diff --git a/src/AppStore.ts b/src/AppStore.ts
index 8ff39c9a1b6..575d1a09dd6 100644
--- a/src/AppStore.ts
+++ b/src/AppStore.ts
@@ -1,30 +1,31 @@
-import {action, computed, observable} from "mobx";
-import {addServiceErrorHandler, getBrowserWindow, remoteData} from "cbioportal-frontend-commons";
-import {initializeAPIClients} from "./config/config";
+import { action, computed, observable } from 'mobx';
+import {
+    addServiceErrorHandler,
+    getBrowserWindow,
+    remoteData,
+} from 'cbioportal-frontend-commons';
+import { initializeAPIClients } from './config/config';
 import * as _ from 'lodash';
-import internalClient from "shared/api/cbioportalInternalClientInstance";
-import {sendSentryMessage} from "./shared/lib/tracking";
+import internalClient from 'shared/api/cbioportalInternalClientInstance';
+import { sendSentryMessage } from './shared/lib/tracking';
 
 export type SiteError = {
-    errorObj:any;
-    dismissed:boolean;
-    title?:string;
+    errorObj: any;
+    dismissed: boolean;
+    title?: string;
 };
 
 export class AppStore {
-
-    constructor(){
-
+    constructor() {
         getBrowserWindow().me = this;
         addServiceErrorHandler((error: any) => {
-            try{
-                sendSentryMessage("ERRORHANDLER:" + error);
-            } catch (ex) {};
-            
-            if (error.status && /400|500/.test(error.status)) {
+            try {
+                sendSentryMessage('ERRORHANDLER:' + error);
+            } catch (ex) {}
 
-                sendSentryMessage("ERROR DIALOG SHOWN:" + error);
-                this.siteErrors.push({errorObj: error, dismissed:false});
+            if (error.status && /400|500/.test(error.status)) {
+                sendSentryMessage('ERROR DIALOG SHOWN:' + error);
+                this.siteErrors.push({ errorObj: error, dismissed: false });
             }
         });
     }
@@ -33,35 +34,35 @@ export class AppStore {
 
     @observable siteErrors: SiteError[] = [];
 
-    @observable userName:string | undefined;
+    @observable userName: string | undefined;
 
-    @observable authMethod:string | undefined;
+    @observable authMethod: string | undefined;
 
-    @computed get isLoggedIn(){
-        return _.isString(this.userName) && this.userName !== "anonymousUser";
+    @computed get isLoggedIn() {
+        return _.isString(this.userName) && this.userName !== 'anonymousUser';
     }
 
-    @computed get logoutUrl(){
-        if (this.authMethod === "saml") {
-            return "saml/logout";
+    @computed get logoutUrl() {
+        if (this.authMethod === 'saml') {
+            return 'saml/logout';
         } else {
-            return "j_spring_security_logout";
+            return 'j_spring_security_logout';
         }
     }
 
-    @computed get undismissedSiteErrors(){
-        return _.filter(this.siteErrors.slice(), (err)=>!err.dismissed);
+    @computed get undismissedSiteErrors() {
+        return _.filter(this.siteErrors.slice(), err => !err.dismissed);
     }
 
-    @computed get isErrorCondition(){
+    @computed get isErrorCondition() {
         return this.undismissedSiteErrors.length > 0;
     }
 
     @action
-    public dismissErrors(){
-        this.siteErrors = this.siteErrors.map((err)=>{
-           err.dismissed = true;
-           return err;
+    public dismissErrors() {
+        this.siteErrors = this.siteErrors.map(err => {
+            err.dismissed = true;
+            return err;
         });
     }
 
@@ -75,14 +76,21 @@ export class AppStore {
     }
 
     readonly portalVersion = remoteData<string | undefined>({
-        invoke:async()=>{
-            const portalVersionResult = await internalClient.getInfoUsingGET({});
+        invoke: async () => {
+            const portalVersionResult = await internalClient.getInfoUsingGET(
+                {}
+            );
             if (portalVersionResult && portalVersionResult.portalVersion) {
                 let version = undefined;
 
                 // try getting version from branch name assume like release-x.y.z
-                if (portalVersionResult.gitBranch && portalVersionResult.gitBranch.startsWith("release-")) {
-                    let branchVersion = portalVersionResult.gitBranch.split('-')[1];
+                if (
+                    portalVersionResult.gitBranch &&
+                    portalVersionResult.gitBranch.startsWith('release-')
+                ) {
+                    let branchVersion = portalVersionResult.gitBranch.split(
+                        '-'
+                    )[1];
                     if (branchVersion.split('.').length == 3) {
                         version = branchVersion;
                     }
@@ -95,12 +103,12 @@ export class AppStore {
                 }
 
                 // add v prefix if missing
-                if (version !== undefined && !version.startsWith("v")) {
+                if (version !== undefined && !version.startsWith('v')) {
                     version = `v${version}`;
                 }
                 return Promise.resolve(version);
             }
             return undefined;
-        }
+        },
     });
 }
diff --git a/src/appBootstrapper.jsx b/src/appBootstrapper.jsx
index 8243a8ed4ad..56108ee37ce 100755
--- a/src/appBootstrapper.jsx
+++ b/src/appBootstrapper.jsx
@@ -2,8 +2,8 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import { Provider } from 'mobx-react';
 import { Router, useRouterHistory } from 'react-router';
-import { createHistory } from 'history'
-import { syncHistoryWithStore  } from 'mobx-react-router';
+import { createHistory } from 'history';
+import { syncHistoryWithStore } from 'mobx-react-router';
 import ExtendedRoutingStore from './shared/lib/ExtendedRouterStore';
 import {
     fetchServerConfig,
@@ -11,7 +11,7 @@ import {
     initializeAppStore,
     initializeConfiguration,
     setConfigDefaults,
-    setServerConfig
+    setServerConfig,
 } from './config/config';
 
 import './shared/lib/ajaxQuiet';
@@ -20,15 +20,15 @@ import * as _ from 'lodash';
 import $ from 'jquery';
 import * as superagent from 'superagent';
 import { getHost, buildCBioPortalPageUrl } from './shared/api/urls';
-import AppConfig from "appConfig";
+import AppConfig from 'appConfig';
 import browser from 'bowser';
 import { setNetworkListener } from './shared/lib/ajaxQuiet';
-import { initializeTracking } from "shared/lib/tracking";
+import { initializeTracking } from 'shared/lib/tracking';
 import superagentCache from 'superagent-cache';
-import {getBrowserWindow} from "cbioportal-frontend-commons";
-import {AppStore} from "./AppStore";
-import {handleLongUrls} from "shared/lib/handleLongUrls";
-import "shared/polyfill/canvasToBlob";
+import { getBrowserWindow } from 'cbioportal-frontend-commons';
+import { AppStore } from './AppStore';
+import { handleLongUrls } from 'shared/lib/handleLongUrls';
+import 'shared/polyfill/canvasToBlob';
 import mobx from 'mobx';
 
 superagentCache(superagent);
@@ -37,39 +37,35 @@ superagentCache(superagent);
 // it fixes the hash portion of url when cohort patient list is too long
 handleLongUrls();
 
-
 // YOU MUST RUN THESE initialize and then set the public path after
 
 initializeConfiguration();
 // THIS TELLS WEBPACK BUNDLE LOADER WHERE TO LOAD SPLIT BUNDLES
 __webpack_public_path__ = AppConfig.frontendUrl;
 
-if (!window.hasOwnProperty("$")) {
+if (!window.hasOwnProperty('$')) {
     window.$ = $;
 }
 
-
-
-if (!window.hasOwnProperty("jQuery")) {
+if (!window.hasOwnProperty('jQuery')) {
     window.jQuery = $;
 }
 
-if (!window.hasOwnProperty("mobx")) {
+if (!window.hasOwnProperty('mobx')) {
     window.mobx = mobx;
 }
 
 // write browser name, version to brody tag
 if (browser) {
-    $(document).ready(()=>{
-        $("body").addClass(browser.name);
+    $(document).ready(() => {
+        $('body').addClass(browser.name);
     });
 }
 
 // e2e test specific stuff
 if (getBrowserWindow().navigator.webdriver) {
-
-    $(document).ready(()=>{
-        $("body").addClass("e2etest");
+    $(document).ready(() => {
+        $('body').addClass('e2etest');
         window.e2etest = true;
     });
 
@@ -82,9 +78,9 @@ window.FRONTEND_COMMIT = COMMIT;
 
 // this is special function allowing MSKCC CIS to hide login UI in
 // portal header
-window.postLoadForMskCIS = function(){
+window.postLoadForMskCIS = function() {
     AppConfig.hide_login = true;
-}
+};
 
 // make sure lodash doesn't overwrite (or set) global underscore
 _.noConflict();
@@ -92,7 +88,7 @@ _.noConflict();
 const routingStore = new ExtendedRoutingStore();
 
 const history = useRouterHistory(createHistory)({
-    basename: AppConfig.basePath || ""
+    basename: AppConfig.basePath || '',
 });
 
 const syncedHistory = syncHistoryWithStore(history, routingStore);
@@ -100,7 +96,7 @@ const syncedHistory = syncHistoryWithStore(history, routingStore);
 const stores = {
     // Key can be whatever you want
     routing: routingStore,
-    appStore:new AppStore()
+    appStore: new AppStore(),
 };
 
 window.globalStores = stores;
@@ -109,21 +105,25 @@ const end = superagent.Request.prototype.end;
 
 let redirecting = false;
 
-superagent.Request.prototype.end = function (callback) {
+superagent.Request.prototype.end = function(callback) {
     return end.call(this, (error, response) => {
-
         if (redirecting) {
             return;
         }
         if (response && response.statusCode === 401) {
-            var storageKey = `redirect${Math.floor(Math.random() * 1000000000000)}`
+            var storageKey = `redirect${Math.floor(
+                Math.random() * 1000000000000
+            )}`;
             localStorage.setItem(storageKey, window.location.href);
 
             // build URL with a reference to storage key so that /restore route can restore it after login
             const loginUrl = buildCBioPortalPageUrl({
                 query: {
-                    "spring-security-redirect":buildCBioPortalPageUrl({ pathname:"restore", query: { key: storageKey} })
-                }
+                    'spring-security-redirect': buildCBioPortalPageUrl({
+                        pathname: 'restore',
+                        query: { key: storageKey },
+                    }),
+                },
             });
 
             redirecting = true;
@@ -136,22 +136,17 @@ superagent.Request.prototype.end = function (callback) {
 
 window.routingStore = routingStore;
 
-
 let render = () => {
-
     if (!getBrowserWindow().navigator.webdriver) initializeTracking();
 
-    const rootNode = document.getElementById("reactRoot");
+    const rootNode = document.getElementById('reactRoot');
 
     ReactDOM.render(
         <Provider {...stores}>
-            <Router
-                history={syncedHistory} routes={makeRoutes()} >
-            </Router>
-        </Provider>
-    , rootNode);
-
-
+            <Router history={syncedHistory} routes={makeRoutes()}></Router>
+        </Provider>,
+        rootNode
+    );
 };
 
 if (__DEBUG__ && module.hot) {
@@ -162,15 +157,14 @@ if (__DEBUG__ && module.hot) {
 }
 
 $(document).ready(async () => {
-
     // we show blank page if the window.name is "blank"
-    if (window.name === "blank") {
+    if (window.name === 'blank') {
         return;
     }
     // we use rawServerConfig (written by JSP) if it is present
     // or fetch from config service if not
     // need to use jsonp, so use jquery
-    let config = window.rawServerConfig || await fetchServerConfig();
+    let config = window.rawServerConfig || (await fetchServerConfig());
 
     setServerConfig(config);
 
@@ -178,7 +172,7 @@ $(document).ready(async () => {
 
     initializeAPIClients();
 
-    initializeAppStore(stores.appStore,config);
+    initializeAppStore(stores.appStore, config);
 
     render();
 
diff --git a/src/appShell/App/Container.tsx b/src/appShell/App/Container.tsx
index efa62a753af..a6d0f3fb10f 100644
--- a/src/appShell/App/Container.tsx
+++ b/src/appShell/App/Container.tsx
@@ -2,19 +2,23 @@ import * as _ from 'lodash';
 import * as React from 'react';
 
 import '../../globalStyles/prefixed-global.scss';
-import PortalHeader from "./PortalHeader";
-import {getBrowserWindow, isWebdriver} from "cbioportal-frontend-commons";
-import {observer} from "mobx-react";
+import PortalHeader from './PortalHeader';
+import { getBrowserWindow, isWebdriver } from 'cbioportal-frontend-commons';
+import { observer } from 'mobx-react';
 
-import LoadingIndicator from "../../shared/components/loadingIndicator/LoadingIndicator";
-import AppConfig from "appConfig";
-import Helmet from "react-helmet";
-import {computed} from "mobx";
+import LoadingIndicator from '../../shared/components/loadingIndicator/LoadingIndicator';
+import AppConfig from 'appConfig';
+import Helmet from 'react-helmet';
+import { computed } from 'mobx';
 import { If, Else, Then } from 'react-if';
-import UserMessager from "shared/components/userMessager/UserMessage";
-import {formatErrorLog, formatErrorTitle, formatErrorMessages} from "shared/lib/errorFormatter";
-import {buildCBioPortalPageUrl} from "shared/api/urls";
-import ErrorScreen from "shared/components/errorScreen/ErrorScreen";
+import UserMessager from 'shared/components/userMessager/UserMessage';
+import {
+    formatErrorLog,
+    formatErrorTitle,
+    formatErrorMessages,
+} from 'shared/lib/errorFormatter';
+import { buildCBioPortalPageUrl } from 'shared/api/urls';
+import ErrorScreen from 'shared/components/errorScreen/ErrorScreen';
 import { ServerConfigHelpers } from 'config/config';
 
 interface IContainerProps {
@@ -24,20 +28,20 @@ interface IContainerProps {
 
 @observer
 export default class Container extends React.Component<IContainerProps, {}> {
-
-    private get routingStore(){
+    private get routingStore() {
         return getBrowserWindow().routingStore;
     }
 
-    private get appStore(){
+    private get appStore() {
         return getBrowserWindow().globalStores.appStore;
     }
 
     renderChildren() {
-        const childProps = {...this.props};
-        const {children} = this.props;
-        return React.Children.map(children,
-            c => React.cloneElement(c as React.ReactElement<any>, childProps));
+        const childProps = { ...this.props };
+        const { children } = this.props;
+        return React.Children.map(children, c =>
+            React.cloneElement(c as React.ReactElement<any>, childProps)
+        );
     }
 
     render() {
@@ -45,12 +49,20 @@ export default class Container extends React.Component<IContainerProps, {}> {
             return (
                 <div className="contentWrapper">
                     <ErrorScreen
-                        title={"No session service configured"}
-                        body={<p>As of version 3.0.0, all cBioPortal installations require a session service.  Please review these instructions for how to do so. <a href="https://docs.cbioportal.org/2.1.2-deploy-without-docker/deploying#run-cbioportal-session-service">https://docs.cbioportal.org/2.1.2-deploy-without-docker/deploying#run-cbioportal-session-service</a>
-                        </p>}
+                        title={'No session service configured'}
+                        body={
+                            <p>
+                                As of version 3.0.0, all cBioPortal
+                                installations require a session service. Please
+                                review these instructions for how to do so.{' '}
+                                <a href="https://docs.cbioportal.org/2.1.2-deploy-without-docker/deploying#run-cbioportal-session-service">
+                                    https://docs.cbioportal.org/2.1.2-deploy-without-docker/deploying#run-cbioportal-session-service
+                                </a>
+                            </p>
+                        }
                     />
                 </div>
-            )
+            );
         }
 
         return (
@@ -58,23 +70,39 @@ export default class Container extends React.Component<IContainerProps, {}> {
                 <Helmet>
                     <meta charSet="utf-8" />
                     <title>{AppConfig.serverConfig.skin_title}</title>
-                    <meta name="description" content={AppConfig.serverConfig.skin_description} />
+                    <meta
+                        name="description"
+                        content={AppConfig.serverConfig.skin_description}
+                    />
                 </Helmet>
 
                 <div className="pageTopContainer">
                     <UserMessager />
                     <div className="contentWidth">
-                        <PortalHeader appStore={this.appStore}/>
+                        <PortalHeader appStore={this.appStore} />
                     </div>
                 </div>
                 <If condition={this.appStore.isErrorCondition}>
                     <Then>
                         <div className="contentWrapper">
                             <ErrorScreen
-                                title={formatErrorTitle(this.appStore.undismissedSiteErrors) || "Oops. There was an error retrieving data."}
-                                body={<a href={buildCBioPortalPageUrl("/")}>Return to homepage</a>}
-                                errorLog={formatErrorLog(this.appStore.undismissedSiteErrors)}
-                                errorMessages={formatErrorMessages(this.appStore.undismissedSiteErrors)}
+                                title={
+                                    formatErrorTitle(
+                                        this.appStore.undismissedSiteErrors
+                                    ) ||
+                                    'Oops. There was an error retrieving data.'
+                                }
+                                body={
+                                    <a href={buildCBioPortalPageUrl('/')}>
+                                        Return to homepage
+                                    </a>
+                                }
+                                errorLog={formatErrorLog(
+                                    this.appStore.undismissedSiteErrors
+                                )}
+                                errorMessages={formatErrorMessages(
+                                    this.appStore.undismissedSiteErrors
+                                )}
                             />
                         </div>
                     </Then>
@@ -88,5 +116,3 @@ export default class Container extends React.Component<IContainerProps, {}> {
         );
     }
 }
-
-
diff --git a/src/appShell/App/PortalFooter.tsx b/src/appShell/App/PortalFooter.tsx
index 6dcd7dfc652..831a78b08bd 100644
--- a/src/appShell/App/PortalFooter.tsx
+++ b/src/appShell/App/PortalFooter.tsx
@@ -1,105 +1,233 @@
 import * as React from 'react';
-import AppConfig from "appConfig";
+import AppConfig from 'appConfig';
 import { If } from 'react-if';
 // tslint:disable-next-line:no-import-side-effect
 import './footer.scss';
 import _ from 'lodash';
 import { Link } from 'react-router';
-import {AppStore} from "../../AppStore";
-import {observer} from "mobx-react";
-
-@observer export default class PortalFooter extends React.Component<{appStore:AppStore}, {}> {
+import { AppStore } from '../../AppStore';
+import { observer } from 'mobx-react';
 
+@observer
+export default class PortalFooter extends React.Component<
+    { appStore: AppStore },
+    {}
+> {
     render() {
-            var version;
-            if (this.props.appStore.portalVersion.isComplete && !this.props.appStore.portalVersion.isError && this.props.appStore.portalVersion.result){
-                version = this.props.appStore.portalVersion.result;
-            }
-            else{
-                version = "--"
-            }
-            if (AppConfig.serverConfig.skin_footer && !_.isEmpty(AppConfig.serverConfig.skin_footer)) {
-                return (
-                    <div id="footer" dangerouslySetInnerHTML={{__html:
-                        "<a href='http://www.cbioportal.org'>cBioPortal</a> | " +
-                        `<a href='${AppConfig.apiRoot}api/info'>${version}</a> ` +
-                        AppConfig.serverConfig.skin_footer +
-                        "<br />" +
-                        `Questions and Feedback: <a href="mailto:${AppConfig.serverConfig.skin_email_contact}">${AppConfig.serverConfig.skin_email_contact}</a>`
-                    }}>
-                    </div>
-                );
-            } else {
-                return (
-                    <div id="footer">
-                        <div className="footer-layout">
+        var version;
+        if (
+            this.props.appStore.portalVersion.isComplete &&
+            !this.props.appStore.portalVersion.isError &&
+            this.props.appStore.portalVersion.result
+        ) {
+            version = this.props.appStore.portalVersion.result;
+        } else {
+            version = '--';
+        }
+        if (
+            AppConfig.serverConfig.skin_footer &&
+            !_.isEmpty(AppConfig.serverConfig.skin_footer)
+        ) {
+            return (
+                <div
+                    id="footer"
+                    dangerouslySetInnerHTML={{
+                        __html:
+                            "<a href='http://www.cbioportal.org'>cBioPortal</a> | " +
+                            `<a href='${AppConfig.apiRoot}api/info'>${version}</a> ` +
+                            AppConfig.serverConfig.skin_footer +
+                            '<br />' +
+                            `Questions and Feedback: <a href="mailto:${AppConfig.serverConfig.skin_email_contact}">${AppConfig.serverConfig.skin_email_contact}</a>`,
+                    }}
+                ></div>
+            );
+        } else {
+            return (
+                <div id="footer">
+                    <div className="footer-layout">
+                        <div className="footer-elem">
+                            <img
+                                src={require('../../globalStyles/images/cbioportal_logo.png')}
+                                style={{
+                                    width: 142,
+                                    filter: 'grayscale(100%)',
+                                }}
+                                alt="cBioPortal Logo"
+                            />
+                            {version && (
+                                <a href={`${AppConfig.apiRoot}api/info`}>
+                                    <div
+                                        style={{
+                                            paddingTop: 9,
+                                            textAlign: 'center',
+                                        }}
+                                    >
+                                        {version}
+                                    </div>
+                                </a>
+                            )}
+                        </div>
+                        <If
+                            condition={
+                                AppConfig.serverConfig
+                                    .skin_show_tutorials_tab !== false ||
+                                AppConfig.serverConfig.skin_show_faqs_tab
+                            }
+                        >
                             <div className="footer-elem">
-                                <img src={require("../../globalStyles/images/cbioportal_logo.png")} style={{width: 142, filter:"grayscale(100%)"}} alt="cBioPortal Logo"/>
-                                {version && (
-                                    <a href={`${AppConfig.apiRoot}api/info`}><div style={{paddingTop:9,textAlign:"center"}}>{version}</div></a>
-                                )}
+                                <h3>HELP</h3>
+                                <ul>
+                                    <If
+                                        condition={
+                                            AppConfig.serverConfig
+                                                .skin_show_tutorials_tab !==
+                                            false
+                                        }
+                                    >
+                                        <li>
+                                            <Link to="/tutorials">
+                                                Tutorials
+                                            </Link>
+                                        </li>
+                                    </If>
+                                    <If
+                                        condition={
+                                            AppConfig.serverConfig
+                                                .skin_show_faqs_tab
+                                        }
+                                    >
+                                        <li>
+                                            <Link to="/faq">FAQ</Link>
+                                        </li>
+                                    </If>
+                                    <li>
+                                        <a
+                                            target="_blank"
+                                            href="https://groups.google.com/forum/#!forum/cbioportal"
+                                        >
+                                            User Group
+                                        </a>
+                                    </li>
+                                </ul>
                             </div>
-                            <If condition={AppConfig.serverConfig.skin_show_tutorials_tab !== false || AppConfig.serverConfig.skin_show_faqs_tab}>
-                                <div className="footer-elem">
-                                    <h3>HELP</h3>
-                                    <ul>
-                                        <If condition={AppConfig.serverConfig.skin_show_tutorials_tab !== false}>
-                                            <li><Link to="/tutorials">Tutorials</Link></li>
-                                        </If>
-                                        <If condition={AppConfig.serverConfig.skin_show_faqs_tab}>
-                                            <li><Link to="/faq">FAQ</Link></li>
-                                        </If>
-                                        <li><a target="_blank" href="https://groups.google.com/forum/#!forum/cbioportal">User Group</a></li>
-                                    </ul>
-                                </div>
-                            </If>
-                            <If condition={AppConfig.serverConfig.skin_show_news_tab || AppConfig.serverConfig.skin_show_about_tab}>
-                                <div className="footer-elem">
-                                    <h3>INFO</h3>
-                                    <ul>
-                                        <If condition={AppConfig.serverConfig.skin_show_news_tab}>
-                                            <li><Link to="/news">News</Link></li>
-                                        </If>
-                                        <If condition={AppConfig.serverConfig.skin_show_about_tab}>
-                                            <li><Link to="/about">About</Link></li>
-                                        </If>
-                                        <If condition={AppConfig.serverConfig.skin_show_r_matlab_tab || AppConfig.serverConfig.skin_show_web_api_tab}>
-                                            <li><a href={`${AppConfig.apiRoot}api`}>API Docs</a></li>
-                                        </If>
-                                        <If condition={AppConfig.serverConfig.app_name === "public-portal"}>
-                                            <li><a target="_blank" href="https://www.twitter.com/cbioportal">Twitter</a></li>
-                                        </If>
-                                    </ul>
-                                </div>
-                            </If>
-                           <If condition={AppConfig.serverConfig.app_name === "public-portal"}>
-                               <div className="footer-elem">
-                                   <h3>DEV</h3>
-                                   <ul>
-                                       <li>
-                                            <a target="_blank" href="https://github.com/cBioPortal/">
-                                                GitHub
+                        </If>
+                        <If
+                            condition={
+                                AppConfig.serverConfig.skin_show_news_tab ||
+                                AppConfig.serverConfig.skin_show_about_tab
+                            }
+                        >
+                            <div className="footer-elem">
+                                <h3>INFO</h3>
+                                <ul>
+                                    <If
+                                        condition={
+                                            AppConfig.serverConfig
+                                                .skin_show_news_tab
+                                        }
+                                    >
+                                        <li>
+                                            <Link to="/news">News</Link>
+                                        </li>
+                                    </If>
+                                    <If
+                                        condition={
+                                            AppConfig.serverConfig
+                                                .skin_show_about_tab
+                                        }
+                                    >
+                                        <li>
+                                            <Link to="/about">About</Link>
+                                        </li>
+                                    </If>
+                                    <If
+                                        condition={
+                                            AppConfig.serverConfig
+                                                .skin_show_r_matlab_tab ||
+                                            AppConfig.serverConfig
+                                                .skin_show_web_api_tab
+                                        }
+                                    >
+                                        <li>
+                                            <a href={`${AppConfig.apiRoot}api`}>
+                                                API Docs
                                             </a>
                                         </li>
-                                       <li><a target="_blank" href="https://slack.cbioportal.org">Slack</a></li>
-                                   </ul>
-                               </div>
-                               <div className="footer-elem">
-                                   <h3>STATUS</h3>
-                                   <ul>
-                                       <li><a href="https://status.cbioportal.org">cBioPortal Status</a></li>
-                                   </ul>
-                               </div>
-                           </If>
-                           <div className="footer-elem">
-                               <h3>CONTACT</h3>
-                               <ul>
-                                   <li><a href={`mailto:${AppConfig.serverConfig.skin_email_contact}`}>{AppConfig.serverConfig.skin_email_contact}</a></li>
-                               </ul>
-                           </div>
+                                    </If>
+                                    <If
+                                        condition={
+                                            AppConfig.serverConfig.app_name ===
+                                            'public-portal'
+                                        }
+                                    >
+                                        <li>
+                                            <a
+                                                target="_blank"
+                                                href="https://www.twitter.com/cbioportal"
+                                            >
+                                                Twitter
+                                            </a>
+                                        </li>
+                                    </If>
+                                </ul>
+                            </div>
+                        </If>
+                        <If
+                            condition={
+                                AppConfig.serverConfig.app_name ===
+                                'public-portal'
+                            }
+                        >
+                            <div className="footer-elem">
+                                <h3>DEV</h3>
+                                <ul>
+                                    <li>
+                                        <a
+                                            target="_blank"
+                                            href="https://github.com/cBioPortal/"
+                                        >
+                                            GitHub
+                                        </a>
+                                    </li>
+                                    <li>
+                                        <a
+                                            target="_blank"
+                                            href="https://slack.cbioportal.org"
+                                        >
+                                            Slack
+                                        </a>
+                                    </li>
+                                </ul>
+                            </div>
+                            <div className="footer-elem">
+                                <h3>STATUS</h3>
+                                <ul>
+                                    <li>
+                                        <a href="https://status.cbioportal.org">
+                                            cBioPortal Status
+                                        </a>
+                                    </li>
+                                </ul>
+                            </div>
+                        </If>
+                        <div className="footer-elem">
+                            <h3>CONTACT</h3>
+                            <ul>
+                                <li>
+                                    <a
+                                        href={`mailto:${AppConfig.serverConfig.skin_email_contact}`}
+                                    >
+                                        {
+                                            AppConfig.serverConfig
+                                                .skin_email_contact
+                                        }
+                                    </a>
+                                </li>
+                            </ul>
                         </div>
                     </div>
-                );
-            }
+                </div>
+            );
+        }
     }
 }
diff --git a/src/appShell/App/PortalHeader.tsx b/src/appShell/App/PortalHeader.tsx
index fc0f765fb22..d9b9d0f81ad 100644
--- a/src/appShell/App/PortalHeader.tsx
+++ b/src/appShell/App/PortalHeader.tsx
@@ -1,147 +1,185 @@
 import * as React from 'react';
 import * as _ from 'lodash';
 import { Link } from 'react-router';
-import AppConfig from "appConfig";
-import {If, Then, Else} from 'react-if';
-import {openSocialAuthWindow} from "../../shared/lib/openSocialAuthWindow";
-import {AppStore} from "../../AppStore";
-import {observer} from "mobx-react";
-import {buildCBioPortalPageUrl} from "../../shared/api/urls";
-import SocialAuthButton from "../../shared/components/SocialAuthButton";
-import {Dropdown} from 'react-bootstrap';
-import {DataAccessTokensDropdown} from "../../shared/components/dataAccessTokens/DataAccessTokensDropdown";
-import {observable} from "mobx";
+import AppConfig from 'appConfig';
+import { If, Then, Else } from 'react-if';
+import { openSocialAuthWindow } from '../../shared/lib/openSocialAuthWindow';
+import { AppStore } from '../../AppStore';
+import { observer } from 'mobx-react';
+import { buildCBioPortalPageUrl } from '../../shared/api/urls';
+import SocialAuthButton from '../../shared/components/SocialAuthButton';
+import { Dropdown } from 'react-bootstrap';
+import { DataAccessTokensDropdown } from '../../shared/components/dataAccessTokens/DataAccessTokensDropdown';
+import { observable } from 'mobx';
 
 @observer
-export default class PortalHeader extends React.Component<{ appStore:AppStore }, {}> {
-
-    private tabs(){
-
+export default class PortalHeader extends React.Component<
+    { appStore: AppStore },
+    {}
+> {
+    private tabs() {
         return [
-
             {
-                id:"datasets",
-                text:"Data Sets",
-                address:"/datasets",
-                internal:true,
-                hide:()=>AppConfig.serverConfig.skin_show_data_tab === false
+                id: 'datasets',
+                text: 'Data Sets',
+                address: '/datasets',
+                internal: true,
+                hide: () => AppConfig.serverConfig.skin_show_data_tab === false,
             },
 
             {
-                id:"webAPI",
-                text:"Web API",
-                address:"/webAPI",
-                internal:true,
-                hide:()=>AppConfig.serverConfig.skin_show_web_api_tab === false
+                id: 'webAPI',
+                text: 'Web API',
+                address: '/webAPI',
+                internal: true,
+                hide: () =>
+                    AppConfig.serverConfig.skin_show_web_api_tab === false,
             },
 
             {
-                id:"rMatlab",
-                text:"R/MATLAB",
-                address:"/rmatlab",
-                internal:true,
-                hide:()=>AppConfig.serverConfig.skin_show_r_matlab_tab === false
+                id: 'rMatlab',
+                text: 'R/MATLAB',
+                address: '/rmatlab',
+                internal: true,
+                hide: () =>
+                    AppConfig.serverConfig.skin_show_r_matlab_tab === false,
             },
 
             {
-                id:"tutorials",
-                text:"Tutorials",
-                address:"/tutorials",
-                internal:true,
-                hide:()=>AppConfig.serverConfig.skin_show_tutorials_tab === false
+                id: 'tutorials',
+                text: 'Tutorials',
+                address: '/tutorials',
+                internal: true,
+                hide: () =>
+                    AppConfig.serverConfig.skin_show_tutorials_tab === false,
             },
 
             {
-                id:"faq",
-                text:"FAQ",
-                address:"/faq",
-                internal:true,
-                hide:()=>AppConfig.serverConfig.skin_show_faqs_tab === false
+                id: 'faq',
+                text: 'FAQ',
+                address: '/faq',
+                internal: true,
+                hide: () => AppConfig.serverConfig.skin_show_faqs_tab === false,
             },
 
             {
-                id:"news",
-                text:"News",
-                address:"/news",
-                internal:true,
-                hide:()=>AppConfig.serverConfig.skin_show_news_tab === false
+                id: 'news',
+                text: 'News',
+                address: '/news',
+                internal: true,
+                hide: () => AppConfig.serverConfig.skin_show_news_tab === false,
             },
 
             {
-                id:"visualize",
-                text:"Visualize Your Data",
-                address:"/visualize",
-                internal:true,
-                hide:()=>AppConfig.serverConfig.skin_show_tools_tab === false
+                id: 'visualize',
+                text: 'Visualize Your Data',
+                address: '/visualize',
+                internal: true,
+                hide: () =>
+                    AppConfig.serverConfig.skin_show_tools_tab === false,
             },
 
             {
-                id:"about",
-                text:"About",
-                address:"/about",
-                internal:true,
-                hide:()=>AppConfig.serverConfig.skin_show_about_tab === false
-            }
+                id: 'about',
+                text: 'About',
+                address: '/about',
+                internal: true,
+                hide: () =>
+                    AppConfig.serverConfig.skin_show_about_tab === false,
+            },
         ];
-
-
     }
 
-    private getTabs(){
-        const shownTabs = this.tabs().filter((t)=>{
-            return !t.hide()
+    private getTabs() {
+        const shownTabs = this.tabs().filter(t => {
+            return !t.hide();
         });
 
-        return shownTabs.map((tab)=>{
-            return <li>
-                {
-                    (tab.internal) ? <Link activeClassName={'selected'} to={tab.address}>{tab.text}</Link> :  <a href={tab.address}>{tab.text}</a>
-                }
-            </li>
-        })
-
+        return shownTabs.map(tab => {
+            return (
+                <li>
+                    {tab.internal ? (
+                        <Link activeClassName={'selected'} to={tab.address}>
+                            {tab.text}
+                        </Link>
+                    ) : (
+                        <a href={tab.address}>{tab.text}</a>
+                    )}
+                </li>
+            );
+        });
     }
 
-    render(){
-        return <header>
-            <div id="leftHeaderContent">
-                <Link to="/" id="cbioportal-logo"><img src={require("../../globalStyles/images/cbioportal_logo.png")} alt="cBioPortal Logo"/></Link>
-                <nav id="main-nav">
-                    <ul>
-                        {
-                           this.getTabs()
+    render() {
+        return (
+            <header>
+                <div id="leftHeaderContent">
+                    <Link to="/" id="cbioportal-logo">
+                        <img
+                            src={require('../../globalStyles/images/cbioportal_logo.png')}
+                            alt="cBioPortal Logo"
+                        />
+                    </Link>
+                    <nav id="main-nav">
+                        <ul>{this.getTabs()}</ul>
+                    </nav>
+                </div>
+                <div id="rightHeaderContent">
+                    <If condition={!AppConfig.hide_login}>
+                        <If condition={this.props.appStore.isLoggedIn}>
+                            <Then>
+                                <div className="identity">
+                                    <Dropdown id="dat-dropdown">
+                                        <Dropdown.Toggle className="btn-sm">
+                                            Logged in as{' '}
+                                            {this.props.appStore.userName}
+                                        </Dropdown.Toggle>
+                                        <Dropdown.Menu
+                                            style={{
+                                                paddingLeft: 10,
+                                                overflow: 'auto',
+                                                maxHeight: 300,
+                                                whiteSpace: 'nowrap',
+                                            }}
+                                        >
+                                            <DataAccessTokensDropdown
+                                                appStore={this.props.appStore}
+                                            />
+                                        </Dropdown.Menu>
+                                    </Dropdown>
+                                </div>
+                            </Then>
+                            <Else>
+                                <If
+                                    condition={
+                                        AppConfig.serverConfig
+                                            .authenticationMethod &&
+                                        AppConfig.serverConfig.authenticationMethod.includes(
+                                            'social_auth'
+                                        )
+                                    }
+                                >
+                                    <SocialAuthButton
+                                        appStore={this.props.appStore}
+                                    />
+                                </If>
+                            </Else>
+                        </If>
+                    </If>
+                    <If
+                        condition={
+                            !_.isEmpty(AppConfig.serverConfig.skin_right_logo)
                         }
-                    </ul>
-                </nav>
-            </div>
-            <div id="rightHeaderContent">
-                <If condition={!AppConfig.hide_login}>
-                    <If condition={this.props.appStore.isLoggedIn}>
-                        <Then>
-                            <div className="identity">
-                                <Dropdown id="dat-dropdown">
-                                    <Dropdown.Toggle className="btn-sm">
-                                        Logged in as {this.props.appStore.userName}
-                                    </Dropdown.Toggle>
-                                    <Dropdown.Menu style={{ paddingLeft:10, overflow:'auto', maxHeight:300, whiteSpace:'nowrap' }}>
-                                        <DataAccessTokensDropdown appStore={this.props.appStore}/>
-                                    </Dropdown.Menu>
-                                </Dropdown>
-                            </div>
-                        </Then>
-                        <Else>
-                            <If condition={AppConfig.serverConfig.authenticationMethod &&  AppConfig.serverConfig.authenticationMethod.includes("social_auth")}>
-                                <SocialAuthButton appStore={this.props.appStore}/>
-                            </If>
-                        </Else>
+                    >
+                        <img
+                            id="institute-logo"
+                            src={`images/${AppConfig.serverConfig
+                                .skin_right_logo!}`}
+                            alt="Institute Logo"
+                        />
                     </If>
-
-                </If>
-                <If condition={!_.isEmpty(AppConfig.serverConfig.skin_right_logo)}>
-                    <img id="institute-logo" src={`images/${AppConfig.serverConfig.skin_right_logo!}`} alt="Institute Logo" />
-                </If>
-
-            </div>
-        </header>
+                </div>
+            </header>
+        );
     }
 }
diff --git a/src/appShell/App/footer.scss b/src/appShell/App/footer.scss
index 102c73cc639..cf0cf17cf60 100644
--- a/src/appShell/App/footer.scss
+++ b/src/appShell/App/footer.scss
@@ -6,7 +6,7 @@
     .footer-layout {
         display: flex;
         text-align: left;
-        justify-content:  space-between;
+        justify-content: space-between;
         max-width: 1024px;
         margin: auto;
 
@@ -17,14 +17,14 @@
 
         h3 {
             color: #666 !important;
-            font-size:15px;
+            font-size: 15px;
         }
 
         ul {
             line-height: 20px;
             color: #666 !important;
             list-style: none;
-            padding-left:0;
+            padding-left: 0;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/appShell/DevTools/DevTools.js b/src/appShell/DevTools/DevTools.js
index a47ba28037f..3b1c70560cd 100755
--- a/src/appShell/DevTools/DevTools.js
+++ b/src/appShell/DevTools/DevTools.js
@@ -4,11 +4,11 @@ import LogMonitor from 'redux-devtools-log-monitor';
 import DockMonitor from 'redux-devtools-dock-monitor';
 
 export default createDevTools(
-  <DockMonitor
-    toggleVisibilityKey="ctrl-h"
-    changePositionKey="ctrl-q"
-    defaultIsVisible={false}
-  >
-    <LogMonitor />
-  </DockMonitor>
+    <DockMonitor
+        toggleVisibilityKey="ctrl-h"
+        changePositionKey="ctrl-q"
+        defaultIsVisible={false}
+    >
+        <LogMonitor />
+    </DockMonitor>
 );
diff --git a/src/config/IAppConfig.ts b/src/config/IAppConfig.ts
index bcb4cd79809..da63339ced6 100644
--- a/src/config/IAppConfig.ts
+++ b/src/config/IAppConfig.ts
@@ -117,6 +117,6 @@ export interface IServerConfig {
     query_product_limit: number;
     dat_uuid_revoke_other_tokens: boolean;
     dat_method: string;
-    skin_show_gsva:boolean;
+    skin_show_gsva: boolean;
     oncoKbTokenDefined: boolean;
 }
diff --git a/src/config/config.spec.ts b/src/config/config.spec.ts
index ae5590dd40d..4d59764f4c2 100644
--- a/src/config/config.spec.ts
+++ b/src/config/config.spec.ts
@@ -1,24 +1,32 @@
-import {ServerConfigHelpers} from "./config";
+import { ServerConfigHelpers } from './config';
 import { assert } from 'chai';
 
-describe("ServerConfigHelpers", ()=>{
-
-    describe("parses config data format", ()=>{
-
-
-        it("parses two entrees and arrays from comma delimitted list",()=>{
-            const testString = "TCGA PanCancer Atlas Studies#*pan_can_atlas*;Curated set of non-redundant studies#acbc_mskcc_2015,acc_tcga_pan_can_atlas_2018";
+describe('ServerConfigHelpers', () => {
+    describe('parses config data format', () => {
+        it('parses two entrees and arrays from comma delimitted list', () => {
+            const testString =
+                'TCGA PanCancer Atlas Studies#*pan_can_atlas*;Curated set of non-redundant studies#acbc_mskcc_2015,acc_tcga_pan_can_atlas_2018';
             const output = ServerConfigHelpers.parseConfigFormat(testString);
-            assert.deepEqual(output,  { "TCGA PanCancer Atlas Studies":["*pan_can_atlas*"], "Curated set of non-redundant studies":["acbc_mskcc_2015","acc_tcga_pan_can_atlas_2018"]  } );
+            assert.deepEqual(output, {
+                'TCGA PanCancer Atlas Studies': ['*pan_can_atlas*'],
+                'Curated set of non-redundant studies': [
+                    'acbc_mskcc_2015',
+                    'acc_tcga_pan_can_atlas_2018',
+                ],
+            });
         });
 
-        it("handles trailing semicolon",()=>{
-            const testString = "TCGA PanCancer Atlas Studies#*pan_can_atlas*;Curated set of non-redundant studies#acbc_mskcc_2015,acc_tcga_pan_can_atlas_2018;";
+        it('handles trailing semicolon', () => {
+            const testString =
+                'TCGA PanCancer Atlas Studies#*pan_can_atlas*;Curated set of non-redundant studies#acbc_mskcc_2015,acc_tcga_pan_can_atlas_2018;';
             const output = ServerConfigHelpers.parseConfigFormat(testString);
-            assert.deepEqual(output,  { "TCGA PanCancer Atlas Studies":["*pan_can_atlas*"], "Curated set of non-redundant studies":["acbc_mskcc_2015","acc_tcga_pan_can_atlas_2018"]  } );
+            assert.deepEqual(output, {
+                'TCGA PanCancer Atlas Studies': ['*pan_can_atlas*'],
+                'Curated set of non-redundant studies': [
+                    'acbc_mskcc_2015',
+                    'acc_tcga_pan_can_atlas_2018',
+                ],
+            });
         });
-
-
     });
-
-})
\ No newline at end of file
+});
diff --git a/src/config/config.ts b/src/config/config.ts
index 32c081be80a..19604c2f676 100644
--- a/src/config/config.ts
+++ b/src/config/config.ts
@@ -1,7 +1,11 @@
-import {CategorizedConfigItems, IAppConfig, IServerConfig} from "./IAppConfig";
-import * as _ from "lodash";
-import ServerConfigDefaults from "./serverConfigDefaults";
-import memoize from "memoize-weak-decorator";
+import {
+    CategorizedConfigItems,
+    IAppConfig,
+    IServerConfig,
+} from './IAppConfig';
+import * as _ from 'lodash';
+import ServerConfigDefaults from './serverConfigDefaults';
+import memoize from 'memoize-weak-decorator';
 
 import {
     getCbioPortalApiUrl,
@@ -9,39 +13,37 @@ import {
     getG2SApiUrl,
     getGenomeNexusApiUrl,
     getOncoKbApiUrl,
-    trimTrailingSlash
-} from "../shared/api/urls";
-import genomeNexusClient from "../shared/api/genomeNexusClientInstance";
-import internalGenomeNexusClient from "../shared/api/genomeNexusInternalClientInstance";
-import oncoKBClient from "../shared/api/oncokbClientInstance";
-import genome2StructureClient from "../shared/api/g2sClientInstance";
-import client from "../shared/api/cbioportalClientInstance";
-import internalClient from "../shared/api/cbioportalInternalClientInstance";
-import $ from "jquery";
-import {AppStore} from "../AppStore";
-import {cachePostMethodsOnClient} from "cbioportal-frontend-commons";
-import CBioPortalAPI from "../shared/api/generated/CBioPortalAPI";
-import CBioPortalAPIInternal from "../shared/api/generated/CBioPortalAPIInternal";
-import CivicAPI from "../shared/api/CivicAPI";
+    trimTrailingSlash,
+} from '../shared/api/urls';
+import genomeNexusClient from '../shared/api/genomeNexusClientInstance';
+import internalGenomeNexusClient from '../shared/api/genomeNexusInternalClientInstance';
+import oncoKBClient from '../shared/api/oncokbClientInstance';
+import genome2StructureClient from '../shared/api/g2sClientInstance';
+import client from '../shared/api/cbioportalClientInstance';
+import internalClient from '../shared/api/cbioportalInternalClientInstance';
+import $ from 'jquery';
+import { AppStore } from '../AppStore';
+import { cachePostMethodsOnClient } from 'cbioportal-frontend-commons';
+import CBioPortalAPI from '../shared/api/generated/CBioPortalAPI';
+import CBioPortalAPIInternal from '../shared/api/generated/CBioPortalAPIInternal';
+import CivicAPI from '../shared/api/CivicAPI';
 import {
     Genome2StructureAPI,
     GenomeNexusAPI,
     GenomeNexusAPIInternal,
-    OncoKbAPI
-} from "cbioportal-frontend-commons";
-import AppConfig from "appConfig";
-import {sendSentryMessage} from "../shared/lib/tracking";
-import {log} from "../shared/lib/consoleLog";
-
+    OncoKbAPI,
+} from 'cbioportal-frontend-commons';
+import AppConfig from 'appConfig';
+import { sendSentryMessage } from '../shared/lib/tracking';
+import { log } from '../shared/lib/consoleLog';
 
-const config:any = (window as any).frontendConfig || { serverConfig:{} };
+const config: any = (window as any).frontendConfig || { serverConfig: {} };
 
-const win = (window as any);
+const win = window as any;
 
 export default config;
 
-export function updateConfig(obj:Partial<IAppConfig>){
-
+export function updateConfig(obj: Partial<IAppConfig>) {
     // handle serverConfig
     if (obj.serverConfig) {
         setServerConfig(obj.serverConfig);
@@ -60,13 +62,10 @@ export function updateConfig(obj:Partial<IAppConfig>){
     // we have to use assign here (as opposed to replacing the reference because importers
     // already have reference and those will become detached from this
     Object.assign(config, nextConfig);
-
 }
 
-export function setServerConfig(serverConfig:{[key:string]:any }){
-
-    _.each(ServerConfigDefaults,(defaultVal,key)=>{
-
+export function setServerConfig(serverConfig: { [key: string]: any }) {
+    _.each(ServerConfigDefaults, (defaultVal, key) => {
         // we only want to work on props which are actually passed to us for setting
         // WE DO NOT EVER SET DEFAULT VALUES EXCEPT WHEN A PASSED VALUE IS NULL
         if (serverConfig.hasOwnProperty(key)) {
@@ -80,14 +79,19 @@ export function setServerConfig(serverConfig:{[key:string]:any }){
                 }
             } else {
                 // for non booleans, only resolve to default if prop is missing or null
-                if (serverConfig.hasOwnProperty(key) && serverConfig[key] === null) {
+                if (
+                    serverConfig.hasOwnProperty(key) &&
+                    serverConfig[key] === null
+                ) {
                     serverConfig[key] = defaultVal;
                 }
             }
         }
     });
 
-    const frontendOverride = (serverConfig.frontendConfigOverride) ? JSON.parse(serverConfig.frontendConfigOverride) : {};
+    const frontendOverride = serverConfig.frontendConfigOverride
+        ? JSON.parse(serverConfig.frontendConfigOverride)
+        : {};
 
     // TODO: temp WARNING remove after we are done testing with AWS. This allows
     // one to change the backend api through the frontendConfigOverride file, so
@@ -99,31 +103,40 @@ export function setServerConfig(serverConfig:{[key:string]:any }){
     }
 
     // allow any hardcoded serverConfig props to override those from service
-    const mergedConfig = Object.assign({}, serverConfig, frontendOverride , config.serverConfig || {});
+    const mergedConfig = Object.assign(
+        {},
+        serverConfig,
+        frontendOverride,
+        config.serverConfig || {}
+    );
 
     config.serverConfig = mergedConfig;
-
 }
 
 export class ServerConfigHelpers {
-
-    @memoize static skin_example_study_queries(str:string){
+    @memoize static skin_example_study_queries(str: string) {
         const matches = str.match(/.+/g);
-        return (matches) ? matches.map((s:string)=>s.trim()) : [];
+        return matches ? matches.map((s: string) => s.trim()) : [];
     }
 
-    @memoize static parseConfigFormat(str:string|null): CategorizedConfigItems {
+    @memoize static parseConfigFormat(
+        str: string | null
+    ): CategorizedConfigItems {
         if (str && str.length) {
             // get rid of a trailing semicolon
-            str = str.replace(/;$/,"");
+            str = str.replace(/;$/, '');
             return _.chain(str)
-                .split(";").map((s)=>s.split("#")).fromPairs().mapValues((s)=>s.split(",")).value();
+                .split(';')
+                .map(s => s.split('#'))
+                .fromPairs()
+                .mapValues(s => s.split(','))
+                .value();
         } else {
             return {};
         }
     }
 
-    @memoize static parseQuerySetsOfGenes(json:string){
+    @memoize static parseQuerySetsOfGenes(json: string) {
         try {
             return JSON.parse(json);
         } catch (ex) {
@@ -131,26 +144,34 @@ export class ServerConfigHelpers {
         }
     }
 
-    static sessionServiceIsEnabled(){
+    static sessionServiceIsEnabled() {
         return config.serverConfig.sessionServiceEnabled;
     }
 
-    static getUserEmailAddress() : string | undefined {
-        return (config.serverConfig.user_email_address && config.serverConfig.user_email_address !== "anonymousUser") ?
-            config.serverConfig.user_email_address : undefined;
+    static getUserEmailAddress(): string | undefined {
+        return config.serverConfig.user_email_address &&
+            config.serverConfig.user_email_address !== 'anonymousUser'
+            ? config.serverConfig.user_email_address
+            : undefined;
     }
-
-};
-
-function cachePostMethods(obj: any,
-                          excluded: string[] = [],
-                          regex: RegExp = /UsingPOST$/)
-{
-    cachePostMethodsOnClient(obj, excluded, regex, AppConfig.serverConfig.api_cache_limit, sendSentryMessage, log);
 }
 
-export function initializeAPIClients(){
+function cachePostMethods(
+    obj: any,
+    excluded: string[] = [],
+    regex: RegExp = /UsingPOST$/
+) {
+    cachePostMethodsOnClient(
+        obj,
+        excluded,
+        regex,
+        AppConfig.serverConfig.api_cache_limit,
+        sendSentryMessage,
+        log
+    );
+}
 
+export function initializeAPIClients() {
     // we need to set the domain of our api clients
     (client as any).domain = getCbioPortalApiUrl();
     (internalClient as any).domain = getCbioPortalApiUrl();
@@ -161,7 +182,10 @@ export function initializeAPIClients(){
 
     // add POST caching
     cachePostMethods(CBioPortalAPI);
-    cachePostMethods(CBioPortalAPIInternal, ['fetchMutatedGenesUsingPOST', 'fetchCNAGenesUsingPOST']);
+    cachePostMethods(CBioPortalAPIInternal, [
+        'fetchMutatedGenesUsingPOST',
+        'fetchCNAGenesUsingPOST',
+    ]);
     cachePostMethods(CivicAPI);
     cachePostMethods(Genome2StructureAPI);
     cachePostMethods(GenomeNexusAPI, [], /POST$/);
@@ -177,10 +201,13 @@ export function initializeConfiguration() {
     if (localStorage.frontendConfig) {
         try {
             updateConfig(JSON.parse(localStorage.frontendConfig));
-            console.log("Using localStorage.frontendConfig (overriding window.frontendConfig): " + localStorage.frontendConfig);
+            console.log(
+                'Using localStorage.frontendConfig (overriding window.frontendConfig): ' +
+                    localStorage.frontendConfig
+            );
         } catch (err) {
             // ignore
-            console.log("Error parsing localStorage.frontendConfig")
+            console.log('Error parsing localStorage.frontendConfig');
         }
     }
 
@@ -193,39 +220,39 @@ export function initializeConfiguration() {
     // @ts-ignore: ENV_* are defined in webpack.config.js
     const frontendUrl = config.frontendUrl || `//${win.location.host}/`;
 
-    const configServiceUrl = config.configurationServiceUrl || `${APIROOT}config_service.jsp`;
+    const configServiceUrl =
+        config.configurationServiceUrl || `${APIROOT}config_service.jsp`;
 
     // should override both when in dev mode and when serving compiled source
     // code outside of legacy project
     // @ts-ignore: ENV_* are defined in webpack.config.js
-    if (IS_DEV_MODE || !(config.frontendUrl)) {
-    // @ts-ignore: ENV_* are defined in webpack.config.js
+    if (IS_DEV_MODE || !config.frontendUrl) {
+        // @ts-ignore: ENV_* are defined in webpack.config.js
         const envConfig: Partial<IAppConfig> = {
             configurationServiceUrl: configServiceUrl,
             apiRoot: APIROOT,
             frontendUrl: frontendUrl,
             serverConfig: {
-                genomenexus_url: GENOME_NEXUS_ROOT
-            } as IServerConfig
+                genomenexus_url: GENOME_NEXUS_ROOT,
+            } as IServerConfig,
         };
         updateConfig(envConfig);
     }
-
 }
 
-export function setConfigDefaults(){
+export function setConfigDefaults() {
     setServerConfig(ServerConfigDefaults);
 }
 
-export function fetchServerConfig(){
+export function fetchServerConfig() {
     return $.ajax({
         url: getConfigurationServiceApiUrl(),
-        dataType: "jsonp",
-        jsonpCallback: "callback"
+        dataType: 'jsonp',
+        jsonpCallback: 'callback',
     });
 }
 
-export function initializeAppStore(appStore:AppStore, config:IServerConfig) {
+export function initializeAppStore(appStore: AppStore, config: IServerConfig) {
     appStore.authMethod = config.authenticationMethod;
     appStore.userName = config.user_email_address;
 }
diff --git a/src/config/test.config.ts b/src/config/test.config.ts
index 5790697c689..29c68ad2309 100644
--- a/src/config/test.config.ts
+++ b/src/config/test.config.ts
@@ -1,8 +1,8 @@
-import {IAppConfig, IServerConfig} from "./IAppConfig";
+import { IAppConfig, IServerConfig } from './IAppConfig';
 
-const config:IAppConfig = {
+const config: IAppConfig = {
     //host: 'cbioportal-rc.herokuapp.com',
-    serverConfig:{} as IServerConfig
+    serverConfig: {} as IServerConfig,
 };
 
 export default config;
diff --git a/src/global.spec.ts b/src/global.spec.ts
index db3128dd79b..7724d2c9f24 100644
--- a/src/global.spec.ts
+++ b/src/global.spec.ts
@@ -1,36 +1,41 @@
-import CBioPortalAPI from "./shared/api/generated/CBioPortalAPI";
+import CBioPortalAPI from './shared/api/generated/CBioPortalAPI';
 import request from 'superagent';
 
-let clientStubs:any[];
+let clientStubs: any[];
 
 clientStubs = stubClient();
 
-request.get = (function(){
-    console.log(`Warning: calling stubbed method request.get, which returns a promise that never resolves.`);
-    return new Promise(()=>{});
-} as any);
-
-request.post = (function(){
-    console.log(`Warning: calling stubbed method request.post, which returns a promise that never resolves.`);
-    return new Promise(()=>{});
-} as any);
-
-
-function stubClient():any[] {
+request.get = function() {
+    console.log(
+        `Warning: calling stubbed method request.get, which returns a promise that never resolves.`
+    );
+    return new Promise(() => {});
+} as any;
+
+request.post = function() {
+    console.log(
+        `Warning: calling stubbed method request.post, which returns a promise that never resolves.`
+    );
+    return new Promise(() => {});
+} as any;
+
+function stubClient(): any[] {
     // returns stubs
 
     var target = CBioPortalAPI;
 
-    const stubs:any[] = [];
+    const stubs: any[] = [];
 
     var arrObj = Object.getOwnPropertyNames(target.prototype);
-    for( var funcKey in arrObj ) {
+    for (var funcKey in arrObj) {
         var methodName = arrObj[funcKey];
 
-        (CBioPortalAPI.prototype as any)[methodName] = function(){
-            console.log(`Warning: calling stubbed method cbioportalClient.${methodName}, which returns a promise that never resolves.`);
-        }
+        (CBioPortalAPI.prototype as any)[methodName] = function() {
+            console.log(
+                `Warning: calling stubbed method cbioportalClient.${methodName}, which returns a promise that never resolves.`
+            );
+        };
     }
 
     return stubs;
-}
\ No newline at end of file
+}
diff --git a/src/globalStyles/bootstrap-entry.scss b/src/globalStyles/bootstrap-entry.scss
index 84f4b9c719e..d20c7c63826 100644
--- a/src/globalStyles/bootstrap-entry.scss
+++ b/src/globalStyles/bootstrap-entry.scss
@@ -1,9 +1,5 @@
 @import './variables.scss';
 
 .cbioportal-frontend {
-
-  @import '../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap';
-
+    @import '../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap';
 }
-
-
diff --git a/src/globalStyles/custom-icons.scss b/src/globalStyles/custom-icons.scss
index 4345d6d6e4e..ba354083625 100644
--- a/src/globalStyles/custom-icons.scss
+++ b/src/globalStyles/custom-icons.scss
@@ -1,13 +1,11 @@
 .ci {
-
-  &.ci-pie-chart {
-    background: url("./images/study-view.svg");
-    -webkit-background-size: 12px 12px;
-    background-size: 12px 12px;
-    width: 12px;
-    height: 12px;
-    display: inline-block;
-    vertical-align:text-top;
-  }
-
-}
\ No newline at end of file
+    &.ci-pie-chart {
+        background: url('./images/study-view.svg');
+        -webkit-background-size: 12px 12px;
+        background-size: 12px 12px;
+        width: 12px;
+        height: 12px;
+        display: inline-block;
+        vertical-align: text-top;
+    }
+}
diff --git a/src/globalStyles/e2etest.scss b/src/globalStyles/e2etest.scss
index 5d47d5b8321..21c68a1d0c8 100644
--- a/src/globalStyles/e2etest.scss
+++ b/src/globalStyles/e2etest.scss
@@ -1,28 +1,28 @@
 .e2etest {
-  input:focus, select:focus {
-    outline:none !important;
-    box-shadow:none !important;
-    border-color: $borderColor !important;
-  }
+    input:focus,
+    select:focus {
+        outline: none !important;
+        box-shadow: none !important;
+        border-color: $borderColor !important;
+    }
 
-  .simple-table tbody>tr:nth-of-type(odd).clickable:hover {
-    background-color: #F9F9F9 !important;
-  }
+    .simple-table tbody > tr:nth-of-type(odd).clickable:hover {
+        background-color: #f9f9f9 !important;
+    }
 
-  .simple-table tbody>tr:nth-of-type(even).clickable:hover {
-    background-color: #FFFFFF !important;
-  }
+    .simple-table tbody > tr:nth-of-type(even).clickable:hover {
+        background-color: #ffffff !important;
+    }
 
-  .oncoprintjs__tooltip {
-    display:none !important;
-  }
+    .oncoprintjs__tooltip {
+        display: none !important;
+    }
 
-  .plotsTab .cbioTooltip.popover {
-    opacity:0 !important;
-  }
-
-  .disablePointerEvents {
-    pointer-events: none;
-  }
+    .plotsTab .cbioTooltip.popover {
+        opacity: 0 !important;
+    }
 
+    .disablePointerEvents {
+        pointer-events: none;
+    }
 }
diff --git a/src/globalStyles/global.scss b/src/globalStyles/global.scss
index 4fd8d678c15..d0080f6196c 100755
--- a/src/globalStyles/global.scss
+++ b/src/globalStyles/global.scss
@@ -4,634 +4,607 @@
 
 /* locks scroll bar on to prevent horizontal jump when content render */
 body {
-  overflow-y:scroll;
-  text-align:left;
-  margin:0;
-  padding:0;
+    overflow-y: scroll;
+    text-align: left;
+    margin: 0;
+    padding: 0;
 }
 
 //get rid of blue border around active button
-button:active, button:focus, div:focus, div:active {
-  outline: none !important;
+button:active,
+button:focus,
+div:focus,
+div:active {
+    outline: none !important;
 }
 
-
-
 .form-group {
-  margin-bottom:5px;
+    margin-bottom: 5px;
 
-  label {
-    font-size:12px;
-    margin-bottom:2px;
-  }
+    label {
+        font-size: 12px;
+        margin-bottom: 2px;
+    }
 }
 
 .posRelative {
-  position:relative;
+    position: relative;
 }
 
 /* importants are necessary for override of legacy style */
 .btn-default {
-  background-image: linear-gradient(to bottom,#fff 0,#eee 100%) !important;
-  color:$text-color !important;
+    background-image: linear-gradient(to bottom, #fff 0, #eee 100%) !important;
+    color: $text-color !important;
 }
 
 .btn.noBorderRadius {
-  -webkit-border-radius: 0 !important;
-  -moz-border-radius: 0 !important;
-  border-radius: 0 !important;
+    -webkit-border-radius: 0 !important;
+    -moz-border-radius: 0 !important;
+    border-radius: 0 !important;
 }
 
 a {
-  cursor:pointer;
-  text-decoration:none;
+    cursor: pointer;
+    text-decoration: none;
 }
 
 a:hover {
-  text-decoration:underline;
+    text-decoration: underline;
 }
 
 .pipeSeperator {
-  margin:0 8px;
+    margin: 0 8px;
 }
 
 /* Buttons */
 
-.cta { // "Call To Action"
-  background: linear-gradient(to bottom, #1f8cc5 50%, #1982b8 100%);
-  border: 0;
-  border-bottom: 1px solid rgba(0,0,0,0.2);
-  border-radius: 2px;
-  color: rgba(255, 255, 255, 1);
-  display: block;
-  text-align: center;
-  font: normal normal 500 11px/19px 'Helvetica Neue', Helvetica, Arial, sans-serif;
-  padding: 5px 10px;
-
-  &:hover:not(:disabled) {
-    cursor: pointer;
-    background: linear-gradient(to bottom, #1982b8 50%, #1f8cc5 100%);
-    color: #fff;
-  }
-  &:disabled {
-    cursor: default;
-    background: $lightGrey;
-    border-bottom: 0;
-    color: $darkGrey;
-  }
+.cta {
+    // "Call To Action"
+    background: linear-gradient(to bottom, #1f8cc5 50%, #1982b8 100%);
+    border: 0;
+    border-bottom: 1px solid rgba(0, 0, 0, 0.2);
+    border-radius: 2px;
+    color: rgba(255, 255, 255, 1);
+    display: block;
+    text-align: center;
+    font: normal normal 500 11px/19px 'Helvetica Neue', Helvetica, Arial,
+        sans-serif;
+    padding: 5px 10px;
+
+    &:hover:not(:disabled) {
+        cursor: pointer;
+        background: linear-gradient(to bottom, #1982b8 50%, #1f8cc5 100%);
+        color: #fff;
+    }
+    &:disabled {
+        cursor: default;
+        background: $lightGrey;
+        border-bottom: 0;
+        color: $darkGrey;
+    }
 }
 
 /* Tables */
 th.reactable-header-sortable {
-
-  &:focus {outline:0;}
-
+    &:focus {
+        outline: 0;
+    }
 }
 
 th.reactable-header-sort-desc:after {
-  content: '\25B2';
-  padding-left: 10px;
-  padding-bottom: 5px;
+    content: '\25B2';
+    padding-left: 10px;
+    padding-bottom: 5px;
 }
 
 th.reactable-header-sort-asc:after {
-  content: '\25BC';
-  padding-left: 10px;
-  padding-bottom: 5px;
+    content: '\25BC';
+    padding-left: 10px;
+    padding-bottom: 5px;
 }
 
 .table-border-top .reactable-column-header {
-
-  th {
-
-  }
-
+    th {
+    }
 }
 
 #content {
-  margin-top:8px;
+    margin-top: 8px;
 }
 
 /* override for rc-tooltip */
 
 .rc-tooltip {
-  opacity:1 !important;
+    opacity: 1 !important;
 
-  &.hideTooltipArrow {
-    .rc-tooltip-arrow {
-      display:none;
+    &.hideTooltipArrow {
+        .rc-tooltip-arrow {
+            display: none;
+        }
     }
-  }
 
-  &.rc-tooltip-placement-topRight {
-    .rc-tooltip-arrow {
-      right: 5px !important;
+    &.rc-tooltip-placement-topRight {
+        .rc-tooltip-arrow {
+            right: 5px !important;
+        }
     }
-  }
-
 }
 
 .secondaryNavigation {
-
-  > div, > ul {
-    border-bottom:none !important;
-    margin-top:-19px;
-    padding-left:20px;
-    margin-left:-20px;
-  }
-
-  > ul, > div {
-    margin-right:-20px;
-    box-shadow:0px 1px 2px 0px rgba(0,0,0,0.08);
-  }
-
-  li {
-    a {
-      font-size:$font-size-small;
-      padding: 8px 0px !important;
-      margin-right: 25px !important;
-      background:none !important;
-      border:none !important;
-
-      &:hover {
-        text-decoration: underline;
-      }
-
+    > div,
+    > ul {
+        border-bottom: none !important;
+        margin-top: -19px;
+        padding-left: 20px;
+        margin-left: -20px;
     }
 
-    &.active a {
-      border-bottom:2px solid $brand-primary !important;
-      padding-bottom: 6px !important;
+    > ul,
+    > div {
+        margin-right: -20px;
+        box-shadow: 0px 1px 2px 0px rgba(0, 0, 0, 0.08);
     }
 
-  }
+    li {
+        a {
+            font-size: $font-size-small;
+            padding: 8px 0px !important;
+            margin-right: 25px !important;
+            background: none !important;
+            border: none !important;
+
+            &:hover {
+                text-decoration: underline;
+            }
+        }
 
-  .tab-content {
-    margin-top:$standardMargin;
-  }
+        &.active a {
+            border-bottom: 2px solid $brand-primary !important;
+            padding-bottom: 6px !important;
+        }
+    }
 
+    .tab-content {
+        margin-top: $standardMargin;
+    }
 }
 
 .pillTabs {
-  > .nav.nav-pills {
-
-    margin-bottom:$standardMargin;
-
-    li {
-
-      margin-bottom:2px;
-      padding-right: 8px;
-
-      a {
-        background: #eee;
-        border-top: none !important;
-      }
-
-      &.active a {
-        background:$brand-primary;
-        border-top:none !important;
-        &:hover {
-          color:#fff !important;
+    > .nav.nav-pills {
+        margin-bottom: $standardMargin;
+
+        li {
+            margin-bottom: 2px;
+            padding-right: 8px;
+
+            a {
+                background: #eee;
+                border-top: none !important;
+            }
+
+            &.active a {
+                background: $brand-primary;
+                border-top: none !important;
+                &:hover {
+                    color: #fff !important;
+                }
+            }
         }
-      }
     }
-  }
-
-  li a {
-    font-size: 12px;
-    padding: 10px 6px !important;
-    cursor: pointer;
-    line-height: 0.8px;
-  }
 
-  .msk-tab {
-    margin-top:10px;
-  }
+    li a {
+        font-size: 12px;
+        padding: 10px 6px !important;
+        cursor: pointer;
+        line-height: 0.8px;
+    }
 
+    .msk-tab {
+        margin-top: 10px;
+    }
 }
 
 .mainTabs {
+    > .nav {
+        @extend .portalWidth;
+        margin: 0 auto;
+        position: relative;
+        z-index: 1;
 
-  > .nav {
-    @extend .portalWidth;
-    margin:0 auto;
-    position:relative;
-    z-index:1;
-
-    background:$main-bg !important;
-
-    display:flex;
+        background: $main-bg !important;
 
-    > li {
-      white-space:nowrap;
+        display: flex;
 
-      &:not(.active) {
-       a:hover {
-         background:none !important;
-         border-color:transparent !important;
-       }
-      }
+        > li {
+            white-space: nowrap;
 
-    }
+            &:not(.active) {
+                a:hover {
+                    background: none !important;
+                    border-color: transparent !important;
+                }
+            }
+        }
 
-    .active {
-      a {
-        border-top: 3px solid $brand-primary !important;
-        padding-top: 9px;
-        text-decoration:none !important;
-      }
+        .active {
+            a {
+                border-top: 3px solid $brand-primary !important;
+                padding-top: 9px;
+                text-decoration: none !important;
+            }
+        }
     }
 
-  }
-
-  > .tab-content {
-    padding:20px 0 20px 0;
-    background:#fff;
-    border-top:1px solid #ddd;
-    margin-top:-1px;
-    min-height:50px;
-    position:relative;
-
-    .tabLoader {
-      position:relative;
-      left:50%;
-      top:50%;
-    }
+    > .tab-content {
+        padding: 20px 0 20px 0;
+        background: #fff;
+        border-top: 1px solid #ddd;
+        margin-top: -1px;
+        min-height: 50px;
+        position: relative;
+
+        .tabLoader {
+            position: relative;
+            left: 50%;
+            top: 50%;
+        }
 
-    hr {
-      margin-top:5px;
-      margin-bottom:20px;
-    }
+        hr {
+            margin-top: 5px;
+            margin-bottom: 20px;
+        }
 
-    > .msk-tab {
-      @extend .portalWidth;
-      margin: 0 auto;
+        > .msk-tab {
+            @extend .portalWidth;
+            margin: 0 auto;
+        }
     }
-
-  }
-
 }
 
 .urlError {
-  width:500px;
-  margin:0 auto;
-  text-align:center;
-  i.fa-warning {
-    font-size:80px;
-  }
-  h3 {
-    margin-bottom:20px;
-  }
-  ul {
-    list-style:none;
-    li {
-      padding-bottom:7px;
+    width: 500px;
+    margin: 0 auto;
+    text-align: center;
+    i.fa-warning {
+        font-size: 80px;
+    }
+    h3 {
+        margin-bottom: 20px;
+    }
+    ul {
+        list-style: none;
+        li {
+            padding-bottom: 7px;
+        }
     }
-  }
 }
 
 .queryInvalid {
-  width:800px;
-  margin:0 auto;
-  text-align:center;
+    width: 800px;
+    margin: 0 auto;
+    text-align: center;
 }
 
 .table tbody tr td {
-  padding:3px 10px !important;
-  border-top:none;
+    padding: 3px 10px !important;
+    border-top: none;
 }
 
 .table {
-  margin-bottom: 5px;
+    margin-bottom: 5px;
 }
 
 .hiddenByPosition {
-  position: absolute;
-  top: -9999px;
-  left: -9999px;
+    position: absolute;
+    top: -9999px;
+    left: -9999px;
 }
 
 // corrects for a problem with build of react-bootstrap and react-select (unicode corrupted when build on linux  machines)
 .Select--multi .Select-value-icon {
-
-  text-indent: -9999px;
-  line-height: 0; /* Collapse the original line */
-
-  &::after {
-    content:"✖";
-    text-indent: 0;
-    display: block;
-    line-height: initial; /* New content takes up original line height */
-  }
+    text-indent: -9999px;
+    line-height: 0; /* Collapse the original line */
+
+    &::after {
+        content: '✖';
+        text-indent: 0;
+        display: block;
+        line-height: initial; /* New content takes up original line height */
+    }
 }
 
 .modal-header .close {
-  &::before {
-    content: "✖";
-  }
-  span {
-    display:none;
-  }
+    &::before {
+        content: '✖';
+    }
+    span {
+        display: none;
+    }
 }
 
 .subhead-dark #mainColumn {
-
 }
 
 .headBlock {
+    background: $main-bg;
+    margin-top: -$gutterWidth;
+    position: relative;
+    padding-top: 10px;
+    padding-left: $gutterWidth;
+    padding-right: $gutterWidth;
+    padding-bottom: 10px;
 
-  background:$main-bg;
-  margin-top:-$gutterWidth;
-  position:relative;
-  padding-top:10px;
-  padding-left:$gutterWidth;
-  padding-right:$gutterWidth;
-  padding-bottom:10px;
-
-  &:empty {
-    padding-bottom:0;
-  }
-
-  .headBlurb {
-    padding:0 $gutterWidth 10px $gutterWidth;
-  }
+    &:empty {
+        padding-bottom: 0;
+    }
 
+    .headBlurb {
+        padding: 0 $gutterWidth 10px $gutterWidth;
+    }
 }
 
 #mainColumn {
-  padding-top: $gutterWidth;
+    padding-top: $gutterWidth;
 }
 
 .fixedWidth {
-  #mainColumn {
-    flex:1;
-    padding-left:0;
-    padding-right:0;
-    line-height:26px;
-  }
-
-  .contentWrapper {
-
-  }
-
-  header {
-    padding-left:0;
-    padding-right:0;
-  }
+    #mainColumn {
+        flex: 1;
+        padding-left: 0;
+        padding-right: 0;
+        line-height: 26px;
+    }
 
-  &.twoColumn {
     .contentWrapper {
-      //.contentWidth {
-      //  padding-right: 0;
-      //}
     }
-  }
 
+    header {
+        padding-left: 0;
+        padding-right: 0;
+    }
+
+    &.twoColumn {
+        .contentWrapper {
+            //.contentWidth {
+            //  padding-right: 0;
+            //}
+        }
+    }
 }
 
 .twoColumn {
-  #mainColumn {
-    padding-right: $gutterWidth;
-  }
+    #mainColumn {
+        padding-right: $gutterWidth;
+    }
 }
 
 h1 {
-  margin-top:30px !important;
-  font-family:Helvetica Neue, Helvetica, Arial, sans-serif !important;
-  margin-bottom:10px !important;
-}
-
-h1, h2, h3, h4, h5, h6 {
-  color:$headerColor !important;
-  &:first-child {
-    margin-top:0 !important;
-  }
+    margin-top: 30px !important;
+    font-family: Helvetica Neue, Helvetica, Arial, sans-serif !important;
+    margin-bottom: 10px !important;
+}
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+    color: $headerColor !important;
+    &:first-child {
+        margin-top: 0 !important;
+    }
 }
 
 h1 {
-  font-size:24px;
+    font-size: 24px;
 }
 
 h2 {
-  font-size:20px;
+    font-size: 20px;
 }
 
 h3 {
-  font-size:16px;
+    font-size: 16px;
 }
 
-
 #rightColumn {
-  background:$lightBlue;
-  padding:$gutterWidth 0;
-  font-size:12px;
-  flex:0 0 325px;
-  border-right:1px solid $borderColor;
-  border-left:1px solid $borderColor;
-
-  .rightBarSection {
-    h3 {
-      border-bottom:1px solid #ddd;
-      margin: 0 0 4px 0;
-      padding-bottom:4px;
-      color:$brand-primary;
+    background: $lightBlue;
+    padding: $gutterWidth 0;
+    font-size: 12px;
+    flex: 0 0 325px;
+    border-right: 1px solid $borderColor;
+    border-left: 1px solid $borderColor;
+
+    .rightBarSection {
+        h3 {
+            border-bottom: 1px solid #ddd;
+            margin: 0 0 4px 0;
+            padding-bottom: 4px;
+            color: $brand-primary;
+        }
+        padding: 0 $gutterWidth 10px $gutterWidth;
     }
-    padding: 0 $gutterWidth 10px $gutterWidth;
-  }
-
-  .exampleQueries {
-    ul {
-      margin:0 0 0 15px;
-      padding:0;
 
-      li {
-        color:#cfd9ea;
-        text-indent:-3px;
-      }
+    .exampleQueries {
+        ul {
+            margin: 0 0 0 15px;
+            padding: 0;
 
+            li {
+                color: #cfd9ea;
+                text-indent: -3px;
+            }
+        }
     }
-  }
-
 }
 
-
-
 .fixedWidth .contentWidth {
-  width:1200px;
-  padding-left:20px;
-  padding-right:20px;
-  margin:0 auto;
+    width: 1200px;
+    padding-left: 20px;
+    padding-right: 20px;
+    margin: 0 auto;
 }
 
-
 .noMargin {
-  .contentWidth {
-    padding-left: 0;
-    padding-right: 0;
-  }
-  header {
-    padding-left:20px;
-    padding-right:20px;
-  }
+    .contentWidth {
+        padding-left: 0;
+        padding-right: 0;
+    }
+    header {
+        padding-left: 20px;
+        padding-right: 20px;
+    }
 }
 
 .mainContainer {
-  display:flex;
-  flex-direction:column;
-
+    display: flex;
+    flex-direction: column;
 }
 
 .contentWidth {
-  display:flex;
-  justify-content:space-between;
-  padding-left:20px;
-  padding-right:20px;
-
-  #mainColumn {
-    flex:1;
-    padding-left:0;
-    min-height:80vh;
-    max-width: 100%;
-  }
-
-  &.noMargin {
-    padding-left:0;
-    padding-right:0;
-  }
+    display: flex;
+    justify-content: space-between;
+    padding-left: 20px;
+    padding-right: 20px;
+
+    #mainColumn {
+        flex: 1;
+        padding-left: 0;
+        min-height: 80vh;
+        max-width: 100%;
+    }
 
+    &.noMargin {
+        padding-left: 0;
+        padding-right: 0;
+    }
 }
 
 .alert {
-  border-color:#ddd;
-  color:inherit;
+    border-color: #ddd;
+    color: inherit;
 }
 
 .alert-info {
-  background:$lightBlue;
+    background: $lightBlue;
 }
 
 .borderedChart {
-  padding:10px;
-  border-radius:$cornerBorderRadius;
-  border:1px dashed $borderColor;
-  position:relative;
-  max-width:100%;
-
-  .chartDownloadButtons {
-    position:absolute;
-    right:10px !important;
-    top:10px !important;
-    z-index:10;
-  }
+    padding: 10px;
+    border-radius: $cornerBorderRadius;
+    border: 1px dashed $borderColor;
+    position: relative;
+    max-width: 100%;
 
+    .chartDownloadButtons {
+        position: absolute;
+        right: 10px !important;
+        top: 10px !important;
+        z-index: 10;
+    }
 }
 
 h3.hr {
-  margin:0 30px;
-  border:1px dashed $borderColor !important;
+    margin: 0 30px;
+    border: 1px dashed $borderColor !important;
 }
 
 .popover {
+    &.cbioTooltip {
+        position: absolute !important;
+        display: block !important;
+        max-width: 600px !important;
+        div:last-child {
+            white-space: nowrap;
+        }
 
-  &.cbioTooltip {
-
-    position:absolute !important;
-    display:block !important;
-    max-width:600px !important;
-    div:last-child {
-      white-space: nowrap;
-    }
-
-    p {
-      margin-bottom:0 !important;
-    }
+        p {
+            margin-bottom: 0 !important;
+        }
 
-    .popover-content, p, td {
-      font-size:11px !important;
+        .popover-content,
+        p,
+        td {
+            font-size: 11px !important;
+        }
     }
-  }
-
 }
 
 .inlineBlock {
-  display:inline-block;
+    display: inline-block;
 }
 
 .noOqlWarning {
-  color:#74bedb;
+    color: #74bedb;
 }
 
 .tabMessageContainer {
-  padding-bottom:$standardMargin;
-  &:empty {
-    display:none;
-  }
-
-  >:last-child {
-    margin-bottom:0 !important;
-  }
+    padding-bottom: $standardMargin;
+    &:empty {
+        display: none;
+    }
 
+    > :last-child {
+        margin-bottom: 0 !important;
+    }
 }
 
 .alert {
-  padding:5px 10px !important;
+    padding: 5px 10px !important;
 }
 
-
 .whiteBackground {
-  background:#fff;
+    background: #fff;
 }
 
 .form-group.form-group-custom {
-  margin-right:15px;
-  padding-right:15px;
-  border-right:1px dashed $borderColor;
-  display:flex !important;
-  align-items: center;
-
-  h5 {
-    font-weight:bold !important;
-    margin-right:5px;
-  }
-
-  &:last-child {
-    border-right:none;
-  }
+    margin-right: 15px;
+    padding-right: 15px;
+    border-right: 1px dashed $borderColor;
+    display: flex !important;
+    align-items: center;
+
+    h5 {
+        font-weight: bold !important;
+        margin-right: 5px;
+    }
 
+    &:last-child {
+        border-right: none;
+    }
 }
 
 .studyViewHeader {
-  margin-top:$gutterWidth;
+    margin-top: $gutterWidth;
 }
 
 .staticPage {
-  padding-bottom: $gutterWidth;
+    padding-bottom: $gutterWidth;
 
-  .markdown-body {
-    h1 {
-      display:none !important;
-    }
+    .markdown-body {
+        h1 {
+            display: none !important;
+        }
 
-    h2 {
-      font-size:20px;
-    }
+        h2 {
+            font-size: 20px;
+        }
 
-    h3 {
-      font-size:18px;
+        h3 {
+            font-size: 18px;
+        }
     }
-
-  }
-
 }
 
 .beta-text {
-  color:#ffA500;
-  text-decoration: none;
+    color: #ffa500;
+    text-decoration: none;
 }
 
 .text-with-ellipsis {
-  white-space: nowrap;
-  overflow: hidden;
-  -ms-text-overflow: ellipsis;
-  text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+    -ms-text-overflow: ellipsis;
+    text-overflow: ellipsis;
 }
diff --git a/src/globalStyles/header.scss b/src/globalStyles/header.scss
index da146eae92b..b0660355882 100644
--- a/src/globalStyles/header.scss
+++ b/src/globalStyles/header.scss
@@ -1,203 +1,203 @@
 #login_header_top {
-  padding:5px 0px 0px 0px;
-  background: white;
-  margin:0px;
-  height:70px;
+    padding: 5px 0px 0px 0px;
+    background: white;
+    margin: 0px;
+    height: 70px;
 }
 
 header {
-  position: relative;
-  padding:10px 0;
-  width:100%;
-  display:flex !important;
-  align-items: center;
-  justify-content: space-between;
+    position: relative;
+    padding: 10px 0;
+    width: 100%;
+    display: flex !important;
+    align-items: center;
+    justify-content: space-between;
 }
 
 .legacy header {
-  margin:0;
-  box-sizing:border-box !important;
-  text-align:left;
+    margin: 0;
+    box-sizing: border-box !important;
+    text-align: left;
 }
 
 .pageTopContainer {
-  background:#eee;
-  border-bottom: 1px solid #ddd;
+    background: #eee;
+    border-bottom: 1px solid #ddd;
 }
 
-.pageTopContainer, #reactRoot {
-
+.pageTopContainer,
+#reactRoot {
 }
 
 #reactRoot {
-  min-height:600px;
+    min-height: 600px;
 }
 
 /* override for new layout */
 .pageTopContainer header {
-  background:none;
-
+    background: none;
 }
 
 .pageTopContainer header #authentication p {
-  margin-right:0;
+    margin-right: 0;
 }
 
-
 #cbioportal-logo img {
-  height:40px;
-  width:177px;
+    height: 40px;
+    width: 177px;
 }
 
 #institute-logo {
-  max-height: 40px;
-  max-width:200px;
-  margin-left:10px;
+    max-height: 40px;
+    max-width: 200px;
+    margin-left: 10px;
 }
 
 #rightHeaderContent {
-  display:flex;
-  align-items:center;
-  color:#777;
+    display: flex;
+    align-items: center;
+    color: #777;
 }
 
 #rightHeaderContent .username {
-  max-width:150px;
-  text-overflow:ellipsis;
-  overflow:hidden;
-  white-space:nowrap;
+    max-width: 150px;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
 }
 
 #rightHeaderContent .userControls a {
-  color:#3786C2 !important;
+    color: #3786c2 !important;
 }
 
 #leftHeaderContent {
-  display:flex;
-  align-items:center;
+    display: flex;
+    align-items: center;
 }
 
 .userControls {
-  position:relative;
+    position: relative;
 }
 
 .userControls i.fa {
-  font-size:20px;
-  color:#999;
-  vertical-align:middle;
+    font-size: 20px;
+    color: #999;
+    vertical-align: middle;
 }
 
 .userControls .identity {
-  position:absolute;
-  display:none;
-  white-space:nowrap;
-  display:none;
-  align-items:center;
-  top:-6px;
-  right:-7px;
-  z-index:2;
-  border:1px solid #ddd;
-  padding:5px 10px;
-  background:#fff;
-  font-size:12px; border-radius:4px
+    position: absolute;
+    display: none;
+    white-space: nowrap;
+    display: none;
+    align-items: center;
+    top: -6px;
+    right: -7px;
+    z-index: 2;
+    border: 1px solid #ddd;
+    padding: 5px 10px;
+    background: #fff;
+    font-size: 12px;
+    border-radius: 4px;
 }
 
 .userControls:hover .identity {
-  display:block;
+    display: block;
 }
 
 #main-nav {
-  padding-bottom:0;
-  margin-left:40px;
-  white-space:nowrap;
+    padding-bottom: 0;
+    margin-left: 40px;
+    white-space: nowrap;
 }
 
 #main-nav ul {
-  padding:0;
-  margin:0;
+    padding: 0;
+    margin: 0;
 }
 
 #main-nav:first-child {
-  top:-22px;
+    top: -22px;
 }
 
 #main-nav li {
-  list-style-type: none;
-  display: inline-block;
-  font: normal normal 400 14px/18px 'Helvetica Neue', Helvetica, Verdana, Arial, sans-serif;
-  margin-left:15px;
+    list-style-type: none;
+    display: inline-block;
+    font: normal normal 400 14px/18px 'Helvetica Neue', Helvetica, Verdana,
+        Arial, sans-serif;
+    margin-left: 15px;
 }
 
-#main-nav li a:link, #main-nav li a:visited {
-  color: #777;
+#main-nav li a:link,
+#main-nav li a:visited {
+    color: #777;
 }
 
 #main-nav li a:hover {
-  color: #000;
-  text-decoration:none;
+    color: #000;
+    text-decoration: none;
 }
 
 #main-nav li a.selected {
-  color: #3786C2;
-  border-bottom: 2px solid #3786C2;
-  padding-bottom:4px;
-  text-decoration:none !important;
-  cursor:text;
+    color: #3786c2;
+    border-bottom: 2px solid #3786c2;
+    padding-bottom: 4px;
+    text-decoration: none !important;
+    cursor: text;
 }
 
-
 #footer {
-  text-align:center;
-  padding:30px;
-  opacity:.5;
+    text-align: center;
+    padding: 30px;
+    opacity: 0.5;
 }
 
 .legacy #page_wrapper {
-  margin:0;
+    margin: 0;
 }
 
 .legacy body {
-  background-color:#fff;
+    background-color: #fff;
 }
 
 .legacy #td-content {
-  background-color:#fff;
+    background-color: #fff;
 }
 
 .legacy #content > table {
-  width:100%;
+    width: 100%;
 }
 
 .legacy .modal-header .close span {
-  display:none;
+    display: none;
 }
 
 .legacy .modal-header .close:before {
-  content: "x";
+    content: 'x';
 }
 
 .legacy #querySelector {
-  font-size:14px;
+    font-size: 14px;
 }
 
 .contentWidth {
-  min-width:1200px;
+    min-width: 1200px;
 }
 
 .legacy .contentWidth {
-  padding-left:20px;
-  padding-right:20px;
+    padding-left: 20px;
+    padding-right: 20px;
 }
 
 .legacy .fixedWidth .contentWidth {
-  width:1200px;
-  padding-left:20px;
-  padding-right:20px;
-  margin:0 auto;
+    width: 1200px;
+    padding-left: 20px;
+    padding-right: 20px;
+    margin: 0 auto;
 }
 
 .noMargin .pageTopContainer header {
-  margin-right:20px;
+    margin-right: 20px;
 }
 
 /*.legacy body > center {*/
@@ -205,18 +205,18 @@ header {
 /*}*/
 
 .legacy #footer {
-  background:#fff;
-  border-top:none;
+    background: #fff;
+    border-top: none;
 }
 
 .legacy .ui-tabs .ui-tabs-nav li a {
-  padding:.5em .8em !important;
+    padding: 0.5em 0.8em !important;
 }
 
 .legacy #cc-bookmark {
-  word-break:break-word;
+    word-break: break-word;
 }
 
 .legacy .studyContainer .contentWidth {
-  width:1300px;
+    width: 1300px;
 }
diff --git a/src/globalStyles/legacy-template.scss b/src/globalStyles/legacy-template.scss
index 4524377e24b..384adcf19c7 100644
--- a/src/globalStyles/legacy-template.scss
+++ b/src/globalStyles/legacy-template.scss
@@ -1,45 +1,42 @@
 .isolateNetwork #tabs {
-  border:none;
-  position:absolute;
-  top:0;
-  left:0;
-  z-index:0;
+    border: none;
+    position: absolute;
+    top: 0;
+    left: 0;
+    z-index: 0;
 }
 
 .isolateNetwork #network {
-  display:block !important;
+    display: block !important;
 }
 
 .isolateNetwork #tabs > .ui-tabs-nav {
-  display:none;
+    display: none;
 }
 
 .isolateNetwork .main_smry {
-  display:none;
+    display: none;
 }
 
 .isolateNetwork #footer {
-  display:none;
+    display: none;
 }
 
 .isolateNetwork .ui-tabs-panel#network {
-  padding:0 !important;
-  margin:0;
-  height:auto;
+    padding: 0 !important;
+    margin: 0;
+    height: auto;
 }
 
 .isolateNetwork #vis_content {
-  width:827px;
-  border:none;
+    width: 827px;
+    border: none;
 }
 
 .isolateNetwork .pageTopContainer {
-  display:none;
+    display: none;
 }
 
 body.isolateNetwork {
-  overflow:hidden;
+    overflow: hidden;
 }
-
-
-
diff --git a/src/globalStyles/legacy.scss b/src/globalStyles/legacy.scss
index f4c2a7ffeba..00ee2cba232 100644
--- a/src/globalStyles/legacy.scss
+++ b/src/globalStyles/legacy.scss
@@ -1,26 +1,25 @@
 /* legacy fixes */
 #mutex {
-  margin-top:10px;
-  .btn i {
-    line-height:1.5 !important;
-  }
+    margin-top: 10px;
+    .btn i {
+        line-height: 1.5 !important;
+    }
 }
 
 button {
-  marginBottom:0 !important;
+    marginbottom: 0 !important;
 }
 
 .radio-inline {
-  line-height:1.42857143 !important;
+    line-height: 1.42857143 !important;
 }
 
 #main_smry_info_div {
-  font-size:14px;
+    font-size: 14px;
 }
 
-
 .h4 {
-  font-size:18px !important;
-  font-weight:500 !important;
-  letter-spacing:normal !important;
+    font-size: 18px !important;
+    font-weight: 500 !important;
+    letter-spacing: normal !important;
 }
diff --git a/src/globalStyles/prefixed-global.scss b/src/globalStyles/prefixed-global.scss
index 8aaed0af6a1..d89c64c987c 100644
--- a/src/globalStyles/prefixed-global.scss
+++ b/src/globalStyles/prefixed-global.scss
@@ -1,15 +1,11 @@
 .cbioportal-frontend {
-
-  @import './global.scss';
-
+    @import './global.scss';
 }
 
 .legacy {
-  .cbioportal-frontend {
-    @import './legacy.scss';
-  }
+    .cbioportal-frontend {
+        @import './legacy.scss';
+    }
 }
 
-
-
 @import './e2etest.scss';
diff --git a/src/globalStyles/variables.scss b/src/globalStyles/variables.scss
index 8d774f1c387..14b7e4cfe56 100644
--- a/src/globalStyles/variables.scss
+++ b/src/globalStyles/variables.scss
@@ -7,12 +7,12 @@ $font-size-base: 14px !default;
 
 $main-bg: #f5f5f5;
 
-$cream: #F6F4EF;
-$darkCream: #ECE7DB;
-$darkestCream: #DAD1BC;
+$cream: #f6f4ef;
+$darkCream: #ece7db;
+$darkestCream: #dad1bc;
 $darkBrown: #585755;
 
-$lightBlue: #F1F6FE;
+$lightBlue: #f1f6fe;
 $mediumBlue: #1982b8;
 
 $lightGrey: #ececec;
@@ -22,31 +22,29 @@ $darkGrey: #999;
 $redError: #a71111;
 $greenSuccess: #11a747;
 
-.portalWidth{
-  padding-left:20px;
-  padding-right:20px;
-  min-width:400px;
+.portalWidth {
+    padding-left: 20px;
+    padding-right: 20px;
+    min-width: 400px;
 }
 
 $gutterWidth: 20px;
 
-$brand-primary: #3786C2;
+$brand-primary: #3786c2;
 
-$borderColor:$mediumGrey;
+$borderColor: $mediumGrey;
 
-$headerColor: #3786C2;
+$headerColor: #3786c2;
 
 $cornerBorderRadius: 5px;
 
-$standardMargin:15px;
+$standardMargin: 15px;
 
 .framedImage {
-  margin:20px 0;
-  border:1px solid #eee !important;
-  border-radius:$cornerBorderRadius;
-  padding:10px;
-  display:block;
-  box-shadow: 1px 1px 1px 0px rgba(0,0,0,0.21);
+    margin: 20px 0;
+    border: 1px solid #eee !important;
+    border-radius: $cornerBorderRadius;
+    padding: 10px;
+    display: block;
+    box-shadow: 1px 1px 1px 0px rgba(0, 0, 0, 0.21);
 }
-
-
diff --git a/src/pages/groupComparison/ClinicalData.tsx b/src/pages/groupComparison/ClinicalData.tsx
index 8a518a979ef..d4ead8d02a2 100644
--- a/src/pages/groupComparison/ClinicalData.tsx
+++ b/src/pages/groupComparison/ClinicalData.tsx
@@ -1,14 +1,14 @@
-import * as React from "react";
-import {observer, Observer} from "mobx-react";
-import autobind from "autobind-decorator";
-import GroupComparisonStore from "./GroupComparisonStore";
-import LoadingIndicator from "shared/components/loadingIndicator/LoadingIndicator";
-import {action, autorun, computed, IReactionDisposer, observable} from "mobx";
-import {SimpleGetterLazyMobXTableApplicationDataStore} from "shared/lib/ILazyMobXTableApplicationDataStore";
-import ClinicalDataEnrichmentsTable from "./ClinicalDataEnrichmentsTable";
-import _ from "lodash";
-import {DownloadControls, remoteData} from "cbioportal-frontend-commons";
-import client from "shared/api/cbioportalClientInstance";
+import * as React from 'react';
+import { observer, Observer } from 'mobx-react';
+import autobind from 'autobind-decorator';
+import GroupComparisonStore from './GroupComparisonStore';
+import LoadingIndicator from 'shared/components/loadingIndicator/LoadingIndicator';
+import { action, autorun, computed, IReactionDisposer, observable } from 'mobx';
+import { SimpleGetterLazyMobXTableApplicationDataStore } from 'shared/lib/ILazyMobXTableApplicationDataStore';
+import ClinicalDataEnrichmentsTable from './ClinicalDataEnrichmentsTable';
+import _ from 'lodash';
+import { DownloadControls, remoteData } from 'cbioportal-frontend-commons';
+import client from 'shared/api/cbioportalClientInstance';
 import {
     boxPlotTooltip,
     IAxisData,
@@ -20,32 +20,38 @@ import {
     makeBoxScatterPlotData,
     MutationSummary,
     mutationSummaryToAppearance,
-    IAxisLogScaleParams
-} from "pages/resultsView/plots/PlotsTabUtils";
-import ScrollBar from "shared/components/Scrollbar/ScrollBar";
-import BoxScatterPlot, {IBoxScatterPlotData} from "shared/components/plots/BoxScatterPlot";
-import {getMobxPromiseGroupStatus} from "shared/lib/getMobxPromiseGroupStatus";
-import {scatterPlotSize} from "shared/components/plots/PlotUtils";
-import {CLINICAL_TAB_NOT_ENOUGH_GROUPS_MSG, ClinicalDataEnrichmentWithQ} from "./GroupComparisonUtils";
-import MultipleCategoryBarPlot from "../../shared/components/plots/MultipleCategoryBarPlot";
-import ReactSelect from "react-select1";
-import {MakeMobxView} from "shared/components/MobxView";
-import OverlapExclusionIndicator from "./OverlapExclusionIndicator";
-import {RESERVED_CLINICAL_VALUE_COLORS} from "../../shared/lib/Colors";
-import ErrorMessage from "../../shared/components/ErrorMessage";
-import ComplexKeyMap from "shared/lib/complexKeyDataStructures/ComplexKeyMap";
-import { Sample } from "shared/api/generated/CBioPortalAPI";
+    IAxisLogScaleParams,
+} from 'pages/resultsView/plots/PlotsTabUtils';
+import ScrollBar from 'shared/components/Scrollbar/ScrollBar';
+import BoxScatterPlot, {
+    IBoxScatterPlotData,
+} from 'shared/components/plots/BoxScatterPlot';
+import { getMobxPromiseGroupStatus } from 'shared/lib/getMobxPromiseGroupStatus';
+import { scatterPlotSize } from 'shared/components/plots/PlotUtils';
+import {
+    CLINICAL_TAB_NOT_ENOUGH_GROUPS_MSG,
+    ClinicalDataEnrichmentWithQ,
+} from './GroupComparisonUtils';
+import MultipleCategoryBarPlot from '../../shared/components/plots/MultipleCategoryBarPlot';
+import ReactSelect from 'react-select1';
+import { MakeMobxView } from 'shared/components/MobxView';
+import OverlapExclusionIndicator from './OverlapExclusionIndicator';
+import { RESERVED_CLINICAL_VALUE_COLORS } from '../../shared/lib/Colors';
+import ErrorMessage from '../../shared/components/ErrorMessage';
+import ComplexKeyMap from 'shared/lib/complexKeyDataStructures/ComplexKeyMap';
+import { Sample } from 'shared/api/generated/CBioPortalAPI';
 
 export interface IClinicalDataProps {
-    store: GroupComparisonStore
+    store: GroupComparisonStore;
 }
 
-const SVG_ID = "clinical-plot-svg";
-
-class PlotsTabBoxPlot extends BoxScatterPlot<IBoxScatterPlotPoint> { }
+const SVG_ID = 'clinical-plot-svg';
 
-export class ClinicalDataEnrichmentStore extends SimpleGetterLazyMobXTableApplicationDataStore<ClinicalDataEnrichmentWithQ> {
+class PlotsTabBoxPlot extends BoxScatterPlot<IBoxScatterPlotPoint> {}
 
+export class ClinicalDataEnrichmentStore extends SimpleGetterLazyMobXTableApplicationDataStore<
+    ClinicalDataEnrichmentWithQ
+> {
     private reactionDisposer: IReactionDisposer;
 
     constructor(
@@ -56,7 +62,11 @@ export class ClinicalDataEnrichmentStore extends SimpleGetterLazyMobXTableApplic
         super(getData);
         this.dataHighlighter = (d: ClinicalDataEnrichmentWithQ) => {
             const highlighted = getHighlighted();
-            return !!(highlighted && (d.clinicalAttribute.clinicalAttributeId === highlighted.clinicalAttribute.clinicalAttributeId));
+            return !!(
+                highlighted &&
+                d.clinicalAttribute.clinicalAttributeId ===
+                    highlighted.clinicalAttribute.clinicalAttributeId
+            );
         };
 
         this.reactionDisposer = autorun(() => {
@@ -76,29 +86,33 @@ export class ClinicalDataEnrichmentStore extends SimpleGetterLazyMobXTableApplic
 }
 
 export enum PlotType {
-    Bar = "Bar",
-    StackedBar = "StackedBar",
-    PercentageStackedBar = "PercentageStackedBar"
+    Bar = 'Bar',
+    StackedBar = 'StackedBar',
+    PercentageStackedBar = 'PercentageStackedBar',
 }
 
 export const plotTypeOptions = [
-    { value: PlotType.Bar, label: "Bar chart" },
-    { value: PlotType.StackedBar, label: "Stacked bar chart" },
-    { value: PlotType.PercentageStackedBar, label: "100% stacked bar chart" }
-]
+    { value: PlotType.Bar, label: 'Bar chart' },
+    { value: PlotType.StackedBar, label: 'Stacked bar chart' },
+    { value: PlotType.PercentageStackedBar, label: '100% stacked bar chart' },
+];
 
 @observer
-export default class ClinicalData extends React.Component<IClinicalDataProps, {}> {
-
+export default class ClinicalData extends React.Component<
+    IClinicalDataProps,
+    {}
+> {
     @observable.ref highlightedRow: ClinicalDataEnrichmentWithQ | undefined;
 
     private scrollPane: HTMLDivElement;
 
     readonly tabUI = MakeMobxView({
         await: () => {
-            const ret:any[] = [this.props.store.activeGroups];
-            if (this.props.store.activeGroups.isComplete &&
-                this.props.store.activeGroups.result.length < 2) {
+            const ret: any[] = [this.props.store.activeGroups];
+            if (
+                this.props.store.activeGroups.isComplete &&
+                this.props.store.activeGroups.result.length < 2
+            ) {
                 // dont bother loading data for and computing clinical tab if not enough groups for it
             } else {
                 ret.push(this.overlapUI);
@@ -108,34 +122,55 @@ export default class ClinicalData extends React.Component<IClinicalDataProps, {}
         render: () => {
             let content: any = [];
             if (this.props.store.activeGroups.result!.length < 2) {
-                content.push(<span>{CLINICAL_TAB_NOT_ENOUGH_GROUPS_MSG(this.props.store._activeGroupsNotOverlapRemoved.result!.length)}</span>);
+                content.push(
+                    <span>
+                        {CLINICAL_TAB_NOT_ENOUGH_GROUPS_MSG(
+                            this.props.store._activeGroupsNotOverlapRemoved
+                                .result!.length
+                        )}
+                    </span>
+                );
             } else {
-                content.push(<OverlapExclusionIndicator store={this.props.store}/>);
-                content.push(this.overlapUI.component)
+                content.push(
+                    <OverlapExclusionIndicator store={this.props.store} />
+                );
+                content.push(this.overlapUI.component);
             }
-            return (<div data-test="ComparisonPageClinicalTabDiv">
-                {content}
-            </div>);
+            return (
+                <div data-test="ComparisonPageClinicalTabDiv">{content}</div>
+            );
         },
-        renderPending: () => <LoadingIndicator isLoading={true} center={true} size={"big"} />,
-        renderError: ()=> <ErrorMessage/>
+        renderPending: () => (
+            <LoadingIndicator isLoading={true} center={true} size={'big'} />
+        ),
+        renderError: () => <ErrorMessage />,
     });
 
     readonly overlapUI = MakeMobxView({
         await: () => [this.props.store.clinicalDataEnrichmentsWithQValues],
         render: () => {
-            return (<div className="clearfix" style={{ display: "flex" }}>
-                <div style={{ width: "600px" }}>
-                    <ClinicalDataEnrichmentsTable dataStore={this.tableDataStore} />
-                </div>
-                <div style={{ marginLeft: "10px" }} >
-                    {this.getUtilitiesMenu}
-                    {this.plot}
+            return (
+                <div className="clearfix" style={{ display: 'flex' }}>
+                    <div style={{ width: '600px' }}>
+                        <ClinicalDataEnrichmentsTable
+                            dataStore={this.tableDataStore}
+                        />
+                    </div>
+                    <div style={{ marginLeft: '10px' }}>
+                        {this.getUtilitiesMenu}
+                        {this.plot}
+                    </div>
                 </div>
-            </div>)
+            );
         },
-        renderPending: () => <LoadingIndicator isLoading={true} centerRelativeToContainer={true} size="big" />,
-        renderError: ()=> <ErrorMessage/>
+        renderPending: () => (
+            <LoadingIndicator
+                isLoading={true}
+                centerRelativeToContainer={true}
+                size="big"
+            />
+        ),
+        renderError: () => <ErrorMessage />,
     });
 
     @autobind
@@ -158,23 +193,28 @@ export default class ClinicalData extends React.Component<IClinicalDataProps, {}
     );
 
     @computed get showLogScaleControls() {
-        return this.highlightedRow!.clinicalAttribute.datatype.toLowerCase() === 'number';
+        return (
+            this.highlightedRow!.clinicalAttribute.datatype.toLowerCase() ===
+            'number'
+        );
     }
 
     @observable private logScale = false;
-    @observable logScaleFunction:IAxisLogScaleParams|undefined;
+    @observable logScaleFunction: IAxisLogScaleParams | undefined;
     @observable swapAxes = false;
     @observable horizontalBars = false;
 
     @autobind
-    @action private onClickLogScale() {
+    @action
+    private onClickLogScale() {
         this.logScale = !this.logScale;
         if (this.logScale) {
             const MIN_LOG_ARGUMENT = 0.01;
             this.logScaleFunction = {
-                label: "log2",
-                fLogScale: (x:number, offset:number) => Math.log2(Math.max(x, MIN_LOG_ARGUMENT)),
-                fInvLogScale: (x:number) => Math.pow(2, x)
+                label: 'log2',
+                fLogScale: (x: number, offset: number) =>
+                    Math.log2(Math.max(x, MIN_LOG_ARGUMENT)),
+                fInvLogScale: (x: number) => Math.pow(2, x),
             };
         } else {
             this.logScaleFunction = undefined;
@@ -182,46 +222,65 @@ export default class ClinicalData extends React.Component<IClinicalDataProps, {}
     }
 
     @autobind
-    @action private onClickSwapAxes() {
+    @action
+    private onClickSwapAxes() {
         this.swapAxes = !this.swapAxes;
     }
 
     @autobind
-    @action private onClickhorizontalBars() {
+    @action
+    private onClickhorizontalBars() {
         this.horizontalBars = !this.horizontalBars;
     }
 
     private readonly clinicalDataPromise = remoteData({
-        await: () => [this.props.store.patientKeyToSamples, this.props.store.activeGroups],
+        await: () => [
+            this.props.store.patientKeyToSamples,
+            this.props.store.activeGroups,
+        ],
         invoke: async () => {
             const axisData: IAxisData = { data: [], datatype: 'string' };
             if (this.highlightedRow) {
                 let attribute = this.highlightedRow!.clinicalAttribute;
-                let patientKeyToSamples = this.props.store.patientKeyToSamples.result!;
-
-                let sampleIdentifiers = _.flatMap(this.props.store.activeGroups.result, group => _.flatMap(group.studies, study => {
-                    return study.samples.map(sample => ({
-                        studyId: study.id,
-                        entityId: sample
-                    }));
-                }));
-
-                let patientidentifiers = _.flatMap(this.props.store.activeGroups.result, group => _.flatMap(group.studies, study => {
-                    return study.patients.map(patient => ({
-                        studyId: study.id,
-                        entityId: patient
-                    }));
-                }));
+                let patientKeyToSamples = this.props.store.patientKeyToSamples
+                    .result!;
+
+                let sampleIdentifiers = _.flatMap(
+                    this.props.store.activeGroups.result,
+                    group =>
+                        _.flatMap(group.studies, study => {
+                            return study.samples.map(sample => ({
+                                studyId: study.id,
+                                entityId: sample,
+                            }));
+                        })
+                );
+
+                let patientidentifiers = _.flatMap(
+                    this.props.store.activeGroups.result,
+                    group =>
+                        _.flatMap(group.studies, study => {
+                            return study.patients.map(patient => ({
+                                studyId: study.id,
+                                entityId: patient,
+                            }));
+                        })
+                );
 
                 let clinicalData = await client.fetchClinicalDataUsingPOST({
-                    clinicalDataType: attribute.patientAttribute ? 'PATIENT' : 'SAMPLE',
+                    clinicalDataType: attribute.patientAttribute
+                        ? 'PATIENT'
+                        : 'SAMPLE',
                     clinicalDataMultiStudyFilter: {
                         attributeIds: [attribute.clinicalAttributeId],
-                        identifiers: attribute.patientAttribute ? patientidentifiers : sampleIdentifiers
-                    }
+                        identifiers: attribute.patientAttribute
+                            ? patientidentifiers
+                            : sampleIdentifiers,
+                    },
                 });
 
-                const shouldParseFloat = attribute.datatype.toLowerCase() === "number";
+                const shouldParseFloat =
+                    attribute.datatype.toLowerCase() === 'number';
                 axisData.datatype = attribute.datatype.toLowerCase();
                 const axisData_Data = axisData.data;
                 if (attribute.patientAttribute) {
@@ -240,7 +299,7 @@ export default class ClinicalData extends React.Component<IClinicalDataProps, {}
                     for (const d of clinicalData) {
                         axisData_Data.push({
                             uniqueSampleKey: d.uniqueSampleKey,
-                            value: d.value
+                            value: d.value,
                         });
                     }
                 }
@@ -251,53 +310,96 @@ export default class ClinicalData extends React.Component<IClinicalDataProps, {}
                 }
             }
             return Promise.resolve(axisData);
-        }
+        },
     });
 
     private readonly groupMembershipAxisData = remoteData({
-        await: () => [this.props.store.sampleSet, this.props.store.activeGroups],
+        await: () => [
+            this.props.store.sampleSet,
+            this.props.store.activeGroups,
+        ],
         invoke: async () => {
-            const categoryOrder = _.map(this.props.store.activeGroups.result!, group => group.nameWithOrdinal);
-            const axisData = { data: [], datatype: "string", categoryOrder } as IStringAxisData;
-            const sampleSet = this.props.store.sampleSet.result || new ComplexKeyMap<Sample>();
-
-            const sampleKeyToGroupSampleData = _.reduce(this.props.store.activeGroups.result, (acc, group) => {
-                group.studies.forEach(studyEntry => {
-                    studyEntry.samples.forEach(sampleId => {
-                        if (sampleSet.has({ studyId: studyEntry.id, sampleId })) {
-                            const uniqueSampleKey = sampleSet.get({ studyId: studyEntry.id, sampleId })!.uniqueSampleKey;
-                            if (acc[uniqueSampleKey] === undefined) {
-                                acc[uniqueSampleKey] = {
-                                    uniqueSampleKey,
-                                    value: []
+            const categoryOrder = _.map(
+                this.props.store.activeGroups.result!,
+                group => group.nameWithOrdinal
+            );
+            const axisData = {
+                data: [],
+                datatype: 'string',
+                categoryOrder,
+            } as IStringAxisData;
+            const sampleSet =
+                this.props.store.sampleSet.result ||
+                new ComplexKeyMap<Sample>();
+
+            const sampleKeyToGroupSampleData = _.reduce(
+                this.props.store.activeGroups.result,
+                (acc, group) => {
+                    group.studies.forEach(studyEntry => {
+                        studyEntry.samples.forEach(sampleId => {
+                            if (
+                                sampleSet.has({
+                                    studyId: studyEntry.id,
+                                    sampleId,
+                                })
+                            ) {
+                                const uniqueSampleKey = sampleSet.get({
+                                    studyId: studyEntry.id,
+                                    sampleId,
+                                })!.uniqueSampleKey;
+                                if (acc[uniqueSampleKey] === undefined) {
+                                    acc[uniqueSampleKey] = {
+                                        uniqueSampleKey,
+                                        value: [],
+                                    };
                                 }
+                                acc[uniqueSampleKey].value.push(
+                                    group.nameWithOrdinal
+                                );
                             }
-                            acc[uniqueSampleKey].value.push(group.nameWithOrdinal);
-                        }
+                        });
                     });
-                });
-                return acc;
-            }, {} as { [uniqueSampleKey: string]: { uniqueSampleKey: string, value: string[] } });
+                    return acc;
+                },
+                {} as {
+                    [uniqueSampleKey: string]: {
+                        uniqueSampleKey: string;
+                        value: string[];
+                    };
+                }
+            );
 
             axisData.data = _.values(sampleKeyToGroupSampleData);
             return Promise.resolve(axisData);
-        }
+        },
     });
 
     @computed get vertAxisDataPromise() {
-        return this.swapAxes ? this.groupMembershipAxisData : this.clinicalDataPromise;
+        return this.swapAxes
+            ? this.groupMembershipAxisData
+            : this.clinicalDataPromise;
     }
 
     @computed get horzAxisDataPromise() {
-        return this.swapAxes ? this.clinicalDataPromise : this.groupMembershipAxisData;
+        return this.swapAxes
+            ? this.clinicalDataPromise
+            : this.groupMembershipAxisData;
     }
 
     @computed get horzLabel() {
-        return this.swapAxes ? `${this.highlightedRow!.clinicalAttribute.displayName}${this.logScale ? ' (log2)' : ''}` : `Group`;
+        return this.swapAxes
+            ? `${this.highlightedRow!.clinicalAttribute.displayName}${
+                  this.logScale ? ' (log2)' : ''
+              }`
+            : `Group`;
     }
 
     @computed get vertLabel() {
-        return this.swapAxes ? 'Group' : `${this.highlightedRow!.clinicalAttribute.displayName}${this.logScale ? ' (log2)' : ''}`;
+        return this.swapAxes
+            ? 'Group'
+            : `${this.highlightedRow!.clinicalAttribute.displayName}${
+                  this.logScale ? ' (log2)' : ''
+              }`;
     }
 
     @autobind
@@ -310,11 +412,14 @@ export default class ClinicalData extends React.Component<IClinicalDataProps, {}
         this.scrollPane = el;
     }
 
-    private readonly boxPlotData = remoteData<{ horizontal: boolean, data: IBoxScatterPlotData<IBoxScatterPlotPoint>[] }>({
+    private readonly boxPlotData = remoteData<{
+        horizontal: boolean;
+        data: IBoxScatterPlotData<IBoxScatterPlotPoint>[];
+    }>({
         await: () => [
             this.horzAxisDataPromise,
             this.vertAxisDataPromise,
-            this.props.store.sampleKeyToSample
+            this.props.store.sampleKeyToSample,
         ],
         invoke: () => {
             const horzAxisData = this.horzAxisDataPromise.result;
@@ -329,7 +434,10 @@ export default class ClinicalData extends React.Component<IClinicalDataProps, {}
                     categoryData = vertAxisData;
                     numberData = horzAxisData;
                     horizontal = true;
-                } else if (isStringData(horzAxisData) && isNumberData(vertAxisData)) {
+                } else if (
+                    isStringData(horzAxisData) &&
+                    isNumberData(vertAxisData)
+                ) {
                     categoryData = horzAxisData;
                     numberData = vertAxisData;
                     horizontal = false;
@@ -339,15 +447,16 @@ export default class ClinicalData extends React.Component<IClinicalDataProps, {}
                 return Promise.resolve({
                     horizontal,
                     data: makeBoxScatterPlotData(
-                        categoryData, numberData,
+                        categoryData,
+                        numberData,
                         this.props.store.sampleKeyToSample.result!,
                         {},
                         undefined,
                         undefined
-                    )
+                    ),
                 });
             }
-        }
+        },
     });
 
     @computed get scatterPlotTooltip() {
@@ -356,52 +465,68 @@ export default class ClinicalData extends React.Component<IClinicalDataProps, {}
             if (this.boxPlotData.isComplete) {
                 content = boxPlotTooltip(d, this.boxPlotData.result.horizontal);
             } else {
-                content = <span>Loading... (this shouldnt appear because the box plot shouldnt be visible)</span>;
+                content = (
+                    <span>
+                        Loading... (this shouldnt appear because the box plot
+                        shouldnt be visible)
+                    </span>
+                );
             }
             return content;
-        }
+        };
     }
 
     @computed get boxPlotTooltip() {
         return (d: any) => {
-            return <table className="table table-striped">
-                <thead>
-                    <tr>
-                        <th colSpan={2}>{this.boxPlotData.result!.data[d.eventKey].label}</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr>
-                        <td>Maximum</td>
-                        <td>{d.max}</td>
-                    </tr>
-                    <tr>
-                        <td>75% (q3)</td>
-                        <td>{d.q3}</td>
-                    </tr>
-                    <tr>
-                        <td>Median</td>
-                        <td>{d.median}</td>
-                    </tr>
-                    <tr>
-                        <td>25% (q1)</td>
-                        <td>{d.q1}</td>
-                    </tr>
-                    <tr>
-                        <td>Minimum</td>
-                        <td>{d.min}</td>
-                    </tr>
-                </tbody>
-            </table>
-        }
+            return (
+                <table className="table table-striped">
+                    <thead>
+                        <tr>
+                            <th colSpan={2}>
+                                {
+                                    this.boxPlotData.result!.data[d.eventKey]
+                                        .label
+                                }
+                            </th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr>
+                            <td>Maximum</td>
+                            <td>{d.max}</td>
+                        </tr>
+                        <tr>
+                            <td>75% (q3)</td>
+                            <td>{d.q3}</td>
+                        </tr>
+                        <tr>
+                            <td>Median</td>
+                            <td>{d.median}</td>
+                        </tr>
+                        <tr>
+                            <td>25% (q1)</td>
+                            <td>{d.q1}</td>
+                        </tr>
+                        <tr>
+                            <td>Minimum</td>
+                            <td>{d.min}</td>
+                        </tr>
+                    </tbody>
+                </table>
+            );
+        };
     }
 
     @computed get categoryToColor() {
         //add group colors and reserved category colors
-        return _.reduce(this.props.store.uidToGroup.result!, (acc, next) => {
-            acc[next.nameWithOrdinal] = next.color;
-            return acc;
-        }, RESERVED_CLINICAL_VALUE_COLORS);
+        return _.reduce(
+            this.props.store.uidToGroup.result!,
+            (acc, next) => {
+                acc[next.nameWithOrdinal] = next.color;
+                return acc;
+            },
+            RESERVED_CLINICAL_VALUE_COLORS
+        );
     }
 
     @observable plotType: PlotType = PlotType.PercentageStackedBar;
@@ -409,7 +534,7 @@ export default class ClinicalData extends React.Component<IClinicalDataProps, {}
     @autobind
     @action
     private onPlotTypeSelect(option: any) {
-        this.plotType = option.value
+        this.plotType = option.value;
     }
 
     @computed private get getUtilitiesMenu() {
@@ -417,11 +542,17 @@ export default class ClinicalData extends React.Component<IClinicalDataProps, {}
             return <span></span>;
         }
         return (
-            <div style={{ marginBottom: "10px"}}>
+            <div style={{ marginBottom: '10px' }}>
                 {!this.showLogScaleControls && (
-                    <div className="form-group" style={{display:"flex", alignItems:"center"}}>
+                    <div
+                        className="form-group"
+                        style={{ display: 'flex', alignItems: 'center' }}
+                    >
                         <label>Plot Type</label>
-                        <div style={{ width: 240, marginLeft:5 }} data-test="plotTypeSelector">
+                        <div
+                            style={{ width: 240, marginLeft: 5 }}
+                            data-test="plotTypeSelector"
+                        >
                             <ReactSelect
                                 name="discrete-vs-discrete-plot-type"
                                 value={this.plotType}
@@ -440,8 +571,9 @@ export default class ClinicalData extends React.Component<IClinicalDataProps, {}
                             checked={this.swapAxes}
                             onClick={this.onClickSwapAxes}
                             data-test="SwapAxes"
-                        />Swap Axes
-                        </label>
+                        />
+                        Swap Axes
+                    </label>
                     {!this.showLogScaleControls && (
                         <label className="checkbox-inline">
                             <input
@@ -450,7 +582,8 @@ export default class ClinicalData extends React.Component<IClinicalDataProps, {}
                                 checked={this.horizontalBars}
                                 onClick={this.onClickhorizontalBars}
                                 data-test="HorizontalBars"
-                            />Horizontal Bars
+                            />
+                            Horizontal Bars
                         </label>
                     )}
                     {this.showLogScaleControls && (
@@ -460,13 +593,13 @@ export default class ClinicalData extends React.Component<IClinicalDataProps, {}
                                 checked={this.logScale}
                                 onClick={this.onClickLogScale}
                                 data-test="logScale"
-                            />Log Scale
+                            />
+                            Log Scale
                         </label>
                     )}
                 </div>
             </div>
         );
-
     }
 
     @computed get plot() {
@@ -478,24 +611,39 @@ export default class ClinicalData extends React.Component<IClinicalDataProps, {}
         const isPercentage = this.plotType === PlotType.PercentageStackedBar;
         const isStacked = isPercentage || this.plotType === PlotType.StackedBar;
         switch (groupStatus) {
-            case "pending":
-                return <LoadingIndicator center={true} isLoading={true} size={"big"} />;
-            case "error":
+            case 'pending':
+                return (
+                    <LoadingIndicator
+                        center={true}
+                        isLoading={true}
+                        size={'big'}
+                    />
+                );
+            case 'error':
                 return <span>Error loading plot data.</span>;
             default: {
-
-                if (!this.horzAxisDataPromise.result || !this.vertAxisDataPromise.result) {
+                if (
+                    !this.horzAxisDataPromise.result ||
+                    !this.vertAxisDataPromise.result
+                ) {
                     return <span>Error loading plot data.</span>;
                 }
 
                 let plotElt: any = null;
-                if (this.highlightedRow!.clinicalAttribute.datatype.toLowerCase() === 'number') {
+                if (
+                    this.highlightedRow!.clinicalAttribute.datatype.toLowerCase() ===
+                    'number'
+                ) {
                     if (this.boxPlotData.isComplete) {
                         plotElt = (
                             <PlotsTabBoxPlot
                                 svgId={SVG_ID}
                                 domainPadding={75}
-                                boxWidth={this.boxPlotData.result.data.length > 7 ? 30 : 60}
+                                boxWidth={
+                                    this.boxPlotData.result.data.length > 7
+                                        ? 30
+                                        : 60
+                                }
                                 axisLabelX={this.horzLabel}
                                 axisLabelY={this.vertLabel}
                                 data={this.boxPlotData.result.data}
@@ -505,9 +653,21 @@ export default class ClinicalData extends React.Component<IClinicalDataProps, {}
                                 horizontal={this.boxPlotData.result.horizontal}
                                 logScale={this.logScaleFunction}
                                 size={scatterPlotSize}
-                                fill={mutationSummaryToAppearance[MutationSummary.Neither].fill}
-                                stroke={mutationSummaryToAppearance[MutationSummary.Neither].stroke}
-                                strokeOpacity={mutationSummaryToAppearance[MutationSummary.Neither].strokeOpacity}
+                                fill={
+                                    mutationSummaryToAppearance[
+                                        MutationSummary.Neither
+                                    ].fill
+                                }
+                                stroke={
+                                    mutationSummaryToAppearance[
+                                        MutationSummary.Neither
+                                    ].stroke
+                                }
+                                strokeOpacity={
+                                    mutationSummaryToAppearance[
+                                        MutationSummary.Neither
+                                    ].strokeOpacity
+                                }
                                 symbol="circle"
                                 useLogSpaceTicks={true}
                                 legendLocationWidthThreshold={550}
@@ -516,36 +676,66 @@ export default class ClinicalData extends React.Component<IClinicalDataProps, {}
                     } else if (this.boxPlotData.isError) {
                         return <span>Error loading plot data.</span>;
                     } else {
-                        return <LoadingIndicator center={true} isLoading={true} size={"big"} />;
+                        return (
+                            <LoadingIndicator
+                                center={true}
+                                isLoading={true}
+                                size={'big'}
+                            />
+                        );
                     }
                 } else {
-                    plotElt = <MultipleCategoryBarPlot
-                        svgId={SVG_ID}
-                        horzData={(this.horzAxisDataPromise.result! as IStringAxisData).data}
-                        vertData={(this.vertAxisDataPromise.result! as IStringAxisData).data}
-                        horzCategoryOrder={(this.horzAxisDataPromise.result! as IStringAxisData).categoryOrder}
-                        vertCategoryOrder={(this.vertAxisDataPromise.result! as IStringAxisData).categoryOrder}
-                        categoryToColor={this.categoryToColor}
-                        barWidth={20}
-                        domainPadding={20}
-                        chartBase={500}
-                        axisLabelX={this.horzLabel}
-                        axisLabelY={this.vertLabel}
-                        legendLocationWidthThreshold={450}
-                        ticksCount={6}
-                        horizontalBars={this.horizontalBars}
-                        percentage={isPercentage}
-                        stacked={isStacked}
-                    />
+                    plotElt = (
+                        <MultipleCategoryBarPlot
+                            svgId={SVG_ID}
+                            horzData={
+                                (this.horzAxisDataPromise
+                                    .result! as IStringAxisData).data
+                            }
+                            vertData={
+                                (this.vertAxisDataPromise
+                                    .result! as IStringAxisData).data
+                            }
+                            horzCategoryOrder={
+                                (this.horzAxisDataPromise
+                                    .result! as IStringAxisData).categoryOrder
+                            }
+                            vertCategoryOrder={
+                                (this.vertAxisDataPromise
+                                    .result! as IStringAxisData).categoryOrder
+                            }
+                            categoryToColor={this.categoryToColor}
+                            barWidth={20}
+                            domainPadding={20}
+                            chartBase={500}
+                            axisLabelX={this.horzLabel}
+                            axisLabelY={this.vertLabel}
+                            legendLocationWidthThreshold={450}
+                            ticksCount={6}
+                            horizontalBars={this.horizontalBars}
+                            percentage={isPercentage}
+                            stacked={isStacked}
+                        />
+                    );
                 }
 
                 return (
-                    <div data-test="PlotsTabPlotDiv" className="borderedChart posRelative">
-                        <ScrollBar style={{ position: 'relative', top: -5 }} getScrollEl={this.getScrollPane} />
-                        <Observer>
-                            {this.toolbar}
-                        </Observer>
-                        <div ref={this.assignScrollPaneRef} style={{ position: "relative", display: "inline-block" }}>
+                    <div
+                        data-test="PlotsTabPlotDiv"
+                        className="borderedChart posRelative"
+                    >
+                        <ScrollBar
+                            style={{ position: 'relative', top: -5 }}
+                            getScrollEl={this.getScrollPane}
+                        />
+                        <Observer>{this.toolbar}</Observer>
+                        <div
+                            ref={this.assignScrollPaneRef}
+                            style={{
+                                position: 'relative',
+                                display: 'inline-block',
+                            }}
+                        >
                             {plotElt}
                         </div>
                     </div>
@@ -557,12 +747,12 @@ export default class ClinicalData extends React.Component<IClinicalDataProps, {}
     @autobind
     private toolbar() {
         return (
-            <div style={{ textAlign: "center", position: "relative" }}>
+            <div style={{ textAlign: 'center', position: 'relative' }}>
                 <DownloadControls
                     getSvg={this.getSvg}
                     filename={SVG_ID}
                     dontFade={true}
-                    type='button'
+                    type="button"
                     style={{ position: 'absolute', right: 0, top: 0 }}
                 />
             </div>
@@ -574,6 +764,6 @@ export default class ClinicalData extends React.Component<IClinicalDataProps, {}
     }
 
     public render() {
-        return this.tabUI.component
+        return this.tabUI.component;
     }
 }
diff --git a/src/pages/groupComparison/ClinicalDataEnrichmentsTable.tsx b/src/pages/groupComparison/ClinicalDataEnrichmentsTable.tsx
index bbd80925f53..f584b3e5a48 100644
--- a/src/pages/groupComparison/ClinicalDataEnrichmentsTable.tsx
+++ b/src/pages/groupComparison/ClinicalDataEnrichmentsTable.tsx
@@ -1,72 +1,135 @@
 import * as React from 'react';
-import * as _ from "lodash";
-import { observer } from "mobx-react";
+import * as _ from 'lodash';
+import { observer } from 'mobx-react';
 import autobind from 'autobind-decorator';
 import LazyMobXTable from 'shared/components/lazyMobXTable/LazyMobXTable';
-import {toConditionalPrecision} from 'shared/lib/NumberUtils';
+import { toConditionalPrecision } from 'shared/lib/NumberUtils';
 import { ClinicalDataEnrichmentStore } from './ClinicalData';
 import { ClinicalDataEnrichmentWithQ } from './GroupComparisonUtils';
-import {toConditionalPrecisionWithMinimum} from "../../shared/lib/FormatUtils";
+import { toConditionalPrecisionWithMinimum } from '../../shared/lib/FormatUtils';
 
 export interface IClinicalDataEnrichmentsTableProps {
     dataStore: ClinicalDataEnrichmentStore;
 }
 
 export enum ClinicalDataEnrichmentTableColumnType {
-    CLINICAL_ATTRIBUTE_NAME = "Clinical Attribute",
-    CLINICAL_ATTRIBUTE_TYPE = "Attribute Type",
-    STATISTICAL_TEST_NAME = "Statistical Test",
-    SCORE = "Score",
-    P_VALUE = "p-Value",
-    Q_VALUE = "q-Value"
+    CLINICAL_ATTRIBUTE_NAME = 'Clinical Attribute',
+    CLINICAL_ATTRIBUTE_TYPE = 'Attribute Type',
+    STATISTICAL_TEST_NAME = 'Statistical Test',
+    SCORE = 'Score',
+    P_VALUE = 'p-Value',
+    Q_VALUE = 'q-Value',
 }
 
 const COLUMNS = [
     {
         name: ClinicalDataEnrichmentTableColumnType.CLINICAL_ATTRIBUTE_NAME,
-        render: (d: ClinicalDataEnrichmentWithQ) => <span style={{fontWeight: (d.qValue < 0.05 ? "bold" : "normal")}}>{d.clinicalAttribute.displayName}</span>,
-        filter: (d: ClinicalDataEnrichmentWithQ, f: string, filterStringUpper: string) => (d.clinicalAttribute.displayName.toUpperCase().indexOf(filterStringUpper) > -1),
-        sortBy: (d: ClinicalDataEnrichmentWithQ) => d.clinicalAttribute.displayName,
-        download: (d: ClinicalDataEnrichmentWithQ) => d.clinicalAttribute.displayName,
-        width: 160
+        render: (d: ClinicalDataEnrichmentWithQ) => (
+            <span style={{ fontWeight: d.qValue < 0.05 ? 'bold' : 'normal' }}>
+                {d.clinicalAttribute.displayName}
+            </span>
+        ),
+        filter: (
+            d: ClinicalDataEnrichmentWithQ,
+            f: string,
+            filterStringUpper: string
+        ) =>
+            d.clinicalAttribute.displayName
+                .toUpperCase()
+                .indexOf(filterStringUpper) > -1,
+        sortBy: (d: ClinicalDataEnrichmentWithQ) =>
+            d.clinicalAttribute.displayName,
+        download: (d: ClinicalDataEnrichmentWithQ) =>
+            d.clinicalAttribute.displayName,
+        width: 160,
     },
     {
         name: ClinicalDataEnrichmentTableColumnType.CLINICAL_ATTRIBUTE_TYPE,
-        render: (d: ClinicalDataEnrichmentWithQ) => <span>{d.clinicalAttribute.patientAttribute ? "Patient" : "Sample"}</span>,
-        filter: (d: ClinicalDataEnrichmentWithQ, f: string, filterStringUpper: string) => ((d.clinicalAttribute.patientAttribute ? "Patient" : "Sample").toUpperCase().indexOf(filterStringUpper) > -1),
-        sortBy: (d: ClinicalDataEnrichmentWithQ) => d.clinicalAttribute.patientAttribute ? "Patient" : "Sample",
-        download: (d: ClinicalDataEnrichmentWithQ) => d.clinicalAttribute.patientAttribute ? "Patient" : "Sample",
-        width: 100
+        render: (d: ClinicalDataEnrichmentWithQ) => (
+            <span>
+                {d.clinicalAttribute.patientAttribute ? 'Patient' : 'Sample'}
+            </span>
+        ),
+        filter: (
+            d: ClinicalDataEnrichmentWithQ,
+            f: string,
+            filterStringUpper: string
+        ) =>
+            (d.clinicalAttribute.patientAttribute ? 'Patient' : 'Sample')
+                .toUpperCase()
+                .indexOf(filterStringUpper) > -1,
+        sortBy: (d: ClinicalDataEnrichmentWithQ) =>
+            d.clinicalAttribute.patientAttribute ? 'Patient' : 'Sample',
+        download: (d: ClinicalDataEnrichmentWithQ) =>
+            d.clinicalAttribute.patientAttribute ? 'Patient' : 'Sample',
+        width: 100,
     },
     {
         name: ClinicalDataEnrichmentTableColumnType.STATISTICAL_TEST_NAME,
-        render: (d: ClinicalDataEnrichmentWithQ) => <span style={{ whiteSpace: "nowrap" }}>{d.method}</span>,
-        filter: (d: ClinicalDataEnrichmentWithQ, f: string, filterStringUpper: string) => (d.method.toUpperCase().indexOf(filterStringUpper) > -1),
+        render: (d: ClinicalDataEnrichmentWithQ) => (
+            <span style={{ whiteSpace: 'nowrap' }}>{d.method}</span>
+        ),
+        filter: (
+            d: ClinicalDataEnrichmentWithQ,
+            f: string,
+            filterStringUpper: string
+        ) => d.method.toUpperCase().indexOf(filterStringUpper) > -1,
         sortBy: (d: ClinicalDataEnrichmentWithQ) => d.method,
         download: (d: ClinicalDataEnrichmentWithQ) => d.method,
-        width: 130
+        width: 130,
     },
     {
         name: ClinicalDataEnrichmentTableColumnType.P_VALUE,
-        render: (d: ClinicalDataEnrichmentWithQ) => <span style={{ whiteSpace: 'nowrap', fontWeight: (d.qValue < 0.05 ? "bold" : "normal") }}>{toConditionalPrecisionWithMinimum(d.pValue, 3, 0.01, -10)}</span>,
+        render: (d: ClinicalDataEnrichmentWithQ) => (
+            <span
+                style={{
+                    whiteSpace: 'nowrap',
+                    fontWeight: d.qValue < 0.05 ? 'bold' : 'normal',
+                }}
+            >
+                {toConditionalPrecisionWithMinimum(d.pValue, 3, 0.01, -10)}
+            </span>
+        ),
         sortBy: (d: ClinicalDataEnrichmentWithQ) => d.pValue,
-        download: (d: ClinicalDataEnrichmentWithQ) => toConditionalPrecision(d.pValue, 3, 0.01),
+        download: (d: ClinicalDataEnrichmentWithQ) =>
+            toConditionalPrecision(d.pValue, 3, 0.01),
         width: 100,
-        tooltip:<span>p-value of null Hypothesis, derived from Chi-Squared test or Kruskal-Wallis test</span>
+        tooltip: (
+            <span>
+                p-value of null Hypothesis, derived from Chi-Squared test or
+                Kruskal-Wallis test
+            </span>
+        ),
     },
     {
         name: ClinicalDataEnrichmentTableColumnType.Q_VALUE,
-        render: (d: ClinicalDataEnrichmentWithQ) => <span style={{ whiteSpace: 'nowrap', fontWeight: (d.qValue < 0.05 ? "bold" : "normal") }}>{toConditionalPrecisionWithMinimum(d.qValue, 3, 0.01, -10)}</span>,
+        render: (d: ClinicalDataEnrichmentWithQ) => (
+            <span
+                style={{
+                    whiteSpace: 'nowrap',
+                    fontWeight: d.qValue < 0.05 ? 'bold' : 'normal',
+                }}
+            >
+                {toConditionalPrecisionWithMinimum(d.qValue, 3, 0.01, -10)}
+            </span>
+        ),
         sortBy: (d: ClinicalDataEnrichmentWithQ) => d.qValue,
-        download: (d: ClinicalDataEnrichmentWithQ) => toConditionalPrecision(d.qValue, 3, 0.01),
+        download: (d: ClinicalDataEnrichmentWithQ) =>
+            toConditionalPrecision(d.qValue, 3, 0.01),
         width: 100,
-        tooltip:<span>Derived from Benjamini-Hochberg FDR correction procedure.</span>
-    }
+        tooltip: (
+            <span>
+                Derived from Benjamini-Hochberg FDR correction procedure.
+            </span>
+        ),
+    },
 ];
 
 @observer
-export default class ClinicalDataEnrichmentsTable extends React.Component<IClinicalDataEnrichmentsTableProps, {}> {
-
+export default class ClinicalDataEnrichmentsTable extends React.Component<
+    IClinicalDataEnrichmentsTableProps,
+    {}
+> {
     @autobind
     private onRowClick(d: ClinicalDataEnrichmentWithQ) {
         this.props.dataStore.setHighlighted(d);
@@ -76,7 +139,9 @@ export default class ClinicalDataEnrichmentsTable extends React.Component<IClini
         return (
             <LazyMobXTable
                 columns={COLUMNS}
-                initialSortColumn={ClinicalDataEnrichmentTableColumnType.Q_VALUE}
+                initialSortColumn={
+                    ClinicalDataEnrichmentTableColumnType.Q_VALUE
+                }
                 initialSortDirection="asc"
                 showColumnVisibility={false}
                 dataStore={this.props.dataStore}
@@ -84,7 +149,7 @@ export default class ClinicalDataEnrichmentsTable extends React.Component<IClini
                 paginationProps={{ itemsPerPageOptions: [20] }}
                 initialItemsPerPage={20}
                 copyDownloadProps={{
-                    showCopy: false
+                    showCopy: false,
                 }}
             />
         );
diff --git a/src/pages/groupComparison/CopyNumberEnrichments.tsx b/src/pages/groupComparison/CopyNumberEnrichments.tsx
index 688b7522aa7..afaf115aa45 100644
--- a/src/pages/groupComparison/CopyNumberEnrichments.tsx
+++ b/src/pages/groupComparison/CopyNumberEnrichments.tsx
@@ -1,79 +1,119 @@
-import * as React from "react";
-import {observer} from "mobx-react";
-import EnrichmentsDataSetDropdown from "../resultsView/enrichments/EnrichmentsDataSetDropdown";
-import AlterationEnrichmentContainer from "../resultsView/enrichments/AlterationEnrichmentsContainer";
-import GroupComparisonStore from "./GroupComparisonStore";
-import autobind from "autobind-decorator";
-import {MolecularProfile} from "../../shared/api/generated/CBioPortalAPI";
-import {MakeMobxView} from "../../shared/components/MobxView";
-import LoadingIndicator from "../../shared/components/loadingIndicator/LoadingIndicator";
-import ErrorMessage from "../../shared/components/ErrorMessage";
-import {MakeEnrichmentsTabUI} from "./GroupComparisonUtils";
-import { remoteData } from "cbioportal-frontend-commons";
-import _ from "lodash";
-import { AlterationContainerType } from "pages/resultsView/enrichments/EnrichmentsUtil";
+import * as React from 'react';
+import { observer } from 'mobx-react';
+import EnrichmentsDataSetDropdown from '../resultsView/enrichments/EnrichmentsDataSetDropdown';
+import AlterationEnrichmentContainer from '../resultsView/enrichments/AlterationEnrichmentsContainer';
+import GroupComparisonStore from './GroupComparisonStore';
+import autobind from 'autobind-decorator';
+import { MolecularProfile } from '../../shared/api/generated/CBioPortalAPI';
+import { MakeMobxView } from '../../shared/components/MobxView';
+import LoadingIndicator from '../../shared/components/loadingIndicator/LoadingIndicator';
+import ErrorMessage from '../../shared/components/ErrorMessage';
+import { MakeEnrichmentsTabUI } from './GroupComparisonUtils';
+import { remoteData } from 'cbioportal-frontend-commons';
+import _ from 'lodash';
+import { AlterationContainerType } from 'pages/resultsView/enrichments/EnrichmentsUtil';
 
 export interface ICopyNumberEnrichmentsProps {
     store: GroupComparisonStore;
 }
 
 @observer
-export default class CopyNumberEnrichments extends React.Component<ICopyNumberEnrichmentsProps, {}> {
+export default class CopyNumberEnrichments extends React.Component<
+    ICopyNumberEnrichmentsProps,
+    {}
+> {
     @autobind
-    private onChangeProfile(profileMap:{[studyId:string]:MolecularProfile}) {
+    private onChangeProfile(profileMap: {
+        [studyId: string]: MolecularProfile;
+    }) {
         this.props.store.setCopyNumberEnrichmentProfileMap(profileMap);
     }
 
-    readonly tabUI = MakeEnrichmentsTabUI(()=>this.props.store, ()=>this.enrichmentsUI, "copy-number", true, true, true);
+    readonly tabUI = MakeEnrichmentsTabUI(
+        () => this.props.store,
+        () => this.enrichmentsUI,
+        'copy-number',
+        true,
+        true,
+        true
+    );
 
     private readonly copyNumberEnrichmentAnalysisGroups = remoteData({
         await: () => [this.props.store.enrichmentAnalysisGroups],
         invoke: () => {
-            return Promise.resolve(_.map(this.props.store.enrichmentAnalysisGroups.result, group => {
-                return {
-                    ...group,
-                    description: `Number (percentage) of ${this.props.store.usePatientLevelEnrichments ? "patients" : "samples"} in ${group.name} that have the listed alteration in the listed gene.`,
-                }
-            }));
-        }
+            return Promise.resolve(
+                _.map(
+                    this.props.store.enrichmentAnalysisGroups.result,
+                    group => {
+                        return {
+                            ...group,
+                            description: `Number (percentage) of ${
+                                this.props.store.usePatientLevelEnrichments
+                                    ? 'patients'
+                                    : 'samples'
+                            } in ${
+                                group.name
+                            } that have the listed alteration in the listed gene.`,
+                        };
+                    }
+                )
+            );
+        },
     });
 
     readonly enrichmentsUI = MakeMobxView({
-        await:()=>[
+        await: () => [
             this.props.store.copyNumberEnrichmentData,
             this.copyNumberEnrichmentAnalysisGroups,
             this.props.store.selectedStudyCopyNumberEnrichmentProfileMap,
-            this.props.store.studies
+            this.props.store.studies,
         ],
-        render:()=>{
-            let headerName = "Copy number";
-            let studyIds = Object.keys(this.props.store.selectedStudyCopyNumberEnrichmentProfileMap.result!);
+        render: () => {
+            let headerName = 'Copy number';
+            let studyIds = Object.keys(
+                this.props.store.selectedStudyCopyNumberEnrichmentProfileMap
+                    .result!
+            );
             if (studyIds.length === 1) {
-                headerName = this.props.store.selectedStudyCopyNumberEnrichmentProfileMap.result![studyIds[0]].name
+                headerName = this.props.store
+                    .selectedStudyCopyNumberEnrichmentProfileMap.result![
+                    studyIds[0]
+                ].name;
             }
             return (
                 <div data-test="GroupComparisonCopyNumberEnrichments">
                     <EnrichmentsDataSetDropdown
                         dataSets={this.props.store.copyNumberEnrichmentProfiles}
                         onChange={this.onChangeProfile}
-                        selectedProfileByStudyId={this.props.store.selectedStudyCopyNumberEnrichmentProfileMap.result!}
+                        selectedProfileByStudyId={
+                            this.props.store
+                                .selectedStudyCopyNumberEnrichmentProfileMap
+                                .result!
+                        }
                         studies={this.props.store.studies.result!}
                     />
 
-                    <AlterationEnrichmentContainer data={this.props.store.copyNumberEnrichmentData.result!}
+                    <AlterationEnrichmentContainer
+                        data={this.props.store.copyNumberEnrichmentData.result!}
                         groups={this.copyNumberEnrichmentAnalysisGroups.result}
                         alteredVsUnalteredMode={false}
                         headerName={headerName}
                         showCNAInTable={true}
                         containerType={AlterationContainerType.COPY_NUMBER}
-                        patientLevelEnrichments={this.props.store.usePatientLevelEnrichments}
-                        onSetPatientLevelEnrichments={this.props.store.setUsePatientLevelEnrichments}
+                        patientLevelEnrichments={
+                            this.props.store.usePatientLevelEnrichments
+                        }
+                        onSetPatientLevelEnrichments={
+                            this.props.store.setUsePatientLevelEnrichments
+                        }
                     />
                 </div>
             );
         },
-        renderPending:()=><LoadingIndicator center={true} isLoading={true} size={"big"}/>,
-        renderError:()=><ErrorMessage/>
+        renderPending: () => (
+            <LoadingIndicator center={true} isLoading={true} size={'big'} />
+        ),
+        renderError: () => <ErrorMessage />,
     });
 
     render() {
diff --git a/src/pages/groupComparison/CreateGroupFromOverlap.tsx b/src/pages/groupComparison/CreateGroupFromOverlap.tsx
index 8ee5ef7f599..79d1b6c3c12 100644
--- a/src/pages/groupComparison/CreateGroupFromOverlap.tsx
+++ b/src/pages/groupComparison/CreateGroupFromOverlap.tsx
@@ -1,46 +1,62 @@
-import * as React from "react";
-import {SyntheticEvent} from "react";
-import {observer} from "mobx-react";
-import GroupComparisonStore from "./GroupComparisonStore";
-import {DefaultTooltip} from "cbioportal-frontend-commons";
-import autobind from "autobind-decorator";
-import {action, computed, observable} from "mobx";
-import {ComparisonGroup, DUPLICATE_GROUP_NAME_MSG} from "./GroupComparisonUtils";
-import {MakeMobxView} from "../../shared/components/MobxView";
-import LoadingIndicator from "../../shared/components/loadingIndicator/LoadingIndicator";
-import {SessionGroupData} from "../../shared/api/ComparisonGroupClient";
-import {getStudiesAttrForPatientOverlapGroup, getStudiesAttrForSampleOverlapGroup, joinGroupNames} from "./OverlapUtils";
-import InfoIcon from "../../shared/components/InfoIcon";
-import FlexAlignedCheckbox from "../../shared/components/FlexAlignedCheckbox";
-import {serializeEvent} from "shared/lib/tracking";
+import * as React from 'react';
+import { SyntheticEvent } from 'react';
+import { observer } from 'mobx-react';
+import GroupComparisonStore from './GroupComparisonStore';
+import { DefaultTooltip } from 'cbioportal-frontend-commons';
+import autobind from 'autobind-decorator';
+import { action, computed, observable } from 'mobx';
+import {
+    ComparisonGroup,
+    DUPLICATE_GROUP_NAME_MSG,
+} from './GroupComparisonUtils';
+import { MakeMobxView } from '../../shared/components/MobxView';
+import LoadingIndicator from '../../shared/components/loadingIndicator/LoadingIndicator';
+import { SessionGroupData } from '../../shared/api/ComparisonGroupClient';
+import {
+    getStudiesAttrForPatientOverlapGroup,
+    getStudiesAttrForSampleOverlapGroup,
+    joinGroupNames,
+} from './OverlapUtils';
+import InfoIcon from '../../shared/components/InfoIcon';
+import FlexAlignedCheckbox from '../../shared/components/FlexAlignedCheckbox';
+import { serializeEvent } from 'shared/lib/tracking';
 
 export interface ICreateGroupFromOverlapProps {
-    store:GroupComparisonStore;
-    includedRegions:string[][]; // group.uid[][]
-    allGroupsInPlot:string[]; // uid[]
-    submitGroup:(group:SessionGroupData, saveToUser:boolean)=>void;
-    caseType:"sample"|"patient";
-    width:number;
-    style?:any;
+    store: GroupComparisonStore;
+    includedRegions: string[][]; // group.uid[][]
+    allGroupsInPlot: string[]; // uid[]
+    submitGroup: (group: SessionGroupData, saveToUser: boolean) => void;
+    caseType: 'sample' | 'patient';
+    width: number;
+    style?: any;
 }
 
 function getRegionSummary(
-    region:string[],
-    allGroupsInVenn:string[],
-    uidToGroup:{[uid:string]:ComparisonGroup},
-    caseType:"sample"|"patient"
+    region: string[],
+    allGroupsInVenn: string[],
+    uidToGroup: { [uid: string]: ComparisonGroup },
+    caseType: 'sample' | 'patient'
 ) {
-    const includedGroups = region.map(uid=>uidToGroup[uid]);
+    const includedGroups = region.map(uid => uidToGroup[uid]);
 
-    let ret = <span>{caseType[0].toUpperCase()}{caseType.substring(1)}s only in {joinGroupNames(includedGroups, "and")}</span>;
+    let ret = (
+        <span>
+            {caseType[0].toUpperCase()}
+            {caseType.substring(1)}s only in{' '}
+            {joinGroupNames(includedGroups, 'and')}
+        </span>
+    );
     ret = <span>{ret}.</span>;
 
     return ret;
 }
 
 @observer
-export default class CreateGroupFromOverlap extends React.Component<ICreateGroupFromOverlapProps, {}> {
-    @observable inputGroupName = "";
+export default class CreateGroupFromOverlap extends React.Component<
+    ICreateGroupFromOverlapProps,
+    {}
+> {
+    @observable inputGroupName = '';
     @observable saveGroupToUser = true;
 
     @autobind
@@ -51,15 +67,15 @@ export default class CreateGroupFromOverlap extends React.Component<ICreateGroup
 
     @autobind
     @action
-    private onChangeInputGroupName(e:SyntheticEvent<HTMLInputElement>) {
+    private onChangeInputGroupName(e: SyntheticEvent<HTMLInputElement>) {
         this.inputGroupName = (e.target as HTMLInputElement).value;
     }
 
     @autobind
     @action
     private submit() {
-        let studiesAttr:SessionGroupData["studies"];
-        if (this.props.caseType === "sample") {
+        let studiesAttr: SessionGroupData['studies'];
+        if (this.props.caseType === 'sample') {
             studiesAttr = getStudiesAttrForSampleOverlapGroup(
                 this.props.store._originalGroups.result!,
                 this.props.includedRegions,
@@ -71,85 +87,116 @@ export default class CreateGroupFromOverlap extends React.Component<ICreateGroup
                 this.props.includedRegions,
                 this.props.allGroupsInPlot,
                 this.props.store.patientToSamplesSet.result!
-            )
+            );
         }
 
-        this.props.submitGroup({
-            name: this.inputGroupName,
-            description: "",
-            studies:studiesAttr,
-            origin:this.props.store.origin.result!
-        }, this.saveGroupToUser);
+        this.props.submitGroup(
+            {
+                name: this.inputGroupName,
+                description: '',
+                studies: studiesAttr,
+                origin: this.props.store.origin.result!,
+            },
+            this.saveGroupToUser
+        );
     }
 
     @computed get isDuplicateName() {
-        const existingGroupNamesObj = this.props.store.existingGroupNames.result!;
+        const existingGroupNamesObj = this.props.store.existingGroupNames
+            .result!;
         let existingGroupNames = existingGroupNamesObj.session;
         if (this.saveGroupToUser) {
             // if we're going to save the group to the user, we have to compare the group name
             //  with all existing groups on the user for these studies
-            existingGroupNames = existingGroupNames.concat(existingGroupNamesObj.user);
+            existingGroupNames = existingGroupNames.concat(
+                existingGroupNamesObj.user
+            );
         }
         return existingGroupNames.includes(this.inputGroupName.trim());
     }
 
     private readonly enterNameInterface = MakeMobxView({
-        await:()=>[
+        await: () => [
             this.props.store.origin,
             this.props.store.sampleSet,
             this.props.store.existingGroupNames,
             this.props.store._originalGroups,
-            this.props.store.patientToSamplesSet
+            this.props.store.patientToSamplesSet,
         ],
-        render:()=>(
-            <div style={{width:250}}>
+        render: () => (
+            <div style={{ width: 250 }}>
                 {this.props.store.isLoggedIn && (
                     <FlexAlignedCheckbox
                         checked={this.saveGroupToUser}
                         onClick={this.toggleSaveGroupToUser}
                         label={[
-                            <span style={{marginRight:5}}>Save group to user account</span>,
-                            <InfoIcon divStyle={{display:"inline"}} tooltip={<span>Selecting this will save the new group with the associated study in your user account.</span>}/>
+                            <span style={{ marginRight: 5 }}>
+                                Save group to user account
+                            </span>,
+                            <InfoIcon
+                                divStyle={{ display: 'inline' }}
+                                tooltip={
+                                    <span>
+                                        Selecting this will save the new group
+                                        with the associated study in your user
+                                        account.
+                                    </span>
+                                }
+                            />,
                         ]}
                     />
                 )}
-                <div style={{display:"flex", justifyContent:"center", alignItems:"center"}}>
+                <div
+                    style={{
+                        display: 'flex',
+                        justifyContent: 'center',
+                        alignItems: 'center',
+                    }}
+                >
                     <input
                         className="form-control"
-                        style={{ marginRight:5 }}
+                        style={{ marginRight: 5 }}
                         type="text"
                         placeholder="Enter a group name.."
                         value={this.inputGroupName}
                         onChange={this.onChangeInputGroupName}
-                        data-test={this.props.caseType + "GroupNameInputField"}
+                        data-test={this.props.caseType + 'GroupNameInputField'}
                     />
                     <button
                         className="btn btm-sm btn-primary"
-                        disabled={this.inputGroupName.length === 0 || this.isDuplicateName}
+                        disabled={
+                            this.inputGroupName.length === 0 ||
+                            this.isDuplicateName
+                        }
                         onClick={this.submit}
-                        data-test={this.props.caseType + "GroupNameSubmitButton"}
+                        data-test={
+                            this.props.caseType + 'GroupNameSubmitButton'
+                        }
                     >
                         Submit
                     </button>
                 </div>
-                { this.isDuplicateName && (
-                    <div style={{marginTop:4}} data-test={this.props.caseType + "DuplicateGroupNameMessage"}>
+                {this.isDuplicateName && (
+                    <div
+                        style={{ marginTop: 4 }}
+                        data-test={
+                            this.props.caseType + 'DuplicateGroupNameMessage'
+                        }
+                    >
                         {DUPLICATE_GROUP_NAME_MSG}
                     </div>
                 )}
             </div>
         ),
-        renderPending:()=><LoadingIndicator isLoading={true}/>
+        renderPending: () => <LoadingIndicator isLoading={true} />,
     });
 
     private readonly includedRegionsDescription = MakeMobxView({
-        await:()=>[
-            this.props.store.uidToGroup
-        ],
-        render:()=>{
+        await: () => [this.props.store.uidToGroup],
+        render: () => {
             return (
                 <div>
-                    {this.props.includedRegions.map(region=>(
+                    {this.props.includedRegions.map(region => (
                         <div>
                             {getRegionSummary(
                                 region,
@@ -161,33 +208,45 @@ export default class CreateGroupFromOverlap extends React.Component<ICreateGroup
                     ))}
                 </div>
             );
-        }
+        },
     });
 
     render() {
         return (
-            <div style={Object.assign({
-                width:this.props.width,
-                display:"flex",
-                flexDirection:"column",
-                justifyContent:"center",
-                alignItems:"center",
-            }, this.props.style)}>
+            <div
+                style={Object.assign(
+                    {
+                        width: this.props.width,
+                        display: 'flex',
+                        flexDirection: 'column',
+                        justifyContent: 'center',
+                        alignItems: 'center',
+                    },
+                    this.props.style
+                )}
+            >
                 <DefaultTooltip
-                    trigger={["click"]}
+                    trigger={['click']}
                     overlay={this.enterNameInterface.component}
                     placement="top"
                 >
                     <button
                         className="btn btn-md btn-primary"
                         disabled={this.props.includedRegions.length === 0}
-                        data-event={serializeEvent({action:'createGroupFromVenn',label:'', category:'groupComparison' })}
-                        data-test={this.props.caseType + "GroupComparisonCreateGroupButton"}
+                        data-event={serializeEvent({
+                            action: 'createGroupFromVenn',
+                            label: '',
+                            category: 'groupComparison',
+                        })}
+                        data-test={
+                            this.props.caseType +
+                            'GroupComparisonCreateGroupButton'
+                        }
                     >
                         Create Group From Selected Diagram Areas
                     </button>
                 </DefaultTooltip>
-                <div style={{marginTop:20}}>
+                <div style={{ marginTop: 20 }}>
                     {this.includedRegionsDescription.component}
                 </div>
             </div>
diff --git a/src/pages/groupComparison/GroupComparisonLoading.tsx b/src/pages/groupComparison/GroupComparisonLoading.tsx
index d1fc7cc6f27..9d346d37c0e 100644
--- a/src/pages/groupComparison/GroupComparisonLoading.tsx
+++ b/src/pages/groupComparison/GroupComparisonLoading.tsx
@@ -1,40 +1,43 @@
-import * as React from "react";
-import {observer} from "mobx-react";
-import LoadingIndicator from "../../shared/components/loadingIndicator/LoadingIndicator";
-import {AppStore} from "../../AppStore";
-import {computed, observable} from "mobx";
-import {getStudySummaryUrl} from "../../shared/api/urls";
+import * as React from 'react';
+import { observer } from 'mobx-react';
+import LoadingIndicator from '../../shared/components/loadingIndicator/LoadingIndicator';
+import { AppStore } from '../../AppStore';
+import { computed, observable } from 'mobx';
+import { getStudySummaryUrl } from '../../shared/api/urls';
 
 export interface IGroupComparisonLoadingProps {
-    routing:any;
-    appStore:AppStore;
+    routing: any;
+    appStore: AppStore;
 }
 
 export type GroupComparisonLoadingParams = {
-    phase:LoadingPhase,
-    clinicalAttributeName:string;
-    origin:string;
-}
+    phase: LoadingPhase;
+    clinicalAttributeName: string;
+    origin: string;
+};
 
 export enum LoadingPhase {
-    DOWNLOADING_GROUPS="downloading",
-    CREATING_SESSION="creating_session"
+    DOWNLOADING_GROUPS = 'downloading',
+    CREATING_SESSION = 'creating_session',
 }
 
 @observer
-export default class GroupComparisonLoading extends React.Component<IGroupComparisonLoadingProps, {}> {
+export default class GroupComparisonLoading extends React.Component<
+    IGroupComparisonLoadingProps,
+    {}
+> {
     @observable studyViewWindowClosed = false;
     private pingedFromStudyView = false;
-    private studyViewInterval:any;
+    private studyViewInterval: any;
 
-    constructor(props:IGroupComparisonLoadingProps) {
+    constructor(props: IGroupComparisonLoadingProps) {
         super(props);
 
-        (window as any).ping = ()=>{
+        (window as any).ping = () => {
             this.pingedFromStudyView = true;
         };
 
-        this.studyViewInterval = setInterval(()=>{
+        this.studyViewInterval = setInterval(() => {
             if (!this.pingedFromStudyView) {
                 this.studyViewWindowClosed = true;
                 clearInterval(this.studyViewInterval);
@@ -48,31 +51,48 @@ export default class GroupComparisonLoading extends React.Component<IGroupCompar
     }
 
     render() {
-        const query = (window as any).routingStore.location.query as Partial<GroupComparisonLoadingParams>;
+        const query = (window as any).routingStore.location.query as Partial<
+            GroupComparisonLoadingParams
+        >;
         if (this.studyViewWindowClosed) {
             return (
-                <div style={{
-                    position:"absolute",
-                    width:300,
-                    left:"50%",
-                    top:200,
-                    transform:"translate(-50%, 0)"
-                }}>
+                <div
+                    style={{
+                        position: 'absolute',
+                        width: 300,
+                        left: '50%',
+                        top: 200,
+                        transform: 'translate(-50%, 0)',
+                    }}
+                >
                     <div className="alert alert-error">
-                        <i className="fa fa-md fa-exclamation-triangle" style={{marginRight:7}}/>
-                        Sorry - please don't close the Study Summary window until the comparison page has finished loading.
-                        <br/>
-                        <br/>
-                        <a href={getStudySummaryUrl(query.origin!.split(","))}>Back to Study Summary</a>
+                        <i
+                            className="fa fa-md fa-exclamation-triangle"
+                            style={{ marginRight: 7 }}
+                        />
+                        Sorry - please don't close the Study Summary window
+                        until the comparison page has finished loading.
+                        <br />
+                        <br />
+                        <a href={getStudySummaryUrl(query.origin!.split(','))}>
+                            Back to Study Summary
+                        </a>
                     </div>
                 </div>
             );
         } else {
-            const ret:JSX.Element[] = [];
+            const ret: JSX.Element[] = [];
             switch (query.phase) {
                 case LoadingPhase.DOWNLOADING_GROUPS:
                     if (query.clinicalAttributeName) {
-                        ret.push(<div>Loading each subgroup of <span style={{whiteSpace:"nowrap"}}>{query.clinicalAttributeName}...</span></div>);
+                        ret.push(
+                            <div>
+                                Loading each subgroup of{' '}
+                                <span style={{ whiteSpace: 'nowrap' }}>
+                                    {query.clinicalAttributeName}...
+                                </span>
+                            </div>
+                        );
                     } else {
                         ret.push(<div>Creating groups...</div>);
                     }
@@ -82,15 +102,15 @@ export default class GroupComparisonLoading extends React.Component<IGroupCompar
                     ret.push(<div>Creating comparison session...</div>);
                     break;
                 default:
-                    ret.push(<div>Redirecting you to the Comparison page...</div>);
+                    ret.push(
+                        <div>Redirecting you to the Comparison page...</div>
+                    );
             }
             return (
                 <LoadingIndicator center={true} isLoading={true} size="big">
-                    <div style={{marginTop:20}}>
-                        {ret}
-                    </div>
+                    <div style={{ marginTop: 20 }}>{ret}</div>
                 </LoadingIndicator>
             );
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/groupComparison/GroupComparisonPage.tsx b/src/pages/groupComparison/GroupComparisonPage.tsx
index 0da1221d7fa..4e7bb240f4d 100644
--- a/src/pages/groupComparison/GroupComparisonPage.tsx
+++ b/src/pages/groupComparison/GroupComparisonPage.tsx
@@ -1,52 +1,65 @@
-import * as React from "react";
-import {inject, observer} from "mobx-react";
-import GroupComparisonStore, {OverlapStrategy} from "./GroupComparisonStore";
-import MutationEnrichments from "./MutationEnrichments";
-import {MSKTab, MSKTabs} from "../../shared/components/MSKTabs/MSKTabs";
-import {PageLayout} from "../../shared/components/PageLayout/PageLayout";
-import Survival from "./Survival";
-import Overlap from "./Overlap";
-import CopyNumberEnrichments from "./CopyNumberEnrichments";
-import MRNAEnrichments from "./MRNAEnrichments";
-import ProteinEnrichments from "./ProteinEnrichments";
-import {MakeMobxView} from "../../shared/components/MobxView";
-import LoadingIndicator from "../../shared/components/loadingIndicator/LoadingIndicator";
-import ErrorMessage from "../../shared/components/ErrorMessage";
-import GroupSelector from "./groupSelector/GroupSelector";
-import { GroupComparisonTab } from "./GroupComparisonTabs"
-import {StudyLink} from "shared/components/StudyLink/StudyLink";
-import {action, computed, IReactionDisposer, observable, reaction} from "mobx";
-import autobind from "autobind-decorator";
-import {AppStore} from "../../AppStore";
-import ClinicalData from "./ClinicalData";
-import ReactSelect from "react-select";
-import {trackEvent} from "shared/lib/tracking";
-import URL from "url";
-import GroupComparisonURLWrapper, {GroupComparisonURLQuery} from "./GroupComparisonURLWrapper";
+import * as React from 'react';
+import { inject, observer } from 'mobx-react';
+import GroupComparisonStore, { OverlapStrategy } from './GroupComparisonStore';
+import MutationEnrichments from './MutationEnrichments';
+import { MSKTab, MSKTabs } from '../../shared/components/MSKTabs/MSKTabs';
+import { PageLayout } from '../../shared/components/PageLayout/PageLayout';
+import Survival from './Survival';
+import Overlap from './Overlap';
+import CopyNumberEnrichments from './CopyNumberEnrichments';
+import MRNAEnrichments from './MRNAEnrichments';
+import ProteinEnrichments from './ProteinEnrichments';
+import { MakeMobxView } from '../../shared/components/MobxView';
+import LoadingIndicator from '../../shared/components/loadingIndicator/LoadingIndicator';
+import ErrorMessage from '../../shared/components/ErrorMessage';
+import GroupSelector from './groupSelector/GroupSelector';
+import { GroupComparisonTab } from './GroupComparisonTabs';
+import { StudyLink } from 'shared/components/StudyLink/StudyLink';
+import {
+    action,
+    computed,
+    IReactionDisposer,
+    observable,
+    reaction,
+} from 'mobx';
+import autobind from 'autobind-decorator';
+import { AppStore } from '../../AppStore';
+import ClinicalData from './ClinicalData';
+import ReactSelect from 'react-select';
+import { trackEvent } from 'shared/lib/tracking';
+import URL from 'url';
+import GroupComparisonURLWrapper, {
+    GroupComparisonURLQuery,
+} from './GroupComparisonURLWrapper';
 
-import styles from "./styles.module.scss";
+import styles from './styles.module.scss';
 import 'cbioportal-frontend-commons/dist/styles.css';
 
 export interface IGroupComparisonPageProps {
-    routing:any;
-    appStore:AppStore;
+    routing: any;
+    appStore: AppStore;
 }
 
 @inject('routing', 'appStore')
 @observer
-export default class GroupComparisonPage extends React.Component<IGroupComparisonPageProps, {}> {
-    @observable.ref private store:GroupComparisonStore;
-    private queryReaction:IReactionDisposer;
-    private urlWrapper:GroupComparisonURLWrapper;
+export default class GroupComparisonPage extends React.Component<
+    IGroupComparisonPageProps,
+    {}
+> {
+    @observable.ref private store: GroupComparisonStore;
+    private queryReaction: IReactionDisposer;
+    private urlWrapper: GroupComparisonURLWrapper;
 
-    constructor(props:IGroupComparisonPageProps) {
+    constructor(props: IGroupComparisonPageProps) {
         super(props);
         this.urlWrapper = new GroupComparisonURLWrapper(props.routing);
         this.queryReaction = reaction(
             () => this.urlWrapper.query.sessionId,
             sessionId => {
-
-                if (!props.routing.location.pathname.includes("/comparison") || !sessionId) {
+                if (
+                    !props.routing.location.pathname.includes('/comparison') ||
+                    !sessionId
+                ) {
                     return;
                 }
 
@@ -54,28 +67,32 @@ export default class GroupComparisonPage extends React.Component<IGroupCompariso
                     this.store.destroy();
                 }
 
-                this.store = new GroupComparisonStore(sessionId, this.props.appStore, this.urlWrapper);
+                this.store = new GroupComparisonStore(
+                    sessionId,
+                    this.props.appStore,
+                    this.urlWrapper
+                );
                 (window as any).groupComparisonStore = this.store;
             },
-            {fireImmediately: true}
+            { fireImmediately: true }
         );
 
         (window as any).groupComparisonPage = this;
     }
 
     @autobind
-    private getTabHref(tabId:string) {
+    private getTabHref(tabId: string) {
         return URL.format({
-            pathname:tabId,
-            query:this.props.routing.location.query,
-            hash:this.props.routing.location.hash
+            pathname: tabId,
+            query: this.props.routing.location.query,
+            hash: this.props.routing.location.hash,
         });
     }
 
     @computed get selectedGroupsKey() {
         // for components which should remount whenever selected groups change
         const selectedGroups = this.store._selectedGroups.result || [];
-        return JSON.stringify(selectedGroups.map(g=>g.uid));
+        return JSON.stringify(selectedGroups.map(g => g.uid));
     }
 
     componentWillUnmount() {
@@ -85,7 +102,7 @@ export default class GroupComparisonPage extends React.Component<IGroupCompariso
     }
 
     readonly tabs = MakeMobxView({
-        await:()=>[
+        await: () => [
             this.store._activeGroupsNotOverlapRemoved,
             this.store.activeGroups,
             this.store.mutationEnrichmentProfiles,
@@ -94,13 +111,14 @@ export default class GroupComparisonPage extends React.Component<IGroupCompariso
             this.store.proteinEnrichmentProfiles,
             this.store.survivalClinicalDataExists,
         ],
-        render:()=>{
+        render: () => {
             return (
-                <MSKTabs unmountOnHide={false}
-                         activeTabId={this.urlWrapper.tabId}
-                         onTabClick={this.urlWrapper.setTabId}
-                         className="primaryTabs mainTabs"
-                         getTabHref={this.getTabHref}
+                <MSKTabs
+                    unmountOnHide={false}
+                    activeTabId={this.urlWrapper.tabId}
+                    onTabClick={this.urlWrapper.setTabId}
+                    className="primaryTabs mainTabs"
+                    getTabHref={this.getTabHref}
                 >
                     <MSKTab id={GroupComparisonTab.OVERLAP} linkText="Overlap">
                         <Overlap
@@ -108,121 +126,194 @@ export default class GroupComparisonPage extends React.Component<IGroupCompariso
                             store={this.store}
                         />
                     </MSKTab>
-                    {
-                        this.store.showSurvivalTab &&
-                        <MSKTab id={GroupComparisonTab.SURVIVAL} linkText="Survival"
-                                anchorClassName={this.store.survivalTabUnavailable ? "greyedOut" : ""}
+                    {this.store.showSurvivalTab && (
+                        <MSKTab
+                            id={GroupComparisonTab.SURVIVAL}
+                            linkText="Survival"
+                            anchorClassName={
+                                this.store.survivalTabUnavailable
+                                    ? 'greyedOut'
+                                    : ''
+                            }
                         >
-                            <Survival store={this.store}/>
+                            <Survival store={this.store} />
                         </MSKTab>
-                    }
-                    <MSKTab id={GroupComparisonTab.CLINICAL} linkText="Clinical"
-                        anchorClassName={this.store.clinicalTabUnavailable ? "greyedOut" : ""}>
-                        <ClinicalData store={this.store}/>
+                    )}
+                    <MSKTab
+                        id={GroupComparisonTab.CLINICAL}
+                        linkText="Clinical"
+                        anchorClassName={
+                            this.store.clinicalTabUnavailable ? 'greyedOut' : ''
+                        }
+                    >
+                        <ClinicalData store={this.store} />
                     </MSKTab>
                     {this.store.showMutationsTab && (
-                        <MSKTab id={GroupComparisonTab.MUTATIONS} linkText="Mutations"
-                            anchorClassName={this.store.mutationsTabUnavailable ? "greyedOut" : ""}
+                        <MSKTab
+                            id={GroupComparisonTab.MUTATIONS}
+                            linkText="Mutations"
+                            anchorClassName={
+                                this.store.mutationsTabUnavailable
+                                    ? 'greyedOut'
+                                    : ''
+                            }
                         >
-                            <MutationEnrichments store={this.store}/>
+                            <MutationEnrichments store={this.store} />
                         </MSKTab>
                     )}
                     {this.store.showCopyNumberTab && (
-                        <MSKTab id={GroupComparisonTab.CNA} linkText="Copy-number"
-                            anchorClassName={this.store.copyNumberUnavailable ? "greyedOut" : ""}
+                        <MSKTab
+                            id={GroupComparisonTab.CNA}
+                            linkText="Copy-number"
+                            anchorClassName={
+                                this.store.copyNumberUnavailable
+                                    ? 'greyedOut'
+                                    : ''
+                            }
                         >
-                            <CopyNumberEnrichments store={this.store}/>
+                            <CopyNumberEnrichments store={this.store} />
                         </MSKTab>
                     )}
                     {this.store.showMRNATab && (
-                        <MSKTab id={GroupComparisonTab.MRNA} linkText="mRNA"
-                            anchorClassName={this.store.mRNATabUnavailable ? "greyedOut" : ""}
+                        <MSKTab
+                            id={GroupComparisonTab.MRNA}
+                            linkText="mRNA"
+                            anchorClassName={
+                                this.store.mRNATabUnavailable ? 'greyedOut' : ''
+                            }
                         >
-                            <MRNAEnrichments store={this.store}/>
+                            <MRNAEnrichments store={this.store} />
                         </MSKTab>
                     )}
                     {this.store.showProteinTab && (
-                        <MSKTab id={GroupComparisonTab.PROTEIN} linkText="Protein"
-                            anchorClassName={this.store.proteinTabUnavailable ? "greyedOut" : ""}
+                        <MSKTab
+                            id={GroupComparisonTab.PROTEIN}
+                            linkText="Protein"
+                            anchorClassName={
+                                this.store.proteinTabUnavailable
+                                    ? 'greyedOut'
+                                    : ''
+                            }
                         >
-                            <ProteinEnrichments store={this.store}/>
+                            <ProteinEnrichments store={this.store} />
                         </MSKTab>
                     )}
                 </MSKTabs>
             );
         },
-        renderPending:()=><LoadingIndicator center={true} isLoading={true}  size={"big"} />,
-        renderError:()=><ErrorMessage/>
+        renderPending: () => (
+            <LoadingIndicator center={true} isLoading={true} size={'big'} />
+        ),
+        renderError: () => <ErrorMessage />,
     });
 
     readonly studyLink = MakeMobxView({
-        await:()=>[this.store.studies],
-        render:()=>{
+        await: () => [this.store.studies],
+        render: () => {
             const studies = this.store.studies.result!;
-            let studyHeader = <span/>;
+            let studyHeader = <span />;
             switch (studies.length) {
                 case 0:
-                    studyHeader = <span/>;
+                    studyHeader = <span />;
                     break;
                 case 1:
-                    studyHeader = <h3><StudyLink studyId={studies[0].studyId}>{studies[0].name}</StudyLink></h3>;
+                    studyHeader = (
+                        <h3>
+                            <StudyLink studyId={studies[0].studyId}>
+                                {studies[0].name}
+                            </StudyLink>
+                        </h3>
+                    );
                     break;
                 default:
-                    studyHeader = (<h4>
-                        <a
-                            href={`study?id=${studies.map(study => study.studyId).join(',')}`}
-                            target="_blank"
-                        >
-                            Multiple studies
-                        </a>
-                    </h4>);
+                    studyHeader = (
+                        <h4>
+                            <a
+                                href={`study?id=${studies
+                                    .map(study => study.studyId)
+                                    .join(',')}`}
+                                target="_blank"
+                            >
+                                Multiple studies
+                            </a>
+                        </h4>
+                    );
             }
             let ret;
             if (this.store.sessionClinicalAttributeName) {
-                ret = <span>{studyHeader}Groups from <span style={{fontWeight:"bold", fontStyle:"italic"}}>{this.store.sessionClinicalAttributeName}</span></span>
+                ret = (
+                    <span>
+                        {studyHeader}Groups from{' '}
+                        <span
+                            style={{ fontWeight: 'bold', fontStyle: 'italic' }}
+                        >
+                            {this.store.sessionClinicalAttributeName}
+                        </span>
+                    </span>
+                );
             } else {
                 ret = studyHeader;
             }
             return ret;
-        }
+        },
     });
 
     @autobind
     @action
-    public onOverlapStrategySelect(option:any) {
-        trackEvent({ category:'groupComparison', action:'setOverlapStrategy', label:option.value});
+    public onOverlapStrategySelect(option: any) {
+        trackEvent({
+            category: 'groupComparison',
+            action: 'setOverlapStrategy',
+            label: option.value,
+        });
         this.store.updateOverlapStrategy(option.value as OverlapStrategy);
     }
 
     readonly overlapStrategySelector = MakeMobxView({
-        await:()=>[this.store.overlapComputations],
-        render:()=>{
-            if (!this.store.overlapComputations.result!.totalSampleOverlap && !this.store.overlapComputations.result!.totalPatientOverlap) {
+        await: () => [this.store.overlapComputations],
+        render: () => {
+            if (
+                !this.store.overlapComputations.result!.totalSampleOverlap &&
+                !this.store.overlapComputations.result!.totalPatientOverlap
+            ) {
                 return null;
             } else {
-                const includeLabel = "Include overlapping samples and patients";
-                const excludeLabel = "Exclude overlapping samples and patients";
+                const includeLabel = 'Include overlapping samples and patients';
+                const excludeLabel = 'Exclude overlapping samples and patients';
                 return (
-                    <div style={{minWidth:355, width:355, zIndex:20}}>
+                    <div style={{ minWidth: 355, width: 355, zIndex: 20 }}>
                         <ReactSelect
                             name="select overlap strategy"
-                            onChange={(option:any|null)=>{
+                            onChange={(option: any | null) => {
                                 if (option) {
                                     this.onOverlapStrategySelect(option);
                                 }
                             }}
                             options={[
-                                { label: includeLabel, value: OverlapStrategy.INCLUDE },
-                                { label: excludeLabel, value: OverlapStrategy.EXCLUDE }
+                                {
+                                    label: includeLabel,
+                                    value: OverlapStrategy.INCLUDE,
+                                },
+                                {
+                                    label: excludeLabel,
+                                    value: OverlapStrategy.EXCLUDE,
+                                },
                             ]}
                             clearable={false}
                             searchable={false}
-                            value={{ label: this.store.overlapStrategy === OverlapStrategy.EXCLUDE ? excludeLabel : includeLabel, value: this.store.overlapStrategy}}
+                            value={{
+                                label:
+                                    this.store.overlapStrategy ===
+                                    OverlapStrategy.EXCLUDE
+                                        ? excludeLabel
+                                        : includeLabel,
+                                value: this.store.overlapStrategy,
+                            }}
                         />
                     </div>
                 );
             }
-        }
+        },
     });
 
     render() {
@@ -231,25 +322,34 @@ export default class GroupComparisonPage extends React.Component<IGroupCompariso
         }
 
         return (
-            <PageLayout noMargin={true} hideFooter={true} className={"subhead-dark"}>
+            <PageLayout
+                noMargin={true}
+                hideFooter={true}
+                className={'subhead-dark'}
+            >
                 <div>
-                    <LoadingIndicator center={true} isLoading={this.store.newSessionPending}  size={"big"} />
-                    <div className={"headBlock"}>
-                        <div style={{display:"flex", justifyContent:"space-between"}}>
+                    <LoadingIndicator
+                        center={true}
+                        isLoading={this.store.newSessionPending}
+                        size={'big'}
+                    />
+                    <div className={'headBlock'}>
+                        <div
+                            style={{
+                                display: 'flex',
+                                justifyContent: 'space-between',
+                            }}
+                        >
                             {this.studyLink.component}
                             {this.overlapStrategySelector.component}
                         </div>
                         <div>
                             <div className={styles.headerControls}>
-                                <GroupSelector
-                                    store = {this.store}
-                                />
+                                <GroupSelector store={this.store} />
                             </div>
                         </div>
                     </div>
-                    <div>
-                        {this.tabs.component}
-                    </div>
+                    <div>{this.tabs.component}</div>
                 </div>
             </PageLayout>
         );
diff --git a/src/pages/groupComparison/GroupComparisonStore.ts b/src/pages/groupComparison/GroupComparisonStore.ts
index dd0727eede3..52bc30aaa4b 100644
--- a/src/pages/groupComparison/GroupComparisonStore.ts
+++ b/src/pages/groupComparison/GroupComparisonStore.ts
@@ -12,99 +12,117 @@ import {
     isGroupEmpty,
     partitionCasesByGroupMembership,
     getNumSamples,
-} from "./GroupComparisonUtils";
-import { GroupComparisonTab } from "./GroupComparisonTabs"
-import {remoteData, stringListToIndexSet} from "cbioportal-frontend-commons";
+} from './GroupComparisonUtils';
+import { GroupComparisonTab } from './GroupComparisonTabs';
+import { remoteData, stringListToIndexSet } from 'cbioportal-frontend-commons';
 import {
     CancerStudy,
     ClinicalAttribute,
     ClinicalData,
     ClinicalDataMultiStudyFilter,
     MolecularProfile,
-    MolecularProfileFilter, ReferenceGenomeGene,
+    MolecularProfileFilter,
+    ReferenceGenomeGene,
     Sample,
-    SampleFilter
-} from "../../shared/api/generated/CBioPortalAPI";
-import {action, autorun, computed, IReactionDisposer, observable} from "mobx";
-import client from "../../shared/api/cbioportalClientInstance";
-import comparisonClient from "../../shared/api/comparisonGroupClientInstance";
-import _ from "lodash";
+    SampleFilter,
+} from '../../shared/api/generated/CBioPortalAPI';
+import { action, autorun, computed, IReactionDisposer, observable } from 'mobx';
+import client from '../../shared/api/cbioportalClientInstance';
+import comparisonClient from '../../shared/api/comparisonGroupClientInstance';
+import _ from 'lodash';
 import {
     pickCopyNumberEnrichmentProfiles,
     pickMRNAEnrichmentProfiles,
     pickMutationEnrichmentProfiles,
-    pickProteinEnrichmentProfiles
-} from "../resultsView/enrichments/EnrichmentsUtil";
-import {makeEnrichmentDataPromise} from "../resultsView/ResultsViewPageStoreUtils";
-import internalClient from "../../shared/api/cbioportalInternalClientInstance";
-import autobind from "autobind-decorator";
-import {PatientSurvival} from "shared/model/PatientSurvival";
-import request from "superagent";
-import {getPatientSurvivals} from "pages/resultsView/SurvivalStoreHelper";
-import {SURVIVAL_CHART_ATTRIBUTES} from "pages/resultsView/survival/SurvivalChart";
-import {getPatientIdentifiers, pickClinicalDataColors} from "pages/studyView/StudyViewUtils";
+    pickProteinEnrichmentProfiles,
+} from '../resultsView/enrichments/EnrichmentsUtil';
+import { makeEnrichmentDataPromise } from '../resultsView/ResultsViewPageStoreUtils';
+import internalClient from '../../shared/api/cbioportalInternalClientInstance';
+import autobind from 'autobind-decorator';
+import { PatientSurvival } from 'shared/model/PatientSurvival';
+import request from 'superagent';
+import { getPatientSurvivals } from 'pages/resultsView/SurvivalStoreHelper';
+import { SURVIVAL_CHART_ATTRIBUTES } from 'pages/resultsView/survival/SurvivalChart';
+import {
+    getPatientIdentifiers,
+    pickClinicalDataColors,
+} from 'pages/studyView/StudyViewUtils';
 import {
     AlterationEnrichment,
     Group,
-    MolecularProfileCasesGroupFilter
-} from "../../shared/api/generated/CBioPortalAPIInternal";
-import {Session, SessionGroupData} from "../../shared/api/ComparisonGroupClient";
-import {calculateQValues} from "shared/lib/calculation/BenjaminiHochbergFDRCalculator";
-import ComplexKeyMap from "../../shared/lib/complexKeyDataStructures/ComplexKeyMap";
-import ComplexKeyGroupsMap from "../../shared/lib/complexKeyDataStructures/ComplexKeyGroupsMap";
-import {AppStore} from "../../AppStore";
-import {GACustomFieldsEnum, trackEvent} from "shared/lib/tracking";
-import ifNotDefined from "../../shared/lib/ifNotDefined";
-import {ISurvivalDescription} from "pages/resultsView/survival/SurvivalDescriptionTable";
-import GroupComparisonURLWrapper from "./GroupComparisonURLWrapper";
-import {CancerStudyQueryUrlParams} from "../../shared/components/query/QueryStore";
-import {fetchAllReferenceGenomeGenes} from "shared/lib/StoreUtils";
+    MolecularProfileCasesGroupFilter,
+} from '../../shared/api/generated/CBioPortalAPIInternal';
+import {
+    Session,
+    SessionGroupData,
+} from '../../shared/api/ComparisonGroupClient';
+import { calculateQValues } from 'shared/lib/calculation/BenjaminiHochbergFDRCalculator';
+import ComplexKeyMap from '../../shared/lib/complexKeyDataStructures/ComplexKeyMap';
+import ComplexKeyGroupsMap from '../../shared/lib/complexKeyDataStructures/ComplexKeyGroupsMap';
+import { AppStore } from '../../AppStore';
+import { GACustomFieldsEnum, trackEvent } from 'shared/lib/tracking';
+import ifNotDefined from '../../shared/lib/ifNotDefined';
+import { ISurvivalDescription } from 'pages/resultsView/survival/SurvivalDescriptionTable';
+import GroupComparisonURLWrapper from './GroupComparisonURLWrapper';
+import { CancerStudyQueryUrlParams } from '../../shared/components/query/QueryStore';
+import { fetchAllReferenceGenomeGenes } from 'shared/lib/StoreUtils';
 
 export enum OverlapStrategy {
-    INCLUDE = "Include",
-    EXCLUDE = "Exclude",
+    INCLUDE = 'Include',
+    EXCLUDE = 'Exclude',
 }
 
 export default class GroupComparisonStore {
-
-    @observable private _currentTabId:GroupComparisonTab|undefined = undefined;
-    @observable private sessionId:string;
+    @observable private _currentTabId:
+        | GroupComparisonTab
+        | undefined = undefined;
+    @observable private sessionId: string;
     @observable public newSessionPending = false;
     private tabHasBeenShown = observable.map<boolean>();
-    private tabHasBeenShownReactionDisposer:IReactionDisposer;
+    private tabHasBeenShownReactionDisposer: IReactionDisposer;
 
-    constructor(sessionId:string, private appStore:AppStore, private urlWrapper:GroupComparisonURLWrapper) {
+    constructor(
+        sessionId: string,
+        private appStore: AppStore,
+        private urlWrapper: GroupComparisonURLWrapper
+    ) {
         this.sessionId = sessionId;
 
-        this.tabHasBeenShownReactionDisposer = autorun(()=>{
+        this.tabHasBeenShownReactionDisposer = autorun(() => {
             this.tabHasBeenShown.set(
                 GroupComparisonTab.SURVIVAL,
-                !!this.tabHasBeenShown.get(GroupComparisonTab.SURVIVAL) || this.showSurvivalTab
+                !!this.tabHasBeenShown.get(GroupComparisonTab.SURVIVAL) ||
+                    this.showSurvivalTab
             );
             this.tabHasBeenShown.set(
                 GroupComparisonTab.MUTATIONS,
-                !!this.tabHasBeenShown.get(GroupComparisonTab.MUTATIONS) || this.showMutationsTab
+                !!this.tabHasBeenShown.get(GroupComparisonTab.MUTATIONS) ||
+                    this.showMutationsTab
             );
             this.tabHasBeenShown.set(
                 GroupComparisonTab.CNA,
-                !!this.tabHasBeenShown.get(GroupComparisonTab.CNA) || this.showCopyNumberTab
+                !!this.tabHasBeenShown.get(GroupComparisonTab.CNA) ||
+                    this.showCopyNumberTab
             );
             this.tabHasBeenShown.set(
                 GroupComparisonTab.MRNA,
-                !!this.tabHasBeenShown.get(GroupComparisonTab.MRNA) || this.showMRNATab
+                !!this.tabHasBeenShown.get(GroupComparisonTab.MRNA) ||
+                    this.showMRNATab
             );
             this.tabHasBeenShown.set(
                 GroupComparisonTab.PROTEIN,
-                !!this.tabHasBeenShown.get(GroupComparisonTab.PROTEIN) || this.showProteinTab
+                !!this.tabHasBeenShown.get(GroupComparisonTab.PROTEIN) ||
+                    this.showProteinTab
             );
         });
     }
 
     public destroy() {
-        this.tabHasBeenShownReactionDisposer && this.tabHasBeenShownReactionDisposer();
+        this.tabHasBeenShownReactionDisposer &&
+            this.tabHasBeenShownReactionDisposer();
     }
 
-    @action public updateOverlapStrategy(strategy:OverlapStrategy) {
+    @action public updateOverlapStrategy(strategy: OverlapStrategy) {
         this.urlWrapper.updateURL({ overlapStrategy: strategy });
     }
 
@@ -114,12 +132,13 @@ export default class GroupComparisonStore {
 
     @computed
     public get usePatientLevelEnrichments() {
-        return this.urlWrapper.query.patientEnrichments === "true";
+        return this.urlWrapper.query.patientEnrichments === 'true';
     }
 
     @autobind
-    @action public setUsePatientLevelEnrichments(e:boolean) {
-        this.urlWrapper.updateURL({ patientEnrichments: e.toString()});
+    @action
+    public setUsePatientLevelEnrichments(e: boolean) {
+        this.urlWrapper.updateURL({ patientEnrichments: e.toString() });
     }
 
     @computed get groupOrder() {
@@ -131,10 +150,10 @@ export default class GroupComparisonStore {
         }
     }
 
-    @action public updateGroupOrder(oldIndex:number, newIndex:number) {
+    @action public updateGroupOrder(oldIndex: number, newIndex: number) {
         let groupOrder = this.groupOrder;
         if (!groupOrder) {
-            groupOrder = this._originalGroups.result!.map(g=>g.name);
+            groupOrder = this._originalGroups.result!.map(g => g.name);
         }
         groupOrder = groupOrder.slice();
         const poppedUid = groupOrder.splice(oldIndex, 1)[0];
@@ -143,7 +162,7 @@ export default class GroupComparisonStore {
         this.urlWrapper.updateURL({ groupOrder: JSON.stringify(groupOrder) });
     }
 
-    @action private updateUnselectedGroups(names:string[]) {
+    @action private updateUnselectedGroups(names: string[]) {
         this.urlWrapper.updateURL({ unselectedGroups: JSON.stringify(names) });
     }
 
@@ -157,7 +176,8 @@ export default class GroupComparisonStore {
     }
 
     @autobind
-    @action public toggleGroupSelected(name:string) {
+    @action
+    public toggleGroupSelected(name: string) {
         const groups = this.unselectedGroups.slice();
         if (groups.includes(name)) {
             groups.splice(groups.indexOf(name), 1);
@@ -168,18 +188,20 @@ export default class GroupComparisonStore {
     }
 
     @autobind
-    @action public selectAllGroups() {
+    @action
+    public selectAllGroups() {
         this.updateUnselectedGroups([]);
     }
 
     @autobind
-    @action public deselectAllGroups() {
+    @action
+    public deselectAllGroups() {
         const groups = this._originalGroups.result!; // assumed complete
-        this.updateUnselectedGroups(groups.map(g=>g.name));
+        this.updateUnselectedGroups(groups.map(g => g.name));
     }
 
     @autobind
-    public isGroupSelected(name:string) {
+    public isGroupSelected(name: string) {
         return !this.unselectedGroups.includes(name);
     }
 
@@ -187,7 +209,7 @@ export default class GroupComparisonStore {
         return this.appStore.isLoggedIn;
     }
 
-    public async addGroup(group:SessionGroupData, saveToUser:boolean) {
+    public async addGroup(group: SessionGroupData, saveToUser: boolean) {
         this.newSessionPending = true;
         if (saveToUser && this.isLoggedIn) {
             await comparisonClient.addGroup(group);
@@ -198,44 +220,48 @@ export default class GroupComparisonStore {
         this.saveAndGoToSession(newSession);
     }
 
-    public async deleteGroup(name:string) {
+    public async deleteGroup(name: string) {
         this.newSessionPending = true;
         const newSession = _.cloneDeep(this._session.result!);
-        newSession.groups = newSession.groups.filter(g=>g.name !== name);
+        newSession.groups = newSession.groups.filter(g => g.name !== name);
 
         this.saveAndGoToSession(newSession);
     }
 
     @action
-    private async saveAndGoToSession(newSession:Session) {
-        const {id} = await comparisonClient.addComparisonSession(newSession);
-        this.urlWrapper.updateURL({ sessionId: id});
+    private async saveAndGoToSession(newSession: Session) {
+        const { id } = await comparisonClient.addComparisonSession(newSession);
+        this.urlWrapper.updateURL({ sessionId: id });
     }
 
     readonly _session = remoteData<Session>({
-        invoke:()=>{
+        invoke: () => {
             return comparisonClient.getComparisonSession(this.sessionId);
         },
-        onResult(data:Session){
+        onResult(data: Session) {
             try {
-                const studies = _.chain(data.groups).flatMap(group => group.studies).map((study=>study.id)).uniq().value();
+                const studies = _.chain(data.groups)
+                    .flatMap(group => group.studies)
+                    .map(study => study.id)
+                    .uniq()
+                    .value();
                 trackEvent({
-                               category: 'groupComparison',
-                               action: 'comparisonSessionViewed',
-                               label: studies.join(',') + ',',
-                               fieldsObject:{
-                                   [GACustomFieldsEnum.GroupCount]:data.groups.length
-                               }
-                           });
+                    category: 'groupComparison',
+                    action: 'comparisonSessionViewed',
+                    label: studies.join(',') + ',',
+                    fieldsObject: {
+                        [GACustomFieldsEnum.GroupCount]: data.groups.length,
+                    },
+                });
             } catch (ex) {
-                throw("Failure to track comparisonSessionViewed");
+                throw 'Failure to track comparisonSessionViewed';
             }
-        }
+        },
     });
 
     readonly origin = remoteData({
-        await:()=>[this._session],
-        invoke:()=>Promise.resolve(this._session.result!.origin)
+        await: () => [this._session],
+        invoke: () => Promise.resolve(this._session.result!.origin),
     });
 
     @computed get sessionClinicalAttributeName() {
@@ -247,102 +273,130 @@ export default class GroupComparisonStore {
     }
 
     readonly existingGroupNames = remoteData({
-        await:()=>[
-            this._originalGroups,
-            this.origin
-        ],
-        invoke:async()=>{
+        await: () => [this._originalGroups, this.origin],
+        invoke: async () => {
             const ret = {
-                session:this._originalGroups.result!.map(g=>g.name),
-                user:[] as string[]
+                session: this._originalGroups.result!.map(g => g.name),
+                user: [] as string[],
             };
             if (this.isLoggedIn) {
                 // need to add all groups belonging to this user for this origin
-                ret.user = (await comparisonClient.getGroupsForStudies(this.origin.result!)).map(g=>g.data.name);
+                ret.user = (await comparisonClient.getGroupsForStudies(
+                    this.origin.result!
+                )).map(g => g.data.name);
             }
             return ret;
-        }
+        },
     });
 
     readonly _unsortedOriginalGroups = remoteData<ComparisonGroup[]>({
-        await:()=>[this._session, this.sampleSet],
-        invoke:()=>{
+        await: () => [this._session, this.sampleSet],
+        invoke: () => {
             // (1) ensure color
             // (2) filter out, and add list of, nonexistent samples
             // (3) add patients
 
-            let ret:ComparisonGroup[] = [];
+            let ret: ComparisonGroup[] = [];
             const sampleSet = this.sampleSet.result!;
 
-            let defaultGroupColors = pickClinicalDataColors(
-                _.map(
-                    this._session.result!.groups,
-                        group=>({value: group.name})
-                ) as any);
+            let defaultGroupColors = pickClinicalDataColors(_.map(
+                this._session.result!.groups,
+                group => ({ value: group.name })
+            ) as any);
 
-            const finalizeGroup = (savedInSession:boolean, groupData:SessionGroupData, index:number)=>{
+            const finalizeGroup = (
+                savedInSession: boolean,
+                groupData: SessionGroupData,
+                index: number
+            ) => {
                 // assign color to group if no color given
-                let color = groupData.color || defaultGroupColors[groupData.name];
+                let color =
+                    groupData.color || defaultGroupColors[groupData.name];
 
-                const { nonExistentSamples, studies} = finalizeStudiesAttr(groupData, sampleSet);
+                const { nonExistentSamples, studies } = finalizeStudiesAttr(
+                    groupData,
+                    sampleSet
+                );
 
                 return Object.assign({}, groupData, {
                     color,
                     studies,
                     nonExistentSamples,
                     uid: groupData.name,
-                    nameWithOrdinal: "", // fill in later
-                    ordinal: "", // fill in later
-                    savedInSession
+                    nameWithOrdinal: '', // fill in later
+                    ordinal: '', // fill in later
+                    savedInSession,
                 });
             };
 
-            this._session.result!.groups.forEach((groupData, index)=>{
+            this._session.result!.groups.forEach((groupData, index) => {
                 ret.push(finalizeGroup(true, groupData, index));
             });
             return Promise.resolve(ret);
-        }
+        },
     });
 
     readonly _originalGroups = remoteData<ComparisonGroup[]>({
-        await:()=>[this._session, this._unsortedOriginalGroups],
-        invoke:()=>{
+        await: () => [this._session, this._unsortedOriginalGroups],
+        invoke: () => {
             // sort and add ordinals
-            let sorted:ComparisonGroup[];
+            let sorted: ComparisonGroup[];
             if (this.groupOrder) {
                 const order = stringListToIndexSet(this.groupOrder);
-                sorted = _.sortBy<ComparisonGroup>(this._unsortedOriginalGroups.result!, g=>ifNotDefined<number>(order[g.name], Number.POSITIVE_INFINITY));
+                sorted = _.sortBy<ComparisonGroup>(
+                    this._unsortedOriginalGroups.result!,
+                    g =>
+                        ifNotDefined<number>(
+                            order[g.name],
+                            Number.POSITIVE_INFINITY
+                        )
+                );
             } else if (this._session.result!.groupNameOrder) {
-                const order = stringListToIndexSet(this._session.result!.groupNameOrder!);
-                sorted = _.sortBy<ComparisonGroup>(this._unsortedOriginalGroups.result!, g=>ifNotDefined<number>(order[g.name], Number.POSITIVE_INFINITY));
+                const order = stringListToIndexSet(
+                    this._session.result!.groupNameOrder!
+                );
+                sorted = _.sortBy<ComparisonGroup>(
+                    this._unsortedOriginalGroups.result!,
+                    g =>
+                        ifNotDefined<number>(
+                            order[g.name],
+                            Number.POSITIVE_INFINITY
+                        )
+                );
             } else {
-                sorted = defaultGroupOrder(this._unsortedOriginalGroups.result!);
+                sorted = defaultGroupOrder(
+                    this._unsortedOriginalGroups.result!
+                );
             }
 
             const ordinals = getOrdinals(sorted.length, 26);
-            sorted.forEach((group, index)=>{
+            sorted.forEach((group, index) => {
                 const ordinal = ordinals[index];
                 group.nameWithOrdinal = `(${ordinal}) ${group.name}`;
                 group.ordinal = ordinal;
             });
             return Promise.resolve(sorted);
-        }
+        },
     });
 
-    readonly overlapComputations = remoteData<IOverlapComputations<ComparisonGroup>>({
-        await:()=>[this._originalGroups],
-        invoke:()=>{
-            return Promise.resolve(getOverlapComputations(
-                this._originalGroups.result!,
-                this.isGroupSelected
-            ));
-        }
+    readonly overlapComputations = remoteData<
+        IOverlapComputations<ComparisonGroup>
+    >({
+        await: () => [this._originalGroups],
+        invoke: () => {
+            return Promise.resolve(
+                getOverlapComputations(
+                    this._originalGroups.result!,
+                    this.isGroupSelected
+                )
+            );
+        },
     });
 
     readonly availableGroups = remoteData<ComparisonGroup[]>({
-        await:()=>[this._originalGroups, this._originalGroupsOverlapRemoved],
-        invoke:()=>{
-            let ret:ComparisonGroup[];
+        await: () => [this._originalGroups, this._originalGroupsOverlapRemoved],
+        invoke: () => {
+            let ret: ComparisonGroup[];
             switch (this.overlapStrategy) {
                 case OverlapStrategy.INCLUDE:
                     ret = this._originalGroups.result!;
@@ -353,778 +407,1125 @@ export default class GroupComparisonStore {
                     break;
             }
             return Promise.resolve(ret);
-        }
+        },
     });
 
     readonly activeGroups = remoteData<ComparisonGroup[]>({
-        await:()=>[this.availableGroups],
-        invoke:()=>Promise.resolve(this.availableGroups.result!.filter(group=>this.isGroupSelected(group.uid) && !isGroupEmpty(group)))
+        await: () => [this.availableGroups],
+        invoke: () =>
+            Promise.resolve(
+                this.availableGroups.result!.filter(
+                    group =>
+                        this.isGroupSelected(group.uid) && !isGroupEmpty(group)
+                )
+            ),
     });
 
     readonly enrichmentAnalysisGroups = remoteData({
         await: () => [this.activeGroups, this.sampleSet],
         invoke: () => {
-            const sampleSet = this.sampleSet.result || new ComplexKeyMap<Sample>();
+            const sampleSet =
+                this.sampleSet.result || new ComplexKeyMap<Sample>();
             const groups = this.activeGroups.result!.map(group => {
                 const samples: Sample[] = [];
                 group.studies.forEach(studyEntry => {
                     const studyId = studyEntry.id;
                     studyEntry.samples.forEach(sampleId => {
                         if (sampleSet.has({ studyId: studyId, sampleId })) {
-                            const sample = sampleSet.get({ studyId: studyId, sampleId })!;
+                            const sample = sampleSet.get({
+                                studyId: studyId,
+                                sampleId,
+                            })!;
                             samples.push(sample);
                         }
                     });
                 });
                 return {
                     name: group.nameWithOrdinal,
-                    description: "",
+                    description: '',
                     count: getNumSamples(group),
                     color: group.color,
-                    samples
-                }
+                    samples,
+                };
             });
             return Promise.resolve(groups);
-        }
+        },
     });
 
     readonly _originalGroupsOverlapRemoved = remoteData<ComparisonGroup[]>({
-        await:()=>[this.overlapComputations, this._originalGroups],
-        invoke:()=>Promise.resolve(this.overlapComputations.result!.groups)
+        await: () => [this.overlapComputations, this._originalGroups],
+        invoke: () => Promise.resolve(this.overlapComputations.result!.groups),
     });
 
     readonly _activeGroupsOverlapRemoved = remoteData<ComparisonGroup[]>({
-        await:()=>[this._originalGroupsOverlapRemoved],
-        invoke:()=>Promise.resolve(this._originalGroupsOverlapRemoved.result!.filter(group=>this.isGroupSelected(group.uid) && !isGroupEmpty(group)))
+        await: () => [this._originalGroupsOverlapRemoved],
+        invoke: () =>
+            Promise.resolve(
+                this._originalGroupsOverlapRemoved.result!.filter(
+                    group =>
+                        this.isGroupSelected(group.uid) && !isGroupEmpty(group)
+                )
+            ),
     });
 
     readonly _activeGroupsNotOverlapRemoved = remoteData({
-        await:()=>[this._originalGroups, this.overlapComputations],
-        invoke:()=>{
-            let excludedGroups = this.overlapComputations.result!.excludedFromAnalysis;
+        await: () => [this._originalGroups, this.overlapComputations],
+        invoke: () => {
+            let excludedGroups = this.overlapComputations.result!
+                .excludedFromAnalysis;
             if (this.overlapStrategy === OverlapStrategy.INCLUDE) {
                 excludedGroups = {};
             }
             return Promise.resolve(
-                this._originalGroups.result!.filter(group=>this.isGroupSelected(group.uid) && !(group.uid in excludedGroups))
+                this._originalGroups.result!.filter(
+                    group =>
+                        this.isGroupSelected(group.uid) &&
+                        !(group.uid in excludedGroups)
+                )
             );
-        }
+        },
     });
 
     readonly _selectedGroups = remoteData({
-        await:()=>[this._originalGroups],
-        invoke:()=>Promise.resolve(this._originalGroups.result!.filter(group=>this.isGroupSelected(group.uid)))
+        await: () => [this._originalGroups],
+        invoke: () =>
+            Promise.resolve(
+                this._originalGroups.result!.filter(group =>
+                    this.isGroupSelected(group.uid)
+                )
+            ),
     });
 
     readonly samples = remoteData({
-        await:()=>[this._session],
-        invoke:()=>{
+        await: () => [this._session],
+        invoke: () => {
             const sampleIdentifiers = [];
             for (const groupData of this._session.result!.groups) {
                 for (const studySpec of groupData.studies) {
                     const studyId = studySpec.id;
                     for (const sampleId of studySpec.samples) {
                         sampleIdentifiers.push({
-                            studyId, sampleId
+                            studyId,
+                            sampleId,
                         });
                     }
                 }
             }
             return client.fetchSamplesUsingPOST({
-                sampleFilter:{
-                    sampleIdentifiers
+                sampleFilter: {
+                    sampleIdentifiers,
                 } as SampleFilter,
-                projection: "DETAILED"
+                projection: 'DETAILED',
             });
-        }
+        },
     });
 
     readonly activeSamplesNotOverlapRemoved = remoteData({
-        await:()=>[this.sampleSet, this._activeGroupsNotOverlapRemoved],
-        invoke:()=>{
-            const activeSampleIdentifiers = getSampleIdentifiers(this._activeGroupsNotOverlapRemoved.result!);
+        await: () => [this.sampleSet, this._activeGroupsNotOverlapRemoved],
+        invoke: () => {
+            const activeSampleIdentifiers = getSampleIdentifiers(
+                this._activeGroupsNotOverlapRemoved.result!
+            );
             const sampleSet = this.sampleSet.result!;
             return Promise.resolve(
-                activeSampleIdentifiers.map(sampleIdentifier=>sampleSet.get(sampleIdentifier)!)
+                activeSampleIdentifiers.map(
+                    sampleIdentifier => sampleSet.get(sampleIdentifier)!
+                )
             );
-        }
+        },
     });
 
     readonly activePatientKeysNotOverlapRemoved = remoteData({
-        await:()=>[this.activeSamplesNotOverlapRemoved],
-        invoke:()=>Promise.resolve(
-            _.uniq(this.activeSamplesNotOverlapRemoved.result!.map(s=>s.uniquePatientKey))
-        )
+        await: () => [this.activeSamplesNotOverlapRemoved],
+        invoke: () =>
+            Promise.resolve(
+                _.uniq(
+                    this.activeSamplesNotOverlapRemoved.result!.map(
+                        s => s.uniquePatientKey
+                    )
+                )
+            ),
     });
 
-    readonly studies = remoteData({
-        await: ()=>[this._session],
-        invoke: () => {
-            const studyIds = getStudyIds(this._session.result!.groups);
-            return client.fetchStudiesUsingPOST({
-                studyIds,
-                projection:'DETAILED'
-            })
-        }
-    }, []);
+    readonly studies = remoteData(
+        {
+            await: () => [this._session],
+            invoke: () => {
+                const studyIds = getStudyIds(this._session.result!.groups);
+                return client.fetchStudiesUsingPOST({
+                    studyIds,
+                    projection: 'DETAILED',
+                });
+            },
+        },
+        []
+    );
 
     readonly activeStudyIds = remoteData({
-        await:()=>[this.activeGroups],
-        invoke:()=>Promise.resolve(getStudyIds(this.activeGroups.result!))
+        await: () => [this.activeGroups],
+        invoke: () => Promise.resolve(getStudyIds(this.activeGroups.result!)),
     });
 
-    readonly molecularProfilesInActiveStudies = remoteData<MolecularProfile[]>({
-        await:()=>[this.activeStudyIds],
-        invoke: async () => {
-            if (this.activeStudyIds.result!.length > 0) {
-                return client.fetchMolecularProfilesUsingPOST({
-                    molecularProfileFilter: { studyIds:this.activeStudyIds.result! } as MolecularProfileFilter
-                });
-            } else {
-                return Promise.resolve([]);
-            }
-        }
-    }, []);
+    readonly molecularProfilesInActiveStudies = remoteData<MolecularProfile[]>(
+        {
+            await: () => [this.activeStudyIds],
+            invoke: async () => {
+                if (this.activeStudyIds.result!.length > 0) {
+                    return client.fetchMolecularProfilesUsingPOST({
+                        molecularProfileFilter: {
+                            studyIds: this.activeStudyIds.result!,
+                        } as MolecularProfileFilter,
+                    });
+                } else {
+                    return Promise.resolve([]);
+                }
+            },
+        },
+        []
+    );
 
     readonly referenceGenes = remoteData<ReferenceGenomeGene[]>({
-        await: ()=>[
-            this.studies
-        ],
+        await: () => [this.studies],
         invoke: () => {
             if (this.studies.result!.length > 0) {
-                return fetchAllReferenceGenomeGenes(this.studies.result[0].referenceGenome);
+                return fetchAllReferenceGenomeGenes(
+                    this.studies.result[0].referenceGenome
+                );
             } else {
                 return Promise.resolve([]);
             }
-        }
+        },
     });
 
-    readonly hugoGeneSymbolToReferenceGene = remoteData<{[hugoSymbol:string]:ReferenceGenomeGene}>({
-        await: ()=>[
-            this.referenceGenes
-        ],
-        invoke: ()=>{
+    readonly hugoGeneSymbolToReferenceGene = remoteData<{
+        [hugoSymbol: string]: ReferenceGenomeGene;
+    }>({
+        await: () => [this.referenceGenes],
+        invoke: () => {
             // build reference gene map
-            return Promise.resolve(_.keyBy(this.referenceGenes.result!, g=>g.hugoGeneSymbol));
-        }
+            return Promise.resolve(
+                _.keyBy(this.referenceGenes.result!, g => g.hugoGeneSymbol)
+            );
+        },
     });
 
     public readonly mutationEnrichmentProfiles = remoteData({
-        await:()=>[this.molecularProfilesInActiveStudies],
-        invoke:()=>Promise.resolve(pickMutationEnrichmentProfiles(this.molecularProfilesInActiveStudies.result!))
+        await: () => [this.molecularProfilesInActiveStudies],
+        invoke: () =>
+            Promise.resolve(
+                pickMutationEnrichmentProfiles(
+                    this.molecularProfilesInActiveStudies.result!
+                )
+            ),
     });
 
     public readonly copyNumberEnrichmentProfiles = remoteData({
-        await:()=>[this.molecularProfilesInActiveStudies],
-        invoke:()=>Promise.resolve(pickCopyNumberEnrichmentProfiles(this.molecularProfilesInActiveStudies.result!))
+        await: () => [this.molecularProfilesInActiveStudies],
+        invoke: () =>
+            Promise.resolve(
+                pickCopyNumberEnrichmentProfiles(
+                    this.molecularProfilesInActiveStudies.result!
+                )
+            ),
     });
 
     public readonly mRNAEnrichmentProfiles = remoteData({
-        await:()=>[this.molecularProfilesInActiveStudies],
-        invoke:()=>Promise.resolve(pickMRNAEnrichmentProfiles(this.molecularProfilesInActiveStudies.result!))
+        await: () => [this.molecularProfilesInActiveStudies],
+        invoke: () =>
+            Promise.resolve(
+                pickMRNAEnrichmentProfiles(
+                    this.molecularProfilesInActiveStudies.result!
+                )
+            ),
     });
 
     public readonly proteinEnrichmentProfiles = remoteData({
-        await:()=>[this.molecularProfilesInActiveStudies],
-        invoke:()=>Promise.resolve(pickProteinEnrichmentProfiles(this.molecularProfilesInActiveStudies.result!))
+        await: () => [this.molecularProfilesInActiveStudies],
+        invoke: () =>
+            Promise.resolve(
+                pickProteinEnrichmentProfiles(
+                    this.molecularProfilesInActiveStudies.result!
+                )
+            ),
     });
 
-    @observable.ref private _mutationEnrichmentProfileMap:{[studyId:string]:MolecularProfile} = {};
-    @observable.ref private _copyNumberEnrichmentProfileMap:{[studyId:string]:MolecularProfile} = {};
-    @observable.ref private _mRNAEnrichmentProfileMap:{[studyId:string]:MolecularProfile} = {};
-    @observable.ref private _proteinEnrichmentProfileMap:{[studyId:string]:MolecularProfile} = {};
+    @observable.ref private _mutationEnrichmentProfileMap: {
+        [studyId: string]: MolecularProfile;
+    } = {};
+    @observable.ref private _copyNumberEnrichmentProfileMap: {
+        [studyId: string]: MolecularProfile;
+    } = {};
+    @observable.ref private _mRNAEnrichmentProfileMap: {
+        [studyId: string]: MolecularProfile;
+    } = {};
+    @observable.ref private _proteinEnrichmentProfileMap: {
+        [studyId: string]: MolecularProfile;
+    } = {};
 
     readonly selectedStudyMutationEnrichmentProfileMap = remoteData({
-        await:()=>[this.mutationEnrichmentProfiles],
-        invoke:()=>{
+        await: () => [this.mutationEnrichmentProfiles],
+        invoke: () => {
             if (_.isEmpty(this._mutationEnrichmentProfileMap)) {
-                const molecularProfilesbyStudyId = _.groupBy(this.mutationEnrichmentProfiles.result!, profile => profile.studyId);
+                const molecularProfilesbyStudyId = _.groupBy(
+                    this.mutationEnrichmentProfiles.result!,
+                    profile => profile.studyId
+                );
                 // Select only one molecular profile for each study
-                return Promise.resolve(_.mapValues(molecularProfilesbyStudyId, molecularProfiles => molecularProfiles[0]));
+                return Promise.resolve(
+                    _.mapValues(
+                        molecularProfilesbyStudyId,
+                        molecularProfiles => molecularProfiles[0]
+                    )
+                );
             } else {
                 return Promise.resolve(this._mutationEnrichmentProfileMap);
             }
-        }
+        },
     });
 
     readonly selectedStudyCopyNumberEnrichmentProfileMap = remoteData({
-        await:()=>[this.copyNumberEnrichmentProfiles],
-        invoke:()=>{
+        await: () => [this.copyNumberEnrichmentProfiles],
+        invoke: () => {
             if (_.isEmpty(this._copyNumberEnrichmentProfileMap)) {
-                const molecularProfilesbyStudyId = _.groupBy(this.copyNumberEnrichmentProfiles.result!, profile => profile.studyId);
+                const molecularProfilesbyStudyId = _.groupBy(
+                    this.copyNumberEnrichmentProfiles.result!,
+                    profile => profile.studyId
+                );
                 // Select only one molecular profile for each study
-                return Promise.resolve(_.mapValues(molecularProfilesbyStudyId, molecularProfiles => molecularProfiles[0]));
+                return Promise.resolve(
+                    _.mapValues(
+                        molecularProfilesbyStudyId,
+                        molecularProfiles => molecularProfiles[0]
+                    )
+                );
             } else {
                 return Promise.resolve(this._copyNumberEnrichmentProfileMap);
             }
-        }
+        },
     });
 
     readonly selectedmRNAEnrichmentProfileMap = remoteData({
-        await:()=>[this.mRNAEnrichmentProfiles],
-        invoke:()=>{
+        await: () => [this.mRNAEnrichmentProfiles],
+        invoke: () => {
             if (_.isEmpty(this._mRNAEnrichmentProfileMap)) {
-                const molecularProfilesbyStudyId = _.groupBy(this.mRNAEnrichmentProfiles.result!, profile => profile.studyId);
+                const molecularProfilesbyStudyId = _.groupBy(
+                    this.mRNAEnrichmentProfiles.result!,
+                    profile => profile.studyId
+                );
                 // Select only one molecular profile for each study
-                return Promise.resolve(_.mapValues(molecularProfilesbyStudyId, molecularProfiles => molecularProfiles[0]));
+                return Promise.resolve(
+                    _.mapValues(
+                        molecularProfilesbyStudyId,
+                        molecularProfiles => molecularProfiles[0]
+                    )
+                );
             } else {
                 return Promise.resolve(this._mRNAEnrichmentProfileMap);
             }
-        }
+        },
     });
 
     readonly selectedProteinEnrichmentProfileMap = remoteData({
-        await:()=>[this.proteinEnrichmentProfiles],
-        invoke:()=>{
+        await: () => [this.proteinEnrichmentProfiles],
+        invoke: () => {
             if (_.isEmpty(this._proteinEnrichmentProfileMap)) {
-                const molecularProfilesbyStudyId = _.groupBy(this.proteinEnrichmentProfiles.result!, profile => profile.studyId);
+                const molecularProfilesbyStudyId = _.groupBy(
+                    this.proteinEnrichmentProfiles.result!,
+                    profile => profile.studyId
+                );
                 // Select only one molecular profile for each study
-                return Promise.resolve(_.mapValues(molecularProfilesbyStudyId, molecularProfiles => molecularProfiles[0]));
+                return Promise.resolve(
+                    _.mapValues(
+                        molecularProfilesbyStudyId,
+                        molecularProfiles => molecularProfiles[0]
+                    )
+                );
             } else {
                 return Promise.resolve(this._proteinEnrichmentProfileMap);
             }
-        }
+        },
     });
 
     @action
-    public setMutationEnrichmentProfileMap(profileMap:{[studyId:string]:MolecularProfile}) {
+    public setMutationEnrichmentProfileMap(profileMap: {
+        [studyId: string]: MolecularProfile;
+    }) {
         this._mutationEnrichmentProfileMap = profileMap;
     }
 
     @action
-    public setCopyNumberEnrichmentProfileMap(profileMap:{[studyId:string]:MolecularProfile}) {
+    public setCopyNumberEnrichmentProfileMap(profileMap: {
+        [studyId: string]: MolecularProfile;
+    }) {
         this._copyNumberEnrichmentProfileMap = profileMap;
     }
 
     @action
-    public setMRNAEnrichmentProfileMap(profiles:{[studyId:string]:MolecularProfile}) {
+    public setMRNAEnrichmentProfileMap(profiles: {
+        [studyId: string]: MolecularProfile;
+    }) {
         this._mRNAEnrichmentProfileMap = profiles;
     }
 
     @action
-    public setProteinEnrichmentProfileMap(profileMap:{[studyId:string]:MolecularProfile}) {
+    public setProteinEnrichmentProfileMap(profileMap: {
+        [studyId: string]: MolecularProfile;
+    }) {
         this._proteinEnrichmentProfileMap = profileMap;
     }
 
     //
     public readonly mutationEnrichmentData = makeEnrichmentDataPromise({
-        await: () => [this.selectedStudyMutationEnrichmentProfileMap, this.activeGroups],
+        await: () => [
+            this.selectedStudyMutationEnrichmentProfileMap,
+            this.activeGroups,
+        ],
         referenceGenesPromise: this.hugoGeneSymbolToReferenceGene,
-        getSelectedProfileMap: () => this.selectedStudyMutationEnrichmentProfileMap.result!,
+        getSelectedProfileMap: () =>
+            this.selectedStudyMutationEnrichmentProfileMap.result!,
         fetchData: () => {
-            let molecularProfiles = this.selectedStudyMutationEnrichmentProfileMap.result!;
-            let studyMolecularProfileMap = _.keyBy(molecularProfiles, molecularProfile=>molecularProfile.studyId);
+            let molecularProfiles = this
+                .selectedStudyMutationEnrichmentProfileMap.result!;
+            let studyMolecularProfileMap = _.keyBy(
+                molecularProfiles,
+                molecularProfile => molecularProfile.studyId
+            );
             if (this.activeGroups.result!.length > 1) {
-                let groups: MolecularProfileCasesGroupFilter[] = _.map(this.activeGroups.result, group => {
-                    const molecularProfileCaseIdentifiers = _.flatMap(group.studies, study => {
-                        return _.map((this.usePatientLevelEnrichments ? study.patients : study.samples), caseId => {
-                            return {
-                                caseId,
-                                molecularProfileId: studyMolecularProfileMap[study.id].molecularProfileId
+                let groups: MolecularProfileCasesGroupFilter[] = _.map(
+                    this.activeGroups.result,
+                    group => {
+                        const molecularProfileCaseIdentifiers = _.flatMap(
+                            group.studies,
+                            study => {
+                                return _.map(
+                                    this.usePatientLevelEnrichments
+                                        ? study.patients
+                                        : study.samples,
+                                    caseId => {
+                                        return {
+                                            caseId,
+                                            molecularProfileId:
+                                                studyMolecularProfileMap[
+                                                    study.id
+                                                ].molecularProfileId,
+                                        };
+                                    }
+                                );
                             }
-                        })
-                    });
-                    return {
-                        name: group.nameWithOrdinal,
-                        molecularProfileCaseIdentifiers
+                        );
+                        return {
+                            name: group.nameWithOrdinal,
+                            molecularProfileCaseIdentifiers,
+                        };
                     }
-                });
+                );
 
                 return internalClient.fetchMutationEnrichmentsUsingPOST({
-                    enrichmentType: this.usePatientLevelEnrichments ? "PATIENT" : "SAMPLE",
-                    groups
+                    enrichmentType: this.usePatientLevelEnrichments
+                        ? 'PATIENT'
+                        : 'SAMPLE',
+                    groups,
                 });
             } else {
                 return Promise.resolve([]);
             }
-        }
+        },
     });
 
     readonly copyNumberEnrichmentDataRequestGroups = remoteData({
-        await: () => [this.selectedStudyCopyNumberEnrichmentProfileMap, this.activeGroups],
+        await: () => [
+            this.selectedStudyCopyNumberEnrichmentProfileMap,
+            this.activeGroups,
+        ],
         invoke: async () => {
-            let molecularProfile = this.selectedStudyCopyNumberEnrichmentProfileMap.result!;
-            let groups: MolecularProfileCasesGroupFilter[] = _.map(this.activeGroups.result, group => {
-                const molecularProfileCaseIdentifiers = _.flatMap(group.studies, study => {
-                    return _.map((this.usePatientLevelEnrichments ? study.patients : study.samples), caseId => {
-                        return {
-                            caseId,
-                            molecularProfileId: molecularProfile[study.id].molecularProfileId
+            let molecularProfile = this
+                .selectedStudyCopyNumberEnrichmentProfileMap.result!;
+            let groups: MolecularProfileCasesGroupFilter[] = _.map(
+                this.activeGroups.result,
+                group => {
+                    const molecularProfileCaseIdentifiers = _.flatMap(
+                        group.studies,
+                        study => {
+                            return _.map(
+                                this.usePatientLevelEnrichments
+                                    ? study.patients
+                                    : study.samples,
+                                caseId => {
+                                    return {
+                                        caseId,
+                                        molecularProfileId:
+                                            molecularProfile[study.id]
+                                                .molecularProfileId,
+                                    };
+                                }
+                            );
                         }
-                    });
-                });
-                return {
-                    name: group.nameWithOrdinal,
-                    molecularProfileCaseIdentifiers
+                    );
+                    return {
+                        name: group.nameWithOrdinal,
+                        molecularProfileCaseIdentifiers,
+                    };
                 }
-            });
+            );
             return groups;
-        }
+        },
     });
 
-    readonly copyNumberHomdelEnrichmentData = remoteData<AlterationEnrichment[]>({
-        await:()=>[this.copyNumberEnrichmentDataRequestGroups],
-        invoke:()=>{
+    readonly copyNumberHomdelEnrichmentData = remoteData<
+        AlterationEnrichment[]
+    >({
+        await: () => [this.copyNumberEnrichmentDataRequestGroups],
+        invoke: () => {
             // assumes single study for now
-            if (this.copyNumberEnrichmentDataRequestGroups.result && this.copyNumberEnrichmentDataRequestGroups.result.length>1) {
+            if (
+                this.copyNumberEnrichmentDataRequestGroups.result &&
+                this.copyNumberEnrichmentDataRequestGroups.result.length > 1
+            ) {
                 return this.getCopyNumberEnrichmentData(
                     this.copyNumberEnrichmentDataRequestGroups.result!,
-                    "HOMDEL"
+                    'HOMDEL'
                 );
             } else {
                 return Promise.resolve([]);
             }
-        }
+        },
     });
 
     readonly copyNumberAmpEnrichmentData = remoteData<AlterationEnrichment[]>({
-        await:()=>[this.copyNumberEnrichmentDataRequestGroups],
-        invoke:()=>{
+        await: () => [this.copyNumberEnrichmentDataRequestGroups],
+        invoke: () => {
             // assumes single study for now
-            if (this.copyNumberEnrichmentDataRequestGroups.result && this.copyNumberEnrichmentDataRequestGroups.result.length>1) {
+            if (
+                this.copyNumberEnrichmentDataRequestGroups.result &&
+                this.copyNumberEnrichmentDataRequestGroups.result.length > 1
+            ) {
                 return this.getCopyNumberEnrichmentData(
                     this.copyNumberEnrichmentDataRequestGroups.result!,
-                    "AMP"
+                    'AMP'
                 );
             } else {
                 return Promise.resolve([]);
             }
-        }
+        },
     });
 
     public readonly copyNumberEnrichmentData = makeEnrichmentDataPromise({
-        await:()=>[this.copyNumberHomdelEnrichmentData, this.copyNumberAmpEnrichmentData, this.selectedStudyCopyNumberEnrichmentProfileMap],
-        getSelectedProfileMap:()=> this.selectedStudyCopyNumberEnrichmentProfileMap.result!,
+        await: () => [
+            this.copyNumberHomdelEnrichmentData,
+            this.copyNumberAmpEnrichmentData,
+            this.selectedStudyCopyNumberEnrichmentProfileMap,
+        ],
+        getSelectedProfileMap: () =>
+            this.selectedStudyCopyNumberEnrichmentProfileMap.result!,
         referenceGenesPromise: this.hugoGeneSymbolToReferenceGene,
-        fetchData:()=>{
-            const ampData = this.copyNumberAmpEnrichmentData.result!.map(d=>{
+        fetchData: () => {
+            const ampData = this.copyNumberAmpEnrichmentData.result!.map(d => {
                 (d as CopyNumberEnrichment).value = 2;
                 return d as CopyNumberEnrichment;
             });
-            const homdelData = this.copyNumberHomdelEnrichmentData.result!.map(d=>{
-                (d as CopyNumberEnrichment).value = -2;
-                return d as CopyNumberEnrichment;
-            });
+            const homdelData = this.copyNumberHomdelEnrichmentData.result!.map(
+                d => {
+                    (d as CopyNumberEnrichment).value = -2;
+                    return d as CopyNumberEnrichment;
+                }
+            );
             return Promise.resolve(ampData.concat(homdelData));
-        }
+        },
     });
 
     private getCopyNumberEnrichmentData(
-        groups:MolecularProfileCasesGroupFilter[],
-        copyNumberEventType: "HOMDEL" | "AMP")
-    : Promise<AlterationEnrichment[]> {
-
+        groups: MolecularProfileCasesGroupFilter[],
+        copyNumberEventType: 'HOMDEL' | 'AMP'
+    ): Promise<AlterationEnrichment[]> {
         return internalClient.fetchCopyNumberEnrichmentsUsingPOST({
             copyNumberEventType: copyNumberEventType,
-            enrichmentType: this.usePatientLevelEnrichments ? "PATIENT" : "SAMPLE",
-            groups
+            enrichmentType: this.usePatientLevelEnrichments
+                ? 'PATIENT'
+                : 'SAMPLE',
+            groups,
         });
     }
 
     readonly mRNAEnrichmentData = makeEnrichmentDataPromise({
-        await:()=>[this.selectedmRNAEnrichmentProfileMap, this.activeGroups],
-        getSelectedProfileMap:()=> this.selectedmRNAEnrichmentProfileMap.result!, // returns an empty array if the selected study doesn't have any mRNA profiles
+        await: () => [this.selectedmRNAEnrichmentProfileMap, this.activeGroups],
+        getSelectedProfileMap: () =>
+            this.selectedmRNAEnrichmentProfileMap.result!, // returns an empty array if the selected study doesn't have any mRNA profiles
         referenceGenesPromise: this.hugoGeneSymbolToReferenceGene,
-        fetchData:()=>{
-            let studyIds =  Object.keys(this.selectedmRNAEnrichmentProfileMap.result!);
+        fetchData: () => {
+            let studyIds = Object.keys(
+                this.selectedmRNAEnrichmentProfileMap.result!
+            );
             // assumes single study for now
             if (studyIds.length === 1) {
-                const molecularProfileId = this.selectedmRNAEnrichmentProfileMap.result![studyIds[0]].molecularProfileId;
-                const groups: MolecularProfileCasesGroupFilter[] = _.map(this.activeGroups.result, group => {
-                    const molecularProfileCaseIdentifiers = _.flatMap(group.studies, study => {
-                        return _.map(study.samples, sampleId => ({ caseId: sampleId, molecularProfileId }));
-                    });
-                    return {
-                        name: group.nameWithOrdinal,
-                        molecularProfileCaseIdentifiers
+                const molecularProfileId = this.selectedmRNAEnrichmentProfileMap
+                    .result![studyIds[0]].molecularProfileId;
+                const groups: MolecularProfileCasesGroupFilter[] = _.map(
+                    this.activeGroups.result,
+                    group => {
+                        const molecularProfileCaseIdentifiers = _.flatMap(
+                            group.studies,
+                            study => {
+                                return _.map(study.samples, sampleId => ({
+                                    caseId: sampleId,
+                                    molecularProfileId,
+                                }));
+                            }
+                        );
+                        return {
+                            name: group.nameWithOrdinal,
+                            molecularProfileCaseIdentifiers,
+                        };
                     }
-                });
+                );
 
                 return internalClient.fetchExpressionEnrichmentsUsingPOST({
-                    enrichmentType: "SAMPLE",
-                    groups
+                    enrichmentType: 'SAMPLE',
+                    groups,
                 });
             } else {
                 return Promise.resolve([]);
             }
-        }
+        },
     });
 
     readonly proteinEnrichmentData = makeEnrichmentDataPromise({
-        await:()=>[this.selectedProteinEnrichmentProfileMap, this.activeGroups],
+        await: () => [
+            this.selectedProteinEnrichmentProfileMap,
+            this.activeGroups,
+        ],
         referenceGenesPromise: this.hugoGeneSymbolToReferenceGene,
-        getSelectedProfileMap:()=> this.selectedProteinEnrichmentProfileMap.result!, // returns an empty array if the selected study doesn't have any mRNA profiles
-        fetchData:()=>{
-            let studyIds =  Object.keys(this.selectedProteinEnrichmentProfileMap.result!);
+        getSelectedProfileMap: () =>
+            this.selectedProteinEnrichmentProfileMap.result!, // returns an empty array if the selected study doesn't have any mRNA profiles
+        fetchData: () => {
+            let studyIds = Object.keys(
+                this.selectedProteinEnrichmentProfileMap.result!
+            );
             // assumes single study for now
             if (studyIds.length === 1) {
-                const molecularProfileId = this.selectedProteinEnrichmentProfileMap.result![studyIds[0]].molecularProfileId
-                const groups: MolecularProfileCasesGroupFilter[] = _.map(this.activeGroups.result, group => {
-                    const molecularProfileCaseIdentifiers = _.flatMap(group.studies, study => {
-                        return _.map(study.samples, sampleId => ({ caseId: sampleId, molecularProfileId }));
-                    });
-                    return {
-                        name: group.nameWithOrdinal,
-                        molecularProfileCaseIdentifiers
+                const molecularProfileId = this
+                    .selectedProteinEnrichmentProfileMap.result![studyIds[0]]
+                    .molecularProfileId;
+                const groups: MolecularProfileCasesGroupFilter[] = _.map(
+                    this.activeGroups.result,
+                    group => {
+                        const molecularProfileCaseIdentifiers = _.flatMap(
+                            group.studies,
+                            study => {
+                                return _.map(study.samples, sampleId => ({
+                                    caseId: sampleId,
+                                    molecularProfileId,
+                                }));
+                            }
+                        );
+                        return {
+                            name: group.nameWithOrdinal,
+                            molecularProfileCaseIdentifiers,
+                        };
                     }
-                });
+                );
                 return internalClient.fetchExpressionEnrichmentsUsingPOST({
-                    enrichmentType: "SAMPLE",
-                    groups
+                    enrichmentType: 'SAMPLE',
+                    groups,
                 });
             } else {
                 return Promise.resolve([]);
             }
-        }
+        },
     });
 
     @computed get survivalTabShowable() {
-        return this.survivalClinicalDataExists.isComplete && this.survivalClinicalDataExists.result;
+        return (
+            this.survivalClinicalDataExists.isComplete &&
+            this.survivalClinicalDataExists.result
+        );
     }
 
     @computed get showSurvivalTab() {
-        return this.survivalTabShowable ||
-            (this.activeGroups.isComplete && this.activeGroups.result!.length === 0 && this.tabHasBeenShown.get(GroupComparisonTab.SURVIVAL));
+        return (
+            this.survivalTabShowable ||
+            (this.activeGroups.isComplete &&
+                this.activeGroups.result!.length === 0 &&
+                this.tabHasBeenShown.get(GroupComparisonTab.SURVIVAL))
+        );
     }
 
     @computed get survivalTabUnavailable() {
         // grey out if more than 10 active groups
-        return (this.activeGroups.isComplete && this.activeGroups.result.length > 10)
-            || !this.survivalTabShowable;
+        return (
+            (this.activeGroups.isComplete &&
+                this.activeGroups.result.length > 10) ||
+            !this.survivalTabShowable
+        );
     }
 
     @computed get mutationsTabShowable() {
-        return this.mutationEnrichmentProfiles.isComplete && this.mutationEnrichmentProfiles.result!.length > 0;
+        return (
+            this.mutationEnrichmentProfiles.isComplete &&
+            this.mutationEnrichmentProfiles.result!.length > 0
+        );
     }
 
     @computed get showMutationsTab() {
-        return this.mutationsTabShowable ||
-            (this.activeGroups.isComplete && this.activeGroups.result!.length === 0 && this.tabHasBeenShown.get(GroupComparisonTab.MUTATIONS));
+        return (
+            this.mutationsTabShowable ||
+            (this.activeGroups.isComplete &&
+                this.activeGroups.result!.length === 0 &&
+                this.tabHasBeenShown.get(GroupComparisonTab.MUTATIONS))
+        );
     }
 
     @computed get mutationsTabUnavailable() {
-        return (this.activeGroups.isComplete && this.activeGroups.result.length < 2) //less than two active groups
-            || !this.mutationsTabShowable;
+        return (
+            (this.activeGroups.isComplete &&
+                this.activeGroups.result.length < 2) || //less than two active groups
+            !this.mutationsTabShowable
+        );
     }
 
     @computed get clinicalTabUnavailable() {
         // grey out if active groups is less than 2
-        return (this.activeGroups.isComplete && this.activeGroups.result.length < 2);
+        return (
+            this.activeGroups.isComplete && this.activeGroups.result.length < 2
+        );
     }
 
     @computed get copyNumberTabShowable() {
-        return this.copyNumberEnrichmentProfiles.isComplete && this.copyNumberEnrichmentProfiles.result!.length > 0;
+        return (
+            this.copyNumberEnrichmentProfiles.isComplete &&
+            this.copyNumberEnrichmentProfiles.result!.length > 0
+        );
     }
 
     @computed get showCopyNumberTab() {
-        return this.copyNumberTabShowable ||
-            (this.activeGroups.isComplete && this.activeGroups.result!.length === 0 && this.tabHasBeenShown.get(GroupComparisonTab.CNA));
+        return (
+            this.copyNumberTabShowable ||
+            (this.activeGroups.isComplete &&
+                this.activeGroups.result!.length === 0 &&
+                this.tabHasBeenShown.get(GroupComparisonTab.CNA))
+        );
     }
 
     @computed get copyNumberUnavailable() {
-        return (this.activeGroups.isComplete && this.activeGroups.result.length < 2) //less than two active groups
-            || !this.copyNumberTabShowable;
+        return (
+            (this.activeGroups.isComplete &&
+                this.activeGroups.result.length < 2) || //less than two active groups
+            !this.copyNumberTabShowable
+        );
     }
 
     @computed get mRNATabShowable() {
-        return this.mRNAEnrichmentProfiles.isComplete && this.mRNAEnrichmentProfiles.result!.length > 0;
+        return (
+            this.mRNAEnrichmentProfiles.isComplete &&
+            this.mRNAEnrichmentProfiles.result!.length > 0
+        );
     }
 
     @computed get showMRNATab() {
-        return this.mRNATabShowable ||
-            (this.activeGroups.isComplete && this.activeGroups.result!.length === 0 && this.tabHasBeenShown.get(GroupComparisonTab.MRNA));
+        return (
+            this.mRNATabShowable ||
+            (this.activeGroups.isComplete &&
+                this.activeGroups.result!.length === 0 &&
+                this.tabHasBeenShown.get(GroupComparisonTab.MRNA))
+        );
     }
 
     @computed get mRNATabUnavailable() {
-        return (this.activeGroups.isComplete && this.activeGroups.result.length < 2) //less than two active groups
-            || (this.activeStudyIds.isComplete && this.activeStudyIds.result.length > 1) //more than one active study
-            || !this.mRNATabShowable;
+        return (
+            (this.activeGroups.isComplete &&
+                this.activeGroups.result.length < 2) || //less than two active groups
+            (this.activeStudyIds.isComplete &&
+                this.activeStudyIds.result.length > 1) || //more than one active study
+            !this.mRNATabShowable
+        );
     }
 
     @computed get proteinTabShowable() {
-        return this.proteinEnrichmentProfiles.isComplete && this.proteinEnrichmentProfiles.result!.length > 0;
+        return (
+            this.proteinEnrichmentProfiles.isComplete &&
+            this.proteinEnrichmentProfiles.result!.length > 0
+        );
     }
 
     @computed get showProteinTab() {
-        return this.proteinTabShowable ||
-            (this.activeGroups.isComplete && this.activeGroups.result!.length === 0 && this.tabHasBeenShown.get(GroupComparisonTab.PROTEIN));
+        return (
+            this.proteinTabShowable ||
+            (this.activeGroups.isComplete &&
+                this.activeGroups.result!.length === 0 &&
+                this.tabHasBeenShown.get(GroupComparisonTab.PROTEIN))
+        );
     }
 
     @computed get proteinTabUnavailable() {
-        return (this.activeGroups.isComplete && this.activeGroups.result.length < 2) //less than two active groups
-            || (this.activeStudyIds.isComplete && this.activeStudyIds.result.length > 1) //more than one active study
-            || !this.proteinTabShowable;
+        return (
+            (this.activeGroups.isComplete &&
+                this.activeGroups.result.length < 2) || //less than two active groups
+            (this.activeStudyIds.isComplete &&
+                this.activeStudyIds.result.length > 1) || //more than one active study
+            !this.proteinTabShowable
+        );
     }
 
     public readonly sampleSet = remoteData({
-        await: () => [
-            this.samples
-        ],
+        await: () => [this.samples],
         invoke: () => {
             const sampleSet = new ComplexKeyMap<Sample>();
             for (const sample of this.samples.result!) {
-                sampleSet.set({ studyId: sample.studyId, sampleId: sample.sampleId}, sample);
+                sampleSet.set(
+                    { studyId: sample.studyId, sampleId: sample.sampleId },
+                    sample
+                );
             }
             return Promise.resolve(sampleSet);
-        }
+        },
     });
 
     readonly patientKeys = remoteData({
-        await:()=>[this.samples],
-        invoke:()=>{
-            return Promise.resolve(_.uniq(this.samples.result!.map(s=>s.uniquePatientKey)));
-        }
+        await: () => [this.samples],
+        invoke: () => {
+            return Promise.resolve(
+                _.uniq(this.samples.result!.map(s => s.uniquePatientKey))
+            );
+        },
     });
 
     public readonly patientToSamplesSet = remoteData({
-        await:()=>[this.samples],
-        invoke:()=>{
+        await: () => [this.samples],
+        invoke: () => {
             const ret = new ComplexKeyGroupsMap<Sample>();
             for (const sample of this.samples.result!) {
-                ret.add({ studyId: sample.studyId, patientId: sample.patientId}, sample);
+                ret.add(
+                    { studyId: sample.studyId, patientId: sample.patientId },
+                    sample
+                );
             }
             return Promise.resolve(ret);
-        }
+        },
     });
 
     public readonly patientKeyToSamples = remoteData({
-        await: () => [
-            this.samples
-        ],
+        await: () => [this.samples],
         invoke: () => {
-            return Promise.resolve(_.groupBy(this.samples.result!, sample => sample.uniquePatientKey));
-        }
+            return Promise.resolve(
+                _.groupBy(
+                    this.samples.result!,
+                    sample => sample.uniquePatientKey
+                )
+            );
+        },
     });
 
     public readonly sampleKeyToSample = remoteData({
-        await: () => [
-            this.samples
-        ],
+        await: () => [this.samples],
         invoke: () => {
-            let sampleSet = _.reduce(this.samples.result!, (acc, sample) => {
-                acc[sample.uniqueSampleKey] = sample;
-                return acc;
-            }, {} as { [uniqueSampleKey: string]: Sample });
+            let sampleSet = _.reduce(
+                this.samples.result!,
+                (acc, sample) => {
+                    acc[sample.uniqueSampleKey] = sample;
+                    return acc;
+                },
+                {} as { [uniqueSampleKey: string]: Sample }
+            );
             return Promise.resolve(sampleSet);
-        }
+        },
     });
 
     public readonly patientsVennPartition = remoteData({
-        await:()=>[
+        await: () => [
             this._activeGroupsNotOverlapRemoved,
             this.patientToSamplesSet,
-            this.activePatientKeysNotOverlapRemoved
+            this.activePatientKeysNotOverlapRemoved,
         ],
-        invoke:()=>{
+        invoke: () => {
             const patientToSamplesSet = this.patientToSamplesSet.result!;
-            return Promise.resolve(
-                partitionCasesByGroupMembership(
-                    this._activeGroupsNotOverlapRemoved.result!,
-                    (group)=>getPatientIdentifiers([group]),
-                    (patientIdentifier)=>patientToSamplesSet.get({ studyId: patientIdentifier.studyId, patientId: patientIdentifier.patientId })![0].uniquePatientKey,
-                    this.activePatientKeysNotOverlapRemoved.result!
-                ) as { key:{[uid:string]:boolean}, value:string[] }[]
-            );
-        }
+            return Promise.resolve(partitionCasesByGroupMembership(
+                this._activeGroupsNotOverlapRemoved.result!,
+                group => getPatientIdentifiers([group]),
+                patientIdentifier =>
+                    patientToSamplesSet.get({
+                        studyId: patientIdentifier.studyId,
+                        patientId: patientIdentifier.patientId,
+                    })![0].uniquePatientKey,
+                this.activePatientKeysNotOverlapRemoved.result!
+            ) as { key: { [uid: string]: boolean }; value: string[] }[]);
+        },
     });
 
     readonly survivalClinicalDataExists = remoteData<boolean>({
-        await: () => [
-            this.activeSamplesNotOverlapRemoved
-        ],
+        await: () => [this.activeSamplesNotOverlapRemoved],
         invoke: async () => {
             if (this.activeSamplesNotOverlapRemoved.result!.length === 0) {
                 return false;
             }
             const filter: ClinicalDataMultiStudyFilter = {
                 attributeIds: SURVIVAL_CHART_ATTRIBUTES,
-                identifiers: this.activeSamplesNotOverlapRemoved.result!.map((s: any) => ({ entityId: s.patientId, studyId: s.studyId }))
+                identifiers: this.activeSamplesNotOverlapRemoved.result!.map(
+                    (s: any) => ({ entityId: s.patientId, studyId: s.studyId })
+                ),
             };
-            const count = await client.fetchClinicalDataUsingPOSTWithHttpInfo({
-                clinicalDataType: "PATIENT",
-                clinicalDataMultiStudyFilter: filter,
-                projection: "META"
-            }).then(function (response: request.Response) {
-                return parseInt(response.header["total-count"], 10);
-            });
+            const count = await client
+                .fetchClinicalDataUsingPOSTWithHttpInfo({
+                    clinicalDataType: 'PATIENT',
+                    clinicalDataMultiStudyFilter: filter,
+                    projection: 'META',
+                })
+                .then(function(response: request.Response) {
+                    return parseInt(response.header['total-count'], 10);
+                });
             return count > 0;
-        }
+        },
     });
 
-    readonly survivalClinicalData = remoteData<ClinicalData[]>({
-        await: () => [
-            this.activeSamplesNotOverlapRemoved
-        ],
-        invoke: () => {
-            if (this.activeSamplesNotOverlapRemoved.result!.length === 0) {
-                return Promise.resolve([]);
-            }
-            const filter: ClinicalDataMultiStudyFilter = {
-                attributeIds: SURVIVAL_CHART_ATTRIBUTES,
-                identifiers: this.activeSamplesNotOverlapRemoved.result!.map((s: any) => ({ entityId: s.patientId, studyId: s.studyId }))
-            };
-            return client.fetchClinicalDataUsingPOST({
-                clinicalDataType: 'PATIENT',
-                clinicalDataMultiStudyFilter: filter
-            });
-        }
-    }, []);
-
-    readonly activeStudiesClinicalAttributes = remoteData<ClinicalAttribute[]>({
-        await: () => [
-            this.activeStudyIds
-        ],
-        invoke: () => {
-            if (this.activeStudyIds.result!.length === 0) {
-                return Promise.resolve([]);
-            }
-            return client.fetchClinicalAttributesUsingPOST({
-                studyIds:this.activeStudyIds.result!
-            });
-        }
-    }, []);
+    readonly survivalClinicalData = remoteData<ClinicalData[]>(
+        {
+            await: () => [this.activeSamplesNotOverlapRemoved],
+            invoke: () => {
+                if (this.activeSamplesNotOverlapRemoved.result!.length === 0) {
+                    return Promise.resolve([]);
+                }
+                const filter: ClinicalDataMultiStudyFilter = {
+                    attributeIds: SURVIVAL_CHART_ATTRIBUTES,
+                    identifiers: this.activeSamplesNotOverlapRemoved.result!.map(
+                        (s: any) => ({
+                            entityId: s.patientId,
+                            studyId: s.studyId,
+                        })
+                    ),
+                };
+                return client.fetchClinicalDataUsingPOST({
+                    clinicalDataType: 'PATIENT',
+                    clinicalDataMultiStudyFilter: filter,
+                });
+            },
+        },
+        []
+    );
+
+    readonly activeStudiesClinicalAttributes = remoteData<ClinicalAttribute[]>(
+        {
+            await: () => [this.activeStudyIds],
+            invoke: () => {
+                if (this.activeStudyIds.result!.length === 0) {
+                    return Promise.resolve([]);
+                }
+                return client.fetchClinicalAttributesUsingPOST({
+                    studyIds: this.activeStudyIds.result!,
+                });
+            },
+        },
+        []
+    );
 
-    readonly survivalClinicalDataGroupByUniquePatientKey = remoteData<{ [key: string]: ClinicalData[] }>({
-        await: () => [
-            this.survivalClinicalData,
-        ],
+    readonly survivalClinicalDataGroupByUniquePatientKey = remoteData<{
+        [key: string]: ClinicalData[];
+    }>({
+        await: () => [this.survivalClinicalData],
         invoke: async () => {
-            return _.groupBy(this.survivalClinicalData.result, 'uniquePatientKey');
-        }
+            return _.groupBy(
+                this.survivalClinicalData.result,
+                'uniquePatientKey'
+            );
+        },
     });
 
-    readonly overallPatientSurvivals = remoteData<PatientSurvival[]>({
-        await: () => [
-            this.survivalClinicalDataGroupByUniquePatientKey,
-            this.activePatientKeysNotOverlapRemoved,
-        ],
-        invoke: async () => {
-            return getPatientSurvivals(this.survivalClinicalDataGroupByUniquePatientKey.result,
-                this.activePatientKeysNotOverlapRemoved.result!, 'OS_STATUS', 'OS_MONTHS', s => s === 'DECEASED');
-        }
-    }, []);
-
-    readonly diseaseFreePatientSurvivals = remoteData<PatientSurvival[]>({
-        await: () => [
-            this.survivalClinicalDataGroupByUniquePatientKey,
-            this.activePatientKeysNotOverlapRemoved,
-        ],
-        invoke: async () => {
-            return getPatientSurvivals(this.survivalClinicalDataGroupByUniquePatientKey.result,
-                this.activePatientKeysNotOverlapRemoved.result!, 'DFS_STATUS', 'DFS_MONTHS', s => s === 'Recurred/Progressed' || s === 'Recurred')
-        }
-    }, []);
+    readonly overallPatientSurvivals = remoteData<PatientSurvival[]>(
+        {
+            await: () => [
+                this.survivalClinicalDataGroupByUniquePatientKey,
+                this.activePatientKeysNotOverlapRemoved,
+            ],
+            invoke: async () => {
+                return getPatientSurvivals(
+                    this.survivalClinicalDataGroupByUniquePatientKey.result,
+                    this.activePatientKeysNotOverlapRemoved.result!,
+                    'OS_STATUS',
+                    'OS_MONTHS',
+                    s => s === 'DECEASED'
+                );
+            },
+        },
+        []
+    );
+
+    readonly diseaseFreePatientSurvivals = remoteData<PatientSurvival[]>(
+        {
+            await: () => [
+                this.survivalClinicalDataGroupByUniquePatientKey,
+                this.activePatientKeysNotOverlapRemoved,
+            ],
+            invoke: async () => {
+                return getPatientSurvivals(
+                    this.survivalClinicalDataGroupByUniquePatientKey.result,
+                    this.activePatientKeysNotOverlapRemoved.result!,
+                    'DFS_STATUS',
+                    'DFS_MONTHS',
+                    s => s === 'Recurred/Progressed' || s === 'Recurred'
+                );
+            },
+        },
+        []
+    );
 
     readonly uidToGroup = remoteData({
-        await:()=>[this._originalGroups],
-        invoke:()=>{
-            return Promise.resolve(_.keyBy(this._originalGroups.result!, group=>group.uid));
-        }
+        await: () => [this._originalGroups],
+        invoke: () => {
+            return Promise.resolve(
+                _.keyBy(this._originalGroups.result!, group => group.uid)
+            );
+        },
     });
 
-    public readonly clinicalDataEnrichments = remoteData({
-        await: () => [this.activeGroups],
-        invoke: () => {
-            if (this.clinicalTabUnavailable) {
-                return Promise.resolve([]);
-            }
-            let groups: Group[] = _.map(this.activeGroups.result, group => {
-                const sampleIdentifiers = [];
-                for (const studySpec of group.studies) {
-                    const studyId = studySpec.id;
-                    for (const sampleId of studySpec.samples) {
-                        sampleIdentifiers.push({
-                            studyId, sampleId
-                        });
-                    }
-                }
-                return {
-                    name: group.nameWithOrdinal || group.uid,
-                    sampleIdentifiers: sampleIdentifiers
+    public readonly clinicalDataEnrichments = remoteData(
+        {
+            await: () => [this.activeGroups],
+            invoke: () => {
+                if (this.clinicalTabUnavailable) {
+                    return Promise.resolve([]);
                 }
-            });
-            if (groups.length > 1) {
-                return internalClient.fetchClinicalEnrichmentsUsingPOST({
-                    'groupFilter': {
-                        groups: groups
+                let groups: Group[] = _.map(this.activeGroups.result, group => {
+                    const sampleIdentifiers = [];
+                    for (const studySpec of group.studies) {
+                        const studyId = studySpec.id;
+                        for (const sampleId of studySpec.samples) {
+                            sampleIdentifiers.push({
+                                studyId,
+                                sampleId,
+                            });
+                        }
                     }
+                    return {
+                        name: group.nameWithOrdinal || group.uid,
+                        sampleIdentifiers: sampleIdentifiers,
+                    };
                 });
-            } else {
-                return Promise.resolve([]);
-            }
+                if (groups.length > 1) {
+                    return internalClient.fetchClinicalEnrichmentsUsingPOST({
+                        groupFilter: {
+                            groups: groups,
+                        },
+                    });
+                } else {
+                    return Promise.resolve([]);
+                }
+            },
+            onError: () => {
+                // suppress failsafe error handler
+            },
         },
-        onError:()=>{
-            // suppress failsafe error handler
-        }
-    }, []);
-
-    readonly clinicalDataEnrichmentsWithQValues = remoteData<ClinicalDataEnrichmentWithQ[]>({
-        await:()=>[this.clinicalDataEnrichments],
-        invoke:()=>{
-            const clinicalDataEnrichments = this.clinicalDataEnrichments.result!;
-            const sortedByPvalue = _.sortBy(clinicalDataEnrichments, c=>c.pValue);
-            const qValues = calculateQValues(sortedByPvalue.map(c=>c.pValue));
-            qValues.forEach((qValue, index)=>{
-                (sortedByPvalue[index] as ClinicalDataEnrichmentWithQ).qValue = qValue;
-            });
-            return Promise.resolve(sortedByPvalue as ClinicalDataEnrichmentWithQ[]);
+        []
+    );
+
+    readonly clinicalDataEnrichmentsWithQValues = remoteData<
+        ClinicalDataEnrichmentWithQ[]
+    >(
+        {
+            await: () => [this.clinicalDataEnrichments],
+            invoke: () => {
+                const clinicalDataEnrichments = this.clinicalDataEnrichments
+                    .result!;
+                const sortedByPvalue = _.sortBy(
+                    clinicalDataEnrichments,
+                    c => c.pValue
+                );
+                const qValues = calculateQValues(
+                    sortedByPvalue.map(c => c.pValue)
+                );
+                qValues.forEach((qValue, index) => {
+                    (sortedByPvalue[
+                        index
+                    ] as ClinicalDataEnrichmentWithQ).qValue = qValue;
+                });
+                return Promise.resolve(
+                    sortedByPvalue as ClinicalDataEnrichmentWithQ[]
+                );
+            },
+            onError: () => {
+                // suppress failsafe error handler
+            },
         },
-        onError:()=>{
-            // suppress failsafe error handler
-        }
-    }, []);
-
-    readonly activeStudyIdToStudy = remoteData({
-        await: ()=>[
-            this.studies,
-            this.activeStudyIds
-        ],
-        invoke:()=>Promise.resolve(_.keyBy(_.filter(this.studies.result, (study) => this.activeStudyIds.result!.includes(study.studyId)), x=>x.studyId))
-    }, {});
+        []
+    );
+
+    readonly activeStudyIdToStudy = remoteData(
+        {
+            await: () => [this.studies, this.activeStudyIds],
+            invoke: () =>
+                Promise.resolve(
+                    _.keyBy(
+                        _.filter(this.studies.result, study =>
+                            this.activeStudyIds.result!.includes(study.studyId)
+                        ),
+                        x => x.studyId
+                    )
+                ),
+        },
+        {}
+    );
 
     readonly overallSurvivalDescriptions = remoteData({
-        await:() => [
+        await: () => [
             this.activeStudiesClinicalAttributes,
-            this.activeStudyIdToStudy
+            this.activeStudyIdToStudy,
         ],
         invoke: () => {
             const overallSurvivalClinicalAttributeId = 'OS_STATUS';
-            const clinicalAttributeMap = _.groupBy(this.activeStudiesClinicalAttributes.result, "clinicalAttributeId");
-            const result : ISurvivalDescription[] = [];
-            const studyIdToStudy : {[studyId:string]:CancerStudy} = this.activeStudyIdToStudy.result;
-            if (clinicalAttributeMap && clinicalAttributeMap[overallSurvivalClinicalAttributeId] && clinicalAttributeMap[overallSurvivalClinicalAttributeId].length > 0) {
-                clinicalAttributeMap[overallSurvivalClinicalAttributeId].forEach((attr) => {
+            const clinicalAttributeMap = _.groupBy(
+                this.activeStudiesClinicalAttributes.result,
+                'clinicalAttributeId'
+            );
+            const result: ISurvivalDescription[] = [];
+            const studyIdToStudy: { [studyId: string]: CancerStudy } = this
+                .activeStudyIdToStudy.result;
+            if (
+                clinicalAttributeMap &&
+                clinicalAttributeMap[overallSurvivalClinicalAttributeId] &&
+                clinicalAttributeMap[overallSurvivalClinicalAttributeId]
+                    .length > 0
+            ) {
+                clinicalAttributeMap[
+                    overallSurvivalClinicalAttributeId
+                ].forEach(attr => {
                     result.push({
-                            studyName: studyIdToStudy[attr.studyId].name,
-                            description: attr.description
+                        studyName: studyIdToStudy[attr.studyId].name,
+                        description: attr.description,
                     } as ISurvivalDescription);
                 });
                 return Promise.resolve(result);
             }
             return Promise.resolve([]);
-        }
+        },
     });
 
     readonly diseaseFreeSurvivalDescriptions = remoteData({
-        await:() => [
+        await: () => [
             this.activeStudiesClinicalAttributes,
-            this.activeStudyIdToStudy
+            this.activeStudyIdToStudy,
         ],
         invoke: () => {
             const diseaseFreeSurvivalClinicalAttributeId = 'DFS_STATUS';
-            const clinicalAttributeMap = _.groupBy(this.activeStudiesClinicalAttributes.result, "clinicalAttributeId");
-            const result : ISurvivalDescription[] = [];
-            const studyIdToStudy : {[studyId:string]:CancerStudy} = this.activeStudyIdToStudy.result;
-            if (clinicalAttributeMap && clinicalAttributeMap[diseaseFreeSurvivalClinicalAttributeId] && clinicalAttributeMap[diseaseFreeSurvivalClinicalAttributeId].length > 0) {
-                clinicalAttributeMap[diseaseFreeSurvivalClinicalAttributeId].forEach((attr) => {
+            const clinicalAttributeMap = _.groupBy(
+                this.activeStudiesClinicalAttributes.result,
+                'clinicalAttributeId'
+            );
+            const result: ISurvivalDescription[] = [];
+            const studyIdToStudy: { [studyId: string]: CancerStudy } = this
+                .activeStudyIdToStudy.result;
+            if (
+                clinicalAttributeMap &&
+                clinicalAttributeMap[diseaseFreeSurvivalClinicalAttributeId] &&
+                clinicalAttributeMap[diseaseFreeSurvivalClinicalAttributeId]
+                    .length > 0
+            ) {
+                clinicalAttributeMap[
+                    diseaseFreeSurvivalClinicalAttributeId
+                ].forEach(attr => {
                     result.push({
-                            studyName: studyIdToStudy[attr.studyId].name,
-                            description: attr.description
+                        studyName: studyIdToStudy[attr.studyId].name,
+                        description: attr.description,
                     } as ISurvivalDescription);
                 });
                 return Promise.resolve(result);
             }
             return Promise.resolve([]);
-        }
+        },
     });
 }
diff --git a/src/pages/groupComparison/GroupComparisonTabs.ts b/src/pages/groupComparison/GroupComparisonTabs.ts
index b4301baf0fc..21201353dbe 100644
--- a/src/pages/groupComparison/GroupComparisonTabs.ts
+++ b/src/pages/groupComparison/GroupComparisonTabs.ts
@@ -1,9 +1,9 @@
 export enum GroupComparisonTab {
-    OVERLAP = "overlap",
-    MUTATIONS = "mutations",
-    CNA = "cna",
-    MRNA = "mrna",
-    PROTEIN = "protein",
-    SURVIVAL = "survival",
-    CLINICAL = "clinical"
-}
\ No newline at end of file
+    OVERLAP = 'overlap',
+    MUTATIONS = 'mutations',
+    CNA = 'cna',
+    MRNA = 'mrna',
+    PROTEIN = 'protein',
+    SURVIVAL = 'survival',
+    CLINICAL = 'clinical',
+}
diff --git a/src/pages/groupComparison/GroupComparisonURLWrapper.ts b/src/pages/groupComparison/GroupComparisonURLWrapper.ts
index fac0b9bbf62..ee0b1a7c94d 100644
--- a/src/pages/groupComparison/GroupComparisonURLWrapper.ts
+++ b/src/pages/groupComparison/GroupComparisonURLWrapper.ts
@@ -1,27 +1,29 @@
-import URLWrapper from "../../shared/lib/URLWrapper";
-import ExtendedRouterStore from "../../shared/lib/ExtendedRouterStore";
-import {computed} from "mobx";
-import {getTabId} from "./GroupComparisonUtils";
-import { GroupComparisonTab } from "./GroupComparisonTabs"
-import autobind from "autobind-decorator";
-import {OverlapStrategy} from "./GroupComparisonStore";
+import URLWrapper from '../../shared/lib/URLWrapper';
+import ExtendedRouterStore from '../../shared/lib/ExtendedRouterStore';
+import { computed } from 'mobx';
+import { getTabId } from './GroupComparisonUtils';
+import { GroupComparisonTab } from './GroupComparisonTabs';
+import autobind from 'autobind-decorator';
+import { OverlapStrategy } from './GroupComparisonStore';
 
 export type GroupComparisonURLQuery = {
     sessionId: string;
-    groupOrder?:string; // json stringified array of names
-    unselectedGroups?:string; // json stringified array of names
-    overlapStrategy?:OverlapStrategy;
-    patientEnrichments?:string;
+    groupOrder?: string; // json stringified array of names
+    unselectedGroups?: string; // json stringified array of names
+    overlapStrategy?: OverlapStrategy;
+    patientEnrichments?: string;
 };
 
-export default class GroupComparisonURLWrapper extends URLWrapper<GroupComparisonURLQuery> {
-    constructor(routing:ExtendedRouterStore) {
+export default class GroupComparisonURLWrapper extends URLWrapper<
+    GroupComparisonURLQuery
+> {
+    constructor(routing: ExtendedRouterStore) {
         super(routing, {
             sessionId: { isSessionProp: false },
             groupOrder: { isSessionProp: false },
             unselectedGroups: { isSessionProp: false },
             overlapStrategy: { isSessionProp: false },
-            patientEnrichments: { isSessionProp: false }
+            patientEnrichments: { isSessionProp: false },
         });
     }
 
@@ -30,7 +32,7 @@ export default class GroupComparisonURLWrapper extends URLWrapper<GroupCompariso
     }
 
     @autobind
-    public setTabId(tabId:GroupComparisonTab, replace?:boolean) {
+    public setTabId(tabId: GroupComparisonTab, replace?: boolean) {
         this.updateURL({}, `comparison/${tabId}`, false, replace);
     }
 }
diff --git a/src/pages/groupComparison/GroupComparisonUtils.spec.ts b/src/pages/groupComparison/GroupComparisonUtils.spec.ts
index 00b97e54d66..4814917b4b1 100644
--- a/src/pages/groupComparison/GroupComparisonUtils.spec.ts
+++ b/src/pages/groupComparison/GroupComparisonUtils.spec.ts
@@ -1,14 +1,17 @@
-import chai, {assert, expect} from 'chai';
+import chai, { assert, expect } from 'chai';
 import {
     caseCounts,
     caseCountsInParens,
     ComparisonGroup,
-    convertPatientsStudiesAttrToSamples, defaultGroupOrder,
+    convertPatientsStudiesAttrToSamples,
+    defaultGroupOrder,
     excludePatients,
     excludeSamples,
     finalizeStudiesAttr,
     getNumPatients,
-    getNumSamples, getOrdinals, getOverlapComputations,
+    getNumSamples,
+    getOrdinals,
+    getOverlapComputations,
     getOverlapFilteredGroups,
     getOverlappingPatients,
     getOverlappingSamples,
@@ -17,2008 +20,3105 @@ import {
     getStudyIds,
     getVennPlotData,
     intersectPatients,
-    intersectSamples, IOverlapComputations,
+    intersectSamples,
+    IOverlapComputations,
     isGroupEmpty,
     partitionCasesByGroupMembership,
     unionPatients,
     unionSamples,
-    splitData
+    splitData,
 } from './GroupComparisonUtils';
-import deepEqualInAnyOrder from "deep-equal-in-any-order";
-import ComplexKeySet from "../../shared/lib/complexKeyDataStructures/ComplexKeySet";
-import {Sample} from "../../shared/api/generated/CBioPortalAPI";
-import ComplexKeyMap from "../../shared/lib/complexKeyDataStructures/ComplexKeyMap";
-import {assertDeepEqualInAnyOrder} from "../../shared/lib/SpecUtils";
-import ComplexKeyGroupsMap from "../../shared/lib/complexKeyDataStructures/ComplexKeyGroupsMap";
+import deepEqualInAnyOrder from 'deep-equal-in-any-order';
+import ComplexKeySet from '../../shared/lib/complexKeyDataStructures/ComplexKeySet';
+import { Sample } from '../../shared/api/generated/CBioPortalAPI';
+import ComplexKeyMap from '../../shared/lib/complexKeyDataStructures/ComplexKeyMap';
+import { assertDeepEqualInAnyOrder } from '../../shared/lib/SpecUtils';
+import ComplexKeyGroupsMap from '../../shared/lib/complexKeyDataStructures/ComplexKeyGroupsMap';
 
 chai.use(deepEqualInAnyOrder);
 
 describe('GroupComparisonUtils', () => {
-    describe("getOverlapComputations", ()=>{
+    describe('getOverlapComputations', () => {
         function assertEqualOverlapComputations(
-            expected:IOverlapComputations<Pick<ComparisonGroup, "studies"|"uid">>,
-            actual:IOverlapComputations<Pick<ComparisonGroup, "studies"|"uid">>
+            expected: IOverlapComputations<
+                Pick<ComparisonGroup, 'studies' | 'uid'>
+            >,
+            actual: IOverlapComputations<
+                Pick<ComparisonGroup, 'studies' | 'uid'>
+            >
         ) {
-            assertDeepEqualInAnyOrder(expected.groups, actual.groups, "groups");
-            assertDeepEqualInAnyOrder(expected.overlappingSamples, actual.overlappingSamples, "overlappingSamples");
-            assertDeepEqualInAnyOrder(expected.overlappingPatients, actual.overlappingPatients, "overlappingPatients");
-            assertDeepEqualInAnyOrder(expected.overlappingSamplesSet.keys(), actual.overlappingSamplesSet.keys(), "overlappingSamplesSet");
-            assertDeepEqualInAnyOrder(expected.overlappingPatientsSet.keys(), actual.overlappingPatientsSet.keys(), "overlappingPatientsSet");
-            assert.equal(expected.totalSampleOverlap, actual.totalSampleOverlap, "totalSampleOverlap");
-            assert.equal(expected.totalPatientOverlap, actual.totalPatientOverlap, "totalPatientOverlap");
-            assert.deepEqual(expected.excludedFromAnalysis, actual.excludedFromAnalysis, "excludedFromAnalysis");
+            assertDeepEqualInAnyOrder(expected.groups, actual.groups, 'groups');
+            assertDeepEqualInAnyOrder(
+                expected.overlappingSamples,
+                actual.overlappingSamples,
+                'overlappingSamples'
+            );
+            assertDeepEqualInAnyOrder(
+                expected.overlappingPatients,
+                actual.overlappingPatients,
+                'overlappingPatients'
+            );
+            assertDeepEqualInAnyOrder(
+                expected.overlappingSamplesSet.keys(),
+                actual.overlappingSamplesSet.keys(),
+                'overlappingSamplesSet'
+            );
+            assertDeepEqualInAnyOrder(
+                expected.overlappingPatientsSet.keys(),
+                actual.overlappingPatientsSet.keys(),
+                'overlappingPatientsSet'
+            );
+            assert.equal(
+                expected.totalSampleOverlap,
+                actual.totalSampleOverlap,
+                'totalSampleOverlap'
+            );
+            assert.equal(
+                expected.totalPatientOverlap,
+                actual.totalPatientOverlap,
+                'totalPatientOverlap'
+            );
+            assert.deepEqual(
+                expected.excludedFromAnalysis,
+                actual.excludedFromAnalysis,
+                'excludedFromAnalysis'
+            );
         }
-        function isGroupSelected(uid:string) {
+        function isGroupSelected(uid: string) {
             return true;
         }
-        it("empty", ()=>{
+        it('empty', () => {
             assertEqualOverlapComputations(
                 getOverlapComputations([], isGroupSelected),
                 {
-                    groups:[],
-                    overlappingSamples:[],
-                    overlappingPatients:[],
+                    groups: [],
+                    overlappingSamples: [],
+                    overlappingPatients: [],
                     overlappingSamplesSet: new ComplexKeySet(),
                     overlappingPatientsSet: new ComplexKeySet(),
                     totalSampleOverlap: 0,
                     totalPatientOverlap: 0,
-                    excludedFromAnalysis: {}
+                    excludedFromAnalysis: {},
                 }
             );
         });
-        it("one group", ()=>{
+        it('one group', () => {
             const group0 = {
-                uid:"group0",
-                studies:[
+                uid: 'group0',
+                studies: [
                     {
-                        id:"study1",
-                        samples:["1", "2", "3"],
-                        patients:["1", "2", "3"]
+                        id: 'study1',
+                        samples: ['1', '2', '3'],
+                        patients: ['1', '2', '3'],
                     },
                     {
-                        id:"study2",
-                        samples:["1","2"],
-                        patients:["1","2"]
-                    }
-                ]
+                        id: 'study2',
+                        samples: ['1', '2'],
+                        patients: ['1', '2'],
+                    },
+                ],
             };
             assertEqualOverlapComputations(
                 getOverlapComputations([group0], isGroupSelected),
                 {
-                    groups:[group0],
-                    overlappingSamples:[],
-                    overlappingPatients:[],
+                    groups: [group0],
+                    overlappingSamples: [],
+                    overlappingPatients: [],
                     overlappingSamplesSet: new ComplexKeySet(),
                     overlappingPatientsSet: new ComplexKeySet(),
                     totalSampleOverlap: 0,
                     totalPatientOverlap: 0,
-                    excludedFromAnalysis: {}
+                    excludedFromAnalysis: {},
                 }
             );
         });
-        it("two disjoint groups", ()=>{
+        it('two disjoint groups', () => {
             const group0 = {
-                uid:"group0",
-                studies:[
+                uid: 'group0',
+                studies: [
                     {
-                        id:"study1",
-                        samples:["1", "2", "3"],
-                        patients:["1", "2", "3"]
+                        id: 'study1',
+                        samples: ['1', '2', '3'],
+                        patients: ['1', '2', '3'],
                     },
                     {
-                        id:"study2",
-                        samples:["1","2"],
-                        patients:["1","2"]
-                    }
-                ]
+                        id: 'study2',
+                        samples: ['1', '2'],
+                        patients: ['1', '2'],
+                    },
+                ],
             };
             const group1 = {
-                uid:"group1",
-                studies:[
+                uid: 'group1',
+                studies: [
                     {
-                        id:"study1",
-                        samples:["4", "5", "6"],
-                        patients:["4", "5", "6"]
+                        id: 'study1',
+                        samples: ['4', '5', '6'],
+                        patients: ['4', '5', '6'],
                     },
                     {
-                        id:"study2",
-                        samples:["3","4"],
-                        patients:["3","4"]
-                    }
-                ]
+                        id: 'study2',
+                        samples: ['3', '4'],
+                        patients: ['3', '4'],
+                    },
+                ],
             };
             assertEqualOverlapComputations(
                 getOverlapComputations([group1, group0], isGroupSelected),
                 {
-                    groups:[group0, group1],
-                    overlappingSamples:[],
-                    overlappingPatients:[],
+                    groups: [group0, group1],
+                    overlappingSamples: [],
+                    overlappingPatients: [],
                     overlappingSamplesSet: new ComplexKeySet(),
                     overlappingPatientsSet: new ComplexKeySet(),
                     totalSampleOverlap: 0,
                     totalPatientOverlap: 0,
-                    excludedFromAnalysis: {}
+                    excludedFromAnalysis: {},
                 }
             );
         });
-        it("two overlapping groups", ()=>{
+        it('two overlapping groups', () => {
             const group0 = {
-                uid:"group0",
-                studies:[
+                uid: 'group0',
+                studies: [
                     {
-                        id:"study1",
-                        samples:["1", "2", "3"],
-                        patients:["1", "2", "3"]
+                        id: 'study1',
+                        samples: ['1', '2', '3'],
+                        patients: ['1', '2', '3'],
                     },
                     {
-                        id:"study2",
-                        samples:["1","2"],
-                        patients:["1","2"]
-                    }
-                ]
+                        id: 'study2',
+                        samples: ['1', '2'],
+                        patients: ['1', '2'],
+                    },
+                ],
             };
             const group1 = {
-                uid:"group1",
-                studies:[
+                uid: 'group1',
+                studies: [
                     {
-                        id:"study1",
-                        samples:["1", "5", "6"],
-                        patients:["4", "2", "3"]
+                        id: 'study1',
+                        samples: ['1', '5', '6'],
+                        patients: ['4', '2', '3'],
                     },
                     {
-                        id:"study2",
-                        samples:["3","2"],
-                        patients:["1","2"]
-                    }
-                ]
+                        id: 'study2',
+                        samples: ['3', '2'],
+                        patients: ['1', '2'],
+                    },
+                ],
             };
             assertEqualOverlapComputations(
                 getOverlapComputations([group1, group0], isGroupSelected),
                 {
-                    groups:[{
-                        uid:"group0",
-                        studies:[
-                            {
-                                id: "study1",
-                                samples:["2","3"],
-                                patients:["1"]
-                            },
-                            {
-                                id:"study2",
-                                samples:["1"],
-                                patients:[]
-                            }
-                        ]
-                    },{
-                        uid:"group1",
-                        studies:[
-                            {
-                                id:"study1",
-                                samples:["5", "6"],
-                                patients:["4"]
-                            },
-                            {
-                                id:"study2",
-                                samples:["3"],
-                                patients:[]
-                            }
-                        ]
-                    }],
-                    overlappingSamples:[{studyId:"study1", sampleId:"1"}, {studyId:"study2", sampleId:"2"}],
-                    overlappingPatients:[
-                        {studyId:"study1", patientId:"2"}, {studyId:"study1", patientId:"3"},
-                        {studyId:"study2", patientId:"1"}, {studyId:"study2", patientId:"2"}
+                    groups: [
+                        {
+                            uid: 'group0',
+                            studies: [
+                                {
+                                    id: 'study1',
+                                    samples: ['2', '3'],
+                                    patients: ['1'],
+                                },
+                                {
+                                    id: 'study2',
+                                    samples: ['1'],
+                                    patients: [],
+                                },
+                            ],
+                        },
+                        {
+                            uid: 'group1',
+                            studies: [
+                                {
+                                    id: 'study1',
+                                    samples: ['5', '6'],
+                                    patients: ['4'],
+                                },
+                                {
+                                    id: 'study2',
+                                    samples: ['3'],
+                                    patients: [],
+                                },
+                            ],
+                        },
+                    ],
+                    overlappingSamples: [
+                        { studyId: 'study1', sampleId: '1' },
+                        { studyId: 'study2', sampleId: '2' },
+                    ],
+                    overlappingPatients: [
+                        { studyId: 'study1', patientId: '2' },
+                        { studyId: 'study1', patientId: '3' },
+                        { studyId: 'study2', patientId: '1' },
+                        { studyId: 'study2', patientId: '2' },
                     ],
-                    overlappingSamplesSet: ComplexKeySet.from([{studyId:"study1", sampleId:"1"}, {studyId:"study2", sampleId:"2"}]),
+                    overlappingSamplesSet: ComplexKeySet.from([
+                        { studyId: 'study1', sampleId: '1' },
+                        { studyId: 'study2', sampleId: '2' },
+                    ]),
                     overlappingPatientsSet: ComplexKeySet.from([
-                            {studyId:"study1", patientId:"2"}, {studyId:"study1", patientId:"3"},
-                            {studyId:"study2", patientId:"1"}, {studyId:"study2", patientId:"2"}
-                        ]),
+                        { studyId: 'study1', patientId: '2' },
+                        { studyId: 'study1', patientId: '3' },
+                        { studyId: 'study2', patientId: '1' },
+                        { studyId: 'study2', patientId: '2' },
+                    ]),
                     totalSampleOverlap: 2,
                     totalPatientOverlap: 4,
-                    excludedFromAnalysis: {}
+                    excludedFromAnalysis: {},
                 }
             );
         });
-        it("one group containing another group", ()=>{
+        it('one group containing another group', () => {
             const group0 = {
-                uid:"group0",
-                studies:[
+                uid: 'group0',
+                studies: [
                     {
-                        id:"study1",
-                        samples:["1", "2", "3"],
-                        patients:["1", "2", "3"]
+                        id: 'study1',
+                        samples: ['1', '2', '3'],
+                        patients: ['1', '2', '3'],
                     },
                     {
-                        id:"study2",
-                        samples:["1","2"],
-                        patients:["1","2"]
-                    }
-                ]
+                        id: 'study2',
+                        samples: ['1', '2'],
+                        patients: ['1', '2'],
+                    },
+                ],
             };
             const group1 = {
-                uid:"group1",
-                studies:[
+                uid: 'group1',
+                studies: [
                     {
-                        id:"study1",
-                        samples:["1", "2"],
-                        patients:["2", "3"]
-                    }
-                ]
+                        id: 'study1',
+                        samples: ['1', '2'],
+                        patients: ['2', '3'],
+                    },
+                ],
             };
             assertEqualOverlapComputations(
                 getOverlapComputations([group1, group0], isGroupSelected),
                 {
-                    groups:[group0,{
-                        uid:"group1",
-                        studies:[]
-                    }],
-                    overlappingSamples:[],
-                    overlappingPatients:[],
+                    groups: [
+                        group0,
+                        {
+                            uid: 'group1',
+                            studies: [],
+                        },
+                    ],
+                    overlappingSamples: [],
+                    overlappingPatients: [],
                     overlappingSamplesSet: ComplexKeySet.from([]),
                     overlappingPatientsSet: ComplexKeySet.from([]),
                     totalSampleOverlap: 2,
                     totalPatientOverlap: 2,
-                    excludedFromAnalysis: {group1:true}
+                    excludedFromAnalysis: { group1: true },
                 }
             );
         });
-        it("one group containing two other overlapping groups", ()=>{
+        it('one group containing two other overlapping groups', () => {
             const group0 = {
-                uid:"group0",
-                studies:[
+                uid: 'group0',
+                studies: [
                     {
-                        id:"study1",
-                        samples:["1", "2", "3"],
-                        patients:["1", "2", "3"]
+                        id: 'study1',
+                        samples: ['1', '2', '3'],
+                        patients: ['1', '2', '3'],
                     },
                     {
-                        id:"study2",
-                        samples:["1","2"],
-                        patients:["1","2"]
-                    }
-                ]
+                        id: 'study2',
+                        samples: ['1', '2'],
+                        patients: ['1', '2'],
+                    },
+                ],
             };
             const group1 = {
-                uid:"group1",
-                studies:[
+                uid: 'group1',
+                studies: [
                     {
-                        id:"study1",
-                        samples:["1", "2"],
-                        patients:["2", "3"]
+                        id: 'study1',
+                        samples: ['1', '2'],
+                        patients: ['2', '3'],
                     },
                     {
-                        id:"study2",
-                        samples:["1"],
-                        patients:["1"]
-                    }
-                ]
+                        id: 'study2',
+                        samples: ['1'],
+                        patients: ['1'],
+                    },
+                ],
             };
             const group2 = {
-                uid:"group2",
-                studies:[
+                uid: 'group2',
+                studies: [
                     {
-                        id:"study1",
-                        samples:["2"],
-                        patients:["1","2"]
+                        id: 'study1',
+                        samples: ['2'],
+                        patients: ['1', '2'],
                     },
                     {
-                        id:"study2",
-                        samples:["2"],
-                        patients:["1"]
-                    }
-                ]
+                        id: 'study2',
+                        samples: ['2'],
+                        patients: ['1'],
+                    },
+                ],
             };
             assertEqualOverlapComputations(
-                getOverlapComputations([group2, group1, group0], isGroupSelected),
+                getOverlapComputations(
+                    [group2, group1, group0],
+                    isGroupSelected
+                ),
                 {
-                    groups:[group0,
+                    groups: [
+                        group0,
                         {
-                            uid:"group1",
-                            studies:[]
+                            uid: 'group1',
+                            studies: [],
                         },
                         {
-                            uid:"group2",
-                            studies:[]
-                        }
+                            uid: 'group2',
+                            studies: [],
+                        },
                     ],
-                    overlappingSamples:[],
-                    overlappingPatients:[],
+                    overlappingSamples: [],
+                    overlappingPatients: [],
                     overlappingSamplesSet: ComplexKeySet.from([]),
                     overlappingPatientsSet: ComplexKeySet.from([]),
                     totalSampleOverlap: 4,
                     totalPatientOverlap: 4,
-                    excludedFromAnalysis: {group1:true, group2:true}
+                    excludedFromAnalysis: { group1: true, group2: true },
                 }
             );
         });
-        it("A contains B contains C", ()=>{
+        it('A contains B contains C', () => {
             const group0 = {
-                uid:"group0",
-                studies:[
+                uid: 'group0',
+                studies: [
                     {
-                        id:"study1",
-                        samples:["1", "2", "3"],
-                        patients:["1", "2", "3"]
+                        id: 'study1',
+                        samples: ['1', '2', '3'],
+                        patients: ['1', '2', '3'],
                     },
                     {
-                        id:"study2",
-                        samples:["1","2"],
-                        patients:["1","2"]
-                    }
-                ]
+                        id: 'study2',
+                        samples: ['1', '2'],
+                        patients: ['1', '2'],
+                    },
+                ],
             };
             const group1 = {
-                uid:"group1",
-                studies:[
+                uid: 'group1',
+                studies: [
                     {
-                        id:"study1",
-                        samples:["1", "2"],
-                        patients:["2", "3"]
+                        id: 'study1',
+                        samples: ['1', '2'],
+                        patients: ['2', '3'],
                     },
                     {
-                        id:"study2",
-                        samples:["1"],
-                        patients:["1"]
-                    }
-                ]
+                        id: 'study2',
+                        samples: ['1'],
+                        patients: ['1'],
+                    },
+                ],
             };
             const group2 = {
-                uid:"group2",
-                studies:[
+                uid: 'group2',
+                studies: [
                     {
-                        id:"study1",
-                        samples:["2"],
-                        patients:["3"]
+                        id: 'study1',
+                        samples: ['2'],
+                        patients: ['3'],
                     },
-                ]
+                ],
             };
             assertEqualOverlapComputations(
-                getOverlapComputations([group2, group1, group0], isGroupSelected),
+                getOverlapComputations(
+                    [group2, group1, group0],
+                    isGroupSelected
+                ),
                 {
-                    groups:[group0,
+                    groups: [
+                        group0,
                         {
-                            uid:"group1",
-                            studies:[]
+                            uid: 'group1',
+                            studies: [],
                         },
                         {
-                            uid:"group2",
-                            studies:[]
-                        }
+                            uid: 'group2',
+                            studies: [],
+                        },
                     ],
-                    overlappingSamples:[],
-                    overlappingPatients:[],
+                    overlappingSamples: [],
+                    overlappingPatients: [],
                     overlappingSamplesSet: ComplexKeySet.from([]),
                     overlappingPatientsSet: ComplexKeySet.from([]),
                     totalSampleOverlap: 3,
                     totalPatientOverlap: 3,
-                    excludedFromAnalysis: {group1:true, group2:true}
+                    excludedFromAnalysis: { group1: true, group2: true },
                 }
             );
         });
-        it("one group containing two disjoint groups", ()=>{
+        it('one group containing two disjoint groups', () => {
             const group0 = {
-                uid:"group0",
-                studies:[
+                uid: 'group0',
+                studies: [
                     {
-                        id:"study1",
-                        samples:["1", "2", "3"],
-                        patients:["1", "2", "3"]
+                        id: 'study1',
+                        samples: ['1', '2', '3'],
+                        patients: ['1', '2', '3'],
                     },
                     {
-                        id:"study2",
-                        samples:["1","2","3"],
-                        patients:["1","2"]
-                    }
-                ]
+                        id: 'study2',
+                        samples: ['1', '2', '3'],
+                        patients: ['1', '2'],
+                    },
+                ],
             };
             const group1 = {
-                uid:"group1",
-                studies:[
+                uid: 'group1',
+                studies: [
                     {
-                        id:"study1",
-                        samples:["1"],
-                        patients:["2"]
+                        id: 'study1',
+                        samples: ['1'],
+                        patients: ['2'],
                     },
                     {
-                        id:"study2",
-                        samples:["1"],
-                        patients:["1"]
-                    }
-                ]
+                        id: 'study2',
+                        samples: ['1'],
+                        patients: ['1'],
+                    },
+                ],
             };
             const group2 = {
-                uid:"group2",
-                studies:[
+                uid: 'group2',
+                studies: [
                     {
-                        id:"study1",
-                        samples:["3"],
-                        patients:["1"]
+                        id: 'study1',
+                        samples: ['3'],
+                        patients: ['1'],
                     },
                     {
-                        id:"study2",
-                        samples:["3"],
-                        patients:["2"]
-                    }
-                ]
+                        id: 'study2',
+                        samples: ['3'],
+                        patients: ['2'],
+                    },
+                ],
             };
             assertEqualOverlapComputations(
-                getOverlapComputations([group2, group1, group0], isGroupSelected),
+                getOverlapComputations(
+                    [group2, group1, group0],
+                    isGroupSelected
+                ),
                 {
-                    groups:[group0,
+                    groups: [
+                        group0,
                         {
-                            uid:"group1",
-                            studies:[]
+                            uid: 'group1',
+                            studies: [],
                         },
                         {
-                            uid:"group2",
-                            studies:[]
-                        }
+                            uid: 'group2',
+                            studies: [],
+                        },
                     ],
-                    overlappingSamples:[],
-                    overlappingPatients:[],
+                    overlappingSamples: [],
+                    overlappingPatients: [],
                     overlappingSamplesSet: ComplexKeySet.from([]),
                     overlappingPatientsSet: ComplexKeySet.from([]),
                     totalSampleOverlap: 4,
                     totalPatientOverlap: 4,
-                    excludedFromAnalysis: {group1:true, group2:true}
+                    excludedFromAnalysis: { group1: true, group2: true },
                 }
             );
         });
-        it("two disjoint groups together covering one group", ()=>{
+        it('two disjoint groups together covering one group', () => {
             const group0 = {
-                uid:"group0",
-                studies:[
+                uid: 'group0',
+                studies: [
                     {
-                        id:"study1",
-                        samples:["1", "2", "3"],
-                        patients:["1", "2", "3"]
+                        id: 'study1',
+                        samples: ['1', '2', '3'],
+                        patients: ['1', '2', '3'],
                     },
                     {
-                        id:"study2",
-                        samples:["1","2","3"],
-                        patients:["1","2"]
-                    }
-                ]
+                        id: 'study2',
+                        samples: ['1', '2', '3'],
+                        patients: ['1', '2'],
+                    },
+                ],
             };
             const group1 = {
-                uid:"group1",
-                studies:[
+                uid: 'group1',
+                studies: [
                     {
-                        id:"study1",
-                        samples:["1","2","5"],
-                        patients:["1","2","7"]
+                        id: 'study1',
+                        samples: ['1', '2', '5'],
+                        patients: ['1', '2', '7'],
                     },
                     {
-                        id:"study2",
-                        samples:["1"],
-                        patients:["1"]
-                    }
-                ]
+                        id: 'study2',
+                        samples: ['1'],
+                        patients: ['1'],
+                    },
+                ],
             };
             const group2 = {
-                uid:"group2",
-                studies:[
+                uid: 'group2',
+                studies: [
                     {
-                        id:"study1",
-                        samples:["3","4"],
-                        patients:["3","4"]
+                        id: 'study1',
+                        samples: ['3', '4'],
+                        patients: ['3', '4'],
                     },
                     {
-                        id:"study2",
-                        samples:["2","3"],
-                        patients:["2"]
-                    }
-                ]
+                        id: 'study2',
+                        samples: ['2', '3'],
+                        patients: ['2'],
+                    },
+                ],
             };
             assertEqualOverlapComputations(
-                getOverlapComputations([group2, group1, group0], isGroupSelected),
+                getOverlapComputations(
+                    [group2, group1, group0],
+                    isGroupSelected
+                ),
                 {
-                    groups:[{
-                        uid: "group0",
-                        studies:[]
-                    }, group1, group2],
-                    overlappingSamples:[],
-                    overlappingPatients:[],
+                    groups: [
+                        {
+                            uid: 'group0',
+                            studies: [],
+                        },
+                        group1,
+                        group2,
+                    ],
+                    overlappingSamples: [],
+                    overlappingPatients: [],
                     overlappingSamplesSet: ComplexKeySet.from([]),
                     overlappingPatientsSet: ComplexKeySet.from([]),
                     totalSampleOverlap: 6,
                     totalPatientOverlap: 5,
-                    excludedFromAnalysis: {group0:true}
+                    excludedFromAnalysis: { group0: true },
                 }
             );
         });
-        it("two overlapping groups together covering one group", ()=>{
+        it('two overlapping groups together covering one group', () => {
             const group0 = {
-                uid:"group0",
-                studies:[
+                uid: 'group0',
+                studies: [
                     {
-                        id:"study1",
-                        samples:["1", "2", "3"],
-                        patients:["1", "2", "3"]
+                        id: 'study1',
+                        samples: ['1', '2', '3'],
+                        patients: ['1', '2', '3'],
                     },
                     {
-                        id:"study2",
-                        samples:["1","2","3"],
-                        patients:["1","2"]
-                    }
-                ]
+                        id: 'study2',
+                        samples: ['1', '2', '3'],
+                        patients: ['1', '2'],
+                    },
+                ],
             };
             const group1 = {
-                uid:"group1",
-                studies:[
+                uid: 'group1',
+                studies: [
                     {
-                        id:"study1",
-                        samples:["1","2","4"],
-                        patients:["1","2","7"]
+                        id: 'study1',
+                        samples: ['1', '2', '4'],
+                        patients: ['1', '2', '7'],
                     },
                     {
-                        id:"study2",
-                        samples:["1"],
-                        patients:["1"]
-                    }
-                ]
+                        id: 'study2',
+                        samples: ['1'],
+                        patients: ['1'],
+                    },
+                ],
             };
             const group2 = {
-                uid:"group2",
-                studies:[
+                uid: 'group2',
+                studies: [
                     {
-                        id:"study1",
-                        samples:["3","4"],
-                        patients:["3","4"]
+                        id: 'study1',
+                        samples: ['3', '4'],
+                        patients: ['3', '4'],
                     },
                     {
-                        id:"study2",
-                        samples:["1","2","3"],
-                        patients:["1","2"]
-                    }
-                ]
+                        id: 'study2',
+                        samples: ['1', '2', '3'],
+                        patients: ['1', '2'],
+                    },
+                ],
             };
             assertEqualOverlapComputations(
-                getOverlapComputations([group2, group1, group0], isGroupSelected),
+                getOverlapComputations(
+                    [group2, group1, group0],
+                    isGroupSelected
+                ),
                 {
-                    groups:[{
-                        uid: "group0",
-                        studies:[]
-                    }, {
-                        uid:"group1",
-                        studies:[
-                            {
-                                id:"study1",
-                                samples:["1","2"],
-                                patients:["1", "2","7"]
-                            }
-                        ]
-                    },{
-                        uid:"group2",
-                        studies:[
-                            {
-                                id:"study1",
-                                samples:["3"],
-                                patients:["3","4"]
-                            },
-                            {
-                                id:"study2",
-                                samples:["2","3"],
-                                patients:["2"]
-                            }
-                        ]
-                    }],
-                    overlappingSamples:[
-                        { studyId:"study1", sampleId:"4"}, { studyId: "study2", sampleId:"1"}
+                    groups: [
+                        {
+                            uid: 'group0',
+                            studies: [],
+                        },
+                        {
+                            uid: 'group1',
+                            studies: [
+                                {
+                                    id: 'study1',
+                                    samples: ['1', '2'],
+                                    patients: ['1', '2', '7'],
+                                },
+                            ],
+                        },
+                        {
+                            uid: 'group2',
+                            studies: [
+                                {
+                                    id: 'study1',
+                                    samples: ['3'],
+                                    patients: ['3', '4'],
+                                },
+                                {
+                                    id: 'study2',
+                                    samples: ['2', '3'],
+                                    patients: ['2'],
+                                },
+                            ],
+                        },
                     ],
-                    overlappingPatients:[
-                        { studyId:"study2", patientId:"1"}
+                    overlappingSamples: [
+                        { studyId: 'study1', sampleId: '4' },
+                        { studyId: 'study2', sampleId: '1' },
                     ],
-                    overlappingSamplesSet: ComplexKeySet.from([{ studyId:"study1", sampleId:"4"}, { studyId: "study2", sampleId:"1"}]),
-                    overlappingPatientsSet: ComplexKeySet.from([{ studyId:"study2", patientId:"1"}]),
+                    overlappingPatients: [
+                        { studyId: 'study2', patientId: '1' },
+                    ],
+                    overlappingSamplesSet: ComplexKeySet.from([
+                        { studyId: 'study1', sampleId: '4' },
+                        { studyId: 'study2', sampleId: '1' },
+                    ]),
+                    overlappingPatientsSet: ComplexKeySet.from([
+                        { studyId: 'study2', patientId: '1' },
+                    ]),
                     totalSampleOverlap: 7,
                     totalPatientOverlap: 5,
-                    excludedFromAnalysis: {group0:true}
+                    excludedFromAnalysis: { group0: true },
                 }
             );
         });
-        it("three disjoint groups", ()=>{
+        it('three disjoint groups', () => {
             const group0 = {
-                uid:"group0",
-                studies:[
+                uid: 'group0',
+                studies: [
                     {
-                        id:"study1",
-                        samples:["1", "2", "3"],
-                        patients:["1", "2", "3"]
+                        id: 'study1',
+                        samples: ['1', '2', '3'],
+                        patients: ['1', '2', '3'],
                     },
                     {
-                        id:"study2",
-                        samples:["1","2"],
-                        patients:["1","2"]
-                    }
-                ]
+                        id: 'study2',
+                        samples: ['1', '2'],
+                        patients: ['1', '2'],
+                    },
+                ],
             };
             const group1 = {
-                uid:"group1",
-                studies:[
+                uid: 'group1',
+                studies: [
                     {
-                        id:"study1",
-                        samples:["4", "5", "6"],
-                        patients:["4", "5", "6"]
+                        id: 'study1',
+                        samples: ['4', '5', '6'],
+                        patients: ['4', '5', '6'],
                     },
                     {
-                        id:"study2",
-                        samples:["3","4"],
-                        patients:["3","4"]
-                    }
-                ]
+                        id: 'study2',
+                        samples: ['3', '4'],
+                        patients: ['3', '4'],
+                    },
+                ],
             };
             const group2 = {
-                uid:"group2",
-                studies:[
+                uid: 'group2',
+                studies: [
                     {
-                        id:"study1",
-                        samples:["7","8"],
-                        patients:["8"]
+                        id: 'study1',
+                        samples: ['7', '8'],
+                        patients: ['8'],
                     },
                     {
-                        id:"study2",
-                        samples:["5"],
-                        patients:["5","6"]
-                    }
-                ]
+                        id: 'study2',
+                        samples: ['5'],
+                        patients: ['5', '6'],
+                    },
+                ],
             };
             assertEqualOverlapComputations(
-                getOverlapComputations([group1, group0, group2], isGroupSelected),
+                getOverlapComputations(
+                    [group1, group0, group2],
+                    isGroupSelected
+                ),
                 {
-                    groups:[group0, group1, group2],
-                    overlappingSamples:[],
-                    overlappingPatients:[],
+                    groups: [group0, group1, group2],
+                    overlappingSamples: [],
+                    overlappingPatients: [],
                     overlappingSamplesSet: new ComplexKeySet(),
                     overlappingPatientsSet: new ComplexKeySet(),
                     totalSampleOverlap: 0,
                     totalPatientOverlap: 0,
-                    excludedFromAnalysis: {}
+                    excludedFromAnalysis: {},
                 }
             );
         });
     });
-    describe("defaultGroupOrder", ()=>{
-        it("empty", ()=>{
+    describe('defaultGroupOrder', () => {
+        it('empty', () => {
             assert.deepEqual(defaultGroupOrder([]), []);
         });
-        it("one group", ()=>{
-            assert.deepEqual(defaultGroupOrder([{name:"yo"}]), [{name:"yo"}]);
-        });
-        it("one group NA", ()=>{
-            assert.deepEqual(defaultGroupOrder([{name:"nA"}]), [{name:"nA"}]);
-        });
-        it("two groups", ()=>{
-            assert.deepEqual(defaultGroupOrder([{name:"HI"},{name:"Adam"}]), [{name:"Adam"},{name:"HI"}]);
-        });
-        it("two groups including NA - NA sorts to end", ()=>{
-            assert.deepEqual(defaultGroupOrder([{name:"NA"},{name:"zebra"}]), [{name:"zebra"},{name:"NA"}]);
-        });
-        it("three groups",()=>{
-            assert.deepEqual(defaultGroupOrder([{name:"hI"},{name:"abra"},{name:"zebra"}]), [{name:"abra"},{name:"hI"}, {name:"zebra"}]);
+        it('one group', () => {
+            assert.deepEqual(defaultGroupOrder([{ name: 'yo' }]), [
+                { name: 'yo' },
+            ]);
         });
-        it("four groups including NA - NA sorts to end",()=>{
-            assert.deepEqual(defaultGroupOrder([{name:"hI"},{name:"nA"},{name:"Na"}, {name:"zebra"}]), [{name:"hI"}, {name:"zebra"},{name:"nA"},{name:"Na"}]);
+        it('one group NA', () => {
+            assert.deepEqual(defaultGroupOrder([{ name: 'nA' }]), [
+                { name: 'nA' },
+            ]);
         });
-    });
-    describe("getOrdinals", ()=>{
-        it("correct values", ()=>{
-            assert.deepEqual(
-                getOrdinals(0,5),
-                []
-            );
+        it('two groups', () => {
             assert.deepEqual(
-                getOrdinals(1,5),
-                ["A"]
+                defaultGroupOrder([{ name: 'HI' }, { name: 'Adam' }]),
+                [{ name: 'Adam' }, { name: 'HI' }]
             );
+        });
+        it('two groups including NA - NA sorts to end', () => {
             assert.deepEqual(
-                getOrdinals(5,5),
-                ["A","B","C","D","E"]
+                defaultGroupOrder([{ name: 'NA' }, { name: 'zebra' }]),
+                [{ name: 'zebra' }, { name: 'NA' }]
             );
+        });
+        it('three groups', () => {
             assert.deepEqual(
-                getOrdinals(20,5),
-                [
-                    "A","B","C","D","E","AA","AB","AC","AD","AE",
-                    "BA","BB","BC","BD","BE","CA","CB","CC","CD","CE"
-                ]
+                defaultGroupOrder([
+                    { name: 'hI' },
+                    { name: 'abra' },
+                    { name: 'zebra' },
+                ]),
+                [{ name: 'abra' }, { name: 'hI' }, { name: 'zebra' }]
             );
+        });
+        it('four groups including NA - NA sorts to end', () => {
             assert.deepEqual(
-                getOrdinals(20, 3),
+                defaultGroupOrder([
+                    { name: 'hI' },
+                    { name: 'nA' },
+                    { name: 'Na' },
+                    { name: 'zebra' },
+                ]),
                 [
-                    "A","B","C","AA","AB","AC","BA","BB","BC",
-                    "CA","CB","CC","AAA","AAB","AAC","ABA","ABB","ABC",
-                    "ACA","ACB"
+                    { name: 'hI' },
+                    { name: 'zebra' },
+                    { name: 'nA' },
+                    { name: 'Na' },
                 ]
             );
         });
     });
+    describe('getOrdinals', () => {
+        it('correct values', () => {
+            assert.deepEqual(getOrdinals(0, 5), []);
+            assert.deepEqual(getOrdinals(1, 5), ['A']);
+            assert.deepEqual(getOrdinals(5, 5), ['A', 'B', 'C', 'D', 'E']);
+            assert.deepEqual(getOrdinals(20, 5), [
+                'A',
+                'B',
+                'C',
+                'D',
+                'E',
+                'AA',
+                'AB',
+                'AC',
+                'AD',
+                'AE',
+                'BA',
+                'BB',
+                'BC',
+                'BD',
+                'BE',
+                'CA',
+                'CB',
+                'CC',
+                'CD',
+                'CE',
+            ]);
+            assert.deepEqual(getOrdinals(20, 3), [
+                'A',
+                'B',
+                'C',
+                'AA',
+                'AB',
+                'AC',
+                'BA',
+                'BB',
+                'BC',
+                'CA',
+                'CB',
+                'CC',
+                'AAA',
+                'AAB',
+                'AAC',
+                'ABA',
+                'ABB',
+                'ABC',
+                'ACA',
+                'ACB',
+            ]);
+        });
+    });
 
     describe('getVennPlotData', () => {
         it('when no data', () => {
-            assert.deepEqual(getVennPlotData([]), [])
+            assert.deepEqual(getVennPlotData([]), []);
         });
 
         it('when there no overlapping groups', () => {
-            assert.deepEqual(getVennPlotData([
-                { groups: ['1'], cases: ['1-1'] },
-                { groups: ['1', '2'], cases: [] },
-                { groups: ['2'], cases: ['1-2'] }
-            ]),
-                [{ count: 1, size: 1, label: '1', sets: ['1'] },
-                { count: 1, size: 1, label: '1', sets: ['2'] },
-                { count: 0, size: 0, label: '0', sets: ['1', '2'] }]
+            assert.deepEqual(
+                getVennPlotData([
+                    { groups: ['1'], cases: ['1-1'] },
+                    { groups: ['1', '2'], cases: [] },
+                    { groups: ['2'], cases: ['1-2'] },
+                ]),
+                [
+                    { count: 1, size: 1, label: '1', sets: ['1'] },
+                    { count: 1, size: 1, label: '1', sets: ['2'] },
+                    { count: 0, size: 0, label: '0', sets: ['1', '2'] },
+                ]
             );
         });
 
         it('when there one or more overlapping groups', () => {
-            assert.deepEqual(getVennPlotData([
-                { groups: ['1'], cases: ['1-1', '1-2'] },
-                { groups: ['1', '2'], cases: ['1-1'] },
-                { groups: ['2'], cases: ['1-1'] }
-            ]),
-                [{ count: 2, size: 2, label: '2', sets: ['1'] },
-                { count: 1, size: 1, label: '1', sets: ['1', '2'] },
-                { count: 1, size: 1, label: '1', sets: ['2'] }]
+            assert.deepEqual(
+                getVennPlotData([
+                    { groups: ['1'], cases: ['1-1', '1-2'] },
+                    { groups: ['1', '2'], cases: ['1-1'] },
+                    { groups: ['2'], cases: ['1-1'] },
+                ]),
+                [
+                    { count: 2, size: 2, label: '2', sets: ['1'] },
+                    { count: 1, size: 1, label: '1', sets: ['1', '2'] },
+                    { count: 1, size: 1, label: '1', sets: ['2'] },
+                ]
             );
         });
     });
 
-    describe("caseCountsInParens", ()=>{
-        it("0 patients and samples", ()=>{
-            assert.equal(
-                caseCountsInParens([], []),
-                "(0)"
-            );
+    describe('caseCountsInParens', () => {
+        it('0 patients and samples', () => {
+            assert.equal(caseCountsInParens([], []), '(0)');
         });
-        it("1 patients and samples", ()=>{
-            assert.equal(
-                caseCountsInParens(["sample"], ["patient"]),
-                "(1)"
-            );
+        it('1 patients and samples', () => {
+            assert.equal(caseCountsInParens(['sample'], ['patient']), '(1)');
         });
-        it("same nonzero number patients and samples", ()=>{
+        it('same nonzero number patients and samples', () => {
             assert.equal(
-                caseCountsInParens(["sampleA", "sampleB"], ["patientA", "patientB"]),
-                "(2)"
+                caseCountsInParens(
+                    ['sampleA', 'sampleB'],
+                    ['patientA', 'patientB']
+                ),
+                '(2)'
             );
         });
-        it("0 patients and 1 sample", ()=>{
+        it('0 patients and 1 sample', () => {
             assert.equal(
-                caseCountsInParens(["sample"], []),
-                "(1 sample/0 patients)"
+                caseCountsInParens(['sample'], []),
+                '(1 sample/0 patients)'
             );
         });
-        it("1 patient and 0 samples", ()=>{
+        it('1 patient and 0 samples', () => {
             assert.equal(
-                caseCountsInParens([], ["patient"]),
-                "(0 samples/1 patient)"
+                caseCountsInParens([], ['patient']),
+                '(0 samples/1 patient)'
             );
         });
-        it("0 patients and nonzero samples", ()=>{
+        it('0 patients and nonzero samples', () => {
             assert.equal(
-                caseCountsInParens(["sample","sample"], []),
-                "(2 samples/0 patients)"
+                caseCountsInParens(['sample', 'sample'], []),
+                '(2 samples/0 patients)'
             );
         });
-        it("0 samples and nonzero patients", ()=>{
+        it('0 samples and nonzero patients', () => {
             assert.equal(
-                caseCountsInParens([], ["patient","patient","patient"]),
-                "(0 samples/3 patients)"
+                caseCountsInParens([], ['patient', 'patient', 'patient']),
+                '(0 samples/3 patients)'
             );
         });
-        it("nonzero nonequal patients and samples", ()=>{
+        it('nonzero nonequal patients and samples', () => {
             assert.equal(
-                caseCountsInParens(["sampleA", "sampleB","sampleC"], ["patientA", "patientB"]),
-                "(3 samples/2 patients)"
+                caseCountsInParens(
+                    ['sampleA', 'sampleB', 'sampleC'],
+                    ['patientA', 'patientB']
+                ),
+                '(3 samples/2 patients)'
             );
         });
     });
 
-    describe("caseCounts", ()=>{
-        it("0 patients and samples", ()=>{
-            assert.equal(
-                caseCounts(0,0),
-                "0 samples/patients"
-            );
+    describe('caseCounts', () => {
+        it('0 patients and samples', () => {
+            assert.equal(caseCounts(0, 0), '0 samples/patients');
             assert.equal(
-                caseCounts(0,0, "+", " overlapping "),
-                "0 overlapping samples+patients"
+                caseCounts(0, 0, '+', ' overlapping '),
+                '0 overlapping samples+patients'
             );
         });
-        it("1 patients and samples", ()=>{
-            assert.equal(
-                caseCounts(1,1),
-                "1 sample/patient"
-            );
+        it('1 patients and samples', () => {
+            assert.equal(caseCounts(1, 1), '1 sample/patient');
         });
-        it("same nonzero number patients and samples", ()=>{
-            assert.equal(
-                caseCounts(2,2),
-                "2 samples/patients"
-            );
+        it('same nonzero number patients and samples', () => {
+            assert.equal(caseCounts(2, 2), '2 samples/patients');
         });
-        it("0 patients and 1 sample", ()=>{
-            assert.equal(
-                caseCounts(1,0),
-                "1 sample/0 patients"
-            );
+        it('0 patients and 1 sample', () => {
+            assert.equal(caseCounts(1, 0), '1 sample/0 patients');
         });
-        it("1 patient and 0 samples", ()=>{
-            assert.equal(
-                caseCounts(0,1),
-                "0 samples/1 patient"
-            );
+        it('1 patient and 0 samples', () => {
+            assert.equal(caseCounts(0, 1), '0 samples/1 patient');
         });
-        it("0 patients and nonzero samples", ()=>{
-            assert.equal(
-                caseCounts(2,0),
-                "2 samples/0 patients"
-            );
+        it('0 patients and nonzero samples', () => {
+            assert.equal(caseCounts(2, 0), '2 samples/0 patients');
             assert.equal(
-                caseCounts(2,0, " and ", " overlapping "),
-                "2 overlapping samples and 0 overlapping patients"
+                caseCounts(2, 0, ' and ', ' overlapping '),
+                '2 overlapping samples and 0 overlapping patients'
             );
         });
-        it("0 samples and nonzero patients", ()=>{
-            assert.equal(
-                caseCounts(0,3),
-                "0 samples/3 patients"
-            );
+        it('0 samples and nonzero patients', () => {
+            assert.equal(caseCounts(0, 3), '0 samples/3 patients');
         });
-        it("nonzero nonequal patients and samples", ()=>{
-            assert.equal(
-                caseCounts(3,2),
-                "3 samples/2 patients"
-            );
+        it('nonzero nonequal patients and samples', () => {
+            assert.equal(caseCounts(3, 2), '3 samples/2 patients');
         });
     });
 
-    describe("getPatientIdentifiers", ()=>{
+    describe('getPatientIdentifiers', () => {
         const sampleIds = [
-            { sampleId:"sample1", studyId:"study1"},
-            { sampleId:"sample2", studyId:"study1"},
-            { sampleId:"sample3", studyId:"study1"},
-            { sampleId:"sample1", studyId:"study2"},
-            { sampleId:"sample2", studyId:"study2"},
-            { sampleId:"sample3", studyId:"study2"}
+            { sampleId: 'sample1', studyId: 'study1' },
+            { sampleId: 'sample2', studyId: 'study1' },
+            { sampleId: 'sample3', studyId: 'study1' },
+            { sampleId: 'sample1', studyId: 'study2' },
+            { sampleId: 'sample2', studyId: 'study2' },
+            { sampleId: 'sample3', studyId: 'study2' },
         ];
-        let sampleSet:ComplexKeyMap<any>;
-        before(()=>{
+        let sampleSet: ComplexKeyMap<any>;
+        before(() => {
             sampleSet = new ComplexKeyMap<any>();
-            sampleSet.set(sampleIds[0], { patientId:"patient1", uniquePatientKey:"patient1key", studyId:"study1"});
-            sampleSet.set(sampleIds[1], { patientId:"patient2", uniquePatientKey:"patient2key", studyId:"study1"});
-            sampleSet.set(sampleIds[2], { patientId:"patient2", uniquePatientKey:"patient2key", studyId:"study1"});
-            sampleSet.set(sampleIds[3], { patientId:"patient1", uniquePatientKey:"patient3key", studyId:"study2"});
-            sampleSet.set(sampleIds[4], { patientId:"patient2", uniquePatientKey:"patient4key", studyId:"study2"});
-            sampleSet.set(sampleIds[5], { patientId:"patient3", uniquePatientKey:"patient5key", studyId:"study2"});
+            sampleSet.set(sampleIds[0], {
+                patientId: 'patient1',
+                uniquePatientKey: 'patient1key',
+                studyId: 'study1',
+            });
+            sampleSet.set(sampleIds[1], {
+                patientId: 'patient2',
+                uniquePatientKey: 'patient2key',
+                studyId: 'study1',
+            });
+            sampleSet.set(sampleIds[2], {
+                patientId: 'patient2',
+                uniquePatientKey: 'patient2key',
+                studyId: 'study1',
+            });
+            sampleSet.set(sampleIds[3], {
+                patientId: 'patient1',
+                uniquePatientKey: 'patient3key',
+                studyId: 'study2',
+            });
+            sampleSet.set(sampleIds[4], {
+                patientId: 'patient2',
+                uniquePatientKey: 'patient4key',
+                studyId: 'study2',
+            });
+            sampleSet.set(sampleIds[5], {
+                patientId: 'patient3',
+                uniquePatientKey: 'patient5key',
+                studyId: 'study2',
+            });
         });
 
-        it("empty", ()=>{
+        it('empty', () => {
             assertDeepEqualInAnyOrder(getPatientIdentifiers([], sampleSet), []);
         });
-        it("one sample", ()=>{
-            assertDeepEqualInAnyOrder(getPatientIdentifiers([sampleIds[0]], sampleSet), [{patientId:"patient1", studyId:"study1"}]);
-        });
-        it("multiple samples one patient one study", ()=>{
-            assertDeepEqualInAnyOrder(getPatientIdentifiers([
-                sampleIds[1], sampleIds[2]
-            ], sampleSet), [{
-                patientId:"patient2",
-                studyId:"study1"
-            }]);
-        });
-        it("multiple samples one per patient one study", ()=>{
-            assertDeepEqualInAnyOrder(getPatientIdentifiers([
-                sampleIds[3], sampleIds[4], sampleIds[5]
-            ], sampleSet), [{
-                patientId:"patient1",
-                studyId:"study2"
-            },{
-                patientId:"patient2",
-                studyId:"study2"
-            },{
-                patientId:"patient3",
-                studyId:"study2"
-            }]);
-        });
-        it("multiple samples multiple per patient one study", ()=>{
-            assertDeepEqualInAnyOrder(getPatientIdentifiers([
-                sampleIds[0], sampleIds[1], sampleIds[2]
-            ], sampleSet), [{
-                patientId:"patient1",
-                studyId:"study1"
-            },{
-                patientId:"patient2",
-                studyId:"study1"
-            }]);
-        });
-        it("multiple samples one per patient multiple studies", ()=>{
-            assertDeepEqualInAnyOrder(getPatientIdentifiers([
-                sampleIds[0], sampleIds[3], sampleIds[4], sampleIds[5]
-            ], sampleSet), [{
-                patientId:"patient1",
-                studyId:"study1"
-            },{
-                patientId:"patient1",
-                studyId:"study2"
-            },{
-                patientId:"patient2",
-                studyId:"study2"
-            },{
-                patientId:"patient3",
-                studyId:"study2"
-            }]);
-        });
-        it("multiple samples multiple per patient multiple studies", ()=>{
-            assertDeepEqualInAnyOrder(getPatientIdentifiers(sampleIds, sampleSet), [{
-                patientId:"patient1",
-                studyId:"study1"
-            },{
-                patientId:"patient2",
-                studyId:"study1"
-            },{
-                patientId:"patient1",
-                studyId:"study2"
-            },{
-                patientId:"patient2",
-                studyId:"study2"
-            },{
-                patientId:"patient3",
-                studyId:"study2"
-            }]);
+        it('one sample', () => {
+            assertDeepEqualInAnyOrder(
+                getPatientIdentifiers([sampleIds[0]], sampleSet),
+                [{ patientId: 'patient1', studyId: 'study1' }]
+            );
+        });
+        it('multiple samples one patient one study', () => {
+            assertDeepEqualInAnyOrder(
+                getPatientIdentifiers([sampleIds[1], sampleIds[2]], sampleSet),
+                [
+                    {
+                        patientId: 'patient2',
+                        studyId: 'study1',
+                    },
+                ]
+            );
+        });
+        it('multiple samples one per patient one study', () => {
+            assertDeepEqualInAnyOrder(
+                getPatientIdentifiers(
+                    [sampleIds[3], sampleIds[4], sampleIds[5]],
+                    sampleSet
+                ),
+                [
+                    {
+                        patientId: 'patient1',
+                        studyId: 'study2',
+                    },
+                    {
+                        patientId: 'patient2',
+                        studyId: 'study2',
+                    },
+                    {
+                        patientId: 'patient3',
+                        studyId: 'study2',
+                    },
+                ]
+            );
+        });
+        it('multiple samples multiple per patient one study', () => {
+            assertDeepEqualInAnyOrder(
+                getPatientIdentifiers(
+                    [sampleIds[0], sampleIds[1], sampleIds[2]],
+                    sampleSet
+                ),
+                [
+                    {
+                        patientId: 'patient1',
+                        studyId: 'study1',
+                    },
+                    {
+                        patientId: 'patient2',
+                        studyId: 'study1',
+                    },
+                ]
+            );
+        });
+        it('multiple samples one per patient multiple studies', () => {
+            assertDeepEqualInAnyOrder(
+                getPatientIdentifiers(
+                    [sampleIds[0], sampleIds[3], sampleIds[4], sampleIds[5]],
+                    sampleSet
+                ),
+                [
+                    {
+                        patientId: 'patient1',
+                        studyId: 'study1',
+                    },
+                    {
+                        patientId: 'patient1',
+                        studyId: 'study2',
+                    },
+                    {
+                        patientId: 'patient2',
+                        studyId: 'study2',
+                    },
+                    {
+                        patientId: 'patient3',
+                        studyId: 'study2',
+                    },
+                ]
+            );
+        });
+        it('multiple samples multiple per patient multiple studies', () => {
+            assertDeepEqualInAnyOrder(
+                getPatientIdentifiers(sampleIds, sampleSet),
+                [
+                    {
+                        patientId: 'patient1',
+                        studyId: 'study1',
+                    },
+                    {
+                        patientId: 'patient2',
+                        studyId: 'study1',
+                    },
+                    {
+                        patientId: 'patient1',
+                        studyId: 'study2',
+                    },
+                    {
+                        patientId: 'patient2',
+                        studyId: 'study2',
+                    },
+                    {
+                        patientId: 'patient3',
+                        studyId: 'study2',
+                    },
+                ]
+            );
         });
     });
 
-    describe("getOverlapFilteredGroups", ()=>{
-
-        function makeGroup(params:Partial<ComparisonGroup>) {
-            return Object.assign({
-                description:"",
-                origin:[]
-            }, params) as any;
+    describe('getOverlapFilteredGroups', () => {
+        function makeGroup(params: Partial<ComparisonGroup>) {
+            return Object.assign(
+                {
+                    description: '',
+                    origin: [],
+                },
+                params
+            ) as any;
         }
 
-        it("filters one group", ()=>{
-
-            assert.deepEqual(getOverlapFilteredGroups(
-                [
+        it('filters one group', () => {
+            assert.deepEqual(
+                getOverlapFilteredGroups(
+                    [
                         makeGroup({
-                            name: "group1",
-                            studies:[{ id:"study1", samples:["sample1","sample2"], patients:["patient1", "patient2"]}],
-                            color:"color1",
-                            uid:"uid1",
-                            nonExistentSamples:[
-                                { studyId:"study1", sampleId:"ne1"},{studyId:"study1", sampleId:"ne2"},{studyId:"study1", sampleId:"ne3"}
-                            ]
-                        })
+                            name: 'group1',
+                            studies: [
+                                {
+                                    id: 'study1',
+                                    samples: ['sample1', 'sample2'],
+                                    patients: ['patient1', 'patient2'],
+                                },
+                            ],
+                            color: 'color1',
+                            uid: 'uid1',
+                            nonExistentSamples: [
+                                { studyId: 'study1', sampleId: 'ne1' },
+                                { studyId: 'study1', sampleId: 'ne2' },
+                                { studyId: 'study1', sampleId: 'ne3' },
+                            ],
+                        }),
                     ],
-                {
-                    overlappingSamplesSet: ComplexKeySet.from([{ sampleId:"sample1", studyId:"study1"}]),
-                    overlappingPatientsSet: ComplexKeySet.from([{ patientId:"patient2", studyId:"study1"}])
-                }),
-                [makeGroup({
-                    name: "group1",
-                    studies:[{ id:"study1", samples:["sample2"], patients:["patient1"]}],
-                    color:"color1",
-                    uid:"uid1",
-                    nonExistentSamples:[
-                        { studyId:"study1", sampleId:"ne1"},{studyId:"study1", sampleId:"ne2"},{studyId:"study1", sampleId:"ne3"}
-                    ]
-                })]);
+                    {
+                        overlappingSamplesSet: ComplexKeySet.from([
+                            { sampleId: 'sample1', studyId: 'study1' },
+                        ]),
+                        overlappingPatientsSet: ComplexKeySet.from([
+                            { patientId: 'patient2', studyId: 'study1' },
+                        ]),
+                    }
+                ),
+                [
+                    makeGroup({
+                        name: 'group1',
+                        studies: [
+                            {
+                                id: 'study1',
+                                samples: ['sample2'],
+                                patients: ['patient1'],
+                            },
+                        ],
+                        color: 'color1',
+                        uid: 'uid1',
+                        nonExistentSamples: [
+                            { studyId: 'study1', sampleId: 'ne1' },
+                            { studyId: 'study1', sampleId: 'ne2' },
+                            { studyId: 'study1', sampleId: 'ne3' },
+                        ],
+                    }),
+                ]
+            );
         });
 
-        it("filters more than one group", ()=>{
-            assert.deepEqual(getOverlapFilteredGroups(
+        it('filters more than one group', () => {
+            assert.deepEqual(
+                getOverlapFilteredGroups(
+                    [
+                        makeGroup({
+                            name: 'group1',
+                            studies: [
+                                {
+                                    id: 'study1',
+                                    samples: ['sample1', 'sample2'],
+                                    patients: ['patient1', 'patient2'],
+                                },
+                            ],
+                            color: 'color1',
+                            uid: 'uid1',
+                            nonExistentSamples: [
+                                { studyId: 'study1', sampleId: 'ne1' },
+                                { studyId: 'study1', sampleId: 'ne2' },
+                                { studyId: 'study1', sampleId: 'ne3' },
+                            ],
+                        }),
+                        makeGroup({
+                            name: 'group2',
+                            studies: [
+                                {
+                                    id: 'study1',
+                                    samples: ['sample1', 'sample2'],
+                                    patients: [],
+                                },
+                                {
+                                    id: 'study2',
+                                    samples: ['sample1', 'sample2'],
+                                    patients: ['patient1'],
+                                },
+                            ],
+                            color: 'color2',
+                            uid: 'uid2',
+                            nonExistentSamples: [
+                                { studyId: 'study2', sampleId: 'ne1' },
+                                { studyId: 'study2', sampleId: 'ne2' },
+                            ],
+                        }),
+                        makeGroup({
+                            name: 'group3',
+                            studies: [
+                                {
+                                    id: 'study3',
+                                    samples: ['sample1', 'sample2'],
+                                    patients: ['patient1', 'patient2'],
+                                },
+                                {
+                                    id: 'study2',
+                                    samples: ['sample1'],
+                                    patients: ['patient1', 'patient2'],
+                                },
+                            ],
+                            color: 'color3',
+                            uid: 'uid3',
+                            nonExistentSamples: [
+                                { studyId: 'study3', sampleId: 'ne1' },
+                                { studyId: 'study4', sampleId: 'ne2' },
+                                { studyId: 'study6', sampleId: 'ne3' },
+                            ],
+                        }),
+                    ],
+                    {
+                        overlappingSamplesSet: ComplexKeySet.from([
+                            { sampleId: 'sample1', studyId: 'study1' },
+                            { sampleId: 'sample2', studyId: 'study1' },
+                            { sampleId: 'sample2', studyId: 'study2' },
+                        ]),
+                        overlappingPatientsSet: ComplexKeySet.from([
+                            { patientId: 'patient2', studyId: 'study1' },
+                            { patientId: 'patient1', studyId: 'study1' },
+                            { patientId: 'patient2', studyId: 'study2' },
+                        ]),
+                    }
+                ),
                 [
                     makeGroup({
-                        name: "group1",
-                        studies:[{ id:"study1", samples:["sample1","sample2"], patients:["patient1", "patient2"]}],
-                        color:"color1",
-                        uid:"uid1",
-                        nonExistentSamples:[
-                            { studyId:"study1", sampleId:"ne1"},{studyId:"study1", sampleId:"ne2"},{studyId:"study1", sampleId:"ne3"}
-                        ]
+                        name: 'group1',
+                        studies: [],
+                        color: 'color1',
+                        uid: 'uid1',
+                        nonExistentSamples: [
+                            { studyId: 'study1', sampleId: 'ne1' },
+                            { studyId: 'study1', sampleId: 'ne2' },
+                            { studyId: 'study1', sampleId: 'ne3' },
+                        ],
                     }),
                     makeGroup({
-                        name: "group2",
-                        studies:[{ id:"study1", samples:["sample1","sample2"], patients:[]}, { id:"study2", samples:["sample1","sample2"], patients:["patient1"]}],
-                        color:"color2",
-                        uid:"uid2",
-                        nonExistentSamples:[
-                            { studyId:"study2", sampleId:"ne1"},{studyId:"study2", sampleId:"ne2"}
+                        name: 'group2',
+                        studies: [
+                            {
+                                id: 'study2',
+                                samples: ['sample1'],
+                                patients: ['patient1'],
+                            },
+                        ],
+                        color: 'color2',
+                        uid: 'uid2',
+                        nonExistentSamples: [
+                            { studyId: 'study2', sampleId: 'ne1' },
+                            { studyId: 'study2', sampleId: 'ne2' },
                         ],
                     }),
                     makeGroup({
-                        name: "group3",
-                        studies:[{ id:"study3", samples:["sample1","sample2"], patients:["patient1", "patient2"]}, { id:"study2", samples:["sample1"], patients:["patient1", "patient2"]}],
-                        color:"color3",
-                        uid:"uid3",
-                        nonExistentSamples:[
-                            { studyId:"study3", sampleId:"ne1"},{studyId:"study4", sampleId:"ne2"},{studyId:"study6", sampleId:"ne3"}
-                        ]
-                    })
-                ],
-                {
-                    overlappingSamplesSet: ComplexKeySet.from([{ sampleId:"sample1", studyId:"study1"}, { sampleId:"sample2", studyId:"study1"}, { sampleId:"sample2", studyId:"study2"}]),
-                    overlappingPatientsSet: ComplexKeySet.from([{ patientId:"patient2", studyId:"study1"}, { patientId:"patient1", studyId:"study1"}, { patientId:"patient2", studyId:"study2"}])
-                }),
-                [makeGroup({
-                    name: "group1",
-                    studies:[],
-                    color:"color1",
-                    uid:"uid1",
-                    nonExistentSamples:[
-                        { studyId:"study1", sampleId:"ne1"},{studyId:"study1", sampleId:"ne2"},{studyId:"study1", sampleId:"ne3"}
-                    ]
-                }),
-                    makeGroup({
-                        name: "group2",
-                        studies:[{ id:"study2", samples:["sample1"], patients:["patient1"]}],
-                        color:"color2",
-                        uid:"uid2",
-                        nonExistentSamples:[
-                            { studyId:"study2", sampleId:"ne1"},{studyId:"study2", sampleId:"ne2"}
-                        ]
+                        name: 'group3',
+                        studies: [
+                            {
+                                id: 'study3',
+                                samples: ['sample1', 'sample2'],
+                                patients: ['patient1', 'patient2'],
+                            },
+                            {
+                                id: 'study2',
+                                samples: ['sample1'],
+                                patients: ['patient1'],
+                            },
+                        ],
+                        color: 'color3',
+                        uid: 'uid3',
+                        nonExistentSamples: [
+                            { studyId: 'study3', sampleId: 'ne1' },
+                            { studyId: 'study4', sampleId: 'ne2' },
+                            { studyId: 'study6', sampleId: 'ne3' },
+                        ],
                     }),
-                    makeGroup({
-                        name: "group3",
-                        studies:[{ id:"study3", samples:["sample1","sample2"], patients:["patient1", "patient2"]}, { id:"study2", samples:["sample1"], patients:["patient1"]}],
-                        color:"color3",
-                        uid:"uid3",
-                        nonExistentSamples:[
-                            { studyId:"study3", sampleId:"ne1"},{studyId:"study4", sampleId:"ne2"},{studyId:"study6", sampleId:"ne3"}
-                        ]
-                    })
-                ]);
+                ]
+            );
         });
 
-        it("gives empty for empty", ()=>{
-            assert.deepEqual(getOverlapFilteredGroups([],
-                {
-                    overlappingSamplesSet: ComplexKeySet.from([{ sampleId:"sample1", studyId:"study1"}]),
-                    overlappingPatientsSet: ComplexKeySet.from([{ patientId:"patient2", studyId:"study1"}])
+        it('gives empty for empty', () => {
+            assert.deepEqual(
+                getOverlapFilteredGroups([], {
+                    overlappingSamplesSet: ComplexKeySet.from([
+                        { sampleId: 'sample1', studyId: 'study1' },
+                    ]),
+                    overlappingPatientsSet: ComplexKeySet.from([
+                        { patientId: 'patient2', studyId: 'study1' },
+                    ]),
                 }),
-                []);
+                []
+            );
         });
     });
 
-    describe("getOverlappingSamples", ()=>{
-        it("empty for empty", ()=>{
+    describe('getOverlappingSamples', () => {
+        it('empty for empty', () => {
             assert.deepEqual(getOverlappingSamples([]), []);
         });
-        it("one group", ()=>{
-            assert.deepEqual(getOverlappingSamples([
-                { studies: [
-                    { id:"study1", samples:["sample1", "sample2"], patients:["patient1"]},
-                    { id:"study2", samples:["sample1", "sample2", "sample3"], patients:["patient1", "patient2", "patient3"]},
-                    { id:"study3", samples:["sample1"], patients:["patient1", "patient2"]}
-                ]}
-            ]), []);
-        });
-        it("two groups no overlap", ()=>{
-            assert.deepEqual(getOverlappingSamples([
-                { studies: [
-                    { id:"study1", samples:["sample1", "sample2"], patients:["patient1"]},
-                    { id:"study2", samples:["sample1", "sample2", "sample3"], patients:["patient1", "patient2", "patient3"]},
-                    { id:"study3", samples:["sample1"], patients:["patient1", "patient2"]}
-                ]},
-                { studies: [
-                    { id:"study1", samples:["sample3"], patients:["patient2"]},
-                    { id:"study2", samples:["sample4"], patients:["patient4", "patient5"]},
-                    { id:"study3", samples:["sample2", "sample3", "sample4"], patients:["patient3", "patient4", "patient5"]}
-                ]}
-            ]), []);
-        });
-        it("two groups overlap", ()=>{
-            (expect(getOverlappingSamples([
-                { studies: [
-                        { id:"study1", samples:["sample1", "sample2"], patients:["patient1"]},
-                        { id:"study2", samples:["sample1", "sample2", "sample3"], patients:["patient1", "patient2", "patient3"]},
-                        { id:"study3", samples:["sample1"], patients:["patient1", "patient2"]}
-                    ]},
-                { studies: [
-                        { id:"study1", samples:["sample1"], patients:["patient1"]},
-                        { id:"study2", samples:["sample2", "sample3",], patients:["patient1"]},
-                        { id:"study3", samples:["sample1", "sample2", "sample3", "sample4"], patients:["patient1", "patient2", "patient3", "patient4", "patient5"]}
-                    ]}
-            ])).to.deep as any).equalInAnyOrder([
-                { studyId:"study1", sampleId:"sample1"},
-                { studyId:"study2", sampleId:"sample2"},
-                { studyId:"study2", sampleId:"sample3"},
-                { studyId:"study3", sampleId:"sample1"},
+        it('one group', () => {
+            assert.deepEqual(
+                getOverlappingSamples([
+                    {
+                        studies: [
+                            {
+                                id: 'study1',
+                                samples: ['sample1', 'sample2'],
+                                patients: ['patient1'],
+                            },
+                            {
+                                id: 'study2',
+                                samples: ['sample1', 'sample2', 'sample3'],
+                                patients: ['patient1', 'patient2', 'patient3'],
+                            },
+                            {
+                                id: 'study3',
+                                samples: ['sample1'],
+                                patients: ['patient1', 'patient2'],
+                            },
+                        ],
+                    },
+                ]),
+                []
+            );
+        });
+        it('two groups no overlap', () => {
+            assert.deepEqual(
+                getOverlappingSamples([
+                    {
+                        studies: [
+                            {
+                                id: 'study1',
+                                samples: ['sample1', 'sample2'],
+                                patients: ['patient1'],
+                            },
+                            {
+                                id: 'study2',
+                                samples: ['sample1', 'sample2', 'sample3'],
+                                patients: ['patient1', 'patient2', 'patient3'],
+                            },
+                            {
+                                id: 'study3',
+                                samples: ['sample1'],
+                                patients: ['patient1', 'patient2'],
+                            },
+                        ],
+                    },
+                    {
+                        studies: [
+                            {
+                                id: 'study1',
+                                samples: ['sample3'],
+                                patients: ['patient2'],
+                            },
+                            {
+                                id: 'study2',
+                                samples: ['sample4'],
+                                patients: ['patient4', 'patient5'],
+                            },
+                            {
+                                id: 'study3',
+                                samples: ['sample2', 'sample3', 'sample4'],
+                                patients: ['patient3', 'patient4', 'patient5'],
+                            },
+                        ],
+                    },
+                ]),
+                []
+            );
+        });
+        it('two groups overlap', () => {
+            (expect(
+                getOverlappingSamples([
+                    {
+                        studies: [
+                            {
+                                id: 'study1',
+                                samples: ['sample1', 'sample2'],
+                                patients: ['patient1'],
+                            },
+                            {
+                                id: 'study2',
+                                samples: ['sample1', 'sample2', 'sample3'],
+                                patients: ['patient1', 'patient2', 'patient3'],
+                            },
+                            {
+                                id: 'study3',
+                                samples: ['sample1'],
+                                patients: ['patient1', 'patient2'],
+                            },
+                        ],
+                    },
+                    {
+                        studies: [
+                            {
+                                id: 'study1',
+                                samples: ['sample1'],
+                                patients: ['patient1'],
+                            },
+                            {
+                                id: 'study2',
+                                samples: ['sample2', 'sample3'],
+                                patients: ['patient1'],
+                            },
+                            {
+                                id: 'study3',
+                                samples: [
+                                    'sample1',
+                                    'sample2',
+                                    'sample3',
+                                    'sample4',
+                                ],
+                                patients: [
+                                    'patient1',
+                                    'patient2',
+                                    'patient3',
+                                    'patient4',
+                                    'patient5',
+                                ],
+                            },
+                        ],
+                    },
+                ])
+            ).to.deep as any).equalInAnyOrder([
+                { studyId: 'study1', sampleId: 'sample1' },
+                { studyId: 'study2', sampleId: 'sample2' },
+                { studyId: 'study2', sampleId: 'sample3' },
+                { studyId: 'study3', sampleId: 'sample1' },
             ]);
         });
-        it("three groups no overlap", ()=>{
-            assert.deepEqual(getOverlappingSamples([
-                { studies: [
-                        { id:"study1", samples:["sample1", "sample2"], patients:["patient1"]},
-                        { id:"study2", samples:["sample1", "sample2", "sample3"], patients:["patient1", "patient2", "patient3"]},
-                        { id:"study3", samples:["sample1"], patients:["patient1", "patient2"]}
-                    ]},
-                { studies: [
-                        { id:"study1", samples:["sample3"], patients:["patient2"]},
-                        { id:"study2", samples:["sample4"], patients:["patient4", "patient5"]},
-                        { id:"study3", samples:["sample2", "sample3", "sample4"], patients:["patient3", "patient4", "patient5"]}
-                    ]},
-                { studies: [
-                        { id:"study1", samples:["sample4"], patients:["patient3"]},
-                        { id:"study2", samples:["sample5"], patients:["patient6"]},
-                        { id:"study3", samples:["sample5", "sample6"], patients:["patient6", "patient7", "patient8"]}
-                    ]}
-            ]), []);
-        });
-        it("three groups overlap", ()=>{
-            (expect(getOverlappingSamples([
-                { studies: [
-                        { id:"study1", samples:["sample1", "sample2"], patients:["patient1"]},
-                        { id:"study2", samples:["sample1", "sample2", "sample3"], patients:["patient1", "patient2", "patient3"]},
-                        { id:"study3", samples:["sample1"], patients:["patient1", "patient2"]}
-                    ]},
-                { studies: [
-                        { id:"study1", samples:["sample1"], patients:["patient1"]},
-                        { id:"study2", samples:["sample2", "sample3",], patients:["patient1"]},
-                        { id:"study3", samples:["sample1", "sample2", "sample3", "sample4"], patients:["patient1", "patient2", "patient3", "patient4", "patient5"]}
-                    ]},
-                { studies: [
-                        { id:"study1", samples:["sample1"], patients:["patient1"]},
-                        { id:"study2", samples:["sample2", "sample3","sample4"], patients:["patient1"]},
-                        { id:"study3", samples:["sample1", "sample2", "sample3", "sample4"], patients:["patient1", "patient2", "patient3", "patient4", "patient5"]}
-                    ]}
-            ])).to.deep as any).equalInAnyOrder([
-                { studyId:"study1", sampleId:"sample1"},
-                { studyId:"study2", sampleId:"sample2"},
-                { studyId:"study2", sampleId:"sample3"},
-                { studyId:"study3", sampleId:"sample1"},
-                { studyId:"study3", sampleId:"sample2"},
-                { studyId:"study3", sampleId:"sample3"},
-                { studyId:"study3", sampleId:"sample4"},
+        it('three groups no overlap', () => {
+            assert.deepEqual(
+                getOverlappingSamples([
+                    {
+                        studies: [
+                            {
+                                id: 'study1',
+                                samples: ['sample1', 'sample2'],
+                                patients: ['patient1'],
+                            },
+                            {
+                                id: 'study2',
+                                samples: ['sample1', 'sample2', 'sample3'],
+                                patients: ['patient1', 'patient2', 'patient3'],
+                            },
+                            {
+                                id: 'study3',
+                                samples: ['sample1'],
+                                patients: ['patient1', 'patient2'],
+                            },
+                        ],
+                    },
+                    {
+                        studies: [
+                            {
+                                id: 'study1',
+                                samples: ['sample3'],
+                                patients: ['patient2'],
+                            },
+                            {
+                                id: 'study2',
+                                samples: ['sample4'],
+                                patients: ['patient4', 'patient5'],
+                            },
+                            {
+                                id: 'study3',
+                                samples: ['sample2', 'sample3', 'sample4'],
+                                patients: ['patient3', 'patient4', 'patient5'],
+                            },
+                        ],
+                    },
+                    {
+                        studies: [
+                            {
+                                id: 'study1',
+                                samples: ['sample4'],
+                                patients: ['patient3'],
+                            },
+                            {
+                                id: 'study2',
+                                samples: ['sample5'],
+                                patients: ['patient6'],
+                            },
+                            {
+                                id: 'study3',
+                                samples: ['sample5', 'sample6'],
+                                patients: ['patient6', 'patient7', 'patient8'],
+                            },
+                        ],
+                    },
+                ]),
+                []
+            );
+        });
+        it('three groups overlap', () => {
+            (expect(
+                getOverlappingSamples([
+                    {
+                        studies: [
+                            {
+                                id: 'study1',
+                                samples: ['sample1', 'sample2'],
+                                patients: ['patient1'],
+                            },
+                            {
+                                id: 'study2',
+                                samples: ['sample1', 'sample2', 'sample3'],
+                                patients: ['patient1', 'patient2', 'patient3'],
+                            },
+                            {
+                                id: 'study3',
+                                samples: ['sample1'],
+                                patients: ['patient1', 'patient2'],
+                            },
+                        ],
+                    },
+                    {
+                        studies: [
+                            {
+                                id: 'study1',
+                                samples: ['sample1'],
+                                patients: ['patient1'],
+                            },
+                            {
+                                id: 'study2',
+                                samples: ['sample2', 'sample3'],
+                                patients: ['patient1'],
+                            },
+                            {
+                                id: 'study3',
+                                samples: [
+                                    'sample1',
+                                    'sample2',
+                                    'sample3',
+                                    'sample4',
+                                ],
+                                patients: [
+                                    'patient1',
+                                    'patient2',
+                                    'patient3',
+                                    'patient4',
+                                    'patient5',
+                                ],
+                            },
+                        ],
+                    },
+                    {
+                        studies: [
+                            {
+                                id: 'study1',
+                                samples: ['sample1'],
+                                patients: ['patient1'],
+                            },
+                            {
+                                id: 'study2',
+                                samples: ['sample2', 'sample3', 'sample4'],
+                                patients: ['patient1'],
+                            },
+                            {
+                                id: 'study3',
+                                samples: [
+                                    'sample1',
+                                    'sample2',
+                                    'sample3',
+                                    'sample4',
+                                ],
+                                patients: [
+                                    'patient1',
+                                    'patient2',
+                                    'patient3',
+                                    'patient4',
+                                    'patient5',
+                                ],
+                            },
+                        ],
+                    },
+                ])
+            ).to.deep as any).equalInAnyOrder([
+                { studyId: 'study1', sampleId: 'sample1' },
+                { studyId: 'study2', sampleId: 'sample2' },
+                { studyId: 'study2', sampleId: 'sample3' },
+                { studyId: 'study3', sampleId: 'sample1' },
+                { studyId: 'study3', sampleId: 'sample2' },
+                { studyId: 'study3', sampleId: 'sample3' },
+                { studyId: 'study3', sampleId: 'sample4' },
             ]);
         });
     });
 
-    describe("getOverlappingPatients", ()=>{
-        it("empty for empty", ()=>{
+    describe('getOverlappingPatients', () => {
+        it('empty for empty', () => {
             assert.deepEqual(getOverlappingPatients([]), []);
         });
-        it("one group", ()=>{
-            assert.deepEqual(getOverlappingPatients([
-                { studies: [
-                        { id:"study1", samples:["sample1", "sample2"], patients:["patient1"]},
-                        { id:"study2", samples:["sample1", "sample2", "sample3"], patients:["patient1", "patient2", "patient3"]},
-                        { id:"study3", samples:["sample1"], patients:["patient1", "patient2"]}
-                    ]}
-            ]), []);
-        });
-        it("two groups no overlap", ()=>{
-            assert.deepEqual(getOverlappingPatients([
-                { studies: [
-                        { id:"study1", samples:["sample1", "sample2"], patients:["patient1"]},
-                        { id:"study2", samples:["sample1", "sample2", "sample3"], patients:["patient1", "patient2", "patient3"]},
-                        { id:"study3", samples:["sample1"], patients:["patient1", "patient2"]}
-                    ]},
-                { studies: [
-                        { id:"study1", samples:["sample3"], patients:["patient2"]},
-                        { id:"study2", samples:["sample4"], patients:["patient4", "patient5"]},
-                        { id:"study3", samples:["sample2", "sample3", "sample4"], patients:["patient3", "patient4", "patient5"]}
-                    ]}
-            ]), []);
-        });
-        it("two groups overlap", ()=>{
-            (expect(getOverlappingPatients([
-                { studies: [
-                        { id:"study1", samples:["sample1", "sample2"], patients:["patient1"]},
-                        { id:"study2", samples:["sample1", "sample2", "sample3"], patients:["patient1", "patient2", "patient3"]},
-                        { id:"study3", samples:["sample1"], patients:["patient1", "patient2"]}
-                    ]},
-                { studies: [
-                        { id:"study1", samples:["sample1"], patients:["patient1"]},
-                        { id:"study2", samples:["sample2", "sample3",], patients:["patient1"]},
-                        { id:"study3", samples:["sample1", "sample2", "sample3", "sample4"], patients:["patient1", "patient2", "patient3", "patient4", "patient5"]}
-                    ]}
-            ])).to.deep as any).equalInAnyOrder([
-                { studyId:"study1", patientId:"patient1"},
-                { studyId:"study2", patientId:"patient1"},
-                { studyId:"study3", patientId:"patient1"},
-                { studyId:"study3", patientId:"patient2"},
+        it('one group', () => {
+            assert.deepEqual(
+                getOverlappingPatients([
+                    {
+                        studies: [
+                            {
+                                id: 'study1',
+                                samples: ['sample1', 'sample2'],
+                                patients: ['patient1'],
+                            },
+                            {
+                                id: 'study2',
+                                samples: ['sample1', 'sample2', 'sample3'],
+                                patients: ['patient1', 'patient2', 'patient3'],
+                            },
+                            {
+                                id: 'study3',
+                                samples: ['sample1'],
+                                patients: ['patient1', 'patient2'],
+                            },
+                        ],
+                    },
+                ]),
+                []
+            );
+        });
+        it('two groups no overlap', () => {
+            assert.deepEqual(
+                getOverlappingPatients([
+                    {
+                        studies: [
+                            {
+                                id: 'study1',
+                                samples: ['sample1', 'sample2'],
+                                patients: ['patient1'],
+                            },
+                            {
+                                id: 'study2',
+                                samples: ['sample1', 'sample2', 'sample3'],
+                                patients: ['patient1', 'patient2', 'patient3'],
+                            },
+                            {
+                                id: 'study3',
+                                samples: ['sample1'],
+                                patients: ['patient1', 'patient2'],
+                            },
+                        ],
+                    },
+                    {
+                        studies: [
+                            {
+                                id: 'study1',
+                                samples: ['sample3'],
+                                patients: ['patient2'],
+                            },
+                            {
+                                id: 'study2',
+                                samples: ['sample4'],
+                                patients: ['patient4', 'patient5'],
+                            },
+                            {
+                                id: 'study3',
+                                samples: ['sample2', 'sample3', 'sample4'],
+                                patients: ['patient3', 'patient4', 'patient5'],
+                            },
+                        ],
+                    },
+                ]),
+                []
+            );
+        });
+        it('two groups overlap', () => {
+            (expect(
+                getOverlappingPatients([
+                    {
+                        studies: [
+                            {
+                                id: 'study1',
+                                samples: ['sample1', 'sample2'],
+                                patients: ['patient1'],
+                            },
+                            {
+                                id: 'study2',
+                                samples: ['sample1', 'sample2', 'sample3'],
+                                patients: ['patient1', 'patient2', 'patient3'],
+                            },
+                            {
+                                id: 'study3',
+                                samples: ['sample1'],
+                                patients: ['patient1', 'patient2'],
+                            },
+                        ],
+                    },
+                    {
+                        studies: [
+                            {
+                                id: 'study1',
+                                samples: ['sample1'],
+                                patients: ['patient1'],
+                            },
+                            {
+                                id: 'study2',
+                                samples: ['sample2', 'sample3'],
+                                patients: ['patient1'],
+                            },
+                            {
+                                id: 'study3',
+                                samples: [
+                                    'sample1',
+                                    'sample2',
+                                    'sample3',
+                                    'sample4',
+                                ],
+                                patients: [
+                                    'patient1',
+                                    'patient2',
+                                    'patient3',
+                                    'patient4',
+                                    'patient5',
+                                ],
+                            },
+                        ],
+                    },
+                ])
+            ).to.deep as any).equalInAnyOrder([
+                { studyId: 'study1', patientId: 'patient1' },
+                { studyId: 'study2', patientId: 'patient1' },
+                { studyId: 'study3', patientId: 'patient1' },
+                { studyId: 'study3', patientId: 'patient2' },
             ]);
         });
-        it("three groups no overlap", ()=>{
-            assert.deepEqual(getOverlappingPatients([
-                { studies: [
-                        { id:"study1", samples:["sample1", "sample2"], patients:["patient1"]},
-                        { id:"study2", samples:["sample1", "sample2", "sample3"], patients:["patient1", "patient2", "patient3"]},
-                        { id:"study3", samples:["sample1"], patients:["patient1", "patient2"]}
-                    ]},
-                { studies: [
-                        { id:"study1", samples:["sample3"], patients:["patient2"]},
-                        { id:"study2", samples:["sample4"], patients:["patient4", "patient5"]},
-                        { id:"study3", samples:["sample2", "sample3", "sample4"], patients:["patient3", "patient4", "patient5"]}
-                    ]},
-                { studies: [
-                        { id:"study1", samples:["sample4"], patients:["patient3"]},
-                        { id:"study2", samples:["sample5"], patients:["patient6"]},
-                        { id:"study3", samples:["sample5", "sample6"], patients:["patient6", "patient7", "patient8"]}
-                    ]}
-            ]), []);
-        });
-        it("three groups overlap", ()=>{
-            (expect(getOverlappingPatients([
-                { studies: [
-                        { id:"study1", samples:["sample1", "sample2"], patients:["patient1"]},
-                        { id:"study2", samples:["sample1", "sample2", "sample3"], patients:["patient1", "patient2", "patient3"]},
-                        { id:"study3", samples:["sample1"], patients:["patient1", "patient2", "patient3"]}
-                    ]},
-                { studies: [
-                        { id:"study1", samples:["sample1"], patients:["patient1"]},
-                        { id:"study2", samples:["sample2", "sample3",], patients:["patient1"]},
-                        { id:"study3", samples:["sample1", "sample2", "sample3", "sample4"], patients:["patient1", "patient2", "patient4", "patient5"]}
-                    ]},
-                { studies: [
-                        { id:"study1", samples:["sample1"], patients:["patient1"]},
-                        { id:"study2", samples:["sample2", "sample3","sample4"], patients:["patient1"]},
-                        { id:"study3", samples:["sample1", "sample2", "sample3", "sample4"], patients:["patient2", "patient3", "patient4", "patient5"]}
-                    ]}
-            ])).to.deep as any).equalInAnyOrder([
-                { studyId:"study1", patientId:"patient1"},
-                { studyId:"study2", patientId:"patient1"},
-                { studyId:"study3", patientId:"patient1"},
-                { studyId:"study3", patientId:"patient2"},
-                { studyId:"study3", patientId:"patient3"},
-                { studyId:"study3", patientId:"patient4"},
-                { studyId:"study3", patientId:"patient5"},
+        it('three groups no overlap', () => {
+            assert.deepEqual(
+                getOverlappingPatients([
+                    {
+                        studies: [
+                            {
+                                id: 'study1',
+                                samples: ['sample1', 'sample2'],
+                                patients: ['patient1'],
+                            },
+                            {
+                                id: 'study2',
+                                samples: ['sample1', 'sample2', 'sample3'],
+                                patients: ['patient1', 'patient2', 'patient3'],
+                            },
+                            {
+                                id: 'study3',
+                                samples: ['sample1'],
+                                patients: ['patient1', 'patient2'],
+                            },
+                        ],
+                    },
+                    {
+                        studies: [
+                            {
+                                id: 'study1',
+                                samples: ['sample3'],
+                                patients: ['patient2'],
+                            },
+                            {
+                                id: 'study2',
+                                samples: ['sample4'],
+                                patients: ['patient4', 'patient5'],
+                            },
+                            {
+                                id: 'study3',
+                                samples: ['sample2', 'sample3', 'sample4'],
+                                patients: ['patient3', 'patient4', 'patient5'],
+                            },
+                        ],
+                    },
+                    {
+                        studies: [
+                            {
+                                id: 'study1',
+                                samples: ['sample4'],
+                                patients: ['patient3'],
+                            },
+                            {
+                                id: 'study2',
+                                samples: ['sample5'],
+                                patients: ['patient6'],
+                            },
+                            {
+                                id: 'study3',
+                                samples: ['sample5', 'sample6'],
+                                patients: ['patient6', 'patient7', 'patient8'],
+                            },
+                        ],
+                    },
+                ]),
+                []
+            );
+        });
+        it('three groups overlap', () => {
+            (expect(
+                getOverlappingPatients([
+                    {
+                        studies: [
+                            {
+                                id: 'study1',
+                                samples: ['sample1', 'sample2'],
+                                patients: ['patient1'],
+                            },
+                            {
+                                id: 'study2',
+                                samples: ['sample1', 'sample2', 'sample3'],
+                                patients: ['patient1', 'patient2', 'patient3'],
+                            },
+                            {
+                                id: 'study3',
+                                samples: ['sample1'],
+                                patients: ['patient1', 'patient2', 'patient3'],
+                            },
+                        ],
+                    },
+                    {
+                        studies: [
+                            {
+                                id: 'study1',
+                                samples: ['sample1'],
+                                patients: ['patient1'],
+                            },
+                            {
+                                id: 'study2',
+                                samples: ['sample2', 'sample3'],
+                                patients: ['patient1'],
+                            },
+                            {
+                                id: 'study3',
+                                samples: [
+                                    'sample1',
+                                    'sample2',
+                                    'sample3',
+                                    'sample4',
+                                ],
+                                patients: [
+                                    'patient1',
+                                    'patient2',
+                                    'patient4',
+                                    'patient5',
+                                ],
+                            },
+                        ],
+                    },
+                    {
+                        studies: [
+                            {
+                                id: 'study1',
+                                samples: ['sample1'],
+                                patients: ['patient1'],
+                            },
+                            {
+                                id: 'study2',
+                                samples: ['sample2', 'sample3', 'sample4'],
+                                patients: ['patient1'],
+                            },
+                            {
+                                id: 'study3',
+                                samples: [
+                                    'sample1',
+                                    'sample2',
+                                    'sample3',
+                                    'sample4',
+                                ],
+                                patients: [
+                                    'patient2',
+                                    'patient3',
+                                    'patient4',
+                                    'patient5',
+                                ],
+                            },
+                        ],
+                    },
+                ])
+            ).to.deep as any).equalInAnyOrder([
+                { studyId: 'study1', patientId: 'patient1' },
+                { studyId: 'study2', patientId: 'patient1' },
+                { studyId: 'study3', patientId: 'patient1' },
+                { studyId: 'study3', patientId: 'patient2' },
+                { studyId: 'study3', patientId: 'patient3' },
+                { studyId: 'study3', patientId: 'patient4' },
+                { studyId: 'study3', patientId: 'patient5' },
             ]);
         });
     });
 
-    describe("isGroupEmpty", ()=>{
-        it("empty", ()=>{
-            assert.isTrue(isGroupEmpty({
-                studies:[]
-            }), "empty array");
+    describe('isGroupEmpty', () => {
+        it('empty', () => {
+            assert.isTrue(
+                isGroupEmpty({
+                    studies: [],
+                }),
+                'empty array'
+            );
 
-            assert.isTrue(isGroupEmpty({
-                studies:[{
-                    id:"study",
-                    samples:[],
-                    patients:[]
-                }]
-            }), "one empty study");
+            assert.isTrue(
+                isGroupEmpty({
+                    studies: [
+                        {
+                            id: 'study',
+                            samples: [],
+                            patients: [],
+                        },
+                    ],
+                }),
+                'one empty study'
+            );
 
-            assert.isTrue(isGroupEmpty({
-                studies:[{
-                    id:"study",
-                    samples:[],
-                    patients:[]
-                },
-                {
-                    id:"study2",
-                    samples:[],
-                    patients:[]
-                }]
-            }), "two empty studies");
-        });
-        it("not empty", ()=>{
-            assert.isFalse(isGroupEmpty({
-                studies:[
-                {
-                    id:"study2",
-                    samples:["sample1"],
-                    patients:[]
-                }]
-            }), "one nonempty study");
+            assert.isTrue(
+                isGroupEmpty({
+                    studies: [
+                        {
+                            id: 'study',
+                            samples: [],
+                            patients: [],
+                        },
+                        {
+                            id: 'study2',
+                            samples: [],
+                            patients: [],
+                        },
+                    ],
+                }),
+                'two empty studies'
+            );
+        });
+        it('not empty', () => {
+            assert.isFalse(
+                isGroupEmpty({
+                    studies: [
+                        {
+                            id: 'study2',
+                            samples: ['sample1'],
+                            patients: [],
+                        },
+                    ],
+                }),
+                'one nonempty study'
+            );
 
-            assert.isFalse(isGroupEmpty({
-                studies:[{
-                    id:"study",
-                    samples:[],
-                    patients:[]
-                },
-                {
-                    id:"study2",
-                    samples:["sample1"],
-                    patients:["patient1"]
-                }]
-            }), "one empty study, one nonempty study");
+            assert.isFalse(
+                isGroupEmpty({
+                    studies: [
+                        {
+                            id: 'study',
+                            samples: [],
+                            patients: [],
+                        },
+                        {
+                            id: 'study2',
+                            samples: ['sample1'],
+                            patients: ['patient1'],
+                        },
+                    ],
+                }),
+                'one empty study, one nonempty study'
+            );
         });
     });
 
-    describe("getStudyIds", ()=>{
-        it("empty for empty", ()=>{
+    describe('getStudyIds', () => {
+        it('empty for empty', () => {
             assert.deepEqual(getStudyIds([]), []);
         });
-        it("one group", ()=>{
-            assert.deepEqual(getStudyIds([{ studies: [
-                { id:"study1", samples:["sample1", "sample2"]},
-                { id:"study2", samples:["sample1", "sample2", "sample3"]},
-                { id:"study3", samples:["sample1"]}
-            ]}]), ["study1", "study2", "study3"]);
-        });
-        it("two groups", ()=>{
-            assert.deepEqual(getStudyIds([{ studies: [
-                { id:"study1", samples:["sample1", "sample2"]},
-                { id:"study2", samples:["sample1", "sample2", "sample3"]},
-                { id:"study3", samples:["sample1"]}
-            ]},{ studies: [
-                { id:"study1", samples:["sample1", "sample2"]},
-                { id:"study2", samples:["sample1", "sample2", "sample3"]},
-                { id:"study4", samples:["sample1"]}
-            ]}]), ["study1", "study2", "study3", "study4"]);
-        });
-        it("three groups", ()=>{
-            assert.deepEqual(getStudyIds([{ studies: [
-                { id:"study1", samples:["sample1", "sample2"]},
-                { id:"study2", samples:["sample1", "sample2", "sample3"]},
-                { id:"study3", samples:["sample1"]}
-            ]},{ studies: [
-                { id:"study1", samples:["sample1", "sample2"]},
-                { id:"study2", samples:["sample1", "sample2", "sample3"]},
-                { id:"study4", samples:["sample1"]}
-            ]},{ studies: [
-                { id:"study5", samples:["sample1", "sample2"]},
-                { id:"study2", samples:["sample1", "sample2", "sample3"]},
-                { id:"study6", samples:["sample1"]}
-            ]}]), ["study1", "study2", "study3", "study4", "study5", "study6"]);
+        it('one group', () => {
+            assert.deepEqual(
+                getStudyIds([
+                    {
+                        studies: [
+                            { id: 'study1', samples: ['sample1', 'sample2'] },
+                            {
+                                id: 'study2',
+                                samples: ['sample1', 'sample2', 'sample3'],
+                            },
+                            { id: 'study3', samples: ['sample1'] },
+                        ],
+                    },
+                ]),
+                ['study1', 'study2', 'study3']
+            );
+        });
+        it('two groups', () => {
+            assert.deepEqual(
+                getStudyIds([
+                    {
+                        studies: [
+                            { id: 'study1', samples: ['sample1', 'sample2'] },
+                            {
+                                id: 'study2',
+                                samples: ['sample1', 'sample2', 'sample3'],
+                            },
+                            { id: 'study3', samples: ['sample1'] },
+                        ],
+                    },
+                    {
+                        studies: [
+                            { id: 'study1', samples: ['sample1', 'sample2'] },
+                            {
+                                id: 'study2',
+                                samples: ['sample1', 'sample2', 'sample3'],
+                            },
+                            { id: 'study4', samples: ['sample1'] },
+                        ],
+                    },
+                ]),
+                ['study1', 'study2', 'study3', 'study4']
+            );
+        });
+        it('three groups', () => {
+            assert.deepEqual(
+                getStudyIds([
+                    {
+                        studies: [
+                            { id: 'study1', samples: ['sample1', 'sample2'] },
+                            {
+                                id: 'study2',
+                                samples: ['sample1', 'sample2', 'sample3'],
+                            },
+                            { id: 'study3', samples: ['sample1'] },
+                        ],
+                    },
+                    {
+                        studies: [
+                            { id: 'study1', samples: ['sample1', 'sample2'] },
+                            {
+                                id: 'study2',
+                                samples: ['sample1', 'sample2', 'sample3'],
+                            },
+                            { id: 'study4', samples: ['sample1'] },
+                        ],
+                    },
+                    {
+                        studies: [
+                            { id: 'study5', samples: ['sample1', 'sample2'] },
+                            {
+                                id: 'study2',
+                                samples: ['sample1', 'sample2', 'sample3'],
+                            },
+                            { id: 'study6', samples: ['sample1'] },
+                        ],
+                    },
+                ]),
+                ['study1', 'study2', 'study3', 'study4', 'study5', 'study6']
+            );
         });
     });
 
-    describe("getSampleIdentifiers",()=>{
-        it("empty for empty", ()=>{
+    describe('getSampleIdentifiers', () => {
+        it('empty for empty', () => {
             assert.deepEqual(getSampleIdentifiers([]), []);
         });
-        it("one group", ()=>{
-            (expect(getSampleIdentifiers([{ studies: [
-                    { id:"study1", samples:["sample1", "sample2"]},
-                    { id:"study2", samples:["sample1", "sample2", "sample3"]},
-                    { id:"study3", samples:["sample1"]}
-                ]}])).to.deep as any).equalInAnyOrder([
-                { sampleId:"sample1", studyId:"study1"},
-                { sampleId:"sample2", studyId:"study1"},
-                { sampleId:"sample1", studyId:"study2"},
-                { sampleId:"sample2", studyId:"study2"},
-                { sampleId:"sample3", studyId:"study2"},
-                { sampleId:"sample1", studyId:"study3"},
+        it('one group', () => {
+            (expect(
+                getSampleIdentifiers([
+                    {
+                        studies: [
+                            { id: 'study1', samples: ['sample1', 'sample2'] },
+                            {
+                                id: 'study2',
+                                samples: ['sample1', 'sample2', 'sample3'],
+                            },
+                            { id: 'study3', samples: ['sample1'] },
+                        ],
+                    },
+                ])
+            ).to.deep as any).equalInAnyOrder([
+                { sampleId: 'sample1', studyId: 'study1' },
+                { sampleId: 'sample2', studyId: 'study1' },
+                { sampleId: 'sample1', studyId: 'study2' },
+                { sampleId: 'sample2', studyId: 'study2' },
+                { sampleId: 'sample3', studyId: 'study2' },
+                { sampleId: 'sample1', studyId: 'study3' },
+            ]);
+        });
+        it('two groups', () => {
+            (expect(
+                getSampleIdentifiers([
+                    {
+                        studies: [
+                            { id: 'study1', samples: ['sample1', 'sample2'] },
+                            {
+                                id: 'study2',
+                                samples: ['sample1', 'sample2', 'sample3'],
+                            },
+                            { id: 'study3', samples: ['sample1'] },
+                        ],
+                    },
+                    {
+                        studies: [
+                            { id: 'study1', samples: ['sample1', 'sample2'] },
+                            {
+                                id: 'study2',
+                                samples: ['sample1', 'sample2', 'sample3'],
+                            },
+                            { id: 'study4', samples: ['sample1'] },
+                        ],
+                    },
+                ])
+            ).to.deep as any).equalInAnyOrder([
+                { sampleId: 'sample1', studyId: 'study1' },
+                { sampleId: 'sample2', studyId: 'study1' },
+                { sampleId: 'sample1', studyId: 'study2' },
+                { sampleId: 'sample2', studyId: 'study2' },
+                { sampleId: 'sample3', studyId: 'study2' },
+                { sampleId: 'sample1', studyId: 'study3' },
+                { sampleId: 'sample1', studyId: 'study4' },
             ]);
         });
-        it("two groups", ()=>{
-            (expect(getSampleIdentifiers([{ studies: [
-                    { id:"study1", samples:["sample1", "sample2"]},
-                    { id:"study2", samples:["sample1", "sample2", "sample3"]},
-                    { id:"study3", samples:["sample1"]}
-                ]},{ studies: [
-                    { id:"study1", samples:["sample1", "sample2"]},
-                    { id:"study2", samples:["sample1", "sample2", "sample3"]},
-                    { id:"study4", samples:["sample1"]}
-                ]}])).to.deep as any).equalInAnyOrder([
-                { sampleId:"sample1", studyId:"study1"},
-                { sampleId:"sample2", studyId:"study1"},
-                { sampleId:"sample1", studyId:"study2"},
-                { sampleId:"sample2", studyId:"study2"},
-                { sampleId:"sample3", studyId:"study2"},
-                { sampleId:"sample1", studyId:"study3"},
-                { sampleId:"sample1", studyId:"study4"},
-                ]);
-        });
-        it("three groups", ()=>{
-            (expect(getSampleIdentifiers([{ studies: [
-                    { id:"study1", samples:["sample1", "sample2"]},
-                    { id:"study2", samples:["sample1", "sample2", "sample3"]},
-                    { id:"study3", samples:["sample1"]}
-                ]},{ studies: [
-                    { id:"study1", samples:["sample1", "sample2"]},
-                    { id:"study2", samples:["sample1", "sample2", "sample3"]},
-                    { id:"study4", samples:["sample1"]}
-                ]},{ studies: [
-                    { id:"study5", samples:["sample1", "sample2"]},
-                    { id:"study2", samples:["sample1", "sample2", "sample3"]},
-                    { id:"study6", samples:["sample1"]}
-                ]}])).to.deep as any).equalInAnyOrder([
-                { sampleId:"sample1", studyId:"study1"},
-                { sampleId:"sample2", studyId:"study1"},
-                { sampleId:"sample1", studyId:"study2"},
-                { sampleId:"sample2", studyId:"study2"},
-                { sampleId:"sample3", studyId:"study2"},
-                { sampleId:"sample1", studyId:"study3"},
-                { sampleId:"sample1", studyId:"study4"},
-                { sampleId:"sample1", studyId:"study5"},
-                { sampleId:"sample2", studyId:"study5"},
-                { sampleId:"sample1", studyId:"study6"},
+        it('three groups', () => {
+            (expect(
+                getSampleIdentifiers([
+                    {
+                        studies: [
+                            { id: 'study1', samples: ['sample1', 'sample2'] },
+                            {
+                                id: 'study2',
+                                samples: ['sample1', 'sample2', 'sample3'],
+                            },
+                            { id: 'study3', samples: ['sample1'] },
+                        ],
+                    },
+                    {
+                        studies: [
+                            { id: 'study1', samples: ['sample1', 'sample2'] },
+                            {
+                                id: 'study2',
+                                samples: ['sample1', 'sample2', 'sample3'],
+                            },
+                            { id: 'study4', samples: ['sample1'] },
+                        ],
+                    },
+                    {
+                        studies: [
+                            { id: 'study5', samples: ['sample1', 'sample2'] },
+                            {
+                                id: 'study2',
+                                samples: ['sample1', 'sample2', 'sample3'],
+                            },
+                            { id: 'study6', samples: ['sample1'] },
+                        ],
+                    },
+                ])
+            ).to.deep as any).equalInAnyOrder([
+                { sampleId: 'sample1', studyId: 'study1' },
+                { sampleId: 'sample2', studyId: 'study1' },
+                { sampleId: 'sample1', studyId: 'study2' },
+                { sampleId: 'sample2', studyId: 'study2' },
+                { sampleId: 'sample3', studyId: 'study2' },
+                { sampleId: 'sample1', studyId: 'study3' },
+                { sampleId: 'sample1', studyId: 'study4' },
+                { sampleId: 'sample1', studyId: 'study5' },
+                { sampleId: 'sample2', studyId: 'study5' },
+                { sampleId: 'sample1', studyId: 'study6' },
             ]);
         });
     });
 
-    describe("getNumSamples", ()=>{
-        it("empty for empty", ()=>{
-            assert.deepEqual(getNumSamples({studies:[]}), 0);
-        });
-        it("nonempty", ()=>{
-            assert.deepEqual(getNumSamples({ studies: [
-                    { id:"study1", samples:["sample1", "sample2"]},
-                    { id:"study2", samples:["sample1", "sample2", "sample3"]},
-                    { id:"study3", samples:["sample1"]}]}), 6);
-
+    describe('getNumSamples', () => {
+        it('empty for empty', () => {
+            assert.deepEqual(getNumSamples({ studies: [] }), 0);
+        });
+        it('nonempty', () => {
+            assert.deepEqual(
+                getNumSamples({
+                    studies: [
+                        { id: 'study1', samples: ['sample1', 'sample2'] },
+                        {
+                            id: 'study2',
+                            samples: ['sample1', 'sample2', 'sample3'],
+                        },
+                        { id: 'study3', samples: ['sample1'] },
+                    ],
+                }),
+                6
+            );
+        });
+    });
+
+    describe('getNumPatients', () => {
+        it('empty for empty', () => {
+            assert.deepEqual(getNumPatients({ studies: [] }), 0);
         });
-    });
-
-    describe("getNumPatients", ()=>{
-        it("empty for empty", ()=>{
-            assert.deepEqual(getNumPatients({studies:[]}), 0);
-        });
-        it("nonempty", ()=>{
-            assert.deepEqual(getNumPatients({ studies: [
-                    { id:"study1", samples:["sample1", "sample2"], patients:["patient1"]},
-                    { id:"study2", samples:["sample1", "sample2", "sample3"], patients:["patient1", "patient3"]},
-                    { id:"study3", samples:["sample1"], patients:["patient2"]}]}), 4);
-
+        it('nonempty', () => {
+            assert.deepEqual(
+                getNumPatients({
+                    studies: [
+                        {
+                            id: 'study1',
+                            samples: ['sample1', 'sample2'],
+                            patients: ['patient1'],
+                        },
+                        {
+                            id: 'study2',
+                            samples: ['sample1', 'sample2', 'sample3'],
+                            patients: ['patient1', 'patient3'],
+                        },
+                        {
+                            id: 'study3',
+                            samples: ['sample1'],
+                            patients: ['patient2'],
+                        },
+                    ],
+                }),
+                4
+            );
         });
     });
 
-    describe("finalizeStudiesAttr", ()=>{
-        const sampleSet = ComplexKeyMap.from([
-            {studyId:"1", sampleId:"1", patientId:"1"}, {studyId:"1", sampleId:"2", patientId:"1"},
-            {studyId:"2", sampleId:"2", patientId:"1"}, {studyId:"2", sampleId:"4", patientId:"4"},
-            {studyId:"3", sampleId:"1", patientId:"1"}
-        ] as Sample[], s=>({studyId: s.studyId, sampleId: s.sampleId}));
+    describe('finalizeStudiesAttr', () => {
+        const sampleSet = ComplexKeyMap.from(
+            [
+                { studyId: '1', sampleId: '1', patientId: '1' },
+                { studyId: '1', sampleId: '2', patientId: '1' },
+                { studyId: '2', sampleId: '2', patientId: '1' },
+                { studyId: '2', sampleId: '4', patientId: '4' },
+                { studyId: '3', sampleId: '1', patientId: '1' },
+            ] as Sample[],
+            s => ({ studyId: s.studyId, sampleId: s.sampleId })
+        );
 
-        it("empty for empty", ()=>{
-            assert.deepEqual(finalizeStudiesAttr({studies:[]}, sampleSet), {
-                nonExistentSamples:[],
-                studies:[]
+        it('empty for empty', () => {
+            assert.deepEqual(finalizeStudiesAttr({ studies: [] }, sampleSet), {
+                nonExistentSamples: [],
+                studies: [],
             });
         });
 
-        it("all samples existing", ()=>{
-            (expect(finalizeStudiesAttr({ studies: [
-                    { id: "1", samples:["1", "2"]},
-                    { id: "2", samples:["4"]},
-                    { id: "3", samples:["1"]}
-                ]}, sampleSet)).to.deep as any).equalInAnyOrder({
-                nonExistentSamples:[],
-                studies:[
-                    { id: "1", samples:["1", "2"], patients:["1"]},
-                    { id: "2", samples:["4"], patients:["4"]},
-                    { id: "3", samples:["1"], patients:["1"]}
-                ]
+        it('all samples existing', () => {
+            (expect(
+                finalizeStudiesAttr(
+                    {
+                        studies: [
+                            { id: '1', samples: ['1', '2'] },
+                            { id: '2', samples: ['4'] },
+                            { id: '3', samples: ['1'] },
+                        ],
+                    },
+                    sampleSet
+                )
+            ).to.deep as any).equalInAnyOrder({
+                nonExistentSamples: [],
+                studies: [
+                    { id: '1', samples: ['1', '2'], patients: ['1'] },
+                    { id: '2', samples: ['4'], patients: ['4'] },
+                    { id: '3', samples: ['1'], patients: ['1'] },
+                ],
             });
         });
 
-        it("some samples not existing", ()=>{
-            (expect(finalizeStudiesAttr({ studies: [
-                    { id: "1", samples:["1", "2", "3", "4"]},
-                    { id: "2", samples:["2", "3", "4"]},
-                    { id: "3", samples:["2","3","4"]}
-                ]}, sampleSet)).to.deep as any).equalInAnyOrder({
-                nonExistentSamples:[
-                    {studyId:"1", sampleId:"3"},
-                    {studyId:"1", sampleId:"4"},
-                    {studyId:"2", sampleId:"3"},
-                    {studyId:"3", sampleId:"2"},
-                    {studyId:"3", sampleId:"3"},
-                    {studyId:"3", sampleId:"4"}
+        it('some samples not existing', () => {
+            (expect(
+                finalizeStudiesAttr(
+                    {
+                        studies: [
+                            { id: '1', samples: ['1', '2', '3', '4'] },
+                            { id: '2', samples: ['2', '3', '4'] },
+                            { id: '3', samples: ['2', '3', '4'] },
+                        ],
+                    },
+                    sampleSet
+                )
+            ).to.deep as any).equalInAnyOrder({
+                nonExistentSamples: [
+                    { studyId: '1', sampleId: '3' },
+                    { studyId: '1', sampleId: '4' },
+                    { studyId: '2', sampleId: '3' },
+                    { studyId: '3', sampleId: '2' },
+                    { studyId: '3', sampleId: '3' },
+                    { studyId: '3', sampleId: '4' },
+                ],
+                studies: [
+                    { id: '1', samples: ['1', '2'], patients: ['1'] },
+                    { id: '2', samples: ['2', '4'], patients: ['1', '4'] },
                 ],
-                studies:[
-                    { id: "1", samples:["1", "2"], patients:["1"]},
-                    { id: "2", samples:["2","4"], patients:["1", "4"]}
-                ]
             });
         });
     });
 
-    describe("splitData", ()=>{
-        it("gets quartiles of 1,2,3, and 4 values", ()=>{
-            const vals = [0,1,2,3].map(x=>({ value:x.toString() }));
-            assert.deepEqual(
-                splitData(vals.slice(0,1),4),
-                [[vals[0]]]
-            );
-            assert.deepEqual(
-                splitData(vals.slice(0,2),4),
-                [[vals[0]],[vals[1]]]
-            );
-            assert.deepEqual(
-                splitData(vals.slice(0,3),4),
-                [[vals[0]],[vals[1]], [vals[2]]]
-            );
-            assert.deepEqual(
-                splitData(vals,4),
-                [[vals[0]],[vals[1]], [vals[2]], [vals[3]]]
-            );
+    describe('splitData', () => {
+        it('gets quartiles of 1,2,3, and 4 values', () => {
+            const vals = [0, 1, 2, 3].map(x => ({ value: x.toString() }));
+            assert.deepEqual(splitData(vals.slice(0, 1), 4), [[vals[0]]]);
+            assert.deepEqual(splitData(vals.slice(0, 2), 4), [
+                [vals[0]],
+                [vals[1]],
+            ]);
+            assert.deepEqual(splitData(vals.slice(0, 3), 4), [
+                [vals[0]],
+                [vals[1]],
+                [vals[2]],
+            ]);
+            assert.deepEqual(splitData(vals, 4), [
+                [vals[0]],
+                [vals[1]],
+                [vals[2]],
+                [vals[3]],
+            ]);
         });
-        it("gets quartiles of 12,13,14,15 values", ()=>{
+        it('gets quartiles of 12,13,14,15 values', () => {
             const vals = [];
-            for (let i=0; i<15; i++) {
+            for (let i = 0; i < 15; i++) {
                 vals.push({ value: i.toString() });
             }
-            assert.deepEqual(
-                splitData(vals.slice(0, 12),4),
-                [vals.slice(0,3), vals.slice(3,6), vals.slice(6,9), vals.slice(9,12)]
-            );
-            assert.deepEqual(
-                splitData(vals.slice(0, 13),4),
-                [vals.slice(0,3), vals.slice(3,6), vals.slice(6,9), vals.slice(9,13)]
-            );
-            assert.deepEqual(
-                splitData(vals.slice(0, 14),4),
-                [vals.slice(0,3), vals.slice(3,7), vals.slice(7,10), vals.slice(10,14)]
-            );
-            assert.deepEqual(
-                splitData(vals.slice(0, 15),4),
-                [vals.slice(0,3), vals.slice(3,7), vals.slice(7,11), vals.slice(11,15)]
-            );
+            assert.deepEqual(splitData(vals.slice(0, 12), 4), [
+                vals.slice(0, 3),
+                vals.slice(3, 6),
+                vals.slice(6, 9),
+                vals.slice(9, 12),
+            ]);
+            assert.deepEqual(splitData(vals.slice(0, 13), 4), [
+                vals.slice(0, 3),
+                vals.slice(3, 6),
+                vals.slice(6, 9),
+                vals.slice(9, 13),
+            ]);
+            assert.deepEqual(splitData(vals.slice(0, 14), 4), [
+                vals.slice(0, 3),
+                vals.slice(3, 7),
+                vals.slice(7, 10),
+                vals.slice(10, 14),
+            ]);
+            assert.deepEqual(splitData(vals.slice(0, 15), 4), [
+                vals.slice(0, 3),
+                vals.slice(3, 7),
+                vals.slice(7, 11),
+                vals.slice(11, 15),
+            ]);
         });
     });
 
-    describe("convertPatientsStudiesAttrToSamples", ()=>{
+    describe('convertPatientsStudiesAttrToSamples', () => {
         const oneStudyOneSamplePerPatient = [
             {
-                id:"study1",
-                patients:["4","5"]
-            }
+                id: 'study1',
+                patients: ['4', '5'],
+            },
         ];
         const multipleStudiesOneSamplePerPatient = [
             {
-                id:"study1",
-                patients:["4","5"]
+                id: 'study1',
+                patients: ['4', '5'],
             },
             {
-                id:"study2",
-                patients:["3"]
-            }
+                id: 'study2',
+                patients: ['3'],
+            },
         ];
         const oneStudyMultipleSamplesPerPatient = [
             {
-                id:"study1",
-                patients:["1","2","3"]
-            }
+                id: 'study1',
+                patients: ['1', '2', '3'],
+            },
         ];
         const multipleStudiesMultipleSamplesPerPatient = [
             {
-                id:"study1",
-                patients:["1","2"]
+                id: 'study1',
+                patients: ['1', '2'],
             },
             {
-                id:"study2",
-                patients:["1","2","3","4"]
-            }
+                id: 'study2',
+                patients: ['1', '2', '3', '4'],
+            },
         ];
-        let patientToSamplesSet:ComplexKeyGroupsMap<Pick<Sample, "sampleId">>;
-        before(()=>{
-            patientToSamplesSet = new ComplexKeyGroupsMap<Pick<Sample, "sampleId">>();
-            for (const studyId of ["study1", "study2"]) {
-                for (const patientId of ["1","2","3","4","5"]) {
-                    if (patientId === "1") {
-                        patientToSamplesSet.add({ patientId, studyId }, {sampleId: "1.1"});
-                        patientToSamplesSet.add({ patientId, studyId }, {sampleId: "1.2"});
-                        patientToSamplesSet.add({ patientId, studyId }, {sampleId: "1.3"});
-                    } else if (patientId === "2") {
-                        patientToSamplesSet.add({ patientId, studyId }, {sampleId: "2.1"});
-                        patientToSamplesSet.add({ patientId, studyId }, {sampleId: "2.2"});
+        let patientToSamplesSet: ComplexKeyGroupsMap<Pick<Sample, 'sampleId'>>;
+        before(() => {
+            patientToSamplesSet = new ComplexKeyGroupsMap<
+                Pick<Sample, 'sampleId'>
+            >();
+            for (const studyId of ['study1', 'study2']) {
+                for (const patientId of ['1', '2', '3', '4', '5']) {
+                    if (patientId === '1') {
+                        patientToSamplesSet.add(
+                            { patientId, studyId },
+                            { sampleId: '1.1' }
+                        );
+                        patientToSamplesSet.add(
+                            { patientId, studyId },
+                            { sampleId: '1.2' }
+                        );
+                        patientToSamplesSet.add(
+                            { patientId, studyId },
+                            { sampleId: '1.3' }
+                        );
+                    } else if (patientId === '2') {
+                        patientToSamplesSet.add(
+                            { patientId, studyId },
+                            { sampleId: '2.1' }
+                        );
+                        patientToSamplesSet.add(
+                            { patientId, studyId },
+                            { sampleId: '2.2' }
+                        );
                     } else {
-                        patientToSamplesSet.add({ patientId, studyId }, {sampleId: patientId});
+                        patientToSamplesSet.add(
+                            { patientId, studyId },
+                            { sampleId: patientId }
+                        );
                     }
                 }
             }
         });
-        it("empty", ()=>{
+        it('empty', () => {
             assertDeepEqualInAnyOrder(
                 convertPatientsStudiesAttrToSamples([], patientToSamplesSet),
                 []
-            )
+            );
         });
-        it("one study, one sample per patient", ()=>{
+        it('one study, one sample per patient', () => {
             assertDeepEqualInAnyOrder(
-                convertPatientsStudiesAttrToSamples(oneStudyOneSamplePerPatient, patientToSamplesSet),
-                [{
-                    id:"study1",
-                    samples:["4","5"]
-                }]
+                convertPatientsStudiesAttrToSamples(
+                    oneStudyOneSamplePerPatient,
+                    patientToSamplesSet
+                ),
+                [
+                    {
+                        id: 'study1',
+                        samples: ['4', '5'],
+                    },
+                ]
             );
         });
-        it("one study, multiple samples per patient", ()=>{
+        it('one study, multiple samples per patient', () => {
             assertDeepEqualInAnyOrder(
-                convertPatientsStudiesAttrToSamples(oneStudyMultipleSamplesPerPatient, patientToSamplesSet),
-                [{
-                    id:"study1",
-                    samples:["1.1","1.2","1.3","2.1","2.2","3"]
-                }]
+                convertPatientsStudiesAttrToSamples(
+                    oneStudyMultipleSamplesPerPatient,
+                    patientToSamplesSet
+                ),
+                [
+                    {
+                        id: 'study1',
+                        samples: ['1.1', '1.2', '1.3', '2.1', '2.2', '3'],
+                    },
+                ]
             );
         });
-        it("multiple studies, one sample per patient", ()=>{
+        it('multiple studies, one sample per patient', () => {
             assertDeepEqualInAnyOrder(
-                convertPatientsStudiesAttrToSamples(multipleStudiesOneSamplePerPatient, patientToSamplesSet),
-                [{
-                    id:"study1",
-                    samples:["4","5"]
-                },
-                {
-                    id:"study2",
-                    samples:["3"]
-                }]
+                convertPatientsStudiesAttrToSamples(
+                    multipleStudiesOneSamplePerPatient,
+                    patientToSamplesSet
+                ),
+                [
+                    {
+                        id: 'study1',
+                        samples: ['4', '5'],
+                    },
+                    {
+                        id: 'study2',
+                        samples: ['3'],
+                    },
+                ]
             );
         });
-        it("multiple studies, multiple samples per patient", ()=>{
+        it('multiple studies, multiple samples per patient', () => {
             assertDeepEqualInAnyOrder(
-                convertPatientsStudiesAttrToSamples(multipleStudiesMultipleSamplesPerPatient, patientToSamplesSet),
-                [{
-                    id:"study1",
-                    samples:["1.1","1.2","1.3","2.1","2.2"]
-                },{
-                    id:"study2",
-                    samples:["1.1","1.2","1.3","2.1","2.2","3","4"]
-                }]
+                convertPatientsStudiesAttrToSamples(
+                    multipleStudiesMultipleSamplesPerPatient,
+                    patientToSamplesSet
+                ),
+                [
+                    {
+                        id: 'study1',
+                        samples: ['1.1', '1.2', '1.3', '2.1', '2.2'],
+                    },
+                    {
+                        id: 'study2',
+                        samples: ['1.1', '1.2', '1.3', '2.1', '2.2', '3', '4'],
+                    },
+                ]
             );
         });
     });
 
-    describe("sample set operations", ()=>{
-        const groups = [{
-            uid:"group0",
-            studies:[{
-                id:"study1",
-                samples:["1", "2", "3"]
+    describe('sample set operations', () => {
+        const groups = [
+            {
+                uid: 'group0',
+                studies: [
+                    {
+                        id: 'study1',
+                        samples: ['1', '2', '3'],
+                    },
+                    {
+                        id: 'study2',
+                        samples: ['1', '2'],
+                    },
+                ],
             },
-                {
-                    id:"study2",
-                    samples:["1","2"]
-                }]
-        },{
-            uid:"group1",
-            studies:[{
-                id:"study1",
-                samples:["2"]
+            {
+                uid: 'group1',
+                studies: [
+                    {
+                        id: 'study1',
+                        samples: ['2'],
+                    },
+                    {
+                        id: 'study2',
+                        samples: ['1'],
+                    },
+                    {
+                        id: 'study3',
+                        samples: ['1', '2', '3', '4'],
+                    },
+                ],
             },
-                {
-                    id:"study2",
-                    samples:["1"]
-                },
-                {
-                    id:"study3",
-                    samples:["1","2","3","4"]
-                }]
-        },{
-            uid:"group2",
-            studies:[{
-                id:"study1",
-                samples:["1","3","4"]
-            }]
-        }, {
-            uid:"group3",
-            studies:[{
-                id:"study1",
-                samples:["1","2","3"]
-            }]
-        }];
-        describe("intersectSamples", ()=>{
-            it("intersection of empties", ()=>{
+            {
+                uid: 'group2',
+                studies: [
+                    {
+                        id: 'study1',
+                        samples: ['1', '3', '4'],
+                    },
+                ],
+            },
+            {
+                uid: 'group3',
+                studies: [
+                    {
+                        id: 'study1',
+                        samples: ['1', '2', '3'],
+                    },
+                ],
+            },
+        ];
+        describe('intersectSamples', () => {
+            it('intersection of empties', () => {
                 assertDeepEqualInAnyOrder(intersectSamples([], []), []);
             });
-            it("empty intersection of nonempties", ()=>{
-                assertDeepEqualInAnyOrder(intersectSamples([{id:"s",samples:["1","2","3"]}], []), []);
-                assertDeepEqualInAnyOrder(intersectSamples([], [{id:"s",samples:["1","2","3"]}]), []);
+            it('empty intersection of nonempties', () => {
+                assertDeepEqualInAnyOrder(
+                    intersectSamples(
+                        [{ id: 's', samples: ['1', '2', '3'] }],
+                        []
+                    ),
+                    []
+                );
+                assertDeepEqualInAnyOrder(
+                    intersectSamples(
+                        [],
+                        [{ id: 's', samples: ['1', '2', '3'] }]
+                    ),
+                    []
+                );
             });
-            it("intersection with self is self", ()=>{
-                assertDeepEqualInAnyOrder(intersectSamples(groups[0].studies, groups[0].studies), groups[0].studies);
+            it('intersection with self is self', () => {
+                assertDeepEqualInAnyOrder(
+                    intersectSamples(groups[0].studies, groups[0].studies),
+                    groups[0].studies
+                );
             });
-            it("intersection is commutative", ()=>{
-                assertDeepEqualInAnyOrder(intersectSamples(groups[0].studies, groups[1].studies), intersectSamples(groups[1].studies, groups[0].studies));
+            it('intersection is commutative', () => {
+                assertDeepEqualInAnyOrder(
+                    intersectSamples(groups[0].studies, groups[1].studies),
+                    intersectSamples(groups[1].studies, groups[0].studies)
+                );
             });
-            it("nonempty intersection of nonempties - one study nonempty", ()=>{
-                assertDeepEqualInAnyOrder(intersectSamples(groups[0].studies, groups[2].studies), [{
-                    id:"study1",
-                    samples:["1","3"]
-                }]);
+            it('nonempty intersection of nonempties - one study nonempty', () => {
+                assertDeepEqualInAnyOrder(
+                    intersectSamples(groups[0].studies, groups[2].studies),
+                    [
+                        {
+                            id: 'study1',
+                            samples: ['1', '3'],
+                        },
+                    ]
+                );
             });
-            it("nonempty intersection of nonempties - some studies nonempty", ()=>{
-                assertDeepEqualInAnyOrder(intersectSamples(groups[0].studies, groups[1].studies), [{
-                    id:"study1",
-                    samples:["2"]
-                },
-                    {
-                        id:"study2",
-                        samples:["1"]
-                    }]);
+            it('nonempty intersection of nonempties - some studies nonempty', () => {
+                assertDeepEqualInAnyOrder(
+                    intersectSamples(groups[0].studies, groups[1].studies),
+                    [
+                        {
+                            id: 'study1',
+                            samples: ['2'],
+                        },
+                        {
+                            id: 'study2',
+                            samples: ['1'],
+                        },
+                    ]
+                );
             });
         });
-        describe("excludeSamples", ()=>{
-            it("exclusion involving empties", ()=>{
+        describe('excludeSamples', () => {
+            it('exclusion involving empties', () => {
                 assertDeepEqualInAnyOrder(excludeSamples([], []), []);
-                assertDeepEqualInAnyOrder(excludeSamples([{id:"s",samples:["1","2","3"]}], []), [{id:"s",samples:["1","2","3"]}]);
-                assertDeepEqualInAnyOrder(excludeSamples([], [{id:"s",samples:["1","2","3"]}]), []);
+                assertDeepEqualInAnyOrder(
+                    excludeSamples([{ id: 's', samples: ['1', '2', '3'] }], []),
+                    [{ id: 's', samples: ['1', '2', '3'] }]
+                );
+                assertDeepEqualInAnyOrder(
+                    excludeSamples([], [{ id: 's', samples: ['1', '2', '3'] }]),
+                    []
+                );
             });
-            it("empty exclusion of nonempties", ()=>{
-                assertDeepEqualInAnyOrder(excludeSamples(groups[0].studies, groups[0].studies), []);
-                assertDeepEqualInAnyOrder(excludeSamples(groups[3].studies, groups[0].studies), []);
+            it('empty exclusion of nonempties', () => {
+                assertDeepEqualInAnyOrder(
+                    excludeSamples(groups[0].studies, groups[0].studies),
+                    []
+                );
+                assertDeepEqualInAnyOrder(
+                    excludeSamples(groups[3].studies, groups[0].studies),
+                    []
+                );
             });
-            it("nonempty exclusion of nonempties", ()=>{
-                assertDeepEqualInAnyOrder(excludeSamples(groups[0].studies, groups[3].studies), [{
-                    id:"study2",
-                    samples:["1","2"]
-                }]);
-                assertDeepEqualInAnyOrder(excludeSamples(groups[0].studies, groups[1].studies), [{
-                    id:"study1",
-                    samples:["1", "3"]
-                },
-                    {
-                        id:"study2",
-                        samples:["2"]
-                    }]);
+            it('nonempty exclusion of nonempties', () => {
+                assertDeepEqualInAnyOrder(
+                    excludeSamples(groups[0].studies, groups[3].studies),
+                    [
+                        {
+                            id: 'study2',
+                            samples: ['1', '2'],
+                        },
+                    ]
+                );
+                assertDeepEqualInAnyOrder(
+                    excludeSamples(groups[0].studies, groups[1].studies),
+                    [
+                        {
+                            id: 'study1',
+                            samples: ['1', '3'],
+                        },
+                        {
+                            id: 'study2',
+                            samples: ['2'],
+                        },
+                    ]
+                );
             });
         });
-        describe("unionSamples", ()=>{
-            it("unions involving empties", ()=>{
+        describe('unionSamples', () => {
+            it('unions involving empties', () => {
                 assertDeepEqualInAnyOrder(unionSamples([], []), []);
-                assertDeepEqualInAnyOrder(unionSamples(groups[0].studies, []), groups[0].studies);
-                assertDeepEqualInAnyOrder(unionSamples([], groups[0].studies), groups[0].studies);
+                assertDeepEqualInAnyOrder(
+                    unionSamples(groups[0].studies, []),
+                    groups[0].studies
+                );
+                assertDeepEqualInAnyOrder(
+                    unionSamples([], groups[0].studies),
+                    groups[0].studies
+                );
             });
-            it("union with self is self", ()=>{
-                assertDeepEqualInAnyOrder(unionSamples(groups[0].studies, groups[0].studies), groups[0].studies);
+            it('union with self is self', () => {
+                assertDeepEqualInAnyOrder(
+                    unionSamples(groups[0].studies, groups[0].studies),
+                    groups[0].studies
+                );
             });
-            it("union is commutative", ()=>{
-                assertDeepEqualInAnyOrder(unionSamples(groups[0].studies, groups[1].studies), unionSamples(groups[1].studies, groups[0].studies));
+            it('union is commutative', () => {
+                assertDeepEqualInAnyOrder(
+                    unionSamples(groups[0].studies, groups[1].studies),
+                    unionSamples(groups[1].studies, groups[0].studies)
+                );
             });
-            it("unions of nonempties", ()=>{
-                assertDeepEqualInAnyOrder(unionSamples(groups[0].studies, groups[1].studies), [{
-                    id:"study1",
-                    samples:["1", "2", "3"]
-                },
-                    {
-                        id:"study2",
-                        samples:["1","2"]
-                    },{
-                        id:"study3",
-                        samples:["1","2","3","4"]
-                    }]);
+            it('unions of nonempties', () => {
+                assertDeepEqualInAnyOrder(
+                    unionSamples(groups[0].studies, groups[1].studies),
+                    [
+                        {
+                            id: 'study1',
+                            samples: ['1', '2', '3'],
+                        },
+                        {
+                            id: 'study2',
+                            samples: ['1', '2'],
+                        },
+                        {
+                            id: 'study3',
+                            samples: ['1', '2', '3', '4'],
+                        },
+                    ]
+                );
 
-                assertDeepEqualInAnyOrder(unionSamples(groups[2].studies, groups[3].studies), [{
-                    id:"study1",
-                    samples:["1","2","3","4"]
-                }]);
+                assertDeepEqualInAnyOrder(
+                    unionSamples(groups[2].studies, groups[3].studies),
+                    [
+                        {
+                            id: 'study1',
+                            samples: ['1', '2', '3', '4'],
+                        },
+                    ]
+                );
             });
         });
     });
 
-    describe("patient set operations", ()=>{
-        const groups = [{
-            uid:"group0",
-            studies:[{
-                id:"study1",
-                patients:["1", "2", "3"]
+    describe('patient set operations', () => {
+        const groups = [
+            {
+                uid: 'group0',
+                studies: [
+                    {
+                        id: 'study1',
+                        patients: ['1', '2', '3'],
+                    },
+                    {
+                        id: 'study2',
+                        patients: ['1', '2'],
+                    },
+                ],
             },
-                {
-                    id:"study2",
-                    patients:["1","2"]
-                }]
-        },{
-            uid:"group1",
-            studies:[{
-                id:"study1",
-                patients:["2"]
+            {
+                uid: 'group1',
+                studies: [
+                    {
+                        id: 'study1',
+                        patients: ['2'],
+                    },
+                    {
+                        id: 'study2',
+                        patients: ['1'],
+                    },
+                    {
+                        id: 'study3',
+                        patients: ['1', '2', '3', '4'],
+                    },
+                ],
             },
-                {
-                    id:"study2",
-                    patients:["1"]
-                },
-                {
-                    id:"study3",
-                    patients:["1","2","3","4"]
-                }]
-        },{
-            uid:"group2",
-            studies:[{
-                id:"study1",
-                patients:["1","3","4"]
-            }]
-        }, {
-            uid:"group3",
-            studies:[{
-                id:"study1",
-                patients:["1","2","3"]
-            }]
-        }];
-        describe("intersectPatients", ()=>{
-            it("intersection of empties", ()=>{
+            {
+                uid: 'group2',
+                studies: [
+                    {
+                        id: 'study1',
+                        patients: ['1', '3', '4'],
+                    },
+                ],
+            },
+            {
+                uid: 'group3',
+                studies: [
+                    {
+                        id: 'study1',
+                        patients: ['1', '2', '3'],
+                    },
+                ],
+            },
+        ];
+        describe('intersectPatients', () => {
+            it('intersection of empties', () => {
                 assertDeepEqualInAnyOrder(intersectPatients([], []), []);
             });
-            it("empty intersection of nonempties", ()=>{
-                assertDeepEqualInAnyOrder(intersectPatients([{id:"s",patients:["1","2","3"]}], []), []);
-                assertDeepEqualInAnyOrder(intersectPatients([], [{id:"s",patients:["1","2","3"]}]), []);
+            it('empty intersection of nonempties', () => {
+                assertDeepEqualInAnyOrder(
+                    intersectPatients(
+                        [{ id: 's', patients: ['1', '2', '3'] }],
+                        []
+                    ),
+                    []
+                );
+                assertDeepEqualInAnyOrder(
+                    intersectPatients(
+                        [],
+                        [{ id: 's', patients: ['1', '2', '3'] }]
+                    ),
+                    []
+                );
             });
-            it("intersection with self is self", ()=>{
-                assertDeepEqualInAnyOrder(intersectPatients(groups[0].studies, groups[0].studies), groups[0].studies);
+            it('intersection with self is self', () => {
+                assertDeepEqualInAnyOrder(
+                    intersectPatients(groups[0].studies, groups[0].studies),
+                    groups[0].studies
+                );
             });
-            it("intersection is commutative", ()=>{
-                assertDeepEqualInAnyOrder(intersectPatients(groups[0].studies, groups[1].studies), intersectPatients(groups[1].studies, groups[0].studies));
+            it('intersection is commutative', () => {
+                assertDeepEqualInAnyOrder(
+                    intersectPatients(groups[0].studies, groups[1].studies),
+                    intersectPatients(groups[1].studies, groups[0].studies)
+                );
             });
-            it("nonempty intersection of nonempties - one study nonempty", ()=>{
-                assertDeepEqualInAnyOrder(intersectPatients(groups[0].studies, groups[2].studies), [{
-                    id:"study1",
-                    patients:["1","3"]
-                }]);
+            it('nonempty intersection of nonempties - one study nonempty', () => {
+                assertDeepEqualInAnyOrder(
+                    intersectPatients(groups[0].studies, groups[2].studies),
+                    [
+                        {
+                            id: 'study1',
+                            patients: ['1', '3'],
+                        },
+                    ]
+                );
             });
-            it("nonempty intersection of nonempties - some studies nonempty", ()=>{
-                assertDeepEqualInAnyOrder(intersectPatients(groups[0].studies, groups[1].studies), [{
-                    id:"study1",
-                    patients:["2"]
-                },
-                    {
-                        id:"study2",
-                        patients:["1"]
-                    }]);
+            it('nonempty intersection of nonempties - some studies nonempty', () => {
+                assertDeepEqualInAnyOrder(
+                    intersectPatients(groups[0].studies, groups[1].studies),
+                    [
+                        {
+                            id: 'study1',
+                            patients: ['2'],
+                        },
+                        {
+                            id: 'study2',
+                            patients: ['1'],
+                        },
+                    ]
+                );
             });
         });
-        describe("excludePatients", ()=>{
-            it("exclusion involving empties", ()=>{
+        describe('excludePatients', () => {
+            it('exclusion involving empties', () => {
                 assertDeepEqualInAnyOrder(excludePatients([], []), []);
-                assertDeepEqualInAnyOrder(excludePatients([{id:"s",patients:["1","2","3"]}], []), [{id:"s",patients:["1","2","3"]}]);
-                assertDeepEqualInAnyOrder(excludePatients([], [{id:"s",patients:["1","2","3"]}]), []);
+                assertDeepEqualInAnyOrder(
+                    excludePatients(
+                        [{ id: 's', patients: ['1', '2', '3'] }],
+                        []
+                    ),
+                    [{ id: 's', patients: ['1', '2', '3'] }]
+                );
+                assertDeepEqualInAnyOrder(
+                    excludePatients(
+                        [],
+                        [{ id: 's', patients: ['1', '2', '3'] }]
+                    ),
+                    []
+                );
             });
-            it("empty exclusion of nonempties", ()=>{
-                assertDeepEqualInAnyOrder(excludePatients(groups[0].studies, groups[0].studies), []);
-                assertDeepEqualInAnyOrder(excludePatients(groups[3].studies, groups[0].studies), []);
+            it('empty exclusion of nonempties', () => {
+                assertDeepEqualInAnyOrder(
+                    excludePatients(groups[0].studies, groups[0].studies),
+                    []
+                );
+                assertDeepEqualInAnyOrder(
+                    excludePatients(groups[3].studies, groups[0].studies),
+                    []
+                );
             });
-            it("nonempty exclusion of nonempties", ()=>{
-                assertDeepEqualInAnyOrder(excludePatients(groups[0].studies, groups[3].studies), [{
-                    id:"study2",
-                    patients:["1","2"]
-                }]);
-                assertDeepEqualInAnyOrder(excludePatients(groups[0].studies, groups[1].studies), [{
-                    id:"study1",
-                    patients:["1", "3"]
-                },
-                    {
-                        id:"study2",
-                        patients:["2"]
-                    }]);
+            it('nonempty exclusion of nonempties', () => {
+                assertDeepEqualInAnyOrder(
+                    excludePatients(groups[0].studies, groups[3].studies),
+                    [
+                        {
+                            id: 'study2',
+                            patients: ['1', '2'],
+                        },
+                    ]
+                );
+                assertDeepEqualInAnyOrder(
+                    excludePatients(groups[0].studies, groups[1].studies),
+                    [
+                        {
+                            id: 'study1',
+                            patients: ['1', '3'],
+                        },
+                        {
+                            id: 'study2',
+                            patients: ['2'],
+                        },
+                    ]
+                );
             });
         });
-        describe("unionPatients", ()=>{
-            it("unions involving empties", ()=>{
+        describe('unionPatients', () => {
+            it('unions involving empties', () => {
                 assertDeepEqualInAnyOrder(unionPatients([], []), []);
-                assertDeepEqualInAnyOrder(unionPatients(groups[0].studies, []), groups[0].studies);
-                assertDeepEqualInAnyOrder(unionPatients([], groups[0].studies), groups[0].studies);
+                assertDeepEqualInAnyOrder(
+                    unionPatients(groups[0].studies, []),
+                    groups[0].studies
+                );
+                assertDeepEqualInAnyOrder(
+                    unionPatients([], groups[0].studies),
+                    groups[0].studies
+                );
             });
-            it("union with self is self", ()=>{
-                assertDeepEqualInAnyOrder(unionPatients(groups[0].studies, groups[0].studies), groups[0].studies);
+            it('union with self is self', () => {
+                assertDeepEqualInAnyOrder(
+                    unionPatients(groups[0].studies, groups[0].studies),
+                    groups[0].studies
+                );
             });
-            it("union is commutative", ()=>{
-                assertDeepEqualInAnyOrder(unionPatients(groups[0].studies, groups[1].studies), unionPatients(groups[1].studies, groups[0].studies));
+            it('union is commutative', () => {
+                assertDeepEqualInAnyOrder(
+                    unionPatients(groups[0].studies, groups[1].studies),
+                    unionPatients(groups[1].studies, groups[0].studies)
+                );
             });
-            it("unions of nonempties", ()=>{
-                assertDeepEqualInAnyOrder(unionPatients(groups[0].studies, groups[1].studies), [{
-                    id:"study1",
-                    patients:["1", "2", "3"]
-                },
-                    {
-                        id:"study2",
-                        patients:["1","2"]
-                    },{
-                        id:"study3",
-                        patients:["1","2","3","4"]
-                    }]);
+            it('unions of nonempties', () => {
+                assertDeepEqualInAnyOrder(
+                    unionPatients(groups[0].studies, groups[1].studies),
+                    [
+                        {
+                            id: 'study1',
+                            patients: ['1', '2', '3'],
+                        },
+                        {
+                            id: 'study2',
+                            patients: ['1', '2'],
+                        },
+                        {
+                            id: 'study3',
+                            patients: ['1', '2', '3', '4'],
+                        },
+                    ]
+                );
 
-                assertDeepEqualInAnyOrder(unionPatients(groups[2].studies, groups[3].studies), [{
-                    id:"study1",
-                    patients:["1","2","3","4"]
-                }]);
+                assertDeepEqualInAnyOrder(
+                    unionPatients(groups[2].studies, groups[3].studies),
+                    [
+                        {
+                            id: 'study1',
+                            patients: ['1', '2', '3', '4'],
+                        },
+                    ]
+                );
             });
         });
     });
 
-    describe("partitionCasesByGroupMembership", ()=>{
-        const getCaseIdentifiers = (group:any)=>{
+    describe('partitionCasesByGroupMembership', () => {
+        const getCaseIdentifiers = (group: any) => {
             return getSampleIdentifiers([group]);
-        }
-        const getUniqueCaseKey = (id:any)=>{
-            return id.studyId+"+"+id.sampleId;
         };
-        const groups = [{
-            uid:"group0",
-            studies:[{
-                id:"study1",
-                samples:["1", "2", "3"],
-                patients:["1", "2", "3"]
+        const getUniqueCaseKey = (id: any) => {
+            return id.studyId + '+' + id.sampleId;
+        };
+        const groups = [
+            {
+                uid: 'group0',
+                studies: [
+                    {
+                        id: 'study1',
+                        samples: ['1', '2', '3'],
+                        patients: ['1', '2', '3'],
+                    },
+                    {
+                        id: 'study2',
+                        samples: ['1', '2'],
+                        patients: ['1', '2'],
+                    },
+                ],
             },
-                {
-                    id:"study2",
-                    samples:["1","2"],
-                    patients:["1","2"]
-                }]
-        },{
-            uid:"group1",
-            studies:[{
-                id:"study1",
-                samples:["2"],
-                patients:["2"]
+            {
+                uid: 'group1',
+                studies: [
+                    {
+                        id: 'study1',
+                        samples: ['2'],
+                        patients: ['2'],
+                    },
+                    {
+                        id: 'study2',
+                        samples: ['1'],
+                        patients: ['1'],
+                    },
+                    {
+                        id: 'study3',
+                        samples: ['1', '2', '3', '4'],
+                        patients: ['1', '2', '3', '4'],
+                    },
+                ],
             },
-                {
-                    id:"study2",
-                    samples:["1"],
-                    patients:["1"]
-                },
-                {
-                    id:"study3",
-                    samples:["1","2","3","4"],
-                    patients:["1","2","3","4"]
-                }]
-        },{
-            uid:"group2",
-            studies:[{
-                id:"study1",
-                samples:["1","3","4"],
-                patients:["1","3","4"]
-            }]
-        }, {
-            uid:"group3",
-            studies:[{
-                id:"study1",
-                samples:["1","2","3"],
-                patients:["1","2","3"]
-            }]
-        }];
-        it("partitions empty list properly", ()=>{
+            {
+                uid: 'group2',
+                studies: [
+                    {
+                        id: 'study1',
+                        samples: ['1', '3', '4'],
+                        patients: ['1', '3', '4'],
+                    },
+                ],
+            },
+            {
+                uid: 'group3',
+                studies: [
+                    {
+                        id: 'study1',
+                        samples: ['1', '2', '3'],
+                        patients: ['1', '2', '3'],
+                    },
+                ],
+            },
+        ];
+        it('partitions empty list properly', () => {
             assertDeepEqualInAnyOrder(
-                partitionCasesByGroupMembership(groups, getCaseIdentifiers, getUniqueCaseKey, []),
+                partitionCasesByGroupMembership(
+                    groups,
+                    getCaseIdentifiers,
+                    getUniqueCaseKey,
+                    []
+                ),
                 []
             );
         });
-        it("partitions a list of cases properly", ()=>{
+        it('partitions a list of cases properly', () => {
             assertDeepEqualInAnyOrder(
-                partitionCasesByGroupMembership(groups, getCaseIdentifiers, getUniqueCaseKey, [
-                    "study1+1","study1+2","study1+3","study1+4",
-                    "study2+1","study2+2",
-                    "study3+1","study3+2","study3+3","study3+4",
-                ]),
-                [{
-                    key:{
-                        group0:true,
-                        group1:false,
-                        group2:true,
-                        group3:true
-                    },
-                    value:["study1+1", "study1+3"]
-                },{
-                    key:{
-                        group0:true,
-                        group1:true,
-                        group2:false,
-                        group3:true
-                    },
-                    value:["study1+2"]
-                },{
-                    key:{
-                        group0:false,
-                        group1:false,
-                        group2:true,
-                        group3:false
-                    },
-                    value:["study1+4"]
-                },{
-                    key:{
-                        group0:true,
-                        group1:true,
-                        group2:false,
-                        group3:false
-                    },
-                    value:["study2+1"]
-                },
-                {
-                    key:{
-                        group0: true,
-                        group1:false,
-                        group2:false,
-                        group3:false
-                    },
-                    value:["study2+2"]
-                },{
-                    key:{
-                        group0:false,
-                        group1:true,
-                        group2:false,
-                        group3:false
-                    },
-                    value:["study3+1","study3+2","study3+3","study3+4"]
-                }]
-            )
+                partitionCasesByGroupMembership(
+                    groups,
+                    getCaseIdentifiers,
+                    getUniqueCaseKey,
+                    [
+                        'study1+1',
+                        'study1+2',
+                        'study1+3',
+                        'study1+4',
+                        'study2+1',
+                        'study2+2',
+                        'study3+1',
+                        'study3+2',
+                        'study3+3',
+                        'study3+4',
+                    ]
+                ),
+                [
+                    {
+                        key: {
+                            group0: true,
+                            group1: false,
+                            group2: true,
+                            group3: true,
+                        },
+                        value: ['study1+1', 'study1+3'],
+                    },
+                    {
+                        key: {
+                            group0: true,
+                            group1: true,
+                            group2: false,
+                            group3: true,
+                        },
+                        value: ['study1+2'],
+                    },
+                    {
+                        key: {
+                            group0: false,
+                            group1: false,
+                            group2: true,
+                            group3: false,
+                        },
+                        value: ['study1+4'],
+                    },
+                    {
+                        key: {
+                            group0: true,
+                            group1: true,
+                            group2: false,
+                            group3: false,
+                        },
+                        value: ['study2+1'],
+                    },
+                    {
+                        key: {
+                            group0: true,
+                            group1: false,
+                            group2: false,
+                            group3: false,
+                        },
+                        value: ['study2+2'],
+                    },
+                    {
+                        key: {
+                            group0: false,
+                            group1: true,
+                            group2: false,
+                            group3: false,
+                        },
+                        value: ['study3+1', 'study3+2', 'study3+3', 'study3+4'],
+                    },
+                ]
+            );
         });
     });
 });
diff --git a/src/pages/groupComparison/GroupComparisonUtils.tsx b/src/pages/groupComparison/GroupComparisonUtils.tsx
index 24dbeb207e8..4e83231b57a 100644
--- a/src/pages/groupComparison/GroupComparisonUtils.tsx
+++ b/src/pages/groupComparison/GroupComparisonUtils.tsx
@@ -1,74 +1,91 @@
-import {MobxPromise} from 'mobxpromise/dist/src/MobxPromise';
-import {ClinicalData, PatientIdentifier, Sample, SampleIdentifier} from "../../shared/api/generated/CBioPortalAPI";
-import _ from "lodash";
+import { MobxPromise } from 'mobxpromise/dist/src/MobxPromise';
+import {
+    ClinicalData,
+    PatientIdentifier,
+    Sample,
+    SampleIdentifier,
+} from '../../shared/api/generated/CBioPortalAPI';
+import _ from 'lodash';
 import {
     ClinicalDataEnrichment,
-    StudyViewFilter
-} from "../../shared/api/generated/CBioPortalAPIInternal";
-import {AlterationEnrichmentWithQ} from "../resultsView/enrichments/EnrichmentsUtil";
-import {GroupData, SessionGroupData} from "../../shared/api/ComparisonGroupClient";
-import * as React from "react";
-import ComplexKeyMap from "../../shared/lib/complexKeyDataStructures/ComplexKeyMap";
-import ComplexKeySet from "../../shared/lib/complexKeyDataStructures/ComplexKeySet";
-import ComplexKeyCounter from "../../shared/lib/complexKeyDataStructures/ComplexKeyCounter";
-import ComplexKeyGroupsMap from "../../shared/lib/complexKeyDataStructures/ComplexKeyGroupsMap";
-import GroupComparisonStore from "./GroupComparisonStore";
-import {MakeMobxView, MobxViewAlwaysComponent} from "../../shared/components/MobxView";
-import OverlapExclusionIndicator from "./OverlapExclusionIndicator";
-import Loader from "../../shared/components/loadingIndicator/LoadingIndicator";
-import ErrorMessage from "../../shared/components/ErrorMessage";
-import {stringListToIndexSet} from "cbioportal-frontend-commons";
-import { GroupComparisonTab } from "./GroupComparisonTabs"
+    StudyViewFilter,
+} from '../../shared/api/generated/CBioPortalAPIInternal';
+import { AlterationEnrichmentWithQ } from '../resultsView/enrichments/EnrichmentsUtil';
+import {
+    GroupData,
+    SessionGroupData,
+} from '../../shared/api/ComparisonGroupClient';
+import * as React from 'react';
+import ComplexKeyMap from '../../shared/lib/complexKeyDataStructures/ComplexKeyMap';
+import ComplexKeySet from '../../shared/lib/complexKeyDataStructures/ComplexKeySet';
+import ComplexKeyCounter from '../../shared/lib/complexKeyDataStructures/ComplexKeyCounter';
+import ComplexKeyGroupsMap from '../../shared/lib/complexKeyDataStructures/ComplexKeyGroupsMap';
+import GroupComparisonStore from './GroupComparisonStore';
+import {
+    MakeMobxView,
+    MobxViewAlwaysComponent,
+} from '../../shared/components/MobxView';
+import OverlapExclusionIndicator from './OverlapExclusionIndicator';
+import Loader from '../../shared/components/loadingIndicator/LoadingIndicator';
+import ErrorMessage from '../../shared/components/ErrorMessage';
+import { stringListToIndexSet } from 'cbioportal-frontend-commons';
+import { GroupComparisonTab } from './GroupComparisonTabs';
 import { DataType } from 'pages/studyView/StudyViewUtils';
 
 type Omit<T, K> = Pick<T, Exclude<keyof T, K>>;
 
-export type ComparisonGroup = Omit<SessionGroupData, "studies"|"color"> & {
-    color:string; // color mandatory here, bc we'll assign one if its missing
-    uid:string; // unique in the session
-    nameWithOrdinal:string; // for easy disambiguation when groups are abbreviated
-    ordinal:string;
-    studies:{ id:string, samples: string[], patients:string[] }[]; // include patients, filter out nonexistent samples
-    nonExistentSamples:SampleIdentifier[]; // samples specified in the group which no longer exist in our DB
-    savedInSession:boolean;
+export type ComparisonGroup = Omit<SessionGroupData, 'studies' | 'color'> & {
+    color: string; // color mandatory here, bc we'll assign one if its missing
+    uid: string; // unique in the session
+    nameWithOrdinal: string; // for easy disambiguation when groups are abbreviated
+    ordinal: string;
+    studies: { id: string; samples: string[]; patients: string[] }[]; // include patients, filter out nonexistent samples
+    nonExistentSamples: SampleIdentifier[]; // samples specified in the group which no longer exist in our DB
+    savedInSession: boolean;
 };
 
-export type StudyViewComparisonGroup = Omit<GroupData, "studies"|"color"> & {
-    uid:string; // unique in the session
-    studies:{ id:string, samples: string[], patients:string[] }[]; // include patients, filter out nonexistent samples
-    nonExistentSamples:SampleIdentifier[]; // samples specified in the group which no longer exist in our DB
+export type StudyViewComparisonGroup = Omit<GroupData, 'studies' | 'color'> & {
+    uid: string; // unique in the session
+    studies: { id: string; samples: string[]; patients: string[] }[]; // include patients, filter out nonexistent samples
+    nonExistentSamples: SampleIdentifier[]; // samples specified in the group which no longer exist in our DB
 };
 
-export type ClinicalDataEnrichmentWithQ = ClinicalDataEnrichment & { qValue:number };
+export type ClinicalDataEnrichmentWithQ = ClinicalDataEnrichment & {
+    qValue: number;
+};
 
-export type CopyNumberEnrichment = AlterationEnrichmentWithQ & { value:number };
+export type CopyNumberEnrichment = AlterationEnrichmentWithQ & {
+    value: number;
+};
 
-export function defaultGroupOrder<T extends Pick<ComparisonGroup, "name">>(groups:T[]) {
+export function defaultGroupOrder<T extends Pick<ComparisonGroup, 'name'>>(
+    groups: T[]
+) {
     // sort alphabetically, except NA goes last
-    const isNA = _.partition(groups, g=>(g.name.toLowerCase() === "na"));
-    return _.sortBy(isNA[1], g=>g.name.toLowerCase()).concat(isNA[0]);
+    const isNA = _.partition(groups, g => g.name.toLowerCase() === 'na');
+    return _.sortBy(isNA[1], g => g.name.toLowerCase()).concat(isNA[0]);
 }
 
 export const MAX_GROUPS_IN_SESSION = 20;
 
-const alphabet = "-ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+const alphabet = '-ABCDEFGHIJKLMNOPQRSTUVWXYZ';
 
-export function getOrdinals(num:number, base:number) {
+export function getOrdinals(num: number, base: number) {
     if (num <= 0) {
         return [];
     }
     const inNewBase = [[1]];
-    let prev:number[];
-    let next:number[];
-    for (let i=1; i<num; i++) {
-        prev = inNewBase[i-1];
+    let prev: number[];
+    let next: number[];
+    for (let i = 1; i < num; i++) {
+        prev = inNewBase[i - 1];
         next = _.clone(prev);
-        next[next.length-1] += 1;
-        for (let carryIndex = next.length-1; carryIndex >= 0; carryIndex--) {
+        next[next.length - 1] += 1;
+        for (let carryIndex = next.length - 1; carryIndex >= 0; carryIndex--) {
             if (next[carryIndex] > base) {
                 next[carryIndex] -= base;
                 if (carryIndex > 0) {
-                    next[carryIndex-1]+=1;
+                    next[carryIndex - 1] += 1;
                 } else {
                     next.unshift(1);
                 }
@@ -76,71 +93,94 @@ export function getOrdinals(num:number, base:number) {
         }
         inNewBase.push(next);
     }
-    return inNewBase.map(n=>n.map(i=>alphabet[i]).join(""));
+    return inNewBase.map(n => n.map(i => alphabet[i]).join(''));
 }
 
-export function getVennPlotData(combinationSets: { groups: string[], cases: string[] }[]) {
-    return combinationSets.map(set => {
-        return {
-            count: set.cases.length,
-            size:set.cases.length,
-            label: `${set.cases.length}`,
-            sets: set.groups
-        }
-    }).sort((a, b) => b.count - a.count);
+export function getVennPlotData(
+    combinationSets: { groups: string[]; cases: string[] }[]
+) {
+    return combinationSets
+        .map(set => {
+            return {
+                count: set.cases.length,
+                size: set.cases.length,
+                label: `${set.cases.length}`,
+                sets: set.groups,
+            };
+        })
+        .sort((a, b) => b.count - a.count);
 }
 
 export function caseCountsInParens(
-    samples:MobxPromise<any[]>|any[],
-    patients:MobxPromise<any[]>|any[]
+    samples: MobxPromise<any[]> | any[],
+    patients: MobxPromise<any[]> | any[]
 ) {
-    let text = "";
-    if ((Array.isArray(samples) || samples.isComplete) && (Array.isArray(patients) || patients.isComplete)) {
+    let text = '';
+    if (
+        (Array.isArray(samples) || samples.isComplete) &&
+        (Array.isArray(patients) || patients.isComplete)
+    ) {
         const samplesArr = Array.isArray(samples) ? samples : samples.result!;
-        const patientsArr = Array.isArray(patients) ? patients : patients.result!;
+        const patientsArr = Array.isArray(patients)
+            ? patients
+            : patients.result!;
         if (samplesArr.length === patientsArr.length) {
             text = `(${samplesArr.length})`;
         } else {
-            const pluralSamples = (samplesArr.length !== 1);
-            const pluralPatients = (patientsArr.length !== 1);
-            text = `(${samplesArr.length} sample${pluralSamples ? "s" : ""}/${patientsArr.length} patient${pluralPatients ? "s" : ""})`;
+            const pluralSamples = samplesArr.length !== 1;
+            const pluralPatients = patientsArr.length !== 1;
+            text = `(${samplesArr.length} sample${pluralSamples ? 's' : ''}/${
+                patientsArr.length
+            } patient${pluralPatients ? 's' : ''})`;
         }
     }
     return text;
 }
 
 export function caseCounts(
-    numSamples:number,
-    numPatients:number,
-    delimiter="/",
-    infix=" "
+    numSamples: number,
+    numPatients: number,
+    delimiter = '/',
+    infix = ' '
 ) {
     if (numSamples === numPatients) {
-        const plural = (numSamples !== 1);
-        return `${numSamples}${infix}sample${plural ? "s" : ""}${delimiter}patient${plural ? "s" : ""}`;
+        const plural = numSamples !== 1;
+        return `${numSamples}${infix}sample${
+            plural ? 's' : ''
+        }${delimiter}patient${plural ? 's' : ''}`;
     } else {
-        const pluralSamples = (numSamples !== 1);
-        const pluralPatients = (numPatients !== 1);
-        return `${numSamples}${infix}sample${pluralSamples ? "s" : ""}${delimiter}${numPatients}${infix}patient${pluralPatients ? "s" : ""}`;
+        const pluralSamples = numSamples !== 1;
+        const pluralPatients = numPatients !== 1;
+        return `${numSamples}${infix}sample${
+            pluralSamples ? 's' : ''
+        }${delimiter}${numPatients}${infix}patient${pluralPatients ? 's' : ''}`;
     }
 }
 
 export function getPatientIdentifiers(
-    sampleIdentifiers:SampleIdentifier[],
-    sampleSet:ComplexKeyMap<Pick<Sample, "uniquePatientKey"|"patientId"|"studyId">>
+    sampleIdentifiers: SampleIdentifier[],
+    sampleSet: ComplexKeyMap<
+        Pick<Sample, 'uniquePatientKey' | 'patientId' | 'studyId'>
+    >
 ) {
-    const patientSet:{[uniquePatientKey:string]:PatientIdentifier} = {};
+    const patientSet: { [uniquePatientKey: string]: PatientIdentifier } = {};
     for (const sampleId of sampleIdentifiers) {
-        const sample = sampleSet.get({studyId:sampleId.studyId, sampleId: sampleId.sampleId});
+        const sample = sampleSet.get({
+            studyId: sampleId.studyId,
+            sampleId: sampleId.sampleId,
+        });
         if (sample && !(sample.uniquePatientKey in patientSet)) {
-            patientSet[sample.uniquePatientKey] = { patientId: sample.patientId, studyId: sample.studyId};
+            patientSet[sample.uniquePatientKey] = {
+                patientId: sample.patientId,
+                studyId: sample.studyId,
+            };
         }
     }
     return _.values(patientSet);
 }
 
 export function getOverlappingSamples(
-    groups:Pick<ComparisonGroup, "studies">[]
+    groups: Pick<ComparisonGroup, 'studies'>[]
 ) {
     // samples that are in at least two selected groups
     const sampleUseCount = new ComplexKeyCounter();
@@ -162,7 +202,7 @@ export function getOverlappingSamples(
 }
 
 export function getOverlappingPatients(
-    groups:Pick<ComparisonGroup, "studies">[]
+    groups: Pick<ComparisonGroup, 'studies'>[]
 ) {
     // patients that are in at least two selected groups
     const patientUseCount = new ComplexKeyCounter();
@@ -183,49 +223,54 @@ export function getOverlappingPatients(
     return overlapping;
 }
 
-export function isGroupEmpty(
-    group:Pick<ComparisonGroup, "studies">
-) {
-    return !_.some(group.studies, study=>(study.samples.length > 0 || study.patients.length > 0));
+export function isGroupEmpty(group: Pick<ComparisonGroup, 'studies'>) {
+    return !_.some(
+        group.studies,
+        study => study.samples.length > 0 || study.patients.length > 0
+    );
 }
 
-export function getStudyIds(
-    groups:Pick<SessionGroupData, "studies">[]
-) {
-    return _.uniq<string>(_.flattenDeep<string>(
-        groups.map(group=>group.studies.map(study=>study.id))
-    ));
+export function getStudyIds(groups: Pick<SessionGroupData, 'studies'>[]) {
+    return _.uniq<string>(
+        _.flattenDeep<string>(
+            groups.map(group => group.studies.map(study => study.id))
+        )
+    );
 }
 
 export function getSampleIdentifiers(
-    groups:Pick<SessionGroupData, "studies">[]
+    groups: Pick<SessionGroupData, 'studies'>[]
 ) {
     return _.uniqWith(
         _.flattenDeep<SampleIdentifier>(
-            groups.map(group=>group.studies.map(study=>{
-                const studyId = study.id;
-                return study.samples.map(sampleId=>({ studyId, sampleId }));
-            }))
+            groups.map(group =>
+                group.studies.map(study => {
+                    const studyId = study.id;
+                    return study.samples.map(sampleId => ({
+                        studyId,
+                        sampleId,
+                    }));
+                })
+            )
         ),
-        (id1, id2)=>((id1.sampleId === id2.sampleId) && (id1.studyId === id2.studyId))
+        (id1, id2) =>
+            id1.sampleId === id2.sampleId && id1.studyId === id2.studyId
     );
 }
 
-export function getNumSamples(
-    group:Pick<SessionGroupData, "studies">
-) {
-    return _.sum(group.studies.map(study=>study.samples.length));
+export function getNumSamples(group: Pick<SessionGroupData, 'studies'>) {
+    return _.sum(group.studies.map(study => study.samples.length));
 }
 
 export function getNumPatients(
-    group:Pick<StudyViewComparisonGroup, "studies">
+    group: Pick<StudyViewComparisonGroup, 'studies'>
 ) {
-    return _.sum(group.studies.map(study=>study.patients.length));
+    return _.sum(group.studies.map(study => study.patients.length));
 }
 
 export function finalizeStudiesAttr(
-    groupData:Pick<SessionGroupData, "studies">,
-    sampleSet:ComplexKeyMap<Sample>
+    groupData: Pick<SessionGroupData, 'studies'>,
+    sampleSet: ComplexKeyMap<Sample>
 ) {
     // (1) filter out, and keep track of nonexisting samples
     // (2) add `patients` object
@@ -237,7 +282,7 @@ export function finalizeStudiesAttr(
         const samples = [];
         let patients = [];
         for (const sampleId of study.samples) {
-            const sample = sampleSet.get({studyId, sampleId});
+            const sample = sampleSet.get({ studyId, sampleId });
             if (!sample) {
                 // filter out, and keep track of, nonexisting sample
                 nonExistentSamples.push({ studyId, sampleId });
@@ -252,39 +297,44 @@ export function finalizeStudiesAttr(
             studies.push({
                 id: studyId,
                 samples,
-                patients
+                patients,
             });
         }
     }
 
     return {
         nonExistentSamples,
-        studies
+        studies,
     };
 }
 
-export function getOverlapFilteredGroups<T extends Pick<ComparisonGroup, "studies">>(
-    groups:T[],
-    info:{
-        overlappingSamplesSet:ComplexKeySet,
-        overlappingPatientsSet:ComplexKeySet
+export function getOverlapFilteredGroups<
+    T extends Pick<ComparisonGroup, 'studies'>
+>(
+    groups: T[],
+    info: {
+        overlappingSamplesSet: ComplexKeySet;
+        overlappingPatientsSet: ComplexKeySet;
     }
-):T[] {
+): T[] {
     // filter out overlap
     const overlappingSamplesSet = info.overlappingSamplesSet;
     const overlappingPatientsSet = info.overlappingPatientsSet;
 
-    return groups.map(group=>{
+    return groups.map(group => {
         const studies = [];
         for (const study of group.studies) {
             const studyId = study.id;
-            const nonOverlappingSamples = study.samples.filter(sampleId=>{
-                return !(overlappingSamplesSet.has({studyId, sampleId}));
+            const nonOverlappingSamples = study.samples.filter(sampleId => {
+                return !overlappingSamplesSet.has({ studyId, sampleId });
             });
-            const nonOverlappingPatients = study.patients.filter(patientId=>{
-                return !(overlappingPatientsSet.has({studyId, patientId}));
+            const nonOverlappingPatients = study.patients.filter(patientId => {
+                return !overlappingPatientsSet.has({ studyId, patientId });
             });
-            if (nonOverlappingSamples.length > 0 || nonOverlappingPatients.length > 0) {
+            if (
+                nonOverlappingSamples.length > 0 ||
+                nonOverlappingPatients.length > 0
+            ) {
                 studies.push({
                     id: studyId,
                     samples: nonOverlappingSamples,
@@ -293,131 +343,172 @@ export function getOverlapFilteredGroups<T extends Pick<ComparisonGroup, "studie
             }
         }
         return Object.assign({}, group, {
-            studies
+            studies,
         });
     });
 }
 
 export function MakeEnrichmentsTabUI(
-    getStore:()=>GroupComparisonStore,
-    getEnrichmentsUI:()=>MobxViewAlwaysComponent,
-    enrichmentType:string,
-    multiGroupAnalysisPossible?:boolean,
-    patientAnalysisPossible?:boolean,
-    multiStudyAnalysisPossible?:boolean
+    getStore: () => GroupComparisonStore,
+    getEnrichmentsUI: () => MobxViewAlwaysComponent,
+    enrichmentType: string,
+    multiGroupAnalysisPossible?: boolean,
+    patientAnalysisPossible?: boolean,
+    multiStudyAnalysisPossible?: boolean
 ) {
     return MakeMobxView({
-        await:()=>{
+        await: () => {
             const store = getStore();
-            const ret:any[] = [store._activeGroupsNotOverlapRemoved, store.activeGroups, store.activeStudyIds];
-            if ((store.activeGroups.isComplete &&
-                store.activeGroups.result.length !== 2) ||
-                (store.activeStudyIds.isComplete && store.activeStudyIds.result.length > 1)) {
+            const ret: any[] = [
+                store._activeGroupsNotOverlapRemoved,
+                store.activeGroups,
+                store.activeStudyIds,
+            ];
+            if (
+                (store.activeGroups.isComplete &&
+                    store.activeGroups.result.length !== 2) ||
+                (store.activeStudyIds.isComplete &&
+                    store.activeStudyIds.result.length > 1)
+            ) {
                 // dont bother loading data for and computing enrichments UI if its not valid situation for it
             } else {
                 ret.push(getEnrichmentsUI());
             }
             return ret;
         },
-        render:()=>{
+        render: () => {
             const store = getStore();
             const activeGroupsCount = store.activeGroups.result!.length;
-            if ((!multiGroupAnalysisPossible && activeGroupsCount !== 2) || (multiGroupAnalysisPossible && activeGroupsCount < 2)) {
+            if (
+                (!multiGroupAnalysisPossible && activeGroupsCount !== 2) ||
+                (multiGroupAnalysisPossible && activeGroupsCount < 2)
+            ) {
                 return (
                     <span>
-                        {ENRICHMENTS_NOT_2_GROUPS_MSG(store.activeGroups.result!.length, store._activeGroupsNotOverlapRemoved.result!.length, multiGroupAnalysisPossible)}
+                        {ENRICHMENTS_NOT_2_GROUPS_MSG(
+                            store.activeGroups.result!.length,
+                            store._activeGroupsNotOverlapRemoved.result!.length,
+                            multiGroupAnalysisPossible
+                        )}
+                    </span>
+                );
+            } else if (
+                store.activeStudyIds.result!.length > 1 &&
+                !multiStudyAnalysisPossible
+            ) {
+                return (
+                    <span>
+                        {ENRICHMENTS_TOO_MANY_STUDIES_MSG(enrichmentType)}
                     </span>
                 );
-            } else if (store.activeStudyIds.result!.length > 1 && !multiStudyAnalysisPossible) {
-                return <span>{ENRICHMENTS_TOO_MANY_STUDIES_MSG(enrichmentType)}</span>;
             } else {
-                const content:any = [];
-                content.push(<OverlapExclusionIndicator store={store} only={(patientAnalysisPossible && store.usePatientLevelEnrichments) ? "patient" : "sample"}/>);
+                const content: any = [];
+                content.push(
+                    <OverlapExclusionIndicator
+                        store={store}
+                        only={
+                            patientAnalysisPossible &&
+                            store.usePatientLevelEnrichments
+                                ? 'patient'
+                                : 'sample'
+                        }
+                    />
+                );
                 content.push(getEnrichmentsUI().component);
                 return content;
             }
         },
-        renderPending:()=><Loader center={true} isLoading={true} size={"big"}/>,
-        renderError:()=><ErrorMessage/>
+        renderPending: () => (
+            <Loader center={true} isLoading={true} size={'big'} />
+        ),
+        renderError: () => <ErrorMessage />,
     });
 }
 
-export function ENRICHMENTS_NOT_2_GROUPS_MSG(numActiveGroups:number, numSelectedGroups:number, isMultiGroupAnalysis?:boolean) {
+export function ENRICHMENTS_NOT_2_GROUPS_MSG(
+    numActiveGroups: number,
+    numSelectedGroups: number,
+    isMultiGroupAnalysis?: boolean
+) {
     if (numSelectedGroups < 2) {
-
-        return `Please select more groups - we need ${isMultiGroupAnalysis ? 'at least' : 'exactly'} 2 selected groups to show enrichments.`;
+        return `Please select more groups - we need ${
+            isMultiGroupAnalysis ? 'at least' : 'exactly'
+        } 2 selected groups to show enrichments.`;
     } else if (numActiveGroups < 2) {
         // at least 2 selected, but less than 2 active, meaning overlap has reduced it
-        return "Due to excluded overlapping cases, there are less than 2 selected nonempty groups - we need exactly 2 nonempty selected groups to show enrichments.";
+        return 'Due to excluded overlapping cases, there are less than 2 selected nonempty groups - we need exactly 2 nonempty selected groups to show enrichments.';
     } else if (numActiveGroups > 2) {
         // more than 2 active
-        return "Please deselect groups - we need exactly 2 selected groups to show enrichments.";
+        return 'Please deselect groups - we need exactly 2 selected groups to show enrichments.';
     }
 }
 
-export function ENRICHMENTS_TOO_MANY_STUDIES_MSG(enrichmentsType:string) {
+export function ENRICHMENTS_TOO_MANY_STUDIES_MSG(enrichmentsType: string) {
     return `The selected comparison groups span more than one study, so we can't show ${enrichmentsType} enrichments. Please change your selection in the Groups section so that all samples only come from one study.`;
 }
 
 export const SURVIVAL_NOT_ENOUGH_GROUPS_MSG =
-    "We need at least 1 group to show survival. Please select more groups from the Groups section above.";
+    'We need at least 1 group to show survival. Please select more groups from the Groups section above.';
 
 export const SURVIVAL_TOO_MANY_GROUPS_MSG =
     "We can't show survival for more than 10 groups. Please deselect groups in the Groups section.";
 
-export const DUPLICATE_GROUP_NAME_MSG = "Another group already has this name.";
+export const DUPLICATE_GROUP_NAME_MSG = 'Another group already has this name.';
 
 export const OVERLAP_NOT_ENOUGH_GROUPS_MSG =
-    "We need at least 2 groups to show overlap. Please select more groups from the Groups section above.";
+    'We need at least 2 groups to show overlap. Please select more groups from the Groups section above.';
 
-export function CLINICAL_TAB_NOT_ENOUGH_GROUPS_MSG(numSelectedGroups:number) {
+export function CLINICAL_TAB_NOT_ENOUGH_GROUPS_MSG(numSelectedGroups: number) {
     if (numSelectedGroups >= 2) {
-        return "Due to excluded overlapping cases, there are less than 2 selected nonempty groups - we need at least 2.";
+        return 'Due to excluded overlapping cases, there are less than 2 selected nonempty groups - we need at least 2.';
     } else {
-        return "We need at least 2 groups to show clinical data enrichments. Please select more groups from the Groups section above.";
+        return 'We need at least 2 groups to show clinical data enrichments. Please select more groups from the Groups section above.';
     }
 }
 
 export function getDefaultGroupName(
-    filters:StudyViewFilter,
-    customChartFilterSet:{[chartId:string]:string[]},
-    clinicalAttributeIdToDataType:{[chartId:string]:string}
+    filters: StudyViewFilter,
+    customChartFilterSet: { [chartId: string]: string[] },
+    clinicalAttributeIdToDataType: { [chartId: string]: string }
 ) {
-
     const equalityFilters = _.chain(filters.clinicalDataFilters || [])
-        .filter(clinicalDataFilter => clinicalAttributeIdToDataType[clinicalDataFilter.attributeId] === DataType.STRING)
+        .filter(
+            clinicalDataFilter =>
+                clinicalAttributeIdToDataType[
+                    clinicalDataFilter.attributeId
+                ] === DataType.STRING
+        )
         .sortBy(filter => filter.attributeId) // sort clinical data equality filters into a canonical order - lets just do alphabetical by attribute id
-        .map(filter => filter.values.join("+")) // get each attributes selected values, joined by +
+        .map(filter => filter.values.join('+')) // get each attributes selected values, joined by +
         .value();
 
-    const customChartValues =
-        _(customChartFilterSet).keys().sortBy() // sort into a canonical order - lets just do alphabetical by chart id
-            .map(key=>customChartFilterSet[key].join("+"))// get each attributes selected values, joined by +
-            .value();
-
+    const customChartValues = _(customChartFilterSet)
+        .keys()
+        .sortBy() // sort into a canonical order - lets just do alphabetical by chart id
+        .map(key => customChartFilterSet[key].join('+')) // get each attributes selected values, joined by +
+        .value();
 
     const geneFilters = _.chain(filters.geneFilters || [])
         .flatMapDeep(geneFilter => geneFilter.geneQueries)
         .value();
 
-    const withData:string[] = [];
+    const withData: string[] = [];
     if (filters.withMutationData) {
-        withData.push("with mutation data");
+        withData.push('with mutation data');
     }
     if (filters.withCNAData) {
-        withData.push("with CNA data");
+        withData.push('with CNA data');
     }
 
-
     const allFilters = geneFilters
-                        .concat(equalityFilters)
-                        .concat(customChartValues)
-                        .concat(withData);
-    
-    return allFilters.join(", "); // comma separate each attributes values
+        .concat(equalityFilters)
+        .concat(customChartValues)
+        .concat(withData);
+
+    return allFilters.join(', '); // comma separate each attributes values
 }
 
-export function getTabId(pathname:string) {
+export function getTabId(pathname: string) {
     const match = pathname.match(/comparison\/([^\/]+)/);
     if (match) {
         return match[1] as GroupComparisonTab;
@@ -426,35 +517,36 @@ export function getTabId(pathname:string) {
     }
 }
 
-export function MissingSamplesMessage(
-    props:{
-        samples:SampleIdentifier[]
-    }
-) {
+export function MissingSamplesMessage(props: { samples: SampleIdentifier[] }) {
     return (
-        <div style={{width:380}}>
-            <div style={{marginBottom:7}}>The following samples cannot be found in our database. They might have been removed or changed since this group was created: </div>
-            <div style={{maxHeight:200, overflowY:"scroll"}}>
-                {props.samples.map(sample=><div>{`${sample.studyId}:${sample.sampleId}`}</div>)}
+        <div style={{ width: 380 }}>
+            <div style={{ marginBottom: 7 }}>
+                The following samples cannot be found in our database. They
+                might have been removed or changed since this group was created:{' '}
+            </div>
+            <div style={{ maxHeight: 200, overflowY: 'scroll' }}>
+                {props.samples.map(sample => (
+                    <div>{`${sample.studyId}:${sample.sampleId}`}</div>
+                ))}
             </div>
         </div>
     );
 }
 
-export function splitData<D extends {value:string}>(
-    data:D[],
-    numberOfSplits:number
+export function splitData<D extends { value: string }>(
+    data: D[],
+    numberOfSplits: number
 ) {
     data = _.chain(data)
-        .filter(d=>!isNaN(d.value as any))
-        .sortBy(d=>parseFloat(d.value))
+        .filter(d => !isNaN(d.value as any))
+        .sortBy(d => parseFloat(d.value))
         .value();
 
     const splitLength = data.length / numberOfSplits;
-    const quartiles:D[][] = [];
+    const quartiles: D[][] = [];
 
-    for( var i = 0; i < numberOfSplits; i++ ){
-        const newQuartile = data.slice(splitLength*i, splitLength*(i+1));
+    for (var i = 0; i < numberOfSplits; i++) {
+        const newQuartile = data.slice(splitLength * i, splitLength * (i + 1));
         if (newQuartile.length > 0)
             // handle edge case for small amounts of data where some quartile ranges might be empty
             quartiles.push(newQuartile);
@@ -463,50 +555,51 @@ export function splitData<D extends {value:string}>(
 }
 
 export function intersectSamples(
-    groupData1:SessionGroupData["studies"],
-    groupData2:SessionGroupData["studies"]
+    groupData1: SessionGroupData['studies'],
+    groupData2: SessionGroupData['studies']
 ) {
-    const studies1 = _.keyBy(groupData1, elt=>elt.id);
-    const studies2 = _.keyBy(groupData2, elt=>elt.id);
-    const intersection = _.mapValues(studies1, (elt, studyId)=>({
+    const studies1 = _.keyBy(groupData1, elt => elt.id);
+    const studies2 = _.keyBy(groupData2, elt => elt.id);
+    const intersection = _.mapValues(studies1, (elt, studyId) => ({
         id: elt.id,
         samples: _.intersection(
             elt.samples,
             studyId in studies2 ? studies2[studyId].samples : []
-        )
+        ),
     }));
-    return _.values(intersection).filter(elt=>elt.samples.length > 0);
+    return _.values(intersection).filter(elt => elt.samples.length > 0);
 }
 
 export function excludeSamples(
-    excludeFrom:SessionGroupData["studies"],
-    exclude:SessionGroupData["studies"]
+    excludeFrom: SessionGroupData['studies'],
+    exclude: SessionGroupData['studies']
 ) {
-    const studiesToExcludeFrom = _.keyBy(excludeFrom, elt=>elt.id);
-    const studiesToExclude = _.keyBy(exclude, elt=>elt.id);
-    const exclusion = _.mapValues(studiesToExcludeFrom, (elt, studyId)=>({
+    const studiesToExcludeFrom = _.keyBy(excludeFrom, elt => elt.id);
+    const studiesToExclude = _.keyBy(exclude, elt => elt.id);
+    const exclusion = _.mapValues(studiesToExcludeFrom, (elt, studyId) => ({
         id: elt.id,
-        samples: studyId in studiesToExclude ?
-            _.difference(elt.samples, studiesToExclude[studyId].samples) :
-            elt.samples
+        samples:
+            studyId in studiesToExclude
+                ? _.difference(elt.samples, studiesToExclude[studyId].samples)
+                : elt.samples,
     }));
-    return _.values(exclusion).filter(elt=>elt.samples.length > 0);
+    return _.values(exclusion).filter(elt => elt.samples.length > 0);
 }
 
 export function unionSamples(
-    groupData1:SessionGroupData["studies"],
-    groupData2:SessionGroupData["studies"]
-):SessionGroupData["studies"] {
-    const studies1 = _.keyBy(groupData1, elt=>elt.id);
-    const studies2 = _.keyBy(groupData2, elt=>elt.id);
+    groupData1: SessionGroupData['studies'],
+    groupData2: SessionGroupData['studies']
+): SessionGroupData['studies'] {
+    const studies1 = _.keyBy(groupData1, elt => elt.id);
+    const studies2 = _.keyBy(groupData2, elt => elt.id);
     const studyIds = _.union(_.keys(studies1), _.keys(studies2));
-    return studyIds.map(studyId=>{
+    return studyIds.map(studyId => {
         const elt1 = studies1[studyId];
         const elt2 = studies2[studyId];
         if (elt1 && elt2) {
             return {
                 id: studyId,
-                samples: _.union(elt1.samples, elt2.samples)
+                samples: _.union(elt1.samples, elt2.samples),
             };
         } else if (elt1) {
             return elt1;
@@ -517,50 +610,51 @@ export function unionSamples(
 }
 
 export function intersectPatients(
-    groupData1:{id:string, patients:string[]}[],
-    groupData2:{id:string, patients:string[]}[]
+    groupData1: { id: string; patients: string[] }[],
+    groupData2: { id: string; patients: string[] }[]
 ) {
-    const studies1 = _.keyBy(groupData1, elt=>elt.id);
-    const studies2 = _.keyBy(groupData2, elt=>elt.id);
-    const intersection = _.mapValues(studies1, (elt, studyId)=>({
+    const studies1 = _.keyBy(groupData1, elt => elt.id);
+    const studies2 = _.keyBy(groupData2, elt => elt.id);
+    const intersection = _.mapValues(studies1, (elt, studyId) => ({
         id: elt.id,
         patients: _.intersection(
             elt.patients,
             studyId in studies2 ? studies2[studyId].patients : []
-        )
+        ),
     }));
-    return _.values(intersection).filter(elt=>elt.patients.length > 0);
+    return _.values(intersection).filter(elt => elt.patients.length > 0);
 }
 
 export function excludePatients(
-    excludeFrom:{id:string, patients:string[]}[],
-    exclude:{id:string, patients:string[]}[]
+    excludeFrom: { id: string; patients: string[] }[],
+    exclude: { id: string; patients: string[] }[]
 ) {
-    const studiesToExcludeFrom = _.keyBy(excludeFrom, elt=>elt.id);
-    const studiesToExclude = _.keyBy(exclude, elt=>elt.id);
-    const exclusion = _.mapValues(studiesToExcludeFrom, (elt, studyId)=>({
+    const studiesToExcludeFrom = _.keyBy(excludeFrom, elt => elt.id);
+    const studiesToExclude = _.keyBy(exclude, elt => elt.id);
+    const exclusion = _.mapValues(studiesToExcludeFrom, (elt, studyId) => ({
         id: elt.id,
-        patients: studyId in studiesToExclude ?
-            _.difference(elt.patients, studiesToExclude[studyId].patients) :
-            elt.patients
+        patients:
+            studyId in studiesToExclude
+                ? _.difference(elt.patients, studiesToExclude[studyId].patients)
+                : elt.patients,
     }));
-    return _.values(exclusion).filter(elt=>elt.patients.length > 0);
+    return _.values(exclusion).filter(elt => elt.patients.length > 0);
 }
 
 export function unionPatients(
-    groupData1:{id:string, patients:string[]}[],
-    groupData2:{id:string, patients:string[]}[]
+    groupData1: { id: string; patients: string[] }[],
+    groupData2: { id: string; patients: string[] }[]
 ) {
-    const studies1 = _.keyBy(groupData1, elt=>elt.id);
-    const studies2 = _.keyBy(groupData2, elt=>elt.id);
+    const studies1 = _.keyBy(groupData1, elt => elt.id);
+    const studies2 = _.keyBy(groupData2, elt => elt.id);
     const studyIds = _.union(_.keys(studies1), _.keys(studies2));
-    return studyIds.map(studyId=>{
+    return studyIds.map(studyId => {
         const elt1 = studies1[studyId];
         const elt2 = studies2[studyId];
         if (elt1 && elt2) {
             return {
                 id: studyId,
-                patients: _.union(elt1.patients, elt2.patients)
+                patients: _.union(elt1.patients, elt2.patients),
             };
         } else if (elt1) {
             return elt1;
@@ -571,25 +665,31 @@ export function unionPatients(
 }
 
 export function convertPatientsStudiesAttrToSamples(
-    data:{id:string, patients:string[]}[],
-    patientToSamples:ComplexKeyGroupsMap<Pick<Sample, "sampleId">>
+    data: { id: string; patients: string[] }[],
+    patientToSamples: ComplexKeyGroupsMap<Pick<Sample, 'sampleId'>>
 ) {
-    return data.map(elt=>({
+    return data.map(elt => ({
         id: elt.id,
         samples: _.flatten(
-            elt.patients.map(patientId=>{
-                return (patientToSamples.get({ patientId, studyId: elt.id}) || [])
-                    .map(s=>s.sampleId);
+            elt.patients.map(patientId => {
+                return (
+                    patientToSamples.get({ patientId, studyId: elt.id }) || []
+                ).map(s => s.sampleId);
             })
-        )
+        ),
     }));
 }
 
 export function partitionCasesByGroupMembership(
-    groupsNotOverlapRemoved:Pick<StudyViewComparisonGroup, "studies"|"uid">[],
-    getCaseIdentifiers:(group:Pick<StudyViewComparisonGroup, "studies"|"uid">)=>any[],
-    getUniqueCaseKey:(caseIdentifier:any)=>string,
-    caseKeys:string[]
+    groupsNotOverlapRemoved: Pick<
+        StudyViewComparisonGroup,
+        'studies' | 'uid'
+    >[],
+    getCaseIdentifiers: (
+        group: Pick<StudyViewComparisonGroup, 'studies' | 'uid'>
+    ) => any[],
+    getUniqueCaseKey: (caseIdentifier: any) => string,
+    caseKeys: string[]
 ) {
     // Gives a partition of the given cases into lists based on which groups
     //  each case is a member of. For example, if there are groups A and B, then
@@ -598,15 +698,20 @@ export function partitionCasesByGroupMembership(
     //  entries in the output for nonempty lists.
 
     const partitionMap = new ComplexKeyGroupsMap<string>();
-    const groupToCaseKeys = groupsNotOverlapRemoved.reduce((map, group)=>{
-        map[group.uid] = _.keyBy(getCaseIdentifiers(group).map(id=>{
-            return getUniqueCaseKey(id);
-        }));
-        return map;
-    }, {} as {[uid:string]:{[uniqueCaseKey:string]:any}});
+    const groupToCaseKeys = groupsNotOverlapRemoved.reduce(
+        (map, group) => {
+            map[group.uid] = _.keyBy(
+                getCaseIdentifiers(group).map(id => {
+                    return getUniqueCaseKey(id);
+                })
+            );
+            return map;
+        },
+        {} as { [uid: string]: { [uniqueCaseKey: string]: any } }
+    );
 
     for (const caseKey of caseKeys) {
-        const key:any = {};
+        const key: any = {};
         for (const group of groupsNotOverlapRemoved) {
             key[group.uid] = caseKey in groupToCaseKeys[group.uid];
         }
@@ -615,56 +720,70 @@ export function partitionCasesByGroupMembership(
     return partitionMap.entries();
 }
 
-export interface IOverlapComputations<T extends Pick<ComparisonGroup, "studies"|"uid">> {
-    groups:T[];
-    overlappingSamples:SampleIdentifier[];
-    overlappingPatients:PatientIdentifier[];
-    overlappingSamplesSet:ComplexKeySet;
-    overlappingPatientsSet:ComplexKeySet;
-    totalSampleOverlap:number;
-    totalPatientOverlap:number;
-    excludedFromAnalysis:{[uid:string]:true}
-}
-
-export function getOverlapComputations<T extends Pick<ComparisonGroup, "studies"|"uid">>(
-    groups:T[],
-    isGroupSelected:(uid:string)=>boolean
-):IOverlapComputations<T> {
-    let filteredGroups:T[] = groups.filter(group=>isGroupSelected(group.uid));
+export interface IOverlapComputations<
+    T extends Pick<ComparisonGroup, 'studies' | 'uid'>
+> {
+    groups: T[];
+    overlappingSamples: SampleIdentifier[];
+    overlappingPatients: PatientIdentifier[];
+    overlappingSamplesSet: ComplexKeySet;
+    overlappingPatientsSet: ComplexKeySet;
+    totalSampleOverlap: number;
+    totalPatientOverlap: number;
+    excludedFromAnalysis: { [uid: string]: true };
+}
+
+export function getOverlapComputations<
+    T extends Pick<ComparisonGroup, 'studies' | 'uid'>
+>(
+    groups: T[],
+    isGroupSelected: (uid: string) => boolean
+): IOverlapComputations<T> {
+    let filteredGroups: T[] = groups.filter(group =>
+        isGroupSelected(group.uid)
+    );
 
     const totalSampleOverlap = new ComplexKeySet();
     const totalPatientOverlap = new ComplexKeySet();
 
-    let overlappingSamples:SampleIdentifier[] = [];
-    let overlappingPatients:PatientIdentifier[] = [];
+    let overlappingSamples: SampleIdentifier[] = [];
+    let overlappingPatients: PatientIdentifier[] = [];
     let overlappingSamplesSet = new ComplexKeySet();
     let overlappingPatientsSet = new ComplexKeySet();
-    let removedGroups:{[uid:string]:T} = {};
+    let removedGroups: { [uid: string]: T } = {};
 
     if (filteredGroups.length > 0) {
-        while(true) {
+        while (true) {
             overlappingSamples = getOverlappingSamples(filteredGroups);
             overlappingPatients = getOverlappingPatients(filteredGroups);
             overlappingSamplesSet = new ComplexKeySet();
             overlappingPatientsSet = new ComplexKeySet();
             let sampleId;
             for (const sample of overlappingSamples) {
-                sampleId = { studyId: sample.studyId, sampleId: sample.sampleId };
+                sampleId = {
+                    studyId: sample.studyId,
+                    sampleId: sample.sampleId,
+                };
                 overlappingSamplesSet.add(sampleId);
                 totalSampleOverlap.add(sampleId);
             }
             let patientId;
             for (const patient of overlappingPatients) {
-                patientId = { studyId: patient.studyId, patientId: patient.patientId };
+                patientId = {
+                    studyId: patient.studyId,
+                    patientId: patient.patientId,
+                };
                 overlappingPatientsSet.add(patientId);
                 totalPatientOverlap.add(patientId);
             }
 
-            const [emptyGroups, nonEmptyGroups] =
-                _.partition(
-                    getOverlapFilteredGroups(filteredGroups, { overlappingSamplesSet, overlappingPatientsSet }),
-                    group=>isGroupEmpty(group)
-                );
+            const [emptyGroups, nonEmptyGroups] = _.partition(
+                getOverlapFilteredGroups(filteredGroups, {
+                    overlappingSamplesSet,
+                    overlappingPatientsSet,
+                }),
+                group => isGroupEmpty(group)
+            );
 
             // remove one group at a time
             if (emptyGroups.length > 0) {
@@ -677,22 +796,27 @@ export function getOverlapComputations<T extends Pick<ComparisonGroup, "studies"
                 break;
             } else {
                 // otherwise, keep iterating
-                filteredGroups = filteredGroups.filter(g=>!(g.uid in removedGroups));
+                filteredGroups = filteredGroups.filter(
+                    g => !(g.uid in removedGroups)
+                );
             }
         }
     }
 
-    const sortOrder = stringListToIndexSet(groups.map(g=>g.uid));
-    let groupsInSortOrder = getOverlapFilteredGroups(filteredGroups, { overlappingSamplesSet, overlappingPatientsSet }).concat(_.values(removedGroups));
-    groupsInSortOrder = _.sortBy(groupsInSortOrder, g=>sortOrder[g.uid]);
+    const sortOrder = stringListToIndexSet(groups.map(g => g.uid));
+    let groupsInSortOrder = getOverlapFilteredGroups(filteredGroups, {
+        overlappingSamplesSet,
+        overlappingPatientsSet,
+    }).concat(_.values(removedGroups));
+    groupsInSortOrder = _.sortBy(groupsInSortOrder, g => sortOrder[g.uid]);
     return {
-        groups:groupsInSortOrder,
+        groups: groupsInSortOrder,
         overlappingSamples,
         overlappingPatients,
         overlappingSamplesSet,
         overlappingPatientsSet,
-        totalSampleOverlap:totalSampleOverlap.keys().length,
-        totalPatientOverlap:totalPatientOverlap.keys().length,
-        excludedFromAnalysis:_.mapValues(removedGroups, g=>true as true)
+        totalSampleOverlap: totalSampleOverlap.keys().length,
+        totalPatientOverlap: totalPatientOverlap.keys().length,
+        excludedFromAnalysis: _.mapValues(removedGroups, g => true as true),
     };
-}
\ No newline at end of file
+}
diff --git a/src/pages/groupComparison/MRNAEnrichments.tsx b/src/pages/groupComparison/MRNAEnrichments.tsx
index 8ed8c9d1a7f..5afe0d369af 100644
--- a/src/pages/groupComparison/MRNAEnrichments.tsx
+++ b/src/pages/groupComparison/MRNAEnrichments.tsx
@@ -1,61 +1,84 @@
-import * as React from "react";
-import {observer} from "mobx-react";
-import autobind from "autobind-decorator";
-import {MolecularProfile} from "../../shared/api/generated/CBioPortalAPI";
-import {MakeMobxView} from "../../shared/components/MobxView";
-import EnrichmentsDataSetDropdown from "../resultsView/enrichments/EnrichmentsDataSetDropdown";
-import LoadingIndicator from "../../shared/components/loadingIndicator/LoadingIndicator";
-import ErrorMessage from "../../shared/components/ErrorMessage";
-import GroupComparisonStore from "./GroupComparisonStore";
-import ExpressionEnrichmentContainer from "../resultsView/enrichments/ExpressionEnrichmentsContainer";
-import {MakeEnrichmentsTabUI} from "./GroupComparisonUtils";
-import { remoteData } from "cbioportal-frontend-commons";
-import * as _ from "lodash";
+import * as React from 'react';
+import { observer } from 'mobx-react';
+import autobind from 'autobind-decorator';
+import { MolecularProfile } from '../../shared/api/generated/CBioPortalAPI';
+import { MakeMobxView } from '../../shared/components/MobxView';
+import EnrichmentsDataSetDropdown from '../resultsView/enrichments/EnrichmentsDataSetDropdown';
+import LoadingIndicator from '../../shared/components/loadingIndicator/LoadingIndicator';
+import ErrorMessage from '../../shared/components/ErrorMessage';
+import GroupComparisonStore from './GroupComparisonStore';
+import ExpressionEnrichmentContainer from '../resultsView/enrichments/ExpressionEnrichmentsContainer';
+import { MakeEnrichmentsTabUI } from './GroupComparisonUtils';
+import { remoteData } from 'cbioportal-frontend-commons';
+import * as _ from 'lodash';
 
 export interface IMRNAEnrichmentsProps {
-    store: GroupComparisonStore
+    store: GroupComparisonStore;
 }
 
 @observer
-export default class MRNAEnrichments extends React.Component<IMRNAEnrichmentsProps, {}> {
+export default class MRNAEnrichments extends React.Component<
+    IMRNAEnrichmentsProps,
+    {}
+> {
     @autobind
-    private onChangeProfile(profileMap:{[studyId:string]:MolecularProfile}) {
+    private onChangeProfile(profileMap: {
+        [studyId: string]: MolecularProfile;
+    }) {
         this.props.store.setMRNAEnrichmentProfileMap(profileMap);
     }
 
     private readonly mrnaEnrichmentAnalysisGroups = remoteData({
         await: () => [this.props.store.enrichmentAnalysisGroups],
         invoke: () => {
-            return Promise.resolve(_.map(this.props.store.enrichmentAnalysisGroups.result, group => {
-                return {
-                    ...group,
-                    description: `samples in ${group.name}`
-                }
-            }));
-        }
+            return Promise.resolve(
+                _.map(
+                    this.props.store.enrichmentAnalysisGroups.result,
+                    group => {
+                        return {
+                            ...group,
+                            description: `samples in ${group.name}`,
+                        };
+                    }
+                )
+            );
+        },
     });
 
-    readonly tabUI = MakeEnrichmentsTabUI(()=>this.props.store, ()=>this.enrichmentsUI, "mRNA", true, true, false);
+    readonly tabUI = MakeEnrichmentsTabUI(
+        () => this.props.store,
+        () => this.enrichmentsUI,
+        'mRNA',
+        true,
+        true,
+        false
+    );
 
     readonly enrichmentsUI = MakeMobxView({
-        await:()=>[
+        await: () => [
             this.props.store.mRNAEnrichmentData,
             this.props.store.selectedmRNAEnrichmentProfileMap,
             this.mrnaEnrichmentAnalysisGroups,
             this.props.store.studies,
-            this.props.store.sampleKeyToSample
+            this.props.store.sampleKeyToSample,
         ],
-        render:()=>{
+        render: () => {
             // since mRNA enrichments tab is enabled only for one study, selectedProteinEnrichmentProfileMap
             // would contain only one key.
-            const studyIds = Object.keys(this.props.store.selectedmRNAEnrichmentProfileMap.result!);
-            const selectedProfile = this.props.store.selectedmRNAEnrichmentProfileMap.result![studyIds[0]];
+            const studyIds = Object.keys(
+                this.props.store.selectedmRNAEnrichmentProfileMap.result!
+            );
+            const selectedProfile = this.props.store
+                .selectedmRNAEnrichmentProfileMap.result![studyIds[0]];
             return (
                 <div data-test="GroupComparisonMRNAEnrichments">
                     <EnrichmentsDataSetDropdown
                         dataSets={this.props.store.mRNAEnrichmentProfiles}
                         onChange={this.onChangeProfile}
-                        selectedProfileByStudyId={this.props.store.selectedmRNAEnrichmentProfileMap.result!}
+                        selectedProfileByStudyId={
+                            this.props.store.selectedmRNAEnrichmentProfileMap
+                                .result!
+                        }
                         alwaysShow={true}
                         studies={this.props.store.studies.result!}
                     />
@@ -64,16 +87,20 @@ export default class MRNAEnrichments extends React.Component<IMRNAEnrichmentsPro
                         groups={this.mrnaEnrichmentAnalysisGroups.result}
                         selectedProfile={selectedProfile}
                         alteredVsUnalteredMode={false}
-                        sampleKeyToSample={this.props.store.sampleKeyToSample.result!}
+                        sampleKeyToSample={
+                            this.props.store.sampleKeyToSample.result!
+                        }
                     />
                 </div>
             );
         },
-        renderPending:()=><LoadingIndicator center={true} isLoading={true} size={"big"}/>,
-        renderError:()=><ErrorMessage/>
+        renderPending: () => (
+            <LoadingIndicator center={true} isLoading={true} size={'big'} />
+        ),
+        renderError: () => <ErrorMessage />,
     });
 
     render() {
         return this.tabUI.component;
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/groupComparison/MutationEnrichments.tsx b/src/pages/groupComparison/MutationEnrichments.tsx
index 4117d3c8ed1..bf02b129423 100644
--- a/src/pages/groupComparison/MutationEnrichments.tsx
+++ b/src/pages/groupComparison/MutationEnrichments.tsx
@@ -1,78 +1,117 @@
-import * as React from "react";
-import { observer } from "mobx-react";
-import GroupComparisonStore from "./GroupComparisonStore";
-import { MolecularProfile } from "../../shared/api/generated/CBioPortalAPI";
-import LoadingIndicator from "../../shared/components/loadingIndicator/LoadingIndicator";
-import ErrorMessage from "../../shared/components/ErrorMessage";
-import EnrichmentsDataSetDropdown from "../resultsView/enrichments/EnrichmentsDataSetDropdown";
-import AlterationEnrichmentContainer from "../resultsView/enrichments/AlterationEnrichmentsContainer";
-import autobind from "autobind-decorator";
-import { MakeMobxView } from "../../shared/components/MobxView";
-import { MakeEnrichmentsTabUI } from "./GroupComparisonUtils";
-import { remoteData } from "cbioportal-frontend-commons";
-import _ from "lodash";
-import { AlterationContainerType } from "pages/resultsView/enrichments/EnrichmentsUtil";
+import * as React from 'react';
+import { observer } from 'mobx-react';
+import GroupComparisonStore from './GroupComparisonStore';
+import { MolecularProfile } from '../../shared/api/generated/CBioPortalAPI';
+import LoadingIndicator from '../../shared/components/loadingIndicator/LoadingIndicator';
+import ErrorMessage from '../../shared/components/ErrorMessage';
+import EnrichmentsDataSetDropdown from '../resultsView/enrichments/EnrichmentsDataSetDropdown';
+import AlterationEnrichmentContainer from '../resultsView/enrichments/AlterationEnrichmentsContainer';
+import autobind from 'autobind-decorator';
+import { MakeMobxView } from '../../shared/components/MobxView';
+import { MakeEnrichmentsTabUI } from './GroupComparisonUtils';
+import { remoteData } from 'cbioportal-frontend-commons';
+import _ from 'lodash';
+import { AlterationContainerType } from 'pages/resultsView/enrichments/EnrichmentsUtil';
 
 export interface IMutationEnrichmentsProps {
-    store: GroupComparisonStore
+    store: GroupComparisonStore;
 }
 
 @observer
-export default class MutationEnrichments extends React.Component<IMutationEnrichmentsProps, {}> {
-
+export default class MutationEnrichments extends React.Component<
+    IMutationEnrichmentsProps,
+    {}
+> {
     @autobind
-    private onChangeProfile(profileMap:{[studyId:string]:MolecularProfile}) {
+    private onChangeProfile(profileMap: {
+        [studyId: string]: MolecularProfile;
+    }) {
         this.props.store.setMutationEnrichmentProfileMap(profileMap);
     }
 
-    readonly tabUI = MakeEnrichmentsTabUI(()=>this.props.store, ()=>this.enrichmentsUI, "mutation", true, true, true);
+    readonly tabUI = MakeEnrichmentsTabUI(
+        () => this.props.store,
+        () => this.enrichmentsUI,
+        'mutation',
+        true,
+        true,
+        true
+    );
 
     private readonly mutationEnrichmentAnalysisGroups = remoteData({
         await: () => [this.props.store.enrichmentAnalysisGroups],
         invoke: () => {
-            return Promise.resolve(_.map(this.props.store.enrichmentAnalysisGroups.result, group => {
-                return {
-                    ...group,
-                    description: `Number (percentage) of ${this.props.store.usePatientLevelEnrichments ? "patients" : "samples"} in ${group.name} that have a mutation in the listed gene.`
-                }
-            }));
-        }
+            return Promise.resolve(
+                _.map(
+                    this.props.store.enrichmentAnalysisGroups.result,
+                    group => {
+                        return {
+                            ...group,
+                            description: `Number (percentage) of ${
+                                this.props.store.usePatientLevelEnrichments
+                                    ? 'patients'
+                                    : 'samples'
+                            } in ${
+                                group.name
+                            } that have a mutation in the listed gene.`,
+                        };
+                    }
+                )
+            );
+        },
     });
 
     readonly enrichmentsUI = MakeMobxView({
-        await:()=>[
+        await: () => [
             this.props.store.mutationEnrichmentData,
             this.props.store.selectedStudyMutationEnrichmentProfileMap,
             this.mutationEnrichmentAnalysisGroups,
-            this.props.store.studies
+            this.props.store.studies,
         ],
-        render:()=>{
-            let headerName = "Mutation";
-            let studyIds = Object.keys(this.props.store.selectedStudyMutationEnrichmentProfileMap.result!);
+        render: () => {
+            let headerName = 'Mutation';
+            let studyIds = Object.keys(
+                this.props.store.selectedStudyMutationEnrichmentProfileMap
+                    .result!
+            );
             if (studyIds.length === 1) {
-                headerName = this.props.store.selectedStudyMutationEnrichmentProfileMap.result![studyIds[0]].name
+                headerName = this.props.store
+                    .selectedStudyMutationEnrichmentProfileMap.result![
+                    studyIds[0]
+                ].name;
             }
             return (
                 <div data-test="GroupComparisonMutationEnrichments">
                     <EnrichmentsDataSetDropdown
                         dataSets={this.props.store.mutationEnrichmentProfiles}
                         onChange={this.onChangeProfile}
-                        selectedProfileByStudyId={this.props.store.selectedStudyMutationEnrichmentProfileMap.result!}
+                        selectedProfileByStudyId={
+                            this.props.store
+                                .selectedStudyMutationEnrichmentProfileMap
+                                .result!
+                        }
                         studies={this.props.store.studies.result!}
                     />
-                    <AlterationEnrichmentContainer data={this.props.store.mutationEnrichmentData.result!}
+                    <AlterationEnrichmentContainer
+                        data={this.props.store.mutationEnrichmentData.result!}
                         groups={this.mutationEnrichmentAnalysisGroups.result}
                         alteredVsUnalteredMode={false}
                         headerName={headerName}
                         containerType={AlterationContainerType.MUTATION}
-                        patientLevelEnrichments={this.props.store.usePatientLevelEnrichments}
-                        onSetPatientLevelEnrichments={this.props.store.setUsePatientLevelEnrichments}
+                        patientLevelEnrichments={
+                            this.props.store.usePatientLevelEnrichments
+                        }
+                        onSetPatientLevelEnrichments={
+                            this.props.store.setUsePatientLevelEnrichments
+                        }
                     />
                 </div>
             );
         },
-        renderPending:()=><LoadingIndicator center={true} isLoading={true} size={"big"}/>,
-        renderError:()=><ErrorMessage/>
+        renderPending: () => (
+            <LoadingIndicator center={true} isLoading={true} size={'big'} />
+        ),
+        renderError: () => <ErrorMessage />,
     });
 
     render() {
diff --git a/src/pages/groupComparison/Overlap.tsx b/src/pages/groupComparison/Overlap.tsx
index 818b0edf41f..b690435ea4b 100644
--- a/src/pages/groupComparison/Overlap.tsx
+++ b/src/pages/groupComparison/Overlap.tsx
@@ -1,40 +1,39 @@
 import * as React from 'react';
-import LoadingIndicator from "shared/components/loadingIndicator/LoadingIndicator";
-import {observer} from "mobx-react";
+import LoadingIndicator from 'shared/components/loadingIndicator/LoadingIndicator';
+import { observer } from 'mobx-react';
 import GroupComparisonStore from './GroupComparisonStore';
-import {action, computed, observable} from 'mobx';
+import { action, computed, observable } from 'mobx';
 import Venn from './OverlapVenn';
-import _ from "lodash";
+import _ from 'lodash';
 import autobind from 'autobind-decorator';
-import {DownloadControls, remoteData} from 'cbioportal-frontend-commons';
-import {MakeMobxView} from "../../shared/components/MobxView";
-import Loader from "../../shared/components/loadingIndicator/LoadingIndicator";
-import ErrorMessage from "../../shared/components/ErrorMessage";
+import { DownloadControls, remoteData } from 'cbioportal-frontend-commons';
+import { MakeMobxView } from '../../shared/components/MobxView';
+import Loader from '../../shared/components/loadingIndicator/LoadingIndicator';
+import ErrorMessage from '../../shared/components/ErrorMessage';
 import {
     getSampleIdentifiers,
     OVERLAP_NOT_ENOUGH_GROUPS_MSG,
-    partitionCasesByGroupMembership
-} from "./GroupComparisonUtils";
+    partitionCasesByGroupMembership,
+} from './GroupComparisonUtils';
 import * as ReactDOM from 'react-dom';
 import WindowStore from 'shared/components/window/WindowStore';
-import {getPatientIdentifiers} from "../studyView/StudyViewUtils";
-import OverlapExclusionIndicator from "./OverlapExclusionIndicator";
-import OverlapUpset from "./OverlapUpset";
+import { getPatientIdentifiers } from '../studyView/StudyViewUtils';
+import OverlapExclusionIndicator from './OverlapExclusionIndicator';
+import OverlapUpset from './OverlapUpset';
 
 export interface IOverlapProps {
-    store: GroupComparisonStore
+    store: GroupComparisonStore;
 }
 
-const SVG_ID = "comparison-tab-overlap-svg";
+const SVG_ID = 'comparison-tab-overlap-svg';
 
 enum PlotType {
     Upset,
-    Venn
+    Venn,
 }
 
 @observer
 export default class Overlap extends React.Component<IOverlapProps, {}> {
-
     @observable plotExists = false;
     @observable vennFailed = false;
 
@@ -49,37 +48,45 @@ export default class Overlap extends React.Component<IOverlapProps, {}> {
     }
 
     readonly tabUI = MakeMobxView({
-        await:()=>{
-            if (this.props.store._selectedGroups.isComplete &&
-                this.props.store._selectedGroups.result.length < 2) {
+        await: () => {
+            if (
+                this.props.store._selectedGroups.isComplete &&
+                this.props.store._selectedGroups.result.length < 2
+            ) {
                 // dont bother loading data for and computing overlap if not enough groups for it
                 return [this.props.store._selectedGroups];
             } else {
                 return [this.props.store._selectedGroups, this.overlapUI];
             }
         },
-        render:()=>{
-            const content:any[] = [];
+        render: () => {
+            const content: any[] = [];
 
             if (this.props.store._selectedGroups.result!.length < 2) {
                 content.push(<span>{OVERLAP_NOT_ENOUGH_GROUPS_MSG}</span>);
             } else {
-                content.push(<OverlapExclusionIndicator overlapTabMode={true} store={this.props.store}/>);
+                content.push(
+                    <OverlapExclusionIndicator
+                        overlapTabMode={true}
+                        store={this.props.store}
+                    />
+                );
                 if (this.vennFailed) {
                     content.push(
                         <div className="alert alert-info">
-                            We couldn't find a good Venn diagram layout, so showing UpSet diagram instead.
+                            We couldn't find a good Venn diagram layout, so
+                            showing UpSet diagram instead.
                         </div>
                     );
                 }
                 content.push(this.overlapUI.component);
             }
-            return (<div data-test="ComparisonPageOverlapTabDiv">
-                {content}
-            </div>);
+            return <div data-test="ComparisonPageOverlapTabDiv">{content}</div>;
         },
-        renderPending:()=><Loader isLoading={true} center={true} size={"big"}/>,
-        renderError:()=><ErrorMessage/>
+        renderPending: () => (
+            <Loader isLoading={true} center={true} size={'big'} />
+        ),
+        renderError: () => <ErrorMessage />,
     });
 
     @autobind
@@ -87,146 +94,214 @@ export default class Overlap extends React.Component<IOverlapProps, {}> {
         if (this.plotType.result! === PlotType.Upset) {
             let node = ReactDOM.findDOMNode(this);
 
-            const svg = document.createElementNS("http://www.w3.org/2000/svg", "svg") as SVGElement;
-            const childSVGs = $(node!).find('svg')
+            const svg = document.createElementNS(
+                'http://www.w3.org/2000/svg',
+                'svg'
+            ) as SVGElement;
+            const childSVGs = $(node!).find('svg');
             const sampleElement = childSVGs[0].cloneNode(true) as Element;
             const patientElement = childSVGs[1].cloneNode(true) as Element;
-            $(node!).find('svg')
+            $(node!).find('svg');
 
             let height = 0;
             let width = 0;
 
-            svg.appendChild(sampleElement)
+            svg.appendChild(sampleElement);
             //move patient element down by sample element size
             if (this.areUpsetPlotsSidebySide) {
-                patientElement.setAttribute("x", `${$(sampleElement).width()}`);
-                height = Math.max($(sampleElement).height()!, $(patientElement).height()!);
+                patientElement.setAttribute('x', `${$(sampleElement).width()}`);
+                height = Math.max(
+                    $(sampleElement).height()!,
+                    $(patientElement).height()!
+                );
                 width = $(sampleElement).width()! + $(patientElement).width()!;
             } else {
-                patientElement.setAttribute("y", `${$(sampleElement).height()}`);
-                height = $(sampleElement).height()! + $(patientElement).height()!;
-                width = Math.max($(sampleElement).width()!, $(patientElement).width()!);
+                patientElement.setAttribute(
+                    'y',
+                    `${$(sampleElement).height()}`
+                );
+                height =
+                    $(sampleElement).height()! + $(patientElement).height()!;
+                width = Math.max(
+                    $(sampleElement).width()!,
+                    $(patientElement).width()!
+                );
             }
 
-            $(svg).attr("height", height);
-            $(svg).attr("width", width);
+            $(svg).attr('height', height);
+            $(svg).attr('width', width);
             $(svg).css({ height, width });
 
             svg.appendChild(patientElement);
             return svg;
         }
-        return document.getElementById(SVG_ID) as SVGElement | null
+        return document.getElementById(SVG_ID) as SVGElement | null;
     }
 
     readonly plotType = remoteData({
-        await:()=>[this.props.store._selectedGroups],
-        invoke:()=>{
-            if (this.vennFailed || this.props.store._selectedGroups.result!.length > 3) {
+        await: () => [this.props.store._selectedGroups],
+        invoke: () => {
+            if (
+                this.vennFailed ||
+                this.props.store._selectedGroups.result!.length > 3
+            ) {
                 return Promise.resolve(PlotType.Upset);
             } else {
                 return Promise.resolve(PlotType.Venn);
             }
-        }
+        },
     });
 
+    public readonly sampleGroupsWithCases = remoteData(
+        {
+            await: () => [
+                this.props.store._selectedGroups,
+                this.props.store.sampleSet,
+            ],
+            invoke: () => {
+                const sampleSet = this.props.store.sampleSet.result!;
+                const groupsWithSamples = _.map(
+                    this.props.store._selectedGroups.result,
+                    group => {
+                        let samples = getSampleIdentifiers([group]).map(
+                            sampleIdentifier =>
+                                sampleSet.get({
+                                    studyId: sampleIdentifier.studyId,
+                                    sampleId: sampleIdentifier.sampleId,
+                                })
+                        );
+                        return {
+                            uid: group.uid,
+                            cases: _.map(
+                                samples,
+                                sample => sample!.uniqueSampleKey
+                            ),
+                        };
+                    }
+                );
+                return Promise.resolve(groupsWithSamples);
+            },
+        },
+        []
+    );
 
-    public readonly sampleGroupsWithCases = remoteData({
-        await: () => [
-            this.props.store._selectedGroups,
-            this.props.store.sampleSet,
-        ],
-        invoke: () => {
-            const sampleSet = this.props.store.sampleSet.result!;
-            const groupsWithSamples = _.map(this.props.store._selectedGroups.result, group => {
-                let samples = getSampleIdentifiers([group]).map(sampleIdentifier => sampleSet.get({studyId: sampleIdentifier.studyId, sampleId: sampleIdentifier.sampleId}));
-                return {
-                    uid: group.uid,
-                    cases: _.map(samples, sample => sample!.uniqueSampleKey)
-                }
-            });
-            return Promise.resolve(groupsWithSamples);
-        }
-    }, []);
+    public readonly patientGroupsWithCases = remoteData(
+        {
+            await: () => [
+                this.props.store._selectedGroups,
+                this.props.store.sampleSet,
+            ],
+            invoke: () => {
+                const sampleSet = this.props.store.sampleSet.result!;
+                const groupsWithPatients = _.map(
+                    this.props.store._selectedGroups.result,
+                    group => {
+                        let samples = getSampleIdentifiers([group]).map(
+                            sampleIdentifier =>
+                                sampleSet.get({
+                                    studyId: sampleIdentifier.studyId,
+                                    sampleId: sampleIdentifier.sampleId,
+                                })
+                        );
+                        return {
+                            uid: group.uid,
+                            cases: _.uniq(
+                                _.map(
+                                    samples,
+                                    sample => sample!.uniquePatientKey
+                                )
+                            ),
+                        };
+                    }
+                );
+                return Promise.resolve(groupsWithPatients);
+            },
+        },
+        []
+    );
 
-    public readonly patientGroupsWithCases = remoteData({
+    private activeSamples = remoteData({
         await: () => [
             this.props.store._selectedGroups,
             this.props.store.sampleSet,
         ],
         invoke: () => {
             const sampleSet = this.props.store.sampleSet.result!;
-            const groupsWithPatients = _.map(this.props.store._selectedGroups.result, group => {
-                let samples = getSampleIdentifiers([group]).map(sampleIdentifier => sampleSet.get({studyId: sampleIdentifier.studyId, sampleId: sampleIdentifier.sampleId}));
-                return {
-                    uid: group.uid,
-                    cases: _.uniq(_.map(samples, sample => sample!.uniquePatientKey))
-                }
-            });
-            return Promise.resolve(groupsWithPatients);
-        }
-    }, []);
-
-    private activeSamples = remoteData({
-        await:()=>[
-            this.props.store._selectedGroups,
-            this.props.store.sampleSet,
-        ],
-        invoke:()=>{
-            const sampleSet = this.props.store.sampleSet.result!;
-            const activeSampleIdentifiers = getSampleIdentifiers(this.props.store._selectedGroups.result!);
-            const activeSamples = activeSampleIdentifiers
-                .map(sampleIdentifier=>sampleSet.get(sampleIdentifier)!);
+            const activeSampleIdentifiers = getSampleIdentifiers(
+                this.props.store._selectedGroups.result!
+            );
+            const activeSamples = activeSampleIdentifiers.map(
+                sampleIdentifier => sampleSet.get(sampleIdentifier)!
+            );
             return Promise.resolve(activeSamples);
-        }
+        },
     });
 
     private readonly samplesVennPartition = remoteData({
-        await:()=>[
+        await: () => [
             this.props.store._selectedGroups,
             this.props.store.sampleSet,
-            this.activeSamples
+            this.activeSamples,
         ],
-        invoke:()=>{
+        invoke: () => {
             const sampleSet = this.props.store.sampleSet.result!;
-            return Promise.resolve(
-                partitionCasesByGroupMembership(
-                    this.props.store._selectedGroups.result!,
-                    (group)=>getSampleIdentifiers([group]),
-                    (sampleIdentifier)=>sampleSet.get({ studyId: sampleIdentifier.studyId, sampleId: sampleIdentifier.sampleId })!.uniqueSampleKey,
-                    this.activeSamples.result!.map(s=>s.uniqueSampleKey)
-                ) as { key:{[uid:string]:boolean}, value:string[] }[]
-            );
-        }
+            return Promise.resolve(partitionCasesByGroupMembership(
+                this.props.store._selectedGroups.result!,
+                group => getSampleIdentifiers([group]),
+                sampleIdentifier =>
+                    sampleSet.get({
+                        studyId: sampleIdentifier.studyId,
+                        sampleId: sampleIdentifier.sampleId,
+                    })!.uniqueSampleKey,
+                this.activeSamples.result!.map(s => s.uniqueSampleKey)
+            ) as { key: { [uid: string]: boolean }; value: string[] }[]);
+        },
     });
 
     private readonly patientsVennPartition = remoteData({
-        await:()=>[
+        await: () => [
             this.props.store._selectedGroups,
             this.props.store.patientToSamplesSet,
-            this.activeSamples
+            this.activeSamples,
         ],
-        invoke:()=>{
-            const patientToSamplesSet = this.props.store.patientToSamplesSet.result!;
-            return Promise.resolve(
-                partitionCasesByGroupMembership(
-                    this.props.store._selectedGroups.result!,
-                    (group)=>getPatientIdentifiers([group]),
-                    (patientIdentifier)=>patientToSamplesSet.get({ studyId: patientIdentifier.studyId, patientId: patientIdentifier.patientId })![0].uniquePatientKey,
-                    _.uniq(this.activeSamples.result!.map(s=>s.uniquePatientKey))
-                ) as { key:{[uid:string]:boolean}, value:string[] }[]
-            );
-        }
+        invoke: () => {
+            const patientToSamplesSet = this.props.store.patientToSamplesSet
+                .result!;
+            return Promise.resolve(partitionCasesByGroupMembership(
+                this.props.store._selectedGroups.result!,
+                group => getPatientIdentifiers([group]),
+                patientIdentifier =>
+                    patientToSamplesSet.get({
+                        studyId: patientIdentifier.studyId,
+                        patientId: patientIdentifier.patientId,
+                    })![0].uniquePatientKey,
+                _.uniq(this.activeSamples.result!.map(s => s.uniquePatientKey))
+            ) as { key: { [uid: string]: boolean }; value: string[] }[]);
+        },
     });
 
     readonly uidToGroup = remoteData({
-        await:()=>[this.props.store._selectedGroups],
-        invoke:()=>Promise.resolve(_.keyBy(this.props.store._selectedGroups.result!, group=>group.uid))
+        await: () => [this.props.store._selectedGroups],
+        invoke: () =>
+            Promise.resolve(
+                _.keyBy(
+                    this.props.store._selectedGroups.result!,
+                    group => group.uid
+                )
+            ),
     });
 
     // whether to display sample and patient sets intersection charts side by side
     @computed get areUpsetPlotsSidebySide() {
-        if (this.samplesVennPartition.isComplete && this.patientsVennPartition.isComplete) {
-            return this.samplesVennPartition.result!.length + this.patientsVennPartition.result!.length <= 100;
+        if (
+            this.samplesVennPartition.isComplete &&
+            this.patientsVennPartition.isComplete
+        ) {
+            return (
+                this.samplesVennPartition.result!.length +
+                    this.patientsVennPartition.result!.length <=
+                100
+            );
         } else {
             return true;
         }
@@ -237,15 +312,15 @@ export default class Overlap extends React.Component<IOverlapProps, {}> {
     }
 
     readonly plot = MakeMobxView({
-        await:()=>[
+        await: () => [
             this.plotType,
             this.samplesVennPartition,
             this.patientsVennPartition,
             this.sampleGroupsWithCases,
             this.patientGroupsWithCases,
-            this.uidToGroup
+            this.uidToGroup,
         ],
-        render:()=>{
+        render: () => {
             let plotElt: any = null;
             switch (this.plotType.result!) {
                 case PlotType.Upset: {
@@ -254,8 +329,12 @@ export default class Overlap extends React.Component<IOverlapProps, {}> {
                             store={this.props.store}
                             sideBySide={this.areUpsetPlotsSidebySide}
                             maxWidth={this.maxWidth}
-                            samplesVennPartition={this.samplesVennPartition.result!}
-                            patientsVennPartition={this.patientsVennPartition.result!}
+                            samplesVennPartition={
+                                this.samplesVennPartition.result!
+                            }
+                            patientsVennPartition={
+                                this.patientsVennPartition.result!
+                            }
                             uidToGroup={this.uidToGroup.result!}
                         />
                     );
@@ -270,45 +349,50 @@ export default class Overlap extends React.Component<IOverlapProps, {}> {
                             uidToGroup={this.uidToGroup.result!}
                             store={this.props.store}
                             onLayoutFailure={this.onVennLayoutFailure}
-                        />)
+                        />
+                    );
                     break;
                 default:
-                    return <span>Not implemented yet</span>
+                    return <span>Not implemented yet</span>;
             }
             return plotElt;
         },
-        renderPending:()=><Loader isLoading={true} size={"big"}/>,
-        renderError:()=><ErrorMessage/>
+        renderPending: () => <Loader isLoading={true} size={'big'} />,
+        renderError: () => <ErrorMessage />,
     });
 
     readonly overlapUI = MakeMobxView({
         await: () => [this.plot],
         render: () => (
-            <div data-test="ComparisonPageOverlapTabDiv" className="borderedChart posRelative">
+            <div
+                data-test="ComparisonPageOverlapTabDiv"
+                className="borderedChart posRelative"
+            >
                 {this.plotExists && (
                     <DownloadControls
                         getSvg={this.getSvg}
                         filename={'overlap'}
                         dontFade={true}
                         style={{ position: 'absolute', right: 10, top: 10 }}
-                        type='button'
+                        type="button"
                     />
                 )}
-                <div style={{ position: "relative", display: "inline-block" }}>
+                <div style={{ position: 'relative', display: 'inline-block' }}>
                     {this.plot.component}
                 </div>
             </div>
         ),
-        renderPending: () => <LoadingIndicator isLoading={true} centerRelativeToContainer={true} size="big" />,
-        renderError: () => <ErrorMessage />
+        renderPending: () => (
+            <LoadingIndicator
+                isLoading={true}
+                centerRelativeToContainer={true}
+                size="big"
+            />
+        ),
+        renderError: () => <ErrorMessage />,
     });
 
-
     public render() {
-        return (
-            <div className="inlineBlock">
-                {this.tabUI.component}
-            </div>
-        )
+        return <div className="inlineBlock">{this.tabUI.component}</div>;
     }
 }
diff --git a/src/pages/groupComparison/OverlapExclusionIndicator.tsx b/src/pages/groupComparison/OverlapExclusionIndicator.tsx
index 9f7453826d9..55da9e4008d 100644
--- a/src/pages/groupComparison/OverlapExclusionIndicator.tsx
+++ b/src/pages/groupComparison/OverlapExclusionIndicator.tsx
@@ -1,72 +1,79 @@
-import * as React from "react";
-import {observer} from "mobx-react";
-import GroupComparisonStore, {OverlapStrategy} from "./GroupComparisonStore";
-import {ComparisonGroup, IOverlapComputations} from "./GroupComparisonUtils";
-import {joinGroupNames} from "./OverlapUtils";
-import {computed} from "mobx";
-import {MakeMobxView} from "../../shared/components/MobxView";
+import * as React from 'react';
+import { observer } from 'mobx-react';
+import GroupComparisonStore, { OverlapStrategy } from './GroupComparisonStore';
+import { ComparisonGroup, IOverlapComputations } from './GroupComparisonUtils';
+import { joinGroupNames } from './OverlapUtils';
+import { computed } from 'mobx';
+import { MakeMobxView } from '../../shared/components/MobxView';
 
 export interface IOverlapExclusionIndicatorProps {
-    store:GroupComparisonStore;
-    only?:"sample"|"patient"
-    overlapTabMode?:boolean;
-    survivalTabMode?:boolean;
+    store: GroupComparisonStore;
+    only?: 'sample' | 'patient';
+    overlapTabMode?: boolean;
+    survivalTabMode?: boolean;
 }
 
-function makeSurvivalTabMessage(count:number) {
+function makeSurvivalTabMessage(count: number) {
     return (
-        <span>Overlapping patients ({count}) are plotted as distinct groups below.</span>
+        <span>
+            Overlapping patients ({count}) are plotted as distinct groups below.
+        </span>
     );
 }
 
 @observer
-export default class OverlapExclusionIndicator extends React.Component<IOverlapExclusionIndicatorProps, {}> {
-
-    static defaultProps:Partial<IOverlapExclusionIndicatorProps> = {
+export default class OverlapExclusionIndicator extends React.Component<
+    IOverlapExclusionIndicatorProps,
+    {}
+> {
+    static defaultProps: Partial<IOverlapExclusionIndicatorProps> = {
         overlapTabMode: false,
-        survivalTabMode: false
+        survivalTabMode: false,
     };
 
     @computed get classNames() {
-        let icon = "";
-        let alert = "";
+        let icon = '';
+        let alert = '';
         switch (this.props.store.overlapStrategy) {
             case OverlapStrategy.INCLUDE:
                 if (this.props.survivalTabMode) {
-                    icon = "fa-info-circle";
-                    alert = "alert-info";
+                    icon = 'fa-info-circle';
+                    alert = 'alert-info';
                 } else {
-                    icon = "fa-exclamation-triangle";
-                    alert = "alert-warning";
+                    icon = 'fa-exclamation-triangle';
+                    alert = 'alert-warning';
                 }
                 break;
             case OverlapStrategy.EXCLUDE:
-                icon = "fa-info-circle";
-                alert = "alert-info";
+                icon = 'fa-info-circle';
+                alert = 'alert-info';
                 break;
         }
         return { icon, alert };
     }
 
     readonly excludedGroupsSummary = MakeMobxView({
-        await:()=>[this.props.store.overlapComputations],
-        render:()=>{
+        await: () => [this.props.store.overlapComputations],
+        render: () => {
             let summary;
             const selectionInfo = this.props.store.overlapComputations.result!;
-            const excludedGroups = selectionInfo.groups.filter(g=>(g.uid in selectionInfo.excludedFromAnalysis));
-            const groupNames = joinGroupNames(excludedGroups, "and");
-            const is =  excludedGroups.length === 1 ? "is" : "are";
+            const excludedGroups = selectionInfo.groups.filter(
+                g => g.uid in selectionInfo.excludedFromAnalysis
+            );
+            const groupNames = joinGroupNames(excludedGroups, 'and');
+            const is = excludedGroups.length === 1 ? 'is' : 'are';
 
             if (excludedGroups.length > 0) {
                 summary = (
                     <span>
                         {groupNames}
                         {` ${is} completely overlapping with other selected groups, so `}
-                        {this.props.overlapTabMode ?
-                            `${is} excluded from analysis in other tabs.` :
-                            `${excludedGroups.length === 1 ? "has" : "have"} been excluded from this analysis.`
-                        }
-                                </span>
+                        {this.props.overlapTabMode
+                            ? `${is} excluded from analysis in other tabs.`
+                            : `${
+                                  excludedGroups.length === 1 ? 'has' : 'have'
+                              } been excluded from this analysis.`}
+                    </span>
                 );
             }
             if (summary) {
@@ -75,8 +82,8 @@ export default class OverlapExclusionIndicator extends React.Component<IOverlapE
                         <i
                             className={`fa fa-md ${this.classNames.icon}`}
                             style={{
-                                color: "#000000",
-                                marginRight:5
+                                color: '#000000',
+                                marginRight: 5,
                             }}
                         />
                         {summary}
@@ -85,15 +92,18 @@ export default class OverlapExclusionIndicator extends React.Component<IOverlapE
             } else {
                 return null;
             }
-        }
+        },
     });
 
     private makeOverlappingCasesMessage(
-        caseType:"sample"|"patient",
-        selectionInfo:IOverlapComputations<ComparisonGroup>
+        caseType: 'sample' | 'patient',
+        selectionInfo: IOverlapComputations<ComparisonGroup>
     ) {
         // determine count
-        const count = (caseType === "sample" ? selectionInfo.overlappingSamples.length : selectionInfo.overlappingPatients.length);
+        const count =
+            caseType === 'sample'
+                ? selectionInfo.overlappingSamples.length
+                : selectionInfo.overlappingPatients.length;
 
         if (count === 0) {
             // omit message if 0 overlap
@@ -101,32 +111,44 @@ export default class OverlapExclusionIndicator extends React.Component<IOverlapE
         }
 
         let message;
-        if (this.props.survivalTabMode &&
+        if (
+            this.props.survivalTabMode &&
             selectionInfo.totalPatientOverlap > 0 &&
-            this.props.store.overlapStrategy === OverlapStrategy.INCLUDE) {
-
+            this.props.store.overlapStrategy === OverlapStrategy.INCLUDE
+        ) {
             // handle survival mode
             message = makeSurvivalTabMessage(count);
         } else {
             // determine groups
-            const includedGroups = selectionInfo.groups.filter(g=>!(g.uid in selectionInfo.excludedFromAnalysis));
-            const groupsAreExcluded = includedGroups.length < selectionInfo.groups.length;
+            const includedGroups = selectionInfo.groups.filter(
+                g => !(g.uid in selectionInfo.excludedFromAnalysis)
+            );
+            const groupsAreExcluded =
+                includedGroups.length < selectionInfo.groups.length;
             let groupsSummary;
             if (groupsAreExcluded) {
-                groupsSummary = <span>between {joinGroupNames(includedGroups, "and")}</span>;
+                groupsSummary = (
+                    <span>between {joinGroupNames(includedGroups, 'and')}</span>
+                );
             } else {
                 groupsSummary = <span>in the selected groups</span>;
             }
 
             message = (
                 <span>
-                    {`${caseType === "sample" ? "Samples" : "Patients"} (${count}) that overlap `}
+                    {`${
+                        caseType === 'sample' ? 'Samples' : 'Patients'
+                    } (${count}) that overlap `}
                     {groupsSummary}
-                    {` are ${this.props.store.overlapStrategy === OverlapStrategy.INCLUDE ? "included in" : "excluded from"}`}
-                    {this.props.overlapTabMode ?
-                        ` ${caseType}-level analysis in other tabs.`:
-                        ` ${caseType}-level analysis below.`
-                    }
+                    {` are ${
+                        this.props.store.overlapStrategy ===
+                        OverlapStrategy.INCLUDE
+                            ? 'included in'
+                            : 'excluded from'
+                    }`}
+                    {this.props.overlapTabMode
+                        ? ` ${caseType}-level analysis in other tabs.`
+                        : ` ${caseType}-level analysis below.`}
                 </span>
             );
         }
@@ -136,8 +158,8 @@ export default class OverlapExclusionIndicator extends React.Component<IOverlapE
                 <i
                     className={`fa fa-md ${this.classNames.icon}`}
                     style={{
-                        color: "#000000",
-                        marginRight:5
+                        color: '#000000',
+                        marginRight: 5,
                     }}
                 />
                 {message}
@@ -150,19 +172,32 @@ export default class OverlapExclusionIndicator extends React.Component<IOverlapE
             return null;
         } else {
             const selectionInfo = this.props.store.overlapComputations.result!;
-            if ((!selectionInfo.totalSampleOverlap && !selectionInfo.totalPatientOverlap) ||
-                (this.props.only === "sample" && !selectionInfo.totalSampleOverlap) ||
-                (this.props.only === "patient" && !selectionInfo.totalPatientOverlap)) {
+            if (
+                (!selectionInfo.totalSampleOverlap &&
+                    !selectionInfo.totalPatientOverlap) ||
+                (this.props.only === 'sample' &&
+                    !selectionInfo.totalSampleOverlap) ||
+                (this.props.only === 'patient' &&
+                    !selectionInfo.totalPatientOverlap)
+            ) {
                 return null;
             }
 
             return (
                 <div className={`alert ${this.classNames.alert}`}>
                     {this.excludedGroupsSummary.component}
-                    {this.props.only !== "patient" && this.makeOverlappingCasesMessage("sample", selectionInfo)}
-                    {this.props.only !== "sample" && this.makeOverlappingCasesMessage("patient", selectionInfo)}
+                    {this.props.only !== 'patient' &&
+                        this.makeOverlappingCasesMessage(
+                            'sample',
+                            selectionInfo
+                        )}
+                    {this.props.only !== 'sample' &&
+                        this.makeOverlappingCasesMessage(
+                            'patient',
+                            selectionInfo
+                        )}
                 </div>
             );
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/groupComparison/OverlapUpset.tsx b/src/pages/groupComparison/OverlapUpset.tsx
index 75dc67190ea..af37eab5b2c 100644
--- a/src/pages/groupComparison/OverlapUpset.tsx
+++ b/src/pages/groupComparison/OverlapUpset.tsx
@@ -1,127 +1,158 @@
-import * as React from "react";
-import {observer} from "mobx-react";
-import UpSet from "./UpSet";
-import {ComparisonGroup} from "./GroupComparisonUtils";
-import {action, observable} from "mobx";
-import autobind from "autobind-decorator";
-import CreateGroupFromOverlap from "./CreateGroupFromOverlap";
-import GroupComparisonStore from "./GroupComparisonStore";
-import {SessionGroupData} from "../../shared/api/ComparisonGroupClient";
+import * as React from 'react';
+import { observer } from 'mobx-react';
+import UpSet from './UpSet';
+import { ComparisonGroup } from './GroupComparisonUtils';
+import { action, observable } from 'mobx';
+import autobind from 'autobind-decorator';
+import CreateGroupFromOverlap from './CreateGroupFromOverlap';
+import GroupComparisonStore from './GroupComparisonStore';
+import { SessionGroupData } from '../../shared/api/ComparisonGroupClient';
 
 export interface IOverlapUpsetProps {
-    store:GroupComparisonStore;
-    sideBySide:boolean;
-    maxWidth:number;
-    samplesVennPartition:{ key:{[uid:string]:boolean}, value:string[] }[],
-    patientsVennPartition:{ key:{[uid:string]:boolean}, value:string[] }[],
-    uidToGroup:{[uid:string]:ComparisonGroup};
+    store: GroupComparisonStore;
+    sideBySide: boolean;
+    maxWidth: number;
+    samplesVennPartition: {
+        key: { [uid: string]: boolean };
+        value: string[];
+    }[];
+    patientsVennPartition: {
+        key: { [uid: string]: boolean };
+        value: string[];
+    }[];
+    uidToGroup: { [uid: string]: ComparisonGroup };
 }
 
 @observer
-export default class OverlapUpset extends React.Component<IOverlapUpsetProps, {}> {
-    @observable.shallow sampleSelection:string[][] = [];
-    @observable.shallow patientSelection:string[][] = [];
+export default class OverlapUpset extends React.Component<
+    IOverlapUpsetProps,
+    {}
+> {
+    @observable.shallow sampleSelection: string[][] = [];
+    @observable.shallow patientSelection: string[][] = [];
 
-    @observable.ref sampleUpset:UpSet|null = null;
-    @observable.ref patientUpset:UpSet|null = null;
+    @observable.ref sampleUpset: UpSet | null = null;
+    @observable.ref patientUpset: UpSet | null = null;
 
     @autobind
     @action
-    private changeSelectedSampleRegions(combinations:string[][]) {
+    private changeSelectedSampleRegions(combinations: string[][]) {
         this.sampleSelection = combinations;
     }
 
     @autobind
     @action
-    private changeSelectedPatientRegions(combinations:string[][]) {
+    private changeSelectedPatientRegions(combinations: string[][]) {
         this.patientSelection = combinations;
     }
 
     @autobind
-    private sampleUpsetRef(upset:UpSet|null) {
+    private sampleUpsetRef(upset: UpSet | null) {
         this.sampleUpset = upset;
     }
 
     @autobind
-    private patientUpsetRef(upset:UpSet|null) {
+    private patientUpsetRef(upset: UpSet | null) {
         this.patientUpset = upset;
     }
 
     @autobind
     @action
-    private submitSampleOverlapGroup(group:SessionGroupData, saveToUser:boolean) {
+    private submitSampleOverlapGroup(
+        group: SessionGroupData,
+        saveToUser: boolean
+    ) {
         this.props.store.addGroup(group, saveToUser);
         this.sampleSelection = [];
     }
 
     @autobind
     @action
-    private submitPatientOverlapGroup(group:SessionGroupData, saveToUser:boolean) {
+    private submitPatientOverlapGroup(
+        group: SessionGroupData,
+        saveToUser: boolean
+    ) {
         this.props.store.addGroup(group, saveToUser);
         this.patientSelection = [];
     }
 
     render() {
         return (
-            <div style={{
-                position:"relative",
-                display: `${this.props.sideBySide ? "flex" : "block"}`,
-                maxWidth: this.props.maxWidth,
-                overflow: "auto hidden",
-            }}>
-                <div style={{
-                    display:"flex",
-                    flexDirection:"column",
-                    alignItems:"center",
-                    paddingBottom:20,
-                    marginRight:this.props.sideBySide ? 10 : undefined
-                }}>
+            <div
+                style={{
+                    position: 'relative',
+                    display: `${this.props.sideBySide ? 'flex' : 'block'}`,
+                    maxWidth: this.props.maxWidth,
+                    overflow: 'auto hidden',
+                }}
+            >
+                <div
+                    style={{
+                        display: 'flex',
+                        flexDirection: 'column',
+                        alignItems: 'center',
+                        paddingBottom: 20,
+                        marginRight: this.props.sideBySide ? 10 : undefined,
+                    }}
+                >
                     <UpSet
                         ref={this.sampleUpsetRef}
                         groups={this.props.samplesVennPartition}
                         uidToGroup={this.props.uidToGroup}
                         caseType="sample"
                         title="Samples overlap"
-                        onChangeSelectedCombinations={this.changeSelectedSampleRegions}
+                        onChangeSelectedCombinations={
+                            this.changeSelectedSampleRegions
+                        }
                         selectedCombinations={this.sampleSelection}
                     />
-                    {this.sampleUpset && (this.props.samplesVennPartition.length > 0) && (
-                        <CreateGroupFromOverlap
-                            store={this.props.store}
-                            includedRegions={this.sampleSelection}
-                            submitGroup={this.submitSampleOverlapGroup}
-                            allGroupsInPlot={Object.keys(this.props.samplesVennPartition[0].key)}
-                            caseType="sample"
-                            width={this.sampleUpset.svgWidth}
-                        />
-                    )}
+                    {this.sampleUpset &&
+                        this.props.samplesVennPartition.length > 0 && (
+                            <CreateGroupFromOverlap
+                                store={this.props.store}
+                                includedRegions={this.sampleSelection}
+                                submitGroup={this.submitSampleOverlapGroup}
+                                allGroupsInPlot={Object.keys(
+                                    this.props.samplesVennPartition[0].key
+                                )}
+                                caseType="sample"
+                                width={this.sampleUpset.svgWidth}
+                            />
+                        )}
                 </div>
-                <div style={{
-                    display:"flex",
-                    flexDirection:"column",
-                    alignItems:"center"
-                }}>
+                <div
+                    style={{
+                        display: 'flex',
+                        flexDirection: 'column',
+                        alignItems: 'center',
+                    }}
+                >
                     <UpSet
                         ref={this.patientUpsetRef}
                         groups={this.props.patientsVennPartition}
                         uidToGroup={this.props.uidToGroup}
                         caseType="patient"
                         title="Patients overlap"
-                        onChangeSelectedCombinations={this.changeSelectedPatientRegions}
+                        onChangeSelectedCombinations={
+                            this.changeSelectedPatientRegions
+                        }
                         selectedCombinations={this.patientSelection}
                     />
-                    {this.patientUpset && (this.props.patientsVennPartition.length > 0) && (
-                        <CreateGroupFromOverlap
-                            store={this.props.store}
-                            includedRegions={this.patientSelection}
-                            submitGroup={this.submitPatientOverlapGroup}
-                            allGroupsInPlot={Object.keys(this.props.patientsVennPartition[0].key)}
-                            caseType="patient"
-                            width={this.patientUpset.svgWidth}
-                        />
-                    )}
+                    {this.patientUpset &&
+                        this.props.patientsVennPartition.length > 0 && (
+                            <CreateGroupFromOverlap
+                                store={this.props.store}
+                                includedRegions={this.patientSelection}
+                                submitGroup={this.submitPatientOverlapGroup}
+                                allGroupsInPlot={Object.keys(
+                                    this.props.patientsVennPartition[0].key
+                                )}
+                                caseType="patient"
+                                width={this.patientUpset.svgWidth}
+                            />
+                        )}
                 </div>
             </div>
         );
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/groupComparison/OverlapUtils.spec.tsx b/src/pages/groupComparison/OverlapUtils.spec.tsx
index b0ef509d739..b4f9d3d60ee 100644
--- a/src/pages/groupComparison/OverlapUtils.spec.tsx
+++ b/src/pages/groupComparison/OverlapUtils.spec.tsx
@@ -1,231 +1,253 @@
-import {assert} from "chai";
+import { assert } from 'chai';
 import expect from 'expect';
 import expectJSX from 'expect-jsx';
-import * as React from "react";
+import * as React from 'react';
 expect.extend(expectJSX);
 import {
     getExcludedIndexes,
     getStudiesAttrForPatientOverlapGroup,
     getStudiesAttrForSampleOverlapGroup,
     getTextColor,
-    joinGroupNames
-} from "./OverlapUtils";
-import {assertDeepEqualInAnyOrder} from "../../shared/lib/SpecUtils";
-import ComplexKeyGroupsMap from "../../shared/lib/complexKeyDataStructures/ComplexKeyGroupsMap";
-import {Sample} from "../../shared/api/generated/CBioPortalAPI";
-import _ from "lodash";
+    joinGroupNames,
+} from './OverlapUtils';
+import { assertDeepEqualInAnyOrder } from '../../shared/lib/SpecUtils';
+import ComplexKeyGroupsMap from '../../shared/lib/complexKeyDataStructures/ComplexKeyGroupsMap';
+import { Sample } from '../../shared/api/generated/CBioPortalAPI';
+import _ from 'lodash';
 
-describe("OverlapUtils", () => {
-    describe("getExcludedIndexes", ()=>{
-        it("empty input", ()=>{
-            assert.deepEqual(
-                getExcludedIndexes([], 5),
-                [0,1,2,3,4]
-            );
-            assert.deepEqual(
-                getExcludedIndexes([], 2),
-                [0,1]
-            );
-            assert.deepEqual(
-                getExcludedIndexes([], 0),
-                []
-            );
+describe('OverlapUtils', () => {
+    describe('getExcludedIndexes', () => {
+        it('empty input', () => {
+            assert.deepEqual(getExcludedIndexes([], 5), [0, 1, 2, 3, 4]);
+            assert.deepEqual(getExcludedIndexes([], 2), [0, 1]);
+            assert.deepEqual(getExcludedIndexes([], 0), []);
         });
-        it("nonempty input", ()=>{
-            assert.deepEqual(
-                getExcludedIndexes([2,4], 5),
-                [0,1,3]
-            );
-            assert.deepEqual(
-                getExcludedIndexes([1], 2),
-                [0]
-            );
-            assert.deepEqual(
-                getExcludedIndexes([0,3,1], 4),
-                [2]
-            );
+        it('nonempty input', () => {
+            assert.deepEqual(getExcludedIndexes([2, 4], 5), [0, 1, 3]);
+            assert.deepEqual(getExcludedIndexes([1], 2), [0]);
+            assert.deepEqual(getExcludedIndexes([0, 3, 1], 4), [2]);
         });
-        it("empty output", ()=>{
-            assert.deepEqual(
-                getExcludedIndexes([0,2,1], 3),
-                []
-            );
-            assert.deepEqual(
-                getExcludedIndexes([1,5,3,2,0,4], 6),
-                []
-            );
-            assert.deepEqual(
-                getExcludedIndexes([], 0),
-                []
-            );
-            assert.deepEqual(
-                getExcludedIndexes([0], 1),
-                []
-            );
-            assert.deepEqual(
-                getExcludedIndexes([0,1], 2),
-                []
-            );
+        it('empty output', () => {
+            assert.deepEqual(getExcludedIndexes([0, 2, 1], 3), []);
+            assert.deepEqual(getExcludedIndexes([1, 5, 3, 2, 0, 4], 6), []);
+            assert.deepEqual(getExcludedIndexes([], 0), []);
+            assert.deepEqual(getExcludedIndexes([0], 1), []);
+            assert.deepEqual(getExcludedIndexes([0, 1], 2), []);
         });
     });
 
-    describe("joinGroupNames", ()=>{
-        it("gives right result for several numbers of names", ()=>{
-            expect(joinGroupNames([], "conj")).toEqualJSX(
-                <span></span>
-            );
-            expect(joinGroupNames([{name:"nameA", ordinal:"1"}], "and")).toEqualJSX(
-                <span>(<strong>1</strong>)&nbsp;nameA</span>
-            );
-            expect(joinGroupNames([{name:"nameA", ordinal:"1"}, {name:"nameB", ordinal:"B"}], "and")).toEqualJSX(
-                <span><span>(<strong>1</strong>)&nbsp;nameA</span> and <span>(<strong>B</strong>)&nbsp;nameB</span></span>
-            );
-            expect(joinGroupNames([{name:"nameA", ordinal:"1"}, {name:"nameB", ordinal:"2"}, {name:"nameC", ordinal:"3"}], "and")).toEqualJSX(
-                <span><span>(<strong>1</strong>)&nbsp;nameA</span>, <span>(<strong>2</strong>)&nbsp;nameB</span>, and <span>(<strong>3</strong>)&nbsp;nameC</span></span>
-            );
-            expect(joinGroupNames([{name:"nameA", ordinal:"1"}, {name:"nameB", ordinal:"2"}, {name:"nameC", ordinal:"3"}, {name:"nameD", ordinal:"4"}], "and")).toEqualJSX(
-                <span><span>(<strong>1</strong>)&nbsp;nameA</span>, <span>(<strong>2</strong>)&nbsp;nameB</span>, <span>(<strong>3</strong>)&nbsp;nameC</span>, and <span>(<strong>4</strong>)&nbsp;nameD</span></span>
+    describe('joinGroupNames', () => {
+        it('gives right result for several numbers of names', () => {
+            expect(joinGroupNames([], 'conj')).toEqualJSX(<span></span>);
+            expect(
+                joinGroupNames([{ name: 'nameA', ordinal: '1' }], 'and')
+            ).toEqualJSX(
+                <span>
+                    (<strong>1</strong>)&nbsp;nameA
+                </span>
+            );
+            expect(
+                joinGroupNames(
+                    [
+                        { name: 'nameA', ordinal: '1' },
+                        { name: 'nameB', ordinal: 'B' },
+                    ],
+                    'and'
+                )
+            ).toEqualJSX(
+                <span>
+                    <span>
+                        (<strong>1</strong>)&nbsp;nameA
+                    </span>{' '}
+                    and{' '}
+                    <span>
+                        (<strong>B</strong>)&nbsp;nameB
+                    </span>
+                </span>
+            );
+            expect(
+                joinGroupNames(
+                    [
+                        { name: 'nameA', ordinal: '1' },
+                        { name: 'nameB', ordinal: '2' },
+                        { name: 'nameC', ordinal: '3' },
+                    ],
+                    'and'
+                )
+            ).toEqualJSX(
+                <span>
+                    <span>
+                        (<strong>1</strong>)&nbsp;nameA
+                    </span>
+                    ,{' '}
+                    <span>
+                        (<strong>2</strong>)&nbsp;nameB
+                    </span>
+                    , and{' '}
+                    <span>
+                        (<strong>3</strong>)&nbsp;nameC
+                    </span>
+                </span>
+            );
+            expect(
+                joinGroupNames(
+                    [
+                        { name: 'nameA', ordinal: '1' },
+                        { name: 'nameB', ordinal: '2' },
+                        { name: 'nameC', ordinal: '3' },
+                        { name: 'nameD', ordinal: '4' },
+                    ],
+                    'and'
+                )
+            ).toEqualJSX(
+                <span>
+                    <span>
+                        (<strong>1</strong>)&nbsp;nameA
+                    </span>
+                    ,{' '}
+                    <span>
+                        (<strong>2</strong>)&nbsp;nameB
+                    </span>
+                    ,{' '}
+                    <span>
+                        (<strong>3</strong>)&nbsp;nameC
+                    </span>
+                    , and{' '}
+                    <span>
+                        (<strong>4</strong>)&nbsp;nameD
+                    </span>
+                </span>
             );
         });
     });
 
-    describe("getTextColor", ()=>{
-        it("gives right result for basic cases", ()=>{
-            assert.equal(
-                getTextColor("#ffffff"),
-                "black"
-            );
-            assert.equal(
-                getTextColor("#d3fff5"),
-                "black"
-            );
-            assert.equal(
-                getTextColor("#fff5b9"),
-                "black"
-            );
-            assert.equal(
-                getTextColor("#000000"),
-                "white"
-            );
-            assert.equal(
-                getTextColor("#22152b"),
-                "white",
-            );
-            assert.equal(
-                getTextColor("#0f2912"),
-                "white",
-                "3"
-            );
+    describe('getTextColor', () => {
+        it('gives right result for basic cases', () => {
+            assert.equal(getTextColor('#ffffff'), 'black');
+            assert.equal(getTextColor('#d3fff5'), 'black');
+            assert.equal(getTextColor('#fff5b9'), 'black');
+            assert.equal(getTextColor('#000000'), 'white');
+            assert.equal(getTextColor('#22152b'), 'white');
+            assert.equal(getTextColor('#0f2912'), 'white', '3');
         });
-        it("gives right result for basic cases, inverted", ()=>{
-            assert.equal(
-                getTextColor("#ffffff", true),
-                "white"
-            );
-            assert.equal(
-                getTextColor("#d3fff5", true),
-                "white"
-            );
-            assert.equal(
-                getTextColor("#fff5b9", true),
-                "white"
-            );
-            assert.equal(
-                getTextColor("#000000", true),
-                "black"
-            );
-            assert.equal(
-                getTextColor("#22152b", true),
-                "black"
-            );
-            assert.equal(
-                getTextColor("#0f2912", true),
-                "black"
-            );
+        it('gives right result for basic cases, inverted', () => {
+            assert.equal(getTextColor('#ffffff', true), 'white');
+            assert.equal(getTextColor('#d3fff5', true), 'white');
+            assert.equal(getTextColor('#fff5b9', true), 'white');
+            assert.equal(getTextColor('#000000', true), 'black');
+            assert.equal(getTextColor('#22152b', true), 'black');
+            assert.equal(getTextColor('#0f2912', true), 'black');
         });
     });
 
-    describe("getStudiesAttrForSampleOverlapGroup", ()=>{
-        const groups = [{
-            uid:"group0",
-            studies:[{
-                id:"study1",
-                samples:["1", "2", "3"]
+    describe('getStudiesAttrForSampleOverlapGroup', () => {
+        const groups = [
+            {
+                uid: 'group0',
+                studies: [
+                    {
+                        id: 'study1',
+                        samples: ['1', '2', '3'],
+                    },
+                    {
+                        id: 'study2',
+                        samples: ['1', '2'],
+                    },
+                ],
             },
-                {
-                    id:"study2",
-                    samples:["1","2"]
-                }]
-        },{
-            uid:"group1",
-            studies:[{
-                id:"study1",
-                samples:["2"]
+            {
+                uid: 'group1',
+                studies: [
+                    {
+                        id: 'study1',
+                        samples: ['2'],
+                    },
+                    {
+                        id: 'study3',
+                        samples: ['1', '2', '3', '4'],
+                    },
+                ],
             },
-                {
-                    id:"study3",
-                    samples:["1","2","3","4"]
-                }]
-        },{
-            uid:"group2",
-            studies:[{
-                id:"study1",
-                samples:["1","3"]
-            }]
-        },{
-            uid:"group3",
-            studies:[{
-                id:"study3",
-                samples:["4","5"]
-            },{
-                id:"study4",
-                samples:["1","2","3"]
-            }]
-        },{
-            uid:"group4",
-            studies:[{
-                id:"study1",
-                samples:["3"]
-            }]
-        },{
-            uid:"group5",
-            studies:[{
-                id:"study4",
-                samples:["1","2","3","4"]
+            {
+                uid: 'group2',
+                studies: [
+                    {
+                        id: 'study1',
+                        samples: ['1', '3'],
+                    },
+                ],
+            },
+            {
+                uid: 'group3',
+                studies: [
+                    {
+                        id: 'study3',
+                        samples: ['4', '5'],
+                    },
+                    {
+                        id: 'study4',
+                        samples: ['1', '2', '3'],
+                    },
+                ],
             },
-                {
-                    id:"study1",
-                    samples:["4","5","6","2"]
-                },
-                {
-                    id:"study2",
-                    samples:["2","3","4"]
-                }]
-        }];
-        it("one region, 1/1 group in it", ()=>{
+            {
+                uid: 'group4',
+                studies: [
+                    {
+                        id: 'study1',
+                        samples: ['3'],
+                    },
+                ],
+            },
+            {
+                uid: 'group5',
+                studies: [
+                    {
+                        id: 'study4',
+                        samples: ['1', '2', '3', '4'],
+                    },
+                    {
+                        id: 'study1',
+                        samples: ['4', '5', '6', '2'],
+                    },
+                    {
+                        id: 'study2',
+                        samples: ['2', '3', '4'],
+                    },
+                ],
+            },
+        ];
+        it('one region, 1/1 group in it', () => {
             for (const group of groups) {
                 assert.deepEqual(
-                    getStudiesAttrForSampleOverlapGroup(groups, [[group.uid]], [group.uid]),
+                    getStudiesAttrForSampleOverlapGroup(
+                        groups,
+                        [[group.uid]],
+                        [group.uid]
+                    ),
                     group.studies,
                     group.uid
                 );
             }
         });
-        it("one region, 1/2 groups in it", ()=>{
+        it('one region, 1/2 groups in it', () => {
             assertDeepEqualInAnyOrder(
                 getStudiesAttrForSampleOverlapGroup(
                     groups,
                     [[groups[0].uid]],
                     [groups[0].uid, groups[1].uid]
                 ),
-                [{
-                    id:"study1",
-                    samples:["1","3"]
-                },{
-                    id:"study2",
-                    samples:["1","2"]
-                }],
-                "0 of 0,1"
+                [
+                    {
+                        id: 'study1',
+                        samples: ['1', '3'],
+                    },
+                    {
+                        id: 'study2',
+                        samples: ['1', '2'],
+                    },
+                ],
+                '0 of 0,1'
             );
 
             assertDeepEqualInAnyOrder(
@@ -234,157 +256,220 @@ describe("OverlapUtils", () => {
                     [[groups[1].uid]],
                     [groups[0].uid, groups[1].uid]
                 ),
-                [{
-                    id:"study3",
-                    samples:["1","2","3","4"]
-                }],
-                "1 of 0,1"
+                [
+                    {
+                        id: 'study3',
+                        samples: ['1', '2', '3', '4'],
+                    },
+                ],
+                '1 of 0,1'
             );
         });
-        it("two regions, out of 3 groups", ()=>{
+        it('two regions, out of 3 groups', () => {
             assertDeepEqualInAnyOrder(
                 getStudiesAttrForSampleOverlapGroup(
                     groups,
                     [[groups[0].uid], [groups[1].uid, groups[2].uid]],
                     [groups[0].uid, groups[1].uid, groups[2].uid]
                 ),
-                [{
-                    id:"study2",
-                    samples:["1","2"]
-                }],
-                "0 + 1,2 of 0,1,2"
+                [
+                    {
+                        id: 'study2',
+                        samples: ['1', '2'],
+                    },
+                ],
+                '0 + 1,2 of 0,1,2'
             );
         });
-        it("three regions, out of 4 groups", ()=>{
+        it('three regions, out of 4 groups', () => {
             assertDeepEqualInAnyOrder(
                 getStudiesAttrForSampleOverlapGroup(
                     groups,
-                    [[groups[5].uid, groups[3].uid], [groups[0].uid, groups[5].uid], [groups[1].uid]],
+                    [
+                        [groups[5].uid, groups[3].uid],
+                        [groups[0].uid, groups[5].uid],
+                        [groups[1].uid],
+                    ],
                     [groups[0].uid, groups[1].uid, groups[3].uid, groups[5].uid]
                 ),
-                [{
-                    id:"study4",
-                    samples:["1","2","3"]
-                },{
-                    id:"study2",
-                    samples:["2"]
-                },{
-                    id:"study3",
-                    samples:["1","2","3"]
-                }]
+                [
+                    {
+                        id: 'study4',
+                        samples: ['1', '2', '3'],
+                    },
+                    {
+                        id: 'study2',
+                        samples: ['2'],
+                    },
+                    {
+                        id: 'study3',
+                        samples: ['1', '2', '3'],
+                    },
+                ]
             );
         });
-        it("3 singleton regions, out of 3 groups", ()=>{
+        it('3 singleton regions, out of 3 groups', () => {
             assertDeepEqualInAnyOrder(
                 getStudiesAttrForSampleOverlapGroup(
                     groups,
-                    [[groups[0].uid],[groups[1].uid],[groups[2].uid]],
+                    [[groups[0].uid], [groups[1].uid], [groups[2].uid]],
                     [groups[0].uid, groups[1].uid, groups[2].uid]
                 ),
-                [{
-                    id:"study2",
-                    samples:["1","2"]
-                },{
-                    id:"study3",
-                    samples:["1","2","3","4"]
-                }]
-            )
+                [
+                    {
+                        id: 'study2',
+                        samples: ['1', '2'],
+                    },
+                    {
+                        id: 'study3',
+                        samples: ['1', '2', '3', '4'],
+                    },
+                ]
+            );
         });
     });
 
-    describe("getStudiesAttrForPatientOverlapGroup", ()=>{
-        const groups = [{
-            uid:"group0",
-            studies:[{
-                id:"study1",
-                patients:["1", "2", "3"]
+    describe('getStudiesAttrForPatientOverlapGroup', () => {
+        const groups = [
+            {
+                uid: 'group0',
+                studies: [
+                    {
+                        id: 'study1',
+                        patients: ['1', '2', '3'],
+                    },
+                    {
+                        id: 'study2',
+                        patients: ['1', '2'],
+                    },
+                ],
+            },
+            {
+                uid: 'group1',
+                studies: [
+                    {
+                        id: 'study1',
+                        patients: ['2'],
+                    },
+                    {
+                        id: 'study3',
+                        patients: ['1', '2', '3', '4'],
+                    },
+                ],
             },
             {
-                id:"study2",
-                patients:["1","2"]
-            }]
-        },{
-            uid:"group1",
-            studies:[{
-                id:"study1",
-                patients:["2"]
+                uid: 'group2',
+                studies: [
+                    {
+                        id: 'study1',
+                        patients: ['1', '3'],
+                    },
+                ],
             },
             {
-                id:"study3",
-                patients:["1","2","3","4"]
-            }]
-        },{
-            uid:"group2",
-            studies:[{
-                id:"study1",
-                patients:["1","3"]
-            }]
-        },{
-            uid:"group3",
-            studies:[{
-                id:"study3",
-                patients:["4","5"]
-            },{
-                id:"study4",
-                patients:["1","2","3"]
-            }]
-        },{
-            uid:"group4",
-            studies:[{
-                id:"study1",
-                patients:["3"]
-            }]
-        },{
-            uid:"group5",
-            studies:[{
-                id:"study4",
-                patients:["1","2","3","4"]
+                uid: 'group3',
+                studies: [
+                    {
+                        id: 'study3',
+                        patients: ['4', '5'],
+                    },
+                    {
+                        id: 'study4',
+                        patients: ['1', '2', '3'],
+                    },
+                ],
             },
             {
-                id:"study1",
-                patients:["4","5","6","2"]
+                uid: 'group4',
+                studies: [
+                    {
+                        id: 'study1',
+                        patients: ['3'],
+                    },
+                ],
             },
             {
-                id:"study2",
-                patients:["2","3","4"]
-            }]
-        }];
-        let patientToSamplesSet:ComplexKeyGroupsMap<Pick<Sample, "sampleId">>;
-        before(()=>{
-            patientToSamplesSet = new ComplexKeyGroupsMap<Pick<Sample, "sampleId">>();
-            for (const studyId of ["study1", "study2", "study3", "study4"]) {
-                for (const patientId of ["1","2","3","4","5","6"]) {
-                    if (patientId === "1") {
-                        patientToSamplesSet.add({ patientId, studyId }, {sampleId: "1.1"});
-                        patientToSamplesSet.add({ patientId, studyId }, {sampleId: "1.2"});
-                        patientToSamplesSet.add({ patientId, studyId }, {sampleId: "1.3"});
-                    } else if (patientId === "2") {
-                        patientToSamplesSet.add({ patientId, studyId }, {sampleId: "2.1"});
-                        patientToSamplesSet.add({ patientId, studyId }, {sampleId: "2.2"});
+                uid: 'group5',
+                studies: [
+                    {
+                        id: 'study4',
+                        patients: ['1', '2', '3', '4'],
+                    },
+                    {
+                        id: 'study1',
+                        patients: ['4', '5', '6', '2'],
+                    },
+                    {
+                        id: 'study2',
+                        patients: ['2', '3', '4'],
+                    },
+                ],
+            },
+        ];
+        let patientToSamplesSet: ComplexKeyGroupsMap<Pick<Sample, 'sampleId'>>;
+        before(() => {
+            patientToSamplesSet = new ComplexKeyGroupsMap<
+                Pick<Sample, 'sampleId'>
+            >();
+            for (const studyId of ['study1', 'study2', 'study3', 'study4']) {
+                for (const patientId of ['1', '2', '3', '4', '5', '6']) {
+                    if (patientId === '1') {
+                        patientToSamplesSet.add(
+                            { patientId, studyId },
+                            { sampleId: '1.1' }
+                        );
+                        patientToSamplesSet.add(
+                            { patientId, studyId },
+                            { sampleId: '1.2' }
+                        );
+                        patientToSamplesSet.add(
+                            { patientId, studyId },
+                            { sampleId: '1.3' }
+                        );
+                    } else if (patientId === '2') {
+                        patientToSamplesSet.add(
+                            { patientId, studyId },
+                            { sampleId: '2.1' }
+                        );
+                        patientToSamplesSet.add(
+                            { patientId, studyId },
+                            { sampleId: '2.2' }
+                        );
                     } else {
-                        patientToSamplesSet.add({ patientId, studyId }, {sampleId: patientId});
+                        patientToSamplesSet.add(
+                            { patientId, studyId },
+                            { sampleId: patientId }
+                        );
                     }
                 }
             }
         });
-        it("one region, 1/1 group in it", ()=>{
+        it('one region, 1/1 group in it', () => {
             for (const group of groups) {
                 assert.deepEqual(
-                    getStudiesAttrForPatientOverlapGroup(groups, [[group.uid]], [group.uid], patientToSamplesSet),
-                    group.studies.map(entry=>({ id: entry.id, samples: _.flatMap(entry.patients, patient=>{
-                        if (patient === "1") {
-                            return ["1.1", "1.2", "1.3"];
-                        } else if (patient === "2") {
-                            return ["2.1","2.2"];
-                        } else {
-                            return patient;
-                        }
-                    })})),
+                    getStudiesAttrForPatientOverlapGroup(
+                        groups,
+                        [[group.uid]],
+                        [group.uid],
+                        patientToSamplesSet
+                    ),
+                    group.studies.map(entry => ({
+                        id: entry.id,
+                        samples: _.flatMap(entry.patients, patient => {
+                            if (patient === '1') {
+                                return ['1.1', '1.2', '1.3'];
+                            } else if (patient === '2') {
+                                return ['2.1', '2.2'];
+                            } else {
+                                return patient;
+                            }
+                        }),
+                    })),
                     group.uid
                 );
             }
         });
-        it("one region, 1/2 groups in it", ()=>{
+        it('one region, 1/2 groups in it', () => {
             assertDeepEqualInAnyOrder(
                 getStudiesAttrForPatientOverlapGroup(
                     groups,
@@ -392,14 +477,17 @@ describe("OverlapUtils", () => {
                     [groups[0].uid, groups[1].uid],
                     patientToSamplesSet
                 ),
-                [{
-                    id:"study1",
-                    samples:["1.1", "1.2", "1.3" ,"3"]
-                },{
-                    id:"study2",
-                    samples:["1.1","1.2","1.3","2.1","2.2"]
-                }],
-                "0 of 0,1"
+                [
+                    {
+                        id: 'study1',
+                        samples: ['1.1', '1.2', '1.3', '3'],
+                    },
+                    {
+                        id: 'study2',
+                        samples: ['1.1', '1.2', '1.3', '2.1', '2.2'],
+                    },
+                ],
+                '0 of 0,1'
             );
 
             assertDeepEqualInAnyOrder(
@@ -409,14 +497,16 @@ describe("OverlapUtils", () => {
                     [groups[0].uid, groups[1].uid],
                     patientToSamplesSet
                 ),
-                [{
-                    id:"study3",
-                    samples:["1.1", "1.2", "1.3","2.1","2.2","3","4"]
-                }],
-                "1 of 0,1"
+                [
+                    {
+                        id: 'study3',
+                        samples: ['1.1', '1.2', '1.3', '2.1', '2.2', '3', '4'],
+                    },
+                ],
+                '1 of 0,1'
             );
         });
-        it("two regions, out of 3 groups", ()=>{
+        it('two regions, out of 3 groups', () => {
             assertDeepEqualInAnyOrder(
                 getStudiesAttrForPatientOverlapGroup(
                     groups,
@@ -424,49 +514,67 @@ describe("OverlapUtils", () => {
                     [groups[0].uid, groups[1].uid, groups[2].uid],
                     patientToSamplesSet
                 ),
-                [{
-                    id:"study2",
-                    samples:["1.1","1.2","1.3","2.1","2.2"]
-                }],
-                "0 + 1,2 of 0,1,2"
+                [
+                    {
+                        id: 'study2',
+                        samples: ['1.1', '1.2', '1.3', '2.1', '2.2'],
+                    },
+                ],
+                '0 + 1,2 of 0,1,2'
             );
         });
-        it("three regions, out of 4 groups", ()=>{
+        it('three regions, out of 4 groups', () => {
             assertDeepEqualInAnyOrder(
                 getStudiesAttrForPatientOverlapGroup(
                     groups,
-                    [[groups[5].uid, groups[3].uid], [groups[0].uid, groups[5].uid], [groups[1].uid]],
-                    [groups[0].uid, groups[1].uid, groups[3].uid, groups[5].uid],
+                    [
+                        [groups[5].uid, groups[3].uid],
+                        [groups[0].uid, groups[5].uid],
+                        [groups[1].uid],
+                    ],
+                    [
+                        groups[0].uid,
+                        groups[1].uid,
+                        groups[3].uid,
+                        groups[5].uid,
+                    ],
                     patientToSamplesSet
                 ),
-                [{
-                    id:"study4",
-                    samples:["1.1","1.2","1.3","2.1","2.2","3"]
-                },{
-                    id:"study2",
-                    samples:["2.1","2.2"]
-                },{
-                    id:"study3",
-                    samples:["1.1","1.2","1.3","2.1","2.2","3"]
-                }]
+                [
+                    {
+                        id: 'study4',
+                        samples: ['1.1', '1.2', '1.3', '2.1', '2.2', '3'],
+                    },
+                    {
+                        id: 'study2',
+                        samples: ['2.1', '2.2'],
+                    },
+                    {
+                        id: 'study3',
+                        samples: ['1.1', '1.2', '1.3', '2.1', '2.2', '3'],
+                    },
+                ]
             );
         });
-        it("3 singleton regions, out of 3 groups", ()=>{
+        it('3 singleton regions, out of 3 groups', () => {
             assertDeepEqualInAnyOrder(
                 getStudiesAttrForPatientOverlapGroup(
                     groups,
-                    [[groups[0].uid],[groups[1].uid],[groups[2].uid]],
+                    [[groups[0].uid], [groups[1].uid], [groups[2].uid]],
                     [groups[0].uid, groups[1].uid, groups[2].uid],
                     patientToSamplesSet
                 ),
-                [{
-                    id:"study2",
-                    samples:["1.1","1.2","1.3","2.1","2.2"]
-                },{
-                    id:"study3",
-                    samples:["1.1","1.2","1.3","2.1","2.2","3","4"]
-                }]
-            )
+                [
+                    {
+                        id: 'study2',
+                        samples: ['1.1', '1.2', '1.3', '2.1', '2.2'],
+                    },
+                    {
+                        id: 'study3',
+                        samples: ['1.1', '1.2', '1.3', '2.1', '2.2', '3', '4'],
+                    },
+                ]
+            );
         });
     });
-});
\ No newline at end of file
+});
diff --git a/src/pages/groupComparison/OverlapUtils.tsx b/src/pages/groupComparison/OverlapUtils.tsx
index 326699db18e..ad7755e474b 100644
--- a/src/pages/groupComparison/OverlapUtils.tsx
+++ b/src/pages/groupComparison/OverlapUtils.tsx
@@ -1,7 +1,7 @@
-import * as React from "react";
-import * as d3 from "d3";
-import _ from "lodash";
-import {SessionGroupData} from "../../shared/api/ComparisonGroupClient";
+import * as React from 'react';
+import * as d3 from 'd3';
+import _ from 'lodash';
+import { SessionGroupData } from '../../shared/api/ComparisonGroupClient';
 import {
     ComparisonGroup,
     convertPatientsStudiesAttrToSamples,
@@ -10,23 +10,23 @@ import {
     intersectPatients,
     intersectSamples,
     unionPatients,
-    unionSamples
-} from "./GroupComparisonUtils";
-import ComplexKeyGroupsMap from "../../shared/lib/complexKeyDataStructures/ComplexKeyGroupsMap";
-import {Sample} from "../../shared/api/generated/CBioPortalAPI";
+    unionSamples,
+} from './GroupComparisonUtils';
+import ComplexKeyGroupsMap from '../../shared/lib/complexKeyDataStructures/ComplexKeyGroupsMap';
+import { Sample } from '../../shared/api/generated/CBioPortalAPI';
 
-export function regionIsSelected<T extends string|number>(
-    regionComb:T[],
-    selectedRegions:T[][]
+export function regionIsSelected<T extends string | number>(
+    regionComb: T[],
+    selectedRegions: T[][]
 ) {
-    return selectedRegions.find(r=>_.isEqual(r, regionComb));
+    return selectedRegions.find(r => _.isEqual(r, regionComb));
 }
 
-export function toggleRegionSelected<T extends string|number>(
-    regionComb:T[],
-    selectedRegions:T[][]
+export function toggleRegionSelected<T extends string | number>(
+    regionComb: T[],
+    selectedRegions: T[][]
 ) {
-    const withoutComb = selectedRegions.filter(r=>!_.isEqual(r, regionComb));
+    const withoutComb = selectedRegions.filter(r => !_.isEqual(r, regionComb));
     if (withoutComb.length === selectedRegions.length) {
         // combination currently not selected, so add it
         return selectedRegions.concat([regionComb]);
@@ -36,11 +36,14 @@ export function toggleRegionSelected<T extends string|number>(
     }
 }
 
-export function getExcludedIndexes(combination:number[], numGroupsTotal:number) {
+export function getExcludedIndexes(
+    combination: number[],
+    numGroupsTotal: number
+) {
     // get all indexes not in the given combination
 
     const excl = [];
-    for (let i=0; i<numGroupsTotal; i++) {
+    for (let i = 0; i < numGroupsTotal; i++) {
         if (!combination.includes(i)) {
             excl.push(i);
         }
@@ -48,7 +51,9 @@ export function getExcludedIndexes(combination:number[], numGroupsTotal:number)
     return excl;
 }
 
-export function renderGroupNameWithOrdinal(group:Pick<ComparisonGroup, "name"|"ordinal">) {
+export function renderGroupNameWithOrdinal(
+    group: Pick<ComparisonGroup, 'name' | 'ordinal'>
+) {
     return (
         <span>
             (<strong>{group.ordinal}</strong>)&nbsp;{group.name}
@@ -56,7 +61,10 @@ export function renderGroupNameWithOrdinal(group:Pick<ComparisonGroup, "name"|"o
     );
 }
 
-export function joinGroupNames(groups:Pick<ComparisonGroup, "name"|"ordinal">[], conj:string) {
+export function joinGroupNames(
+    groups: Pick<ComparisonGroup, 'name' | 'ordinal'>[],
+    conj: string
+) {
     const names = groups.map(renderGroupNameWithOrdinal);
     switch (names.length) {
         case 0:
@@ -64,14 +72,23 @@ export function joinGroupNames(groups:Pick<ComparisonGroup, "name"|"ordinal">[],
         case 1:
             return names[0];
         case 2:
-            return <span>{names[0]} {conj} {names[1]}</span>;
+            return (
+                <span>
+                    {names[0]} {conj} {names[1]}
+                </span>
+            );
         default:
-            const beforeConj = names.slice(0, names.length-1);
-            return <span>{beforeConj.map(name=>[name,", "])}{conj} {names[names.length-1]}</span>;
+            const beforeConj = names.slice(0, names.length - 1);
+            return (
+                <span>
+                    {beforeConj.map(name => [name, ', '])}
+                    {conj} {names[names.length - 1]}
+                </span>
+            );
     }
 }
 
-export function blendColors(colors:string[]) {
+export function blendColors(colors: string[]) {
     // helper function for venn diagram drawing. In order to highlight set complements,
     //  we draw things from the bottom up - the visual exclusion simulates the complement,
     //  even though we don't explicitly draw the set complements in SVG. In order to make
@@ -80,24 +97,28 @@ export function blendColors(colors:string[]) {
 
     // TL;DR: We use this function to blend colors between groups, for the intersection regions.
 
-    if(colors.length == 1){
-        return colors[0]; 
+    if (colors.length == 1) {
+        return colors[0];
     }
-    // blend between the first two, 
+    // blend between the first two,
     // then iteratively blend the next one with the previously blended color
-    return _.reduce(colors.slice(2), (blendedColor, nextColor) => {
-        return d3.interpolateLab(blendedColor, nextColor)(0.5);
-    }, d3.interpolateLab(colors[0], colors[1])(0.5));
+    return _.reduce(
+        colors.slice(2),
+        (blendedColor, nextColor) => {
+            return d3.interpolateLab(blendedColor, nextColor)(0.5);
+        },
+        d3.interpolateLab(colors[0], colors[1])(0.5)
+    );
 }
 
 export function getTextColor(
-    backgroundColor:string,
-    inverse:boolean=false
+    backgroundColor: string,
+    inverse: boolean = false
 ) {
-    const colors = ["black", "white"];
+    const colors = ['black', 'white'];
     let colorIndex = 1;
     const rgb = d3.rgb(backgroundColor);
-    const luminance = 0.299*rgb.r + 0.587*rgb.g + 0.114*rgb.b;
+    const luminance = 0.299 * rgb.r + 0.587 * rgb.g + 0.114 * rgb.b;
     if (luminance > 186) {
         // if luminance is high, use black text
         // https://stackoverflow.com/questions/3942878/how-to-decide-font-color-in-white-or-black-depending-on-background-color
@@ -110,23 +131,31 @@ export function getTextColor(
 }
 
 export function getStudiesAttrForSampleOverlapGroup(
-    availableGroups:(Pick<ComparisonGroup, "uid">&Pick<SessionGroupData,"studies">)[],
-    includedRegions:string[][], // uid[][],
-    allGroupsInPlot:string[] // uid[]
+    availableGroups: (Pick<ComparisonGroup, 'uid'> &
+        Pick<SessionGroupData, 'studies'>)[],
+    includedRegions: string[][], // uid[][],
+    allGroupsInPlot: string[] // uid[]
 ) {
     // compute set operations to find contents
-    const groups = _.keyBy(availableGroups, g=>g.uid);
-    let studiesAttr:SessionGroupData["studies"] = [];
+    const groups = _.keyBy(availableGroups, g => g.uid);
+    let studiesAttr: SessionGroupData['studies'] = [];
     for (const region of includedRegions) {
-        let regionStudiesAttr:SessionGroupData["studies"] = groups[region[0]].studies;
+        let regionStudiesAttr: SessionGroupData['studies'] =
+            groups[region[0]].studies;
         // intersect
-        for (let i=1; i<region.length; i++) {
-            regionStudiesAttr = intersectSamples(regionStudiesAttr, groups[region[i]].studies);
+        for (let i = 1; i < region.length; i++) {
+            regionStudiesAttr = intersectSamples(
+                regionStudiesAttr,
+                groups[region[i]].studies
+            );
         }
         // exclude
         for (const uid of allGroupsInPlot) {
             if (!region.includes(uid)) {
-                regionStudiesAttr = excludeSamples(regionStudiesAttr, groups[uid].studies);
+                regionStudiesAttr = excludeSamples(
+                    regionStudiesAttr,
+                    groups[uid].studies
+                );
             }
         }
         studiesAttr = unionSamples(studiesAttr, regionStudiesAttr);
@@ -135,27 +164,39 @@ export function getStudiesAttrForSampleOverlapGroup(
 }
 
 export function getStudiesAttrForPatientOverlapGroup(
-    availableGroups:(Pick<ComparisonGroup, "uid">&{ studies: {id:string, patients:string[]}[]})[],
-    includedRegions:string[][], // uid[][]
-    allGroupsInVenn:string[], // uid[]
-    patientToSamplesSet:ComplexKeyGroupsMap<Pick<Sample, "sampleId">>
+    availableGroups: (Pick<ComparisonGroup, 'uid'> & {
+        studies: { id: string; patients: string[] }[];
+    })[],
+    includedRegions: string[][], // uid[][]
+    allGroupsInVenn: string[], // uid[]
+    patientToSamplesSet: ComplexKeyGroupsMap<Pick<Sample, 'sampleId'>>
 ) {
     // compute set operations to find contents
-    const groups = _.keyBy(availableGroups, g=>g.uid);
-    let studiesAttr:{ id:string, patients:string[]}[] = [];
+    const groups = _.keyBy(availableGroups, g => g.uid);
+    let studiesAttr: { id: string; patients: string[] }[] = [];
     for (const region of includedRegions) {
-        let regionStudiesAttr:{ id:string, patients:string[]}[] = groups[region[0]].studies;
+        let regionStudiesAttr: { id: string; patients: string[] }[] =
+            groups[region[0]].studies;
         // intersect
-        for (let i=1; i<region.length; i++) {
-            regionStudiesAttr = intersectPatients(regionStudiesAttr, groups[region[i]].studies);
+        for (let i = 1; i < region.length; i++) {
+            regionStudiesAttr = intersectPatients(
+                regionStudiesAttr,
+                groups[region[i]].studies
+            );
         }
         // exclude
         for (const uid of allGroupsInVenn) {
             if (!region.includes(uid)) {
-                regionStudiesAttr = excludePatients(regionStudiesAttr, groups[uid].studies);
+                regionStudiesAttr = excludePatients(
+                    regionStudiesAttr,
+                    groups[uid].studies
+                );
             }
         }
         studiesAttr = unionPatients(studiesAttr, regionStudiesAttr);
     }
-    return convertPatientsStudiesAttrToSamples(studiesAttr, patientToSamplesSet);
-}
\ No newline at end of file
+    return convertPatientsStudiesAttrToSamples(
+        studiesAttr,
+        patientToSamplesSet
+    );
+}
diff --git a/src/pages/groupComparison/OverlapVenn.tsx b/src/pages/groupComparison/OverlapVenn.tsx
index 41f23b8bb73..a9b0a329162 100644
--- a/src/pages/groupComparison/OverlapVenn.tsx
+++ b/src/pages/groupComparison/OverlapVenn.tsx
@@ -1,15 +1,15 @@
 import * as React from 'react';
-import { observer } from "mobx-react";
+import { observer } from 'mobx-react';
 import { VictoryLabel, VictoryLegend } from 'victory';
 import CBIOPORTAL_VICTORY_THEME from 'shared/theme/cBioPoralTheme';
-import {action, computed, observable} from 'mobx';
-import {ComparisonGroup} from './GroupComparisonUtils';
-import RectangleVennDiagram from "./rectangleVennDiagram/RectangleVennDiagram";
-import CreateGroupFromOverlap from "./CreateGroupFromOverlap";
-import GroupComparisonStore from "./GroupComparisonStore";
-import autobind from "autobind-decorator";
-import {SessionGroupData} from "../../shared/api/ComparisonGroupClient";
-import {GroupLegendLabelComponent} from "./labelComponents/GroupLegendLabelComponent";
+import { action, computed, observable } from 'mobx';
+import { ComparisonGroup } from './GroupComparisonUtils';
+import RectangleVennDiagram from './rectangleVennDiagram/RectangleVennDiagram';
+import CreateGroupFromOverlap from './CreateGroupFromOverlap';
+import GroupComparisonStore from './GroupComparisonStore';
+import autobind from 'autobind-decorator';
+import { SessionGroupData } from '../../shared/api/ComparisonGroupClient';
+import { GroupLegendLabelComponent } from './labelComponents/GroupLegendLabelComponent';
 
 export interface IVennProps {
     svgId?: string;
@@ -22,8 +22,8 @@ export interface IVennProps {
         cases: string[];
     }[];
     uidToGroup: { [uid: string]: ComparisonGroup };
-    store:GroupComparisonStore;
-    onLayoutFailure:()=>void;
+    store: GroupComparisonStore;
+    onLayoutFailure: () => void;
 }
 
 const VENN_PLOT_WIDTH = 400;
@@ -34,16 +34,17 @@ const LEGEND_WIDTH = 180;
 
 @observer
 export default class Venn extends React.Component<IVennProps, {}> {
-
     @observable.shallow sampleSelection = {
-        regions:[] as number[][]
+        regions: [] as number[][],
     };
     @observable.shallow patientSelection = {
-        regions:[] as number[][]
+        regions: [] as number[][],
     };
 
     @computed get chartWidth() {
-        return this.vennPlotAreaWidth + PADDING_BTWN_VENN_AND_LEGEND + LEGEND_WIDTH;
+        return (
+            this.vennPlotAreaWidth + PADDING_BTWN_VENN_AND_LEGEND + LEGEND_WIDTH
+        );
     }
 
     @computed get chartHeight() {
@@ -52,70 +53,90 @@ export default class Venn extends React.Component<IVennProps, {}> {
 
     @autobind
     @action
-    private submitSampleOverlapGroup(group:SessionGroupData, saveToUser:boolean) {
+    private submitSampleOverlapGroup(
+        group: SessionGroupData,
+        saveToUser: boolean
+    ) {
         this.props.store.addGroup(group, saveToUser);
         this.sampleSelection.regions = [];
     }
 
     @autobind
     @action
-    private submitPatientOverlapGroup(group:SessionGroupData, saveToUser:boolean) {
+    private submitPatientOverlapGroup(
+        group: SessionGroupData,
+        saveToUser: boolean
+    ) {
         this.props.store.addGroup(group, saveToUser);
         this.patientSelection.regions = [];
     }
 
     @autobind
     @action
-    private changeSelectedSampleRegions(regions:number[][]) {
+    private changeSelectedSampleRegions(regions: number[][]) {
         this.sampleSelection.regions = regions;
     }
 
     @autobind
     @action
-    private changeSelectedPatientRegions(regions:number[][]) {
+    private changeSelectedPatientRegions(regions: number[][]) {
         this.patientSelection.regions = regions;
     }
 
     @computed get sampleGroupUids() {
-        return this.props.sampleGroups.map(g=>g.uid);
+        return this.props.sampleGroups.map(g => g.uid);
     }
 
     @computed get patientGroupUids() {
-        return this.props.patientGroups.map(g=>g.uid);
+        return this.props.patientGroups.map(g => g.uid);
     }
 
     @computed get legendData() {
-        return this.props.sampleGroups.map(sampleGroup=>{
+        return this.props.sampleGroups.map(sampleGroup => {
             return {
                 name: sampleGroup.uid,
-                symbol: { fill: this.props.uidToGroup[sampleGroup.uid].color, strokeOpacity:0, type:"square", size: 6 }
-            }
+                symbol: {
+                    fill: this.props.uidToGroup[sampleGroup.uid].color,
+                    strokeOpacity: 0,
+                    type: 'square',
+                    size: 6,
+                },
+            };
         });
     }
 
     @computed get vennPlotAreaWidth() {
-        return 2*VENN_PLOT_WIDTH + PADDING_BTWN_SAMPLE_AND_PATIENT;
+        return 2 * VENN_PLOT_WIDTH + PADDING_BTWN_SAMPLE_AND_PATIENT;
     }
 
     @computed get sampleSelectedRegionsUids() {
-        return this.sampleSelection.regions.map(comb=>comb.map(index=>{
-            return this.props.sampleGroups[index].uid;
-        }));
+        return this.sampleSelection.regions.map(comb =>
+            comb.map(index => {
+                return this.props.sampleGroups[index].uid;
+            })
+        );
     }
     @computed get patientSelectedRegionsUids() {
-        return this.patientSelection.regions.map(comb=>comb.map(index=>{
-            return this.props.patientGroups[index].uid;
-        }));
+        return this.patientSelection.regions.map(comb =>
+            comb.map(index => {
+                return this.props.patientGroups[index].uid;
+            })
+        );
     }
 
     public render() {
         return (
-            <div style={{
-                position:"relative",
-                paddingBottom:`${Math.max(this.sampleSelection.regions.length, this.patientSelection.regions.length) + 1}em`
-            }}>
+            <div
+                style={{
+                    position: 'relative',
+                    paddingBottom: `${Math.max(
+                        this.sampleSelection.regions.length,
+                        this.patientSelection.regions.length
+                    ) + 1}em`,
+                }}
+            >
                 <svg
-                    id={this.props.svgId || ""}
+                    id={this.props.svgId || ''}
                     xmlns="http://www.w3.org/2000/svg"
                     width={this.chartWidth}
                     height={this.chartHeight}
@@ -124,10 +145,10 @@ export default class Venn extends React.Component<IVennProps, {}> {
                 >
                     <VictoryLabel
                         style={{
-                            fontWeight: "bold",
-                            fontFamily: "Verdana,Arial,sans-serif",
-                            textAnchor: "middle",
-                            userSelect:"none"
+                            fontWeight: 'bold',
+                            fontFamily: 'Verdana,Arial,sans-serif',
+                            textAnchor: 'middle',
+                            userSelect: 'none',
                         }}
                         x={VENN_PLOT_WIDTH / 2}
                         y="1.2em"
@@ -142,41 +163,48 @@ export default class Venn extends React.Component<IVennProps, {}> {
                         width={VENN_PLOT_WIDTH}
                         height={VENN_PLOT_HEIGHT}
                         selection={this.sampleSelection}
-                        onChangeSelectedRegions={this.changeSelectedSampleRegions}
+                        onChangeSelectedRegions={
+                            this.changeSelectedSampleRegions
+                        }
                         caseType="sample"
                         onLayoutFailure={this.props.onLayoutFailure}
                     />
 
                     <VictoryLabel
                         style={{
-                            fontWeight: "bold",
-                            fontFamily: "Verdana,Arial,sans-serif",
-                            textAnchor: "middle",
-                            userSelect:"none"
+                            fontWeight: 'bold',
+                            fontFamily: 'Verdana,Arial,sans-serif',
+                            textAnchor: 'middle',
+                            userSelect: 'none',
                         }}
                         x={VENN_PLOT_WIDTH / 2}
-                        dx={VENN_PLOT_WIDTH+PADDING_BTWN_SAMPLE_AND_PATIENT}
+                        dx={VENN_PLOT_WIDTH + PADDING_BTWN_SAMPLE_AND_PATIENT}
                         y="1.2em"
                         text={'Patients overlap'}
                     />
 
                     <RectangleVennDiagram
                         uid="patients"
-                        x={VENN_PLOT_WIDTH+PADDING_BTWN_SAMPLE_AND_PATIENT}
+                        x={VENN_PLOT_WIDTH + PADDING_BTWN_SAMPLE_AND_PATIENT}
                         y={15}
                         groups={this.props.patientGroups}
                         uidToGroup={this.props.uidToGroup}
                         width={VENN_PLOT_WIDTH}
                         height={VENN_PLOT_HEIGHT}
                         selection={this.patientSelection}
-                        onChangeSelectedRegions={this.changeSelectedPatientRegions}
+                        onChangeSelectedRegions={
+                            this.changeSelectedPatientRegions
+                        }
                         caseType="patient"
                         onLayoutFailure={this.props.onLayoutFailure}
                     />
 
                     {this.legendData.length > 0 && (
                         <VictoryLegend
-                            x={this.vennPlotAreaWidth + PADDING_BTWN_VENN_AND_LEGEND}
+                            x={
+                                this.vennPlotAreaWidth +
+                                PADDING_BTWN_VENN_AND_LEGEND
+                            }
                             y={100}
                             theme={CBIOPORTAL_VICTORY_THEME}
                             labelComponent={
@@ -195,9 +223,9 @@ export default class Venn extends React.Component<IVennProps, {}> {
                     store={this.props.store}
                     includedRegions={this.sampleSelectedRegionsUids}
                     style={{
-                        position:"absolute",
-                        left:0,
-                        top:VENN_PLOT_HEIGHT + 20
+                        position: 'absolute',
+                        left: 0,
+                        top: VENN_PLOT_HEIGHT + 20,
                     }}
                     submitGroup={this.submitSampleOverlapGroup}
                     allGroupsInPlot={this.sampleGroupUids}
@@ -208,9 +236,9 @@ export default class Venn extends React.Component<IVennProps, {}> {
                     store={this.props.store}
                     includedRegions={this.patientSelectedRegionsUids}
                     style={{
-                        position:"absolute",
-                        left:VENN_PLOT_WIDTH + PADDING_BTWN_SAMPLE_AND_PATIENT,
-                        top:VENN_PLOT_HEIGHT + 20
+                        position: 'absolute',
+                        left: VENN_PLOT_WIDTH + PADDING_BTWN_SAMPLE_AND_PATIENT,
+                        top: VENN_PLOT_HEIGHT + 20,
                     }}
                     submitGroup={this.submitPatientOverlapGroup}
                     allGroupsInPlot={this.patientGroupUids}
diff --git a/src/pages/groupComparison/ProteinEnrichments.tsx b/src/pages/groupComparison/ProteinEnrichments.tsx
index f2b8c554e00..e41e8f1f68d 100644
--- a/src/pages/groupComparison/ProteinEnrichments.tsx
+++ b/src/pages/groupComparison/ProteinEnrichments.tsx
@@ -1,60 +1,83 @@
-import * as React from "react";
-import {observer} from "mobx-react";
-import autobind from "autobind-decorator";
-import {MolecularProfile} from "../../shared/api/generated/CBioPortalAPI";
-import {MakeMobxView} from "../../shared/components/MobxView";
-import EnrichmentsDataSetDropdown from "../resultsView/enrichments/EnrichmentsDataSetDropdown";
-import ExpressionEnrichmentContainer from "../resultsView/enrichments/ExpressionEnrichmentsContainer";
-import Loader from "../../shared/components/loadingIndicator/LoadingIndicator";
-import ErrorMessage from "../../shared/components/ErrorMessage";
-import GroupComparisonStore from "./GroupComparisonStore";
-import {MakeEnrichmentsTabUI} from "./GroupComparisonUtils";
-import { remoteData } from "cbioportal-frontend-commons";
-import * as _ from "lodash";
+import * as React from 'react';
+import { observer } from 'mobx-react';
+import autobind from 'autobind-decorator';
+import { MolecularProfile } from '../../shared/api/generated/CBioPortalAPI';
+import { MakeMobxView } from '../../shared/components/MobxView';
+import EnrichmentsDataSetDropdown from '../resultsView/enrichments/EnrichmentsDataSetDropdown';
+import ExpressionEnrichmentContainer from '../resultsView/enrichments/ExpressionEnrichmentsContainer';
+import Loader from '../../shared/components/loadingIndicator/LoadingIndicator';
+import ErrorMessage from '../../shared/components/ErrorMessage';
+import GroupComparisonStore from './GroupComparisonStore';
+import { MakeEnrichmentsTabUI } from './GroupComparisonUtils';
+import { remoteData } from 'cbioportal-frontend-commons';
+import * as _ from 'lodash';
 
 export interface IProteinEnrichmentsProps {
-    store: GroupComparisonStore
+    store: GroupComparisonStore;
 }
 
 @observer
-export default class ProteinEnrichments extends React.Component<IProteinEnrichmentsProps, {}> {
+export default class ProteinEnrichments extends React.Component<
+    IProteinEnrichmentsProps,
+    {}
+> {
     @autobind
-    private onChangeProfile(profileMap:{[studyId:string]:MolecularProfile}) {
+    private onChangeProfile(profileMap: {
+        [studyId: string]: MolecularProfile;
+    }) {
         this.props.store.setProteinEnrichmentProfileMap(profileMap);
     }
 
     private readonly proteinEnrichmentAnalysisGroups = remoteData({
         await: () => [this.props.store.enrichmentAnalysisGroups],
         invoke: () => {
-            return Promise.resolve(_.map(this.props.store.enrichmentAnalysisGroups.result, group => {
-                return {
-                    ...group,
-                    description: `samples in ${group.name}`
-                }
-            }));
-        }
+            return Promise.resolve(
+                _.map(
+                    this.props.store.enrichmentAnalysisGroups.result,
+                    group => {
+                        return {
+                            ...group,
+                            description: `samples in ${group.name}`,
+                        };
+                    }
+                )
+            );
+        },
     });
 
-    readonly tabUI = MakeEnrichmentsTabUI(()=>this.props.store, ()=>this.enrichmentsUI, "protein", true, true, false);
+    readonly tabUI = MakeEnrichmentsTabUI(
+        () => this.props.store,
+        () => this.enrichmentsUI,
+        'protein',
+        true,
+        true,
+        false
+    );
 
     readonly enrichmentsUI = MakeMobxView({
-        await:()=>[
+        await: () => [
             this.props.store.proteinEnrichmentData,
             this.props.store.selectedProteinEnrichmentProfileMap,
             this.proteinEnrichmentAnalysisGroups,
-            this.props.store.studies
+            this.props.store.studies,
         ],
-        render:()=>{
+        render: () => {
             // since protein enrichments tab is enabled only for one study, selectedProteinEnrichmentProfileMap
             // would contain only one key.
-            const studyIds = Object.keys(this.props.store.selectedProteinEnrichmentProfileMap.result!);
-            const selectedProfile = this.props.store.selectedProteinEnrichmentProfileMap.result![studyIds[0]];
+            const studyIds = Object.keys(
+                this.props.store.selectedProteinEnrichmentProfileMap.result!
+            );
+            const selectedProfile = this.props.store
+                .selectedProteinEnrichmentProfileMap.result![studyIds[0]];
             return (
                 <div data-test="GroupComparisonProteinEnrichments">
                     <EnrichmentsDataSetDropdown
                         dataSets={this.props.store.proteinEnrichmentProfiles}
                         onChange={this.onChangeProfile}
-                        selectedProfileByStudyId={this.props.store.selectedProteinEnrichmentProfileMap.result!}
+                        selectedProfileByStudyId={
+                            this.props.store.selectedProteinEnrichmentProfileMap
+                                .result!
+                        }
                         alwaysShow={true}
                         studies={this.props.store.studies.result!}
                     />
@@ -63,16 +86,20 @@ export default class ProteinEnrichments extends React.Component<IProteinEnrichme
                         groups={this.proteinEnrichmentAnalysisGroups.result}
                         selectedProfile={selectedProfile}
                         alteredVsUnalteredMode={false}
-                        sampleKeyToSample={this.props.store.sampleKeyToSample.result!}
+                        sampleKeyToSample={
+                            this.props.store.sampleKeyToSample.result!
+                        }
                     />
                 </div>
             );
         },
-        renderPending:()=><Loader center={true} isLoading={true} size={"big"}/>,
-        renderError:()=><ErrorMessage/>
+        renderPending: () => (
+            <Loader center={true} isLoading={true} size={'big'} />
+        ),
+        renderError: () => <ErrorMessage />,
     });
 
     render() {
         return this.tabUI.component;
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/groupComparison/Survival.tsx b/src/pages/groupComparison/Survival.tsx
index f5f08e1d53b..3f0b269f3cd 100644
--- a/src/pages/groupComparison/Survival.tsx
+++ b/src/pages/groupComparison/Survival.tsx
@@ -1,143 +1,199 @@
 import * as React from 'react';
-import SurvivalChart from "../resultsView/survival/SurvivalChart";
+import SurvivalChart from '../resultsView/survival/SurvivalChart';
 import 'react-rangeslider/lib/index.css';
-import LoadingIndicator from "shared/components/loadingIndicator/LoadingIndicator";
-import {observer} from "mobx-react";
-import GroupComparisonStore, {OverlapStrategy} from './GroupComparisonStore';
-import {DefaultTooltip, remoteData} from 'cbioportal-frontend-commons';
-import {MakeMobxView} from "../../shared/components/MobxView";
-import {SURVIVAL_NOT_ENOUGH_GROUPS_MSG, SURVIVAL_TOO_MANY_GROUPS_MSG} from "./GroupComparisonUtils";
-import ErrorMessage from "../../shared/components/ErrorMessage";
-import {blendColors} from "./OverlapUtils";
-import OverlapExclusionIndicator from "./OverlapExclusionIndicator";
-import {getPatientIdentifiers} from "../studyView/StudyViewUtils";
+import LoadingIndicator from 'shared/components/loadingIndicator/LoadingIndicator';
+import { observer } from 'mobx-react';
+import GroupComparisonStore, { OverlapStrategy } from './GroupComparisonStore';
+import { DefaultTooltip, remoteData } from 'cbioportal-frontend-commons';
+import { MakeMobxView } from '../../shared/components/MobxView';
+import {
+    SURVIVAL_NOT_ENOUGH_GROUPS_MSG,
+    SURVIVAL_TOO_MANY_GROUPS_MSG,
+} from './GroupComparisonUtils';
+import ErrorMessage from '../../shared/components/ErrorMessage';
+import { blendColors } from './OverlapUtils';
+import OverlapExclusionIndicator from './OverlapExclusionIndicator';
+import { getPatientIdentifiers } from '../studyView/StudyViewUtils';
 import _ from 'lodash';
 import SurvivalDescriptionTable from 'pages/resultsView/survival/SurvivalDescriptionTable';
 import {
     GroupLegendLabelComponent,
-    SurvivalTabGroupLegendLabelComponent
-} from "./labelComponents/GroupLegendLabelComponent";
+    SurvivalTabGroupLegendLabelComponent,
+} from './labelComponents/GroupLegendLabelComponent';
 
 export interface ISurvivalProps {
-    store: GroupComparisonStore
+    store: GroupComparisonStore;
 }
 
 @observer
 export default class Survival extends React.Component<ISurvivalProps, {}> {
-
     private overallSurvivalTitleText = 'Overall Survival Kaplan-Meier Estimate';
-    private diseaseFreeSurvivalTitleText = 'Disease/Progression-free Kaplan-Meier Estimate';
-    private multipleDescriptionWarningMessageWithoutTooltip = "The survival data on patients from different cohorts may have been defined by ";
-    private multipleDescriptionWarningMessageWithTooltip = "different criteria.";
-    private differentDescriptionExistMessage = "Different descriptions of survival data were used for different studies.";
+    private diseaseFreeSurvivalTitleText =
+        'Disease/Progression-free Kaplan-Meier Estimate';
+    private multipleDescriptionWarningMessageWithoutTooltip =
+        'The survival data on patients from different cohorts may have been defined by ';
+    private multipleDescriptionWarningMessageWithTooltip =
+        'different criteria.';
+    private differentDescriptionExistMessage =
+        'Different descriptions of survival data were used for different studies.';
 
     public readonly analysisGroupsComputations = remoteData({
         await: () => [
             this.props.store.activeGroups,
             this.props.store.patientsVennPartition,
             this.props.store.uidToGroup,
-            this.props.store.patientToSamplesSet
+            this.props.store.patientToSamplesSet,
         ],
         invoke: () => {
-            const orderedActiveGroupUidSet = _.reduce(this.props.store._activeGroupsNotOverlapRemoved.result!, (acc, next, index) => {
-                acc[next.uid] = index;
-                return acc;
-            }, {} as { [id: string]: number });
+            const orderedActiveGroupUidSet = _.reduce(
+                this.props.store._activeGroupsNotOverlapRemoved.result!,
+                (acc, next, index) => {
+                    acc[next.uid] = index;
+                    return acc;
+                },
+                {} as { [id: string]: number }
+            );
             const partition = this.props.store.patientsVennPartition.result!;
 
             // ascending sort partition bases on number of groups in each parition.
             // if they are equal then sort based on the give order of groups
             partition.sort((a, b) => {
-                const aUids = Object.keys(a.key).filter(uid=>a.key[uid]);
-                const bUids = Object.keys(b.key).filter(uid=>b.key[uid]);
+                const aUids = Object.keys(a.key).filter(uid => a.key[uid]);
+                const bUids = Object.keys(b.key).filter(uid => b.key[uid]);
                 if (aUids.length !== bUids.length) {
                     return aUids.length - bUids.length;
                 }
-                const aCount = _.sumBy(aUids, uid=>orderedActiveGroupUidSet[uid])
-                const bCount = _.sumBy(bUids, uid=>orderedActiveGroupUidSet[uid])
+                const aCount = _.sumBy(
+                    aUids,
+                    uid => orderedActiveGroupUidSet[uid]
+                );
+                const bCount = _.sumBy(
+                    bUids,
+                    uid => orderedActiveGroupUidSet[uid]
+                );
                 return aCount - bCount;
             });
             const uidToGroup = this.props.store.uidToGroup.result!;
             const analysisGroups = [];
-            const patientToAnalysisGroups:{[patientKey:string]:string[]} = {};
+            const patientToAnalysisGroups: {
+                [patientKey: string]: string[];
+            } = {};
 
             if (this.props.store.overlapStrategy === OverlapStrategy.INCLUDE) {
                 for (const entry of partition) {
-                    const partitionGroupUids = Object.keys(entry.key).filter(uid=>entry.key[uid]);
+                    const partitionGroupUids = Object.keys(entry.key).filter(
+                        uid => entry.key[uid]
+                    );
                     // sort by give order of groups
-                    partitionGroupUids.sort((a, b) => orderedActiveGroupUidSet[a] - orderedActiveGroupUidSet[b]);
+                    partitionGroupUids.sort(
+                        (a, b) =>
+                            orderedActiveGroupUidSet[a] -
+                            orderedActiveGroupUidSet[b]
+                    );
                     if (partitionGroupUids.length > 0) {
-                        const name = `Only ${partitionGroupUids.map(uid => uidToGroup[uid].nameWithOrdinal).join(", ")}`;
-                        const value = partitionGroupUids.join(",");
+                        const name = `Only ${partitionGroupUids
+                            .map(uid => uidToGroup[uid].nameWithOrdinal)
+                            .join(', ')}`;
+                        const value = partitionGroupUids.join(',');
                         for (const patientKey of entry.value) {
                             patientToAnalysisGroups[patientKey] = [value];
                         }
                         analysisGroups.push({
                             name,
-                            color: blendColors(partitionGroupUids.map(uid => uidToGroup[uid].color)),
+                            color: blendColors(
+                                partitionGroupUids.map(
+                                    uid => uidToGroup[uid].color
+                                )
+                            ),
                             value,
                             legendText: JSON.stringify(partitionGroupUids),
                         });
                     }
                 }
             } else {
-                const patientToSamplesSet = this.props.store.patientToSamplesSet.result!;
+                const patientToSamplesSet = this.props.store.patientToSamplesSet
+                    .result!;
                 for (const group of this.props.store.activeGroups.result!) {
                     const name = group.nameWithOrdinal;
                     analysisGroups.push({
                         name,
                         color: group.color,
                         value: group.uid,
-                        legendText: group.uid
+                        legendText: group.uid,
                     });
                     const patientIdentifiers = getPatientIdentifiers([group]);
                     for (const identifier of patientIdentifiers) {
-                        const samples = patientToSamplesSet.get({ studyId: identifier.studyId, patientId: identifier.patientId });
+                        const samples = patientToSamplesSet.get({
+                            studyId: identifier.studyId,
+                            patientId: identifier.patientId,
+                        });
                         if (samples && samples.length) {
-                            patientToAnalysisGroups[samples[0].uniquePatientKey] = [group.uid];
+                            patientToAnalysisGroups[
+                                samples[0].uniquePatientKey
+                            ] = [group.uid];
                         }
                     }
                 }
             }
             return Promise.resolve({
                 analysisGroups,
-                patientToAnalysisGroups
+                patientToAnalysisGroups,
             });
-        }
+        },
     });
 
-
     readonly tabUI = MakeMobxView({
-        await:()=>{
-            if (this.props.store._activeGroupsNotOverlapRemoved.isComplete &&
-                this.props.store._activeGroupsNotOverlapRemoved.result.length > 10) {
+        await: () => {
+            if (
+                this.props.store._activeGroupsNotOverlapRemoved.isComplete &&
+                this.props.store._activeGroupsNotOverlapRemoved.result.length >
+                    10
+            ) {
                 // dont bother loading data for and computing UI if its not valid situation for it
                 return [this.props.store._activeGroupsNotOverlapRemoved];
             } else {
-                return [this.props.store._activeGroupsNotOverlapRemoved, this.survivalUI, this.props.store.overlapComputations];
+                return [
+                    this.props.store._activeGroupsNotOverlapRemoved,
+                    this.survivalUI,
+                    this.props.store.overlapComputations,
+                ];
             }
         },
-        render:()=>{
+        render: () => {
             let content: any = [];
-            if (this.props.store._activeGroupsNotOverlapRemoved.result!.length > 10) {
+            if (
+                this.props.store._activeGroupsNotOverlapRemoved.result!.length >
+                10
+            ) {
                 content.push(<span>{SURVIVAL_TOO_MANY_GROUPS_MSG}</span>);
-            } else if (this.props.store._activeGroupsNotOverlapRemoved.result!.length === 0) {
+            } else if (
+                this.props.store._activeGroupsNotOverlapRemoved.result!
+                    .length === 0
+            ) {
                 content.push(<span>{SURVIVAL_NOT_ENOUGH_GROUPS_MSG}</span>);
             } else {
-                content.push(<OverlapExclusionIndicator store={this.props.store} only="patient" survivalTabMode={true}/>);
+                content.push(
+                    <OverlapExclusionIndicator
+                        store={this.props.store}
+                        only="patient"
+                        survivalTabMode={true}
+                    />
+                );
                 content.push(this.survivalUI.component);
             }
-            return (<div data-test="ComparisonPageSurvivalTabDiv">
-                {content}
-            </div>);
+            return (
+                <div data-test="ComparisonPageSurvivalTabDiv">{content}</div>
+            );
         },
-        renderPending:()=><LoadingIndicator center={true} isLoading={true} size={"big"}/>,
-        renderError:()=><ErrorMessage/>,
-        showLastRenderWhenPending:true
+        renderPending: () => (
+            <LoadingIndicator center={true} isLoading={true} size={'big'} />
+        ),
+        renderError: () => <ErrorMessage />,
+        showLastRenderWhenPending: true,
     });
 
     readonly survivalUI = MakeMobxView({
-        await:()=>[
+        await: () => [
             this.props.store.overallPatientSurvivals,
             this.props.store.diseaseFreePatientSurvivals,
             this.props.store.overallSurvivalDescriptions,
@@ -145,34 +201,69 @@ export default class Survival extends React.Component<ISurvivalProps, {}> {
             this.props.store.activeStudiesClinicalAttributes,
             this.analysisGroupsComputations,
             this.props.store.overlapComputations,
-            this.props.store.uidToGroup
+            this.props.store.uidToGroup,
         ],
-        render:()=>{
+        render: () => {
             let content: any = [];
             let overallNotAvailable: boolean = false;
             let diseaseFreeNotAvailable: boolean = false;
-            const analysisGroups = this.analysisGroupsComputations.result!.analysisGroups;
-            const patientToAnalysisGroups = this.analysisGroupsComputations.result!.patientToAnalysisGroups;
-            const overallSurvivalDescription = this.props.store.overallSurvivalDescriptions && this.props.store.overallSurvivalDescriptions.result!.length == 1 ? this.props.store.overallSurvivalDescriptions.result![0].description : "";
-            const diseaseFreeSurvivalDescription = this.props.store.diseaseFreeSurvivalDescriptions && this.props.store.diseaseFreeSurvivalDescriptions.result!.length == 1 ? this.props.store.diseaseFreeSurvivalDescriptions.result![0].description : "";
+            const analysisGroups = this.analysisGroupsComputations.result!
+                .analysisGroups;
+            const patientToAnalysisGroups = this.analysisGroupsComputations
+                .result!.patientToAnalysisGroups;
+            const overallSurvivalDescription =
+                this.props.store.overallSurvivalDescriptions &&
+                this.props.store.overallSurvivalDescriptions.result!.length == 1
+                    ? this.props.store.overallSurvivalDescriptions.result![0]
+                          .description
+                    : '';
+            const diseaseFreeSurvivalDescription =
+                this.props.store.diseaseFreeSurvivalDescriptions &&
+                this.props.store.diseaseFreeSurvivalDescriptions.result!
+                    .length == 1
+                    ? this.props.store.diseaseFreeSurvivalDescriptions
+                          .result![0].description
+                    : '';
 
             if (this.props.store.overallPatientSurvivals.result!.length > 0) {
-                if (this.props.store.overallSurvivalDescriptions && this.props.store.overallSurvivalDescriptions.result!.length > 1) {
-                    let messageBeforeTooltip = this.multipleDescriptionWarningMessageWithoutTooltip;
-                    const uniqDescriptions = _.uniq(_.map(this.props.store.overallSurvivalDescriptions.result!, (d) => d.description));
+                if (
+                    this.props.store.overallSurvivalDescriptions &&
+                    this.props.store.overallSurvivalDescriptions.result!
+                        .length > 1
+                ) {
+                    let messageBeforeTooltip = this
+                        .multipleDescriptionWarningMessageWithoutTooltip;
+                    const uniqDescriptions = _.uniq(
+                        _.map(
+                            this.props.store.overallSurvivalDescriptions
+                                .result!,
+                            d => d.description
+                        )
+                    );
                     if (uniqDescriptions.length > 1) {
                         messageBeforeTooltip = `${this.differentDescriptionExistMessage} ${messageBeforeTooltip}`;
                     }
                     content.push(
-                        <div className={"tabMessageContainer"}>
-                            <div className={"alert alert-warning"} role="alert">
+                        <div className={'tabMessageContainer'}>
+                            <div className={'alert alert-warning'} role="alert">
                                 {messageBeforeTooltip}
                                 <DefaultTooltip
                                     placement="bottom"
-                                    overlay={(<SurvivalDescriptionTable survivalDescriptionData = {this.props.store.overallSurvivalDescriptions.result!}/>)}
+                                    overlay={
+                                        <SurvivalDescriptionTable
+                                            survivalDescriptionData={
+                                                this.props.store
+                                                    .overallSurvivalDescriptions
+                                                    .result!
+                                            }
+                                        />
+                                    }
                                 >
                                     <a href="javascript:void(0)">
-                                        {this.multipleDescriptionWarningMessageWithTooltip}
+                                        {
+                                            this
+                                                .multipleDescriptionWarningMessageWithTooltip
+                                        }
                                     </a>
                                 </DefaultTooltip>
                             </div>
@@ -180,14 +271,23 @@ export default class Survival extends React.Component<ISurvivalProps, {}> {
                     );
                 }
                 content.push(
-                    <div style={{marginBottom:40}}>
-                        <h4 className='forceHeaderStyle h4'>{overallSurvivalDescription ? `${this.overallSurvivalTitleText} (${overallSurvivalDescription})` : this.overallSurvivalTitleText}</h4>
-                        <div style={{width: '920px'}}>
+                    <div style={{ marginBottom: 40 }}>
+                        <h4 className="forceHeaderStyle h4">
+                            {overallSurvivalDescription
+                                ? `${this.overallSurvivalTitleText} (${overallSurvivalDescription})`
+                                : this.overallSurvivalTitleText}
+                        </h4>
+                        <div style={{ width: '920px' }}>
                             <SurvivalChart
-                                className='borderedChart'
-                                patientSurvivals = {this.props.store.overallPatientSurvivals.result}
+                                className="borderedChart"
+                                patientSurvivals={
+                                    this.props.store.overallPatientSurvivals
+                                        .result
+                                }
                                 analysisGroups={analysisGroups}
-                                patientToAnalysisGroups={patientToAnalysisGroups}
+                                patientToAnalysisGroups={
+                                    patientToAnalysisGroups
+                                }
                                 title={this.overallSurvivalTitleText}
                                 xAxisLabel="Months Survival"
                                 yAxisLabel="Overall Survival"
@@ -200,17 +300,26 @@ export default class Survival extends React.Component<ISurvivalProps, {}> {
                                 fileName="Overall_Survival"
                                 showCurveInTooltip={true}
                                 legendLabelComponent={
-                                    this.props.store.overlapStrategy === OverlapStrategy.INCLUDE ? (
+                                    this.props.store.overlapStrategy ===
+                                    OverlapStrategy.INCLUDE ? (
                                         <SurvivalTabGroupLegendLabelComponent
                                             maxLabelWidth={256}
-                                            uidToGroup={this.props.store.uidToGroup.result!}
+                                            uidToGroup={
+                                                this.props.store.uidToGroup
+                                                    .result!
+                                            }
                                             dy="0.3em"
                                         />
-                                    ) : <GroupLegendLabelComponent
-                                        maxLabelWidth={256}
-                                        uidToGroup={this.props.store.uidToGroup.result!}
-                                        dy="0.3em"
-                                    />
+                                    ) : (
+                                        <GroupLegendLabelComponent
+                                            maxLabelWidth={256}
+                                            uidToGroup={
+                                                this.props.store.uidToGroup
+                                                    .result!
+                                            }
+                                            dy="0.3em"
+                                        />
+                                    )
                                 }
                             />
                         </div>
@@ -220,23 +329,47 @@ export default class Survival extends React.Component<ISurvivalProps, {}> {
                 overallNotAvailable = true;
             }
 
-            if (this.props.store.diseaseFreePatientSurvivals.result!.length > 0) {
-                if (this.props.store.diseaseFreeSurvivalDescriptions && this.props.store.diseaseFreeSurvivalDescriptions.result!.length > 1) {
-                    let messageBeforeTooltip = this.multipleDescriptionWarningMessageWithoutTooltip;
-                    const uniqDescriptions = _.uniq(_.map(this.props.store.diseaseFreeSurvivalDescriptions.result!, (d) => d.description));
+            if (
+                this.props.store.diseaseFreePatientSurvivals.result!.length > 0
+            ) {
+                if (
+                    this.props.store.diseaseFreeSurvivalDescriptions &&
+                    this.props.store.diseaseFreeSurvivalDescriptions.result!
+                        .length > 1
+                ) {
+                    let messageBeforeTooltip = this
+                        .multipleDescriptionWarningMessageWithoutTooltip;
+                    const uniqDescriptions = _.uniq(
+                        _.map(
+                            this.props.store.diseaseFreeSurvivalDescriptions
+                                .result!,
+                            d => d.description
+                        )
+                    );
                     if (uniqDescriptions.length > 1) {
                         messageBeforeTooltip = `${this.differentDescriptionExistMessage} ${messageBeforeTooltip}`;
                     }
                     content.push(
-                        <div className={"tabMessageContainer"}>
-                            <div className={"alert alert-warning"} role="alert">
+                        <div className={'tabMessageContainer'}>
+                            <div className={'alert alert-warning'} role="alert">
                                 {messageBeforeTooltip}
                                 <DefaultTooltip
                                     placement="bottom"
-                                    overlay={(<SurvivalDescriptionTable survivalDescriptionData = {this.props.store.diseaseFreeSurvivalDescriptions.result!}/>)}
+                                    overlay={
+                                        <SurvivalDescriptionTable
+                                            survivalDescriptionData={
+                                                this.props.store
+                                                    .diseaseFreeSurvivalDescriptions
+                                                    .result!
+                                            }
+                                        />
+                                    }
                                 >
                                     <a href="javascript:void(0)">
-                                        {this.multipleDescriptionWarningMessageWithTooltip}
+                                        {
+                                            this
+                                                .multipleDescriptionWarningMessageWithTooltip
+                                        }
                                     </a>
                                 </DefaultTooltip>
                             </div>
@@ -245,13 +378,22 @@ export default class Survival extends React.Component<ISurvivalProps, {}> {
                 }
                 content.push(
                     <div>
-                        <h4 className='forceHeaderStyle h4'>{diseaseFreeSurvivalDescription ? `${this.diseaseFreeSurvivalTitleText} (${diseaseFreeSurvivalDescription})` : this.diseaseFreeSurvivalTitleText}</h4>
-                        <div style={{width: '920px'}}>
+                        <h4 className="forceHeaderStyle h4">
+                            {diseaseFreeSurvivalDescription
+                                ? `${this.diseaseFreeSurvivalTitleText} (${diseaseFreeSurvivalDescription})`
+                                : this.diseaseFreeSurvivalTitleText}
+                        </h4>
+                        <div style={{ width: '920px' }}>
                             <SurvivalChart
-                                className='borderedChart'
-                                patientSurvivals = {this.props.store.diseaseFreePatientSurvivals.result}
+                                className="borderedChart"
+                                patientSurvivals={
+                                    this.props.store.diseaseFreePatientSurvivals
+                                        .result
+                                }
                                 analysisGroups={analysisGroups}
-                                patientToAnalysisGroups={patientToAnalysisGroups}
+                                patientToAnalysisGroups={
+                                    patientToAnalysisGroups
+                                }
                                 title={this.diseaseFreeSurvivalTitleText}
                                 xAxisLabel="Months Disease/Progression-free"
                                 yAxisLabel="Disease/Progression-free Survival"
@@ -264,17 +406,26 @@ export default class Survival extends React.Component<ISurvivalProps, {}> {
                                 fileName="Disease_Free_Survival"
                                 showCurveInTooltip={true}
                                 legendLabelComponent={
-                                    this.props.store.overlapStrategy === OverlapStrategy.INCLUDE ? (
+                                    this.props.store.overlapStrategy ===
+                                    OverlapStrategy.INCLUDE ? (
                                         <SurvivalTabGroupLegendLabelComponent
                                             maxLabelWidth={256}
-                                            uidToGroup={this.props.store.uidToGroup.result!}
+                                            uidToGroup={
+                                                this.props.store.uidToGroup
+                                                    .result!
+                                            }
                                             dy="0.3em"
                                         />
-                                    ) : <GroupLegendLabelComponent
-                                        maxLabelWidth={256}
-                                        uidToGroup={this.props.store.uidToGroup.result!}
-                                        dy="0.3em"
-                                    />
+                                    ) : (
+                                        <GroupLegendLabelComponent
+                                            maxLabelWidth={256}
+                                            uidToGroup={
+                                                this.props.store.uidToGroup
+                                                    .result!
+                                            }
+                                            dy="0.3em"
+                                        />
+                                    )
                                 }
                             />
                         </div>
@@ -285,21 +436,27 @@ export default class Survival extends React.Component<ISurvivalProps, {}> {
             }
 
             if (overallNotAvailable) {
-                content.push(<div className={'alert alert-info'}>{this.overallSurvivalTitleText} not available</div>);
+                content.push(
+                    <div className={'alert alert-info'}>
+                        {this.overallSurvivalTitleText} not available
+                    </div>
+                );
             }
 
             if (diseaseFreeNotAvailable) {
-                content.push(<div className={'alert alert-info'}>{this.diseaseFreeSurvivalTitleText} not available</div>);
+                content.push(
+                    <div className={'alert alert-info'}>
+                        {this.diseaseFreeSurvivalTitleText} not available
+                    </div>
+                );
             }
 
-            return (
-                <div>
-                    {content}
-                </div>
-            );
+            return <div>{content}</div>;
         },
-        renderPending:()=><LoadingIndicator center={true} isLoading={true} size={"big"}/>,
-        renderError:()=><ErrorMessage/>,
+        renderPending: () => (
+            <LoadingIndicator center={true} isLoading={true} size={'big'} />
+        ),
+        renderError: () => <ErrorMessage />,
     });
 
     render() {
diff --git a/src/pages/groupComparison/UpSet.tsx b/src/pages/groupComparison/UpSet.tsx
index 54f6d1f18a8..ff5448717b8 100644
--- a/src/pages/groupComparison/UpSet.tsx
+++ b/src/pages/groupComparison/UpSet.tsx
@@ -1,55 +1,78 @@
 import * as React from 'react';
-import {observer, Observer} from "mobx-react";
-import {VictoryAxis, VictoryBar, VictoryChart, VictoryLabel, VictoryLine, VictoryScatter, Bar} from 'victory';
-import {computed, observable} from 'mobx';
+import { observer, Observer } from 'mobx-react';
+import {
+    VictoryAxis,
+    VictoryBar,
+    VictoryChart,
+    VictoryLabel,
+    VictoryLine,
+    VictoryScatter,
+    Bar,
+} from 'victory';
+import { computed, observable } from 'mobx';
 import * as _ from 'lodash';
-import CBIOPORTAL_VICTORY_THEME, {axisTickLabelStyles} from 'shared/theme/cBioPoralTheme';
+import CBIOPORTAL_VICTORY_THEME, {
+    axisTickLabelStyles,
+} from 'shared/theme/cBioPoralTheme';
 import autobind from 'autobind-decorator';
-import {ComparisonGroup} from './GroupComparisonUtils';
-import {getTextWidth, pluralize, truncateWithEllipsis} from 'cbioportal-frontend-commons';
-import {tickFormatNumeral} from 'shared/components/plots/TickUtils';
-import {joinGroupNames, regionIsSelected, renderGroupNameWithOrdinal, toggleRegionSelected} from './OverlapUtils';
-import {getPlotDomain} from './UpSetUtils';
-import * as ReactDOM from "react-dom";
-import {Popover} from "react-bootstrap";
-import classnames from "classnames";
-import styles from "../resultsView/survival/styles.module.scss";
+import { ComparisonGroup } from './GroupComparisonUtils';
+import {
+    getTextWidth,
+    pluralize,
+    truncateWithEllipsis,
+} from 'cbioportal-frontend-commons';
+import { tickFormatNumeral } from 'shared/components/plots/TickUtils';
+import {
+    joinGroupNames,
+    regionIsSelected,
+    renderGroupNameWithOrdinal,
+    toggleRegionSelected,
+} from './OverlapUtils';
+import { getPlotDomain } from './UpSetUtils';
+import * as ReactDOM from 'react-dom';
+import { Popover } from 'react-bootstrap';
+import classnames from 'classnames';
+import styles from '../resultsView/survival/styles.module.scss';
 import Timer = NodeJS.Timer;
-import WindowStore from "../../shared/components/window/WindowStore";
-import invertIncreasingFunction from "../../shared/lib/invertIncreasingFunction";
-import GroupTickLabelComponent from "./labelComponents/GroupTickLabelComponent";
+import WindowStore from '../../shared/components/window/WindowStore';
+import invertIncreasingFunction from '../../shared/lib/invertIncreasingFunction';
+import GroupTickLabelComponent from './labelComponents/GroupTickLabelComponent';
 
 export interface IUpSetProps {
     groups: {
-        key:{[uid:string]:boolean},
+        key: { [uid: string]: boolean };
         value: string[];
     }[];
     uidToGroup: { [uid: string]: ComparisonGroup };
-    onChangeSelectedCombinations:(selectedCombinations:string[][])=>void;
-    selectedCombinations:string[][]; // we do it like this so that updating it doesn't update all props
+    onChangeSelectedCombinations: (selectedCombinations: string[][]) => void;
+    selectedCombinations: string[][]; // we do it like this so that updating it doesn't update all props
     svgId?: string;
     title?: string;
-    caseType: "sample" | "patient";
-};
+    caseType: 'sample' | 'patient';
+}
 
 const PLOT_DATA_PADDING_PIXELS = 20;
 const DEFAULT_BOTTOM_PADDING = 10;
 const RIGHT_PADDING_FOR_LONG_LABELS = 50;
 const BAR_WIDTH = 10;
-const DEFAULT_SCATTER_DOT_COLOR = "#efefef"
+const DEFAULT_SCATTER_DOT_COLOR = '#efefef';
 const MAX_LABEL_WIDTH = 200;
 
-const BarComponent = (props:any)=>(
-    <Bar className={`${props.caseType}_${_.sortBy(props.datum.groups).join("_")}_bar`} {...props}/>
+const BarComponent = (props: any) => (
+    <Bar
+        className={`${props.caseType}_${_.sortBy(props.datum.groups).join(
+            '_'
+        )}_bar`}
+        {...props}
+    />
 );
 
 @observer
 export default class UpSet extends React.Component<IUpSetProps, {}> {
-
     private container: HTMLDivElement;
     @observable.ref private tooltipModel: any | null = null;
     private mouseEvents: any = this.makeMouseEvents();
-    @observable mousePosition = { x:0, y:0 };
+    @observable mousePosition = { x: 0, y: 0 };
 
     @autobind
     private containerRef(container: HTMLDivElement) {
@@ -60,54 +83,67 @@ export default class UpSet extends React.Component<IUpSetProps, {}> {
         let disappearTimeout: Timer | null = null;
         const disappearDelayMs = 250;
 
-        return [{
-            target: "data",
-            eventHandlers: {
-                onMouseOver: () => {
-                    return [
-                        {
-                            target: "data",
-                            mutation: (props: any) => {
-                                 if (!props.datum || !props.datum.dontShowTooltip) {
-                                    this.tooltipModel = props;
-                                }
-                                return null;
-                            }
-                        }
-                    ];
-                },
-                onMouseOut: () => {
-                    return [
-                        {
-                            target: "data",
-                            mutation: () => {
-                                this.tooltipModel = null;
-                                return null;
-                            }
-                        }
-                    ];
-                },
-                onClick:()=>{
-                    return [
-                        {
-                            target: "data",
-                            mutation:(props:any) => {
-                                let groups;
-                                if (props.datum) {
-                                    groups = props.datum.groups;
-                                } else {
-                                    groups = props.data[0].groups;
-                                }
-                                if (!props.datum || !props.datum.notClickable) {
-                                    this.props.onChangeSelectedCombinations(toggleRegionSelected(groups, this.props.selectedCombinations));
-                                }
-                                return null;
-                            }
-                        }
-                    ];
+        return [
+            {
+                target: 'data',
+                eventHandlers: {
+                    onMouseOver: () => {
+                        return [
+                            {
+                                target: 'data',
+                                mutation: (props: any) => {
+                                    if (
+                                        !props.datum ||
+                                        !props.datum.dontShowTooltip
+                                    ) {
+                                        this.tooltipModel = props;
+                                    }
+                                    return null;
+                                },
+                            },
+                        ];
+                    },
+                    onMouseOut: () => {
+                        return [
+                            {
+                                target: 'data',
+                                mutation: () => {
+                                    this.tooltipModel = null;
+                                    return null;
+                                },
+                            },
+                        ];
+                    },
+                    onClick: () => {
+                        return [
+                            {
+                                target: 'data',
+                                mutation: (props: any) => {
+                                    let groups;
+                                    if (props.datum) {
+                                        groups = props.datum.groups;
+                                    } else {
+                                        groups = props.data[0].groups;
+                                    }
+                                    if (
+                                        !props.datum ||
+                                        !props.datum.notClickable
+                                    ) {
+                                        this.props.onChangeSelectedCombinations(
+                                            toggleRegionSelected(
+                                                groups,
+                                                this.props.selectedCombinations
+                                            )
+                                        );
+                                    }
+                                    return null;
+                                },
+                            },
+                        ];
+                    },
                 },
-            }
-        }];
+            },
+        ];
     }
 
     @autobind private resetSelection() {
@@ -115,25 +151,29 @@ export default class UpSet extends React.Component<IUpSetProps, {}> {
     }
 
     @computed get usedGroups() {
-        const usedGroupUids =
-            _.chain(this.groupCombinationSets)
-            .flatMap(g=>g.groups)
+        const usedGroupUids = _.chain(this.groupCombinationSets)
+            .flatMap(g => g.groups)
             .keyBy()
             .value();
 
         return _.chain(this.props.uidToGroup)
-            .reduce((acc, group, uid) => {
-                if (uid in usedGroupUids) {
-                    acc.push(group);
-                }
-                return acc;
-            }, [] as ComparisonGroup[])
-            .orderBy(group=>group.nameWithOrdinal,"desc")
+            .reduce(
+                (acc, group, uid) => {
+                    if (uid in usedGroupUids) {
+                        acc.push(group);
+                    }
+                    return acc;
+                },
+                [] as ComparisonGroup[]
+            )
+            .orderBy(group => group.nameWithOrdinal, 'desc')
             .value();
     }
 
     @computed get groupLabels() {
-        return _.map(this.usedGroups, group => truncateWithEllipsis(group.nameWithOrdinal, 100, "Arial", "13px"));
+        return _.map(this.usedGroups, group =>
+            truncateWithEllipsis(group.nameWithOrdinal, 100, 'Arial', '13px')
+        );
     }
 
     private barSeparation() {
@@ -145,7 +185,7 @@ export default class UpSet extends React.Component<IUpSetProps, {}> {
     }
 
     @computed get chartWidth() {
-        return this.barChartExtent
+        return this.barChartExtent;
     }
 
     private barChartHeight() {
@@ -153,7 +193,7 @@ export default class UpSet extends React.Component<IUpSetProps, {}> {
     }
 
     @computed get scatterChartHeight() {
-        return this.scatterChartExtent
+        return this.scatterChartExtent;
     }
 
     private domainPadding() {
@@ -171,7 +211,7 @@ export default class UpSet extends React.Component<IUpSetProps, {}> {
     private chartDomainPadding() {
         return {
             y: this.countAxisDomainPadding(),
-            x: this.categoryAxisDomainPadding()
+            x: this.categoryAxisDomainPadding(),
         };
     }
 
@@ -180,9 +220,9 @@ export default class UpSet extends React.Component<IUpSetProps, {}> {
             return (
                 <VictoryLabel
                     style={{
-                        fontWeight: "bold",
-                        fontFamily: "Verdana,Arial,sans-serif",
-                        textAnchor: "middle"
+                        fontWeight: 'bold',
+                        fontFamily: 'Verdana,Arial,sans-serif',
+                        textAnchor: 'middle',
                     }}
                     x={this.svgWidth / 2}
                     y="1.2em"
@@ -197,7 +237,11 @@ export default class UpSet extends React.Component<IUpSetProps, {}> {
     @computed get scatterChartExtent() {
         let miscPadding = 100; // specifying chart width in victory doesnt translate directly to the actual graph size
         if (this.usedGroups.length > 0) {
-            return this.categoryCoord(this.usedGroups.length - 1) + (2 * (this.categoryAxisDomainPadding())) + miscPadding;
+            return (
+                this.categoryCoord(this.usedGroups.length - 1) +
+                2 * this.categoryAxisDomainPadding() +
+                miscPadding
+            );
         } else {
             return miscPadding;
         }
@@ -206,7 +250,11 @@ export default class UpSet extends React.Component<IUpSetProps, {}> {
     @computed get barChartExtent() {
         let miscPadding = 100; // specifying chart width in victory doesnt translate directly to the actual graph size
         if (this.groupCombinationSets.length > 0) {
-            return this.categoryCoord(this.groupCombinationSets.length - 1) + 2 * (this.categoryAxisDomainPadding()) + miscPadding;
+            return (
+                this.categoryCoord(this.groupCombinationSets.length - 1) +
+                2 * this.categoryAxisDomainPadding() +
+                miscPadding
+            );
         } else {
             return miscPadding;
         }
@@ -214,7 +262,13 @@ export default class UpSet extends React.Component<IUpSetProps, {}> {
 
     @computed get biggestCategoryLabelSize() {
         const rawLabel = Math.max(
-            ..._.map(this.usedGroups, group => getTextWidth(group.nameWithOrdinal, axisTickLabelStyles.fontFamily, axisTickLabelStyles.fontSize + "px"))
+            ..._.map(this.usedGroups, group =>
+                getTextWidth(
+                    group.nameWithOrdinal,
+                    axisTickLabelStyles.fontFamily,
+                    axisTickLabelStyles.fontSize + 'px'
+                )
+            )
         );
         return Math.min(rawLabel, MAX_LABEL_WIDTH);
     }
@@ -228,7 +282,13 @@ export default class UpSet extends React.Component<IUpSetProps, {}> {
 
     @computed get svgHeight() {
         //subtract 100 as padding added both while calculating barchart height and scatter plot height
-        return this.topPadding + this.barChartHeight() + this.scatterChartHeight + this.bottomPadding - 100;
+        return (
+            this.topPadding +
+            this.barChartHeight() +
+            this.scatterChartHeight +
+            this.bottomPadding -
+            100
+        );
     }
 
     @computed get leftPadding() {
@@ -253,23 +313,24 @@ export default class UpSet extends React.Component<IUpSetProps, {}> {
     }
 
     @autobind
-    private categoryCoordToGroup(coord:number) {
-        const index = Math.round(invertIncreasingFunction(
-            this.categoryCoord,
-            coord,
-            [0,this.usedGroups.length]
-        ));
+    private categoryCoordToGroup(coord: number) {
+        const index = Math.round(
+            invertIncreasingFunction(this.categoryCoord, coord, [
+                0,
+                this.usedGroups.length,
+            ])
+        );
         return this.usedGroups[index];
     }
 
     @computed get groupCombinationSets() {
         return _.orderBy(
-            this.props.groups.map(entry=>({
-                groups:Object.keys(entry.key).filter(k=>entry.key[k]),
-                cases: entry.value
+            this.props.groups.map(entry => ({
+                groups: Object.keys(entry.key).filter(k => entry.key[k]),
+                cases: entry.value,
             })),
-            group=>group.cases.length,
-            "desc"
+            group => group.cases.length,
+            'desc'
         );
     }
 
@@ -280,11 +341,11 @@ export default class UpSet extends React.Component<IUpSetProps, {}> {
                 return {
                     x: this.categoryCoord(index),
                     y: this.categoryCoord(i),
-                    fill: included ? "#000000" : DEFAULT_SCATTER_DOT_COLOR,
+                    fill: included ? '#000000' : DEFAULT_SCATTER_DOT_COLOR,
                     dontShowTooltip: !included,
-                    cursor: included ? "pointer" : "default",
+                    cursor: included ? 'pointer' : 'default',
                     notClickable: !included,
-                    ...set
+                    ...set,
                 };
             });
         });
@@ -294,26 +355,26 @@ export default class UpSet extends React.Component<IUpSetProps, {}> {
         return _.map(this.groupCombinationSets, (set, index) => ({
             x: this.categoryCoord(index),
             y: set.cases.length,
-            ...set
+            ...set,
         }));
     }
 
     @computed get barPlotHitzoneData() {
-        const minY = this.barPlotDomain.y[1]/15;
-        return this.barPlotData.map(d=>{
+        const minY = this.barPlotDomain.y[1] / 15;
+        return this.barPlotData.map(d => {
             return Object.assign({}, d, { y: Math.max(d.y, minY) });
         });
     }
 
     @computed private get getGroupIntersectionLines() {
-        const activeUids = _.map(this.usedGroups, g => g.uid)
+        const activeUids = _.map(this.usedGroups, g => g.uid);
         return _.flatMap(this.groupCombinationSets, (set, index) => {
             const data = _.map(set.groups, groupUid => {
                 const groupIndex = _.indexOf(activeUids, groupUid);
                 return {
                     x: this.categoryCoord(index),
                     y: this.categoryCoord(groupIndex),
-                    ...set
+                    ...set,
                 };
             });
             return [
@@ -322,7 +383,7 @@ export default class UpSet extends React.Component<IUpSetProps, {}> {
                         data: {
                             stroke: this.lineStroke,
                             strokeWidth: 2,
-                            strokeLinecap: "round"
+                            strokeLinecap: 'round',
                         },
                     }}
                     data={data}
@@ -332,24 +393,37 @@ export default class UpSet extends React.Component<IUpSetProps, {}> {
                         data: {
                             strokeOpacity: 0,
                             strokeWidth: this.barWidth(),
-                            strokeLinecap: "round",
-                            cursor: "pointer"
+                            strokeLinecap: 'round',
+                            cursor: 'pointer',
                         },
                     }}
                     data={data}
                     events={this.mouseEvents}
-                />
-            ]
-        })
+                />,
+            ];
+        });
     }
 
     @computed get barPlotDomain() {
-        const maxCount = _.max(_.map(this.groupCombinationSets, datum => datum.cases.length)) || 0;
-        return getPlotDomain(this.groupCombinationSets.length, maxCount, this.categoryCoord, true, false);
+        const maxCount =
+            _.max(
+                _.map(this.groupCombinationSets, datum => datum.cases.length)
+            ) || 0;
+        return getPlotDomain(
+            this.groupCombinationSets.length,
+            maxCount,
+            this.categoryCoord,
+            true,
+            false
+        );
     }
 
     @computed get scatterPlotDomain() {
-        return getPlotDomain(this.groupCombinationSets.length, _.keys(this.groupLabels).length, this.categoryCoord);
+        return getPlotDomain(
+            this.groupCombinationSets.length,
+            _.keys(this.groupLabels).length,
+            this.categoryCoord
+        );
     }
 
     @computed get categoryTickValues() {
@@ -357,7 +431,9 @@ export default class UpSet extends React.Component<IUpSetProps, {}> {
     }
 
     @computed get groupTickValues() {
-        return _.map(this.groupLabels, (label, index) => this.categoryCoord(index));
+        return _.map(this.groupLabels, (label, index) =>
+            this.categoryCoord(index)
+        );
     }
 
     @autobind
@@ -376,14 +452,19 @@ export default class UpSet extends React.Component<IUpSetProps, {}> {
     }
 
     private tooltipFunction(datum: any) {
-        const includedGroups = _.map(datum.groups as string[], uid=>this.props.uidToGroup[uid]);
+        const includedGroups = _.map(
+            datum.groups as string[],
+            uid => this.props.uidToGroup[uid]
+        );
         const casesCount = datum.cases.length;
 
         return (
-            <div style={{width:300, whiteSpace:"normal"}}>
-                <strong>{casesCount} {pluralize(this.props.caseType, casesCount)}</strong>
-                <br/>
-                in only {joinGroupNames(includedGroups, "and")}.
+            <div style={{ width: 300, whiteSpace: 'normal' }}>
+                <strong>
+                    {casesCount} {pluralize(this.props.caseType, casesCount)}
+                </strong>
+                <br />
+                in only {joinGroupNames(includedGroups, 'and')}.
             </div>
         );
     }
@@ -393,49 +474,70 @@ export default class UpSet extends React.Component<IUpSetProps, {}> {
             return null;
         } else {
             const maxWidth = 400;
-            let tooltipPlacement = (this.mousePosition.x > WindowStore.size.width-maxWidth ? "left" : "right");
+            let tooltipPlacement =
+                this.mousePosition.x > WindowStore.size.width - maxWidth
+                    ? 'left'
+                    : 'right';
             return (ReactDOM as any).createPortal(
                 <Popover
                     arrowOffsetTop={17}
-                    className={classnames("cbioportal-frontend", "cbioTooltip", styles.Tooltip)}
-                    positionLeft={this.mousePosition.x+(tooltipPlacement === "left" ? -8 : 8)}
-                    positionTop={this.mousePosition.y-17}
+                    className={classnames(
+                        'cbioportal-frontend',
+                        'cbioTooltip',
+                        styles.Tooltip
+                    )}
+                    positionLeft={
+                        this.mousePosition.x +
+                        (tooltipPlacement === 'left' ? -8 : 8)
+                    }
+                    positionTop={this.mousePosition.y - 17}
                     style={{
-                        transform: (tooltipPlacement === "left" ? "translate(-100%,0%)" : undefined),
-                        maxWidth
+                        transform:
+                            tooltipPlacement === 'left'
+                                ? 'translate(-100%,0%)'
+                                : undefined,
+                        maxWidth,
                     }}
                     placement={tooltipPlacement}
                 >
-                    {this.tooltipFunction(this.tooltipModel.datum || this.tooltipModel.data[0])}
+                    {this.tooltipFunction(
+                        this.tooltipModel.datum || this.tooltipModel.data[0]
+                    )}
                 </Popover>,
                 document.body
             );
         }
     }
 
-    @autobind private onMouseMove(e:React.MouseEvent<any>) {
+    @autobind private onMouseMove(e: React.MouseEvent<any>) {
         this.mousePosition.x = e.pageX;
         this.mousePosition.y = e.pageY;
     }
 
-    @autobind private lineStroke(datum:any) {
+    @autobind private lineStroke(datum: any) {
         if (datum.length === 0) {
-            return "black";
+            return 'black';
         }
-        const selected = regionIsSelected(datum[0].groups, this.props.selectedCombinations);
+        const selected = regionIsSelected(
+            datum[0].groups,
+            this.props.selectedCombinations
+        );
         if (selected) {
-            return "yellow";
+            return 'yellow';
         } else {
-            return "black";
+            return 'black';
         }
     }
 
-    @autobind private fill(datum:any) {
-        const selected = regionIsSelected(datum.groups, this.props.selectedCombinations);
+    @autobind private fill(datum: any) {
+        const selected = regionIsSelected(
+            datum.groups,
+            this.props.selectedCombinations
+        );
         if (selected && !datum.notClickable) {
-            return "yellow";
+            return 'yellow';
         } else {
-            return datum.fill || "black";
+            return datum.fill || 'black';
         }
     }
 
@@ -447,11 +549,11 @@ export default class UpSet extends React.Component<IUpSetProps, {}> {
                     style={{ width: this.svgWidth, height: this.svgHeight }}
                 >
                     <svg
-                        id={this.props.svgId || ""}
+                        id={this.props.svgId || ''}
                         style={{
                             width: this.svgWidth,
                             height: this.svgHeight,
-                            pointerEvents: "all"
+                            pointerEvents: 'all',
                         }}
                         height={this.svgHeight}
                         width={this.svgWidth}
@@ -459,9 +561,7 @@ export default class UpSet extends React.Component<IUpSetProps, {}> {
                         viewBox={`0 0 ${this.svgWidth} ${this.svgHeight}`}
                         onMouseMove={this.onMouseMove}
                     >
-                        <g>
-                            {this.title}
-                        </g>
+                        <g>{this.title}</g>
                         <g
                             transform={`translate(${this.leftPadding}, ${this.topPadding})`}
                         >
@@ -474,7 +574,7 @@ export default class UpSet extends React.Component<IUpSetProps, {}> {
                                 domain={this.barPlotDomain}
                                 singleQuadrantDomainPadding={{
                                     y: true,
-                                    x: false
+                                    x: false,
                                 }}
                             >
                                 <VictoryAxis
@@ -483,37 +583,53 @@ export default class UpSet extends React.Component<IUpSetProps, {}> {
                                     crossAxis={false}
                                     tickValues={this.categoryTickValues}
                                     style={{
-                                        ticks: { size: 0, },
+                                        ticks: { size: 0 },
                                         tickLabels: { fontSize: 0 },
                                         grid: {
-                                            stroke: 0
-                                        }
+                                            stroke: 0,
+                                        },
                                     }}
                                 />
                                 <VictoryAxis
                                     orientation="left"
                                     offsetX={50}
                                     dependentAxis
-                                    label={"Overlap count"}
+                                    label={'Overlap count'}
                                     tickFormat={this.formatNumericalTick}
                                     style={{
                                         grid: {
-                                            stroke: 0
-                                        }
+                                            stroke: 0,
+                                        },
                                     }}
-                                    axisLabelComponent={<VictoryLabel dy={-40} />}
+                                    axisLabelComponent={
+                                        <VictoryLabel dy={-40} />
+                                    }
                                 />
                                 <VictoryBar
-                                    style={{ data: { fill: this.fill, width: this.barWidth() } }}
+                                    style={{
+                                        data: {
+                                            fill: this.fill,
+                                            width: this.barWidth(),
+                                        },
+                                    }}
                                     data={this.barPlotData}
                                 />
                                 <VictoryBar
-                                    style={{ data: { fillOpacity:0, width: this.barWidth(), cursor:"pointer"} }}
+                                    style={{
+                                        data: {
+                                            fillOpacity: 0,
+                                            width: this.barWidth(),
+                                            cursor: 'pointer',
+                                        },
+                                    }}
                                     data={this.barPlotHitzoneData}
                                     events={this.mouseEvents}
-                                    dataComponent={<BarComponent caseType={this.props.caseType}/>}
+                                    dataComponent={
+                                        <BarComponent
+                                            caseType={this.props.caseType}
+                                        />
+                                    }
                                 />
-
                             </VictoryChart>
                         </g>
 
@@ -529,7 +645,7 @@ export default class UpSet extends React.Component<IUpSetProps, {}> {
                                 domain={this.scatterPlotDomain}
                                 singleQuadrantDomainPadding={{
                                     y: true,
-                                    x: false
+                                    x: false,
                                 }}
                             >
                                 <VictoryAxis
@@ -540,10 +656,10 @@ export default class UpSet extends React.Component<IUpSetProps, {}> {
                                     style={{
                                         axis: { strokeWidth: 0 },
                                         ticks: { size: 0, strokeWidth: 0 },
-                                        tickLabels: { fill: "none" },
+                                        tickLabels: { fill: 'none' },
                                         grid: {
-                                            stroke: 0
-                                        }
+                                            stroke: 0,
+                                        },
                                     }}
                                 />
 
@@ -554,7 +670,9 @@ export default class UpSet extends React.Component<IUpSetProps, {}> {
                                     crossAxis={false}
                                     tickLabelComponent={
                                         <GroupTickLabelComponent
-                                            categoryCoordToGroup={this.categoryCoordToGroup}
+                                            categoryCoordToGroup={
+                                                this.categoryCoordToGroup
+                                            }
                                             maxLabelWidth={MAX_LABEL_WIDTH}
                                             dy="0.4em"
                                         />
@@ -564,43 +682,39 @@ export default class UpSet extends React.Component<IUpSetProps, {}> {
                                         axis: { strokeWidth: 0 },
                                         ticks: { size: 0, strokeWidth: 0 },
                                         grid: {
-                                            stroke: 0
-                                        }
+                                            stroke: 0,
+                                        },
                                     }}
                                 />
 
                                 <VictoryScatter
-                                    size={this.barWidth()/2}
+                                    size={this.barWidth() / 2}
                                     style={{
                                         data: {
                                             fill: this.fill,
-                                            cursor: (d:any)=>d.cursor
-                                        }
+                                            cursor: (d: any) => d.cursor,
+                                        },
                                     }}
                                     data={this.scatterData}
                                     events={this.mouseEvents}
                                 />
                                 {this.getGroupIntersectionLines}
-
                             </VictoryChart>
                         </g>
                     </svg>
                 </div>
             );
         } else {
-            return <span>No data to plot.</span>
+            return <span>No data to plot.</span>;
         }
     }
 
     render() {
         return (
             <div>
-                <Observer>
-                    {this.getChart}
-                </Observer>
+                <Observer>{this.getChart}</Observer>
                 {this.tooltipComponent}
             </div>
         );
     }
-
 }
diff --git a/src/pages/groupComparison/UpSetUtils.spec.ts b/src/pages/groupComparison/UpSetUtils.spec.ts
index 2b94b904ec6..eb4ff18447b 100644
--- a/src/pages/groupComparison/UpSetUtils.spec.ts
+++ b/src/pages/groupComparison/UpSetUtils.spec.ts
@@ -1,59 +1,58 @@
-import { assert } from "chai";
-import _ from "lodash";
-import { getPlotDomain } from "./UpSetUtils";
+import { assert } from 'chai';
+import _ from 'lodash';
+import { getPlotDomain } from './UpSetUtils';
 
-describe("UpSetUtils", () => {
-    describe("getPlotDomain", () => {
+describe('UpSetUtils', () => {
+    describe('getPlotDomain', () => {
         let categoryCoord = (categoryIndex: number) => 25 * categoryIndex;
 
-        it("returns correct result for empty input", () => {
+        it('returns correct result for empty input', () => {
             assert.deepEqual(getPlotDomain(0, 0, categoryCoord), {
                 x: [0, 0],
-                y: [0, 0]
-            })
+                y: [0, 0],
+            });
         });
 
-        it("returns correct result for nonempty x and empty y count", () => {
+        it('returns correct result for nonempty x and empty y count', () => {
             assert.deepEqual(getPlotDomain(3, 0, categoryCoord), {
                 x: [0, 50],
-                y: [0, 0]
-            })
+                y: [0, 0],
+            });
         });
 
-        it("returns correct result for empty x and nonempty y count", () => {
+        it('returns correct result for empty x and nonempty y count', () => {
             assert.deepEqual(getPlotDomain(0, 3, categoryCoord), {
                 x: [0, 0],
-                y: [0, 50]
-            })
+                y: [0, 50],
+            });
         });
 
-        it("returns correct result for nonempty x and y count", () => {
+        it('returns correct result for nonempty x and y count', () => {
             assert.deepEqual(getPlotDomain(3, 3, categoryCoord), {
                 x: [0, 50],
-                y: [0, 50]
-            })
+                y: [0, 50],
+            });
         });
 
-        it("returns correct result for nonempty x and empty y count and without calculating coordinates for x", () => {
+        it('returns correct result for nonempty x and empty y count and without calculating coordinates for x', () => {
             assert.deepEqual(getPlotDomain(3, 0, categoryCoord, false, true), {
                 x: [0, 3],
-                y: [0, 0]
-            })
+                y: [0, 0],
+            });
         });
 
-        it("returns correct result for empty x and nonempty y count and without calculating coordinates for y", () => {
+        it('returns correct result for empty x and nonempty y count and without calculating coordinates for y', () => {
             assert.deepEqual(getPlotDomain(0, 3, categoryCoord, true, false), {
                 x: [0, 0],
-                y: [0, 3]
-            })
+                y: [0, 3],
+            });
         });
 
-        it("returns correct result for nonempty x and y count and  without calculating coordinates for x and y", () => {
+        it('returns correct result for nonempty x and y count and  without calculating coordinates for x and y', () => {
             assert.deepEqual(getPlotDomain(3, 3, categoryCoord, false, false), {
                 x: [0, 3],
-                y: [0, 3]
-            })
+                y: [0, 3],
+            });
         });
     });
-
-});
\ No newline at end of file
+});
diff --git a/src/pages/groupComparison/UpSetUtils.tsx b/src/pages/groupComparison/UpSetUtils.tsx
index 16c32aca431..60e406822a3 100644
--- a/src/pages/groupComparison/UpSetUtils.tsx
+++ b/src/pages/groupComparison/UpSetUtils.tsx
@@ -3,20 +3,26 @@ export function getPlotDomain(
     yCount: number,
     categoryCoord: (categoryIndex: number) => number,
     calcXCoord: boolean = true,
-    calcYCoord: boolean = true,
+    calcYCoord: boolean = true
 ) {
     let yDomain: number[];
     let xDomain: number[];
     if (xCount > 0) {
-        xDomain = [categoryCoord(0), calcXCoord ? categoryCoord(Math.max(1, xCount - 1)) : xCount];
+        xDomain = [
+            categoryCoord(0),
+            calcXCoord ? categoryCoord(Math.max(1, xCount - 1)) : xCount,
+        ];
     } else {
         xDomain = [0, 0];
     }
     if (yCount > 0) {
-        yDomain = [categoryCoord(0), calcYCoord ? categoryCoord(Math.max(1, yCount - 1)) : yCount]
+        yDomain = [
+            categoryCoord(0),
+            calcYCoord ? categoryCoord(Math.max(1, yCount - 1)) : yCount,
+        ];
     } else {
         yDomain = [0, 0];
     }
 
     return { x: xDomain, y: yDomain };
-}
\ No newline at end of file
+}
diff --git a/src/pages/groupComparison/comparisonGroupManager/ComparisonGroupManager.tsx b/src/pages/groupComparison/comparisonGroupManager/ComparisonGroupManager.tsx
index 1f2295ddd94..2a766c123e7 100644
--- a/src/pages/groupComparison/comparisonGroupManager/ComparisonGroupManager.tsx
+++ b/src/pages/groupComparison/comparisonGroupManager/ComparisonGroupManager.tsx
@@ -1,64 +1,77 @@
-import * as React from "react";
-import {SyntheticEvent} from "react";
-import {observer} from "mobx-react";
-import {StudyViewPageStore} from "../../studyView/StudyViewPageStore";
-import {action, computed, observable} from "mobx";
-import autobind from "autobind-decorator";
+import * as React from 'react';
+import { SyntheticEvent } from 'react';
+import { observer } from 'mobx-react';
+import { StudyViewPageStore } from '../../studyView/StudyViewPageStore';
+import { action, computed, observable } from 'mobx';
+import autobind from 'autobind-decorator';
 import {
     DUPLICATE_GROUP_NAME_MSG,
     getDefaultGroupName,
     MAX_GROUPS_IN_SESSION,
-    StudyViewComparisonGroup
-} from "../GroupComparisonUtils";
-import {getComparisonLoadingUrl, redirectToComparisonPage} from "../../../shared/api/urls";
-import styles from "../styles.module.scss";
-import {DefaultTooltip, remoteData} from "cbioportal-frontend-commons";
-import {addSamplesParameters, getGroupParameters, getSelectedGroups} from "./ComparisonGroupManagerUtils";
-import comparisonClient from "../../../shared/api/comparisonGroupClientInstance";
-import {MakeMobxView} from "../../../shared/components/MobxView";
-import LoadingIndicator from "../../../shared/components/loadingIndicator/LoadingIndicator";
-import ErrorMessage from "../../../shared/components/ErrorMessage";
-import GroupCheckbox from "./GroupCheckbox";
-import {sleepUntil} from "../../../shared/lib/TimeUtils";
-import {LoadingPhase} from "../GroupComparisonLoading";
-import _ from "lodash";
-import {serializeEvent} from "shared/lib/tracking";
+    StudyViewComparisonGroup,
+} from '../GroupComparisonUtils';
+import {
+    getComparisonLoadingUrl,
+    redirectToComparisonPage,
+} from '../../../shared/api/urls';
+import styles from '../styles.module.scss';
+import { DefaultTooltip, remoteData } from 'cbioportal-frontend-commons';
+import {
+    addSamplesParameters,
+    getGroupParameters,
+    getSelectedGroups,
+} from './ComparisonGroupManagerUtils';
+import comparisonClient from '../../../shared/api/comparisonGroupClientInstance';
+import { MakeMobxView } from '../../../shared/components/MobxView';
+import LoadingIndicator from '../../../shared/components/loadingIndicator/LoadingIndicator';
+import ErrorMessage from '../../../shared/components/ErrorMessage';
+import GroupCheckbox from './GroupCheckbox';
+import { sleepUntil } from '../../../shared/lib/TimeUtils';
+import { LoadingPhase } from '../GroupComparisonLoading';
+import _ from 'lodash';
+import { serializeEvent } from 'shared/lib/tracking';
 
 export interface IComparisonGroupManagerProps {
-    store:StudyViewPageStore;
+    store: StudyViewPageStore;
 }
 
 @observer
-export default class ComparisonGroupManager extends React.Component<IComparisonGroupManagerProps, {}> {
-    @observable groupNameFilter:string = "";
+export default class ComparisonGroupManager extends React.Component<
+    IComparisonGroupManagerProps,
+    {}
+> {
+    @observable groupNameFilter: string = '';
     @observable addGroupPanelOpen = false;
-    @observable _inputGroupName:string = "";
+    @observable _inputGroupName: string = '';
     @computed get inputGroupName() {
         return this._inputGroupName;
     }
-    @observable addSamplesTargetGroupId:string = "";
+    @observable addSamplesTargetGroupId: string = '';
 
     @autobind
     @action
-    private onChangeGroupNameFilter(e:SyntheticEvent<HTMLInputElement>) {
+    private onChangeGroupNameFilter(e: SyntheticEvent<HTMLInputElement>) {
         this.groupNameFilter = (e.target as HTMLInputElement).value;
     }
 
     @autobind
     @action
-    private onChangeInputGroupName(e:SyntheticEvent<HTMLInputElement>) {
+    private onChangeInputGroupName(e: SyntheticEvent<HTMLInputElement>) {
         this._inputGroupName = (e.target as HTMLInputElement).value;
     }
 
     readonly filteredGroups = remoteData({
-        await:()=>[this.props.store.comparisonGroups],
-        invoke:()=>Promise.resolve(
-            // TODO: fuzzy string search?
-            _.sortBy(
-                this.props.store.comparisonGroups.result!.filter(group=>(new RegExp(this.groupNameFilter, "i")).test(group.name)),
-                group=>group.name.toLowerCase()
-            )
-        )
+        await: () => [this.props.store.comparisonGroups],
+        invoke: () =>
+            Promise.resolve(
+                // TODO: fuzzy string search?
+                _.sortBy(
+                    this.props.store.comparisonGroups.result!.filter(group =>
+                        new RegExp(this.groupNameFilter, 'i').test(group.name)
+                    ),
+                    group => group.name.toLowerCase()
+                )
+            ),
     });
 
     @autobind
@@ -76,8 +89,8 @@ export default class ComparisonGroupManager extends React.Component<IComparisonG
     @action
     private cancelAddGroup() {
         this.addGroupPanelOpen = false;
-        this._inputGroupName = "";
-        this.addSamplesTargetGroupId = "";
+        this._inputGroupName = '';
+        this.addSamplesTargetGroupId = '';
     }
 
     @autobind
@@ -92,7 +105,10 @@ export default class ComparisonGroupManager extends React.Component<IComparisonG
         if (this.props.store.selectedSamples.result) {
             await comparisonClient.updateGroup(
                 group.uid,
-                addSamplesParameters(group, this.props.store.selectedSamples.result)
+                addSamplesParameters(
+                    group,
+                    this.props.store.selectedSamples.result
+                )
             );
             this.props.store.notifyComparisonGroupsChange();
         }
@@ -116,26 +132,39 @@ export default class ComparisonGroupManager extends React.Component<IComparisonG
 
     private get header() {
         return (
-            <div style={{
-                display:"flex",
-                justifyContent:"space-between",
-                width:"100%",
-                marginTop:3,
-                alignItems:"center",
-                marginBottom:10
-            }}>
+            <div
+                style={{
+                    display: 'flex',
+                    justifyContent: 'space-between',
+                    width: '100%',
+                    marginTop: 3,
+                    alignItems: 'center',
+                    marginBottom: 10,
+                }}
+            >
                 <div className="btn-group" role="group">
-                    <button className="btn btn-default btn-xs" onClick={this.selectAllFiltered}>
-                        Select all&nbsp;{this.filteredGroups.isComplete ? `(${this.filteredGroups.result!.length})` : ""}
+                    <button
+                        className="btn btn-default btn-xs"
+                        onClick={this.selectAllFiltered}
+                    >
+                        Select all&nbsp;
+                        {this.filteredGroups.isComplete
+                            ? `(${this.filteredGroups.result!.length})`
+                            : ''}
                     </button>
-                    <button className="btn btn-default btn-xs" onClick={this.deselectAllFiltered}>
+                    <button
+                        className="btn btn-default btn-xs"
+                        onClick={this.deselectAllFiltered}
+                    >
                         Deselect all
                     </button>
                 </div>
                 <input
                     className="form-control"
                     style={{
-                        right:0, width:140, height:25
+                        right: 0,
+                        width: 140,
+                        height: 25,
                     }}
                     type="text"
                     placeholder="Search.."
@@ -147,38 +176,45 @@ export default class ComparisonGroupManager extends React.Component<IComparisonG
     }
 
     @autobind
-    private restoreGroup(group:StudyViewComparisonGroup) {
+    private restoreGroup(group: StudyViewComparisonGroup) {
         this.props.store.toggleComparisonGroupMarkedForDeletion(group.uid);
     }
 
     @autobind
-    private async renameGroup(newName:string, group:StudyViewComparisonGroup) {
-        const {name, ...rest} = group;
-        await comparisonClient.updateGroup(
-            group.uid,
-            { name: newName, ...rest}
-        );
+    private async renameGroup(
+        newName: string,
+        group: StudyViewComparisonGroup
+    ) {
+        const { name, ...rest } = group;
+        await comparisonClient.updateGroup(group.uid, {
+            name: newName,
+            ...rest,
+        });
         this.props.store.notifyComparisonGroupsChange();
     }
 
     private readonly groupsSection = MakeMobxView({
-        await:()=>[
+        await: () => [
             this.props.store.comparisonGroups,
             this.filteredGroups,
-            this.props.store.selectedSamples
+            this.props.store.selectedSamples,
         ],
-        render:()=>{
+        render: () => {
             if (this.props.store.comparisonGroups.result!.length > 0) {
                 // show this component if there are groups, and if filteredGroups is complete
-                const allGroupNames = this.props.store.comparisonGroups.result!.map(group=>group.name);
+                const allGroupNames = this.props.store.comparisonGroups.result!.map(
+                    group => group.name
+                );
                 return (
                     <div className={styles.groupCheckboxes}>
                         {this.filteredGroups.result!.length > 0 ? (
-                            this.filteredGroups.result!.map(group=>(
+                            this.filteredGroups.result!.map(group => (
                                 <GroupCheckbox
                                     group={group}
                                     store={this.props.store}
-                                    markedForDeletion={this.props.store.isComparisonGroupMarkedForDeletion(group.uid)}
+                                    markedForDeletion={this.props.store.isComparisonGroupMarkedForDeletion(
+                                        group.uid
+                                    )}
                                     restore={this.restoreGroup}
                                     rename={this.renameGroup}
                                     delete={this.deleteGroup}
@@ -196,33 +232,48 @@ export default class ComparisonGroupManager extends React.Component<IComparisonG
             } else {
                 return (
                     <div className={styles.noGroupsMessage}>
-                        Group comparison allows you to create custom groups and compare their clinical and genomic features. Use the button below to create groups based on selections.
+                        Group comparison allows you to create custom groups and
+                        compare their clinical and genomic features. Use the
+                        button below to create groups based on selections.
                     </div>
                 );
             }
         },
-        renderPending:()=><LoadingIndicator isLoading={true}/>,
-        renderError:()=>(
+        renderPending: () => <LoadingIndicator isLoading={true} />,
+        renderError: () => (
             <div className={styles.noGroupsMessage}>
-                <ErrorMessage message={"There was an error loading saved groups. Please try again."}/>
+                <ErrorMessage
+                    message={
+                        'There was an error loading saved groups. Please try again.'
+                    }
+                />
             </div>
-        )
+        ),
     });
 
     private get viewButton() {
-        if (this.props.store.comparisonGroups.isComplete &&
-            this.props.store.comparisonGroups.result.length > 0) {
+        if (
+            this.props.store.comparisonGroups.isComplete &&
+            this.props.store.comparisonGroups.result.length > 0
+        ) {
             // only show select button if there are any groups
             return (
                 <button
                     className="btn btn-sm btn-default"
-                    disabled={getSelectedGroups(this.props.store.comparisonGroups.result, this.props.store).length === 0}
-                    style={{marginLeft:7}}
-                    onClick={()=>{
+                    disabled={
+                        getSelectedGroups(
+                            this.props.store.comparisonGroups.result,
+                            this.props.store
+                        ).length === 0
+                    }
+                    style={{ marginLeft: 7 }}
+                    onClick={() => {
                         this.props.store.clearAllFilters();
                         this.props.store.updateComparisonGroupsFilter();
                     }}
-                >View</button>
+                >
+                    View
+                </button>
             );
         } else {
             return null;
@@ -230,19 +281,33 @@ export default class ComparisonGroupManager extends React.Component<IComparisonG
     }
 
     @computed get submitNewGroupDisabled() {
-        const selectedSamples = this.props.store.selectedSamples.isComplete ? this.props.store.selectedSamples.result :  undefined;
-        const allGroupNames = this.props.store.comparisonGroups.isComplete ? this.props.store.comparisonGroups.result!.map(group=>group.name) : undefined;
-        return !selectedSamples || this.inputGroupName.length === 0 || !allGroupNames || allGroupNames.includes(this.inputGroupName);
+        const selectedSamples = this.props.store.selectedSamples.isComplete
+            ? this.props.store.selectedSamples.result
+            : undefined;
+        const allGroupNames = this.props.store.comparisonGroups.isComplete
+            ? this.props.store.comparisonGroups.result!.map(group => group.name)
+            : undefined;
+        return (
+            !selectedSamples ||
+            this.inputGroupName.length === 0 ||
+            !allGroupNames ||
+            allGroupNames.includes(this.inputGroupName)
+        );
     }
 
     @autobind
-    @action private async submitNewGroup() {
-        const selectedSamples = this.props.store.selectedSamples.isComplete ? this.props.store.selectedSamples.result :  undefined;
-        const {id}= await comparisonClient.addGroup(getGroupParameters(
-            this.inputGroupName,
-            selectedSamples!,
-            this.props.store.studyIds
-        ));
+    @action
+    private async submitNewGroup() {
+        const selectedSamples = this.props.store.selectedSamples.isComplete
+            ? this.props.store.selectedSamples.result
+            : undefined;
+        const { id } = await comparisonClient.addGroup(
+            getGroupParameters(
+                this.inputGroupName,
+                selectedSamples!,
+                this.props.store.studyIds
+            )
+        );
         this.props.store.setComparisonGroupSelected(id); // created groups start selected
         this.props.store.notifyComparisonGroupsChange();
         this.cancelAddGroup();
@@ -251,49 +316,72 @@ export default class ComparisonGroupManager extends React.Component<IComparisonG
     private get compareButton() {
         if (this.props.store.comparisonGroups.isComplete) {
             // only show if there are enough groups to possibly compare (i.e. 2)
-            const numSelectedGroups = getSelectedGroups(this.props.store.comparisonGroups.result, this.props.store).length;
-            const wrongNumberOfGroups = numSelectedGroups > MAX_GROUPS_IN_SESSION || numSelectedGroups < 2;
+            const numSelectedGroups = getSelectedGroups(
+                this.props.store.comparisonGroups.result,
+                this.props.store
+            ).length;
+            const wrongNumberOfGroups =
+                numSelectedGroups > MAX_GROUPS_IN_SESSION ||
+                numSelectedGroups < 2;
 
-            let tooltipText = "";
-            if (this.props.store.comparisonGroups.result.length >=2) {
+            let tooltipText = '';
+            if (this.props.store.comparisonGroups.result.length >= 2) {
                 if (wrongNumberOfGroups) {
                     tooltipText = `Select between 2 and ${MAX_GROUPS_IN_SESSION} groups to enable comparison.`;
                 } else {
-                    tooltipText = "Open a comparison session with selected groups";
+                    tooltipText =
+                        'Open a comparison session with selected groups';
                 }
             } else {
-                tooltipText = "Create at least two groups to open a comparison session";
+                tooltipText =
+                    'Create at least two groups to open a comparison session';
             }
 
             return (
                 <DefaultTooltip overlay={tooltipText}>
-                    <button className="btn btn-sm btn-primary"
-                            disabled={wrongNumberOfGroups}
-                            data-event={
-                                serializeEvent({
-                                                   action:'createCustomComparisonSession',
-                                                   label:this.props.store.comparisonGroups.result.length.toString(),
-                                                   category:'groupComparison'
-                                               })
-                            }
-                            onClick={async()=>{
-                                // open window before the first `await` call - this makes it a synchronous window.open,
-                                //  which doesnt trigger pop-up blockers. We'll send it to the correct url once we get the result
-                                const comparisonWindow = window.open(getComparisonLoadingUrl({
+                    <button
+                        className="btn btn-sm btn-primary"
+                        disabled={wrongNumberOfGroups}
+                        data-event={serializeEvent({
+                            action: 'createCustomComparisonSession',
+                            label: this.props.store.comparisonGroups.result.length.toString(),
+                            category: 'groupComparison',
+                        })}
+                        onClick={async () => {
+                            // open window before the first `await` call - this makes it a synchronous window.open,
+                            //  which doesnt trigger pop-up blockers. We'll send it to the correct url once we get the result
+                            const comparisonWindow = window.open(
+                                getComparisonLoadingUrl({
                                     phase: LoadingPhase.CREATING_SESSION,
-                                }), "_blank");
+                                }),
+                                '_blank'
+                            );
 
-                                // wait until the new window has routingStore available
-                                await sleepUntil(()=>!!(comparisonWindow as any).routingStore);
+                            // wait until the new window has routingStore available
+                            await sleepUntil(
+                                () => !!(comparisonWindow as any).routingStore
+                            );
 
-                                // save comparison session, and get id
-                                const groups = getSelectedGroups(this.props.store.comparisonGroups.result!, this.props.store);
-                                const {id} = await comparisonClient.addComparisonSession({groups, origin: this.props.store.studyIds});
+                            // save comparison session, and get id
+                            const groups = getSelectedGroups(
+                                this.props.store.comparisonGroups.result!,
+                                this.props.store
+                            );
+                            const {
+                                id,
+                            } = await comparisonClient.addComparisonSession({
+                                groups,
+                                origin: this.props.store.studyIds,
+                            });
 
-                                // redirect window to correct URL
-                                redirectToComparisonPage(comparisonWindow!, { sessionId: id });
-                            }}
-                    >Compare</button>
+                            // redirect window to correct URL
+                            redirectToComparisonPage(comparisonWindow!, {
+                                sessionId: id,
+                            });
+                        }}
+                    >
+                        Compare
+                    </button>
                 </DefaultTooltip>
             );
         } else {
@@ -302,103 +390,139 @@ export default class ComparisonGroupManager extends React.Component<IComparisonG
     }
 
     private readonly actionButtons = MakeMobxView({
-            await:()=>[
-                this.props.store.comparisonGroups
-            ],
-            render:()=> {
-                if (this.props.store.comparisonGroups.result!.length > 0) {
-                    return <div
+        await: () => [this.props.store.comparisonGroups],
+        render: () => {
+            if (this.props.store.comparisonGroups.result!.length > 0) {
+                return (
+                    <div
                         style={{
-                            marginTop:6
+                            marginTop: 6,
                         }}
                     >
                         {this.compareButton}
                         {this.viewButton}
                     </div>
-                } else {
-                   return null;
-                }
+                );
+            } else {
+                return null;
             }
+        },
     });
 
     private get addGroupPanel() {
-        let contents:any;
+        let contents: any;
         const inputWidth = 235;
         const createOrAddButtonWidth = 58;
-        const selectedSamples = this.props.store.selectedSamples.isComplete ? this.props.store.selectedSamples.result :  undefined;
-        const allGroupNames = this.props.store.comparisonGroups.isComplete ? this.props.store.comparisonGroups.result!.map(group=>group.name) : undefined;
+        const selectedSamples = this.props.store.selectedSamples.isComplete
+            ? this.props.store.selectedSamples.result
+            : undefined;
+        const allGroupNames = this.props.store.comparisonGroups.isComplete
+            ? this.props.store.comparisonGroups.result!.map(group => group.name)
+            : undefined;
         if (this.addGroupPanelOpen) {
             contents = [
-                <div style={{display:"none", flexDirection:"row", justifyContent:"space-between", width:"100%", marginTop:3}}>
-                    <h5>Add{selectedSamples ? ` ${selectedSamples.length}` : ""} selected samples</h5>
+                <div
+                    style={{
+                        display: 'none',
+                        flexDirection: 'row',
+                        justifyContent: 'space-between',
+                        width: '100%',
+                        marginTop: 3,
+                    }}
+                >
+                    <h5>
+                        Add{selectedSamples ? ` ${selectedSamples.length}` : ''}{' '}
+                        selected samples
+                    </h5>
                     <button
                         className="btn btn-xs btn-default"
                         style={{
-                            right:0, marginTop:-4
+                            right: 0,
+                            marginTop: -4,
                         }}
                         onClick={this.cancelAddGroup}
-                    >Cancel</button>
+                    >
+                        Cancel
+                    </button>
                 </div>,
-                <div style={{width:"100%", marginTop:7}}>
-                    <div style={{display:"flex", flexDirection:"row", justifyContent:"space-between", alignItems:"center", width:"100%"}}>
+                <div style={{ width: '100%', marginTop: 7 }}>
+                    <div
+                        style={{
+                            display: 'flex',
+                            flexDirection: 'row',
+                            justifyContent: 'space-between',
+                            alignItems: 'center',
+                            width: '100%',
+                        }}
+                    >
                         <DefaultTooltip
-                            visible={allGroupNames && allGroupNames.includes(this.inputGroupName)}
+                            visible={
+                                allGroupNames &&
+                                allGroupNames.includes(this.inputGroupName)
+                            }
                             overlay={
                                 <div>
                                     <i
                                         className="fa fa-md fa-exclamation-triangle"
                                         style={{
-                                            color: "#BB1700",
-                                            marginRight: 5
+                                            color: '#BB1700',
+                                            marginRight: 5,
                                         }}
                                     />
-                                    <span>
-                                        {DUPLICATE_GROUP_NAME_MSG}
-                                    </span>
+                                    <span>{DUPLICATE_GROUP_NAME_MSG}</span>
                                 </div>
                             }
                         >
                             <input
                                 className="form-control"
-                                style={{ marginRight:5 }}
+                                style={{ marginRight: 5 }}
                                 type="text"
                                 placeholder="Enter a name for your new group"
                                 value={this.inputGroupName}
                                 onChange={this.onChangeInputGroupName}
-                                onKeyPress={
-                                    (event) => {
-                                        if(event.key == 'Enter' && !this.submitNewGroupDisabled){
-                                            this.submitNewGroup();
-                                        }
+                                onKeyPress={event => {
+                                    if (
+                                        event.key == 'Enter' &&
+                                        !this.submitNewGroupDisabled
+                                    ) {
+                                        this.submitNewGroup();
                                     }
-                                }
+                                }}
                             />
                         </DefaultTooltip>
                         <button
                             className="btn btn-sm btn-primary"
-                            style={{width:createOrAddButtonWidth}}
+                            style={{ width: createOrAddButtonWidth }}
                             onClick={this.submitNewGroup}
                             disabled={this.submitNewGroupDisabled}
-                        >Create</button>
+                        >
+                            Create
+                        </button>
                     </div>
-                </div>
+                </div>,
             ];
         } else {
             contents = (
                 <button
                     className="btn btn-sm btn-primary"
-                    data-event={serializeEvent({action:'createCustomGroup',label:'', category:'groupComparison' })}
+                    data-event={serializeEvent({
+                        action: 'createCustomGroup',
+                        label: '',
+                        category: 'groupComparison',
+                    })}
                     onClick={this.showAddGroupPanel}
                     disabled={!selectedSamples}
-                    style={{width:"100%"}}
-                >Create new group from selected samples {selectedSamples ? ` (${selectedSamples.length})` : ""}
+                    style={{ width: '100%' }}
+                >
+                    Create new group from selected samples{' '}
+                    {selectedSamples ? ` (${selectedSamples.length})` : ''}
                 </button>
             );
         }
         return (
             <div
                 style={{
-                    width:"100%"
+                    width: '100%',
                 }}
             >
                 {contents}
@@ -412,8 +536,9 @@ export default class ComparisonGroupManager extends React.Component<IComparisonG
 
     render() {
         return (
-            <div className={styles.comparisonGroupManager}
-                 style={{position:"relative"}}
+            <div
+                className={styles.comparisonGroupManager}
+                style={{ position: 'relative' }}
             >
                 {this.header}
                 {this.groupsSection.component}
diff --git a/src/pages/groupComparison/comparisonGroupManager/ComparisonGroupManagerUtils.spec.ts b/src/pages/groupComparison/comparisonGroupManager/ComparisonGroupManagerUtils.spec.ts
index 6803174845c..21cfbab0378 100644
--- a/src/pages/groupComparison/comparisonGroupManager/ComparisonGroupManagerUtils.spec.ts
+++ b/src/pages/groupComparison/comparisonGroupManager/ComparisonGroupManagerUtils.spec.ts
@@ -1,52 +1,70 @@
-import chai, {assert, expect} from 'chai';
-import deepEqualInAnyOrder from "deep-equal-in-any-order";
-import {PatientIdentifier, SampleIdentifier} from "../../../shared/api/generated/CBioPortalAPI";
-import {getStudiesAttr} from "./ComparisonGroupManagerUtils";
+import chai, { assert, expect } from 'chai';
+import deepEqualInAnyOrder from 'deep-equal-in-any-order';
+import {
+    PatientIdentifier,
+    SampleIdentifier,
+} from '../../../shared/api/generated/CBioPortalAPI';
+import { getStudiesAttr } from './ComparisonGroupManagerUtils';
 chai.use(deepEqualInAnyOrder);
 
-describe("ComparisonGroupManagerUtils", () => {
-    describe("getStudiesAttr", ()=>{
-        it("empty for empty", ()=>{
+describe('ComparisonGroupManagerUtils', () => {
+    describe('getStudiesAttr', () => {
+        it('empty for empty', () => {
             assert.deepEqual(getStudiesAttr([]), []);
         });
-        it("fills with samples, no patients attr when patients not given", ()=>{
-            (expect(getStudiesAttr([
-                { studyId:"study1", sampleId:"sample1"},
-                { studyId:"study1", sampleId:"sample2"},
-                { studyId:"study2", sampleId:"sample1"},
-                { studyId:"study2", sampleId:"sample2"},
-                { studyId:"study2", sampleId:"sample3"},
-                { studyId:"study3", sampleId:"sample1"}
-            ])).to.deep as any).equalInAnyOrder(
-                [
-                    { id:"study1", samples:["sample1", "sample2"]},
-                    { id:"study2", samples:["sample1", "sample2", "sample3"]},
-                    { id:"study3", samples:["sample1"]}
-                ]
-            );
+        it('fills with samples, no patients attr when patients not given', () => {
+            (expect(
+                getStudiesAttr([
+                    { studyId: 'study1', sampleId: 'sample1' },
+                    { studyId: 'study1', sampleId: 'sample2' },
+                    { studyId: 'study2', sampleId: 'sample1' },
+                    { studyId: 'study2', sampleId: 'sample2' },
+                    { studyId: 'study2', sampleId: 'sample3' },
+                    { studyId: 'study3', sampleId: 'sample1' },
+                ])
+            ).to.deep as any).equalInAnyOrder([
+                { id: 'study1', samples: ['sample1', 'sample2'] },
+                { id: 'study2', samples: ['sample1', 'sample2', 'sample3'] },
+                { id: 'study3', samples: ['sample1'] },
+            ]);
         });
-        it("fills with samples and patients when both given", ()=>{
-            (expect(getStudiesAttr([
-                { studyId:"study1", sampleId:"sample1"},
-                { studyId:"study1", sampleId:"sample2"},
-                { studyId:"study2", sampleId:"sample1"},
-                { studyId:"study2", sampleId:"sample2"},
-                { studyId:"study2", sampleId:"sample3"},
-                { studyId:"study3", sampleId:"sample1"}
-            ], [
-                { studyId:"study2", patientId:"patient2"},
-                { studyId:"study2", patientId:"patient3"},
-                { studyId:"study2", patientId:"patient1"},
-                { studyId:"study3", patientId:"patient2"},
-                { studyId:"study3", patientId:"patient1"},
-                { studyId:"study1", patientId:"patient1"},
-            ])).to.deep as any).equalInAnyOrder(
-                [
-                    { id:"study1", samples:["sample1", "sample2"], patients:["patient1"]},
-                    { id:"study2", samples:["sample1", "sample2", "sample3"], patients:["patient1", "patient2", "patient3"]},
-                    { id:"study3", samples:["sample1"], patients:["patient1", "patient2"]}
-                ]
-            );
+        it('fills with samples and patients when both given', () => {
+            (expect(
+                getStudiesAttr(
+                    [
+                        { studyId: 'study1', sampleId: 'sample1' },
+                        { studyId: 'study1', sampleId: 'sample2' },
+                        { studyId: 'study2', sampleId: 'sample1' },
+                        { studyId: 'study2', sampleId: 'sample2' },
+                        { studyId: 'study2', sampleId: 'sample3' },
+                        { studyId: 'study3', sampleId: 'sample1' },
+                    ],
+                    [
+                        { studyId: 'study2', patientId: 'patient2' },
+                        { studyId: 'study2', patientId: 'patient3' },
+                        { studyId: 'study2', patientId: 'patient1' },
+                        { studyId: 'study3', patientId: 'patient2' },
+                        { studyId: 'study3', patientId: 'patient1' },
+                        { studyId: 'study1', patientId: 'patient1' },
+                    ]
+                )
+            ).to.deep as any).equalInAnyOrder([
+                {
+                    id: 'study1',
+                    samples: ['sample1', 'sample2'],
+                    patients: ['patient1'],
+                },
+                {
+                    id: 'study2',
+                    samples: ['sample1', 'sample2', 'sample3'],
+                    patients: ['patient1', 'patient2', 'patient3'],
+                },
+                {
+                    id: 'study3',
+                    samples: ['sample1'],
+                    patients: ['patient1', 'patient2'],
+                },
+            ]);
         });
     });
-});
\ No newline at end of file
+});
diff --git a/src/pages/groupComparison/comparisonGroupManager/ComparisonGroupManagerUtils.ts b/src/pages/groupComparison/comparisonGroupManager/ComparisonGroupManagerUtils.ts
index 8a45a58262c..2b5e00b9c3f 100644
--- a/src/pages/groupComparison/comparisonGroupManager/ComparisonGroupManagerUtils.ts
+++ b/src/pages/groupComparison/comparisonGroupManager/ComparisonGroupManagerUtils.ts
@@ -1,39 +1,53 @@
-import {Group, GroupData, SessionGroupData} from "../../../shared/api/ComparisonGroupClient";
-import {StudyViewPageStore} from "../../studyView/StudyViewPageStore";
-import {PatientIdentifier, SampleIdentifier} from "../../../shared/api/generated/CBioPortalAPI";
-import _ from "lodash";
-import {getSampleIdentifiers, StudyViewComparisonGroup} from "../GroupComparisonUtils";
+import {
+    Group,
+    GroupData,
+    SessionGroupData,
+} from '../../../shared/api/ComparisonGroupClient';
+import { StudyViewPageStore } from '../../studyView/StudyViewPageStore';
+import {
+    PatientIdentifier,
+    SampleIdentifier,
+} from '../../../shared/api/generated/CBioPortalAPI';
+import _ from 'lodash';
+import {
+    getSampleIdentifiers,
+    StudyViewComparisonGroup,
+} from '../GroupComparisonUtils';
 
 export function getSelectedGroups(
-    allGroups:StudyViewComparisonGroup[],
-    store:StudyViewPageStore
+    allGroups: StudyViewComparisonGroup[],
+    store: StudyViewPageStore
 ) {
-    return allGroups.filter(group=>store.isComparisonGroupSelected(group.uid));
+    return allGroups.filter(group =>
+        store.isComparisonGroupSelected(group.uid)
+    );
 }
 
 export function getStudiesAttr(
-    sampleIdentifiers:SampleIdentifier[]
-):{id:string, samples:string[]}[];
+    sampleIdentifiers: SampleIdentifier[]
+): { id: string; samples: string[] }[];
 
 export function getStudiesAttr(
-    sampleIdentifiers:SampleIdentifier[],
-    patientIdentifiers:PatientIdentifier[]
-):{id:string, samples:string[], patients:string[]}[];
+    sampleIdentifiers: SampleIdentifier[],
+    patientIdentifiers: PatientIdentifier[]
+): { id: string; samples: string[]; patients: string[] }[];
 
 export function getStudiesAttr(
-    sampleIdentifiers:SampleIdentifier[],
-    patientIdentifiers?:PatientIdentifier[]
+    sampleIdentifiers: SampleIdentifier[],
+    patientIdentifiers?: PatientIdentifier[]
 ) {
-    const samples = _.groupBy(sampleIdentifiers, id=>id.studyId);
-    let patients = patientIdentifiers ? _.groupBy(patientIdentifiers, id=>id.studyId) : {};
+    const samples = _.groupBy(sampleIdentifiers, id => id.studyId);
+    let patients = patientIdentifiers
+        ? _.groupBy(patientIdentifiers, id => id.studyId)
+        : {};
     const studies = _.uniq(Object.keys(samples).concat(Object.keys(patients)));
-    return studies.map(studyId=>{
-        const ret:{id:string, samples:string[], patients?:string[]} = {
+    return studies.map(studyId => {
+        const ret: { id: string; samples: string[]; patients?: string[] } = {
             id: studyId,
-            samples: (samples[studyId] || []).map(id=>id.sampleId)
+            samples: (samples[studyId] || []).map(id => id.sampleId),
         };
         if (patientIdentifiers) {
-            ret.patients = (patients[studyId] || []).map(id=>id.patientId);
+            ret.patients = (patients[studyId] || []).map(id => id.patientId);
         }
         return ret;
     });
@@ -43,27 +57,27 @@ export function getGroupParameters(
     name: string,
     selectedSamples: SampleIdentifier[],
     origin: string[],
-    color?:string
+    color?: string
 ): SessionGroupData {
     return {
         name,
-        description: "",
+        description: '',
         studies: getStudiesAttr(selectedSamples),
         origin,
-        color
+        color,
     };
 }
 
 export function addSamplesParameters(
-    group:GroupData,
-    sampleIdentifiers:SampleIdentifier[]
+    group: GroupData,
+    sampleIdentifiers: SampleIdentifier[]
 ) {
     group = Object.assign({}, group);
     const prevSampleIdentifiers = getSampleIdentifiers([group]);
     const newSampleIdentifiers = _.uniqWith(
         prevSampleIdentifiers.concat(sampleIdentifiers),
-        (a,b)=>(a.studyId === b.studyId)&&(a.sampleId === b.sampleId)
+        (a, b) => a.studyId === b.studyId && a.sampleId === b.sampleId
     );
     group.studies = getStudiesAttr(newSampleIdentifiers);
     return group;
-}
\ No newline at end of file
+}
diff --git a/src/pages/groupComparison/comparisonGroupManager/GroupCheckbox.tsx b/src/pages/groupComparison/comparisonGroupManager/GroupCheckbox.tsx
index 4017ec4f2ca..d630762d132 100644
--- a/src/pages/groupComparison/comparisonGroupManager/GroupCheckbox.tsx
+++ b/src/pages/groupComparison/comparisonGroupManager/GroupCheckbox.tsx
@@ -1,38 +1,42 @@
-import * as React from "react";
-import {observer} from "mobx-react";
+import * as React from 'react';
+import { observer } from 'mobx-react';
 import {
-    caseCounts, DUPLICATE_GROUP_NAME_MSG,
+    caseCounts,
+    DUPLICATE_GROUP_NAME_MSG,
     getNumPatients,
     getNumSamples,
     MissingSamplesMessage,
-    StudyViewComparisonGroup
-} from "../GroupComparisonUtils";
-import {StudyViewPageStore} from "../../studyView/StudyViewPageStore";
-import autobind from "autobind-decorator";
-import {computed, observable} from "mobx";
-import ErrorIcon from "../../../shared/components/ErrorIcon";
-import styles from "../styles.module.scss"
-import {SyntheticEvent} from "react";
-import {DefaultTooltip, EllipsisTextTooltip} from "cbioportal-frontend-commons";
-
-
+    StudyViewComparisonGroup,
+} from '../GroupComparisonUtils';
+import { StudyViewPageStore } from '../../studyView/StudyViewPageStore';
+import autobind from 'autobind-decorator';
+import { computed, observable } from 'mobx';
+import ErrorIcon from '../../../shared/components/ErrorIcon';
+import styles from '../styles.module.scss';
+import { SyntheticEvent } from 'react';
+import {
+    DefaultTooltip,
+    EllipsisTextTooltip,
+} from 'cbioportal-frontend-commons';
 
 export interface IGroupCheckboxProps {
-    group:StudyViewComparisonGroup;
-    store:StudyViewPageStore;
-    markedForDeletion:boolean;
-    restore:(group:StudyViewComparisonGroup)=>void;
-    rename:(newName:string, currentGroup:StudyViewComparisonGroup)=>void;
-    delete:(group:StudyViewComparisonGroup)=>void;
-    addSelectedSamples:(group:StudyViewComparisonGroup)=>void;
-    allGroupNames:string[];
+    group: StudyViewComparisonGroup;
+    store: StudyViewPageStore;
+    markedForDeletion: boolean;
+    restore: (group: StudyViewComparisonGroup) => void;
+    rename: (newName: string, currentGroup: StudyViewComparisonGroup) => void;
+    delete: (group: StudyViewComparisonGroup) => void;
+    addSelectedSamples: (group: StudyViewComparisonGroup) => void;
+    allGroupNames: string[];
 }
 
 @observer
-export default class GroupCheckbox extends React.Component<IGroupCheckboxProps, {}> {
-
+export default class GroupCheckbox extends React.Component<
+    IGroupCheckboxProps,
+    {}
+> {
     @observable _editingName = false;
-    @observable nameInput = "";
+    @observable nameInput = '';
 
     @computed get editingName() {
         return this._editingName && !this.props.markedForDeletion;
@@ -40,7 +44,7 @@ export default class GroupCheckbox extends React.Component<IGroupCheckboxProps,
 
     @autobind
     private onCheckboxClick() {
-        this.props.store.toggleComparisonGroupSelected(this.props.group.uid)
+        this.props.store.toggleComparisonGroupSelected(this.props.group.uid);
     }
 
     @autobind
@@ -81,17 +85,20 @@ export default class GroupCheckbox extends React.Component<IGroupCheckboxProps,
     }
 
     @autobind
-    private handleNameInputChange(evt:SyntheticEvent<HTMLInputElement>) {
+    private handleNameInputChange(evt: SyntheticEvent<HTMLInputElement>) {
         this.nameInput = (evt.target as HTMLInputElement).value;
     }
 
     @computed get label() {
         return (
-            <span style={{display:"flex", alignItems:"center"}}>
-                <EllipsisTextTooltip
-                    text={this.props.group.name}
-                />
-                &nbsp;({caseCounts(getNumSamples(this.props.group), getNumPatients(this.props.group))})
+            <span style={{ display: 'flex', alignItems: 'center' }}>
+                <EllipsisTextTooltip text={this.props.group.name} />
+                &nbsp;(
+                {caseCounts(
+                    getNumSamples(this.props.group),
+                    getNumPatients(this.props.group)
+                )}
+                )
             </span>
         );
     }
@@ -99,19 +106,22 @@ export default class GroupCheckbox extends React.Component<IGroupCheckboxProps,
     @computed get editingNameUI() {
         return (
             <DefaultTooltip
-                visible={!!(this.editSubmitError && this.editSubmitError.message)}
+                visible={
+                    !!(this.editSubmitError && this.editSubmitError.message)
+                }
                 overlay={
                     <div>
                         <i
                             className="fa fa-md fa-exclamation-triangle"
                             style={{
-                                color: "#BB1700",
-                                marginRight: 5
+                                color: '#BB1700',
+                                marginRight: 5,
                             }}
                         />
                         <span>
-                                    {this.editSubmitError && this.editSubmitError.message}
-                                </span>
+                            {this.editSubmitError &&
+                                this.editSubmitError.message}
+                        </span>
                     </div>
                 }
             >
@@ -119,7 +129,7 @@ export default class GroupCheckbox extends React.Component<IGroupCheckboxProps,
                     type="text"
                     value={this.nameInput}
                     onChange={this.handleNameInputChange}
-                    style={{width:174}}
+                    style={{ width: 174 }}
                 />
             </DefaultTooltip>
         );
@@ -127,12 +137,12 @@ export default class GroupCheckbox extends React.Component<IGroupCheckboxProps,
 
     @computed get editSubmitError() {
         if (this.nameInput.length === 0) {
-            return { message: "Please enter a name."};
+            return { message: 'Please enter a name.' };
         } else if (this.nameInput === this.props.group.name) {
             // Non-null object signifies that submit should be disabled, but no message specified means no tooltip.
             return {};
         } else if (this.props.allGroupNames.indexOf(this.nameInput) > -1) {
-            return { message: DUPLICATE_GROUP_NAME_MSG};
+            return { message: DUPLICATE_GROUP_NAME_MSG };
         } else {
             return null;
         }
@@ -142,20 +152,24 @@ export default class GroupCheckbox extends React.Component<IGroupCheckboxProps,
         const group = this.props.group;
         let checkboxAndLabel;
         if (this.props.markedForDeletion) {
-            checkboxAndLabel = <span className={styles.markedForDeletion}>{this.label}</span>;
+            checkboxAndLabel = (
+                <span className={styles.markedForDeletion}>{this.label}</span>
+            );
         } else {
             checkboxAndLabel = (
-                <div className={styles.groupItem} style={{display:"flex", alignItems:"center"}}>
+                <div
+                    className={styles.groupItem}
+                    style={{ display: 'flex', alignItems: 'center' }}
+                >
                     <input
                         type="checkbox"
                         value={group.uid}
-                        checked={this.props.store.isComparisonGroupSelected(group.uid)}
+                        checked={this.props.store.isComparisonGroupSelected(
+                            group.uid
+                        )}
                         onClick={this.onCheckboxClick}
                     />
-                    { this.editingName ?
-                        this.editingNameUI :
-                        this.label
-                    }
+                    {this.editingName ? this.editingNameUI : this.label}
                 </div>
             );
         }
@@ -167,7 +181,7 @@ export default class GroupCheckbox extends React.Component<IGroupCheckboxProps,
                     className="btn btn-xs btn-primary"
                     onClick={this.onEditSubmit}
                     disabled={!!this.editSubmitError}
-                    style={{marginRight:3}}
+                    style={{ marginRight: 3 }}
                 >
                     Save
                 </button>,
@@ -176,66 +190,90 @@ export default class GroupCheckbox extends React.Component<IGroupCheckboxProps,
                     onClick={this.onEditCancel}
                 >
                     Cancel
-                </button>
+                </button>,
             ];
         } else if (!this.props.markedForDeletion) {
             editingRelatedIcons = [
-                <DefaultTooltip overlay={"Edit Name"}>
-                <span
-                    onClick={this.onEditClick}
-                >
-                    <i
-                        className="fa fa-md fa-pencil"
-                        style={{
-                            cursor:"pointer"
-                        }}
-                    />
-                </span></DefaultTooltip>,
-                <DefaultTooltip overlay={"Delete Group"}>
-                <span
-                    onClick={this.onDeleteClick}
+                <DefaultTooltip overlay={'Edit Name'}>
+                    <span onClick={this.onEditClick}>
+                        <i
+                            className="fa fa-md fa-pencil"
+                            style={{
+                                cursor: 'pointer',
+                            }}
+                        />
+                    </span>
+                </DefaultTooltip>,
+                <DefaultTooltip overlay={'Delete Group'}>
+                    <span onClick={this.onDeleteClick}>
+                        <i
+                            className="fa fa-md fa-trash"
+                            style={{
+                                cursor: 'pointer',
+                            }}
+                        />
+                    </span>
+                </DefaultTooltip>,
+                <DefaultTooltip
+                    overlay={
+                        <span>
+                            {`Add currently selected samples (${getNumSamples(
+                                group
+                            )}) to `}
+                            <strong>{group.name}</strong>
+                        </span>
+                    }
                 >
-                    <i
-                        className="fa fa-md fa-trash"
-                        style={{
-                            cursor:"pointer"
-                        }}
-                    />
-                </span></DefaultTooltip>,
-                <DefaultTooltip overlay={<span>{`Add currently selected samples (${getNumSamples(group)}) to `}<strong>{group.name}</strong></span>}>
-                    <span
-                        onClick={this.onAddSelectedSamplesClick}
-                    >
+                    <span onClick={this.onAddSelectedSamplesClick}>
                         <i
                             className="fa fa-md fa-plus"
                             style={{
-                                cursor:"pointer"
+                                cursor: 'pointer',
                             }}
                         />
                     </span>
-                </DefaultTooltip>
+                </DefaultTooltip>,
             ];
         }
-        
+
         return (
-            <div key={group.uid}
+            <div
+                key={group.uid}
                 className={styles.groupRow}
                 style={{
-                    display:"flex",
-                    flexDirection:"row",
-                    justifyContent:"space-between",
-                    alignItems:"center",
-                    paddingBottom:4,
-                    paddingTop:4
+                    display: 'flex',
+                    flexDirection: 'row',
+                    justifyContent: 'space-between',
+                    alignItems: 'center',
+                    paddingBottom: 4,
+                    paddingTop: 4,
                 }}
             >
                 {checkboxAndLabel}
                 <div className={styles.groupLineItemActionButtons}>
                     {editingRelatedIcons}
-                    {this.props.group.nonExistentSamples.length > 0 && <ErrorIcon tooltip={<MissingSamplesMessage samples={this.props.group.nonExistentSamples}/>} />}
-                    {this.props.markedForDeletion && (<button style={{marginLeft:10}} className="btn btn-xs btn-default" onClick={this.onRestoreClick}>Restore</button>)}
+                    {this.props.group.nonExistentSamples.length > 0 && (
+                        <ErrorIcon
+                            tooltip={
+                                <MissingSamplesMessage
+                                    samples={
+                                        this.props.group.nonExistentSamples
+                                    }
+                                />
+                            }
+                        />
+                    )}
+                    {this.props.markedForDeletion && (
+                        <button
+                            style={{ marginLeft: 10 }}
+                            className="btn btn-xs btn-default"
+                            onClick={this.onRestoreClick}
+                        >
+                            Restore
+                        </button>
+                    )}
                 </div>
             </div>
         );
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/groupComparison/groupSelector/GroupSelector.tsx b/src/pages/groupComparison/groupSelector/GroupSelector.tsx
index d3fcae221b3..fe9f3bc64a7 100644
--- a/src/pages/groupComparison/groupSelector/GroupSelector.tsx
+++ b/src/pages/groupComparison/groupSelector/GroupSelector.tsx
@@ -1,44 +1,46 @@
-import * as React from "react";
-import {observer} from "mobx-react";
-import {MakeMobxView} from "shared/components/MobxView";
-import LoadingIndicator from "shared/components/loadingIndicator/LoadingIndicator";
-import ErrorMessage from "shared/components/ErrorMessage";
-import GroupComparisonStore, {OverlapStrategy} from "../GroupComparisonStore";
-import autobind from "autobind-decorator";
-import GroupSelectorButton from "./GroupSelectorButton";
-import GroupSelectorButtonList from "./GroupSelectorButtonList";
-import SelectAllDeselectAll from "./SelectAllDeselectAll";
+import * as React from 'react';
+import { observer } from 'mobx-react';
+import { MakeMobxView } from 'shared/components/MobxView';
+import LoadingIndicator from 'shared/components/loadingIndicator/LoadingIndicator';
+import ErrorMessage from 'shared/components/ErrorMessage';
+import GroupComparisonStore, { OverlapStrategy } from '../GroupComparisonStore';
+import autobind from 'autobind-decorator';
+import GroupSelectorButton from './GroupSelectorButton';
+import GroupSelectorButtonList from './GroupSelectorButtonList';
+import SelectAllDeselectAll from './SelectAllDeselectAll';
 
 export interface IGroupSelectorProps {
-    store:GroupComparisonStore;
+    store: GroupComparisonStore;
 }
 
 @observer
-export default class GroupSelector extends React.Component<IGroupSelectorProps,{}> {
-
+export default class GroupSelector extends React.Component<
+    IGroupSelectorProps,
+    {}
+> {
     private dragging = false;
 
     @autobind
-    private isSelected(groupName:string) {
+    private isSelected(groupName: string) {
         return !!this.props.store.isGroupSelected(groupName);
     }
 
     @autobind
-    private onClick(groupName:string) {
+    private onClick(groupName: string) {
         if (!this.dragging) {
             this.props.store.toggleGroupSelected(groupName);
         }
     }
 
     @autobind
-    private onClickDelete(groupName:string) {
+    private onClickDelete(groupName: string) {
         if (!this.dragging) {
             this.props.store.deleteGroup(groupName);
         }
     }
 
     @autobind
-    private onSortEnd(params:any) {
+    private onSortEnd(params: any) {
         if (params.oldIndex !== params.newIndex)
             this.props.store.updateGroupOrder(params.oldIndex, params.newIndex);
 
@@ -51,43 +53,59 @@ export default class GroupSelector extends React.Component<IGroupSelectorProps,{
     }
 
     readonly tabUI = MakeMobxView({
-        await:()=>[
+        await: () => [
             this.props.store._originalGroups,
             this.props.store.sampleSet,
-            this.props.store.overlapComputations
+            this.props.store.overlapComputations,
         ],
-        render:()=>{
+        render: () => {
             if (this.props.store._originalGroups.result!.length === 0) {
                 return null;
             } else {
-                const deletable = this.props.store._originalGroups.result!.length > 2;
-                const buttons = this.props.store._originalGroups.result!.map((group, index)=>{
-                    const excludedFromAnalysis =
-                        this.props.store.overlapStrategy === OverlapStrategy.EXCLUDE &&
-                        (group.uid in this.props.store.overlapComputations.result!.excludedFromAnalysis);
+                const deletable =
+                    this.props.store._originalGroups.result!.length > 2;
+                const buttons = this.props.store._originalGroups.result!.map(
+                    (group, index) => {
+                        const excludedFromAnalysis =
+                            this.props.store.overlapStrategy ===
+                                OverlapStrategy.EXCLUDE &&
+                            group.uid in
+                                this.props.store.overlapComputations.result!
+                                    .excludedFromAnalysis;
 
-                    return (
-                        <GroupSelectorButton
-                            isSelected={this.isSelected}
-                            deletable={deletable}
-                            onClick={this.onClick}
-                            onClickDelete={this.onClickDelete}
-                            sampleSet={this.props.store.sampleSet.result!}
-                            group={group}
-                            index={index}
-                            excludedFromAnalysis={excludedFromAnalysis}
-                        />
-                    );
-                });
-                buttons.push(<SelectAllDeselectAll store={this.props.store} disabled={true} index={buttons.length}/>);
+                        return (
+                            <GroupSelectorButton
+                                isSelected={this.isSelected}
+                                deletable={deletable}
+                                onClick={this.onClick}
+                                onClickDelete={this.onClickDelete}
+                                sampleSet={this.props.store.sampleSet.result!}
+                                group={group}
+                                index={index}
+                                excludedFromAnalysis={excludedFromAnalysis}
+                            />
+                        );
+                    }
+                );
+                buttons.push(
+                    <SelectAllDeselectAll
+                        store={this.props.store}
+                        disabled={true}
+                        index={buttons.length}
+                    />
+                );
                 return (
-                    <div style={{
-                        display:"flex",
-                        alignItems:"center",
-                        position:"relative"
-                    }}>
-                        <strong style={{marginRight:5}}>Groups: </strong>
-                        <span style={{fontSize:12, marginRight:3}}>(drag to reorder)</span>
+                    <div
+                        style={{
+                            display: 'flex',
+                            alignItems: 'center',
+                            position: 'relative',
+                        }}
+                    >
+                        <strong style={{ marginRight: 5 }}>Groups: </strong>
+                        <span style={{ fontSize: 12, marginRight: 3 }}>
+                            (drag to reorder)
+                        </span>
                         <GroupSelectorButtonList
                             buttons={buttons}
                             axis="xy"
@@ -96,14 +114,16 @@ export default class GroupSelector extends React.Component<IGroupSelectorProps,{
                             distance={6}
                         />
                     </div>
-                )
+                );
             }
         },
-        renderPending:()=><LoadingIndicator isLoading={true} size="big" center={true} />,
-        renderError:()=><ErrorMessage/>
+        renderPending: () => (
+            <LoadingIndicator isLoading={true} size="big" center={true} />
+        ),
+        renderError: () => <ErrorMessage />,
     });
 
     render() {
         return this.tabUI.component;
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/groupComparison/groupSelector/GroupSelectorButton.tsx b/src/pages/groupComparison/groupSelector/GroupSelectorButton.tsx
index e7e4afb4230..c4fa5ed68a2 100644
--- a/src/pages/groupComparison/groupSelector/GroupSelectorButton.tsx
+++ b/src/pages/groupComparison/groupSelector/GroupSelectorButton.tsx
@@ -1,45 +1,49 @@
-import * as React from "react";
-import {observer} from "mobx-react";
-import classNames from "classnames";
-import styles from "../styles.module.scss";
+import * as React from 'react';
+import { observer } from 'mobx-react';
+import classNames from 'classnames';
+import styles from '../styles.module.scss';
 import {
     caseCountsInParens,
-    ComparisonGroup, getPatientIdentifiers,
+    ComparisonGroup,
+    getPatientIdentifiers,
     getSampleIdentifiers,
-    MissingSamplesMessage
-} from "../GroupComparisonUtils";
-import ErrorIcon from "../../../shared/components/ErrorIcon";
-import ComplexKeyMap from "../../../shared/lib/complexKeyDataStructures/ComplexKeyMap";
-import {Sample} from "../../../shared/api/generated/CBioPortalAPI";
-import {SortableElement} from "react-sortable-hoc";
-import {getTextColor, renderGroupNameWithOrdinal} from "../OverlapUtils";
-import {TOOLTIP_MOUSE_ENTER_DELAY_MS} from "cbioportal-frontend-commons";
-import * as ReactDOM from "react-dom";
-import {Popover, Overlay} from "react-bootstrap";
-import classnames from "classnames";
-import {action, observable} from "mobx";
-import autobind from "autobind-decorator";
-import {ButtonHTMLAttributes} from "react";
+    MissingSamplesMessage,
+} from '../GroupComparisonUtils';
+import ErrorIcon from '../../../shared/components/ErrorIcon';
+import ComplexKeyMap from '../../../shared/lib/complexKeyDataStructures/ComplexKeyMap';
+import { Sample } from '../../../shared/api/generated/CBioPortalAPI';
+import { SortableElement } from 'react-sortable-hoc';
+import { getTextColor, renderGroupNameWithOrdinal } from '../OverlapUtils';
+import { TOOLTIP_MOUSE_ENTER_DELAY_MS } from 'cbioportal-frontend-commons';
+import * as ReactDOM from 'react-dom';
+import { Popover, Overlay } from 'react-bootstrap';
+import classnames from 'classnames';
+import { action, observable } from 'mobx';
+import autobind from 'autobind-decorator';
+import { ButtonHTMLAttributes } from 'react';
 
 export interface IGroupSelectorButtonProps {
-    onClick:(name:string)=>void;
-    onClickDelete:(name:string)=>void;
-    deletable:boolean;
-    isSelected:(name:string)=>boolean;
-    group:ComparisonGroup;
-    sampleSet:ComplexKeyMap<Sample>;
-    excludedFromAnalysis:boolean;
+    onClick: (name: string) => void;
+    onClickDelete: (name: string) => void;
+    deletable: boolean;
+    isSelected: (name: string) => boolean;
+    group: ComparisonGroup;
+    sampleSet: ComplexKeyMap<Sample>;
+    excludedFromAnalysis: boolean;
 }
 
 @observer
-class GroupSelectorButton extends React.Component<IGroupSelectorButtonProps, {}> {
+class GroupSelectorButton extends React.Component<
+    IGroupSelectorButtonProps,
+    {}
+> {
     @observable hovered = false;
-    @observable.ref button:HTMLButtonElement|null;
-    private hoverTimeout:any = null;
+    @observable.ref button: HTMLButtonElement | null;
+    private hoverTimeout: any = null;
 
     @autobind
     @action
-    private buttonRef(button:HTMLButtonElement|null) {
+    private buttonRef(button: HTMLButtonElement | null) {
         this.button = button;
     }
 
@@ -52,7 +56,9 @@ class GroupSelectorButton extends React.Component<IGroupSelectorButtonProps, {}>
     @autobind
     @action
     private onMouseEnter() {
-        this.hoverTimeout = setTimeout(()=>{ this.hovered = true; }, TOOLTIP_MOUSE_ENTER_DELAY_MS);
+        this.hoverTimeout = setTimeout(() => {
+            this.hovered = true;
+        }, TOOLTIP_MOUSE_ENTER_DELAY_MS);
     }
 
     @autobind
@@ -73,84 +79,120 @@ class GroupSelectorButton extends React.Component<IGroupSelectorButtonProps, {}>
         const group = this.props.group;
         const selected = this.props.isSelected(group.name);
         const sampleIdentifiers = getSampleIdentifiers([group]);
-        const patientIdentifiers = getPatientIdentifiers(sampleIdentifiers, this.props.sampleSet);
+        const patientIdentifiers = getPatientIdentifiers(
+            sampleIdentifiers,
+            this.props.sampleSet
+        );
 
         const button = (
             <button
                 ref={this.buttonRef}
-                className={classNames('btn btn-xs', { [styles.buttonUnselected]:!selected, [styles.buttonExcludedFromAnalysis]:this.props.excludedFromAnalysis})}
+                className={classNames('btn btn-xs', {
+                    [styles.buttonUnselected]: !selected,
+                    [styles.buttonExcludedFromAnalysis]: this.props
+                        .excludedFromAnalysis,
+                })}
                 onClick={this.onMouseClick}
                 onMouseEnter={this.onMouseEnter}
                 onMouseLeave={this.onMouseLeave}
                 onMouseDown={this.onMouseDown}
                 style={{
-                    backgroundColor: group.color
+                    backgroundColor: group.color,
                 }}
                 data-test={`groupSelectorButton${group.ordinal}`}
             >
-                <span style={{display:"flex", alignItems:"center"}}>
+                <span style={{ display: 'flex', alignItems: 'center' }}>
                     <div
-                        style={{display:"flex", alignItems:"center"}}
-                        onClick={()=>this.props.onClick(group.name)}
+                        style={{ display: 'flex', alignItems: 'center' }}
+                        onClick={() => this.props.onClick(group.name)}
                     >
                         <div
                             className="text-with-ellipsis"
                             style={{
-                                display:"inline-block",
-                                color:getTextColor(group.color),
-                                maxWidth:200
+                                display: 'inline-block',
+                                color: getTextColor(group.color),
+                                maxWidth: 200,
                             }}
                         >
                             {renderGroupNameWithOrdinal(group)}
                         </div>
                         &nbsp;
-                        <span style={{color:getTextColor(group.color)}}>
-                            ({ sampleIdentifiers.length === patientIdentifiers.length ?
-                                sampleIdentifiers.length :
-                                `${sampleIdentifiers.length}/${patientIdentifiers.length}`
-                            })
+                        <span style={{ color: getTextColor(group.color) }}>
+                            (
+                            {sampleIdentifiers.length ===
+                            patientIdentifiers.length
+                                ? sampleIdentifiers.length
+                                : `${sampleIdentifiers.length}/${patientIdentifiers.length}`}
+                            )
                         </span>
                     </div>
-                    {group.nonExistentSamples.length > 0 && <ErrorIcon style={{marginLeft:7}} tooltip={<MissingSamplesMessage samples={group.nonExistentSamples}/>}/>}
+                    {group.nonExistentSamples.length > 0 && (
+                        <ErrorIcon
+                            style={{ marginLeft: 7 }}
+                            tooltip={
+                                <MissingSamplesMessage
+                                    samples={group.nonExistentSamples}
+                                />
+                            }
+                        />
+                    )}
                     {this.props.deletable && (
                         <div
                             style={{
-                                paddingLeft:2,
-                                marginLeft:5,
-                                marginRight:-3,
-                                borderLeft: "1px dashed white",
-                                cursor: "pointer"
+                                paddingLeft: 2,
+                                marginLeft: 5,
+                                marginRight: -3,
+                                borderLeft: '1px dashed white',
+                                cursor: 'pointer',
                             }}
                             data-test="deleteButton"
-                            onClick={()=>this.props.onClickDelete(group.name)}
+                            onClick={() => this.props.onClickDelete(group.name)}
                         >
-                            <i className="fa fa-times-circle"/>
+                            <i className="fa fa-times-circle" />
                         </div>
                     )}
                 </span>
-                {this.button && (ReactDOM as any).createPortal(
-                    <Overlay
-                        rootClose
-                        placement="top"
-                        show={this.hovered}
-                        target={this.button}
-                    >
-                        <Popover
-                            arrowOffsetTop={17}
-                            className={classnames("cbioportal-frontend", "cbioTooltip", styles.Tooltip)}
+                {this.button &&
+                    (ReactDOM as any).createPortal(
+                        <Overlay
+                            rootClose
+                            placement="top"
+                            show={this.hovered}
+                            target={this.button}
                         >
-                            <div>
-                                {renderGroupNameWithOrdinal(group)}&nbsp;{caseCountsInParens(sampleIdentifiers, patientIdentifiers)}
-                            </div>
-                            {this.props.excludedFromAnalysis && (
-                                <div style={{maxWidth:300, whiteSpace:"initial", marginTop:5}}>
-                                    This group is a subset of the other selected groups, so it's excluded from analysis, and not considered in overlap calculations.
+                            <Popover
+                                arrowOffsetTop={17}
+                                className={classnames(
+                                    'cbioportal-frontend',
+                                    'cbioTooltip',
+                                    styles.Tooltip
+                                )}
+                            >
+                                <div>
+                                    {renderGroupNameWithOrdinal(group)}&nbsp;
+                                    {caseCountsInParens(
+                                        sampleIdentifiers,
+                                        patientIdentifiers
+                                    )}
                                 </div>
-                            )}
-                        </Popover>
-                    </Overlay>,
-                    document.body
-                )}
+                                {this.props.excludedFromAnalysis && (
+                                    <div
+                                        style={{
+                                            maxWidth: 300,
+                                            whiteSpace: 'initial',
+                                            marginTop: 5,
+                                        }}
+                                    >
+                                        This group is a subset of the other
+                                        selected groups, so it's excluded from
+                                        analysis, and not considered in overlap
+                                        calculations.
+                                    </div>
+                                )}
+                            </Popover>
+                        </Overlay>,
+                        document.body
+                    )}
             </button>
         );
 
@@ -158,4 +200,4 @@ class GroupSelectorButton extends React.Component<IGroupSelectorButtonProps, {}>
     }
 }
 
-export default SortableElement(GroupSelectorButton);
\ No newline at end of file
+export default SortableElement(GroupSelectorButton);
diff --git a/src/pages/groupComparison/groupSelector/GroupSelectorButtonList.tsx b/src/pages/groupComparison/groupSelector/GroupSelectorButtonList.tsx
index d5cff358397..271e1349f05 100644
--- a/src/pages/groupComparison/groupSelector/GroupSelectorButtonList.tsx
+++ b/src/pages/groupComparison/groupSelector/GroupSelectorButtonList.tsx
@@ -1,23 +1,24 @@
-import * as React from "react";
-import {observer} from "mobx-react";
-import styles from "../styles.module.scss";
-import {SortableContainer} from "react-sortable-hoc";
+import * as React from 'react';
+import { observer } from 'mobx-react';
+import styles from '../styles.module.scss';
+import { SortableContainer } from 'react-sortable-hoc';
 
 export interface IGroupSelectorButtonListProps {
-    buttons:any[];
+    buttons: any[];
 }
 
 @observer
-class GroupSelectorButtonList extends React.Component<IGroupSelectorButtonListProps, {}> {
+class GroupSelectorButtonList extends React.Component<
+    IGroupSelectorButtonListProps,
+    {}
+> {
     render() {
         return (
             <div className={styles.groupButtons}>
-                <div>
-                    {this.props.buttons}
-                </div>
+                <div>{this.props.buttons}</div>
             </div>
         );
     }
 }
 
-export default SortableContainer(GroupSelectorButtonList);
\ No newline at end of file
+export default SortableContainer(GroupSelectorButtonList);
diff --git a/src/pages/groupComparison/groupSelector/SelectAllDeselectAll.tsx b/src/pages/groupComparison/groupSelector/SelectAllDeselectAll.tsx
index 124d5868ad9..0bd0cda8fb6 100644
--- a/src/pages/groupComparison/groupSelector/SelectAllDeselectAll.tsx
+++ b/src/pages/groupComparison/groupSelector/SelectAllDeselectAll.tsx
@@ -1,22 +1,24 @@
-import * as React from "react";
-import {observer} from "mobx-react";
-import {SortableElement} from "react-sortable-hoc";
-import GroupComparisonStore from "../GroupComparisonStore";
+import * as React from 'react';
+import { observer } from 'mobx-react';
+import { SortableElement } from 'react-sortable-hoc';
+import GroupComparisonStore from '../GroupComparisonStore';
 
 export interface ISelectionButtonProps {
-    store:GroupComparisonStore;
+    store: GroupComparisonStore;
 }
 
 @observer
 class SelectAllDeselectAll extends React.Component<ISelectionButtonProps, {}> {
     render() {
         return (
-            <div style={{
-                display:'inline-flex',
-                whiteSpace:'nowrap',
-                paddingLeft:7,
-                paddingRight:7
-            }} >
+            <div
+                style={{
+                    display: 'inline-flex',
+                    whiteSpace: 'nowrap',
+                    paddingLeft: 7,
+                    paddingRight: 7,
+                }}
+            >
                 <a onClick={this.props.store.selectAllGroups}>Select all</a>
                 &nbsp;|&nbsp;
                 <a onClick={this.props.store.deselectAllGroups}>Deselect all</a>
diff --git a/src/pages/groupComparison/labelComponents/GroupLegendLabelComponent.tsx b/src/pages/groupComparison/labelComponents/GroupLegendLabelComponent.tsx
index 108288d158a..bce5765587c 100644
--- a/src/pages/groupComparison/labelComponents/GroupLegendLabelComponent.tsx
+++ b/src/pages/groupComparison/labelComponents/GroupLegendLabelComponent.tsx
@@ -1,25 +1,27 @@
-import * as React from "react";
-import TruncatedTextWithTooltipSVG from "../../../shared/components/TruncatedTextWithTooltipSVG";
-import {ComparisonGroup} from "../GroupComparisonUtils";
-import {renderGroupNameWithOrdinal} from "../OverlapUtils";
-import {OverlapStrategy} from "../GroupComparisonStore";
-import {insertBetween} from "../../../shared/lib/ArrayUtils";
+import * as React from 'react';
+import TruncatedTextWithTooltipSVG from '../../../shared/components/TruncatedTextWithTooltipSVG';
+import { ComparisonGroup } from '../GroupComparisonUtils';
+import { renderGroupNameWithOrdinal } from '../OverlapUtils';
+import { OverlapStrategy } from '../GroupComparisonStore';
+import { insertBetween } from '../../../shared/lib/ArrayUtils';
 
 export interface IGroupLegendLabelComponentProps {
     maxLabelWidth: number;
-    uidToGroup:{[uid:string]:ComparisonGroup};
-    dy?:string;
-    dx?:string;
+    uidToGroup: { [uid: string]: ComparisonGroup };
+    dy?: string;
+    dx?: string;
 
     // always there, given by victory, but has to be optional so we don't get typeerrors when passing it as a victory label component prop
-    text?:string;
+    text?: string;
 
     // unused props given by victory that we have to extract
-    datum?:any;
+    datum?: any;
 }
 
-export const GroupLegendLabelComponent:React.FunctionComponent<IGroupLegendLabelComponentProps> = (props:IGroupLegendLabelComponentProps)=>{
-    const {uidToGroup, dx, dy, datum, text, ...rest} = props;
+export const GroupLegendLabelComponent: React.FunctionComponent<
+    IGroupLegendLabelComponentProps
+> = (props: IGroupLegendLabelComponentProps) => {
+    const { uidToGroup, dx, dy, datum, text, ...rest } = props;
 
     const group = uidToGroup[props.text!];
     return (
@@ -27,15 +29,11 @@ export const GroupLegendLabelComponent:React.FunctionComponent<IGroupLegendLabel
             text={group!.name}
             prefixTspans={[
                 <tspan>(</tspan>,
-                <tspan style={{fontWeight:"bold"}}>{group!.ordinal}</tspan>,
-                <tspan>) </tspan>
+                <tspan style={{ fontWeight: 'bold' }}>{group!.ordinal}</tspan>,
+                <tspan>) </tspan>,
             ]}
-            tooltip={()=>{
-                return (
-                    <div>
-                        {renderGroupNameWithOrdinal(group)}
-                    </div>
-                );
+            tooltip={() => {
+                return <div>{renderGroupNameWithOrdinal(group)}</div>;
             }}
             maxWidth={props.maxLabelWidth}
             dy={dy}
@@ -45,25 +43,34 @@ export const GroupLegendLabelComponent:React.FunctionComponent<IGroupLegendLabel
     );
 };
 
-export const SurvivalTabGroupLegendLabelComponent:React.FunctionComponent<IGroupLegendLabelComponentProps> = (props:IGroupLegendLabelComponentProps)=>{
-    const {uidToGroup, dx, dy, datum, text, ...rest} = props;
+export const SurvivalTabGroupLegendLabelComponent: React.FunctionComponent<
+    IGroupLegendLabelComponentProps
+> = (props: IGroupLegendLabelComponentProps) => {
+    const { uidToGroup, dx, dy, datum, text, ...rest } = props;
 
     const groupUids = JSON.parse(text!) as string[];
-    const groups = groupUids.map(uid=>uidToGroup[uid]);
-    const groupOrdinals = groups.map(group=>group.ordinal);
-    const textToTruncate = `Only ${groupOrdinals.map(o=>`(${o})`).join(", ")}`;
+    const groups = groupUids.map(uid => uidToGroup[uid]);
+    const groupOrdinals = groups.map(group => group.ordinal);
+    const textToTruncate = `Only ${groupOrdinals
+        .map(o => `(${o})`)
+        .join(', ')}`;
     return (
         <TruncatedTextWithTooltipSVG
             text={textToTruncate}
-            renderTruncatedText={(truncatedText:string)=>{
+            renderTruncatedText={(truncatedText: string) => {
                 const ret = [];
-                for (let i=0; i<truncatedText.length; i++) {
-                    const bold = ((i > 0) &&
-                        (i < truncatedText.length - 1) &&
-                        (truncatedText[i-1] === "(") &&
-                        (truncatedText[i+1] === ")"));
+                for (let i = 0; i < truncatedText.length; i++) {
+                    const bold =
+                        i > 0 &&
+                        i < truncatedText.length - 1 &&
+                        truncatedText[i - 1] === '(' &&
+                        truncatedText[i + 1] === ')';
                     if (bold) {
-                        ret.push(<tspan style={{fontWeight:"bold"}}>{truncatedText[i]}</tspan>)
+                        ret.push(
+                            <tspan style={{ fontWeight: 'bold' }}>
+                                {truncatedText[i]}
+                            </tspan>
+                        );
                     } else {
                         ret.push(<tspan>{truncatedText[i]}</tspan>);
                     }
@@ -71,10 +78,16 @@ export const SurvivalTabGroupLegendLabelComponent:React.FunctionComponent<IGroup
                 return ret;
             }}
             alwaysShowTooltip={true}
-            tooltip={()=>{
+            tooltip={() => {
                 return (
                     <div>
-                        Only {insertBetween(<span>,&nbsp;</span>, groups.map(group=>renderGroupNameWithOrdinal(group)))}
+                        Only{' '}
+                        {insertBetween(
+                            <span>,&nbsp;</span>,
+                            groups.map(group =>
+                                renderGroupNameWithOrdinal(group)
+                            )
+                        )}
                     </div>
                 );
             }}
@@ -84,4 +97,4 @@ export const SurvivalTabGroupLegendLabelComponent:React.FunctionComponent<IGroup
             {...rest}
         />
     );
-};
\ No newline at end of file
+};
diff --git a/src/pages/groupComparison/labelComponents/GroupTickLabelComponent.tsx b/src/pages/groupComparison/labelComponents/GroupTickLabelComponent.tsx
index a8ce9212a98..2d3f1062a4f 100644
--- a/src/pages/groupComparison/labelComponents/GroupTickLabelComponent.tsx
+++ b/src/pages/groupComparison/labelComponents/GroupTickLabelComponent.tsx
@@ -1,25 +1,27 @@
-import * as React from "react";
-import TruncatedTextWithTooltipSVG from "../../../shared/components/TruncatedTextWithTooltipSVG";
-import {ComparisonGroup} from "../GroupComparisonUtils";
-import {getTextColor, renderGroupNameWithOrdinal} from "../OverlapUtils";
-import {observer} from "mobx-react";
-import autobind from "autobind-decorator";
-import {action, computed, observable} from "mobx";
+import * as React from 'react';
+import TruncatedTextWithTooltipSVG from '../../../shared/components/TruncatedTextWithTooltipSVG';
+import { ComparisonGroup } from '../GroupComparisonUtils';
+import { getTextColor, renderGroupNameWithOrdinal } from '../OverlapUtils';
+import { observer } from 'mobx-react';
+import autobind from 'autobind-decorator';
+import { action, computed, observable } from 'mobx';
 
 export interface IGroupTickLabelComponentProps {
-    categoryCoordToGroup:(coord:number)=>ComparisonGroup;
+    categoryCoordToGroup: (coord: number) => ComparisonGroup;
     maxLabelWidth: number;
-    text?:number; // always there, has to be optional so we dont get typeerrors when passing it as prop eg
-                    // tickLabelComponent={<GroupTickLabelComponent categoryCoordToGroup={this.categoryCoordToGroup} maxLabelWidth={MAX_LABEL_WIDTH}/>}
-    dy?:string;
-    dx?:string;
+    text?: number; // always there, has to be optional so we dont get typeerrors when passing it as prop eg
+    // tickLabelComponent={<GroupTickLabelComponent categoryCoordToGroup={this.categoryCoordToGroup} maxLabelWidth={MAX_LABEL_WIDTH}/>}
+    dy?: string;
+    dx?: string;
     // unused victory props
-    datum?:any;
+    datum?: any;
 }
 
 @observer
-export default class GroupTickLabelComponent extends React.Component<IGroupTickLabelComponentProps> {
-    @observable.ref private textElt:SVGTextElement|null = null;
+export default class GroupTickLabelComponent extends React.Component<
+    IGroupTickLabelComponentProps
+> {
+    @observable.ref private textElt: SVGTextElement | null = null;
 
     @computed get group() {
         return this.props.categoryCoordToGroup(this.props.text!);
@@ -27,7 +29,7 @@ export default class GroupTickLabelComponent extends React.Component<IGroupTickL
 
     @autobind
     @action
-    private ref(elt:any) {
+    private ref(elt: any) {
         this.textElt = elt;
     }
 
@@ -38,7 +40,7 @@ export default class GroupTickLabelComponent extends React.Component<IGroupTickL
             return (
                 <rect
                     x={box.x - boxLength - 5}
-                    y={box.y + (box.height - boxLength)/2}
+                    y={box.y + (box.height - boxLength) / 2}
                     fill={this.group.color}
                     width={boxLength}
                     height={boxLength}
@@ -50,7 +52,15 @@ export default class GroupTickLabelComponent extends React.Component<IGroupTickL
     }
 
     render() {
-        const {categoryCoordToGroup, dx, dy, maxLabelWidth, datum, text, ...rest} = this.props;
+        const {
+            categoryCoordToGroup,
+            dx,
+            dy,
+            maxLabelWidth,
+            datum,
+            text,
+            ...rest
+        } = this.props;
         return (
             <>
                 {this.colorRectangle}
@@ -59,18 +69,12 @@ export default class GroupTickLabelComponent extends React.Component<IGroupTickL
                     textRef={this.ref}
                     prefixTspans={[
                         <tspan>(</tspan>,
-                        <tspan fontWeight="bold">
-                            {this.group!.ordinal}
-                        </tspan>,
-                        <tspan>)&nbsp;</tspan>
+                        <tspan fontWeight="bold">{this.group!.ordinal}</tspan>,
+                        <tspan>)&nbsp;</tspan>,
                     ]}
                     datum={this.group}
-                    tooltip={(group:ComparisonGroup)=>{
-                        return (
-                            <div>
-                                {renderGroupNameWithOrdinal(group)}
-                            </div>
-                        );
+                    tooltip={(group: ComparisonGroup) => {
+                        return <div>{renderGroupNameWithOrdinal(group)}</div>;
                     }}
                     maxWidth={maxLabelWidth}
                     dy={dy}
@@ -80,4 +84,4 @@ export default class GroupTickLabelComponent extends React.Component<IGroupTickL
             </>
         );
     }
-};
\ No newline at end of file
+}
diff --git a/src/pages/groupComparison/rectangleVennDiagram/RectangleVennDiagram.tsx b/src/pages/groupComparison/rectangleVennDiagram/RectangleVennDiagram.tsx
index fe12aad2ffc..387a0faf6af 100644
--- a/src/pages/groupComparison/rectangleVennDiagram/RectangleVennDiagram.tsx
+++ b/src/pages/groupComparison/rectangleVennDiagram/RectangleVennDiagram.tsx
@@ -1,72 +1,86 @@
-import * as React from "react";
-import {observer} from "mobx-react";
-import {computed, observable} from "mobx";
-import autobind from "autobind-decorator";
-import {ComparisonGroup} from "../GroupComparisonUtils";
+import * as React from 'react';
+import { observer } from 'mobx-react';
+import { computed, observable } from 'mobx';
+import autobind from 'autobind-decorator';
+import { ComparisonGroup } from '../GroupComparisonUtils';
 import * as d3 from 'd3';
-import _ from "lodash";
-import MemoizedHandlerFactory from "../../../shared/lib/MemoizedHandlerFactory";
-import measureText from "measure-text";
-import * as ReactDOM from "react-dom";
-import {Popover} from "react-bootstrap";
-import classnames from "classnames";
-import styles from "../../resultsView/survival/styles.module.scss";
-import {pluralize} from "cbioportal-frontend-commons";
+import _ from 'lodash';
+import MemoizedHandlerFactory from '../../../shared/lib/MemoizedHandlerFactory';
+import measureText from 'measure-text';
+import * as ReactDOM from 'react-dom';
+import { Popover } from 'react-bootstrap';
+import classnames from 'classnames';
+import styles from '../../resultsView/survival/styles.module.scss';
+import { pluralize } from 'cbioportal-frontend-commons';
 import {
     blendColors,
     getExcludedIndexes,
     getTextColor,
     joinGroupNames,
     regionIsSelected,
-    toggleRegionSelected
-} from "../OverlapUtils";
+    toggleRegionSelected,
+} from '../OverlapUtils';
+import { computeRectangleVennLayout, getRegionLabelPosition } from './layout';
 import {
-    computeRectangleVennLayout,
-    getRegionLabelPosition
-} from "./layout";
-import {adjustSizesForMinimumSizeRegions, scaleAndCenterLayout} from "./normalizeLayout";
+    adjustSizesForMinimumSizeRegions,
+    scaleAndCenterLayout,
+} from './normalizeLayout';
 
 export interface IRectangleVennDiagramProps {
-    uid:string;
+    uid: string;
     groups: {
         uid: string;
         cases: string[];
     }[]; // either 2 or 3
-    x:number;
-    y:number;
-    width:number;
-    height:number;
+    x: number;
+    y: number;
+    width: number;
+    height: number;
     uidToGroup: { [uid: string]: ComparisonGroup };
-    onChangeSelectedRegions:(selectedRegions:number[][])=>void;
-    selection:{
-        regions:number[][]; // we do it like this so that updating it doesn't update all props
+    onChangeSelectedRegions: (selectedRegions: number[][]) => void;
+    selection: {
+        regions: number[][]; // we do it like this so that updating it doesn't update all props
     };
-    caseType:"sample"|"patient";
-    onLayoutFailure:()=>void;
+    caseType: 'sample' | 'patient';
+    onLayoutFailure: () => void;
 }
 
-function regionMouseOver(e:any) {
-    e.target.setAttribute("fill", e.target.getAttribute("data-hover-fill"));
+function regionMouseOver(e: any) {
+    e.target.setAttribute('fill', e.target.getAttribute('data-hover-fill'));
 }
 
-function regionMouseOut(e:any) {
-    e.target.setAttribute("fill", e.target.getAttribute("data-default-fill"));
+function regionMouseOut(e: any) {
+    e.target.setAttribute('fill', e.target.getAttribute('data-default-fill'));
 }
 
 @observer
-export default class RectangleVennDiagram extends React.Component<IRectangleVennDiagramProps, {}> {
-    @observable.ref svg:SVGElement|null = null;
-    @observable.ref tooltipModel:{ combination:number[], sizeOfRegion:number } | null = null;
-    @observable mousePosition = { x:0, y:0 };
+export default class RectangleVennDiagram extends React.Component<
+    IRectangleVennDiagramProps,
+    {}
+> {
+    @observable.ref svg: SVGElement | null = null;
+    @observable.ref tooltipModel: {
+        combination: number[];
+        sizeOfRegion: number;
+    } | null = null;
+    @observable mousePosition = { x: 0, y: 0 };
 
     private regionClickHandlers = MemoizedHandlerFactory(
-        (e:any, params:{ combination:number[], }) => {
-            this.props.onChangeSelectedRegions(toggleRegionSelected(params.combination, this.props.selection.regions));
+        (e: any, params: { combination: number[] }) => {
+            this.props.onChangeSelectedRegions(
+                toggleRegionSelected(
+                    params.combination,
+                    this.props.selection.regions
+                )
+            );
         }
     );
 
     private regionHoverHandlers = MemoizedHandlerFactory(
-        (e:React.MouseEvent<any>, params:{ combination:number[], sizeOfRegion:number}) => {
+        (
+            e: React.MouseEvent<any>,
+            params: { combination: number[]; sizeOfRegion: number }
+        ) => {
             if (params.sizeOfRegion > 0) {
                 this.tooltipModel = params;
                 this.mousePosition.x = e.pageX;
@@ -75,33 +89,46 @@ export default class RectangleVennDiagram extends React.Component<IRectangleVenn
         }
     );
 
-    @autobind private svgRef(_svg:SVGElement|null) {
+    @autobind private svgRef(_svg: SVGElement | null) {
         this.svg = _svg;
     }
 
     @computed get layoutParams() {
         // First generate regions
-        let combinations:number[][]; // in painting order so that mouse interactions look right
+        let combinations: number[][]; // in painting order so that mouse interactions look right
         switch (this.props.groups.length) {
             case 2:
                 // all combinations of two groups
-                combinations = [[0], [1], [0,1]];
+                combinations = [[0], [1], [0, 1]];
                 break;
             case 3:
             default:
                 // all combinations of three groups
-                combinations = [[0],[1],[2],[0,1],[0,2],[1,2],[0,1,2]];
+                combinations = [
+                    [0],
+                    [1],
+                    [2],
+                    [0, 1],
+                    [0, 2],
+                    [1, 2],
+                    [0, 1, 2],
+                ];
                 break;
         }
 
         // `regions` corresponds to exclusive regions in the diagram.
         // For example, in a diagram with sets A and B, there's a region for the intersection of A and B,
         //  a region for whats only in A, and a region for whats only in B.
-        const regions = combinations.map(combination=>{
+        const regions = combinations.map(combination => {
             // compute the cases in this region
-            let casesInRegion = _.intersection(...combination.map(index=>this.props.groups[index].cases));
+            let casesInRegion = _.intersection(
+                ...combination.map(index => this.props.groups[index].cases)
+            );
             const sizeOfIntersectionOfSets = casesInRegion.length;
-            for (const i of getExcludedIndexes(combination, this.props.groups.length)) {
+            for (const i of getExcludedIndexes(
+                combination,
+                this.props.groups.length
+            )) {
                 _.pullAll(casesInRegion, this.props.groups[i].cases);
             }
             return {
@@ -109,46 +136,66 @@ export default class RectangleVennDiagram extends React.Component<IRectangleVenn
                 sizeOfIntersectionOfSets,
                 sizeOfRegion: casesInRegion.length,
                 // compute the fill based on the colors of the included groups
-                color: blendColors(combination.map(index=>this.props.uidToGroup[this.props.groups[index].uid].color)),
-                labelPosition: null as {x:number, y:number} | null
+                color: blendColors(
+                    combination.map(
+                        index =>
+                            this.props.uidToGroup[this.props.groups[index].uid]
+                                .color
+                    )
+                ),
+                labelPosition: null as { x: number; y: number } | null,
             };
         });
 
         // convert to form thats useful for algorithm
-        const regionsInAlgorithmForm = regions.map(r=>({
-            sets: r.combination.map(i=>this.props.groups[i].uid),
+        const regionsInAlgorithmForm = regions.map(r => ({
+            sets: r.combination.map(i => this.props.groups[i].uid),
             size: r.sizeOfRegion,
-            sizeOfIntersectionOfSets: r.sizeOfIntersectionOfSets
+            sizeOfIntersectionOfSets: r.sizeOfIntersectionOfSets,
         }));
 
         // the algorithm also needs all the sets
-        const sets = this.props.groups.map(g=>({
+        const sets = this.props.groups.map(g => ({
             size: g.cases.length,
             uid: g.uid,
             color: this.props.uidToGroup[g.uid].color,
-            disjoint: (function(){
-                const region = regionsInAlgorithmForm.find(r=>(r.sets.length === 1 && r.sets[0] === g.uid));
+            disjoint: (function() {
+                const region = regionsInAlgorithmForm.find(
+                    r => r.sets.length === 1 && r.sets[0] === g.uid
+                );
                 return region!.size === region!.sizeOfIntersectionOfSets; // disjoint if not intersecting with anything else, aka nothing is excluded from its solo region
-            })()
+            })(),
         }));
 
-        const algorithmInput = adjustSizesForMinimumSizeRegions(regionsInAlgorithmForm, sets);
+        const algorithmInput = adjustSizesForMinimumSizeRegions(
+            regionsInAlgorithmForm,
+            sets
+        );
 
         // compute a layout for the venn diagram using the specification given by the
         //  sets and the regions
-        const unscaledLayout = computeRectangleVennLayout(algorithmInput.regions, algorithmInput.sets, {
-            maxIterations: 10000
-        });
+        const unscaledLayout = computeRectangleVennLayout(
+            algorithmInput.regions,
+            algorithmInput.sets,
+            {
+                maxIterations: 10000,
+            }
+        );
 
         // scale and center the layout in a normalized form for presenting
         const padding = 20;
-        const rectangles = scaleAndCenterLayout(unscaledLayout.rectangles, this.props.width, this.props.height, padding);
+        const rectangles = scaleAndCenterLayout(
+            unscaledLayout.rectangles,
+            this.props.width,
+            this.props.height,
+            padding
+        );
 
         // compute label positions for nonempty regions
         for (const region of regions) {
             if (region.sizeOfRegion > 0) {
                 region.labelPosition = getRegionLabelPosition(
-                    region.combination.map(i=>this.props.groups[i].uid),
+                    region.combination.map(i => this.props.groups[i].uid),
                     rectangles
                 );
             }
@@ -160,18 +207,19 @@ export default class RectangleVennDiagram extends React.Component<IRectangleVenn
         }
 
         return {
-            rectangles, regions, sets
-        }
+            rectangles,
+            regions,
+            sets,
+        };
     }
 
-
     @computed get svgElements() {
         // Compute all of the display elements of the venn diagram - the outline, the fills, and the text
 
         const CORNER_RADIUS = 8;
         const rectangleParams = this.layoutParams.rectangles;
         // compute the clip paths corresponding to each group circle
-        const clipPaths = this.props.groups.map((group, index)=>(
+        const clipPaths = this.props.groups.map((group, index) => (
             <clipPath id={`${this.props.uid}_circle_${index}`}>
                 <rect
                     x={rectangleParams[group.uid].x}
@@ -183,101 +231,154 @@ export default class RectangleVennDiagram extends React.Component<IRectangleVenn
             </clipPath>
         ));
 
-        const elements = _.flattenDeep<any>(this.layoutParams.regions.map(region=>{
-
-            // FOR EACH REGION: generate the filled region, and the "# cases" text for it
-            // Each region is specified by the combination of groups corresponding to it
-            const comb = region.combination;
+        const elements = _.flattenDeep<any>(
+            this.layoutParams.regions.map(region => {
+                // FOR EACH REGION: generate the filled region, and the "# cases" text for it
+                // Each region is specified by the combination of groups corresponding to it
+                const comb = region.combination;
+
+                // generate clipped hover region by iteratively nesting a rect in all the clip paths
+                //  corresponding to groups in this region. This clips out, one by one, everything
+                //  except for the intersection.
+                let hoverRegion: JSX.Element = (
+                    <g>
+                        <rect
+                            x="0"
+                            y="0"
+                            height={this.props.height}
+                            width={this.props.width}
+                            fill={region.color}
+                            style={{
+                                cursor:
+                                    region.sizeOfRegion > 0
+                                        ? 'pointer'
+                                        : 'default',
+                            }}
+                            data-default-fill={region.color}
+                            data-hover-fill={d3
+                                .hsl(region.color)
+                                .brighter(1)
+                                .rgb()}
+                            onMouseOver={
+                                region.sizeOfRegion > 0
+                                    ? regionMouseOver
+                                    : undefined
+                            }
+                            onMouseOut={
+                                region.sizeOfRegion > 0
+                                    ? regionMouseOut
+                                    : undefined
+                            }
+                            onMouseMove={this.regionHoverHandlers({
+                                combination: comb,
+                                sizeOfRegion: region.sizeOfRegion,
+                            })}
+                            onClick={
+                                region.sizeOfRegion > 0
+                                    ? this.regionClickHandlers({
+                                          combination: comb,
+                                      })
+                                    : undefined
+                            }
+                            data-test={`${
+                                this.props.caseType
+                            }${region.combination.join(',')}VennRegion`}
+                        />
+                    </g>
+                );
+                for (const index of comb) {
+                    hoverRegion = (
+                        <g clipPath={`url(#${this.props.uid}_circle_${index})`}>
+                            {hoverRegion}
+                        </g>
+                    );
+                }
+
+                return [hoverRegion];
+            })
+        );
 
-            // generate clipped hover region by iteratively nesting a rect in all the clip paths
-            //  corresponding to groups in this region. This clips out, one by one, everything
-            //  except for the intersection.
-            let hoverRegion:JSX.Element = (
-                <g>
+        const outlines = _.sortBy(this.layoutParams.sets, s => -s.size).map(
+            s => {
+                // draw the outlines of the rectangles
+                const uid = s.uid;
+                return (
                     <rect
-                        x="0"
-                        y="0"
-                        height={this.props.height}
-                        width={this.props.width}
-                        fill={region.color}
-                        style={{ cursor: region.sizeOfRegion > 0 ? "pointer" : "default" }}
-                        data-default-fill={region.color}
-                        data-hover-fill={d3.hsl(region.color).brighter(1).rgb()}
-                        onMouseOver={region.sizeOfRegion > 0 ? regionMouseOver : undefined}
-                        onMouseOut={region.sizeOfRegion > 0 ? regionMouseOut : undefined}
-                        onMouseMove={this.regionHoverHandlers({combination:comb, sizeOfRegion: region.sizeOfRegion })}
-                        onClick={region.sizeOfRegion > 0 ? this.regionClickHandlers({ combination: comb }) : undefined}
-                        data-test={`${this.props.caseType}${region.combination.join(",")}VennRegion`}
+                        x={rectangleParams[uid].x}
+                        y={rectangleParams[uid].y}
+                        width={rectangleParams[uid].xLength}
+                        height={rectangleParams[uid].yLength}
+                        fill="none"
+                        stroke={s.color}
+                        strokeWidth={2}
+                        rx={CORNER_RADIUS}
                     />
-                </g>
-            );
-            for (const index of comb) {
-                hoverRegion = (
-                    <g clipPath={`url(#${this.props.uid}_circle_${index})`}>
-                        {hoverRegion}
-                    </g>
                 );
             }
+        );
+        const textElements = _.flattenDeep<any>(
+            this.layoutParams.regions.map(region => {
+                if (region.sizeOfRegion === 0 || !region.labelPosition) {
+                    return [];
+                }
+
+                const selected = regionIsSelected(
+                    region.combination,
+                    this.props.selection.regions
+                );
 
-            return [hoverRegion];
-        }));
-
-        const outlines = _.sortBy(this.layoutParams.sets, s=>-s.size).map(s=>{
-            // draw the outlines of the rectangles
-            const uid = s.uid;
-            return (
-                <rect
-                    x={rectangleParams[uid].x}
-                    y={rectangleParams[uid].y}
-                    width={rectangleParams[uid].xLength}
-                    height={rectangleParams[uid].yLength}
-                    fill="none"
-                    stroke={s.color}
-                    strokeWidth={2}
-                    rx={CORNER_RADIUS}
-                />
-            );
-        });
-        const textElements = _.flattenDeep<any>(this.layoutParams.regions.map(region=>{
-            if (region.sizeOfRegion === 0 || !region.labelPosition) {
-                return [];
-            }
-
-            const selected = regionIsSelected(region.combination, this.props.selection.regions);
-
-            const textContents = `${region.sizeOfRegion.toString()}${selected ? " "+String.fromCharCode(10004) : ""}`;
-            // Add rect behind for ease of reading
-            const textSize = measureText({text:textContents, fontFamily:"Arial", fontSize:"13px", lineHeight: 1});
-            const padding = 4;
-            const textPosition = region.labelPosition;
-            let textBackground = null;
-            if (selected) {
-                textBackground = <rect
-                    x={textPosition.x - textSize.width.value / 2 - padding}
-                    y={textPosition.y - textSize.height.value + 3}
-                    width={textSize.width.value + 2*padding}
-                    height={textSize.height.value + padding}
-                    fill={"yellow"}
-                    rx={3}
-                    ry={3}
-                    pointerEvents="none"
-                />;
-            }
-            return [
-                textBackground,
-                <text
-                    x={textPosition.x}
-                    y={textPosition.y}
-                    style={{ userSelect:"none", color:selected ? "black" : getTextColor(region.color)}}
-                    fontWeight={region.sizeOfRegion > 0 ? "bold" : "normal"}
-                    pointerEvents="none"
-                    textAnchor="middle"
-                    alignmentBaseline="middle"
-                >
-                    {textContents}
-                </text>
-            ];
-        }));
+                const textContents = `${region.sizeOfRegion.toString()}${
+                    selected ? ' ' + String.fromCharCode(10004) : ''
+                }`;
+                // Add rect behind for ease of reading
+                const textSize = measureText({
+                    text: textContents,
+                    fontFamily: 'Arial',
+                    fontSize: '13px',
+                    lineHeight: 1,
+                });
+                const padding = 4;
+                const textPosition = region.labelPosition;
+                let textBackground = null;
+                if (selected) {
+                    textBackground = (
+                        <rect
+                            x={
+                                textPosition.x -
+                                textSize.width.value / 2 -
+                                padding
+                            }
+                            y={textPosition.y - textSize.height.value + 3}
+                            width={textSize.width.value + 2 * padding}
+                            height={textSize.height.value + padding}
+                            fill={'yellow'}
+                            rx={3}
+                            ry={3}
+                            pointerEvents="none"
+                        />
+                    );
+                }
+                return [
+                    textBackground,
+                    <text
+                        x={textPosition.x}
+                        y={textPosition.y}
+                        style={{
+                            userSelect: 'none',
+                            color: selected
+                                ? 'black'
+                                : getTextColor(region.color),
+                        }}
+                        fontWeight={region.sizeOfRegion > 0 ? 'bold' : 'normal'}
+                        pointerEvents="none"
+                        textAnchor="middle"
+                        alignmentBaseline="middle"
+                    >
+                        {textContents}
+                    </text>,
+                ];
+            })
+        );
 
         return (
             <>
@@ -301,14 +402,24 @@ export default class RectangleVennDiagram extends React.Component<IRectangleVenn
         if (!this.tooltipModel) {
             return null;
         }
-        const includedGroupUids = this.tooltipModel.combination.map(groupIndex=>this.props.groups[groupIndex].uid);
-        const includedGroups = includedGroupUids.map(uid=>this.props.uidToGroup[uid]);
+        const includedGroupUids = this.tooltipModel.combination.map(
+            groupIndex => this.props.groups[groupIndex].uid
+        );
+        const includedGroups = includedGroupUids.map(
+            uid => this.props.uidToGroup[uid]
+        );
 
         return (
-            <div style={{width:300, whiteSpace:"normal"}}>
-                <strong>{this.tooltipModel.sizeOfRegion} {pluralize(this.props.caseType, this.tooltipModel.sizeOfRegion)}</strong>
-                <br/>
-                in only {joinGroupNames(includedGroups, "and")}.
+            <div style={{ width: 300, whiteSpace: 'normal' }}>
+                <strong>
+                    {this.tooltipModel.sizeOfRegion}{' '}
+                    {pluralize(
+                        this.props.caseType,
+                        this.tooltipModel.sizeOfRegion
+                    )}
+                </strong>
+                <br />
+                in only {joinGroupNames(includedGroups, 'and')}.
             </div>
         );
     }
@@ -330,20 +441,23 @@ export default class RectangleVennDiagram extends React.Component<IRectangleVenn
                     onClick={this.resetSelection}
                 />
                 {this.svgElements}
-                {!!this.tooltipModel && (
+                {!!this.tooltipModel &&
                     (ReactDOM as any).createPortal(
                         <Popover
                             arrowOffsetTop={17}
-                            className={classnames("cbioportal-frontend", "cbioTooltip", styles.Tooltip)}
-                            positionLeft={this.mousePosition.x+15}
-                            positionTop={this.mousePosition.y-17}
+                            className={classnames(
+                                'cbioportal-frontend',
+                                'cbioTooltip',
+                                styles.Tooltip
+                            )}
+                            positionLeft={this.mousePosition.x + 15}
+                            positionTop={this.mousePosition.y - 17}
                         >
                             {this.tooltipContent}
                         </Popover>,
                         document.body
-                    )
-                )}
+                    )}
             </g>
         );
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/groupComparison/rectangleVennDiagram/geometry.spec.ts b/src/pages/groupComparison/rectangleVennDiagram/geometry.spec.ts
index 044d1adf1f2..9c15c59e40d 100644
--- a/src/pages/groupComparison/rectangleVennDiagram/geometry.spec.ts
+++ b/src/pages/groupComparison/rectangleVennDiagram/geometry.spec.ts
@@ -1,313 +1,343 @@
-import {assert} from "chai";
-import {assertDeepEqualInAnyOrder} from "../../../shared/lib/SpecUtils";
+import { assert } from 'chai';
+import { assertDeepEqualInAnyOrder } from '../../../shared/lib/SpecUtils';
 import {
     getRegionArea,
     getRegionShape,
     rectangleDifference,
     rectangleDifferenceMultiple,
-    rectangleIntersection
-} from "./geometry";
+    rectangleIntersection,
+} from './geometry';
 
-describe("rectangleVennDiagram/geometry", () => {
-    describe("rectangleIntersection", ()=>{
-        it("one rectangle", ()=>{
-            const rects = [{ x:0, y:0, xLength:10, yLength:3}];
-            assert.deepEqual(
-                rectangleIntersection(...rects),
-                {
-                    x:0, y:0, xLength:10, yLength:3
-                }
-            );
+describe('rectangleVennDiagram/geometry', () => {
+    describe('rectangleIntersection', () => {
+        it('one rectangle', () => {
+            const rects = [{ x: 0, y: 0, xLength: 10, yLength: 3 }];
+            assert.deepEqual(rectangleIntersection(...rects), {
+                x: 0,
+                y: 0,
+                xLength: 10,
+                yLength: 3,
+            });
         });
-        it("two disjoint rectangles", ()=>{
+        it('two disjoint rectangles', () => {
             const rects = [
-                { x:0, y:0, xLength:10, yLength:3},
-                { x:20, y:0, xLength:5, yLength:3}
+                { x: 0, y: 0, xLength: 10, yLength: 3 },
+                { x: 20, y: 0, xLength: 5, yLength: 3 },
             ];
-            assert.deepEqual(
-                rectangleIntersection(...rects),
-                {
-                    x:0, y:0, xLength:0, yLength:0
-                }
-            );
+            assert.deepEqual(rectangleIntersection(...rects), {
+                x: 0,
+                y: 0,
+                xLength: 0,
+                yLength: 0,
+            });
         });
-        it("two intersecting rectangles, one containing the other", ()=>{
+        it('two intersecting rectangles, one containing the other', () => {
             const rects = [
-                { x:0, y:0, xLength:10, yLength:3},
-                { x:5, y:0, xLength:5, yLength:3}
+                { x: 0, y: 0, xLength: 10, yLength: 3 },
+                { x: 5, y: 0, xLength: 5, yLength: 3 },
             ];
-            assert.deepEqual(
-                rectangleIntersection(...rects),
-                {
-                    x:5, y:0, xLength:5, yLength:3
-                }
-            );
+            assert.deepEqual(rectangleIntersection(...rects), {
+                x: 5,
+                y: 0,
+                xLength: 5,
+                yLength: 3,
+            });
         });
-        it("two intersecting rectangles, neither containing the other", ()=>{
+        it('two intersecting rectangles, neither containing the other', () => {
             const rects = [
-                { x:0, y:0, xLength:10, yLength:5},
-                { x:5, y:3, xLength:20, yLength:50}
+                { x: 0, y: 0, xLength: 10, yLength: 5 },
+                { x: 5, y: 3, xLength: 20, yLength: 50 },
             ];
-            assert.deepEqual(
-                rectangleIntersection(...rects),
-                {
-                    x:5, y:3, xLength:5, yLength:2
-                }
-            );
+            assert.deepEqual(rectangleIntersection(...rects), {
+                x: 5,
+                y: 3,
+                xLength: 5,
+                yLength: 2,
+            });
         });
-        it("two intersecting rectangles and one disjoint rectangle", ()=>{
+        it('two intersecting rectangles and one disjoint rectangle', () => {
             const rects = [
-                { x:0, y:0, xLength:10, yLength:3},
-                { x:5, y:0, xLength:5, yLength:3},
-                { x:20, y:0, xLength:5, yLength:3}
+                { x: 0, y: 0, xLength: 10, yLength: 3 },
+                { x: 5, y: 0, xLength: 5, yLength: 3 },
+                { x: 20, y: 0, xLength: 5, yLength: 3 },
             ];
-            assert.deepEqual(
-                rectangleIntersection(...rects),
-                {
-                    x:0, y:0, xLength:0, yLength:0
-                }
-            );
+            assert.deepEqual(rectangleIntersection(...rects), {
+                x: 0,
+                y: 0,
+                xLength: 0,
+                yLength: 0,
+            });
         });
-        it("three intersecting rectangles", ()=>{
+        it('three intersecting rectangles', () => {
             const rects = [
-                { x:0, y:0, xLength:10, yLength:3},
-                { x:5, y:0, xLength:5, yLength:3},
-                { x:2, y:0, xLength:5, yLength:2}
+                { x: 0, y: 0, xLength: 10, yLength: 3 },
+                { x: 5, y: 0, xLength: 5, yLength: 3 },
+                { x: 2, y: 0, xLength: 5, yLength: 2 },
             ];
-            assert.deepEqual(
-                rectangleIntersection(...rects),
-                {
-                    x:5, y:0, xLength:2, yLength:2
-                }
-            );
+            assert.deepEqual(rectangleIntersection(...rects), {
+                x: 5,
+                y: 0,
+                xLength: 2,
+                yLength: 2,
+            });
         });
-        it("three disjoint rectangles", ()=>{
+        it('three disjoint rectangles', () => {
             const rects = [
-                { x:0, y:0, xLength:10, yLength:3},
-                { x:20, y:0, xLength:5, yLength:3},
-                { x:50, y:0, xLength:5, yLength:3}
+                { x: 0, y: 0, xLength: 10, yLength: 3 },
+                { x: 20, y: 0, xLength: 5, yLength: 3 },
+                { x: 50, y: 0, xLength: 5, yLength: 3 },
             ];
-            assert.deepEqual(
-                rectangleIntersection(...rects),
-                {
-                    x:0, y:0, xLength:0, yLength:0
-                }
-            );
+            assert.deepEqual(rectangleIntersection(...rects), {
+                x: 0,
+                y: 0,
+                xLength: 0,
+                yLength: 0,
+            });
         });
     });
 
-    describe("rectangleDifference", ()=>{
-        it("A disjoint with B", ()=>{
+    describe('rectangleDifference', () => {
+        it('A disjoint with B', () => {
             const rects = [
-                { x:0, y:0, xLength:10, yLength:3},
-                { x:20, y:0, xLength:5, yLength:3}
+                { x: 0, y: 0, xLength: 10, yLength: 3 },
+                { x: 20, y: 0, xLength: 5, yLength: 3 },
             ];
-            assertDeepEqualInAnyOrder(
-                rectangleDifference(rects[0], rects[1]),
-                [rects[0]]
-            );
+            assertDeepEqualInAnyOrder(rectangleDifference(rects[0], rects[1]), [
+                rects[0],
+            ]);
         });
-        it("A contains B", ()=>{
+        it('A contains B', () => {
             const rects = [
-                { x:0, y:0, xLength:10, yLength:3},
-                { x:5, y:0, xLength:5, yLength:3}
+                { x: 0, y: 0, xLength: 10, yLength: 3 },
+                { x: 5, y: 0, xLength: 5, yLength: 3 },
             ];
-            assertDeepEqualInAnyOrder(
-                rectangleDifference(rects[0], rects[1]),
-                [{
-                    x:0, y:0, xLength:5, yLength:3
-                }]
-            );
+            assertDeepEqualInAnyOrder(rectangleDifference(rects[0], rects[1]), [
+                {
+                    x: 0,
+                    y: 0,
+                    xLength: 5,
+                    yLength: 3,
+                },
+            ]);
         });
-        it("B contains A", ()=>{
+        it('B contains A', () => {
             const rects = [
-                { x:0, y:0, xLength:10, yLength:3},
-                { x:5, y:0, xLength:5, yLength:3}
+                { x: 0, y: 0, xLength: 10, yLength: 3 },
+                { x: 5, y: 0, xLength: 5, yLength: 3 },
             ];
             assertDeepEqualInAnyOrder(
                 rectangleDifference(rects[1], rects[0]),
                 []
             );
         });
-        it("A intersects and doesnt contain B", ()=>{
+        it('A intersects and doesnt contain B', () => {
             const rects = [
-                { x:0, y:0, xLength:10, yLength:5},
-                { x:5, y:3, xLength:20, yLength:50}
+                { x: 0, y: 0, xLength: 10, yLength: 5 },
+                { x: 5, y: 3, xLength: 20, yLength: 50 },
             ];
             assertDeepEqualInAnyOrder(
                 rectangleDifference(rects[0], rects[1]),
                 [
-                    { x:0, y:3, xLength:5, yLength:2 },
-                    { x:0, y:0, xLength:10, yLength:3 }
+                    { x: 0, y: 3, xLength: 5, yLength: 2 },
+                    { x: 0, y: 0, xLength: 10, yLength: 3 },
                 ],
-                "A - B"
+                'A - B'
             );
             assertDeepEqualInAnyOrder(
                 rectangleDifference(rects[1], rects[0]),
                 [
-                    { x:5, y:5, xLength:20, yLength:48 },
-                    { x:10, y:3, xLength:15, yLength:2 }
+                    { x: 5, y: 5, xLength: 20, yLength: 48 },
+                    { x: 10, y: 3, xLength: 15, yLength: 2 },
                 ],
-                "B-A"
+                'B-A'
             );
         });
     });
 
-    describe("rectangleDifferenceMultiple", ()=>{
-        it("three intersecting rectangles", ()=>{
-            const a = { x:-3, y:-2, xLength:20, yLength:30};
-            const b = { x:5, y:0, xLength:5, yLength:8};
-            const c = { x:-6, y:6, xLength:14, yLength:5};
+    describe('rectangleDifferenceMultiple', () => {
+        it('three intersecting rectangles', () => {
+            const a = { x: -3, y: -2, xLength: 20, yLength: 30 };
+            const b = { x: 5, y: 0, xLength: 5, yLength: 8 };
+            const c = { x: -6, y: 6, xLength: 14, yLength: 5 };
             assertDeepEqualInAnyOrder(
-                rectangleDifferenceMultiple(a, [b,c]),
-                [{
-                    x:-3,
-                    y: 11,
-                    xLength:20,
-                    yLength:17
-                },{
-                    x:8,
-                    y:8,
-                    xLength:9,
-                    yLength:3
-                },{
-                    x:10,
-                    y:0,
-                    xLength:7,
-                    yLength:8
-                },{
-                    x:-3,
-                    y:-2,
-                    xLength:20,
-                    yLength:2
-                },{
-                    x:-3,
-                    y:0,
-                    xLength:8,
-                    yLength:6
-                }],
-                "a - b - c"
+                rectangleDifferenceMultiple(a, [b, c]),
+                [
+                    {
+                        x: -3,
+                        y: 11,
+                        xLength: 20,
+                        yLength: 17,
+                    },
+                    {
+                        x: 8,
+                        y: 8,
+                        xLength: 9,
+                        yLength: 3,
+                    },
+                    {
+                        x: 10,
+                        y: 0,
+                        xLength: 7,
+                        yLength: 8,
+                    },
+                    {
+                        x: -3,
+                        y: -2,
+                        xLength: 20,
+                        yLength: 2,
+                    },
+                    {
+                        x: -3,
+                        y: 0,
+                        xLength: 8,
+                        yLength: 6,
+                    },
+                ],
+                'a - b - c'
             );
             assertDeepEqualInAnyOrder(
-                rectangleDifferenceMultiple(b, [a,c]),
+                rectangleDifferenceMultiple(b, [a, c]),
                 [],
-                "b - a - c"
+                'b - a - c'
             );
             assertDeepEqualInAnyOrder(
-                rectangleDifferenceMultiple(c, [a,b]),
-                [{
-                    x:-6,
-                    y:6,
-                    xLength:3,
-                    yLength:5
-                }],
-                "c - a - b"
+                rectangleDifferenceMultiple(c, [a, b]),
+                [
+                    {
+                        x: -6,
+                        y: 6,
+                        xLength: 3,
+                        yLength: 5,
+                    },
+                ],
+                'c - a - b'
             );
         });
-        it("three disjoint rectangles", ()=>{
-            const a = { x:0, y:0, xLength:10, yLength:3};
-            const b = { x:20, y:0, xLength:5, yLength:3};
-            const c = { x:50, y:0, xLength:5, yLength:3};
-            assertDeepEqualInAnyOrder(
-                rectangleDifferenceMultiple(a, [b,c]),
-                [a]
-            );
-            assertDeepEqualInAnyOrder(
-                rectangleDifferenceMultiple(b, [a,c]),
-                [b]
-            );
-            assertDeepEqualInAnyOrder(
-                rectangleDifferenceMultiple(c, [a,b]),
-                [c]
-            );
+        it('three disjoint rectangles', () => {
+            const a = { x: 0, y: 0, xLength: 10, yLength: 3 };
+            const b = { x: 20, y: 0, xLength: 5, yLength: 3 };
+            const c = { x: 50, y: 0, xLength: 5, yLength: 3 };
+            assertDeepEqualInAnyOrder(rectangleDifferenceMultiple(a, [b, c]), [
+                a,
+            ]);
+            assertDeepEqualInAnyOrder(rectangleDifferenceMultiple(b, [a, c]), [
+                b,
+            ]);
+            assertDeepEqualInAnyOrder(rectangleDifferenceMultiple(c, [a, b]), [
+                c,
+            ]);
         });
     });
 
-    describe("getRegionShape", ()=>{
+    describe('getRegionShape', () => {
         const setRectangles = {
-            a: { x:-3, y:-2, xLength:20, yLength:30},
-            b: { x:5, y:0, xLength:5, yLength:8},
-            c: { x:-6, y:6, xLength:14, yLength:5}
+            a: { x: -3, y: -2, xLength: 20, yLength: 30 },
+            b: { x: 5, y: 0, xLength: 5, yLength: 8 },
+            c: { x: -6, y: 6, xLength: 14, yLength: 5 },
         };
 
-        it("A", ()=>{
+        it('A', () => {
             assertDeepEqualInAnyOrder(
-                getRegionShape(["a"], {a:setRectangles.a}),
+                getRegionShape(['a'], { a: setRectangles.a }),
                 [setRectangles.a]
             );
         });
-        it("A and B", ()=>{
+        it('A and B', () => {
             assertDeepEqualInAnyOrder(
-                getRegionShape(["a","b"], {a:setRectangles.a, b:setRectangles.b}),
+                getRegionShape(['a', 'b'], {
+                    a: setRectangles.a,
+                    b: setRectangles.b,
+                }),
                 [rectangleIntersection(setRectangles.a, setRectangles.b)]
             );
         });
-        it("A not B", ()=>{
+        it('A not B', () => {
             assertDeepEqualInAnyOrder(
-                getRegionShape(["a"], {a:setRectangles.a, b:setRectangles.b}),
+                getRegionShape(['a'], {
+                    a: setRectangles.a,
+                    b: setRectangles.b,
+                }),
                 rectangleDifference(setRectangles.a, setRectangles.b)
             );
         });
-        it("A and B not C", ()=>{
+        it('A and B not C', () => {
             assertDeepEqualInAnyOrder(
-                getRegionShape(["a", "b"], setRectangles),
+                getRegionShape(['a', 'b'], setRectangles),
                 rectangleDifference(
                     rectangleIntersection(setRectangles.a, setRectangles.b),
                     setRectangles.c
                 )
             );
         });
-        it("A not B not C", ()=>{
+        it('A not B not C', () => {
             assertDeepEqualInAnyOrder(
-                getRegionShape(["a"], setRectangles),
-                rectangleDifferenceMultiple(setRectangles.a, [setRectangles.b, setRectangles.c])
+                getRegionShape(['a'], setRectangles),
+                rectangleDifferenceMultiple(setRectangles.a, [
+                    setRectangles.b,
+                    setRectangles.c,
+                ])
             );
         });
-        it("A and B and C", ()=>{
+        it('A and B and C', () => {
             assertDeepEqualInAnyOrder(
-                getRegionShape(["a", "b", "c"], setRectangles),
-                [rectangleIntersection(setRectangles.a, setRectangles.b, setRectangles.c)]
+                getRegionShape(['a', 'b', 'c'], setRectangles),
+                [
+                    rectangleIntersection(
+                        setRectangles.a,
+                        setRectangles.b,
+                        setRectangles.c
+                    ),
+                ]
             );
         });
     });
 
-    describe("getRegionArea", ()=>{
+    describe('getRegionArea', () => {
         const setRectangles = {
-            a: { x:-3, y:-2, xLength:20, yLength:30},
-            b: { x:5, y:0, xLength:5, yLength:8},
-            c: { x:-6, y:6, xLength:14, yLength:5}
+            a: { x: -3, y: -2, xLength: 20, yLength: 30 },
+            b: { x: 5, y: 0, xLength: 5, yLength: 8 },
+            c: { x: -6, y: 6, xLength: 14, yLength: 5 },
         };
 
-        it("A", ()=>{
-            const shape = getRegionShape(["a"], {a:setRectangles.a});
+        it('A', () => {
+            const shape = getRegionShape(['a'], { a: setRectangles.a });
             assert.equal(getRegionArea(shape), 600);
         });
-        it("A and B", ()=>{
-            const shape = getRegionShape(["a","b"], {a:setRectangles.a, b:setRectangles.b});
+        it('A and B', () => {
+            const shape = getRegionShape(['a', 'b'], {
+                a: setRectangles.a,
+                b: setRectangles.b,
+            });
             assert.equal(getRegionArea(shape), 40);
         });
-        it("A not B", ()=>{
-            const shape = getRegionShape(["a"], {a:setRectangles.a, b:setRectangles.b});
+        it('A not B', () => {
+            const shape = getRegionShape(['a'], {
+                a: setRectangles.a,
+                b: setRectangles.b,
+            });
             assert.equal(getRegionArea(shape), 560);
         });
-        it("A and B not C", ()=>{
-            const shape = getRegionShape(["a", "b"], setRectangles);
+        it('A and B not C', () => {
+            const shape = getRegionShape(['a', 'b'], setRectangles);
             assert.equal(getRegionArea(shape), 34);
         });
-        it("A not B not C", ()=>{
-            const shape = getRegionShape(["a"], setRectangles);
+        it('A not B not C', () => {
+            const shape = getRegionShape(['a'], setRectangles);
             assert.equal(getRegionArea(shape), 511);
         });
-        it("A and B and C", ()=>{
-            const shape = getRegionShape(["a", "b", "c"], setRectangles);
+        it('A and B and C', () => {
+            const shape = getRegionShape(['a', 'b', 'c'], setRectangles);
             assert.equal(getRegionArea(shape), 6);
         });
-        it("empty region", ()=>{
+        it('empty region', () => {
             assert.equal(getRegionArea([]), 0);
         });
 
-        it("region with empty rectangles", ()=>{
-            assert.equal(getRegionArea([{x:0, y:0, xLength:0, yLength:0}]), 0);
+        it('region with empty rectangles', () => {
+            assert.equal(
+                getRegionArea([{ x: 0, y: 0, xLength: 0, yLength: 0 }]),
+                0
+            );
         });
     });
-});
\ No newline at end of file
+});
diff --git a/src/pages/groupComparison/rectangleVennDiagram/geometry.ts b/src/pages/groupComparison/rectangleVennDiagram/geometry.ts
index 62785bd413b..0df00227995 100644
--- a/src/pages/groupComparison/rectangleVennDiagram/geometry.ts
+++ b/src/pages/groupComparison/rectangleVennDiagram/geometry.ts
@@ -1,33 +1,44 @@
-import _ from "lodash";
-import {SetRectangles} from "./layout";
-
-export type Rectangle = {x:number, y:number, xLength:number, yLength:number};// bottom-left aligned
+import _ from 'lodash';
+import { SetRectangles } from './layout';
+
+export type Rectangle = {
+    x: number;
+    y: number;
+    xLength: number;
+    yLength: number;
+}; // bottom-left aligned
 export type RegionShape = Rectangle[];
 
-export function rectangleArea(rectangle:Pick<Rectangle, "xLength"|"yLength">) {
-    return rectangle.xLength*rectangle.yLength;
+export function rectangleArea(
+    rectangle: Pick<Rectangle, 'xLength' | 'yLength'>
+) {
+    return rectangle.xLength * rectangle.yLength;
 }
 
-export function rectangleDistance(rect1:Rectangle, rect2:Rectangle) {
-    const x = (rect1.x - rect2.x);
-    const y = (rect1.y - rect2.y);
-    return Math.sqrt(x*x + y*y);
+export function rectangleDistance(rect1: Rectangle, rect2: Rectangle) {
+    const x = rect1.x - rect2.x;
+    const y = rect1.y - rect2.y;
+    return Math.sqrt(x * x + y * y);
 }
 
-export function rectangleIntersection(
-    ...rectangles:Rectangle[]
-):Rectangle {
+export function rectangleIntersection(...rectangles: Rectangle[]): Rectangle {
     // Iteratively intersect every rectangle in the list with an accumulator
     let intersection = rectangles[0];
-    for (let i=1; i<rectangles.length; i++) {
+    for (let i = 1; i < rectangles.length; i++) {
         // Perform the intersection - this is standard way to do it
         const rect = rectangles[i];
 
         const xMin = Math.max(intersection.x, rect.x);
-        const xMax = Math.min(intersection.x + intersection.xLength, rect.x + rect.xLength);
+        const xMax = Math.min(
+            intersection.x + intersection.xLength,
+            rect.x + rect.xLength
+        );
 
         const yMin = Math.max(intersection.y, rect.y);
-        const yMax = Math.min(intersection.y + intersection.yLength, rect.y + rect.yLength);
+        const yMax = Math.min(
+            intersection.y + intersection.yLength,
+            rect.y + rect.yLength
+        );
 
         if (xMin >= xMax || yMin >= yMax) {
             // no intersection
@@ -35,23 +46,21 @@ export function rectangleIntersection(
                 x: 0,
                 y: 0,
                 xLength: 0,
-                yLength: 0
+                yLength: 0,
             };
         } else {
             intersection = {
                 x: xMin,
                 y: yMin,
                 xLength: xMax - xMin,
-                yLength: yMax - yMin
+                yLength: yMax - yMin,
             };
         }
     }
     return intersection;
 }
 
-export function rectangleDifference(
-    a:Rectangle, b:Rectangle
-):RegionShape {
+export function rectangleDifference(a: Rectangle, b: Rectangle): RegionShape {
     if (rectangleArea(rectangleIntersection(a, b)) === 0) {
         // no intersection -> no difference
         return [a];
@@ -72,87 +81,91 @@ export function rectangleDifference(
      */
     // To avoid any problems with infinity, just take the set complement with respect to the bounding box of the two
 
-    const boundingBox = getBoundingBox([a,b]);
+    const boundingBox = getBoundingBox([a, b]);
     const setComplementOfB = [
         // top box
         {
-            x:boundingBox.xRange.min,
-            y:b.y + b.yLength,
-            xLength:boundingBox.xLength,
-            yLength:boundingBox.yRange.max - (b.y + b.yLength)
+            x: boundingBox.xRange.min,
+            y: b.y + b.yLength,
+            xLength: boundingBox.xLength,
+            yLength: boundingBox.yRange.max - (b.y + b.yLength),
         },
         // left box
         {
-            x:boundingBox.xRange.min,
-            y:b.y,
-            xLength:b.x - boundingBox.xRange.min,
-            yLength:b.yLength
+            x: boundingBox.xRange.min,
+            y: b.y,
+            xLength: b.x - boundingBox.xRange.min,
+            yLength: b.yLength,
         },
         // bottom box
         {
-            x:boundingBox.xRange.min,
-            y:boundingBox.yRange.min,
-            xLength:boundingBox.xLength,
-            yLength:b.y - boundingBox.yRange.min
+            x: boundingBox.xRange.min,
+            y: boundingBox.yRange.min,
+            xLength: boundingBox.xLength,
+            yLength: b.y - boundingBox.yRange.min,
         },
         // right box
         {
-            x:b.x+b.xLength,
-            y:b.y,
-            xLength:boundingBox.xRange.max - (b.x + b.xLength),
-            yLength:b.yLength
-        }
-    ]
+            x: b.x + b.xLength,
+            y: b.y,
+            xLength: boundingBox.xRange.max - (b.x + b.xLength),
+            yLength: b.yLength,
+        },
+    ];
 
     // Intersect a with each of those rectangles
-    let intersection = setComplementOfB.map(rect=>rectangleIntersection(rect, a));
+    let intersection = setComplementOfB.map(rect =>
+        rectangleIntersection(rect, a)
+    );
     // filter out empty rectangles
-    intersection = intersection.filter(r=>rectangleArea(r) > 0);
+    intersection = intersection.filter(r => rectangleArea(r) > 0);
     return intersection;
 }
 
 export function rectangleDifferenceMultiple(
-    a:Rectangle, subRects:Rectangle[]
-):RegionShape {
+    a: Rectangle,
+    subRects: Rectangle[]
+): RegionShape {
     let difference = [a];
     for (const subRect of subRects) {
-        difference = _.flatMap(difference, rect=>rectangleDifference(rect, subRect));
+        difference = _.flatMap(difference, rect =>
+            rectangleDifference(rect, subRect)
+        );
     }
     return difference;
 }
 
-export function getRegionArea(
-    region:RegionShape
-) {
+export function getRegionArea(region: RegionShape) {
     return _.sumBy(region, rectangleArea);
 }
 
-export function getRegionShape(
-    sets:string[],
-    setRectangles:SetRectangles
-) {
-    const intersectionRect = rectangleIntersection(...sets.map(s=>setRectangles[s]));
+export function getRegionShape(sets: string[], setRectangles: SetRectangles) {
+    const intersectionRect = rectangleIntersection(
+        ...sets.map(s => setRectangles[s])
+    );
 
-    const excludedRectangles =
-        _.difference(Object.keys(setRectangles), sets).map(uid=>setRectangles[uid]);
+    const excludedRectangles = _.difference(
+        Object.keys(setRectangles),
+        sets
+    ).map(uid => setRectangles[uid]);
 
     return rectangleDifferenceMultiple(intersectionRect, excludedRectangles);
 }
 
-export function getBoundingBox(rectangles:Rectangle[]) {
+export function getBoundingBox(rectangles: Rectangle[]) {
     const ret = {
-        xRange:{
-            min: Math.min(...rectangles.map(r=>r.x)),
-            max: Math.max(...rectangles.map(r=>r.x + r.xLength))
+        xRange: {
+            min: Math.min(...rectangles.map(r => r.x)),
+            max: Math.max(...rectangles.map(r => r.x + r.xLength)),
         },
-        yRange:{
-            min: Math.min(...rectangles.map(r=>r.y)),
-            max: Math.max(...rectangles.map(r=>r.y + r.yLength))
+        yRange: {
+            min: Math.min(...rectangles.map(r => r.y)),
+            max: Math.max(...rectangles.map(r => r.y + r.yLength)),
         },
-        xLength:0,
-        yLength:0
+        xLength: 0,
+        yLength: 0,
     };
     ret.xLength = ret.xRange.max - ret.xRange.min;
     ret.yLength = ret.yRange.max - ret.yRange.min;
     return ret;
-}
\ No newline at end of file
+}
diff --git a/src/pages/groupComparison/rectangleVennDiagram/layout.ts b/src/pages/groupComparison/rectangleVennDiagram/layout.ts
index 8be138f50f6..73c00df334a 100644
--- a/src/pages/groupComparison/rectangleVennDiagram/layout.ts
+++ b/src/pages/groupComparison/rectangleVennDiagram/layout.ts
@@ -1,44 +1,63 @@
-import _ from "lodash";
-import {nelderMead} from 'fmin';
-import {layoutConnectedComponents} from "./normalizeLayout";
-import {getRegionArea, getRegionShape, Rectangle, rectangleArea, rectangleDistance} from "./geometry";
-
-export type Region = {size:number, sets:string[], sizeOfIntersectionOfSets:number};
-export type Set = { size:number, uid:string, disjoint:boolean};
-export type SetRectangles = {[setUid:string]:Rectangle};
-const VennJs = require("venn.js");
-
-export function getRegionLabelPosition(sets:string[], setRectangles:SetRectangles) {
+import _ from 'lodash';
+import { nelderMead } from 'fmin';
+import { layoutConnectedComponents } from './normalizeLayout';
+import {
+    getRegionArea,
+    getRegionShape,
+    Rectangle,
+    rectangleArea,
+    rectangleDistance,
+} from './geometry';
+
+export type Region = {
+    size: number;
+    sets: string[];
+    sizeOfIntersectionOfSets: number;
+};
+export type Set = { size: number; uid: string; disjoint: boolean };
+export type SetRectangles = { [setUid: string]: Rectangle };
+const VennJs = require('venn.js');
+
+export function getRegionLabelPosition(
+    sets: string[],
+    setRectangles: SetRectangles
+) {
     const regionShape = getRegionShape(sets, setRectangles);
 
     // Put label in center of biggest area rectangle in the region shape
-    const sortedRegionRectangles = _.sortBy(regionShape, rectangle=>-rectangleArea(rectangle));
+    const sortedRegionRectangles = _.sortBy(
+        regionShape,
+        rectangle => -rectangleArea(rectangle)
+    );
     const biggestAreaRectangle = sortedRegionRectangles[0];
     return {
-        x: biggestAreaRectangle.x + biggestAreaRectangle.xLength/2,
-        y: biggestAreaRectangle.y + biggestAreaRectangle.yLength/2
+        x: biggestAreaRectangle.x + biggestAreaRectangle.xLength / 2,
+        y: biggestAreaRectangle.y + biggestAreaRectangle.yLength / 2,
     };
 }
 
 function rectangleVennLossFunction(
-    setRectangles:SetRectangles,
-    regions:Region[],
-    sets:Set[]
+    setRectangles: SetRectangles,
+    regions: Region[],
+    sets: Set[]
 ) {
     let areaError = 0;
     let intersectionDistancePenalty = 0;
 
     for (const region of regions) {
         // Make regions proportional to their size
-        const regionArea = getRegionArea(getRegionShape(region.sets, setRectangles));
-        const error = (regionArea - region.size);
-        areaError += error*error;
+        const regionArea = getRegionArea(
+            getRegionShape(region.sets, setRectangles)
+        );
+        const error = regionArea - region.size;
+        areaError += error * error;
 
         if (region.sets.length === 2 && regionArea === 0 && region.size > 0) {
             // try to bring each pair of rectangles together if they should intersect and currently dont. Otherwise,
             //  the loss function only detects errors in intersection regions, so won't know how to move them to get better.
             intersectionDistancePenalty += rectangleDistance(
-                setRectangles[region.sets[0]], setRectangles[region.sets[1]]
+                setRectangles[region.sets[0]],
+                setRectangles[region.sets[1]]
             );
         }
     }
@@ -46,32 +65,51 @@ function rectangleVennLossFunction(
     for (const set of sets) {
         // Make each rectangle proportional to its size
         const rectSize = rectangleArea(setRectangles[set.uid]);
-        const rectSizeError = (rectSize - set.size);
-        areaError += rectSizeError*rectSizeError;
+        const rectSizeError = rectSize - set.size;
+        areaError += rectSizeError * rectSizeError;
     }
 
     return {
         areaError,
-        otherPenalties: intersectionDistancePenalty
+        otherPenalties: intersectionDistancePenalty,
     };
 }
 
-export function computeRectangleVennLayout(regions:Region[], sets:Set[], parameters:any) {
+export function computeRectangleVennLayout(
+    regions: Region[],
+    sets: Set[],
+    parameters: any
+) {
     // based on https://github.com/benfred/venn.js/blob/master/src/layout.js#L7
     parameters = parameters || {};
 
     // Base our initial layout on the VennJs library's initial layout for circles.
-    const initialLayout = VennJs.bestInitialLayout(regions.map(region=>({ sets: region.sets, size: region.sizeOfIntersectionOfSets })), parameters);
-    const initialRectangles:SetRectangles = _.mapValues(initialLayout, circle=>({
-        x: circle.x - circle.radius,
-        y: circle.y - circle.radius,
-        xLength: 2*circle.radius,
-        yLength: 2*circle.radius
-    }));
-
-    const rectangleToVector = (rect:Rectangle)=>{
-        return [rect.x + rect.xLength / 2, rect.y + rect.yLength / 2,
-                rect.xLength/2, rect.xLength/2, rect.yLength/2, rect.yLength/2];
+    const initialLayout = VennJs.bestInitialLayout(
+        regions.map(region => ({
+            sets: region.sets,
+            size: region.sizeOfIntersectionOfSets,
+        })),
+        parameters
+    );
+    const initialRectangles: SetRectangles = _.mapValues(
+        initialLayout,
+        circle => ({
+            x: circle.x - circle.radius,
+            y: circle.y - circle.radius,
+            xLength: 2 * circle.radius,
+            yLength: 2 * circle.radius,
+        })
+    );
+
+    const rectangleToVector = (rect: Rectangle) => {
+        return [
+            rect.x + rect.xLength / 2,
+            rect.y + rect.yLength / 2,
+            rect.xLength / 2,
+            rect.xLength / 2,
+            rect.yLength / 2,
+            rect.yLength / 2,
+        ];
 
         // This parametrization is useful because it allows free exploration of the parameter space in
         //  a way that is relevant to the problem.
@@ -87,39 +125,43 @@ export function computeRectangleVennLayout(regions:Region[], sets:Set[], paramet
         //  whereas to change x in Param. B you'd need to alter both x1 and x2 synchronously.
     };
 
-    const vectorToRectangle = (i:number, vector:number[], square:boolean)=>{
+    const vectorToRectangle = (
+        i: number,
+        vector: number[],
+        square: boolean
+    ) => {
         // This is completely tied to `rectangleToVector` - if one is rewritten then so must the other be so that they are inverses.
-        const centerX = vector[6*i];
-        const centerY = vector[6*i + 1];
-        const leftXLength = Math.abs(vector[6*i + 2]);
-        const xLength = leftXLength + Math.abs(vector[6*i+3]);
+        const centerX = vector[6 * i];
+        const centerY = vector[6 * i + 1];
+        const leftXLength = Math.abs(vector[6 * i + 2]);
+        const xLength = leftXLength + Math.abs(vector[6 * i + 3]);
 
-        let bottomYLength:number, yLength:number;
+        let bottomYLength: number, yLength: number;
         if (square) {
             // if square, then ignore the vector values for y width, just copy from x
             bottomYLength = leftXLength;
             yLength = xLength;
         } else {
-            bottomYLength = Math.abs(vector[6*i+4]);
-            yLength = bottomYLength + Math.abs(vector[6*i + 5]);
+            bottomYLength = Math.abs(vector[6 * i + 4]);
+            yLength = bottomYLength + Math.abs(vector[6 * i + 5]);
         }
 
         const x = centerX - leftXLength;
         const y = centerY - bottomYLength;
-        return {x,y,xLength,yLength};
+        return { x, y, xLength, yLength };
     };
 
     // transform rectangles to a vector to pass to the optimization algorithm
-    const initial:number[] = [];
+    const initial: number[] = [];
     for (const set of sets) {
         initial.push(...rectangleToVector(initialRectangles[set.uid]));
     }
 
     // optimize initial layout from our loss function
     const solution = nelderMead(
-        function(values:number[]) {
-            const current:SetRectangles = {};
-            for (let i=0; i<sets.length; i++) {
+        function(values: number[]) {
+            const current: SetRectangles = {};
+            for (let i = 0; i < sets.length; i++) {
                 const setId = sets[i].uid;
                 current[setId] = vectorToRectangle(i, values, sets[i].disjoint);
             }
@@ -127,12 +169,13 @@ export function computeRectangleVennLayout(regions:Region[], sets:Set[], paramet
             return error.areaError + error.otherPenalties;
         },
         initial,
-        parameters);
+        parameters
+    );
 
     // transform solution vector back to rectangles
-    const rectangles:SetRectangles = {};
+    const rectangles: SetRectangles = {};
     const values = solution.x;
-    for (let i=0; i<sets.length; i++) {
+    for (let i = 0; i < sets.length; i++) {
         const setId = sets[i].uid;
         rectangles[setId] = vectorToRectangle(i, values, sets[i].disjoint);
     }
@@ -141,6 +184,7 @@ export function computeRectangleVennLayout(regions:Region[], sets:Set[], paramet
 
     return {
         rectangles,
-        finalErrorValue: rectangleVennLossFunction(rectangles, regions, sets).areaError
+        finalErrorValue: rectangleVennLossFunction(rectangles, regions, sets)
+            .areaError,
     };
-}
\ No newline at end of file
+}
diff --git a/src/pages/groupComparison/rectangleVennDiagram/normalizeLayout.spec.ts b/src/pages/groupComparison/rectangleVennDiagram/normalizeLayout.spec.ts
index 29337748f7d..2d4c79a29cd 100644
--- a/src/pages/groupComparison/rectangleVennDiagram/normalizeLayout.spec.ts
+++ b/src/pages/groupComparison/rectangleVennDiagram/normalizeLayout.spec.ts
@@ -1,70 +1,70 @@
-import {assert} from "chai";
-import {assertDeepEqualInAnyOrder} from "../../../shared/lib/SpecUtils";
-import {getConnectedComponents} from "./normalizeLayout";
+import { assert } from 'chai';
+import { assertDeepEqualInAnyOrder } from '../../../shared/lib/SpecUtils';
+import { getConnectedComponents } from './normalizeLayout';
 
-describe("rectangleVennDiagram/normalizeLayout", () => {
-    describe("getConnectedComponents", ()=>{
-        it("one rectangle", ()=>{
-            const rect = { x:0, y:0, xLength:10, yLength:3};
+describe('rectangleVennDiagram/normalizeLayout', () => {
+    describe('getConnectedComponents', () => {
+        it('one rectangle', () => {
+            const rect = { x: 0, y: 0, xLength: 10, yLength: 3 };
             assertDeepEqualInAnyOrder(
                 getConnectedComponents({
-                    rect
+                    rect,
                 }),
-                [{rectangles:[rect]}]
-            )
+                [{ rectangles: [rect] }]
+            );
         });
-        it("two disjoint rectangles", ()=>{
+        it('two disjoint rectangles', () => {
             const rects = {
-                rect1:{ x:0, y:0, xLength:10, yLength:3},
-                rect2:{ x:20, y:0, xLength:5, yLength:3}
+                rect1: { x: 0, y: 0, xLength: 10, yLength: 3 },
+                rect2: { x: 20, y: 0, xLength: 5, yLength: 3 },
             };
-            assertDeepEqualInAnyOrder(
-                getConnectedComponents(rects),
-                [{rectangles:[rects.rect1]}, {rectangles:[rects.rect2]}]
-            );
+            assertDeepEqualInAnyOrder(getConnectedComponents(rects), [
+                { rectangles: [rects.rect1] },
+                { rectangles: [rects.rect2] },
+            ]);
         });
-        it("two intersecting rectangles", ()=>{
+        it('two intersecting rectangles', () => {
             const rects = {
-                rect1:{ x:0, y:0, xLength:10, yLength:3},
-                rect2:{ x:5, y:0, xLength:5, yLength:3}
+                rect1: { x: 0, y: 0, xLength: 10, yLength: 3 },
+                rect2: { x: 5, y: 0, xLength: 5, yLength: 3 },
             };
-            assertDeepEqualInAnyOrder(
-                getConnectedComponents(rects),
-                [{rectangles:[rects.rect1, rects.rect2]}]
-            );
+            assertDeepEqualInAnyOrder(getConnectedComponents(rects), [
+                { rectangles: [rects.rect1, rects.rect2] },
+            ]);
         });
-        it("two intersecting rectangles and one disjoint rectangle", ()=>{
+        it('two intersecting rectangles and one disjoint rectangle', () => {
             const rects = {
-                rect1:{ x:0, y:0, xLength:10, yLength:3},
-                rect2:{ x:5, y:0, xLength:5, yLength:3},
-                rect3:{ x:20, y:0, xLength:5, yLength:3}
+                rect1: { x: 0, y: 0, xLength: 10, yLength: 3 },
+                rect2: { x: 5, y: 0, xLength: 5, yLength: 3 },
+                rect3: { x: 20, y: 0, xLength: 5, yLength: 3 },
             };
-            assertDeepEqualInAnyOrder(
-                getConnectedComponents(rects),
-                [{rectangles:[rects.rect1, rects.rect2]}, {rectangles:[rects.rect3]}]
-            );
+            assertDeepEqualInAnyOrder(getConnectedComponents(rects), [
+                { rectangles: [rects.rect1, rects.rect2] },
+                { rectangles: [rects.rect3] },
+            ]);
         });
-        it("three intersecting rectangles", ()=>{
+        it('three intersecting rectangles', () => {
             const rects = {
-                rect1:{ x:0, y:0, xLength:10, yLength:3},
-                rect2:{ x:5, y:0, xLength:5, yLength:3},
-                rect3:{ x:2, y:0, xLength:5, yLength:3}
+                rect1: { x: 0, y: 0, xLength: 10, yLength: 3 },
+                rect2: { x: 5, y: 0, xLength: 5, yLength: 3 },
+                rect3: { x: 2, y: 0, xLength: 5, yLength: 3 },
             };
-            assertDeepEqualInAnyOrder(
-                getConnectedComponents(rects),
-                [{rectangles:[rects.rect1, rects.rect2, rects.rect3]}]
-            );
+            assertDeepEqualInAnyOrder(getConnectedComponents(rects), [
+                { rectangles: [rects.rect1, rects.rect2, rects.rect3] },
+            ]);
         });
-        it("three disjoint rectangles", ()=>{
+        it('three disjoint rectangles', () => {
             const rects = {
-                rect1:{ x:0, y:0, xLength:10, yLength:3},
-                rect2:{ x:20, y:0, xLength:5, yLength:3},
-                rect3:{ x:50, y:0, xLength:5, yLength:3}
+                rect1: { x: 0, y: 0, xLength: 10, yLength: 3 },
+                rect2: { x: 20, y: 0, xLength: 5, yLength: 3 },
+                rect3: { x: 50, y: 0, xLength: 5, yLength: 3 },
             };
-            assertDeepEqualInAnyOrder(
-                getConnectedComponents(rects),
-                [{rectangles:[rects.rect1]}, {rectangles:[rects.rect2]},, {rectangles:[rects.rect3]}]
-            );
+            assertDeepEqualInAnyOrder(getConnectedComponents(rects), [
+                { rectangles: [rects.rect1] },
+                { rectangles: [rects.rect2] },
+                ,
+                { rectangles: [rects.rect3] },
+            ]);
         });
     });
-});
\ No newline at end of file
+});
diff --git a/src/pages/groupComparison/rectangleVennDiagram/normalizeLayout.ts b/src/pages/groupComparison/rectangleVennDiagram/normalizeLayout.ts
index 87db7a593b4..e1eccece4eb 100644
--- a/src/pages/groupComparison/rectangleVennDiagram/normalizeLayout.ts
+++ b/src/pages/groupComparison/rectangleVennDiagram/normalizeLayout.ts
@@ -1,24 +1,25 @@
-import _ from "lodash";
+import _ from 'lodash';
+import { Region, SetRectangles, Set } from './layout';
 import {
-    Region,
-    SetRectangles, Set
-} from "./layout";
-import {getBoundingBox, Rectangle, rectangleArea, rectangleIntersection} from "./geometry";
-
+    getBoundingBox,
+    Rectangle,
+    rectangleArea,
+    rectangleIntersection,
+} from './geometry';
 
 export function adjustSizesForMinimumSizeRegions(
-    regions:Region[],
-    sets:Set[]
+    regions: Region[],
+    sets: Set[]
 ) {
     // Adjust sizes in order to not have regions that are too tiny to interact with/see.
     // The minimum region size is a fraction of the biggest set size.
-    const biggestSetSize = Math.max(...sets.map(s=>s.size));
+    const biggestSetSize = Math.max(...sets.map(s => s.size));
     const minRegionSize = biggestSetSize / 30;
 
     sets = _.cloneDeep(sets);
     regions = _.cloneDeep(regions);
 
-    const setsMap = _.keyBy(sets, s=>s.uid);
+    const setsMap = _.keyBy(sets, s => s.uid);
     for (const region of regions) {
         // Adjust sizes of nonempty regions in a consistent way:
         //  When adding to a region in order to bring it to the minimum, it also implies
@@ -38,10 +39,8 @@ export function adjustSizesForMinimumSizeRegions(
     return { regions, sets };
 }
 
-export function getConnectedComponents(
-    setRectangles:SetRectangles
-) {
-    const components:{ rectangles:Rectangle[] }[] = [];
+export function getConnectedComponents(setRectangles: SetRectangles) {
+    const components: { rectangles: Rectangle[] }[] = [];
     const rectangles = _.values(setRectangles);
 
     for (const rect of rectangles) {
@@ -49,10 +48,15 @@ export function getConnectedComponents(
         // First we check if `rect` is intersecting with any connected component we've already tracked
         let added = false;
         for (const component of components) {
-            if (_.some(
-                component.rectangles,
-                componentRect=>(rectangleArea(rectangleIntersection(rect, componentRect)) > 0)
-            )) {
+            if (
+                _.some(
+                    component.rectangles,
+                    componentRect =>
+                        rectangleArea(
+                            rectangleIntersection(rect, componentRect)
+                        ) > 0
+                )
+            ) {
                 component.rectangles.push(rect);
                 added = true;
             }
@@ -60,16 +64,14 @@ export function getConnectedComponents(
         // If not, then add it to a new component
         if (!added) {
             components.push({
-                rectangles:[rect]
+                rectangles: [rect],
             });
         }
     }
     return components;
 }
 
-export function layoutConnectedComponents(
-    setRectangles:SetRectangles
-) {
+export function layoutConnectedComponents(setRectangles: SetRectangles) {
     // layout connected components by their bounding boxes
     let connectedComponents = getConnectedComponents(setRectangles);
 
@@ -86,31 +88,56 @@ export function layoutConnectedComponents(
         //   SMALLEST
 
         // First sort by size
-        connectedComponents = _.sortBy(connectedComponents, component=>-rectangleArea(getBoundingBox(component.rectangles)));
-        const boundingBoxes = connectedComponents.map(component=>getBoundingBox(component.rectangles));
-        const xPadding = Math.max(...boundingBoxes.map(box=>(box.xRange.max - box.xRange.min))) / 10;
-        const yPadding = Math.max(...boundingBoxes.map(box=>(box.yRange.max - box.yRange.min))) / 10;
+        connectedComponents = _.sortBy(
+            connectedComponents,
+            component => -rectangleArea(getBoundingBox(component.rectangles))
+        );
+        const boundingBoxes = connectedComponents.map(component =>
+            getBoundingBox(component.rectangles)
+        );
+        const xPadding =
+            Math.max(
+                ...boundingBoxes.map(box => box.xRange.max - box.xRange.min)
+            ) / 10;
+        const yPadding =
+            Math.max(
+                ...boundingBoxes.map(box => box.yRange.max - box.yRange.min)
+            ) / 10;
 
         // select the target coordinates for the layout
-        let targetCoordinates:{x:number, y:number}[] = [];
+        let targetCoordinates: { x: number; y: number }[] = [];
         switch (boundingBoxes.length) {
             case 2:
                 targetCoordinates = [
-                    { x:0, y:0 },
-                    { x:boundingBoxes[0].xLength + xPadding, y:0 }
+                    { x: 0, y: 0 },
+                    { x: boundingBoxes[0].xLength + xPadding, y: 0 },
                 ];
                 break;
             case 3:
                 targetCoordinates = [
-                    {x:0, y:0},
-                    {x:Math.max(boundingBoxes[0].xLength, boundingBoxes[2].xLength) + xPadding, y:0 },
-                    {x:0, y:Math.max(boundingBoxes[0].yLength, boundingBoxes[1].yLength) + yPadding }
+                    { x: 0, y: 0 },
+                    {
+                        x:
+                            Math.max(
+                                boundingBoxes[0].xLength,
+                                boundingBoxes[2].xLength
+                            ) + xPadding,
+                        y: 0,
+                    },
+                    {
+                        x: 0,
+                        y:
+                            Math.max(
+                                boundingBoxes[0].yLength,
+                                boundingBoxes[1].yLength
+                            ) + yPadding,
+                    },
                 ];
                 break;
         }
 
         // Calculate the offsets from the target coordinates and add those offsets to each rectangle in the connected component
-        for (let i=0; i<targetCoordinates.length; i++) {
+        for (let i = 0; i < targetCoordinates.length; i++) {
             const xDiff = targetCoordinates[i].x - boundingBoxes[i].xRange.min;
             const yDiff = targetCoordinates[i].y - boundingBoxes[i].yRange.min;
             for (const rectangle of connectedComponents[i].rectangles) {
@@ -121,34 +148,38 @@ export function layoutConnectedComponents(
     }
 }
 
-export function scaleAndCenterLayout(layout:SetRectangles, width:number, height:number, padding:number) {
+export function scaleAndCenterLayout(
+    layout: SetRectangles,
+    width: number,
+    height: number,
+    padding: number
+) {
     // Based on https://github.com/benfred/venn.js/blob/d5a47bd12140f95a17402c6356af4631f53a0723/src/layout.js#L635
 
     const rectangles = _.values(layout);
     const setIds = Object.keys(layout);
 
-    width -= 2*padding;
-    height -= 2*padding;
+    width -= 2 * padding;
+    height -= 2 * padding;
 
     const bounds = getBoundingBox(rectangles);
     const xRange = bounds.xRange;
     const yRange = bounds.yRange;
 
-    if ((xRange.max == xRange.min) ||
-        (yRange.max == yRange.min)) {
-        console.log("not scaling layout: zero size detected");
+    if (xRange.max == xRange.min || yRange.max == yRange.min) {
+        console.log('not scaling layout: zero size detected');
         return layout;
     }
 
-    const xScaling = width  / (xRange.max - xRange.min);
+    const xScaling = width / (xRange.max - xRange.min);
     const yScaling = height / (yRange.max - yRange.min);
     const scaling = Math.min(yScaling, xScaling);
 
     // while we're at it, center the diagram too
-    const xOffset = (width -  (xRange.max - xRange.min) * scaling) / 2;
+    const xOffset = (width - (xRange.max - xRange.min) * scaling) / 2;
     const yOffset = (height - (yRange.max - yRange.min) * scaling) / 2;
 
-    const scaled:SetRectangles = {};
+    const scaled: SetRectangles = {};
     for (let i = 0; i < rectangles.length; ++i) {
         const rect = rectangles[i];
         scaled[setIds[i]] = {
@@ -160,4 +191,4 @@ export function scaleAndCenterLayout(layout:SetRectangles, width:number, height:
     }
 
     return scaled;
-}
\ No newline at end of file
+}
diff --git a/src/pages/groupComparison/styles.module.scss b/src/pages/groupComparison/styles.module.scss
index 74068c0c06f..bd026b89f51 100644
--- a/src/pages/groupComparison/styles.module.scss
+++ b/src/pages/groupComparison/styles.module.scss
@@ -3,28 +3,28 @@
 }
 
 :global(.btn-group) > :global(.btn.noMarginLeft) {
-    margin-left:0px !important;
+    margin-left: 0px !important;
 }
 
 .comparisonGroupManager {
     .groupCheckboxes {
-        margin-top:4px;
-        max-height:350px;
-        width:100%;
-        overflow:auto;
-        padding:3px;
+        margin-top: 4px;
+        max-height: 350px;
+        width: 100%;
+        overflow: auto;
+        padding: 3px;
 
         :global(div.checkbox) {
-            margin-bottom:0px;
-            margin-top:0px;
+            margin-bottom: 0px;
+            margin-top: 0px;
         }
 
         .markedForDeletion {
-            color:#888888;
-            text-decoration:line-through black;
-            display:flex;
-            flex-direction:row;
-            justify-content:space-between;
+            color: #888888;
+            text-decoration: line-through black;
+            display: flex;
+            flex-direction: row;
+            justify-content: space-between;
         }
 
         .groupRow:nth-of-type(even) {
@@ -33,73 +33,67 @@
 
         .groupItem {
             input {
-                margin-top:0px;
-                margin-right:5px;
+                margin-top: 0px;
+                margin-right: 5px;
             }
         }
     }
 
     .noGroupsMessage {
-
     }
 
     :global(input.form-control) {
-        font-size:12px;
-        height:36px;
+        font-size: 12px;
+        height: 36px;
     }
 }
 
 .groupButtons {
     button {
-        margin:2px !important;
+        margin: 2px !important;
     }
-    display:inline-block;
+    display: inline-block;
 
     .buttonUnselected {
         //filter: grayscale(1);
         //opacity: 0.35;
-        background-color:rgba(0,0,0,0) !important;
+        background-color: rgba(0, 0, 0, 0) !important;
         border: 1px solid #c3c3c3;
 
         span {
-            color:black !important;
+            color: black !important;
         }
     }
 
     .buttonExcludedFromAnalysis {
-        background-color:#dddddd !important;
-        color:white !important;
+        background-color: #dddddd !important;
+        color: white !important;
         text-decoration: line-through solid black !important;
     }
 
     i {
-        width:15px;
+        width: 15px;
     }
 }
 
-
-
-
 .groupLineItemActionButtons {
-    min-width:45px;
+    min-width: 45px;
     > span {
-        margin-left:5px;
+        margin-left: 5px;
         i {
-            color:$brand-primary;
+            color: $brand-primary;
             &:hover {
-                color:darken($brand-primary,10%)
+                color: darken($brand-primary, 10%);
             }
         }
     }
 }
 
-
-
 .headerControls {
-    display:flex;
-    align-items:center;
+    display: flex;
+    align-items: center;
     justify-content: space-between;
     > div {
-      margin-right:30px;
+        margin-right: 30px;
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/home/HomePage.tsx b/src/pages/home/HomePage.tsx
index 41640839663..f418b51bdcb 100644
--- a/src/pages/home/HomePage.tsx
+++ b/src/pages/home/HomePage.tsx
@@ -1,48 +1,57 @@
 import * as React from 'react';
-import {observer, inject, Observer } from "mobx-react";
+import { observer, inject, Observer } from 'mobx-react';
 import { observable } from 'mobx';
 import Chart from 'chart.js';
 import AppConfig from 'appConfig';
 import 'react-select1/dist/react-select.css';
-import {CancerStudyQueryUrlParams, QueryStore} from "../../shared/components/query/QueryStore";
-import QueryAndDownloadTabs from "../../shared/components/query/QueryAndDownloadTabs";
-import {PageLayout} from "../../shared/components/PageLayout/PageLayout";
-import RightBar from "../../shared/components/rightbar/RightBar";
+import {
+    CancerStudyQueryUrlParams,
+    QueryStore,
+} from '../../shared/components/query/QueryStore';
+import QueryAndDownloadTabs from '../../shared/components/query/QueryAndDownloadTabs';
+import { PageLayout } from '../../shared/components/PageLayout/PageLayout';
+import RightBar from '../../shared/components/rightbar/RightBar';
 // tslint:disable-next-line:no-import-side-effect
-import "./homePage.scss";
-import autobind from "autobind-decorator";
-import {ResultsViewTab} from "pages/resultsView/ResultsViewPageHelpers";
-import ResultsViewURLWrapper from "pages/resultsView/ResultsViewURLWrapper";
-import {createQueryStore} from "shared/lib/createQueryStore";
+import './homePage.scss';
+import autobind from 'autobind-decorator';
+import { ResultsViewTab } from 'pages/resultsView/ResultsViewPageHelpers';
+import ResultsViewURLWrapper from 'pages/resultsView/ResultsViewURLWrapper';
+import { createQueryStore } from 'shared/lib/createQueryStore';
 
 (Chart as any).plugins.register({
-    beforeDraw: function (chartInstance: any) {
+    beforeDraw: function(chartInstance: any) {
         const ctx = chartInstance.chart.ctx;
-        ctx.fillStyle = "white";
-        ctx.fillRect(0, 0, chartInstance.chart.width, chartInstance.chart.height);
-    }
+        ctx.fillStyle = 'white';
+        ctx.fillRect(
+            0,
+            0,
+            chartInstance.chart.width,
+            chartInstance.chart.height
+        );
+    },
 });
 
-const win = (window as any);
+const win = window as any;
 
 export interface IResultsViewPageProps {
     routing: any;
 }
 
-
 @inject('routing')
 @observer
-export default class HomePage extends React.Component<IResultsViewPageProps, {}> {
-
+export default class HomePage extends React.Component<
+    IResultsViewPageProps,
+    {}
+> {
     @observable showQuerySelector = true;
 
-    queryStore:QueryStore;
+    queryStore: QueryStore;
 
     constructor(props: IResultsViewPageProps) {
         super(props);
     }
 
-    componentWillMount(){
+    componentWillMount() {
         this.queryStore = createQueryStore();
     }
 
@@ -51,21 +60,32 @@ export default class HomePage extends React.Component<IResultsViewPageProps, {}>
     }
 
     @autobind
-    private getQueryStore(){
+    private getQueryStore() {
         return this.queryStore;
     }
 
     public render() {
-
         return (
-            <PageLayout className="homePageLayout" noMargin={true} rightBar={<RightBar queryStore={this.queryStore} />}>
-
-                <div className={"headBlock"} dangerouslySetInnerHTML={{__html:AppConfig.serverConfig.skin_blurb!}}></div>
-
-                <QueryAndDownloadTabs getQueryStore={this.getQueryStore} showQuickSearchTab={AppConfig.serverConfig.quick_search_enabled} showDownloadTab={true}/>
-
+            <PageLayout
+                className="homePageLayout"
+                noMargin={true}
+                rightBar={<RightBar queryStore={this.queryStore} />}
+            >
+                <div
+                    className={'headBlock'}
+                    dangerouslySetInnerHTML={{
+                        __html: AppConfig.serverConfig.skin_blurb!,
+                    }}
+                ></div>
+
+                <QueryAndDownloadTabs
+                    getQueryStore={this.getQueryStore}
+                    showQuickSearchTab={
+                        AppConfig.serverConfig.quick_search_enabled
+                    }
+                    showDownloadTab={true}
+                />
             </PageLayout>
-        )
-
+        );
     }
 }
diff --git a/src/pages/home/homePage.scss b/src/pages/home/homePage.scss
index b89a5757f27..b8a79bf59d6 100644
--- a/src/pages/home/homePage.scss
+++ b/src/pages/home/homePage.scss
@@ -2,4 +2,4 @@
     #mainColumn {
         background: white;
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/patientView/PatientViewGenePanelModal/GenesList.tsx b/src/pages/patientView/PatientViewGenePanelModal/GenesList.tsx
index 510cbd6eed0..e030d3ecdb1 100644
--- a/src/pages/patientView/PatientViewGenePanelModal/GenesList.tsx
+++ b/src/pages/patientView/PatientViewGenePanelModal/GenesList.tsx
@@ -17,34 +17,37 @@ interface IGenesListProps {
 }
 
 @observer
-export default class GenesList extends React.Component<
-    IGenesListProps,
-    {}
-> {
-    @observable filter:string = '';
-    
+export default class GenesList extends React.Component<IGenesListProps, {}> {
+    @observable filter: string = '';
+
     @autobind
-    @action handleChangeInput(value: string) {
+    @action
+    handleChangeInput(value: string) {
         this.filter = value;
-    };
+    }
 
     @computed get filteredGenes() {
         const { genes } = this.props.genePanel;
         if (this.filter) {
             const regex = new RegExp(this.filter, 'i');
             return genes.filter(
-                gene => regex.test(gene.entrezGeneId.toString()) || regex.test(gene.hugoGeneSymbol)
+                gene =>
+                    regex.test(gene.entrezGeneId.toString()) ||
+                    regex.test(gene.hugoGeneSymbol)
             );
         }
         return genes;
-    };
+    }
 
     genesDividedToColumns = (genes: GenePanelToGene[]) => {
         let result = [];
         let columnCount = this.columnCount;
         let remainingGenes = [...genes];
         while (columnCount > 0) {
-            const chunked = chunk(remainingGenes, Math.ceil(remainingGenes.length/columnCount));
+            const chunked = chunk(
+                remainingGenes,
+                Math.ceil(remainingGenes.length / columnCount)
+            );
             if (chunked.length === columnCount) {
                 result = result.concat(chunked);
                 break;
@@ -62,16 +65,21 @@ export default class GenesList extends React.Component<
         if (filtered.length === 0) {
             return [];
         }
-        const rows:JSX.Element[] = [];
+        const rows: JSX.Element[] = [];
         this.genesDividedToRows(filtered).forEach(row => {
-            const tdValues = row.map(gene => <td key={gene ? gene : Math.random()}>{gene}</td>);
+            const tdValues = row.map(gene => (
+                <td key={gene ? gene : Math.random()}>{gene}</td>
+            ));
             rows.push(<tr>{tdValues}</tr>);
         });
         return rows;
-    };
+    }
 
     getDownloadData = () => {
-        const downloadData = [['Genes'], ...this.props.genePanel.genes.map(gene => [gene.hugoGeneSymbol])];
+        const downloadData = [
+            ['Genes'],
+            ...this.props.genePanel.genes.map(gene => [gene.hugoGeneSymbol]),
+        ];
         return serializeData(downloadData);
     };
 
@@ -95,12 +103,12 @@ export default class GenesList extends React.Component<
 
     @computed get columnCount() {
         return this.props.columns || 1;
-    };
+    }
 
     geneCountPerColumn = (totalLength: number) => {
         return Math.ceil(totalLength / this.columnCount);
     };
-    
+
     @computed get renderTableHeaders() {
         const thValues = [<th>Genes</th>];
         return thValues.concat(Array(this.columnCount - 1).fill(<th></th>));
@@ -115,7 +123,12 @@ export default class GenesList extends React.Component<
                 <span>
                     Number of genes: {this.props.genePanel.genes.length}
                 </span>
-                <div className={classnames('pull-right has-feedback input-group-sm', styles.searchInput)}>
+                <div
+                    className={classnames(
+                        'pull-right has-feedback input-group-sm',
+                        styles.searchInput
+                    )}
+                >
                     <input
                         type="text"
                         value={this.filter}
@@ -130,7 +143,10 @@ export default class GenesList extends React.Component<
                     />
                 </div>
                 <SimpleCopyDownloadControls
-                    className={classnames("pull-right", styles.copyDownloadControls)}
+                    className={classnames(
+                        'pull-right',
+                        styles.copyDownloadControls
+                    )}
                     downloadData={this.getDownloadData}
                     downloadFilename={`gene_panel_${this.props.genePanel.genePanelId}.tsv`}
                     controlsStyle="BUTTON"
diff --git a/src/pages/patientView/PatientViewGenePanelModal/styles.module.scss b/src/pages/patientView/PatientViewGenePanelModal/styles.module.scss
index 860c376323a..68440f033c7 100644
--- a/src/pages/patientView/PatientViewGenePanelModal/styles.module.scss
+++ b/src/pages/patientView/PatientViewGenePanelModal/styles.module.scss
@@ -1,21 +1,21 @@
 .genesList {
-  table {
-    margin-top: 20px;
-  }
-  
-  .searchInput {
-    margin-left: 5px;
-  }
-  
-  h4.panelName {
-    margin-bottom: 15px;
-  }
-  
-  .copyDownloadControls {
-    z-index: 1080;
-  }
+    table {
+        margin-top: 20px;
+    }
+
+    .searchInput {
+        margin-left: 5px;
+    }
+
+    h4.panelName {
+        margin-bottom: 15px;
+    }
+
+    .copyDownloadControls {
+        z-index: 1080;
+    }
 }
 
 .patientViewModal {
-  z-index: 1070 !important;
+    z-index: 1070 !important;
 }
diff --git a/src/pages/patientView/PatientViewPage.spec.tsx b/src/pages/patientView/PatientViewPage.spec.tsx
index dcbfc2d391e..da813e71177 100644
--- a/src/pages/patientView/PatientViewPage.spec.tsx
+++ b/src/pages/patientView/PatientViewPage.spec.tsx
@@ -1,40 +1,37 @@
-import  PatientViewPage from './PatientViewPage';
+import PatientViewPage from './PatientViewPage';
 import React from 'react';
-import {assert} from 'chai';
+import { assert } from 'chai';
 import sinon from 'sinon';
 
-const componentUnderTest: PatientViewPage = (PatientViewPage as any).wrappedComponent;
+const componentUnderTest: PatientViewPage = (PatientViewPage as any)
+    .wrappedComponent;
 
 describe('PatientViewPage', () => {
-
     describe('handleSampleClick', () => {
+        const handleSampleClick = (componentUnderTest as any).prototype
+            .handleSampleClick;
 
-        const handleSampleClick = (componentUnderTest as any).prototype.handleSampleClick;
-
-        let updateURLStub:sinon.SinonStub,
+        let updateURLStub: sinon.SinonStub,
             preventDefaultStub: sinon.SinonStub,
             mock: any,
             ev: Partial<React.MouseEvent<HTMLAnchorElement>>;
 
-
-
         beforeEach(() => {
-
             updateURLStub = sinon.stub();
 
             preventDefaultStub = sinon.stub();
 
             mock = {
                 urlWrapper: {
-                    updateURL:updateURLStub
-                }
+                    updateURL: updateURLStub,
+                },
             };
 
             ev = {
                 preventDefault: preventDefaultStub,
                 altKey: false,
             };
-        })
+        });
 
         it('calls update route when no modifier keys are pressed', () => {
             handleSampleClick.call(mock, 1, ev);
@@ -49,7 +46,6 @@ describe('PatientViewPage', () => {
             assert.isFalse(preventDefaultStub.called);
         });
 
-
         it('does not call updateRoute or preventDefault if metaKey is true', () => {
             ev.metaKey = true;
             handleSampleClick.call(mock, 1, ev);
@@ -63,7 +59,5 @@ describe('PatientViewPage', () => {
             assert.isFalse(updateURLStub.called);
             assert.isFalse(preventDefaultStub.called);
         });
-
-    })
-
+    });
 });
diff --git a/src/pages/patientView/PatientViewPage.tsx b/src/pages/patientView/PatientViewPage.tsx
index f3a206bac7f..2653b280469 100644
--- a/src/pages/patientView/PatientViewPage.tsx
+++ b/src/pages/patientView/PatientViewPage.tsx
@@ -1,60 +1,70 @@
-import * as React from "react";
-import * as _ from "lodash";
-import GenomicOverview from "./genomicOverview/GenomicOverview";
-import {CancerStudy, ClinicalData} from "shared/api/generated/CBioPortalAPI";
-import {ClinicalDataBySampleId, RequestStatus} from "../../shared/api/api-types-extended";
-import FeatureTitle from "../../shared/components/featureTitle/FeatureTitle";
-import {Else, If, Then} from "react-if";
-import SampleManager from "./SampleManager";
-import PatientHeader from "./patientHeader/PatientHeader";
-import SignificantMutationalSignatures from "./patientHeader/SignificantMutationalSignatures";
-import {PaginationControls} from "../../shared/components/paginationControls/PaginationControls";
-import {IColumnVisibilityDef} from "shared/components/columnVisibilityControls/ColumnVisibilityControls";
-import {toggleColumnVisibility} from "cbioportal-frontend-commons";
-import {parseCohortIds, PatientViewPageStore} from "./clinicalInformation/PatientViewPageStore";
-import ClinicalInformationPatientTable from "./clinicalInformation/ClinicalInformationPatientTable";
-import ClinicalInformationSamples from "./clinicalInformation/ClinicalInformationSamplesTable";
-import {inject, observer} from "mobx-react";
-import {getSpanElementsFromCleanData} from "./clinicalInformation/lib/clinicalAttributesUtil.js";
-import CopyNumberTableWrapper from "./copyNumberAlterations/CopyNumberTableWrapper";
-import {action, computed, observable, reaction} from "mobx";
-import Timeline from "./timeline/Timeline";
-import {default as PatientViewMutationTable} from "./mutation/PatientViewMutationTable";
-import PathologyReport from "./pathologyReport/PathologyReport";
-import {MSKTab, MSKTabs} from "../../shared/components/MSKTabs/MSKTabs";
-import {validateParametersPatientView} from "../../shared/lib/validateParameters";
-import LoadingIndicator from "shared/components/loadingIndicator/LoadingIndicator";
-import ValidationAlert from "shared/components/ValidationAlert";
-import AppConfig from "appConfig";
-import {getMouseIcon} from "./SVGIcons";
-
-import "./patient.scss";
-import IFrameLoader from "../../shared/components/iframeLoader/IFrameLoader";
-import {getDigitalSlideArchiveIFrameUrl, getSampleViewUrl, getWholeSlideViewerUrl} from "../../shared/api/urls";
-import {PageLayout} from "../../shared/components/PageLayout/PageLayout";
-import Helmet from "react-helmet";
-import {ServerConfigHelpers} from "../../config/config";
-import autobind from "autobind-decorator";
-import {showCustomTab} from "../../shared/lib/customTabs";
-import {StudyLink} from "../../shared/components/StudyLink/StudyLink";
-import WindowStore from "shared/components/window/WindowStore";
-import {QueryParams} from "url";
-import {AppStore} from "../../AppStore";
+import * as React from 'react';
+import * as _ from 'lodash';
+import GenomicOverview from './genomicOverview/GenomicOverview';
+import { CancerStudy, ClinicalData } from 'shared/api/generated/CBioPortalAPI';
+import {
+    ClinicalDataBySampleId,
+    RequestStatus,
+} from '../../shared/api/api-types-extended';
+import FeatureTitle from '../../shared/components/featureTitle/FeatureTitle';
+import { Else, If, Then } from 'react-if';
+import SampleManager from './SampleManager';
+import PatientHeader from './patientHeader/PatientHeader';
+import SignificantMutationalSignatures from './patientHeader/SignificantMutationalSignatures';
+import { PaginationControls } from '../../shared/components/paginationControls/PaginationControls';
+import { IColumnVisibilityDef } from 'shared/components/columnVisibilityControls/ColumnVisibilityControls';
+import { toggleColumnVisibility } from 'cbioportal-frontend-commons';
+import {
+    parseCohortIds,
+    PatientViewPageStore,
+} from './clinicalInformation/PatientViewPageStore';
+import ClinicalInformationPatientTable from './clinicalInformation/ClinicalInformationPatientTable';
+import ClinicalInformationSamples from './clinicalInformation/ClinicalInformationSamplesTable';
+import { inject, observer } from 'mobx-react';
+import { getSpanElementsFromCleanData } from './clinicalInformation/lib/clinicalAttributesUtil.js';
+import CopyNumberTableWrapper from './copyNumberAlterations/CopyNumberTableWrapper';
+import { action, computed, observable, reaction } from 'mobx';
+import Timeline from './timeline/Timeline';
+import { default as PatientViewMutationTable } from './mutation/PatientViewMutationTable';
+import PathologyReport from './pathologyReport/PathologyReport';
+import { MSKTab, MSKTabs } from '../../shared/components/MSKTabs/MSKTabs';
+import { validateParametersPatientView } from '../../shared/lib/validateParameters';
+import LoadingIndicator from 'shared/components/loadingIndicator/LoadingIndicator';
+import ValidationAlert from 'shared/components/ValidationAlert';
+import AppConfig from 'appConfig';
+import { getMouseIcon } from './SVGIcons';
+
+import './patient.scss';
+import IFrameLoader from '../../shared/components/iframeLoader/IFrameLoader';
+import {
+    getDigitalSlideArchiveIFrameUrl,
+    getSampleViewUrl,
+    getWholeSlideViewerUrl,
+} from '../../shared/api/urls';
+import { PageLayout } from '../../shared/components/PageLayout/PageLayout';
+import Helmet from 'react-helmet';
+import { ServerConfigHelpers } from '../../config/config';
+import autobind from 'autobind-decorator';
+import { showCustomTab } from '../../shared/lib/customTabs';
+import { StudyLink } from '../../shared/components/StudyLink/StudyLink';
+import WindowStore from 'shared/components/window/WindowStore';
+import { QueryParams } from 'url';
+import { AppStore } from '../../AppStore';
 import request from 'superagent';
-import {remoteData, getBrowserWindow} from "cbioportal-frontend-commons";
-import TrialMatchTable from "./trialMatch/TrialMatchTable";
+import { remoteData, getBrowserWindow } from 'cbioportal-frontend-commons';
+import TrialMatchTable from './trialMatch/TrialMatchTable';
 
 import 'cbioportal-frontend-commons/dist/styles.css';
 import 'react-mutation-mapper/dist/styles.css';
 import 'react-table/react-table.css';
-import { trackPatient, trackEvent } from "shared/lib/tracking";
-import PatientViewUrlWrapper from "./PatientViewUrlWrapper";
-import { PagePath } from "shared/enums/PagePaths";
-import { GeneFilterOption } from "./mutation/GeneFilterMenu";
-import { checkNonProfiledGenesExist } from "./PatientViewPageUtils";
-import PatientViewMutationsTab from "./mutation/PatientViewMutationsTab";
-import PatientViewGenePanelModal from "./PatientViewGenePanelModal/PatientViewGenePanelModal";
-import { PatientViewPageTabs } from "./PatientViewPageTabs";
+import { trackPatient, trackEvent } from 'shared/lib/tracking';
+import PatientViewUrlWrapper from './PatientViewUrlWrapper';
+import { PagePath } from 'shared/enums/PagePaths';
+import { GeneFilterOption } from './mutation/GeneFilterMenu';
+import { checkNonProfiledGenesExist } from './PatientViewPageUtils';
+import PatientViewMutationsTab from './mutation/PatientViewMutationsTab';
+import PatientViewGenePanelModal from './PatientViewGenePanelModal/PatientViewGenePanelModal';
+import { PatientViewPageTabs } from './PatientViewPageTabs';
 
 export interface IPatientViewPageProps {
     params: any; // react route
@@ -63,36 +73,43 @@ export interface IPatientViewPageProps {
     samples?: ClinicalDataBySampleId[];
     loadClinicalInformationTableData?: () => Promise<any>;
     patient?: {
-        id: string,
-        clinicalData: ClinicalData[]
+        id: string;
+        clinicalData: ClinicalData[];
     };
     clinicalDataStatus?: RequestStatus;
 }
 
-export interface PatientViewUrlParams extends QueryParams{
-    studyId:string;
-    caseId?:string;
-    sampleId?:string;
+export interface PatientViewUrlParams extends QueryParams {
+    studyId: string;
+    caseId?: string;
+    sampleId?: string;
 }
 
 @inject('routing', 'appStore')
 @observer
-export default class PatientViewPage extends React.Component<IPatientViewPageProps, {}> {
-
-    @observable private mutationTableColumnVisibility: {[columnId: string]: boolean}|undefined;
-    @observable private cnaTableColumnVisibility: {[columnId: string]: boolean}|undefined;
+export default class PatientViewPage extends React.Component<
+    IPatientViewPageProps,
+    {}
+> {
+    @observable private mutationTableColumnVisibility:
+        | { [columnId: string]: boolean }
+        | undefined;
+    @observable private cnaTableColumnVisibility:
+        | { [columnId: string]: boolean }
+        | undefined;
     @observable genePanelModal = { genePanelId: '', isOpen: false };
 
     // use this wrapper rather than interacting with the url directly
     @observable
-    public urlWrapper: PatientViewUrlWrapper
+    public urlWrapper: PatientViewUrlWrapper;
     private patientViewPageStore: PatientViewPageStore;
 
     constructor(props: IPatientViewPageProps) {
-
         super(props);
         this.urlWrapper = new PatientViewUrlWrapper(props.routing);
-        this.patientViewPageStore = new PatientViewPageStore(this.props.appStore);
+        this.patientViewPageStore = new PatientViewPageStore(
+            this.props.appStore
+        );
         getBrowserWindow().patientViewPageStore = this.patientViewPageStore;
 
         reaction(
@@ -100,189 +117,273 @@ export default class PatientViewPage extends React.Component<IPatientViewPagePro
             ([_, studyId]) => {
                 if (
                     studyId &&
-                    this.props.routing.location.pathname.includes("/" + PagePath.Patient)
+                    this.props.routing.location.pathname.includes(
+                        '/' + PagePath.Patient
+                    )
                 ) {
                     trackPatient(studyId);
                 }
             },
-            { fireImmediately:true }
-        )
+            { fireImmediately: true }
+        );
 
         //TODO: this should be done by a module so that it can be reused on other pages
         reaction(
             () => [
                 props.routing.location.query,
                 props.routing.location.hash,
-                props.routing.location.pathname
+                props.routing.location.pathname,
             ],
             ([query, hash, pathname]) => {
                 // we don't want to update patient if we aren't on a patient page route
-                if (!pathname.includes("/" + PagePath.Patient)) {
+                if (!pathname.includes('/' + PagePath.Patient)) {
                     return;
                 }
 
                 const validationResult = validateParametersPatientView(query);
 
                 if (validationResult.isValid) {
-
                     this.patientViewPageStore.urlValidationError = null;
 
                     if ('studyId' in query) {
                         this.patientViewPageStore.studyId = query.studyId;
-                    } if ('caseId' in query) {
-                        this.patientViewPageStore.setPatientId(query.caseId as string);
+                    }
+                    if ('caseId' in query) {
+                        this.patientViewPageStore.setPatientId(
+                            query.caseId as string
+                        );
                     } else if ('sampleId' in query) {
-                        this.patientViewPageStore.setSampleId(query.sampleId as string);
+                        this.patientViewPageStore.setSampleId(
+                            query.sampleId as string
+                        );
                     }
 
                     // if there is a navCaseId list in url
                     const navCaseIdMatch = hash.match(/navCaseIds=([^&]*)/);
                     if (navCaseIdMatch && navCaseIdMatch.length > 1) {
-                        this.patientViewPageStore.patientIdsInCohort = parseCohortIds(navCaseIdMatch[1]);
+                        this.patientViewPageStore.patientIdsInCohort = parseCohortIds(
+                            navCaseIdMatch[1]
+                        );
                     }
-
                 } else {
-                    this.patientViewPageStore.urlValidationError = validationResult.message;
+                    this.patientViewPageStore.urlValidationError =
+                        validationResult.message;
                 }
-
             },
-            { fireImmediately:true }
+            { fireImmediately: true }
         );
 
-        this.onMutationTableColumnVisibilityToggled = this.onMutationTableColumnVisibilityToggled.bind(this);
-        this.onCnaTableColumnVisibilityToggled = this.onCnaTableColumnVisibilityToggled.bind(this);
+        this.onMutationTableColumnVisibilityToggled = this.onMutationTableColumnVisibilityToggled.bind(
+            this
+        );
+        this.onCnaTableColumnVisibilityToggled = this.onCnaTableColumnVisibilityToggled.bind(
+            this
+        );
     }
 
-    public handleSampleClick(id: string, e: React.MouseEvent<HTMLAnchorElement>) {
+    public handleSampleClick(
+        id: string,
+        e: React.MouseEvent<HTMLAnchorElement>
+    ) {
         if (!e.shiftKey && !e.altKey && !e.metaKey) {
             e.preventDefault();
-            this.urlWrapper.updateURL({ caseId:undefined, sampleId:id })
+            this.urlWrapper.updateURL({ caseId: undefined, sampleId: id });
         }
         // otherwise do nothing, we want default behavior of link
         // namely that href will open in a new window/tab
     }
 
     private handlePatientClick(id: string) {
-
-        let values = id.split(":");
-        if(values.length == 2){
-            this.urlWrapper.updateURL({ studyId: values[0], caseId: values[1], sampleId: undefined });
+        let values = id.split(':');
+        if (values.length == 2) {
+            this.urlWrapper.updateURL({
+                studyId: values[0],
+                caseId: values[1],
+                sampleId: undefined,
+            });
         } else {
             this.urlWrapper.updateURL({ caseId: id, sampleId: undefined });
         }
-
     }
 
     @computed get cnaTableStatus() {
         if (this.patientViewPageStore.molecularProfileIdDiscrete.isComplete) {
-            if (this.patientViewPageStore.molecularProfileIdDiscrete.result === undefined) {
-                return "unavailable";
+            if (
+                this.patientViewPageStore.molecularProfileIdDiscrete.result ===
+                undefined
+            ) {
+                return 'unavailable';
             } else if (this.patientViewPageStore.discreteCNAData.isComplete) {
-                return "available";
+                return 'available';
             } else {
-                return "loading";
+                return 'loading';
             }
         } else {
-            return "loading";
+            return 'loading';
         }
     }
 
-    @action private onCnaTableColumnVisibilityToggled(columnId: string, columnVisibility?: IColumnVisibilityDef[])
-    {
+    @action private onCnaTableColumnVisibilityToggled(
+        columnId: string,
+        columnVisibility?: IColumnVisibilityDef[]
+    ) {
         this.cnaTableColumnVisibility = toggleColumnVisibility(
-            this.cnaTableColumnVisibility, columnId, columnVisibility);
+            this.cnaTableColumnVisibility,
+            columnId,
+            columnVisibility
+        );
     }
 
-    @action private onMutationTableColumnVisibilityToggled(columnId: string, columnVisibility?: IColumnVisibilityDef[])
-    {
+    @action private onMutationTableColumnVisibilityToggled(
+        columnId: string,
+        columnVisibility?: IColumnVisibilityDef[]
+    ) {
         this.mutationTableColumnVisibility = toggleColumnVisibility(
-            this.mutationTableColumnVisibility, columnId, columnVisibility);
+            this.mutationTableColumnVisibility,
+            columnId,
+            columnVisibility
+        );
     }
 
-    private shouldShowPathologyReport(patientViewPageStore: PatientViewPageStore): boolean {
-        return patientViewPageStore.pathologyReport.isComplete && patientViewPageStore.pathologyReport.result.length > 0;
+    private shouldShowPathologyReport(
+        patientViewPageStore: PatientViewPageStore
+    ): boolean {
+        return (
+            patientViewPageStore.pathologyReport.isComplete &&
+            patientViewPageStore.pathologyReport.result.length > 0
+        );
     }
 
-    hideTissueImageTab(){
-        return this.patientViewPageStore.hasTissueImageIFrameUrl.isPending || this.patientViewPageStore.hasTissueImageIFrameUrl.isError
-            || (this.patientViewPageStore.hasTissueImageIFrameUrl.isComplete && !this.patientViewPageStore.hasTissueImageIFrameUrl.result);
+    hideTissueImageTab() {
+        return (
+            this.patientViewPageStore.hasTissueImageIFrameUrl.isPending ||
+            this.patientViewPageStore.hasTissueImageIFrameUrl.isError ||
+            (this.patientViewPageStore.hasTissueImageIFrameUrl.isComplete &&
+                !this.patientViewPageStore.hasTissueImageIFrameUrl.result)
+        );
     }
 
-    private shouldShowTrialMatch(patientViewPageStore: PatientViewPageStore): boolean {
-        return getBrowserWindow().localStorage.trialmatch === 'true' &&
-            patientViewPageStore.detailedTrialMatches.isComplete && patientViewPageStore.detailedTrialMatches.result.length > 0;
+    private shouldShowTrialMatch(
+        patientViewPageStore: PatientViewPageStore
+    ): boolean {
+        return (
+            getBrowserWindow().localStorage.trialmatch === 'true' &&
+            patientViewPageStore.detailedTrialMatches.isComplete &&
+            patientViewPageStore.detailedTrialMatches.result.length > 0
+        );
     }
 
-
     @autobind
-    private customTabMountCallback(div:HTMLDivElement,tab:any){
-        showCustomTab(div, tab, this.props.routing.location, this.patientViewPageStore);
+    private customTabMountCallback(div: HTMLDivElement, tab: any) {
+        showCustomTab(
+            div,
+            tab,
+            this.props.routing.location,
+            this.patientViewPageStore
+        );
     }
 
     private wholeSlideViewerUrl = remoteData<string | undefined>({
         await: () => [this.patientViewPageStore.getWholeSlideViewerIds],
-        invoke: async() => {
-            if (!_.isEmpty(this.patientViewPageStore.getWholeSlideViewerIds.result)) {
-                const url = getWholeSlideViewerUrl(this.patientViewPageStore.getWholeSlideViewerIds.result!, this.props.appStore.userName!);
+        invoke: async () => {
+            if (
+                !_.isEmpty(
+                    this.patientViewPageStore.getWholeSlideViewerIds.result
+                )
+            ) {
+                const url = getWholeSlideViewerUrl(
+                    this.patientViewPageStore.getWholeSlideViewerIds.result!,
+                    this.props.appStore.userName!
+                );
                 //if request succeeds then we return the url because we know request works.
                 try {
                     await request.get(url);
                     return url;
-                }
-                //but if request fails, we will return undefined.
-                catch (er){
+                } catch (er) {
+                    //but if request fails, we will return undefined.
                     return undefined;
                 }
             }
             return undefined;
-        }
+        },
     });
 
     @autobind
-    private onFilterGenesMutationTable(option:GeneFilterOption):void {
+    private onFilterGenesMutationTable(option: GeneFilterOption): void {
         this.patientViewPageStore.mutationTableGeneFilterOption = option;
     }
 
     @autobind
-    private onFilterGenesCopyNumberTable(option:GeneFilterOption):void {
+    private onFilterGenesCopyNumberTable(option: GeneFilterOption): void {
         this.patientViewPageStore.copyNumberTableGeneFilterOption = option;
     }
 
-    mutationTableShowGeneFilterMenu(sampleIds:string[]):boolean {
-        const entrezGeneIds:number[] = _.uniq(_.map(this.patientViewPageStore.mergedMutationDataIncludingUncalled, mutations => mutations[0].entrezGeneId));
-        return sampleIds.length > 1
-            && checkNonProfiledGenesExist(  sampleIds,
-                                            entrezGeneIds,
-                                            this.patientViewPageStore.sampleToMutationGenePanelId.result,
-                                            this.patientViewPageStore.genePanelIdToEntrezGeneIds.result);
+    mutationTableShowGeneFilterMenu(sampleIds: string[]): boolean {
+        const entrezGeneIds: number[] = _.uniq(
+            _.map(
+                this.patientViewPageStore.mergedMutationDataIncludingUncalled,
+                mutations => mutations[0].entrezGeneId
+            )
+        );
+        return (
+            sampleIds.length > 1 &&
+            checkNonProfiledGenesExist(
+                sampleIds,
+                entrezGeneIds,
+                this.patientViewPageStore.sampleToMutationGenePanelId.result,
+                this.patientViewPageStore.genePanelIdToEntrezGeneIds.result
+            )
+        );
     }
 
-    cnaTableShowGeneFilterMenu(sampleIds:string[]):boolean {
-        const entrezGeneIds:number[] = _.uniq(_.map(this.patientViewPageStore.mergedDiscreteCNAData, alterations => alterations[0].entrezGeneId));
-        return sampleIds.length > 1
-            && checkNonProfiledGenesExist(  sampleIds,
-                                            entrezGeneIds,
-                                            this.patientViewPageStore.sampleToDiscreteGenePanelId.result,
-                                            this.patientViewPageStore.genePanelIdToEntrezGeneIds.result);
+    cnaTableShowGeneFilterMenu(sampleIds: string[]): boolean {
+        const entrezGeneIds: number[] = _.uniq(
+            _.map(
+                this.patientViewPageStore.mergedDiscreteCNAData,
+                alterations => alterations[0].entrezGeneId
+            )
+        );
+        return (
+            sampleIds.length > 1 &&
+            checkNonProfiledGenesExist(
+                sampleIds,
+                entrezGeneIds,
+                this.patientViewPageStore.sampleToDiscreteGenePanelId.result,
+                this.patientViewPageStore.genePanelIdToEntrezGeneIds.result
+            )
+        );
     }
 
     @autobind
-    @action toggleGenePanelModal(genePanelId?:string|undefined) {
+    @action
+    toggleGenePanelModal(genePanelId?: string | undefined) {
         this.genePanelModal = {
             isOpen: !this.genePanelModal.isOpen,
-            genePanelId: genePanelId || ''
+            genePanelId: genePanelId || '',
         };
     }
 
     @computed get modalSelectedGenePanel() {
-        return this.patientViewPageStore.genePanelIdToPanel.result[this.genePanelModal.genePanelId];
+        return this.patientViewPageStore.genePanelIdToPanel.result[
+            this.genePanelModal.genePanelId
+        ];
     }
     @computed get sampleManager() {
-        if (this.patientViewPageStore.patientViewData.isComplete && this.patientViewPageStore.studyMetaData.isComplete) {
-            const patientData = this.patientViewPageStore.patientViewData.result;
-
-            if (this.patientViewPageStore.clinicalEvents.isComplete && this.patientViewPageStore.clinicalEvents.result!.length > 0) {
-                return new SampleManager(patientData.samples!, this.patientViewPageStore.clinicalEvents.result);
+        if (
+            this.patientViewPageStore.patientViewData.isComplete &&
+            this.patientViewPageStore.studyMetaData.isComplete
+        ) {
+            const patientData = this.patientViewPageStore.patientViewData
+                .result;
+
+            if (
+                this.patientViewPageStore.clinicalEvents.isComplete &&
+                this.patientViewPageStore.clinicalEvents.result!.length > 0
+            ) {
+                return new SampleManager(
+                    patientData.samples!,
+                    this.patientViewPageStore.clinicalEvents.result
+                );
             } else {
                 return new SampleManager(patientData.samples!);
             }
@@ -298,413 +399,1062 @@ export default class PatientViewPage extends React.Component<IPatientViewPagePro
         let studyName: JSX.Element | null = null;
 
         if (this.patientViewPageStore.urlValidationError) {
-            return <ValidationAlert urlValidationError={this.patientViewPageStore.urlValidationError} />;
+            return (
+                <ValidationAlert
+                    urlValidationError={
+                        this.patientViewPageStore.urlValidationError
+                    }
+                />
+            );
         }
 
         if (this.patientViewPageStore.studyMetaData.isComplete) {
-            let study:CancerStudy = this.patientViewPageStore.studyMetaData.result;
-            studyName = <StudyLink studyId={study.studyId}>{study.name}</StudyLink>;
+            let study: CancerStudy = this.patientViewPageStore.studyMetaData
+                .result;
+            studyName = (
+                <StudyLink studyId={study.studyId}>{study.name}</StudyLink>
+            );
         }
 
-        if (this.patientViewPageStore.patientViewData.isComplete &&
+        if (
+            this.patientViewPageStore.patientViewData.isComplete &&
             this.patientViewPageStore.studyMetaData.isComplete &&
             this.patientViewPageStore.clinicalEvents.isComplete &&
-            sampleManager !== null) {
-
-            sampleHeader = _.map(sampleManager!.samples, (sample: ClinicalDataBySampleId) => {
-                const isPDX:boolean = (sampleManager &&
-                    sampleManager.clinicalDataLegacyCleanAndDerived &&
-                    sampleManager.clinicalDataLegacyCleanAndDerived[sample.id] &&
-                    sampleManager.clinicalDataLegacyCleanAndDerived[sample.id].DERIVED_NORMALIZED_CASE_TYPE === 'Xenograft'
-                );
-
-                return (
-                    <div className="patientSample">
-                        <span className='clinical-spans'>
-                            {
-                                sampleManager!.getComponentForSample(sample.id, 1, '',
-                                    <span style={{display:'inline-flex'}}>
+            sampleManager !== null
+        ) {
+            sampleHeader = _.map(
+                sampleManager!.samples,
+                (sample: ClinicalDataBySampleId) => {
+                    const isPDX: boolean =
+                        sampleManager &&
+                        sampleManager.clinicalDataLegacyCleanAndDerived &&
+                        sampleManager.clinicalDataLegacyCleanAndDerived[
+                            sample.id
+                        ] &&
+                        sampleManager.clinicalDataLegacyCleanAndDerived[
+                            sample.id
+                        ].DERIVED_NORMALIZED_CASE_TYPE === 'Xenograft';
+
+                    return (
+                        <div className="patientSample">
+                            <span className="clinical-spans">
+                                {sampleManager!.getComponentForSample(
+                                    sample.id,
+                                    1,
+                                    '',
+                                    <span style={{ display: 'inline-flex' }}>
                                         {'\u00A0'}
                                         {isPDX && getMouseIcon()}
                                         {isPDX && '\u00A0'}
                                         <a
-                                            href={getSampleViewUrl(this.patientViewPageStore.studyMetaData.result!.studyId, sample.id)}
+                                            href={getSampleViewUrl(
+                                                this.patientViewPageStore
+                                                    .studyMetaData.result!
+                                                    .studyId,
+                                                sample.id
+                                            )}
                                             target="_blank"
-                                            onClick={(e: React.MouseEvent<HTMLAnchorElement>) => this.handleSampleClick(sample.id, e)}
+                                            onClick={(
+                                                e: React.MouseEvent<
+                                                    HTMLAnchorElement
+                                                >
+                                            ) =>
+                                                this.handleSampleClick(
+                                                    sample.id,
+                                                    e
+                                                )
+                                            }
                                         >
-                                            {SampleManager.getClinicalAttributeInSample(sample, "DISPLAY_SAMPLE_NAME") ? `${SampleManager.getClinicalAttributeInSample(sample, "DISPLAY_SAMPLE_NAME")!.value} (${sample.id})` : sample.id}
+                                            {SampleManager.getClinicalAttributeInSample(
+                                                sample,
+                                                'DISPLAY_SAMPLE_NAME'
+                                            )
+                                                ? `${
+                                                      SampleManager.getClinicalAttributeInSample(
+                                                          sample,
+                                                          'DISPLAY_SAMPLE_NAME'
+                                                      )!.value
+                                                  } (${sample.id})`
+                                                : sample.id}
                                         </a>
                                         {sampleManager &&
-                                        sampleManager.clinicalDataLegacyCleanAndDerived[sample.id] &&
-                                        getSpanElementsFromCleanData(sampleManager.clinicalDataLegacyCleanAndDerived[sample.id], this.patientViewPageStore.studyId)}
+                                            sampleManager
+                                                .clinicalDataLegacyCleanAndDerived[
+                                                sample.id
+                                            ] &&
+                                            getSpanElementsFromCleanData(
+                                                sampleManager
+                                                    .clinicalDataLegacyCleanAndDerived[
+                                                    sample.id
+                                                ],
+                                                this.patientViewPageStore
+                                                    .studyId
+                                            )}
                                     </span>,
                                     this.toggleGenePanelModal,
                                     this.genePanelModal.isOpen
-                                )
-                            }
-                        </span>
-                        {this.patientViewPageStore.hasMutationalSignatureData.result === true &&
-                        <LoadingIndicator isLoading={this.patientViewPageStore.mutationalSignatureData.isPending && this.patientViewPageStore.mutationalSignatureMetaData.isPending}/>}
-
-                        {this.patientViewPageStore.hasMutationalSignatureData.result === true &&
-                        this.patientViewPageStore.clinicalDataGroupedBySample.isComplete && this.patientViewPageStore.mutationalSignatureData.isComplete &&
-                        this.patientViewPageStore.mutationalSignatureMetaData.isComplete &&
-                        (<SignificantMutationalSignatures data={this.patientViewPageStore.mutationalSignatureData.result}
-                                                          metadata={this.patientViewPageStore.mutationalSignatureMetaData.result} uniqueSampleKey={sample.id}/>)}
-
-                    </div>
-                );
-            });
-
-            if (sampleHeader && sampleHeader.length > 0 && this.patientViewPageStore.pageMode === 'sample' &&
-                this.patientViewPageStore.patientId && this.patientViewPageStore.allSamplesForPatient && this.patientViewPageStore.allSamplesForPatient.result.length > 1) {
+                                )}
+                            </span>
+                            {this.patientViewPageStore
+                                .hasMutationalSignatureData.result === true && (
+                                <LoadingIndicator
+                                    isLoading={
+                                        this.patientViewPageStore
+                                            .mutationalSignatureData
+                                            .isPending &&
+                                        this.patientViewPageStore
+                                            .mutationalSignatureMetaData
+                                            .isPending
+                                    }
+                                />
+                            )}
+
+                            {this.patientViewPageStore
+                                .hasMutationalSignatureData.result === true &&
+                                this.patientViewPageStore
+                                    .clinicalDataGroupedBySample.isComplete &&
+                                this.patientViewPageStore
+                                    .mutationalSignatureData.isComplete &&
+                                this.patientViewPageStore
+                                    .mutationalSignatureMetaData.isComplete && (
+                                    <SignificantMutationalSignatures
+                                        data={
+                                            this.patientViewPageStore
+                                                .mutationalSignatureData.result
+                                        }
+                                        metadata={
+                                            this.patientViewPageStore
+                                                .mutationalSignatureMetaData
+                                                .result
+                                        }
+                                        uniqueSampleKey={sample.id}
+                                    />
+                                )}
+                        </div>
+                    );
+                }
+            );
+
+            if (
+                sampleHeader &&
+                sampleHeader.length > 0 &&
+                this.patientViewPageStore.pageMode === 'sample' &&
+                this.patientViewPageStore.patientId &&
+                this.patientViewPageStore.allSamplesForPatient &&
+                this.patientViewPageStore.allSamplesForPatient.result.length > 1
+            ) {
                 sampleHeader.push(
-                    <button className="btn btn-default btn-xs" onClick={()=>this.handlePatientClick(this.patientViewPageStore.patientId)}>Show all {this.patientViewPageStore.allSamplesForPatient.result.length} samples</button>
+                    <button
+                        className="btn btn-default btn-xs"
+                        onClick={() =>
+                            this.handlePatientClick(
+                                this.patientViewPageStore.patientId
+                            )
+                        }
+                    >
+                        Show all{' '}
+                        {
+                            this.patientViewPageStore.allSamplesForPatient
+                                .result.length
+                        }{' '}
+                        samples
+                    </button>
                 );
             }
         }
 
-        if (this.patientViewPageStore.patientIdsInCohort && this.patientViewPageStore.patientIdsInCohort.length > 0) {
-            const indexInCohort = this.patientViewPageStore.patientIdsInCohort.indexOf(this.patientViewPageStore.studyId + ':' + this.patientViewPageStore.patientId);
+        if (
+            this.patientViewPageStore.patientIdsInCohort &&
+            this.patientViewPageStore.patientIdsInCohort.length > 0
+        ) {
+            const indexInCohort = this.patientViewPageStore.patientIdsInCohort.indexOf(
+                this.patientViewPageStore.studyId +
+                    ':' +
+                    this.patientViewPageStore.patientId
+            );
             cohortNav = (
                 <PaginationControls
-                currentPage={indexInCohort + 1}
-                showMoreButton={false}
-                showItemsPerPageSelector={false}
-                showFirstPage={true}
-                showLastPage={true}
-                textBetweenButtons={` of ${this.patientViewPageStore.patientIdsInCohort.length} patients`}
-                firstPageDisabled={indexInCohort === 0}
-                previousPageDisabled={indexInCohort === 0}
-                nextPageDisabled={indexInCohort === this.patientViewPageStore.patientIdsInCohort.length-1}
-                lastPageDisabled={indexInCohort === this.patientViewPageStore.patientIdsInCohort.length-1}
-                onFirstPageClick={() => this.handlePatientClick(this.patientViewPageStore.patientIdsInCohort[0]) }
-                    onPreviousPageClick={() => this.handlePatientClick(this.patientViewPageStore.patientIdsInCohort[indexInCohort-1]) }
-                    onNextPageClick={() => this.handlePatientClick(this.patientViewPageStore.patientIdsInCohort[indexInCohort+1]) }
-                    onLastPageClick={() => this.handlePatientClick(this.patientViewPageStore.patientIdsInCohort[this.patientViewPageStore.patientIdsInCohort.length-1]) }
-                    onChangeCurrentPage={(newPage) => {
-                        if (newPage > 0 && newPage <= this.patientViewPageStore.patientIdsInCohort.length) {
-                            this.handlePatientClick(this.patientViewPageStore.patientIdsInCohort[newPage - 1]);
+                    currentPage={indexInCohort + 1}
+                    showMoreButton={false}
+                    showItemsPerPageSelector={false}
+                    showFirstPage={true}
+                    showLastPage={true}
+                    textBetweenButtons={` of ${this.patientViewPageStore.patientIdsInCohort.length} patients`}
+                    firstPageDisabled={indexInCohort === 0}
+                    previousPageDisabled={indexInCohort === 0}
+                    nextPageDisabled={
+                        indexInCohort ===
+                        this.patientViewPageStore.patientIdsInCohort.length - 1
+                    }
+                    lastPageDisabled={
+                        indexInCohort ===
+                        this.patientViewPageStore.patientIdsInCohort.length - 1
+                    }
+                    onFirstPageClick={() =>
+                        this.handlePatientClick(
+                            this.patientViewPageStore.patientIdsInCohort[0]
+                        )
+                    }
+                    onPreviousPageClick={() =>
+                        this.handlePatientClick(
+                            this.patientViewPageStore.patientIdsInCohort[
+                                indexInCohort - 1
+                            ]
+                        )
+                    }
+                    onNextPageClick={() =>
+                        this.handlePatientClick(
+                            this.patientViewPageStore.patientIdsInCohort[
+                                indexInCohort + 1
+                            ]
+                        )
+                    }
+                    onLastPageClick={() =>
+                        this.handlePatientClick(
+                            this.patientViewPageStore.patientIdsInCohort[
+                                this.patientViewPageStore.patientIdsInCohort
+                                    .length - 1
+                            ]
+                        )
+                    }
+                    onChangeCurrentPage={newPage => {
+                        if (
+                            newPage > 0 &&
+                            newPage <=
+                                this.patientViewPageStore.patientIdsInCohort
+                                    .length
+                        ) {
+                            this.handlePatientClick(
+                                this.patientViewPageStore.patientIdsInCohort[
+                                    newPage - 1
+                                ]
+                            );
                         }
                     }}
                     pageNumberEditable={true}
                     className="cohortNav"
-                    />
-                    );
-                }
+                />
+            );
+        }
 
         return (
             <PageLayout noMargin={true} hideFooter={true}>
-                {
-                    (this.patientViewPageStore.patientViewData.isComplete) && (
-                        <Helmet>
-                            <title>{this.patientViewPageStore.pageTitle}</title>
-                            <meta name="description" content={this.patientViewPageStore.metaDescription} />
-                        </Helmet>
-                    )
-                }
+                {this.patientViewPageStore.patientViewData.isComplete && (
+                    <Helmet>
+                        <title>{this.patientViewPageStore.pageTitle}</title>
+                        <meta
+                            name="description"
+                            content={this.patientViewPageStore.metaDescription}
+                        />
+                    </Helmet>
+                )}
                 <div className="patientViewPage">
-                    {this.genePanelModal.isOpen &&
+                    {this.genePanelModal.isOpen && (
                         <PatientViewGenePanelModal
                             genePanel={this.modalSelectedGenePanel}
                             show={this.genePanelModal.isOpen}
                             onHide={this.toggleGenePanelModal}
                             columns={3}
                         />
-                    }
+                    )}
                     <div className="headBlock">
-
-                        {  (this.patientViewPageStore.patientViewData.isComplete) && (
+                        {this.patientViewPageStore.patientViewData
+                            .isComplete && (
                             <div className="patientPageHeader">
-                                <i className="fa fa-user-circle-o patientIcon" aria-hidden="true"></i>
+                                <i
+                                    className="fa fa-user-circle-o patientIcon"
+                                    aria-hidden="true"
+                                ></i>
                                 <div className="patientDataTable">
                                     <table>
                                         <tr>
                                             <td>Patient:</td>
-                                            <td><PatientHeader
-                                                handlePatientClick={(id: string)=>this.handlePatientClick(id)}
-                                                patient={this.patientViewPageStore.patientViewData.result.patient}
-                                                studyId={this.patientViewPageStore.studyId}
-                                                darwinUrl={this.patientViewPageStore.darwinUrl.result}
-                                                sampleManager={sampleManager}/></td>
+                                            <td>
+                                                <PatientHeader
+                                                    handlePatientClick={(
+                                                        id: string
+                                                    ) =>
+                                                        this.handlePatientClick(
+                                                            id
+                                                        )
+                                                    }
+                                                    patient={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .patientViewData
+                                                            .result.patient
+                                                    }
+                                                    studyId={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .studyId
+                                                    }
+                                                    darwinUrl={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .darwinUrl.result
+                                                    }
+                                                    sampleManager={
+                                                        sampleManager
+                                                    }
+                                                />
+                                            </td>
                                         </tr>
                                         <tr>
                                             <td>Samples:</td>
                                             <td>
-                                                <div className="patientSamples">{sampleHeader}</div>
+                                                <div className="patientSamples">
+                                                    {sampleHeader}
+                                                </div>
                                             </td>
                                         </tr>
                                     </table>
                                 </div>
-                                <div className="studyMetaBar">{ studyName } <If condition={(cohortNav != null)}>{cohortNav}</If></div>
+                                <div className="studyMetaBar">
+                                    {studyName}{' '}
+                                    <If condition={cohortNav != null}>
+                                        {cohortNav}
+                                    </If>
+                                </div>
                             </div>
-                        )
-                        }
+                        )}
                     </div>
-                    <If condition={this.patientViewPageStore.patientViewData.isComplete}>
+                    <If
+                        condition={
+                            this.patientViewPageStore.patientViewData.isComplete
+                        }
+                    >
                         <Then>
                             <MSKTabs
                                 id="patientViewPageTabs"
-                                activeTabId={this.props.params.tab || "summaryTab"}
-                                onTabClick={(id:string)=>this.urlWrapper.setTab(id)}
+                                activeTabId={
+                                    this.props.params.tab || 'summaryTab'
+                                }
+                                onTabClick={(id: string) =>
+                                    this.urlWrapper.setTab(id)
+                                }
                                 className="mainTabs"
                             >
-                                <MSKTab key={0} id={PatientViewPageTabs.Summary} linkText="Summary">
-
-                                    <LoadingIndicator isLoading={this.patientViewPageStore.clinicalEvents.isPending} />
-
-                                    {
-                                        (!!sampleManager && this.patientViewPageStore.clinicalEvents.isComplete && this.patientViewPageStore.clinicalEvents.result.length > 0) && (
+                                <MSKTab
+                                    key={0}
+                                    id={PatientViewPageTabs.Summary}
+                                    linkText="Summary"
+                                >
+                                    <LoadingIndicator
+                                        isLoading={
+                                            this.patientViewPageStore
+                                                .clinicalEvents.isPending
+                                        }
+                                    />
 
+                                    {!!sampleManager &&
+                                        this.patientViewPageStore.clinicalEvents
+                                            .isComplete &&
+                                        this.patientViewPageStore.clinicalEvents
+                                            .result.length > 0 && (
                                             <div>
-                                                <Timeline store={this.patientViewPageStore} width={WindowStore.size.width-60} sampleManager={ sampleManager } />
+                                                <Timeline
+                                                    store={
+                                                        this
+                                                            .patientViewPageStore
+                                                    }
+                                                    width={
+                                                        WindowStore.size.width -
+                                                        60
+                                                    }
+                                                    sampleManager={
+                                                        sampleManager
+                                                    }
+                                                />
                                                 <hr />
                                             </div>
-                                        )
-
-                                    }
+                                        )}
 
                                     <LoadingIndicator
-                                        isLoading={this.patientViewPageStore.mutationData.isPending || this.patientViewPageStore.cnaSegments.isPending}
+                                        isLoading={
+                                            this.patientViewPageStore
+                                                .mutationData.isPending ||
+                                            this.patientViewPageStore
+                                                .cnaSegments.isPending
+                                        }
                                     />
 
-                                    {
-                                        (this.patientViewPageStore.mutationData.isComplete
-                                         && this.patientViewPageStore.cnaSegments.isComplete
-                                         && this.patientViewPageStore.sequencedSampleIdsInStudy.isComplete
-                                         && this.patientViewPageStore.sampleToMutationGenePanelId.isComplete
-                                         && this.patientViewPageStore.sampleToDiscreteGenePanelId.isComplete
-                                         && (this.patientViewPageStore.mergedMutationDataFilteredByGene.length > 0 || this.patientViewPageStore.cnaSegments.result.length > 0)
-                                         && sampleManager) && (
+                                    {this.patientViewPageStore.mutationData
+                                        .isComplete &&
+                                        this.patientViewPageStore.cnaSegments
+                                            .isComplete &&
+                                        this.patientViewPageStore
+                                            .sequencedSampleIdsInStudy
+                                            .isComplete &&
+                                        this.patientViewPageStore
+                                            .sampleToMutationGenePanelId
+                                            .isComplete &&
+                                        this.patientViewPageStore
+                                            .sampleToDiscreteGenePanelId
+                                            .isComplete &&
+                                        (this.patientViewPageStore
+                                            .mergedMutationDataFilteredByGene
+                                            .length > 0 ||
+                                            this.patientViewPageStore
+                                                .cnaSegments.result.length >
+                                                0) &&
+                                        sampleManager && (
                                             <div>
                                                 <GenomicOverview
-                                                    mergedMutations={this.patientViewPageStore.mergedMutationDataFilteredByGene}
-                                                    samples={this.patientViewPageStore.samples.result}
-                                                    cnaSegments={this.patientViewPageStore.cnaSegments.result}
-                                                    sampleOrder={sampleManager.sampleIndex}
-                                                    sampleLabels={sampleManager.sampleLabels}
-                                                    sampleColors={sampleManager.sampleColors}
-                                                    sampleManager={sampleManager}
-                                                    containerWidth={WindowStore.size.width-20}
-                                                    sampleIdToMutationGenePanelId={this.patientViewPageStore.sampleToMutationGenePanelId.result}
-                                                    sampleIdToCopyNumberGenePanelId={this.patientViewPageStore.sampleToDiscreteGenePanelId.result}
-                                                    onSelectGenePanel={this.toggleGenePanelModal}
-                                                    disableTooltip={this.genePanelModal.isOpen}
+                                                    mergedMutations={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .mergedMutationDataFilteredByGene
+                                                    }
+                                                    samples={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .samples.result
+                                                    }
+                                                    cnaSegments={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .cnaSegments.result
+                                                    }
+                                                    sampleOrder={
+                                                        sampleManager.sampleIndex
+                                                    }
+                                                    sampleLabels={
+                                                        sampleManager.sampleLabels
+                                                    }
+                                                    sampleColors={
+                                                        sampleManager.sampleColors
+                                                    }
+                                                    sampleManager={
+                                                        sampleManager
+                                                    }
+                                                    containerWidth={
+                                                        WindowStore.size.width -
+                                                        20
+                                                    }
+                                                    sampleIdToMutationGenePanelId={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .sampleToMutationGenePanelId
+                                                            .result
+                                                    }
+                                                    sampleIdToCopyNumberGenePanelId={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .sampleToDiscreteGenePanelId
+                                                            .result
+                                                    }
+                                                    onSelectGenePanel={
+                                                        this
+                                                            .toggleGenePanelModal
+                                                    }
+                                                    disableTooltip={
+                                                        this.genePanelModal
+                                                            .isOpen
+                                                    }
                                                 />
                                                 <hr />
                                             </div>
-                                        )
-                                    }
+                                        )}
 
-                                    <LoadingIndicator isLoading={this.patientViewPageStore.mutationData.isPending || this.patientViewPageStore.uncalledMutationData.isPending || this.patientViewPageStore.oncoKbAnnotatedGenes.isPending || this.patientViewPageStore.studyIdToStudy.isPending} />
+                                    <LoadingIndicator
+                                        isLoading={
+                                            this.patientViewPageStore
+                                                .mutationData.isPending ||
+                                            this.patientViewPageStore
+                                                .uncalledMutationData
+                                                .isPending ||
+                                            this.patientViewPageStore
+                                                .oncoKbAnnotatedGenes
+                                                .isPending ||
+                                            this.patientViewPageStore
+                                                .studyIdToStudy.isPending
+                                        }
+                                    />
 
-                                    {
-                                        (this.patientViewPageStore.oncoKbAnnotatedGenes.isComplete
-                                         && this.patientViewPageStore.mutationData.isComplete
-                                         && this.patientViewPageStore.uncalledMutationData.isComplete
-                                         && this.patientViewPageStore.studyIdToStudy.isComplete
-                                         && this.patientViewPageStore.sampleToMutationGenePanelId.isComplete
-                                         && !!sampleManager) && (
+                                    {this.patientViewPageStore
+                                        .oncoKbAnnotatedGenes.isComplete &&
+                                        this.patientViewPageStore.mutationData
+                                            .isComplete &&
+                                        this.patientViewPageStore
+                                            .uncalledMutationData.isComplete &&
+                                        this.patientViewPageStore.studyIdToStudy
+                                            .isComplete &&
+                                        this.patientViewPageStore
+                                            .sampleToMutationGenePanelId
+                                            .isComplete &&
+                                        !!sampleManager && (
                                             <div data-test="patientview-mutation-table">
                                                 <PatientViewMutationTable
-                                                    studyIdToStudy={this.patientViewPageStore.studyIdToStudy.result}
-                                                    sampleManager={sampleManager}
-                                                    sampleToGenePanelId={this.patientViewPageStore.sampleToMutationGenePanelId.result}
-                                                    genePanelIdToEntrezGeneIds={this.patientViewPageStore.genePanelIdToEntrezGeneIds.result}
-                                                    sampleIds={sampleManager ? sampleManager.getSampleIdsInOrder() : []}
-                                                    uniqueSampleKeyToTumorType={this.patientViewPageStore.uniqueSampleKeyToTumorType}
-                                                    molecularProfileIdToMolecularProfile={this.patientViewPageStore.molecularProfileIdToMolecularProfile.result}
-                                                    variantCountCache={this.patientViewPageStore.variantCountCache}
-                                                    indexedVariantAnnotations={this.patientViewPageStore.indexedVariantAnnotations}
-                                                    discreteCNACache={this.patientViewPageStore.discreteCNACache}
-                                                    mrnaExprRankCache={this.patientViewPageStore.mrnaExprRankCache}
-                                                    oncoKbEvidenceCache={this.patientViewPageStore.oncoKbEvidenceCache}
-                                                    pubMedCache={this.patientViewPageStore.pubMedCache}
-                                                    genomeNexusCache={this.patientViewPageStore.genomeNexusCache}
-                                                    genomeNexusMyVariantInfoCache={this.patientViewPageStore.genomeNexusMyVariantInfoCache}
-                                                    mrnaExprRankMolecularProfileId={this.patientViewPageStore.mrnaRankMolecularProfileId.result || undefined}
-                                                    discreteCNAMolecularProfileId={this.patientViewPageStore.molecularProfileIdDiscrete.result}
-                                                    data={this.patientViewPageStore.mergedMutationDataIncludingUncalledFilteredByGene}
-                                                    downloadDataFetcher={this.patientViewPageStore.downloadDataFetcher}
-                                                    mutSigData={this.patientViewPageStore.mutSigData.result}
-                                                    myCancerGenomeData={this.patientViewPageStore.myCancerGenomeData}
-                                                    hotspotData={this.patientViewPageStore.indexedHotspotData}
-                                                    cosmicData={this.patientViewPageStore.cosmicData.result}
-                                                    oncoKbData={this.patientViewPageStore.oncoKbData}
-                                                    oncoKbCancerGenes={this.patientViewPageStore.oncoKbCancerGenes}
-                                                    civicGenes={this.patientViewPageStore.civicGenes}
-                                                    civicVariants={this.patientViewPageStore.civicVariants}
+                                                    studyIdToStudy={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .studyIdToStudy
+                                                            .result
+                                                    }
+                                                    sampleManager={
+                                                        sampleManager
+                                                    }
+                                                    sampleToGenePanelId={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .sampleToMutationGenePanelId
+                                                            .result
+                                                    }
+                                                    genePanelIdToEntrezGeneIds={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .genePanelIdToEntrezGeneIds
+                                                            .result
+                                                    }
+                                                    sampleIds={
+                                                        sampleManager
+                                                            ? sampleManager.getSampleIdsInOrder()
+                                                            : []
+                                                    }
+                                                    uniqueSampleKeyToTumorType={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .uniqueSampleKeyToTumorType
+                                                    }
+                                                    molecularProfileIdToMolecularProfile={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .molecularProfileIdToMolecularProfile
+                                                            .result
+                                                    }
+                                                    variantCountCache={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .variantCountCache
+                                                    }
+                                                    indexedVariantAnnotations={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .indexedVariantAnnotations
+                                                    }
+                                                    discreteCNACache={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .discreteCNACache
+                                                    }
+                                                    mrnaExprRankCache={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .mrnaExprRankCache
+                                                    }
+                                                    oncoKbEvidenceCache={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .oncoKbEvidenceCache
+                                                    }
+                                                    pubMedCache={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .pubMedCache
+                                                    }
+                                                    genomeNexusCache={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .genomeNexusCache
+                                                    }
+                                                    genomeNexusMyVariantInfoCache={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .genomeNexusMyVariantInfoCache
+                                                    }
+                                                    mrnaExprRankMolecularProfileId={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .mrnaRankMolecularProfileId
+                                                            .result || undefined
+                                                    }
+                                                    discreteCNAMolecularProfileId={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .molecularProfileIdDiscrete
+                                                            .result
+                                                    }
+                                                    data={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .mergedMutationDataIncludingUncalledFilteredByGene
+                                                    }
+                                                    downloadDataFetcher={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .downloadDataFetcher
+                                                    }
+                                                    mutSigData={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .mutSigData.result
+                                                    }
+                                                    myCancerGenomeData={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .myCancerGenomeData
+                                                    }
+                                                    hotspotData={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .indexedHotspotData
+                                                    }
+                                                    cosmicData={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .cosmicData.result
+                                                    }
+                                                    oncoKbData={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .oncoKbData
+                                                    }
+                                                    oncoKbCancerGenes={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .oncoKbCancerGenes
+                                                    }
+                                                    civicGenes={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .civicGenes
+                                                    }
+                                                    civicVariants={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .civicVariants
+                                                    }
                                                     userEmailAddress={ServerConfigHelpers.getUserEmailAddress()}
-                                                    enableOncoKb={AppConfig.serverConfig.show_oncokb}
-                                                    enableFunctionalImpact={AppConfig.serverConfig.show_genomenexus}
-                                                    enableHotspot={AppConfig.serverConfig.show_hotspot}
-                                                    enableMyCancerGenome={AppConfig.serverConfig.mycancergenome_show}
-                                                    enableCivic={AppConfig.serverConfig.show_civic}
-                                                    columnVisibility={this.mutationTableColumnVisibility}
-                                                    showGeneFilterMenu={this.patientViewPageStore.mutationTableShowGeneFilterMenu.result}
-                                                    currentGeneFilter={this.patientViewPageStore.mutationTableGeneFilterOption}
-                                                    onFilterGenes={this.onFilterGenesMutationTable}
+                                                    enableOncoKb={
+                                                        AppConfig.serverConfig
+                                                            .show_oncokb
+                                                    }
+                                                    enableFunctionalImpact={
+                                                        AppConfig.serverConfig
+                                                            .show_genomenexus
+                                                    }
+                                                    enableHotspot={
+                                                        AppConfig.serverConfig
+                                                            .show_hotspot
+                                                    }
+                                                    enableMyCancerGenome={
+                                                        AppConfig.serverConfig
+                                                            .mycancergenome_show
+                                                    }
+                                                    enableCivic={
+                                                        AppConfig.serverConfig
+                                                            .show_civic
+                                                    }
+                                                    columnVisibility={
+                                                        this
+                                                            .mutationTableColumnVisibility
+                                                    }
+                                                    showGeneFilterMenu={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .mutationTableShowGeneFilterMenu
+                                                            .result
+                                                    }
+                                                    currentGeneFilter={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .mutationTableGeneFilterOption
+                                                    }
+                                                    onFilterGenes={
+                                                        this
+                                                            .onFilterGenesMutationTable
+                                                    }
                                                     columnVisibilityProps={{
-                                                        onColumnToggled: this.onMutationTableColumnVisibilityToggled
+                                                        onColumnToggled: this
+                                                            .onMutationTableColumnVisibilityToggled,
                                                     }}
-                                                    onSelectGenePanel={this.toggleGenePanelModal}
-                                                    disableTooltip={this.genePanelModal.isOpen}
+                                                    onSelectGenePanel={
+                                                        this
+                                                            .toggleGenePanelModal
+                                                    }
+                                                    disableTooltip={
+                                                        this.genePanelModal
+                                                            .isOpen
+                                                    }
                                                 />
                                             </div>
-                                        )
-                                    }
+                                        )}
 
                                     <hr />
 
-                                    <LoadingIndicator isLoading={(this.cnaTableStatus === 'loading' || this.patientViewPageStore.studyIdToStudy.isPending)} />
+                                    <LoadingIndicator
+                                        isLoading={
+                                            this.cnaTableStatus === 'loading' ||
+                                            this.patientViewPageStore
+                                                .studyIdToStudy.isPending
+                                        }
+                                    />
 
-                                    {
-                                        (this.patientViewPageStore.studyIdToStudy.isComplete
-                                            && this.patientViewPageStore.referenceGenes.isComplete) && (
+                                    {this.patientViewPageStore.studyIdToStudy
+                                        .isComplete &&
+                                        this.patientViewPageStore.referenceGenes
+                                            .isComplete && (
                                             <div data-test="patientview-copynumber-table">
                                                 <CopyNumberTableWrapper
-                                                    studyIdToStudy={this.patientViewPageStore.studyIdToStudy.result}
-                                                    sampleIds={sampleManager ? sampleManager.getSampleIdsInOrder() : []}
-                                                    sampleManager={sampleManager}
-                                                    sampleToGenePanelId={this.patientViewPageStore.sampleToDiscreteGenePanelId.result}
-                                                    genePanelIdToEntrezGeneIds={this.patientViewPageStore.genePanelIdToEntrezGeneIds.result}
-                                                    cnaOncoKbData={this.patientViewPageStore.cnaOncoKbData}
-                                                    cnaCivicGenes={this.patientViewPageStore.cnaCivicGenes}
-                                                    cnaCivicVariants={this.patientViewPageStore.cnaCivicVariants}
-                                                    oncoKbEvidenceCache={this.patientViewPageStore.oncoKbEvidenceCache}
-                                                    oncoKbCancerGenes={this.patientViewPageStore.oncoKbCancerGenes}
-                                                    enableOncoKb={AppConfig.serverConfig.show_oncokb}
-                                                    enableCivic={AppConfig.serverConfig.show_civic}
-                                                    userEmailAddress={AppConfig.serverConfig.user_email_address}
-                                                    pubMedCache={this.patientViewPageStore.pubMedCache}
-                                                    referenceGenes={this.patientViewPageStore.referenceGenes.result}
-                                                    data={this.patientViewPageStore.mergedDiscreteCNADataFilteredByGene}
-                                                    copyNumberCountCache={this.patientViewPageStore.copyNumberCountCache}
-                                                    mrnaExprRankCache={this.patientViewPageStore.mrnaExprRankCache}
-                                                    gisticData={this.patientViewPageStore.gisticData.result}
-                                                    mrnaExprRankMolecularProfileId={this.patientViewPageStore.mrnaRankMolecularProfileId.result || undefined}
+                                                    studyIdToStudy={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .studyIdToStudy
+                                                            .result
+                                                    }
+                                                    sampleIds={
+                                                        sampleManager
+                                                            ? sampleManager.getSampleIdsInOrder()
+                                                            : []
+                                                    }
+                                                    sampleManager={
+                                                        sampleManager
+                                                    }
+                                                    sampleToGenePanelId={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .sampleToDiscreteGenePanelId
+                                                            .result
+                                                    }
+                                                    genePanelIdToEntrezGeneIds={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .genePanelIdToEntrezGeneIds
+                                                            .result
+                                                    }
+                                                    cnaOncoKbData={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .cnaOncoKbData
+                                                    }
+                                                    cnaCivicGenes={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .cnaCivicGenes
+                                                    }
+                                                    cnaCivicVariants={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .cnaCivicVariants
+                                                    }
+                                                    oncoKbEvidenceCache={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .oncoKbEvidenceCache
+                                                    }
+                                                    oncoKbCancerGenes={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .oncoKbCancerGenes
+                                                    }
+                                                    enableOncoKb={
+                                                        AppConfig.serverConfig
+                                                            .show_oncokb
+                                                    }
+                                                    enableCivic={
+                                                        AppConfig.serverConfig
+                                                            .show_civic
+                                                    }
+                                                    userEmailAddress={
+                                                        AppConfig.serverConfig
+                                                            .user_email_address
+                                                    }
+                                                    pubMedCache={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .pubMedCache
+                                                    }
+                                                    referenceGenes={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .referenceGenes
+                                                            .result
+                                                    }
+                                                    data={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .mergedDiscreteCNADataFilteredByGene
+                                                    }
+                                                    copyNumberCountCache={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .copyNumberCountCache
+                                                    }
+                                                    mrnaExprRankCache={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .mrnaExprRankCache
+                                                    }
+                                                    gisticData={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .gisticData.result
+                                                    }
+                                                    mrnaExprRankMolecularProfileId={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .mrnaRankMolecularProfileId
+                                                            .result || undefined
+                                                    }
                                                     status={this.cnaTableStatus}
-                                                    columnVisibility={this.cnaTableColumnVisibility}
-                                                    showGeneFilterMenu={this.patientViewPageStore.cnaTableShowGeneFilterMenu.result}
-                                                    currentGeneFilter={this.patientViewPageStore.copyNumberTableGeneFilterOption}
-                                                    onFilterGenes={this.onFilterGenesCopyNumberTable}
+                                                    columnVisibility={
+                                                        this
+                                                            .cnaTableColumnVisibility
+                                                    }
+                                                    showGeneFilterMenu={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .cnaTableShowGeneFilterMenu
+                                                            .result
+                                                    }
+                                                    currentGeneFilter={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .copyNumberTableGeneFilterOption
+                                                    }
+                                                    onFilterGenes={
+                                                        this
+                                                            .onFilterGenesCopyNumberTable
+                                                    }
                                                     columnVisibilityProps={{
-                                                        onColumnToggled: this.onCnaTableColumnVisibilityToggled
+                                                        onColumnToggled: this
+                                                            .onCnaTableColumnVisibilityToggled,
                                                     }}
-                                                    sampleToMutationGenePanelId={this.patientViewPageStore.sampleToMutationGenePanelId}
-                                                    onSelectGenePanel={this.toggleGenePanelModal}
-                                                    disableTooltip={this.genePanelModal.isOpen}
+                                                    sampleToMutationGenePanelId={
+                                                        this
+                                                            .patientViewPageStore
+                                                            .sampleToMutationGenePanelId
+                                                    }
+                                                    onSelectGenePanel={
+                                                        this
+                                                            .toggleGenePanelModal
+                                                    }
+                                                    disableTooltip={
+                                                        this.genePanelModal
+                                                            .isOpen
+                                                    }
                                                 />
                                             </div>
+                                        )}
+                                </MSKTab>
+                                {this.patientViewPageStore.sampleIds.length >
+                                    1 &&
+                                    this.patientViewPageStore
+                                        .existsSomeMutationWithVAFData && (
+                                        <MSKTab
+                                            key={1}
+                                            id="genomicEvolution"
+                                            linkText="Genomic Evolution"
+                                        >
+                                            <PatientViewMutationsTab
+                                                store={
+                                                    this.patientViewPageStore
+                                                }
+                                                mutationTableColumnVisibility={
+                                                    this
+                                                        .mutationTableColumnVisibility
+                                                }
+                                                onMutationTableColumnVisibilityToggled={
+                                                    this
+                                                        .onMutationTableColumnVisibilityToggled
+                                                }
+                                                sampleManager={sampleManager}
+                                            />
+                                        </MSKTab>
+                                    )}
+
+                                <MSKTab
+                                    key={2}
+                                    id={PatientViewPageTabs.ClinicalData}
+                                    linkText="Clinical Data"
+                                >
+                                    <div className="clearfix">
+                                        <FeatureTitle
+                                            title="Patient"
+                                            isLoading={
+                                                this.patientViewPageStore
+                                                    .clinicalDataPatient
+                                                    .isPending
+                                            }
+                                            className="pull-left"
+                                        />
+                                        {this.patientViewPageStore
+                                            .clinicalDataPatient.isComplete && (
+                                            <ClinicalInformationPatientTable
+                                                showTitleBar={true}
+                                                data={
+                                                    this.patientViewPageStore
+                                                        .clinicalDataPatient
+                                                        .result
+                                                }
+                                            />
+                                        )}
+                                    </div>
+
+                                    <br />
+
+                                    <div className="clearfix">
+                                        <FeatureTitle
+                                            title="Samples"
+                                            isLoading={
+                                                this.patientViewPageStore
+                                                    .clinicalDataGroupedBySample
+                                                    .isPending
+                                            }
+                                            className="pull-left"
+                                        />
+                                        {this.patientViewPageStore
+                                            .clinicalDataGroupedBySample
+                                            .isComplete && (
+                                            <ClinicalInformationSamples
+                                                samples={
+                                                    this.patientViewPageStore
+                                                        .clinicalDataGroupedBySample
+                                                        .result!
+                                                }
+                                            />
+                                        )}
+                                    </div>
+                                </MSKTab>
+
+                                <MSKTab
+                                    key={3}
+                                    id={PatientViewPageTabs.PathologyReport}
+                                    linkText="Pathology Report"
+                                    hide={
+                                        !this.shouldShowPathologyReport(
+                                            this.patientViewPageStore
                                         )
                                     }
+                                >
+                                    <div>
+                                        <PathologyReport
+                                            iframeHeight={
+                                                WindowStore.size.height - 220
+                                            }
+                                            pdfs={
+                                                this.patientViewPageStore
+                                                    .pathologyReport.result
+                                            }
+                                        />
+                                    </div>
                                 </MSKTab>
-                    {this.patientViewPageStore.sampleIds.length > 1 && this.patientViewPageStore.existsSomeMutationWithVAFData && (
-                        <MSKTab key={1} id="genomicEvolution" linkText="Genomic Evolution">
-                            <PatientViewMutationsTab
-                                store={this.patientViewPageStore}
-                                mutationTableColumnVisibility={this.mutationTableColumnVisibility}
-                                onMutationTableColumnVisibilityToggled={this.onMutationTableColumnVisibilityToggled}
-                                sampleManager={sampleManager}
-                            />
-                        </MSKTab>
-                    )}
-
-                    <MSKTab key={2} id={PatientViewPageTabs.ClinicalData} linkText="Clinical Data">
 
-                        <div className="clearfix">
-                            <FeatureTitle title="Patient"
-                                            isLoading={this.patientViewPageStore.clinicalDataPatient.isPending}
-                                            className="pull-left"/>
-                            {(this.patientViewPageStore.clinicalDataPatient.isComplete) && (
-                                <ClinicalInformationPatientTable showTitleBar={true}
-                                                                    data={this.patientViewPageStore.clinicalDataPatient.result}/>
-                            )
-                            }
-                        </div>
-
-                        <br />
-
-                        <div className="clearfix">
-                            <FeatureTitle title="Samples" isLoading={ this.patientViewPageStore.clinicalDataGroupedBySample.isPending } className="pull-left" />
-                            {  (this.patientViewPageStore.clinicalDataGroupedBySample.isComplete) && (
-                                <ClinicalInformationSamples
-                                    samples={this.patientViewPageStore.clinicalDataGroupedBySample.result!}/>
-                            )
-                            }
-                        </div>
-
-                    </MSKTab>
-
-
-                    <MSKTab key={3} id={PatientViewPageTabs.PathologyReport} linkText="Pathology Report"
-                            hide={!this.shouldShowPathologyReport(this.patientViewPageStore)}
-                    >
-                        <div>
-                            <PathologyReport iframeHeight={WindowStore.size.height - 220} pdfs={this.patientViewPageStore.pathologyReport.result} />
-                        </div>
-                    </MSKTab>
-
-                    <MSKTab key={5} id={PatientViewPageTabs.TissueImage} linkText="Tissue Image"
-                            hide={this.hideTissueImageTab()}
-                    >
-                        <div>
-                            <IFrameLoader height={WindowStore.size.height - 220} url={  getDigitalSlideArchiveIFrameUrl(this.patientViewPageStore.patientId) } />
-                        </div>
-                    </MSKTab>
-
-                    {(this.patientViewPageStore.studyId === "mskimpact" && this.wholeSlideViewerUrl.result) && (
-                    <MSKTab key={6} id={PatientViewPageTabs.MSKTissueImage} linkText="Tissue Image"
-                            unmountOnHide = {false}
-                    >
-                        <div>
-                            <IFrameLoader height={WindowStore.size.height - 220} url={ this.wholeSlideViewerUrl.result! } />
-                        </div>
-                    </MSKTab>
-                    )}
-
-                    {
-                        this.shouldShowTrialMatch(this.patientViewPageStore) && (
-                            <MSKTab key={7} id={PatientViewPageTabs.TrialMatchTab} linkText="Matched Trials">
-                                <TrialMatchTable
-                                    sampleManager={sampleManager}
-                                    detailedTrialMatches={this.patientViewPageStore.detailedTrialMatches.result}
-                                    containerWidth={WindowStore.size.width-20}
-                                />
-                            </MSKTab>
-                        )
-                    }
+                                <MSKTab
+                                    key={5}
+                                    id={PatientViewPageTabs.TissueImage}
+                                    linkText="Tissue Image"
+                                    hide={this.hideTissueImageTab()}
+                                >
+                                    <div>
+                                        <IFrameLoader
+                                            height={
+                                                WindowStore.size.height - 220
+                                            }
+                                            url={getDigitalSlideArchiveIFrameUrl(
+                                                this.patientViewPageStore
+                                                    .patientId
+                                            )}
+                                        />
+                                    </div>
+                                </MSKTab>
 
-                    {/*<MSKTab key={5} id={{PatientViewPageTabs.MutationalSignatures}} linkText="Mutational Signature Data" hide={true}>*/}
-                        {/*<div className="clearfix">*/}
-                            {/*<FeatureTitle title="Mutational Signatures" isLoading={ this.patientViewPageStore.clinicalDataGroupedBySample.isPending } className="pull-left" />*/}
-                            {/*<LoadingIndicator isLoading={this.patientViewPageStore.mutationalSignatureData.isPending}/>*/}
-                            {/*{*/}
+                                {this.patientViewPageStore.studyId ===
+                                    'mskimpact' &&
+                                    this.wholeSlideViewerUrl.result && (
+                                        <MSKTab
+                                            key={6}
+                                            id={
+                                                PatientViewPageTabs.MSKTissueImage
+                                            }
+                                            linkText="Tissue Image"
+                                            unmountOnHide={false}
+                                        >
+                                            <div>
+                                                <IFrameLoader
+                                                    height={
+                                                        WindowStore.size
+                                                            .height - 220
+                                                    }
+                                                    url={
+                                                        this.wholeSlideViewerUrl
+                                                            .result!
+                                                    }
+                                                />
+                                            </div>
+                                        </MSKTab>
+                                    )}
+
+                                {this.shouldShowTrialMatch(
+                                    this.patientViewPageStore
+                                ) && (
+                                    <MSKTab
+                                        key={7}
+                                        id={PatientViewPageTabs.TrialMatchTab}
+                                        linkText="Matched Trials"
+                                    >
+                                        <TrialMatchTable
+                                            sampleManager={sampleManager}
+                                            detailedTrialMatches={
+                                                this.patientViewPageStore
+                                                    .detailedTrialMatches.result
+                                            }
+                                            containerWidth={
+                                                WindowStore.size.width - 20
+                                            }
+                                        />
+                                    </MSKTab>
+                                )}
+
+                                {/*<MSKTab key={5} id={{PatientViewPageTabs.MutationalSignatures}} linkText="Mutational Signature Data" hide={true}>*/}
+                                {/*<div className="clearfix">*/}
+                                {/*<FeatureTitle title="Mutational Signatures" isLoading={ this.patientViewPageStore.clinicalDataGroupedBySample.isPending } className="pull-left" />*/}
+                                {/*<LoadingIndicator isLoading={this.patientViewPageStore.mutationalSignatureData.isPending}/>*/}
+                                {/*{*/}
                                 {/*(this.patientViewPageStore.clinicalDataGroupedBySample.isComplete && this.patientViewPageStore.mutationalSignatureData.isComplete) && (*/}
-                                    {/*<ClinicalInformationMutationalSignatureTable data={this.patientViewPageStore.mutationalSignatureData.result} showTitleBar={true}/>*/}
+                                {/*<ClinicalInformationMutationalSignatureTable data={this.patientViewPageStore.mutationalSignatureData.result} showTitleBar={true}/>*/}
                                 {/*)*/}
-                            {/*}*/}
-                        {/*</div>*/}
+                                {/*}*/}
+                                {/*</div>*/}
 
-                    {/*</MSKTab>*/}
-
-                                {
-                                    (AppConfig.serverConfig.custom_tabs) && AppConfig.serverConfig.custom_tabs.filter((tab:any)=>tab.location==="PATIENT_PAGE").map((tab:any, i:number)=>{
-                                        return (<MSKTab key={100+i} id={'customTab'+1} unmountOnHide={(tab.unmountOnHide===true)}
-                                                        onTabDidMount={(div)=>{ this.customTabMountCallback(div, tab) }} linkText={tab.title}>
-                                        </MSKTab>)
-                                    })
-                                }
+                                {/*</MSKTab>*/}
 
+                                {AppConfig.serverConfig.custom_tabs &&
+                                    AppConfig.serverConfig.custom_tabs
+                                        .filter(
+                                            (tab: any) =>
+                                                tab.location === 'PATIENT_PAGE'
+                                        )
+                                        .map((tab: any, i: number) => {
+                                            return (
+                                                <MSKTab
+                                                    key={100 + i}
+                                                    id={'customTab' + 1}
+                                                    unmountOnHide={
+                                                        tab.unmountOnHide ===
+                                                        true
+                                                    }
+                                                    onTabDidMount={div => {
+                                                        this.customTabMountCallback(
+                                                            div,
+                                                            tab
+                                                        );
+                                                    }}
+                                                    linkText={tab.title}
+                                                ></MSKTab>
+                                            );
+                                        })}
                             </MSKTabs>
-
                         </Then>
                         <Else>
-                            <LoadingIndicator isLoading={true} center={true} size={"big"}/>
+                            <LoadingIndicator
+                                isLoading={true}
+                                center={true}
+                                size={'big'}
+                            />
                         </Else>
-
                     </If>
-
                 </div>
             </PageLayout>
         );
diff --git a/src/pages/patientView/PatientViewPageTabs.ts b/src/pages/patientView/PatientViewPageTabs.ts
index aac7a898ff2..1d1cb0d95cb 100644
--- a/src/pages/patientView/PatientViewPageTabs.ts
+++ b/src/pages/patientView/PatientViewPageTabs.ts
@@ -1,10 +1,10 @@
 export enum PatientViewPageTabs {
-    Summary = "summary",
-    genomicEvolution = "genomicEvolution",
-    ClinicalData = "clinicalData",
-    PathologyReport = "pathologyReport",
-    TissueImage = "tissueImage",
-    MSKTissueImage = "MSKTissueImage",
-    TrialMatchTab = "trialMatchTab",
-    MutationalSignatures = "mutationalSignatures",
-}
\ No newline at end of file
+    Summary = 'summary',
+    genomicEvolution = 'genomicEvolution',
+    ClinicalData = 'clinicalData',
+    PathologyReport = 'pathologyReport',
+    TissueImage = 'tissueImage',
+    MSKTissueImage = 'MSKTissueImage',
+    TrialMatchTab = 'trialMatchTab',
+    MutationalSignatures = 'mutationalSignatures',
+}
diff --git a/src/pages/patientView/PatientViewPageUtils.spec.tsx b/src/pages/patientView/PatientViewPageUtils.spec.tsx
index c06aba33f4a..8fd89107c4f 100644
--- a/src/pages/patientView/PatientViewPageUtils.spec.tsx
+++ b/src/pages/patientView/PatientViewPageUtils.spec.tsx
@@ -1,4 +1,4 @@
-import {assert} from 'chai';
+import { assert } from 'chai';
 import sinon from 'sinon';
 import SampleManager from './SampleManager';
 import TumorColumnFormatter from './mutation/column/TumorColumnFormatter';
@@ -7,42 +7,51 @@ import { PatientViewPageStore } from './clinicalInformation/PatientViewPageStore
 import { ClinicalDataBySampleId } from 'shared/api/api-types-extended';
 
 describe('PatientViewPageUtils', () => {
-
     describe('checkNonProfiledGenesExist()', () => {
-
         const sampleIds = ['sampleA', 'sampleB'];
         const entrezGeneIds = [1, 2, 3];
 
-        const stub = sinon.stub(TumorColumnFormatter, 'getProfiledSamplesForGene');
-        
+        const stub = sinon.stub(
+            TumorColumnFormatter,
+            'getProfiledSamplesForGene'
+        );
+
         after(() => {
             stub.restore();
         });
 
         it('returns false when all samples have been profiled', () => {
-
             const allSamplesProfiled = {
                 sampleA: true,
                 sampleB: true,
             };
 
             stub.returns(allSamplesProfiled);
-            assert.isFalse(checkNonProfiledGenesExist(sampleIds, entrezGeneIds, {} as any, {} as any));
-
+            assert.isFalse(
+                checkNonProfiledGenesExist(
+                    sampleIds,
+                    entrezGeneIds,
+                    {} as any,
+                    {} as any
+                )
+            );
         });
 
         it('returns true when a sample has not been not profiled', () => {
-
             const oneSampleNotProfiled = {
                 sampleA: true,
                 sampleB: false,
             };
 
             stub.returns(oneSampleNotProfiled);
-            assert.isTrue(checkNonProfiledGenesExist(sampleIds, entrezGeneIds, {} as any, {} as any));
-
+            assert.isTrue(
+                checkNonProfiledGenesExist(
+                    sampleIds,
+                    entrezGeneIds,
+                    {} as any,
+                    {} as any
+                )
+            );
         });
-
     });
-
 });
diff --git a/src/pages/patientView/PatientViewPageUtils.tsx b/src/pages/patientView/PatientViewPageUtils.tsx
index d51f239e4c4..0192e712d6e 100644
--- a/src/pages/patientView/PatientViewPageUtils.tsx
+++ b/src/pages/patientView/PatientViewPageUtils.tsx
@@ -1,16 +1,19 @@
-import TumorColumnFormatter from "./mutation/column/TumorColumnFormatter";
-import _ from "lodash";
+import TumorColumnFormatter from './mutation/column/TumorColumnFormatter';
+import _ from 'lodash';
 
-export function checkNonProfiledGenesExist( sampleIds:string[],
-                                            entrezGeneIds:number[],
-                                            sampleToGenePanelId:{[sampleId:string]:string},
-                                            genePanelIdToEntrezGeneIds:{[genePanelId:string]:number[]}
-):boolean {
+export function checkNonProfiledGenesExist(
+    sampleIds: string[],
+    entrezGeneIds: number[],
+    sampleToGenePanelId: { [sampleId: string]: string },
+    genePanelIdToEntrezGeneIds: { [genePanelId: string]: number[] }
+): boolean {
     return _.some(entrezGeneIds, entrezGeneId => {
-        const profiledSamples = TumorColumnFormatter.getProfiledSamplesForGene( entrezGeneId, 
-                                                                                sampleIds,
-                                                                                sampleToGenePanelId,
-                                                                                genePanelIdToEntrezGeneIds);
+        const profiledSamples = TumorColumnFormatter.getProfiledSamplesForGene(
+            entrezGeneId,
+            sampleIds,
+            sampleToGenePanelId,
+            genePanelIdToEntrezGeneIds
+        );
         return _.values(profiledSamples).includes(false);
     });
 }
diff --git a/src/pages/patientView/PatientViewUrlWrapper.ts b/src/pages/patientView/PatientViewUrlWrapper.ts
index 1b8b92166f2..a0f874af318 100644
--- a/src/pages/patientView/PatientViewUrlWrapper.ts
+++ b/src/pages/patientView/PatientViewUrlWrapper.ts
@@ -1,14 +1,16 @@
-import URLWrapper from "shared/lib/URLWrapper";
-import ExtendedRouterStore from "shared/lib/ExtendedRouterStore";
-import { PagePath } from "shared/enums/PagePaths";
+import URLWrapper from 'shared/lib/URLWrapper';
+import ExtendedRouterStore from 'shared/lib/ExtendedRouterStore';
+import { PagePath } from 'shared/enums/PagePaths';
 
 export type PatientViewUrlQuery = {
     studyId: string;
     caseId?: string;
     sampleId?: string;
-}
+};
 
-export default class PatientViewUrlWrapper extends URLWrapper<PatientViewUrlQuery> {
+export default class PatientViewUrlWrapper extends URLWrapper<
+    PatientViewUrlQuery
+> {
     constructor(routing: ExtendedRouterStore) {
         super(routing, {
             studyId: { isSessionProp: false },
diff --git a/src/pages/patientView/SVGIcons.tsx b/src/pages/patientView/SVGIcons.tsx
index 769c3d2a01b..0d459d98b61 100644
--- a/src/pages/patientView/SVGIcons.tsx
+++ b/src/pages/patientView/SVGIcons.tsx
@@ -1,18 +1,50 @@
 import * as React from 'react';
 
-export function getMouseIcon():JSX.Element {
-    return  (
-        <svg id="Layer_2" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-                 width="15px" height="15px" viewBox="7.015 20 388.209 342.605"
-                 enable-background="new 7.015 47.906 388.209 342.605">
-            <path fill="none" stroke="#000000" strokeWidth="20" strokeLinejoin="bevel" strokeMiterlimit="10" d="M377.5,250.5 c-2.896,138.241-177.896,163.241-280.896,89.241"/>
+export function getMouseIcon(): JSX.Element {
+    return (
+        <svg
+            id="Layer_2"
+            xmlns="http://www.w3.org/2000/svg"
+            x="0px"
+            y="0px"
+            width="15px"
+            height="15px"
+            viewBox="7.015 20 388.209 342.605"
+            enable-background="new 7.015 47.906 388.209 342.605"
+        >
+            <path
+                fill="none"
+                stroke="#000000"
+                strokeWidth="20"
+                strokeLinejoin="bevel"
+                strokeMiterlimit="10"
+                d="M377.5,250.5 c-2.896,138.241-177.896,163.241-280.896,89.241"
+            />
             <g>
                 <g>
-                    <path fill="#0C0202" stroke="#000000" strokeMiterlimit="10" d="M10.5,251.5h377c0,0,66-275-201-185 C186.5,66.5-19.5,159.5,10.5,251.5z"/>
+                    <path
+                        fill="#0C0202"
+                        stroke="#000000"
+                        strokeMiterlimit="10"
+                        d="M10.5,251.5h377c0,0,66-275-201-185 C186.5,66.5-19.5,159.5,10.5,251.5z"
+                    />
                 </g>
-                    <path fill="#0C0202" stroke="#000000" strokeLinejoin="bevel" strokeMiterlimit="10" d="M50.5,159.5 C-65.396,141.741,82.604,2.741,88.604,128.741"/>
+                <path
+                    fill="#0C0202"
+                    stroke="#000000"
+                    strokeLinejoin="bevel"
+                    strokeMiterlimit="10"
+                    d="M50.5,159.5 C-65.396,141.741,82.604,2.741,88.604,128.741"
+                />
             </g>
-            <circle fill="#FFFFFF" stroke="#000000" strokeMiterlimit="10" cx="50.854" cy="210.991" r="21.25"/>
+            <circle
+                fill="#FFFFFF"
+                stroke="#000000"
+                strokeMiterlimit="10"
+                cx="50.854"
+                cy="210.991"
+                r="21.25"
+            />
         </svg>
     );
 }
diff --git a/src/pages/patientView/SampleManager.tsx b/src/pages/patientView/SampleManager.tsx
index 69802ae4299..edd85bc1baf 100644
--- a/src/pages/patientView/SampleManager.tsx
+++ b/src/pages/patientView/SampleManager.tsx
@@ -1,48 +1,68 @@
 import * as React from 'react';
 import * as _ from 'lodash';
 import SampleInline from './patientHeader/SampleInline';
-import {ClinicalDataBySampleId} from "../../shared/api/api-types-extended";
-import { ClinicalData } from "shared/api/generated/CBioPortalAPI";
-import {cleanAndDerive} from './clinicalInformation/lib/clinicalAttributesUtil.js';
+import { ClinicalDataBySampleId } from '../../shared/api/api-types-extended';
+import { ClinicalData } from 'shared/api/generated/CBioPortalAPI';
+import { cleanAndDerive } from './clinicalInformation/lib/clinicalAttributesUtil.js';
 import styles from './patientHeader/style/clinicalAttributes.scss';
 import naturalSort from 'javascript-natural-sort';
-import {ClinicalEvent, ClinicalEventData} from "../../shared/api/generated/CBioPortalAPI";
+import {
+    ClinicalEvent,
+    ClinicalEventData,
+} from '../../shared/api/generated/CBioPortalAPI';
 import { SampleLabelHTML } from 'shared/components/sampleLabel/SampleLabel';
 
-
 // sort samples based on event, clinical data and id
 // 1. based on sample collection data (timeline event)
 // 2. if all cases have derived normalized case types, put primary first
 // 3. natural sort of sample ids
-export function sortSamples(samples: Array<ClinicalDataBySampleId>,
-                            clinicalDataLegacyCleanAndDerived: { [s:string]:any },
-                            events?: any) {
+export function sortSamples(
+    samples: Array<ClinicalDataBySampleId>,
+    clinicalDataLegacyCleanAndDerived: { [s: string]: any },
+    events?: any
+) {
     // natural sort (use contrived concatenation, to avoid complaints about
     // immutable types)
     let naturalSortedSampleIDs: string[] = [];
-    naturalSortedSampleIDs = naturalSortedSampleIDs.concat(samples.map((sample) => sample.id)).sort(naturalSort);
+    naturalSortedSampleIDs = naturalSortedSampleIDs
+        .concat(samples.map(sample => sample.id))
+        .sort(naturalSort);
 
     // based on sample collection data (timeline event)
-    let collectionDayMap: {[s:string]:number} = {};
+    let collectionDayMap: { [s: string]: number } = {};
     if (events) {
         // use SPECIMEN or SAMPLE_ACQUISITION track on timeline to get timeline
         // event
         // TODO: SAMPLE_ACQUISITION is specific to genie_bpc_test study. We
         // should probably have some config to allow people to choose what
         // timeline tracks get labels
-        const specimenEvents = events.filter((e: ClinicalEvent) => (e.eventType === 'SPECIMEN' || 'SAMPLE_ACQUISITION'));
-
-        collectionDayMap = specimenEvents.reduce((map:{[s:string]:number}, specimenEvent: ClinicalEvent) => {
-            let sampleAttr = _.find(specimenEvent.attributes, (attr: ClinicalEventData) => {
-                // TODO: This is legacy support for old timeline data that does not use SAMPLE_ID, but one of the specrefnum
-                return (attr.key === "SAMPLE_ID" || attr.key === "SpecimenReferenceNumber" || attr.key === "SPECIMEN_REFERENCE_NUMBER") &&
-                    (naturalSortedSampleIDs.indexOf(attr.value) !== -1);
-            });
-            if (sampleAttr) {
-                map[sampleAttr.value] = specimenEvent.startNumberOfDaysSinceDiagnosis;
-            }
-            return map;
-        }, {});
+        const specimenEvents = events.filter(
+            (e: ClinicalEvent) =>
+                e.eventType === 'SPECIMEN' || 'SAMPLE_ACQUISITION'
+        );
+
+        collectionDayMap = specimenEvents.reduce(
+            (map: { [s: string]: number }, specimenEvent: ClinicalEvent) => {
+                let sampleAttr = _.find(
+                    specimenEvent.attributes,
+                    (attr: ClinicalEventData) => {
+                        // TODO: This is legacy support for old timeline data that does not use SAMPLE_ID, but one of the specrefnum
+                        return (
+                            (attr.key === 'SAMPLE_ID' ||
+                                attr.key === 'SpecimenReferenceNumber' ||
+                                attr.key === 'SPECIMEN_REFERENCE_NUMBER') &&
+                            naturalSortedSampleIDs.indexOf(attr.value) !== -1
+                        );
+                    }
+                );
+                if (sampleAttr) {
+                    map[sampleAttr.value] =
+                        specimenEvent.startNumberOfDaysSinceDiagnosis;
+                }
+                return map;
+            },
+            {}
+        );
     }
 
     // create new object array, to allow sorting of samples by multiple fields
@@ -56,15 +76,18 @@ export function sortSamples(samples: Array<ClinicalDataBySampleId>,
     // put primaries first (could be extended with more if necessary)
     let sampleTypeOrdering: string[] = ['primary', 'metastasis', 'cfdna'];
     let sampleOrder: sampleOrderT[] = [];
-    
+
     for (let i: number = 0; i < samples.length; i++) {
         let id = samples[i].id;
         // 1. based on sample collection data (timeline event)
         let eventOrdering = collectionDayMap[id];
 
         // 2. if cases have derived normalized case types, put primary first
-        const caseType = clinicalDataLegacyCleanAndDerived[id].DERIVED_NORMALIZED_CASE_TYPE;
-        let sampleTypeIndex = caseType ? sampleTypeOrdering.indexOf(caseType.toLowerCase()) : -1;
+        const caseType =
+            clinicalDataLegacyCleanAndDerived[id].DERIVED_NORMALIZED_CASE_TYPE;
+        let sampleTypeIndex = caseType
+            ? sampleTypeOrdering.indexOf(caseType.toLowerCase())
+            : -1;
         if (sampleTypeIndex === -1) {
             sampleTypeIndex = sampleTypeOrdering.length;
         }
@@ -72,28 +95,34 @@ export function sortSamples(samples: Array<ClinicalDataBySampleId>,
         // 3. natural sort of sample ids
         let naturalSortIndex = naturalSortedSampleIDs.indexOf(id);
 
-        sampleOrder = sampleOrder.concat({id, sampleTypeIndex, naturalSortIndex, eventOrdering});
+        sampleOrder = sampleOrder.concat({
+            id,
+            sampleTypeIndex,
+            naturalSortIndex,
+            eventOrdering,
+        });
     }
 
-    sampleOrder = _.orderBy(sampleOrder, ['eventOrdering', 'sampleTypeIndex', 'naturalSortIndex'], ['asc','asc','asc']);
+    sampleOrder = _.orderBy(
+        sampleOrder,
+        ['eventOrdering', 'sampleTypeIndex', 'naturalSortIndex'],
+        ['asc', 'asc', 'asc']
+    );
     let sampleOrderMap = _.fromPairs(sampleOrder.map((so, i) => [so.id, i]));
-    return _.sortBy<ClinicalDataBySampleId>(samples, (sample) => {
+    return _.sortBy<ClinicalDataBySampleId>(samples, sample => {
         return sampleOrderMap[sample.id];
     });
 }
 
-
 class SampleManager {
-
-    sampleIndex: { [s:string]:number };
-    sampleLabels: { [s:string]:string };
+    sampleIndex: { [s: string]: number };
+    sampleLabels: { [s: string]: string };
     sampleOrder: string[];
-    clinicalDataLegacyCleanAndDerived: { [s:string]:any };
-    sampleColors: { [s:string]:string };
-    commonClinicalDataLegacyCleanAndDerived: { [s:string]:string };
+    clinicalDataLegacyCleanAndDerived: { [s: string]: any };
+    sampleColors: { [s: string]: string };
+    commonClinicalDataLegacyCleanAndDerived: { [s: string]: string };
 
     constructor(public samples: Array<ClinicalDataBySampleId>, events?: any) {
-
         this.sampleIndex = {};
         this.sampleLabels = {};
         this.clinicalDataLegacyCleanAndDerived = {};
@@ -103,109 +132,156 @@ class SampleManager {
         this.commonClinicalDataLegacyCleanAndDerived = {};
 
         samples.forEach((sample, i) => {
-           // add legacy clinical data
-           this.clinicalDataLegacyCleanAndDerived[sample.id] = cleanAndDerive(
-               _.fromPairs(sample.clinicalData.map((x) => [x.clinicalAttributeId, x.value]))
-           );
-
-           // determine color based on DERIVED_NORMALIZED_CASE_TYPE
-           let color = 'black';
-           if (this.clinicalDataLegacyCleanAndDerived[sample.id]['DERIVED_NORMALIZED_CASE_TYPE'] === 'Primary') {
-               color = styles.sampleColorPrimary;
-           } else if (this.clinicalDataLegacyCleanAndDerived[sample.id].DERIVED_NORMALIZED_CASE_TYPE === 'Recurrence' ||
-                      this.clinicalDataLegacyCleanAndDerived[sample.id].DERIVED_NORMALIZED_CASE_TYPE === 'Progressed') {
-               color = styles.sampleColorRecurrence;
-           } else if (this.clinicalDataLegacyCleanAndDerived[sample.id].DERIVED_NORMALIZED_CASE_TYPE === 'Metastasis') {
-               color = styles.sampleColorMetastasis;
-           } else if (this.clinicalDataLegacyCleanAndDerived[sample.id].DERIVED_NORMALIZED_CASE_TYPE === 'cfDNA') {
-               color = styles.sampleColorCfdna;
-           } else if (this.clinicalDataLegacyCleanAndDerived[sample.id].DERIVED_NORMALIZED_CASE_TYPE === 'Xenograft') {
-               color = styles.sampleColorXenograft;
-           }
-
-           this.sampleColors[sample.id] = color;
+            // add legacy clinical data
+            this.clinicalDataLegacyCleanAndDerived[sample.id] = cleanAndDerive(
+                _.fromPairs(
+                    sample.clinicalData.map(x => [
+                        x.clinicalAttributeId,
+                        x.value,
+                    ])
+                )
+            );
+
+            // determine color based on DERIVED_NORMALIZED_CASE_TYPE
+            let color = 'black';
+            if (
+                this.clinicalDataLegacyCleanAndDerived[sample.id][
+                    'DERIVED_NORMALIZED_CASE_TYPE'
+                ] === 'Primary'
+            ) {
+                color = styles.sampleColorPrimary;
+            } else if (
+                this.clinicalDataLegacyCleanAndDerived[sample.id]
+                    .DERIVED_NORMALIZED_CASE_TYPE === 'Recurrence' ||
+                this.clinicalDataLegacyCleanAndDerived[sample.id]
+                    .DERIVED_NORMALIZED_CASE_TYPE === 'Progressed'
+            ) {
+                color = styles.sampleColorRecurrence;
+            } else if (
+                this.clinicalDataLegacyCleanAndDerived[sample.id]
+                    .DERIVED_NORMALIZED_CASE_TYPE === 'Metastasis'
+            ) {
+                color = styles.sampleColorMetastasis;
+            } else if (
+                this.clinicalDataLegacyCleanAndDerived[sample.id]
+                    .DERIVED_NORMALIZED_CASE_TYPE === 'cfDNA'
+            ) {
+                color = styles.sampleColorCfdna;
+            } else if (
+                this.clinicalDataLegacyCleanAndDerived[sample.id]
+                    .DERIVED_NORMALIZED_CASE_TYPE === 'Xenograft'
+            ) {
+                color = styles.sampleColorXenograft;
+            }
+
+            this.sampleColors[sample.id] = color;
         });
 
         // remove common CANCER_TYPE/CANCER_TYPE_DETAILED in top bar (display on
         // patient)
-        ['CANCER_TYPE', 'CANCER_TYPE_DETAILED'].forEach((attr) => {
-            if (SampleManager.isSameClinicalAttributeInAllSamples(samples, attr)) {
-                this.commonClinicalDataLegacyCleanAndDerived[attr] = this.clinicalDataLegacyCleanAndDerived[samples[0].id][attr];
-                samples.forEach((sample) => {
-                    delete this.clinicalDataLegacyCleanAndDerived[sample.id][attr];
+        ['CANCER_TYPE', 'CANCER_TYPE_DETAILED'].forEach(attr => {
+            if (
+                SampleManager.isSameClinicalAttributeInAllSamples(samples, attr)
+            ) {
+                this.commonClinicalDataLegacyCleanAndDerived[
+                    attr
+                ] = this.clinicalDataLegacyCleanAndDerived[samples[0].id][attr];
+                samples.forEach(sample => {
+                    delete this.clinicalDataLegacyCleanAndDerived[sample.id][
+                        attr
+                    ];
                 });
             }
-        })
+        });
 
-        this.samples = sortSamples(samples, this.clinicalDataLegacyCleanAndDerived, events);
+        this.samples = sortSamples(
+            samples,
+            this.clinicalDataLegacyCleanAndDerived,
+            events
+        );
         this.samples.forEach((sample, i) => {
             this.sampleIndex[sample.id] = i;
-            this.sampleLabels[sample.id] = String(i+1);
+            this.sampleLabels[sample.id] = String(i + 1);
         });
         // order as array of sample ids (used further downstream)
-        this.sampleOrder = _.sortBy(Object.keys(this.sampleIndex), (k) => this.sampleIndex[k]);
+        this.sampleOrder = _.sortBy(
+            Object.keys(this.sampleIndex),
+            k => this.sampleIndex[k]
+        );
     }
 
-    static isSameClinicalAttributeInAllSamples(samples:Array<ClinicalDataBySampleId>, attribute:string) {
-        let uniqueValues = _.uniq(samples.map((sample) => {
-            let attr = sample.clinicalData.find(
-                (x:ClinicalData) => x.clinicalAttributeId === attribute
-            );
-            return attr? attr.value : attr
-        }));
+    static isSameClinicalAttributeInAllSamples(
+        samples: Array<ClinicalDataBySampleId>,
+        attribute: string
+    ) {
+        let uniqueValues = _.uniq(
+            samples.map(sample => {
+                let attr = sample.clinicalData.find(
+                    (x: ClinicalData) => x.clinicalAttributeId === attribute
+                );
+                return attr ? attr.value : attr;
+            })
+        );
         return uniqueValues.length === 1 && uniqueValues[0];
     }
 
-    static getClinicalAttributeInSample(sample: ClinicalDataBySampleId, clinicalAttributeId: string) : ClinicalData | undefined {
-        return _.find(sample.clinicalData, (data) => {
+    static getClinicalAttributeInSample(
+        sample: ClinicalDataBySampleId,
+        clinicalAttributeId: string
+    ): ClinicalData | undefined {
+        return _.find(sample.clinicalData, data => {
             return data.clinicalAttributeId === clinicalAttributeId;
-        })
+        });
     }
 
-    getComponentForSample(sampleId: string,
-                          fillOpacity: number = 1,
-                          extraTooltipText: string = '',
-                          additionalContent: JSX.Element|null = null,
-                          onSelectGenePanel?:(name:string)=>void,
-                          disableTooltip?:boolean)
-    {
-        const sample = _.find(this.samples, (s: ClinicalDataBySampleId)=> {
+    getComponentForSample(
+        sampleId: string,
+        fillOpacity: number = 1,
+        extraTooltipText: string = '',
+        additionalContent: JSX.Element | null = null,
+        onSelectGenePanel?: (name: string) => void,
+        disableTooltip?: boolean
+    ) {
+        const sample = _.find(this.samples, (s: ClinicalDataBySampleId) => {
             return s.id === sampleId;
         });
 
-        return sample && (
-            <SampleInline
-                sample={sample}
-                extraTooltipText={extraTooltipText}
-                additionalContent={additionalContent}
-                onSelectGenePanel={onSelectGenePanel}
-                disableTooltip={disableTooltip} >
-                <SampleLabelHTML
-                    label={(this.sampleIndex[sample.id] + 1).toString()}
-                    fillOpacity={fillOpacity}
-                    color={this.sampleColors[sample.id]}
-                />
-            </SampleInline>
+        return (
+            sample && (
+                <SampleInline
+                    sample={sample}
+                    extraTooltipText={extraTooltipText}
+                    additionalContent={additionalContent}
+                    onSelectGenePanel={onSelectGenePanel}
+                    disableTooltip={disableTooltip}
+                >
+                    <SampleLabelHTML
+                        label={(this.sampleIndex[sample.id] + 1).toString()}
+                        fillOpacity={fillOpacity}
+                        color={this.sampleColors[sample.id]}
+                    />
+                </SampleInline>
+            )
         );
     }
 
-    getColorForSample(sampleId: string):string {
+    getColorForSample(sampleId: string): string {
         return this.sampleColors[sampleId];
     }
 
-    getSampleIdsInOrder():string[] {
-        return this.samples.map((sample:ClinicalDataBySampleId) => sample.id);
+    getSampleIdsInOrder(): string[] {
+        return this.samples.map((sample: ClinicalDataBySampleId) => sample.id);
     }
 
     getComponentsForSamples() {
-        this.samples.map((sample)=>this.getComponentForSample(sample.id));
+        this.samples.map(sample => this.getComponentForSample(sample.id));
     }
 
-    getSampleLabel(sampleId:string):string {
+    getSampleLabel(sampleId: string): string {
         if (sampleId in this.sampleLabels) {
             return this.sampleLabels[sampleId];
         }
-        return "";
+        return '';
     }
 }
 
diff --git a/src/pages/patientView/clinicalInformation/ClinicalInformationMutationalSignatureTable.spec.tsx b/src/pages/patientView/clinicalInformation/ClinicalInformationMutationalSignatureTable.spec.tsx
index 896b2d2202e..3f226671975 100644
--- a/src/pages/patientView/clinicalInformation/ClinicalInformationMutationalSignatureTable.spec.tsx
+++ b/src/pages/patientView/clinicalInformation/ClinicalInformationMutationalSignatureTable.spec.tsx
@@ -3,10 +3,11 @@ import React from 'react';
 import { assert } from 'chai';
 import { shallow, mount } from 'enzyme';
 import sinon from 'sinon';
-import {prepareMutationalSignatureDataForTable} from "./ClinicalInformationMutationalSignatureTable";
+import { prepareMutationalSignatureDataForTable } from './ClinicalInformationMutationalSignatureTable';
 
 const sampleMutationalSignatureData = [
-    {sampleId: 'firstSample',
+    {
+        sampleId: 'firstSample',
         uniqueSampleKey: 'firstSample',
         patientId: 'firstPatient',
         uniquePatientKey: 'firstPatient',
@@ -14,8 +15,10 @@ const sampleMutationalSignatureData = [
         mutationalSignatureId: 'firstMutationalSignature',
         value: 1,
         confidence: 0.9,
-        numberOfMutationsForSample: 20},
-    {sampleId: 'secondSample',
+        numberOfMutationsForSample: 20,
+    },
+    {
+        sampleId: 'secondSample',
         uniqueSampleKey: 'secondSample',
         patientId: 'firstPatient',
         uniquePatientKey: 'firstPatient',
@@ -23,8 +26,10 @@ const sampleMutationalSignatureData = [
         mutationalSignatureId: 'firstMutationalSignature',
         value: 2,
         confidence: 0.8,
-        numberOfMutationsForSample: 20},
-    {sampleId: 'firstSample',
+        numberOfMutationsForSample: 20,
+    },
+    {
+        sampleId: 'firstSample',
         uniqueSampleKey: 'firstSample',
         patientId: 'firstPatient',
         uniquePatientKey: 'firstPatient',
@@ -32,43 +37,42 @@ const sampleMutationalSignatureData = [
         mutationalSignatureId: 'secondMutationalSignature',
         value: 3,
         confidence: 0.4,
-        numberOfMutationsForSample: 20}
+        numberOfMutationsForSample: 20,
+    },
 ];
 
 describe('ClinicalInformationMutationalSignatureTable', () => {
+    before(() => {});
+    after(() => {});
 
-    before(()=>{
-
-    });
-    after(()=>{
-
-    });
-
-    it('takes mutational signature sample data and formats it for mutational signature table to render', ()=>{
-        let result = prepareMutationalSignatureDataForTable(sampleMutationalSignatureData);
+    it('takes mutational signature sample data and formats it for mutational signature table to render', () => {
+        let result = prepareMutationalSignatureDataForTable(
+            sampleMutationalSignatureData
+        );
 
         assert.deepEqual(result, [
-            {mutationalSignatureId: 'firstMutationalSignature',
-             sampleValues:{
-                "firstSample":{
-                    value: 1,
-                    confidence: 0.9
+            {
+                mutationalSignatureId: 'firstMutationalSignature',
+                sampleValues: {
+                    firstSample: {
+                        value: 1,
+                        confidence: 0.9,
+                    },
+                    secondSample: {
+                        value: 2,
+                        confidence: 0.8,
+                    },
                 },
-                "secondSample": {
-                    value: 2,
-                    confidence: 0.8
-                }
-             }
-             },
-            {mutationalSignatureId: 'secondMutationalSignature',
-                sampleValues:{
-                    "firstSample":{
+            },
+            {
+                mutationalSignatureId: 'secondMutationalSignature',
+                sampleValues: {
+                    firstSample: {
                         value: 3,
-                        confidence: 0.4
-                    }
-                }
-
-            }
+                        confidence: 0.4,
+                    },
+                },
+            },
         ]);
     });
 });
diff --git a/src/pages/patientView/clinicalInformation/ClinicalInformationMutationalSignatureTable.tsx b/src/pages/patientView/clinicalInformation/ClinicalInformationMutationalSignatureTable.tsx
index b511711d2d6..8d0fd9a8277 100644
--- a/src/pages/patientView/clinicalInformation/ClinicalInformationMutationalSignatureTable.tsx
+++ b/src/pages/patientView/clinicalInformation/ClinicalInformationMutationalSignatureTable.tsx
@@ -1,96 +1,158 @@
-import * as React from "react";
-import {ClinicalAttribute, ClinicalData} from "../../../shared/api/generated/CBioPortalAPI";
-import LazyMobXTable, {Column} from "shared/components/lazyMobXTable/LazyMobXTable";
+import * as React from 'react';
+import {
+    ClinicalAttribute,
+    ClinicalData,
+} from '../../../shared/api/generated/CBioPortalAPI';
+import LazyMobXTable, {
+    Column,
+} from 'shared/components/lazyMobXTable/LazyMobXTable';
 import styles from './style/mutationalSignatureTable.module.scss';
-import {SHOW_ALL_PAGE_SIZE} from "../../../shared/components/paginationControls/PaginationControls";
-import {IMutationalSignature} from "../../../shared/model/MutationalSignature";
-import convertSamplesData, {IConvertedSamplesData} from "./lib/convertSamplesData";
-import {getMutationalSignaturePercentage} from "../../../shared/lib/FormatUtils";
+import { SHOW_ALL_PAGE_SIZE } from '../../../shared/components/paginationControls/PaginationControls';
+import { IMutationalSignature } from '../../../shared/model/MutationalSignature';
+import convertSamplesData, {
+    IConvertedSamplesData,
+} from './lib/convertSamplesData';
+import { getMutationalSignaturePercentage } from '../../../shared/lib/FormatUtils';
 import _ from 'lodash';
-import {labelMobxPromises} from "mobxpromise";
+import { labelMobxPromises } from 'mobxpromise';
 
 export interface IClinicalInformationMutationalSignatureTableProps {
     data: IMutationalSignature[];
     showTitleBar: boolean;
-    cssClass?:string;
-    showFilter?:boolean;
-    showCopyDownload?:boolean;
+    cssClass?: string;
+    showFilter?: boolean;
+    showCopyDownload?: boolean;
 }
 
 class MutationalSignatureTable extends LazyMobXTable<IMutationalSignatureRow> {}
 
 interface IMutationalSignatureRow {
-    mutationalSignatureId:string;
-    sampleValues:{
-        [uniqueSampleKey: string]: { //each element in the row will contain data about exposure and confidence
-            value: number
-            confidence: number
-        }
+    mutationalSignatureId: string;
+    sampleValues: {
+        [uniqueSampleKey: string]: {
+            //each element in the row will contain data about exposure and confidence
+            value: number;
+            confidence: number;
+        };
     };
 }
 
-export function prepareMutationalSignatureDataForTable(mutationalSignatureData: IMutationalSignature[]):IMutationalSignatureRow[] {
-
+export function prepareMutationalSignatureDataForTable(
+    mutationalSignatureData: IMutationalSignature[]
+): IMutationalSignatureRow[] {
     const tableData: IMutationalSignatureRow[] = [];
 
     //group data by mutational signature
     //[{id: mutationalsignatureid, samples: [{}, {}]}]
-    let sampleInvertedDataByMutationalSignature:Array<any> = _(mutationalSignatureData)
-        .groupBy(mutationalSignatureSample => mutationalSignatureSample.mutationalSignatureId)
-        .map((mutationalSignatureSampleData, mutationalSignatureId)  => ({id: mutationalSignatureId, samples: mutationalSignatureSampleData}))
+    let sampleInvertedDataByMutationalSignature: Array<any> = _(
+        mutationalSignatureData
+    )
+        .groupBy(
+            mutationalSignatureSample =>
+                mutationalSignatureSample.mutationalSignatureId
+        )
+        .map((mutationalSignatureSampleData, mutationalSignatureId) => ({
+            id: mutationalSignatureId,
+            samples: mutationalSignatureSampleData,
+        }))
         .value();
 
-    for (const mutationalSignature of sampleInvertedDataByMutationalSignature){
-        let mutationalSignatureRowForTable: IMutationalSignatureRow = {mutationalSignatureId:"", sampleValues: {}};
-        mutationalSignatureRowForTable.mutationalSignatureId = mutationalSignature.id;
-        for (const sample of mutationalSignature.samples){
-            mutationalSignatureRowForTable.sampleValues[sample.uniqueSampleKey] =
-                {value: sample.value,
-                    confidence: sample.confidence};
+    for (const mutationalSignature of sampleInvertedDataByMutationalSignature) {
+        let mutationalSignatureRowForTable: IMutationalSignatureRow = {
+            mutationalSignatureId: '',
+            sampleValues: {},
+        };
+        mutationalSignatureRowForTable.mutationalSignatureId =
+            mutationalSignature.id;
+        for (const sample of mutationalSignature.samples) {
+            mutationalSignatureRowForTable.sampleValues[
+                sample.uniqueSampleKey
+            ] = { value: sample.value, confidence: sample.confidence };
         }
         tableData.push(mutationalSignatureRowForTable);
     }
     return tableData;
 }
 
-export default class ClinicalInformationMutationalSignatureTable extends React.Component<IClinicalInformationMutationalSignatureTableProps, {}> {
-
-    readonly uniqueSamples = _.map(_.uniqBy(this.props.data, "uniqueSampleKey"), (uniqSample => ({id: uniqSample.uniqueSampleKey})));
+export default class ClinicalInformationMutationalSignatureTable extends React.Component<
+    IClinicalInformationMutationalSignatureTableProps,
+    {}
+> {
+    readonly uniqueSamples = _.map(
+        _.uniqBy(this.props.data, 'uniqueSampleKey'),
+        uniqSample => ({ id: uniqSample.uniqueSampleKey })
+    );
 
-    readonly tableData = prepareMutationalSignatureDataForTable(this.props.data);
+    readonly tableData = prepareMutationalSignatureDataForTable(
+        this.props.data
+    );
     readonly firstCol = 'mutationalSignatureId';
-    readonly columns:Column<IMutationalSignatureRow>[] = [{
-        name: "Mutational Signature",
-        render: (data:IMutationalSignatureRow)=><span>{data[this.firstCol]}</span>,
-        download: (data: IMutationalSignatureRow) => `${data[this.firstCol]}`,
-        filter: (data: IMutationalSignatureRow, filterString: string, filterStringUpper: string) =>
-            (data[this.firstCol].toString().toUpperCase().indexOf(filterStringUpper) > -1),
-        sortBy: (data)=> Number(data[this.firstCol].slice(21)) //slice off "mutational_signature_" and convert to a number
-    }, ...this.uniqueSamples.map((col) => (
+    readonly columns: Column<IMutationalSignatureRow>[] = [
         {
+            name: 'Mutational Signature',
+            render: (data: IMutationalSignatureRow) => (
+                <span>{data[this.firstCol]}</span>
+            ),
+            download: (data: IMutationalSignatureRow) =>
+                `${data[this.firstCol]}`,
+            filter: (
+                data: IMutationalSignatureRow,
+                filterString: string,
+                filterStringUpper: string
+            ) =>
+                data[this.firstCol]
+                    .toString()
+                    .toUpperCase()
+                    .indexOf(filterStringUpper) > -1,
+            sortBy: data => Number(data[this.firstCol].slice(21)), //slice off "mutational_signature_" and convert to a number
+        },
+        ...this.uniqueSamples.map(col => ({
             name: col.id,
-            render: (data: IMutationalSignatureRow) => (data.sampleValues[col.id].confidence > 0.85) ? //if confidence of mutsig sample is greater than 0.85, bold the exposure
-                <span className={styles.mutationalSignatureValue}>{getMutationalSignaturePercentage(data.sampleValues[col.id].value)}</span> :
-                <span>{getMutationalSignaturePercentage(data.sampleValues[col.id].value)}</span>,
-            download: (data: IMutationalSignatureRow) => `${getMutationalSignaturePercentage(data.sampleValues[col.id].value)}`,
-            filter: (data: IMutationalSignatureRow, filterString: string, filterStringUpper: string) =>
-                (getMutationalSignaturePercentage(data.sampleValues[col.id].value).toUpperCase().indexOf(filterStringUpper) > -1),
-            sortBy: (data: IMutationalSignatureRow) => data.sampleValues[col.id].value//Number(data.sampleValues[col.id].value.match(/\d+/g)) //extracts digits out of format like 5%
-        }
-    ))];
+            render: (data: IMutationalSignatureRow) =>
+                data.sampleValues[col.id].confidence > 0.85 ? ( //if confidence of mutsig sample is greater than 0.85, bold the exposure
+                    <span className={styles.mutationalSignatureValue}>
+                        {getMutationalSignaturePercentage(
+                            data.sampleValues[col.id].value
+                        )}
+                    </span>
+                ) : (
+                    <span>
+                        {getMutationalSignaturePercentage(
+                            data.sampleValues[col.id].value
+                        )}
+                    </span>
+                ),
+            download: (data: IMutationalSignatureRow) =>
+                `${getMutationalSignaturePercentage(
+                    data.sampleValues[col.id].value
+                )}`,
+            filter: (
+                data: IMutationalSignatureRow,
+                filterString: string,
+                filterStringUpper: string
+            ) =>
+                getMutationalSignaturePercentage(
+                    data.sampleValues[col.id].value
+                )
+                    .toUpperCase()
+                    .indexOf(filterStringUpper) > -1,
+            sortBy: (data: IMutationalSignatureRow) =>
+                data.sampleValues[col.id].value, //Number(data.sampleValues[col.id].value.match(/\d+/g)) //extracts digits out of format like 5%
+        })),
+    ];
 
     public render() {
-        return <MutationalSignatureTable
-            columns={this.columns}
-            data={this.tableData}
-            className={styles.mutationalSignatureTable}
-            showPagination={false}
-            initialItemsPerPage={SHOW_ALL_PAGE_SIZE}
-            showColumnVisibility={false}
-            initialSortColumn="attribute"
-            initialSortDirection="asc"
-        />;
+        return (
+            <MutationalSignatureTable
+                columns={this.columns}
+                data={this.tableData}
+                className={styles.mutationalSignatureTable}
+                showPagination={false}
+                initialItemsPerPage={SHOW_ALL_PAGE_SIZE}
+                showColumnVisibility={false}
+                initialSortColumn="attribute"
+                initialSortDirection="asc"
+            />
+        );
     }
 }
-
-
diff --git a/src/pages/patientView/clinicalInformation/ClinicalInformationPatientTable.spec.tsx b/src/pages/patientView/clinicalInformation/ClinicalInformationPatientTable.spec.tsx
index 64ad8c492ab..d9869b22451 100644
--- a/src/pages/patientView/clinicalInformation/ClinicalInformationPatientTable.spec.tsx
+++ b/src/pages/patientView/clinicalInformation/ClinicalInformationPatientTable.spec.tsx
@@ -5,17 +5,9 @@ import { shallow, mount } from 'enzyme';
 import sinon from 'sinon';
 
 describe('ClinicalInformationPatientTable', () => {
+    before(() => {});
 
-    before(()=>{
-
-    });
-
-    after(()=>{
-
-    });
-
-    it('what does it do?', ()=>{
-
-    });
+    after(() => {});
 
+    it('what does it do?', () => {});
 });
diff --git a/src/pages/patientView/clinicalInformation/ClinicalInformationPatientTable.tsx b/src/pages/patientView/clinicalInformation/ClinicalInformationPatientTable.tsx
index c6513a824fd..b11d12f326d 100644
--- a/src/pages/patientView/clinicalInformation/ClinicalInformationPatientTable.tsx
+++ b/src/pages/patientView/clinicalInformation/ClinicalInformationPatientTable.tsx
@@ -1,20 +1,20 @@
-import * as React from "react";
-import {ClinicalData} from "../../../shared/api/generated/CBioPortalAPI";
-import LazyMobXTable from "shared/components/lazyMobXTable/LazyMobXTable";
+import * as React from 'react';
+import { ClinicalData } from '../../../shared/api/generated/CBioPortalAPI';
+import LazyMobXTable from 'shared/components/lazyMobXTable/LazyMobXTable';
 
 import styles from './style/patientTable.module.scss';
-import {SHOW_ALL_PAGE_SIZE} from "../../../shared/components/paginationControls/PaginationControls";
-import {sortByClinicalAttributePriorityThenName} from "../../../shared/lib/SortUtils";
-import { isUrl } from "cbioportal-frontend-commons";
+import { SHOW_ALL_PAGE_SIZE } from '../../../shared/components/paginationControls/PaginationControls';
+import { sortByClinicalAttributePriorityThenName } from '../../../shared/lib/SortUtils';
+import { isUrl } from 'cbioportal-frontend-commons';
 import autobind from 'autobind-decorator';
 
 export interface IClinicalInformationPatientTableProps {
     data: ClinicalData[];
     showTitleBar?: boolean;
-    cssClass?:string;
-    showFilter?:boolean;
-    showCopyDownload?:boolean;
-    onSelectGenePanel?:(name:string)=>void;
+    cssClass?: string;
+    showFilter?: boolean;
+    showCopyDownload?: boolean;
+    onSelectGenePanel?: (name: string) => void;
 }
 
 class PatientTable extends LazyMobXTable<IPatientRow> {}
@@ -22,14 +22,19 @@ class PatientTable extends LazyMobXTable<IPatientRow> {}
 interface IPatientRow {
     attribute: string;
     value: string;
-};
-
-export default class ClinicalInformationPatientTable extends React.Component<IClinicalInformationPatientTableProps, {}> {
+}
 
-    private getDisplayValue(data:{attribute:string, value:string}):string {
-        let ret:string;
+export default class ClinicalInformationPatientTable extends React.Component<
+    IClinicalInformationPatientTableProps,
+    {}
+> {
+    private getDisplayValue(data: {
+        attribute: string;
+        value: string;
+    }): string {
+        let ret: string;
         switch (data.attribute) {
-            case "Overall Survival (Months)":
+            case 'Overall Survival (Months)':
                 ret = parseInt(data.value, 10).toFixed(0);
                 break;
             default:
@@ -39,77 +44,104 @@ export default class ClinicalInformationPatientTable extends React.Component<ICl
         return ret;
     }
 
-    @autobind handleClick(name:string) {
+    @autobind handleClick(name: string) {
         if (this.props.onSelectGenePanel) {
             this.props.onSelectGenePanel(name);
         }
     }
 
-    renderGenePanelLinks = (genePanels:string) => {
-        const links: (string|JSX.Element)[] = [];
-        const genePanelsArray = genePanels.split(",");
+    renderGenePanelLinks = (genePanels: string) => {
+        const links: (string | JSX.Element)[] = [];
+        const genePanelsArray = genePanels.split(',');
         genePanelsArray.forEach((panelName, index) => {
             panelName = panelName.trim();
-            if (panelName.includes("N/A")) {
+            if (panelName.includes('N/A')) {
                 links.push(panelName);
             } else {
                 // split gene panel name from "TESTPANEL2 (mut)" to ["TESTPANEL2", "(mut)"]
-                const splitGenePanelName = panelName.split(" ");
+                const splitGenePanelName = panelName.split(' ');
                 links.push(
-                    <a
-                        onClick={() => this.handleClick(splitGenePanelName[0])}>
+                    <a onClick={() => this.handleClick(splitGenePanelName[0])}>
                         {panelName}
                     </a>
                 );
             }
             if (index < genePanelsArray.length - 1) {
-                links.push(", ");
+                links.push(', ');
             }
-        })
+        });
         return <span>{links}</span>;
-    }
+    };
 
     public render() {
-
-        const tableData = this.props.data && this.props.data.sort((a, b) => sortByClinicalAttributePriorityThenName(a.clinicalAttribute, b.clinicalAttribute)).map((el: ClinicalData) => ({
-            attribute: el.clinicalAttribute.displayName || '',
-            value: el.value
-        }));
+        const tableData =
+            this.props.data &&
+            this.props.data
+                .sort((a, b) =>
+                    sortByClinicalAttributePriorityThenName(
+                        a.clinicalAttribute,
+                        b.clinicalAttribute
+                    )
+                )
+                .map((el: ClinicalData) => ({
+                    attribute: el.clinicalAttribute.displayName || '',
+                    value: el.value,
+                }));
 
         return (
             <PatientTable
-                  data={tableData}
-                  columns={[
-                      {   name:'Attribute',
-                          render:(data)=><span>{data.attribute}</span>,
-                          download: (data) => data.attribute,
-                          filter: (data:IPatientRow, filterString:string, filterStringUpper:string) =>
-                            data.attribute.toString().toUpperCase().indexOf(filterStringUpper) > -1,
-                          sortBy: (data)=>data.attribute
-                      },
-                      {
-                          name:'Value',
-                          render: (data)=>{
-                              if(isUrl(data.value)){
-                                return <a href={data.value} target="_blank">{data.value}</a>
-                              } else if (data.attribute === "Gene Panel") {
+                data={tableData}
+                columns={[
+                    {
+                        name: 'Attribute',
+                        render: data => <span>{data.attribute}</span>,
+                        download: data => data.attribute,
+                        filter: (
+                            data: IPatientRow,
+                            filterString: string,
+                            filterStringUpper: string
+                        ) =>
+                            data.attribute
+                                .toString()
+                                .toUpperCase()
+                                .indexOf(filterStringUpper) > -1,
+                        sortBy: data => data.attribute,
+                    },
+                    {
+                        name: 'Value',
+                        render: data => {
+                            if (isUrl(data.value)) {
+                                return (
+                                    <a href={data.value} target="_blank">
+                                        {data.value}
+                                    </a>
+                                );
+                            } else if (data.attribute === 'Gene Panel') {
                                 return this.renderGenePanelLinks(data.value);
-                              }
-                              return <span>{this.getDisplayValue(data)}</span>
-                          },
-                          download: (data) => this.getDisplayValue(data),
-                          filter: (data:IPatientRow, filterString:string, filterStringUpper:string) =>
-                            data.value.toString().toUpperCase().indexOf(filterStringUpper) > -1
-                      }]}
-                  showPagination={false}
-                  showColumnVisibility={false}
-                  className={styles.patientTable}
-                  initialItemsPerPage={SHOW_ALL_PAGE_SIZE}
-                  showFilter={(this.props.showFilter === false) ? false : true }
-                  showCopyDownload={(this.props.showCopyDownload === false) ? false : true }
+                            }
+                            return <span>{this.getDisplayValue(data)}</span>;
+                        },
+                        download: data => this.getDisplayValue(data),
+                        filter: (
+                            data: IPatientRow,
+                            filterString: string,
+                            filterStringUpper: string
+                        ) =>
+                            data.value
+                                .toString()
+                                .toUpperCase()
+                                .indexOf(filterStringUpper) > -1,
+                    },
+                ]}
+                showPagination={false}
+                showColumnVisibility={false}
+                className={styles.patientTable}
+                initialItemsPerPage={SHOW_ALL_PAGE_SIZE}
+                showFilter={this.props.showFilter === false ? false : true}
+                showCopyDownload={
+                    this.props.showCopyDownload === false ? false : true
+                }
             />
         );
     }
 }
-
-
diff --git a/src/pages/patientView/clinicalInformation/ClinicalInformationSamplesTable.spec.tsx b/src/pages/patientView/clinicalInformation/ClinicalInformationSamplesTable.spec.tsx
index cf3aad01944..e654cdae4c4 100644
--- a/src/pages/patientView/clinicalInformation/ClinicalInformationSamplesTable.spec.tsx
+++ b/src/pages/patientView/clinicalInformation/ClinicalInformationSamplesTable.spec.tsx
@@ -5,17 +5,9 @@ import { shallow, mount } from 'enzyme';
 import sinon from 'sinon';
 
 describe('ClinicalInformationSamplesTable', () => {
+    before(() => {});
 
-    before(()=>{
-
-    });
-
-    after(()=>{
-
-    });
-
-    it('what does it do?', ()=>{
-
-    });
+    after(() => {});
 
+    it('what does it do?', () => {});
 });
diff --git a/src/pages/patientView/clinicalInformation/ClinicalInformationSamplesTable.tsx b/src/pages/patientView/clinicalInformation/ClinicalInformationSamplesTable.tsx
index 8b560833a31..6e17f490203 100755
--- a/src/pages/patientView/clinicalInformation/ClinicalInformationSamplesTable.tsx
+++ b/src/pages/patientView/clinicalInformation/ClinicalInformationSamplesTable.tsx
@@ -1,74 +1,98 @@
-import * as React from "react";
-import * as _ from "lodash";
-import {ClinicalDataBySampleId} from "../../../shared/api/api-types-extended";
-import convertSamplesData, {IConvertedSamplesData} from "./lib/convertSamplesData";
-import LazyMobXTable, {Column} from "shared/components/lazyMobXTable/LazyMobXTable";
-import {ClinicalAttribute} from "../../../shared/api/generated/CBioPortalAPI";
+import * as React from 'react';
+import * as _ from 'lodash';
+import { ClinicalDataBySampleId } from '../../../shared/api/api-types-extended';
+import convertSamplesData, {
+    IConvertedSamplesData,
+} from './lib/convertSamplesData';
+import LazyMobXTable, {
+    Column,
+} from 'shared/components/lazyMobXTable/LazyMobXTable';
+import { ClinicalAttribute } from '../../../shared/api/generated/CBioPortalAPI';
 import styles from './style/sampleTable.module.scss';
-import {SHOW_ALL_PAGE_SIZE} from "../../../shared/components/paginationControls/PaginationControls";
-import {sortByClinicalAttributePriorityThenName} from "../../../shared/lib/SortUtils";
-import { isUrl } from "cbioportal-frontend-commons";
+import { SHOW_ALL_PAGE_SIZE } from '../../../shared/components/paginationControls/PaginationControls';
+import { sortByClinicalAttributePriorityThenName } from '../../../shared/lib/SortUtils';
+import { isUrl } from 'cbioportal-frontend-commons';
 
 interface IClinicalInformationSamplesTableProps {
     samples?: ClinicalDataBySampleId[];
 }
 
 export interface ISampleRow {
-    attribute:string;
-    [key:string]:string|number|ClinicalAttribute;
+    attribute: string;
+    [key: string]: string | number | ClinicalAttribute;
 }
 
-class SampleTableComponent extends LazyMobXTable<ISampleRow> {
-}
-
-export default class ClinicalInformationSamplesTable extends React.Component<IClinicalInformationSamplesTableProps, {}> {
+class SampleTableComponent extends LazyMobXTable<ISampleRow> {}
 
+export default class ClinicalInformationSamplesTable extends React.Component<
+    IClinicalInformationSamplesTableProps,
+    {}
+> {
     public render() {
         const sampleInvertedData = convertSamplesData(this.props.samples);
         const tableData = this.prepareData(sampleInvertedData);
-        const columns:Column<ISampleRow>[] = [{id: 'attribute'}, ...sampleInvertedData.columns].map((col) =>  (
-            {
-                name: col.id,
-                render: (data: ISampleRow) => {
-                    if (isUrl(data[col.id] as any)) {
-                        return <a href={data[col.id] as any} target="_blank">{data[col.id]}</a>
-                    }
-                    return <span>{data[col.id]}</span>
-                },
-                download: (data:ISampleRow) => `${data[col.id]}`,
-                filter: (data:ISampleRow, filterString:string, filterStringUpper:string) =>
-                    (data[col.id].toString().toUpperCase().indexOf(filterStringUpper) > -1)
-            }
-        ));
-        columns[0].sortBy = (data)=>data.attribute;
-        return <SampleTableComponent
-                    columns={columns}
-                    data={tableData}
-                    className={styles.sampleTable}
-                    showPagination={false}
-                    initialItemsPerPage={SHOW_ALL_PAGE_SIZE}
-                    showColumnVisibility={false}
-                />;
+        const columns: Column<ISampleRow>[] = [
+            { id: 'attribute' },
+            ...sampleInvertedData.columns,
+        ].map(col => ({
+            name: col.id,
+            render: (data: ISampleRow) => {
+                if (isUrl(data[col.id] as any)) {
+                    return (
+                        <a href={data[col.id] as any} target="_blank">
+                            {data[col.id]}
+                        </a>
+                    );
+                }
+                return <span>{data[col.id]}</span>;
+            },
+            download: (data: ISampleRow) => `${data[col.id]}`,
+            filter: (
+                data: ISampleRow,
+                filterString: string,
+                filterStringUpper: string
+            ) =>
+                data[col.id]
+                    .toString()
+                    .toUpperCase()
+                    .indexOf(filterStringUpper) > -1,
+        }));
+        columns[0].sortBy = data => data.attribute;
+        return (
+            <SampleTableComponent
+                columns={columns}
+                data={tableData}
+                className={styles.sampleTable}
+                showPagination={false}
+                initialItemsPerPage={SHOW_ALL_PAGE_SIZE}
+                showColumnVisibility={false}
+            />
+        );
     }
 
     public prepareData(sampleInvertedData: IConvertedSamplesData) {
-
         const tableData: ISampleRow[] = [];
 
-        _.each(_.values(sampleInvertedData.items).sort((a: any, b: any) => {
-            return sortByClinicalAttributePriorityThenName(a.clinicalAttribute, b.clinicalAttribute);
-        }), rowData => {
-            const row: ISampleRow = {attribute: rowData.clinicalAttribute.displayName};
+        _.each(
+            _.values(sampleInvertedData.items).sort((a: any, b: any) => {
+                return sortByClinicalAttributePriorityThenName(
+                    a.clinicalAttribute,
+                    b.clinicalAttribute
+                );
+            }),
+            rowData => {
+                const row: ISampleRow = {
+                    attribute: rowData.clinicalAttribute.displayName,
+                };
 
-            sampleInvertedData.columns.map((col) => {
-                if (col.id in rowData)
-                    row[col.id] = rowData[col.id];
-                else
-                    row[col.id] = 'n/a';
-            });
+                sampleInvertedData.columns.map(col => {
+                    if (col.id in rowData) row[col.id] = rowData[col.id];
+                    else row[col.id] = 'n/a';
+                });
 
-            tableData.push(row);
-        });
+                tableData.push(row);
+            }
+        );
 
         return tableData;
     }
diff --git a/src/pages/patientView/clinicalInformation/CopyNumberCountCache.ts b/src/pages/patientView/clinicalInformation/CopyNumberCountCache.ts
index fe938ffc8c6..4a4796bf71d 100644
--- a/src/pages/patientView/clinicalInformation/CopyNumberCountCache.ts
+++ b/src/pages/patientView/clinicalInformation/CopyNumberCountCache.ts
@@ -1,19 +1,27 @@
-import LazyMobXCache from "../../../shared/lib/LazyMobXCache";
-import {CopyNumberCount, CopyNumberCountIdentifier} from "shared/api/generated/CBioPortalAPI";
-import client from "shared/api/cbioportalClientInstance";
+import LazyMobXCache from '../../../shared/lib/LazyMobXCache';
+import {
+    CopyNumberCount,
+    CopyNumberCountIdentifier,
+} from 'shared/api/generated/CBioPortalAPI';
+import client from 'shared/api/cbioportalClientInstance';
 
-function getKey<T extends { entrezGeneId: number, alteration: number}>(obj:T):string {
-    return obj.entrezGeneId + "~" + obj.alteration;
+function getKey<T extends { entrezGeneId: number; alteration: number }>(
+    obj: T
+): string {
+    return obj.entrezGeneId + '~' + obj.alteration;
 }
 
-function fetch(queries:CopyNumberCountIdentifier[], molecularProfileIdDiscrete:string|undefined):Promise<CopyNumberCount[]> {
+function fetch(
+    queries: CopyNumberCountIdentifier[],
+    molecularProfileIdDiscrete: string | undefined
+): Promise<CopyNumberCount[]> {
     if (!molecularProfileIdDiscrete) {
-        return Promise.reject("No discrete CNA molecular profile id given");
+        return Promise.reject('No discrete CNA molecular profile id given');
     } else {
         if (queries.length) {
             return client.fetchCopyNumberCountsUsingPOST({
                 molecularProfileId: molecularProfileIdDiscrete,
-                copyNumberCountIdentifiers: queries
+                copyNumberCountIdentifiers: queries,
             });
         } else {
             return Promise.resolve([]);
@@ -21,9 +29,11 @@ function fetch(queries:CopyNumberCountIdentifier[], molecularProfileIdDiscrete:s
     }
 }
 
-export default class CopyNumberCountCache extends LazyMobXCache<CopyNumberCount, CopyNumberCountIdentifier> {
-    constructor(molecularProfileIdDiscrete:string|undefined) {
-        super(getKey, getKey,
-            fetch, molecularProfileIdDiscrete);
+export default class CopyNumberCountCache extends LazyMobXCache<
+    CopyNumberCount,
+    CopyNumberCountIdentifier
+> {
+    constructor(molecularProfileIdDiscrete: string | undefined) {
+        super(getKey, getKey, fetch, molecularProfileIdDiscrete);
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/patientView/clinicalInformation/PDXTree.jsx b/src/pages/patientView/clinicalInformation/PDXTree.jsx
index 00018e9deca..7b0c484b708 100644
--- a/src/pages/patientView/clinicalInformation/PDXTree.jsx
+++ b/src/pages/patientView/clinicalInformation/PDXTree.jsx
@@ -2,33 +2,57 @@ import React from 'react';
 import SampleLabelSVG from '../../../shared/components/sampleLabel/SampleLabel';
 
 export default class PDXTree extends React.Component {
-
     /*
      * Recursive function to draw SVG Tree
      */
     renderNode(node, width, yDistance, x, y, level) {
         if (node.children) {
-            return (<g key={node.name}>
-                <SampleLabelSVG x={x} y={y} color={'black'} label={node.label} />
-                {node.children.map((n, i) => {
-                    const newX = x - (width / 2) + (i + 0.5) * (width / node.children.length);
-                    const newY = (level + 1) * yDistance;
+            return (
+                <g key={node.name}>
+                    <SampleLabelSVG
+                        x={x}
+                        y={y}
+                        color={'black'}
+                        label={node.label}
+                    />
+                    {node.children.map((n, i) => {
+                        const newX =
+                            x -
+                            width / 2 +
+                            (i + 0.5) * (width / node.children.length);
+                        const newY = (level + 1) * yDistance;
 
-                    return ([<path d={`M${x},${y + 10} C${x},${y + 10} ${newX},${newY + 10} ${newX},${newY - 10}`}
-                      fill={'none'} stroke={'red'}
-                    />,
-                        this.renderNode(n,
-                            width / node.children.length,
-                            yDistance,
-                            newX,
-                            newY,
-                            level + 1)]);
-                })}
-            </g>);
+                        return [
+                            <path
+                                d={`M${x},${y + 10} C${x},${y +
+                                    10} ${newX},${newY + 10} ${newX},${newY -
+                                    10}`}
+                                fill={'none'}
+                                stroke={'red'}
+                            />,
+                            this.renderNode(
+                                n,
+                                width / node.children.length,
+                                yDistance,
+                                newX,
+                                newY,
+                                level + 1
+                            ),
+                        ];
+                    })}
+                </g>
+            );
         } else {
-            return (<g key={node.name}>
-                <SampleLabelSVG x={x} y={y} color={'black'} label={node.label} />
-            </g>);
+            return (
+                <g key={node.name}>
+                    <SampleLabelSVG
+                        x={x}
+                        y={y}
+                        color={'black'}
+                        label={node.label}
+                    />
+                </g>
+            );
         }
     }
 
@@ -38,26 +62,34 @@ export default class PDXTree extends React.Component {
         const nodes = data;
 
         if (nodes.children) {
-            const maxDepth = Math.max(...nodes.children.map((n, i) => {
-                let depth = 0;
-                const curN = n;
+            const maxDepth = Math.max(
+                ...nodes.children.map((n, i) => {
+                    let depth = 0;
+                    const curN = n;
 
-                while (n) {
-                    n = n.children;
-                    depth += 1;
-                }
-                return depth;
-            }));
+                    while (n) {
+                        n = n.children;
+                        depth += 1;
+                    }
+                    return depth;
+                })
+            );
 
             return (
                 <svg width={width} height={height}>
-                    {this.renderNode(nodes, width, (height - 15) / (maxDepth + 1), width / 2, 15, 0, 0)}
+                    {this.renderNode(
+                        nodes,
+                        width,
+                        (height - 15) / (maxDepth + 1),
+                        width / 2,
+                        15,
+                        0,
+                        0
+                    )}
                 </svg>
             );
         } else {
-            return (
-                <svg width={width} height={height} />
-            );
+            return <svg width={width} height={height} />;
         }
     }
 }
@@ -87,7 +119,7 @@ export function getTreeNodesFromClinicalData(clinicalDataMap, sampleOrder) {
     sampleOrder.map((n, i) => {
         clinicalDataMapExtended[n].label = i + 1;
     });
-    const roots = Object.keys(clinicalDataMapExtended).filter((sample) => {
+    const roots = Object.keys(clinicalDataMapExtended).filter(sample => {
         return !clinicalDataMapExtended[sample].PDX_PARENT;
     });
 
@@ -95,25 +127,25 @@ export function getTreeNodesFromClinicalData(clinicalDataMap, sampleOrder) {
      * Recursive function to make a tree from root node using clinicalData
      */
     const getNode = (clinicalDataMapExtended, sampleName) => {
-        const children = Object.keys(clinicalDataMapExtended).filter((sample) => {
+        const children = Object.keys(clinicalDataMapExtended).filter(sample => {
             return clinicalDataMapExtended[sample].PDX_PARENT === sampleName;
         });
         if (children.length === 0) {
             return {
-                'name': sampleName,
-                'label': clinicalDataMapExtended[sampleName].label.toString(),
+                name: sampleName,
+                label: clinicalDataMapExtended[sampleName].label.toString(),
             };
         } else {
             return {
-                'name': sampleName,
-                'label': clinicalDataMapExtended[sampleName].label.toString(),
-                'children': children.map((c) => {
+                name: sampleName,
+                label: clinicalDataMapExtended[sampleName].label.toString(),
+                children: children.map(c => {
                     return getNode(clinicalDataMapExtended, c);
                 }),
             };
         }
     };
-    const trees = roots.map((n) => {
+    const trees = roots.map(n => {
         return getNode(clinicalDataMapExtended, n);
     });
 
diff --git a/src/pages/patientView/clinicalInformation/PatientViewPageStore.spec.ts b/src/pages/patientView/clinicalInformation/PatientViewPageStore.spec.ts
index 335454203f9..39a49363ce4 100644
--- a/src/pages/patientView/clinicalInformation/PatientViewPageStore.spec.ts
+++ b/src/pages/patientView/clinicalInformation/PatientViewPageStore.spec.ts
@@ -1,7 +1,10 @@
 /**
  * Created by aaronlisman on 3/2/17.
  */
-import { handlePathologyReportCheckResponse, PatientViewPageStore } from './PatientViewPageStore';
+import {
+    handlePathologyReportCheckResponse,
+    PatientViewPageStore,
+} from './PatientViewPageStore';
 import { assert } from 'chai';
 // import { shallow, mount } from 'enzyme';
 import sinon from 'sinon';
@@ -12,37 +15,34 @@ import { AppStore } from 'AppStore';
 // import request from 'superagent';
 
 describe('PatientViewPageStore', () => {
-
     let store: PatientViewPageStore;
 
-    before(()=>{
+    before(() => {
         store = new PatientViewPageStore(new AppStore());
     });
 
-    it('if there are pdf items in response and their name starts with a given patientId, return collection, otherwise returns empty array', ()=>{
+    it('if there are pdf items in response and their name starts with a given patientId, return collection, otherwise returns empty array', () => {
         let result = handlePathologyReportCheckResponse('some', {
-            total_count:1,
-            items:[ { url:'someUrl', name:'someName' } ]
+            total_count: 1,
+            items: [{ url: 'someUrl', name: 'someName' }],
         });
-        assert.deepEqual(result,[{ url: 'someUrl' , name: 'someName'}]);
+        assert.deepEqual(result, [{ url: 'someUrl', name: 'someName' }]);
 
         result = handlePathologyReportCheckResponse('some', {
-            total_count:0,
+            total_count: 0,
         });
-        assert.deepEqual(result,[]);
+        assert.deepEqual(result, []);
     });
 
-    it('if there are pdf items in response and their name starts with the wrong patientId, return empty array', ()=>{
+    it('if there are pdf items in response and their name starts with the wrong patientId, return empty array', () => {
         let result = handlePathologyReportCheckResponse('xxx', {
-            total_count:1,
-            items:[ { url:'someUrl', name:'someName' } ]
+            total_count: 1,
+            items: [{ url: 'someUrl', name: 'someName' }],
         });
-        assert.deepEqual(result,[]);
+        assert.deepEqual(result, []);
     });
 
-
-    it('sets page title to patient if theres a patient id and sample if sample id, patient id winning out', ()=>{
-
+    it('sets page title to patient if theres a patient id and sample if sample id, patient id winning out', () => {
         assert.equal(store.pageTitle, 'Patient: ');
 
         store.setPatientId('1234');
@@ -53,7 +53,5 @@ describe('PatientViewPageStore', () => {
 
         store.setPatientId('1234');
         assert.equal(store.pageTitle, 'Patient: 1234');
-
     });
-
 });
diff --git a/src/pages/patientView/clinicalInformation/PatientViewPageStore.ts b/src/pages/patientView/clinicalInformation/PatientViewPageStore.ts
index 9cf2b5e6b78..cffad401c98 100644
--- a/src/pages/patientView/clinicalInformation/PatientViewPageStore.ts
+++ b/src/pages/patientView/clinicalInformation/PatientViewPageStore.ts
@@ -1,38 +1,46 @@
 import * as _ from 'lodash';
 import {
-    ClinicalData, MolecularProfile, Sample, Mutation, DiscreteCopyNumberFilter, DiscreteCopyNumberData, MutationFilter,
-    CopyNumberCount, ClinicalDataMultiStudyFilter, SampleMolecularIdentifier, GenePanelData, GenePanel,
-    ReferenceGenomeGene
-} from "../../../shared/api/generated/CBioPortalAPI";
-import client from "../../../shared/api/cbioportalClientInstance";
-import internalClient from "../../../shared/api/cbioportalInternalClientInstance";
-import {
-    default as CBioPortalAPIInternal
-} from "shared/api/generated/CBioPortalAPIInternal";
-import {computed, observable, action, runInAction} from "mobx";
-import {remoteData} from "cbioportal-frontend-commons";
-import {IGisticData} from "shared/model/Gistic";
-import {labelMobxPromises, cached} from "mobxpromise";
+    ClinicalData,
+    MolecularProfile,
+    Sample,
+    Mutation,
+    DiscreteCopyNumberFilter,
+    DiscreteCopyNumberData,
+    MutationFilter,
+    CopyNumberCount,
+    ClinicalDataMultiStudyFilter,
+    SampleMolecularIdentifier,
+    GenePanelData,
+    GenePanel,
+    ReferenceGenomeGene,
+} from '../../../shared/api/generated/CBioPortalAPI';
+import client from '../../../shared/api/cbioportalClientInstance';
+import internalClient from '../../../shared/api/cbioportalInternalClientInstance';
+import { default as CBioPortalAPIInternal } from 'shared/api/generated/CBioPortalAPIInternal';
+import { computed, observable, action, runInAction } from 'mobx';
+import { remoteData } from 'cbioportal-frontend-commons';
+import { IGisticData } from 'shared/model/Gistic';
+import { labelMobxPromises, cached } from 'mobxpromise';
 import MrnaExprRankCache from 'shared/cache/MrnaExprRankCache';
 import request from 'superagent';
-import DiscreteCNACache from "shared/cache/DiscreteCNACache";
+import DiscreteCNACache from 'shared/cache/DiscreteCNACache';
 import {
     getDarwinUrl,
-    getDigitalSlideArchiveMetaUrl
-} from "../../../shared/api/urls";
-import OncoKbEvidenceCache from "shared/cache/OncoKbEvidenceCache";
-import PubMedCache from "shared/cache/PubMedCache";
-import GenomeNexusCache from "shared/cache/GenomeNexusCache";
-import GenomeNexusMyVariantInfoCache from "shared/cache/GenomeNexusMyVariantInfoCache";
-import {IOncoKbData} from "shared/model/OncoKB";
-import {IHotspotIndex, indexHotspotsData} from "react-mutation-mapper";
-import {ICivicVariant, ICivicGene} from "shared/model/Civic.ts";
-import {ClinicalInformationData} from "shared/model/ClinicalInformation";
-import VariantCountCache from "shared/cache/VariantCountCache";
-import CopyNumberCountCache from "./CopyNumberCountCache";
-import CancerTypeCache from "shared/cache/CancerTypeCache";
-import MutationCountCache from "shared/cache/MutationCountCache";
-import AppConfig from "appConfig";
+    getDigitalSlideArchiveMetaUrl,
+} from '../../../shared/api/urls';
+import OncoKbEvidenceCache from 'shared/cache/OncoKbEvidenceCache';
+import PubMedCache from 'shared/cache/PubMedCache';
+import GenomeNexusCache from 'shared/cache/GenomeNexusCache';
+import GenomeNexusMyVariantInfoCache from 'shared/cache/GenomeNexusMyVariantInfoCache';
+import { IOncoKbData } from 'shared/model/OncoKB';
+import { IHotspotIndex, indexHotspotsData } from 'react-mutation-mapper';
+import { ICivicVariant, ICivicGene } from 'shared/model/Civic.ts';
+import { ClinicalInformationData } from 'shared/model/ClinicalInformation';
+import VariantCountCache from 'shared/cache/VariantCountCache';
+import CopyNumberCountCache from './CopyNumberCountCache';
+import CancerTypeCache from 'shared/cache/CancerTypeCache';
+import MutationCountCache from 'shared/cache/MutationCountCache';
+import AppConfig from 'appConfig';
 import {
     findMolecularProfileIdDiscrete,
     ONCOKB_DEFAULT,
@@ -71,76 +79,104 @@ import {
     fetchReferenceGenomeGenes,
     fetchGenePanelData,
     fetchGenePanel,
-    noGenePanelUsed
-} from "shared/lib/StoreUtils";
-import {fetchHotspotsData} from "shared/lib/CancerHotspotsUtils";
+    noGenePanelUsed,
+} from 'shared/lib/StoreUtils';
+import { fetchHotspotsData } from 'shared/lib/CancerHotspotsUtils';
 import {
     CancerGene,
     getBrowserWindow,
     stringListToSet,
-    VariantAnnotation
-} from "cbioportal-frontend-commons";
-import {MutationTableDownloadDataFetcher} from "shared/lib/MutationTableDownloadDataFetcher";
-import {getNavCaseIdsCache} from "../../../shared/lib/handleLongUrls";
-import { fetchTrialsById, fetchTrialMatchesUsingPOST } from "../../../shared/api/MatchMinerAPI";
-import { IDetailedTrialMatch, ITrial, ITrialMatch, ITrialQuery } from "../../../shared/model/MatchMiner";
-import { groupTrialMatchesById } from "../trialMatch/TrialMatchTableUtils";
+    VariantAnnotation,
+} from 'cbioportal-frontend-commons';
+import { MutationTableDownloadDataFetcher } from 'shared/lib/MutationTableDownloadDataFetcher';
+import { getNavCaseIdsCache } from '../../../shared/lib/handleLongUrls';
+import {
+    fetchTrialsById,
+    fetchTrialMatchesUsingPOST,
+} from '../../../shared/api/MatchMinerAPI';
+import {
+    IDetailedTrialMatch,
+    ITrial,
+    ITrialMatch,
+    ITrialQuery,
+} from '../../../shared/model/MatchMiner';
+import { groupTrialMatchesById } from '../trialMatch/TrialMatchTableUtils';
 import { GeneFilterOption } from '../mutation/GeneFilterMenu';
 import TumorColumnFormatter from '../mutation/column/TumorColumnFormatter';
-import {computeGenePanelInformation, CoverageInformation} from "../../resultsView/ResultsViewPageStoreUtils";
-import {getVariantAlleleFrequency} from "../../../shared/lib/MutationUtils";
+import {
+    computeGenePanelInformation,
+    CoverageInformation,
+} from '../../resultsView/ResultsViewPageStoreUtils';
+import { getVariantAlleleFrequency } from '../../../shared/lib/MutationUtils';
 import { AppStore, SiteError } from 'AppStore';
 import { getGeneFilterDefault } from './PatientViewPageStoreUtil';
-import {checkNonProfiledGenesExist} from "../PatientViewPageUtils";
-
+import { checkNonProfiledGenesExist } from '../PatientViewPageUtils';
 
 type PageMode = 'patient' | 'sample';
 
 export async function checkForTissueImage(patientId: string): Promise<boolean> {
-
     if (/TCGA/.test(patientId) === false) {
         return false;
     } else {
-
         let resp = await request.get(getDigitalSlideArchiveMetaUrl(patientId));
 
         // if the count is greater than 0, there is a slide for this patient
-        return resp.body && resp.body.total_count && resp.body.total_count > 0
+        return resp.body && resp.body.total_count && resp.body.total_count > 0;
     }
-
 }
 
 export type PathologyReportPDF = {
-
     name: string;
     url: string;
+};
 
-}
-
-export function parseCohortIds(concatenatedIds:string){
-    return concatenatedIds.split(',').map((entityId:string)=>{
-        return entityId.includes(':') ? entityId : this.studyId + ':' + entityId;
+export function parseCohortIds(concatenatedIds: string) {
+    return concatenatedIds.split(',').map((entityId: string) => {
+        return entityId.includes(':')
+            ? entityId
+            : this.studyId + ':' + entityId;
     });
 }
 
-export function handlePathologyReportCheckResponse(patientId: string, resp: any): PathologyReportPDF[] {
-
+export function handlePathologyReportCheckResponse(
+    patientId: string,
+    resp: any
+): PathologyReportPDF[] {
     if (resp.total_count > 0) {
         // only use pdfs starting with the patient id to prevent mismatches
-        const r = new RegExp("^" + patientId);
-        const filteredItems:any = _.filter(resp.items, (item: any) => r.test(item.name));
-        return _.map(filteredItems, (item: any) => ( {url: item.url, name: item.name} ));
+        const r = new RegExp('^' + patientId);
+        const filteredItems: any = _.filter(resp.items, (item: any) =>
+            r.test(item.name)
+        );
+        return _.map(filteredItems, (item: any) => ({
+            url: item.url,
+            name: item.name,
+        }));
     } else {
         return [];
     }
-
 }
 
-export function filterMutationsByProfiledGene(mutationRows:Mutation[][], sampleIds:string[], sampleToGenePanelId:{[sampleId:string]:string}, genePanelIdToEntrezGeneIds:{[sampleId:string]:number[]}):Mutation[][] {
-    return _.filter(mutationRows,(mutations:Mutation[]) => {
+export function filterMutationsByProfiledGene(
+    mutationRows: Mutation[][],
+    sampleIds: string[],
+    sampleToGenePanelId: { [sampleId: string]: string },
+    genePanelIdToEntrezGeneIds: { [sampleId: string]: number[] }
+): Mutation[][] {
+    return _.filter(mutationRows, (mutations: Mutation[]) => {
         const entrezGeneId = mutations[0].gene.entrezGeneId;
-        const geneProfiledInSamples = TumorColumnFormatter.getProfiledSamplesForGene(entrezGeneId, sampleIds, sampleToGenePanelId, genePanelIdToEntrezGeneIds);
-        return _(geneProfiledInSamples).values().filter((profiled:boolean) => profiled).value().length === sampleIds.length;
+        const geneProfiledInSamples = TumorColumnFormatter.getProfiledSamplesForGene(
+            entrezGeneId,
+            sampleIds,
+            sampleToGenePanelId,
+            genePanelIdToEntrezGeneIds
+        );
+        return (
+            _(geneProfiledInSamples)
+                .values()
+                .filter((profiled: boolean) => profiled)
+                .value().length === sampleIds.length
+        );
     });
 }
 
@@ -148,22 +184,27 @@ export function filterMutationsByProfiledGene(mutationRows:Mutation[][], sampleI
  * Transform clinical data from API to clinical data shape as it will be stored
  * in the store
  */
-function transformClinicalInformationToStoreShape(patientId: string, studyId: string, sampleIds: Array<string>, clinicalDataPatient: Array<ClinicalData>, clinicalDataSample: Array<ClinicalData>): ClinicalInformationData {
+function transformClinicalInformationToStoreShape(
+    patientId: string,
+    studyId: string,
+    sampleIds: Array<string>,
+    clinicalDataPatient: Array<ClinicalData>,
+    clinicalDataSample: Array<ClinicalData>
+): ClinicalInformationData {
     const patient = {
         id: patientId,
-        clinicalData: clinicalDataPatient
+        clinicalData: clinicalDataPatient,
     };
     const samples = groupBySampleId(sampleIds, clinicalDataSample);
     const rv = {
         patient,
-        samples
+        samples,
     };
 
     return rv;
 }
 
 export class PatientViewPageStore {
-
     constructor(private appStore: AppStore) {
         labelMobxPromises(this);
         this.internalClient = internalClient;
@@ -175,8 +216,7 @@ export class PatientViewPageStore {
 
     @observable private _patientId = '';
     @computed get patientId(): string {
-        if (this._patientId)
-            return this._patientId;
+        if (this._patientId) return this._patientId;
 
         return this.derivedPatientId.result;
     }
@@ -189,24 +229,29 @@ export class PatientViewPageStore {
 
     @observable _sampleId = '';
 
-    @observable public mutationTableGeneFilterOption:GeneFilterOption = getGeneFilterDefault(getBrowserWindow().frontendConfig);
-    @observable public copyNumberTableGeneFilterOption:GeneFilterOption = getGeneFilterDefault(getBrowserWindow().frontendConfig);
+    @observable
+    public mutationTableGeneFilterOption: GeneFilterOption = getGeneFilterDefault(
+        getBrowserWindow().frontendConfig
+    );
+    @observable
+    public copyNumberTableGeneFilterOption: GeneFilterOption = getGeneFilterDefault(
+        getBrowserWindow().frontendConfig
+    );
 
     @computed get sampleId() {
         return this._sampleId;
     }
 
     @computed get pageTitle(): string {
-            if (this.pageMode === 'patient') {
-                return `Patient: ${this.patientId}`
-            } else {
-                return `Sample: ${this.sampleId}`
-            }
+        if (this.pageMode === 'patient') {
+            return `Patient: ${this.patientId}`;
+        } else {
+            return `Sample: ${this.sampleId}`;
+        }
     }
 
     @computed get metaDescription(): string {
-        const id = ((this.pageMode === "patient") ?
-            this.patientId : this.sampleId);
+        const id = this.pageMode === 'patient' ? this.patientId : this.sampleId;
         return `${id} from ${this.studyMetaData.result!.name}`;
     }
 
@@ -214,45 +259,50 @@ export class PatientViewPageStore {
         return this._sampleId ? 'sample' : 'patient';
     }
 
-    @computed get caseId():string {
+    @computed get caseId(): string {
         return this.pageMode === 'sample' ? this.sampleId : this.patientId;
     }
 
     readonly mutationMolecularProfile = remoteData({
-        await: () => [
-            this.molecularProfilesInStudy
-        ],
-        invoke: async() => findMutationMolecularProfile(this.molecularProfilesInStudy, this.studyId)
+        await: () => [this.molecularProfilesInStudy],
+        invoke: async () =>
+            findMutationMolecularProfile(
+                this.molecularProfilesInStudy,
+                this.studyId
+            ),
     });
 
     readonly mutationMolecularProfileId = remoteData({
-        await: () => [
-            this.molecularProfilesInStudy
-        ],
-        invoke: async() => {
-            const profile = findMutationMolecularProfile(this.molecularProfilesInStudy, this.studyId);
+        await: () => [this.molecularProfilesInStudy],
+        invoke: async () => {
+            const profile = findMutationMolecularProfile(
+                this.molecularProfilesInStudy,
+                this.studyId
+            );
             if (profile) {
                 return profile.molecularProfileId;
             } else {
                 return undefined;
             }
-        }
+        },
     });
 
     readonly uncalledMutationMolecularProfileId = remoteData({
-        await: () => [
-            this.molecularProfilesInStudy
-        ],
-        invoke: async() => findUncalledMutationMolecularProfileId(this.molecularProfilesInStudy, this.studyId)
+        await: () => [this.molecularProfilesInStudy],
+        invoke: async () =>
+            findUncalledMutationMolecularProfileId(
+                this.molecularProfilesInStudy,
+                this.studyId
+            ),
     });
 
     // this is a string of concatenated ids
     @observable
-    private _patientIdsInCohort:string[] = [];
+    private _patientIdsInCohort: string[] = [];
 
-    public set patientIdsInCohort(cohortIds:string[]){
+    public set patientIdsInCohort(cohortIds: string[]) {
         // cannot put action on setter
-        runInAction(()=>this._patientIdsInCohort = cohortIds);
+        runInAction(() => (this._patientIdsInCohort = cohortIds));
     }
 
     @computed
@@ -260,7 +310,7 @@ export class PatientViewPageStore {
         let concatenatedIds: string;
         // check to see if we copied from url hash on app load
         const memoryCachedIds = getNavCaseIdsCache();
-        return (memoryCachedIds) ? memoryCachedIds : this._patientIdsInCohort;
+        return memoryCachedIds ? memoryCachedIds : this._patientIdsInCohort;
     }
 
     @computed get myCancerGenomeData() {
@@ -268,40 +318,50 @@ export class PatientViewPageStore {
     }
 
     readonly mutationalSignatureData = remoteData({
-        invoke: async() => fetchMutationalSignatureData()
+        invoke: async () => fetchMutationalSignatureData(),
     });
 
     readonly mutationalSignatureMetaData = remoteData({
-        invoke: async() => fetchMutationalSignatureMetaData()
+        invoke: async () => fetchMutationalSignatureMetaData(),
     });
 
     readonly hasMutationalSignatureData = remoteData({
-        invoke: async() => false,
-        default: false
+        invoke: async () => false,
+        default: false,
     });
 
     readonly derivedPatientId = remoteData<string>({
         await: () => [this.samples],
-        invoke: async() => {
-            for (let sample of this.samples.result)
-                return sample.patientId;
+        invoke: async () => {
+            for (let sample of this.samples.result) return sample.patientId;
             return '';
         },
-        default: ''
+        default: '',
     });
 
     readonly clinicalDataPatient = remoteData({
-        await: () => this.pageMode === 'patient' ? [] : [this.derivedPatientId],
-        invoke: async() => fetchClinicalDataForPatient(this.studyId, this.patientId),
-        default: []
+        await: () =>
+            this.pageMode === 'patient' ? [] : [this.derivedPatientId],
+        invoke: async () =>
+            fetchClinicalDataForPatient(this.studyId, this.patientId),
+        default: [],
     });
 
     readonly samples = remoteData(
         {
-            invoke:  () => fetchSamplesForPatient(this.studyId, this._patientId, this.sampleId),
+            invoke: () =>
+                fetchSamplesForPatient(
+                    this.studyId,
+                    this._patientId,
+                    this.sampleId
+                ),
             onError: (err: Error) => {
-                this.appStore.siteErrors.push({errorObj: err, dismissed: false, title:"Samples / Patients not valid"} as SiteError);
-            }
+                this.appStore.siteErrors.push({
+                    errorObj: err,
+                    dismissed: false,
+                    title: 'Samples / Patients not valid',
+                } as SiteError);
+            },
         },
         []
     );
@@ -309,298 +369,395 @@ export class PatientViewPageStore {
     // use this when pageMode === 'sample' to get total nr of samples for the
     // patient
     readonly allSamplesForPatient = remoteData({
-            await: () => [this.derivedPatientId],
-            invoke: async() => {
-                return await client.getAllSamplesOfPatientInStudyUsingGET({
-                    studyId: this.studyId,
-                    patientId: this.derivedPatientId.result,
-                    projection: 'DETAILED'
-                });
-            },
-            default: []
+        await: () => [this.derivedPatientId],
+        invoke: async () => {
+            return await client.getAllSamplesOfPatientInStudyUsingGET({
+                studyId: this.studyId,
+                patientId: this.derivedPatientId.result,
+                projection: 'DETAILED',
+            });
+        },
+        default: [],
     });
 
-    readonly samplesWithoutCancerTypeClinicalData = remoteData({
-        await: () => [
-            this.samples,
-            this.clinicalDataForSamples
-        ],
-        invoke: async () => findSamplesWithoutCancerTypeClinicalData(this.samples, this.clinicalDataForSamples)
-    }, []);
+    readonly samplesWithoutCancerTypeClinicalData = remoteData(
+        {
+            await: () => [this.samples, this.clinicalDataForSamples],
+            invoke: async () =>
+                findSamplesWithoutCancerTypeClinicalData(
+                    this.samples,
+                    this.clinicalDataForSamples
+                ),
+        },
+        []
+    );
 
-    readonly studiesForSamplesWithoutCancerTypeClinicalData = remoteData({
-        await: () => [
-            this.samplesWithoutCancerTypeClinicalData
-        ],
-        invoke: async () => fetchStudiesForSamplesWithoutCancerTypeClinicalData(this.samplesWithoutCancerTypeClinicalData)
-    }, []);
+    readonly studiesForSamplesWithoutCancerTypeClinicalData = remoteData(
+        {
+            await: () => [this.samplesWithoutCancerTypeClinicalData],
+            invoke: async () =>
+                fetchStudiesForSamplesWithoutCancerTypeClinicalData(
+                    this.samplesWithoutCancerTypeClinicalData
+                ),
+        },
+        []
+    );
 
-    readonly studies = remoteData({
-        invoke: async()=>([await client.getStudyUsingGET({studyId: this.studyId})])
-    }, []);
+    readonly studies = remoteData(
+        {
+            invoke: async () => [
+                await client.getStudyUsingGET({ studyId: this.studyId }),
+            ],
+        },
+        []
+    );
 
-    readonly studyIdToStudy = remoteData({
-        await: ()=>[this.studies],
-        invoke:()=>Promise.resolve(_.keyBy(this.studies.result, x=>x.studyId))
-    }, {});
+    readonly studyIdToStudy = remoteData(
+        {
+            await: () => [this.studies],
+            invoke: () =>
+                Promise.resolve(_.keyBy(this.studies.result, x => x.studyId)),
+        },
+        {}
+    );
 
     @computed get studyToCancerType() {
         return makeStudyToCancerTypeMap(this.studies.result);
     }
 
-    readonly cnaSegments = remoteData({
-        await: () => [
-            this.samples
-        ],
-        invoke: () => fetchCopyNumberSegments(this.studyId, this.sampleIds)
-    }, []);
+    readonly cnaSegments = remoteData(
+        {
+            await: () => [this.samples],
+            invoke: () => fetchCopyNumberSegments(this.studyId, this.sampleIds),
+        },
+        []
+    );
 
-    readonly pathologyReport = remoteData({
-        await: () => [this.derivedPatientId],
-        invoke: () => {
-            // only check path report for tcga studies
-            if (this.studyId.toLowerCase().indexOf('tcga') > -1) {
-                const pathLinkUrl = "https://raw.githubusercontent.com/inodb/datahub/a0d36d77b242e32cda3175127de73805b028f595/tcga/pathology_reports/symlink_by_patient";
-                const rawPdfUrl = "https://github.com/inodb/datahub/raw/a0d36d77b242e32cda3175127de73805b028f595/tcga/pathology_reports";
-                const reports: PathologyReportPDF[] = [];
-
-                // keep checking if patient has more reports recursively
-                function getPathologyReport(patientId:string, i:number):any {
-                    return request.get(`${pathLinkUrl}/${patientId}.${i}`).then(function(resp){
-                            // add report
-                            let pdfName: string = resp.text.split('/')[1];
-                            reports.push({name: `${pdfName}`, url: `${rawPdfUrl}/${pdfName}`});
-                            // check if patient has more reports
-                            return getPathologyReport(patientId, i+1);
-                        }, () => reports);
-                }
+    readonly pathologyReport = remoteData(
+        {
+            await: () => [this.derivedPatientId],
+            invoke: () => {
+                // only check path report for tcga studies
+                if (this.studyId.toLowerCase().indexOf('tcga') > -1) {
+                    const pathLinkUrl =
+                        'https://raw.githubusercontent.com/inodb/datahub/a0d36d77b242e32cda3175127de73805b028f595/tcga/pathology_reports/symlink_by_patient';
+                    const rawPdfUrl =
+                        'https://github.com/inodb/datahub/raw/a0d36d77b242e32cda3175127de73805b028f595/tcga/pathology_reports';
+                    const reports: PathologyReportPDF[] = [];
+
+                    // keep checking if patient has more reports recursively
+                    function getPathologyReport(
+                        patientId: string,
+                        i: number
+                    ): any {
+                        return request
+                            .get(`${pathLinkUrl}/${patientId}.${i}`)
+                            .then(
+                                function(resp) {
+                                    // add report
+                                    let pdfName: string = resp.text.split(
+                                        '/'
+                                    )[1];
+                                    reports.push({
+                                        name: `${pdfName}`,
+                                        url: `${rawPdfUrl}/${pdfName}`,
+                                    });
+                                    // check if patient has more reports
+                                    return getPathologyReport(patientId, i + 1);
+                                },
+                                () => reports
+                            );
+                    }
 
-               return getPathologyReport(this.patientId, 0);
-            } else {
-                return Promise.resolve([]);
-            }
+                    return getPathologyReport(this.patientId, 0);
+                } else {
+                    return Promise.resolve([]);
+                }
+            },
+            onError: (err: Error) => {
+                // fail silently
+            },
         },
-        onError: (err: Error) => {
-            // fail silently
-        }
-
-    }, []);
+        []
+    );
 
     readonly cosmicData = remoteData({
-        await: () => [
-            this.mutationData,
-            this.uncalledMutationData
-        ],
-        invoke: () => fetchCosmicData(this.mutationData, this.uncalledMutationData)
+        await: () => [this.mutationData, this.uncalledMutationData],
+        invoke: () =>
+            fetchCosmicData(this.mutationData, this.uncalledMutationData),
     });
 
     readonly mutSigData = remoteData({
-        invoke: async () => fetchMutSigData(this.studyId)
+        invoke: async () => fetchMutSigData(this.studyId),
     });
 
     // Mutation annotation
     // genome nexus
-    readonly indexedVariantAnnotations = remoteData<{[genomicLocation: string]: VariantAnnotation} | undefined>({
-        await:()=>[
-            this.mutationData,
-            this.uncalledMutationData,
-        ],
-        invoke: async () => await fetchVariantAnnotationsIndexedByGenomicLocation(
-            concatMutationData(this.mutationData, this.uncalledMutationData),
-            ["annotation_summary", "hotspots"],
-            AppConfig.serverConfig.isoformOverrideSource),
-        onError: (err: Error) => {
-            // fail silently, leave the error handling responsibility to the data consumer
-        }
-    }, undefined);
+    readonly indexedVariantAnnotations = remoteData<
+        { [genomicLocation: string]: VariantAnnotation } | undefined
+    >(
+        {
+            await: () => [this.mutationData, this.uncalledMutationData],
+            invoke: async () =>
+                await fetchVariantAnnotationsIndexedByGenomicLocation(
+                    concatMutationData(
+                        this.mutationData,
+                        this.uncalledMutationData
+                    ),
+                    ['annotation_summary', 'hotspots'],
+                    AppConfig.serverConfig.isoformOverrideSource
+                ),
+            onError: (err: Error) => {
+                // fail silently, leave the error handling responsibility to the data consumer
+            },
+        },
+        undefined
+    );
 
     readonly hotspotData = remoteData({
-        await: ()=> [
-            this.mutationData,
-            this.uncalledMutationData,
-        ],
+        await: () => [this.mutationData, this.uncalledMutationData],
         invoke: async () => {
-            return fetchHotspotsData(this.mutationData, this.uncalledMutationData);
+            return fetchHotspotsData(
+                this.mutationData,
+                this.uncalledMutationData
+            );
         },
         onError: () => {
             // fail silently
-        }
+        },
     });
 
+    readonly clinicalDataForSamples = remoteData(
+        {
+            await: () => [this.samples],
+            invoke: () => {
+                const identifiers = this.sampleIds.map((sampleId: string) => ({
+                    entityId: sampleId,
+                    studyId: this.studyId,
+                }));
+                const clinicalDataMultiStudyFilter = {
+                    identifiers,
+                } as ClinicalDataMultiStudyFilter;
+                return fetchClinicalData(clinicalDataMultiStudyFilter);
+            },
+        },
+        []
+    );
 
-    readonly clinicalDataForSamples = remoteData({
-        await: () => [
-            this.samples
-        ],
-        invoke: () => {
-            const identifiers = this.sampleIds.map((sampleId: string) => ({
-                entityId: sampleId,
-                studyId: this.studyId
-            }));
-            const clinicalDataMultiStudyFilter = {identifiers} as ClinicalDataMultiStudyFilter;
-            return fetchClinicalData(clinicalDataMultiStudyFilter)
-        }
-    }, []);
-
-    readonly clinicalDataGroupedBySample = remoteData({
-        await: () => [this.clinicalDataForSamples],
-        invoke: async() => groupBySampleId(this.sampleIds, this.clinicalDataForSamples.result)
-    }, []);
+    readonly clinicalDataGroupedBySample = remoteData(
+        {
+            await: () => [this.clinicalDataForSamples],
+            invoke: async () =>
+                groupBySampleId(
+                    this.sampleIds,
+                    this.clinicalDataForSamples.result
+                ),
+        },
+        []
+    );
 
     readonly getWholeSlideViewerIds = remoteData({
         await: () => [this.clinicalDataGroupedBySample],
         invoke: () => {
             const clinicalData = this.clinicalDataGroupedBySample.result!;
-            const clinicalAttributeId = "MSK_SLIDE_ID";
+            const clinicalAttributeId = 'MSK_SLIDE_ID';
             if (clinicalData) {
                 const ids = _.chain(clinicalData)
-                .map((data) => data.clinicalData)
-                .flatten()
-                .filter((attribute) => {return attribute.clinicalAttributeId === clinicalAttributeId})
-                .map((attribute) => attribute.value)
-                .value();
+                    .map(data => data.clinicalData)
+                    .flatten()
+                    .filter(attribute => {
+                        return (
+                            attribute.clinicalAttributeId ===
+                            clinicalAttributeId
+                        );
+                    })
+                    .map(attribute => attribute.value)
+                    .value();
 
                 return Promise.resolve(ids);
             }
             return Promise.resolve([]);
-        }
+        },
     });
 
     readonly studyMetaData = remoteData({
-        invoke: async() => client.getStudyUsingGET({studyId: this.studyId})
+        invoke: async () => client.getStudyUsingGET({ studyId: this.studyId }),
     });
 
-    readonly patientViewData = remoteData<ClinicalInformationData>({
-        await: () => [
-            this.clinicalDataPatient,
-            this.clinicalDataForSamples,
-        ],
-        invoke: async() => transformClinicalInformationToStoreShape(
-            this.patientId,
-            this.studyId,
-            this.sampleIds,
-            this.clinicalDataPatient.result,
-            this.clinicalDataForSamples.result
-        )
-    }, {});
-
-    readonly sequencedSampleIdsInStudy = remoteData({
-        invoke: async () => {
-            return stringListToSet(await client.getAllSampleIdsInSampleListUsingGET({sampleListId:`${this.studyId}_sequenced`}));
+    readonly patientViewData = remoteData<ClinicalInformationData>(
+        {
+            await: () => [
+                this.clinicalDataPatient,
+                this.clinicalDataForSamples,
+            ],
+            invoke: async () =>
+                transformClinicalInformationToStoreShape(
+                    this.patientId,
+                    this.studyId,
+                    this.sampleIds,
+                    this.clinicalDataPatient.result,
+                    this.clinicalDataForSamples.result
+                ),
         },
-        onError: (err: Error) => {
-            // fail silently, leave the error handling responsibility to the data consumer
-        }
-    }, {});
+        {}
+    );
+
+    readonly sequencedSampleIdsInStudy = remoteData(
+        {
+            invoke: async () => {
+                return stringListToSet(
+                    await client.getAllSampleIdsInSampleListUsingGET({
+                        sampleListId: `${this.studyId}_sequenced`,
+                    })
+                );
+            },
+            onError: (err: Error) => {
+                // fail silently, leave the error handling responsibility to the data consumer
+            },
+        },
+        {}
+    );
 
     readonly molecularProfilesInStudy = remoteData(() => {
         return client.getAllMolecularProfilesInStudyUsingGET({
-            studyId: this.studyId
-        })
+            studyId: this.studyId,
+        });
     }, []);
 
-    readonly molecularProfileIdToMolecularProfile = remoteData<{[molecularProfileId:string]:MolecularProfile}>({
-        await:()=>[this.molecularProfilesInStudy],
-        invoke:()=>{
-            return Promise.resolve(this.molecularProfilesInStudy.result.reduce((map:{[molecularProfileId:string]:MolecularProfile}, next:MolecularProfile)=>{
-                map[next.molecularProfileId] = next;
-                return map;
-            }, {}));
-        }
-    }, {});
+    readonly molecularProfileIdToMolecularProfile = remoteData<{
+        [molecularProfileId: string]: MolecularProfile;
+    }>(
+        {
+            await: () => [this.molecularProfilesInStudy],
+            invoke: () => {
+                return Promise.resolve(
+                    this.molecularProfilesInStudy.result.reduce(
+                        (
+                            map: {
+                                [molecularProfileId: string]: MolecularProfile;
+                            },
+                            next: MolecularProfile
+                        ) => {
+                            map[next.molecularProfileId] = next;
+                            return map;
+                        },
+                        {}
+                    )
+                );
+            },
+        },
+        {}
+    );
 
     readonly referenceGenes = remoteData<ReferenceGenomeGene[]>({
-        await: ()=>[
-            this.studies,
-            this.discreteCNAData
-        ],
+        await: () => [this.studies, this.discreteCNAData],
         invoke: async () => {
-            return fetchReferenceGenomeGenes(this.studies.result[0].referenceGenome,
-                this.discreteCNAData.result.map(
-                    (d:DiscreteCopyNumberData)=>d.gene.hugoGeneSymbol.toUpperCase()));
+            return fetchReferenceGenomeGenes(
+                this.studies.result[0].referenceGenome,
+                this.discreteCNAData.result.map((d: DiscreteCopyNumberData) =>
+                    d.gene.hugoGeneSymbol.toUpperCase()
+                )
+            );
         },
-        onError:(err)=>{
+        onError: err => {
             // throwing this allows sentry to report it
-            throw(err);
-        }
+            throw err;
+        },
     });
 
-    public readonly mrnaRankMolecularProfileId = remoteData({
-        await: () => [
-            this.molecularProfilesInStudy
-        ],
-        invoke: async() => findMrnaRankMolecularProfileId(this.molecularProfilesInStudy)
-    }, null);
-
-    readonly discreteCNAData = remoteData({
-
-        await: () => [
-            this.molecularProfileIdDiscrete,
-            this.samples
-        ],
-        invoke: async() => {
-            const filter = {sampleIds: this.sampleIds} as DiscreteCopyNumberFilter;
-            return fetchDiscreteCNAData(filter, this.molecularProfileIdDiscrete);
+    public readonly mrnaRankMolecularProfileId = remoteData(
+        {
+            await: () => [this.molecularProfilesInStudy],
+            invoke: async () =>
+                findMrnaRankMolecularProfileId(this.molecularProfilesInStudy),
         },
-        onResult: (result:DiscreteCopyNumberData[])=>{
-            // We want to take advantage of this loaded data, and not redownload the same data
-            //  for users of the cache
-            this.discreteCNACache.addData(result);
-        }
+        null
+    );
 
-    }, []);
+    readonly discreteCNAData = remoteData(
+        {
+            await: () => [this.molecularProfileIdDiscrete, this.samples],
+            invoke: async () => {
+                const filter = {
+                    sampleIds: this.sampleIds,
+                } as DiscreteCopyNumberFilter;
+                return fetchDiscreteCNAData(
+                    filter,
+                    this.molecularProfileIdDiscrete
+                );
+            },
+            onResult: (result: DiscreteCopyNumberData[]) => {
+                // We want to take advantage of this loaded data, and not redownload the same data
+                //  for users of the cache
+                this.discreteCNACache.addData(result);
+            },
+        },
+        []
+    );
 
-    @computed get mergedDiscreteCNAData():DiscreteCopyNumberData[][] {
+    @computed get mergedDiscreteCNAData(): DiscreteCopyNumberData[][] {
         return mergeDiscreteCNAData(this.discreteCNAData);
     }
 
-    readonly gisticData = remoteData<IGisticData>({
-        invoke: async() => fetchGisticData(this.studyId)
-    }, {});
-
-    readonly clinicalEvents = remoteData({
-
-        await: () => [
-            this.patientViewData
-        ],
-        invoke: async() => {
-
-            return await client.getAllClinicalEventsOfPatientInStudyUsingGET({
-                studyId: this.studyId, patientId: this.patientId, projection: 'DETAILED'
-            })
-
-        }
+    readonly gisticData = remoteData<IGisticData>(
+        {
+            invoke: async () => fetchGisticData(this.studyId),
+        },
+        {}
+    );
 
-    }, []);
+    readonly clinicalEvents = remoteData(
+        {
+            await: () => [this.patientViewData],
+            invoke: async () => {
+                return await client.getAllClinicalEventsOfPatientInStudyUsingGET(
+                    {
+                        studyId: this.studyId,
+                        patientId: this.patientId,
+                        projection: 'DETAILED',
+                    }
+                );
+            },
+        },
+        []
+    );
 
     readonly molecularProfileIdDiscrete = remoteData({
-        await: () => [
-            this.molecularProfilesInStudy
-        ],
-        invoke: async() => {
-            return findMolecularProfileIdDiscrete(this.molecularProfilesInStudy);
-        }
+        await: () => [this.molecularProfilesInStudy],
+        invoke: async () => {
+            return findMolecularProfileIdDiscrete(
+                this.molecularProfilesInStudy
+            );
+        },
     });
 
-    readonly studyToMolecularProfileDiscrete = remoteData({
-        await: ()=>[this.molecularProfileIdDiscrete],
-        invoke:async ()=>{
-            // we just need it in this form for input to DiscreteCNACache
-            const ret:{[studyId:string]:MolecularProfile} = {};
-            if (this.molecularProfileIdDiscrete.result) {
-                ret[this.studyId] = await client.getMolecularProfileUsingGET({molecularProfileId:this.molecularProfileIdDiscrete.result});
-            }
-            return ret;
-        }
-    }, {});
+    readonly studyToMolecularProfileDiscrete = remoteData(
+        {
+            await: () => [this.molecularProfileIdDiscrete],
+            invoke: async () => {
+                // we just need it in this form for input to DiscreteCNACache
+                const ret: { [studyId: string]: MolecularProfile } = {};
+                if (this.molecularProfileIdDiscrete.result) {
+                    ret[
+                        this.studyId
+                    ] = await client.getMolecularProfileUsingGET({
+                        molecularProfileId: this.molecularProfileIdDiscrete
+                            .result,
+                    });
+                }
+                return ret;
+            },
+        },
+        {}
+    );
 
     readonly darwinUrl = remoteData({
-        await: () => [
-            this.derivedPatientId
-        ],
-        invoke: async() => {
+        await: () => [this.derivedPatientId],
+        invoke: async () => {
             if (AppConfig.serverConfig.enable_darwin === true) {
-                let resp = await request.get(getDarwinUrl(this.sampleIds, this.patientId));
+                let resp = await request.get(
+                    getDarwinUrl(this.sampleIds, this.patientId)
+                );
                 return resp.text;
             } else {
                 return '';
@@ -608,244 +765,336 @@ export class PatientViewPageStore {
         },
         onError: () => {
             // fail silently
-        }
+        },
     });
 
-
-    readonly hasTissueImageIFrameUrl = remoteData({
-        await: () => [
-            this.derivedPatientId
-        ],
-        invoke: async() => {
-
-            return checkForTissueImage(this.patientId);
-
+    readonly hasTissueImageIFrameUrl = remoteData(
+        {
+            await: () => [this.derivedPatientId],
+            invoke: async () => {
+                return checkForTissueImage(this.patientId);
+            },
+            onError: () => {
+                // fail silently
+            },
         },
-        onError: () => {
-            // fail silently
-        }
-    }, false);
-
-    readonly uncalledMutationData = remoteData({
-        await: () => [
-            this.samples,
-            this.uncalledMutationMolecularProfileId
-        ],
-        invoke: async() => {
-            const mutationFilter = {
-                sampleIds: this.samples.result.map((sample: Sample) => sample.sampleId)
-            } as MutationFilter;
+        false
+    );
 
-            return fetchMutationData(mutationFilter, this.uncalledMutationMolecularProfileId.result);
-        }
-    }, []);
+    readonly uncalledMutationData = remoteData(
+        {
+            await: () => [
+                this.samples,
+                this.uncalledMutationMolecularProfileId,
+            ],
+            invoke: async () => {
+                const mutationFilter = {
+                    sampleIds: this.samples.result.map(
+                        (sample: Sample) => sample.sampleId
+                    ),
+                } as MutationFilter;
+
+                return fetchMutationData(
+                    mutationFilter,
+                    this.uncalledMutationMolecularProfileId.result
+                );
+            },
+        },
+        []
+    );
 
-    readonly coverageInformation = remoteData<CoverageInformation>({
-        await:()=>[
-            this.mutatedGenes,
-            this.samples,
-            this.molecularProfilesInStudy
-        ],
-        invoke:async()=>{
-            // gather sample molecular identifiers
-            const sampleMolecularIdentifiers:SampleMolecularIdentifier[] = [];
-            this.samples.result!.forEach(sample=>{
-                const profiles = this.molecularProfilesInStudy.result!;
-                if (profiles) {
-                    const sampleId = sample.sampleId;
-                    for (const profile of profiles) {
-                        sampleMolecularIdentifiers.push({
-                            molecularProfileId: profile.molecularProfileId,
-                            sampleId
-                        });
+    readonly coverageInformation = remoteData<CoverageInformation>(
+        {
+            await: () => [
+                this.mutatedGenes,
+                this.samples,
+                this.molecularProfilesInStudy,
+            ],
+            invoke: async () => {
+                // gather sample molecular identifiers
+                const sampleMolecularIdentifiers: SampleMolecularIdentifier[] = [];
+                this.samples.result!.forEach(sample => {
+                    const profiles = this.molecularProfilesInStudy.result!;
+                    if (profiles) {
+                        const sampleId = sample.sampleId;
+                        for (const profile of profiles) {
+                            sampleMolecularIdentifiers.push({
+                                molecularProfileId: profile.molecularProfileId,
+                                sampleId,
+                            });
+                        }
                     }
-                }
-            });
-            // query for gene panel data using sample molecular identifiers
-            let genePanelData:GenePanelData[];
-            if (sampleMolecularIdentifiers.length && this.mutatedGenes.result!.length) {
-                genePanelData = await client.fetchGenePanelDataInMultipleMolecularProfilesUsingPOST({
-                    sampleMolecularIdentifiers
                 });
-            } else {
-                genePanelData = [];
-            }
-
-            // query for gene panel metadata
-            const genePanelIds = _.uniq(genePanelData.map(gpData=>gpData.genePanelId).filter(id=>!!id));
-            let genePanels:GenePanel[] = [];
-            if (genePanelIds.length) {
-                genePanels = await client.fetchGenePanelsUsingPOST({
-                    genePanelIds,
-                    projection:"DETAILED"
-                });
-            }
+                // query for gene panel data using sample molecular identifiers
+                let genePanelData: GenePanelData[];
+                if (
+                    sampleMolecularIdentifiers.length &&
+                    this.mutatedGenes.result!.length
+                ) {
+                    genePanelData = await client.fetchGenePanelDataInMultipleMolecularProfilesUsingPOST(
+                        {
+                            sampleMolecularIdentifiers,
+                        }
+                    );
+                } else {
+                    genePanelData = [];
+                }
 
-            // plug all data into computeGenePanelInformation to generate coverageInformation object
-            return computeGenePanelInformation(genePanelData, genePanels, this.samples.result!, [{ uniquePatientKey:this.samples.result![0].uniquePatientKey }], this.mutatedGenes.result!);
-        }
-    }, { samples: {}, patients: {} });
+                // query for gene panel metadata
+                const genePanelIds = _.uniq(
+                    genePanelData
+                        .map(gpData => gpData.genePanelId)
+                        .filter(id => !!id)
+                );
+                let genePanels: GenePanel[] = [];
+                if (genePanelIds.length) {
+                    genePanels = await client.fetchGenePanelsUsingPOST({
+                        genePanelIds,
+                        projection: 'DETAILED',
+                    });
+                }
 
-    readonly mutationData = remoteData({
-        await: () => [
-            this.samples,
-            this.mutationMolecularProfileId
-        ],
-        invoke: async() => {
-            const mutationFilter = {
-                sampleIds: this.sampleIds
-            } as MutationFilter;
+                // plug all data into computeGenePanelInformation to generate coverageInformation object
+                return computeGenePanelInformation(
+                    genePanelData,
+                    genePanels,
+                    this.samples.result!,
+                    [
+                        {
+                            uniquePatientKey: this.samples.result![0]
+                                .uniquePatientKey,
+                        },
+                    ],
+                    this.mutatedGenes.result!
+                );
+            },
+        },
+        { samples: {}, patients: {} }
+    );
 
-            return fetchMutationData(mutationFilter, this.mutationMolecularProfileId.result);
-        }
-    }, []);
+    readonly mutationData = remoteData(
+        {
+            await: () => [this.samples, this.mutationMolecularProfileId],
+            invoke: async () => {
+                const mutationFilter = {
+                    sampleIds: this.sampleIds,
+                } as MutationFilter;
+
+                return fetchMutationData(
+                    mutationFilter,
+                    this.mutationMolecularProfileId.result
+                );
+            },
+        },
+        []
+    );
 
     readonly mutatedGenes = remoteData({
-        await: ()=>[
-            this.mutationData
-        ],
-        invoke:()=>{
+        await: () => [this.mutationData],
+        invoke: () => {
             return Promise.resolve(
-                _.uniqBy(this.mutationData.result!, d=>d.entrezGeneId)
-                    .map(m=>({ hugoGeneSymbol:m.gene.hugoGeneSymbol, entrezGeneId: m.entrezGeneId }))
+                _.uniqBy(this.mutationData.result!, d => d.entrezGeneId).map(
+                    m => ({
+                        hugoGeneSymbol: m.gene.hugoGeneSymbol,
+                        entrezGeneId: m.entrezGeneId,
+                    })
+                )
             );
-        }
+        },
     });
 
-    readonly oncoKbCancerGenes = remoteData({
-        invoke: () => {
-            if (AppConfig.serverConfig.show_oncokb) {
-                return fetchOncoKbCancerGenes();
-            } else {
-                return Promise.resolve([]);
-            }
-        }
-    }, []);
+    readonly oncoKbCancerGenes = remoteData(
+        {
+            invoke: () => {
+                if (AppConfig.serverConfig.show_oncokb) {
+                    return fetchOncoKbCancerGenes();
+                } else {
+                    return Promise.resolve([]);
+                }
+            },
+        },
+        []
+    );
 
-    readonly oncoKbAnnotatedGenes = remoteData({
-        await: () => [this.oncoKbCancerGenes],
-        invoke: () => {
-            if (AppConfig.serverConfig.show_oncokb) {
-                return Promise.resolve(_.reduce(this.oncoKbCancerGenes.result, (map: { [entrezGeneId: number]: boolean }, next: CancerGene) => {
-                    if (next.oncokbAnnotated) {
-                        map[next.entrezGeneId] = true;
-                    }
-                    return map;
-                }, {}));
-            } else {
-                return Promise.resolve({});
-            }
-        }
-    }, {});
+    readonly oncoKbAnnotatedGenes = remoteData(
+        {
+            await: () => [this.oncoKbCancerGenes],
+            invoke: () => {
+                if (AppConfig.serverConfig.show_oncokb) {
+                    return Promise.resolve(
+                        _.reduce(
+                            this.oncoKbCancerGenes.result,
+                            (
+                                map: { [entrezGeneId: number]: boolean },
+                                next: CancerGene
+                            ) => {
+                                if (next.oncokbAnnotated) {
+                                    map[next.entrezGeneId] = true;
+                                }
+                                return map;
+                            },
+                            {}
+                        )
+                    );
+                } else {
+                    return Promise.resolve({});
+                }
+            },
+        },
+        {}
+    );
 
-    readonly oncoKbData = remoteData<IOncoKbData|Error>({
-        await: () => [
-            this.oncoKbAnnotatedGenes,
-            this.mutationData,
-            this.uncalledMutationData,
-            this.clinicalDataForSamples,
-            this.studiesForSamplesWithoutCancerTypeClinicalData,
-            this.studies
-        ],
-        invoke: () => {
-            if (AppConfig.serverConfig.show_oncokb) {
-                return fetchOncoKbData(this.uniqueSampleKeyToTumorType, this.oncoKbAnnotatedGenes.result || {}, this.mutationData, undefined, this.uncalledMutationData);
-            } else {
-                return Promise.resolve({indicatorMap: null, uniqueSampleKeyToTumorType: null});
-            }
+    readonly oncoKbData = remoteData<IOncoKbData | Error>(
+        {
+            await: () => [
+                this.oncoKbAnnotatedGenes,
+                this.mutationData,
+                this.uncalledMutationData,
+                this.clinicalDataForSamples,
+                this.studiesForSamplesWithoutCancerTypeClinicalData,
+                this.studies,
+            ],
+            invoke: () => {
+                if (AppConfig.serverConfig.show_oncokb) {
+                    return fetchOncoKbData(
+                        this.uniqueSampleKeyToTumorType,
+                        this.oncoKbAnnotatedGenes.result || {},
+                        this.mutationData,
+                        undefined,
+                        this.uncalledMutationData
+                    );
+                } else {
+                    return Promise.resolve({
+                        indicatorMap: null,
+                        uniqueSampleKeyToTumorType: null,
+                    });
+                }
+            },
+            onError: (err: Error) => {
+                // fail silently, leave the error handling responsibility to the data consumer
+            },
         },
-        onError: (err: Error) => {
-            // fail silently, leave the error handling responsibility to the data consumer
-        }
-    }, ONCOKB_DEFAULT);
+        ONCOKB_DEFAULT
+    );
 
-    readonly civicGenes = remoteData<ICivicGene | undefined>({
-        await: () => [
-            this.mutationData,
-            this.uncalledMutationData,
-            this.clinicalDataForSamples
-        ],
-        invoke: async() => AppConfig.serverConfig.show_civic ? fetchCivicGenes(this.mutationData, this.uncalledMutationData) : {},
-        onError: (err: Error) => {
-            // fail silently
-        }
-    }, undefined);
+    readonly civicGenes = remoteData<ICivicGene | undefined>(
+        {
+            await: () => [
+                this.mutationData,
+                this.uncalledMutationData,
+                this.clinicalDataForSamples,
+            ],
+            invoke: async () =>
+                AppConfig.serverConfig.show_civic
+                    ? fetchCivicGenes(
+                          this.mutationData,
+                          this.uncalledMutationData
+                      )
+                    : {},
+            onError: (err: Error) => {
+                // fail silently
+            },
+        },
+        undefined
+    );
 
-    readonly civicVariants = remoteData<ICivicVariant | undefined>({
-        await: () => [
-            this.civicGenes,
-            this.mutationData,
-            this.uncalledMutationData
-        ],
-        invoke: async() => {
-            if (AppConfig.serverConfig.show_civic && this.civicGenes.result) {
-                return fetchCivicVariants(this.civicGenes.result as ICivicGene,
-                    this.mutationData,
-                    this.uncalledMutationData);
-            }
-            else {
-                return {};
-            }
+    readonly civicVariants = remoteData<ICivicVariant | undefined>(
+        {
+            await: () => [
+                this.civicGenes,
+                this.mutationData,
+                this.uncalledMutationData,
+            ],
+            invoke: async () => {
+                if (
+                    AppConfig.serverConfig.show_civic &&
+                    this.civicGenes.result
+                ) {
+                    return fetchCivicVariants(
+                        this.civicGenes.result as ICivicGene,
+                        this.mutationData,
+                        this.uncalledMutationData
+                    );
+                } else {
+                    return {};
+                }
+            },
+            onError: (err: Error) => {
+                // fail silently
+            },
         },
-        onError: (err: Error) => {
-            // fail silently
-        }
-    }, undefined);
+        undefined
+    );
 
-    readonly cnaOncoKbData = remoteData<IOncoKbData>({
-        await: () => [
-            this.oncoKbAnnotatedGenes,
-            this.discreteCNAData,
-            this.clinicalDataForSamples,
-            this.studies
-        ],
-        invoke: async() => {
-            if (AppConfig.serverConfig.show_oncokb) {
-                return fetchCnaOncoKbData(this.uniqueSampleKeyToTumorType, this.oncoKbAnnotatedGenes.result || {}, this.discreteCNAData);
-            } else {
-                return ONCOKB_DEFAULT;
-            }
+    readonly cnaOncoKbData = remoteData<IOncoKbData>(
+        {
+            await: () => [
+                this.oncoKbAnnotatedGenes,
+                this.discreteCNAData,
+                this.clinicalDataForSamples,
+                this.studies,
+            ],
+            invoke: async () => {
+                if (AppConfig.serverConfig.show_oncokb) {
+                    return fetchCnaOncoKbData(
+                        this.uniqueSampleKeyToTumorType,
+                        this.oncoKbAnnotatedGenes.result || {},
+                        this.discreteCNAData
+                    );
+                } else {
+                    return ONCOKB_DEFAULT;
+                }
+            },
+            onError: (err: Error) => {
+                // fail silently, leave the error handling responsibility to the data consumer
+            },
         },
-        onError: (err: Error) => {
-            // fail silently, leave the error handling responsibility to the data consumer
-        }
-    }, ONCOKB_DEFAULT);
+        ONCOKB_DEFAULT
+    );
 
-    readonly cnaCivicGenes = remoteData<ICivicGene | undefined>({
-        await: () => [
-            this.discreteCNAData,
-            this.clinicalDataForSamples
-        ],
-        invoke: async() => AppConfig.serverConfig.show_civic ? fetchCnaCivicGenes(this.discreteCNAData) : {},
-        onError: (err: Error) => {
-            // fail silently
-        }
-    }, undefined);
+    readonly cnaCivicGenes = remoteData<ICivicGene | undefined>(
+        {
+            await: () => [this.discreteCNAData, this.clinicalDataForSamples],
+            invoke: async () =>
+                AppConfig.serverConfig.show_civic
+                    ? fetchCnaCivicGenes(this.discreteCNAData)
+                    : {},
+            onError: (err: Error) => {
+                // fail silently
+            },
+        },
+        undefined
+    );
 
-    readonly cnaCivicVariants = remoteData<ICivicVariant | undefined>({
-        await: () => [
-            this.civicGenes,
-            this.mutationData
-        ],
-        invoke: async() => {
-            if (this.cnaCivicGenes.status == "complete") {
-                return fetchCivicVariants(this.cnaCivicGenes.result as ICivicGene);
-            }
+    readonly cnaCivicVariants = remoteData<ICivicVariant | undefined>(
+        {
+            await: () => [this.civicGenes, this.mutationData],
+            invoke: async () => {
+                if (this.cnaCivicGenes.status == 'complete') {
+                    return fetchCivicVariants(this.cnaCivicGenes
+                        .result as ICivicGene);
+                }
+            },
+            onError: (err: Error) => {
+                // fail silently
+            },
         },
-        onError: (err: Error) => {
-            // fail silently
-        }
-    }, undefined);
+        undefined
+    );
 
-    readonly copyNumberCountData = remoteData<CopyNumberCount[]>({
-        await: () => [
-            this.discreteCNAData
-        ],
-        invoke: async() => fetchCopyNumberData(this.discreteCNAData, this.molecularProfileIdDiscrete)
-    }, []);
+    readonly copyNumberCountData = remoteData<CopyNumberCount[]>(
+        {
+            await: () => [this.discreteCNAData],
+            invoke: async () =>
+                fetchCopyNumberData(
+                    this.discreteCNAData,
+                    this.molecularProfileIdDiscrete
+                ),
+        },
+        []
+    );
 
-    @computed get sampleIds(): string[]
-    {
+    @computed get sampleIds(): string[] {
         if (this.samples.result) {
             return this.samples.result.map(sample => sample.sampleId);
         }
@@ -853,176 +1102,266 @@ export class PatientViewPageStore {
         return [];
     }
 
-    readonly indexedHotspotData = remoteData<IHotspotIndex|undefined>({
-        await:()=>[
-            this.hotspotData
-        ],
-        invoke: ()=>Promise.resolve(indexHotspotsData(this.hotspotData))
+    readonly indexedHotspotData = remoteData<IHotspotIndex | undefined>({
+        await: () => [this.hotspotData],
+        invoke: () => Promise.resolve(indexHotspotsData(this.hotspotData)),
     });
 
-    readonly sampleToMutationGenePanelData = remoteData<{[sampleId: string]: GenePanelData}>({
-        await:()=>[
-            this.mutationMolecularProfileId
-        ],
-        invoke: async() => {
-            if (this.mutationMolecularProfileId.result) {
-                return fetchGenePanelData(this.mutationMolecularProfileId.result, this.sampleIds);
-            }
-            return {};
-        }
-    }, {});
+    readonly sampleToMutationGenePanelData = remoteData<{
+        [sampleId: string]: GenePanelData;
+    }>(
+        {
+            await: () => [this.mutationMolecularProfileId],
+            invoke: async () => {
+                if (this.mutationMolecularProfileId.result) {
+                    return fetchGenePanelData(
+                        this.mutationMolecularProfileId.result,
+                        this.sampleIds
+                    );
+                }
+                return {};
+            },
+        },
+        {}
+    );
 
-    readonly sampleToMutationGenePanelId = remoteData<{[sampleId: string]: string}>({
-        await:()=>[
-            this.sampleToMutationGenePanelData
-        ],
-        invoke: async() => {
-            return _.mapValues(this.sampleToMutationGenePanelData.result, (genePanelData) => genePanelData.genePanelId);
-        }
-    }, {});
+    readonly sampleToMutationGenePanelId = remoteData<{
+        [sampleId: string]: string;
+    }>(
+        {
+            await: () => [this.sampleToMutationGenePanelData],
+            invoke: async () => {
+                return _.mapValues(
+                    this.sampleToMutationGenePanelData.result,
+                    genePanelData => genePanelData.genePanelId
+                );
+            },
+        },
+        {}
+    );
 
-    readonly sampleToDiscreteGenePanelData = remoteData<{[sampleId: string]: GenePanelData}>({
-        await:()=>[
-            this.molecularProfileIdDiscrete
-        ],
-        invoke: async() => {
-            if (this.molecularProfileIdDiscrete.result) {
-                return fetchGenePanelData(this.molecularProfileIdDiscrete.result, this.sampleIds);
-            }
-            return {};
-        }
-    }, {});
+    readonly sampleToDiscreteGenePanelData = remoteData<{
+        [sampleId: string]: GenePanelData;
+    }>(
+        {
+            await: () => [this.molecularProfileIdDiscrete],
+            invoke: async () => {
+                if (this.molecularProfileIdDiscrete.result) {
+                    return fetchGenePanelData(
+                        this.molecularProfileIdDiscrete.result,
+                        this.sampleIds
+                    );
+                }
+                return {};
+            },
+        },
+        {}
+    );
 
-    readonly sampleToDiscreteGenePanelId = remoteData<{[sampleId: string]: string}>({
-        await:()=>[
-            this.sampleToDiscreteGenePanelData
-        ],
-        invoke: async() => {
-            return _.mapValues(this.sampleToDiscreteGenePanelData.result, (genePanelData) => genePanelData.genePanelId);
-        }
-    }, {});
+    readonly sampleToDiscreteGenePanelId = remoteData<{
+        [sampleId: string]: string;
+    }>(
+        {
+            await: () => [this.sampleToDiscreteGenePanelData],
+            invoke: async () => {
+                return _.mapValues(
+                    this.sampleToDiscreteGenePanelData.result,
+                    genePanelData => genePanelData.genePanelId
+                );
+            },
+        },
+        {}
+    );
 
-    readonly genePanelIdToPanel = remoteData<{[genePanelId: string]: GenePanel}>({
-        await:()=>[
-            this.sampleToMutationGenePanelData,
-            this.sampleToDiscreteGenePanelData
-        ],
-        invoke: async() => {
-            const sampleGenePanelInfo = _.concat(_.values(this.sampleToMutationGenePanelData.result), _.values(this.sampleToDiscreteGenePanelData.result));
-            const panelIds = _(sampleGenePanelInfo)
-                .map((genePanelData) => genePanelData.genePanelId)
-                .filter((genePanelId) => !noGenePanelUsed(genePanelId))
-                .value();
-            return fetchGenePanel(panelIds);
-        }
-    }, {});
+    readonly genePanelIdToPanel = remoteData<{
+        [genePanelId: string]: GenePanel;
+    }>(
+        {
+            await: () => [
+                this.sampleToMutationGenePanelData,
+                this.sampleToDiscreteGenePanelData,
+            ],
+            invoke: async () => {
+                const sampleGenePanelInfo = _.concat(
+                    _.values(this.sampleToMutationGenePanelData.result),
+                    _.values(this.sampleToDiscreteGenePanelData.result)
+                );
+                const panelIds = _(sampleGenePanelInfo)
+                    .map(genePanelData => genePanelData.genePanelId)
+                    .filter(genePanelId => !noGenePanelUsed(genePanelId))
+                    .value();
+                return fetchGenePanel(panelIds);
+            },
+        },
+        {}
+    );
 
-    readonly genePanelIdToEntrezGeneIds = remoteData<{[genePanelId: string]: number[]}>({
-        await:()=>[
-            this.genePanelIdToPanel
-        ],
-        invoke: async() => {
-            return _(this.genePanelIdToPanel.result)
-            .mapValues((genePanel) => _.map(genePanel.genes, (genePanelToGene) => genePanelToGene.entrezGeneId))
-            .value();
-        }
-    }, {});
+    readonly genePanelIdToEntrezGeneIds = remoteData<{
+        [genePanelId: string]: number[];
+    }>(
+        {
+            await: () => [this.genePanelIdToPanel],
+            invoke: async () => {
+                return _(this.genePanelIdToPanel.result)
+                    .mapValues(genePanel =>
+                        _.map(
+                            genePanel.genes,
+                            genePanelToGene => genePanelToGene.entrezGeneId
+                        )
+                    )
+                    .value();
+            },
+        },
+        {}
+    );
 
     @computed get mergedMutationData(): Mutation[][] {
         return mergeMutations(this.mutationData);
     }
-    
+
     @computed get mergedMutationDataIncludingUncalled(): Mutation[][] {
-        return mergeMutationsIncludingUncalled(this.mutationData, this.uncalledMutationData);
+        return mergeMutationsIncludingUncalled(
+            this.mutationData,
+            this.uncalledMutationData
+        );
     }
-    
-    @computed get mergedMutationDataFilteredByGene():Mutation[][] {
-        if (this.mutationTableGeneFilterOption === GeneFilterOption.ALL_SAMPLES) {
-            return filterMutationsByProfiledGene(this.mergedMutationData, this.sampleIds, this.sampleToMutationGenePanelId.result, this.genePanelIdToEntrezGeneIds.result);
+
+    @computed get mergedMutationDataFilteredByGene(): Mutation[][] {
+        if (
+            this.mutationTableGeneFilterOption === GeneFilterOption.ALL_SAMPLES
+        ) {
+            return filterMutationsByProfiledGene(
+                this.mergedMutationData,
+                this.sampleIds,
+                this.sampleToMutationGenePanelId.result,
+                this.genePanelIdToEntrezGeneIds.result
+            );
         }
         return this.mergedMutationData;
     }
 
-    @computed get mergedMutationDataIncludingUncalledFilteredByGene():Mutation[][] {
-        if (this.mutationTableGeneFilterOption === GeneFilterOption.ALL_SAMPLES) {
-            return filterMutationsByProfiledGene(this.mergedMutationDataIncludingUncalled, this.sampleIds, this.sampleToMutationGenePanelId.result, this.genePanelIdToEntrezGeneIds.result);
+    @computed
+    get mergedMutationDataIncludingUncalledFilteredByGene(): Mutation[][] {
+        if (
+            this.mutationTableGeneFilterOption === GeneFilterOption.ALL_SAMPLES
+        ) {
+            return filterMutationsByProfiledGene(
+                this.mergedMutationDataIncludingUncalled,
+                this.sampleIds,
+                this.sampleToMutationGenePanelId.result,
+                this.genePanelIdToEntrezGeneIds.result
+            );
         }
         return this.mergedMutationDataIncludingUncalled;
     }
 
-    @computed get mergedDiscreteCNADataFilteredByGene():DiscreteCopyNumberData[][] {
-        if (this.copyNumberTableGeneFilterOption === GeneFilterOption.ALL_SAMPLES) {
-            return _.filter(this.mergedDiscreteCNAData,(mutations:DiscreteCopyNumberData[]) => {
-                const entrezGeneId = mutations[0].gene.entrezGeneId;
-                const geneProfiledInSamples = TumorColumnFormatter.getProfiledSamplesForGene(entrezGeneId, this.sampleIds, this.sampleToMutationGenePanelId.result, this.genePanelIdToEntrezGeneIds.result);
-                return _(geneProfiledInSamples).values().filter((profiled:boolean) => profiled).value().length === this.sampleIds.length;
-            });
+    @computed
+    get mergedDiscreteCNADataFilteredByGene(): DiscreteCopyNumberData[][] {
+        if (
+            this.copyNumberTableGeneFilterOption ===
+            GeneFilterOption.ALL_SAMPLES
+        ) {
+            return _.filter(
+                this.mergedDiscreteCNAData,
+                (mutations: DiscreteCopyNumberData[]) => {
+                    const entrezGeneId = mutations[0].gene.entrezGeneId;
+                    const geneProfiledInSamples = TumorColumnFormatter.getProfiledSamplesForGene(
+                        entrezGeneId,
+                        this.sampleIds,
+                        this.sampleToMutationGenePanelId.result,
+                        this.genePanelIdToEntrezGeneIds.result
+                    );
+                    return (
+                        _(geneProfiledInSamples)
+                            .values()
+                            .filter((profiled: boolean) => profiled)
+                            .value().length === this.sampleIds.length
+                    );
+                }
+            );
         }
         return this.mergedDiscreteCNAData;
     }
 
     @computed get existsSomeMutationWithVAFData() {
-        return _.some(this.mergedMutationDataIncludingUncalled, mutationList=>{
-            return _.some(mutationList, m=>{
-                const vaf = getVariantAlleleFrequency(m);
-                return vaf != null && vaf > 0;
-            });
-        });
+        return _.some(
+            this.mergedMutationDataIncludingUncalled,
+            mutationList => {
+                return _.some(mutationList, m => {
+                    const vaf = getVariantAlleleFrequency(m);
+                    return vaf != null && vaf > 0;
+                });
+            }
+        );
     }
 
     readonly mutationTableShowGeneFilterMenu = remoteData({
-        await:()=>[
+        await: () => [
             this.samples,
             this.sampleToMutationGenePanelId,
-            this.genePanelIdToEntrezGeneIds
+            this.genePanelIdToEntrezGeneIds,
         ],
-        invoke:()=>{
-            const entrezGeneIds:number[] = _.uniq(_.map(this.mergedMutationDataIncludingUncalled, mutations => mutations[0].entrezGeneId));
-            const sampleIds = this.samples.result!.map(s=>s.sampleId);
+        invoke: () => {
+            const entrezGeneIds: number[] = _.uniq(
+                _.map(
+                    this.mergedMutationDataIncludingUncalled,
+                    mutations => mutations[0].entrezGeneId
+                )
+            );
+            const sampleIds = this.samples.result!.map(s => s.sampleId);
             return Promise.resolve(
-                sampleIds.length > 1
-                && checkNonProfiledGenesExist(  sampleIds,
-                    entrezGeneIds,
-                    this.sampleToMutationGenePanelId.result,
-                    this.genePanelIdToEntrezGeneIds.result)
+                sampleIds.length > 1 &&
+                    checkNonProfiledGenesExist(
+                        sampleIds,
+                        entrezGeneIds,
+                        this.sampleToMutationGenePanelId.result,
+                        this.genePanelIdToEntrezGeneIds.result
+                    )
             );
-        }
+        },
     });
 
     readonly cnaTableShowGeneFilterMenu = remoteData({
-        await:()=>[
+        await: () => [
             this.samples,
             this.sampleToMutationGenePanelId,
-            this.genePanelIdToEntrezGeneIds
+            this.genePanelIdToEntrezGeneIds,
         ],
-        invoke:()=>{
-            const entrezGeneIds:number[] = _.uniq(_.map(this.mergedDiscreteCNAData, alterations => alterations[0].entrezGeneId));
-            const sampleIds = this.samples.result!.map(s=>s.sampleId);
+        invoke: () => {
+            const entrezGeneIds: number[] = _.uniq(
+                _.map(
+                    this.mergedDiscreteCNAData,
+                    alterations => alterations[0].entrezGeneId
+                )
+            );
+            const sampleIds = this.samples.result!.map(s => s.sampleId);
             return Promise.resolve(
-                sampleIds.length > 1
-                && checkNonProfiledGenesExist(  sampleIds,
-                entrezGeneIds,
-                this.sampleToMutationGenePanelId.result,
-                this.genePanelIdToEntrezGeneIds.result)
+                sampleIds.length > 1 &&
+                    checkNonProfiledGenesExist(
+                        sampleIds,
+                        entrezGeneIds,
+                        this.sampleToMutationGenePanelId.result,
+                        this.genePanelIdToEntrezGeneIds.result
+                    )
             );
-        }
+        },
     });
 
-    @computed get uniqueSampleKeyToTumorType(): {[sampleId: string]: string} {
-        return generateUniqueSampleKeyToTumorTypeMap(this.clinicalDataForSamples,
+    @computed get uniqueSampleKeyToTumorType(): { [sampleId: string]: string } {
+        return generateUniqueSampleKeyToTumorTypeMap(
+            this.clinicalDataForSamples,
             this.studiesForSamplesWithoutCancerTypeClinicalData,
-            this.samplesWithoutCancerTypeClinicalData);
+            this.samplesWithoutCancerTypeClinicalData
+        );
     }
 
-    @action("SetSampleId") setSampleId(newId: string) {
-        if (newId)
-            this._patientId = '';
+    @action('SetSampleId') setSampleId(newId: string) {
+        if (newId) this._patientId = '';
         this._sampleId = newId;
     }
 
-    @action("SetPatientId") setPatientId(newId: string) {
-        if (newId)
-            this._sampleId = '';
+    @action('SetPatientId') setPatientId(newId: string) {
+        if (newId) this._sampleId = '';
         this._patientId = newId;
     }
 
@@ -1035,7 +1374,9 @@ export class PatientViewPageStore {
     }
 
     @cached get discreteCNACache() {
-        return new DiscreteCNACache(this.studyToMolecularProfileDiscrete.result);
+        return new DiscreteCNACache(
+            this.studyToMolecularProfileDiscrete.result
+        );
     }
 
     @cached get oncoKbEvidenceCache() {
@@ -1078,59 +1419,72 @@ export class PatientViewPageStore {
         this.ajaxErrors = [];
     }
 
-    readonly trialMatches = remoteData<ITrialMatch[]>({
-        invoke: () => {
-            return fetchTrialMatchesUsingPOST({mrn: this.patientId});
-        }
-    }, []);
-
-    readonly trialIds = remoteData<ITrialQuery>({
-        await: () => [
-            this.trialMatches
-        ],
-        invoke: async() => {
-            let nctIds = new Set<string>(); // Trial unique id from clinicaltrials.gov
-            let protocolNos = new Set<string>(); // Trials's MSK ID same as protocol_number or protocol_id
-            _.forEach(this.trialMatches.result, (trialMatch: ITrialMatch) => {
-                if (_.isEmpty(trialMatch.protocolNo)) {
-                    nctIds.add(trialMatch.nctId);
-                } else {
-                    protocolNos.add(trialMatch.protocolNo);
-                }
-            });
-            return {
-                nct_id: [...nctIds],
-                protocol_no: [...protocolNos]
-            };
-        }
-    }, {
-        nct_id: [],
-        protocol_no: []
-    });
+    readonly trialMatches = remoteData<ITrialMatch[]>(
+        {
+            invoke: () => {
+                return fetchTrialMatchesUsingPOST({ mrn: this.patientId });
+            },
+        },
+        []
+    );
 
-    readonly trials = remoteData<ITrial[]>({
-        await: () => [
-            this.trialIds
-        ],
-        invoke: async () => {
-            if (this.trialIds.result.protocol_no.length > 0 || this.trialIds.result.nct_id.length > 0) {
-                return fetchTrialsById(this.trialIds.result);
-            }
-            return [];
+    readonly trialIds = remoteData<ITrialQuery>(
+        {
+            await: () => [this.trialMatches],
+            invoke: async () => {
+                let nctIds = new Set<string>(); // Trial unique id from clinicaltrials.gov
+                let protocolNos = new Set<string>(); // Trials's MSK ID same as protocol_number or protocol_id
+                _.forEach(
+                    this.trialMatches.result,
+                    (trialMatch: ITrialMatch) => {
+                        if (_.isEmpty(trialMatch.protocolNo)) {
+                            nctIds.add(trialMatch.nctId);
+                        } else {
+                            protocolNos.add(trialMatch.protocolNo);
+                        }
+                    }
+                );
+                return {
+                    nct_id: [...nctIds],
+                    protocol_no: [...protocolNos],
+                };
+            },
+        },
+        {
+            nct_id: [],
+            protocol_no: [],
         }
-    }, []);
+    );
 
-    readonly detailedTrialMatches = remoteData<IDetailedTrialMatch[]>({
-        await: () => [
-            this.trials,
-            this.trialMatches
-        ],
-        invoke: async () => {
-            if (this.trials.result && this.trialMatches.result ) {
-                return groupTrialMatchesById(this.trials.result, this.trialMatches.result);
-            }
-            return [];
-        }
-    }, []);
+    readonly trials = remoteData<ITrial[]>(
+        {
+            await: () => [this.trialIds],
+            invoke: async () => {
+                if (
+                    this.trialIds.result.protocol_no.length > 0 ||
+                    this.trialIds.result.nct_id.length > 0
+                ) {
+                    return fetchTrialsById(this.trialIds.result);
+                }
+                return [];
+            },
+        },
+        []
+    );
 
+    readonly detailedTrialMatches = remoteData<IDetailedTrialMatch[]>(
+        {
+            await: () => [this.trials, this.trialMatches],
+            invoke: async () => {
+                if (this.trials.result && this.trialMatches.result) {
+                    return groupTrialMatchesById(
+                        this.trials.result,
+                        this.trialMatches.result
+                    );
+                }
+                return [];
+            },
+        },
+        []
+    );
 }
diff --git a/src/pages/patientView/clinicalInformation/PatientViewPageStoreUtil.ts b/src/pages/patientView/clinicalInformation/PatientViewPageStoreUtil.ts
index 8fdc17a28f1..ab603d9dec5 100644
--- a/src/pages/patientView/clinicalInformation/PatientViewPageStoreUtil.ts
+++ b/src/pages/patientView/clinicalInformation/PatientViewPageStoreUtil.ts
@@ -1,14 +1,17 @@
-import { IServerConfig } from "config/IAppConfig";
-import { GeneFilterOption } from "../mutation/GeneFilterMenu";
+import { IServerConfig } from 'config/IAppConfig';
+import { GeneFilterOption } from '../mutation/GeneFilterMenu';
 
-export function getGeneFilterDefault(frontendConfig:any):GeneFilterOption {
+export function getGeneFilterDefault(frontendConfig: any): GeneFilterOption {
     if (frontendConfig && 'serverConfig' in frontendConfig) {
-        const serverConfig:IServerConfig = frontendConfig.serverConfig;
+        const serverConfig: IServerConfig = frontendConfig.serverConfig;
         const propName = 'skin_patientview_filter_genes_profiled_all_samples';
-        if (serverConfig && propName in serverConfig && serverConfig[propName]) {
+        if (
+            serverConfig &&
+            propName in serverConfig &&
+            serverConfig[propName]
+        ) {
             return GeneFilterOption.ALL_SAMPLES;
         }
-
     }
     return GeneFilterOption.ANY_SAMPLE;
-}
\ No newline at end of file
+}
diff --git a/src/pages/patientView/clinicalInformation/PatientViewPageStoreUtils.spec.ts b/src/pages/patientView/clinicalInformation/PatientViewPageStoreUtils.spec.ts
index acc16f541af..ad8739b23fa 100644
--- a/src/pages/patientView/clinicalInformation/PatientViewPageStoreUtils.spec.ts
+++ b/src/pages/patientView/clinicalInformation/PatientViewPageStoreUtils.spec.ts
@@ -1,28 +1,44 @@
-import { handlePathologyReportCheckResponse, PatientViewPageStore } from './PatientViewPageStore';
+import {
+    handlePathologyReportCheckResponse,
+    PatientViewPageStore,
+} from './PatientViewPageStore';
 import { assert } from 'chai';
 import { GeneFilterOption } from '../mutation/GeneFilterMenu';
 import { IServerConfig } from 'config/IAppConfig';
 import { getGeneFilterDefault } from './PatientViewPageStoreUtil';
 
 describe('PatientViewPageStoreUtils', () => {
-
     describe('getGeneFilterDefault()', () => {
-
         it('sets filter to `all samples`', () => {
-            const frontendConfig = {serverConfig: { skin_patientview_filter_genes_profiled_all_samples: true} as IServerConfig};
-            assert.equal(getGeneFilterDefault(frontendConfig), GeneFilterOption.ALL_SAMPLES);
+            const frontendConfig = {
+                serverConfig: {
+                    skin_patientview_filter_genes_profiled_all_samples: true,
+                } as IServerConfig,
+            };
+            assert.equal(
+                getGeneFilterDefault(frontendConfig),
+                GeneFilterOption.ALL_SAMPLES
+            );
         });
-        
+
         it('sets filter to `any sample`', () => {
-            const frontendConfig = {serverConfig: { skin_patientview_filter_genes_profiled_all_samples: false} as IServerConfig};
-            assert.equal(getGeneFilterDefault(frontendConfig), GeneFilterOption.ANY_SAMPLE);
+            const frontendConfig = {
+                serverConfig: {
+                    skin_patientview_filter_genes_profiled_all_samples: false,
+                } as IServerConfig,
+            };
+            assert.equal(
+                getGeneFilterDefault(frontendConfig),
+                GeneFilterOption.ANY_SAMPLE
+            );
         });
 
         it('when missing defaults to `any sample`', () => {
-            const frontendConfig = {serverConfig: {} as IServerConfig};
-            assert.equal(getGeneFilterDefault(frontendConfig), GeneFilterOption.ANY_SAMPLE);
+            const frontendConfig = { serverConfig: {} as IServerConfig };
+            assert.equal(
+                getGeneFilterDefault(frontendConfig),
+                GeneFilterOption.ANY_SAMPLE
+            );
         });
-
     });
-
 });
diff --git a/src/pages/patientView/clinicalInformation/SampleGeneCache.ts b/src/pages/patientView/clinicalInformation/SampleGeneCache.ts
index 9822a38c8f3..9a6d3d438f2 100644
--- a/src/pages/patientView/clinicalInformation/SampleGeneCache.ts
+++ b/src/pages/patientView/clinicalInformation/SampleGeneCache.ts
@@ -1,72 +1,94 @@
-import {observable, action} from "mobx";
-import Immutable from "seamless-immutable";
-import * as _ from "lodash";
-import accumulatingDebounce from "../../../shared/lib/accumulatingDebounce";
+import { observable, action } from 'mobx';
+import Immutable from 'seamless-immutable';
+import * as _ from 'lodash';
+import accumulatingDebounce from '../../../shared/lib/accumulatingDebounce';
 
-export type CacheData<T> = { status: "complete", data: T | null} | { status: "error", data:null};
+export type CacheData<T> =
+    | { status: 'complete'; data: T | null }
+    | { status: 'error'; data: null };
 export type Cache<T> = {
-    [sampleId:string]: {
-        fetchedWithoutGeneArgument: "complete" | "error" | false,
-        geneData: {[entrezGeneId: number]: CacheData<T> | null}
-    }
+    [sampleId: string]: {
+        fetchedWithoutGeneArgument: 'complete' | 'error' | false;
+        geneData: { [entrezGeneId: number]: CacheData<T> | null };
+    };
 };
 type PendingCache = {
-    [sampleId:string]: {
-        fetchedWithoutGeneArgument: boolean
-        geneData: {[entrezGeneId: number]: boolean}
-    }
-}
+    [sampleId: string]: {
+        fetchedWithoutGeneArgument: boolean;
+        geneData: { [entrezGeneId: number]: boolean };
+    };
+};
 
 type CacheMerge<T> = {
-    [sampleId:string]: {
-        fetchedWithoutGeneArgument?: "complete" | "error" | false,
-        geneData?: {[entrezGeneId: number]: CacheData<T> | null}
-    }
-}
-export type SampleToEntrezListOrNull = { [sampleId:string]:number[]|null };
-export type SampleToEntrezList = { [sampleId:string]:number[] };
-type SampleToEntrezSet = { [sampleId:string]:{[entrez:string]:true} };
+    [sampleId: string]: {
+        fetchedWithoutGeneArgument?: 'complete' | 'error' | false;
+        geneData?: { [entrezGeneId: number]: CacheData<T> | null };
+    };
+};
+export type SampleToEntrezListOrNull = { [sampleId: string]: number[] | null };
+export type SampleToEntrezList = { [sampleId: string]: number[] };
+type SampleToEntrezSet = { [sampleId: string]: { [entrez: string]: true } };
 
-export default class SampleGeneCache<T extends { sampleId: string; entrezGeneId:number; }> {
-    @observable.ref private _cache: Cache<T> & Immutable.ImmutableObject<Cache<T>>;
+export default class SampleGeneCache<
+    T extends { sampleId: string; entrezGeneId: number }
+> {
+    @observable.ref private _cache: Cache<T> &
+        Immutable.ImmutableObject<Cache<T>>;
     private _pending: PendingCache;
-    private dependencies:any[];
-
-    private debouncedPopulate:(sampleId:string, entrezGeneId:number)=>void;
+    private dependencies: any[];
 
+    private debouncedPopulate: (sampleId: string, entrezGeneId: number) => void;
 
-    constructor(sampleIds:string[], ...dependencies:any[]) {
+    constructor(sampleIds: string[], ...dependencies: any[]) {
         this.dependencies = dependencies;
         this.initCache(sampleIds);
         this._pending = {};
 
-        this.debouncedPopulate = accumulatingDebounce<SampleToEntrezSet, string|number>(
-            (toFetch:SampleToEntrezSet)=>{
-                const sampleToEntrezList:SampleToEntrezList = {};
+        this.debouncedPopulate = accumulatingDebounce<
+            SampleToEntrezSet,
+            string | number
+        >(
+            (toFetch: SampleToEntrezSet) => {
+                const sampleToEntrezList: SampleToEntrezList = {};
                 for (const sample of Object.keys(toFetch)) {
-                    sampleToEntrezList[sample] = Object.keys(toFetch[sample]).map(x=>parseInt(x,10));
+                    sampleToEntrezList[sample] = Object.keys(
+                        toFetch[sample]
+                    ).map(x => parseInt(x, 10));
                 }
                 this.populate(sampleToEntrezList);
             },
-            (acc:SampleToEntrezSet, sampleId:string, entrezGeneId:number)=>{
+            (
+                acc: SampleToEntrezSet,
+                sampleId: string,
+                entrezGeneId: number
+            ) => {
                 acc[sampleId] = acc[sampleId] || new Set<number>();
                 acc[sampleId][entrezGeneId] = true;
                 return acc;
             },
-            ()=>{return {};}, 0);
+            () => {
+                return {};
+            },
+            0
+        );
     }
 
     public get cache() {
         return this._cache;
     }
 
-    public get data():T[] {
-        const ret:T[] = [];
+    public get data(): T[] {
+        const ret: T[] = [];
         for (const sampleId of Object.keys(this._cache)) {
             const geneData = this._cache[sampleId].geneData || {};
             for (const entrezGeneId of Object.keys(geneData)) {
-                const datum:CacheData<T> | null = geneData[parseInt(entrezGeneId,10)];
-                if (datum !== null && datum.status === "complete" && datum.data !== null) {
+                const datum: CacheData<T> | null =
+                    geneData[parseInt(entrezGeneId, 10)];
+                if (
+                    datum !== null &&
+                    datum.status === 'complete' &&
+                    datum.data !== null
+                ) {
                     ret.push(datum.data);
                 }
             }
@@ -74,14 +96,19 @@ export default class SampleGeneCache<T extends { sampleId: string; entrezGeneId:
         return ret;
     }
 
-    public get(sampleId:string, entrezGeneId:number):CacheData<T> | null {
-        const cacheDatum = this._cache[sampleId] && this._cache[sampleId].geneData[entrezGeneId];
+    public get(sampleId: string, entrezGeneId: number): CacheData<T> | null {
+        const cacheDatum =
+            this._cache[sampleId] &&
+            this._cache[sampleId].geneData[entrezGeneId];
         if (!cacheDatum) {
-            if (this._cache[sampleId] && this._cache[sampleId].fetchedWithoutGeneArgument === "complete") {
+            if (
+                this._cache[sampleId] &&
+                this._cache[sampleId].fetchedWithoutGeneArgument === 'complete'
+            ) {
                 // in this case, we infer there is no data, because we've already fetched all data for this sample
                 return {
-                    status: "complete",
-                    data: null
+                    status: 'complete',
+                    data: null,
                 };
             } else {
                 // if we have not fetched all data for this sample, there's no data yet, so we should query
@@ -104,7 +131,7 @@ export default class SampleGeneCache<T extends { sampleId: string; entrezGeneId:
         }
         this.markPending(missing);
         try {
-            const data:T[] = await this.fetch(missing, ...this.dependencies);
+            const data: T[] = await this.fetch(missing, ...this.dependencies);
             this.putData(missing, data);
             return true;
         } catch (err) {
@@ -115,53 +142,71 @@ export default class SampleGeneCache<T extends { sampleId: string; entrezGeneId:
         }
     }
 
-    protected fetch(sampleToEntrezList:SampleToEntrezListOrNull, ...dependencies:any[]):Promise<T[]> {
-        throw "Not implemented in abstract class.";
+    protected fetch(
+        sampleToEntrezList: SampleToEntrezListOrNull,
+        ...dependencies: any[]
+    ): Promise<T[]> {
+        throw 'Not implemented in abstract class.';
     }
 
-    private initCache(sampleIds:string[]) {
-        const _cache:Cache<T> = {};
+    private initCache(sampleIds: string[]) {
+        const _cache: Cache<T> = {};
         for (const sampleId of sampleIds) {
             _cache[sampleId] = {
                 fetchedWithoutGeneArgument: false,
-                geneData: {}
+                geneData: {},
             };
         }
         this._cache = Immutable.from<Cache<T>>(_cache);
     }
 
-    private markError(sampleToEntrezList:SampleToEntrezListOrNull) {
+    private markError(sampleToEntrezList: SampleToEntrezListOrNull) {
         const cache = this._cache;
-        const toMerge:CacheMerge<T> = {};
+        const toMerge: CacheMerge<T> = {};
         for (const sample of Object.keys(sampleToEntrezList)) {
             const entrezList = sampleToEntrezList[sample];
             toMerge[sample] = { geneData: {} };
             if (entrezList === null) {
-                toMerge[sample].fetchedWithoutGeneArgument = "error";
+                toMerge[sample].fetchedWithoutGeneArgument = 'error';
             } else {
                 for (const entrez of entrezList) {
-                    toMerge[sample].geneData![entrez] = {status: "error", data:null};
+                    toMerge[sample].geneData![entrez] = {
+                        status: 'error',
+                        data: null,
+                    };
                 }
             }
         }
         this.updateCache(toMerge);
     }
 
-    private getMissing(sampleToEntrezList:SampleToEntrezListOrNull):SampleToEntrezListOrNull {
-        const ret:SampleToEntrezListOrNull = {};
+    private getMissing(
+        sampleToEntrezList: SampleToEntrezListOrNull
+    ): SampleToEntrezListOrNull {
+        const ret: SampleToEntrezListOrNull = {};
         const pending = this._pending;
         const cache = this._cache;
         for (const sampleId of Object.keys(sampleToEntrezList)) {
             const entrezList = sampleToEntrezList[sampleId];
             if (entrezList === null) {
-                if (!(cache[sampleId] && cache[sampleId].fetchedWithoutGeneArgument) &&
-                    !(pending[sampleId] && pending[sampleId].fetchedWithoutGeneArgument)) {
+                if (
+                    !(
+                        cache[sampleId] &&
+                        cache[sampleId].fetchedWithoutGeneArgument
+                    ) &&
+                    !(
+                        pending[sampleId] &&
+                        pending[sampleId].fetchedWithoutGeneArgument
+                    )
+                ) {
                     ret[sampleId] = null;
                 }
             } else {
-                const missingEntrez = entrezList.filter((g:number)=>{
-                    return (!(cache[sampleId] && cache[sampleId].geneData[g]) &&
-                            !(pending[sampleId] && pending[sampleId].geneData[g]));
+                const missingEntrez = entrezList.filter((g: number) => {
+                    return (
+                        !(cache[sampleId] && cache[sampleId].geneData[g]) &&
+                        !(pending[sampleId] && pending[sampleId].geneData[g])
+                    );
                 });
                 if (missingEntrez.length > 0) {
                     ret[sampleId] = missingEntrez;
@@ -171,7 +216,10 @@ export default class SampleGeneCache<T extends { sampleId: string; entrezGeneId:
         return ret;
     }
 
-    private markPendingStatus(sampleToEntrezList:SampleToEntrezListOrNull, status:boolean) {
+    private markPendingStatus(
+        sampleToEntrezList: SampleToEntrezListOrNull,
+        status: boolean
+    ) {
         // Helper function for markPending and unmarkPending
         const pending = this._pending;
         for (const sampleId of Object.keys(sampleToEntrezList)) {
@@ -188,44 +236,49 @@ export default class SampleGeneCache<T extends { sampleId: string; entrezGeneId:
         }
     }
 
-    private markPending(sampleToEntrezList:SampleToEntrezListOrNull):void {
+    private markPending(sampleToEntrezList: SampleToEntrezListOrNull): void {
         this.markPendingStatus(sampleToEntrezList, true);
     }
 
-    private unmarkPending(sampleToEntrezList:SampleToEntrezListOrNull):void {
+    private unmarkPending(sampleToEntrezList: SampleToEntrezListOrNull): void {
         this.markPendingStatus(sampleToEntrezList, false);
     }
 
-    private putData(query:SampleToEntrezListOrNull, fetchedData:T[]):void {
-        const dataMap:{ [sampleId:string]: { [entrezGeneId:number]: T } } = {};
+    private putData(query: SampleToEntrezListOrNull, fetchedData: T[]): void {
+        const dataMap: {
+            [sampleId: string]: { [entrezGeneId: number]: T };
+        } = {};
         for (const fetchedDatum of fetchedData) {
-            dataMap[fetchedDatum.sampleId] = dataMap[fetchedDatum.sampleId] || {};
-            dataMap[fetchedDatum.sampleId][fetchedDatum.entrezGeneId] = fetchedDatum;
+            dataMap[fetchedDatum.sampleId] =
+                dataMap[fetchedDatum.sampleId] || {};
+            dataMap[fetchedDatum.sampleId][
+                fetchedDatum.entrezGeneId
+            ] = fetchedDatum;
         }
-        const toMerge:CacheMerge<T> = {};
+        const toMerge: CacheMerge<T> = {};
         for (const sampleId of Object.keys(query)) {
             const entrezList = query[sampleId];
             toMerge[sampleId] = { geneData: {} };
             const sampleData = dataMap[sampleId];
 
             if (entrezList === null) {
-                toMerge[sampleId].fetchedWithoutGeneArgument = "complete";
+                toMerge[sampleId].fetchedWithoutGeneArgument = 'complete';
                 // Put all fetched data for this sample
                 if (sampleData) {
                     for (const entrezGene in sampleData) {
                         if (sampleData.hasOwnProperty(entrezGene)) {
                             toMerge[sampleId].geneData![entrezGene] = {
-                                status:"complete",
-                                data: sampleData[entrezGene]
-                            }
+                                status: 'complete',
+                                data: sampleData[entrezGene],
+                            };
                         }
                     }
                 }
             } else {
                 for (const entrezGene of entrezList) {
                     toMerge[sampleId].geneData![entrezGene] = {
-                        status:"complete",
-                        data: (sampleData && sampleData[entrezGene]) || null
+                        status: 'complete',
+                        data: (sampleData && sampleData[entrezGene]) || null,
                     };
                 }
             }
@@ -233,9 +286,12 @@ export default class SampleGeneCache<T extends { sampleId: string; entrezGeneId:
         this.updateCache(toMerge);
     }
 
-    @action private updateCache(toMerge:CacheMerge<T>) {
+    @action private updateCache(toMerge: CacheMerge<T>) {
         if (Object.keys(toMerge).length > 0) {
-            this._cache = this._cache.merge(toMerge, {deep:true}) as Cache<T> & Immutable.ImmutableObject<Cache<T>>;
+            this._cache = this._cache.merge(toMerge, { deep: true }) as Cache<
+                T
+            > &
+                Immutable.ImmutableObject<Cache<T>>;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/patientView/clinicalInformation/lib/clinicalAttributesUtil.js b/src/pages/patientView/clinicalInformation/lib/clinicalAttributesUtil.js
index 94a1975723c..be04159bd22 100644
--- a/src/pages/patientView/clinicalInformation/lib/clinicalAttributesUtil.js
+++ b/src/pages/patientView/clinicalInformation/lib/clinicalAttributesUtil.js
@@ -29,7 +29,7 @@ function clean(clinicalData) {
         '[not evaluated]',
         '[not applicable]',
         '[not available]',
-        '[undefined]'
+        '[undefined]',
     ];
 
     const keys = Object.keys(clinicalData);
@@ -79,7 +79,6 @@ function getFirstKeyFound(object, keys) {
     return null;
 }
 
-
 /**
  * Derive clinical attributes from existing clinical attributes .e.g. age based
  * on a date of birth. TODO: Now only includes a funky hack to keep current
@@ -115,14 +114,20 @@ function derive(clinicalData) {
                     caseTypeNormalized = 'Recurrence';
                 } else if (caseTypeLower.indexOf('progr') >= 0) {
                     caseTypeNormalized = 'Progressed';
-                } else if (caseTypeLower.indexOf('xeno') >= 0 || caseTypeLower.indexOf('pdx') >= 0) {
+                } else if (
+                    caseTypeLower.indexOf('xeno') >= 0 ||
+                    caseTypeLower.indexOf('pdx') >= 0
+                ) {
                     caseTypeNormalized = 'Xenograft';
                 } else if (caseTypeLower.indexOf('cfdna') >= 0) {
                     caseTypeNormalized = 'cfDNA';
                 } else if (caseTypeLower.indexOf('prim') >= 0) {
                     caseTypeNormalized = 'Primary';
                 }
-                if (caseTypeNormalized !== null && typeof caseTypeNormalized !== 'undefined') {
+                if (
+                    caseTypeNormalized !== null &&
+                    typeof caseTypeNormalized !== 'undefined'
+                ) {
                     break;
                 }
             }
@@ -131,17 +136,33 @@ function derive(clinicalData) {
         return caseTypeNormalized;
     }
 
-    const caseTypeNormalized = normalizedCaseType(clinicalData, ['SAMPLE_CLASS', 'SAMPLE_TYPE', 'TUMOR_TISSUE_SITE', 'TUMOR_TYPE']);
+    const caseTypeNormalized = normalizedCaseType(clinicalData, [
+        'SAMPLE_CLASS',
+        'SAMPLE_TYPE',
+        'TUMOR_TISSUE_SITE',
+        'TUMOR_TYPE',
+    ]);
     if (caseTypeNormalized !== null) {
         let loc;
 
         derivedClinicalAttributes.DERIVED_NORMALIZED_CASE_TYPE = caseTypeNormalized;
 
         // TODO: DERIVED_SAMPLE_LOCATION should probably be a clinical attribute.
-        if (derivedClinicalAttributes.DERIVED_NORMALIZED_CASE_TYPE === 'Metastasis') {
-            loc = getFirstKeyFound(clinicalData, ['METASTATIC_SITE', 'TUMOR_SITE']);
-        } else if (derivedClinicalAttributes.DERIVED_NORMALIZED_CASE_TYPE === 'Primary') {
-            loc = getFirstKeyFound(clinicalData, ['PRIMARY_SITE', 'TUMOR_SITE']);
+        if (
+            derivedClinicalAttributes.DERIVED_NORMALIZED_CASE_TYPE ===
+            'Metastasis'
+        ) {
+            loc = getFirstKeyFound(clinicalData, [
+                'METASTATIC_SITE',
+                'TUMOR_SITE',
+            ]);
+        } else if (
+            derivedClinicalAttributes.DERIVED_NORMALIZED_CASE_TYPE === 'Primary'
+        ) {
+            loc = getFirstKeyFound(clinicalData, [
+                'PRIMARY_SITE',
+                'TUMOR_SITE',
+            ]);
         } else {
             loc = getFirstKeyFound(clinicalData, ['TUMOR_SITE']);
         }
@@ -168,14 +189,30 @@ function cleanAndDerive(clinicalData) {
  * @param {string} cancerStudyId    - short name of cancer study
  */
 function getSpanElements(clinicalData, cancerStudyId) {
-    return getSpanElementsFromCleanData(cleanAndDerive(clinicalData), cancerStudyId);
+    return getSpanElementsFromCleanData(
+        cleanAndDerive(clinicalData),
+        cancerStudyId
+    );
 }
 
-function getSpanElementsFromCleanData(clinicalAttributesCleanDerived, cancerStudyId) {
+function getSpanElementsFromCleanData(
+    clinicalAttributesCleanDerived,
+    cancerStudyId
+) {
     let spans = [];
-    return Object.keys(clinicalAttributesCleanDerived).map((key) => {
+    return Object.keys(clinicalAttributesCleanDerived).map(key => {
         let value = clinicalAttributesCleanDerived[key];
-        return <span is class="clinical-attribute" attr-id={key} attr-value={value} study={cancerStudyId}>{value}</span>
+        return (
+            <span
+                is
+                class="clinical-attribute"
+                attr-id={key}
+                attr-value={value}
+                study={cancerStudyId}
+            >
+                {value}
+            </span>
+        );
     });
 }
 
@@ -188,15 +225,25 @@ function getSpanElementsFromCleanData(clinicalAttributesCleanDerived, cancerStud
  */
 function addFirstOrderClass() {
     $('.sample-record-inline, #more-patient-info').each(() => {
-        const orderSortedAttributes = _.sortBy($(this).find('a > .clinical-attribute'), (y) => {
-            const order = parseInt($(y).css('order'), 10);
-            if (isNaN(order)) {
-                console.log('Warning: No order attribute found in .clinical-attribute.');
+        const orderSortedAttributes = _.sortBy(
+            $(this).find('a > .clinical-attribute'),
+            y => {
+                const order = parseInt($(y).css('order'), 10);
+                if (isNaN(order)) {
+                    console.log(
+                        'Warning: No order attribute found in .clinical-attribute.'
+                    );
+                }
+                return order;
             }
-            return order;
-        });
+        );
         $(orderSortedAttributes[0]).addClass('first-order');
     });
 }
 
-export { cleanAndDerive, getSpanElements, getSpanElementsFromCleanData, addFirstOrderClass };
+export {
+    cleanAndDerive,
+    getSpanElements,
+    getSpanElementsFromCleanData,
+    addFirstOrderClass,
+};
diff --git a/src/pages/patientView/clinicalInformation/lib/convertSamplesData.spec.ts b/src/pages/patientView/clinicalInformation/lib/convertSamplesData.spec.ts
index 353f06d8880..1e9d4a9827d 100644
--- a/src/pages/patientView/clinicalInformation/lib/convertSamplesData.spec.ts
+++ b/src/pages/patientView/clinicalInformation/lib/convertSamplesData.spec.ts
@@ -1,25 +1,37 @@
-import mockClinicalData from "../../../../shared/api/mock/Clinical_data_study_ucec_tcga_pub.json";
-import { ClinicalData } from "../../../../shared/api/generated/CBioPortalAPI";
-import { default as convertSampleData, IConvertedSamplesData } from "./convertSamplesData";
+import mockClinicalData from '../../../../shared/api/mock/Clinical_data_study_ucec_tcga_pub.json';
+import { ClinicalData } from '../../../../shared/api/generated/CBioPortalAPI';
+import {
+    default as convertSampleData,
+    IConvertedSamplesData,
+} from './convertSamplesData';
 import { groupBySampleId } from '../../../../shared/lib/StoreUtils';
-import { ClinicalDataBySampleId } from "../../../../shared/api/api-types-extended";
-import {assert} from "chai";
+import { ClinicalDataBySampleId } from '../../../../shared/api/api-types-extended';
+import { assert } from 'chai';
 
 describe('convertSamplesData', () => {
     it('api data is properly transformed into table data', () => {
-
-        const res: Array<ClinicalDataBySampleId> = groupBySampleId(['TCGA-BK-A0CC-01'], mockClinicalData as Array<ClinicalData>);
+        const res: Array<ClinicalDataBySampleId> = groupBySampleId(
+            ['TCGA-BK-A0CC-01'],
+            mockClinicalData as Array<ClinicalData>
+        );
 
         const result: IConvertedSamplesData = convertSampleData(res);
 
         assert.equal(result.columns.length, 1);
 
-        assert.equal(result.items['CANCER_TYPE']['TCGA-BK-A0CC-01'], 'Endometrial Cancer');
-
-        assert.equal(result.items['CANCER_TYPE_DETAILED']['TCGA-BK-A0CC-01'], 'Uterine Serous Carcinoma/Uterine Papillary Serous Carcinoma');
+        assert.equal(
+            result.items['CANCER_TYPE']['TCGA-BK-A0CC-01'],
+            'Endometrial Cancer'
+        );
 
-        assert.equal(result.items['TUMOR_STAGE_2009']['TCGA-BK-A0CC-01'], 'Stage III');
+        assert.equal(
+            result.items['CANCER_TYPE_DETAILED']['TCGA-BK-A0CC-01'],
+            'Uterine Serous Carcinoma/Uterine Papillary Serous Carcinoma'
+        );
 
+        assert.equal(
+            result.items['TUMOR_STAGE_2009']['TCGA-BK-A0CC-01'],
+            'Stage III'
+        );
     });
 });
-
diff --git a/src/pages/patientView/clinicalInformation/lib/convertSamplesData.ts b/src/pages/patientView/clinicalInformation/lib/convertSamplesData.ts
index 972e37ea990..fe08e924c63 100644
--- a/src/pages/patientView/clinicalInformation/lib/convertSamplesData.ts
+++ b/src/pages/patientView/clinicalInformation/lib/convertSamplesData.ts
@@ -1,25 +1,31 @@
-import {ClinicalData, ClinicalAttribute, Sample} from '../../../../shared/api/generated/CBioPortalAPI';
-import { ClinicalDataBySampleId } from "../../../../shared/api/api-types-extended";
+import {
+    ClinicalData,
+    ClinicalAttribute,
+    Sample,
+} from '../../../../shared/api/generated/CBioPortalAPI';
+import { ClinicalDataBySampleId } from '../../../../shared/api/api-types-extended';
 
 export interface IColumn {
-    id:string;
-};
+    id: string;
+}
 
 export interface IAttrData {
-    [attrId:string]: {
+    [attrId: string]: {
         [sampleId: string]: ClinicalAttribute | string;
         clinicalAttribute: ClinicalAttribute;
         id: string;
     };
-};
+}
 
 export interface IConvertedSamplesData {
     columns: IColumn[];
     items: IAttrData;
 }
 
-export default function (data?: Array<ClinicalDataBySampleId>):IConvertedSamplesData {
-    const output:IConvertedSamplesData = { columns: [], items: {} };
+export default function(
+    data?: Array<ClinicalDataBySampleId>
+): IConvertedSamplesData {
+    const output: IConvertedSamplesData = { columns: [], items: {} };
 
     if (data)
         data.forEach((sample: ClinicalDataBySampleId) => {
@@ -28,13 +34,18 @@ export default function (data?: Array<ClinicalDataBySampleId>):IConvertedSamples
             output.columns.push({ id: sampleId });
 
             sample.clinicalData.forEach((clinicalData: ClinicalData) => {
-                output.items[clinicalData.clinicalAttributeId] = output.items[clinicalData.clinicalAttributeId] || {};
-                output.items[clinicalData.clinicalAttributeId][sampleId] = clinicalData.value.toString();
-                output.items[clinicalData.clinicalAttributeId].clinicalAttribute = clinicalData.clinicalAttribute;
-                output.items[clinicalData.clinicalAttributeId].id = clinicalData.clinicalAttributeId;
+                output.items[clinicalData.clinicalAttributeId] =
+                    output.items[clinicalData.clinicalAttributeId] || {};
+                output.items[clinicalData.clinicalAttributeId][
+                    sampleId
+                ] = clinicalData.value.toString();
+                output.items[
+                    clinicalData.clinicalAttributeId
+                ].clinicalAttribute = clinicalData.clinicalAttribute;
+                output.items[clinicalData.clinicalAttributeId].id =
+                    clinicalData.clinicalAttributeId;
             });
         });
 
     return output;
 }
-
diff --git a/src/pages/patientView/clinicalInformation/style/local.module.scss b/src/pages/patientView/clinicalInformation/style/local.module.scss
index 8fb4919f229..a8423ddbcde 100644
--- a/src/pages/patientView/clinicalInformation/style/local.module.scss
+++ b/src/pages/patientView/clinicalInformation/style/local.module.scss
@@ -1,12 +1,7 @@
 h4 {
-  margin-bottom:15px !important;
-
-
-  &:nth-child(n+2) {
-    margin-top:20px;
-  }
+    margin-bottom: 15px !important;
 
+    &:nth-child(n + 2) {
+        margin-top: 20px;
+    }
 }
-
-
-
diff --git a/src/pages/patientView/clinicalInformation/style/mutationalSignatureTable.module.scss b/src/pages/patientView/clinicalInformation/style/mutationalSignatureTable.module.scss
index 72f32a077c4..ca704f52d35 100644
--- a/src/pages/patientView/clinicalInformation/style/mutationalSignatureTable.module.scss
+++ b/src/pages/patientView/clinicalInformation/style/mutationalSignatureTable.module.scss
@@ -1,3 +1,3 @@
-.mutationalSignatureValue{
-  font-weight: bold;
-}
\ No newline at end of file
+.mutationalSignatureValue {
+    font-weight: bold;
+}
diff --git a/src/pages/patientView/clinicalInformation/style/patientTable.module.scss b/src/pages/patientView/clinicalInformation/style/patientTable.module.scss
index c4f50042477..ecef53ef8ce 100644
--- a/src/pages/patientView/clinicalInformation/style/patientTable.module.scss
+++ b/src/pages/patientView/clinicalInformation/style/patientTable.module.scss
@@ -3,6 +3,6 @@
     word-wrap: break-word;
 
     td:first-child {
-        width:300px;
+        width: 300px;
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/patientView/clinicalInformation/style/sampleTable.module.scss b/src/pages/patientView/clinicalInformation/style/sampleTable.module.scss
index 859a9ab6f99..4a6b5215046 100644
--- a/src/pages/patientView/clinicalInformation/style/sampleTable.module.scss
+++ b/src/pages/patientView/clinicalInformation/style/sampleTable.module.scss
@@ -1,9 +1,5 @@
 .sampleTable {
-
     tr th span {
-
         text-transform: capitalize;
-
     }
-
-}
\ No newline at end of file
+}
diff --git a/src/pages/patientView/copyNumberAlterations/CopyNumberTableWrapper.spec.tsx b/src/pages/patientView/copyNumberAlterations/CopyNumberTableWrapper.spec.tsx
index 9f417d790ed..6ac770c9857 100644
--- a/src/pages/patientView/copyNumberAlterations/CopyNumberTableWrapper.spec.tsx
+++ b/src/pages/patientView/copyNumberAlterations/CopyNumberTableWrapper.spec.tsx
@@ -1,47 +1,78 @@
 import React from 'react';
-import {ReactWrapper, mount} from "enzyme";
+import { ReactWrapper, mount } from 'enzyme';
 import { assert } from 'chai';
-import {default as CopyNumberTableWrapper} from "./CopyNumberTableWrapper"
+import { default as CopyNumberTableWrapper } from './CopyNumberTableWrapper';
 import { GeneFilterOption } from '../mutation/GeneFilterMenu';
 
-function hasColumn(tableWrapper:ReactWrapper<any, any>, columnName:string):boolean {
-    const columns:string[] = [];
-    tableWrapper.find('th span').map((span:ReactWrapper<any, any>)=>{columns.push(span.text())});
-    return (columns.indexOf(columnName) > -1);
+function hasColumn(
+    tableWrapper: ReactWrapper<any, any>,
+    columnName: string
+): boolean {
+    const columns: string[] = [];
+    tableWrapper.find('th span').map((span: ReactWrapper<any, any>) => {
+        columns.push(span.text());
+    });
+    return columns.indexOf(columnName) > -1;
 }
 
-function getTable(samples:string[], mrnaMolecularProfileId?:string):ReactWrapper<any, any> {
-    return mount(<CopyNumberTableWrapper
-        sampleManager={null}
-        sampleToGenePanelId={{}}
-        genePanelIdToEntrezGeneIds={{}}
-        sampleIds={samples}
-        gisticData={{}}
-        status="available"
-        referenceGenes={[]}
-        currentGeneFilter={GeneFilterOption.ANY_SAMPLE}
-        data={[]}
-        mrnaExprRankMolecularProfileId={mrnaMolecularProfileId}
-    />);
+function getTable(
+    samples: string[],
+    mrnaMolecularProfileId?: string
+): ReactWrapper<any, any> {
+    return mount(
+        <CopyNumberTableWrapper
+            sampleManager={null}
+            sampleToGenePanelId={{}}
+            genePanelIdToEntrezGeneIds={{}}
+            sampleIds={samples}
+            gisticData={{}}
+            status="available"
+            referenceGenes={[]}
+            currentGeneFilter={GeneFilterOption.ANY_SAMPLE}
+            data={[]}
+            mrnaExprRankMolecularProfileId={mrnaMolecularProfileId}
+        />
+    );
 }
 
-describe("CopyNumberTableWrapper", ()=>{
-    it("shows mrna expr column if theres one sample and a molecular profile id", ()=>{
-        assert(hasColumn(getTable(["sampleA"], "id"), "mRNA Expr."), "Has with one sample and id");
-        assert(!hasColumn(getTable(["sampleA"]), "mRNA Expr."), "Doesnt have with one sample and no id");
-        assert(!hasColumn(getTable([], "id"), "mRNA Expr."), "Doesn't have with 0 samples and id");
-        assert(!hasColumn(getTable(["sampleA", "sampleB"], "id"), "mRNA Expr."), "Doesn't have with 2 samples and id");
+describe('CopyNumberTableWrapper', () => {
+    it('shows mrna expr column if theres one sample and a molecular profile id', () => {
+        assert(
+            hasColumn(getTable(['sampleA'], 'id'), 'mRNA Expr.'),
+            'Has with one sample and id'
+        );
+        assert(
+            !hasColumn(getTable(['sampleA']), 'mRNA Expr.'),
+            'Doesnt have with one sample and no id'
+        );
+        assert(
+            !hasColumn(getTable([], 'id'), 'mRNA Expr.'),
+            "Doesn't have with 0 samples and id"
+        );
+        assert(
+            !hasColumn(getTable(['sampleA', 'sampleB'], 'id'), 'mRNA Expr.'),
+            "Doesn't have with 2 samples and id"
+        );
     });
 
-    it("shows samples column if theres more than one sample", ()=>{
-        assert(!hasColumn(getTable(["sampleA"]), "Samples"), "Doesnt have with one sample");
-        assert(!hasColumn(getTable(["sampleA"]), "Samples"), "Doesnt have with zero samples");
-        assert(hasColumn(getTable(["sampleA", "sampleB"]), "Samples"), "Has with two samples");
+    it('shows samples column if theres more than one sample', () => {
+        assert(
+            !hasColumn(getTable(['sampleA']), 'Samples'),
+            'Doesnt have with one sample'
+        );
+        assert(
+            !hasColumn(getTable(['sampleA']), 'Samples'),
+            'Doesnt have with zero samples'
+        );
+        assert(
+            hasColumn(getTable(['sampleA', 'sampleB']), 'Samples'),
+            'Has with two samples'
+        );
     });
 
     it('should have Samples column resizable', () => {
-        const aTable = getTable(["sampleA", "sampleB"]);
+        const aTable = getTable(['sampleA', 'sampleB']);
         const res = aTable.find('.columnResizer');
-        assert.equal(res.length, 2)
+        assert.equal(res.length, 2);
     });
 });
diff --git a/src/pages/patientView/copyNumberAlterations/CopyNumberTableWrapper.tsx b/src/pages/patientView/copyNumberAlterations/CopyNumberTableWrapper.tsx
index 8e8f4ceef0b..21acd86df02 100644
--- a/src/pages/patientView/copyNumberAlterations/CopyNumberTableWrapper.tsx
+++ b/src/pages/patientView/copyNumberAlterations/CopyNumberTableWrapper.tsx
@@ -1,69 +1,80 @@
 import * as React from 'react';
-import {observer} from "mobx-react";
-import {computed} from "mobx";
+import { observer } from 'mobx-react';
+import { computed } from 'mobx';
 import * as _ from 'lodash';
-import LazyMobXTable from "shared/components/lazyMobXTable/LazyMobXTable";
-import {CancerStudy, DiscreteCopyNumberData, Gene, ReferenceGenomeGene} from "shared/api/generated/CBioPortalAPI";
-import {Column} from "shared/components/lazyMobXTable/LazyMobXTable";
-import MrnaExprColumnFormatter from "shared/components/mutationTable/column/MrnaExprColumnFormatter";
-import {IColumnVisibilityControlsProps} from "shared/components/columnVisibilityControls/ColumnVisibilityControls";
-import CohortColumnFormatter from "./column/CohortColumnFormatter";
-import CnaColumnFormatter from "./column/CnaColumnFormatter";
-import AnnotationColumnFormatter from "./column/AnnotationColumnFormatter";
-import TumorColumnFormatter from "../mutation/column/TumorColumnFormatter";
-import SampleManager from "../SampleManager";
-import {IOncoKbCancerGenesWrapper, IOncoKbDataWrapper} from "shared/model/OncoKB";
-import OncoKbEvidenceCache from "shared/cache/OncoKbEvidenceCache";
-import PubMedCache from "shared/cache/PubMedCache";
-import MrnaExprRankCache from "shared/cache/MrnaExprRankCache";
-import {IGisticData} from "shared/model/Gistic";
-import CopyNumberCountCache from "../clinicalInformation/CopyNumberCountCache";
-import {ICivicGeneDataWrapper, ICivicVariantDataWrapper} from "shared/model/Civic.ts";
+import LazyMobXTable from 'shared/components/lazyMobXTable/LazyMobXTable';
+import {
+    CancerStudy,
+    DiscreteCopyNumberData,
+    Gene,
+    ReferenceGenomeGene,
+} from 'shared/api/generated/CBioPortalAPI';
+import { Column } from 'shared/components/lazyMobXTable/LazyMobXTable';
+import MrnaExprColumnFormatter from 'shared/components/mutationTable/column/MrnaExprColumnFormatter';
+import { IColumnVisibilityControlsProps } from 'shared/components/columnVisibilityControls/ColumnVisibilityControls';
+import CohortColumnFormatter from './column/CohortColumnFormatter';
+import CnaColumnFormatter from './column/CnaColumnFormatter';
+import AnnotationColumnFormatter from './column/AnnotationColumnFormatter';
+import TumorColumnFormatter from '../mutation/column/TumorColumnFormatter';
+import SampleManager from '../SampleManager';
+import {
+    IOncoKbCancerGenesWrapper,
+    IOncoKbDataWrapper,
+} from 'shared/model/OncoKB';
+import OncoKbEvidenceCache from 'shared/cache/OncoKbEvidenceCache';
+import PubMedCache from 'shared/cache/PubMedCache';
+import MrnaExprRankCache from 'shared/cache/MrnaExprRankCache';
+import { IGisticData } from 'shared/model/Gistic';
+import CopyNumberCountCache from '../clinicalInformation/CopyNumberCountCache';
+import {
+    ICivicGeneDataWrapper,
+    ICivicVariantDataWrapper,
+} from 'shared/model/Civic.ts';
 import HeaderIconMenu from '../mutation/HeaderIconMenu';
 import GeneFilterMenu, { GeneFilterOption } from '../mutation/GeneFilterMenu';
-import PanelColumnFormatter from "shared/components/mutationTable/column/PanelColumnFormatter";
+import PanelColumnFormatter from 'shared/components/mutationTable/column/PanelColumnFormatter';
 
-class CNATableComponent extends LazyMobXTable<DiscreteCopyNumberData[]> {
+class CNATableComponent extends LazyMobXTable<DiscreteCopyNumberData[]> {}
 
-}
-
-type CNATableColumn = Column<DiscreteCopyNumberData[]>&{order:number};
+type CNATableColumn = Column<DiscreteCopyNumberData[]> & { order: number };
 
 type ICopyNumberTableWrapperProps = {
-    studyIdToStudy?: {[studyId:string]:CancerStudy};
-    sampleIds:string[];
-    sampleManager:SampleManager|null;
-    sampleToGenePanelId:{[sampleId: string]: string|undefined};
-    genePanelIdToEntrezGeneIds:{[genePanelId: string]: number[]};
+    studyIdToStudy?: { [studyId: string]: CancerStudy };
+    sampleIds: string[];
+    sampleManager: SampleManager | null;
+    sampleToGenePanelId: { [sampleId: string]: string | undefined };
+    genePanelIdToEntrezGeneIds: { [genePanelId: string]: number[] };
     cnaOncoKbData?: IOncoKbDataWrapper;
     cnaCivicGenes?: ICivicGeneDataWrapper;
     cnaCivicVariants?: ICivicVariantDataWrapper;
-    oncoKbEvidenceCache?:OncoKbEvidenceCache;
-    oncoKbCancerGenes?:IOncoKbCancerGenesWrapper;
-    enableOncoKb?:boolean;
-    enableCivic?:boolean;
-    pubMedCache?:PubMedCache;
-    referenceGenes:ReferenceGenomeGene[];
-    data:DiscreteCopyNumberData[][];
-    copyNumberCountCache?:CopyNumberCountCache;
-    mrnaExprRankCache?:MrnaExprRankCache;
-    gisticData:IGisticData;
-    userEmailAddress?:string;
-    mrnaExprRankMolecularProfileId?:string;
-    columnVisibility?: {[columnId: string]: boolean};
+    oncoKbEvidenceCache?: OncoKbEvidenceCache;
+    oncoKbCancerGenes?: IOncoKbCancerGenesWrapper;
+    enableOncoKb?: boolean;
+    enableCivic?: boolean;
+    pubMedCache?: PubMedCache;
+    referenceGenes: ReferenceGenomeGene[];
+    data: DiscreteCopyNumberData[][];
+    copyNumberCountCache?: CopyNumberCountCache;
+    mrnaExprRankCache?: MrnaExprRankCache;
+    gisticData: IGisticData;
+    userEmailAddress?: string;
+    mrnaExprRankMolecularProfileId?: string;
+    columnVisibility?: { [columnId: string]: boolean };
     columnVisibilityProps?: IColumnVisibilityControlsProps;
-    status:"loading"|"available"|"unavailable";
-    showGeneFilterMenu?:boolean;
-    currentGeneFilter:GeneFilterOption;
-    onFilterGenes?:(option:GeneFilterOption)=>void;
-    sampleToMutationGenePanelId?: {[sampleId:string]:string};
-    onSelectGenePanel?:(name:string)=>void;
-    disableTooltip?:boolean;
+    status: 'loading' | 'available' | 'unavailable';
+    showGeneFilterMenu?: boolean;
+    currentGeneFilter: GeneFilterOption;
+    onFilterGenes?: (option: GeneFilterOption) => void;
+    sampleToMutationGenePanelId?: { [sampleId: string]: string };
+    onSelectGenePanel?: (name: string) => void;
+    disableTooltip?: boolean;
 };
 
 @observer
-export default class CopyNumberTableWrapper extends React.Component<ICopyNumberTableWrapperProps, {}> {
-
+export default class CopyNumberTableWrapper extends React.Component<
+    ICopyNumberTableWrapperProps,
+    {}
+> {
     public static defaultProps = {
         enableOncoKb: true,
         enableCivic: false,
@@ -72,15 +83,22 @@ export default class CopyNumberTableWrapper extends React.Component<ICopyNumberT
 
     @computed get hugoGeneSymbolToCytoband() {
         // build reference gene map
-        const result:{[hugosymbol:string]:string} =
-            this.props.referenceGenes!.reduce(
-                (map:{[hugosymbol:string]:string}, next:ReferenceGenomeGene)=>
-                { map[next.hugoGeneSymbol] = next.cytoband || '';return map;},
-                {});
+        const result: {
+            [hugosymbol: string]: string;
+        } = this.props.referenceGenes!.reduce(
+            (
+                map: { [hugosymbol: string]: string },
+                next: ReferenceGenomeGene
+            ) => {
+                map[next.hugoGeneSymbol] = next.cytoband || '';
+                return map;
+            },
+            {}
+        );
         return result;
     }
 
-    getCytobandForGene(hugoGeneSymbol:string) {
+    getCytobandForGene(hugoGeneSymbol: string) {
         return this.hugoGeneSymbolToCytoband[hugoGeneSymbol];
     }
 
@@ -90,134 +108,197 @@ export default class CopyNumberTableWrapper extends React.Component<ICopyNumberT
 
         if (numSamples >= 2) {
             columns.push({
-                name: "Samples",
-                render:(d:DiscreteCopyNumberData[])=>TumorColumnFormatter.renderFunction(d, this.props.sampleManager, this.props.sampleToGenePanelId, this.props.genePanelIdToEntrezGeneIds, this.props.onSelectGenePanel, this.props.disableTooltip),
-                sortBy:(d:DiscreteCopyNumberData[])=>TumorColumnFormatter.getSortValue(d, this.props.sampleManager),
-                download: (d:DiscreteCopyNumberData[])=>TumorColumnFormatter.getSample(d),
+                name: 'Samples',
+                render: (d: DiscreteCopyNumberData[]) =>
+                    TumorColumnFormatter.renderFunction(
+                        d,
+                        this.props.sampleManager,
+                        this.props.sampleToGenePanelId,
+                        this.props.genePanelIdToEntrezGeneIds,
+                        this.props.onSelectGenePanel,
+                        this.props.disableTooltip
+                    ),
+                sortBy: (d: DiscreteCopyNumberData[]) =>
+                    TumorColumnFormatter.getSortValue(
+                        d,
+                        this.props.sampleManager
+                    ),
+                download: (d: DiscreteCopyNumberData[]) =>
+                    TumorColumnFormatter.getSample(d),
                 order: 20,
                 resizable: true,
             });
         }
 
         columns.push({
-            name: "Gene",
-            render: (d:DiscreteCopyNumberData[])=><span data-test="cna-table-gene-column">{d[0].gene.hugoGeneSymbol}</span>,
-            filter: (d:DiscreteCopyNumberData[], filterString:string, filterStringUpper:string)=>{
+            name: 'Gene',
+            render: (d: DiscreteCopyNumberData[]) => (
+                <span data-test="cna-table-gene-column">
+                    {d[0].gene.hugoGeneSymbol}
+                </span>
+            ),
+            filter: (
+                d: DiscreteCopyNumberData[],
+                filterString: string,
+                filterStringUpper: string
+            ) => {
                 return d[0].gene.hugoGeneSymbol.indexOf(filterStringUpper) > -1;
             },
-            download: (d:DiscreteCopyNumberData[])=>d[0].gene.hugoGeneSymbol,
-            sortBy: (d:DiscreteCopyNumberData[])=>d[0].gene.hugoGeneSymbol,
-            headerRender: (name:string) => {
+            download: (d: DiscreteCopyNumberData[]) => d[0].gene.hugoGeneSymbol,
+            sortBy: (d: DiscreteCopyNumberData[]) => d[0].gene.hugoGeneSymbol,
+            headerRender: (name: string) => {
                 return (
-                    <HeaderIconMenu name={name} showIcon={this.props.showGeneFilterMenu} >
-                        <GeneFilterMenu onOptionChanged={this.props.onFilterGenes} currentSelection={this.props.currentGeneFilter} />
+                    <HeaderIconMenu
+                        name={name}
+                        showIcon={this.props.showGeneFilterMenu}
+                    >
+                        <GeneFilterMenu
+                            onOptionChanged={this.props.onFilterGenes}
+                            currentSelection={this.props.currentGeneFilter}
+                        />
                     </HeaderIconMenu>
                 );
             },
             visible: true,
-            order: 30
+            order: 30,
         });
-        
-        const GenePanelProps = (d:DiscreteCopyNumberData[]) => ({
+
+        const GenePanelProps = (d: DiscreteCopyNumberData[]) => ({
             data: d,
             sampleToGenePanelId: this.props.sampleToGenePanelId,
             sampleManager: this.props.sampleManager,
             genePanelIdToGene: this.props.genePanelIdToEntrezGeneIds,
-            onSelectGenePanel: this.props.onSelectGenePanel
+            onSelectGenePanel: this.props.onSelectGenePanel,
         });
-        
+
         columns.push({
-            name: "Gene panel",
-            render: (d:DiscreteCopyNumberData[]) => PanelColumnFormatter.renderFunction(GenePanelProps(d)),
-            download: (d:DiscreteCopyNumberData[]) => PanelColumnFormatter.download(GenePanelProps(d)),
-            sortBy: (d:DiscreteCopyNumberData[]) => PanelColumnFormatter.getGenePanelIds(GenePanelProps(d)),
+            name: 'Gene panel',
+            render: (d: DiscreteCopyNumberData[]) =>
+                PanelColumnFormatter.renderFunction(GenePanelProps(d)),
+            download: (d: DiscreteCopyNumberData[]) =>
+                PanelColumnFormatter.download(GenePanelProps(d)),
+            sortBy: (d: DiscreteCopyNumberData[]) =>
+                PanelColumnFormatter.getGenePanelIds(GenePanelProps(d)),
             visible: false,
-            order: 35
+            order: 35,
         });
 
         columns.push({
-            name: "CNA",
+            name: 'CNA',
             render: CnaColumnFormatter.renderFunction,
-            filter: (d:DiscreteCopyNumberData[], filterString:string, filterStringUpper:string)=>{
-                return CnaColumnFormatter.displayText(d).toUpperCase().indexOf(filterStringUpper) > -1;
+            filter: (
+                d: DiscreteCopyNumberData[],
+                filterString: string,
+                filterStringUpper: string
+            ) => {
+                return (
+                    CnaColumnFormatter.displayText(d)
+                        .toUpperCase()
+                        .indexOf(filterStringUpper) > -1
+                );
             },
             download: CnaColumnFormatter.download,
             sortBy: CnaColumnFormatter.sortValue,
             visible: true,
-            order: 40
+            order: 40,
         });
 
         columns.push({
-            name: "Annotation",
-            render: (d:DiscreteCopyNumberData[]) => (AnnotationColumnFormatter.renderFunction(d, {
-                oncoKbData: this.props.cnaOncoKbData,
-                oncoKbEvidenceCache: this.props.oncoKbEvidenceCache,
-                oncoKbCancerGenes: this.props.oncoKbCancerGenes,
-                enableOncoKb: this.props.enableOncoKb as boolean,
-                pubMedCache: this.props.pubMedCache,
-                civicGenes: this.props.cnaCivicGenes,
-                civicVariants: this.props.cnaCivicVariants,
-                enableCivic: this.props.enableCivic as boolean,
-                enableMyCancerGenome: false,
-                enableHotspot: false,
-                userEmailAddress: this.props.userEmailAddress,
-                studyIdToStudy: this.props.studyIdToStudy
-            })),
-            sortBy:(d:DiscreteCopyNumberData[])=>{
-                return AnnotationColumnFormatter.sortValue(d,
-                    this.props.oncoKbCancerGenes, this.props.cnaOncoKbData, this.props.cnaCivicGenes, this.props.cnaCivicVariants);
+            name: 'Annotation',
+            render: (d: DiscreteCopyNumberData[]) =>
+                AnnotationColumnFormatter.renderFunction(d, {
+                    oncoKbData: this.props.cnaOncoKbData,
+                    oncoKbEvidenceCache: this.props.oncoKbEvidenceCache,
+                    oncoKbCancerGenes: this.props.oncoKbCancerGenes,
+                    enableOncoKb: this.props.enableOncoKb as boolean,
+                    pubMedCache: this.props.pubMedCache,
+                    civicGenes: this.props.cnaCivicGenes,
+                    civicVariants: this.props.cnaCivicVariants,
+                    enableCivic: this.props.enableCivic as boolean,
+                    enableMyCancerGenome: false,
+                    enableHotspot: false,
+                    userEmailAddress: this.props.userEmailAddress,
+                    studyIdToStudy: this.props.studyIdToStudy,
+                }),
+            sortBy: (d: DiscreteCopyNumberData[]) => {
+                return AnnotationColumnFormatter.sortValue(
+                    d,
+                    this.props.oncoKbCancerGenes,
+                    this.props.cnaOncoKbData,
+                    this.props.cnaCivicGenes,
+                    this.props.cnaCivicVariants
+                );
             },
-            order: 50
+            order: 50,
         });
 
         columns.push({
-            name: "Cytoband",
-            render: (d:DiscreteCopyNumberData[])=><span>{this.getCytobandForGene(d[0].gene.hugoGeneSymbol)}</span>,
-            sortBy: (d:DiscreteCopyNumberData[])=>this.getCytobandForGene(d[0].gene.hugoGeneSymbol),
+            name: 'Cytoband',
+            render: (d: DiscreteCopyNumberData[]) => (
+                <span>{this.getCytobandForGene(d[0].gene.hugoGeneSymbol)}</span>
+            ),
+            sortBy: (d: DiscreteCopyNumberData[]) =>
+                this.getCytobandForGene(d[0].gene.hugoGeneSymbol),
             visible: true,
-            order: 60
+            order: 60,
         });
 
         columns.push({
-            name:"Cohort",
-            render:(d:DiscreteCopyNumberData[])=>(this.props.copyNumberCountCache
-                ? CohortColumnFormatter.renderFunction(d,
-                    this.props.copyNumberCountCache,
-                    this.props.gisticData)
-                : (<span/>)),
-            sortBy:(d:DiscreteCopyNumberData[]) => {
+            name: 'Cohort',
+            render: (d: DiscreteCopyNumberData[]) =>
+                this.props.copyNumberCountCache ? (
+                    CohortColumnFormatter.renderFunction(
+                        d,
+                        this.props.copyNumberCountCache,
+                        this.props.gisticData
+                    )
+                ) : (
+                    <span />
+                ),
+            sortBy: (d: DiscreteCopyNumberData[]) => {
                 if (this.props.copyNumberCountCache) {
-                    return CohortColumnFormatter.getSortValue(d, this.props.copyNumberCountCache);
+                    return CohortColumnFormatter.getSortValue(
+                        d,
+                        this.props.copyNumberCountCache
+                    );
                 } else {
                     return 0;
                 }
             },
-            tooltip: (<span>Alteration frequency in cohort</span>),
-            defaultSortDirection: "desc",
-            order: 80
+            tooltip: <span>Alteration frequency in cohort</span>,
+            defaultSortDirection: 'desc',
+            order: 80,
         });
 
-        if ((numSamples === 1) && this.props.mrnaExprRankMolecularProfileId) {
+        if (numSamples === 1 && this.props.mrnaExprRankMolecularProfileId) {
             columns.push({
-                name: "mRNA Expr.",
-                render: (d:DiscreteCopyNumberData[])=>(this.props.mrnaExprRankCache
-                                    ? MrnaExprColumnFormatter.cnaRenderFunction(d, this.props.mrnaExprRankCache)
-                                    : (<span/>)),
-                order: 70
+                name: 'mRNA Expr.',
+                render: (d: DiscreteCopyNumberData[]) =>
+                    this.props.mrnaExprRankCache ? (
+                        MrnaExprColumnFormatter.cnaRenderFunction(
+                            d,
+                            this.props.mrnaExprRankCache
+                        )
+                    ) : (
+                        <span />
+                    ),
+                order: 70,
             });
         }
 
-        const orderedColumns = _.sortBy(columns, (c:CNATableColumn)=>c.order);
+        const orderedColumns = _.sortBy(
+            columns,
+            (c: CNATableColumn) => c.order
+        );
         return (
             <div>
-            {
-                (this.props.status === "unavailable") && (
-                    <div className="alert alert-info" role="alert">Copy Number Alterations are not available.</div>
-                )
-            }
-
-            {
-                (this.props.status === "available") && (
+                {this.props.status === 'unavailable' && (
+                    <div className="alert alert-info" role="alert">
+                        Copy Number Alterations are not available.
+                    </div>
+                )}
+
+                {this.props.status === 'available' && (
                     <CNATableComponent
                         columns={orderedColumns}
                         data={this.props.data}
@@ -230,13 +311,8 @@ export default class CopyNumberTableWrapper extends React.Component<ICopyNumberT
                         columnVisibility={this.props.columnVisibility}
                         columnVisibilityProps={this.props.columnVisibilityProps}
                     />
-                )
-            }
+                )}
             </div>
         );
     }
 }
-
-
-
-
diff --git a/src/pages/patientView/copyNumberAlterations/column/AnnotationColumnFormatter.spec.tsx b/src/pages/patientView/copyNumberAlterations/column/AnnotationColumnFormatter.spec.tsx
index 7b9e8bfa5ca..8765cb19113 100644
--- a/src/pages/patientView/copyNumberAlterations/column/AnnotationColumnFormatter.spec.tsx
+++ b/src/pages/patientView/copyNumberAlterations/column/AnnotationColumnFormatter.spec.tsx
@@ -3,60 +3,73 @@ import React from 'react';
 import { assert } from 'chai';
 import { shallow, mount } from 'enzyme';
 import sinon from 'sinon';
-import {getCivicGenes, getCnaCivicVariants, getCnaData, getExpectedCnaCivicEntry, getCnaCivicEmptyVariants} from "test/CivicMockUtils";
-import {ICivicEntry} from "shared/model/Civic";
+import {
+    getCivicGenes,
+    getCnaCivicVariants,
+    getCnaData,
+    getExpectedCnaCivicEntry,
+    getCnaCivicEmptyVariants,
+} from 'test/CivicMockUtils';
+import { ICivicEntry } from 'shared/model/Civic';
 
 describe('AnnotationColumnFormatter', () => {
+    before(() => {});
 
-    before(()=>{
-
-    });
-
-    after(()=>{
-
-    });
+    after(() => {});
 
     it('properly creates a civic entry', () => {
-
         let civicGenes = getCivicGenes();
 
         let civicVariants = getCnaCivicVariants();
-        
+
         let cna = getCnaData();
 
         let expectedCivicEntry = getExpectedCnaCivicEntry();
 
         assert.deepEqual(
-            AnnotationColumnFormatter.getCivicEntry(cna, civicGenes, civicVariants), expectedCivicEntry,
-            'Equal Civic Entry');
-
+            AnnotationColumnFormatter.getCivicEntry(
+                cna,
+                civicGenes,
+                civicVariants
+            ),
+            expectedCivicEntry,
+            'Equal Civic Entry'
+        );
     });
-    
+
     it('properly points that Civic has variants', () => {
-        
         let civicGenes = getCivicGenes();
 
         let civicVariants = getCnaCivicVariants();
-        
+
         let cna = getCnaData();
-        
+
         assert.deepEqual(
-            AnnotationColumnFormatter.hasCivicVariants(cna, civicGenes, civicVariants), true,
-            'Civic has variants');
+            AnnotationColumnFormatter.hasCivicVariants(
+                cna,
+                civicGenes,
+                civicVariants
+            ),
+            true,
+            'Civic has variants'
+        );
     });
-    
+
     it('properly points that Civic has no variants', () => {
-        
         let civicGenes = getCivicGenes();
 
         let civicVariants = getCnaCivicEmptyVariants();
-        
+
         let cna = getCnaData();
-        
+
         assert.deepEqual(
-            AnnotationColumnFormatter.hasCivicVariants(cna, civicGenes, civicVariants), false,
-            'Civic has no variants');
+            AnnotationColumnFormatter.hasCivicVariants(
+                cna,
+                civicGenes,
+                civicVariants
+            ),
+            false,
+            'Civic has no variants'
+        );
     });
-
-
 });
diff --git a/src/pages/patientView/copyNumberAlterations/column/AnnotationColumnFormatter.tsx b/src/pages/patientView/copyNumberAlterations/column/AnnotationColumnFormatter.tsx
index 1da34c057b5..db9b9293de0 100644
--- a/src/pages/patientView/copyNumberAlterations/column/AnnotationColumnFormatter.tsx
+++ b/src/pages/patientView/copyNumberAlterations/column/AnnotationColumnFormatter.tsx
@@ -1,128 +1,200 @@
 import * as React from 'react';
-import * as _ from "lodash";
-import {oncoKbAnnotationSortValue} from "react-mutation-mapper";
-import {CancerStudy, DiscreteCopyNumberData} from "shared/api/generated/CBioPortalAPI";
+import * as _ from 'lodash';
+import { oncoKbAnnotationSortValue } from 'react-mutation-mapper';
 import {
-    IAnnotation, IAnnotationColumnProps, default as DefaultAnnotationColumnFormatter
-} from "shared/components/mutationTable/column/AnnotationColumnFormatter";
-import {IOncoKbCancerGenesWrapper, IOncoKbData, IOncoKbDataWrapper} from "shared/model/OncoKB";
-import Civic from "shared/components/annotation/Civic";
-import {generateQueryVariant} from "shared/lib/OncoKbUtils";
+    CancerStudy,
+    DiscreteCopyNumberData,
+} from 'shared/api/generated/CBioPortalAPI';
+import {
+    IAnnotation,
+    IAnnotationColumnProps,
+    default as DefaultAnnotationColumnFormatter,
+} from 'shared/components/mutationTable/column/AnnotationColumnFormatter';
+import {
+    IOncoKbCancerGenesWrapper,
+    IOncoKbData,
+    IOncoKbDataWrapper,
+} from 'shared/model/OncoKB';
+import Civic from 'shared/components/annotation/Civic';
+import { generateQueryVariant } from 'shared/lib/OncoKbUtils';
 import {
     CancerGene,
     generateQueryVariantId,
     IndicatorQueryResp,
-    Query
-} from "cbioportal-frontend-commons";
-import {getAlterationString} from "shared/lib/CopyNumberUtils";
-import {ICivicVariant, ICivicGene, ICivicEntry, ICivicVariantData, ICivicGeneData, ICivicGeneDataWrapper, ICivicVariantDataWrapper} from "shared/model/Civic.ts";
-import {buildCivicEntry, getCivicCNAVariants} from "shared/lib/CivicUtils";
+    Query,
+} from 'cbioportal-frontend-commons';
+import { getAlterationString } from 'shared/lib/CopyNumberUtils';
+import {
+    ICivicVariant,
+    ICivicGene,
+    ICivicEntry,
+    ICivicVariantData,
+    ICivicGeneData,
+    ICivicGeneDataWrapper,
+    ICivicVariantDataWrapper,
+} from 'shared/model/Civic.ts';
+import { buildCivicEntry, getCivicCNAVariants } from 'shared/lib/CivicUtils';
 
 /**
  * @author Selcuk Onur Sumer
  */
-export default class AnnotationColumnFormatter
-{
-    public static getData(copyNumberData:DiscreteCopyNumberData[]|undefined,
-                          oncoKbCancerGenes? :IOncoKbCancerGenesWrapper,
-                          oncoKbData?: IOncoKbDataWrapper,
-                          civicGenes?: ICivicGeneDataWrapper,
-                          civicVariants?: ICivicVariantDataWrapper,
-                          studyIdToStudy?: {[studyId:string]:CancerStudy})
-    {
+export default class AnnotationColumnFormatter {
+    public static getData(
+        copyNumberData: DiscreteCopyNumberData[] | undefined,
+        oncoKbCancerGenes?: IOncoKbCancerGenesWrapper,
+        oncoKbData?: IOncoKbDataWrapper,
+        civicGenes?: ICivicGeneDataWrapper,
+        civicVariants?: ICivicVariantDataWrapper,
+        studyIdToStudy?: { [studyId: string]: CancerStudy }
+    ) {
         let value: IAnnotation;
 
-        if (copyNumberData)
-        {
-            let oncoKbIndicator: IndicatorQueryResp|undefined = undefined;
-            let oncoKbStatus:IAnnotation["oncoKbStatus"] = "complete";
+        if (copyNumberData) {
+            let oncoKbIndicator: IndicatorQueryResp | undefined = undefined;
+            let oncoKbStatus: IAnnotation['oncoKbStatus'] = 'complete';
             let hugoGeneSymbol = copyNumberData[0].gene.hugoGeneSymbol;
 
             let oncoKbGeneExist = false;
             let isOncoKbCancerGene = false;
-            if( oncoKbCancerGenes && !(oncoKbCancerGenes instanceof Error)) {
-                oncoKbGeneExist = _.find(oncoKbCancerGenes.result, (gene: CancerGene) => gene.oncokbAnnotated && gene.entrezGeneId === copyNumberData[0].entrezGeneId) !== undefined;
-                isOncoKbCancerGene = _.find(oncoKbCancerGenes.result, (gene: CancerGene) => gene.entrezGeneId === copyNumberData[0].entrezGeneId) !== undefined;
+            if (oncoKbCancerGenes && !(oncoKbCancerGenes instanceof Error)) {
+                oncoKbGeneExist =
+                    _.find(
+                        oncoKbCancerGenes.result,
+                        (gene: CancerGene) =>
+                            gene.oncokbAnnotated &&
+                            gene.entrezGeneId === copyNumberData[0].entrezGeneId
+                    ) !== undefined;
+                isOncoKbCancerGene =
+                    _.find(
+                        oncoKbCancerGenes.result,
+                        (gene: CancerGene) =>
+                            gene.entrezGeneId === copyNumberData[0].entrezGeneId
+                    ) !== undefined;
             }
 
             // oncoKbData may exist but it might be an instance of Error, in that case we flag the status as error
             if (oncoKbData && oncoKbData.result instanceof Error) {
-                oncoKbStatus = "error";
-            }
-            else if (oncoKbGeneExist) {
+                oncoKbStatus = 'error';
+            } else if (oncoKbGeneExist) {
                 // actually, oncoKbData.result shouldn't be an instance of Error in this case (we already check it above),
                 // but we need to check it again in order to avoid TS errors/warnings
-                if (oncoKbData &&
+                if (
+                    oncoKbData &&
                     oncoKbData.result &&
                     !(oncoKbData.result instanceof Error) &&
-                    oncoKbData.status === "complete")
-                {
-                    oncoKbIndicator = AnnotationColumnFormatter.getIndicatorData(copyNumberData, oncoKbData.result, studyIdToStudy);
+                    oncoKbData.status === 'complete'
+                ) {
+                    oncoKbIndicator = AnnotationColumnFormatter.getIndicatorData(
+                        copyNumberData,
+                        oncoKbData.result,
+                        studyIdToStudy
+                    );
                 }
-                oncoKbStatus = oncoKbData ? oncoKbData.status : "pending";
+                oncoKbStatus = oncoKbData ? oncoKbData.status : 'pending';
             }
 
-
             value = {
                 hugoGeneSymbol,
                 oncoKbStatus,
                 oncoKbIndicator,
                 oncoKbGeneExist,
                 isOncoKbCancerGene,
-                civicEntry: civicGenes && civicGenes.result && civicVariants && civicVariants.result?
-                    AnnotationColumnFormatter.getCivicEntry(copyNumberData, civicGenes.result, civicVariants.result) : undefined,
-                civicStatus: civicGenes && civicGenes.status && civicVariants && civicVariants.status ?
-                        AnnotationColumnFormatter.getCivicStatus(civicGenes.status, civicVariants.status) : "pending",
-                hasCivicVariants: civicGenes && civicGenes.result && civicVariants && civicVariants.result ?
-                    AnnotationColumnFormatter.hasCivicVariants(copyNumberData, civicGenes.result, civicVariants.result) : true,
+                civicEntry:
+                    civicGenes &&
+                    civicGenes.result &&
+                    civicVariants &&
+                    civicVariants.result
+                        ? AnnotationColumnFormatter.getCivicEntry(
+                              copyNumberData,
+                              civicGenes.result,
+                              civicVariants.result
+                          )
+                        : undefined,
+                civicStatus:
+                    civicGenes &&
+                    civicGenes.status &&
+                    civicVariants &&
+                    civicVariants.status
+                        ? AnnotationColumnFormatter.getCivicStatus(
+                              civicGenes.status,
+                              civicVariants.status
+                          )
+                        : 'pending',
+                hasCivicVariants:
+                    civicGenes &&
+                    civicGenes.result &&
+                    civicVariants &&
+                    civicVariants.result
+                        ? AnnotationColumnFormatter.hasCivicVariants(
+                              copyNumberData,
+                              civicGenes.result,
+                              civicVariants.result
+                          )
+                        : true,
                 myCancerGenomeLinks: [],
-                hotspotStatus: "complete",
+                hotspotStatus: 'complete',
                 isHotspot: false,
-                is3dHotspot: false
+                is3dHotspot: false,
             };
-        }
-        else {
+        } else {
             value = DefaultAnnotationColumnFormatter.DEFAULT_ANNOTATION_DATA;
         }
 
         return value;
     }
 
-   /**
-    * Returns an ICivicEntry if the civicGenes and civicVariants have information about the gene and the mutation (variant) specified. Otherwise it returns
-    * an empty object.
-    */
-    public static getCivicEntry(copyNumberData:DiscreteCopyNumberData[], civicGenes:ICivicGene, 
-                                civicVariants:ICivicVariant): ICivicEntry | null
-    {
+    /**
+     * Returns an ICivicEntry if the civicGenes and civicVariants have information about the gene and the mutation (variant) specified. Otherwise it returns
+     * an empty object.
+     */
+    public static getCivicEntry(
+        copyNumberData: DiscreteCopyNumberData[],
+        civicGenes: ICivicGene,
+        civicVariants: ICivicVariant
+    ): ICivicEntry | null {
         let civicEntry = null;
         let geneSymbol: string = copyNumberData[0].gene.hugoGeneSymbol;
-        let geneVariants:{[name: string]: ICivicVariantData} = getCivicCNAVariants(copyNumberData, geneSymbol, civicVariants);
+        let geneVariants: {
+            [name: string]: ICivicVariantData;
+        } = getCivicCNAVariants(copyNumberData, geneSymbol, civicVariants);
         let geneEntry: ICivicGeneData = civicGenes[geneSymbol];
         //geneEntry must exists, and only return data for genes with variants or it has a description provided by the Civic API
-        if (geneEntry && (!_.isEmpty(geneVariants) || geneEntry.description !== "")) {
+        if (
+            geneEntry &&
+            (!_.isEmpty(geneVariants) || geneEntry.description !== '')
+        ) {
             civicEntry = buildCivicEntry(geneEntry, geneVariants);
         }
 
         return civicEntry;
     }
-    
-    public static getCivicStatus(civicGenesStatus:"pending" | "error" | "complete", civicVariantsStatus:"pending" | "error" | "complete"): "pending" | "error" | "complete"
-    {
-    if (civicGenesStatus === "error" || civicVariantsStatus === "error") {
-        return "error";
-    }
-    if (civicGenesStatus === "complete" && civicVariantsStatus === "complete") {
-        return "complete";
-    }
-    
-    return "pending";
+
+    public static getCivicStatus(
+        civicGenesStatus: 'pending' | 'error' | 'complete',
+        civicVariantsStatus: 'pending' | 'error' | 'complete'
+    ): 'pending' | 'error' | 'complete' {
+        if (civicGenesStatus === 'error' || civicVariantsStatus === 'error') {
+            return 'error';
+        }
+        if (
+            civicGenesStatus === 'complete' &&
+            civicVariantsStatus === 'complete'
+        ) {
+            return 'complete';
+        }
+
+        return 'pending';
     }
 
-    public static hasCivicVariants (copyNumberData:DiscreteCopyNumberData[], civicGenes:ICivicGene, civicVariants:ICivicVariant): boolean
-    {
+    public static hasCivicVariants(
+        copyNumberData: DiscreteCopyNumberData[],
+        civicGenes: ICivicGene,
+        civicVariants: ICivicVariant
+    ): boolean {
         let geneSymbol: string = copyNumberData[0].gene.hugoGeneSymbol;
-        let geneVariants:{[name: string]: ICivicVariantData} = getCivicCNAVariants(copyNumberData, geneSymbol, civicVariants);
+        let geneVariants: {
+            [name: string]: ICivicVariantData;
+        } = getCivicCNAVariants(copyNumberData, geneSymbol, civicVariants);
         let geneEntry: ICivicGeneData = civicGenes[geneSymbol];
 
         if (geneEntry && _.isEmpty(geneVariants)) {
@@ -132,21 +204,31 @@ export default class AnnotationColumnFormatter
         return true;
     }
 
-    public static getIndicatorData(copyNumberData:DiscreteCopyNumberData[], oncoKbData:IOncoKbData, studyIdToStudy?: {[studyId:string]:CancerStudy}): IndicatorQueryResp|undefined
-    {
-        if (oncoKbData.uniqueSampleKeyToTumorType === null || oncoKbData.indicatorMap === null) {
+    public static getIndicatorData(
+        copyNumberData: DiscreteCopyNumberData[],
+        oncoKbData: IOncoKbData,
+        studyIdToStudy?: { [studyId: string]: CancerStudy }
+    ): IndicatorQueryResp | undefined {
+        if (
+            oncoKbData.uniqueSampleKeyToTumorType === null ||
+            oncoKbData.indicatorMap === null
+        ) {
             return undefined;
         }
 
-        const id = generateQueryVariantId(copyNumberData[0].gene.entrezGeneId,
-            oncoKbData.uniqueSampleKeyToTumorType[copyNumberData[0].uniqueSampleKey],
-            getAlterationString(copyNumberData[0].alteration));
+        const id = generateQueryVariantId(
+            copyNumberData[0].gene.entrezGeneId,
+            oncoKbData.uniqueSampleKeyToTumorType[
+                copyNumberData[0].uniqueSampleKey
+            ],
+            getAlterationString(copyNumberData[0].alteration)
+        );
 
         if (oncoKbData.indicatorMap[id]) {
             let indicator = oncoKbData.indicatorMap[id];
             if (indicator.query.tumorType === null && studyIdToStudy) {
                 const studyMetaData = studyIdToStudy[copyNumberData[0].studyId];
-                if (studyMetaData.cancerTypeId !== "mixed") {           
+                if (studyMetaData.cancerTypeId !== 'mixed') {
                     indicator.query.tumorType = studyMetaData.cancerType.name;
                 }
             }
@@ -156,42 +238,76 @@ export default class AnnotationColumnFormatter
         }
     }
 
-    public static getEvidenceQuery(copyNumberData:DiscreteCopyNumberData[], oncoKbData:IOncoKbData): Query|undefined
-    {
+    public static getEvidenceQuery(
+        copyNumberData: DiscreteCopyNumberData[],
+        oncoKbData: IOncoKbData
+    ): Query | undefined {
         // return null in case sampleToTumorMap is null
-        return oncoKbData.uniqueSampleKeyToTumorType ? generateQueryVariant(copyNumberData[0].gene.entrezGeneId,
-            oncoKbData.uniqueSampleKeyToTumorType[copyNumberData[0].uniqueSampleKey],
-            getAlterationString(copyNumberData[0].alteration)
-        ) : undefined;
+        return oncoKbData.uniqueSampleKeyToTumorType
+            ? generateQueryVariant(
+                  copyNumberData[0].gene.entrezGeneId,
+                  oncoKbData.uniqueSampleKeyToTumorType[
+                      copyNumberData[0].uniqueSampleKey
+                  ],
+                  getAlterationString(copyNumberData[0].alteration)
+              )
+            : undefined;
     }
 
-    public static sortValue(data:DiscreteCopyNumberData[],
-                            oncoKbCancerGenes? :IOncoKbCancerGenesWrapper,
-                            oncoKbData?: IOncoKbDataWrapper,
-                            civicGenes?: ICivicGeneDataWrapper,
-                            civicVariants?: ICivicVariantDataWrapper):number[] {
-        const annotationData:IAnnotation = AnnotationColumnFormatter.getData(data, oncoKbCancerGenes, oncoKbData, civicGenes, civicVariants);
+    public static sortValue(
+        data: DiscreteCopyNumberData[],
+        oncoKbCancerGenes?: IOncoKbCancerGenesWrapper,
+        oncoKbData?: IOncoKbDataWrapper,
+        civicGenes?: ICivicGeneDataWrapper,
+        civicVariants?: ICivicVariantDataWrapper
+    ): number[] {
+        const annotationData: IAnnotation = AnnotationColumnFormatter.getData(
+            data,
+            oncoKbCancerGenes,
+            oncoKbData,
+            civicGenes,
+            civicVariants
+        );
 
-        return _.flatten([oncoKbAnnotationSortValue(annotationData.oncoKbIndicator), Civic.sortValue(annotationData.civicEntry), annotationData.isOncoKbCancerGene ? 1 : 0]);
+        return _.flatten([
+            oncoKbAnnotationSortValue(annotationData.oncoKbIndicator),
+            Civic.sortValue(annotationData.civicEntry),
+            annotationData.isOncoKbCancerGene ? 1 : 0,
+        ]);
     }
 
-    public static renderFunction(data:DiscreteCopyNumberData[], columnProps:IAnnotationColumnProps)
-    {
-        const annotation:IAnnotation = AnnotationColumnFormatter.getData(data, columnProps.oncoKbCancerGenes, columnProps.oncoKbData, columnProps.civicGenes, columnProps.civicVariants, columnProps.studyIdToStudy);
+    public static renderFunction(
+        data: DiscreteCopyNumberData[],
+        columnProps: IAnnotationColumnProps
+    ) {
+        const annotation: IAnnotation = AnnotationColumnFormatter.getData(
+            data,
+            columnProps.oncoKbCancerGenes,
+            columnProps.oncoKbData,
+            columnProps.civicGenes,
+            columnProps.civicVariants,
+            columnProps.studyIdToStudy
+        );
 
-        let evidenceQuery:Query|undefined;
+        let evidenceQuery: Query | undefined;
 
-        if (columnProps.oncoKbData &&
+        if (
+            columnProps.oncoKbData &&
             columnProps.oncoKbData.result &&
-            !(columnProps.oncoKbData.result instanceof Error))
-        {
-            evidenceQuery = this.getEvidenceQuery(data, columnProps.oncoKbData.result);
+            !(columnProps.oncoKbData.result instanceof Error)
+        ) {
+            evidenceQuery = this.getEvidenceQuery(
+                data,
+                columnProps.oncoKbData.result
+            );
         }
 
-        return DefaultAnnotationColumnFormatter.mainContent(annotation,
+        return DefaultAnnotationColumnFormatter.mainContent(
+            annotation,
             columnProps,
             columnProps.oncoKbEvidenceCache,
             evidenceQuery,
-            columnProps.pubMedCache);
+            columnProps.pubMedCache
+        );
     }
 }
diff --git a/src/pages/patientView/copyNumberAlterations/column/CnaColumnFormatter.spec.tsx b/src/pages/patientView/copyNumberAlterations/column/CnaColumnFormatter.spec.tsx
index f1ceb345dc7..4305b02d31b 100644
--- a/src/pages/patientView/copyNumberAlterations/column/CnaColumnFormatter.spec.tsx
+++ b/src/pages/patientView/copyNumberAlterations/column/CnaColumnFormatter.spec.tsx
@@ -1,30 +1,33 @@
-import { default as CnaColumnFormatter, AlterationTypes } from './CnaColumnFormatter';
+import {
+    default as CnaColumnFormatter,
+    AlterationTypes,
+} from './CnaColumnFormatter';
 import React from 'react';
 import { assert } from 'chai';
 import { shallow, mount } from 'enzyme';
 import sinon from 'sinon';
-import {DiscreteCopyNumberData} from "../../../../shared/api/generated/CBioPortalAPI";
+import { DiscreteCopyNumberData } from '../../../../shared/api/generated/CBioPortalAPI';
 
 describe('CnaColumnFormatter', () => {
+    before(() => {});
 
-    before(() => {
-
-    });
-
-    after(() => {
-
-    });
+    after(() => {});
 
     it('CNA column renderer shows correct text based on alteration value', () => {
-
-        let output = mount(CnaColumnFormatter.renderFunction([{alteration:-2} as DiscreteCopyNumberData]));
+        let output = mount(
+            CnaColumnFormatter.renderFunction([
+                { alteration: -2 } as DiscreteCopyNumberData,
+            ])
+        );
 
         assert.equal(output.text(), 'DeepDel');
 
-        output = mount(CnaColumnFormatter.renderFunction([{alteration:2} as DiscreteCopyNumberData]));
+        output = mount(
+            CnaColumnFormatter.renderFunction([
+                { alteration: 2 } as DiscreteCopyNumberData,
+            ])
+        );
 
         assert.equal(output.text(), 'AMP');
-
     });
-
 });
diff --git a/src/pages/patientView/copyNumberAlterations/column/CnaColumnFormatter.tsx b/src/pages/patientView/copyNumberAlterations/column/CnaColumnFormatter.tsx
index 10edec621cc..2655b4c42a8 100644
--- a/src/pages/patientView/copyNumberAlterations/column/CnaColumnFormatter.tsx
+++ b/src/pages/patientView/copyNumberAlterations/column/CnaColumnFormatter.tsx
@@ -1,22 +1,20 @@
 import * as React from 'react';
-import {DiscreteCopyNumberData} from "shared/api/generated/CBioPortalAPI";
+import { DiscreteCopyNumberData } from 'shared/api/generated/CBioPortalAPI';
 
 export enum AlterationTypes {
     'DeepDel' = -2,
-    'AMP'= 2
+    'AMP' = 2,
 }
 
-export default class CnaColumnFormatter
-{
-    public static displayText(d:DiscreteCopyNumberData[]) {
+export default class CnaColumnFormatter {
+    public static displayText(d: DiscreteCopyNumberData[]) {
         return AlterationTypes[d[0].alteration];
     }
 
-    public static renderFunction(d:DiscreteCopyNumberData[])
-    {
+    public static renderFunction(d: DiscreteCopyNumberData[]) {
         let color = null;
         let value = d[0].alteration;
-        switch(value) {
+        switch (value) {
             case -2:
                 color = '#0000FF';
                 break;
@@ -25,20 +23,21 @@ export default class CnaColumnFormatter
                 break;
         }
         if (!color) {
-            return (<span/>);
+            return <span />;
         } else {
-            return (<span style={{color}}>{CnaColumnFormatter.displayText(d)}</span>);
+            return (
+                <span style={{ color }}>
+                    {CnaColumnFormatter.displayText(d)}
+                </span>
+            );
         }
     }
 
-    public static download(d:DiscreteCopyNumberData[])
-    {
+    public static download(d: DiscreteCopyNumberData[]) {
         return AlterationTypes[d[0].alteration];
     }
 
-    public static sortValue(d:DiscreteCopyNumberData[])
-    {
+    public static sortValue(d: DiscreteCopyNumberData[]) {
         return d[0].alteration;
     }
 }
-
diff --git a/src/pages/patientView/copyNumberAlterations/column/CohortColumnFormatter.spec.tsx b/src/pages/patientView/copyNumberAlterations/column/CohortColumnFormatter.spec.tsx
index 0a860cec8bf..aae576fe465 100644
--- a/src/pages/patientView/copyNumberAlterations/column/CohortColumnFormatter.spec.tsx
+++ b/src/pages/patientView/copyNumberAlterations/column/CohortColumnFormatter.spec.tsx
@@ -1,146 +1,194 @@
 import CohortColumnFormatter from './CohortColumnFormatter';
-import {IGisticData} from "shared/model/Gistic";
-import {DiscreteCopyNumberData, CopyNumberCount, CopyNumberCountIdentifier} from "shared/api/generated/CBioPortalAPI";
+import { IGisticData } from 'shared/model/Gistic';
+import {
+    DiscreteCopyNumberData,
+    CopyNumberCount,
+    CopyNumberCountIdentifier,
+} from 'shared/api/generated/CBioPortalAPI';
 import React from 'react';
 import { assert } from 'chai';
-import {shallow, mount, ReactWrapper} from 'enzyme';
+import { shallow, mount, ReactWrapper } from 'enzyme';
 import sinon from 'sinon';
-import CopyNumberCountCache from "../../clinicalInformation/CopyNumberCountCache";
-import {CacheData} from "../../clinicalInformation/SampleGeneCache";
+import CopyNumberCountCache from '../../clinicalInformation/CopyNumberCountCache';
+import { CacheData } from '../../clinicalInformation/SampleGeneCache';
 
 describe('CohortColumnFormatter', () => {
-
-    const copyNumberData:DiscreteCopyNumberData[] = [
+    const copyNumberData: DiscreteCopyNumberData[] = [
         {
             alteration: -2,
             entrezGeneId: 0,
             gene: {
-                geneticEntityId:0,
+                geneticEntityId: 0,
                 entrezGeneId: 0,
-                hugoGeneSymbol: "BRCA2",
-                type: ""
+                hugoGeneSymbol: 'BRCA2',
+                type: '',
             },
-            molecularProfileId: "alterations",
-            sampleId: "SAMPLE_01",
-            patientId: "PATIENT1",
-            studyId: "STUDY1",
-            uniquePatientKey: "",
-            uniqueSampleKey: ""
+            molecularProfileId: 'alterations',
+            sampleId: 'SAMPLE_01',
+            patientId: 'PATIENT1',
+            studyId: 'STUDY1',
+            uniquePatientKey: '',
+            uniqueSampleKey: '',
         },
         {
             alteration: 2,
             entrezGeneId: 1,
             gene: {
-                geneticEntityId:0,
+                geneticEntityId: 0,
                 entrezGeneId: 1,
-                hugoGeneSymbol: "SMURF2",
-                type: ""
+                hugoGeneSymbol: 'SMURF2',
+                type: '',
             },
-            molecularProfileId: "alterations",
-            sampleId: "SAMPLE_02",
-            patientId: "PATIENT1",
-            studyId: "STUDY1",
-            uniquePatientKey: "",
-            uniqueSampleKey: ""
-        }
+            molecularProfileId: 'alterations',
+            sampleId: 'SAMPLE_02',
+            patientId: 'PATIENT1',
+            studyId: 'STUDY1',
+            uniquePatientKey: '',
+            uniqueSampleKey: '',
+        },
     ];
 
-    const copyNumberCountData:CopyNumberCount[] = [
+    const copyNumberCountData: CopyNumberCount[] = [
         {
             alteration: -2,
             entrezGeneId: 0,
-            molecularProfileId: "alterations",
+            molecularProfileId: 'alterations',
             numberOfSamples: 100,
-            numberOfSamplesWithAlterationInGene: 61
+            numberOfSamplesWithAlterationInGene: 61,
         },
         {
             alteration: 2,
             entrezGeneId: 1,
-            molecularProfileId: "alterations",
+            molecularProfileId: 'alterations',
             numberOfSamples: 200,
-            numberOfSamplesWithAlterationInGene: 1
-        }
+            numberOfSamplesWithAlterationInGene: 1,
+        },
     ];
 
-    const gisticData:IGisticData = {
+    const gisticData: IGisticData = {
         0: [
             {
                 amp: false,
                 qValue: 0.00023,
-                peakGeneCount: 5
-            }
+                peakGeneCount: 5,
+            },
         ],
         1: [
             {
                 amp: false,
                 qValue: 0.00666,
-                peakGeneCount: 8
+                peakGeneCount: 8,
             },
             {
                 amp: true,
                 qValue: 0.00045,
-                peakGeneCount: 4
-            }
-        ]
+                peakGeneCount: 4,
+            },
+        ],
     };
-    const fakeCache:CopyNumberCountCache = new CopyNumberCountCache("");
+    const fakeCache: CopyNumberCountCache = new CopyNumberCountCache('');
 
     const tooltips: Array<ReactWrapper<any, any>> = [];
 
     before(() => {
-        tooltips.push(mount(CohortColumnFormatter.tooltipContent([copyNumberData[0]], copyNumberCountData[0])));
-        tooltips.push(mount(CohortColumnFormatter.tooltipContent([copyNumberData[1]], copyNumberCountData[1])));
-
-        sinon.stub(fakeCache, 'get').callsFake((query:CopyNumberCountIdentifier):CacheData<CopyNumberCount>|null=>{
-            let cnc:CopyNumberCount|undefined = copyNumberCountData.find(x=>{
-                return x.entrezGeneId === query.entrezGeneId && x.alteration === query.alteration;
+        tooltips.push(
+            mount(
+                CohortColumnFormatter.tooltipContent(
+                    [copyNumberData[0]],
+                    copyNumberCountData[0]
+                )
+            )
+        );
+        tooltips.push(
+            mount(
+                CohortColumnFormatter.tooltipContent(
+                    [copyNumberData[1]],
+                    copyNumberCountData[1]
+                )
+            )
+        );
+
+        sinon
+            .stub(fakeCache, 'get')
+            .callsFake((query: CopyNumberCountIdentifier): CacheData<
+                CopyNumberCount
+            > | null => {
+                let cnc: CopyNumberCount | undefined = copyNumberCountData.find(
+                    x => {
+                        return (
+                            x.entrezGeneId === query.entrezGeneId &&
+                            x.alteration === query.alteration
+                        );
+                    }
+                );
+                if (cnc) {
+                    return {
+                        status: 'complete',
+                        data: cnc,
+                    };
+                } else {
+                    return null;
+                }
             });
-            if (cnc) {
-                return {
-                    status:"complete",
-                    data: cnc
-                };
-            } else {
-                return null;
-            }
-        });
     });
 
     it('generates the tooltip text properly', () => {
-        assert.equal(tooltips[0].text(), "61 samples (61.0%) in this study have deleted BRCA2");
-        assert.equal(tooltips[1].text(), "1 sample (0.5%) in this study has amplified SMURF2");
+        assert.equal(
+            tooltips[0].text(),
+            '61 samples (61.0%) in this study have deleted BRCA2'
+        );
+        assert.equal(
+            tooltips[1].text(),
+            '1 sample (0.5%) in this study has amplified SMURF2'
+        );
     });
 
     it('calculates the sort value correctly', () => {
-        assert.equal(CohortColumnFormatter.getSortValue([copyNumberData[0]], fakeCache), 61);
-        assert.equal(CohortColumnFormatter.getSortValue([copyNumberData[1]], fakeCache), 1);
+        assert.equal(
+            CohortColumnFormatter.getSortValue([copyNumberData[0]], fakeCache),
+            61
+        );
+        assert.equal(
+            CohortColumnFormatter.getSortValue([copyNumberData[1]], fakeCache),
+            1
+        );
     });
 
     it('picks the correct gistic summary', () => {
-        let summary = CohortColumnFormatter.getGisticValue([copyNumberData[0]], gisticData);
+        let summary = CohortColumnFormatter.getGisticValue(
+            [copyNumberData[0]],
+            gisticData
+        );
 
         let qValue = summary === null ? null : summary.qValue;
         let amp = summary === null ? null : summary.amp;
         let count = summary === null ? null : summary.peakGeneCount;
 
-        assert.isFalse(summary === null, "Gistic summary should exist");
-        assert.isFalse(amp, "Gistic summary should be the one marked as not amplified for a deleted CNA");
+        assert.isFalse(summary === null, 'Gistic summary should exist');
+        assert.isFalse(
+            amp,
+            'Gistic summary should be the one marked as not amplified for a deleted CNA'
+        );
         assert.equal(qValue, 0.00023);
         assert.equal(count, 5);
 
-        summary = CohortColumnFormatter.getGisticValue([copyNumberData[1]], gisticData);
+        summary = CohortColumnFormatter.getGisticValue(
+            [copyNumberData[1]],
+            gisticData
+        );
 
         qValue = summary === null ? null : summary.qValue;
         amp = summary === null ? null : summary.amp;
         count = summary === null ? null : summary.peakGeneCount;
 
-        assert.isFalse(summary === null, "Gistic summary should exist");
-        assert.isTrue(amp, "Gistic summary should be the one marked as amplified for an amplified CNA");
+        assert.isFalse(summary === null, 'Gistic summary should exist');
+        assert.isTrue(
+            amp,
+            'Gistic summary should be the one marked as amplified for an amplified CNA'
+        );
         assert.equal(qValue, 0.00045);
         assert.equal(count, 4);
     });
 
-    after(() => {
-
-    });
+    after(() => {});
 });
diff --git a/src/pages/patientView/copyNumberAlterations/column/CohortColumnFormatter.tsx b/src/pages/patientView/copyNumberAlterations/column/CohortColumnFormatter.tsx
index 03536964cb2..effa11fe92e 100644
--- a/src/pages/patientView/copyNumberAlterations/column/CohortColumnFormatter.tsx
+++ b/src/pages/patientView/copyNumberAlterations/column/CohortColumnFormatter.tsx
@@ -1,95 +1,129 @@
 import * as React from 'react';
-import {DiscreteCopyNumberData, CopyNumberCount} from "shared/api/generated/CBioPortalAPI";
-import FrequencyBar from "shared/components/cohort/FrequencyBar";
-import Icon from "shared/components/cohort/LetterIcon";
-import {IGisticData, IGisticSummary} from "shared/model/Gistic";
-import {getPercentage} from "shared/lib/FormatUtils";
-
-import CopyNumberCountCache from "../../clinicalInformation/CopyNumberCountCache";
-import {CacheData} from "../../../../shared/lib/LazyMobXCache";
-import {DefaultTooltip} from "cbioportal-frontend-commons";
-
-export default class CohortColumnFormatter
-{
-    public static renderFunction(data:DiscreteCopyNumberData[],
-                                 copyNumberCountCache:CopyNumberCountCache,
-                                 gisticData:IGisticData)
-    {
-        const copyNumberCount = CohortColumnFormatter.getCopyNumberCount(data, copyNumberCountCache);
-        const freqViz = CohortColumnFormatter.makeCohortFrequencyViz(data, copyNumberCount);
-        const gisticValue = CohortColumnFormatter.getGisticValue(data, gisticData);
-        let gisticIcon:JSX.Element|null = null;
-
-        if (gisticValue !== null)
-        {
-            const tooltipCallback = () => CohortColumnFormatter.getGisticTooltip(
-                gisticValue.qValue, gisticValue.peakGeneCount);
-
-            gisticIcon = (
-                <Icon
-                    text="G"
-                    tooltip={tooltipCallback}
-                />
-            );
+import {
+    DiscreteCopyNumberData,
+    CopyNumberCount,
+} from 'shared/api/generated/CBioPortalAPI';
+import FrequencyBar from 'shared/components/cohort/FrequencyBar';
+import Icon from 'shared/components/cohort/LetterIcon';
+import { IGisticData, IGisticSummary } from 'shared/model/Gistic';
+import { getPercentage } from 'shared/lib/FormatUtils';
+
+import CopyNumberCountCache from '../../clinicalInformation/CopyNumberCountCache';
+import { CacheData } from '../../../../shared/lib/LazyMobXCache';
+import { DefaultTooltip } from 'cbioportal-frontend-commons';
+
+export default class CohortColumnFormatter {
+    public static renderFunction(
+        data: DiscreteCopyNumberData[],
+        copyNumberCountCache: CopyNumberCountCache,
+        gisticData: IGisticData
+    ) {
+        const copyNumberCount = CohortColumnFormatter.getCopyNumberCount(
+            data,
+            copyNumberCountCache
+        );
+        const freqViz = CohortColumnFormatter.makeCohortFrequencyViz(
+            data,
+            copyNumberCount
+        );
+        const gisticValue = CohortColumnFormatter.getGisticValue(
+            data,
+            gisticData
+        );
+        let gisticIcon: JSX.Element | null = null;
+
+        if (gisticValue !== null) {
+            const tooltipCallback = () =>
+                CohortColumnFormatter.getGisticTooltip(
+                    gisticValue.qValue,
+                    gisticValue.peakGeneCount
+                );
+
+            gisticIcon = <Icon text="G" tooltip={tooltipCallback} />;
         }
 
         return (
             <div>
-                {(freqViz !== null) && freqViz}
+                {freqViz !== null && freqViz}
                 {gisticIcon}
             </div>
         );
     }
 
-    public static makeCohortFrequencyViz(data:DiscreteCopyNumberData[], cacheDatum:CacheData<CopyNumberCount> | null) {
-
+    public static makeCohortFrequencyViz(
+        data: DiscreteCopyNumberData[],
+        cacheDatum: CacheData<CopyNumberCount> | null
+    ) {
         if (cacheDatum !== null) {
             const copyNumberCount = cacheDatum.data;
-            if (cacheDatum.status === "complete" && copyNumberCount) {
-                const counts = [copyNumberCount.numberOfSamplesWithAlterationInGene];
-                const colors = data[0].alteration > 0 ? ["red"] : ["blue"];
+            if (cacheDatum.status === 'complete' && copyNumberCount) {
+                const counts = [
+                    copyNumberCount.numberOfSamplesWithAlterationInGene,
+                ];
+                const colors = data[0].alteration > 0 ? ['red'] : ['blue'];
 
                 return (
                     <FrequencyBar
                         counts={counts}
                         freqColors={colors}
                         totalCount={copyNumberCount.numberOfSamples}
-                        tooltip={CohortColumnFormatter.tooltipContent(data, copyNumberCount)}
+                        tooltip={CohortColumnFormatter.tooltipContent(
+                            data,
+                            copyNumberCount
+                        )}
                     />
                 );
-            } else if (cacheDatum.status === "complete") {
+            } else if (cacheDatum.status === 'complete') {
                 return (
                     <DefaultTooltip
                         placement="left"
-                        overlay={(<span>Data not available for this gene and alteration.</span>)}
+                        overlay={
+                            <span>
+                                Data not available for this gene and alteration.
+                            </span>
+                        }
                     >
                         <span
-                            style={{color: "gray", fontSize:"xx-small", textAlign:"center"}}
+                            style={{
+                                color: 'gray',
+                                fontSize: 'xx-small',
+                                textAlign: 'center',
+                            }}
                         >
                             NA
                         </span>
-                    </DefaultTooltip>);
+                    </DefaultTooltip>
+                );
             } else {
                 return (
                     <DefaultTooltip
                         placement="left"
-                        overlay={(<span>Error retrieving data.</span>)}
-                        >
+                        overlay={<span>Error retrieving data.</span>}
+                    >
                         <span
-                            style={{color: "gray", fontSize:"xx-small", textAlign:"center"}}
+                            style={{
+                                color: 'gray',
+                                fontSize: 'xx-small',
+                                textAlign: 'center',
+                            }}
                         >
-                        ERROR
+                            ERROR
                         </span>
-                    </DefaultTooltip>);
+                    </DefaultTooltip>
+                );
             }
         } else {
             return (
                 <DefaultTooltip
                     placement="left"
-                    overlay={(<span>Querying server for data.</span>)}
-                    >
+                    overlay={<span>Querying server for data.</span>}
+                >
                     <span
-                        style={{color: "gray", fontSize:"xx-small", textAlign:"center"}}
+                        style={{
+                            color: 'gray',
+                            fontSize: 'xx-small',
+                            textAlign: 'center',
+                        }}
                     >
                         LOADING
                     </span>
@@ -98,23 +132,36 @@ export default class CohortColumnFormatter
         }
     }
 
-    public static tooltipContent(data:DiscreteCopyNumberData[], copyNumberCount:CopyNumberCount)
-    {
+    public static tooltipContent(
+        data: DiscreteCopyNumberData[],
+        copyNumberCount: CopyNumberCount
+    ) {
         const count = copyNumberCount.numberOfSamplesWithAlterationInGene;
-        const proportion = copyNumberCount.numberOfSamplesWithAlterationInGene / copyNumberCount.numberOfSamples;
+        const proportion =
+            copyNumberCount.numberOfSamplesWithAlterationInGene /
+            copyNumberCount.numberOfSamples;
         const boldPercentage = <b>{getPercentage(proportion)}</b>;
         const gene = data[0].gene.hugoGeneSymbol;
-        const cna = data[0].alteration === -2 ? "deleted" : "amplified";
-        const samples = count === 1 ? "sample" : "samples";
-        const have = count === 1 ? "has" : "have";
+        const cna = data[0].alteration === -2 ? 'deleted' : 'amplified';
+        const samples = count === 1 ? 'sample' : 'samples';
+        const have = count === 1 ? 'has' : 'have';
 
         return (
-            <span>{count} {samples} ({boldPercentage}) in this study {have} {cna} {gene}</span>
+            <span>
+                {count} {samples} ({boldPercentage}) in this study {have} {cna}{' '}
+                {gene}
+            </span>
         );
     }
 
-    public static getSortValue(data:DiscreteCopyNumberData[], copyNumberCountCache:CopyNumberCountCache):number|null {
-        const copyNumberCount = CohortColumnFormatter.getCopyNumberCount(data, copyNumberCountCache);
+    public static getSortValue(
+        data: DiscreteCopyNumberData[],
+        copyNumberCountCache: CopyNumberCountCache
+    ): number | null {
+        const copyNumberCount = CohortColumnFormatter.getCopyNumberCount(
+            data,
+            copyNumberCountCache
+        );
 
         if (copyNumberCount && copyNumberCount.data) {
             return copyNumberCount.data.numberOfSamplesWithAlterationInGene;
@@ -123,22 +170,28 @@ export default class CohortColumnFormatter
         }
     }
 
-    private static getCopyNumberCount(data:DiscreteCopyNumberData[], copyNumberCountCache:CopyNumberCountCache):CacheData<CopyNumberCount> | null
-    {
-        return copyNumberCountCache.get({entrezGeneId: data[0].entrezGeneId, alteration: data[0].alteration});
+    private static getCopyNumberCount(
+        data: DiscreteCopyNumberData[],
+        copyNumberCountCache: CopyNumberCountCache
+    ): CacheData<CopyNumberCount> | null {
+        return copyNumberCountCache.get({
+            entrezGeneId: data[0].entrezGeneId,
+            alteration: data[0].alteration,
+        });
     }
 
-    public static getGisticValue(data:DiscreteCopyNumberData[], gisticData:IGisticData): IGisticSummary|null
-    {
+    public static getGisticValue(
+        data: DiscreteCopyNumberData[],
+        gisticData: IGisticData
+    ): IGisticSummary | null {
         const gistic = gisticData[data[0].entrezGeneId];
-        let summary:IGisticSummary|undefined;
+        let summary: IGisticSummary | undefined;
 
-        if (gistic)
-        {
+        if (gistic) {
             // here we are assuming that we have at most 2 values in the GisticSummary array:
             // one for amp === true, and one for amp === false
-            const targetAmp = (data[0].alteration === 2);
-            summary = gistic.find((gs:IGisticSummary) => {
+            const targetAmp = data[0].alteration === 2;
+            summary = gistic.find((gs: IGisticSummary) => {
                 // alteration === 2 => amplified
                 // otherwise => not amplified (deleted)
                 return gs.amp === targetAmp;
@@ -148,12 +201,13 @@ export default class CohortColumnFormatter
         return summary === undefined ? null : summary;
     }
 
-    private static getGisticTooltip(qValue:number, peakGeneCount:number)
-    {
+    private static getGisticTooltip(qValue: number, peakGeneCount: number) {
         return (
             <div>
-                <b>Gistic</b><br/>
-                <span> Q-value: {(qValue || 0).toExponential(3)}</span><br/>
+                <b>Gistic</b>
+                <br />
+                <span> Q-value: {(qValue || 0).toExponential(3)}</span>
+                <br />
                 <span> Number of genes in the peak: {peakGeneCount}</span>
             </div>
         );
diff --git a/src/pages/patientView/genomicOverview/GenomicOverview.spec.tsx b/src/pages/patientView/genomicOverview/GenomicOverview.spec.tsx
index 65d6e41ffdd..ca8058eeb55 100644
--- a/src/pages/patientView/genomicOverview/GenomicOverview.spec.tsx
+++ b/src/pages/patientView/genomicOverview/GenomicOverview.spec.tsx
@@ -1,189 +1,319 @@
 import GenomicOverview from './GenomicOverview';
 import React from 'react';
 import { assert } from 'chai';
-import {shallow, mount, ShallowWrapper, ReactWrapper} from 'enzyme';
+import { shallow, mount, ShallowWrapper, ReactWrapper } from 'enzyme';
 import sinon from 'sinon';
-import SampleManager from "../SampleManager";
-import {ThumbnailExpandVAFPlot} from "../vafPlot/ThumbnailExpandVAFPlot";
-import {Mutation} from "../../../shared/api/generated/CBioPortalAPI";
-import {MutationFrequenciesBySample} from "../vafPlot/VAFPlot";
+import SampleManager from '../SampleManager';
+import { ThumbnailExpandVAFPlot } from '../vafPlot/ThumbnailExpandVAFPlot';
+import { Mutation } from '../../../shared/api/generated/CBioPortalAPI';
+import { MutationFrequenciesBySample } from '../vafPlot/VAFPlot';
 
 describe('GenomicOverview', () => {
-    let genomicOverview:ShallowWrapper<any,any>;
-    let mergedMutations:any[][];
-    function getVAFFrequencies(genomicOverview:ShallowWrapper<any, any>) {
+    let genomicOverview: ShallowWrapper<any, any>;
+    let mergedMutations: any[][];
+    function getVAFFrequencies(genomicOverview: ShallowWrapper<any, any>) {
         return genomicOverview.find(ThumbnailExpandVAFPlot).props().data;
     }
-    function assertDeepEqualFrequencies(actual:MutationFrequenciesBySample, expected:MutationFrequenciesBySample, message:string) {
-        assert.equal(Object.keys(actual).length, Object.keys(expected).length, message);
+    function assertDeepEqualFrequencies(
+        actual: MutationFrequenciesBySample,
+        expected: MutationFrequenciesBySample,
+        message: string
+    ) {
+        assert.equal(
+            Object.keys(actual).length,
+            Object.keys(expected).length,
+            message
+        );
         for (const sample of Object.keys(actual)) {
             const actualList = actual[sample];
             const expectedList = expected[sample];
-            for (let i=0; i<actualList.length; i++) {
+            for (let i = 0; i < actualList.length; i++) {
                 if (isNaN(actualList[i])) {
                     assert.isTrue(isNaN(expectedList[i]), message);
                 } else {
-                    assert.closeTo(actualList[i], expectedList[i], 0.0000001, message);
+                    assert.closeTo(
+                        actualList[i],
+                        expectedList[i],
+                        0.0000001,
+                        message
+                    );
                 }
             }
         }
     }
 
-
-    describe("computing VAF plot frequencies", ()=>{
-        it('computes the correct frequencies for a single sample', ()=>{
+    describe('computing VAF plot frequencies', () => {
+        it('computes the correct frequencies for a single sample', () => {
             mergedMutations = [];
-            genomicOverview = shallow(<GenomicOverview
-                mergedMutations={mergedMutations}
-                samples={[]}
-                cnaSegments={[]}
-                sampleOrder={{}}
-                sampleLabels={{}}
-                sampleColors={{}}
-                sampleManager={new SampleManager([])}
-                containerWidth={20}
-            />);
-            assert.deepEqual(getVAFFrequencies(genomicOverview), {}, "no frequencies with no mutations");
+            genomicOverview = shallow(
+                <GenomicOverview
+                    mergedMutations={mergedMutations}
+                    samples={[]}
+                    cnaSegments={[]}
+                    sampleOrder={{}}
+                    sampleLabels={{}}
+                    sampleColors={{}}
+                    sampleManager={new SampleManager([])}
+                    containerWidth={20}
+                />
+            );
+            assert.deepEqual(
+                getVAFFrequencies(genomicOverview),
+                {},
+                'no frequencies with no mutations'
+            );
 
             mergedMutations = [
-                [{sampleId: 'sample1', tumorAltCount: 10, tumorRefCount: 30}]
+                [{ sampleId: 'sample1', tumorAltCount: 10, tumorRefCount: 30 }],
             ];
-            genomicOverview = shallow(<GenomicOverview
-                mergedMutations={mergedMutations}
-                samples={[]}
-                cnaSegments={[]}
-                sampleOrder={{}}
-                sampleLabels={{}}
-                sampleColors={{}}
-                sampleManager={new SampleManager([])}
-                containerWidth={20}
-            />);
+            genomicOverview = shallow(
+                <GenomicOverview
+                    mergedMutations={mergedMutations}
+                    samples={[]}
+                    cnaSegments={[]}
+                    sampleOrder={{}}
+                    sampleLabels={{}}
+                    sampleColors={{}}
+                    sampleManager={new SampleManager([])}
+                    containerWidth={20}
+                />
+            );
             let frequencies = getVAFFrequencies(genomicOverview);
-            assertDeepEqualFrequencies(frequencies, {sample1: [0.25]}, "correctly calculates variant allele frequencies")
+            assertDeepEqualFrequencies(
+                frequencies,
+                { sample1: [0.25] },
+                'correctly calculates variant allele frequencies'
+            );
 
             mergedMutations = [
-                [{sampleId: 'sample1', tumorAltCount: 10, tumorRefCount: 30}],
-                [{sampleId: 'sample1', tumorAltCount: 1, tumorRefCount: 5}],
-                [{sampleId: 'sample1', tumorAltCount: 2, tumorRefCount: 8}],
-                [{sampleId: 'sample1', tumorAltCount: 100, tumorRefCount: 1000}]
+                [{ sampleId: 'sample1', tumorAltCount: 10, tumorRefCount: 30 }],
+                [{ sampleId: 'sample1', tumorAltCount: 1, tumorRefCount: 5 }],
+                [{ sampleId: 'sample1', tumorAltCount: 2, tumorRefCount: 8 }],
+                [
+                    {
+                        sampleId: 'sample1',
+                        tumorAltCount: 100,
+                        tumorRefCount: 1000,
+                    },
+                ],
             ];
-            genomicOverview = shallow(<GenomicOverview
-                mergedMutations={mergedMutations}
-                samples={[]}
-                cnaSegments={[]}
-                sampleOrder={{}}
-                sampleLabels={{}}
-                sampleColors={{}}
-                sampleManager={new SampleManager([])}
-                containerWidth={20}
-            />);
+            genomicOverview = shallow(
+                <GenomicOverview
+                    mergedMutations={mergedMutations}
+                    samples={[]}
+                    cnaSegments={[]}
+                    sampleOrder={{}}
+                    sampleLabels={{}}
+                    sampleColors={{}}
+                    sampleManager={new SampleManager([])}
+                    containerWidth={20}
+                />
+            );
             frequencies = getVAFFrequencies(genomicOverview);
-            assertDeepEqualFrequencies(frequencies, {sample1: [1/4, 1/6, 1/5, 1/11]}, "correctly calculates, part 2");
+            assertDeepEqualFrequencies(
+                frequencies,
+                { sample1: [1 / 4, 1 / 6, 1 / 5, 1 / 11] },
+                'correctly calculates, part 2'
+            );
         });
         it(`computes the correct frequencies for multiple samples, such that 
                 the frequency lists are the same length, padded by NaNs for any 
-                mutation which that sample does not have`, ()=>{
-
+                mutation which that sample does not have`, () => {
             // cases:
             // one mutation for one sample
             // one mutation for both samples
             // a few mutations with both, some with either one
             // a few mutations with both
             let frequencies;
-            mergedMutations = [[{sampleId: 'sample1', tumorAltCount: 10, tumorRefCount: 30}]];
-            genomicOverview = shallow(<GenomicOverview
-                mergedMutations={mergedMutations}
-                samples={[]}
-                cnaSegments={[]}
-                sampleOrder={{sample1:1, sample2:2}}
-                sampleLabels={{}}
-                sampleColors={{}}
-                sampleManager={new SampleManager([])}
-                containerWidth={20}
-            />);
-            frequencies = getVAFFrequencies(genomicOverview);
-            assertDeepEqualFrequencies(frequencies, {sample1:[1/4], sample2:[NaN]}, "case: one mutation for one sample");
-
-            mergedMutations = [[
-                {sampleId: 'sample1', tumorAltCount: 10, tumorRefCount: 30},
-                {sampleId: 'sample2', tumorAltCount: 20, tumorRefCount: 30}
-            ]];
-            genomicOverview = shallow(<GenomicOverview
-                mergedMutations={mergedMutations}
-                samples={[]}
-                cnaSegments={[]}
-                sampleOrder={{sample1:1, sample2:2}}
-                sampleLabels={{}}
-                sampleColors={{}}
-                sampleManager={new SampleManager([])}
-                containerWidth={20}
-            />);
+            mergedMutations = [
+                [{ sampleId: 'sample1', tumorAltCount: 10, tumorRefCount: 30 }],
+            ];
+            genomicOverview = shallow(
+                <GenomicOverview
+                    mergedMutations={mergedMutations}
+                    samples={[]}
+                    cnaSegments={[]}
+                    sampleOrder={{ sample1: 1, sample2: 2 }}
+                    sampleLabels={{}}
+                    sampleColors={{}}
+                    sampleManager={new SampleManager([])}
+                    containerWidth={20}
+                />
+            );
             frequencies = getVAFFrequencies(genomicOverview);
-            assertDeepEqualFrequencies(frequencies, {sample1:[1/4], sample2:[2/5]}, "case: one mutation for both samples");
+            assertDeepEqualFrequencies(
+                frequencies,
+                { sample1: [1 / 4], sample2: [NaN] },
+                'case: one mutation for one sample'
+            );
 
-            mergedMutations = [[
-                {sampleId: 'sample1', tumorAltCount: 10, tumorRefCount: 30},
-                {sampleId: 'sample2', tumorAltCount: 20, tumorRefCount: 30}
-            ],
+            mergedMutations = [
                 [
-                    {sampleId: 'sample1', tumorAltCount: 10, tumorRefCount: 30},
-                    {sampleId: 'sample2', tumorAltCount: 20, tumorRefCount: 30}
+                    {
+                        sampleId: 'sample1',
+                        tumorAltCount: 10,
+                        tumorRefCount: 30,
+                    },
+                    {
+                        sampleId: 'sample2',
+                        tumorAltCount: 20,
+                        tumorRefCount: 30,
+                    },
                 ],
+            ];
+            genomicOverview = shallow(
+                <GenomicOverview
+                    mergedMutations={mergedMutations}
+                    samples={[]}
+                    cnaSegments={[]}
+                    sampleOrder={{ sample1: 1, sample2: 2 }}
+                    sampleLabels={{}}
+                    sampleColors={{}}
+                    sampleManager={new SampleManager([])}
+                    containerWidth={20}
+                />
+            );
+            frequencies = getVAFFrequencies(genomicOverview);
+            assertDeepEqualFrequencies(
+                frequencies,
+                { sample1: [1 / 4], sample2: [2 / 5] },
+                'case: one mutation for both samples'
+            );
+
+            mergedMutations = [
                 [
-                    {sampleId: 'sample2', tumorAltCount: 30, tumorRefCount: 80}
+                    {
+                        sampleId: 'sample1',
+                        tumorAltCount: 10,
+                        tumorRefCount: 30,
+                    },
+                    {
+                        sampleId: 'sample2',
+                        tumorAltCount: 20,
+                        tumorRefCount: 30,
+                    },
                 ],
                 [
-                    {sampleId: 'sample1', tumorAltCount: 10, tumorRefCount: 40},
+                    {
+                        sampleId: 'sample1',
+                        tumorAltCount: 10,
+                        tumorRefCount: 30,
+                    },
+                    {
+                        sampleId: 'sample2',
+                        tumorAltCount: 20,
+                        tumorRefCount: 30,
+                    },
                 ],
-                [
-                    {sampleId: 'sample1', tumorAltCount: 20, tumorRefCount: 40},
-                ],];
-            genomicOverview = shallow(<GenomicOverview
-                mergedMutations={mergedMutations}
-                samples={[]}
-                cnaSegments={[]}
-                sampleOrder={{sample1:1, sample2:2}}
-                sampleLabels={{}}
-                sampleColors={{}}
-                sampleManager={new SampleManager([])}
-                containerWidth={20}
-            />);
+                [{ sampleId: 'sample2', tumorAltCount: 30, tumorRefCount: 80 }],
+                [{ sampleId: 'sample1', tumorAltCount: 10, tumorRefCount: 40 }],
+                [{ sampleId: 'sample1', tumorAltCount: 20, tumorRefCount: 40 }],
+            ];
+            genomicOverview = shallow(
+                <GenomicOverview
+                    mergedMutations={mergedMutations}
+                    samples={[]}
+                    cnaSegments={[]}
+                    sampleOrder={{ sample1: 1, sample2: 2 }}
+                    sampleLabels={{}}
+                    sampleColors={{}}
+                    sampleManager={new SampleManager([])}
+                    containerWidth={20}
+                />
+            );
             frequencies = getVAFFrequencies(genomicOverview);
-            assertDeepEqualFrequencies(frequencies, {sample1:[1/4, 1/4, 1/5, 1/3, NaN], sample2:[2/5, 2/5, 3/11, NaN, NaN]}, "case: a few mutations for both, a few for only one");
+            assertDeepEqualFrequencies(
+                frequencies,
+                {
+                    sample1: [1 / 4, 1 / 4, 1 / 5, 1 / 3, NaN],
+                    sample2: [2 / 5, 2 / 5, 3 / 11, NaN, NaN],
+                },
+                'case: a few mutations for both, a few for only one'
+            );
 
-            mergedMutations = [[
-                {sampleId: 'sample1', tumorAltCount: 10, tumorRefCount: 30},
-                {sampleId: 'sample2', tumorAltCount: 20, tumorRefCount: 30}
-            ],
+            mergedMutations = [
                 [
-                    {sampleId: 'sample1', tumorAltCount: 10, tumorRefCount: 30},
-                    {sampleId: 'sample2', tumorAltCount: 20, tumorRefCount: 30}
+                    {
+                        sampleId: 'sample1',
+                        tumorAltCount: 10,
+                        tumorRefCount: 30,
+                    },
+                    {
+                        sampleId: 'sample2',
+                        tumorAltCount: 20,
+                        tumorRefCount: 30,
+                    },
                 ],
                 [
-                    {sampleId: 'sample1', tumorAltCount: 30, tumorRefCount: 80},
-                    {sampleId: 'sample2', tumorAltCount: 30, tumorRefCount: 80}
+                    {
+                        sampleId: 'sample1',
+                        tumorAltCount: 10,
+                        tumorRefCount: 30,
+                    },
+                    {
+                        sampleId: 'sample2',
+                        tumorAltCount: 20,
+                        tumorRefCount: 30,
+                    },
                 ],
                 [
-                    {sampleId: 'sample1', tumorAltCount: 10, tumorRefCount: 40},
-                    {sampleId: 'sample2', tumorAltCount: 10, tumorRefCount: 40}
+                    {
+                        sampleId: 'sample1',
+                        tumorAltCount: 30,
+                        tumorRefCount: 80,
+                    },
+                    {
+                        sampleId: 'sample2',
+                        tumorAltCount: 30,
+                        tumorRefCount: 80,
+                    },
                 ],
                 [
-                    {sampleId: 'sample1', tumorAltCount: 20, tumorRefCount: 40},
-                    {sampleId: 'sample2', tumorAltCount: 10, tumorRefCount: 40}
-                ],];
-            genomicOverview = shallow(<GenomicOverview
-                mergedMutations={mergedMutations}
-                samples={[]}
-                cnaSegments={[]}
-                sampleOrder={{sample1:1, sample2:2}}
-                sampleLabels={{}}
-                sampleColors={{}}
-                sampleManager={new SampleManager([])}
-                containerWidth={20}
-            />);
+                    {
+                        sampleId: 'sample1',
+                        tumorAltCount: 10,
+                        tumorRefCount: 40,
+                    },
+                    {
+                        sampleId: 'sample2',
+                        tumorAltCount: 10,
+                        tumorRefCount: 40,
+                    },
+                ],
+                [
+                    {
+                        sampleId: 'sample1',
+                        tumorAltCount: 20,
+                        tumorRefCount: 40,
+                    },
+                    {
+                        sampleId: 'sample2',
+                        tumorAltCount: 10,
+                        tumorRefCount: 40,
+                    },
+                ],
+            ];
+            genomicOverview = shallow(
+                <GenomicOverview
+                    mergedMutations={mergedMutations}
+                    samples={[]}
+                    cnaSegments={[]}
+                    sampleOrder={{ sample1: 1, sample2: 2 }}
+                    sampleLabels={{}}
+                    sampleColors={{}}
+                    sampleManager={new SampleManager([])}
+                    containerWidth={20}
+                />
+            );
             frequencies = getVAFFrequencies(genomicOverview);
-            assertDeepEqualFrequencies(frequencies, {sample1:[1/4, 1/4, 3/11, 1/5, 1/3], sample2:[2/5, 2/5, 3/11, 1/5, 1/5]}, "case: all mutations for both");
+            assertDeepEqualFrequencies(
+                frequencies,
+                {
+                    sample1: [1 / 4, 1 / 4, 3 / 11, 1 / 5, 1 / 3],
+                    sample2: [2 / 5, 2 / 5, 3 / 11, 1 / 5, 1 / 5],
+                },
+                'case: all mutations for both'
+            );
         });
     });
-
 });
diff --git a/src/pages/patientView/genomicOverview/GenomicOverview.tsx b/src/pages/patientView/genomicOverview/GenomicOverview.tsx
index 187413511c4..0eba01cd4c3 100644
--- a/src/pages/patientView/genomicOverview/GenomicOverview.tsx
+++ b/src/pages/patientView/genomicOverview/GenomicOverview.tsx
@@ -2,75 +2,100 @@ import * as React from 'react';
 import * as _ from 'lodash';
 import { If } from 'react-if';
 import Tracks from './Tracks';
-import {ThumbnailExpandVAFPlot} from '../vafPlot/ThumbnailExpandVAFPlot';
-import {Mutation, Sample} from "../../../shared/api/generated/CBioPortalAPI";
-import SampleManager from "../SampleManager";
-import {ClinicalDataBySampleId} from "../../../shared/api/api-types-extended";
-import {MutationFrequenciesBySample} from "../vafPlot/VAFPlot";
+import { ThumbnailExpandVAFPlot } from '../vafPlot/ThumbnailExpandVAFPlot';
+import { Mutation, Sample } from '../../../shared/api/generated/CBioPortalAPI';
+import SampleManager from '../SampleManager';
+import { ClinicalDataBySampleId } from '../../../shared/api/api-types-extended';
+import { MutationFrequenciesBySample } from '../vafPlot/VAFPlot';
 import { computed } from 'mobx';
-import { sampleIdToIconData, IKeyedIconData, genePanelIdToIconData } from './GenomicOverviewUtils';
+import {
+    sampleIdToIconData,
+    IKeyedIconData,
+    genePanelIdToIconData,
+} from './GenomicOverviewUtils';
 
 interface IGenomicOverviewProps {
     mergedMutations: Mutation[][];
     cnaSegments: any;
-    samples:Sample[];
-    sampleOrder: {[s:string]:number};
-    sampleLabels: {[s:string]:string};
-    sampleColors: {[s:string]:string};
+    samples: Sample[];
+    sampleOrder: { [s: string]: number };
+    sampleLabels: { [s: string]: string };
+    sampleColors: { [s: string]: string };
     sampleManager: SampleManager;
     containerWidth: number;
-    sampleIdToMutationGenePanelId?:{[sampleId:string]:string};
-    sampleIdToCopyNumberGenePanelId?:{[sampleId:string]:string};
-    onSelectGenePanel?:(name:string)=>void;
-    disableTooltip?:boolean;
+    sampleIdToMutationGenePanelId?: { [sampleId: string]: string };
+    sampleIdToCopyNumberGenePanelId?: { [sampleId: string]: string };
+    onSelectGenePanel?: (name: string) => void;
+    disableTooltip?: boolean;
 }
 
-export default class GenomicOverview extends React.Component<IGenomicOverviewProps, { frequencies:MutationFrequenciesBySample }> {
-    constructor(props:IGenomicOverviewProps) {
+export default class GenomicOverview extends React.Component<
+    IGenomicOverviewProps,
+    { frequencies: MutationFrequenciesBySample }
+> {
+    constructor(props: IGenomicOverviewProps) {
         super(props);
     }
-    
+
     @computed get frequencies() {
-        return this.computeMutationFrequencyBySample(this.props.mergedMutations);
+        return this.computeMutationFrequencyBySample(
+            this.props.mergedMutations
+        );
     }
 
     @computed get genePanelIds() {
-        return _.uniq(_.concat(
-                    _.values(this.props.sampleIdToMutationGenePanelId),
-                    _.values(this.props.sampleIdToCopyNumberGenePanelId)
-                ));
+        return _.uniq(
+            _.concat(
+                _.values(this.props.sampleIdToMutationGenePanelId),
+                _.values(this.props.sampleIdToCopyNumberGenePanelId)
+            )
+        );
     }
 
-    @computed get genePanelIdToIconData():IKeyedIconData {
+    @computed get genePanelIdToIconData(): IKeyedIconData {
         return genePanelIdToIconData(this.genePanelIds);
     }
-        
-    @computed get sampleIdToMutationGenePanelIconData():IKeyedIconData {
-        return sampleIdToIconData(this.props.sampleIdToMutationGenePanelId, this.genePanelIdToIconData);
+
+    @computed get sampleIdToMutationGenePanelIconData(): IKeyedIconData {
+        return sampleIdToIconData(
+            this.props.sampleIdToMutationGenePanelId,
+            this.genePanelIdToIconData
+        );
     }
 
-    @computed get sampleIdToCopyNumberGenePanelIconData():IKeyedIconData {
-        return sampleIdToIconData(this.props.sampleIdToCopyNumberGenePanelId, this.genePanelIdToIconData);
+    @computed get sampleIdToCopyNumberGenePanelIconData(): IKeyedIconData {
+        return sampleIdToIconData(
+            this.props.sampleIdToCopyNumberGenePanelId,
+            this.genePanelIdToIconData
+        );
     }
 
     public render() {
-
-        const labels = _.reduce(this.props.sampleManager.samples, (result: any, sample: ClinicalDataBySampleId, i: number)=>{
-            result[sample.id] = i + 1;
-            return result;
-        }, {});
+        const labels = _.reduce(
+            this.props.sampleManager.samples,
+            (result: any, sample: ClinicalDataBySampleId, i: number) => {
+                result[sample.id] = i + 1;
+                return result;
+            },
+            {}
+        );
 
         return (
-            <div style={{ display:'flex' }}>
-                <Tracks mutations={_.flatten(this.props.mergedMutations)}
-                        key={Math.random() /* Force remounting on every render */}
-                        sampleManager={this.props.sampleManager}
-                        width={this.getTracksWidth()}
-                        cnaSegments={this.props.cnaSegments}
-                        samples={this.props.samples}
-                        mutationGenePanelIconData={this.sampleIdToMutationGenePanelIconData}
-                        copyNumberGenePanelIconData={this.sampleIdToCopyNumberGenePanelIconData}
-                        onSelectGenePanel={this.props.onSelectGenePanel}
+            <div style={{ display: 'flex' }}>
+                <Tracks
+                    mutations={_.flatten(this.props.mergedMutations)}
+                    key={Math.random() /* Force remounting on every render */}
+                    sampleManager={this.props.sampleManager}
+                    width={this.getTracksWidth()}
+                    cnaSegments={this.props.cnaSegments}
+                    samples={this.props.samples}
+                    mutationGenePanelIconData={
+                        this.sampleIdToMutationGenePanelIconData
+                    }
+                    copyNumberGenePanelIconData={
+                        this.sampleIdToCopyNumberGenePanelIconData
+                    }
+                    onSelectGenePanel={this.props.onSelectGenePanel}
                 />
                 <If condition={this.shouldShowVAFPlot()}>
                     <ThumbnailExpandVAFPlot
@@ -80,21 +105,23 @@ export default class GenomicOverview extends React.Component<IGenomicOverviewPro
                         labels={labels}
                         overlayPlacement="right"
                         cssClass="vafPlot"
-                        genePanelIconData={this.sampleIdToMutationGenePanelIconData}
+                        genePanelIconData={
+                            this.sampleIdToMutationGenePanelIconData
+                        }
                     />
                 </If>
             </div>
         );
     }
 
-    private shouldShowVAFPlot():boolean {
+    private shouldShowVAFPlot(): boolean {
         return this.props.mergedMutations.length > 0 && this.isFrequencyExist();
     }
 
-    private isFrequencyExist():boolean {
-        for (const frequencyId of Object.keys(this.frequencies)){
-            if (this.frequencies.hasOwnProperty(frequencyId)){
-                for (const frequency of this.frequencies[frequencyId]){
+    private isFrequencyExist(): boolean {
+        for (const frequencyId of Object.keys(this.frequencies)) {
+            if (this.frequencies.hasOwnProperty(frequencyId)) {
+                for (const frequency of this.frequencies[frequencyId]) {
                     return !isNaN(frequency);
                 }
             }
@@ -102,19 +129,28 @@ export default class GenomicOverview extends React.Component<IGenomicOverviewPro
         return false;
     }
 
-    private getTracksWidth():number {
-        return this.props.containerWidth - (this.shouldShowVAFPlot() ? 140 : 40);
+    private getTracksWidth(): number {
+        return (
+            this.props.containerWidth - (this.shouldShowVAFPlot() ? 140 : 40)
+        );
     }
 
-    private computeMutationFrequencyBySample(mergedMutations:Mutation[][]):MutationFrequenciesBySample {
-        const ret:MutationFrequenciesBySample = {};
+    private computeMutationFrequencyBySample(
+        mergedMutations: Mutation[][]
+    ): MutationFrequenciesBySample {
+        const ret: MutationFrequenciesBySample = {};
         let sampleId;
         let freq;
         for (const mutations of mergedMutations) {
             for (const mutation of mutations) {
-                if (mutation.tumorAltCount >= 0 && mutation.tumorRefCount >= 0) {
+                if (
+                    mutation.tumorAltCount >= 0 &&
+                    mutation.tumorRefCount >= 0
+                ) {
                     sampleId = mutation.sampleId;
-                    freq = mutation.tumorAltCount / (mutation.tumorRefCount + mutation.tumorAltCount);
+                    freq =
+                        mutation.tumorAltCount /
+                        (mutation.tumorRefCount + mutation.tumorAltCount);
                     ret[sampleId] = ret[sampleId] || [];
                     ret[sampleId].push(freq);
                 }
@@ -123,11 +159,10 @@ export default class GenomicOverview extends React.Component<IGenomicOverviewPro
         for (const sampleId of Object.keys(this.props.sampleOrder)) {
             ret[sampleId] = ret[sampleId] || [];
             const shouldAdd = mergedMutations.length - ret[sampleId].length;
-            for (let i=0; i<shouldAdd; i++) {
+            for (let i = 0; i < shouldAdd; i++) {
                 ret[sampleId].push(NaN);
             }
         }
         return ret;
     }
-
 }
diff --git a/src/pages/patientView/genomicOverview/GenomicOverviewUtils.spec.tsx b/src/pages/patientView/genomicOverview/GenomicOverviewUtils.spec.tsx
index bfaeaaffd8d..bd205534746 100644
--- a/src/pages/patientView/genomicOverview/GenomicOverviewUtils.spec.tsx
+++ b/src/pages/patientView/genomicOverview/GenomicOverviewUtils.spec.tsx
@@ -1,66 +1,98 @@
 import { assert } from 'chai';
-import { COLOR_GENEPANEL_ICON, genePanelIdToIconData, WHOLEGENOME_LABEL, sampleIdToIconData, COLOR_WHOLEGENOME_ICON, IKeyedIconData } from './GenomicOverviewUtils';
+import {
+    COLOR_GENEPANEL_ICON,
+    genePanelIdToIconData,
+    WHOLEGENOME_LABEL,
+    sampleIdToIconData,
+    COLOR_WHOLEGENOME_ICON,
+    IKeyedIconData,
+} from './GenomicOverviewUtils';
 import { GenePanelIdSpecialValue } from 'shared/lib/StoreUtils';
 
 describe('GenomicOverviewUtils', () => {
-    
     describe('genePanelIdToIconData()', () => {
-        
         const expectedData = {
-            A: {label: "P1", color: COLOR_GENEPANEL_ICON, genePanelId: 'A'},
-            B: {label: "P2", color: COLOR_GENEPANEL_ICON, genePanelId: 'B'},
-            C: {label: "P3", color: COLOR_GENEPANEL_ICON, genePanelId: 'C'},
+            A: { label: 'P1', color: COLOR_GENEPANEL_ICON, genePanelId: 'A' },
+            B: { label: 'P2', color: COLOR_GENEPANEL_ICON, genePanelId: 'B' },
+            C: { label: 'P3', color: COLOR_GENEPANEL_ICON, genePanelId: 'C' },
         };
 
         it('generates icon data', () => {
-            const genePanelIds = ["A", "B", "C"];
+            const genePanelIds = ['A', 'B', 'C'];
             assert.deepEqual(genePanelIdToIconData(genePanelIds), expectedData);
         });
-        
+
         it('generates icon data independent of input order', () => {
-            const genePanelIds = ["C", "B", "A"];
+            const genePanelIds = ['C', 'B', 'A'];
             assert.deepEqual(genePanelIdToIconData(genePanelIds), expectedData);
         });
-        
+
         it('removes undefined entries', () => {
-            const genePanelIds = ["A", "B", "C", undefined];
+            const genePanelIds = ['A', 'B', 'C', undefined];
             assert.deepEqual(genePanelIdToIconData(genePanelIds), expectedData);
         });
 
         it('adds whole-genome icon data', () => {
-            const genePanelIds = [GenePanelIdSpecialValue.WHOLE_EXOME_SEQ, GenePanelIdSpecialValue.WHOLE_GENOME_SEQ];
-            
-            const expectedData:any = {};
-            expectedData[GenePanelIdSpecialValue.WHOLE_EXOME_SEQ] = {label: WHOLEGENOME_LABEL, color: COLOR_WHOLEGENOME_ICON, genePanelId: GenePanelIdSpecialValue.WHOLE_EXOME_SEQ};
-            expectedData[GenePanelIdSpecialValue.WHOLE_GENOME_SEQ] = {label: WHOLEGENOME_LABEL, color: COLOR_WHOLEGENOME_ICON, genePanelId: GenePanelIdSpecialValue.WHOLE_GENOME_SEQ};
-            
+            const genePanelIds = [
+                GenePanelIdSpecialValue.WHOLE_EXOME_SEQ,
+                GenePanelIdSpecialValue.WHOLE_GENOME_SEQ,
+            ];
+
+            const expectedData: any = {};
+            expectedData[GenePanelIdSpecialValue.WHOLE_EXOME_SEQ] = {
+                label: WHOLEGENOME_LABEL,
+                color: COLOR_WHOLEGENOME_ICON,
+                genePanelId: GenePanelIdSpecialValue.WHOLE_EXOME_SEQ,
+            };
+            expectedData[GenePanelIdSpecialValue.WHOLE_GENOME_SEQ] = {
+                label: WHOLEGENOME_LABEL,
+                color: COLOR_WHOLEGENOME_ICON,
+                genePanelId: GenePanelIdSpecialValue.WHOLE_GENOME_SEQ,
+            };
+
             assert.deepEqual(genePanelIdToIconData(genePanelIds), expectedData);
         });
-        
     });
-    
-    describe('sampleIdToIconData()', () => {
 
+    describe('sampleIdToIconData()', () => {
         const iconLookUp = {
-            panel1: {label: "P1", color: COLOR_GENEPANEL_ICON, genePanelId: 'panel1'},
-            panel2: {label: "P2", color: COLOR_GENEPANEL_ICON, genePanelId: 'panel2'},
+            panel1: {
+                label: 'P1',
+                color: COLOR_GENEPANEL_ICON,
+                genePanelId: 'panel1',
+            },
+            panel2: {
+                label: 'P2',
+                color: COLOR_GENEPANEL_ICON,
+                genePanelId: 'panel2',
+            },
         };
-        
+
         it('links icon data', () => {
-            
             const sampleToGenePanelId = {
                 sampleA: 'panel1',
                 sampleB: 'panel2',
-            } as {[sampleId:string]:string};
+            } as { [sampleId: string]: string };
 
             const expectedData = {
-                sampleA: {label: "P1", color: COLOR_GENEPANEL_ICON, genePanelId: "panel1"},
-                sampleB: {label: "P2", color: COLOR_GENEPANEL_ICON, genePanelId: "panel2"},
+                sampleA: {
+                    label: 'P1',
+                    color: COLOR_GENEPANEL_ICON,
+                    genePanelId: 'panel1',
+                },
+                sampleB: {
+                    label: 'P2',
+                    color: COLOR_GENEPANEL_ICON,
+                    genePanelId: 'panel2',
+                },
             };
 
-            assert.deepEqual(sampleIdToIconData(sampleToGenePanelId, iconLookUp), expectedData);
+            assert.deepEqual(
+                sampleIdToIconData(sampleToGenePanelId, iconLookUp),
+                expectedData
+            );
         });
-        
+
         it('returns empty object when sampleToGenePanel data is undefined', () => {
             assert.deepEqual(sampleIdToIconData(undefined, iconLookUp), {});
         });
@@ -68,53 +100,102 @@ describe('GenomicOverviewUtils', () => {
         it('links undefined genePanelId to whole-genome analysis icon', () => {
             const sampleToGenePanelId = {
                 sampleA: undefined,
-                sampleB: 'panel1'
-            } as {[sampleId:string]:string|undefined};
-            
+                sampleB: 'panel1',
+            } as { [sampleId: string]: string | undefined };
+
             const expectedData = {
-                sampleA: {label: WHOLEGENOME_LABEL, color: COLOR_WHOLEGENOME_ICON, genePanelId: undefined},
-                sampleB: {label: "P1", color: COLOR_GENEPANEL_ICON, genePanelId: "panel1"}
+                sampleA: {
+                    label: WHOLEGENOME_LABEL,
+                    color: COLOR_WHOLEGENOME_ICON,
+                    genePanelId: undefined,
+                },
+                sampleB: {
+                    label: 'P1',
+                    color: COLOR_GENEPANEL_ICON,
+                    genePanelId: 'panel1',
+                },
             };
 
-            assert.deepEqual(sampleIdToIconData(sampleToGenePanelId, iconLookUp), expectedData);
+            assert.deepEqual(
+                sampleIdToIconData(sampleToGenePanelId, iconLookUp),
+                expectedData
+            );
         });
 
         it('links whole-genome genePanelIds to whole-genome analysis icon', () => {
-
-            const myIconLookup:IKeyedIconData = { panel1: {label: "P1", color: COLOR_GENEPANEL_ICON, genePanelId: 'panel1'} };
-            myIconLookup[GenePanelIdSpecialValue.WHOLE_EXOME_SEQ] = {label: WHOLEGENOME_LABEL, color: COLOR_WHOLEGENOME_ICON, genePanelId: GenePanelIdSpecialValue.WHOLE_EXOME_SEQ};
-            myIconLookup[GenePanelIdSpecialValue.WHOLE_GENOME_SEQ] = {label: WHOLEGENOME_LABEL, color: COLOR_WHOLEGENOME_ICON, genePanelId: GenePanelIdSpecialValue.WHOLE_GENOME_SEQ};
+            const myIconLookup: IKeyedIconData = {
+                panel1: {
+                    label: 'P1',
+                    color: COLOR_GENEPANEL_ICON,
+                    genePanelId: 'panel1',
+                },
+            };
+            myIconLookup[GenePanelIdSpecialValue.WHOLE_EXOME_SEQ] = {
+                label: WHOLEGENOME_LABEL,
+                color: COLOR_WHOLEGENOME_ICON,
+                genePanelId: GenePanelIdSpecialValue.WHOLE_EXOME_SEQ,
+            };
+            myIconLookup[GenePanelIdSpecialValue.WHOLE_GENOME_SEQ] = {
+                label: WHOLEGENOME_LABEL,
+                color: COLOR_WHOLEGENOME_ICON,
+                genePanelId: GenePanelIdSpecialValue.WHOLE_GENOME_SEQ,
+            };
 
             const sampleToGenePanelId = {
                 sampleA: GenePanelIdSpecialValue.WHOLE_EXOME_SEQ,
                 sampleB: GenePanelIdSpecialValue.WHOLE_GENOME_SEQ,
-                sampleC: 'panel1'
-            } as {[sampleId:string]:string|undefined};
-            
+                sampleC: 'panel1',
+            } as { [sampleId: string]: string | undefined };
+
             const expectedData = {
-                sampleA: {label: WHOLEGENOME_LABEL, color: COLOR_WHOLEGENOME_ICON, genePanelId: GenePanelIdSpecialValue.WHOLE_EXOME_SEQ},
-                sampleB: {label: WHOLEGENOME_LABEL, color: COLOR_WHOLEGENOME_ICON, genePanelId: GenePanelIdSpecialValue.WHOLE_GENOME_SEQ},
-                sampleC: {label: "P1", color: COLOR_GENEPANEL_ICON, genePanelId: "panel1"}
+                sampleA: {
+                    label: WHOLEGENOME_LABEL,
+                    color: COLOR_WHOLEGENOME_ICON,
+                    genePanelId: GenePanelIdSpecialValue.WHOLE_EXOME_SEQ,
+                },
+                sampleB: {
+                    label: WHOLEGENOME_LABEL,
+                    color: COLOR_WHOLEGENOME_ICON,
+                    genePanelId: GenePanelIdSpecialValue.WHOLE_GENOME_SEQ,
+                },
+                sampleC: {
+                    label: 'P1',
+                    color: COLOR_GENEPANEL_ICON,
+                    genePanelId: 'panel1',
+                },
             };
 
-            assert.deepEqual(sampleIdToIconData(sampleToGenePanelId, myIconLookup), expectedData);
+            assert.deepEqual(
+                sampleIdToIconData(sampleToGenePanelId, myIconLookup),
+                expectedData
+            );
         });
 
         it('returns empty object when all samples are whole genome', () => {
-            const myIconLookup:IKeyedIconData = {};
-            myIconLookup[GenePanelIdSpecialValue.WHOLE_EXOME_SEQ] = {label: WHOLEGENOME_LABEL, color: COLOR_WHOLEGENOME_ICON, genePanelId: GenePanelIdSpecialValue.WHOLE_EXOME_SEQ};
-            myIconLookup[GenePanelIdSpecialValue.WHOLE_GENOME_SEQ] = {label: WHOLEGENOME_LABEL, color: COLOR_WHOLEGENOME_ICON, genePanelId: GenePanelIdSpecialValue.WHOLE_GENOME_SEQ};
+            const myIconLookup: IKeyedIconData = {};
+            myIconLookup[GenePanelIdSpecialValue.WHOLE_EXOME_SEQ] = {
+                label: WHOLEGENOME_LABEL,
+                color: COLOR_WHOLEGENOME_ICON,
+                genePanelId: GenePanelIdSpecialValue.WHOLE_EXOME_SEQ,
+            };
+            myIconLookup[GenePanelIdSpecialValue.WHOLE_GENOME_SEQ] = {
+                label: WHOLEGENOME_LABEL,
+                color: COLOR_WHOLEGENOME_ICON,
+                genePanelId: GenePanelIdSpecialValue.WHOLE_GENOME_SEQ,
+            };
 
             const sampleToGenePanelId = {
                 sampleA: GenePanelIdSpecialValue.WHOLE_EXOME_SEQ,
                 sampleB: GenePanelIdSpecialValue.WHOLE_GENOME_SEQ,
-                sampleC: GenePanelIdSpecialValue.UNKNOWN
-            } as {[sampleId:string]:string|undefined};
-            
+                sampleC: GenePanelIdSpecialValue.UNKNOWN,
+            } as { [sampleId: string]: string | undefined };
+
             const expectedData = {};
 
-            assert.deepEqual(sampleIdToIconData(sampleToGenePanelId, myIconLookup), expectedData);
+            assert.deepEqual(
+                sampleIdToIconData(sampleToGenePanelId, myIconLookup),
+                expectedData
+            );
         });
     });
-    
-});
\ No newline at end of file
+});
diff --git a/src/pages/patientView/genomicOverview/GenomicOverviewUtils.ts b/src/pages/patientView/genomicOverview/GenomicOverviewUtils.ts
index 57904012fff..243bb839ef9 100644
--- a/src/pages/patientView/genomicOverview/GenomicOverviewUtils.ts
+++ b/src/pages/patientView/genomicOverview/GenomicOverviewUtils.ts
@@ -1,73 +1,94 @@
-import _ from "lodash";
-import { GenePanelIdSpecialValue } from "shared/lib/StoreUtils";
+import _ from 'lodash';
+import { GenePanelIdSpecialValue } from 'shared/lib/StoreUtils';
 
 export interface IIconData {
-    genePanelId:string|undefined;
-    color:string;
-    label:string;
+    genePanelId: string | undefined;
+    color: string;
+    label: string;
 }
 
 export interface IKeyedIconData {
-    [id:string]:IIconData;
+    [id: string]: IIconData;
 }
 
 export const COLOR_GENEPANEL_ICON = 'blue';
 export const COLOR_WHOLEGENOME_ICON = '#007fff';
 export const PREFIX_GENEPANEL_LABEL = 'P';
 export const WHOLEGENOME_LABEL = 'W';
-export const wholeGenomeIconData:IIconData = {label: WHOLEGENOME_LABEL, color: COLOR_WHOLEGENOME_ICON, genePanelId: undefined};
-
-export function genePanelIdToIconData(genePanelIds:(string|undefined)[]):IKeyedIconData {
+export const wholeGenomeIconData: IIconData = {
+    label: WHOLEGENOME_LABEL,
+    color: COLOR_WHOLEGENOME_ICON,
+    genePanelId: undefined,
+};
 
+export function genePanelIdToIconData(
+    genePanelIds: (string | undefined)[]
+): IKeyedIconData {
     // remove undef and get array of sorted unique elements
-    const gpIds = _.uniq(_.filter(genePanelIds, genePanelId => genePanelId !== undefined)).sort();
+    const gpIds = _.uniq(
+        _.filter(genePanelIds, genePanelId => genePanelId !== undefined)
+    ).sort();
 
-    const lookupTable:IKeyedIconData = {};
+    const lookupTable: IKeyedIconData = {};
 
     // create entries for whole-genome analyses
     _(gpIds)
-        .filter(genePanelId => _.values(GenePanelIdSpecialValue).includes(genePanelId))
+        .filter(genePanelId =>
+            _.values(GenePanelIdSpecialValue).includes(genePanelId)
+        )
         .each(genePanelId => {
             const i = Object.assign({}, wholeGenomeIconData);
             i.genePanelId = genePanelId;
             lookupTable[genePanelId!] = i;
         });
-        
+
     // create entries for gene panel analyses
     _(gpIds)
-        .reject(genePanelId => _.values(GenePanelIdSpecialValue).includes(genePanelId))
+        .reject(genePanelId =>
+            _.values(GenePanelIdSpecialValue).includes(genePanelId)
+        )
         .each((genePanelId, index) => {
             lookupTable[genePanelId!] = {
                 genePanelId: genePanelId,
-                label: PREFIX_GENEPANEL_LABEL+(index+1),
+                label: PREFIX_GENEPANEL_LABEL + (index + 1),
                 color: COLOR_GENEPANEL_ICON,
             };
         });
-        
+
     return lookupTable;
 }
 
-export function sampleIdToIconData(sampleIdToGenePanelId:{[sampleId:string]:string|undefined}|undefined, iconLookupTable:IKeyedIconData):IKeyedIconData {
-
+export function sampleIdToIconData(
+    sampleIdToGenePanelId:
+        | { [sampleId: string]: string | undefined }
+        | undefined,
+    iconLookupTable: IKeyedIconData
+): IKeyedIconData {
     // return undefined when all samples were analyzed with a whole genome approach
     const genePanelIds = _.values(sampleIdToGenePanelId);
     const wholeGenomeIndicators = _.values(GenePanelIdSpecialValue);
-    
-    if (!sampleIdToGenePanelId || _.difference(genePanelIds, wholeGenomeIndicators).length === 0) {
+
+    if (
+        !sampleIdToGenePanelId ||
+        _.difference(genePanelIds, wholeGenomeIndicators).length === 0
+    ) {
         return {};
     }
 
     // samples where genePanelId is undefined represent a whole-genome analysis
     // undefined genePanelIds are not represented in the lookup table
-    const lookupTable:IKeyedIconData = _(sampleIdToGenePanelId)
-                                        .omitBy(genePanelId => genePanelId! in iconLookupTable) // keep samples with undefined genePanelIds
-                                        .mapValues(() => wholeGenomeIconData)
-                                        .value();
+    const lookupTable: IKeyedIconData = _(sampleIdToGenePanelId)
+        .omitBy(genePanelId => genePanelId! in iconLookupTable) // keep samples with undefined genePanelIds
+        .mapValues(() => wholeGenomeIconData)
+        .value();
 
     // add icon data for samples with defined genePanelIds
     _(sampleIdToGenePanelId)
         .pickBy(genePanelId => genePanelId! in iconLookupTable) // keep samples with defined genePanelIds
-        .forIn((genePanelId, sampleId) => lookupTable[sampleId] = iconLookupTable[genePanelId!]);
+        .forIn(
+            (genePanelId, sampleId) =>
+                (lookupTable[sampleId] = iconLookupTable[genePanelId!])
+        );
 
     return lookupTable;
 }
diff --git a/src/pages/patientView/genomicOverview/Tracks.spec.tsx b/src/pages/patientView/genomicOverview/Tracks.spec.tsx
index f284772590a..3f99532eb1e 100644
--- a/src/pages/patientView/genomicOverview/Tracks.spec.tsx
+++ b/src/pages/patientView/genomicOverview/Tracks.spec.tsx
@@ -3,17 +3,13 @@ import Tracks from './Tracks';
 import { shallow, mount } from 'enzyme';
 import { assert } from 'chai';
 
-describe('Tracks', ()=>{
-
-   // it('', ()=>{
-   //
-   //     const wrapper = mount(<Tracks data={mockData} />);
-   //     //console.log(mockData);
-   //
-   //
-   //
-   // })
-
-
-
+describe('Tracks', () => {
+    // it('', ()=>{
+    //
+    //     const wrapper = mount(<Tracks data={mockData} />);
+    //     //console.log(mockData);
+    //
+    //
+    //
+    // })
 });
diff --git a/src/pages/patientView/genomicOverview/Tracks.tsx b/src/pages/patientView/genomicOverview/Tracks.tsx
index dd526571ff6..f1a00c6b244 100644
--- a/src/pages/patientView/genomicOverview/Tracks.tsx
+++ b/src/pages/patientView/genomicOverview/Tracks.tsx
@@ -2,54 +2,78 @@ import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 import * as _ from 'lodash';
 import * as tracksHelper from './tracksHelper';
-import {CopyNumberSeg, Mutation, Sample} from 'shared/api/generated/CBioPortalAPI';
-import SampleManager from "../SampleManager";
-import {ClinicalDataBySampleId} from "../../../shared/api/api-types-extended";
+import {
+    CopyNumberSeg,
+    Mutation,
+    Sample,
+} from 'shared/api/generated/CBioPortalAPI';
+import SampleManager from '../SampleManager';
+import { ClinicalDataBySampleId } from '../../../shared/api/api-types-extended';
 import { IKeyedIconData, IIconData } from './GenomicOverviewUtils';
 import { observable, action } from 'mobx';
 import autobind from 'autobind-decorator';
 import { observer } from 'mobx-react';
 
 interface TracksPropTypes {
-    mutations:Array<Mutation>;
-    cnaSegments:Array<CopyNumberSeg>;
-    sampleManager:SampleManager;
-    samples:Sample[];
-    width:number;
-    mutationGenePanelIconData?:IKeyedIconData;
-    copyNumberGenePanelIconData?:IKeyedIconData;
-    onSelectGenePanel?:(name:string)=>void;
+    mutations: Array<Mutation>;
+    cnaSegments: Array<CopyNumberSeg>;
+    sampleManager: SampleManager;
+    samples: Sample[];
+    width: number;
+    mutationGenePanelIconData?: IKeyedIconData;
+    copyNumberGenePanelIconData?: IKeyedIconData;
+    onSelectGenePanel?: (name: string) => void;
 }
 
-export const DEFAULT_GENOME_BUILD="GRCh37";
-const noGenePanelMessage = 'Gene panel information not found. Sample is presumed to be whole exome/genome sequenced.';
+export const DEFAULT_GENOME_BUILD = 'GRCh37';
+const noGenePanelMessage =
+    'Gene panel information not found. Sample is presumed to be whole exome/genome sequenced.';
 
 @observer
 export default class Tracks extends React.Component<TracksPropTypes, {}> {
-    @observable genePanelInTooltip:string = '';
-    
+    @observable genePanelInTooltip: string = '';
+
     componentDidMount() {
         this.drawTracks();
     }
-    
+
     @autobind
-    @action setGenePanelInTooltip(genePanelId:string) {
+    @action
+    setGenePanelInTooltip(genePanelId: string) {
         this.genePanelInTooltip = genePanelId;
     }
-    
-    drawTracks() {
 
+    drawTracks() {
         // --- construct params ---
-        let cnaSamples = _.keyBy(this.props.samples.filter(s=>s.copyNumberSegmentPresent), s=>s.sampleId);
-        let mutSamples = _.keyBy(this.props.samples.filter(s=>s.sequenced), s=>s.sampleId);
-        const showGenePanelIcons = !!((this.props.mutationGenePanelIconData   && _.keys(this.props.mutationGenePanelIconData  ).length > 0)
-                                   || (this.props.copyNumberGenePanelIconData && _.keys(this.props.copyNumberGenePanelIconData).length > 0));
-        var config = tracksHelper.GenomicOverviewConfig(Object.keys(cnaSamples).length + Object.keys(mutSamples).length, this.props.width, showGenePanelIcons);
+        let cnaSamples = _.keyBy(
+            this.props.samples.filter(s => s.copyNumberSegmentPresent),
+            s => s.sampleId
+        );
+        let mutSamples = _.keyBy(
+            this.props.samples.filter(s => s.sequenced),
+            s => s.sampleId
+        );
+        const showGenePanelIcons = !!(
+            (this.props.mutationGenePanelIconData &&
+                _.keys(this.props.mutationGenePanelIconData).length > 0) ||
+            (this.props.copyNumberGenePanelIconData &&
+                _.keys(this.props.copyNumberGenePanelIconData).length > 0)
+        );
+        var config = tracksHelper.GenomicOverviewConfig(
+            Object.keys(cnaSamples).length + Object.keys(mutSamples).length,
+            this.props.width,
+            showGenePanelIcons
+        );
         // --- end of params ---
 
         // --- raphael config ---
         let rowIndex: number = 0;
-        var paper = tracksHelper.createRaphaelCanvas(document.getElementsByClassName('genomicOverviewTracksContainer')[0], config);
+        var paper = tracksHelper.createRaphaelCanvas(
+            document.getElementsByClassName(
+                'genomicOverviewTracksContainer'
+            )[0],
+            config
+        );
         // --- end of raphael config ---
 
         // --- chromosome chart ---
@@ -57,106 +81,159 @@ export default class Tracks extends React.Component<TracksPropTypes, {}> {
         if (this.props.mutations && this.props.mutations.length > 0) {
             genomeBuild = this.props.mutations[0].ncbiBuild;
         }
-        const chmInfo = tracksHelper.getChmInfo( genomeBuild);
-        tracksHelper.plotChromosomes(paper,config,chmInfo, genomeBuild);
+        const chmInfo = tracksHelper.getChmInfo(genomeBuild);
+        tracksHelper.plotChromosomes(paper, config, chmInfo, genomeBuild);
         // --- end of chromosome chart ---
 
-        _.each(this.props.sampleManager.samples, (sample: ClinicalDataBySampleId) => {
-
-            let genePanelIconData:IIconData =  {} as IIconData;
-            if (this.props.mutationGenePanelIconData) {
-                genePanelIconData = this.props.mutationGenePanelIconData[sample.id];
-            }
+        _.each(
+            this.props.sampleManager.samples,
+            (sample: ClinicalDataBySampleId) => {
+                let genePanelIconData: IIconData = {} as IIconData;
+                if (this.props.mutationGenePanelIconData) {
+                    genePanelIconData = this.props.mutationGenePanelIconData[
+                        sample.id
+                    ];
+                }
 
-            // --- CNA bar chart ---
-            if (cnaSamples[sample.id]) {
-                let raphaelData: Array<any> = [];
-                var _trackData = _.filter(this.props.cnaSegments, function (_cnaObj: CopyNumberSeg) {
-                    return _cnaObj.sampleId === sample.id;
-                });
-                _.each(_trackData, function (_dataObj: CopyNumberSeg) {
-                    var _tmp: Array<any> = [];
-                    _tmp.push(_dataObj.sampleId);
-                    _tmp.push(_dataObj.chromosome);
-                    _tmp.push(_dataObj.end);
-                    _tmp.push(_dataObj.start);
-                    _tmp.push(_dataObj.numberOfProbes);
-                    _tmp.push(_dataObj.segmentMean);
-                    raphaelData.push(_tmp);
-                });
-                tracksHelper.plotCnSegs(paper, config, chmInfo, rowIndex, raphaelData, 1, 3, 2, 5, sample.id, genePanelIconData, this.setGenePanelInTooltip);
-                rowIndex = rowIndex + 1;
-
-                if (this.props.sampleManager.samples.length > 1) {
-                    const $container = $(`[id="cnaTrack${sample.id}"]`);
-                    const pos = {x: parseInt($container.attr('x')!) - 10, y: parseInt($container.attr('y')!) - 5};
-                    const $newContainer = $('<svg height="12" width="12" />').attr(pos);
-                    $container.replaceWith($newContainer);
-
-                    let comp: any = this.props.sampleManager.getComponentForSample(
-                        sample.id, 1, '', null,
-                        this.props.onSelectGenePanel);
-                    ReactDOM.render(
-                        comp,
-                        $newContainer[0]
+                // --- CNA bar chart ---
+                if (cnaSamples[sample.id]) {
+                    let raphaelData: Array<any> = [];
+                    var _trackData = _.filter(this.props.cnaSegments, function(
+                        _cnaObj: CopyNumberSeg
+                    ) {
+                        return _cnaObj.sampleId === sample.id;
+                    });
+                    _.each(_trackData, function(_dataObj: CopyNumberSeg) {
+                        var _tmp: Array<any> = [];
+                        _tmp.push(_dataObj.sampleId);
+                        _tmp.push(_dataObj.chromosome);
+                        _tmp.push(_dataObj.end);
+                        _tmp.push(_dataObj.start);
+                        _tmp.push(_dataObj.numberOfProbes);
+                        _tmp.push(_dataObj.segmentMean);
+                        raphaelData.push(_tmp);
+                    });
+                    tracksHelper.plotCnSegs(
+                        paper,
+                        config,
+                        chmInfo,
+                        rowIndex,
+                        raphaelData,
+                        1,
+                        3,
+                        2,
+                        5,
+                        sample.id,
+                        genePanelIconData,
+                        this.setGenePanelInTooltip
                     );
+                    rowIndex = rowIndex + 1;
+
+                    if (this.props.sampleManager.samples.length > 1) {
+                        const $container = $(`[id="cnaTrack${sample.id}"]`);
+                        const pos = {
+                            x: parseInt($container.attr('x')!) - 10,
+                            y: parseInt($container.attr('y')!) - 5,
+                        };
+                        const $newContainer = $(
+                            '<svg height="12" width="12" />'
+                        ).attr(pos);
+                        $container.replaceWith($newContainer);
+
+                        let comp: any = this.props.sampleManager.getComponentForSample(
+                            sample.id,
+                            1,
+                            '',
+                            null,
+                            this.props.onSelectGenePanel
+                        );
+                        ReactDOM.render(comp, $newContainer[0]);
+                    }
                 }
             }
-        });
+        );
         // --- end of CNA bar chart ---
 
         // --- mutation events bar chart ---
-        _.each(this.props.sampleManager.samples, (sample: ClinicalDataBySampleId) => {
- 
-            let genePanelIconData:IIconData =  {} as IIconData;
-            if (this.props.mutationGenePanelIconData) {
-                genePanelIconData = this.props.mutationGenePanelIconData[sample.id];
-            }
+        _.each(
+            this.props.sampleManager.samples,
+            (sample: ClinicalDataBySampleId) => {
+                let genePanelIconData: IIconData = {} as IIconData;
+                if (this.props.mutationGenePanelIconData) {
+                    genePanelIconData = this.props.mutationGenePanelIconData[
+                        sample.id
+                    ];
+                }
 
-            if (mutSamples[sample.id]) {
-                var _trackData = _.filter(this.props.mutations, function (_mutObj: any) {
-                    return _mutObj.sampleId === sample.id;
-                });
-                tracksHelper.plotMuts(paper, config, chmInfo, rowIndex, _trackData, sample.id, genePanelIconData, this.setGenePanelInTooltip);
-                rowIndex = rowIndex + 1;
-
-                if (this.props.sampleManager.samples.length > 1) {
-                    const id = `mutTrack${sample.id}`;
-                    const $container = $(`[id="${id}"]`);
-                    const pos = {x: parseInt($container.attr('x')!) - 10, y: parseInt($container.attr('y')!) - 5};
-                    const $newContainer = $(`<svg id="${id}" height="12" width="12" />`);
-                    $newContainer.attr(pos);
-                    $container.replaceWith($newContainer);
-
-                    let comp: any = this.props.sampleManager.getComponentForSample(
-                        sample.id, 1, '', null,
-                        this.props.onSelectGenePanel);
-
-                    ReactDOM.render(
-                        comp,
-                        $newContainer[0]
+                if (mutSamples[sample.id]) {
+                    var _trackData = _.filter(this.props.mutations, function(
+                        _mutObj: any
+                    ) {
+                        return _mutObj.sampleId === sample.id;
+                    });
+                    tracksHelper.plotMuts(
+                        paper,
+                        config,
+                        chmInfo,
+                        rowIndex,
+                        _trackData,
+                        sample.id,
+                        genePanelIconData,
+                        this.setGenePanelInTooltip
                     );
+                    rowIndex = rowIndex + 1;
+
+                    if (this.props.sampleManager.samples.length > 1) {
+                        const id = `mutTrack${sample.id}`;
+                        const $container = $(`[id="${id}"]`);
+                        const pos = {
+                            x: parseInt($container.attr('x')!) - 10,
+                            y: parseInt($container.attr('y')!) - 5,
+                        };
+                        const $newContainer = $(
+                            `<svg id="${id}" height="12" width="12" />`
+                        );
+                        $newContainer.attr(pos);
+                        $container.replaceWith($newContainer);
+
+                        let comp: any = this.props.sampleManager.getComponentForSample(
+                            sample.id,
+                            1,
+                            '',
+                            null,
+                            this.props.onSelectGenePanel
+                        );
+
+                        ReactDOM.render(comp, $newContainer[0]);
+                    }
                 }
-            };
-        });
+            }
+        );
         // --- end of mutation events bar chart ---
-    };
+    }
 
     public render() {
         return (
             <React.Fragment>
                 <div className="genomicOverviewTracksContainer" />
-                <div className="tooltip-content" style={{display: 'none'}}>
+                <div className="tooltip-content" style={{ display: 'none' }}>
                     <span>
-                        { this.genePanelInTooltip ? 
+                        {this.genePanelInTooltip ? (
                             <React.Fragment>
                                 Gene panel:{' '}
-                                <a onClick={() => this.props.onSelectGenePanel!(this.genePanelInTooltip)}>        
+                                <a
+                                    onClick={() =>
+                                        this.props.onSelectGenePanel!(
+                                            this.genePanelInTooltip
+                                        )
+                                    }
+                                >
                                     {this.genePanelInTooltip}
                                 </a>
                             </React.Fragment>
-                            : noGenePanelMessage
-                        }
+                        ) : (
+                            noGenePanelMessage
+                        )}
                     </span>
                 </div>
             </React.Fragment>
diff --git a/src/pages/patientView/genomicOverview/mockData.js b/src/pages/patientView/genomicOverview/mockData.js
index b5ecd454309..faf8f426062 100644
--- a/src/pages/patientView/genomicOverview/mockData.js
+++ b/src/pages/patientView/genomicOverview/mockData.js
@@ -1,3 +1,2662 @@
-const data = [[{"sample":"TCGA-24-2024-01","chr":"23","start":43657865,"end":154905589,"numProbes":45307,"value":0.001},{"sample":"TCGA-24-2024-01","chr":"23","start":43656384,"end":43657852,"numProbes":2,"value":-3.8329},{"sample":"TCGA-24-2024-01","chr":"23","start":16501627,"end":43652316,"numProbes":12696,"value":-0.0036},{"sample":"TCGA-24-2024-01","chr":"23","start":16432819,"end":16501253,"numProbes":35,"value":-3.139},{"sample":"TCGA-24-2024-01","chr":"23","start":3157107,"end":16432500,"numProbes":5189,"value":-0.0161},{"sample":"TCGA-24-2024-01","chr":"22","start":37993126,"end":49331012,"numProbes":6810,"value":0.2338},{"sample":"TCGA-24-2024-01","chr":"22","start":37977179,"end":37990078,"numProbes":10,"value":-0.6727},{"sample":"TCGA-24-2024-01","chr":"22","start":29465642,"end":37971766,"numProbes":5567,"value":0.2428},{"sample":"TCGA-24-2024-01","chr":"22","start":29357926,"end":29459732,"numProbes":91,"value":0.7707},{"sample":"TCGA-24-2024-01","chr":"22","start":17423930,"end":29355821,"numProbes":4401,"value":0.2322},{"sample":"TCGA-24-2024-01","chr":"21","start":47527681,"end":47678774,"numProbes":70,"value":0.6043},{"sample":"TCGA-24-2024-01","chr":"21","start":35940832,"end":47527508,"numProbes":7464,"value":0.1511},{"sample":"TCGA-24-2024-01","chr":"21","start":35937190,"end":35938325,"numProbes":4,"value":-1.1603},{"sample":"TCGA-24-2024-01","chr":"21","start":31650579,"end":35937072,"numProbes":2549,"value":0.1662},{"sample":"TCGA-24-2024-01","chr":"21","start":31640228,"end":31643037,"numProbes":6,"value":-0.7478},{"sample":"TCGA-24-2024-01","chr":"21","start":15347621,"end":31638959,"numProbes":10421,"value":0.1906},{"sample":"TCGA-24-2024-01","chr":"20","start":55289145,"end":62219837,"numProbes":4534,"value":0.7728},{"sample":"TCGA-24-2024-01","chr":"20","start":54895876,"end":55287439,"numProbes":252,"value":0.2763},{"sample":"TCGA-24-2024-01","chr":"20","start":54889510,"end":54889859,"numProbes":2,"value":-1.1488},{"sample":"TCGA-24-2024-01","chr":"20","start":50699043,"end":54888985,"numProbes":3026,"value":0.253},{"sample":"TCGA-24-2024-01","chr":"20","start":50683910,"end":50695849,"numProbes":12,"value":0.9252},{"sample":"TCGA-24-2024-01","chr":"20","start":16088321,"end":50682615,"numProbes":19555,"value":0.222},{"sample":"TCGA-24-2024-01","chr":"20","start":16079006,"end":16084944,"numProbes":3,"value":-0.7763},{"sample":"TCGA-24-2024-01","chr":"20","start":16009795,"end":16078803,"numProbes":73,"value":0.1612},{"sample":"TCGA-24-2024-01","chr":"20","start":16008011,"end":16009257,"numProbes":4,"value":-0.8311},{"sample":"TCGA-24-2024-01","chr":"20","start":12763139,"end":16007501,"numProbes":1850,"value":0.242},{"sample":"TCGA-24-2024-01","chr":"20","start":12757713,"end":12761379,"numProbes":4,"value":-0.7483},{"sample":"TCGA-24-2024-01","chr":"20","start":11515533,"end":12751391,"numProbes":842,"value":0.2548},{"sample":"TCGA-24-2024-01","chr":"20","start":11504274,"end":11514978,"numProbes":9,"value":-0.7358},{"sample":"TCGA-24-2024-01","chr":"20","start":455764,"end":11501142,"numProbes":6983,"value":0.2505},{"sample":"TCGA-24-2024-01","chr":"19","start":53778339,"end":58878226,"numProbes":2202,"value":-0.6708},{"sample":"TCGA-24-2024-01","chr":"19","start":53777270,"end":53778199,"numProbes":5,"value":-3.0977},{"sample":"TCGA-24-2024-01","chr":"19","start":46652781,"end":53777198,"numProbes":2709,"value":-0.6668},{"sample":"TCGA-24-2024-01","chr":"19","start":40465403,"end":46650570,"numProbes":2498,"value":0.2273},{"sample":"TCGA-24-2024-01","chr":"19","start":40458136,"end":40464877,"numProbes":2,"value":-1.4056},{"sample":"TCGA-24-2024-01","chr":"19","start":9078190,"end":40455082,"numProbes":13652,"value":0.225},{"sample":"TCGA-24-2024-01","chr":"19","start":284018,"end":9077436,"numProbes":2715,"value":-0.6673},{"sample":"TCGA-24-2024-01","chr":"18","start":72819403,"end":77109240,"numProbes":2768,"value":-0.7803},{"sample":"TCGA-24-2024-01","chr":"18","start":72816432,"end":72816792,"numProbes":2,"value":-4.2813},{"sample":"TCGA-24-2024-01","chr":"18","start":54746156,"end":72815890,"numProbes":9289,"value":-0.6938},{"sample":"TCGA-24-2024-01","chr":"18","start":54744144,"end":54745406,"numProbes":3,"value":-3.8705},{"sample":"TCGA-24-2024-01","chr":"18","start":47600795,"end":54741641,"numProbes":4475,"value":-0.7011},{"sample":"TCGA-24-2024-01","chr":"18","start":34411777,"end":47595962,"numProbes":8135,"value":0.2272},{"sample":"TCGA-24-2024-01","chr":"18","start":34411076,"end":34411683,"numProbes":7,"value":-0.7072},{"sample":"TCGA-24-2024-01","chr":"18","start":30491195,"end":34404924,"numProbes":2371,"value":0.2241},{"sample":"TCGA-24-2024-01","chr":"18","start":30478933,"end":30490280,"numProbes":12,"value":-0.4928},{"sample":"TCGA-24-2024-01","chr":"18","start":329586,"end":30474276,"numProbes":15332,"value":0.2442},{"sample":"TCGA-24-2024-01","chr":"17","start":77247212,"end":80917016,"numProbes":1407,"value":0.7418},{"sample":"TCGA-24-2024-01","chr":"17","start":77241410,"end":77241949,"numProbes":5,"value":-1.0674},{"sample":"TCGA-24-2024-01","chr":"17","start":76483338,"end":77237483,"numProbes":298,"value":0.7671},{"sample":"TCGA-24-2024-01","chr":"17","start":76471679,"end":76472976,"numProbes":5,"value":1.9059},{"sample":"TCGA-24-2024-01","chr":"17","start":75236950,"end":76471268,"numProbes":539,"value":0.7771},{"sample":"TCGA-24-2024-01","chr":"17","start":75217179,"end":75235908,"numProbes":12,"value":1.689},{"sample":"TCGA-24-2024-01","chr":"17","start":66837642,"end":75215486,"numProbes":4710,"value":0.7873},{"sample":"TCGA-24-2024-01","chr":"17","start":66836099,"end":66837397,"numProbes":4,"value":-1.18},{"sample":"TCGA-24-2024-01","chr":"17","start":60801044,"end":66835832,"numProbes":3285,"value":0.7837},{"sample":"TCGA-24-2024-01","chr":"17","start":59424239,"end":60796099,"numProbes":633,"value":0.2047},{"sample":"TCGA-24-2024-01","chr":"17","start":59423420,"end":59423815,"numProbes":2,"value":-2.4517},{"sample":"TCGA-24-2024-01","chr":"17","start":46989154,"end":59421940,"numProbes":7090,"value":0.2315},{"sample":"TCGA-24-2024-01","chr":"17","start":29671387,"end":46988597,"numProbes":7340,"value":-0.6851},{"sample":"TCGA-24-2024-01","chr":"17","start":29668808,"end":29671327,"numProbes":3,"value":-5.3267},{"sample":"TCGA-24-2024-01","chr":"17","start":19645901,"end":29668664,"numProbes":2377,"value":-0.66},{"sample":"TCGA-24-2024-01","chr":"17","start":19643016,"end":19645245,"numProbes":3,"value":-2.4935},{"sample":"TCGA-24-2024-01","chr":"17","start":19404091,"end":19642952,"numProbes":112,"value":-0.6656},{"sample":"TCGA-24-2024-01","chr":"17","start":19397455,"end":19402097,"numProbes":6,"value":-4.4334},{"sample":"TCGA-24-2024-01","chr":"17","start":10383994,"end":19390096,"numProbes":4104,"value":-0.697},{"sample":"TCGA-24-2024-01","chr":"17","start":9788769,"end":10379289,"numProbes":336,"value":0.2504},{"sample":"TCGA-24-2024-01","chr":"17","start":9788218,"end":9788251,"numProbes":2,"value":2.0012},{"sample":"TCGA-24-2024-01","chr":"17","start":7762637,"end":9787468,"numProbes":1248,"value":0.2294},{"sample":"TCGA-24-2024-01","chr":"17","start":7754460,"end":7757313,"numProbes":2,"value":-3.1445},{"sample":"TCGA-24-2024-01","chr":"17","start":987221,"end":7753140,"numProbes":3205,"value":0.24},{"sample":"TCGA-24-2024-01","chr":"16","start":85997281,"end":89379936,"numProbes":1784,"value":-0.7937},{"sample":"TCGA-24-2024-01","chr":"16","start":85994520,"end":85996295,"numProbes":3,"value":-4.8393},{"sample":"TCGA-24-2024-01","chr":"16","start":83862600,"end":85993580,"numProbes":719,"value":-0.7994},{"sample":"TCGA-24-2024-01","chr":"16","start":83857789,"end":83861617,"numProbes":4,"value":-6.3381},{"sample":"TCGA-24-2024-01","chr":"16","start":83767219,"end":83856512,"numProbes":145,"value":-0.6863},{"sample":"TCGA-24-2024-01","chr":"16","start":83767112,"end":83767133,"numProbes":2,"value":-3.7654},{"sample":"TCGA-24-2024-01","chr":"16","start":80779563,"end":83766808,"numProbes":2396,"value":-0.7461},{"sample":"TCGA-24-2024-01","chr":"16","start":80779076,"end":80779197,"numProbes":3,"value":-4.2752},{"sample":"TCGA-24-2024-01","chr":"16","start":50731096,"end":80778706,"numProbes":19135,"value":-0.6901},{"sample":"TCGA-24-2024-01","chr":"16","start":50730865,"end":50730881,"numProbes":2,"value":-6.0352},{"sample":"TCGA-24-2024-01","chr":"16","start":48153165,"end":50726262,"numProbes":1667,"value":-0.7152},{"sample":"TCGA-24-2024-01","chr":"16","start":1007268,"end":48148756,"numProbes":14413,"value":0.2426},{"sample":"TCGA-24-2024-01","chr":"16","start":1005360,"end":1005666,"numProbes":2,"value":-2.1781},{"sample":"TCGA-24-2024-01","chr":"16","start":653459,"end":1004694,"numProbes":64,"value":0.2524},{"sample":"TCGA-24-2024-01","chr":"15","start":77918702,"end":101884307,"numProbes":14059,"value":0.2201},{"sample":"TCGA-24-2024-01","chr":"15","start":72034649,"end":77912408,"numProbes":2755,"value":-0.6969},{"sample":"TCGA-24-2024-01","chr":"15","start":23687685,"end":72033321,"numProbes":27549,"value":0.2317},{"sample":"TCGA-24-2024-01","chr":"14","start":104050792,"end":105988038,"numProbes":571,"value":0.2141},{"sample":"TCGA-24-2024-01","chr":"14","start":104047702,"end":104047757,"numProbes":3,"value":-1.1989},{"sample":"TCGA-24-2024-01","chr":"14","start":95420055,"end":104047122,"numProbes":5436,"value":0.2204},{"sample":"TCGA-24-2024-01","chr":"14","start":95416598,"end":95417563,"numProbes":3,"value":-1.2993},{"sample":"TCGA-24-2024-01","chr":"14","start":84013477,"end":95415113,"numProbes":7059,"value":0.2324},{"sample":"TCGA-24-2024-01","chr":"14","start":32464312,"end":84010872,"numProbes":30017,"value":-0.6961},{"sample":"TCGA-24-2024-01","chr":"14","start":32452629,"end":32456358,"numProbes":7,"value":-6.4466},{"sample":"TCGA-24-2024-01","chr":"14","start":22083365,"end":32452378,"numProbes":5013,"value":-0.6846},{"sample":"TCGA-24-2024-01","chr":"14","start":20501368,"end":22082606,"numProbes":863,"value":0.2439},{"sample":"TCGA-24-2024-01","chr":"13","start":114246355,"end":114987458,"numProbes":141,"value":0.7791},{"sample":"TCGA-24-2024-01","chr":"13","start":110604680,"end":114245861,"numProbes":2117,"value":0.2025},{"sample":"TCGA-24-2024-01","chr":"13","start":27457376,"end":110600254,"numProbes":49522,"value":-0.6953},{"sample":"TCGA-24-2024-01","chr":"13","start":27455416,"end":27456768,"numProbes":4,"value":-5.0616},{"sample":"TCGA-24-2024-01","chr":"13","start":21911278,"end":27455339,"numProbes":3285,"value":-0.7199},{"sample":"TCGA-24-2024-01","chr":"13","start":21907495,"end":21911143,"numProbes":5,"value":-3.3075},{"sample":"TCGA-24-2024-01","chr":"13","start":19734310,"end":21907172,"numProbes":742,"value":-0.6964},{"sample":"TCGA-24-2024-01","chr":"13","start":19732017,"end":19733849,"numProbes":5,"value":-2.0104},{"sample":"TCGA-24-2024-01","chr":"13","start":19450806,"end":19731876,"numProbes":193,"value":-0.7024},{"sample":"TCGA-24-2024-01","chr":"12","start":110132304,"end":133161346,"numProbes":12013,"value":0.2227},{"sample":"TCGA-24-2024-01","chr":"12","start":110123478,"end":110127439,"numProbes":5,"value":-1.1275},{"sample":"TCGA-24-2024-01","chr":"12","start":75187700,"end":110122326,"numProbes":21760,"value":0.2105},{"sample":"TCGA-24-2024-01","chr":"12","start":75185912,"end":75186314,"numProbes":3,"value":-2.2662},{"sample":"TCGA-24-2024-01","chr":"12","start":50548328,"end":75179421,"numProbes":14319,"value":0.215},{"sample":"TCGA-24-2024-01","chr":"12","start":50375648,"end":50547607,"numProbes":89,"value":0.7632},{"sample":"TCGA-24-2024-01","chr":"12","start":22868305,"end":50372026,"numProbes":12908,"value":0.2142},{"sample":"TCGA-24-2024-01","chr":"12","start":22866862,"end":22868165,"numProbes":6,"value":-1.276},{"sample":"TCGA-24-2024-01","chr":"12","start":11356080,"end":22865243,"numProbes":7111,"value":0.2167},{"sample":"TCGA-24-2024-01","chr":"12","start":889902,"end":11152443,"numProbes":5517,"value":0.7603},{"sample":"TCGA-24-2024-01","chr":"11","start":99883154,"end":134142530,"numProbes":22728,"value":0.2133},{"sample":"TCGA-24-2024-01","chr":"11","start":99882392,"end":99883092,"numProbes":2,"value":-1.6296},{"sample":"TCGA-24-2024-01","chr":"11","start":69988895,"end":99882216,"numProbes":17659,"value":0.2128},{"sample":"TCGA-24-2024-01","chr":"11","start":69973982,"end":69985223,"numProbes":10,"value":-1.0153},{"sample":"TCGA-24-2024-01","chr":"11","start":49462367,"end":69972079,"numProbes":6411,"value":0.2114},{"sample":"TCGA-24-2024-01","chr":"11","start":49434739,"end":49459219,"numProbes":13,"value":1.4942},{"sample":"TCGA-24-2024-01","chr":"11","start":41718075,"end":49432485,"numProbes":4107,"value":0.2165},{"sample":"TCGA-24-2024-01","chr":"11","start":41683975,"end":41714503,"numProbes":17,"value":-0.2813},{"sample":"TCGA-24-2024-01","chr":"11","start":8974357,"end":41683364,"numProbes":21490,"value":0.2215},{"sample":"TCGA-24-2024-01","chr":"11","start":8966388,"end":8972645,"numProbes":9,"value":-0.7575},{"sample":"TCGA-24-2024-01","chr":"11","start":456120,"end":8957970,"numProbes":4536,"value":0.2022},{"sample":"TCGA-24-2024-01","chr":"10","start":130265278,"end":135225087,"numProbes":2182,"value":0.7919},{"sample":"TCGA-24-2024-01","chr":"10","start":130262934,"end":130262998,"numProbes":3,"value":-0.7388},{"sample":"TCGA-24-2024-01","chr":"10","start":125868241,"end":130262918,"numProbes":3066,"value":0.7877},{"sample":"TCGA-24-2024-01","chr":"10","start":121782814,"end":125863535,"numProbes":3264,"value":0.2139},{"sample":"TCGA-24-2024-01","chr":"10","start":121780861,"end":121781935,"numProbes":4,"value":-1.5035},{"sample":"TCGA-24-2024-01","chr":"10","start":115730237,"end":121778291,"numProbes":3983,"value":0.2264},{"sample":"TCGA-24-2024-01","chr":"10","start":115727348,"end":115729327,"numProbes":3,"value":-2.8661},{"sample":"TCGA-24-2024-01","chr":"10","start":110193416,"end":115727283,"numProbes":3689,"value":0.2125},{"sample":"TCGA-24-2024-01","chr":"10","start":108428264,"end":110191034,"numProbes":1207,"value":-0.6901},{"sample":"TCGA-24-2024-01","chr":"10","start":108427122,"end":108427644,"numProbes":2,"value":-7.0718},{"sample":"TCGA-24-2024-01","chr":"10","start":107305066,"end":108425019,"numProbes":723,"value":-0.7233},{"sample":"TCGA-24-2024-01","chr":"10","start":107299745,"end":107301067,"numProbes":2,"value":-5.2964},{"sample":"TCGA-24-2024-01","chr":"10","start":89166468,"end":107299192,"numProbes":10599,"value":-0.706},{"sample":"TCGA-24-2024-01","chr":"10","start":78329131,"end":88868671,"numProbes":7013,"value":0.2352},{"sample":"TCGA-24-2024-01","chr":"10","start":78312803,"end":78321443,"numProbes":13,"value":-0.7084},{"sample":"TCGA-24-2024-01","chr":"10","start":22421698,"end":78311287,"numProbes":29233,"value":0.2389},{"sample":"TCGA-24-2024-01","chr":"10","start":21390298,"end":22413053,"numProbes":469,"value":-0.6934},{"sample":"TCGA-24-2024-01","chr":"10","start":21378085,"end":21384152,"numProbes":5,"value":-3.5129},{"sample":"TCGA-24-2024-01","chr":"10","start":16813456,"end":21377866,"numProbes":3144,"value":-0.686},{"sample":"TCGA-24-2024-01","chr":"10","start":16803947,"end":16812244,"numProbes":13,"value":-1.5785},{"sample":"TCGA-24-2024-01","chr":"10","start":9361364,"end":16800118,"numProbes":5548,"value":-0.7072},{"sample":"TCGA-24-2024-01","chr":"10","start":9355284,"end":9357949,"numProbes":8,"value":-6.1968},{"sample":"TCGA-24-2024-01","chr":"10","start":5636626,"end":9353777,"numProbes":2858,"value":-0.7102},{"sample":"TCGA-24-2024-01","chr":"10","start":5624038,"end":5635591,"numProbes":6,"value":-3.0768},{"sample":"TCGA-24-2024-01","chr":"10","start":3983483,"end":5623837,"numProbes":1279,"value":-0.7413},{"sample":"TCGA-24-2024-01","chr":"10","start":3972077,"end":3980337,"numProbes":4,"value":-3.0515},{"sample":"TCGA-24-2024-01","chr":"10","start":415240,"end":3971879,"numProbes":1978,"value":-0.7595},{"sample":"TCGA-24-2024-01","chr":"9","start":137733844,"end":140938752,"numProbes":1028,"value":-0.7643},{"sample":"TCGA-24-2024-01","chr":"9","start":137722644,"end":137732458,"numProbes":3,"value":-4.5388},{"sample":"TCGA-24-2024-01","chr":"9","start":113356463,"end":137722170,"numProbes":15136,"value":-0.7149},{"sample":"TCGA-24-2024-01","chr":"9","start":113355602,"end":113355719,"numProbes":3,"value":-3.3229},{"sample":"TCGA-24-2024-01","chr":"9","start":100162417,"end":113353357,"numProbes":8610,"value":-0.6886},{"sample":"TCGA-24-2024-01","chr":"9","start":100156757,"end":100161757,"numProbes":4,"value":-3.4709},{"sample":"TCGA-24-2024-01","chr":"9","start":96063776,"end":100156312,"numProbes":2509,"value":-0.6947},{"sample":"TCGA-24-2024-01","chr":"9","start":96053440,"end":96063690,"numProbes":6,"value":-3.1223},{"sample":"TCGA-24-2024-01","chr":"9","start":78424837,"end":96052896,"numProbes":11807,"value":-0.6953},{"sample":"TCGA-24-2024-01","chr":"9","start":71039044,"end":78420242,"numProbes":5053,"value":0.2515},{"sample":"TCGA-24-2024-01","chr":"9","start":21806564,"end":38747688,"numProbes":9858,"value":-0.7006},{"sample":"TCGA-24-2024-01","chr":"9","start":21801319,"end":21801530,"numProbes":2,"value":-3.7177},{"sample":"TCGA-24-2024-01","chr":"9","start":12790630,"end":21800513,"numProbes":6953,"value":-0.6992},{"sample":"TCGA-24-2024-01","chr":"9","start":12780295,"end":12790501,"numProbes":4,"value":-3.5431},{"sample":"TCGA-24-2024-01","chr":"9","start":789932,"end":12776840,"numProbes":6275,"value":-0.7064},{"sample":"TCGA-24-2024-01","chr":"8","start":87667954,"end":145232496,"numProbes":34128,"value":0.2118},{"sample":"TCGA-24-2024-01","chr":"8","start":76114189,"end":87661513,"numProbes":5917,"value":-0.7085},{"sample":"TCGA-24-2024-01","chr":"8","start":76093556,"end":76110365,"numProbes":11,"value":-4.452},{"sample":"TCGA-24-2024-01","chr":"8","start":63340985,"end":76087289,"numProbes":7374,"value":-0.7075},{"sample":"TCGA-24-2024-01","chr":"8","start":57180528,"end":63338349,"numProbes":3905,"value":0.221},{"sample":"TCGA-24-2024-01","chr":"8","start":57173329,"end":57176908,"numProbes":2,"value":-1.5932},{"sample":"TCGA-24-2024-01","chr":"8","start":49978424,"end":57172232,"numProbes":4063,"value":0.2334},{"sample":"TCGA-24-2024-01","chr":"8","start":49749805,"end":49976448,"numProbes":131,"value":-0.6765},{"sample":"TCGA-24-2024-01","chr":"8","start":37396693,"end":49747633,"numProbes":3962,"value":0.2231},{"sample":"TCGA-24-2024-01","chr":"8","start":37389985,"end":37395076,"numProbes":4,"value":-1.0445},{"sample":"TCGA-24-2024-01","chr":"8","start":34712820,"end":37387915,"numProbes":1333,"value":0.2388},{"sample":"TCGA-24-2024-01","chr":"8","start":8656669,"end":34708689,"numProbes":16776,"value":-0.7094},{"sample":"TCGA-24-2024-01","chr":"8","start":8619322,"end":8655386,"numProbes":34,"value":-5.106},{"sample":"TCGA-24-2024-01","chr":"8","start":4241132,"end":8616474,"numProbes":1505,"value":-0.7265},{"sample":"TCGA-24-2024-01","chr":"8","start":4240940,"end":4241054,"numProbes":2,"value":-7.2199},{"sample":"TCGA-24-2024-01","chr":"8","start":1208805,"end":4240925,"numProbes":1669,"value":-0.7119},{"sample":"TCGA-24-2024-01","chr":"8","start":617667,"end":930451,"numProbes":155,"value":-4.2219},{"sample":"TCGA-24-2024-01","chr":"7","start":115181622,"end":158385118,"numProbes":23022,"value":0.2151},{"sample":"TCGA-24-2024-01","chr":"7","start":115181271,"end":115181357,"numProbes":2,"value":1.8737},{"sample":"TCGA-24-2024-01","chr":"7","start":93685391,"end":115180647,"numProbes":10740,"value":0.2153},{"sample":"TCGA-24-2024-01","chr":"7","start":93683616,"end":93684144,"numProbes":4,"value":-1.3536},{"sample":"TCGA-24-2024-01","chr":"7","start":82612005,"end":93682407,"numProbes":5410,"value":0.2154},{"sample":"TCGA-24-2024-01","chr":"7","start":82609304,"end":82610262,"numProbes":5,"value":-0.9891},{"sample":"TCGA-24-2024-01","chr":"7","start":71490008,"end":82605569,"numProbes":4822,"value":0.2289},{"sample":"TCGA-24-2024-01","chr":"7","start":71480843,"end":71489776,"numProbes":10,"value":-0.4829},{"sample":"TCGA-24-2024-01","chr":"7","start":29835020,"end":71480281,"numProbes":21102,"value":0.2221},{"sample":"TCGA-24-2024-01","chr":"7","start":29792232,"end":29822279,"numProbes":29,"value":-0.6814},{"sample":"TCGA-24-2024-01","chr":"7","start":705284,"end":29791748,"numProbes":15947,"value":0.2151},{"sample":"TCGA-24-2024-01","chr":"6","start":168277738,"end":170903919,"numProbes":811,"value":0.2377},{"sample":"TCGA-24-2024-01","chr":"6","start":161789173,"end":168270238,"numProbes":3499,"value":-0.7158},{"sample":"TCGA-24-2024-01","chr":"6","start":161763312,"end":161786694,"numProbes":18,"value":-3.6736},{"sample":"TCGA-24-2024-01","chr":"6","start":156201599,"end":161753326,"numProbes":3413,"value":-0.72},{"sample":"TCGA-24-2024-01","chr":"6","start":156201012,"end":156201248,"numProbes":3,"value":-4.9443},{"sample":"TCGA-24-2024-01","chr":"6","start":153967777,"end":156200568,"numProbes":1493,"value":-0.6612},{"sample":"TCGA-24-2024-01","chr":"6","start":139725588,"end":153946241,"numProbes":8868,"value":0.2435},{"sample":"TCGA-24-2024-01","chr":"6","start":139718926,"end":139724949,"numProbes":4,"value":-0.7218},{"sample":"TCGA-24-2024-01","chr":"6","start":135349570,"end":139716941,"numProbes":2876,"value":0.231},{"sample":"TCGA-24-2024-01","chr":"6","start":135342254,"end":135343238,"numProbes":2,"value":-1.7472},{"sample":"TCGA-24-2024-01","chr":"6","start":117019472,"end":135335429,"numProbes":10765,"value":0.2381},{"sample":"TCGA-24-2024-01","chr":"6","start":106038310,"end":117016762,"numProbes":6564,"value":-0.7212},{"sample":"TCGA-24-2024-01","chr":"6","start":66357489,"end":106037860,"numProbes":22010,"value":0.234},{"sample":"TCGA-24-2024-01","chr":"6","start":66356639,"end":66356757,"numProbes":2,"value":-1.9615},{"sample":"TCGA-24-2024-01","chr":"6","start":55349650,"end":66353061,"numProbes":2976,"value":0.2197},{"sample":"TCGA-24-2024-01","chr":"6","start":55341607,"end":55345403,"numProbes":3,"value":-2.863},{"sample":"TCGA-24-2024-01","chr":"6","start":38076164,"end":55336331,"numProbes":10779,"value":0.2185},{"sample":"TCGA-24-2024-01","chr":"6","start":37057606,"end":38074244,"numProbes":614,"value":0.7732},{"sample":"TCGA-24-2024-01","chr":"6","start":2164325,"end":37053844,"numProbes":20502,"value":0.2122},{"sample":"TCGA-24-2024-01","chr":"6","start":2162749,"end":2163474,"numProbes":2,"value":-2.1869},{"sample":"TCGA-24-2024-01","chr":"6","start":1014281,"end":2161192,"numProbes":872,"value":0.2199},{"sample":"TCGA-24-2024-01","chr":"5","start":177746360,"end":180360469,"numProbes":1377,"value":0.2244},{"sample":"TCGA-24-2024-01","chr":"5","start":176957597,"end":177744217,"numProbes":174,"value":-0.7476},{"sample":"TCGA-24-2024-01","chr":"5","start":168532467,"end":176946576,"numProbes":5107,"value":0.2087},{"sample":"TCGA-24-2024-01","chr":"5","start":168522112,"end":168532137,"numProbes":11,"value":-1.0801},{"sample":"TCGA-24-2024-01","chr":"5","start":140916357,"end":168518373,"numProbes":17972,"value":0.2138},{"sample":"TCGA-24-2024-01","chr":"5","start":140803629,"end":140911422,"numProbes":52,"value":-0.6697},{"sample":"TCGA-24-2024-01","chr":"5","start":123546684,"end":140784427,"numProbes":9646,"value":0.2086},{"sample":"TCGA-24-2024-01","chr":"5","start":123537576,"end":123546260,"numProbes":9,"value":-0.7347},{"sample":"TCGA-24-2024-01","chr":"5","start":123480625,"end":123536491,"numProbes":31,"value":0.3134},{"sample":"TCGA-24-2024-01","chr":"5","start":113321898,"end":123474316,"numProbes":5809,"value":-0.7264},{"sample":"TCGA-24-2024-01","chr":"5","start":113320355,"end":113320778,"numProbes":2,"value":-3.9754},{"sample":"TCGA-24-2024-01","chr":"5","start":109983605,"end":113320137,"numProbes":2288,"value":-0.7211},{"sample":"TCGA-24-2024-01","chr":"5","start":109982583,"end":109982795,"numProbes":2,"value":-3.6512},{"sample":"TCGA-24-2024-01","chr":"5","start":89882068,"end":109978803,"numProbes":9757,"value":-0.7181},{"sample":"TCGA-24-2024-01","chr":"5","start":89865854,"end":89881778,"numProbes":7,"value":-2.1454},{"sample":"TCGA-24-2024-01","chr":"5","start":75726963,"end":89864738,"numProbes":7630,"value":-0.7198},{"sample":"TCGA-24-2024-01","chr":"5","start":75259085,"end":75724985,"numProbes":359,"value":0.1964},{"sample":"TCGA-24-2024-01","chr":"5","start":75258446,"end":75259043,"numProbes":5,"value":-6.6277},{"sample":"TCGA-24-2024-01","chr":"5","start":70819971,"end":75255293,"numProbes":2778,"value":0.2073},{"sample":"TCGA-24-2024-01","chr":"5","start":66644503,"end":70817911,"numProbes":1384,"value":-0.7246},{"sample":"TCGA-24-2024-01","chr":"5","start":914233,"end":66639638,"numProbes":35621,"value":0.2268},{"sample":"TCGA-24-2024-01","chr":"4","start":177796613,"end":188763651,"numProbes":5184,"value":-0.7165},{"sample":"TCGA-24-2024-01","chr":"4","start":171692801,"end":177791404,"numProbes":3316,"value":0.2238},{"sample":"TCGA-24-2024-01","chr":"4","start":171689684,"end":171689818,"numProbes":2,"value":-3.2116},{"sample":"TCGA-24-2024-01","chr":"4","start":171075161,"end":171687319,"numProbes":343,"value":0.2451},{"sample":"TCGA-24-2024-01","chr":"4","start":171068077,"end":171070516,"numProbes":2,"value":-1.9924},{"sample":"TCGA-24-2024-01","chr":"4","start":152680701,"end":171065247,"numProbes":10401,"value":0.2159},{"sample":"TCGA-24-2024-01","chr":"4","start":150955949,"end":152677580,"numProbes":791,"value":0.7709},{"sample":"TCGA-24-2024-01","chr":"4","start":150915157,"end":150954229,"numProbes":31,"value":-0.6813},{"sample":"TCGA-24-2024-01","chr":"4","start":138523136,"end":150901114,"numProbes":7155,"value":0.7804},{"sample":"TCGA-24-2024-01","chr":"4","start":138013614,"end":138515322,"numProbes":262,"value":0.2723},{"sample":"TCGA-24-2024-01","chr":"4","start":137994244,"end":138011032,"numProbes":12,"value":-0.2958},{"sample":"TCGA-24-2024-01","chr":"4","start":127258991,"end":137993837,"numProbes":4946,"value":0.2528},{"sample":"TCGA-24-2024-01","chr":"4","start":78005837,"end":127258721,"numProbes":27787,"value":-0.7014},{"sample":"TCGA-24-2024-01","chr":"4","start":18422330,"end":78004668,"numProbes":31356,"value":0.2361},{"sample":"TCGA-24-2024-01","chr":"3","start":46484261,"end":52013563,"numProbes":2209,"value":0.195},{"sample":"TCGA-24-2024-01","chr":"3","start":52028350,"end":53776712,"numProbes":878,"value":-0.7862},{"sample":"TCGA-24-2024-01","chr":"3","start":53776995,"end":197538677,"numProbes":76728,"value":0.2114},{"sample":"TCGA-24-2024-01","chr":"4","start":1053934,"end":18414885,"numProbes":10668,"value":0.2069},{"sample":"TCGA-24-2024-01","chr":"4","start":18421158,"end":18421798,"numProbes":3,"value":-1.958},{"sample":"TCGA-24-2024-01","chr":"3","start":46477219,"end":46480958,"numProbes":3,"value":-1.9527},{"sample":"TCGA-24-2024-01","chr":"3","start":42244622,"end":46476348,"numProbes":2492,"value":0.1919},{"sample":"TCGA-24-2024-01","chr":"3","start":27914273,"end":42243851,"numProbes":8822,"value":0.7657},{"sample":"TCGA-24-2024-01","chr":"3","start":2212571,"end":27909805,"numProbes":14920,"value":0.2055},{"sample":"TCGA-24-2024-01","chr":"2","start":78400250,"end":242476062,"numProbes":85532,"value":0.2061},{"sample":"TCGA-24-2024-01","chr":"2","start":78396267,"end":78399695,"numProbes":2,"value":-2.6689},{"sample":"TCGA-24-2024-01","chr":"2","start":71288879,"end":78395652,"numProbes":3910,"value":0.1916},{"sample":"TCGA-24-2024-01","chr":"2","start":71286167,"end":71288787,"numProbes":2,"value":-1.9297},{"sample":"TCGA-24-2024-01","chr":"2","start":70442792,"end":71285874,"numProbes":560,"value":0.1881},{"sample":"TCGA-24-2024-01","chr":"2","start":70423558,"end":70439760,"numProbes":11,"value":0.8579},{"sample":"TCGA-24-2024-01","chr":"2","start":70389900,"end":70421985,"numProbes":16,"value":0.1159},{"sample":"TCGA-24-2024-01","chr":"2","start":70371571,"end":70381785,"numProbes":10,"value":-0.8133},{"sample":"TCGA-24-2024-01","chr":"2","start":6658248,"end":70369023,"numProbes":37312,"value":0.1953},{"sample":"TCGA-24-2024-01","chr":"2","start":6656742,"end":6657578,"numProbes":3,"value":-2.2234},{"sample":"TCGA-24-2024-01","chr":"2","start":6297054,"end":6655781,"numProbes":325,"value":0.1758},{"sample":"TCGA-24-2024-01","chr":"2","start":6295641,"end":6295756,"numProbes":2,"value":-2.114},{"sample":"TCGA-24-2024-01","chr":"2","start":5959381,"end":6295524,"numProbes":291,"value":0.1735},{"sample":"TCGA-24-2024-01","chr":"2","start":5958743,"end":5958997,"numProbes":3,"value":-1.5976},{"sample":"TCGA-24-2024-01","chr":"2","start":5166890,"end":5958708,"numProbes":606,"value":0.1848},{"sample":"TCGA-24-2024-01","chr":"2","start":4999999,"end":5004039,"numProbes":5,"value":-0.9434},{"sample":"TCGA-24-2024-01","chr":"2","start":484222,"end":4997283,"numProbes":2291,"value":0.1925},{"sample":"TCGA-24-2024-01","chr":"1","start":235768784,"end":247813706,"numProbes":7608,"value":0.2275},{"sample":"TCGA-24-2024-01","chr":"1","start":234930171,"end":235763211,"numProbes":390,"value":0.7595},{"sample":"TCGA-24-2024-01","chr":"1","start":234912288,"end":234915914,"numProbes":3,"value":-0.5717},{"sample":"TCGA-24-2024-01","chr":"1","start":221590000,"end":234908287,"numProbes":8429,"value":0.759},{"sample":"TCGA-24-2024-01","chr":"1","start":221587450,"end":221588015,"numProbes":2,"value":-0.7688},{"sample":"TCGA-24-2024-01","chr":"1","start":217115312,"end":221585278,"numProbes":2949,"value":0.7757},{"sample":"TCGA-24-2024-01","chr":"1","start":207746653,"end":217111943,"numProbes":6584,"value":0.2213},{"sample":"TCGA-24-2024-01","chr":"1","start":207712848,"end":207734866,"numProbes":4,"value":-0.9269},{"sample":"TCGA-24-2024-01","chr":"1","start":204157168,"end":207697830,"numProbes":2102,"value":0.202},{"sample":"TCGA-24-2024-01","chr":"1","start":200191383,"end":204156841,"numProbes":2509,"value":0.7576},{"sample":"TCGA-24-2024-01","chr":"1","start":200189305,"end":200189524,"numProbes":3,"value":-0.7011},{"sample":"TCGA-24-2024-01","chr":"1","start":153994647,"end":200188593,"numProbes":28707,"value":0.7692},{"sample":"TCGA-24-2024-01","chr":"1","start":153985743,"end":153992734,"numProbes":7,"value":-0.6409},{"sample":"TCGA-24-2024-01","chr":"1","start":149898951,"end":153979279,"numProbes":1873,"value":0.7645},{"sample":"TCGA-24-2024-01","chr":"1","start":116556470,"end":149890533,"numProbes":2393,"value":0.2191},{"sample":"TCGA-24-2024-01","chr":"1","start":116552570,"end":116556138,"numProbes":3,"value":-1.1621},{"sample":"TCGA-24-2024-01","chr":"1","start":112579141,"end":116552183,"numProbes":2531,"value":0.217},{"sample":"TCGA-24-2024-01","chr":"1","start":112567672,"end":112575032,"numProbes":17,"value":-0.8569},{"sample":"TCGA-24-2024-01","chr":"1","start":104802221,"end":112565239,"numProbes":4441,"value":0.2234},{"sample":"TCGA-24-2024-01","chr":"1","start":104798629,"end":104798853,"numProbes":3,"value":-0.9208},{"sample":"TCGA-24-2024-01","chr":"1","start":101295332,"end":104795504,"numProbes":1736,"value":0.2556},{"sample":"TCGA-24-2024-01","chr":"1","start":101269419,"end":101292652,"numProbes":10,"value":-0.5996},{"sample":"TCGA-24-2024-01","chr":"1","start":100824593,"end":101266091,"numProbes":284,"value":0.1934},{"sample":"TCGA-24-2024-01","chr":"1","start":100822030,"end":100823047,"numProbes":3,"value":-1.8243},{"sample":"TCGA-24-2024-01","chr":"1","start":84538704,"end":100817279,"numProbes":10060,"value":0.2264},{"sample":"TCGA-24-2024-01","chr":"1","start":79835336,"end":84537360,"numProbes":2936,"value":-0.6973},{"sample":"TCGA-24-2024-01","chr":"1","start":79834021,"end":79835191,"numProbes":4,"value":-2.8748},{"sample":"TCGA-24-2024-01","chr":"1","start":65818617,"end":79828164,"numProbes":8076,"value":-0.6817},{"sample":"TCGA-24-2024-01","chr":"1","start":65801352,"end":65818481,"numProbes":9,"value":-2.6031},{"sample":"TCGA-24-2024-01","chr":"1","start":55043569,"end":65800657,"numProbes":7771,"value":-0.7076},{"sample":"TCGA-24-2024-01","chr":"1","start":55039805,"end":55043533,"numProbes":7,"value":-3.5606},{"sample":"TCGA-24-2024-01","chr":"1","start":38738690,"end":55038988,"numProbes":8499,"value":-0.687},{"sample":"TCGA-24-2024-01","chr":"1","start":38735871,"end":38737593,"numProbes":3,"value":-4.1975},{"sample":"TCGA-24-2024-01","chr":"1","start":3218610,"end":38735280,"numProbes":18343,"value":-0.6915}],[{"gene":{"chromosome":"string","cytoband":"string","entrezGeneId":"number","hugoGeneSymbol":"string","length":"number","type":"string"},"startPos":"number","endPos":"number","referenceAllele":"string","variantAllele":"string","aminoAcidChange":"string","center":"string","mutationStatus":"string","validationStatus":"string","geneticProfileId":"string","sampleId":"string","tumorRefCount":"number","tumorAltCount":"number","normalRefCount":"number","normalAltCount":"number","proteinChange":"string","mutationType":"string","proteinPosEnd":"number","proteinPosStart":"number","keyword":"string","uniprotEntryName":"string","uniprotAccession":"string","functionalImpactScore":"string","fisValue":"number","linkPdb":"string","linkMsa":"string","linkXvar":"string"},{"gene":{"chromosome":"21","cytoband":null,"entrezGeneId":4685,"hugoGeneSymbol":"NCAM2","length":null,"type":null},"startPos":22841054,"endPos":22841054,"referenceAllele":"C","variantAllele":"A","aminoAcidChange":null,"center":null,"mutationStatus":"Somatic","validationStatus":"Valid","geneticProfileId":"ov_tcga_pub_mutations","sampleId":"TCGA-24-2024-01","tumorRefCount":null,"tumorAltCount":null,"normalRefCount":null,"normalAltCount":null,"proteinChange":"Q616K","mutationType":"Missense_Mutation","proteinPosEnd":616,"proteinPosStart":616,"keyword":"NCAM2 Q616 missense","uniprotEntryName":null,"uniprotAccession":null,"functionalImpactScore":"L","fisValue":null,"linkPdb":"getma.org/pdb.php?prot=NCAM2_HUMAN&from=593&to=678&var=Q616K","linkMsa":"http://mutationassessor.org/r2/?cm=msa&ty=f&p=NCAM2_HUMAN&rb=593&re=678&var=Q616K","linkXvar":"http://mutationassessor.org/r2/?cm=var&var=hg19,21,22841054,C,A&fts=all"},{"gene":{"chromosome":"6","cytoband":null,"entrezGeneId":23195,"hugoGeneSymbol":"MDN1","length":null,"type":null},"startPos":90368337,"endPos":90368337,"referenceAllele":"G","variantAllele":"A","aminoAcidChange":null,"center":null,"mutationStatus":"Somatic","validationStatus":"Valid","geneticProfileId":"ov_tcga_pub_mutations","sampleId":"TCGA-24-2024-01","tumorRefCount":null,"tumorAltCount":null,"normalRefCount":null,"normalAltCount":null,"proteinChange":"Q5005*","mutationType":"Nonsense_Mutation","proteinPosEnd":5005,"proteinPosStart":5005,"keyword":"MDN1 truncating","uniprotEntryName":null,"uniprotAccession":null,"functionalImpactScore":"L","fisValue":null,"linkPdb":null,"linkMsa":null,"linkXvar":"http://mutationassessor.org/r2/?cm=var&var=hg19,6,90368337,G,A&fts=all"},{"gene":{"chromosome":"5","cytoband":null,"entrezGeneId":324,"hugoGeneSymbol":"APC","length":null,"type":null},"startPos":112175577,"endPos":112175577,"referenceAllele":"A","variantAllele":"G","aminoAcidChange":null,"center":null,"mutationStatus":"Somatic","validationStatus":"Valid","geneticProfileId":"ov_tcga_pub_mutations","sampleId":"TCGA-24-2024-01 (deliberately elongated id)","tumorRefCount":null,"tumorAltCount":null,"normalRefCount":null,"normalAltCount":null,"proteinChange":"Q1429R","mutationType":"Missense_Mutation","proteinPosEnd":1429,"proteinPosStart":1429,"keyword":"APC Q1429 missense","uniprotEntryName":null,"uniprotAccession":null,"functionalImpactScore":"M","fisValue":null,"linkPdb":null,"linkMsa":"http://mutationassessor.org/r2/?cm=msa&ty=f&p=APC_HUMAN&rb=1395&re=1484&var=Q1429R","linkXvar":"http://mutationassessor.org/r2/?cm=var&var=hg19,5,112175577,A,G&fts=all"}]];
+const data = [
+    [
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '23',
+            start: 43657865,
+            end: 154905589,
+            numProbes: 45307,
+            value: 0.001,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '23',
+            start: 43656384,
+            end: 43657852,
+            numProbes: 2,
+            value: -3.8329,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '23',
+            start: 16501627,
+            end: 43652316,
+            numProbes: 12696,
+            value: -0.0036,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '23',
+            start: 16432819,
+            end: 16501253,
+            numProbes: 35,
+            value: -3.139,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '23',
+            start: 3157107,
+            end: 16432500,
+            numProbes: 5189,
+            value: -0.0161,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '22',
+            start: 37993126,
+            end: 49331012,
+            numProbes: 6810,
+            value: 0.2338,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '22',
+            start: 37977179,
+            end: 37990078,
+            numProbes: 10,
+            value: -0.6727,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '22',
+            start: 29465642,
+            end: 37971766,
+            numProbes: 5567,
+            value: 0.2428,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '22',
+            start: 29357926,
+            end: 29459732,
+            numProbes: 91,
+            value: 0.7707,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '22',
+            start: 17423930,
+            end: 29355821,
+            numProbes: 4401,
+            value: 0.2322,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '21',
+            start: 47527681,
+            end: 47678774,
+            numProbes: 70,
+            value: 0.6043,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '21',
+            start: 35940832,
+            end: 47527508,
+            numProbes: 7464,
+            value: 0.1511,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '21',
+            start: 35937190,
+            end: 35938325,
+            numProbes: 4,
+            value: -1.1603,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '21',
+            start: 31650579,
+            end: 35937072,
+            numProbes: 2549,
+            value: 0.1662,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '21',
+            start: 31640228,
+            end: 31643037,
+            numProbes: 6,
+            value: -0.7478,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '21',
+            start: 15347621,
+            end: 31638959,
+            numProbes: 10421,
+            value: 0.1906,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '20',
+            start: 55289145,
+            end: 62219837,
+            numProbes: 4534,
+            value: 0.7728,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '20',
+            start: 54895876,
+            end: 55287439,
+            numProbes: 252,
+            value: 0.2763,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '20',
+            start: 54889510,
+            end: 54889859,
+            numProbes: 2,
+            value: -1.1488,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '20',
+            start: 50699043,
+            end: 54888985,
+            numProbes: 3026,
+            value: 0.253,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '20',
+            start: 50683910,
+            end: 50695849,
+            numProbes: 12,
+            value: 0.9252,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '20',
+            start: 16088321,
+            end: 50682615,
+            numProbes: 19555,
+            value: 0.222,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '20',
+            start: 16079006,
+            end: 16084944,
+            numProbes: 3,
+            value: -0.7763,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '20',
+            start: 16009795,
+            end: 16078803,
+            numProbes: 73,
+            value: 0.1612,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '20',
+            start: 16008011,
+            end: 16009257,
+            numProbes: 4,
+            value: -0.8311,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '20',
+            start: 12763139,
+            end: 16007501,
+            numProbes: 1850,
+            value: 0.242,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '20',
+            start: 12757713,
+            end: 12761379,
+            numProbes: 4,
+            value: -0.7483,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '20',
+            start: 11515533,
+            end: 12751391,
+            numProbes: 842,
+            value: 0.2548,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '20',
+            start: 11504274,
+            end: 11514978,
+            numProbes: 9,
+            value: -0.7358,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '20',
+            start: 455764,
+            end: 11501142,
+            numProbes: 6983,
+            value: 0.2505,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '19',
+            start: 53778339,
+            end: 58878226,
+            numProbes: 2202,
+            value: -0.6708,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '19',
+            start: 53777270,
+            end: 53778199,
+            numProbes: 5,
+            value: -3.0977,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '19',
+            start: 46652781,
+            end: 53777198,
+            numProbes: 2709,
+            value: -0.6668,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '19',
+            start: 40465403,
+            end: 46650570,
+            numProbes: 2498,
+            value: 0.2273,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '19',
+            start: 40458136,
+            end: 40464877,
+            numProbes: 2,
+            value: -1.4056,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '19',
+            start: 9078190,
+            end: 40455082,
+            numProbes: 13652,
+            value: 0.225,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '19',
+            start: 284018,
+            end: 9077436,
+            numProbes: 2715,
+            value: -0.6673,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '18',
+            start: 72819403,
+            end: 77109240,
+            numProbes: 2768,
+            value: -0.7803,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '18',
+            start: 72816432,
+            end: 72816792,
+            numProbes: 2,
+            value: -4.2813,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '18',
+            start: 54746156,
+            end: 72815890,
+            numProbes: 9289,
+            value: -0.6938,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '18',
+            start: 54744144,
+            end: 54745406,
+            numProbes: 3,
+            value: -3.8705,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '18',
+            start: 47600795,
+            end: 54741641,
+            numProbes: 4475,
+            value: -0.7011,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '18',
+            start: 34411777,
+            end: 47595962,
+            numProbes: 8135,
+            value: 0.2272,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '18',
+            start: 34411076,
+            end: 34411683,
+            numProbes: 7,
+            value: -0.7072,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '18',
+            start: 30491195,
+            end: 34404924,
+            numProbes: 2371,
+            value: 0.2241,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '18',
+            start: 30478933,
+            end: 30490280,
+            numProbes: 12,
+            value: -0.4928,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '18',
+            start: 329586,
+            end: 30474276,
+            numProbes: 15332,
+            value: 0.2442,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '17',
+            start: 77247212,
+            end: 80917016,
+            numProbes: 1407,
+            value: 0.7418,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '17',
+            start: 77241410,
+            end: 77241949,
+            numProbes: 5,
+            value: -1.0674,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '17',
+            start: 76483338,
+            end: 77237483,
+            numProbes: 298,
+            value: 0.7671,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '17',
+            start: 76471679,
+            end: 76472976,
+            numProbes: 5,
+            value: 1.9059,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '17',
+            start: 75236950,
+            end: 76471268,
+            numProbes: 539,
+            value: 0.7771,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '17',
+            start: 75217179,
+            end: 75235908,
+            numProbes: 12,
+            value: 1.689,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '17',
+            start: 66837642,
+            end: 75215486,
+            numProbes: 4710,
+            value: 0.7873,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '17',
+            start: 66836099,
+            end: 66837397,
+            numProbes: 4,
+            value: -1.18,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '17',
+            start: 60801044,
+            end: 66835832,
+            numProbes: 3285,
+            value: 0.7837,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '17',
+            start: 59424239,
+            end: 60796099,
+            numProbes: 633,
+            value: 0.2047,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '17',
+            start: 59423420,
+            end: 59423815,
+            numProbes: 2,
+            value: -2.4517,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '17',
+            start: 46989154,
+            end: 59421940,
+            numProbes: 7090,
+            value: 0.2315,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '17',
+            start: 29671387,
+            end: 46988597,
+            numProbes: 7340,
+            value: -0.6851,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '17',
+            start: 29668808,
+            end: 29671327,
+            numProbes: 3,
+            value: -5.3267,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '17',
+            start: 19645901,
+            end: 29668664,
+            numProbes: 2377,
+            value: -0.66,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '17',
+            start: 19643016,
+            end: 19645245,
+            numProbes: 3,
+            value: -2.4935,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '17',
+            start: 19404091,
+            end: 19642952,
+            numProbes: 112,
+            value: -0.6656,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '17',
+            start: 19397455,
+            end: 19402097,
+            numProbes: 6,
+            value: -4.4334,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '17',
+            start: 10383994,
+            end: 19390096,
+            numProbes: 4104,
+            value: -0.697,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '17',
+            start: 9788769,
+            end: 10379289,
+            numProbes: 336,
+            value: 0.2504,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '17',
+            start: 9788218,
+            end: 9788251,
+            numProbes: 2,
+            value: 2.0012,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '17',
+            start: 7762637,
+            end: 9787468,
+            numProbes: 1248,
+            value: 0.2294,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '17',
+            start: 7754460,
+            end: 7757313,
+            numProbes: 2,
+            value: -3.1445,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '17',
+            start: 987221,
+            end: 7753140,
+            numProbes: 3205,
+            value: 0.24,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '16',
+            start: 85997281,
+            end: 89379936,
+            numProbes: 1784,
+            value: -0.7937,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '16',
+            start: 85994520,
+            end: 85996295,
+            numProbes: 3,
+            value: -4.8393,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '16',
+            start: 83862600,
+            end: 85993580,
+            numProbes: 719,
+            value: -0.7994,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '16',
+            start: 83857789,
+            end: 83861617,
+            numProbes: 4,
+            value: -6.3381,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '16',
+            start: 83767219,
+            end: 83856512,
+            numProbes: 145,
+            value: -0.6863,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '16',
+            start: 83767112,
+            end: 83767133,
+            numProbes: 2,
+            value: -3.7654,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '16',
+            start: 80779563,
+            end: 83766808,
+            numProbes: 2396,
+            value: -0.7461,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '16',
+            start: 80779076,
+            end: 80779197,
+            numProbes: 3,
+            value: -4.2752,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '16',
+            start: 50731096,
+            end: 80778706,
+            numProbes: 19135,
+            value: -0.6901,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '16',
+            start: 50730865,
+            end: 50730881,
+            numProbes: 2,
+            value: -6.0352,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '16',
+            start: 48153165,
+            end: 50726262,
+            numProbes: 1667,
+            value: -0.7152,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '16',
+            start: 1007268,
+            end: 48148756,
+            numProbes: 14413,
+            value: 0.2426,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '16',
+            start: 1005360,
+            end: 1005666,
+            numProbes: 2,
+            value: -2.1781,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '16',
+            start: 653459,
+            end: 1004694,
+            numProbes: 64,
+            value: 0.2524,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '15',
+            start: 77918702,
+            end: 101884307,
+            numProbes: 14059,
+            value: 0.2201,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '15',
+            start: 72034649,
+            end: 77912408,
+            numProbes: 2755,
+            value: -0.6969,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '15',
+            start: 23687685,
+            end: 72033321,
+            numProbes: 27549,
+            value: 0.2317,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '14',
+            start: 104050792,
+            end: 105988038,
+            numProbes: 571,
+            value: 0.2141,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '14',
+            start: 104047702,
+            end: 104047757,
+            numProbes: 3,
+            value: -1.1989,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '14',
+            start: 95420055,
+            end: 104047122,
+            numProbes: 5436,
+            value: 0.2204,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '14',
+            start: 95416598,
+            end: 95417563,
+            numProbes: 3,
+            value: -1.2993,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '14',
+            start: 84013477,
+            end: 95415113,
+            numProbes: 7059,
+            value: 0.2324,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '14',
+            start: 32464312,
+            end: 84010872,
+            numProbes: 30017,
+            value: -0.6961,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '14',
+            start: 32452629,
+            end: 32456358,
+            numProbes: 7,
+            value: -6.4466,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '14',
+            start: 22083365,
+            end: 32452378,
+            numProbes: 5013,
+            value: -0.6846,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '14',
+            start: 20501368,
+            end: 22082606,
+            numProbes: 863,
+            value: 0.2439,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '13',
+            start: 114246355,
+            end: 114987458,
+            numProbes: 141,
+            value: 0.7791,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '13',
+            start: 110604680,
+            end: 114245861,
+            numProbes: 2117,
+            value: 0.2025,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '13',
+            start: 27457376,
+            end: 110600254,
+            numProbes: 49522,
+            value: -0.6953,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '13',
+            start: 27455416,
+            end: 27456768,
+            numProbes: 4,
+            value: -5.0616,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '13',
+            start: 21911278,
+            end: 27455339,
+            numProbes: 3285,
+            value: -0.7199,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '13',
+            start: 21907495,
+            end: 21911143,
+            numProbes: 5,
+            value: -3.3075,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '13',
+            start: 19734310,
+            end: 21907172,
+            numProbes: 742,
+            value: -0.6964,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '13',
+            start: 19732017,
+            end: 19733849,
+            numProbes: 5,
+            value: -2.0104,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '13',
+            start: 19450806,
+            end: 19731876,
+            numProbes: 193,
+            value: -0.7024,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '12',
+            start: 110132304,
+            end: 133161346,
+            numProbes: 12013,
+            value: 0.2227,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '12',
+            start: 110123478,
+            end: 110127439,
+            numProbes: 5,
+            value: -1.1275,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '12',
+            start: 75187700,
+            end: 110122326,
+            numProbes: 21760,
+            value: 0.2105,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '12',
+            start: 75185912,
+            end: 75186314,
+            numProbes: 3,
+            value: -2.2662,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '12',
+            start: 50548328,
+            end: 75179421,
+            numProbes: 14319,
+            value: 0.215,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '12',
+            start: 50375648,
+            end: 50547607,
+            numProbes: 89,
+            value: 0.7632,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '12',
+            start: 22868305,
+            end: 50372026,
+            numProbes: 12908,
+            value: 0.2142,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '12',
+            start: 22866862,
+            end: 22868165,
+            numProbes: 6,
+            value: -1.276,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '12',
+            start: 11356080,
+            end: 22865243,
+            numProbes: 7111,
+            value: 0.2167,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '12',
+            start: 889902,
+            end: 11152443,
+            numProbes: 5517,
+            value: 0.7603,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '11',
+            start: 99883154,
+            end: 134142530,
+            numProbes: 22728,
+            value: 0.2133,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '11',
+            start: 99882392,
+            end: 99883092,
+            numProbes: 2,
+            value: -1.6296,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '11',
+            start: 69988895,
+            end: 99882216,
+            numProbes: 17659,
+            value: 0.2128,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '11',
+            start: 69973982,
+            end: 69985223,
+            numProbes: 10,
+            value: -1.0153,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '11',
+            start: 49462367,
+            end: 69972079,
+            numProbes: 6411,
+            value: 0.2114,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '11',
+            start: 49434739,
+            end: 49459219,
+            numProbes: 13,
+            value: 1.4942,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '11',
+            start: 41718075,
+            end: 49432485,
+            numProbes: 4107,
+            value: 0.2165,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '11',
+            start: 41683975,
+            end: 41714503,
+            numProbes: 17,
+            value: -0.2813,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '11',
+            start: 8974357,
+            end: 41683364,
+            numProbes: 21490,
+            value: 0.2215,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '11',
+            start: 8966388,
+            end: 8972645,
+            numProbes: 9,
+            value: -0.7575,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '11',
+            start: 456120,
+            end: 8957970,
+            numProbes: 4536,
+            value: 0.2022,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '10',
+            start: 130265278,
+            end: 135225087,
+            numProbes: 2182,
+            value: 0.7919,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '10',
+            start: 130262934,
+            end: 130262998,
+            numProbes: 3,
+            value: -0.7388,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '10',
+            start: 125868241,
+            end: 130262918,
+            numProbes: 3066,
+            value: 0.7877,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '10',
+            start: 121782814,
+            end: 125863535,
+            numProbes: 3264,
+            value: 0.2139,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '10',
+            start: 121780861,
+            end: 121781935,
+            numProbes: 4,
+            value: -1.5035,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '10',
+            start: 115730237,
+            end: 121778291,
+            numProbes: 3983,
+            value: 0.2264,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '10',
+            start: 115727348,
+            end: 115729327,
+            numProbes: 3,
+            value: -2.8661,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '10',
+            start: 110193416,
+            end: 115727283,
+            numProbes: 3689,
+            value: 0.2125,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '10',
+            start: 108428264,
+            end: 110191034,
+            numProbes: 1207,
+            value: -0.6901,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '10',
+            start: 108427122,
+            end: 108427644,
+            numProbes: 2,
+            value: -7.0718,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '10',
+            start: 107305066,
+            end: 108425019,
+            numProbes: 723,
+            value: -0.7233,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '10',
+            start: 107299745,
+            end: 107301067,
+            numProbes: 2,
+            value: -5.2964,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '10',
+            start: 89166468,
+            end: 107299192,
+            numProbes: 10599,
+            value: -0.706,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '10',
+            start: 78329131,
+            end: 88868671,
+            numProbes: 7013,
+            value: 0.2352,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '10',
+            start: 78312803,
+            end: 78321443,
+            numProbes: 13,
+            value: -0.7084,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '10',
+            start: 22421698,
+            end: 78311287,
+            numProbes: 29233,
+            value: 0.2389,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '10',
+            start: 21390298,
+            end: 22413053,
+            numProbes: 469,
+            value: -0.6934,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '10',
+            start: 21378085,
+            end: 21384152,
+            numProbes: 5,
+            value: -3.5129,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '10',
+            start: 16813456,
+            end: 21377866,
+            numProbes: 3144,
+            value: -0.686,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '10',
+            start: 16803947,
+            end: 16812244,
+            numProbes: 13,
+            value: -1.5785,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '10',
+            start: 9361364,
+            end: 16800118,
+            numProbes: 5548,
+            value: -0.7072,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '10',
+            start: 9355284,
+            end: 9357949,
+            numProbes: 8,
+            value: -6.1968,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '10',
+            start: 5636626,
+            end: 9353777,
+            numProbes: 2858,
+            value: -0.7102,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '10',
+            start: 5624038,
+            end: 5635591,
+            numProbes: 6,
+            value: -3.0768,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '10',
+            start: 3983483,
+            end: 5623837,
+            numProbes: 1279,
+            value: -0.7413,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '10',
+            start: 3972077,
+            end: 3980337,
+            numProbes: 4,
+            value: -3.0515,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '10',
+            start: 415240,
+            end: 3971879,
+            numProbes: 1978,
+            value: -0.7595,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '9',
+            start: 137733844,
+            end: 140938752,
+            numProbes: 1028,
+            value: -0.7643,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '9',
+            start: 137722644,
+            end: 137732458,
+            numProbes: 3,
+            value: -4.5388,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '9',
+            start: 113356463,
+            end: 137722170,
+            numProbes: 15136,
+            value: -0.7149,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '9',
+            start: 113355602,
+            end: 113355719,
+            numProbes: 3,
+            value: -3.3229,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '9',
+            start: 100162417,
+            end: 113353357,
+            numProbes: 8610,
+            value: -0.6886,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '9',
+            start: 100156757,
+            end: 100161757,
+            numProbes: 4,
+            value: -3.4709,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '9',
+            start: 96063776,
+            end: 100156312,
+            numProbes: 2509,
+            value: -0.6947,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '9',
+            start: 96053440,
+            end: 96063690,
+            numProbes: 6,
+            value: -3.1223,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '9',
+            start: 78424837,
+            end: 96052896,
+            numProbes: 11807,
+            value: -0.6953,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '9',
+            start: 71039044,
+            end: 78420242,
+            numProbes: 5053,
+            value: 0.2515,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '9',
+            start: 21806564,
+            end: 38747688,
+            numProbes: 9858,
+            value: -0.7006,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '9',
+            start: 21801319,
+            end: 21801530,
+            numProbes: 2,
+            value: -3.7177,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '9',
+            start: 12790630,
+            end: 21800513,
+            numProbes: 6953,
+            value: -0.6992,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '9',
+            start: 12780295,
+            end: 12790501,
+            numProbes: 4,
+            value: -3.5431,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '9',
+            start: 789932,
+            end: 12776840,
+            numProbes: 6275,
+            value: -0.7064,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '8',
+            start: 87667954,
+            end: 145232496,
+            numProbes: 34128,
+            value: 0.2118,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '8',
+            start: 76114189,
+            end: 87661513,
+            numProbes: 5917,
+            value: -0.7085,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '8',
+            start: 76093556,
+            end: 76110365,
+            numProbes: 11,
+            value: -4.452,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '8',
+            start: 63340985,
+            end: 76087289,
+            numProbes: 7374,
+            value: -0.7075,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '8',
+            start: 57180528,
+            end: 63338349,
+            numProbes: 3905,
+            value: 0.221,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '8',
+            start: 57173329,
+            end: 57176908,
+            numProbes: 2,
+            value: -1.5932,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '8',
+            start: 49978424,
+            end: 57172232,
+            numProbes: 4063,
+            value: 0.2334,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '8',
+            start: 49749805,
+            end: 49976448,
+            numProbes: 131,
+            value: -0.6765,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '8',
+            start: 37396693,
+            end: 49747633,
+            numProbes: 3962,
+            value: 0.2231,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '8',
+            start: 37389985,
+            end: 37395076,
+            numProbes: 4,
+            value: -1.0445,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '8',
+            start: 34712820,
+            end: 37387915,
+            numProbes: 1333,
+            value: 0.2388,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '8',
+            start: 8656669,
+            end: 34708689,
+            numProbes: 16776,
+            value: -0.7094,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '8',
+            start: 8619322,
+            end: 8655386,
+            numProbes: 34,
+            value: -5.106,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '8',
+            start: 4241132,
+            end: 8616474,
+            numProbes: 1505,
+            value: -0.7265,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '8',
+            start: 4240940,
+            end: 4241054,
+            numProbes: 2,
+            value: -7.2199,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '8',
+            start: 1208805,
+            end: 4240925,
+            numProbes: 1669,
+            value: -0.7119,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '8',
+            start: 617667,
+            end: 930451,
+            numProbes: 155,
+            value: -4.2219,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '7',
+            start: 115181622,
+            end: 158385118,
+            numProbes: 23022,
+            value: 0.2151,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '7',
+            start: 115181271,
+            end: 115181357,
+            numProbes: 2,
+            value: 1.8737,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '7',
+            start: 93685391,
+            end: 115180647,
+            numProbes: 10740,
+            value: 0.2153,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '7',
+            start: 93683616,
+            end: 93684144,
+            numProbes: 4,
+            value: -1.3536,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '7',
+            start: 82612005,
+            end: 93682407,
+            numProbes: 5410,
+            value: 0.2154,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '7',
+            start: 82609304,
+            end: 82610262,
+            numProbes: 5,
+            value: -0.9891,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '7',
+            start: 71490008,
+            end: 82605569,
+            numProbes: 4822,
+            value: 0.2289,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '7',
+            start: 71480843,
+            end: 71489776,
+            numProbes: 10,
+            value: -0.4829,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '7',
+            start: 29835020,
+            end: 71480281,
+            numProbes: 21102,
+            value: 0.2221,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '7',
+            start: 29792232,
+            end: 29822279,
+            numProbes: 29,
+            value: -0.6814,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '7',
+            start: 705284,
+            end: 29791748,
+            numProbes: 15947,
+            value: 0.2151,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '6',
+            start: 168277738,
+            end: 170903919,
+            numProbes: 811,
+            value: 0.2377,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '6',
+            start: 161789173,
+            end: 168270238,
+            numProbes: 3499,
+            value: -0.7158,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '6',
+            start: 161763312,
+            end: 161786694,
+            numProbes: 18,
+            value: -3.6736,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '6',
+            start: 156201599,
+            end: 161753326,
+            numProbes: 3413,
+            value: -0.72,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '6',
+            start: 156201012,
+            end: 156201248,
+            numProbes: 3,
+            value: -4.9443,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '6',
+            start: 153967777,
+            end: 156200568,
+            numProbes: 1493,
+            value: -0.6612,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '6',
+            start: 139725588,
+            end: 153946241,
+            numProbes: 8868,
+            value: 0.2435,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '6',
+            start: 139718926,
+            end: 139724949,
+            numProbes: 4,
+            value: -0.7218,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '6',
+            start: 135349570,
+            end: 139716941,
+            numProbes: 2876,
+            value: 0.231,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '6',
+            start: 135342254,
+            end: 135343238,
+            numProbes: 2,
+            value: -1.7472,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '6',
+            start: 117019472,
+            end: 135335429,
+            numProbes: 10765,
+            value: 0.2381,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '6',
+            start: 106038310,
+            end: 117016762,
+            numProbes: 6564,
+            value: -0.7212,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '6',
+            start: 66357489,
+            end: 106037860,
+            numProbes: 22010,
+            value: 0.234,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '6',
+            start: 66356639,
+            end: 66356757,
+            numProbes: 2,
+            value: -1.9615,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '6',
+            start: 55349650,
+            end: 66353061,
+            numProbes: 2976,
+            value: 0.2197,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '6',
+            start: 55341607,
+            end: 55345403,
+            numProbes: 3,
+            value: -2.863,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '6',
+            start: 38076164,
+            end: 55336331,
+            numProbes: 10779,
+            value: 0.2185,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '6',
+            start: 37057606,
+            end: 38074244,
+            numProbes: 614,
+            value: 0.7732,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '6',
+            start: 2164325,
+            end: 37053844,
+            numProbes: 20502,
+            value: 0.2122,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '6',
+            start: 2162749,
+            end: 2163474,
+            numProbes: 2,
+            value: -2.1869,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '6',
+            start: 1014281,
+            end: 2161192,
+            numProbes: 872,
+            value: 0.2199,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '5',
+            start: 177746360,
+            end: 180360469,
+            numProbes: 1377,
+            value: 0.2244,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '5',
+            start: 176957597,
+            end: 177744217,
+            numProbes: 174,
+            value: -0.7476,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '5',
+            start: 168532467,
+            end: 176946576,
+            numProbes: 5107,
+            value: 0.2087,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '5',
+            start: 168522112,
+            end: 168532137,
+            numProbes: 11,
+            value: -1.0801,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '5',
+            start: 140916357,
+            end: 168518373,
+            numProbes: 17972,
+            value: 0.2138,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '5',
+            start: 140803629,
+            end: 140911422,
+            numProbes: 52,
+            value: -0.6697,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '5',
+            start: 123546684,
+            end: 140784427,
+            numProbes: 9646,
+            value: 0.2086,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '5',
+            start: 123537576,
+            end: 123546260,
+            numProbes: 9,
+            value: -0.7347,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '5',
+            start: 123480625,
+            end: 123536491,
+            numProbes: 31,
+            value: 0.3134,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '5',
+            start: 113321898,
+            end: 123474316,
+            numProbes: 5809,
+            value: -0.7264,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '5',
+            start: 113320355,
+            end: 113320778,
+            numProbes: 2,
+            value: -3.9754,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '5',
+            start: 109983605,
+            end: 113320137,
+            numProbes: 2288,
+            value: -0.7211,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '5',
+            start: 109982583,
+            end: 109982795,
+            numProbes: 2,
+            value: -3.6512,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '5',
+            start: 89882068,
+            end: 109978803,
+            numProbes: 9757,
+            value: -0.7181,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '5',
+            start: 89865854,
+            end: 89881778,
+            numProbes: 7,
+            value: -2.1454,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '5',
+            start: 75726963,
+            end: 89864738,
+            numProbes: 7630,
+            value: -0.7198,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '5',
+            start: 75259085,
+            end: 75724985,
+            numProbes: 359,
+            value: 0.1964,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '5',
+            start: 75258446,
+            end: 75259043,
+            numProbes: 5,
+            value: -6.6277,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '5',
+            start: 70819971,
+            end: 75255293,
+            numProbes: 2778,
+            value: 0.2073,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '5',
+            start: 66644503,
+            end: 70817911,
+            numProbes: 1384,
+            value: -0.7246,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '5',
+            start: 914233,
+            end: 66639638,
+            numProbes: 35621,
+            value: 0.2268,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '4',
+            start: 177796613,
+            end: 188763651,
+            numProbes: 5184,
+            value: -0.7165,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '4',
+            start: 171692801,
+            end: 177791404,
+            numProbes: 3316,
+            value: 0.2238,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '4',
+            start: 171689684,
+            end: 171689818,
+            numProbes: 2,
+            value: -3.2116,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '4',
+            start: 171075161,
+            end: 171687319,
+            numProbes: 343,
+            value: 0.2451,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '4',
+            start: 171068077,
+            end: 171070516,
+            numProbes: 2,
+            value: -1.9924,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '4',
+            start: 152680701,
+            end: 171065247,
+            numProbes: 10401,
+            value: 0.2159,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '4',
+            start: 150955949,
+            end: 152677580,
+            numProbes: 791,
+            value: 0.7709,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '4',
+            start: 150915157,
+            end: 150954229,
+            numProbes: 31,
+            value: -0.6813,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '4',
+            start: 138523136,
+            end: 150901114,
+            numProbes: 7155,
+            value: 0.7804,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '4',
+            start: 138013614,
+            end: 138515322,
+            numProbes: 262,
+            value: 0.2723,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '4',
+            start: 137994244,
+            end: 138011032,
+            numProbes: 12,
+            value: -0.2958,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '4',
+            start: 127258991,
+            end: 137993837,
+            numProbes: 4946,
+            value: 0.2528,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '4',
+            start: 78005837,
+            end: 127258721,
+            numProbes: 27787,
+            value: -0.7014,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '4',
+            start: 18422330,
+            end: 78004668,
+            numProbes: 31356,
+            value: 0.2361,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '3',
+            start: 46484261,
+            end: 52013563,
+            numProbes: 2209,
+            value: 0.195,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '3',
+            start: 52028350,
+            end: 53776712,
+            numProbes: 878,
+            value: -0.7862,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '3',
+            start: 53776995,
+            end: 197538677,
+            numProbes: 76728,
+            value: 0.2114,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '4',
+            start: 1053934,
+            end: 18414885,
+            numProbes: 10668,
+            value: 0.2069,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '4',
+            start: 18421158,
+            end: 18421798,
+            numProbes: 3,
+            value: -1.958,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '3',
+            start: 46477219,
+            end: 46480958,
+            numProbes: 3,
+            value: -1.9527,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '3',
+            start: 42244622,
+            end: 46476348,
+            numProbes: 2492,
+            value: 0.1919,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '3',
+            start: 27914273,
+            end: 42243851,
+            numProbes: 8822,
+            value: 0.7657,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '3',
+            start: 2212571,
+            end: 27909805,
+            numProbes: 14920,
+            value: 0.2055,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '2',
+            start: 78400250,
+            end: 242476062,
+            numProbes: 85532,
+            value: 0.2061,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '2',
+            start: 78396267,
+            end: 78399695,
+            numProbes: 2,
+            value: -2.6689,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '2',
+            start: 71288879,
+            end: 78395652,
+            numProbes: 3910,
+            value: 0.1916,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '2',
+            start: 71286167,
+            end: 71288787,
+            numProbes: 2,
+            value: -1.9297,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '2',
+            start: 70442792,
+            end: 71285874,
+            numProbes: 560,
+            value: 0.1881,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '2',
+            start: 70423558,
+            end: 70439760,
+            numProbes: 11,
+            value: 0.8579,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '2',
+            start: 70389900,
+            end: 70421985,
+            numProbes: 16,
+            value: 0.1159,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '2',
+            start: 70371571,
+            end: 70381785,
+            numProbes: 10,
+            value: -0.8133,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '2',
+            start: 6658248,
+            end: 70369023,
+            numProbes: 37312,
+            value: 0.1953,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '2',
+            start: 6656742,
+            end: 6657578,
+            numProbes: 3,
+            value: -2.2234,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '2',
+            start: 6297054,
+            end: 6655781,
+            numProbes: 325,
+            value: 0.1758,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '2',
+            start: 6295641,
+            end: 6295756,
+            numProbes: 2,
+            value: -2.114,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '2',
+            start: 5959381,
+            end: 6295524,
+            numProbes: 291,
+            value: 0.1735,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '2',
+            start: 5958743,
+            end: 5958997,
+            numProbes: 3,
+            value: -1.5976,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '2',
+            start: 5166890,
+            end: 5958708,
+            numProbes: 606,
+            value: 0.1848,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '2',
+            start: 4999999,
+            end: 5004039,
+            numProbes: 5,
+            value: -0.9434,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '2',
+            start: 484222,
+            end: 4997283,
+            numProbes: 2291,
+            value: 0.1925,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '1',
+            start: 235768784,
+            end: 247813706,
+            numProbes: 7608,
+            value: 0.2275,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '1',
+            start: 234930171,
+            end: 235763211,
+            numProbes: 390,
+            value: 0.7595,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '1',
+            start: 234912288,
+            end: 234915914,
+            numProbes: 3,
+            value: -0.5717,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '1',
+            start: 221590000,
+            end: 234908287,
+            numProbes: 8429,
+            value: 0.759,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '1',
+            start: 221587450,
+            end: 221588015,
+            numProbes: 2,
+            value: -0.7688,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '1',
+            start: 217115312,
+            end: 221585278,
+            numProbes: 2949,
+            value: 0.7757,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '1',
+            start: 207746653,
+            end: 217111943,
+            numProbes: 6584,
+            value: 0.2213,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '1',
+            start: 207712848,
+            end: 207734866,
+            numProbes: 4,
+            value: -0.9269,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '1',
+            start: 204157168,
+            end: 207697830,
+            numProbes: 2102,
+            value: 0.202,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '1',
+            start: 200191383,
+            end: 204156841,
+            numProbes: 2509,
+            value: 0.7576,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '1',
+            start: 200189305,
+            end: 200189524,
+            numProbes: 3,
+            value: -0.7011,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '1',
+            start: 153994647,
+            end: 200188593,
+            numProbes: 28707,
+            value: 0.7692,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '1',
+            start: 153985743,
+            end: 153992734,
+            numProbes: 7,
+            value: -0.6409,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '1',
+            start: 149898951,
+            end: 153979279,
+            numProbes: 1873,
+            value: 0.7645,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '1',
+            start: 116556470,
+            end: 149890533,
+            numProbes: 2393,
+            value: 0.2191,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '1',
+            start: 116552570,
+            end: 116556138,
+            numProbes: 3,
+            value: -1.1621,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '1',
+            start: 112579141,
+            end: 116552183,
+            numProbes: 2531,
+            value: 0.217,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '1',
+            start: 112567672,
+            end: 112575032,
+            numProbes: 17,
+            value: -0.8569,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '1',
+            start: 104802221,
+            end: 112565239,
+            numProbes: 4441,
+            value: 0.2234,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '1',
+            start: 104798629,
+            end: 104798853,
+            numProbes: 3,
+            value: -0.9208,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '1',
+            start: 101295332,
+            end: 104795504,
+            numProbes: 1736,
+            value: 0.2556,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '1',
+            start: 101269419,
+            end: 101292652,
+            numProbes: 10,
+            value: -0.5996,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '1',
+            start: 100824593,
+            end: 101266091,
+            numProbes: 284,
+            value: 0.1934,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '1',
+            start: 100822030,
+            end: 100823047,
+            numProbes: 3,
+            value: -1.8243,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '1',
+            start: 84538704,
+            end: 100817279,
+            numProbes: 10060,
+            value: 0.2264,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '1',
+            start: 79835336,
+            end: 84537360,
+            numProbes: 2936,
+            value: -0.6973,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '1',
+            start: 79834021,
+            end: 79835191,
+            numProbes: 4,
+            value: -2.8748,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '1',
+            start: 65818617,
+            end: 79828164,
+            numProbes: 8076,
+            value: -0.6817,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '1',
+            start: 65801352,
+            end: 65818481,
+            numProbes: 9,
+            value: -2.6031,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '1',
+            start: 55043569,
+            end: 65800657,
+            numProbes: 7771,
+            value: -0.7076,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '1',
+            start: 55039805,
+            end: 55043533,
+            numProbes: 7,
+            value: -3.5606,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '1',
+            start: 38738690,
+            end: 55038988,
+            numProbes: 8499,
+            value: -0.687,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '1',
+            start: 38735871,
+            end: 38737593,
+            numProbes: 3,
+            value: -4.1975,
+        },
+        {
+            sample: 'TCGA-24-2024-01',
+            chr: '1',
+            start: 3218610,
+            end: 38735280,
+            numProbes: 18343,
+            value: -0.6915,
+        },
+    ],
+    [
+        {
+            gene: {
+                chromosome: 'string',
+                cytoband: 'string',
+                entrezGeneId: 'number',
+                hugoGeneSymbol: 'string',
+                length: 'number',
+                type: 'string',
+            },
+            startPos: 'number',
+            endPos: 'number',
+            referenceAllele: 'string',
+            variantAllele: 'string',
+            aminoAcidChange: 'string',
+            center: 'string',
+            mutationStatus: 'string',
+            validationStatus: 'string',
+            geneticProfileId: 'string',
+            sampleId: 'string',
+            tumorRefCount: 'number',
+            tumorAltCount: 'number',
+            normalRefCount: 'number',
+            normalAltCount: 'number',
+            proteinChange: 'string',
+            mutationType: 'string',
+            proteinPosEnd: 'number',
+            proteinPosStart: 'number',
+            keyword: 'string',
+            uniprotEntryName: 'string',
+            uniprotAccession: 'string',
+            functionalImpactScore: 'string',
+            fisValue: 'number',
+            linkPdb: 'string',
+            linkMsa: 'string',
+            linkXvar: 'string',
+        },
+        {
+            gene: {
+                chromosome: '21',
+                cytoband: null,
+                entrezGeneId: 4685,
+                hugoGeneSymbol: 'NCAM2',
+                length: null,
+                type: null,
+            },
+            startPos: 22841054,
+            endPos: 22841054,
+            referenceAllele: 'C',
+            variantAllele: 'A',
+            aminoAcidChange: null,
+            center: null,
+            mutationStatus: 'Somatic',
+            validationStatus: 'Valid',
+            geneticProfileId: 'ov_tcga_pub_mutations',
+            sampleId: 'TCGA-24-2024-01',
+            tumorRefCount: null,
+            tumorAltCount: null,
+            normalRefCount: null,
+            normalAltCount: null,
+            proteinChange: 'Q616K',
+            mutationType: 'Missense_Mutation',
+            proteinPosEnd: 616,
+            proteinPosStart: 616,
+            keyword: 'NCAM2 Q616 missense',
+            uniprotEntryName: null,
+            uniprotAccession: null,
+            functionalImpactScore: 'L',
+            fisValue: null,
+            linkPdb:
+                'getma.org/pdb.php?prot=NCAM2_HUMAN&from=593&to=678&var=Q616K',
+            linkMsa:
+                'http://mutationassessor.org/r2/?cm=msa&ty=f&p=NCAM2_HUMAN&rb=593&re=678&var=Q616K',
+            linkXvar:
+                'http://mutationassessor.org/r2/?cm=var&var=hg19,21,22841054,C,A&fts=all',
+        },
+        {
+            gene: {
+                chromosome: '6',
+                cytoband: null,
+                entrezGeneId: 23195,
+                hugoGeneSymbol: 'MDN1',
+                length: null,
+                type: null,
+            },
+            startPos: 90368337,
+            endPos: 90368337,
+            referenceAllele: 'G',
+            variantAllele: 'A',
+            aminoAcidChange: null,
+            center: null,
+            mutationStatus: 'Somatic',
+            validationStatus: 'Valid',
+            geneticProfileId: 'ov_tcga_pub_mutations',
+            sampleId: 'TCGA-24-2024-01',
+            tumorRefCount: null,
+            tumorAltCount: null,
+            normalRefCount: null,
+            normalAltCount: null,
+            proteinChange: 'Q5005*',
+            mutationType: 'Nonsense_Mutation',
+            proteinPosEnd: 5005,
+            proteinPosStart: 5005,
+            keyword: 'MDN1 truncating',
+            uniprotEntryName: null,
+            uniprotAccession: null,
+            functionalImpactScore: 'L',
+            fisValue: null,
+            linkPdb: null,
+            linkMsa: null,
+            linkXvar:
+                'http://mutationassessor.org/r2/?cm=var&var=hg19,6,90368337,G,A&fts=all',
+        },
+        {
+            gene: {
+                chromosome: '5',
+                cytoband: null,
+                entrezGeneId: 324,
+                hugoGeneSymbol: 'APC',
+                length: null,
+                type: null,
+            },
+            startPos: 112175577,
+            endPos: 112175577,
+            referenceAllele: 'A',
+            variantAllele: 'G',
+            aminoAcidChange: null,
+            center: null,
+            mutationStatus: 'Somatic',
+            validationStatus: 'Valid',
+            geneticProfileId: 'ov_tcga_pub_mutations',
+            sampleId: 'TCGA-24-2024-01 (deliberately elongated id)',
+            tumorRefCount: null,
+            tumorAltCount: null,
+            normalRefCount: null,
+            normalAltCount: null,
+            proteinChange: 'Q1429R',
+            mutationType: 'Missense_Mutation',
+            proteinPosEnd: 1429,
+            proteinPosStart: 1429,
+            keyword: 'APC Q1429 missense',
+            uniprotEntryName: null,
+            uniprotAccession: null,
+            functionalImpactScore: 'M',
+            fisValue: null,
+            linkPdb: null,
+            linkMsa:
+                'http://mutationassessor.org/r2/?cm=msa&ty=f&p=APC_HUMAN&rb=1395&re=1484&var=Q1429R',
+            linkXvar:
+                'http://mutationassessor.org/r2/?cm=var&var=hg19,5,112175577,A,G&fts=all',
+        },
+    ],
+];
 
-export default data;
\ No newline at end of file
+export default data;
diff --git a/src/pages/patientView/genomicOverview/tracksHelper.spec.tsx b/src/pages/patientView/genomicOverview/tracksHelper.spec.tsx
index d5733645191..6f35128b8a2 100644
--- a/src/pages/patientView/genomicOverview/tracksHelper.spec.tsx
+++ b/src/pages/patientView/genomicOverview/tracksHelper.spec.tsx
@@ -5,17 +5,9 @@ import { shallow, mount } from 'enzyme';
 import sinon from 'sinon';
 
 describe('tracksHelper', () => {
+    before(() => {});
 
-    before(()=>{
-
-    });
-
-    after(()=>{
-
-    });
-
-    it('what does it do?', ()=>{
-
-    });
+    after(() => {});
 
+    it('what does it do?', () => {});
 });
diff --git a/src/pages/patientView/genomicOverview/tracksHelper.ts b/src/pages/patientView/genomicOverview/tracksHelper.ts
index 93b32cf39e4..ba12c9218a4 100644
--- a/src/pages/patientView/genomicOverview/tracksHelper.ts
+++ b/src/pages/patientView/genomicOverview/tracksHelper.ts
@@ -3,12 +3,19 @@ import $ from 'jquery';
 import * as _ from 'lodash';
 import 'qtip2';
 import 'qtip2/dist/jquery.qtip.css';
-import {Mutation, ReferenceGenomeGene} from "shared/api/generated/CBioPortalAPI";
-import {DEFAULT_GENOME_BUILD} from "pages/patientView/genomicOverview/Tracks";
-import {default as chromosomeSizes} from "./chromosomeSizes.json";
+import {
+    Mutation,
+    ReferenceGenomeGene,
+} from 'shared/api/generated/CBioPortalAPI';
+import { DEFAULT_GENOME_BUILD } from 'pages/patientView/genomicOverview/Tracks';
+import { default as chromosomeSizes } from './chromosomeSizes.json';
 import { IIconData } from './GenomicOverviewUtils.js';
 
-export function GenomicOverviewConfig(nRows: any,width: any, showGenePanelIcons:boolean) {
+export function GenomicOverviewConfig(
+    nRows: any,
+    width: any,
+    showGenePanelIcons: boolean
+) {
     let sel: any = {};
     sel.nRows = nRows;
     sel.canvasWidth = width;
@@ -16,29 +23,40 @@ export function GenomicOverviewConfig(nRows: any,width: any, showGenePanelIcons:
     sel.wideRightText = 50;
     sel.wideGenePanelIcon = 20;
     sel.heigthGenePanelIcon = 18;
-    sel.GenomeWidth = sel.canvasWidth-sel.wideLeftText-sel.wideRightText-(showGenePanelIcons ? sel.wideGenePanelIcon : 0);
+    sel.GenomeWidth =
+        sel.canvasWidth -
+        sel.wideLeftText -
+        sel.wideRightText -
+        (showGenePanelIcons ? sel.wideGenePanelIcon : 0);
     sel.pixelsPerBinMut = 3;
     sel.rowHeight = 20;
     sel.rowMargin = 5;
     sel.ticHeight = 10;
-    sel.cnTh = [0.2,1.5];
+    sel.cnTh = [0.2, 1.5];
     sel.cnLengthTh = 50000;
     sel.getCnColor = function(cnValue: any) {
-        if (cnValue>=sel.cnTh[1])
-            return "#f00";
-        if (cnValue<=-sel.cnTh[1])
-            return "#00f";
-        var c = Math.round(255*(sel.cnTh[1]-Math.abs(cnValue))/(sel.cnTh[1]-sel.cnTh[0]));
-        if (cnValue<0)
-            return "rgb("+c+","+c+",255)";
-        else
-            return "rgb(255,"+c+","+c+")";
+        if (cnValue >= sel.cnTh[1]) return '#f00';
+        if (cnValue <= -sel.cnTh[1]) return '#00f';
+        var c = Math.round(
+            (255 * (sel.cnTh[1] - Math.abs(cnValue))) /
+                (sel.cnTh[1] - sel.cnTh[0])
+        );
+        if (cnValue < 0) return 'rgb(' + c + ',' + c + ',255)';
+        else return 'rgb(255,' + c + ',' + c + ')';
     };
     sel.canvasHeight = function() {
-        return 2*sel.rowMargin+sel.ticHeight+sel.nRows*(sel.rowHeight+sel.rowMargin);
+        return (
+            2 * sel.rowMargin +
+            sel.ticHeight +
+            sel.nRows * (sel.rowHeight + sel.rowMargin)
+        );
     };
     sel.yRow = function(row: any) {
-        return 2*sel.rowMargin+sel.ticHeight+row*(sel.rowHeight+sel.rowMargin);
+        return (
+            2 * sel.rowMargin +
+            sel.ticHeight +
+            row * (sel.rowHeight + sel.rowMargin)
+        );
     };
     sel.xRightText = function() {
         return sel.wideLeftText + sel.GenomeWidth + 5;
@@ -47,7 +65,7 @@ export function GenomicOverviewConfig(nRows: any,width: any, showGenePanelIcons:
         return sel.xRightText() + 40;
     };
     sel.xGenePanelIconText = function() {
-        return sel.xGenePanelIcon() + sel.wideGenePanelIcon/2;
+        return sel.xGenePanelIcon() + sel.wideGenePanelIcon / 2;
     };
     return sel;
 }
@@ -58,8 +76,8 @@ export function createRaphaelCanvas(elementId: any, config: any) {
 
 function getChmEndsPerc(chms: Array<any>, total: any) {
     var ends = [0];
-    for (var i=1; i<chms.length; i++) {
-        ends.push(ends[i-1]+chms[i]/total);
+    for (var i = 1; i < chms.length; i++) {
+        ends.push(ends[i - 1] + chms[i] / total);
     }
     return ends;
 }
@@ -68,28 +86,32 @@ function getChmEndsPerc(chms: Array<any>, total: any) {
  * storing chromesome length info
  */
 export const genomeBuilds: Map<string, string> = new Map([
-    [ "hg19", "GRCh37" ],
-    [ "37", "GRCh37" ],
-    [ "hg38", "GRCh38" ],
-    [ "38", "GRCh38" ],
-    [ "mm10", "GRCm38" ]
+    ['hg19', 'GRCh37'],
+    ['37', 'GRCh37'],
+    ['hg38', 'GRCh38'],
+    ['38', 'GRCh38'],
+    ['mm10', 'GRCm38'],
 ]);
 
 export type ChromosomeSizes = {
-    genomeBuild: string,
-    chromosomeSize: number[]
+    genomeBuild: string;
+    chromosomeSize: number[];
 };
 
-const referenceGenomeSizes:{[genomeBuild:string]:number[]} =
-    chromosomeSizes.reduce(
-            (map:{[genomeBuild:string]:number[]}, next:ChromosomeSizes)=>
-            { map[next.genomeBuild] = next.chromosomeSize || [];return map;},
-            {});
+const referenceGenomeSizes: {
+    [genomeBuild: string]: number[];
+} = chromosomeSizes.reduce(
+    (map: { [genomeBuild: string]: number[] }, next: ChromosomeSizes) => {
+        map[next.genomeBuild] = next.chromosomeSize || [];
+        return map;
+    },
+    {}
+);
 
-export function getChmInfo(genomeBuild:string) {
-    const sel: any = {genomeRef:{}, total:0};
+export function getChmInfo(genomeBuild: string) {
+    const sel: any = { genomeRef: {}, total: 0 };
     let referenceGenome = genomeBuilds.get(genomeBuild);
-    if (!referenceGenome || referenceGenome === "") {
+    if (!referenceGenome || referenceGenome === '') {
         referenceGenome = DEFAULT_GENOME_BUILD;
     }
     const genomeSize = referenceGenomeSizes[referenceGenome];
@@ -98,84 +120,122 @@ export function getChmInfo(genomeBuild:string) {
         sel.total = _.sum(genomeSize);
     }
 
-    sel.perc = getChmEndsPerc(sel.genomeRef,sel.total);
-    sel.loc2perc = function(chm: any,loc: any) {
-        return sel.perc[chm-1] + loc/sel.total;
+    sel.perc = getChmEndsPerc(sel.genomeRef, sel.total);
+    sel.loc2perc = function(chm: any, loc: any) {
+        return sel.perc[chm - 1] + loc / sel.total;
     };
     sel.loc2xpixil = function(chm: any, loc: any, goConfig: any) {
-        return sel.loc2perc(chm,loc)*goConfig.GenomeWidth+goConfig.wideLeftText;
+        return (
+            sel.loc2perc(chm, loc) * goConfig.GenomeWidth +
+            goConfig.wideLeftText
+        );
     };
-    sel.perc2loc = function(xPerc: any,startChm: any) {
+    sel.perc2loc = function(xPerc: any, startChm: any) {
         var chm;
-        if (!startChm) {//binary search
-            var low = 1, high = sel.genomeRef.length-1, i;
+        if (!startChm) {
+            //binary search
+            var low = 1,
+                high = sel.genomeRef.length - 1,
+                i;
             while (low <= high) {
                 i = Math.floor((low + high) / 2);
-                if (sel.perc[i] >= xPerc)  {high = i - 1;}
-                else  {low = i + 1;}
+                if (sel.perc[i] >= xPerc) {
+                    high = i - 1;
+                } else {
+                    low = i + 1;
+                }
             }
             chm = low;
-        } else {//linear search
+        } else {
+            //linear search
             var i;
-            for (i=startChm; i<sel.genomeRef.length; i++) {
-                if (xPerc<=sel.perc[i]) break;
+            for (i = startChm; i < sel.genomeRef.length; i++) {
+                if (xPerc <= sel.perc[i]) break;
             }
             chm = i;
         }
-        var loc = Math.round(sel.total*(xPerc-sel.perc[chm-1]));
-        return [chm,loc];
+        var loc = Math.round(sel.total * (xPerc - sel.perc[chm - 1]));
+        return [chm, loc];
     };
     sel.xpixil2loc = function(goConfig: any, x: any, startChm: any) {
-        var xPerc = (x-goConfig.wideLeftText)/goConfig.GenomeWidth;
-        return sel.perc2loc(xPerc,startChm);
+        var xPerc = (x - goConfig.wideLeftText) / goConfig.GenomeWidth;
+        return sel.perc2loc(xPerc, startChm);
     };
     sel.middle = function(chm: any, goConfig: any) {
-        var loc = sel.genomeRef[chm]/2;
-        return sel.loc2xpixil(chm,loc,goConfig);
+        var loc = sel.genomeRef[chm] / 2;
+        return sel.loc2xpixil(chm, loc, goConfig);
     };
     sel.chmName = function(chm: any) {
-        if (chm === 23) return "X";
-        if (chm === 24) return "Y";
+        if (chm === 23) return 'X';
+        if (chm === 24) return 'Y';
         return chm;
-    }
+    };
     return sel;
 }
 
-export function plotChromosomes(p: any, config: any,chmInfo: any, genomeBuild: any) {
-    var yRuler = config.rowMargin+config.ticHeight;
-    drawLine(config.wideLeftText,yRuler,config.wideLeftText+config.GenomeWidth,yRuler,p,'#000',1);
+export function plotChromosomes(
+    p: any,
+    config: any,
+    chmInfo: any,
+    genomeBuild: any
+) {
+    var yRuler = config.rowMargin + config.ticHeight;
+    drawLine(
+        config.wideLeftText,
+        yRuler,
+        config.wideLeftText + config.GenomeWidth,
+        yRuler,
+        p,
+        '#000',
+        1
+    );
     // ticks & texts
-    for (var i=1; i<chmInfo.genomeRef.length; i++) {
-        if (chmInfo.genomeRef[i] === 0 && genomeBuild === "GRCm38") {
+    for (var i = 1; i < chmInfo.genomeRef.length; i++) {
+        if (chmInfo.genomeRef[i] === 0 && genomeBuild === 'GRCm38') {
             // Do not display chromosomes 20, 21 and 22 in mouse, they do not exist
             // They have length 0 in the file chromosomeSizes.json
         } else {
-        var xt = chmInfo.loc2xpixil(i,0,config);
-        drawLine(xt,yRuler,xt,config.rowMargin,p,'#000',1);
+            var xt = chmInfo.loc2xpixil(i, 0, config);
+            drawLine(xt, yRuler, xt, config.rowMargin, p, '#000', 1);
 
-        var m = chmInfo.middle(i,config);
-        p.text(m,yRuler-config.rowMargin,chmInfo.chmName(i));
+            var m = chmInfo.middle(i, config);
+            p.text(m, yRuler - config.rowMargin, chmInfo.chmName(i));
         }
     }
-    drawLine(config.wideLeftText+config.GenomeWidth,yRuler,config.wideLeftText+config.GenomeWidth,config.rowMargin,p,'#000',1);
+    drawLine(
+        config.wideLeftText + config.GenomeWidth,
+        yRuler,
+        config.wideLeftText + config.GenomeWidth,
+        config.rowMargin,
+        p,
+        '#000',
+        1
+    );
 }
 
-function drawLine(x1: any, y1: any, x2: any, y2: any, p: any, cl: any, width: any) {
-    var path = "M" + x1 + " " + y1 + " L" + x2 + " " + y2;
+function drawLine(
+    x1: any,
+    y1: any,
+    x2: any,
+    y2: any,
+    p: any,
+    cl: any,
+    width: any
+) {
+    var path = 'M' + x1 + ' ' + y1 + ' L' + x2 + ' ' + y2;
     var line = p.path(path);
-    line.attr("stroke", cl);
-    line.attr("stroke-width", width);
-    line.attr("opacity", 0.5);
+    line.attr('stroke', cl);
+    line.attr('stroke-width', width);
+    line.attr('opacity', 0.5);
     line.translate(0.5, 0.5);
     return line;
 }
 
 function loc2string(loc: any, chmInfo: any) {
-    return "chr"+chmInfo.chmName(loc[0])+":"+addCommas(loc[1]);
+    return 'chr' + chmInfo.chmName(loc[0]) + ':' + addCommas(loc[1]);
 }
 
-function addCommas(x: any)
-{
+function addCommas(x: any) {
     var strX = x.toString();
     var rgx = /(\d+)(\d{3})/;
     while (rgx.test(strX)) {
@@ -184,169 +244,266 @@ function addCommas(x: any)
     return strX;
 }
 
-export function plotCnSegs(p: any, config: any, chmInfo: any,row: any, segs: Array<any>, chrCol: any, startCol: any, endCol: any, segCol: any, caseId: any, genePanelIconData: IIconData, setGenePanelInTooltip:(genePanelId:string)=>void) {
+export function plotCnSegs(
+    p: any,
+    config: any,
+    chmInfo: any,
+    row: any,
+    segs: Array<any>,
+    chrCol: any,
+    startCol: any,
+    endCol: any,
+    segCol: any,
+    caseId: any,
+    genePanelIconData: IIconData,
+    setGenePanelInTooltip: (genePanelId: string) => void
+) {
     var yRow = config.yRow(row);
     var genomeMeasured = 0;
     var genomeAltered = 0;
 
     _.each(segs, function(seg: any) {
         let chm: any = translateChm(seg[chrCol]);
-        if (chm == null || chm[0]>=chmInfo.genomeRef.length) return;
+        if (chm == null || chm[0] >= chmInfo.genomeRef.length) return;
         var start = seg[startCol];
         var end = seg[endCol];
         var segMean = seg[segCol];
-        genomeMeasured += end-start;
-        if (Math.abs(segMean)<config.cnTh[0]) return;
-        if (end-start<config.cnLengthTh) return; //filter cnv
-        genomeAltered += end-start;
-        var x1: any = chmInfo.loc2xpixil(chm,start,config);
-        var x2: any = chmInfo.loc2xpixil(chm,end,config);
-        var r: any = p.rect(x1,yRow,x2-x1,config.rowHeight);
+        genomeMeasured += end - start;
+        if (Math.abs(segMean) < config.cnTh[0]) return;
+        if (end - start < config.cnLengthTh) return; //filter cnv
+        genomeAltered += end - start;
+        var x1: any = chmInfo.loc2xpixil(chm, start, config);
+        var x2: any = chmInfo.loc2xpixil(chm, end, config);
+        var r: any = p.rect(x1, yRow, x2 - x1, config.rowHeight);
         var cl: any = config.getCnColor(segMean);
-        r.attr("fill",cl);
-        r.attr("stroke", cl);
-        r.attr("stroke-width", 1);
-        r.attr("opacity", 0.5);
+        r.attr('fill', cl);
+        r.attr('stroke', cl);
+        r.attr('stroke-width', 1);
+        r.attr('opacity', 0.5);
         r.translate(0.5, 0.5);
-        var tip = "Mean copy number log2 value: "+segMean+"<br/>from "+loc2string([chm,start],chmInfo)+"<br/>to "+loc2string([chm,end],chmInfo);
-        addToolTip(r.node,tip, '', '');
+        var tip =
+            'Mean copy number log2 value: ' +
+            segMean +
+            '<br/>from ' +
+            loc2string([chm, start], chmInfo) +
+            '<br/>to ' +
+            loc2string([chm, end], chmInfo);
+        addToolTip(r.node, tip, '', '');
     });
 
-    if (caseId!=null) {
+    if (caseId != null) {
         //var label = caseMetaData.label[caseId]; //TODO: needed for patient view
-        var label = "CNA"; //TODO:
+        var label = 'CNA'; //TODO:
         //var c = p.circle(12,yRow+config.rowHeight/2,6).attr({'stroke':caseMetaData.color[caseId], 'fill':caseMetaData.color[caseId]}); //TODO: needed for patient view
         //var c = p.circle(12,yRow+config.rowHeight/2,6).attr({'stroke':'black', 'fill':'black'});
-        var t = p.text(12,yRow+config.rowHeight/2,label).attr({'text-anchor': 'center', 'fill':'black'});
+        var t = p
+            .text(12, yRow + config.rowHeight / 2, label)
+            .attr({ 'text-anchor': 'center', fill: 'black' });
 
-        t.node.setAttribute('id','cnaTrack' + caseId);
+        t.node.setAttribute('id', 'cnaTrack' + caseId);
 
         //addToolTip(c.node, caseMetaData.tooltip[caseId],false,{my:'middle left',at:'middle right', viewport: $(window)}); //TODO: needed for patient view
         //addToolTip(t.node, caseMetaData.tooltip[caseId],false,{my:'middle left',at:'middle right', viewport: $(window)}); //TODO: needed for patient view
         //addToolTip(c.node, "",false,{my:'middle left',at:'middle right', viewport: $(window)});
         //addToolTip(t.node, "",false,{my:'middle left',at:'middle right', viewport: $(window)});
     } else {
-        p.text(0,yRow+config.rowHeight/2,'CNA').attr({'text-anchor': 'start'});
+        p.text(0, yRow + config.rowHeight / 2, 'CNA').attr({
+            'text-anchor': 'start',
+        });
     }
 
-    var label = genomeMeasured===0 ? 'N/A' : (100*genomeAltered/genomeMeasured).toFixed(1)+'%';
-    var tip = genomeMeasured===0 ? 'Copy number segment data not available' :
-        ("Percentage of copy number altered chromosome regions (mean copy number log value >0.2 or <-0.2) out of measured regions.");
+    var label =
+        genomeMeasured === 0
+            ? 'N/A'
+            : ((100 * genomeAltered) / genomeMeasured).toFixed(1) + '%';
+    var tip =
+        genomeMeasured === 0
+            ? 'Copy number segment data not available'
+            : 'Percentage of copy number altered chromosome regions (mean copy number log value >0.2 or <-0.2) out of measured regions.';
 
-    var t = p.text(config.xRightText(),yRow+config.rowHeight/2,label).attr({'text-anchor': 'start','font-weight': 'bold'});
-    underlineText(t,p);
-    addToolTip(t.node, tip,null,{my:'top right',at:'bottom left', viewport: $(window)});
+    var t = p
+        .text(config.xRightText(), yRow + config.rowHeight / 2, label)
+        .attr({ 'text-anchor': 'start', 'font-weight': 'bold' });
+    underlineText(t, p);
+    addToolTip(t.node, tip, null, {
+        my: 'top right',
+        at: 'bottom left',
+        viewport: $(window),
+    });
 
-    var noGenePanelMessage = 'Gene panel information not found. Sample is presumed to be whole exome/genome sequenced.';
+    var noGenePanelMessage =
+        'Gene panel information not found. Sample is presumed to be whole exome/genome sequenced.';
 
     if (genePanelIconData && genePanelIconData.label) {
-        const icon = p.rect(config.xGenePanelIcon(), yRow+1, config.wideGenePanelIcon, config.heigthGenePanelIcon, 4);
-        icon.attr("fill", genePanelIconData.color || '#FFFFFF');
-        icon.attr("fill-opacity", 0.2);
-        icon.attr("stroke-width", 0);
-        var t = p.text(config.xGenePanelIconText(), yRow+config.heigthGenePanelIcon/2+1, genePanelIconData.label)
-        .attr({'text-anchor': 'center', 'fill':'black'});
-        t.node.setAttribute("data-test", "cna-track-genepanel-icon-"+row);
-        var message = genePanelIconData.genePanelId? "Gene panel: " + genePanelIconData.genePanelId : noGenePanelMessage;
+        const icon = p.rect(
+            config.xGenePanelIcon(),
+            yRow + 1,
+            config.wideGenePanelIcon,
+            config.heigthGenePanelIcon,
+            4
+        );
+        icon.attr('fill', genePanelIconData.color || '#FFFFFF');
+        icon.attr('fill-opacity', 0.2);
+        icon.attr('stroke-width', 0);
+        var t = p
+            .text(
+                config.xGenePanelIconText(),
+                yRow + config.heigthGenePanelIcon / 2 + 1,
+                genePanelIconData.label
+            )
+            .attr({ 'text-anchor': 'center', fill: 'black' });
+        t.node.setAttribute('data-test', 'cna-track-genepanel-icon-' + row);
+        var message = genePanelIconData.genePanelId
+            ? 'Gene panel: ' + genePanelIconData.genePanelId
+            : noGenePanelMessage;
         addToolTip(
             t.node,
             message,
             null,
-            {my:'top right',at:'bottom left'},
+            { my: 'top right', at: 'bottom left' },
             genePanelIconData.genePanelId,
             $('.tooltip-content').find('span'),
             setGenePanelInTooltip
         );
     }
-    
 }
 
-export function plotMuts(p: any, config: any,chmInfo: any,row: any, mutations: Array<Mutation>, caseId: any, genePanelIconData: IIconData, setGenePanelInTooltip:(genePanelId:string)=>void) {
+export function plotMuts(
+    p: any,
+    config: any,
+    chmInfo: any,
+    row: any,
+    mutations: Array<Mutation>,
+    caseId: any,
+    genePanelIconData: IIconData,
+    setGenePanelInTooltip: (genePanelId: string) => void
+) {
     var numMut = 0;
-    var mutObjs = _.filter(mutations, function(_mutObj: Mutation){ return _mutObj.sampleId === caseId; } );
-    
+    var mutObjs = _.filter(mutations, function(_mutObj: Mutation) {
+        return _mutObj.sampleId === caseId;
+    });
+
     let pixelMap: Array<Array<string>> = [];
     for (var i = 0; i < mutObjs.length; i++) {
         var mutObj: Mutation = mutObjs[i];
         if (typeof mutObj.chr !== 'undefined') {
             var chm = translateChm(mutObj.chr);
             if (chm != null && chm <= chmInfo.genomeRef.length) {
-                var x = Math.round(chmInfo.loc2xpixil(chm, (mutObj.startPosition + mutObj.endPosition)/2, config));
-                var xBin = x - x%config.pixelsPerBinMut;
+                var x = Math.round(
+                    chmInfo.loc2xpixil(
+                        chm,
+                        (mutObj.startPosition + mutObj.endPosition) / 2,
+                        config
+                    )
+                );
+                var xBin = x - (x % config.pixelsPerBinMut);
                 if (pixelMap[xBin] == null) pixelMap[xBin] = [];
-                pixelMap[xBin].push(mutObj.gene.hugoGeneSymbol + ": " + mutObj.proteinChange);
+                pixelMap[xBin].push(
+                    mutObj.gene.hugoGeneSymbol + ': ' + mutObj.proteinChange
+                );
                 numMut++;
             }
         }
     }
     var maxCount = 5; // set max height to 5 mutations
-    
-    var yRow = config.yRow(row)+config.rowHeight;
+
+    var yRow = config.yRow(row) + config.rowHeight;
     $.each(pixelMap, function(i: number, arr: Array<any>) {
         var pixil = i;
         if (arr) {
-            var h = arr.length>maxCount ? config.rowHeight : (config.rowHeight*arr.length/maxCount);
-            var r = p.rect(pixil,yRow-h,config.pixelsPerBinMut,h);
-            r.attr("fill","#0f0");
-            r.attr("stroke", "#0f0");
-            r.attr("stroke-width", 1);
-            r.attr("opacity", 0.5);
+            var h =
+                arr.length > maxCount
+                    ? config.rowHeight
+                    : (config.rowHeight * arr.length) / maxCount;
+            var r = p.rect(pixil, yRow - h, config.pixelsPerBinMut, h);
+            r.attr('fill', '#0f0');
+            r.attr('stroke', '#0f0');
+            r.attr('stroke-width', 1);
+            r.attr('opacity', 0.5);
             r.translate(0.5, 0.5);
-            addToolTip(r.node, arr.join("</br>"), 100, '');
+            addToolTip(r.node, arr.join('</br>'), 100, '');
         }
     });
-    
-    if (caseId!==null) {
+
+    if (caseId !== null) {
         //var label = caseMetaData.label[caseId]; //TODO: needed for patient view
-        var label = "MUT";
+        var label = 'MUT';
         //var c = p.circle(12,yRow-config.rowHeight/2,6).attr({'stroke':caseMetaData.color[caseId], 'fill':caseMetaData.color[caseId]}); //TODO: needed for patient view
-        var t = p.text(12,yRow-config.rowHeight/2,label).attr({'text-anchor': 'center', 'fill':'black'});
-        t.node.setAttribute('id','mutTrack' + caseId);
+        var t = p
+            .text(12, yRow - config.rowHeight / 2, label)
+            .attr({ 'text-anchor': 'center', fill: 'black' });
+        t.node.setAttribute('id', 'mutTrack' + caseId);
         //addToolTip(c.node, caseMetaData.tooltip[caseId],false,{my:'middle left',at:'middle right'}); //TODO: needed for patient view
         //addToolTip(t.node, caseMetaData.tooltip[caseId],false,{my:'middle left',at:'middle right'}); //TODO: needed for patient view
     } else {
-        p.text(0,yRow-config.rowHeight/2,'MUT').attr({'text-anchor': 'start'});
+        p.text(0, yRow - config.rowHeight / 2, 'MUT').attr({
+            'text-anchor': 'start',
+        });
     }
-    var t = p.text(config.xRightText(),yRow-config.rowHeight/2,mutations.length).attr({'text-anchor': 'start','font-weight': 'bold'});
-    underlineText(t,p);
-    var tip = "Number of mutation events.";
-    addToolTip(t.node,tip,null,{my:'top right',at:'bottom left'});
-    
+    var t = p
+        .text(
+            config.xRightText(),
+            yRow - config.rowHeight / 2,
+            mutations.length
+        )
+        .attr({ 'text-anchor': 'start', 'font-weight': 'bold' });
+    underlineText(t, p);
+    var tip = 'Number of mutation events.';
+    addToolTip(t.node, tip, null, { my: 'top right', at: 'bottom left' });
+
     if (genePanelIconData && genePanelIconData.label) {
-        const icon = p.rect(config.xGenePanelIcon(), yRow-config.heigthGenePanelIcon-1, config.wideGenePanelIcon, config.heigthGenePanelIcon, 4);
-        icon.attr("fill", genePanelIconData.color || '#FFFFFF');
-        icon.attr("fill-opacity", 0.2);
-        icon.attr("stroke-width", 0);
-        var t = p.text(config.xGenePanelIconText(), yRow-config.heigthGenePanelIcon/2-1, genePanelIconData.label)
-        .attr({'text-anchor': 'center', 'fill':'black'});
-        t.node.setAttribute("data-test", "mut-track-genepanel-icon-"+row);
+        const icon = p.rect(
+            config.xGenePanelIcon(),
+            yRow - config.heigthGenePanelIcon - 1,
+            config.wideGenePanelIcon,
+            config.heigthGenePanelIcon,
+            4
+        );
+        icon.attr('fill', genePanelIconData.color || '#FFFFFF');
+        icon.attr('fill-opacity', 0.2);
+        icon.attr('stroke-width', 0);
+        var t = p
+            .text(
+                config.xGenePanelIconText(),
+                yRow - config.heigthGenePanelIcon / 2 - 1,
+                genePanelIconData.label
+            )
+            .attr({ 'text-anchor': 'center', fill: 'black' });
+        t.node.setAttribute('data-test', 'mut-track-genepanel-icon-' + row);
         addToolTip(
             t.node,
             '',
             null,
-            {my:'top right',at:'bottom left'},
+            { my: 'top right', at: 'bottom left' },
             genePanelIconData.genePanelId,
             $('.tooltip-content').find('span'),
             setGenePanelInTooltip
         );
     }
-    
 }
 
-function addToolTip(node: any, tip: any,showDelay: any, position: any, genePanel?:string, tooltipContentEl?:any, setGenePanelInTooltip?:(genePanelId:string)=>void) {
+function addToolTip(
+    node: any,
+    tip: any,
+    showDelay: any,
+    position: any,
+    genePanel?: string,
+    tooltipContentEl?: any,
+    setGenePanelInTooltip?: (genePanelId: string) => void
+) {
     var param = {
         content: {
             text: () => {
-                return tooltipContentEl || tip
-            }
+                return tooltipContentEl || tip;
+            },
         },
-        show: {event: "mouseover"},
-        hide: {fixed: true, delay: 100, event:"mouseout"},
+        show: { event: 'mouseover' },
+        hide: { fixed: true, delay: 100, event: 'mouseout' },
         style: { classes: 'qtip-light qtip-rounded' },
         position: {
-            my: "bottom right",
-            at: "top left",
-            viewport: $("body")
+            my: 'bottom right',
+            at: 'top left',
+            viewport: $('body'),
         },
         events: {
             show: () => {
@@ -358,8 +515,8 @@ function addToolTip(node: any, tip: any,showDelay: any, position: any, genePanel
                 if (setGenePanelInTooltip) {
                     setGenePanelInTooltip('');
                 }
-            }
-        }
+            },
+        },
     };
     // if (showDelay)
     //     param['show'] = { delay: showDelay };
@@ -367,18 +524,26 @@ function addToolTip(node: any, tip: any,showDelay: any, position: any, genePanel
     //     param['position'] = position;
 
     ($(node) as any).qtip(param);
-
 }
 
 function underlineText(textElement: any, p: any) {
     var textBBox = textElement.getBBox();
-    return p.path("M"+textBBox.x+" "+(textBBox.y+textBBox.height)+"L"+(textBBox.x+textBBox.width)+" "+(textBBox.y+textBBox.height));
+    return p.path(
+        'M' +
+            textBBox.x +
+            ' ' +
+            (textBBox.y + textBBox.height) +
+            'L' +
+            (textBBox.x + textBBox.width) +
+            ' ' +
+            (textBBox.y + textBBox.height)
+    );
 }
 
 function translateChm(chm: any) {
-    if (chm.toLowerCase().indexOf("chr")===0) chm=chm.substring(3);
-    if (chm==='X'||chm==='x') chm = 23;
-    if (chm==='Y'||chm==='y') chm = 24;
+    if (chm.toLowerCase().indexOf('chr') === 0) chm = chm.substring(3);
+    if (chm === 'X' || chm === 'x') chm = 23;
+    if (chm === 'Y' || chm === 'y') chm = 24;
     if (isNaN(chm) || chm < 1 || chm > 24) return null;
     return parseInt(chm);
 }
diff --git a/src/pages/patientView/mutation/GeneFilterMenu.spec.tsx b/src/pages/patientView/mutation/GeneFilterMenu.spec.tsx
index 8c28c3958bc..fed11e0d7e8 100644
--- a/src/pages/patientView/mutation/GeneFilterMenu.spec.tsx
+++ b/src/pages/patientView/mutation/GeneFilterMenu.spec.tsx
@@ -1,30 +1,34 @@
 import React from 'react';
-import { shallow } from "enzyme";
+import { shallow } from 'enzyme';
 import { assert } from 'chai';
 import GeneFilterMenu, { GeneFilterOption } from './GeneFilterMenu';
 import sinon from 'sinon';
 import { debug } from 'util';
 
-describe("GeneFilterOptions", ()=>{
-
+describe('GeneFilterOptions', () => {
     const callback = sinon.spy();
-    const wrapper = shallow(<GeneFilterMenu 
-        currentSelection={GeneFilterOption.ALL_SAMPLES}
-        onOptionChanged={callback}
-    />); 
-    const allGenesRadioButton = wrapper.find('[value="'+GeneFilterOption.ALL_SAMPLES+'"]');
-    const anyGenesRadioButton = wrapper.find('[value="'+GeneFilterOption.ANY_SAMPLE+'"]');
-    
+    const wrapper = shallow(
+        <GeneFilterMenu
+            currentSelection={GeneFilterOption.ALL_SAMPLES}
+            onOptionChanged={callback}
+        />
+    );
+    const allGenesRadioButton = wrapper.find(
+        '[value="' + GeneFilterOption.ALL_SAMPLES + '"]'
+    );
+    const anyGenesRadioButton = wrapper.find(
+        '[value="' + GeneFilterOption.ANY_SAMPLE + '"]'
+    );
+
     it('Selects correct option on init', () => {
         const propertiesAll = allGenesRadioButton.props() as any;
         const propertiesAny = anyGenesRadioButton.props() as any;
         assert.isTrue(propertiesAll.checked);
         assert.isFalse(propertiesAny.checked);
     });
-    
+
     it('Notifies parent of option change', () => {
-        anyGenesRadioButton.simulate('change', {target: {checked: true}});
+        anyGenesRadioButton.simulate('change', { target: { checked: true } });
         assert(callback.called);
     });
-
-});
\ No newline at end of file
+});
diff --git a/src/pages/patientView/mutation/GeneFilterMenu.tsx b/src/pages/patientView/mutation/GeneFilterMenu.tsx
index da292e02801..68830da5acb 100644
--- a/src/pages/patientView/mutation/GeneFilterMenu.tsx
+++ b/src/pages/patientView/mutation/GeneFilterMenu.tsx
@@ -1,24 +1,27 @@
-import React, { Component } from 'react'
+import React, { Component } from 'react';
 import { Radio } from 'react-bootstrap';
 import { observer } from 'mobx-react';
 
 export interface IGeneFilterSelection {
-    currentSelection:GeneFilterOption;
-    onOptionChanged?:(currentSelection:GeneFilterOption)=>void;
+    currentSelection: GeneFilterOption;
+    onOptionChanged?: (currentSelection: GeneFilterOption) => void;
 }
 
 export enum GeneFilterOption {
-    ANY_SAMPLE = "anySample",
-    ALL_SAMPLES = "allSamples"
+    ANY_SAMPLE = 'anySample',
+    ALL_SAMPLES = 'allSamples',
 }
 
-@observer export default class GeneFilterMenu extends React.Component<IGeneFilterSelection , {}> {
-
-    constructor(props:IGeneFilterSelection) {
+@observer
+export default class GeneFilterMenu extends React.Component<
+    IGeneFilterSelection,
+    {}
+> {
+    constructor(props: IGeneFilterSelection) {
         super(props);
     }
 
-    private handleOptionChange(e:React.FormEvent<Radio>) {
+    private handleOptionChange(e: React.FormEvent<Radio>) {
         if (this.props.onOptionChanged) {
             const target = e.target as HTMLInputElement;
             this.props.onOptionChanged(target.value as GeneFilterOption);
@@ -32,20 +35,29 @@ export enum GeneFilterOption {
                 <div>Filter mutations for:</div>
                 <Radio
                     value={GeneFilterOption.ANY_SAMPLE}
-                    checked={this.props.currentSelection === GeneFilterOption.ANY_SAMPLE}
-                    onChange={(e:React.FormEvent<Radio>) => this.handleOptionChange(e)}
+                    checked={
+                        this.props.currentSelection ===
+                        GeneFilterOption.ANY_SAMPLE
+                    }
+                    onChange={(e: React.FormEvent<Radio>) =>
+                        this.handleOptionChange(e)
+                    }
                 >
                     Genes profiled in any sample
                 </Radio>
                 <Radio
                     value={GeneFilterOption.ALL_SAMPLES}
-                    checked={this.props.currentSelection === GeneFilterOption.ALL_SAMPLES}
-                    onChange={(e:React.FormEvent<Radio>) => this.handleOptionChange(e)}
+                    checked={
+                        this.props.currentSelection ===
+                        GeneFilterOption.ALL_SAMPLES
+                    }
+                    onChange={(e: React.FormEvent<Radio>) =>
+                        this.handleOptionChange(e)
+                    }
                 >
                     Genes profiled in all samples
                 </Radio>
             </React.Fragment>
-        )
+        );
     }
-
 }
diff --git a/src/pages/patientView/mutation/HeaderIconMenu.spec.tsx b/src/pages/patientView/mutation/HeaderIconMenu.spec.tsx
index 2cec78268cb..5ec33665ef4 100644
--- a/src/pages/patientView/mutation/HeaderIconMenu.spec.tsx
+++ b/src/pages/patientView/mutation/HeaderIconMenu.spec.tsx
@@ -1,14 +1,11 @@
 import React from 'react';
-import {ReactWrapper, mount, shallow} from "enzyme";
+import { ReactWrapper, mount, shallow } from 'enzyme';
 import { assert } from 'chai';
 import HeaderIconMenu from './HeaderIconMenu';
 
-describe("HeaderIconMenu", ()=>{
-
+describe('HeaderIconMenu', () => {
     const headerName = 'MyName';
-    const wrapper = mount(<HeaderIconMenu 
-        name={headerName}
-    />); 
+    const wrapper = mount(<HeaderIconMenu name={headerName} />);
 
     it('shows the name passed in as prop', () => {
         assert.equal(wrapper.find('span').text(), headerName);
@@ -19,5 +16,4 @@ describe("HeaderIconMenu", ()=>{
         icon.simulate('click');
         assert.isTrue(wrapper.find('.rc-tooltip').exists());
     });
-
 });
diff --git a/src/pages/patientView/mutation/HeaderIconMenu.tsx b/src/pages/patientView/mutation/HeaderIconMenu.tsx
index cdcb5a832dd..66693935b50 100644
--- a/src/pages/patientView/mutation/HeaderIconMenu.tsx
+++ b/src/pages/patientView/mutation/HeaderIconMenu.tsx
@@ -1,42 +1,47 @@
-import React from "react";
-import { DefaultTooltip } from "cbioportal-frontend-commons";
-import Tooltip from "rc-tooltip";
-import { JsxElement } from "typescript";
+import React from 'react';
+import { DefaultTooltip } from 'cbioportal-frontend-commons';
+import Tooltip from 'rc-tooltip';
+import { JsxElement } from 'typescript';
 import './style.scss';
 
 export interface IHeaderIconMenuProps {
-    name:string;
-    showIcon?:boolean;
-    suppressClickBubble?:boolean;
+    name: string;
+    showIcon?: boolean;
+    suppressClickBubble?: boolean;
 }
 
-export default class HeaderIconMenu extends React.Component<IHeaderIconMenuProps, {}> {
-    
+export default class HeaderIconMenu extends React.Component<
+    IHeaderIconMenuProps,
+    {}
+> {
     public static defaultProps = {
         suppressClickBubble: true,
-        showIcon: true
+        showIcon: true,
     };
 
-    constructor(props:IHeaderIconMenuProps) {
+    constructor(props: IHeaderIconMenuProps) {
         super(props);
     }
 
     // when configured suppress the bubbling of the mouse event to the parent
-    iconClicked = (e:React.MouseEvent) => {
+    iconClicked = (e: React.MouseEvent) => {
         if (this.props.suppressClickBubble) e.stopPropagation();
-    }
+    };
 
     render() {
         return (
             <React.Fragment>
-                <span style={{marginRight:"5px"}} >{this.props.name}</span>
+                <span style={{ marginRight: '5px' }}>{this.props.name}</span>
                 {this.props.showIcon && (
-                    <Tooltip trigger={['click']} overlay={this.props.children}  >
-                        <i className="fa fa-filter" onClick={this.iconClicked} data-test="gene-filter-icon" />
+                    <Tooltip trigger={['click']} overlay={this.props.children}>
+                        <i
+                            className="fa fa-filter"
+                            onClick={this.iconClicked}
+                            data-test="gene-filter-icon"
+                        />
                     </Tooltip>
                 )}
             </React.Fragment>
         );
     }
-
 }
diff --git a/src/pages/patientView/mutation/PatientViewMutationTable.spec.tsx b/src/pages/patientView/mutation/PatientViewMutationTable.spec.tsx
index 4e4bebb6f92..b70a919ee57 100644
--- a/src/pages/patientView/mutation/PatientViewMutationTable.spec.tsx
+++ b/src/pages/patientView/mutation/PatientViewMutationTable.spec.tsx
@@ -1,69 +1,103 @@
 import React from 'react';
-import {ReactWrapper, mount, shallow} from "enzyme";
+import { ReactWrapper, mount, shallow } from 'enzyme';
 import { assert } from 'chai';
-import {default as PatientViewMutationTable} from "./PatientViewMutationTable"
-import {MutationTableColumnType} from "shared/components/mutationTable/MutationTable";
+import { default as PatientViewMutationTable } from './PatientViewMutationTable';
+import { MutationTableColumnType } from 'shared/components/mutationTable/MutationTable';
 import { GeneFilterOption } from './GeneFilterMenu';
 
-function hasColumn(tableWrapper:ReactWrapper<any, any>, columnName:string):boolean {
-    const columns:string[] = [];
-    tableWrapper.find('th span').map((span:ReactWrapper<any, any>)=>{columns.push(span.text())});
-    return (columns.indexOf(columnName) > -1);
+function hasColumn(
+    tableWrapper: ReactWrapper<any, any>,
+    columnName: string
+): boolean {
+    const columns: string[] = [];
+    tableWrapper.find('th span').map((span: ReactWrapper<any, any>) => {
+        columns.push(span.text());
+    });
+    return columns.indexOf(columnName) > -1;
 }
 
-function getTable(samples:string[], mrnaId?:string, cnaId?:string):ReactWrapper<any, any> {
-    return mount(<PatientViewMutationTable
-        sampleManager={null}
-        sampleIds={samples}
-        sampleToGenePanelId={{}}
-        genePanelIdToEntrezGeneIds={{}}
-        mrnaExprRankMolecularProfileId={mrnaId}
-        discreteCNAMolecularProfileId={cnaId}
-        currentGeneFilter={GeneFilterOption.ANY_SAMPLE}
-        columns={[MutationTableColumnType.GENE,
-                    MutationTableColumnType.MRNA_EXPR,
-                    MutationTableColumnType.SAMPLES,
-                    MutationTableColumnType.COPY_NUM]}
-        data={[]}
-        />);
+function getTable(
+    samples: string[],
+    mrnaId?: string,
+    cnaId?: string
+): ReactWrapper<any, any> {
+    return mount(
+        <PatientViewMutationTable
+            sampleManager={null}
+            sampleIds={samples}
+            sampleToGenePanelId={{}}
+            genePanelIdToEntrezGeneIds={{}}
+            mrnaExprRankMolecularProfileId={mrnaId}
+            discreteCNAMolecularProfileId={cnaId}
+            currentGeneFilter={GeneFilterOption.ANY_SAMPLE}
+            columns={[
+                MutationTableColumnType.GENE,
+                MutationTableColumnType.MRNA_EXPR,
+                MutationTableColumnType.SAMPLES,
+                MutationTableColumnType.COPY_NUM,
+            ]}
+            data={[]}
+        />
+    );
 }
 
-describe("PatientViewMutationTable", ()=>{
-
-    it("hides mrna expr column if no expression profile is available, or theres more than one sample", ()=>{
-        assert(!hasColumn(getTable(["sampleA"]), "mRNA Expr."), "No expression profile");
+describe('PatientViewMutationTable', () => {
+    it('hides mrna expr column if no expression profile is available, or theres more than one sample', () => {
+        assert(
+            !hasColumn(getTable(['sampleA']), 'mRNA Expr.'),
+            'No expression profile'
+        );
 
-        assert(!hasColumn(getTable(["sampleA", "sampleB"], "mrnaId"), "mRNA Expr."), "More than one sample");
+        assert(
+            !hasColumn(
+                getTable(['sampleA', 'sampleB'], 'mrnaId'),
+                'mRNA Expr.'
+            ),
+            'More than one sample'
+        );
 
-        assert(!hasColumn(getTable(["sampleA", "sampleB"]), "mRNA Expr."),
-            "No expression profile and more than one sample");//
+        assert(
+            !hasColumn(getTable(['sampleA', 'sampleB']), 'mRNA Expr.'),
+            'No expression profile and more than one sample'
+        ); //
     });
 
-    it("shows mrna expr column if theres an expression profile and exactly one sample", ()=>{
-        assert(hasColumn(getTable(["sampleA"], "[\"sampleA\"]"), "mRNA Expr."));
+    it('shows mrna expr column if theres an expression profile and exactly one sample', () => {
+        assert(hasColumn(getTable(['sampleA'], '["sampleA"]'), 'mRNA Expr.'));
     });
 
     it('should have Samples column resizable', () => {
-        const aTable = getTable(["sampleA", "sampleB"]);
+        const aTable = getTable(['sampleA', 'sampleB']);
         const res = aTable.find('.columnResizer');
-        assert.equal(res.length, 2)
+        assert.equal(res.length, 2);
     });
 
-    it("hides copy number column if there's more than one sample", ()=>{
-        assert.isFalse(hasColumn(getTable(["sampleA","sampleB"], undefined, "cnaId"), "Copy #"));
+    it("hides copy number column if there's more than one sample", () => {
+        assert.isFalse(
+            hasColumn(
+                getTable(['sampleA', 'sampleB'], undefined, 'cnaId'),
+                'Copy #'
+            )
+        );
     });
 
-    it("hides the samples column if theres less than two samples", ()=>{
-        assert(!hasColumn(getTable([]), "Samples"), "Hides with no samples (this shouldnt happen though)");
-        assert(!hasColumn(getTable(["sampleA"]), "Samples"), "Hides with one sample");
+    it('hides the samples column if theres less than two samples', () => {
+        assert(
+            !hasColumn(getTable([]), 'Samples'),
+            'Hides with no samples (this shouldnt happen though)'
+        );
+        assert(
+            !hasColumn(getTable(['sampleA']), 'Samples'),
+            'Hides with one sample'
+        );
     });
 
-    it("shows the samples column if theres more than one sample", ()=>{
-        assert(hasColumn(getTable(["sampleA", "sampleB"]), "Samples"));
+    it('shows the samples column if theres more than one sample', () => {
+        assert(hasColumn(getTable(['sampleA', 'sampleB']), 'Samples'));
     });
 
-    it("hides the copy number column if theres no discrete cna profile", ()=>{
-        assert(!hasColumn(getTable(["sampleA"]), "Copy #"));
+    it('hides the copy number column if theres no discrete cna profile', () => {
+        assert(!hasColumn(getTable(['sampleA']), 'Copy #'));
     });
 
     /*it("shows the copy number column if theres a discrete cna profile", ()=>{
diff --git a/src/pages/patientView/mutation/PatientViewMutationTable.tsx b/src/pages/patientView/mutation/PatientViewMutationTable.tsx
index 6c352a765a9..92e38b47ef1 100644
--- a/src/pages/patientView/mutation/PatientViewMutationTable.tsx
+++ b/src/pages/patientView/mutation/PatientViewMutationTable.tsx
@@ -1,45 +1,47 @@
-import * as React from "react";
-import {computed} from "mobx";
-import {observer} from "mobx-react";
+import * as React from 'react';
+import { computed } from 'mobx';
+import { observer } from 'mobx-react';
 import {
-    IMutationTableProps, MutationTableColumnType, default as MutationTable
-} from "shared/components/mutationTable/MutationTable";
-import SampleManager from "../SampleManager";
-import {Mutation} from "shared/api/generated/CBioPortalAPI";
-import AlleleCountColumnFormatter from "shared/components/mutationTable/column/AlleleCountColumnFormatter";
-import AlleleFreqColumnFormatter from "./column/AlleleFreqColumnFormatter";
-import TumorColumnFormatter from "./column/TumorColumnFormatter";
-import PanelColumnFormatter from "shared/components/mutationTable/column/PanelColumnFormatter";
-import {isUncalled} from "shared/lib/MutationUtils";
-import TumorAlleleFreqColumnFormatter from "shared/components/mutationTable/column/TumorAlleleFreqColumnFormatter";
-import ExonColumnFormatter from "shared/components/mutationTable/column/ExonColumnFormatter";
-import HeaderIconMenu from "./HeaderIconMenu";
-import GeneFilterMenu, { GeneFilterOption } from "./GeneFilterMenu";
+    IMutationTableProps,
+    MutationTableColumnType,
+    default as MutationTable,
+} from 'shared/components/mutationTable/MutationTable';
+import SampleManager from '../SampleManager';
+import { Mutation } from 'shared/api/generated/CBioPortalAPI';
+import AlleleCountColumnFormatter from 'shared/components/mutationTable/column/AlleleCountColumnFormatter';
+import AlleleFreqColumnFormatter from './column/AlleleFreqColumnFormatter';
+import TumorColumnFormatter from './column/TumorColumnFormatter';
+import PanelColumnFormatter from 'shared/components/mutationTable/column/PanelColumnFormatter';
+import { isUncalled } from 'shared/lib/MutationUtils';
+import TumorAlleleFreqColumnFormatter from 'shared/components/mutationTable/column/TumorAlleleFreqColumnFormatter';
+import ExonColumnFormatter from 'shared/components/mutationTable/column/ExonColumnFormatter';
+import HeaderIconMenu from './HeaderIconMenu';
+import GeneFilterMenu, { GeneFilterOption } from './GeneFilterMenu';
 
 export interface IPatientViewMutationTableProps extends IMutationTableProps {
-    sampleManager:SampleManager | null;
-    sampleToGenePanelId:{[sampleId: string]: string|undefined};
-    genePanelIdToEntrezGeneIds:{[genePanelId: string]: number[]};
-    sampleIds?:string[];
-    showGeneFilterMenu?:boolean;
-    currentGeneFilter:GeneFilterOption;
-    onFilterGenes?:(option:GeneFilterOption)=>void;
-    onSelectGenePanel?:(name:string)=>void;
-    disableTooltip?:boolean;
+    sampleManager: SampleManager | null;
+    sampleToGenePanelId: { [sampleId: string]: string | undefined };
+    genePanelIdToEntrezGeneIds: { [genePanelId: string]: number[] };
+    sampleIds?: string[];
+    showGeneFilterMenu?: boolean;
+    currentGeneFilter: GeneFilterOption;
+    onFilterGenes?: (option: GeneFilterOption) => void;
+    onSelectGenePanel?: (name: string) => void;
+    disableTooltip?: boolean;
 }
 
 @observer
-export default class PatientViewMutationTable extends MutationTable<IPatientViewMutationTableProps> {
-
-    constructor(props:IPatientViewMutationTableProps) {
+export default class PatientViewMutationTable extends MutationTable<
+    IPatientViewMutationTableProps
+> {
+    constructor(props: IPatientViewMutationTableProps) {
         super(props);
     }
 
-    public static defaultProps =
-    {
+    public static defaultProps = {
         ...MutationTable.defaultProps,
         initialItemsPerPage: 10,
-        paginationProps:{ itemsPerPageOptions:[10,25,50,100] },
+        paginationProps: { itemsPerPageOptions: [10, 25, 50, 100] },
         showGeneFilterMenu: true,
         columns: [
             MutationTableColumnType.COHORT,
@@ -71,15 +73,14 @@ export default class PatientViewMutationTable extends MutationTable<IPatientView
             MutationTableColumnType.GNOMAD,
             MutationTableColumnType.CLINVAR,
             MutationTableColumnType.DBSNP,
-            MutationTableColumnType.GENE_PANEL
-        ]
+            MutationTableColumnType.GENE_PANEL,
+        ],
     };
 
-    protected getSamples():string[] {
+    protected getSamples(): string[] {
         if (this.props.sampleIds) {
             return this.props.sampleIds;
-        }
-        else {
+        } else {
             return [];
         }
     }
@@ -88,69 +89,134 @@ export default class PatientViewMutationTable extends MutationTable<IPatientView
         super.generateColumns();
 
         this._columns[MutationTableColumnType.TUMOR_ALLELE_FREQ] = {
-            name: "Allele Freq",
-            render: (d:Mutation[])=>AlleleFreqColumnFormatter.renderFunction(d, this.props.sampleManager),
-            sortBy:(d:Mutation[])=>AlleleFreqColumnFormatter.getSortValue(d, this.props.sampleManager),
-            download: (d:Mutation[])=>AlleleFreqColumnFormatter.getFrequency(d),
-            tooltip:(<span>Variant allele frequency in the tumor sample</span>),
-            visible: AlleleFreqColumnFormatter.isVisible(this.props.sampleManager,
-                this.props.dataStore ? this.props.dataStore.allData : this.props.data)
+            name: 'Allele Freq',
+            render: (d: Mutation[]) =>
+                AlleleFreqColumnFormatter.renderFunction(
+                    d,
+                    this.props.sampleManager
+                ),
+            sortBy: (d: Mutation[]) =>
+                AlleleFreqColumnFormatter.getSortValue(
+                    d,
+                    this.props.sampleManager
+                ),
+            download: (d: Mutation[]) =>
+                AlleleFreqColumnFormatter.getFrequency(d),
+            tooltip: <span>Variant allele frequency in the tumor sample</span>,
+            visible: AlleleFreqColumnFormatter.isVisible(
+                this.props.sampleManager,
+                this.props.dataStore
+                    ? this.props.dataStore.allData
+                    : this.props.data
+            ),
         };
 
         this._columns[MutationTableColumnType.SAMPLES] = {
-            name: "Samples",
-            render:(d:Mutation[])=>TumorColumnFormatter.renderFunction(d, this.props.sampleManager, this.props.sampleToGenePanelId, this.props.genePanelIdToEntrezGeneIds, this.props.onSelectGenePanel, this.props.disableTooltip),
-            sortBy:(d:Mutation[])=>TumorColumnFormatter.getSortValue(d, this.props.sampleManager),
-            download: (d:Mutation[])=>TumorColumnFormatter.getSample(d),
+            name: 'Samples',
+            render: (d: Mutation[]) =>
+                TumorColumnFormatter.renderFunction(
+                    d,
+                    this.props.sampleManager,
+                    this.props.sampleToGenePanelId,
+                    this.props.genePanelIdToEntrezGeneIds,
+                    this.props.onSelectGenePanel,
+                    this.props.disableTooltip
+                ),
+            sortBy: (d: Mutation[]) =>
+                TumorColumnFormatter.getSortValue(d, this.props.sampleManager),
+            download: (d: Mutation[]) => TumorColumnFormatter.getSample(d),
             resizable: true,
         };
-        
-        const GenePanelProps = (d:Mutation[]) => ({
+
+        const GenePanelProps = (d: Mutation[]) => ({
             data: d,
             sampleToGenePanelId: this.props.sampleToGenePanelId,
             sampleManager: this.props.sampleManager,
             genePanelIdToGene: this.props.genePanelIdToEntrezGeneIds,
-            onSelectGenePanel: this.props.onSelectGenePanel
+            onSelectGenePanel: this.props.onSelectGenePanel,
         });
-        
+
         this._columns[MutationTableColumnType.GENE_PANEL] = {
-            name: "Gene panel",
-            render: (d:Mutation[]) => PanelColumnFormatter.renderFunction(GenePanelProps(d)),
-            download: (d:Mutation[]) => PanelColumnFormatter.download(GenePanelProps(d)),
+            name: 'Gene panel',
+            render: (d: Mutation[]) =>
+                PanelColumnFormatter.renderFunction(GenePanelProps(d)),
+            download: (d: Mutation[]) =>
+                PanelColumnFormatter.download(GenePanelProps(d)),
             visible: false,
-            sortBy: (d:Mutation[]) => PanelColumnFormatter.getGenePanelIds(GenePanelProps(d))
-        }
+            sortBy: (d: Mutation[]) =>
+                PanelColumnFormatter.getGenePanelIds(GenePanelProps(d)),
+        };
 
         // customization for allele count columns
 
-        this._columns[MutationTableColumnType.REF_READS_N].render =
-            (d:Mutation[])=>AlleleCountColumnFormatter.renderFunction(d, this.getSamples(), "normalRefCount");
-        this._columns[MutationTableColumnType.REF_READS_N].download =
-            (d:Mutation[])=>AlleleCountColumnFormatter.getReads(d, "normalRefCount");
+        this._columns[MutationTableColumnType.REF_READS_N].render = (
+            d: Mutation[]
+        ) =>
+            AlleleCountColumnFormatter.renderFunction(
+                d,
+                this.getSamples(),
+                'normalRefCount'
+            );
+        this._columns[MutationTableColumnType.REF_READS_N].download = (
+            d: Mutation[]
+        ) => AlleleCountColumnFormatter.getReads(d, 'normalRefCount');
 
-        this._columns[MutationTableColumnType.VAR_READS_N].render =
-            (d:Mutation[])=>AlleleCountColumnFormatter.renderFunction(d, this.getSamples(), "normalAltCount");
-        this._columns[MutationTableColumnType.VAR_READS_N].download =
-            (d:Mutation[])=>AlleleCountColumnFormatter.getReads(d, "normalAltCount");
+        this._columns[MutationTableColumnType.VAR_READS_N].render = (
+            d: Mutation[]
+        ) =>
+            AlleleCountColumnFormatter.renderFunction(
+                d,
+                this.getSamples(),
+                'normalAltCount'
+            );
+        this._columns[MutationTableColumnType.VAR_READS_N].download = (
+            d: Mutation[]
+        ) => AlleleCountColumnFormatter.getReads(d, 'normalAltCount');
 
-        this._columns[MutationTableColumnType.REF_READS].render =
-            (d:Mutation[])=>AlleleCountColumnFormatter.renderFunction(d, this.getSamples(), "tumorRefCount");
-        this._columns[MutationTableColumnType.REF_READS].download =
-            (d:Mutation[])=>AlleleCountColumnFormatter.getReads(d, "tumorRefCount");
+        this._columns[MutationTableColumnType.REF_READS].render = (
+            d: Mutation[]
+        ) =>
+            AlleleCountColumnFormatter.renderFunction(
+                d,
+                this.getSamples(),
+                'tumorRefCount'
+            );
+        this._columns[MutationTableColumnType.REF_READS].download = (
+            d: Mutation[]
+        ) => AlleleCountColumnFormatter.getReads(d, 'tumorRefCount');
 
-        this._columns[MutationTableColumnType.VAR_READS].render =
-            (d:Mutation[])=>AlleleCountColumnFormatter.renderFunction(d, this.getSamples(), "tumorAltCount");
-        this._columns[MutationTableColumnType.VAR_READS].download =
-            (d:Mutation[])=>AlleleCountColumnFormatter.getReads(d, "tumorAltCount");
+        this._columns[MutationTableColumnType.VAR_READS].render = (
+            d: Mutation[]
+        ) =>
+            AlleleCountColumnFormatter.renderFunction(
+                d,
+                this.getSamples(),
+                'tumorAltCount'
+            );
+        this._columns[MutationTableColumnType.VAR_READS].download = (
+            d: Mutation[]
+        ) => AlleleCountColumnFormatter.getReads(d, 'tumorAltCount');
 
         // customization for columns
         this._columns[MutationTableColumnType.EXON].sortBy = undefined;
-        this._columns[MutationTableColumnType.EXON].render =
-            (d:Mutation[]) => (ExonColumnFormatter.renderFunction(d, this.props.genomeNexusCache, true));
-        this._columns[MutationTableColumnType.GENE].headerRender = (name:string) => {
+        this._columns[MutationTableColumnType.EXON].render = (d: Mutation[]) =>
+            ExonColumnFormatter.renderFunction(
+                d,
+                this.props.genomeNexusCache,
+                true
+            );
+        this._columns[MutationTableColumnType.GENE].headerRender = (
+            name: string
+        ) => {
             return (
-                <HeaderIconMenu name={name} showIcon={this.props.showGeneFilterMenu} >
-                    <GeneFilterMenu onOptionChanged={this.props.onFilterGenes} currentSelection={this.props.currentGeneFilter} />
+                <HeaderIconMenu
+                    name={name}
+                    showIcon={this.props.showGeneFilterMenu}
+                >
+                    <GeneFilterMenu
+                        onOptionChanged={this.props.onFilterGenes}
+                        currentSelection={this.props.currentGeneFilter}
+                    />
                 </HeaderIconMenu>
             );
         };
@@ -188,29 +254,35 @@ export default class PatientViewMutationTable extends MutationTable<IPatientView
         this._columns[MutationTableColumnType.DBSNP].order = 189;
 
         // exclusions
-        this._columns[MutationTableColumnType.MRNA_EXPR].shouldExclude = ()=>{
-            return (!this.props.mrnaExprRankMolecularProfileId) || (this.getSamples().length > 1);
+        this._columns[MutationTableColumnType.MRNA_EXPR].shouldExclude = () => {
+            return (
+                !this.props.mrnaExprRankMolecularProfileId ||
+                this.getSamples().length > 1
+            );
         };
         // only hide tumor column if there is one sample and no uncalled
         // mutations (there is no information added in that case by the sample
         // label)
-        this._columns[MutationTableColumnType.SAMPLES].shouldExclude = ()=>{
+        this._columns[MutationTableColumnType.SAMPLES].shouldExclude = () => {
             return this.getSamples().length < 2 && !this.hasUncalledMutations;
         };
-        this._columns[MutationTableColumnType.COPY_NUM].shouldExclude = ()=>{
-            return (!this.props.discreteCNAMolecularProfileId) || (this.getSamples().length > 1);
+        this._columns[MutationTableColumnType.COPY_NUM].shouldExclude = () => {
+            return (
+                !this.props.discreteCNAMolecularProfileId ||
+                this.getSamples().length > 1
+            );
         };
     }
 
-    @computed private get hasUncalledMutations():boolean {
-        let data:Mutation[][] = [];
+    @computed private get hasUncalledMutations(): boolean {
+        let data: Mutation[][] = [];
         if (this.props.data) {
             data = this.props.data;
         } else if (this.props.dataStore) {
             data = this.props.dataStore.allData;
         }
-        return data.some((row:Mutation[]) => {
-            return row.some((m:Mutation) => {
+        return data.some((row: Mutation[]) => {
+            return row.some((m: Mutation) => {
                 return isUncalled(m.molecularProfileId);
             });
         });
diff --git a/src/pages/patientView/mutation/PatientViewMutationsDataStore.ts b/src/pages/patientView/mutation/PatientViewMutationsDataStore.ts
index 00bc5c00516..3b547b29ac7 100644
--- a/src/pages/patientView/mutation/PatientViewMutationsDataStore.ts
+++ b/src/pages/patientView/mutation/PatientViewMutationsDataStore.ts
@@ -1,19 +1,23 @@
-import {SimpleGetterLazyMobXTableApplicationDataStore} from "../../../shared/lib/ILazyMobXTableApplicationDataStore";
-import {Mutation} from "../../../shared/api/generated/CBioPortalAPI";
-import {action, computed, observable} from "mobx";
-import _ from "lodash";
-
-function mutationMatch(d:Mutation[], id:Mutation) {
-    return d[0].proteinChange === id.proteinChange &&
-        d[0].gene.hugoGeneSymbol === id.gene.hugoGeneSymbol;
+import { SimpleGetterLazyMobXTableApplicationDataStore } from '../../../shared/lib/ILazyMobXTableApplicationDataStore';
+import { Mutation } from '../../../shared/api/generated/CBioPortalAPI';
+import { action, computed, observable } from 'mobx';
+import _ from 'lodash';
+
+function mutationMatch(d: Mutation[], id: Mutation) {
+    return (
+        d[0].proteinChange === id.proteinChange &&
+        d[0].gene.hugoGeneSymbol === id.gene.hugoGeneSymbol
+    );
 }
 
-function mutationIdKey(m:Mutation) {
+function mutationIdKey(m: Mutation) {
     return `{ "proteinChange": "${m.proteinChange}", "hugoGeneSymbol": "${m.gene.hugoGeneSymbol}" }`;
 }
 
-export default class PatientViewMutationsDataStore extends SimpleGetterLazyMobXTableApplicationDataStore<Mutation[]> {
-    @observable.ref private mouseOverMutation:Readonly<Mutation>|null = null;
+export default class PatientViewMutationsDataStore extends SimpleGetterLazyMobXTableApplicationDataStore<
+    Mutation[]
+> {
+    @observable.ref private mouseOverMutation: Readonly<Mutation> | null = null;
     private selectedMutationsMap = observable.map<Mutation>();
     @observable private _onlyShowSelectedInTable = false;
     @observable private _onlyShowSelectedInVAFChart = false;
@@ -31,22 +35,22 @@ export default class PatientViewMutationsDataStore extends SimpleGetterLazyMobXT
     }
 
     @action
-    public setMouseOverMutation(m:Readonly<Mutation>|null) {
+    public setMouseOverMutation(m: Readonly<Mutation> | null) {
         this.mouseOverMutation = m;
     }
 
     @action
-    public setOnlyShowSelectedInTable(o:boolean) {
+    public setOnlyShowSelectedInTable(o: boolean) {
         this._onlyShowSelectedInTable = o;
     }
 
     @action
-    public setOnlyShowSelectedInVAFChart(o:boolean) {
+    public setOnlyShowSelectedInVAFChart(o: boolean) {
         this._onlyShowSelectedInVAFChart = o;
     }
 
     @action
-    public toggleSelectedMutation(m:Readonly<Mutation>) {
+    public toggleSelectedMutation(m: Readonly<Mutation>) {
         const key = mutationIdKey(m);
         if (this.selectedMutationsMap.has(key)) {
             this.selectedMutationsMap.delete(key);
@@ -56,7 +60,7 @@ export default class PatientViewMutationsDataStore extends SimpleGetterLazyMobXT
     }
 
     @action
-    public setSelectedMutations(muts:Readonly<Mutation[]>) {
+    public setSelectedMutations(muts: Readonly<Mutation[]>) {
         this.selectedMutationsMap.clear();
         let count = 0;
         for (const m of muts) {
@@ -65,31 +69,39 @@ export default class PatientViewMutationsDataStore extends SimpleGetterLazyMobXT
         }
     }
 
-    @computed public get selectedMutations():Readonly<Mutation[]> {
-        return this.selectedMutationsMap.entries().map(x=>x[1]);
+    @computed public get selectedMutations(): Readonly<Mutation[]> {
+        return this.selectedMutationsMap.entries().map(x => x[1]);
     }
 
-    public isMutationSelected(m:Mutation) {
+    public isMutationSelected(m: Mutation) {
         return this.selectedMutationsMap.has(mutationIdKey(m));
     }
 
     @computed get sortedFilteredData() {
         const filterStringUpper = this.filterString.toUpperCase();
         const filterStringLower = this.filterString.toLowerCase();
-        return this.sortedData.filter((d:Mutation[])=>{
-            const stringFilter = this.dataFilter(d, this.filterString, filterStringUpper, filterStringLower);
+        return this.sortedData.filter((d: Mutation[]) => {
+            const stringFilter = this.dataFilter(
+                d,
+                this.filterString,
+                filterStringUpper,
+                filterStringLower
+            );
 
             // filter out non-selected mutations
-            const selectedFilter = !this._onlyShowSelectedInTable || this.selectedMutations.length === 0 || _.some(this.selectedMutations, m=>mutationMatch(d, m));
+            const selectedFilter =
+                !this._onlyShowSelectedInTable ||
+                this.selectedMutations.length === 0 ||
+                _.some(this.selectedMutations, m => mutationMatch(d, m));
 
             return stringFilter && selectedFilter;
         });
     }
 
-    constructor(getData:()=>Mutation[][]) {
+    constructor(getData: () => Mutation[][]) {
         super(getData);
 
-        this.dataHighlighter = (mergedMutation:Mutation[])=>{
+        this.dataHighlighter = (mergedMutation: Mutation[]) => {
             const highlightedMutations = [];
             if (!this.onlyShowSelectedInTable) {
                 // dont put highlight on selected mutations if those are all we're showing
@@ -98,7 +110,9 @@ export default class PatientViewMutationsDataStore extends SimpleGetterLazyMobXT
             if (this.mouseOverMutation) {
                 highlightedMutations.push(this.mouseOverMutation);
             }
-            return _.some(highlightedMutations, mutation=>mutationMatch(mergedMutation, mutation));
-        }
+            return _.some(highlightedMutations, mutation =>
+                mutationMatch(mergedMutation, mutation)
+            );
+        };
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/patientView/mutation/PatientViewMutationsTab.tsx b/src/pages/patientView/mutation/PatientViewMutationsTab.tsx
index 7d341270290..053c0a23ab2 100644
--- a/src/pages/patientView/mutation/PatientViewMutationsTab.tsx
+++ b/src/pages/patientView/mutation/PatientViewMutationsTab.tsx
@@ -1,88 +1,98 @@
-import * as React from "react";
-import {observer} from "mobx-react";
-import {MakeMobxView} from "../../../shared/components/MobxView";
-import LoadingIndicator from "../../../shared/components/loadingIndicator/LoadingIndicator";
-import {ServerConfigHelpers} from "../../../config/config";
-import AppConfig from "appConfig";
-import {MSKTab, MSKTabs} from "../../../shared/components/MSKTabs/MSKTabs";
-import {PatientViewPageStore} from "../clinicalInformation/PatientViewPageStore";
-import SampleManager from "../SampleManager";
-import {IColumnVisibilityDef} from "../../../shared/components/columnVisibilityControls/ColumnVisibilityControls";
-import VAFLineChart, {SHOW_ONLY_SELECTED_LABEL} from "./VAFLineChart";
-import {action, computed, observable} from "mobx";
-import autobind from "autobind-decorator";
-import PatientViewMutationsDataStore from "./PatientViewMutationsDataStore";
-import {Mutation} from "../../../shared/api/generated/CBioPortalAPI";
-import ReactSelect from "react-select";
-import MutationOncoprint from "./oncoprint/MutationOncoprint";
-import {DownloadControls} from "cbioportal-frontend-commons";
-import LabeledCheckbox from "../../../shared/components/labeledCheckbox/LabeledCheckbox";
-import PatientViewMutationTable from "./PatientViewMutationTable";
-import {GeneFilterOption} from "./GeneFilterMenu";
-import {isFusion} from "../../../shared/lib/MutationUtils";
+import * as React from 'react';
+import { observer } from 'mobx-react';
+import { MakeMobxView } from '../../../shared/components/MobxView';
+import LoadingIndicator from '../../../shared/components/loadingIndicator/LoadingIndicator';
+import { ServerConfigHelpers } from '../../../config/config';
+import AppConfig from 'appConfig';
+import { MSKTab, MSKTabs } from '../../../shared/components/MSKTabs/MSKTabs';
+import { PatientViewPageStore } from '../clinicalInformation/PatientViewPageStore';
+import SampleManager from '../SampleManager';
+import { IColumnVisibilityDef } from '../../../shared/components/columnVisibilityControls/ColumnVisibilityControls';
+import VAFLineChart, { SHOW_ONLY_SELECTED_LABEL } from './VAFLineChart';
+import { action, computed, observable } from 'mobx';
+import autobind from 'autobind-decorator';
+import PatientViewMutationsDataStore from './PatientViewMutationsDataStore';
+import { Mutation } from '../../../shared/api/generated/CBioPortalAPI';
+import ReactSelect from 'react-select';
+import MutationOncoprint from './oncoprint/MutationOncoprint';
+import { DownloadControls } from 'cbioportal-frontend-commons';
+import LabeledCheckbox from '../../../shared/components/labeledCheckbox/LabeledCheckbox';
+import PatientViewMutationTable from './PatientViewMutationTable';
+import { GeneFilterOption } from './GeneFilterMenu';
+import { isFusion } from '../../../shared/lib/MutationUtils';
 
 export interface IPatientViewMutationsTabProps {
-    store:PatientViewPageStore;
-    mutationTableColumnVisibility?:{[columnId: string]: boolean};
-    onMutationTableColumnVisibilityToggled:(columnId: string, columnVisibility?: IColumnVisibilityDef[]) => void;
-    sampleManager:SampleManager|null;
+    store: PatientViewPageStore;
+    mutationTableColumnVisibility?: { [columnId: string]: boolean };
+    onMutationTableColumnVisibilityToggled: (
+        columnId: string,
+        columnVisibility?: IColumnVisibilityDef[]
+    ) => void;
+    sampleManager: SampleManager | null;
 }
 
 const DROPDOWN_STYLES = {
-    control: (provided:any)=>({
+    control: (provided: any) => ({
         ...provided,
-        height:36,
-        minHeight:36,
-        border: "1px solid rgb(204,204,204)"
+        height: 36,
+        minHeight: 36,
+        border: '1px solid rgb(204,204,204)',
     }),
-    menu: (provided:any)=>({
+    menu: (provided: any) => ({
         ...provided,
-        maxHeight: 400
+        maxHeight: 400,
     }),
-    menuList: (provided:any)=>({
+    menuList: (provided: any) => ({
         ...provided,
-        maxHeight:400
+        maxHeight: 400,
     }),
-    placeholder:(provided:any)=>({
+    placeholder: (provided: any) => ({
         ...provided,
-        color: "#000000"
+        color: '#000000',
     }),
-    dropdownIndicator:(provided:any)=>({
+    dropdownIndicator: (provided: any) => ({
         ...provided,
-        color:"#000000"
+        color: '#000000',
     }),
-    option:(provided:any, state:any)=>{
+    option: (provided: any, state: any) => {
         return {
             ...provided,
-            cursor:"pointer",
+            cursor: 'pointer',
         };
-    }
+    },
 };
 
-const DROPDOWN_THEME = (theme:any)=>({
+const DROPDOWN_THEME = (theme: any) => ({
     ...theme,
     colors: {
         ...theme.colors,
-        neutral80:"black",
+        neutral80: 'black',
         //primary: theme.colors.primary50
     },
 });
 
 enum PlotTab {
-    LINE_CHART="lineChart",
-    HEATMAP="heatmap"
+    LINE_CHART = 'lineChart',
+    HEATMAP = 'heatmap',
 }
 
-export const LOCAL_STORAGE_PLOT_TAB_KEY = "patient_view_mutations_tab__vaf_plot_choice";
+export const LOCAL_STORAGE_PLOT_TAB_KEY =
+    'patient_view_mutations_tab__vaf_plot_choice';
 
 @observer
-export default class PatientViewMutationsTab extends React.Component<IPatientViewMutationsTabProps, {}> {
-    private dataStore = new PatientViewMutationsDataStore(()=>this.mergedMutations);
-    private vafLineChartSvg:SVGElement|null = null;
+export default class PatientViewMutationsTab extends React.Component<
+    IPatientViewMutationsTabProps,
+    {}
+> {
+    private dataStore = new PatientViewMutationsDataStore(
+        () => this.mergedMutations
+    );
+    private vafLineChartSvg: SVGElement | null = null;
     @observable vafLineChartLogScale = false;
     @observable vafLineChartZeroToOneYAxis = true;
     // TODO: replace this with URL stuff
-    @observable private _plotTab = localStorage.getItem(LOCAL_STORAGE_PLOT_TAB_KEY) || PlotTab.LINE_CHART;
+    @observable private _plotTab =
+        localStorage.getItem(LOCAL_STORAGE_PLOT_TAB_KEY) || PlotTab.LINE_CHART;
 
     @computed get plotTab() {
         return this._plotTab;
@@ -90,70 +100,86 @@ export default class PatientViewMutationsTab extends React.Component<IPatientVie
 
     @autobind
     @action
-    private setPlotTab(id:PlotTab) {
+    private setPlotTab(id: PlotTab) {
         this._plotTab = id;
         localStorage.setItem(LOCAL_STORAGE_PLOT_TAB_KEY, id);
     }
 
     @autobind
-    private vafLineChartSvgRef(elt:SVGElement|null) {
+    private vafLineChartSvgRef(elt: SVGElement | null) {
         this.vafLineChartSvg = elt;
     }
 
     @computed get mergedMutations() {
         // remove fusions
-        return this.props.store.mergedMutationDataIncludingUncalledFilteredByGene.filter(mutationArray=>{
-            return !isFusion(mutationArray[0]);
-        });
+        return this.props.store.mergedMutationDataIncludingUncalledFilteredByGene.filter(
+            mutationArray => {
+                return !isFusion(mutationArray[0]);
+            }
+        );
     }
 
     readonly vafLineChart = MakeMobxView({
-        await:()=>[
+        await: () => [
             this.props.store.coverageInformation,
             this.props.store.samples,
-            this.props.store.mutationMolecularProfileId
+            this.props.store.mutationMolecularProfileId,
         ],
-        renderPending:()=><LoadingIndicator isLoading={true} size="small"/>,
-        render:()=>(
-            <div
-                className="borderedChart"
-                style={{ display:"inline-block"}}
-            >
+        renderPending: () => <LoadingIndicator isLoading={true} size="small" />,
+        render: () => (
+            <div className="borderedChart" style={{ display: 'inline-block' }}>
                 <div
-                    style={{display:"flex", alignItems:"center", justifyContent:"space-between", marginBottom:5}}
+                    style={{
+                        display: 'flex',
+                        alignItems: 'center',
+                        justifyContent: 'space-between',
+                        marginBottom: 5,
+                    }}
                 >
-                    <div
-                        style={{display:"flex", alignItems:"center"}}
-                    >
+                    <div style={{ display: 'flex', alignItems: 'center' }}>
                         <LabeledCheckbox
                             checked={this.dataStore.onlyShowSelectedInVAFChart}
-                            onChange={()=>this.dataStore.setOnlyShowSelectedInVAFChart(!this.dataStore.onlyShowSelectedInVAFChart)}
-                            labelProps={{style:{ marginRight:10}}}
-                            inputProps={{"data-test":"VAFOnlyHighlighted"}}
+                            onChange={() =>
+                                this.dataStore.setOnlyShowSelectedInVAFChart(
+                                    !this.dataStore.onlyShowSelectedInVAFChart
+                                )
+                            }
+                            labelProps={{ style: { marginRight: 10 } }}
+                            inputProps={{ 'data-test': 'VAFOnlyHighlighted' }}
                         >
-                            <span style={{marginTop:-3}}>{SHOW_ONLY_SELECTED_LABEL}</span>
+                            <span style={{ marginTop: -3 }}>
+                                {SHOW_ONLY_SELECTED_LABEL}
+                            </span>
                         </LabeledCheckbox>
                         <LabeledCheckbox
                             checked={this.vafLineChartLogScale}
-                            onChange={()=>{ this.vafLineChartLogScale = !this.vafLineChartLogScale; }}
-                            labelProps={{style:{ marginRight:10}}}
-                            inputProps={{"data-test":"VAFLogScale"}}
+                            onChange={() => {
+                                this.vafLineChartLogScale = !this
+                                    .vafLineChartLogScale;
+                            }}
+                            labelProps={{ style: { marginRight: 10 } }}
+                            inputProps={{ 'data-test': 'VAFLogScale' }}
                         >
-                            <span style={{marginTop:-3}}>Log scale</span>
+                            <span style={{ marginTop: -3 }}>Log scale</span>
                         </LabeledCheckbox>
                         <LabeledCheckbox
                             checked={!this.vafLineChartZeroToOneYAxis}
-                            onChange={()=>{ this.vafLineChartZeroToOneYAxis = !this.vafLineChartZeroToOneYAxis; }}
-                            labelProps={{style:{ marginRight:10}}}
-                            inputProps={{"data-test":"VAFDataRange"}}
+                            onChange={() => {
+                                this.vafLineChartZeroToOneYAxis = !this
+                                    .vafLineChartZeroToOneYAxis;
+                            }}
+                            labelProps={{ style: { marginRight: 10 } }}
+                            inputProps={{ 'data-test': 'VAFDataRange' }}
                         >
-                            <span style={{marginTop:-3}}>Set y-axis to data range</span>
+                            <span style={{ marginTop: -3 }}>
+                                Set y-axis to data range
+                            </span>
                         </LabeledCheckbox>
                     </div>
                     <DownloadControls
                         filename="vafHeatmap"
-                        getSvg={()=>this.vafLineChartSvg}
-                        buttons={["SVG", "PNG", "PDF"]}
+                        getSvg={() => this.vafLineChartSvg}
+                        buttons={['SVG', 'PNG', 'PDF']}
                         type="button"
                         dontFade
                     />
@@ -161,8 +187,12 @@ export default class PatientViewMutationsTab extends React.Component<IPatientVie
                 <VAFLineChart
                     dataStore={this.dataStore}
                     samples={this.props.store.samples.result!}
-                    coverageInformation={this.props.store.coverageInformation.result!}
-                    mutationProfileId={this.props.store.mutationMolecularProfileId.result!}
+                    coverageInformation={
+                        this.props.store.coverageInformation.result!
+                    }
+                    mutationProfileId={
+                        this.props.store.mutationMolecularProfileId.result!
+                    }
                     sampleManager={this.props.sampleManager}
                     svgRef={this.vafLineChartSvgRef}
                     logScale={this.vafLineChartLogScale}
@@ -170,17 +200,17 @@ export default class PatientViewMutationsTab extends React.Component<IPatientVie
                 />
             </div>
         ),
-        showLastRenderWhenPending:true
+        showLastRenderWhenPending: true,
     });
 
     @autobind
-    private onTableRowClick(d:Mutation[]) {
+    private onTableRowClick(d: Mutation[]) {
         if (d.length) {
             this.dataStore.toggleSelectedMutation(d[0]);
         }
     }
     @autobind
-    private onTableRowMouseEnter(d:Mutation[]) {
+    private onTableRowMouseEnter(d: Mutation[]) {
         if (d.length) {
             this.dataStore.setMouseOverMutation(d[0]);
         }
@@ -191,57 +221,83 @@ export default class PatientViewMutationsTab extends React.Component<IPatientVie
     }
 
     @autobind
-    private onFilterGenesMutationTable(option:GeneFilterOption):void {
+    private onFilterGenesMutationTable(option: GeneFilterOption): void {
         this.props.store.mutationTableGeneFilterOption = option;
     }
 
     readonly table = MakeMobxView({
-        await:()=>[
+        await: () => [
             this.props.store.mutationData,
             this.props.store.uncalledMutationData,
             this.props.store.oncoKbAnnotatedGenes,
             this.props.store.studyIdToStudy,
             this.props.store.sampleToMutationGenePanelId,
-            this.props.store.genePanelIdToEntrezGeneIds
+            this.props.store.genePanelIdToEntrezGeneIds,
         ],
-        renderPending:()=><LoadingIndicator isLoading={true} size="small"/>,
-        render:()=>(
+        renderPending: () => <LoadingIndicator isLoading={true} size="small" />,
+        render: () => (
             <div data-test="GenomicEvolutionMutationTable">
-                <div style={{ float: "left", marginRight: 15, marginTop: 4 }} >
+                <div style={{ float: 'left', marginRight: 15, marginTop: 4 }}>
                     <LabeledCheckbox
                         checked={this.dataStore.onlyShowSelectedInTable}
-                        onChange={()=>this.dataStore.setOnlyShowSelectedInTable(!this.dataStore.onlyShowSelectedInTable)}
-                        labelProps={{style:{ marginRight:10}}}
-                        inputProps={{"data-test":"TableShowOnlyHighlighted"}}
+                        onChange={() =>
+                            this.dataStore.setOnlyShowSelectedInTable(
+                                !this.dataStore.onlyShowSelectedInTable
+                            )
+                        }
+                        labelProps={{ style: { marginRight: 10 } }}
+                        inputProps={{ 'data-test': 'TableShowOnlyHighlighted' }}
                     >
-                        <span style={{marginTop:-3}}>Show only selected mutations</span>
+                        <span style={{ marginTop: -3 }}>
+                            Show only selected mutations
+                        </span>
                     </LabeledCheckbox>
                 </div>
                 <PatientViewMutationTable
                     dataStore={this.dataStore}
-
-                    showGeneFilterMenu={this.props.store.mutationTableShowGeneFilterMenu.result}
-                    currentGeneFilter={this.props.store.mutationTableGeneFilterOption}
+                    showGeneFilterMenu={
+                        this.props.store.mutationTableShowGeneFilterMenu.result
+                    }
+                    currentGeneFilter={
+                        this.props.store.mutationTableGeneFilterOption
+                    }
                     onFilterGenes={this.onFilterGenesMutationTable}
-
                     onRowClick={this.onTableRowClick}
                     onRowMouseEnter={this.onTableRowMouseEnter}
                     onRowMouseLeave={this.onTableRowMouseLeave}
                     studyIdToStudy={this.props.store.studyIdToStudy.result!}
                     sampleManager={this.props.sampleManager}
-                    sampleIds={this.props.sampleManager ? this.props.sampleManager.getSampleIdsInOrder() : []}
-                    uniqueSampleKeyToTumorType={this.props.store.uniqueSampleKeyToTumorType}
-                    molecularProfileIdToMolecularProfile={this.props.store.molecularProfileIdToMolecularProfile.result}
+                    sampleIds={
+                        this.props.sampleManager
+                            ? this.props.sampleManager.getSampleIdsInOrder()
+                            : []
+                    }
+                    uniqueSampleKeyToTumorType={
+                        this.props.store.uniqueSampleKeyToTumorType
+                    }
+                    molecularProfileIdToMolecularProfile={
+                        this.props.store.molecularProfileIdToMolecularProfile
+                            .result
+                    }
                     variantCountCache={this.props.store.variantCountCache}
-                    indexedVariantAnnotations={this.props.store.indexedVariantAnnotations}
+                    indexedVariantAnnotations={
+                        this.props.store.indexedVariantAnnotations
+                    }
                     discreteCNACache={this.props.store.discreteCNACache}
                     mrnaExprRankCache={this.props.store.mrnaExprRankCache}
                     oncoKbEvidenceCache={this.props.store.oncoKbEvidenceCache}
                     pubMedCache={this.props.store.pubMedCache}
                     genomeNexusCache={this.props.store.genomeNexusCache}
-                    genomeNexusMyVariantInfoCache={this.props.store.genomeNexusMyVariantInfoCache}
-                    mrnaExprRankMolecularProfileId={this.props.store.mrnaRankMolecularProfileId.result || undefined}
-                    discreteCNAMolecularProfileId={this.props.store.molecularProfileIdDiscrete.result}
+                    genomeNexusMyVariantInfoCache={
+                        this.props.store.genomeNexusMyVariantInfoCache
+                    }
+                    mrnaExprRankMolecularProfileId={
+                        this.props.store.mrnaRankMolecularProfileId.result ||
+                        undefined
+                    }
+                    discreteCNAMolecularProfileId={
+                        this.props.store.molecularProfileIdDiscrete.result
+                    }
                     downloadDataFetcher={this.props.store.downloadDataFetcher}
                     mutSigData={this.props.store.mutSigData.result}
                     myCancerGenomeData={this.props.store.myCancerGenomeData}
@@ -253,28 +309,36 @@ export default class PatientViewMutationsTab extends React.Component<IPatientVie
                     civicVariants={this.props.store.civicVariants}
                     userEmailAddress={ServerConfigHelpers.getUserEmailAddress()}
                     enableOncoKb={AppConfig.serverConfig.show_oncokb}
-                    enableFunctionalImpact={AppConfig.serverConfig.show_genomenexus}
+                    enableFunctionalImpact={
+                        AppConfig.serverConfig.show_genomenexus
+                    }
                     enableHotspot={AppConfig.serverConfig.show_hotspot}
-                    enableMyCancerGenome={AppConfig.serverConfig.mycancergenome_show}
+                    enableMyCancerGenome={
+                        AppConfig.serverConfig.mycancergenome_show
+                    }
                     enableCivic={AppConfig.serverConfig.show_civic}
                     columnVisibility={this.props.mutationTableColumnVisibility}
                     columnVisibilityProps={{
-                        onColumnToggled: this.props.onMutationTableColumnVisibilityToggled
+                        onColumnToggled: this.props
+                            .onMutationTableColumnVisibilityToggled,
                     }}
-                    sampleToGenePanelId={this.props.store.sampleToMutationGenePanelId.result!}
-                    genePanelIdToEntrezGeneIds={this.props.store.genePanelIdToEntrezGeneIds.result!}
+                    sampleToGenePanelId={
+                        this.props.store.sampleToMutationGenePanelId.result!
+                    }
+                    genePanelIdToEntrezGeneIds={
+                        this.props.store.genePanelIdToEntrezGeneIds.result!
+                    }
                 />
             </div>
-        )
+        ),
     });
 
     readonly tabUI = MakeMobxView({
-        await:()=>[
-            this.table,
-            this.vafLineChart
-        ],
-        renderPending:()=><LoadingIndicator isLoading={true} size="big" center={true}/>,
-        render:()=>(
+        await: () => [this.table, this.vafLineChart],
+        renderPending: () => (
+            <LoadingIndicator isLoading={true} size="big" center={true} />
+        ),
+        render: () => (
             <div data-test="GenomicEvolutionTab">
                 <MSKTabs
                     activeTabId={this.plotTab}
@@ -283,12 +347,12 @@ export default class PatientViewMutationsTab extends React.Component<IPatientVie
                     unmountOnHide={false}
                 >
                     <MSKTab id={PlotTab.LINE_CHART} linkText="Line Chart">
-                        <div style={{paddingBottom:20}}>
+                        <div style={{ paddingBottom: 20 }}>
                             {this.vafLineChart.component}
                         </div>
                     </MSKTab>
                     <MSKTab id={PlotTab.HEATMAP} linkText="Heatmap">
-                        <div style={{paddingBottom:20}}>
+                        <div style={{ paddingBottom: 20 }}>
                             <MutationOncoprint
                                 store={this.props.store}
                                 dataStore={this.dataStore}
@@ -297,14 +361,12 @@ export default class PatientViewMutationsTab extends React.Component<IPatientVie
                         </div>
                     </MSKTab>
                 </MSKTabs>
-                <div style={{marginTop:30}}>
-                    {this.table.component}
-                </div>
+                <div style={{ marginTop: 30 }}>{this.table.component}</div>
             </div>
-        )
+        ),
     });
 
     render() {
         return this.tabUI.component;
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/patientView/mutation/PatientViewMutationsTabUtils.tsx b/src/pages/patientView/mutation/PatientViewMutationsTabUtils.tsx
index 6db8726b81c..db8a5c29d93 100644
--- a/src/pages/patientView/mutation/PatientViewMutationsTabUtils.tsx
+++ b/src/pages/patientView/mutation/PatientViewMutationsTabUtils.tsx
@@ -1,26 +1,26 @@
-import * as React from "react";
-import {Mutation} from "../../../shared/api/generated/CBioPortalAPI";
+import * as React from 'react';
+import { Mutation } from '../../../shared/api/generated/CBioPortalAPI';
 
 export enum MutationStatus {
     MUTATED_WITH_VAF,
     MUTATED_BUT_NO_VAF,
     PROFILED_WITH_READS_BUT_UNCALLED,
     PROFILED_BUT_NOT_MUTATED,
-    NOT_PROFILED
+    NOT_PROFILED,
 }
 
 export function mutationTooltip(
-    mutation:Mutation,
-    sampleSpecificInfo?:{
-        sampleId:string,
-        mutationStatus:MutationStatus,
-        vaf?:number|null|undefined
+    mutation: Mutation,
+    sampleSpecificInfo?: {
+        sampleId: string;
+        mutationStatus: MutationStatus;
+        vaf?: number | null | undefined;
     }
 ) {
-    let sampleSpecificSection:any = null;
+    let sampleSpecificSection: any = null;
     if (sampleSpecificInfo) {
         // show tooltip when hovering a point
-        let vafExplanation:string;
+        let vafExplanation: string;
         switch (sampleSpecificInfo.mutationStatus) {
             case MutationStatus.MUTATED_WITH_VAF:
                 vafExplanation = `VAF: ${sampleSpecificInfo.vaf!.toFixed(2)}`;
@@ -30,26 +30,28 @@ export function mutationTooltip(
                 break;
             case MutationStatus.PROFILED_WITH_READS_BUT_UNCALLED:
             case MutationStatus.PROFILED_BUT_NOT_MUTATED:
-                vafExplanation = `Mutation not detected (VAF: ${(sampleSpecificInfo.vaf || 0).toFixed(2)})`;
+                vafExplanation = `Mutation not detected (VAF: ${(
+                    sampleSpecificInfo.vaf || 0
+                ).toFixed(2)})`;
                 break;
             case MutationStatus.NOT_PROFILED:
             default:
                 vafExplanation = `${sampleSpecificInfo.sampleId} is not sequenced for ${mutation.gene.hugoGeneSymbol} mutations.`;
                 break;
         }
-        sampleSpecificSection = (
-            [
-                <span>Sample ID: {sampleSpecificInfo.sampleId}</span>,
-                <br/>,
-                <span>{vafExplanation}</span>
-            ]
-        );
+        sampleSpecificSection = [
+            <span>Sample ID: {sampleSpecificInfo.sampleId}</span>,
+            <br />,
+            <span>{vafExplanation}</span>,
+        ];
     }
     return (
         <div>
-            <span>Gene: {mutation.gene.hugoGeneSymbol}</span><br/>
-            <span>Protein Change: {mutation.proteinChange}</span><br/>
+            <span>Gene: {mutation.gene.hugoGeneSymbol}</span>
+            <br />
+            <span>Protein Change: {mutation.proteinChange}</span>
+            <br />
             {sampleSpecificSection}
         </div>
     );
-}
\ No newline at end of file
+}
diff --git a/src/pages/patientView/mutation/VAFLineChart.tsx b/src/pages/patientView/mutation/VAFLineChart.tsx
index 34f2477817f..e88e8b85144 100644
--- a/src/pages/patientView/mutation/VAFLineChart.tsx
+++ b/src/pages/patientView/mutation/VAFLineChart.tsx
@@ -1,73 +1,84 @@
-import * as React from "react";
-import {Observer, observer} from "mobx-react";
-import {VictoryAxis, VictoryChart, VictoryLabel, VictoryLine, VictoryScatter} from "victory";
-import CBIOPORTAL_VICTORY_THEME from "../../../shared/theme/cBioPoralTheme";
-import {action, computed, observable} from "mobx";
-import {Sample} from "../../../shared/api/generated/CBioPortalAPI";
-import {stringListToIndexSet} from "cbioportal-frontend-commons";
-import _ from "lodash";
-import WindowStore from "../../../shared/components/window/WindowStore";
-import TruncatedTextWithTooltipSVG from "../../../shared/components/TruncatedTextWithTooltipSVG";
-import {Popover} from "react-bootstrap";
-import classnames from "classnames";
-import survivalStyles from "../../resultsView/survival/styles.module.scss";
-import styles from "./styles.module.scss";
-import autobind from "autobind-decorator";
-import {Portal} from "react-portal";
-import {CoverageInformation} from "../../resultsView/ResultsViewPageStoreUtils";
-import SampleLabelSVG from "../../../shared/components/sampleLabel/SampleLabel";
-import SampleManager from "../SampleManager";
-import PatientViewMutationsDataStore from "./PatientViewMutationsDataStore";
-import $ from "jquery";
-import ComplexKeyMap from "../../../shared/lib/complexKeyDataStructures/ComplexKeyMap";
-import invertIncreasingFunction, {invertDecreasingFunction} from "../../../shared/lib/invertIncreasingFunction";
-import {mutationTooltip} from "./PatientViewMutationsTabUtils";
-import {tickFormatNumeral} from "../../../shared/components/plots/TickUtils";
-import {computeRenderData, IPoint} from "./VAFLineChartUtils";
-
+import * as React from 'react';
+import { Observer, observer } from 'mobx-react';
+import {
+    VictoryAxis,
+    VictoryChart,
+    VictoryLabel,
+    VictoryLine,
+    VictoryScatter,
+} from 'victory';
+import CBIOPORTAL_VICTORY_THEME from '../../../shared/theme/cBioPoralTheme';
+import { action, computed, observable } from 'mobx';
+import { Sample } from '../../../shared/api/generated/CBioPortalAPI';
+import { stringListToIndexSet } from 'cbioportal-frontend-commons';
+import _ from 'lodash';
+import WindowStore from '../../../shared/components/window/WindowStore';
+import TruncatedTextWithTooltipSVG from '../../../shared/components/TruncatedTextWithTooltipSVG';
+import { Popover } from 'react-bootstrap';
+import classnames from 'classnames';
+import survivalStyles from '../../resultsView/survival/styles.module.scss';
+import styles from './styles.module.scss';
+import autobind from 'autobind-decorator';
+import { Portal } from 'react-portal';
+import { CoverageInformation } from '../../resultsView/ResultsViewPageStoreUtils';
+import SampleLabelSVG from '../../../shared/components/sampleLabel/SampleLabel';
+import SampleManager from '../SampleManager';
+import PatientViewMutationsDataStore from './PatientViewMutationsDataStore';
+import $ from 'jquery';
+import ComplexKeyMap from '../../../shared/lib/complexKeyDataStructures/ComplexKeyMap';
+import invertIncreasingFunction, {
+    invertDecreasingFunction,
+} from '../../../shared/lib/invertIncreasingFunction';
+import { mutationTooltip } from './PatientViewMutationsTabUtils';
+import { tickFormatNumeral } from '../../../shared/components/plots/TickUtils';
+import { computeRenderData, IPoint } from './VAFLineChartUtils';
 
 export interface IVAFLineChartProps {
-    samples:Sample[];
-    coverageInformation:CoverageInformation;
-    mutationProfileId:string;
-    sampleManager:SampleManager|null;
-    dataStore:PatientViewMutationsDataStore;
-    svgRef:(elt:SVGElement|null)=>void;
-    logScale:boolean;
-    zeroToOneAxis:boolean;
+    samples: Sample[];
+    coverageInformation: CoverageInformation;
+    mutationProfileId: string;
+    sampleManager: SampleManager | null;
+    dataStore: PatientViewMutationsDataStore;
+    svgRef: (elt: SVGElement | null) => void;
+    logScale: boolean;
+    zeroToOneAxis: boolean;
 }
 
-export const SHOW_ONLY_SELECTED_LABEL = "Show only selected mutations";
+export const SHOW_ONLY_SELECTED_LABEL = 'Show only selected mutations';
 
-const LINE_COLOR = "#000000";
+const LINE_COLOR = '#000000';
 const HIGHLIGHT_LINE_STROKE_WIDTH = 6;
-const HIGHLIGHT_COLOR = "#318ec4";
-const DRAG_COVER_CLASSNAME = "draggingCover";
+const HIGHLIGHT_COLOR = '#318ec4';
+const DRAG_COVER_CLASSNAME = 'draggingCover';
 const MIN_LOG_ARG = 0.001;
 const SCATTER_DATA_POINT_SIZE = 3;
 
-const THEME:any = _.cloneDeep(CBIOPORTAL_VICTORY_THEME);
+const THEME: any = _.cloneDeep(CBIOPORTAL_VICTORY_THEME);
 THEME.axis.style.grid.strokeOpacity = 1;
 
-class ScaleCapturer extends React.Component<any, any>{
+class ScaleCapturer extends React.Component<any, any> {
     render() {
         this.props.scaleCallback(this.props.scale);
 
-        return <g/>;
+        return <g />;
     }
 }
 
-class Tick extends React.Component<any, any>{
+class Tick extends React.Component<any, any> {
     render() {
-        let {sampleIdOrder, sampleManager, text:index, ...rest} = this.props;
+        let { sampleIdOrder, sampleManager, text: index, ...rest } = this.props;
         const sampleId = sampleIdOrder[index];
         return (
             <g transform={`rotate(50, ${rest.x}, ${rest.y})`}>
                 <SampleLabelSVG
-                    label={index+1}
-                    color={sampleManager ? sampleManager.getColorForSample(sampleId) : "black"}
-                    x={rest.x+10}
-                    y={rest.y-5}
+                    label={index + 1}
+                    color={
+                        sampleManager
+                            ? sampleManager.getColorForSample(sampleId)
+                            : 'black'
+                    }
+                    x={rest.x + 10}
+                    y={rest.y - 5}
                     r={6}
                     textDy={-1}
                 />
@@ -82,95 +93,109 @@ class Tick extends React.Component<any, any>{
             </g>
         );
     }
-
 }
 
-type VictoryScale = { x: (_x:number)=>number, y:(_y:number)=>number };
+type VictoryScale = { x: (_x: number) => number; y: (_y: number) => number };
 
 @observer
-export default class VAFLineChart extends React.Component<IVAFLineChartProps, {}> {
-
-    @observable.ref private tooltipDatum:any | null = null;
+export default class VAFLineChart extends React.Component<
+    IVAFLineChartProps,
+    {}
+> {
+    @observable.ref private tooltipDatum: any | null = null;
     @observable private tooltipOnPoint = false;
 
     private mouseEvents = this.makeMouseEvents();
-    @observable.ref mouseEvent:React.MouseEvent<any>|null = null;
-    @observable.ref private scale:VictoryScale | null = null;
+    @observable.ref mouseEvent: React.MouseEvent<any> | null = null;
+    @observable.ref private scale: VictoryScale | null = null;
 
     @observable dragRect = {
-        startX:0, startY:0, currentX:0, currentY:0
+        startX: 0,
+        startY: 0,
+        currentX: 0,
+        currentY: 0,
     };
     @observable dragging = false;
 
     @autobind
-    private scaleCallback(scale:VictoryScale) {
+    private scaleCallback(scale: VictoryScale) {
         this.scale = scale;
     }
 
     private makeMouseEvents() {
-        return [{
-            target: "data",
-            eventHandlers: {
-                onMouseOver: () => {
-                    return [
-                        {
-                            target: "data",
-                            mutation: action((props: any) => {
-                                let datum;
-                                if (props.datum) {
-                                    // mouse over point
-                                    datum = props.datum;
-                                    this.tooltipOnPoint = true;
-                                } else if (props.data.length > 0) {
-                                    // mouse over line
-                                    datum = props.data[0];
+        return [
+            {
+                target: 'data',
+                eventHandlers: {
+                    onMouseOver: () => {
+                        return [
+                            {
+                                target: 'data',
+                                mutation: action((props: any) => {
+                                    let datum;
+                                    if (props.datum) {
+                                        // mouse over point
+                                        datum = props.datum;
+                                        this.tooltipOnPoint = true;
+                                    } else if (props.data.length > 0) {
+                                        // mouse over line
+                                        datum = props.data[0];
+                                        this.tooltipOnPoint = false;
+                                    }
+                                    this.tooltipDatum = datum;
+                                    this.props.dataStore.setMouseOverMutation(
+                                        this.tooltipDatum.mutation
+                                    );
+                                    return null;
+                                }),
+                            },
+                        ];
+                    },
+                    onMouseOut: () => {
+                        return [
+                            {
+                                target: 'data',
+                                mutation: action(() => {
+                                    this.tooltipDatum = null;
                                     this.tooltipOnPoint = false;
-                                }
-                                this.tooltipDatum = datum;
-                                this.props.dataStore.setMouseOverMutation(this.tooltipDatum.mutation);
-                                return null;
-                            })
-                        }
-                    ];
-                },
-                onMouseOut: () => {
-                    return [
-                        {
-                            target: "data",
-                            mutation: action(() => {
-                                this.tooltipDatum = null;
-                                this.tooltipOnPoint = false;
-                                this.props.dataStore.setMouseOverMutation(null);
-                                return null;
-                            })
-                        }
-                    ];
+                                    this.props.dataStore.setMouseOverMutation(
+                                        null
+                                    );
+                                    return null;
+                                }),
+                            },
+                        ];
+                    },
+                    onClick: () => {
+                        return [
+                            {
+                                target: 'data',
+                                mutation: action((props: any) => {
+                                    let datum;
+                                    if (props.datum) {
+                                        // click on point
+                                        datum = props.datum;
+                                    } else if (props.data.length > 0) {
+                                        // click on line
+                                        datum = props.data[0];
+                                    }
+                                    this.props.dataStore.toggleSelectedMutation(
+                                        datum.mutation
+                                    );
+                                }),
+                            },
+                        ];
+                    },
                 },
-                onClick: ()=> {
-                    return [
-                        {
-                            target: "data",
-                            mutation: action((props:any)=>{
-                                let datum;
-                                if (props.datum) {
-                                    // click on point
-                                    datum = props.datum;
-                                } else if (props.data.length > 0) {
-                                    // click on line
-                                    datum = props.data[0];
-                                }
-                                this.props.dataStore.toggleSelectedMutation(datum.mutation);
-                            })
-                        }
-                    ];
-                }
-            }
-        }];
+            },
+        ];
     }
 
     @computed get mutations() {
         if (this.props.dataStore.onlyShowSelectedInVAFChart) {
-            return this.props.dataStore.allData.filter(m=>this.props.dataStore.isMutationSelected(m[0]));
+            return this.props.dataStore.allData.filter(m =>
+                this.props.dataStore.isMutationSelected(m[0])
+            );
         } else {
             return this.props.dataStore.allData;
         }
@@ -179,35 +204,56 @@ export default class VAFLineChart extends React.Component<IVAFLineChartProps, {}
     @action
     private selectPointsInDragRect() {
         if (this.scale) {
-            const points = this.renderData.grayPoints.concat(_.flatten(this.renderData.lineData));
+            const points = this.renderData.grayPoints.concat(
+                _.flatten(this.renderData.lineData)
+            );
 
             const rectBoundsSvgSpace = {
-                x:[Math.min(this.dragRect.startX, this.dragRect.currentX), Math.max(this.dragRect.startX, this.dragRect.currentX)],
+                x: [
+                    Math.min(this.dragRect.startX, this.dragRect.currentX),
+                    Math.max(this.dragRect.startX, this.dragRect.currentX),
+                ],
                 // y inverted because svg y goes top to bottom
-                y:[Math.max(this.dragRect.startY, this.dragRect.currentY), Math.min(this.dragRect.startY, this.dragRect.currentY)]
+                y: [
+                    Math.max(this.dragRect.startY, this.dragRect.currentY),
+                    Math.min(this.dragRect.startY, this.dragRect.currentY),
+                ],
             };
 
             const rectBoundsDataSpace = {
-                x:rectBoundsSvgSpace.x.map(v=>invertIncreasingFunction(this.scale!.x, v)),
-                y:rectBoundsSvgSpace.y.map(v=>invertDecreasingFunction(this.scale!.y, v)) // y is decreasing function because svg y goes top to bottom
+                x: rectBoundsSvgSpace.x.map(v =>
+                    invertIncreasingFunction(this.scale!.x, v)
+                ),
+                y: rectBoundsSvgSpace.y.map(v =>
+                    invertDecreasingFunction(this.scale!.y, v)
+                ), // y is decreasing function because svg y goes top to bottom
             };
 
-            const selectedPoints = points.filter(p=>{
-                return p.x >= rectBoundsDataSpace.x[0] && p.x <= rectBoundsDataSpace.x[1] &&
-                    p.y >= rectBoundsDataSpace.y[0] && p.y <= rectBoundsDataSpace.y[1];
+            const selectedPoints = points.filter(p => {
+                return (
+                    p.x >= rectBoundsDataSpace.x[0] &&
+                    p.x <= rectBoundsDataSpace.x[1] &&
+                    p.y >= rectBoundsDataSpace.y[0] &&
+                    p.y <= rectBoundsDataSpace.y[1]
+                );
             });
 
-            this.props.dataStore.setSelectedMutations(selectedPoints.map(p=>p.mutation));
+            this.props.dataStore.setSelectedMutations(
+                selectedPoints.map(p => p.mutation)
+            );
         }
     }
 
     @autobind
     @action
-    private onMouseMove(e:React.MouseEvent<any>) {
+    private onMouseMove(e: React.MouseEvent<any>) {
         e.persist();
         this.mouseEvent = e;
 
-        if (this.dragging && (e.target as SVGElement).classList.contains(DRAG_COVER_CLASSNAME)) {
+        if (
+            this.dragging &&
+            (e.target as SVGElement).classList.contains(DRAG_COVER_CLASSNAME)
+        ) {
             // only update drag coordinates based on SVG events
             const offset = $(e.target).offset()!;
             this.dragRect.currentX = e.pageX - offset.left;
@@ -217,8 +263,8 @@ export default class VAFLineChart extends React.Component<IVAFLineChartProps, {}
 
     @autobind
     @action
-    private onMouseDown(e:React.MouseEvent<any>) {
-        if ((e.target as SVGElement).nodeName.toLowerCase() === "svg") {
+    private onMouseDown(e: React.MouseEvent<any>) {
+        if ((e.target as SVGElement).nodeName.toLowerCase() === 'svg') {
             // start drag if clicking on background
             this.dragging = true;
 
@@ -232,7 +278,7 @@ export default class VAFLineChart extends React.Component<IVAFLineChartProps, {}
 
     @autobind
     @action
-    private onMouseUp(e:React.MouseEvent<any>) {
+    private onMouseUp(e: React.MouseEvent<any>) {
         // finish drag
         if (this.dragging) {
             this.dragging = false;
@@ -261,11 +307,11 @@ export default class VAFLineChart extends React.Component<IVAFLineChartProps, {}
     }
 
     @computed get sampleIdOrder() {
-        let order:string[];
+        let order: string[];
         if (this.props.sampleManager) {
             order = this.props.sampleManager.getSampleIdsInOrder();
         } else {
-            order = this.props.samples.map(s=>s.sampleId);
+            order = this.props.samples.map(s => s.sampleId);
         }
         return order;
     }
@@ -287,10 +333,13 @@ export default class VAFLineChart extends React.Component<IVAFLineChartProps, {}
     @computed get mutationToDataPoints() {
         const map = new ComplexKeyMap<IPoint[]>();
         for (const lineData of this.renderData.lineData) {
-            map.set({
-                hugoGeneSymbol: lineData[0].mutation.gene.hugoGeneSymbol,
-                proteinChange: lineData[0].mutation.proteinChange
-            }, lineData);
+            map.set(
+                {
+                    hugoGeneSymbol: lineData[0].mutation.gene.hugoGeneSymbol,
+                    proteinChange: lineData[0].mutation.proteinChange,
+                },
+                lineData
+            );
         }
         return map;
     }
@@ -298,29 +347,43 @@ export default class VAFLineChart extends React.Component<IVAFLineChartProps, {}
     private tooltipFunction(datum: any) {
         return mutationTooltip(
             datum.mutation,
-            this.tooltipOnPoint ? {
-                mutationStatus: datum.mutationStatus,
-                sampleId: datum.sampleId,
-                vaf: datum.y
-            } : undefined
+            this.tooltipOnPoint
+                ? {
+                      mutationStatus: datum.mutationStatus,
+                      sampleId: datum.sampleId,
+                      vaf: datum.y,
+                  }
+                : undefined
         );
     }
 
     @autobind
     private getTooltipComponent() {
         if (!this.tooltipDatum || !this.mouseEvent) {
-            return <span/>;
+            return <span />;
         } else {
-            let tooltipPlacement = (this.mouseEvent.clientY < 250 ? "bottom" : "top");
+            let tooltipPlacement =
+                this.mouseEvent.clientY < 250 ? 'bottom' : 'top';
             return (
                 <Portal isOpened={true} node={document.body}>
                     <Popover
-                        className={classnames("cbioportal-frontend", "cbioTooltip", survivalStyles.Tooltip, styles.Tooltip)}
+                        className={classnames(
+                            'cbioportal-frontend',
+                            'cbioTooltip',
+                            survivalStyles.Tooltip,
+                            styles.Tooltip
+                        )}
                         positionLeft={this.mouseEvent.pageX}
-                        positionTop={this.mouseEvent.pageY+(tooltipPlacement === "top" ? -7 : 7)}
+                        positionTop={
+                            this.mouseEvent.pageY +
+                            (tooltipPlacement === 'top' ? -7 : 7)
+                        }
                         style={{
-                            transform: (tooltipPlacement === "top" ? "translate(-50%,-100%)" : "translate(-50%,0%)"),
-                            maxWidth:400
+                            transform:
+                                tooltipPlacement === 'top'
+                                    ? 'translate(-50%,-100%)'
+                                    : 'translate(-50%,0%)',
+                            maxWidth: 400,
                         }}
                         placement={tooltipPlacement}
                     >
@@ -338,56 +401,64 @@ export default class VAFLineChart extends React.Component<IVAFLineChartProps, {}
         const highlightedMutations = [];
         if (!this.props.dataStore.onlyShowSelectedInVAFChart) {
             // dont bold highlighted mutations if we're only showing highlighted mutations
-            highlightedMutations.push(...this.props.dataStore.selectedMutations);
+            highlightedMutations.push(
+                ...this.props.dataStore.selectedMutations
+            );
         }
         const mouseOverMutation = this.props.dataStore.getMouseOverMutation();
         if (mouseOverMutation) {
             highlightedMutations.push(mouseOverMutation);
         }
         if (highlightedMutations.length > 0 && this.scale !== null) {
-            return highlightedMutations.map(highlightedMutation=>{
+            return highlightedMutations.map(highlightedMutation => {
                 const points = this.mutationToDataPoints.get({
                     proteinChange: highlightedMutation.proteinChange,
-                    hugoGeneSymbol: highlightedMutation.gene.hugoGeneSymbol
+                    hugoGeneSymbol: highlightedMutation.gene.hugoGeneSymbol,
                 });
                 if (!points) {
-                    return <g/>
+                    return <g />;
                 }
                 let linePath = null;
                 if (points.length > 1) {
                     // more than one point -> we should render a path
-                    let d = `M ${this.scale!.x(points[0].x)} ${this.scale!.y(this.y(points[0]))}`;
-                    for (let i=1; i<points.length; i++) {
-                        d = `${d} L ${this.scale!.x(points[i].x)} ${this.scale!.y(this.y(points[i]))}`;
+                    let d = `M ${this.scale!.x(points[0].x)} ${this.scale!.y(
+                        this.y(points[0])
+                    )}`;
+                    for (let i = 1; i < points.length; i++) {
+                        d = `${d} L ${this.scale!.x(
+                            points[i].x
+                        )} ${this.scale!.y(this.y(points[i]))}`;
                     }
                     linePath = (
                         <path
                             style={{
-                                stroke:HIGHLIGHT_COLOR,
-                                strokeOpacity:1,
-                                strokeWidth:HIGHLIGHT_LINE_STROKE_WIDTH,
-                                fillOpacity:0,
-                                pointerEvents:"none"
+                                stroke: HIGHLIGHT_COLOR,
+                                strokeOpacity: 1,
+                                strokeWidth: HIGHLIGHT_LINE_STROKE_WIDTH,
+                                fillOpacity: 0,
+                                pointerEvents: 'none',
                             }}
                             d={d}
                         />
                     );
                 }
-                const pointPaths = points.map(point=>(
+                const pointPaths = points.map(point => (
                     <path
-                        d={
-                            `M ${this.scale!.x(point.x)} ${this.scale!.y(this.y(point))}
+                        d={`M ${this.scale!.x(point.x)} ${this.scale!.y(
+                            this.y(point)
+                        )}
                             m -${SCATTER_DATA_POINT_SIZE}, 0
-                            a ${SCATTER_DATA_POINT_SIZE}, ${SCATTER_DATA_POINT_SIZE} 0 1,0 ${2*SCATTER_DATA_POINT_SIZE},0
-                            a ${SCATTER_DATA_POINT_SIZE}, ${SCATTER_DATA_POINT_SIZE} 0 1,0 ${-2*SCATTER_DATA_POINT_SIZE},0
-                            `
-                        }
+                            a ${SCATTER_DATA_POINT_SIZE}, ${SCATTER_DATA_POINT_SIZE} 0 1,0 ${2 *
+                            SCATTER_DATA_POINT_SIZE},0
+                            a ${SCATTER_DATA_POINT_SIZE}, ${SCATTER_DATA_POINT_SIZE} 0 1,0 ${-2 *
+                            SCATTER_DATA_POINT_SIZE},0
+                            `}
                         style={{
-                            stroke:HIGHLIGHT_COLOR,
-                            fill:"white",
-                            strokeWidth:2,
-                            opacity:1,
-                            pointerEvents:"none"
+                            stroke: HIGHLIGHT_COLOR,
+                            fill: 'white',
+                            strokeWidth: 2,
+                            opacity: 1,
+                            pointerEvents: 'none',
                         }}
                     />
                 ));
@@ -400,7 +471,7 @@ export default class VAFLineChart extends React.Component<IVAFLineChartProps, {}
                 );
             });
         } else {
-            return <g/>;
+            return <g />;
         }
     }
 
@@ -409,10 +480,14 @@ export default class VAFLineChart extends React.Component<IVAFLineChartProps, {}
         if (this.dragging) {
             const x = Math.min(this.dragRect.startX, this.dragRect.currentX);
             const y = Math.min(this.dragRect.startY, this.dragRect.currentY);
-            const width = Math.abs(this.dragRect.startX - this.dragRect.currentX);
-            const height = Math.abs(this.dragRect.startY - this.dragRect.currentY);
+            const width = Math.abs(
+                this.dragRect.startX - this.dragRect.currentX
+            );
+            const height = Math.abs(
+                this.dragRect.startY - this.dragRect.currentY
+            );
 
-            return ([
+            return [
                 <rect
                     fill="black"
                     fillOpacity="0"
@@ -423,22 +498,22 @@ export default class VAFLineChart extends React.Component<IVAFLineChartProps, {}
                     className={DRAG_COVER_CLASSNAME}
                 />, // cover svg so text doesnt get selected during drag
                 <rect
-                    style={{"pointerEvents":"none"}}
+                    style={{ pointerEvents: 'none' }}
                     fill="red"
                     fillOpacity="0.5"
                     x={x}
                     y={y}
                     width={width}
                     height={height}
-                />
-            ]);
+                />,
+            ];
         } else {
-            return <g/>;
+            return <g />;
         }
     }
 
     @autobind
-    private y(d:IPoint) {
+    private y(d: IPoint) {
         if (this.props.logScale) {
             return Math.log10(Math.max(MIN_LOG_ARG, d.y));
         } else {
@@ -451,7 +526,7 @@ export default class VAFLineChart extends React.Component<IVAFLineChartProps, {}
 
         // determine true domain
         if (this.props.zeroToOneAxis) {
-            domain = [0,1];
+            domain = [0, 1];
         } else {
             let min = Number.POSITIVE_INFINITY;
             let max = Number.NEGATIVE_INFINITY;
@@ -466,16 +541,18 @@ export default class VAFLineChart extends React.Component<IVAFLineChartProps, {}
 
         // log-transform if necessary
         if (this.props.logScale) {
-            domain = domain.map(x=>Math.log10(Math.max(x, MIN_LOG_ARG)));
+            domain = domain.map(x => Math.log10(Math.max(x, MIN_LOG_ARG)));
         }
 
         return domain;
     }
 
     @autobind
-    private tickFormatY(t:number, tickIndex:number, tickValues:number[]) {
+    private tickFormatY(t: number, tickIndex: number, tickValues: number[]) {
         if (this.props.logScale) {
-            const realValue = tickFormatNumeral(t, tickValues, t=>Math.pow(10, t));
+            const realValue = tickFormatNumeral(t, tickValues, t =>
+                Math.pow(10, t)
+            );
             if (tickIndex === 0 && t <= MIN_LOG_ARG && t > 0) {
                 // bottom tick - if its greater than 0, show less-than-or-equal sign since data is floored at MIN_LOG_ARG
                 return `≤ ${realValue}`;
@@ -497,7 +574,7 @@ export default class VAFLineChart extends React.Component<IVAFLineChartProps, {}
                         style={{
                             width: this.svgWidth,
                             height: this.svgHeight,
-                            pointerEvents: "all"
+                            pointerEvents: 'all',
                         }}
                         height={this.svgHeight}
                         width={this.svgWidth}
@@ -516,15 +593,15 @@ export default class VAFLineChart extends React.Component<IVAFLineChartProps, {}
                             domainPadding={20}
                             singleQuadrantDomainPadding={false}
                             style={{
-                                parent:{
-                                    backgroundColor:"white"
-                                }
+                                parent: {
+                                    backgroundColor: 'white',
+                                },
                             }}
                         >
                             <VictoryAxis
                                 dependentAxis
                                 label="Allele Freq"
-                                axisLabelComponent={<VictoryLabel dy={-28}/>}
+                                axisLabelComponent={<VictoryLabel dy={-28} />}
                                 crossAxis={false}
                                 offsetX={50}
                                 tickFormat={this.tickFormatY}
@@ -533,10 +610,15 @@ export default class VAFLineChart extends React.Component<IVAFLineChartProps, {}
                             <VictoryAxis
                                 style={{
                                     grid: {
-                                        strokeOpacity: (t:number, i:number)=>{ return i === 0 ? 0 : 1; },
-                                    }
+                                        strokeOpacity: (
+                                            t: number,
+                                            i: number
+                                        ) => {
+                                            return i === 0 ? 0 : 1;
+                                        },
+                                    },
                                 }}
-                                tickValues={this.props.samples.map((s,i)=>i)}
+                                tickValues={this.props.samples.map((s, i) => i)}
                                 tickLabelComponent={
                                     <Tick
                                         sampleIdOrder={this.sampleIdOrder}
@@ -547,39 +629,47 @@ export default class VAFLineChart extends React.Component<IVAFLineChartProps, {}
                                 offsetY={50}
                                 orientation="bottom"
                             />
-                            {this.renderData.lineData.map(dataForSingleLine=>{
+                            {this.renderData.lineData.map(dataForSingleLine => {
                                 if (dataForSingleLine.length > 1) {
                                     // cant show line with only 1 point - causes error in svg to pdf conversion
                                     return [
                                         <VictoryLine
                                             style={{
-                                                data: { stroke: LINE_COLOR, strokeOpacity:0.5, pointerEvents:"none" }
+                                                data: {
+                                                    stroke: LINE_COLOR,
+                                                    strokeOpacity: 0.5,
+                                                    pointerEvents: 'none',
+                                                },
                                             }}
                                             data={dataForSingleLine}
                                             y={this.y}
                                         />,
                                         <VictoryLine
                                             style={{
-                                                data: { strokeOpacity:0, pointerEvents:"stroke", strokeWidth:HIGHLIGHT_LINE_STROKE_WIDTH }
+                                                data: {
+                                                    strokeOpacity: 0,
+                                                    pointerEvents: 'stroke',
+                                                    strokeWidth: HIGHLIGHT_LINE_STROKE_WIDTH,
+                                                },
                                             }}
                                             data={dataForSingleLine}
                                             events={this.mouseEvents}
                                             y={this.y}
-                                        />
+                                        />,
                                     ];
                                 } else {
                                     return null;
                                 }
                             })}
-                            <ScaleCapturer scaleCallback={this.scaleCallback}/>
-                            { this.renderData.grayPoints.length > 0 && (
+                            <ScaleCapturer scaleCallback={this.scaleCallback} />
+                            {this.renderData.grayPoints.length > 0 && (
                                 <VictoryScatter
                                     style={{
                                         data: {
-                                            stroke:"gray",
-                                            fill:"white",
-                                            strokeWidth:2
-                                        }
+                                            stroke: 'gray',
+                                            fill: 'white',
+                                            strokeWidth: 2,
+                                        },
                                     }}
                                     size={2.5}
                                     data={this.renderData.grayPoints}
@@ -587,14 +677,14 @@ export default class VAFLineChart extends React.Component<IVAFLineChartProps, {}
                                     y={this.y}
                                 />
                             )}
-                            { this.renderData.lineData.length > 0 && (
+                            {this.renderData.lineData.length > 0 && (
                                 <VictoryScatter
                                     style={{
                                         data: {
-                                            stroke:LINE_COLOR,
-                                            fill:"white",
-                                            strokeWidth:2
-                                        }
+                                            stroke: LINE_COLOR,
+                                            fill: 'white',
+                                            strokeWidth: 2,
+                                        },
                                     }}
                                     size={SCATTER_DATA_POINT_SIZE}
                                     data={_.flatten(this.renderData.lineData)}
@@ -603,30 +693,27 @@ export default class VAFLineChart extends React.Component<IVAFLineChartProps, {}
                                 />
                             )}
                         </VictoryChart>
-                        <Observer>
-                            {this.getHighlights}
-                        </Observer>
-                        <Observer>
-                            {this.getDragRect}
-                        </Observer>
+                        <Observer>{this.getHighlights}</Observer>
+                        <Observer>{this.getDragRect}</Observer>
                     </svg>
-                    <Observer>
-                        {this.getTooltipComponent}
-                    </Observer>
+                    <Observer>{this.getTooltipComponent}</Observer>
                 </>
             );
         } else {
             return (
-                <div style={{
-                    display:"flex",
-                    justifyContent:"center",
-                    alignItems:"center",
-                    height:this.svgHeight,
-                    width:"100%"
-                }}>
-                    No VAF data to show. Select mutations below or un-check the "{SHOW_ONLY_SELECTED_LABEL}" filter above.
+                <div
+                    style={{
+                        display: 'flex',
+                        justifyContent: 'center',
+                        alignItems: 'center',
+                        height: this.svgHeight,
+                        width: '100%',
+                    }}
+                >
+                    No VAF data to show. Select mutations below or un-check the
+                    "{SHOW_ONLY_SELECTED_LABEL}" filter above.
                 </div>
             );
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/patientView/mutation/VAFLineChartUtils.spec.ts b/src/pages/patientView/mutation/VAFLineChartUtils.spec.ts
index 2a131b51b8d..c7015860be0 100644
--- a/src/pages/patientView/mutation/VAFLineChartUtils.spec.ts
+++ b/src/pages/patientView/mutation/VAFLineChartUtils.spec.ts
@@ -1,527 +1,849 @@
-import {assert} from "chai";
-import {Mutation, Sample} from "../../../shared/api/generated/CBioPortalAPI";
-import {MutationStatus} from "./PatientViewMutationsTabUtils";
-import {generateMutationIdByGeneAndProteinChangeAndEvent} from "../../../shared/lib/StoreUtils";
-import {CoverageInformation} from "../../resultsView/ResultsViewPageStoreUtils";
-import {makeMutationHeatmapData} from "./oncoprint/MutationOncoprintUtils";
-import {MutationOncoprintMode} from "./oncoprint/MutationOncoprint";
-import {assertDeepEqualInAnyOrder} from "../../../shared/lib/SpecUtils";
-import {computeRenderData, IPoint} from "./VAFLineChartUtils";
-import _ from "lodash";
+import { assert } from 'chai';
+import { Mutation, Sample } from '../../../shared/api/generated/CBioPortalAPI';
+import { MutationStatus } from './PatientViewMutationsTabUtils';
+import { generateMutationIdByGeneAndProteinChangeAndEvent } from '../../../shared/lib/StoreUtils';
+import { CoverageInformation } from '../../resultsView/ResultsViewPageStoreUtils';
+import { makeMutationHeatmapData } from './oncoprint/MutationOncoprintUtils';
+import { MutationOncoprintMode } from './oncoprint/MutationOncoprint';
+import { assertDeepEqualInAnyOrder } from '../../../shared/lib/SpecUtils';
+import { computeRenderData, IPoint } from './VAFLineChartUtils';
+import _ from 'lodash';
 
-describe("VAFLineChartUtils", () => {
-    describe("computeRenderData", ()=>{
-        function roughlyDeepEqualPoints(actual:IPoint[], expected:IPoint[], message?:string) {
+describe('VAFLineChartUtils', () => {
+    describe('computeRenderData', () => {
+        function roughlyDeepEqualPoints(
+            actual: IPoint[],
+            expected: IPoint[],
+            message?: string
+        ) {
             // theres no other way to do this in chai
-            actual.forEach(d=>{
+            actual.forEach(d => {
                 d.y = d.y.toFixed(5) as any;
             });
-            expected.forEach(d=>{
+            expected.forEach(d => {
                 d.y = d.y.toFixed(5) as any;
             });
             assert.deepEqual(actual, expected, message);
         }
 
-        function checkResult(actual:{ grayPoints:IPoint[], lineData:IPoint[][]}, expected:{grayPoints:IPoint[], lineData:IPoint[][]}, messagePrefix?:string) {
+        function checkResult(
+            actual: { grayPoints: IPoint[]; lineData: IPoint[][] },
+            expected: { grayPoints: IPoint[]; lineData: IPoint[][] },
+            messagePrefix?: string
+        ) {
             // gray points in any order
-            roughlyDeepEqualPoints(actual.grayPoints, expected.grayPoints, `${messagePrefix||""}grayPoints`);
+            roughlyDeepEqualPoints(
+                actual.grayPoints,
+                expected.grayPoints,
+                `${messagePrefix || ''}grayPoints`
+            );
 
             // lines in any order, but the actual order of each line internally does matter
-            assert.equal(actual.lineData.length, expected.lineData.length, `${messagePrefix||""}lineData length`);
-            const mutationKeyToLineData = _.keyBy(actual.lineData, d=>generateMutationIdByGeneAndProteinChangeAndEvent(d[0].mutation));
+            assert.equal(
+                actual.lineData.length,
+                expected.lineData.length,
+                `${messagePrefix || ''}lineData length`
+            );
+            const mutationKeyToLineData = _.keyBy(actual.lineData, d =>
+                generateMutationIdByGeneAndProteinChangeAndEvent(d[0].mutation)
+            );
             for (const line of expected.lineData) {
-                const mutationKey = generateMutationIdByGeneAndProteinChangeAndEvent(line[0].mutation);
-                roughlyDeepEqualPoints(mutationKeyToLineData[mutationKey], line, `${messagePrefix||""}mutation with key ${mutationKey}`);
+                const mutationKey = generateMutationIdByGeneAndProteinChangeAndEvent(
+                    line[0].mutation
+                );
+                roughlyDeepEqualPoints(
+                    mutationKeyToLineData[mutationKey],
+                    line,
+                    `${messagePrefix || ''}mutation with key ${mutationKey}`
+                );
             }
         }
 
-        function makeSample(i:number) {
+        function makeSample(i: number) {
             return {
-                sampleId:`sample${i}`,
-                patientId:"patient",
-                uniqueSampleKey:`uniqueKey${i}`,
-                studyId:"study"
+                sampleId: `sample${i}`,
+                patientId: 'patient',
+                uniqueSampleKey: `uniqueKey${i}`,
+                studyId: 'study',
             } as Sample;
         }
 
-        function makeMutation(sampleI:number, hugoGeneSymbol:string, proteinChange:string, vafPercent?:number, mutationStatus:string="") {
+        function makeMutation(
+            sampleI: number,
+            hugoGeneSymbol: string,
+            proteinChange: string,
+            vafPercent?: number,
+            mutationStatus: string = ''
+        ) {
             return {
                 gene: {
-                    hugoGeneSymbol
+                    hugoGeneSymbol,
                 },
                 mutationStatus,
-                uniqueSampleKey:`uniqueKey${sampleI}`,
-                uniquePatientKey:`uniquePatientKey`,
-                sampleId:`sample${sampleI}`,
-                patientId:"patient",
-                studyId:"study",
+                uniqueSampleKey: `uniqueKey${sampleI}`,
+                uniquePatientKey: `uniquePatientKey`,
+                sampleId: `sample${sampleI}`,
+                patientId: 'patient',
+                studyId: 'study',
                 proteinChange,
-                chr: "1",
-                startPosition:0,
-                endPosition:0,
-                referenceAllele:"",
-                variantAllele:"",
+                chr: '1',
+                startPosition: 0,
+                endPosition: 0,
+                referenceAllele: '',
+                variantAllele: '',
                 tumorAltCount: vafPercent,
-                tumorRefCount:vafPercent === undefined ? undefined : 100-vafPercent,
-                molecularProfileId:"mutations"
+                tumorRefCount:
+                    vafPercent === undefined ? undefined : 100 - vafPercent,
+                molecularProfileId: 'mutations',
             } as Mutation;
         }
 
-        function makeCoverageInfo(profiledIs:number[], unprofiledIs:number[], unprofiledByGene:{ i:number, notProfiledByGene:any}[]=[]) {
-            const ret:CoverageInformation = { samples:{}, patients:{} };
+        function makeCoverageInfo(
+            profiledIs: number[],
+            unprofiledIs: number[],
+            unprofiledByGene: { i: number; notProfiledByGene: any }[] = []
+        ) {
+            const ret: CoverageInformation = { samples: {}, patients: {} };
             for (const i of profiledIs) {
                 ret.samples[`uniqueKey${i}`] = {
-                    byGene:{},
-                    allGenes:[{
-                        molecularProfileId:"mutations",
-                        patientId:"patient",
-                        profiled: true,
-                        sampleId:`sample${i}`,
-                        studyId:"study",
-                        uniquePatientKey:`uniquePatientKey`,
-                        uniqueSampleKey:`uniqueKey${i}`
-                    }],
-                    notProfiledByGene:{},
-                    notProfiledAllGenes:[]
+                    byGene: {},
+                    allGenes: [
+                        {
+                            molecularProfileId: 'mutations',
+                            patientId: 'patient',
+                            profiled: true,
+                            sampleId: `sample${i}`,
+                            studyId: 'study',
+                            uniquePatientKey: `uniquePatientKey`,
+                            uniqueSampleKey: `uniqueKey${i}`,
+                        },
+                    ],
+                    notProfiledByGene: {},
+                    notProfiledAllGenes: [],
                 };
             }
             for (const i of unprofiledIs) {
                 ret.samples[`uniqueKey${i}`] = {
-                    byGene:{},
-                    notProfiledAllGenes:[{
-                        molecularProfileId:"mutations",
-                        patientId:"patient",
-                        profiled: false,
-                        sampleId:`sample${i}`,
-                        studyId:"study",
-                        uniquePatientKey:`uniquePatientKey`,
-                        uniqueSampleKey:`uniqueKey${i}`
-                    }],
-                    notProfiledByGene:{},
-                    allGenes:[]
+                    byGene: {},
+                    notProfiledAllGenes: [
+                        {
+                            molecularProfileId: 'mutations',
+                            patientId: 'patient',
+                            profiled: false,
+                            sampleId: `sample${i}`,
+                            studyId: 'study',
+                            uniquePatientKey: `uniquePatientKey`,
+                            uniqueSampleKey: `uniqueKey${i}`,
+                        },
+                    ],
+                    notProfiledByGene: {},
+                    allGenes: [],
                 };
             }
             for (const obj of unprofiledByGene) {
                 ret.samples[`uniqueKey${obj.i}`] = {
-                    byGene:{},
-                    allGenes:[],
-                    notProfiledByGene:obj.notProfiledByGene,
-                    notProfiledAllGenes:[]
+                    byGene: {},
+                    allGenes: [],
+                    notProfiledByGene: obj.notProfiledByGene,
+                    notProfiledAllGenes: [],
                 };
             }
             return ret;
         }
 
-        const sampleIdIndex = {sample1:0, sample2:1, sample3:2};
+        const sampleIdIndex = { sample1: 0, sample2: 1, sample3: 2 };
 
-        it("handles case of empty data", ()=>{
+        it('handles case of empty data', () => {
             checkResult(
                 computeRenderData(
                     [makeSample(1), makeSample(2), makeSample(3)],
                     [],
                     sampleIdIndex,
-                    "mutations",
-                    makeCoverageInfo([1,2,3],[])
+                    'mutations',
+                    makeCoverageInfo([1, 2, 3], [])
                 ),
                 {
-                    grayPoints:[],
-                    lineData:[]
+                    grayPoints: [],
+                    lineData: [],
                 }
             );
         });
-        it("returns correct result when every sample has vaf data for every mutation", ()=>{
+        it('returns correct result when every sample has vaf data for every mutation', () => {
             checkResult(
                 computeRenderData(
                     [makeSample(1), makeSample(2), makeSample(3)],
                     [
-                        [ makeMutation(1, "gene1", "proteinchange1", 20),
-                            makeMutation(2, "gene1", "proteinchange1", 10),
-                            makeMutation(3, "gene1", "proteinchange1", 15) ],
+                        [
+                            makeMutation(1, 'gene1', 'proteinchange1', 20),
+                            makeMutation(2, 'gene1', 'proteinchange1', 10),
+                            makeMutation(3, 'gene1', 'proteinchange1', 15),
+                        ],
 
-                        [ makeMutation(1, "gene2", "proteinchange2", 30, "uncalled"),
-                            makeMutation(2, "gene2", "proteinchange2", 50),
-                            makeMutation(3, "gene2", "proteinchange2", 25) ],
+                        [
+                            makeMutation(
+                                1,
+                                'gene2',
+                                'proteinchange2',
+                                30,
+                                'uncalled'
+                            ),
+                            makeMutation(2, 'gene2', 'proteinchange2', 50),
+                            makeMutation(3, 'gene2', 'proteinchange2', 25),
+                        ],
 
-                        [ makeMutation(1, "gene3", "proteinchange3", 40) ,
-                            makeMutation(2, "gene3", "proteinchange3", 60) ,
-                            makeMutation(3, "gene3", "proteinchange3", 80) ]
+                        [
+                            makeMutation(1, 'gene3', 'proteinchange3', 40),
+                            makeMutation(2, 'gene3', 'proteinchange3', 60),
+                            makeMutation(3, 'gene3', 'proteinchange3', 80),
+                        ],
                     ],
                     sampleIdIndex,
-                    "mutations",
-                    makeCoverageInfo([1,2,3], [])
+                    'mutations',
+                    makeCoverageInfo([1, 2, 3], [])
                 ),
                 {
-                    grayPoints:[],
-                    lineData:[
+                    grayPoints: [],
+                    lineData: [
                         [
                             {
-                                sampleId:"sample1",
-                                mutation: makeMutation(1, "gene1", "proteinchange1", 20),
+                                sampleId: 'sample1',
+                                mutation: makeMutation(
+                                    1,
+                                    'gene1',
+                                    'proteinchange1',
+                                    20
+                                ),
                                 mutationStatus: MutationStatus.MUTATED_WITH_VAF,
-                                x: 0, y: 20/100
+                                x: 0,
+                                y: 20 / 100,
                             },
                             {
-                                sampleId:"sample2",
-                                mutation: makeMutation(2, "gene1", "proteinchange1", 10),
+                                sampleId: 'sample2',
+                                mutation: makeMutation(
+                                    2,
+                                    'gene1',
+                                    'proteinchange1',
+                                    10
+                                ),
                                 mutationStatus: MutationStatus.MUTATED_WITH_VAF,
-                                x: 1, y: 10/100
+                                x: 1,
+                                y: 10 / 100,
                             },
                             {
-                                sampleId:"sample3",
-                                mutation: makeMutation(3, "gene1", "proteinchange1", 15),
+                                sampleId: 'sample3',
+                                mutation: makeMutation(
+                                    3,
+                                    'gene1',
+                                    'proteinchange1',
+                                    15
+                                ),
                                 mutationStatus: MutationStatus.MUTATED_WITH_VAF,
-                                x: 2, y: 15/100
-                            }
+                                x: 2,
+                                y: 15 / 100,
+                            },
                         ],
                         [
                             {
-                                sampleId:"sample1",
-                                mutation: makeMutation(1, "gene2", "proteinchange2", 30, "uncalled"),
-                                mutationStatus: MutationStatus.PROFILED_WITH_READS_BUT_UNCALLED,
-                                x: 0, y: 30/100
+                                sampleId: 'sample1',
+                                mutation: makeMutation(
+                                    1,
+                                    'gene2',
+                                    'proteinchange2',
+                                    30,
+                                    'uncalled'
+                                ),
+                                mutationStatus:
+                                    MutationStatus.PROFILED_WITH_READS_BUT_UNCALLED,
+                                x: 0,
+                                y: 30 / 100,
                             },
                             {
-                                sampleId:"sample2",
-                                mutation: makeMutation(2, "gene2", "proteinchange2", 50),
+                                sampleId: 'sample2',
+                                mutation: makeMutation(
+                                    2,
+                                    'gene2',
+                                    'proteinchange2',
+                                    50
+                                ),
                                 mutationStatus: MutationStatus.MUTATED_WITH_VAF,
-                                x: 1, y: 50/100
+                                x: 1,
+                                y: 50 / 100,
                             },
                             {
-                                sampleId:"sample3",
-                                mutation: makeMutation(3, "gene2", "proteinchange2", 25),
+                                sampleId: 'sample3',
+                                mutation: makeMutation(
+                                    3,
+                                    'gene2',
+                                    'proteinchange2',
+                                    25
+                                ),
                                 mutationStatus: MutationStatus.MUTATED_WITH_VAF,
-                                x: 2, y: 25/100
-                            }
+                                x: 2,
+                                y: 25 / 100,
+                            },
                         ],
                         [
                             {
-                                sampleId:"sample1",
-                                mutation: makeMutation(1, "gene3", "proteinchange3", 40),
+                                sampleId: 'sample1',
+                                mutation: makeMutation(
+                                    1,
+                                    'gene3',
+                                    'proteinchange3',
+                                    40
+                                ),
                                 mutationStatus: MutationStatus.MUTATED_WITH_VAF,
-                                x: 0, y: 40/100
+                                x: 0,
+                                y: 40 / 100,
                             },
                             {
-                                sampleId:"sample2",
-                                mutation: makeMutation(2, "gene3", "proteinchange3", 60),
+                                sampleId: 'sample2',
+                                mutation: makeMutation(
+                                    2,
+                                    'gene3',
+                                    'proteinchange3',
+                                    60
+                                ),
                                 mutationStatus: MutationStatus.MUTATED_WITH_VAF,
-                                x: 1, y: 60/100
+                                x: 1,
+                                y: 60 / 100,
                             },
                             {
-                                sampleId:"sample3",
-                                mutation: makeMutation(3, "gene3", "proteinchange3", 80),
+                                sampleId: 'sample3',
+                                mutation: makeMutation(
+                                    3,
+                                    'gene3',
+                                    'proteinchange3',
+                                    80
+                                ),
                                 mutationStatus: MutationStatus.MUTATED_WITH_VAF,
-                                x: 2, y: 80/100
-                            }
-                        ]
-                    ]
+                                x: 2,
+                                y: 80 / 100,
+                            },
+                        ],
+                    ],
                 }
             );
         });
-        it("returns correct result when every sample has data for every mutation, but not all have VAF", ()=>{
+        it('returns correct result when every sample has data for every mutation, but not all have VAF', () => {
             checkResult(
                 computeRenderData(
                     [makeSample(1), makeSample(2), makeSample(3)],
                     [
-                        [ makeMutation(1, "gene1", "proteinchange1", 20),
-                            makeMutation(2, "gene1", "proteinchange1"),
-                            makeMutation(3, "gene1", "proteinchange1", 15) ],
+                        [
+                            makeMutation(1, 'gene1', 'proteinchange1', 20),
+                            makeMutation(2, 'gene1', 'proteinchange1'),
+                            makeMutation(3, 'gene1', 'proteinchange1', 15),
+                        ],
 
-                        [ makeMutation(1, "gene2", "proteinchange2", 30),
-                            makeMutation(2, "gene2", "proteinchange2", 50),
-                            makeMutation(3, "gene2", "proteinchange2") ],
+                        [
+                            makeMutation(1, 'gene2', 'proteinchange2', 30),
+                            makeMutation(2, 'gene2', 'proteinchange2', 50),
+                            makeMutation(3, 'gene2', 'proteinchange2'),
+                        ],
 
-                        [ makeMutation(1, "gene3", "proteinchange3", 40),
-                            makeMutation(2, "gene3", "proteinchange3"),
-                            makeMutation(3, "gene3", "proteinchange3", 80) ],
+                        [
+                            makeMutation(1, 'gene3', 'proteinchange3', 40),
+                            makeMutation(2, 'gene3', 'proteinchange3'),
+                            makeMutation(3, 'gene3', 'proteinchange3', 80),
+                        ],
                     ],
                     sampleIdIndex,
-                    "mutations",
-                    makeCoverageInfo([1,2,3], [])
+                    'mutations',
+                    makeCoverageInfo([1, 2, 3], [])
                 ),
                 {
-                    grayPoints:[
+                    grayPoints: [
                         {
-                            sampleId:"sample2",
-                            mutation: makeMutation(2, "gene1", "proteinchange1"),
+                            sampleId: 'sample2',
+                            mutation: makeMutation(
+                                2,
+                                'gene1',
+                                'proteinchange1'
+                            ),
                             mutationStatus: MutationStatus.MUTATED_BUT_NO_VAF,
-                            x: 1, y: 17.5/100
+                            x: 1,
+                            y: 17.5 / 100,
                         },
                         {
-                            sampleId:"sample2",
-                            mutation: makeMutation(2, "gene3", "proteinchange3"),
+                            sampleId: 'sample2',
+                            mutation: makeMutation(
+                                2,
+                                'gene3',
+                                'proteinchange3'
+                            ),
                             mutationStatus: MutationStatus.MUTATED_BUT_NO_VAF,
-                            x: 1, y: 60/100
-                        }
+                            x: 1,
+                            y: 60 / 100,
+                        },
                     ],
                     lineData: [
                         [
                             {
-                                sampleId:"sample1",
-                                mutation: makeMutation(1, "gene1", "proteinchange1", 20),
+                                sampleId: 'sample1',
+                                mutation: makeMutation(
+                                    1,
+                                    'gene1',
+                                    'proteinchange1',
+                                    20
+                                ),
                                 mutationStatus: MutationStatus.MUTATED_WITH_VAF,
-                                x: 0, y: 20/100
+                                x: 0,
+                                y: 20 / 100,
                             },
                             {
-                                sampleId:"sample3",
-                                mutation: makeMutation(3, "gene1", "proteinchange1", 15),
+                                sampleId: 'sample3',
+                                mutation: makeMutation(
+                                    3,
+                                    'gene1',
+                                    'proteinchange1',
+                                    15
+                                ),
                                 mutationStatus: MutationStatus.MUTATED_WITH_VAF,
-                                x: 2, y: 15/100
-                            }
+                                x: 2,
+                                y: 15 / 100,
+                            },
                         ],
                         [
                             {
-                                sampleId:"sample1",
-                                mutation: makeMutation(1, "gene2", "proteinchange2", 30),
+                                sampleId: 'sample1',
+                                mutation: makeMutation(
+                                    1,
+                                    'gene2',
+                                    'proteinchange2',
+                                    30
+                                ),
                                 mutationStatus: MutationStatus.MUTATED_WITH_VAF,
-                                x: 0, y: 30/100
+                                x: 0,
+                                y: 30 / 100,
                             },
                             {
-                                sampleId:"sample2",
-                                mutation: makeMutation(2, "gene2", "proteinchange2", 50),
+                                sampleId: 'sample2',
+                                mutation: makeMutation(
+                                    2,
+                                    'gene2',
+                                    'proteinchange2',
+                                    50
+                                ),
                                 mutationStatus: MutationStatus.MUTATED_WITH_VAF,
-                                x: 1, y: 50/100
-                            }
+                                x: 1,
+                                y: 50 / 100,
+                            },
                         ],
                         [
                             {
-                                sampleId:"sample1",
-                                mutation: makeMutation(1, "gene3", "proteinchange3", 40),
+                                sampleId: 'sample1',
+                                mutation: makeMutation(
+                                    1,
+                                    'gene3',
+                                    'proteinchange3',
+                                    40
+                                ),
                                 mutationStatus: MutationStatus.MUTATED_WITH_VAF,
-                                x: 0, y: 40/100
+                                x: 0,
+                                y: 40 / 100,
                             },
                             {
-                                sampleId:"sample3",
-                                mutation: makeMutation(3, "gene3", "proteinchange3", 80),
+                                sampleId: 'sample3',
+                                mutation: makeMutation(
+                                    3,
+                                    'gene3',
+                                    'proteinchange3',
+                                    80
+                                ),
                                 mutationStatus: MutationStatus.MUTATED_WITH_VAF,
-                                x: 2, y: 80/100
-                            }
-                        ]
-                    ]
+                                x: 2,
+                                y: 80 / 100,
+                            },
+                        ],
+                    ],
                 }
             );
         });
-        it("returns correct result when not every sample has data for every mutation", ()=>{
+        it('returns correct result when not every sample has data for every mutation', () => {
             checkResult(
                 computeRenderData(
                     [makeSample(1), makeSample(2), makeSample(3)],
                     [
-                        [ makeMutation(1, "gene1", "proteinchange1", 20),
-                            makeMutation(2, "gene1", "proteinchange1"),
-                            makeMutation(3, "gene1", "proteinchange1", 60) ],
+                        [
+                            makeMutation(1, 'gene1', 'proteinchange1', 20),
+                            makeMutation(2, 'gene1', 'proteinchange1'),
+                            makeMutation(3, 'gene1', 'proteinchange1', 60),
+                        ],
 
-                        [ makeMutation(2, "gene2", "proteinchange2", 50),
-                        makeMutation(3, "gene2", "proteinchange2") ],
+                        [
+                            makeMutation(2, 'gene2', 'proteinchange2', 50),
+                            makeMutation(3, 'gene2', 'proteinchange2'),
+                        ],
 
-                        [ makeMutation(1, "gene3", "proteinchange3", 40),
-                        makeMutation(2, "gene3", "proteinchange3") ],
+                        [
+                            makeMutation(1, 'gene3', 'proteinchange3', 40),
+                            makeMutation(2, 'gene3', 'proteinchange3'),
+                        ],
                     ],
                     sampleIdIndex,
-                    "mutations",
-                    makeCoverageInfo([1,2,3], []),
+                    'mutations',
+                    makeCoverageInfo([1, 2, 3], [])
                 ),
                 {
-                    grayPoints: [{
-                        sampleId:"sample2",
-                        mutation:makeMutation(2, "gene1", "proteinchange1"),
-                        mutationStatus:MutationStatus.MUTATED_BUT_NO_VAF,
-                        x:1, y:40/100
-                    }],
-                    lineData: [
-                        [{
-                            sampleId:"sample1",
-                            mutation:makeMutation(1, "gene1", "proteinchange1", 20),
-                            mutationStatus:MutationStatus.MUTATED_WITH_VAF,
-                            x:0, y:20/100
-                        },
+                    grayPoints: [
                         {
-                            sampleId:"sample3",
-                            mutation:makeMutation(3, "gene1", "proteinchange1", 60),
-                            mutationStatus:MutationStatus.MUTATED_WITH_VAF,
-                            x:2, y:60/100
-                        }],
-                        [{
-                            sampleId:"sample2",
-                            mutation:makeMutation(2, "gene2", "proteinchange2", 50),
-                            mutationStatus:MutationStatus.MUTATED_WITH_VAF,
-                            x:1, y:50/100
-                        }],
-                        [{
-                            sampleId:"sample1",
-                            mutation:makeMutation(1, "gene3", "proteinchange3", 40),
-                            mutationStatus:MutationStatus.MUTATED_WITH_VAF,
-                            x:0, y:40/100
-                        }]
-                    ]
+                            sampleId: 'sample2',
+                            mutation: makeMutation(
+                                2,
+                                'gene1',
+                                'proteinchange1'
+                            ),
+                            mutationStatus: MutationStatus.MUTATED_BUT_NO_VAF,
+                            x: 1,
+                            y: 40 / 100,
+                        },
+                    ],
+                    lineData: [
+                        [
+                            {
+                                sampleId: 'sample1',
+                                mutation: makeMutation(
+                                    1,
+                                    'gene1',
+                                    'proteinchange1',
+                                    20
+                                ),
+                                mutationStatus: MutationStatus.MUTATED_WITH_VAF,
+                                x: 0,
+                                y: 20 / 100,
+                            },
+                            {
+                                sampleId: 'sample3',
+                                mutation: makeMutation(
+                                    3,
+                                    'gene1',
+                                    'proteinchange1',
+                                    60
+                                ),
+                                mutationStatus: MutationStatus.MUTATED_WITH_VAF,
+                                x: 2,
+                                y: 60 / 100,
+                            },
+                        ],
+                        [
+                            {
+                                sampleId: 'sample2',
+                                mutation: makeMutation(
+                                    2,
+                                    'gene2',
+                                    'proteinchange2',
+                                    50
+                                ),
+                                mutationStatus: MutationStatus.MUTATED_WITH_VAF,
+                                x: 1,
+                                y: 50 / 100,
+                            },
+                        ],
+                        [
+                            {
+                                sampleId: 'sample1',
+                                mutation: makeMutation(
+                                    1,
+                                    'gene3',
+                                    'proteinchange3',
+                                    40
+                                ),
+                                mutationStatus: MutationStatus.MUTATED_WITH_VAF,
+                                x: 0,
+                                y: 40 / 100,
+                            },
+                        ],
+                    ],
                 }
             );
         });
-        it("returns correct result when one sample has no data for any mutation", ()=>{
+        it('returns correct result when one sample has no data for any mutation', () => {
             checkResult(
                 computeRenderData(
                     [makeSample(1), makeSample(2), makeSample(3)],
                     [
-                        [ makeMutation(1, "gene1", "proteinchange1", 20),
-                        makeMutation(3, "gene1", "proteinchange1") ],
+                        [
+                            makeMutation(1, 'gene1', 'proteinchange1', 20),
+                            makeMutation(3, 'gene1', 'proteinchange1'),
+                        ],
 
-                        [ makeMutation(3, "gene2", "proteinchange2", 50) ],
+                        [makeMutation(3, 'gene2', 'proteinchange2', 50)],
 
-                        [ makeMutation(1, "gene3", "proteinchange3", 40),
-                        makeMutation(3, "gene3", "proteinchange3", 65) ],
+                        [
+                            makeMutation(1, 'gene3', 'proteinchange3', 40),
+                            makeMutation(3, 'gene3', 'proteinchange3', 65),
+                        ],
                     ],
                     sampleIdIndex,
-                    "mutations",
-                    makeCoverageInfo([1,2,3], []),
+                    'mutations',
+                    makeCoverageInfo([1, 2, 3], [])
                 ),
                 {
-                    grayPoints:[],
-                    lineData:[
-                        [{
-                            sampleId:"sample1",
-                            mutation:makeMutation(1, "gene1", "proteinchange1", 20),
-                            mutationStatus:MutationStatus.MUTATED_WITH_VAF,
-                            x:0, y:20/100
-                        }],
-                        [{
-                            sampleId:"sample3",
-                            mutation:makeMutation(3, "gene2", "proteinchange2", 50),
-                            mutationStatus:MutationStatus.MUTATED_WITH_VAF,
-                            x:2, y:50/100
-                        }],
-                        [{
-                            sampleId:"sample1",
-                            mutation:makeMutation(1, "gene3", "proteinchange3", 40),
-                            mutationStatus:MutationStatus.MUTATED_WITH_VAF,
-                            x:0, y:40/100
-                        },{
-                            sampleId:"sample2",
-                            mutation:makeMutation(1, "gene3", "proteinchange3", 40),
-                            mutationStatus:MutationStatus.PROFILED_BUT_NOT_MUTATED,
-                            x:1, y:0
-                        },{
-                            sampleId:"sample3",
-                            mutation:makeMutation(3, "gene3", "proteinchange3", 65),
-                            mutationStatus:MutationStatus.MUTATED_WITH_VAF,
-                            x:2, y:65/100
-                        }]
-                    ]
+                    grayPoints: [],
+                    lineData: [
+                        [
+                            {
+                                sampleId: 'sample1',
+                                mutation: makeMutation(
+                                    1,
+                                    'gene1',
+                                    'proteinchange1',
+                                    20
+                                ),
+                                mutationStatus: MutationStatus.MUTATED_WITH_VAF,
+                                x: 0,
+                                y: 20 / 100,
+                            },
+                        ],
+                        [
+                            {
+                                sampleId: 'sample3',
+                                mutation: makeMutation(
+                                    3,
+                                    'gene2',
+                                    'proteinchange2',
+                                    50
+                                ),
+                                mutationStatus: MutationStatus.MUTATED_WITH_VAF,
+                                x: 2,
+                                y: 50 / 100,
+                            },
+                        ],
+                        [
+                            {
+                                sampleId: 'sample1',
+                                mutation: makeMutation(
+                                    1,
+                                    'gene3',
+                                    'proteinchange3',
+                                    40
+                                ),
+                                mutationStatus: MutationStatus.MUTATED_WITH_VAF,
+                                x: 0,
+                                y: 40 / 100,
+                            },
+                            {
+                                sampleId: 'sample2',
+                                mutation: makeMutation(
+                                    1,
+                                    'gene3',
+                                    'proteinchange3',
+                                    40
+                                ),
+                                mutationStatus:
+                                    MutationStatus.PROFILED_BUT_NOT_MUTATED,
+                                x: 1,
+                                y: 0,
+                            },
+                            {
+                                sampleId: 'sample3',
+                                mutation: makeMutation(
+                                    3,
+                                    'gene3',
+                                    'proteinchange3',
+                                    65
+                                ),
+                                mutationStatus: MutationStatus.MUTATED_WITH_VAF,
+                                x: 2,
+                                y: 65 / 100,
+                            },
+                        ],
+                    ],
                 }
             );
         });
-        it("returns correct result when some not profiled", ()=>{
+        it('returns correct result when some not profiled', () => {
             checkResult(
                 computeRenderData(
                     [makeSample(1), makeSample(2), makeSample(3)],
                     [
-                        [ makeMutation(1, "gene1", "proteinchange1", 20) ],
+                        [makeMutation(1, 'gene1', 'proteinchange1', 20)],
 
-                        [ makeMutation(1, "gene2", "proteinchange2", 20),
-                            makeMutation(3, "gene2", "proteinchange2", 30) ],
+                        [
+                            makeMutation(1, 'gene2', 'proteinchange2', 20),
+                            makeMutation(3, 'gene2', 'proteinchange2', 30),
+                        ],
 
-                        [ makeMutation(1, "gene3", "proteinchange3", 40),
-                            makeMutation(2, "gene3", "proteinchange3") ]
+                        [
+                            makeMutation(1, 'gene3', 'proteinchange3', 40),
+                            makeMutation(2, 'gene3', 'proteinchange3'),
+                        ],
                     ],
                     sampleIdIndex,
-                    "mutations",
-                    makeCoverageInfo([1,3], [], [{
-                        i:2,
-                        notProfiledByGene:{
-                            "gene1":{
-                                molecularProfileId:"mutations",
-                                patientId:"patient",
-                                profiled: false,
-                                sampleId:`sample2`,
-                                studyId:"study",
-                                uniquePatientKey:`uniquePatientKey`,
-                                uniqueSampleKey:`uniqueKey2`
-                            },
-                            "gene2":{
-                                molecularProfileId:"mutations",
-                                patientId:"patient",
-                                profiled: false,
-                                sampleId:`sample2`,
-                                studyId:"study",
-                                uniquePatientKey:`uniquePatientKey`,
-                                uniqueSampleKey:`uniqueKey2`
-                            }
-                        }
-                    }])
+                    'mutations',
+                    makeCoverageInfo(
+                        [1, 3],
+                        [],
+                        [
+                            {
+                                i: 2,
+                                notProfiledByGene: {
+                                    gene1: {
+                                        molecularProfileId: 'mutations',
+                                        patientId: 'patient',
+                                        profiled: false,
+                                        sampleId: `sample2`,
+                                        studyId: 'study',
+                                        uniquePatientKey: `uniquePatientKey`,
+                                        uniqueSampleKey: `uniqueKey2`,
+                                    },
+                                    gene2: {
+                                        molecularProfileId: 'mutations',
+                                        patientId: 'patient',
+                                        profiled: false,
+                                        sampleId: `sample2`,
+                                        studyId: 'study',
+                                        uniquePatientKey: `uniquePatientKey`,
+                                        uniqueSampleKey: `uniqueKey2`,
+                                    },
+                                },
+                            },
+                        ]
+                    )
                 ),
                 {
-                    grayPoints:[{
-                        sampleId:"sample2",
-                        mutation:makeMutation(1, "gene2", "proteinchange2", 20),
-                        mutationStatus:MutationStatus.NOT_PROFILED,
-                        x:1, y:25/100
-                    }],
-                    lineData:[
-                        [{
-                            sampleId:"sample1",
-                            mutation:makeMutation(1, "gene1", "proteinchange1", 20),
-                            mutationStatus:MutationStatus.MUTATED_WITH_VAF,
-                            x:0, y:20/100
-                        }],
-                        [{
-                            sampleId:"sample1",
-                            mutation:makeMutation(1, "gene2", "proteinchange2", 20),
-                            mutationStatus:MutationStatus.MUTATED_WITH_VAF,
-                            x:0, y:20/100
-                        },{
-                            sampleId:"sample3",
-                            mutation:makeMutation(3, "gene2", "proteinchange2", 30),
-                            mutationStatus:MutationStatus.MUTATED_WITH_VAF,
-                            x:2, y:30/100
-                        }],
-                        [{
-                            sampleId:"sample1",
-                            mutation:makeMutation(1, "gene3", "proteinchange3", 40),
-                            mutationStatus:MutationStatus.MUTATED_WITH_VAF,
-                            x:0, y:40/100
-                        }]
-                    ]
+                    grayPoints: [
+                        {
+                            sampleId: 'sample2',
+                            mutation: makeMutation(
+                                1,
+                                'gene2',
+                                'proteinchange2',
+                                20
+                            ),
+                            mutationStatus: MutationStatus.NOT_PROFILED,
+                            x: 1,
+                            y: 25 / 100,
+                        },
+                    ],
+                    lineData: [
+                        [
+                            {
+                                sampleId: 'sample1',
+                                mutation: makeMutation(
+                                    1,
+                                    'gene1',
+                                    'proteinchange1',
+                                    20
+                                ),
+                                mutationStatus: MutationStatus.MUTATED_WITH_VAF,
+                                x: 0,
+                                y: 20 / 100,
+                            },
+                        ],
+                        [
+                            {
+                                sampleId: 'sample1',
+                                mutation: makeMutation(
+                                    1,
+                                    'gene2',
+                                    'proteinchange2',
+                                    20
+                                ),
+                                mutationStatus: MutationStatus.MUTATED_WITH_VAF,
+                                x: 0,
+                                y: 20 / 100,
+                            },
+                            {
+                                sampleId: 'sample3',
+                                mutation: makeMutation(
+                                    3,
+                                    'gene2',
+                                    'proteinchange2',
+                                    30
+                                ),
+                                mutationStatus: MutationStatus.MUTATED_WITH_VAF,
+                                x: 2,
+                                y: 30 / 100,
+                            },
+                        ],
+                        [
+                            {
+                                sampleId: 'sample1',
+                                mutation: makeMutation(
+                                    1,
+                                    'gene3',
+                                    'proteinchange3',
+                                    40
+                                ),
+                                mutationStatus: MutationStatus.MUTATED_WITH_VAF,
+                                x: 0,
+                                y: 40 / 100,
+                            },
+                        ],
+                    ],
                 }
             );
         });
-        it("returns correct result when a sample is not profiled at all", ()=>{
+        it('returns correct result when a sample is not profiled at all', () => {
             checkResult(
                 computeRenderData(
                     [makeSample(1), makeSample(2), makeSample(3)],
                     [
-                        [ makeMutation(1, "gene1", "proteinchange1", 20),
-                            makeMutation(2, "gene1", "proteinchange1") ],
+                        [
+                            makeMutation(1, 'gene1', 'proteinchange1', 20),
+                            makeMutation(2, 'gene1', 'proteinchange1'),
+                        ],
 
-                        [ makeMutation(2, "gene2", "proteinchange2", 50) ],
+                        [makeMutation(2, 'gene2', 'proteinchange2', 50)],
 
-                        [ makeMutation(1, "gene3", "proteinchange3", 40),
-                            makeMutation(2, "gene3", "proteinchange3") ],
+                        [
+                            makeMutation(1, 'gene3', 'proteinchange3', 40),
+                            makeMutation(2, 'gene3', 'proteinchange3'),
+                        ],
                     ],
                     sampleIdIndex,
-                    "mutations",
-                    makeCoverageInfo([1,2], [3])
+                    'mutations',
+                    makeCoverageInfo([1, 2], [3])
                 ),
                 {
-                    grayPoints:[],
-                    lineData:[
-                        [{
-                            sampleId:"sample1",
-                            mutation:makeMutation(1, "gene1", "proteinchange1", 20),
-                            mutationStatus:MutationStatus.MUTATED_WITH_VAF,
-                            x:0, y:20/100
-                        }],
-                        [{
-                            sampleId:"sample2",
-                            mutation:makeMutation(2, "gene2", "proteinchange2", 50),
-                            mutationStatus:MutationStatus.MUTATED_WITH_VAF,
-                            x:1, y:50/100
-                        }],
-                        [{
-                            sampleId:"sample1",
-                            mutation:makeMutation(1, "gene3", "proteinchange3", 40),
-                            mutationStatus:MutationStatus.MUTATED_WITH_VAF,
-                            x:0, y:40/100
-                        }]
-                    ]
+                    grayPoints: [],
+                    lineData: [
+                        [
+                            {
+                                sampleId: 'sample1',
+                                mutation: makeMutation(
+                                    1,
+                                    'gene1',
+                                    'proteinchange1',
+                                    20
+                                ),
+                                mutationStatus: MutationStatus.MUTATED_WITH_VAF,
+                                x: 0,
+                                y: 20 / 100,
+                            },
+                        ],
+                        [
+                            {
+                                sampleId: 'sample2',
+                                mutation: makeMutation(
+                                    2,
+                                    'gene2',
+                                    'proteinchange2',
+                                    50
+                                ),
+                                mutationStatus: MutationStatus.MUTATED_WITH_VAF,
+                                x: 1,
+                                y: 50 / 100,
+                            },
+                        ],
+                        [
+                            {
+                                sampleId: 'sample1',
+                                mutation: makeMutation(
+                                    1,
+                                    'gene3',
+                                    'proteinchange3',
+                                    40
+                                ),
+                                mutationStatus: MutationStatus.MUTATED_WITH_VAF,
+                                x: 0,
+                                y: 40 / 100,
+                            },
+                        ],
+                    ],
                 }
             );
         });
     });
-});
\ No newline at end of file
+});
diff --git a/src/pages/patientView/mutation/VAFLineChartUtils.ts b/src/pages/patientView/mutation/VAFLineChartUtils.ts
index b7bef41bad4..cc3b3f43cbd 100644
--- a/src/pages/patientView/mutation/VAFLineChartUtils.ts
+++ b/src/pages/patientView/mutation/VAFLineChartUtils.ts
@@ -1,41 +1,42 @@
-import {getVariantAlleleFrequency} from "../../../shared/lib/MutationUtils";
-import {MutationStatus} from "./PatientViewMutationsTabUtils";
-import {isSampleProfiled} from "../../../shared/lib/isSampleProfiled";
-import _ from "lodash";
-import {Mutation, Sample} from "../../../shared/api/generated/CBioPortalAPI";
-import {CoverageInformation} from "../../resultsView/ResultsViewPageStoreUtils";
+import { getVariantAlleleFrequency } from '../../../shared/lib/MutationUtils';
+import { MutationStatus } from './PatientViewMutationsTabUtils';
+import { isSampleProfiled } from '../../../shared/lib/isSampleProfiled';
+import _ from 'lodash';
+import { Mutation, Sample } from '../../../shared/api/generated/CBioPortalAPI';
+import { CoverageInformation } from '../../resultsView/ResultsViewPageStoreUtils';
 
 export interface IPoint {
-    x:number,
-    y:number,
-    sampleId:string,
-    mutation:Mutation;
-    mutationStatus:MutationStatus
+    x: number;
+    y: number;
+    sampleId: string;
+    mutation: Mutation;
+    mutationStatus: MutationStatus;
 }
 
-function isPointBasedOnRealVAF(d:{ mutationStatus: MutationStatus }) {
-    return d.mutationStatus === MutationStatus.MUTATED_WITH_VAF ||
-        d.mutationStatus === MutationStatus.PROFILED_WITH_READS_BUT_UNCALLED;
+function isPointBasedOnRealVAF(d: { mutationStatus: MutationStatus }) {
+    return (
+        d.mutationStatus === MutationStatus.MUTATED_WITH_VAF ||
+        d.mutationStatus === MutationStatus.PROFILED_WITH_READS_BUT_UNCALLED
+    );
 }
 
 export function computeRenderData(
-    samples:Sample[],
-    mutations:Mutation[][],
-    sampleIdIndex:{[sampleId:string]:number},
-    mutationProfileId:string,
-    coverageInformation:CoverageInformation
+    samples: Sample[],
+    mutations: Mutation[][],
+    sampleIdIndex: { [sampleId: string]: number },
+    mutationProfileId: string,
+    coverageInformation: CoverageInformation
 ) {
-
-    const grayPoints:IPoint[] = []; // points that are purely interpolated for rendering, dont have data of their own
-    const lineData:IPoint[][] = [];
+    const grayPoints: IPoint[] = []; // points that are purely interpolated for rendering, dont have data of their own
+    const lineData: IPoint[][] = [];
 
     for (const mergedMutation of mutations) {
         // determine data points in line for this mutation
 
         // first add data points for each mutation
-        let thisLineData:Partial<IPoint>[] = [];
+        let thisLineData: Partial<IPoint>[] = [];
         // keep track of which samples have mutations
-        const samplesWithData:{[uniqueSampleKey:string]:boolean} = {};
+        const samplesWithData: { [uniqueSampleKey: string]: boolean } = {};
         for (const mutation of mergedMutation) {
             const sampleKey = mutation.uniqueSampleKey;
             const sampleId = mutation.sampleId;
@@ -43,7 +44,7 @@ export function computeRenderData(
             if (vaf !== null) {
                 // has VAF data
 
-                if (mutation.mutationStatus.toLowerCase() === "uncalled") {
+                if (mutation.mutationStatus.toLowerCase() === 'uncalled') {
                     if (mutation.tumorAltCount > 0) {
                         // add point for uncalled mutation with supporting reads
                         thisLineData.push({
@@ -51,7 +52,8 @@ export function computeRenderData(
                             y: vaf,
                             sampleId,
                             mutation,
-                            mutationStatus: MutationStatus.PROFILED_WITH_READS_BUT_UNCALLED
+                            mutationStatus:
+                                MutationStatus.PROFILED_WITH_READS_BUT_UNCALLED,
                         });
                         samplesWithData[sampleKey] = true;
                     }
@@ -62,7 +64,7 @@ export function computeRenderData(
                         y: vaf,
                         sampleId,
                         mutation,
-                        mutationStatus: MutationStatus.MUTATED_WITH_VAF
+                        mutationStatus: MutationStatus.MUTATED_WITH_VAF,
                     });
                     samplesWithData[sampleKey] = true;
                 }
@@ -70,7 +72,8 @@ export function computeRenderData(
                 // no VAF data - add point which will be extrapolated
                 thisLineData.push({
                     x: sampleIdIndex[sampleId],
-                    sampleId, mutation,
+                    sampleId,
+                    mutation,
                     mutationStatus: MutationStatus.MUTATED_BUT_NO_VAF,
                 });
                 samplesWithData[sampleKey] = true;
@@ -81,36 +84,48 @@ export function computeRenderData(
         // add data points for samples without mutations
         for (const sample of samples) {
             if (!(sample.uniqueSampleKey in samplesWithData)) {
-                if (!isSampleProfiled(
-                    sample.uniqueSampleKey,
-                    mutationProfileId,
-                    mutation.gene.hugoGeneSymbol,
-                    coverageInformation
-                )) {
+                if (
+                    !isSampleProfiled(
+                        sample.uniqueSampleKey,
+                        mutationProfileId,
+                        mutation.gene.hugoGeneSymbol,
+                        coverageInformation
+                    )
+                ) {
                     // not profiled
                     thisLineData.push({
                         x: sampleIdIndex[sample.sampleId],
-                        sampleId: sample.sampleId, mutation,
+                        sampleId: sample.sampleId,
+                        mutation,
                         mutationStatus: MutationStatus.NOT_PROFILED,
                     });
                 } else {
                     thisLineData.push({
                         x: sampleIdIndex[sample.sampleId],
                         y: 0,
-                        sampleId: sample.sampleId, mutation,
+                        sampleId: sample.sampleId,
+                        mutation,
                         mutationStatus: MutationStatus.PROFILED_BUT_NOT_MUTATED,
                     });
                 }
             }
         }
         // sort by sample order
-        thisLineData = _.sortBy(thisLineData, d=>d.x);
+        thisLineData = _.sortBy(thisLineData, d => d.x);
         // interpolate missing y values
         // take out anything from the left and right that dont have data - we'll only interpolate points with data to their left and right
-        while (thisLineData.length > 0 && !isPointBasedOnRealVAF(thisLineData[0] as IPoint)) {
+        while (
+            thisLineData.length > 0 &&
+            !isPointBasedOnRealVAF(thisLineData[0] as IPoint)
+        ) {
             thisLineData.shift();
         }
-        while (thisLineData.length > 0 && !isPointBasedOnRealVAF(thisLineData[thisLineData.length-1] as IPoint)) {
+        while (
+            thisLineData.length > 0 &&
+            !isPointBasedOnRealVAF(thisLineData[
+                thisLineData.length - 1
+            ] as IPoint)
+        ) {
             thisLineData.pop();
         }
         if (thisLineData.length === 0) {
@@ -118,24 +133,36 @@ export function computeRenderData(
             continue;
         }
         // interpolate, and pull out interpolated points into gray points array
-        const thisLineDataWithoutGrayPoints:IPoint[] = [];
-        const thisGrayPoints:IPoint[] = [];
-        for (let i=0; i<thisLineData.length; i++) {
-            if (i !== 0 && i !== thisLineData.length-1 && thisLineData[i].y === undefined) {
+        const thisLineDataWithoutGrayPoints: IPoint[] = [];
+        const thisGrayPoints: IPoint[] = [];
+        for (let i = 0; i < thisLineData.length; i++) {
+            if (
+                i !== 0 &&
+                i !== thisLineData.length - 1 &&
+                thisLineData[i].y === undefined
+            ) {
                 // find closest defined data to the left and right
-                let leftIndex = 0, rightIndex = 0;
-                for (leftIndex=i; leftIndex>=0; leftIndex--) {
+                let leftIndex = 0,
+                    rightIndex = 0;
+                for (leftIndex = i; leftIndex >= 0; leftIndex--) {
                     if (thisLineData[leftIndex].y !== undefined) {
                         break;
                     }
                 }
-                for (rightIndex=i; rightIndex<=thisLineData.length-1; rightIndex++) {
+                for (
+                    rightIndex = i;
+                    rightIndex <= thisLineData.length - 1;
+                    rightIndex++
+                ) {
                     if (thisLineData[rightIndex].y !== undefined) {
                         break;
                     }
                 }
-                const step = 1/(rightIndex - leftIndex);
-                thisLineData[i].y = (i-leftIndex)*step*(thisLineData[leftIndex].y! + thisLineData[rightIndex].y!);
+                const step = 1 / (rightIndex - leftIndex);
+                thisLineData[i].y =
+                    (i - leftIndex) *
+                    step *
+                    (thisLineData[leftIndex].y! + thisLineData[rightIndex].y!);
                 // add to grayPoints
                 thisGrayPoints.push(thisLineData[i] as IPoint);
             } else {
@@ -151,4 +178,4 @@ export function computeRenderData(
         lineData,
         grayPoints,
     };
-}
\ No newline at end of file
+}
diff --git a/src/pages/patientView/mutation/column/AlleleFreqColumnFormatter.spec.tsx b/src/pages/patientView/mutation/column/AlleleFreqColumnFormatter.spec.tsx
index e1d0a91d03f..a913f7cfaa8 100644
--- a/src/pages/patientView/mutation/column/AlleleFreqColumnFormatter.spec.tsx
+++ b/src/pages/patientView/mutation/column/AlleleFreqColumnFormatter.spec.tsx
@@ -1,64 +1,83 @@
 import AlleleFreqColumnFormatter from './AlleleFreqColumnFormatter';
-import {initMutation} from "test/MutationMockUtils";
-import {Mutation} from "shared/api/generated/CBioPortalAPI";
-import {MOLECULAR_PROFILE_UNCALLED_MUTATIONS_SUFFIX, MOLECULAR_PROFILE_MUTATIONS_SUFFIX} from '../../../../shared/constants';
+import { initMutation } from 'test/MutationMockUtils';
+import { Mutation } from 'shared/api/generated/CBioPortalAPI';
+import {
+    MOLECULAR_PROFILE_UNCALLED_MUTATIONS_SUFFIX,
+    MOLECULAR_PROFILE_MUTATIONS_SUFFIX,
+} from '../../../../shared/constants';
 import React from 'react';
 import { assert } from 'chai';
 import { shallow, mount } from 'enzyme';
 import sinon from 'sinon';
 
 describe('AlleleFreqColumnFormatter', () => {
+    before(() => {});
 
-    before(()=> {
+    after(() => {});
 
-    });
-
-    after(()=> {
-
-    });
-
-    it('uncalled mutations component w/o reads should have 0 opacity', ()=> {
+    it('uncalled mutations component w/o reads should have 0 opacity', () => {
         const uncalledMutationWithoutSupport = {
-            molecularProfileId:`study_${MOLECULAR_PROFILE_UNCALLED_MUTATIONS_SUFFIX}`,
-            tumorAltCount:0,
-            tumorRefCount:10
+            molecularProfileId: `study_${MOLECULAR_PROFILE_UNCALLED_MUTATIONS_SUFFIX}`,
+            tumorAltCount: 0,
+            tumorRefCount: 10,
         };
-        const res = AlleleFreqColumnFormatter.getComponentForSampleArgs(uncalledMutationWithoutSupport);
+        const res = AlleleFreqColumnFormatter.getComponentForSampleArgs(
+            uncalledMutationWithoutSupport
+        );
         assert(res.opacity === 0);
     });
-    it('uncalled mutations component w supporting reads should have >0 and <1 opacity', ()=> {
+    it('uncalled mutations component w supporting reads should have >0 and <1 opacity', () => {
         const uncalledMutationWithSupport = {
-            molecularProfileId:`study_${MOLECULAR_PROFILE_UNCALLED_MUTATIONS_SUFFIX}`,
-            tumorAltCount:1,
-            tumorRefCount:10
+            molecularProfileId: `study_${MOLECULAR_PROFILE_UNCALLED_MUTATIONS_SUFFIX}`,
+            tumorAltCount: 1,
+            tumorRefCount: 10,
         };
-        const res = AlleleFreqColumnFormatter.getComponentForSampleArgs(uncalledMutationWithSupport);
+        const res = AlleleFreqColumnFormatter.getComponentForSampleArgs(
+            uncalledMutationWithSupport
+        );
         assert(res.opacity > 0 && res.opacity < 1);
     });
-    it('called mutations component w supporting reads should have 1 opacity', ()=> {
+    it('called mutations component w supporting reads should have 1 opacity', () => {
         const calledMutation = {
-            molecularProfileId:`study_${MOLECULAR_PROFILE_MUTATIONS_SUFFIX}`,
-            tumorAltCount:1,
-            tumorRefCount:10
+            molecularProfileId: `study_${MOLECULAR_PROFILE_MUTATIONS_SUFFIX}`,
+            tumorAltCount: 1,
+            tumorRefCount: 10,
         };
-        const res = AlleleFreqColumnFormatter.getComponentForSampleArgs(calledMutation);
+        const res = AlleleFreqColumnFormatter.getComponentForSampleArgs(
+            calledMutation
+        );
         assert(res.opacity === 1);
     });
-    it('sampleElement should have the text (uncalled)', ()=> {
+    it('sampleElement should have the text (uncalled)', () => {
         const uncalledMutationWithSupport = {
-            sampleId:'1',
-            molecularProfileId:`study_${MOLECULAR_PROFILE_UNCALLED_MUTATIONS_SUFFIX}`,
-            tumorAltCount:1,
-            tumorRefCount:10
+            sampleId: '1',
+            molecularProfileId: `study_${MOLECULAR_PROFILE_UNCALLED_MUTATIONS_SUFFIX}`,
+            tumorAltCount: 1,
+            tumorRefCount: 10,
         };
-        const res = AlleleFreqColumnFormatter.convertMutationToSampleElement(uncalledMutationWithSupport, 'red', 5, {});
-        assert(res && mount(res.text).text().indexOf('(uncalled)') !== -1);
+        const res = AlleleFreqColumnFormatter.convertMutationToSampleElement(
+            uncalledMutationWithSupport,
+            'red',
+            5,
+            {}
+        );
+        assert(
+            res &&
+                mount(res.text)
+                    .text()
+                    .indexOf('(uncalled)') !== -1
+        );
     });
-    it('calculates the Allele frequency for a mutation', ()=> {
-        const mutation:Mutation[] = [initMutation({
-            tumorAltCount:1,
-            tumorRefCount:10
-        })];
-        assert.equal(AlleleFreqColumnFormatter.getFrequency(mutation), "0.09090909090909091");
+    it('calculates the Allele frequency for a mutation', () => {
+        const mutation: Mutation[] = [
+            initMutation({
+                tumorAltCount: 1,
+                tumorRefCount: 10,
+            }),
+        ];
+        assert.equal(
+            AlleleFreqColumnFormatter.getFrequency(mutation),
+            '0.09090909090909091'
+        );
     });
 });
diff --git a/src/pages/patientView/mutation/column/AlleleFreqColumnFormatter.tsx b/src/pages/patientView/mutation/column/AlleleFreqColumnFormatter.tsx
index 00af0bb6df1..58d9ddb92c7 100644
--- a/src/pages/patientView/mutation/column/AlleleFreqColumnFormatter.tsx
+++ b/src/pages/patientView/mutation/column/AlleleFreqColumnFormatter.tsx
@@ -1,19 +1,24 @@
 import * as React from 'react';
 import * as _ from 'lodash';
-import {DefaultTooltip} from "cbioportal-frontend-commons";
+import { DefaultTooltip } from 'cbioportal-frontend-commons';
 import 'rc-tooltip/assets/bootstrap_white.css';
-import {Mutation} from "shared/api/generated/CBioPortalAPI";
-import SampleManager from "../../SampleManager";
-import {isUncalled} from 'shared/lib/MutationUtils';
-import {getFormattedFrequencyValue} from "shared/components/mutationTable/column/TumorAlleleFreqColumnFormatter";
+import { Mutation } from 'shared/api/generated/CBioPortalAPI';
+import SampleManager from '../../SampleManager';
+import { isUncalled } from 'shared/lib/MutationUtils';
+import { getFormattedFrequencyValue } from 'shared/components/mutationTable/column/TumorAlleleFreqColumnFormatter';
 
 export default class AlleleFreqColumnFormatter {
     static barWidth = 6;
     static barSpacing = 3;
     static maxBarHeight = 12;
-    static indexToBarLeft = (n:number) => n*(AlleleFreqColumnFormatter.barWidth + AlleleFreqColumnFormatter.barSpacing);
+    static indexToBarLeft = (n: number) =>
+        n *
+        (AlleleFreqColumnFormatter.barWidth +
+            AlleleFreqColumnFormatter.barSpacing);
 
-    public static getComponentForSampleArgs<T extends {tumorAltCount:number,molecularProfileId:string}>(mutation:T) {
+    public static getComponentForSampleArgs<
+        T extends { tumorAltCount: number; molecularProfileId: string }
+    >(mutation: T) {
         const altReads = mutation.tumorAltCount;
 
         let opacity: number = 1;
@@ -21,75 +26,142 @@ export default class AlleleFreqColumnFormatter {
         if (isUncalled(mutation.molecularProfileId)) {
             if (altReads > 0) {
                 opacity = 0.1;
-                extraTooltipText = "Mutation has supporting reads, but wasn't called";
+                extraTooltipText =
+                    "Mutation has supporting reads, but wasn't called";
             } else {
                 opacity = 0;
-                extraTooltipText = "Mutation has 0 supporting reads and wasn't called";
+                extraTooltipText =
+                    "Mutation has 0 supporting reads and wasn't called";
             }
         }
         return {
-           opacity,
-           extraTooltipText
+            opacity,
+            extraTooltipText,
         };
     }
 
-    public static convertMutationToSampleElement<T extends {sampleId:string, tumorRefCount:number, tumorAltCount:number, molecularProfileId:string}>(mutation:T, color:string, barX:number, sampleComponent:any) {
-            const altReads = mutation.tumorAltCount;
-            const refReads = mutation.tumorRefCount;
-            if ((altReads < 0) || (refReads < 0)) {
-                return null;
-            }
-            const freq = altReads / (altReads + refReads);
-            const barHeight = (isNaN(freq) ? 0 : freq)*AlleleFreqColumnFormatter.maxBarHeight;
-            const barY = AlleleFreqColumnFormatter.maxBarHeight - barHeight;
-
+    public static convertMutationToSampleElement<
+        T extends {
+            sampleId: string;
+            tumorRefCount: number;
+            tumorAltCount: number;
+            molecularProfileId: string;
+        }
+    >(mutation: T, color: string, barX: number, sampleComponent: any) {
+        const altReads = mutation.tumorAltCount;
+        const refReads = mutation.tumorRefCount;
+        if (altReads < 0 || refReads < 0) {
+            return null;
+        }
+        const freq = altReads / (altReads + refReads);
+        const barHeight =
+            (isNaN(freq) ? 0 : freq) * AlleleFreqColumnFormatter.maxBarHeight;
+        const barY = AlleleFreqColumnFormatter.maxBarHeight - barHeight;
 
-            const bar = (<rect x={barX} y={barY} width={AlleleFreqColumnFormatter.barWidth} height={barHeight} fill={color}/>);
+        const bar = (
+            <rect
+                x={barX}
+                y={barY}
+                width={AlleleFreqColumnFormatter.barWidth}
+                height={barHeight}
+                fill={color}
+            />
+        );
 
-            const variantReadText:string = `${isUncalled(mutation.molecularProfileId)? "(uncalled) " : ""}(${altReads} variant reads out of ${altReads+refReads} total)`;
+        const variantReadText: string = `${
+            isUncalled(mutation.molecularProfileId) ? '(uncalled) ' : ''
+        }(${altReads} variant reads out of ${altReads + refReads} total)`;
 
-            const text = (<span>
-                    <strong>{getFormattedFrequencyValue(freq)}</strong> {variantReadText}
-                </span>);
-            return {
-                sampleId:mutation.sampleId, bar, component:sampleComponent, text, freq
-            };
+        const text = (
+            <span>
+                <strong>{getFormattedFrequencyValue(freq)}</strong>{' '}
+                {variantReadText}
+            </span>
+        );
+        return {
+            sampleId: mutation.sampleId,
+            bar,
+            component: sampleComponent,
+            text,
+            freq,
+        };
     }
 
-    public static renderFunction(mutations:Mutation[], sampleManager:SampleManager|null) {
+    public static renderFunction(
+        mutations: Mutation[],
+        sampleManager: SampleManager | null
+    ) {
         if (!sampleManager) {
-            return (<span></span>);
+            return <span></span>;
         }
 
         const sampleOrder = sampleManager.getSampleIdsInOrder();
-        const barX = sampleOrder.reduce((map, sampleId:string, i:number) => {map[sampleId] = AlleleFreqColumnFormatter.indexToBarLeft(i); return map;}, {} as {[s:string]:number});
-        const sampleElements = mutations.map((m:Mutation) => {
+        const barX = sampleOrder.reduce(
+            (map, sampleId: string, i: number) => {
+                map[sampleId] = AlleleFreqColumnFormatter.indexToBarLeft(i);
+                return map;
+            },
+            {} as { [s: string]: number }
+        );
+        const sampleElements = mutations.map((m: Mutation) => {
             const args = AlleleFreqColumnFormatter.getComponentForSampleArgs(m);
             return AlleleFreqColumnFormatter.convertMutationToSampleElement(
                 m,
                 sampleManager.getColorForSample(m.sampleId),
                 barX[m.sampleId],
-                sampleManager.getComponentForSample(m.sampleId, args.opacity, args.extraTooltipText)
+                sampleManager.getComponentForSample(
+                    m.sampleId,
+                    args.opacity,
+                    args.extraTooltipText
+                )
             );
         });
-        const sampleToElements = sampleElements.reduce((map, elements:any) => {if (elements) { map[elements.sampleId] = elements } return map; }, {} as {[s:string]:any});
-        const elementsInSampleOrder = sampleOrder.map((sampleId:string) => sampleToElements[sampleId]).filter((x:any) => !!x);
-        const tooltipLines = elementsInSampleOrder.map((elements:any)=>(<span key={elements.sampleId}>{elements.component}  {elements.text}<br/></span>));
-        const freqs = sampleOrder.map((sampleId:string) => (sampleToElements[sampleId] && sampleToElements[sampleId].freq) || undefined);
-        const bars = elementsInSampleOrder.map((elements:any)=>elements.bar);
+        const sampleToElements = sampleElements.reduce(
+            (map, elements: any) => {
+                if (elements) {
+                    map[elements.sampleId] = elements;
+                }
+                return map;
+            },
+            {} as { [s: string]: any }
+        );
+        const elementsInSampleOrder = sampleOrder
+            .map((sampleId: string) => sampleToElements[sampleId])
+            .filter((x: any) => !!x);
+        const tooltipLines = elementsInSampleOrder.map((elements: any) => (
+            <span key={elements.sampleId}>
+                {elements.component} {elements.text}
+                <br />
+            </span>
+        ));
+        const freqs = sampleOrder.map(
+            (sampleId: string) =>
+                (sampleToElements[sampleId] &&
+                    sampleToElements[sampleId].freq) ||
+                undefined
+        );
+        const bars = elementsInSampleOrder.map((elements: any) => elements.bar);
 
-        let content:JSX.Element = <span />;
+        let content: JSX.Element = <span />;
 
         // single sample: just show the number
         if (sampleManager.samples.length === 1) {
-            content = <span>{ (!isNaN(freqs[0]) ? getFormattedFrequencyValue(freqs[0]) : '') }</span>;
+            content = (
+                <span>
+                    {!isNaN(freqs[0])
+                        ? getFormattedFrequencyValue(freqs[0])
+                        : ''}
+                </span>
+            );
         }
         // multiple samples: show a graphical component
         // (if no tooltip info available do not update content)
         else if (tooltipLines.length > 0) {
             content = (
                 <svg
-                    width={AlleleFreqColumnFormatter.getSVGWidth(sampleOrder.length)}
+                    width={AlleleFreqColumnFormatter.getSVGWidth(
+                        sampleOrder.length
+                    )}
                     height={AlleleFreqColumnFormatter.maxBarHeight}
                 >
                     {bars}
@@ -98,14 +170,16 @@ export default class AlleleFreqColumnFormatter {
         }
 
         // as long as we have tooltip lines, show tooltip in either cases (single or multiple)
-        if (tooltipLines.length > 0 && freqs.filter((freq) => freq !== undefined).length > 0)
-        {
+        if (
+            tooltipLines.length > 0 &&
+            freqs.filter(freq => freq !== undefined).length > 0
+        ) {
             const overlay = () => <span>{tooltipLines}</span>;
             content = (
                 <DefaultTooltip
                     placement="left"
                     overlay={overlay}
-                    arrowContent={<div className="rc-tooltip-arrow-inner"/>}
+                    arrowContent={<div className="rc-tooltip-arrow-inner" />}
                     destroyTooltipOnHide={true}
                 >
                     {content}
@@ -116,30 +190,48 @@ export default class AlleleFreqColumnFormatter {
         return content;
     }
 
-    public static getSVGWidth(numSamples:number) {
-        return numSamples*AlleleFreqColumnFormatter.barWidth + (numSamples-1)*AlleleFreqColumnFormatter.barSpacing
+    public static getSVGWidth(numSamples: number) {
+        return (
+            numSamples * AlleleFreqColumnFormatter.barWidth +
+            (numSamples - 1) * AlleleFreqColumnFormatter.barSpacing
+        );
     }
 
-    public static getSortValue(d:Mutation[], sampleManager:SampleManager|null) {
+    public static getSortValue(
+        d: Mutation[],
+        sampleManager: SampleManager | null
+    ) {
         if (!sampleManager) {
             return [null];
         }
 
         // frequencies in sample order
-        const sampleToMutation = d.reduce((map:{[s:string]:Mutation}, next:Mutation)=>{
-            map[next.sampleId] = next;
-            return map;
-        }, {} as {[s:string]:Mutation});
-        return sampleManager.getSampleIdsInOrder().map(sampleId=>sampleToMutation[sampleId]).map(mutation=>
-            AlleleFreqColumnFormatter.calcFrequency(mutation) || null
+        const sampleToMutation = d.reduce(
+            (map: { [s: string]: Mutation }, next: Mutation) => {
+                map[next.sampleId] = next;
+                return map;
+            },
+            {} as { [s: string]: Mutation }
         );
+        return sampleManager
+            .getSampleIdsInOrder()
+            .map(sampleId => sampleToMutation[sampleId])
+            .map(
+                mutation =>
+                    AlleleFreqColumnFormatter.calcFrequency(mutation) || null
+            );
     }
 
-    public static isVisible(sampleManager:SampleManager|null, allMutations?: Mutation[][]): boolean {
-
+    public static isVisible(
+        sampleManager: SampleManager | null,
+        allMutations?: Mutation[][]
+    ): boolean {
         if (allMutations) {
             for (const rowMutations of allMutations) {
-                const frequency = this.getSortValue(rowMutations, sampleManager);
+                const frequency = this.getSortValue(
+                    rowMutations,
+                    sampleManager
+                );
                 // if there is at least one valid (non-falsey) value, it should be visible
                 if (_.compact(frequency).length > 0) {
                     return true;
@@ -150,14 +242,15 @@ export default class AlleleFreqColumnFormatter {
         return false;
     }
 
-
-    public static getFrequency(data:Mutation[]): string|string[] {
+    public static getFrequency(data: Mutation[]): string | string[] {
         const result: string[] = [];
 
         if (data) {
             for (const mutation of data) {
-                const frequency = AlleleFreqColumnFormatter.calcFrequency(mutation);
-                const value = frequency === null ? "" : String(frequency);
+                const frequency = AlleleFreqColumnFormatter.calcFrequency(
+                    mutation
+                );
+                const value = frequency === null ? '' : String(frequency);
 
                 result.push(value);
             }
@@ -170,8 +263,7 @@ export default class AlleleFreqColumnFormatter {
         return result;
     }
 
-    protected static calcFrequency(mutation: Mutation): number|null
-    {
+    protected static calcFrequency(mutation: Mutation): number | null {
         if (!mutation) {
             return null;
         }
@@ -179,10 +271,10 @@ export default class AlleleFreqColumnFormatter {
         const altReads = mutation.tumorAltCount;
         const refReads = mutation.tumorRefCount;
 
-        if ((altReads < 0) || (refReads < 0)) {
+        if (altReads < 0 || refReads < 0) {
             return null;
         }
 
-        return (altReads / (altReads + refReads));
+        return altReads / (altReads + refReads);
     }
 }
diff --git a/src/pages/patientView/mutation/column/TumorColumnFormatter.spec.tsx b/src/pages/patientView/mutation/column/TumorColumnFormatter.spec.tsx
index 455e734b243..ef356e48526 100644
--- a/src/pages/patientView/mutation/column/TumorColumnFormatter.spec.tsx
+++ b/src/pages/patientView/mutation/column/TumorColumnFormatter.spec.tsx
@@ -1,95 +1,110 @@
 import TumorColumnFormatter from './TumorColumnFormatter';
 import { assert } from 'chai';
-import {MOLECULAR_PROFILE_MUTATIONS_SUFFIX, MOLECULAR_PROFILE_UNCALLED_MUTATIONS_SUFFIX} from '../../../../shared/constants';
+import {
+    MOLECULAR_PROFILE_MUTATIONS_SUFFIX,
+    MOLECULAR_PROFILE_UNCALLED_MUTATIONS_SUFFIX,
+} from '../../../../shared/constants';
 import { ClinicalDataBySampleId } from 'shared/api/api-types-extended';
 import { GenePanelIdSpecialValue } from 'shared/lib/StoreUtils';
 
 describe('TumorColumnFormatter', () => {
     let testData = [
-        {sampleId:'A',
-            molecularProfileId:MOLECULAR_PROFILE_MUTATIONS_SUFFIX
+        {
+            sampleId: 'A',
+            molecularProfileId: MOLECULAR_PROFILE_MUTATIONS_SUFFIX,
         },
-        {sampleId:'B',
-            molecularProfileId:MOLECULAR_PROFILE_UNCALLED_MUTATIONS_SUFFIX,
+        {
+            sampleId: 'B',
+            molecularProfileId: MOLECULAR_PROFILE_UNCALLED_MUTATIONS_SUFFIX,
             tumorAltCount: 0,
         },
-        {sampleId:'C',
-            molecularProfileId:MOLECULAR_PROFILE_UNCALLED_MUTATIONS_SUFFIX,
+        {
+            sampleId: 'C',
+            molecularProfileId: MOLECULAR_PROFILE_UNCALLED_MUTATIONS_SUFFIX,
             tumorAltCount: 5,
         },
     ];
 
-    before(()=>{
+    before(() => {});
 
-    });
-
-    after(()=>{
-
-    });
+    after(() => {});
 
-    it('test get present samples', ()=>{
+    it('test get present samples', () => {
         let presentSamples = TumorColumnFormatter.getPresentSamples(testData);
-        assert(presentSamples['A'], "sample A is present and is called");
-        assert(!('B' in presentSamples), "sample B mutation is not present because it has 0 supporting reads");
-        assert(presentSamples['C'] === false, "sample C mutation is present and is uncalled with > 0 supporting reads");
+        assert(presentSamples['A'], 'sample A is present and is called');
+        assert(
+            !('B' in presentSamples),
+            'sample B mutation is not present because it has 0 supporting reads'
+        );
+        assert(
+            presentSamples['C'] === false,
+            'sample C mutation is present and is uncalled with > 0 supporting reads'
+        );
     });
 
-    it('test get sample ids', ()=>{
-        assert.deepEqual(TumorColumnFormatter.getSample(testData), ["A", "B", "C"]);
+    it('test get sample ids', () => {
+        assert.deepEqual(TumorColumnFormatter.getSample(testData), [
+            'A',
+            'B',
+            'C',
+        ]);
     });
 
     describe('getProfiledSamplesForGene', () => {
-
         const sampleToGenePanelId = {
             sampleA: 'panel1',
             sampleB: 'panel2',
             sampleC: GenePanelIdSpecialValue.UNKNOWN,
             sampleD: GenePanelIdSpecialValue.WHOLE_EXOME_SEQ,
-            sampleE: GenePanelIdSpecialValue.WHOLE_GENOME_SEQ
-        } as {[sampleId: string]: string|undefined};
+            sampleE: GenePanelIdSpecialValue.WHOLE_GENOME_SEQ,
+        } as { [sampleId: string]: string | undefined };
 
         const genePanelIdToGene = {
             panel1: [1, 2, 3],
             panel2: [3, 4, 5],
-        } as {[genePanelId: string]: number[]};
+        } as { [genePanelId: string]: number[] };
 
         it('excludes samples where gene-of-interest is not in gene panel', () => {
             const entrezId = 1;
-            const sampleIds = [
-                'sampleA',
-                'sampleB'
-            ];
-            const profiledSamples = TumorColumnFormatter.getProfiledSamplesForGene(entrezId, sampleIds, sampleToGenePanelId, genePanelIdToGene);
+            const sampleIds = ['sampleA', 'sampleB'];
+            const profiledSamples = TumorColumnFormatter.getProfiledSamplesForGene(
+                entrezId,
+                sampleIds,
+                sampleToGenePanelId,
+                genePanelIdToGene
+            );
             const correct = {
                 sampleA: true,
-                sampleB: false
+                sampleB: false,
             };
             assert.deepEqual(profiledSamples, correct);
         });
 
         it('includes samples where gene-of-interest is analyzed with different gene panels', () => {
             const entrezId = 3;
-            const sampleIds = [
-                'sampleA',
-                'sampleB'
-            ];
-            const profiledSamples = TumorColumnFormatter.getProfiledSamplesForGene(entrezId, sampleIds, sampleToGenePanelId, genePanelIdToGene);
+            const sampleIds = ['sampleA', 'sampleB'];
+            const profiledSamples = TumorColumnFormatter.getProfiledSamplesForGene(
+                entrezId,
+                sampleIds,
+                sampleToGenePanelId,
+                genePanelIdToGene
+            );
             const correct = {
                 sampleA: true,
-                sampleB: true
+                sampleB: true,
             };
             assert.deepEqual(profiledSamples, correct);
         });
 
         it('always includes samples that were whole genome/exome profiled', () => {
             const entrezId = 1;
-            const sampleIds = [
-                'sampleA',
-                'sampleC',
-                'sampleD',
-                'sampleE'
-            ];
-            const profiledSamples = TumorColumnFormatter.getProfiledSamplesForGene(entrezId, sampleIds, sampleToGenePanelId, genePanelIdToGene);
+            const sampleIds = ['sampleA', 'sampleC', 'sampleD', 'sampleE'];
+            const profiledSamples = TumorColumnFormatter.getProfiledSamplesForGene(
+                entrezId,
+                sampleIds,
+                sampleToGenePanelId,
+                genePanelIdToGene
+            );
             const correct = {
                 sampleA: true,
                 sampleC: true,
@@ -99,5 +114,4 @@ describe('TumorColumnFormatter', () => {
             assert.deepEqual(profiledSamples, correct);
         });
     });
-
 });
diff --git a/src/pages/patientView/mutation/column/TumorColumnFormatter.tsx b/src/pages/patientView/mutation/column/TumorColumnFormatter.tsx
index 2b5a1b757d7..7bc9afff0b4 100644
--- a/src/pages/patientView/mutation/column/TumorColumnFormatter.tsx
+++ b/src/pages/patientView/mutation/column/TumorColumnFormatter.tsx
@@ -1,152 +1,203 @@
 import * as React from 'react';
 import 'rc-tooltip/assets/bootstrap_white.css';
-import SampleManager from "../../SampleManager";
-import {isUncalled} from 'shared/lib/MutationUtils';
+import SampleManager from '../../SampleManager';
+import { isUncalled } from 'shared/lib/MutationUtils';
 import _ from 'lodash';
 import { ClinicalDataBySampleId } from 'shared/api/api-types-extended';
-import { noGenePanelUsed } from "shared/lib/StoreUtils";
+import { noGenePanelUsed } from 'shared/lib/StoreUtils';
 import SampleInline from 'pages/patientView/patientHeader/SampleInline';
 import SampleLabelNotProfiled from 'shared/components/sampleLabel/SampleLabelNotProfiled';
 
 export default class TumorColumnFormatter {
-    
-
-    public static renderFunction<T extends {sampleId:string,
-                                            entrezGeneId:number}>(
-                                            mutations:T[],
-                                            sampleManager:SampleManager|null,
-                                            sampleToGenePanelId:{[sampleId: string]: string|undefined},
-                                            genePanelIdToGene:{[genePanelId: string]: number[]},
-                                            onSelectGenePanel?:(name:string)=>void,
-                                            disableTooltip?:boolean) {
-        
+    public static renderFunction<
+        T extends { sampleId: string; entrezGeneId: number }
+    >(
+        mutations: T[],
+        sampleManager: SampleManager | null,
+        sampleToGenePanelId: { [sampleId: string]: string | undefined },
+        genePanelIdToGene: { [genePanelId: string]: number[] },
+        onSelectGenePanel?: (name: string) => void,
+        disableTooltip?: boolean
+    ) {
         if (!sampleManager) {
-            return (<span></span>);
+            return <span></span>;
         }
-        
+
         // Rules for icon:
-        // - when sample->gene has mutation (present in _mutatedSamples_) show the `sample` icon 
+        // - when sample->gene has mutation (present in _mutatedSamples_) show the `sample` icon
         // - when sample->gene has no mutation (absent from _mutatedSamples_) and was profiled, show `no mutation` icon
         // - when sample->gene has no mutation (absent from _mutatedSamples_) and was not profiled, show `not profiled` icon
-        const samples =  sampleManager.samples;
-        const sampleIds = _.map(samples, (sample:ClinicalDataBySampleId) => sample.id);
+        const samples = sampleManager.samples;
+        const sampleIds = _.map(
+            samples,
+            (sample: ClinicalDataBySampleId) => sample.id
+        );
         const entrezGeneId = mutations[0].entrezGeneId;
-        const mutatedSamples = TumorColumnFormatter.getPresentSamples(mutations);
-        const profiledSamples = TumorColumnFormatter.getProfiledSamplesForGene(entrezGeneId, sampleIds, sampleToGenePanelId, genePanelIdToGene);
-        const notProfiledText = 'This gene was not profiled for this sample (absent from gene panel)';
+        const mutatedSamples = TumorColumnFormatter.getPresentSamples(
+            mutations
+        );
+        const profiledSamples = TumorColumnFormatter.getProfiledSamplesForGene(
+            entrezGeneId,
+            sampleIds,
+            sampleToGenePanelId,
+            genePanelIdToGene
+        );
+        const notProfiledText =
+            'This gene was not profiled for this sample (absent from gene panel)';
 
-        const tdValue = samples.map((sample:any) => {
-                // hide labels for non-existent mutation data
-                // decreased opacity for uncalled mutations
-                // show not-profiled icon when gene was not analyzed
-                const isMutated = sample.id in mutatedSamples;
-                const isProfiled = sample.id in profiledSamples && profiledSamples[sample.id];
+        const tdValue = samples.map((sample: any) => {
+            // hide labels for non-existent mutation data
+            // decreased opacity for uncalled mutations
+            // show not-profiled icon when gene was not analyzed
+            const isMutated = sample.id in mutatedSamples;
+            const isProfiled =
+                sample.id in profiledSamples && profiledSamples[sample.id];
 
-                let extraTooltipText = '';
+            let extraTooltipText = '';
 
-                // mutations can be read which are not part of the target of the gene panel
-                // therefore a sample can still have mutations even if the gene was not profiled
-                if (isMutated) {
-                    if(!mutatedSamples[sample.id]) {
-                        extraTooltipText = "Mutation has supporting reads, but wasn't called. ";
-                    }
-                    if (!isProfiled) {
-                        extraTooltipText = `${extraTooltipText}${notProfiledText}`;
-                    }
+            // mutations can be read which are not part of the target of the gene panel
+            // therefore a sample can still have mutations even if the gene was not profiled
+            if (isMutated) {
+                if (!mutatedSamples[sample.id]) {
+                    extraTooltipText =
+                        "Mutation has supporting reads, but wasn't called. ";
                 }
-                else {
-                    if (!isProfiled) {
-                        extraTooltipText = `${notProfiledText}. It is unknown whether it is mutated.`
-                    }
+                if (!isProfiled) {
+                    extraTooltipText = `${extraTooltipText}${notProfiledText}`;
+                }
+            } else {
+                if (!isProfiled) {
+                    extraTooltipText = `${notProfiledText}. It is unknown whether it is mutated.`;
                 }
+            }
 
-                return (
-                    <li className={isProfiled && !isMutated? 'invisible' : ''}>
-                        {isMutated?
-                            sampleManager.getComponentForSample( 
-                                sample.id,
-                                (mutatedSamples[sample.id]) ? 1 : 0.1,
-                                extraTooltipText,
-                                null,
-                                onSelectGenePanel,
-                                disableTooltip
-                            )
-                            :
-                            <SampleInline
+            return (
+                <li className={isProfiled && !isMutated ? 'invisible' : ''}>
+                    {isMutated ? (
+                        sampleManager.getComponentForSample(
+                            sample.id,
+                            mutatedSamples[sample.id] ? 1 : 0.1,
+                            extraTooltipText,
+                            null,
+                            onSelectGenePanel,
+                            disableTooltip
+                        )
+                    ) : (
+                        <SampleInline
+                            sample={sample}
+                            extraTooltipText={extraTooltipText}
+                            onSelectGenePanel={onSelectGenePanel}
+                            disableTooltip={disableTooltip}
+                        >
+                            <SampleLabelNotProfiled
                                 sample={sample}
-                                extraTooltipText={extraTooltipText}
                                 onSelectGenePanel={onSelectGenePanel}
-                                disableTooltip={disableTooltip} >
-                                <SampleLabelNotProfiled
-                                    sample={sample}
-                                    onSelectGenePanel={onSelectGenePanel}
-                                    disableTooltip={disableTooltip}
-                                />
-                            </SampleInline>
-                        }
-                    </li>
-                );
+                                disableTooltip={disableTooltip}
+                            />
+                        </SampleInline>
+                    )}
+                </li>
+            );
         });
 
         return (
-                <div style={{position:'relative'}} data-test="samples-cell">
-                    <ul  style={{marginBottom:0}} className="list-inline list-unstyled">{ tdValue }</ul>
-                </div>
+            <div style={{ position: 'relative' }} data-test="samples-cell">
+                <ul
+                    style={{ marginBottom: 0 }}
+                    className="list-inline list-unstyled"
+                >
+                    {tdValue}
+                </ul>
+            </div>
         );
-    };
+    }
 
-    public static getSortValue<T extends {sampleId:string}>(d:T[], sampleManager:SampleManager|null) {
+    public static getSortValue<T extends { sampleId: string }>(
+        d: T[],
+        sampleManager: SampleManager | null
+    ) {
         if (!sampleManager) {
             return [];
         } else {
             const presentSamples = TumorColumnFormatter.getPresentSamples(d);
             const ret = [];
             // First, we sort by the number of present and called samples
-            ret.push(Object.keys(presentSamples).filter((s) => presentSamples[s]).length);
+            ret.push(
+                Object.keys(presentSamples).filter(s => presentSamples[s])
+                    .length
+            );
             // Then, we sort by the particular ones present
             for (const sampleId of sampleManager.getSampleIdsInOrder()) {
-                ret.push(+(!!presentSamples[sampleId]));
+                ret.push(+!!presentSamples[sampleId]);
             }
             return ret;
         }
     }
 
-    public static getPresentSamples<T extends {sampleId:string, tumorAltCount?: number, molecularProfileId?: string}>(data:T[]) {
-        return data.reduce((map, next:T, currentIndex:number) => {
-            // Indicate called mutations with true,
-            // uncalled mutations with supporting reads as false
-            // exclude uncalled mutations without supporting reads completely
-            if (next.molecularProfileId && isUncalled(next.molecularProfileId)) {
-                if (next.tumorAltCount && next.tumorAltCount > 0) {
-                    map[next.sampleId] = false;
+    public static getPresentSamples<
+        T extends {
+            sampleId: string;
+            tumorAltCount?: number;
+            molecularProfileId?: string;
+        }
+    >(data: T[]) {
+        return data.reduce(
+            (map, next: T, currentIndex: number) => {
+                // Indicate called mutations with true,
+                // uncalled mutations with supporting reads as false
+                // exclude uncalled mutations without supporting reads completely
+                if (
+                    next.molecularProfileId &&
+                    isUncalled(next.molecularProfileId)
+                ) {
+                    if (next.tumorAltCount && next.tumorAltCount > 0) {
+                        map[next.sampleId] = false;
+                    }
+                } else {
+                    map[next.sampleId] = true;
                 }
-            } else {
-                map[next.sampleId] = true;
-            }
-            return map;
-        }, {} as {[s:string]:boolean});
+                return map;
+            },
+            {} as { [s: string]: boolean }
+        );
     }
 
-    public static getProfiledSamplesForGene(entrezGeneId:number, sampleIds:string[], sampleToGenePanelId:{[sampleId: string]: string|undefined}, genePanelIdToEntrezGeneIds:{[genePanelId: string]: number[]}) {
+    public static getProfiledSamplesForGene(
+        entrezGeneId: number,
+        sampleIds: string[],
+        sampleToGenePanelId: { [sampleId: string]: string | undefined },
+        genePanelIdToEntrezGeneIds: { [genePanelId: string]: number[] }
+    ) {
         // For a given gene indicate whether it was profiled in a particular sample
-        return sampleIds.reduce((sampleIsProfiled, nextSampleId, currentIndex:number) => {
-            const genePanelId = sampleToGenePanelId[nextSampleId];
-            
-            const wholeGenome = noGenePanelUsed(genePanelId);
-            const isInGenePanel = !wholeGenome && !!genePanelId && genePanelId in genePanelIdToEntrezGeneIds && genePanelIdToEntrezGeneIds[genePanelId].includes(entrezGeneId);
+        return sampleIds.reduce(
+            (sampleIsProfiled, nextSampleId, currentIndex: number) => {
+                const genePanelId = sampleToGenePanelId[nextSampleId];
+
+                const wholeGenome = noGenePanelUsed(genePanelId);
+                const isInGenePanel =
+                    !wholeGenome &&
+                    !!genePanelId &&
+                    genePanelId in genePanelIdToEntrezGeneIds &&
+                    genePanelIdToEntrezGeneIds[genePanelId].includes(
+                        entrezGeneId
+                    );
 
-            sampleIsProfiled[nextSampleId] = wholeGenome || isInGenePanel;
-            
-            return sampleIsProfiled;
-        }, {} as {[s:string]:boolean});
+                sampleIsProfiled[nextSampleId] = wholeGenome || isInGenePanel;
+
+                return sampleIsProfiled;
+            },
+            {} as { [s: string]: boolean }
+        );
     }
 
-    public static getSample(data:Array<{sampleId:string}>): string|string[] {
-        let result: string[] =[];
+    public static getSample(
+        data: Array<{ sampleId: string }>
+    ): string | string[] {
+        let result: string[] = [];
         if (data) {
-            data.forEach((datum:{sampleId:string}) => {
+            data.forEach((datum: { sampleId: string }) => {
                 result.push(datum.sampleId);
-            })
+            });
         }
         if (result.length == 1) {
             return result[0];
diff --git a/src/pages/patientView/mutation/oncoprint/MutationOncoprint.tsx b/src/pages/patientView/mutation/oncoprint/MutationOncoprint.tsx
index a802f887710..4dd6859f41d 100644
--- a/src/pages/patientView/mutation/oncoprint/MutationOncoprint.tsx
+++ b/src/pages/patientView/mutation/oncoprint/MutationOncoprint.tsx
@@ -1,73 +1,87 @@
-import * as React from "react";
-import {observer} from "mobx-react";
-import Oncoprint, {IOncoprintProps} from "../../../../shared/components/oncoprint/Oncoprint";
-import {MakeMobxView} from "../../../../shared/components/MobxView";
-import {PatientViewPageStore} from "../../clinicalInformation/PatientViewPageStore";
-import $ from "jquery";
+import * as React from 'react';
+import { observer } from 'mobx-react';
+import Oncoprint, {
+    IOncoprintProps,
+} from '../../../../shared/components/oncoprint/Oncoprint';
+import { MakeMobxView } from '../../../../shared/components/MobxView';
+import { PatientViewPageStore } from '../../clinicalInformation/PatientViewPageStore';
+import $ from 'jquery';
 import {
     getDownloadData,
     getMutationLabel,
     IMutationOncoprintTrackDatum,
     IMutationOncoprintTrackSpec,
     makeMutationHeatmapData,
-    MUTATION_ONCOPRINT_NA_SHAPES
-} from "./MutationOncoprintUtils";
-import LoadingIndicator from "../../../../shared/components/loadingIndicator/LoadingIndicator";
-import ErrorMessage from "../../../../shared/components/ErrorMessage";
-import {computed, IReactionDisposer, observable, reaction} from "mobx";
-import OncoprintJS, {ColumnId, ColumnLabel, InitParams, TrackId} from "oncoprintjs";
-import autobind from "autobind-decorator";
-import {DefaultTooltip, DownloadControls, remoteData} from "cbioportal-frontend-commons";
-import _ from "lodash";
-import SampleManager from "../../SampleManager";
-import WindowStore from "../../../../shared/components/window/WindowStore";
-import {generateMutationIdByGeneAndProteinChangeAndEvent} from "../../../../shared/lib/StoreUtils";
-import LabeledCheckbox from "../../../../shared/components/labeledCheckbox/LabeledCheckbox";
-import {mutationTooltip} from "../PatientViewMutationsTabUtils";
-import Slider from "react-rangeslider";
-import "react-rangeslider/lib/index.css";
-import styles from "./styles.module.scss";
-import PatientViewMutationsDataStore from "../PatientViewMutationsDataStore";
-import {Mutation} from "../../../../shared/api/generated/CBioPortalAPI";
-import ReactDOM from "react-dom";
+    MUTATION_ONCOPRINT_NA_SHAPES,
+} from './MutationOncoprintUtils';
+import LoadingIndicator from '../../../../shared/components/loadingIndicator/LoadingIndicator';
+import ErrorMessage from '../../../../shared/components/ErrorMessage';
+import { computed, IReactionDisposer, observable, reaction } from 'mobx';
+import OncoprintJS, {
+    ColumnId,
+    ColumnLabel,
+    InitParams,
+    TrackId,
+} from 'oncoprintjs';
+import autobind from 'autobind-decorator';
+import {
+    DefaultTooltip,
+    DownloadControls,
+    remoteData,
+} from 'cbioportal-frontend-commons';
+import _ from 'lodash';
+import SampleManager from '../../SampleManager';
+import WindowStore from '../../../../shared/components/window/WindowStore';
+import { generateMutationIdByGeneAndProteinChangeAndEvent } from '../../../../shared/lib/StoreUtils';
+import LabeledCheckbox from '../../../../shared/components/labeledCheckbox/LabeledCheckbox';
+import { mutationTooltip } from '../PatientViewMutationsTabUtils';
+import Slider from 'react-rangeslider';
+import 'react-rangeslider/lib/index.css';
+import styles from './styles.module.scss';
+import PatientViewMutationsDataStore from '../PatientViewMutationsDataStore';
+import { Mutation } from '../../../../shared/api/generated/CBioPortalAPI';
+import ReactDOM from 'react-dom';
 import Timeout = NodeJS.Timeout;
 
 export interface IMutationOncoprintProps {
-    store:PatientViewPageStore;
-    dataStore:PatientViewMutationsDataStore;
-    sampleManager:SampleManager|null;
+    store: PatientViewPageStore;
+    dataStore: PatientViewMutationsDataStore;
+    sampleManager: SampleManager | null;
 }
 
 export enum MutationOncoprintMode {
     MUTATION_TRACKS,
-    SAMPLE_TRACKS
+    SAMPLE_TRACKS,
 }
 
 const TRACK_GROUP_INDEX = 2;
-const INIT_PARAMS:InitParams = {
-    init_cell_width:20,
-    init_cell_padding:1,
-    cell_padding_off_cell_width_threshold:10
+const INIT_PARAMS: InitParams = {
+    init_cell_width: 20,
+    init_cell_padding: 1,
+    cell_padding_off_cell_width_threshold: 10,
 };
 
 @observer
-export default class MutationOncoprint extends React.Component<IMutationOncoprintProps, {}> {
-
-    private oncoprint:OncoprintJS|null = null;
-    private oncoprintComponent:Oncoprint|null = null;
+export default class MutationOncoprint extends React.Component<
+    IMutationOncoprintProps,
+    {}
+> {
+    private oncoprint: OncoprintJS | null = null;
+    private oncoprintComponent: Oncoprint | null = null;
     @observable private showMutationLabels = true;
     @observable private horzZoomSliderState = 100;
     @observable clustered = true;
-    @observable private mode:MutationOncoprintMode = MutationOncoprintMode.SAMPLE_TRACKS;
+    @observable private mode: MutationOncoprintMode =
+        MutationOncoprintMode.SAMPLE_TRACKS;
     @observable minZoom = 0;
 
-    private minZoomUpdater:Timeout;
+    private minZoomUpdater: Timeout;
 
-    constructor(props:IMutationOncoprintProps) {
+    constructor(props: IMutationOncoprintProps) {
         super(props);
 
         (window as any).mutationOncoprint = this;
-        this.minZoomUpdater = setInterval(()=>{
+        this.minZoomUpdater = setInterval(() => {
             if (this.oncoprint) {
                 this.minZoom = this.oncoprint.model.getMinHorzZoom();
             }
@@ -79,74 +93,96 @@ export default class MutationOncoprint extends React.Component<IMutationOncoprin
     }
 
     @autobind
-    private oncoprintComponentRef(oncoprint:Oncoprint|null) {
+    private oncoprintComponentRef(oncoprint: Oncoprint | null) {
         this.oncoprintComponent = oncoprint;
     }
 
     @autobind
-    private oncoprintRef(oncoprint:OncoprintJS) {
+    private oncoprintRef(oncoprint: OncoprintJS) {
         this.oncoprint = oncoprint;
-        this.oncoprint.onHorzZoom(z=>(this.horzZoomSliderState = z));
+        this.oncoprint.onHorzZoom(z => (this.horzZoomSliderState = z));
         this.horzZoomSliderState = this.oncoprint.getHorzZoom();
-        this.oncoprint.onCellMouseOver((uid:string|null, track_id?:TrackId)=>{
-            if (this.mode === MutationOncoprintMode.SAMPLE_TRACKS && uid !== null) {
-                const mutation = this.mutationKeyToMutation[uid];
-                if (mutation) {
-                    this.props.dataStore.setMouseOverMutation(mutation);
-                }
-            } else if (this.mode === MutationOncoprintMode.MUTATION_TRACKS && track_id !== undefined) {
-                // set mouseover mutation based on track
-                if (this.oncoprintComponent) {
-                    const key = this.oncoprintComponent.getTrackSpecKey(track_id);
-                    const mutation = key && this.mutationKeyToMutation[key];
+        this.oncoprint.onCellMouseOver(
+            (uid: string | null, track_id?: TrackId) => {
+                if (
+                    this.mode === MutationOncoprintMode.SAMPLE_TRACKS &&
+                    uid !== null
+                ) {
+                    const mutation = this.mutationKeyToMutation[uid];
                     if (mutation) {
                         this.props.dataStore.setMouseOverMutation(mutation);
                     }
+                } else if (
+                    this.mode === MutationOncoprintMode.MUTATION_TRACKS &&
+                    track_id !== undefined
+                ) {
+                    // set mouseover mutation based on track
+                    if (this.oncoprintComponent) {
+                        const key = this.oncoprintComponent.getTrackSpecKey(
+                            track_id
+                        );
+                        const mutation = key && this.mutationKeyToMutation[key];
+                        if (mutation) {
+                            this.props.dataStore.setMouseOverMutation(mutation);
+                        }
+                    }
+                } else {
+                    this.props.dataStore.setMouseOverMutation(null);
                 }
-            } else {
-                this.props.dataStore.setMouseOverMutation(null);
             }
-        });
-        this.oncoprint.onCellClick((uid:ColumnId|null, track_id?:TrackId)=>{
-            if (this.mode === MutationOncoprintMode.SAMPLE_TRACKS && uid!== null) {
-                const mutation = this.mutationKeyToMutation[uid];
-                if (mutation) {
-                    this.props.dataStore.toggleSelectedMutation(mutation);
-                }
-            } else if (this.mode === MutationOncoprintMode.MUTATION_TRACKS && track_id !== undefined) {
-                if (this.oncoprintComponent) {
-                    // toggle highlighted mutation based on track
-                    const key = this.oncoprintComponent.getTrackSpecKey(track_id);
-                    const mutation = key && this.mutationKeyToMutation[key];
+        );
+        this.oncoprint.onCellClick(
+            (uid: ColumnId | null, track_id?: TrackId) => {
+                if (
+                    this.mode === MutationOncoprintMode.SAMPLE_TRACKS &&
+                    uid !== null
+                ) {
+                    const mutation = this.mutationKeyToMutation[uid];
                     if (mutation) {
                         this.props.dataStore.toggleSelectedMutation(mutation);
                     }
+                } else if (
+                    this.mode === MutationOncoprintMode.MUTATION_TRACKS &&
+                    track_id !== undefined
+                ) {
+                    if (this.oncoprintComponent) {
+                        // toggle highlighted mutation based on track
+                        const key = this.oncoprintComponent.getTrackSpecKey(
+                            track_id
+                        );
+                        const mutation = key && this.mutationKeyToMutation[key];
+                        if (mutation) {
+                            this.props.dataStore.toggleSelectedMutation(
+                                mutation
+                            );
+                        }
+                    }
+                } else {
+                    this.props.dataStore.setSelectedMutations([]);
                 }
-            } else {
-                this.props.dataStore.setSelectedMutations([]);
             }
-        });
+        );
     }
 
     @computed get mutations() {
         return _.flatten(this.props.dataStore.allData);
     }
 
-    readonly sortConfig = remoteData<IOncoprintProps["sortConfig"]>({
-        await:()=>[this.sampleIdOrder],
-        invoke:()=>{
+    readonly sortConfig = remoteData<IOncoprintProps['sortConfig']>({
+        await: () => [this.sampleIdOrder],
+        invoke: () => {
             if (this.clustered) {
                 return Promise.resolve({
-                    clusterHeatmapTrackGroupIndex: TRACK_GROUP_INDEX
+                    clusterHeatmapTrackGroupIndex: TRACK_GROUP_INDEX,
                 });
             } else if (this.mode === MutationOncoprintMode.MUTATION_TRACKS) {
                 return Promise.resolve({
-                    order: this.sampleIdOrder.result!
+                    order: this.sampleIdOrder.result!,
                 });
             } else {
                 return Promise.resolve({});
             }
-        }
+        },
     });
 
     // TODO: be able to highlight a track in mutation track mode
@@ -156,7 +192,9 @@ export default class MutationOncoprint extends React.Component<IMutationOncoprin
         if (mutation) {
             highlighted.push(mutation);
         }
-        return highlighted.map(generateMutationIdByGeneAndProteinChangeAndEvent);
+        return highlighted.map(
+            generateMutationIdByGeneAndProteinChangeAndEvent
+        );
     }
 
     @computed get highlightedIds() {
@@ -176,32 +214,37 @@ export default class MutationOncoprint extends React.Component<IMutationOncoprin
     }
 
     readonly sampleIdOrder = remoteData({
-        await:()=>[this.props.store.samples],
-        invoke:()=>{
+        await: () => [this.props.store.samples],
+        invoke: () => {
             if (this.props.sampleManager) {
-                return Promise.resolve(this.props.sampleManager.getSampleIdsInOrder());
+                return Promise.resolve(
+                    this.props.sampleManager.getSampleIdsInOrder()
+                );
             } else {
-                return Promise.resolve(this.props.store.samples.result!.map(s=>s.sampleId));
+                return Promise.resolve(
+                    this.props.store.samples.result!.map(s => s.sampleId)
+                );
             }
-        }
+        },
     });
 
     readonly mutationWithIdOrder = remoteData({
-        invoke:()=>{
+        invoke: () => {
             // TODO: any specific order?
-            const mutations:{mutation:Mutation, id:string}[] = [];
+            const mutations: { mutation: Mutation; id: string }[] = [];
             for (const d of this.mutations) {
                 mutations.push({
                     mutation: d,
-                    id: generateMutationIdByGeneAndProteinChangeAndEvent(d)
+                    id: generateMutationIdByGeneAndProteinChangeAndEvent(d),
                 });
             }
             return Promise.resolve(
                 _.chain(mutations)
-                    .uniqBy(m=>m.id)
-                    .sortBy(m=>getMutationLabel(m.mutation)).value()
+                    .uniqBy(m => m.id)
+                    .sortBy(m => getMutationLabel(m.mutation))
+                    .value()
             );
-        }
+        },
     });
 
     @autobind
@@ -211,12 +254,14 @@ export default class MutationOncoprint extends React.Component<IMutationOncoprin
 
     @autobind
     private onClickZoomIn() {
-        this.oncoprint && this.oncoprint.setHorzZoom(this.oncoprint.getHorzZoom()/0.7);
+        this.oncoprint &&
+            this.oncoprint.setHorzZoom(this.oncoprint.getHorzZoom() / 0.7);
     }
 
     @autobind
     private onClickZoomOut() {
-        this.oncoprint && this.oncoprint.setHorzZoom(this.oncoprint.getHorzZoom()*0.7);
+        this.oncoprint &&
+            this.oncoprint.setHorzZoom(this.oncoprint.getHorzZoom() * 0.7);
     }
 
     @computed get mutationKeyToMutation() {
@@ -230,34 +275,45 @@ export default class MutationOncoprint extends React.Component<IMutationOncoprin
 
     //      Column labels
     private readonly mutationModeColumnLabels = remoteData({
-        await:()=>[this.sampleIdOrder],
-        invoke:()=>{
-            return Promise.resolve(this.sampleIdOrder.result!.reduce((labels, sampleId, index)=>{
-                const labelNumber = index+1;
-                labels[sampleId] = {
-                    text: labelNumber.toString(),
-                    angle_in_degrees: 0,
-                    text_color: "#ffffff",
-                    circle_color: this.props.sampleManager!.getColorForSample(sampleId),
-                    left_padding_percent: (labelNumber < 10 ? -15 : -34), // label padding depending on how many digits in number
-                };
-                return labels;
-            }, {} as {[sampleId:string]:ColumnLabel}));
-        }
+        await: () => [this.sampleIdOrder],
+        invoke: () => {
+            return Promise.resolve(
+                this.sampleIdOrder.result!.reduce(
+                    (labels, sampleId, index) => {
+                        const labelNumber = index + 1;
+                        labels[sampleId] = {
+                            text: labelNumber.toString(),
+                            angle_in_degrees: 0,
+                            text_color: '#ffffff',
+                            circle_color: this.props.sampleManager!.getColorForSample(
+                                sampleId
+                            ),
+                            left_padding_percent: labelNumber < 10 ? -15 : -34, // label padding depending on how many digits in number
+                        };
+                        return labels;
+                    },
+                    {} as { [sampleId: string]: ColumnLabel }
+                )
+            );
+        },
     });
 
     private readonly sampleModeColumnLabels = remoteData({
-        invoke:()=>{
-            const ret:{[uid:string]:ColumnLabel} = {};
+        invoke: () => {
+            const ret: { [uid: string]: ColumnLabel } = {};
             if (this.showMutationLabels) {
                 for (const mutation of this.mutations) {
-                    ret[generateMutationIdByGeneAndProteinChangeAndEvent(mutation)] = {
-                        text: getMutationLabel(mutation)
+                    ret[
+                        generateMutationIdByGeneAndProteinChangeAndEvent(
+                            mutation
+                        )
+                    ] = {
+                        text: getMutationLabel(mutation),
                     };
                 }
             }
             return Promise.resolve(ret);
-        }
+        },
     });
 
     @computed get columnLabels() {
@@ -272,25 +328,31 @@ export default class MutationOncoprint extends React.Component<IMutationOncoprin
 
     //      Heatmap tracks order
     readonly sampleModeHeatmapTracksOrder = remoteData({
-        await:()=>[this.sampleIdOrder],
-        invoke:()=>{
+        await: () => [this.sampleIdOrder],
+        invoke: () => {
             if (this.clustered) {
                 return Promise.resolve(undefined);
             } else {
-                return Promise.resolve({[TRACK_GROUP_INDEX]:this.sampleIdOrder.result!});
+                return Promise.resolve({
+                    [TRACK_GROUP_INDEX]: this.sampleIdOrder.result!,
+                });
             }
-        }
+        },
     });
 
     readonly mutationModeHeatmapTracksOrder = remoteData({
-        await:()=>[this.mutationWithIdOrder],
-        invoke:()=>{
+        await: () => [this.mutationWithIdOrder],
+        invoke: () => {
             if (this.clustered) {
                 return Promise.resolve(undefined);
             } else {
-                return Promise.resolve({[TRACK_GROUP_INDEX]:this.mutationWithIdOrder.result!.map(m=>m.id)});
+                return Promise.resolve({
+                    [TRACK_GROUP_INDEX]: this.mutationWithIdOrder.result!.map(
+                        m => m.id
+                    ),
+                });
             }
-        }
+        },
     });
 
     @computed get heatmapTracksOrder() {
@@ -304,14 +366,16 @@ export default class MutationOncoprint extends React.Component<IMutationOncoprin
     }
 
     //      Heatmap tracks
-    private readonly sampleModeHeatmapTracks = remoteData<IMutationOncoprintTrackSpec[]>({
-        await:()=>[
+    private readonly sampleModeHeatmapTracks = remoteData<
+        IMutationOncoprintTrackSpec[]
+    >({
+        await: () => [
             this.props.store.samples,
             this.sampleIdOrder,
             this.props.store.mutationMolecularProfile,
             this.props.store.coverageInformation,
         ],
-        invoke:()=>{
+        invoke: () => {
             if (this.mutations.length === 0) {
                 return Promise.resolve([]);
             }
@@ -322,13 +386,15 @@ export default class MutationOncoprint extends React.Component<IMutationOncoprin
                 this.props.store.coverageInformation.result!,
                 MutationOncoprintMode.SAMPLE_TRACKS
             );
-            const tracks:IMutationOncoprintTrackSpec[] = [];
-            this.sampleIdOrder.result!.forEach((sampleId, index)=>{
+            const tracks: IMutationOncoprintTrackSpec[] = [];
+            this.sampleIdOrder.result!.forEach((sampleId, index) => {
                 const data = trackData[sampleId];
                 if (!data || !data.length) {
                     return;
                 }
-                const circleColor = this.props.sampleManager ? this.props.sampleManager.getColorForSample(sampleId) : undefined;
+                const circleColor = this.props.sampleManager
+                    ? this.props.sampleManager.getColorForSample(sampleId)
+                    : undefined;
                 const labelNumber = index + 1;
                 tracks.push({
                     key: sampleId,
@@ -338,47 +404,46 @@ export default class MutationOncoprint extends React.Component<IMutationOncoprin
                     molecularAlterationType: profile.molecularAlterationType,
                     datatype: profile.datatype,
                     data,
-                    trackGroupIndex:TRACK_GROUP_INDEX,
-                    naLegendLabel:"Not sequenced",
-                    labelColor: circleColor ? "white" : "black",
+                    trackGroupIndex: TRACK_GROUP_INDEX,
+                    naLegendLabel: 'Not sequenced',
+                    labelColor: circleColor ? 'white' : 'black',
                     labelCircleColor: circleColor,
-                    labelFontWeight: "normal",
-                    labelLeftPadding:(labelNumber < 10 ? 21 : 17), // label padding depending on how many digits in number
-                    hasColumnSpacing:true,
-                    tooltip:(data:IMutationOncoprintTrackDatum[])=>{
+                    labelFontWeight: 'normal',
+                    labelLeftPadding: labelNumber < 10 ? 21 : 17, // label padding depending on how many digits in number
+                    hasColumnSpacing: true,
+                    tooltip: (data: IMutationOncoprintTrackDatum[]) => {
                         const d = data[0];
-                        const tooltipJSX = mutationTooltip(
-                            d.mutation,
-                            {
-                                sampleId:d.sample!,
-                                mutationStatus:d.mutationStatus,
-                                vaf:d.profile_data
-                            }
-                        );
+                        const tooltipJSX = mutationTooltip(d.mutation, {
+                            sampleId: d.sample!,
+                            mutationStatus: d.mutationStatus,
+                            vaf: d.profile_data,
+                        });
                         // convert JSX into HTML string by rendering to dummy element then using innerHTML
-                        const dummyElt = document.createElement("div");
+                        const dummyElt = document.createElement('div');
                         ReactDOM.render(tooltipJSX, dummyElt);
                         const html = dummyElt.innerHTML;
                         return $(html);
                     },
                     sortDirectionChangeable: false,
-                    initSortDirection:-1 as -1,
+                    initSortDirection: -1 as -1,
                     movable: false,
-                    customNaShapes:MUTATION_ONCOPRINT_NA_SHAPES
+                    customNaShapes: MUTATION_ONCOPRINT_NA_SHAPES,
                 });
             });
             return Promise.resolve(tracks);
-        }
+        },
     });
 
-    private readonly mutationModeHeatmapTracks = remoteData<IMutationOncoprintTrackSpec[]>({
-        await:()=>[
+    private readonly mutationModeHeatmapTracks = remoteData<
+        IMutationOncoprintTrackSpec[]
+    >({
+        await: () => [
             this.props.store.samples,
             this.mutationWithIdOrder,
             this.props.store.mutationMolecularProfile,
             this.props.store.coverageInformation,
         ],
-        invoke:()=>{
+        invoke: () => {
             if (this.mutations.length === 0) {
                 return Promise.resolve([]);
             }
@@ -389,8 +454,8 @@ export default class MutationOncoprint extends React.Component<IMutationOncoprin
                 this.props.store.coverageInformation.result!,
                 MutationOncoprintMode.MUTATION_TRACKS
             );
-            const tracks:IMutationOncoprintTrackSpec[] = [];
-            this.mutationWithIdOrder.result!.forEach((mutationWithId)=>{
+            const tracks: IMutationOncoprintTrackSpec[] = [];
+            this.mutationWithIdOrder.result!.forEach(mutationWithId => {
                 const data = trackData[mutationWithId.id];
                 if (!data || !data.length) {
                     return;
@@ -398,39 +463,38 @@ export default class MutationOncoprint extends React.Component<IMutationOncoprin
                 tracks.push({
                     key: mutationWithId.id,
                     label: getMutationLabel(mutationWithId.mutation),
-                    description: `${getMutationLabel(mutationWithId.mutation)} data from ${profile.molecularProfileId}`,
+                    description: `${getMutationLabel(
+                        mutationWithId.mutation
+                    )} data from ${profile.molecularProfileId}`,
                     molecularProfileId: profile.molecularProfileId,
                     molecularAlterationType: profile.molecularAlterationType,
                     datatype: profile.datatype,
                     data,
-                    trackGroupIndex:TRACK_GROUP_INDEX,
-                    naLegendLabel:"Not sequenced",
-                    labelFontWeight: "normal",
-                    hasColumnSpacing:true,
-                    tooltip:(data:IMutationOncoprintTrackDatum[])=>{
+                    trackGroupIndex: TRACK_GROUP_INDEX,
+                    naLegendLabel: 'Not sequenced',
+                    labelFontWeight: 'normal',
+                    hasColumnSpacing: true,
+                    tooltip: (data: IMutationOncoprintTrackDatum[]) => {
                         const d = data[0];
-                        const tooltipJSX = mutationTooltip(
-                            d.mutation,
-                            {
-                                sampleId:d.sample!,
-                                mutationStatus:d.mutationStatus,
-                                vaf:d.profile_data
-                            }
-                        );
+                        const tooltipJSX = mutationTooltip(d.mutation, {
+                            sampleId: d.sample!,
+                            mutationStatus: d.mutationStatus,
+                            vaf: d.profile_data,
+                        });
                         // convert JSX into HTML string by rendering to dummy element then using innerHTML
-                        const dummyElt = document.createElement("div");
+                        const dummyElt = document.createElement('div');
                         ReactDOM.render(tooltipJSX, dummyElt);
                         const html = dummyElt.innerHTML;
                         return $(html);
                     },
                     sortDirectionChangeable: false,
-                    initSortDirection:-1 as -1,
+                    initSortDirection: -1 as -1,
                     movable: false,
-                    customNaShapes:MUTATION_ONCOPRINT_NA_SHAPES
+                    customNaShapes: MUTATION_ONCOPRINT_NA_SHAPES,
                 });
             });
             return Promise.resolve(tracks);
-        }
+        },
     });
 
     @computed get heatmapTracks() {
@@ -463,10 +527,12 @@ export default class MutationOncoprint extends React.Component<IMutationOncoprin
                     overlay={<span>Zoom in/out of heatmap</span>}
                     placement="top"
                 >
-                    <div style={{width:"90px"}}>
+                    <div style={{ width: '90px' }}>
                         <Slider
                             value={this.horzZoomSliderState}
-                            onChange={(z:number)=>(this.horzZoomSliderState = z)}
+                            onChange={(z: number) =>
+                                (this.horzZoomSliderState = z)
+                            }
                             onChangeComplete={this.updateOncoprintHorzZoom}
                             step={0.01}
                             max={1}
@@ -492,46 +558,72 @@ export default class MutationOncoprint extends React.Component<IMutationOncoprin
 
     @computed get header() {
         return (
-            <div style={{display:"flex", alignItems:"center", justifyContent:"space-between", marginBottom:5}}>
-                <div style={{display:"inline-flex", alignItems:"center"}}>
+            <div
+                style={{
+                    display: 'flex',
+                    alignItems: 'center',
+                    justifyContent: 'space-between',
+                    marginBottom: 5,
+                }}
+            >
+                <div style={{ display: 'inline-flex', alignItems: 'center' }}>
                     <LabeledCheckbox
                         checked={this.clustered}
-                        onChange={()=>{ this.clustered = !this.clustered; }}
-                        labelProps={{style:{ marginRight:10}}}
-                        inputProps={{"data-test":"HeatmapCluster"}}
+                        onChange={() => {
+                            this.clustered = !this.clustered;
+                        }}
+                        labelProps={{ style: { marginRight: 10 } }}
+                        inputProps={{ 'data-test': 'HeatmapCluster' }}
                     >
-                        <span style={{marginTop:-3}}>Cluster</span>
+                        <span style={{ marginTop: -3 }}>Cluster</span>
                     </LabeledCheckbox>
                     <LabeledCheckbox
-                        checked={this.mode === MutationOncoprintMode.MUTATION_TRACKS}
-                        onChange={()=>{ this.mode = (this.mode === MutationOncoprintMode.MUTATION_TRACKS ? MutationOncoprintMode.SAMPLE_TRACKS : MutationOncoprintMode.MUTATION_TRACKS); }}
-                        labelProps={{style:{ marginRight:10}}}
-                        inputProps={{"data-test":"HeatmapTranspose"}}
+                        checked={
+                            this.mode === MutationOncoprintMode.MUTATION_TRACKS
+                        }
+                        onChange={() => {
+                            this.mode =
+                                this.mode ===
+                                MutationOncoprintMode.MUTATION_TRACKS
+                                    ? MutationOncoprintMode.SAMPLE_TRACKS
+                                    : MutationOncoprintMode.MUTATION_TRACKS;
+                        }}
+                        labelProps={{ style: { marginRight: 10 } }}
+                        inputProps={{ 'data-test': 'HeatmapTranspose' }}
                     >
-                        <span style={{marginTop:-3}}>Transpose</span>
+                        <span style={{ marginTop: -3 }}>Transpose</span>
                     </LabeledCheckbox>
                     <LabeledCheckbox
                         checked={this.showMutationLabels}
-                        onChange={()=>{ this.showMutationLabels = !this.showMutationLabels; }}
-                        labelProps={{style:{ marginRight:10}}}
-                        inputProps={{"data-test":"HeatmapMutationLabels"}}
+                        onChange={() => {
+                            this.showMutationLabels = !this.showMutationLabels;
+                        }}
+                        labelProps={{ style: { marginRight: 10 } }}
+                        inputProps={{ 'data-test': 'HeatmapMutationLabels' }}
                     >
-                        <span style={{marginTop:-3}}>Show mutation labels</span>
+                        <span style={{ marginTop: -3 }}>
+                            Show mutation labels
+                        </span>
                     </LabeledCheckbox>
                     {this.zoomControls}
                 </div>
                 <DownloadControls
                     filename="vafHeatmap"
-                    getSvg={()=>(this.oncoprint ? this.oncoprint.toSVG(true) : null)}
-                    getData={()=>{
-                        const data = _.flatMap(this.heatmapTracks.result!, track=>track.data);
+                    getSvg={() =>
+                        this.oncoprint ? this.oncoprint.toSVG(true) : null
+                    }
+                    getData={() => {
+                        const data = _.flatMap(
+                            this.heatmapTracks.result!,
+                            track => track.data
+                        );
                         return getDownloadData(data);
                     }}
-                    buttons={["SVG", "PNG", "Data"]}
+                    buttons={['SVG', 'PNG', 'Data']}
                     type="button"
                     dontFade
                     style={{
-                        marginLeft:10
+                        marginLeft: 10,
                     }}
                 />
             </div>
@@ -539,20 +631,20 @@ export default class MutationOncoprint extends React.Component<IMutationOncoprin
     }
 
     private readonly oncoprintUI = MakeMobxView({
-        await:()=>[
+        await: () => [
             this.heatmapTracks,
             this.heatmapTracksOrder,
             this.columnLabels,
-            this.sortConfig
+            this.sortConfig,
         ],
-        render:()=>{
+        render: () => {
             if (this.heatmapTracks.result!.length === 0) {
                 return null;
             } else {
                 return (
                     <div
                         className="borderedChart"
-                        style={{display:"inline-block"}}
+                        style={{ display: 'inline-block' }}
                     >
                         {this.header}
                         <Oncoprint
@@ -562,7 +654,13 @@ export default class MutationOncoprint extends React.Component<IMutationOncoprin
                             highlightedIds={this.highlightedIds}
                             highlightedTracks={this.highlightedTracks}
                             initParams={INIT_PARAMS}
-                            showTrackLabels={!(this.mode === MutationOncoprintMode.MUTATION_TRACKS && !this.showMutationLabels)}
+                            showTrackLabels={
+                                !(
+                                    this.mode ===
+                                        MutationOncoprintMode.MUTATION_TRACKS &&
+                                    !this.showMutationLabels
+                                )
+                            }
                             columnLabels={this.columnLabels.result!}
                             clinicalTracks={[]}
                             geneticTracks={[]}
@@ -578,12 +676,12 @@ export default class MutationOncoprint extends React.Component<IMutationOncoprin
                 );
             }
         },
-        renderPending:()=><LoadingIndicator isLoading={true}/>,
-        renderError:()=><ErrorMessage/>,
-        showLastRenderWhenPending: true
+        renderPending: () => <LoadingIndicator isLoading={true} />,
+        renderError: () => <ErrorMessage />,
+        showLastRenderWhenPending: true,
     });
 
     render() {
         return this.oncoprintUI.component;
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/patientView/mutation/oncoprint/MutationOncoprintUtils.spec.ts b/src/pages/patientView/mutation/oncoprint/MutationOncoprintUtils.spec.ts
index 16f2d419399..609ec4f4ebd 100644
--- a/src/pages/patientView/mutation/oncoprint/MutationOncoprintUtils.spec.ts
+++ b/src/pages/patientView/mutation/oncoprint/MutationOncoprintUtils.spec.ts
@@ -1,660 +1,1344 @@
-import {assert} from "chai";
-import {Mutation, Sample} from "../../../../shared/api/generated/CBioPortalAPI";
-import {CoverageInformation} from "../../../resultsView/ResultsViewPageStoreUtils";
-import {makeMutationHeatmapData} from "./MutationOncoprintUtils";
-import {MutationOncoprintMode} from "./MutationOncoprint";
-import {generateMutationIdByGeneAndProteinChangeAndEvent} from "../../../../shared/lib/StoreUtils";
-import {MutationStatus} from "../PatientViewMutationsTabUtils";
-import {assertDeepEqualInAnyOrder} from "../../../../shared/lib/SpecUtils";
-
-describe("MutationOncoprintUtils", () => {
-    describe("makeMutationHeatmapData", ()=>{
-        function makeSample(i:number) {
+import { assert } from 'chai';
+import {
+    Mutation,
+    Sample,
+} from '../../../../shared/api/generated/CBioPortalAPI';
+import { CoverageInformation } from '../../../resultsView/ResultsViewPageStoreUtils';
+import { makeMutationHeatmapData } from './MutationOncoprintUtils';
+import { MutationOncoprintMode } from './MutationOncoprint';
+import { generateMutationIdByGeneAndProteinChangeAndEvent } from '../../../../shared/lib/StoreUtils';
+import { MutationStatus } from '../PatientViewMutationsTabUtils';
+import { assertDeepEqualInAnyOrder } from '../../../../shared/lib/SpecUtils';
+
+describe('MutationOncoprintUtils', () => {
+    describe('makeMutationHeatmapData', () => {
+        function makeSample(i: number) {
             return {
-                sampleId:`sample${i}`,
-                patientId:"patient",
-                uniqueSampleKey:`uniqueKey${i}`,
-                studyId:"study"
+                sampleId: `sample${i}`,
+                patientId: 'patient',
+                uniqueSampleKey: `uniqueKey${i}`,
+                studyId: 'study',
             } as Sample;
         }
 
-        function makeMutation(sampleI:number, hugoGeneSymbol:string, proteinChange:string, vafPercent?:number, mutationStatus:string="") {
+        function makeMutation(
+            sampleI: number,
+            hugoGeneSymbol: string,
+            proteinChange: string,
+            vafPercent?: number,
+            mutationStatus: string = ''
+        ) {
             return {
                 gene: {
-                    hugoGeneSymbol
+                    hugoGeneSymbol,
                 },
                 mutationStatus,
-                uniqueSampleKey:`uniqueKey${sampleI}`,
-                uniquePatientKey:`uniquePatientKey`,
-                sampleId:`sample${sampleI}`,
-                patientId:"patient",
-                studyId:"study",
+                uniqueSampleKey: `uniqueKey${sampleI}`,
+                uniquePatientKey: `uniquePatientKey`,
+                sampleId: `sample${sampleI}`,
+                patientId: 'patient',
+                studyId: 'study',
                 proteinChange,
-                chr: "1",
-                startPosition:0,
-                endPosition:0,
-                referenceAllele:"",
-                variantAllele:"",
+                chr: '1',
+                startPosition: 0,
+                endPosition: 0,
+                referenceAllele: '',
+                variantAllele: '',
                 tumorAltCount: vafPercent,
-                tumorRefCount:vafPercent === undefined ? undefined : 100-vafPercent,
-                molecularProfileId:"mutations"
+                tumorRefCount:
+                    vafPercent === undefined ? undefined : 100 - vafPercent,
+                molecularProfileId: 'mutations',
             } as Mutation;
         }
 
         function makeOncoprintData(
-            sampleI:number,
-            hugoGeneSymbol:string,
-            proteinChange:string,
-            vafPercent:number|undefined,
-            mutationStatus:MutationStatus,
-            mutationMutationStatus:string=""
+            sampleI: number,
+            hugoGeneSymbol: string,
+            proteinChange: string,
+            vafPercent: number | undefined,
+            mutationStatus: MutationStatus,
+            mutationMutationStatus: string = ''
         ) {
-            const mutation = makeMutation(sampleI, hugoGeneSymbol, proteinChange, vafPercent, mutationMutationStatus);
+            const mutation = makeMutation(
+                sampleI,
+                hugoGeneSymbol,
+                proteinChange,
+                vafPercent,
+                mutationMutationStatus
+            );
             return {
-                profile_data: vafPercent === undefined ? null : vafPercent/100,
+                profile_data:
+                    vafPercent === undefined ? null : vafPercent / 100,
                 sample: `sample${sampleI}`,
-                patient:"patient",
-                study_id:"study",
-                hugo_gene_symbol:"",
+                patient: 'patient',
+                study_id: 'study',
+                hugo_gene_symbol: '',
                 mutation,
-                uid:generateMutationIdByGeneAndProteinChangeAndEvent(mutation),
-                mutationId: generateMutationIdByGeneAndProteinChangeAndEvent(mutation),
-                mutationStatus
+                uid: generateMutationIdByGeneAndProteinChangeAndEvent(mutation),
+                mutationId: generateMutationIdByGeneAndProteinChangeAndEvent(
+                    mutation
+                ),
+                mutationStatus,
             };
         }
 
         function makeOncoprintData_NoData(
-            sampleI:number,
-            mutation:Mutation,
-            mutationStatus:MutationStatus
+            sampleI: number,
+            mutation: Mutation,
+            mutationStatus: MutationStatus
         ) {
             return {
-                profile_data:null,
-                sample:`sample${sampleI}`,
-                patient:"patient",
-                study_id:"study",
-                hugo_gene_symbol:"",
+                profile_data: null,
+                sample: `sample${sampleI}`,
+                patient: 'patient',
+                study_id: 'study',
+                hugo_gene_symbol: '',
                 mutation,
-                uid:generateMutationIdByGeneAndProteinChangeAndEvent(mutation),
-                mutationId:generateMutationIdByGeneAndProteinChangeAndEvent(mutation),
+                uid: generateMutationIdByGeneAndProteinChangeAndEvent(mutation),
+                mutationId: generateMutationIdByGeneAndProteinChangeAndEvent(
+                    mutation
+                ),
                 mutationStatus,
-                na: mutationStatus === MutationStatus.NOT_PROFILED
-            }
+                na: mutationStatus === MutationStatus.NOT_PROFILED,
+            };
         }
 
         function makeMutationModeOncoprintData(
-            sampleI:number,
-            hugoGeneSymbol:string,
-            proteinChange:string,
-            vafPercent:number|undefined,
-            mutationStatus:MutationStatus,
-            mutationMutationStatus:string=""
+            sampleI: number,
+            hugoGeneSymbol: string,
+            proteinChange: string,
+            vafPercent: number | undefined,
+            mutationStatus: MutationStatus,
+            mutationMutationStatus: string = ''
         ) {
-            const d = makeOncoprintData(sampleI, hugoGeneSymbol, proteinChange, vafPercent, mutationStatus, mutationMutationStatus);
+            const d = makeOncoprintData(
+                sampleI,
+                hugoGeneSymbol,
+                proteinChange,
+                vafPercent,
+                mutationStatus,
+                mutationMutationStatus
+            );
             d.uid = d.sample;
             return d;
         }
 
         function makeMutationModeOncoprintData_NoData(
-            sampleI:number,
-            mutation:Mutation,
-            mutationStatus:MutationStatus
+            sampleI: number,
+            mutation: Mutation,
+            mutationStatus: MutationStatus
         ) {
-            const d = makeOncoprintData_NoData(sampleI, mutation, mutationStatus);
+            const d = makeOncoprintData_NoData(
+                sampleI,
+                mutation,
+                mutationStatus
+            );
             d.uid = d.sample;
             return d;
         }
 
-        function makeCoverageInfo(profiledIs:number[], unprofiledIs:number[], unprofiledByGene:{ i:number, notProfiledByGene:any}[]=[]) {
-            const ret:CoverageInformation = { samples:{}, patients:{} };
+        function makeCoverageInfo(
+            profiledIs: number[],
+            unprofiledIs: number[],
+            unprofiledByGene: { i: number; notProfiledByGene: any }[] = []
+        ) {
+            const ret: CoverageInformation = { samples: {}, patients: {} };
             for (const i of profiledIs) {
                 ret.samples[`uniqueKey${i}`] = {
-                    byGene:{},
-                    allGenes:[{
-                        molecularProfileId:"mutations",
-                        patientId:"patient",
-                        profiled: true,
-                        sampleId:`sample${i}`,
-                        studyId:"study",
-                        uniquePatientKey:`uniquePatientKey`,
-                        uniqueSampleKey:`uniqueKey${i}`
-                    }],
-                    notProfiledByGene:{},
-                    notProfiledAllGenes:[]
+                    byGene: {},
+                    allGenes: [
+                        {
+                            molecularProfileId: 'mutations',
+                            patientId: 'patient',
+                            profiled: true,
+                            sampleId: `sample${i}`,
+                            studyId: 'study',
+                            uniquePatientKey: `uniquePatientKey`,
+                            uniqueSampleKey: `uniqueKey${i}`,
+                        },
+                    ],
+                    notProfiledByGene: {},
+                    notProfiledAllGenes: [],
                 };
             }
             for (const i of unprofiledIs) {
                 ret.samples[`uniqueKey${i}`] = {
-                    byGene:{},
-                    notProfiledAllGenes:[{
-                        molecularProfileId:"mutations",
-                        patientId:"patient",
-                        profiled: false,
-                        sampleId:`sample${i}`,
-                        studyId:"study",
-                        uniquePatientKey:`uniquePatientKey`,
-                        uniqueSampleKey:`uniqueKey${i}`
-                    }],
-                    notProfiledByGene:{},
-                    allGenes:[]
+                    byGene: {},
+                    notProfiledAllGenes: [
+                        {
+                            molecularProfileId: 'mutations',
+                            patientId: 'patient',
+                            profiled: false,
+                            sampleId: `sample${i}`,
+                            studyId: 'study',
+                            uniquePatientKey: `uniquePatientKey`,
+                            uniqueSampleKey: `uniqueKey${i}`,
+                        },
+                    ],
+                    notProfiledByGene: {},
+                    allGenes: [],
                 };
             }
             for (const obj of unprofiledByGene) {
                 ret.samples[`uniqueKey${obj.i}`] = {
-                    byGene:{},
-                    allGenes:[],
-                    notProfiledByGene:obj.notProfiledByGene,
-                    notProfiledAllGenes:[]
+                    byGene: {},
+                    allGenes: [],
+                    notProfiledByGene: obj.notProfiledByGene,
+                    notProfiledAllGenes: [],
                 };
             }
             return ret;
         }
 
-        describe("sample track mode", ()=>{
-            it("handles case of empty data", ()=>{
+        describe('sample track mode', () => {
+            it('handles case of empty data', () => {
                 assert.deepEqual(
                     makeMutationHeatmapData(
                         [makeSample(1), makeSample(2), makeSample(3)],
                         [],
-                        makeCoverageInfo([1,2,3], []),
+                        makeCoverageInfo([1, 2, 3], []),
                         MutationOncoprintMode.SAMPLE_TRACKS
                     ),
-                    {
-                    }
+                    {}
                 );
             });
-            it("returns correct result when every sample has vaf data for every mutation", ()=>{
+            it('returns correct result when every sample has vaf data for every mutation', () => {
                 assertDeepEqualInAnyOrder(
                     makeMutationHeatmapData(
                         [makeSample(1), makeSample(2), makeSample(3)],
                         [
-                            makeMutation(1, "gene1", "proteinchange1", 20),
-                            makeMutation(1, "gene2", "proteinchange2", 30, "uncalled"),
-                            makeMutation(1, "gene3", "proteinchange3", 40),
+                            makeMutation(1, 'gene1', 'proteinchange1', 20),
+                            makeMutation(
+                                1,
+                                'gene2',
+                                'proteinchange2',
+                                30,
+                                'uncalled'
+                            ),
+                            makeMutation(1, 'gene3', 'proteinchange3', 40),
 
-                            makeMutation(2, "gene1", "proteinchange1", 10),
-                            makeMutation(2, "gene2", "proteinchange2", 50),
-                            makeMutation(2, "gene3", "proteinchange3", 60),
+                            makeMutation(2, 'gene1', 'proteinchange1', 10),
+                            makeMutation(2, 'gene2', 'proteinchange2', 50),
+                            makeMutation(2, 'gene3', 'proteinchange3', 60),
 
-                            makeMutation(3, "gene1", "proteinchange1", 15),
-                            makeMutation(3, "gene2", "proteinchange2", 25),
-                            makeMutation(3, "gene3", "proteinchange3", 80),
+                            makeMutation(3, 'gene1', 'proteinchange1', 15),
+                            makeMutation(3, 'gene2', 'proteinchange2', 25),
+                            makeMutation(3, 'gene3', 'proteinchange3', 80),
                         ],
-                        makeCoverageInfo([1,2,3], []),
+                        makeCoverageInfo([1, 2, 3], []),
                         MutationOncoprintMode.SAMPLE_TRACKS
                     ),
                     {
-                        sample1:[
-                            makeOncoprintData(1, "gene1", "proteinchange1", 20, MutationStatus.MUTATED_WITH_VAF),
-                            makeOncoprintData(1, "gene2", "proteinchange2", 30, MutationStatus.PROFILED_WITH_READS_BUT_UNCALLED, "uncalled"),
-                            makeOncoprintData(1, "gene3", "proteinchange3", 40, MutationStatus.MUTATED_WITH_VAF)
-                        ],
-                        sample2:[
-                            makeOncoprintData(2, "gene1", "proteinchange1", 10, MutationStatus.MUTATED_WITH_VAF),
-                            makeOncoprintData(2, "gene2", "proteinchange2", 50, MutationStatus.MUTATED_WITH_VAF),
-                            makeOncoprintData(2, "gene3", "proteinchange3", 60, MutationStatus.MUTATED_WITH_VAF)
-                        ],
-                        sample3:[
-                            makeOncoprintData(3, "gene1", "proteinchange1", 15, MutationStatus.MUTATED_WITH_VAF),
-                            makeOncoprintData(3, "gene2", "proteinchange2", 25, MutationStatus.MUTATED_WITH_VAF),
-                            makeOncoprintData(3, "gene3", "proteinchange3", 80, MutationStatus.MUTATED_WITH_VAF)
-                        ]
+                        sample1: [
+                            makeOncoprintData(
+                                1,
+                                'gene1',
+                                'proteinchange1',
+                                20,
+                                MutationStatus.MUTATED_WITH_VAF
+                            ),
+                            makeOncoprintData(
+                                1,
+                                'gene2',
+                                'proteinchange2',
+                                30,
+                                MutationStatus.PROFILED_WITH_READS_BUT_UNCALLED,
+                                'uncalled'
+                            ),
+                            makeOncoprintData(
+                                1,
+                                'gene3',
+                                'proteinchange3',
+                                40,
+                                MutationStatus.MUTATED_WITH_VAF
+                            ),
+                        ],
+                        sample2: [
+                            makeOncoprintData(
+                                2,
+                                'gene1',
+                                'proteinchange1',
+                                10,
+                                MutationStatus.MUTATED_WITH_VAF
+                            ),
+                            makeOncoprintData(
+                                2,
+                                'gene2',
+                                'proteinchange2',
+                                50,
+                                MutationStatus.MUTATED_WITH_VAF
+                            ),
+                            makeOncoprintData(
+                                2,
+                                'gene3',
+                                'proteinchange3',
+                                60,
+                                MutationStatus.MUTATED_WITH_VAF
+                            ),
+                        ],
+                        sample3: [
+                            makeOncoprintData(
+                                3,
+                                'gene1',
+                                'proteinchange1',
+                                15,
+                                MutationStatus.MUTATED_WITH_VAF
+                            ),
+                            makeOncoprintData(
+                                3,
+                                'gene2',
+                                'proteinchange2',
+                                25,
+                                MutationStatus.MUTATED_WITH_VAF
+                            ),
+                            makeOncoprintData(
+                                3,
+                                'gene3',
+                                'proteinchange3',
+                                80,
+                                MutationStatus.MUTATED_WITH_VAF
+                            ),
+                        ],
                     }
                 );
             });
-            it("returns correct result when every sample has data for every mutation, but not all have VAF", ()=>{
+            it('returns correct result when every sample has data for every mutation, but not all have VAF', () => {
                 assertDeepEqualInAnyOrder(
                     makeMutationHeatmapData(
                         [makeSample(1), makeSample(2), makeSample(3)],
                         [
-                            makeMutation(1, "gene1", "proteinchange1", 20),
-                            makeMutation(1, "gene2", "proteinchange2", 30),
-                            makeMutation(1, "gene3", "proteinchange3", 40),
+                            makeMutation(1, 'gene1', 'proteinchange1', 20),
+                            makeMutation(1, 'gene2', 'proteinchange2', 30),
+                            makeMutation(1, 'gene3', 'proteinchange3', 40),
 
-                            makeMutation(2, "gene1", "proteinchange1"),
-                            makeMutation(2, "gene2", "proteinchange2", 50),
-                            makeMutation(2, "gene3", "proteinchange3"),
+                            makeMutation(2, 'gene1', 'proteinchange1'),
+                            makeMutation(2, 'gene2', 'proteinchange2', 50),
+                            makeMutation(2, 'gene3', 'proteinchange3'),
 
-                            makeMutation(3, "gene1", "proteinchange1", 15),
-                            makeMutation(3, "gene2", "proteinchange2"),
-                            makeMutation(3, "gene3", "proteinchange3", 80),
+                            makeMutation(3, 'gene1', 'proteinchange1', 15),
+                            makeMutation(3, 'gene2', 'proteinchange2'),
+                            makeMutation(3, 'gene3', 'proteinchange3', 80),
                         ],
-                        makeCoverageInfo([1,2,3], []),
+                        makeCoverageInfo([1, 2, 3], []),
                         MutationOncoprintMode.SAMPLE_TRACKS
                     ),
                     {
-                        sample1:[
-                            makeOncoprintData(1, "gene1", "proteinchange1", 20, MutationStatus.MUTATED_WITH_VAF),
-                            makeOncoprintData(1, "gene2", "proteinchange2", 30, MutationStatus.MUTATED_WITH_VAF),
-                            makeOncoprintData(1, "gene3", "proteinchange3", 40, MutationStatus.MUTATED_WITH_VAF)
-                        ],
-                        sample2:[
-                            makeOncoprintData(2, "gene1", "proteinchange1", undefined, MutationStatus.MUTATED_BUT_NO_VAF),
-                            makeOncoprintData(2, "gene2", "proteinchange2", 50, MutationStatus.MUTATED_WITH_VAF),
-                            makeOncoprintData(2, "gene3", "proteinchange3", undefined, MutationStatus.MUTATED_BUT_NO_VAF)
-                        ],
-                        sample3:[
-                            makeOncoprintData(3, "gene1", "proteinchange1", 15, MutationStatus.MUTATED_WITH_VAF),
-                            makeOncoprintData(3, "gene2", "proteinchange2", undefined, MutationStatus.MUTATED_BUT_NO_VAF),
-                            makeOncoprintData(3, "gene3", "proteinchange3", 80, MutationStatus.MUTATED_WITH_VAF)
-                        ]
+                        sample1: [
+                            makeOncoprintData(
+                                1,
+                                'gene1',
+                                'proteinchange1',
+                                20,
+                                MutationStatus.MUTATED_WITH_VAF
+                            ),
+                            makeOncoprintData(
+                                1,
+                                'gene2',
+                                'proteinchange2',
+                                30,
+                                MutationStatus.MUTATED_WITH_VAF
+                            ),
+                            makeOncoprintData(
+                                1,
+                                'gene3',
+                                'proteinchange3',
+                                40,
+                                MutationStatus.MUTATED_WITH_VAF
+                            ),
+                        ],
+                        sample2: [
+                            makeOncoprintData(
+                                2,
+                                'gene1',
+                                'proteinchange1',
+                                undefined,
+                                MutationStatus.MUTATED_BUT_NO_VAF
+                            ),
+                            makeOncoprintData(
+                                2,
+                                'gene2',
+                                'proteinchange2',
+                                50,
+                                MutationStatus.MUTATED_WITH_VAF
+                            ),
+                            makeOncoprintData(
+                                2,
+                                'gene3',
+                                'proteinchange3',
+                                undefined,
+                                MutationStatus.MUTATED_BUT_NO_VAF
+                            ),
+                        ],
+                        sample3: [
+                            makeOncoprintData(
+                                3,
+                                'gene1',
+                                'proteinchange1',
+                                15,
+                                MutationStatus.MUTATED_WITH_VAF
+                            ),
+                            makeOncoprintData(
+                                3,
+                                'gene2',
+                                'proteinchange2',
+                                undefined,
+                                MutationStatus.MUTATED_BUT_NO_VAF
+                            ),
+                            makeOncoprintData(
+                                3,
+                                'gene3',
+                                'proteinchange3',
+                                80,
+                                MutationStatus.MUTATED_WITH_VAF
+                            ),
+                        ],
                     }
                 );
             });
-            it("returns correct result when not every sample has data for every mutation", ()=>{
+            it('returns correct result when not every sample has data for every mutation', () => {
                 assertDeepEqualInAnyOrder(
                     makeMutationHeatmapData(
                         [makeSample(1), makeSample(2), makeSample(3)],
                         [
-                            makeMutation(1, "gene1", "proteinchange1", 20),
-                            makeMutation(1, "gene3", "proteinchange3", 40),
+                            makeMutation(1, 'gene1', 'proteinchange1', 20),
+                            makeMutation(1, 'gene3', 'proteinchange3', 40),
 
-                            makeMutation(2, "gene1", "proteinchange1"),
-                            makeMutation(2, "gene2", "proteinchange2", 50),
-                            makeMutation(2, "gene3", "proteinchange3"),
+                            makeMutation(2, 'gene1', 'proteinchange1'),
+                            makeMutation(2, 'gene2', 'proteinchange2', 50),
+                            makeMutation(2, 'gene3', 'proteinchange3'),
 
-                            makeMutation(3, "gene2", "proteinchange2"),
+                            makeMutation(3, 'gene2', 'proteinchange2'),
                         ],
-                        makeCoverageInfo([1,2,3], []),
+                        makeCoverageInfo([1, 2, 3], []),
                         MutationOncoprintMode.SAMPLE_TRACKS
                     ),
                     {
-                        sample1:[
-                            makeOncoprintData(1, "gene1", "proteinchange1", 20, MutationStatus.MUTATED_WITH_VAF),
-                            makeOncoprintData(1, "gene3", "proteinchange3", 40, MutationStatus.MUTATED_WITH_VAF),
-                            makeOncoprintData_NoData(1, makeMutation(3, "gene2", "proteinchange2"), MutationStatus.PROFILED_BUT_NOT_MUTATED)
-                        ],
-                        sample2:[
-                            makeOncoprintData(2, "gene1", "proteinchange1", undefined, MutationStatus.MUTATED_BUT_NO_VAF),
-                            makeOncoprintData(2, "gene2", "proteinchange2", 50, MutationStatus.MUTATED_WITH_VAF),
-                            makeOncoprintData(2, "gene3", "proteinchange3", undefined, MutationStatus.MUTATED_BUT_NO_VAF)
-                        ],
-                        sample3:[
-                            makeOncoprintData(3, "gene2", "proteinchange2", undefined, MutationStatus.MUTATED_BUT_NO_VAF),
-                            makeOncoprintData_NoData(3, makeMutation(2, "gene1", "proteinchange1"), MutationStatus.PROFILED_BUT_NOT_MUTATED),
-                            makeOncoprintData_NoData(3, makeMutation(2, "gene3", "proteinchange3"), MutationStatus.PROFILED_BUT_NOT_MUTATED),
-                        ]
+                        sample1: [
+                            makeOncoprintData(
+                                1,
+                                'gene1',
+                                'proteinchange1',
+                                20,
+                                MutationStatus.MUTATED_WITH_VAF
+                            ),
+                            makeOncoprintData(
+                                1,
+                                'gene3',
+                                'proteinchange3',
+                                40,
+                                MutationStatus.MUTATED_WITH_VAF
+                            ),
+                            makeOncoprintData_NoData(
+                                1,
+                                makeMutation(3, 'gene2', 'proteinchange2'),
+                                MutationStatus.PROFILED_BUT_NOT_MUTATED
+                            ),
+                        ],
+                        sample2: [
+                            makeOncoprintData(
+                                2,
+                                'gene1',
+                                'proteinchange1',
+                                undefined,
+                                MutationStatus.MUTATED_BUT_NO_VAF
+                            ),
+                            makeOncoprintData(
+                                2,
+                                'gene2',
+                                'proteinchange2',
+                                50,
+                                MutationStatus.MUTATED_WITH_VAF
+                            ),
+                            makeOncoprintData(
+                                2,
+                                'gene3',
+                                'proteinchange3',
+                                undefined,
+                                MutationStatus.MUTATED_BUT_NO_VAF
+                            ),
+                        ],
+                        sample3: [
+                            makeOncoprintData(
+                                3,
+                                'gene2',
+                                'proteinchange2',
+                                undefined,
+                                MutationStatus.MUTATED_BUT_NO_VAF
+                            ),
+                            makeOncoprintData_NoData(
+                                3,
+                                makeMutation(2, 'gene1', 'proteinchange1'),
+                                MutationStatus.PROFILED_BUT_NOT_MUTATED
+                            ),
+                            makeOncoprintData_NoData(
+                                3,
+                                makeMutation(2, 'gene3', 'proteinchange3'),
+                                MutationStatus.PROFILED_BUT_NOT_MUTATED
+                            ),
+                        ],
                     }
                 );
             });
-            it("returns correct result when one sample has no data for any mutation", ()=>{
+            it('returns correct result when one sample has no data for any mutation', () => {
                 assertDeepEqualInAnyOrder(
                     makeMutationHeatmapData(
                         [makeSample(1), makeSample(2), makeSample(3)],
                         [
-                            makeMutation(1, "gene1", "proteinchange1", 20),
-                            makeMutation(1, "gene3", "proteinchange3", 40),
+                            makeMutation(1, 'gene1', 'proteinchange1', 20),
+                            makeMutation(1, 'gene3', 'proteinchange3', 40),
 
-                            makeMutation(2, "gene1", "proteinchange1"),
-                            makeMutation(2, "gene2", "proteinchange2", 50),
-                            makeMutation(2, "gene3", "proteinchange3"),
+                            makeMutation(2, 'gene1', 'proteinchange1'),
+                            makeMutation(2, 'gene2', 'proteinchange2', 50),
+                            makeMutation(2, 'gene3', 'proteinchange3'),
                         ],
-                        makeCoverageInfo([1,2,3], []),
+                        makeCoverageInfo([1, 2, 3], []),
                         MutationOncoprintMode.SAMPLE_TRACKS
                     ),
                     {
-                        sample1:[
-                            makeOncoprintData(1, "gene1", "proteinchange1", 20, MutationStatus.MUTATED_WITH_VAF),
-                            makeOncoprintData(1, "gene3", "proteinchange3", 40, MutationStatus.MUTATED_WITH_VAF),
-                            makeOncoprintData_NoData(1, makeMutation(2, "gene2", "proteinchange2", 50), MutationStatus.PROFILED_BUT_NOT_MUTATED)
-                        ],
-                        sample2:[
-                            makeOncoprintData(2, "gene1", "proteinchange1", undefined, MutationStatus.MUTATED_BUT_NO_VAF),
-                            makeOncoprintData(2, "gene2", "proteinchange2", 50, MutationStatus.MUTATED_WITH_VAF),
-                            makeOncoprintData(2, "gene3", "proteinchange3", undefined, MutationStatus.MUTATED_BUT_NO_VAF)
-                        ],
-                        sample3:[
-                            makeOncoprintData_NoData(3, makeMutation(2, "gene1", "proteinchange1"), MutationStatus.PROFILED_BUT_NOT_MUTATED),
-                            makeOncoprintData_NoData(3, makeMutation(2, "gene2", "proteinchange2", 50), MutationStatus.PROFILED_BUT_NOT_MUTATED),
-                            makeOncoprintData_NoData(3, makeMutation(2, "gene3", "proteinchange3"), MutationStatus.PROFILED_BUT_NOT_MUTATED)
-                        ]
+                        sample1: [
+                            makeOncoprintData(
+                                1,
+                                'gene1',
+                                'proteinchange1',
+                                20,
+                                MutationStatus.MUTATED_WITH_VAF
+                            ),
+                            makeOncoprintData(
+                                1,
+                                'gene3',
+                                'proteinchange3',
+                                40,
+                                MutationStatus.MUTATED_WITH_VAF
+                            ),
+                            makeOncoprintData_NoData(
+                                1,
+                                makeMutation(2, 'gene2', 'proteinchange2', 50),
+                                MutationStatus.PROFILED_BUT_NOT_MUTATED
+                            ),
+                        ],
+                        sample2: [
+                            makeOncoprintData(
+                                2,
+                                'gene1',
+                                'proteinchange1',
+                                undefined,
+                                MutationStatus.MUTATED_BUT_NO_VAF
+                            ),
+                            makeOncoprintData(
+                                2,
+                                'gene2',
+                                'proteinchange2',
+                                50,
+                                MutationStatus.MUTATED_WITH_VAF
+                            ),
+                            makeOncoprintData(
+                                2,
+                                'gene3',
+                                'proteinchange3',
+                                undefined,
+                                MutationStatus.MUTATED_BUT_NO_VAF
+                            ),
+                        ],
+                        sample3: [
+                            makeOncoprintData_NoData(
+                                3,
+                                makeMutation(2, 'gene1', 'proteinchange1'),
+                                MutationStatus.PROFILED_BUT_NOT_MUTATED
+                            ),
+                            makeOncoprintData_NoData(
+                                3,
+                                makeMutation(2, 'gene2', 'proteinchange2', 50),
+                                MutationStatus.PROFILED_BUT_NOT_MUTATED
+                            ),
+                            makeOncoprintData_NoData(
+                                3,
+                                makeMutation(2, 'gene3', 'proteinchange3'),
+                                MutationStatus.PROFILED_BUT_NOT_MUTATED
+                            ),
+                        ],
                     }
                 );
             });
-            it("returns correct result when some not profiled", ()=>{
-
+            it('returns correct result when some not profiled', () => {
                 const actual = makeMutationHeatmapData(
                     [makeSample(1), makeSample(2), makeSample(3)],
                     [
-                        makeMutation(1, "gene1", "proteinchange1", 20),
-                        makeMutation(1, "gene3", "proteinchange3", 40),
+                        makeMutation(1, 'gene1', 'proteinchange1', 20),
+                        makeMutation(1, 'gene3', 'proteinchange3', 40),
 
-                        makeMutation(2, "gene3", "proteinchange3"),
+                        makeMutation(2, 'gene3', 'proteinchange3'),
 
-                        makeMutation(3, "gene2", "proteinchange2", 30),
+                        makeMutation(3, 'gene2', 'proteinchange2', 30),
                     ],
-                    makeCoverageInfo([1,3], [], [{
-                        i:2,
-                        notProfiledByGene:{
-                            "gene1":{
-                                molecularProfileId:"mutations",
-                                patientId:"patient",
-                                profiled: false,
-                                sampleId:`sample2`,
-                                studyId:"study",
-                                uniquePatientKey:`uniquePatientKey`,
-                                uniqueSampleKey:`uniqueKey2`
+                    makeCoverageInfo(
+                        [1, 3],
+                        [],
+                        [
+                            {
+                                i: 2,
+                                notProfiledByGene: {
+                                    gene1: {
+                                        molecularProfileId: 'mutations',
+                                        patientId: 'patient',
+                                        profiled: false,
+                                        sampleId: `sample2`,
+                                        studyId: 'study',
+                                        uniquePatientKey: `uniquePatientKey`,
+                                        uniqueSampleKey: `uniqueKey2`,
+                                    },
+                                    gene2: {
+                                        molecularProfileId: 'mutations',
+                                        patientId: 'patient',
+                                        profiled: false,
+                                        sampleId: `sample2`,
+                                        studyId: 'study',
+                                        uniquePatientKey: `uniquePatientKey`,
+                                        uniqueSampleKey: `uniqueKey2`,
+                                    },
+                                },
                             },
-                            "gene2":{
-                                molecularProfileId:"mutations",
-                                patientId:"patient",
-                                profiled: false,
-                                sampleId:`sample2`,
-                                studyId:"study",
-                                uniquePatientKey:`uniquePatientKey`,
-                                uniqueSampleKey:`uniqueKey2`
-                            }
-                        }
-                    }]),
+                        ]
+                    ),
                     MutationOncoprintMode.SAMPLE_TRACKS
                 );
 
                 const expected = {
-                    sample1:[
-                        makeOncoprintData(1, "gene1", "proteinchange1", 20, MutationStatus.MUTATED_WITH_VAF),
-                        makeOncoprintData(1, "gene3", "proteinchange3", 40, MutationStatus.MUTATED_WITH_VAF),
-                        makeOncoprintData_NoData(1, makeMutation(3, "gene2", "proteinchange2", 30), MutationStatus.PROFILED_BUT_NOT_MUTATED)
+                    sample1: [
+                        makeOncoprintData(
+                            1,
+                            'gene1',
+                            'proteinchange1',
+                            20,
+                            MutationStatus.MUTATED_WITH_VAF
+                        ),
+                        makeOncoprintData(
+                            1,
+                            'gene3',
+                            'proteinchange3',
+                            40,
+                            MutationStatus.MUTATED_WITH_VAF
+                        ),
+                        makeOncoprintData_NoData(
+                            1,
+                            makeMutation(3, 'gene2', 'proteinchange2', 30),
+                            MutationStatus.PROFILED_BUT_NOT_MUTATED
+                        ),
                     ],
-                    sample2:[
-                        makeOncoprintData(2, "gene3", "proteinchange3", undefined, MutationStatus.MUTATED_BUT_NO_VAF),
-                        makeOncoprintData_NoData(2, makeMutation(1, "gene1", "proteinchange1", 20), MutationStatus.NOT_PROFILED),
-                        makeOncoprintData_NoData(2, makeMutation(3, "gene2", "proteinchange2", 30), MutationStatus.NOT_PROFILED),
+                    sample2: [
+                        makeOncoprintData(
+                            2,
+                            'gene3',
+                            'proteinchange3',
+                            undefined,
+                            MutationStatus.MUTATED_BUT_NO_VAF
+                        ),
+                        makeOncoprintData_NoData(
+                            2,
+                            makeMutation(1, 'gene1', 'proteinchange1', 20),
+                            MutationStatus.NOT_PROFILED
+                        ),
+                        makeOncoprintData_NoData(
+                            2,
+                            makeMutation(3, 'gene2', 'proteinchange2', 30),
+                            MutationStatus.NOT_PROFILED
+                        ),
+                    ],
+                    sample3: [
+                        makeOncoprintData(
+                            3,
+                            'gene2',
+                            'proteinchange2',
+                            30,
+                            MutationStatus.MUTATED_WITH_VAF
+                        ),
+                        makeOncoprintData_NoData(
+                            3,
+                            makeMutation(1, 'gene1', 'proteinchange1', 20),
+                            MutationStatus.PROFILED_BUT_NOT_MUTATED
+                        ),
+                        makeOncoprintData_NoData(
+                            3,
+                            makeMutation(2, 'gene3', 'proteinchange3'),
+                            MutationStatus.PROFILED_BUT_NOT_MUTATED
+                        ),
                     ],
-                    sample3:[
-                        makeOncoprintData(3, "gene2", "proteinchange2", 30, MutationStatus.MUTATED_WITH_VAF),
-                        makeOncoprintData_NoData(3, makeMutation(1, "gene1", "proteinchange1", 20), MutationStatus.PROFILED_BUT_NOT_MUTATED),
-                        makeOncoprintData_NoData(3, makeMutation(2, "gene3", "proteinchange3"), MutationStatus.PROFILED_BUT_NOT_MUTATED),
-                    ]
                 };
 
                 assertDeepEqualInAnyOrder(actual, expected);
             });
-            it("returns correct result when a sample is not profiled at all", ()=>{
+            it('returns correct result when a sample is not profiled at all', () => {
                 assertDeepEqualInAnyOrder(
                     makeMutationHeatmapData(
                         [makeSample(1), makeSample(2), makeSample(3)],
                         [
-                            makeMutation(1, "gene1", "proteinchange1", 20),
-                            makeMutation(1, "gene3", "proteinchange3", 40),
+                            makeMutation(1, 'gene1', 'proteinchange1', 20),
+                            makeMutation(1, 'gene3', 'proteinchange3', 40),
 
-                            makeMutation(2, "gene1", "proteinchange1"),
-                            makeMutation(2, "gene2", "proteinchange2", 50),
-                            makeMutation(2, "gene3", "proteinchange3"),
+                            makeMutation(2, 'gene1', 'proteinchange1'),
+                            makeMutation(2, 'gene2', 'proteinchange2', 50),
+                            makeMutation(2, 'gene3', 'proteinchange3'),
                         ],
-                        makeCoverageInfo([1,2], [3]),
+                        makeCoverageInfo([1, 2], [3]),
                         MutationOncoprintMode.SAMPLE_TRACKS
                     ),
                     {
-                        sample1:[
-                            makeOncoprintData(1, "gene1", "proteinchange1", 20, MutationStatus.MUTATED_WITH_VAF),
-                            makeOncoprintData(1, "gene3", "proteinchange3", 40, MutationStatus.MUTATED_WITH_VAF),
-                            makeOncoprintData_NoData(1, makeMutation(2, "gene2", "proteinchange2", 50), MutationStatus.PROFILED_BUT_NOT_MUTATED)
-                        ],
-                        sample2:[
-                            makeOncoprintData(2, "gene1", "proteinchange1", undefined, MutationStatus.MUTATED_BUT_NO_VAF),
-                            makeOncoprintData(2, "gene2", "proteinchange2", 50, MutationStatus.MUTATED_WITH_VAF),
-                            makeOncoprintData(2, "gene3", "proteinchange3", undefined, MutationStatus.MUTATED_BUT_NO_VAF)
-                        ],
-                        sample3:[
-                            makeOncoprintData_NoData(3, makeMutation(2, "gene1", "proteinchange1"), MutationStatus.NOT_PROFILED),
-                            makeOncoprintData_NoData(3, makeMutation(2, "gene2", "proteinchange2", 50), MutationStatus.NOT_PROFILED),
-                            makeOncoprintData_NoData(3, makeMutation(2, "gene3", "proteinchange3"), MutationStatus.NOT_PROFILED)
-                        ]
+                        sample1: [
+                            makeOncoprintData(
+                                1,
+                                'gene1',
+                                'proteinchange1',
+                                20,
+                                MutationStatus.MUTATED_WITH_VAF
+                            ),
+                            makeOncoprintData(
+                                1,
+                                'gene3',
+                                'proteinchange3',
+                                40,
+                                MutationStatus.MUTATED_WITH_VAF
+                            ),
+                            makeOncoprintData_NoData(
+                                1,
+                                makeMutation(2, 'gene2', 'proteinchange2', 50),
+                                MutationStatus.PROFILED_BUT_NOT_MUTATED
+                            ),
+                        ],
+                        sample2: [
+                            makeOncoprintData(
+                                2,
+                                'gene1',
+                                'proteinchange1',
+                                undefined,
+                                MutationStatus.MUTATED_BUT_NO_VAF
+                            ),
+                            makeOncoprintData(
+                                2,
+                                'gene2',
+                                'proteinchange2',
+                                50,
+                                MutationStatus.MUTATED_WITH_VAF
+                            ),
+                            makeOncoprintData(
+                                2,
+                                'gene3',
+                                'proteinchange3',
+                                undefined,
+                                MutationStatus.MUTATED_BUT_NO_VAF
+                            ),
+                        ],
+                        sample3: [
+                            makeOncoprintData_NoData(
+                                3,
+                                makeMutation(2, 'gene1', 'proteinchange1'),
+                                MutationStatus.NOT_PROFILED
+                            ),
+                            makeOncoprintData_NoData(
+                                3,
+                                makeMutation(2, 'gene2', 'proteinchange2', 50),
+                                MutationStatus.NOT_PROFILED
+                            ),
+                            makeOncoprintData_NoData(
+                                3,
+                                makeMutation(2, 'gene3', 'proteinchange3'),
+                                MutationStatus.NOT_PROFILED
+                            ),
+                        ],
                     }
                 );
             });
         });
-        describe("mutation track mode", ()=>{
-            it("handles case of empty data", ()=>{
+        describe('mutation track mode', () => {
+            it('handles case of empty data', () => {
                 assert.deepEqual(
                     makeMutationHeatmapData(
                         [makeSample(1), makeSample(2), makeSample(3)],
                         [],
-                        makeCoverageInfo([1,2,3], []),
+                        makeCoverageInfo([1, 2, 3], []),
                         MutationOncoprintMode.MUTATION_TRACKS
                     ),
-                    {
-                    }
+                    {}
                 );
             });
-            it("returns correct result when every sample has vaf data for every mutation", ()=>{
+            it('returns correct result when every sample has vaf data for every mutation', () => {
                 assertDeepEqualInAnyOrder(
                     makeMutationHeatmapData(
                         [makeSample(1), makeSample(2), makeSample(3)],
                         [
-                            makeMutation(1, "gene1", "proteinchange1", 20),
-                            makeMutation(1, "gene2", "proteinchange2", 30, "uncalled"),
-                            makeMutation(1, "gene3", "proteinchange3", 40),
+                            makeMutation(1, 'gene1', 'proteinchange1', 20),
+                            makeMutation(
+                                1,
+                                'gene2',
+                                'proteinchange2',
+                                30,
+                                'uncalled'
+                            ),
+                            makeMutation(1, 'gene3', 'proteinchange3', 40),
 
-                            makeMutation(2, "gene1", "proteinchange1", 10),
-                            makeMutation(2, "gene2", "proteinchange2", 50),
-                            makeMutation(2, "gene3", "proteinchange3", 60),
+                            makeMutation(2, 'gene1', 'proteinchange1', 10),
+                            makeMutation(2, 'gene2', 'proteinchange2', 50),
+                            makeMutation(2, 'gene3', 'proteinchange3', 60),
 
-                            makeMutation(3, "gene1", "proteinchange1", 15),
-                            makeMutation(3, "gene2", "proteinchange2", 25),
-                            makeMutation(3, "gene3", "proteinchange3", 80),
+                            makeMutation(3, 'gene1', 'proteinchange1', 15),
+                            makeMutation(3, 'gene2', 'proteinchange2', 25),
+                            makeMutation(3, 'gene3', 'proteinchange3', 80),
                         ],
-                        makeCoverageInfo([1,2,3], []),
+                        makeCoverageInfo([1, 2, 3], []),
                         MutationOncoprintMode.MUTATION_TRACKS
                     ),
                     {
-                        [generateMutationIdByGeneAndProteinChangeAndEvent(makeMutation(1, "gene1", "proteinchange1"))]:[
-                            makeMutationModeOncoprintData(1, "gene1", "proteinchange1", 20, MutationStatus.MUTATED_WITH_VAF),
-                            makeMutationModeOncoprintData(2, "gene1", "proteinchange1", 10, MutationStatus.MUTATED_WITH_VAF),
-                            makeMutationModeOncoprintData(3, "gene1", "proteinchange1", 15, MutationStatus.MUTATED_WITH_VAF),
-                        ],
-                        [generateMutationIdByGeneAndProteinChangeAndEvent(makeMutation(1, "gene2", "proteinchange2"))]:[
-                            makeMutationModeOncoprintData(1, "gene2", "proteinchange2", 30, MutationStatus.PROFILED_WITH_READS_BUT_UNCALLED, "uncalled"),
-                            makeMutationModeOncoprintData(2, "gene2", "proteinchange2", 50, MutationStatus.MUTATED_WITH_VAF),
-                            makeMutationModeOncoprintData(3, "gene2", "proteinchange2", 25, MutationStatus.MUTATED_WITH_VAF),
-                        ],
-                        [generateMutationIdByGeneAndProteinChangeAndEvent(makeMutation(1, "gene3", "proteinchange3"))]:[
-                            makeMutationModeOncoprintData(1, "gene3", "proteinchange3", 40, MutationStatus.MUTATED_WITH_VAF),
-                            makeMutationModeOncoprintData(2, "gene3", "proteinchange3", 60, MutationStatus.MUTATED_WITH_VAF),
-                            makeMutationModeOncoprintData(3, "gene3", "proteinchange3", 80, MutationStatus.MUTATED_WITH_VAF)
-                        ]
+                        [generateMutationIdByGeneAndProteinChangeAndEvent(
+                            makeMutation(1, 'gene1', 'proteinchange1')
+                        )]: [
+                            makeMutationModeOncoprintData(
+                                1,
+                                'gene1',
+                                'proteinchange1',
+                                20,
+                                MutationStatus.MUTATED_WITH_VAF
+                            ),
+                            makeMutationModeOncoprintData(
+                                2,
+                                'gene1',
+                                'proteinchange1',
+                                10,
+                                MutationStatus.MUTATED_WITH_VAF
+                            ),
+                            makeMutationModeOncoprintData(
+                                3,
+                                'gene1',
+                                'proteinchange1',
+                                15,
+                                MutationStatus.MUTATED_WITH_VAF
+                            ),
+                        ],
+                        [generateMutationIdByGeneAndProteinChangeAndEvent(
+                            makeMutation(1, 'gene2', 'proteinchange2')
+                        )]: [
+                            makeMutationModeOncoprintData(
+                                1,
+                                'gene2',
+                                'proteinchange2',
+                                30,
+                                MutationStatus.PROFILED_WITH_READS_BUT_UNCALLED,
+                                'uncalled'
+                            ),
+                            makeMutationModeOncoprintData(
+                                2,
+                                'gene2',
+                                'proteinchange2',
+                                50,
+                                MutationStatus.MUTATED_WITH_VAF
+                            ),
+                            makeMutationModeOncoprintData(
+                                3,
+                                'gene2',
+                                'proteinchange2',
+                                25,
+                                MutationStatus.MUTATED_WITH_VAF
+                            ),
+                        ],
+                        [generateMutationIdByGeneAndProteinChangeAndEvent(
+                            makeMutation(1, 'gene3', 'proteinchange3')
+                        )]: [
+                            makeMutationModeOncoprintData(
+                                1,
+                                'gene3',
+                                'proteinchange3',
+                                40,
+                                MutationStatus.MUTATED_WITH_VAF
+                            ),
+                            makeMutationModeOncoprintData(
+                                2,
+                                'gene3',
+                                'proteinchange3',
+                                60,
+                                MutationStatus.MUTATED_WITH_VAF
+                            ),
+                            makeMutationModeOncoprintData(
+                                3,
+                                'gene3',
+                                'proteinchange3',
+                                80,
+                                MutationStatus.MUTATED_WITH_VAF
+                            ),
+                        ],
                     }
                 );
             });
-            it("returns correct result when every sample has data for every mutation, but not all have VAF", ()=>{
+            it('returns correct result when every sample has data for every mutation, but not all have VAF', () => {
                 assertDeepEqualInAnyOrder(
                     makeMutationHeatmapData(
                         [makeSample(1), makeSample(2), makeSample(3)],
                         [
-                            makeMutation(1, "gene1", "proteinchange1", 20),
-                            makeMutation(1, "gene2", "proteinchange2", 30),
-                            makeMutation(1, "gene3", "proteinchange3", 40),
+                            makeMutation(1, 'gene1', 'proteinchange1', 20),
+                            makeMutation(1, 'gene2', 'proteinchange2', 30),
+                            makeMutation(1, 'gene3', 'proteinchange3', 40),
 
-                            makeMutation(2, "gene1", "proteinchange1"),
-                            makeMutation(2, "gene2", "proteinchange2", 50),
-                            makeMutation(2, "gene3", "proteinchange3"),
+                            makeMutation(2, 'gene1', 'proteinchange1'),
+                            makeMutation(2, 'gene2', 'proteinchange2', 50),
+                            makeMutation(2, 'gene3', 'proteinchange3'),
 
-                            makeMutation(3, "gene1", "proteinchange1", 15),
-                            makeMutation(3, "gene2", "proteinchange2"),
-                            makeMutation(3, "gene3", "proteinchange3", 80),
+                            makeMutation(3, 'gene1', 'proteinchange1', 15),
+                            makeMutation(3, 'gene2', 'proteinchange2'),
+                            makeMutation(3, 'gene3', 'proteinchange3', 80),
                         ],
-                        makeCoverageInfo([1,2,3], []),
+                        makeCoverageInfo([1, 2, 3], []),
                         MutationOncoprintMode.MUTATION_TRACKS
                     ),
                     {
-                        [generateMutationIdByGeneAndProteinChangeAndEvent(makeMutation(1, "gene1", "proteinchange1"))]:[
-                            makeMutationModeOncoprintData(1, "gene1", "proteinchange1", 20, MutationStatus.MUTATED_WITH_VAF),
-                            makeMutationModeOncoprintData(2, "gene1", "proteinchange1", undefined, MutationStatus.MUTATED_BUT_NO_VAF),
-                            makeMutationModeOncoprintData(3, "gene1", "proteinchange1", 15, MutationStatus.MUTATED_WITH_VAF),
-                        ],
-                        [generateMutationIdByGeneAndProteinChangeAndEvent(makeMutation(1, "gene2", "proteinchange2"))]:[
-                            makeMutationModeOncoprintData(1, "gene2", "proteinchange2", 30, MutationStatus.MUTATED_WITH_VAF),
-                            makeMutationModeOncoprintData(2, "gene2", "proteinchange2", 50, MutationStatus.MUTATED_WITH_VAF),
-                            makeMutationModeOncoprintData(3, "gene2", "proteinchange2", undefined, MutationStatus.MUTATED_BUT_NO_VAF),
-                        ],
-                        [generateMutationIdByGeneAndProteinChangeAndEvent(makeMutation(1, "gene3", "proteinchange3"))]:[
-                            makeMutationModeOncoprintData(1, "gene3", "proteinchange3", 40, MutationStatus.MUTATED_WITH_VAF),
-                            makeMutationModeOncoprintData(2, "gene3", "proteinchange3", undefined, MutationStatus.MUTATED_BUT_NO_VAF),
-                            makeMutationModeOncoprintData(3, "gene3", "proteinchange3", 80, MutationStatus.MUTATED_WITH_VAF)
-                        ]
+                        [generateMutationIdByGeneAndProteinChangeAndEvent(
+                            makeMutation(1, 'gene1', 'proteinchange1')
+                        )]: [
+                            makeMutationModeOncoprintData(
+                                1,
+                                'gene1',
+                                'proteinchange1',
+                                20,
+                                MutationStatus.MUTATED_WITH_VAF
+                            ),
+                            makeMutationModeOncoprintData(
+                                2,
+                                'gene1',
+                                'proteinchange1',
+                                undefined,
+                                MutationStatus.MUTATED_BUT_NO_VAF
+                            ),
+                            makeMutationModeOncoprintData(
+                                3,
+                                'gene1',
+                                'proteinchange1',
+                                15,
+                                MutationStatus.MUTATED_WITH_VAF
+                            ),
+                        ],
+                        [generateMutationIdByGeneAndProteinChangeAndEvent(
+                            makeMutation(1, 'gene2', 'proteinchange2')
+                        )]: [
+                            makeMutationModeOncoprintData(
+                                1,
+                                'gene2',
+                                'proteinchange2',
+                                30,
+                                MutationStatus.MUTATED_WITH_VAF
+                            ),
+                            makeMutationModeOncoprintData(
+                                2,
+                                'gene2',
+                                'proteinchange2',
+                                50,
+                                MutationStatus.MUTATED_WITH_VAF
+                            ),
+                            makeMutationModeOncoprintData(
+                                3,
+                                'gene2',
+                                'proteinchange2',
+                                undefined,
+                                MutationStatus.MUTATED_BUT_NO_VAF
+                            ),
+                        ],
+                        [generateMutationIdByGeneAndProteinChangeAndEvent(
+                            makeMutation(1, 'gene3', 'proteinchange3')
+                        )]: [
+                            makeMutationModeOncoprintData(
+                                1,
+                                'gene3',
+                                'proteinchange3',
+                                40,
+                                MutationStatus.MUTATED_WITH_VAF
+                            ),
+                            makeMutationModeOncoprintData(
+                                2,
+                                'gene3',
+                                'proteinchange3',
+                                undefined,
+                                MutationStatus.MUTATED_BUT_NO_VAF
+                            ),
+                            makeMutationModeOncoprintData(
+                                3,
+                                'gene3',
+                                'proteinchange3',
+                                80,
+                                MutationStatus.MUTATED_WITH_VAF
+                            ),
+                        ],
                     }
                 );
             });
-            it("returns correct result when not every sample has data for every mutation", ()=>{
+            it('returns correct result when not every sample has data for every mutation', () => {
                 assertDeepEqualInAnyOrder(
                     makeMutationHeatmapData(
                         [makeSample(1), makeSample(2), makeSample(3)],
                         [
-                            makeMutation(1, "gene1", "proteinchange1", 20),
-                            makeMutation(1, "gene3", "proteinchange3", 40),
+                            makeMutation(1, 'gene1', 'proteinchange1', 20),
+                            makeMutation(1, 'gene3', 'proteinchange3', 40),
 
-                            makeMutation(2, "gene1", "proteinchange1"),
-                            makeMutation(2, "gene2", "proteinchange2", 50),
-                            makeMutation(2, "gene3", "proteinchange3"),
+                            makeMutation(2, 'gene1', 'proteinchange1'),
+                            makeMutation(2, 'gene2', 'proteinchange2', 50),
+                            makeMutation(2, 'gene3', 'proteinchange3'),
 
-                            makeMutation(3, "gene2", "proteinchange2"),
+                            makeMutation(3, 'gene2', 'proteinchange2'),
                         ],
-                        makeCoverageInfo([1,2,3], []),
+                        makeCoverageInfo([1, 2, 3], []),
                         MutationOncoprintMode.MUTATION_TRACKS
-                    ),{
-                        [generateMutationIdByGeneAndProteinChangeAndEvent(makeMutation(1, "gene1", "proteinchange1"))]:[
-                            makeMutationModeOncoprintData(1, "gene1", "proteinchange1", 20, MutationStatus.MUTATED_WITH_VAF),
-                            makeMutationModeOncoprintData(2, "gene1", "proteinchange1", undefined, MutationStatus.MUTATED_BUT_NO_VAF),
-                            makeMutationModeOncoprintData_NoData(3, makeMutation(2, "gene1", "proteinchange1"), MutationStatus.PROFILED_BUT_NOT_MUTATED),
-                        ],
-                        [generateMutationIdByGeneAndProteinChangeAndEvent(makeMutation(1, "gene2", "proteinchange2"))]:[
-                            makeMutationModeOncoprintData_NoData(1, makeMutation(3, "gene2", "proteinchange2"), MutationStatus.PROFILED_BUT_NOT_MUTATED),
-                            makeMutationModeOncoprintData(2, "gene2", "proteinchange2", 50, MutationStatus.MUTATED_WITH_VAF),
-                            makeMutationModeOncoprintData(3, "gene2", "proteinchange2", undefined, MutationStatus.MUTATED_BUT_NO_VAF),
-                        ],
-                        [generateMutationIdByGeneAndProteinChangeAndEvent(makeMutation(1, "gene3", "proteinchange3"))]:[
-                            makeMutationModeOncoprintData(1, "gene3", "proteinchange3", 40, MutationStatus.MUTATED_WITH_VAF),
-                            makeMutationModeOncoprintData(2, "gene3", "proteinchange3", undefined, MutationStatus.MUTATED_BUT_NO_VAF),
-                            makeMutationModeOncoprintData_NoData(3, makeMutation(2, "gene3", "proteinchange3"), MutationStatus.PROFILED_BUT_NOT_MUTATED),
-                        ]
+                    ),
+                    {
+                        [generateMutationIdByGeneAndProteinChangeAndEvent(
+                            makeMutation(1, 'gene1', 'proteinchange1')
+                        )]: [
+                            makeMutationModeOncoprintData(
+                                1,
+                                'gene1',
+                                'proteinchange1',
+                                20,
+                                MutationStatus.MUTATED_WITH_VAF
+                            ),
+                            makeMutationModeOncoprintData(
+                                2,
+                                'gene1',
+                                'proteinchange1',
+                                undefined,
+                                MutationStatus.MUTATED_BUT_NO_VAF
+                            ),
+                            makeMutationModeOncoprintData_NoData(
+                                3,
+                                makeMutation(2, 'gene1', 'proteinchange1'),
+                                MutationStatus.PROFILED_BUT_NOT_MUTATED
+                            ),
+                        ],
+                        [generateMutationIdByGeneAndProteinChangeAndEvent(
+                            makeMutation(1, 'gene2', 'proteinchange2')
+                        )]: [
+                            makeMutationModeOncoprintData_NoData(
+                                1,
+                                makeMutation(3, 'gene2', 'proteinchange2'),
+                                MutationStatus.PROFILED_BUT_NOT_MUTATED
+                            ),
+                            makeMutationModeOncoprintData(
+                                2,
+                                'gene2',
+                                'proteinchange2',
+                                50,
+                                MutationStatus.MUTATED_WITH_VAF
+                            ),
+                            makeMutationModeOncoprintData(
+                                3,
+                                'gene2',
+                                'proteinchange2',
+                                undefined,
+                                MutationStatus.MUTATED_BUT_NO_VAF
+                            ),
+                        ],
+                        [generateMutationIdByGeneAndProteinChangeAndEvent(
+                            makeMutation(1, 'gene3', 'proteinchange3')
+                        )]: [
+                            makeMutationModeOncoprintData(
+                                1,
+                                'gene3',
+                                'proteinchange3',
+                                40,
+                                MutationStatus.MUTATED_WITH_VAF
+                            ),
+                            makeMutationModeOncoprintData(
+                                2,
+                                'gene3',
+                                'proteinchange3',
+                                undefined,
+                                MutationStatus.MUTATED_BUT_NO_VAF
+                            ),
+                            makeMutationModeOncoprintData_NoData(
+                                3,
+                                makeMutation(2, 'gene3', 'proteinchange3'),
+                                MutationStatus.PROFILED_BUT_NOT_MUTATED
+                            ),
+                        ],
                     }
                 );
             });
-            it("returns correct result when one sample has no data for any mutation", ()=>{
+            it('returns correct result when one sample has no data for any mutation', () => {
                 assertDeepEqualInAnyOrder(
                     makeMutationHeatmapData(
                         [makeSample(1), makeSample(2), makeSample(3)],
                         [
-                            makeMutation(1, "gene1", "proteinchange1", 20),
-                            makeMutation(1, "gene3", "proteinchange3", 40),
+                            makeMutation(1, 'gene1', 'proteinchange1', 20),
+                            makeMutation(1, 'gene3', 'proteinchange3', 40),
 
-                            makeMutation(2, "gene1", "proteinchange1"),
-                            makeMutation(2, "gene2", "proteinchange2", 50),
-                            makeMutation(2, "gene3", "proteinchange3"),
+                            makeMutation(2, 'gene1', 'proteinchange1'),
+                            makeMutation(2, 'gene2', 'proteinchange2', 50),
+                            makeMutation(2, 'gene3', 'proteinchange3'),
                         ],
-                        makeCoverageInfo([1,2,3], []),
+                        makeCoverageInfo([1, 2, 3], []),
                         MutationOncoprintMode.MUTATION_TRACKS
-                    ),{
-                        [generateMutationIdByGeneAndProteinChangeAndEvent(makeMutation(1, "gene1", "proteinchange1"))]:[
-                            makeMutationModeOncoprintData(1, "gene1", "proteinchange1", 20, MutationStatus.MUTATED_WITH_VAF),
-                            makeMutationModeOncoprintData(2, "gene1", "proteinchange1", undefined, MutationStatus.MUTATED_BUT_NO_VAF),
-                            makeMutationModeOncoprintData_NoData(3, makeMutation(2, "gene1", "proteinchange1"), MutationStatus.PROFILED_BUT_NOT_MUTATED),
-                        ],
-                        [generateMutationIdByGeneAndProteinChangeAndEvent(makeMutation(1, "gene2", "proteinchange2"))]:[
-                            makeMutationModeOncoprintData_NoData(1, makeMutation(2, "gene2", "proteinchange2", 50), MutationStatus.PROFILED_BUT_NOT_MUTATED),
-                            makeMutationModeOncoprintData(2, "gene2", "proteinchange2", 50, MutationStatus.MUTATED_WITH_VAF),
-                            makeMutationModeOncoprintData_NoData(3, makeMutation(2, "gene2", "proteinchange2", 50), MutationStatus.PROFILED_BUT_NOT_MUTATED),
-                        ],
-                        [generateMutationIdByGeneAndProteinChangeAndEvent(makeMutation(1, "gene3", "proteinchange3"))]:[
-                            makeMutationModeOncoprintData(1, "gene3", "proteinchange3", 40, MutationStatus.MUTATED_WITH_VAF),
-                            makeMutationModeOncoprintData(2, "gene3", "proteinchange3", undefined, MutationStatus.MUTATED_BUT_NO_VAF),
-                            makeMutationModeOncoprintData_NoData(3, makeMutation(2, "gene3", "proteinchange3"), MutationStatus.PROFILED_BUT_NOT_MUTATED)
-                        ]
+                    ),
+                    {
+                        [generateMutationIdByGeneAndProteinChangeAndEvent(
+                            makeMutation(1, 'gene1', 'proteinchange1')
+                        )]: [
+                            makeMutationModeOncoprintData(
+                                1,
+                                'gene1',
+                                'proteinchange1',
+                                20,
+                                MutationStatus.MUTATED_WITH_VAF
+                            ),
+                            makeMutationModeOncoprintData(
+                                2,
+                                'gene1',
+                                'proteinchange1',
+                                undefined,
+                                MutationStatus.MUTATED_BUT_NO_VAF
+                            ),
+                            makeMutationModeOncoprintData_NoData(
+                                3,
+                                makeMutation(2, 'gene1', 'proteinchange1'),
+                                MutationStatus.PROFILED_BUT_NOT_MUTATED
+                            ),
+                        ],
+                        [generateMutationIdByGeneAndProteinChangeAndEvent(
+                            makeMutation(1, 'gene2', 'proteinchange2')
+                        )]: [
+                            makeMutationModeOncoprintData_NoData(
+                                1,
+                                makeMutation(2, 'gene2', 'proteinchange2', 50),
+                                MutationStatus.PROFILED_BUT_NOT_MUTATED
+                            ),
+                            makeMutationModeOncoprintData(
+                                2,
+                                'gene2',
+                                'proteinchange2',
+                                50,
+                                MutationStatus.MUTATED_WITH_VAF
+                            ),
+                            makeMutationModeOncoprintData_NoData(
+                                3,
+                                makeMutation(2, 'gene2', 'proteinchange2', 50),
+                                MutationStatus.PROFILED_BUT_NOT_MUTATED
+                            ),
+                        ],
+                        [generateMutationIdByGeneAndProteinChangeAndEvent(
+                            makeMutation(1, 'gene3', 'proteinchange3')
+                        )]: [
+                            makeMutationModeOncoprintData(
+                                1,
+                                'gene3',
+                                'proteinchange3',
+                                40,
+                                MutationStatus.MUTATED_WITH_VAF
+                            ),
+                            makeMutationModeOncoprintData(
+                                2,
+                                'gene3',
+                                'proteinchange3',
+                                undefined,
+                                MutationStatus.MUTATED_BUT_NO_VAF
+                            ),
+                            makeMutationModeOncoprintData_NoData(
+                                3,
+                                makeMutation(2, 'gene3', 'proteinchange3'),
+                                MutationStatus.PROFILED_BUT_NOT_MUTATED
+                            ),
+                        ],
                     }
                 );
             });
-            it("returns correct result when some not profiled", ()=>{
-
+            it('returns correct result when some not profiled', () => {
                 const actual = makeMutationHeatmapData(
                     [makeSample(1), makeSample(2), makeSample(3)],
                     [
-                        makeMutation(1, "gene1", "proteinchange1", 20),
-                        makeMutation(1, "gene3", "proteinchange3", 40),
+                        makeMutation(1, 'gene1', 'proteinchange1', 20),
+                        makeMutation(1, 'gene3', 'proteinchange3', 40),
 
-                        makeMutation(2, "gene3", "proteinchange3"),
+                        makeMutation(2, 'gene3', 'proteinchange3'),
 
-                        makeMutation(3, "gene2", "proteinchange2", 30),
+                        makeMutation(3, 'gene2', 'proteinchange2', 30),
                     ],
-                    makeCoverageInfo([1,3], [], [{
-                        i:2,
-                        notProfiledByGene:{
-                            "gene1":{
-                                molecularProfileId:"mutations",
-                                patientId:"patient",
-                                profiled: false,
-                                sampleId:`sample2`,
-                                studyId:"study",
-                                uniquePatientKey:`uniquePatientKey`,
-                                uniqueSampleKey:`uniqueKey2`
+                    makeCoverageInfo(
+                        [1, 3],
+                        [],
+                        [
+                            {
+                                i: 2,
+                                notProfiledByGene: {
+                                    gene1: {
+                                        molecularProfileId: 'mutations',
+                                        patientId: 'patient',
+                                        profiled: false,
+                                        sampleId: `sample2`,
+                                        studyId: 'study',
+                                        uniquePatientKey: `uniquePatientKey`,
+                                        uniqueSampleKey: `uniqueKey2`,
+                                    },
+                                    gene2: {
+                                        molecularProfileId: 'mutations',
+                                        patientId: 'patient',
+                                        profiled: false,
+                                        sampleId: `sample2`,
+                                        studyId: 'study',
+                                        uniquePatientKey: `uniquePatientKey`,
+                                        uniqueSampleKey: `uniqueKey2`,
+                                    },
+                                },
                             },
-                            "gene2":{
-                                molecularProfileId:"mutations",
-                                patientId:"patient",
-                                profiled: false,
-                                sampleId:`sample2`,
-                                studyId:"study",
-                                uniquePatientKey:`uniquePatientKey`,
-                                uniqueSampleKey:`uniqueKey2`
-                            }
-                        }
-                    }]),
+                        ]
+                    ),
                     MutationOncoprintMode.MUTATION_TRACKS
                 );
 
                 const expected = {
-                    [generateMutationIdByGeneAndProteinChangeAndEvent(makeMutation(1, "gene1", "proteinchange1"))]:[
-                        makeMutationModeOncoprintData(1, "gene1", "proteinchange1", 20, MutationStatus.MUTATED_WITH_VAF),
-                        makeMutationModeOncoprintData_NoData(2, makeMutation(1, "gene1", "proteinchange1", 20), MutationStatus.NOT_PROFILED),
-                        makeMutationModeOncoprintData_NoData(3, makeMutation(1, "gene1", "proteinchange1", 20), MutationStatus.PROFILED_BUT_NOT_MUTATED),
+                    [generateMutationIdByGeneAndProteinChangeAndEvent(
+                        makeMutation(1, 'gene1', 'proteinchange1')
+                    )]: [
+                        makeMutationModeOncoprintData(
+                            1,
+                            'gene1',
+                            'proteinchange1',
+                            20,
+                            MutationStatus.MUTATED_WITH_VAF
+                        ),
+                        makeMutationModeOncoprintData_NoData(
+                            2,
+                            makeMutation(1, 'gene1', 'proteinchange1', 20),
+                            MutationStatus.NOT_PROFILED
+                        ),
+                        makeMutationModeOncoprintData_NoData(
+                            3,
+                            makeMutation(1, 'gene1', 'proteinchange1', 20),
+                            MutationStatus.PROFILED_BUT_NOT_MUTATED
+                        ),
+                    ],
+                    [generateMutationIdByGeneAndProteinChangeAndEvent(
+                        makeMutation(1, 'gene2', 'proteinchange2')
+                    )]: [
+                        makeMutationModeOncoprintData_NoData(
+                            1,
+                            makeMutation(3, 'gene2', 'proteinchange2', 30),
+                            MutationStatus.PROFILED_BUT_NOT_MUTATED
+                        ),
+                        makeMutationModeOncoprintData_NoData(
+                            2,
+                            makeMutation(3, 'gene2', 'proteinchange2', 30),
+                            MutationStatus.NOT_PROFILED
+                        ),
+                        makeMutationModeOncoprintData(
+                            3,
+                            'gene2',
+                            'proteinchange2',
+                            30,
+                            MutationStatus.MUTATED_WITH_VAF
+                        ),
                     ],
-                    [generateMutationIdByGeneAndProteinChangeAndEvent(makeMutation(1, "gene2", "proteinchange2"))]:[
-                        makeMutationModeOncoprintData_NoData(1, makeMutation(3, "gene2", "proteinchange2", 30), MutationStatus.PROFILED_BUT_NOT_MUTATED),
-                        makeMutationModeOncoprintData_NoData(2, makeMutation(3, "gene2", "proteinchange2", 30), MutationStatus.NOT_PROFILED),
-                        makeMutationModeOncoprintData(3, "gene2", "proteinchange2", 30, MutationStatus.MUTATED_WITH_VAF),
+                    [generateMutationIdByGeneAndProteinChangeAndEvent(
+                        makeMutation(1, 'gene3', 'proteinchange3')
+                    )]: [
+                        makeMutationModeOncoprintData(
+                            1,
+                            'gene3',
+                            'proteinchange3',
+                            40,
+                            MutationStatus.MUTATED_WITH_VAF
+                        ),
+                        makeMutationModeOncoprintData(
+                            2,
+                            'gene3',
+                            'proteinchange3',
+                            undefined,
+                            MutationStatus.MUTATED_BUT_NO_VAF
+                        ),
+                        makeMutationModeOncoprintData_NoData(
+                            3,
+                            makeMutation(2, 'gene3', 'proteinchange3'),
+                            MutationStatus.PROFILED_BUT_NOT_MUTATED
+                        ),
                     ],
-                    [generateMutationIdByGeneAndProteinChangeAndEvent(makeMutation(1, "gene3", "proteinchange3"))]:[
-                        makeMutationModeOncoprintData(1, "gene3", "proteinchange3", 40, MutationStatus.MUTATED_WITH_VAF),
-                        makeMutationModeOncoprintData(2, "gene3", "proteinchange3", undefined, MutationStatus.MUTATED_BUT_NO_VAF),
-                        makeMutationModeOncoprintData_NoData(3, makeMutation(2, "gene3", "proteinchange3"), MutationStatus.PROFILED_BUT_NOT_MUTATED),
-                    ]
                 };
 
                 assertDeepEqualInAnyOrder(actual, expected);
             });
-            it("returns correct result when a sample is not profiled at all", ()=>{
+            it('returns correct result when a sample is not profiled at all', () => {
                 assertDeepEqualInAnyOrder(
                     makeMutationHeatmapData(
                         [makeSample(1), makeSample(2), makeSample(3)],
                         [
-                            makeMutation(1, "gene1", "proteinchange1", 20),
-                            makeMutation(1, "gene3", "proteinchange3", 40),
+                            makeMutation(1, 'gene1', 'proteinchange1', 20),
+                            makeMutation(1, 'gene3', 'proteinchange3', 40),
 
-                            makeMutation(2, "gene1", "proteinchange1"),
-                            makeMutation(2, "gene2", "proteinchange2", 50),
-                            makeMutation(2, "gene3", "proteinchange3"),
+                            makeMutation(2, 'gene1', 'proteinchange1'),
+                            makeMutation(2, 'gene2', 'proteinchange2', 50),
+                            makeMutation(2, 'gene3', 'proteinchange3'),
                         ],
-                        makeCoverageInfo([1,2], [3]),
+                        makeCoverageInfo([1, 2], [3]),
                         MutationOncoprintMode.MUTATION_TRACKS
                     ),
                     {
-                        [generateMutationIdByGeneAndProteinChangeAndEvent(makeMutation(1, "gene1", "proteinchange1"))]:[
-                            makeMutationModeOncoprintData(1, "gene1", "proteinchange1", 20, MutationStatus.MUTATED_WITH_VAF),
-                            makeMutationModeOncoprintData(2, "gene1", "proteinchange1", undefined, MutationStatus.MUTATED_BUT_NO_VAF),
-                            makeMutationModeOncoprintData_NoData(3, makeMutation(2, "gene1", "proteinchange1"), MutationStatus.NOT_PROFILED),
-                        ],
-                        [generateMutationIdByGeneAndProteinChangeAndEvent(makeMutation(1, "gene2", "proteinchange2"))]:[
-                            makeMutationModeOncoprintData_NoData(1, makeMutation(2, "gene2", "proteinchange2", 50), MutationStatus.PROFILED_BUT_NOT_MUTATED),
-                            makeMutationModeOncoprintData(2, "gene2", "proteinchange2", 50, MutationStatus.MUTATED_WITH_VAF),
-                            makeMutationModeOncoprintData_NoData(3, makeMutation(2, "gene2", "proteinchange2", 50), MutationStatus.NOT_PROFILED),
-                        ],
-                        [generateMutationIdByGeneAndProteinChangeAndEvent(makeMutation(1, "gene3", "proteinchange3"))]:[
-                            makeMutationModeOncoprintData(1, "gene3", "proteinchange3", 40, MutationStatus.MUTATED_WITH_VAF),
-                            makeMutationModeOncoprintData(2, "gene3", "proteinchange3", undefined, MutationStatus.MUTATED_BUT_NO_VAF),
-                            makeMutationModeOncoprintData_NoData(3, makeMutation(2, "gene3", "proteinchange3"), MutationStatus.NOT_PROFILED)
-                        ]
+                        [generateMutationIdByGeneAndProteinChangeAndEvent(
+                            makeMutation(1, 'gene1', 'proteinchange1')
+                        )]: [
+                            makeMutationModeOncoprintData(
+                                1,
+                                'gene1',
+                                'proteinchange1',
+                                20,
+                                MutationStatus.MUTATED_WITH_VAF
+                            ),
+                            makeMutationModeOncoprintData(
+                                2,
+                                'gene1',
+                                'proteinchange1',
+                                undefined,
+                                MutationStatus.MUTATED_BUT_NO_VAF
+                            ),
+                            makeMutationModeOncoprintData_NoData(
+                                3,
+                                makeMutation(2, 'gene1', 'proteinchange1'),
+                                MutationStatus.NOT_PROFILED
+                            ),
+                        ],
+                        [generateMutationIdByGeneAndProteinChangeAndEvent(
+                            makeMutation(1, 'gene2', 'proteinchange2')
+                        )]: [
+                            makeMutationModeOncoprintData_NoData(
+                                1,
+                                makeMutation(2, 'gene2', 'proteinchange2', 50),
+                                MutationStatus.PROFILED_BUT_NOT_MUTATED
+                            ),
+                            makeMutationModeOncoprintData(
+                                2,
+                                'gene2',
+                                'proteinchange2',
+                                50,
+                                MutationStatus.MUTATED_WITH_VAF
+                            ),
+                            makeMutationModeOncoprintData_NoData(
+                                3,
+                                makeMutation(2, 'gene2', 'proteinchange2', 50),
+                                MutationStatus.NOT_PROFILED
+                            ),
+                        ],
+                        [generateMutationIdByGeneAndProteinChangeAndEvent(
+                            makeMutation(1, 'gene3', 'proteinchange3')
+                        )]: [
+                            makeMutationModeOncoprintData(
+                                1,
+                                'gene3',
+                                'proteinchange3',
+                                40,
+                                MutationStatus.MUTATED_WITH_VAF
+                            ),
+                            makeMutationModeOncoprintData(
+                                2,
+                                'gene3',
+                                'proteinchange3',
+                                undefined,
+                                MutationStatus.MUTATED_BUT_NO_VAF
+                            ),
+                            makeMutationModeOncoprintData_NoData(
+                                3,
+                                makeMutation(2, 'gene3', 'proteinchange3'),
+                                MutationStatus.NOT_PROFILED
+                            ),
+                        ],
                     }
                 );
             });
         });
     });
-});
\ No newline at end of file
+});
diff --git a/src/pages/patientView/mutation/oncoprint/MutationOncoprintUtils.ts b/src/pages/patientView/mutation/oncoprint/MutationOncoprintUtils.ts
index c33c3d88b3f..6c7f9f8abe5 100644
--- a/src/pages/patientView/mutation/oncoprint/MutationOncoprintUtils.ts
+++ b/src/pages/patientView/mutation/oncoprint/MutationOncoprintUtils.ts
@@ -1,70 +1,87 @@
-import {Mutation, Sample} from "../../../../shared/api/generated/CBioPortalAPI";
-import _ from "lodash";
-import {generateMutationIdByGeneAndProteinChangeAndEvent} from "../../../../shared/lib/StoreUtils";
-import {IGeneHeatmapTrackDatum, IHeatmapTrackSpec} from "../../../../shared/components/oncoprint/Oncoprint";
-import {CoverageInformation} from "../../../resultsView/ResultsViewPageStoreUtils";
-import {isSampleProfiled} from "../../../../shared/lib/isSampleProfiled";
-import {MutationStatus} from "../PatientViewMutationsTabUtils";
-import {getVariantAlleleFrequency} from "../../../../shared/lib/MutationUtils";
-import {MutationOncoprintMode} from "./MutationOncoprint";
-import {ShapeParams} from "oncoprintjs/dist/js/oncoprintshape";
+import {
+    Mutation,
+    Sample,
+} from '../../../../shared/api/generated/CBioPortalAPI';
+import _ from 'lodash';
+import { generateMutationIdByGeneAndProteinChangeAndEvent } from '../../../../shared/lib/StoreUtils';
+import {
+    IGeneHeatmapTrackDatum,
+    IHeatmapTrackSpec,
+} from '../../../../shared/components/oncoprint/Oncoprint';
+import { CoverageInformation } from '../../../resultsView/ResultsViewPageStoreUtils';
+import { isSampleProfiled } from '../../../../shared/lib/isSampleProfiled';
+import { MutationStatus } from '../PatientViewMutationsTabUtils';
+import { getVariantAlleleFrequency } from '../../../../shared/lib/MutationUtils';
+import { MutationOncoprintMode } from './MutationOncoprint';
+import { ShapeParams } from 'oncoprintjs/dist/js/oncoprintshape';
 
 export interface IMutationOncoprintTrackDatum extends IGeneHeatmapTrackDatum {
-    mutation:Mutation;
-    mutationStatus:MutationStatus;
-    mutationId:string;
+    mutation: Mutation;
+    mutationStatus: MutationStatus;
+    mutationId: string;
 }
 
-export const MUTATION_ONCOPRINT_NA_SHAPES:ShapeParams[] = [
+export const MUTATION_ONCOPRINT_NA_SHAPES: ShapeParams[] = [
     {
-        'type': 'rectangle',
-        'fill': 'rgba(255,255,255,1)',
-        'z':1000
-    }, {
-        'type': 'line',
-        'stroke': 'rgba(190,190,190,1)',
+        type: 'rectangle',
+        fill: 'rgba(255,255,255,1)',
+        z: 1000,
+    },
+    {
+        type: 'line',
+        stroke: 'rgba(190,190,190,1)',
         'stroke-width': 1,
-        'x1': 20,
-        'x2': 80,
-        'y1':50,
-        'y2':50,
-        'z':1000
-    }
+        x1: 20,
+        x2: 80,
+        y1: 50,
+        y2: 50,
+        z: 1000,
+    },
 ];
 
 export interface IMutationOncoprintTrackSpec extends IHeatmapTrackSpec {
-    data:IMutationOncoprintTrackDatum[];
+    data: IMutationOncoprintTrackDatum[];
 }
 
-export function getMutationLabel(mutation:Mutation) {
+export function getMutationLabel(mutation: Mutation) {
     return `${mutation.gene.hugoGeneSymbol} ${mutation.proteinChange}`;
 }
 
 export function makeMutationHeatmapData(
-    samples:Sample[],
-    mutations:Mutation[],
-    coverageInformation:CoverageInformation,
-    mode:MutationOncoprintMode
+    samples: Sample[],
+    mutations: Mutation[],
+    coverageInformation: CoverageInformation,
+    mode: MutationOncoprintMode
 ) {
-    const mutationsByKey = _.keyBy(mutations, generateMutationIdByGeneAndProteinChangeAndEvent);
-    const mutationsBySample = _.groupBy(mutations, m=>m.uniqueSampleKey);
-    const mutationHasAtLeastOneVAF = _.mapValues(mutationsByKey, ()=>false);
+    const mutationsByKey = _.keyBy(
+        mutations,
+        generateMutationIdByGeneAndProteinChangeAndEvent
+    );
+    const mutationsBySample = _.groupBy(mutations, m => m.uniqueSampleKey);
+    const mutationHasAtLeastOneVAF = _.mapValues(mutationsByKey, () => false);
 
-    let oncoprintData:IMutationOncoprintTrackDatum[] = [];
+    let oncoprintData: IMutationOncoprintTrackDatum[] = [];
     for (const sample of samples) {
         const sampleMutations = mutationsBySample[sample.uniqueSampleKey] || [];
-        const mutationKeys:{[mutationId:string]:boolean} = {};
+        const mutationKeys: { [mutationId: string]: boolean } = {};
         for (const mutation of sampleMutations) {
-            const mutationId = generateMutationIdByGeneAndProteinChangeAndEvent(mutation);
-            const uid = mode === MutationOncoprintMode.SAMPLE_TRACKS ? mutationId : sample.sampleId;
-            const isUncalled = mutation.mutationStatus.toLowerCase() === "uncalled";
+            const mutationId = generateMutationIdByGeneAndProteinChangeAndEvent(
+                mutation
+            );
+            const uid =
+                mode === MutationOncoprintMode.SAMPLE_TRACKS
+                    ? mutationId
+                    : sample.sampleId;
+            const isUncalled =
+                mutation.mutationStatus.toLowerCase() === 'uncalled';
             if (!isUncalled || mutation.tumorAltCount > 0) {
                 mutationKeys[mutationId] = true;
                 let vaf = getVariantAlleleFrequency(mutation);
 
                 let mutationStatus;
                 if (isUncalled) {
-                    mutationStatus = MutationStatus.PROFILED_WITH_READS_BUT_UNCALLED;
+                    mutationStatus =
+                        MutationStatus.PROFILED_WITH_READS_BUT_UNCALLED;
                 } else if (vaf === null) {
                     mutationStatus = MutationStatus.MUTATED_BUT_NO_VAF;
                 } else {
@@ -73,27 +90,33 @@ export function makeMutationHeatmapData(
                 }
 
                 oncoprintData.push({
-                    profile_data:vaf,
+                    profile_data: vaf,
                     sample: sample.sampleId,
                     patient: sample.patientId,
                     study_id: sample.studyId,
-                    hugo_gene_symbol:"", // not used by us
+                    hugo_gene_symbol: '', // not used by us
                     mutation,
                     uid,
                     mutationId,
-                    mutationStatus
+                    mutationStatus,
                 });
             }
         }
 
         // fill in data for missing mutations
 
-        const noData = Object.keys(mutationsByKey).filter(key=>!(key in mutationKeys))
-                        .map(key=>mutationsByKey[key]);
+        const noData = Object.keys(mutationsByKey)
+            .filter(key => !(key in mutationKeys))
+            .map(key => mutationsByKey[key]);
 
         for (const mutation of noData) {
-            const mutationId = generateMutationIdByGeneAndProteinChangeAndEvent(mutation);
-            const uid = mode === MutationOncoprintMode.SAMPLE_TRACKS ? mutationId : sample.sampleId;
+            const mutationId = generateMutationIdByGeneAndProteinChangeAndEvent(
+                mutation
+            );
+            const uid =
+                mode === MutationOncoprintMode.SAMPLE_TRACKS
+                    ? mutationId
+                    : sample.sampleId;
             const isProfiledForGene = isSampleProfiled(
                 sample.uniqueSampleKey,
                 mutation.molecularProfileId,
@@ -101,45 +124,52 @@ export function makeMutationHeatmapData(
                 coverageInformation
             );
             oncoprintData.push({
-                profile_data:null,
+                profile_data: null,
                 sample: sample.sampleId,
                 patient: sample.patientId,
                 study_id: sample.studyId,
-                hugo_gene_symbol:"", // not used by us
+                hugo_gene_symbol: '', // not used by us
                 mutation,
                 uid,
                 mutationId,
-                mutationStatus: isProfiledForGene ? MutationStatus.PROFILED_BUT_NOT_MUTATED : MutationStatus.NOT_PROFILED,
-                na: !isProfiledForGene
+                mutationStatus: isProfiledForGene
+                    ? MutationStatus.PROFILED_BUT_NOT_MUTATED
+                    : MutationStatus.NOT_PROFILED,
+                na: !isProfiledForGene,
             });
         }
     }
 
     // filter out data for mutations where none of them have data
-    oncoprintData = oncoprintData.filter(d=>mutationHasAtLeastOneVAF[d.mutationId]);
+    oncoprintData = oncoprintData.filter(
+        d => mutationHasAtLeastOneVAF[d.mutationId]
+    );
 
     // group data by track
     if (mode === MutationOncoprintMode.SAMPLE_TRACKS) {
-        return _.groupBy(oncoprintData, d=>d.sample);
+        return _.groupBy(oncoprintData, d => d.sample);
     } else {
-        return _.groupBy(oncoprintData, d=>d.mutationId);
+        return _.groupBy(oncoprintData, d => d.mutationId);
     }
 }
 
-export function getDownloadData(
-    data:IMutationOncoprintTrackDatum[]
-) {
+export function getDownloadData(data: IMutationOncoprintTrackDatum[]) {
     const downloadData = [];
-    downloadData.push(["Sample_ID", "Gene", "Protein_Change", "Variant_Allele_Frequency"]);
+    downloadData.push([
+        'Sample_ID',
+        'Gene',
+        'Protein_Change',
+        'Variant_Allele_Frequency',
+    ]);
     for (const datum of data) {
         if (datum.profile_data !== null) {
             downloadData.push([
                 datum.sample,
                 datum.mutation.gene.hugoGeneSymbol,
                 datum.mutation.proteinChange,
-                datum.profile_data
+                datum.profile_data,
             ]);
         }
     }
-    return downloadData.map(line=>line.join("\t")).join("\n");
-}
\ No newline at end of file
+    return downloadData.map(line => line.join('\t')).join('\n');
+}
diff --git a/src/pages/patientView/mutation/oncoprint/styles.module.scss b/src/pages/patientView/mutation/oncoprint/styles.module.scss
index d6ad9b73b1c..c8674d2b96d 100644
--- a/src/pages/patientView/mutation/oncoprint/styles.module.scss
+++ b/src/pages/patientView/mutation/oncoprint/styles.module.scss
@@ -1,41 +1,44 @@
 .zoomControls {
-  display:flex !important;
-  align-items:center;
-  border:1px solid #e4e4e4;
-  border-radius: 5px;
-  padding:3px 5px;
-  margin-left:5px;
+    display: flex !important;
+    align-items: center;
+    border: 1px solid #e4e4e4;
+    border-radius: 5px;
+    padding: 3px 5px;
+    margin-left: 5px;
 
-  > * {
-    margin-right:10px;
-  }
-
-  > :last-child {
-    margin-right:0;
-  }
-
-  > .zoomButton {
-    cursor: pointer;
-  }
-
-  :global(.rangeslider) {
-    margin:0;
-    :global(.rangeslider__labels) {
-      display:none;
+    > * {
+        margin-right: 10px;
     }
-    :global(.rangeslider__handle) {
-      height:15px;
-      width:15px;
-      &:after {
-        width:9px;
-        height:9px;
-        top:2px;
-        left:2px;
-      }
+
+    > :last-child {
+        margin-right: 0;
     }
-    :global(.rangeslider__fill) {
-      background-image: linear-gradient(to bottom, #89cdef 0, #81bfde 100%);
+
+    > .zoomButton {
+        cursor: pointer;
     }
-  }
 
-}
\ No newline at end of file
+    :global(.rangeslider) {
+        margin: 0;
+        :global(.rangeslider__labels) {
+            display: none;
+        }
+        :global(.rangeslider__handle) {
+            height: 15px;
+            width: 15px;
+            &:after {
+                width: 9px;
+                height: 9px;
+                top: 2px;
+                left: 2px;
+            }
+        }
+        :global(.rangeslider__fill) {
+            background-image: linear-gradient(
+                to bottom,
+                #89cdef 0,
+                #81bfde 100%
+            );
+        }
+    }
+}
diff --git a/src/pages/patientView/mutation/style.scss b/src/pages/patientView/mutation/style.scss
index 532cca9dc32..8363a8607fd 100644
--- a/src/pages/patientView/mutation/style.scss
+++ b/src/pages/patientView/mutation/style.scss
@@ -2,4 +2,4 @@ div.lazy-mobx-table {
     .rc-tooltip {
         opacity: 1;
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/patientView/mutation/styles.module.scss b/src/pages/patientView/mutation/styles.module.scss
index 253a21090f3..ccf9a26b1bc 100644
--- a/src/pages/patientView/mutation/styles.module.scss
+++ b/src/pages/patientView/mutation/styles.module.scss
@@ -1,15 +1,15 @@
 .Tooltip {
-  border-radius: 3px !important;
+    border-radius: 3px !important;
 
-  & > :global(.popover-content) {
-    padding: 8px 10px;
-  }
+    & > :global(.popover-content) {
+        padding: 8px 10px;
+    }
 }
 
 div:global(#MutationHeatmap) :global(.oncoprintjs__tooltip) {
-  border-radius: 3px !important;
-  padding: 8px 10px;
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 12px;
-  transform:translate(0px, -2px);
- }
\ No newline at end of file
+    border-radius: 3px !important;
+    padding: 8px 10px;
+    font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+    font-size: 12px;
+    transform: translate(0px, -2px);
+}
diff --git a/src/pages/patientView/pathologyReport/PathologyReport.tsx b/src/pages/patientView/pathologyReport/PathologyReport.tsx
index 7a3e42513a5..acbccbf2f54 100644
--- a/src/pages/patientView/pathologyReport/PathologyReport.tsx
+++ b/src/pages/patientView/pathologyReport/PathologyReport.tsx
@@ -1,65 +1,69 @@
 import * as React from 'react';
-import {PathologyReportPDF} from "../clinicalInformation/PatientViewPageStore";
+import { PathologyReportPDF } from '../clinicalInformation/PatientViewPageStore';
 import { If, Then, Else } from 'react-if';
 import * as _ from 'lodash';
-import IFrameLoader from "../../../shared/components/iframeLoader/IFrameLoader";
-import {observer} from "mobx-react";
+import IFrameLoader from '../../../shared/components/iframeLoader/IFrameLoader';
+import { observer } from 'mobx-react';
 
 export type IPathologyReportProps = {
-
-    pdfs:PathologyReportPDF[];
+    pdfs: PathologyReportPDF[];
     iframeHeight: number;
-    iframeStyle?:{[styleProp:string]:any};
-
-}
-
+    iframeStyle?: { [styleProp: string]: any };
+};
 
 @observer
-export default class PathologyReport extends React.Component<IPathologyReportProps,{ pdfUrl:string; }> {
-
-    pdfSelectList:any;
-    pdfEmbed:any;
-
-    constructor(props: IPathologyReportProps){
-
+export default class PathologyReport extends React.Component<
+    IPathologyReportProps,
+    { pdfUrl: string }
+> {
+    pdfSelectList: any;
+    pdfEmbed: any;
+
+    constructor(props: IPathologyReportProps) {
         super(props);
 
-        this.state = { pdfUrl: this.buildPDFUrl(props.pdfs[0].url) }
+        this.state = { pdfUrl: this.buildPDFUrl(props.pdfs[0].url) };
 
         this.handleSelection = this.handleSelection.bind(this);
-
     }
 
-    buildPDFUrl(url: string):string {
-
+    buildPDFUrl(url: string): string {
         return `https://docs.google.com/viewerng/viewer?url=${url}?pid=explorer&efh=false&a=v&chrome=false&embedded=true`;
-
     }
 
     // shouldComponentUpdate(nextProps: IPathologyReportProps){
     //     return nextProps === this.props;
     // }
 
-    handleSelection(){
-        this.setState({ pdfUrl:this.buildPDFUrl(this.pdfSelectList.options[this.pdfSelectList.selectedIndex].value) });
+    handleSelection() {
+        this.setState({
+            pdfUrl: this.buildPDFUrl(
+                this.pdfSelectList.options[this.pdfSelectList.selectedIndex]
+                    .value
+            ),
+        });
     }
 
-    render(){
-
-        return (<div>
-
-            <If condition={this.props.pdfs.length > 1}>
-                <select ref={(el)=>this.pdfSelectList = el} style={{ marginBottom:15 }} onChange={ this.handleSelection }>{  _.map(this.props.pdfs, (pdf: PathologyReportPDF)=>
-                    <option value={pdf.url}>{pdf.name}</option>)    }
-                </select>
-            </If>
-
-            <IFrameLoader height={this.props.iframeHeight} url={ this.state.pdfUrl } />
-
-        </div>)
-
+    render() {
+        return (
+            <div>
+                <If condition={this.props.pdfs.length > 1}>
+                    <select
+                        ref={el => (this.pdfSelectList = el)}
+                        style={{ marginBottom: 15 }}
+                        onChange={this.handleSelection}
+                    >
+                        {_.map(this.props.pdfs, (pdf: PathologyReportPDF) => (
+                            <option value={pdf.url}>{pdf.name}</option>
+                        ))}
+                    </select>
+                </If>
+
+                <IFrameLoader
+                    height={this.props.iframeHeight}
+                    url={this.state.pdfUrl}
+                />
+            </div>
+        );
     }
-
-
-
 }
diff --git a/src/pages/patientView/patient.scss b/src/pages/patientView/patient.scss
index 87f186e6c21..19ceb661f36 100644
--- a/src/pages/patientView/patient.scss
+++ b/src/pages/patientView/patient.scss
@@ -1,74 +1,68 @@
-
 .patientPageHeader {
-
-  .cohortNav {
-    text-align:right;
-  }
-
-  position:relative;
-  padding-left:45px;
-  display:flex;
-
-  td {
-    vertical-align:top;
-    padding-left:10px;
-    padding-bottom:4px;
-  }
-
-  .studyMetaBar {
-    text-align:right;
-    flex-grow:1;
-
-    .studyMetaBar_studyName {
-      white-space: nowrap;
-      max-width:400px;
-      text-overflow: ellipsis;
-      display:inline-block;
-      overflow:hidden;
+    .cohortNav {
+        text-align: right;
     }
 
-  }
+    position: relative;
+    padding-left: 45px;
+    display: flex;
 
-  .patientDataTable {
-    flex-grow:1;
-  }
-
-  .patientIcon {
-    position:absolute;
-    left:0;
-    font-size:40px;
-  }
-
-  .patientSamples {
+    td {
+        vertical-align: top;
+        padding-left: 10px;
+        padding-bottom: 4px;
+    }
 
-    .patientSample {
-      display:inline-block;
-      background-color:#ddd;
-      padding:1px 2px;
-      margin-right:3px;
-      border-radius:3px;
-      margin-bottom:3px;
-      font-size:11px;
-      height: 20px;
-      line-height: 20px;
-      vertical-align: middle;
+    .studyMetaBar {
+        text-align: right;
+        flex-grow: 1;
+
+        .studyMetaBar_studyName {
+            white-space: nowrap;
+            max-width: 400px;
+            text-overflow: ellipsis;
+            display: inline-block;
+            overflow: hidden;
+        }
+    }
 
-      svg {
-        position:relative;
-        top:1px;
-      }
+    .patientDataTable {
+        flex-grow: 1;
     }
 
-  }
+    .patientIcon {
+        position: absolute;
+        left: 0;
+        font-size: 40px;
+    }
 
+    .patientSamples {
+        .patientSample {
+            display: inline-block;
+            background-color: #ddd;
+            padding: 1px 2px;
+            margin-right: 3px;
+            border-radius: 3px;
+            margin-bottom: 3px;
+            font-size: 11px;
+            height: 20px;
+            line-height: 20px;
+            vertical-align: middle;
+
+            svg {
+                position: relative;
+                top: 1px;
+            }
+        }
+    }
 }
 
 .vafPlot {
-  position:relative;
-  top:-10px;
+    position: relative;
+    top: -10px;
 }
 
 .cbioportal-frontend .secondaryNavigation.vafVizNavTabs li a.tabAnchor {
-  //font-size: 17px !important;
-  //margin-right:30px !important;
+    //font-size: 17px !important;
+    //margin-right:30px !important;
 }
diff --git a/src/pages/patientView/patientHeader/ClinicalAttributesInline.spec.tsx b/src/pages/patientView/patientHeader/ClinicalAttributesInline.spec.tsx
index 2844c22ac9d..d7cf5dda4dc 100644
--- a/src/pages/patientView/patientHeader/ClinicalAttributesInline.spec.tsx
+++ b/src/pages/patientView/patientHeader/ClinicalAttributesInline.spec.tsx
@@ -5,17 +5,9 @@ import { shallow, mount } from 'enzyme';
 import sinon from 'sinon';
 
 describe('ClinicalAttributesInline', () => {
+    before(() => {});
 
-    before(()=>{
-
-    });
-
-    after(()=>{
-
-    });
-
-    it('what does it do?', ()=>{
-
-    });
+    after(() => {});
 
+    it('what does it do?', () => {});
 });
diff --git a/src/pages/patientView/patientHeader/ClinicalAttributesInline.tsx b/src/pages/patientView/patientHeader/ClinicalAttributesInline.tsx
index 572c0b56bc0..3f947f9f026 100644
--- a/src/pages/patientView/patientHeader/ClinicalAttributesInline.tsx
+++ b/src/pages/patientView/patientHeader/ClinicalAttributesInline.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import {ClinicalData} from "../../../shared/api/generated/CBioPortalAPI";
+import { ClinicalData } from '../../../shared/api/generated/CBioPortalAPI';
 
 export type IClinicalAttributesInlineProps = {
     clinicalData?: ClinicalData;
@@ -24,7 +24,7 @@ export type IClinicalAttributesInlineProps = {
 //    }
 //}
 
-type IClinicalAttributeProps ={
+type IClinicalAttributeProps = {
     key: string;
     value: string;
 };
diff --git a/src/pages/patientView/patientHeader/PatientHeader.spec.tsx b/src/pages/patientView/patientHeader/PatientHeader.spec.tsx
index 29ea8523e01..5f475319583 100644
--- a/src/pages/patientView/patientHeader/PatientHeader.spec.tsx
+++ b/src/pages/patientView/patientHeader/PatientHeader.spec.tsx
@@ -5,17 +5,9 @@ import { shallow, mount } from 'enzyme';
 import sinon from 'sinon';
 
 describe('PatientHeader', () => {
+    before(() => {});
 
-    before(()=>{
-
-    });
-
-    after(()=>{
-
-    });
-
-    it('what does it do?', ()=>{
-
-    });
+    after(() => {});
 
+    it('what does it do?', () => {});
 });
diff --git a/src/pages/patientView/patientHeader/PatientHeader.tsx b/src/pages/patientView/patientHeader/PatientHeader.tsx
index a0088b42bde..9559835e6c9 100644
--- a/src/pages/patientView/patientHeader/PatientHeader.tsx
+++ b/src/pages/patientView/patientHeader/PatientHeader.tsx
@@ -1,31 +1,40 @@
 import * as React from 'react';
-import {fromPairs} from 'lodash';
-import {OverlayTrigger, Popover} from 'react-bootstrap';
+import { fromPairs } from 'lodash';
+import { OverlayTrigger, Popover } from 'react-bootstrap';
 
 import ClinicalInformationPatientTable from '../clinicalInformation/ClinicalInformationPatientTable';
-import {getSpanElements} from '../clinicalInformation/lib/clinicalAttributesUtil.js';
-import {DefaultTooltip, placeArrowBottomLeft} from "cbioportal-frontend-commons";
+import { getSpanElements } from '../clinicalInformation/lib/clinicalAttributesUtil.js';
+import {
+    DefaultTooltip,
+    placeArrowBottomLeft,
+} from 'cbioportal-frontend-commons';
 import SampleManager from '../SampleManager';
 
 import styles from './styles.module.scss';
 
 export type IPatientHeaderProps = {
-    patient:any;
+    patient: any;
     studyId: string;
-    sampleManager?:SampleManager | null;
-    handlePatientClick:any;
+    sampleManager?: SampleManager | null;
+    handlePatientClick: any;
     darwinUrl?: string;
-}
-export default class PatientHeader extends React.Component<IPatientHeaderProps, {}> {
+};
+export default class PatientHeader extends React.Component<
+    IPatientHeaderProps,
+    {}
+> {
     public render() {
-
         return (
             <div className={styles.patientHeader}>
-                {this.props.patient && this.getOverlayTriggerPatient(this.props.patient, this.props.studyId, this.props.sampleManager)}
+                {this.props.patient &&
+                    this.getOverlayTriggerPatient(
+                        this.props.patient,
+                        this.props.studyId,
+                        this.props.sampleManager
+                    )}
                 {this.getDarwinUrl(this.props.darwinUrl)}
             </div>
         );
-
     }
 
     private getDarwinUrl(darwinUrl: string | null | undefined) {
@@ -33,48 +42,87 @@ export default class PatientHeader extends React.Component<IPatientHeaderProps,
         // TODO: use internal API service instead, once this exists
         if (darwinUrl !== undefined && darwinUrl !== null && darwinUrl !== '') {
             // add link to darwin
-            let darwinImgSrc = require("./images/darwin_logo.png");
-            return (<a target='_blank' href={darwinUrl}><img style={{paddingLeft:'5px', height:'21px', width:'29px'}} src={darwinImgSrc} /></a>);
+            let darwinImgSrc = require('./images/darwin_logo.png');
+            return (
+                <a target="_blank" href={darwinUrl}>
+                    <img
+                        style={{
+                            paddingLeft: '5px',
+                            height: '21px',
+                            width: '29px',
+                        }}
+                        src={darwinImgSrc}
+                    />
+                </a>
+            );
         } else {
             return null;
         }
     }
 
     private getPopoverPatient(patient: any) {
-        return patient && (
-            <div key={patient.id} style={{ maxHeight:400, maxWidth:600, overflow:'auto' }}>
-                <h5>{ patient.id }</h5>
-                <ClinicalInformationPatientTable showFilter={false} showCopyDownload={false} showTitleBar={false} data={patient.clinicalData} />
-            </div>
+        return (
+            patient && (
+                <div
+                    key={patient.id}
+                    style={{ maxHeight: 400, maxWidth: 600, overflow: 'auto' }}
+                >
+                    <h5>{patient.id}</h5>
+                    <ClinicalInformationPatientTable
+                        showFilter={false}
+                        showCopyDownload={false}
+                        showTitleBar={false}
+                        data={patient.clinicalData}
+                    />
+                </div>
+            )
         );
     }
 
-    private getOverlayTriggerPatient(patient: any, studyId:string, sampleManager?: SampleManager|null) {
-        const clinicalDataLegacy = fromPairs(patient.clinicalData.map(
-            (x: any) => [x.clinicalAttributeId, x.value])
+    private getOverlayTriggerPatient(
+        patient: any,
+        studyId: string,
+        sampleManager?: SampleManager | null
+    ) {
+        const clinicalDataLegacy = fromPairs(
+            patient.clinicalData.map((x: any) => [
+                x.clinicalAttributeId,
+                x.value,
+            ])
         );
         // get common clinical attributes in all samples
         if (sampleManager) {
-            Object.keys(sampleManager.commonClinicalDataLegacyCleanAndDerived).forEach((attr:string) => {
-                clinicalDataLegacy[attr] = sampleManager.commonClinicalDataLegacyCleanAndDerived[attr];
+            Object.keys(
+                sampleManager.commonClinicalDataLegacyCleanAndDerived
+            ).forEach((attr: string) => {
+                clinicalDataLegacy[attr] =
+                    sampleManager.commonClinicalDataLegacyCleanAndDerived[attr];
             });
         }
 
-        return patient &&
-        (
-            <DefaultTooltip
-                placement='bottomLeft'
-                trigger={['hover', 'focus']}
-                overlay={this.getPopoverPatient(patient)}
-                arrowContent={<div className="rc-tooltip-arrow-inner" />}
-                destroyTooltipOnHide={true}
-                onPopupAlign={placeArrowBottomLeft}
-            >
-                <span className='clinical-spans' id='patient-attributes'>
-                    <a href="javascript:void(0)" onClick={()=>this.props.handlePatientClick(patient.id)}>{patient.id}</a>
-                    {getSpanElements(clinicalDataLegacy, studyId)}
-                </span>
-            </DefaultTooltip>
+        return (
+            patient && (
+                <DefaultTooltip
+                    placement="bottomLeft"
+                    trigger={['hover', 'focus']}
+                    overlay={this.getPopoverPatient(patient)}
+                    arrowContent={<div className="rc-tooltip-arrow-inner" />}
+                    destroyTooltipOnHide={true}
+                    onPopupAlign={placeArrowBottomLeft}
+                >
+                    <span className="clinical-spans" id="patient-attributes">
+                        <a
+                            href="javascript:void(0)"
+                            onClick={() =>
+                                this.props.handlePatientClick(patient.id)
+                            }
+                        >
+                            {patient.id}
+                        </a>
+                        {getSpanElements(clinicalDataLegacy, studyId)}
+                    </span>
+                </DefaultTooltip>
+            )
         );
     }
 }
diff --git a/src/pages/patientView/patientHeader/SampleInline.spec.tsx b/src/pages/patientView/patientHeader/SampleInline.spec.tsx
index 8debf4ed09f..6f77924be27 100644
--- a/src/pages/patientView/patientHeader/SampleInline.spec.tsx
+++ b/src/pages/patientView/patientHeader/SampleInline.spec.tsx
@@ -1,19 +1,18 @@
-import SampleInline from "./SampleInline";
-import {DefaultTooltip} from "cbioportal-frontend-commons";
+import SampleInline from './SampleInline';
+import { DefaultTooltip } from 'cbioportal-frontend-commons';
 import React from 'react';
 import { assert } from 'chai';
-import {shallow, mount, ReactWrapper} from 'enzyme';
+import { shallow, mount, ReactWrapper } from 'enzyme';
 import sinon from 'sinon';
 
 describe('SampleInline', () => {
-
     const defaultProps = {
         sample: {
-            id: "sampleSample",
-            clinicalData: []
+            id: 'sampleSample',
+            clinicalData: [],
         },
         sampleNumber: 6,
-        sampleColor: "#DDD666",
+        sampleColor: '#DDD666',
         fillOpacity: 0.6,
     };
 
@@ -23,52 +22,81 @@ describe('SampleInline', () => {
     let componentWithAdditionalContent: ReactWrapper<any, any>;
 
     before(() => {
-        defaultComponent = mount(<SampleInline {...defaultProps}/>);
+        defaultComponent = mount(<SampleInline {...defaultProps} />);
 
-        const minimalProps = {...defaultProps, tooltipEnabled: false};
-        minimalComponent = mount(<SampleInline {...minimalProps}/>);
+        const minimalProps = { ...defaultProps, tooltipEnabled: false };
+        minimalComponent = mount(<SampleInline {...minimalProps} />);
 
-        const extraTooltipTextProps = {...defaultProps, extraTooltipText: "Custom Tooltip Text!"};
-        componentWithExtraTooltipText = mount(<SampleInline {...extraTooltipTextProps} />);
+        const extraTooltipTextProps = {
+            ...defaultProps,
+            extraTooltipText: 'Custom Tooltip Text!',
+        };
+        componentWithExtraTooltipText = mount(
+            <SampleInline {...extraTooltipTextProps} />
+        );
 
         const additionalContentProps = {
             ...defaultProps,
-            additionalContent: <span className="awesomeCustomAdditionalContent">I am custom!</span>
+            additionalContent: (
+                <span className="awesomeCustomAdditionalContent">
+                    I am custom!
+                </span>
+            ),
         };
-        componentWithAdditionalContent = mount(<SampleInline {...additionalContentProps} />);
+        componentWithAdditionalContent = mount(
+            <SampleInline {...additionalContentProps} />
+        );
     });
 
     it('renders the default component properly', () => {
-        assert.isTrue(defaultComponent.find(DefaultTooltip).exists(),
-            "Default component should have tooltip");
-
-        assert.isFalse(defaultComponent.find('span').exists(),
-            "Default component should NOT have any additional component than svg");
+        assert.isTrue(
+            defaultComponent.find(DefaultTooltip).exists(),
+            'Default component should have tooltip'
+        );
+
+        assert.isFalse(
+            defaultComponent.find('span').exists(),
+            'Default component should NOT have any additional component than svg'
+        );
     });
 
     it('renders the minimal component properly', () => {
-        assert.isFalse(minimalComponent.find(DefaultTooltip).exists(),
-            "Minimal component should NOT have a tooltip");
-
-        assert.isFalse(minimalComponent.find('span').exists(),
-            "Minimal component should NOT have any additional component than svg");
+        assert.isFalse(
+            minimalComponent.find(DefaultTooltip).exists(),
+            'Minimal component should NOT have a tooltip'
+        );
+
+        assert.isFalse(
+            minimalComponent.find('span').exists(),
+            'Minimal component should NOT have any additional component than svg'
+        );
     });
 
     it('renders the component with extra tooltip text properly', () => {
-        assert.isTrue(componentWithExtraTooltipText.find(DefaultTooltip).exists(),
-            "Component should have a tooltip");
+        assert.isTrue(
+            componentWithExtraTooltipText.find(DefaultTooltip).exists(),
+            'Component should have a tooltip'
+        );
 
         // ideally we should also check for the actual existence of "Custom Tooltip Text!" within the tooltip content
 
-        assert.isFalse(componentWithExtraTooltipText.find('span').exists(),
-            "Component should NOT have any additional component than svg");
+        assert.isFalse(
+            componentWithExtraTooltipText.find('span').exists(),
+            'Component should NOT have any additional component than svg'
+        );
     });
 
     it('renders the component with additional content properly', () => {
-        assert.isTrue(componentWithAdditionalContent.find(DefaultTooltip).exists(),
-            "Component should have a tooltip");
-
-        assert.isTrue(componentWithAdditionalContent.find('span.awesomeCustomAdditionalContent').exists(),
-            "Component should have the additional content");
+        assert.isTrue(
+            componentWithAdditionalContent.find(DefaultTooltip).exists(),
+            'Component should have a tooltip'
+        );
+
+        assert.isTrue(
+            componentWithAdditionalContent
+                .find('span.awesomeCustomAdditionalContent')
+                .exists(),
+            'Component should have the additional content'
+        );
     });
 });
diff --git a/src/pages/patientView/patientHeader/SampleInline.tsx b/src/pages/patientView/patientHeader/SampleInline.tsx
index a11c839f726..81ca18b1751 100644
--- a/src/pages/patientView/patientHeader/SampleInline.tsx
+++ b/src/pages/patientView/patientHeader/SampleInline.tsx
@@ -1,67 +1,69 @@
-import * as React from "react";
-import {If, Else, Then} from 'react-if';
-import {DefaultTooltip, placeArrowBottomLeft} from "cbioportal-frontend-commons";
-import { ClinicalDataBySampleId } from "shared/api/api-types-extended";
-import ClinicalInformationPatientTable from "../clinicalInformation/ClinicalInformationPatientTable";
+import * as React from 'react';
+import { If, Else, Then } from 'react-if';
+import {
+    DefaultTooltip,
+    placeArrowBottomLeft,
+} from 'cbioportal-frontend-commons';
+import { ClinicalDataBySampleId } from 'shared/api/api-types-extended';
+import ClinicalInformationPatientTable from '../clinicalInformation/ClinicalInformationPatientTable';
 import './styles.scss';
 
 interface ISampleInlineProps {
     sample: ClinicalDataBySampleId;
     tooltipEnabled?: boolean;
     extraTooltipText?: string;
-    additionalContent?: JSX.Element|null;
-    hideClinicalTable?:boolean;
-    onSelectGenePanel?:(name:string)=>void;
-    disableTooltip?:boolean;
+    additionalContent?: JSX.Element | null;
+    hideClinicalTable?: boolean;
+    onSelectGenePanel?: (name: string) => void;
+    disableTooltip?: boolean;
 }
 
-export default class SampleInline extends React.Component<ISampleInlineProps, {}> {
+export default class SampleInline extends React.Component<
+    ISampleInlineProps,
+    {}
+> {
     public static defaultProps = {
         tooltipEnabled: true,
         hideClinicalInfoTable: false,
-        disableTooltip: false
+        disableTooltip: false,
     };
 
     public render() {
         return (
             <If condition={this.props.tooltipEnabled === true}>
-                <Then>
-                    {this.contentWithTooltip()}
-                </Then>
-                <Else>
-                    {this.mainContent()}
-                </Else>
+                <Then>{this.contentWithTooltip()}</Then>
+                <Else>{this.mainContent()}</Else>
             </If>
         );
     }
 
-    public tooltipContent()
-    {
-        const {sample, extraTooltipText} = this.props;
+    public tooltipContent() {
+        const { sample, extraTooltipText } = this.props;
 
         return (
-            <div style={{ maxHeight:400, maxWidth:600, overflow:'auto' }}>
+            <div style={{ maxHeight: 400, maxWidth: 600, overflow: 'auto' }}>
                 <h5 style={{ marginBottom: 1 }}>
-                    <span className='sample-inline-tooltip-children' >
+                    <span className="sample-inline-tooltip-children">
                         {this.props.children}
                     </span>
                     {sample.id}
                 </h5>
                 {extraTooltipText && <h5>{extraTooltipText}</h5>}
-                {!this.props.hideClinicalTable && <ClinicalInformationPatientTable
-                    showFilter={false}
-                    showCopyDownload={false}
-                    showTitleBar={false}
-                    data={sample.clinicalData}
-                    onSelectGenePanel={this.props.onSelectGenePanel}
-                />}
+                {!this.props.hideClinicalTable && (
+                    <ClinicalInformationPatientTable
+                        showFilter={false}
+                        showCopyDownload={false}
+                        showTitleBar={false}
+                        data={sample.clinicalData}
+                        onSelectGenePanel={this.props.onSelectGenePanel}
+                    />
+                )}
             </div>
         );
     }
 
-    public mainContent()
-    {
-        const {additionalContent} = this.props;
+    public mainContent() {
+        const { additionalContent } = this.props;
 
         let content = (
             <svg height="12" width="12">
@@ -81,11 +83,10 @@ export default class SampleInline extends React.Component<ISampleInlineProps, {}
         return content;
     }
 
-    public contentWithTooltip()
-    {
+    public contentWithTooltip() {
         return (
             <DefaultTooltip
-                placement='bottomLeft'
+                placement="bottomLeft"
                 trigger={['hover', 'focus']}
                 overlay={this.tooltipContent()}
                 arrowContent={<div className="rc-tooltip-arrow-inner" />}
diff --git a/src/pages/patientView/patientHeader/SignificantMutationalSignatures.spec.tsx b/src/pages/patientView/patientHeader/SignificantMutationalSignatures.spec.tsx
index 9a085b39034..43f2c3605ea 100644
--- a/src/pages/patientView/patientHeader/SignificantMutationalSignatures.spec.tsx
+++ b/src/pages/patientView/patientHeader/SignificantMutationalSignatures.spec.tsx
@@ -1,12 +1,13 @@
 import * as SignificantMutationalSignatures from './SignificantMutationalSignatures';
-import {prepareMutationalSignaturesForHeader} from "../../../shared/lib/MutationalSignaturesUtils";
+import { prepareMutationalSignaturesForHeader } from '../../../shared/lib/MutationalSignaturesUtils';
 import React from 'react';
 import { assert } from 'chai';
 import { shallow, mount } from 'enzyme';
 import sinon from 'sinon';
 
 const sampleMutationalSignatureData = [
-    {sampleId: 'firstSample',
+    {
+        sampleId: 'firstSample',
         uniqueSampleKey: 'firstSample',
         patientId: 'firstPatient',
         uniquePatientKey: 'firstPatient',
@@ -14,8 +15,10 @@ const sampleMutationalSignatureData = [
         mutationalSignatureId: 'firstMutationalSignature',
         value: 1,
         confidence: 0.9,
-        numberOfMutationsForSample: 20},
-    {sampleId: 'secondSample',
+        numberOfMutationsForSample: 20,
+    },
+    {
+        sampleId: 'secondSample',
         uniqueSampleKey: 'secondSample',
         patientId: 'firstPatient',
         uniquePatientKey: 'firstPatient',
@@ -23,8 +26,10 @@ const sampleMutationalSignatureData = [
         mutationalSignatureId: 'firstMutationalSignature',
         value: 2,
         confidence: 0.8,
-        numberOfMutationsForSample: 20},
-    {sampleId: 'firstSample',
+        numberOfMutationsForSample: 20,
+    },
+    {
+        sampleId: 'firstSample',
         uniqueSampleKey: 'firstSample',
         patientId: 'firstPatient',
         uniquePatientKey: 'firstPatient',
@@ -32,34 +37,44 @@ const sampleMutationalSignatureData = [
         mutationalSignatureId: 'secondMutationalSignature',
         value: 3,
         confidence: 0.4,
-        numberOfMutationsForSample: 20}
+        numberOfMutationsForSample: 20,
+    },
 ];
 
 const sampleMutationalSignatureMetaData = [
     {
-        mutationalSignatureId: "firstMutationalSignature",
-        description: "Mutational Signature 1",
-        confidenceStatement:  "Signature 1, the aging signature, is detected in this case."
+        mutationalSignatureId: 'firstMutationalSignature',
+        description: 'Mutational Signature 1',
+        confidenceStatement:
+            'Signature 1, the aging signature, is detected in this case.',
     },
     {
-        mutationalSignatureId: "secondMutationalSignature",
-        description: "Mutational Signature 2",
-        confidenceStatement: "Signature 2, the APOBEC signature, is detected in this case.  This signature often coccurs with signature 13, the other APOBEC signature"
-    }
-]
+        mutationalSignatureId: 'secondMutationalSignature',
+        description: 'Mutational Signature 2',
+        confidenceStatement:
+            'Signature 2, the APOBEC signature, is detected in this case.  This signature often coccurs with signature 13, the other APOBEC signature',
+    },
+];
 
 describe('SignificantMutationalSignatures', () => {
-    it('extracts significant mutational signatures, builds confidence statement, and prepares signatures for ' +
-        'header using mutational signature sample data and metadata', ()=>{
-        let result = prepareMutationalSignaturesForHeader(sampleMutationalSignatureData, sampleMutationalSignatureMetaData, 'firstSample');
+    it(
+        'extracts significant mutational signatures, builds confidence statement, and prepares signatures for ' +
+            'header using mutational signature sample data and metadata',
+        () => {
+            let result = prepareMutationalSignaturesForHeader(
+                sampleMutationalSignatureData,
+                sampleMutationalSignatureMetaData,
+                'firstSample'
+            );
 
-        assert.deepEqual(result, {
+            assert.deepEqual(result, {
                 numberOfMutationsForSample: 20,
-                confidenceStatement: "Signature 1, the aging signature, is detected in this case.",
-                significantSignatures:{
-                    "firstMutationalSignature": 1
-                }
-            }
-        );
-    });
-});
\ No newline at end of file
+                confidenceStatement:
+                    'Signature 1, the aging signature, is detected in this case.',
+                significantSignatures: {
+                    firstMutationalSignature: 1,
+                },
+            });
+        }
+    );
+});
diff --git a/src/pages/patientView/patientHeader/SignificantMutationalSignatures.tsx b/src/pages/patientView/patientHeader/SignificantMutationalSignatures.tsx
index 305336af26b..c9d3c390f33 100644
--- a/src/pages/patientView/patientHeader/SignificantMutationalSignatures.tsx
+++ b/src/pages/patientView/patientHeader/SignificantMutationalSignatures.tsx
@@ -1,8 +1,18 @@
-import * as React from "react";
-import {DefaultTooltip, placeArrowBottomLeft} from "cbioportal-frontend-commons";
-import {IMutationalSignature, IMutationalSignatureMeta, ISignificantMutationalSignaturesForSample} from "../../../shared/model/MutationalSignature";
-import "../../../shared/components/simpleTable/styles.scss"
-import {progressBar, prepareMutationalSignaturesForHeader} from "../../../shared/lib/MutationalSignaturesUtils";
+import * as React from 'react';
+import {
+    DefaultTooltip,
+    placeArrowBottomLeft,
+} from 'cbioportal-frontend-commons';
+import {
+    IMutationalSignature,
+    IMutationalSignatureMeta,
+    ISignificantMutationalSignaturesForSample,
+} from '../../../shared/model/MutationalSignature';
+import '../../../shared/components/simpleTable/styles.scss';
+import {
+    progressBar,
+    prepareMutationalSignaturesForHeader,
+} from '../../../shared/lib/MutationalSignaturesUtils';
 import _ from 'lodash';
 
 interface ISignificantMutationalSignaturesProps {
@@ -11,50 +21,82 @@ interface ISignificantMutationalSignaturesProps {
     uniqueSampleKey: string;
 }
 
-export default class SignificantMutationalSignatures extends React.Component<ISignificantMutationalSignaturesProps, {}> {
+export default class SignificantMutationalSignatures extends React.Component<
+    ISignificantMutationalSignaturesProps,
+    {}
+> {
     public render() {
         return (
             <DefaultTooltip
-                placement='bottomLeft'
+                placement="bottomLeft"
                 trigger={['hover', 'focus']}
-                overlay={this.tooltipContent(this.props.data, this.props.metadata, this.props.uniqueSampleKey)}
+                overlay={this.tooltipContent(
+                    this.props.data,
+                    this.props.metadata,
+                    this.props.uniqueSampleKey
+                )}
                 destroyTooltipOnHide={false}
                 onPopupAlign={placeArrowBottomLeft}
             >
-                <span style={{paddingLeft:2}}>
+                <span style={{ paddingLeft: 2 }}>
                     <a>(Significant Mutational Signatures)</a>
                 </span>
             </DefaultTooltip>
         );
     }
 
-    private tooltipContent(mutationalSignatureData: IMutationalSignature[], mutationalSignatureMetaData: IMutationalSignatureMeta[], uniqueSampleKey: string) {
-
-        const significantMutationalSignaturesForSample: ISignificantMutationalSignaturesForSample = prepareMutationalSignaturesForHeader(mutationalSignatureData, mutationalSignatureMetaData, uniqueSampleKey);
+    private tooltipContent(
+        mutationalSignatureData: IMutationalSignature[],
+        mutationalSignatureMetaData: IMutationalSignatureMeta[],
+        uniqueSampleKey: string
+    ) {
+        const significantMutationalSignaturesForSample: ISignificantMutationalSignaturesForSample = prepareMutationalSignaturesForHeader(
+            mutationalSignatureData,
+            mutationalSignatureMetaData,
+            uniqueSampleKey
+        );
         let hasMutationalSignatures: boolean = true;
 
-        if(_.isEmpty(significantMutationalSignaturesForSample.significantSignatures)){
+        if (
+            _.isEmpty(
+                significantMutationalSignaturesForSample.significantSignatures
+            )
+        ) {
             hasMutationalSignatures = false;
         }
 
         return (
-            <div style={{maxWidth:250}}>
+            <div style={{ maxWidth: 250 }}>
                 <span className="small">
-                    {significantMutationalSignaturesForSample.confidenceStatement}
+                    {
+                        significantMutationalSignaturesForSample.confidenceStatement
+                    }
                 </span>
-                <hr style={{marginTop:10,marginBottom:10}}/>
-                {hasMutationalSignatures &&
+                <hr style={{ marginTop: 10, marginBottom: 10 }} />
+                {hasMutationalSignatures && (
                     <table>
-                    <th>Significant Mutational Signatures</th>
+                        <th>Significant Mutational Signatures</th>
                         <th>Exposure</th>
-                    {Object.keys(significantMutationalSignaturesForSample.significantSignatures).map((significantSignatureValue)=>
-                        <tr><td style={{paddingTop: 3}}>{significantSignatureValue}</td>
-                        <td style={{paddingTop: 3}}>{progressBar(significantMutationalSignaturesForSample.significantSignatures[significantSignatureValue].toString(), false)}</td>
-                        </tr>)}
+                        {Object.keys(
+                            significantMutationalSignaturesForSample.significantSignatures
+                        ).map(significantSignatureValue => (
+                            <tr>
+                                <td style={{ paddingTop: 3 }}>
+                                    {significantSignatureValue}
+                                </td>
+                                <td style={{ paddingTop: 3 }}>
+                                    {progressBar(
+                                        significantMutationalSignaturesForSample.significantSignatures[
+                                            significantSignatureValue
+                                        ].toString(),
+                                        false
+                                    )}
+                                </td>
+                            </tr>
+                        ))}
                     </table>
-                }
-
+                )}
             </div>
         );
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/patientView/patientHeader/style/clinicalAttributes.scss b/src/pages/patientView/patientHeader/style/clinicalAttributes.scss
index 1861a8913e4..2e19c9e6096 100644
--- a/src/pages/patientView/patientHeader/style/clinicalAttributes.scss
+++ b/src/pages/patientView/patientHeader/style/clinicalAttributes.scss
@@ -23,145 +23,145 @@ $sample-color-xenograft: pink;
         order: 999;
     }
     /* Show only following attributes */
-    .clinical-attribute[attr-id="SEX"],
-    .clinical-attribute[attr-id="GENDER"],
-    .clinical-attribute[attr-id="AGE"],
-    .clinical-attribute[attr-id="OS_STATUS"],
-    .clinical-attribute[attr-id="OS_MONTHS"],
-    .clinical-attribute[attr-id="DFS_STATUS"],
-    .clinical-attribute[attr-id="DFS_MONTHS"],
-    .clinical-attribute[attr-id="CANCER_TYPE"],
-    .clinical-attribute[attr-id="CANCER_TYPE_DETAILED"],
-    .clinical-attribute[attr-id="KNOWN_MOLECULAR_CLASSIFIER"],
-    .clinical-attribute[attr-id="GLEASON_SCORE"],
-    .clinical-attribute[attr-id="HISTOLOGY"],
-    .clinical-attribute[attr-id="TUMOR_STAGE_2009"],
-    .clinical-attribute[attr-id="TUMOR_GRADE"],
-    .clinical-attribute[attr-id="ETS_RAF_SPINK1_STATUS"],
-    .clinical-attribute[attr-id="TMPRSS2_ERG_FUSION_STATUS"],
-    .clinical-attribute[attr-id="ERG_FUSION_ACGH"],
-    .clinical-attribute[attr-id="SERUM_PSA"],
-    .clinical-attribute[attr-id="DRIVER_MUTATIONS"],
-    .clinical-attribute[attr-id="MOUSE_STRAIN"],
-    .clinical-attribute[attr-id="BREAST_CANCER_RECEPTOR_STATUS"],
-    .clinical-attribute[attr-id="DERIVED_NORMALIZED_CASE_TYPE"],
-    .clinical-attribute[attr-id="DERIVED_SAMPLE_LOCATION"],
-    .clinical-attribute[attr-id="PATIENT_DISPLAY_NAME"],
-    .clinical-attribute[attr-id="SAMPLE_DISPLAY_NAME"] {
+    .clinical-attribute[attr-id='SEX'],
+    .clinical-attribute[attr-id='GENDER'],
+    .clinical-attribute[attr-id='AGE'],
+    .clinical-attribute[attr-id='OS_STATUS'],
+    .clinical-attribute[attr-id='OS_MONTHS'],
+    .clinical-attribute[attr-id='DFS_STATUS'],
+    .clinical-attribute[attr-id='DFS_MONTHS'],
+    .clinical-attribute[attr-id='CANCER_TYPE'],
+    .clinical-attribute[attr-id='CANCER_TYPE_DETAILED'],
+    .clinical-attribute[attr-id='KNOWN_MOLECULAR_CLASSIFIER'],
+    .clinical-attribute[attr-id='GLEASON_SCORE'],
+    .clinical-attribute[attr-id='HISTOLOGY'],
+    .clinical-attribute[attr-id='TUMOR_STAGE_2009'],
+    .clinical-attribute[attr-id='TUMOR_GRADE'],
+    .clinical-attribute[attr-id='ETS_RAF_SPINK1_STATUS'],
+    .clinical-attribute[attr-id='TMPRSS2_ERG_FUSION_STATUS'],
+    .clinical-attribute[attr-id='ERG_FUSION_ACGH'],
+    .clinical-attribute[attr-id='SERUM_PSA'],
+    .clinical-attribute[attr-id='DRIVER_MUTATIONS'],
+    .clinical-attribute[attr-id='MOUSE_STRAIN'],
+    .clinical-attribute[attr-id='BREAST_CANCER_RECEPTOR_STATUS'],
+    .clinical-attribute[attr-id='DERIVED_NORMALIZED_CASE_TYPE'],
+    .clinical-attribute[attr-id='DERIVED_SAMPLE_LOCATION'],
+    .clinical-attribute[attr-id='PATIENT_DISPLAY_NAME'],
+    .clinical-attribute[attr-id='SAMPLE_DISPLAY_NAME'] {
         display: inline;
         order: 6;
     }
     /* Show comma before clinical attributes */
     .clinical-attribute:before {
-        content: ", ";
+        content: ', ';
         color: #000;
     }
     /* Order patient+sample clinical attributes */
-    .clinical-attribute[attr-id="PATIENT_DISPLAY_NAME"],
-    .clinical-attribute[attr-id="SAMPLE_DISPLAY_NAME"] {
+    .clinical-attribute[attr-id='PATIENT_DISPLAY_NAME'],
+    .clinical-attribute[attr-id='SAMPLE_DISPLAY_NAME'] {
         order: 0;
     }
     /* Order sample clinical attributes (they don't exist for patient) */
-    .clinical-attribute[attr-id="DERIVED_NORMALIZED_CASE_TYPE"] {
+    .clinical-attribute[attr-id='DERIVED_NORMALIZED_CASE_TYPE'] {
         order: 1;
     }
-    .clinical-attribute[attr-id="DERIVED_SAMPLE_LOCATION"] {
+    .clinical-attribute[attr-id='DERIVED_SAMPLE_LOCATION'] {
         order: 2;
     }
     /* attributes with opening parenthesis */
-    .clinical-attribute[attr-id="OS_MONTHS"]:before,
-    .clinical-attribute[attr-id="DFS_MONTHS"]:before,
-    .clinical-attribute[attr-id="CANCER_TYPE_DETAILED"]:before,
-    .clinical-attribute[attr-id="PATIENT_DISPLAY_NAME"]:before,
-    .clinical-attribute[attr-id="DERIVED_SAMPLE_LOCATION"]:before,
-    .clinical-attribute[attr-id="SAMPLE_DISPLAY_NAME"]:before {
-        content: "\00a0(";
+    .clinical-attribute[attr-id='OS_MONTHS']:before,
+    .clinical-attribute[attr-id='DFS_MONTHS']:before,
+    .clinical-attribute[attr-id='CANCER_TYPE_DETAILED']:before,
+    .clinical-attribute[attr-id='PATIENT_DISPLAY_NAME']:before,
+    .clinical-attribute[attr-id='DERIVED_SAMPLE_LOCATION']:before,
+    .clinical-attribute[attr-id='SAMPLE_DISPLAY_NAME']:before {
+        content: '\00a0(';
     }
     /* attributes with a closing parenthesis */
-    .clinical-attribute[attr-id="CANCER_TYPE_DETAILED"]:after,
-    .clinical-attribute[attr-id="PATIENT_DISPLAY_NAME"]:after,
-    .clinical-attribute[attr-id="DERIVED_SAMPLE_LOCATION"]:after,
-    .clinical-attribute[attr-id="SAMPLE_DISPLAY_NAME"]:after {
-        content: ")";
+    .clinical-attribute[attr-id='CANCER_TYPE_DETAILED']:after,
+    .clinical-attribute[attr-id='PATIENT_DISPLAY_NAME']:after,
+    .clinical-attribute[attr-id='DERIVED_SAMPLE_LOCATION']:after,
+    .clinical-attribute[attr-id='SAMPLE_DISPLAY_NAME']:after {
+        content: ')';
     }
     /* text before an attribute */
-    .clinical-attribute[attr-id="SERUM_PSA"]:before {
-        content: ", Serum PSA: ";
+    .clinical-attribute[attr-id='SERUM_PSA']:before {
+        content: ', Serum PSA: ';
     }
-    .clinical-attribute[attr-id="ERG_FUSION_ACGH"]:before {
-        content: ", ERG-fusion aCGH: ";
+    .clinical-attribute[attr-id='ERG_FUSION_ACGH']:before {
+        content: ', ERG-fusion aCGH: ';
     }
-    .clinical-attribute[attr-id="TMPRSS2_ERG_FUSION_STATUS"]:before {
-        content: ", TMPRSS2-ERG Fusion: ";
+    .clinical-attribute[attr-id='TMPRSS2_ERG_FUSION_STATUS']:before {
+        content: ', TMPRSS2-ERG Fusion: ';
     }
-    .clinical-attribute[attr-id="GLEASON"]:before {
-        content: ", Gleason: ";
+    .clinical-attribute[attr-id='GLEASON']:before {
+        content: ', Gleason: ';
     }
     /* text after an attribute */
-    .clinical-attribute[attr-id="OS_MONTHS"]:after,
-    .clinical-attribute[attr-id="DFS_MONTHS"]:after {
-        content: " months)";
+    .clinical-attribute[attr-id='OS_MONTHS']:after,
+    .clinical-attribute[attr-id='DFS_MONTHS']:after {
+        content: ' months)';
     }
-    .clinical-attribute[attr-id="AGE"]:after {
-        content: " years old";
+    .clinical-attribute[attr-id='AGE']:after {
+        content: ' years old';
     }
     /* attributes with special colors */
-    .clinical-attribute[attr-id="OS_STATUS"][attr-value="DECEASED"],
-    .clinical-attribute[attr-id="OS_STATUS"][attr-value="DEAD"],
-    .clinical-attribute[attr-id="DFS_STATUS"] {
+    .clinical-attribute[attr-id='OS_STATUS'][attr-value='DECEASED'],
+    .clinical-attribute[attr-id='OS_STATUS'][attr-value='DEAD'],
+    .clinical-attribute[attr-id='DFS_STATUS'] {
         color: #f00;
     }
-    .clinical-attribute[attr-id="OS_STATUS"][attr-value="LIVING"],
-    .clinical-attribute[attr-id="OS_STATUS"][attr-value="ALIVE"],
-    .clinical-attribute[attr-id="DFS_STATUS"][attr-value="DiseaseFree"],
-    .clinical-attribute[attr-id="DFS_STATUS"][attr-value="Yes"] {
+    .clinical-attribute[attr-id='OS_STATUS'][attr-value='LIVING'],
+    .clinical-attribute[attr-id='OS_STATUS'][attr-value='ALIVE'],
+    .clinical-attribute[attr-id='DFS_STATUS'][attr-value='DiseaseFree'],
+    .clinical-attribute[attr-id='DFS_STATUS'][attr-value='Yes'] {
         color: rgb(0, 128, 0);
     }
-    .clinical-attribute[attr-id="DERIVED_NORMALIZED_CASE_TYPE"][attr-value='Primary'] {
-      color: $sample-color-primary;
+    .clinical-attribute[attr-id='DERIVED_NORMALIZED_CASE_TYPE'][attr-value='Primary'] {
+        color: $sample-color-primary;
     }
-    .clinical-attribute[attr-id="DERIVED_NORMALIZED_CASE_TYPE"][attr-value="Progressed"],
-    .clinical-attribute[attr-id="DERIVED_NORMALIZED_CASE_TYPE"][attr-value="Recurrence"] {
-      color: $sample-color-recurrence;
+    .clinical-attribute[attr-id='DERIVED_NORMALIZED_CASE_TYPE'][attr-value='Progressed'],
+    .clinical-attribute[attr-id='DERIVED_NORMALIZED_CASE_TYPE'][attr-value='Recurrence'] {
+        color: $sample-color-recurrence;
     }
-    .clinical-attribute[attr-id="DERIVED_NORMALIZED_CASE_TYPE"][attr-value="Metastasis"] {
-      color: $sample-color-metastasis;
+    .clinical-attribute[attr-id='DERIVED_NORMALIZED_CASE_TYPE'][attr-value='Metastasis'] {
+        color: $sample-color-metastasis;
     }
-    .clinical-attribute[attr-id="DERIVED_NORMALIZED_CASE_TYPE"][attr-value="Xenograft"] {
+    .clinical-attribute[attr-id='DERIVED_NORMALIZED_CASE_TYPE'][attr-value='Xenograft'] {
         display: none; // already showing icon, no need to show text
     }
 }
 #patient-attributes {
     /* Order patient clinical attributes */
-    .clinical-attribute[attr-id="SEX"],
-    .clinical-attribute[attr-id="GENDER"] {
+    .clinical-attribute[attr-id='SEX'],
+    .clinical-attribute[attr-id='GENDER'] {
         order: 1;
     }
-    .clinical-attribute[attr-id="AGE"] {
+    .clinical-attribute[attr-id='AGE'] {
         order: 2;
     }
-    .clinical-attribute[attr-id="CANCER_TYPE"] {
+    .clinical-attribute[attr-id='CANCER_TYPE'] {
         order: 3;
     }
-    .clinical-attribute[attr-id="CANCER_TYPE_DETAILED"] {
+    .clinical-attribute[attr-id='CANCER_TYPE_DETAILED'] {
         order: 4;
     }
-    .clinical-attribute[attr-id="KNOWN_MOLECULAR_CLASSIFIER"] {
+    .clinical-attribute[attr-id='KNOWN_MOLECULAR_CLASSIFIER'] {
         order: 5;
     }
-    .clinical-attribute[attr-id="HISTOLOGY"] {
+    .clinical-attribute[attr-id='HISTOLOGY'] {
         order: 6;
     }
-    .clinical-attribute[attr-id="OS_STATUS"] {
+    .clinical-attribute[attr-id='OS_STATUS'] {
         order: 7;
     }
-    .clinical-attribute[attr-id="OS_MONTHS"] {
+    .clinical-attribute[attr-id='OS_MONTHS'] {
         order: 8;
     }
-    .clinical-attribute[attr-id="DFS_STATUS"] {
+    .clinical-attribute[attr-id='DFS_STATUS'] {
         order: 9;
     }
-    .clinical-attribute[attr-id="DFS_MONTHS"] {
+    .clinical-attribute[attr-id='DFS_MONTHS'] {
         order: 10;
     }
 }
diff --git a/src/pages/patientView/patientHeader/styles.scss b/src/pages/patientView/patientHeader/styles.scss
index 5e7ad919262..4c7df8a69ab 100644
--- a/src/pages/patientView/patientHeader/styles.scss
+++ b/src/pages/patientView/patientHeader/styles.scss
@@ -1,3 +1,3 @@
 .sample-inline-tooltip-children {
     margin-right: 5px;
-}
\ No newline at end of file
+}
diff --git a/src/pages/patientView/sampleManager.spec.tsx b/src/pages/patientView/sampleManager.spec.tsx
index 0a9d2bc410e..6512f06d3fa 100644
--- a/src/pages/patientView/sampleManager.spec.tsx
+++ b/src/pages/patientView/sampleManager.spec.tsx
@@ -5,17 +5,9 @@ import { shallow, mount } from 'enzyme';
 import sinon from 'sinon';
 
 describe('sampleManager', () => {
+    before(() => {});
 
-    before(()=>{
-
-    });
-
-    after(()=>{
-
-    });
-
-    it('what does it do?', ()=>{
-
-    });
+    after(() => {});
 
+    it('what does it do?', () => {});
 });
diff --git a/src/pages/patientView/timeline/Timeline.tsx b/src/pages/patientView/timeline/Timeline.tsx
index 18b3e1927e5..2a87646bbca 100644
--- a/src/pages/patientView/timeline/Timeline.tsx
+++ b/src/pages/patientView/timeline/Timeline.tsx
@@ -2,30 +2,32 @@ import * as React from 'react';
 import * as _ from 'lodash';
 import $ from 'jquery';
 import 'jquery-migrate';
-require( 'datatables.net' );
-import {buildTimeline} from './legacy.js';
+require('datatables.net');
+import { buildTimeline } from './legacy.js';
 import 'qtip2';
 import 'qtip2/dist/jquery.qtip.css';
 
 import './styles.scss';
-import SampleManager from "../SampleManager";
+import SampleManager from '../SampleManager';
 
-import {PatientViewPageStore} from "../clinicalInformation/PatientViewPageStore";
-import {ClinicalEvent, ClinicalEventData} from "../../../shared/api/generated/CBioPortalAPI";
-import {DownloadControls} from "cbioportal-frontend-commons";
-import autobind from "autobind-decorator";
+import { PatientViewPageStore } from '../clinicalInformation/PatientViewPageStore';
+import {
+    ClinicalEvent,
+    ClinicalEventData,
+} from '../../../shared/api/generated/CBioPortalAPI';
+import { DownloadControls } from 'cbioportal-frontend-commons';
+import autobind from 'autobind-decorator';
 
 interface ITimelineProps {
-    sampleManager:SampleManager;
-    store:PatientViewPageStore;
-    width:number;
+    sampleManager: SampleManager;
+    store: PatientViewPageStore;
+    width: number;
 }
 
 export default class Timeline extends React.Component<ITimelineProps, {}> {
+    private currentWidth: number;
 
-    private currentWidth:number;
-
-    shouldComponentUpdate(nextProps:ITimelineProps){
+    shouldComponentUpdate(nextProps: ITimelineProps) {
         if (nextProps.width !== this.currentWidth) {
             // only rerender to resize
             this.drawTimeline(nextProps.width);
@@ -34,59 +36,86 @@ export default class Timeline extends React.Component<ITimelineProps, {}> {
     }
 
     componentDidMount() {
-
         this.drawTimeline(this.props.width);
 
         /*var debouncedResize =  _.debounce(()=>this.drawTimeline(),500);
 
         $(window).resize(debouncedResize);*/
-
     }
 
-    drawTimeline(width:number){
-
-        let clinicalDataMap = this.props.store.patientViewData.result.samples!.reduce((memo:any,item)=>{
-            memo[item.id] = item.clinicalData.reduce((innerMemo:any,innerItem)=>{
-                innerMemo[innerItem.clinicalAttributeId] = innerItem.value;
-                return innerMemo;
-            },{})
-            return memo;
-        },{});
+    drawTimeline(width: number) {
+        let clinicalDataMap = this.props.store.patientViewData.result.samples!.reduce(
+            (memo: any, item) => {
+                memo[item.id] = item.clinicalData.reduce(
+                    (innerMemo: any, innerItem) => {
+                        innerMemo[innerItem.clinicalAttributeId] =
+                            innerItem.value;
+                        return innerMemo;
+                    },
+                    {}
+                );
+                return memo;
+            },
+            {}
+        );
 
         let caseIds = this.props.sampleManager.getSampleIdsInOrder();
 
         let params = {
             cancer_study_id: this.props.store.studyId,
-            patient_id: this.props.store.patientId
+            patient_id: this.props.store.patientId,
         };
 
-        let patientInfo = this.props.store.patientViewData.result!.patient!.clinicalData.reduce((memo:any, item)=>{
-            memo[item.clinicalAttributeId] = item.value;
-            return memo;
-        },{});
+        let patientInfo = this.props.store.patientViewData.result!.patient!.clinicalData.reduce(
+            (memo: any, item) => {
+                memo[item.clinicalAttributeId] = item.value;
+                return memo;
+            },
+            {}
+        );
 
         let caseMetaData = {
-            "color": this.props.sampleManager.sampleColors,
-            "label": this.props.sampleManager.sampleLabels,
-            "index": this.props.sampleManager.sampleIndex
+            color: this.props.sampleManager.sampleColors,
+            label: this.props.sampleManager.sampleLabels,
+            index: this.props.sampleManager.sampleIndex,
         };
 
-        let timelineData = this.props.store.clinicalEvents.result.map((eventData:ClinicalEvent) => {
-            return {
-                eventType: eventData.eventType,
-                patientId: eventData.patientId,
-                startDate: _.isUndefined(eventData.startNumberOfDaysSinceDiagnosis) ? null : eventData.startNumberOfDaysSinceDiagnosis,
-                stopDate: _.isUndefined(eventData.endNumberOfDaysSinceDiagnosis) ? null : eventData.endNumberOfDaysSinceDiagnosis,
-                eventData: eventData.attributes.reduce((memo:any, evData: ClinicalEventData) => {
-                    memo[evData.key] = evData.value;
-                    return memo;
-                }, {})
+        let timelineData = this.props.store.clinicalEvents.result.map(
+            (eventData: ClinicalEvent) => {
+                return {
+                    eventType: eventData.eventType,
+                    patientId: eventData.patientId,
+                    startDate: _.isUndefined(
+                        eventData.startNumberOfDaysSinceDiagnosis
+                    )
+                        ? null
+                        : eventData.startNumberOfDaysSinceDiagnosis,
+                    stopDate: _.isUndefined(
+                        eventData.endNumberOfDaysSinceDiagnosis
+                    )
+                        ? null
+                        : eventData.endNumberOfDaysSinceDiagnosis,
+                    eventData: eventData.attributes.reduce(
+                        (memo: any, evData: ClinicalEventData) => {
+                            memo[evData.key] = evData.value;
+                            return memo;
+                        },
+                        {}
+                    ),
+                };
             }
-        });
-
-        buildTimeline(params, caseIds, patientInfo, clinicalDataMap, caseMetaData, timelineData, width);
+        );
+
+        buildTimeline(
+            params,
+            caseIds,
+            patientInfo,
+            clinicalDataMap,
+            caseMetaData,
+            timelineData,
+            width
+        );
         this.currentWidth = width;
-
     }
 
     private svgContainer: HTMLDivElement;
@@ -96,20 +125,22 @@ export default class Timeline extends React.Component<ITimelineProps, {}> {
     }
 
     public render() {
-
         return (
             <div id="timeline-container" className="timelineContainer">
-                <div id="timeline" ref = {(container) => {this.svgContainer = container!}}></div>
+                <div
+                    id="timeline"
+                    ref={container => {
+                        this.svgContainer = container!;
+                    }}
+                ></div>
                 <DownloadControls
-                getSvg={this.getSvg}
-                filename="timeline"
-                dontFade={true}
-                type='button'
-                style={{position:"absolute", top:0, right:5}}
+                    getSvg={this.getSvg}
+                    filename="timeline"
+                    dontFade={true}
+                    type="button"
+                    style={{ position: 'absolute', top: 0, right: 5 }}
                 />
             </div>
-        )
+        );
     }
-
 }
-
diff --git a/src/pages/patientView/timeline/legacy.js b/src/pages/patientView/timeline/legacy.js
index 515fba65d3c..a72d804cc8c 100644
--- a/src/pages/patientView/timeline/legacy.js
+++ b/src/pages/patientView/timeline/legacy.js
@@ -4,51 +4,58 @@ import * as d3 from 'd3';
 
 import clinicalTimelineExports from './timeline-lib';
 
-
 // TODO: these are some styling hacks for genie. Need to figure out how to add
 // proper support for this in the library (or the future reactified library)
 function addMoreGenieTimelineStylingHacks() {
-    $("circle[id^='timelineItem_2']").attr("stroke","gray");
-    $("circle[id^='timelineItem_2']").attr("stroke-width","0.5px");
-    $("circle[id^='timelineItem_2']").attr("r","4.5");
-    $("circle[id^='timelineItem_3']").attr("stroke","gray");
-    $("circle[id^='timelineItem_3']").attr("stroke-width","0.5px");
-    $("circle[id^='timelineItem_3']").attr("r","4.5");
-    $("circle[id^='timelineItem_4']").attr("stroke","gray");
-    $("circle[id^='timelineItem_4']").attr("stroke-width","0.5px");
-    $("circle[id^='timelineItem_4']").attr("r","4.5");
-};
-
-function plotCaseLabelsInTimeline(timelineClasses, caseIds, clinicalDataMap, caseMetaData) {
-
+    $("circle[id^='timelineItem_2']").attr('stroke', 'gray');
+    $("circle[id^='timelineItem_2']").attr('stroke-width', '0.5px');
+    $("circle[id^='timelineItem_2']").attr('r', '4.5');
+    $("circle[id^='timelineItem_3']").attr('stroke', 'gray');
+    $("circle[id^='timelineItem_3']").attr('stroke-width', '0.5px');
+    $("circle[id^='timelineItem_3']").attr('r', '4.5');
+    $("circle[id^='timelineItem_4']").attr('stroke', 'gray');
+    $("circle[id^='timelineItem_4']").attr('stroke-width', '0.5px');
+    $("circle[id^='timelineItem_4']").attr('r', '4.5');
+}
 
-    var fillColorAndLabelForCase = function (circle, caseId) {
+function plotCaseLabelsInTimeline(
+    timelineClasses,
+    caseIds,
+    clinicalDataMap,
+    caseMetaData
+) {
+    var fillColorAndLabelForCase = function(circle, caseId) {
         var label = caseMetaData.label[caseId];
         var color = caseMetaData.color[caseId];
-        circle.select("circle").attr("fill", color);
-        circle.append("text")
-            .attr("y", 4)
-            .attr("r",6)
-            .attr("text-anchor", "middle")
-            .attr("font-size", 10)
-            .attr("fill", "white")
+        circle.select('circle').attr('fill', color);
+        circle
+            .append('text')
+            .attr('y', 4)
+            .attr('r', 6)
+            .attr('text-anchor', 'middle')
+            .attr('font-size', 10)
+            .attr('fill', 'white')
             .text(label);
-    }
+    };
 
     for (var i = 0; i < caseIds.length; i++) {
         var caseId = caseIds[i];
         var clinicalData = clinicalDataMap[caseId];
         var compareAgainstIds = [caseId];
 
-        var OtherSampleId = clinicalData["OTHER_SAMPLE_ID"];
+        var OtherSampleId = clinicalData['OTHER_SAMPLE_ID'];
         if (OtherSampleId) {
             compareAgainstIds = compareAgainstIds.concat(OtherSampleId);
         }
         timelineClasses.forEach(timelineRow => {
-            var circle = d3.selectAll(timelineRow).filter(function (x) {
+            var circle = d3.selectAll(timelineRow).filter(function(x) {
                 if (x.tooltip_tables.length === 1) {
-                    var specRefNum = x.tooltip_tables[0].filter(function (x) {
-                        return x[0] === "SpecimenReferenceNumber" || x[0] === "SPECIMEN_REFERENCE_NUMBER" || x[0] === "SAMPLE_ID";
+                    var specRefNum = x.tooltip_tables[0].filter(function(x) {
+                        return (
+                            x[0] === 'SpecimenReferenceNumber' ||
+                            x[0] === 'SPECIMEN_REFERENCE_NUMBER' ||
+                            x[0] === 'SAMPLE_ID'
+                        );
                     })[0];
                     if (specRefNum) {
                         return compareAgainstIds.indexOf(specRefNum[1]) !== -1;
@@ -57,16 +64,26 @@ function plotCaseLabelsInTimeline(timelineClasses, caseIds, clinicalDataMap, cas
                 return undefined;
             });
             if (circle[0][0]) {
-                var g = document.createElementNS("http://www.w3.org/2000/svg", "g");
-                $(g).attr("transform", "translate(" + circle.attr("cx") + "," + circle.attr("cy") + ")");
-                $(circle[0]).removeAttr("cx");
-                $(circle[0]).removeAttr("cy");
-                $(circle[0]).removeAttr("style");
+                var g = document.createElementNS(
+                    'http://www.w3.org/2000/svg',
+                    'g'
+                );
+                $(g).attr(
+                    'transform',
+                    'translate(' +
+                        circle.attr('cx') +
+                        ',' +
+                        circle.attr('cy') +
+                        ')'
+                );
+                $(circle[0]).removeAttr('cx');
+                $(circle[0]).removeAttr('cy');
+                $(circle[0]).removeAttr('style');
                 $(circle[0]).qtip('destroy');
                 $(circle[0]).unbind('mouseover mouseout');
                 $(circle[0]).wrap(g);
                 g = $(circle[0]).parent();
-                g.prop("__data__", $(circle[0]).prop("__data__"));
+                g.prop('__data__', $(circle[0]).prop('__data__'));
                 fillColorAndLabelForCase(d3.select(g.get(0)), caseId);
                 window.pvTimeline.addDataPointTooltip(g);
             }
@@ -74,69 +91,99 @@ function plotCaseLabelsInTimeline(timelineClasses, caseIds, clinicalDataMap, cas
     }
 }
 
-export function buildTimeline(params, caseIds, patientInfo, clinicalDataMap, caseMetaData, data, width) {
-
+export function buildTimeline(
+    params,
+    caseIds,
+    patientInfo,
+    clinicalDataMap,
+    caseMetaData,
+    data,
+    width
+) {
     if (data.length === 0) return;
 
     var timeData = clinicalTimelineExports.clinicalTimelineParser(data);
     if (timeData.length === 0) return;
 
     // TODO: remove this, special dev configuration for genie_bpc* studies
-    var isGenieBpcStudy = window.location.href.includes("genie_bpc")
+    var isGenieBpcStudy = window.location.href.includes('genie_bpc');
     if (isGenieBpcStudy) {
-
         // color based on state (need to rename Status to Med Onc Assessment)
-        var statusGenieData = _.find(timeData, (item) => item.label === 'Status' || item.label == "Med Onc Assessment");
+        var statusGenieData = _.find(
+            timeData,
+            item =>
+                item.label === 'Status' || item.label == 'Med Onc Assessment'
+        );
         if (statusGenieData) {
-            statusGenieData.label = "Med Onc Assessment";
+            statusGenieData.label = 'Med Onc Assessment';
             statusGenieData.times.forEach(time => {
-                var state = _.find(time.tooltip_tables[0], row => row[0] === "STATUS")[1].toLowerCase();
-                if (state.includes("indeter")) {
-                    time["color"] = "white";
-                } else if (state.includes("stable")) {
-                    time["color"] = "gainsboro";
-                } else if (state.includes("mixed")) {
-                    time["color"] = "goldenrod";
-                } else if (state.includes("improving")) {
-                    time["color"] = "rgb(44, 160, 44)";
-                } else if (state.includes("worsening")) {
-                    time["color"] = "rgb(214, 39, 40)";
+                var state = _.find(
+                    time.tooltip_tables[0],
+                    row => row[0] === 'STATUS'
+                )[1].toLowerCase();
+                if (state.includes('indeter')) {
+                    time['color'] = 'white';
+                } else if (state.includes('stable')) {
+                    time['color'] = 'gainsboro';
+                } else if (state.includes('mixed')) {
+                    time['color'] = 'goldenrod';
+                } else if (state.includes('improving')) {
+                    time['color'] = 'rgb(44, 160, 44)';
+                } else if (state.includes('worsening')) {
+                    time['color'] = 'rgb(214, 39, 40)';
                 }
             });
         }
         // same for imaging
-        var imagingGenieData = _.find(timeData, (item) => item.label === 'Imaging');
+        var imagingGenieData = _.find(
+            timeData,
+            item => item.label === 'Imaging'
+        );
         if (imagingGenieData) {
             imagingGenieData.times.forEach(time => {
-                var imageOverall = _.find(time.tooltip_tables[0], row => row[0] === "IMAGE_OVERALL");
-                imageOverall = imageOverall? imageOverall[1].toLowerCase() : "indeterminate";
-                if (imageOverall.includes("indeter") || imageOverall.includes("does not mention")) {
-                    time["color"] = "white";
-                } else if (imageOverall.includes("stable")) {
-                    time["color"] = "gainsboro";
-                } else if (imageOverall.includes("mixed")) {
-                    time["color"] = "goldenrod";
-                } else if (imageOverall.includes("improving")) {
-                    time["color"] = "rgb(44, 160, 44)";
-                } else if (imageOverall.includes("worsening")) {
-                    time["color"] = "rgb(214, 39, 40)";
+                var imageOverall = _.find(
+                    time.tooltip_tables[0],
+                    row => row[0] === 'IMAGE_OVERALL'
+                );
+                imageOverall = imageOverall
+                    ? imageOverall[1].toLowerCase()
+                    : 'indeterminate';
+                if (
+                    imageOverall.includes('indeter') ||
+                    imageOverall.includes('does not mention')
+                ) {
+                    time['color'] = 'white';
+                } else if (imageOverall.includes('stable')) {
+                    time['color'] = 'gainsboro';
+                } else if (imageOverall.includes('mixed')) {
+                    time['color'] = 'goldenrod';
+                } else if (imageOverall.includes('improving')) {
+                    time['color'] = 'rgb(44, 160, 44)';
+                } else if (imageOverall.includes('worsening')) {
+                    time['color'] = 'rgb(214, 39, 40)';
                 }
             });
         }
-    };
+    }
 
     // order specimens by svg label number
-    var specimen = _.find(timeData, (item) => item.label === 'Specimen');
+    var specimen = _.find(timeData, item => item.label === 'Specimen');
     if (specimen) {
-        specimen.times = _.sortBy(specimen.times, function (x) {
+        specimen.times = _.sortBy(specimen.times, function(x) {
             var sortOrder = Infinity;
 
-            var specRefNum = _.filter(x.tooltip_tables[0], function (x) {
-                return x[0] === "SPECIMEN_REFERENCE_NUMBER" || x[0] === "SpecimenReferenceNumber" || x[0] === "SAMPLE_ID";
+            var specRefNum = _.filter(x.tooltip_tables[0], function(x) {
+                return (
+                    x[0] === 'SPECIMEN_REFERENCE_NUMBER' ||
+                    x[0] === 'SpecimenReferenceNumber' ||
+                    x[0] === 'SAMPLE_ID'
+                );
             });
             if (specRefNum) {
                 if (specRefNum.length > 1) {
-                    console.warn("More than 1 specimen reference number found in tooltip table");
+                    console.warn(
+                        'More than 1 specimen reference number found in tooltip table'
+                    );
                 } else if (specRefNum.length === 1) {
                     sortOrder = caseIds.indexOf(specRefNum[0][1]);
                     if (sortOrder === -1) {
@@ -152,42 +199,45 @@ export function buildTimeline(params, caseIds, patientInfo, clinicalDataMap, cas
     // .*OS_MONTHS$ if .*OS_STATUS$ is DECEASED
     var i;
     var prefixes;
-    prefixes = Object.keys(patientInfo).filter(function (x) {
-        // find all keys postfixed with "OS_STATUS"
-        return /OS_STATUS$/.test(x);
-    }).map(function (x) {
-        // get the prefixes
-        return x.substr(0, x.length - "OS_STATUS".length);
-    });
+    prefixes = Object.keys(patientInfo)
+        .filter(function(x) {
+            // find all keys postfixed with "OS_STATUS"
+            return /OS_STATUS$/.test(x);
+        })
+        .map(function(x) {
+            // get the prefixes
+            return x.substr(0, x.length - 'OS_STATUS'.length);
+        });
 
     for (i = 0; i < prefixes.length; i++) {
         var prefix = prefixes[i];
-        if (patientInfo[prefix + "OS_STATUS"] === "DECEASED" &&
-            prefix + "OS_MONTHS" in patientInfo) {
-            var days = Math.round(parseFloat(patientInfo[prefix + "OS_MONTHS"]) * 30.4);
+        if (
+            patientInfo[prefix + 'OS_STATUS'] === 'DECEASED' &&
+            prefix + 'OS_MONTHS' in patientInfo
+        ) {
+            var days = Math.round(
+                parseFloat(patientInfo[prefix + 'OS_MONTHS']) * 30.4
+            );
             var timePoint = {
-                "starting_time": days,
-                "ending_time": days,
-                "display": "circle",
-                "color": "#000",
-                "tooltip_tables": [
-                    [
-                        ["START_DATE", days],
-                        ["STATUS", "DECEASED"]
-                    ]
-                ]
-            }
+                starting_time: days,
+                ending_time: days,
+                display: 'circle',
+                color: '#000',
+                tooltip_tables: [
+                    [['START_DATE', days], ['STATUS', 'DECEASED']],
+                ],
+            };
 
-            var trackData = timeData.filter(function (x) {
-                return x.label === "Status";
+            var trackData = timeData.filter(function(x) {
+                return x.label === 'Status';
             })[0];
 
             if (trackData) {
                 trackData.times = trackData.times.concat(timePoint);
             } else {
                 timeData = timeData.concat({
-                    "label": "Status",
-                    "times": [timePoint]
+                    label: 'Status',
+                    times: [timePoint],
                 });
             }
             // Add timepoint only once in case of multiple prefixes
@@ -195,66 +245,125 @@ export function buildTimeline(params, caseIds, patientInfo, clinicalDataMap, cas
         }
     }
 
-    window.pvTimeline = clinicalTimelineExports.clinicalTimeline()
+    window.pvTimeline = clinicalTimelineExports
+        .clinicalTimeline()
         .width(width)
         .data(timeData)
-        .divId("#timeline")
-        .setTimepointsDisplay("Imaging", "square")
-        .orderTracks(["Specimen", "Surgery", "Med Onc Assessment", "Status", "Diagnostics", "Diagnostic", "Imaging", "Lab_test", "Treatment"])
-        .splitByClinicalAttributes("Lab_test", "TEST")
+        .divId('#timeline')
+        .setTimepointsDisplay('Imaging', 'square')
+        .orderTracks([
+            'Specimen',
+            'Surgery',
+            'Med Onc Assessment',
+            'Status',
+            'Diagnostics',
+            'Diagnostic',
+            'Imaging',
+            'Lab_test',
+            'Treatment',
+        ])
+        .splitByClinicalAttributes('Lab_test', 'TEST');
     var splitData = window.pvTimeline.data();
     // Get TEST names that have a RESULT field in their clinical
     // tooltip table. We assume the RESULT field contains
     // integer/float values that can be used to size the dots on the
     // timeline by
-    var testsWithResults = splitData.filter(function (x) {
-        return x.parent_track === 'Lab_test' &&
-            _.every(x.times.map(
-                function (t) {
-                    return t.tooltip_tables.length === 1 &&
-                        t.tooltip_tables[0].filter(function (a) {
-                            return a[0] === 'RESULT'
-                        }).length > 0;
-                })
-            )
-    }).map(function (x) {
-        return x.label;
-    });
+    var testsWithResults = splitData
+        .filter(function(x) {
+            return (
+                x.parent_track === 'Lab_test' &&
+                _.every(
+                    x.times.map(function(t) {
+                        return (
+                            t.tooltip_tables.length === 1 &&
+                            t.tooltip_tables[0].filter(function(a) {
+                                return a[0] === 'RESULT';
+                            }).length > 0
+                        );
+                    })
+                )
+            );
+        })
+        .map(function(x) {
+            return x.label;
+        });
     // Scale dot size on timepoint by RESULT field
-    testsWithResults.forEach(function (test) {
-        window.pvTimeline =
-            window.pvTimeline
-                .sizeByClinicalAttribute(test, "RESULT")
-    })
+    testsWithResults.forEach(function(test) {
+        window.pvTimeline = window.pvTimeline.sizeByClinicalAttribute(
+            test,
+            'RESULT'
+        );
+    });
     if (isGenieBpcStudy) {
-        window.pvTimeline =
-            window.pvTimeline
-                .orderTracks(["Sample acquisition", "Sequencing", "Surgery", "Med Onc Assessment", "Status", "Diagnostics", "Diagnostic", "Imaging", "Lab_test", "Treatment"])
-                .setTimepointsDisplay("Imaging", "circle")
-                .splitByClinicalAttributes("Treatment", ["TREATMENT_TYPE", "AGENT"])
-                .enableTrackTooltips(false)
-                .plugins([{ obj: new clinicalTimelineExports.trimClinicalTimeline("Trim Timeline"), enabled: true }])
-                .addPostTimelineHook(plotCaseLabelsInTimeline.bind(this, [".timelineSeries_0", ".timelineSeries_1"], caseIds, clinicalDataMap, caseMetaData))
-                .addPostTimelineHook(addMoreGenieTimelineStylingHacks.bind(this));
+        window.pvTimeline = window.pvTimeline
+            .orderTracks([
+                'Sample acquisition',
+                'Sequencing',
+                'Surgery',
+                'Med Onc Assessment',
+                'Status',
+                'Diagnostics',
+                'Diagnostic',
+                'Imaging',
+                'Lab_test',
+                'Treatment',
+            ])
+            .setTimepointsDisplay('Imaging', 'circle')
+            .splitByClinicalAttributes('Treatment', ['TREATMENT_TYPE', 'AGENT'])
+            .enableTrackTooltips(false)
+            .plugins([
+                {
+                    obj: new clinicalTimelineExports.trimClinicalTimeline(
+                        'Trim Timeline'
+                    ),
+                    enabled: true,
+                },
+            ])
+            .addPostTimelineHook(
+                plotCaseLabelsInTimeline.bind(
+                    this,
+                    ['.timelineSeries_0', '.timelineSeries_1'],
+                    caseIds,
+                    clinicalDataMap,
+                    caseMetaData
+                )
+            )
+            .addPostTimelineHook(addMoreGenieTimelineStylingHacks.bind(this));
     } else {
-        window.pvTimeline =
-            window.pvTimeline
-                .splitByClinicalAttributes("Treatment", ["TREATMENT_TYPE", "SUBTYPE", "AGENT"])
-                .splitByClinicalAttributes("Diagnosis", ["SUBTYPE"])
-                .collapseAll()
-                .toggleTrackCollapse("Specimen")
-                .enableTrackTooltips(false)
-                .plugins([{ obj: new clinicalTimelineExports.trimClinicalTimeline("Trim Timeline"), enabled: true }])
-                .addPostTimelineHook(plotCaseLabelsInTimeline.bind(this, [".timelineSeries_0"], caseIds, clinicalDataMap, caseMetaData));
+        window.pvTimeline = window.pvTimeline
+            .splitByClinicalAttributes('Treatment', [
+                'TREATMENT_TYPE',
+                'SUBTYPE',
+                'AGENT',
+            ])
+            .splitByClinicalAttributes('Diagnosis', ['SUBTYPE'])
+            .collapseAll()
+            .toggleTrackCollapse('Specimen')
+            .enableTrackTooltips(false)
+            .plugins([
+                {
+                    obj: new clinicalTimelineExports.trimClinicalTimeline(
+                        'Trim Timeline'
+                    ),
+                    enabled: true,
+                },
+            ])
+            .addPostTimelineHook(
+                plotCaseLabelsInTimeline.bind(
+                    this,
+                    ['.timelineSeries_0'],
+                    caseIds,
+                    clinicalDataMap,
+                    caseMetaData
+                )
+            );
     }
     window.pvTimeline();
-    $("#timeline-container").show();
-
+    $('#timeline-container').show();
 
     // $.post("http://www.cbioportal.org/clinical_timeline_data.json",
     //     params,
     //
     //     , "json"
     // );
-
 }
diff --git a/src/pages/patientView/timeline/styles.scss b/src/pages/patientView/timeline/styles.scss
index 55343111fe8..9b57b40ef96 100644
--- a/src/pages/patientView/timeline/styles.scss
+++ b/src/pages/patientView/timeline/styles.scss
@@ -1,5 +1,5 @@
-.axis path, .axis line
-{
+.axis path,
+.axis line {
     fill: none;
     stroke: black;
     shape-rendering: crispEdges;
@@ -16,47 +16,44 @@
 }
 
 #timeline .axis {
-    transform: translate(0px,20px);
-    -ms-transform: translate(0px,20px); /* IE 9 */
-    -webkit-transform: translate(0px,20px); /* Safari and Chrome */
-    -o-transform: translate(0px,20px); /* Opera */
-    -moz-transform: translate(0px,20px); /* Firefox */
+    transform: translate(0px, 20px);
+    -ms-transform: translate(0px, 20px); /* IE 9 */
+    -webkit-transform: translate(0px, 20px); /* Safari and Chrome */
+    -o-transform: translate(0px, 20px); /* Opera */
+    -moz-transform: translate(0px, 20px); /* Firefox */
 }
 
 #timeline circle {
-  cursor: pointer;
+    cursor: pointer;
 }
 
 #timeline g text {
-  cursor:pointer;
+    cursor: pointer;
 }
 
-
 .coloredDiv {
-    height:20px; width:20px; float:left;
+    height: 20px;
+    width: 20px;
+    float: left;
 }
 
 .timeline-qtip {
-  padding:5px;
-  table {
-
-    tr {
-
-      td {
-        padding-top:5px;
-        padding-left:5px;
-        padding-right:5px;
-      }
-
-      &:first-child {
-        td {
-          padding-top:0;
+    padding: 5px;
+    table {
+        tr {
+            td {
+                padding-top: 5px;
+                padding-left: 5px;
+                padding-right: 5px;
+            }
+
+            &:first-child {
+                td {
+                    padding-top: 0;
+                }
+            }
         }
-      }
-
     }
-  }
-
 }
 
 .timelineContainer {
diff --git a/src/pages/patientView/timeline/timeline-lib.js b/src/pages/patientView/timeline/timeline-lib.js
index cd38948b860..72e995946b5 100644
--- a/src/pages/patientView/timeline/timeline-lib.js
+++ b/src/pages/patientView/timeline/timeline-lib.js
@@ -1,7 +1,5 @@
 // we have to shim both exports and imports for this library
 // so better to do so in once place and then export
-let clinicalTimelineExports = require(
-    "imports-loader?$=jquery&d3=d3&_=underscore!exports-loader?clinicalTimeline=clinicalTimeline&clinicalTimelineZoom=clinicalTimelineZoom&trimClinicalTimeline=trimClinicalTimeline&clinicalTimelineParser=clinicalTimelineParser!clinical-timeline"
-);
+let clinicalTimelineExports = require('imports-loader?$=jquery&d3=d3&_=underscore!exports-loader?clinicalTimeline=clinicalTimeline&clinicalTimelineZoom=clinicalTimelineZoom&trimClinicalTimeline=trimClinicalTimeline&clinicalTimelineParser=clinicalTimelineParser!clinical-timeline');
 
-export default clinicalTimelineExports;
\ No newline at end of file
+export default clinicalTimelineExports;
diff --git a/src/pages/patientView/trialMatch/TrialMatchFeedback.tsx b/src/pages/patientView/trialMatch/TrialMatchFeedback.tsx
index 367334a4736..6f70940bbd6 100644
--- a/src/pages/patientView/trialMatch/TrialMatchFeedback.tsx
+++ b/src/pages/patientView/trialMatch/TrialMatchFeedback.tsx
@@ -1,7 +1,7 @@
-import * as React from "react";
+import * as React from 'react';
 import * as _ from 'lodash';
-import {Modal} from "react-bootstrap";
-import { ISelectedTrialFeedbackFormData } from "./TrialMatchTable";
+import { Modal } from 'react-bootstrap';
+import { ISelectedTrialFeedbackFormData } from './TrialMatchTable';
 
 interface ITrialMatchFeedbackProps {
     show: boolean;
@@ -12,24 +12,40 @@ interface ITrialMatchFeedbackProps {
     onHide: () => void;
 }
 
-export default class TrialMatchFeedback extends React.Component<ITrialMatchFeedbackProps, {}> {
+export default class TrialMatchFeedback extends React.Component<
+    ITrialMatchFeedbackProps,
+    {}
+> {
     public render() {
         let src = '';
         if (this.props.show) {
-            if (!_.isUndefined(this.props.isTrialFeedback) && this.props.isTrialFeedback) {
-                const url = "https://docs.google.com/forms/d/e/1FAIpQLSfcoLRG0iWO_qUb4hfzWFQ1toP575EKCTwqPcXE9DmMzuS34w/viewform";
-                const userParam = `entry.1655318994=${this.props.userEmailAddress || ''}`;
-                const uriParam = `entry.1782078941=${encodeURIComponent(window.location.href)}`;
+            if (
+                !_.isUndefined(this.props.isTrialFeedback) &&
+                this.props.isTrialFeedback
+            ) {
+                const url =
+                    'https://docs.google.com/forms/d/e/1FAIpQLSfcoLRG0iWO_qUb4hfzWFQ1toP575EKCTwqPcXE9DmMzuS34w/viewform';
+                const userParam = `entry.1655318994=${this.props
+                    .userEmailAddress || ''}`;
+                const uriParam = `entry.1782078941=${encodeURIComponent(
+                    window.location.href
+                )}`;
                 src = `${url}?${userParam}&${uriParam}&embedded=true`;
                 if (!_.isUndefined(this.props.data)) {
-                    const nctIdParam = `entry.1070287537=${this.props.data.nctId || ''}`;
-                    const protocolNoParam = `entry.699867040=${this.props.data.protocolNo || ''}`;
+                    const nctIdParam = `entry.1070287537=${this.props.data
+                        .nctId || ''}`;
+                    const protocolNoParam = `entry.699867040=${this.props.data
+                        .protocolNo || ''}`;
                     src = `${url}?${userParam}&${uriParam}&${nctIdParam}&${protocolNoParam}&embedded=true`;
                 }
             } else {
-                const url = "https://docs.google.com/forms/d/e/1FAIpQLSes1WuMattmo_aT8-34LaPRTC47vVzvdWMgYZ5tSuw8EHoLZw/viewform";
-                const userParam = `entry.251841421=${this.props.userEmailAddress || ''}`;
-                const uriParam = `entry.1295500928=${encodeURIComponent(window.location.href)}`;
+                const url =
+                    'https://docs.google.com/forms/d/e/1FAIpQLSes1WuMattmo_aT8-34LaPRTC47vVzvdWMgYZ5tSuw8EHoLZw/viewform';
+                const userParam = `entry.251841421=${this.props
+                    .userEmailAddress || ''}`;
+                const uriParam = `entry.1295500928=${encodeURIComponent(
+                    window.location.href
+                )}`;
                 src = `${url}?${userParam}&${uriParam}&embedded=true`;
             }
         }
@@ -42,7 +58,12 @@ export default class TrialMatchFeedback extends React.Component<ITrialMatchFeedb
                 <Modal.Body>
                     <iframe
                         src={src}
-                        style={{width:550, height:700, border:"none", marginLeft:"10px"}}
+                        style={{
+                            width: 550,
+                            height: 700,
+                            border: 'none',
+                            marginLeft: '10px',
+                        }}
                         marginHeight={0}
                         marginWidth={0}
                     >
diff --git a/src/pages/patientView/trialMatch/TrialMatchTable.tsx b/src/pages/patientView/trialMatch/TrialMatchTable.tsx
index 4deff894f18..4168458758f 100644
--- a/src/pages/patientView/trialMatch/TrialMatchTable.tsx
+++ b/src/pages/patientView/trialMatch/TrialMatchTable.tsx
@@ -1,30 +1,38 @@
 import * as React from 'react';
 import { If, Then, Else } from 'react-if';
-import {observer} from "mobx-react";
+import { observer } from 'mobx-react';
 import * as _ from 'lodash';
 import {
-    IClinicalGroupMatch, IGenomicGroupMatch, IGenomicMatch, IDetailedTrialMatch, IArmMatch, IGenomicMatchType
-} from "../../../shared/model/MatchMiner";
+    IClinicalGroupMatch,
+    IGenomicGroupMatch,
+    IGenomicMatch,
+    IDetailedTrialMatch,
+    IArmMatch,
+    IGenomicMatchType,
+} from '../../../shared/model/MatchMiner';
 import styles from './style/trialMatch.module.scss';
-import { action, computed, observable } from "mobx";
-import LazyMobXTable from "../../../shared/components/lazyMobXTable/LazyMobXTable";
-import SampleManager from "../SampleManager";
-import {DefaultTooltip, placeArrowBottomLeft } from "cbioportal-frontend-commons";
-import { getAgeRangeDisplay } from "./TrialMatchTableUtils";
-import TrialMatchFeedback from "./TrialMatchFeedback";
+import { action, computed, observable } from 'mobx';
+import LazyMobXTable from '../../../shared/components/lazyMobXTable/LazyMobXTable';
+import SampleManager from '../SampleManager';
+import {
+    DefaultTooltip,
+    placeArrowBottomLeft,
+} from 'cbioportal-frontend-commons';
+import { getAgeRangeDisplay } from './TrialMatchTableUtils';
+import TrialMatchFeedback from './TrialMatchFeedback';
 import AppConfig from 'appConfig';
-import { Button } from "react-bootstrap";
+import { Button } from 'react-bootstrap';
 
 export type ITrialMatchProps = {
     sampleManager: SampleManager | null;
     detailedTrialMatches: IDetailedTrialMatch[];
     containerWidth: number;
-}
+};
 
 export type ISelectedTrialFeedbackFormData = {
     nctId: string;
     protocolNo: string;
-}
+};
 
 enum ColumnKey {
     TITLE = 'Title',
@@ -33,130 +41,285 @@ enum ColumnKey {
 }
 
 enum ColumnWidth {
-    STATUS = 140
+    STATUS = 140,
 }
 
-class TrialMatchTableComponent extends LazyMobXTable<IDetailedTrialMatch> {
-
-}
+class TrialMatchTableComponent extends LazyMobXTable<IDetailedTrialMatch> {}
 
 @observer
 export default class TrialMatchTable extends React.Component<ITrialMatchProps> {
-
     @computed
     get columnWidths() {
         return {
             [ColumnKey.STATUS]: ColumnWidth.STATUS,
-            [ColumnKey.TITLE]: 0.35 * (this.props.containerWidth - ColumnWidth.STATUS),
-            [ColumnKey.MATCHING_CRITERIA]: 0.65 * (this.props.containerWidth - ColumnWidth.STATUS)
+            [ColumnKey.TITLE]:
+                0.35 * (this.props.containerWidth - ColumnWidth.STATUS),
+            [ColumnKey.MATCHING_CRITERIA]:
+                0.65 * (this.props.containerWidth - ColumnWidth.STATUS),
         };
     }
 
-    @observable selectedTrialFeedbackFormData: ISelectedTrialFeedbackFormData | undefined;
+    @observable selectedTrialFeedbackFormData:
+        | ISelectedTrialFeedbackFormData
+        | undefined;
     @observable showGeneralFeedback = false;
 
-    private _columns = [{
-        name: ColumnKey.TITLE,
-        render: (trial: IDetailedTrialMatch) => (
-            <div>
-                <If condition={trial.protocolNo.length > 0}>
-                    <div><a target="_blank" href={"https://www.mskcc.org/cancer-care/clinical-trials/" + trial.protocolNo}>{trial.protocolNo}</a></div>
-                </If>
-                <If condition={trial.nctId.length > 0}>
-                    <div><a target="_blank" href={"https://clinicaltrials.gov/ct2/show/" + trial.nctId}>{trial.nctId}</a></div>
-                </If>
-                <div>{trial.shortTitle}</div>
-                {trial.principalInvestigator &&
-                    <div className={styles.icon}>
-                        <i className={`fa fa-user-md ${styles.marginRight}`} aria-hidden="true"></i>
-                        <If condition={!_.isUndefined(trial.principalInvestigator.url)}>
-                            <Then>
-                                <a target="_blank" href={trial.principalInvestigator.url}>{trial.principalInvestigator.full_name}</a>
-                            </Then>
-                            <Else>
-                                {trial.principalInvestigator.full_name}
-                            </Else>
-                        </If>
-                        <If condition={!_.isUndefined(trial.principalInvestigator.email)}>
-                            <a href={"mailto:" + trial.principalInvestigator.email}><i className={`fa fa-envelope-o ${styles.marginLeft}`} aria-hidden="true"></i></a>
-                        </If>
-                    </div>
-                }
-            </div>
-        ),
-        width: this.columnWidths[ColumnKey.TITLE]
-    }, {
-        name: ColumnKey.MATCHING_CRITERIA,
-        render: (trial: IDetailedTrialMatch) => (
-            <div>
-                {trial.matches.map((armMatch: IArmMatch, index: number) => (
-                    <div>
-                        <div className={styles.matchInfoContainer}>
-                            <div className={styles.genomicInfoContainer}>
-                                <div>
-                                    {armMatch.matches.map((clinicalGroupMatch: IClinicalGroupMatch, cgIndex:number) => (
-                                        <div className={styles.criteriaContainer}>
-                                            <If condition={clinicalGroupMatch.matches || clinicalGroupMatch.notMatches}>
-                                                <div className={styles.firstLeft}>
-                                                    {clinicalGroupMatch.matches && this.getGenomicMatch(clinicalGroupMatch.matches)}
-                                                    {clinicalGroupMatch.notMatches && this.getGenomicNotMatch(clinicalGroupMatch.notMatches)}
+    private _columns = [
+        {
+            name: ColumnKey.TITLE,
+            render: (trial: IDetailedTrialMatch) => (
+                <div>
+                    <If condition={trial.protocolNo.length > 0}>
+                        <div>
+                            <a
+                                target="_blank"
+                                href={
+                                    'https://www.mskcc.org/cancer-care/clinical-trials/' +
+                                    trial.protocolNo
+                                }
+                            >
+                                {trial.protocolNo}
+                            </a>
+                        </div>
+                    </If>
+                    <If condition={trial.nctId.length > 0}>
+                        <div>
+                            <a
+                                target="_blank"
+                                href={
+                                    'https://clinicaltrials.gov/ct2/show/' +
+                                    trial.nctId
+                                }
+                            >
+                                {trial.nctId}
+                            </a>
+                        </div>
+                    </If>
+                    <div>{trial.shortTitle}</div>
+                    {trial.principalInvestigator && (
+                        <div className={styles.icon}>
+                            <i
+                                className={`fa fa-user-md ${styles.marginRight}`}
+                                aria-hidden="true"
+                            ></i>
+                            <If
+                                condition={
+                                    !_.isUndefined(
+                                        trial.principalInvestigator.url
+                                    )
+                                }
+                            >
+                                <Then>
+                                    <a
+                                        target="_blank"
+                                        href={trial.principalInvestigator.url}
+                                    >
+                                        {trial.principalInvestigator.full_name}
+                                    </a>
+                                </Then>
+                                <Else>
+                                    {trial.principalInvestigator.full_name}
+                                </Else>
+                            </If>
+                            <If
+                                condition={
+                                    !_.isUndefined(
+                                        trial.principalInvestigator.email
+                                    )
+                                }
+                            >
+                                <a
+                                    href={
+                                        'mailto:' +
+                                        trial.principalInvestigator.email
+                                    }
+                                >
+                                    <i
+                                        className={`fa fa-envelope-o ${styles.marginLeft}`}
+                                        aria-hidden="true"
+                                    ></i>
+                                </a>
+                            </If>
+                        </div>
+                    )}
+                </div>
+            ),
+            width: this.columnWidths[ColumnKey.TITLE],
+        },
+        {
+            name: ColumnKey.MATCHING_CRITERIA,
+            render: (trial: IDetailedTrialMatch) => (
+                <div>
+                    {trial.matches.map((armMatch: IArmMatch, index: number) => (
+                        <div>
+                            <div className={styles.matchInfoContainer}>
+                                <div className={styles.genomicInfoContainer}>
+                                    <div>
+                                        {armMatch.matches.map(
+                                            (
+                                                clinicalGroupMatch: IClinicalGroupMatch,
+                                                cgIndex: number
+                                            ) => (
+                                                <div
+                                                    className={
+                                                        styles.criteriaContainer
+                                                    }
+                                                >
+                                                    <If
+                                                        condition={
+                                                            clinicalGroupMatch.matches ||
+                                                            clinicalGroupMatch.notMatches
+                                                        }
+                                                    >
+                                                        <div
+                                                            className={
+                                                                styles.firstLeft
+                                                            }
+                                                        >
+                                                            {clinicalGroupMatch.matches &&
+                                                                this.getGenomicMatch(
+                                                                    clinicalGroupMatch.matches
+                                                                )}
+                                                            {clinicalGroupMatch.notMatches &&
+                                                                this.getGenomicNotMatch(
+                                                                    clinicalGroupMatch.notMatches
+                                                                )}
+                                                        </div>
+                                                    </If>
+                                                    {this.getClinicalMatch(
+                                                        clinicalGroupMatch
+                                                    )}
+                                                    <If
+                                                        condition={
+                                                            cgIndex <
+                                                            armMatch.matches
+                                                                .length -
+                                                                1
+                                                        }
+                                                    >
+                                                        <hr
+                                                            className={
+                                                                styles.criteriaHr
+                                                            }
+                                                        />
+                                                    </If>
                                                 </div>
-                                            </If>
-                                            {this.getClinicalMatch(clinicalGroupMatch)}
-                                            <If condition={cgIndex < armMatch.matches.length - 1}><hr className={styles.criteriaHr}/></If>
-                                        </div>
-                                    ))}
-                                </div>
-                                <div style={{ marginTop: 5 }}>
-                                    <span>Matched Samples: {this.getSampleIdIcons(armMatch.sampleIds)}</span>
-                                </div>
-                                <If condition={armMatch.armDescription !== ''}>
-                                    <div style={{ width: '75%' }}>
-                                        <span>Arm: {armMatch.armDescription}</span>
+                                            )
+                                        )}
                                     </div>
-                                </If>
-                                <If condition={armMatch.drugs.length > 0}>
-                                    <div>
+                                    <div style={{ marginTop: 5 }}>
                                         <span>
-                                            <img src={require("../../../globalStyles/images/drug.png")} style={{ width: 18, marginTop: -5, marginRight: 5 }} alt="drug icon"/>
-                                            <b>{armMatch.drugs.map((drugCombination: string[]) => drugCombination.join(' + ')).join(', ')}</b></span>
+                                            Matched Samples:{' '}
+                                            {this.getSampleIdIcons(
+                                                armMatch.sampleIds
+                                            )}
+                                        </span>
                                     </div>
-                                </If>
+                                    <If
+                                        condition={
+                                            armMatch.armDescription !== ''
+                                        }
+                                    >
+                                        <div style={{ width: '75%' }}>
+                                            <span>
+                                                Arm: {armMatch.armDescription}
+                                            </span>
+                                        </div>
+                                    </If>
+                                    <If condition={armMatch.drugs.length > 0}>
+                                        <div>
+                                            <span>
+                                                <img
+                                                    src={require('../../../globalStyles/images/drug.png')}
+                                                    style={{
+                                                        width: 18,
+                                                        marginTop: -5,
+                                                        marginRight: 5,
+                                                    }}
+                                                    alt="drug icon"
+                                                />
+                                                <b>
+                                                    {armMatch.drugs
+                                                        .map(
+                                                            (
+                                                                drugCombination: string[]
+                                                            ) =>
+                                                                drugCombination.join(
+                                                                    ' + '
+                                                                )
+                                                        )
+                                                        .join(', ')}
+                                                </b>
+                                            </span>
+                                        </div>
+                                    </If>
+                                </div>
                             </div>
+                            <If condition={index < trial.matches.length - 1}>
+                                <hr className={styles.criteriaHr} />
+                            </If>
                         </div>
-                        <If condition={index < trial.matches.length - 1}><hr className={styles.criteriaHr}/></If>
-                    </div>
-                ))}
-            </div>
-        ),
-        width: this.columnWidths[ColumnKey.MATCHING_CRITERIA]
-    }, {
-        name: ColumnKey.STATUS,
-        render: (trial: IDetailedTrialMatch) => (
-            <div className={styles.statusContainer}>
-                <a target="_blank" href={"https://www.mskcc.org/cancer-care/clinical-trials/" + trial.protocolNo}>
-                    <span className={styles.statusBackground}>{trial.status}</span>
-                </a>
-                <span className={styles.feedback}>
-                    <Button type="button" className={"btn btn-default btn-sm btn-xs " + styles.feedbackButton} onClick={() => this.openCloseFeedbackForm({nctId: trial.nctId, protocolNo: trial.protocolNo})}>Feedback</Button>
-                </span>
-            </div>
-        ),
-        sortBy: (trial: IDetailedTrialMatch) => trial.status,
-        width: this.columnWidths[ColumnKey.STATUS]
-    }];
+                    ))}
+                </div>
+            ),
+            width: this.columnWidths[ColumnKey.MATCHING_CRITERIA],
+        },
+        {
+            name: ColumnKey.STATUS,
+            render: (trial: IDetailedTrialMatch) => (
+                <div className={styles.statusContainer}>
+                    <a
+                        target="_blank"
+                        href={
+                            'https://www.mskcc.org/cancer-care/clinical-trials/' +
+                            trial.protocolNo
+                        }
+                    >
+                        <span className={styles.statusBackground}>
+                            {trial.status}
+                        </span>
+                    </a>
+                    <span className={styles.feedback}>
+                        <Button
+                            type="button"
+                            className={
+                                'btn btn-default btn-sm btn-xs ' +
+                                styles.feedbackButton
+                            }
+                            onClick={() =>
+                                this.openCloseFeedbackForm({
+                                    nctId: trial.nctId,
+                                    protocolNo: trial.protocolNo,
+                                })
+                            }
+                        >
+                            Feedback
+                        </Button>
+                    </span>
+                </div>
+            ),
+            sortBy: (trial: IDetailedTrialMatch) => trial.status,
+            width: this.columnWidths[ColumnKey.STATUS],
+        },
+    ];
 
     public getSampleIdIcons(sampleIds: string[]) {
         let sortedSampleIds = sampleIds;
         if (sampleIds.length > 1) {
             const sampleOrder = this.props.sampleManager!.getSampleIdsInOrder();
-            sortedSampleIds = sampleOrder.filter( ( sampleId: string ) => sampleIds.includes( sampleId ) );
+            sortedSampleIds = sampleOrder.filter((sampleId: string) =>
+                sampleIds.includes(sampleId)
+            );
         }
         return (
             <React.Fragment>
                 {sortedSampleIds.map((sampleId: string) => (
                     <span className={styles.genomicSpan}>
-                        {this.props.sampleManager!.getComponentForSample(sampleId, 1, '')}
+                        {this.props.sampleManager!.getComponentForSample(
+                            sampleId,
+                            1,
+                            ''
+                        )}
                     </span>
                 ))}
             </React.Fragment>
@@ -165,30 +328,62 @@ export default class TrialMatchTable extends React.Component<ITrialMatchProps> {
 
     public getClinicalMatch(clinicalGroupMatch: IClinicalGroupMatch) {
         return (
-            <div className={styles.firstRight} style={(clinicalGroupMatch.matches || clinicalGroupMatch.notMatches) ? {} : {width: "100%"}}>
-                <span className={styles.secondLeft}>{getAgeRangeDisplay(clinicalGroupMatch.trialAgeNumerical)}</span>
+            <div
+                className={styles.firstRight}
+                style={
+                    clinicalGroupMatch.matches || clinicalGroupMatch.notMatches
+                        ? {}
+                        : { width: '100%' }
+                }
+            >
+                <span className={styles.secondLeft}>
+                    {getAgeRangeDisplay(clinicalGroupMatch.trialAgeNumerical)}
+                </span>
                 <span className={styles.secondRight}>
-                    {clinicalGroupMatch.trialOncotreePrimaryDiagnosis.positive.join(', ')}
-                    {clinicalGroupMatch.trialOncotreePrimaryDiagnosis.negative.length > 0 &&
+                    {clinicalGroupMatch.trialOncotreePrimaryDiagnosis.positive.join(
+                        ', '
+                    )}
+                    {clinicalGroupMatch.trialOncotreePrimaryDiagnosis.negative
+                        .length > 0 && (
                         <span>
                             <b> except </b>
-                            <If condition={clinicalGroupMatch.trialOncotreePrimaryDiagnosis.negative.length < 4}>
+                            <If
+                                condition={
+                                    clinicalGroupMatch
+                                        .trialOncotreePrimaryDiagnosis.negative
+                                        .length < 4
+                                }
+                            >
                                 <Then>
-                                    <span>{clinicalGroupMatch.trialOncotreePrimaryDiagnosis.negative.join(', ').replace(/,(?!.*,)/gmi, ' and')}</span>
+                                    <span>
+                                        {clinicalGroupMatch.trialOncotreePrimaryDiagnosis.negative
+                                            .join(', ')
+                                            .replace(/,(?!.*,)/gim, ' and')}
+                                    </span>
                                 </Then>
                                 <Else>
-                                     <DefaultTooltip
-                                         placement='bottomLeft'
-                                         trigger={['hover', 'focus']}
-                                         overlay={this.tooltipClinicalContent(clinicalGroupMatch.trialOncotreePrimaryDiagnosis.negative)}
-                                         destroyTooltipOnHide={true}
-                                         onPopupAlign={placeArrowBottomLeft}>
-                                         <span>{clinicalGroupMatch.trialOncotreePrimaryDiagnosis.negative.length + ` cancer types`}</span>
+                                    <DefaultTooltip
+                                        placement="bottomLeft"
+                                        trigger={['hover', 'focus']}
+                                        overlay={this.tooltipClinicalContent(
+                                            clinicalGroupMatch
+                                                .trialOncotreePrimaryDiagnosis
+                                                .negative
+                                        )}
+                                        destroyTooltipOnHide={true}
+                                        onPopupAlign={placeArrowBottomLeft}
+                                    >
+                                        <span>
+                                            {clinicalGroupMatch
+                                                .trialOncotreePrimaryDiagnosis
+                                                .negative.length +
+                                                ` cancer types`}
+                                        </span>
                                     </DefaultTooltip>
                                 </Else>
                             </If>
                         </span>
-                    }
+                    )}
                 </span>
             </div>
         );
@@ -202,34 +397,60 @@ export default class TrialMatchTable extends React.Component<ITrialMatchProps> {
     public getGenomicMatch(matches: IGenomicMatchType) {
         return (
             <React.Fragment>
-                {matches.MUTATION.map((genomicGroupMatch: IGenomicGroupMatch) => (
+                {matches.MUTATION.map(
+                    (genomicGroupMatch: IGenomicGroupMatch) => (
+                        <div>
+                            <span style={{ marginRight: 5 }}>
+                                <b>
+                                    {
+                                        genomicGroupMatch.patientGenomic!
+                                            .trueHugoSymbol
+                                    }{' '}
+                                </b>
+                                {
+                                    genomicGroupMatch.patientGenomic!
+                                        .trueProteinChange
+                                }
+                            </span>
+                            <DefaultTooltip
+                                placement="bottomLeft"
+                                trigger={['hover', 'focus']}
+                                overlay={this.tooltipGenomicContent(
+                                    genomicGroupMatch.genomicAlteration
+                                )}
+                                destroyTooltipOnHide={false}
+                                onPopupAlign={placeArrowBottomLeft}
+                            >
+                                <i
+                                    className={
+                                        'fa fa-info-circle ' + styles.icon
+                                    }
+                                ></i>
+                            </DefaultTooltip>
+                        </div>
+                    )
+                )}
+                {matches.MSI.length > 0 && (
                     <div>
-                        <span style={{'marginRight': 5}}>
-                            <b>{genomicGroupMatch.patientGenomic!.trueHugoSymbol} </b>{genomicGroupMatch.patientGenomic!.trueProteinChange}
-                        </span>
-                        <DefaultTooltip
-                            placement='bottomLeft'
-                            trigger={['hover', 'focus']}
-                            overlay={this.tooltipGenomicContent(genomicGroupMatch.genomicAlteration)}
-                            destroyTooltipOnHide={false}
-                            onPopupAlign={placeArrowBottomLeft}>
-                            <i className={'fa fa-info-circle ' + styles.icon}></i>
-                        </DefaultTooltip>
+                        Tumor is <b>MSI-H</b>
                     </div>
-                ))}
-                {matches.MSI.length > 0 &&
-                    <div>Tumor is <b>MSI-H</b></div>
-                }
+                )}
                 {matches.CNA.map((genomicGroupMatch: IGenomicGroupMatch) => (
                     <div>
-                        {this.getGenomicAlteration(genomicGroupMatch.genomicAlteration)}
-                    </div>
-                ))}
-                {matches.WILDTYPE.map((genomicGroupMatch: IGenomicGroupMatch) => (
-                    <div>
-                        {this.getGenomicAlteration(genomicGroupMatch.genomicAlteration)}
+                        {this.getGenomicAlteration(
+                            genomicGroupMatch.genomicAlteration
+                        )}
                     </div>
                 ))}
+                {matches.WILDTYPE.map(
+                    (genomicGroupMatch: IGenomicGroupMatch) => (
+                        <div>
+                            {this.getGenomicAlteration(
+                                genomicGroupMatch.genomicAlteration
+                            )}
+                        </div>
+                    )
+                )}
             </React.Fragment>
         );
     }
@@ -237,42 +458,71 @@ export default class TrialMatchTable extends React.Component<ITrialMatchProps> {
     public getGenomicNotMatch(notMatches: IGenomicMatchType) {
         let mutationAndCnagenemicAlterations: string[] = [];
         if (notMatches.MUTATION.length > 0) {
-            mutationAndCnagenemicAlterations = notMatches.MUTATION[0].genomicAlteration;
+            mutationAndCnagenemicAlterations =
+                notMatches.MUTATION[0].genomicAlteration;
         }
         if (notMatches.CNA.length > 0) {
-            mutationAndCnagenemicAlterations = mutationAndCnagenemicAlterations.concat(notMatches.CNA[0].genomicAlteration);
+            mutationAndCnagenemicAlterations = mutationAndCnagenemicAlterations.concat(
+                notMatches.CNA[0].genomicAlteration
+            );
         }
         return (
             <React.Fragment>
-                { mutationAndCnagenemicAlterations.length > 0 &&
-                <div>
-                    <span className={styles.genomicSpan}>{this.getDescriptionForNotMatches(mutationAndCnagenemicAlterations, 3, 'Negative for alterations in', '')}</span>
-                    <DefaultTooltip
-                        placement='bottomLeft'
-                        trigger={['hover', 'focus']}
-                        overlay={this.tooltipGenomicContent(mutationAndCnagenemicAlterations)}
-                        destroyTooltipOnHide={false}
-                        onPopupAlign={placeArrowBottomLeft}>
-                        <i className={'fa fa-info-circle ' + styles.icon}></i>
-                    </DefaultTooltip>
-                </div>
-                }
-                { notMatches.MSI.length > 0 &&
-                    <div>Tumor is <b>not MSI-H</b></div>
-                }
-                { notMatches.WILDTYPE.length > 0 &&
-                <div>
-                    <span className={styles.genomicSpan}>{this.getDescriptionForNotMatches(notMatches.WILDTYPE[0].genomicAlteration, 3, 'Tumor doesn\'t have', 'defined by the trial')}</span>
-                    <DefaultTooltip
-                        placement='bottomLeft'
-                        trigger={['hover', 'focus']}
-                        overlay={this.tooltipGenomicContent(notMatches.WILDTYPE[0].genomicAlteration)}
-                        destroyTooltipOnHide={false}
-                        onPopupAlign={placeArrowBottomLeft}>
-                        <i className={'fa fa-info-circle ' + styles.icon}></i>
-                    </DefaultTooltip>
-                </div>
-                }
+                {mutationAndCnagenemicAlterations.length > 0 && (
+                    <div>
+                        <span className={styles.genomicSpan}>
+                            {this.getDescriptionForNotMatches(
+                                mutationAndCnagenemicAlterations,
+                                3,
+                                'Negative for alterations in',
+                                ''
+                            )}
+                        </span>
+                        <DefaultTooltip
+                            placement="bottomLeft"
+                            trigger={['hover', 'focus']}
+                            overlay={this.tooltipGenomicContent(
+                                mutationAndCnagenemicAlterations
+                            )}
+                            destroyTooltipOnHide={false}
+                            onPopupAlign={placeArrowBottomLeft}
+                        >
+                            <i
+                                className={'fa fa-info-circle ' + styles.icon}
+                            ></i>
+                        </DefaultTooltip>
+                    </div>
+                )}
+                {notMatches.MSI.length > 0 && (
+                    <div>
+                        Tumor is <b>not MSI-H</b>
+                    </div>
+                )}
+                {notMatches.WILDTYPE.length > 0 && (
+                    <div>
+                        <span className={styles.genomicSpan}>
+                            {this.getDescriptionForNotMatches(
+                                notMatches.WILDTYPE[0].genomicAlteration,
+                                3,
+                                "Tumor doesn't have",
+                                'defined by the trial'
+                            )}
+                        </span>
+                        <DefaultTooltip
+                            placement="bottomLeft"
+                            trigger={['hover', 'focus']}
+                            overlay={this.tooltipGenomicContent(
+                                notMatches.WILDTYPE[0].genomicAlteration
+                            )}
+                            destroyTooltipOnHide={false}
+                            onPopupAlign={placeArrowBottomLeft}
+                        >
+                            <i
+                                className={'fa fa-info-circle ' + styles.icon}
+                            ></i>
+                        </DefaultTooltip>
+                    </div>
+                )}
             </React.Fragment>
         );
     }
@@ -282,7 +532,9 @@ export default class TrialMatchTable extends React.Component<ITrialMatchProps> {
         return (
             <div>
                 {filteredData.map((e: string[]) => (
-                    <div><b>{e[0]}</b> {e[1]}</div>
+                    <div>
+                        <b>{e[0]}</b> {e[1]}
+                    </div>
                 ))}
             </div>
         );
@@ -291,16 +543,19 @@ export default class TrialMatchTable extends React.Component<ITrialMatchProps> {
     public tooltipGenomicContent(data: string[]) {
         return (
             <div className={styles.tooltip}>
-                <div>Genomic selection {data.length > 1 ? 'criteria': 'criterion'} specified in the trial:</div>
+                <div>
+                    Genomic selection{' '}
+                    {data.length > 1 ? 'criteria' : 'criterion'} specified in
+                    the trial:
+                </div>
                 {data.map((e: string) => (
                     <div className={styles.genomicSpan}>
                         <If condition={e.includes('!')}>
                             <Then>
-                                <b>Not </b>{e.replace(/!/g, '')}
+                                <b>Not </b>
+                                {e.replace(/!/g, '')}
                             </Then>
-                            <Else>
-                                {e}
-                            </Else>
+                            <Else>{e}</Else>
                         </If>
                     </div>
                 ))}
@@ -320,8 +575,15 @@ export default class TrialMatchTable extends React.Component<ITrialMatchProps> {
         );
     }
 
-    public getDescriptionForNotMatches(genomicAlteration: string[], threshold: number, preContent: string, postContent: string) {
-        const hugoSymbolSet = new Set([...genomicAlteration].map((s: string) => s.split(' ')[0]));
+    public getDescriptionForNotMatches(
+        genomicAlteration: string[],
+        threshold: number,
+        preContent: string,
+        postContent: string
+    ) {
+        const hugoSymbolSet = new Set(
+            [...genomicAlteration].map((s: string) => s.split(' ')[0])
+        );
         let genomicAlterationContent = '';
         if (hugoSymbolSet.size <= threshold) {
             genomicAlterationContent = [...hugoSymbolSet].join(', ');
@@ -334,34 +596,53 @@ export default class TrialMatchTable extends React.Component<ITrialMatchProps> {
     render() {
         return (
             <div>
-                <p style={{marginBottom: '0'}}>Curated genomic and clinical criteria from open clinical trials at Memorial Sloan Kettering. Please <a href="mailto:team@oncokb.org">contact us</a> or submit <a onClick={() => this.showGeneralFeedback=true}>feedback form</a> if you have any questions.</p>
-                {!_.isUndefined(this.showGeneralFeedback) &&
+                <p style={{ marginBottom: '0' }}>
+                    Curated genomic and clinical criteria from open clinical
+                    trials at Memorial Sloan Kettering. Please{' '}
+                    <a href="mailto:team@oncokb.org">contact us</a> or submit{' '}
+                    <a onClick={() => (this.showGeneralFeedback = true)}>
+                        feedback form
+                    </a>{' '}
+                    if you have any questions.
+                </p>
+                {!_.isUndefined(this.showGeneralFeedback) && (
                     <TrialMatchFeedback
                         show={this.showGeneralFeedback}
-                        onHide={() => this.showGeneralFeedback = false}
+                        onHide={() => (this.showGeneralFeedback = false)}
                         title="OncoKB Matched Trials General Feedback"
-                        userEmailAddress={AppConfig.serverConfig.user_email_address}
+                        userEmailAddress={
+                            AppConfig.serverConfig.user_email_address
+                        }
                     />
-                }
-                {this.selectedTrialFeedbackFormData &&
+                )}
+                {this.selectedTrialFeedbackFormData && (
                     <TrialMatchFeedback
                         show={!!this.selectedTrialFeedbackFormData}
                         data={this.selectedTrialFeedbackFormData}
                         onHide={() => this.openCloseFeedbackForm()}
                         isTrialFeedback={true}
                         title="OncoKB Matched Trial Feedback"
-                        userEmailAddress={AppConfig.serverConfig.user_email_address}
+                        userEmailAddress={
+                            AppConfig.serverConfig.user_email_address
+                        }
                     />
-                }
+                )}
                 <TrialMatchTableComponent
                     data={this.props.detailedTrialMatches}
                     columns={this._columns}
                     showCopyDownload={false}
                 />
                 <div className={styles.powered}>
-                    Powered by <a href="https://oncokb.org/" target="_blank">OncoKB</a> & <a href="https://matchminer.org/" target="_blank">MatchMiner</a>
+                    Powered by{' '}
+                    <a href="https://oncokb.org/" target="_blank">
+                        OncoKB
+                    </a>{' '}
+                    &{' '}
+                    <a href="https://matchminer.org/" target="_blank">
+                        MatchMiner
+                    </a>
                 </div>
             </div>
-        )
+        );
     }
 }
diff --git a/src/pages/patientView/trialMatch/TrialMatchTableUtils.spec.ts b/src/pages/patientView/trialMatch/TrialMatchTableUtils.spec.ts
index 0a18f1c7eb8..f8c6425eb02 100644
--- a/src/pages/patientView/trialMatch/TrialMatchTableUtils.spec.ts
+++ b/src/pages/patientView/trialMatch/TrialMatchTableUtils.spec.ts
@@ -1,450 +1,473 @@
 import { assert } from 'chai';
 import * as _ from 'lodash';
 import {
-    getMatchPriority, excludeControlArms, getDrugsFromArm,
-    mergeClinicalGroupMatchByAge
+    getMatchPriority,
+    excludeControlArms,
+    getDrugsFromArm,
+    mergeClinicalGroupMatchByAge,
 } from './TrialMatchTableUtils';
-import { IArm, IClinicalGroupMatch, ITrialMatch } from "../../../shared/model/MatchMiner";
-
-describe("TrialMatchTableUtils", () => {
+import {
+    IArm,
+    IClinicalGroupMatch,
+    ITrialMatch,
+} from '../../../shared/model/MatchMiner';
 
-    it("Test setTrialMatchPriority: set priority of trial match record based on number of positive matches and not matches.", () => {
-        const clinicalMatchGroup = [ {
-                "trialAgeNumerical": ">=18",
-                "trialOncotreePrimaryDiagnosis": {
-                    "positive": [ "Non-Small Cell Lung Cancer" ],
-                    "negative": []
+describe('TrialMatchTableUtils', () => {
+    it('Test setTrialMatchPriority: set priority of trial match record based on number of positive matches and not matches.', () => {
+        const clinicalMatchGroup = [
+            {
+                trialAgeNumerical: '>=18',
+                trialOncotreePrimaryDiagnosis: {
+                    positive: ['Non-Small Cell Lung Cancer'],
+                    negative: [],
                 },
-                "matches": {
-                    "MUTATION": [],
-                    "MSI": [],
-                    "CNA": [],
-                    "WILDTYPE": []
+                matches: {
+                    MUTATION: [],
+                    MSI: [],
+                    CNA: [],
+                    WILDTYPE: [],
                 },
-                "notMatches": {
-                    "MUTATION": [
+                notMatches: {
+                    MUTATION: [
                         {
-                            "genomicAlteration": "EGFR !E709_T710delinsD",
-                            "matches": [
+                            genomicAlteration: 'EGFR !E709_T710delinsD',
+                            matches: [
                                 {
-                                    "trueHugoSymbol": null,
-                                    "trueProteinChange": null,
-                                    "sampleIds": [ "P-0000628-T01-IM3", "P-0000628-T02-IM5" ]
-                                }
-                            ]
+                                    trueHugoSymbol: null,
+                                    trueProteinChange: null,
+                                    sampleIds: [
+                                        'P-0000628-T01-IM3',
+                                        'P-0000628-T02-IM5',
+                                    ],
+                                },
+                            ],
                         },
                         {
-                            "genomicAlteration": "EGFR !E709K",
-                            "matches": [
+                            genomicAlteration: 'EGFR !E709K',
+                            matches: [
                                 {
-                                    "trueHugoSymbol": null,
-                                    "trueProteinChange": null,
-                                    "sampleIds": [ "P-0000628-T01-IM3", "P-0000628-T02-IM5" ]
-                                }
-                            ]
+                                    trueHugoSymbol: null,
+                                    trueProteinChange: null,
+                                    sampleIds: [
+                                        'P-0000628-T01-IM3',
+                                        'P-0000628-T02-IM5',
+                                    ],
+                                },
+                            ],
                         },
                         {
-                            "genomicAlteration": "EGFR !L833V",
-                            "matches": [
+                            genomicAlteration: 'EGFR !L833V',
+                            matches: [
                                 {
-                                    "trueHugoSymbol": null,
-                                    "trueProteinChange": null,
-                                    "sampleIds": [ "P-0000628-T01-IM3", "P-0000628-T02-IM5" ]
-                                }
-                            ]
-                        }
+                                    trueHugoSymbol: null,
+                                    trueProteinChange: null,
+                                    sampleIds: [
+                                        'P-0000628-T01-IM3',
+                                        'P-0000628-T02-IM5',
+                                    ],
+                                },
+                            ],
+                        },
                     ],
-                    "MSI": [],
-                    "CNA": [],
-                    "WILDTYPE": []
-                }
-            }, {
-                "trialAgeNumerical": ">=18",
-                "trialOncotreePrimaryDiagnosis": {
-                    "positive": [ "Non-Small Cell Lung Cancer" ],
-                    "negative": []
+                    MSI: [],
+                    CNA: [],
+                    WILDTYPE: [],
                 },
-                "matches": {
-                    "MUTATION": [
+            },
+            {
+                trialAgeNumerical: '>=18',
+                trialOncotreePrimaryDiagnosis: {
+                    positive: ['Non-Small Cell Lung Cancer'],
+                    negative: [],
+                },
+                matches: {
+                    MUTATION: [
                         {
-                            "genomicAlteration": "EGFR 729_761del",
-                            "matches": [
+                            genomicAlteration: 'EGFR 729_761del',
+                            matches: [
                                 {
-                                    "trueHugoSymbol": "EGFR",
-                                    "trueProteinChange": "L747_P753delinsS",
-                                    "sampleIds": [ "P-0000628-T01-IM3" ]
-                                }
-                            ]
-                        }
+                                    trueHugoSymbol: 'EGFR',
+                                    trueProteinChange: 'L747_P753delinsS',
+                                    sampleIds: ['P-0000628-T01-IM3'],
+                                },
+                            ],
+                        },
                     ],
-                    "MSI": [],
-                    "CNA": [],
-                    "WILDTYPE": []
+                    MSI: [],
+                    CNA: [],
+                    WILDTYPE: [],
                 },
-                "notMatches": {
-                    "MUTATION": [
+                notMatches: {
+                    MUTATION: [
                         {
-                            "genomicAlteration": "EGFR !T790M",
-                            "matches": [
+                            genomicAlteration: 'EGFR !T790M',
+                            matches: [
                                 {
-                                    "trueHugoSymbol": null,
-                                    "trueProteinChange": null,
-                                    "sampleIds": [ "P-0000628-T01-IM3" ]
-                                }
-                            ]
-                        }
+                                    trueHugoSymbol: null,
+                                    trueProteinChange: null,
+                                    sampleIds: ['P-0000628-T01-IM3'],
+                                },
+                            ],
+                        },
                     ],
-                    "MSI": [],
-                    "CNA": [],
-                    "WILDTYPE": []
-
-                }
-            }, {
-                "trialAgeNumerical": ">18",
-                "trialOncotreePrimaryDiagnosis": {
-                    "positive": [ "Lung Adenocarcinoma" ],
-                    "negative": []
+                    MSI: [],
+                    CNA: [],
+                    WILDTYPE: [],
+                },
+            },
+            {
+                trialAgeNumerical: '>18',
+                trialOncotreePrimaryDiagnosis: {
+                    positive: ['Lung Adenocarcinoma'],
+                    negative: [],
                 },
-                "matches": {
-                    "MUTATION": [
+                matches: {
+                    MUTATION: [
                         {
-                            "genomicAlteration": "EGFR Oncogenic Mutations",
-                            "matches": [
+                            genomicAlteration: 'EGFR Oncogenic Mutations',
+                            matches: [
                                 {
-                                    "trueHugoSymbol": "EGFR",
-                                    "trueProteinChange": "L747_P753delinsS",
-                                    "sampleIds": [ "P-0000628-T01-IM3", "P-0000628-T02-IM5" ]
+                                    trueHugoSymbol: 'EGFR',
+                                    trueProteinChange: 'L747_P753delinsS',
+                                    sampleIds: [
+                                        'P-0000628-T01-IM3',
+                                        'P-0000628-T02-IM5',
+                                    ],
                                 },
                                 {
-                                    "trueHugoSymbol": "EGFR",
-                                    "trueProteinChange": "T790M",
-                                    "sampleIds": [ "P-0000628-T02-IM5" ]
-                                }
-                            ]
-                        }
+                                    trueHugoSymbol: 'EGFR',
+                                    trueProteinChange: 'T790M',
+                                    sampleIds: ['P-0000628-T02-IM5'],
+                                },
+                            ],
+                        },
                     ],
-                    "MSI": [],
-                    "CNA": [],
-                    "WILDTYPE": []
-
+                    MSI: [],
+                    CNA: [],
+                    WILDTYPE: [],
                 },
-                "notMatches": {
-                    "MUTATION": [],
-                    "MSI": [],
-                    "CNA": [],
-                    "WILDTYPE": []
-                }
-            }];
+                notMatches: {
+                    MUTATION: [],
+                    MSI: [],
+                    CNA: [],
+                    WILDTYPE: [],
+                },
+            },
+        ];
         const expectedResult = [2, 1, 0];
         _.forEach(clinicalMatchGroup, (item: any, index: number) => {
-            assert.equal(getMatchPriority(item), expectedResult[index], 'Priority of trial is wrong.');
+            assert.equal(
+                getMatchPriority(item),
+                expectedResult[index],
+                'Priority of trial is wrong.'
+            );
         });
     });
 
-    it("Test excludeControlArms: control arms should be excluded from matched results.", () => {
-        const data:ITrialMatch[] = [
+    it('Test excludeControlArms: control arms should be excluded from matched results.', () => {
+        const data: ITrialMatch[] = [
             {
-                id: "NCT01948297+13-131",
-                nctId: "NCT01948297",
-                protocolNo: "13-131",
-                oncotreePrimaryDiagnosisName: "Intrahepatic Cholangiocarcinoma",
-                matchType: "annotated_variant",
-                armDescription: "Part A - Dose Escalation",
-                trueHugoSymbol: "FGFR2",
-                sampleId: "P-0002675-T01-IM3",
-                mrn: "P-0002675",
-                trueProteinChange: "FGFR2-BICC1 fusion",
-                genomicAlteration: "FGFR2 Oncogenic Mutations",
-                trialAgeNumerical: ">=18",
-                trialOncotreePrimaryDiagnosis: "All Solid Tumors"
+                id: 'NCT01948297+13-131',
+                nctId: 'NCT01948297',
+                protocolNo: '13-131',
+                oncotreePrimaryDiagnosisName: 'Intrahepatic Cholangiocarcinoma',
+                matchType: 'annotated_variant',
+                armDescription: 'Part A - Dose Escalation',
+                trueHugoSymbol: 'FGFR2',
+                sampleId: 'P-0002675-T01-IM3',
+                mrn: 'P-0002675',
+                trueProteinChange: 'FGFR2-BICC1 fusion',
+                genomicAlteration: 'FGFR2 Oncogenic Mutations',
+                trialAgeNumerical: '>=18',
+                trialOncotreePrimaryDiagnosis: 'All Solid Tumors',
             },
             {
-                id: "NCT01948297+13-131",
-                nctId: "NCT01948297",
-                protocolNo: "13-131",
-                oncotreePrimaryDiagnosisName: "Intrahepatic Cholangiocarcinoma",
-                matchType: "annotated_variant",
-                armDescription: "Part B - Expansion Cohort",
-                trueHugoSymbol: "FGFR2",
-                sampleId: "P-0002675-T01-IM3",
-                mrn: "P-0002675",
-                trueProteinChange: "FGFR2-BICC1 fusion",
-                genomicAlteration: "FGFR2 Fusions",
-                trialAgeNumerical: ">=18",
-                trialOncotreePrimaryDiagnosis: "All Solid Tumors"
+                id: 'NCT01948297+13-131',
+                nctId: 'NCT01948297',
+                protocolNo: '13-131',
+                oncotreePrimaryDiagnosisName: 'Intrahepatic Cholangiocarcinoma',
+                matchType: 'annotated_variant',
+                armDescription: 'Part B - Expansion Cohort',
+                trueHugoSymbol: 'FGFR2',
+                sampleId: 'P-0002675-T01-IM3',
+                mrn: 'P-0002675',
+                trueProteinChange: 'FGFR2-BICC1 fusion',
+                genomicAlteration: 'FGFR2 Fusions',
+                trialAgeNumerical: '>=18',
+                trialOncotreePrimaryDiagnosis: 'All Solid Tumors',
             },
             {
-                id: "NCT02924376+17-405",
-                nctId: "NCT02924376",
-                protocolNo: "17-405",
-                oncotreePrimaryDiagnosisName: "Intrahepatic Cholangiocarcinoma",
-                matchType: "annotated_variant",
-                armDescription: "Cohort C INCB054828",
-                armType: "Control Arm",
-                sampleId: "P-0002675-T01-IM3",
-                mrn: "P-0002675",
-                genomicAlteration: "FGF23 !Oncogenic Mutations",
-                trialAgeNumerical: ">=18",
-                trialOncotreePrimaryDiagnosis: "Cholangiocarcinoma"
+                id: 'NCT02924376+17-405',
+                nctId: 'NCT02924376',
+                protocolNo: '17-405',
+                oncotreePrimaryDiagnosisName: 'Intrahepatic Cholangiocarcinoma',
+                matchType: 'annotated_variant',
+                armDescription: 'Cohort C INCB054828',
+                armType: 'Control Arm',
+                sampleId: 'P-0002675-T01-IM3',
+                mrn: 'P-0002675',
+                genomicAlteration: 'FGF23 !Oncogenic Mutations',
+                trialAgeNumerical: '>=18',
+                trialOncotreePrimaryDiagnosis: 'Cholangiocarcinoma',
             },
             {
-                id: "NCT02924376+17-405",
-                nctId: "NCT02924376",
-                protocolNo: "17-405",
-                oncotreePrimaryDiagnosisName: "Intrahepatic Cholangiocarcinoma",
-                matchType: "annotated_variant",
-                armDescription: "Cohort C INCB054828",
-                armType: "Control Arm",
-                sampleId: "P-0002675-T01-IM3",
-                mrn: "P-0002675",
-                genomicAlteration: "FGFR1 !Oncogenic Mutations",
-                trialAgeNumerical: ">=18",
-                trialOncotreePrimaryDiagnosis: "Cholangiocarcinoma"
-            }
+                id: 'NCT02924376+17-405',
+                nctId: 'NCT02924376',
+                protocolNo: '17-405',
+                oncotreePrimaryDiagnosisName: 'Intrahepatic Cholangiocarcinoma',
+                matchType: 'annotated_variant',
+                armDescription: 'Cohort C INCB054828',
+                armType: 'Control Arm',
+                sampleId: 'P-0002675-T01-IM3',
+                mrn: 'P-0002675',
+                genomicAlteration: 'FGFR1 !Oncogenic Mutations',
+                trialAgeNumerical: '>=18',
+                trialOncotreePrimaryDiagnosis: 'Cholangiocarcinoma',
+            },
         ];
-        const expectedResult:ITrialMatch[] = [
+        const expectedResult: ITrialMatch[] = [
             {
-                id: "NCT01948297+13-131",
-                nctId: "NCT01948297",
-                protocolNo: "13-131",
-                oncotreePrimaryDiagnosisName: "Intrahepatic Cholangiocarcinoma",
-                matchType: "annotated_variant",
-                armDescription: "Part A - Dose Escalation",
-                trueHugoSymbol: "FGFR2",
-                sampleId: "P-0002675-T01-IM3",
-                mrn: "P-0002675",
-                trueProteinChange: "FGFR2-BICC1 fusion",
-                genomicAlteration: "FGFR2 Oncogenic Mutations",
-                trialAgeNumerical: ">=18",
-                trialOncotreePrimaryDiagnosis: "All Solid Tumors"
+                id: 'NCT01948297+13-131',
+                nctId: 'NCT01948297',
+                protocolNo: '13-131',
+                oncotreePrimaryDiagnosisName: 'Intrahepatic Cholangiocarcinoma',
+                matchType: 'annotated_variant',
+                armDescription: 'Part A - Dose Escalation',
+                trueHugoSymbol: 'FGFR2',
+                sampleId: 'P-0002675-T01-IM3',
+                mrn: 'P-0002675',
+                trueProteinChange: 'FGFR2-BICC1 fusion',
+                genomicAlteration: 'FGFR2 Oncogenic Mutations',
+                trialAgeNumerical: '>=18',
+                trialOncotreePrimaryDiagnosis: 'All Solid Tumors',
             },
             {
-                id: "NCT01948297+13-131",
-                nctId: "NCT01948297",
-                protocolNo: "13-131",
-                oncotreePrimaryDiagnosisName: "Intrahepatic Cholangiocarcinoma",
-                matchType: "annotated_variant",
-                armDescription: "Part B - Expansion Cohort",
-                trueHugoSymbol: "FGFR2",
-                sampleId: "P-0002675-T01-IM3",
-                mrn: "P-0002675",
-                trueProteinChange: "FGFR2-BICC1 fusion",
-                genomicAlteration: "FGFR2 Fusions",
-                trialAgeNumerical: ">=18",
-                trialOncotreePrimaryDiagnosis: "All Solid Tumors"
-            }
+                id: 'NCT01948297+13-131',
+                nctId: 'NCT01948297',
+                protocolNo: '13-131',
+                oncotreePrimaryDiagnosisName: 'Intrahepatic Cholangiocarcinoma',
+                matchType: 'annotated_variant',
+                armDescription: 'Part B - Expansion Cohort',
+                trueHugoSymbol: 'FGFR2',
+                sampleId: 'P-0002675-T01-IM3',
+                mrn: 'P-0002675',
+                trueProteinChange: 'FGFR2-BICC1 fusion',
+                genomicAlteration: 'FGFR2 Fusions',
+                trialAgeNumerical: '>=18',
+                trialOncotreePrimaryDiagnosis: 'All Solid Tumors',
+            },
         ];
-        assert.deepEqual(excludeControlArms(data),  expectedResult, 'Exclude control arm failed.');
+        assert.deepEqual(
+            excludeControlArms(data),
+            expectedResult,
+            'Exclude control arm failed.'
+        );
     });
 
-    it("Test getDrugsFromArm: fetch drugs from arm.", () => {
+    it('Test getDrugsFromArm: fetch drugs from arm.', () => {
         const arm: IArm[] = [
             {
                 drugs: [
                     [
                         {
-                            synonyms: "",
-                            name: "Pemigatinib",
-                            ncit_code: "C121553"
-                        }
-                    ]
+                            synonyms: '',
+                            name: 'Pemigatinib',
+                            ncit_code: 'C121553',
+                        },
+                    ],
                 ],
-                arm_info: "INCB054828 in subjects with FGFR2 translocation with a documented fusion partner in central laboratory report",
+                arm_info:
+                    'INCB054828 in subjects with FGFR2 translocation with a documented fusion partner in central laboratory report',
                 match: [
                     {
                         and: [
                             {
                                 genomic: {
-                                    annotated_variant: "Fusions",
-                                    hugo_symbol: "FGFR2"
-                                }
+                                    annotated_variant: 'Fusions',
+                                    hugo_symbol: 'FGFR2',
+                                },
                             },
                             {
                                 clinical: {
-                                    oncotree_primary_diagnosis: "Cholangiocarcinoma",
-                                    age_numerical: ">=18"
-                                }
-                            }
-                        ]
-                    }
+                                    oncotree_primary_diagnosis:
+                                        'Cholangiocarcinoma',
+                                    age_numerical: '>=18',
+                                },
+                            },
+                        ],
+                    },
                 ],
-                arm_eligibility: "Men and women 18 years and older\n\nHistologically or cytologically confirmed advanced/metastatic or surgically unresectable cholangiocarcinoma.\n\nCohort A: FGFR2 translocation with a documented fusion partner in central laboratory report\n",
-                arm_description: "Cohort A INCB054828"
+                arm_eligibility:
+                    'Men and women 18 years and older\n\nHistologically or cytologically confirmed advanced/metastatic or surgically unresectable cholangiocarcinoma.\n\nCohort A: FGFR2 translocation with a documented fusion partner in central laboratory report\n',
+                arm_description: 'Cohort A INCB054828',
             },
             {
                 drugs: [
                     [
                         {
-                            synonyms: "",
-                            name: "Pemigatinib",
-                            ncit_code: "C121553"
-                        }
-                    ]
+                            synonyms: '',
+                            name: 'Pemigatinib',
+                            ncit_code: 'C121553',
+                        },
+                    ],
                 ],
-                arm_info: "INCB054828 in subjects with other FGF/FGFR alterations",
+                arm_info:
+                    'INCB054828 in subjects with other FGF/FGFR alterations',
                 match: [
                     {
                         and: [
                             {
                                 clinical: {
-                                    oncotree_primary_diagnosis: "Cholangiocarcinoma",
-                                    age_numerical: ">=18"
-                                }
+                                    oncotree_primary_diagnosis:
+                                        'Cholangiocarcinoma',
+                                    age_numerical: '>=18',
+                                },
                             },
                             {
                                 or: [
                                     {
                                         genomic: {
-                                            annotated_variant: "N549Y",
-                                            hugo_symbol: "FGFR2"
-                                        }
+                                            annotated_variant: 'N549Y',
+                                            hugo_symbol: 'FGFR2',
+                                        },
                                     },
                                     {
                                         genomic: {
-                                            annotated_variant: "Oncogenic Mutations",
-                                            hugo_symbol: "FGFR3"
-                                        }
-                                    }
-                                ]
-                            }
-                        ]
-                    }
+                                            annotated_variant:
+                                                'Oncogenic Mutations',
+                                            hugo_symbol: 'FGFR3',
+                                        },
+                                    },
+                                ],
+                            },
+                        ],
+                    },
                 ],
-                arm_eligibility: "Men and women 18 years and older\n\nHistologically or cytologically confirmed advanced/metastatic or surgically unresectable cholangiocarcinoma.\nCohort B: other FGF/FGFR alterations\n",
-                arm_description: "Cohort B INCB054828"
-            }
+                arm_eligibility:
+                    'Men and women 18 years and older\n\nHistologically or cytologically confirmed advanced/metastatic or surgically unresectable cholangiocarcinoma.\nCohort B: other FGF/FGFR alterations\n',
+                arm_description: 'Cohort B INCB054828',
+            },
         ];
-        const armDescription: string = "Cohort B INCB054828";
-        const expectedResult:string[][]  = [["Pemigatinib"]];
-        assert.deepEqual(getDrugsFromArm(armDescription, arm),  expectedResult, 'Get drugs failed.');
+        const armDescription: string = 'Cohort B INCB054828';
+        const expectedResult: string[][] = [['Pemigatinib']];
+        assert.deepEqual(
+            getDrugsFromArm(armDescription, arm),
+            expectedResult,
+            'Get drugs failed.'
+        );
     });
 
-    it("Test mergeClinicalGroupMatchByAge: merge trial matches by the same clinical age.", () => {
+    it('Test mergeClinicalGroupMatchByAge: merge trial matches by the same clinical age.', () => {
         const clinicalGroupMatch: IClinicalGroupMatch[] = [
             {
-                trialAgeNumerical: [
-                    ">0"
-                ],
+                trialAgeNumerical: ['>0'],
                 trialOncotreePrimaryDiagnosis: {
-                    positive: [
-                        "All Solid Tumors"
-                    ],
-                    negative: [
-                        "CNS Cancer"
-                    ]
+                    positive: ['All Solid Tumors'],
+                    negative: ['CNS Cancer'],
                 },
                 matches: {
                     MUTATION: [
                         {
-                            genomicAlteration: ["NTRK3 Fusions"],
+                            genomicAlteration: ['NTRK3 Fusions'],
                             patientGenomic: {
-                                trueHugoSymbol: "NTRK3",
-                                trueProteinChange: "NTRK3-ETV6 fusion - Archer"
-                            }
+                                trueHugoSymbol: 'NTRK3',
+                                trueProteinChange: 'NTRK3-ETV6 fusion - Archer',
+                            },
                         },
                         {
-                            genomicAlteration: ["NTRK3 Fusions"],
+                            genomicAlteration: ['NTRK3 Fusions'],
                             patientGenomic: {
-                                trueHugoSymbol: "NTRK3",
-                                trueProteinChange: "ETV6-NTRK3 fusion"
-                            }
-                        }
+                                trueHugoSymbol: 'NTRK3',
+                                trueProteinChange: 'ETV6-NTRK3 fusion',
+                            },
+                        },
                     ],
                     CNA: [],
                     MSI: [],
-                    WILDTYPE: []
+                    WILDTYPE: [],
                 },
                 notMatches: {
                     MUTATION: [],
                     CNA: [],
                     MSI: [],
-                    WILDTYPE: []
-                }
+                    WILDTYPE: [],
+                },
             },
             {
-                trialAgeNumerical: [
-                    "<22"
-                ],
+                trialAgeNumerical: ['<22'],
                 trialOncotreePrimaryDiagnosis: {
-                    positive: [
-                        "All Solid Tumors"
-                    ],
-                    negative: [
-                        "CNS Cancer"
-                    ]
+                    positive: ['All Solid Tumors'],
+                    negative: ['CNS Cancer'],
                 },
                 matches: {
                     MUTATION: [
                         {
-                            genomicAlteration: ["NTRK3 Fusions"],
+                            genomicAlteration: ['NTRK3 Fusions'],
                             patientGenomic: {
-                                trueHugoSymbol: "NTRK3",
-                                trueProteinChange: "NTRK3-ETV6 fusion - Archer"
-                            }
+                                trueHugoSymbol: 'NTRK3',
+                                trueProteinChange: 'NTRK3-ETV6 fusion - Archer',
+                            },
                         },
                         {
-                            genomicAlteration: ["NTRK3 Fusions"],
+                            genomicAlteration: ['NTRK3 Fusions'],
                             patientGenomic: {
-                                trueHugoSymbol: "NTRK3",
-                                trueProteinChange: "ETV6-NTRK3 fusion"
-                            }
-                        }
+                                trueHugoSymbol: 'NTRK3',
+                                trueProteinChange: 'ETV6-NTRK3 fusion',
+                            },
+                        },
                     ],
                     CNA: [],
                     MSI: [],
-                    WILDTYPE: []
+                    WILDTYPE: [],
                 },
                 notMatches: {
                     MUTATION: [],
                     CNA: [],
                     MSI: [],
-                    WILDTYPE: []
-                }
-            }
+                    WILDTYPE: [],
+                },
+            },
         ];
-        const expectedResult: IClinicalGroupMatch[]  = [
+        const expectedResult: IClinicalGroupMatch[] = [
             {
-                trialAgeNumerical: [
-                    ">0",
-                    "<22"
-                ],
+                trialAgeNumerical: ['>0', '<22'],
                 trialOncotreePrimaryDiagnosis: {
-                    positive: [
-                        "All Solid Tumors"
-                    ],
-                    negative: [
-                        "CNS Cancer"
-                    ]
+                    positive: ['All Solid Tumors'],
+                    negative: ['CNS Cancer'],
                 },
                 matches: {
                     MUTATION: [
                         {
-                            genomicAlteration: ["NTRK3 Fusions"],
+                            genomicAlteration: ['NTRK3 Fusions'],
                             patientGenomic: {
-                                trueHugoSymbol: "NTRK3",
-                                trueProteinChange: "NTRK3-ETV6 fusion - Archer"
-                            }
+                                trueHugoSymbol: 'NTRK3',
+                                trueProteinChange: 'NTRK3-ETV6 fusion - Archer',
+                            },
                         },
                         {
-                            genomicAlteration: ["NTRK3 Fusions"],
+                            genomicAlteration: ['NTRK3 Fusions'],
                             patientGenomic: {
-                                trueHugoSymbol: "NTRK3",
-                                trueProteinChange: "ETV6-NTRK3 fusion"
-                            }
-                        }
+                                trueHugoSymbol: 'NTRK3',
+                                trueProteinChange: 'ETV6-NTRK3 fusion',
+                            },
+                        },
                     ],
                     CNA: [],
                     MSI: [],
-                    WILDTYPE: []
+                    WILDTYPE: [],
                 },
                 notMatches: {
                     MUTATION: [],
                     CNA: [],
                     MSI: [],
-                    WILDTYPE: []
-                }
-            }
+                    WILDTYPE: [],
+                },
+            },
         ];
-        assert.deepEqual(mergeClinicalGroupMatchByAge(clinicalGroupMatch),  expectedResult, 'Merge trial matches by the same clinical age failed.');
+        assert.deepEqual(
+            mergeClinicalGroupMatchByAge(clinicalGroupMatch),
+            expectedResult,
+            'Merge trial matches by the same clinical age failed.'
+        );
     });
 });
diff --git a/src/pages/patientView/trialMatch/TrialMatchTableUtils.ts b/src/pages/patientView/trialMatch/TrialMatchTableUtils.ts
index bef4c04cc04..b0a81e523e3 100644
--- a/src/pages/patientView/trialMatch/TrialMatchTableUtils.ts
+++ b/src/pages/patientView/trialMatch/TrialMatchTableUtils.ts
@@ -1,43 +1,83 @@
 import {
-    IArmMatch, IClinicalGroupMatch, IDetailedTrialMatch, IGenomicGroupMatch, IGenomicMatch, ITrial,
-    ITrialMatch, IArm, IDrug, IGenomicMatchType
-} from "../../../shared/model/MatchMiner";
+    IArmMatch,
+    IClinicalGroupMatch,
+    IDetailedTrialMatch,
+    IGenomicGroupMatch,
+    IGenomicMatch,
+    ITrial,
+    ITrialMatch,
+    IArm,
+    IDrug,
+    IGenomicMatchType,
+} from '../../../shared/model/MatchMiner';
 import * as _ from 'lodash';
 
-export function groupTrialMatchesById(trials: ITrial[], trialMatches:ITrialMatch[]): IDetailedTrialMatch[] {
+export function groupTrialMatchesById(
+    trials: ITrial[],
+    trialMatches: ITrialMatch[]
+): IDetailedTrialMatch[] {
     trialMatches = excludeControlArms(trialMatches);
-    const matchesGroupedById = _.groupBy(trialMatches, (trial: ITrialMatch) => trial.id);
-    const matchedTrials: IDetailedTrialMatch[] = _.map(matchesGroupedById, (trialGroup, trialId) => {
-        const originalMatchedTrial: ITrial = _.find( trials, (trial) => trial.id === trialId )!;
-        const matchedTrial: IDetailedTrialMatch = {
-            id: originalMatchedTrial.id,
-            nctId: originalMatchedTrial.nctId,
-            principalInvestigator: originalMatchedTrial.principalInvestigator,
-            protocolNo: originalMatchedTrial.protocolNo,
-            phase: originalMatchedTrial.phase,
-            shortTitle: originalMatchedTrial.shortTitle,
-            status: originalMatchedTrial.status,
-            matches: [],
-            priority: 0 // highest priority
-        };
-        matchedTrial.matches = groupTrialMatchesByArmDescription(trialGroup, originalMatchedTrial);
-        matchedTrial.priority = calculateTrialPriority(matchedTrial.matches);
-        return matchedTrial;
-    });
-    return _.sortBy(matchedTrials, (trial: IDetailedTrialMatch) => trial.priority);
+    const matchesGroupedById = _.groupBy(
+        trialMatches,
+        (trial: ITrialMatch) => trial.id
+    );
+    const matchedTrials: IDetailedTrialMatch[] = _.map(
+        matchesGroupedById,
+        (trialGroup, trialId) => {
+            const originalMatchedTrial: ITrial = _.find(
+                trials,
+                trial => trial.id === trialId
+            )!;
+            const matchedTrial: IDetailedTrialMatch = {
+                id: originalMatchedTrial.id,
+                nctId: originalMatchedTrial.nctId,
+                principalInvestigator:
+                    originalMatchedTrial.principalInvestigator,
+                protocolNo: originalMatchedTrial.protocolNo,
+                phase: originalMatchedTrial.phase,
+                shortTitle: originalMatchedTrial.shortTitle,
+                status: originalMatchedTrial.status,
+                matches: [],
+                priority: 0, // highest priority
+            };
+            matchedTrial.matches = groupTrialMatchesByArmDescription(
+                trialGroup,
+                originalMatchedTrial
+            );
+            matchedTrial.priority = calculateTrialPriority(
+                matchedTrial.matches
+            );
+            return matchedTrial;
+        }
+    );
+    return _.sortBy(
+        matchedTrials,
+        (trial: IDetailedTrialMatch) => trial.priority
+    );
 }
 
-export function groupTrialMatchesByArmDescription(trialGroup: ITrialMatch[], originalMatchedTrial: ITrial): IArmMatch[] {
-    const matchesGroupedByArm = _.groupBy(trialGroup, (trial: ITrialMatch) => trial.armDescription);
+export function groupTrialMatchesByArmDescription(
+    trialGroup: ITrialMatch[],
+    originalMatchedTrial: ITrial
+): IArmMatch[] {
+    const matchesGroupedByArm = _.groupBy(
+        trialGroup,
+        (trial: ITrialMatch) => trial.armDescription
+    );
     const matches = _.map(matchesGroupedByArm, (armGroup, armDescription) => {
         const armMatch: IArmMatch = {
             armDescription: armDescription,
             drugs: [],
             matches: [],
-            sampleIds: _.uniq(armGroup.map((trialMatch: ITrialMatch) => trialMatch.sampleId)).sort()
+            sampleIds: _.uniq(
+                armGroup.map((trialMatch: ITrialMatch) => trialMatch.sampleId)
+            ).sort(),
         };
         if (!_.isUndefined(originalMatchedTrial.treatmentList.step[0].arm)) {
-            armMatch.drugs = getDrugsFromArm(armDescription, originalMatchedTrial.treatmentList.step[0].arm);
+            armMatch.drugs = getDrugsFromArm(
+                armDescription,
+                originalMatchedTrial.treatmentList.step[0].arm
+            );
         }
         armMatch.matches = groupTrialMatchesByAgeNumerical(armGroup);
         return armMatch;
@@ -45,13 +85,23 @@ export function groupTrialMatchesByArmDescription(trialGroup: ITrialMatch[], ori
     return matches;
 }
 
-export function groupTrialMatchesByAgeNumerical(armGroup: ITrialMatch[]): IClinicalGroupMatch[] {
-    const matchesGroupedByAge = _.groupBy(armGroup, (trial: ITrialMatch) => trial.trialAgeNumerical);
+export function groupTrialMatchesByAgeNumerical(
+    armGroup: ITrialMatch[]
+): IClinicalGroupMatch[] {
+    const matchesGroupedByAge = _.groupBy(
+        armGroup,
+        (trial: ITrialMatch) => trial.trialAgeNumerical
+    );
     const matches = _.map(matchesGroupedByAge, (ageGroup, age) => {
-        const cancerTypes =  _.uniq(_.map(ageGroup, (trial: ITrialMatch) => trial.trialOncotreePrimaryDiagnosis));
+        const cancerTypes = _.uniq(
+            _.map(
+                ageGroup,
+                (trial: ITrialMatch) => trial.trialOncotreePrimaryDiagnosis
+            )
+        );
         const positiveCancerTypes: string[] = [];
         const negativeCancerTypes: string[] = [];
-        _.map(cancerTypes, (item) => {
+        _.map(cancerTypes, item => {
             // If a cancer type contains a "!", it means this trial cannot be used for the cancer type, which is a "NOT" match.
             if (!_.isUndefined(item)) {
                 if (item.includes('!')) {
@@ -65,20 +115,38 @@ export function groupTrialMatchesByAgeNumerical(armGroup: ITrialMatch[]): IClini
             trialAgeNumerical: [age],
             trialOncotreePrimaryDiagnosis: {
                 positive: positiveCancerTypes,
-                negative: negativeCancerTypes
-            }
+                negative: negativeCancerTypes,
+            },
         };
-        const positiveTrialMatches = _.filter(matchesGroupedByAge[age], (trialMatch:ITrialMatch) => {
-            if (!_.isUndefined(trialMatch.genomicAlteration) && trialMatch.genomicAlteration !== '') return !trialMatch.genomicAlteration.includes('!')
-        });
-        const negativeTrialMatches = _.filter(matchesGroupedByAge[age], (trialMatch:ITrialMatch) => {
-            if (!_.isUndefined(trialMatch.genomicAlteration) && trialMatch.genomicAlteration !== '') return trialMatch.genomicAlteration.includes('!')
-        });
+        const positiveTrialMatches = _.filter(
+            matchesGroupedByAge[age],
+            (trialMatch: ITrialMatch) => {
+                if (
+                    !_.isUndefined(trialMatch.genomicAlteration) &&
+                    trialMatch.genomicAlteration !== ''
+                )
+                    return !trialMatch.genomicAlteration.includes('!');
+            }
+        );
+        const negativeTrialMatches = _.filter(
+            matchesGroupedByAge[age],
+            (trialMatch: ITrialMatch) => {
+                if (
+                    !_.isUndefined(trialMatch.genomicAlteration) &&
+                    trialMatch.genomicAlteration !== ''
+                )
+                    return trialMatch.genomicAlteration.includes('!');
+            }
+        );
         if (positiveTrialMatches.length > 0) {
-            clinicalGroupMatch.matches = groupPositiveTrialMatchesByMatchType(positiveTrialMatches);
+            clinicalGroupMatch.matches = groupPositiveTrialMatchesByMatchType(
+                positiveTrialMatches
+            );
         }
         if (negativeTrialMatches.length > 0) {
-            clinicalGroupMatch.notMatches = groupNegativeTrialMatchesByMatchType(negativeTrialMatches);
+            clinicalGroupMatch.notMatches = groupNegativeTrialMatchesByMatchType(
+                negativeTrialMatches
+            );
         }
         return clinicalGroupMatch;
     });
@@ -89,79 +157,137 @@ export function groupTrialMatchesByAgeNumerical(armGroup: ITrialMatch[]): IClini
 }
 
 // Merge clinical matches by age when they have the same trialOncotreePrimaryDiagnosis but different trialAgeNumericals.
-export function mergeClinicalGroupMatchByAge(clinicalGroupMatch: IClinicalGroupMatch[]): IClinicalGroupMatch[] {
+export function mergeClinicalGroupMatchByAge(
+    clinicalGroupMatch: IClinicalGroupMatch[]
+): IClinicalGroupMatch[] {
     const mergedClinicalGroupMatch: IClinicalGroupMatch[] = [];
-    const matchesGroupedByTrialOncotreePrimaryDiagnosis = _.groupBy(clinicalGroupMatch, (match: IClinicalGroupMatch) => match.trialOncotreePrimaryDiagnosis);
-    _.forEach(matchesGroupedByTrialOncotreePrimaryDiagnosis, (clinicalGroup: IClinicalGroupMatch[]) => {
-        _.forEach(clinicalGroup, (clinicalMatch: IClinicalGroupMatch, index: number) => {
-            if (index !== 0) {
-                clinicalGroup[0].trialAgeNumerical = clinicalGroup[0].trialAgeNumerical.concat(clinicalMatch.trialAgeNumerical);
-            }
-        });
-        mergedClinicalGroupMatch.push(clinicalGroup[0]);
-    });
+    const matchesGroupedByTrialOncotreePrimaryDiagnosis = _.groupBy(
+        clinicalGroupMatch,
+        (match: IClinicalGroupMatch) => match.trialOncotreePrimaryDiagnosis
+    );
+    _.forEach(
+        matchesGroupedByTrialOncotreePrimaryDiagnosis,
+        (clinicalGroup: IClinicalGroupMatch[]) => {
+            _.forEach(
+                clinicalGroup,
+                (clinicalMatch: IClinicalGroupMatch, index: number) => {
+                    if (index !== 0) {
+                        clinicalGroup[0].trialAgeNumerical = clinicalGroup[0].trialAgeNumerical.concat(
+                            clinicalMatch.trialAgeNumerical
+                        );
+                    }
+                }
+            );
+            mergedClinicalGroupMatch.push(clinicalGroup[0]);
+        }
+    );
     return mergedClinicalGroupMatch;
 }
 
-export function groupPositiveTrialMatchesByMatchType(trialMatches: ITrialMatch[]) {
-    const matchesGroupedByMatchType = _.groupBy(trialMatches, (trial: ITrialMatch) => trial.matchType);
+export function groupPositiveTrialMatchesByMatchType(
+    trialMatches: ITrialMatch[]
+) {
+    const matchesGroupedByMatchType = _.groupBy(
+        trialMatches,
+        (trial: ITrialMatch) => trial.matchType
+    );
     const matches: IGenomicMatchType = {
         MUTATION: [],
         CNA: [],
         MSI: [],
-        WILDTYPE: []
+        WILDTYPE: [],
     };
-    _.forEach(matchesGroupedByMatchType, (matchTypeGroup: ITrialMatch[], matchType: string) => {
-        if (matchType === 'MUTATION') {
-            const matchesGroupedByPatientGenomic = _.groupBy( matchTypeGroup, ( trial: ITrialMatch ) => trial.trueHugoSymbol! + trial.trueProteinChange!);
-            _.forEach(matchesGroupedByPatientGenomic, (patientGenomicGroup: ITrialMatch[]) => {
-                const mutationGroupMatch: IGenomicGroupMatch = {
-                    genomicAlteration: _.uniq(patientGenomicGroup.map((trialMatch: ITrialMatch) => trialMatch.genomicAlteration!)),
-                    patientGenomic: {
-                        trueHugoSymbol: patientGenomicGroup[0].trueHugoSymbol!,
-                        trueProteinChange: patientGenomicGroup[0].trueProteinChange!
+    _.forEach(
+        matchesGroupedByMatchType,
+        (matchTypeGroup: ITrialMatch[], matchType: string) => {
+            if (matchType === 'MUTATION') {
+                const matchesGroupedByPatientGenomic = _.groupBy(
+                    matchTypeGroup,
+                    (trial: ITrialMatch) =>
+                        trial.trueHugoSymbol! + trial.trueProteinChange!
+                );
+                _.forEach(
+                    matchesGroupedByPatientGenomic,
+                    (patientGenomicGroup: ITrialMatch[]) => {
+                        const mutationGroupMatch: IGenomicGroupMatch = {
+                            genomicAlteration: _.uniq(
+                                patientGenomicGroup.map(
+                                    (trialMatch: ITrialMatch) =>
+                                        trialMatch.genomicAlteration!
+                                )
+                            ),
+                            patientGenomic: {
+                                trueHugoSymbol: patientGenomicGroup[0]
+                                    .trueHugoSymbol!,
+                                trueProteinChange: patientGenomicGroup[0]
+                                    .trueProteinChange!,
+                            },
+                        };
+                        matches.MUTATION.push(mutationGroupMatch);
                     }
+                );
+            } else {
+                const genomicGroupMatch: IGenomicGroupMatch = {
+                    genomicAlteration: _.uniq(
+                        matchTypeGroup.map(
+                            (trialMatch: ITrialMatch) =>
+                                trialMatch.genomicAlteration!
+                        )
+                    ),
                 };
-                matches.MUTATION.push(mutationGroupMatch);
-            });
-        } else {
-            const genomicGroupMatch: IGenomicGroupMatch = {
-                genomicAlteration: _.uniq(matchTypeGroup.map((trialMatch: ITrialMatch) => trialMatch.genomicAlteration!))
-            };
-            matches[matchType].push(genomicGroupMatch);
+                matches[matchType].push(genomicGroupMatch);
+            }
         }
-    });
+    );
     return matches;
 }
 
-export function groupNegativeTrialMatchesByMatchType(trialMatches: ITrialMatch[]) {
-    const matchesGroupedByMatchType = _.groupBy(trialMatches, (trial: ITrialMatch) => trial.matchType);
+export function groupNegativeTrialMatchesByMatchType(
+    trialMatches: ITrialMatch[]
+) {
+    const matchesGroupedByMatchType = _.groupBy(
+        trialMatches,
+        (trial: ITrialMatch) => trial.matchType
+    );
     const matches: IGenomicMatchType = {
         MUTATION: [],
         CNA: [],
         MSI: [],
-        WILDTYPE: []
+        WILDTYPE: [],
     };
-    _.forEach(matchesGroupedByMatchType, (matchTypeGroup: ITrialMatch[], matchType: string) => {
-        const genomicGroupMatch: IGenomicGroupMatch = {
-            genomicAlteration: _.uniq(matchTypeGroup.map((trialMatch: ITrialMatch) => trialMatch.genomicAlteration!))
-        };
-        matches[matchType].push(genomicGroupMatch);
-    });
+    _.forEach(
+        matchesGroupedByMatchType,
+        (matchTypeGroup: ITrialMatch[], matchType: string) => {
+            const genomicGroupMatch: IGenomicGroupMatch = {
+                genomicAlteration: _.uniq(
+                    matchTypeGroup.map(
+                        (trialMatch: ITrialMatch) =>
+                            trialMatch.genomicAlteration!
+                    )
+                ),
+            };
+            matches[matchType].push(genomicGroupMatch);
+        }
+    );
     return matches;
 }
 
 export function calculateTrialPriority(armMatches: IArmMatch[]): number {
     let priority = 0;
-    _.forEach(armMatches, (armMatch) => {
-        _.forEach(armMatch.matches, (clinicalGroupMatch: IClinicalGroupMatch) => {
-            priority += getMatchPriority(clinicalGroupMatch);
-        });
+    _.forEach(armMatches, armMatch => {
+        _.forEach(
+            armMatch.matches,
+            (clinicalGroupMatch: IClinicalGroupMatch) => {
+                priority += getMatchPriority(clinicalGroupMatch);
+            }
+        );
     });
     return priority;
 }
 
-export function getMatchPriority(clinicalGroupMatch: IClinicalGroupMatch): number {
+export function getMatchPriority(
+    clinicalGroupMatch: IClinicalGroupMatch
+): number {
     // In trial match tab, positive matches should always display before negative matches(notMatches).
     // The highest and default priority is 0. The priority the higher, the display order the lower.
     let matchesLength = 0;
@@ -173,7 +299,7 @@ export function getMatchPriority(clinicalGroupMatch: IClinicalGroupMatch): numbe
         notMatchesLength = getMatchesLength(clinicalGroupMatch.notMatches);
     }
     if (notMatchesLength > 0) {
-        if ( matchesLength === 0) {
+        if (matchesLength === 0) {
             return 2; // A trial only has negative matches.
         }
         return 1; // A trial has both positive matches and negative matches.
@@ -182,27 +308,43 @@ export function getMatchPriority(clinicalGroupMatch: IClinicalGroupMatch): numbe
 }
 
 export function getMatchesLength(genomicMatchType: IGenomicMatchType): number {
-    return _.sum([genomicMatchType.MUTATION.length, genomicMatchType.CNA.length,
-        genomicMatchType.MSI.length, genomicMatchType.WILDTYPE.length]);
+    return _.sum([
+        genomicMatchType.MUTATION.length,
+        genomicMatchType.CNA.length,
+        genomicMatchType.MSI.length,
+        genomicMatchType.WILDTYPE.length,
+    ]);
 }
 
 export function excludeControlArms(trialMatches: ITrialMatch[]): ITrialMatch[] {
     const hiddenArmTypes = ['Control Arm', 'Placebo Arm'];
     const filteredTrialMatches: ITrialMatch[] = [];
-    _.forEach(trialMatches, (trialMatch) => {
-        if ( !trialMatch.armType || !hiddenArmTypes.includes(trialMatch.armType) ) {
+    _.forEach(trialMatches, trialMatch => {
+        if (
+            !trialMatch.armType ||
+            !hiddenArmTypes.includes(trialMatch.armType)
+        ) {
             filteredTrialMatches.push(trialMatch);
         }
     });
     return filteredTrialMatches;
 }
 
-export function getDrugsFromArm(armDescription: string, arms: IArm[]): string[][] {
+export function getDrugsFromArm(
+    armDescription: string,
+    arms: IArm[]
+): string[][] {
     let drugs: string[][] = [];
-    if ( armDescription !== '' ) { // match for specific arm
-        const matchedArm: IArm = _.find( arms, (arm) => arm.arm_description === armDescription )!;
-        if ( !_.isUndefined(matchedArm.drugs) ) {
-            drugs = matchedArm.drugs.map(  (drugCombination: IDrug[]) => drugCombination.map((drug: IDrug) => drug.name ));
+    if (armDescription !== '') {
+        // match for specific arm
+        const matchedArm: IArm = _.find(
+            arms,
+            arm => arm.arm_description === armDescription
+        )!;
+        if (!_.isUndefined(matchedArm.drugs)) {
+            drugs = matchedArm.drugs.map((drugCombination: IDrug[]) =>
+                drugCombination.map((drug: IDrug) => drug.name)
+            );
         }
     }
     return drugs;
@@ -210,11 +352,16 @@ export function getDrugsFromArm(armDescription: string, arms: IArm[]): string[][
 
 export function getAgeRangeDisplay(trialAgeNumerical: string[]) {
     if (trialAgeNumerical.length > 1) {
-        const ageNumbers = trialAgeNumerical.map((age:string) => age.match(/\d+(\.?\d+)?/g)!.map((v: string) => Number(v)));
+        const ageNumbers = trialAgeNumerical.map((age: string) =>
+            age.match(/\d+(\.?\d+)?/g)!.map((v: string) => Number(v))
+        );
         if (trialAgeNumerical.length === 2) {
             let leftAgeText = '';
             let rightAgeText = '';
-            if (trialAgeNumerical[0].includes('>') && trialAgeNumerical[1].includes('<')) {
+            if (
+                trialAgeNumerical[0].includes('>') &&
+                trialAgeNumerical[1].includes('<')
+            ) {
                 if (trialAgeNumerical[0].includes('=')) {
                     leftAgeText = `${ageNumbers[0]} ≤`;
                 } else {
@@ -226,7 +373,10 @@ export function getAgeRangeDisplay(trialAgeNumerical: string[]) {
                     rightAgeText = `< ${ageNumbers[1]}`;
                 }
                 return `${leftAgeText} Age ${rightAgeText}`;
-            } else if (trialAgeNumerical[0].includes('<') && trialAgeNumerical[1].includes('>')) {
+            } else if (
+                trialAgeNumerical[0].includes('<') &&
+                trialAgeNumerical[1].includes('>')
+            ) {
                 if (trialAgeNumerical[1].includes('=')) {
                     leftAgeText = `${ageNumbers[1]} ≤`;
                 } else {
@@ -239,7 +389,7 @@ export function getAgeRangeDisplay(trialAgeNumerical: string[]) {
                 }
                 return `${leftAgeText} Age ${rightAgeText}`;
             } else {
-                return `Age: ${trialAgeNumerical.join(', ')}`
+                return `Age: ${trialAgeNumerical.join(', ')}`;
             }
         } else {
             return `Age: ${trialAgeNumerical.join(', ')}`;
diff --git a/src/pages/patientView/trialMatch/style/trialMatch.module.scss b/src/pages/patientView/trialMatch/style/trialMatch.module.scss
index 56c6ed6ee32..c32caf8d02c 100644
--- a/src/pages/patientView/trialMatch/style/trialMatch.module.scss
+++ b/src/pages/patientView/trialMatch/style/trialMatch.module.scss
@@ -1,101 +1,100 @@
 .armDiv {
-  margin: 0 0 3px 0;
+    margin: 0 0 3px 0;
 }
 .criteriaHr {
-  margin:3px 0 !important;
-  border-top-color: rgb(221, 221, 221) !important;
+    margin: 3px 0 !important;
+    border-top-color: rgb(221, 221, 221) !important;
 }
-.alterationUl{
-  margin-bottom: -20px !important;
-  list-style-type: none;
-  padding-left: 15px;
+.alterationUl {
+    margin-bottom: -20px !important;
+    list-style-type: none;
+    padding-left: 15px;
 }
 .genomicSpan {
-  margin-right:5px;
+    margin-right: 5px;
 }
 .tooltip {
-  maxHeight: 400px;
-  maxWidth: 600px;
-  overflow: auto;
+    maxheight: 400px;
+    maxwidth: 600px;
+    overflow: auto;
 }
 .statusBackground {
-  display: block;
-  padding: 10px;
-  width: 130px;
-  border-radius: 10px;
-  background: #73AD21;
-  text-align: center;
-  color: #ffffff;
+    display: block;
+    padding: 10px;
+    width: 130px;
+    border-radius: 10px;
+    background: #73ad21;
+    text-align: center;
+    color: #ffffff;
 }
 .icon {
-  .marginLeft {
-    margin-left:5px;
-  }
-  .marginRight {
-    margin-right:5px;
-  }
+    .marginLeft {
+        margin-left: 5px;
+    }
+    .marginRight {
+        margin-right: 5px;
+    }
 }
 
 .matchInfoContainer {
-  display: flex;
-  justify-content: space-between;
-
-  .sampleIdsContainer {
-    flex: 0 0 auto;
-    width: 30px;
-  }
+    display: flex;
+    justify-content: space-between;
 
-  .genomicInfoContainer {
-    flex: 1 1 auto;
-    margin: 0 5px 0 0;
+    .sampleIdsContainer {
+        flex: 0 0 auto;
+        width: 30px;
+    }
 
-  }
+    .genomicInfoContainer {
+        flex: 1 1 auto;
+        margin: 0 5px 0 0;
+    }
 }
 
 .criteriaContainer {
-  display: flex;
-  justify-content: space-between;
-
-  .firstLeft {
-    flex: 1 1 auto;
-    margin: 0 5px 0 0;
-  }
-
-  .firstRight{
-    display:flex;
-    flex: 0 0 auto;
-    width: 50%;
+    display: flex;
     justify-content: space-between;
 
-    .secondLeft {
-      flex: 0 0 auto;
-      width: 85px;
-      margin-right: 10px;
+    .firstLeft {
+        flex: 1 1 auto;
+        margin: 0 5px 0 0;
     }
-    .secondRight{
-      flex: 1 1 auto;
+
+    .firstRight {
+        display: flex;
+        flex: 0 0 auto;
+        width: 50%;
+        justify-content: space-between;
+
+        .secondLeft {
+            flex: 0 0 auto;
+            width: 85px;
+            margin-right: 10px;
+        }
+        .secondRight {
+            flex: 1 1 auto;
+        }
     }
-  }
 }
 .powered {
-  padding-right: 9px;
-  text-align: right;
-  font-size: 13px;
+    padding-right: 9px;
+    text-align: right;
+    font-size: 13px;
 }
 .statusContainer {
-  margin: 20% 0 20% 0;
+    margin: 20% 0 20% 0;
 
-  a:hover {
-    text-decoration: none;
-  }
+    a:hover {
+        text-decoration: none;
+    }
 }
 .feedback {
-  font-size: 12px;
+    font-size: 12px;
 
-  .feedbackButton {
-    display: block;
-    margin-left: auto;
-    margin-right: auto;
-    margin-top: 10px;
-  }
+    .feedbackButton {
+        display: block;
+        margin-left: auto;
+        margin-right: auto;
+        margin-top: 10px;
+    }
 }
diff --git a/src/pages/patientView/vafPlot/ThumbnailExpandVAFPlot.spec.tsx b/src/pages/patientView/vafPlot/ThumbnailExpandVAFPlot.spec.tsx
index d482f45d286..fa848b65a00 100644
--- a/src/pages/patientView/vafPlot/ThumbnailExpandVAFPlot.spec.tsx
+++ b/src/pages/patientView/vafPlot/ThumbnailExpandVAFPlot.spec.tsx
@@ -5,17 +5,9 @@ import { shallow, mount } from 'enzyme';
 import sinon from 'sinon';
 
 describe('ThumbnailExpandVAFPlot', () => {
+    before(() => {});
 
-    before(()=>{
-
-    });
-
-    after(()=>{
-
-    });
-
-    it('what does it do?', ()=>{
-
-    });
+    after(() => {});
 
+    it('what does it do?', () => {});
 });
diff --git a/src/pages/patientView/vafPlot/ThumbnailExpandVAFPlot.tsx b/src/pages/patientView/vafPlot/ThumbnailExpandVAFPlot.tsx
index aa914e3251c..408ec097055 100644
--- a/src/pages/patientView/vafPlot/ThumbnailExpandVAFPlot.tsx
+++ b/src/pages/patientView/vafPlot/ThumbnailExpandVAFPlot.tsx
@@ -1,27 +1,29 @@
 import * as React from 'react';
 import 'rc-tooltip/assets/bootstrap_white.css';
-import {VAFPlot, IVAFPlotProps, MutationFrequenciesBySample} from './VAFPlot';
-import Tooltip, {RCTooltip} from "rc-tooltip";
+import { VAFPlot, IVAFPlotProps, MutationFrequenciesBySample } from './VAFPlot';
+import Tooltip, { RCTooltip } from 'rc-tooltip';
 import { IKeyedIconData } from '../genomicOverview/GenomicOverviewUtils';
 import { DefaultTooltip, isWebdriver } from 'cbioportal-frontend-commons';
 
 export type IThumbnailExpandVAFPlotProps = {
     data: MutationFrequenciesBySample;
-    order?: { [s:string]:number };
-    colors?: { [s: string]:string };
-    labels?: { [s:string]:string };
+    order?: { [s: string]: number };
+    colors?: { [s: string]: string };
+    labels?: { [s: string]: string };
     overlayPlacement?: RCTooltip.Placement;
     cssClass?: string;
-    genePanelIconData?:IKeyedIconData;
+    genePanelIconData?: IKeyedIconData;
 };
 
-export class ThumbnailExpandVAFPlot extends React.Component<IThumbnailExpandVAFPlotProps, {}> {
-
+export class ThumbnailExpandVAFPlot extends React.Component<
+    IThumbnailExpandVAFPlotProps,
+    {}
+> {
     public static defaultProps = {
         order: {},
         colors: {},
         labels: {},
-        overlayPlacement: "left",
+        overlayPlacement: 'left',
     };
 
     render() {
@@ -33,7 +35,7 @@ export class ThumbnailExpandVAFPlot extends React.Component<IThumbnailExpandVAFP
             nolegend: true,
             width: 64,
             height: 64,
-            label_font_size: "6.5px",
+            label_font_size: '6.5px',
             xticks: 0,
             yticks: 0,
             margin_bottom: 15,
@@ -47,22 +49,20 @@ export class ThumbnailExpandVAFPlot extends React.Component<IThumbnailExpandVAFP
             nolegend: false,
             init_show_histogram: true,
             init_show_curve: true,
-            genepanel_icon_data: this.props.genePanelIconData
+            genepanel_icon_data: this.props.genePanelIconData,
         };
 
         return (
             <DefaultTooltip
                 placement={this.props.overlayPlacement}
                 trigger={['hover', 'focus']}
-                overlay={<VAFPlot {...expandedProps}/>}
-                arrowContent={<div className="rc-tooltip-arrow-inner"/>}
+                overlay={<VAFPlot {...expandedProps} />}
+                arrowContent={<div className="rc-tooltip-arrow-inner" />}
                 destroyTooltipOnHide={false}
                 mouseLeaveDelay={isWebdriver ? 2 : 0.05}
             >
-                <div className={ this.props.cssClass || '' }>
-                    <VAFPlot
-                            {...thumbnailProps}
-                    />
+                <div className={this.props.cssClass || ''}>
+                    <VAFPlot {...thumbnailProps} />
                 </div>
             </DefaultTooltip>
         );
diff --git a/src/pages/patientView/vafPlot/VAFPlot.spec.tsx b/src/pages/patientView/vafPlot/VAFPlot.spec.tsx
index 644d3222b3f..2013970ba7d 100644
--- a/src/pages/patientView/vafPlot/VAFPlot.spec.tsx
+++ b/src/pages/patientView/vafPlot/VAFPlot.spec.tsx
@@ -5,17 +5,9 @@ import { shallow, mount } from 'enzyme';
 import sinon from 'sinon';
 
 describe('VAFPlot', () => {
+    before(() => {});
 
-    before(()=>{
-
-    });
-
-    after(()=>{
-
-    });
-
-    it('what does it do?', ()=>{
-
-    });
+    after(() => {});
 
+    it('what does it do?', () => {});
 });
diff --git a/src/pages/patientView/vafPlot/VAFPlot.tsx b/src/pages/patientView/vafPlot/VAFPlot.tsx
index 427c73b04a2..8bbc2964dfb 100644
--- a/src/pages/patientView/vafPlot/VAFPlot.tsx
+++ b/src/pages/patientView/vafPlot/VAFPlot.tsx
@@ -1,18 +1,20 @@
 import * as React from 'react';
 import $ from 'jquery';
-import {AlleleFreqPlotMulti} from './legacyVAFCode.js';
+import { AlleleFreqPlotMulti } from './legacyVAFCode.js';
 import { IKeyedIconData } from '../genomicOverview/GenomicOverviewUtils.js';
 import _ from 'lodash';
 
 export type MutationFrequencies = number[];
 
-export type MutationFrequenciesBySample = { [sampleId:string]: MutationFrequencies  }
+export type MutationFrequenciesBySample = {
+    [sampleId: string]: MutationFrequencies;
+};
 
 export type IVAFPlotProps = {
     data?: MutationFrequenciesBySample;
-    order?: { [s:string]:number };
-    colors?: { [s: string]:string };
-    labels?: { [s:string]:string };
+    order?: { [s: string]: number };
+    colors?: { [s: string]: string };
+    labels?: { [s: string]: string };
     width?: number;
     height?: number;
     margin_left?: number;
@@ -26,11 +28,11 @@ export type IVAFPlotProps = {
     init_show_histogram?: boolean;
     init_show_curve?: boolean;
     show_controls?: boolean;
-    genepanel_icon_data?:IKeyedIconData;
+    genepanel_icon_data?: IKeyedIconData;
 };
 
 export type IVAFPlotState = {
-    show_histogram?:boolean;
+    show_histogram?: boolean;
     show_curve?: boolean;
     options?: any;
 };
@@ -49,28 +51,34 @@ export class VAFPlot extends React.Component<IVAFPlotProps, IVAFPlotState> {
         margin_bottom: undefined,
         xticks: 3,
         yticks: 8,
-        label_font_size: "11.5px",
+        label_font_size: '11.5px',
         nolegend: false,
         init_show_histogram: true,
         init_show_curve: true,
         show_controls: false,
     };
 
-    private histogramCheckbox:HTMLInputElement;
-    private curveCheckbox:HTMLInputElement;
-    private div:HTMLDivElement;
+    private histogramCheckbox: HTMLInputElement;
+    private curveCheckbox: HTMLInputElement;
+    private div: HTMLDivElement;
 
     private refHandlers = {
-        histogramCheckbox: (input:HTMLInputElement) => {this.histogramCheckbox = input;},
-        curveCheckbox: (input:HTMLInputElement) => {this.curveCheckbox = input;},
-        div: (div:HTMLDivElement) => {this.div = div;}
+        histogramCheckbox: (input: HTMLInputElement) => {
+            this.histogramCheckbox = input;
+        },
+        curveCheckbox: (input: HTMLInputElement) => {
+            this.curveCheckbox = input;
+        },
+        div: (div: HTMLDivElement) => {
+            this.div = div;
+        },
     };
 
-    constructor(props:IVAFPlotProps) {
+    constructor(props: IVAFPlotProps) {
         super(props);
 
         // Compute contingent default params
-        let label_dist_to_axis = (this.props.xticks === 0) ? 13: 30;
+        let label_dist_to_axis = this.props.xticks === 0 ? 13 : 30;
 
         let options = {
             label_font_size: this.props.label_font_size,
@@ -81,20 +89,23 @@ export class VAFPlot extends React.Component<IVAFPlotProps, IVAFPlotState> {
                 top: this.props.margin_top,
                 left: this.props.margin_left,
                 right: this.props.margin_right,
-                bottom: this.props.margin_bottom
+                bottom: this.props.margin_bottom,
             },
             width: this.props.width,
-            height: this.props.height
+            height: this.props.height,
         };
         // margin bottom must be computed before height because height computation makes use of it
         if (options.margin.bottom === undefined)
-            options.margin.bottom = 30 + (label_dist_to_axis / 2);
+            options.margin.bottom = 30 + label_dist_to_axis / 2;
         if (options.height === undefined && options.margin.top !== undefined)
-            options.height = ((500 + label_dist_to_axis) / 2) - options.margin.top - options.margin.bottom;
+            options.height =
+                (500 + label_dist_to_axis) / 2 -
+                options.margin.top -
+                options.margin.bottom;
         this.state = {
             show_histogram: !!this.props.init_show_histogram,
             show_curve: !!this.props.init_show_curve,
-            options
+            options,
         };
 
         this.toggleShowHistogram = this.toggleShowHistogram.bind(this);
@@ -102,83 +113,106 @@ export class VAFPlot extends React.Component<IVAFPlotProps, IVAFPlotState> {
     }
 
     componentDidMount() {
-        AlleleFreqPlotMulti(this, this.props.data, this.state.options, this.props.order, this.props.colors, this.props.labels, this.props.genepanel_icon_data);
+        AlleleFreqPlotMulti(
+            this,
+            this.props.data,
+            this.state.options,
+            this.props.order,
+            this.props.colors,
+            this.props.labels,
+            this.props.genepanel_icon_data
+        );
     }
-    
+
     componentDidUpdate() {
-        $(this.div).find('svg').remove(); // remove svg element prior to rerendering
-        AlleleFreqPlotMulti(this, this.props.data, this.state.options, this.props.order, this.props.colors, this.props.labels, this.props.genepanel_icon_data);
+        $(this.div)
+            .find('svg')
+            .remove(); // remove svg element prior to rerendering
+        AlleleFreqPlotMulti(
+            this,
+            this.props.data,
+            this.state.options,
+            this.props.order,
+            this.props.colors,
+            this.props.labels,
+            this.props.genepanel_icon_data
+        );
     }
 
-    shouldComponentUpdate(nextProps:IVAFPlotProps, nextState:IVAFPlotState) {
+    shouldComponentUpdate(nextProps: IVAFPlotProps, nextState: IVAFPlotState) {
         // Hack around React for manually-handled DOM elements: handle updating here
         if (this.histogramCheckbox) {
             if (nextState.show_histogram) {
-                $(this.div).find('.viz_hist').show();
+                $(this.div)
+                    .find('.viz_hist')
+                    .show();
             } else {
-                $(this.div).find('.viz_hist').hide();
+                $(this.div)
+                    .find('.viz_hist')
+                    .hide();
             }
         }
         if (this.curveCheckbox) {
             if (nextState.show_curve) {
-                $(this.div).find('.viz_curve').show();
+                $(this.div)
+                    .find('.viz_curve')
+                    .show();
             } else {
-                $(this.div).find('.viz_curve').hide();
+                $(this.div)
+                    .find('.viz_curve')
+                    .hide();
             }
         }
 
-        return (nextState.show_histogram !== this.state.show_histogram)
-            || (nextState.show_curve !== this.state.show_curve)
-            || (!_.isEqual(this.props.data, nextProps.data));
+        return (
+            nextState.show_histogram !== this.state.show_histogram ||
+            nextState.show_curve !== this.state.show_curve ||
+            !_.isEqual(this.props.data, nextProps.data)
+        );
     }
 
     toggleShowHistogram() {
         const new_show_histogram = !this.state.show_histogram;
-        this.setState({show_histogram: new_show_histogram});
+        this.setState({ show_histogram: new_show_histogram });
     }
     toggleShowCurve() {
         const new_show_curve = !this.state.show_curve;
-        this.setState({show_curve: new_show_curve});
+        this.setState({ show_curve: new_show_curve });
     }
 
     render() {
-        
         const histogramCheckbox = (
-            <label
-                key="histogram-toggle"
-                style={{ marginRight:10 }}
-            >
+            <label key="histogram-toggle" style={{ marginRight: 10 }}>
                 <input
                     ref={this.refHandlers.histogramCheckbox}
                     type="checkbox"
-                    checked={ this.state.show_histogram }
-                    onChange= { this.toggleShowHistogram }
-                    style={{ marginRight:3 }}
-                />histogram
-            </label>);
+                    checked={this.state.show_histogram}
+                    onChange={this.toggleShowHistogram}
+                    style={{ marginRight: 3 }}
+                />
+                histogram
+            </label>
+        );
 
         const curveCheckbox = (
-            <label
-                key="curve-toggle"
-            >
+            <label key="curve-toggle">
                 <input
                     ref={this.refHandlers.curveCheckbox}
                     type="checkbox"
-                    checked={ this.state.show_curve }
-                    onChange = { this.toggleShowCurve }
-                    style={{ marginRight:3 }}
-                />density estimation
-            </label>);
+                    checked={this.state.show_curve}
+                    onChange={this.toggleShowCurve}
+                    style={{ marginRight: 3 }}
+                />
+                density estimation
+            </label>
+        );
 
         const controls = [histogramCheckbox, curveCheckbox];
 
         return (
-            <div
-                style={{display: "inline"}}
-                ref={this.refHandlers.div}
-            >
-                { ( this.props.show_controls ? controls : [] ) }
-                {( this.props.show_controls ? <br/> : [])}
+            <div style={{ display: 'inline' }} ref={this.refHandlers.div}>
+                {this.props.show_controls ? controls : []}
+                {this.props.show_controls ? <br /> : []}
             </div>
         );
     }
diff --git a/src/pages/patientView/vafPlot/legacyVAFCode.js b/src/pages/patientView/vafPlot/legacyVAFCode.js
index 1708ab75b09..247717315bd 100644
--- a/src/pages/patientView/vafPlot/legacyVAFCode.js
+++ b/src/pages/patientView/vafPlot/legacyVAFCode.js
@@ -4,7 +4,7 @@ const GENEPANEL_ICON_WIDTH = 1.25;
 const GENEPANEL_ICON_HEIGHT = 1.1;
 
 const AlleleFreqPlotUtils = (function() {
-    var NO_DATA = undefined;       // this was set by the patient view
+    var NO_DATA = undefined; // this was set by the patient view
 
     // params: alt_counts (array of numbers), ref_counts (array of numbers)
     // returns array of numbers
@@ -14,17 +14,20 @@ const AlleleFreqPlotUtils = (function() {
     //
     // or, if there is no valid data, returns `undefined`
     var process_data = function(alt_counts, ref_counts, caseId) {
-
         // validate:
         // * that data exists
-        var validated = _.find(alt_counts, function(data) { return data[caseId]!==NO_DATA; });
+        var validated = _.find(alt_counts, function(data) {
+            return data[caseId] !== NO_DATA;
+        });
 
         if (!validated) {
             return undefined;
         }
 
         return d3.zip(alt_counts, ref_counts).map(function(pair) {
-            return pair[0][caseId] === NO_DATA === pair[1][caseId] ? 0 : (pair[0][caseId] / (pair[0][caseId] + pair[1][caseId]));
+            return (pair[0][caseId] === NO_DATA) === pair[1][caseId]
+                ? 0
+                : pair[0][caseId] / (pair[0][caseId] + pair[1][caseId]);
         });
     };
 
@@ -45,8 +48,12 @@ const AlleleFreqPlotUtils = (function() {
     var gaussianKernel = function(variance) {
         var mean = 0;
         return function(x) {
-            return (1 / (variance * Math.sqrt(2 * Math.PI)))
-                * Math.exp( -1 * Math.pow((x - mean), 2) / (2 * Math.pow(variance, 2)));
+            return (
+                (1 / (variance * Math.sqrt(2 * Math.PI))) *
+                Math.exp(
+                    (-1 * Math.pow(x - mean, 2)) / (2 * Math.pow(variance, 2))
+                )
+            );
         };
     };
 
@@ -59,7 +66,12 @@ const AlleleFreqPlotUtils = (function() {
     var kernelDensityEstimator = function(kernel, x) {
         return function(sample) {
             return x.map(function(z) {
-                return [z, d3.mean(sample, function(v) { return kernel(z - v); })];
+                return [
+                    z,
+                    d3.mean(sample, function(v) {
+                        return kernel(z - v);
+                    }),
+                ];
             });
         };
     };
@@ -67,7 +79,7 @@ const AlleleFreqPlotUtils = (function() {
     // params: u, some number
     // uniform kernel
     var uniform = function(u) {
-        return Math.abs(u) <= 1 ? .5 * u : 0;
+        return Math.abs(u) <= 1 ? 0.5 * u : 0;
     };
 
     // Silverman's rule of thumb for calculating the bandwith parameter for
@@ -79,9 +91,14 @@ const AlleleFreqPlotUtils = (function() {
     // http://en.wikipedia.org/wiki/Kernel_density_estimation#Practical_estimation_of_the_bandwidth
     var calculate_bandwidth = function(data) {
         var mean = d3.mean(data);
-        var variance = d3.mean(data.map(function(d) { return Math.pow(d - mean, 2); }));
-        var standard_deviation = Math.pow(variance, .5);
-        var bandwidth = 1.06 * standard_deviation * Math.pow(data.length, -1/5);
+        var variance = d3.mean(
+            data.map(function(d) {
+                return Math.pow(d - mean, 2);
+            })
+        );
+        var standard_deviation = Math.pow(variance, 0.5);
+        var bandwidth =
+            1.06 * standard_deviation * Math.pow(data.length, -1 / 5);
 
         return bandwidth;
     };
@@ -91,11 +108,19 @@ const AlleleFreqPlotUtils = (function() {
         extract_and_process: extract_and_process,
         kernelDensityEstimator: kernelDensityEstimator,
         gaussianKernel: gaussianKernel,
-        calculate_bandwidth: calculate_bandwidth
+        calculate_bandwidth: calculate_bandwidth,
     };
-}());
-
-export const AlleleFreqPlotMulti = function(component, data, options, order, colors, labels, genepanel_icon_data) {
+})();
+
+export const AlleleFreqPlotMulti = function(
+    component,
+    data,
+    options,
+    order,
+    colors,
+    labels,
+    genepanel_icon_data
+) {
     // If nolegend is false, the div this is called on must be attached and
     // rendered at call time or else Firefox will throw an error on the call
     // to getBBox
@@ -121,34 +146,48 @@ export const AlleleFreqPlotMulti = function(component, data, options, order, col
         if (data.hasOwnProperty(k)) {
             /*var ind = Object.keys(colors).length;
              colors[k] = {stroke:fillcolors(ind), fill:fillcolors(ind)};*/
-            var col = d3.rgb(colors[k] || "rgb(0,0,0)");
-            while (col.toString() in colorhist && !(col.r === 0 && col.g === 0 && col.b === 0)) {
+            var col = d3.rgb(colors[k] || 'rgb(0,0,0)');
+            while (
+                col.toString() in colorhist &&
+                !(col.r === 0 && col.g === 0 && col.b === 0)
+            ) {
                 col = col.darker(0.4);
             }
             var col_string = col.toString();
             colorhist[col_string] = true;
-            colors[k] = {stroke:col_string, fill:col_string};
+            colors[k] = { stroke: col_string, fill: col_string };
         }
     }
     // data is a map of sample id to list of data
-    var options = options || { label_font_size: "11.5px", xticks: 3, yticks: 8, nolegend:false}; // init
+    var options = options || {
+        label_font_size: '11.5px',
+        xticks: 3,
+        yticks: 8,
+        nolegend: false,
+    }; // init
 
     var label_dist_to_axis = options.xticks === 0 ? 13 : 30;
 
     options.margin = options.margin || {};
-    var margin = $.extend({top: 20, right: 30, bottom: 30 + label_dist_to_axis / 2, left: 50},
-        options.margin);
+    var margin = $.extend(
+        { top: 20, right: 30, bottom: 30 + label_dist_to_axis / 2, left: 50 },
+        options.margin
+    );
     var width = options.width || 200;
-    var height = options.height || (500 + label_dist_to_axis) / 2 - margin.top - margin.bottom;
+    var height =
+        options.height ||
+        (500 + label_dist_to_axis) / 2 - margin.top - margin.bottom;
 
     // x scale and axis
-    var x = d3.scale.linear()
-        .domain([-0.1,1])
-        .range([0,width]);
+    var x = d3.scale
+        .linear()
+        .domain([-0.1, 1])
+        .range([0, width]);
 
-    var xAxis = d3.svg.axis()
+    var xAxis = d3.svg
+        .axis()
         .scale(x)
-        .orient("bottom")
+        .orient('bottom')
         .ticks(options.xticks);
 
     var utils = AlleleFreqPlotUtils; // alias
@@ -160,12 +199,18 @@ export const AlleleFreqPlotMulti = function(component, data, options, order, col
     for (var k in data) {
         if (data.hasOwnProperty(k)) {
             bandwidth[k] = Math.max(utils.calculate_bandwidth(data[k]), 0.01);
-            kde[k] = utils.kernelDensityEstimator(utils.gaussianKernel(bandwidth[k]), x.ticks(100));
+            kde[k] = utils.kernelDensityEstimator(
+                utils.gaussianKernel(bandwidth[k]),
+                x.ticks(100)
+            );
             plot_data[k] = kde[k](data[k]);
         }
     }
     // make histograms
-    var histogram = d3.layout.histogram().frequency(false).bins(x.ticks(30));
+    var histogram = d3.layout
+        .histogram()
+        .frequency(false)
+        .bins(x.ticks(30));
     var binned_data = {};
     for (var k in data) {
         if (data.hasOwnProperty(k)) {
@@ -180,25 +225,49 @@ export const AlleleFreqPlotMulti = function(component, data, options, order, col
             all_plot_data = all_plot_data.concat(plot_data[k]);
         }
     }
-    var ycoords = all_plot_data.map(function(d) { return d[1]; });
+    var ycoords = all_plot_data.map(function(d) {
+        return d[1];
+    });
     var ydomain = [d3.min(ycoords), d3.max(ycoords)];
-    var y = d3.scale.linear()
+    var y = d3.scale
+        .linear()
         .domain(ydomain)
         .range([height, 0]);
-    var line = d3.svg.line()
-        .x(function(d) { return x(d[0]); })
-        .y(function(d) { return y(d[1]); });
+    var line = d3.svg
+        .line()
+        .x(function(d) {
+            return x(d[0]);
+        })
+        .y(function(d) {
+            return y(d[1]);
+        });
 
-    var svg = d3.select(div).append("svg")
-        .attr("width", width + margin.left + (options.yticks === 0 ? 0 : margin.right) + (options.nolegend? 0 : 100))
-        .attr("height", height + margin.top + margin.bottom)
-        .attr("data-test", 'vaf-plot')
-        .append("g")
-        .attr("transform", "translate(" + (options.yticks === 0 ? margin.left / 2 : margin.left) + "," + margin.top + ")");
+    var svg = d3
+        .select(div)
+        .append('svg')
+        .attr(
+            'width',
+            width +
+                margin.left +
+                (options.yticks === 0 ? 0 : margin.right) +
+                (options.nolegend ? 0 : 100)
+        )
+        .attr('height', height + margin.top + margin.bottom)
+        .attr('data-test', 'vaf-plot')
+        .append('g')
+        .attr(
+            'transform',
+            'translate(' +
+                (options.yticks === 0 ? margin.left / 2 : margin.left) +
+                ',' +
+                margin.top +
+                ')'
+        );
 
     // x axis
-    var x_axis = svg.append("g")
-        .attr("transform", "translate(0,"+height+")")
+    var x_axis = svg
+        .append('g')
+        .attr('transform', 'translate(0,' + height + ')')
         .call(xAxis);
 
     // applies some common line and path css attributes to the selection. The
@@ -216,14 +285,14 @@ export const AlleleFreqPlotMulti = function(component, data, options, order, col
 
     // x-axis label
     x_axis
-        .append("text")
+        .append('text')
         //.attr("class", "label")
-        .attr("x", width / 2)
-        .attr("y", label_dist_to_axis)
-        .attr("font-size", options.label_font_size)
-        .style("text-anchor", "middle")
-        .style("font-style", "italic")
-        .text("variant allele frequency");
+        .attr('x', width / 2)
+        .attr('y', label_dist_to_axis)
+        .attr('font-size', options.label_font_size)
+        .style('text-anchor', 'middle')
+        .style('font-style', 'italic')
+        .text('variant allele frequency');
 
     // make the y-axis mutation count
     var all_binned_data = [];
@@ -232,54 +301,63 @@ export const AlleleFreqPlotMulti = function(component, data, options, order, col
             all_binned_data = all_binned_data.concat(binned_data[k]);
         }
     }
-    var mutation_counts = all_binned_data.map(function(d) { return d.length; });
+    var mutation_counts = all_binned_data.map(function(d) {
+        return d.length;
+    });
     var mutation_count_range = [0, d3.max(mutation_counts)];
 
     // create y axis
-    var yAxis = d3.svg.axis()
+    var yAxis = d3.svg
+        .axis()
         .scale(y.copy().domain(mutation_count_range))
-        .orient("left")
+        .orient('left')
         .ticks(options.yticks);
 
     // render axis
-    var y_axis = svg.append("g").call(yAxis);
+    var y_axis = svg.append('g').call(yAxis);
 
     // takes a number and returns a displacement length for the
     // yaxis label
     //
     // *signature:* `number -> number`
     var displace_by_digits = function(n) {
-        var stringified = "" + n;
-        var no_digits = stringified.split("").length;
+        var stringified = '' + n;
+        var no_digits = stringified.split('').length;
 
         // there will be a comma in the string, i.e. 1,000 not 1000
         if (no_digits >= 4) {
             no_digits += 1.5;
         }
 
-        return no_digits * 7 / 3;
+        return (no_digits * 7) / 3;
     };
 
     var ylabel_dist_to_axis = label_dist_to_axis;
-    ylabel_dist_to_axis += options.yticks === 0 ? 0 : displace_by_digits(mutation_count_range[1]);
+    ylabel_dist_to_axis +=
+        options.yticks === 0 ? 0 : displace_by_digits(mutation_count_range[1]);
 
     // y axis label
     y_axis
-        .append("text")
+        .append('text')
         //.attr("class","label")
-        .attr("transform", "rotate(-90)")
-        .attr("x", - height/2)
-        .attr("y", -ylabel_dist_to_axis)
-        .attr("font-size", options.label_font_size)
-        .style("text-anchor","middle")
-        .style("font-style", "italic")
-        .text("mutation count");
-
-    applyCss(y_axis.selectAll('path')).attr('display', options.yticks === 0? '' : 'none');
+        .attr('transform', 'rotate(-90)')
+        .attr('x', -height / 2)
+        .attr('y', -ylabel_dist_to_axis)
+        .attr('font-size', options.label_font_size)
+        .style('text-anchor', 'middle')
+        .style('font-style', 'italic')
+        .text('mutation count');
+
+    applyCss(y_axis.selectAll('path')).attr(
+        'display',
+        options.yticks === 0 ? '' : 'none'
+    );
     applyCss(y_axis.selectAll('line'));
 
     // calculate new domain for the binned data
-    var binned_yvalues = all_binned_data.map(function(d) { return d.y;});
+    var binned_yvalues = all_binned_data.map(function(d) {
+        return d.y;
+    });
     var binned_ydomain = [d3.min(binned_yvalues), d3.max(binned_yvalues)];
     var binned_yscale = y.copy();
     binned_yscale.domain(binned_ydomain);
@@ -287,206 +365,316 @@ export const AlleleFreqPlotMulti = function(component, data, options, order, col
     // make bar charts
     for (var k in binned_data) {
         if (binned_data.hasOwnProperty(k)) {
-            svg.selectAll(".bar")
+            svg.selectAll('.bar')
                 .data(binned_data[k])
-                .enter().insert("rect")
-                .attr("x", function(d) { return x(d.x) + 1; })
-                .attr("y", function(d) { return binned_yscale(d.y); })
-                .attr('class', order[k]+'_viz_hist viz_hist')
-                .attr("width", x(binned_data[k][0].dx + binned_data[k][0].x) - x(binned_data[k][0].x) - 1)
-                .attr("height", function(d) {return (height - binned_yscale(d.y)); })
+                .enter()
+                .insert('rect')
+                .attr('x', function(d) {
+                    return x(d.x) + 1;
+                })
+                .attr('y', function(d) {
+                    return binned_yscale(d.y);
+                })
+                .attr('class', order[k] + '_viz_hist viz_hist')
+                .attr(
+                    'width',
+                    x(binned_data[k][0].dx + binned_data[k][0].x) -
+                        x(binned_data[k][0].x) -
+                        1
+                )
+                .attr('height', function(d) {
+                    return height - binned_yscale(d.y);
+                })
                 .attr('fill', colors[k].fill)
-                .attr('opacity', (Object.keys(data).length > 1 ? '0.1': '0.3'))
-            ;
+                .attr('opacity', Object.keys(data).length > 1 ? '0.1' : '0.3');
         }
     }
 
     // make kde plots
     for (var k in plot_data) {
         if (plot_data.hasOwnProperty(k)) {
-            svg.append("path")
+            svg.append('path')
                 .datum(plot_data[k])
-                .attr("d", line)
-                .attr('class', 'curve '+order[k]+'_viz_curve viz_curve')
+                .attr('d', line)
+                .attr('class', 'curve ' + order[k] + '_viz_curve viz_curve')
                 .attr('fill', 'none')
                 .attr('stroke', colors[k].stroke)
                 .attr('stroke-width', '1.5px')
                 .attr('opacity', '0.9')
-                .attr('data-legend',function() { return k; })
-                .attr('data-legend-pos', function() { return order[k];})
-            ;
+                .attr('data-legend', function() {
+                    return k;
+                })
+                .attr('data-legend-pos', function() {
+                    return order[k];
+                });
         }
     }
 
     // make legend
     if (!options.nolegend && Object.keys(data).length > 1) {
         var legend_font_size = 13;
-        var legend = svg.append("g")
-                .attr('class', 'legend')
-                .attr('transform', 'translate('+(width+25)+',0)')
-                .style('font-size', legend_font_size+"px")
-            ;
-        d3.legend(component, legend, legend_font_size, labels, order, genepanel_icon_data);
+        var legend = svg
+            .append('g')
+            .attr('class', 'legend')
+            .attr('transform', 'translate(' + (width + 25) + ',0)')
+            .style('font-size', legend_font_size + 'px');
+        d3.legend(
+            component,
+            legend,
+            legend_font_size,
+            labels,
+            order,
+            genepanel_icon_data
+        );
     }
     return div;
 };
 
-
 // d3.legend.js
 // (C) 2012 ziggy.jonsson.nyc@gmail.com
 // Modifications by Adam Abeshouse adama@cbio.mskcc.org
 // MIT licence
-var highlightSample = function (div, k, order, show_histogram, show_curve) {
-    $(div).find('.viz_hist').hide();
-    $(div).find('.viz_curve').hide();
+var highlightSample = function(div, k, order, show_histogram, show_curve) {
+    $(div)
+        .find('.viz_hist')
+        .hide();
+    $(div)
+        .find('.viz_curve')
+        .hide();
     if (show_histogram) {
-        $(div).find("." + order[k] + "_viz_hist").show();
-        $(div).find("." + order[k] + "_viz_hist").attr('opacity', '0.5');
+        $(div)
+            .find('.' + order[k] + '_viz_hist')
+            .show();
+        $(div)
+            .find('.' + order[k] + '_viz_hist')
+            .attr('opacity', '0.5');
     }
     if (show_curve) {
-        $(div).find("." + order[k] + "_viz_curve").show();
+        $(div)
+            .find('.' + order[k] + '_viz_curve')
+            .show();
     }
-}
-var showSamples = function (div, show_histogram, show_curve) {
+};
+var showSamples = function(div, show_histogram, show_curve) {
     if (show_histogram) {
-        $(div).find('.viz_hist').show();
-        $(div).find(".viz_hist").attr('opacity', '0.1');
+        $(div)
+            .find('.viz_hist')
+            .show();
+        $(div)
+            .find('.viz_hist')
+            .attr('opacity', '0.1');
     }
     if (show_curve) {
-        $(div).find('.viz_curve').show();
+        $(div)
+            .find('.viz_curve')
+            .show();
     }
-}
-d3.legend = function(component, g, font_size, labels, order, genepanel_icon_data) {
+};
+d3.legend = function(
+    component,
+    g,
+    font_size,
+    labels,
+    order,
+    genepanel_icon_data
+) {
     g.each(function() {
-        var g= d3.select(this),
+        var g = d3.select(this),
             items = {},
-            svg = d3.select(g.property("nearestViewportElement")),
-            legendPadding = g.attr("data-style-padding") || 5,
-            lb = g.selectAll(".legend-box").data([true]),
-            li = g.selectAll(".legend-items").data([true]);
+            svg = d3.select(g.property('nearestViewportElement')),
+            legendPadding = g.attr('data-style-padding') || 5,
+            lb = g.selectAll('.legend-box').data([true]),
+            li = g.selectAll('.legend-items').data([true]);
 
-        li.enter().append("g").classed("legend-items",true);
+        li.enter()
+            .append('g')
+            .classed('legend-items', true);
 
-        svg.selectAll("[data-legend]").each(function() {
+        svg.selectAll('[data-legend]').each(function() {
             var self = d3.select(this);
-            items[self.attr("data-legend")] = {
-                pos : self.attr("data-legend-pos") || this.getBBox().y,
-                color : self.attr("data-legend-color") != undefined ? self.attr("data-legend-color") : self.style("fill") != 'none' ? self.style("fill") : self.style("stroke")
-            }
+            items[self.attr('data-legend')] = {
+                pos: self.attr('data-legend-pos') || this.getBBox().y,
+                color:
+                    self.attr('data-legend-color') != undefined
+                        ? self.attr('data-legend-color')
+                        : self.style('fill') != 'none'
+                        ? self.style('fill')
+                        : self.style('stroke'),
+            };
         });
 
-        items = d3.entries(items).sort(function(a,b) { return a.value.pos-b.value.pos})
-
-
+        items = d3.entries(items).sort(function(a, b) {
+            return a.value.pos - b.value.pos;
+        });
 
         var maxLabelLength = 10;
         var spacing = 0.4;
 
         // sample name text
-        li.selectAll("text")
-            .data(items,function(d) { return d.key;})
-            .call(function(d) { d.enter().append("text");})
-            .call(function(d) { d.exit().remove();})
-            .attr("y",function(d,i) { return (i-0.2+i*spacing)+"em";})
-            .attr("x", 0.75+GENEPANEL_ICON_WIDTH+'em')
+        li.selectAll('text')
+            .data(items, function(d) {
+                return d.key;
+            })
+            .call(function(d) {
+                d.enter().append('text');
+            })
+            .call(function(d) {
+                d.exit().remove();
+            })
+            .attr('y', function(d, i) {
+                return i - 0.2 + i * spacing + 'em';
+            })
+            .attr('x', 0.75 + GENEPANEL_ICON_WIDTH + 'em')
             .text(function(d) {
                 var key = d.key;
-                var label = key.length > maxLabelLength ? key.substring(0,4) + "..." + key.slice(-3) : key;
+                var label =
+                    key.length > maxLabelLength
+                        ? key.substring(0, 4) + '...' + key.slice(-3)
+                        : key;
                 return label;
+            });
+        li.selectAll('circle')
+            .data(items, function(d) {
+                return d.key;
+            })
+            .call(function(d) {
+                d.enter().append('circle');
+            })
+            .call(function(d) {
+                d.exit().remove();
             })
-        ;
-        li.selectAll("circle")
-            .data(items,function(d) { return d.key})
-            .call(function(d) { d.enter().append("circle");})
-            .call(function(d) { d.exit().remove()})
-            .attr("cy",function(d,i) { return (i-0.5+i*spacing)+"em"})
-            .attr("cx",GENEPANEL_ICON_WIDTH+'em')
-            .attr("r","0.5em")
-            .style("fill",function(d) { return d.value.color;})
-        ;
+            .attr('cy', function(d, i) {
+                return i - 0.5 + i * spacing + 'em';
+            })
+            .attr('cx', GENEPANEL_ICON_WIDTH + 'em')
+            .attr('r', '0.5em')
+            .style('fill', function(d) {
+                return d.value.color;
+            });
 
         // sample index icon text
-        for (var i=0, keys=Object.keys(items); i<keys.length; i++) {
-            li.append("text")
-                .attr("x",0.4+GENEPANEL_ICON_WIDTH+'em')
-                .attr("y", (i-0.5+i*spacing)*font_size)
-                .attr("fill","white")
-                .attr("font-size","10")
-                .attr("dy","0.34em")
-                .attr("text-anchor","middle")
+        for (var i = 0, keys = Object.keys(items); i < keys.length; i++) {
+            li.append('text')
+                .attr('x', 0.4 + GENEPANEL_ICON_WIDTH + 'em')
+                .attr('y', (i - 0.5 + i * spacing) * font_size)
+                .attr('fill', 'white')
+                .attr('font-size', '10')
+                .attr('dy', '0.34em')
+                .attr('text-anchor', 'middle')
                 .text(labels[items[keys[i]].key])
-                .attr("class", "sample-icon-text")
-            ;
+                .attr('class', 'sample-icon-text');
         }
 
         // gene panel icon
-        for (var i=0, keys=Object.keys(items); i<keys.length; i++) {
+        for (var i = 0, keys = Object.keys(items); i < keys.length; i++) {
             var sample_id = items[i].key;
             if (Object.keys(genepanel_icon_data).includes(sample_id)) {
-
                 var label = genepanel_icon_data[sample_id].label;
                 var color = genepanel_icon_data[sample_id].color;
 
-                li.append("rect")
-                    .attr("x",'-0.75em')
-                    .attr("y", (i-1.06+i*spacing)+"em")
-                    .attr('width',function(d) {return GENEPANEL_ICON_WIDTH+'em'})
-                    .attr('height',function(d) {return GENEPANEL_ICON_HEIGHT+'em'})
+                li.append('rect')
+                    .attr('x', '-0.75em')
+                    .attr('y', i - 1.06 + i * spacing + 'em')
+                    .attr('width', function(d) {
+                        return GENEPANEL_ICON_WIDTH + 'em';
+                    })
+                    .attr('height', function(d) {
+                        return GENEPANEL_ICON_HEIGHT + 'em';
+                    })
                     .attr('rx', 4)
                     .attr('ry', 4)
-                    .attr("fill",function(d) {return color})
-                    .attr("class", "genepanel-icon")
-                    ;
-                li.append("text")
-                    .attr("x","-0.15em")
-                    .attr("y", (i-0.5+i*spacing)*font_size)
-                    .attr("fill","white")
-                    .attr("font-size","10")
-                    .attr("dy","0.34em")
-                    .attr("text-anchor","middle")
+                    .attr('fill', function(d) {
+                        return color;
+                    })
+                    .attr('class', 'genepanel-icon');
+                li.append('text')
+                    .attr('x', '-0.15em')
+                    .attr('y', (i - 0.5 + i * spacing) * font_size)
+                    .attr('fill', 'white')
+                    .attr('font-size', '10')
+                    .attr('dy', '0.34em')
+                    .attr('text-anchor', 'middle')
                     .text(label)
-                    .attr("class", "genepanel-icon-text")
-                ;
-            };
+                    .attr('class', 'genepanel-icon-text');
+            }
         }
 
-        li.selectAll("rect:not(.genepanel-icon)")
-            .data(items, function(d) { return d.key;})
-            .call(function(d) { d.enter().append("rect");})
-            .call(function(d) { d.exit().remove();})
-            .attr("id", function(d) { return d.key+"legend_hover_rect";})
-            .attr("y", function(d,i) { return (i-1+i*spacing-spacing/2)+"em";})
-            .attr("x","-1em")
-            .attr('width',function(d) { return '117px';})
-            .attr('height',(1+spacing)+'em')
-            .style('fill',function(d) { return d.value.color;})
+        li.selectAll('rect:not(.genepanel-icon)')
+            .data(items, function(d) {
+                return d.key;
+            })
+            .call(function(d) {
+                d.enter().append('rect');
+            })
+            .call(function(d) {
+                d.exit().remove();
+            })
+            .attr('id', function(d) {
+                return d.key + 'legend_hover_rect';
+            })
+            .attr('y', function(d, i) {
+                return i - 1 + i * spacing - spacing / 2 + 'em';
+            })
+            .attr('x', '-1em')
+            .attr('width', function(d) {
+                return '117px';
+            })
+            .attr('height', 1 + spacing + 'em')
+            .style('fill', function(d) {
+                return d.value.color;
+            })
             .attr('opacity', '0')
-            .on('mouseover', (Object.keys(items).length > 1 ?
-                function(d) {
-                    $(this).attr('opacity','0.2');
-                    highlightSample(component.div, d.key, order, component.state.show_histogram, component.state.show_curve);
-                } : function(d) {}))
-            .on('mouseout', function(d) { $(this).attr('opacity','0');})
-        ;
-        for (var i=0; i<items.length; i++) {
+            .on(
+                'mouseover',
+                Object.keys(items).length > 1
+                    ? function(d) {
+                          $(this).attr('opacity', '0.2');
+                          highlightSample(
+                              component.div,
+                              d.key,
+                              order,
+                              component.state.show_histogram,
+                              component.state.show_curve
+                          );
+                      }
+                    : function(d) {}
+            )
+            .on('mouseout', function(d) {
+                $(this).attr('opacity', '0');
+            });
+        for (var i = 0; i < items.length; i++) {
             var k = items[i].key;
             if (k.length > maxLabelLength) {
-                $("#"+k+"legend_hover_rect").attr("title", k);
-                $("#"+k+"legend_hover_rect").qtip({
+                $('#' + k + 'legend_hover_rect').attr('title', k);
+                $('#' + k + 'legend_hover_rect').qtip({
                     content: { attr: 'title' },
                     style: { classes: 'qtip-light qtip-rounded' },
-                    position: { my:'center left',at:'center right',viewport: $(window) }
+                    position: {
+                        my: 'center left',
+                        at: 'center right',
+                        viewport: $(window),
+                    },
                 });
             }
         }
-        li.on('mouseout', (Object.keys(items).length > 1 ? function() { showSamples(component.div, component.state.show_histogram, component.state.show_curve); } : function() {}));
+        li.on(
+            'mouseout',
+            Object.keys(items).length > 1
+                ? function() {
+                      showSamples(
+                          component.div,
+                          component.state.show_histogram,
+                          component.state.show_curve
+                      );
+                  }
+                : function() {}
+        );
         // Reposition and resize the box
         var lbbox = li[0][0].getBBox();
-        lb.attr("x",(lbbox.x-legendPadding))
-            .attr("y",(lbbox.y-legendPadding))
-            .attr("height",(lbbox.height+2*legendPadding))
-            .attr("width",(lbbox.width+2*legendPadding));
-
+        lb.attr('x', lbbox.x - legendPadding)
+            .attr('y', lbbox.y - legendPadding)
+            .attr('height', lbbox.height + 2 * legendPadding)
+            .attr('width', lbbox.width + 2 * legendPadding);
     });
     return g;
 };
diff --git a/src/pages/patientView/vafPlot/mockData.js b/src/pages/patientView/vafPlot/mockData.js
index 98f78f82ff1..969a642df30 100644
--- a/src/pages/patientView/vafPlot/mockData.js
+++ b/src/pages/patientView/vafPlot/mockData.js
@@ -1,31 +1,1036 @@
 export const mockData = {
-    'caseId1':[0,0,0.803961537188,1,1,1,0,0,1,0.927615090482,0,1,1,0.157538019288,0.505991600312,0.152390044049,1,0,0,1,1,0.301866051448,1,1,0.599820470204,0.340867907957,0,0.562541018735,0,1,1,0,1,1,1,0,0.967163242798,0,1,1,0.381215959441,0.464697262077,0,1,0,0.313873402196,1,0.270227179111,1,0.463708509529,0.00837944708018,0,0.259038150274,1,1,0.646563819321,1,1,1,0,0.239650642043,0.949429698845,0.190516256646,0.125548032017,1,0,1,0.942069898141,0.640891483093,0,1,1,0,1,0.730659293339,0.9072753608,0,0.121204050087,0.927213192677,0.745733277804,0.519700953941,0.0412041253287,0,1,0.048801978452,0.545550410771,0.731273876942,0,1,0.0897803087261,1,1,1,1,0,0,0,1,1,1,0,0,0,1,0,1,1,1,1,0.950118413707,1,0.890306058,0,0.159954927308,0.899185967666,0,0.880025852017,1,1,1,0.0283685935033,0,0,1,1,1,1,0.7243265704,0.0347008645035,0,0.352539349043,0.502537673741,0,1,0,0.739354091947,1,0,0.900740381213,0.580605153631,0,0.682409109201,1,1,1,0.531225828432,1,1,0,1,1,1,0.153220214038,1,0.926133882551,0.330896249209,1,0.715289064299,0,0,1,1,0.471672729834,0.417639361909,0.0599785296869,0.219772111753,0.0759062397248,0.478510730503,0.170762866919,0.537315649137,0.940138463276,0.12018977833,0.397501448375,1,0,0,0.551708458271,0,1,0,0,1,0,0,1,1,1,0.14331674924,0.237701959882,0.483028539063,1,0.398342314421,1,0,1,0,1,0.597795167713,1,1],
-    'caseId2':[1,1,0.0861744469357,0,1,1,1,1,0.991316594603,0.836583516684,0.596111403236,1,0.704881309909,0.0809265608024,1,1,0.0314528673007,1,1,1,1,0.608931713399,0.0663813538308,0.460006406919,1,0,1,1,0.61896859303,1,0.676442936155,1,0.578703636005,0.847075020759,1,1,1,1,1,1,0.559797741762,1,1,0,1,1,0.558139738104,0.941897527601,0,1,0.557358947973,1,1,0.514779918977,1,1,0,1,1,1,0,1,1,0.166547266602,0.092897149493,1,0,1,1,0.455417004012,1,0.951717921441,0,0.632774205875,0.115616517836,0,0.626419359175,1,0,1,0,0.260459195882,1,0.109948310117,1,0.959781786516,1,0,0,1,1,1,0.191256331256,0.566940876199,0,0.678519611457,1,0.017987207268,1,0,1,1,1,0,1,0.453336592189,1,0.765664210084,1,1,1,0.153930935046,1,0,1,0,0.165288723276,1,0.721723926515,0.812499675825,1,1,0.228831108017,0.862834021154,0.368385551742,0,0.38893262702,1,1,0,1,0.487141717604,0.211711972934,1,1,0.656597184875,1,0.963853720992,0,1,0,1,0.565869465769,0,0,0.00442790741152,0.240739696432,0.415636083349,0.347074431281,1,1,0,0.639925953834,1,1,0,1,0.712507178865,0.473014969742,0.448164293897,0,1,1,1,0.965551710214,1,1,0.682606257454,0,1,1,1,1,1,0.439963551291,0.831102061378,1,0.490587234557,1,0.406569926542,0.645989431646,1,1,1,1,0.76358507351,0.861064947236,1,1,1,0.936146756906,1,0.463344836259,1,1,1,1,1,0,0.517811176568],
-    'caseId3':[0,0,1,1,0,1,0.982743940415,1,0,0.562518097393,0.384603175808,0.825791175001,1,0.67967625972,0.39108253206,0.585394735075,1,0,0,0.220488846489,0,0,0,0,0,1,0.335692788053,0.351004717288,0.164944781336,0,0.63360412752,1,1,0,0.519018146959,0.812838472664,0,0,0,0,0,0.475942193723,1,0,0,1,0,0,0,0.575653863354,0,0,0.747406500828,0,0.501450359381,0,0.976179778863,0,0,0,0.215789266617,0.905087352754,1,1,0.574406543277,0.455742187537,0.457805357424,0,1,0,1,1,0,0,0.418355975742,1,0.93074148983,0.0882156616796,0,1,0,1,0,0.520172452289,0,1,0,1,1,0,0.135039273289,0,0,0,1,0.798941369109,0.0936639112423,0.879749720106,0.45950130259,1,0,1,1,0,0.719800848602,0.845704365742,0.372938603374,0.882133474503,0.718286455969,0.715598986664,0,0,1,0,0.0844001102011,0,0,1,0.407193886452,0.887593408267,0,1,0,0.300167957881,1,0,0.575167919672,0.73577731602,0.160827319298,0.29088032771,0,0.987604085356,1,0,0,0.273416768022,0,0,1,0.929925709794,0,0,0.225932459378,0,0.604123347826,0.00908295786925,0.82393718673,1,0.99903088712,0.437948420161,1,0.978540270247,0,0,1,0,0,0,0,0,1,1,0,0,0.119387547997,0,0,0,1,0,0.521644842939,1,1,0.027513793083,0,0,1,0,0.518970619115,1,0.203203213489,0.208470748321,0,0,0,0,0,0,0,0,0,0,0.138402280116,0.0894434237411,1,0,0,0,1,0.536134158817],
-    'caseId4':[1,0.164323464323,0.706470407706,1,1,1,0.901171303347,1,0,1,0.346477571805,0,1,0,0,1,1,1,0,1,1,0,0.839640857892,0.92843215907,0.920856049311,1,1,0.656203876856,0.0315160561341,0.990580530539,0,1,0,0,0,1,0,0.710034949719,1,1,0,0.0955139879875,0,0.997738071041,0.650979038247,1,1,0.705339028445,0,1,0.422236236835,0.0481415685822,0,0.509762191958,0,0,0.544663299925,0.184116987101,0.177457518055,0.28233770763,0.748169604394,1,0.394669419953,0,0,0.511658741034,0,0.99704520347,0.836932985294,0.45135694574,1,0,1,0.266225898216,1,0,1,0.722536588317,0.36312870554,0,0.321027237713,1,0,1,1,0.100963602477,0,1,1,0,0.715089433089,1,0,0.110127212445,1,0.640137757342,1,1,0,0.259664103222,0,0,0.401887496269,0.28565947045,1,1,0,0.404539003702,1,0.901932072609,0.270869491378,0,1,0,1,0,1,1,0,0,1,0,0,0.363106757684,1,0,1,0.101809321904,0.377560275534,0.968023639036,1,1,1,0.58726687049,1,1,0.0748794521634,0.938463508618,0.554765150475,0.328438749495,0,1,0.0652968662628,1,0,0,0,0.0576784074454,1,1,0,0.0462453699386,1,0.00277521668818,1,1,0,0,0,0.0270234754663,0.432653709482,0.800874793163,0.769730530688,1,0.885417454165,0.473938976091,1,1,0.465918156882,0.708987687885,1,1,0.0744632019345,0,1,0,0.11822625903,0,0,0,0,0.831808741566,0,0,1,0.143270832071,0,0.598422313681,0.804695284369,0,1,0,0.846076612318,1,0,0.909663489268,0,0,0.450639894394,0],
-    'caseId5':[0.405359402906,0,0.349769277124,0,0,1,0.722847806191,0,0,0,0,0,0.561249908195,0,0.557132315565,0.305423627825,0.0378889229479,0,0,1,0,0.606341087891,0.744985697822,0,1,0,0,0,0.860866885884,0,0.431734082927,0,0,0.381833632238,0.0320495636432,0.750936285151,0.550024399751,0.702703284808,0.0155292884669,0,0,1,0.195584876538,0,0,0,0,1,0.0690817371214,1,0,0.670304887614,0.71445837597,1,0,1,0.862615249846,0.586990955422,0.0911444307108,1,0,0.27401552062,0.720264759989,0.268739744306,0,1,0.885296565182,0,0.140373477293,0.651557052238,1,0,1,0,0,0,0,0,0.157841032057,0.284890043525,0,0.158613132307,0.0814661755948,0,0.157863869611,0,1,0,0.471460688282,0,0,0.111389474879,0.471042616748,1,0.799873435786,0.163790831564,0.314877780415,0,0,0.457791335541,0,0,0.0902804171292,0.928494256811,0.210567882252,0,0.413616641686,1,0,1,0,1,0,0,0.349439604236,0,0,1,0.694448825078,0.0078414019065,0,0,0,0.0997563119172,0.499203782811,0,0.221955375765,1,0,1,0,0,0,0,0,0,1,0,1,0,0,0,0.599475388272,0,0.590468681685,0.678429211997,1,0,0,0.557921992711,0.148982663363,0,0,0.737714899624,0.805711184042,0.378898597033,0,1,0.0580312499921,0,0.20032916315,1,0,0.210712627405,0.602249777467,0,0.032903245054,0,0,0.581695100015,1,0,0,0.0619511031922,0.625629353329,0,0,0.846693308486,1,0,0.423064467567,0,1,0,0,0.917140078957,1,0.371763797544,0,0,0.724428533063,0.464856693359,0.12555493885,0,1,0.162255219797,0.481374677365,0.106401251612,0,0]
+    caseId1: [
+        0,
+        0,
+        0.803961537188,
+        1,
+        1,
+        1,
+        0,
+        0,
+        1,
+        0.927615090482,
+        0,
+        1,
+        1,
+        0.157538019288,
+        0.505991600312,
+        0.152390044049,
+        1,
+        0,
+        0,
+        1,
+        1,
+        0.301866051448,
+        1,
+        1,
+        0.599820470204,
+        0.340867907957,
+        0,
+        0.562541018735,
+        0,
+        1,
+        1,
+        0,
+        1,
+        1,
+        1,
+        0,
+        0.967163242798,
+        0,
+        1,
+        1,
+        0.381215959441,
+        0.464697262077,
+        0,
+        1,
+        0,
+        0.313873402196,
+        1,
+        0.270227179111,
+        1,
+        0.463708509529,
+        0.00837944708018,
+        0,
+        0.259038150274,
+        1,
+        1,
+        0.646563819321,
+        1,
+        1,
+        1,
+        0,
+        0.239650642043,
+        0.949429698845,
+        0.190516256646,
+        0.125548032017,
+        1,
+        0,
+        1,
+        0.942069898141,
+        0.640891483093,
+        0,
+        1,
+        1,
+        0,
+        1,
+        0.730659293339,
+        0.9072753608,
+        0,
+        0.121204050087,
+        0.927213192677,
+        0.745733277804,
+        0.519700953941,
+        0.0412041253287,
+        0,
+        1,
+        0.048801978452,
+        0.545550410771,
+        0.731273876942,
+        0,
+        1,
+        0.0897803087261,
+        1,
+        1,
+        1,
+        1,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        0,
+        0,
+        0,
+        1,
+        0,
+        1,
+        1,
+        1,
+        1,
+        0.950118413707,
+        1,
+        0.890306058,
+        0,
+        0.159954927308,
+        0.899185967666,
+        0,
+        0.880025852017,
+        1,
+        1,
+        1,
+        0.0283685935033,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1,
+        0.7243265704,
+        0.0347008645035,
+        0,
+        0.352539349043,
+        0.502537673741,
+        0,
+        1,
+        0,
+        0.739354091947,
+        1,
+        0,
+        0.900740381213,
+        0.580605153631,
+        0,
+        0.682409109201,
+        1,
+        1,
+        1,
+        0.531225828432,
+        1,
+        1,
+        0,
+        1,
+        1,
+        1,
+        0.153220214038,
+        1,
+        0.926133882551,
+        0.330896249209,
+        1,
+        0.715289064299,
+        0,
+        0,
+        1,
+        1,
+        0.471672729834,
+        0.417639361909,
+        0.0599785296869,
+        0.219772111753,
+        0.0759062397248,
+        0.478510730503,
+        0.170762866919,
+        0.537315649137,
+        0.940138463276,
+        0.12018977833,
+        0.397501448375,
+        1,
+        0,
+        0,
+        0.551708458271,
+        0,
+        1,
+        0,
+        0,
+        1,
+        0,
+        0,
+        1,
+        1,
+        1,
+        0.14331674924,
+        0.237701959882,
+        0.483028539063,
+        1,
+        0.398342314421,
+        1,
+        0,
+        1,
+        0,
+        1,
+        0.597795167713,
+        1,
+        1,
+    ],
+    caseId2: [
+        1,
+        1,
+        0.0861744469357,
+        0,
+        1,
+        1,
+        1,
+        1,
+        0.991316594603,
+        0.836583516684,
+        0.596111403236,
+        1,
+        0.704881309909,
+        0.0809265608024,
+        1,
+        1,
+        0.0314528673007,
+        1,
+        1,
+        1,
+        1,
+        0.608931713399,
+        0.0663813538308,
+        0.460006406919,
+        1,
+        0,
+        1,
+        1,
+        0.61896859303,
+        1,
+        0.676442936155,
+        1,
+        0.578703636005,
+        0.847075020759,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        0.559797741762,
+        1,
+        1,
+        0,
+        1,
+        1,
+        0.558139738104,
+        0.941897527601,
+        0,
+        1,
+        0.557358947973,
+        1,
+        1,
+        0.514779918977,
+        1,
+        1,
+        0,
+        1,
+        1,
+        1,
+        0,
+        1,
+        1,
+        0.166547266602,
+        0.092897149493,
+        1,
+        0,
+        1,
+        1,
+        0.455417004012,
+        1,
+        0.951717921441,
+        0,
+        0.632774205875,
+        0.115616517836,
+        0,
+        0.626419359175,
+        1,
+        0,
+        1,
+        0,
+        0.260459195882,
+        1,
+        0.109948310117,
+        1,
+        0.959781786516,
+        1,
+        0,
+        0,
+        1,
+        1,
+        1,
+        0.191256331256,
+        0.566940876199,
+        0,
+        0.678519611457,
+        1,
+        0.017987207268,
+        1,
+        0,
+        1,
+        1,
+        1,
+        0,
+        1,
+        0.453336592189,
+        1,
+        0.765664210084,
+        1,
+        1,
+        1,
+        0.153930935046,
+        1,
+        0,
+        1,
+        0,
+        0.165288723276,
+        1,
+        0.721723926515,
+        0.812499675825,
+        1,
+        1,
+        0.228831108017,
+        0.862834021154,
+        0.368385551742,
+        0,
+        0.38893262702,
+        1,
+        1,
+        0,
+        1,
+        0.487141717604,
+        0.211711972934,
+        1,
+        1,
+        0.656597184875,
+        1,
+        0.963853720992,
+        0,
+        1,
+        0,
+        1,
+        0.565869465769,
+        0,
+        0,
+        0.00442790741152,
+        0.240739696432,
+        0.415636083349,
+        0.347074431281,
+        1,
+        1,
+        0,
+        0.639925953834,
+        1,
+        1,
+        0,
+        1,
+        0.712507178865,
+        0.473014969742,
+        0.448164293897,
+        0,
+        1,
+        1,
+        1,
+        0.965551710214,
+        1,
+        1,
+        0.682606257454,
+        0,
+        1,
+        1,
+        1,
+        1,
+        1,
+        0.439963551291,
+        0.831102061378,
+        1,
+        0.490587234557,
+        1,
+        0.406569926542,
+        0.645989431646,
+        1,
+        1,
+        1,
+        1,
+        0.76358507351,
+        0.861064947236,
+        1,
+        1,
+        1,
+        0.936146756906,
+        1,
+        0.463344836259,
+        1,
+        1,
+        1,
+        1,
+        1,
+        0,
+        0.517811176568,
+    ],
+    caseId3: [
+        0,
+        0,
+        1,
+        1,
+        0,
+        1,
+        0.982743940415,
+        1,
+        0,
+        0.562518097393,
+        0.384603175808,
+        0.825791175001,
+        1,
+        0.67967625972,
+        0.39108253206,
+        0.585394735075,
+        1,
+        0,
+        0,
+        0.220488846489,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        0.335692788053,
+        0.351004717288,
+        0.164944781336,
+        0,
+        0.63360412752,
+        1,
+        1,
+        0,
+        0.519018146959,
+        0.812838472664,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0.475942193723,
+        1,
+        0,
+        0,
+        1,
+        0,
+        0,
+        0,
+        0.575653863354,
+        0,
+        0,
+        0.747406500828,
+        0,
+        0.501450359381,
+        0,
+        0.976179778863,
+        0,
+        0,
+        0,
+        0.215789266617,
+        0.905087352754,
+        1,
+        1,
+        0.574406543277,
+        0.455742187537,
+        0.457805357424,
+        0,
+        1,
+        0,
+        1,
+        1,
+        0,
+        0,
+        0.418355975742,
+        1,
+        0.93074148983,
+        0.0882156616796,
+        0,
+        1,
+        0,
+        1,
+        0,
+        0.520172452289,
+        0,
+        1,
+        0,
+        1,
+        1,
+        0,
+        0.135039273289,
+        0,
+        0,
+        0,
+        1,
+        0.798941369109,
+        0.0936639112423,
+        0.879749720106,
+        0.45950130259,
+        1,
+        0,
+        1,
+        1,
+        0,
+        0.719800848602,
+        0.845704365742,
+        0.372938603374,
+        0.882133474503,
+        0.718286455969,
+        0.715598986664,
+        0,
+        0,
+        1,
+        0,
+        0.0844001102011,
+        0,
+        0,
+        1,
+        0.407193886452,
+        0.887593408267,
+        0,
+        1,
+        0,
+        0.300167957881,
+        1,
+        0,
+        0.575167919672,
+        0.73577731602,
+        0.160827319298,
+        0.29088032771,
+        0,
+        0.987604085356,
+        1,
+        0,
+        0,
+        0.273416768022,
+        0,
+        0,
+        1,
+        0.929925709794,
+        0,
+        0,
+        0.225932459378,
+        0,
+        0.604123347826,
+        0.00908295786925,
+        0.82393718673,
+        1,
+        0.99903088712,
+        0.437948420161,
+        1,
+        0.978540270247,
+        0,
+        0,
+        1,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        0,
+        0,
+        0.119387547997,
+        0,
+        0,
+        0,
+        1,
+        0,
+        0.521644842939,
+        1,
+        1,
+        0.027513793083,
+        0,
+        0,
+        1,
+        0,
+        0.518970619115,
+        1,
+        0.203203213489,
+        0.208470748321,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0.138402280116,
+        0.0894434237411,
+        1,
+        0,
+        0,
+        0,
+        1,
+        0.536134158817,
+    ],
+    caseId4: [
+        1,
+        0.164323464323,
+        0.706470407706,
+        1,
+        1,
+        1,
+        0.901171303347,
+        1,
+        0,
+        1,
+        0.346477571805,
+        0,
+        1,
+        0,
+        0,
+        1,
+        1,
+        1,
+        0,
+        1,
+        1,
+        0,
+        0.839640857892,
+        0.92843215907,
+        0.920856049311,
+        1,
+        1,
+        0.656203876856,
+        0.0315160561341,
+        0.990580530539,
+        0,
+        1,
+        0,
+        0,
+        0,
+        1,
+        0,
+        0.710034949719,
+        1,
+        1,
+        0,
+        0.0955139879875,
+        0,
+        0.997738071041,
+        0.650979038247,
+        1,
+        1,
+        0.705339028445,
+        0,
+        1,
+        0.422236236835,
+        0.0481415685822,
+        0,
+        0.509762191958,
+        0,
+        0,
+        0.544663299925,
+        0.184116987101,
+        0.177457518055,
+        0.28233770763,
+        0.748169604394,
+        1,
+        0.394669419953,
+        0,
+        0,
+        0.511658741034,
+        0,
+        0.99704520347,
+        0.836932985294,
+        0.45135694574,
+        1,
+        0,
+        1,
+        0.266225898216,
+        1,
+        0,
+        1,
+        0.722536588317,
+        0.36312870554,
+        0,
+        0.321027237713,
+        1,
+        0,
+        1,
+        1,
+        0.100963602477,
+        0,
+        1,
+        1,
+        0,
+        0.715089433089,
+        1,
+        0,
+        0.110127212445,
+        1,
+        0.640137757342,
+        1,
+        1,
+        0,
+        0.259664103222,
+        0,
+        0,
+        0.401887496269,
+        0.28565947045,
+        1,
+        1,
+        0,
+        0.404539003702,
+        1,
+        0.901932072609,
+        0.270869491378,
+        0,
+        1,
+        0,
+        1,
+        0,
+        1,
+        1,
+        0,
+        0,
+        1,
+        0,
+        0,
+        0.363106757684,
+        1,
+        0,
+        1,
+        0.101809321904,
+        0.377560275534,
+        0.968023639036,
+        1,
+        1,
+        1,
+        0.58726687049,
+        1,
+        1,
+        0.0748794521634,
+        0.938463508618,
+        0.554765150475,
+        0.328438749495,
+        0,
+        1,
+        0.0652968662628,
+        1,
+        0,
+        0,
+        0,
+        0.0576784074454,
+        1,
+        1,
+        0,
+        0.0462453699386,
+        1,
+        0.00277521668818,
+        1,
+        1,
+        0,
+        0,
+        0,
+        0.0270234754663,
+        0.432653709482,
+        0.800874793163,
+        0.769730530688,
+        1,
+        0.885417454165,
+        0.473938976091,
+        1,
+        1,
+        0.465918156882,
+        0.708987687885,
+        1,
+        1,
+        0.0744632019345,
+        0,
+        1,
+        0,
+        0.11822625903,
+        0,
+        0,
+        0,
+        0,
+        0.831808741566,
+        0,
+        0,
+        1,
+        0.143270832071,
+        0,
+        0.598422313681,
+        0.804695284369,
+        0,
+        1,
+        0,
+        0.846076612318,
+        1,
+        0,
+        0.909663489268,
+        0,
+        0,
+        0.450639894394,
+        0,
+    ],
+    caseId5: [
+        0.405359402906,
+        0,
+        0.349769277124,
+        0,
+        0,
+        1,
+        0.722847806191,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0.561249908195,
+        0,
+        0.557132315565,
+        0.305423627825,
+        0.0378889229479,
+        0,
+        0,
+        1,
+        0,
+        0.606341087891,
+        0.744985697822,
+        0,
+        1,
+        0,
+        0,
+        0,
+        0.860866885884,
+        0,
+        0.431734082927,
+        0,
+        0,
+        0.381833632238,
+        0.0320495636432,
+        0.750936285151,
+        0.550024399751,
+        0.702703284808,
+        0.0155292884669,
+        0,
+        0,
+        1,
+        0.195584876538,
+        0,
+        0,
+        0,
+        0,
+        1,
+        0.0690817371214,
+        1,
+        0,
+        0.670304887614,
+        0.71445837597,
+        1,
+        0,
+        1,
+        0.862615249846,
+        0.586990955422,
+        0.0911444307108,
+        1,
+        0,
+        0.27401552062,
+        0.720264759989,
+        0.268739744306,
+        0,
+        1,
+        0.885296565182,
+        0,
+        0.140373477293,
+        0.651557052238,
+        1,
+        0,
+        1,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0.157841032057,
+        0.284890043525,
+        0,
+        0.158613132307,
+        0.0814661755948,
+        0,
+        0.157863869611,
+        0,
+        1,
+        0,
+        0.471460688282,
+        0,
+        0,
+        0.111389474879,
+        0.471042616748,
+        1,
+        0.799873435786,
+        0.163790831564,
+        0.314877780415,
+        0,
+        0,
+        0.457791335541,
+        0,
+        0,
+        0.0902804171292,
+        0.928494256811,
+        0.210567882252,
+        0,
+        0.413616641686,
+        1,
+        0,
+        1,
+        0,
+        1,
+        0,
+        0,
+        0.349439604236,
+        0,
+        0,
+        1,
+        0.694448825078,
+        0.0078414019065,
+        0,
+        0,
+        0,
+        0.0997563119172,
+        0.499203782811,
+        0,
+        0.221955375765,
+        1,
+        0,
+        1,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        0,
+        1,
+        0,
+        0,
+        0,
+        0.599475388272,
+        0,
+        0.590468681685,
+        0.678429211997,
+        1,
+        0,
+        0,
+        0.557921992711,
+        0.148982663363,
+        0,
+        0,
+        0.737714899624,
+        0.805711184042,
+        0.378898597033,
+        0,
+        1,
+        0.0580312499921,
+        0,
+        0.20032916315,
+        1,
+        0,
+        0.210712627405,
+        0.602249777467,
+        0,
+        0.032903245054,
+        0,
+        0,
+        0.581695100015,
+        1,
+        0,
+        0,
+        0.0619511031922,
+        0.625629353329,
+        0,
+        0,
+        0.846693308486,
+        1,
+        0,
+        0.423064467567,
+        0,
+        1,
+        0,
+        0,
+        0.917140078957,
+        1,
+        0.371763797544,
+        0,
+        0,
+        0.724428533063,
+        0.464856693359,
+        0.12555493885,
+        0,
+        1,
+        0.162255219797,
+        0.481374677365,
+        0.106401251612,
+        0,
+        0,
+    ],
 };
 
 export const mockColors = {
-    'caseId1': 'black',
-    'caseId2': 'red',
-    'caseId3': '#00FF00',
-    'caseId4': 'black',
-    'caseId5': 'rgb(35,101,200)'
+    caseId1: 'black',
+    caseId2: 'red',
+    caseId3: '#00FF00',
+    caseId4: 'black',
+    caseId5: 'rgb(35,101,200)',
 };
 
 export const mockLabels = {
-    'caseId1': "2",
-    'caseId2': "1",
-    'caseId3': "3",
-    'caseId4': "4",
-    'caseId5': "5"
+    caseId1: '2',
+    caseId2: '1',
+    caseId3: '3',
+    caseId4: '4',
+    caseId5: '5',
 };
 
 export const mockOrder = {
-    'caseId1': 2,
-    'caseId2': 1,
-    'caseId3': 3,
-    'caseId4': 4,
-    'caseId5': 5
-};
\ No newline at end of file
+    caseId1: 2,
+    caseId2: 1,
+    caseId3: 3,
+    caseId4: 4,
+    caseId5: 5,
+};
diff --git a/src/pages/resultsView/ErrorPage.tsx b/src/pages/resultsView/ErrorPage.tsx
index dc1867df6cd..c60d591c2fa 100644
--- a/src/pages/resultsView/ErrorPage.tsx
+++ b/src/pages/resultsView/ErrorPage.tsx
@@ -8,24 +8,33 @@ import ErrorScreen from 'shared/components/errorScreen/ErrorScreen';
 import { formatErrorTitle } from 'shared/lib/errorFormatter';
 import { buildCBioPortalPageUrl } from 'shared/api/urls';
 
-@inject("appStore")
-export default class ErrorPage extends React.Component<{appStore?: AppStore}, {}> {
-    render () {
+@inject('appStore')
+export default class ErrorPage extends React.Component<
+    { appStore?: AppStore },
+    {}
+> {
+    render() {
         return (
             <div>
                 <div className="pageTopContainer">
                     <UserMessager />
                     <div className="contentWidth">
-                        <PortalHeader appStore={this.props.appStore as AppStore}/>
+                        <PortalHeader
+                            appStore={this.props.appStore as AppStore}
+                        />
                     </div>
                 </div>
                 <div className="contentWrapper">
                     <ErrorScreen
                         title={"Sorry, this page doesn't exist."}
-                        body={<a href={buildCBioPortalPageUrl("/")}>Return to homepage</a>}
+                        body={
+                            <a href={buildCBioPortalPageUrl('/')}>
+                                Return to homepage
+                            </a>
+                        }
                     />
                 </div>
             </div>
-        )
+        );
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/resultsView/NotUsingGenePanelWarning.tsx b/src/pages/resultsView/NotUsingGenePanelWarning.tsx
index 4a4dcca29dc..5afb7c2725e 100644
--- a/src/pages/resultsView/NotUsingGenePanelWarning.tsx
+++ b/src/pages/resultsView/NotUsingGenePanelWarning.tsx
@@ -1,33 +1,42 @@
-import * as React from "react";
-import {observer} from "mobx-react";
-import {ResultsViewPageStore} from "./ResultsViewPageStore";
-import {MakeMobxView} from "../../shared/components/MobxView";
+import * as React from 'react';
+import { observer } from 'mobx-react';
+import { ResultsViewPageStore } from './ResultsViewPageStore';
+import { MakeMobxView } from '../../shared/components/MobxView';
 
 export interface INotUsingGenePanelWarningProps {
-    store:ResultsViewPageStore;
+    store: ResultsViewPageStore;
 }
 
 @observer
-export default class NotUsingGenePanelWarning extends React.Component<INotUsingGenePanelWarningProps, {}> {
+export default class NotUsingGenePanelWarning extends React.Component<
+    INotUsingGenePanelWarningProps,
+    {}
+> {
     readonly ui = MakeMobxView({
-        await:()=>[
+        await: () => [
             this.props.store.existUnsequencedSamplesInAGene,
-            this.props.store.genes
+            this.props.store.genes,
         ],
-        render:()=>{
+        render: () => {
             if (this.props.store.existUnsequencedSamplesInAGene.result) {
-                let message = "";
+                let message = '';
                 if (this.props.store.genes.result!.length > 1) {
-                    message = "The results below do not reflect gene panel data. Samples which were not profiled for some or all of the queried genes are included in the analysis below.";
+                    message =
+                        'The results below do not reflect gene panel data. Samples which were not profiled for some or all of the queried genes are included in the analysis below.';
                 } else {
-                    message = "The results below do not reflect gene panel data. Samples which were not profiled for the queried gene are included in the analysis below.";
+                    message =
+                        'The results below do not reflect gene panel data. Samples which were not profiled for the queried gene are included in the analysis below.';
                 }
                 return (
                     <div className="alert alert-warning">
-                        <span style={{verticalAlign:"middle"}}>
+                        <span style={{ verticalAlign: 'middle' }}>
                             <i
-                                className={"fa fa-md fa-exclamation-triangle"}
-                                style={{verticalAlign:"middle !important", marginRight:6, marginBottom:1}}
+                                className={'fa fa-md fa-exclamation-triangle'}
+                                style={{
+                                    verticalAlign: 'middle !important',
+                                    marginRight: 6,
+                                    marginBottom: 1,
+                                }}
                             />
                             {message}
                         </span>
@@ -36,11 +45,10 @@ export default class NotUsingGenePanelWarning extends React.Component<INotUsingG
             } else {
                 return null;
             }
-        }
+        },
     });
 
-
     render() {
         return this.ui.component;
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/resultsView/ResultsViewPage.spec.tsx b/src/pages/resultsView/ResultsViewPage.spec.tsx
index 59bc9b25347..00440fa36fd 100644
--- a/src/pages/resultsView/ResultsViewPage.spec.tsx
+++ b/src/pages/resultsView/ResultsViewPage.spec.tsx
@@ -34,4 +34,4 @@
 //         assert.equal(methodUnderTest.call(mockInstance,undefined), "oncoprint", "single study, single gene");
 //
 //     });
-// });
\ No newline at end of file
+// });
diff --git a/src/pages/resultsView/ResultsViewPage.tsx b/src/pages/resultsView/ResultsViewPage.tsx
index 31b87e9ca11..6fb5f5a5abe 100644
--- a/src/pages/resultsView/ResultsViewPage.tsx
+++ b/src/pages/resultsView/ResultsViewPage.tsx
@@ -3,7 +3,7 @@ import * as _ from 'lodash';
 import $ from 'jquery';
 import URL from 'url';
 import { inject, observer } from 'mobx-react';
-import {action, computed, observable, reaction, runInAction} from 'mobx';
+import { action, computed, observable, reaction, runInAction } from 'mobx';
 import { ResultsViewPageStore } from './ResultsViewPageStore';
 import CancerSummaryContainer from 'pages/resultsView/cancerSummary/CancerSummaryContainer';
 import Mutations from './mutation/Mutations';
@@ -22,7 +22,7 @@ import { MSKTab, MSKTabs } from '../../shared/components/MSKTabs/MSKTabs';
 import { PageLayout } from '../../shared/components/PageLayout/PageLayout';
 import autobind from 'autobind-decorator';
 import { ITabConfiguration } from '../../shared/model/ITabConfiguration';
-import {getBrowserWindow} from 'cbioportal-frontend-commons';
+import { getBrowserWindow } from 'cbioportal-frontend-commons';
 import CoExpressionTab from './coExpression/CoExpressionTab';
 import Helmet from 'react-helmet';
 import { showCustomTab } from '../../shared/lib/customTabs';
@@ -43,24 +43,29 @@ import ExtendedRouterStore from 'shared/lib/ExtendedRouterStore';
 import GeneSymbolValidationError from 'shared/components/query/GeneSymbolValidationError';
 import ResultsViewURLWrapper from 'pages/resultsView/ResultsViewURLWrapper';
 import setWindowVariable from 'shared/lib/setWindowVariable';
-import LoadingIndicator from "shared/components/loadingIndicator/LoadingIndicator";
-import onMobxPromise from "shared/lib/onMobxPromise";
-import {createQueryStore} from "shared/lib/createQueryStore";
-import {handleLegacySubmission, handlePostedSubmission} from "shared/lib/redirectHelpers";
-import OQLTextArea, {GeneBoxType} from "shared/components/GeneSelectionBox/OQLTextArea";
+import LoadingIndicator from 'shared/components/loadingIndicator/LoadingIndicator';
+import onMobxPromise from 'shared/lib/onMobxPromise';
+import { createQueryStore } from 'shared/lib/createQueryStore';
+import {
+    handleLegacySubmission,
+    handlePostedSubmission,
+} from 'shared/lib/redirectHelpers';
+import OQLTextArea, {
+    GeneBoxType,
+} from 'shared/components/GeneSelectionBox/OQLTextArea';
 
 function initStore(appStore: AppStore, urlWrapper: ResultsViewURLWrapper) {
-    const resultsViewPageStore = new ResultsViewPageStore(
-        appStore,
-        urlWrapper
-    );
+    const resultsViewPageStore = new ResultsViewPageStore(appStore, urlWrapper);
 
     setWindowVariable('resultsViewPageStore', resultsViewPageStore);
 
     reaction(
         () => [resultsViewPageStore.studyIds, resultsViewPageStore.oqlText],
         () => {
-            if (resultsViewPageStore.studyIds.isComplete && resultsViewPageStore.oqlText) {
+            if (
+                resultsViewPageStore.studyIds.isComplete &&
+                resultsViewPageStore.oqlText
+            ) {
                 trackQuery(
                     resultsViewPageStore.studyIds.result!,
                     resultsViewPageStore.oqlText,
@@ -112,12 +117,17 @@ export default class ResultsViewPage extends React.Component<
 
         if (this.urlWrapper.hasSessionId) {
             onMobxPromise(this.urlWrapper.remoteSessionData, () => {
-                this.resultsViewPageStore = initStore(props.appStore, this.urlWrapper);
+                this.resultsViewPageStore = initStore(
+                    props.appStore,
+                    this.urlWrapper
+                );
             });
         } else {
-            this.resultsViewPageStore = initStore(props.appStore, this.urlWrapper);
+            this.resultsViewPageStore = initStore(
+                props.appStore,
+                this.urlWrapper
+            );
         }
-
     }
 
     private handleTabChange(id: string, replace?: boolean) {
@@ -366,9 +376,15 @@ export default class ResultsViewPage extends React.Component<
                             id={ResultsViewTab.NETWORK}
                             linkText={'Network'}
                         >
-                            <div className="alert alert-info">The Network tab has been retired. For similar
-                                functionality, please visit <a href="http://www.pathwaycommons.org/pcviz/"
-                                                               target="_blank">http://www.pathwaycommons.org/pcviz/</a>
+                            <div className="alert alert-info">
+                                The Network tab has been retired. For similar
+                                functionality, please visit{' '}
+                                <a
+                                    href="http://www.pathwaycommons.org/pcviz/"
+                                    target="_blank"
+                                >
+                                    http://www.pathwaycommons.org/pcviz/
+                                </a>
                             </div>
                         </MSKTab>
                     );
@@ -479,26 +495,39 @@ export default class ResultsViewPage extends React.Component<
         return isRoutedTo || (!isExcludedInList && !isExcluded);
     }
 
-    @computed get quickOQLSubmitButtion(){
-        return ( <>
-            <button className={"btn btn-primary btn-sm"} style={{marginLeft:10}} onClick={this.handleQuickOQLSubmission}>Submit Query</button>
-            &nbsp;
-            <button className={'btn btn-link btn-sm'} onClick={this.toggleOQLEditor}>Cancel</button>
-        </>)
+    @computed get quickOQLSubmitButtion() {
+        return (
+            <>
+                <button
+                    className={'btn btn-primary btn-sm'}
+                    style={{ marginLeft: 10 }}
+                    onClick={this.handleQuickOQLSubmission}
+                >
+                    Submit Query
+                </button>
+                &nbsp;
+                <button
+                    className={'btn btn-link btn-sm'}
+                    onClick={this.toggleOQLEditor}
+                >
+                    Cancel
+                </button>
+            </>
+        );
     }
 
     @autobind
     @action
-    handleQuickOQLSubmission(){
+    handleQuickOQLSubmission() {
         this.showOQLEditor = false;
         this.urlWrapper.updateURL({
-                                      gene_list:this.oqlSubmission
-                                  });
+            gene_list: this.oqlSubmission,
+        });
     }
 
     @autobind
     @action
-    toggleOQLEditor(){
+    toggleOQLEditor() {
         this.showOQLEditor = !this.showOQLEditor;
     }
 
@@ -511,7 +540,7 @@ export default class ResultsViewPage extends React.Component<
         });
     }
 
-    @observable oqlSubmission = "";
+    @observable oqlSubmission = '';
 
     @computed get pageContent() {
         if (this.resultsViewPageStore.invalidStudyIds.result.length > 0) {
@@ -524,7 +553,10 @@ export default class ResultsViewPage extends React.Component<
                         showDownloadTab={false}
                         showAlerts={true}
                         getQueryStore={() =>
-                            createQueryStore(this.urlWrapper.query, this.urlWrapper)
+                            createQueryStore(
+                                this.urlWrapper.query,
+                                this.urlWrapper
+                            )
                         }
                     />
                 </div>
@@ -554,14 +586,19 @@ export default class ResultsViewPage extends React.Component<
                         </div>
                     )}
                     {this.resultsViewPageStore.studies.isPending && (
-                        <LoadingIndicator isLoading={true} center={true} size={"big"}></LoadingIndicator>
+                        <LoadingIndicator
+                            isLoading={true}
+                            center={true}
+                            size={'big'}
+                        ></LoadingIndicator>
                     )}
                     {this.resultsViewPageStore.studies.isComplete && (
                         <>
                             <Helmet>
                                 <title>
                                     {buildResultsViewPageTitle(
-                                        this.resultsViewPageStore.hugoGeneSymbols,
+                                        this.resultsViewPageStore
+                                            .hugoGeneSymbols,
                                         this.resultsViewPageStore.studies.result
                                     )}
                                 </title>
@@ -572,41 +609,44 @@ export default class ResultsViewPage extends React.Component<
                                         routingStore={this.props.routing}
                                         store={this.resultsViewPageStore}
                                         onToggleQueryFormVisibility={visible => {
-                                            runInAction(()=>{
+                                            runInAction(() => {
                                                 this.showTabs = visible;
                                                 this.showOQLEditor = false;
                                             });
                                         }}
-                                        onToggleOQLEditUIVisibility={this.toggleOQLEditor}
+                                        onToggleOQLEditUIVisibility={
+                                            this.toggleOQLEditor
+                                        }
                                     />
 
-                                    {
-                                        (this.showOQLEditor) && (
-                                            <div className={'quick_oql_edit'}>
-                                                <OQLTextArea
-                                                    inputGeneQuery={this.resultsViewPageStore.oqlText}
-                                                    validateInputGeneQuery={true}
-                                                    callback={(...args)=>{
-                                                        this.oqlSubmission = args[2];
-                                                    }}
-                                                    location={GeneBoxType.DEFAULT}
-                                                    submitButton={this.quickOQLSubmitButtion}
-                                                />
-
-                                            </div>
-                                        )
-                                    }
-
+                                    {this.showOQLEditor && (
+                                        <div className={'quick_oql_edit'}>
+                                            <OQLTextArea
+                                                inputGeneQuery={
+                                                    this.resultsViewPageStore
+                                                        .oqlText
+                                                }
+                                                validateInputGeneQuery={true}
+                                                callback={(...args) => {
+                                                    this.oqlSubmission =
+                                                        args[2];
+                                                }}
+                                                location={GeneBoxType.DEFAULT}
+                                                submitButton={
+                                                    this.quickOQLSubmitButtion
+                                                }
+                                            />
+                                        </div>
+                                    )}
                                 </div>
 
                                 {// we don't show the result tabs if we don't have valid query
                                 this.showTabs &&
                                     !this.resultsViewPageStore.genesInvalid &&
-                                    !this.resultsViewPageStore.isQueryInvalid && (
+                                    !this.resultsViewPageStore
+                                        .isQueryInvalid && (
                                         <MSKTabs
-                                            key={
-                                                this.urlWrapper.hash
-                                            }
+                                            key={this.urlWrapper.hash}
                                             activeTabId={
                                                 this.resultsViewPageStore.tabId
                                             }
@@ -629,9 +669,13 @@ export default class ResultsViewPage extends React.Component<
     }
 
     public render() {
-
-        if (this.urlWrapper.isPendingSession || this.urlWrapper.isLoadingSession) {
-            return <LoadingIndicator isLoading={true} center={true} size={"big"}/>
+        if (
+            this.urlWrapper.isPendingSession ||
+            this.urlWrapper.isLoadingSession
+        ) {
+            return (
+                <LoadingIndicator isLoading={true} center={true} size={'big'} />
+            );
         }
 
         if (
@@ -639,10 +683,7 @@ export default class ResultsViewPage extends React.Component<
             !this.resultsViewPageStore.tabId
         ) {
             setTimeout(() => {
-                this.handleTabChange(
-                    this.resultsViewPageStore.tabId,
-                    true
-                );
+                this.handleTabChange(this.resultsViewPageStore.tabId, true);
             });
             return null;
         } else {
diff --git a/src/pages/resultsView/ResultsViewPageHelpers.spec.ts b/src/pages/resultsView/ResultsViewPageHelpers.spec.ts
index 8bc0ae0957e..1069944e09b 100644
--- a/src/pages/resultsView/ResultsViewPageHelpers.spec.ts
+++ b/src/pages/resultsView/ResultsViewPageHelpers.spec.ts
@@ -1,57 +1,112 @@
-import {assert} from "chai";
-import {getTabId, parseSamplesSpecifications, ResultsViewTab} from "./ResultsViewPageHelpers";
-import {SamplesSpecificationElement} from "./ResultsViewPageStore";
-
-describe("ResultsViewPageHelpers", () => {
-    describe("getTabId", ()=>{
-        it("gets the tab id correctly", ()=>{
-            assert.equal(getTabId("results"), undefined);
-            assert.equal(getTabId("results/"), undefined);
-            assert.equal(getTabId("results/asdf"), "asdf" as any);
-            assert.equal(getTabId("results/oncoprint"), ResultsViewTab.ONCOPRINT);
-            assert.equal(getTabId("results/oncoprint/"), ResultsViewTab.ONCOPRINT);
+import { assert } from 'chai';
+import {
+    getTabId,
+    parseSamplesSpecifications,
+    ResultsViewTab,
+} from './ResultsViewPageHelpers';
+import { SamplesSpecificationElement } from './ResultsViewPageStore';
+
+describe('ResultsViewPageHelpers', () => {
+    describe('getTabId', () => {
+        it('gets the tab id correctly', () => {
+            assert.equal(getTabId('results'), undefined);
+            assert.equal(getTabId('results/'), undefined);
+            assert.equal(getTabId('results/asdf'), 'asdf' as any);
+            assert.equal(
+                getTabId('results/oncoprint'),
+                ResultsViewTab.ONCOPRINT
+            );
+            assert.equal(
+                getTabId('results/oncoprint/'),
+                ResultsViewTab.ONCOPRINT
+            );
         });
     });
 
-    describe('parseSamplesSpecifications', ()=>{
-
-        it('should parse session caseids with \\r/\\n delimter',()=>{
-
-            let query = {"Action":"Submit","case_ids":"msk_impact_2017:P-0000036-T01-IM3\r\nmsk_impact_2017:P-0010863-T01-IM5","Z_SCORE_THRESHOLD":"2","tab_index":"tab_visualize","data_priority":"0","case_set_id":"-1","gene_list":"EGFR ERBB2 MET RET ROS1 ALK KRAS NRAS NF1 BRAF MAP2K1","RPPA_SCORE_THRESHOLD":"2","cancer_study_list":"msk_impact_2017,luad_broad,luad_tcga_pub,lung_msk_2017,luad_mskcc_2015"};
-
-            let cancerStudyIds = ["msk_impact_2017","luad_broad","luad_tcga_pub","lung_msk_2017","luad_mskcc_2015"];
-
-            const ret = parseSamplesSpecifications(query.case_ids, undefined, query.case_set_id, cancerStudyIds);
+    describe('parseSamplesSpecifications', () => {
+        it('should parse session caseids with \\r/\\n delimter', () => {
+            let query = {
+                Action: 'Submit',
+                case_ids:
+                    'msk_impact_2017:P-0000036-T01-IM3\r\nmsk_impact_2017:P-0010863-T01-IM5',
+                Z_SCORE_THRESHOLD: '2',
+                tab_index: 'tab_visualize',
+                data_priority: '0',
+                case_set_id: '-1',
+                gene_list:
+                    'EGFR ERBB2 MET RET ROS1 ALK KRAS NRAS NF1 BRAF MAP2K1',
+                RPPA_SCORE_THRESHOLD: '2',
+                cancer_study_list:
+                    'msk_impact_2017,luad_broad,luad_tcga_pub,lung_msk_2017,luad_mskcc_2015',
+            };
+
+            let cancerStudyIds = [
+                'msk_impact_2017',
+                'luad_broad',
+                'luad_tcga_pub',
+                'lung_msk_2017',
+                'luad_mskcc_2015',
+            ];
+
+            const ret = parseSamplesSpecifications(
+                query.case_ids,
+                undefined,
+                query.case_set_id,
+                cancerStudyIds
+            );
 
             // @ts-ignore
-            const expectedResult = [{"studyId":"msk_impact_2017","sampleId":"P-0000036-T01-IM3"} as SamplesSpecificationElement,{"studyId":"msk_impact_2017","sampleId":"P-0010863-T01-IM5"}];
+            const expectedResult = [
+                {
+                    studyId: 'msk_impact_2017',
+                    sampleId: 'P-0000036-T01-IM3',
+                } as SamplesSpecificationElement,
+                { studyId: 'msk_impact_2017', sampleId: 'P-0010863-T01-IM5' },
+            ];
 
             assert.deepEqual(ret, expectedResult);
-
         });
 
-        it('should parse session caseids with + delimiter',()=>{
-
-            let query = {"Action":"Submit","case_ids":"msk_impact_2017:P-0000036-T01-IM3+msk_impact_2017:P-0010863-T01-IM5","Z_SCORE_THRESHOLD":"2","tab_index":"tab_visualize","data_priority":"0","case_set_id":"-1","gene_list":"EGFR ERBB2 MET RET ROS1 ALK KRAS NRAS NF1 BRAF MAP2K1","RPPA_SCORE_THRESHOLD":"2","cancer_study_list":"msk_impact_2017,luad_broad,luad_tcga_pub,lung_msk_2017,luad_mskcc_2015"};
+        it('should parse session caseids with + delimiter', () => {
+            let query = {
+                Action: 'Submit',
+                case_ids:
+                    'msk_impact_2017:P-0000036-T01-IM3+msk_impact_2017:P-0010863-T01-IM5',
+                Z_SCORE_THRESHOLD: '2',
+                tab_index: 'tab_visualize',
+                data_priority: '0',
+                case_set_id: '-1',
+                gene_list:
+                    'EGFR ERBB2 MET RET ROS1 ALK KRAS NRAS NF1 BRAF MAP2K1',
+                RPPA_SCORE_THRESHOLD: '2',
+                cancer_study_list:
+                    'msk_impact_2017,luad_broad,luad_tcga_pub,lung_msk_2017,luad_mskcc_2015',
+            };
 
             // @ts-ignore
-            let cancerStudyIds = ["msk_impact_2017","luad_broad","luad_tcga_pub","lung_msk_2017","luad_mskcc_2015"];
-
-            const ret = parseSamplesSpecifications(query.case_ids, undefined, query.case_set_id , cancerStudyIds);
+            let cancerStudyIds = [
+                'msk_impact_2017',
+                'luad_broad',
+                'luad_tcga_pub',
+                'lung_msk_2017',
+                'luad_mskcc_2015',
+            ];
+
+            const ret = parseSamplesSpecifications(
+                query.case_ids,
+                undefined,
+                query.case_set_id,
+                cancerStudyIds
+            );
 
             // @ts-ignore
-            const expectedResult = [{"studyId":"msk_impact_2017","sampleId":"P-0000036-T01-IM3"},{"studyId":"msk_impact_2017","sampleId":"P-0010863-T01-IM5"}];
+            const expectedResult = [
+                { studyId: 'msk_impact_2017', sampleId: 'P-0000036-T01-IM3' },
+                { studyId: 'msk_impact_2017', sampleId: 'P-0010863-T01-IM5' },
+            ];
 
             // @ts-ignore
             assert.deepEqual(ret, expectedResult);
-
-        })
-
-
-
+        });
     });
-
-
-
-
 });
diff --git a/src/pages/resultsView/ResultsViewPageHelpers.ts b/src/pages/resultsView/ResultsViewPageHelpers.ts
index 59d3d9d983b..ed2298f95ef 100644
--- a/src/pages/resultsView/ResultsViewPageHelpers.ts
+++ b/src/pages/resultsView/ResultsViewPageHelpers.ts
@@ -1,24 +1,24 @@
-import * as _ from "lodash";
+import * as _ from 'lodash';
 
-import {SamplesSpecificationElement} from "./ResultsViewPageStore";
-import {VirtualStudy} from "../../shared/model/VirtualStudy";
+import { SamplesSpecificationElement } from './ResultsViewPageStore';
+import { VirtualStudy } from '../../shared/model/VirtualStudy';
 
 export enum ResultsViewTab {
-    ONCOPRINT="oncoprint",
-    CANCER_TYPES_SUMMARY="cancerTypesSummary",
-    MUTUAL_EXCLUSIVITY="mutualExclusivity",
-    PLOTS="plots",
-    MUTATIONS="mutations",
-    COEXPRESSION="coexpression",
-    ENRICHMENTS="enrichments",
-    SURVIVAL="survival",
-    CN_SEGMENTS="cnSegments",
-    NETWORK="network",
-    EXPRESSION="expression",
-    DOWNLOAD="download"
+    ONCOPRINT = 'oncoprint',
+    CANCER_TYPES_SUMMARY = 'cancerTypesSummary',
+    MUTUAL_EXCLUSIVITY = 'mutualExclusivity',
+    PLOTS = 'plots',
+    MUTATIONS = 'mutations',
+    COEXPRESSION = 'coexpression',
+    ENRICHMENTS = 'enrichments',
+    SURVIVAL = 'survival',
+    CN_SEGMENTS = 'cnSegments',
+    NETWORK = 'network',
+    EXPRESSION = 'expression',
+    DOWNLOAD = 'download',
 }
 
-export function getTabId(pathname:string) {
+export function getTabId(pathname: string) {
     const match = pathname.match(/results\/([^\/]+)/);
     if (match) {
         return match[1] as ResultsViewTab;
@@ -27,40 +27,50 @@ export function getTabId(pathname:string) {
     }
 }
 
-export function parseConfigDisabledTabs(configDisabledTabsParam:string){
-    const oldTabToNewTabRoute:{[legacyTabId:string]:ResultsViewTab} = {
-        "oncoprint":ResultsViewTab.ONCOPRINT,
-        "cancer_types_summary":ResultsViewTab.CANCER_TYPES_SUMMARY,
-        "mutual_exclusivity":ResultsViewTab.MUTUAL_EXCLUSIVITY,
-        "plots":ResultsViewTab.PLOTS,
-        "mutations":ResultsViewTab.MUTATIONS,
-        "co_expression":ResultsViewTab.COEXPRESSION,
-        "enrichments":ResultsViewTab.ENRICHMENTS,
-        "survival":ResultsViewTab.SURVIVAL,
-        "IGV":ResultsViewTab.CN_SEGMENTS,
-        "network":ResultsViewTab.NETWORK,
-        "expression":ResultsViewTab.EXPRESSION,
-        "download":ResultsViewTab.DOWNLOAD
+export function parseConfigDisabledTabs(configDisabledTabsParam: string) {
+    const oldTabToNewTabRoute: { [legacyTabId: string]: ResultsViewTab } = {
+        oncoprint: ResultsViewTab.ONCOPRINT,
+        cancer_types_summary: ResultsViewTab.CANCER_TYPES_SUMMARY,
+        mutual_exclusivity: ResultsViewTab.MUTUAL_EXCLUSIVITY,
+        plots: ResultsViewTab.PLOTS,
+        mutations: ResultsViewTab.MUTATIONS,
+        co_expression: ResultsViewTab.COEXPRESSION,
+        enrichments: ResultsViewTab.ENRICHMENTS,
+        survival: ResultsViewTab.SURVIVAL,
+        IGV: ResultsViewTab.CN_SEGMENTS,
+        network: ResultsViewTab.NETWORK,
+        expression: ResultsViewTab.EXPRESSION,
+        download: ResultsViewTab.DOWNLOAD,
     };
-    return configDisabledTabsParam.split(",").map((s)=>s.trim()).map(str=>{
-        if (str in oldTabToNewTabRoute) {
-            return oldTabToNewTabRoute[str];
-        } else {
-            return str;
-        }
-    });
+    return configDisabledTabsParam
+        .split(',')
+        .map(s => s.trim())
+        .map(str => {
+            if (str in oldTabToNewTabRoute) {
+                return oldTabToNewTabRoute[str];
+            } else {
+                return str;
+            }
+        });
 }
 
-export function substitutePhysicalStudiesForVirtualStudies(cancerStudyIds:string[], virtualStudies:VirtualStudy[]){
-
-    let physicalStudies:string[] = [];
+export function substitutePhysicalStudiesForVirtualStudies(
+    cancerStudyIds: string[],
+    virtualStudies: VirtualStudy[]
+) {
+    let physicalStudies: string[] = [];
 
     //if a study is a virtual study, substitute its physical study ids
-    const virtualStudiesKeyedById = _.keyBy(virtualStudies,(virtualStudy)=>virtualStudy.id);
-    cancerStudyIds.forEach((studyId)=>{
+    const virtualStudiesKeyedById = _.keyBy(
+        virtualStudies,
+        virtualStudy => virtualStudy.id
+    );
+    cancerStudyIds.forEach(studyId => {
         if (studyId in virtualStudiesKeyedById) {
             const virtualStudy = virtualStudiesKeyedById[studyId];
-            physicalStudies = physicalStudies.concat(virtualStudy.data.studies.map((study)=>study.id));
+            physicalStudies = physicalStudies.concat(
+                virtualStudy.data.studies.map(study => study.id)
+            );
         } else {
             physicalStudies.push(studyId);
         }
@@ -70,87 +80,104 @@ export function substitutePhysicalStudiesForVirtualStudies(cancerStudyIds:string
     // or is also contained by another selected virtual study
     // make sure physical study collection is unique
     return _.uniq(physicalStudies);
-
 }
 
-export function populateSampleSpecificationsFromVirtualStudies(samplesSpecifications:SamplesSpecificationElement[], virtualStudies:VirtualStudy[]){
-
-    const virtualStudiesKeyedById = _.keyBy(virtualStudies,(virtualStudy)=>virtualStudy.id);
-    const samplesSpecificationsKeyedByStudyId = _.keyBy(samplesSpecifications,(spec)=>spec.studyId);
+export function populateSampleSpecificationsFromVirtualStudies(
+    samplesSpecifications: SamplesSpecificationElement[],
+    virtualStudies: VirtualStudy[]
+) {
+    const virtualStudiesKeyedById = _.keyBy(
+        virtualStudies,
+        virtualStudy => virtualStudy.id
+    );
+    const samplesSpecificationsKeyedByStudyId = _.keyBy(
+        samplesSpecifications,
+        spec => spec.studyId
+    );
     // remove specs for virtual studies (since they mean nothing to api)
     // and then populate with ids
-    samplesSpecifications = _.filter(samplesSpecifications,(spec)=>!virtualStudiesKeyedById[spec.studyId]);
+    samplesSpecifications = _.filter(
+        samplesSpecifications,
+        spec => !virtualStudiesKeyedById[spec.studyId]
+    );
 
     // only add sample specs when this virtual study is in the samplesSpecifications
-    const selectedVirtualStudies = _.filter(virtualStudies, (virtualStudy) => samplesSpecificationsKeyedByStudyId[virtualStudy.id]);
-    const allSelectedVirtualStudySampleSpecs = _.flatMapDeep(selectedVirtualStudies.map((virtualStudy)=>{
-        return virtualStudy.data.studies.map((study)=>{
-            return study.samples.map((sampleId)=>{
-                return {
-                    studyId:study.id,
-                    sampleListId:undefined,
-                    sampleId:sampleId
-                } as SamplesSpecificationElement
-            })
-        }) as SamplesSpecificationElement[][];
-    }));
+    const selectedVirtualStudies = _.filter(
+        virtualStudies,
+        virtualStudy => samplesSpecificationsKeyedByStudyId[virtualStudy.id]
+    );
+    const allSelectedVirtualStudySampleSpecs = _.flatMapDeep(
+        selectedVirtualStudies.map(virtualStudy => {
+            return virtualStudy.data.studies.map(study => {
+                return study.samples.map(sampleId => {
+                    return {
+                        studyId: study.id,
+                        sampleListId: undefined,
+                        sampleId: sampleId,
+                    } as SamplesSpecificationElement;
+                });
+            }) as SamplesSpecificationElement[][];
+        })
+    );
 
     // ts not resolving type above and not sure why, so cast it
-    samplesSpecifications = samplesSpecifications.concat(allSelectedVirtualStudySampleSpecs as SamplesSpecificationElement[]);
+    samplesSpecifications = samplesSpecifications.concat(
+        allSelectedVirtualStudySampleSpecs as SamplesSpecificationElement[]
+    );
 
     return samplesSpecifications;
-
 }
 
 //testIt
 export function parseSamplesSpecifications(
-    case_ids:string,
-    sample_list_ids:string | undefined,
-    case_set_id:string,
-    cancerStudyIds:string[]
-): SamplesSpecificationElement[]{
-
+    case_ids: string,
+    sample_list_ids: string | undefined,
+    case_set_id: string,
+    cancerStudyIds: string[]
+): SamplesSpecificationElement[] {
     let samplesSpecifications: SamplesSpecificationElement[];
 
     if (case_ids && case_ids.length > 0) {
         const case_ids_parsed = case_ids.split(/\+|\s+/);
-        samplesSpecifications = case_ids_parsed.map((item:string)=>{
-            const split = item.split(":");
+        samplesSpecifications = case_ids_parsed.map((item: string) => {
+            const split = item.split(':');
             return {
-                studyId:split[0],
-                sampleId:split[1]
+                studyId: split[0],
+                sampleId: split[1],
             } as SamplesSpecificationElement;
         });
     } else if (sample_list_ids) {
-        samplesSpecifications = sample_list_ids.split(",").map((studyListPair:string)=>{
-            const pair = studyListPair.split(":");
-            return {
-                studyId:pair[0],
-                sampleListId:pair[1],
-                sampleId: undefined
-            }
-        });
-    } else if (case_set_id !== "all") {
+        samplesSpecifications = sample_list_ids
+            .split(',')
+            .map((studyListPair: string) => {
+                const pair = studyListPair.split(':');
+                return {
+                    studyId: pair[0],
+                    sampleListId: pair[1],
+                    sampleId: undefined,
+                };
+            });
+    } else if (case_set_id !== 'all') {
         // by definition if there is a case_set_id, there is only one study
-        samplesSpecifications = cancerStudyIds.map((studyId:string)=>{
+        samplesSpecifications = cancerStudyIds.map((studyId: string) => {
             return {
                 studyId: studyId,
                 sampleListId: case_set_id,
-                sampleId: undefined
+                sampleId: undefined,
             };
         });
-    } else if (case_set_id === "all") { // case_set_id IS equal to all
-        samplesSpecifications = cancerStudyIds.map((studyId:string)=>{
+    } else if (case_set_id === 'all') {
+        // case_set_id IS equal to all
+        samplesSpecifications = cancerStudyIds.map((studyId: string) => {
             return {
                 studyId,
-                sampleListId:`${studyId}_all`,
-                sampleId:undefined
-            }
+                sampleListId: `${studyId}_all`,
+                sampleId: undefined,
+            };
         });
     } else {
-        throw("INVALID QUERY");
+        throw 'INVALID QUERY';
     }
 
     return samplesSpecifications;
-
 }
diff --git a/src/pages/resultsView/ResultsViewPageStore.spec.ts b/src/pages/resultsView/ResultsViewPageStore.spec.ts
index 62cc43f64df..eb5e81dc43a 100644
--- a/src/pages/resultsView/ResultsViewPageStore.spec.ts
+++ b/src/pages/resultsView/ResultsViewPageStore.spec.ts
@@ -1,160 +1,198 @@
-import {assert} from 'chai';
-import {buildDefaultOQLProfile, extendSamplesWithCancerType} from './ResultsViewPageStore';
-import {CancerStudy, ClinicalData, Sample} from "../../shared/api/generated/CBioPortalAPI";
+import { assert } from 'chai';
+import {
+    buildDefaultOQLProfile,
+    extendSamplesWithCancerType,
+} from './ResultsViewPageStore';
+import {
+    CancerStudy,
+    ClinicalData,
+    Sample,
+} from '../../shared/api/generated/CBioPortalAPI';
 
 describe('buildDefaultOQLProfile', () => {
-
     it('produces correct default queryies based on alteration profiles and zscore/rppa', () => {
-        assert.equal(buildDefaultOQLProfile(['COPY_NUMBER_ALTERATION'], 2, 2), 'AMP HOMDEL');
-        assert.equal(buildDefaultOQLProfile(['MUTATION_EXTENDED'], 2, 2), 'MUT FUSION');
-        assert.equal(buildDefaultOQLProfile(['MUTATION_EXTENDED', 'COPY_NUMBER_ALTERATION'], 2, 2), 'MUT FUSION AMP HOMDEL');
-        assert.equal(buildDefaultOQLProfile(['MUTATION_EXTENDED', 'MRNA_EXPRESSION'], 2, 2), 'MUT FUSION EXP>=2 EXP<=-2');
-        assert.equal(buildDefaultOQLProfile(['MUTATION_EXTENDED', 'PROTEIN_LEVEL'], 2, 2), 'MUT FUSION PROT>=2 PROT<=-2');
+        assert.equal(
+            buildDefaultOQLProfile(['COPY_NUMBER_ALTERATION'], 2, 2),
+            'AMP HOMDEL'
+        );
+        assert.equal(
+            buildDefaultOQLProfile(['MUTATION_EXTENDED'], 2, 2),
+            'MUT FUSION'
+        );
+        assert.equal(
+            buildDefaultOQLProfile(
+                ['MUTATION_EXTENDED', 'COPY_NUMBER_ALTERATION'],
+                2,
+                2
+            ),
+            'MUT FUSION AMP HOMDEL'
+        );
+        assert.equal(
+            buildDefaultOQLProfile(
+                ['MUTATION_EXTENDED', 'MRNA_EXPRESSION'],
+                2,
+                2
+            ),
+            'MUT FUSION EXP>=2 EXP<=-2'
+        );
+        assert.equal(
+            buildDefaultOQLProfile(
+                ['MUTATION_EXTENDED', 'PROTEIN_LEVEL'],
+                2,
+                2
+            ),
+            'MUT FUSION PROT>=2 PROT<=-2'
+        );
     });
-
 });
 
-
 describe('extendSamplesWithCancerType', () => {
-
-    var arg2 = [{
-        "name": "NCI-60 Cell Lines (NCI, Cancer Res. 2012)",
-        "shortName": "NCI-60",
-        "description": "NCI-60 cell line project; raw data at <A HREF=\"http://discover.nci.nih.gov/cellminer/loadDownload.do\">CellMiner</A>.",
-        "publicStudy": true,
-        "pmid": "22802077",
-        "citation": "Reinhold et al., Cancer Res. 2012",
-        "groups": "PUBLIC",
-        "status": 0,
-        "allSampleCount": 60,
-        "sequencedSampleCount": 60,
-        "cnaSampleCount": 60,
-        "mrnaRnaSeqSampleCount": 0,
-        "mrnaRnaSeqV2SampleCount": 0,
-        "mrnaMicroarraySampleCount": 60,
-        "miRnaSampleCount": 0,
-        "methylationHm27SampleCount": 0,
-        "rppaSampleCount": 0,
-        "completeSampleCount": 0,
-        "studyId": "cellline_nci60",
-        "cancerType": {
-            "name": "Mixed Cancer Types",
-            "clinicalTrialKeywords": "mixed cancer types",
-            "dedicatedColor": "Black",
-            "shortName": "MIXED",
-            "parent": "cup",
-            "cancerTypeId": "mixed"
-        }
-    }] as CancerStudy[];
+    var arg2 = [
+        {
+            name: 'NCI-60 Cell Lines (NCI, Cancer Res. 2012)',
+            shortName: 'NCI-60',
+            description:
+                'NCI-60 cell line project; raw data at <A HREF="http://discover.nci.nih.gov/cellminer/loadDownload.do">CellMiner</A>.',
+            publicStudy: true,
+            pmid: '22802077',
+            citation: 'Reinhold et al., Cancer Res. 2012',
+            groups: 'PUBLIC',
+            status: 0,
+            allSampleCount: 60,
+            sequencedSampleCount: 60,
+            cnaSampleCount: 60,
+            mrnaRnaSeqSampleCount: 0,
+            mrnaRnaSeqV2SampleCount: 0,
+            mrnaMicroarraySampleCount: 60,
+            miRnaSampleCount: 0,
+            methylationHm27SampleCount: 0,
+            rppaSampleCount: 0,
+            completeSampleCount: 0,
+            studyId: 'cellline_nci60',
+            cancerType: {
+                name: 'Mixed Cancer Types',
+                clinicalTrialKeywords: 'mixed cancer types',
+                dedicatedColor: 'Black',
+                shortName: 'MIXED',
+                parent: 'cup',
+                cancerTypeId: 'mixed',
+            },
+        },
+    ] as CancerStudy[];
 
     var arg0: Sample[];
-    beforeEach(()=>{
-        arg0 = [{
-            "uniqueSampleKey": "QlRfNTQ5OmNlbGxsaW5lX25jaTYw",
-            "uniquePatientKey": "QlRfNTQ5OmNlbGxsaW5lX25jaTYw",
-            "sampleType": "Primary Solid Tumor",
-            "sampleId": "BT_549",
-            "patientId": "BT_549",
-            "studyId": "cellline_nci60"
-        }] as Sample[];
+    beforeEach(() => {
+        arg0 = [
+            {
+                uniqueSampleKey: 'QlRfNTQ5OmNlbGxsaW5lX25jaTYw',
+                uniquePatientKey: 'QlRfNTQ5OmNlbGxsaW5lX25jaTYw',
+                sampleType: 'Primary Solid Tumor',
+                sampleId: 'BT_549',
+                patientId: 'BT_549',
+                studyId: 'cellline_nci60',
+            },
+        ] as Sample[];
     });
 
-
-
     it('when both CANCER_TYPE and CANCER_TYPE_DETAILED are present, should populated appropriately', () => {
-
-        var arg1 = [{
-            "uniqueSampleKey": "QlRfNTQ5OmNlbGxsaW5lX25jaTYw",
-            "uniquePatientKey": "QlRfNTQ5OmNlbGxsaW5lX25jaTYw",
-            "sampleId": "BT_549",
-            "patientId": "BT_549",
-            "studyId": "cellline_nci60",
-            "clinicalAttributeId": "CANCER_TYPE",
-            "value": "Breast Sarcoma"
-        }, {
-            "uniqueSampleKey": "QlRfNTQ5OmNlbGxsaW5lX25jaTYw",
-            "uniquePatientKey": "QlRfNTQ5OmNlbGxsaW5lX25jaTYw",
-            "sampleId": "BT_549",
-            "patientId": "BT_549",
-            "studyId": "cellline_nci60",
-            "clinicalAttributeId": "CANCER_TYPE_DETAILED",
-            "value": "Breast"
-        }] as ClinicalData[];
+        var arg1 = [
+            {
+                uniqueSampleKey: 'QlRfNTQ5OmNlbGxsaW5lX25jaTYw',
+                uniquePatientKey: 'QlRfNTQ5OmNlbGxsaW5lX25jaTYw',
+                sampleId: 'BT_549',
+                patientId: 'BT_549',
+                studyId: 'cellline_nci60',
+                clinicalAttributeId: 'CANCER_TYPE',
+                value: 'Breast Sarcoma',
+            },
+            {
+                uniqueSampleKey: 'QlRfNTQ5OmNlbGxsaW5lX25jaTYw',
+                uniquePatientKey: 'QlRfNTQ5OmNlbGxsaW5lX25jaTYw',
+                sampleId: 'BT_549',
+                patientId: 'BT_549',
+                studyId: 'cellline_nci60',
+                clinicalAttributeId: 'CANCER_TYPE_DETAILED',
+                value: 'Breast',
+            },
+        ] as ClinicalData[];
 
         const ret = extendSamplesWithCancerType(arg0, arg1, arg2);
 
-        const expectedResult = [{
-            "uniqueSampleKey": "QlRfNTQ5OmNlbGxsaW5lX25jaTYw",
-            "uniquePatientKey": "QlRfNTQ5OmNlbGxsaW5lX25jaTYw",
-            "sampleType": "Primary Solid Tumor",
-            "sampleId": "BT_549",
-            "patientId": "BT_549",
-            "studyId": "cellline_nci60",
-            "cancerType": "Breast Sarcoma",
-            "cancerTypeDetailed": "Breast"
-        }];
+        const expectedResult = [
+            {
+                uniqueSampleKey: 'QlRfNTQ5OmNlbGxsaW5lX25jaTYw',
+                uniquePatientKey: 'QlRfNTQ5OmNlbGxsaW5lX25jaTYw',
+                sampleType: 'Primary Solid Tumor',
+                sampleId: 'BT_549',
+                patientId: 'BT_549',
+                studyId: 'cellline_nci60',
+                cancerType: 'Breast Sarcoma',
+                cancerTypeDetailed: 'Breast',
+            },
+        ];
 
         assert.deepEqual(ret, expectedResult);
-
     });
 
     it('when only CANCER_TYPE_DETAILED are present, cancerType should fall back to that of study', () => {
-
-        var arg1 = [{
-            "uniqueSampleKey": "QlRfNTQ5OmNlbGxsaW5lX25jaTYw",
-            "uniquePatientKey": "QlRfNTQ5OmNlbGxsaW5lX25jaTYw",
-            "sampleId": "BT_549",
-            "patientId": "BT_549",
-            "studyId": "cellline_nci60",
-            "clinicalAttributeId": "CANCER_TYPE_DETAILED",
-            "value": "Breast"
-        }] as ClinicalData[];
+        var arg1 = [
+            {
+                uniqueSampleKey: 'QlRfNTQ5OmNlbGxsaW5lX25jaTYw',
+                uniquePatientKey: 'QlRfNTQ5OmNlbGxsaW5lX25jaTYw',
+                sampleId: 'BT_549',
+                patientId: 'BT_549',
+                studyId: 'cellline_nci60',
+                clinicalAttributeId: 'CANCER_TYPE_DETAILED',
+                value: 'Breast',
+            },
+        ] as ClinicalData[];
 
         const ret = extendSamplesWithCancerType(arg0, arg1, arg2);
 
-        const expectedResult = [{
-            "uniqueSampleKey": "QlRfNTQ5OmNlbGxsaW5lX25jaTYw",
-            "uniquePatientKey": "QlRfNTQ5OmNlbGxsaW5lX25jaTYw",
-            "sampleType": "Primary Solid Tumor",
-            "sampleId": "BT_549",
-            "patientId": "BT_549",
-            "studyId": "cellline_nci60",
-            "cancerType": "Mixed Cancer Types",
-            "cancerTypeDetailed": "Breast"
-        }];
+        const expectedResult = [
+            {
+                uniqueSampleKey: 'QlRfNTQ5OmNlbGxsaW5lX25jaTYw',
+                uniquePatientKey: 'QlRfNTQ5OmNlbGxsaW5lX25jaTYw',
+                sampleType: 'Primary Solid Tumor',
+                sampleId: 'BT_549',
+                patientId: 'BT_549',
+                studyId: 'cellline_nci60',
+                cancerType: 'Mixed Cancer Types',
+                cancerTypeDetailed: 'Breast',
+            },
+        ];
 
         assert.deepEqual(ret[0], expectedResult[0]);
-
     });
 
     it('when CANCER_TYPE_DETAILED missing, cancerTypeDetailed should be CANCER_TYPE', () => {
-
-        var arg1 = [{
-            "uniqueSampleKey": "QlRfNTQ5OmNlbGxsaW5lX25jaTYw",
-            "uniquePatientKey": "QlRfNTQ5OmNlbGxsaW5lX25jaTYw",
-            "sampleId": "BT_549",
-            "patientId": "BT_549",
-            "studyId": "cellline_nci60",
-            "clinicalAttributeId": "CANCER_TYPE",
-            "value": "Breast"
-        }] as ClinicalData[];
+        var arg1 = [
+            {
+                uniqueSampleKey: 'QlRfNTQ5OmNlbGxsaW5lX25jaTYw',
+                uniquePatientKey: 'QlRfNTQ5OmNlbGxsaW5lX25jaTYw',
+                sampleId: 'BT_549',
+                patientId: 'BT_549',
+                studyId: 'cellline_nci60',
+                clinicalAttributeId: 'CANCER_TYPE',
+                value: 'Breast',
+            },
+        ] as ClinicalData[];
 
         const ret = extendSamplesWithCancerType(arg0, arg1, arg2);
 
-        const expectedResult = [{
-            "uniqueSampleKey": "QlRfNTQ5OmNlbGxsaW5lX25jaTYw",
-            "uniquePatientKey": "QlRfNTQ5OmNlbGxsaW5lX25jaTYw",
-            "sampleType": "Primary Solid Tumor",
-            "sampleId": "BT_549",
-            "patientId": "BT_549",
-            "studyId": "cellline_nci60",
-            "cancerType": "Breast",
-            "cancerTypeDetailed": "Breast"
-        }];
+        const expectedResult = [
+            {
+                uniqueSampleKey: 'QlRfNTQ5OmNlbGxsaW5lX25jaTYw',
+                uniquePatientKey: 'QlRfNTQ5OmNlbGxsaW5lX25jaTYw',
+                sampleType: 'Primary Solid Tumor',
+                sampleId: 'BT_549',
+                patientId: 'BT_549',
+                studyId: 'cellline_nci60',
+                cancerType: 'Breast',
+                cancerTypeDetailed: 'Breast',
+            },
+        ];
 
         assert.deepEqual(ret[0], expectedResult[0]);
-
     });
-
 });
-
diff --git a/src/pages/resultsView/ResultsViewPageStore.ts b/src/pages/resultsView/ResultsViewPageStore.ts
index 0a3dcde3310..a66f06f8237 100644
--- a/src/pages/resultsView/ResultsViewPageStore.ts
+++ b/src/pages/resultsView/ResultsViewPageStore.ts
@@ -25,10 +25,10 @@ import {
     SampleFilter,
     SampleIdentifier,
     SampleList,
-    SampleMolecularIdentifier
+    SampleMolecularIdentifier,
 } from 'shared/api/generated/CBioPortalAPI';
 import client from 'shared/api/cbioportalClientInstance';
-import { action, computed, observable, ObservableMap , reaction} from 'mobx';
+import { action, computed, observable, ObservableMap, reaction } from 'mobx';
 import {
     remoteData,
     generateQueryVariantId,
@@ -36,7 +36,7 @@ import {
     CancerGene,
     getProteinPositionFromProteinChange,
     IndicatorQueryResp,
-    VariantAnnotation
+    VariantAnnotation,
 } from 'cbioportal-frontend-commons';
 import { cached, labelMobxPromises, MobxPromise } from 'mobxpromise';
 import OncoKbEvidenceCache from 'shared/cache/OncoKbEvidenceCache';
@@ -66,15 +66,17 @@ import {
     isMutationProfile,
     ONCOKB_DEFAULT,
 } from 'shared/lib/StoreUtils';
-import {IHotspotIndex, indexHotspotsData} from 'react-mutation-mapper';
-import {fetchHotspotsData} from 'shared/lib/CancerHotspotsUtils';
+import { IHotspotIndex, indexHotspotsData } from 'react-mutation-mapper';
+import { fetchHotspotsData } from 'shared/lib/CancerHotspotsUtils';
 import ResultsViewMutationMapperStore from './mutation/ResultsViewMutationMapperStore';
 import AppConfig from 'appConfig';
 import * as _ from 'lodash';
-import {toSampleUuid} from '../../shared/lib/UuidUtils';
+import { toSampleUuid } from '../../shared/lib/UuidUtils';
 import MutationDataCache from '../../shared/cache/MutationDataCache';
 import { PatientSurvival } from '../../shared/model/PatientSurvival';
-import AccessorsForOqlFilter, {SimplifiedMutationType,} from '../../shared/lib/oql/AccessorsForOqlFilter';
+import AccessorsForOqlFilter, {
+    SimplifiedMutationType,
+} from '../../shared/lib/oql/AccessorsForOqlFilter';
 import {
     doesQueryContainMutationOQL,
     doesQueryContainOQL,
@@ -91,7 +93,7 @@ import GenesetCorrelatedGeneCache from '../../shared/cache/GenesetCorrelatedGene
 import TreatmentMolecularDataCache from '../../shared/cache/TreatmentMolecularDataCache';
 import GeneCache from '../../shared/cache/GeneCache';
 import GenesetCache from '../../shared/cache/GenesetCache';
-import {IOncoKbData} from '../../shared/model/OncoKB';
+import { IOncoKbData } from '../../shared/model/OncoKB';
 import {
     AlterationEnrichment,
     CosmicMutation,
@@ -101,12 +103,18 @@ import {
     MolecularProfileCasesGroupFilter,
 } from '../../shared/api/generated/CBioPortalAPIInternal';
 import internalClient from '../../shared/api/cbioportalInternalClientInstance';
-import {getAlterationString} from '../../shared/lib/CopyNumberUtils';
+import { getAlterationString } from '../../shared/lib/CopyNumberUtils';
 import memoize from 'memoize-weak-decorator';
 import request from 'superagent';
-import {countMutations, mutationCountByPositionKey,} from './mutationCountHelpers';
-import {getPatientSurvivals} from './SurvivalStoreHelper';
-import {CancerStudyQueryUrlParams, QueryStore,} from 'shared/components/query/QueryStore';
+import {
+    countMutations,
+    mutationCountByPositionKey,
+} from './mutationCountHelpers';
+import { getPatientSurvivals } from './SurvivalStoreHelper';
+import {
+    CancerStudyQueryUrlParams,
+    QueryStore,
+} from 'shared/components/query/QueryStore';
 import {
     OncoprintAnalysisCaseType,
     annotateMolecularDatum,
@@ -129,25 +137,29 @@ import {
     excludeMutationAndSVProfiles,
 } from './ResultsViewPageStoreUtils';
 import MobxPromiseCache from '../../shared/lib/MobxPromiseCache';
-import {isSampleProfiledInMultiple} from '../../shared/lib/isSampleProfiled';
-import {BookmarkLinks} from '../../shared/model/BookmarkLinks';
-import {getBitlyServiceUrl} from '../../shared/api/urls';
+import { isSampleProfiledInMultiple } from '../../shared/lib/isSampleProfiled';
+import { BookmarkLinks } from '../../shared/model/BookmarkLinks';
+import { getBitlyServiceUrl } from '../../shared/api/urls';
 import url from 'url';
 import ClinicalDataCache, {
     clinicalAttributeIsINCOMPARISONGROUP,
     SpecialAttribute,
 } from '../../shared/cache/ClinicalDataCache';
-import {getDefaultMolecularProfiles} from '../../shared/lib/getDefaultMolecularProfiles';
-import {ServerConfigHelpers} from '../../config/config';
+import { getDefaultMolecularProfiles } from '../../shared/lib/getDefaultMolecularProfiles';
+import { ServerConfigHelpers } from '../../config/config';
 import {
     parseSamplesSpecifications,
     populateSampleSpecificationsFromVirtualStudies,
     ResultsViewTab,
     substitutePhysicalStudiesForVirtualStudies,
 } from './ResultsViewPageHelpers';
-import {filterAndSortProfiles, getGenesetProfiles, sortRnaSeqProfilesToTop,} from './coExpression/CoExpressionTabUtils';
-import {isRecurrentHotspot} from '../../shared/lib/AnnotationUtils';
-import {generateDownloadFilenamePrefixByStudies} from 'shared/lib/FilenameUtils';
+import {
+    filterAndSortProfiles,
+    getGenesetProfiles,
+    sortRnaSeqProfilesToTop,
+} from './coExpression/CoExpressionTabUtils';
+import { isRecurrentHotspot } from '../../shared/lib/AnnotationUtils';
+import { generateDownloadFilenamePrefixByStudies } from 'shared/lib/FilenameUtils';
 import {
     convertComparisonGroupClinicalAttribute,
     makeComparisonGroupClinicalAttributes,
@@ -161,16 +173,16 @@ import {
     pickMutationEnrichmentProfiles,
     pickProteinEnrichmentProfiles,
 } from './enrichments/EnrichmentsUtil';
-import {SURVIVAL_CHART_ATTRIBUTES} from './survival/SurvivalChart';
+import { SURVIVAL_CHART_ATTRIBUTES } from './survival/SurvivalChart';
 import sessionServiceClient from '../../shared/api/sessionServiceInstance';
-import {VirtualStudy} from 'shared/model/VirtualStudy';
-import {ISurvivalDescription} from './survival/SurvivalDescriptionTable';
+import { VirtualStudy } from 'shared/model/VirtualStudy';
+import { ISurvivalDescription } from './survival/SurvivalDescriptionTable';
 import comparisonClient from '../../shared/api/comparisonGroupClientInstance';
 import { Group } from '../../shared/api/ComparisonGroupClient';
 import { AppStore } from '../../AppStore';
 import { getNumSamples } from '../groupComparison/GroupComparisonUtils';
 import autobind from 'autobind-decorator';
-import {DEFAULT_GENOME} from 'pages/resultsView/ResultsViewPageStoreUtils';
+import { DEFAULT_GENOME } from 'pages/resultsView/ResultsViewPageStoreUtils';
 import {
     ChartMeta,
     getChartMetaDataType,
@@ -179,13 +191,19 @@ import {
     getPriorityByClinicalAttribute,
     StudyWithSamples,
     UniqueKey,
-    getUniqueKey
+    getUniqueKey,
 } from 'pages/studyView/StudyViewUtils';
-import {FRACTION_GENOME_ALTERED, MUTATION_COUNT,} from 'pages/studyView/StudyViewPageStore';
+import {
+    FRACTION_GENOME_ALTERED,
+    MUTATION_COUNT,
+} from 'pages/studyView/StudyViewPageStore';
 import { IVirtualStudyProps } from 'pages/studyView/virtualStudy/VirtualStudy';
 import { decideMolecularProfileSortingOrder } from './download/DownloadUtils';
-import ResultsViewURLWrapper from "pages/resultsView/ResultsViewURLWrapper";
-import { Treatment, fetchTreatmentByMolecularProfileIds } from 'shared/lib/GenericAssayUtils/TreatmentUtils';
+import ResultsViewURLWrapper from 'pages/resultsView/ResultsViewURLWrapper';
+import {
+    Treatment,
+    fetchTreatmentByMolecularProfileIds,
+} from 'shared/lib/GenericAssayUtils/TreatmentUtils';
 
 type Optional<T> =
     | { isApplicable: true; value: T }
@@ -203,14 +221,14 @@ export const AlterationTypeConstants = {
     GENESET_SCORE: 'GENESET_SCORE',
     METHYLATION: 'METHYLATION',
     GENERIC_ASSAY: 'GENERIC_ASSAY',
-    STRUCTURAL_VARIANT: 'STRUCTURAL_VARIANT'
+    STRUCTURAL_VARIANT: 'STRUCTURAL_VARIANT',
 };
 
 // only show TREATMENT_RESPONSE in the plots tab for now
 // TODO: apply to all generic assay profiles when front-end implementation finish
 export const GenericAssayTypeConstants = {
-    TREATMENT_RESPONSE: 'TREATMENT_RESPONSE'
-}
+    TREATMENT_RESPONSE: 'TREATMENT_RESPONSE',
+};
 
 export const AlterationTypeDisplayConstants = {
     COPY_NUMBER_ALTERATION: 'CNA',
@@ -423,10 +441,7 @@ export type ModifyQueryParams = {
 /* chronological setup concerns, rather than on encapsulation and public API */
 /* tslint:disable: member-ordering */
 export class ResultsViewPageStore {
-    constructor(
-        private appStore: AppStore,
-        urlWrapper: ResultsViewURLWrapper
-    ) {
+    constructor(private appStore: AppStore, urlWrapper: ResultsViewURLWrapper) {
         labelMobxPromises(this);
 
         this.urlWrapper = urlWrapper;
@@ -733,9 +748,7 @@ export class ResultsViewPageStore {
 
     @computed
     public get usePatientLevelEnrichments() {
-        return (
-            this.urlWrapper.query.patient_enrichments === 'true'
-        );
+        return this.urlWrapper.query.patient_enrichments === 'true';
     }
 
     @autobind
@@ -756,14 +769,14 @@ export class ResultsViewPageStore {
 
     @computed
     public get excludeGermlineMutations() {
-        return this.urlWrapper.query.exclude_germline_mutations === "true";
+        return this.urlWrapper.query.exclude_germline_mutations === 'true';
     }
 
     @autobind
     @action
     public setExcludeGermlineMutations(e: boolean) {
         this.urlWrapper.updateURL({
-            exclude_germline_mutations: e.toString()
+            exclude_germline_mutations: e.toString(),
         });
     }
 
@@ -1214,7 +1227,9 @@ export class ResultsViewPageStore {
         invoke: () => {
             // we get mutations with mutations endpoint, structural variants and fusions with structural variant endpoint.
             // filter out mutation genetic profile and structural variant profiles
-            const profilesWithoutMutationProfile = excludeMutationAndSVProfiles(this.selectedMolecularProfiles.result!);
+            const profilesWithoutMutationProfile = excludeMutationAndSVProfiles(
+                this.selectedMolecularProfiles.result!
+            );
             const genes = this.genes.result;
 
             if (
@@ -1270,7 +1285,9 @@ export class ResultsViewPageStore {
         invoke: () => {
             // we get mutations with mutations endpoint, structural variants and fusions with structural variant endpoint.
             // filter out mutation genetic profile and structural variant profiles
-            const profilesWithoutMutationProfile = excludeMutationAndSVProfiles(this.nonSelectedMolecularProfiles.result);
+            const profilesWithoutMutationProfile = excludeMutationAndSVProfiles(
+                this.nonSelectedMolecularProfiles.result
+            );
             const genes = this.genes.result;
 
             if (
@@ -1393,46 +1410,48 @@ export class ResultsViewPageStore {
         },
     });
 
-
-	// remoteNgchmUrl queries mdanderson.org to test if there are NGCHMs for one selected
-	// study.  The result is either the full URL to a portal page, or an empty string.
+    // remoteNgchmUrl queries mdanderson.org to test if there are NGCHMs for one selected
+    // study.  The result is either the full URL to a portal page, or an empty string.
     readonly remoteNgchmUrl = remoteData<string>({
-        await:()=>[this.studyIds],
-        invoke:async()=>{
+        await: () => [this.studyIds],
+        invoke: async () => {
             var result = '';
 
             if (this.studyIds.result!.length === 1) {
-
                 const queryData = {
-                    studyid:this.studyIds.result![0],
-                    format:"json"
+                    studyid: this.studyIds.result![0],
+                    format: 'json',
                 };
 
-				var urlResponse;
+                var urlResponse;
 
-				try {
-                    urlResponse = await request.get("https://bioinformatics.mdanderson.org/study2url")
-                                        .timeout(30000)
-                                        .query(queryData) as any;
+                try {
+                    urlResponse = (await request
+                        .get('https://bioinformatics.mdanderson.org/study2url')
+                        .timeout(30000)
+                        .query(queryData)) as any;
                 } catch (err) {
                     // Just eat the exception. Result will be empty string.
                 }
 
                 if (urlResponse && urlResponse.body.fileContent) {
-                    const parsedUrlResponse = JSON.parse(urlResponse.body.fileContent.trimEnd()) as any;
+                    const parsedUrlResponse = JSON.parse(
+                        urlResponse.body.fileContent.trimEnd()
+                    ) as any;
 
                     if (parsedUrlResponse.length >= 1) {
                         // This is faked out for now.  study2url needs mods to include site url
-                        result = "https://bioinformatics.mdanderson.org/TCGA/NGCHMPortal?" + parsedUrlResponse[0];
+                        result =
+                            'https://bioinformatics.mdanderson.org/TCGA/NGCHMPortal?' +
+                            parsedUrlResponse[0];
                     }
                 }
             }
 
-            return Promise.resolve (result);
-        }
+            return Promise.resolve(result);
+        },
     });
 
-
     readonly molecularProfilesWithData = remoteData<MolecularProfile[]>({
         await: () => [
             this.molecularProfilesInStudies,
@@ -2603,9 +2622,7 @@ export class ResultsViewPageStore {
                 );
 
                 const category =
-                    SampleListCategoryTypeToFullId[
-                        this.sampleListCategory!
-                    ];
+                    SampleListCategoryTypeToFullId[this.sampleListCategory!];
                 const specs = allSampleLists.reduce(
                     (
                         aggregator: SamplesSpecificationElement[],
@@ -2695,22 +2712,25 @@ export class ResultsViewPageStore {
         []
     );
 
-    readonly studyIds = remoteData({
-        await: () => [this.queriedVirtualStudies],
-        invoke: () => {
-            let physicalStudies: string[];
-            if (this.queriedVirtualStudies.result!.length > 0) {
-                // we want to replace virtual studies with their underlying physical studies
-                physicalStudies = substitutePhysicalStudiesForVirtualStudies(
-                    this.cancerStudyIds,
-                    this.queriedVirtualStudies.result!
-                );
-            } else {
-                physicalStudies = this.cancerStudyIds.slice();
-            }
-            return Promise.resolve(physicalStudies);
+    readonly studyIds = remoteData(
+        {
+            await: () => [this.queriedVirtualStudies],
+            invoke: () => {
+                let physicalStudies: string[];
+                if (this.queriedVirtualStudies.result!.length > 0) {
+                    // we want to replace virtual studies with their underlying physical studies
+                    physicalStudies = substitutePhysicalStudiesForVirtualStudies(
+                        this.cancerStudyIds,
+                        this.queriedVirtualStudies.result!
+                    );
+                } else {
+                    physicalStudies = this.cancerStudyIds.slice();
+                }
+                return Promise.resolve(physicalStudies);
+            },
         },
-    }, []);
+        []
+    );
 
     // this is less than desirable way of validating studyIds
     // if studyId does not appear in list of all physical studies
@@ -3477,7 +3497,6 @@ export class ResultsViewPageStore {
         {}
     );
 
-
     // If we have same profile accros multiple studies, they should have the same name, so we can group them by name to get all related molecular profiles in multiple studies.
     readonly nonSelectedMolecularProfilesGroupByName = remoteData<{
         [profileName: string]: MolecularProfile[];
@@ -3755,14 +3774,16 @@ export class ResultsViewPageStore {
         },
     });
 
-    readonly entrezGeneIdToReferenceGene = remoteData<{ [hugoSymbol: string]: ReferenceGenomeGene }>({
-        await: () => [
-            this.referenceGenes
-        ],
+    readonly entrezGeneIdToReferenceGene = remoteData<{
+        [hugoSymbol: string]: ReferenceGenomeGene;
+    }>({
+        await: () => [this.referenceGenes],
         invoke: () => {
             // build reference gene map
-            return Promise.resolve(_.keyBy(this.referenceGenes.result!, g => g.entrezGeneId));
-        }
+            return Promise.resolve(
+                _.keyBy(this.referenceGenes.result!, g => g.entrezGeneId)
+            );
+        },
     });
 
     @computed get referenceGenome() {
@@ -3838,8 +3859,10 @@ export class ResultsViewPageStore {
     readonly treatmentsInStudies = remoteData<Treatment[]>({
         await: () => [this.molecularProfilesInStudies],
         invoke: async () => {
-            return await fetchTreatmentByMolecularProfileIds(this.molecularProfilesInStudies.result);
-        }
+            return await fetchTreatmentByMolecularProfileIds(
+                this.molecularProfilesInStudies.result
+            );
+        },
     });
 
     readonly selectedTreatments = remoteData<Treatment[]>({
@@ -3882,8 +3905,13 @@ export class ResultsViewPageStore {
     readonly treatmentLinkMap = remoteData<{ [treatmentId: string]: string }>({
         await: () => [this.molecularProfilesInStudies],
         invoke: async () => {
-            if (this.molecularProfilesInStudies.result && this.molecularProfilesInStudies.result.length > 0) {
-                const treatments = await fetchTreatmentByMolecularProfileIds(this.molecularProfilesInStudies.result);
+            if (
+                this.molecularProfilesInStudies.result &&
+                this.molecularProfilesInStudies.result.length > 0
+            ) {
+                const treatments = await fetchTreatmentByMolecularProfileIds(
+                    this.molecularProfilesInStudies.result
+                );
                 const linkMap: { [treatmentId: string]: string } = {};
                 treatments.forEach(({ treatmentId, refLink }) => {
                     linkMap[treatmentId] = refLink;
diff --git a/src/pages/resultsView/ResultsViewPageStoreUtils.spec.ts b/src/pages/resultsView/ResultsViewPageStoreUtils.spec.ts
index 6644d6f77d1..01abb12bb6b 100644
--- a/src/pages/resultsView/ResultsViewPageStoreUtils.spec.ts
+++ b/src/pages/resultsView/ResultsViewPageStoreUtils.spec.ts
@@ -1,164 +1,242 @@
-import {assert} from "chai";
+import { assert } from 'chai';
 import {
-    Gene, NumericGeneMolecularData, GenePanelData, MolecularProfile, Mutation, Patient,
-    Sample, CancerStudy
-} from "../../shared/api/generated/CBioPortalAPI";
+    Gene,
+    NumericGeneMolecularData,
+    GenePanelData,
+    MolecularProfile,
+    Mutation,
+    Patient,
+    Sample,
+    CancerStudy,
+} from '../../shared/api/generated/CBioPortalAPI';
 import {
     annotateMolecularDatum,
     annotateMutationPutativeDriver,
-    computeCustomDriverAnnotationReport, computeGenePanelInformation, filterAndAnnotateMutations,
+    computeCustomDriverAnnotationReport,
+    computeGenePanelInformation,
+    filterAndAnnotateMutations,
     filterSubQueryData,
     getOncoKbOncogenic,
     initializeCustomDriverAnnotationSettings,
-    fetchQueriedStudies, isRNASeqProfile, isPanCanStudy, isTCGAProvStudy, isTCGAPubStudy, buildResultsViewPageTitle,
-    getSampleAlteredMap, getSingleGeneResultKey, getMultipleGeneResultKey
-} from "./ResultsViewPageStoreUtils";
-import {IQueriedMergedTrackCaseData, AnnotatedExtendedAlteration} from "./ResultsViewPageStore";
+    fetchQueriedStudies,
+    isRNASeqProfile,
+    isPanCanStudy,
+    isTCGAProvStudy,
+    isTCGAPubStudy,
+    buildResultsViewPageTitle,
+    getSampleAlteredMap,
+    getSingleGeneResultKey,
+    getMultipleGeneResultKey,
+} from './ResultsViewPageStoreUtils';
 import {
-    OQLLineFilterOutput, MergedTrackLineFilterOutput
-} from "../../shared/lib/oql/oqlfilter";
-import {observable} from "mobx";
-import {IndicatorQueryResp} from "cbioportal-frontend-commons";
-import {AnnotatedMutation} from "./ResultsViewPageStore";
+    IQueriedMergedTrackCaseData,
+    AnnotatedExtendedAlteration,
+} from './ResultsViewPageStore';
+import {
+    OQLLineFilterOutput,
+    MergedTrackLineFilterOutput,
+} from '../../shared/lib/oql/oqlfilter';
+import { observable } from 'mobx';
+import { IndicatorQueryResp } from 'cbioportal-frontend-commons';
+import { AnnotatedMutation } from './ResultsViewPageStore';
 import * as _ from 'lodash';
 import sinon from 'sinon';
-import sessionServiceClient from "shared/api//sessionServiceInstance";
-import { VirtualStudy, VirtualStudyData } from "shared/model/VirtualStudy";
-import client from "shared/api/cbioportalClientInstance";
-import AccessorsForOqlFilter, {getSimplifiedMutationType} from "../../shared/lib/oql/AccessorsForOqlFilter";
-import { AlteredStatus } from "./mutualExclusivity/MutualExclusivityUtil";
-
-describe("ResultsViewPageStoreUtils", ()=>{
-    describe("computeCustomDriverAnnotationReport", ()=>{
-        let driverFilterMutation:Mutation;
-        let driverTiersFilterMutation:Mutation;
-        let bothMutation:Mutation;
-        let neitherMutation:Mutation;
-
-        before(()=>{
+import sessionServiceClient from 'shared/api//sessionServiceInstance';
+import { VirtualStudy, VirtualStudyData } from 'shared/model/VirtualStudy';
+import client from 'shared/api/cbioportalClientInstance';
+import AccessorsForOqlFilter, {
+    getSimplifiedMutationType,
+} from '../../shared/lib/oql/AccessorsForOqlFilter';
+import { AlteredStatus } from './mutualExclusivity/MutualExclusivityUtil';
+
+describe('ResultsViewPageStoreUtils', () => {
+    describe('computeCustomDriverAnnotationReport', () => {
+        let driverFilterMutation: Mutation;
+        let driverTiersFilterMutation: Mutation;
+        let bothMutation: Mutation;
+        let neitherMutation: Mutation;
+
+        before(() => {
             driverFilterMutation = {
-                driverFilter:"B"
+                driverFilter: 'B',
             } as Mutation;
 
             driverTiersFilterMutation = {
-                driverTiersFilter:"T"
+                driverTiersFilter: 'T',
             } as Mutation;
 
             bothMutation = {
-                driverFilter:"ADFADF",
-                driverTiersFilter:"SDPOIFJP"
+                driverFilter: 'ADFADF',
+                driverTiersFilter: 'SDPOIFJP',
             } as Mutation;
 
-            neitherMutation = {
-            } as Mutation;
+            neitherMutation = {} as Mutation;
         });
 
-        it("returns the right report for empty list", ()=>{
-            assert.deepEqual(computeCustomDriverAnnotationReport([]), {hasBinary: false, tiers:[]});
+        it('returns the right report for empty list', () => {
+            assert.deepEqual(computeCustomDriverAnnotationReport([]), {
+                hasBinary: false,
+                tiers: [],
+            });
         });
-        it("returns the right report for no annotations, one element", ()=>{
-            assert.deepEqual(computeCustomDriverAnnotationReport([neitherMutation]), {hasBinary:false, tiers:[]});
+        it('returns the right report for no annotations, one element', () => {
+            assert.deepEqual(
+                computeCustomDriverAnnotationReport([neitherMutation]),
+                { hasBinary: false, tiers: [] }
+            );
         });
-        it("returns the right report for no annotations, three elements", ()=>{
+        it('returns the right report for no annotations, three elements', () => {
             assert.deepEqual(
-                computeCustomDriverAnnotationReport([neitherMutation, neitherMutation, neitherMutation]),
-                {hasBinary:false, tiers:[]}
+                computeCustomDriverAnnotationReport([
+                    neitherMutation,
+                    neitherMutation,
+                    neitherMutation,
+                ]),
+                { hasBinary: false, tiers: [] }
             );
         });
-        it("returns the right report for just binary annotations, one element", ()=>{
-            assert.deepEqual(computeCustomDriverAnnotationReport([driverFilterMutation]), {hasBinary:true, tiers:[]});
+        it('returns the right report for just binary annotations, one element', () => {
+            assert.deepEqual(
+                computeCustomDriverAnnotationReport([driverFilterMutation]),
+                { hasBinary: true, tiers: [] }
+            );
         });
-        it("returns the right report for just binary annotations, three elements", ()=>{
+        it('returns the right report for just binary annotations, three elements', () => {
             assert.deepEqual(
-                computeCustomDriverAnnotationReport([neitherMutation, driverFilterMutation, driverFilterMutation]),
-                {hasBinary:true, tiers:[]}
+                computeCustomDriverAnnotationReport([
+                    neitherMutation,
+                    driverFilterMutation,
+                    driverFilterMutation,
+                ]),
+                { hasBinary: true, tiers: [] }
             );
         });
-        it("returns the right report for just tiers annotations, one element", ()=>{
-            assert.deepEqual(computeCustomDriverAnnotationReport([driverTiersFilterMutation]), {hasBinary:false, tiers:["T"]});
+        it('returns the right report for just tiers annotations, one element', () => {
+            assert.deepEqual(
+                computeCustomDriverAnnotationReport([
+                    driverTiersFilterMutation,
+                ]),
+                { hasBinary: false, tiers: ['T'] }
+            );
         });
-        it("returns the right report for just tiers annotations, three elements", ()=>{
+        it('returns the right report for just tiers annotations, three elements', () => {
             assert.deepEqual(
-                computeCustomDriverAnnotationReport([driverTiersFilterMutation, driverTiersFilterMutation, neitherMutation]),
-                {hasBinary:false, tiers:["T"]}
+                computeCustomDriverAnnotationReport([
+                    driverTiersFilterMutation,
+                    driverTiersFilterMutation,
+                    neitherMutation,
+                ]),
+                { hasBinary: false, tiers: ['T'] }
             );
         });
-        it("returns the right report for binary and tier annotation in one element", ()=>{
-            assert.deepEqual(computeCustomDriverAnnotationReport([bothMutation]), {hasBinary:true, tiers:["SDPOIFJP"]});
+        it('returns the right report for binary and tier annotation in one element', () => {
+            assert.deepEqual(
+                computeCustomDriverAnnotationReport([bothMutation]),
+                { hasBinary: true, tiers: ['SDPOIFJP'] }
+            );
         });
-        it("returns the right report for binary and tier annotation, both present in three elements", ()=>{
+        it('returns the right report for binary and tier annotation, both present in three elements', () => {
             assert.deepEqual(
-                computeCustomDriverAnnotationReport([bothMutation, neitherMutation, bothMutation]),
-                {hasBinary:true, tiers:["SDPOIFJP"]}
+                computeCustomDriverAnnotationReport([
+                    bothMutation,
+                    neitherMutation,
+                    bothMutation,
+                ]),
+                { hasBinary: true, tiers: ['SDPOIFJP'] }
             );
         });
-        it("returns the right report for binary and tier annotation in different elements", ()=>{
+        it('returns the right report for binary and tier annotation in different elements', () => {
             assert.deepEqual(
-                computeCustomDriverAnnotationReport([driverTiersFilterMutation, driverFilterMutation]),
-                {hasBinary:true, tiers:["T"]}
+                computeCustomDriverAnnotationReport([
+                    driverTiersFilterMutation,
+                    driverFilterMutation,
+                ]),
+                { hasBinary: true, tiers: ['T'] }
             );
         });
-        it("returns the right report for binary and tier annotation in different elements, including an element with no annotation", ()=>{
+        it('returns the right report for binary and tier annotation in different elements, including an element with no annotation', () => {
             assert.deepEqual(
-                computeCustomDriverAnnotationReport([driverTiersFilterMutation, driverFilterMutation, neitherMutation]),
-                {hasBinary:true, tiers:["T"]}
+                computeCustomDriverAnnotationReport([
+                    driverTiersFilterMutation,
+                    driverFilterMutation,
+                    neitherMutation,
+                ]),
+                { hasBinary: true, tiers: ['T'] }
             );
         });
     });
 
-    describe("filterSubQueryData", () => {
+    describe('filterSubQueryData', () => {
         // I believe these metadata to be all `new AccessorsForOqlFilter()` needs
         // tslint:disable-next-line no-object-literal-type-assertion
-        const makeBasicExpressionProfile = () => ({
-            "molecularAlterationType": "MRNA_EXPRESSION",
-            "datatype": "Z-SCORE",
-            "molecularProfileId": "brca_tcga_mrna_median_Zscores",
-            "studyId": "brca_tcga"
-        } as MolecularProfile);
+        const makeBasicExpressionProfile = () =>
+            ({
+                molecularAlterationType: 'MRNA_EXPRESSION',
+                datatype: 'Z-SCORE',
+                molecularProfileId: 'brca_tcga_mrna_median_Zscores',
+                studyId: 'brca_tcga',
+            } as MolecularProfile);
 
         // I believe this to be the projection the filter function needs
         const makeMinimalExpressionData = (
-            points: {entrezGeneId: number, uniqueSampleKey: string, value: number}[]
-        ) => points.map(({entrezGeneId, uniqueSampleKey, value}) => ({
-            entrezGeneId, value,uniqueSampleKey,
-            sampleId: `TCGA-${uniqueSampleKey}`,
-            uniquePatientKey: `${uniqueSampleKey}_PATIENT`,
-            patientId: `TCGA-${uniqueSampleKey}_PATIENT`,
-            molecularProfileId: 'brca_tcga_mrna_median_Zscores',
-            studyId: 'brca_tcga',
-            gene: {
-                entrezGeneId, hugoGeneSymbol: `GENE${entrezGeneId}`,
-                "type": "protein-coding"
-            }
-        })) as NumericGeneMolecularData[];
+            points: {
+                entrezGeneId: number;
+                uniqueSampleKey: string;
+                value: number;
+            }[]
+        ) =>
+            points.map(({ entrezGeneId, uniqueSampleKey, value }) => ({
+                entrezGeneId,
+                value,
+                uniqueSampleKey,
+                sampleId: `TCGA-${uniqueSampleKey}`,
+                uniquePatientKey: `${uniqueSampleKey}_PATIENT`,
+                patientId: `TCGA-${uniqueSampleKey}_PATIENT`,
+                molecularProfileId: 'brca_tcga_mrna_median_Zscores',
+                studyId: 'brca_tcga',
+                gene: {
+                    entrezGeneId,
+                    hugoGeneSymbol: `GENE${entrezGeneId}`,
+                    type: 'protein-coding',
+                },
+            })) as NumericGeneMolecularData[];
 
         const makeMinimalCaseArrays = (sampleKeys: string[]) => ({
-            samples: sampleKeys.map(
-                uniqueSampleKey => ({uniqueSampleKey})
-            ),
-            patients: sampleKeys.map(
-                uniqueSampleKey => ({uniquePatientKey: `${uniqueSampleKey}_PATIENT`})
-            )
+            samples: sampleKeys.map(uniqueSampleKey => ({ uniqueSampleKey })),
+            patients: sampleKeys.map(uniqueSampleKey => ({
+                uniquePatientKey: `${uniqueSampleKey}_PATIENT`,
+            })),
         });
 
-        it("returns undefined when queried for a non-merged track", () => {
+        it('returns undefined when queried for a non-merged track', () => {
             // given
-            const accessorsInstance = new AccessorsForOqlFilter([makeBasicExpressionProfile()]);
-            const dataArray: NumericGeneMolecularData[] = makeMinimalExpressionData([{
-                entrezGeneId: 1000,
-                uniqueSampleKey: 'SAMPLE1',
-                value: 1.5
-            }]);
-            const {samples, patients} = makeMinimalCaseArrays(['SAMPLE1']);
+            const accessorsInstance = new AccessorsForOqlFilter([
+                makeBasicExpressionProfile(),
+            ]);
+            const dataArray: NumericGeneMolecularData[] = makeMinimalExpressionData(
+                [
+                    {
+                        entrezGeneId: 1000,
+                        uniqueSampleKey: 'SAMPLE1',
+                        value: 1.5,
+                    },
+                ]
+            );
+            const { samples, patients } = makeMinimalCaseArrays(['SAMPLE1']);
             const queryLine: OQLLineFilterOutput<object> = {
                 gene: 'GENE400',
                 oql_line: 'GENE400: EXP>=2;',
-                parsed_oql_line: {gene: 'GENE400', alterations: [{
-                    alteration_type: 'exp',
-                    constr_rel: '>=',
-                    constr_val: 2
-                }]},
-                data: []
+                parsed_oql_line: {
+                    gene: 'GENE400',
+                    alterations: [
+                        {
+                            alteration_type: 'exp',
+                            constr_rel: '>=',
+                            constr_val: 2,
+                        },
+                    ],
+                },
+                data: [],
             };
             // when
             const data = filterSubQueryData(
@@ -166,30 +244,67 @@ describe("ResultsViewPageStoreUtils", ()=>{
                 '',
                 dataArray,
                 accessorsInstance,
-                samples, patients
+                samples,
+                patients
             );
             // then
             assert.isUndefined(data);
         });
 
-        it("returns a two-element array with no alterations if queried for a two-gene merged track that matches none", () => {
+        it('returns a two-element array with no alterations if queried for a two-gene merged track that matches none', () => {
             // given
-            const accessorsInstance = new AccessorsForOqlFilter([makeBasicExpressionProfile()]);
-            const dataArray: NumericGeneMolecularData[] = makeMinimalExpressionData([
-                {entrezGeneId: 1000, uniqueSampleKey: 'SAMPLE1', value: 1.5},
-                {entrezGeneId: 1001, uniqueSampleKey: 'SAMPLE1', value: 1.5},
+            const accessorsInstance = new AccessorsForOqlFilter([
+                makeBasicExpressionProfile(),
             ]);
-            const {samples, patients} = makeMinimalCaseArrays(['SAMPLE1']);
+            const dataArray: NumericGeneMolecularData[] = makeMinimalExpressionData(
+                [
+                    {
+                        entrezGeneId: 1000,
+                        uniqueSampleKey: 'SAMPLE1',
+                        value: 1.5,
+                    },
+                    {
+                        entrezGeneId: 1001,
+                        uniqueSampleKey: 'SAMPLE1',
+                        value: 1.5,
+                    },
+                ]
+            );
+            const { samples, patients } = makeMinimalCaseArrays(['SAMPLE1']);
             // [DATATYPES: EXP<-3; GENE1000 GENE1001],
             const queryLine: MergedTrackLineFilterOutput<object> = {
                 list: [
-                    {oql_line: 'GENE1000: EXP<-3;', gene: 'GENE1000', data: [], parsed_oql_line: {
-                        gene: 'GENE1000', alterations: [{alteration_type: 'exp', constr_rel: '<', constr_val: -3}]
-                    }},
-                    {oql_line: 'GENE1001: EXP<-3;', gene: 'GENE1001', data: [], parsed_oql_line: {
-                        gene: 'GENE1001', alterations: [{alteration_type: 'exp', constr_rel: '<', constr_val: -3}]
-                    }}
-                ]
+                    {
+                        oql_line: 'GENE1000: EXP<-3;',
+                        gene: 'GENE1000',
+                        data: [],
+                        parsed_oql_line: {
+                            gene: 'GENE1000',
+                            alterations: [
+                                {
+                                    alteration_type: 'exp',
+                                    constr_rel: '<',
+                                    constr_val: -3,
+                                },
+                            ],
+                        },
+                    },
+                    {
+                        oql_line: 'GENE1001: EXP<-3;',
+                        gene: 'GENE1001',
+                        data: [],
+                        parsed_oql_line: {
+                            gene: 'GENE1001',
+                            alterations: [
+                                {
+                                    alteration_type: 'exp',
+                                    constr_rel: '<',
+                                    constr_val: -3,
+                                },
+                            ],
+                        },
+                    },
+                ],
             };
             // when
             const data = filterSubQueryData(
@@ -197,48 +312,88 @@ describe("ResultsViewPageStoreUtils", ()=>{
                 '',
                 dataArray,
                 accessorsInstance,
-                samples, patients
+                samples,
+                patients
             );
             // then
             assert.lengthOf(data!, 2);
-            assert.deepEqual(
-                data![0].cases,
-                {
-                    samples: {'SAMPLE1': []},
-                    patients: {'SAMPLE1_PATIENT': []}
-                }
-            );
-            assert.deepEqual(
-                data![1].cases,
-                {
-                    samples: {'SAMPLE1': []},
-                    patients: {'SAMPLE1_PATIENT': []}
-                }
-            );
+            assert.deepEqual(data![0].cases, {
+                samples: { SAMPLE1: [] },
+                patients: { SAMPLE1_PATIENT: [] },
+            });
+            assert.deepEqual(data![1].cases, {
+                samples: { SAMPLE1: [] },
+                patients: { SAMPLE1_PATIENT: [] },
+            });
         });
 
-        it("lists alterations that match genes in a merged track", () => {
+        it('lists alterations that match genes in a merged track', () => {
             // given
-            const accessorsInstance = new AccessorsForOqlFilter([makeBasicExpressionProfile()]);
-            const dataArray: NumericGeneMolecularData[] = makeMinimalExpressionData([
-                {entrezGeneId: 1000, uniqueSampleKey: 'SAMPLE1', value: 0},
-                {entrezGeneId: 1000, uniqueSampleKey: 'SAMPLE2', value: 0},
-                {entrezGeneId: 1001, uniqueSampleKey: 'SAMPLE1', value: 2.2},
-                {entrezGeneId: 1001, uniqueSampleKey: 'SAMPLE2', value: 2.7}
+            const accessorsInstance = new AccessorsForOqlFilter([
+                makeBasicExpressionProfile(),
             ]);
-            const {samples, patients} = makeMinimalCaseArrays(
-                ['SAMPLE1', 'SAMPLE2']
+            const dataArray: NumericGeneMolecularData[] = makeMinimalExpressionData(
+                [
+                    {
+                        entrezGeneId: 1000,
+                        uniqueSampleKey: 'SAMPLE1',
+                        value: 0,
+                    },
+                    {
+                        entrezGeneId: 1000,
+                        uniqueSampleKey: 'SAMPLE2',
+                        value: 0,
+                    },
+                    {
+                        entrezGeneId: 1001,
+                        uniqueSampleKey: 'SAMPLE1',
+                        value: 2.2,
+                    },
+                    {
+                        entrezGeneId: 1001,
+                        uniqueSampleKey: 'SAMPLE2',
+                        value: 2.7,
+                    },
+                ]
             );
+            const { samples, patients } = makeMinimalCaseArrays([
+                'SAMPLE1',
+                'SAMPLE2',
+            ]);
             // [DATATYPES: EXP >= 2.5; GENE1000 GENE1001]'
             const queryLine: MergedTrackLineFilterOutput<object> = {
                 list: [
-                    {oql_line: 'GENE1000: EXP>2.5;', gene: 'GENE1000', data: [], parsed_oql_line: {
-                        gene: 'GENE1000', alterations: [{alteration_type: 'exp', constr_rel: '>', constr_val: 2.5}]
-                    }},
-                    {oql_line: 'GENE1001: EXP>2.5;', gene: 'GENE1001', data: [], parsed_oql_line: {
-                        gene: 'GENE1001', alterations: [{alteration_type: 'exp', constr_rel: '>', constr_val: 2.5}]
-                    }}
-                ]
+                    {
+                        oql_line: 'GENE1000: EXP>2.5;',
+                        gene: 'GENE1000',
+                        data: [],
+                        parsed_oql_line: {
+                            gene: 'GENE1000',
+                            alterations: [
+                                {
+                                    alteration_type: 'exp',
+                                    constr_rel: '>',
+                                    constr_val: 2.5,
+                                },
+                            ],
+                        },
+                    },
+                    {
+                        oql_line: 'GENE1001: EXP>2.5;',
+                        gene: 'GENE1001',
+                        data: [],
+                        parsed_oql_line: {
+                            gene: 'GENE1001',
+                            alterations: [
+                                {
+                                    alteration_type: 'exp',
+                                    constr_rel: '>',
+                                    constr_val: 2.5,
+                                },
+                            ],
+                        },
+                    },
+                ],
             };
             // when
             const data = filterSubQueryData(
@@ -246,7 +401,8 @@ describe("ResultsViewPageStoreUtils", ()=>{
                 '',
                 dataArray,
                 accessorsInstance,
-                samples, patients
+                samples,
+                patients
             );
             // then
             const gene2AlterationsBySample = data![1].cases.samples;
@@ -259,10 +415,10 @@ describe("ResultsViewPageStoreUtils", ()=>{
         });
     });
 
-    describe("initializeCustomDriverAnnotationSettings", ()=>{
-        it("initializes selection for empty list of tiers", ()=>{
+    describe('initializeCustomDriverAnnotationSettings', () => {
+        it('initializes selection for empty list of tiers', () => {
             let mutationAnnotationSettings = {
-                driverTiers: observable.map<boolean>()
+                driverTiers: observable.map<boolean>(),
             };
 
             initializeCustomDriverAnnotationSettings(
@@ -276,44 +432,52 @@ describe("ResultsViewPageStoreUtils", ()=>{
             assert.deepEqual(mutationAnnotationSettings.driverTiers.toJS(), {});
         });
 
-        it.skip("initializes selection for given tiers", ()=>{
+        it.skip('initializes selection for given tiers', () => {
             // TODO: figure out why doing driverTiers.set in this test is causing crazy problems
             let mutationAnnotationSettings = {
-                driverTiers: observable.map<boolean>()
+                driverTiers: observable.map<boolean>(),
             };
             let enableCustomTiers = false;
 
             initializeCustomDriverAnnotationSettings(
-                { tiers: ["a","b","c"] } as any,
+                { tiers: ['a', 'b', 'c'] } as any,
                 mutationAnnotationSettings,
                 enableCustomTiers,
                 false,
                 false
             );
 
-            assert.deepEqual(mutationAnnotationSettings.driverTiers.toJS(), {"a":false, "b":false, "c":false}, "initialized to false");
+            assert.deepEqual(
+                mutationAnnotationSettings.driverTiers.toJS(),
+                { a: false, b: false, c: false },
+                'initialized to false'
+            );
 
             enableCustomTiers = true;
 
             initializeCustomDriverAnnotationSettings(
-                { tiers: ["a","b","c"] } as any,
+                { tiers: ['a', 'b', 'c'] } as any,
                 mutationAnnotationSettings,
                 enableCustomTiers,
                 false,
                 false
             );
 
-            assert.deepEqual(mutationAnnotationSettings.driverTiers.toJS(), {"a":true, "b":true, "c":true}, "initialized to true");
+            assert.deepEqual(
+                mutationAnnotationSettings.driverTiers.toJS(),
+                { a: true, b: true, c: true },
+                'initialized to true'
+            );
         });
 
-        it("sets hotspots and oncoKb if option is set and there are no custom annotations", ()=>{
+        it('sets hotspots and oncoKb if option is set and there are no custom annotations', () => {
             let mutationAnnotationSettings = {
                 hotspots: false,
                 oncoKb: false,
-                driverTiers: observable.map<boolean>()
+                driverTiers: observable.map<boolean>(),
             };
             initializeCustomDriverAnnotationSettings(
-                {hasBinary: false, tiers: []} as any,
+                { hasBinary: false, tiers: [] } as any,
                 mutationAnnotationSettings,
                 false,
                 true,
@@ -323,15 +487,15 @@ describe("ResultsViewPageStoreUtils", ()=>{
             assert.isTrue(mutationAnnotationSettings.hotspots);
             assert.isTrue(mutationAnnotationSettings.oncoKb);
         });
-        it.skip("does not set hotspots and oncoKb if option is set and there are custom annotations", ()=>{
+        it.skip('does not set hotspots and oncoKb if option is set and there are custom annotations', () => {
             // TODO: figure out why doing driverTiers.set in this test is causing crazy problems
             let mutationAnnotationSettings = {
                 hotspots: false,
                 oncoKb: false,
-                driverTiers: observable.map<boolean>()
+                driverTiers: observable.map<boolean>(),
             };
             initializeCustomDriverAnnotationSettings(
-                {hasBinary: true, tiers: []} as any,
+                { hasBinary: true, tiers: [] } as any,
                 mutationAnnotationSettings,
                 false,
                 true,
@@ -340,7 +504,7 @@ describe("ResultsViewPageStoreUtils", ()=>{
             assert.isFalse(mutationAnnotationSettings.hotspots);
             assert.isFalse(mutationAnnotationSettings.oncoKb);
             initializeCustomDriverAnnotationSettings(
-                {hasBinary: false, tiers: ["a"]} as any,
+                { hasBinary: false, tiers: ['a'] } as any,
                 mutationAnnotationSettings,
                 false,
                 true,
@@ -349,14 +513,14 @@ describe("ResultsViewPageStoreUtils", ()=>{
             assert.isFalse(mutationAnnotationSettings.hotspots);
             assert.isFalse(mutationAnnotationSettings.oncoKb);
         });
-        it("does not set hotspots and oncoKb if option is not set", ()=>{
+        it('does not set hotspots and oncoKb if option is not set', () => {
             let mutationAnnotationSettings = {
                 hotspots: false,
                 oncoKb: false,
-                driverTiers: observable.map<boolean>()
+                driverTiers: observable.map<boolean>(),
             };
             initializeCustomDriverAnnotationSettings(
-                {hasBinary: true, tiers: []} as any,
+                { hasBinary: true, tiers: [] } as any,
                 mutationAnnotationSettings,
                 false,
                 false,
@@ -367,149 +531,161 @@ describe("ResultsViewPageStoreUtils", ()=>{
         });
     });
 
-    describe("annotateMutationPutativeDriver", ()=>{
-        it("annotates with hotspot, oncokb", ()=>{
+    describe('annotateMutationPutativeDriver', () => {
+        it('annotates with hotspot, oncokb', () => {
             assert.deepEqual(
                 annotateMutationPutativeDriver(
                     {
-                        mutationType: "missense",
+                        mutationType: 'missense',
                     } as Mutation,
                     {
                         hotspots: true,
-                        oncoKb: "oncogenic"
+                        oncoKb: 'oncogenic',
                     } as any
                 ),
                 {
                     putativeDriver: true,
                     isHotspot: true,
-                    oncoKbOncogenic: "oncogenic",
-                    simplifiedMutationType: getSimplifiedMutationType("missense"),
-                    mutationType: "missense",
+                    oncoKbOncogenic: 'oncogenic',
+                    simplifiedMutationType: getSimplifiedMutationType(
+                        'missense'
+                    ),
+                    mutationType: 'missense',
                 }
             );
         });
-        it("annotates with cbioportal, cosmic", ()=>{
+        it('annotates with cbioportal, cosmic', () => {
             assert.deepEqual(
                 annotateMutationPutativeDriver(
                     {
-                        mutationType: "in_frame_ins",
+                        mutationType: 'in_frame_ins',
                     } as Mutation,
                     {
                         hotspots: false,
-                        oncoKb: "",
+                        oncoKb: '',
                         cbioportalCount: true,
-                        cosmicCount: false
+                        cosmicCount: false,
                     } as any
                 ),
                 {
                     putativeDriver: true,
                     isHotspot: false,
-                    oncoKbOncogenic: "",
-                    simplifiedMutationType: getSimplifiedMutationType("in_frame_ins"),
-                    mutationType: "in_frame_ins",
+                    oncoKbOncogenic: '',
+                    simplifiedMutationType: getSimplifiedMutationType(
+                        'in_frame_ins'
+                    ),
+                    mutationType: 'in_frame_ins',
                 },
-                "cbioportal count"
+                'cbioportal count'
             );
 
             assert.deepEqual(
                 annotateMutationPutativeDriver(
                     {
-                        mutationType: "in_frame_ins",
+                        mutationType: 'in_frame_ins',
                     } as Mutation,
                     {
                         hotspots: false,
-                        oncoKb: "",
+                        oncoKb: '',
                         cbioportalCount: false,
-                        cosmicCount: true
+                        cosmicCount: true,
                     } as any
                 ),
                 {
                     putativeDriver: true,
                     isHotspot: false,
-                    oncoKbOncogenic: "",
-                    simplifiedMutationType: getSimplifiedMutationType("in_frame_ins"),
-                    mutationType: "in_frame_ins",
+                    oncoKbOncogenic: '',
+                    simplifiedMutationType: getSimplifiedMutationType(
+                        'in_frame_ins'
+                    ),
+                    mutationType: 'in_frame_ins',
                 },
-                "cosmic count"
+                'cosmic count'
             );
         });
-        it("annotates with custom driver annotations", ()=>{
+        it('annotates with custom driver annotations', () => {
             assert.deepEqual(
                 annotateMutationPutativeDriver(
                     {
-                        mutationType: "asdfasdf",
+                        mutationType: 'asdfasdf',
                     } as Mutation,
                     {
                         hotspots: false,
-                        oncoKb: "",
+                        oncoKb: '',
                         customDriverBinary: false,
-                        customDriverTier: "hello"
+                        customDriverTier: 'hello',
                     } as any
                 ),
                 {
                     putativeDriver: true,
                     isHotspot: false,
-                    oncoKbOncogenic: "",
-                    simplifiedMutationType: getSimplifiedMutationType("asdfasdf"),
-                    mutationType: "asdfasdf",
+                    oncoKbOncogenic: '',
+                    simplifiedMutationType: getSimplifiedMutationType(
+                        'asdfasdf'
+                    ),
+                    mutationType: 'asdfasdf',
                 },
-                "tier"
+                'tier'
             );
 
             assert.deepEqual(
                 annotateMutationPutativeDriver(
                     {
-                        mutationType: "missense",
+                        mutationType: 'missense',
                     } as Mutation,
                     {
                         hotspots: false,
-                        oncoKb: "",
+                        oncoKb: '',
                         customDriverBinary: true,
                     } as any
                 ),
                 {
                     putativeDriver: true,
                     isHotspot: false,
-                    oncoKbOncogenic: "",
-                    simplifiedMutationType: getSimplifiedMutationType("missense"),
-                    mutationType: "missense",
+                    oncoKbOncogenic: '',
+                    simplifiedMutationType: getSimplifiedMutationType(
+                        'missense'
+                    ),
+                    mutationType: 'missense',
                 },
-                "binary"
+                'binary'
             );
         });
-        it("annotates with all", ()=>{
+        it('annotates with all', () => {
             assert.deepEqual(
                 annotateMutationPutativeDriver(
                     {
-                        mutationType: "asdfasdf",
+                        mutationType: 'asdfasdf',
                     } as Mutation,
                     {
                         hotspots: true,
-                        oncoKb: "oncogenic",
+                        oncoKb: 'oncogenic',
                         cbioportalCount: true,
                         cosmicCount: true,
                         customDriverBinary: true,
-                        customDriverTier: "hello"
+                        customDriverTier: 'hello',
                     } as any
                 ),
                 {
                     putativeDriver: true,
                     isHotspot: true,
-                    oncoKbOncogenic: "oncogenic",
-                    simplifiedMutationType: getSimplifiedMutationType("asdfasdf"),
-                    mutationType: "asdfasdf",
+                    oncoKbOncogenic: 'oncogenic',
+                    simplifiedMutationType: getSimplifiedMutationType(
+                        'asdfasdf'
+                    ),
+                    mutationType: 'asdfasdf',
                 }
             );
         });
-        it("annotates with none", ()=>{
+        it('annotates with none', () => {
             assert.deepEqual(
                 annotateMutationPutativeDriver(
                     {
-                        mutationType: "cvzxcv",
+                        mutationType: 'cvzxcv',
                     } as Mutation,
                     {
                         hotspots: false,
-                        oncoKb: "",
+                        oncoKb: '',
                         cbioportalCount: false,
                         cosmicCount: false,
                         customDriverBinary: false,
@@ -518,1873 +694,2374 @@ describe("ResultsViewPageStoreUtils", ()=>{
                 {
                     putativeDriver: false,
                     isHotspot: false,
-                    oncoKbOncogenic: "",
-                    simplifiedMutationType: getSimplifiedMutationType("cvzxcv"),
-                    mutationType: "cvzxcv",
+                    oncoKbOncogenic: '',
+                    simplifiedMutationType: getSimplifiedMutationType('cvzxcv'),
+                    mutationType: 'cvzxcv',
                 }
             );
         });
     });
 
-    describe("filterAndAnnotateMutations", ()=>{
-        it("returns empty list for empty input", ()=>{
-            assert.deepEqual(filterAndAnnotateMutations([], ()=>({}) as any, {}), {
-                data: [], germline: [], vus: [], vusAndGermline:[]
-            });
+    describe('filterAndAnnotateMutations', () => {
+        it('returns empty list for empty input', () => {
+            assert.deepEqual(
+                filterAndAnnotateMutations([], () => ({} as any), {}),
+                {
+                    data: [],
+                    germline: [],
+                    vus: [],
+                    vusAndGermline: [],
+                }
+            );
         });
-        it("annotates a single mutation", ()=>{
+        it('annotates a single mutation', () => {
             assert.deepEqual(
                 filterAndAnnotateMutations(
-                    [{mutationType:"missense", entrezGeneId:1} as Mutation],
-                    ()=>({oncoKb:"", hotspots:true, cbioportalCount:false, cosmicCount:true, customDriverBinary:false}),
-                    {1:{ hugoGeneSymbol:"mygene"} as Gene}
+                    [{ mutationType: 'missense', entrezGeneId: 1 } as Mutation],
+                    () => ({
+                        oncoKb: '',
+                        hotspots: true,
+                        cbioportalCount: false,
+                        cosmicCount: true,
+                        customDriverBinary: false,
+                    }),
+                    { 1: { hugoGeneSymbol: 'mygene' } as Gene }
                 ),
                 {
-                    data:[{
-                        mutationType:"missense",
-                        hugoGeneSymbol:"mygene",
-                        entrezGeneId:1,
-                        simplifiedMutationType: getSimplifiedMutationType("missense"),
-                        isHotspot: true,
-                        oncoKbOncogenic: "",
-                        putativeDriver: true
-                    } as AnnotatedMutation],
-                    germline:[],
-                    vus:[],
-                    vusAndGermline:[]
+                    data: [
+                        {
+                            mutationType: 'missense',
+                            hugoGeneSymbol: 'mygene',
+                            entrezGeneId: 1,
+                            simplifiedMutationType: getSimplifiedMutationType(
+                                'missense'
+                            ),
+                            isHotspot: true,
+                            oncoKbOncogenic: '',
+                            putativeDriver: true,
+                        } as AnnotatedMutation,
+                    ],
+                    germline: [],
+                    vus: [],
+                    vusAndGermline: [],
                 }
             );
         });
-        it("annotates a few mutations", ()=>{
+        it('annotates a few mutations', () => {
             assert.deepEqual(
                 filterAndAnnotateMutations(
-                    [{mutationType:"missense", entrezGeneId:1} as Mutation, {mutationType:"in_frame_del", entrezGeneId:1} as Mutation, {mutationType:"asdf", entrezGeneId:134} as Mutation],
-                    ()=>({oncoKb:"", hotspots:true, cbioportalCount:false, cosmicCount:true, customDriverBinary:false}),
-                    {1:{hugoGeneSymbol:"gene1hello"} as Gene, 134:{hugoGeneSymbol:"gene3hello"} as Gene}
+                    [
+                        {
+                            mutationType: 'missense',
+                            entrezGeneId: 1,
+                        } as Mutation,
+                        {
+                            mutationType: 'in_frame_del',
+                            entrezGeneId: 1,
+                        } as Mutation,
+                        { mutationType: 'asdf', entrezGeneId: 134 } as Mutation,
+                    ],
+                    () => ({
+                        oncoKb: '',
+                        hotspots: true,
+                        cbioportalCount: false,
+                        cosmicCount: true,
+                        customDriverBinary: false,
+                    }),
+                    {
+                        1: { hugoGeneSymbol: 'gene1hello' } as Gene,
+                        134: { hugoGeneSymbol: 'gene3hello' } as Gene,
+                    }
                 ),
                 {
-                    data: [{
-                        mutationType:"missense",
-                        hugoGeneSymbol:"gene1hello",
-                        entrezGeneId:1,
-                        simplifiedMutationType: getSimplifiedMutationType("missense"),
-                        isHotspot: true,
-                        oncoKbOncogenic: "",
-                        putativeDriver: true
-                    },{
-                        mutationType:"in_frame_del",
-                        hugoGeneSymbol:"gene1hello",
-                        entrezGeneId:1,
-                        simplifiedMutationType: getSimplifiedMutationType("in_frame_del"),
-                        isHotspot: true,
-                        oncoKbOncogenic: "",
-                        putativeDriver: true
-                    },{
-                        mutationType:"asdf",
-                        hugoGeneSymbol:"gene3hello",
-                        entrezGeneId:134,
-                        simplifiedMutationType: getSimplifiedMutationType("asdf"),
-                        isHotspot: true,
-                        oncoKbOncogenic: "",
-                        putativeDriver: true
-                    }] as AnnotatedMutation[],
-                    vus:[],
-                    germline:[],
-                    vusAndGermline:[]
+                    data: [
+                        {
+                            mutationType: 'missense',
+                            hugoGeneSymbol: 'gene1hello',
+                            entrezGeneId: 1,
+                            simplifiedMutationType: getSimplifiedMutationType(
+                                'missense'
+                            ),
+                            isHotspot: true,
+                            oncoKbOncogenic: '',
+                            putativeDriver: true,
+                        },
+                        {
+                            mutationType: 'in_frame_del',
+                            hugoGeneSymbol: 'gene1hello',
+                            entrezGeneId: 1,
+                            simplifiedMutationType: getSimplifiedMutationType(
+                                'in_frame_del'
+                            ),
+                            isHotspot: true,
+                            oncoKbOncogenic: '',
+                            putativeDriver: true,
+                        },
+                        {
+                            mutationType: 'asdf',
+                            hugoGeneSymbol: 'gene3hello',
+                            entrezGeneId: 134,
+                            simplifiedMutationType: getSimplifiedMutationType(
+                                'asdf'
+                            ),
+                            isHotspot: true,
+                            oncoKbOncogenic: '',
+                            putativeDriver: true,
+                        },
+                    ] as AnnotatedMutation[],
+                    vus: [],
+                    germline: [],
+                    vusAndGermline: [],
                 }
             );
         });
-        it("excludes a single non-annotated mutation", ()=>{
+        it('excludes a single non-annotated mutation', () => {
             assert.deepEqual(
                 filterAndAnnotateMutations(
-                    [{mutationType:"missense", entrezGeneId:1} as Mutation],
-                    ()=>({oncoKb:"", hotspots:false, cbioportalCount:false, cosmicCount:false, customDriverBinary:false}),
-                    {1:{hugoGeneSymbol:"gene1hello"} as Gene, 134:{hugoGeneSymbol:"gene3hello"} as Gene}
+                    [{ mutationType: 'missense', entrezGeneId: 1 } as Mutation],
+                    () => ({
+                        oncoKb: '',
+                        hotspots: false,
+                        cbioportalCount: false,
+                        cosmicCount: false,
+                        customDriverBinary: false,
+                    }),
+                    {
+                        1: { hugoGeneSymbol: 'gene1hello' } as Gene,
+                        134: { hugoGeneSymbol: 'gene3hello' } as Gene,
+                    }
                 ),
                 {
-                    data:[],
-                    germline:[],
-                    vus:[{
-                        mutationType:"missense",
-                        hugoGeneSymbol:"gene1hello",
-                        entrezGeneId:1,
-                        simplifiedMutationType: getSimplifiedMutationType("missense"),
-                        isHotspot: false,
-                        oncoKbOncogenic: "",
-                        putativeDriver: false
-                    }] as AnnotatedMutation[],
-                    vusAndGermline:[]
+                    data: [],
+                    germline: [],
+                    vus: [
+                        {
+                            mutationType: 'missense',
+                            hugoGeneSymbol: 'gene1hello',
+                            entrezGeneId: 1,
+                            simplifiedMutationType: getSimplifiedMutationType(
+                                'missense'
+                            ),
+                            isHotspot: false,
+                            oncoKbOncogenic: '',
+                            putativeDriver: false,
+                        },
+                    ] as AnnotatedMutation[],
+                    vusAndGermline: [],
                 }
             );
         });
-        it("excludes non-annotated mutations from a list of a few", ()=>{
+        it('excludes non-annotated mutations from a list of a few', () => {
             assert.deepEqual(
                 filterAndAnnotateMutations(
-                    [{mutationType:"missense", entrezGeneId:1} as Mutation, {mutationType:"in_frame_del", entrezGeneId:1} as Mutation, {mutationType:"asdf", entrezGeneId:134} as Mutation],
-                    (m)=>(m.mutationType === "in_frame_del" ?
-                        {oncoKb:"", hotspots:false, cbioportalCount:false, cosmicCount:false, customDriverBinary:true}:
-                        {oncoKb:"", hotspots:false, cbioportalCount:false, cosmicCount:false, customDriverBinary:false}
-                    ),
-                    {1:{hugoGeneSymbol:"gene1hello"} as Gene, 134:{hugoGeneSymbol:"gene3hello"} as Gene}
-                    ),
+                    [
+                        {
+                            mutationType: 'missense',
+                            entrezGeneId: 1,
+                        } as Mutation,
+                        {
+                            mutationType: 'in_frame_del',
+                            entrezGeneId: 1,
+                        } as Mutation,
+                        { mutationType: 'asdf', entrezGeneId: 134 } as Mutation,
+                    ],
+                    m =>
+                        m.mutationType === 'in_frame_del'
+                            ? {
+                                  oncoKb: '',
+                                  hotspots: false,
+                                  cbioportalCount: false,
+                                  cosmicCount: false,
+                                  customDriverBinary: true,
+                              }
+                            : {
+                                  oncoKb: '',
+                                  hotspots: false,
+                                  cbioportalCount: false,
+                                  cosmicCount: false,
+                                  customDriverBinary: false,
+                              },
+                    {
+                        1: { hugoGeneSymbol: 'gene1hello' } as Gene,
+                        134: { hugoGeneSymbol: 'gene3hello' } as Gene,
+                    }
+                ),
                 {
-                    data: [{
-                        mutationType:"in_frame_del",
-                        hugoGeneSymbol:"gene1hello",
-                        entrezGeneId:1,
-                        simplifiedMutationType: getSimplifiedMutationType("in_frame_del"),
-                        isHotspot: false,
-                        oncoKbOncogenic: "",
-                        putativeDriver: true
-                    }] as AnnotatedMutation[],
-                    vus:[{
-                        mutationType:"missense",
-                        hugoGeneSymbol:"gene1hello",
-                        entrezGeneId:1,
-                        simplifiedMutationType: getSimplifiedMutationType("missense"),
-                        isHotspot: false,
-                        oncoKbOncogenic: "",
-                        putativeDriver: false
-                    },
-                    {
-                        mutationType:"asdf",
-                        hugoGeneSymbol:"gene3hello",
-                        entrezGeneId:134,
-                        simplifiedMutationType: getSimplifiedMutationType("asdf"),
-                        isHotspot: false,
-                        oncoKbOncogenic: "",
-                        putativeDriver: false
-                    }] as AnnotatedMutation[],
-                    germline:[],
-                    vusAndGermline:[]
+                    data: [
+                        {
+                            mutationType: 'in_frame_del',
+                            hugoGeneSymbol: 'gene1hello',
+                            entrezGeneId: 1,
+                            simplifiedMutationType: getSimplifiedMutationType(
+                                'in_frame_del'
+                            ),
+                            isHotspot: false,
+                            oncoKbOncogenic: '',
+                            putativeDriver: true,
+                        },
+                    ] as AnnotatedMutation[],
+                    vus: [
+                        {
+                            mutationType: 'missense',
+                            hugoGeneSymbol: 'gene1hello',
+                            entrezGeneId: 1,
+                            simplifiedMutationType: getSimplifiedMutationType(
+                                'missense'
+                            ),
+                            isHotspot: false,
+                            oncoKbOncogenic: '',
+                            putativeDriver: false,
+                        },
+                        {
+                            mutationType: 'asdf',
+                            hugoGeneSymbol: 'gene3hello',
+                            entrezGeneId: 134,
+                            simplifiedMutationType: getSimplifiedMutationType(
+                                'asdf'
+                            ),
+                            isHotspot: false,
+                            oncoKbOncogenic: '',
+                            putativeDriver: false,
+                        },
+                    ] as AnnotatedMutation[],
+                    germline: [],
+                    vusAndGermline: [],
                 }
             );
         });
-        it("excludes a single germline mutation", ()=>{
+        it('excludes a single germline mutation', () => {
             assert.deepEqual(
                 filterAndAnnotateMutations(
-                    [{mutationType:"missense", entrezGeneId:1, mutationStatus:"germline"} as Mutation],
-                    ()=>({oncoKb:"", hotspots:false, cbioportalCount:false, cosmicCount:false, customDriverBinary:false}),
-                    {1:{hugoGeneSymbol:"gene1hello"} as Gene, 134:{hugoGeneSymbol:"gene3hello"} as Gene}
-                    ),
+                    [
+                        {
+                            mutationType: 'missense',
+                            entrezGeneId: 1,
+                            mutationStatus: 'germline',
+                        } as Mutation,
+                    ],
+                    () => ({
+                        oncoKb: '',
+                        hotspots: false,
+                        cbioportalCount: false,
+                        cosmicCount: false,
+                        customDriverBinary: false,
+                    }),
+                    {
+                        1: { hugoGeneSymbol: 'gene1hello' } as Gene,
+                        134: { hugoGeneSymbol: 'gene3hello' } as Gene,
+                    }
+                ),
                 {
-                    data:[],
-                    vusAndGermline:[{
-                        mutationType:"missense",
-                        hugoGeneSymbol:"gene1hello",
-                        mutationStatus:"germline",
-                        entrezGeneId:1,
-                        simplifiedMutationType: getSimplifiedMutationType("missense"),
-                        isHotspot: false,
-                        oncoKbOncogenic: "",
-                        putativeDriver: false
-                    }] as AnnotatedMutation[],
-                    vus:[],
-                    germline:[]
+                    data: [],
+                    vusAndGermline: [
+                        {
+                            mutationType: 'missense',
+                            hugoGeneSymbol: 'gene1hello',
+                            mutationStatus: 'germline',
+                            entrezGeneId: 1,
+                            simplifiedMutationType: getSimplifiedMutationType(
+                                'missense'
+                            ),
+                            isHotspot: false,
+                            oncoKbOncogenic: '',
+                            putativeDriver: false,
+                        },
+                    ] as AnnotatedMutation[],
+                    vus: [],
+                    germline: [],
                 }
             );
         });
-        it("excludes germline mutations from a list of a few", ()=>{
+        it('excludes germline mutations from a list of a few', () => {
             assert.deepEqual(
                 filterAndAnnotateMutations(
-                    [{mutationType:"missense", entrezGeneId:1, mutationStatus:"germline"} as Mutation, {mutationType:"in_frame_del", entrezGeneId:1} as Mutation, {mutationType:"asdf", entrezGeneId:134, mutationStatus:"germline"} as Mutation],
-                    (m)=>(m.mutationType === "in_frame_del" ?
-                            {oncoKb:"", hotspots:false, cbioportalCount:false, cosmicCount:false, customDriverBinary:true}:
-                            {oncoKb:"", hotspots:false, cbioportalCount:false, cosmicCount:false, customDriverBinary:false}
-                    ),
-                    {1:{hugoGeneSymbol:"gene1hello"} as Gene, 134:{hugoGeneSymbol:"gene3hello"} as Gene}
+                    [
+                        {
+                            mutationType: 'missense',
+                            entrezGeneId: 1,
+                            mutationStatus: 'germline',
+                        } as Mutation,
+                        {
+                            mutationType: 'in_frame_del',
+                            entrezGeneId: 1,
+                        } as Mutation,
+                        {
+                            mutationType: 'asdf',
+                            entrezGeneId: 134,
+                            mutationStatus: 'germline',
+                        } as Mutation,
+                    ],
+                    m =>
+                        m.mutationType === 'in_frame_del'
+                            ? {
+                                  oncoKb: '',
+                                  hotspots: false,
+                                  cbioportalCount: false,
+                                  cosmicCount: false,
+                                  customDriverBinary: true,
+                              }
+                            : {
+                                  oncoKb: '',
+                                  hotspots: false,
+                                  cbioportalCount: false,
+                                  cosmicCount: false,
+                                  customDriverBinary: false,
+                              },
+                    {
+                        1: { hugoGeneSymbol: 'gene1hello' } as Gene,
+                        134: { hugoGeneSymbol: 'gene3hello' } as Gene,
+                    }
                 ),
                 {
-                    data:[{
-                        mutationType:"in_frame_del",
-                        hugoGeneSymbol:"gene1hello",
-                        entrezGeneId:1,
-                        simplifiedMutationType: getSimplifiedMutationType("in_frame_del"),
-                        isHotspot: false,
-                        oncoKbOncogenic: "",
-                        putativeDriver: true
-                    }] as AnnotatedMutation[],
+                    data: [
+                        {
+                            mutationType: 'in_frame_del',
+                            hugoGeneSymbol: 'gene1hello',
+                            entrezGeneId: 1,
+                            simplifiedMutationType: getSimplifiedMutationType(
+                                'in_frame_del'
+                            ),
+                            isHotspot: false,
+                            oncoKbOncogenic: '',
+                            putativeDriver: true,
+                        },
+                    ] as AnnotatedMutation[],
                     germline: [],
-                    vus:[],
-                    vusAndGermline:[{
-                        mutationType:"missense",
-                        hugoGeneSymbol:"gene1hello",
-                        mutationStatus:"germline",
-                        entrezGeneId:1,
-                        simplifiedMutationType: getSimplifiedMutationType("missense"),
-                        isHotspot: false,
-                        oncoKbOncogenic: "",
-                        putativeDriver: false
-                    },{
-                        mutationType:"asdf",
-                        hugoGeneSymbol:"gene3hello",
-                        mutationStatus:"germline",
-                        entrezGeneId:134,
-                        simplifiedMutationType: getSimplifiedMutationType("asdf"),
-                        isHotspot: false,
-                        oncoKbOncogenic: "",
-                        putativeDriver: false
-                    }] as AnnotatedMutation[]
+                    vus: [],
+                    vusAndGermline: [
+                        {
+                            mutationType: 'missense',
+                            hugoGeneSymbol: 'gene1hello',
+                            mutationStatus: 'germline',
+                            entrezGeneId: 1,
+                            simplifiedMutationType: getSimplifiedMutationType(
+                                'missense'
+                            ),
+                            isHotspot: false,
+                            oncoKbOncogenic: '',
+                            putativeDriver: false,
+                        },
+                        {
+                            mutationType: 'asdf',
+                            hugoGeneSymbol: 'gene3hello',
+                            mutationStatus: 'germline',
+                            entrezGeneId: 134,
+                            simplifiedMutationType: getSimplifiedMutationType(
+                                'asdf'
+                            ),
+                            isHotspot: false,
+                            oncoKbOncogenic: '',
+                            putativeDriver: false,
+                        },
+                    ] as AnnotatedMutation[],
                 }
             );
         });
     });
 
-    describe("getOncoKbOncogenic", ()=>{
-        it("should return Likely Oncogenic if thats the input", ()=>{
-            assert.equal(getOncoKbOncogenic({oncogenic:"Likely Oncogenic"} as IndicatorQueryResp), "Likely Oncogenic");
+    describe('getOncoKbOncogenic', () => {
+        it('should return Likely Oncogenic if thats the input', () => {
+            assert.equal(
+                getOncoKbOncogenic({
+                    oncogenic: 'Likely Oncogenic',
+                } as IndicatorQueryResp),
+                'Likely Oncogenic'
+            );
         });
-        it("should return Oncogenic if thats the input", ()=>{
-            assert.equal(getOncoKbOncogenic({oncogenic:"Oncogenic"} as IndicatorQueryResp), "Oncogenic");
+        it('should return Oncogenic if thats the input', () => {
+            assert.equal(
+                getOncoKbOncogenic({
+                    oncogenic: 'Oncogenic',
+                } as IndicatorQueryResp),
+                'Oncogenic'
+            );
         });
-        it("should return Predicted Oncogenic if thats the input", ()=>{
-            assert.equal(getOncoKbOncogenic({oncogenic:"Predicted Oncogenic"} as IndicatorQueryResp), "Predicted Oncogenic");
+        it('should return Predicted Oncogenic if thats the input', () => {
+            assert.equal(
+                getOncoKbOncogenic({
+                    oncogenic: 'Predicted Oncogenic',
+                } as IndicatorQueryResp),
+                'Predicted Oncogenic'
+            );
         });
-        it("should return empty string for any other case", ()=>{
-            assert.equal(getOncoKbOncogenic({oncogenic:"Likely Neutral"} as IndicatorQueryResp), "");
-            assert.equal(getOncoKbOncogenic({oncogenic:"Inconclusive"} as IndicatorQueryResp), "");
-            assert.equal(getOncoKbOncogenic({oncogenic:"Unknown"} as IndicatorQueryResp), "");
-            assert.equal(getOncoKbOncogenic({oncogenic:""} as IndicatorQueryResp), "");
-            assert.equal(getOncoKbOncogenic({oncogenic:"asdfasdfasefawer"} as IndicatorQueryResp), "");
-            assert.equal(getOncoKbOncogenic({oncogenic:undefined} as any), "");
+        it('should return empty string for any other case', () => {
+            assert.equal(
+                getOncoKbOncogenic({
+                    oncogenic: 'Likely Neutral',
+                } as IndicatorQueryResp),
+                ''
+            );
+            assert.equal(
+                getOncoKbOncogenic({
+                    oncogenic: 'Inconclusive',
+                } as IndicatorQueryResp),
+                ''
+            );
+            assert.equal(
+                getOncoKbOncogenic({
+                    oncogenic: 'Unknown',
+                } as IndicatorQueryResp),
+                ''
+            );
+            assert.equal(
+                getOncoKbOncogenic({ oncogenic: '' } as IndicatorQueryResp),
+                ''
+            );
+            assert.equal(
+                getOncoKbOncogenic({
+                    oncogenic: 'asdfasdfasefawer',
+                } as IndicatorQueryResp),
+                ''
+            );
+            assert.equal(
+                getOncoKbOncogenic({ oncogenic: undefined } as any),
+                ''
+            );
         });
     });
 
-    describe("annotateMolecularDatum", ()=>{
-        it("annotates single element correctly in case of Likely Oncogenic", ()=>{
+    describe('annotateMolecularDatum', () => {
+        it('annotates single element correctly in case of Likely Oncogenic', () => {
             assert.deepEqual(
                 annotateMolecularDatum(
-                    {value:0, molecularProfileId:"profile", entrezGeneId:9} as NumericGeneMolecularData,
-                    (d:NumericGeneMolecularData)=>({oncogenic:"Likely Oncogenic"} as IndicatorQueryResp),
-                    {"profile":{molecularAlterationType:"COPY_NUMBER_ALTERATION"} as MolecularProfile},
-                    { 9: { hugoGeneSymbol:"genesymbol"} as Gene}
+                    {
+                        value: 0,
+                        molecularProfileId: 'profile',
+                        entrezGeneId: 9,
+                    } as NumericGeneMolecularData,
+                    (d: NumericGeneMolecularData) =>
+                        ({
+                            oncogenic: 'Likely Oncogenic',
+                        } as IndicatorQueryResp),
+                    {
+                        profile: {
+                            molecularAlterationType: 'COPY_NUMBER_ALTERATION',
+                        } as MolecularProfile,
+                    },
+                    { 9: { hugoGeneSymbol: 'genesymbol' } as Gene }
                 ),
-                {value:0, molecularProfileId:"profile", oncoKbOncogenic:"Likely Oncogenic", hugoGeneSymbol:"genesymbol", entrezGeneId:9}
+                {
+                    value: 0,
+                    molecularProfileId: 'profile',
+                    oncoKbOncogenic: 'Likely Oncogenic',
+                    hugoGeneSymbol: 'genesymbol',
+                    entrezGeneId: 9,
+                }
             );
         });
-        it("annotates single element correctly in case of Predicted Oncogenic", ()=>{
+        it('annotates single element correctly in case of Predicted Oncogenic', () => {
             assert.deepEqual(
                 annotateMolecularDatum(
-                    {value:0, molecularProfileId:"profile", entrezGeneId:9} as NumericGeneMolecularData,
-                    (d:NumericGeneMolecularData)=>({oncogenic:"Predicted Oncogenic"} as IndicatorQueryResp),
-                    {"profile":{molecularAlterationType:"COPY_NUMBER_ALTERATION"} as MolecularProfile},
-                    { 9: { hugoGeneSymbol:"genesymbol"} as Gene}
+                    {
+                        value: 0,
+                        molecularProfileId: 'profile',
+                        entrezGeneId: 9,
+                    } as NumericGeneMolecularData,
+                    (d: NumericGeneMolecularData) =>
+                        ({
+                            oncogenic: 'Predicted Oncogenic',
+                        } as IndicatorQueryResp),
+                    {
+                        profile: {
+                            molecularAlterationType: 'COPY_NUMBER_ALTERATION',
+                        } as MolecularProfile,
+                    },
+                    { 9: { hugoGeneSymbol: 'genesymbol' } as Gene }
                 ),
-                {value:0, molecularProfileId:"profile", oncoKbOncogenic:"Predicted Oncogenic", hugoGeneSymbol:"genesymbol", entrezGeneId:9}
+                {
+                    value: 0,
+                    molecularProfileId: 'profile',
+                    oncoKbOncogenic: 'Predicted Oncogenic',
+                    hugoGeneSymbol: 'genesymbol',
+                    entrezGeneId: 9,
+                }
             );
         });
-        it("annotates single element correctly in case of Oncogenic", ()=>{
+        it('annotates single element correctly in case of Oncogenic', () => {
             assert.deepEqual(
                 annotateMolecularDatum(
-                    {value:0, molecularProfileId:"profile", entrezGeneId:9} as NumericGeneMolecularData,
-                    (d:NumericGeneMolecularData)=>({oncogenic:"Oncogenic"} as IndicatorQueryResp),
-                    {"profile":{molecularAlterationType:"COPY_NUMBER_ALTERATION"} as MolecularProfile},
-                    { 9: { hugoGeneSymbol:"genesymbol"} as Gene}
+                    {
+                        value: 0,
+                        molecularProfileId: 'profile',
+                        entrezGeneId: 9,
+                    } as NumericGeneMolecularData,
+                    (d: NumericGeneMolecularData) =>
+                        ({ oncogenic: 'Oncogenic' } as IndicatorQueryResp),
+                    {
+                        profile: {
+                            molecularAlterationType: 'COPY_NUMBER_ALTERATION',
+                        } as MolecularProfile,
+                    },
+                    { 9: { hugoGeneSymbol: 'genesymbol' } as Gene }
                 ),
-                {value:0, molecularProfileId:"profile", oncoKbOncogenic:"Oncogenic", hugoGeneSymbol:"genesymbol", entrezGeneId:9}
+                {
+                    value: 0,
+                    molecularProfileId: 'profile',
+                    oncoKbOncogenic: 'Oncogenic',
+                    hugoGeneSymbol: 'genesymbol',
+                    entrezGeneId: 9,
+                }
             );
         });
-        it("annotates single element correctly in case of Likely Neutral, Inconclusive, Unknown, asdfasd, undefined, empty", ()=>{
+        it('annotates single element correctly in case of Likely Neutral, Inconclusive, Unknown, asdfasd, undefined, empty', () => {
             assert.deepEqual(
                 annotateMolecularDatum(
-                    {value:0, molecularProfileId:"profile", entrezGeneId:9} as NumericGeneMolecularData,
-                    (d:NumericGeneMolecularData)=>({oncogenic:"Likely Neutral"} as IndicatorQueryResp),
-                    {"profile":{molecularAlterationType:"COPY_NUMBER_ALTERATION"} as MolecularProfile},
-                    { 9: { hugoGeneSymbol:"genesymbol"} as Gene}
+                    {
+                        value: 0,
+                        molecularProfileId: 'profile',
+                        entrezGeneId: 9,
+                    } as NumericGeneMolecularData,
+                    (d: NumericGeneMolecularData) =>
+                        ({ oncogenic: 'Likely Neutral' } as IndicatorQueryResp),
+                    {
+                        profile: {
+                            molecularAlterationType: 'COPY_NUMBER_ALTERATION',
+                        } as MolecularProfile,
+                    },
+                    { 9: { hugoGeneSymbol: 'genesymbol' } as Gene }
                 ),
-                {value:0, molecularProfileId:"profile", oncoKbOncogenic:"", hugoGeneSymbol:"genesymbol", entrezGeneId:9}
+                {
+                    value: 0,
+                    molecularProfileId: 'profile',
+                    oncoKbOncogenic: '',
+                    hugoGeneSymbol: 'genesymbol',
+                    entrezGeneId: 9,
+                }
             );
             assert.deepEqual(
                 annotateMolecularDatum(
-                    {value:0, molecularProfileId:"profile", entrezGeneId:9} as NumericGeneMolecularData,
-                    (d:NumericGeneMolecularData)=>({oncogenic:"Inconclusive"} as IndicatorQueryResp),
-                    {"profile":{molecularAlterationType:"COPY_NUMBER_ALTERATION"} as MolecularProfile},
-                    { 9: { hugoGeneSymbol:"genesymbol"} as Gene}
+                    {
+                        value: 0,
+                        molecularProfileId: 'profile',
+                        entrezGeneId: 9,
+                    } as NumericGeneMolecularData,
+                    (d: NumericGeneMolecularData) =>
+                        ({ oncogenic: 'Inconclusive' } as IndicatorQueryResp),
+                    {
+                        profile: {
+                            molecularAlterationType: 'COPY_NUMBER_ALTERATION',
+                        } as MolecularProfile,
+                    },
+                    { 9: { hugoGeneSymbol: 'genesymbol' } as Gene }
                 ),
-                {value:0, molecularProfileId:"profile", oncoKbOncogenic:"", hugoGeneSymbol:"genesymbol", entrezGeneId:9}
+                {
+                    value: 0,
+                    molecularProfileId: 'profile',
+                    oncoKbOncogenic: '',
+                    hugoGeneSymbol: 'genesymbol',
+                    entrezGeneId: 9,
+                }
             );
             assert.deepEqual(
                 annotateMolecularDatum(
-                    {value:0, molecularProfileId:"profile", entrezGeneId:9} as NumericGeneMolecularData,
-                    (d:NumericGeneMolecularData)=>({oncogenic:"Unknown"} as IndicatorQueryResp),
-                    {"profile":{molecularAlterationType:"COPY_NUMBER_ALTERATION"} as MolecularProfile},
-                    { 9: { hugoGeneSymbol:"genesymbol"} as Gene}
+                    {
+                        value: 0,
+                        molecularProfileId: 'profile',
+                        entrezGeneId: 9,
+                    } as NumericGeneMolecularData,
+                    (d: NumericGeneMolecularData) =>
+                        ({ oncogenic: 'Unknown' } as IndicatorQueryResp),
+                    {
+                        profile: {
+                            molecularAlterationType: 'COPY_NUMBER_ALTERATION',
+                        } as MolecularProfile,
+                    },
+                    { 9: { hugoGeneSymbol: 'genesymbol' } as Gene }
                 ),
-                {value:0, molecularProfileId:"profile", oncoKbOncogenic:"", hugoGeneSymbol:"genesymbol", entrezGeneId:9}
+                {
+                    value: 0,
+                    molecularProfileId: 'profile',
+                    oncoKbOncogenic: '',
+                    hugoGeneSymbol: 'genesymbol',
+                    entrezGeneId: 9,
+                }
             );
             assert.deepEqual(
                 annotateMolecularDatum(
-                    {value:0, molecularProfileId:"profile", entrezGeneId:9} as NumericGeneMolecularData,
-                    (d:NumericGeneMolecularData)=>({oncogenic:"asdfasdf"} as IndicatorQueryResp),
-                    {"profile":{molecularAlterationType:"COPY_NUMBER_ALTERATION"} as MolecularProfile},
-                    { 9: { hugoGeneSymbol:"genesymbol"} as Gene}
+                    {
+                        value: 0,
+                        molecularProfileId: 'profile',
+                        entrezGeneId: 9,
+                    } as NumericGeneMolecularData,
+                    (d: NumericGeneMolecularData) =>
+                        ({ oncogenic: 'asdfasdf' } as IndicatorQueryResp),
+                    {
+                        profile: {
+                            molecularAlterationType: 'COPY_NUMBER_ALTERATION',
+                        } as MolecularProfile,
+                    },
+                    { 9: { hugoGeneSymbol: 'genesymbol' } as Gene }
                 ),
-                {value:0, molecularProfileId:"profile", oncoKbOncogenic:"", hugoGeneSymbol:"genesymbol", entrezGeneId:9}
+                {
+                    value: 0,
+                    molecularProfileId: 'profile',
+                    oncoKbOncogenic: '',
+                    hugoGeneSymbol: 'genesymbol',
+                    entrezGeneId: 9,
+                }
             );
             assert.deepEqual(
                 annotateMolecularDatum(
-                    {value:0, molecularProfileId:"profile", entrezGeneId:9} as NumericGeneMolecularData,
-                    (d:NumericGeneMolecularData)=>({oncogenic:undefined} as any),
-                    {"profile":{molecularAlterationType:"COPY_NUMBER_ALTERATION"} as MolecularProfile},
-                    { 9: { hugoGeneSymbol:"genesymbol"} as Gene}
+                    {
+                        value: 0,
+                        molecularProfileId: 'profile',
+                        entrezGeneId: 9,
+                    } as NumericGeneMolecularData,
+                    (d: NumericGeneMolecularData) =>
+                        ({ oncogenic: undefined } as any),
+                    {
+                        profile: {
+                            molecularAlterationType: 'COPY_NUMBER_ALTERATION',
+                        } as MolecularProfile,
+                    },
+                    { 9: { hugoGeneSymbol: 'genesymbol' } as Gene }
                 ),
-                {value:0, molecularProfileId:"profile", oncoKbOncogenic:"", hugoGeneSymbol:"genesymbol", entrezGeneId:9}
+                {
+                    value: 0,
+                    molecularProfileId: 'profile',
+                    oncoKbOncogenic: '',
+                    hugoGeneSymbol: 'genesymbol',
+                    entrezGeneId: 9,
+                }
             );
             assert.deepEqual(
                 annotateMolecularDatum(
-                    {value:0, molecularProfileId:"profile", entrezGeneId:9} as NumericGeneMolecularData,
-                    (d:NumericGeneMolecularData)=>({oncogenic:""} as IndicatorQueryResp),
-                    {"profile":{molecularAlterationType:"COPY_NUMBER_ALTERATION"} as MolecularProfile},
-                    { 9: { hugoGeneSymbol:"genesymbol"} as Gene}
+                    {
+                        value: 0,
+                        molecularProfileId: 'profile',
+                        entrezGeneId: 9,
+                    } as NumericGeneMolecularData,
+                    (d: NumericGeneMolecularData) =>
+                        ({ oncogenic: '' } as IndicatorQueryResp),
+                    {
+                        profile: {
+                            molecularAlterationType: 'COPY_NUMBER_ALTERATION',
+                        } as MolecularProfile,
+                    },
+                    { 9: { hugoGeneSymbol: 'genesymbol' } as Gene }
                 ),
-                {value:0, molecularProfileId:"profile", oncoKbOncogenic:"", hugoGeneSymbol:"genesymbol", entrezGeneId:9}
+                {
+                    value: 0,
+                    molecularProfileId: 'profile',
+                    oncoKbOncogenic: '',
+                    hugoGeneSymbol: 'genesymbol',
+                    entrezGeneId: 9,
+                }
             );
         });
-        it("annotates non-copy number data with empty string", ()=>{
+        it('annotates non-copy number data with empty string', () => {
             assert.deepEqual(
                 annotateMolecularDatum(
-                    {value:0, molecularProfileId:"profile", entrezGeneId:9} as NumericGeneMolecularData,
-                    (d:NumericGeneMolecularData)=>({oncogenic:"Oncogenic"} as IndicatorQueryResp),
-                    {"profile":{molecularAlterationType:"MUTATION_EXTENDED"} as MolecularProfile},
-                    { 9: { hugoGeneSymbol:"genesymbol"} as Gene}
+                    {
+                        value: 0,
+                        molecularProfileId: 'profile',
+                        entrezGeneId: 9,
+                    } as NumericGeneMolecularData,
+                    (d: NumericGeneMolecularData) =>
+                        ({ oncogenic: 'Oncogenic' } as IndicatorQueryResp),
+                    {
+                        profile: {
+                            molecularAlterationType: 'MUTATION_EXTENDED',
+                        } as MolecularProfile,
+                    },
+                    { 9: { hugoGeneSymbol: 'genesymbol' } as Gene }
                 ),
-                {value:0, molecularProfileId:"profile", oncoKbOncogenic:"", hugoGeneSymbol:"genesymbol", entrezGeneId:9}
+                {
+                    value: 0,
+                    molecularProfileId: 'profile',
+                    oncoKbOncogenic: '',
+                    hugoGeneSymbol: 'genesymbol',
+                    entrezGeneId: 9,
+                }
             );
             assert.deepEqual(
                 annotateMolecularDatum(
-                    {value:0, molecularProfileId:"profile", entrezGeneId:9} as NumericGeneMolecularData,
-                    (d:NumericGeneMolecularData)=>({oncogenic:"Oncogenic"} as IndicatorQueryResp),
-                    {"profile":{molecularAlterationType:"MRNA_EXPRESSION"} as MolecularProfile},
-                    { 9: { hugoGeneSymbol:"genesymbol"} as Gene}
+                    {
+                        value: 0,
+                        molecularProfileId: 'profile',
+                        entrezGeneId: 9,
+                    } as NumericGeneMolecularData,
+                    (d: NumericGeneMolecularData) =>
+                        ({ oncogenic: 'Oncogenic' } as IndicatorQueryResp),
+                    {
+                        profile: {
+                            molecularAlterationType: 'MRNA_EXPRESSION',
+                        } as MolecularProfile,
+                    },
+                    { 9: { hugoGeneSymbol: 'genesymbol' } as Gene }
                 ),
-                {value:0, molecularProfileId:"profile", oncoKbOncogenic:"", hugoGeneSymbol:"genesymbol", entrezGeneId:9}
+                {
+                    value: 0,
+                    molecularProfileId: 'profile',
+                    oncoKbOncogenic: '',
+                    hugoGeneSymbol: 'genesymbol',
+                    entrezGeneId: 9,
+                }
             );
             assert.deepEqual(
                 annotateMolecularDatum(
-                    {value:0, molecularProfileId:"profile", entrezGeneId:9} as NumericGeneMolecularData,
-                    (d:NumericGeneMolecularData)=>({oncogenic:"Oncogenic"} as IndicatorQueryResp),
-                    {"profile":{molecularAlterationType:"PROTEIN_LEVEL"} as MolecularProfile},
-                    { 9: { hugoGeneSymbol:"genesymbol"} as Gene}
+                    {
+                        value: 0,
+                        molecularProfileId: 'profile',
+                        entrezGeneId: 9,
+                    } as NumericGeneMolecularData,
+                    (d: NumericGeneMolecularData) =>
+                        ({ oncogenic: 'Oncogenic' } as IndicatorQueryResp),
+                    {
+                        profile: {
+                            molecularAlterationType: 'PROTEIN_LEVEL',
+                        } as MolecularProfile,
+                    },
+                    { 9: { hugoGeneSymbol: 'genesymbol' } as Gene }
                 ),
-                {value:0, molecularProfileId:"profile", oncoKbOncogenic:"", hugoGeneSymbol:"genesymbol", entrezGeneId:9}
+                {
+                    value: 0,
+                    molecularProfileId: 'profile',
+                    oncoKbOncogenic: '',
+                    hugoGeneSymbol: 'genesymbol',
+                    entrezGeneId: 9,
+                }
             );
             assert.deepEqual(
                 annotateMolecularDatum(
-                    {value:0, molecularProfileId:"profile", entrezGeneId:9} as NumericGeneMolecularData,
-                    (d:NumericGeneMolecularData)=>({oncogenic:"Oncogenic"} as IndicatorQueryResp),
-                    {"profile":{molecularAlterationType:"FUSION"} as MolecularProfile},
-                    { 9: { hugoGeneSymbol:"genesymbol"} as Gene}
+                    {
+                        value: 0,
+                        molecularProfileId: 'profile',
+                        entrezGeneId: 9,
+                    } as NumericGeneMolecularData,
+                    (d: NumericGeneMolecularData) =>
+                        ({ oncogenic: 'Oncogenic' } as IndicatorQueryResp),
+                    {
+                        profile: {
+                            molecularAlterationType: 'FUSION',
+                        } as MolecularProfile,
+                    },
+                    { 9: { hugoGeneSymbol: 'genesymbol' } as Gene }
                 ),
-                {value:0, molecularProfileId:"profile", oncoKbOncogenic:"", hugoGeneSymbol:"genesymbol", entrezGeneId:9}
+                {
+                    value: 0,
+                    molecularProfileId: 'profile',
+                    oncoKbOncogenic: '',
+                    hugoGeneSymbol: 'genesymbol',
+                    entrezGeneId: 9,
+                }
             );
         });
     });
 
-
-
     describe('getDefaultSelectedStudiesForExpressionTab', () => {
-
         it('recognizes pub tcga study', () => {
-            const studyId = "blca_tcga_pub";
+            const studyId = 'blca_tcga_pub';
             assert.isTrue(isTCGAPubStudy(studyId));
             assert.isFalse(isTCGAProvStudy(studyId));
             assert.isFalse(isPanCanStudy(studyId));
         });
 
         it('recognizes provisional tcga study', () => {
-            const studyId = "blca_tcga";
+            const studyId = 'blca_tcga';
             assert.isFalse(isTCGAPubStudy(studyId));
             assert.isTrue(isTCGAProvStudy(studyId));
             assert.isFalse(isPanCanStudy(studyId));
         });
 
         it('recognizes pan can tcga study', () => {
-            const studyId = "blca_tcga_pan_can_atlas_2018";
+            const studyId = 'blca_tcga_pan_can_atlas_2018';
             assert.isFalse(isTCGAPubStudy(studyId));
             assert.isFalse(isTCGAProvStudy(studyId));
             assert.isTrue(isPanCanStudy(studyId));
         });
-
     });
 
-
-    describe("computeGenePanelInformation", ()=>{
-        const genes:Gene[] = [];
-        const samples:Sample[] = [];
-        const patients:Patient[] = [];
-        let genePanelDatum1:any, genePanelDatum2:any, wxsDatum1:any, nsDatum1:any, nsDatum2:any;
-        let genePanels:any[] = [];
-        before(()=>{
-
+    describe('computeGenePanelInformation', () => {
+        const genes: Gene[] = [];
+        const samples: Sample[] = [];
+        const patients: Patient[] = [];
+        let genePanelDatum1: any,
+            genePanelDatum2: any,
+            wxsDatum1: any,
+            nsDatum1: any,
+            nsDatum2: any;
+        let genePanels: any[] = [];
+        before(() => {
             genes.push({
-                entrezGeneId:0,
-                hugoGeneSymbol:"GENE1"
+                entrezGeneId: 0,
+                hugoGeneSymbol: 'GENE1',
             } as Gene);
             genes.push({
-                entrezGeneId:1,
-                hugoGeneSymbol:"GENE2"
+                entrezGeneId: 1,
+                hugoGeneSymbol: 'GENE2',
             } as Gene);
             genes.push({
-                entrezGeneId:2,
-                hugoGeneSymbol:"GENE3"
+                entrezGeneId: 2,
+                hugoGeneSymbol: 'GENE3',
             } as Gene);
 
             genePanels.push({
-                genePanelId:"GENEPANEL1",
-                genes:[genes[0], genes[1]]
+                genePanelId: 'GENEPANEL1',
+                genes: [genes[0], genes[1]],
             });
 
             genePanels.push({
-                genePanelId:"GENEPANEL2",
-                genes:[genes[0], genes[1]]
+                genePanelId: 'GENEPANEL2',
+                genes: [genes[0], genes[1]],
             });
 
             samples.push({
-                uniqueSampleKey:"PATIENT1 SAMPLE1"
+                uniqueSampleKey: 'PATIENT1 SAMPLE1',
             } as Sample);
             samples.push({
-                uniqueSampleKey:"PATIENT1 SAMPLE2"
+                uniqueSampleKey: 'PATIENT1 SAMPLE2',
             } as Sample);
             samples.push({
-                uniqueSampleKey:"PATIENT2 SAMPLE1"
+                uniqueSampleKey: 'PATIENT2 SAMPLE1',
             } as Sample);
 
             patients.push({
-                uniquePatientKey:"PATIENT1"
+                uniquePatientKey: 'PATIENT1',
             } as Patient);
             patients.push({
-                uniquePatientKey:"PATIENT2"
+                uniquePatientKey: 'PATIENT2',
             } as Patient);
 
             genePanelDatum1 = {
-                uniqueSampleKey: "PATIENT1 SAMPLE1",
-                uniquePatientKey: "PATIENT1",
-                molecularProfileId: "PROFILE",
-                genePanelId: "GENEPANEL1",
-                profiled: true
+                uniqueSampleKey: 'PATIENT1 SAMPLE1',
+                uniquePatientKey: 'PATIENT1',
+                molecularProfileId: 'PROFILE',
+                genePanelId: 'GENEPANEL1',
+                profiled: true,
             };
 
             genePanelDatum2 = {
-                uniqueSampleKey: "PATIENT2 SAMPLE1",
-                uniquePatientKey: "PATIENT2",
-                molecularProfileId: "PROFILE",
-                genePanelId: "GENEPANEL2",
-                profiled: true
+                uniqueSampleKey: 'PATIENT2 SAMPLE1',
+                uniquePatientKey: 'PATIENT2',
+                molecularProfileId: 'PROFILE',
+                genePanelId: 'GENEPANEL2',
+                profiled: true,
             };
 
             wxsDatum1 = {
-                uniqueSampleKey:"PATIENT1 SAMPLE2",
-                uniquePatientKey: "PATIENT1",
-                molecularProfileId: "PROFILE",
-                profiled: true
+                uniqueSampleKey: 'PATIENT1 SAMPLE2',
+                uniquePatientKey: 'PATIENT1',
+                molecularProfileId: 'PROFILE',
+                profiled: true,
             };
 
-
             nsDatum1 = {
                 entrezGeneId: 2,
-                molecularProfileId: "PROFILE",
-                uniqueSampleKey: "PATIENT1 SAMPLE1",
-                uniquePatientKey: "PATIENT1",
-                profiled: false
+                molecularProfileId: 'PROFILE',
+                uniqueSampleKey: 'PATIENT1 SAMPLE1',
+                uniquePatientKey: 'PATIENT1',
+                profiled: false,
             };
 
             nsDatum2 = {
                 entrezGeneId: 2,
-                molecularProfileId: "PROFILE",
-                uniqueSampleKey: "PATIENT2 SAMPLE1",
-                uniquePatientKey: "PATIENT2",
-                profiled: false
+                molecularProfileId: 'PROFILE',
+                uniqueSampleKey: 'PATIENT2 SAMPLE1',
+                uniquePatientKey: 'PATIENT2',
+                profiled: false,
             };
         });
-        it("computes the correct object with no input data", ()=>{
+        it('computes the correct object with no input data', () => {
             assert.deepEqual(
-                computeGenePanelInformation([], genePanels, samples, patients, genes),
+                computeGenePanelInformation(
+                    [],
+                    genePanels,
+                    samples,
+                    patients,
+                    genes
+                ),
                 {
                     samples: {
-                        "PATIENT1 SAMPLE1": {
-                            byGene:{},
-                            allGenes:[],
-                            notProfiledByGene:{},
-                            notProfiledAllGenes:[]
+                        'PATIENT1 SAMPLE1': {
+                            byGene: {},
+                            allGenes: [],
+                            notProfiledByGene: {},
+                            notProfiledAllGenes: [],
                         },
-                        "PATIENT1 SAMPLE2": {
-                            byGene:{},
-                            allGenes:[],
-                            notProfiledByGene:{},
-                            notProfiledAllGenes:[]
+                        'PATIENT1 SAMPLE2': {
+                            byGene: {},
+                            allGenes: [],
+                            notProfiledByGene: {},
+                            notProfiledAllGenes: [],
+                        },
+                        'PATIENT2 SAMPLE1': {
+                            byGene: {},
+                            allGenes: [],
+                            notProfiledByGene: {},
+                            notProfiledAllGenes: [],
                         },
-                        "PATIENT2 SAMPLE1": {
-                            byGene:{},
-                            allGenes:[],
-                            notProfiledByGene:{},
-                            notProfiledAllGenes:[]
-                        }
                     },
                     patients: {
-                        "PATIENT1": {
-                            byGene:{},
-                            allGenes:[],
-                            notProfiledByGene:{},
-                            notProfiledAllGenes:[]
+                        PATIENT1: {
+                            byGene: {},
+                            allGenes: [],
+                            notProfiledByGene: {},
+                            notProfiledAllGenes: [],
                         },
-                        "PATIENT2": {
-                            byGene:{},
-                            allGenes:[],
-                            notProfiledByGene:{},
-                            notProfiledAllGenes:[]
-                        }
-                    }
+                        PATIENT2: {
+                            byGene: {},
+                            allGenes: [],
+                            notProfiledByGene: {},
+                            notProfiledAllGenes: [],
+                        },
+                    },
                 }
             );
         });
-        it("computes the correct object with gene panel data", ()=>{
+        it('computes the correct object with gene panel data', () => {
             assert.deepEqual(
-                computeGenePanelInformation([
-                    genePanelDatum1, genePanelDatum2
-                ] as GenePanelData[], genePanels, samples, patients, genes),
+                computeGenePanelInformation(
+                    [genePanelDatum1, genePanelDatum2] as GenePanelData[],
+                    genePanels,
+                    samples,
+                    patients,
+                    genes
+                ),
                 {
                     samples: {
-                        "PATIENT1 SAMPLE1": {
-                            byGene:{"GENE1":[genePanelDatum1], "GENE2":[genePanelDatum1]},
-                            allGenes:[],
-                            notProfiledByGene:{"GENE3":[genePanelDatum1]},
-                            notProfiledAllGenes:[]
+                        'PATIENT1 SAMPLE1': {
+                            byGene: {
+                                GENE1: [genePanelDatum1],
+                                GENE2: [genePanelDatum1],
+                            },
+                            allGenes: [],
+                            notProfiledByGene: { GENE3: [genePanelDatum1] },
+                            notProfiledAllGenes: [],
                         },
-                        "PATIENT1 SAMPLE2": {
-                            byGene:{},
-                            allGenes:[],
-                            notProfiledByGene:{},
-                            notProfiledAllGenes:[]
+                        'PATIENT1 SAMPLE2': {
+                            byGene: {},
+                            allGenes: [],
+                            notProfiledByGene: {},
+                            notProfiledAllGenes: [],
+                        },
+                        'PATIENT2 SAMPLE1': {
+                            byGene: {
+                                GENE1: [genePanelDatum2],
+                                GENE2: [genePanelDatum2],
+                            },
+                            allGenes: [],
+                            notProfiledByGene: { GENE3: [genePanelDatum2] },
+                            notProfiledAllGenes: [],
                         },
-                        "PATIENT2 SAMPLE1": {
-                            byGene:{"GENE1":[genePanelDatum2], "GENE2":[genePanelDatum2]},
-                            allGenes:[],
-                            notProfiledByGene:{"GENE3":[genePanelDatum2]},
-                            notProfiledAllGenes:[]
-                        }
                     },
                     patients: {
-                        "PATIENT1": {
-                            byGene:{"GENE1":[genePanelDatum1], "GENE2":[genePanelDatum1]},
-                            allGenes:[],
-                            notProfiledByGene:{"GENE3":[genePanelDatum1]},
-                            notProfiledAllGenes:[]
+                        PATIENT1: {
+                            byGene: {
+                                GENE1: [genePanelDatum1],
+                                GENE2: [genePanelDatum1],
+                            },
+                            allGenes: [],
+                            notProfiledByGene: { GENE3: [genePanelDatum1] },
+                            notProfiledAllGenes: [],
                         },
-                        "PATIENT2": {
-                            byGene:{"GENE1":[genePanelDatum2], "GENE2":[genePanelDatum2]},
-                            allGenes:[],
-                            notProfiledByGene:{"GENE3":[genePanelDatum2]},
-                            notProfiledAllGenes:[]
-                        }
-                    }
+                        PATIENT2: {
+                            byGene: {
+                                GENE1: [genePanelDatum2],
+                                GENE2: [genePanelDatum2],
+                            },
+                            allGenes: [],
+                            notProfiledByGene: { GENE3: [genePanelDatum2] },
+                            notProfiledAllGenes: [],
+                        },
+                    },
                 }
             );
         });
-        it("computes the correct object with whole exome sequenced data", ()=>{
+        it('computes the correct object with whole exome sequenced data', () => {
             assert.deepEqual(
-                computeGenePanelInformation([
-                    wxsDatum1
-                ] as GenePanelData[], genePanels, samples, patients, genes),
+                computeGenePanelInformation(
+                    [wxsDatum1] as GenePanelData[],
+                    genePanels,
+                    samples,
+                    patients,
+                    genes
+                ),
                 {
                     samples: {
-                        "PATIENT1 SAMPLE1": {
-                            byGene:{},
-                            allGenes:[],
-                            notProfiledByGene:{},
-                            notProfiledAllGenes:[]
+                        'PATIENT1 SAMPLE1': {
+                            byGene: {},
+                            allGenes: [],
+                            notProfiledByGene: {},
+                            notProfiledAllGenes: [],
                         },
-                        "PATIENT1 SAMPLE2": {
-                            byGene:{},
-                            allGenes:[wxsDatum1],
-                            notProfiledByGene:{},
-                            notProfiledAllGenes:[]
+                        'PATIENT1 SAMPLE2': {
+                            byGene: {},
+                            allGenes: [wxsDatum1],
+                            notProfiledByGene: {},
+                            notProfiledAllGenes: [],
+                        },
+                        'PATIENT2 SAMPLE1': {
+                            byGene: {},
+                            allGenes: [],
+                            notProfiledByGene: {},
+                            notProfiledAllGenes: [],
                         },
-                        "PATIENT2 SAMPLE1": {
-                            byGene:{},
-                            allGenes:[],
-                            notProfiledByGene:{},
-                            notProfiledAllGenes:[]
-                        }
                     },
                     patients: {
-                        "PATIENT1": {
-                            byGene:{},
-                            allGenes:[wxsDatum1],
-                            notProfiledByGene:{},
-                            notProfiledAllGenes:[]
+                        PATIENT1: {
+                            byGene: {},
+                            allGenes: [wxsDatum1],
+                            notProfiledByGene: {},
+                            notProfiledAllGenes: [],
                         },
-                        "PATIENT2": {
-                            byGene:{},
-                            allGenes:[],
-                            notProfiledByGene:{},
-                            notProfiledAllGenes:[]
-                        }
-                    }
+                        PATIENT2: {
+                            byGene: {},
+                            allGenes: [],
+                            notProfiledByGene: {},
+                            notProfiledAllGenes: [],
+                        },
+                    },
                 }
             );
         });
-        it("computes the correct object with not sequenced data", ()=>{
+        it('computes the correct object with not sequenced data', () => {
             assert.deepEqual(
-                computeGenePanelInformation([
-                    nsDatum1, nsDatum2
-                ] as GenePanelData[], genePanels, samples, patients, genes),
+                computeGenePanelInformation(
+                    [nsDatum1, nsDatum2] as GenePanelData[],
+                    genePanels,
+                    samples,
+                    patients,
+                    genes
+                ),
                 {
                     samples: {
-                        "PATIENT1 SAMPLE1": {
-                            byGene:{},
-                            allGenes:[],
-                            notProfiledByGene:{},
-                            notProfiledAllGenes:[nsDatum1]
+                        'PATIENT1 SAMPLE1': {
+                            byGene: {},
+                            allGenes: [],
+                            notProfiledByGene: {},
+                            notProfiledAllGenes: [nsDatum1],
+                        },
+                        'PATIENT1 SAMPLE2': {
+                            byGene: {},
+                            allGenes: [],
+                            notProfiledByGene: {},
+                            notProfiledAllGenes: [],
                         },
-                        "PATIENT1 SAMPLE2": {
-                            byGene:{},
-                            allGenes:[],
-                            notProfiledByGene:{},
-                            notProfiledAllGenes:[]
+                        'PATIENT2 SAMPLE1': {
+                            byGene: {},
+                            allGenes: [],
+                            notProfiledByGene: {},
+                            notProfiledAllGenes: [nsDatum2],
                         },
-                        "PATIENT2 SAMPLE1": {
-                            byGene:{},
-                            allGenes:[],
-                            notProfiledByGene:{},
-                            notProfiledAllGenes:[nsDatum2]
-                        }
                     },
                     patients: {
-                        "PATIENT1": {
-                            byGene:{},
-                            allGenes:[],
-                            notProfiledByGene:{},
-                            notProfiledAllGenes:[nsDatum1]
+                        PATIENT1: {
+                            byGene: {},
+                            allGenes: [],
+                            notProfiledByGene: {},
+                            notProfiledAllGenes: [nsDatum1],
                         },
-                        "PATIENT2": {
-                            byGene:{},
-                            allGenes:[],
-                            notProfiledByGene:{},
-                            notProfiledAllGenes:[nsDatum2]
-                        }
-                    }
+                        PATIENT2: {
+                            byGene: {},
+                            allGenes: [],
+                            notProfiledByGene: {},
+                            notProfiledAllGenes: [nsDatum2],
+                        },
+                    },
                 }
             );
         });
-        it("computes the correct object with gene panel data and whole exome sequenced data" /*and not sequenced data"*/, ()=>{
+        it('computes the correct object with gene panel data and whole exome sequenced data' /*and not sequenced data"*/, () => {
             assert.deepEqual(
-                computeGenePanelInformation([
-                    genePanelDatum1, genePanelDatum2,
-                    wxsDatum1
-                    ,nsDatum1, nsDatum2
-                ] as GenePanelData[], genePanels, samples, patients, genes),
+                computeGenePanelInformation(
+                    [
+                        genePanelDatum1,
+                        genePanelDatum2,
+                        wxsDatum1,
+                        nsDatum1,
+                        nsDatum2,
+                    ] as GenePanelData[],
+                    genePanels,
+                    samples,
+                    patients,
+                    genes
+                ),
                 {
                     samples: {
-                        "PATIENT1 SAMPLE1": {
-                            byGene:{"GENE1":[genePanelDatum1], "GENE2":[genePanelDatum1]},
-                            allGenes:[],
-                            notProfiledByGene:{"GENE3":[genePanelDatum1]},
-                            notProfiledAllGenes:[nsDatum1]
+                        'PATIENT1 SAMPLE1': {
+                            byGene: {
+                                GENE1: [genePanelDatum1],
+                                GENE2: [genePanelDatum1],
+                            },
+                            allGenes: [],
+                            notProfiledByGene: { GENE3: [genePanelDatum1] },
+                            notProfiledAllGenes: [nsDatum1],
                         },
-                        "PATIENT1 SAMPLE2": {
-                            byGene:{},
-                            allGenes:[wxsDatum1],
-                            notProfiledByGene:{},
-                            notProfiledAllGenes:[]
+                        'PATIENT1 SAMPLE2': {
+                            byGene: {},
+                            allGenes: [wxsDatum1],
+                            notProfiledByGene: {},
+                            notProfiledAllGenes: [],
+                        },
+                        'PATIENT2 SAMPLE1': {
+                            byGene: {
+                                GENE1: [genePanelDatum2],
+                                GENE2: [genePanelDatum2],
+                            },
+                            allGenes: [],
+                            notProfiledByGene: { GENE3: [genePanelDatum2] },
+                            notProfiledAllGenes: [nsDatum2],
                         },
-                        "PATIENT2 SAMPLE1": {
-                            byGene:{"GENE1":[genePanelDatum2], "GENE2":[genePanelDatum2]},
-                            allGenes:[],
-                            notProfiledByGene:{"GENE3":[genePanelDatum2]},
-                            notProfiledAllGenes:[nsDatum2]
-                        }
                     },
                     patients: {
-                        "PATIENT1": {
-                            byGene:{"GENE1":[genePanelDatum1], "GENE2":[genePanelDatum1]},
-                            allGenes:[wxsDatum1],
-                            notProfiledByGene:{"GENE3":[genePanelDatum1]},
-                            notProfiledAllGenes:[nsDatum1]
+                        PATIENT1: {
+                            byGene: {
+                                GENE1: [genePanelDatum1],
+                                GENE2: [genePanelDatum1],
+                            },
+                            allGenes: [wxsDatum1],
+                            notProfiledByGene: { GENE3: [genePanelDatum1] },
+                            notProfiledAllGenes: [nsDatum1],
                         },
-                        "PATIENT2": {
-                            byGene:{"GENE1":[genePanelDatum2], "GENE2":[genePanelDatum2]},
-                            allGenes:[],
-                            notProfiledByGene:{"GENE3":[genePanelDatum2]},
-                            notProfiledAllGenes:[nsDatum2]
-                        }
-                    }
+                        PATIENT2: {
+                            byGene: {
+                                GENE1: [genePanelDatum2],
+                                GENE2: [genePanelDatum2],
+                            },
+                            allGenes: [],
+                            notProfiledByGene: { GENE3: [genePanelDatum2] },
+                            notProfiledAllGenes: [nsDatum2],
+                        },
+                    },
                 }
             );
         });
     });
 
-    describe('getRNASeqProfiles',()=>{
-
-        it('properly recognizes expression profile based on patterns in id',()=>{
-            assert.isFalse(isRNASeqProfile(""), "blank is false");
-            assert.isTrue(isRNASeqProfile("acc_tcga_rna_seq_v2_mrna"),"matches seq v2 id");
-            assert.isTrue(isRNASeqProfile("chol_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median"),'matches pan can v2');
-            assert.isTrue(isRNASeqProfile("laml_tcga_rna_seq_mrna"));
-            assert.isFalse(isRNASeqProfile("chol_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median_Zscores"), 'doesn\'t match zscores profils');
+    describe('getRNASeqProfiles', () => {
+        it('properly recognizes expression profile based on patterns in id', () => {
+            assert.isFalse(isRNASeqProfile(''), 'blank is false');
+            assert.isTrue(
+                isRNASeqProfile('acc_tcga_rna_seq_v2_mrna'),
+                'matches seq v2 id'
+            );
+            assert.isTrue(
+                isRNASeqProfile(
+                    'chol_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median'
+                ),
+                'matches pan can v2'
+            );
+            assert.isTrue(isRNASeqProfile('laml_tcga_rna_seq_mrna'));
+            assert.isFalse(
+                isRNASeqProfile(
+                    'chol_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median_Zscores'
+                ),
+                "doesn't match zscores profils"
+            );
         });
-
     });
 
-    describe("getQueriedStudies", ()=>{
-
+    describe('getQueriedStudies', () => {
         const virtualStudy: VirtualStudy = {
-            "id": "shared_study",
-            "data": {
-                "name": "Shared Study",
-                "description": "Shared Study",
-                "studies": [
-                    {
-                        "id": "test_study",
-                        "samples": [
-                        "sample-01",
-                        "sample-02",
-                        "sample-03"
-                        ]
-                    }
+            id: 'shared_study',
+            data: {
+                name: 'Shared Study',
+                description: 'Shared Study',
+                studies: [
+                    {
+                        id: 'test_study',
+                        samples: ['sample-01', 'sample-02', 'sample-03'],
+                    },
                 ],
-            } as VirtualStudyData
+            } as VirtualStudyData,
         } as VirtualStudy;
 
         let physicalStudies: { [id: string]: CancerStudy } = {
-            'physical_study_1': {
+            physical_study_1: {
                 studyId: 'physical_study_1',
             } as CancerStudy,
-            'physical_study_2': {
+            physical_study_2: {
                 studyId: 'physical_study_2',
-            } as CancerStudy
+            } as CancerStudy,
         };
 
         let virtualStudies: VirtualStudy[] = [
-            $.extend({},virtualStudy,{"id": "virtual_study_1"}) as VirtualStudy,
-            $.extend({},virtualStudy,{"id": "virtual_study_2"}) as VirtualStudy
+            $.extend({}, virtualStudy, {
+                id: 'virtual_study_1',
+            }) as VirtualStudy,
+            $.extend({}, virtualStudy, {
+                id: 'virtual_study_2',
+            }) as VirtualStudy,
         ];
 
-        before(()=>{
-            sinon.stub(sessionServiceClient, "getUserVirtualStudies").callsFake(function fakeFn(id:string) {
-                return new Promise((resolve, reject) => {
-                    resolve(virtualStudies);
+        before(() => {
+            sinon
+                .stub(sessionServiceClient, 'getUserVirtualStudies')
+                .callsFake(function fakeFn(id: string) {
+                    return new Promise((resolve, reject) => {
+                        resolve(virtualStudies);
+                    });
                 });
-            });
             //
-            sinon.stub(client, "fetchStudiesUsingPOST").callsFake(function fakeFn(parameters: {
-                'studyIds': Array < string > ,
-                'projection' ? : "ID" | "SUMMARY" | "DETAILED" | "META"
-            }) {
-                return new Promise((resolve, reject) => {
-                    resolve(_.reduce(parameters.studyIds,(acc:CancerStudy[],next)=>{
-                        let obj = physicalStudies[next]
-                        if(!_.isUndefined(obj)){
-                            acc.push(obj)
-                        }
-                        return acc
-                    },[]))
+            sinon
+                .stub(client, 'fetchStudiesUsingPOST')
+                .callsFake(function fakeFn(parameters: {
+                    studyIds: Array<string>;
+                    projection?: 'ID' | 'SUMMARY' | 'DETAILED' | 'META';
+                }) {
+                    return new Promise((resolve, reject) => {
+                        resolve(
+                            _.reduce(
+                                parameters.studyIds,
+                                (acc: CancerStudy[], next) => {
+                                    let obj = physicalStudies[next];
+                                    if (!_.isUndefined(obj)) {
+                                        acc.push(obj);
+                                    }
+                                    return acc;
+                                },
+                                []
+                            )
+                        );
+                    });
                 });
-            });
-        })
+        });
         after(() => {
             //(sessionServiceClient.getVirtualStudy as sinon.SinonStub).restore();
             //(client.fetchStudiesUsingPOST as sinon.SinonStub).restore();
         });
 
-        it("when queried ids is empty", async ()=>{
-            let test = await fetchQueriedStudies({},[], []);
-            assert.deepEqual(test,[]);
+        it('when queried ids is empty', async () => {
+            let test = await fetchQueriedStudies({}, [], []);
+            assert.deepEqual(test, []);
         });
 
-        it("when only physical studies are present", async ()=>{
-            let test = await fetchQueriedStudies(physicalStudies,['physical_study_1', 'physical_study_2'], virtualStudies);
-            assert.deepEqual(_.map(test,obj=>obj.studyId), ['physical_study_1', 'physical_study_2']);
+        it('when only physical studies are present', async () => {
+            let test = await fetchQueriedStudies(
+                physicalStudies,
+                ['physical_study_1', 'physical_study_2'],
+                virtualStudies
+            );
+            assert.deepEqual(_.map(test, obj => obj.studyId), [
+                'physical_study_1',
+                'physical_study_2',
+            ]);
         });
 
-        it("when only virtual studies are present", async ()=>{
-            let test = await fetchQueriedStudies({},['virtual_study_1', 'virtual_study_2'], virtualStudies);
-            assert.deepEqual(_.map(test,obj=>obj.studyId), ['virtual_study_1', 'virtual_study_2']);
+        it('when only virtual studies are present', async () => {
+            let test = await fetchQueriedStudies(
+                {},
+                ['virtual_study_1', 'virtual_study_2'],
+                virtualStudies
+            );
+            assert.deepEqual(_.map(test, obj => obj.studyId), [
+                'virtual_study_1',
+                'virtual_study_2',
+            ]);
         });
 
-        it("when physical and virtual studies are present", async ()=>{
-            let test = await fetchQueriedStudies(physicalStudies, ['physical_study_1', 'virtual_study_2'], virtualStudies);
-            assert.deepEqual(_.map(test,obj=>obj.studyId), ['physical_study_1', 'virtual_study_2']);
+        it('when physical and virtual studies are present', async () => {
+            let test = await fetchQueriedStudies(
+                physicalStudies,
+                ['physical_study_1', 'virtual_study_2'],
+                virtualStudies
+            );
+            assert.deepEqual(_.map(test, obj => obj.studyId), [
+                'physical_study_1',
+                'virtual_study_2',
+            ]);
         });
 
-        it("when there only a subset of studies in studySampleMap compared to queriedIds", async ()=>{
-            let test = await fetchQueriedStudies({ 'physical_study_1': { studyId: 'physical_study_1'} as CancerStudy},['physical_study_1','physical_study_2'], virtualStudies);
-            assert.deepEqual(_.map(test,obj=>obj.studyId), ['physical_study_1', 'physical_study_2']);
+        it('when there only a subset of studies in studySampleMap compared to queriedIds', async () => {
+            let test = await fetchQueriedStudies(
+                {
+                    physical_study_1: {
+                        studyId: 'physical_study_1',
+                    } as CancerStudy,
+                },
+                ['physical_study_1', 'physical_study_2'],
+                virtualStudies
+            );
+            assert.deepEqual(_.map(test, obj => obj.studyId), [
+                'physical_study_1',
+                'physical_study_2',
+            ]);
         });
 
         //this case is not possible because id in these scenarios are first identified in QueryBuilder.java and
         //returned to query selector page
-        it("when virtual study query having private study or unknow virtual study id", async ()=>{
-            let test = await fetchQueriedStudies({},['shared_study1'], virtualStudies);
+        it('when virtual study query having private study or unknow virtual study id', async () => {
+            let test = await fetchQueriedStudies(
+                {},
+                ['shared_study1'],
+                virtualStudies
+            );
             // assume no studies returned
             assert.equal(test.length, 0);
         });
-
-
-
     });
 
-    describe('buildResultsViewPageTitle', ()=>{
-
-        it('handles various numbers of studies and genes',()=>{
-
-            let genes = ["KRAS","NRAS","BRAF"];
-            let studies = [{ shortName:"Study Number One"} as CancerStudy];
+    describe('buildResultsViewPageTitle', () => {
+        it('handles various numbers of studies and genes', () => {
+            let genes = ['KRAS', 'NRAS', 'BRAF'];
+            let studies = [{ shortName: 'Study Number One' } as CancerStudy];
             let ret = buildResultsViewPageTitle(genes, studies);
-            let expectedResult = "cBioPortal for Cancer Genomics: KRAS, NRAS and 1 other gene in Study Number One";
-            assert.equal(ret, expectedResult, "three genes, one study");
+            let expectedResult =
+                'cBioPortal for Cancer Genomics: KRAS, NRAS and 1 other gene in Study Number One';
+            assert.equal(ret, expectedResult, 'three genes, one study');
 
-            genes = ["KRAS","NRAS","BRAF","KFED"];
-            studies = [{ shortName:"Study Number One"} as CancerStudy];
+            genes = ['KRAS', 'NRAS', 'BRAF', 'KFED'];
+            studies = [{ shortName: 'Study Number One' } as CancerStudy];
             ret = buildResultsViewPageTitle(genes, studies);
-            expectedResult = "cBioPortal for Cancer Genomics: KRAS, NRAS and 2 other genes in Study Number One";
-            assert.equal(ret, expectedResult, "two genes, one study");
+            expectedResult =
+                'cBioPortal for Cancer Genomics: KRAS, NRAS and 2 other genes in Study Number One';
+            assert.equal(ret, expectedResult, 'two genes, one study');
 
-            genes = ["KRAS","NRAS"];
-            studies = [{ shortName:"Study Number One"} as CancerStudy];
+            genes = ['KRAS', 'NRAS'];
+            studies = [{ shortName: 'Study Number One' } as CancerStudy];
             ret = buildResultsViewPageTitle(genes, studies);
-            expectedResult = "cBioPortal for Cancer Genomics: KRAS, NRAS in Study Number One";
-            assert.equal(ret, expectedResult, "two genes, one study");
+            expectedResult =
+                'cBioPortal for Cancer Genomics: KRAS, NRAS in Study Number One';
+            assert.equal(ret, expectedResult, 'two genes, one study');
 
-            genes = ["KRAS"];
-            studies = [{ shortName:"Study Number One"} as CancerStudy];
+            genes = ['KRAS'];
+            studies = [{ shortName: 'Study Number One' } as CancerStudy];
             ret = buildResultsViewPageTitle(genes, studies);
-            expectedResult = "cBioPortal for Cancer Genomics: KRAS in Study Number One";
-            assert.equal(ret, expectedResult, "one gene, one study");
-
-            genes = ["KRAS"];
-            studies = [{ shortName:"Study Number One"} as CancerStudy, { shortName:"Study Number Two"} as CancerStudy];
+            expectedResult =
+                'cBioPortal for Cancer Genomics: KRAS in Study Number One';
+            assert.equal(ret, expectedResult, 'one gene, one study');
+
+            genes = ['KRAS'];
+            studies = [
+                { shortName: 'Study Number One' } as CancerStudy,
+                { shortName: 'Study Number Two' } as CancerStudy,
+            ];
             ret = buildResultsViewPageTitle(genes, studies);
-            expectedResult = "cBioPortal for Cancer Genomics: KRAS in Study Number One and 1 other study";
-            assert.equal(ret, expectedResult, "one gene two studies");
-
-            genes = ["KRAS"];
-            studies = [{ shortName:"Study Number One"} as CancerStudy, { shortName:"Study Number Two"} as CancerStudy,  { shortName:"Study Number Two"} as CancerStudy];
+            expectedResult =
+                'cBioPortal for Cancer Genomics: KRAS in Study Number One and 1 other study';
+            assert.equal(ret, expectedResult, 'one gene two studies');
+
+            genes = ['KRAS'];
+            studies = [
+                { shortName: 'Study Number One' } as CancerStudy,
+                { shortName: 'Study Number Two' } as CancerStudy,
+                { shortName: 'Study Number Two' } as CancerStudy,
+            ];
             ret = buildResultsViewPageTitle(genes, studies);
-            expectedResult = "cBioPortal for Cancer Genomics: KRAS in Study Number One and 2 other studies";
-            assert.equal(ret, expectedResult, "one gene, three studies");
-
-        })
-
+            expectedResult =
+                'cBioPortal for Cancer Genomics: KRAS in Study Number One and 2 other studies';
+            assert.equal(ret, expectedResult, 'one gene, three studies');
+        });
     });
-
 });
 
-
 describe('getSampleAlteredMap', () => {
-
     const filteredAlterationData = [
         {
-            "cases": {
-                "samples": {
-                },
-                "patients": {
-                }
+            cases: {
+                samples: {},
+                patients: {},
             },
-            "oql": {
-                "label": "RAS",
-                "list": [
-                    {
-                        "gene": "KRAS",
-                        "parsed_oql_line": {
-                            "gene": "KRAS",
-                            "alterations": [
+            oql: {
+                label: 'RAS',
+                list: [
+                    {
+                        gene: 'KRAS',
+                        parsed_oql_line: {
+                            gene: 'KRAS',
+                            alterations: [
                                 {
-                                    "alteration_type": "mut",
-                                    "info": {}
+                                    alteration_type: 'mut',
+                                    info: {},
                                 },
                                 {
-                                    "alteration_type": "fusion"
-                                }
-                            ]
+                                    alteration_type: 'fusion',
+                                },
+                            ],
                         },
-                        "oql_line": "KRAS: MUT FUSION;",
-                        "data": [
+                        oql_line: 'KRAS: MUT FUSION;',
+                        data: [
                             {
-                                "uniqueSampleKey": "QjA4NTpjaG9sX251c18yMDEy",
+                                uniqueSampleKey: 'QjA4NTpjaG9sX251c18yMDEy',
                             },
                             {
-                                "uniqueSampleKey": "UjEwNDpjaG9sX251c18yMDEy",
+                                uniqueSampleKey: 'UjEwNDpjaG9sX251c18yMDEy',
                             },
                             {
-                                "uniqueSampleKey": "VzAxMjpjaG9sX251c18yMDEy",
-                            }
-                        ]
+                                uniqueSampleKey: 'VzAxMjpjaG9sX251c18yMDEy',
+                            },
+                        ],
                     },
                     {
-                        "gene": "NRAS",
-                        "parsed_oql_line": {
-                            "gene": "NRAS",
-                            "alterations": [
+                        gene: 'NRAS',
+                        parsed_oql_line: {
+                            gene: 'NRAS',
+                            alterations: [
                                 {
-                                    "alteration_type": "mut",
-                                    "info": {}
+                                    alteration_type: 'mut',
+                                    info: {},
                                 },
                                 {
-                                    "alteration_type": "fusion"
-                                }
-                            ]
+                                    alteration_type: 'fusion',
+                                },
+                            ],
                         },
-                        "oql_line": "NRAS: MUT FUSION;",
-                        "data": []
-                    }
-                ]
+                        oql_line: 'NRAS: MUT FUSION;',
+                        data: [],
+                    },
+                ],
             },
-            "mergedTrackOqlList": [
+            mergedTrackOqlList: [
                 {
-                    "cases": {
-                        "samples": {
-                        },
-                        "patients": {
-                        }
-                    },
-                    "oql": {
-                        "gene": "KRAS",
-                        "parsed_oql_line": {
-                            "gene": "KRAS",
-                            "alterations": [
+                    cases: {
+                        samples: {},
+                        patients: {},
+                    },
+                    oql: {
+                        gene: 'KRAS',
+                        parsed_oql_line: {
+                            gene: 'KRAS',
+                            alterations: [
                                 {
-                                    "alteration_type": "mut",
-                                    "info": {}
+                                    alteration_type: 'mut',
+                                    info: {},
                                 },
                                 {
-                                    "alteration_type": "fusion"
-                                }
-                            ]
+                                    alteration_type: 'fusion',
+                                },
+                            ],
                         },
-                        "oql_line": "KRAS: MUT FUSION;",
-                        "data": [
+                        oql_line: 'KRAS: MUT FUSION;',
+                        data: [
                             {
-                                "uniqueSampleKey": "QjA4NTpjaG9sX251c18yMDEy",
+                                uniqueSampleKey: 'QjA4NTpjaG9sX251c18yMDEy',
                             },
                             {
-                                "uniqueSampleKey": "UjEwNDpjaG9sX251c18yMDEy",
+                                uniqueSampleKey: 'UjEwNDpjaG9sX251c18yMDEy',
                             },
                             {
-                                "uniqueSampleKey": "VzAxMjpjaG9sX251c18yMDEy",
-                            }
-                        ]
-                    }
+                                uniqueSampleKey: 'VzAxMjpjaG9sX251c18yMDEy',
+                            },
+                        ],
+                    },
                 },
                 {
-                    "cases": {
-                        "samples": {
-                        },
-                        "patients": {
-                        }
-                    },
-                    "oql": {
-                        "gene": "NRAS",
-                        "parsed_oql_line": {
-                            "gene": "NRAS",
-                            "alterations": [
+                    cases: {
+                        samples: {},
+                        patients: {},
+                    },
+                    oql: {
+                        gene: 'NRAS',
+                        parsed_oql_line: {
+                            gene: 'NRAS',
+                            alterations: [
                                 {
-                                    "alteration_type": "mut",
-                                    "info": {}
+                                    alteration_type: 'mut',
+                                    info: {},
                                 },
                                 {
-                                    "alteration_type": "fusion"
-                                }
-                            ]
+                                    alteration_type: 'fusion',
+                                },
+                            ],
                         },
-                        "oql_line": "NRAS: MUT FUSION;",
-                        "data": []
-                    }
-                }
-            ]
+                        oql_line: 'NRAS: MUT FUSION;',
+                        data: [],
+                    },
+                },
+            ],
         },
         {
-            "cases": {
-                "samples": {
-                },
-                "patients": {
-                }
+            cases: {
+                samples: {},
+                patients: {},
             },
-            "oql": {
-                "list": [
+            oql: {
+                list: [
                     {
-                        "gene": "SMAD4",
-                        "parsed_oql_line": {
-                            "gene": "SMAD4",
-                            "alterations": [
+                        gene: 'SMAD4',
+                        parsed_oql_line: {
+                            gene: 'SMAD4',
+                            alterations: [
                                 {
-                                    "alteration_type": "mut",
-                                    "info": {}
+                                    alteration_type: 'mut',
+                                    info: {},
                                 },
                                 {
-                                    "alteration_type": "fusion"
-                                }
-                            ]
+                                    alteration_type: 'fusion',
+                                },
+                            ],
                         },
-                        "oql_line": "SMAD4: MUT FUSION;",
-                        "data": [
+                        oql_line: 'SMAD4: MUT FUSION;',
+                        data: [
                             {
-                                "uniqueSampleKey": "QjA5OTpjaG9sX251c18yMDEy",
+                                uniqueSampleKey: 'QjA5OTpjaG9sX251c18yMDEy',
                             },
                             {
-                                "uniqueSampleKey": "UjEwNDpjaG9sX251c18yMDEy",
+                                uniqueSampleKey: 'UjEwNDpjaG9sX251c18yMDEy',
                             },
                             {
-                                "uniqueSampleKey": "VTA0NDpjaG9sX251c18yMDEy",
+                                uniqueSampleKey: 'VTA0NDpjaG9sX251c18yMDEy',
                             },
                             {
-                                "uniqueSampleKey": "VzAxMjpjaG9sX251c18yMDEy",
-                            }
-                        ]
+                                uniqueSampleKey: 'VzAxMjpjaG9sX251c18yMDEy',
+                            },
+                        ],
                     },
                     {
-                        "gene": "RAN",
-                        "parsed_oql_line": {
-                            "gene": "RAN",
-                            "alterations": [
+                        gene: 'RAN',
+                        parsed_oql_line: {
+                            gene: 'RAN',
+                            alterations: [
                                 {
-                                    "alteration_type": "mut",
-                                    "info": {}
+                                    alteration_type: 'mut',
+                                    info: {},
                                 },
                                 {
-                                    "alteration_type": "fusion"
-                                }
-                            ]
+                                    alteration_type: 'fusion',
+                                },
+                            ],
                         },
-                        "oql_line": "RAN: MUT FUSION;",
-                        "data": []
-                    }
-                ]
+                        oql_line: 'RAN: MUT FUSION;',
+                        data: [],
+                    },
+                ],
             },
-            "mergedTrackOqlList": [
+            mergedTrackOqlList: [
                 {
-                    "cases": {
-                        "samples": {
-                        },
-                        "patients": {
-                        }
-                    },
-                    "oql": {
-                        "gene": "SMAD4",
-                        "parsed_oql_line": {
-                            "gene": "SMAD4",
-                            "alterations": [
+                    cases: {
+                        samples: {},
+                        patients: {},
+                    },
+                    oql: {
+                        gene: 'SMAD4',
+                        parsed_oql_line: {
+                            gene: 'SMAD4',
+                            alterations: [
                                 {
-                                    "alteration_type": "mut",
-                                    "info": {}
+                                    alteration_type: 'mut',
+                                    info: {},
                                 },
                                 {
-                                    "alteration_type": "fusion"
-                                }
-                            ]
+                                    alteration_type: 'fusion',
+                                },
+                            ],
                         },
-                        "oql_line": "SMAD4: MUT FUSION;",
-                        "data": [
+                        oql_line: 'SMAD4: MUT FUSION;',
+                        data: [
                             {
-                                "uniqueSampleKey": "QjA5OTpjaG9sX251c18yMDEy",
+                                uniqueSampleKey: 'QjA5OTpjaG9sX251c18yMDEy',
                             },
                             {
-                                "uniqueSampleKey": "UjEwNDpjaG9sX251c18yMDEy",
+                                uniqueSampleKey: 'UjEwNDpjaG9sX251c18yMDEy',
                             },
                             {
-                                "uniqueSampleKey": "VTA0NDpjaG9sX251c18yMDEy",
+                                uniqueSampleKey: 'VTA0NDpjaG9sX251c18yMDEy',
                             },
                             {
-                                "uniqueSampleKey": "VzAxMjpjaG9sX251c18yMDEy",
-                            }
-                        ]
-                    }
+                                uniqueSampleKey: 'VzAxMjpjaG9sX251c18yMDEy',
+                            },
+                        ],
+                    },
                 },
                 {
-                    "cases": {
-                        "samples": {
-                        },
-                        "patients": {
-                        }
-                    },
-                    "oql": {
-                        "gene": "RAN",
-                        "parsed_oql_line": {
-                            "gene": "RAN",
-                            "alterations": [
+                    cases: {
+                        samples: {},
+                        patients: {},
+                    },
+                    oql: {
+                        gene: 'RAN',
+                        parsed_oql_line: {
+                            gene: 'RAN',
+                            alterations: [
                                 {
-                                    "alteration_type": "mut",
-                                    "info": {}
+                                    alteration_type: 'mut',
+                                    info: {},
                                 },
                                 {
-                                    "alteration_type": "fusion"
-                                }
-                            ]
+                                    alteration_type: 'fusion',
+                                },
+                            ],
                         },
-                        "oql_line": "RAN: MUT FUSION;",
-                        "data": []
-                    }
-                }
-            ]
+                        oql_line: 'RAN: MUT FUSION;',
+                        data: [],
+                    },
+                },
+            ],
         },
         {
-            "cases": {
-                "samples": {
-                },
-                "patients": {
-                }
+            cases: {
+                samples: {},
+                patients: {},
             },
-            "oql": {
-                "gene": "SMAD4",
-                "parsed_oql_line": {
-                    "gene": "SMAD4",
-                    "alterations": [
+            oql: {
+                gene: 'SMAD4',
+                parsed_oql_line: {
+                    gene: 'SMAD4',
+                    alterations: [
                         {
-                            "alteration_type": "mut",
-                            "info": {}
-                        }
-                    ]
+                            alteration_type: 'mut',
+                            info: {},
+                        },
+                    ],
                 },
-                "oql_line": "SMAD4: MUT;",
-                "data": [
+                oql_line: 'SMAD4: MUT;',
+                data: [
                     {
-                        "uniqueSampleKey": "QjA5OTpjaG9sX251c18yMDEy",
+                        uniqueSampleKey: 'QjA5OTpjaG9sX251c18yMDEy',
                     },
                     {
-                        "uniqueSampleKey": "UjEwNDpjaG9sX251c18yMDEy",
+                        uniqueSampleKey: 'UjEwNDpjaG9sX251c18yMDEy',
                     },
                     {
-                        "uniqueSampleKey": "VTA0NDpjaG9sX251c18yMDEy",
+                        uniqueSampleKey: 'VTA0NDpjaG9sX251c18yMDEy',
                     },
                     {
-                        "uniqueSampleKey": "VzAxMjpjaG9sX251c18yMDEy",
-                    }
-                ]
-            }
+                        uniqueSampleKey: 'VzAxMjpjaG9sX251c18yMDEy',
+                    },
+                ],
+            },
         },
         {
-            "cases": {
-                "samples": {
-                }
+            cases: {
+                samples: {},
             },
-            "oql": {
-                "gene": "KRAS",
-                "parsed_oql_line": {
-                    "gene": "KRAS",
-                    "alterations": [
+            oql: {
+                gene: 'KRAS',
+                parsed_oql_line: {
+                    gene: 'KRAS',
+                    alterations: [
                         {
-                            "alteration_type": "mut",
-                            "info": {}
+                            alteration_type: 'mut',
+                            info: {},
                         },
                         {
-                            "alteration_type": "fusion"
-                        }
-                    ]
+                            alteration_type: 'fusion',
+                        },
+                    ],
                 },
-                "oql_line": "KRAS: MUT FUSION;",
-                "data": [
+                oql_line: 'KRAS: MUT FUSION;',
+                data: [
                     {
-                        "uniqueSampleKey": "QjA4NTpjaG9sX251c18yMDEy",
+                        uniqueSampleKey: 'QjA4NTpjaG9sX251c18yMDEy',
                     },
                     {
-                        "uniqueSampleKey": "UjEwNDpjaG9sX251c18yMDEy",
+                        uniqueSampleKey: 'UjEwNDpjaG9sX251c18yMDEy',
                     },
                     {
-                        "uniqueSampleKey": "VzAxMjpjaG9sX251c18yMDEy",
-                    }
-                ]
-            }
-        }
+                        uniqueSampleKey: 'VzAxMjpjaG9sX251c18yMDEy',
+                    },
+                ],
+            },
+        },
     ] as IQueriedMergedTrackCaseData[];
 
     var samples = [
         {
-            "uniqueSampleKey": "QjA4NTpjaG9sX251c18yMDEy",
-            "uniquePatientKey": "QjA4NTpjaG9sX251c18yMDEy",
-            "sampleType": "Primary Solid Tumor",
-            "sequenced": true,
-            "copyNumberSegmentPresent": false,
-            "sampleId": "B085",
-            "patientId": "B085",
-            "studyId": "chol_nus_2012"
+            uniqueSampleKey: 'QjA4NTpjaG9sX251c18yMDEy',
+            uniquePatientKey: 'QjA4NTpjaG9sX251c18yMDEy',
+            sampleType: 'Primary Solid Tumor',
+            sequenced: true,
+            copyNumberSegmentPresent: false,
+            sampleId: 'B085',
+            patientId: 'B085',
+            studyId: 'chol_nus_2012',
         },
         {
-            "uniqueSampleKey": "QjA5OTpjaG9sX251c18yMDEy",
-            "uniquePatientKey": "QjA5OTpjaG9sX251c18yMDEy",
-            "sampleType": "Primary Solid Tumor",
-            "sequenced": true,
-            "copyNumberSegmentPresent": false,
-            "sampleId": "B099",
-            "patientId": "B099",
-            "studyId": "chol_nus_2012"
+            uniqueSampleKey: 'QjA5OTpjaG9sX251c18yMDEy',
+            uniquePatientKey: 'QjA5OTpjaG9sX251c18yMDEy',
+            sampleType: 'Primary Solid Tumor',
+            sequenced: true,
+            copyNumberSegmentPresent: false,
+            sampleId: 'B099',
+            patientId: 'B099',
+            studyId: 'chol_nus_2012',
         },
         {
-            "uniqueSampleKey": "UjEwNDpjaG9sX251c18yMDEy",
-            "uniquePatientKey": "UjEwNDpjaG9sX251c18yMDEy",
-            "sampleType": "Primary Solid Tumor",
-            "sequenced": true,
-            "copyNumberSegmentPresent": false,
-            "sampleId": "R104",
-            "patientId": "R104",
-            "studyId": "chol_nus_2012"
+            uniqueSampleKey: 'UjEwNDpjaG9sX251c18yMDEy',
+            uniquePatientKey: 'UjEwNDpjaG9sX251c18yMDEy',
+            sampleType: 'Primary Solid Tumor',
+            sequenced: true,
+            copyNumberSegmentPresent: false,
+            sampleId: 'R104',
+            patientId: 'R104',
+            studyId: 'chol_nus_2012',
         },
         {
-            "uniqueSampleKey": "VDAyNjpjaG9sX251c18yMDEy",
-            "uniquePatientKey": "VDAyNjpjaG9sX251c18yMDEy",
-            "sampleType": "Primary Solid Tumor",
-            "sequenced": true,
-            "copyNumberSegmentPresent": false,
-            "sampleId": "T026",
-            "patientId": "T026",
-            "studyId": "chol_nus_2012"
+            uniqueSampleKey: 'VDAyNjpjaG9sX251c18yMDEy',
+            uniquePatientKey: 'VDAyNjpjaG9sX251c18yMDEy',
+            sampleType: 'Primary Solid Tumor',
+            sequenced: true,
+            copyNumberSegmentPresent: false,
+            sampleId: 'T026',
+            patientId: 'T026',
+            studyId: 'chol_nus_2012',
         },
         {
-            "uniqueSampleKey": "VTA0NDpjaG9sX251c18yMDEy",
-            "uniquePatientKey": "VTA0NDpjaG9sX251c18yMDEy",
-            "sampleType": "Primary Solid Tumor",
-            "sequenced": true,
-            "copyNumberSegmentPresent": false,
-            "sampleId": "U044",
-            "patientId": "U044",
-            "studyId": "chol_nus_2012"
+            uniqueSampleKey: 'VTA0NDpjaG9sX251c18yMDEy',
+            uniquePatientKey: 'VTA0NDpjaG9sX251c18yMDEy',
+            sampleType: 'Primary Solid Tumor',
+            sequenced: true,
+            copyNumberSegmentPresent: false,
+            sampleId: 'U044',
+            patientId: 'U044',
+            studyId: 'chol_nus_2012',
         },
         {
-            "uniqueSampleKey": "VzAxMjpjaG9sX251c18yMDEy",
-            "uniquePatientKey": "VzAxMjpjaG9sX251c18yMDEy",
-            "sampleType": "Primary Solid Tumor",
-            "sequenced": true,
-            "copyNumberSegmentPresent": false,
-            "sampleId": "W012",
-            "patientId": "W012",
-            "studyId": "chol_nus_2012"
+            uniqueSampleKey: 'VzAxMjpjaG9sX251c18yMDEy',
+            uniquePatientKey: 'VzAxMjpjaG9sX251c18yMDEy',
+            sampleType: 'Primary Solid Tumor',
+            sequenced: true,
+            copyNumberSegmentPresent: false,
+            sampleId: 'W012',
+            patientId: 'W012',
+            studyId: 'chol_nus_2012',
         },
         {
-            "uniqueSampleKey": "VzAzOTpjaG9sX251c18yMDEy",
-            "uniquePatientKey": "VzAzOTpjaG9sX251c18yMDEy",
-            "sampleType": "Primary Solid Tumor",
-            "sequenced": true,
-            "copyNumberSegmentPresent": false,
-            "sampleId": "W039",
-            "patientId": "W039",
-            "studyId": "chol_nus_2012"
+            uniqueSampleKey: 'VzAzOTpjaG9sX251c18yMDEy',
+            uniquePatientKey: 'VzAzOTpjaG9sX251c18yMDEy',
+            sampleType: 'Primary Solid Tumor',
+            sequenced: true,
+            copyNumberSegmentPresent: false,
+            sampleId: 'W039',
+            patientId: 'W039',
+            studyId: 'chol_nus_2012',
         },
         {
-            "uniqueSampleKey": "VzA0MDpjaG9sX251c18yMDEy",
-            "uniquePatientKey": "VzA0MDpjaG9sX251c18yMDEy",
-            "sampleType": "Primary Solid Tumor",
-            "sequenced": true,
-            "copyNumberSegmentPresent": false,
-            "sampleId": "W040",
-            "patientId": "W040",
-            "studyId": "chol_nus_2012"
-        }
+            uniqueSampleKey: 'VzA0MDpjaG9sX251c18yMDEy',
+            uniquePatientKey: 'VzA0MDpjaG9sX251c18yMDEy',
+            sampleType: 'Primary Solid Tumor',
+            sequenced: true,
+            copyNumberSegmentPresent: false,
+            sampleId: 'W040',
+            patientId: 'W040',
+            studyId: 'chol_nus_2012',
+        },
     ] as Sample[];
 
-    const oqlQuery = "[\"RAS\" KRAS NRAS]\n[SMAD4 RAN]\nSMAD4: MUT\nKRAS";
+    const oqlQuery = '["RAS" KRAS NRAS]\n[SMAD4 RAN]\nSMAD4: MUT\nKRAS';
 
     const coverageInformation = {
-        "samples": {
-            "QjA4NTpjaG9sX251c18yMDEy": {
-                "byGene": {},
-                "allGenes": [
-                    {
-                        "uniqueSampleKey": "QjA4NTpjaG9sX251c18yMDEy",
-                        "uniquePatientKey": "QjA4NTpjaG9sX251c18yMDEy",
-                        "molecularProfileId": "chol_nus_2012_mutations",
-                        "sampleId": "B085",
-                        "patientId": "B085",
-                        "studyId": "chol_nus_2012",
-                        "profiled": true
-                    }
+        samples: {
+            QjA4NTpjaG9sX251c18yMDEy: {
+                byGene: {},
+                allGenes: [
+                    {
+                        uniqueSampleKey: 'QjA4NTpjaG9sX251c18yMDEy',
+                        uniquePatientKey: 'QjA4NTpjaG9sX251c18yMDEy',
+                        molecularProfileId: 'chol_nus_2012_mutations',
+                        sampleId: 'B085',
+                        patientId: 'B085',
+                        studyId: 'chol_nus_2012',
+                        profiled: true,
+                    },
                 ],
-                "notProfiledByGene": {},
-                "notProfiledAllGenes": []
+                notProfiledByGene: {},
+                notProfiledAllGenes: [],
             },
-            "QjA5OTpjaG9sX251c18yMDEy": {
-                "byGene": {},
-                "allGenes": [
-                    {
-                        "uniqueSampleKey": "QjA5OTpjaG9sX251c18yMDEy",
-                        "uniquePatientKey": "QjA5OTpjaG9sX251c18yMDEy",
-                        "molecularProfileId": "chol_nus_2012_mutations",
-                        "sampleId": "B099",
-                        "patientId": "B099",
-                        "studyId": "chol_nus_2012",
-                        "profiled": true
-                    }
+            QjA5OTpjaG9sX251c18yMDEy: {
+                byGene: {},
+                allGenes: [
+                    {
+                        uniqueSampleKey: 'QjA5OTpjaG9sX251c18yMDEy',
+                        uniquePatientKey: 'QjA5OTpjaG9sX251c18yMDEy',
+                        molecularProfileId: 'chol_nus_2012_mutations',
+                        sampleId: 'B099',
+                        patientId: 'B099',
+                        studyId: 'chol_nus_2012',
+                        profiled: true,
+                    },
                 ],
-                "notProfiledByGene": {},
-                "notProfiledAllGenes": []
+                notProfiledByGene: {},
+                notProfiledAllGenes: [],
             },
-            "UjEwNDpjaG9sX251c18yMDEy": {
-                "byGene": {},
-                "allGenes": [
-                    {
-                        "uniqueSampleKey": "UjEwNDpjaG9sX251c18yMDEy",
-                        "uniquePatientKey": "UjEwNDpjaG9sX251c18yMDEy",
-                        "molecularProfileId": "chol_nus_2012_mutations",
-                        "sampleId": "R104",
-                        "patientId": "R104",
-                        "studyId": "chol_nus_2012",
-                        "profiled": true
-                    }
+            UjEwNDpjaG9sX251c18yMDEy: {
+                byGene: {},
+                allGenes: [
+                    {
+                        uniqueSampleKey: 'UjEwNDpjaG9sX251c18yMDEy',
+                        uniquePatientKey: 'UjEwNDpjaG9sX251c18yMDEy',
+                        molecularProfileId: 'chol_nus_2012_mutations',
+                        sampleId: 'R104',
+                        patientId: 'R104',
+                        studyId: 'chol_nus_2012',
+                        profiled: true,
+                    },
                 ],
-                "notProfiledByGene": {},
-                "notProfiledAllGenes": []
+                notProfiledByGene: {},
+                notProfiledAllGenes: [],
             },
-            "VDAyNjpjaG9sX251c18yMDEy": {
-                "byGene": {},
-                "allGenes": [
-                    {
-                        "uniqueSampleKey": "VDAyNjpjaG9sX251c18yMDEy",
-                        "uniquePatientKey": "VDAyNjpjaG9sX251c18yMDEy",
-                        "molecularProfileId": "chol_nus_2012_mutations",
-                        "sampleId": "T026",
-                        "patientId": "T026",
-                        "studyId": "chol_nus_2012",
-                        "profiled": true
-                    }
+            VDAyNjpjaG9sX251c18yMDEy: {
+                byGene: {},
+                allGenes: [
+                    {
+                        uniqueSampleKey: 'VDAyNjpjaG9sX251c18yMDEy',
+                        uniquePatientKey: 'VDAyNjpjaG9sX251c18yMDEy',
+                        molecularProfileId: 'chol_nus_2012_mutations',
+                        sampleId: 'T026',
+                        patientId: 'T026',
+                        studyId: 'chol_nus_2012',
+                        profiled: true,
+                    },
                 ],
-                "notProfiledByGene": {},
-                "notProfiledAllGenes": []
+                notProfiledByGene: {},
+                notProfiledAllGenes: [],
             },
-            "VTA0NDpjaG9sX251c18yMDEy": {
-                "byGene": {},
-                "allGenes": [
-                    {
-                        "uniqueSampleKey": "VTA0NDpjaG9sX251c18yMDEy",
-                        "uniquePatientKey": "VTA0NDpjaG9sX251c18yMDEy",
-                        "molecularProfileId": "chol_nus_2012_mutations",
-                        "sampleId": "U044",
-                        "patientId": "U044",
-                        "studyId": "chol_nus_2012",
-                        "profiled": true
-                    }
+            VTA0NDpjaG9sX251c18yMDEy: {
+                byGene: {},
+                allGenes: [
+                    {
+                        uniqueSampleKey: 'VTA0NDpjaG9sX251c18yMDEy',
+                        uniquePatientKey: 'VTA0NDpjaG9sX251c18yMDEy',
+                        molecularProfileId: 'chol_nus_2012_mutations',
+                        sampleId: 'U044',
+                        patientId: 'U044',
+                        studyId: 'chol_nus_2012',
+                        profiled: true,
+                    },
                 ],
-                "notProfiledByGene": {},
-                "notProfiledAllGenes": []
+                notProfiledByGene: {},
+                notProfiledAllGenes: [],
             },
-            "VzAxMjpjaG9sX251c18yMDEy": {
-                "byGene": {},
-                "allGenes": [
-                    {
-                        "uniqueSampleKey": "VzAxMjpjaG9sX251c18yMDEy",
-                        "uniquePatientKey": "VzAxMjpjaG9sX251c18yMDEy",
-                        "molecularProfileId": "chol_nus_2012_mutations",
-                        "sampleId": "W012",
-                        "patientId": "W012",
-                        "studyId": "chol_nus_2012",
-                        "profiled": true
-                    }
+            VzAxMjpjaG9sX251c18yMDEy: {
+                byGene: {},
+                allGenes: [
+                    {
+                        uniqueSampleKey: 'VzAxMjpjaG9sX251c18yMDEy',
+                        uniquePatientKey: 'VzAxMjpjaG9sX251c18yMDEy',
+                        molecularProfileId: 'chol_nus_2012_mutations',
+                        sampleId: 'W012',
+                        patientId: 'W012',
+                        studyId: 'chol_nus_2012',
+                        profiled: true,
+                    },
                 ],
-                "notProfiledByGene": {},
-                "notProfiledAllGenes": []
+                notProfiledByGene: {},
+                notProfiledAllGenes: [],
             },
-            "VzAzOTpjaG9sX251c18yMDEy": {
-                "byGene": {},
-                "allGenes": [
-                    {
-                        "uniqueSampleKey": "VzAzOTpjaG9sX251c18yMDEy",
-                        "uniquePatientKey": "VzAzOTpjaG9sX251c18yMDEy",
-                        "molecularProfileId": "chol_nus_2012_mutations",
-                        "sampleId": "W039",
-                        "patientId": "W039",
-                        "studyId": "chol_nus_2012",
-                        "profiled": true
-                    }
+            VzAzOTpjaG9sX251c18yMDEy: {
+                byGene: {},
+                allGenes: [
+                    {
+                        uniqueSampleKey: 'VzAzOTpjaG9sX251c18yMDEy',
+                        uniquePatientKey: 'VzAzOTpjaG9sX251c18yMDEy',
+                        molecularProfileId: 'chol_nus_2012_mutations',
+                        sampleId: 'W039',
+                        patientId: 'W039',
+                        studyId: 'chol_nus_2012',
+                        profiled: true,
+                    },
                 ],
-                "notProfiledByGene": {},
-                "notProfiledAllGenes": []
+                notProfiledByGene: {},
+                notProfiledAllGenes: [],
             },
-            "VzA0MDpjaG9sX251c18yMDEy": {
-                "byGene": {},
-                "allGenes": [
-                    {
-                        "uniqueSampleKey": "VzA0MDpjaG9sX251c18yMDEy",
-                        "uniquePatientKey": "VzA0MDpjaG9sX251c18yMDEy",
-                        "molecularProfileId": "chol_nus_2012_mutations",
-                        "sampleId": "W040",
-                        "patientId": "W040",
-                        "studyId": "chol_nus_2012",
-                        "profiled": true
-                    }
+            VzA0MDpjaG9sX251c18yMDEy: {
+                byGene: {},
+                allGenes: [
+                    {
+                        uniqueSampleKey: 'VzA0MDpjaG9sX251c18yMDEy',
+                        uniquePatientKey: 'VzA0MDpjaG9sX251c18yMDEy',
+                        molecularProfileId: 'chol_nus_2012_mutations',
+                        sampleId: 'W040',
+                        patientId: 'W040',
+                        studyId: 'chol_nus_2012',
+                        profiled: true,
+                    },
                 ],
-                "notProfiledByGene": {},
-                "notProfiledAllGenes": []
-            }
+                notProfiledByGene: {},
+                notProfiledAllGenes: [],
+            },
         },
-        "patients": {
-            "QjA4NTpjaG9sX251c18yMDEy": {
-                "byGene": {},
-                "allGenes": [
-                    {
-                        "uniqueSampleKey": "QjA4NTpjaG9sX251c18yMDEy",
-                        "uniquePatientKey": "QjA4NTpjaG9sX251c18yMDEy",
-                        "molecularProfileId": "chol_nus_2012_mutations",
-                        "sampleId": "B085",
-                        "patientId": "B085",
-                        "studyId": "chol_nus_2012",
-                        "profiled": true
-                    }
+        patients: {
+            QjA4NTpjaG9sX251c18yMDEy: {
+                byGene: {},
+                allGenes: [
+                    {
+                        uniqueSampleKey: 'QjA4NTpjaG9sX251c18yMDEy',
+                        uniquePatientKey: 'QjA4NTpjaG9sX251c18yMDEy',
+                        molecularProfileId: 'chol_nus_2012_mutations',
+                        sampleId: 'B085',
+                        patientId: 'B085',
+                        studyId: 'chol_nus_2012',
+                        profiled: true,
+                    },
                 ],
-                "notProfiledByGene": {},
-                "notProfiledAllGenes": []
+                notProfiledByGene: {},
+                notProfiledAllGenes: [],
             },
-            "QjA5OTpjaG9sX251c18yMDEy": {
-                "byGene": {},
-                "allGenes": [
-                    {
-                        "uniqueSampleKey": "QjA5OTpjaG9sX251c18yMDEy",
-                        "uniquePatientKey": "QjA5OTpjaG9sX251c18yMDEy",
-                        "molecularProfileId": "chol_nus_2012_mutations",
-                        "sampleId": "B099",
-                        "patientId": "B099",
-                        "studyId": "chol_nus_2012",
-                        "profiled": true
-                    }
+            QjA5OTpjaG9sX251c18yMDEy: {
+                byGene: {},
+                allGenes: [
+                    {
+                        uniqueSampleKey: 'QjA5OTpjaG9sX251c18yMDEy',
+                        uniquePatientKey: 'QjA5OTpjaG9sX251c18yMDEy',
+                        molecularProfileId: 'chol_nus_2012_mutations',
+                        sampleId: 'B099',
+                        patientId: 'B099',
+                        studyId: 'chol_nus_2012',
+                        profiled: true,
+                    },
                 ],
-                "notProfiledByGene": {},
-                "notProfiledAllGenes": []
+                notProfiledByGene: {},
+                notProfiledAllGenes: [],
             },
-            "UjEwNDpjaG9sX251c18yMDEy": {
-                "byGene": {},
-                "allGenes": [
-                    {
-                        "uniqueSampleKey": "UjEwNDpjaG9sX251c18yMDEy",
-                        "uniquePatientKey": "UjEwNDpjaG9sX251c18yMDEy",
-                        "molecularProfileId": "chol_nus_2012_mutations",
-                        "sampleId": "R104",
-                        "patientId": "R104",
-                        "studyId": "chol_nus_2012",
-                        "profiled": true
-                    }
+            UjEwNDpjaG9sX251c18yMDEy: {
+                byGene: {},
+                allGenes: [
+                    {
+                        uniqueSampleKey: 'UjEwNDpjaG9sX251c18yMDEy',
+                        uniquePatientKey: 'UjEwNDpjaG9sX251c18yMDEy',
+                        molecularProfileId: 'chol_nus_2012_mutations',
+                        sampleId: 'R104',
+                        patientId: 'R104',
+                        studyId: 'chol_nus_2012',
+                        profiled: true,
+                    },
                 ],
-                "notProfiledByGene": {},
-                "notProfiledAllGenes": []
+                notProfiledByGene: {},
+                notProfiledAllGenes: [],
             },
-            "VDAyNjpjaG9sX251c18yMDEy": {
-                "byGene": {},
-                "allGenes": [
-                    {
-                        "uniqueSampleKey": "VDAyNjpjaG9sX251c18yMDEy",
-                        "uniquePatientKey": "VDAyNjpjaG9sX251c18yMDEy",
-                        "molecularProfileId": "chol_nus_2012_mutations",
-                        "sampleId": "T026",
-                        "patientId": "T026",
-                        "studyId": "chol_nus_2012",
-                        "profiled": true
-                    }
+            VDAyNjpjaG9sX251c18yMDEy: {
+                byGene: {},
+                allGenes: [
+                    {
+                        uniqueSampleKey: 'VDAyNjpjaG9sX251c18yMDEy',
+                        uniquePatientKey: 'VDAyNjpjaG9sX251c18yMDEy',
+                        molecularProfileId: 'chol_nus_2012_mutations',
+                        sampleId: 'T026',
+                        patientId: 'T026',
+                        studyId: 'chol_nus_2012',
+                        profiled: true,
+                    },
                 ],
-                "notProfiledByGene": {},
-                "notProfiledAllGenes": []
+                notProfiledByGene: {},
+                notProfiledAllGenes: [],
             },
-            "VTA0NDpjaG9sX251c18yMDEy": {
-                "byGene": {},
-                "allGenes": [
-                    {
-                        "uniqueSampleKey": "VTA0NDpjaG9sX251c18yMDEy",
-                        "uniquePatientKey": "VTA0NDpjaG9sX251c18yMDEy",
-                        "molecularProfileId": "chol_nus_2012_mutations",
-                        "sampleId": "U044",
-                        "patientId": "U044",
-                        "studyId": "chol_nus_2012",
-                        "profiled": true
-                    }
+            VTA0NDpjaG9sX251c18yMDEy: {
+                byGene: {},
+                allGenes: [
+                    {
+                        uniqueSampleKey: 'VTA0NDpjaG9sX251c18yMDEy',
+                        uniquePatientKey: 'VTA0NDpjaG9sX251c18yMDEy',
+                        molecularProfileId: 'chol_nus_2012_mutations',
+                        sampleId: 'U044',
+                        patientId: 'U044',
+                        studyId: 'chol_nus_2012',
+                        profiled: true,
+                    },
                 ],
-                "notProfiledByGene": {},
-                "notProfiledAllGenes": []
+                notProfiledByGene: {},
+                notProfiledAllGenes: [],
             },
-            "VzAxMjpjaG9sX251c18yMDEy": {
-                "byGene": {},
-                "allGenes": [
-                    {
-                        "uniqueSampleKey": "VzAxMjpjaG9sX251c18yMDEy",
-                        "uniquePatientKey": "VzAxMjpjaG9sX251c18yMDEy",
-                        "molecularProfileId": "chol_nus_2012_mutations",
-                        "sampleId": "W012",
-                        "patientId": "W012",
-                        "studyId": "chol_nus_2012",
-                        "profiled": true
-                    }
+            VzAxMjpjaG9sX251c18yMDEy: {
+                byGene: {},
+                allGenes: [
+                    {
+                        uniqueSampleKey: 'VzAxMjpjaG9sX251c18yMDEy',
+                        uniquePatientKey: 'VzAxMjpjaG9sX251c18yMDEy',
+                        molecularProfileId: 'chol_nus_2012_mutations',
+                        sampleId: 'W012',
+                        patientId: 'W012',
+                        studyId: 'chol_nus_2012',
+                        profiled: true,
+                    },
                 ],
-                "notProfiledByGene": {},
-                "notProfiledAllGenes": []
+                notProfiledByGene: {},
+                notProfiledAllGenes: [],
             },
-            "VzAzOTpjaG9sX251c18yMDEy": {
-                "byGene": {},
-                "allGenes": [
-                    {
-                        "uniqueSampleKey": "VzAzOTpjaG9sX251c18yMDEy",
-                        "uniquePatientKey": "VzAzOTpjaG9sX251c18yMDEy",
-                        "molecularProfileId": "chol_nus_2012_mutations",
-                        "sampleId": "W039",
-                        "patientId": "W039",
-                        "studyId": "chol_nus_2012",
-                        "profiled": true
-                    }
+            VzAzOTpjaG9sX251c18yMDEy: {
+                byGene: {},
+                allGenes: [
+                    {
+                        uniqueSampleKey: 'VzAzOTpjaG9sX251c18yMDEy',
+                        uniquePatientKey: 'VzAzOTpjaG9sX251c18yMDEy',
+                        molecularProfileId: 'chol_nus_2012_mutations',
+                        sampleId: 'W039',
+                        patientId: 'W039',
+                        studyId: 'chol_nus_2012',
+                        profiled: true,
+                    },
                 ],
-                "notProfiledByGene": {},
-                "notProfiledAllGenes": []
+                notProfiledByGene: {},
+                notProfiledAllGenes: [],
             },
-            "VzA0MDpjaG9sX251c18yMDEy": {
-                "byGene": {},
-                "allGenes": [
-                    {
-                        "uniqueSampleKey": "VzA0MDpjaG9sX251c18yMDEy",
-                        "uniquePatientKey": "VzA0MDpjaG9sX251c18yMDEy",
-                        "molecularProfileId": "chol_nus_2012_mutations",
-                        "sampleId": "W040",
-                        "patientId": "W040",
-                        "studyId": "chol_nus_2012",
-                        "profiled": true
-                    }
+            VzA0MDpjaG9sX251c18yMDEy: {
+                byGene: {},
+                allGenes: [
+                    {
+                        uniqueSampleKey: 'VzA0MDpjaG9sX251c18yMDEy',
+                        uniquePatientKey: 'VzA0MDpjaG9sX251c18yMDEy',
+                        molecularProfileId: 'chol_nus_2012_mutations',
+                        sampleId: 'W040',
+                        patientId: 'W040',
+                        studyId: 'chol_nus_2012',
+                        profiled: true,
+                    },
                 ],
-                "notProfiledByGene": {},
-                "notProfiledAllGenes": []
-            }
-        }
+                notProfiledByGene: {},
+                notProfiledAllGenes: [],
+            },
+        },
     };
 
     const coverageInformationWithUnprofiledSamples = {
-        "samples": {
-            "QjA4NTpjaG9sX251c18yMDEy": {
-                "byGene": {
-                    "NRAS": [
+        samples: {
+            QjA4NTpjaG9sX251c18yMDEy: {
+                byGene: {
+                    NRAS: [
                         {
-                            "uniqueSampleKey": "QjA4NTpjaG9sX251c18yMDEy",
-                            "uniquePatientKey": "QjA4NTpjaG9sX251c18yMDEy",
-                            "molecularProfileId": "chol_nus_2012_mutations",
-                            "sampleId": "B085",
-                            "patientId": "B085",
-                            "genePanelId": "test",
-                            "studyId": "chol_nus_2012",
-                            "profiled": true
-                        }
-                    ]
+                            uniqueSampleKey: 'QjA4NTpjaG9sX251c18yMDEy',
+                            uniquePatientKey: 'QjA4NTpjaG9sX251c18yMDEy',
+                            molecularProfileId: 'chol_nus_2012_mutations',
+                            sampleId: 'B085',
+                            patientId: 'B085',
+                            genePanelId: 'test',
+                            studyId: 'chol_nus_2012',
+                            profiled: true,
+                        },
+                    ],
                 },
-                "allGenes": [],
-                "notProfiledByGene": {
-                    "KRAS": [
+                allGenes: [],
+                notProfiledByGene: {
+                    KRAS: [
                         {
-                            "uniqueSampleKey": "QjA4NTpjaG9sX251c18yMDEy",
-                            "uniquePatientKey": "QjA4NTpjaG9sX251c18yMDEy",
-                            "molecularProfileId": "chol_nus_2012_mutations",
-                            "sampleId": "B085",
-                            "patientId": "B085",
-                            "genePanelId": "test",
-                            "studyId": "chol_nus_2012",
-                            "profiled": true
-                        }
+                            uniqueSampleKey: 'QjA4NTpjaG9sX251c18yMDEy',
+                            uniquePatientKey: 'QjA4NTpjaG9sX251c18yMDEy',
+                            molecularProfileId: 'chol_nus_2012_mutations',
+                            sampleId: 'B085',
+                            patientId: 'B085',
+                            genePanelId: 'test',
+                            studyId: 'chol_nus_2012',
+                            profiled: true,
+                        },
                     ],
-                    "SMAD4": [
+                    SMAD4: [
                         {
-                            "uniqueSampleKey": "QjA4NTpjaG9sX251c18yMDEy",
-                            "uniquePatientKey": "QjA4NTpjaG9sX251c18yMDEy",
-                            "molecularProfileId": "chol_nus_2012_mutations",
-                            "sampleId": "B085",
-                            "patientId": "B085",
-                            "genePanelId": "test",
-                            "studyId": "chol_nus_2012",
-                            "profiled": true
-                        }
+                            uniqueSampleKey: 'QjA4NTpjaG9sX251c18yMDEy',
+                            uniquePatientKey: 'QjA4NTpjaG9sX251c18yMDEy',
+                            molecularProfileId: 'chol_nus_2012_mutations',
+                            sampleId: 'B085',
+                            patientId: 'B085',
+                            genePanelId: 'test',
+                            studyId: 'chol_nus_2012',
+                            profiled: true,
+                        },
                     ],
-                    "RAN": [
+                    RAN: [
                         {
-                            "uniqueSampleKey": "QjA4NTpjaG9sX251c18yMDEy",
-                            "uniquePatientKey": "QjA4NTpjaG9sX251c18yMDEy",
-                            "molecularProfileId": "chol_nus_2012_mutations",
-                            "sampleId": "B085",
-                            "patientId": "B085",
-                            "genePanelId": "test",
-                            "studyId": "chol_nus_2012",
-                            "profiled": true
-                        }
-                    ]
+                            uniqueSampleKey: 'QjA4NTpjaG9sX251c18yMDEy',
+                            uniquePatientKey: 'QjA4NTpjaG9sX251c18yMDEy',
+                            molecularProfileId: 'chol_nus_2012_mutations',
+                            sampleId: 'B085',
+                            patientId: 'B085',
+                            genePanelId: 'test',
+                            studyId: 'chol_nus_2012',
+                            profiled: true,
+                        },
+                    ],
                 },
-                "notProfiledAllGenes": []
+                notProfiledAllGenes: [],
             },
-            "QjA5OTpjaG9sX251c18yMDEy": {
-                "byGene": {
-                    "NRAS": [
+            QjA5OTpjaG9sX251c18yMDEy: {
+                byGene: {
+                    NRAS: [
                         {
-                            "uniqueSampleKey": "QjA5OTpjaG9sX251c18yMDEy",
-                            "uniquePatientKey": "QjA5OTpjaG9sX251c18yMDEy",
-                            "molecularProfileId": "chol_nus_2012_mutations",
-                            "sampleId": "B099",
-                            "patientId": "B099",
-                            "genePanelId": "test",
-                            "studyId": "chol_nus_2012",
-                            "profiled": true
-                        }
+                            uniqueSampleKey: 'QjA5OTpjaG9sX251c18yMDEy',
+                            uniquePatientKey: 'QjA5OTpjaG9sX251c18yMDEy',
+                            molecularProfileId: 'chol_nus_2012_mutations',
+                            sampleId: 'B099',
+                            patientId: 'B099',
+                            genePanelId: 'test',
+                            studyId: 'chol_nus_2012',
+                            profiled: true,
+                        },
                     ],
-                    "SMAD4": [
+                    SMAD4: [
                         {
-                            "uniqueSampleKey": "QjA5OTpjaG9sX251c18yMDEy",
-                            "uniquePatientKey": "QjA5OTpjaG9sX251c18yMDEy",
-                            "molecularProfileId": "chol_nus_2012_mutations",
-                            "sampleId": "B099",
-                            "patientId": "B099",
-                            "genePanelId": "test",
-                            "studyId": "chol_nus_2012",
-                            "profiled": true
-                        }
+                            uniqueSampleKey: 'QjA5OTpjaG9sX251c18yMDEy',
+                            uniquePatientKey: 'QjA5OTpjaG9sX251c18yMDEy',
+                            molecularProfileId: 'chol_nus_2012_mutations',
+                            sampleId: 'B099',
+                            patientId: 'B099',
+                            genePanelId: 'test',
+                            studyId: 'chol_nus_2012',
+                            profiled: true,
+                        },
                     ],
-                    "RAN": [
+                    RAN: [
                         {
-                            "uniqueSampleKey": "QjA5OTpjaG9sX251c18yMDEy",
-                            "uniquePatientKey": "QjA5OTpjaG9sX251c18yMDEy",
-                            "molecularProfileId": "chol_nus_2012_mutations",
-                            "sampleId": "B099",
-                            "patientId": "B099",
-                            "genePanelId": "test",
-                            "studyId": "chol_nus_2012",
-                            "profiled": true
-                        }
-                    ]
+                            uniqueSampleKey: 'QjA5OTpjaG9sX251c18yMDEy',
+                            uniquePatientKey: 'QjA5OTpjaG9sX251c18yMDEy',
+                            molecularProfileId: 'chol_nus_2012_mutations',
+                            sampleId: 'B099',
+                            patientId: 'B099',
+                            genePanelId: 'test',
+                            studyId: 'chol_nus_2012',
+                            profiled: true,
+                        },
+                    ],
                 },
-                "allGenes": [],
-                "notProfiledByGene": {
-                    "KRAS": [
+                allGenes: [],
+                notProfiledByGene: {
+                    KRAS: [
                         {
-                            "uniqueSampleKey": "QjA5OTpjaG9sX251c18yMDEy",
-                            "uniquePatientKey": "QjA5OTpjaG9sX251c18yMDEy",
-                            "molecularProfileId": "chol_nus_2012_mutations",
-                            "sampleId": "B099",
-                            "patientId": "B099",
-                            "genePanelId": "test",
-                            "studyId": "chol_nus_2012",
-                            "profiled": true
-                        }
-                    ]
+                            uniqueSampleKey: 'QjA5OTpjaG9sX251c18yMDEy',
+                            uniquePatientKey: 'QjA5OTpjaG9sX251c18yMDEy',
+                            molecularProfileId: 'chol_nus_2012_mutations',
+                            sampleId: 'B099',
+                            patientId: 'B099',
+                            genePanelId: 'test',
+                            studyId: 'chol_nus_2012',
+                            profiled: true,
+                        },
+                    ],
                 },
-                "notProfiledAllGenes": []
+                notProfiledAllGenes: [],
             },
-            "UjEwNDpjaG9sX251c18yMDEy": {
-                "byGene": {},
-                "allGenes": [
-                    {
-                        "uniqueSampleKey": "UjEwNDpjaG9sX251c18yMDEy",
-                        "uniquePatientKey": "UjEwNDpjaG9sX251c18yMDEy",
-                        "molecularProfileId": "chol_nus_2012_mutations",
-                        "sampleId": "R104",
-                        "patientId": "R104",
-                        "studyId": "chol_nus_2012",
-                        "profiled": true
-                    }
+            UjEwNDpjaG9sX251c18yMDEy: {
+                byGene: {},
+                allGenes: [
+                    {
+                        uniqueSampleKey: 'UjEwNDpjaG9sX251c18yMDEy',
+                        uniquePatientKey: 'UjEwNDpjaG9sX251c18yMDEy',
+                        molecularProfileId: 'chol_nus_2012_mutations',
+                        sampleId: 'R104',
+                        patientId: 'R104',
+                        studyId: 'chol_nus_2012',
+                        profiled: true,
+                    },
                 ],
-                "notProfiledByGene": {},
-                "notProfiledAllGenes": []
+                notProfiledByGene: {},
+                notProfiledAllGenes: [],
             },
-            "VDAyNjpjaG9sX251c18yMDEy": {
-                "byGene": {},
-                "allGenes": [
-                    {
-                        "uniqueSampleKey": "VDAyNjpjaG9sX251c18yMDEy",
-                        "uniquePatientKey": "VDAyNjpjaG9sX251c18yMDEy",
-                        "molecularProfileId": "chol_nus_2012_mutations",
-                        "sampleId": "T026",
-                        "patientId": "T026",
-                        "studyId": "chol_nus_2012",
-                        "profiled": true
-                    }
+            VDAyNjpjaG9sX251c18yMDEy: {
+                byGene: {},
+                allGenes: [
+                    {
+                        uniqueSampleKey: 'VDAyNjpjaG9sX251c18yMDEy',
+                        uniquePatientKey: 'VDAyNjpjaG9sX251c18yMDEy',
+                        molecularProfileId: 'chol_nus_2012_mutations',
+                        sampleId: 'T026',
+                        patientId: 'T026',
+                        studyId: 'chol_nus_2012',
+                        profiled: true,
+                    },
                 ],
-                "notProfiledByGene": {},
-                "notProfiledAllGenes": []
+                notProfiledByGene: {},
+                notProfiledAllGenes: [],
             },
-            "VTA0NDpjaG9sX251c18yMDEy": {
-                "byGene": {},
-                "allGenes": [
-                    {
-                        "uniqueSampleKey": "VTA0NDpjaG9sX251c18yMDEy",
-                        "uniquePatientKey": "VTA0NDpjaG9sX251c18yMDEy",
-                        "molecularProfileId": "chol_nus_2012_mutations",
-                        "sampleId": "U044",
-                        "patientId": "U044",
-                        "studyId": "chol_nus_2012",
-                        "profiled": true
-                    }
+            VTA0NDpjaG9sX251c18yMDEy: {
+                byGene: {},
+                allGenes: [
+                    {
+                        uniqueSampleKey: 'VTA0NDpjaG9sX251c18yMDEy',
+                        uniquePatientKey: 'VTA0NDpjaG9sX251c18yMDEy',
+                        molecularProfileId: 'chol_nus_2012_mutations',
+                        sampleId: 'U044',
+                        patientId: 'U044',
+                        studyId: 'chol_nus_2012',
+                        profiled: true,
+                    },
                 ],
-                "notProfiledByGene": {},
-                "notProfiledAllGenes": []
+                notProfiledByGene: {},
+                notProfiledAllGenes: [],
             },
-            "VzAxMjpjaG9sX251c18yMDEy": {
-                "byGene": {},
-                "allGenes": [
-                    {
-                        "uniqueSampleKey": "VzAxMjpjaG9sX251c18yMDEy",
-                        "uniquePatientKey": "VzAxMjpjaG9sX251c18yMDEy",
-                        "molecularProfileId": "chol_nus_2012_mutations",
-                        "sampleId": "W012",
-                        "patientId": "W012",
-                        "studyId": "chol_nus_2012",
-                        "profiled": true
-                    }
+            VzAxMjpjaG9sX251c18yMDEy: {
+                byGene: {},
+                allGenes: [
+                    {
+                        uniqueSampleKey: 'VzAxMjpjaG9sX251c18yMDEy',
+                        uniquePatientKey: 'VzAxMjpjaG9sX251c18yMDEy',
+                        molecularProfileId: 'chol_nus_2012_mutations',
+                        sampleId: 'W012',
+                        patientId: 'W012',
+                        studyId: 'chol_nus_2012',
+                        profiled: true,
+                    },
                 ],
-                "notProfiledByGene": {},
-                "notProfiledAllGenes": []
+                notProfiledByGene: {},
+                notProfiledAllGenes: [],
             },
-            "VzAzOTpjaG9sX251c18yMDEy": {
-                "byGene": {},
-                "allGenes": [
-                    {
-                        "uniqueSampleKey": "VzAzOTpjaG9sX251c18yMDEy",
-                        "uniquePatientKey": "VzAzOTpjaG9sX251c18yMDEy",
-                        "molecularProfileId": "chol_nus_2012_mutations",
-                        "sampleId": "W039",
-                        "patientId": "W039",
-                        "studyId": "chol_nus_2012",
-                        "profiled": true
-                    }
+            VzAzOTpjaG9sX251c18yMDEy: {
+                byGene: {},
+                allGenes: [
+                    {
+                        uniqueSampleKey: 'VzAzOTpjaG9sX251c18yMDEy',
+                        uniquePatientKey: 'VzAzOTpjaG9sX251c18yMDEy',
+                        molecularProfileId: 'chol_nus_2012_mutations',
+                        sampleId: 'W039',
+                        patientId: 'W039',
+                        studyId: 'chol_nus_2012',
+                        profiled: true,
+                    },
                 ],
-                "notProfiledByGene": {},
-                "notProfiledAllGenes": []
+                notProfiledByGene: {},
+                notProfiledAllGenes: [],
             },
-            "VzA0MDpjaG9sX251c18yMDEy": {
-                "byGene": {},
-                "allGenes": [
-                    {
-                        "uniqueSampleKey": "VzA0MDpjaG9sX251c18yMDEy",
-                        "uniquePatientKey": "VzA0MDpjaG9sX251c18yMDEy",
-                        "molecularProfileId": "chol_nus_2012_mutations",
-                        "sampleId": "W040",
-                        "patientId": "W040",
-                        "studyId": "chol_nus_2012",
-                        "profiled": true
-                    }
+            VzA0MDpjaG9sX251c18yMDEy: {
+                byGene: {},
+                allGenes: [
+                    {
+                        uniqueSampleKey: 'VzA0MDpjaG9sX251c18yMDEy',
+                        uniquePatientKey: 'VzA0MDpjaG9sX251c18yMDEy',
+                        molecularProfileId: 'chol_nus_2012_mutations',
+                        sampleId: 'W040',
+                        patientId: 'W040',
+                        studyId: 'chol_nus_2012',
+                        profiled: true,
+                    },
                 ],
-                "notProfiledByGene": {},
-                "notProfiledAllGenes": []
-            }
+                notProfiledByGene: {},
+                notProfiledAllGenes: [],
+            },
         },
-        "patients": {
-            "QjA4NTpjaG9sX251c18yMDEy": {
-                "byGene": {},
-                "allGenes": [
-                    {
-                        "uniqueSampleKey": "QjA4NTpjaG9sX251c18yMDEy",
-                        "uniquePatientKey": "QjA4NTpjaG9sX251c18yMDEy",
-                        "molecularProfileId": "chol_nus_2012_mutations",
-                        "sampleId": "B085",
-                        "patientId": "B085",
-                        "studyId": "chol_nus_2012",
-                        "profiled": true
-                    }
+        patients: {
+            QjA4NTpjaG9sX251c18yMDEy: {
+                byGene: {},
+                allGenes: [
+                    {
+                        uniqueSampleKey: 'QjA4NTpjaG9sX251c18yMDEy',
+                        uniquePatientKey: 'QjA4NTpjaG9sX251c18yMDEy',
+                        molecularProfileId: 'chol_nus_2012_mutations',
+                        sampleId: 'B085',
+                        patientId: 'B085',
+                        studyId: 'chol_nus_2012',
+                        profiled: true,
+                    },
                 ],
-                "notProfiledByGene": {},
-                "notProfiledAllGenes": []
+                notProfiledByGene: {},
+                notProfiledAllGenes: [],
             },
-            "QjA5OTpjaG9sX251c18yMDEy": {
-                "byGene": {},
-                "allGenes": [
-                    {
-                        "uniqueSampleKey": "QjA5OTpjaG9sX251c18yMDEy",
-                        "uniquePatientKey": "QjA5OTpjaG9sX251c18yMDEy",
-                        "molecularProfileId": "chol_nus_2012_mutations",
-                        "sampleId": "B099",
-                        "patientId": "B099",
-                        "studyId": "chol_nus_2012",
-                        "profiled": true
-                    }
+            QjA5OTpjaG9sX251c18yMDEy: {
+                byGene: {},
+                allGenes: [
+                    {
+                        uniqueSampleKey: 'QjA5OTpjaG9sX251c18yMDEy',
+                        uniquePatientKey: 'QjA5OTpjaG9sX251c18yMDEy',
+                        molecularProfileId: 'chol_nus_2012_mutations',
+                        sampleId: 'B099',
+                        patientId: 'B099',
+                        studyId: 'chol_nus_2012',
+                        profiled: true,
+                    },
                 ],
-                "notProfiledByGene": {},
-                "notProfiledAllGenes": []
+                notProfiledByGene: {},
+                notProfiledAllGenes: [],
             },
-            "UjEwNDpjaG9sX251c18yMDEy": {
-                "byGene": {},
-                "allGenes": [
-                    {
-                        "uniqueSampleKey": "UjEwNDpjaG9sX251c18yMDEy",
-                        "uniquePatientKey": "UjEwNDpjaG9sX251c18yMDEy",
-                        "molecularProfileId": "chol_nus_2012_mutations",
-                        "sampleId": "R104",
-                        "patientId": "R104",
-                        "studyId": "chol_nus_2012",
-                        "profiled": true
-                    }
+            UjEwNDpjaG9sX251c18yMDEy: {
+                byGene: {},
+                allGenes: [
+                    {
+                        uniqueSampleKey: 'UjEwNDpjaG9sX251c18yMDEy',
+                        uniquePatientKey: 'UjEwNDpjaG9sX251c18yMDEy',
+                        molecularProfileId: 'chol_nus_2012_mutations',
+                        sampleId: 'R104',
+                        patientId: 'R104',
+                        studyId: 'chol_nus_2012',
+                        profiled: true,
+                    },
                 ],
-                "notProfiledByGene": {},
-                "notProfiledAllGenes": []
+                notProfiledByGene: {},
+                notProfiledAllGenes: [],
             },
-            "VDAyNjpjaG9sX251c18yMDEy": {
-                "byGene": {},
-                "allGenes": [
-                    {
-                        "uniqueSampleKey": "VDAyNjpjaG9sX251c18yMDEy",
-                        "uniquePatientKey": "VDAyNjpjaG9sX251c18yMDEy",
-                        "molecularProfileId": "chol_nus_2012_mutations",
-                        "sampleId": "T026",
-                        "patientId": "T026",
-                        "studyId": "chol_nus_2012",
-                        "profiled": true
-                    }
+            VDAyNjpjaG9sX251c18yMDEy: {
+                byGene: {},
+                allGenes: [
+                    {
+                        uniqueSampleKey: 'VDAyNjpjaG9sX251c18yMDEy',
+                        uniquePatientKey: 'VDAyNjpjaG9sX251c18yMDEy',
+                        molecularProfileId: 'chol_nus_2012_mutations',
+                        sampleId: 'T026',
+                        patientId: 'T026',
+                        studyId: 'chol_nus_2012',
+                        profiled: true,
+                    },
                 ],
-                "notProfiledByGene": {},
-                "notProfiledAllGenes": []
+                notProfiledByGene: {},
+                notProfiledAllGenes: [],
             },
-            "VTA0NDpjaG9sX251c18yMDEy": {
-                "byGene": {},
-                "allGenes": [
-                    {
-                        "uniqueSampleKey": "VTA0NDpjaG9sX251c18yMDEy",
-                        "uniquePatientKey": "VTA0NDpjaG9sX251c18yMDEy",
-                        "molecularProfileId": "chol_nus_2012_mutations",
-                        "sampleId": "U044",
-                        "patientId": "U044",
-                        "studyId": "chol_nus_2012",
-                        "profiled": true
-                    }
+            VTA0NDpjaG9sX251c18yMDEy: {
+                byGene: {},
+                allGenes: [
+                    {
+                        uniqueSampleKey: 'VTA0NDpjaG9sX251c18yMDEy',
+                        uniquePatientKey: 'VTA0NDpjaG9sX251c18yMDEy',
+                        molecularProfileId: 'chol_nus_2012_mutations',
+                        sampleId: 'U044',
+                        patientId: 'U044',
+                        studyId: 'chol_nus_2012',
+                        profiled: true,
+                    },
                 ],
-                "notProfiledByGene": {},
-                "notProfiledAllGenes": []
+                notProfiledByGene: {},
+                notProfiledAllGenes: [],
             },
-            "VzAxMjpjaG9sX251c18yMDEy": {
-                "byGene": {},
-                "allGenes": [
-                    {
-                        "uniqueSampleKey": "VzAxMjpjaG9sX251c18yMDEy",
-                        "uniquePatientKey": "VzAxMjpjaG9sX251c18yMDEy",
-                        "molecularProfileId": "chol_nus_2012_mutations",
-                        "sampleId": "W012",
-                        "patientId": "W012",
-                        "studyId": "chol_nus_2012",
-                        "profiled": true
-                    }
+            VzAxMjpjaG9sX251c18yMDEy: {
+                byGene: {},
+                allGenes: [
+                    {
+                        uniqueSampleKey: 'VzAxMjpjaG9sX251c18yMDEy',
+                        uniquePatientKey: 'VzAxMjpjaG9sX251c18yMDEy',
+                        molecularProfileId: 'chol_nus_2012_mutations',
+                        sampleId: 'W012',
+                        patientId: 'W012',
+                        studyId: 'chol_nus_2012',
+                        profiled: true,
+                    },
                 ],
-                "notProfiledByGene": {},
-                "notProfiledAllGenes": []
+                notProfiledByGene: {},
+                notProfiledAllGenes: [],
             },
-            "VzAzOTpjaG9sX251c18yMDEy": {
-                "byGene": {},
-                "allGenes": [
-                    {
-                        "uniqueSampleKey": "VzAzOTpjaG9sX251c18yMDEy",
-                        "uniquePatientKey": "VzAzOTpjaG9sX251c18yMDEy",
-                        "molecularProfileId": "chol_nus_2012_mutations",
-                        "sampleId": "W039",
-                        "patientId": "W039",
-                        "studyId": "chol_nus_2012",
-                        "profiled": true
-                    }
+            VzAzOTpjaG9sX251c18yMDEy: {
+                byGene: {},
+                allGenes: [
+                    {
+                        uniqueSampleKey: 'VzAzOTpjaG9sX251c18yMDEy',
+                        uniquePatientKey: 'VzAzOTpjaG9sX251c18yMDEy',
+                        molecularProfileId: 'chol_nus_2012_mutations',
+                        sampleId: 'W039',
+                        patientId: 'W039',
+                        studyId: 'chol_nus_2012',
+                        profiled: true,
+                    },
                 ],
-                "notProfiledByGene": {},
-                "notProfiledAllGenes": []
+                notProfiledByGene: {},
+                notProfiledAllGenes: [],
             },
-            "VzA0MDpjaG9sX251c18yMDEy": {
-                "byGene": {},
-                "allGenes": [
-                    {
-                        "uniqueSampleKey": "VzA0MDpjaG9sX251c18yMDEy",
-                        "uniquePatientKey": "VzA0MDpjaG9sX251c18yMDEy",
-                        "molecularProfileId": "chol_nus_2012_mutations",
-                        "sampleId": "W040",
-                        "patientId": "W040",
-                        "studyId": "chol_nus_2012",
-                        "profiled": true
-                    }
+            VzA0MDpjaG9sX251c18yMDEy: {
+                byGene: {},
+                allGenes: [
+                    {
+                        uniqueSampleKey: 'VzA0MDpjaG9sX251c18yMDEy',
+                        uniquePatientKey: 'VzA0MDpjaG9sX251c18yMDEy',
+                        molecularProfileId: 'chol_nus_2012_mutations',
+                        sampleId: 'W040',
+                        patientId: 'W040',
+                        studyId: 'chol_nus_2012',
+                        profiled: true,
+                    },
                 ],
-                "notProfiledByGene": {},
-                "notProfiledAllGenes": []
-            }
-        }
+                notProfiledByGene: {},
+                notProfiledAllGenes: [],
+            },
+        },
     };
 
-    const molecularProfileIds = ["chol_nus_2012_mutations"];
-    const unprofiledMolecularProfileIds = ["chol_nus_2012_mutations","chol_nus_2012_cna"];
-    const studyToMolecularProfiles = {"chol_nus_2012": [{"molecularProfileId": "chol_nus_2012_mutations"} as MolecularProfile, {"molecularProfileId": "chol_nus_2012_cna"} as MolecularProfile]};
+    const molecularProfileIds = ['chol_nus_2012_mutations'];
+    const unprofiledMolecularProfileIds = [
+        'chol_nus_2012_mutations',
+        'chol_nus_2012_cna',
+    ];
+    const studyToMolecularProfiles = {
+        chol_nus_2012: [
+            {
+                molecularProfileId: 'chol_nus_2012_mutations',
+            } as MolecularProfile,
+            { molecularProfileId: 'chol_nus_2012_cna' } as MolecularProfile,
+        ],
+    };
 
     it('should handle all profiled samples correctly', () => {
-        const ret = getSampleAlteredMap(filteredAlterationData, samples, oqlQuery, coverageInformation, molecularProfileIds, studyToMolecularProfiles);
+        const ret = getSampleAlteredMap(
+            filteredAlterationData,
+            samples,
+            oqlQuery,
+            coverageInformation,
+            molecularProfileIds,
+            studyToMolecularProfiles
+        );
         const expectedResult = {
-            "RAS": [
+            RAS: [
                 AlteredStatus.ALTERED,
                 AlteredStatus.UNALTERED,
                 AlteredStatus.ALTERED,
@@ -2392,9 +3069,9 @@ describe('getSampleAlteredMap', () => {
                 AlteredStatus.UNALTERED,
                 AlteredStatus.ALTERED,
                 AlteredStatus.UNALTERED,
-                AlteredStatus.UNALTERED
+                AlteredStatus.UNALTERED,
             ],
-            "SMAD4 / RAN": [
+            'SMAD4 / RAN': [
                 AlteredStatus.UNALTERED,
                 AlteredStatus.ALTERED,
                 AlteredStatus.ALTERED,
@@ -2402,9 +3079,9 @@ describe('getSampleAlteredMap', () => {
                 AlteredStatus.ALTERED,
                 AlteredStatus.ALTERED,
                 AlteredStatus.UNALTERED,
-                AlteredStatus.UNALTERED
+                AlteredStatus.UNALTERED,
             ],
-            "SMAD4: MUT": [
+            'SMAD4: MUT': [
                 AlteredStatus.UNALTERED,
                 AlteredStatus.ALTERED,
                 AlteredStatus.ALTERED,
@@ -2412,9 +3089,9 @@ describe('getSampleAlteredMap', () => {
                 AlteredStatus.ALTERED,
                 AlteredStatus.ALTERED,
                 AlteredStatus.UNALTERED,
-                AlteredStatus.UNALTERED
+                AlteredStatus.UNALTERED,
             ],
-            "KRAS": [
+            KRAS: [
                 AlteredStatus.ALTERED,
                 AlteredStatus.UNALTERED,
                 AlteredStatus.ALTERED,
@@ -2422,20 +3099,42 @@ describe('getSampleAlteredMap', () => {
                 AlteredStatus.UNALTERED,
                 AlteredStatus.ALTERED,
                 AlteredStatus.UNALTERED,
-                AlteredStatus.UNALTERED
-            ]
+                AlteredStatus.UNALTERED,
+            ],
         };
-        assert.deepEqual(ret["KRAS"], expectedResult["KRAS"], "single gene track");
-        assert.deepEqual(ret["SMAD4: MUT"], expectedResult["SMAD4: MUT"], "single gene track(with alteration)");
-        assert.deepEqual(ret["SMAD4 / RAN"], expectedResult["SMAD4 / RAN"], "merged gene track");
-        assert.deepEqual(ret["RAS"], expectedResult["RAS"], "merged gene track(with group name)");
-
+        assert.deepEqual(
+            ret['KRAS'],
+            expectedResult['KRAS'],
+            'single gene track'
+        );
+        assert.deepEqual(
+            ret['SMAD4: MUT'],
+            expectedResult['SMAD4: MUT'],
+            'single gene track(with alteration)'
+        );
+        assert.deepEqual(
+            ret['SMAD4 / RAN'],
+            expectedResult['SMAD4 / RAN'],
+            'merged gene track'
+        );
+        assert.deepEqual(
+            ret['RAS'],
+            expectedResult['RAS'],
+            'merged gene track(with group name)'
+        );
     });
 
     it('should set undefined for the not profiled samples', () => {
-        const ret = getSampleAlteredMap(filteredAlterationData, samples, oqlQuery, coverageInformationWithUnprofiledSamples, molecularProfileIds, studyToMolecularProfiles);
+        const ret = getSampleAlteredMap(
+            filteredAlterationData,
+            samples,
+            oqlQuery,
+            coverageInformationWithUnprofiledSamples,
+            molecularProfileIds,
+            studyToMolecularProfiles
+        );
         const expectedResult = {
-            "RAS": [
+            RAS: [
                 AlteredStatus.ALTERED,
                 AlteredStatus.UNALTERED,
                 AlteredStatus.ALTERED,
@@ -2443,9 +3142,9 @@ describe('getSampleAlteredMap', () => {
                 AlteredStatus.UNALTERED,
                 AlteredStatus.ALTERED,
                 AlteredStatus.UNALTERED,
-                AlteredStatus.UNALTERED
+                AlteredStatus.UNALTERED,
             ],
-            "SMAD4 / RAN": [
+            'SMAD4 / RAN': [
                 AlteredStatus.UNPROFILED,
                 AlteredStatus.ALTERED,
                 AlteredStatus.ALTERED,
@@ -2453,9 +3152,9 @@ describe('getSampleAlteredMap', () => {
                 AlteredStatus.ALTERED,
                 AlteredStatus.ALTERED,
                 AlteredStatus.UNALTERED,
-                AlteredStatus.UNALTERED
+                AlteredStatus.UNALTERED,
             ],
-            "SMAD4: MUT": [
+            'SMAD4: MUT': [
                 AlteredStatus.UNALTERED,
                 AlteredStatus.ALTERED,
                 AlteredStatus.ALTERED,
@@ -2463,9 +3162,9 @@ describe('getSampleAlteredMap', () => {
                 AlteredStatus.ALTERED,
                 AlteredStatus.ALTERED,
                 AlteredStatus.UNALTERED,
-                AlteredStatus.UNALTERED
+                AlteredStatus.UNALTERED,
             ],
-            "KRAS": [
+            KRAS: [
                 AlteredStatus.UNPROFILED,
                 AlteredStatus.UNPROFILED,
                 AlteredStatus.ALTERED,
@@ -2473,18 +3172,38 @@ describe('getSampleAlteredMap', () => {
                 AlteredStatus.UNALTERED,
                 AlteredStatus.ALTERED,
                 AlteredStatus.UNALTERED,
-                AlteredStatus.UNALTERED
-            ]
+                AlteredStatus.UNALTERED,
+            ],
         };
-        assert.deepEqual(ret["KRAS"], expectedResult["KRAS"], "single gene track with unprofiled samples");
-        assert.deepEqual(ret["RAS"], expectedResult["RAS"], "merged gene track with unprofiled samples in one gene");
-        assert.deepEqual(ret["SMAD4 / RAN"], expectedResult["SMAD4 / RAN"], "merged gene track with unprofiled samples in all genes");
+        assert.deepEqual(
+            ret['KRAS'],
+            expectedResult['KRAS'],
+            'single gene track with unprofiled samples'
+        );
+        assert.deepEqual(
+            ret['RAS'],
+            expectedResult['RAS'],
+            'merged gene track with unprofiled samples in one gene'
+        );
+        assert.deepEqual(
+            ret['SMAD4 / RAN'],
+            expectedResult['SMAD4 / RAN'],
+            'merged gene track with unprofiled samples in all genes'
+        );
     });
 
     it('should search in all molecularProfile ids', () => {
-        const ret = getSampleAlteredMap(filteredAlterationData, samples, oqlQuery, coverageInformationWithUnprofiledSamples, unprofiledMolecularProfileIds, studyToMolecularProfiles);
+        const ret = getSampleAlteredMap(
+            filteredAlterationData,
+            samples,
+            oqlQuery,
+            coverageInformationWithUnprofiledSamples,
+            unprofiledMolecularProfileIds,
+            studyToMolecularProfiles
+        );
         const expectedResult = {
-            "RAS": [
+            RAS: [
+                AlteredStatus.UNPROFILED,
                 AlteredStatus.UNPROFILED,
                 AlteredStatus.UNPROFILED,
                 AlteredStatus.UNPROFILED,
@@ -2492,116 +3211,127 @@ describe('getSampleAlteredMap', () => {
                 AlteredStatus.UNPROFILED,
                 AlteredStatus.UNPROFILED,
                 AlteredStatus.UNPROFILED,
-                AlteredStatus.UNPROFILED
-            ]
+            ],
         };
-        assert.deepEqual(ret["RAS"], expectedResult["RAS"], "should return an list contains only undefined value");
+        assert.deepEqual(
+            ret['RAS'],
+            expectedResult['RAS'],
+            'should return an list contains only undefined value'
+        );
     });
 });
 
 describe('getSingleGeneResultKey', () => {
     it('handles gene with alteration', () => {
-
         let arg0 = 2;
-        let arg1 = "[\"RAS\" KRAS NRAS]\n[SMAD4 RAN]\nSMAD4: MUT\nKRAS";
+        let arg1 = '["RAS" KRAS NRAS]\n[SMAD4 RAN]\nSMAD4: MUT\nKRAS';
         let arg2 = {
-            "gene": "SMAD4",
-            "parsed_oql_line": {
-                "gene": "SMAD4",
-                "alterations": []
+            gene: 'SMAD4',
+            parsed_oql_line: {
+                gene: 'SMAD4',
+                alterations: [],
             },
-            "oql_line": "SMAD4: MUT;",
-            "data": []
+            oql_line: 'SMAD4: MUT;',
+            data: [],
         } as OQLLineFilterOutput<AnnotatedExtendedAlteration>;
         const ret = getSingleGeneResultKey(arg0, arg1, arg2);
-        const expectedResult = "SMAD4: MUT"
-
-        assert.equal(ret, expectedResult, "get single gene result key(with alteration)");
+        const expectedResult = 'SMAD4: MUT';
 
+        assert.equal(
+            ret,
+            expectedResult,
+            'get single gene result key(with alteration)'
+        );
     });
 
     it('handles gene without mutation', () => {
-
         let arg0 = 3;
-        let arg1 = "[\"RAS\" KRAS NRAS]\n[SMAD4 RAN]\nSMAD4: MUT\nKRAS";
+        let arg1 = '["RAS" KRAS NRAS]\n[SMAD4 RAN]\nSMAD4: MUT\nKRAS';
         let arg2 = {
-            "gene": "KRAS",
-            "parsed_oql_line": {
-                "gene": "KRAS",
-                "alterations": []
+            gene: 'KRAS',
+            parsed_oql_line: {
+                gene: 'KRAS',
+                alterations: [],
             },
-            "oql_line": "KRAS: MUT FUSION;",
-            "data": []
+            oql_line: 'KRAS: MUT FUSION;',
+            data: [],
         } as OQLLineFilterOutput<AnnotatedExtendedAlteration>;
         const ret = getSingleGeneResultKey(arg0, arg1, arg2);
-        const expectedResult = "KRAS"
-
-        assert.equal(ret, expectedResult, "get single gene result key(without alteration)");
+        const expectedResult = 'KRAS';
 
+        assert.equal(
+            ret,
+            expectedResult,
+            'get single gene result key(without alteration)'
+        );
     });
 });
 
 describe('getMultipleGeneResultKey', () => {
     it('handles gene group with name', () => {
-
         let arg0 = {
-            "label": "RAS",
-            "list": [
+            label: 'RAS',
+            list: [
                 {
-                    "gene": "KRAS",
-                    "parsed_oql_line": {
-                        "gene": "KRAS",
-                        "alterations": []
+                    gene: 'KRAS',
+                    parsed_oql_line: {
+                        gene: 'KRAS',
+                        alterations: [],
                     },
-                    "oql_line": "KRAS: MUT FUSION;",
-                    "data": []
+                    oql_line: 'KRAS: MUT FUSION;',
+                    data: [],
                 },
                 {
-                    "gene": "NRAS",
-                    "parsed_oql_line": {
-                        "gene": "NRAS",
-                        "alterations": []
+                    gene: 'NRAS',
+                    parsed_oql_line: {
+                        gene: 'NRAS',
+                        alterations: [],
                     },
-                    "oql_line": "NRAS: MUT FUSION;",
-                    "data": []
-                }
-            ]
+                    oql_line: 'NRAS: MUT FUSION;',
+                    data: [],
+                },
+            ],
         } as MergedTrackLineFilterOutput<AnnotatedExtendedAlteration>;
         const ret = getMultipleGeneResultKey(arg0);
-        const expectedResult = "RAS"
-
-        assert.equal(ret, expectedResult, "get gene group result key(with name)");
+        const expectedResult = 'RAS';
 
+        assert.equal(
+            ret,
+            expectedResult,
+            'get gene group result key(with name)'
+        );
     });
 
     it('handles gene group without name', () => {
-
         let arg0 = {
-            "list": [
+            list: [
                 {
-                    "gene": "SMAD4",
-                    "parsed_oql_line": {
-                        "gene": "SMAD4",
-                        "alterations": []
+                    gene: 'SMAD4',
+                    parsed_oql_line: {
+                        gene: 'SMAD4',
+                        alterations: [],
                     },
-                    "oql_line": "SMAD4: MUT FUSION;",
-                    "data": []
+                    oql_line: 'SMAD4: MUT FUSION;',
+                    data: [],
                 },
                 {
-                    "gene": "RAN",
-                    "parsed_oql_line": {
-                        "gene": "RAN",
-                        "alterations": []
+                    gene: 'RAN',
+                    parsed_oql_line: {
+                        gene: 'RAN',
+                        alterations: [],
                     },
-                    "oql_line": "RAN: MUT FUSION;",
-                    "data": []
-                }
-            ]
+                    oql_line: 'RAN: MUT FUSION;',
+                    data: [],
+                },
+            ],
         } as MergedTrackLineFilterOutput<AnnotatedExtendedAlteration>;
         const ret = getMultipleGeneResultKey(arg0);
-        const expectedResult = "SMAD4 / RAN"
-
-        assert.equal(ret, expectedResult, "get gene group result key(without name)");
+        const expectedResult = 'SMAD4 / RAN';
 
+        assert.equal(
+            ret,
+            expectedResult,
+            'get gene group result key(without name)'
+        );
     });
 });
diff --git a/src/pages/resultsView/ResultsViewPageStoreUtils.ts b/src/pages/resultsView/ResultsViewPageStoreUtils.ts
index fd39b5d3675..e1d7b801dbe 100644
--- a/src/pages/resultsView/ResultsViewPageStoreUtils.ts
+++ b/src/pages/resultsView/ResultsViewPageStoreUtils.ts
@@ -1,73 +1,88 @@
 import {
-    Gene, NumericGeneMolecularData, GenePanel, GenePanelData, MolecularProfile,
-    Mutation, Patient, Sample, CancerStudy, ClinicalAttribute, PatientIdentifier,
-    PatientFilter, ReferenceGenomeGene
-} from "../../shared/api/generated/CBioPortalAPI";
-import {action, computed} from "mobx";
-import AccessorsForOqlFilter, {getSimplifiedMutationType} from "../../shared/lib/oql/AccessorsForOqlFilter";
+    Gene,
+    NumericGeneMolecularData,
+    GenePanel,
+    GenePanelData,
+    MolecularProfile,
+    Mutation,
+    Patient,
+    Sample,
+    CancerStudy,
+    ClinicalAttribute,
+    PatientIdentifier,
+    PatientFilter,
+    ReferenceGenomeGene,
+} from '../../shared/api/generated/CBioPortalAPI';
+import { action, computed } from 'mobx';
+import AccessorsForOqlFilter, {
+    getSimplifiedMutationType,
+} from '../../shared/lib/oql/AccessorsForOqlFilter';
 import {
     OQLLineFilterOutput,
     UnflattenedOQLLineFilterOutput,
     filterCBioPortalWebServiceDataByUnflattenedOQLLine,
     isMergedTrackFilter,
-    MergedTrackLineFilterOutput
-} from "../../shared/lib/oql/oqlfilter";
+    MergedTrackLineFilterOutput,
+} from '../../shared/lib/oql/oqlfilter';
 import oql_parser from '../../shared/lib/oql/oql-parser';
-import {groupBy} from "../../shared/lib/StoreUtils";
+import { groupBy } from '../../shared/lib/StoreUtils';
 import {
     AnnotatedExtendedAlteration,
     AnnotatedNumericGeneMolecularData,
     AnnotatedMutation,
     CaseAggregatedData,
     IQueriedCaseData,
-    IQueriedMergedTrackCaseData, ResultsViewPageStore, AlterationTypeConstants
-} from "./ResultsViewPageStore";
-import {IndicatorQueryResp, remoteData} from "cbioportal-frontend-commons";
-import _ from "lodash";
-import client from "shared/api/cbioportalClientInstance";
-import { VirtualStudy } from "shared/model/VirtualStudy";
-import MobxPromise, {MobxPromise_await} from "mobxpromise";
-import {calculateQValues} from "../../shared/lib/calculation/BenjaminiHochbergFDRCalculator";
-import {SpecialAttribute} from "../../shared/cache/ClinicalDataCache";
-import { isSampleProfiled } from "shared/lib/isSampleProfiled";
-import { AlteredStatus } from "./mutualExclusivity/MutualExclusivityUtil";
-import {Group} from "../../shared/api/ComparisonGroupClient";
-import {isNotGermlineMutation} from "../../shared/lib/MutationUtils";
+    IQueriedMergedTrackCaseData,
+    ResultsViewPageStore,
+    AlterationTypeConstants,
+} from './ResultsViewPageStore';
+import { IndicatorQueryResp, remoteData } from 'cbioportal-frontend-commons';
+import _ from 'lodash';
+import client from 'shared/api/cbioportalClientInstance';
+import { VirtualStudy } from 'shared/model/VirtualStudy';
+import MobxPromise, { MobxPromise_await } from 'mobxpromise';
+import { calculateQValues } from '../../shared/lib/calculation/BenjaminiHochbergFDRCalculator';
+import { SpecialAttribute } from '../../shared/cache/ClinicalDataCache';
+import { isSampleProfiled } from 'shared/lib/isSampleProfiled';
+import { AlteredStatus } from './mutualExclusivity/MutualExclusivityUtil';
+import { Group } from '../../shared/api/ComparisonGroupClient';
+import { isNotGermlineMutation } from '../../shared/lib/MutationUtils';
 
 type CustomDriverAnnotationReport = {
-    hasBinary: boolean,
+    hasBinary: boolean;
     tiers: string[];
 };
 
 type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
 
-export type ExtendedClinicalAttribute =
-    Pick<ClinicalAttribute, "datatype"|"description"|"displayName"|"patientAttribute"> &
-    {
-        clinicalAttributeId: string|SpecialAttribute;
-        molecularProfileIds?:string[];
-        comparisonGroup?:Group;
-    };
+export type ExtendedClinicalAttribute = Pick<
+    ClinicalAttribute,
+    'datatype' | 'description' | 'displayName' | 'patientAttribute'
+> & {
+    clinicalAttributeId: string | SpecialAttribute;
+    molecularProfileIds?: string[];
+    comparisonGroup?: Group;
+};
 
 export type CoverageInformationForCase = {
-    byGene:{[hugoGeneSymbol:string]:GenePanelData[]},
-    allGenes:Omit<GenePanelData, "genePanelId">[],
-    notProfiledByGene:{[hugoGeneSymbol:string]:GenePanelData[]}
-    notProfiledAllGenes:Omit<GenePanelData, "genePanelId">[];
+    byGene: { [hugoGeneSymbol: string]: GenePanelData[] };
+    allGenes: Omit<GenePanelData, 'genePanelId'>[];
+    notProfiledByGene: { [hugoGeneSymbol: string]: GenePanelData[] };
+    notProfiledAllGenes: Omit<GenePanelData, 'genePanelId'>[];
 };
 
 export type CoverageInformation = {
-    samples:
-        {[uniqueSampleKey:string]:CoverageInformationForCase};
-    patients:
-        {[uniquePatientKey:string]:CoverageInformationForCase};
+    samples: { [uniqueSampleKey: string]: CoverageInformationForCase };
+    patients: { [uniquePatientKey: string]: CoverageInformationForCase };
 };
 
-export type SampleAlteredMap = {[trackOqlKey:string]:AlteredStatus[]};
+export type SampleAlteredMap = { [trackOqlKey: string]: AlteredStatus[] };
 
-export function computeCustomDriverAnnotationReport(mutations:Mutation[]):CustomDriverAnnotationReport {
+export function computeCustomDriverAnnotationReport(
+    mutations: Mutation[]
+): CustomDriverAnnotationReport {
     let hasBinary = false;
-    let tiersMap:{[tier:string]:boolean} = {};
+    let tiersMap: { [tier: string]: boolean } = {};
     for (const mutation of mutations) {
         hasBinary = hasBinary || !!mutation.driverFilter;
         if (mutation.driverTiersFilter) {
@@ -76,76 +91,106 @@ export function computeCustomDriverAnnotationReport(mutations:Mutation[]):Custom
     }
     return {
         hasBinary,
-        tiers: Object.keys(tiersMap)
+        tiers: Object.keys(tiersMap),
     };
 }
 
 export enum OncoprintAnalysisCaseType {
-    SAMPLE = "sample",
-    PATIENT = "patient"
-};
+    SAMPLE = 'sample',
+    PATIENT = 'patient',
+}
 
-export const DEFAULT_GENOME = "hg19";
-
-export const initializeCustomDriverAnnotationSettings = action((
-    report:CustomDriverAnnotationReport,
-    mutationAnnotationSettings:any,
-    enableCustomTiers:boolean,
-    enableOncoKb:boolean,
-    enableHotspots:boolean
-)=>{
-    // initialize keys with all available tiers
-    for (const tier of report.tiers) {
-        mutationAnnotationSettings.driverTiers.set(tier, enableCustomTiers);
-    }
+export const DEFAULT_GENOME = 'hg19';
+
+export const initializeCustomDriverAnnotationSettings = action(
+    (
+        report: CustomDriverAnnotationReport,
+        mutationAnnotationSettings: any,
+        enableCustomTiers: boolean,
+        enableOncoKb: boolean,
+        enableHotspots: boolean
+    ) => {
+        // initialize keys with all available tiers
+        for (const tier of report.tiers) {
+            mutationAnnotationSettings.driverTiers.set(tier, enableCustomTiers);
+        }
 
-    if (enableOncoKb) {
-        mutationAnnotationSettings.oncoKb = true;
-    }
+        if (enableOncoKb) {
+            mutationAnnotationSettings.oncoKb = true;
+        }
 
-    if (enableHotspots) {
-        mutationAnnotationSettings.hotspots = true;
+        if (enableHotspots) {
+            mutationAnnotationSettings.hotspots = true;
+        }
     }
-});
+);
 
 export function annotateMutationPutativeDriver(
     mutation: Mutation,
-    putativeDriverInfo:{oncoKb:string, hotspots:boolean, cbioportalCount:boolean, cosmicCount:boolean, customDriverBinary:boolean, customDriverTier?:string},
-):AnnotatedMutation {
-    const putativeDriver =
-        !!(putativeDriverInfo.oncoKb ||
+    putativeDriverInfo: {
+        oncoKb: string;
+        hotspots: boolean;
+        cbioportalCount: boolean;
+        cosmicCount: boolean;
+        customDriverBinary: boolean;
+        customDriverTier?: string;
+    }
+): AnnotatedMutation {
+    const putativeDriver = !!(
+        putativeDriverInfo.oncoKb ||
         putativeDriverInfo.hotspots ||
         putativeDriverInfo.cbioportalCount ||
         putativeDriverInfo.cosmicCount ||
         putativeDriverInfo.customDriverBinary ||
-        putativeDriverInfo.customDriverTier);
-    return Object.assign({
-        putativeDriver,
-        isHotspot: putativeDriverInfo.hotspots,
-        oncoKbOncogenic: putativeDriverInfo.oncoKb,
-        simplifiedMutationType: getSimplifiedMutationType(mutation.mutationType)
-    }, mutation) as AnnotatedMutation;
+        putativeDriverInfo.customDriverTier
+    );
+    return Object.assign(
+        {
+            putativeDriver,
+            isHotspot: putativeDriverInfo.hotspots,
+            oncoKbOncogenic: putativeDriverInfo.oncoKb,
+            simplifiedMutationType: getSimplifiedMutationType(
+                mutation.mutationType
+            ),
+        },
+        mutation
+    ) as AnnotatedMutation;
 }
 
-export type FilteredAndAnnotatedMutationsReport<T extends AnnotatedMutation = AnnotatedMutation> = {
-    data:T[],
-    vus:T[],
-    germline:T[],
-    vusAndGermline:T[]
+export type FilteredAndAnnotatedMutationsReport<
+    T extends AnnotatedMutation = AnnotatedMutation
+> = {
+    data: T[];
+    vus: T[];
+    germline: T[];
+    vusAndGermline: T[];
 };
 
 export function filterAndAnnotateMutations(
     mutations: Mutation[],
-    getPutativeDriverInfo:(mutation:Mutation)=>{oncoKb:string, hotspots:boolean, cbioportalCount:boolean, cosmicCount:boolean, customDriverBinary:boolean, customDriverTier?:string},
-    entrezGeneIdToGene:{[entrezGeneId:number]:Gene}
-):FilteredAndAnnotatedMutationsReport<AnnotatedMutation> {
-    const vus:AnnotatedMutation[] = [];
-    const germline:AnnotatedMutation[] = [];
-    const vusAndGermline:AnnotatedMutation[] = [];
+    getPutativeDriverInfo: (
+        mutation: Mutation
+    ) => {
+        oncoKb: string;
+        hotspots: boolean;
+        cbioportalCount: boolean;
+        cosmicCount: boolean;
+        customDriverBinary: boolean;
+        customDriverTier?: string;
+    },
+    entrezGeneIdToGene: { [entrezGeneId: number]: Gene }
+): FilteredAndAnnotatedMutationsReport<AnnotatedMutation> {
+    const vus: AnnotatedMutation[] = [];
+    const germline: AnnotatedMutation[] = [];
+    const vusAndGermline: AnnotatedMutation[] = [];
     const filteredAnnotatedMutations = [];
     for (const mutation of mutations) {
-        const annotatedMutation = annotateMutationPutativeDriver(mutation, getPutativeDriverInfo(mutation)); // annotate
-        annotatedMutation.hugoGeneSymbol = entrezGeneIdToGene[mutation.entrezGeneId].hugoGeneSymbol;
+        const annotatedMutation = annotateMutationPutativeDriver(
+            mutation,
+            getPutativeDriverInfo(mutation)
+        ); // annotate
+        annotatedMutation.hugoGeneSymbol =
+            entrezGeneIdToGene[mutation.entrezGeneId].hugoGeneSymbol;
         const isGermline = !isNotGermlineMutation(mutation);
         const isVus = !annotatedMutation.putativeDriver;
         if (isGermline && isVus) {
@@ -160,14 +205,18 @@ export function filterAndAnnotateMutations(
     }
     return {
         data: filteredAnnotatedMutations,
-        vus, germline, vusAndGermline
+        vus,
+        germline,
+        vusAndGermline,
     };
 }
 
-export function compileMutations<T extends AnnotatedMutation = AnnotatedMutation>(
-    report:FilteredAndAnnotatedMutationsReport<T>,
-    excludeVus:boolean,
-    excludeGermline:boolean
+export function compileMutations<
+    T extends AnnotatedMutation = AnnotatedMutation
+>(
+    report: FilteredAndAnnotatedMutationsReport<T>,
+    excludeVus: boolean,
+    excludeGermline: boolean
 ) {
     let mutations = report.data;
     if (!excludeVus) {
@@ -182,49 +231,69 @@ export function compileMutations<T extends AnnotatedMutation = AnnotatedMutation
     return mutations;
 }
 
-
-export const ONCOKB_ONCOGENIC_LOWERCASE = ["likely oncogenic", "predicted oncogenic", "oncogenic"];
-
-export function getOncoKbOncogenic(response:IndicatorQueryResp):string {
-    if (ONCOKB_ONCOGENIC_LOWERCASE.indexOf((response.oncogenic || "").toLowerCase()) > -1) {
+export const ONCOKB_ONCOGENIC_LOWERCASE = [
+    'likely oncogenic',
+    'predicted oncogenic',
+    'oncogenic',
+];
+
+export function getOncoKbOncogenic(response: IndicatorQueryResp): string {
+    if (
+        ONCOKB_ONCOGENIC_LOWERCASE.indexOf(
+            (response.oncogenic || '').toLowerCase()
+        ) > -1
+    ) {
         return response.oncogenic;
     } else {
-        return "";
+        return '';
     }
 }
 
 export function computeGenePanelInformation(
-    genePanelData:GenePanelData[],
-    genePanels:GenePanel[],
-    samples: Pick<Sample, "uniqueSampleKey"|"uniquePatientKey">[],
-    patients: Pick<Patient, "uniquePatientKey">[],
-    genes:Pick<Gene, "entrezGeneId"|"hugoGeneSymbol">[]
-):CoverageInformation {
-    const entrezToGene = _.keyBy(genes, gene=>gene.entrezGeneId);
-    const genePanelToGenes = _.mapValues(_.keyBy(genePanels, panel=>panel.genePanelId), (panel:GenePanel)=>{
-        return panel.genes.filter(gene=>!!entrezToGene[gene.entrezGeneId]); // only list genes that we're curious in
-    });
-    const sampleInfo:CoverageInformation["samples"] = _.reduce(samples, (map:CoverageInformation["samples"], sample)=>{
-        map[sample.uniqueSampleKey] = {
-            byGene: {},
-            allGenes:[],
-            notProfiledByGene: {},
-            notProfiledAllGenes:[]
-        };
-        return map;
-    }, {});
-
-    const patientInfo:CoverageInformation["patients"] = _.reduce(patients, (map:CoverageInformation["patients"], patient)=>{
-        map[patient.uniquePatientKey] = {
-            byGene: {},
-            allGenes:[],
-            notProfiledByGene: {},
-            notProfiledAllGenes:[]
-        };
-        return map;
-    }, {});
+    genePanelData: GenePanelData[],
+    genePanels: GenePanel[],
+    samples: Pick<Sample, 'uniqueSampleKey' | 'uniquePatientKey'>[],
+    patients: Pick<Patient, 'uniquePatientKey'>[],
+    genes: Pick<Gene, 'entrezGeneId' | 'hugoGeneSymbol'>[]
+): CoverageInformation {
+    const entrezToGene = _.keyBy(genes, gene => gene.entrezGeneId);
+    const genePanelToGenes = _.mapValues(
+        _.keyBy(genePanels, panel => panel.genePanelId),
+        (panel: GenePanel) => {
+            return panel.genes.filter(
+                gene => !!entrezToGene[gene.entrezGeneId]
+            ); // only list genes that we're curious in
+        }
+    );
+    const sampleInfo: CoverageInformation['samples'] = _.reduce(
+        samples,
+        (map: CoverageInformation['samples'], sample) => {
+            map[sample.uniqueSampleKey] = {
+                byGene: {},
+                allGenes: [],
+                notProfiledByGene: {},
+                notProfiledAllGenes: [],
+            };
+            return map;
+        },
+        {}
+    );
 
-    const genePanelDataWithGenePanelId:GenePanelData[] = [];
+    const patientInfo: CoverageInformation['patients'] = _.reduce(
+        patients,
+        (map: CoverageInformation['patients'], patient) => {
+            map[patient.uniquePatientKey] = {
+                byGene: {},
+                allGenes: [],
+                notProfiledByGene: {},
+                notProfiledAllGenes: [],
+            };
+            return map;
+        },
+        {}
+    );
+
+    const genePanelDataWithGenePanelId: GenePanelData[] = [];
     for (const gpData of genePanelData) {
         const sampleSequencingInfo = sampleInfo[gpData.uniqueSampleKey];
         const patientSequencingInfo = patientInfo[gpData.uniquePatientKey];
@@ -235,11 +304,19 @@ export function computeGenePanelInformation(
                 if (genePanelToGenes[genePanelId]) {
                     // add gene panel data to record particular genes sequenced
                     for (const gene of genePanelToGenes[genePanelId]) {
-                        sampleSequencingInfo.byGene[gene.hugoGeneSymbol] = sampleSequencingInfo.byGene[gene.hugoGeneSymbol] || [];
-                        sampleSequencingInfo.byGene[gene.hugoGeneSymbol].push(gpData);
-
-                        patientSequencingInfo.byGene[gene.hugoGeneSymbol] = patientSequencingInfo.byGene[gene.hugoGeneSymbol] || [];
-                        patientSequencingInfo.byGene[gene.hugoGeneSymbol].push(gpData);
+                        sampleSequencingInfo.byGene[gene.hugoGeneSymbol] =
+                            sampleSequencingInfo.byGene[gene.hugoGeneSymbol] ||
+                            [];
+                        sampleSequencingInfo.byGene[gene.hugoGeneSymbol].push(
+                            gpData
+                        );
+
+                        patientSequencingInfo.byGene[gene.hugoGeneSymbol] =
+                            patientSequencingInfo.byGene[gene.hugoGeneSymbol] ||
+                            [];
+                        patientSequencingInfo.byGene[gene.hugoGeneSymbol].push(
+                            gpData
+                        );
                     }
                     // Add to list for more processing later
                     genePanelDataWithGenePanelId.push(gpData);
@@ -261,73 +338,108 @@ export function computeGenePanelInformation(
 
         for (const queryGene of genes) {
             if (!sampleSequencingInfo.byGene[queryGene.hugoGeneSymbol]) {
-                sampleSequencingInfo.notProfiledByGene[queryGene.hugoGeneSymbol] = sampleSequencingInfo.notProfiledByGene[queryGene.hugoGeneSymbol] || [];
-                sampleSequencingInfo.notProfiledByGene[queryGene.hugoGeneSymbol].push(gpData);
+                sampleSequencingInfo.notProfiledByGene[
+                    queryGene.hugoGeneSymbol
+                ] =
+                    sampleSequencingInfo.notProfiledByGene[
+                        queryGene.hugoGeneSymbol
+                    ] || [];
+                sampleSequencingInfo.notProfiledByGene[
+                    queryGene.hugoGeneSymbol
+                ].push(gpData);
             }
             if (!patientSequencingInfo.byGene[queryGene.hugoGeneSymbol]) {
-                patientSequencingInfo.notProfiledByGene[queryGene.hugoGeneSymbol] = patientSequencingInfo.notProfiledByGene[queryGene.hugoGeneSymbol] || [];
-                patientSequencingInfo.notProfiledByGene[queryGene.hugoGeneSymbol].push(gpData);
+                patientSequencingInfo.notProfiledByGene[
+                    queryGene.hugoGeneSymbol
+                ] =
+                    patientSequencingInfo.notProfiledByGene[
+                        queryGene.hugoGeneSymbol
+                    ] || [];
+                patientSequencingInfo.notProfiledByGene[
+                    queryGene.hugoGeneSymbol
+                ].push(gpData);
             }
         }
     }
     return {
         samples: sampleInfo,
-        patients: patientInfo
+        patients: patientInfo,
     };
 }
 
 export function annotateMolecularDatum(
-    molecularDatum:NumericGeneMolecularData,
-    getOncoKbCnaAnnotationForOncoprint:(datum:NumericGeneMolecularData)=>IndicatorQueryResp|undefined,
-    molecularProfileIdToMolecularProfile:{[molecularProfileId:string]:MolecularProfile},
-    entrezGeneIdToGene:{[entrezGeneId:number]:Gene}
-):AnnotatedNumericGeneMolecularData {
-    const hugoGeneSymbol = entrezGeneIdToGene[molecularDatum.entrezGeneId].hugoGeneSymbol;
-    let oncogenic = "";
-    if (molecularProfileIdToMolecularProfile[molecularDatum.molecularProfileId].molecularAlterationType
-        === "COPY_NUMBER_ALTERATION") {
+    molecularDatum: NumericGeneMolecularData,
+    getOncoKbCnaAnnotationForOncoprint: (
+        datum: NumericGeneMolecularData
+    ) => IndicatorQueryResp | undefined,
+    molecularProfileIdToMolecularProfile: {
+        [molecularProfileId: string]: MolecularProfile;
+    },
+    entrezGeneIdToGene: { [entrezGeneId: number]: Gene }
+): AnnotatedNumericGeneMolecularData {
+    const hugoGeneSymbol =
+        entrezGeneIdToGene[molecularDatum.entrezGeneId].hugoGeneSymbol;
+    let oncogenic = '';
+    if (
+        molecularProfileIdToMolecularProfile[molecularDatum.molecularProfileId]
+            .molecularAlterationType === 'COPY_NUMBER_ALTERATION'
+    ) {
         const oncoKbDatum = getOncoKbCnaAnnotationForOncoprint(molecularDatum);
         if (oncoKbDatum) {
             oncogenic = getOncoKbOncogenic(oncoKbDatum);
         }
     }
-    return Object.assign({oncoKbOncogenic: oncogenic, hugoGeneSymbol}, molecularDatum);
+    return Object.assign(
+        { oncoKbOncogenic: oncogenic, hugoGeneSymbol },
+        molecularDatum
+    );
 }
 
-export async function fetchQueriedStudies(filteredPhysicalStudies:{[id:string]:CancerStudy},queriedIds:string[],queriedVirtualStudies:VirtualStudy[]):Promise<CancerStudy[]>{
-    const queriedStudies:CancerStudy[] = [];
-    let unknownIds:{[id:string]:boolean} = {};
-    for(const id of queriedIds){
-        if(filteredPhysicalStudies[id]){
+export async function fetchQueriedStudies(
+    filteredPhysicalStudies: { [id: string]: CancerStudy },
+    queriedIds: string[],
+    queriedVirtualStudies: VirtualStudy[]
+): Promise<CancerStudy[]> {
+    const queriedStudies: CancerStudy[] = [];
+    let unknownIds: { [id: string]: boolean } = {};
+    for (const id of queriedIds) {
+        if (filteredPhysicalStudies[id]) {
             queriedStudies.push(filteredPhysicalStudies[id]);
         } else {
-            unknownIds[id]=true;
+            unknownIds[id] = true;
         }
     }
 
-    if(!_.isEmpty(unknownIds)){
-        await client.fetchStudiesUsingPOST({
-            studyIds:Object.keys(unknownIds),
-            projection:'DETAILED'
-        }).then(studies=>{
-            studies.forEach(study=>{
-                queriedStudies.push(study);
-                delete unknownIds[study.studyId];
+    if (!_.isEmpty(unknownIds)) {
+        await client
+            .fetchStudiesUsingPOST({
+                studyIds: Object.keys(unknownIds),
+                projection: 'DETAILED',
             })
-
-        }).catch(() => {}); //this is for private instances. it throws error when the study is not found
-
-        queriedVirtualStudies.filter((vs:VirtualStudy) => unknownIds[vs.id]).forEach(virtualStudy=>{
-            // tslint:disable-next-line:no-object-literal-type-assertion
-            const cancerStudy = {
-                allSampleCount: _.sumBy(virtualStudy.data.studies, study=>study.samples.length),
-                studyId: virtualStudy.id,
-                name: virtualStudy.data.name,
-                description: virtualStudy.data.description,
-                cancerTypeId: "My Virtual Studies"
-            } as CancerStudy;
-            queriedStudies.push(cancerStudy);
-        });
+            .then(studies => {
+                studies.forEach(study => {
+                    queriedStudies.push(study);
+                    delete unknownIds[study.studyId];
+                });
+            })
+            .catch(() => {}); //this is for private instances. it throws error when the study is not found
+
+        queriedVirtualStudies
+            .filter((vs: VirtualStudy) => unknownIds[vs.id])
+            .forEach(virtualStudy => {
+                // tslint:disable-next-line:no-object-literal-type-assertion
+                const cancerStudy = {
+                    allSampleCount: _.sumBy(
+                        virtualStudy.data.studies,
+                        study => study.samples.length
+                    ),
+                    studyId: virtualStudy.id,
+                    name: virtualStudy.data.name,
+                    description: virtualStudy.data.description,
+                    cancerTypeId: 'My Virtual Studies',
+                } as CancerStudy;
+                queriedStudies.push(cancerStudy);
+            });
     }
 
     return queriedStudies;
@@ -335,17 +447,23 @@ export async function fetchQueriedStudies(filteredPhysicalStudies:{[id:string]:C
 
 export function groupDataByCase(
     oqlFilter: UnflattenedOQLLineFilterOutput<AnnotatedExtendedAlteration>,
-    samples: {uniqueSampleKey: string}[],
-    patients: {uniquePatientKey: string}[]
+    samples: { uniqueSampleKey: string }[],
+    patients: { uniquePatientKey: string }[]
 ): CaseAggregatedData<AnnotatedExtendedAlteration> {
-    const data: AnnotatedExtendedAlteration[] = (
-        isMergedTrackFilter(oqlFilter)
-        ? _.flatMap(oqlFilter.list, (geneLine) => geneLine.data)
-        : oqlFilter.data
-    );
+    const data: AnnotatedExtendedAlteration[] = isMergedTrackFilter(oqlFilter)
+        ? _.flatMap(oqlFilter.list, geneLine => geneLine.data)
+        : oqlFilter.data;
     return {
-        samples: groupBy(data, datum=>datum.uniqueSampleKey, samples.map(sample=>sample.uniqueSampleKey)),
-        patients: groupBy(data, datum=>datum.uniquePatientKey, patients.map(sample=>sample.uniquePatientKey))
+        samples: groupBy(
+            data,
+            datum => datum.uniqueSampleKey,
+            samples.map(sample => sample.uniqueSampleKey)
+        ),
+        patients: groupBy(
+            data,
+            datum => datum.uniquePatientKey,
+            patients.map(sample => sample.uniquePatientKey)
+        ),
     };
 }
 
@@ -354,84 +472,85 @@ export function filterSubQueryData(
     defaultOQLQuery: string,
     data: (AnnotatedMutation | NumericGeneMolecularData)[],
     accessorsInstance: AccessorsForOqlFilter,
-    samples: {uniqueSampleKey: string}[],
-    patients: {uniquePatientKey: string}[]
+    samples: { uniqueSampleKey: string }[],
+    patients: { uniquePatientKey: string }[]
 ): IQueriedCaseData<object>[] | undefined {
     function filterDataForLine(oqlLine: string) {
         // assuming that merged track syntax will never allow
         // nesting, each inner OQL line will be one single-gene
         // query
-        const alterationsForLine = (
-            filterCBioPortalWebServiceDataByUnflattenedOQLLine(
-                oqlLine,
-                data,
-                accessorsInstance,
-                defaultOQLQuery
-            )[0]
-        ) as OQLLineFilterOutput<AnnotatedExtendedAlteration>;
+        const alterationsForLine = filterCBioPortalWebServiceDataByUnflattenedOQLLine(
+            oqlLine,
+            data,
+            accessorsInstance,
+            defaultOQLQuery
+        )[0] as OQLLineFilterOutput<AnnotatedExtendedAlteration>;
         return {
             cases: groupDataByCase(alterationsForLine, samples, patients),
-            oql: alterationsForLine
+            oql: alterationsForLine,
         };
     }
 
     if (!isMergedTrackFilter(queryStructure)) {
         return undefined;
     } else {
-        return queryStructure.list.map(
-            innerLine => filterDataForLine(innerLine.oql_line)
+        return queryStructure.list.map(innerLine =>
+            filterDataForLine(innerLine.oql_line)
         );
     }
 }
 
-
-export function isRNASeqProfile(profileId:string): boolean {
-    return RegExp(`rna_seq_mrna$|rna_seq_v2_mrna$|pan_can_atlas_2018_rna_seq_mrna_median$|pan_can_atlas_2018_rna_seq_v2_mrna_median$`).test(profileId);
+export function isRNASeqProfile(profileId: string): boolean {
+    return RegExp(
+        `rna_seq_mrna$|rna_seq_v2_mrna$|pan_can_atlas_2018_rna_seq_mrna_median$|pan_can_atlas_2018_rna_seq_v2_mrna_median$`
+    ).test(profileId);
 }
 
-export function isTCGAPubStudy(studyId:string){
+export function isTCGAPubStudy(studyId: string) {
     return /tcga_pub$/.test(studyId);
 }
 
-export function isTCGAProvStudy(studyId:string){
+export function isTCGAProvStudy(studyId: string) {
     return /tcga$/.test(studyId);
 }
 
-export function isPanCanStudy(studyId:string){
+export function isPanCanStudy(studyId: string) {
     return /tcga_pan_can_atlas/.test(studyId);
 }
 
-export function buildResultsViewPageTitle(genes:string[], studies:CancerStudy[]){
-
-    const arr = ["cBioPortal for Cancer Genomics: "];
+export function buildResultsViewPageTitle(
+    genes: string[],
+    studies: CancerStudy[]
+) {
+    const arr = ['cBioPortal for Cancer Genomics: '];
 
     if (genes.length) {
         arr.push(genes[0]);
         if (genes.length > 1) {
-            arr.push(", ");
+            arr.push(', ');
             arr.push(genes[1]);
         }
         if (genes.length > 2) {
-            arr.push(" and ");
+            arr.push(' and ');
             arr.push((genes.length - 2).toString());
-            arr.push(" other ");
-            arr.push(((genes.length - 2) > 1) ? "genes" : "gene");
+            arr.push(' other ');
+            arr.push(genes.length - 2 > 1 ? 'genes' : 'gene');
         }
-        if (studies.length){
-            arr.push(" in ");
+        if (studies.length) {
+            arr.push(' in ');
             arr.push(studies[0].shortName);
             if (studies.length > 1) {
-                arr.push(" and ");
+                arr.push(' and ');
                 arr.push((studies.length - 1).toString());
-                arr.push (" other ");
-                arr.push(((studies.length - 1) > 1) ? "studies" : "study");
+                arr.push(' other ');
+                arr.push(studies.length - 1 > 1 ? 'studies' : 'study');
             }
         }
     }
-    return arr.join("");
+    return arr.join('');
 }
 
-export function getMolecularProfiles(query:any){
+export function getMolecularProfiles(query: any) {
     //if there's only one study, we read profiles from query params and filter out undefined
     let molecularProfiles = [
         query.genetic_profile_ids_PROFILE_MUTATION_EXTENDED,
@@ -439,11 +558,13 @@ export function getMolecularProfiles(query:any){
         query.genetic_profile_ids_PROFILE_MRNA_EXPRESSION,
         query.genetic_profile_ids_PROFILE_PROTEIN_EXPRESSION,
         query.genetic_profile_ids_PROFILE_GENESET_SCORE,
-        query.genetic_profile_ids_GENERIC_ASSAY
-    ].filter((profile:string|undefined)=>!!profile);
+        query.genetic_profile_ids_GENERIC_ASSAY,
+    ].filter((profile: string | undefined) => !!profile);
 
     // append 'genetic_profile_ids' which is sometimes in use
-    molecularProfiles = molecularProfiles.concat(query.genetic_profile_ids || []);
+    molecularProfiles = molecularProfiles.concat(
+        query.genetic_profile_ids || []
+    );
 
     // filter out duplicates
     molecularProfiles = _.uniq(molecularProfiles);
@@ -451,33 +572,65 @@ export function getMolecularProfiles(query:any){
     return molecularProfiles;
 }
 
-export function doesQueryHaveCNSegmentData(
-    detailedSamples:Sample[]
-) {
+export function doesQueryHaveCNSegmentData(detailedSamples: Sample[]) {
     if (detailedSamples.length === 0) {
         return false;
-    } else if (!("copyNumberSegmentPresent" in detailedSamples[0])) {
-        throw "Passed non-detailed sample projection when detailed expected.";
+    } else if (!('copyNumberSegmentPresent' in detailedSamples[0])) {
+        throw 'Passed non-detailed sample projection when detailed expected.';
     } else {
-        return _.some(detailedSamples, s=>!!s.copyNumberSegmentPresent);
+        return _.some(detailedSamples, s => !!s.copyNumberSegmentPresent);
     }
 }
 
-export function getSampleAlteredMap(filteredAlterationData: IQueriedMergedTrackCaseData[], samples: Sample[], oqlQuery: string, coverageInformation: CoverageInformation, selectedMolecularProfileIds: string[], studyToMolecularProfiles : _.Dictionary<MolecularProfile[]>) {
-    const result : SampleAlteredMap = {};
+export function getSampleAlteredMap(
+    filteredAlterationData: IQueriedMergedTrackCaseData[],
+    samples: Sample[],
+    oqlQuery: string,
+    coverageInformation: CoverageInformation,
+    selectedMolecularProfileIds: string[],
+    studyToMolecularProfiles: _.Dictionary<MolecularProfile[]>
+) {
+    const result: SampleAlteredMap = {};
     filteredAlterationData.forEach((element, key) => {
         //1: is not group
         if (element.mergedTrackOqlList === undefined) {
-            const notGroupedOql = element.oql as OQLLineFilterOutput<AnnotatedExtendedAlteration>;
-            const sampleKeysMap = _.keyBy(_.map(notGroupedOql.data, (data) => data.uniqueSampleKey));
-            const unProfiledSampleKeysMap = _.keyBy(samples.filter((sample) => {
-                const molecularProfileIds = studyToMolecularProfiles[sample.studyId] ? _.intersection(studyToMolecularProfiles[sample.studyId].map((profile) => profile.molecularProfileId), selectedMolecularProfileIds) : selectedMolecularProfileIds;
-                // if not profiled in some genes molecular profile, then we think it is not profiled and will exclude this sample
-                return _.some(_.map(molecularProfileIds, (molecularProfileId) => {
-                    return isSampleProfiled(sample.uniqueSampleKey, molecularProfileId, notGroupedOql.gene, coverageInformation);
-                }) , (profiled) => profiled === false);
-            }).map((sample) => sample.uniqueSampleKey));
-            result[getSingleGeneResultKey(key, oqlQuery, notGroupedOql)] = samples.map((sample: Sample) => {
+            const notGroupedOql = element.oql as OQLLineFilterOutput<
+                AnnotatedExtendedAlteration
+            >;
+            const sampleKeysMap = _.keyBy(
+                _.map(notGroupedOql.data, data => data.uniqueSampleKey)
+            );
+            const unProfiledSampleKeysMap = _.keyBy(
+                samples
+                    .filter(sample => {
+                        const molecularProfileIds = studyToMolecularProfiles[
+                            sample.studyId
+                        ]
+                            ? _.intersection(
+                                  studyToMolecularProfiles[sample.studyId].map(
+                                      profile => profile.molecularProfileId
+                                  ),
+                                  selectedMolecularProfileIds
+                              )
+                            : selectedMolecularProfileIds;
+                        // if not profiled in some genes molecular profile, then we think it is not profiled and will exclude this sample
+                        return _.some(
+                            _.map(molecularProfileIds, molecularProfileId => {
+                                return isSampleProfiled(
+                                    sample.uniqueSampleKey,
+                                    molecularProfileId,
+                                    notGroupedOql.gene,
+                                    coverageInformation
+                                );
+                            }),
+                            profiled => profiled === false
+                        );
+                    })
+                    .map(sample => sample.uniqueSampleKey)
+            );
+            result[
+                getSingleGeneResultKey(key, oqlQuery, notGroupedOql)
+            ] = samples.map((sample: Sample) => {
                 if (sample.uniqueSampleKey in unProfiledSampleKeysMap) {
                     return AlteredStatus.UNPROFILED;
                 } else if (sample.uniqueSampleKey in sampleKeysMap) {
@@ -489,36 +642,76 @@ export function getSampleAlteredMap(filteredAlterationData: IQueriedMergedTrackC
         }
         //2: is group
         else {
-            const groupedOql = element.oql as MergedTrackLineFilterOutput<AnnotatedExtendedAlteration>;
-            const sampleKeysMap = _.keyBy(_.map(_.flatten(_.map(groupedOql.list, (list) => list.data)), (data) => data.uniqueSampleKey));
-            const groupGenes = _.map(groupedOql.list, (oql) => oql.gene);
-            const unProfiledSampleKeysMap = _.keyBy(samples.filter((sample) => {
-                const molecularProfileIds = studyToMolecularProfiles[sample.studyId] ? _.intersection(studyToMolecularProfiles[sample.studyId].map((profile) => profile.molecularProfileId), selectedMolecularProfileIds) : selectedMolecularProfileIds;
-                // if not profiled in some genes molecular profile, then we think it is not profiled and will exclude this sample
-                return _.some(_.map(molecularProfileIds, (molecularProfileId) => {
-                    // if not profiled in every genes, then the sample is not profiled, or we think it is profiled
-                    return _.every(_.map(groupGenes, (gene) => {
-                        return isSampleProfiled(sample.uniqueSampleKey, molecularProfileId, gene, coverageInformation);
-                    }), (profiled) => profiled === false);
-                }) , (notProfiled) => notProfiled === true);
-            }).map((sample) => sample.uniqueSampleKey));
-            result[getMultipleGeneResultKey(groupedOql)] = samples.map((sample: Sample) => {
-                if (sample.uniqueSampleKey in unProfiledSampleKeysMap) {
-                    return AlteredStatus.UNPROFILED;
-                } else if (sample.uniqueSampleKey in sampleKeysMap) {
-                    return AlteredStatus.ALTERED;
-                } else {
-                    return AlteredStatus.UNALTERED;
+            const groupedOql = element.oql as MergedTrackLineFilterOutput<
+                AnnotatedExtendedAlteration
+            >;
+            const sampleKeysMap = _.keyBy(
+                _.map(
+                    _.flatten(_.map(groupedOql.list, list => list.data)),
+                    data => data.uniqueSampleKey
+                )
+            );
+            const groupGenes = _.map(groupedOql.list, oql => oql.gene);
+            const unProfiledSampleKeysMap = _.keyBy(
+                samples
+                    .filter(sample => {
+                        const molecularProfileIds = studyToMolecularProfiles[
+                            sample.studyId
+                        ]
+                            ? _.intersection(
+                                  studyToMolecularProfiles[sample.studyId].map(
+                                      profile => profile.molecularProfileId
+                                  ),
+                                  selectedMolecularProfileIds
+                              )
+                            : selectedMolecularProfileIds;
+                        // if not profiled in some genes molecular profile, then we think it is not profiled and will exclude this sample
+                        return _.some(
+                            _.map(molecularProfileIds, molecularProfileId => {
+                                // if not profiled in every genes, then the sample is not profiled, or we think it is profiled
+                                return _.every(
+                                    _.map(groupGenes, gene => {
+                                        return isSampleProfiled(
+                                            sample.uniqueSampleKey,
+                                            molecularProfileId,
+                                            gene,
+                                            coverageInformation
+                                        );
+                                    }),
+                                    profiled => profiled === false
+                                );
+                            }),
+                            notProfiled => notProfiled === true
+                        );
+                    })
+                    .map(sample => sample.uniqueSampleKey)
+            );
+            result[getMultipleGeneResultKey(groupedOql)] = samples.map(
+                (sample: Sample) => {
+                    if (sample.uniqueSampleKey in unProfiledSampleKeysMap) {
+                        return AlteredStatus.UNPROFILED;
+                    } else if (sample.uniqueSampleKey in sampleKeysMap) {
+                        return AlteredStatus.ALTERED;
+                    } else {
+                        return AlteredStatus.UNALTERED;
+                    }
                 }
-            });
+            );
         }
     });
     return result;
 }
 
-export function getSingleGeneResultKey(key: number, oqlQuery: string, notGroupedOql: OQLLineFilterOutput<AnnotatedExtendedAlteration>){
+export function getSingleGeneResultKey(
+    key: number,
+    oqlQuery: string,
+    notGroupedOql: OQLLineFilterOutput<AnnotatedExtendedAlteration>
+) {
     //only gene
-    if ((oql_parser.parse(oqlQuery)![key] as oql_parser.SingleGeneQuery).alterations === false) {
+    if (
+        (oql_parser.parse(oqlQuery)![key] as oql_parser.SingleGeneQuery)
+            .alterations === false
+    ) {
         return notGroupedOql.gene;
     }
     //gene with alteration type
@@ -527,19 +720,32 @@ export function getSingleGeneResultKey(key: number, oqlQuery: string, notGrouped
     }
 }
 
-export function getMultipleGeneResultKey(groupedOql: MergedTrackLineFilterOutput<AnnotatedExtendedAlteration>){
-    return groupedOql.label ? groupedOql.label : _.map(groupedOql.list, (data) => data.gene).join(' / ');
+export function getMultipleGeneResultKey(
+    groupedOql: MergedTrackLineFilterOutput<AnnotatedExtendedAlteration>
+) {
+    return groupedOql.label
+        ? groupedOql.label
+        : _.map(groupedOql.list, data => data.gene).join(' / ');
 }
 
-export function makeEnrichmentDataPromise<T extends {cytoband?:string, hugoGeneSymbol:string, pValue:number, qValue?:number}>(params:{
-    store?:ResultsViewPageStore,
-    await: MobxPromise_await,
-    referenceGenesPromise:MobxPromise<{[hugoGeneSymbol:string]:ReferenceGenomeGene}>,
-    getSelectedProfileMap:()=>{[studyId:string]:MolecularProfile},
-    fetchData:()=>Promise<T[]>
-}):MobxPromise<(T & {qValue:number})[]> {
+export function makeEnrichmentDataPromise<
+    T extends {
+        cytoband?: string;
+        hugoGeneSymbol: string;
+        pValue: number;
+        qValue?: number;
+    }
+>(params: {
+    store?: ResultsViewPageStore;
+    await: MobxPromise_await;
+    referenceGenesPromise: MobxPromise<{
+        [hugoGeneSymbol: string]: ReferenceGenomeGene;
+    }>;
+    getSelectedProfileMap: () => { [studyId: string]: MolecularProfile };
+    fetchData: () => Promise<T[]>;
+}): MobxPromise<(T & { qValue: number })[]> {
     return remoteData({
-        await: ()=>{
+        await: () => {
             const ret = params.await();
             if (params.store) {
                 ret.push(params.store.selectedMolecularProfiles);
@@ -547,71 +753,99 @@ export function makeEnrichmentDataPromise<T extends {cytoband?:string, hugoGeneS
             ret.push(params.referenceGenesPromise);
             return ret;
         },
-        invoke:async()=>{
+        invoke: async () => {
             const profileMap = params.getSelectedProfileMap();
             if (profileMap) {
                 let data = await params.fetchData();
                 // filter out query genes, if looking at a queried profile
                 // its important that we filter out *before* calculating Q values
-                if (params.store && params.store.selectedMolecularProfiles.result!
-                    .findIndex(molecularProfile => profileMap[molecularProfile.studyId] !== undefined) > -1) {
-                    const queryGenes = _.keyBy(params.store.hugoGeneSymbols, x=>x.toUpperCase());
-                    data = data.filter(d=>!(d.hugoGeneSymbol.toUpperCase() in queryGenes));
+                if (
+                    params.store &&
+                    params.store.selectedMolecularProfiles.result!.findIndex(
+                        molecularProfile =>
+                            profileMap[molecularProfile.studyId] !== undefined
+                    ) > -1
+                ) {
+                    const queryGenes = _.keyBy(
+                        params.store.hugoGeneSymbols,
+                        x => x.toUpperCase()
+                    );
+                    data = data.filter(
+                        d => !(d.hugoGeneSymbol.toUpperCase() in queryGenes)
+                    );
                 }
 
-                let referenceGenes = params.referenceGenesPromise.result!
+                let referenceGenes = params.referenceGenesPromise.result!;
                 // add cytoband from reference gene
                 for (const d of data) {
                     const refGene = referenceGenes[d.hugoGeneSymbol];
 
-                    if (refGene)
-                        d.cytoband = refGene.cytoband;
+                    if (refGene) d.cytoband = refGene.cytoband;
                 }
 
                 const dataWithpValue: T[] = [];
                 const dataWithoutpValue: T[] = [];
                 data.forEach(datum => {
-                    datum.pValue === undefined ? dataWithoutpValue.push(datum) : dataWithpValue.push(datum);
+                    datum.pValue === undefined
+                        ? dataWithoutpValue.push(datum)
+                        : dataWithpValue.push(datum);
                 });
 
                 const sortedByPValue = _.sortBy(dataWithpValue, c => c.pValue);
-                const qValues = calculateQValues(sortedByPValue.map(c => c.pValue));
+                const qValues = calculateQValues(
+                    sortedByPValue.map(c => c.pValue)
+                );
 
                 qValues.forEach((qValue, index) => {
                     sortedByPValue[index].qValue = qValue;
                 });
 
-                return sortEnrichmentData([...sortedByPValue, ...dataWithoutpValue]);
+                return sortEnrichmentData([
+                    ...sortedByPValue,
+                    ...dataWithoutpValue,
+                ]);
             } else {
                 return [];
             }
-        }
+        },
     });
 }
 
-
 function sortEnrichmentData(data: any[]): any[] {
-    return _.sortBy(data, ["pValue", "hugoGeneSymbol"]);
+    return _.sortBy(data, ['pValue', 'hugoGeneSymbol']);
 }
 
-export function fetchPatients(samples:Sample[]) {
-    let patientKeyToPatientIdentifier:{[uniquePatientKey:string]:PatientIdentifier} = {};
+export function fetchPatients(samples: Sample[]) {
+    let patientKeyToPatientIdentifier: {
+        [uniquePatientKey: string]: PatientIdentifier;
+    } = {};
     for (const sample of samples) {
         patientKeyToPatientIdentifier[sample.uniquePatientKey] = {
             patientId: sample.patientId,
-            studyId: sample.studyId
+            studyId: sample.studyId,
         };
     }
     const patientFilter = {
-        uniquePatientKeys: _.uniq(samples.map((sample:Sample)=>sample.uniquePatientKey))
+        uniquePatientKeys: _.uniq(
+            samples.map((sample: Sample) => sample.uniquePatientKey)
+        ),
     } as PatientFilter;
 
     return client.fetchPatientsUsingPOST({
-        patientFilter
+        patientFilter,
     });
 }
 
-export function excludeMutationAndSVProfiles(molecularprofiles: MolecularProfile[]): MolecularProfile[] {
-    const mutationAlterationTypes = [AlterationTypeConstants.MUTATION_EXTENDED, AlterationTypeConstants.FUSION, AlterationTypeConstants.STRUCTURAL_VARIANT];
-    return molecularprofiles.filter(profile => !mutationAlterationTypes.includes(profile.molecularAlterationType));
-}
\ No newline at end of file
+export function excludeMutationAndSVProfiles(
+    molecularprofiles: MolecularProfile[]
+): MolecularProfile[] {
+    const mutationAlterationTypes = [
+        AlterationTypeConstants.MUTATION_EXTENDED,
+        AlterationTypeConstants.FUSION,
+        AlterationTypeConstants.STRUCTURAL_VARIANT,
+    ];
+    return molecularprofiles.filter(
+        profile =>
+            !mutationAlterationTypes.includes(profile.molecularAlterationType)
+    );
+}
diff --git a/src/pages/resultsView/ResultsViewTableUtils.spec.ts b/src/pages/resultsView/ResultsViewTableUtils.spec.ts
index f7df8cbc0cf..627e6f27242 100644
--- a/src/pages/resultsView/ResultsViewTableUtils.spec.ts
+++ b/src/pages/resultsView/ResultsViewTableUtils.spec.ts
@@ -1,60 +1,79 @@
-import {assert} from "chai";
-import {cytobandFilter} from "./ResultsViewTableUtils";
+import { assert } from 'chai';
+import { cytobandFilter } from './ResultsViewTableUtils';
 
-describe("CoExpressionTableUtils", ()=>{
-    describe("cytobandFilter", ()=>{
-        it("returns false if no cytoband", ()=>{
-            assert.isFalse(cytobandFilter({ cytoband: null } as any, "asdfa"));
-        });
-        it("returns false if no match", ()=>{
-            assert.isFalse(cytobandFilter({ cytoband: "hello" } as any, "hi"))
-        });
-        it("returns false if match in middle", ()=>{
-            assert.isFalse(cytobandFilter({ cytoband: "hello" } as any, "ell"));
-        });
-        it("returns true if match at beginning", ()=>{
-            assert.isTrue(cytobandFilter({ cytoband: "hello" } as any, "h"));
-            assert.isTrue(cytobandFilter({ cytoband: "hello" } as any, "he"));
-            assert.isTrue(cytobandFilter({ cytoband: "hello" } as any, "hel"));
-            assert.isTrue(cytobandFilter({ cytoband: "hello" } as any, "hell"));
-            assert.isTrue(cytobandFilter({ cytoband: "hello" } as any, "hello"));
-        });
-        it("returns false if no match for complete query", ()=>{
-            assert.isFalse(cytobandFilter({ cytoband: "hello" } as any, "hellothere"));
-        });
-        it("returns true on empty input", ()=>{
-            assert.isTrue(cytobandFilter({ cytoband: "hello" } as any, ""));
-        });
-        it("returns true if minus sign at beginning and nothing following", ()=>{
-            assert.isTrue(cytobandFilter({ cytoband: "hello" } as any, "-"));
-        });
-        it("returns false if match but minus sign at beginning of filter string", ()=>{
-            assert.isFalse(cytobandFilter({ cytoband: "hello" } as any, "-he"));
-            assert.isFalse(cytobandFilter({ cytoband: "17p" } as any, "-17p"));
-        });
-        it("returns true if no match but minus sign at beginning", ()=>{
-            assert.isTrue(cytobandFilter({ cytoband: "17p" } as any, "-3p"));
-        });
-        it("returns true if match in middle but minus sign at beginning", ()=>{
-            assert.isTrue(cytobandFilter({ cytoband: "17p" } as any, "-7p"));
-        });
-        it("returns true if matches at least one query, all positive", ()=>{
-            assert.isTrue(cytobandFilter({ cytoband: "17p" } as any, "17p 5p 3p"));
-        });
-        it("returns true if no match every query, all negative", ()=>{
-            assert.isTrue(cytobandFilter({ cytoband: "17p" } as any, "-5 -3 -7p -1p"));
-        });
-        it("returns true if passes at least one positive query and every negative query", ()=>{
-            assert.isTrue(cytobandFilter({ cytoband: "17p" } as any, "-5 -3 17p -7p -1p 3p"));
-        });
-        it("returns false if it doesnt match any query, all positive", ()=>{
-            assert.isFalse(cytobandFilter({ cytoband: "17p" } as any, "1p 1q 5p"));
-        });
-        it("returns false if it matches at least one query, all negative", ()=>{
-            assert.isFalse(cytobandFilter({ cytoband: "17p" } as any, "-5 -3 -17p -1p"));
-        });
-        it("returns false if fails every query, mix of positive and negative", ()=>{
-            assert.isFalse(cytobandFilter({ cytoband: "17p" } as any, "-17p 3q -1"));
+describe('CoExpressionTableUtils', () => {
+    describe('cytobandFilter', () => {
+        it('returns false if no cytoband', () => {
+            assert.isFalse(cytobandFilter({ cytoband: null } as any, 'asdfa'));
+        });
+        it('returns false if no match', () => {
+            assert.isFalse(cytobandFilter({ cytoband: 'hello' } as any, 'hi'));
+        });
+        it('returns false if match in middle', () => {
+            assert.isFalse(cytobandFilter({ cytoband: 'hello' } as any, 'ell'));
+        });
+        it('returns true if match at beginning', () => {
+            assert.isTrue(cytobandFilter({ cytoband: 'hello' } as any, 'h'));
+            assert.isTrue(cytobandFilter({ cytoband: 'hello' } as any, 'he'));
+            assert.isTrue(cytobandFilter({ cytoband: 'hello' } as any, 'hel'));
+            assert.isTrue(cytobandFilter({ cytoband: 'hello' } as any, 'hell'));
+            assert.isTrue(
+                cytobandFilter({ cytoband: 'hello' } as any, 'hello')
+            );
+        });
+        it('returns false if no match for complete query', () => {
+            assert.isFalse(
+                cytobandFilter({ cytoband: 'hello' } as any, 'hellothere')
+            );
+        });
+        it('returns true on empty input', () => {
+            assert.isTrue(cytobandFilter({ cytoband: 'hello' } as any, ''));
+        });
+        it('returns true if minus sign at beginning and nothing following', () => {
+            assert.isTrue(cytobandFilter({ cytoband: 'hello' } as any, '-'));
+        });
+        it('returns false if match but minus sign at beginning of filter string', () => {
+            assert.isFalse(cytobandFilter({ cytoband: 'hello' } as any, '-he'));
+            assert.isFalse(cytobandFilter({ cytoband: '17p' } as any, '-17p'));
+        });
+        it('returns true if no match but minus sign at beginning', () => {
+            assert.isTrue(cytobandFilter({ cytoband: '17p' } as any, '-3p'));
+        });
+        it('returns true if match in middle but minus sign at beginning', () => {
+            assert.isTrue(cytobandFilter({ cytoband: '17p' } as any, '-7p'));
+        });
+        it('returns true if matches at least one query, all positive', () => {
+            assert.isTrue(
+                cytobandFilter({ cytoband: '17p' } as any, '17p 5p 3p')
+            );
+        });
+        it('returns true if no match every query, all negative', () => {
+            assert.isTrue(
+                cytobandFilter({ cytoband: '17p' } as any, '-5 -3 -7p -1p')
+            );
+        });
+        it('returns true if passes at least one positive query and every negative query', () => {
+            assert.isTrue(
+                cytobandFilter(
+                    { cytoband: '17p' } as any,
+                    '-5 -3 17p -7p -1p 3p'
+                )
+            );
+        });
+        it('returns false if it doesnt match any query, all positive', () => {
+            assert.isFalse(
+                cytobandFilter({ cytoband: '17p' } as any, '1p 1q 5p')
+            );
+        });
+        it('returns false if it matches at least one query, all negative', () => {
+            assert.isFalse(
+                cytobandFilter({ cytoband: '17p' } as any, '-5 -3 -17p -1p')
+            );
+        });
+        it('returns false if fails every query, mix of positive and negative', () => {
+            assert.isFalse(
+                cytobandFilter({ cytoband: '17p' } as any, '-17p 3q -1')
+            );
         });
     });
 });
diff --git a/src/pages/resultsView/ResultsViewTableUtils.ts b/src/pages/resultsView/ResultsViewTableUtils.ts
index 65b95d06d28..f3b86ec5950 100644
--- a/src/pages/resultsView/ResultsViewTableUtils.ts
+++ b/src/pages/resultsView/ResultsViewTableUtils.ts
@@ -1,13 +1,13 @@
-import {logicalAnd} from "../../shared/lib/LogicUtils";
-import _ from "lodash";
+import { logicalAnd } from '../../shared/lib/LogicUtils';
+import _ from 'lodash';
 
-function cytobandFilterSingle(d: { cytoband: string }, filterString:string) {
+function cytobandFilterSingle(d: { cytoband: string }, filterString: string) {
     if (!filterString.length) {
         return true;
     } else {
         let match = false;
         let reject = false;
-        if (filterString[0] === "-") {
+        if (filterString[0] === '-') {
             filterString = filterString.substring(1);
             reject = true;
         }
@@ -19,7 +19,7 @@ function cytobandFilterSingle(d: { cytoband: string }, filterString:string) {
     }
 }
 
-export function cytobandFilter(d: { cytoband: string }, filterString:string) {
+export function cytobandFilter(d: { cytoband: string }, filterString: string) {
     filterString = filterString.trim();
     if (!filterString.length) {
         return true;
@@ -28,14 +28,18 @@ export function cytobandFilter(d: { cytoband: string }, filterString:string) {
         const positiveQueries = [];
         const negativeQueries = [];
         for (const q of queryElts) {
-            if (q[0] === "-") {
+            if (q[0] === '-') {
                 negativeQueries.push(q);
             } else {
                 positiveQueries.push(q);
             }
         }
-        const positiveResult = positiveQueries.length ? _.some(positiveQueries, q=>cytobandFilterSingle(d, q)) : true;
-        const negativeResult = negativeQueries.length ? logicalAnd(negativeQueries.map(q=>cytobandFilterSingle(d, q))) : true;
+        const positiveResult = positiveQueries.length
+            ? _.some(positiveQueries, q => cytobandFilterSingle(d, q))
+            : true;
+        const negativeResult = negativeQueries.length
+            ? logicalAnd(negativeQueries.map(q => cytobandFilterSingle(d, q)))
+            : true;
         return positiveResult && negativeResult;
     }
 }
diff --git a/src/pages/resultsView/ResultsViewURLWrapper.ts b/src/pages/resultsView/ResultsViewURLWrapper.ts
index 10c8d8863ac..10466adaef7 100644
--- a/src/pages/resultsView/ResultsViewURLWrapper.ts
+++ b/src/pages/resultsView/ResultsViewURLWrapper.ts
@@ -1,93 +1,116 @@
-import URLWrapper, {BooleanString, NumberString} from "../../shared/lib/URLWrapper";
-import ExtendedRouterStore from "../../shared/lib/ExtendedRouterStore";
-import {computed} from "mobx";
-import autobind from "autobind-decorator";
-import {ResultsViewTab} from "pages/resultsView/ResultsViewPageHelpers";
-import AppConfig from "appConfig";
+import URLWrapper, {
+    BooleanString,
+    NumberString,
+} from '../../shared/lib/URLWrapper';
+import ExtendedRouterStore from '../../shared/lib/ExtendedRouterStore';
+import { computed } from 'mobx';
+import autobind from 'autobind-decorator';
+import { ResultsViewTab } from 'pages/resultsView/ResultsViewPageHelpers';
+import AppConfig from 'appConfig';
 
 export enum ResultsViewURLQueryEnum {
-    clinicallist = "clinicallist",
-    gene_list = "gene_list",
-    cancer_study_list = "cancer_study_list",
-    case_ids = "case_ids",
-    sample_list_ids = "sample_list_ids",
-    case_set_id = "case_set_id",
-    profileFilter =  "profileFilter",
-    RPPA_SCORE_THRESHOLD = "RPPA_SCORE_THRESHOLD",
-    Z_SCORE_THRESHOLD = "Z_SCORE_THRESHOLD",
-    geneset_list = "geneset_list",
-    treatment_list = "treatment_list",
-    show_samples = "show_samples",
-    heatmap_track_groups = "heatmap_track_groups",
-    oncoprint_sortby = "oncoprint_sortby",
-    oncoprint_cluster_profile = "oncoprint_cluster_profile",
-    oncoprint_sort_by_mutation_type = "oncoprint_sort_by_mutation_type",
-    oncoprint_sort_by_drivers = "oncoprint_sort_by_drivers",
-    exclude_germline_mutations = "exclude_germline_mutations",
-    patient_enrichments = "patient_enrichments",
+    clinicallist = 'clinicallist',
+    gene_list = 'gene_list',
+    cancer_study_list = 'cancer_study_list',
+    case_ids = 'case_ids',
+    sample_list_ids = 'sample_list_ids',
+    case_set_id = 'case_set_id',
+    profileFilter = 'profileFilter',
+    RPPA_SCORE_THRESHOLD = 'RPPA_SCORE_THRESHOLD',
+    Z_SCORE_THRESHOLD = 'Z_SCORE_THRESHOLD',
+    geneset_list = 'geneset_list',
+    treatment_list = 'treatment_list',
+    show_samples = 'show_samples',
+    heatmap_track_groups = 'heatmap_track_groups',
+    oncoprint_sortby = 'oncoprint_sortby',
+    oncoprint_cluster_profile = 'oncoprint_cluster_profile',
+    oncoprint_sort_by_mutation_type = 'oncoprint_sort_by_mutation_type',
+    oncoprint_sort_by_drivers = 'oncoprint_sort_by_drivers',
+    exclude_germline_mutations = 'exclude_germline_mutations',
+    patient_enrichments = 'patient_enrichments',
 
-    genetic_profile_ids_PROFILE_MUTATION_EXTENDED = "genetic_profile_ids_PROFILE_MUTATION_EXTENDED",
-    genetic_profile_ids_PROFILE_COPY_NUMBER_ALTERATION = "genetic_profile_ids_PROFILE_COPY_NUMBER_ALTERATION",
-    genetic_profile_ids_PROFILE_MRNA_EXPRESSION = "genetic_profile_ids_PROFILE_MRNA_EXPRESSION",
-    genetic_profile_ids_PROFILE_PROTEIN_EXPRESSION = "genetic_profile_ids_PROFILE_PROTEIN_EXPRESSION",
-    genetic_profile_ids_PROFILE_GENESET_SCORE = "genetic_profile_ids_PROFILE_GENESET_SCORE",
-    genetic_profile_ids_GENERIC_ASSAY = "genetic_profile_ids_GENERIC_ASSAY",
-    genetic_profile_ids = "genetic_profile_ids"
+    genetic_profile_ids_PROFILE_MUTATION_EXTENDED = 'genetic_profile_ids_PROFILE_MUTATION_EXTENDED',
+    genetic_profile_ids_PROFILE_COPY_NUMBER_ALTERATION = 'genetic_profile_ids_PROFILE_COPY_NUMBER_ALTERATION',
+    genetic_profile_ids_PROFILE_MRNA_EXPRESSION = 'genetic_profile_ids_PROFILE_MRNA_EXPRESSION',
+    genetic_profile_ids_PROFILE_PROTEIN_EXPRESSION = 'genetic_profile_ids_PROFILE_PROTEIN_EXPRESSION',
+    genetic_profile_ids_PROFILE_GENESET_SCORE = 'genetic_profile_ids_PROFILE_GENESET_SCORE',
+    genetic_profile_ids_GENERIC_ASSAY = 'genetic_profile_ids_GENERIC_ASSAY',
+    genetic_profile_ids = 'genetic_profile_ids',
+}
 
+export type ResultsViewURLQuery = {
+    [key in keyof typeof ResultsViewURLQueryEnum]: string;
 };
 
-export type ResultsViewURLQuery = { [key in keyof typeof ResultsViewURLQueryEnum] : string }
-
-
-export default class ResultsViewURLWrapper extends URLWrapper<ResultsViewURLQuery> {
-    constructor(routing:ExtendedRouterStore) {
-        super(routing, {
+export default class ResultsViewURLWrapper extends URLWrapper<
+    ResultsViewURLQuery
+> {
+    constructor(routing: ExtendedRouterStore) {
+        super(
+            routing,
+            {
                 // NON session props here
                 // oncoprint props
-                clinicallist: { isSessionProp:false },
-                show_samples: { isSessionProp:false },
-                heatmap_track_groups: { isSessionProp:false },
-                oncoprint_sortby: { isSessionProp:false },
-                oncoprint_cluster_profile: { isSessionProp:false},
-                oncoprint_sort_by_mutation_type: { isSessionProp:false },
-                oncoprint_sort_by_drivers: { isSessionProp:false},
-                treatment_list: { isSessionProp:false },
-                exclude_germline_mutations: { isSessionProp:false },
-                patient_enrichments: { isSessionProp:false },
-
-
+                clinicallist: { isSessionProp: false },
+                show_samples: { isSessionProp: false },
+                heatmap_track_groups: { isSessionProp: false },
+                oncoprint_sortby: { isSessionProp: false },
+                oncoprint_cluster_profile: { isSessionProp: false },
+                oncoprint_sort_by_mutation_type: { isSessionProp: false },
+                oncoprint_sort_by_drivers: { isSessionProp: false },
+                treatment_list: { isSessionProp: false },
+                exclude_germline_mutations: { isSessionProp: false },
+                patient_enrichments: { isSessionProp: false },
 
                 // session props here
-                gene_list: { isSessionProp:true },
-                cancer_study_list: { isSessionProp:true, aliases:["cancer_study_id"] },
-                case_ids: { isSessionProp:true },
-                sample_list_ids: { isSessionProp:true },
-                case_set_id: { isSessionProp:true },
-                profileFilter: { isSessionProp:true, aliases:["data_priority"] },
-                RPPA_SCORE_THRESHOLD: { isSessionProp:true },
-                Z_SCORE_THRESHOLD: { isSessionProp:true },
-                geneset_list: { isSessionProp:true },
-                genetic_profile_ids_PROFILE_MUTATION_EXTENDED: { isSessionProp:true },
-                genetic_profile_ids_PROFILE_COPY_NUMBER_ALTERATION: { isSessionProp:true },
-                genetic_profile_ids_PROFILE_MRNA_EXPRESSION: { isSessionProp:true },
-                genetic_profile_ids_PROFILE_PROTEIN_EXPRESSION: { isSessionProp:true },
-                genetic_profile_ids_PROFILE_GENESET_SCORE: { isSessionProp:true },
-                genetic_profile_ids_GENERIC_ASSAY: { isSessionProp:true },
-                genetic_profile_ids: { isSessionProp:true },
+                gene_list: { isSessionProp: true },
+                cancer_study_list: {
+                    isSessionProp: true,
+                    aliases: ['cancer_study_id'],
+                },
+                case_ids: { isSessionProp: true },
+                sample_list_ids: { isSessionProp: true },
+                case_set_id: { isSessionProp: true },
+                profileFilter: {
+                    isSessionProp: true,
+                    aliases: ['data_priority'],
+                },
+                RPPA_SCORE_THRESHOLD: { isSessionProp: true },
+                Z_SCORE_THRESHOLD: { isSessionProp: true },
+                geneset_list: { isSessionProp: true },
+                genetic_profile_ids_PROFILE_MUTATION_EXTENDED: {
+                    isSessionProp: true,
+                },
+                genetic_profile_ids_PROFILE_COPY_NUMBER_ALTERATION: {
+                    isSessionProp: true,
+                },
+                genetic_profile_ids_PROFILE_MRNA_EXPRESSION: {
+                    isSessionProp: true,
+                },
+                genetic_profile_ids_PROFILE_PROTEIN_EXPRESSION: {
+                    isSessionProp: true,
+                },
+                genetic_profile_ids_PROFILE_GENESET_SCORE: {
+                    isSessionProp: true,
+                },
+                genetic_profile_ids_GENERIC_ASSAY: { isSessionProp: true },
+                genetic_profile_ids: { isSessionProp: true },
             },
-              true,
-              AppConfig.serverConfig.session_url_length_threshold ? parseInt(AppConfig.serverConfig.session_url_length_threshold) : undefined
+            true,
+            AppConfig.serverConfig.session_url_length_threshold
+                ? parseInt(AppConfig.serverConfig.session_url_length_threshold)
+                : undefined
         );
     }
 
-    pathContext = "/results";
+    pathContext = '/results';
 
     @computed public get tabId() {
-        return this.pathName.split("/").pop();
+        return this.pathName.split('/').pop();
     }
 
     @autobind
-    public setTabId(tabId:ResultsViewTab, replace?:boolean) {
+    public setTabId(tabId: ResultsViewTab, replace?: boolean) {
         this.updateURL({}, `comparison/${tabId}`, false, replace);
     }
 }
diff --git a/src/pages/resultsView/SurvivalStoreHelper.spec.ts b/src/pages/resultsView/SurvivalStoreHelper.spec.ts
index 080a23b3c0f..baa047a6cb4 100644
--- a/src/pages/resultsView/SurvivalStoreHelper.spec.ts
+++ b/src/pages/resultsView/SurvivalStoreHelper.spec.ts
@@ -1,102 +1,119 @@
 import { assert } from 'chai';
-import { getPatientSurvivals } from "./SurvivalStoreHelper";
-import { Patient } from "shared/api/generated/CBioPortalAPI";
+import { getPatientSurvivals } from './SurvivalStoreHelper';
+import { Patient } from 'shared/api/generated/CBioPortalAPI';
 
 const exampleClinicalData = {
-    "1": [
+    '1': [
         {
-            "clinicalAttributeId": "OS_MONTHS",
-            "value": "0",
-            "patientId":"patient_1",
-            "studyId":"study_1",
-            "uniquePatientKey": "1"
+            clinicalAttributeId: 'OS_MONTHS',
+            value: '0',
+            patientId: 'patient_1',
+            studyId: 'study_1',
+            uniquePatientKey: '1',
         },
         {
-            "clinicalAttributeId": "OS_STATUS",
-            "value": "DECEASED",
-            "patientId":"patient_1",
-            "studyId":"study_1",
-            "uniquePatientKey": "1"
-        }
+            clinicalAttributeId: 'OS_STATUS',
+            value: 'DECEASED',
+            patientId: 'patient_1',
+            studyId: 'study_1',
+            uniquePatientKey: '1',
+        },
     ],
-    "2": [
+    '2': [
         {
-            "clinicalAttributeId": "OS_STATUS",
-            "value": "LIVING",
-            "patientId":"patient_2",
-            "studyId":"study_1",
-            "uniquePatientKey": "2"
-        }
+            clinicalAttributeId: 'OS_STATUS',
+            value: 'LIVING',
+            patientId: 'patient_2',
+            studyId: 'study_1',
+            uniquePatientKey: '2',
+        },
     ],
-    "3": [
+    '3': [
         {
-            "clinicalAttributeId": "OS_MONTHS",
-            "value": "5.23",
-            "patientId":"patient_3",
-            "studyId":"study_1",
-            "uniquePatientKey": "3"
+            clinicalAttributeId: 'OS_MONTHS',
+            value: '5.23',
+            patientId: 'patient_3',
+            studyId: 'study_1',
+            uniquePatientKey: '3',
         },
         {
-            "clinicalAttributeId": "OS_STATUS",
-            "value": "NA",
-            "patientId":"patient_3",
-            "studyId":"study_1",
-            "uniquePatientKey": "3"
-        }
+            clinicalAttributeId: 'OS_STATUS',
+            value: 'NA',
+            patientId: 'patient_3',
+            studyId: 'study_1',
+            uniquePatientKey: '3',
+        },
     ],
-    "4": [
+    '4': [
         {
-            "clinicalAttributeId": "OS_MONTHS",
-            "value": "0.2",
-            "patientId":"patient_4",
-            "studyId":"study_1",
-            "uniquePatientKey": "4"
+            clinicalAttributeId: 'OS_MONTHS',
+            value: '0.2',
+            patientId: 'patient_4',
+            studyId: 'study_1',
+            uniquePatientKey: '4',
         },
         {
-            "clinicalAttributeId": "OS_STATUS",
-            "value": "LIVING",
-            "patientId":"patient_4",
-            "studyId":"study_1",
-            "uniquePatientKey": "4"
-        }
+            clinicalAttributeId: 'OS_STATUS',
+            value: 'LIVING',
+            patientId: 'patient_4',
+            studyId: 'study_1',
+            uniquePatientKey: '4',
+        },
     ],
-    "5": [
+    '5': [
         {
-            "clinicalAttributeId": "OS_MONTHS",
-            "value": "#VALUE!",
-            "patientId":"patient_5",
-            "studyId":"study_1",
-            "uniquePatientKey": "5"
+            clinicalAttributeId: 'OS_MONTHS',
+            value: '#VALUE!',
+            patientId: 'patient_5',
+            studyId: 'study_1',
+            uniquePatientKey: '5',
         },
         {
-            "clinicalAttributeId": "OS_STATUS",
-            "value": "LIVING",
-            "patientId":"patient_5",
-            "studyId":"study_1",
-            "uniquePatientKey": "5"
-        }
-    ]
+            clinicalAttributeId: 'OS_STATUS',
+            value: 'LIVING',
+            patientId: 'patient_5',
+            studyId: 'study_1',
+            uniquePatientKey: '5',
+        },
+    ],
 };
 
-const exampleTargetKeys = ["1", "2", "3", "5"];
+const exampleTargetKeys = ['1', '2', '3', '5'];
 
-describe("SurvivalStoreHelper", () => {
-    describe("#getPatientSurvivals()", () => {
-        it("returns empty list for empty clinical data", () => {
-            assert.deepEqual(getPatientSurvivals({}, [], "OS_STATUS", "OS_MONTHS", s => s === 'DECEASED'), []);
+describe('SurvivalStoreHelper', () => {
+    describe('#getPatientSurvivals()', () => {
+        it('returns empty list for empty clinical data', () => {
+            assert.deepEqual(
+                getPatientSurvivals(
+                    {},
+                    [],
+                    'OS_STATUS',
+                    'OS_MONTHS',
+                    s => s === 'DECEASED'
+                ),
+                []
+            );
         });
 
-        it("returns correct result for example data", () => {
-            assert.deepEqual(getPatientSurvivals(exampleClinicalData, exampleTargetKeys,
-                 "OS_STATUS", "OS_MONTHS", s => s === 'DECEASED'), [
+        it('returns correct result for example data', () => {
+            assert.deepEqual(
+                getPatientSurvivals(
+                    exampleClinicalData,
+                    exampleTargetKeys,
+                    'OS_STATUS',
+                    'OS_MONTHS',
+                    s => s === 'DECEASED'
+                ),
+                [
                     {
-                        patientId: "patient_1",
-                        uniquePatientKey: "1",
-                        studyId: "study_1",
+                        patientId: 'patient_1',
+                        uniquePatientKey: '1',
+                        studyId: 'study_1',
                         months: 0,
-                        status: true
-                    }
-                ]);
+                        status: true,
+                    },
+                ]
+            );
         });
     });
 });
diff --git a/src/pages/resultsView/SurvivalStoreHelper.ts b/src/pages/resultsView/SurvivalStoreHelper.ts
index cc512791599..afdde45d990 100644
--- a/src/pages/resultsView/SurvivalStoreHelper.ts
+++ b/src/pages/resultsView/SurvivalStoreHelper.ts
@@ -1,29 +1,51 @@
-import { Patient, ClinicalData } from "shared/api/generated/CBioPortalAPI";
-import { PatientSurvival } from "../../shared/model/PatientSurvival";
-
-export function getPatientSurvivals(survivalClinicalDataGroupByUniquePatientKey: any,
-    targetUniquePatientKeys: string[], statusAttributeId: string, monthsAttributeId: string,
-    statusFilter: (s: string) => boolean): PatientSurvival[] {
+import { Patient, ClinicalData } from 'shared/api/generated/CBioPortalAPI';
+import { PatientSurvival } from '../../shared/model/PatientSurvival';
 
+export function getPatientSurvivals(
+    survivalClinicalDataGroupByUniquePatientKey: any,
+    targetUniquePatientKeys: string[],
+    statusAttributeId: string,
+    monthsAttributeId: string,
+    statusFilter: (s: string) => boolean
+): PatientSurvival[] {
     if (targetUniquePatientKeys) {
-        return targetUniquePatientKeys.reduce((patientSurvivals: PatientSurvival[], uniquePatientKey: string) => {
-            const clinicalData: ClinicalData[] = survivalClinicalDataGroupByUniquePatientKey[uniquePatientKey];
-            if (clinicalData) {
-                const statusClinicalData: ClinicalData | undefined = clinicalData.find(c => c.clinicalAttributeId === statusAttributeId);
-                const monthsClinicalData: ClinicalData | undefined = clinicalData.find(c => c.clinicalAttributeId === monthsAttributeId);
-                if (statusClinicalData && monthsClinicalData && statusClinicalData.value != 'NA' &&
-                    monthsClinicalData.value != 'NA' && !Number.isNaN(Number(monthsClinicalData.value))) {
-                    patientSurvivals.push({
-                        uniquePatientKey,
-                        patientId: clinicalData[0].patientId,
-                        studyId: clinicalData[0].studyId,
-                        status: statusFilter(statusClinicalData.value),
-                        months: parseFloat(monthsClinicalData.value)
-                    });
+        return targetUniquePatientKeys.reduce(
+            (patientSurvivals: PatientSurvival[], uniquePatientKey: string) => {
+                const clinicalData: ClinicalData[] =
+                    survivalClinicalDataGroupByUniquePatientKey[
+                        uniquePatientKey
+                    ];
+                if (clinicalData) {
+                    const statusClinicalData:
+                        | ClinicalData
+                        | undefined = clinicalData.find(
+                        c => c.clinicalAttributeId === statusAttributeId
+                    );
+                    const monthsClinicalData:
+                        | ClinicalData
+                        | undefined = clinicalData.find(
+                        c => c.clinicalAttributeId === monthsAttributeId
+                    );
+                    if (
+                        statusClinicalData &&
+                        monthsClinicalData &&
+                        statusClinicalData.value != 'NA' &&
+                        monthsClinicalData.value != 'NA' &&
+                        !Number.isNaN(Number(monthsClinicalData.value))
+                    ) {
+                        patientSurvivals.push({
+                            uniquePatientKey,
+                            patientId: clinicalData[0].patientId,
+                            studyId: clinicalData[0].studyId,
+                            status: statusFilter(statusClinicalData.value),
+                            months: parseFloat(monthsClinicalData.value),
+                        });
+                    }
                 }
-            }
-            return patientSurvivals;
-        }, []);
+                return patientSurvivals;
+            },
+            []
+        );
     } else {
         return [];
     }
diff --git a/src/pages/resultsView/bookmark/BookmarkModal.tsx b/src/pages/resultsView/bookmark/BookmarkModal.tsx
index 19f79a9a725..4a20fd09eca 100644
--- a/src/pages/resultsView/bookmark/BookmarkModal.tsx
+++ b/src/pages/resultsView/bookmark/BookmarkModal.tsx
@@ -1,91 +1,114 @@
-import * as React from "react";
+import * as React from 'react';
 import * as _ from 'lodash';
-import {observer} from "mobx-react";
-import {Modal} from 'react-bootstrap';
-import {observable} from "mobx";
-import {ShareUrls} from "../querySummary/ShareUI";
-import classNames from "classnames";
-import autobind from "autobind-decorator";
-import LoadingIndicator from "shared/components/loadingIndicator/LoadingIndicator";
+import { observer } from 'mobx-react';
+import { Modal } from 'react-bootstrap';
+import { observable } from 'mobx';
+import { ShareUrls } from '../querySummary/ShareUI';
+import classNames from 'classnames';
+import autobind from 'autobind-decorator';
+import LoadingIndicator from 'shared/components/loadingIndicator/LoadingIndicator';
 var Clipboard = require('clipboard');
 
-
 @observer
-export class BookmarkModal extends React.Component<{ onHide: () => void, urlPromise:Promise<any> }, {}> {
-
+export class BookmarkModal extends React.Component<
+    { onHide: () => void; urlPromise: Promise<any> },
+    {}
+> {
     @observable
-    urlData:ShareUrls;
+    urlData: ShareUrls;
 
-    clipboards:any[] = [];
+    clipboards: any[] = [];
 
-    componentDidMount(){
+    componentDidMount() {
         // this is an $.ajax promise, not a real promise
         this.props.urlPromise.then(
-            (data)=>{
+            data => {
                 this.urlData = data;
-                setTimeout(()=>{
+                setTimeout(() => {
                     this.initializeClipboards();
-                },0);
+                }, 0);
             },
-            ()=>{
-
-            }
+            () => {}
         );
     }
 
     @autobind
-    showThumb(e:any){
-        e.target.className="fa fa-thumbs-up";
+    showThumb(e: any) {
+        e.target.className = 'fa fa-thumbs-up';
     }
 
     @autobind
-    initializeClipboards(){
-            this.clipboards.push(new Clipboard(this.sessionButton, {
+    initializeClipboards() {
+        this.clipboards.push(
+            new Clipboard(this.sessionButton, {
                 text: function() {
                     return this.urlData.fullUrl;
                 }.bind(this),
-                container: this.container
-            }));
+                container: this.container,
+            })
+        );
 
-            if (this.urlData && this.urlData.bitlyUrl) {
-                this.clipboards.push(new Clipboard(this.bitlyButton, {
-                    text: function () {
+        if (this.urlData && this.urlData.bitlyUrl) {
+            this.clipboards.push(
+                new Clipboard(this.bitlyButton, {
+                    text: function() {
                         return this.urlData.bitlyUrl;
                     }.bind(this),
-                    container: this.container
-                }));
-            }
-
+                    container: this.container,
+                })
+            );
+        }
     }
 
-    componentWillUnmount(){
+    componentWillUnmount() {
         // we need to clean up clipboards
-        this.clipboards.forEach((clipboard:any)=>clipboard.destroy());
+        this.clipboards.forEach((clipboard: any) => clipboard.destroy());
     }
 
-    public sessionButton:HTMLAnchorElement;
+    public sessionButton: HTMLAnchorElement;
 
-    public bitlyButton:HTMLAnchorElement;
+    public bitlyButton: HTMLAnchorElement;
 
-    public container:HTMLDivElement;
+    public container: HTMLDivElement;
 
     render() {
-
         //NOTE: internal div id necessary for
-        return <Modal show={true} onHide={this.props.onHide}>
-            <Modal.Header closeButton>
-                <Modal.Title>Bookmark Query</Modal.Title>
-            </Modal.Header>
-            <Modal.Body style={{minHeight:70}}>
-                <LoadingIndicator size={"big"} center={true} style={{top:32}} isLoading={!this.urlData}/>
-                    <div className={classNames({hidden:!this.urlData})} ref={(el:HTMLDivElement)=>this.container=el}>
+        return (
+            <Modal show={true} onHide={this.props.onHide}>
+                <Modal.Header closeButton>
+                    <Modal.Title>Bookmark Query</Modal.Title>
+                </Modal.Header>
+                <Modal.Body style={{ minHeight: 70 }}>
+                    <LoadingIndicator
+                        size={'big'}
+                        center={true}
+                        style={{ top: 32 }}
+                        isLoading={!this.urlData}
+                    />
+                    <div
+                        className={classNames({ hidden: !this.urlData })}
+                        ref={(el: HTMLDivElement) => (this.container = el)}
+                    >
                         <form>
                             <div className="form-group">
-                                <label htmlFor="exampleInputAmount">Share link</label>
+                                <label htmlFor="exampleInputAmount">
+                                    Share link
+                                </label>
                                 <div className="input-group">
-                                    <input type="text" className="form-control" value={(this.urlData ? this.urlData.fullUrl : "")}/>
+                                    <input
+                                        type="text"
+                                        className="form-control"
+                                        value={
+                                            this.urlData
+                                                ? this.urlData.fullUrl
+                                                : ''
+                                        }
+                                    />
                                     <div className="input-group-addon">
-                                        <a ref={(el:HTMLAnchorElement)=>this.sessionButton=el}
+                                        <a
+                                            ref={(el: HTMLAnchorElement) =>
+                                                (this.sessionButton = el)
+                                            }
                                             onClick={this.showThumb}
                                         >
                                             <i className="fa fa-clipboard"></i>
@@ -93,25 +116,38 @@ export class BookmarkModal extends React.Component<{ onHide: () => void, urlProm
                                     </div>
                                 </div>
                             </div>
-                            {
-                                (this.urlData && this.urlData.bitlyUrl) && (
-                                    <div className="form-group">
-                                        <label htmlFor="exampleInputAmount">Shortened URL</label>
-                                        <div className="input-group">
-                                            <input type="text" className="form-control" value={(this.urlData ? this.urlData.bitlyUrl : "")}/>
-                                            <div className="input-group-addon"><a
+                            {this.urlData && this.urlData.bitlyUrl && (
+                                <div className="form-group">
+                                    <label htmlFor="exampleInputAmount">
+                                        Shortened URL
+                                    </label>
+                                    <div className="input-group">
+                                        <input
+                                            type="text"
+                                            className="form-control"
+                                            value={
+                                                this.urlData
+                                                    ? this.urlData.bitlyUrl
+                                                    : ''
+                                            }
+                                        />
+                                        <div className="input-group-addon">
+                                            <a
                                                 onClick={this.showThumb}
-                                                ref={(el: HTMLAnchorElement) => this.bitlyButton = el}><i
-                                                className="fa fa-clipboard"></i></a></div>
+                                                ref={(el: HTMLAnchorElement) =>
+                                                    (this.bitlyButton = el)
+                                                }
+                                            >
+                                                <i className="fa fa-clipboard"></i>
+                                            </a>
                                         </div>
                                     </div>
-                                )
-                            }
+                                </div>
+                            )}
                         </form>
                     </div>
-            </Modal.Body>
-        </Modal>
-
+                </Modal.Body>
+            </Modal>
+        );
     }
-
 }
diff --git a/src/pages/resultsView/cancerSummary/CancerSummaryChart.spec.tsx b/src/pages/resultsView/cancerSummary/CancerSummaryChart.spec.tsx
index 9a3cf394e2c..35b97fb9f99 100644
--- a/src/pages/resultsView/cancerSummary/CancerSummaryChart.spec.tsx
+++ b/src/pages/resultsView/cancerSummary/CancerSummaryChart.spec.tsx
@@ -1,219 +1,464 @@
-import {assert} from 'chai';
-import {shallow, mount} from "enzyme";
-import * as React from "react";
+import { assert } from 'chai';
+import { shallow, mount } from 'enzyme';
+import * as React from 'react';
 import * as _ from 'lodash';
 import {
-    CancerSummaryChart, HORIZONTAL_SCROLLING_THRESHOLD,
-    mergeAlterationDataAcrossAlterationTypes
-} from "./CancerSummaryChart";
+    CancerSummaryChart,
+    HORIZONTAL_SCROLLING_THRESHOLD,
+    mergeAlterationDataAcrossAlterationTypes,
+} from './CancerSummaryChart';
 
 describe('CancerSummaryChart', () => {
+    it('Allows chart container to be horizontally scrolled when bar threshold is reached', () => {
+        const method: () => any = Object.getOwnPropertyDescriptor(
+            CancerSummaryChart.prototype,
+            'overflowStyle'
+        )!.get!;
 
-
-    it("Allows chart container to be horizontally scrolled when bar threshold is reached", () => {
-
-        const method: () => any = Object.getOwnPropertyDescriptor(CancerSummaryChart.prototype, 'overflowStyle')!.get!;
-
-
-        let result = method.bind({props: {xLabels: Array(HORIZONTAL_SCROLLING_THRESHOLD)}}).call();
+        let result = method
+            .bind({ props: { xLabels: Array(HORIZONTAL_SCROLLING_THRESHOLD) } })
+            .call();
         assert.equal(result.width, 'auto');
 
-        result = method.bind({props: {xLabels: Array(HORIZONTAL_SCROLLING_THRESHOLD + 1)}}).call();
+        result = method
+            .bind({
+                props: { xLabels: Array(HORIZONTAL_SCROLLING_THRESHOLD + 1) },
+            })
+            .call();
         assert.equal(result.width, '100%');
-
     });
 
-
     it('#legendData only includes alteration types which are present in query', () => {
-
         const props = {
-            "data": [[{
-                "alterationType": "multiple",
-                "x": "Lung Squamous Cell Carcinoma",
-                "y": 27.066115702479337
-            }, {
-                "alterationType": "multiple",
-                "x": "Lung Adenocarcinoma",
-                "y": 13.18181818181818
-            }], [{
-                "alterationType": "protExpressionLow",
-                "x": "Lung Squamous Cell Carcinoma",
-                "y": 0
-            }, {
-                "alterationType": "protExpressionLow",
-                "x": "Lung Adenocarcinoma",
-                "y": 0
-            }], [{
-                "alterationType": "protExpressionHigh",
-                "x": "Lung Squamous Cell Carcinoma",
-                "y": 0
-            }, {
-                "alterationType": "protExpressionHigh",
-                "x": "Lung Adenocarcinoma",
-                "y": 0
-            }], [{
-                "alterationType": "mrnaExpressionLow",
-                "x": "Lung Squamous Cell Carcinoma",
-                "y": 0
-            }, {
-                "alterationType": "mrnaExpressionLow",
-                "x": "Lung Adenocarcinoma",
-                "y": 0
-            }], [{
-                "alterationType": "mrnaExpressionHigh",
-                "x": "Lung Squamous Cell Carcinoma",
-                "y": 0
-            }, {"alterationType": "mrnaExpressionHigh", "x": "Lung Adenocarcinoma", "y": 0}], [{
-                "alterationType": "hetloss",
-                "x": "Lung Squamous Cell Carcinoma",
-                "y": 0
-            }, {"alterationType": "hetloss", "x": "Lung Adenocarcinoma", "y": 0}], [{
-                "alterationType": "homdel",
-                "x": "Lung Squamous Cell Carcinoma",
-                "y": 3.71900826446281
-            }, {
-                "alterationType": "homdel",
-                "x": "Lung Adenocarcinoma",
-                "y": 8.181818181818182
-            }], [{"alterationType": "gain", "x": "Lung Squamous Cell Carcinoma", "y": 0}, {
-                "alterationType": "gain",
-                "x": "Lung Adenocarcinoma",
-                "y": 0
-            }], [{
-                "alterationType": "amp",
-                "x": "Lung Squamous Cell Carcinoma",
-                "y": 0.4132231404958678
-            }, {"alterationType": "amp", "x": "Lung Adenocarcinoma", "y": 5.909090909090909}], [{
-                "alterationType": "fusion",
-                "x": "Lung Squamous Cell Carcinoma",
-                "y": 0
-            }, {"alterationType": "fusion", "x": "Lung Adenocarcinoma", "y": 0}], [{
-                "alterationType": "mutated",
-                "x": "Lung Squamous Cell Carcinoma",
-                "y": 60.33057851239669
-            }, {"alterationType": "mutated", "x": "Lung Adenocarcinoma", "y": 42.42424242424242}]],
-            "countsByGroup": {
-                "Lung Adenocarcinoma": {
-                    "profiledSampleTotal": 660,
-                    "alterationTotal": 547,
-                    "alterationTypeCounts": {
-                        "mutated": 280,
-                        "amp": 39,
-                        "homdel": 54,
-                        "hetloss": 0,
-                        "gain": 0,
-                        "fusion": 0,
-                        "mrnaExpressionHigh": 0,
-                        "mrnaExpressionLow": 0,
-                        "protExpressionHigh": 0,
-                        "protExpressionLow": 0,
-                        "multiple": 87
-                    },
-                    "alteredSampleCount": 460,
-                    "parentCancerType": "Non-Small Cell Lung Cancer"
-                },
-                "Lung Squamous Cell Carcinoma": {
-                    "profiledSampleTotal": 484,
-                    "alterationTotal": 574,
-                    "alterationTypeCounts": {
-                        "mutated": 292,
-                        "amp": 2,
-                        "homdel": 18,
-                        "hetloss": 0,
-                        "gain": 0,
-                        "fusion": 0,
-                        "mrnaExpressionHigh": 0,
-                        "mrnaExpressionLow": 0,
-                        "protExpressionHigh": 0,
-                        "protExpressionLow": 0,
-                        "multiple": 131
-                    },
-                    "alteredSampleCount": 443,
-                    "parentCancerType": "Non-Small Cell Lung Cancer"
-                }
+            data: [
+                [
+                    {
+                        alterationType: 'multiple',
+                        x: 'Lung Squamous Cell Carcinoma',
+                        y: 27.066115702479337,
+                    },
+                    {
+                        alterationType: 'multiple',
+                        x: 'Lung Adenocarcinoma',
+                        y: 13.18181818181818,
+                    },
+                ],
+                [
+                    {
+                        alterationType: 'protExpressionLow',
+                        x: 'Lung Squamous Cell Carcinoma',
+                        y: 0,
+                    },
+                    {
+                        alterationType: 'protExpressionLow',
+                        x: 'Lung Adenocarcinoma',
+                        y: 0,
+                    },
+                ],
+                [
+                    {
+                        alterationType: 'protExpressionHigh',
+                        x: 'Lung Squamous Cell Carcinoma',
+                        y: 0,
+                    },
+                    {
+                        alterationType: 'protExpressionHigh',
+                        x: 'Lung Adenocarcinoma',
+                        y: 0,
+                    },
+                ],
+                [
+                    {
+                        alterationType: 'mrnaExpressionLow',
+                        x: 'Lung Squamous Cell Carcinoma',
+                        y: 0,
+                    },
+                    {
+                        alterationType: 'mrnaExpressionLow',
+                        x: 'Lung Adenocarcinoma',
+                        y: 0,
+                    },
+                ],
+                [
+                    {
+                        alterationType: 'mrnaExpressionHigh',
+                        x: 'Lung Squamous Cell Carcinoma',
+                        y: 0,
+                    },
+                    {
+                        alterationType: 'mrnaExpressionHigh',
+                        x: 'Lung Adenocarcinoma',
+                        y: 0,
+                    },
+                ],
+                [
+                    {
+                        alterationType: 'hetloss',
+                        x: 'Lung Squamous Cell Carcinoma',
+                        y: 0,
+                    },
+                    {
+                        alterationType: 'hetloss',
+                        x: 'Lung Adenocarcinoma',
+                        y: 0,
+                    },
+                ],
+                [
+                    {
+                        alterationType: 'homdel',
+                        x: 'Lung Squamous Cell Carcinoma',
+                        y: 3.71900826446281,
+                    },
+                    {
+                        alterationType: 'homdel',
+                        x: 'Lung Adenocarcinoma',
+                        y: 8.181818181818182,
+                    },
+                ],
+                [
+                    {
+                        alterationType: 'gain',
+                        x: 'Lung Squamous Cell Carcinoma',
+                        y: 0,
+                    },
+                    {
+                        alterationType: 'gain',
+                        x: 'Lung Adenocarcinoma',
+                        y: 0,
+                    },
+                ],
+                [
+                    {
+                        alterationType: 'amp',
+                        x: 'Lung Squamous Cell Carcinoma',
+                        y: 0.4132231404958678,
+                    },
+                    {
+                        alterationType: 'amp',
+                        x: 'Lung Adenocarcinoma',
+                        y: 5.909090909090909,
+                    },
+                ],
+                [
+                    {
+                        alterationType: 'fusion',
+                        x: 'Lung Squamous Cell Carcinoma',
+                        y: 0,
+                    },
+                    {
+                        alterationType: 'fusion',
+                        x: 'Lung Adenocarcinoma',
+                        y: 0,
+                    },
+                ],
+                [
+                    {
+                        alterationType: 'mutated',
+                        x: 'Lung Squamous Cell Carcinoma',
+                        y: 60.33057851239669,
+                    },
+                    {
+                        alterationType: 'mutated',
+                        x: 'Lung Adenocarcinoma',
+                        y: 42.42424242424242,
+                    },
+                ],
+            ],
+            countsByGroup: {
+                'Lung Adenocarcinoma': {
+                    profiledSampleTotal: 660,
+                    alterationTotal: 547,
+                    alterationTypeCounts: {
+                        mutated: 280,
+                        amp: 39,
+                        homdel: 54,
+                        hetloss: 0,
+                        gain: 0,
+                        fusion: 0,
+                        mrnaExpressionHigh: 0,
+                        mrnaExpressionLow: 0,
+                        protExpressionHigh: 0,
+                        protExpressionLow: 0,
+                        multiple: 87,
+                    },
+                    alteredSampleCount: 460,
+                    parentCancerType: 'Non-Small Cell Lung Cancer',
+                },
+                'Lung Squamous Cell Carcinoma': {
+                    profiledSampleTotal: 484,
+                    alterationTotal: 574,
+                    alterationTypeCounts: {
+                        mutated: 292,
+                        amp: 2,
+                        homdel: 18,
+                        hetloss: 0,
+                        gain: 0,
+                        fusion: 0,
+                        mrnaExpressionHigh: 0,
+                        mrnaExpressionLow: 0,
+                        protExpressionHigh: 0,
+                        protExpressionLow: 0,
+                        multiple: 131,
+                    },
+                    alteredSampleCount: 443,
+                    parentCancerType: 'Non-Small Cell Lung Cancer',
+                },
+            },
+            representedAlterations: {
+                multiple: true,
+                homdel: true,
+                amp: true,
+                mutated: true,
             },
-            "representedAlterations": {"multiple": true, "homdel": true, "amp": true, "mutated": true},
-            "alterationTypes": {
-                "multiple": "Multiple Alterations",
-                "protExpressionLow": "Protein Low",
-                "protExpressionHigh": "Protein High",
-                "mrnaExpressionLow": "mRNA Low",
-                "mrnaExpressionHigh": "mRNA High",
-                "hetloss": "Shallow Deletion",
-                "homdel": "Deep Deletion",
-                "gain": "Gain",
-                "amp": "Amplification",
-                "fusion": "Fusion",
-                "mutated": "Mutation"
+            alterationTypes: {
+                multiple: 'Multiple Alterations',
+                protExpressionLow: 'Protein Low',
+                protExpressionHigh: 'Protein High',
+                mrnaExpressionLow: 'mRNA Low',
+                mrnaExpressionHigh: 'mRNA High',
+                hetloss: 'Shallow Deletion',
+                homdel: 'Deep Deletion',
+                gain: 'Gain',
+                amp: 'Amplification',
+                fusion: 'Fusion',
+                mutated: 'Mutation',
             },
-            "isPercentage": true,
-            "colors": {
-                "mutated": "#008000",
-                "amp": "#ff0000",
-                "homdel": "rgb(0,0,255)",
-                "hetloss": "#000",
-                "gain": "rgb(255,182,193)",
-                "fusion": "#8B00C9",
-                "mrnaExpressionHigh": "#FF989A",
-                "mrnaExpressionLow": "#529AC8",
-                "protExpressionHigh": "#FF989A",
-                "protExpressionLow": "#E0FFFF",
-                "multiple": "#666"
+            isPercentage: true,
+            colors: {
+                mutated: '#008000',
+                amp: '#ff0000',
+                homdel: 'rgb(0,0,255)',
+                hetloss: '#000',
+                gain: 'rgb(255,182,193)',
+                fusion: '#8B00C9',
+                mrnaExpressionHigh: '#FF989A',
+                mrnaExpressionLow: '#529AC8',
+                protExpressionHigh: '#FF989A',
+                protExpressionLow: '#E0FFFF',
+                multiple: '#666',
             },
-            "xLabels": ["Lung Squamous Cell Carcinoma", "Lung Adenocarcinoma"],
-            "alterationTypeDataCounts": [{
-                "x": "Lung Squamous Cell Carcinoma",
-                "y": "Mutation data",
-                "profiledCount": 484,
-                "notProfiledCount": 0
-            },{
-                "x": "Lung Adenocarcinoma",
-                "y": "Mutation data",
-                "profiledCount": 660,
-                "notProfiledCount": 0
-            },{
-                "x": "Lung Squamous Cell Carcinoma",
-                "y": "CNA data",
-                "profiledCount": 100,
-                "notProfiledCount": 0
-            },{
-                "x": "Lung Adenocarcinoma",
-                "y": "CNA data",
-                "profiledCount": 25,
-                "notProfiledCount": 0
-            }]
+            xLabels: ['Lung Squamous Cell Carcinoma', 'Lung Adenocarcinoma'],
+            alterationTypeDataCounts: [
+                {
+                    x: 'Lung Squamous Cell Carcinoma',
+                    y: 'Mutation data',
+                    profiledCount: 484,
+                    notProfiledCount: 0,
+                },
+                {
+                    x: 'Lung Adenocarcinoma',
+                    y: 'Mutation data',
+                    profiledCount: 660,
+                    notProfiledCount: 0,
+                },
+                {
+                    x: 'Lung Squamous Cell Carcinoma',
+                    y: 'CNA data',
+                    profiledCount: 100,
+                    notProfiledCount: 0,
+                },
+                {
+                    x: 'Lung Adenocarcinoma',
+                    y: 'CNA data',
+                    profiledCount: 25,
+                    notProfiledCount: 0,
+                },
+            ],
         } as any;
 
-        const instance = shallow(<CancerSummaryChart {...props} />).instance() as CancerSummaryChart;
+        const instance = shallow(
+            <CancerSummaryChart {...props} />
+        ).instance() as CancerSummaryChart;
 
         const result = [
-            {"name":"Mutation","symbol":{"fill":"#008000"}},
-            {"name":"Amplification","symbol":{"fill":"#ff0000"}},
-            {"name":"Deep Deletion","symbol":{"fill":"rgb(0,0,255)"}},
-            {"name":"Multiple Alterations","symbol":{"fill":"#666"}}
+            { name: 'Mutation', symbol: { fill: '#008000' } },
+            { name: 'Amplification', symbol: { fill: '#ff0000' } },
+            { name: 'Deep Deletion', symbol: { fill: 'rgb(0,0,255)' } },
+            { name: 'Multiple Alterations', symbol: { fill: '#666' } },
         ];
 
-        assert.deepEqual( instance.legendData, result, 'represented alterations present in legendData');
+        assert.deepEqual(
+            instance.legendData,
+            result,
+            'represented alterations present in legendData'
+        );
 
         delete instance.props.representedAlterations['mutated'];
 
-        assert.deepEqual( instance.legendData, result.slice(1), 'mutations no longer present be no longer in represented alterations');
-
-
+        assert.deepEqual(
+            instance.legendData,
+            result.slice(1),
+            'mutations no longer present be no longer in represented alterations'
+        );
     });
 
-    it('#mergeAlterationDataAcrossAlterationTypes should merge alteration rate/count across alteration types',()=>{
-
-        let alterationData = [[{"alterationType":"multiple","x":"Colorectal Adenocarcinoma","y":0},{"alterationType":"multiple","x":"Rectal Adenocarcinoma","y":2.083333333333333},{"alterationType":"multiple","x":"Colon Adenocarcinoma","y":0}],[{"alterationType":"protExpressionLow","x":"Colorectal Adenocarcinoma","y":0},{"alterationType":"protExpressionLow","x":"Rectal Adenocarcinoma","y":0},{"alterationType":"protExpressionLow","x":"Colon Adenocarcinoma","y":0}],[{"alterationType":"protExpressionHigh","x":"Colorectal Adenocarcinoma","y":0},{"alterationType":"protExpressionHigh","x":"Rectal Adenocarcinoma","y":0},{"alterationType":"protExpressionHigh","x":"Colon Adenocarcinoma","y":0}],[{"alterationType":"mrnaExpressionLow","x":"Colorectal Adenocarcinoma","y":0},{"alterationType":"mrnaExpressionLow","x":"Rectal Adenocarcinoma","y":0},{"alterationType":"mrnaExpressionLow","x":"Colon Adenocarcinoma","y":0}],[{"alterationType":"mrnaExpressionHigh","x":"Colorectal Adenocarcinoma","y":0},{"alterationType":"mrnaExpressionHigh","x":"Rectal Adenocarcinoma","y":0},{"alterationType":"mrnaExpressionHigh","x":"Colon Adenocarcinoma","y":0}],[{"alterationType":"hetloss","x":"Colorectal Adenocarcinoma","y":0},{"alterationType":"hetloss","x":"Rectal Adenocarcinoma","y":0},{"alterationType":"hetloss","x":"Colon Adenocarcinoma","y":0}],[{"alterationType":"homdel","x":"Colorectal Adenocarcinoma","y":0},{"alterationType":"homdel","x":"Rectal Adenocarcinoma","y":0},{"alterationType":"homdel","x":"Colon Adenocarcinoma","y":0}],[{"alterationType":"gain","x":"Colorectal Adenocarcinoma","y":0},{"alterationType":"gain","x":"Rectal Adenocarcinoma","y":0},{"alterationType":"gain","x":"Colon Adenocarcinoma","y":0}],[{"alterationType":"amp","x":"Colorectal Adenocarcinoma","y":0},{"alterationType":"amp","x":"Rectal Adenocarcinoma","y":2.083333333333333},{"alterationType":"amp","x":"Colon Adenocarcinoma","y":0}],[{"alterationType":"fusion","x":"Colorectal Adenocarcinoma","y":0},{"alterationType":"fusion","x":"Rectal Adenocarcinoma","y":0},{"alterationType":"fusion","x":"Colon Adenocarcinoma","y":0}],[{"alterationType":"mutated","x":"Colorectal Adenocarcinoma","y":78.26086956521739},{"alterationType":"mutated","x":"Rectal Adenocarcinoma","y":54.166666666666664},{"alterationType":"mutated","x":"Colon Adenocarcinoma","y":46.808510638297875}]];
+    it('#mergeAlterationDataAcrossAlterationTypes should merge alteration rate/count across alteration types', () => {
+        let alterationData = [
+            [
+                {
+                    alterationType: 'multiple',
+                    x: 'Colorectal Adenocarcinoma',
+                    y: 0,
+                },
+                {
+                    alterationType: 'multiple',
+                    x: 'Rectal Adenocarcinoma',
+                    y: 2.083333333333333,
+                },
+                { alterationType: 'multiple', x: 'Colon Adenocarcinoma', y: 0 },
+            ],
+            [
+                {
+                    alterationType: 'protExpressionLow',
+                    x: 'Colorectal Adenocarcinoma',
+                    y: 0,
+                },
+                {
+                    alterationType: 'protExpressionLow',
+                    x: 'Rectal Adenocarcinoma',
+                    y: 0,
+                },
+                {
+                    alterationType: 'protExpressionLow',
+                    x: 'Colon Adenocarcinoma',
+                    y: 0,
+                },
+            ],
+            [
+                {
+                    alterationType: 'protExpressionHigh',
+                    x: 'Colorectal Adenocarcinoma',
+                    y: 0,
+                },
+                {
+                    alterationType: 'protExpressionHigh',
+                    x: 'Rectal Adenocarcinoma',
+                    y: 0,
+                },
+                {
+                    alterationType: 'protExpressionHigh',
+                    x: 'Colon Adenocarcinoma',
+                    y: 0,
+                },
+            ],
+            [
+                {
+                    alterationType: 'mrnaExpressionLow',
+                    x: 'Colorectal Adenocarcinoma',
+                    y: 0,
+                },
+                {
+                    alterationType: 'mrnaExpressionLow',
+                    x: 'Rectal Adenocarcinoma',
+                    y: 0,
+                },
+                {
+                    alterationType: 'mrnaExpressionLow',
+                    x: 'Colon Adenocarcinoma',
+                    y: 0,
+                },
+            ],
+            [
+                {
+                    alterationType: 'mrnaExpressionHigh',
+                    x: 'Colorectal Adenocarcinoma',
+                    y: 0,
+                },
+                {
+                    alterationType: 'mrnaExpressionHigh',
+                    x: 'Rectal Adenocarcinoma',
+                    y: 0,
+                },
+                {
+                    alterationType: 'mrnaExpressionHigh',
+                    x: 'Colon Adenocarcinoma',
+                    y: 0,
+                },
+            ],
+            [
+                {
+                    alterationType: 'hetloss',
+                    x: 'Colorectal Adenocarcinoma',
+                    y: 0,
+                },
+                { alterationType: 'hetloss', x: 'Rectal Adenocarcinoma', y: 0 },
+                { alterationType: 'hetloss', x: 'Colon Adenocarcinoma', y: 0 },
+            ],
+            [
+                {
+                    alterationType: 'homdel',
+                    x: 'Colorectal Adenocarcinoma',
+                    y: 0,
+                },
+                { alterationType: 'homdel', x: 'Rectal Adenocarcinoma', y: 0 },
+                { alterationType: 'homdel', x: 'Colon Adenocarcinoma', y: 0 },
+            ],
+            [
+                {
+                    alterationType: 'gain',
+                    x: 'Colorectal Adenocarcinoma',
+                    y: 0,
+                },
+                { alterationType: 'gain', x: 'Rectal Adenocarcinoma', y: 0 },
+                { alterationType: 'gain', x: 'Colon Adenocarcinoma', y: 0 },
+            ],
+            [
+                { alterationType: 'amp', x: 'Colorectal Adenocarcinoma', y: 0 },
+                {
+                    alterationType: 'amp',
+                    x: 'Rectal Adenocarcinoma',
+                    y: 2.083333333333333,
+                },
+                { alterationType: 'amp', x: 'Colon Adenocarcinoma', y: 0 },
+            ],
+            [
+                {
+                    alterationType: 'fusion',
+                    x: 'Colorectal Adenocarcinoma',
+                    y: 0,
+                },
+                { alterationType: 'fusion', x: 'Rectal Adenocarcinoma', y: 0 },
+                { alterationType: 'fusion', x: 'Colon Adenocarcinoma', y: 0 },
+            ],
+            [
+                {
+                    alterationType: 'mutated',
+                    x: 'Colorectal Adenocarcinoma',
+                    y: 78.26086956521739,
+                },
+                {
+                    alterationType: 'mutated',
+                    x: 'Rectal Adenocarcinoma',
+                    y: 54.166666666666664,
+                },
+                {
+                    alterationType: 'mutated',
+                    x: 'Colon Adenocarcinoma',
+                    y: 46.808510638297875,
+                },
+            ],
+        ];
 
         const ret = mergeAlterationDataAcrossAlterationTypes(alterationData);
 
-        const expectedResult = [{"x":"Colorectal Adenocarcinoma","y":78.26086956521739,"alterationType":"whatever"},{"x":"Rectal Adenocarcinoma","y":58.33333333333333,"alterationType":"whatever"},{"x":"Colon Adenocarcinoma","y":46.808510638297875,"alterationType":"whatever"}];
+        const expectedResult = [
+            {
+                x: 'Colorectal Adenocarcinoma',
+                y: 78.26086956521739,
+                alterationType: 'whatever',
+            },
+            {
+                x: 'Rectal Adenocarcinoma',
+                y: 58.33333333333333,
+                alterationType: 'whatever',
+            },
+            {
+                x: 'Colon Adenocarcinoma',
+                y: 46.808510638297875,
+                alterationType: 'whatever',
+            },
+        ];
 
         assert.deepEqual(ret, expectedResult);
-
     });
-
-
-
 });
diff --git a/src/pages/resultsView/cancerSummary/CancerSummaryChart.tsx b/src/pages/resultsView/cancerSummary/CancerSummaryChart.tsx
index b7fa91095f3..96435fa31e9 100644
--- a/src/pages/resultsView/cancerSummary/CancerSummaryChart.tsx
+++ b/src/pages/resultsView/cancerSummary/CancerSummaryChart.tsx
@@ -1,90 +1,113 @@
-import * as React from "react";
+import * as React from 'react';
 import * as _ from 'lodash';
-import { VictoryChart, VictoryLegend, VictoryScatter, VictoryAxis, VictoryLabel, VictoryStack, VictoryBar } from 'victory';
-import {IAlterationCountMap, IAlterationData, ICancerSummaryChartData} from "./CancerSummaryContent";
-import {observable, computed, action} from "mobx";
-import {observer, Observer} from "mobx-react";
-import {CSSProperties} from "react";
-import CBIOPORTAL_VICTORY_THEME from "../../../shared/theme/cBioPoralTheme";
-import autobind from "autobind-decorator";
-import {adjustedLongestLabelLength} from "../../../shared/lib/VictoryChartUtils";
-import classnames from "classnames";
-import * as ReactDOM from "react-dom";
-import WindowStore from "shared/components/window/WindowStore";
-import { Popover } from "react-bootstrap";
-import {DownloadControls, pluralize} from "cbioportal-frontend-commons";
-import { HORIZONTAL_OFFSET, VERTICAL_OFFSET } from "pages/studyView/charts/barChart/BarChartToolTip";
-import { sleepUntil } from "shared/lib/TimeUtils";
-import { If, Then, Else } from "react-if";
-import { PagePath } from "shared/enums/PagePaths";
+import {
+    VictoryChart,
+    VictoryLegend,
+    VictoryScatter,
+    VictoryAxis,
+    VictoryLabel,
+    VictoryStack,
+    VictoryBar,
+} from 'victory';
+import {
+    IAlterationCountMap,
+    IAlterationData,
+    ICancerSummaryChartData,
+} from './CancerSummaryContent';
+import { observable, computed, action } from 'mobx';
+import { observer, Observer } from 'mobx-react';
+import { CSSProperties } from 'react';
+import CBIOPORTAL_VICTORY_THEME from '../../../shared/theme/cBioPoralTheme';
+import autobind from 'autobind-decorator';
+import { adjustedLongestLabelLength } from '../../../shared/lib/VictoryChartUtils';
+import classnames from 'classnames';
+import * as ReactDOM from 'react-dom';
+import WindowStore from 'shared/components/window/WindowStore';
+import { Popover } from 'react-bootstrap';
+import { DownloadControls, pluralize } from 'cbioportal-frontend-commons';
+import {
+    HORIZONTAL_OFFSET,
+    VERTICAL_OFFSET,
+} from 'pages/studyView/charts/barChart/BarChartToolTip';
+import { sleepUntil } from 'shared/lib/TimeUtils';
+import { If, Then, Else } from 'react-if';
+import { PagePath } from 'shared/enums/PagePaths';
 import URL from 'url';
-import { CANCER_SUMMARY_ALL_GENES } from "./CancerSummaryContainer";
-import {ResultsViewURLQueryEnum} from "pages/resultsView/ResultsViewURLWrapper";
+import { CANCER_SUMMARY_ALL_GENES } from './CancerSummaryContainer';
+import { ResultsViewURLQueryEnum } from 'pages/resultsView/ResultsViewURLWrapper';
 
 interface CancerSummaryChartProps {
     colors: Record<keyof IAlterationCountMap, string>;
     alterationTypes: Record<keyof IAlterationCountMap, string>;
     data: {
-        x: string,
-        y: number,
-        alterationType: string
+        x: string;
+        y: number;
+        alterationType: string;
     }[][];
     alterationTypeDataCounts: {
-        x: string,
-        y: string,
-        profiledCount: number,
-        notProfiledCount: number
+        x: string;
+        y: string;
+        profiledCount: number;
+        notProfiledCount: number;
     }[];
-    countsByGroup:{[groupName:string]:IAlterationData};
-    xLabels:string[];
-    representedAlterations:{ [alterationType:string]:boolean };
-    isPercentage:boolean;
-    showLinks:boolean;
-    hideGenomicAlterations?:boolean;
+    countsByGroup: { [groupName: string]: IAlterationData };
+    xLabels: string[];
+    representedAlterations: { [alterationType: string]: boolean };
+    isPercentage: boolean;
+    showLinks: boolean;
+    hideGenomicAlterations?: boolean;
     gene: string;
-};
+}
 
-export function percentageRounder(num:number){
-    return _.round(num * 100, 2)
+export function percentageRounder(num: number) {
+    return _.round(num * 100, 2);
 }
 
 //TODO: refactor to use generic tooltip model
 interface ITooltipModel {
-    x:number,
-    y:number,
-    alterationData:IAlterationData,
-    groupName:string,
-    studyId:string,
+    x: number;
+    y: number;
+    alterationData: IAlterationData;
+    groupName: string;
+    studyId: string;
 }
 
 export const HORIZONTAL_SCROLLING_THRESHOLD = 37;
 const PLOT_DATA_PADDING_PIXELS = 20;
 
-export function mergeAlterationDataAcrossAlterationTypes(alterationData:ICancerSummaryChartData["data"]){
-
+export function mergeAlterationDataAcrossAlterationTypes(
+    alterationData: ICancerSummaryChartData['data']
+) {
     // first get the group types
-    const groupTypes = alterationData[0].map((item)=>item.x);
+    const groupTypes = alterationData[0].map(item => item.x);
 
     // now we want to sum up the alteration rate/count across alteration types for this group
-    const merged = alterationData.reduce((memo, alterationTypeGroups)=>{
-        alterationTypeGroups.forEach((item)=>{
-            memo[item.x] = memo[item.x] || 0;
-            memo[item.x] += item.y;
-        });
-        return memo;
-    }, {} as { [groupKey:string]:number });
+    const merged = alterationData.reduce(
+        (memo, alterationTypeGroups) => {
+            alterationTypeGroups.forEach(item => {
+                memo[item.x] = memo[item.x] || 0;
+                memo[item.x] += item.y;
+            });
+            return memo;
+        },
+        {} as { [groupKey: string]: number }
+    );
 
     // we want an array of one
-    return groupTypes.map((groupType)=>{
-        return { x:groupType, y:merged[groupType], alterationType:'whatever' };
+    return groupTypes.map(groupType => {
+        return {
+            x: groupType,
+            y: merged[groupType],
+            alterationType: 'whatever',
+        };
     });
-
 }
 
-
 @observer
-export class CancerSummaryChart extends React.Component<CancerSummaryChartProps,{}> {
-
+export class CancerSummaryChart extends React.Component<
+    CancerSummaryChartProps,
+    {}
+> {
     @observable.ref private barPlotTooltipModel: ITooltipModel | null;
     @observable.ref private scatterPlotTooltipModel: any | null;
 
@@ -93,9 +116,9 @@ export class CancerSummaryChart extends React.Component<CancerSummaryChartProps,
     @observable private shouldUpdatePosition = false; // Prevents chasing tooltip
 
     private svg: SVGElement;
-    @observable mousePosition = { x:0, y:0 };
+    @observable mousePosition = { x: 0, y: 0 };
 
-    constructor(props:CancerSummaryChartProps){
+    constructor(props: CancerSummaryChartProps) {
         super(props);
     }
 
@@ -116,28 +139,41 @@ export class CancerSummaryChart extends React.Component<CancerSummaryChartProps,
         if (!this.scatterPlotTooltipModel) {
             return null;
         } else {
-            const profiledCount = this.scatterPlotTooltipModel.datum.profiledCount as number
-            let tooltopMessage = "Not profiled";
-            if(profiledCount > 0) {
-                tooltopMessage = `${profiledCount} ${pluralize("sample", profiledCount)}  profiled`
+            const profiledCount = this.scatterPlotTooltipModel.datum
+                .profiledCount as number;
+            let tooltopMessage = 'Not profiled';
+            if (profiledCount > 0) {
+                tooltopMessage = `${profiledCount} ${pluralize(
+                    'sample',
+                    profiledCount
+                )}  profiled`;
             }
             const maxWidth = 400;
-            let tooltipPlacement = (this.mousePosition.x > WindowStore.size.width-maxWidth ? "left" : "right");
+            let tooltipPlacement =
+                this.mousePosition.x > WindowStore.size.width - maxWidth
+                    ? 'left'
+                    : 'right';
             return (ReactDOM as any).createPortal(
                 <Popover
                     arrowOffsetTop={VERTICAL_OFFSET}
-                    className={classnames("cbioportal-frontend", "cbioTooltip")}
-                    positionLeft={this.mousePosition.x+(tooltipPlacement === "left" ? - HORIZONTAL_OFFSET : HORIZONTAL_OFFSET)}
-                    positionTop={this.mousePosition.y-VERTICAL_OFFSET}
+                    className={classnames('cbioportal-frontend', 'cbioTooltip')}
+                    positionLeft={
+                        this.mousePosition.x +
+                        (tooltipPlacement === 'left'
+                            ? -HORIZONTAL_OFFSET
+                            : HORIZONTAL_OFFSET)
+                    }
+                    positionTop={this.mousePosition.y - VERTICAL_OFFSET}
                     style={{
-                        transform: (tooltipPlacement === "left" ? "translate(-100%,0%)" : undefined),
-                        maxWidth
+                        transform:
+                            tooltipPlacement === 'left'
+                                ? 'translate(-100%,0%)'
+                                : undefined,
+                        maxWidth,
                     }}
                     placement={tooltipPlacement}
                 >
-                    <div style={{ whiteSpace:"normal" }}>
-                        {tooltopMessage}
-                    </div>
+                    <div style={{ whiteSpace: 'normal' }}>{tooltopMessage}</div>
                 </Popover>,
                 document.body
             );
@@ -148,21 +184,32 @@ export class CancerSummaryChart extends React.Component<CancerSummaryChartProps,
         if (!this.barPlotTooltipModel) {
             return null;
         } else {
-            const tooltipModel = this.barPlotTooltipModel
+            const tooltipModel = this.barPlotTooltipModel;
             const maxWidth = 400;
-            let tooltipPlacement = (this.mousePosition.x > WindowStore.size.width - maxWidth ? "left" : "right");
+            let tooltipPlacement =
+                this.mousePosition.x > WindowStore.size.width - maxWidth
+                    ? 'left'
+                    : 'right';
 
             return (ReactDOM as any).createPortal(
                 <Popover
                     onMouseLeave={this.tooltipMouseLeave}
                     onMouseEnter={this.tooltipMouseEnter}
                     arrowOffsetTop={VERTICAL_OFFSET}
-                    className={classnames("cbioportal-frontend", "cbioTooltip")}
-                    positionLeft={this.mousePosition.x + (tooltipPlacement === "left" ? -HORIZONTAL_OFFSET : HORIZONTAL_OFFSET)}
+                    className={classnames('cbioportal-frontend', 'cbioTooltip')}
+                    positionLeft={
+                        this.mousePosition.x +
+                        (tooltipPlacement === 'left'
+                            ? -HORIZONTAL_OFFSET
+                            : HORIZONTAL_OFFSET)
+                    }
                     positionTop={this.mousePosition.y - VERTICAL_OFFSET}
                     style={{
-                        transform: (tooltipPlacement === "left" ? "translate(-100%,0%)" : undefined),
-                        maxWidth
+                        transform:
+                            tooltipPlacement === 'left'
+                                ? 'translate(-100%,0%)'
+                                : undefined,
+                        maxWidth,
                     }}
                     placement={tooltipPlacement}
                 >
@@ -171,23 +218,37 @@ export class CancerSummaryChart extends React.Component<CancerSummaryChartProps,
                             <Then>
                                 <strong>
                                     <a
-                                        href={this.formatStudyLink(tooltipModel.studyId)}
+                                        href={this.formatStudyLink(
+                                            tooltipModel.studyId
+                                        )}
                                         target="_blank"
                                     >
                                         {tooltipModel.groupName}
                                         &nbsp;
                                         <i
                                             className="fa fa-external-link"
-                                            style={{fontWeight: "bold"}}
+                                            style={{ fontWeight: 'bold' }}
                                         />
                                     </a>
                                 </strong>
                             </Then>
                             <Else>
-                                <strong>Summary for {tooltipModel.groupName}</strong>
+                                <strong>
+                                    Summary for {tooltipModel.groupName}
+                                </strong>
                             </Else>
                         </If>
-                        <p>Gene altered in {percentageRounder(tooltipModel.alterationData.alteredSampleCount / tooltipModel.alterationData.profiledSampleTotal)}% of {tooltipModel.alterationData.profiledSampleTotal} cases</p>
+                        <p>
+                            Gene altered in{' '}
+                            {percentageRounder(
+                                tooltipModel.alterationData.alteredSampleCount /
+                                    tooltipModel.alterationData
+                                        .profiledSampleTotal
+                            )}
+                            % of{' '}
+                            {tooltipModel.alterationData.profiledSampleTotal}{' '}
+                            cases
+                        </p>
                         <table className="table table-striped">
                             <thead>
                                 <tr>
@@ -196,32 +257,64 @@ export class CancerSummaryChart extends React.Component<CancerSummaryChartProps,
                                 </tr>
                             </thead>
                             <tbody>
-                                {
-                                    _.reduce(this.props.alterationTypes, (memo, name: string, key: string) => {
-                                        if (key in tooltipModel!.alterationData.alterationTypeCounts && (tooltipModel!.alterationData.alterationTypeCounts as any)[key] > 0) {
-                                            const alterationCount = (tooltipModel!.alterationData.alterationTypeCounts as any)[key];
-                                            memo.push((
+                                {_.reduce(
+                                    this.props.alterationTypes,
+                                    (memo, name: string, key: string) => {
+                                        if (
+                                            key in
+                                                tooltipModel!.alterationData
+                                                    .alterationTypeCounts &&
+                                            (tooltipModel!.alterationData
+                                                .alterationTypeCounts as any)[
+                                                key
+                                            ] > 0
+                                        ) {
+                                            const alterationCount = (tooltipModel!
+                                                .alterationData
+                                                .alterationTypeCounts as any)[
+                                                key
+                                            ];
+                                            memo.push(
                                                 <tr>
                                                     <td>{name}</td>
                                                     <td>
-                                                        {percentageRounder((tooltipModel!.alterationData.alterationTypeCounts as any)[key] / tooltipModel!.alterationData.profiledSampleTotal)}%
-                                                ({alterationCount} {pluralize("case", alterationCount)})
-                                            </td>
+                                                        {percentageRounder(
+                                                            (tooltipModel!
+                                                                .alterationData
+                                                                .alterationTypeCounts as any)[
+                                                                key
+                                                            ] /
+                                                                tooltipModel!
+                                                                    .alterationData
+                                                                    .profiledSampleTotal
+                                                        )}
+                                                        % ({alterationCount}{' '}
+                                                        {pluralize(
+                                                            'case',
+                                                            alterationCount
+                                                        )}
+                                                        )
+                                                    </td>
                                                 </tr>
-                                            ))
+                                            );
                                         }
                                         return memo;
-                                    }, [] as JSX.Element[]).reverse()
-                                }
+                                    },
+                                    [] as JSX.Element[]
+                                ).reverse()}
                             </tbody>
                         </table>
                         <If condition={this.props.showLinks}>
                             <div
                                 className="btn btn-primary btn-xs"
-                                onClick={() => {this.queryStudy(tooltipModel.studyId)}}
+                                onClick={() => {
+                                    this.queryStudy(tooltipModel.studyId);
+                                }}
                             >
                                 Query this study
-                                {this.props.gene == CANCER_SUMMARY_ALL_GENES ? "" : ` for ${this.props.gene}`}
+                                {this.props.gene == CANCER_SUMMARY_ALL_GENES
+                                    ? ''
+                                    : ` for ${this.props.gene}`}
                             </div>
                         </If>
                     </div>
@@ -236,68 +329,82 @@ export class CancerSummaryChart extends React.Component<CancerSummaryChartProps,
      * so that it is just for the one study.
      */
     private async queryStudy(studyId: string) {
-        const studyWindow = window.open(window.location.href) as any
+        const studyWindow = window.open(window.location.href) as any;
 
         if (studyWindow === null) {
             return;
         }
 
-        await sleepUntil(()=>{
-            return studyWindow.closed ||
-                (studyWindow.globalStores && studyWindow.globalStores.appStore.appReady);
+        await sleepUntil(() => {
+            return (
+                studyWindow.closed ||
+                (studyWindow.globalStores &&
+                    studyWindow.globalStores.appStore.appReady)
+            );
         });
 
         if (!studyWindow.closed) {
-            const params: any = {[ResultsViewURLQueryEnum.cancer_study_list]: studyId};
+            const params: any = {
+                [ResultsViewURLQueryEnum.cancer_study_list]: studyId,
+            };
             if (this.props.gene != CANCER_SUMMARY_ALL_GENES) {
                 params[ResultsViewURLQueryEnum.gene_list] = this.props.gene;
             }
-            studyWindow.routingStore.updateRoute(params)
+            studyWindow.routingStore.updateRoute(params);
         }
     }
 
     private formatStudyLink(studyId: string): string {
         return URL.format({
-            pathname: "/" + PagePath.Study,
-            query: {id: studyId}
+            pathname: '/' + PagePath.Study,
+            query: { id: studyId },
         });
     }
 
     @autobind
     @action
-    private onMouseMove(e:React.MouseEvent<any>) {
+    private onMouseMove(e: React.MouseEvent<any>) {
         if (this.shouldUpdatePosition) {
             this.mousePosition.x = e.pageX;
             this.mousePosition.y = e.pageY;
         }
     }
 
-    private get svgWidth(){
+    private get svgWidth() {
         return this.chartWidth + this.rightPadding + this.leftPadding;
     }
 
-    private get chartWidth(){
-        return (this.props.xLabels.length * (this.barWidth()+this.barSeparation())) + 100;
+    private get chartWidth() {
+        return (
+            this.props.xLabels.length *
+                (this.barWidth() + this.barSeparation()) +
+            100
+        );
     }
 
-    private get svgHeight(){
-        return this.barChartHeight() + this.scatterChartHeight + this.bottomPadding - 100;
+    private get svgHeight() {
+        return (
+            this.barChartHeight() +
+            this.scatterChartHeight +
+            this.bottomPadding -
+            100
+        );
     }
 
-    private get rightPadding(){
+    private get rightPadding() {
         return Math.max(200, this.legendWidth - this.chartWidth + 20);
     }
 
-    private get legendWidth(){
-        const legendItems = this.legendData.map((item)=>item.name);
-        return (legendItems.join("").length * 6) + (legendItems.length * 40);
+    private get legendWidth() {
+        const legendItems = this.legendData.map(item => item.name);
+        return legendItems.join('').length * 6 + legendItems.length * 40;
     }
 
-    private get leftPadding(){
+    private get leftPadding() {
         return 50;
     }
 
-    private get bottomPadding(){
+    private get bottomPadding() {
         return adjustedLongestLabelLength(this.props.xLabels) * 5 + 40;
     }
 
@@ -309,123 +416,150 @@ export class CancerSummaryChart extends React.Component<CancerSummaryChartProps,
         return 8;
     }
 
-    private get colorArray():string[] {
-        return _.map(this.props.alterationTypes, (val:string, key:string)=>{
+    private get colorArray(): string[] {
+        return _.map(this.props.alterationTypes, (val: string, key: string) => {
             return (this.props.colors as any)[key];
         });
     }
 
-    get legendData(){
-        const legendData = _.reduce(this.props.alterationTypes,(memo, alterationName, alterationType)=>{
-            if (alterationType in this.props.representedAlterations) {
-                memo.push({
-                    name:alterationName,
-                    symbol: { fill: (this.props.colors as any)[alterationType] }
-                })
-            }
-            return memo;
-        }, [] as { name:string, symbol: { fill:string } }[])
+    get legendData() {
+        const legendData = _.reduce(
+            this.props.alterationTypes,
+            (memo, alterationName, alterationType) => {
+                if (alterationType in this.props.representedAlterations) {
+                    memo.push({
+                        name: alterationName,
+                        symbol: {
+                            fill: (this.props.colors as any)[alterationType],
+                        },
+                    });
+                }
+                return memo;
+            },
+            [] as { name: string; symbol: { fill: string } }[]
+        );
         return legendData.reverse();
     }
 
-    private get yAxisLabel(){
-        return (this.props.isPercentage) ? "Alteration Frequency" : "Absolute Counts";
+    private get yAxisLabel() {
+        return this.props.isPercentage
+            ? 'Alteration Frequency'
+            : 'Absolute Counts';
     }
 
     @autobind
-    private tickFormat(){
-        return (this.props.isPercentage) ? (tick:string) => `${tick}%` : (tick:string)=>tick;
+    private tickFormat() {
+        return this.props.isPercentage
+            ? (tick: string) => `${tick}%`
+            : (tick: string) => tick;
     }
     /*
      * returns events configuration for Victory chart
      */
-    private get barPlotEvents(){
+    private get barPlotEvents() {
         const self = this;
-        return [{
-            target: "data",
-            eventHandlers: {
-                onMouseEnter: () => {
-                    return [
-                        {
-                            target: "data",
-                            mutation: (props:any) => {
-                                self.shouldUpdatePosition = true;
-                                if (props.datum.xKey in self.props.countsByGroup) {
-                                    self.barPlotTooltipModel = {
-                                        ...props,
-                                        groupName:props.datum.x,
-                                        alterationData:self.props.countsByGroup[props.datum.xKey],
-                                        studyId: props.datum.xKey,
-                                    };
-                                    self.barToolTipCounter++;
-                                } else {
-                                    self.barPlotTooltipModel = null;
-                                }
-                            }
-                        }
-                    ];
-                },
-                onMouseLeave: () => {
-                    return [
-                        {
-                            target: "data",
-                            mutation: () => {
-                                // Freeze tool tip position and give user a moment to mouse over it
-                                self.shouldUpdatePosition = false;
-
-                                setTimeout(() => {
-                                    // If they don't, get rid of it
-                                    if (!self.isBarPlotTooltipHovered && self.barToolTipCounter === 1) {
+        return [
+            {
+                target: 'data',
+                eventHandlers: {
+                    onMouseEnter: () => {
+                        return [
+                            {
+                                target: 'data',
+                                mutation: (props: any) => {
+                                    self.shouldUpdatePosition = true;
+                                    if (
+                                        props.datum.xKey in
+                                        self.props.countsByGroup
+                                    ) {
+                                        self.barPlotTooltipModel = {
+                                            ...props,
+                                            groupName: props.datum.x,
+                                            alterationData:
+                                                self.props.countsByGroup[
+                                                    props.datum.xKey
+                                                ],
+                                            studyId: props.datum.xKey,
+                                        };
+                                        self.barToolTipCounter++;
+                                    } else {
                                         self.barPlotTooltipModel = null;
                                     }
-                                    self.barToolTipCounter--;
-                                }, 100);                            }
-                        }
-                    ];
-                }
-            }
-        }];
+                                },
+                            },
+                        ];
+                    },
+                    onMouseLeave: () => {
+                        return [
+                            {
+                                target: 'data',
+                                mutation: () => {
+                                    // Freeze tool tip position and give user a moment to mouse over it
+                                    self.shouldUpdatePosition = false;
+
+                                    setTimeout(() => {
+                                        // If they don't, get rid of it
+                                        if (
+                                            !self.isBarPlotTooltipHovered &&
+                                            self.barToolTipCounter === 1
+                                        ) {
+                                            self.barPlotTooltipModel = null;
+                                        }
+                                        self.barToolTipCounter--;
+                                    }, 100);
+                                },
+                            },
+                        ];
+                    },
+                },
+            },
+        ];
     }
 
     private get scatterPlotMouseEvents() {
         const self = this;
-        return [{
-            target: "data",
-            eventHandlers: {
-                onMouseOver: () => {
-                    return [
-                        {
-                            target: "data",
-                            mutation: (props: any) => {
-                                if (props.datum) {
-                                    self.scatterPlotTooltipModel = props;
-                                }
-                            }
-                        }
-                    ];
+        return [
+            {
+                target: 'data',
+                eventHandlers: {
+                    onMouseOver: () => {
+                        return [
+                            {
+                                target: 'data',
+                                mutation: (props: any) => {
+                                    if (props.datum) {
+                                        self.scatterPlotTooltipModel = props;
+                                    }
+                                },
+                            },
+                        ];
+                    },
+                    onMouseOut: () => {
+                        return [
+                            {
+                                target: 'data',
+                                mutation: () => {
+                                    self.scatterPlotTooltipModel = null;
+                                },
+                            },
+                        ];
+                    },
                 },
-                onMouseOut: () => {
-                    return [
-                        {
-                            target: "data",
-                            mutation: () => {
-                                self.scatterPlotTooltipModel = null;
-                            }
-                        }
-                    ];
-                }
-            }
-        }];
+            },
+        ];
     }
 
     /*
      * if we have more than threshold of bars (groups) we need to do horizontal scrolling
      */
-    get overflowStyle():CSSProperties {
+    get overflowStyle(): CSSProperties {
         return {
-            position:'relative',
-            display:'inline-block',
-            width: (this.props.xLabels.length > HORIZONTAL_SCROLLING_THRESHOLD) ? '100%' : 'auto'
+            position: 'relative',
+            display: 'inline-block',
+            width:
+                this.props.xLabels.length > HORIZONTAL_SCROLLING_THRESHOLD
+                    ? '100%'
+                    : 'auto',
         };
     }
 
@@ -444,7 +578,7 @@ export class CancerSummaryChart extends React.Component<CancerSummaryChartProps,
     private chartDomainPadding() {
         return {
             y: this.countAxisDomainPadding(),
-            x: this.categoryAxisDomainPadding()
+            x: this.categoryAxisDomainPadding(),
         };
     }
 
@@ -454,9 +588,16 @@ export class CancerSummaryChart extends React.Component<CancerSummaryChartProps,
 
     @computed get scatterChartHeight() {
         let miscPadding = 100; // specifying chart width in victory doesnt translate directly to the actual graph size
-        const profiledDataTypesLength = _.uniqBy(this.scatterData, datum => datum.y).length;
+        const profiledDataTypesLength = _.uniqBy(
+            this.scatterData,
+            datum => datum.y
+        ).length;
         if (profiledDataTypesLength > 0) {
-            return profiledDataTypesLength * (this.barWidth() + this.barSeparation()) + miscPadding;
+            return (
+                profiledDataTypesLength *
+                    (this.barWidth() + this.barSeparation()) +
+                miscPadding
+            );
         } else {
             return miscPadding;
         }
@@ -471,20 +612,28 @@ export class CancerSummaryChart extends React.Component<CancerSummaryChartProps,
         return _.map(this.props.alterationTypeDataCounts, datum => {
             return {
                 ...datum,
-                symbol: datum.profiledCount > 0 ? "plus" : "minus"
-            }
+                symbol: datum.profiledCount > 0 ? 'plus' : 'minus',
+            };
         });
     }
 
     @computed get barPlots() {
-         // if we're not showing result broken down the alterations then we need to merge
+        // if we're not showing result broken down the alterations then we need to merge
         // data across alterations (and hide legend down below)
-        const alterationData =  (this.props.hideGenomicAlterations) ?
-        [mergeAlterationDataAcrossAlterationTypes(this.props.data)] : this.props.data
+        const alterationData = this.props.hideGenomicAlterations
+            ? [mergeAlterationDataAcrossAlterationTypes(this.props.data)]
+            : this.props.data;
 
         return alterationData.map((data: any, i: number) => {
-            return <VictoryBar style={{ data: { width: this.barWidth } }} events={this.barPlotEvents} data={data} key={i} />;
-        })
+            return (
+                <VictoryBar
+                    style={{ data: { width: this.barWidth } }}
+                    events={this.barPlotEvents}
+                    data={data}
+                    key={i}
+                />
+            );
+        });
     }
 
     @autobind private getChart() {
@@ -495,16 +644,16 @@ export class CancerSummaryChart extends React.Component<CancerSummaryChartProps,
                         style={{
                             width: this.svgWidth,
                             height: this.svgHeight,
-                            pointerEvents: "all"
+                            pointerEvents: 'all',
                         }}
                         height={this.svgHeight}
                         width={this.svgWidth}
                         role="img"
                         viewBox={`0 0 ${this.svgWidth} ${this.svgHeight}`}
-                        ref={(ref: any) => this.svg = ref}
+                        ref={(ref: any) => (this.svg = ref)}
                         onMouseMove={this.onMouseMove}
                     >
-                        <g transform={`translate(${this.leftPadding}, 0)`} >
+                        <g transform={`translate(${this.leftPadding}, 0)`}>
                             <VictoryChart
                                 theme={CBIOPORTAL_VICTORY_THEME}
                                 width={this.chartWidth}
@@ -513,11 +662,14 @@ export class CancerSummaryChart extends React.Component<CancerSummaryChartProps,
                                 domainPadding={this.chartDomainPadding()}
                                 singleQuadrantDomainPadding={{
                                     y: true,
-                                    x: false
+                                    x: false,
                                 }}
                             >
-                                <VictoryAxis dependentAxis
-                                    axisLabelComponent={<VictoryLabel dy={-50} />}
+                                <VictoryAxis
+                                    dependentAxis
+                                    axisLabelComponent={
+                                        <VictoryLabel dy={-50} />
+                                    }
                                     label={this.yAxisLabel}
                                     tickFormat={this.tickFormat}
                                     offsetX={50}
@@ -533,23 +685,24 @@ export class CancerSummaryChart extends React.Component<CancerSummaryChartProps,
                                     }}
                                 />
 
-                                <VictoryStack
-                                    colorScale={this.colorArray}
-                                >
+                                <VictoryStack colorScale={this.colorArray}>
                                     {this.barPlots}
                                 </VictoryStack>
-                                {
-                                    // we're not showing alterations, so we don't need legend
-                                    (!this.props.hideGenomicAlterations) && (
-                                        <VictoryLegend x={10} y={this.svgHeight - 30}
-                                            orientation="horizontal"
-                                            data={this.legendData}
-                                        />)
-                                }
+                                {// we're not showing alterations, so we don't need legend
+                                !this.props.hideGenomicAlterations && (
+                                    <VictoryLegend
+                                        x={10}
+                                        y={this.svgHeight - 30}
+                                        orientation="horizontal"
+                                        data={this.legendData}
+                                    />
+                                )}
                             </VictoryChart>
                         </g>
 
-                        <g transform={`translate(${this.leftPadding}, ${this.scatterPlotTopPadding})`} >
+                        <g
+                            transform={`translate(${this.leftPadding}, ${this.scatterPlotTopPadding})`}
+                        >
                             <VictoryChart
                                 theme={CBIOPORTAL_VICTORY_THEME}
                                 width={this.chartWidth}
@@ -558,7 +711,7 @@ export class CancerSummaryChart extends React.Component<CancerSummaryChartProps,
                                 domainPadding={this.chartDomainPadding()}
                                 singleQuadrantDomainPadding={{
                                     y: true,
-                                    x: false
+                                    x: false,
                                 }}
                             >
                                 <VictoryAxis
@@ -569,8 +722,8 @@ export class CancerSummaryChart extends React.Component<CancerSummaryChartProps,
                                         axis: { strokeWidth: 0 },
                                         ticks: { size: 0, strokeWidth: 0 },
                                         grid: {
-                                            stroke: 0
-                                        }
+                                            stroke: 0,
+                                        },
                                     }}
                                     tickLabelComponent={
                                         <VictoryLabel
@@ -589,8 +742,8 @@ export class CancerSummaryChart extends React.Component<CancerSummaryChartProps,
                                         axis: { strokeWidth: 0 },
                                         ticks: { size: 0, strokeWidth: 0 },
                                         grid: {
-                                            stroke: 0
-                                        }
+                                            stroke: 0,
+                                        },
                                     }}
                                 />
 
@@ -598,9 +751,9 @@ export class CancerSummaryChart extends React.Component<CancerSummaryChartProps,
                                     size={this.barWidth() / 5}
                                     style={{
                                         data: {
-                                            fill: "black",
-                                            cursor: (d: any) => d.cursor
-                                        }
+                                            fill: 'black',
+                                            cursor: (d: any) => d.cursor,
+                                        },
                                     }}
                                     data={this.scatterData}
                                     events={this.scatterPlotMouseEvents}
@@ -608,29 +761,25 @@ export class CancerSummaryChart extends React.Component<CancerSummaryChartProps,
                             </VictoryChart>
                         </g>
                     </svg>
-
                 </div>
                 <DownloadControls
                     getSvg={() => this.svg}
                     filename="cancer_types_summary"
                     dontFade={true}
-                    type='button'
-                    style={{ position: "absolute", top: 10, right: 10 }}
+                    type="button"
+                    style={{ position: 'absolute', top: 10, right: 10 }}
                 />
-            </div>)
-
+            </div>
+        );
     }
 
     render() {
         return (
             <div data-test="cancerTypeSummaryChart">
-                <Observer>
-                    {this.getChart}
-                </Observer>
+                <Observer>{this.getChart}</Observer>
                 {this.scatterPlotTooltipComponent}
                 {this.barPlotTooltipComponent}
             </div>
         );
     }
 }
-
diff --git a/src/pages/resultsView/cancerSummary/CancerSummaryContainer.spec.tsx b/src/pages/resultsView/cancerSummary/CancerSummaryContainer.spec.tsx
index 099f73533fb..8a8a3ae600c 100644
--- a/src/pages/resultsView/cancerSummary/CancerSummaryContainer.spec.tsx
+++ b/src/pages/resultsView/cancerSummary/CancerSummaryContainer.spec.tsx
@@ -1,67 +1,74 @@
-import {assert} from 'chai';
-import {shallow, mount} from "enzyme";
-import * as React from "react";
+import { assert } from 'chai';
+import { shallow, mount } from 'enzyme';
+import * as React from 'react';
 import * as _ from 'lodash';
-import CancerSummaryContainer from "./CancerSummaryContainer";
-import {ICancerSummaryContentProps} from "./CancerSummaryContent";
-import {ExtendedSample} from "../ResultsViewPageStore";
+import CancerSummaryContainer from './CancerSummaryContainer';
+import { ICancerSummaryContentProps } from './CancerSummaryContent';
+import { ExtendedSample } from '../ResultsViewPageStore';
 
-describe('CancerSummaryContainer', ()=>{
-
-    let mockInstance:any;
-
-    beforeEach(()=>{
+describe('CancerSummaryContainer', () => {
+    let mockInstance: any;
 
+    beforeEach(() => {
         mockInstance = {
-            groupAlterationsBy_userSelection:undefined,
+            groupAlterationsBy_userSelection: undefined,
 
-            props:{
-
-                store:{
+            props: {
+                store: {
                     studies: {
-                        result: [1,2]
-
+                        result: [1, 2],
+                    },
+                    samplesExtendedWithClinicalData: {
+                        result: [
+                            { cancerType: 'colon' },
+                            { cancerType: 'brain' },
+                        ],
                     },
-                    samplesExtendedWithClinicalData:{
-                        result:[
-                            {cancerType:'colon'},
-                            {cancerType:'brain'},
-                        ]
-                    }
                 },
-
-
-            }
+            },
         };
-
     });
 
-    describe('#groupAlterationsBy',()=>{
-
-        const method: () => any = Object.getOwnPropertyDescriptor(CancerSummaryContainer.prototype, 'groupAlterationsBy')!.get!;
-
-        it('defaults to studyId if there is more than one study', ()=>{
-            assert.equal(method.apply(mockInstance), 'studyId','for > 1 study, defaults to studyId');
+    describe('#groupAlterationsBy', () => {
+        const method: () => any = Object.getOwnPropertyDescriptor(
+            CancerSummaryContainer.prototype,
+            'groupAlterationsBy'
+        )!.get!;
+
+        it('defaults to studyId if there is more than one study', () => {
+            assert.equal(
+                method.apply(mockInstance),
+                'studyId',
+                'for > 1 study, defaults to studyId'
+            );
         });
 
-        it('defaults to cancerTypeDetailed if there is only one study', ()=>{
+        it('defaults to cancerTypeDetailed if there is only one study', () => {
             //mockInstance.groupAlterationsBy_userSelection = "not undefined";
             mockInstance.props.store.studies.result = [1];
-            assert.equal(method.apply(mockInstance), 'cancerType','for more than one cancer type');
+            assert.equal(
+                method.apply(mockInstance),
+                'cancerType',
+                'for more than one cancer type'
+            );
 
             // now test if there's only one uniq cancerType
-            mockInstance.props.store.samplesExtendedWithClinicalData.result[1].cancerType = "colon";
-            assert.equal(method.apply(mockInstance), 'cancerTypeDetailed','one uniq cancer type');
-
-
+            mockInstance.props.store.samplesExtendedWithClinicalData.result[1].cancerType =
+                'colon';
+            assert.equal(
+                method.apply(mockInstance),
+                'cancerTypeDetailed',
+                'one uniq cancer type'
+            );
         });
 
-        it('respects user selected groupBy', ()=>{
-            mockInstance.groupAlterationsBy_userSelection = "cancerType";
-            assert.equal(method.apply(mockInstance), 'cancerType', 'respects user selection');
+        it('respects user selected groupBy', () => {
+            mockInstance.groupAlterationsBy_userSelection = 'cancerType';
+            assert.equal(
+                method.apply(mockInstance),
+                'cancerType',
+                'respects user selection'
+            );
         });
-
     });
-
-
-});
\ No newline at end of file
+});
diff --git a/src/pages/resultsView/cancerSummary/CancerSummaryContainer.tsx b/src/pages/resultsView/cancerSummary/CancerSummaryContainer.tsx
index 9a2488e9683..f912d6275ec 100644
--- a/src/pages/resultsView/cancerSummary/CancerSummaryContainer.tsx
+++ b/src/pages/resultsView/cancerSummary/CancerSummaryContainer.tsx
@@ -1,44 +1,49 @@
-import * as React from "react";
+import * as React from 'react';
 import * as _ from 'lodash';
-import {action, computed, observable} from "mobx";
-import {observer} from "mobx-react";
-import {MSKTabs, MSKTab} from "shared/components/MSKTabs/MSKTabs";
-import {If, Then, Else} from 'react-if';
-import {ThreeBounce} from 'better-react-spinkit';
-import {CancerSummaryContent, IAlterationData} from './CancerSummaryContent';
+import { action, computed, observable } from 'mobx';
+import { observer } from 'mobx-react';
+import { MSKTabs, MSKTab } from 'shared/components/MSKTabs/MSKTabs';
+import { If, Then, Else } from 'react-if';
+import { ThreeBounce } from 'better-react-spinkit';
+import { CancerSummaryContent, IAlterationData } from './CancerSummaryContent';
 import {
-    ExtendedAlteration, ExtendedSample,
-    ResultsViewPageStore
-} from "../ResultsViewPageStore";
-import Loader, {default as LoadingIndicator} from "../../../shared/components/loadingIndicator/LoadingIndicator";
-import {CancerStudy, Gene} from "../../../shared/api/generated/CBioPortalAPI";
+    ExtendedAlteration,
+    ExtendedSample,
+    ResultsViewPageStore,
+} from '../ResultsViewPageStore';
+import Loader, {
+    default as LoadingIndicator,
+} from '../../../shared/components/loadingIndicator/LoadingIndicator';
+import { CancerStudy, Gene } from '../../../shared/api/generated/CBioPortalAPI';
 import './styles.scss';
 import {
     getAlterationCountsForCancerTypesByGene,
-    getAlterationCountsForCancerTypesForAllGenes
-} from "../../../shared/lib/alterationCountHelpers";
-import OqlStatusBanner from "../../../shared/components/banners/OqlStatusBanner";
-import MobxPromise from "mobxpromise/dist/src/MobxPromise";
-import {getMobxPromiseGroupStatus} from "../../../shared/lib/getMobxPromiseGroupStatus";
-import NotUsingGenePanelWarning from "../NotUsingGenePanelWarning";
-import AlterationFilterWarning from "../../../shared/components/banners/AlterationFilterWarning";
+    getAlterationCountsForCancerTypesForAllGenes,
+} from '../../../shared/lib/alterationCountHelpers';
+import OqlStatusBanner from '../../../shared/components/banners/OqlStatusBanner';
+import MobxPromise from 'mobxpromise/dist/src/MobxPromise';
+import { getMobxPromiseGroupStatus } from '../../../shared/lib/getMobxPromiseGroupStatus';
+import NotUsingGenePanelWarning from '../NotUsingGenePanelWarning';
+import AlterationFilterWarning from '../../../shared/components/banners/AlterationFilterWarning';
 
 interface ICancerSummaryContainerProps {
-    store:ResultsViewPageStore;
-};
+    store: ResultsViewPageStore;
+}
 
 export const CANCER_SUMMARY_ALL_GENES = 'all';
 
 @observer
-export default class CancerSummaryContainer extends React.Component<ICancerSummaryContainerProps, {}> {
-
+export default class CancerSummaryContainer extends React.Component<
+    ICancerSummaryContainerProps,
+    {}
+> {
     @observable private activeTab: string = CANCER_SUMMARY_ALL_GENES;
     @observable private resultsViewPageWidth: number = 1150;
     @observable private groupAlterationsBy_userSelection: keyof ExtendedSample;
 
     private resultsViewPageContent: HTMLElement;
 
-    constructor(props:ICancerSummaryContainerProps) {
+    constructor(props: ICancerSummaryContainerProps) {
         super(props);
         this.handleTabClick = this.handleTabClick.bind(this);
         this.pivotData = this.pivotData.bind(this);
@@ -53,7 +58,7 @@ export default class CancerSummaryContainer extends React.Component<ICancerSumma
         return CANCER_SUMMARY_ALL_GENES;
     }
 
-    public pivotData(str: keyof ExtendedSample){
+    public pivotData(str: keyof ExtendedSample) {
         this.groupAlterationsBy_userSelection = str;
     }
 
@@ -62,10 +67,15 @@ export default class CancerSummaryContainer extends React.Component<ICancerSumma
             if (this.props.store.studies.result!.length > 1) {
                 return 'studyId';
             } else {
-                const cancerTypes = _.chain(this.props.store.samplesExtendedWithClinicalData.result!)
-                    .map((sample:ExtendedSample)=>sample.cancerType)
-                    .uniq().value();
-                return (cancerTypes.length === 1) ? 'cancerTypeDetailed' : 'cancerType';
+                const cancerTypes = _.chain(
+                    this.props.store.samplesExtendedWithClinicalData.result!
+                )
+                    .map((sample: ExtendedSample) => sample.cancerType)
+                    .uniq()
+                    .value();
+                return cancerTypes.length === 1
+                    ? 'cancerTypeDetailed'
+                    : 'cancerType';
             }
         } else {
             return this.groupAlterationsBy_userSelection;
@@ -73,75 +83,104 @@ export default class CancerSummaryContainer extends React.Component<ICancerSumma
     }
 
     // this is used to map study id to study shortname
-    private mapStudyIdToShortName(str: string){
-            if (str in this.props.store.physicalStudySet) {
-                return this.props.store.physicalStudySet[str].shortName;
-            } else {
-                return str;
-            }
+    private mapStudyIdToShortName(str: string) {
+        if (str in this.props.store.physicalStudySet) {
+            return this.props.store.physicalStudySet[str].shortName;
+        } else {
+            return str;
+        }
     }
 
     @computed
     private get tabs() {
-
         // if we're grouping by cancer study, we need to use study shortName property instead of studyId
-        const labelTransformer = (this.groupAlterationsBy === 'studyId') ? this.mapStudyIdToShortName : undefined;
-
-        const alterationCountsForCancerTypesByGene =
-            getAlterationCountsForCancerTypesByGene(
-                this.props.store.oqlFilteredAlterationsByGeneBySampleKey.result!,
-                this.props.store.samplesExtendedWithClinicalData.result!,
-                this.groupAlterationsBy,
-                this.props.store.selectedMolecularProfileIdsByAlterationType.result!,
-                this.props.store.coverageInformation.result!);
+        const labelTransformer =
+            this.groupAlterationsBy === 'studyId'
+                ? this.mapStudyIdToShortName
+                : undefined;
+
+        const alterationCountsForCancerTypesByGene = getAlterationCountsForCancerTypesByGene(
+            this.props.store.oqlFilteredAlterationsByGeneBySampleKey.result!,
+            this.props.store.samplesExtendedWithClinicalData.result!,
+            this.groupAlterationsBy,
+            this.props.store.selectedMolecularProfileIdsByAlterationType
+                .result!,
+            this.props.store.coverageInformation.result!
+        );
 
-        const geneTabs = _.map(this.props.store.genes.result!, (gene:Gene) => {
-            const geneData = alterationCountsForCancerTypesByGene[gene.hugoGeneSymbol];
+        const geneTabs = _.map(this.props.store.genes.result!, (gene: Gene) => {
+            const geneData =
+                alterationCountsForCancerTypesByGene[gene.hugoGeneSymbol];
             // count how many alterations there are across all cancer types for this gene
-            const alterationCountAcrossCancerType = _.reduce(geneData,(count, alterationData:IAlterationData)=>{
-                return count + alterationData.alterationTotal;
-            },0);
+            const alterationCountAcrossCancerType = _.reduce(
+                geneData,
+                (count, alterationData: IAlterationData) => {
+                    return count + alterationData.alterationTotal;
+                },
+                0
+            );
 
             // if there are no alterations for this gene, grey out text
-            const anchorStyle = (alterationCountAcrossCancerType === 0) ? { color:'#bbb' } : undefined;
+            const anchorStyle =
+                alterationCountAcrossCancerType === 0
+                    ? { color: '#bbb' }
+                    : undefined;
 
             return (
-                <MSKTab key={gene.hugoGeneSymbol} id={"summaryTab" + gene.hugoGeneSymbol} linkText={gene.hugoGeneSymbol} {...{anchorStyle}}>
+                <MSKTab
+                    key={gene.hugoGeneSymbol}
+                    id={'summaryTab' + gene.hugoGeneSymbol}
+                    linkText={gene.hugoGeneSymbol}
+                    {...{ anchorStyle }}
+                >
                     <CancerSummaryContent
-                        groupedAlterationData={alterationCountsForCancerTypesByGene[gene.hugoGeneSymbol]}
+                        groupedAlterationData={
+                            alterationCountsForCancerTypesByGene[
+                                gene.hugoGeneSymbol
+                            ]
+                        }
                         groupAlterationsBy={this.groupAlterationsBy}
                         gene={gene.hugoGeneSymbol}
                         labelTransformer={labelTransformer}
                         handlePivotChange={this.pivotData}
-                        width={this.resultsViewPageWidth}/>
+                        width={this.resultsViewPageWidth}
+                    />
                 </MSKTab>
-            )
+            );
         });
 
         // only add combined gene tab if there's more than one gene
         if (geneTabs.length > 1) {
             const groupedAlterationDataForAllGenes = getAlterationCountsForCancerTypesForAllGenes(
-                this.props.store.oqlFilteredAlterationsByGeneBySampleKey.result!,
+                this.props.store.oqlFilteredAlterationsByGeneBySampleKey
+                    .result!,
                 this.props.store.samplesExtendedWithClinicalData.result!,
                 this.groupAlterationsBy,
-                this.props.store.selectedMolecularProfileIdsByAlterationType.result!,
-                this.props.store.coverageInformation.result!);
-            geneTabs.unshift(<MSKTab key={CANCER_SUMMARY_ALL_GENES} id="allGenes" linkText="All Queried Genes">
-                <CancerSummaryContent gene={CANCER_SUMMARY_ALL_GENES}
-                                      width={this.resultsViewPageWidth}
-                                      groupedAlterationData={groupedAlterationDataForAllGenes}
-                                      handlePivotChange={this.pivotData}
-                                      labelTransformer={labelTransformer}
-                                      groupAlterationsBy={this.groupAlterationsBy}
-                />
-            </MSKTab>)
+                this.props.store.selectedMolecularProfileIdsByAlterationType
+                    .result!,
+                this.props.store.coverageInformation.result!
+            );
+            geneTabs.unshift(
+                <MSKTab
+                    key={CANCER_SUMMARY_ALL_GENES}
+                    id="allGenes"
+                    linkText="All Queried Genes"
+                >
+                    <CancerSummaryContent
+                        gene={CANCER_SUMMARY_ALL_GENES}
+                        width={this.resultsViewPageWidth}
+                        groupedAlterationData={groupedAlterationDataForAllGenes}
+                        handlePivotChange={this.pivotData}
+                        labelTransformer={labelTransformer}
+                        groupAlterationsBy={this.groupAlterationsBy}
+                    />
+                </MSKTab>
+            );
         }
         return geneTabs;
-
     }
 
     public render() {
-
         const status = getMobxPromiseGroupStatus(
             this.props.store.samplesExtendedWithClinicalData,
             this.props.store.oqlFilteredAlterationsByGeneBySampleKey,
@@ -151,30 +190,46 @@ export default class CancerSummaryContainer extends React.Component<ICancerSumma
             this.props.store.coverageInformation
         );
 
-        switch(status) {
-
-            case "pending":
-                return <LoadingIndicator isLoading={true} center={true} size={"big"} />;
-            case "error":
+        switch (status) {
+            case 'pending':
+                return (
+                    <LoadingIndicator
+                        isLoading={true}
+                        center={true}
+                        size={'big'}
+                    />
+                );
+            case 'error':
                 return null;
-            case "complete":
-                return <div ref={(el: HTMLDivElement) => this.resultsViewPageContent = el} data-test="cancerTypeSummaryWrapper">
-                    <div className={"tabMessageContainer"}>
-                        <OqlStatusBanner className="cancer-types-summary-oql-status-banner" store={this.props.store} tabReflectsOql={true}/>
-                        <AlterationFilterWarning store={this.props.store}/>
+            case 'complete':
+                return (
+                    <div
+                        ref={(el: HTMLDivElement) =>
+                            (this.resultsViewPageContent = el)
+                        }
+                        data-test="cancerTypeSummaryWrapper"
+                    >
+                        <div className={'tabMessageContainer'}>
+                            <OqlStatusBanner
+                                className="cancer-types-summary-oql-status-banner"
+                                store={this.props.store}
+                                tabReflectsOql={true}
+                            />
+                            <AlterationFilterWarning store={this.props.store} />
+                        </div>
+                        <MSKTabs
+                            onTabClick={this.handleTabClick}
+                            enablePagination={false}
+                            unmountOnHide={true}
+                            arrowStyle={{ 'line-height': 0.8 }}
+                            tabButtonStyle="pills"
+                            activeTabId={this.activeTab}
+                            className="pillTabs"
+                        >
+                            {this.tabs}
+                        </MSKTabs>
                     </div>
-                    <MSKTabs onTabClick={this.handleTabClick}
-                             enablePagination={false}
-                             unmountOnHide={true}
-                             arrowStyle={{'line-height': .8}}
-                             tabButtonStyle="pills"
-                             activeTabId={this.activeTab}
-                             className="pillTabs">
-                        {this.tabs}
-                    </MSKTabs>
-                </div>
+                );
         }
-
     }
-};
-
+}
diff --git a/src/pages/resultsView/cancerSummary/CancerSummaryContent.spec.tsx b/src/pages/resultsView/cancerSummary/CancerSummaryContent.spec.tsx
index 1176d5a9fa0..de460b983f9 100644
--- a/src/pages/resultsView/cancerSummary/CancerSummaryContent.spec.tsx
+++ b/src/pages/resultsView/cancerSummary/CancerSummaryContent.spec.tsx
@@ -1,310 +1,408 @@
 import {
     calculatePercentage,
-    CancerSummaryContent, IAlterationData, ICancerSummaryContentProps, OrderedAlterationLabelMap,
-} from "./CancerSummaryContent";
-import {assert} from 'chai';
-import {shallow, mount} from "enzyme";
-import * as React from "react";
+    CancerSummaryContent,
+    IAlterationData,
+    ICancerSummaryContentProps,
+    OrderedAlterationLabelMap,
+} from './CancerSummaryContent';
+import { assert } from 'chai';
+import { shallow, mount } from 'enzyme';
+import * as React from 'react';
 import * as _ from 'lodash';
 import sinon from 'sinon';
 
 describe('CancerSummaryContent', () => {
-
-
     let groupedAlterationData: {
-        [groupType: string]: IAlterationData
+        [groupType: string]: IAlterationData;
     };
 
-    beforeEach(()=>{
+    beforeEach(() => {
         groupedAlterationData = {
-            "Colon Adenocarcinoma": {
-                "profiledSampleTotal": 94,
-                "alterationTotal": 10,
-                "alterationTypeCounts": {
-                    "mutated": 10,
-                    "amp": 0,
-                    "homdel": 0,
-                    "hetloss": 0,
-                    "gain": 0,
-                    "fusion": 0,
-                    "mrnaExpressionHigh": 0,
-                    "mrnaExpressionLow": 0,
-                    "protExpressionHigh": 0,
-                    "protExpressionLow": 0,
-                    "multiple": 0
+            'Colon Adenocarcinoma': {
+                profiledSampleTotal: 94,
+                alterationTotal: 10,
+                alterationTypeCounts: {
+                    mutated: 10,
+                    amp: 0,
+                    homdel: 0,
+                    hetloss: 0,
+                    gain: 0,
+                    fusion: 0,
+                    mrnaExpressionHigh: 0,
+                    mrnaExpressionLow: 0,
+                    protExpressionHigh: 0,
+                    protExpressionLow: 0,
+                    multiple: 0,
                 },
-                "alteredSampleCount": 10,
-                "parentCancerType": "Colorectal Cancer",
-                "profiledSamplesCounts":{
-                    "mutation": 10,
-                    "cna": 0,
-                    "expression": 0,
-                    "protein": 0
+                alteredSampleCount: 10,
+                parentCancerType: 'Colorectal Cancer',
+                profiledSamplesCounts: {
+                    mutation: 10,
+                    cna: 0,
+                    expression: 0,
+                    protein: 0,
+                },
+                notProfiledSamplesCounts: {
+                    mutation: 0,
+                    cna: 0,
+                    expression: 0,
+                    protein: 0,
                 },
-                "notProfiledSamplesCounts":{
-                    "mutation": 0,
-                    "cna": 0,
-                    "expression": 0,
-                    "protein": 0
-                }
             },
-            "Colorectal Adenocarcinoma": {
-                "profiledSampleTotal": 23,
-                "alterationTotal": 1,
-                "alterationTypeCounts": {
-                    "mutated": 1,
-                    "amp": 0,
-                    "homdel": 0,
-                    "hetloss": 0,
-                    "gain": 0,
-                    "fusion": 0,
-                    "mrnaExpressionHigh": 0,
-                    "mrnaExpressionLow": 0,
-                    "protExpressionHigh": 0,
-                    "protExpressionLow": 0,
-                    "multiple": 0
+            'Colorectal Adenocarcinoma': {
+                profiledSampleTotal: 23,
+                alterationTotal: 1,
+                alterationTypeCounts: {
+                    mutated: 1,
+                    amp: 0,
+                    homdel: 0,
+                    hetloss: 0,
+                    gain: 0,
+                    fusion: 0,
+                    mrnaExpressionHigh: 0,
+                    mrnaExpressionLow: 0,
+                    protExpressionHigh: 0,
+                    protExpressionLow: 0,
+                    multiple: 0,
+                },
+                alteredSampleCount: 1,
+                parentCancerType: 'Colorectal Cancer',
+                profiledSamplesCounts: {
+                    mutation: 1,
+                    cna: 0,
+                    expression: 0,
+                    protein: 0,
                 },
-                "alteredSampleCount": 1,
-                "parentCancerType": "Colorectal Cancer",
-                "profiledSamplesCounts":{
-                    "mutation": 1,
-                    "cna": 0,
-                    "expression": 0,
-                    "protein": 0
+                notProfiledSamplesCounts: {
+                    mutation: 0,
+                    cna: 0,
+                    expression: 0,
+                    protein: 0,
                 },
-                "notProfiledSamplesCounts":{
-                    "mutation": 0,
-                    "cna": 0,
-                    "expression": 0,
-                    "protein": 0
-                }
             },
-            "Rectal Adenocarcinoma": {
-                "profiledSampleTotal": 48,
-                "alterationTotal": 5,
-                "alterationTypeCounts": {
-                    "mutated": 4,
-                    "amp": 1,
-                    "homdel": 0,
-                    "hetloss": 0,
-                    "gain": 0,
-                    "fusion": 0,
-                    "mrnaExpressionHigh": 0,
-                    "mrnaExpressionLow": 0,
-                    "protExpressionHigh": 0,
-                    "protExpressionLow": 0,
-                    "multiple": 0
+            'Rectal Adenocarcinoma': {
+                profiledSampleTotal: 48,
+                alterationTotal: 5,
+                alterationTypeCounts: {
+                    mutated: 4,
+                    amp: 1,
+                    homdel: 0,
+                    hetloss: 0,
+                    gain: 0,
+                    fusion: 0,
+                    mrnaExpressionHigh: 0,
+                    mrnaExpressionLow: 0,
+                    protExpressionHigh: 0,
+                    protExpressionLow: 0,
+                    multiple: 0,
                 },
-                "alteredSampleCount": 5,
-                "parentCancerType": "Colorectal Cancer",
-                "profiledSamplesCounts":{
-                    "mutation": 5,
-                    "cna": 1,
-                    "expression": 0,
-                    "protein": 0
+                alteredSampleCount: 5,
+                parentCancerType: 'Colorectal Cancer',
+                profiledSamplesCounts: {
+                    mutation: 5,
+                    cna: 1,
+                    expression: 0,
+                    protein: 0,
                 },
-                "notProfiledSamplesCounts":{
-                    "mutation": 0,
-                    "cna": 0,
-                    "expression": 0,
-                    "protein": 0
-                }
-            }
+                notProfiledSamplesCounts: {
+                    mutation: 0,
+                    cna: 0,
+                    expression: 0,
+                    protein: 0,
+                },
+            },
         };
     });
 
-
     it('#getYValue should return total count if absolute mode, otherwise percentage', () => {
-
         const comp = CancerSummaryContent;
-        const ret1 = comp.prototype.getYValue.call({yAxis: "abs-count"}, 1, 5, 'absolute count returns count value');
+        const ret1 = comp.prototype.getYValue.call(
+            { yAxis: 'abs-count' },
+            1,
+            5,
+            'absolute count returns count value'
+        );
         assert.equal(ret1, 1);
 
-        const ret2 = comp.prototype.getYValue.call({yAxis: "alt-freq"}, 1, 5, 'frequency returns percentage of total');
+        const ret2 = comp.prototype.getYValue.call(
+            { yAxis: 'alt-freq' },
+            1,
+            5,
+            'frequency returns percentage of total'
+        );
         assert.equal(ret2, 20);
-
     });
 
     it('#calculatePercentage returns ratio of part to whole', () => {
-        assert.equal(calculatePercentage(5,10), 50);
-        assert.equal(calculatePercentage(0,5), 0);
-        assert.equal(calculatePercentage(20,20), 100);
-        assert.equal(calculatePercentage(9,10), 90);
+        assert.equal(calculatePercentage(5, 10), 50);
+        assert.equal(calculatePercentage(0, 5), 0);
+        assert.equal(calculatePercentage(20, 20), 100);
+        assert.equal(calculatePercentage(9, 10), 90);
     });
 
+    it("#maxAltCount getter returns maxPercenage if we're in frequecy mode (default), absolute count otherwise", () => {
+        const wrapper = shallow(
+            <CancerSummaryContent
+                groupedAlterationData={groupedAlterationData}
+                groupAlterationsBy={'cancerTypeDetailed'}
+                gene={'NRAS'}
+                width={500}
+                handlePivotChange={() => {}}
+            />
+        );
 
-    it('#maxAltCount getter returns maxPercenage if we\'re in frequecy mode (default), absolute count otherwise', ()=>{
-        const wrapper = shallow(<CancerSummaryContent
-            groupedAlterationData={groupedAlterationData}
-            groupAlterationsBy={"cancerTypeDetailed"}
-            gene={"NRAS"}
-            width={500}
-            handlePivotChange={() => {
-            }}/>);
-
-        const instance = (wrapper.instance() as CancerSummaryContent);
+        const instance = wrapper.instance() as CancerSummaryContent;
         const chartData = instance.chartData;
-        assert.equal(instance.altCasesMax, chartData.maxPercentage, 'returns percentage');
+        assert.equal(
+            instance.altCasesMax,
+            chartData.maxPercentage,
+            'returns percentage'
+        );
 
         instance.yAxis = 'abs-count';
-        assert.equal(instance.altCasesMax, chartData.maxAbsoluteCount, 'returns absolute count');
-
+        assert.equal(
+            instance.altCasesMax,
+            chartData.maxAbsoluteCount,
+            'returns absolute count'
+        );
     });
 
     it('#handleYAxisChange should reset alteration slider to zero', () => {
         const comp = CancerSummaryContent;
         const mockInstance = {
-            handleAltSliderChange:sinon.stub(),
-            altCasesValue:null,
-            yAxis:null
+            handleAltSliderChange: sinon.stub(),
+            altCasesValue: null,
+            yAxis: null,
         };
-        comp.prototype.handleYAxisChange.call(mockInstance,{
-            target:{
-                value:"something"
-            }
+        comp.prototype.handleYAxisChange.call(mockInstance, {
+            target: {
+                value: 'something',
+            },
         });
         assert.equal(mockInstance.altCasesValue, 0, 'sets altCasesValue to 0');
-        assert.equal(mockInstance.yAxis, 'something', 'sets altCasesValue to 0');
-        assert.isTrue(mockInstance.handleAltSliderChange.calledOnce,'slider change handler called');
-        assert.isTrue(mockInstance.handleAltSliderChange.calledWith(0),'slider set to zero');
+        assert.equal(
+            mockInstance.yAxis,
+            'something',
+            'sets altCasesValue to 0'
+        );
+        assert.isTrue(
+            mockInstance.handleAltSliderChange.calledOnce,
+            'slider change handler called'
+        );
+        assert.isTrue(
+            mockInstance.handleAltSliderChange.calledWith(0),
+            'slider set to zero'
+        );
     });
 
     it('#handleXAxisChange should reset alteration slider to zero', () => {
         const comp = CancerSummaryContent;
         const mockInstance = {
-            xAxis:null
+            xAxis: null,
         };
-        comp.prototype.handleXAxisChange.call(mockInstance,{
-            target:{
-                value:"something"
-            }
+        comp.prototype.handleXAxisChange.call(mockInstance, {
+            target: {
+                value: 'something',
+            },
         });
-        assert.equal(mockInstance.xAxis, 'something', 'sets xAis to passed value');
+        assert.equal(
+            mockInstance.xAxis,
+            'something',
+            'sets xAis to passed value'
+        );
     });
 
-    describe('chartData getter', ()=>{
-
+    describe('chartData getter', () => {
         it('returns labels and appropriate alteration percentages', () => {
-
-            const wrapper = shallow(<CancerSummaryContent
-                groupedAlterationData={groupedAlterationData}
-                groupAlterationsBy={"cancerTypeDetailed"}
-                gene={"NRAS"}
-                width={500}
-                handlePivotChange={() => {}}/>);
-
-            const chartData = (wrapper.instance() as CancerSummaryContent).chartData;
-            assert.equal(chartData.data.length, _.size(OrderedAlterationLabelMap), "all alteration types are returned in data");
-            assert.isFalse("gain" in chartData.representedAlterations, "Alteration types with count 0 in result are NOT in represented alteration map");
-            assert.deepEqual(chartData.representedAlterations,{ amp:true, mutated:true });
+            const wrapper = shallow(
+                <CancerSummaryContent
+                    groupedAlterationData={groupedAlterationData}
+                    groupAlterationsBy={'cancerTypeDetailed'}
+                    gene={'NRAS'}
+                    width={500}
+                    handlePivotChange={() => {}}
+                />
+            );
+
+            const chartData = (wrapper.instance() as CancerSummaryContent)
+                .chartData;
+            assert.equal(
+                chartData.data.length,
+                _.size(OrderedAlterationLabelMap),
+                'all alteration types are returned in data'
+            );
+            assert.isFalse(
+                'gain' in chartData.representedAlterations,
+                'Alteration types with count 0 in result are NOT in represented alteration map'
+            );
+            assert.deepEqual(chartData.representedAlterations, {
+                amp: true,
+                mutated: true,
+            });
             assert.equal(chartData.data[8][1].y, 2.083333333333333);
-
-
         });
 
-        it('respects alteration percentage threshold', ()=>{
-            const wrapper = shallow(<CancerSummaryContent
-                groupedAlterationData={groupedAlterationData}
-                groupAlterationsBy={"cancerTypeDetailed"}
-                gene={"NRAS"}
-                width={500}
-                handlePivotChange={() => {
-                }}/>);
-
-            const instance = (wrapper.instance() as CancerSummaryContent);
-            assert.deepEqual(instance.chartData.labels, ['Colon Adenocarcinoma', 'Rectal Adenocarcinoma', 'Colorectal Adenocarcinoma'], "Has all three group types in labels");
+        it('respects alteration percentage threshold', () => {
+            const wrapper = shallow(
+                <CancerSummaryContent
+                    groupedAlterationData={groupedAlterationData}
+                    groupAlterationsBy={'cancerTypeDetailed'}
+                    gene={'NRAS'}
+                    width={500}
+                    handlePivotChange={() => {}}
+                />
+            );
+
+            const instance = wrapper.instance() as CancerSummaryContent;
+            assert.deepEqual(
+                instance.chartData.labels,
+                [
+                    'Colon Adenocarcinoma',
+                    'Rectal Adenocarcinoma',
+                    'Colorectal Adenocarcinoma',
+                ],
+                'Has all three group types in labels'
+            );
 
             instance.tempAltCasesValue = 5;
-            assert.deepEqual(instance.chartData.labels, ['Colon Adenocarcinoma', 'Rectal Adenocarcinoma'], "Filters out alt percentage lower than 5");
+            assert.deepEqual(
+                instance.chartData.labels,
+                ['Colon Adenocarcinoma', 'Rectal Adenocarcinoma'],
+                'Filters out alt percentage lower than 5'
+            );
 
             instance.tempAltCasesValue = 10.5;
-            assert.deepEqual(instance.chartData.labels, ['Colon Adenocarcinoma'], "Filters out alt percentage lower than 10.5");
-
+            assert.deepEqual(
+                instance.chartData.labels,
+                ['Colon Adenocarcinoma'],
+                'Filters out alt percentage lower than 10.5'
+            );
         });
 
-        it('respects alteration absolute threshold', ()=>{
-            const wrapper = shallow(<CancerSummaryContent
-                groupedAlterationData={groupedAlterationData}
-                groupAlterationsBy={"cancerTypeDetailed"}
-                gene={"NRAS"}
-                width={500}
-                handlePivotChange={() => {
-                }}/>);
-
-            const instance = (wrapper.instance() as CancerSummaryContent);
-
-            instance.yAxis = "abs-count";
-
-            assert.deepEqual(instance.chartData.labels, ['Colon Adenocarcinoma', 'Rectal Adenocarcinoma', 'Colorectal Adenocarcinoma'], "Has all three group types in labels");
+        it('respects alteration absolute threshold', () => {
+            const wrapper = shallow(
+                <CancerSummaryContent
+                    groupedAlterationData={groupedAlterationData}
+                    groupAlterationsBy={'cancerTypeDetailed'}
+                    gene={'NRAS'}
+                    width={500}
+                    handlePivotChange={() => {}}
+                />
+            );
+
+            const instance = wrapper.instance() as CancerSummaryContent;
+
+            instance.yAxis = 'abs-count';
+
+            assert.deepEqual(
+                instance.chartData.labels,
+                [
+                    'Colon Adenocarcinoma',
+                    'Rectal Adenocarcinoma',
+                    'Colorectal Adenocarcinoma',
+                ],
+                'Has all three group types in labels'
+            );
 
             instance.tempAltCasesValue = 4;
-            assert.deepEqual(instance.chartData.labels, ['Colon Adenocarcinoma', 'Rectal Adenocarcinoma'], "Filters out alt percentage lower than 5");
+            assert.deepEqual(
+                instance.chartData.labels,
+                ['Colon Adenocarcinoma', 'Rectal Adenocarcinoma'],
+                'Filters out alt percentage lower than 5'
+            );
 
             instance.tempAltCasesValue = 6;
-            assert.deepEqual(instance.chartData.labels, ['Colon Adenocarcinoma'], "Filters out alt percentage lower than 6");
+            assert.deepEqual(
+                instance.chartData.labels,
+                ['Colon Adenocarcinoma'],
+                'Filters out alt percentage lower than 6'
+            );
 
             instance.tempAltCasesValue = 11;
-            assert.deepEqual(instance.chartData.labels, [], "Filters out all");
-
+            assert.deepEqual(instance.chartData.labels, [], 'Filters out all');
         });
 
-        it('respects total sample threshold', ()=>{
-            const wrapper = shallow(<CancerSummaryContent
-                groupedAlterationData={groupedAlterationData}
-                groupAlterationsBy={"cancerTypeDetailed"}
-                gene={"NRAS"}
-                width={500}
-                handlePivotChange={() => {
-                }}/>);
-
-            const instance = (wrapper.instance() as CancerSummaryContent);
-            assert.deepEqual(instance.chartData.labels, ['Colon Adenocarcinoma', 'Rectal Adenocarcinoma', 'Colorectal Adenocarcinoma'], "Has all three group types in labels");
-
-            instance.totalCasesValue = 24
-            assert.deepEqual(instance.chartData.labels, ['Colon Adenocarcinoma', 'Rectal Adenocarcinoma'], "Filters out total samples less than 24");
+        it('respects total sample threshold', () => {
+            const wrapper = shallow(
+                <CancerSummaryContent
+                    groupedAlterationData={groupedAlterationData}
+                    groupAlterationsBy={'cancerTypeDetailed'}
+                    gene={'NRAS'}
+                    width={500}
+                    handlePivotChange={() => {}}
+                />
+            );
+
+            const instance = wrapper.instance() as CancerSummaryContent;
+            assert.deepEqual(
+                instance.chartData.labels,
+                [
+                    'Colon Adenocarcinoma',
+                    'Rectal Adenocarcinoma',
+                    'Colorectal Adenocarcinoma',
+                ],
+                'Has all three group types in labels'
+            );
+
+            instance.totalCasesValue = 24;
+            assert.deepEqual(
+                instance.chartData.labels,
+                ['Colon Adenocarcinoma', 'Rectal Adenocarcinoma'],
+                'Filters out total samples less than 24'
+            );
 
             instance.totalCasesValue = 49;
-            assert.deepEqual(instance.chartData.labels, ['Colon Adenocarcinoma'], "Filters out percentage lower than 49");
-
+            assert.deepEqual(
+                instance.chartData.labels,
+                ['Colon Adenocarcinoma'],
+                'Filters out percentage lower than 49'
+            );
         });
 
-        it('applies label transformer', ()=>{
-            const wrapper = shallow(<CancerSummaryContent
-                groupedAlterationData={groupedAlterationData}
-                groupAlterationsBy={"cancerTypeDetailed"}
-                gene={"NRAS"}
-                labelTransformer={(t:string)=>`|${t.toUpperCase()}|`}
-                width={500}
-                handlePivotChange={() => {
-                }}/>);
-
-            const instance = (wrapper.instance() as CancerSummaryContent);
-            assert.equal(instance.chartData.labels[0],'|COLON ADENOCARCINOMA|', "Has all three group types in labels");
-
+        it('applies label transformer', () => {
+            const wrapper = shallow(
+                <CancerSummaryContent
+                    groupedAlterationData={groupedAlterationData}
+                    groupAlterationsBy={'cancerTypeDetailed'}
+                    gene={'NRAS'}
+                    labelTransformer={(t: string) => `|${t.toUpperCase()}|`}
+                    width={500}
+                    handlePivotChange={() => {}}
+                />
+            );
+
+            const instance = wrapper.instance() as CancerSummaryContent;
+            assert.equal(
+                instance.chartData.labels[0],
+                '|COLON ADENOCARCINOMA|',
+                'Has all three group types in labels'
+            );
         });
-
-
     });
 
-
     describe('determineSorterAndDirection', () => {
-
         it('sorting is default=desc and if x-axis, asc', () => {
-
-            let ret = CancerSummaryContent.prototype.determineSorterAndDirection.apply({});
-            assert.equal(ret.dir, "desc");
-
-            ret = CancerSummaryContent.prototype.determineSorterAndDirection.apply({xAxis: 'x-axis'});
-            assert.equal(ret.dir, "asc");
-
+            let ret = CancerSummaryContent.prototype.determineSorterAndDirection.apply(
+                {}
+            );
+            assert.equal(ret.dir, 'desc');
+
+            ret = CancerSummaryContent.prototype.determineSorterAndDirection.apply(
+                { xAxis: 'x-axis' }
+            );
+            assert.equal(ret.dir, 'asc');
         });
 
         it('if sorting by xAxis, sort just returns input key', () => {
             const instance = {
-                xAxis: 'x-axis'
+                xAxis: 'x-axis',
             };
-            let {sorter} = CancerSummaryContent.prototype.determineSorterAndDirection.apply(instance);
-            assert.equal(sorter('tree'), 'tree')
+            let {
+                sorter,
+            } = CancerSummaryContent.prototype.determineSorterAndDirection.apply(
+                instance
+            );
+            assert.equal(sorter('tree'), 'tree');
         });
 
         it('if NOT sorting by xAxis, sorter return either absolute count or percentage value depending on yAxis value', () => {
@@ -312,26 +410,36 @@ describe('CancerSummaryContent', () => {
                 xAxis: 'whatever',
                 yAxis: 'abs-count',
                 countsData: {
-                    'test': {
+                    test: {
                         alteredSampleCount: 12,
-                        profiledSampleTotal: 50
-                    }
-                }
-
+                        profiledSampleTotal: 50,
+                    },
+                },
             };
-            let {sorter} = CancerSummaryContent.prototype.determineSorterAndDirection.apply(instance);
-            assert.equal(sorter('test'), 12, 'just returns alteredSample value');
+            let {
+                sorter,
+            } = CancerSummaryContent.prototype.determineSorterAndDirection.apply(
+                instance
+            );
+            assert.equal(
+                sorter('test'),
+                12,
+                'just returns alteredSample value'
+            );
 
             instance.yAxis = 'someDefault';
 
-            let {sorter: sorter2} = CancerSummaryContent.prototype.determineSorterAndDirection.apply(instance);
-
-            assert.equal(sorter2('test'), 0.24, 'returns alteration percentage of total');
-
-
+            let {
+                sorter: sorter2,
+            } = CancerSummaryContent.prototype.determineSorterAndDirection.apply(
+                instance
+            );
+
+            assert.equal(
+                sorter2('test'),
+                0.24,
+                'returns alteration percentage of total'
+            );
         });
-
     });
-
-
 });
diff --git a/src/pages/resultsView/cancerSummary/CancerSummaryContent.tsx b/src/pages/resultsView/cancerSummary/CancerSummaryContent.tsx
index 7b8b5ec8cf1..c583a264f37 100644
--- a/src/pages/resultsView/cancerSummary/CancerSummaryContent.tsx
+++ b/src/pages/resultsView/cancerSummary/CancerSummaryContent.tsx
@@ -1,55 +1,57 @@
-import * as React from "react";
+import * as React from 'react';
 import * as _ from 'lodash';
-import {Checkbox, ButtonGroup, Radio} from 'react-bootstrap';
-import {computed, observable, action} from "mobx";
-import {observer} from "mobx-react";
+import { Checkbox, ButtonGroup, Radio } from 'react-bootstrap';
+import { computed, observable, action } from 'mobx';
+import { observer } from 'mobx-react';
 import Slider from 'react-rangeslider';
 import { ControlLabel, FormControl } from 'react-bootstrap';
-import {If, Then, Else} from 'react-if';
+import { If, Then, Else } from 'react-if';
 import classnames from 'classnames';
 
 import 'react-select1/dist/react-select.css';
 import 'react-rangeslider/lib/index.css';
 
-import { CancerSummaryChart } from "./CancerSummaryChart";
-import {WindowWidthBox} from "../../../shared/components/WindowWidthBox/WindowWidthBox";
-
-export const OrderedAlterationLabelMap: Record<keyof IAlterationCountMap, string> = {
-    multiple: "Multiple Alterations",
-    protExpressionLow: "Protein Low",
-    protExpressionHigh: "Protein High",
-    mrnaExpressionLow: "mRNA Low",
-    mrnaExpressionHigh: "mRNA High",
-    hetloss: "Shallow Deletion",
-    homdel: "Deep Deletion",
-    gain: "Gain",
-    amp: "Amplification",
-    fusion: "Fusion",
-    mutated: "Mutation"
+import { CancerSummaryChart } from './CancerSummaryChart';
+import { WindowWidthBox } from '../../../shared/components/WindowWidthBox/WindowWidthBox';
+
+export const OrderedAlterationLabelMap: Record<
+    keyof IAlterationCountMap,
+    string
+> = {
+    multiple: 'Multiple Alterations',
+    protExpressionLow: 'Protein Low',
+    protExpressionHigh: 'Protein High',
+    mrnaExpressionLow: 'mRNA Low',
+    mrnaExpressionHigh: 'mRNA High',
+    hetloss: 'Shallow Deletion',
+    homdel: 'Deep Deletion',
+    gain: 'Gain',
+    amp: 'Amplification',
+    fusion: 'Fusion',
+    mutated: 'Mutation',
 };
 
-export const AlterationTypeToDataTypeLabel: {[id:string]:string} = {
-    protein: "Protein data",
-    expression: "mRNA data",
-    cna: "CNA data",
-    mutation: "Mutation data"
+export const AlterationTypeToDataTypeLabel: { [id: string]: string } = {
+    protein: 'Protein data',
+    expression: 'mRNA data',
+    cna: 'CNA data',
+    mutation: 'Mutation data',
 };
 
 const alterationToColor: Record<keyof IAlterationCountMap, string> = {
-    mutated: "#008000",
-    amp: "#ff0000",
-    homdel: "#0000ff", //"#8fd8d8" "rgb(0,0,255)",
-    hetloss: "#8fd8d8",
-    gain: "rgb(255,182,193)",
-    fusion: "#8B00C9",
-    mrnaExpressionHigh: "#FF989A",
-    mrnaExpressionLow: "#529AC8",
-    protExpressionHigh: "#FF989A",
-    protExpressionLow: "#E0FFFF",
-    multiple: "#666"
+    mutated: '#008000',
+    amp: '#ff0000',
+    homdel: '#0000ff', //"#8fd8d8" "rgb(0,0,255)",
+    hetloss: '#8fd8d8',
+    gain: 'rgb(255,182,193)',
+    fusion: '#8B00C9',
+    mrnaExpressionHigh: '#FF989A',
+    mrnaExpressionLow: '#529AC8',
+    protExpressionHigh: '#FF989A',
+    protExpressionLow: '#E0FFFF',
+    multiple: '#666',
 };
 
-
 export interface IAlterationCountMap {
     mutated: number;
     amp: number;
@@ -62,8 +64,7 @@ export interface IAlterationCountMap {
     protExpressionHigh: number;
     protExpressionLow: number;
     multiple: number;
-};
-
+}
 
 export interface IAlterationData {
     alterationTotal: number;
@@ -72,32 +73,31 @@ export interface IAlterationData {
     alteredSampleCount: number;
     parentCancerType: string;
     profiledSamplesCounts: {
-        mutation: number,
-        cna: number,
-        expression: number,
-        protein: number
-    },
+        mutation: number;
+        cna: number;
+        expression: number;
+        protein: number;
+    };
     notProfiledSamplesCounts: {
-        mutation: number,
-        cna: number,
-        expression: number,
-        protein: number
-    }
+        mutation: number;
+        cna: number;
+        expression: number;
+        protein: number;
+    };
 }
 
-
 export interface ICancerSummaryChartData {
     representedAlterations: { [alterationType: string]: boolean };
     data: {
-        x: string,
-        y: number,
-        alterationType: string
+        x: string;
+        y: number;
+        alterationType: string;
     }[][];
     alterationTypeDataCounts: {
-        x: string,
-        y: string,
-        profiledCount: number,
-        notProfiledCount: number
+        x: string;
+        y: string;
+        profiledCount: number;
+        notProfiledCount: number;
     }[];
     labels: string[];
     maxPercentage: number;
@@ -108,8 +108,8 @@ export interface ICancerSummaryChartData {
 export interface ICancerSummaryContentProps {
     labelTransformer?: (key: string) => string;
     groupedAlterationData: {
-        [groupType: string]: IAlterationData
-    }
+        [groupType: string]: IAlterationData;
+    };
     groupAlterationsBy: string;
     gene: string;
     width: number;
@@ -117,25 +117,31 @@ export interface ICancerSummaryContentProps {
 }
 
 const GroupByOptions = [
-    {value: 'studyId', label: 'Cancer Study'},
-    {value: 'cancerType', label: 'Cancer Type'},
-    {value: 'cancerTypeDetailed', label: 'Cancer Type Detailed'}
+    { value: 'studyId', label: 'Cancer Study' },
+    { value: 'cancerType', label: 'Cancer Type' },
+    { value: 'cancerTypeDetailed', label: 'Cancer Type Detailed' },
 ];
 
-export function calculatePercentage(part:number, whole:number){
-    return  (part / whole) * 100;
+export function calculatePercentage(part: number, whole: number) {
+    return (part / whole) * 100;
 }
 
 @observer
-export class CancerSummaryContent extends React.Component<ICancerSummaryContentProps, {}> {
-
+export class CancerSummaryContent extends React.Component<
+    ICancerSummaryContentProps,
+    {}
+> {
     private inputYAxisEl: any;
     private inputXAxisEl: any;
     private totalCasesMinDefaultValue = 10;
     @observable private tempAltCasesInputValue = 0;
     @observable private tempTotalCasesInputValue = this.totalCasesMin;
     @observable private pngAnchor = '';
-    @observable private pdf: { anchor: string; width: number; height: number } = {anchor: '', width: 0, height: 0};
+    @observable private pdf: {
+        anchor: string;
+        width: number;
+        height: number;
+    } = { anchor: '', width: 0, height: 0 };
     @observable private showControls = true; // 9/2018 we will always show controls
     @observable private hideGenomicAlterations = false;
     @observable public yAxis: 'alt-freq' | 'abs-count' = 'alt-freq';
@@ -150,16 +156,26 @@ export class CancerSummaryContent extends React.Component<ICancerSummaryContentP
         super(props);
         this.handleYAxisChange = this.handleYAxisChange.bind(this);
         this.handleXAxisChange = this.handleXAxisChange.bind(this);
-        this.handleGenomicCheckboxChange = this.handleGenomicCheckboxChange.bind(this);
-        this.handleCancerTypeCheckboxChange = this.handleCancerTypeCheckboxChange.bind(this);
+        this.handleGenomicCheckboxChange = this.handleGenomicCheckboxChange.bind(
+            this
+        );
+        this.handleCancerTypeCheckboxChange = this.handleCancerTypeCheckboxChange.bind(
+            this
+        );
         this.handleAltSliderChange = this.handleAltSliderChange.bind(this);
         this.handleTotalSliderChange = this.handleTotalSliderChange.bind(this);
-        this.handleAltSliderChangeComplete = this.handleAltSliderChangeComplete.bind(this);
-        this.handleTotalSliderChangeComplete = this.handleTotalSliderChangeComplete.bind(this);
+        this.handleAltSliderChangeComplete = this.handleAltSliderChangeComplete.bind(
+            this
+        );
+        this.handleTotalSliderChangeComplete = this.handleTotalSliderChangeComplete.bind(
+            this
+        );
         this.handleAltInputChange = this.handleAltInputChange.bind(this);
         this.handleAltInputKeyPress = this.handleAltInputKeyPress.bind(this);
         this.handleTotalInputChange = this.handleTotalInputChange.bind(this);
-        this.handleTotalInputKeyPress = this.handleTotalInputKeyPress.bind(this);
+        this.handleTotalInputKeyPress = this.handleTotalInputKeyPress.bind(
+            this
+        );
         //this.toggleShowControls = this.toggleShowControls.bind(this);
         this.setPngAnchor = this.setPngAnchor.bind(this);
     }
@@ -169,7 +185,7 @@ export class CancerSummaryContent extends React.Component<ICancerSummaryContentP
         this.initializeSliderValue();
     }
 
-    private chartComponent:any;
+    private chartComponent: any;
 
     get countsData() {
         return this.props.groupedAlterationData;
@@ -185,138 +201,237 @@ export class CancerSummaryContent extends React.Component<ICancerSummaryContentP
         return groupKeysSorted;
     }
 
-    public getYValue(count:number, total:number) {
-        return (this.yAxis === "abs-count") ? count : (count / total) * 100;
+    public getYValue(count: number, total: number) {
+        return this.yAxis === 'abs-count' ? count : (count / total) * 100;
     }
 
-    determineSorterAndDirection(): { sorter:(item:any)=>number|string, dir:'asc'| 'desc' } {
-        const sortByPercentage = (key:string) => {
+    determineSorterAndDirection(): {
+        sorter: (item: any) => number | string;
+        dir: 'asc' | 'desc';
+    } {
+        const sortByPercentage = (key: string) => {
             const alterationCountsData: IAlterationData = this.countsData[key];
-            return alterationCountsData.alteredSampleCount / alterationCountsData.profiledSampleTotal;
+            return (
+                alterationCountsData.alteredSampleCount /
+                alterationCountsData.profiledSampleTotal
+            );
         };
-        const sortByAbsoluteCount = (key:string) => {
+        const sortByAbsoluteCount = (key: string) => {
             const alterationCountsData: IAlterationData = this.countsData[key];
-            return alterationCountsData.alteredSampleCount
+            return alterationCountsData.alteredSampleCount;
         };
-        const sortByLabel = (key:string) => {
+        const sortByLabel = (key: string) => {
             return key;
-        }
+        };
         let sorter;
         let dir: 'asc' | 'desc';
         if (this.xAxis === 'x-axis') {
             sorter = sortByLabel;
             dir = 'asc' as 'asc';
         } else {
-            sorter = (this.yAxis === "abs-count") ? sortByAbsoluteCount : sortByPercentage;
+            sorter =
+                this.yAxis === 'abs-count'
+                    ? sortByAbsoluteCount
+                    : sortByPercentage;
             dir = 'desc' as 'desc';
         }
         return { sorter, dir };
     }
 
     @computed get alterationTypeDataCounts() {
-        const scatterPlotData: { x: string, y: string, profiledCount: number, notProfiledCount: number }[] = [];
+        const scatterPlotData: {
+            x: string;
+            y: string;
+            profiledCount: number;
+            notProfiledCount: number;
+        }[] = [];
         _.forEach(this.groupKeysSorted, groupKey => {
             const alterationData = this.countsData[groupKey];
-            const totalProfiledSamplesCount = _.chain(alterationData.profiledSamplesCounts as any).values().sum().value();
-            const alterationPercentage = calculatePercentage(alterationData.alteredSampleCount, alterationData.profiledSampleTotal);;
+            const totalProfiledSamplesCount = _.chain(
+                alterationData.profiledSamplesCounts as any
+            )
+                .values()
+                .sum()
+                .value();
+            const alterationPercentage = calculatePercentage(
+                alterationData.alteredSampleCount,
+                alterationData.profiledSampleTotal
+            );
 
             let meetsAlterationThreshold;
-            if (this.yAxis === "abs-count") {
-                meetsAlterationThreshold = alterationData.alteredSampleCount >= this.tempAltCasesValue;
+            if (this.yAxis === 'abs-count') {
+                meetsAlterationThreshold =
+                    alterationData.alteredSampleCount >= this.tempAltCasesValue;
             } else {
-                meetsAlterationThreshold = alterationPercentage >= this.tempAltCasesValue;
+                meetsAlterationThreshold =
+                    alterationPercentage >= this.tempAltCasesValue;
             }
 
-            const meetsSampleTotalThreshold = alterationData.profiledSampleTotal >= this.totalCasesValue;
+            const meetsSampleTotalThreshold =
+                alterationData.profiledSampleTotal >= this.totalCasesValue;
 
             // if we don't meet the threshold set by the user in the custom controls, don't put data in (default 0)
             //hide scatter point if there are no profiled samples in the group
-            if (totalProfiledSamplesCount > 0 && meetsAlterationThreshold && meetsSampleTotalThreshold) {
-                _.forEach(_.keys(AlterationTypeToDataTypeLabel), alterationType => {
-                    const profiledCount = (alterationData.profiledSamplesCounts as any)[alterationType];
-                    const notProfiledCount = (alterationData.notProfiledSamplesCounts as any)[alterationType];
-                    if ((profiledCount + notProfiledCount) > 0) {
-                        scatterPlotData.push({
-                            x: (this.props.labelTransformer) ? this.props.labelTransformer(groupKey) : groupKey,
-                            y: AlterationTypeToDataTypeLabel[alterationType],
-                            profiledCount,
-                            notProfiledCount
-                        });
+            if (
+                totalProfiledSamplesCount > 0 &&
+                meetsAlterationThreshold &&
+                meetsSampleTotalThreshold
+            ) {
+                _.forEach(
+                    _.keys(AlterationTypeToDataTypeLabel),
+                    alterationType => {
+                        const profiledCount = (alterationData.profiledSamplesCounts as any)[
+                            alterationType
+                        ];
+                        const notProfiledCount = (alterationData.notProfiledSamplesCounts as any)[
+                            alterationType
+                        ];
+                        if (profiledCount + notProfiledCount > 0) {
+                            scatterPlotData.push({
+                                x: this.props.labelTransformer
+                                    ? this.props.labelTransformer(groupKey)
+                                    : groupKey,
+                                y:
+                                    AlterationTypeToDataTypeLabel[
+                                        alterationType
+                                    ],
+                                profiledCount,
+                                notProfiledCount,
+                            });
+                        }
                     }
-                });
+                );
             }
         });
         return scatterPlotData;
     }
 
     @computed
-    get chartData(): ICancerSummaryChartData  {
-
-        const representedAlterations: { [alterationType: string]: boolean } = {};
+    get chartData(): ICancerSummaryChartData {
+        const representedAlterations: {
+            [alterationType: string]: boolean;
+        } = {};
 
         let maxPercentage = 0;
         let maxAbsoluteCount = 0;
         let maxSampleCount = 0;
 
-        const labels:string[] = [];
+        const labels: string[] = [];
 
         // for each alteration type stack, we need the collection of different group types
-        const retData = _.map(OrderedAlterationLabelMap, (alterationLabel, alterationKey) => {
-            return _.reduce(this.groupKeysSorted, (memo, groupKey) => {
-                // each of these represents a bucket along x-axis (e.g. cancer type or cancer study)
-                const alterationData = this.countsData[groupKey];
-                const totalProfiledSamplesCount = _.chain(alterationData.profiledSamplesCounts as any).values().sum().value();
-
-                const alterationPercentage = calculatePercentage(alterationData.alteredSampleCount,alterationData.profiledSampleTotal);;
-
-                    let meetsAlterationThreshold;
-    
-                    if (this.yAxis === "abs-count") {
-                        meetsAlterationThreshold = alterationData.alteredSampleCount >= this.tempAltCasesValue;
-                    } else {
-                        meetsAlterationThreshold = alterationPercentage >= this.tempAltCasesValue;
-                    }
-    
-                    const meetsSampleTotalThreshold = alterationData.profiledSampleTotal >= this.totalCasesValue;
-
-                //hide bar if there are no profiled samples in the group
-                if(totalProfiledSamplesCount > 0 && meetsAlterationThreshold && meetsSampleTotalThreshold) {
-                    // if we don't meet the threshold set by the user in the custom controls, don't put data in (default 0)
-                    // now we push label into collection
-                    const label = this.props.labelTransformer ? this.props.labelTransformer(groupKey) : groupKey;
-                    labels.push(label);
-
-                    // update maxes if item exceeds memoized
-                    maxPercentage = (alterationPercentage > maxPercentage) ? alterationPercentage : maxPercentage;
-                    maxAbsoluteCount = (alterationData.alteredSampleCount > maxAbsoluteCount) ? alterationData.alteredSampleCount : maxAbsoluteCount;
-                    maxSampleCount = (alterationData.profiledSampleTotal > maxSampleCount) ? alterationData.profiledSampleTotal : maxSampleCount;
-
-                    const alterationCount = (alterationData.alterationTypeCounts as any)[alterationKey];
-
-                    // we want to keep track of what alterationTypes are actually
-                    // present in this dataset
-                    if (alterationCount > 0) {
-                        representedAlterations[alterationKey] = true;
-                    }
-
-                    memo.push({
-                        alterationType: alterationKey,
-                        x: label,
-                        xKey: groupKey,
-                        y: this.getYValue(alterationCount, alterationData.profiledSampleTotal)
-                    });
-                }
-
-                return memo;
-            }, [] as { x: string, y: number, xKey:string, alterationType: string }[]);
-        });
+        const retData = _.map(
+            OrderedAlterationLabelMap,
+            (alterationLabel, alterationKey) => {
+                return _.reduce(
+                    this.groupKeysSorted,
+                    (memo, groupKey) => {
+                        // each of these represents a bucket along x-axis (e.g. cancer type or cancer study)
+                        const alterationData = this.countsData[groupKey];
+                        const totalProfiledSamplesCount = _.chain(
+                            alterationData.profiledSamplesCounts as any
+                        )
+                            .values()
+                            .sum()
+                            .value();
+
+                        const alterationPercentage = calculatePercentage(
+                            alterationData.alteredSampleCount,
+                            alterationData.profiledSampleTotal
+                        );
+
+                        let meetsAlterationThreshold;
+
+                        if (this.yAxis === 'abs-count') {
+                            meetsAlterationThreshold =
+                                alterationData.alteredSampleCount >=
+                                this.tempAltCasesValue;
+                        } else {
+                            meetsAlterationThreshold =
+                                alterationPercentage >= this.tempAltCasesValue;
+                        }
+
+                        const meetsSampleTotalThreshold =
+                            alterationData.profiledSampleTotal >=
+                            this.totalCasesValue;
+
+                        //hide bar if there are no profiled samples in the group
+                        if (
+                            totalProfiledSamplesCount > 0 &&
+                            meetsAlterationThreshold &&
+                            meetsSampleTotalThreshold
+                        ) {
+                            // if we don't meet the threshold set by the user in the custom controls, don't put data in (default 0)
+                            // now we push label into collection
+                            const label = this.props.labelTransformer
+                                ? this.props.labelTransformer(groupKey)
+                                : groupKey;
+                            labels.push(label);
+
+                            // update maxes if item exceeds memoized
+                            maxPercentage =
+                                alterationPercentage > maxPercentage
+                                    ? alterationPercentage
+                                    : maxPercentage;
+                            maxAbsoluteCount =
+                                alterationData.alteredSampleCount >
+                                maxAbsoluteCount
+                                    ? alterationData.alteredSampleCount
+                                    : maxAbsoluteCount;
+                            maxSampleCount =
+                                alterationData.profiledSampleTotal >
+                                maxSampleCount
+                                    ? alterationData.profiledSampleTotal
+                                    : maxSampleCount;
+
+                            const alterationCount = (alterationData.alterationTypeCounts as any)[
+                                alterationKey
+                            ];
+
+                            // we want to keep track of what alterationTypes are actually
+                            // present in this dataset
+                            if (alterationCount > 0) {
+                                representedAlterations[alterationKey] = true;
+                            }
+
+                            memo.push({
+                                alterationType: alterationKey,
+                                x: label,
+                                xKey: groupKey,
+                                y: this.getYValue(
+                                    alterationCount,
+                                    alterationData.profiledSampleTotal
+                                ),
+                            });
+                        }
+
+                        return memo;
+                    },
+                    [] as {
+                        x: string;
+                        y: number;
+                        xKey: string;
+                        alterationType: string;
+                    }[]
+                );
+            }
+        );
 
-        return { labels: _.uniq(labels), data: retData, alterationTypeDataCounts: this.alterationTypeDataCounts, representedAlterations, maxPercentage, maxAbsoluteCount, maxSampleCount };
+        return {
+            labels: _.uniq(labels),
+            data: retData,
+            alterationTypeDataCounts: this.alterationTypeDataCounts,
+            representedAlterations,
+            maxPercentage,
+            maxAbsoluteCount,
+            maxSampleCount,
+        };
     }
 
     @computed
     public get altCasesMax() {
-        return (this.yAxis === "abs-count") ? this.chartData.maxAbsoluteCount : this.chartData.maxPercentage;
+        return this.yAxis === 'abs-count'
+            ? this.chartData.maxAbsoluteCount
+            : this.chartData.maxPercentage;
     }
 
     @computed
@@ -335,9 +450,15 @@ export class CancerSummaryContent extends React.Component<ICancerSummaryContentP
 
     @computed
     private get hasAlterations() {
-        return _.reduce(this.countsData, (count, alterationData: IAlterationData) => {
-            return count + alterationData.alterationTotal;
-        }, 0) > 0;
+        return (
+            _.reduce(
+                this.countsData,
+                (count, alterationData: IAlterationData) => {
+                    return count + alterationData.alterationTotal;
+                },
+                0
+            ) > 0
+        );
     }
 
     @computed
@@ -358,7 +479,7 @@ export class CancerSummaryContent extends React.Component<ICancerSummaryContentP
     @computed
     private get showStudyTooltipLinks(): boolean {
         return (
-            this.props.groupAlterationsBy === "studyId" &&
+            this.props.groupAlterationsBy === 'studyId' &&
             this.chartData.labels.length > 1
         );
     }
@@ -382,7 +503,8 @@ export class CancerSummaryContent extends React.Component<ICancerSummaryContentP
     }
 
     private handleCancerTypeCheckboxChange() {
-        this.viewCountsByCancerSubType = (this.viewCountsByCancerSubType === false);
+        this.viewCountsByCancerSubType =
+            this.viewCountsByCancerSubType === false;
     }
 
     private handleGenomicCheckboxChange() {
@@ -422,7 +544,9 @@ export class CancerSummaryContent extends React.Component<ICancerSummaryContentP
                 this.tempTotalCasesValue = this.totalCasesMax;
             } else {
                 //removes leading 0s
-                this.tempTotalCasesInputValue = Number(this.tempTotalCasesInputValue);
+                this.tempTotalCasesInputValue = Number(
+                    this.tempTotalCasesInputValue
+                );
                 this.tempTotalCasesValue = this.tempTotalCasesInputValue;
             }
             this.handleTotalSliderChangeComplete();
@@ -459,24 +583,29 @@ export class CancerSummaryContent extends React.Component<ICancerSummaryContentP
         this.pngAnchor = href;
     }
 
-    @computed public get controls(){
-
+    @computed public get controls() {
         const symbol = this.yAxis === 'alt-freq' ? '%' : '';
 
         return (
-
             <div className="cancer-summary--form-controls">
-
                 <table>
                     <tr>
                         <td>
                             <ControlLabel>Y-Axis Value:</ControlLabel>
                         </td>
                         <td className="dashed-border-right">
-                            <FormControl componentClass="select" data-test="cancerSummaryYAxisSelect" onChange={this.handleYAxisChange}
-                                         ref={(el: any) => this.inputYAxisEl = el}>
-                                <option value="alt-freq">Alteration Frequency</option>
-                                <option value="abs-count">Absolute Counts</option>
+                            <FormControl
+                                componentClass="select"
+                                data-test="cancerSummaryYAxisSelect"
+                                onChange={this.handleYAxisChange}
+                                ref={(el: any) => (this.inputYAxisEl = el)}
+                            >
+                                <option value="alt-freq">
+                                    Alteration Frequency
+                                </option>
+                                <option value="abs-count">
+                                    Absolute Counts
+                                </option>
                             </FormControl>
                         </td>
                         <td>
@@ -484,125 +613,206 @@ export class CancerSummaryContent extends React.Component<ICancerSummaryContentP
                         </td>
                         <td>
                             <div className="slider-holder">
-                                <div className='slider custom-labels'>
+                                <div className="slider custom-labels">
                                     <Slider
                                         min={0}
                                         max={this.totalCasesMax}
                                         value={this.tempTotalCasesValue}
-                                        labels={{0: 0, [this.totalCasesMax]: this.totalCasesMax}}
+                                        labels={{
+                                            0: 0,
+                                            [this.totalCasesMax]: this
+                                                .totalCasesMax,
+                                        }}
                                         onChange={this.handleTotalSliderChange}
-                                        onChangeComplete={this.handleTotalSliderChangeComplete}
+                                        onChangeComplete={
+                                            this.handleTotalSliderChangeComplete
+                                        }
                                     />
                                 </div>
                             </div>
                         </td>
-                        <td className={classnames(this.totalCaseChanged ? "highlightInput" : "" , "dashed-border-right" , "slider-input")}>
-                            <FormControl type="text" value={this.tempTotalCasesInputValue}
-                                         data-test="sampleTotalThresholdInput"
-                                         onChange={this.handleTotalInputChange}
-                                         onKeyPress={this.handleTotalInputKeyPress}/>
+                        <td
+                            className={classnames(
+                                this.totalCaseChanged ? 'highlightInput' : '',
+                                'dashed-border-right',
+                                'slider-input'
+                            )}
+                        >
+                            <FormControl
+                                type="text"
+                                value={this.tempTotalCasesInputValue}
+                                data-test="sampleTotalThresholdInput"
+                                onChange={this.handleTotalInputChange}
+                                onKeyPress={this.handleTotalInputKeyPress}
+                            />
                         </td>
                         <td>
-                            <Checkbox checked={!this.hideGenomicAlterations} onChange={this.handleGenomicCheckboxChange}>
+                            <Checkbox
+                                checked={!this.hideGenomicAlterations}
+                                onChange={this.handleGenomicCheckboxChange}
+                            >
                                 Show Genomic Alteration Types
                             </Checkbox>
                         </td>
                     </tr>
                     <tr>
-                        <td><ControlLabel>Sort X-Axis By:</ControlLabel></td>
+                        <td>
+                            <ControlLabel>Sort X-Axis By:</ControlLabel>
+                        </td>
                         <td className="dashed-border-right">
-                            <FormControl componentClass="select" data-test="cancerSummaryXAxisSelect" onChange={this.handleXAxisChange}
-                                         ref={(el: any) => this.inputXAxisEl = el}>
+                            <FormControl
+                                componentClass="select"
+                                data-test="cancerSummaryXAxisSelect"
+                                onChange={this.handleXAxisChange}
+                                ref={(el: any) => (this.inputXAxisEl = el)}
+                            >
                                 <option value="y-axis">Y-Axis Values</option>
                                 <option value="x-axis">Alphabetically</option>
                             </FormControl>
                         </td>
                         <td>
-                            <ControlLabel>{`Min. ${this.yAxis === 'alt-freq' ? '%' : '#'} Altered Cases:`}</ControlLabel>
+                            <ControlLabel>{`Min. ${
+                                this.yAxis === 'alt-freq' ? '%' : '#'
+                            } Altered Cases:`}</ControlLabel>
                         </td>
                         <td>
                             <div className="slider-holder">
-                                <div className='slider custom-labels'>
+                                <div className="slider custom-labels">
                                     <Slider
                                         min={0}
                                         max={this.altCasesMax}
                                         value={this.tempAltCasesValue}
-                                        labels={{0: 0 + symbol, [this.altCasesMax]: Math.ceil(this.altCasesMax) + symbol}}
+                                        labels={{
+                                            0: 0 + symbol,
+                                            [this.altCasesMax]:
+                                                Math.ceil(this.altCasesMax) +
+                                                symbol,
+                                        }}
                                         format={(val: string) => val + symbol}
                                         onChange={this.handleAltSliderChange}
-                                        onChangeComplete={this.handleAltSliderChangeComplete}
+                                        onChangeComplete={
+                                            this.handleAltSliderChangeComplete
+                                        }
                                     />
                                 </div>
                             </div>
                         </td>
-                        <td className={classnames(this.altCaseChanged ? "highlightInput" : "" , "dashed-border-right" , "slider-input")}>
-                            <FormControl type="text" value={this.tempAltCasesInputValue + symbol}
-                                         onChange={this.handleAltInputChange}
-                                         data-test="alterationThresholdInput"
-                                         onKeyPress={this.handleAltInputKeyPress}/>
+                        <td
+                            className={classnames(
+                                this.altCaseChanged ? 'highlightInput' : '',
+                                'dashed-border-right',
+                                'slider-input'
+                            )}
+                        >
+                            <FormControl
+                                type="text"
+                                value={this.tempAltCasesInputValue + symbol}
+                                onChange={this.handleAltInputChange}
+                                data-test="alterationThresholdInput"
+                                onKeyPress={this.handleAltInputKeyPress}
+                            />
                         </td>
                     </tr>
                 </table>
-            </div>)
+            </div>
+        );
     }
 
     public render() {
         return (
             <WindowWidthBox offset={60}>
-            <If condition={this.hasAlterations}>
-                <Then>
-                    <div data-test="cancerTypesSummaryDiv">
-
-                        <div className={'cancer-summary--main-options'}>
-
-                            <ButtonGroup>
-                                {
-                                    GroupByOptions.map((option, i) => {
-                                        return <Radio
-                                            checked={option.value === this.props.groupAlterationsBy}
-                                            onChange={(e) => {
-                                                this.initializeSliderValue();
-                                                this.props.handlePivotChange($(e.target).attr("data-value"));
-                                            }}
-                                            inline
-                                            data-value={option.value}
-                                        >{option.label}</Radio>
-                                    })
-                                }
-                            </ButtonGroup>
-                        </div>
+                <If condition={this.hasAlterations}>
+                    <Then>
+                        <div data-test="cancerTypesSummaryDiv">
+                            <div className={'cancer-summary--main-options'}>
+                                <ButtonGroup>
+                                    {GroupByOptions.map((option, i) => {
+                                        return (
+                                            <Radio
+                                                checked={
+                                                    option.value ===
+                                                    this.props
+                                                        .groupAlterationsBy
+                                                }
+                                                onChange={e => {
+                                                    this.initializeSliderValue();
+                                                    this.props.handlePivotChange(
+                                                        $(e.target).attr(
+                                                            'data-value'
+                                                        )
+                                                    );
+                                                }}
+                                                inline
+                                                data-value={option.value}
+                                            >
+                                                {option.label}
+                                            </Radio>
+                                        );
+                                    })}
+                                </ButtonGroup>
+                            </div>
 
-                        <div className={classnames("inlineBlock",{hidden: !this.showControls}, 'cancer-summary-secondary-options')}>
-                            {/*<button type="button" onClick={this.toggleShowControls} className="close">×</button>*/}
-                            {this.controls}
-                        </div>
+                            <div
+                                className={classnames(
+                                    'inlineBlock',
+                                    { hidden: !this.showControls },
+                                    'cancer-summary-secondary-options'
+                                )}
+                            >
+                                {/*<button type="button" onClick={this.toggleShowControls} className="close">×</button>*/}
+                                {this.controls}
+                            </div>
 
-                        <div className={classnames("alert" , "alert-success", {hidden: !this.totalCaseChanged && !this.altCaseChanged})}>
-                            <span style={{verticalAlign:"middle"}}>
-                                {`${this.chartData.labels.length} of ${this.groupKeysSorted.length} categories (${_.keyBy(GroupByOptions, "value")[this.props.groupAlterationsBy].label}) are shown based on filtering.`}
-                            </span>
+                            <div
+                                className={classnames(
+                                    'alert',
+                                    'alert-success',
+                                    {
+                                        hidden:
+                                            !this.totalCaseChanged &&
+                                            !this.altCaseChanged,
+                                    }
+                                )}
+                            >
+                                <span style={{ verticalAlign: 'middle' }}>
+                                    {`${this.chartData.labels.length} of ${
+                                        this.groupKeysSorted.length
+                                    } categories (${
+                                        _.keyBy(GroupByOptions, 'value')[
+                                            this.props.groupAlterationsBy
+                                        ].label
+                                    }) are shown based on filtering.`}
+                                </span>
+                            </div>
+                            <CancerSummaryChart
+                                gene={this.props.gene}
+                                key={Date.now()}
+                                data={this.chartData.data}
+                                alterationTypeDataCounts={
+                                    this.chartData.alterationTypeDataCounts
+                                }
+                                ref={(el: any) => (this.chartComponent = el)}
+                                countsByGroup={this.countsData}
+                                representedAlterations={
+                                    this.chartData.representedAlterations
+                                }
+                                alterationTypes={OrderedAlterationLabelMap}
+                                isPercentage={this.yAxis === 'alt-freq'}
+                                showLinks={this.showStudyTooltipLinks}
+                                colors={alterationToColor}
+                                hideGenomicAlterations={
+                                    this.hideGenomicAlterations
+                                }
+                                xLabels={this.chartData.labels}
+                            />
+                        </div>
+                    </Then>
+                    <Else>
+                        <div className="alert alert-info">
+                            There are no alterations in this gene.
                         </div>
-                        <CancerSummaryChart
-                            gene={this.props.gene}
-                            key={Date.now()}
-                            data={this.chartData.data}
-                            alterationTypeDataCounts={this.chartData.alterationTypeDataCounts}
-                            ref={(el:any)=>this.chartComponent = el}
-                            countsByGroup={this.countsData}
-                            representedAlterations={this.chartData.representedAlterations}
-                            alterationTypes={OrderedAlterationLabelMap}
-                            isPercentage={(this.yAxis === "alt-freq")}
-                            showLinks={this.showStudyTooltipLinks}
-                            colors={alterationToColor}
-                            hideGenomicAlterations={this.hideGenomicAlterations}
-                            xLabels={this.chartData.labels}/>
-
-                    </div>
-                </Then>
-                <Else>
-                    <div className="alert alert-info">There are no alterations in this gene.</div>
-                </Else>
-            </If>
+                    </Else>
+                </If>
             </WindowWidthBox>
         );
     }
diff --git a/src/pages/resultsView/cancerSummary/mockPropsforCancerSummaryContainer.ts b/src/pages/resultsView/cancerSummary/mockPropsforCancerSummaryContainer.ts
index e4064618698..6f36c6f2071 100644
--- a/src/pages/resultsView/cancerSummary/mockPropsforCancerSummaryContainer.ts
+++ b/src/pages/resultsView/cancerSummary/mockPropsforCancerSummaryContainer.ts
@@ -1,662 +1,716 @@
 export const mockPropsForCancerSummaryContainer = {
-    "samplesExtendedWithClinicalData": [{
-        "uniqueSampleKey": "QjA4NTpjaG9sX251c18yMDEy",
-        "uniquePatientKey": "QjA4NTpjaG9sX251c18yMDEy",
-        "sampleType": "Primary Solid Tumor",
-        "sampleId": "B085",
-        "patientId": "B085",
-        "cancerTypeId": "chol",
-        "studyId": "chol_nus_2012",
-        "cancerType": "Hepatobiliary Cancer",
-        "cancerTypeDetailed": "Cholangiocarcinoma"
-    }, {
-        "uniqueSampleKey": "QjA5OTpjaG9sX251c18yMDEy",
-        "uniquePatientKey": "QjA5OTpjaG9sX251c18yMDEy",
-        "sampleType": "Primary Solid Tumor",
-        "sampleId": "B099",
-        "patientId": "B099",
-        "cancerTypeId": "chol",
-        "studyId": "chol_nus_2012",
-        "cancerType": "Hepatobiliary Cancer",
-        "cancerTypeDetailed": "Cholangiocarcinoma"
-    }, {
-        "uniqueSampleKey": "UjEwNDpjaG9sX251c18yMDEy",
-        "uniquePatientKey": "UjEwNDpjaG9sX251c18yMDEy",
-        "sampleType": "Primary Solid Tumor",
-        "sampleId": "R104",
-        "patientId": "R104",
-        "cancerTypeId": "chol",
-        "studyId": "chol_nus_2012",
-        "cancerType": "Hepatobiliary Cancer",
-        "cancerTypeDetailed": "Cholangiocarcinoma"
-    }, {
-        "uniqueSampleKey": "VDAyNjpjaG9sX251c18yMDEy",
-        "uniquePatientKey": "VDAyNjpjaG9sX251c18yMDEy",
-        "sampleType": "Primary Solid Tumor",
-        "sampleId": "T026",
-        "patientId": "T026",
-        "cancerTypeId": "chol",
-        "studyId": "chol_nus_2012",
-        "cancerType": "Hepatobiliary Cancer",
-        "cancerTypeDetailed": "Cholangiocarcinoma"
-    }, {
-        "uniqueSampleKey": "VTA0NDpjaG9sX251c18yMDEy",
-        "uniquePatientKey": "VTA0NDpjaG9sX251c18yMDEy",
-        "sampleType": "Primary Solid Tumor",
-        "sampleId": "U044",
-        "patientId": "U044",
-        "cancerTypeId": "chol",
-        "studyId": "chol_nus_2012",
-        "cancerType": "Hepatobiliary Cancer",
-        "cancerTypeDetailed": "Cholangiocarcinoma"
-    }, {
-        "uniqueSampleKey": "VzAxMjpjaG9sX251c18yMDEy",
-        "uniquePatientKey": "VzAxMjpjaG9sX251c18yMDEy",
-        "sampleType": "Primary Solid Tumor",
-        "sampleId": "W012",
-        "patientId": "W012",
-        "cancerTypeId": "chol",
-        "studyId": "chol_nus_2012",
-        "cancerType": "Hepatobiliary Cancer",
-        "cancerTypeDetailed": "Cholangiocarcinoma"
-    }, {
-        "uniqueSampleKey": "VzAzOTpjaG9sX251c18yMDEy",
-        "uniquePatientKey": "VzAzOTpjaG9sX251c18yMDEy",
-        "sampleType": "Primary Solid Tumor",
-        "sampleId": "W039",
-        "patientId": "W039",
-        "cancerTypeId": "chol",
-        "studyId": "chol_nus_2012",
-        "cancerType": "Hepatobiliary Cancer",
-        "cancerTypeDetailed": "Cholangiocarcinoma"
-    }, {
-        "uniqueSampleKey": "VzA0MDpjaG9sX251c18yMDEy",
-        "uniquePatientKey": "VzA0MDpjaG9sX251c18yMDEy",
-        "sampleType": "Primary Solid Tumor",
-        "sampleId": "W040",
-        "patientId": "W040",
-        "cancerTypeId": "chol",
-        "studyId": "chol_nus_2012",
-        "cancerType": "Hepatobiliary Cancer",
-        "cancerTypeDetailed": "Cholangiocarcinoma"
-    }, {
-        "uniqueSampleKey": "UGFuTkVUMTBQVDpwYW5ldF9qaHVfMjAxMQ",
-        "uniquePatientKey": "UEVOMTA6cGFuZXRfamh1XzIwMTE",
-        "sampleType": "Primary Solid Tumor",
-        "sampleId": "PanNET10PT",
-        "patientId": "PEN10",
-        "cancerTypeId": "panet",
-        "studyId": "panet_jhu_2011",
-        "cancerType": "Pancreatic Cancer",
-        "cancerTypeDetailed": "Pancreatic Neuroendocrine Tumor"
-    }, {
-        "uniqueSampleKey": "UGFuTkVUMjFQVDpwYW5ldF9qaHVfMjAxMQ",
-        "uniquePatientKey": "UEVOMjE6cGFuZXRfamh1XzIwMTE",
-        "sampleType": "Primary Solid Tumor",
-        "sampleId": "PanNET21PT",
-        "patientId": "PEN21",
-        "cancerTypeId": "panet",
-        "studyId": "panet_jhu_2011",
-        "cancerType": "Pancreatic Cancer",
-        "cancerTypeDetailed": "Pancreatic Neuroendocrine Tumor"
-    }, {
-        "uniqueSampleKey": "UGFuTkVUMjNQVDpwYW5ldF9qaHVfMjAxMQ",
-        "uniquePatientKey": "UEVOMjM6cGFuZXRfamh1XzIwMTE",
-        "sampleType": "Primary Solid Tumor",
-        "sampleId": "PanNET23PT",
-        "patientId": "PEN23",
-        "cancerTypeId": "panet",
-        "studyId": "panet_jhu_2011",
-        "cancerType": "Pancreatic Cancer",
-        "cancerTypeDetailed": "Pancreatic Neuroendocrine Tumor"
-    }, {
-        "uniqueSampleKey": "UGFuTkVUMjRQVDpwYW5ldF9qaHVfMjAxMQ",
-        "uniquePatientKey": "UEVOMjQ6cGFuZXRfamh1XzIwMTE",
-        "sampleType": "Primary Solid Tumor",
-        "sampleId": "PanNET24PT",
-        "patientId": "PEN24",
-        "cancerTypeId": "panet",
-        "studyId": "panet_jhu_2011",
-        "cancerType": "Pancreatic Cancer",
-        "cancerTypeDetailed": "Pancreatic Neuroendocrine Tumor"
-    }, {
-        "uniqueSampleKey": "UGFuTkVUMjVQVDpwYW5ldF9qaHVfMjAxMQ",
-        "uniquePatientKey": "UEVOMjU6cGFuZXRfamh1XzIwMTE",
-        "sampleType": "Primary Solid Tumor",
-        "sampleId": "PanNET25PT",
-        "patientId": "PEN25",
-        "cancerTypeId": "panet",
-        "studyId": "panet_jhu_2011",
-        "cancerType": "Pancreatic Cancer",
-        "cancerTypeDetailed": "Pancreatic Neuroendocrine Tumor"
-    }, {
-        "uniqueSampleKey": "UGFuTkVUM1BUOnBhbmV0X2podV8yMDEx",
-        "uniquePatientKey": "UEVOMzpwYW5ldF9qaHVfMjAxMQ",
-        "sampleType": "Primary Solid Tumor",
-        "sampleId": "PanNET3PT",
-        "patientId": "PEN3",
-        "cancerTypeId": "panet",
-        "studyId": "panet_jhu_2011",
-        "cancerType": "Pancreatic Cancer",
-        "cancerTypeDetailed": "Pancreatic Neuroendocrine Tumor"
-    }, {
-        "uniqueSampleKey": "UGFuTkVUMzFQVDpwYW5ldF9qaHVfMjAxMQ",
-        "uniquePatientKey": "UEVOMzE6cGFuZXRfamh1XzIwMTE",
-        "sampleType": "Primary Solid Tumor",
-        "sampleId": "PanNET31PT",
-        "patientId": "PEN31",
-        "cancerTypeId": "panet",
-        "studyId": "panet_jhu_2011",
-        "cancerType": "Pancreatic Cancer",
-        "cancerTypeDetailed": "Pancreatic Neuroendocrine Tumor"
-    }, {
-        "uniqueSampleKey": "UGFuTkVUMzZQVDpwYW5ldF9qaHVfMjAxMQ",
-        "uniquePatientKey": "UEVOMzY6cGFuZXRfamh1XzIwMTE",
-        "sampleType": "Primary Solid Tumor",
-        "sampleId": "PanNET36PT",
-        "patientId": "PEN36",
-        "cancerTypeId": "panet",
-        "studyId": "panet_jhu_2011",
-        "cancerType": "Pancreatic Cancer",
-        "cancerTypeDetailed": "Pancreatic Neuroendocrine Tumor"
-    }, {
-        "uniqueSampleKey": "UGFuTkVUN1BUOnBhbmV0X2podV8yMDEx",
-        "uniquePatientKey": "UEVONzpwYW5ldF9qaHVfMjAxMQ",
-        "sampleType": "Primary Solid Tumor",
-        "sampleId": "PanNET7PT",
-        "patientId": "PEN7",
-        "cancerTypeId": "panet",
-        "studyId": "panet_jhu_2011",
-        "cancerType": "Pancreatic Cancer",
-        "cancerTypeDetailed": "Pancreatic Neuroendocrine Tumor"
-    }, {
-        "uniqueSampleKey": "UGFuTkVUOTNQVDpwYW5ldF9qaHVfMjAxMQ",
-        "uniquePatientKey": "UEVOOTM6cGFuZXRfamh1XzIwMTE",
-        "sampleType": "Primary Solid Tumor",
-        "sampleId": "PanNET93PT",
-        "patientId": "PEN93",
-        "cancerTypeId": "panet",
-        "studyId": "panet_jhu_2011",
-        "cancerType": "Pancreatic Cancer",
-        "cancerTypeDetailed": "Pancreatic Neuroendocrine Tumor"
-    }],
-    "alterationsByGeneBySampleKey": {
-        "KRAS": {
-            "UjEwNDpjaG9sX251c18yMDEy": [{
-                "uniqueSampleKey": "UjEwNDpjaG9sX251c18yMDEy",
-                "uniquePatientKey": "UjEwNDpjaG9sX251c18yMDEy",
-                "molecularProfileId": "chol_nus_2012_mutations",
-                "sampleId": "R104",
-                "patientId": "R104",
-                "entrezGeneId": 3845,
-                "gene": {
-                    "entrezGeneId": 3845,
-                    "hugoGeneSymbol": "KRAS",
-                    "type": "protein-coding",
-                    "cytoband": "12p12.1",
-                    "length": 47305,
-                    "chromosome": "12"
+    samplesExtendedWithClinicalData: [
+        {
+            uniqueSampleKey: 'QjA4NTpjaG9sX251c18yMDEy',
+            uniquePatientKey: 'QjA4NTpjaG9sX251c18yMDEy',
+            sampleType: 'Primary Solid Tumor',
+            sampleId: 'B085',
+            patientId: 'B085',
+            cancerTypeId: 'chol',
+            studyId: 'chol_nus_2012',
+            cancerType: 'Hepatobiliary Cancer',
+            cancerTypeDetailed: 'Cholangiocarcinoma',
+        },
+        {
+            uniqueSampleKey: 'QjA5OTpjaG9sX251c18yMDEy',
+            uniquePatientKey: 'QjA5OTpjaG9sX251c18yMDEy',
+            sampleType: 'Primary Solid Tumor',
+            sampleId: 'B099',
+            patientId: 'B099',
+            cancerTypeId: 'chol',
+            studyId: 'chol_nus_2012',
+            cancerType: 'Hepatobiliary Cancer',
+            cancerTypeDetailed: 'Cholangiocarcinoma',
+        },
+        {
+            uniqueSampleKey: 'UjEwNDpjaG9sX251c18yMDEy',
+            uniquePatientKey: 'UjEwNDpjaG9sX251c18yMDEy',
+            sampleType: 'Primary Solid Tumor',
+            sampleId: 'R104',
+            patientId: 'R104',
+            cancerTypeId: 'chol',
+            studyId: 'chol_nus_2012',
+            cancerType: 'Hepatobiliary Cancer',
+            cancerTypeDetailed: 'Cholangiocarcinoma',
+        },
+        {
+            uniqueSampleKey: 'VDAyNjpjaG9sX251c18yMDEy',
+            uniquePatientKey: 'VDAyNjpjaG9sX251c18yMDEy',
+            sampleType: 'Primary Solid Tumor',
+            sampleId: 'T026',
+            patientId: 'T026',
+            cancerTypeId: 'chol',
+            studyId: 'chol_nus_2012',
+            cancerType: 'Hepatobiliary Cancer',
+            cancerTypeDetailed: 'Cholangiocarcinoma',
+        },
+        {
+            uniqueSampleKey: 'VTA0NDpjaG9sX251c18yMDEy',
+            uniquePatientKey: 'VTA0NDpjaG9sX251c18yMDEy',
+            sampleType: 'Primary Solid Tumor',
+            sampleId: 'U044',
+            patientId: 'U044',
+            cancerTypeId: 'chol',
+            studyId: 'chol_nus_2012',
+            cancerType: 'Hepatobiliary Cancer',
+            cancerTypeDetailed: 'Cholangiocarcinoma',
+        },
+        {
+            uniqueSampleKey: 'VzAxMjpjaG9sX251c18yMDEy',
+            uniquePatientKey: 'VzAxMjpjaG9sX251c18yMDEy',
+            sampleType: 'Primary Solid Tumor',
+            sampleId: 'W012',
+            patientId: 'W012',
+            cancerTypeId: 'chol',
+            studyId: 'chol_nus_2012',
+            cancerType: 'Hepatobiliary Cancer',
+            cancerTypeDetailed: 'Cholangiocarcinoma',
+        },
+        {
+            uniqueSampleKey: 'VzAzOTpjaG9sX251c18yMDEy',
+            uniquePatientKey: 'VzAzOTpjaG9sX251c18yMDEy',
+            sampleType: 'Primary Solid Tumor',
+            sampleId: 'W039',
+            patientId: 'W039',
+            cancerTypeId: 'chol',
+            studyId: 'chol_nus_2012',
+            cancerType: 'Hepatobiliary Cancer',
+            cancerTypeDetailed: 'Cholangiocarcinoma',
+        },
+        {
+            uniqueSampleKey: 'VzA0MDpjaG9sX251c18yMDEy',
+            uniquePatientKey: 'VzA0MDpjaG9sX251c18yMDEy',
+            sampleType: 'Primary Solid Tumor',
+            sampleId: 'W040',
+            patientId: 'W040',
+            cancerTypeId: 'chol',
+            studyId: 'chol_nus_2012',
+            cancerType: 'Hepatobiliary Cancer',
+            cancerTypeDetailed: 'Cholangiocarcinoma',
+        },
+        {
+            uniqueSampleKey: 'UGFuTkVUMTBQVDpwYW5ldF9qaHVfMjAxMQ',
+            uniquePatientKey: 'UEVOMTA6cGFuZXRfamh1XzIwMTE',
+            sampleType: 'Primary Solid Tumor',
+            sampleId: 'PanNET10PT',
+            patientId: 'PEN10',
+            cancerTypeId: 'panet',
+            studyId: 'panet_jhu_2011',
+            cancerType: 'Pancreatic Cancer',
+            cancerTypeDetailed: 'Pancreatic Neuroendocrine Tumor',
+        },
+        {
+            uniqueSampleKey: 'UGFuTkVUMjFQVDpwYW5ldF9qaHVfMjAxMQ',
+            uniquePatientKey: 'UEVOMjE6cGFuZXRfamh1XzIwMTE',
+            sampleType: 'Primary Solid Tumor',
+            sampleId: 'PanNET21PT',
+            patientId: 'PEN21',
+            cancerTypeId: 'panet',
+            studyId: 'panet_jhu_2011',
+            cancerType: 'Pancreatic Cancer',
+            cancerTypeDetailed: 'Pancreatic Neuroendocrine Tumor',
+        },
+        {
+            uniqueSampleKey: 'UGFuTkVUMjNQVDpwYW5ldF9qaHVfMjAxMQ',
+            uniquePatientKey: 'UEVOMjM6cGFuZXRfamh1XzIwMTE',
+            sampleType: 'Primary Solid Tumor',
+            sampleId: 'PanNET23PT',
+            patientId: 'PEN23',
+            cancerTypeId: 'panet',
+            studyId: 'panet_jhu_2011',
+            cancerType: 'Pancreatic Cancer',
+            cancerTypeDetailed: 'Pancreatic Neuroendocrine Tumor',
+        },
+        {
+            uniqueSampleKey: 'UGFuTkVUMjRQVDpwYW5ldF9qaHVfMjAxMQ',
+            uniquePatientKey: 'UEVOMjQ6cGFuZXRfamh1XzIwMTE',
+            sampleType: 'Primary Solid Tumor',
+            sampleId: 'PanNET24PT',
+            patientId: 'PEN24',
+            cancerTypeId: 'panet',
+            studyId: 'panet_jhu_2011',
+            cancerType: 'Pancreatic Cancer',
+            cancerTypeDetailed: 'Pancreatic Neuroendocrine Tumor',
+        },
+        {
+            uniqueSampleKey: 'UGFuTkVUMjVQVDpwYW5ldF9qaHVfMjAxMQ',
+            uniquePatientKey: 'UEVOMjU6cGFuZXRfamh1XzIwMTE',
+            sampleType: 'Primary Solid Tumor',
+            sampleId: 'PanNET25PT',
+            patientId: 'PEN25',
+            cancerTypeId: 'panet',
+            studyId: 'panet_jhu_2011',
+            cancerType: 'Pancreatic Cancer',
+            cancerTypeDetailed: 'Pancreatic Neuroendocrine Tumor',
+        },
+        {
+            uniqueSampleKey: 'UGFuTkVUM1BUOnBhbmV0X2podV8yMDEx',
+            uniquePatientKey: 'UEVOMzpwYW5ldF9qaHVfMjAxMQ',
+            sampleType: 'Primary Solid Tumor',
+            sampleId: 'PanNET3PT',
+            patientId: 'PEN3',
+            cancerTypeId: 'panet',
+            studyId: 'panet_jhu_2011',
+            cancerType: 'Pancreatic Cancer',
+            cancerTypeDetailed: 'Pancreatic Neuroendocrine Tumor',
+        },
+        {
+            uniqueSampleKey: 'UGFuTkVUMzFQVDpwYW5ldF9qaHVfMjAxMQ',
+            uniquePatientKey: 'UEVOMzE6cGFuZXRfamh1XzIwMTE',
+            sampleType: 'Primary Solid Tumor',
+            sampleId: 'PanNET31PT',
+            patientId: 'PEN31',
+            cancerTypeId: 'panet',
+            studyId: 'panet_jhu_2011',
+            cancerType: 'Pancreatic Cancer',
+            cancerTypeDetailed: 'Pancreatic Neuroendocrine Tumor',
+        },
+        {
+            uniqueSampleKey: 'UGFuTkVUMzZQVDpwYW5ldF9qaHVfMjAxMQ',
+            uniquePatientKey: 'UEVOMzY6cGFuZXRfamh1XzIwMTE',
+            sampleType: 'Primary Solid Tumor',
+            sampleId: 'PanNET36PT',
+            patientId: 'PEN36',
+            cancerTypeId: 'panet',
+            studyId: 'panet_jhu_2011',
+            cancerType: 'Pancreatic Cancer',
+            cancerTypeDetailed: 'Pancreatic Neuroendocrine Tumor',
+        },
+        {
+            uniqueSampleKey: 'UGFuTkVUN1BUOnBhbmV0X2podV8yMDEx',
+            uniquePatientKey: 'UEVONzpwYW5ldF9qaHVfMjAxMQ',
+            sampleType: 'Primary Solid Tumor',
+            sampleId: 'PanNET7PT',
+            patientId: 'PEN7',
+            cancerTypeId: 'panet',
+            studyId: 'panet_jhu_2011',
+            cancerType: 'Pancreatic Cancer',
+            cancerTypeDetailed: 'Pancreatic Neuroendocrine Tumor',
+        },
+        {
+            uniqueSampleKey: 'UGFuTkVUOTNQVDpwYW5ldF9qaHVfMjAxMQ',
+            uniquePatientKey: 'UEVOOTM6cGFuZXRfamh1XzIwMTE',
+            sampleType: 'Primary Solid Tumor',
+            sampleId: 'PanNET93PT',
+            patientId: 'PEN93',
+            cancerTypeId: 'panet',
+            studyId: 'panet_jhu_2011',
+            cancerType: 'Pancreatic Cancer',
+            cancerTypeDetailed: 'Pancreatic Neuroendocrine Tumor',
+        },
+    ],
+    alterationsByGeneBySampleKey: {
+        KRAS: {
+            UjEwNDpjaG9sX251c18yMDEy: [
+                {
+                    uniqueSampleKey: 'UjEwNDpjaG9sX251c18yMDEy',
+                    uniquePatientKey: 'UjEwNDpjaG9sX251c18yMDEy',
+                    molecularProfileId: 'chol_nus_2012_mutations',
+                    sampleId: 'R104',
+                    patientId: 'R104',
+                    entrezGeneId: 3845,
+                    gene: {
+                        entrezGeneId: 3845,
+                        hugoGeneSymbol: 'KRAS',
+                        type: 'protein-coding',
+                        cytoband: '12p12.1',
+                        length: 47305,
+                        chromosome: '12',
+                    },
+                    studyId: 'chol_nus_2012',
+                    center: 'NUS',
+                    mutationStatus: 'NA',
+                    validationStatus: 'NA',
+                    tumorAltCount: -1,
+                    tumorRefCount: -1,
+                    normalAltCount: -1,
+                    normalRefCount: -1,
+                    startPosition: 25398281,
+                    endPosition: 25398281,
+                    referenceAllele: 'C',
+                    proteinChange: 'G13D',
+                    mutationType: 'Missense_Mutation',
+                    functionalImpactScore: 'M',
+                    fisValue: 3.375,
+                    linkXvar:
+                        'getma.org/?cm=var&var=hg19,12,25398281,C,T&fts=all',
+                    linkPdb:
+                        'getma.org/pdb.php?prot=RASK_HUMAN&from=5&to=165&var=G13D',
+                    linkMsa:
+                        'getma.org/?cm=msa&ty=f&p=RASK_HUMAN&rb=5&re=165&var=G13D',
+                    ncbiBuild: 'GRCh37',
+                    variantType: 'SNP',
+                    keyword: 'KRAS G13 missense',
+                    driverFilter: '',
+                    driverFilterAnnotation: '',
+                    driverTiersFilter: '',
+                    driverTiersFilterAnnotation: '',
+                    sequenced: true,
+                    wildType: false,
+                    variantAllele: 'T',
+                    refseqMrnaId: 'NM_033360.2',
+                    proteinPosStart: 13,
+                    proteinPosEnd: 13,
+                    molecularProfileAlterationType: 'MUTATION_EXTENDED',
+                    alterationSubType: 'missense',
+                    alterationType: 'MUTATION_EXTENDED',
                 },
-                "studyId": "chol_nus_2012",
-                "center": "NUS",
-                "mutationStatus": "NA",
-                "validationStatus": "NA",
-                "tumorAltCount": -1,
-                "tumorRefCount": -1,
-                "normalAltCount": -1,
-                "normalRefCount": -1,
-                "startPosition": 25398281,
-                "endPosition": 25398281,
-                "referenceAllele": "C",
-                "proteinChange": "G13D",
-                "mutationType": "Missense_Mutation",
-                "functionalImpactScore": "M",
-                "fisValue": 3.375,
-                "linkXvar": "getma.org/?cm=var&var=hg19,12,25398281,C,T&fts=all",
-                "linkPdb": "getma.org/pdb.php?prot=RASK_HUMAN&from=5&to=165&var=G13D",
-                "linkMsa": "getma.org/?cm=msa&ty=f&p=RASK_HUMAN&rb=5&re=165&var=G13D",
-                "ncbiBuild": "GRCh37",
-                "variantType": "SNP",
-                "keyword": "KRAS G13 missense",
-                "driverFilter": "",
-                "driverFilterAnnotation": "",
-                "driverTiersFilter": "",
-                "driverTiersFilterAnnotation": "",
-                "sequenced": true,
-                "wildType": false,
-                "variantAllele": "T",
-                "refseqMrnaId": "NM_033360.2",
-                "proteinPosStart": 13,
-                "proteinPosEnd": 13,
-                "molecularProfileAlterationType": "MUTATION_EXTENDED",
-                "alterationSubType": "missense",
-                "alterationType": "MUTATION_EXTENDED"
-            }],
-            "QjA4NTpjaG9sX251c18yMDEy": [{
-                "uniqueSampleKey": "QjA4NTpjaG9sX251c18yMDEy",
-                "uniquePatientKey": "QjA4NTpjaG9sX251c18yMDEy",
-                "molecularProfileId": "chol_nus_2012_mutations",
-                "sampleId": "B085",
-                "patientId": "B085",
-                "entrezGeneId": 3845,
-                "gene": {
-                    "entrezGeneId": 3845,
-                    "hugoGeneSymbol": "KRAS",
-                    "type": "protein-coding",
-                    "cytoband": "12p12.1",
-                    "length": 47305,
-                    "chromosome": "12"
+            ],
+            QjA4NTpjaG9sX251c18yMDEy: [
+                {
+                    uniqueSampleKey: 'QjA4NTpjaG9sX251c18yMDEy',
+                    uniquePatientKey: 'QjA4NTpjaG9sX251c18yMDEy',
+                    molecularProfileId: 'chol_nus_2012_mutations',
+                    sampleId: 'B085',
+                    patientId: 'B085',
+                    entrezGeneId: 3845,
+                    gene: {
+                        entrezGeneId: 3845,
+                        hugoGeneSymbol: 'KRAS',
+                        type: 'protein-coding',
+                        cytoband: '12p12.1',
+                        length: 47305,
+                        chromosome: '12',
+                    },
+                    studyId: 'chol_nus_2012',
+                    center: 'NUS',
+                    mutationStatus: 'NA',
+                    validationStatus: 'NA',
+                    tumorAltCount: -1,
+                    tumorRefCount: -1,
+                    normalAltCount: -1,
+                    normalRefCount: -1,
+                    startPosition: 25398284,
+                    endPosition: 25398284,
+                    referenceAllele: 'G',
+                    proteinChange: 'MUTATED',
+                    mutationType: 'Missense_Mutation',
+                    functionalImpactScore: 'NA',
+                    fisValue: 1.4013e-45,
+                    linkXvar: 'NA',
+                    linkPdb: 'NA',
+                    linkMsa: 'NA',
+                    ncbiBuild: '37',
+                    variantType: 'SNP',
+                    driverFilter: '',
+                    driverFilterAnnotation: '',
+                    driverTiersFilter: '',
+                    driverTiersFilterAnnotation: '',
+                    sequenced: true,
+                    wildType: false,
+                    variantAllele: 'C',
+                    refseqMrnaId: 'NA',
+                    proteinPosStart: -1,
+                    proteinPosEnd: -1,
+                    molecularProfileAlterationType: 'MUTATION_EXTENDED',
+                    alterationSubType: 'missense',
+                    alterationType: 'MUTATION_EXTENDED',
                 },
-                "studyId": "chol_nus_2012",
-                "center": "NUS",
-                "mutationStatus": "NA",
-                "validationStatus": "NA",
-                "tumorAltCount": -1,
-                "tumorRefCount": -1,
-                "normalAltCount": -1,
-                "normalRefCount": -1,
-                "startPosition": 25398284,
-                "endPosition": 25398284,
-                "referenceAllele": "G",
-                "proteinChange": "MUTATED",
-                "mutationType": "Missense_Mutation",
-                "functionalImpactScore": "NA",
-                "fisValue": 1.4013e-45,
-                "linkXvar": "NA",
-                "linkPdb": "NA",
-                "linkMsa": "NA",
-                "ncbiBuild": "37",
-                "variantType": "SNP",
-                "driverFilter": "",
-                "driverFilterAnnotation": "",
-                "driverTiersFilter": "",
-                "driverTiersFilterAnnotation": "",
-                "sequenced": true,
-                "wildType": false,
-                "variantAllele": "C",
-                "refseqMrnaId": "NA",
-                "proteinPosStart": -1,
-                "proteinPosEnd": -1,
-                "molecularProfileAlterationType": "MUTATION_EXTENDED",
-                "alterationSubType": "missense",
-                "alterationType": "MUTATION_EXTENDED"
-            }],
-            "VzAxMjpjaG9sX251c18yMDEy": [{
-                "uniqueSampleKey": "VzAxMjpjaG9sX251c18yMDEy",
-                "uniquePatientKey": "VzAxMjpjaG9sX251c18yMDEy",
-                "molecularProfileId": "chol_nus_2012_mutations",
-                "sampleId": "W012",
-                "patientId": "W012",
-                "entrezGeneId": 3845,
-                "gene": {
-                    "entrezGeneId": 3845,
-                    "hugoGeneSymbol": "KRAS",
-                    "type": "protein-coding",
-                    "cytoband": "12p12.1",
-                    "length": 47305,
-                    "chromosome": "12"
+            ],
+            VzAxMjpjaG9sX251c18yMDEy: [
+                {
+                    uniqueSampleKey: 'VzAxMjpjaG9sX251c18yMDEy',
+                    uniquePatientKey: 'VzAxMjpjaG9sX251c18yMDEy',
+                    molecularProfileId: 'chol_nus_2012_mutations',
+                    sampleId: 'W012',
+                    patientId: 'W012',
+                    entrezGeneId: 3845,
+                    gene: {
+                        entrezGeneId: 3845,
+                        hugoGeneSymbol: 'KRAS',
+                        type: 'protein-coding',
+                        cytoband: '12p12.1',
+                        length: 47305,
+                        chromosome: '12',
+                    },
+                    studyId: 'chol_nus_2012',
+                    center: 'NUS',
+                    mutationStatus: 'NA',
+                    validationStatus: 'NA',
+                    tumorAltCount: -1,
+                    tumorRefCount: -1,
+                    normalAltCount: -1,
+                    normalRefCount: -1,
+                    startPosition: 25398284,
+                    endPosition: 25398284,
+                    referenceAllele: 'G',
+                    proteinChange: 'MUTATED',
+                    mutationType: 'Missense_Mutation',
+                    functionalImpactScore: 'NA',
+                    fisValue: 1.4013e-45,
+                    linkXvar: 'NA',
+                    linkPdb: 'NA',
+                    linkMsa: 'NA',
+                    ncbiBuild: '37',
+                    variantType: 'SNP',
+                    driverFilter: '',
+                    driverFilterAnnotation: '',
+                    driverTiersFilter: '',
+                    driverTiersFilterAnnotation: '',
+                    sequenced: true,
+                    wildType: false,
+                    variantAllele: 'C',
+                    refseqMrnaId: 'NA',
+                    proteinPosStart: -1,
+                    proteinPosEnd: -1,
+                    molecularProfileAlterationType: 'MUTATION_EXTENDED',
+                    alterationSubType: 'missense',
+                    alterationType: 'MUTATION_EXTENDED',
                 },
-                "studyId": "chol_nus_2012",
-                "center": "NUS",
-                "mutationStatus": "NA",
-                "validationStatus": "NA",
-                "tumorAltCount": -1,
-                "tumorRefCount": -1,
-                "normalAltCount": -1,
-                "normalRefCount": -1,
-                "startPosition": 25398284,
-                "endPosition": 25398284,
-                "referenceAllele": "G",
-                "proteinChange": "MUTATED",
-                "mutationType": "Missense_Mutation",
-                "functionalImpactScore": "NA",
-                "fisValue": 1.4013e-45,
-                "linkXvar": "NA",
-                "linkPdb": "NA",
-                "linkMsa": "NA",
-                "ncbiBuild": "37",
-                "variantType": "SNP",
-                "driverFilter": "",
-                "driverFilterAnnotation": "",
-                "driverTiersFilter": "",
-                "driverTiersFilterAnnotation": "",
-                "sequenced": true,
-                "wildType": false,
-                "variantAllele": "C",
-                "refseqMrnaId": "NA",
-                "proteinPosStart": -1,
-                "proteinPosEnd": -1,
-                "molecularProfileAlterationType": "MUTATION_EXTENDED",
-                "alterationSubType": "missense",
-                "alterationType": "MUTATION_EXTENDED"
-            }]
+            ],
         },
-        "TP53": {
-            "VzAxMjpjaG9sX251c18yMDEy": [{
-                "uniqueSampleKey": "VzAxMjpjaG9sX251c18yMDEy",
-                "uniquePatientKey": "VzAxMjpjaG9sX251c18yMDEy",
-                "molecularProfileId": "chol_nus_2012_mutations",
-                "sampleId": "W012",
-                "patientId": "W012",
-                "entrezGeneId": 7157,
-                "gene": {
-                    "entrezGeneId": 7157,
-                    "hugoGeneSymbol": "TP53",
-                    "type": "protein-coding",
-                    "cytoband": "17p13.1",
-                    "length": 19149,
-                    "chromosome": "17"
+        TP53: {
+            VzAxMjpjaG9sX251c18yMDEy: [
+                {
+                    uniqueSampleKey: 'VzAxMjpjaG9sX251c18yMDEy',
+                    uniquePatientKey: 'VzAxMjpjaG9sX251c18yMDEy',
+                    molecularProfileId: 'chol_nus_2012_mutations',
+                    sampleId: 'W012',
+                    patientId: 'W012',
+                    entrezGeneId: 7157,
+                    gene: {
+                        entrezGeneId: 7157,
+                        hugoGeneSymbol: 'TP53',
+                        type: 'protein-coding',
+                        cytoband: '17p13.1',
+                        length: 19149,
+                        chromosome: '17',
+                    },
+                    studyId: 'chol_nus_2012',
+                    center: 'NUS',
+                    mutationStatus: 'NA',
+                    validationStatus: 'NA',
+                    tumorAltCount: -1,
+                    tumorRefCount: -1,
+                    normalAltCount: -1,
+                    normalRefCount: -1,
+                    startPosition: 7577539,
+                    endPosition: 7577539,
+                    referenceAllele: 'G',
+                    proteinChange: 'R248W',
+                    mutationType: 'Missense_Mutation',
+                    functionalImpactScore: 'M',
+                    fisValue: 3.315,
+                    linkXvar:
+                        'getma.org/?cm=var&var=hg19,17,7577539,G,A&fts=all',
+                    linkPdb:
+                        'getma.org/pdb.php?prot=P53_HUMAN&from=95&to=289&var=R248W',
+                    linkMsa:
+                        'getma.org/?cm=msa&ty=f&p=P53_HUMAN&rb=95&re=289&var=R248W',
+                    ncbiBuild: 'GRCh37',
+                    variantType: 'SNP',
+                    keyword: 'TP53 R248 missense',
+                    driverFilter: '',
+                    driverFilterAnnotation: '',
+                    driverTiersFilter: '',
+                    driverTiersFilterAnnotation: '',
+                    sequenced: true,
+                    wildType: false,
+                    variantAllele: 'A',
+                    refseqMrnaId:
+                        'NM_001126112.2,NM_001276761.1,NM_001276760.1,NM_000546.5,NM_0011',
+                    proteinPosStart: 248,
+                    proteinPosEnd: 248,
+                    molecularProfileAlterationType: 'MUTATION_EXTENDED',
+                    alterationSubType: 'missense',
+                    alterationType: 'MUTATION_EXTENDED',
                 },
-                "studyId": "chol_nus_2012",
-                "center": "NUS",
-                "mutationStatus": "NA",
-                "validationStatus": "NA",
-                "tumorAltCount": -1,
-                "tumorRefCount": -1,
-                "normalAltCount": -1,
-                "normalRefCount": -1,
-                "startPosition": 7577539,
-                "endPosition": 7577539,
-                "referenceAllele": "G",
-                "proteinChange": "R248W",
-                "mutationType": "Missense_Mutation",
-                "functionalImpactScore": "M",
-                "fisValue": 3.315,
-                "linkXvar": "getma.org/?cm=var&var=hg19,17,7577539,G,A&fts=all",
-                "linkPdb": "getma.org/pdb.php?prot=P53_HUMAN&from=95&to=289&var=R248W",
-                "linkMsa": "getma.org/?cm=msa&ty=f&p=P53_HUMAN&rb=95&re=289&var=R248W",
-                "ncbiBuild": "GRCh37",
-                "variantType": "SNP",
-                "keyword": "TP53 R248 missense",
-                "driverFilter": "",
-                "driverFilterAnnotation": "",
-                "driverTiersFilter": "",
-                "driverTiersFilterAnnotation": "",
-                "sequenced": true,
-                "wildType": false,
-                "variantAllele": "A",
-                "refseqMrnaId": "NM_001126112.2,NM_001276761.1,NM_001276760.1,NM_000546.5,NM_0011",
-                "proteinPosStart": 248,
-                "proteinPosEnd": 248,
-                "molecularProfileAlterationType": "MUTATION_EXTENDED",
-                "alterationSubType": "missense",
-                "alterationType": "MUTATION_EXTENDED"
-            }],
-            "VDAyNjpjaG9sX251c18yMDEy": [{
-                "uniqueSampleKey": "VDAyNjpjaG9sX251c18yMDEy",
-                "uniquePatientKey": "VDAyNjpjaG9sX251c18yMDEy",
-                "molecularProfileId": "chol_nus_2012_mutations",
-                "sampleId": "T026",
-                "patientId": "T026",
-                "entrezGeneId": 7157,
-                "gene": {
-                    "entrezGeneId": 7157,
-                    "hugoGeneSymbol": "TP53",
-                    "type": "protein-coding",
-                    "cytoband": "17p13.1",
-                    "length": 19149,
-                    "chromosome": "17"
+            ],
+            VDAyNjpjaG9sX251c18yMDEy: [
+                {
+                    uniqueSampleKey: 'VDAyNjpjaG9sX251c18yMDEy',
+                    uniquePatientKey: 'VDAyNjpjaG9sX251c18yMDEy',
+                    molecularProfileId: 'chol_nus_2012_mutations',
+                    sampleId: 'T026',
+                    patientId: 'T026',
+                    entrezGeneId: 7157,
+                    gene: {
+                        entrezGeneId: 7157,
+                        hugoGeneSymbol: 'TP53',
+                        type: 'protein-coding',
+                        cytoband: '17p13.1',
+                        length: 19149,
+                        chromosome: '17',
+                    },
+                    studyId: 'chol_nus_2012',
+                    center: 'NUS',
+                    mutationStatus: 'NA',
+                    validationStatus: 'NA',
+                    tumorAltCount: -1,
+                    tumorRefCount: -1,
+                    normalAltCount: -1,
+                    normalRefCount: -1,
+                    startPosition: 7579470,
+                    endPosition: 7579471,
+                    referenceAllele: '-',
+                    proteinChange: 'V73Rfs*76',
+                    mutationType: 'Frame_Shift_Ins',
+                    functionalImpactScore: 'NA',
+                    fisValue: 1.4013e-45,
+                    linkXvar: 'NA',
+                    linkPdb: 'NA',
+                    linkMsa: 'NA',
+                    ncbiBuild: 'GRCh37',
+                    variantType: 'INS',
+                    keyword: 'TP53 truncating',
+                    driverFilter: '',
+                    driverFilterAnnotation: '',
+                    driverTiersFilter: '',
+                    driverTiersFilterAnnotation: '',
+                    sequenced: true,
+                    wildType: false,
+                    variantAllele: 'G',
+                    refseqMrnaId:
+                        'NM_001126112.2,NM_001276761.1,NM_001276760.1,NM_000546.5,NM_0011',
+                    proteinPosStart: 72,
+                    proteinPosEnd: 73,
+                    molecularProfileAlterationType: 'MUTATION_EXTENDED',
+                    alterationSubType: 'frameshift',
+                    alterationType: 'MUTATION_EXTENDED',
                 },
-                "studyId": "chol_nus_2012",
-                "center": "NUS",
-                "mutationStatus": "NA",
-                "validationStatus": "NA",
-                "tumorAltCount": -1,
-                "tumorRefCount": -1,
-                "normalAltCount": -1,
-                "normalRefCount": -1,
-                "startPosition": 7579470,
-                "endPosition": 7579471,
-                "referenceAllele": "-",
-                "proteinChange": "V73Rfs*76",
-                "mutationType": "Frame_Shift_Ins",
-                "functionalImpactScore": "NA",
-                "fisValue": 1.4013e-45,
-                "linkXvar": "NA",
-                "linkPdb": "NA",
-                "linkMsa": "NA",
-                "ncbiBuild": "GRCh37",
-                "variantType": "INS",
-                "keyword": "TP53 truncating",
-                "driverFilter": "",
-                "driverFilterAnnotation": "",
-                "driverTiersFilter": "",
-                "driverTiersFilterAnnotation": "",
-                "sequenced": true,
-                "wildType": false,
-                "variantAllele": "G",
-                "refseqMrnaId": "NM_001126112.2,NM_001276761.1,NM_001276760.1,NM_000546.5,NM_0011",
-                "proteinPosStart": 72,
-                "proteinPosEnd": 73,
-                "molecularProfileAlterationType": "MUTATION_EXTENDED",
-                "alterationSubType": "frameshift",
-                "alterationType": "MUTATION_EXTENDED"
-            }],
-            "VTA0NDpjaG9sX251c18yMDEy": [{
-                "uniqueSampleKey": "VTA0NDpjaG9sX251c18yMDEy",
-                "uniquePatientKey": "VTA0NDpjaG9sX251c18yMDEy",
-                "molecularProfileId": "chol_nus_2012_mutations",
-                "sampleId": "U044",
-                "patientId": "U044",
-                "entrezGeneId": 7157,
-                "gene": {
-                    "entrezGeneId": 7157,
-                    "hugoGeneSymbol": "TP53",
-                    "type": "protein-coding",
-                    "cytoband": "17p13.1",
-                    "length": 19149,
-                    "chromosome": "17"
+            ],
+            VTA0NDpjaG9sX251c18yMDEy: [
+                {
+                    uniqueSampleKey: 'VTA0NDpjaG9sX251c18yMDEy',
+                    uniquePatientKey: 'VTA0NDpjaG9sX251c18yMDEy',
+                    molecularProfileId: 'chol_nus_2012_mutations',
+                    sampleId: 'U044',
+                    patientId: 'U044',
+                    entrezGeneId: 7157,
+                    gene: {
+                        entrezGeneId: 7157,
+                        hugoGeneSymbol: 'TP53',
+                        type: 'protein-coding',
+                        cytoband: '17p13.1',
+                        length: 19149,
+                        chromosome: '17',
+                    },
+                    studyId: 'chol_nus_2012',
+                    center: 'NUS',
+                    mutationStatus: 'NA',
+                    validationStatus: 'NA',
+                    tumorAltCount: -1,
+                    tumorRefCount: -1,
+                    normalAltCount: -1,
+                    normalRefCount: -1,
+                    startPosition: 7579377,
+                    endPosition: 7579377,
+                    referenceAllele: 'G',
+                    proteinChange: 'Q104*',
+                    mutationType: 'Nonsense_Mutation',
+                    functionalImpactScore: 'NA',
+                    fisValue: 0,
+                    linkXvar:
+                        'getma.org/?cm=var&var=hg19,17,7579377,G,A&fts=all',
+                    linkPdb: 'NA',
+                    linkMsa: 'NA',
+                    ncbiBuild: 'GRCh37',
+                    variantType: 'SNP',
+                    keyword: 'TP53 truncating',
+                    driverFilter: '',
+                    driverFilterAnnotation: '',
+                    driverTiersFilter: '',
+                    driverTiersFilterAnnotation: '',
+                    sequenced: true,
+                    wildType: false,
+                    variantAllele: 'A',
+                    refseqMrnaId:
+                        'NM_001126112.2,NM_001276761.1,NM_001276760.1,NM_000546.5,NM_0011',
+                    proteinPosStart: 104,
+                    proteinPosEnd: 104,
+                    molecularProfileAlterationType: 'MUTATION_EXTENDED',
+                    alterationSubType: 'nonsense',
+                    alterationType: 'MUTATION_EXTENDED',
                 },
-                "studyId": "chol_nus_2012",
-                "center": "NUS",
-                "mutationStatus": "NA",
-                "validationStatus": "NA",
-                "tumorAltCount": -1,
-                "tumorRefCount": -1,
-                "normalAltCount": -1,
-                "normalRefCount": -1,
-                "startPosition": 7579377,
-                "endPosition": 7579377,
-                "referenceAllele": "G",
-                "proteinChange": "Q104*",
-                "mutationType": "Nonsense_Mutation",
-                "functionalImpactScore": "NA",
-                "fisValue": 0,
-                "linkXvar": "getma.org/?cm=var&var=hg19,17,7579377,G,A&fts=all",
-                "linkPdb": "NA",
-                "linkMsa": "NA",
-                "ncbiBuild": "GRCh37",
-                "variantType": "SNP",
-                "keyword": "TP53 truncating",
-                "driverFilter": "",
-                "driverFilterAnnotation": "",
-                "driverTiersFilter": "",
-                "driverTiersFilterAnnotation": "",
-                "sequenced": true,
-                "wildType": false,
-                "variantAllele": "A",
-                "refseqMrnaId": "NM_001126112.2,NM_001276761.1,NM_001276760.1,NM_000546.5,NM_0011",
-                "proteinPosStart": 104,
-                "proteinPosEnd": 104,
-                "molecularProfileAlterationType": "MUTATION_EXTENDED",
-                "alterationSubType": "nonsense",
-                "alterationType": "MUTATION_EXTENDED"
-            }],
-            "VzA0MDpjaG9sX251c18yMDEy": [{
-                "uniqueSampleKey": "VzA0MDpjaG9sX251c18yMDEy",
-                "uniquePatientKey": "VzA0MDpjaG9sX251c18yMDEy",
-                "molecularProfileId": "chol_nus_2012_mutations",
-                "sampleId": "W040",
-                "patientId": "W040",
-                "entrezGeneId": 7157,
-                "gene": {
-                    "entrezGeneId": 7157,
-                    "hugoGeneSymbol": "TP53",
-                    "type": "protein-coding",
-                    "cytoband": "17p13.1",
-                    "length": 19149,
-                    "chromosome": "17"
+            ],
+            VzA0MDpjaG9sX251c18yMDEy: [
+                {
+                    uniqueSampleKey: 'VzA0MDpjaG9sX251c18yMDEy',
+                    uniquePatientKey: 'VzA0MDpjaG9sX251c18yMDEy',
+                    molecularProfileId: 'chol_nus_2012_mutations',
+                    sampleId: 'W040',
+                    patientId: 'W040',
+                    entrezGeneId: 7157,
+                    gene: {
+                        entrezGeneId: 7157,
+                        hugoGeneSymbol: 'TP53',
+                        type: 'protein-coding',
+                        cytoband: '17p13.1',
+                        length: 19149,
+                        chromosome: '17',
+                    },
+                    studyId: 'chol_nus_2012',
+                    center: 'NUS',
+                    mutationStatus: 'NA',
+                    validationStatus: 'NA',
+                    tumorAltCount: -1,
+                    tumorRefCount: -1,
+                    normalAltCount: -1,
+                    normalRefCount: -1,
+                    startPosition: 7577564,
+                    endPosition: 7577565,
+                    referenceAllele: '-',
+                    proteinChange: 'N239Kfs*25',
+                    mutationType: 'Frame_Shift_Ins',
+                    functionalImpactScore: 'NA',
+                    fisValue: 1.4013e-45,
+                    linkXvar: 'NA',
+                    linkPdb: 'NA',
+                    linkMsa: 'NA',
+                    ncbiBuild: 'GRCh37',
+                    variantType: 'INS',
+                    keyword: 'TP53 truncating',
+                    driverFilter: '',
+                    driverFilterAnnotation: '',
+                    driverTiersFilter: '',
+                    driverTiersFilterAnnotation: '',
+                    sequenced: true,
+                    wildType: false,
+                    variantAllele: 'T',
+                    refseqMrnaId: 'NM_001126112.2',
+                    proteinPosStart: 239,
+                    proteinPosEnd: 239,
+                    molecularProfileAlterationType: 'MUTATION_EXTENDED',
+                    alterationSubType: 'frameshift',
+                    alterationType: 'MUTATION_EXTENDED',
                 },
-                "studyId": "chol_nus_2012",
-                "center": "NUS",
-                "mutationStatus": "NA",
-                "validationStatus": "NA",
-                "tumorAltCount": -1,
-                "tumorRefCount": -1,
-                "normalAltCount": -1,
-                "normalRefCount": -1,
-                "startPosition": 7577564,
-                "endPosition": 7577565,
-                "referenceAllele": "-",
-                "proteinChange": "N239Kfs*25",
-                "mutationType": "Frame_Shift_Ins",
-                "functionalImpactScore": "NA",
-                "fisValue": 1.4013e-45,
-                "linkXvar": "NA",
-                "linkPdb": "NA",
-                "linkMsa": "NA",
-                "ncbiBuild": "GRCh37",
-                "variantType": "INS",
-                "keyword": "TP53 truncating",
-                "driverFilter": "",
-                "driverFilterAnnotation": "",
-                "driverTiersFilter": "",
-                "driverTiersFilterAnnotation": "",
-                "sequenced": true,
-                "wildType": false,
-                "variantAllele": "T",
-                "refseqMrnaId": "NM_001126112.2",
-                "proteinPosStart": 239,
-                "proteinPosEnd": 239,
-                "molecularProfileAlterationType": "MUTATION_EXTENDED",
-                "alterationSubType": "frameshift",
-                "alterationType": "MUTATION_EXTENDED"
-            }]
-        }
+            ],
+        },
     },
-    "studies": [{
-        "name": "Cholangiocarcinoma (National University of Singapore, Nat Genet 2012)",
-        "shortName": "Cholangiocarcinoma (NUS)",
-        "description": "Exome Sequencing for Opisthorchis viverrini-related cholangiocarcinoma in 8 O.viverrini-related tumors and matched normal tissue.",
-        "publicStudy": true,
-        "pmid": "22561520",
-        "citation": "Ong et al. Nat Genet 2012",
-        "groups": "PUBLIC",
-        "status": 0,
-        "importDate": "2017-11-10 05:00:00",
-        "allSampleCount": 8,
-        "sequencedSampleCount": 8,
-        "cnaSampleCount": 0,
-        "mrnaRnaSeqSampleCount": 0,
-        "mrnaRnaSeqV2SampleCount": 0,
-        "mrnaMicroarraySampleCount": 0,
-        "miRnaSampleCount": 0,
-        "methylationHm27SampleCount": 0,
-        "rppaSampleCount": 0,
-        "completeSampleCount": 0,
-        "studyId": "chol_nus_2012",
-        "cancerTypeId": "chol",
-        "cancerType": {
-            "name": "Cholangiocarcinoma",
-            "clinicalTrialKeywords": "cholangiocarcinoma",
-            "dedicatedColor": "Green",
-            "shortName": "CHOL",
-            "parent": "biliary_tract",
-            "cancerTypeId": "chol"
-        }
-    }, {
-        "name": "Pancreatic Neuroendocrine Tumors (Johns Hopkins University, Science 2011)",
-        "shortName": "PANET(Johns Hopkins 2011)",
-        "description": "Whole exome sequencing of 10 pancreatic neuroendocrine tumor patients. <A HREF=\"https://www.sciencemag.org/content/331/6021/1199/suppl/DC1\">",
-        "publicStudy": true,
-        "pmid": "21252315",
-        "citation": "Jiao et al. Science 2011",
-        "groups": "PUBLIC",
-        "status": 0,
-        "importDate": "2017-11-15 05:00:00",
-        "allSampleCount": 10,
-        "sequencedSampleCount": 10,
-        "cnaSampleCount": 0,
-        "mrnaRnaSeqSampleCount": 0,
-        "mrnaRnaSeqV2SampleCount": 0,
-        "mrnaMicroarraySampleCount": 0,
-        "miRnaSampleCount": 0,
-        "methylationHm27SampleCount": 0,
-        "rppaSampleCount": 0,
-        "completeSampleCount": 0,
-        "studyId": "panet_jhu_2011",
-        "cancerTypeId": "panet",
-        "cancerType": {
-            "name": "Pancreatic Neuroendocrine Tumor",
-            "clinicalTrialKeywords": "pancreatic neuroendocrine tumor",
-            "dedicatedColor": "Purple",
-            "shortName": "PANET",
-            "parent": "pancreas",
-            "cancerTypeId": "panet"
-        }
-    }],
-    "studyMap": {
-        "chol_nus_2012": {
-            "name": "Cholangiocarcinoma (National University of Singapore, Nat Genet 2012)",
-            "shortName": "Cholangiocarcinoma (NUS)",
-            "description": "Exome Sequencing for Opisthorchis viverrini-related cholangiocarcinoma in 8 O.viverrini-related tumors and matched normal tissue.",
-            "publicStudy": true,
-            "pmid": "22561520",
-            "citation": "Ong et al. Nat Genet 2012",
-            "groups": "PUBLIC",
-            "status": 0,
-            "importDate": "2017-11-10 05:00:00",
-            "allSampleCount": 8,
-            "sequencedSampleCount": 8,
-            "cnaSampleCount": 0,
-            "mrnaRnaSeqSampleCount": 0,
-            "mrnaRnaSeqV2SampleCount": 0,
-            "mrnaMicroarraySampleCount": 0,
-            "miRnaSampleCount": 0,
-            "methylationHm27SampleCount": 0,
-            "rppaSampleCount": 0,
-            "completeSampleCount": 0,
-            "studyId": "chol_nus_2012",
-            "cancerTypeId": "chol",
-            "cancerType": {
-                "name": "Cholangiocarcinoma",
-                "clinicalTrialKeywords": "cholangiocarcinoma",
-                "dedicatedColor": "Green",
-                "shortName": "CHOL",
-                "parent": "biliary_tract",
-                "cancerTypeId": "chol"
-            }
+    studies: [
+        {
+            name:
+                'Cholangiocarcinoma (National University of Singapore, Nat Genet 2012)',
+            shortName: 'Cholangiocarcinoma (NUS)',
+            description:
+                'Exome Sequencing for Opisthorchis viverrini-related cholangiocarcinoma in 8 O.viverrini-related tumors and matched normal tissue.',
+            publicStudy: true,
+            pmid: '22561520',
+            citation: 'Ong et al. Nat Genet 2012',
+            groups: 'PUBLIC',
+            status: 0,
+            importDate: '2017-11-10 05:00:00',
+            allSampleCount: 8,
+            sequencedSampleCount: 8,
+            cnaSampleCount: 0,
+            mrnaRnaSeqSampleCount: 0,
+            mrnaRnaSeqV2SampleCount: 0,
+            mrnaMicroarraySampleCount: 0,
+            miRnaSampleCount: 0,
+            methylationHm27SampleCount: 0,
+            rppaSampleCount: 0,
+            completeSampleCount: 0,
+            studyId: 'chol_nus_2012',
+            cancerTypeId: 'chol',
+            cancerType: {
+                name: 'Cholangiocarcinoma',
+                clinicalTrialKeywords: 'cholangiocarcinoma',
+                dedicatedColor: 'Green',
+                shortName: 'CHOL',
+                parent: 'biliary_tract',
+                cancerTypeId: 'chol',
+            },
+        },
+        {
+            name:
+                'Pancreatic Neuroendocrine Tumors (Johns Hopkins University, Science 2011)',
+            shortName: 'PANET(Johns Hopkins 2011)',
+            description:
+                'Whole exome sequencing of 10 pancreatic neuroendocrine tumor patients. <A HREF="https://www.sciencemag.org/content/331/6021/1199/suppl/DC1">',
+            publicStudy: true,
+            pmid: '21252315',
+            citation: 'Jiao et al. Science 2011',
+            groups: 'PUBLIC',
+            status: 0,
+            importDate: '2017-11-15 05:00:00',
+            allSampleCount: 10,
+            sequencedSampleCount: 10,
+            cnaSampleCount: 0,
+            mrnaRnaSeqSampleCount: 0,
+            mrnaRnaSeqV2SampleCount: 0,
+            mrnaMicroarraySampleCount: 0,
+            miRnaSampleCount: 0,
+            methylationHm27SampleCount: 0,
+            rppaSampleCount: 0,
+            completeSampleCount: 0,
+            studyId: 'panet_jhu_2011',
+            cancerTypeId: 'panet',
+            cancerType: {
+                name: 'Pancreatic Neuroendocrine Tumor',
+                clinicalTrialKeywords: 'pancreatic neuroendocrine tumor',
+                dedicatedColor: 'Purple',
+                shortName: 'PANET',
+                parent: 'pancreas',
+                cancerTypeId: 'panet',
+            },
+        },
+    ],
+    studyMap: {
+        chol_nus_2012: {
+            name:
+                'Cholangiocarcinoma (National University of Singapore, Nat Genet 2012)',
+            shortName: 'Cholangiocarcinoma (NUS)',
+            description:
+                'Exome Sequencing for Opisthorchis viverrini-related cholangiocarcinoma in 8 O.viverrini-related tumors and matched normal tissue.',
+            publicStudy: true,
+            pmid: '22561520',
+            citation: 'Ong et al. Nat Genet 2012',
+            groups: 'PUBLIC',
+            status: 0,
+            importDate: '2017-11-10 05:00:00',
+            allSampleCount: 8,
+            sequencedSampleCount: 8,
+            cnaSampleCount: 0,
+            mrnaRnaSeqSampleCount: 0,
+            mrnaRnaSeqV2SampleCount: 0,
+            mrnaMicroarraySampleCount: 0,
+            miRnaSampleCount: 0,
+            methylationHm27SampleCount: 0,
+            rppaSampleCount: 0,
+            completeSampleCount: 0,
+            studyId: 'chol_nus_2012',
+            cancerTypeId: 'chol',
+            cancerType: {
+                name: 'Cholangiocarcinoma',
+                clinicalTrialKeywords: 'cholangiocarcinoma',
+                dedicatedColor: 'Green',
+                shortName: 'CHOL',
+                parent: 'biliary_tract',
+                cancerTypeId: 'chol',
+            },
         },
-        "panet_jhu_2011": {
-            "name": "Pancreatic Neuroendocrine Tumors (Johns Hopkins University, Science 2011)",
-            "shortName": "PANET(Johns Hopkins 2011)",
-            "description": "Whole exome sequencing of 10 pancreatic neuroendocrine tumor patients. <A HREF=\"https://www.sciencemag.org/content/331/6021/1199/suppl/DC1\">",
-            "publicStudy": true,
-            "pmid": "21252315",
-            "citation": "Jiao et al. Science 2011",
-            "groups": "PUBLIC",
-            "status": 0,
-            "importDate": "2017-11-15 05:00:00",
-            "allSampleCount": 10,
-            "sequencedSampleCount": 10,
-            "cnaSampleCount": 0,
-            "mrnaRnaSeqSampleCount": 0,
-            "mrnaRnaSeqV2SampleCount": 0,
-            "mrnaMicroarraySampleCount": 0,
-            "miRnaSampleCount": 0,
-            "methylationHm27SampleCount": 0,
-            "rppaSampleCount": 0,
-            "completeSampleCount": 0,
-            "studyId": "panet_jhu_2011",
-            "cancerTypeId": "panet",
-            "cancerType": {
-                "name": "Pancreatic Neuroendocrine Tumor",
-                "clinicalTrialKeywords": "pancreatic neuroendocrine tumor",
-                "dedicatedColor": "Purple",
-                "shortName": "PANET",
-                "parent": "pancreas",
-                "cancerTypeId": "panet"
-            }
-        }
-    }
-}
\ No newline at end of file
+        panet_jhu_2011: {
+            name:
+                'Pancreatic Neuroendocrine Tumors (Johns Hopkins University, Science 2011)',
+            shortName: 'PANET(Johns Hopkins 2011)',
+            description:
+                'Whole exome sequencing of 10 pancreatic neuroendocrine tumor patients. <A HREF="https://www.sciencemag.org/content/331/6021/1199/suppl/DC1">',
+            publicStudy: true,
+            pmid: '21252315',
+            citation: 'Jiao et al. Science 2011',
+            groups: 'PUBLIC',
+            status: 0,
+            importDate: '2017-11-15 05:00:00',
+            allSampleCount: 10,
+            sequencedSampleCount: 10,
+            cnaSampleCount: 0,
+            mrnaRnaSeqSampleCount: 0,
+            mrnaRnaSeqV2SampleCount: 0,
+            mrnaMicroarraySampleCount: 0,
+            miRnaSampleCount: 0,
+            methylationHm27SampleCount: 0,
+            rppaSampleCount: 0,
+            completeSampleCount: 0,
+            studyId: 'panet_jhu_2011',
+            cancerTypeId: 'panet',
+            cancerType: {
+                name: 'Pancreatic Neuroendocrine Tumor',
+                clinicalTrialKeywords: 'pancreatic neuroendocrine tumor',
+                dedicatedColor: 'Purple',
+                shortName: 'PANET',
+                parent: 'pancreas',
+                cancerTypeId: 'panet',
+            },
+        },
+    },
+};
diff --git a/src/pages/resultsView/cancerSummary/styles.scss b/src/pages/resultsView/cancerSummary/styles.scss
index a378e956363..c6d0c3b9d40 100644
--- a/src/pages/resultsView/cancerSummary/styles.scss
+++ b/src/pages/resultsView/cancerSummary/styles.scss
@@ -1,6 +1,6 @@
 .cancer-summary--chart-container {
-    padding:0px 0px;
-    margin-top:10px;
+    padding: 0px 0px;
+    margin-top: 10px;
     position: relative;
     width: 100%;
     height: 600px;
@@ -9,8 +9,8 @@
 .cancer-type--summary-tab-tooltip {
     background-color: white !important;
     border: 1px solid $borderColor !important;
-    box-shadow:1px 1px 1px 1px rgba(0,0,0,.15);
-    border-radius:5px;
+    box-shadow: 1px 1px 1px 1px rgba(0, 0, 0, 0.15);
+    border-radius: 5px;
     position: absolute;
     display: block;
     padding: 8px !important;
@@ -20,88 +20,103 @@
         margin-bottom: 0px !important;
         > thead > tr > th {
             font-size: 12px;
-            line-height: 1; }}
-    th:first-child, td:first-child {
-          border-right: 2px solid #ddd;} }
+            line-height: 1;
+        }
+    }
+    th:first-child,
+    td:first-child {
+        border-right: 2px solid #ddd;
+    }
+}
 
 .cancer-summary--main-options {
-  margin-left: 5px;
-  margin-bottom:$standardMargin;
+    margin-left: 5px;
+    margin-bottom: $standardMargin;
 }
 
 .cancer-summary--chart-buttons {
-  margin-bottom:$standardMargin;
+    margin-bottom: $standardMargin;
 }
 
 .cancer-summary--form-controls {
-
-  border: 1px solid $borderColor;
-  margin-bottom:10px;
-
-  > table {
-    > tr {
-      > td {
-        padding-left: 13px;
-        padding-right: 13px;
-        padding-top: 5px;
-        padding-bottom: 5px;
-
-        &.dashed-border-right {
-          border-right: 1px dashed $borderColor;
+    border: 1px solid $borderColor;
+    margin-bottom: 10px;
+
+    > table {
+        > tr {
+            > td {
+                padding-left: 13px;
+                padding-right: 13px;
+                padding-top: 5px;
+                padding-bottom: 5px;
+
+                &.dashed-border-right {
+                    border-right: 1px dashed $borderColor;
+                }
+                &.slider-input {
+                    width: 110px;
+                }
+            }
+            &:last-child {
+                > td {
+                    padding-bottom: 10px;
+                }
+            }
         }
-        &.slider-input {
-          width: 110px;
+    }
+
+    .slider-holder {
+        display: flex;
+        align-items: flex-start;
+        width: 235px;
+        > div:first-child {
+            flex: 1 1 100%;
+            margin-bottom: 0px;
         }
-      }
-      &:last-child {
-        > td {
-         padding-bottom:10px;
+        > div:last-child {
+            margin-left: 25px;
         }
-      }
     }
-  }
-
-  .slider-holder {
-    display: flex;
-    align-items: flex-start;
-    width:235px;
-    >div:first-child {
-      flex: 1 1 100%;
-      margin-bottom: 0px;}
-    >div:last-child {margin-left: 25px;}
-  }
 
-  .rangeslider-horizontal .rangeslider__fill {
-    background-image: -webkit-linear-gradient(top,#89cdef 0,#81bfde 100%);
-    background-image: -o-linear-gradient(top,#89cdef 0,#81bfde 100%);
-    background-image: linear-gradient(to bottom,#89cdef 0,#81bfde 100%);
-    background-repeat: repeat-x;
-  }
-
-  .rangeslider__label-list .rangeslider__label {top: 20px;  }
+    .rangeslider-horizontal .rangeslider__fill {
+        background-image: -webkit-linear-gradient(top, #89cdef 0, #81bfde 100%);
+        background-image: -o-linear-gradient(top, #89cdef 0, #81bfde 100%);
+        background-image: linear-gradient(to bottom, #89cdef 0, #81bfde 100%);
+        background-repeat: repeat-x;
+    }
 
-  .rangeslider { margin: 8px 0 20px;}
+    .rangeslider__label-list .rangeslider__label {
+        top: 20px;
+    }
 
-  .slider {width:100%}
+    .rangeslider {
+        margin: 8px 0 20px;
+    }
 
-  .rangeslider-horizontal .rangeslider__handle {
-    width: 20px;
-    height: 20px;
-    border-radius: 20px;
-    &:after {
-      width: 12px;
-      height: 12px;
-      top: 3px;
-      left: 3px;}}
+    .slider {
+        width: 100%;
+    }
 
+    .rangeslider-horizontal .rangeslider__handle {
+        width: 20px;
+        height: 20px;
+        border-radius: 20px;
+        &:after {
+            width: 12px;
+            height: 12px;
+            top: 3px;
+            left: 3px;
+        }
+    }
 }
 
 .highlightInput {
     .form-control {
-      border-color: #66afe9;
-      outline: 0;
-      -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6);
-      box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6);
-  }
+        border-color: #66afe9;
+        outline: 0;
+        -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075),
+            0 0 8px rgba(102, 175, 233, 0.6);
+        box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075),
+            0 0 8px rgba(102, 175, 233, 0.6);
+    }
 }
-
diff --git a/src/pages/resultsView/cnSegments/CNSegments.tsx b/src/pages/resultsView/cnSegments/CNSegments.tsx
index 92fdb84ffa8..bf820d013ab 100644
--- a/src/pages/resultsView/cnSegments/CNSegments.tsx
+++ b/src/pages/resultsView/cnSegments/CNSegments.tsx
@@ -1,53 +1,70 @@
 import * as React from 'react';
-import {observer} from "mobx-react";
-import {action, computed, observable} from "mobx";
-import MobxPromise from "mobxpromise";
-import autobind from "autobind-decorator";
-import {Nav, NavItem} from "react-bootstrap";
-
-import {ResultsViewPageStore} from "../ResultsViewPageStore";
-import {ResultsViewTab} from "../ResultsViewPageHelpers";
-import {CopyNumberSeg, Gene, ReferenceGenomeGene} from "shared/api/generated/CBioPortalAPI";
-import IntegrativeGenomicsViewer from "shared/components/igv/IntegrativeGenomicsViewer";
-import CNSegmentsDownloader from "shared/components/cnSegments/CNSegmentsDownloader";
-import WindowStore from "shared/components/window/WindowStore";
+import { observer } from 'mobx-react';
+import { action, computed, observable } from 'mobx';
+import MobxPromise from 'mobxpromise';
+import autobind from 'autobind-decorator';
+import { Nav, NavItem } from 'react-bootstrap';
+
+import { ResultsViewPageStore } from '../ResultsViewPageStore';
+import { ResultsViewTab } from '../ResultsViewPageHelpers';
 import {
-    WHOLE_GENOME, calcSegmentTrackHeight, defaultSegmentTrackProps, generateSegmentFeatures
-} from "shared/lib/IGVUtils";
-import LoadingIndicator from "shared/components/loadingIndicator/LoadingIndicator";
-import {default as ProgressIndicator, IProgressIndicatorItem} from "shared/components/progressIndicator/ProgressIndicator";
-import {remoteData} from "cbioportal-frontend-commons";
+    CopyNumberSeg,
+    Gene,
+    ReferenceGenomeGene,
+} from 'shared/api/generated/CBioPortalAPI';
+import IntegrativeGenomicsViewer from 'shared/components/igv/IntegrativeGenomicsViewer';
+import CNSegmentsDownloader from 'shared/components/cnSegments/CNSegmentsDownloader';
+import WindowStore from 'shared/components/window/WindowStore';
+import {
+    WHOLE_GENOME,
+    calcSegmentTrackHeight,
+    defaultSegmentTrackProps,
+    generateSegmentFeatures,
+} from 'shared/lib/IGVUtils';
+import LoadingIndicator from 'shared/components/loadingIndicator/LoadingIndicator';
+import {
+    default as ProgressIndicator,
+    IProgressIndicatorItem,
+} from 'shared/components/progressIndicator/ProgressIndicator';
+import { remoteData } from 'cbioportal-frontend-commons';
 
 @observer
-export default class CNSegments extends React.Component<{ store: ResultsViewPageStore}, {}> {
-
+export default class CNSegments extends React.Component<
+    { store: ResultsViewPageStore },
+    {}
+> {
     @observable renderingComplete = false;
     @observable selectedLocus: string;
-    @observable segmentTrackMaxHeight: number|undefined;
+    @observable segmentTrackMaxHeight: number | undefined;
 
-    constructor(props: {store: ResultsViewPageStore})
-    {
+    constructor(props: { store: ResultsViewPageStore }) {
         super(props);
         this.segmentTrackMaxHeight = WindowStore.size.height * 0.7;
     }
 
     @computed get segmentTrackHeight() {
-        return calcSegmentTrackHeight(this.features, this.segmentTrackMaxHeight);
+        return calcSegmentTrackHeight(
+            this.features,
+            this.segmentTrackMaxHeight
+        );
     }
 
     @computed get activeLocus(): string {
         let locus = this.selectedLocus;
 
         if (!locus) {
-            locus = this.props.store.genes.result ?
-                this.props.store.genes.result[0].hugoGeneSymbol : WHOLE_GENOME;
+            locus = this.props.store.genes.result
+                ? this.props.store.genes.result[0].hugoGeneSymbol
+                : WHOLE_GENOME;
         }
 
         return locus;
     }
 
     @computed get features() {
-        const segments: CopyNumberSeg[] = this.activePromise ? this.activePromise.result || [] : [];
+        const segments: CopyNumberSeg[] = this.activePromise
+            ? this.activePromise.result || []
+            : [];
 
         return generateSegmentFeatures(segments);
     }
@@ -55,12 +72,15 @@ export default class CNSegments extends React.Component<{ store: ResultsViewPage
     readonly chromosome = remoteData({
         await: () => [this.props.store.hugoGeneSymbolToReferenceGene],
         invoke: () => {
-            return Promise.resolve(this.props.store.hugoGeneSymbolToReferenceGene.result![this.activeLocus].chromosome);
-        }
+            return Promise.resolve(
+                this.props.store.hugoGeneSymbolToReferenceGene.result![
+                    this.activeLocus
+                ].chromosome
+            );
+        },
     });
 
-    @computed get filename()
-    {
+    @computed get filename() {
         return `${this.props.store.downloadFilenamePrefix}segments.seg`;
     }
 
@@ -68,19 +88,21 @@ export default class CNSegments extends React.Component<{ store: ResultsViewPage
         return this.isLoading || !this.renderingComplete;
     }
 
-    @computed get isLoading()
-    {
+    @computed get isLoading() {
         return this.activePromise ? this.activePromise.isPending : true;
     }
 
     @computed get activePromise() {
         if (this.activeLocus === WHOLE_GENOME) {
             return this.props.store.cnSegments;
-        }
-        else if (this.props.store.cnSegmentsByChromosome.result && this.chromosome) {
-            return this.props.store.cnSegmentsByChromosome.result[this.chromosome.result!];
-        }
-        else {
+        } else if (
+            this.props.store.cnSegmentsByChromosome.result &&
+            this.chromosome
+        ) {
+            return this.props.store.cnSegmentsByChromosome.result[
+                this.chromosome.result!
+            ];
+        } else {
             return undefined;
         }
     }
@@ -88,7 +110,7 @@ export default class CNSegments extends React.Component<{ store: ResultsViewPage
     @computed get indicatorPromises() {
         const promises: MobxPromise<any>[] = [
             this.props.store.studies,
-            this.props.store.genes
+            this.props.store.genes,
         ];
 
         if (this.activeLocus !== WHOLE_GENOME) {
@@ -105,21 +127,28 @@ export default class CNSegments extends React.Component<{ store: ResultsViewPage
     @computed get progressItems(): IProgressIndicatorItem[] {
         return [
             {
-                label: "Loading copy number segments data...",
-                promises: this.indicatorPromises
+                label: 'Loading copy number segments data...',
+                promises: this.indicatorPromises,
             },
             {
-                label: "Rendering"
-            }
+                label: 'Rendering',
+            },
         ];
     }
 
-
     public render() {
         return (
             <div className="pillTabs">
-                <LoadingIndicator isLoading={this.isHidden} size={"big"} center={true}>
-                    <ProgressIndicator getItems={() => this.progressItems} show={this.isHidden} sequential={true}/>
+                <LoadingIndicator
+                    isLoading={this.isHidden}
+                    size={'big'}
+                    center={true}
+                >
+                    <ProgressIndicator
+                        getItems={() => this.progressItems}
+                        show={this.isHidden}
+                        sequential={true}
+                    />
                 </LoadingIndicator>
                 <CNSegmentsDownloader
                     promise={this.props.store.cnSegments}
@@ -130,32 +159,32 @@ export default class CNSegments extends React.Component<{ store: ResultsViewPage
                     activeKey={this.activeLocus}
                     onSelect={this.onTabSelect}
                 >
-                    <NavItem eventKey={WHOLE_GENOME}>
-                        Whole Genome
-                    </NavItem>
-                    {
-                        this.props.store.genes.result && this.props.store.genes.result.map((gene:Gene) => (
+                    <NavItem eventKey={WHOLE_GENOME}>Whole Genome</NavItem>
+                    {this.props.store.genes.result &&
+                        this.props.store.genes.result.map((gene: Gene) => (
                             <NavItem eventKey={gene.hugoGeneSymbol}>
                                 {gene.hugoGeneSymbol}
                             </NavItem>
-                        ))
-                    }
+                        ))}
                 </Nav>
-                <div style={this.isHidden ? {opacity: 0} : undefined}>
+                <div style={this.isHidden ? { opacity: 0 } : undefined}>
                     <IntegrativeGenomicsViewer
                         tracks={[
                             {
                                 ...defaultSegmentTrackProps(),
                                 height: this.segmentTrackHeight,
-                                features: this.features
-                            }
+                                features: this.features,
+                            },
                         ]}
                         genome={this.props.store.referenceGenome}
                         locus={this.activeLocus}
                         onRenderingStart={this.onIgvRenderingStart}
                         onRenderingComplete={this.onIgvRenderingComplete}
                         disableSearch={this.activeLocus !== WHOLE_GENOME}
-                        isVisible={this.props.store.tabId === ResultsViewTab.CN_SEGMENTS && !this.isHidden}
+                        isVisible={
+                            this.props.store.tabId ===
+                                ResultsViewTab.CN_SEGMENTS && !this.isHidden
+                        }
                     />
                 </div>
             </div>
@@ -163,18 +192,21 @@ export default class CNSegments extends React.Component<{ store: ResultsViewPage
     }
 
     @autobind
-    @action private onTabSelect(id: any) {
+    @action
+    private onTabSelect(id: any) {
         this.selectedLocus = id;
     }
 
     @autobind
-    @action private onIgvRenderingStart() {
+    @action
+    private onIgvRenderingStart() {
         // we would like to keep the loader icon in the rendering state until initial IGV rendering is complete
         this.renderingComplete = false;
     }
 
     @autobind
-    @action private onIgvRenderingComplete() {
+    @action
+    private onIgvRenderingComplete() {
         this.renderingComplete = true;
     }
 }
diff --git a/src/pages/resultsView/coExpression/CoExpressionPlot.tsx b/src/pages/resultsView/coExpression/CoExpressionPlot.tsx
index 4e8445befac..2fcfc65fb5b 100644
--- a/src/pages/resultsView/coExpression/CoExpressionPlot.tsx
+++ b/src/pages/resultsView/coExpression/CoExpressionPlot.tsx
@@ -1,71 +1,73 @@
-import * as React from "react";
-import {computed} from "mobx";
-import {observer, Observer} from "mobx-react";
-import {MolecularProfile} from "../../../shared/api/generated/CBioPortalAPI";
-import {GeneticEntity} from "../ResultsViewPageStore";
-import {getSampleViewUrl} from "../../../shared/api/urls";
-import "./styles.scss";
-import {bind} from "bind-decorator";
-import ScatterPlot from "../../../shared/components/plots/ScatterPlot";
-import {DownloadControls} from "cbioportal-frontend-commons";
-import {axisLabel, isNotProfiled} from "./CoExpressionPlotUtils";
-import _ from "lodash";
-import {scatterPlotSize} from "../../../shared/components/plots/PlotUtils";
+import * as React from 'react';
+import { computed } from 'mobx';
+import { observer, Observer } from 'mobx-react';
+import { MolecularProfile } from '../../../shared/api/generated/CBioPortalAPI';
+import { GeneticEntity } from '../ResultsViewPageStore';
+import { getSampleViewUrl } from '../../../shared/api/urls';
+import './styles.scss';
+import { bind } from 'bind-decorator';
+import ScatterPlot from '../../../shared/components/plots/ScatterPlot';
+import { DownloadControls } from 'cbioportal-frontend-commons';
+import { axisLabel, isNotProfiled } from './CoExpressionPlotUtils';
+import _ from 'lodash';
+import { scatterPlotSize } from '../../../shared/components/plots/PlotUtils';
 import { IAxisLogScaleParams } from 'pages/resultsView/plots/PlotsTabUtils';
 
 export interface ICoExpressionPlotProps {
-    xAxisGeneticEntity:GeneticEntity;
-    yAxisGeneticEntity:GeneticEntity;
-    data:CoExpressionPlotData[];
-    molecularProfileY:MolecularProfile;
-    molecularProfileX:MolecularProfile;
+    xAxisGeneticEntity: GeneticEntity;
+    yAxisGeneticEntity: GeneticEntity;
+    data: CoExpressionPlotData[];
+    molecularProfileY: MolecularProfile;
+    molecularProfileX: MolecularProfile;
 
-    height:number;
-    width:number;
+    height: number;
+    width: number;
 
-    showLogScaleControls?:boolean;
-    showMutationControls?:boolean;
-    showMutations?:boolean;
-    logScale?:boolean;
-    showRegressionLine:boolean;
-    handlers:{
-        onClickShowMutations?:()=>void,
-        onClickLogScale?:()=>void,
-        onClickShowRegressionLine:()=>void
+    showLogScaleControls?: boolean;
+    showMutationControls?: boolean;
+    showMutations?: boolean;
+    logScale?: boolean;
+    showRegressionLine: boolean;
+    handlers: {
+        onClickShowMutations?: () => void;
+        onClickLogScale?: () => void;
+        onClickShowRegressionLine: () => void;
     };
 }
 
 export type CoExpressionPlotData = {
-    x:number,
-    y:number,
-    mutationsX:string,
-    mutationsY:string,
-    profiledX:boolean,
-    profiledY:boolean,
-    studyId:string,
-    sampleId:string
+    x: number;
+    y: number;
+    mutationsX: string;
+    mutationsY: string;
+    profiledX: boolean;
+    profiledY: boolean;
+    studyId: string;
+    sampleId: string;
 };
 
-class CoExpressionScatterPlot extends ScatterPlot<CoExpressionPlotData>{}
+class CoExpressionScatterPlot extends ScatterPlot<CoExpressionPlotData> {}
 
-const NO_MUT_STROKE = "#0174df";
-const NO_MUT_FILL = "#58acfa";
-const X_MUT_STROKE = "#886A08";
-const X_MUT_FILL = "#DBA901";
-const Y_MUT_STROKE = "#F7819F";
-const Y_MUT_FILL = "#F5A9F2";
-const BOTH_MUT_STROKE = "#B40404";
-const BOTH_MUT_FILL = "#FF0000";
-const NOT_PROFILED_STROKE = "#d3d3d3";
-const NOT_PROFILED_FILL = "#ffffff";
+const NO_MUT_STROKE = '#0174df';
+const NO_MUT_FILL = '#58acfa';
+const X_MUT_STROKE = '#886A08';
+const X_MUT_FILL = '#DBA901';
+const Y_MUT_STROKE = '#F7819F';
+const Y_MUT_FILL = '#F5A9F2';
+const BOTH_MUT_STROKE = '#B40404';
+const BOTH_MUT_FILL = '#FF0000';
+const NOT_PROFILED_STROKE = '#d3d3d3';
+const NOT_PROFILED_FILL = '#ffffff';
 
-function noop() {};
+function noop() {}
 
-const SVG_ID = "coexpression-plot-svg";
+const SVG_ID = 'coexpression-plot-svg';
 
 @observer
-export default class CoExpressionPlot extends React.Component<ICoExpressionPlotProps, {}> {
-
+export default class CoExpressionPlot extends React.Component<
+    ICoExpressionPlotProps,
+    {}
+> {
     @bind
     private getSvg() {
         return document.getElementById(SVG_ID) as SVGElement | null;
@@ -73,7 +75,12 @@ export default class CoExpressionPlot extends React.Component<ICoExpressionPlotP
 
     @computed get stroke() {
         if (this.props.showMutations) {
-            return (d:{mutationsX:string, mutationsY:string, profiledX:boolean, profiledY:boolean})=>{
+            return (d: {
+                mutationsX: string;
+                mutationsY: string;
+                profiledX: boolean;
+                profiledY: boolean;
+            }) => {
                 if (isNotProfiled(d)) {
                     return NOT_PROFILED_STROKE;
                 } else if (d.mutationsX && d.mutationsY) {
@@ -93,7 +100,12 @@ export default class CoExpressionPlot extends React.Component<ICoExpressionPlotP
 
     @computed get fill() {
         if (this.props.showMutations) {
-            return (d:{mutationsX:string, mutationsY:string, profiledX:boolean, profiledY:boolean})=>{
+            return (d: {
+                mutationsX: string;
+                mutationsY: string;
+                profiledX: boolean;
+                profiledY: boolean;
+            }) => {
                 if (isNotProfiled(d)) {
                     return NOT_PROFILED_FILL;
                 } else if (d.mutationsX && d.mutationsY) {
@@ -138,32 +150,41 @@ export default class CoExpressionPlot extends React.Component<ICoExpressionPlotP
         const ret = [];
         if (hasX) {
             ret.push({
-                name: [this.props.xAxisGeneticEntity.geneticEntityName, "mutated"],
-                symbol: { fill: X_MUT_FILL, stroke: X_MUT_STROKE }
+                name: [
+                    this.props.xAxisGeneticEntity.geneticEntityName,
+                    'mutated',
+                ],
+                symbol: { fill: X_MUT_FILL, stroke: X_MUT_STROKE },
             });
         }
         if (hasY) {
             ret.push({
-                name: [this.props.yAxisGeneticEntity.geneticEntityName, "mutated"],
-                symbol: { fill: Y_MUT_FILL, stroke: Y_MUT_STROKE }
+                name: [
+                    this.props.yAxisGeneticEntity.geneticEntityName,
+                    'mutated',
+                ],
+                symbol: { fill: Y_MUT_FILL, stroke: Y_MUT_STROKE },
             });
         }
         if (hasBoth) {
             ret.push({
                 name: `Both mutated`,
-                symbol: { fill: BOTH_MUT_FILL, stroke: BOTH_MUT_STROKE }
+                symbol: { fill: BOTH_MUT_FILL, stroke: BOTH_MUT_STROKE },
             });
         }
         if (hasNone) {
             ret.push({
                 name: `Neither mutated`,
-                symbol: { fill: NO_MUT_FILL, stroke: NO_MUT_STROKE }
+                symbol: { fill: NO_MUT_FILL, stroke: NO_MUT_STROKE },
             });
         }
         if (hasNotProfiled) {
             ret.push({
-                name: "Not profiled for mutations",
-                symbol: { fill: NOT_PROFILED_FILL, stroke: NOT_PROFILED_STROKE }
+                name: 'Not profiled for mutations',
+                symbol: {
+                    fill: NOT_PROFILED_FILL,
+                    stroke: NOT_PROFILED_STROKE,
+                },
             });
         }
         return ret;
@@ -172,7 +193,7 @@ export default class CoExpressionPlot extends React.Component<ICoExpressionPlotP
     @computed get data() {
         // sort in order to set z index in plot
         // order: both mutated, one mutated, neither mutated, not profiled
-        return _.sortBy(this.props.data, d=>{
+        return _.sortBy(this.props.data, d => {
             if (d.mutationsX && d.mutationsY) {
                 return 3;
             } else if (d.mutationsX || d.mutationsY) {
@@ -190,24 +211,38 @@ export default class CoExpressionPlot extends React.Component<ICoExpressionPlotP
     }
 
     @computed get axisLabelX() {
-        return axisLabel({geneticEntityName: this.props.xAxisGeneticEntity.geneticEntityName}, this.axisLogScaleFunction, this.props.molecularProfileX.name);
+        return axisLabel(
+            {
+                geneticEntityName: this.props.xAxisGeneticEntity
+                    .geneticEntityName,
+            },
+            this.axisLogScaleFunction,
+            this.props.molecularProfileX.name
+        );
     }
 
     @computed get axisLabelY() {
-        return axisLabel({geneticEntityName: this.props.yAxisGeneticEntity.geneticEntityName}, this.axisLogScaleFunction, this.props.molecularProfileY.name);
+        return axisLabel(
+            {
+                geneticEntityName: this.props.yAxisGeneticEntity
+                    .geneticEntityName,
+            },
+            this.axisLogScaleFunction,
+            this.props.molecularProfileY.name
+        );
     }
 
-    @computed get axisLogScaleFunction():IAxisLogScaleParams|undefined {
-
+    @computed get axisLogScaleFunction(): IAxisLogScaleParams | undefined {
         const MIN_LOG_ARGUMENT = 0.01;
 
         if (!this.props.logScale) {
             return undefined;
         }
         return {
-            label: "log2",
-            fLogScale: (x:number, offset:number) => Math.log2(Math.max(x, MIN_LOG_ARGUMENT)),
-            fInvLogScale: (x:number) => Math.pow(2, x)
+            label: 'log2',
+            fLogScale: (x: number, offset: number) =>
+                Math.log2(Math.max(x, MIN_LOG_ARGUMENT)),
+            fInvLogScale: (x: number) => Math.pow(2, x),
         };
     }
 
@@ -243,54 +278,71 @@ export default class CoExpressionPlot extends React.Component<ICoExpressionPlotP
     @bind
     private toolbar() {
         return (
-            <div style={{textAlign:"center", position:"relative"}}>
-                <div style={{display:"inline-block"}}>
+            <div style={{ textAlign: 'center', position: 'relative' }}>
+                <div style={{ display: 'inline-block' }}>
                     {this.props.showMutationControls && (
-                        <div className="checkbox coexpression-plot-toolbar-elt"><label>
-                            <input
-                                type="checkbox"
-                                checked={this.props.showMutations}
-                                onClick={this.props.handlers.onClickShowMutations || noop}
-                                data-test="ShowMutations"
-                            />Show Mutations
-                        </label></div>
+                        <div className="checkbox coexpression-plot-toolbar-elt">
+                            <label>
+                                <input
+                                    type="checkbox"
+                                    checked={this.props.showMutations}
+                                    onClick={
+                                        this.props.handlers
+                                            .onClickShowMutations || noop
+                                    }
+                                    data-test="ShowMutations"
+                                />
+                                Show Mutations
+                            </label>
+                        </div>
                     )}
                     {this.props.showLogScaleControls && (
                         <div className="coexpression-plot-toolbar-elt">
-                            <div className="checkbox coexpression-plot-toolbar-elt"><label>
-                                <input
-                                    type="checkbox"
-                                    checked={this.props.logScale}
-                                    onClick={this.props.handlers.onClickLogScale || noop}
-                                    data-test="logScale"
-                                />Log Scale
-                            </label></div>
+                            <div className="checkbox coexpression-plot-toolbar-elt">
+                                <label>
+                                    <input
+                                        type="checkbox"
+                                        checked={this.props.logScale}
+                                        onClick={
+                                            this.props.handlers
+                                                .onClickLogScale || noop
+                                        }
+                                        data-test="logScale"
+                                    />
+                                    Log Scale
+                                </label>
+                            </div>
                         </div>
                     )}
-                    <div className="checkbox coexpression-plot-toolbar-elt"><label>
-                        <input
-                            type="checkbox"
-                            checked={this.props.showRegressionLine}
-                            onClick={this.props.handlers.onClickShowRegressionLine}
-                            data-test="ShowRegressionLine"
-                        />Show Regression Line
-                    </label></div>
+                    <div className="checkbox coexpression-plot-toolbar-elt">
+                        <label>
+                            <input
+                                type="checkbox"
+                                checked={this.props.showRegressionLine}
+                                onClick={
+                                    this.props.handlers
+                                        .onClickShowRegressionLine
+                                }
+                                data-test="ShowRegressionLine"
+                            />
+                            Show Regression Line
+                        </label>
+                    </div>
                 </div>
 
                 <DownloadControls
                     getSvg={this.getSvg}
                     filename="coexpression"
                     dontFade={true}
-                    type='button'
-                    style={{position:"absolute", top:0, right:0}}
+                    type="button"
+                    style={{ position: 'absolute', top: 0, right: 0 }}
                 />
-
             </div>
         );
     }
 
     @bind
-    private tooltip(d:CoExpressionPlotData) {
+    private tooltip(d: CoExpressionPlotData) {
         return (
             <div>
                 <div>
@@ -314,7 +366,8 @@ export default class CoExpressionPlot extends React.Component<ICoExpressionPlotP
                 {d.mutationsX && (
                     <div>
                         <span>
-                            {this.props.xAxisGeneticEntity.geneticEntityName} Mutation:&nbsp;
+                            {this.props.xAxisGeneticEntity.geneticEntityName}{' '}
+                            Mutation:&nbsp;
                             <b>{d.mutationsX}</b>
                         </span>
                     </div>
@@ -322,7 +375,8 @@ export default class CoExpressionPlot extends React.Component<ICoExpressionPlotP
                 {d.mutationsY && (
                     <div>
                         <span>
-                            {this.props.yAxisGeneticEntity.geneticEntityName} Mutation:&nbsp;
+                            {this.props.yAxisGeneticEntity.geneticEntityName}{' '}
+                            Mutation:&nbsp;
                             <b>{d.mutationsY}</b>
                         </span>
                     </div>
@@ -333,13 +387,12 @@ export default class CoExpressionPlot extends React.Component<ICoExpressionPlotP
 
     render() {
         return (
-            <div className="borderedChart inlineBlock" data-test="CoExpressionPlot">
-                <Observer>
-                    {this.toolbar}
-                </Observer>
-                <Observer>
-                    {this.plot}
-                </Observer>
+            <div
+                className="borderedChart inlineBlock"
+                data-test="CoExpressionPlot"
+            >
+                <Observer>{this.toolbar}</Observer>
+                <Observer>{this.plot}</Observer>
             </div>
         );
     }
diff --git a/src/pages/resultsView/coExpression/CoExpressionPlotUtils.spec.ts b/src/pages/resultsView/coExpression/CoExpressionPlotUtils.spec.ts
index 89c5674d4b3..047de831d31 100644
--- a/src/pages/resultsView/coExpression/CoExpressionPlotUtils.spec.ts
+++ b/src/pages/resultsView/coExpression/CoExpressionPlotUtils.spec.ts
@@ -1,25 +1,35 @@
-import {assert} from "chai";
-import {getUniquePrecision} from "./CoExpressionPlotUtils";
+import { assert } from 'chai';
+import { getUniquePrecision } from './CoExpressionPlotUtils';
 
-describe("CoExpressionPlotUtils", ()=>{
-    describe("getUniquePrecision", ()=>{
-        it("empty array", ()=>{
+describe('CoExpressionPlotUtils', () => {
+    describe('getUniquePrecision', () => {
+        it('empty array', () => {
             assert.equal(getUniquePrecision(0, []), 0);
         });
-        it("value not present", ()=>{
+        it('value not present', () => {
             assert.equal(getUniquePrecision(0, [1]), 0);
         });
-        it("completely unique", ()=>{
-            assert.equal(getUniquePrecision(23,[11,2,23,43,59, 0]), 0);
+        it('completely unique', () => {
+            assert.equal(getUniquePrecision(23, [11, 2, 23, 43, 59, 0]), 0);
         });
-        it("unique at one decimal", ()=>{
+        it('unique at one decimal', () => {
             assert.equal(getUniquePrecision(1.5, [1.2, 1.6, 2, 5, 1.5]), 1);
         });
-        it("unique at 2 decimals", ()=>{
-            assert.equal(getUniquePrecision(6.51, [1.23, 1.6, 6.53, 5, 6.51]), 2);
+        it('unique at 2 decimals', () => {
+            assert.equal(
+                getUniquePrecision(6.51, [1.23, 1.6, 6.53, 5, 6.51]),
+                2
+            );
         });
-        it("unique at 5 decimals", ()=>{
-            assert.equal(getUniquePrecision(1.23456, [1.23456, 1.23459, 2.23456, 43.31314, 5], 10), 5);
+        it('unique at 5 decimals', () => {
+            assert.equal(
+                getUniquePrecision(
+                    1.23456,
+                    [1.23456, 1.23459, 2.23456, 43.31314, 5],
+                    10
+                ),
+                5
+            );
         });
     });
-});
\ No newline at end of file
+});
diff --git a/src/pages/resultsView/coExpression/CoExpressionPlotUtils.ts b/src/pages/resultsView/coExpression/CoExpressionPlotUtils.ts
index 5f7da5a3f09..472beff7afd 100644
--- a/src/pages/resultsView/coExpression/CoExpressionPlotUtils.ts
+++ b/src/pages/resultsView/coExpression/CoExpressionPlotUtils.ts
@@ -1,12 +1,19 @@
-import _ from "lodash";
+import _ from 'lodash';
 import { IAxisLogScaleParams } from 'pages/resultsView/plots/PlotsTabUtils';
 
-export function getUniquePrecision(value:number, allValues:number[], maxPrecision:number=3) {
-    if (!allValues.length)
-        return 0;
+export function getUniquePrecision(
+    value: number,
+    allValues: number[],
+    maxPrecision: number = 3
+) {
+    if (!allValues.length) return 0;
 
     let precision = 0;
-    while (_.countBy(allValues, val=>val.toFixed(precision))[value.toFixed(precision)] > 1) {
+    while (
+        _.countBy(allValues, val => val.toFixed(precision))[
+            value.toFixed(precision)
+        ] > 1
+    ) {
         precision++;
 
         if (precision >= maxPrecision) {
@@ -16,10 +23,16 @@ export function getUniquePrecision(value:number, allValues:number[], maxPrecisio
     return precision;
 }
 
-export function axisLabel(geneticEntity:{geneticEntityName:string}, logScale:IAxisLogScaleParams|undefined, profileName:string) {
-    return `${profileName}: ${geneticEntity.geneticEntityName} ${logScale ? `(${logScale.label}) ` : ""}`;
+export function axisLabel(
+    geneticEntity: { geneticEntityName: string },
+    logScale: IAxisLogScaleParams | undefined,
+    profileName: string
+) {
+    return `${profileName}: ${geneticEntity.geneticEntityName} ${
+        logScale ? `(${logScale.label}) ` : ''
+    }`;
 }
 
-export function isNotProfiled(d:{profiledX:boolean, profiledY:boolean}) {
+export function isNotProfiled(d: { profiledX: boolean; profiledY: boolean }) {
     return !d.profiledX && !d.profiledY;
-}
\ No newline at end of file
+}
diff --git a/src/pages/resultsView/coExpression/CoExpressionTab.tsx b/src/pages/resultsView/coExpression/CoExpressionTab.tsx
index 9e4adadb779..aca6e6de7c7 100644
--- a/src/pages/resultsView/coExpression/CoExpressionTab.tsx
+++ b/src/pages/resultsView/coExpression/CoExpressionTab.tsx
@@ -1,280 +1,408 @@
-import * as React from "react";
-import {MolecularProfile} from "../../../shared/api/generated/CBioPortalAPI";
-import {action, computed, observable} from "mobx";
-import {observer, Observer} from "mobx-react";
-import {AlterationTypeConstants, ResultsViewPageStore, GeneticEntity, GeneticEntityType} from "../ResultsViewPageStore";
-import Select from "react-select1";
-import internalClient from "../../../shared/api/cbioportalInternalClientInstance";
-import {CoExpression, CoExpressionFilter, Geneset} from "../../../shared/api/generated/CBioPortalAPIInternal";
-import _ from "lodash";
-import {MSKTab, MSKTabs} from "../../../shared/components/MSKTabs/MSKTabs";
-import CoExpressionViz from "./CoExpressionViz";
-import LoadingIndicator from "shared/components/loadingIndicator/LoadingIndicator";
-import {filterAndSortProfiles, getGenesetProfiles, getProfileOptions, CoExpressionWithEntityInfo} from "./CoExpressionTabUtils";
-import MobxPromiseCache from "../../../shared/lib/MobxPromiseCache";
-import {ICoExpressionPlotProps} from "./CoExpressionPlot";
-import {bind} from "bind-decorator";
-import OqlStatusBanner from "../../../shared/components/banners/OqlStatusBanner";
-import {getMobxPromiseGroupStatus} from "../../../shared/lib/getMobxPromiseGroupStatus";
-import {IDataQueryFilter} from "shared/lib/StoreUtils";
-import {remoteData} from "cbioportal-frontend-commons";
-import AlterationFilterWarning from "../../../shared/components/banners/AlterationFilterWarning";
+import * as React from 'react';
+import { MolecularProfile } from '../../../shared/api/generated/CBioPortalAPI';
+import { action, computed, observable } from 'mobx';
+import { observer, Observer } from 'mobx-react';
+import {
+    AlterationTypeConstants,
+    ResultsViewPageStore,
+    GeneticEntity,
+    GeneticEntityType,
+} from '../ResultsViewPageStore';
+import Select from 'react-select1';
+import internalClient from '../../../shared/api/cbioportalInternalClientInstance';
+import {
+    CoExpression,
+    CoExpressionFilter,
+    Geneset,
+} from '../../../shared/api/generated/CBioPortalAPIInternal';
+import _ from 'lodash';
+import { MSKTab, MSKTabs } from '../../../shared/components/MSKTabs/MSKTabs';
+import CoExpressionViz from './CoExpressionViz';
+import LoadingIndicator from 'shared/components/loadingIndicator/LoadingIndicator';
+import {
+    filterAndSortProfiles,
+    getGenesetProfiles,
+    getProfileOptions,
+    CoExpressionWithEntityInfo,
+} from './CoExpressionTabUtils';
+import MobxPromiseCache from '../../../shared/lib/MobxPromiseCache';
+import { ICoExpressionPlotProps } from './CoExpressionPlot';
+import { bind } from 'bind-decorator';
+import OqlStatusBanner from '../../../shared/components/banners/OqlStatusBanner';
+import { getMobxPromiseGroupStatus } from '../../../shared/lib/getMobxPromiseGroupStatus';
+import { IDataQueryFilter } from 'shared/lib/StoreUtils';
+import { remoteData } from 'cbioportal-frontend-commons';
+import AlterationFilterWarning from '../../../shared/components/banners/AlterationFilterWarning';
 
 export interface ICoExpressionTabProps {
-    store:ResultsViewPageStore;
+    store: ResultsViewPageStore;
 }
 
-export class CoExpressionCache extends MobxPromiseCache<{profileX: MolecularProfile,
-    profileY: MolecularProfile, geneticEntityId: string,
-    geneticEntityType: GeneticEntityType, allData:boolean}, CoExpressionWithEntityInfo[]> {}
+export class CoExpressionCache extends MobxPromiseCache<
+    {
+        profileX: MolecularProfile;
+        profileY: MolecularProfile;
+        geneticEntityId: string;
+        geneticEntityType: GeneticEntityType;
+        allData: boolean;
+    },
+    CoExpressionWithEntityInfo[]
+> {}
 
 @observer
-export default class CoExpressionTab extends React.Component<ICoExpressionTabProps, {}> {
-    @observable _selectedProfileX:string|undefined; // only undefined initially, until molecular profiles downloaded
-    @observable _selectedProfileY:string|undefined; // only undefined initially, until molecular profiles downloaded
-    @observable _selectedGeneticEntity:GeneticEntity|undefined; // only undefined initially, until genes and gene sets downloaded
-
-    readonly selectedProfileX = remoteData<string|undefined>({
-        await: ()=>[
-            this.xProfileOptions
-        ],
+export default class CoExpressionTab extends React.Component<
+    ICoExpressionTabProps,
+    {}
+> {
+    @observable _selectedProfileX: string | undefined; // only undefined initially, until molecular profiles downloaded
+    @observable _selectedProfileY: string | undefined; // only undefined initially, until molecular profiles downloaded
+    @observable _selectedGeneticEntity: GeneticEntity | undefined; // only undefined initially, until genes and gene sets downloaded
+
+    readonly selectedProfileX = remoteData<string | undefined>({
+        await: () => [this.xProfileOptions],
         invoke: () => {
-            if (!this._selectedProfileX && this.xProfileOptions.result!.length > 0) {
+            if (
+                !this._selectedProfileX &&
+                this.xProfileOptions.result!.length > 0
+            ) {
                 return Promise.resolve(this.xProfileOptions.result![0].value);
             } else {
                 return Promise.resolve(this._selectedProfileX);
             }
-        }
+        },
     });
 
-    readonly selectedProfileY = remoteData<string|undefined>({
-        await: ()=>[
-            this.yProfileOptions
-        ],
+    readonly selectedProfileY = remoteData<string | undefined>({
+        await: () => [this.yProfileOptions],
         invoke: () => {
-            if (!this._selectedProfileY && this.yProfileOptions.result!.length > 0) {
+            if (
+                !this._selectedProfileY &&
+                this.yProfileOptions.result!.length > 0
+            ) {
                 return Promise.resolve(this.yProfileOptions.result![0].value);
             } else {
                 return Promise.resolve(this._selectedProfileY);
             }
-        }
+        },
     });
 
     readonly selectedGeneticEntity = remoteData<GeneticEntity>({
-        await: ()=>[
-            this.props.store.geneticEntities
-        ],
+        await: () => [this.props.store.geneticEntities],
         invoke: () => {
             if (!this._selectedGeneticEntity) {
-                return Promise.resolve(this.props.store.geneticEntities.result![0]);
+                return Promise.resolve(
+                    this.props.store.geneticEntities.result![0]
+                );
             } else {
                 return Promise.resolve(this._selectedGeneticEntity);
             }
-        }
+        },
     });
 
     readonly isSelectedGeneticEntityAGeneSet = remoteData<boolean>({
-        await: ()=>[
-            this.props.store.geneticEntities
-        ],
+        await: () => [this.props.store.geneticEntities],
         invoke: () => {
             if (this._selectedGeneticEntity) {
-                for (const geneticEntity of this.props.store.geneticEntities.result!) {
-                    if (geneticEntity.geneticEntityType === GeneticEntityType.GENESET && geneticEntity.geneticEntityId === this._selectedGeneticEntity!.geneticEntityId) {
+                for (const geneticEntity of this.props.store.geneticEntities
+                    .result!) {
+                    if (
+                        geneticEntity.geneticEntityType ===
+                            GeneticEntityType.GENESET &&
+                        geneticEntity.geneticEntityId ===
+                            this._selectedGeneticEntity!.geneticEntityId
+                    ) {
                         return Promise.resolve(true);
                     }
                 }
             }
             return Promise.resolve(false);
-        }
+        },
     });
 
     @observable private plotState = {
         plotLogScale: false,
         plotShowMutations: true,
-        plotShowRegressionLine: false
+        plotShowRegressionLine: false,
     };
 
-    private plotHandlers: ICoExpressionPlotProps["handlers"];
+    private plotHandlers: ICoExpressionPlotProps['handlers'];
 
-    constructor(props:ICoExpressionTabProps) {
+    constructor(props: ICoExpressionTabProps) {
         super(props);
 
         (window as any).resultsViewCoExpressionTab = this; // for testing
 
         this.plotHandlers = {
-            onClickLogScale: action(()=>{
+            onClickLogScale: action(() => {
                 this.plotState.plotLogScale = !this.plotState.plotLogScale;
             }),
-            onClickShowMutations: action(()=>{
-                this.plotState.plotShowMutations = !this.plotState.plotShowMutations;
+            onClickShowMutations: action(() => {
+                this.plotState.plotShowMutations = !this.plotState
+                    .plotShowMutations;
+            }),
+            onClickShowRegressionLine: action(() => {
+                this.plotState.plotShowRegressionLine = !this.plotState
+                    .plotShowRegressionLine;
             }),
-            onClickShowRegressionLine: action(()=>{
-                this.plotState.plotShowRegressionLine = !this.plotState.plotShowRegressionLine;
-            })
         };
     }
 
     @bind
-    public onSelectProfileX(option:any) {
+    public onSelectProfileX(option: any) {
         this._selectedProfileX = option.value;
     }
 
     @bind
-    public onSelectProfileY(option:any) {
+    public onSelectProfileY(option: any) {
         this._selectedProfileY = option.value;
     }
 
     @bind
-    private onSelectGeneticEntity(geneticEntityId:string) {
+    private onSelectGeneticEntity(geneticEntityId: string) {
         if (this.props.store.geneticEntities.isComplete) {
-            for (const geneticEntity of this.props.store.geneticEntities.result) {
-                if (geneticEntity.geneticEntityId.toString() === geneticEntityId) {
+            for (const geneticEntity of this.props.store.geneticEntities
+                .result) {
+                if (
+                    geneticEntity.geneticEntityId.toString() === geneticEntityId
+                ) {
                     this._selectedGeneticEntity = geneticEntity;
                 }
             }
         } else {
-            throw new Error("Invalid Genetic Entity");
+            throw new Error('Invalid Genetic Entity');
         }
     }
 
     @computed get hasMutationData() {
         return !!_.find(
             this.props.store.molecularProfilesWithData.result,
-            profile=>profile.molecularAlterationType === AlterationTypeConstants.MUTATION_EXTENDED
+            profile =>
+                profile.molecularAlterationType ===
+                AlterationTypeConstants.MUTATION_EXTENDED
         );
     }
 
-    readonly xProfileOptions = remoteData<{label:string, value:string}[]> ({
-        await: ()=>[
+    readonly xProfileOptions = remoteData<{ label: string; value: string }[]>({
+        await: () => [
             this.props.store.coexpressionTabMolecularProfiles,
             this.isSelectedGeneticEntityAGeneSet,
-            this.props.store.molecularProfileIdToProfiledSampleCount
+            this.props.store.molecularProfileIdToProfiledSampleCount,
         ],
         invoke: () => {
             let filteredProfiles: MolecularProfile[] = [];
             if (this.isSelectedGeneticEntityAGeneSet.result!) {
-                filteredProfiles = getGenesetProfiles(this.props.store.coexpressionTabMolecularProfiles.result!);
+                filteredProfiles = getGenesetProfiles(
+                    this.props.store.coexpressionTabMolecularProfiles.result!
+                );
             } else {
-                filteredProfiles = filterAndSortProfiles(this.props.store.coexpressionTabMolecularProfiles.result!);
+                filteredProfiles = filterAndSortProfiles(
+                    this.props.store.coexpressionTabMolecularProfiles.result!
+                );
             }
-            return Promise.resolve(getProfileOptions(filteredProfiles, this.props.store.molecularProfileIdToProfiledSampleCount.result!));
-        }
-    })
+            return Promise.resolve(
+                getProfileOptions(
+                    filteredProfiles,
+                    this.props.store.molecularProfileIdToProfiledSampleCount
+                        .result!
+                )
+            );
+        },
+    });
 
-    readonly yProfileOptions = remoteData<{label:string, value:string}[]> ({
-        await: ()=>[
+    readonly yProfileOptions = remoteData<{ label: string; value: string }[]>({
+        await: () => [
             this.props.store.coexpressionTabMolecularProfiles,
-            this.props.store.molecularProfileIdToProfiledSampleCount
+            this.props.store.molecularProfileIdToProfiledSampleCount,
         ],
         invoke: () => {
-            return Promise.resolve(getProfileOptions(
-                this.props.store.coexpressionTabMolecularProfiles.result!,
-                this.props.store.molecularProfileIdToProfiledSampleCount.result!
-                ));
-        }
-    })
+            return Promise.resolve(
+                getProfileOptions(
+                    this.props.store.coexpressionTabMolecularProfiles.result!,
+                    this.props.store.molecularProfileIdToProfiledSampleCount
+                        .result!
+                )
+            );
+        },
+    });
 
     /**
      * We need a different "dataQueryFilter" from the rest of the functions in ResultsViewPageStore,
      * so this function is building a new object based on the dataQueryFilter obtained from
      * this.props.store.studyToDataQueryFilter.result.
      */
-    private createDataQueryFilterForCoExpression(studyToDataQueryFilter: IDataQueryFilter, geneticEntityId: string, geneticEntityType: string) {
-        let dataQueryFilter: {'entrezGeneId'?: number; 'genesetId'?: string; 'sampleIds'?: string[]; 'sampleListId'?: string}|undefined = undefined;
+    private createDataQueryFilterForCoExpression(
+        studyToDataQueryFilter: IDataQueryFilter,
+        geneticEntityId: string,
+        geneticEntityType: string
+    ) {
+        let dataQueryFilter:
+            | {
+                  entrezGeneId?: number;
+                  genesetId?: string;
+                  sampleIds?: string[];
+                  sampleListId?: string;
+              }
+            | undefined = undefined;
         if (geneticEntityType === GeneticEntityType.GENE) {
-            dataQueryFilter = {...studyToDataQueryFilter, entrezGeneId: parseFloat(geneticEntityId)};
+            dataQueryFilter = {
+                ...studyToDataQueryFilter,
+                entrezGeneId: parseFloat(geneticEntityId),
+            };
         } else if (geneticEntityType === GeneticEntityType.GENESET) {
-            dataQueryFilter = {...studyToDataQueryFilter, genesetId: geneticEntityId};
+            dataQueryFilter = {
+                ...studyToDataQueryFilter,
+                genesetId: geneticEntityId,
+            };
         }
         return dataQueryFilter;
     }
 
-    private coExpressionCache:CoExpressionCache = new CoExpressionCache(
-        q=>({
+    private coExpressionCache: CoExpressionCache = new CoExpressionCache(
+        q => ({
             await: () => [this.props.store.entrezGeneIdToReferenceGene],
-            invoke: async ()=>{
+            invoke: async () => {
                 let threshold = 0.3;
                 if (q.allData) {
                     threshold = 0;
                 }
                 const dataQueryFilter = this.createDataQueryFilterForCoExpression(
-                    this.props.store.studyToDataQueryFilter.result![q.profileX.studyId], q.geneticEntityId, q.geneticEntityType);
+                    this.props.store.studyToDataQueryFilter.result![
+                        q.profileX.studyId
+                    ],
+                    q.geneticEntityId,
+                    q.geneticEntityType
+                );
                 if (dataQueryFilter != undefined) {
-
                     // temporarily point coexpression traffic to master cbioportal instance
-                    const $domain = (window.location.hostname === "www.cbioportal.org") ? "https://master.cbioportal.org/api" : undefined;
-
-                    const data = await internalClient.fetchCoExpressionsUsingPOST({
-                        molecularProfileIdA: q.profileX.molecularProfileId,
-                        molecularProfileIdB: q.profileY.molecularProfileId,
-                        coExpressionFilter: dataQueryFilter as CoExpressionFilter,
-                        threshold,
-                        $domain
-                    });
+                    const $domain =
+                        window.location.hostname === 'www.cbioportal.org'
+                            ? 'https://master.cbioportal.org/api'
+                            : undefined;
+
+                    const data = await internalClient.fetchCoExpressionsUsingPOST(
+                        {
+                            molecularProfileIdA: q.profileX.molecularProfileId,
+                            molecularProfileIdB: q.profileY.molecularProfileId,
+                            coExpressionFilter: dataQueryFilter as CoExpressionFilter,
+                            threshold,
+                            $domain,
+                        }
+                    );
 
                     let genesetMap: { [id: string]: Geneset } = {};
-                    if (q.profileY.molecularAlterationType === AlterationTypeConstants.GENESET_SCORE) {
+                    if (
+                        q.profileY.molecularAlterationType ===
+                        AlterationTypeConstants.GENESET_SCORE
+                    ) {
                         const genesetIds = _.chain(data)
                             .map(datum => datum.geneticEntityId)
                             .uniq()
                             .value();
-                        const genesets = await internalClient.fetchGenesetsUsingPOST({
-                            genesetIds
-                        });
-                        genesetMap = _.keyBy(genesets, geneset => geneset.genesetId);
+                        const genesets = await internalClient.fetchGenesetsUsingPOST(
+                            {
+                                genesetIds,
+                            }
+                        );
+                        genesetMap = _.keyBy(
+                            genesets,
+                            geneset => geneset.genesetId
+                        );
                     }
 
-                    const entrezGeneIdToReferenceGene = this.props.store.entrezGeneIdToReferenceGene.result || {};
-
-                    return Promise.resolve(_.reduce(data, (acc, datum) => {
-                        let geneticEntityName: string | undefined = undefined;
-                        let cytoband = "-";
-                        if (q.profileY.molecularAlterationType === AlterationTypeConstants.GENESET_SCORE) {
-                            geneticEntityName = genesetMap[datum.geneticEntityId].name;
-                        } else if (entrezGeneIdToReferenceGene[datum.geneticEntityId] !== undefined) {
-                            geneticEntityName = entrezGeneIdToReferenceGene[datum.geneticEntityId].hugoGeneSymbol;
-                            cytoband = entrezGeneIdToReferenceGene[datum.geneticEntityId].cytoband;
-                        }
+                    const entrezGeneIdToReferenceGene =
+                        this.props.store.entrezGeneIdToReferenceGene.result ||
+                        {};
+
+                    return Promise.resolve(
+                        _.reduce(
+                            data,
+                            (acc, datum) => {
+                                let geneticEntityName:
+                                    | string
+                                    | undefined = undefined;
+                                let cytoband = '-';
+                                if (
+                                    q.profileY.molecularAlterationType ===
+                                    AlterationTypeConstants.GENESET_SCORE
+                                ) {
+                                    geneticEntityName =
+                                        genesetMap[datum.geneticEntityId].name;
+                                } else if (
+                                    entrezGeneIdToReferenceGene[
+                                        datum.geneticEntityId
+                                    ] !== undefined
+                                ) {
+                                    geneticEntityName =
+                                        entrezGeneIdToReferenceGene[
+                                            datum.geneticEntityId
+                                        ].hugoGeneSymbol;
+                                    cytoband =
+                                        entrezGeneIdToReferenceGene[
+                                            datum.geneticEntityId
+                                        ].cytoband;
+                                }
 
-                        if (geneticEntityName !== undefined) {
-                            acc.push({
-                                ...datum,
-                                geneticEntityName,
-                                cytoband
-                            })
-                        }
+                                if (geneticEntityName !== undefined) {
+                                    acc.push({
+                                        ...datum,
+                                        geneticEntityName,
+                                        cytoband,
+                                    });
+                                }
 
-                        return acc;
-                    }, [] as CoExpressionWithEntityInfo[]));
+                                return acc;
+                            },
+                            [] as CoExpressionWithEntityInfo[]
+                        )
+                    );
                 } else {
                     return Promise.resolve([]);
                 }
-            }
+            },
         }),
-        q=>`${q.geneticEntityId},${q.profileX.molecularProfileId},${q.profileY.molecularProfileId}`
+        q =>
+            `${q.geneticEntityId},${q.profileX.molecularProfileId},${q.profileY.molecularProfileId}`
     );
 
     private get profilesSelector() {
-        if (this.selectedGeneticEntity.isComplete &&
+        if (
+            this.selectedGeneticEntity.isComplete &&
             this.selectedProfileX.isComplete &&
             this.selectedProfileY.isComplete &&
             this.xProfileOptions.isComplete &&
             this.yProfileOptions.isComplete &&
             this.props.store.coexpressionTabMolecularProfiles.isComplete &&
-            this.isSelectedGeneticEntityAGeneSet.isComplete) {
+            this.isSelectedGeneticEntityAGeneSet.isComplete
+        ) {
             return (
                 <div>
                     <div
-                        style= {{
-                             float: "left",
-                             width: "100%",
-                             display: "flex",
-                             alignItems: "center"
+                        style={{
+                            float: 'left',
+                            width: '100%',
+                            display: 'flex',
+                            alignItems: 'center',
+                        }}
+                    >
+                        <span>
+                            Find{' '}
+                            {getGenesetProfiles(
+                                this.props.store
+                                    .coexpressionTabMolecularProfiles.result
+                            ).length > 0
+                                ? 'genes/genesets'
+                                : 'genes'}{' '}
+                            in{' '}
+                        </span>
+                        <div
+                            style={{
+                                display: 'inline-block',
+                                width: 376,
+                                marginLeft: 4,
+                                marginRight: 4,
+                                zIndex: 10 /* so that on top when opened*/,
                             }}
                         >
-                        <span>Find {getGenesetProfiles(this.props.store.coexpressionTabMolecularProfiles.result).length > 0 ? "genes/genesets" : "genes" } in </span>
-                        <div style={{display:"inline-block", width:376, marginLeft:4, marginRight:4, zIndex:10 /* so that on top when opened*/}}>
                             <Select
                                 name="query-profile-select"
                                 value={this.selectedProfileY.result}
@@ -285,8 +413,26 @@ export default class CoExpressionTab extends React.Component<ICoExpressionTabPro
                                 className="coexpression-select-query-profile"
                             />
                         </div>
-                        { <span> that are correlated with  {this.selectedGeneticEntity.result.geneticEntityName} in </span>}
-                        <div style={{display:"inline-block", width:376, marginLeft:4, marginRight:4, zIndex:15 /* so that on top when opened*/}}>
+                        {
+                            <span>
+                                {' '}
+                                that are correlated with{' '}
+                                {
+                                    this.selectedGeneticEntity.result
+                                        .geneticEntityName
+                                }{' '}
+                                in{' '}
+                            </span>
+                        }
+                        <div
+                            style={{
+                                display: 'inline-block',
+                                width: 376,
+                                marginLeft: 4,
+                                marginRight: 4,
+                                zIndex: 15 /* so that on top when opened*/,
+                            }}
+                        >
                             <Select
                                 name="subject-profile-select"
                                 value={this.selectedProfileX.result}
@@ -294,39 +440,52 @@ export default class CoExpressionTab extends React.Component<ICoExpressionTabPro
                                 options={this.xProfileOptions.result}
                                 searchable={false}
                                 clearable={false}
-                                disabled={this.isSelectedGeneticEntityAGeneSet.result}
+                                disabled={
+                                    this.isSelectedGeneticEntityAGeneSet.result
+                                }
                                 className="coexpression-select-subject-profile"
                             />
                         </div>
+                    </div>
                 </div>
-            </div>
             );
         } else {
-            return <LoadingIndicator isLoading={true} center={true} size={"big"}/>;
+            return (
+                <LoadingIndicator isLoading={true} center={true} size={'big'} />
+            );
         }
     }
 
     @bind
     private header() {
-        return (
-            <div style={{marginBottom:20}}>
-                {this.profilesSelector}
-            </div>
-        );
+        return <div style={{ marginBottom: 20 }}>{this.profilesSelector}</div>;
     }
 
     @bind
     private geneTabs() {
         // we hack together MSKTabs this way because of some particular responsiveness needs and mobxpromise behavior that may or may not still be relevant
-        if (this.selectedGeneticEntity.isComplete &&
+        if (
+            this.selectedGeneticEntity.isComplete &&
             this.selectedProfileX.isComplete &&
             this.selectedProfileY.isComplete &&
             this.props.store.geneticEntities.isComplete &&
-            this.props.store.coexpressionTabMolecularProfiles.isComplete) {
+            this.props.store.coexpressionTabMolecularProfiles.isComplete
+        ) {
             const coExpressionVizElements = [];
-            for (const geneticEntity of this.props.store.geneticEntities.result) {
-                for (const profileX of (geneticEntity.geneticEntityType === GeneticEntityType.GENE ? filterAndSortProfiles(this.props.store.coexpressionTabMolecularProfiles.result) : getGenesetProfiles(this.props.store.coexpressionTabMolecularProfiles.result))) {
-                    for (const profileY of this.props.store.coexpressionTabMolecularProfiles.result) {
+            for (const geneticEntity of this.props.store.geneticEntities
+                .result) {
+                for (const profileX of geneticEntity.geneticEntityType ===
+                GeneticEntityType.GENE
+                    ? filterAndSortProfiles(
+                          this.props.store.coexpressionTabMolecularProfiles
+                              .result
+                      )
+                    : getGenesetProfiles(
+                          this.props.store.coexpressionTabMolecularProfiles
+                              .result
+                      )) {
+                    for (const profileY of this.props.store
+                        .coexpressionTabMolecularProfiles.result) {
                         coExpressionVizElements.push(
                             <CoExpressionViz
                                 key={`${geneticEntity.geneticEntityId},${profileX.molecularProfileId},${profileY.molecularProfileId}`}
@@ -334,23 +493,41 @@ export default class CoExpressionTab extends React.Component<ICoExpressionTabPro
                                 geneticEntity={geneticEntity}
                                 profileX={profileX}
                                 profileY={profileY}
-                                numericGeneMolecularDataCache={this.props.store.numericGeneMolecularDataCache}
-                                numericGenesetMolecularDataCache={this.props.store.numericGenesetMolecularDataCache}
-                                mutationCache={this.hasMutationData ? this.props.store.mutationCache : undefined}
+                                numericGeneMolecularDataCache={
+                                    this.props.store
+                                        .numericGeneMolecularDataCache
+                                }
+                                numericGenesetMolecularDataCache={
+                                    this.props.store
+                                        .numericGenesetMolecularDataCache
+                                }
+                                mutationCache={
+                                    this.hasMutationData
+                                        ? this.props.store.mutationCache
+                                        : undefined
+                                }
                                 hidden={
-                                    (profileX.molecularProfileId !== this.selectedProfileX.result) ||
-                                    (profileY.molecularProfileId !== this.selectedProfileY.result) ||
-                                    (geneticEntity.geneticEntityId !== this.selectedGeneticEntity.result.geneticEntityId!)
+                                    profileX.molecularProfileId !==
+                                        this.selectedProfileX.result ||
+                                    profileY.molecularProfileId !==
+                                        this.selectedProfileY.result ||
+                                    geneticEntity.geneticEntityId !==
+                                        this.selectedGeneticEntity.result
+                                            .geneticEntityId!
                                 }
                                 plotState={this.plotState}
                                 plotHandlers={this.plotHandlers}
-                                coverageInformation={this.props.store.coverageInformation}
-                                studyToMutationMolecularProfile={this.props.store.studyToMutationMolecularProfile}
+                                coverageInformation={
+                                    this.props.store.coverageInformation
+                                }
+                                studyToMutationMolecularProfile={
+                                    this.props.store
+                                        .studyToMutationMolecularProfile
+                                }
                             />
                         );
                     }
                 }
-
             }
 
             return (
@@ -363,42 +540,42 @@ export default class CoExpressionTab extends React.Component<ICoExpressionTabPro
                         unmountOnHide={true}
                         tabButtonStyle="pills"
                         enablePagination={false}
-                        arrowStyle={{'line-height':0.8}}
+                        arrowStyle={{ 'line-height': 0.8 }}
                     >
-                        {this.props.store.geneticEntities.result!.map((geneticEntity:GeneticEntity, i:number)=>{
-                            return (
-                                <MSKTab
-                                    key={i}
-                                    id={geneticEntity.geneticEntityId.toString()}
-                                    linkText={geneticEntity.geneticEntityName}
-                                >
-                                </MSKTab>
-                            );
-                        })}
+                        {this.props.store.geneticEntities.result!.map(
+                            (geneticEntity: GeneticEntity, i: number) => {
+                                return (
+                                    <MSKTab
+                                        key={i}
+                                        id={geneticEntity.geneticEntityId.toString()}
+                                        linkText={
+                                            geneticEntity.geneticEntityName
+                                        }
+                                    ></MSKTab>
+                                );
+                            }
+                        )}
                     </MSKTabs>
-                    <Observer>
-                        {this.header}
-                    </Observer>
+                    <Observer>{this.header}</Observer>
                     {coExpressionVizElements}
                 </div>
             );
         } else {
             return (
-                <LoadingIndicator isLoading={true} center={true} size={"big"}/>
+                <LoadingIndicator isLoading={true} center={true} size={'big'} />
             );
         }
     }
 
-
     render() {
         let divContents = null;
-        if (this.props.store.coexpressionTabMolecularProfiles.isComplete &&
-            this.props.store.coexpressionTabMolecularProfiles.result.length > 0) {
+        if (
+            this.props.store.coexpressionTabMolecularProfiles.isComplete &&
+            this.props.store.coexpressionTabMolecularProfiles.result.length > 0
+        ) {
             divContents = (
                 <div>
-                    <Observer>
-                        {this.geneTabs}
-                    </Observer>
+                    <Observer>{this.geneTabs}</Observer>
                 </div>
             );
         } else {
@@ -410,22 +587,32 @@ export default class CoExpressionTab extends React.Component<ICoExpressionTabPro
         }
 
         const status = getMobxPromiseGroupStatus(
-          this.props.store.genes,
-          this.props.store.molecularProfileIdToProfiledSampleCount,
-          this.props.store.coexpressionTabMolecularProfiles
+            this.props.store.genes,
+            this.props.store.molecularProfileIdToProfiledSampleCount,
+            this.props.store.coexpressionTabMolecularProfiles
         );
 
         return (
             <div data-test="coExpressionTabDiv">
-                <div className={"tabMessageContainer"}>
-                    <OqlStatusBanner className="coexp-oql-status-banner" store={this.props.store} tabReflectsOql={false}/>
-                    <AlterationFilterWarning store={this.props.store} isUnaffected={true}/>
+                <div className={'tabMessageContainer'}>
+                    <OqlStatusBanner
+                        className="coexp-oql-status-banner"
+                        store={this.props.store}
+                        tabReflectsOql={false}
+                    />
+                    <AlterationFilterWarning
+                        store={this.props.store}
+                        isUnaffected={true}
+                    />
                 </div>
 
-                { (status==="complete") && divContents }
-
-                <LoadingIndicator center={true} size={"big"} isLoading={status==="pending"}/>
+                {status === 'complete' && divContents}
 
+                <LoadingIndicator
+                    center={true}
+                    size={'big'}
+                    isLoading={status === 'pending'}
+                />
             </div>
         );
     }
diff --git a/src/pages/resultsView/coExpression/CoExpressionTabUtils.spec.ts b/src/pages/resultsView/coExpression/CoExpressionTabUtils.spec.ts
index b04bc93d878..9334120f7e8 100644
--- a/src/pages/resultsView/coExpression/CoExpressionTabUtils.spec.ts
+++ b/src/pages/resultsView/coExpression/CoExpressionTabUtils.spec.ts
@@ -1,74 +1,84 @@
-import {assert} from "chai";
-import {getGenesetProfiles, sortRnaSeqProfilesToTop, filterAndSortProfiles} from "./CoExpressionTabUtils";
+import { assert } from 'chai';
+import {
+    getGenesetProfiles,
+    sortRnaSeqProfilesToTop,
+    filterAndSortProfiles,
+} from './CoExpressionTabUtils';
 
 const profiles = [
     {
-        molecularAlterationType: "MUTATION_EXTENDED"
+        molecularAlterationType: 'MUTATION_EXTENDED',
     },
     {
-        molecularAlterationType: "MRNA_EXPRESSION",
-        molecularProfileId: "merged_median_zscores_rna_seq"
+        molecularAlterationType: 'MRNA_EXPRESSION',
+        molecularProfileId: 'merged_median_zscores_rna_seq',
     },
     {
-        molecularAlterationType: "PROTEIN_LEVEL",
-        molecularProfileId: "aposidjpao"
+        molecularAlterationType: 'PROTEIN_LEVEL',
+        molecularProfileId: 'aposidjpao',
     },
     {
-        molecularAlterationType: "MRNA_EXPRESSION",
-        molecularProfileId: "blah2_zscores"
+        molecularAlterationType: 'MRNA_EXPRESSION',
+        molecularProfileId: 'blah2_zscores',
     },
     {
-        molecularAlterationType: "PROTEIN_LEVEL",
-        molecularProfileId:"blah_zscores"
+        molecularAlterationType: 'PROTEIN_LEVEL',
+        molecularProfileId: 'blah_zscores',
     },
     {
-        molecularAlterationType: "GENESET_SCORE",
-        molecularProfileId:"someid"
+        molecularAlterationType: 'GENESET_SCORE',
+        molecularProfileId: 'someid',
     },
     {
-        molecularAlterationType: "GENESET_SCORE",
-        molecularProfileId:"someid_gsva_pvalues"
-    }
+        molecularAlterationType: 'GENESET_SCORE',
+        molecularProfileId: 'someid_gsva_pvalues',
+    },
 ] as any;
 
-describe("CoExpressionTabUtils", ()=>{
-    describe("filterAndSortProfiles", ()=>{
-        it("returns empty if no profiles given", ()=>{
+describe('CoExpressionTabUtils', () => {
+    describe('filterAndSortProfiles', () => {
+        it('returns empty if no profiles given', () => {
             assert.equal(filterAndSortProfiles([]).length, 0);
         });
-        it("returns empty if no valid profiles", ()=>{
+        it('returns empty if no valid profiles', () => {
             assert.equal(filterAndSortProfiles([profiles[0]]).length, 0);
             assert.equal(filterAndSortProfiles([profiles[3]]).length, 0);
-            assert.equal(filterAndSortProfiles([profiles[0], profiles[3], profiles[4]]).length, 0);
-        });
-        it("returns valid profiles, with rna seq sorted to the top", ()=>{
-            assert.deepEqual(
-                filterAndSortProfiles(profiles),
-                [profiles[1], profiles[2]]
+            assert.equal(
+                filterAndSortProfiles([profiles[0], profiles[3], profiles[4]])
+                    .length,
+                0
             );
         });
+        it('returns valid profiles, with rna seq sorted to the top', () => {
+            assert.deepEqual(filterAndSortProfiles(profiles), [
+                profiles[1],
+                profiles[2],
+            ]);
+        });
     });
-    describe("getGenesetProfiles", ()=>{
-        it("returns empty if no profiles given", ()=>{
+    describe('getGenesetProfiles', () => {
+        it('returns empty if no profiles given', () => {
             assert.equal(getGenesetProfiles([]).length, 0);
         });
-        it("returns empty if no valid profiles", ()=>{
+        it('returns empty if no valid profiles', () => {
             assert.equal(getGenesetProfiles([profiles[0]]).length, 0);
             assert.equal(getGenesetProfiles([profiles[1]]).length, 0);
-            assert.equal(getGenesetProfiles([profiles[1], profiles[2], profiles[4]]).length, 0);
-        });
-        it("returns valid profiles", ()=>{
-            assert.deepEqual(
-                getGenesetProfiles(profiles),
-                [profiles[5]]
+            assert.equal(
+                getGenesetProfiles([profiles[1], profiles[2], profiles[4]])
+                    .length,
+                0
             );
         });
+        it('returns valid profiles', () => {
+            assert.deepEqual(getGenesetProfiles(profiles), [profiles[5]]);
+        });
     });
-    describe("sortProfiles", ()=>{
-        it("sorts profiles, with rna seq to the top", ()=>{
+    describe('sortProfiles', () => {
+        it('sorts profiles, with rna seq to the top', () => {
             assert.deepEqual(
-                sortRnaSeqProfilesToTop([profiles[2], profiles[1]]), 
-                [profiles[1], profiles[2]]);
+                sortRnaSeqProfilesToTop([profiles[2], profiles[1]]),
+                [profiles[1], profiles[2]]
+            );
         });
     });
-});
\ No newline at end of file
+});
diff --git a/src/pages/resultsView/coExpression/CoExpressionTabUtils.ts b/src/pages/resultsView/coExpression/CoExpressionTabUtils.ts
index 0a06f6b776e..a7fb8d71cd0 100644
--- a/src/pages/resultsView/coExpression/CoExpressionTabUtils.ts
+++ b/src/pages/resultsView/coExpression/CoExpressionTabUtils.ts
@@ -1,37 +1,54 @@
 import * as _ from 'lodash';
-import {MolecularProfile} from "../../../shared/api/generated/CBioPortalAPI";
-import {AlterationTypeConstants, GeneticEntityType} from "../ResultsViewPageStore";
-import {CoExpression} from "../../../shared/api/generated/CBioPortalAPIInternal";
+import { MolecularProfile } from '../../../shared/api/generated/CBioPortalAPI';
+import {
+    AlterationTypeConstants,
+    GeneticEntityType,
+} from '../ResultsViewPageStore';
+import { CoExpression } from '../../../shared/api/generated/CBioPortalAPIInternal';
 
-export type CoExpressionWithEntityInfo = CoExpression & { geneticEntityName: string, cytoband: string };
+export type CoExpressionWithEntityInfo = CoExpression & {
+    geneticEntityName: string;
+    cytoband: string;
+};
 
-export type CoExpressionWithQ = CoExpressionWithEntityInfo & { geneticEntityType: GeneticEntityType, qValue: number };
+export type CoExpressionWithQ = CoExpressionWithEntityInfo & {
+    geneticEntityType: GeneticEntityType;
+    qValue: number;
+};
 
-export const correlationInformation = "Pearson correlations are computed first. For genes with a correlation greater "+
-                                        "than 0.3 or less than -0.3, the Spearman correlations are also computed. By "+
-                                        "default, only gene pairs with values > 0.3 or < -0.3 in both measures are shown.";
+export const correlationInformation =
+    'Pearson correlations are computed first. For genes with a correlation greater ' +
+    'than 0.3 or less than -0.3, the Spearman correlations are also computed. By ' +
+    'default, only gene pairs with values > 0.3 or < -0.3 in both measures are shown.';
 
-export const tableSearchInformation = "Coexpression data can be filtered by gene, or by cytoband. To exclude all genes "+
-                                        "from a cytoband, prefix with a dash -. For example, to exclude all genes on "+
-                                        "1p, search '-1p'.";
+export const tableSearchInformation =
+    'Coexpression data can be filtered by gene, or by cytoband. To exclude all genes ' +
+    'from a cytoband, prefix with a dash -. For example, to exclude all genes on ' +
+    "1p, search '-1p'.";
 
 export function sortRnaSeqProfilesToTop(profs: MolecularProfile[]) {
     // sort rna seq to the top
-    return _.sortBy(profs, profile=>(profile.molecularProfileId.toLowerCase().indexOf("rna_seq") > -1) ? 0 : 1);
+    return _.sortBy(profs, profile =>
+        profile.molecularProfileId.toLowerCase().indexOf('rna_seq') > -1 ? 0 : 1
+    );
 }
 
-export function filterAndSortProfiles(profiles:MolecularProfile[]) {
-    const profs = profiles.filter(profile=>{
+export function filterAndSortProfiles(profiles: MolecularProfile[]) {
+    const profs = profiles.filter(profile => {
         // we want a profile which is mrna or protein, and among them we want any profile,
         // except zscore profiles that are not merged_median_zscores
 
         let good = false;
-        if (profile.molecularAlterationType === AlterationTypeConstants.MRNA_EXPRESSION ||
-            profile.molecularAlterationType === AlterationTypeConstants.PROTEIN_LEVEL) {
-
+        if (
+            profile.molecularAlterationType ===
+                AlterationTypeConstants.MRNA_EXPRESSION ||
+            profile.molecularAlterationType ===
+                AlterationTypeConstants.PROTEIN_LEVEL
+        ) {
             const profileId = profile.molecularProfileId.toLowerCase();
-            good = (profileId.indexOf("merged_median_zscores") > -1) ||
-                (profileId.indexOf("zscores") === -1);
+            good =
+                profileId.indexOf('merged_median_zscores') > -1 ||
+                profileId.indexOf('zscores') === -1;
         }
         return good;
     });
@@ -40,32 +57,43 @@ export function filterAndSortProfiles(profiles:MolecularProfile[]) {
     return sortRnaSeqProfilesToTop(profs);
 }
 
-export function getGenesetProfiles(profiles:MolecularProfile[]) {
-    const profs = profiles.filter(profile=>{
+export function getGenesetProfiles(profiles: MolecularProfile[]) {
+    const profs = profiles.filter(profile => {
         // we want only the geneset score profiles, excluding p-values
 
         let good = false;
-        if (profile.molecularAlterationType === AlterationTypeConstants.GENESET_SCORE) {
-
+        if (
+            profile.molecularAlterationType ===
+            AlterationTypeConstants.GENESET_SCORE
+        ) {
             const profileId = profile.molecularProfileId.toLowerCase();
-            good = profileId.indexOf("gsva_pvalues") === -1;
+            good = profileId.indexOf('gsva_pvalues') === -1;
         }
         return good;
     });
     return profs;
 }
 
-export function getProfileOptions(profiles: MolecularProfile[],
-    molecularProfileIdToProfiledSampleCount?: { [molecularProfileId: string]: number; }) {
+export function getProfileOptions(
+    profiles: MolecularProfile[],
+    molecularProfileIdToProfiledSampleCount?: {
+        [molecularProfileId: string]: number;
+    }
+) {
     return profiles.map(profile => {
         let label = profile.name;
         if (molecularProfileIdToProfiledSampleCount) {
-            const profiledSampleCount = molecularProfileIdToProfiledSampleCount[profile.molecularProfileId];
-            label += ` (${profiledSampleCount} sample${profiledSampleCount !== 1 ? "s" : ""})`;
+            const profiledSampleCount =
+                molecularProfileIdToProfiledSampleCount[
+                    profile.molecularProfileId
+                ];
+            label += ` (${profiledSampleCount} sample${
+                profiledSampleCount !== 1 ? 's' : ''
+            })`;
         }
         return {
             label,
-            value: profile.molecularProfileId
+            value: profile.molecularProfileId,
         };
     });
-}
\ No newline at end of file
+}
diff --git a/src/pages/resultsView/coExpression/CoExpressionTableGenes.tsx b/src/pages/resultsView/coExpression/CoExpressionTableGenes.tsx
index 998dbd834cb..ac7b0457b14 100644
--- a/src/pages/resultsView/coExpression/CoExpressionTableGenes.tsx
+++ b/src/pages/resultsView/coExpression/CoExpressionTableGenes.tsx
@@ -1,116 +1,154 @@
-import * as React from "react";
-import {Geneset} from "../../../shared/api/generated/CBioPortalAPIInternal";
-import {Gene} from "../../../shared/api/generated/CBioPortalAPI";
-import {correlationColor, correlationSortBy} from "./CoExpressionTableUtils";
-import LazyMobXTable from "../../../shared/components/lazyMobXTable/LazyMobXTable";
-import {CoExpressionDataStore, TableMode} from "./CoExpressionViz";
-import Select from "react-select1";
-import {observer} from "mobx-react";
-import {CoExpressionWithQ, tableSearchInformation} from "./CoExpressionTabUtils";
-import InfoIcon from "../../../shared/components/InfoIcon";
-import {bind} from "bind-decorator";
-import { cytobandFilter } from "pages/resultsView/ResultsViewTableUtils";
-import { toConditionalPrecision } from "shared/lib/NumberUtils";
-import { formatSignificanceValueWithStyle } from "shared/lib/FormatUtils";
+import * as React from 'react';
+import { Geneset } from '../../../shared/api/generated/CBioPortalAPIInternal';
+import { Gene } from '../../../shared/api/generated/CBioPortalAPI';
+import { correlationColor, correlationSortBy } from './CoExpressionTableUtils';
+import LazyMobXTable from '../../../shared/components/lazyMobXTable/LazyMobXTable';
+import { CoExpressionDataStore, TableMode } from './CoExpressionViz';
+import Select from 'react-select1';
+import { observer } from 'mobx-react';
+import {
+    CoExpressionWithQ,
+    tableSearchInformation,
+} from './CoExpressionTabUtils';
+import InfoIcon from '../../../shared/components/InfoIcon';
+import { bind } from 'bind-decorator';
+import { cytobandFilter } from 'pages/resultsView/ResultsViewTableUtils';
+import { toConditionalPrecision } from 'shared/lib/NumberUtils';
+import { formatSignificanceValueWithStyle } from 'shared/lib/FormatUtils';
 
 export interface ICoExpressionTableGenesProps {
-    referenceGeneticEntity:Gene|Geneset;
-    dataStore:CoExpressionDataStore;
-    tableMode:TableMode;
-    onSelectTableMode:(t:TableMode)=>void;
+    referenceGeneticEntity: Gene | Geneset;
+    dataStore: CoExpressionDataStore;
+    tableMode: TableMode;
+    onSelectTableMode: (t: TableMode) => void;
 }
 
 const SPEARMANS_CORRELATION_COLUMN_NAME = "Spearman's Correlation";
-const P_VALUE_COLUMN_NAME = "p-Value";
-const Q_VALUE_COLUMN_NAME = "q-Value";
+const P_VALUE_COLUMN_NAME = 'p-Value';
+const Q_VALUE_COLUMN_NAME = 'q-Value';
 
 const COLUMNS = [
     {
-        name: "Correlated Gene",
-        render: (d:CoExpressionWithQ)=>(<span style={{fontWeight:"bold"}}>{d.geneticEntityName}</span>),
-        filter:(d:CoExpressionWithQ, f:string, filterStringUpper:string)=>(d.geneticEntityName.indexOf(filterStringUpper) > -1),
-        download:(d:CoExpressionWithQ)=>d.geneticEntityName,
-        sortBy:(d:CoExpressionWithQ)=>d.geneticEntityName,
-        width:"30%"
+        name: 'Correlated Gene',
+        render: (d: CoExpressionWithQ) => (
+            <span style={{ fontWeight: 'bold' }}>{d.geneticEntityName}</span>
+        ),
+        filter: (d: CoExpressionWithQ, f: string, filterStringUpper: string) =>
+            d.geneticEntityName.indexOf(filterStringUpper) > -1,
+        download: (d: CoExpressionWithQ) => d.geneticEntityName,
+        sortBy: (d: CoExpressionWithQ) => d.geneticEntityName,
+        width: '30%',
     },
     {
-        name:"Cytoband",
-        render:(d:CoExpressionWithQ)=>(<span>{d.cytoband}</span>),
-        filter:cytobandFilter,
-        download:(d:CoExpressionWithQ)=>d.cytoband,
-        sortBy:(d:CoExpressionWithQ)=>d.cytoband,
-        width:"30%"
+        name: 'Cytoband',
+        render: (d: CoExpressionWithQ) => <span>{d.cytoband}</span>,
+        filter: cytobandFilter,
+        download: (d: CoExpressionWithQ) => d.cytoband,
+        sortBy: (d: CoExpressionWithQ) => d.cytoband,
+        width: '30%',
     },
-    makeNumberColumn(SPEARMANS_CORRELATION_COLUMN_NAME, "spearmansCorrelation", true, false),
-    Object.assign(makeNumberColumn(P_VALUE_COLUMN_NAME, "pValue", false, false), {
-        tooltip:<span>Derived from 2-sided t-test.</span>
-    }),
-    Object.assign(makeNumberColumn(Q_VALUE_COLUMN_NAME, "qValue", false, true), {
-        sortBy:(d:CoExpressionWithQ) => [d.qValue, d.pValue],
-        tooltip:<span>Derived from Benjamini-Hochberg FDR correction procedure.</span>
-    })
+    makeNumberColumn(
+        SPEARMANS_CORRELATION_COLUMN_NAME,
+        'spearmansCorrelation',
+        true,
+        false
+    ),
+    Object.assign(
+        makeNumberColumn(P_VALUE_COLUMN_NAME, 'pValue', false, false),
+        {
+            tooltip: <span>Derived from 2-sided t-test.</span>,
+        }
+    ),
+    Object.assign(
+        makeNumberColumn(Q_VALUE_COLUMN_NAME, 'qValue', false, true),
+        {
+            sortBy: (d: CoExpressionWithQ) => [d.qValue, d.pValue],
+            tooltip: (
+                <span>
+                    Derived from Benjamini-Hochberg FDR correction procedure.
+                </span>
+            ),
+        }
+    ),
 ];
 
-function makeNumberColumn(name:string, key:keyof CoExpressionWithQ, colorByValue:boolean, formatSignificance: boolean) {
+function makeNumberColumn(
+    name: string,
+    key: keyof CoExpressionWithQ,
+    colorByValue: boolean,
+    formatSignificance: boolean
+) {
     return {
-        name:name,
-        render:(d:CoExpressionWithQ)=>{
+        name: name,
+        render: (d: CoExpressionWithQ) => {
             return (
                 <span
                     style={{
-                        color:(colorByValue ? correlationColor(d[key] as number) : "#000000"),
-                        textAlign:"right",
-                        float:"right",
-                        whiteSpace:"nowrap"
+                        color: colorByValue
+                            ? correlationColor(d[key] as number)
+                            : '#000000',
+                        textAlign: 'right',
+                        float: 'right',
+                        whiteSpace: 'nowrap',
                     }}
-                >{formatSignificance? formatSignificanceValueWithStyle(d[key] as number) : toConditionalPrecision((d[key] as number), 3, 0.01)}</span>
+                >
+                    {formatSignificance
+                        ? formatSignificanceValueWithStyle(d[key] as number)
+                        : toConditionalPrecision(d[key] as number, 3, 0.01)}
+                </span>
             );
         },
-        download:(d:CoExpressionWithQ)=>(d[key] as number).toString()+"",
-        sortBy:(d:CoExpressionWithQ)=>correlationSortBy(d[key] as number),
-        align: "right" as "right"
+        download: (d: CoExpressionWithQ) => (d[key] as number).toString() + '',
+        sortBy: (d: CoExpressionWithQ) => correlationSortBy(d[key] as number),
+        align: 'right' as 'right',
     };
 }
 
 @observer
-export default class CoExpressionTableGenes extends React.Component<ICoExpressionTableGenesProps, {}> {
-
+export default class CoExpressionTableGenes extends React.Component<
+    ICoExpressionTableGenesProps,
+    {}
+> {
     @bind
-    private onRowClick(d:CoExpressionWithQ) {
+    private onRowClick(d: CoExpressionWithQ) {
         this.props.dataStore.setHighlighted(d);
     }
 
     @bind
-    private onSelectTableMode(d:any) {
+    private onSelectTableMode(d: any) {
         this.props.onSelectTableMode(d.value);
     }
 
     private tableModeOptions = [
         {
-            label: "Show Any Correlation",
-            value: TableMode.SHOW_ALL
+            label: 'Show Any Correlation',
+            value: TableMode.SHOW_ALL,
         },
         {
-            label: "Show Only Positively Correlated",
-            value: TableMode.SHOW_POSITIVE
+            label: 'Show Only Positively Correlated',
+            value: TableMode.SHOW_POSITIVE,
         },
         {
-            label: "Show Only Negatively Correlated",
-            value: TableMode.SHOW_NEGATIVE
-        }
+            label: 'Show Only Negatively Correlated',
+            value: TableMode.SHOW_NEGATIVE,
+        },
     ];
 
     private paginationProps = {
-        itemsPerPageOptions: [25]
+        itemsPerPageOptions: [25],
     };
 
     render() {
         return (
             <div>
                 <div
-                    style={{float:"left", display:"flex", flexDirection:"row"}}
+                    style={{
+                        float: 'left',
+                        display: 'flex',
+                        flexDirection: 'row',
+                    }}
                 >
-                    <div style={{width:180}}>
+                    <div style={{ width: 180 }}>
                         <Select
                             value={this.props.tableMode}
                             onChange={this.onSelectTableMode}
@@ -121,8 +159,12 @@ export default class CoExpressionTableGenes extends React.Component<ICoExpressio
                         />
                     </div>
                     <InfoIcon
-                        style={{marginLeft:21, marginTop:"0.7em"}}
-                        tooltip={<div style={{maxWidth:200}}>{tableSearchInformation}</div>}
+                        style={{ marginLeft: 21, marginTop: '0.7em' }}
+                        tooltip={
+                            <div style={{ maxWidth: 200 }}>
+                                {tableSearchInformation}
+                            </div>
+                        }
                         tooltipPlacement="left"
                     />
                 </div>
@@ -137,7 +179,7 @@ export default class CoExpressionTableGenes extends React.Component<ICoExpressio
                     paginationProps={this.paginationProps}
                     initialItemsPerPage={25}
                     copyDownloadProps={{
-                        showCopy: false
+                        showCopy: false,
                     }}
                 />
             </div>
diff --git a/src/pages/resultsView/coExpression/CoExpressionTableGenesets.tsx b/src/pages/resultsView/coExpression/CoExpressionTableGenesets.tsx
index 1ed3ea317d7..fe4df67baf3 100644
--- a/src/pages/resultsView/coExpression/CoExpressionTableGenesets.tsx
+++ b/src/pages/resultsView/coExpression/CoExpressionTableGenesets.tsx
@@ -1,104 +1,137 @@
-import * as React from "react";
-import {Geneset} from "../../../shared/api/generated/CBioPortalAPIInternal";
-import {Gene} from "../../../shared/api/generated/CBioPortalAPI";
-import {correlationColor, correlationSortBy} from "./CoExpressionTableUtils";
-import LazyMobXTable from "../../../shared/components/lazyMobXTable/LazyMobXTable";
-import {CoExpressionDataStore, TableMode} from "./CoExpressionViz";
-import Select from "react-select1";
-import {observer} from "mobx-react";
-import {CoExpressionWithQ, tableSearchInformation} from "./CoExpressionTabUtils";
-import InfoIcon from "../../../shared/components/InfoIcon";
-import {bind} from "bind-decorator";
-import { toConditionalPrecision } from "shared/lib/NumberUtils";
-import { formatSignificanceValueWithStyle } from "shared/lib/FormatUtils";
+import * as React from 'react';
+import { Geneset } from '../../../shared/api/generated/CBioPortalAPIInternal';
+import { Gene } from '../../../shared/api/generated/CBioPortalAPI';
+import { correlationColor, correlationSortBy } from './CoExpressionTableUtils';
+import LazyMobXTable from '../../../shared/components/lazyMobXTable/LazyMobXTable';
+import { CoExpressionDataStore, TableMode } from './CoExpressionViz';
+import Select from 'react-select1';
+import { observer } from 'mobx-react';
+import {
+    CoExpressionWithQ,
+    tableSearchInformation,
+} from './CoExpressionTabUtils';
+import InfoIcon from '../../../shared/components/InfoIcon';
+import { bind } from 'bind-decorator';
+import { toConditionalPrecision } from 'shared/lib/NumberUtils';
+import { formatSignificanceValueWithStyle } from 'shared/lib/FormatUtils';
 
 export interface ICoExpressionTableGenesetsProps {
-    referenceGeneticEntity:Gene|Geneset;
-    dataStore:CoExpressionDataStore;
-    tableMode:TableMode;
-    onSelectTableMode:(t:TableMode)=>void;
+    referenceGeneticEntity: Gene | Geneset;
+    dataStore: CoExpressionDataStore;
+    tableMode: TableMode;
+    onSelectTableMode: (t: TableMode) => void;
 }
 
 const SPEARMANS_CORRELATION_COLUMN_NAME = "Spearman's Correlation";
-const P_VALUE_COLUMN_NAME = "p-Value";
-const Q_VALUE_COLUMN_NAME = "q-Value";
+const P_VALUE_COLUMN_NAME = 'p-Value';
+const Q_VALUE_COLUMN_NAME = 'q-Value';
 
 const COLUMNS = [
     {
-        name: "Correlated Gene Set",
-        render: (d:CoExpressionWithQ)=>(<span style={{fontWeight:"bold"}}>{d.geneticEntityName.length > 28 ? 
-            d.geneticEntityName.substring(0, 25) + "..." : 
-            d.geneticEntityName}</span>),
-        filter:(d:CoExpressionWithQ, f:string, filterStringUpper:string)=>(d.geneticEntityName.indexOf(filterStringUpper) > -1),
-        download:(d:CoExpressionWithQ)=>d.geneticEntityName,
-        sortBy:(d:CoExpressionWithQ)=>d.geneticEntityName,
-        width:"60%"
+        name: 'Correlated Gene Set',
+        render: (d: CoExpressionWithQ) => (
+            <span style={{ fontWeight: 'bold' }}>
+                {d.geneticEntityName.length > 28
+                    ? d.geneticEntityName.substring(0, 25) + '...'
+                    : d.geneticEntityName}
+            </span>
+        ),
+        filter: (d: CoExpressionWithQ, f: string, filterStringUpper: string) =>
+            d.geneticEntityName.indexOf(filterStringUpper) > -1,
+        download: (d: CoExpressionWithQ) => d.geneticEntityName,
+        sortBy: (d: CoExpressionWithQ) => d.geneticEntityName,
+        width: '60%',
     },
-    makeNumberColumn(SPEARMANS_CORRELATION_COLUMN_NAME, "spearmansCorrelation", true, false),
-    makeNumberColumn(P_VALUE_COLUMN_NAME, "pValue", false, false),
-    Object.assign(makeNumberColumn(Q_VALUE_COLUMN_NAME, "qValue", false, true), {sortBy:(d:CoExpressionWithQ) => [d.qValue, d.pValue]}),
+    makeNumberColumn(
+        SPEARMANS_CORRELATION_COLUMN_NAME,
+        'spearmansCorrelation',
+        true,
+        false
+    ),
+    makeNumberColumn(P_VALUE_COLUMN_NAME, 'pValue', false, false),
+    Object.assign(
+        makeNumberColumn(Q_VALUE_COLUMN_NAME, 'qValue', false, true),
+        { sortBy: (d: CoExpressionWithQ) => [d.qValue, d.pValue] }
+    ),
 ];
 
-function makeNumberColumn(name:string, key:keyof CoExpressionWithQ, colorByValue:boolean, formatSignificance: boolean) {
+function makeNumberColumn(
+    name: string,
+    key: keyof CoExpressionWithQ,
+    colorByValue: boolean,
+    formatSignificance: boolean
+) {
     return {
-        name:name,
-        render:(d:CoExpressionWithQ)=>{
+        name: name,
+        render: (d: CoExpressionWithQ) => {
             return (
                 <span
                     style={{
-                        color:(colorByValue ? correlationColor(d[key] as number) : "#000000"),
-                        textAlign:"right",
-                        float:"right",
-                        whiteSpace:"nowrap"
+                        color: colorByValue
+                            ? correlationColor(d[key] as number)
+                            : '#000000',
+                        textAlign: 'right',
+                        float: 'right',
+                        whiteSpace: 'nowrap',
                     }}
-                >{formatSignificance? formatSignificanceValueWithStyle(d[key] as number) : toConditionalPrecision((d[key] as number), 3, 0.01)}</span>
+                >
+                    {formatSignificance
+                        ? formatSignificanceValueWithStyle(d[key] as number)
+                        : toConditionalPrecision(d[key] as number, 3, 0.01)}
+                </span>
             );
         },
-        download:(d:CoExpressionWithQ)=>(d[key] as number).toString()+"",
-        sortBy:(d:CoExpressionWithQ)=>correlationSortBy(d[key] as number),
-        align: "right" as "right"
+        download: (d: CoExpressionWithQ) => (d[key] as number).toString() + '',
+        sortBy: (d: CoExpressionWithQ) => correlationSortBy(d[key] as number),
+        align: 'right' as 'right',
     };
 }
 
 @observer
-export default class CoExpressionTableGenesets extends React.Component<ICoExpressionTableGenesetsProps, {}> {
-
+export default class CoExpressionTableGenesets extends React.Component<
+    ICoExpressionTableGenesetsProps,
+    {}
+> {
     @bind
-    private onRowClick(d:CoExpressionWithQ) {
+    private onRowClick(d: CoExpressionWithQ) {
         this.props.dataStore.setHighlighted(d);
     }
 
     @bind
-    private onSelectTableMode(d:any) {
+    private onSelectTableMode(d: any) {
         this.props.onSelectTableMode(d.value);
     }
 
     private tableModeOptions = [
         {
-            label: "Show Any Correlation",
-            value: TableMode.SHOW_ALL
+            label: 'Show Any Correlation',
+            value: TableMode.SHOW_ALL,
         },
         {
-            label: "Show Only Positively Correlated",
-            value: TableMode.SHOW_POSITIVE
+            label: 'Show Only Positively Correlated',
+            value: TableMode.SHOW_POSITIVE,
         },
         {
-            label: "Show Only Negatively Correlated",
-            value: TableMode.SHOW_NEGATIVE
-        }
+            label: 'Show Only Negatively Correlated',
+            value: TableMode.SHOW_NEGATIVE,
+        },
     ];
 
     private paginationProps = {
-        itemsPerPageOptions: [25]
+        itemsPerPageOptions: [25],
     };
 
     render() {
         return (
             <div>
                 <div
-                    style={{float:"left", display:"flex", flexDirection:"row"}}
+                    style={{
+                        float: 'left',
+                        display: 'flex',
+                        flexDirection: 'row',
+                    }}
                 >
-                    <div style={{width:180}}>
+                    <div style={{ width: 180 }}>
                         <Select
                             value={this.props.tableMode}
                             onChange={this.onSelectTableMode}
@@ -109,8 +142,12 @@ export default class CoExpressionTableGenesets extends React.Component<ICoExpres
                         />
                     </div>
                     <InfoIcon
-                        style={{marginLeft:21, marginTop:"0.7em"}}
-                        tooltip={<div style={{maxWidth:200}}>{tableSearchInformation}</div>}
+                        style={{ marginLeft: 21, marginTop: '0.7em' }}
+                        tooltip={
+                            <div style={{ maxWidth: 200 }}>
+                                {tableSearchInformation}
+                            </div>
+                        }
                         tooltipPlacement="left"
                     />
                 </div>
@@ -125,7 +162,7 @@ export default class CoExpressionTableGenesets extends React.Component<ICoExpres
                     paginationProps={this.paginationProps}
                     initialItemsPerPage={25}
                     copyDownloadProps={{
-                        showCopy: false
+                        showCopy: false,
                     }}
                 />
             </div>
diff --git a/src/pages/resultsView/coExpression/CoExpressionTableUtils.ts b/src/pages/resultsView/coExpression/CoExpressionTableUtils.ts
index 36bbd964a84..63d328678a1 100644
--- a/src/pages/resultsView/coExpression/CoExpressionTableUtils.ts
+++ b/src/pages/resultsView/coExpression/CoExpressionTableUtils.ts
@@ -1,7 +1,7 @@
-export const CORR_POS_COLOR = "rgb(41, 87, 41)";
-export const CORR_NEG_COLOR = "rgb(180, 4, 4)";
+export const CORR_POS_COLOR = 'rgb(41, 87, 41)';
+export const CORR_NEG_COLOR = 'rgb(180, 4, 4)';
 
-export function correlationColor(correlation:number) {
+export function correlationColor(correlation: number) {
     if (correlation > 0) {
         return CORR_POS_COLOR;
     } else {
@@ -9,6 +9,6 @@ export function correlationColor(correlation:number) {
     }
 }
 
-export function correlationSortBy(correlation:number) {
-    return [Math.abs(correlation), (correlation > 0 ? 1 : 0)];
+export function correlationSortBy(correlation: number) {
+    return [Math.abs(correlation), correlation > 0 ? 1 : 0];
 }
diff --git a/src/pages/resultsView/coExpression/CoExpressionViz.tsx b/src/pages/resultsView/coExpression/CoExpressionViz.tsx
index 9d61a6dc1be..fd47616f7d7 100644
--- a/src/pages/resultsView/coExpression/CoExpressionViz.tsx
+++ b/src/pages/resultsView/coExpression/CoExpressionViz.tsx
@@ -1,75 +1,97 @@
-import * as React from "react";
-import {MolecularProfile, Mutation, NumericGeneMolecularData, Gene} from "../../../shared/api/generated/CBioPortalAPI";
-import {observer, Observer} from "mobx-react";
-import CoExpressionTableGenes from "./CoExpressionTableGenes";
-import CoExpressionTableGenesets from "./CoExpressionTableGenesets";
-import {action, autorun, computed, IReactionDisposer, observable} from "mobx";
-import LoadingIndicator from "shared/components/loadingIndicator/LoadingIndicator";
-import {SimpleGetterLazyMobXTableApplicationDataStore} from "../../../shared/lib/ILazyMobXTableApplicationDataStore";
-import {logScalePossibleForProfile} from "../plots/PlotsTabUtils";
-import CoExpressionPlot, {ICoExpressionPlotProps} from "./CoExpressionPlot";
-import {remoteData} from "cbioportal-frontend-commons";
-import {MobxPromise} from "mobxpromise";
-import {computePlotData, requestAllDataMessage} from "./CoExpressionVizUtils";
-import {Button} from "react-bootstrap";
-import {CoExpressionCache} from "./CoExpressionTab";
-import {bind} from "bind-decorator";
-import MobxPromiseCache from "../../../shared/lib/MobxPromiseCache";
-import {AlterationTypeConstants, GeneticEntityType} from "../ResultsViewPageStore";
-import {CoverageInformation} from "../ResultsViewPageStoreUtils";
-import _ from "lodash";
-import {calculateQValues} from "../../../shared/lib/calculation/BenjaminiHochbergFDRCalculator";
-import {CoExpressionWithQ} from "./CoExpressionTabUtils";
-import {GenesetMolecularData} from "../../../shared/api/generated/CBioPortalAPIInternal";
-import {GeneticEntity} from "../ResultsViewPageStore";
+import * as React from 'react';
+import {
+    MolecularProfile,
+    Mutation,
+    NumericGeneMolecularData,
+    Gene,
+} from '../../../shared/api/generated/CBioPortalAPI';
+import { observer, Observer } from 'mobx-react';
+import CoExpressionTableGenes from './CoExpressionTableGenes';
+import CoExpressionTableGenesets from './CoExpressionTableGenesets';
+import { action, autorun, computed, IReactionDisposer, observable } from 'mobx';
+import LoadingIndicator from 'shared/components/loadingIndicator/LoadingIndicator';
+import { SimpleGetterLazyMobXTableApplicationDataStore } from '../../../shared/lib/ILazyMobXTableApplicationDataStore';
+import { logScalePossibleForProfile } from '../plots/PlotsTabUtils';
+import CoExpressionPlot, { ICoExpressionPlotProps } from './CoExpressionPlot';
+import { remoteData } from 'cbioportal-frontend-commons';
+import { MobxPromise } from 'mobxpromise';
+import { computePlotData, requestAllDataMessage } from './CoExpressionVizUtils';
+import { Button } from 'react-bootstrap';
+import { CoExpressionCache } from './CoExpressionTab';
+import { bind } from 'bind-decorator';
+import MobxPromiseCache from '../../../shared/lib/MobxPromiseCache';
+import {
+    AlterationTypeConstants,
+    GeneticEntityType,
+} from '../ResultsViewPageStore';
+import { CoverageInformation } from '../ResultsViewPageStoreUtils';
+import _ from 'lodash';
+import { calculateQValues } from '../../../shared/lib/calculation/BenjaminiHochbergFDRCalculator';
+import { CoExpressionWithQ } from './CoExpressionTabUtils';
+import { GenesetMolecularData } from '../../../shared/api/generated/CBioPortalAPIInternal';
+import { GeneticEntity } from '../ResultsViewPageStore';
 
 export interface ICoExpressionVizProps {
-    plotState:{
-        plotLogScale:boolean;
-        plotShowMutations:boolean;
-        plotShowRegressionLine:boolean;
+    plotState: {
+        plotLogScale: boolean;
+        plotShowMutations: boolean;
+        plotShowRegressionLine: boolean;
     };
-    plotHandlers:ICoExpressionPlotProps["handlers"];
-    geneticEntity:GeneticEntity;
-    profileX:MolecularProfile;
-    profileY:MolecularProfile;
-    coExpressionCache:CoExpressionCache;
-    numericGeneMolecularDataCache:MobxPromiseCache<{entrezGeneId:number, molecularProfileId:string}, NumericGeneMolecularData[]>;
-    numericGenesetMolecularDataCache:MobxPromiseCache<{genesetId:string, molecularProfileId:string}, GenesetMolecularData[]>;
-    coverageInformation:MobxPromise<CoverageInformation>;
-    studyToMutationMolecularProfile:MobxPromise<{[studyId:string]:MolecularProfile}>;
-    mutationCache?:MobxPromiseCache<{entrezGeneId:number}, Mutation[]>;
-    hidden?:boolean;
+    plotHandlers: ICoExpressionPlotProps['handlers'];
+    geneticEntity: GeneticEntity;
+    profileX: MolecularProfile;
+    profileY: MolecularProfile;
+    coExpressionCache: CoExpressionCache;
+    numericGeneMolecularDataCache: MobxPromiseCache<
+        { entrezGeneId: number; molecularProfileId: string },
+        NumericGeneMolecularData[]
+    >;
+    numericGenesetMolecularDataCache: MobxPromiseCache<
+        { genesetId: string; molecularProfileId: string },
+        GenesetMolecularData[]
+    >;
+    coverageInformation: MobxPromise<CoverageInformation>;
+    studyToMutationMolecularProfile: MobxPromise<{
+        [studyId: string]: MolecularProfile;
+    }>;
+    mutationCache?: MobxPromiseCache<{ entrezGeneId: number }, Mutation[]>;
+    hidden?: boolean;
 }
 
 export enum TableMode {
-    SHOW_ALL, SHOW_POSITIVE, SHOW_NEGATIVE
+    SHOW_ALL,
+    SHOW_POSITIVE,
+    SHOW_NEGATIVE,
 }
 
-export class CoExpressionDataStore extends SimpleGetterLazyMobXTableApplicationDataStore<CoExpressionWithQ> {
-    @observable public tableMode:TableMode;
+export class CoExpressionDataStore extends SimpleGetterLazyMobXTableApplicationDataStore<
+    CoExpressionWithQ
+> {
+    @observable public tableMode: TableMode;
 
-    private reactionDisposer:IReactionDisposer;
+    private reactionDisposer: IReactionDisposer;
 
     constructor(
-        getData:()=>CoExpressionWithQ[],
-        getHighlighted:()=>CoExpressionWithQ|undefined,
-        public setHighlighted:(c:CoExpressionWithQ)=>void
+        getData: () => CoExpressionWithQ[],
+        getHighlighted: () => CoExpressionWithQ | undefined,
+        public setHighlighted: (c: CoExpressionWithQ) => void
     ) {
         super(getData);
         this.tableMode = TableMode.SHOW_ALL;
-        this.dataHighlighter = (d:CoExpressionWithQ) =>{
+        this.dataHighlighter = (d: CoExpressionWithQ) => {
             const highlighted = getHighlighted();
-            return !!(highlighted && (d.geneticEntityId === highlighted.geneticEntityId));
+            return !!(
+                highlighted && d.geneticEntityId === highlighted.geneticEntityId
+            );
         };
-        this.dataSelector = (d:CoExpressionWithQ) =>{
+        this.dataSelector = (d: CoExpressionWithQ) => {
             let selected;
             switch (this.tableMode) {
                 case TableMode.SHOW_POSITIVE:
-                    selected = (d.spearmansCorrelation >= 0);
+                    selected = d.spearmansCorrelation >= 0;
                     break;
                 case TableMode.SHOW_NEGATIVE:
-                    selected = (d.spearmansCorrelation <= 0);
+                    selected = d.spearmansCorrelation <= 0;
                     break;
                 default:
                     selected = true;
@@ -78,7 +100,7 @@ export class CoExpressionDataStore extends SimpleGetterLazyMobXTableApplicationD
             return selected;
         };
 
-        this.reactionDisposer = autorun(()=>{
+        this.reactionDisposer = autorun(() => {
             if (
                 this.sortMetric &&
                 this.sortedFilteredData.length > 0 &&
@@ -95,12 +117,14 @@ export class CoExpressionDataStore extends SimpleGetterLazyMobXTableApplicationD
 }
 
 @observer
-export default class CoExpressionViz extends React.Component<ICoExpressionVizProps, {}> {
-
-    @observable.ref highlightedCoExpression:CoExpressionWithQ|undefined; // only undefined initially, before data loaded
-    @observable allDataRequested:boolean = true; // set to true to request all data by default
+export default class CoExpressionViz extends React.Component<
+    ICoExpressionVizProps,
+    {}
+> {
+    @observable.ref highlightedCoExpression: CoExpressionWithQ | undefined; // only undefined initially, before data loaded
+    @observable allDataRequested: boolean = true; // set to true to request all data by default
 
-    private lastCoExpressionData:CoExpressionWithQ[];
+    private lastCoExpressionData: CoExpressionWithQ[];
 
     get coExpressionDataPromise() {
         return this.props.coExpressionCache.get({
@@ -108,25 +132,25 @@ export default class CoExpressionViz extends React.Component<ICoExpressionVizPro
             geneticEntityType: this.props.geneticEntity.geneticEntityType,
             profileX: this.props.profileX,
             profileY: this.props.profileY,
-            allData: this.allDataRequested
+            allData: this.allDataRequested,
         });
     }
 
     readonly coExpressionsWithQValues = remoteData<CoExpressionWithQ[]>({
-        await:()=>[this.coExpressionDataPromise],
-        invoke:()=>{
+        await: () => [this.coExpressionDataPromise],
+        invoke: () => {
             const coexpressions = this.coExpressionDataPromise.result!;
-            const sortedByPvalue = _.sortBy(coexpressions, c=>c.pValue);
-            const qValues = calculateQValues(sortedByPvalue.map(c=>c.pValue));
-            qValues.forEach((qValue, index)=>{
+            const sortedByPvalue = _.sortBy(coexpressions, c => c.pValue);
+            const qValues = calculateQValues(sortedByPvalue.map(c => c.pValue));
+            qValues.forEach((qValue, index) => {
                 (sortedByPvalue[index] as CoExpressionWithQ).qValue = qValue;
             });
             return Promise.resolve(sortedByPvalue as CoExpressionWithQ[]);
-        }
+        },
     });
 
     private dataStore = new CoExpressionDataStore(
-        ()=>{
+        () => {
             if (this.props.hidden) {
                 // dont download any data or trigger anything if element is hidden
                 // need to return last result, because if we just return empty,
@@ -142,17 +166,17 @@ export default class CoExpressionViz extends React.Component<ICoExpressionVizPro
                 return [];
             }
         },
-        ()=>{
+        () => {
             return this.highlightedCoExpression;
         },
-        (c:CoExpressionWithQ)=>{
+        (c: CoExpressionWithQ) => {
             this.highlightedCoExpression = c;
         }
     );
 
     @bind
     @action
-    private onSelectTableMode(t:TableMode) {
+    private onSelectTableMode(t: TableMode) {
         this.dataStore.tableMode = t;
     }
 
@@ -162,41 +186,72 @@ export default class CoExpressionViz extends React.Component<ICoExpressionVizPro
         this.allDataRequested = true;
     }
 
-    private getPlotDataPromises(yAxisCoExpression?:CoExpressionWithQ) {
-        const ret:{
-            molecularX:MobxPromise<NumericGeneMolecularData[]> | MobxPromise<GenesetMolecularData[]>,
-            molecularY:MobxPromise<NumericGeneMolecularData[]> | MobxPromise<GenesetMolecularData[]>|undefined,
-            mutationX:MobxPromise<Mutation[]>|undefined,
-            mutationY:MobxPromise<Mutation[]>|undefined
+    private getPlotDataPromises(yAxisCoExpression?: CoExpressionWithQ) {
+        const ret: {
+            molecularX:
+                | MobxPromise<NumericGeneMolecularData[]>
+                | MobxPromise<GenesetMolecularData[]>;
+            molecularY:
+                | MobxPromise<NumericGeneMolecularData[]>
+                | MobxPromise<GenesetMolecularData[]>
+                | undefined;
+            mutationX: MobxPromise<Mutation[]> | undefined;
+            mutationY: MobxPromise<Mutation[]> | undefined;
         } = {
-            molecularX: this.props.profileX.molecularAlterationType === AlterationTypeConstants.GENESET_SCORE ?
-                this.props.numericGenesetMolecularDataCache.get({
-                genesetId: this.props.geneticEntity.geneticEntityId.toString(),
-                molecularProfileId: this.props.profileX.molecularProfileId
-            }) : this.props.numericGeneMolecularDataCache.get({
-                entrezGeneId: parseInt(String(this.props.geneticEntity.geneticEntityId), 10),
-                molecularProfileId: this.props.profileX.molecularProfileId
-            }),
-            mutationX:undefined,
-            molecularY:undefined,
-            mutationY:undefined
+            molecularX:
+                this.props.profileX.molecularAlterationType ===
+                AlterationTypeConstants.GENESET_SCORE
+                    ? this.props.numericGenesetMolecularDataCache.get({
+                          genesetId: this.props.geneticEntity.geneticEntityId.toString(),
+                          molecularProfileId: this.props.profileX
+                              .molecularProfileId,
+                      })
+                    : this.props.numericGeneMolecularDataCache.get({
+                          entrezGeneId: parseInt(
+                              String(this.props.geneticEntity.geneticEntityId),
+                              10
+                          ),
+                          molecularProfileId: this.props.profileX
+                              .molecularProfileId,
+                      }),
+            mutationX: undefined,
+            molecularY: undefined,
+            mutationY: undefined,
         };
 
         if (yAxisCoExpression) {
-            ret.molecularY = this.props.profileY.molecularAlterationType === AlterationTypeConstants.GENESET_SCORE ?
-            this.props.numericGenesetMolecularDataCache.get({
-                genesetId: yAxisCoExpression.geneticEntityId,
-                molecularProfileId: this.props.profileY.molecularProfileId
-            }) : this.props.numericGeneMolecularDataCache.get({
-                    entrezGeneId: parseInt(yAxisCoExpression.geneticEntityId, 10),
-                    molecularProfileId: this.props.profileY.molecularProfileId
-            });
+            ret.molecularY =
+                this.props.profileY.molecularAlterationType ===
+                AlterationTypeConstants.GENESET_SCORE
+                    ? this.props.numericGenesetMolecularDataCache.get({
+                          genesetId: yAxisCoExpression.geneticEntityId,
+                          molecularProfileId: this.props.profileY
+                              .molecularProfileId,
+                      })
+                    : this.props.numericGeneMolecularDataCache.get({
+                          entrezGeneId: parseInt(
+                              yAxisCoExpression.geneticEntityId,
+                              10
+                          ),
+                          molecularProfileId: this.props.profileY
+                              .molecularProfileId,
+                      });
         }
 
         if (this.props.mutationCache) {
-            ret.mutationX = this.props.mutationCache.get({entrezGeneId: parseInt(String(this.props.geneticEntity.geneticEntityId), 10)});
+            ret.mutationX = this.props.mutationCache.get({
+                entrezGeneId: parseInt(
+                    String(this.props.geneticEntity.geneticEntityId),
+                    10
+                ),
+            });
             if (yAxisCoExpression) {
-                ret.mutationY = this.props.mutationCache.get({entrezGeneId: parseInt(yAxisCoExpression.geneticEntityId, 10)});
+                ret.mutationY = this.props.mutationCache.get({
+                    entrezGeneId: parseInt(
+                        yAxisCoExpression.geneticEntityId,
+                        10
+                    ),
+                });
             }
         }
 
@@ -204,28 +259,27 @@ export default class CoExpressionViz extends React.Component<ICoExpressionVizPro
     }
 
     readonly plotData = remoteData({
-        await:()=>{
+        await: () => {
             if (this.props.hidden)
                 // dont download any data or trigger anything if element is hidden
                 return [];
 
-            const promises = this.getPlotDataPromises(this.highlightedCoExpression);
-            const ret:MobxPromise<any>[] = [
+            const promises = this.getPlotDataPromises(
+                this.highlightedCoExpression
+            );
+            const ret: MobxPromise<any>[] = [
                 this.props.coverageInformation,
                 this.props.studyToMutationMolecularProfile,
-                promises.molecularX
+                promises.molecularX,
             ];
 
-            if (promises.mutationX)
-                ret.push(promises.mutationX);
-            if (promises.molecularY)
-                ret.push(promises.molecularY);
-            if (promises.mutationY)
-                ret.push(promises.mutationY);
+            if (promises.mutationX) ret.push(promises.mutationX);
+            if (promises.molecularY) ret.push(promises.molecularY);
+            if (promises.mutationY) ret.push(promises.mutationY);
 
             return ret;
         },
-        invoke: ()=>{
+        invoke: () => {
             if (this.props.hidden) {
                 // dont download any data or trigger anything if element is hidden
                 return Promise.resolve([]);
@@ -236,36 +290,48 @@ export default class CoExpressionViz extends React.Component<ICoExpressionVizPro
                 return Promise.resolve([]);
             }
 
-            const promises = this.getPlotDataPromises(this.highlightedCoExpression);
-            let numericGeneMolecularData:NumericGeneMolecularData[]|GenesetMolecularData[] = [];
+            const promises = this.getPlotDataPromises(
+                this.highlightedCoExpression
+            );
+            let numericGeneMolecularData:
+                | NumericGeneMolecularData[]
+                | GenesetMolecularData[] = [];
             if (promises.molecularX && promises.molecularX.isComplete)
-                numericGeneMolecularData = (numericGeneMolecularData as any[]).concat(promises.molecularX.result!);
+                numericGeneMolecularData = (numericGeneMolecularData as any[]).concat(
+                    promises.molecularX.result!
+                );
             if (promises.molecularY && promises.molecularY.isComplete)
-                numericGeneMolecularData = (numericGeneMolecularData as any[]).concat(promises.molecularY.result!);
+                numericGeneMolecularData = (numericGeneMolecularData as any[]).concat(
+                    promises.molecularY.result!
+                );
 
-            let mutations:Mutation[] = [];
+            let mutations: Mutation[] = [];
             if (promises.mutationX && promises.mutationX.isComplete)
                 mutations = mutations.concat(promises.mutationX.result!);
             if (promises.mutationY && promises.mutationY.isComplete)
                 mutations = mutations.concat(promises.mutationY.result!);
 
-            return Promise.resolve(computePlotData(
-                numericGeneMolecularData,
-                mutations,
-                this.props.geneticEntity.geneticEntityId,
-                isNaN(Number(this.highlightedCoExpression.geneticEntityId))?
-                    this.highlightedCoExpression.geneticEntityId :
-                    Number(this.highlightedCoExpression.geneticEntityId),
-                this.props.geneticEntity.geneticEntityName,
-                this.highlightedCoExpression.geneticEntityName,
-                this.props.coverageInformation.result!,
-                this.props.studyToMutationMolecularProfile.result!
-            ));
-        }
+            return Promise.resolve(
+                computePlotData(
+                    numericGeneMolecularData,
+                    mutations,
+                    this.props.geneticEntity.geneticEntityId,
+                    isNaN(Number(this.highlightedCoExpression.geneticEntityId))
+                        ? this.highlightedCoExpression.geneticEntityId
+                        : Number(this.highlightedCoExpression.geneticEntityId),
+                    this.props.geneticEntity.geneticEntityName,
+                    this.highlightedCoExpression.geneticEntityName,
+                    this.props.coverageInformation.result!,
+                    this.props.studyToMutationMolecularProfile.result!
+                )
+            );
+        },
     });
 
     @computed get plotShowMutations() {
-        return this.props.plotState.plotShowMutations && this.showMutationControls;
+        return (
+            this.props.plotState.plotShowMutations && this.showMutationControls
+        );
     }
 
     @computed get plotLogScale() {
@@ -280,16 +346,27 @@ export default class CoExpressionViz extends React.Component<ICoExpressionVizPro
         const profileXId = this.props.profileX.molecularProfileId.toLowerCase();
         const profileYId = this.props.profileY.molecularProfileId.toLowerCase();
         return (
-            (logScalePossibleForProfile(profileXId) || logScalePossibleForProfile(profileYId))
+            logScalePossibleForProfile(profileXId) ||
+            logScalePossibleForProfile(profileYId)
         );
     }
 
     private get requestAllDataButton() {
-        if (this.plotData.isComplete && !this.dataStore.allData.length && !this.allDataRequested) {
+        if (
+            this.plotData.isComplete &&
+            !this.dataStore.allData.length &&
+            !this.allDataRequested
+        ) {
             return (
                 <div>
-                    <span style={{marginRight:5}}>{requestAllDataMessage(this.props.geneticEntity.geneticEntityName)}</span>
-                    <Button onClick={this.requestAllData}>Load data for all genes.</Button>
+                    <span style={{ marginRight: 5 }}>
+                        {requestAllDataMessage(
+                            this.props.geneticEntity.geneticEntityName
+                        )}
+                    </span>
+                    <Button onClick={this.requestAllData}>
+                        Load data for all genes.
+                    </Button>
                 </div>
             );
         } else {
@@ -299,11 +376,16 @@ export default class CoExpressionViz extends React.Component<ICoExpressionVizPro
 
     @bind
     private table() {
-        if (this.props.profileY.molecularAlterationType !== AlterationTypeConstants.GENESET_SCORE){
+        if (
+            this.props.profileY.molecularAlterationType !==
+            AlterationTypeConstants.GENESET_SCORE
+        ) {
             return (
                 <div>
                     <CoExpressionTableGenes
-                        referenceGeneticEntity={this.props.geneticEntity.geneticEntityData}
+                        referenceGeneticEntity={
+                            this.props.geneticEntity.geneticEntityData
+                        }
                         dataStore={this.dataStore}
                         tableMode={this.dataStore.tableMode}
                         onSelectTableMode={this.onSelectTableMode}
@@ -315,7 +397,9 @@ export default class CoExpressionViz extends React.Component<ICoExpressionVizPro
             return (
                 <div>
                     <CoExpressionTableGenesets
-                        referenceGeneticEntity={this.props.geneticEntity.geneticEntityData}
+                        referenceGeneticEntity={
+                            this.props.geneticEntity.geneticEntityData
+                        }
                         dataStore={this.dataStore}
                         tableMode={this.dataStore.tableMode}
                         onSelectTableMode={this.onSelectTableMode}
@@ -328,33 +412,48 @@ export default class CoExpressionViz extends React.Component<ICoExpressionVizPro
 
     @bind
     private plot() {
-        if (this.props.hidden)
-            return <span></span>;
+        if (this.props.hidden) return <span></span>;
 
         if (this.plotData.isError) {
-            return <span>Error fetching data. Please refresh the page and try again.</span>;
+            return (
+                <span>
+                    Error fetching data. Please refresh the page and try again.
+                </span>
+            );
         } else {
             //Create a GeneticEntity object based on this.highlightedCoExpression
             let yGeneticEntity: GeneticEntity;
             if (this.highlightedCoExpression) {
-                const emptyGeneEntityData: Gene = {geneticEntityId:0,entrezGeneId: 0, hugoGeneSymbol: '', type: ''};
-                yGeneticEntity = {geneticEntityName: this.highlightedCoExpression.geneticEntityName,
-                    geneticEntityType: this.highlightedCoExpression.geneticEntityType,
-                    geneticEntityId: this.highlightedCoExpression.geneticEntityId,
+                const emptyGeneEntityData: Gene = {
+                    geneticEntityId: 0,
+                    entrezGeneId: 0,
+                    hugoGeneSymbol: '',
+                    type: '',
+                };
+                yGeneticEntity = {
+                    geneticEntityName: this.highlightedCoExpression
+                        .geneticEntityName,
+                    geneticEntityType: this.highlightedCoExpression
+                        .geneticEntityType,
+                    geneticEntityId: this.highlightedCoExpression
+                        .geneticEntityId,
                     cytoband: this.highlightedCoExpression.cytoband,
-                    geneticEntityData: emptyGeneEntityData};
+                    geneticEntityData: emptyGeneEntityData,
+                };
             }
             return (
-                <div style={{position:"relative"}}>
+                <div style={{ position: 'relative' }}>
                     <LoadingIndicator
                         isLoading={
-                            (this.dataStore.allData.length > 0) // dont show indicator if theres no data
-                            && (this.plotData.isPending || !this.highlightedCoExpression)}
+                            this.dataStore.allData.length > 0 && // dont show indicator if theres no data
+                            (this.plotData.isPending ||
+                                !this.highlightedCoExpression)
+                        }
                         center={true}
-                        size={"big"}
+                        size={'big'}
                     />
-                    { (this.plotData.isComplete && this.highlightedCoExpression) && (
-                        <div style={{marginLeft:10}}>
+                    {this.plotData.isComplete && this.highlightedCoExpression && (
+                        <div style={{ marginLeft: 10 }}>
                             <CoExpressionPlot
                                 xAxisGeneticEntity={this.props.geneticEntity}
                                 yAxisGeneticEntity={yGeneticEntity!}
@@ -362,12 +461,13 @@ export default class CoExpressionViz extends React.Component<ICoExpressionVizPro
                                 showLogScaleControls={this.showLogScaleControls}
                                 showMutationControls={this.showMutationControls}
                                 showMutations={this.plotShowMutations}
-                                showRegressionLine={this.props.plotState.plotShowRegressionLine}
+                                showRegressionLine={
+                                    this.props.plotState.plotShowRegressionLine
+                                }
                                 logScale={this.plotLogScale}
                                 handlers={this.props.plotHandlers}
                                 molecularProfileY={this.props.profileY}
                                 molecularProfileX={this.props.profileX}
-
                                 height={530}
                                 width={530}
                             />
@@ -378,7 +478,7 @@ export default class CoExpressionViz extends React.Component<ICoExpressionVizPro
         }
     }
 
-    componentWillUnmount(){
+    componentWillUnmount() {
         this.dataStore.destroy();
     }
 
@@ -388,39 +488,73 @@ export default class CoExpressionViz extends React.Component<ICoExpressionVizPro
         let innerElt = (
             <div
                 style={{
-                    display:(!this.props.hidden && this.coExpressionsWithQValues.isComplete) ? "inherit" : "none",
+                    display:
+                        !this.props.hidden &&
+                        this.coExpressionsWithQValues.isComplete
+                            ? 'inherit'
+                            : 'none',
                 }}
                 data-test="CoExpressionGeneTabContent"
             >
                 <div className="clearfix">
-                    { this.dataStore.allData.length > 0 ? [
-                        <div style={{width:"40%", float:"left", marginTop:6}}>
-                            <Observer>
-                                {this.table}
-                            </Observer>
-                        </div>,
-                        <div style={{width:"60%", float:"right", marginTop:6 /*align with table controls*/}}>
-                            <Observer>
-                                {this.plot}
-                            </Observer>
-                        </div>
-                    ] : (
-                        <div style={{
-                            position:"absolute",
-                            top:200,
-                            left:"50%",
-                            transform:"translate(-50%, 0)"
-                        }}>
-                            There is no expression data for <strong>{this.props.geneticEntity.geneticEntityName}</strong> with the selected samples in <strong>{this.props.profileX.name}</strong>.
+                    {this.dataStore.allData.length > 0 ? (
+                        [
+                            <div
+                                style={{
+                                    width: '40%',
+                                    float: 'left',
+                                    marginTop: 6,
+                                }}
+                            >
+                                <Observer>{this.table}</Observer>
+                            </div>,
+                            <div
+                                style={{
+                                    width: '60%',
+                                    float: 'right',
+                                    marginTop: 6 /*align with table controls*/,
+                                }}
+                            >
+                                <Observer>{this.plot}</Observer>
+                            </div>,
+                        ]
+                    ) : (
+                        <div
+                            style={{
+                                position: 'absolute',
+                                top: 200,
+                                left: '50%',
+                                transform: 'translate(-50%, 0)',
+                            }}
+                        >
+                            There is no expression data for{' '}
+                            <strong>
+                                {this.props.geneticEntity.geneticEntityName}
+                            </strong>{' '}
+                            with the selected samples in{' '}
+                            <strong>{this.props.profileX.name}</strong>.
                         </div>
                     )}
                 </div>
             </div>
         );
         return (
-            <div style={{display:this.props.hidden ? "none" : "inherit", minHeight:826, position:"relative"}}>
+            <div
+                style={{
+                    display: this.props.hidden ? 'none' : 'inherit',
+                    minHeight: 826,
+                    position: 'relative',
+                }}
+            >
                 {innerElt}
-                <LoadingIndicator isLoading={!this.props.hidden && this.coExpressionsWithQValues.isPending} center={true} size={"big"} />
+                <LoadingIndicator
+                    isLoading={
+                        !this.props.hidden &&
+                        this.coExpressionsWithQValues.isPending
+                    }
+                    center={true}
+                    size={'big'}
+                />
             </div>
         );
     }
diff --git a/src/pages/resultsView/coExpression/CoExpressionVizUtils.spec.ts b/src/pages/resultsView/coExpression/CoExpressionVizUtils.spec.ts
index 9aa41898454..0889f63b2c4 100644
--- a/src/pages/resultsView/coExpression/CoExpressionVizUtils.spec.ts
+++ b/src/pages/resultsView/coExpression/CoExpressionVizUtils.spec.ts
@@ -1,86 +1,377 @@
-import {assert} from "chai";
-import {computePlotData} from "./CoExpressionVizUtils";
-import {GenePanelData, MolecularProfile} from "../../../shared/api/generated/CBioPortalAPI";
+import { assert } from 'chai';
+import { computePlotData } from './CoExpressionVizUtils';
+import {
+    GenePanelData,
+    MolecularProfile,
+} from '../../../shared/api/generated/CBioPortalAPI';
 
-describe("CoExpressionVizUtils", ()=>{
-    describe("computePlotData", ()=>{
-        it("no data", ()=>{
-            assert.deepEqual(computePlotData([], [], 0, 0, "", "", {} as any, {} as any), [], "empty empty empty");
+describe('CoExpressionVizUtils', () => {
+    describe('computePlotData', () => {
+        it('no data', () => {
             assert.deepEqual(
-                computePlotData([], [{proteinChange:"G12D", uniqueSampleKey:"sample1", entrezGeneId:0}] as any, 0, 0, "", "", {} as any, {} as any),
+                computePlotData([], [], 0, 0, '', '', {} as any, {} as any),
                 [],
-                "no molecular data -> no data, even w mutations"
+                'empty empty empty'
+            );
+            assert.deepEqual(
+                computePlotData(
+                    [],
+                    [
+                        {
+                            proteinChange: 'G12D',
+                            uniqueSampleKey: 'sample1',
+                            entrezGeneId: 0,
+                        },
+                    ] as any,
+                    0,
+                    0,
+                    '',
+                    '',
+                    {} as any,
+                    {} as any
+                ),
+                [],
+                'no molecular data -> no data, even w mutations'
             );
         });
-        it("gene data with no mutations", ()=>{
+        it('gene data with no mutations', () => {
             assert.deepEqual(
-                computePlotData([
-                    {uniqueSampleKey:"sample1", sampleId:"sample1", studyId:"study", entrezGeneId:0, value:1.5},
-                    {uniqueSampleKey:"sample2", sampleId:"sample2", studyId:"study", entrezGeneId:0, value:5},
-                    {uniqueSampleKey:"sample1", sampleId:"sample1", studyId:"study", entrezGeneId:1, value:2},
-                    {uniqueSampleKey:"sample2", sampleId:"sample2", studyId:"study", entrezGeneId:1, value:12},
-                    // the following data should not appear because only x-axis data for it
-                    {uniqueSampleKey:"sample3", sampleId:"sample3", studyId:"study", entrezGeneId:0, value:5},
-                    // the following data should not appear because one is NaN
-                    {uniqueSampleKey:"sample4", sampleId:"sample4", studyId:"study", entrezGeneId:0, value:NaN},
-                    {uniqueSampleKey:"sample4", sampleId:"sample4", studyId:"study", entrezGeneId:1, value:4},
-                ] as any, [], 0, 0, "gene0", "gene1", { samples: {}, patients: {} }, {} as any),
+                computePlotData(
+                    [
+                        {
+                            uniqueSampleKey: 'sample1',
+                            sampleId: 'sample1',
+                            studyId: 'study',
+                            entrezGeneId: 0,
+                            value: 1.5,
+                        },
+                        {
+                            uniqueSampleKey: 'sample2',
+                            sampleId: 'sample2',
+                            studyId: 'study',
+                            entrezGeneId: 0,
+                            value: 5,
+                        },
+                        {
+                            uniqueSampleKey: 'sample1',
+                            sampleId: 'sample1',
+                            studyId: 'study',
+                            entrezGeneId: 1,
+                            value: 2,
+                        },
+                        {
+                            uniqueSampleKey: 'sample2',
+                            sampleId: 'sample2',
+                            studyId: 'study',
+                            entrezGeneId: 1,
+                            value: 12,
+                        },
+                        // the following data should not appear because only x-axis data for it
+                        {
+                            uniqueSampleKey: 'sample3',
+                            sampleId: 'sample3',
+                            studyId: 'study',
+                            entrezGeneId: 0,
+                            value: 5,
+                        },
+                        // the following data should not appear because one is NaN
+                        {
+                            uniqueSampleKey: 'sample4',
+                            sampleId: 'sample4',
+                            studyId: 'study',
+                            entrezGeneId: 0,
+                            value: NaN,
+                        },
+                        {
+                            uniqueSampleKey: 'sample4',
+                            sampleId: 'sample4',
+                            studyId: 'study',
+                            entrezGeneId: 1,
+                            value: 4,
+                        },
+                    ] as any,
+                    [],
+                    0,
+                    0,
+                    'gene0',
+                    'gene1',
+                    { samples: {}, patients: {} },
+                    {} as any
+                ),
                 [
-                    {x: 1.5, y: 2, mutationsX: "", mutationsY: "", studyId: "study", sampleId: "sample1", profiledX: false, profiledY:false},
-                    {x: 5, y: 12, mutationsX: "", mutationsY: "", studyId: "study", sampleId: "sample2", profiledX: false, profiledY: false}
+                    {
+                        x: 1.5,
+                        y: 2,
+                        mutationsX: '',
+                        mutationsY: '',
+                        studyId: 'study',
+                        sampleId: 'sample1',
+                        profiledX: false,
+                        profiledY: false,
+                    },
+                    {
+                        x: 5,
+                        y: 12,
+                        mutationsX: '',
+                        mutationsY: '',
+                        studyId: 'study',
+                        sampleId: 'sample2',
+                        profiledX: false,
+                        profiledY: false,
+                    },
                 ]
             );
         });
-        it("gene data with mutations", ()=>{
-            const profiled = { byGene: { "gene0": [{ molecularProfileId: "profile"} as GenePanelData] }, allGenes: [], notProfiledByGene: {}, notProfiledAllGenes:[] };
+        it('gene data with mutations', () => {
+            const profiled = {
+                byGene: {
+                    gene0: [{ molecularProfileId: 'profile' } as GenePanelData],
+                },
+                allGenes: [],
+                notProfiledByGene: {},
+                notProfiledAllGenes: [],
+            };
             assert.deepEqual(
-                computePlotData([
-                    {uniqueSampleKey:"sample1", sampleId:"sample1", studyId:"study", entrezGeneId:0, value:1.5},
-                    {uniqueSampleKey:"sample2", sampleId:"sample2", studyId:"study", entrezGeneId:0, value:5},
-                    {uniqueSampleKey:"sample1", sampleId:"sample1", studyId:"study", entrezGeneId:1, value:2},
-                    {uniqueSampleKey:"sample2", sampleId:"sample2", studyId:"study", entrezGeneId:1, value:12},
-                    {uniqueSampleKey:"sample3", sampleId:"sample3", studyId:"study", entrezGeneId:0, value:-7},
-                    {uniqueSampleKey:"sample3", sampleId:"sample3", studyId:"study", entrezGeneId:1, value:-10},
-                    // the following data should not appear because one is NaN
-                    {uniqueSampleKey:"sample4", sampleId:"sample4", studyId:"study", entrezGeneId:0, value:NaN},
-                    {uniqueSampleKey:"sample4", sampleId:"sample4", studyId:"study", entrezGeneId:1, value:4},
-                    // the following data should not appear because only x-axis data for it
-                    {uniqueSampleKey:"sample5", sampleId:"sample5", studyId:"study", entrezGeneId:0, value:5},
-                ] as any, [
-                    {uniqueSampleKey:"sample1", sampleId:"sample1", studyId:"study", entrezGeneId: 0, proteinChange:"hello"},
-                    {uniqueSampleKey:"sample1", sampleId:"sample1", studyId:"study", entrezGeneId: 0, proteinChange:"hi"},
-                    {uniqueSampleKey:"sample1", sampleId:"sample1", studyId:"study", entrezGeneId: 0, proteinChange:""},
-                    {uniqueSampleKey:"sample1", sampleId:"sample1", studyId:"study", entrezGeneId: 1, proteinChange:"whatsup"},
-                    {uniqueSampleKey:"sample2", sampleId:"sample2", studyId:"study", entrezGeneId: 0, proteinChange:"bye"}
-                ] as any, 0, 0, "gene0", "gene1",
-                    { samples: { sample1: profiled, sample4: profiled }, patients: {} },
-                    { study: { molecularProfileId: "profile" } as MolecularProfile }
+                computePlotData(
+                    [
+                        {
+                            uniqueSampleKey: 'sample1',
+                            sampleId: 'sample1',
+                            studyId: 'study',
+                            entrezGeneId: 0,
+                            value: 1.5,
+                        },
+                        {
+                            uniqueSampleKey: 'sample2',
+                            sampleId: 'sample2',
+                            studyId: 'study',
+                            entrezGeneId: 0,
+                            value: 5,
+                        },
+                        {
+                            uniqueSampleKey: 'sample1',
+                            sampleId: 'sample1',
+                            studyId: 'study',
+                            entrezGeneId: 1,
+                            value: 2,
+                        },
+                        {
+                            uniqueSampleKey: 'sample2',
+                            sampleId: 'sample2',
+                            studyId: 'study',
+                            entrezGeneId: 1,
+                            value: 12,
+                        },
+                        {
+                            uniqueSampleKey: 'sample3',
+                            sampleId: 'sample3',
+                            studyId: 'study',
+                            entrezGeneId: 0,
+                            value: -7,
+                        },
+                        {
+                            uniqueSampleKey: 'sample3',
+                            sampleId: 'sample3',
+                            studyId: 'study',
+                            entrezGeneId: 1,
+                            value: -10,
+                        },
+                        // the following data should not appear because one is NaN
+                        {
+                            uniqueSampleKey: 'sample4',
+                            sampleId: 'sample4',
+                            studyId: 'study',
+                            entrezGeneId: 0,
+                            value: NaN,
+                        },
+                        {
+                            uniqueSampleKey: 'sample4',
+                            sampleId: 'sample4',
+                            studyId: 'study',
+                            entrezGeneId: 1,
+                            value: 4,
+                        },
+                        // the following data should not appear because only x-axis data for it
+                        {
+                            uniqueSampleKey: 'sample5',
+                            sampleId: 'sample5',
+                            studyId: 'study',
+                            entrezGeneId: 0,
+                            value: 5,
+                        },
+                    ] as any,
+                    [
+                        {
+                            uniqueSampleKey: 'sample1',
+                            sampleId: 'sample1',
+                            studyId: 'study',
+                            entrezGeneId: 0,
+                            proteinChange: 'hello',
+                        },
+                        {
+                            uniqueSampleKey: 'sample1',
+                            sampleId: 'sample1',
+                            studyId: 'study',
+                            entrezGeneId: 0,
+                            proteinChange: 'hi',
+                        },
+                        {
+                            uniqueSampleKey: 'sample1',
+                            sampleId: 'sample1',
+                            studyId: 'study',
+                            entrezGeneId: 0,
+                            proteinChange: '',
+                        },
+                        {
+                            uniqueSampleKey: 'sample1',
+                            sampleId: 'sample1',
+                            studyId: 'study',
+                            entrezGeneId: 1,
+                            proteinChange: 'whatsup',
+                        },
+                        {
+                            uniqueSampleKey: 'sample2',
+                            sampleId: 'sample2',
+                            studyId: 'study',
+                            entrezGeneId: 0,
+                            proteinChange: 'bye',
+                        },
+                    ] as any,
+                    0,
+                    0,
+                    'gene0',
+                    'gene1',
+                    {
+                        samples: { sample1: profiled, sample4: profiled },
+                        patients: {},
+                    },
+                    {
+                        study: {
+                            molecularProfileId: 'profile',
+                        } as MolecularProfile,
+                    }
                 ),
                 [
-                    {x: 1.5, y: 2, mutationsX: "hello, hi", mutationsY: "whatsup", studyId: "study", sampleId: "sample1", profiledX: true, profiledY: false},
-                    {x: 5, y: 12, mutationsX: "bye", mutationsY: "", studyId: "study", sampleId: "sample2", profiledX: false, profiledY: false},
-                    {x: -7, y: -10, mutationsX: "", mutationsY: "", studyId: "study", sampleId: "sample3", profiledX: false, profiledY: false}
+                    {
+                        x: 1.5,
+                        y: 2,
+                        mutationsX: 'hello, hi',
+                        mutationsY: 'whatsup',
+                        studyId: 'study',
+                        sampleId: 'sample1',
+                        profiledX: true,
+                        profiledY: false,
+                    },
+                    {
+                        x: 5,
+                        y: 12,
+                        mutationsX: 'bye',
+                        mutationsY: '',
+                        studyId: 'study',
+                        sampleId: 'sample2',
+                        profiledX: false,
+                        profiledY: false,
+                    },
+                    {
+                        x: -7,
+                        y: -10,
+                        mutationsX: '',
+                        mutationsY: '',
+                        studyId: 'study',
+                        sampleId: 'sample3',
+                        profiledX: false,
+                        profiledY: false,
+                    },
                 ]
             );
         });
-        it("gene set data", ()=>{
+        it('gene set data', () => {
             assert.deepEqual(
-                computePlotData([
-                    {uniqueSampleKey:"sample1", sampleId:"sample1", studyId:"study", genesetId:"abc", value:"2"},
-                    {uniqueSampleKey:"sample2", sampleId:"sample2", studyId:"study", genesetId:"abc", value:"4"},
-                    {uniqueSampleKey:"sample1", sampleId:"sample1", studyId:"study", genesetId:"def", value:"1.5"},
-                    {uniqueSampleKey:"sample2", sampleId:"sample2", studyId:"study", genesetId:"def", value:"10"},
-                    // the following data should not appear because only x-axis data for it
-                    {uniqueSampleKey:"sample3", sampleId:"sample3", studyId:"study", genesetId:"abc", value:"2"},
-                    // the following data should not appear because one is NaN
-                    {uniqueSampleKey:"sample4", sampleId:"sample4", studyId:"study", genesetId:"abc", value:NaN},
-                    {uniqueSampleKey:"sample4", sampleId:"sample4", studyId:"study", genesetId:"def", value:"1.5"},
-                ] as any, [], "abc", "abc", "def", "def", { samples: {}, patients: {} }, {} as any),
+                computePlotData(
+                    [
+                        {
+                            uniqueSampleKey: 'sample1',
+                            sampleId: 'sample1',
+                            studyId: 'study',
+                            genesetId: 'abc',
+                            value: '2',
+                        },
+                        {
+                            uniqueSampleKey: 'sample2',
+                            sampleId: 'sample2',
+                            studyId: 'study',
+                            genesetId: 'abc',
+                            value: '4',
+                        },
+                        {
+                            uniqueSampleKey: 'sample1',
+                            sampleId: 'sample1',
+                            studyId: 'study',
+                            genesetId: 'def',
+                            value: '1.5',
+                        },
+                        {
+                            uniqueSampleKey: 'sample2',
+                            sampleId: 'sample2',
+                            studyId: 'study',
+                            genesetId: 'def',
+                            value: '10',
+                        },
+                        // the following data should not appear because only x-axis data for it
+                        {
+                            uniqueSampleKey: 'sample3',
+                            sampleId: 'sample3',
+                            studyId: 'study',
+                            genesetId: 'abc',
+                            value: '2',
+                        },
+                        // the following data should not appear because one is NaN
+                        {
+                            uniqueSampleKey: 'sample4',
+                            sampleId: 'sample4',
+                            studyId: 'study',
+                            genesetId: 'abc',
+                            value: NaN,
+                        },
+                        {
+                            uniqueSampleKey: 'sample4',
+                            sampleId: 'sample4',
+                            studyId: 'study',
+                            genesetId: 'def',
+                            value: '1.5',
+                        },
+                    ] as any,
+                    [],
+                    'abc',
+                    'abc',
+                    'def',
+                    'def',
+                    { samples: {}, patients: {} },
+                    {} as any
+                ),
                 [
-                    {x: 2, y: 1.5, mutationsX: "", mutationsY: "", studyId: "study", sampleId: "sample1", profiledX: false, profiledY:false},
-                    {x: 4, y: 10, mutationsX: "", mutationsY: "", studyId: "study", sampleId: "sample2", profiledX: false, profiledY: false}
+                    {
+                        x: 2,
+                        y: 1.5,
+                        mutationsX: '',
+                        mutationsY: '',
+                        studyId: 'study',
+                        sampleId: 'sample1',
+                        profiledX: false,
+                        profiledY: false,
+                    },
+                    {
+                        x: 4,
+                        y: 10,
+                        mutationsX: '',
+                        mutationsY: '',
+                        studyId: 'study',
+                        sampleId: 'sample2',
+                        profiledX: false,
+                        profiledY: false,
+                    },
                 ]
             );
         });
     });
-});
\ No newline at end of file
+});
diff --git a/src/pages/resultsView/coExpression/CoExpressionVizUtils.ts b/src/pages/resultsView/coExpression/CoExpressionVizUtils.ts
index 451551b689e..dc3b1a27d96 100644
--- a/src/pages/resultsView/coExpression/CoExpressionVizUtils.ts
+++ b/src/pages/resultsView/coExpression/CoExpressionVizUtils.ts
@@ -1,24 +1,30 @@
-import {MolecularProfile, Mutation, NumericGeneMolecularData} from "../../../shared/api/generated/CBioPortalAPI";
-import {GenesetMolecularData} from "../../../shared/api/generated/CBioPortalAPIInternal";
-import {CoverageInformation} from "../ResultsViewPageStoreUtils";
-import {isSampleProfiled} from "../../../shared/lib/isSampleProfiled";
-
+import {
+    MolecularProfile,
+    Mutation,
+    NumericGeneMolecularData,
+} from '../../../shared/api/generated/CBioPortalAPI';
+import { GenesetMolecularData } from '../../../shared/api/generated/CBioPortalAPIInternal';
+import { CoverageInformation } from '../ResultsViewPageStoreUtils';
+import { isSampleProfiled } from '../../../shared/lib/isSampleProfiled';
 
 const nonBreakingSpace = '\xa0';
-export function requestAllDataMessage(hugoGeneSymbol:string) {
+export function requestAllDataMessage(hugoGeneSymbol: string) {
     return `There are no genes with a Pearson or Spearman correlation with ${hugoGeneSymbol} of${nonBreakingSpace}>${nonBreakingSpace}0.3${nonBreakingSpace}or${nonBreakingSpace}<${nonBreakingSpace}-0.3.`;
 }
 
-function dispMut(mutations:Mutation[]) {
-    return mutations.map(mutation=>mutation.proteinChange).filter(p=>!!p).join(", ");
+function dispMut(mutations: Mutation[]) {
+    return mutations
+        .map(mutation => mutation.proteinChange)
+        .filter(p => !!p)
+        .join(', ');
 }
 
 function isProfiled(
-    uniqueSampleKey:string,
-    studyId:string,
-    hugoGeneSymbol:string,
-    coverageInformation:CoverageInformation,
-    studyToMutationMolecularProfile:{[studyId:string]:MolecularProfile}
+    uniqueSampleKey: string,
+    studyId: string,
+    hugoGeneSymbol: string,
+    coverageInformation: CoverageInformation,
+    studyToMutationMolecularProfile: { [studyId: string]: MolecularProfile }
 ) {
     const molecularProfile = studyToMutationMolecularProfile[studyId];
     if (!molecularProfile) {
@@ -34,22 +40,36 @@ function isProfiled(
 }
 
 export function computePlotData(
-    molecularData: NumericGeneMolecularData[]|GenesetMolecularData[],
+    molecularData: NumericGeneMolecularData[] | GenesetMolecularData[],
     mutationData: Mutation[],
-    xGeneticEntityId:number|string,
-    yGeneticEntityId:number|string,
-    xGeneticEntityName:string,
-    yGeneticEntityName:string,
-    coverageInformation:CoverageInformation,
-    studyToMutationMolecularProfile:{[studyId:string]:MolecularProfile}
+    xGeneticEntityId: number | string,
+    yGeneticEntityId: number | string,
+    xGeneticEntityName: string,
+    yGeneticEntityName: string,
+    coverageInformation: CoverageInformation,
+    studyToMutationMolecularProfile: { [studyId: string]: MolecularProfile }
 ) {
-    const xData:{[uniqueSampleKey:string]:NumericGeneMolecularData|GenesetMolecularData} = {};
-    const yData:{[uniqueSampleKey:string]:NumericGeneMolecularData|GenesetMolecularData} = {};
-    const xMutations:{[uniqueSampleKey:string]:Mutation[]} = {};
-    const yMutations:{[uniqueSampleKey:string]:Mutation[]} = {};
-    const sampleInfo:{[uniqueSampleKey:string]:{sampleId:string, studyId:string}} = {};
+    const xData: {
+        [uniqueSampleKey: string]:
+            | NumericGeneMolecularData
+            | GenesetMolecularData;
+    } = {};
+    const yData: {
+        [uniqueSampleKey: string]:
+            | NumericGeneMolecularData
+            | GenesetMolecularData;
+    } = {};
+    const xMutations: { [uniqueSampleKey: string]: Mutation[] } = {};
+    const yMutations: { [uniqueSampleKey: string]: Mutation[] } = {};
+    const sampleInfo: {
+        [uniqueSampleKey: string]: { sampleId: string; studyId: string };
+    } = {};
 
-    const addSampleInfo = (datum:{sampleId:string, studyId:string, uniqueSampleKey:string})=>{
+    const addSampleInfo = (datum: {
+        sampleId: string;
+        studyId: string;
+        uniqueSampleKey: string;
+    }) => {
         if (!sampleInfo[datum.uniqueSampleKey]) {
             sampleInfo[datum.uniqueSampleKey] = datum;
         }
@@ -57,23 +77,40 @@ export function computePlotData(
     if (typeof xGeneticEntityId === 'number') {
         for (const datum of mutationData) {
             if (datum.proteinChange) {
-                const targetData = (datum.entrezGeneId === xGeneticEntityId ? xMutations : yMutations);
-                targetData[datum.uniqueSampleKey] = targetData[datum.uniqueSampleKey] || [];
+                const targetData =
+                    datum.entrezGeneId === xGeneticEntityId
+                        ? xMutations
+                        : yMutations;
+                targetData[datum.uniqueSampleKey] =
+                    targetData[datum.uniqueSampleKey] || [];
                 targetData[datum.uniqueSampleKey].push(datum);
                 addSampleInfo(datum);
             }
         }
     }
 
-    if (molecularData[0] && (molecularData[0] as NumericGeneMolecularData).entrezGeneId !== undefined) { //Check if molecularData contains gene or gene set data
+    if (
+        molecularData[0] &&
+        (molecularData[0] as NumericGeneMolecularData).entrezGeneId !==
+            undefined
+    ) {
+        //Check if molecularData contains gene or gene set data
         for (const datum of molecularData) {
-            const targetData = ((datum as NumericGeneMolecularData).entrezGeneId === xGeneticEntityId ? xData : yData);
+            const targetData =
+                (datum as NumericGeneMolecularData).entrezGeneId ===
+                xGeneticEntityId
+                    ? xData
+                    : yData;
             targetData[datum.uniqueSampleKey] = datum;
             addSampleInfo(datum);
-        } 
+        }
     } else {
         for (const datum of molecularData) {
-            const targetData = ((datum as GenesetMolecularData).genesetId === xGeneticEntityId.toString() ? xData : yData);
+            const targetData =
+                (datum as GenesetMolecularData).genesetId ===
+                xGeneticEntityId.toString()
+                    ? xData
+                    : yData;
             targetData[datum.uniqueSampleKey] = datum;
             addSampleInfo(datum);
         }
@@ -94,17 +131,31 @@ export function computePlotData(
                     y: yVal,
                     mutationsX: dispMut(xMutations[uniqueSampleKey] || []),
                     mutationsY: dispMut(yMutations[uniqueSampleKey] || []),
-                    profiledX: typeof xGeneticEntityId === 'number' ? 
-                        isProfiled(uniqueSampleKey, studyId, xGeneticEntityName, coverageInformation, studyToMutationMolecularProfile) :
-                        false,
-                    profiledY: typeof yGeneticEntityId === 'number' ?
-                        isProfiled(uniqueSampleKey, studyId, yGeneticEntityName, coverageInformation, studyToMutationMolecularProfile) :
-                        false,
+                    profiledX:
+                        typeof xGeneticEntityId === 'number'
+                            ? isProfiled(
+                                  uniqueSampleKey,
+                                  studyId,
+                                  xGeneticEntityName,
+                                  coverageInformation,
+                                  studyToMutationMolecularProfile
+                              )
+                            : false,
+                    profiledY:
+                        typeof yGeneticEntityId === 'number'
+                            ? isProfiled(
+                                  uniqueSampleKey,
+                                  studyId,
+                                  yGeneticEntityName,
+                                  coverageInformation,
+                                  studyToMutationMolecularProfile
+                              )
+                            : false,
                     studyId,
-                    sampleId: sampleInfo[uniqueSampleKey].sampleId
+                    sampleId: sampleInfo[uniqueSampleKey].sampleId,
                 });
             }
         }
     }
     return ret;
-}
\ No newline at end of file
+}
diff --git a/src/pages/resultsView/coExpression/styles.scss b/src/pages/resultsView/coExpression/styles.scss
index bcad16615e3..6988580df9d 100644
--- a/src/pages/resultsView/coExpression/styles.scss
+++ b/src/pages/resultsView/coExpression/styles.scss
@@ -1,52 +1,53 @@
 .coexpression-plot-data-tooltip {
-  div {
-    font-size: 12px;
-  }
-  max-width:none !important; //override bootstrap
+    div {
+        font-size: 12px;
+    }
+    max-width: none !important; //override bootstrap
 }
 
 .coexpression-plot-toolbar-elt {
-  display: inline-block !important;
-  margin-right: 10px !important;
+    display: inline-block !important;
+    margin-right: 10px !important;
 }
 
 $coExpressionSelectProfileOuterHeight: 30px;
 $coExpressionSelectProfileGutter: 4px;
-$coExpressionSelectProfileInnerHeight: $coExpressionSelectProfileOuterHeight - $coExpressionSelectProfileGutter;
+$coExpressionSelectProfileInnerHeight: $coExpressionSelectProfileOuterHeight -
+    $coExpressionSelectProfileGutter;
 
 .coexpression-select-profile .Select-control {
-  height: $coExpressionSelectProfileOuterHeight;
+    height: $coExpressionSelectProfileOuterHeight;
 
-  .Select-value {
-    line-height: $coExpressionSelectProfileInnerHeight !important;
+    .Select-value {
+        line-height: $coExpressionSelectProfileInnerHeight !important;
 
-    .Select-value-label {
-      line-height: $coExpressionSelectProfileInnerHeight;
+        .Select-value-label {
+            line-height: $coExpressionSelectProfileInnerHeight;
+        }
     }
-  }
 
-  .Select-input {
-    height: $coExpressionSelectProfileInnerHeight;
-  }
+    .Select-input {
+        height: $coExpressionSelectProfileInnerHeight;
+    }
 }
 
-
 $coExpressionSelectTableModeOuterHeight: 30px;
 $coExpressionSelectTableModeGutter: 4px;
-$coExpressionSelectTableModeInnerHeight: $coExpressionSelectProfileOuterHeight - $coExpressionSelectProfileGutter;
+$coExpressionSelectTableModeInnerHeight: $coExpressionSelectProfileOuterHeight -
+    $coExpressionSelectProfileGutter;
 
 .coexpression-select-table-mode .Select-control {
-  height: $coExpressionSelectTableModeOuterHeight;
+    height: $coExpressionSelectTableModeOuterHeight;
 
-  .Select-value {
-    line-height: $coExpressionSelectTableModeInnerHeight !important;
+    .Select-value {
+        line-height: $coExpressionSelectTableModeInnerHeight !important;
 
-    .Select-value-label {
-      line-height: $coExpressionSelectTableModeInnerHeight;
+        .Select-value-label {
+            line-height: $coExpressionSelectTableModeInnerHeight;
+        }
     }
-  }
 
-  .Select-input {
-    height: $coExpressionSelectTableModeInnerHeight;
-  }
-}
\ No newline at end of file
+    .Select-input {
+        height: $coExpressionSelectTableModeInnerHeight;
+    }
+}
diff --git a/src/pages/resultsView/download/CaseAlterationTable.tsx b/src/pages/resultsView/download/CaseAlterationTable.tsx
index 907bbf7b5c2..82d2f3f0695 100644
--- a/src/pages/resultsView/download/CaseAlterationTable.tsx
+++ b/src/pages/resultsView/download/CaseAlterationTable.tsx
@@ -1,16 +1,26 @@
-import {observer} from "mobx-react";
+import { observer } from 'mobx-react';
 import * as React from 'react';
 import * as _ from 'lodash';
-import {default as LazyMobXTable, Column} from "shared/components/lazyMobXTable/LazyMobXTable";
-import {OQLLineFilterOutput, UnflattenedOQLLineFilterOutput, MergedTrackLineFilterOutput} from "shared/lib/oql/oqlfilter";
-import {AnnotatedExtendedAlteration, IQueriedMergedTrackCaseData} from "../ResultsViewPageStore";
-import {StudyLink} from "shared/components/StudyLink/StudyLink";
-import {getPatientViewUrl, getSampleViewUrl} from "shared/api/urls";
-import styles from "./styles.module.scss"
-import { getMultipleGeneResultKey } from "../ResultsViewPageStoreUtils";
+import {
+    default as LazyMobXTable,
+    Column,
+} from 'shared/components/lazyMobXTable/LazyMobXTable';
+import {
+    OQLLineFilterOutput,
+    UnflattenedOQLLineFilterOutput,
+    MergedTrackLineFilterOutput,
+} from 'shared/lib/oql/oqlfilter';
+import {
+    AnnotatedExtendedAlteration,
+    IQueriedMergedTrackCaseData,
+} from '../ResultsViewPageStore';
+import { StudyLink } from 'shared/components/StudyLink/StudyLink';
+import { getPatientViewUrl, getSampleViewUrl } from 'shared/api/urls';
+import styles from './styles.module.scss';
+import { getMultipleGeneResultKey } from '../ResultsViewPageStoreUtils';
 import { AlteredStatus } from 'pages/resultsView/mutualExclusivity/MutualExclusivityUtil';
 import { Alteration } from 'shared/lib/oql/oql-parser';
-import { parsedOQLAlterationToSourceOQL } from "shared/lib/oql/oqlfilter";
+import { parsedOQLAlterationToSourceOQL } from 'shared/lib/oql/oqlfilter';
 
 export interface ISubAlteration {
     type: string;
@@ -38,76 +48,90 @@ export interface ICaseAlteration {
     sampleId: string;
     patientId: string;
     altered: boolean;
-    oqlData: {[oqlLine: string]: IOqlData};
-    oqlDataByGene: {[gene: string]: IOqlData};
+    oqlData: { [oqlLine: string]: IOqlData };
+    oqlDataByGene: { [gene: string]: IOqlData };
 }
 
 export interface ICaseAlterationTableProps {
     caseAlterationData: ICaseAlteration[];
     oqls: OQLLineFilterOutput<AnnotatedExtendedAlteration>[];
     trackLabels: string[];
-    trackAlterationTypesMap: {[label:string]: string[]};
-    geneAlterationTypesMap: {[label:string]: Alteration[]};
+    trackAlterationTypesMap: { [label: string]: string[] };
+    geneAlterationTypesMap: { [label: string]: Alteration[] };
 }
 
 export type PseudoOqlSummary = {
     summaryContent: string;
     summaryClass: any;
-    summaryAlteredStatus: AlteredStatus
-}
+    summaryAlteredStatus: AlteredStatus;
+};
 
-export function generateOqlValue(data: IOqlData, alterationType: string): PseudoOqlSummary | undefined
-{
+export function generateOqlValue(
+    data: IOqlData,
+    alterationType: string
+): PseudoOqlSummary | undefined {
     // helper functions to map the display value for different alteration types
-    const stringMapper = (alterationData: (string|ISubAlteration)[]) => alterationData;
-    const subAlterationMapper = (alterationData: (string|ISubAlteration)[]) =>
-        alterationData.map((alteration: ISubAlteration) => alteration.type);        
+    const stringMapper = (alterationData: (string | ISubAlteration)[]) =>
+        alterationData;
+    const subAlterationMapper = (alterationData: (string | ISubAlteration)[]) =>
+        alterationData.map((alteration: ISubAlteration) => alteration.type);
     let generator;
     let pseudoOqlSummary: PseudoOqlSummary | undefined = undefined;
 
-    if (data.alterationTypes.length === 0 || !data.alterationTypes.includes(alterationType)) {
-        pseudoOqlSummary = {summaryContent: "no alteration", summaryClass: styles.noAlterationSpan, summaryAlteredStatus: AlteredStatus.UNALTERED};
+    if (
+        data.alterationTypes.length === 0 ||
+        !data.alterationTypes.includes(alterationType)
+    ) {
+        pseudoOqlSummary = {
+            summaryContent: 'no alteration',
+            summaryClass: styles.noAlterationSpan,
+            summaryAlteredStatus: AlteredStatus.UNALTERED,
+        };
     }
     switch (alterationType) {
-        case "MUT":
+        case 'MUT':
             generator = {
-                label: "MUT",
+                label: 'MUT',
                 getAlterationData: (oqlData: IOqlData) => oqlData.mutation,
-                isNotProfiled: (oqlData: IOqlData) => oqlData.isMutationNotProfiled,
-                getValues: stringMapper
-            }
+                isNotProfiled: (oqlData: IOqlData) =>
+                    oqlData.isMutationNotProfiled,
+                getValues: stringMapper,
+            };
             break;
-        case "FUSION":
+        case 'FUSION':
             generator = {
-                label: "FUSION",
+                label: 'FUSION',
                 getAlterationData: (oqlData: IOqlData) => oqlData.fusion,
-                isNotProfiled: (oqlData: IOqlData) => oqlData.isFusionNotProfiled,
-                getValues: stringMapper
-            }
+                isNotProfiled: (oqlData: IOqlData) =>
+                    oqlData.isFusionNotProfiled,
+                getValues: stringMapper,
+            };
             break;
-        case "CNA":
+        case 'CNA':
             generator = {
-                label: "CNA",
+                label: 'CNA',
                 getAlterationData: (oqlData: IOqlData) => oqlData.cna,
                 isNotProfiled: (oqlData: IOqlData) => oqlData.isCnaNotProfiled,
-                getValues: subAlterationMapper
-            }
+                getValues: subAlterationMapper,
+            };
             break;
-        case "EXP":
+        case 'EXP':
             generator = {
-                label: "EXP",
+                label: 'EXP',
                 getAlterationData: (oqlData: IOqlData) => oqlData.mrnaExp,
-                isNotProfiled: (oqlData: IOqlData) => oqlData.isMrnaExpNotProfiled,
-                getValues: subAlterationMapper
-            }
+                isNotProfiled: (oqlData: IOqlData) =>
+                    oqlData.isMrnaExpNotProfiled,
+                getValues: subAlterationMapper,
+            };
             break;
-        case "PROT":
+        case 'PROT':
             generator = {
-                label: "PROT",
+                label: 'PROT',
                 getAlterationData: (oqlData: IOqlData) => oqlData.proteinLevel,
-                isNotProfiled: (oqlData: IOqlData) => oqlData.isProteinLevelNotProfiled,
-                getValues: subAlterationMapper
-            }
+                isNotProfiled: (oqlData: IOqlData) =>
+                    oqlData.isProteinLevelNotProfiled,
+                getValues: subAlterationMapper,
+            };
             break;
         default:
     }
@@ -115,10 +139,18 @@ export function generateOqlValue(data: IOqlData, alterationType: string): Pseudo
     if (generator) {
         const alterationData = generator.getAlterationData(data);
         if (alterationData.length > 0) {
-            pseudoOqlSummary = {summaryContent: generator.getValues(alterationData).join(", "), summaryClass: styles.alterationSpan, summaryAlteredStatus: AlteredStatus.ALTERED};
+            pseudoOqlSummary = {
+                summaryContent: generator.getValues(alterationData).join(', '),
+                summaryClass: styles.alterationSpan,
+                summaryAlteredStatus: AlteredStatus.ALTERED,
+            };
         }
         if (generator.isNotProfiled(data)) {
-            pseudoOqlSummary = {summaryContent: "not profiled", summaryClass: styles.notProfiledSpan, summaryAlteredStatus: AlteredStatus.UNPROFILED};
+            pseudoOqlSummary = {
+                summaryContent: 'not profiled',
+                summaryClass: styles.notProfiledSpan,
+                summaryAlteredStatus: AlteredStatus.UNPROFILED,
+            };
         }
     }
 
@@ -126,10 +158,12 @@ export function generateOqlValue(data: IOqlData, alterationType: string): Pseudo
     return pseudoOqlSummary ? pseudoOqlSummary : undefined;
 }
 
-export function generatePseudoOqlSummary(oqlData: {[oqlLine: string]: IOqlData}, oqlLine: string, alterationType: string): PseudoOqlSummary | undefined
-{  
-    if (!_.isEmpty(oqlData))
-    {
+export function generatePseudoOqlSummary(
+    oqlData: { [oqlLine: string]: IOqlData },
+    oqlLine: string,
+    alterationType: string
+): PseudoOqlSummary | undefined {
+    if (!_.isEmpty(oqlData)) {
         const datum = oqlData[oqlLine];
 
         if (datum) {
@@ -140,121 +174,247 @@ export function generatePseudoOqlSummary(oqlData: {[oqlLine: string]: IOqlData},
     return undefined;
 }
 
-export function computeAlterationTypes(alterationData: ICaseAlteration[]): string[]
-{
+export function computeAlterationTypes(
+    alterationData: ICaseAlteration[]
+): string[] {
     const types = _.chain(alterationData)
-        .map((alteration) => _.values(alteration.oqlData))
+        .map(alteration => _.values(alteration.oqlData))
         .flatten()
-        .map((oqlDataValue) => oqlDataValue.alterationTypes)
+        .map(oqlDataValue => oqlDataValue.alterationTypes)
         .flatten()
         .uniq()
         .value();
     return types;
 }
 
-export function getPseudoOqlSummaryByAlterationTypes(oqlData: {[oqlLine: string]: IOqlData}, oqlLine: string, alterationTypes: string[]) : PseudoOqlSummary {
-    const pseudoOqlSummaries = _.map(alterationTypes, (type) => generatePseudoOqlSummary(oqlData, oqlLine, type));
+export function getPseudoOqlSummaryByAlterationTypes(
+    oqlData: { [oqlLine: string]: IOqlData },
+    oqlLine: string,
+    alterationTypes: string[]
+): PseudoOqlSummary {
+    const pseudoOqlSummaries = _.map(alterationTypes, type =>
+        generatePseudoOqlSummary(oqlData, oqlLine, type)
+    );
     // if not profiled in all profiles, then it is not profiled
-    const notProfiledPseudoOqlSummaries = _.filter(pseudoOqlSummaries, (summary) => summary ? summary.summaryAlteredStatus === AlteredStatus.UNPROFILED : false);
-    if (notProfiledPseudoOqlSummaries && notProfiledPseudoOqlSummaries.length === alterationTypes.length) {
-        return {summaryContent: "not profiled", summaryClass: styles.notProfiledSpan, summaryAlteredStatus: AlteredStatus.UNPROFILED};
+    const notProfiledPseudoOqlSummaries = _.filter(
+        pseudoOqlSummaries,
+        summary =>
+            summary
+                ? summary.summaryAlteredStatus === AlteredStatus.UNPROFILED
+                : false
+    );
+    if (
+        notProfiledPseudoOqlSummaries &&
+        notProfiledPseudoOqlSummaries.length === alterationTypes.length
+    ) {
+        return {
+            summaryContent: 'not profiled',
+            summaryClass: styles.notProfiledSpan,
+            summaryAlteredStatus: AlteredStatus.UNPROFILED,
+        };
     }
     // altered and no alteration
-    const alteredPseudoOqlSummaries = _.filter(pseudoOqlSummaries, (summary) => summary ? summary.summaryAlteredStatus === AlteredStatus.ALTERED : false);
-    const alteredPseudoOqlSummaryContent = _.map(alteredPseudoOqlSummaries, (summary : PseudoOqlSummary)=>summary.summaryContent).join(", ");
+    const alteredPseudoOqlSummaries = _.filter(pseudoOqlSummaries, summary =>
+        summary ? summary.summaryAlteredStatus === AlteredStatus.ALTERED : false
+    );
+    const alteredPseudoOqlSummaryContent = _.map(
+        alteredPseudoOqlSummaries,
+        (summary: PseudoOqlSummary) => summary.summaryContent
+    ).join(', ');
     if (alteredPseudoOqlSummaries.length > 0) {
-        return {summaryContent: alteredPseudoOqlSummaryContent, summaryClass: styles.alterationSpan, summaryAlteredStatus: AlteredStatus.ALTERED};
+        return {
+            summaryContent: alteredPseudoOqlSummaryContent,
+            summaryClass: styles.alterationSpan,
+            summaryAlteredStatus: AlteredStatus.ALTERED,
+        };
     } else {
-        return {summaryContent: "no alteration", summaryClass: styles.noAlterationSpan, summaryAlteredStatus: AlteredStatus.UNALTERED};
+        return {
+            summaryContent: 'no alteration',
+            summaryClass: styles.noAlterationSpan,
+            summaryAlteredStatus: AlteredStatus.UNALTERED,
+        };
     }
 }
 
 class CaseAlterationTableComponent extends LazyMobXTable<ICaseAlteration> {}
 
 @observer
-export default class CaseAlterationTable extends React.Component<ICaseAlterationTableProps, {}> {
-    public render()
-    {
+export default class CaseAlterationTable extends React.Component<
+    ICaseAlterationTableProps,
+    {}
+> {
+    public render() {
         const columns: Column<ICaseAlteration>[] = [
             {
                 name: 'Study ID',
-                render: (data: ICaseAlteration) => <span style={{whiteSpace: "nowrap"}}><StudyLink studyId={data.studyId}>{data.studyId}</StudyLink></span>,
+                render: (data: ICaseAlteration) => (
+                    <span style={{ whiteSpace: 'nowrap' }}>
+                        <StudyLink studyId={data.studyId}>
+                            {data.studyId}
+                        </StudyLink>
+                    </span>
+                ),
                 download: (data: ICaseAlteration) => data.studyId,
                 sortBy: (data: ICaseAlteration) => data.studyId,
                 filter: (data: ICaseAlteration, filterString: string) => {
-                    return (new RegExp(filterString, 'i')).test(data.studyId);
-                }
+                    return new RegExp(filterString, 'i').test(data.studyId);
+                },
             },
             {
                 name: 'Sample ID',
-                render: (data: ICaseAlteration) => <span style={{whiteSpace: "nowrap"}}><a href={getSampleViewUrl(data.studyId, data.sampleId)} target='_blank'>{data.sampleId}</a></span>,
+                render: (data: ICaseAlteration) => (
+                    <span style={{ whiteSpace: 'nowrap' }}>
+                        <a
+                            href={getSampleViewUrl(data.studyId, data.sampleId)}
+                            target="_blank"
+                        >
+                            {data.sampleId}
+                        </a>
+                    </span>
+                ),
                 download: (data: ICaseAlteration) => `${data.sampleId}`,
                 sortBy: (data: ICaseAlteration) => data.sampleId,
                 filter: (data: ICaseAlteration, filterString: string) => {
-                    return (new RegExp(filterString, 'i')).test(data.sampleId);
-                }
+                    return new RegExp(filterString, 'i').test(data.sampleId);
+                },
             },
             {
                 name: 'Patient ID',
-                render: (data: ICaseAlteration) => <span style={{whiteSpace: "nowrap"}}><a href={getPatientViewUrl(data.studyId, data.patientId)} target='_blank'>{data.patientId}</a></span>,
+                render: (data: ICaseAlteration) => (
+                    <span style={{ whiteSpace: 'nowrap' }}>
+                        <a
+                            href={getPatientViewUrl(
+                                data.studyId,
+                                data.patientId
+                            )}
+                            target="_blank"
+                        >
+                            {data.patientId}
+                        </a>
+                    </span>
+                ),
                 download: (data: ICaseAlteration) => `${data.patientId}`,
                 sortBy: (data: ICaseAlteration) => data.patientId,
                 filter: (data: ICaseAlteration, filterString: string) => {
-                    return (new RegExp(filterString, 'i')).test(data.patientId);
-                }
+                    return new RegExp(filterString, 'i').test(data.patientId);
+                },
             },
             {
                 name: 'Altered',
-                tooltip: <span>1 = Sample harbors alteration in one of the input genes</span>,
-                render: (data: ICaseAlteration) => <span>{data.altered ? "1" : "0"}</span>,
-                download: (data: ICaseAlteration) => data.altered ? "1" : "0",
-                sortBy: (data: ICaseAlteration) => data.altered ? 1 : 0
-            }
+                tooltip: (
+                    <span>
+                        1 = Sample harbors alteration in one of the input genes
+                    </span>
+                ),
+                render: (data: ICaseAlteration) => (
+                    <span>{data.altered ? '1' : '0'}</span>
+                ),
+                download: (data: ICaseAlteration) => (data.altered ? '1' : '0'),
+                sortBy: (data: ICaseAlteration) => (data.altered ? 1 : 0),
+            },
         ];
 
         // track columns
-        _.forEach(this.props.trackLabels, (trackLabel) => {
+        _.forEach(this.props.trackLabels, trackLabel => {
             // add column for each track
             columns.push({
                 name: `${trackLabel}`,
                 headerDownload: (name: string) => `${trackLabel}`,
                 render: (data: ICaseAlteration) => {
-                    const pseudoOqlSummary = getPseudoOqlSummaryByAlterationTypes(data.oqlData, trackLabel, this.props.trackAlterationTypesMap[trackLabel]); 
-                    return <span className={pseudoOqlSummary.summaryClass}>{pseudoOqlSummary.summaryContent}</span>;
+                    const pseudoOqlSummary = getPseudoOqlSummaryByAlterationTypes(
+                        data.oqlData,
+                        trackLabel,
+                        this.props.trackAlterationTypesMap[trackLabel]
+                    );
+                    return (
+                        <span className={pseudoOqlSummary.summaryClass}>
+                            {pseudoOqlSummary.summaryContent}
+                        </span>
+                    );
                 },
-                download: (data: ICaseAlteration) => getPseudoOqlSummaryByAlterationTypes(data.oqlData, trackLabel, this.props.trackAlterationTypesMap[trackLabel])!.summaryContent,
-                sortBy: (data: ICaseAlteration) => getPseudoOqlSummaryByAlterationTypes(data.oqlData, trackLabel, this.props.trackAlterationTypesMap[trackLabel])!.summaryContent,
+                download: (data: ICaseAlteration) =>
+                    getPseudoOqlSummaryByAlterationTypes(
+                        data.oqlData,
+                        trackLabel,
+                        this.props.trackAlterationTypesMap[trackLabel]
+                    )!.summaryContent,
+                sortBy: (data: ICaseAlteration) =>
+                    getPseudoOqlSummaryByAlterationTypes(
+                        data.oqlData,
+                        trackLabel,
+                        this.props.trackAlterationTypesMap[trackLabel]
+                    )!.summaryContent,
                 filter: (data: ICaseAlteration, filterString: string) => {
-                    return (new RegExp(filterString, 'i')).test(getPseudoOqlSummaryByAlterationTypes(data.oqlData, trackLabel, this.props.trackAlterationTypesMap[trackLabel])!.summaryContent);
+                    return new RegExp(filterString, 'i').test(
+                        getPseudoOqlSummaryByAlterationTypes(
+                            data.oqlData,
+                            trackLabel,
+                            this.props.trackAlterationTypesMap[trackLabel]
+                        )!.summaryContent
+                    );
                 },
-                visible: true
+                visible: true,
             });
         });
 
         // additional alteration combinations
-        const uniqGenes = _.uniq(_.map(this.props.oqls, (oql) => oql.gene));
+        const uniqGenes = _.uniq(_.map(this.props.oqls, oql => oql.gene));
 
-        _.forEach(uniqGenes, (gene) => {
+        _.forEach(uniqGenes, gene => {
             //add column for each gene alteration combination
             this.props.geneAlterationTypesMap[gene].forEach(alteration => {
                 const oql_line = parsedOQLAlterationToSourceOQL(alteration);
                 const alterationType = alteration.alteration_type.toUpperCase();
                 const alterationName = `${gene}: ${oql_line}`;
-                if (_.isEmpty(columns.find((column) => column.name === alterationName))) {
+                if (
+                    _.isEmpty(
+                        columns.find(column => column.name === alterationName)
+                    )
+                ) {
                     columns.push({
                         name: `${gene}: ${oql_line}`,
-                        headerDownload: (name: string) => `${gene}: ${oql_line}`,
+                        headerDownload: (name: string) =>
+                            `${gene}: ${oql_line}`,
                         render: (data: ICaseAlteration) => {
-                            const pseudoOqlSummary = generatePseudoOqlSummary(data.oqlDataByGene, gene, alterationType); 
-    
-                            return <span className={pseudoOqlSummary!.summaryClass}>{pseudoOqlSummary!.summaryContent}</span>;
+                            const pseudoOqlSummary = generatePseudoOqlSummary(
+                                data.oqlDataByGene,
+                                gene,
+                                alterationType
+                            );
+
+                            return (
+                                <span
+                                    className={pseudoOqlSummary!.summaryClass}
+                                >
+                                    {pseudoOqlSummary!.summaryContent}
+                                </span>
+                            );
                         },
-                        download: (data: ICaseAlteration) => generatePseudoOqlSummary(data.oqlDataByGene, gene, alterationType)!.summaryContent,
-                        sortBy: (data: ICaseAlteration) => generatePseudoOqlSummary(data.oqlDataByGene, gene, alterationType)!.summaryContent,
-                        filter: (data: ICaseAlteration, filterString: string) => {
-                            return (new RegExp(filterString, 'i')).test(generatePseudoOqlSummary(data.oqlDataByGene, gene, alterationType)!.summaryContent);
+                        download: (data: ICaseAlteration) =>
+                            generatePseudoOqlSummary(
+                                data.oqlDataByGene,
+                                gene,
+                                alterationType
+                            )!.summaryContent,
+                        sortBy: (data: ICaseAlteration) =>
+                            generatePseudoOqlSummary(
+                                data.oqlDataByGene,
+                                gene,
+                                alterationType
+                            )!.summaryContent,
+                        filter: (
+                            data: ICaseAlteration,
+                            filterString: string
+                        ) => {
+                            return new RegExp(filterString, 'i').test(
+                                generatePseudoOqlSummary(
+                                    data.oqlDataByGene,
+                                    gene,
+                                    alterationType
+                                )!.summaryContent
+                            );
                         },
-                        visible: false
+                        visible: false,
                     });
                 }
             });
@@ -272,7 +432,9 @@ export default class CaseAlterationTable extends React.Component<ICaseAlteration
                 showFilter={true}
                 showCopyDownload={true}
                 enableHorizontalScroll={true}
-                copyDownloadProps={{downloadFilename: "alterations_across_samples.tsv"}}
+                copyDownloadProps={{
+                    downloadFilename: 'alterations_across_samples.tsv',
+                }}
             />
         );
     }
diff --git a/src/pages/resultsView/download/DownloadTab.tsx b/src/pages/resultsView/download/DownloadTab.tsx
index 05bbba5c8a8..ffe6c736522 100644
--- a/src/pages/resultsView/download/DownloadTab.tsx
+++ b/src/pages/resultsView/download/DownloadTab.tsx
@@ -1,32 +1,67 @@
 import * as React from 'react';
 import * as _ from 'lodash';
-import {computed, observable, action} from "mobx";
-import {observer} from 'mobx-react';
+import { computed, observable, action } from 'mobx';
+import { observer } from 'mobx-react';
 import fileDownload from 'react-file-download';
-import {AnnotatedExtendedAlteration, ExtendedAlteration, ResultsViewPageStore, ModifyQueryParams, CaseAggregatedData, AlterationTypeConstants} from "../ResultsViewPageStore";
-import {CoverageInformation, getSingleGeneResultKey, getMultipleGeneResultKey} from "../ResultsViewPageStoreUtils";
-import {OQLLineFilterOutput, UnflattenedOQLLineFilterOutput, MergedTrackLineFilterOutput} from "shared/lib/oql/oqlfilter";
-import FeatureTitle from "shared/components/featureTitle/FeatureTitle";
-import {SimpleCopyDownloadControls} from "shared/components/copyDownloadControls/SimpleCopyDownloadControls";
-import {default as GeneAlterationTable, IGeneAlteration} from "./GeneAlterationTable";
-import {default as CaseAlterationTable, ICaseAlteration} from "./CaseAlterationTable";
 import {
-    generateCaseAlterationData, generateCnaData, generateDownloadData, generateGeneAlterationData, generateMrnaData,
-    generateMutationData, generateMutationDownloadData,
-    generateProteinData, hasValidData, hasValidMutationData, stringify2DArray, generateOtherMolecularProfileData, generateOtherMolecularProfileDownloadData
-} from "./DownloadUtils";
+    AnnotatedExtendedAlteration,
+    ExtendedAlteration,
+    ResultsViewPageStore,
+    ModifyQueryParams,
+    CaseAggregatedData,
+    AlterationTypeConstants,
+} from '../ResultsViewPageStore';
+import {
+    CoverageInformation,
+    getSingleGeneResultKey,
+    getMultipleGeneResultKey,
+} from '../ResultsViewPageStoreUtils';
+import {
+    OQLLineFilterOutput,
+    UnflattenedOQLLineFilterOutput,
+    MergedTrackLineFilterOutput,
+} from 'shared/lib/oql/oqlfilter';
+import FeatureTitle from 'shared/components/featureTitle/FeatureTitle';
+import { SimpleCopyDownloadControls } from 'shared/components/copyDownloadControls/SimpleCopyDownloadControls';
+import {
+    default as GeneAlterationTable,
+    IGeneAlteration,
+} from './GeneAlterationTable';
+import {
+    default as CaseAlterationTable,
+    ICaseAlteration,
+} from './CaseAlterationTable';
+import {
+    generateCaseAlterationData,
+    generateCnaData,
+    generateDownloadData,
+    generateGeneAlterationData,
+    generateMrnaData,
+    generateMutationData,
+    generateMutationDownloadData,
+    generateProteinData,
+    hasValidData,
+    hasValidMutationData,
+    stringify2DArray,
+    generateOtherMolecularProfileData,
+    generateOtherMolecularProfileDownloadData,
+} from './DownloadUtils';
 
-import styles from "./styles.module.scss";
+import styles from './styles.module.scss';
 import classNames from 'classnames';
-import OqlStatusBanner from "../../../shared/components/banners/OqlStatusBanner";
-import {WindowWidthBox} from "../../../shared/components/WindowWidthBox/WindowWidthBox";
-import {DefaultTooltip, remoteData} from "cbioportal-frontend-commons";
-import LoadingIndicator from "shared/components/loadingIndicator/LoadingIndicator";
-import onMobxPromise from "shared/lib/onMobxPromise";
-import {MolecularProfile, Sample, CancerStudy} from "shared/api/generated/CBioPortalAPI";
-import {getMobxPromiseGroupStatus} from "../../../shared/lib/getMobxPromiseGroupStatus";
-import ErrorMessage from "../../../shared/components/ErrorMessage";
-import AlterationFilterWarning from "../../../shared/components/banners/AlterationFilterWarning";
+import OqlStatusBanner from '../../../shared/components/banners/OqlStatusBanner';
+import { WindowWidthBox } from '../../../shared/components/WindowWidthBox/WindowWidthBox';
+import { DefaultTooltip, remoteData } from 'cbioportal-frontend-commons';
+import LoadingIndicator from 'shared/components/loadingIndicator/LoadingIndicator';
+import onMobxPromise from 'shared/lib/onMobxPromise';
+import {
+    MolecularProfile,
+    Sample,
+    CancerStudy,
+} from 'shared/api/generated/CBioPortalAPI';
+import { getMobxPromiseGroupStatus } from '../../../shared/lib/getMobxPromiseGroupStatus';
+import ErrorMessage from '../../../shared/components/ErrorMessage';
+import AlterationFilterWarning from '../../../shared/components/banners/AlterationFilterWarning';
 import { CUSTOM_CASE_LIST_ID } from 'shared/components/query/QueryStore';
 import { IVirtualStudyProps } from 'pages/studyView/virtualStudy/VirtualStudy';
 import { Alteration } from 'shared/lib/oql/oql-parser';
@@ -38,40 +73,56 @@ export interface IDownloadTabProps {
 }
 
 @observer
-export default class DownloadTab extends React.Component<IDownloadTabProps, {}>
-{
-    constructor(props: IDownloadTabProps)
-    {
+export default class DownloadTab extends React.Component<
+    IDownloadTabProps,
+    {}
+> {
+    constructor(props: IDownloadTabProps) {
         super(props);
 
         this.handleMutationDownload = this.handleMutationDownload.bind(this);
-        this.handleTransposedMutationDownload = this.handleTransposedMutationDownload.bind(this);
+        this.handleTransposedMutationDownload = this.handleTransposedMutationDownload.bind(
+            this
+        );
         this.handleCnaDownload = this.handleCnaDownload.bind(this);
-        this.handleTransposedCnaDownload = this.handleTransposedCnaDownload.bind(this);
+        this.handleTransposedCnaDownload = this.handleTransposedCnaDownload.bind(
+            this
+        );
         this.handleMrnaDownload = this.handleMrnaDownload.bind(this);
-        this.handleTransposedMrnaDownload = this.handleTransposedMrnaDownload.bind(this);
+        this.handleTransposedMrnaDownload = this.handleTransposedMrnaDownload.bind(
+            this
+        );
         this.handleProteinDownload = this.handleProteinDownload.bind(this);
-        this.handleTransposedProteinDownload = this.handleTransposedProteinDownload.bind(this);
+        this.handleTransposedProteinDownload = this.handleTransposedProteinDownload.bind(
+            this
+        );
     }
 
     readonly geneAlterationData = remoteData<IGeneAlteration[]>({
-        await: ()=>[
+        await: () => [
             this.props.store.oqlFilteredCaseAggregatedDataByOQLLine,
-            this.props.store.sequencedSampleKeysByGene
+            this.props.store.sequencedSampleKeysByGene,
         ],
-        invoke:()=>Promise.resolve(generateGeneAlterationData(
-            this.props.store.oqlFilteredCaseAggregatedDataByOQLLine.result!,
-            this.props.store.sequencedSampleKeysByGene.result!
-        ))
+        invoke: () =>
+            Promise.resolve(
+                generateGeneAlterationData(
+                    this.props.store.oqlFilteredCaseAggregatedDataByOQLLine
+                        .result!,
+                    this.props.store.sequencedSampleKeysByGene.result!
+                )
+            ),
     });
 
-    readonly geneAlterationDataByGene = remoteData<{[gene: string]: IGeneAlteration}>({
-        await:()=>[this.geneAlterationData],
-        invoke:()=>Promise.resolve(_.keyBy(this.geneAlterationData.result!, "gene"))
+    readonly geneAlterationDataByGene = remoteData<{
+        [gene: string]: IGeneAlteration;
+    }>({
+        await: () => [this.geneAlterationData],
+        invoke: () =>
+            Promise.resolve(_.keyBy(this.geneAlterationData.result!, 'gene')),
     });
 
     readonly caseAlterationData = remoteData<ICaseAlteration[]>({
-        await:()=>[
+        await: () => [
             this.props.store.selectedMolecularProfiles,
             this.props.store.oqlFilteredCaseAggregatedDataByOQLLine,
             this.props.store.oqlFilteredCaseAggregatedDataByUnflattenedOQLLine,
@@ -80,401 +131,741 @@ export default class DownloadTab extends React.Component<IDownloadTabProps, {}>
             this.geneAlterationDataByGene,
             this.props.store.molecularProfileIdToMolecularProfile,
         ],
-        invoke: ()=>Promise.resolve(generateCaseAlterationData(
-            this.props.store.oqlText,
-            this.props.store.selectedMolecularProfiles.result!,
-            this.props.store.oqlFilteredCaseAggregatedDataByOQLLine.result!,
-            this.props.store.oqlFilteredCaseAggregatedDataByUnflattenedOQLLine.result!,
-            this.props.store.coverageInformation.result!,
-            this.props.store.samples.result!,
-            this.geneAlterationDataByGene.result!,
-            this.props.store.molecularProfileIdToMolecularProfile.result!
-        ))
+        invoke: () =>
+            Promise.resolve(
+                generateCaseAlterationData(
+                    this.props.store.oqlText,
+                    this.props.store.selectedMolecularProfiles.result!,
+                    this.props.store.oqlFilteredCaseAggregatedDataByOQLLine
+                        .result!,
+                    this.props.store
+                        .oqlFilteredCaseAggregatedDataByUnflattenedOQLLine
+                        .result!,
+                    this.props.store.coverageInformation.result!,
+                    this.props.store.samples.result!,
+                    this.geneAlterationDataByGene.result!,
+                    this.props.store.molecularProfileIdToMolecularProfile
+                        .result!
+                )
+            ),
     });
 
-    readonly mutationData = remoteData<{[key: string]: ExtendedAlteration[]}>({
-        await:()=>[this.props.store.nonOqlFilteredCaseAggregatedData],
-        invoke:()=>{
-            return Promise.resolve(generateMutationData(this.props.store.nonOqlFilteredCaseAggregatedData.result!));
+    readonly mutationData = remoteData<{ [key: string]: ExtendedAlteration[] }>(
+        {
+            await: () => [this.props.store.nonOqlFilteredCaseAggregatedData],
+            invoke: () => {
+                return Promise.resolve(
+                    generateMutationData(
+                        this.props.store.nonOqlFilteredCaseAggregatedData
+                            .result!
+                    )
+                );
+            },
         }
-    });
+    );
 
     readonly mutationDownloadData = remoteData<string[][]>({
-        await:()=>[this.mutationData, this.props.store.samples, this.props.store.genes],
-        invoke:()=>Promise.resolve(generateMutationDownloadData(
-            this.mutationData.result!, this.props.store.samples.result!, this.props.store.genes.result!
-        ))
+        await: () => [
+            this.mutationData,
+            this.props.store.samples,
+            this.props.store.genes,
+        ],
+        invoke: () =>
+            Promise.resolve(
+                generateMutationDownloadData(
+                    this.mutationData.result!,
+                    this.props.store.samples.result!,
+                    this.props.store.genes.result!
+                )
+            ),
     });
 
-    readonly allOtherMolecularProfileDataGroupByProfileName = remoteData<{[profileName: string]: {[key: string]: ExtendedAlteration[]}}>({
-        await:()=>[this.props.store.nonQueriedMolecularData, this.props.store.nonSelectedMolecularProfilesGroupByName],
-        invoke:()=>{
-            const profileNames = _.keys(this.props.store.nonSelectedMolecularProfilesGroupByName.result);
+    readonly allOtherMolecularProfileDataGroupByProfileName = remoteData<{
+        [profileName: string]: { [key: string]: ExtendedAlteration[] };
+    }>({
+        await: () => [
+            this.props.store.nonQueriedMolecularData,
+            this.props.store.nonSelectedMolecularProfilesGroupByName,
+        ],
+        invoke: () => {
+            const profileNames = _.keys(
+                this.props.store.nonSelectedMolecularProfilesGroupByName.result
+            );
             if (this.props.store.doNonSelectedMolecularProfilesExist) {
                 const data = {
-                    "samples": _.groupBy(this.props.store.nonQueriedMolecularData.result!, (data) => data.uniqueSampleKey)
-                } as CaseAggregatedData<ExtendedAlteration>
-                const allOtherMolecularProfileDataGroupByProfileName: {[profileName: string]: {[key: string]: ExtendedAlteration[]}} = _.reduce(profileNames, (allOtherMolecularProfileDataGroupByProfileName, profileName) => {
-                    allOtherMolecularProfileDataGroupByProfileName[profileName] = generateOtherMolecularProfileData(this.props.store.nonSelectedMolecularProfilesGroupByName.result[profileName].map(profile => profile.molecularProfileId), data);
-                    return allOtherMolecularProfileDataGroupByProfileName;
-                },{} as {[profileName: string]: {[key: string]: ExtendedAlteration[]}})
-                return Promise.resolve(allOtherMolecularProfileDataGroupByProfileName)
+                    samples: _.groupBy(
+                        this.props.store.nonQueriedMolecularData.result!,
+                        data => data.uniqueSampleKey
+                    ),
+                } as CaseAggregatedData<ExtendedAlteration>;
+                const allOtherMolecularProfileDataGroupByProfileName: {
+                    [profileName: string]: {
+                        [key: string]: ExtendedAlteration[];
+                    };
+                } = _.reduce(
+                    profileNames,
+                    (
+                        allOtherMolecularProfileDataGroupByProfileName,
+                        profileName
+                    ) => {
+                        allOtherMolecularProfileDataGroupByProfileName[
+                            profileName
+                        ] = generateOtherMolecularProfileData(
+                            this.props.store.nonSelectedMolecularProfilesGroupByName.result[
+                                profileName
+                            ].map(profile => profile.molecularProfileId),
+                            data
+                        );
+                        return allOtherMolecularProfileDataGroupByProfileName;
+                    },
+                    {} as {
+                        [profileName: string]: {
+                            [key: string]: ExtendedAlteration[];
+                        };
+                    }
+                );
+                return Promise.resolve(
+                    allOtherMolecularProfileDataGroupByProfileName
+                );
             }
             return Promise.resolve({});
-        }
+        },
     });
 
-    readonly allOtherMolecularProfileDownloadDataGroupByProfileName = remoteData<{[key: string]: string[][]}>({
-        await:()=>[this.allOtherMolecularProfileDataGroupByProfileName, this.props.store.samples, this.props.store.genes],
-        invoke:()=>Promise.resolve(
-            _.mapValues(this.allOtherMolecularProfileDataGroupByProfileName.result, (otherMolecularProfileData) => {
-                return generateOtherMolecularProfileDownloadData (
-                    otherMolecularProfileData, this.props.store.samples.result!, this.props.store.genes.result!
+    readonly allOtherMolecularProfileDownloadDataGroupByProfileName = remoteData<{
+        [key: string]: string[][];
+    }>({
+        await: () => [
+            this.allOtherMolecularProfileDataGroupByProfileName,
+            this.props.store.samples,
+            this.props.store.genes,
+        ],
+        invoke: () =>
+            Promise.resolve(
+                _.mapValues(
+                    this.allOtherMolecularProfileDataGroupByProfileName.result,
+                    otherMolecularProfileData => {
+                        return generateOtherMolecularProfileDownloadData(
+                            otherMolecularProfileData,
+                            this.props.store.samples.result!,
+                            this.props.store.genes.result!
+                        );
+                    }
                 )
-            })
-        )
+            ),
     });
 
-    readonly mrnaData = remoteData<{[key: string]: ExtendedAlteration[]}>({
-        await:()=>[this.props.store.nonOqlFilteredCaseAggregatedData],
-        invoke:()=>Promise.resolve(generateMrnaData(this.props.store.nonOqlFilteredCaseAggregatedData.result!))
+    readonly mrnaData = remoteData<{ [key: string]: ExtendedAlteration[] }>({
+        await: () => [this.props.store.nonOqlFilteredCaseAggregatedData],
+        invoke: () =>
+            Promise.resolve(
+                generateMrnaData(
+                    this.props.store.nonOqlFilteredCaseAggregatedData.result!
+                )
+            ),
     });
 
     readonly mrnaDownloadData = remoteData<string[][]>({
-        await:()=>[this.mrnaData, this.props.store.samples, this.props.store.genes],
-        invoke:()=>Promise.resolve(generateDownloadData(
-            this.mrnaData.result!, this.props.store.samples.result!, this.props.store.genes.result!
-        ))
+        await: () => [
+            this.mrnaData,
+            this.props.store.samples,
+            this.props.store.genes,
+        ],
+        invoke: () =>
+            Promise.resolve(
+                generateDownloadData(
+                    this.mrnaData.result!,
+                    this.props.store.samples.result!,
+                    this.props.store.genes.result!
+                )
+            ),
     });
 
-    readonly proteinData = remoteData<{[key: string]: ExtendedAlteration[]}>({
-        await:()=>[this.props.store.nonOqlFilteredCaseAggregatedData],
-        invoke:()=>Promise.resolve(generateProteinData(this.props.store.nonOqlFilteredCaseAggregatedData.result!))
+    readonly proteinData = remoteData<{ [key: string]: ExtendedAlteration[] }>({
+        await: () => [this.props.store.nonOqlFilteredCaseAggregatedData],
+        invoke: () =>
+            Promise.resolve(
+                generateProteinData(
+                    this.props.store.nonOqlFilteredCaseAggregatedData.result!
+                )
+            ),
     });
 
     readonly proteinDownloadData = remoteData<string[][]>({
-        await:()=>[this.proteinData, this.props.store.samples, this.props.store.genes],
-        invoke:()=>Promise.resolve(generateDownloadData(
-            this.proteinData.result!, this.props.store.samples.result!, this.props.store.genes.result!
-        ))
+        await: () => [
+            this.proteinData,
+            this.props.store.samples,
+            this.props.store.genes,
+        ],
+        invoke: () =>
+            Promise.resolve(
+                generateDownloadData(
+                    this.proteinData.result!,
+                    this.props.store.samples.result!,
+                    this.props.store.genes.result!
+                )
+            ),
     });
 
-    readonly cnaData = remoteData<{[key: string]: ExtendedAlteration[]}>({
-        await:()=>[this.props.store.nonOqlFilteredCaseAggregatedData],
-        invoke:()=>Promise.resolve(generateCnaData(this.props.store.nonOqlFilteredCaseAggregatedData.result!))
+    readonly cnaData = remoteData<{ [key: string]: ExtendedAlteration[] }>({
+        await: () => [this.props.store.nonOqlFilteredCaseAggregatedData],
+        invoke: () =>
+            Promise.resolve(
+                generateCnaData(
+                    this.props.store.nonOqlFilteredCaseAggregatedData.result!
+                )
+            ),
     });
 
     readonly cnaDownloadData = remoteData<string[][]>({
-        await:()=>[this.cnaData, this.props.store.samples, this.props.store.genes],
-        invoke:()=>Promise.resolve(generateDownloadData(
-            this.cnaData.result!, this.props.store.samples.result!, this.props.store.genes.result!
-        ))
+        await: () => [
+            this.cnaData,
+            this.props.store.samples,
+            this.props.store.genes,
+        ],
+        invoke: () =>
+            Promise.resolve(
+                generateDownloadData(
+                    this.cnaData.result!,
+                    this.props.store.samples.result!,
+                    this.props.store.genes.result!
+                )
+            ),
     });
 
     readonly alteredCaseAlterationData = remoteData<ICaseAlteration[]>({
-        await:()=>[this.caseAlterationData],
-        invoke:()=>Promise.resolve(this.caseAlterationData.result!
-            .filter(caseAlteration => caseAlteration.altered))
+        await: () => [this.caseAlterationData],
+        invoke: () =>
+            Promise.resolve(
+                this.caseAlterationData.result!.filter(
+                    caseAlteration => caseAlteration.altered
+                )
+            ),
     });
 
     readonly unalteredCaseAlterationData = remoteData<ICaseAlteration[]>({
-        await:()=>[this.caseAlterationData],
-        invoke:()=>Promise.resolve(this.caseAlterationData.result!
-            .filter(caseAlteration => !caseAlteration.altered))
+        await: () => [this.caseAlterationData],
+        invoke: () =>
+            Promise.resolve(
+                this.caseAlterationData.result!.filter(
+                    caseAlteration => !caseAlteration.altered
+                )
+            ),
     });
 
     readonly sampleMatrix = remoteData<string[][]>({
-        await:()=>[this.caseAlterationData],
-        invoke:()=>{
-            let result : string[][] = [];
-            _.map(this.caseAlterationData.result!, (caseAlteration) => {
+        await: () => [this.caseAlterationData],
+        invoke: () => {
+            let result: string[][] = [];
+            _.map(this.caseAlterationData.result!, caseAlteration => {
                 // if writing the first line, add titles
                 if (_.isEmpty(result)) {
                     const titleMap = _.keys(caseAlteration.oqlDataByGene);
                     result.push(['studyID:sampleId', 'Altered', ...titleMap]);
                 }
                 // get altered infomation by gene
-                const genesAlteredData = _.map(caseAlteration.oqlDataByGene, (oqlData) => {
-                    return _.isEmpty(oqlData.alterationTypes) ? "0" : "1";
-                });
-                result.push([`${caseAlteration.studyId}:${caseAlteration.sampleId}`, caseAlteration.altered ? "1" : "0", ...genesAlteredData]);
-            })
+                const genesAlteredData = _.map(
+                    caseAlteration.oqlDataByGene,
+                    oqlData => {
+                        return _.isEmpty(oqlData.alterationTypes) ? '0' : '1';
+                    }
+                );
+                result.push([
+                    `${caseAlteration.studyId}:${caseAlteration.sampleId}`,
+                    caseAlteration.altered ? '1' : '0',
+                    ...genesAlteredData,
+                ]);
+            });
             return Promise.resolve(result);
-        }
+        },
     });
 
     readonly sampleMatrixText = remoteData<string>({
-        await:()=>[this.sampleMatrix],
-        invoke:()=>Promise.resolve(stringify2DArray(this.sampleMatrix.result!))
+        await: () => [this.sampleMatrix],
+        invoke: () =>
+            Promise.resolve(stringify2DArray(this.sampleMatrix.result!)),
     });
 
-    readonly oqls = remoteData<OQLLineFilterOutput<AnnotatedExtendedAlteration>[]>({
-        await:()=>[this.props.store.oqlFilteredCaseAggregatedDataByOQLLine],
-        invoke:()=>Promise.resolve(this.props.store.oqlFilteredCaseAggregatedDataByOQLLine.result!
-                        .map(data => data.oql))
+    readonly oqls = remoteData<
+        OQLLineFilterOutput<AnnotatedExtendedAlteration>[]
+    >({
+        await: () => [this.props.store.oqlFilteredCaseAggregatedDataByOQLLine],
+        invoke: () =>
+            Promise.resolve(
+                this.props.store.oqlFilteredCaseAggregatedDataByOQLLine.result!.map(
+                    data => data.oql
+                )
+            ),
     });
 
     readonly trackLabels = remoteData({
-        await:()=>[this.props.store.oqlFilteredCaseAggregatedDataByUnflattenedOQLLine],
-        invoke:()=> {
+        await: () => [
+            this.props.store.oqlFilteredCaseAggregatedDataByUnflattenedOQLLine,
+        ],
+        invoke: () => {
             const labels: string[] = [];
-            this.props.store.oqlFilteredCaseAggregatedDataByUnflattenedOQLLine.result!.forEach((data, index) => {
-                // mergedTrackOqlList is undefined means the data is for single track / oql
-                if (data.mergedTrackOqlList === undefined) {
-                    labels.push(getSingleGeneResultKey(index, this.props.store.oqlText, data.oql as OQLLineFilterOutput<AnnotatedExtendedAlteration>));
-                }
-                // or data is for merged track (group: list of oqls)
-                else {
-                    labels.push(getMultipleGeneResultKey(data.oql as MergedTrackLineFilterOutput<AnnotatedExtendedAlteration>));
+            this.props.store.oqlFilteredCaseAggregatedDataByUnflattenedOQLLine.result!.forEach(
+                (data, index) => {
+                    // mergedTrackOqlList is undefined means the data is for single track / oql
+                    if (data.mergedTrackOqlList === undefined) {
+                        labels.push(
+                            getSingleGeneResultKey(
+                                index,
+                                this.props.store.oqlText,
+                                data.oql as OQLLineFilterOutput<
+                                    AnnotatedExtendedAlteration
+                                >
+                            )
+                        );
+                    }
+                    // or data is for merged track (group: list of oqls)
+                    else {
+                        labels.push(
+                            getMultipleGeneResultKey(
+                                data.oql as MergedTrackLineFilterOutput<
+                                    AnnotatedExtendedAlteration
+                                >
+                            )
+                        );
+                    }
                 }
-            })
+            );
             return Promise.resolve(labels);
-        }
+        },
     });
 
     readonly trackAlterationTypesMap = remoteData({
-        await:()=>[this.props.store.oqlFilteredCaseAggregatedDataByUnflattenedOQLLine],
-        invoke:()=> {
-            const trackAlterationTypesMap: {[label:string]: string[]} = {};
-            this.props.store.oqlFilteredCaseAggregatedDataByUnflattenedOQLLine.result!.forEach((data, index) => {
-                // mergedTrackOqlList is undefined means the data is for single track / oql
-                if (data.mergedTrackOqlList === undefined) {
-                    const singleTrackOql = data.oql as OQLLineFilterOutput<AnnotatedExtendedAlteration>;
-                    const label = getSingleGeneResultKey(index, this.props.store.oqlText, data.oql as OQLLineFilterOutput<AnnotatedExtendedAlteration>);
-                    // put types for single track into the map, key is track label
-                    if (singleTrackOql.parsed_oql_line.alterations) {
-                        trackAlterationTypesMap[label] = _.uniq(_.map(singleTrackOql.parsed_oql_line.alterations, (alteration) => alteration.alteration_type.toUpperCase()));
-                    }
-                }
-                // or data is for merged track (group: list of oqls)
-                else {
-                    const mergedTrackOql = data.oql as MergedTrackLineFilterOutput<AnnotatedExtendedAlteration>;
-                    const label = getMultipleGeneResultKey(data.oql as MergedTrackLineFilterOutput<AnnotatedExtendedAlteration>);
-                    // put types for merged track into the map, key is track label
-                    let alterations: string[] = [];
-                    _.forEach(mergedTrackOql.list, (oql: OQLLineFilterOutput<AnnotatedExtendedAlteration>) => {
-                        if (oql.parsed_oql_line.alterations) {
-                            const types: string[] = _.map(oql.parsed_oql_line.alterations, (alteration) => alteration.alteration_type.toUpperCase());
-                            alterations.push(...types);
+        await: () => [
+            this.props.store.oqlFilteredCaseAggregatedDataByUnflattenedOQLLine,
+        ],
+        invoke: () => {
+            const trackAlterationTypesMap: { [label: string]: string[] } = {};
+            this.props.store.oqlFilteredCaseAggregatedDataByUnflattenedOQLLine.result!.forEach(
+                (data, index) => {
+                    // mergedTrackOqlList is undefined means the data is for single track / oql
+                    if (data.mergedTrackOqlList === undefined) {
+                        const singleTrackOql = data.oql as OQLLineFilterOutput<
+                            AnnotatedExtendedAlteration
+                        >;
+                        const label = getSingleGeneResultKey(
+                            index,
+                            this.props.store.oqlText,
+                            data.oql as OQLLineFilterOutput<
+                                AnnotatedExtendedAlteration
+                            >
+                        );
+                        // put types for single track into the map, key is track label
+                        if (singleTrackOql.parsed_oql_line.alterations) {
+                            trackAlterationTypesMap[label] = _.uniq(
+                                _.map(
+                                    singleTrackOql.parsed_oql_line.alterations,
+                                    alteration =>
+                                        alteration.alteration_type.toUpperCase()
+                                )
+                            );
                         }
-                    })
-                    trackAlterationTypesMap[label] = _.uniq(alterations);
+                    }
+                    // or data is for merged track (group: list of oqls)
+                    else {
+                        const mergedTrackOql = data.oql as MergedTrackLineFilterOutput<
+                            AnnotatedExtendedAlteration
+                        >;
+                        const label = getMultipleGeneResultKey(
+                            data.oql as MergedTrackLineFilterOutput<
+                                AnnotatedExtendedAlteration
+                            >
+                        );
+                        // put types for merged track into the map, key is track label
+                        let alterations: string[] = [];
+                        _.forEach(
+                            mergedTrackOql.list,
+                            (
+                                oql: OQLLineFilterOutput<
+                                    AnnotatedExtendedAlteration
+                                >
+                            ) => {
+                                if (oql.parsed_oql_line.alterations) {
+                                    const types: string[] = _.map(
+                                        oql.parsed_oql_line.alterations,
+                                        alteration =>
+                                            alteration.alteration_type.toUpperCase()
+                                    );
+                                    alterations.push(...types);
+                                }
+                            }
+                        );
+                        trackAlterationTypesMap[label] = _.uniq(alterations);
+                    }
                 }
-            })
+            );
             return Promise.resolve(trackAlterationTypesMap);
-        }
+        },
     });
 
     readonly geneAlterationMap = remoteData({
-        await:()=>[this.props.store.oqlFilteredCaseAggregatedDataByUnflattenedOQLLine],
-        invoke:()=> {
-            const geneAlterationMap: {[label:string]: Alteration[]} = {};
-            this.props.store.oqlFilteredCaseAggregatedDataByUnflattenedOQLLine.result!.forEach((data, index) => {
-                // mergedTrackOqlList is undefined means the data is for single track / oql
-                if (data.mergedTrackOqlList === undefined) {
-                    const singleTrackOql = data.oql as OQLLineFilterOutput<AnnotatedExtendedAlteration>;
-                    // put types for single track into the map, key is gene name
-                    if (singleTrackOql.parsed_oql_line.alterations) {
-                        geneAlterationMap[singleTrackOql.gene] = _.chain(singleTrackOql.parsed_oql_line.alterations)
-                                                                       .union(geneAlterationMap[singleTrackOql.gene])
-                                                                       .uniq()
-                                                                       .value();
-                    }
-                }
-                // or data is for merged track (group: list of oqls)
-                else {
-                    const mergedTrackOql = data.oql as MergedTrackLineFilterOutput<AnnotatedExtendedAlteration>;
-                    // put types for merged track into the map, key is gene name
-                    let alterations: string[] = [];
-                    _.forEach(mergedTrackOql.list, (oql: OQLLineFilterOutput<AnnotatedExtendedAlteration>) => {
-                        if (oql.parsed_oql_line.alterations) {
-                            const types: string[] = _.map(oql.parsed_oql_line.alterations, (alteration) => alteration.alteration_type);
-                            geneAlterationMap[oql.gene] = _.chain(oql.parsed_oql_line.alterations)
-                                                                .union(geneAlterationMap[oql.gene])
-                                                                .uniq()
-                                                                .value();
+        await: () => [
+            this.props.store.oqlFilteredCaseAggregatedDataByUnflattenedOQLLine,
+        ],
+        invoke: () => {
+            const geneAlterationMap: { [label: string]: Alteration[] } = {};
+            this.props.store.oqlFilteredCaseAggregatedDataByUnflattenedOQLLine.result!.forEach(
+                (data, index) => {
+                    // mergedTrackOqlList is undefined means the data is for single track / oql
+                    if (data.mergedTrackOqlList === undefined) {
+                        const singleTrackOql = data.oql as OQLLineFilterOutput<
+                            AnnotatedExtendedAlteration
+                        >;
+                        // put types for single track into the map, key is gene name
+                        if (singleTrackOql.parsed_oql_line.alterations) {
+                            geneAlterationMap[singleTrackOql.gene] = _.chain(
+                                singleTrackOql.parsed_oql_line.alterations
+                            )
+                                .union(geneAlterationMap[singleTrackOql.gene])
+                                .uniq()
+                                .value();
                         }
-                    })
+                    }
+                    // or data is for merged track (group: list of oqls)
+                    else {
+                        const mergedTrackOql = data.oql as MergedTrackLineFilterOutput<
+                            AnnotatedExtendedAlteration
+                        >;
+                        // put types for merged track into the map, key is gene name
+                        let alterations: string[] = [];
+                        _.forEach(
+                            mergedTrackOql.list,
+                            (
+                                oql: OQLLineFilterOutput<
+                                    AnnotatedExtendedAlteration
+                                >
+                            ) => {
+                                if (oql.parsed_oql_line.alterations) {
+                                    const types: string[] = _.map(
+                                        oql.parsed_oql_line.alterations,
+                                        alteration => alteration.alteration_type
+                                    );
+                                    geneAlterationMap[oql.gene] = _.chain(
+                                        oql.parsed_oql_line.alterations
+                                    )
+                                        .union(geneAlterationMap[oql.gene])
+                                        .uniq()
+                                        .value();
+                                }
+                            }
+                        );
+                    }
                 }
-            })
+            );
             return Promise.resolve(geneAlterationMap);
-        }
+        },
     });
 
     public render() {
-        const status = getMobxPromiseGroupStatus(this.geneAlterationData, this.caseAlterationData, this.oqls, this.trackLabels, this.trackAlterationTypesMap, this.geneAlterationMap, this.cnaData, this.mutationData,
-            this.mrnaData, this.proteinData, this.unalteredCaseAlterationData, this.alteredCaseAlterationData, this.props.store.virtualStudyParams, this.sampleMatrixText, this.props.store.nonSelectedMolecularProfilesGroupByName,
-            this.props.store.studies, this.props.store.selectedMolecularProfiles);
+        const status = getMobxPromiseGroupStatus(
+            this.geneAlterationData,
+            this.caseAlterationData,
+            this.oqls,
+            this.trackLabels,
+            this.trackAlterationTypesMap,
+            this.geneAlterationMap,
+            this.cnaData,
+            this.mutationData,
+            this.mrnaData,
+            this.proteinData,
+            this.unalteredCaseAlterationData,
+            this.alteredCaseAlterationData,
+            this.props.store.virtualStudyParams,
+            this.sampleMatrixText,
+            this.props.store.nonSelectedMolecularProfilesGroupByName,
+            this.props.store.studies,
+            this.props.store.selectedMolecularProfiles
+        );
 
         switch (status) {
-            case "pending":
-                return <LoadingIndicator isLoading={true} center={true} size={"big"}/>;
-            case "error":
-                return <ErrorMessage/>;
-            case "complete":
+            case 'pending':
+                return (
+                    <LoadingIndicator
+                        isLoading={true}
+                        center={true}
+                        size={'big'}
+                    />
+                );
+            case 'error':
+                return <ErrorMessage />;
+            case 'complete':
                 return (
                     <WindowWidthBox data-test="downloadTabDiv" offset={60}>
-                        <div className={"tabMessageContainer"}>
-                            <OqlStatusBanner className="download-oql-status-banner" store={this.props.store} tabReflectsOql={true} />
-                            <AlterationFilterWarning store={this.props.store}/>
+                        <div className={'tabMessageContainer'}>
+                            <OqlStatusBanner
+                                className="download-oql-status-banner"
+                                store={this.props.store}
+                                tabReflectsOql={true}
+                            />
+                            <AlterationFilterWarning store={this.props.store} />
                         </div>
                         <div>
                             <FeatureTitle
                                 title="Downloadable Data Files"
                                 className="forceHeaderStyle h4"
                                 isLoading={false}
-                                style={{marginBottom:15}}
+                                style={{ marginBottom: 15 }}
                             />
-                            <table className={ classNames("table", "table-striped", styles.downloadCopyTable) }>
+                            <table
+                                className={classNames(
+                                    'table',
+                                    'table-striped',
+                                    styles.downloadCopyTable
+                                )}
+                            >
                                 <tbody>
-                                    {hasValidData(this.cnaData.result!) && this.cnaDownloadControls()}
-                                    {hasValidMutationData(this.mutationData.result!) && this.mutationDownloadControls()}
-                                    {hasValidData(this.mrnaData.result!) && this.mrnaExprDownloadControls(this.props.store.selectedMolecularProfiles.result!.find((profile) => profile.molecularAlterationType === AlterationTypeConstants.MRNA_EXPRESSION)!.name)}
-                                    {hasValidData(this.proteinData.result!) && this.proteinExprDownloadControls(this.props.store.selectedMolecularProfiles.result!.find((profile) => profile.molecularAlterationType === AlterationTypeConstants.PROTEIN_LEVEL)!.name)}
-                                    {this.alteredSamplesDownloadControls(this.alteredCaseAlterationData.result!, this.props.store.virtualStudyParams.result!)}
-                                    {this.unalteredSamplesDownloadControls(this.unalteredCaseAlterationData.result!, this.props.store.virtualStudyParams.result!)}
-                                    {this.sampleMatrixDownloadControls(this.sampleMatrixText.result!)}
-                                    {(this.props.store.doNonSelectedMolecularProfilesExist) && this.nonSelectedProfileDownloadRow(this.props.store.nonSelectedMolecularProfilesGroupByName.result!)}
+                                    {hasValidData(this.cnaData.result!) &&
+                                        this.cnaDownloadControls()}
+                                    {hasValidMutationData(
+                                        this.mutationData.result!
+                                    ) && this.mutationDownloadControls()}
+                                    {hasValidData(this.mrnaData.result!) &&
+                                        this.mrnaExprDownloadControls(
+                                            this.props.store.selectedMolecularProfiles.result!.find(
+                                                profile =>
+                                                    profile.molecularAlterationType ===
+                                                    AlterationTypeConstants.MRNA_EXPRESSION
+                                            )!.name
+                                        )}
+                                    {hasValidData(this.proteinData.result!) &&
+                                        this.proteinExprDownloadControls(
+                                            this.props.store.selectedMolecularProfiles.result!.find(
+                                                profile =>
+                                                    profile.molecularAlterationType ===
+                                                    AlterationTypeConstants.PROTEIN_LEVEL
+                                            )!.name
+                                        )}
+                                    {this.alteredSamplesDownloadControls(
+                                        this.alteredCaseAlterationData.result!,
+                                        this.props.store.virtualStudyParams
+                                            .result!
+                                    )}
+                                    {this.unalteredSamplesDownloadControls(
+                                        this.unalteredCaseAlterationData
+                                            .result!,
+                                        this.props.store.virtualStudyParams
+                                            .result!
+                                    )}
+                                    {this.sampleMatrixDownloadControls(
+                                        this.sampleMatrixText.result!
+                                    )}
+                                    {this.props.store
+                                        .doNonSelectedMolecularProfilesExist &&
+                                        this.nonSelectedProfileDownloadRow(
+                                            this.props.store
+                                                .nonSelectedMolecularProfilesGroupByName
+                                                .result!
+                                        )}
                                 </tbody>
                             </table>
                         </div>
-                        <hr/>
-                        <div className={styles["tables-container"]} data-test="dataDownloadGeneAlterationTable">
+                        <hr />
+                        <div
+                            className={styles['tables-container']}
+                            data-test="dataDownloadGeneAlterationTable"
+                        >
                             <FeatureTitle
                                 title="Gene Alteration Frequency"
                                 isLoading={false}
                                 className="pull-left forceHeaderStyle h4"
                             />
-                            <GeneAlterationTable geneAlterationData={this.geneAlterationData.result!} />
+                            <GeneAlterationTable
+                                geneAlterationData={
+                                    this.geneAlterationData.result!
+                                }
+                            />
                         </div>
-                        <hr/>
-                        <div className={styles["tables-container"]}>
+                        <hr />
+                        <div className={styles['tables-container']}>
                             <FeatureTitle
                                 title="Type of Genetic Alterations Across All Samples"
                                 isLoading={false}
                                 className="pull-left forceHeaderStyle h4"
                             />
                             <CaseAlterationTable
-                                caseAlterationData={this.caseAlterationData.result!}
+                                caseAlterationData={
+                                    this.caseAlterationData.result!
+                                }
                                 oqls={this.oqls.result!}
                                 trackLabels={this.trackLabels.result!}
-                                trackAlterationTypesMap={this.trackAlterationTypesMap.result!}
-                                geneAlterationTypesMap={this.geneAlterationMap.result!}
+                                trackAlterationTypesMap={
+                                    this.trackAlterationTypesMap.result!
+                                }
+                                geneAlterationTypesMap={
+                                    this.geneAlterationMap.result!
+                                }
                             />
                         </div>
                     </WindowWidthBox>
                 );
             default:
-                return <ErrorMessage/>;
+                return <ErrorMessage />;
         }
     }
 
-    private cnaDownloadControls(): JSX.Element
-    {
-        return this.downloadControlsRow("Copy-number Alterations (OQL is not in effect)",
-                                        this.handleCnaDownload,
-                                        this.handleTransposedCnaDownload);
+    private cnaDownloadControls(): JSX.Element {
+        return this.downloadControlsRow(
+            'Copy-number Alterations (OQL is not in effect)',
+            this.handleCnaDownload,
+            this.handleTransposedCnaDownload
+        );
     }
 
-    private mutationDownloadControls(): JSX.Element
-    {
-        return this.downloadControlsRow("Mutations (OQL is not in effect)",
-                                        this.handleMutationDownload,
-                                        this.handleTransposedMutationDownload);
+    private mutationDownloadControls(): JSX.Element {
+        return this.downloadControlsRow(
+            'Mutations (OQL is not in effect)',
+            this.handleMutationDownload,
+            this.handleTransposedMutationDownload
+        );
     }
 
-    private mrnaExprDownloadControls(profileName: string): JSX.Element
-    {
-        return this.downloadControlsRow(profileName,
-                                        this.handleMrnaDownload,
-                                        this.handleTransposedMrnaDownload);
+    private mrnaExprDownloadControls(profileName: string): JSX.Element {
+        return this.downloadControlsRow(
+            profileName,
+            this.handleMrnaDownload,
+            this.handleTransposedMrnaDownload
+        );
     }
 
-    private proteinExprDownloadControls(profileName: string): JSX.Element
-    {
-        return this.downloadControlsRow(profileName,
-                                        this.handleProteinDownload,
-                                        this.handleTransposedProteinDownload);
+    private proteinExprDownloadControls(profileName: string): JSX.Element {
+        return this.downloadControlsRow(
+            profileName,
+            this.handleProteinDownload,
+            this.handleTransposedProteinDownload
+        );
     }
 
-    private downloadControlsRow(profileName:string,
-                                handleTabDelimitedDownload: (name: string) => void,
-                                handleTransposedMatrixDownload: (name: string) => void)
-    {
+    private downloadControlsRow(
+        profileName: string,
+        handleTabDelimitedDownload: (name: string) => void,
+        handleTransposedMatrixDownload: (name: string) => void
+    ) {
         return (
             <tr>
-                <td style={{width: 500}}>{profileName}</td>
+                <td style={{ width: 500 }}>{profileName}</td>
                 <td>
-                    <a onClick={(event) => handleTabDelimitedDownload(profileName)}>
-                        <i className='fa fa-cloud-download' style={{marginRight: 5}}/>Tab Delimited Format
+                    <a
+                        onClick={event =>
+                            handleTabDelimitedDownload(profileName)
+                        }
+                    >
+                        <i
+                            className="fa fa-cloud-download"
+                            style={{ marginRight: 5 }}
+                        />
+                        Tab Delimited Format
                     </a>
-                    <span style={{margin:'0px 10px'}}>|</span>
-                    <a onClick={(event) => handleTransposedMatrixDownload(profileName)}>
-                        <i className='fa fa-cloud-download' style={{marginRight: 5}}/>Transposed Matrix
+                    <span style={{ margin: '0px 10px' }}>|</span>
+                    <a
+                        onClick={event =>
+                            handleTransposedMatrixDownload(profileName)
+                        }
+                    >
+                        <i
+                            className="fa fa-cloud-download"
+                            style={{ marginRight: 5 }}
+                        />
+                        Transposed Matrix
                     </a>
                 </td>
             </tr>
         );
     }
 
-    private nonSelectedProfileDownloadRow(nonSelectedMolecularProfilesGroupByName:_.Dictionary<MolecularProfile[]>)
-    {
-        const allProfileOptions = _.map(nonSelectedMolecularProfilesGroupByName, (profiles: MolecularProfile[], profileName: string) => {
-            if (this.props.store.studies.result!.length === 1) {
-                const singleStudyProfile = profiles[0];
-                return {
-                    "name": profileName,
-                    "description": singleStudyProfile.description
+    private nonSelectedProfileDownloadRow(
+        nonSelectedMolecularProfilesGroupByName: _.Dictionary<
+            MolecularProfile[]
+        >
+    ) {
+        const allProfileOptions = _.map(
+            nonSelectedMolecularProfilesGroupByName,
+            (profiles: MolecularProfile[], profileName: string) => {
+                if (this.props.store.studies.result!.length === 1) {
+                    const singleStudyProfile = profiles[0];
+                    return {
+                        name: profileName,
+                        description: singleStudyProfile.description,
+                    };
                 }
+                return { name: profileName };
             }
-            return {"name": profileName}
-        });
+        );
 
-        return _.map(allProfileOptions, (option) =>
-            (
-                <tr>
-                    <td style={{width: 500}}>
-                        <div style={{display: "flex", alignItems:"center"}}>
-                            {option.name}
-                            {
-                                (option.description) && (
-                                        <DefaultTooltip
-                                            mouseEnterDelay={0}
-                                            placement="right"
-                                            overlay={<div className={styles.tooltip}>{option.description}</div>}
-                                        >
-                                            <FontAwesome className={styles.infoIcon} name='info-circle'/>
-                                        </DefaultTooltip>
+        return _.map(allProfileOptions, option => (
+            <tr>
+                <td style={{ width: 500 }}>
+                    <div style={{ display: 'flex', alignItems: 'center' }}>
+                        {option.name}
+                        {option.description && (
+                            <DefaultTooltip
+                                mouseEnterDelay={0}
+                                placement="right"
+                                overlay={
+                                    <div className={styles.tooltip}>
+                                        {option.description}
+                                    </div>
+                                }
+                            >
+                                <FontAwesome
+                                    className={styles.infoIcon}
+                                    name="info-circle"
+                                />
+                            </DefaultTooltip>
+                        )}
+                    </div>
+                </td>
+                <td>
+                    <div>
+                        <a
+                            onClick={event =>
+                                this.handleOtherMolecularProfileDownload(
+                                    event,
+                                    option.name
                                 )
                             }
-                        </div>
-                    </td>
-                    <td>
-                        <div>
-                            <a onClick={(event) => this.handleOtherMolecularProfileDownload(event, option.name)}>
-                            <i className='fa fa-cloud-download' style={{marginRight: 5}}/>Tab Delimited Format
-                            </a>
-                            <span style={{margin:'0px 10px'}}>|</span>
-                            <a onClick={(event) => this.handleTransposedOtherMolecularProfileDownload(event, option.name)}>
-                                <i className='fa fa-cloud-download' style={{marginRight: 5}}/>Transposed Matrix
-                            </a>
-                        </div>
-                    </td>
-                </tr>
-            )
-        )
+                        >
+                            <i
+                                className="fa fa-cloud-download"
+                                style={{ marginRight: 5 }}
+                            />
+                            Tab Delimited Format
+                        </a>
+                        <span style={{ margin: '0px 10px' }}>|</span>
+                        <a
+                            onClick={event =>
+                                this.handleTransposedOtherMolecularProfileDownload(
+                                    event,
+                                    option.name
+                                )
+                            }
+                        >
+                            <i
+                                className="fa fa-cloud-download"
+                                style={{ marginRight: 5 }}
+                            />
+                            Transposed Matrix
+                        </a>
+                    </div>
+                </td>
+            </tr>
+        ));
     }
 
-    private copyDownloadControlsRow(title:string,
-                                    handleDownload: () => string,
-                                    filename: string)
-    {
+    private copyDownloadControlsRow(
+        title: string,
+        handleDownload: () => string,
+        filename: string
+    ) {
         return (
             <tr>
                 <td>{title}</td>
                 <td>
                     <SimpleCopyDownloadControls
-                        controlsStyle='LINK'
+                        controlsStyle="LINK"
                         downloadData={handleDownload}
                         downloadFilename={filename}
                     />
@@ -483,18 +874,19 @@ export default class DownloadTab extends React.Component<IDownloadTabProps, {}>
         );
     }
 
-    private copyDownloadQueryControlsRow(title:string,
-                                    handleDownload: () => string,
-                                    filename: string,
-                                    handleQuery: () => void,
-                                    virtualStudyParams: any)
-    {
+    private copyDownloadQueryControlsRow(
+        title: string,
+        handleDownload: () => string,
+        filename: string,
+        handleQuery: () => void,
+        virtualStudyParams: any
+    ) {
         return (
             <tr>
                 <td>{title}</td>
                 <td>
                     <SimpleCopyDownloadControls
-                        controlsStyle='QUERY'
+                        controlsStyle="QUERY"
                         downloadData={handleDownload}
                         downloadFilename={filename}
                         handleQuery={handleQuery}
@@ -505,139 +897,181 @@ export default class DownloadTab extends React.Component<IDownloadTabProps, {}>
         );
     }
 
-    private alteredSamplesDownloadControls(alteredCaseAlterationData: ICaseAlteration[], virtualStudyParams: IVirtualStudyProps)
-    {
-        const alteredSampleCaseIds = _.map(alteredCaseAlterationData, caseAlteration => `${caseAlteration.studyId}:${caseAlteration.sampleId}`);
-        const handleDownload = () => alteredSampleCaseIds.join("\n");
-        const handleQuery = () => this.handleQueryButtonClick(alteredSampleCaseIds);
+    private alteredSamplesDownloadControls(
+        alteredCaseAlterationData: ICaseAlteration[],
+        virtualStudyParams: IVirtualStudyProps
+    ) {
+        const alteredSampleCaseIds = _.map(
+            alteredCaseAlterationData,
+            caseAlteration =>
+                `${caseAlteration.studyId}:${caseAlteration.sampleId}`
+        );
+        const handleDownload = () => alteredSampleCaseIds.join('\n');
+        const handleQuery = () =>
+            this.handleQueryButtonClick(alteredSampleCaseIds);
         const alteredSamplesVirtualStudyParams = {
-                "user": virtualStudyParams.user,
-                "name": virtualStudyParams.name,
-                "description": virtualStudyParams.description,
-                "studyWithSamples": virtualStudyParams.studyWithSamples,
-                "selectedSamples": _.filter(virtualStudyParams.selectedSamples, ((sample: Sample) => alteredSampleCaseIds.includes(`${sample.studyId}:${sample.sampleId}`))),
-                "filter": virtualStudyParams.filter,
-                "attributesMetaSet": virtualStudyParams.attributesMetaSet
-            } as IVirtualStudyProps
-
-        return (this.copyDownloadQueryControlsRow("Altered samples: List of samples with alterations",
-                                            handleDownload,
-                                            "altered_samples.txt",
-                                            handleQuery,
-                                            alteredSamplesVirtualStudyParams));
+            user: virtualStudyParams.user,
+            name: virtualStudyParams.name,
+            description: virtualStudyParams.description,
+            studyWithSamples: virtualStudyParams.studyWithSamples,
+            selectedSamples: _.filter(
+                virtualStudyParams.selectedSamples,
+                (sample: Sample) =>
+                    alteredSampleCaseIds.includes(
+                        `${sample.studyId}:${sample.sampleId}`
+                    )
+            ),
+            filter: virtualStudyParams.filter,
+            attributesMetaSet: virtualStudyParams.attributesMetaSet,
+        } as IVirtualStudyProps;
+
+        return this.copyDownloadQueryControlsRow(
+            'Altered samples: List of samples with alterations',
+            handleDownload,
+            'altered_samples.txt',
+            handleQuery,
+            alteredSamplesVirtualStudyParams
+        );
     }
 
-    private unalteredSamplesDownloadControls(unalteredCaseAlterationData: ICaseAlteration[], virtualStudyParams: IVirtualStudyProps)
-    {
-        const unalteredSampleCaseIds = _.map(unalteredCaseAlterationData, caseAlteration => `${caseAlteration.studyId}:${caseAlteration.sampleId}`);
-        const handleDownload = () => unalteredSampleCaseIds.join("\n");
-        const handleQuery = () => this.handleQueryButtonClick(unalteredSampleCaseIds);
+    private unalteredSamplesDownloadControls(
+        unalteredCaseAlterationData: ICaseAlteration[],
+        virtualStudyParams: IVirtualStudyProps
+    ) {
+        const unalteredSampleCaseIds = _.map(
+            unalteredCaseAlterationData,
+            caseAlteration =>
+                `${caseAlteration.studyId}:${caseAlteration.sampleId}`
+        );
+        const handleDownload = () => unalteredSampleCaseIds.join('\n');
+        const handleQuery = () =>
+            this.handleQueryButtonClick(unalteredSampleCaseIds);
         const unalteredSamplesVirtualStudyParams = {
-            "user": virtualStudyParams.user,
-            "name": virtualStudyParams.name,
-            "description": virtualStudyParams.description,
-            "studyWithSamples": virtualStudyParams.studyWithSamples,
-            "selectedSamples": _.filter(virtualStudyParams.selectedSamples, ((sample: Sample) => unalteredSampleCaseIds.includes(`${sample.studyId}:${sample.sampleId}`))),
-            "filter": virtualStudyParams.filter,
-            "attributesMetaSet": virtualStudyParams.attributesMetaSet
-        } as IVirtualStudyProps
-
-        return (this.copyDownloadQueryControlsRow("Unaltered samples: List of samples without any alteration",
-                                            handleDownload,
-                                            "unaltered_samples.txt",
-                                            handleQuery,
-                                            unalteredSamplesVirtualStudyParams));
+            user: virtualStudyParams.user,
+            name: virtualStudyParams.name,
+            description: virtualStudyParams.description,
+            studyWithSamples: virtualStudyParams.studyWithSamples,
+            selectedSamples: _.filter(
+                virtualStudyParams.selectedSamples,
+                (sample: Sample) =>
+                    unalteredSampleCaseIds.includes(
+                        `${sample.studyId}:${sample.sampleId}`
+                    )
+            ),
+            filter: virtualStudyParams.filter,
+            attributesMetaSet: virtualStudyParams.attributesMetaSet,
+        } as IVirtualStudyProps;
+
+        return this.copyDownloadQueryControlsRow(
+            'Unaltered samples: List of samples without any alteration',
+            handleDownload,
+            'unaltered_samples.txt',
+            handleQuery,
+            unalteredSamplesVirtualStudyParams
+        );
     }
 
-    private sampleMatrixDownloadControls(sampleMatrixText: string)
-    {
+    private sampleMatrixDownloadControls(sampleMatrixText: string) {
         const handleDownload = () => sampleMatrixText;
 
-        return (this.copyDownloadControlsRow("Sample matrix: List of all samples where 1=altered and 0=unaltered",
-                                            handleDownload,
-                                            "sample_matrix.txt"));
-    };
+        return this.copyDownloadControlsRow(
+            'Sample matrix: List of all samples where 1=altered and 0=unaltered',
+            handleDownload,
+            'sample_matrix.txt'
+        );
+    }
 
-    private handleMutationDownload()
-    {
-        onMobxPromise(this.mutationDownloadData, data=>{
+    private handleMutationDownload() {
+        onMobxPromise(this.mutationDownloadData, data => {
             const text = this.downloadDataText(data);
-            fileDownload(text, "mutations.txt")
+            fileDownload(text, 'mutations.txt');
         });
     }
 
-    private handleTransposedMutationDownload()
-    {
-        onMobxPromise(this.mutationDownloadData, data=>{
+    private handleTransposedMutationDownload() {
+        onMobxPromise(this.mutationDownloadData, data => {
             const text = this.downloadDataText(this.unzipDownloadData(data));
-            fileDownload(text, "mutations_transposed.txt")
+            fileDownload(text, 'mutations_transposed.txt');
         });
     }
 
-    private handleMrnaDownload(profileName: string)
-    {
-        onMobxPromise(this.mrnaDownloadData, data=>{
+    private handleMrnaDownload(profileName: string) {
+        onMobxPromise(this.mrnaDownloadData, data => {
             const text = this.downloadDataText(data);
-            fileDownload(text, `${profileName}.txt`)
+            fileDownload(text, `${profileName}.txt`);
         });
     }
 
-    private handleTransposedMrnaDownload(profileName: string)
-    {
-        onMobxPromise(this.mrnaDownloadData, data=>{
+    private handleTransposedMrnaDownload(profileName: string) {
+        onMobxPromise(this.mrnaDownloadData, data => {
             const text = this.downloadDataText(this.unzipDownloadData(data));
-            fileDownload(text, `${profileName}.txt`)
+            fileDownload(text, `${profileName}.txt`);
         });
     }
 
-    private handleProteinDownload(profileName: string)
-    {
-        onMobxPromise(this.proteinDownloadData, data=>{
+    private handleProteinDownload(profileName: string) {
+        onMobxPromise(this.proteinDownloadData, data => {
             const text = this.downloadDataText(data);
-            fileDownload(text, `${profileName}.txt`)
+            fileDownload(text, `${profileName}.txt`);
         });
     }
 
-    private handleTransposedProteinDownload(profileName: string)
-    {
-        onMobxPromise(this.proteinDownloadData, data=>{
+    private handleTransposedProteinDownload(profileName: string) {
+        onMobxPromise(this.proteinDownloadData, data => {
             const text = this.downloadDataText(this.unzipDownloadData(data));
-            fileDownload(text, `${profileName}.txt`)
+            fileDownload(text, `${profileName}.txt`);
         });
     }
 
-    private handleCnaDownload()
-    {
-        onMobxPromise(this.cnaDownloadData, data=>{
+    private handleCnaDownload() {
+        onMobxPromise(this.cnaDownloadData, data => {
             const text = this.downloadDataText(data);
-            fileDownload(text, "cna.txt")
+            fileDownload(text, 'cna.txt');
         });
     }
 
-    private handleTransposedCnaDownload()
-    {
-        onMobxPromise(this.cnaDownloadData, data=>{
+    private handleTransposedCnaDownload() {
+        onMobxPromise(this.cnaDownloadData, data => {
             const text = this.downloadDataText(this.unzipDownloadData(data));
-            fileDownload(text, "cna_transposed.txt")
+            fileDownload(text, 'cna_transposed.txt');
         });
     }
 
     @autobind
-    private handleOtherMolecularProfileDownload(event: React.MouseEvent<HTMLAnchorElement, MouseEvent>, profileName: string)
-    {
-        onMobxPromise(this.allOtherMolecularProfileDownloadDataGroupByProfileName, downloadDataGroupByProfileName=>{
-            const textMap = this.downloadDataTextGroupByProfileName(downloadDataGroupByProfileName);
-            fileDownload(textMap[profileName], `${profileName}.txt`)
-        });
+    private handleOtherMolecularProfileDownload(
+        event: React.MouseEvent<HTMLAnchorElement, MouseEvent>,
+        profileName: string
+    ) {
+        onMobxPromise(
+            this.allOtherMolecularProfileDownloadDataGroupByProfileName,
+            downloadDataGroupByProfileName => {
+                const textMap = this.downloadDataTextGroupByProfileName(
+                    downloadDataGroupByProfileName
+                );
+                fileDownload(textMap[profileName], `${profileName}.txt`);
+            }
+        );
     }
 
     @autobind
-    private handleTransposedOtherMolecularProfileDownload(event: React.MouseEvent<HTMLAnchorElement, MouseEvent>, profileName: string)
-    {
-        onMobxPromise(this.allOtherMolecularProfileDownloadDataGroupByProfileName, downloadDataGroupByProfileName=>{
-            const transposedTextMap = this.downloadDataTextGroupByProfileName(this.unzipDownloadDataGroupByProfileName(downloadDataGroupByProfileName));
-            fileDownload(transposedTextMap[profileName], `${profileName}.txt`)
-        });
+    private handleTransposedOtherMolecularProfileDownload(
+        event: React.MouseEvent<HTMLAnchorElement, MouseEvent>,
+        profileName: string
+    ) {
+        onMobxPromise(
+            this.allOtherMolecularProfileDownloadDataGroupByProfileName,
+            downloadDataGroupByProfileName => {
+                const transposedTextMap = this.downloadDataTextGroupByProfileName(
+                    this.unzipDownloadDataGroupByProfileName(
+                        downloadDataGroupByProfileName
+                    )
+                );
+                fileDownload(
+                    transposedTextMap[profileName],
+                    `${profileName}.txt`
+                );
+            }
+        );
     }
 
     @action
@@ -645,22 +1079,29 @@ export default class DownloadTab extends React.Component<IDownloadTabProps, {}>
         const modifyQueryParams: ModifyQueryParams = {
             selectedSampleListId: CUSTOM_CASE_LIST_ID,
             selectedSampleIds: querySampleIds,
-            caseIdsMode: "sample"
-        }
+            caseIdsMode: 'sample',
+        };
         this.props.store.modifyQueryParams = modifyQueryParams;
         this.props.store.queryFormVisible = true;
     }
 
-    private unzipDownloadDataGroupByProfileName(downloadDataGroupByProfileName: {[key: string]: string[][]}): {[key: string]: string[][]} {
-        return _.mapValues(downloadDataGroupByProfileName, (otherMolecularProfileDownloadData) => {
-            return _.unzip(otherMolecularProfileDownloadData);
-        })
+    private unzipDownloadDataGroupByProfileName(downloadDataGroupByProfileName: {
+        [key: string]: string[][];
+    }): { [key: string]: string[][] } {
+        return _.mapValues(
+            downloadDataGroupByProfileName,
+            otherMolecularProfileDownloadData => {
+                return _.unzip(otherMolecularProfileDownloadData);
+            }
+        );
     }
 
-    private downloadDataTextGroupByProfileName(downloadDataGroupByProfileName: {[key: string]: string[][]}): {[x: string]: string} {
-        return _.mapValues(downloadDataGroupByProfileName, (downloadData) => {
+    private downloadDataTextGroupByProfileName(downloadDataGroupByProfileName: {
+        [key: string]: string[][];
+    }): { [x: string]: string } {
+        return _.mapValues(downloadDataGroupByProfileName, downloadData => {
             return stringify2DArray(downloadData);
-        })
+        });
     }
 
     private unzipDownloadData(downloadData: string[][]): string[][] {
diff --git a/src/pages/resultsView/download/DownloadUtils.spec.ts b/src/pages/resultsView/download/DownloadUtils.spec.ts
index 960c7e0da8c..35b3a1fb29b 100644
--- a/src/pages/resultsView/download/DownloadUtils.spec.ts
+++ b/src/pages/resultsView/download/DownloadUtils.spec.ts
@@ -1,394 +1,473 @@
-import {assert} from 'chai';
+import { assert } from 'chai';
 
-import {GeneticTrackDatum} from "shared/components/oncoprint/Oncoprint";
-import {GenePanelData, MolecularProfile, Sample} from "shared/api/generated/CBioPortalAPI";
+import { GeneticTrackDatum } from 'shared/components/oncoprint/Oncoprint';
 import {
-    generateCaseAlterationData, generateDownloadData, generateGeneAlterationData, generateMutationDownloadData, generateOqlData, updateOqlData, decideMolecularProfileSortingOrder
-} from "./DownloadUtils";
+    GenePanelData,
+    MolecularProfile,
+    Sample,
+} from 'shared/api/generated/CBioPortalAPI';
 import {
-    AnnotatedMutation, ExtendedAlteration
-} from "../ResultsViewPageStore";
+    generateCaseAlterationData,
+    generateDownloadData,
+    generateGeneAlterationData,
+    generateMutationDownloadData,
+    generateOqlData,
+    updateOqlData,
+    decideMolecularProfileSortingOrder,
+} from './DownloadUtils';
+import { AnnotatedMutation, ExtendedAlteration } from '../ResultsViewPageStore';
 
 describe('DownloadUtils', () => {
-
     const genes = [
         {
-            "geneticEntityId": 4598,
-            "entrezGeneId": 5728,
-            "hugoGeneSymbol": "PTEN",
-            "type": "protein-coding"
+            geneticEntityId: 4598,
+            entrezGeneId: 5728,
+            hugoGeneSymbol: 'PTEN',
+            type: 'protein-coding',
         },
         {
-            "geneticEntityId": 5808,
-            "entrezGeneId": 7157,
-            "hugoGeneSymbol": "TP53",
-            "type": "protein-coding"
+            geneticEntityId: 5808,
+            entrezGeneId: 7157,
+            hugoGeneSymbol: 'TP53',
+            type: 'protein-coding',
         },
         {
-            "geneticEntityId": 1575,
-            "entrezGeneId": 1956,
-            "hugoGeneSymbol": "EGFR",
-            "type": "protein-coding"
-        }
+            geneticEntityId: 1575,
+            entrezGeneId: 1956,
+            hugoGeneSymbol: 'EGFR',
+            type: 'protein-coding',
+        },
     ];
 
-    const samples = [{
-        uniqueSampleKey: "UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3",
-        uniquePatientKey: "UC0wMDAwMzc4Om1za19pbXBhY3RfMjAxNw",
-        sampleType: "Primary Solid Tumor",
-        sampleId: "P-0000378-T01-IM3",
-        patientId: "P-0000378",
-        studyId: "msk_impact_2017",
-    }, {
-        uniqueSampleKey: "VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ",
-        uniquePatientKey: "VENHQS1FRS1BMjBDOnNrY21fdGNnYQ",
-        sampleType: "Metastatic",
-        sampleId: "TCGA-EE-A20C-06",
-        patientId: "TCGA-EE-A20C",
-        studyId: "skcm_tcga",
-    }] as Sample[];
-
-    const sampleDataWithNoAlteration: (ExtendedAlteration&AnnotatedMutation)[] = [];
+    const samples = [
+        {
+            uniqueSampleKey: 'UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3',
+            uniquePatientKey: 'UC0wMDAwMzc4Om1za19pbXBhY3RfMjAxNw',
+            sampleType: 'Primary Solid Tumor',
+            sampleId: 'P-0000378-T01-IM3',
+            patientId: 'P-0000378',
+            studyId: 'msk_impact_2017',
+        },
+        {
+            uniqueSampleKey: 'VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ',
+            uniquePatientKey: 'VENHQS1FRS1BMjBDOnNrY21fdGNnYQ',
+            sampleType: 'Metastatic',
+            sampleId: 'TCGA-EE-A20C-06',
+            patientId: 'TCGA-EE-A20C',
+            studyId: 'skcm_tcga',
+        },
+    ] as Sample[];
+
+    const sampleDataWithNoAlteration: (ExtendedAlteration &
+        AnnotatedMutation)[] = [];
 
     const mrnaDataForTCGAEEA20C = {
-        oncoKbOncogenic: "",
-        uniqueSampleKey: "VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ",
-        uniquePatientKey: "VENHQS1FRS1BMjBDOnNrY21fdGNnYQ",
-        molecularProfileId: "skcm_tcga_rna_seq_v2_mrna_median_Zscores",
-        sampleId: "TCGA-EE-A20C-06",
-        patientId: "TCGA-EE-A20C",
-        studyId: "skcm_tcga",
+        oncoKbOncogenic: '',
+        uniqueSampleKey: 'VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ',
+        uniquePatientKey: 'VENHQS1FRS1BMjBDOnNrY21fdGNnYQ',
+        molecularProfileId: 'skcm_tcga_rna_seq_v2_mrna_median_Zscores',
+        sampleId: 'TCGA-EE-A20C-06',
+        patientId: 'TCGA-EE-A20C',
+        studyId: 'skcm_tcga',
         value: 2.4745,
         entrezGeneId: 5728,
         gene: {
             geneticEntityId: 4598,
             entrezGeneId: 5728,
-            hugoGeneSymbol: "PTEN",
-            type: "protein-coding"
+            hugoGeneSymbol: 'PTEN',
+            type: 'protein-coding',
         },
-        molecularProfileAlterationType: "MRNA_EXPRESSION",
-        alterationType: "MRNA_EXPRESSION",
-        alterationSubType: "high"
+        molecularProfileAlterationType: 'MRNA_EXPRESSION',
+        alterationType: 'MRNA_EXPRESSION',
+        alterationSubType: 'high',
     };
 
     const proteinDataForTCGAEEA20C = {
-        oncoKbOncogenic: "",
-        uniqueSampleKey: "VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ",
-        uniquePatientKey: "VENHQS1FRS1BMjBDOnNrY21fdGNnYQ",
-        molecularProfileId: "skcm_tcga_rppa_Zscores",
-        sampleId: "TCGA-EE-A20C-06",
-        patientId: "TCGA-EE-A20C",
-        studyId: "skcm_tcga",
+        oncoKbOncogenic: '',
+        uniqueSampleKey: 'VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ',
+        uniquePatientKey: 'VENHQS1FRS1BMjBDOnNrY21fdGNnYQ',
+        molecularProfileId: 'skcm_tcga_rppa_Zscores',
+        sampleId: 'TCGA-EE-A20C-06',
+        patientId: 'TCGA-EE-A20C',
+        studyId: 'skcm_tcga',
         value: 2.5406,
         entrezGeneId: 5728,
         gene: {
             geneticEntityId: 4598,
             entrezGeneId: 5728,
-            hugoGeneSymbol: "PTEN",
-            type: "protein-coding"
+            hugoGeneSymbol: 'PTEN',
+            type: 'protein-coding',
         },
-        molecularProfileAlterationType: "PROTEIN_LEVEL",
-        alterationType: "PROTEIN_LEVEL",
-        alterationSubType: "high"
+        molecularProfileAlterationType: 'PROTEIN_LEVEL',
+        alterationType: 'PROTEIN_LEVEL',
+        alterationSubType: 'high',
     };
 
     const cnaDataForTCGAEEA20C = {
-        molecularProfileAlterationType: "COPY_NUMBER_ALTERATION",
-        uniqueSampleKey: "VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ",
-        uniquePatientKey: "VENHQS1FRS1BMjBDOnNrY21fdGNnYQ",
-        molecularProfileId: "skcm_tcga_gistic",
-        sampleId: "TCGA-EE-A20C-06",
-        patientId: "TCGA-EE-A20C",
-        studyId: "skcm_tcga",
+        molecularProfileAlterationType: 'COPY_NUMBER_ALTERATION',
+        uniqueSampleKey: 'VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ',
+        uniquePatientKey: 'VENHQS1FRS1BMjBDOnNrY21fdGNnYQ',
+        molecularProfileId: 'skcm_tcga_gistic',
+        sampleId: 'TCGA-EE-A20C-06',
+        patientId: 'TCGA-EE-A20C',
+        studyId: 'skcm_tcga',
         value: -1,
         entrezGeneId: 7157,
         gene: {
-            geneticEntityId:5808,
+            geneticEntityId: 5808,
             entrezGeneId: 7157,
-            hugoGeneSymbol: "TP53",
-            type: "protein-coding"
-        }
+            hugoGeneSymbol: 'TP53',
+            type: 'protein-coding',
+        },
     };
 
     const sampleDataWithBothMutationAndFusion = [
         {
-            "putativeDriver": true,
-            "isHotspot": true,
-            "oncoKbOncogenic": "likely oncogenic",
-            "simplifiedMutationType": "missense",
-            "uniqueSampleKey": "UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3",
-            "uniquePatientKey": "UC0wMDAwMzc4Om1za19pbXBhY3RfMjAxNw",
-            "molecularProfileId": "msk_impact_2017_mutations",
-            "sampleId": "P-0000378-T01-IM3",
-            "patientId": "P-0000378",
-            "entrezGeneId": 1956,
-            "gene": {
-                "geneticEntityId": 1575,
-                "entrezGeneId": 1956,
-                "hugoGeneSymbol": "EGFR",
-                "type": "protein-coding"
+            putativeDriver: true,
+            isHotspot: true,
+            oncoKbOncogenic: 'likely oncogenic',
+            simplifiedMutationType: 'missense',
+            uniqueSampleKey: 'UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3',
+            uniquePatientKey: 'UC0wMDAwMzc4Om1za19pbXBhY3RfMjAxNw',
+            molecularProfileId: 'msk_impact_2017_mutations',
+            sampleId: 'P-0000378-T01-IM3',
+            patientId: 'P-0000378',
+            entrezGeneId: 1956,
+            gene: {
+                geneticEntityId: 1575,
+                entrezGeneId: 1956,
+                hugoGeneSymbol: 'EGFR',
+                type: 'protein-coding',
             },
-            "studyId": "msk_impact_2017",
-            "center": "NA",
-            "mutationStatus": "NA",
-            "validationStatus": "NA",
-            "tumorAltCount": 425,
-            "tumorRefCount": 7757,
-            "normalAltCount": -1,
-            "normalRefCount": -1,
-            "startPosition": 55233043,
-            "endPosition": 55233043,
-            "referenceAllele": "G",
-            "proteinChange": "G598A",
-            "mutationType": "Missense_Mutation",
-            "functionalImpactScore": "M",
-            "fisValue": 2.855,
-            "linkXvar": "getma.org/?cm=var&var=hg19,7,55233043,G,C&fts=all",
-            "linkPdb": "getma.org/pdb.php?prot=EGFR_HUMAN&from=482&to=681&var=G598A",
-            "linkMsa": "getma.org/?cm=msa&ty=f&p=EGFR_HUMAN&rb=482&re=681&var=G598A",
-            "ncbiBuild": "GRCh37",
-            "variantType": "SNP",
-            "keyword": "EGFR G598 missense",
-            "driverFilter": "",
-            "driverFilterAnnotation": "",
-            "driverTiersFilter": "",
-            "driverTiersFilterAnnotation": "",
-            "variantAllele": "C",
-            "refseqMrnaId": "NM_005228.3",
-            "proteinPosStart": 598,
-            "proteinPosEnd": 598,
-            "molecularProfileAlterationType": "MUTATION_EXTENDED",
-            "alterationType": "MUTATION_EXTENDED",
-            "alterationSubType": "missense"
+            studyId: 'msk_impact_2017',
+            center: 'NA',
+            mutationStatus: 'NA',
+            validationStatus: 'NA',
+            tumorAltCount: 425,
+            tumorRefCount: 7757,
+            normalAltCount: -1,
+            normalRefCount: -1,
+            startPosition: 55233043,
+            endPosition: 55233043,
+            referenceAllele: 'G',
+            proteinChange: 'G598A',
+            mutationType: 'Missense_Mutation',
+            functionalImpactScore: 'M',
+            fisValue: 2.855,
+            linkXvar: 'getma.org/?cm=var&var=hg19,7,55233043,G,C&fts=all',
+            linkPdb:
+                'getma.org/pdb.php?prot=EGFR_HUMAN&from=482&to=681&var=G598A',
+            linkMsa:
+                'getma.org/?cm=msa&ty=f&p=EGFR_HUMAN&rb=482&re=681&var=G598A',
+            ncbiBuild: 'GRCh37',
+            variantType: 'SNP',
+            keyword: 'EGFR G598 missense',
+            driverFilter: '',
+            driverFilterAnnotation: '',
+            driverTiersFilter: '',
+            driverTiersFilterAnnotation: '',
+            variantAllele: 'C',
+            refseqMrnaId: 'NM_005228.3',
+            proteinPosStart: 598,
+            proteinPosEnd: 598,
+            molecularProfileAlterationType: 'MUTATION_EXTENDED',
+            alterationType: 'MUTATION_EXTENDED',
+            alterationSubType: 'missense',
         },
         {
-            "putativeDriver": true,
-            "isHotspot": false,
-            "oncoKbOncogenic": "likely oncogenic",
-            "simplifiedMutationType": "fusion",
-            "uniqueSampleKey": "UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3",
-            "uniquePatientKey": "UC0wMDAwMzc4Om1za19pbXBhY3RfMjAxNw",
-            "molecularProfileId": "msk_impact_2017_mutations",
-            "sampleId": "P-0000378-T01-IM3",
-            "patientId": "P-0000378",
-            "entrezGeneId": 1956,
-            "gene": {
-                "geneticEntityId": 1575,
-                "entrezGeneId": 1956,
-                "hugoGeneSymbol": "EGFR",
-                "type": "protein-coding"
+            putativeDriver: true,
+            isHotspot: false,
+            oncoKbOncogenic: 'likely oncogenic',
+            simplifiedMutationType: 'fusion',
+            uniqueSampleKey: 'UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3',
+            uniquePatientKey: 'UC0wMDAwMzc4Om1za19pbXBhY3RfMjAxNw',
+            molecularProfileId: 'msk_impact_2017_mutations',
+            sampleId: 'P-0000378-T01-IM3',
+            patientId: 'P-0000378',
+            entrezGeneId: 1956,
+            gene: {
+                geneticEntityId: 1575,
+                entrezGeneId: 1956,
+                hugoGeneSymbol: 'EGFR',
+                type: 'protein-coding',
             },
-            "studyId": "msk_impact_2017",
-            "center": "MSKCC-DMP",
-            "mutationStatus": "NA",
-            "validationStatus": "NA",
-            "tumorAltCount": -1,
-            "tumorRefCount": -1,
-            "normalAltCount": -1,
-            "normalRefCount": -1,
-            "startPosition": -1,
-            "endPosition": -1,
-            "referenceAllele": "NA",
-            "proteinChange": "EGFR-intragenic",
-            "mutationType": "Fusion",
-            "functionalImpactScore": "NA",
-            "fisValue": -1,
-            "linkXvar": "NA",
-            "linkPdb": "NA",
-            "linkMsa": "NA",
-            "ncbiBuild": "NA",
-            "variantType": "NA",
-            "keyword": "EGFR EGFR-intragenic",
-            "variantAllele": "NA",
-            "refseqMrnaId": "NA",
-            "proteinPosStart": -1,
-            "proteinPosEnd": -1,
-            "molecularProfileAlterationType": "MUTATION_EXTENDED",
-            "alterationType": "FUSION",
-            "alterationSubType": "fusion"
+            studyId: 'msk_impact_2017',
+            center: 'MSKCC-DMP',
+            mutationStatus: 'NA',
+            validationStatus: 'NA',
+            tumorAltCount: -1,
+            tumorRefCount: -1,
+            normalAltCount: -1,
+            normalRefCount: -1,
+            startPosition: -1,
+            endPosition: -1,
+            referenceAllele: 'NA',
+            proteinChange: 'EGFR-intragenic',
+            mutationType: 'Fusion',
+            functionalImpactScore: 'NA',
+            fisValue: -1,
+            linkXvar: 'NA',
+            linkPdb: 'NA',
+            linkMsa: 'NA',
+            ncbiBuild: 'NA',
+            variantType: 'NA',
+            keyword: 'EGFR EGFR-intragenic',
+            variantAllele: 'NA',
+            refseqMrnaId: 'NA',
+            proteinPosStart: -1,
+            proteinPosEnd: -1,
+            molecularProfileAlterationType: 'MUTATION_EXTENDED',
+            alterationType: 'FUSION',
+            alterationSubType: 'fusion',
         },
         {
-            "putativeDriver": false,
-            "isHotspot": false,
-            "oncoKbOncogenic": "",
-            "simplifiedMutationType": "missense",
-            "uniqueSampleKey": "UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3",
-            "uniquePatientKey": "UC0wMDAwMzc4Om1za19pbXBhY3RfMjAxNw",
-            "molecularProfileId": "msk_impact_2017_mutations",
-            "sampleId": "P-0000378-T01-IM3",
-            "patientId": "P-0000378",
-            "entrezGeneId": 1956,
-            "gene": {
-                "geneticEntityId": 1575,
-                "entrezGeneId": 1956,
-                "hugoGeneSymbol": "EGFR",
-                "type": "protein-coding"
+            putativeDriver: false,
+            isHotspot: false,
+            oncoKbOncogenic: '',
+            simplifiedMutationType: 'missense',
+            uniqueSampleKey: 'UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3',
+            uniquePatientKey: 'UC0wMDAwMzc4Om1za19pbXBhY3RfMjAxNw',
+            molecularProfileId: 'msk_impact_2017_mutations',
+            sampleId: 'P-0000378-T01-IM3',
+            patientId: 'P-0000378',
+            entrezGeneId: 1956,
+            gene: {
+                geneticEntityId: 1575,
+                entrezGeneId: 1956,
+                hugoGeneSymbol: 'EGFR',
+                type: 'protein-coding',
             },
-            "studyId": "msk_impact_2017",
-            "center": "NA",
-            "mutationStatus": "NA",
-            "validationStatus": "NA",
-            "tumorAltCount": 1694,
-            "tumorRefCount": 3870,
-            "normalAltCount": -1,
-            "normalRefCount": -1,
-            "startPosition": 55220325,
-            "endPosition": 55220325,
-            "referenceAllele": "G",
-            "proteinChange": "G239C",
-            "mutationType": "Missense_Mutation",
-            "functionalImpactScore": "",
-            "fisValue": 1.4013e-45,
-            "linkXvar": "",
-            "linkPdb": "",
-            "linkMsa": "",
-            "ncbiBuild": "GRCh37",
-            "variantType": "SNP",
-            "keyword": "EGFR G239 missense",
-            "driverFilter": "",
-            "driverFilterAnnotation": "",
-            "driverTiersFilter": "",
-            "driverTiersFilterAnnotation": "",
-            "variantAllele": "T",
-            "refseqMrnaId": "NM_005228.3",
-            "proteinPosStart": 239,
-            "proteinPosEnd": 239,
-            "molecularProfileAlterationType": "MUTATION_EXTENDED",
-            "alterationType": "MUTATION_EXTENDED",
-            "alterationSubType": "missense"
-        }
-    ] as (ExtendedAlteration&AnnotatedMutation)[];
-
-    const caseAggregatedDataByOQLLine = [{
-        cases: {
-            samples: {
-                "UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3": sampleDataWithBothMutationAndFusion,
-                "VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ": []
-            }
+            studyId: 'msk_impact_2017',
+            center: 'NA',
+            mutationStatus: 'NA',
+            validationStatus: 'NA',
+            tumorAltCount: 1694,
+            tumorRefCount: 3870,
+            normalAltCount: -1,
+            normalRefCount: -1,
+            startPosition: 55220325,
+            endPosition: 55220325,
+            referenceAllele: 'G',
+            proteinChange: 'G239C',
+            mutationType: 'Missense_Mutation',
+            functionalImpactScore: '',
+            fisValue: 1.4013e-45,
+            linkXvar: '',
+            linkPdb: '',
+            linkMsa: '',
+            ncbiBuild: 'GRCh37',
+            variantType: 'SNP',
+            keyword: 'EGFR G239 missense',
+            driverFilter: '',
+            driverFilterAnnotation: '',
+            driverTiersFilter: '',
+            driverTiersFilterAnnotation: '',
+            variantAllele: 'T',
+            refseqMrnaId: 'NM_005228.3',
+            proteinPosStart: 239,
+            proteinPosEnd: 239,
+            molecularProfileAlterationType: 'MUTATION_EXTENDED',
+            alterationType: 'MUTATION_EXTENDED',
+            alterationSubType: 'missense',
         },
-        oql: {
-            gene: "EGFR",
-            oql_line: "EGFR: AMP HOMDEL MUT FUSION;",
-            data: sampleDataWithBothMutationAndFusion
-        }
-    }, {
-        cases: {
-            samples: {
-                "UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3": [],
-                "VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ": [mrnaDataForTCGAEEA20C, proteinDataForTCGAEEA20C]
-            }
+    ] as (ExtendedAlteration & AnnotatedMutation)[];
+
+    const caseAggregatedDataByOQLLine = [
+        {
+            cases: {
+                samples: {
+                    UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3: sampleDataWithBothMutationAndFusion,
+                    VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ: [],
+                },
+            },
+            oql: {
+                gene: 'EGFR',
+                oql_line: 'EGFR: AMP HOMDEL MUT FUSION;',
+                data: sampleDataWithBothMutationAndFusion,
+            },
         },
-        oql: {
-            gene: "PTEN",
-            oql_line: "PTEN: AMP HOMDEL MUT FUSION;",
-            data: [mrnaDataForTCGAEEA20C, proteinDataForTCGAEEA20C]
-        }
-    }, {
-        cases: {
-            samples: {
-                "UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3": [],
-                "VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ": []
-            }
+        {
+            cases: {
+                samples: {
+                    UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3: [],
+                    VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ: [
+                        mrnaDataForTCGAEEA20C,
+                        proteinDataForTCGAEEA20C,
+                    ],
+                },
+            },
+            oql: {
+                gene: 'PTEN',
+                oql_line: 'PTEN: AMP HOMDEL MUT FUSION;',
+                data: [mrnaDataForTCGAEEA20C, proteinDataForTCGAEEA20C],
+            },
+        },
+        {
+            cases: {
+                samples: {
+                    UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3: [],
+                    VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ: [],
+                },
+            },
+            oql: {
+                gene: 'TP53',
+                oql_line: 'TP53: AMP HOMDEL MUT FUSION;',
+                data: [],
+            },
         },
-        oql: {
-            gene: "TP53",
-            oql_line: "TP53: AMP HOMDEL MUT FUSION;",
-            data: []
-        }
-    }] as any;
+    ] as any;
 
     describe('generateOqlData', () => {
-
         it('generates empty oql data for a sample with no alteration data', () => {
-
             const geneticTrackDatum: GeneticTrackDatum = {
-                sample: "TCGA-BF-A1PV-01",
-                patient: "TCGA-BF-A1PV",
-                study_id: "skcm_tcga",
-                uid: "VENHQS1CRi1BMVBWLTAxOnNrY21fdGNnYQ",
-                trackLabel: "PTEN",
-                data: sampleDataWithNoAlteration
+                sample: 'TCGA-BF-A1PV-01',
+                patient: 'TCGA-BF-A1PV',
+                study_id: 'skcm_tcga',
+                uid: 'VENHQS1CRi1BMVBWLTAxOnNrY21fdGNnYQ',
+                trackLabel: 'PTEN',
+                data: sampleDataWithNoAlteration,
             };
 
             const oqlData = generateOqlData(geneticTrackDatum);
 
-            assert.equal(oqlData.geneSymbol, "PTEN",
-                "gene symbol is correct for the sample with no alteration");
-            assert.equal(oqlData.cna.length, 0,
-                "cna data is empty for the sample with no alteration");
-            assert.equal(oqlData.mutation.length, 0,
-                "mutation data is empty for the sample with no alteration");
-            assert.equal(oqlData.fusion.length, 0,
-                "fusion data is empty for the sample with no alteration");
-            assert.equal(oqlData.mrnaExp.length, 0,
-                "mRNA expression data is empty for the sample with no alteration");
-            assert.equal(oqlData.proteinLevel.length, 0,
-                "protein level data is empty for the sample with no alteration");
+            assert.equal(
+                oqlData.geneSymbol,
+                'PTEN',
+                'gene symbol is correct for the sample with no alteration'
+            );
+            assert.equal(
+                oqlData.cna.length,
+                0,
+                'cna data is empty for the sample with no alteration'
+            );
+            assert.equal(
+                oqlData.mutation.length,
+                0,
+                'mutation data is empty for the sample with no alteration'
+            );
+            assert.equal(
+                oqlData.fusion.length,
+                0,
+                'fusion data is empty for the sample with no alteration'
+            );
+            assert.equal(
+                oqlData.mrnaExp.length,
+                0,
+                'mRNA expression data is empty for the sample with no alteration'
+            );
+            assert.equal(
+                oqlData.proteinLevel.length,
+                0,
+                'protein level data is empty for the sample with no alteration'
+            );
         });
 
         it('generates oql data properly for samples with multiple alteration types', () => {
-
             const geneticTrackDatum: GeneticTrackDatum = {
-                sample: "TCGA-EE-A20C-06",
-                patient: "TCGA-EE-A20C",
-                study_id: "skcm_tcga",
-                uid: "VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ",
-                trackLabel: "PTEN",
-                data: [mrnaDataForTCGAEEA20C, proteinDataForTCGAEEA20C] as any[],
-                disp_mrna: "high",
-                disp_prot: "high"
+                sample: 'TCGA-EE-A20C-06',
+                patient: 'TCGA-EE-A20C',
+                study_id: 'skcm_tcga',
+                uid: 'VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ',
+                trackLabel: 'PTEN',
+                data: [
+                    mrnaDataForTCGAEEA20C,
+                    proteinDataForTCGAEEA20C,
+                ] as any[],
+                disp_mrna: 'high',
+                disp_prot: 'high',
             };
 
             const oqlData = generateOqlData(geneticTrackDatum);
 
-            assert.equal(oqlData.geneSymbol, "PTEN",
-                "gene symbol is correct for the sample with mrna and protein data only");
-            assert.equal(oqlData.cna.length, 0,
-                "cna data is empty for the sample with mrna and protein data only");
-            assert.equal(oqlData.mutation.length, 0,
-                "mutation data is empty for the sample with mrna and protein data only");
-            assert.equal(oqlData.fusion.length, 0,
-                "fusion data is empty for the sample with mrna and protein data only");
-
-            assert.equal(oqlData.mrnaExp.length, 1,
-                "mRNA expression data exists for the sample with mrna and protein data only");
-            assert.equal(oqlData.proteinLevel.length, 1,
-                "protein level data exists for the sample with mrna and protein data only");
-
-            assert.deepEqual(oqlData.mrnaExp, [{type: "HIGH", value: 2.4745}],
-                "mRNA expression data is correct for the sample with mrna and protein data only");
-            assert.deepEqual(oqlData.proteinLevel, [{type: "HIGH", value: 2.5406}],
-                "protein level data is correct for the sample with mrna and protein data only");
+            assert.equal(
+                oqlData.geneSymbol,
+                'PTEN',
+                'gene symbol is correct for the sample with mrna and protein data only'
+            );
+            assert.equal(
+                oqlData.cna.length,
+                0,
+                'cna data is empty for the sample with mrna and protein data only'
+            );
+            assert.equal(
+                oqlData.mutation.length,
+                0,
+                'mutation data is empty for the sample with mrna and protein data only'
+            );
+            assert.equal(
+                oqlData.fusion.length,
+                0,
+                'fusion data is empty for the sample with mrna and protein data only'
+            );
+
+            assert.equal(
+                oqlData.mrnaExp.length,
+                1,
+                'mRNA expression data exists for the sample with mrna and protein data only'
+            );
+            assert.equal(
+                oqlData.proteinLevel.length,
+                1,
+                'protein level data exists for the sample with mrna and protein data only'
+            );
+
+            assert.deepEqual(
+                oqlData.mrnaExp,
+                [{ type: 'HIGH', value: 2.4745 }],
+                'mRNA expression data is correct for the sample with mrna and protein data only'
+            );
+            assert.deepEqual(
+                oqlData.proteinLevel,
+                [{ type: 'HIGH', value: 2.5406 }],
+                'protein level data is correct for the sample with mrna and protein data only'
+            );
         });
 
         it('generates oql data properly for samples with multiple mutations/fusions', () => {
-
             const geneticTrackDatum: GeneticTrackDatum = {
-                sample: "P-0000378-T01-IM3",
-                patient: "P-0000378",
-                study_id: "msk_impact_2017",
-                uid: "UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3",
-                trackLabel: "EGFR",
+                sample: 'P-0000378-T01-IM3',
+                patient: 'P-0000378',
+                study_id: 'msk_impact_2017',
+                uid: 'UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3',
+                trackLabel: 'EGFR',
                 data: sampleDataWithBothMutationAndFusion,
                 disp_fusion: true,
-                disp_cna: "amp",
-                disp_mut: "missense_rec"
+                disp_cna: 'amp',
+                disp_mut: 'missense_rec',
             };
 
             const oqlData = generateOqlData(geneticTrackDatum);
 
-            assert.equal(oqlData.geneSymbol, "EGFR",
-                "gene symbol is correct for the sample with both mutation and fusion data");
-            assert.deepEqual(oqlData.mrnaExp, [],
-                "mRNA expression data is empty for the sample with mutation and fusion data");
-            assert.deepEqual(oqlData.proteinLevel, [],
-                "protein level data is empty for the sample with mutation and fusion data");
-            assert.deepEqual(oqlData.cna, [],
-                "CNA data is empty for the sample with mutation and fusion data");
-            assert.deepEqual(oqlData.fusion, ["EGFR-intragenic"],
-                "fusion data is correct for the sample with mutation and fusion data");
-            assert.deepEqual(oqlData.mutation, ["G598A", "G239C"],
-                "mutation data is correct for the sample with mutation and fusion data");
+            assert.equal(
+                oqlData.geneSymbol,
+                'EGFR',
+                'gene symbol is correct for the sample with both mutation and fusion data'
+            );
+            assert.deepEqual(
+                oqlData.mrnaExp,
+                [],
+                'mRNA expression data is empty for the sample with mutation and fusion data'
+            );
+            assert.deepEqual(
+                oqlData.proteinLevel,
+                [],
+                'protein level data is empty for the sample with mutation and fusion data'
+            );
+            assert.deepEqual(
+                oqlData.cna,
+                [],
+                'CNA data is empty for the sample with mutation and fusion data'
+            );
+            assert.deepEqual(
+                oqlData.fusion,
+                ['EGFR-intragenic'],
+                'fusion data is correct for the sample with mutation and fusion data'
+            );
+            assert.deepEqual(
+                oqlData.mutation,
+                ['G598A', 'G239C'],
+                'mutation data is correct for the sample with mutation and fusion data'
+            );
         });
     });
 
@@ -396,158 +475,223 @@ describe('DownloadUtils', () => {
         it('returns empty list in case of empty input', () => {
             const sampleKeys = {};
 
-            const caseAlterationData = generateGeneAlterationData(caseAggregatedDataByOQLLine, sampleKeys);
-
-            assert.equal(caseAlterationData.length, 0,
-                "case alteration data should be empty");
+            const caseAlterationData = generateGeneAlterationData(
+                caseAggregatedDataByOQLLine,
+                sampleKeys
+            );
+
+            assert.equal(
+                caseAlterationData.length,
+                0,
+                'case alteration data should be empty'
+            );
         });
 
         it('generates gene alteration data for multiple samples', () => {
-
             const sampleKeys = {
                 PTEN: [
-                    "UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3",
-                    "VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ"
+                    'UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3',
+                    'VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ',
                 ],
                 TP53: [
-                    "UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3",
-                    "VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ"
+                    'UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3',
+                    'VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ',
                 ],
                 EGFR: [
-                    "UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3",
-                    "VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ"
-                ]
+                    'UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3',
+                    'VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ',
+                ],
             };
 
-            const caseAlterationData = generateGeneAlterationData(caseAggregatedDataByOQLLine, sampleKeys);
-
-            assert.equal(caseAlterationData[0].oqlLine, "EGFR: AMP HOMDEL MUT FUSION;",
-                "OQL line is correct for the gene EGFR");
-            assert.equal(caseAlterationData[0].altered, 1,
-                "number of altered samples is correct for the gene EGFR");
-            assert.equal(caseAlterationData[0].percentAltered, "50%",
-                "alteration percent is correct for the gene EGFR");
-
-            assert.equal(caseAlterationData[1].oqlLine, "PTEN: AMP HOMDEL MUT FUSION;",
-                "OQL line is correct for the gene PTEN");
-            assert.equal(caseAlterationData[1].altered, 1,
-                "number of altered samples is correct for the gene PTEN");
-            assert.equal(caseAlterationData[1].percentAltered, "50%",
-                "alteration percent is correct for the gene PTEN");
-
-            assert.equal(caseAlterationData[2].oqlLine, "TP53: AMP HOMDEL MUT FUSION;",
-                "OQL line is correct for the gene TP53");
-            assert.equal(caseAlterationData[2].altered, 0,
-                "number of altered samples is correct for the gene TP53");
-            assert.equal(caseAlterationData[2].percentAltered, "0%",
-                "alteration percent is correct for the gene TP53");
+            const caseAlterationData = generateGeneAlterationData(
+                caseAggregatedDataByOQLLine,
+                sampleKeys
+            );
+
+            assert.equal(
+                caseAlterationData[0].oqlLine,
+                'EGFR: AMP HOMDEL MUT FUSION;',
+                'OQL line is correct for the gene EGFR'
+            );
+            assert.equal(
+                caseAlterationData[0].altered,
+                1,
+                'number of altered samples is correct for the gene EGFR'
+            );
+            assert.equal(
+                caseAlterationData[0].percentAltered,
+                '50%',
+                'alteration percent is correct for the gene EGFR'
+            );
+
+            assert.equal(
+                caseAlterationData[1].oqlLine,
+                'PTEN: AMP HOMDEL MUT FUSION;',
+                'OQL line is correct for the gene PTEN'
+            );
+            assert.equal(
+                caseAlterationData[1].altered,
+                1,
+                'number of altered samples is correct for the gene PTEN'
+            );
+            assert.equal(
+                caseAlterationData[1].percentAltered,
+                '50%',
+                'alteration percent is correct for the gene PTEN'
+            );
+
+            assert.equal(
+                caseAlterationData[2].oqlLine,
+                'TP53: AMP HOMDEL MUT FUSION;',
+                'OQL line is correct for the gene TP53'
+            );
+            assert.equal(
+                caseAlterationData[2].altered,
+                0,
+                'number of altered samples is correct for the gene TP53'
+            );
+            assert.equal(
+                caseAlterationData[2].percentAltered,
+                '0%',
+                'alteration percent is correct for the gene TP53'
+            );
         });
     });
 
     describe('generateMutationDownloadData', () => {
-
-        it('generates download data for mutated samples',() => {
-
+        it('generates download data for mutated samples', () => {
             const sampleAlterationDataByGene = {
-                "EGFR_UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3": [
-                    ...sampleDataWithBothMutationAndFusion
+                EGFR_UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3: [
+                    ...sampleDataWithBothMutationAndFusion,
                 ],
-                "PTEN_UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3": [],
-                "TP53_UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3": [],
-                "EGFR_VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ": [],
-                "PTEN_VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ": [],
-                "TP53_VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ": []
+                PTEN_UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3: [],
+                TP53_UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3: [],
+                EGFR_VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ: [],
+                PTEN_VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ: [],
+                TP53_VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ: [],
             };
 
-            const downloadData = generateMutationDownloadData(sampleAlterationDataByGene, samples, genes);
+            const downloadData = generateMutationDownloadData(
+                sampleAlterationDataByGene,
+                samples,
+                genes
+            );
 
             const expectedResult = [
-                ["STUDY_ID", "SAMPLE_ID", "PTEN", "TP53", "EGFR"],
-                ["msk_impact_2017", "P-0000378-T01-IM3", "NA", "NA", "G598A EGFR-intragenic G239C"],
-                ["skcm_tcga", "TCGA-EE-A20C-06", "NA", "NA", "NA"]
+                ['STUDY_ID', 'SAMPLE_ID', 'PTEN', 'TP53', 'EGFR'],
+                [
+                    'msk_impact_2017',
+                    'P-0000378-T01-IM3',
+                    'NA',
+                    'NA',
+                    'G598A EGFR-intragenic G239C',
+                ],
+                ['skcm_tcga', 'TCGA-EE-A20C-06', 'NA', 'NA', 'NA'],
             ];
 
-            assert.deepEqual(downloadData, expectedResult,
-                "mutation download data is correctly generated");
+            assert.deepEqual(
+                downloadData,
+                expectedResult,
+                'mutation download data is correctly generated'
+            );
         });
-
     });
 
     describe('generateDownloadData', () => {
-
-        it('generates download data for mRNA expression alterations',() => {
-
+        it('generates download data for mRNA expression alterations', () => {
             const sampleAlterationDataByGene = {
-                "EGFR_UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3": [],
-                "PTEN_UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3": [],
-                "TP53_UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3": [],
-                "EGFR_VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ": [],
-                "PTEN_VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ": [
-                    mrnaDataForTCGAEEA20C as ExtendedAlteration&AnnotatedMutation
+                EGFR_UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3: [],
+                PTEN_UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3: [],
+                TP53_UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3: [],
+                EGFR_VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ: [],
+                PTEN_VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ: [
+                    mrnaDataForTCGAEEA20C as ExtendedAlteration &
+                        AnnotatedMutation,
                 ],
-                "TP53_VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ": []
+                TP53_VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ: [],
             };
 
-            const downloadData = generateDownloadData(sampleAlterationDataByGene, samples, genes);
+            const downloadData = generateDownloadData(
+                sampleAlterationDataByGene,
+                samples,
+                genes
+            );
 
             const expectedResult = [
-                ["STUDY_ID", "SAMPLE_ID", "PTEN", "TP53", "EGFR"],
-                ["msk_impact_2017", "P-0000378-T01-IM3", "NA", "NA", "NA"],
-                ["skcm_tcga", "TCGA-EE-A20C-06", "2.4745", "NA", "NA"]
+                ['STUDY_ID', 'SAMPLE_ID', 'PTEN', 'TP53', 'EGFR'],
+                ['msk_impact_2017', 'P-0000378-T01-IM3', 'NA', 'NA', 'NA'],
+                ['skcm_tcga', 'TCGA-EE-A20C-06', '2.4745', 'NA', 'NA'],
             ];
 
-            assert.deepEqual(downloadData, expectedResult,
-                "mRNA download data is correctly generated");
+            assert.deepEqual(
+                downloadData,
+                expectedResult,
+                'mRNA download data is correctly generated'
+            );
         });
 
-        it('generates download data for protein expression alterations',() => {
-
+        it('generates download data for protein expression alterations', () => {
             const sampleAlterationDataByGene = {
-                "EGFR_UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3": [],
-                "PTEN_UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3": [],
-                "TP53_UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3": [],
-                "EGFR_VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ": [],
-                "PTEN_VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ": [
-                    proteinDataForTCGAEEA20C as ExtendedAlteration&AnnotatedMutation
+                EGFR_UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3: [],
+                PTEN_UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3: [],
+                TP53_UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3: [],
+                EGFR_VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ: [],
+                PTEN_VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ: [
+                    proteinDataForTCGAEEA20C as ExtendedAlteration &
+                        AnnotatedMutation,
                 ],
-                "TP53_VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ": []
+                TP53_VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ: [],
             };
 
-            const downloadData = generateDownloadData(sampleAlterationDataByGene, samples, genes);
+            const downloadData = generateDownloadData(
+                sampleAlterationDataByGene,
+                samples,
+                genes
+            );
 
             const expectedResult = [
-                ["STUDY_ID", "SAMPLE_ID", "PTEN", "TP53", "EGFR"],
-                ["msk_impact_2017", "P-0000378-T01-IM3", "NA", "NA", "NA"],
-                ["skcm_tcga", "TCGA-EE-A20C-06", "2.5406", "NA", "NA"]
+                ['STUDY_ID', 'SAMPLE_ID', 'PTEN', 'TP53', 'EGFR'],
+                ['msk_impact_2017', 'P-0000378-T01-IM3', 'NA', 'NA', 'NA'],
+                ['skcm_tcga', 'TCGA-EE-A20C-06', '2.5406', 'NA', 'NA'],
             ];
 
-            assert.deepEqual(downloadData, expectedResult,
-                "protein download data is correctly generated");
+            assert.deepEqual(
+                downloadData,
+                expectedResult,
+                'protein download data is correctly generated'
+            );
         });
 
-        it('generates download data for copy number altered samples',() => {
-
+        it('generates download data for copy number altered samples', () => {
             const sampleAlterationDataByGene = {
-                "EGFR_UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3": [],
-                "PTEN_UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3": [],
-                "TP53_UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3": [],
-                "EGFR_VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ": [],
-                "PTEN_VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ": [],
-                "TP53_VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ": [
-                    cnaDataForTCGAEEA20C as ExtendedAlteration&AnnotatedMutation
-                ]
+                EGFR_UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3: [],
+                PTEN_UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3: [],
+                TP53_UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3: [],
+                EGFR_VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ: [],
+                PTEN_VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ: [],
+                TP53_VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ: [
+                    cnaDataForTCGAEEA20C as ExtendedAlteration &
+                        AnnotatedMutation,
+                ],
             };
 
-            const downloadData = generateDownloadData(sampleAlterationDataByGene, samples, genes);
+            const downloadData = generateDownloadData(
+                sampleAlterationDataByGene,
+                samples,
+                genes
+            );
 
             const expectedResult = [
-                ["STUDY_ID", "SAMPLE_ID", "PTEN", "TP53", "EGFR"],
-                ["msk_impact_2017", "P-0000378-T01-IM3", "NA", "NA", "NA"],
-                ["skcm_tcga", "TCGA-EE-A20C-06", "NA", "-1", "NA"]
+                ['STUDY_ID', 'SAMPLE_ID', 'PTEN', 'TP53', 'EGFR'],
+                ['msk_impact_2017', 'P-0000378-T01-IM3', 'NA', 'NA', 'NA'],
+                ['skcm_tcga', 'TCGA-EE-A20C-06', 'NA', '-1', 'NA'],
             ];
 
-            assert.deepEqual(downloadData, expectedResult,
-                "CNA download data is correctly generated");
+            assert.deepEqual(
+                downloadData,
+                expectedResult,
+                'CNA download data is correctly generated'
+            );
         });
     });
 
@@ -555,103 +699,159 @@ describe('DownloadUtils', () => {
         it('properly handles not sequenced genes when generating case alteration data', () => {
             const genePanelInformation = {
                 samples: {
-                    "UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3": {
-                        "byGene": {},
-                        "allGenes": [],
-                        "notProfiledByGene":{},
-                        "notProfiledAllGenes":[]
+                    UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3: {
+                        byGene: {},
+                        allGenes: [],
+                        notProfiledByGene: {},
+                        notProfiledAllGenes: [],
+                    },
+                    VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ: {
+                        byGene: {},
+                        allGenes: [
+                            {
+                                molecularProfileId: 'AsdfasD',
+                                profiled: true,
+                            } as GenePanelData,
+                        ],
+                        notProfiledByGene: {},
+                        notProfiledAllGenes: [],
                     },
-                    "VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ": {
-                        "byGene": {},
-                        "allGenes": [{molecularProfileId:"AsdfasD", profiled:true} as GenePanelData],
-                        "notProfiledByGene":{},
-                        "notProfiledAllGenes":[]
-                    }
                 },
-                patients: {}
+                patients: {},
             };
 
             const geneAlterationData = {
-                "EGFR": {
-                    gene: "EGFR",
-                    oqlLine: "EGFR: AMP HOMDEL MUT FUSION;",
+                EGFR: {
+                    gene: 'EGFR',
+                    oqlLine: 'EGFR: AMP HOMDEL MUT FUSION;',
                     sequenced: 0,
                     altered: 0,
-                    percentAltered: "N/S"
-                }
+                    percentAltered: 'N/S',
+                },
             };
 
-            const selectedMolecularProfiles = [{molecularProfileId:"AsdfasD"} as MolecularProfile];
+            const selectedMolecularProfiles = [
+                { molecularProfileId: 'AsdfasD' } as MolecularProfile,
+            ];
 
             const caseAlterationData = generateCaseAlterationData(
-                "EGFR TP53 PTEN",
+                'EGFR TP53 PTEN',
                 selectedMolecularProfiles,
                 caseAggregatedDataByOQLLine,
                 caseAggregatedDataByOQLLine,
                 genePanelInformation,
                 samples,
-                geneAlterationData);
-
-            assert.isFalse(caseAlterationData[0].oqlData["EGFR"].sequenced,
-                "cases with the gene EGFR should be marked as not sequenced");
-
-            assert.isTrue(caseAlterationData[1].oqlData["PTEN"].sequenced,
-                "cases with the gene other than EGFR should be marked as sequenced");
+                geneAlterationData
+            );
+
+            assert.isFalse(
+                caseAlterationData[0].oqlData['EGFR'].sequenced,
+                'cases with the gene EGFR should be marked as not sequenced'
+            );
+
+            assert.isTrue(
+                caseAlterationData[1].oqlData['PTEN'].sequenced,
+                'cases with the gene other than EGFR should be marked as sequenced'
+            );
         });
 
-
-        it('generates case alteration data for multiple samples',() => {
-
+        it('generates case alteration data for multiple samples', () => {
             const genePanelInformation = {
                 samples: {
-                    "UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3": {
-                        "byGene": {},
-                        "allGenes": [{molecularProfileId:"AsdfasD", profiled:true} as GenePanelData],
-                        "notProfiledByGene":{},
-                        "notProfiledAllGenes":[]
+                    UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3: {
+                        byGene: {},
+                        allGenes: [
+                            {
+                                molecularProfileId: 'AsdfasD',
+                                profiled: true,
+                            } as GenePanelData,
+                        ],
+                        notProfiledByGene: {},
+                        notProfiledAllGenes: [],
+                    },
+                    VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ: {
+                        byGene: {},
+                        allGenes: [
+                            {
+                                molecularProfileId: 'AsdfasD',
+                                profiled: true,
+                            } as GenePanelData,
+                        ],
+                        notProfiledByGene: {},
+                        notProfiledAllGenes: [],
                     },
-                    "VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ": {
-                        "byGene": {},
-                        "allGenes": [{molecularProfileId:"AsdfasD", profiled:true} as GenePanelData],
-                        "notProfiledByGene":{},
-                        "notProfiledAllGenes":[]
-                    }
                 },
-                patients: {}
+                patients: {},
             };
 
-            const selectedMolecularProfiles = [{molecularProfileId:"AsdfasD"} as MolecularProfile];
-
-            const caseAlterationData = generateCaseAlterationData("EGFR TP53 PTEN", selectedMolecularProfiles, caseAggregatedDataByOQLLine, caseAggregatedDataByOQLLine, genePanelInformation, samples);
-
-            assert.equal(caseAlterationData.length, 2,
-                "case alteration data has correct size");
-
-            assert.equal(caseAlterationData[0].sampleId, "P-0000378-T01-IM3",
-                "sample id is correct for the sample key UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3");
-            assert.equal(caseAlterationData[0].studyId, "msk_impact_2017",
-                "study id is correct for the sample key UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3");
-            assert.isTrue(caseAlterationData[0].altered,
-                "sample UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3 is altered");
-            assert.deepEqual(caseAlterationData[0].oqlData["EGFR"].mutation,
-                ["G598A", "G239C"],
-                "mutation data is correct for the sample key UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3");
-            assert.deepEqual(caseAlterationData[0].oqlData["EGFR"].fusion,
-                ["EGFR-intragenic"],
-                "fusion data is correct for the sample key UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3");
-
-            assert.equal(caseAlterationData[1].sampleId, "TCGA-EE-A20C-06",
-                "sample id is correct for the sample key VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ");
-            assert.equal(caseAlterationData[1].studyId, "skcm_tcga",
-                "study id is correct for the sample key VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ");
-            assert.isTrue(caseAlterationData[1].altered,
-                "sample VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ is altered");
-            assert.deepEqual(caseAlterationData[1].oqlData["PTEN"].mrnaExp,
-                [{type: 'HIGH', value: 2.4745}],
-                "mRNA data is correct for the sample key VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ");
-            assert.deepEqual(caseAlterationData[1].oqlData["PTEN"].proteinLevel,
-                [{type: 'HIGH', value: 2.5406}],
-                "protein data is correct for the sample key VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ");
+            const selectedMolecularProfiles = [
+                { molecularProfileId: 'AsdfasD' } as MolecularProfile,
+            ];
+
+            const caseAlterationData = generateCaseAlterationData(
+                'EGFR TP53 PTEN',
+                selectedMolecularProfiles,
+                caseAggregatedDataByOQLLine,
+                caseAggregatedDataByOQLLine,
+                genePanelInformation,
+                samples
+            );
+
+            assert.equal(
+                caseAlterationData.length,
+                2,
+                'case alteration data has correct size'
+            );
+
+            assert.equal(
+                caseAlterationData[0].sampleId,
+                'P-0000378-T01-IM3',
+                'sample id is correct for the sample key UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3'
+            );
+            assert.equal(
+                caseAlterationData[0].studyId,
+                'msk_impact_2017',
+                'study id is correct for the sample key UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3'
+            );
+            assert.isTrue(
+                caseAlterationData[0].altered,
+                'sample UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3 is altered'
+            );
+            assert.deepEqual(
+                caseAlterationData[0].oqlData['EGFR'].mutation,
+                ['G598A', 'G239C'],
+                'mutation data is correct for the sample key UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3'
+            );
+            assert.deepEqual(
+                caseAlterationData[0].oqlData['EGFR'].fusion,
+                ['EGFR-intragenic'],
+                'fusion data is correct for the sample key UC0wMDAwMzc4LVQwMS1JTTM6bXNrX2ltcGFjdF8yMDE3'
+            );
+
+            assert.equal(
+                caseAlterationData[1].sampleId,
+                'TCGA-EE-A20C-06',
+                'sample id is correct for the sample key VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ'
+            );
+            assert.equal(
+                caseAlterationData[1].studyId,
+                'skcm_tcga',
+                'study id is correct for the sample key VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ'
+            );
+            assert.isTrue(
+                caseAlterationData[1].altered,
+                'sample VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ is altered'
+            );
+            assert.deepEqual(
+                caseAlterationData[1].oqlData['PTEN'].mrnaExp,
+                [{ type: 'HIGH', value: 2.4745 }],
+                'mRNA data is correct for the sample key VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ'
+            );
+            assert.deepEqual(
+                caseAlterationData[1].oqlData['PTEN'].proteinLevel,
+                [{ type: 'HIGH', value: 2.5406 }],
+                'protein data is correct for the sample key VENHQS1FRS1BMjBDLTA2OnNrY21fdGNnYQ'
+            );
         });
     });
 
@@ -659,7 +859,7 @@ describe('DownloadUtils', () => {
         it('properly updates oql data', () => {
             const sampleOql = {
                 sequenced: true,
-                geneSymbol: "EGFR",
+                geneSymbol: 'EGFR',
                 mutation: [],
                 fusion: [],
                 cna: [],
@@ -670,263 +870,348 @@ describe('DownloadUtils', () => {
                 isCnaNotProfiled: false,
                 isMrnaExpNotProfiled: false,
                 isProteinLevelNotProfiled: false,
-                alterationTypes: []
+                alterationTypes: [],
             };
 
             const notProfiledGeneticTrackDatum: GeneticTrackDatum[] = [
                 {
-                    "sample": "TCGA-S9-A7J0-01",
-                    "patient": "TCGA-S9-A7J0",
-                    "study_id": "lgg_tcga",
-                    "uid": "VENHQS1TOS1BN0owLTAxOmxnZ190Y2dh",
-                    "profiled_in": [
+                    sample: 'TCGA-S9-A7J0-01',
+                    patient: 'TCGA-S9-A7J0',
+                    study_id: 'lgg_tcga',
+                    uid: 'VENHQS1TOS1BN0owLTAxOmxnZ190Y2dh',
+                    profiled_in: [
                         {
-                            "uniqueSampleKey": "VENHQS1EVS02Mzk1LTAxOmxnZ190Y2dh",
-                            "uniquePatientKey": "VENHQS1EVS02Mzk1OmxnZ190Y2dh",
-                            "molecularProfileId": "lgg_tcga_gistic",
-                            "sampleId": "TCGA-DU-6395-01",
-                            "patientId": "TCGA-DU-6395",
-                            "studyId": "lgg_tcga",
-                            "profiled": true
+                            uniqueSampleKey: 'VENHQS1EVS02Mzk1LTAxOmxnZ190Y2dh',
+                            uniquePatientKey: 'VENHQS1EVS02Mzk1OmxnZ190Y2dh',
+                            molecularProfileId: 'lgg_tcga_gistic',
+                            sampleId: 'TCGA-DU-6395-01',
+                            patientId: 'TCGA-DU-6395',
+                            studyId: 'lgg_tcga',
+                            profiled: true,
                         } as GenePanelData,
                         {
-                            "uniqueSampleKey": "VENHQS1EVS02Mzk1LTAxOmxnZ190Y2dh",
-                            "uniquePatientKey": "VENHQS1EVS02Mzk1OmxnZ190Y2dh",
-                            "molecularProfileId": "lgg_tcga_mutations",
-                            "sampleId": "TCGA-DU-6395-01",
-                            "patientId": "TCGA-DU-6395",
-                            "studyId": "lgg_tcga",
-                            "profiled": true
-                        } as GenePanelData
+                            uniqueSampleKey: 'VENHQS1EVS02Mzk1LTAxOmxnZ190Y2dh',
+                            uniquePatientKey: 'VENHQS1EVS02Mzk1OmxnZ190Y2dh',
+                            molecularProfileId: 'lgg_tcga_mutations',
+                            sampleId: 'TCGA-DU-6395-01',
+                            patientId: 'TCGA-DU-6395',
+                            studyId: 'lgg_tcga',
+                            profiled: true,
+                        } as GenePanelData,
                     ],
-                    "trackLabel": "EGFR",
-                    "data": []
+                    trackLabel: 'EGFR',
+                    data: [],
                 },
                 {
-                    "sample": "TCGA-F6-A8O3-01",
-                    "patient": "TCGA-F6-A8O3",
-                    "study_id": "lgg_tcga",
-                    "uid": "VENHQS1GNi1BOE8zLTAxOmxnZ190Y2dh",
-                    "profiled_in": [
+                    sample: 'TCGA-F6-A8O3-01',
+                    patient: 'TCGA-F6-A8O3',
+                    study_id: 'lgg_tcga',
+                    uid: 'VENHQS1GNi1BOE8zLTAxOmxnZ190Y2dh',
+                    profiled_in: [
                         {
-                            "uniqueSampleKey": "VENHQS1GNi1BOE8zLTAxOmxnZ190Y2dh",
-                            "uniquePatientKey": "VENHQS1GNi1BOE8zOmxnZ190Y2dh",
-                            "molecularProfileId": "lgg_tcga_gistic",
-                            "sampleId": "TCGA-F6-A8O3-01",
-                            "patientId": "TCGA-F6-A8O3",
-                            "studyId": "lgg_tcga",
-                            "profiled": true
-                        } as GenePanelData
+                            uniqueSampleKey: 'VENHQS1GNi1BOE8zLTAxOmxnZ190Y2dh',
+                            uniquePatientKey: 'VENHQS1GNi1BOE8zOmxnZ190Y2dh',
+                            molecularProfileId: 'lgg_tcga_gistic',
+                            sampleId: 'TCGA-F6-A8O3-01',
+                            patientId: 'TCGA-F6-A8O3',
+                            studyId: 'lgg_tcga',
+                            profiled: true,
+                        } as GenePanelData,
                     ],
-                    "not_profiled_in": [
+                    not_profiled_in: [
                         {
-                            "uniqueSampleKey": "VENHQS1GNi1BOE8zLTAxOmxnZ190Y2dh",
-                            "uniquePatientKey": "VENHQS1GNi1BOE8zOmxnZ190Y2dh",
-                            "molecularProfileId": "lgg_tcga_mutations",
-                            "sampleId": "TCGA-F6-A8O3-01",
-                            "patientId": "TCGA-F6-A8O3",
-                            "studyId": "lgg_tcga",
-                            "profiled": false
-                        } as GenePanelData
+                            uniqueSampleKey: 'VENHQS1GNi1BOE8zLTAxOmxnZ190Y2dh',
+                            uniquePatientKey: 'VENHQS1GNi1BOE8zOmxnZ190Y2dh',
+                            molecularProfileId: 'lgg_tcga_mutations',
+                            sampleId: 'TCGA-F6-A8O3-01',
+                            patientId: 'TCGA-F6-A8O3',
+                            studyId: 'lgg_tcga',
+                            profiled: false,
+                        } as GenePanelData,
                     ],
-                    "trackLabel": "EGFR",
-                    "data": []
+                    trackLabel: 'EGFR',
+                    data: [],
                 },
                 {
-                    "sample": "TCGA-DU-6396-01",
-                    "patient": "TCGA-DU-6396",
-                    "study_id": "lgg_tcga",
-                    "uid": "VENHQS1EVS02Mzk2LTAxOmxnZ190Y2dh",
-                    "profiled_in": [],
-                    "not_profiled_in": [
+                    sample: 'TCGA-DU-6396-01',
+                    patient: 'TCGA-DU-6396',
+                    study_id: 'lgg_tcga',
+                    uid: 'VENHQS1EVS02Mzk2LTAxOmxnZ190Y2dh',
+                    profiled_in: [],
+                    not_profiled_in: [
                         {
-                            "uniqueSampleKey": "VENHQS1EVS02Mzk2LTAxOmxnZ190Y2dh",
-                            "uniquePatientKey": "VENHQS1EVS02Mzk2OmxnZ190Y2dh",
-                            "molecularProfileId": "lgg_tcga_gistic",
-                            "sampleId": "TCGA-DU-6396-01",
-                            "patientId": "TCGA-DU-6396",
-                            "studyId": "lgg_tcga",
-                            "profiled": true
+                            uniqueSampleKey: 'VENHQS1EVS02Mzk2LTAxOmxnZ190Y2dh',
+                            uniquePatientKey: 'VENHQS1EVS02Mzk2OmxnZ190Y2dh',
+                            molecularProfileId: 'lgg_tcga_gistic',
+                            sampleId: 'TCGA-DU-6396-01',
+                            patientId: 'TCGA-DU-6396',
+                            studyId: 'lgg_tcga',
+                            profiled: true,
                         } as GenePanelData,
                         {
-                            "uniqueSampleKey": "VENHQS1EVS02Mzk2LTAxOmxnZ190Y2dh",
-                            "uniquePatientKey": "VENHQS1EVS02Mzk2OmxnZ190Y2dh",
-                            "molecularProfileId": "lgg_tcga_mutations",
-                            "sampleId": "TCGA-DU-6396-01",
-                            "patientId": "TCGA-DU-6396",
-                            "studyId": "lgg_tcga",
-                            "profiled": true
-                        } as GenePanelData
+                            uniqueSampleKey: 'VENHQS1EVS02Mzk2LTAxOmxnZ190Y2dh',
+                            uniquePatientKey: 'VENHQS1EVS02Mzk2OmxnZ190Y2dh',
+                            molecularProfileId: 'lgg_tcga_mutations',
+                            sampleId: 'TCGA-DU-6396-01',
+                            patientId: 'TCGA-DU-6396',
+                            studyId: 'lgg_tcga',
+                            profiled: true,
+                        } as GenePanelData,
                     ],
-                    "trackLabel": "EGFR",
-                    "data": []
-                }
+                    trackLabel: 'EGFR',
+                    data: [],
+                },
             ];
 
-            const sampleMolecularProfileIdToMolecularProfile: {[molecularProfileId:string]:MolecularProfile} = {
-                "lgg_tcga_rppa": {
-                    "molecularAlterationType": "PROTEIN_LEVEL",
-                    "datatype": "LOG2-VALUE",
-                    "name": "Protein expression (RPPA)",
-                    "description": "Protein expression measured by reverse-phase protein array",
-                    "showProfileInAnalysisTab": false,
-                    "molecularProfileId": "lgg_tcga_rppa",
-                    "studyId": "lgg_tcga"
+            const sampleMolecularProfileIdToMolecularProfile: {
+                [molecularProfileId: string]: MolecularProfile;
+            } = {
+                lgg_tcga_rppa: {
+                    molecularAlterationType: 'PROTEIN_LEVEL',
+                    datatype: 'LOG2-VALUE',
+                    name: 'Protein expression (RPPA)',
+                    description:
+                        'Protein expression measured by reverse-phase protein array',
+                    showProfileInAnalysisTab: false,
+                    molecularProfileId: 'lgg_tcga_rppa',
+                    studyId: 'lgg_tcga',
+                } as MolecularProfile,
+                lgg_tcga_rppa_Zscores: {
+                    molecularAlterationType: 'PROTEIN_LEVEL',
+                    datatype: 'Z-SCORE',
+                    name: 'Protein expression Z-scores (RPPA)',
+                    description:
+                        'Protein expression, measured by reverse-phase protein array, Z-scores',
+                    showProfileInAnalysisTab: true,
+                    molecularProfileId: 'lgg_tcga_rppa_Zscores',
+                    studyId: 'lgg_tcga',
                 } as MolecularProfile,
-                "lgg_tcga_rppa_Zscores": {
-                    "molecularAlterationType": "PROTEIN_LEVEL",
-                    "datatype": "Z-SCORE",
-                    "name": "Protein expression Z-scores (RPPA)",
-                    "description": "Protein expression, measured by reverse-phase protein array, Z-scores",
-                    "showProfileInAnalysisTab": true,
-                    "molecularProfileId": "lgg_tcga_rppa_Zscores",
-                    "studyId": "lgg_tcga"
+                lgg_tcga_gistic: {
+                    molecularAlterationType: 'COPY_NUMBER_ALTERATION',
+                    datatype: 'DISCRETE',
+                    name: 'Putative copy-number alterations from GISTIC',
+                    description:
+                        'Putative copy-number calls on 513 cases determined using GISTIC 2.0. Values: -2 = homozygous deletion; -1 = hemizygous deletion; 0 = neutral / no change; 1 = gain; 2 = high level amplification.',
+                    showProfileInAnalysisTab: true,
+                    molecularProfileId: 'lgg_tcga_gistic',
+                    studyId: 'lgg_tcga',
                 } as MolecularProfile,
-                "lgg_tcga_gistic": {
-                    "molecularAlterationType": "COPY_NUMBER_ALTERATION",
-                    "datatype": "DISCRETE",
-                    "name": "Putative copy-number alterations from GISTIC",
-                    "description": "Putative copy-number calls on 513 cases determined using GISTIC 2.0. Values: -2 = homozygous deletion; -1 = hemizygous deletion; 0 = neutral / no change; 1 = gain; 2 = high level amplification.",
-                    "showProfileInAnalysisTab": true,
-                    "molecularProfileId": "lgg_tcga_gistic",
-                    "studyId": "lgg_tcga"
+                lgg_tcga_mrna: {
+                    molecularAlterationType: 'MRNA_EXPRESSION',
+                    datatype: 'CONTINUOUS',
+                    name: 'mRNA expression (microarray)',
+                    description:
+                        'Expression levels for 17155 genes in 27 difg cases (Agilent microarray).',
+                    showProfileInAnalysisTab: false,
+                    molecularProfileId: 'lgg_tcga_mrna',
+                    studyId: 'lgg_tcga',
                 } as MolecularProfile,
-                "lgg_tcga_mrna": {
-                    "molecularAlterationType": "MRNA_EXPRESSION",
-                    "datatype": "CONTINUOUS",
-                    "name": "mRNA expression (microarray)",
-                    "description": "Expression levels for 17155 genes in 27 difg cases (Agilent microarray).",
-                    "showProfileInAnalysisTab": false,
-                    "molecularProfileId": "lgg_tcga_mrna",
-                    "studyId": "lgg_tcga"
+                lgg_tcga_mrna_median_Zscores: {
+                    molecularAlterationType: 'MRNA_EXPRESSION',
+                    datatype: 'Z-SCORE',
+                    name: 'mRNA Expression z-Scores (microarray)',
+                    description:
+                        'mRNA z-Scores (Agilent microarray) compared to the expression distribution of each gene tumors that are diploid for this gene.',
+                    showProfileInAnalysisTab: true,
+                    molecularProfileId: 'lgg_tcga_mrna_median_Zscores',
+                    studyId: 'lgg_tcga',
                 } as MolecularProfile,
-                "lgg_tcga_mrna_median_Zscores": {
-                    "molecularAlterationType": "MRNA_EXPRESSION",
-                    "datatype": "Z-SCORE",
-                    "name": "mRNA Expression z-Scores (microarray)",
-                    "description": "mRNA z-Scores (Agilent microarray) compared to the expression distribution of each gene tumors that are diploid for this gene.",
-                    "showProfileInAnalysisTab": true,
-                    "molecularProfileId": "lgg_tcga_mrna_median_Zscores",
-                    "studyId": "lgg_tcga"
+                lgg_tcga_rna_seq_v2_mrna: {
+                    molecularAlterationType: 'MRNA_EXPRESSION',
+                    datatype: 'CONTINUOUS',
+                    name: 'mRNA expression (RNA Seq V2 RSEM)',
+                    description:
+                        'Expression levels for 20532 genes in 530 difg cases (RNA Seq V2 RSEM).',
+                    showProfileInAnalysisTab: false,
+                    molecularProfileId: 'lgg_tcga_rna_seq_v2_mrna',
+                    studyId: 'lgg_tcga',
                 } as MolecularProfile,
-                "lgg_tcga_rna_seq_v2_mrna": {
-                    "molecularAlterationType": "MRNA_EXPRESSION",
-                    "datatype": "CONTINUOUS",
-                    "name": "mRNA expression (RNA Seq V2 RSEM)",
-                    "description": "Expression levels for 20532 genes in 530 difg cases (RNA Seq V2 RSEM).",
-                    "showProfileInAnalysisTab": false,
-                    "molecularProfileId": "lgg_tcga_rna_seq_v2_mrna",
-                    "studyId": "lgg_tcga"
+                lgg_tcga_rna_seq_v2_mrna_median_Zscores: {
+                    molecularAlterationType: 'MRNA_EXPRESSION',
+                    datatype: 'Z-SCORE',
+                    name: 'mRNA Expression z-Scores (RNA Seq V2 RSEM)',
+                    description:
+                        'mRNA z-Scores (RNA Seq V2 RSEM) compared to the expression distribution of each gene tumors that are diploid for this gene.',
+                    showProfileInAnalysisTab: true,
+                    molecularProfileId:
+                        'lgg_tcga_rna_seq_v2_mrna_median_Zscores',
+                    studyId: 'lgg_tcga',
                 } as MolecularProfile,
-                "lgg_tcga_rna_seq_v2_mrna_median_Zscores": {
-                    "molecularAlterationType": "MRNA_EXPRESSION",
-                    "datatype": "Z-SCORE",
-                    "name": "mRNA Expression z-Scores (RNA Seq V2 RSEM)",
-                    "description": "mRNA z-Scores (RNA Seq V2 RSEM) compared to the expression distribution of each gene tumors that are diploid for this gene.",
-                    "showProfileInAnalysisTab": true,
-                    "molecularProfileId": "lgg_tcga_rna_seq_v2_mrna_median_Zscores",
-                    "studyId": "lgg_tcga"
+                lgg_tcga_linear_CNA: {
+                    molecularAlterationType: 'COPY_NUMBER_ALTERATION',
+                    datatype: 'CONTINUOUS',
+                    name: 'Relative linear copy-number values',
+                    description:
+                        'Relative linear copy-number values for each gene (from Affymetrix SNP6).',
+                    showProfileInAnalysisTab: false,
+                    molecularProfileId: 'lgg_tcga_linear_CNA',
+                    studyId: 'lgg_tcga',
                 } as MolecularProfile,
-                "lgg_tcga_linear_CNA": {
-                    "molecularAlterationType": "COPY_NUMBER_ALTERATION",
-                    "datatype": "CONTINUOUS",
-                    "name": "Relative linear copy-number values",
-                    "description": "Relative linear copy-number values for each gene (from Affymetrix SNP6).",
-                    "showProfileInAnalysisTab": false,
-                    "molecularProfileId": "lgg_tcga_linear_CNA",
-                    "studyId": "lgg_tcga"
+                lgg_tcga_methylation_hm450: {
+                    molecularAlterationType: 'METHYLATION',
+                    datatype: 'CONTINUOUS',
+                    name: 'Methylation (HM450)',
+                    description:
+                        'Methylation (HM450) beta-values for genes in 530 cases. For genes with multiple methylation probes, the probe most anti-correlated with expression.',
+                    showProfileInAnalysisTab: false,
+                    molecularProfileId: 'lgg_tcga_methylation_hm450',
+                    studyId: 'lgg_tcga',
                 } as MolecularProfile,
-                "lgg_tcga_methylation_hm450": {
-                    "molecularAlterationType": "METHYLATION",
-                    "datatype": "CONTINUOUS",
-                    "name": "Methylation (HM450)",
-                    "description": "Methylation (HM450) beta-values for genes in 530 cases. For genes with multiple methylation probes, the probe most anti-correlated with expression.",
-                    "showProfileInAnalysisTab": false,
-                    "molecularProfileId": "lgg_tcga_methylation_hm450",
-                    "studyId": "lgg_tcga"
+                lgg_tcga_mutations: {
+                    molecularAlterationType: 'MUTATION_EXTENDED',
+                    datatype: 'MAF',
+                    name: 'Mutations',
+                    description:
+                        'Mutation data from whole exome sequencing. Mutation packager: LGG/20160128/gdac.broadinstitute.org_LGG.Mutation_Packager_Calls.Level_3.2016012800.0.0.tar.gz.',
+                    showProfileInAnalysisTab: true,
+                    molecularProfileId: 'lgg_tcga_mutations',
+                    studyId: 'lgg_tcga',
                 } as MolecularProfile,
-                "lgg_tcga_mutations": {
-                    "molecularAlterationType": "MUTATION_EXTENDED",
-                    "datatype": "MAF",
-                    "name": "Mutations",
-                    "description": "Mutation data from whole exome sequencing. Mutation packager: LGG/20160128/gdac.broadinstitute.org_LGG.Mutation_Packager_Calls.Level_3.2016012800.0.0.tar.gz.",
-                    "showProfileInAnalysisTab": true,
-                    "molecularProfileId": "lgg_tcga_mutations",
-                    "studyId": "lgg_tcga"
-                } as MolecularProfile
             };
 
             const oqlData0 = updateOqlData(
                 notProfiledGeneticTrackDatum[0],
                 sampleOql,
-                sampleMolecularProfileIdToMolecularProfile);
-
-            assert.equal(oqlData0.isCnaNotProfiled, false,
-                "cna is profiled for the zero not profiled GeneticTrackDatum");
-            assert.equal(oqlData0.isFusionNotProfiled, false,
-                "fusion is profiled for the zero not profiled GeneticTrackDatum");
-            assert.equal(oqlData0.isMrnaExpNotProfiled, true,
-                "mrna is profiled for the zero not profiled GeneticTrackDatum");
-            assert.equal(oqlData0.isMutationNotProfiled, false,
-                "mutation is profiled for the zero not profiled GeneticTrackDatum");
-            assert.equal(oqlData0.isProteinLevelNotProfiled, true,
-                "protein level is profiled for the zero not profiled GeneticTrackDatum");
+                sampleMolecularProfileIdToMolecularProfile
+            );
+
+            assert.equal(
+                oqlData0.isCnaNotProfiled,
+                false,
+                'cna is profiled for the zero not profiled GeneticTrackDatum'
+            );
+            assert.equal(
+                oqlData0.isFusionNotProfiled,
+                false,
+                'fusion is profiled for the zero not profiled GeneticTrackDatum'
+            );
+            assert.equal(
+                oqlData0.isMrnaExpNotProfiled,
+                true,
+                'mrna is profiled for the zero not profiled GeneticTrackDatum'
+            );
+            assert.equal(
+                oqlData0.isMutationNotProfiled,
+                false,
+                'mutation is profiled for the zero not profiled GeneticTrackDatum'
+            );
+            assert.equal(
+                oqlData0.isProteinLevelNotProfiled,
+                true,
+                'protein level is profiled for the zero not profiled GeneticTrackDatum'
+            );
 
             const oqlData1 = updateOqlData(
                 notProfiledGeneticTrackDatum[1],
                 sampleOql,
-                sampleMolecularProfileIdToMolecularProfile);
-
-            assert.equal(oqlData1.isCnaNotProfiled, false,
-                "cna is profiled for the one not profiled GeneticTrackDatum");
-            assert.equal(oqlData1.isFusionNotProfiled, true,
-                "fusion is not profiled for the one not profiled GeneticTrackDatum");
-            assert.equal(oqlData1.isMrnaExpNotProfiled, true,
-                "mrna is profiled for the one not profiled GeneticTrackDatum");
-            assert.equal(oqlData1.isMutationNotProfiled, true,
-                "mutation is not profiled for the one not profiled GeneticTrackDatum");
-            assert.equal(oqlData1.isProteinLevelNotProfiled, true,
-                "protein level is profiled for the one not profiled GeneticTrackDatum");
+                sampleMolecularProfileIdToMolecularProfile
+            );
+
+            assert.equal(
+                oqlData1.isCnaNotProfiled,
+                false,
+                'cna is profiled for the one not profiled GeneticTrackDatum'
+            );
+            assert.equal(
+                oqlData1.isFusionNotProfiled,
+                true,
+                'fusion is not profiled for the one not profiled GeneticTrackDatum'
+            );
+            assert.equal(
+                oqlData1.isMrnaExpNotProfiled,
+                true,
+                'mrna is profiled for the one not profiled GeneticTrackDatum'
+            );
+            assert.equal(
+                oqlData1.isMutationNotProfiled,
+                true,
+                'mutation is not profiled for the one not profiled GeneticTrackDatum'
+            );
+            assert.equal(
+                oqlData1.isProteinLevelNotProfiled,
+                true,
+                'protein level is profiled for the one not profiled GeneticTrackDatum'
+            );
 
             const oqlData2 = updateOqlData(
                 notProfiledGeneticTrackDatum[2],
                 sampleOql,
-                sampleMolecularProfileIdToMolecularProfile);
-
-            assert.equal(oqlData2.isCnaNotProfiled, true,
-                "cna is not profiled for the two not profiled GeneticTrackDatum");
-            assert.equal(oqlData2.isFusionNotProfiled, true,
-                "fusion is not profiled for the two not profiled GeneticTrackDatum");
-            assert.equal(oqlData2.isMrnaExpNotProfiled, true,
-                "mrna is profiled for the two not profiled GeneticTrackDatum");
-            assert.equal(oqlData2.isMutationNotProfiled, true,
-                "mutation is not profiled for the two not profiled GeneticTrackDatum");
-            assert.equal(oqlData2.isProteinLevelNotProfiled, true,
-                "protein level is profiled for the two not profiled GeneticTrackDatum");
+                sampleMolecularProfileIdToMolecularProfile
+            );
+
+            assert.equal(
+                oqlData2.isCnaNotProfiled,
+                true,
+                'cna is not profiled for the two not profiled GeneticTrackDatum'
+            );
+            assert.equal(
+                oqlData2.isFusionNotProfiled,
+                true,
+                'fusion is not profiled for the two not profiled GeneticTrackDatum'
+            );
+            assert.equal(
+                oqlData2.isMrnaExpNotProfiled,
+                true,
+                'mrna is profiled for the two not profiled GeneticTrackDatum'
+            );
+            assert.equal(
+                oqlData2.isMutationNotProfiled,
+                true,
+                'mutation is not profiled for the two not profiled GeneticTrackDatum'
+            );
+            assert.equal(
+                oqlData2.isProteinLevelNotProfiled,
+                true,
+                'protein level is profiled for the two not profiled GeneticTrackDatum'
+            );
         });
     });
 
     describe('molecularProfileSortingOrder', () => {
         it('should return specific number for 7 specific molecular profile types', () => {
-            assert.equal(decideMolecularProfileSortingOrder("MUTATION_EXTENDED"), 1,
-                "MUTATION_EXTENDED should be the 1st type");
-            assert.equal(decideMolecularProfileSortingOrder("COPY_NUMBER_ALTERATION"), 2,
-                "COPY_NUMBER_ALTERATION should be the 2nd type");
-            assert.equal(decideMolecularProfileSortingOrder("GENESET_SCORE"), 3,
-                "GENESET_SCORE should be the 3rd type");
-            assert.equal(decideMolecularProfileSortingOrder("MRNA_EXPRESSION"), 4,
-                "MRNA_EXPRESSION should be the 4th type");
-            assert.equal(decideMolecularProfileSortingOrder("METHYLATION"), 5,
-                "METHYLATION should be the 5th type");
-            assert.equal(decideMolecularProfileSortingOrder("METHYLATION_BINARY"), 6,
-                "METHYLATION_BINARY should be the 6th type");
-            assert.equal(decideMolecularProfileSortingOrder("PROTEIN_LEVEL"), 7,
-                "PROTEIN_LEVEL should be the 7th type");
+            assert.equal(
+                decideMolecularProfileSortingOrder('MUTATION_EXTENDED'),
+                1,
+                'MUTATION_EXTENDED should be the 1st type'
+            );
+            assert.equal(
+                decideMolecularProfileSortingOrder('COPY_NUMBER_ALTERATION'),
+                2,
+                'COPY_NUMBER_ALTERATION should be the 2nd type'
+            );
+            assert.equal(
+                decideMolecularProfileSortingOrder('GENESET_SCORE'),
+                3,
+                'GENESET_SCORE should be the 3rd type'
+            );
+            assert.equal(
+                decideMolecularProfileSortingOrder('MRNA_EXPRESSION'),
+                4,
+                'MRNA_EXPRESSION should be the 4th type'
+            );
+            assert.equal(
+                decideMolecularProfileSortingOrder('METHYLATION'),
+                5,
+                'METHYLATION should be the 5th type'
+            );
+            assert.equal(
+                decideMolecularProfileSortingOrder('METHYLATION_BINARY'),
+                6,
+                'METHYLATION_BINARY should be the 6th type'
+            );
+            assert.equal(
+                decideMolecularProfileSortingOrder('PROTEIN_LEVEL'),
+                7,
+                'PROTEIN_LEVEL should be the 7th type'
+            );
         });
 
         it('should return maximum number for the other types', () => {
-            assert.equal(decideMolecularProfileSortingOrder("FUSION"), Number.MAX_VALUE,
-                "FUSION should be put to the end");
+            assert.equal(
+                decideMolecularProfileSortingOrder('FUSION'),
+                Number.MAX_VALUE,
+                'FUSION should be put to the end'
+            );
         });
     });
 });
diff --git a/src/pages/resultsView/download/DownloadUtils.ts b/src/pages/resultsView/download/DownloadUtils.ts
index 704d235e91f..9fc1d5ef9b2 100644
--- a/src/pages/resultsView/download/DownloadUtils.ts
+++ b/src/pages/resultsView/download/DownloadUtils.ts
@@ -1,31 +1,51 @@
 import * as _ from 'lodash';
 import {
-    AlterationTypeConstants, AnnotatedExtendedAlteration, CaseAggregatedData, ExtendedAlteration,
+    AlterationTypeConstants,
+    AnnotatedExtendedAlteration,
+    CaseAggregatedData,
+    ExtendedAlteration,
     IQueriedCaseData,
-    IQueriedMergedTrackCaseData
-} from "../ResultsViewPageStore";
+    IQueriedMergedTrackCaseData,
+} from '../ResultsViewPageStore';
+import { alterationInfoForCaseAggregatedDataByOQLLine } from 'shared/components/oncoprint/OncoprintUtils';
+import { makeGeneticTrackData } from 'shared/components/oncoprint/DataUtils';
+import { GeneticTrackDatum } from 'shared/components/oncoprint/Oncoprint';
 import {
-    alterationInfoForCaseAggregatedDataByOQLLine
-} from "shared/components/oncoprint/OncoprintUtils";
-import {makeGeneticTrackData} from "shared/components/oncoprint/DataUtils";
-import {GeneticTrackDatum} from "shared/components/oncoprint/Oncoprint";
-import {Sample, Gene, MolecularProfile, GenePanelData} from "shared/api/generated/CBioPortalAPI";
-import {ICaseAlteration, IOqlData, ISubAlteration} from "./CaseAlterationTable";
-import {IGeneAlteration} from "./GeneAlterationTable";
-import {CoverageInformation, getSingleGeneResultKey, getMultipleGeneResultKey} from "../ResultsViewPageStoreUtils";
-import { OQLLineFilterOutput, MergedTrackLineFilterOutput } from 'shared/lib/oql/oqlfilter';
+    Sample,
+    Gene,
+    MolecularProfile,
+    GenePanelData,
+} from 'shared/api/generated/CBioPortalAPI';
+import {
+    ICaseAlteration,
+    IOqlData,
+    ISubAlteration,
+} from './CaseAlterationTable';
+import { IGeneAlteration } from './GeneAlterationTable';
+import {
+    CoverageInformation,
+    getSingleGeneResultKey,
+    getMultipleGeneResultKey,
+} from '../ResultsViewPageStoreUtils';
+import {
+    OQLLineFilterOutput,
+    MergedTrackLineFilterOutput,
+} from 'shared/lib/oql/oqlfilter';
 
 export interface IDownloadFileRow {
     studyId: string;
     patientId: string;
     sampleId: string;
-    alterationData: {[gene: string]: string[]};
+    alterationData: { [gene: string]: string[] };
 }
 
-export function generateOqlData(datum: GeneticTrackDatum,
-                                geneAlterationDataByGene?: {[gene: string]: IGeneAlteration},
-                                molecularProfileIdToMolecularProfile?: {[molecularProfileId:string]:MolecularProfile}): IOqlData
-{
+export function generateOqlData(
+    datum: GeneticTrackDatum,
+    geneAlterationDataByGene?: { [gene: string]: IGeneAlteration },
+    molecularProfileIdToMolecularProfile?: {
+        [molecularProfileId: string]: MolecularProfile;
+    }
+): IOqlData {
     const proteinChanges: string[] = [];
     const fusions: string[] = [];
     const cnaAlterations: ISubAlteration[] = [];
@@ -34,60 +54,60 @@ export function generateOqlData(datum: GeneticTrackDatum,
     const alterationTypes: string[] = [];
 
     // there might be multiple alterations for a single sample
-    for (const alteration of datum.data)
-    {
-        const molecularAlterationType = alteration.molecularProfileAlterationType;
+    for (const alteration of datum.data) {
+        const molecularAlterationType =
+            alteration.molecularProfileAlterationType;
         const alterationSubType = alteration.alterationSubType.toUpperCase();
-        switch (molecularAlterationType)
-        {
+        switch (molecularAlterationType) {
             case AlterationTypeConstants.COPY_NUMBER_ALTERATION:
                 if (alterationSubType.length > 0) {
                     cnaAlterations.push({
                         type: alterationSubType,
-                        value: alteration.value
+                        value: alteration.value,
                     });
-                    alterationTypes.push("CNA");
+                    alterationTypes.push('CNA');
                 }
                 break;
             case AlterationTypeConstants.MRNA_EXPRESSION:
                 if (alterationSubType.length > 0) {
                     mrnaExpressions.push({
                         type: alterationSubType,
-                        value: alteration.value
+                        value: alteration.value,
                     });
-                    alterationTypes.push("EXP");
+                    alterationTypes.push('EXP');
                 }
                 break;
             case AlterationTypeConstants.PROTEIN_LEVEL:
                 if (alterationSubType.length > 0) {
                     proteinLevels.push({
                         type: alterationSubType,
-                        value: alteration.value
+                        value: alteration.value,
                     });
-                    alterationTypes.push("PROT");
+                    alterationTypes.push('PROT');
                 }
                 break;
             case AlterationTypeConstants.MUTATION_EXTENDED:
-                if (alteration.mutationType.toLowerCase().includes("fusion")) {
+                if (alteration.mutationType.toLowerCase().includes('fusion')) {
                     fusions.push(alteration.proteinChange);
-                    alterationTypes.push("FUSION");
-                }
-                else {
+                    alterationTypes.push('FUSION');
+                } else {
                     proteinChanges.push(alteration.proteinChange);
-                    alterationTypes.push("MUT");
+                    alterationTypes.push('MUT');
                 }
                 break;
         }
     }
 
-    return ({
+    return {
         // by default assume it is sequenced if the label is not a recognised
         // gene symbol or if no gene alteration data exists for the gene; it
         // should always be a gene symbol as long as the download tab doesn't
         // use multi-gene tracks
-        sequenced: geneAlterationDataByGene && geneAlterationDataByGene[datum.trackLabel]
-            ? geneAlterationDataByGene[datum.trackLabel].sequenced > 0
-            : true,
+        sequenced:
+            geneAlterationDataByGene &&
+            geneAlterationDataByGene[datum.trackLabel]
+                ? geneAlterationDataByGene[datum.trackLabel].sequenced > 0
+                : true,
         geneSymbol: datum.trackLabel,
         mutation: proteinChanges,
         fusion: fusions,
@@ -99,14 +119,17 @@ export function generateOqlData(datum: GeneticTrackDatum,
         isCnaNotProfiled: false,
         isMrnaExpNotProfiled: false,
         isProteinLevelNotProfiled: false,
-        alterationTypes: alterationTypes
-    });
+        alterationTypes: alterationTypes,
+    };
 }
 
-export function updateOqlData(datum: GeneticTrackDatum,
+export function updateOqlData(
+    datum: GeneticTrackDatum,
     oql: IOqlData,
-    molecularProfileIdToMolecularProfile?: {[molecularProfileId:string]:MolecularProfile}): IOqlData
-{
+    molecularProfileIdToMolecularProfile?: {
+        [molecularProfileId: string]: MolecularProfile;
+    }
+): IOqlData {
     let isMutationNotProfiled = true;
     let isFusionNotProfiled = true;
     let isCnaNotProfiled = true;
@@ -114,15 +137,14 @@ export function updateOqlData(datum: GeneticTrackDatum,
     let isProteinLevelNotProfiled = true;
 
     //record the profile information
-    if (datum.profiled_in)
-    {
-        for (const profile of datum.profiled_in)
-        {
-            if (molecularProfileIdToMolecularProfile)
-            {
-                const molecularAlterationType = molecularProfileIdToMolecularProfile[profile.molecularProfileId].molecularAlterationType;
-                switch (molecularAlterationType)
-                {
+    if (datum.profiled_in) {
+        for (const profile of datum.profiled_in) {
+            if (molecularProfileIdToMolecularProfile) {
+                const molecularAlterationType =
+                    molecularProfileIdToMolecularProfile[
+                        profile.molecularProfileId
+                    ].molecularAlterationType;
+                switch (molecularAlterationType) {
                     case AlterationTypeConstants.COPY_NUMBER_ALTERATION:
                         isCnaNotProfiled = false;
                         break;
@@ -137,7 +159,7 @@ export function updateOqlData(datum: GeneticTrackDatum,
                     case AlterationTypeConstants.FUSION:
                         isFusionNotProfiled = false;
                         break;
-                }                
+                }
             }
         }
     }
@@ -151,110 +173,160 @@ export function updateOqlData(datum: GeneticTrackDatum,
 }
 
 export function generateGeneAlterationData(
-    caseAggregatedDataByOQLLine?: IQueriedCaseData<AnnotatedExtendedAlteration>[],
-    sequencedSampleKeysByGene: {[hugoGeneSymbol:string]:string[]} = {}): IGeneAlteration[]
-{
-    return (caseAggregatedDataByOQLLine && !_.isEmpty(sequencedSampleKeysByGene)) ?
-        caseAggregatedDataByOQLLine.map(data => {
-            const info = alterationInfoForCaseAggregatedDataByOQLLine(
-                true, data, sequencedSampleKeysByGene, {});
-
-            return {
-                gene: data.oql.gene,
-                oqlLine: data.oql.oql_line,
-                altered: info.altered,
-                sequenced: info.sequenced,
-                percentAltered: info.percent
-            };
-        }) :
-        [];
+    caseAggregatedDataByOQLLine?: IQueriedCaseData<
+        AnnotatedExtendedAlteration
+    >[],
+    sequencedSampleKeysByGene: { [hugoGeneSymbol: string]: string[] } = {}
+): IGeneAlteration[] {
+    return caseAggregatedDataByOQLLine && !_.isEmpty(sequencedSampleKeysByGene)
+        ? caseAggregatedDataByOQLLine.map(data => {
+              const info = alterationInfoForCaseAggregatedDataByOQLLine(
+                  true,
+                  data,
+                  sequencedSampleKeysByGene,
+                  {}
+              );
+
+              return {
+                  gene: data.oql.gene,
+                  oqlLine: data.oql.oql_line,
+                  altered: info.altered,
+                  sequenced: info.sequenced,
+                  percentAltered: info.percent,
+              };
+          })
+        : [];
 }
 
-export function stringify2DArray(data: string[][], colDelimiter: string = "\t", rowDelimiter: string = "\n")
-{
+export function stringify2DArray(
+    data: string[][],
+    colDelimiter: string = '\t',
+    rowDelimiter: string = '\n'
+) {
     return data.map(mutation => mutation.join(colDelimiter)).join(rowDelimiter);
 }
 
-export function generateMutationData(unfilteredCaseAggregatedData?: CaseAggregatedData<ExtendedAlteration>):
-    {[key: string]: ExtendedAlteration[]}
-{
+export function generateMutationData(
+    unfilteredCaseAggregatedData?: CaseAggregatedData<ExtendedAlteration>
+): { [key: string]: ExtendedAlteration[] } {
     const sampleFilter = (alteration: ExtendedAlteration) => {
         return (
-            alteration.molecularProfileAlterationType === AlterationTypeConstants.MUTATION_EXTENDED ||
-            alteration.molecularProfileAlterationType === AlterationTypeConstants.FUSION
+            alteration.molecularProfileAlterationType ===
+                AlterationTypeConstants.MUTATION_EXTENDED ||
+            alteration.molecularProfileAlterationType ===
+                AlterationTypeConstants.FUSION
         );
     };
 
-    return unfilteredCaseAggregatedData ?
-        generateSampleAlterationDataByGene(unfilteredCaseAggregatedData, sampleFilter) : {};
+    return unfilteredCaseAggregatedData
+        ? generateSampleAlterationDataByGene(
+              unfilteredCaseAggregatedData,
+              sampleFilter
+          )
+        : {};
 }
 
-export function generateMutationDownloadData(sampleAlterationDataByGene: {[key: string]: ExtendedAlteration[]},
-                                             samples: Sample[] = [],
-                                             genes: Gene[] = []): string[][]
-{
-    return sampleAlterationDataByGene ?
-        generateDownloadData(sampleAlterationDataByGene, samples, genes, extractMutationValue) : [];
+export function generateMutationDownloadData(
+    sampleAlterationDataByGene: { [key: string]: ExtendedAlteration[] },
+    samples: Sample[] = [],
+    genes: Gene[] = []
+): string[][] {
+    return sampleAlterationDataByGene
+        ? generateDownloadData(
+              sampleAlterationDataByGene,
+              samples,
+              genes,
+              extractMutationValue
+          )
+        : [];
 }
 
-export function generateMrnaData(unfilteredCaseAggregatedData?: CaseAggregatedData<ExtendedAlteration>):
-    {[key: string]: ExtendedAlteration[]}
-{
+export function generateMrnaData(
+    unfilteredCaseAggregatedData?: CaseAggregatedData<ExtendedAlteration>
+): { [key: string]: ExtendedAlteration[] } {
     const sampleFilter = (alteration: ExtendedAlteration) => {
-        return alteration.molecularProfileAlterationType === AlterationTypeConstants.MRNA_EXPRESSION;
+        return (
+            alteration.molecularProfileAlterationType ===
+            AlterationTypeConstants.MRNA_EXPRESSION
+        );
     };
 
-    return unfilteredCaseAggregatedData ?
-        generateSampleAlterationDataByGene(unfilteredCaseAggregatedData, sampleFilter) : {};
+    return unfilteredCaseAggregatedData
+        ? generateSampleAlterationDataByGene(
+              unfilteredCaseAggregatedData,
+              sampleFilter
+          )
+        : {};
 }
 
-
-export function generateProteinData(unfilteredCaseAggregatedData?: CaseAggregatedData<ExtendedAlteration>):
-    {[key: string]: ExtendedAlteration[]}
-{
+export function generateProteinData(
+    unfilteredCaseAggregatedData?: CaseAggregatedData<ExtendedAlteration>
+): { [key: string]: ExtendedAlteration[] } {
     const sampleFilter = (alteration: ExtendedAlteration) => {
-        return alteration.molecularProfileAlterationType === AlterationTypeConstants.PROTEIN_LEVEL;
+        return (
+            alteration.molecularProfileAlterationType ===
+            AlterationTypeConstants.PROTEIN_LEVEL
+        );
     };
 
-    return unfilteredCaseAggregatedData ?
-        generateSampleAlterationDataByGene(unfilteredCaseAggregatedData, sampleFilter) : {};
+    return unfilteredCaseAggregatedData
+        ? generateSampleAlterationDataByGene(
+              unfilteredCaseAggregatedData,
+              sampleFilter
+          )
+        : {};
 }
 
-export function generateCnaData(unfilteredCaseAggregatedData?: CaseAggregatedData<ExtendedAlteration>):
-    {[key: string]: ExtendedAlteration[]}
-{
+export function generateCnaData(
+    unfilteredCaseAggregatedData?: CaseAggregatedData<ExtendedAlteration>
+): { [key: string]: ExtendedAlteration[] } {
     const sampleFilter = (alteration: ExtendedAlteration) => {
-        return alteration.molecularProfileAlterationType === AlterationTypeConstants.COPY_NUMBER_ALTERATION;
+        return (
+            alteration.molecularProfileAlterationType ===
+            AlterationTypeConstants.COPY_NUMBER_ALTERATION
+        );
     };
 
-    return unfilteredCaseAggregatedData ?
-        generateSampleAlterationDataByGene(unfilteredCaseAggregatedData, sampleFilter) : {};
+    return unfilteredCaseAggregatedData
+        ? generateSampleAlterationDataByGene(
+              unfilteredCaseAggregatedData,
+              sampleFilter
+          )
+        : {};
 }
 
-export function generateOtherMolecularProfileData(molecularProfileId:string[], unfilteredCaseAggregatedData?: CaseAggregatedData<ExtendedAlteration>):
-    {[key: string]: ExtendedAlteration[]}
-{
+export function generateOtherMolecularProfileData(
+    molecularProfileId: string[],
+    unfilteredCaseAggregatedData?: CaseAggregatedData<ExtendedAlteration>
+): { [key: string]: ExtendedAlteration[] } {
     const sampleFilter = (alteration: ExtendedAlteration) => {
         return molecularProfileId.includes(alteration.molecularProfileId);
     };
 
-    return unfilteredCaseAggregatedData ?
-        generateSampleAlterationDataByGene(unfilteredCaseAggregatedData, sampleFilter) : {};
+    return unfilteredCaseAggregatedData
+        ? generateSampleAlterationDataByGene(
+              unfilteredCaseAggregatedData,
+              sampleFilter
+          )
+        : {};
 }
 
-export function generateOtherMolecularProfileDownloadData(sampleAlterationDataByGene: {[key: string]: ExtendedAlteration[]},
-                                             samples: Sample[] = [],
-                                             genes: Gene[] = []): string[][]
-{
-    return sampleAlterationDataByGene ?
-        generateDownloadData(sampleAlterationDataByGene, samples, genes) : [];
+export function generateOtherMolecularProfileDownloadData(
+    sampleAlterationDataByGene: { [key: string]: ExtendedAlteration[] },
+    samples: Sample[] = [],
+    genes: Gene[] = []
+): string[][] {
+    return sampleAlterationDataByGene
+        ? generateDownloadData(sampleAlterationDataByGene, samples, genes)
+        : [];
 }
 
-export function generateSampleAlterationDataByGene(unfilteredCaseAggregatedData: CaseAggregatedData<ExtendedAlteration>,
-                                                   sampleFilter?: (alteration: ExtendedAlteration) => boolean): {[key: string]: ExtendedAlteration[]}
-{
+export function generateSampleAlterationDataByGene(
+    unfilteredCaseAggregatedData: CaseAggregatedData<ExtendedAlteration>,
+    sampleFilter?: (alteration: ExtendedAlteration) => boolean
+): { [key: string]: ExtendedAlteration[] } {
     // key => gene + uniqueSampleKey
-    const sampleDataByGene: {[key: string]: ExtendedAlteration[]} = {};
+    const sampleDataByGene: { [key: string]: ExtendedAlteration[] } = {};
 
     _.values(unfilteredCaseAggregatedData.samples).forEach(alterations => {
         alterations.forEach(alteration => {
@@ -271,13 +343,14 @@ export function generateSampleAlterationDataByGene(unfilteredCaseAggregatedData:
     return sampleDataByGene;
 }
 
-export function generateDownloadFileRows(sampleAlterationDataByGene: {[key: string]: ExtendedAlteration[]},
-                                         geneSymbols: string[],
-                                         sampleIndex: {[sampleKey: string]: Sample},
-                                         sampleKeys: string[],
-                                         extractValue?: (alteration: ExtendedAlteration) => string): {[sampleKey: string]: IDownloadFileRow}
-{
-    const rows: {[sampleKey: string]: IDownloadFileRow} = {};
+export function generateDownloadFileRows(
+    sampleAlterationDataByGene: { [key: string]: ExtendedAlteration[] },
+    geneSymbols: string[],
+    sampleIndex: { [sampleKey: string]: Sample },
+    sampleKeys: string[],
+    extractValue?: (alteration: ExtendedAlteration) => string
+): { [sampleKey: string]: IDownloadFileRow } {
+    const rows: { [sampleKey: string]: IDownloadFileRow } = {};
 
     sampleKeys.forEach(sampleKey => {
         const sample = sampleIndex[sampleKey];
@@ -286,7 +359,7 @@ export function generateDownloadFileRows(sampleAlterationDataByGene: {[key: stri
             studyId: sample.studyId,
             sampleId: sample.sampleId,
             patientId: sample.patientId,
-            alterationData: {}
+            alterationData: {},
         };
 
         rows[sampleKey] = row;
@@ -298,7 +371,9 @@ export function generateDownloadFileRows(sampleAlterationDataByGene: {[key: stri
 
             if (sampleAlterationDataByGene[key]) {
                 sampleAlterationDataByGene[key].forEach(alteration => {
-                    const value = extractValue ? extractValue(alteration) : String(alteration.value);
+                    const value = extractValue
+                        ? extractValue(alteration)
+                        : String(alteration.value);
                     row.alterationData[gene].push(value);
                 });
             }
@@ -308,12 +383,13 @@ export function generateDownloadFileRows(sampleAlterationDataByGene: {[key: stri
     return rows;
 }
 
-export function generateDownloadData(sampleAlterationDataByGene: {[key: string]: ExtendedAlteration[]},
-                                     samples: Sample[] = [],
-                                     genes: Gene[] = [],
-                                     extractValue?: (alteration:ExtendedAlteration) => string,
-                                     formatData?: (data: string[]) => string)
-{
+export function generateDownloadData(
+    sampleAlterationDataByGene: { [key: string]: ExtendedAlteration[] },
+    samples: Sample[] = [],
+    genes: Gene[] = [],
+    extractValue?: (alteration: ExtendedAlteration) => string,
+    formatData?: (data: string[]) => string
+) {
     const geneSymbols = genes.map(gene => gene.hugoGeneSymbol);
 
     // we need the sample index for better performance
@@ -321,12 +397,18 @@ export function generateDownloadData(sampleAlterationDataByGene: {[key: string]:
     const sampleKeys = samples.map(sample => sample.uniqueSampleKey);
 
     // generate row data (keyed by uniqueSampleKey)
-    const rows = generateDownloadFileRows(sampleAlterationDataByGene, geneSymbols, sampleIndex, sampleKeys, extractValue);
+    const rows = generateDownloadFileRows(
+        sampleAlterationDataByGene,
+        geneSymbols,
+        sampleIndex,
+        sampleKeys,
+        extractValue
+    );
 
     const downloadData: string[][] = [];
 
     // add headers
-    downloadData.push(["STUDY_ID", "SAMPLE_ID"].concat(geneSymbols));
+    downloadData.push(['STUDY_ID', 'SAMPLE_ID'].concat(geneSymbols));
 
     // convert row data into a 2D array of strings
     sampleKeys.forEach(sampleKey => {
@@ -337,9 +419,9 @@ export function generateDownloadData(sampleAlterationDataByGene: {[key: string]:
         row.push(rowData.sampleId);
 
         geneSymbols.forEach(gene => {
-            const formattedValue = formatData ?
-                formatData(rowData.alterationData[gene]) : // if provided format with the custom data formatter
-                rowData.alterationData[gene].join(" ") || "NA"; // else, default format: space delimited join
+            const formattedValue = formatData
+                ? formatData(rowData.alterationData[gene]) // if provided format with the custom data formatter
+                : rowData.alterationData[gene].join(' ') || 'NA'; // else, default format: space delimited join
 
             row.push(formattedValue);
         });
@@ -352,49 +434,75 @@ export function generateDownloadData(sampleAlterationDataByGene: {[key: string]:
 
 export function generateCaseAlterationData(
     oqlQuery: string,
-    selectedMolecularProfiles:MolecularProfile[],
-    caseAggregatedDataByOQLLine?: IQueriedCaseData<AnnotatedExtendedAlteration>[],
+    selectedMolecularProfiles: MolecularProfile[],
+    caseAggregatedDataByOQLLine?: IQueriedCaseData<
+        AnnotatedExtendedAlteration
+    >[],
     caseAggregatedDataByUnflattenedOQLLine?: IQueriedMergedTrackCaseData[],
     genePanelInformation?: CoverageInformation,
     samples: Sample[] = [],
-    geneAlterationDataByGene?: {[gene: string]: IGeneAlteration},
-    molecularProfileIdToMolecularProfile?: {[molecularProfileId:string]:MolecularProfile}
+    geneAlterationDataByGene?: { [gene: string]: IGeneAlteration },
+    molecularProfileIdToMolecularProfile?: {
+        [molecularProfileId: string]: MolecularProfile;
+    }
 ): ICaseAlteration[] {
-    const caseAlterationData: {[studyCaseId: string] : ICaseAlteration} = {};
+    const caseAlterationData: { [studyCaseId: string]: ICaseAlteration } = {};
 
     // put gene data into oqlDataByGene
-    if (caseAggregatedDataByOQLLine &&
-        genePanelInformation)
-    {
+    if (caseAggregatedDataByOQLLine && genePanelInformation) {
         // we need the sample index for better performance
         const sampleIndex = _.keyBy(samples, 'uniqueSampleKey');
 
         caseAggregatedDataByOQLLine.forEach(data => {
             const geneticTrackData = makeGeneticTrackData(
-                data.cases.samples, data.oql.gene, samples, genePanelInformation, selectedMolecularProfiles);
+                data.cases.samples,
+                data.oql.gene,
+                samples,
+                genePanelInformation,
+                selectedMolecularProfiles
+            );
 
             geneticTrackData.forEach(datum => {
-                const key = datum.study_id + ":" + datum.uid;
-                initializeCaseAlterationData(caseAlterationData, datum, sampleIndex);
+                const key = datum.study_id + ':' + datum.uid;
+                initializeCaseAlterationData(
+                    caseAlterationData,
+                    datum,
+                    sampleIndex
+                );
                 // for each gene the oql data is different
                 // that's why we need a map here
-                const generatedOqlData = generateOqlData(datum, geneAlterationDataByGene, molecularProfileIdToMolecularProfile);
+                const generatedOqlData = generateOqlData(
+                    datum,
+                    geneAlterationDataByGene,
+                    molecularProfileIdToMolecularProfile
+                );
                 //generate and update oqlDataByGene in caseAlterationData
-                if (caseAlterationData[key].oqlDataByGene[data.oql.gene] !== undefined) {
-                    caseAlterationData[key].oqlDataByGene[data.oql.gene] = _.merge(generatedOqlData, caseAlterationData[key].oqlDataByGene[data.oql.gene]);
-                }
-                else {
-                    caseAlterationData[key].oqlDataByGene[data.oql.gene] = generatedOqlData;
+                if (
+                    caseAlterationData[key].oqlDataByGene[data.oql.gene] !==
+                    undefined
+                ) {
+                    caseAlterationData[key].oqlDataByGene[
+                        data.oql.gene
+                    ] = _.merge(
+                        generatedOqlData,
+                        caseAlterationData[key].oqlDataByGene[data.oql.gene]
+                    );
+                } else {
+                    caseAlterationData[key].oqlDataByGene[
+                        data.oql.gene
+                    ] = generatedOqlData;
                 }
-                updateOqlData(datum, caseAlterationData[key].oqlDataByGene[data.oql.gene], molecularProfileIdToMolecularProfile);
+                updateOqlData(
+                    datum,
+                    caseAlterationData[key].oqlDataByGene[data.oql.gene],
+                    molecularProfileIdToMolecularProfile
+                );
             });
         });
     }
 
     // put track data into oqlData
-    if (caseAggregatedDataByUnflattenedOQLLine &&
-        genePanelInformation)
-    {
+    if (caseAggregatedDataByUnflattenedOQLLine && genePanelInformation) {
         // we need the sample index for better performance
         const sampleIndex = _.keyBy(samples, 'uniqueSampleKey');
 
@@ -403,58 +511,96 @@ export function generateCaseAlterationData(
             let trackName: string;
             // get genes and track mames
             if (data.mergedTrackOqlList === undefined) {
-                genes = (data.oql as OQLLineFilterOutput<AnnotatedExtendedAlteration>).gene;
-                trackName = getSingleGeneResultKey(index, oqlQuery, data.oql as OQLLineFilterOutput<AnnotatedExtendedAlteration>);
-            }
-            else {
-                genes = (data.oql as MergedTrackLineFilterOutput<AnnotatedExtendedAlteration>).list.map((oql) => oql.gene);
-                trackName = getMultipleGeneResultKey(data.oql as MergedTrackLineFilterOutput<AnnotatedExtendedAlteration>);
+                genes = (data.oql as OQLLineFilterOutput<
+                    AnnotatedExtendedAlteration
+                >).gene;
+                trackName = getSingleGeneResultKey(
+                    index,
+                    oqlQuery,
+                    data.oql as OQLLineFilterOutput<AnnotatedExtendedAlteration>
+                );
+            } else {
+                genes = (data.oql as MergedTrackLineFilterOutput<
+                    AnnotatedExtendedAlteration
+                >).list.map(oql => oql.gene);
+                trackName = getMultipleGeneResultKey(
+                    data.oql as MergedTrackLineFilterOutput<
+                        AnnotatedExtendedAlteration
+                    >
+                );
             }
             const geneticTrackData = makeGeneticTrackData(
-                data.cases.samples, genes, samples, genePanelInformation, selectedMolecularProfiles);
+                data.cases.samples,
+                genes,
+                samples,
+                genePanelInformation,
+                selectedMolecularProfiles
+            );
 
             geneticTrackData.forEach(datum => {
-                const key = datum.study_id + ":" + datum.uid;
-                initializeCaseAlterationData(caseAlterationData, datum, sampleIndex);
+                const key = datum.study_id + ':' + datum.uid;
+                initializeCaseAlterationData(
+                    caseAlterationData,
+                    datum,
+                    sampleIndex
+                );
                 // for each track (for each oql line/gene) the oql data is different
                 // that's why we need a map here
-                const generatedOqlData = generateOqlData(datum, geneAlterationDataByGene, molecularProfileIdToMolecularProfile);
+                const generatedOqlData = generateOqlData(
+                    datum,
+                    geneAlterationDataByGene,
+                    molecularProfileIdToMolecularProfile
+                );
                 //generate and update oqlData in caseAlterationData
-                caseAlterationData[key].oqlData[trackName] = generatedOqlData
-                updateOqlData(datum, caseAlterationData[key].oqlData[trackName], molecularProfileIdToMolecularProfile);
+                caseAlterationData[key].oqlData[trackName] = generatedOqlData;
+                updateOqlData(
+                    datum,
+                    caseAlterationData[key].oqlData[trackName],
+                    molecularProfileIdToMolecularProfile
+                );
             });
         });
     }
     return _.values(caseAlterationData);
 }
 
-export function initializeCaseAlterationData(caseAlterationData: {[studyCaseId: string] : ICaseAlteration}, datum: GeneticTrackDatum, sampleIndex: _.Dictionary<Sample>) {
+export function initializeCaseAlterationData(
+    caseAlterationData: { [studyCaseId: string]: ICaseAlteration },
+    datum: GeneticTrackDatum,
+    sampleIndex: _.Dictionary<Sample>
+) {
     const studyId = datum.study_id;
-    const sampleId = datum.sample || (sampleIndex[datum.uid] ? sampleIndex[datum.uid].sampleId : "");
-    const key = studyId + ":" + datum.uid;
+    const sampleId =
+        datum.sample ||
+        (sampleIndex[datum.uid] ? sampleIndex[datum.uid].sampleId : '');
+    const key = studyId + ':' + datum.uid;
 
     // initialize the row data
     caseAlterationData[key] = caseAlterationData[key] || {
         studyId,
         sampleId,
-        patientId: sampleIndex[datum.uid] ? sampleIndex[datum.uid].patientId : "",
+        patientId: sampleIndex[datum.uid]
+            ? sampleIndex[datum.uid].patientId
+            : '',
         altered: false,
         oqlData: {},
-        oqlDataByGene: {}
+        oqlDataByGene: {},
     };
 
     // update altered: a single alteration in any track means altered
-    caseAlterationData[key].altered = caseAlterationData[key].altered || datum.data.length > 0;
+    caseAlterationData[key].altered =
+        caseAlterationData[key].altered || datum.data.length > 0;
 }
 
-export function hasValidData(sampleAlterationDataByGene: {[key: string]: ExtendedAlteration[]},
-                             extractValue?: (alteration: ExtendedAlteration) => string): boolean
-{
-    for (const alterations of _.values(sampleAlterationDataByGene))
-    {
-        for (const alteration of alterations)
-        {
-            const value = extractValue ? extractValue(alteration) : alteration.value;
+export function hasValidData(
+    sampleAlterationDataByGene: { [key: string]: ExtendedAlteration[] },
+    extractValue?: (alteration: ExtendedAlteration) => string
+): boolean {
+    for (const alterations of _.values(sampleAlterationDataByGene)) {
+        for (const alteration of alterations) {
+            const value = extractValue
+                ? extractValue(alteration)
+                : alteration.value;
 
             // at least one valid value means, there is valid data
             // TODO also filter out values like "NA", "N/A", etc. ?
@@ -468,33 +614,35 @@ export function hasValidData(sampleAlterationDataByGene: {[key: string]: Extende
     return false;
 }
 
-export function hasValidMutationData(sampleAlterationDataByGene: {[key: string]: ExtendedAlteration[]}): boolean
-{
+export function hasValidMutationData(sampleAlterationDataByGene: {
+    [key: string]: ExtendedAlteration[];
+}): boolean {
     return hasValidData(sampleAlterationDataByGene, extractMutationValue);
 }
 
-function extractMutationValue(alteration: ExtendedAlteration)
-{
+function extractMutationValue(alteration: ExtendedAlteration) {
     return alteration.proteinChange;
 }
 
-export function decideMolecularProfileSortingOrder(profileType: MolecularProfile['molecularAlterationType']) {
+export function decideMolecularProfileSortingOrder(
+    profileType: MolecularProfile['molecularAlterationType']
+) {
     switch (profileType) {
-        case "MUTATION_EXTENDED":
+        case 'MUTATION_EXTENDED':
             return 1;
-        case "COPY_NUMBER_ALTERATION":
+        case 'COPY_NUMBER_ALTERATION':
             return 2;
-        case "GENESET_SCORE":
+        case 'GENESET_SCORE':
             return 3;
-        case "MRNA_EXPRESSION":
+        case 'MRNA_EXPRESSION':
             return 4;
-        case "METHYLATION":
+        case 'METHYLATION':
             return 5;
-        case "METHYLATION_BINARY":
+        case 'METHYLATION_BINARY':
             return 6;
-        case "PROTEIN_LEVEL":
+        case 'PROTEIN_LEVEL':
             return 7;
         default:
             return Number.MAX_VALUE;
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/resultsView/download/GeneAlterationTable.tsx b/src/pages/resultsView/download/GeneAlterationTable.tsx
index 020f6ed8acb..c87979d928f 100644
--- a/src/pages/resultsView/download/GeneAlterationTable.tsx
+++ b/src/pages/resultsView/download/GeneAlterationTable.tsx
@@ -1,7 +1,7 @@
-import {observer} from "mobx-react";
+import { observer } from 'mobx-react';
 import * as React from 'react';
-import LazyMobXTable from "shared/components/lazyMobXTable/LazyMobXTable";
-import FrequencyBar from "shared/components/cohort/FrequencyBar";
+import LazyMobXTable from 'shared/components/lazyMobXTable/LazyMobXTable';
+import FrequencyBar from 'shared/components/cohort/FrequencyBar';
 
 export interface IGeneAlteration {
     gene: string;
@@ -18,56 +18,84 @@ export interface IGeneAlterationTableProps {
 class GeneAlterationTableComponent extends LazyMobXTable<IGeneAlteration> {}
 
 @observer
-export default class GeneAlterationTable extends React.Component<IGeneAlterationTableProps, {}> {
-    public render()
-    {
+export default class GeneAlterationTable extends React.Component<
+    IGeneAlterationTableProps,
+    {}
+> {
+    public render() {
         return (
             <GeneAlterationTableComponent
                 data={this.props.geneAlterationData}
-                columns={
-                    [
-                        {
-                            name: 'Gene Symbol',
-                            render: (data: IGeneAlteration) => <span>{data.gene}</span>,
-                            download: (data: IGeneAlteration) => data.gene,
-                            sortBy: (data: IGeneAlteration) => data.gene,
-                            filter: (data: IGeneAlteration, filterString: string, filterStringUpper: string) => {
-                                return data.gene.toUpperCase().indexOf(filterStringUpper) > -1;
-                            }
+                columns={[
+                    {
+                        name: 'Gene Symbol',
+                        render: (data: IGeneAlteration) => (
+                            <span>{data.gene}</span>
+                        ),
+                        download: (data: IGeneAlteration) => data.gene,
+                        sortBy: (data: IGeneAlteration) => data.gene,
+                        filter: (
+                            data: IGeneAlteration,
+                            filterString: string,
+                            filterStringUpper: string
+                        ) => {
+                            return (
+                                data.gene
+                                    .toUpperCase()
+                                    .indexOf(filterStringUpper) > -1
+                            );
                         },
-                        {
-                            name: 'OQL Line',
-                            visible: false,
-                            render: (data: IGeneAlteration) => <span>{data.oqlLine}</span>,
-                            download: (data: IGeneAlteration) => data.oqlLine,
-                            sortBy: (data: IGeneAlteration) => data.oqlLine,
-                            filter: (data: IGeneAlteration, filterString: string, filterStringUpper: string) => {
-                                return data.oqlLine.toUpperCase().indexOf(filterStringUpper) > -1;
-                            }
+                    },
+                    {
+                        name: 'OQL Line',
+                        visible: false,
+                        render: (data: IGeneAlteration) => (
+                            <span>{data.oqlLine}</span>
+                        ),
+                        download: (data: IGeneAlteration) => data.oqlLine,
+                        sortBy: (data: IGeneAlteration) => data.oqlLine,
+                        filter: (
+                            data: IGeneAlteration,
+                            filterString: string,
+                            filterStringUpper: string
+                        ) => {
+                            return (
+                                data.oqlLine
+                                    .toUpperCase()
+                                    .indexOf(filterStringUpper) > -1
+                            );
                         },
-                        {
-                            name: 'Num Samples Altered',
-                            render: (data: IGeneAlteration) => <span>{data.sequenced ? data.altered : "Not Profiled"}</span>,
-                            download: (data: IGeneAlteration) => data.sequenced ? `${data.altered}` : "N/P",
-                            sortBy: (data: IGeneAlteration) => data.altered
-                        },
-                        {
-                            name: 'Percent Samples Altered',
-                            render: (data: IGeneAlteration) => (
-                                data.sequenced ?
+                    },
+                    {
+                        name: 'Num Samples Altered',
+                        render: (data: IGeneAlteration) => (
+                            <span>
+                                {data.sequenced ? data.altered : 'Not Profiled'}
+                            </span>
+                        ),
+                        download: (data: IGeneAlteration) =>
+                            data.sequenced ? `${data.altered}` : 'N/P',
+                        sortBy: (data: IGeneAlteration) => data.altered,
+                    },
+                    {
+                        name: 'Percent Samples Altered',
+                        render: (data: IGeneAlteration) =>
+                            data.sequenced ? (
                                 <FrequencyBar
                                     barWidth={200}
                                     textWidth={45}
                                     counts={[data.altered]}
                                     totalCount={data.sequenced}
-                                /> :
+                                />
+                            ) : (
                                 <span>Not Profiled</span>
                             ),
-                            download: (data: IGeneAlteration) => data.percentAltered,
-                            sortBy: (data: IGeneAlteration) => data.altered / data.sequenced,
-                        }
-                    ]
-                }
+                        download: (data: IGeneAlteration) =>
+                            data.percentAltered,
+                        sortBy: (data: IGeneAlteration) =>
+                            data.altered / data.sequenced,
+                    },
+                ]}
                 initialSortColumn="Percent Samples Altered"
                 initialSortDirection={'desc'}
                 showPagination={true}
@@ -75,7 +103,9 @@ export default class GeneAlterationTable extends React.Component<IGeneAlteration
                 showColumnVisibility={true}
                 showFilter={true}
                 showCopyDownload={true}
-                copyDownloadProps={{downloadFilename: "gene_alteration_frequency.tsv"}}
+                copyDownloadProps={{
+                    downloadFilename: 'gene_alteration_frequency.tsv',
+                }}
             />
         );
     }
diff --git a/src/pages/resultsView/download/styles.module.scss b/src/pages/resultsView/download/styles.module.scss
index cc08fdc8d48..e091a85a63f 100644
--- a/src/pages/resultsView/download/styles.module.scss
+++ b/src/pages/resultsView/download/styles.module.scss
@@ -1,11 +1,11 @@
 .tables-container {
-  margin-top: 30px;
+    margin-top: 30px;
 }
 
 .downloadCopyTable {
-  td {
-    vertical-align:middle !important;
-  }
+    td {
+        vertical-align: middle !important;
+    }
 }
 
 .noAlterationSpan {
@@ -25,10 +25,10 @@
 }
 
 .tooltip {
-  max-width: 300px;
+    max-width: 300px;
 }
 
 .infoIcon {
-  margin-left: 4px;
-  color: #555;
-}
\ No newline at end of file
+    margin-left: 4px;
+    color: #555;
+}
diff --git a/src/pages/resultsView/enrichments/AddCheckedGenes.tsx b/src/pages/resultsView/enrichments/AddCheckedGenes.tsx
index 293e7730017..10cf65fdbf4 100644
--- a/src/pages/resultsView/enrichments/AddCheckedGenes.tsx
+++ b/src/pages/resultsView/enrichments/AddCheckedGenes.tsx
@@ -1,34 +1,51 @@
 import * as React from 'react';
-import { observer } from "mobx-react";
+import { observer } from 'mobx-react';
 import { Button } from 'react-bootstrap';
 import autobind from 'autobind-decorator';
-import {ResultsViewTab} from "../ResultsViewPageHelpers";
-import {DefaultTooltip} from "cbioportal-frontend-commons";
-import {ResultsViewURLQueryEnum} from "pages/resultsView/ResultsViewURLWrapper";
+import { ResultsViewTab } from '../ResultsViewPageHelpers';
+import { DefaultTooltip } from 'cbioportal-frontend-commons';
+import { ResultsViewURLQueryEnum } from 'pages/resultsView/ResultsViewURLWrapper';
 
 export interface IAddCheckedGenesProps {
-    checkedGenes:  string[];
+    checkedGenes: string[];
 }
 
 @observer
-export default class AddCheckedGenes extends React.Component<IAddCheckedGenesProps, {}> {
-
+export default class AddCheckedGenes extends React.Component<
+    IAddCheckedGenesProps,
+    {}
+> {
     @autobind
     private onAddGenes() {
         // add genes and go back to oncoprint tab
-        (window as any).routingStore.updateRoute({
-            [ResultsViewURLQueryEnum.gene_list]: `${(window as any).routingStore.query[ResultsViewURLQueryEnum.gene_list]}\n${this.props.checkedGenes.join(" ")}`
-        }, `results/${ResultsViewTab.ONCOPRINT}`);
+        (window as any).routingStore.updateRoute(
+            {
+                [ResultsViewURLQueryEnum.gene_list]: `${
+                    (window as any).routingStore.query[
+                        ResultsViewURLQueryEnum.gene_list
+                    ]
+                }\n${this.props.checkedGenes.join(' ')}`,
+            },
+            `results/${ResultsViewTab.ONCOPRINT}`
+        );
     }
 
     public render() {
-
-        const geneText = this.props.checkedGenes.length > 0 ? `(${this.props.checkedGenes.join(", ")})` : "(none checked)";
+        const geneText =
+            this.props.checkedGenes.length > 0
+                ? `(${this.props.checkedGenes.join(', ')})`
+                : '(none checked)';
         return (
             <div style={{ marginBottom: 15 }}>
-                <DefaultTooltip overlay={"Check genes in table below"}>
-                    <Button style={{ marginBottom: 2 }} disabled={this.props.checkedGenes.length < 1} onClick={this.onAddGenes}
-                            bsSize="xsmall">Add checked genes to query {geneText}</Button>
+                <DefaultTooltip overlay={'Check genes in table below'}>
+                    <Button
+                        style={{ marginBottom: 2 }}
+                        disabled={this.props.checkedGenes.length < 1}
+                        onClick={this.onAddGenes}
+                        bsSize="xsmall"
+                    >
+                        Add checked genes to query {geneText}
+                    </Button>
                 </DefaultTooltip>
             </div>
         );
diff --git a/src/pages/resultsView/enrichments/AlterationEnrichmentsContainer.tsx b/src/pages/resultsView/enrichments/AlterationEnrichmentsContainer.tsx
index ea529f76e71..d3205f8769d 100644
--- a/src/pages/resultsView/enrichments/AlterationEnrichmentsContainer.tsx
+++ b/src/pages/resultsView/enrichments/AlterationEnrichmentsContainer.tsx
@@ -1,65 +1,75 @@
 import * as React from 'react';
-import * as _ from "lodash";
-import { observer } from "mobx-react";
+import * as _ from 'lodash';
+import { observer } from 'mobx-react';
 import numeral from 'numeral';
-import { ResultsViewPageStore } from "../ResultsViewPageStore";
-import {observable, computed, action} from 'mobx';
-import AlterationEnrichmentTable, {AlterationEnrichmentTableColumnType} from 'pages/resultsView/enrichments/AlterationEnrichmentsTable';
-import styles from "./styles.module.scss";
+import { ResultsViewPageStore } from '../ResultsViewPageStore';
+import { observable, computed, action } from 'mobx';
+import AlterationEnrichmentTable, {
+    AlterationEnrichmentTableColumnType,
+} from 'pages/resultsView/enrichments/AlterationEnrichmentsTable';
+import styles from './styles.module.scss';
 import {
     getAlterationScatterData,
     getAlterationRowData,
-    getAlterationFrequencyScatterData, AlterationEnrichmentWithQ, getAlterationEnrichmentColumns, AlterationContainerType, getFilteredData
+    getAlterationFrequencyScatterData,
+    AlterationEnrichmentWithQ,
+    getAlterationEnrichmentColumns,
+    AlterationContainerType,
+    getFilteredData,
 } from 'pages/resultsView/enrichments/EnrichmentsUtil';
 import { AlterationEnrichmentRow } from 'shared/model/AlterationEnrichmentRow';
 import MiniScatterChart from 'pages/resultsView/enrichments/MiniScatterChart';
 import AddCheckedGenes from 'pages/resultsView/enrichments/AddCheckedGenes';
 import autobind from 'autobind-decorator';
 import { EnrichmentsTableDataStore } from 'pages/resultsView/enrichments/EnrichmentsTableDataStore';
-import MiniFrequencyScatterChart from "./MiniFrequencyScatterChart";
+import MiniFrequencyScatterChart from './MiniFrequencyScatterChart';
 import {
     CheckedSelect,
     DefaultTooltip,
-    Option
+    Option,
 } from 'cbioportal-frontend-commons';
-import {MiniOncoprint} from "shared/components/miniOncoprint/MiniOncoprint";
+import { MiniOncoprint } from 'shared/components/miniOncoprint/MiniOncoprint';
 import GeneBarPlot from './GeneBarPlot';
-import WindowStore from "shared/components/window/WindowStore";
+import WindowStore from 'shared/components/window/WindowStore';
 import './styles.scss';
-import ReactSelect from "react-select";
+import ReactSelect from 'react-select';
 
 export interface IAlterationEnrichmentContainerProps {
     data: AlterationEnrichmentWithQ[];
-    groups:{
-        name:string,
-        description:string,
-        nameOfEnrichmentDirection?:string,
-        count:number,
-        color?:string
-    }[]
-    alteredVsUnalteredMode?:boolean;
+    groups: {
+        name: string;
+        description: string;
+        nameOfEnrichmentDirection?: string;
+        count: number;
+        color?: string;
+    }[];
+    alteredVsUnalteredMode?: boolean;
     headerName: string;
     store?: ResultsViewPageStore;
-    showCNAInTable?:boolean;
-    containerType:AlterationContainerType;
-    patientLevelEnrichments:boolean;
-    onSetPatientLevelEnrichments:(patientLevel:boolean)=>void;
+    showCNAInTable?: boolean;
+    containerType: AlterationContainerType;
+    patientLevelEnrichments: boolean;
+    onSetPatientLevelEnrichments: (patientLevel: boolean) => void;
 }
 
 @observer
-export default class AlterationEnrichmentContainer extends React.Component<IAlterationEnrichmentContainerProps, {}> {
-
-    static defaultProps:Partial<IAlterationEnrichmentContainerProps> = {
+export default class AlterationEnrichmentContainer extends React.Component<
+    IAlterationEnrichmentContainerProps,
+    {}
+> {
+    static defaultProps: Partial<IAlterationEnrichmentContainerProps> = {
         showCNAInTable: false,
-        alteredVsUnalteredMode: true
+        alteredVsUnalteredMode: true,
     };
 
     @observable significanceFilter: boolean = false;
     @observable.shallow checkedGenes: string[] = [];
-    @observable.shallow selectedGenes: string[]|null;
-    @observable.ref highlightedRow:AlterationEnrichmentRow|undefined;
+    @observable.shallow selectedGenes: string[] | null;
+    @observable.ref highlightedRow: AlterationEnrichmentRow | undefined;
 
-    @observable.ref _enrichedGroups: string[] = this.props.groups.map(group=>group.name);
+    @observable.ref _enrichedGroups: string[] = this.props.groups.map(
+        group => group.name
+    );
 
     @computed get isTwoGroupAnalysis(): boolean {
         return this.props.groups.length == 2;
@@ -76,11 +86,20 @@ export default class AlterationEnrichmentContainer extends React.Component<IAlte
     }
 
     @computed get data(): AlterationEnrichmentRow[] {
-        return getAlterationRowData(this.props.data, this.props.store ? this.props.store.hugoGeneSymbols : [], this.props.groups);
+        return getAlterationRowData(
+            this.props.data,
+            this.props.store ? this.props.store.hugoGeneSymbols : [],
+            this.props.groups
+        );
     }
 
     @computed get filteredData(): AlterationEnrichmentRow[] {
-        return getFilteredData(this.data, this._enrichedGroups, this.significanceFilter, this.selectedGenes);
+        return getFilteredData(
+            this.data,
+            this._enrichedGroups,
+            this.significanceFilter,
+            this.selectedGenes
+        );
     }
 
     @autobind
@@ -90,7 +109,6 @@ export default class AlterationEnrichmentContainer extends React.Component<IAlte
 
     @autobind
     private onCheckGene(hugoGeneSymbol: string) {
-
         const index = this.checkedGenes.indexOf(hugoGeneSymbol);
         if (index !== -1) {
             this.checkedGenes.splice(index, 1);
@@ -105,139 +123,226 @@ export default class AlterationEnrichmentContainer extends React.Component<IAlte
     }
 
     @autobind
-    @action private onSelection(hugoGeneSymbols: string[]) {
+    @action
+    private onSelection(hugoGeneSymbols: string[]) {
         this.selectedGenes = hugoGeneSymbols;
     }
 
     @autobind
-    @action private onSelectionCleared() {
+    @action
+    private onSelectionCleared() {
         this.selectedGenes = null;
     }
 
     private dataStore = new EnrichmentsTableDataStore(
-        ()=>{
+        () => {
             return this.filteredData;
         },
-        ()=>{
+        () => {
             return this.highlightedRow;
         },
-        (c:AlterationEnrichmentRow)=>{
+        (c: AlterationEnrichmentRow) => {
             this.highlightedRow = c;
         }
     );
 
     @computed get customColumns() {
-        const cols =  getAlterationEnrichmentColumns(this.props.groups, this.props.alteredVsUnalteredMode);
+        const cols = getAlterationEnrichmentColumns(
+            this.props.groups,
+            this.props.alteredVsUnalteredMode
+        );
         if (this.isTwoGroupAnalysis) {
             cols.push({
-            name: 'Alteration Overlap',
-            headerRender: () => <span>Co-occurrence Pattern</span>,
-            render: (data) => {
-                if (data.pValue === undefined) {
-                    return <span>-</span>
-                }
-                const groups = _.map(data.groupsSet);
-                const queriedGroup1 = this.props.groups[0];
-                const queriedGroup2 = this.props.groups[1];
-                  // we want to order groups according to order in prop.groups
-                  const group1 = groups.find((group)=>group.name===this.props.groups[0].name)!;
-                  const group2 = groups.find((group)=>group.name===this.props.groups[1].name)!;
-
-                  if (!group1 || !group2) {
-                      throw("No matching groups in Alteration Overlap Cell");
-                  }
-
-                const totalQueriedCases = queriedGroup1.count + queriedGroup2.count;
-                const group1Width = (queriedGroup1.count / totalQueriedCases) * 100;
-                const group2Width = 100 - group1Width;
-                const group1Unprofiled = ((queriedGroup1.count - group1.profiledCount) / totalQueriedCases) * 100;
-                const group1Unaltered = ((group1.profiledCount - group1.alteredCount) / totalQueriedCases) * 100;
-                const group2Unprofiled = ((queriedGroup2.count - group2.profiledCount) / totalQueriedCases) * 100;
-                const group1Altered = (group1.alteredCount / totalQueriedCases) * 100;
-                const group2Altered = (group2.alteredCount / totalQueriedCases) * 100;
-
-                const alterationLanguage = this.props.showCNAInTable ? 'copy number alterations' : 'mutations'
-
-                const overlay = ()=>{
-                    return (<div>
-                        <h3>{data.hugoGeneSymbol} {alterationLanguage} in:</h3>
-                        <table className={'table table-striped'}>
-                            <tbody>
-                            <tr>
-                                <td><strong>{group1.name}: </strong></td>
-                                <td>{group1.alteredCount} of {group1.profiledCount} of profiled {this.props.patientLevelEnrichments ? "patients" : "samples"} ({numeral(group1.alteredPercentage).format('0.0')}%)</td>
-                            </tr>
-                            <tr>
-                                <td><strong>{group2.name}: </strong></td>
-                                <td>{group2.alteredCount} of {group2.profiledCount} of profiled {this.props.patientLevelEnrichments ? "patients" : "samples"} ({numeral(group2.alteredPercentage).format('0.0')}%)
-                                </td>
-                            </tr>
-                            </tbody>
-
-                        </table>
-
-                    </div>);
-                };
-
-                  return <DefaultTooltip destroyTooltipOnHide={true}  trigger={['hover']} overlay={overlay}>
-                      <div className={'inlineBlock'} style={{padding:'3px 0'}}>
-                          <MiniOncoprint
-                              group1Width={group1Width}
-                              group2Width={group2Width}
-                              group1Unaltered={group1Unaltered}
-                              group1Altered={group1Altered}
-                              group2Altered={group2Altered}
-                              group1Unprofiled={group1Unprofiled}
-                              group2Unprofiled={group2Unprofiled}
-                              group1Color={this.props.groups[0].color}
-                              group2Color={this.props.groups[1].color}
-                              width={150}
-                          />
-                      </div>
-                  </DefaultTooltip>;
-            },
-            tooltip:
-                <table>
-                    <tr>
-                        <td>Upper row</td>
-                        <td>: {this.props.patientLevelEnrichments ? "Patients" : "Samples"} colored according to group.</td>
-                    </tr>
-                    <tr>
-                        <td>Lower row</td>
-                        <td>: {this.props.patientLevelEnrichments ? "Patients" : "Samples"} with {this.props.showCNAInTable ? 'the listed alteration' : 'a mutation'} in the listed gene are highlighted.</td>
-                    </tr>
-                </table>,
-          });
-        }
+                name: 'Alteration Overlap',
+                headerRender: () => <span>Co-occurrence Pattern</span>,
+                render: data => {
+                    if (data.pValue === undefined) {
+                        return <span>-</span>;
+                    }
+                    const groups = _.map(data.groupsSet);
+                    const queriedGroup1 = this.props.groups[0];
+                    const queriedGroup2 = this.props.groups[1];
+                    // we want to order groups according to order in prop.groups
+                    const group1 = groups.find(
+                        group => group.name === this.props.groups[0].name
+                    )!;
+                    const group2 = groups.find(
+                        group => group.name === this.props.groups[1].name
+                    )!;
+
+                    if (!group1 || !group2) {
+                        throw 'No matching groups in Alteration Overlap Cell';
+                    }
 
+                    const totalQueriedCases =
+                        queriedGroup1.count + queriedGroup2.count;
+                    const group1Width =
+                        (queriedGroup1.count / totalQueriedCases) * 100;
+                    const group2Width = 100 - group1Width;
+                    const group1Unprofiled =
+                        ((queriedGroup1.count - group1.profiledCount) /
+                            totalQueriedCases) *
+                        100;
+                    const group1Unaltered =
+                        ((group1.profiledCount - group1.alteredCount) /
+                            totalQueriedCases) *
+                        100;
+                    const group2Unprofiled =
+                        ((queriedGroup2.count - group2.profiledCount) /
+                            totalQueriedCases) *
+                        100;
+                    const group1Altered =
+                        (group1.alteredCount / totalQueriedCases) * 100;
+                    const group2Altered =
+                        (group2.alteredCount / totalQueriedCases) * 100;
+
+                    const alterationLanguage = this.props.showCNAInTable
+                        ? 'copy number alterations'
+                        : 'mutations';
+
+                    const overlay = () => {
+                        return (
+                            <div>
+                                <h3>
+                                    {data.hugoGeneSymbol} {alterationLanguage}{' '}
+                                    in:
+                                </h3>
+                                <table className={'table table-striped'}>
+                                    <tbody>
+                                        <tr>
+                                            <td>
+                                                <strong>{group1.name}: </strong>
+                                            </td>
+                                            <td>
+                                                {group1.alteredCount} of{' '}
+                                                {group1.profiledCount} of
+                                                profiled{' '}
+                                                {this.props
+                                                    .patientLevelEnrichments
+                                                    ? 'patients'
+                                                    : 'samples'}{' '}
+                                                (
+                                                {numeral(
+                                                    group1.alteredPercentage
+                                                ).format('0.0')}
+                                                %)
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <strong>{group2.name}: </strong>
+                                            </td>
+                                            <td>
+                                                {group2.alteredCount} of{' '}
+                                                {group2.profiledCount} of
+                                                profiled{' '}
+                                                {this.props
+                                                    .patientLevelEnrichments
+                                                    ? 'patients'
+                                                    : 'samples'}{' '}
+                                                (
+                                                {numeral(
+                                                    group2.alteredPercentage
+                                                ).format('0.0')}
+                                                %)
+                                            </td>
+                                        </tr>
+                                    </tbody>
+                                </table>
+                            </div>
+                        );
+                    };
+
+                    return (
+                        <DefaultTooltip
+                            destroyTooltipOnHide={true}
+                            trigger={['hover']}
+                            overlay={overlay}
+                        >
+                            <div
+                                className={'inlineBlock'}
+                                style={{ padding: '3px 0' }}
+                            >
+                                <MiniOncoprint
+                                    group1Width={group1Width}
+                                    group2Width={group2Width}
+                                    group1Unaltered={group1Unaltered}
+                                    group1Altered={group1Altered}
+                                    group2Altered={group2Altered}
+                                    group1Unprofiled={group1Unprofiled}
+                                    group2Unprofiled={group2Unprofiled}
+                                    group1Color={this.props.groups[0].color}
+                                    group2Color={this.props.groups[1].color}
+                                    width={150}
+                                />
+                            </div>
+                        </DefaultTooltip>
+                    );
+                },
+                tooltip: (
+                    <table>
+                        <tr>
+                            <td>Upper row</td>
+                            <td>
+                                :{' '}
+                                {this.props.patientLevelEnrichments
+                                    ? 'Patients'
+                                    : 'Samples'}{' '}
+                                colored according to group.
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>Lower row</td>
+                            <td>
+                                :{' '}
+                                {this.props.patientLevelEnrichments
+                                    ? 'Patients'
+                                    : 'Samples'}{' '}
+                                with{' '}
+                                {this.props.showCNAInTable
+                                    ? 'the listed alteration'
+                                    : 'a mutation'}{' '}
+                                in the listed gene are highlighted.
+                            </td>
+                        </tr>
+                    </table>
+                ),
+            });
+        }
 
         return cols;
-
     }
 
     @computed get visibleOrderedColumnNames() {
         const columns = [];
-        columns.push(AlterationEnrichmentTableColumnType.GENE,
-            AlterationEnrichmentTableColumnType.CYTOBAND);
+        columns.push(
+            AlterationEnrichmentTableColumnType.GENE,
+            AlterationEnrichmentTableColumnType.CYTOBAND
+        );
         if (this.props.showCNAInTable) {
             columns.push(AlterationEnrichmentTableColumnType.ALTERATION);
         }
-        this.props.groups.forEach(group=>{
+        this.props.groups.forEach(group => {
             columns.push(group.name);
-        })
-        if(this.isTwoGroupAnalysis) {
+        });
+        if (this.isTwoGroupAnalysis) {
             columns.push('Alteration Overlap');
             columns.push(AlterationEnrichmentTableColumnType.LOG_RATIO);
         }
 
         columns.push(
-        AlterationEnrichmentTableColumnType.P_VALUE,
-        AlterationEnrichmentTableColumnType.Q_VALUE);
+            AlterationEnrichmentTableColumnType.P_VALUE,
+            AlterationEnrichmentTableColumnType.Q_VALUE
+        );
 
-        if(this.isTwoGroupAnalysis) {
-            columns.push(this.props.alteredVsUnalteredMode ? AlterationEnrichmentTableColumnType.TENDENCY : AlterationEnrichmentTableColumnType.ENRICHED);
+        if (this.isTwoGroupAnalysis) {
+            columns.push(
+                this.props.alteredVsUnalteredMode
+                    ? AlterationEnrichmentTableColumnType.TENDENCY
+                    : AlterationEnrichmentTableColumnType.ENRICHED
+            );
         } else {
-            columns.push(AlterationEnrichmentTableColumnType.MOST_ENRICHED)
+            columns.push(AlterationEnrichmentTableColumnType.MOST_ENRICHED);
         }
 
         return columns;
@@ -248,7 +353,8 @@ export default class AlterationEnrichmentContainer extends React.Component<IAlte
     }
 
     @autobind
-    @action onChange(values: { value: string }[]) {
+    @action
+    onChange(values: { value: string }[]) {
         this._enrichedGroups = _.map(values, datum => datum.value);
     }
 
@@ -259,9 +365,11 @@ export default class AlterationEnrichmentContainer extends React.Component<IAlte
     @computed get options(): Option[] {
         return _.map(this.props.groups, group => {
             return {
-                label: group.nameOfEnrichmentDirection ? group.nameOfEnrichmentDirection : group.name,
-                value: group.name
-            }
+                label: group.nameOfEnrichmentDirection
+                    ? group.nameOfEnrichmentDirection
+                    : group.name,
+                value: group.name,
+            };
         });
     }
 
@@ -271,27 +379,49 @@ export default class AlterationEnrichmentContainer extends React.Component<IAlte
     }
 
     @computed private get categoryToColor() {
-        return _.reduce(this.props.groups, (acc, next) => {
-            if (next.color) {
-                acc[next.name] = next.color;
-            }
-            return acc;
-        }, {} as { [id: string]: string });
+        return _.reduce(
+            this.props.groups,
+            (acc, next) => {
+                if (next.color) {
+                    acc[next.name] = next.color;
+                }
+                return acc;
+            },
+            {} as { [id: string]: string }
+        );
     }
 
     public render() {
         if (this.props.data.length === 0) {
-            return <div className={'alert alert-info'}>No data/result available</div>;
+            return (
+                <div className={'alert alert-info'}>
+                    No data/result available
+                </div>
+            );
         }
 
         return (
             <div className={styles.Container}>
-                <div className={styles.ChartsPanel} style={{maxWidth:WindowStore.size.width-60}}>
-                    {this.isTwoGroupAnalysis &&
+                <div
+                    className={styles.ChartsPanel}
+                    style={{ maxWidth: WindowStore.size.width - 60 }}
+                >
+                    {this.isTwoGroupAnalysis && (
                         <MiniScatterChart
-                            data={getAlterationScatterData(this.data, this.props.store ? this.props.store.hugoGeneSymbols : [])}
-                            xAxisLeftLabel={this.group2.nameOfEnrichmentDirection || this.group2.name}
-                            xAxisRightLabel={this.group1.nameOfEnrichmentDirection || this.group1.name}
+                            data={getAlterationScatterData(
+                                this.data,
+                                this.props.store
+                                    ? this.props.store.hugoGeneSymbols
+                                    : []
+                            )}
+                            xAxisLeftLabel={
+                                this.group2.nameOfEnrichmentDirection ||
+                                this.group2.name
+                            }
+                            xAxisRightLabel={
+                                this.group1.nameOfEnrichmentDirection ||
+                                this.group1.name
+                            }
                             xAxisDomain={15}
                             xAxisTickValues={[-10, 0, 10]}
                             selectedGenesSet={this.selectedGenesSet}
@@ -299,11 +429,18 @@ export default class AlterationEnrichmentContainer extends React.Component<IAlte
                             onSelection={this.onSelection}
                             onSelectionCleared={this.onSelectionCleared}
                         />
-                    }
+                    )}
 
-                    {this.isTwoGroupAnalysis &&
+                    {this.isTwoGroupAnalysis && (
                         <MiniFrequencyScatterChart
-                            data={getAlterationFrequencyScatterData(this.data, this.props.store ? this.props.store.hugoGeneSymbols : [], this.group1.name, this.group2.name)}
+                            data={getAlterationFrequencyScatterData(
+                                this.data,
+                                this.props.store
+                                    ? this.props.store.hugoGeneSymbols
+                                    : [],
+                                this.group1.name,
+                                this.group2.name
+                            )}
                             xGroupName={this.group1.name}
                             yGroupName={this.group2.name}
                             onGeneNameClick={this.onGeneNameClick}
@@ -311,13 +448,15 @@ export default class AlterationEnrichmentContainer extends React.Component<IAlte
                             onSelection={this.onSelection}
                             onSelectionCleared={this.onSelectionCleared}
                         />
-                    }
+                    )}
 
                     <div style={{ maxWidth: this.genePlotMaxWidth }}>
                         <GeneBarPlot
                             data={this.data}
                             isTwoGroupAnalysis={this.isTwoGroupAnalysis}
-                            groupOrder={this.props.groups.map(group => group.name)}
+                            groupOrder={this.props.groups.map(
+                                group => group.name
+                            )}
                             showCNAInTable={this.props.showCNAInTable}
                             containerType={this.props.containerType}
                             categoryToColor={this.categoryToColor}
@@ -329,68 +468,83 @@ export default class AlterationEnrichmentContainer extends React.Component<IAlte
                 <div>
                     <div>
                         <h3>{this.props.headerName}</h3>
-                        {this.props.store && <AddCheckedGenes checkedGenes={this.checkedGenes}/>}
+                        {this.props.store && (
+                            <AddCheckedGenes checkedGenes={this.checkedGenes} />
+                        )}
                     </div>
                     <div className={styles.Checkboxes}>
-                        <div style={{ width: 250, marginRight: 7 }} >
+                        <div style={{ width: 250, marginRight: 7 }}>
                             <ReactSelect
                                 name="select enrichments level: sample or patient"
-                                onChange={(option:any|null)=>{
+                                onChange={(option: any | null) => {
                                     if (option) {
-                                        this.props.onSetPatientLevelEnrichments(option.value);
+                                        this.props.onSetPatientLevelEnrichments(
+                                            option.value
+                                        );
                                     }
                                 }}
                                 options={[
-                                    { label: "Patient-level enrichments", value: true},
-                                    { label: "Sample-level enrichments", value: false}
+                                    {
+                                        label: 'Patient-level enrichments',
+                                        value: true,
+                                    },
+                                    {
+                                        label: 'Sample-level enrichments',
+                                        value: false,
+                                    },
                                 ]}
                                 clearable={false}
                                 searchable={false}
-                                value={{ label: this.props.patientLevelEnrichments ? "Patient-level enrichments" : "Sample-level enrichments", value: this.props.patientLevelEnrichments}}
+                                value={{
+                                    label: this.props.patientLevelEnrichments
+                                        ? 'Patient-level enrichments'
+                                        : 'Sample-level enrichments',
+                                    value: this.props.patientLevelEnrichments,
+                                }}
                                 styles={{
-                                    control: (provided:any)=>({
+                                    control: (provided: any) => ({
                                         ...provided,
-                                        height:36,
-                                        minHeight:36,
-                                        border: "1px solid rgb(204,204,204)"
+                                        height: 36,
+                                        minHeight: 36,
+                                        border: '1px solid rgb(204,204,204)',
                                     }),
-                                    menu: (provided:any)=>({
+                                    menu: (provided: any) => ({
                                         ...provided,
-                                        maxHeight: 400
+                                        maxHeight: 400,
                                     }),
-                                    menuList: (provided:any)=>({
+                                    menuList: (provided: any) => ({
                                         ...provided,
-                                        maxHeight:400
+                                        maxHeight: 400,
                                     }),
-                                    placeholder:(provided:any)=>({
+                                    placeholder: (provided: any) => ({
                                         ...provided,
-                                        color: "#000000"
+                                        color: '#000000',
                                     }),
-                                    dropdownIndicator:(provided:any)=>({
+                                    dropdownIndicator: (provided: any) => ({
                                         ...provided,
-                                        color:"#000000"
+                                        color: '#000000',
                                     }),
-                                    option:(provided:any, state:any)=>{
+                                    option: (provided: any, state: any) => {
                                         return {
                                             ...provided,
-                                            cursor:"pointer",
+                                            cursor: 'pointer',
                                         };
-                                    }
+                                    },
                                 }}
-                                theme={(theme:any)=>({
+                                theme={(theme: any) => ({
                                     ...theme,
                                     colors: {
                                         ...theme.colors,
-                                        neutral80:"black",
+                                        neutral80: 'black',
                                         //primary: theme.colors.primary50
                                     },
                                 })}
                             />
                         </div>
-                        <div style={{ width: 250, marginRight: 7 }} >
+                        <div style={{ width: 250, marginRight: 7 }}>
                             <CheckedSelect
-                                name={"enrichedGroupsSelector"}
-                                placeholder={"Select enriched groups"}
+                                name={'enrichedGroupsSelector'}
+                                placeholder={'Select enriched groups'}
                                 onChange={this.onChange}
                                 options={this.options}
                                 value={this.selectedValues}
@@ -403,16 +557,27 @@ export default class AlterationEnrichmentContainer extends React.Component<IAlte
                                 checked={this.significanceFilter}
                                 onClick={this.toggleSignificanceFilter}
                                 data-test="SwapAxes"
-                            />Significant only
+                            />
+                            Significant only
                         </label>
-
                     </div>
-                    <AlterationEnrichmentTable key={this.props.patientLevelEnrichments.toString()}
-                                                data={this.filteredData} onCheckGene={this.props.store ? this.onCheckGene : undefined}
-                                               checkedGenes={this.props.store ? this.checkedGenes : undefined}
-                                               dataStore={this.dataStore}
-                                               visibleOrderedColumnNames={this.visibleOrderedColumnNames}
-                                               customColumns={_.keyBy(this.customColumns,column=>column.name)}
+                    <AlterationEnrichmentTable
+                        key={this.props.patientLevelEnrichments.toString()}
+                        data={this.filteredData}
+                        onCheckGene={
+                            this.props.store ? this.onCheckGene : undefined
+                        }
+                        checkedGenes={
+                            this.props.store ? this.checkedGenes : undefined
+                        }
+                        dataStore={this.dataStore}
+                        visibleOrderedColumnNames={
+                            this.visibleOrderedColumnNames
+                        }
+                        customColumns={_.keyBy(
+                            this.customColumns,
+                            column => column.name
+                        )}
                     />
                 </div>
             </div>
diff --git a/src/pages/resultsView/enrichments/AlterationEnrichmentsTable.tsx b/src/pages/resultsView/enrichments/AlterationEnrichmentsTable.tsx
index 2992ce42a1c..a9b4898f615 100644
--- a/src/pages/resultsView/enrichments/AlterationEnrichmentsTable.tsx
+++ b/src/pages/resultsView/enrichments/AlterationEnrichmentsTable.tsx
@@ -1,12 +1,14 @@
 import * as React from 'react';
-import * as _ from "lodash";
-import LazyMobXTable, { Column } from "../../../shared/components/lazyMobXTable/LazyMobXTable";
-import { observer } from "mobx-react";
-import { computed } from "mobx";
+import * as _ from 'lodash';
+import LazyMobXTable, {
+    Column,
+} from '../../../shared/components/lazyMobXTable/LazyMobXTable';
+import { observer } from 'mobx-react';
+import { computed } from 'mobx';
 import { Checkbox } from 'react-bootstrap';
-import { formatSignificanceValueWithStyle } from "shared/lib/FormatUtils";
+import { formatSignificanceValueWithStyle } from 'shared/lib/FormatUtils';
 import { toConditionalPrecision } from 'shared/lib/NumberUtils';
-import styles from "./styles.module.scss";
+import styles from './styles.module.scss';
 import { cytobandFilter } from 'pages/resultsView/ResultsViewTableUtils';
 import autobind from 'autobind-decorator';
 import { EnrichmentsTableDataStore } from 'pages/resultsView/enrichments/EnrichmentsTableDataStore';
@@ -15,37 +17,41 @@ import { CNA_COLOR_AMP, CNA_COLOR_HOMDEL } from 'shared/lib/Colors';
 
 export interface IAlterationEnrichmentTableProps {
     visibleOrderedColumnNames?: string[];
-    customColumns?:{[id:string]:AlterationEnrichmentTableColumn}
+    customColumns?: { [id: string]: AlterationEnrichmentTableColumn };
     data: AlterationEnrichmentRow[];
     initialSortColumn?: string;
     dataStore: EnrichmentsTableDataStore;
     onCheckGene?: (hugoGeneSymbol: string) => void;
     onGeneNameClick?: (hugoGeneSymbol: string) => void;
-    checkedGenes?:string[];
+    checkedGenes?: string[];
 }
 
 export enum AlterationEnrichmentTableColumnType {
-    GENE="GENE",
-    CYTOBAND="CYTOBAND",
-    ALTERATION="ALTERATION",
-    P_VALUE="P_VALUE",
-    Q_VALUE="Q_VALUE",
-    LOG_RATIO="Log Ratio",
-    TENDENCY="Tendency",
-    ENRICHED="Enriched in",
-    MOST_ENRICHED="Most enriched in"
+    GENE = 'GENE',
+    CYTOBAND = 'CYTOBAND',
+    ALTERATION = 'ALTERATION',
+    P_VALUE = 'P_VALUE',
+    Q_VALUE = 'Q_VALUE',
+    LOG_RATIO = 'Log Ratio',
+    TENDENCY = 'Tendency',
+    ENRICHED = 'Enriched in',
+    MOST_ENRICHED = 'Most enriched in',
 }
 
-const cnaToAlteration:{[cna:number]:string} = {
-    "2": "Amp",
-    "-2": "DeepDel"
+const cnaToAlteration: { [cna: number]: string } = {
+    '2': 'Amp',
+    '-2': 'DeepDel',
 };
 
-export type AlterationEnrichmentTableColumn = Column<AlterationEnrichmentRow> & { order?: number };
+export type AlterationEnrichmentTableColumn = Column<
+    AlterationEnrichmentRow
+> & { order?: number };
 
 @observer
-export default class AlterationEnrichmentTable extends React.Component<IAlterationEnrichmentTableProps, {}> {
-
+export default class AlterationEnrichmentTable extends React.Component<
+    IAlterationEnrichmentTableProps,
+    {}
+> {
     public static defaultProps = {
         columns: [
             AlterationEnrichmentTableColumnType.GENE,
@@ -53,11 +59,13 @@ export default class AlterationEnrichmentTable extends React.Component<IAlterati
             AlterationEnrichmentTableColumnType.P_VALUE,
             AlterationEnrichmentTableColumnType.Q_VALUE,
         ],
-        initialSortColumn: "q-Value"
+        initialSortColumn: 'q-Value',
     };
 
     private checkboxChange(hugoGeneSymbol: string) {
-        const row: AlterationEnrichmentRow = _.find(this.props.data, {hugoGeneSymbol})!;
+        const row: AlterationEnrichmentRow = _.find(this.props.data, {
+            hugoGeneSymbol,
+        })!;
         row.checked = !row.checked;
         this.props.onCheckGene!(hugoGeneSymbol);
     }
@@ -68,67 +76,119 @@ export default class AlterationEnrichmentTable extends React.Component<IAlterati
         this.props.dataStore.setHighlighted(d);
     }
 
-    @computed get columns():{ [columnEnum: string]: AlterationEnrichmentTableColumn } {
-        const columns: { [columnEnum: string]: AlterationEnrichmentTableColumn } = this.props.customColumns || {};
+    @computed get columns(): {
+        [columnEnum: string]: AlterationEnrichmentTableColumn;
+    } {
+        const columns: {
+            [columnEnum: string]: AlterationEnrichmentTableColumn;
+        } = this.props.customColumns || {};
 
         columns[AlterationEnrichmentTableColumnType.GENE] = {
-            name: "Gene",
-            render: (d: AlterationEnrichmentRow) => <div style={{ display: 'flex' }}>
-                {this.props.onCheckGene && this.props.checkedGenes && (
-                    <Checkbox checked={this.props.checkedGenes.includes(d.hugoGeneSymbol)}
-                              disabled={d.disabled}
-                              key={d.hugoGeneSymbol}
-                              className={styles.Checkbox}
-                              onChange={() => {
-                                  this.checkboxChange(d.hugoGeneSymbol);
-                              }}
-                              onClick={(e)=>{
-                                  e.stopPropagation();
-                              }}
-                              title={d.disabled ? "This is one of the query genes" : ""}
-                    />
-                )}
-                <span className={styles.GeneName}><b>{d.hugoGeneSymbol}</b></span></div>,
+            name: 'Gene',
+            render: (d: AlterationEnrichmentRow) => (
+                <div style={{ display: 'flex' }}>
+                    {this.props.onCheckGene && this.props.checkedGenes && (
+                        <Checkbox
+                            checked={this.props.checkedGenes.includes(
+                                d.hugoGeneSymbol
+                            )}
+                            disabled={d.disabled}
+                            key={d.hugoGeneSymbol}
+                            className={styles.Checkbox}
+                            onChange={() => {
+                                this.checkboxChange(d.hugoGeneSymbol);
+                            }}
+                            onClick={e => {
+                                e.stopPropagation();
+                            }}
+                            title={
+                                d.disabled
+                                    ? 'This is one of the query genes'
+                                    : ''
+                            }
+                        />
+                    )}
+                    <span className={styles.GeneName}>
+                        <b>{d.hugoGeneSymbol}</b>
+                    </span>
+                </div>
+            ),
             tooltip: <span>Gene</span>,
-            filter: (d: AlterationEnrichmentRow, filterString: string, filterStringUpper: string) =>
-                d.hugoGeneSymbol.toUpperCase().includes(filterStringUpper),
+            filter: (
+                d: AlterationEnrichmentRow,
+                filterString: string,
+                filterStringUpper: string
+            ) => d.hugoGeneSymbol.toUpperCase().includes(filterStringUpper),
             sortBy: (d: AlterationEnrichmentRow) => d.hugoGeneSymbol,
-            download: (d: AlterationEnrichmentRow) => d.hugoGeneSymbol
+            download: (d: AlterationEnrichmentRow) => d.hugoGeneSymbol,
         };
 
         columns[AlterationEnrichmentTableColumnType.CYTOBAND] = {
-            name: "Cytoband",
+            name: 'Cytoband',
             render: (d: AlterationEnrichmentRow) => <span>{d.cytoband}</span>,
             tooltip: <span>Cytoband</span>,
             filter: cytobandFilter,
             sortBy: (d: AlterationEnrichmentRow) => d.cytoband,
-            download: (d: AlterationEnrichmentRow) => d.cytoband
+            download: (d: AlterationEnrichmentRow) => d.cytoband,
         };
 
         columns[AlterationEnrichmentTableColumnType.ALTERATION] = {
-            name: "Alteration",
-            render: (d: AlterationEnrichmentRow) => <span style={{ color: d.value! === 2 ? CNA_COLOR_AMP : CNA_COLOR_HOMDEL }}>{cnaToAlteration[d.value!]}</span>,
+            name: 'Alteration',
+            render: (d: AlterationEnrichmentRow) => (
+                <span
+                    style={{
+                        color:
+                            d.value! === 2 ? CNA_COLOR_AMP : CNA_COLOR_HOMDEL,
+                    }}
+                >
+                    {cnaToAlteration[d.value!]}
+                </span>
+            ),
             tooltip: <span>Copy number alteration</span>,
-            filter: (d: AlterationEnrichmentRow, filterString: string, filterStringUpper: string) =>
-                cnaToAlteration[d.value!].toUpperCase().includes(filterStringUpper),
+            filter: (
+                d: AlterationEnrichmentRow,
+                filterString: string,
+                filterStringUpper: string
+            ) =>
+                cnaToAlteration[d.value!]
+                    .toUpperCase()
+                    .includes(filterStringUpper),
             sortBy: (d: AlterationEnrichmentRow) => cnaToAlteration[d.value!],
-            download: (d: AlterationEnrichmentRow) => cnaToAlteration[d.value!]
+            download: (d: AlterationEnrichmentRow) => cnaToAlteration[d.value!],
         };
 
         columns[AlterationEnrichmentTableColumnType.P_VALUE] = {
-            name: "p-Value",
-            render: (d: AlterationEnrichmentRow) => <span style={{ whiteSpace: 'nowrap' }}>{d.pValue !== undefined ? toConditionalPrecision(d.pValue, 3, 0.01) : '-'}</span>,
+            name: 'p-Value',
+            render: (d: AlterationEnrichmentRow) => (
+                <span style={{ whiteSpace: 'nowrap' }}>
+                    {d.pValue !== undefined
+                        ? toConditionalPrecision(d.pValue, 3, 0.01)
+                        : '-'}
+                </span>
+            ),
             tooltip: <span>Derived from one-sided Fisher Exact Test</span>,
             sortBy: (d: AlterationEnrichmentRow) => Number(d.pValue),
-            download: (d: AlterationEnrichmentRow) => d.pValue !== undefined ? toConditionalPrecision(d.pValue, 3, 0.01) : '-'
+            download: (d: AlterationEnrichmentRow) =>
+                d.pValue !== undefined
+                    ? toConditionalPrecision(d.pValue, 3, 0.01)
+                    : '-',
         };
 
         columns[AlterationEnrichmentTableColumnType.Q_VALUE] = {
-            name: "q-Value",
-            render: (d: AlterationEnrichmentRow) => <span style={{ whiteSpace: 'nowrap' }}>{d.qValue !== undefined ? formatSignificanceValueWithStyle(d.qValue) : '-'}</span>,
+            name: 'q-Value',
+            render: (d: AlterationEnrichmentRow) => (
+                <span style={{ whiteSpace: 'nowrap' }}>
+                    {d.qValue !== undefined
+                        ? formatSignificanceValueWithStyle(d.qValue)
+                        : '-'}
+                </span>
+            ),
             tooltip: <span>Derived from Benjamini-Hochberg procedure</span>,
             sortBy: (d: AlterationEnrichmentRow) => Number(d.qValue),
-            download: (d: AlterationEnrichmentRow) => d.qValue !== undefined ? toConditionalPrecision(d.qValue, 3, 0.01) : '-'
+            download: (d: AlterationEnrichmentRow) =>
+                d.qValue !== undefined
+                    ? toConditionalPrecision(d.qValue, 3, 0.01)
+                    : '-',
         };
 
         return columns;
@@ -136,13 +196,23 @@ export default class AlterationEnrichmentTable extends React.Component<IAlterati
 
     public render() {
         const orderedColumns = _.sortBy(
-            this.props.visibleOrderedColumnNames!.map(column=>this.columns[column]),
+            this.props.visibleOrderedColumnNames!.map(
+                column => this.columns[column]
+            ),
             (c: AlterationEnrichmentTableColumn) => c.order
         );
         return (
-            <LazyMobXTable initialItemsPerPage={20} paginationProps={{ itemsPerPageOptions: [20] }}
-                columns={orderedColumns} data={this.props.data} initialSortColumn={this.props.initialSortColumn} 
-                onRowClick={this.props.onGeneNameClick ? this.onRowClick : undefined} dataStore={this.props.dataStore}/>
+            <LazyMobXTable
+                initialItemsPerPage={20}
+                paginationProps={{ itemsPerPageOptions: [20] }}
+                columns={orderedColumns}
+                data={this.props.data}
+                initialSortColumn={this.props.initialSortColumn}
+                onRowClick={
+                    this.props.onGeneNameClick ? this.onRowClick : undefined
+                }
+                dataStore={this.props.dataStore}
+            />
         );
     }
 }
diff --git a/src/pages/resultsView/enrichments/CopyNumberEnrichmentsTab.tsx b/src/pages/resultsView/enrichments/CopyNumberEnrichmentsTab.tsx
index 447dbddae20..630f298ffa8 100644
--- a/src/pages/resultsView/enrichments/CopyNumberEnrichmentsTab.tsx
+++ b/src/pages/resultsView/enrichments/CopyNumberEnrichmentsTab.tsx
@@ -1,34 +1,38 @@
 import * as React from 'react';
-import { observer } from "mobx-react";
-import { ResultsViewPageStore } from "../ResultsViewPageStore";
+import { observer } from 'mobx-react';
+import { ResultsViewPageStore } from '../ResultsViewPageStore';
 import AlterationEnrichmentContainer from 'pages/resultsView/enrichments/AlterationEnrichmentsContainer';
 import Loader from 'shared/components/loadingIndicator/LoadingIndicator';
 import EnrichmentsDataSetDropdown from 'pages/resultsView/enrichments/EnrichmentsDataSetDropdown';
 import { MolecularProfile } from 'shared/api/generated/CBioPortalAPI';
 import autobind from 'autobind-decorator';
-import ErrorMessage from "../../../shared/components/ErrorMessage";
+import ErrorMessage from '../../../shared/components/ErrorMessage';
 import { AlterationContainerType } from './EnrichmentsUtil';
-import {makeUniqueColorGetter} from "shared/components/plots/PlotUtils";
-import {MakeMobxView} from "../../../shared/components/MobxView";
+import { makeUniqueColorGetter } from 'shared/components/plots/PlotUtils';
+import { MakeMobxView } from '../../../shared/components/MobxView';
 
 export interface ICopyNumberEnrichmentsTabProps {
-    store: ResultsViewPageStore
+    store: ResultsViewPageStore;
 }
 
 @observer
-export default class CopyNumberEnrichmentsTab extends React.Component<ICopyNumberEnrichmentsTabProps, {}> {
-
+export default class CopyNumberEnrichmentsTab extends React.Component<
+    ICopyNumberEnrichmentsTabProps,
+    {}
+> {
     private uniqueColorGetter = makeUniqueColorGetter();
     private alteredColor = this.uniqueColorGetter();
     private unalteredColor = this.uniqueColorGetter();
 
     @autobind
-    private onProfileChange(profileMap:{[studyId:string]:MolecularProfile}) {
+    private onProfileChange(profileMap: {
+        [studyId: string]: MolecularProfile;
+    }) {
         this.props.store.setCopyNumberEnrichmentProfileMap(profileMap);
     }
 
     readonly tabUI = MakeMobxView({
-        await:()=>[
+        await: () => [
             this.props.store.copyNumberHomdelEnrichmentData,
             this.props.store.copyNumberAmpEnrichmentData,
             this.props.store.alteredSampleKeys,
@@ -36,14 +40,17 @@ export default class CopyNumberEnrichmentsTab extends React.Component<ICopyNumbe
             this.props.store.alteredPatientKeys,
             this.props.store.unalteredPatientKeys,
             this.props.store.studies,
-            this.props.store.selectedCopyNumberEnrichmentProfileMap
+            this.props.store.selectedCopyNumberEnrichmentProfileMap,
         ],
-        render:()=>{
+        render: () => {
             const patientLevel = this.props.store.usePatientLevelEnrichments;
-            let profileName: string = "";
+            let profileName: string = '';
             const studies = this.props.store.studies.result!;
             if (studies.length === 1) {
-                profileName = ' - ' + this.props.store.selectedMutationEnrichmentProfileMap.result![studies[0].studyId].name;
+                profileName =
+                    ' - ' +
+                    this.props.store.selectedMutationEnrichmentProfileMap
+                        .result![studies[0].studyId].name;
             }
 
             return (
@@ -51,60 +58,109 @@ export default class CopyNumberEnrichmentsTab extends React.Component<ICopyNumbe
                     <EnrichmentsDataSetDropdown
                         dataSets={this.props.store.copyNumberEnrichmentProfiles}
                         onChange={this.onProfileChange}
-                        selectedProfileByStudyId={this.props.store.selectedCopyNumberEnrichmentProfileMap.result!}
-                        molecularProfileIdToProfiledSampleCount={this.props.store.molecularProfileIdToProfiledSampleCount}
+                        selectedProfileByStudyId={
+                            this.props.store
+                                .selectedCopyNumberEnrichmentProfileMap.result!
+                        }
+                        molecularProfileIdToProfiledSampleCount={
+                            this.props.store
+                                .molecularProfileIdToProfiledSampleCount
+                        }
                         studies={this.props.store.studies.result!}
                     />
-                    <AlterationEnrichmentContainer data={this.props.store.copyNumberHomdelEnrichmentData.result!}
-                                                   groups={[
-                                                       {
-                                                           name: "Altered group",
-                                                           description: `Number (percentage) of ${patientLevel ? "patients" : "samples"} that have alterations in the query gene(s) that also have a deep deletion in the listed gene.`,
-                                                           nameOfEnrichmentDirection: "Co-occurrence",
-                                                           count: patientLevel ? this.props.store.alteredPatientKeys.result!.length : this.props.store.alteredSampleKeys.result!.length,
-                                                           color: this.alteredColor
-                                                       }, {
-                                                           name: "Unaltered group",
-                                                           description: `Number (percentage) of ${patientLevel ? "patients" : "samples"} that do not have alterations in the query gene(s) that have a deep deletion in the listed gene.`,
-                                                           nameOfEnrichmentDirection: "Mutual exclusivity",
-                                                           count: patientLevel ? this.props.store.unalteredPatientKeys.result!.length : this.props.store.unalteredSampleKeys.result!.length,
-                                                           color: this.unalteredColor
-                                                       }
-                                                   ]}
-                                                   headerName={"Deep Deletion" + profileName}
-                                                   store={this.props.store}
-                                                   containerType={AlterationContainerType.COPY_NUMBER}
-                                                   patientLevelEnrichments={this.props.store.usePatientLevelEnrichments}
-                                                   onSetPatientLevelEnrichments={this.props.store.setUsePatientLevelEnrichments}
+                    <AlterationEnrichmentContainer
+                        data={
+                            this.props.store.copyNumberHomdelEnrichmentData
+                                .result!
+                        }
+                        groups={[
+                            {
+                                name: 'Altered group',
+                                description: `Number (percentage) of ${
+                                    patientLevel ? 'patients' : 'samples'
+                                } that have alterations in the query gene(s) that also have a deep deletion in the listed gene.`,
+                                nameOfEnrichmentDirection: 'Co-occurrence',
+                                count: patientLevel
+                                    ? this.props.store.alteredPatientKeys
+                                          .result!.length
+                                    : this.props.store.alteredSampleKeys.result!
+                                          .length,
+                                color: this.alteredColor,
+                            },
+                            {
+                                name: 'Unaltered group',
+                                description: `Number (percentage) of ${
+                                    patientLevel ? 'patients' : 'samples'
+                                } that do not have alterations in the query gene(s) that have a deep deletion in the listed gene.`,
+                                nameOfEnrichmentDirection: 'Mutual exclusivity',
+                                count: patientLevel
+                                    ? this.props.store.unalteredPatientKeys
+                                          .result!.length
+                                    : this.props.store.unalteredSampleKeys
+                                          .result!.length,
+                                color: this.unalteredColor,
+                            },
+                        ]}
+                        headerName={'Deep Deletion' + profileName}
+                        store={this.props.store}
+                        containerType={AlterationContainerType.COPY_NUMBER}
+                        patientLevelEnrichments={
+                            this.props.store.usePatientLevelEnrichments
+                        }
+                        onSetPatientLevelEnrichments={
+                            this.props.store.setUsePatientLevelEnrichments
+                        }
                     />
                     <hr />
-                    <AlterationEnrichmentContainer data={this.props.store.copyNumberAmpEnrichmentData.result!}
-                                                   groups={[
-                                                       {
-                                                           name: "Altered group",
-                                                           description: `Number (percentage) of ${patientLevel ? "patients" : "samples"} that have alterations in the query gene(s) that also have an amplification in the listed gene.`,
-                                                           nameOfEnrichmentDirection: "Co-occurrence",
-                                                           count: patientLevel ? this.props.store.alteredPatientKeys.result!.length : this.props.store.alteredSampleKeys.result!.length,
-                                                           color: this.alteredColor
-                                                       }, {
-                                                           name: "Unaltered group",
-                                                           description: `Number (percentage) of ${patientLevel ? "patients" : "samples"} that do not have alterations in the query gene(s) that have an amplification in the listed gene.`,
-                                                           nameOfEnrichmentDirection: "Mutual exclusivity",
-                                                           count: patientLevel ? this.props.store.unalteredPatientKeys.result!.length : this.props.store.unalteredSampleKeys.result!.length,
-                                                           color: this.unalteredColor
-                                                       }
-                                                   ]}
-                                                   headerName={"Amplification - " + profileName}
-                                                   store={this.props.store}
-                                                   containerType={AlterationContainerType.COPY_NUMBER}
-                                                   patientLevelEnrichments={this.props.store.usePatientLevelEnrichments}
-                                                   onSetPatientLevelEnrichments={this.props.store.setUsePatientLevelEnrichments}
+                    <AlterationEnrichmentContainer
+                        data={
+                            this.props.store.copyNumberAmpEnrichmentData.result!
+                        }
+                        groups={[
+                            {
+                                name: 'Altered group',
+                                description: `Number (percentage) of ${
+                                    patientLevel ? 'patients' : 'samples'
+                                } that have alterations in the query gene(s) that also have an amplification in the listed gene.`,
+                                nameOfEnrichmentDirection: 'Co-occurrence',
+                                count: patientLevel
+                                    ? this.props.store.alteredPatientKeys
+                                          .result!.length
+                                    : this.props.store.alteredSampleKeys.result!
+                                          .length,
+                                color: this.alteredColor,
+                            },
+                            {
+                                name: 'Unaltered group',
+                                description: `Number (percentage) of ${
+                                    patientLevel ? 'patients' : 'samples'
+                                } that do not have alterations in the query gene(s) that have an amplification in the listed gene.`,
+                                nameOfEnrichmentDirection: 'Mutual exclusivity',
+                                count: patientLevel
+                                    ? this.props.store.unalteredPatientKeys
+                                          .result!.length
+                                    : this.props.store.unalteredSampleKeys
+                                          .result!.length,
+                                color: this.unalteredColor,
+                            },
+                        ]}
+                        headerName={'Amplification - ' + profileName}
+                        store={this.props.store}
+                        containerType={AlterationContainerType.COPY_NUMBER}
+                        patientLevelEnrichments={
+                            this.props.store.usePatientLevelEnrichments
+                        }
+                        onSetPatientLevelEnrichments={
+                            this.props.store.setUsePatientLevelEnrichments
+                        }
                     />
                 </div>
             );
         },
-        renderPending:()=><Loader isLoading={true} center={true} size={"big"} />,
-        renderError:()=><ErrorMessage/>
+        renderPending: () => (
+            <Loader isLoading={true} center={true} size={'big'} />
+        ),
+        renderError: () => <ErrorMessage />,
     });
 
     public render() {
diff --git a/src/pages/resultsView/enrichments/EnrichmentsDataSetDropdown.tsx b/src/pages/resultsView/enrichments/EnrichmentsDataSetDropdown.tsx
index 00f686d066a..52e5292b7b5 100644
--- a/src/pages/resultsView/enrichments/EnrichmentsDataSetDropdown.tsx
+++ b/src/pages/resultsView/enrichments/EnrichmentsDataSetDropdown.tsx
@@ -1,44 +1,68 @@
 import * as React from 'react';
-import { observer } from "mobx-react";
+import { observer } from 'mobx-react';
 import { computed } from 'mobx';
-import styles from "./styles.module.scss";
-import { MolecularProfile, CancerStudy } from 'shared/api/generated/CBioPortalAPI';
+import styles from './styles.module.scss';
+import {
+    MolecularProfile,
+    CancerStudy,
+} from 'shared/api/generated/CBioPortalAPI';
 import autobind from 'autobind-decorator';
-import MolecularProfileSelector from "../../../shared/components/MolecularProfileSelector";
-import { MobxPromise } from "mobxpromise";
-import * as _ from "lodash";
+import MolecularProfileSelector from '../../../shared/components/MolecularProfileSelector';
+import { MobxPromise } from 'mobxpromise';
+import * as _ from 'lodash';
 import LoadingIndicator from 'shared/components/loadingIndicator/LoadingIndicator';
 
 export interface IEnrichmentsDataSetDropdownProps {
     dataSets: MobxPromise<MolecularProfile[]>;
-    onChange: (studyMolecularProfileMap: { [id: string]: MolecularProfile }) => void;
-    selectedProfileByStudyId: { [id: string]: Pick<MolecularProfile, "molecularProfileId"> };
-    molecularProfileIdToProfiledSampleCount?: MobxPromise<{ [molecularProfileId: string]: number }>;
-    studies: CancerStudy[]
-    alwaysShow?: boolean
+    onChange: (studyMolecularProfileMap: {
+        [id: string]: MolecularProfile;
+    }) => void;
+    selectedProfileByStudyId: {
+        [id: string]: Pick<MolecularProfile, 'molecularProfileId'>;
+    };
+    molecularProfileIdToProfiledSampleCount?: MobxPromise<{
+        [molecularProfileId: string]: number;
+    }>;
+    studies: CancerStudy[];
+    alwaysShow?: boolean;
 }
 
 @observer
-export default class EnrichmentsDataSetDropdown extends React.Component<IEnrichmentsDataSetDropdownProps, {}> {
-
+export default class EnrichmentsDataSetDropdown extends React.Component<
+    IEnrichmentsDataSetDropdownProps,
+    {}
+> {
     @autobind
     private change(selectedStudyId: string, o: any) {
         // at this point, we know dataSets is complete because otherwise this callback wouldnt be fired
-        let updatedStudyMolecularProfileMap = _.mapValues(this.props.selectedProfileByStudyId, (molecularProfile, studyId) => {
-            if (selectedStudyId === studyId) {
-                return this.molecularProfileMap[o.value];
+        let updatedStudyMolecularProfileMap = _.mapValues(
+            this.props.selectedProfileByStudyId,
+            (molecularProfile, studyId) => {
+                if (selectedStudyId === studyId) {
+                    return this.molecularProfileMap[o.value];
+                }
+                return this.molecularProfileMap[
+                    molecularProfile.molecularProfileId
+                ];
             }
-            return this.molecularProfileMap[molecularProfile.molecularProfileId];
-        });
+        );
         // only update if the options are changed
-        if (!_.isEqual(this.props.selectedProfileByStudyId, updatedStudyMolecularProfileMap)) {
+        if (
+            !_.isEqual(
+                this.props.selectedProfileByStudyId,
+                updatedStudyMolecularProfileMap
+            )
+        ) {
             this.props.onChange(updatedStudyMolecularProfileMap);
         }
     }
 
     @computed private get molecularProfileMap() {
         if (this.props.dataSets.isComplete) {
-            return _.keyBy(this.props.dataSets.result!, x => x.molecularProfileId);
+            return _.keyBy(
+                this.props.dataSets.result!,
+                x => x.molecularProfileId
+            );
         }
         return {};
     }
@@ -49,28 +73,62 @@ export default class EnrichmentsDataSetDropdown extends React.Component<IEnrichm
 
     @computed private get showEnrichmentsDataSetDropdown() {
         if (this.props.dataSets.isComplete) {
-            let molecularProfilesMap = _.groupBy(this.props.dataSets.result!, profile => profile.studyId);
-            return !!_.find(molecularProfilesMap, molecularProfiles => molecularProfiles.length > 1);
+            let molecularProfilesMap = _.groupBy(
+                this.props.dataSets.result!,
+                profile => profile.studyId
+            );
+            return !!_.find(
+                molecularProfilesMap,
+                molecularProfiles => molecularProfiles.length > 1
+            );
         }
         return false;
     }
 
     public render() {
-        if (this.props.dataSets.isPending || (this.props.molecularProfileIdToProfiledSampleCount && this.props.molecularProfileIdToProfiledSampleCount.isPending)) {
-            return <LoadingIndicator isLoading={true} />
+        if (
+            this.props.dataSets.isPending ||
+            (this.props.molecularProfileIdToProfiledSampleCount &&
+                this.props.molecularProfileIdToProfiledSampleCount.isPending)
+        ) {
+            return <LoadingIndicator isLoading={true} />;
         }
         if (this.showEnrichmentsDataSetDropdown || !!this.props.alwaysShow) {
-            let studyProfilesMap = _.groupBy(this.props.dataSets.result!, x => x.studyId)
+            let studyProfilesMap = _.groupBy(
+                this.props.dataSets.result!,
+                x => x.studyId
+            );
             const includeStudyName = Object.keys(studyProfilesMap).length > 1;
             return _.map(studyProfilesMap, (molecularProfiles, studyId) => (
                 <div className={styles.DataSet}>
-                    <div style={{ display: "flex", alignItems: "center" }}>
-                        <strong>{includeStudyName ? this.studiesMap[studyId].name + " " : ""}Data Set:</strong>
-                        <div style={{ display: "inline-block", marginLeft: 5, width: 400 }}>
+                    <div style={{ display: 'flex', alignItems: 'center' }}>
+                        <strong>
+                            {includeStudyName
+                                ? this.studiesMap[studyId].name + ' '
+                                : ''}
+                            Data Set:
+                        </strong>
+                        <div
+                            style={{
+                                display: 'inline-block',
+                                marginLeft: 5,
+                                width: 400,
+                            }}
+                        >
                             <MolecularProfileSelector
-                                value={this.props.selectedProfileByStudyId[studyId].molecularProfileId}
+                                value={
+                                    this.props.selectedProfileByStudyId[studyId]
+                                        .molecularProfileId
+                                }
                                 molecularProfiles={molecularProfiles}
-                                molecularProfileIdToProfiledSampleCount={this.props.molecularProfileIdToProfiledSampleCount ? this.props.molecularProfileIdToProfiledSampleCount.result : undefined}
+                                molecularProfileIdToProfiledSampleCount={
+                                    this.props
+                                        .molecularProfileIdToProfiledSampleCount
+                                        ? this.props
+                                              .molecularProfileIdToProfiledSampleCount
+                                              .result
+                                        : undefined
+                                }
                                 onChange={(o: any) => this.change(studyId, o)}
                             />
                         </div>
diff --git a/src/pages/resultsView/enrichments/EnrichmentsTab.tsx b/src/pages/resultsView/enrichments/EnrichmentsTab.tsx
index eda4602f9e6..d89651cb99c 100644
--- a/src/pages/resultsView/enrichments/EnrichmentsTab.tsx
+++ b/src/pages/resultsView/enrichments/EnrichmentsTab.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
-import { observer } from "mobx-react";
-import { ResultsViewPageStore } from "../ResultsViewPageStore";
+import { observer } from 'mobx-react';
+import { ResultsViewPageStore } from '../ResultsViewPageStore';
 import { MSKTabs, MSKTab } from 'shared/components/MSKTabs/MSKTabs';
 import { observable } from 'mobx';
 import MutationEnrichmentsTab from 'pages/resultsView/enrichments/MutationEnrichmentsTab';
@@ -9,63 +9,109 @@ import MRNAEnrichmentsTab from 'pages/resultsView/enrichments/MRNAEnrichmentsTab
 import ProteinEnrichmentsTab from 'pages/resultsView/enrichments/ProteinEnrichmentsTab';
 import LoadingIndicator from 'shared/components/loadingIndicator/LoadingIndicator';
 import autobind from 'autobind-decorator';
-import OqlStatusBanner from "../../../shared/components/banners/OqlStatusBanner";
-import AlterationFilterWarning from "../../../shared/components/banners/AlterationFilterWarning";
+import OqlStatusBanner from '../../../shared/components/banners/OqlStatusBanner';
+import AlterationFilterWarning from '../../../shared/components/banners/AlterationFilterWarning';
 
 export interface IEnrichmentsTabProps {
-    store: ResultsViewPageStore
+    store: ResultsViewPageStore;
 }
 
 @observer
-export default class EnrichmentsTab extends React.Component<IEnrichmentsTabProps, {}> {
-
-    @observable currentTabId:string;
+export default class EnrichmentsTab extends React.Component<
+    IEnrichmentsTabProps,
+    {}
+> {
+    @observable currentTabId: string;
 
     @autobind
     private handleTabChange(id: string) {
-            this.currentTabId = id;
+        this.currentTabId = id;
     }
 
     public render() {
-
-        if (this.props.store.alteredSampleKeys.isPending || this.props.store.unalteredSampleKeys.isPending) {
-            return <LoadingIndicator isLoading={true} center={true} size={"big"} />;
+        if (
+            this.props.store.alteredSampleKeys.isPending ||
+            this.props.store.unalteredSampleKeys.isPending
+        ) {
+            return (
+                <LoadingIndicator isLoading={true} center={true} size={'big'} />
+            );
         }
 
         if (this.props.store.alteredSampleKeys.result!.length === 0) {
-            return <div className={'alert alert-info'}>No queried samples are altered, therefore this calculation cannot be performed.</div>;
+            return (
+                <div className={'alert alert-info'}>
+                    No queried samples are altered, therefore this calculation
+                    cannot be performed.
+                </div>
+            );
         }
 
         if (this.props.store.unalteredSampleKeys.result!.length === 0) {
-            return <div className={'alert alert-info'}>All queried samples are altered, therefore this calculation cannot be performed.</div>;
+            return (
+                <div className={'alert alert-info'}>
+                    All queried samples are altered, therefore this calculation
+                    cannot be performed.
+                </div>
+            );
         }
 
-        if (this.props.store.mutationEnrichmentProfiles.isPending ||
+        if (
+            this.props.store.mutationEnrichmentProfiles.isPending ||
             this.props.store.copyNumberEnrichmentProfiles.isPending ||
             this.props.store.mRNAEnrichmentProfiles.isPending ||
-            this.props.store.proteinEnrichmentProfiles.isPending) {
-            return <LoadingIndicator isLoading={true} center={true} size={"big"} />;
+            this.props.store.proteinEnrichmentProfiles.isPending
+        ) {
+            return (
+                <LoadingIndicator isLoading={true} center={true} size={'big'} />
+            );
         }
 
         return (
             <div data-test="enrichmentsTabDiv">
-                <div className={"tabMessageContainer"}>
-                    <OqlStatusBanner className="enrichments-oql-status-banner" store={this.props.store} tabReflectsOql={true}/>
-                    <AlterationFilterWarning store={this.props.store}/>
+                <div className={'tabMessageContainer'}>
+                    <OqlStatusBanner
+                        className="enrichments-oql-status-banner"
+                        store={this.props.store}
+                        tabReflectsOql={true}
+                    />
+                    <AlterationFilterWarning store={this.props.store} />
                 </div>
-                <MSKTabs activeTabId={this.currentTabId} onTabClick={this.handleTabChange} className="secondaryNavigation">
-                    {(this.props.store.mutationEnrichmentProfiles.result!.length > 0) && <MSKTab id="mutations" linkText="Mutations">
-                        <MutationEnrichmentsTab store={this.props.store}/>
-                    </MSKTab>}
-                    {(this.props.store.copyNumberEnrichmentProfiles.result!.length > 0) && <MSKTab id="copynumber" linkText="Copy-number">
-                        <CopyNumberEnrichmentsTab store={this.props.store}/>
-                    </MSKTab>}
-                    {(this.props.store.mRNAEnrichmentProfiles.result!.length > 0 && this.props.store.studies.result!.length === 1) && <MSKTab id="mrna" linkText="mRNA">
-                        <MRNAEnrichmentsTab store={this.props.store}/>
-                    </MSKTab>}
-                    {(this.props.store.proteinEnrichmentProfiles.result!.length > 0 && this.props.store.studies.result!.length === 1) && <MSKTab id="protein" linkText="Protein">
-                        <ProteinEnrichmentsTab store={this.props.store}/>
-                    </MSKTab>}
+                <MSKTabs
+                    activeTabId={this.currentTabId}
+                    onTabClick={this.handleTabChange}
+                    className="secondaryNavigation"
+                >
+                    {this.props.store.mutationEnrichmentProfiles.result!
+                        .length > 0 && (
+                        <MSKTab id="mutations" linkText="Mutations">
+                            <MutationEnrichmentsTab store={this.props.store} />
+                        </MSKTab>
+                    )}
+                    {this.props.store.copyNumberEnrichmentProfiles.result!
+                        .length > 0 && (
+                        <MSKTab id="copynumber" linkText="Copy-number">
+                            <CopyNumberEnrichmentsTab
+                                store={this.props.store}
+                            />
+                        </MSKTab>
+                    )}
+                    {this.props.store.mRNAEnrichmentProfiles.result!.length >
+                        0 &&
+                        this.props.store.studies.result!.length === 1 && (
+                            <MSKTab id="mrna" linkText="mRNA">
+                                <MRNAEnrichmentsTab store={this.props.store} />
+                            </MSKTab>
+                        )}
+                    {this.props.store.proteinEnrichmentProfiles.result!.length >
+                        0 &&
+                        this.props.store.studies.result!.length === 1 && (
+                            <MSKTab id="protein" linkText="Protein">
+                                <ProteinEnrichmentsTab
+                                    store={this.props.store}
+                                />
+                            </MSKTab>
+                        )}
                 </MSKTabs>
             </div>
         );
diff --git a/src/pages/resultsView/enrichments/EnrichmentsTableDataStore.ts b/src/pages/resultsView/enrichments/EnrichmentsTableDataStore.ts
index 8123892b7dd..9758b95d4f3 100644
--- a/src/pages/resultsView/enrichments/EnrichmentsTableDataStore.ts
+++ b/src/pages/resultsView/enrichments/EnrichmentsTableDataStore.ts
@@ -1,16 +1,19 @@
-import { SimpleGetterLazyMobXTableApplicationDataStore } from "shared/lib/ILazyMobXTableApplicationDataStore";
-
-export class EnrichmentsTableDataStore extends SimpleGetterLazyMobXTableApplicationDataStore<any> {
+import { SimpleGetterLazyMobXTableApplicationDataStore } from 'shared/lib/ILazyMobXTableApplicationDataStore';
 
+export class EnrichmentsTableDataStore extends SimpleGetterLazyMobXTableApplicationDataStore<
+    any
+> {
     constructor(
-        getData:()=>any[],
-        getHighlighted:()=>any|undefined,
-        public setHighlighted:(c:any)=>void
+        getData: () => any[],
+        getHighlighted: () => any | undefined,
+        public setHighlighted: (c: any) => void
     ) {
         super(getData);
-        this.dataHighlighter = (d:any) =>{
+        this.dataHighlighter = (d: any) => {
             const highlighted = getHighlighted();
-            return !!(highlighted && (d.entrezGeneId === highlighted.entrezGeneId));
+            return !!(
+                highlighted && d.entrezGeneId === highlighted.entrezGeneId
+            );
         };
     }
 }
diff --git a/src/pages/resultsView/enrichments/EnrichmentsUtil.spec.tsx b/src/pages/resultsView/enrichments/EnrichmentsUtil.spec.tsx
index c2a405a30f7..d877196cf82 100644
--- a/src/pages/resultsView/enrichments/EnrichmentsUtil.spec.tsx
+++ b/src/pages/resultsView/enrichments/EnrichmentsUtil.spec.tsx
@@ -1,360 +1,391 @@
 import { assert } from 'chai';
-import { calculateExpressionTendency,
-    formatPercentage, getAlterationScatterData, getExpressionScatterData,
-    getAlterationRowData, getExpressionRowData, getFilteredData, getBarChartTooltipContent,
-    getAlterationsTooltipContent, getAlterationEnrichmentColumns, getEnrichmentBarPlotData, getGeneListOptions
-} from "./EnrichmentsUtil";
+import {
+    calculateExpressionTendency,
+    formatPercentage,
+    getAlterationScatterData,
+    getExpressionScatterData,
+    getAlterationRowData,
+    getExpressionRowData,
+    getFilteredData,
+    getBarChartTooltipContent,
+    getAlterationsTooltipContent,
+    getAlterationEnrichmentColumns,
+    getEnrichmentBarPlotData,
+    getGeneListOptions,
+} from './EnrichmentsUtil';
 import expect from 'expect';
 import expectJSX from 'expect-jsx';
-import * as _ from "lodash";
+import * as _ from 'lodash';
 
 expect.extend(expectJSX);
 
 const exampleAlterationEnrichments = [
     {
-        "entrezGeneId": 1956,
-        "hugoGeneSymbol": "EGFR",
-        "cytoband": "7p11.2",
-        "counts":[{
-            "alteredCount": 3,
-            "name": "altered group",
-            "profiledCount": 4
-        },{
-            "alteredCount": 0,
-            "name": "unaltered group",
-            "profiledCount": 4
-        }],
-        "pValue": 0.00003645111904935468,
-        "qValue": 0.2521323904643863
+        entrezGeneId: 1956,
+        hugoGeneSymbol: 'EGFR',
+        cytoband: '7p11.2',
+        counts: [
+            {
+                alteredCount: 3,
+                name: 'altered group',
+                profiledCount: 4,
+            },
+            {
+                alteredCount: 0,
+                name: 'unaltered group',
+                profiledCount: 4,
+            },
+        ],
+        pValue: 0.00003645111904935468,
+        qValue: 0.2521323904643863,
     },
     {
-        "entrezGeneId": 6468,
-        "hugoGeneSymbol": "FBXW4",
-        "cytoband": "10q24.32",
-        "counts":[{
-            "alteredCount": 2,
-            "name": "altered group",
-            "profiledCount": 4
-        },{
-            "alteredCount": 0,
-            "name": "unaltered group",
-            "profiledCount": 4
-        }],
-        "pValue": 0.0015673981191222392,
-        "qValue": 0.9385345997286061
+        entrezGeneId: 6468,
+        hugoGeneSymbol: 'FBXW4',
+        cytoband: '10q24.32',
+        counts: [
+            {
+                alteredCount: 2,
+                name: 'altered group',
+                profiledCount: 4,
+            },
+            {
+                alteredCount: 0,
+                name: 'unaltered group',
+                profiledCount: 4,
+            },
+        ],
+        pValue: 0.0015673981191222392,
+        qValue: 0.9385345997286061,
     },
     {
-        "entrezGeneId": 23066,
-        "hugoGeneSymbol": "CAND2",
-        "cytoband": "3p25.2",
-        "counts":[{
-            "alteredCount": 2,
-            "name": "altered group",
-            "profiledCount": 4
-        },{
-            "alteredCount": 0,
-            "name": "unaltered group",
-            "profiledCount": 4
-        }],
-        "pValue": 0.0015673981191222392,
-        "qValue": 0.9385345997286061
-    }
+        entrezGeneId: 23066,
+        hugoGeneSymbol: 'CAND2',
+        cytoband: '3p25.2',
+        counts: [
+            {
+                alteredCount: 2,
+                name: 'altered group',
+                profiledCount: 4,
+            },
+            {
+                alteredCount: 0,
+                name: 'unaltered group',
+                profiledCount: 4,
+            },
+        ],
+        pValue: 0.0015673981191222392,
+        qValue: 0.9385345997286061,
+    },
 ];
 
 const exampleAlterationEnrichmentRowData = [
     {
-        "checked": true,
-        "disabled": true,
-        "entrezGeneId": 1956,
-        "hugoGeneSymbol": "EGFR",
-        "cytoband": "7p11.2",
-        "groupsSet": {
-            "altered group": {
-                "name": "altered group",
-                "alteredCount": 3,
-                "profiledCount": 4,
-                "alteredPercentage": 75
+        checked: true,
+        disabled: true,
+        entrezGeneId: 1956,
+        hugoGeneSymbol: 'EGFR',
+        cytoband: '7p11.2',
+        groupsSet: {
+            'altered group': {
+                name: 'altered group',
+                alteredCount: 3,
+                profiledCount: 4,
+                alteredPercentage: 75,
+            },
+            'unaltered group': {
+                name: 'unaltered group',
+                alteredCount: 0,
+                profiledCount: 4,
+                alteredPercentage: 0,
             },
-            "unaltered group": {
-                "name": "unaltered group",
-                "alteredCount": 0,
-                "profiledCount": 4,
-                "alteredPercentage": 0
-            }
         },
-        "logRatio": Infinity,
-        "pValue": 0.00003645111904935468,
-        "qValue": 0.2521323904643863,
-        "value":undefined,
-        "enrichedGroup":"altered group"
+        logRatio: Infinity,
+        pValue: 0.00003645111904935468,
+        qValue: 0.2521323904643863,
+        value: undefined,
+        enrichedGroup: 'altered group',
     },
     {
-        "checked": false,
-        "disabled": false,
-        "entrezGeneId": 6468,
-        "hugoGeneSymbol": "FBXW4",
-        "cytoband": "10q24.32",
-        "groupsSet": {
-            "altered group": {
-                "name":"altered group",
-                "alteredCount": 2,
-                "profiledCount": 4,
-                "alteredPercentage": 50
+        checked: false,
+        disabled: false,
+        entrezGeneId: 6468,
+        hugoGeneSymbol: 'FBXW4',
+        cytoband: '10q24.32',
+        groupsSet: {
+            'altered group': {
+                name: 'altered group',
+                alteredCount: 2,
+                profiledCount: 4,
+                alteredPercentage: 50,
+            },
+            'unaltered group': {
+                name: 'unaltered group',
+                alteredCount: 0,
+                profiledCount: 4,
+                alteredPercentage: 0,
             },
-            "unaltered group": {
-                "name":"unaltered group",
-                "alteredCount": 0,
-                "profiledCount": 4,
-                "alteredPercentage": 0
-            }
         },
-        "logRatio": Infinity,
-        "pValue": 0.0015673981191222392,
-        "qValue": 0.9385345997286061,
-        "value":undefined,
-        "enrichedGroup":"altered group"
+        logRatio: Infinity,
+        pValue: 0.0015673981191222392,
+        qValue: 0.9385345997286061,
+        value: undefined,
+        enrichedGroup: 'altered group',
     },
     {
-        "checked": false,
-        "disabled": false,
-        "entrezGeneId": 23066,
-        "hugoGeneSymbol": "CAND2",
-        "cytoband": "3p25.2",
-        "groupsSet": {
-            "altered group": {
-                "name":"altered group",
-                "alteredCount": 2,
-                "profiledCount": 4,
-                "alteredPercentage": 50
+        checked: false,
+        disabled: false,
+        entrezGeneId: 23066,
+        hugoGeneSymbol: 'CAND2',
+        cytoband: '3p25.2',
+        groupsSet: {
+            'altered group': {
+                name: 'altered group',
+                alteredCount: 2,
+                profiledCount: 4,
+                alteredPercentage: 50,
+            },
+            'unaltered group': {
+                name: 'unaltered group',
+                alteredCount: 0,
+                profiledCount: 4,
+                alteredPercentage: 0,
             },
-            "unaltered group": {
-                "name":"unaltered group",
-                "alteredCount": 0,
-                "profiledCount": 4,
-                "alteredPercentage": 0
-            }
         },
-        "logRatio": Infinity,
-        "pValue": 0.0015673981191222392,
-        "qValue": 0.9385345997286061,
-        "value":undefined,
-        "enrichedGroup":"altered group"
-    }
+        logRatio: Infinity,
+        pValue: 0.0015673981191222392,
+        qValue: 0.9385345997286061,
+        value: undefined,
+        enrichedGroup: 'altered group',
+    },
 ];
 
 const exampleExpressionEnrichments = [
     {
-        "entrezGeneId": 25979,
-        "hugoGeneSymbol": "DHRS7B",
-        "cytoband": "17p11.2",
-        "groupsStatistics": [{
-            "meanExpression": 8.797111512335256,
-            "name": "altered group",
-            "standardDeviation": 0.09305770504332485
-        }, {
-            "meanExpression": 9.548546748530768,
-            "name": "unaltered group",
-            "standardDeviation": 0.5899774772149077
-        }],
-        "pValue": 1.9359580614715825E-9,
-        "qValue": 0.000024032306741578182
+        entrezGeneId: 25979,
+        hugoGeneSymbol: 'DHRS7B',
+        cytoband: '17p11.2',
+        groupsStatistics: [
+            {
+                meanExpression: 8.797111512335256,
+                name: 'altered group',
+                standardDeviation: 0.09305770504332485,
+            },
+            {
+                meanExpression: 9.548546748530768,
+                name: 'unaltered group',
+                standardDeviation: 0.5899774772149077,
+            },
+        ],
+        pValue: 1.9359580614715825e-9,
+        qValue: 0.000024032306741578182,
     },
     {
-        "entrezGeneId": 5774,
-        "hugoGeneSymbol": "PTPN3",
-        "cytoband": "9q31.3",
-        "groupsStatistics": [{
-            "meanExpression": 8.973330136818843,
-            "name": "altered group",
-            "standardDeviation": 0.15386396864659846,
-        }, {
-            "meanExpression": 7.599637956820568,
-            "name": "unaltered group",
-            "standardDeviation": 1.5212548411382572,
-        }],
-        "pValue": 3.698700537372556E-9,
-        "qValue": 0.000024032306741578182
+        entrezGeneId: 5774,
+        hugoGeneSymbol: 'PTPN3',
+        cytoband: '9q31.3',
+        groupsStatistics: [
+            {
+                meanExpression: 8.973330136818843,
+                name: 'altered group',
+                standardDeviation: 0.15386396864659846,
+            },
+            {
+                meanExpression: 7.599637956820568,
+                name: 'unaltered group',
+                standardDeviation: 1.5212548411382572,
+            },
+        ],
+        pValue: 3.698700537372556e-9,
+        qValue: 0.000024032306741578182,
     },
     {
-        "entrezGeneId": 2049,
-        "hugoGeneSymbol": "EPHB3",
-        "cytoband": "3q27.1",
-        "groupsStatistics": [{
-            "meanExpression": 8.082947701098236,
-            "name": "altered group",
-            "standardDeviation": 0.33113816397794055,
-        }, {
-            "meanExpression": 5.430662108616908,
-            "name": "unaltered group",
-            "standardDeviation": 1.8406977746799924,
-        }],
-        "pValue": 5.631839749745262E-9,
-        "qValue": 0.000024395252515979897
-    }
+        entrezGeneId: 2049,
+        hugoGeneSymbol: 'EPHB3',
+        cytoband: '3q27.1',
+        groupsStatistics: [
+            {
+                meanExpression: 8.082947701098236,
+                name: 'altered group',
+                standardDeviation: 0.33113816397794055,
+            },
+            {
+                meanExpression: 5.430662108616908,
+                name: 'unaltered group',
+                standardDeviation: 1.8406977746799924,
+            },
+        ],
+        pValue: 5.631839749745262e-9,
+        qValue: 0.000024395252515979897,
+    },
 ];
 
-const exampleExpressionEnrichmentRowData = [{
-    "checked": false,
-    "disabled": false,
-    "entrezGeneId": 25979,
-    "hugoGeneSymbol": "DHRS7B",
-    "cytoband": "17p11.2",
-    "groupsSet": {
-        "altered group": {
-            "meanExpression": 8.797111512335256,
-            "name": "altered group",
-            "standardDeviation": 0.09305770504332485
+const exampleExpressionEnrichmentRowData = [
+    {
+        checked: false,
+        disabled: false,
+        entrezGeneId: 25979,
+        hugoGeneSymbol: 'DHRS7B',
+        cytoband: '17p11.2',
+        groupsSet: {
+            'altered group': {
+                meanExpression: 8.797111512335256,
+                name: 'altered group',
+                standardDeviation: 0.09305770504332485,
+            },
+            'unaltered group': {
+                meanExpression: 9.548546748530768,
+                name: 'unaltered group',
+                standardDeviation: 0.5899774772149077,
+            },
         },
-        "unaltered group": {
-            "meanExpression": 9.548546748530768,
-            "name": "unaltered group",
-            "standardDeviation": 0.5899774772149077
-        }
+        logRatio: -0.7514352361955119,
+        pValue: 1.9359580614715825e-9,
+        qValue: 0.000024032306741578182,
+        enrichedGroup: 'unaltered group',
     },
-    "logRatio": -0.7514352361955119,
-    "pValue": 1.9359580614715825E-9,
-    "qValue": 0.000024032306741578182,
-    "enrichedGroup":"unaltered group"
-}, {
-    "checked": false,
-    "disabled": false,
-    "entrezGeneId": 5774,
-    "hugoGeneSymbol": "PTPN3",
-    "cytoband": "9q31.3",
-    "groupsSet": {
-        "altered group": {
-            "meanExpression": 8.973330136818843,
-            "name": "altered group",
-            "standardDeviation": 0.15386396864659846,
+    {
+        checked: false,
+        disabled: false,
+        entrezGeneId: 5774,
+        hugoGeneSymbol: 'PTPN3',
+        cytoband: '9q31.3',
+        groupsSet: {
+            'altered group': {
+                meanExpression: 8.973330136818843,
+                name: 'altered group',
+                standardDeviation: 0.15386396864659846,
+            },
+            'unaltered group': {
+                meanExpression: 7.599637956820568,
+                name: 'unaltered group',
+                standardDeviation: 1.5212548411382572,
+            },
         },
-        "unaltered group": {
-            "meanExpression": 7.599637956820568,
-            "name": "unaltered group",
-            "standardDeviation": 1.5212548411382572,
-        }
+        logRatio: 1.373692179998275,
+        pValue: 3.698700537372556e-9,
+        qValue: 0.000024032306741578182,
+        enrichedGroup: 'altered group',
     },
-    "logRatio": 1.373692179998275,
-    "pValue": 3.698700537372556E-9,
-    "qValue": 0.000024032306741578182,
-    "enrichedGroup":"altered group"
-}, {
-    "checked": false,
-    "disabled": false,
-    "entrezGeneId": 2049,
-    "hugoGeneSymbol": "EPHB3",
-    "cytoband": "3q27.1",
-    "groupsSet": {
-        "altered group": {
-            "meanExpression": 8.082947701098236,
-            "name": "altered group",
-            "standardDeviation": 0.33113816397794055,
+    {
+        checked: false,
+        disabled: false,
+        entrezGeneId: 2049,
+        hugoGeneSymbol: 'EPHB3',
+        cytoband: '3q27.1',
+        groupsSet: {
+            'altered group': {
+                meanExpression: 8.082947701098236,
+                name: 'altered group',
+                standardDeviation: 0.33113816397794055,
+            },
+            'unaltered group': {
+                meanExpression: 5.430662108616908,
+                name: 'unaltered group',
+                standardDeviation: 1.8406977746799924,
+            },
         },
-        "unaltered group": {
-            "meanExpression": 5.430662108616908,
-            "name": "unaltered group",
-            "standardDeviation": 1.8406977746799924,
-        }
+        logRatio: 2.652285592481328,
+        pValue: 5.631839749745262e-9,
+        qValue: 0.000024395252515979897,
+        enrichedGroup: 'altered group',
     },
-    "logRatio": 2.652285592481328,
-    "pValue": 5.631839749745262E-9,
-    "qValue": 0.000024395252515979897,
-    "enrichedGroup":"altered group"
-}];
+];
 
 const exampleAlterations = [
     {
-        alterationSubType: "missense",
-        alterationType: "MUTATION_EXTENDED",
-        center: "hgsc.bcm.edu;broad.mit.edu;ucsc.edu;bcgsc.ca;mdanderson.org",
-        driverFilter: "",
-        driverFilterAnnotation: "",
-        driverTiersFilter: "",
-        driverTiersFilterAnnotation: "",
+        alterationSubType: 'missense',
+        alterationType: 'MUTATION_EXTENDED',
+        center: 'hgsc.bcm.edu;broad.mit.edu;ucsc.edu;bcgsc.ca;mdanderson.org',
+        driverFilter: '',
+        driverFilterAnnotation: '',
+        driverTiersFilter: '',
+        driverTiersFilterAnnotation: '',
         endPosition: 55224349,
         entrezGeneId: 1956,
         fisValue: 1.4013e-45,
-        functionalImpactScore: "",
+        functionalImpactScore: '',
         gene: {
             entrezGeneId: 1956,
-            hugoGeneSymbol: "EGFR",
-            type: "protein-coding",
-            cytoband: "7p11.2",
+            hugoGeneSymbol: 'EGFR',
+            type: 'protein-coding',
+            cytoband: '7p11.2',
             length: 188307,
-            chromosome: "7"
+            chromosome: '7',
         },
-        keyword: "EGFR R377 missense",
-        linkMsa: "",
-        linkPdb: "",
-        linkXvar: "",
-        molecularProfileAlterationType: "MUTATION_EXTENDED",
-        molecularProfileId: "acc_tcga_mutations",
-        mutationStatus: "Somatic",
-        mutationType: "Missense_Mutation",
-        ncbiBuild: "GRCh37",
+        keyword: 'EGFR R377 missense',
+        linkMsa: '',
+        linkPdb: '',
+        linkXvar: '',
+        molecularProfileAlterationType: 'MUTATION_EXTENDED',
+        molecularProfileId: 'acc_tcga_mutations',
+        mutationStatus: 'Somatic',
+        mutationType: 'Missense_Mutation',
+        ncbiBuild: 'GRCh37',
         normalAltCount: 0,
         normalRefCount: 110,
-        patientId: "TCGA-OR-A5K0",
-        proteinChange: "R377K",
+        patientId: 'TCGA-OR-A5K0',
+        proteinChange: 'R377K',
         proteinPosEnd: 377,
         proteinPosStart: 377,
-        referenceAllele: "G",
-        refseqMrnaId: "NM_005228.3",
-        sampleId: "TCGA-OR-A5K0-01",
+        referenceAllele: 'G',
+        refseqMrnaId: 'NM_005228.3',
+        sampleId: 'TCGA-OR-A5K0-01',
         startPosition: 55224349,
-        studyId: "acc_tcga",
+        studyId: 'acc_tcga',
         tumorAltCount: 66,
         tumorRefCount: 53,
-        uniquePatientKey: "VENHQS1PUi1BNUswOmFjY190Y2dh",
-        uniqueSampleKey: "VENHQS1PUi1BNUswLTAxOmFjY190Y2dh",
-        validationStatus: "Untested",
-        variantAllele: "A",
-        variantType: "SNP"
+        uniquePatientKey: 'VENHQS1PUi1BNUswOmFjY190Y2dh',
+        uniqueSampleKey: 'VENHQS1PUi1BNUswLTAxOmFjY190Y2dh',
+        validationStatus: 'Untested',
+        variantAllele: 'A',
+        variantType: 'SNP',
     },
     {
-        alterationSubType: "amp",
-        alterationType: "COPY_NUMBER_ALTERATION",
+        alterationSubType: 'amp',
+        alterationType: 'COPY_NUMBER_ALTERATION',
         entrezGeneId: 1956,
         gene: {
             entrezGeneId: 1956,
-            hugoGeneSymbol: "EGFR",
-            type: "protein-coding",
-            cytoband: "7p11.2",
-            length: 188307
+            hugoGeneSymbol: 'EGFR',
+            type: 'protein-coding',
+            cytoband: '7p11.2',
+            length: 188307,
         },
-        molecularProfileAlterationType: "COPY_NUMBER_ALTERATION",
-        molecularProfileId: "acc_tcga_gistic",
-        patientId: "TCGA-OR-A5LO",
-        sampleId: "TCGA-OR-A5LO-01",
-        studyId: "acc_tcga",
-        uniquePatientKey: "VENHQS1PUi1BNUxPOmFjY190Y2dh",
-        uniqueSampleKey: "VENHQS1PUi1BNUxPLTAxOmFjY190Y2dh",
-        value: 2
-    }
-]
+        molecularProfileAlterationType: 'COPY_NUMBER_ALTERATION',
+        molecularProfileId: 'acc_tcga_gistic',
+        patientId: 'TCGA-OR-A5LO',
+        sampleId: 'TCGA-OR-A5LO-01',
+        studyId: 'acc_tcga',
+        uniquePatientKey: 'VENHQS1PUi1BNUxPOmFjY190Y2dh',
+        uniqueSampleKey: 'VENHQS1PUi1BNUxPLTAxOmFjY190Y2dh',
+        value: 2,
+    },
+];
 
 const exampleBoxPlotScatterData = [
     {
         x: 1.922684807165747,
         y: 9.940678152790728,
-        sampleId: "TCGA-OR-A5J1-01",
-        studyId: "acc_tcga",
-        alterations: ""
+        sampleId: 'TCGA-OR-A5J1-01',
+        studyId: 'acc_tcga',
+        alterations: '',
     },
     {
         x: 2.0781361505168783,
         y: 8.34481740339671,
-        sampleId: "TCGA-OR-A5J2-01",
-        studyId: "acc_tcga",
-        alterations: ""
+        sampleId: 'TCGA-OR-A5J2-01',
+        studyId: 'acc_tcga',
+        alterations: '',
     },
     {
         x: 1.8867908893279546,
         y: 9.660310790006957,
-        sampleId: "TCGA-OR-A5J3-01",
-        studyId: "acc_tcga",
-        alterations: ""
-    }
-]
+        sampleId: 'TCGA-OR-A5J3-01',
+        studyId: 'acc_tcga',
+        alterations: '',
+    },
+];
 
 const exampleMolecularData = [
     {
@@ -362,258 +393,414 @@ const exampleMolecularData = [
         gene: {
             geneticEntityId: 9829,
             entrezGeneId: 25979,
-            hugoGeneSymbol: "DHRS7B",
-            type: "protein-coding"
+            hugoGeneSymbol: 'DHRS7B',
+            type: 'protein-coding',
         },
-        molecularProfileId:"acc_tcga_rna_seq_v2_mrna",
-        patientId:"TCGA-OR-A5J1",
-        sampleId:"TCGA-OR-A5J1-01",
-        studyId:"acc_tcga",
-        uniquePatientKey:"VENHQS1PUi1BNUoxOmFjY190Y2dh",
-        uniqueSampleKey:"VENHQS1PUi1BNUoxLTAxOmFjY190Y2dh",
-        value:981.7483
+        molecularProfileId: 'acc_tcga_rna_seq_v2_mrna',
+        patientId: 'TCGA-OR-A5J1',
+        sampleId: 'TCGA-OR-A5J1-01',
+        studyId: 'acc_tcga',
+        uniquePatientKey: 'VENHQS1PUi1BNUoxOmFjY190Y2dh',
+        uniqueSampleKey: 'VENHQS1PUi1BNUoxLTAxOmFjY190Y2dh',
+        value: 981.7483,
     },
     {
-        entrezGeneId:25979,
+        entrezGeneId: 25979,
         gene: {
             geneticEntityId: 9829,
             entrezGeneId: 25979,
-            hugoGeneSymbol: "DHRS7B",
-            type: "protein-coding"
+            hugoGeneSymbol: 'DHRS7B',
+            type: 'protein-coding',
         },
-        molecularProfileId:"acc_tcga_rna_seq_v2_mrna",
-        patientId:"TCGA-OR-A5J2",
-        sampleId:"TCGA-OR-A5J2-01",
-        studyId:"acc_tcga",
-        uniquePatientKey:"VENHQS1PUi1BNUoyOmFjY190Y2dh",
-        uniqueSampleKey:"VENHQS1PUi1BNUoyLTAxOmFjY190Y2dh",
-        value:324.1175
+        molecularProfileId: 'acc_tcga_rna_seq_v2_mrna',
+        patientId: 'TCGA-OR-A5J2',
+        sampleId: 'TCGA-OR-A5J2-01',
+        studyId: 'acc_tcga',
+        uniquePatientKey: 'VENHQS1PUi1BNUoyOmFjY190Y2dh',
+        uniqueSampleKey: 'VENHQS1PUi1BNUoyLTAxOmFjY190Y2dh',
+        value: 324.1175,
     },
     {
-        entrezGeneId:25979,
+        entrezGeneId: 25979,
         gene: {
             geneticEntityId: 9829,
             entrezGeneId: 25979,
-            hugoGeneSymbol: "DHRS7B",
-            type: "protein-coding"
+            hugoGeneSymbol: 'DHRS7B',
+            type: 'protein-coding',
         },
-        molecularProfileId:"acc_tcga_rna_seq_v2_mrna",
-        patientId:"TCGA-OR-A5J3",
-        sampleId:"TCGA-OR-A5J3-01",
-        studyId:"acc_tcga",
-        uniquePatientKey:"VENHQS1PUi1BNUozOmFjY190Y2dh",
-        uniqueSampleKey:"VENHQS1PUi1BNUozLTAxOmFjY190Y2dh",
-        value:808.1766
-    }
-]
-
-describe("EnrichmentsUtil", () => {
-
-    describe("#calculateExpressionTendency()", () => {
-        it("returns Over-expressed for 3", () => {
-            assert.equal(calculateExpressionTendency(3), "Over-expressed");
+        molecularProfileId: 'acc_tcga_rna_seq_v2_mrna',
+        patientId: 'TCGA-OR-A5J3',
+        sampleId: 'TCGA-OR-A5J3-01',
+        studyId: 'acc_tcga',
+        uniquePatientKey: 'VENHQS1PUi1BNUozOmFjY190Y2dh',
+        uniqueSampleKey: 'VENHQS1PUi1BNUozLTAxOmFjY190Y2dh',
+        value: 808.1766,
+    },
+];
+
+describe('EnrichmentsUtil', () => {
+    describe('#calculateExpressionTendency()', () => {
+        it('returns Over-expressed for 3', () => {
+            assert.equal(calculateExpressionTendency(3), 'Over-expressed');
         });
 
-        it("returns Under-expressed for 0", () => {
-            assert.equal(calculateExpressionTendency(0), "Under-expressed");
+        it('returns Under-expressed for 0', () => {
+            assert.equal(calculateExpressionTendency(0), 'Under-expressed');
         });
 
-        it("returns Under-expressed for -7", () => {
-            assert.equal(calculateExpressionTendency(-7), "Under-expressed");
+        it('returns Under-expressed for -7', () => {
+            assert.equal(calculateExpressionTendency(-7), 'Under-expressed');
         });
     });
 
-    describe("#formatPercentage()", () => {
-        it("returns 3 (75.00%) for altered count 3 and profiled count 4", () => {
-            assert.equal(formatPercentage("altered group", {
-                "groupsSet": {
-                    "altered group": {
-                        "name": "altered group",
-                        "alteredCount": 3,
-                        "alteredPercentage": 75
-                    }
-                }
-            } as any), "3 (75.00%)");
+    describe('#formatPercentage()', () => {
+        it('returns 3 (75.00%) for altered count 3 and profiled count 4', () => {
+            assert.equal(
+                formatPercentage('altered group', {
+                    groupsSet: {
+                        'altered group': {
+                            name: 'altered group',
+                            alteredCount: 3,
+                            alteredPercentage: 75,
+                        },
+                    },
+                } as any),
+                '3 (75.00%)'
+            );
         });
 
-        it("returns 1 (1.00%) for altered count 1 and profiled count 100", () => {
-            assert.equal(formatPercentage("altered group", {
-                "groupsSet": {
-                    "altered group": {
-                        "name": "altered group",
-                        "alteredCount": 1,
-                        "alteredPercentage": 1
-                    }
-                }
-            } as any), "1 (1.00%)");
+        it('returns 1 (1.00%) for altered count 1 and profiled count 100', () => {
+            assert.equal(
+                formatPercentage('altered group', {
+                    groupsSet: {
+                        'altered group': {
+                            name: 'altered group',
+                            alteredCount: 1,
+                            alteredPercentage: 1,
+                        },
+                    },
+                } as any),
+                '1 (1.00%)'
+            );
         });
     });
 
-    describe("#getAlterationScatterData()", () => {
-        it("returns empty array for empty array", () => {
+    describe('#getAlterationScatterData()', () => {
+        it('returns empty array for empty array', () => {
             assert.deepEqual(getAlterationScatterData([], []), []);
         });
 
-        it("returns correct scatter data", () => {
-            assert.deepEqual(getAlterationScatterData(exampleAlterationEnrichmentRowData as any, ["EGFR"]), [
-                {x: 10, y: 2.804820678721167, hugoGeneSymbol: "FBXW4", logRatio: Infinity, pValue:0.0015673981191222392, qValue: 0.9385345997286061, hovered: false},
-                {x: 10, y: 2.804820678721167, hugoGeneSymbol: "CAND2", logRatio: Infinity, pValue:0.0015673981191222392, qValue: 0.9385345997286061, hovered: false},
-            ]);
+        it('returns correct scatter data', () => {
+            assert.deepEqual(
+                getAlterationScatterData(
+                    exampleAlterationEnrichmentRowData as any,
+                    ['EGFR']
+                ),
+                [
+                    {
+                        x: 10,
+                        y: 2.804820678721167,
+                        hugoGeneSymbol: 'FBXW4',
+                        logRatio: Infinity,
+                        pValue: 0.0015673981191222392,
+                        qValue: 0.9385345997286061,
+                        hovered: false,
+                    },
+                    {
+                        x: 10,
+                        y: 2.804820678721167,
+                        hugoGeneSymbol: 'CAND2',
+                        logRatio: Infinity,
+                        pValue: 0.0015673981191222392,
+                        qValue: 0.9385345997286061,
+                        hovered: false,
+                    },
+                ]
+            );
         });
     });
 
-    describe("#getExpressionScatterData()", () => {
-        it("returns empty array for empty array", () => {
+    describe('#getExpressionScatterData()', () => {
+        it('returns empty array for empty array', () => {
             assert.deepEqual(getExpressionScatterData([], []), []);
         });
 
-        it("returns correct scatter data", () => {
-            assert.deepEqual(getExpressionScatterData(exampleExpressionEnrichmentRowData, ["EGFR"]), [
-                {x: -0.7514352361955119, y: 8.713104055017682, hugoGeneSymbol: "DHRS7B", entrezGeneId: 25979,
-                    logRatio: -0.7514352361955119, pValue: 1.9359580614715825E-9, qValue: 0.000024032306741578182, hovered: false},
-                {x: 1.373692179998275, y: 8.431950829601448, hugoGeneSymbol: "PTPN3", entrezGeneId: 5774,
-                    logRatio: 1.373692179998275, pValue: 3.698700537372556E-9, qValue: 0.000024032306741578182, hovered: false},
-                {x: 2.652285592481328, y: 8.249349711250797, hugoGeneSymbol: "EPHB3", entrezGeneId: 2049,
-                    logRatio: 2.652285592481328, pValue: 5.631839749745262E-9, qValue: 0.000024395252515979897, hovered: false}
-            ]);
+        it('returns correct scatter data', () => {
+            assert.deepEqual(
+                getExpressionScatterData(exampleExpressionEnrichmentRowData, [
+                    'EGFR',
+                ]),
+                [
+                    {
+                        x: -0.7514352361955119,
+                        y: 8.713104055017682,
+                        hugoGeneSymbol: 'DHRS7B',
+                        entrezGeneId: 25979,
+                        logRatio: -0.7514352361955119,
+                        pValue: 1.9359580614715825e-9,
+                        qValue: 0.000024032306741578182,
+                        hovered: false,
+                    },
+                    {
+                        x: 1.373692179998275,
+                        y: 8.431950829601448,
+                        hugoGeneSymbol: 'PTPN3',
+                        entrezGeneId: 5774,
+                        logRatio: 1.373692179998275,
+                        pValue: 3.698700537372556e-9,
+                        qValue: 0.000024032306741578182,
+                        hovered: false,
+                    },
+                    {
+                        x: 2.652285592481328,
+                        y: 8.249349711250797,
+                        hugoGeneSymbol: 'EPHB3',
+                        entrezGeneId: 2049,
+                        logRatio: 2.652285592481328,
+                        pValue: 5.631839749745262e-9,
+                        qValue: 0.000024395252515979897,
+                        hovered: false,
+                    },
+                ]
+            );
         });
     });
 
-    describe("#getAlterationRowData()", () => {
-        it("returns empty array for empty array", () => {
+    describe('#getAlterationRowData()', () => {
+        it('returns empty array for empty array', () => {
             assert.deepEqual(getAlterationRowData([], [], []), []);
         });
 
-        it("returns correct row data", () => {
-            assert.deepEqual(getAlterationRowData(exampleAlterationEnrichments, ["EGFR"], [{name:"altered group"}, {name:"unaltered group"}]), exampleAlterationEnrichmentRowData as any);
+        it('returns correct row data', () => {
+            assert.deepEqual(
+                getAlterationRowData(
+                    exampleAlterationEnrichments,
+                    ['EGFR'],
+                    [{ name: 'altered group' }, { name: 'unaltered group' }]
+                ),
+                exampleAlterationEnrichmentRowData as any
+            );
         });
     });
 
-    describe("#getExpressionRowData()", () => {
-        it("returns empty array for empty array", () => {
-            assert.deepEqual(getExpressionRowData([], ["EGFR"],[]), []);
+    describe('#getExpressionRowData()', () => {
+        it('returns empty array for empty array', () => {
+            assert.deepEqual(getExpressionRowData([], ['EGFR'], []), []);
         });
 
-        it("returns correct row data", () => {
-            assert.deepEqual(getExpressionRowData(exampleExpressionEnrichments, ["EGFR"], [{name:"altered group"}, {name:"unaltered group"}]), exampleExpressionEnrichmentRowData);
+        it('returns correct row data', () => {
+            assert.deepEqual(
+                getExpressionRowData(
+                    exampleExpressionEnrichments,
+                    ['EGFR'],
+                    [{ name: 'altered group' }, { name: 'unaltered group' }]
+                ),
+                exampleExpressionEnrichmentRowData
+            );
         });
     });
 
-    describe("#getFilteredData()", () => {
-        it("returns correct filtered data", () => {
-            assert.deepEqual(getFilteredData(exampleAlterationEnrichmentRowData as any, ["altered group", "unaltered group"], false, null),
-            exampleAlterationEnrichmentRowData);
-
-            assert.deepEqual(getFilteredData(exampleAlterationEnrichmentRowData as any , ["unaltered group"], true, null), []);
-
-            assert.deepEqual(getFilteredData(exampleAlterationEnrichmentRowData as any, ["altered group"], false, ["FBXW4"]), [
-                {
-                    "checked": false,
-                    "disabled": false,
-                    "entrezGeneId": 6468,
-                    "hugoGeneSymbol": "FBXW4",
-                    "cytoband": "10q24.32",
-                    "groupsSet": {
-                        "altered group": {
-                            "name":"altered group",
-                            "alteredCount": 2,
-                            "profiledCount": 4,
-                            "alteredPercentage": 50
+    describe('#getFilteredData()', () => {
+        it('returns correct filtered data', () => {
+            assert.deepEqual(
+                getFilteredData(
+                    exampleAlterationEnrichmentRowData as any,
+                    ['altered group', 'unaltered group'],
+                    false,
+                    null
+                ),
+                exampleAlterationEnrichmentRowData
+            );
+
+            assert.deepEqual(
+                getFilteredData(
+                    exampleAlterationEnrichmentRowData as any,
+                    ['unaltered group'],
+                    true,
+                    null
+                ),
+                []
+            );
+
+            assert.deepEqual(
+                getFilteredData(
+                    exampleAlterationEnrichmentRowData as any,
+                    ['altered group'],
+                    false,
+                    ['FBXW4']
+                ),
+                [
+                    {
+                        checked: false,
+                        disabled: false,
+                        entrezGeneId: 6468,
+                        hugoGeneSymbol: 'FBXW4',
+                        cytoband: '10q24.32',
+                        groupsSet: {
+                            'altered group': {
+                                name: 'altered group',
+                                alteredCount: 2,
+                                profiledCount: 4,
+                                alteredPercentage: 50,
+                            },
+                            'unaltered group': {
+                                name: 'unaltered group',
+                                alteredCount: 0,
+                                profiledCount: 4,
+                                alteredPercentage: 0,
+                            },
                         },
-                        "unaltered group": {
-                            "name":"unaltered group",
-                            "alteredCount": 0,
-                            "profiledCount": 4,
-                            "alteredPercentage": 0
-                        }
+                        logRatio: Infinity,
+                        pValue: 0.0015673981191222392,
+                        qValue: 0.9385345997286061,
+                        enrichedGroup: 'altered group',
+                        value: undefined,
                     },
-                    "logRatio": Infinity,
-                    "pValue": 0.0015673981191222392,
-                    "qValue": 0.9385345997286061,
-                    "enrichedGroup": "altered group",
-                    "value":undefined
-                }
-            ]);
+                ]
+            );
         });
     });
 
-    describe("#getBarChartTooltipContent()", () => {
-        it("returns correct tooltip content", () => {
+    describe('#getBarChartTooltipContent()', () => {
+        it('returns correct tooltip content', () => {
             const exampleTooltipModel1 = {
                 datum: {
                     x: 2,
                     y: 1,
-                    index: 0
-                }
+                    index: 0,
+                },
             };
-            assert.equal(getBarChartTooltipContent(exampleTooltipModel1, "EGFR"), "Query Genes Altered: 1");
+            assert.equal(
+                getBarChartTooltipContent(exampleTooltipModel1, 'EGFR'),
+                'Query Genes Altered: 1'
+            );
 
             const exampleTooltipModel2 = {
                 datum: {
                     x: 2,
                     y: 5,
-                    index: 1
-                }
+                    index: 1,
+                },
             };
-            assert.equal(getBarChartTooltipContent(exampleTooltipModel2, "EGFR"), "Query Genes Unaltered: 5");
+            assert.equal(
+                getBarChartTooltipContent(exampleTooltipModel2, 'EGFR'),
+                'Query Genes Unaltered: 5'
+            );
 
             const exampleTooltipModel3 = {
                 datum: {
                     x: 4,
                     y: 1,
-                    index: 0
-                }
+                    index: 0,
+                },
             };
-            assert.equal(getBarChartTooltipContent(exampleTooltipModel3, "EGFR"), "Query Genes Altered, EGFR Unaltered: 1");
+            assert.equal(
+                getBarChartTooltipContent(exampleTooltipModel3, 'EGFR'),
+                'Query Genes Altered, EGFR Unaltered: 1'
+            );
 
             const exampleTooltipModel4 = {
                 datum: {
                     x: 1,
                     y: 1,
-                    index: 1
-                }
+                    index: 1,
+                },
             };
-            assert.equal(getBarChartTooltipContent(exampleTooltipModel4, "EGFR"), "Query Genes Altered, EGFR Altered: 1");
+            assert.equal(
+                getBarChartTooltipContent(exampleTooltipModel4, 'EGFR'),
+                'Query Genes Altered, EGFR Altered: 1'
+            );
 
             const exampleTooltipModel5 = {
                 datum: {
                     x: 3,
                     y: 3,
-                    index: 2
-                }
+                    index: 2,
+                },
             };
-            assert.equal(getBarChartTooltipContent(exampleTooltipModel5, "EGFR"), "Query Genes Unaltered, EGFR Altered: 3");
+            assert.equal(
+                getBarChartTooltipContent(exampleTooltipModel5, 'EGFR'),
+                'Query Genes Unaltered, EGFR Altered: 3'
+            );
 
             const exampleTooltipModel6 = {
                 datum: {
                     x: 4,
                     y: 4,
-                    index: 3
-                }
+                    index: 3,
+                },
             };
-            assert.equal(getBarChartTooltipContent(exampleTooltipModel6, "EGFR"), "Query Genes Unaltered, EGFR Unaltered: 4");
+            assert.equal(
+                getBarChartTooltipContent(exampleTooltipModel6, 'EGFR'),
+                'Query Genes Unaltered, EGFR Unaltered: 4'
+            );
         });
     });
 
-    describe("#getAlterationsTooltipContent()", () => {
-        it("returns correct tooltip content", () => {
-            assert.equal(getAlterationsTooltipContent(exampleAlterations), "EGFR: MUT; AMP; ");
+    describe('#getAlterationsTooltipContent()', () => {
+        it('returns correct tooltip content', () => {
+            assert.equal(
+                getAlterationsTooltipContent(exampleAlterations),
+                'EGFR: MUT; AMP; '
+            );
         });
     });
 
-    describe("#getGroupColumns()", () => {
-        it("returns correct group columns", () => {
-            assert.deepEqual(getAlterationEnrichmentColumns([]),[]);
-            assert.deepEqual(_.map(getAlterationEnrichmentColumns([{name:"altered group", description:""}]),datum=>datum.name),[]);
-            assert.deepEqual(_.map(getAlterationEnrichmentColumns([{name:"altered group", description:""},{name:"unaltered group", description:""}], true),datum=>datum.name),["Log Ratio", "Tendency", "altered group", "unaltered group"]);
-            assert.deepEqual(_.map(getAlterationEnrichmentColumns([{name:"group1", description:""},{name:"group2", description:""}]),datum=>datum.name),["Log Ratio", "Enriched in", "group1", "group2"]);
-            assert.deepEqual(_.map(getAlterationEnrichmentColumns([{name:"group1", description:""},{name:"group2", description:""}, {name:"group3", description:""}]),datum=>datum.name),["Most enriched in", "group1", "group2", "group3"]);
+    describe('#getGroupColumns()', () => {
+        it('returns correct group columns', () => {
+            assert.deepEqual(getAlterationEnrichmentColumns([]), []);
+            assert.deepEqual(
+                _.map(
+                    getAlterationEnrichmentColumns([
+                        { name: 'altered group', description: '' },
+                    ]),
+                    datum => datum.name
+                ),
+                []
+            );
+            assert.deepEqual(
+                _.map(
+                    getAlterationEnrichmentColumns(
+                        [
+                            { name: 'altered group', description: '' },
+                            { name: 'unaltered group', description: '' },
+                        ],
+                        true
+                    ),
+                    datum => datum.name
+                ),
+                ['Log Ratio', 'Tendency', 'altered group', 'unaltered group']
+            );
+            assert.deepEqual(
+                _.map(
+                    getAlterationEnrichmentColumns([
+                        { name: 'group1', description: '' },
+                        { name: 'group2', description: '' },
+                    ]),
+                    datum => datum.name
+                ),
+                ['Log Ratio', 'Enriched in', 'group1', 'group2']
+            );
+            assert.deepEqual(
+                _.map(
+                    getAlterationEnrichmentColumns([
+                        { name: 'group1', description: '' },
+                        { name: 'group2', description: '' },
+                        { name: 'group3', description: '' },
+                    ]),
+                    datum => datum.name
+                ),
+                ['Most enriched in', 'group1', 'group2', 'group3']
+            );
         });
     });
 
-    describe("#getEnrichmentBarPlotData()", () => {
-        it("returns correct data", () => {
-            const data = _.keyBy(exampleAlterationEnrichmentRowData, datum => datum.hugoGeneSymbol);
+    describe('#getEnrichmentBarPlotData()', () => {
+        it('returns correct data', () => {
+            const data = _.keyBy(
+                exampleAlterationEnrichmentRowData,
+                datum => datum.hugoGeneSymbol
+            );
             //empty requests
             assert.deepEqual(getEnrichmentBarPlotData({}, []), []);
             //empty genes
@@ -622,45 +809,86 @@ describe("EnrichmentsUtil", () => {
             assert.deepEqual(getEnrichmentBarPlotData(data, ['ABC']), []);
             //genes present in data
             assert.deepEqual(getEnrichmentBarPlotData(data, ['EGFR']), [
-                { "minorCategory": "altered group", "counts": [{ "majorCategory": "EGFR", "count": 75, "percentage": 100 }] },
-                { "minorCategory": "unaltered group", "counts": [{ "majorCategory": "EGFR", "count": 0, "percentage": 0 }] }
+                {
+                    minorCategory: 'altered group',
+                    counts: [
+                        { majorCategory: 'EGFR', count: 75, percentage: 100 },
+                    ],
+                },
+                {
+                    minorCategory: 'unaltered group',
+                    counts: [
+                        { majorCategory: 'EGFR', count: 0, percentage: 0 },
+                    ],
+                },
             ]);
         });
     });
 
-    describe("#getGeneListOptions()", () => {
-        it("returns correct options", () => {
+    describe('#getGeneListOptions()', () => {
+        it('returns correct options', () => {
             //empty requests
-            assert.deepEqual(getGeneListOptions([]), [{ "label": "User-defined genes", "genes": [] }] as any);
+            assert.deepEqual(getGeneListOptions([]), [
+                { label: 'User-defined genes', genes: [] },
+            ] as any);
 
             //non empty requests
-            assert.deepEqual(getGeneListOptions(exampleAlterationEnrichmentRowData), [
-                { "label": "User-defined genes", "genes": [] },
-                { "label": "Genes with highest frequency in any group", "genes": ["EGFR", "FBXW4", "CAND2"] },
-                { "label": "Genes with highest average frequency", "genes": ["EGFR", "FBXW4", "CAND2"] },
-                { "label": "Genes with most significant p-value", "genes": ["EGFR", "FBXW4", "CAND2"] },
-                { "label": "Sync with table (up to 100 genes)", "genes": [] }
-            ]);
+            assert.deepEqual(
+                getGeneListOptions(exampleAlterationEnrichmentRowData),
+                [
+                    { label: 'User-defined genes', genes: [] },
+                    {
+                        label: 'Genes with highest frequency in any group',
+                        genes: ['EGFR', 'FBXW4', 'CAND2'],
+                    },
+                    {
+                        label: 'Genes with highest average frequency',
+                        genes: ['EGFR', 'FBXW4', 'CAND2'],
+                    },
+                    {
+                        label: 'Genes with most significant p-value',
+                        genes: ['EGFR', 'FBXW4', 'CAND2'],
+                    },
+                    { label: 'Sync with table (up to 100 genes)', genes: [] },
+                ]
+            );
 
             //non empty requests
-            let exampleCopyNumberAlterationEnrichmentRowData = _.map(exampleAlterationEnrichmentRowData,rowDatum=>{
-                let value = 2;
-                if(rowDatum.hugoGeneSymbol === "FBXW4") {
-                    value = -2
-                }
-                return {
-                    ...rowDatum,
-                    value
+            let exampleCopyNumberAlterationEnrichmentRowData = _.map(
+                exampleAlterationEnrichmentRowData,
+                rowDatum => {
+                    let value = 2;
+                    if (rowDatum.hugoGeneSymbol === 'FBXW4') {
+                        value = -2;
+                    }
+                    return {
+                        ...rowDatum,
+                        value,
+                    };
                 }
-            })
-            assert.deepEqual(getGeneListOptions(exampleCopyNumberAlterationEnrichmentRowData, true), [
-                { "label": "User-defined genes", "genes": [] },
-                { "label": "Genes with highest frequency in any group", "genes": ["EGFR: AMP", "FBXW4: HOMDEL", "CAND2: AMP"] },
-                { "label": "Genes with highest average frequency", "genes": ["EGFR: AMP", "FBXW4: HOMDEL", "CAND2: AMP"] },
-                { "label": "Genes with most significant p-value", "genes": ["EGFR: AMP", "FBXW4: HOMDEL", "CAND2: AMP"] },
-                { "label": "Sync with table (up to 100 genes)", "genes": [] }
-            ]);
-
+            );
+            assert.deepEqual(
+                getGeneListOptions(
+                    exampleCopyNumberAlterationEnrichmentRowData,
+                    true
+                ),
+                [
+                    { label: 'User-defined genes', genes: [] },
+                    {
+                        label: 'Genes with highest frequency in any group',
+                        genes: ['EGFR: AMP', 'FBXW4: HOMDEL', 'CAND2: AMP'],
+                    },
+                    {
+                        label: 'Genes with highest average frequency',
+                        genes: ['EGFR: AMP', 'FBXW4: HOMDEL', 'CAND2: AMP'],
+                    },
+                    {
+                        label: 'Genes with most significant p-value',
+                        genes: ['EGFR: AMP', 'FBXW4: HOMDEL', 'CAND2: AMP'],
+                    },
+                    { label: 'Sync with table (up to 100 genes)', genes: [] },
+                ]
+            );
         });
     });
 });
diff --git a/src/pages/resultsView/enrichments/EnrichmentsUtil.tsx b/src/pages/resultsView/enrichments/EnrichmentsUtil.tsx
index 15529772a40..cafdc76eb52 100644
--- a/src/pages/resultsView/enrichments/EnrichmentsUtil.tsx
+++ b/src/pages/resultsView/enrichments/EnrichmentsUtil.tsx
@@ -1,80 +1,106 @@
 import * as React from 'react';
-import { AlterationEnrichment, ExpressionEnrichment } from "shared/api/generated/CBioPortalAPIInternal";
+import {
+    AlterationEnrichment,
+    ExpressionEnrichment,
+} from 'shared/api/generated/CBioPortalAPIInternal';
 import { AlterationEnrichmentRow } from 'shared/model/AlterationEnrichmentRow';
 import { ExpressionEnrichmentRow } from 'shared/model/ExpressionEnrichmentRow';
 import { tsvFormat } from 'd3-dsv';
 import { BoxPlotModel, calculateBoxPlotModel } from 'shared/lib/boxPlotUtils';
-import {MolecularProfile, NumericGeneMolecularData} from 'shared/api/generated/CBioPortalAPI';
+import {
+    MolecularProfile,
+    NumericGeneMolecularData,
+} from 'shared/api/generated/CBioPortalAPI';
 import seedrandom from 'seedrandom';
 import { roundLogRatio, formatLogOddsRatio } from 'shared/lib/FormatUtils';
-import * as _ from "lodash";
-import {AlterationTypeConstants} from "../ResultsViewPageStore";
-import {filterAndSortProfiles} from "../coExpression/CoExpressionTabUtils";
-import {IMiniFrequencyScatterChartData} from "./MiniFrequencyScatterChart";
-import { AlterationEnrichmentTableColumn, AlterationEnrichmentTableColumnType } from './AlterationEnrichmentsTable';
-import styles from "./styles.module.scss";
-import classNames from "classnames";
+import * as _ from 'lodash';
+import { AlterationTypeConstants } from '../ResultsViewPageStore';
+import { filterAndSortProfiles } from '../coExpression/CoExpressionTabUtils';
+import { IMiniFrequencyScatterChartData } from './MiniFrequencyScatterChart';
+import {
+    AlterationEnrichmentTableColumn,
+    AlterationEnrichmentTableColumnType,
+} from './AlterationEnrichmentsTable';
+import styles from './styles.module.scss';
+import classNames from 'classnames';
 import { IMultipleCategoryBarPlotData } from 'shared/components/plots/MultipleCategoryBarPlot';
-import {getTextColor} from "../../groupComparison/OverlapUtils";
-import TruncatedText from "shared/components/TruncatedText";
-import { ExpressionEnrichmentTableColumn, ExpressionEnrichmentTableColumnType } from './ExpressionEnrichmentsTable';
-
-export type AlterationEnrichmentWithQ = AlterationEnrichment & { logRatio?:number, qValue:number, value?:number /* used for copy number in group comparison */ };
-export type ExpressionEnrichmentWithQ = ExpressionEnrichment & { qValue:number };
+import { getTextColor } from '../../groupComparison/OverlapUtils';
+import TruncatedText from 'shared/components/TruncatedText';
+import {
+    ExpressionEnrichmentTableColumn,
+    ExpressionEnrichmentTableColumnType,
+} from './ExpressionEnrichmentsTable';
+
+export type AlterationEnrichmentWithQ = AlterationEnrichment & {
+    logRatio?: number;
+    qValue: number;
+    value?: number /* used for copy number in group comparison */;
+};
+export type ExpressionEnrichmentWithQ = ExpressionEnrichment & {
+    qValue: number;
+};
 
-export const CNA_TO_ALTERATION:{[cna:number]:string} = {
-    "2": "AMP",
-    "-2": "HOMDEL"
+export const CNA_TO_ALTERATION: { [cna: number]: string } = {
+    '2': 'AMP',
+    '-2': 'HOMDEL',
 };
 
 export enum GeneOptionLabel {
-    USER_DEFINED_OPTION='User-defined genes',
-    HIGHEST_FREQUENCY='Genes with highest frequency in any group',
-    AVERAGE_FREQUENCY='Genes with highest average frequency',
-    SIGNIFICANT_P_VALUE='Genes with most significant p-value',
-    SYNC_WITH_TABLE="Sync with table (up to 100 genes)"
+    USER_DEFINED_OPTION = 'User-defined genes',
+    HIGHEST_FREQUENCY = 'Genes with highest frequency in any group',
+    AVERAGE_FREQUENCY = 'Genes with highest average frequency',
+    SIGNIFICANT_P_VALUE = 'Genes with most significant p-value',
+    SYNC_WITH_TABLE = 'Sync with table (up to 100 genes)',
 }
 
 export enum AlterationContainerType {
-    MUTATION="MUTATION",
-    COPY_NUMBER="COPY_NUMBER"
+    MUTATION = 'MUTATION',
+    COPY_NUMBER = 'COPY_NUMBER',
 }
 
-export function PERCENTAGE_IN_headerRender(name:string) {
+export function PERCENTAGE_IN_headerRender(name: string) {
     return (
-        <div style={{display:"flex", alignItems:"center"}}>
-            <TruncatedText text={name} maxLength={20} addTooltip={"never"}/>
+        <div style={{ display: 'flex', alignItems: 'center' }}>
+            <TruncatedText text={name} maxLength={20} addTooltip={'never'} />
         </div>
     );
 }
 
-export function STAT_IN_headerRender(stat:string, name:string) {
+export function STAT_IN_headerRender(stat: string, name: string) {
     return (
-        <div style={{display:"flex", alignItems:"center"}}>
-            {stat}&nbsp;in&nbsp;<TruncatedText text={name} maxLength={20} addTooltip={"never"}/>
+        <div style={{ display: 'flex', alignItems: 'center' }}>
+            {stat}&nbsp;in&nbsp;
+            <TruncatedText text={name} maxLength={20} addTooltip={'never'} />
         </div>
     );
 }
 
 export function calculateExpressionTendency(logOddsRatio: number): string {
-    return logOddsRatio > 0 ? "Over-expressed" : "Under-expressed";
+    return logOddsRatio > 0 ? 'Over-expressed' : 'Under-expressed';
 }
 
 export function formatAlterationTendency(text: string) {
-    return <TruncatedText text={text} maxLength={20}/>;
+    return <TruncatedText text={text} maxLength={20} />;
 }
 
-export function formatPercentage(group: string, data: AlterationEnrichmentRow): string {
-
-    const datum = data.groupsSet[group]
-    return datum.alteredCount + " (" + datum.alteredPercentage.toFixed(2) + "%)";
+export function formatPercentage(
+    group: string,
+    data: AlterationEnrichmentRow
+): string {
+    const datum = data.groupsSet[group];
+    return (
+        datum.alteredCount + ' (' + datum.alteredPercentage.toFixed(2) + '%)'
+    );
 }
 
-export function getAlteredCount(group: string, data: AlterationEnrichmentRow): number {
-    return data.groupsSet[group].alteredCount
+export function getAlteredCount(
+    group: string,
+    data: AlterationEnrichmentRow
+): number {
+    return data.groupsSet[group].alteredCount;
 }
 
-function volcanoPlotYCoord(pValue:number) {
+function volcanoPlotYCoord(pValue: number) {
     if (pValue === 0 || Math.log10(pValue) < -10) {
         return 10;
     } else {
@@ -82,10 +108,18 @@ function volcanoPlotYCoord(pValue:number) {
     }
 }
 
-export function getAlterationScatterData(alterationEnrichments: AlterationEnrichmentRow[], queryGenes: string[]): any[] {
+export function getAlterationScatterData(
+    alterationEnrichments: AlterationEnrichmentRow[],
+    queryGenes: string[]
+): any[] {
     return alterationEnrichments
-        .filter(a => a.pValue !== undefined && a.qValue !== undefined && !queryGenes.includes(a.hugoGeneSymbol))
-        .map((alterationEnrichment) => {
+        .filter(
+            a =>
+                a.pValue !== undefined &&
+                a.qValue !== undefined &&
+                !queryGenes.includes(a.hugoGeneSymbol)
+        )
+        .map(alterationEnrichment => {
             return {
                 x: roundLogRatio(Number(alterationEnrichment.logRatio), 10),
                 y: volcanoPlotYCoord(alterationEnrichment.pValue!),
@@ -93,30 +127,43 @@ export function getAlterationScatterData(alterationEnrichments: AlterationEnrich
                 pValue: alterationEnrichment.pValue,
                 qValue: alterationEnrichment.qValue,
                 logRatio: alterationEnrichment.logRatio,
-                hovered: false
+                hovered: false,
             };
         });
 }
 
-export function getAlterationFrequencyScatterData(alterationEnrichments: AlterationEnrichmentRow[], queryGenes: string[], group1:string, group2:string): IMiniFrequencyScatterChartData[] {
+export function getAlterationFrequencyScatterData(
+    alterationEnrichments: AlterationEnrichmentRow[],
+    queryGenes: string[],
+    group1: string,
+    group2: string
+): IMiniFrequencyScatterChartData[] {
     return alterationEnrichments
-        .filter(a => a.pValue !== undefined && a.qValue !== undefined && !queryGenes.includes(a.hugoGeneSymbol))
-        .map((alterationEnrichment) => {
+        .filter(
+            a =>
+                a.pValue !== undefined &&
+                a.qValue !== undefined &&
+                !queryGenes.includes(a.hugoGeneSymbol)
+        )
+        .map(alterationEnrichment => {
             return {
                 x: alterationEnrichment.groupsSet[group1].alteredPercentage,
                 y: alterationEnrichment.groupsSet[group2].alteredPercentage,
                 hugoGeneSymbol: alterationEnrichment.hugoGeneSymbol,
                 pValue: alterationEnrichment.pValue!,
                 qValue: alterationEnrichment.qValue!,
-                logRatio: alterationEnrichment.logRatio!
+                logRatio: alterationEnrichment.logRatio!,
             };
         });
 }
 
-export function getExpressionScatterData(expressionEnrichments: ExpressionEnrichmentRow[], queryGenes: string[]): any[] {
+export function getExpressionScatterData(
+    expressionEnrichments: ExpressionEnrichmentRow[],
+    queryGenes: string[]
+): any[] {
     return expressionEnrichments
         .filter(a => !queryGenes.includes(a.hugoGeneSymbol))
-        .map((expressionEnrichment) => {
+        .map(expressionEnrichment => {
             return {
                 x: expressionEnrichment.logRatio,
                 y: volcanoPlotYCoord(expressionEnrichment.pValue),
@@ -125,7 +172,7 @@ export function getExpressionScatterData(expressionEnrichments: ExpressionEnrich
                 pValue: expressionEnrichment.pValue,
                 qValue: expressionEnrichment.qValue,
                 logRatio: expressionEnrichment.logRatio,
-                hovered: false
+                hovered: false,
             };
         });
 }
@@ -133,29 +180,45 @@ export function getExpressionScatterData(expressionEnrichments: ExpressionEnrich
 export function getAlterationRowData(
     alterationEnrichments: AlterationEnrichmentWithQ[],
     queryGenes: string[],
-    groups: { name: string, nameOfEnrichmentDirection?: string }[]): AlterationEnrichmentRow[] {
+    groups: { name: string; nameOfEnrichmentDirection?: string }[]
+): AlterationEnrichmentRow[] {
     return alterationEnrichments.map(alterationEnrichment => {
-        let countsWithAlteredPercentage = _.map(alterationEnrichment.counts, datum => {
-            const alteredPercentage = (datum.alteredCount > 0 && datum.profiledCount > 0) ? (datum.alteredCount / datum.profiledCount) * 100 : 0
-            return {
-                ...datum,
-                alteredPercentage
+        let countsWithAlteredPercentage = _.map(
+            alterationEnrichment.counts,
+            datum => {
+                const alteredPercentage =
+                    datum.alteredCount > 0 && datum.profiledCount > 0
+                        ? (datum.alteredCount / datum.profiledCount) * 100
+                        : 0;
+                return {
+                    ...datum,
+                    alteredPercentage,
+                };
             }
-        });
-        let groupsSet = _.keyBy(countsWithAlteredPercentage, count => count.name);
+        );
+        let groupsSet = _.keyBy(
+            countsWithAlteredPercentage,
+            count => count.name
+        );
         let enrichedGroup: string | undefined = undefined;
         let logRatio: number | undefined = undefined;
         if (groups.length === 2) {
             let group1Data = groupsSet[groups[0].name];
             let group2Data = groupsSet[groups[1].name];
             if (alterationEnrichment.pValue !== undefined) {
-                logRatio = Math.log2(group1Data.alteredPercentage / group2Data.alteredPercentage);
-                let group1Name = groups[0].nameOfEnrichmentDirection || groups[0].name;
-                let group2Name = groups[1].nameOfEnrichmentDirection || groups[1].name;
+                logRatio = Math.log2(
+                    group1Data.alteredPercentage / group2Data.alteredPercentage
+                );
+                let group1Name =
+                    groups[0].nameOfEnrichmentDirection || groups[0].name;
+                let group2Name =
+                    groups[1].nameOfEnrichmentDirection || groups[1].name;
                 enrichedGroup = logRatio > 0 ? group1Name : group2Name;
             }
         } else if (alterationEnrichment.pValue !== undefined) {
-            countsWithAlteredPercentage.sort((a, b) => b.alteredPercentage - a.alteredPercentage);
+            countsWithAlteredPercentage.sort(
+                (a, b) => b.alteredPercentage - a.alteredPercentage
+            );
             enrichedGroup = countsWithAlteredPercentage[0].name;
         }
 
@@ -170,7 +233,7 @@ export function getAlterationRowData(
             enrichedGroup,
             groupsSet,
             logRatio,
-            value: alterationEnrichment.value
+            value: alterationEnrichment.value,
         };
     });
 }
@@ -178,22 +241,28 @@ export function getAlterationRowData(
 export function getExpressionRowData(
     expressionEnrichments: ExpressionEnrichmentWithQ[],
     queryGenes: string[],
-    groups: { name: string, nameOfEnrichmentDirection?: string }[]): ExpressionEnrichmentRow[] {
-
+    groups: { name: string; nameOfEnrichmentDirection?: string }[]
+): ExpressionEnrichmentRow[] {
     return expressionEnrichments.map(expressionEnrichment => {
-
         let enrichedGroup = '';
         let logRatio: number | undefined = undefined;
-        let groupsSet = _.keyBy(expressionEnrichment.groupsStatistics, group => group.name);
+        let groupsSet = _.keyBy(
+            expressionEnrichment.groupsStatistics,
+            group => group.name
+        );
         if (groups.length === 2) {
             let group1Data = groupsSet[groups[0].name];
             let group2Data = groupsSet[groups[1].name];
             logRatio = group1Data.meanExpression - group2Data.meanExpression;
-            let group1Name = groups[0].nameOfEnrichmentDirection || groups[0].name;
-            let group2Name = groups[1].nameOfEnrichmentDirection || groups[1].name;
+            let group1Name =
+                groups[0].nameOfEnrichmentDirection || groups[0].name;
+            let group2Name =
+                groups[1].nameOfEnrichmentDirection || groups[1].name;
             enrichedGroup = logRatio > 0 ? group1Name : group2Name;
         } else {
-            enrichedGroup = expressionEnrichment.groupsStatistics.sort((a, b) => b.meanExpression - a.meanExpression)[0].name;
+            enrichedGroup = expressionEnrichment.groupsStatistics.sort(
+                (a, b) => b.meanExpression - a.meanExpression
+            )[0].name;
         }
 
         return {
@@ -211,21 +280,36 @@ export function getExpressionRowData(
     });
 }
 
-export function getFilteredData(data: (ExpressionEnrichmentRow|AlterationEnrichmentRow)[], expressedGroups: string[], qValueFilter: boolean,
-    selectedGenes: string[] | null): any[] {
-
+export function getFilteredData(
+    data: (ExpressionEnrichmentRow | AlterationEnrichmentRow)[],
+    expressedGroups: string[],
+    qValueFilter: boolean,
+    selectedGenes: string[] | null
+): any[] {
     return data.filter(enrichmentDatum => {
         let result = false;
-        expressedGroups.forEach(enrichedGroup=>{
-            const enrichedGroupData = enrichmentDatum.groupsSet[enrichedGroup] as any;
-            let enrichedGroupAlteredPercentage = enrichedGroupData.meanExpression || enrichedGroupData.alteredPercentage;
-            let res = _.reduce(enrichmentDatum.groupsSet, (acc, next, group) => {
-                if (enrichedGroup !== group) {
-                    let alteredPercentage = (next as any).meanExpression || (next as any).alteredPercentage;
-                    acc = acc && (enrichedGroupAlteredPercentage >= alteredPercentage);
-                }
-                return acc;
-            }, true)
+        expressedGroups.forEach(enrichedGroup => {
+            const enrichedGroupData = enrichmentDatum.groupsSet[
+                enrichedGroup
+            ] as any;
+            let enrichedGroupAlteredPercentage =
+                enrichedGroupData.meanExpression ||
+                enrichedGroupData.alteredPercentage;
+            let res = _.reduce(
+                enrichmentDatum.groupsSet,
+                (acc, next, group) => {
+                    if (enrichedGroup !== group) {
+                        let alteredPercentage =
+                            (next as any).meanExpression ||
+                            (next as any).alteredPercentage;
+                        acc =
+                            acc &&
+                            enrichedGroupAlteredPercentage >= alteredPercentage;
+                    }
+                    return acc;
+                },
+                true
+            );
             if (res) {
                 result = res;
                 return false;
@@ -235,34 +319,38 @@ export function getFilteredData(data: (ExpressionEnrichmentRow|AlterationEnrichm
             result = result && enrichmentDatum.qValue < 0.05;
         }
         if (selectedGenes) {
-            result = result && selectedGenes.includes(enrichmentDatum.hugoGeneSymbol);
+            result =
+                result &&
+                selectedGenes.includes(enrichmentDatum.hugoGeneSymbol);
         }
         return result;
     });
 }
 
-export function getBarChartTooltipContent(tooltipModel: any, selectedGene: string): string {
+export function getBarChartTooltipContent(
+    tooltipModel: any,
+    selectedGene: string
+): string {
+    let tooltipContent = '';
 
-    let tooltipContent = "";
-
-    if(tooltipModel != null) {
+    if (tooltipModel != null) {
         const datum = tooltipModel.datum;
-        tooltipContent += "Query Genes ";
+        tooltipContent += 'Query Genes ';
         if (datum.x == 2) {
             if (datum.index == 0) {
-                tooltipContent += "Altered: ";
+                tooltipContent += 'Altered: ';
             } else {
-                tooltipContent += "Unaltered: ";
+                tooltipContent += 'Unaltered: ';
             }
         } else {
             if (datum.index == 0) {
-                tooltipContent += "Altered, " + selectedGene + " Unaltered: ";
+                tooltipContent += 'Altered, ' + selectedGene + ' Unaltered: ';
             } else if (datum.index == 1) {
-                tooltipContent += "Altered, " + selectedGene + " Altered: ";
+                tooltipContent += 'Altered, ' + selectedGene + ' Altered: ';
             } else if (datum.index == 2) {
-                tooltipContent += "Unaltered, " + selectedGene + " Altered: ";
+                tooltipContent += 'Unaltered, ' + selectedGene + ' Altered: ';
             } else if (datum.index == 3) {
-                tooltipContent += "Unaltered, " + selectedGene + " Unaltered: ";
+                tooltipContent += 'Unaltered, ' + selectedGene + ' Unaltered: ';
             }
         }
 
@@ -272,62 +360,81 @@ export function getBarChartTooltipContent(tooltipModel: any, selectedGene: strin
 }
 
 export function getAlterationsTooltipContent(alterations: any[]): string {
-
-    let result: string = "";
+    let result: string = '';
     let currentGene: string;
     alterations.forEach(a => {
         const hugoGeneSymbol = a.gene.hugoGeneSymbol;
         if (hugoGeneSymbol != currentGene) {
-            result += hugoGeneSymbol + ": ";
+            result += hugoGeneSymbol + ': ';
         }
-        if (a.alterationType === "MUTATION_EXTENDED") {
-            result += "MUT";
-        } else if (a.alterationType === "PROTEIN_LEVEL") {
-            result += "RPPA-" + a.alterationSubType.toUpperCase();
+        if (a.alterationType === 'MUTATION_EXTENDED') {
+            result += 'MUT';
+        } else if (a.alterationType === 'PROTEIN_LEVEL') {
+            result += 'RPPA-' + a.alterationSubType.toUpperCase();
         } else {
             result += a.alterationSubType.toUpperCase();
         }
-        result += "; "
+        result += '; ';
         currentGene = hugoGeneSymbol;
     });
 
     return result;
 }
 
-export function pickMutationEnrichmentProfiles(profiles:MolecularProfile[]) {
-    return _.filter(profiles, (profile: MolecularProfile) =>
-        profile.molecularAlterationType === AlterationTypeConstants.MUTATION_EXTENDED);
+export function pickMutationEnrichmentProfiles(profiles: MolecularProfile[]) {
+    return _.filter(
+        profiles,
+        (profile: MolecularProfile) =>
+            profile.molecularAlterationType ===
+            AlterationTypeConstants.MUTATION_EXTENDED
+    );
 }
 
-export function pickCopyNumberEnrichmentProfiles(profiles:MolecularProfile[]) {
-    return _.filter(profiles, (profile: MolecularProfile) =>
-        profile.molecularAlterationType === AlterationTypeConstants.COPY_NUMBER_ALTERATION && profile.datatype === "DISCRETE");
+export function pickCopyNumberEnrichmentProfiles(profiles: MolecularProfile[]) {
+    return _.filter(
+        profiles,
+        (profile: MolecularProfile) =>
+            profile.molecularAlterationType ===
+                AlterationTypeConstants.COPY_NUMBER_ALTERATION &&
+            profile.datatype === 'DISCRETE'
+    );
 }
 
-export function pickMRNAEnrichmentProfiles(profiles:MolecularProfile[]) {
-    const mrnaProfiles = profiles.filter(p=>{
-        return p.molecularAlterationType === AlterationTypeConstants.MRNA_EXPRESSION
+export function pickMRNAEnrichmentProfiles(profiles: MolecularProfile[]) {
+    const mrnaProfiles = profiles.filter(p => {
+        return (
+            p.molecularAlterationType ===
+            AlterationTypeConstants.MRNA_EXPRESSION
+        );
     });
     return filterAndSortProfiles(mrnaProfiles);
 }
 
-export function pickProteinEnrichmentProfiles(profiles:MolecularProfile[]) {
-    const protProfiles = profiles.filter(p=>{
-        return p.molecularAlterationType === AlterationTypeConstants.PROTEIN_LEVEL;
+export function pickProteinEnrichmentProfiles(profiles: MolecularProfile[]) {
+    const protProfiles = profiles.filter(p => {
+        return (
+            p.molecularAlterationType === AlterationTypeConstants.PROTEIN_LEVEL
+        );
     });
     return filterAndSortProfiles(protProfiles);
 }
 
-export function getAlterationEnrichmentColumns(groups: { name: string, description: string, color?:string }[], alteredVsUnalteredMode?: boolean): AlterationEnrichmentTableColumn[] {
+export function getAlterationEnrichmentColumns(
+    groups: { name: string; description: string; color?: string }[],
+    alteredVsUnalteredMode?: boolean
+): AlterationEnrichmentTableColumn[] {
     let columns: AlterationEnrichmentTableColumn[] = [];
-    const nameToGroup = _.keyBy(groups, g=>g.name);
+    const nameToGroup = _.keyBy(groups, g => g.name);
 
     let enrichedGroupColum: AlterationEnrichmentTableColumn = {
-        name: alteredVsUnalteredMode ? AlterationEnrichmentTableColumnType.TENDENCY :
-            (groups.length === 2 ? AlterationEnrichmentTableColumnType.ENRICHED : AlterationEnrichmentTableColumnType.MOST_ENRICHED),
+        name: alteredVsUnalteredMode
+            ? AlterationEnrichmentTableColumnType.TENDENCY
+            : groups.length === 2
+            ? AlterationEnrichmentTableColumnType.ENRICHED
+            : AlterationEnrichmentTableColumnType.MOST_ENRICHED,
         render: (d: AlterationEnrichmentRow) => {
             if (d.enrichedGroup === undefined || d.qValue === undefined) {
-                return <span>-</span>
+                return <span>-</span>;
             }
             let groupColor = undefined;
             const significant = d.qValue < 0.05;
@@ -336,26 +443,34 @@ export function getAlterationEnrichmentColumns(groups: { name: string, descripti
             }
             return (
                 <div
-                    className={classNames(styles.Tendency, { [styles.Significant]: significant, [styles.ColoredBackground]:!!groupColor })}
+                    className={classNames(styles.Tendency, {
+                        [styles.Significant]: significant,
+                        [styles.ColoredBackground]: !!groupColor,
+                    })}
                     style={{
                         backgroundColor: groupColor,
-                        color:groupColor && getTextColor(groupColor)
+                        color: groupColor && getTextColor(groupColor),
                     }}
                 >
-                    {alteredVsUnalteredMode ? d.enrichedGroup : formatAlterationTendency(d.enrichedGroup)}
+                    {alteredVsUnalteredMode
+                        ? d.enrichedGroup
+                        : formatAlterationTendency(d.enrichedGroup)}
                 </div>
             );
         },
-        filter: (d: AlterationEnrichmentRow, filterString: string, filterStringUpper: string) =>
-            (d.enrichedGroup || '').toUpperCase().includes(filterStringUpper),
+        filter: (
+            d: AlterationEnrichmentRow,
+            filterString: string,
+            filterStringUpper: string
+        ) => (d.enrichedGroup || '').toUpperCase().includes(filterStringUpper),
         sortBy: (d: AlterationEnrichmentRow) => d.enrichedGroup || '-',
         download: (d: AlterationEnrichmentRow) => d.enrichedGroup || '-',
-        tooltip: <span>The group with the highest alteration frequency</span>
-    }
+        tooltip: <span>The group with the highest alteration frequency</span>,
+    };
 
     //minimum 2 group are required for enrichment analysis
     if (groups.length < 2) {
-        return []
+        return [];
     }
 
     if (groups.length === 2) {
@@ -363,14 +478,22 @@ export function getAlterationEnrichmentColumns(groups: { name: string, descripti
         let group2 = groups[1];
         columns.push({
             name: AlterationEnrichmentTableColumnType.LOG_RATIO,
-            render: (d: AlterationEnrichmentRow) => <span>{d.logRatio ? formatLogOddsRatio(d.logRatio) : '-'}</span>,
-            tooltip: <span>Log2 based ratio of (pct in {group1.name}/ pct in {group2.name})</span>,
+            render: (d: AlterationEnrichmentRow) => (
+                <span>{d.logRatio ? formatLogOddsRatio(d.logRatio) : '-'}</span>
+            ),
+            tooltip: (
+                <span>
+                    Log2 based ratio of (pct in {group1.name}/ pct in{' '}
+                    {group2.name})
+                </span>
+            ),
             sortBy: (d: AlterationEnrichmentRow) => Number(d.logRatio),
-            download: (d: AlterationEnrichmentRow) => formatLogOddsRatio(d.logRatio!)
+            download: (d: AlterationEnrichmentRow) =>
+                formatLogOddsRatio(d.logRatio!),
         });
 
-        enrichedGroupColum.tooltip =
-            (<table>
+        enrichedGroupColum.tooltip = (
+            <table>
                 <tr>
                     <td>Log ratio > 0</td>
                     <td>: Enriched in {group1.name}</td>
@@ -383,35 +506,49 @@ export function getAlterationEnrichmentColumns(groups: { name: string, descripti
                     <td>q-Value &lt; 0.05</td>
                     <td>: Significant association</td>
                 </tr>
-            </table>)
+            </table>
+        );
     }
     columns.push(enrichedGroupColum);
     groups.forEach(group => {
         columns.push({
             name: group.name,
             headerRender: PERCENTAGE_IN_headerRender,
-            render: (d: AlterationEnrichmentRow) => <span>{formatPercentage(group.name, d)}</span>,
-            tooltip: <span><strong>{group.name}:</strong> {group.description}</span>,
-            sortBy: (d: AlterationEnrichmentRow) => getAlteredCount(group.name, d),
-            download: (d: AlterationEnrichmentRow) => formatPercentage(group.name, d)
+            render: (d: AlterationEnrichmentRow) => (
+                <span>{formatPercentage(group.name, d)}</span>
+            ),
+            tooltip: (
+                <span>
+                    <strong>{group.name}:</strong> {group.description}
+                </span>
+            ),
+            sortBy: (d: AlterationEnrichmentRow) =>
+                getAlteredCount(group.name, d),
+            download: (d: AlterationEnrichmentRow) =>
+                formatPercentage(group.name, d),
         });
     });
     return columns;
 }
 
-export function getExpressionEnrichmentColumns(groups: { name: string, description: string, color?: string }[], alteredVsUnalteredMode?: boolean): ExpressionEnrichmentTableColumn[] {
+export function getExpressionEnrichmentColumns(
+    groups: { name: string; description: string; color?: string }[],
+    alteredVsUnalteredMode?: boolean
+): ExpressionEnrichmentTableColumn[] {
     // minimum 2 group are required for enrichment analysis
     if (groups.length < 2) {
-        return []
+        return [];
     }
     let columns: ExpressionEnrichmentTableColumn[] = [];
     const nameToGroup = _.keyBy(groups, g => g.name);
 
     let enrichedGroupColum: ExpressionEnrichmentTableColumn = {
-        name: alteredVsUnalteredMode ? ExpressionEnrichmentTableColumnType.TENDENCY : ExpressionEnrichmentTableColumnType.EXPRESSED,
+        name: alteredVsUnalteredMode
+            ? ExpressionEnrichmentTableColumnType.TENDENCY
+            : ExpressionEnrichmentTableColumnType.EXPRESSED,
         render: (d: ExpressionEnrichmentRow) => {
             if (d.pValue === undefined) {
-                return <span>-</span>
+                return <span>-</span>;
             }
             let groupColor = undefined;
             const significant = d.qValue < 0.05;
@@ -420,36 +557,52 @@ export function getExpressionEnrichmentColumns(groups: { name: string, descripti
             }
             return (
                 <div
-                    className={classNames(styles.Tendency, { [styles.Significant]: significant, [styles.ColoredBackground]: !!groupColor })}
+                    className={classNames(styles.Tendency, {
+                        [styles.Significant]: significant,
+                        [styles.ColoredBackground]: !!groupColor,
+                    })}
                     style={{
                         backgroundColor: groupColor,
-                        color: groupColor && getTextColor(groupColor)
+                        color: groupColor && getTextColor(groupColor),
                     }}
                 >
-                    {alteredVsUnalteredMode ? d.enrichedGroup : formatAlterationTendency(d.enrichedGroup)}
+                    {alteredVsUnalteredMode
+                        ? d.enrichedGroup
+                        : formatAlterationTendency(d.enrichedGroup)}
                 </div>
             );
         },
-        filter: (d: ExpressionEnrichmentRow, filterString: string, filterStringUpper: string) =>
-            d.enrichedGroup.toUpperCase().includes(filterStringUpper),
+        filter: (
+            d: ExpressionEnrichmentRow,
+            filterString: string,
+            filterStringUpper: string
+        ) => d.enrichedGroup.toUpperCase().includes(filterStringUpper),
         sortBy: (d: ExpressionEnrichmentRow) => d.enrichedGroup,
         download: (d: ExpressionEnrichmentRow) => d.enrichedGroup,
-        tooltip: <span>The group with the highest expression frequency</span>
-    }
+        tooltip: <span>The group with the highest expression frequency</span>,
+    };
 
     if (groups.length === 2) {
         let group1 = groups[0];
         let group2 = groups[1];
         columns.push({
             name: ExpressionEnrichmentTableColumnType.LOG_RATIO,
-            render: (d: ExpressionEnrichmentRow) => <span>{formatLogOddsRatio(d.logRatio!)}</span>,
-            tooltip: <span>Log2 of ratio of (unlogged) mean in {group1.name} to (unlogged) mean in {group2.name}</span>,
+            render: (d: ExpressionEnrichmentRow) => (
+                <span>{formatLogOddsRatio(d.logRatio!)}</span>
+            ),
+            tooltip: (
+                <span>
+                    Log2 of ratio of (unlogged) mean in {group1.name} to
+                    (unlogged) mean in {group2.name}
+                </span>
+            ),
             sortBy: (d: ExpressionEnrichmentRow) => Number(d.logRatio),
-            download: (d: ExpressionEnrichmentRow) => formatLogOddsRatio(d.logRatio!)
+            download: (d: ExpressionEnrichmentRow) =>
+                formatLogOddsRatio(d.logRatio!),
         });
 
-        enrichedGroupColum.tooltip =
-            (<table>
+        enrichedGroupColum.tooltip = (
+            <table>
                 <tr>
                     <td>Log ratio > 0</td>
                     <td>: Enriched in {group1.name}</td>
@@ -462,56 +615,88 @@ export function getExpressionEnrichmentColumns(groups: { name: string, descripti
                     <td>q-Value &lt; 0.05</td>
                     <td>: Significant association</td>
                 </tr>
-            </table>)
+            </table>
+        );
     }
     columns.push(enrichedGroupColum);
     groups.forEach(group => {
         columns.push({
             name: group.name,
-            headerRender: (name: string) => STAT_IN_headerRender("μ", name),
-            render: (d: ExpressionEnrichmentRow) => <span>{d.groupsSet[group.name].meanExpression.toFixed(2)}</span>,
-            tooltip: <span>Mean log2 expression of the listed gene in {group.description}</span>,
-            sortBy: (d: ExpressionEnrichmentRow) => d.groupsSet[group.name].meanExpression,
-            download: (d: ExpressionEnrichmentRow) => d.groupsSet[group.name].meanExpression.toFixed(2),
-            uniqueName: group.name + ExpressionEnrichmentTableColumnType.MEAN_SUFFIX
+            headerRender: (name: string) => STAT_IN_headerRender('μ', name),
+            render: (d: ExpressionEnrichmentRow) => (
+                <span>{d.groupsSet[group.name].meanExpression.toFixed(2)}</span>
+            ),
+            tooltip: (
+                <span>
+                    Mean log2 expression of the listed gene in{' '}
+                    {group.description}
+                </span>
+            ),
+            sortBy: (d: ExpressionEnrichmentRow) =>
+                d.groupsSet[group.name].meanExpression,
+            download: (d: ExpressionEnrichmentRow) =>
+                d.groupsSet[group.name].meanExpression.toFixed(2),
+            uniqueName:
+                group.name + ExpressionEnrichmentTableColumnType.MEAN_SUFFIX,
         });
 
         columns.push({
             name: group.name,
-            headerRender: (name: string) => STAT_IN_headerRender("σ", name),
-            render: (d: ExpressionEnrichmentRow) => <span>{d.groupsSet[group.name].standardDeviation.toFixed(2)}</span>,
-            tooltip: <span>Standard deviation of log2 expression of the listed gene in {group.description}</span>,
-            sortBy: (d: ExpressionEnrichmentRow) => d.groupsSet[group.name].standardDeviation,
-            download: (d: ExpressionEnrichmentRow) => d.groupsSet[group.name].standardDeviation.toFixed(2),
-            uniqueName: group.name + ExpressionEnrichmentTableColumnType.STANDARD_DEVIATION_SUFFIX
+            headerRender: (name: string) => STAT_IN_headerRender('σ', name),
+            render: (d: ExpressionEnrichmentRow) => (
+                <span>
+                    {d.groupsSet[group.name].standardDeviation.toFixed(2)}
+                </span>
+            ),
+            tooltip: (
+                <span>
+                    Standard deviation of log2 expression of the listed gene in{' '}
+                    {group.description}
+                </span>
+            ),
+            sortBy: (d: ExpressionEnrichmentRow) =>
+                d.groupsSet[group.name].standardDeviation,
+            download: (d: ExpressionEnrichmentRow) =>
+                d.groupsSet[group.name].standardDeviation.toFixed(2),
+            uniqueName:
+                group.name +
+                ExpressionEnrichmentTableColumnType.STANDARD_DEVIATION_SUFFIX,
         });
     });
     return columns;
 }
 
-export function getEnrichmentBarPlotData(data: { [gene: string]: AlterationEnrichmentRow }, genes: string[]): IMultipleCategoryBarPlotData[] {
+export function getEnrichmentBarPlotData(
+    data: { [gene: string]: AlterationEnrichmentRow },
+    genes: string[]
+): IMultipleCategoryBarPlotData[] {
     const usedGenes: { [gene: string]: boolean } = {};
     if (_.isEmpty(genes)) {
         return [];
     }
 
-    const groupToGeneCounts = _.reduce(genes, (acc, gene) => {
-        const datum = data[gene];
-        if (datum) {
-            _.each(datum.groupsSet, group => {
-                const groupName = group.name;
-                if (!acc[groupName]) {
-                    acc[groupName] = {};
-                }
-                const displayedGeneName = gene + (datum.qValue && datum.qValue < 0.05 ? '*' : '');
-                acc[groupName][displayedGeneName] = group.alteredPercentage;
-                usedGenes[displayedGeneName] = true;
-            });
-        }
-        return acc;
-    }, {} as { [group: string]: { [gene: string]: number } });
+    const groupToGeneCounts = _.reduce(
+        genes,
+        (acc, gene) => {
+            const datum = data[gene];
+            if (datum) {
+                _.each(datum.groupsSet, group => {
+                    const groupName = group.name;
+                    if (!acc[groupName]) {
+                        acc[groupName] = {};
+                    }
+                    const displayedGeneName =
+                        gene + (datum.qValue && datum.qValue < 0.05 ? '*' : '');
+                    acc[groupName][displayedGeneName] = group.alteredPercentage;
+                    usedGenes[displayedGeneName] = true;
+                });
+            }
+            return acc;
+        },
+        {} as { [group: string]: { [gene: string]: number } }
+    );
 
-    const geneTotalCounts: { [id: string]: number } = {}
+    const geneTotalCounts: { [id: string]: number } = {};
     // ensure entries for all used minor categories - we need 0 entries for those major/minor combos we didnt see
     _.forEach(usedGenes, (z, gene) => {
         let totalCount = 0;
@@ -522,60 +707,98 @@ export function getEnrichmentBarPlotData(data: { [gene: string]: AlterationEnric
         geneTotalCounts[gene] = totalCount;
     });
 
-    return _.map(groupToGeneCounts, (geneCounts: { [gene: string]: number }, group) => {
-        let counts = _.map(geneCounts, (count, gene) => {
-            const percentage = (count / geneTotalCounts[gene]) * 100;
+    return _.map(
+        groupToGeneCounts,
+        (geneCounts: { [gene: string]: number }, group) => {
+            let counts = _.map(geneCounts, (count, gene) => {
+                const percentage = (count / geneTotalCounts[gene]) * 100;
+                return {
+                    majorCategory: gene,
+                    count: count,
+                    percentage: parseFloat(percentage.toFixed(2)),
+                };
+            });
             return {
-                majorCategory: gene,
-                count: count,
-                percentage: parseFloat(percentage.toFixed(2))
-            }
-        });
-        return {
-            minorCategory: group,
-            counts
+                minorCategory: group,
+                counts,
+            };
         }
-    });
+    );
 }
 
-export function getGeneListOptions(data: AlterationEnrichmentRow[], includeAlteration?:boolean): { label: GeneOptionLabel, genes: string[] }[] {
+export function getGeneListOptions(
+    data: AlterationEnrichmentRow[],
+    includeAlteration?: boolean
+): { label: GeneOptionLabel; genes: string[] }[] {
     if (_.isEmpty(data)) {
-        return [{
-            label: GeneOptionLabel.USER_DEFINED_OPTION,
-            genes: []
-        }];
+        return [
+            {
+                label: GeneOptionLabel.USER_DEFINED_OPTION,
+                genes: [],
+            },
+        ];
     }
 
-    let dataWithOptionName: (AlterationEnrichmentRow & {optionName?:string})[] = data;
+    let dataWithOptionName: (AlterationEnrichmentRow & {
+        optionName?: string;
+    })[] = data;
 
-    if(includeAlteration) {
-        dataWithOptionName = _.map(dataWithOptionName,datum=>{
+    if (includeAlteration) {
+        dataWithOptionName = _.map(dataWithOptionName, datum => {
             return {
                 ...datum,
-                optionName: datum.hugoGeneSymbol + `: ${CNA_TO_ALTERATION[datum.value!]}`
+                optionName:
+                    datum.hugoGeneSymbol +
+                    `: ${CNA_TO_ALTERATION[datum.value!]}`,
             };
         });
     }
 
-    let dataSortedByAlteredPercentage = _.clone(dataWithOptionName).sort(function (kv1, kv2) {
-        const t1 = _.reduce(kv1.groupsSet, (acc, next) => {
-            acc = next.alteredPercentage > acc ? next.alteredPercentage : acc;
-            return acc;
-        }, 0);
-        const t2 = _.reduce(kv2.groupsSet, (acc, next) => {
-            acc = next.alteredPercentage > acc ? next.alteredPercentage : acc;
-            return acc;
-        }, 0);
-        return t2 - t1;
-    });
+    let dataSortedByAlteredPercentage = _.clone(dataWithOptionName).sort(
+        function(kv1, kv2) {
+            const t1 = _.reduce(
+                kv1.groupsSet,
+                (acc, next) => {
+                    acc =
+                        next.alteredPercentage > acc
+                            ? next.alteredPercentage
+                            : acc;
+                    return acc;
+                },
+                0
+            );
+            const t2 = _.reduce(
+                kv2.groupsSet,
+                (acc, next) => {
+                    acc =
+                        next.alteredPercentage > acc
+                            ? next.alteredPercentage
+                            : acc;
+                    return acc;
+                },
+                0
+            );
+            return t2 - t1;
+        }
+    );
 
-    let dataSortedByAvgFrequency = _.clone(dataWithOptionName).sort(function (kv1, kv2) {
-        const t1 = _.sumBy(_.values(kv1.groupsSet), count => count.alteredPercentage) / _.keys(kv1.groupsSet).length;
-        const t2 = _.sumBy(_.values(kv2.groupsSet), count => count.alteredPercentage) / _.keys(kv2.groupsSet).length;
+    let dataSortedByAvgFrequency = _.clone(dataWithOptionName).sort(function(
+        kv1,
+        kv2
+    ) {
+        const t1 =
+            _.sumBy(_.values(kv1.groupsSet), count => count.alteredPercentage) /
+            _.keys(kv1.groupsSet).length;
+        const t2 =
+            _.sumBy(_.values(kv2.groupsSet), count => count.alteredPercentage) /
+            _.keys(kv2.groupsSet).length;
         return t2 - t1;
     });
 
-    let dataSortedBypValue = _.clone(dataWithOptionName).sort(function (kv1, kv2) {
+    let dataSortedBypValue = _.clone(dataWithOptionName).sort(function(
+        kv1,
+        kv2
+    ) {
         if (kv1.pValue !== undefined && kv2.pValue !== undefined) {
             return 0;
         }
@@ -591,23 +814,32 @@ export function getGeneListOptions(data: AlterationEnrichmentRow[], includeAlter
     return [
         {
             label: GeneOptionLabel.USER_DEFINED_OPTION,
-            genes: []
+            genes: [],
         },
         {
             label: GeneOptionLabel.HIGHEST_FREQUENCY,
-            genes: _.map(dataSortedByAlteredPercentage, datum => datum.optionName || datum.hugoGeneSymbol)
+            genes: _.map(
+                dataSortedByAlteredPercentage,
+                datum => datum.optionName || datum.hugoGeneSymbol
+            ),
         },
         {
             label: GeneOptionLabel.AVERAGE_FREQUENCY,
-            genes: _.map(dataSortedByAvgFrequency, datum => datum.optionName || datum.hugoGeneSymbol)
+            genes: _.map(
+                dataSortedByAvgFrequency,
+                datum => datum.optionName || datum.hugoGeneSymbol
+            ),
         },
         {
             label: GeneOptionLabel.SIGNIFICANT_P_VALUE,
-            genes: _.map(dataSortedBypValue, datum => datum.optionName || datum.hugoGeneSymbol)
+            genes: _.map(
+                dataSortedBypValue,
+                datum => datum.optionName || datum.hugoGeneSymbol
+            ),
         },
         {
             label: GeneOptionLabel.SYNC_WITH_TABLE,
-            genes: []
-        }
+            genes: [],
+        },
     ];
 }
diff --git a/src/pages/resultsView/enrichments/ExpressionEnrichmentsBoxPlot.tsx b/src/pages/resultsView/enrichments/ExpressionEnrichmentsBoxPlot.tsx
index fed000b487f..6700af9fc5e 100644
--- a/src/pages/resultsView/enrichments/ExpressionEnrichmentsBoxPlot.tsx
+++ b/src/pages/resultsView/enrichments/ExpressionEnrichmentsBoxPlot.tsx
@@ -1,50 +1,63 @@
 import * as React from 'react';
-import { observer } from "mobx-react";
+import { observer } from 'mobx-react';
 import { observable, computed } from 'mobx';
-import styles from "./styles.module.scss";
+import styles from './styles.module.scss';
 import { MolecularProfile, Sample } from 'shared/api/generated/CBioPortalAPI';
 import {
     ExpressionEnrichmentWithQ,
-    getAlterationsTooltipContent
+    getAlterationsTooltipContent,
 } from 'pages/resultsView/enrichments/EnrichmentsUtil';
-import * as _ from "lodash";
+import * as _ from 'lodash';
 import autobind from 'autobind-decorator';
-import { IBoxScatterPlotPoint, IStringAxisData, INumberAxisData, makeBoxScatterPlotData, getBoxPlotDownloadData } from '../plots/PlotsTabUtils';
-import BoxScatterPlot, { IBoxScatterPlotData } from 'shared/components/plots/BoxScatterPlot';
+import {
+    IBoxScatterPlotPoint,
+    IStringAxisData,
+    INumberAxisData,
+    makeBoxScatterPlotData,
+    getBoxPlotDownloadData,
+} from '../plots/PlotsTabUtils';
+import BoxScatterPlot, {
+    IBoxScatterPlotData,
+} from 'shared/components/plots/BoxScatterPlot';
 import { remoteData, DownloadControls } from 'cbioportal-frontend-commons';
 import client from 'shared/api/cbioportalClientInstance';
 import LoadingIndicator from 'shared/components/loadingIndicator/LoadingIndicator';
 import { toConditionalPrecision } from 'shared/lib/NumberUtils';
 import { ExtendedAlteration } from '../ResultsViewPageStore';
 import { getSampleViewUrl } from 'shared/api/urls';
-import classNames from "classnames";
+import classNames from 'classnames';
 import { getGeneSummary } from '../querySummary/QuerySummaryUtils';
 
-class EnrichmentsBoxPlotComponent extends BoxScatterPlot<IBoxScatterPlotPoint> { }
+class EnrichmentsBoxPlotComponent extends BoxScatterPlot<
+    IBoxScatterPlotPoint
+> {}
 
 export interface IExpressionEnrichmentsBoxPlotProps {
     selectedProfile: MolecularProfile;
     groups: {
-        name: string,
-        description: string,
-        nameOfEnrichmentDirection?: string,
-        count: number,
-        color?: string,
-        samples:Pick<Sample, "uniqueSampleKey">[]
+        name: string;
+        description: string;
+        nameOfEnrichmentDirection?: string;
+        count: number;
+        color?: string;
+        samples: Pick<Sample, 'uniqueSampleKey'>[];
     }[];
     sampleKeyToSample: {
         [uniqueSampleKey: string]: Sample;
-    }
+    };
     queriedHugoGeneSymbols?: string[];
-    oqlFilteredCaseAggregatedData?: { [uniqueSampleKey: string]: ExtendedAlteration[] };
+    oqlFilteredCaseAggregatedData?: {
+        [uniqueSampleKey: string]: ExtendedAlteration[];
+    };
     selectedRow?: ExpressionEnrichmentWithQ;
 }
 
 @observer
-export default class ExpressionEnrichmentsBoxPlot extends React.Component<IExpressionEnrichmentsBoxPlotProps, {}> {
-
-    static defaultProps: Partial<IExpressionEnrichmentsBoxPlotProps> = {
-    };
+export default class ExpressionEnrichmentsBoxPlot extends React.Component<
+    IExpressionEnrichmentsBoxPlotProps,
+    {}
+> {
+    static defaultProps: Partial<IExpressionEnrichmentsBoxPlotProps> = {};
 
     @observable private svgContainer: SVGElement | null;
 
@@ -53,71 +66,97 @@ export default class ExpressionEnrichmentsBoxPlot extends React.Component<IExpre
         if (this.props.selectedRow !== undefined) {
             return getBoxPlotDownloadData(
                 this.boxPlotData.result!,
-                "Group",
-                this.props.selectedRow.hugoGeneSymbol + ", " + this.props.selectedProfile.name,
+                'Group',
+                this.props.selectedRow.hugoGeneSymbol +
+                    ', ' +
+                    this.props.selectedProfile.name,
                 {}
-            )
+            );
         }
         return '';
-
     }
 
     public readonly horzAxisData = remoteData({
         await: () => [],
         invoke: async () => {
             const categoryOrder = _.map(this.props.groups, group => group.name);
-            const axisData = { data: [], datatype: "string", categoryOrder } as IStringAxisData;
-
-            const sampleKeyToGroupSampleData = _.reduce(this.props.groups, (acc, group) => {
-                group.samples.forEach(sample => {
-                    const uniqueSampleKey = sample.uniqueSampleKey
-                    if (acc[uniqueSampleKey] === undefined) {
-                        acc[uniqueSampleKey] = {
-                            uniqueSampleKey,
-                            value: []
+            const axisData = {
+                data: [],
+                datatype: 'string',
+                categoryOrder,
+            } as IStringAxisData;
+
+            const sampleKeyToGroupSampleData = _.reduce(
+                this.props.groups,
+                (acc, group) => {
+                    group.samples.forEach(sample => {
+                        const uniqueSampleKey = sample.uniqueSampleKey;
+                        if (acc[uniqueSampleKey] === undefined) {
+                            acc[uniqueSampleKey] = {
+                                uniqueSampleKey,
+                                value: [],
+                            };
                         }
-                    }
-                    acc[uniqueSampleKey].value.push(group.name);
-                });
-                return acc;
-            }, {} as { [uniqueSampleKey: string]: { uniqueSampleKey: string, value: string[] } });
+                        acc[uniqueSampleKey].value.push(group.name);
+                    });
+                    return acc;
+                },
+                {} as {
+                    [uniqueSampleKey: string]: {
+                        uniqueSampleKey: string;
+                        value: string[];
+                    };
+                }
+            );
 
             axisData.data = _.values(sampleKeyToGroupSampleData);
             return Promise.resolve(axisData);
-        }
+        },
     });
 
     readonly vertAxisData = remoteData({
         invoke: async () => {
             const axisData: INumberAxisData = { data: [], datatype: 'number' };
             if (this.props.selectedRow !== undefined) {
-                const modecluarData = await client.fetchAllMolecularDataInMolecularProfileUsingPOST({
-                    molecularProfileId: this.props.selectedProfile.molecularProfileId,
-                    molecularDataFilter: {
-                        entrezGeneIds: [this.props.selectedRow.entrezGeneId],
-                        sampleIds: _.map(this.props.sampleKeyToSample, (sample) => sample.sampleId)
-                    } as any,
-                });
+                const modecluarData = await client.fetchAllMolecularDataInMolecularProfileUsingPOST(
+                    {
+                        molecularProfileId: this.props.selectedProfile
+                            .molecularProfileId,
+                        molecularDataFilter: {
+                            entrezGeneIds: [
+                                this.props.selectedRow.entrezGeneId,
+                            ],
+                            sampleIds: _.map(
+                                this.props.sampleKeyToSample,
+                                sample => sample.sampleId
+                            ),
+                        } as any,
+                    }
+                );
 
                 const axisData_Data = axisData.data;
-                const applyLog2 = this.props.selectedProfile.molecularProfileId.includes("rna_seq");
+                const applyLog2 = this.props.selectedProfile.molecularProfileId.includes(
+                    'rna_seq'
+                );
 
                 for (const d of modecluarData) {
-                    const value = applyLog2 ? Math.log(d.value + 1) / Math.log(2) : d.value;
+                    const value = applyLog2
+                        ? Math.log(d.value + 1) / Math.log(2)
+                        : d.value;
                     axisData_Data.push({
                         uniqueSampleKey: d.uniqueSampleKey,
-                        value
+                        value,
                     });
                 }
             }
             return Promise.resolve(axisData);
-        }
+        },
     });
 
-    private readonly boxPlotData = remoteData<IBoxScatterPlotData<IBoxScatterPlotPoint>[]>({
-        await: () => [
-            this.vertAxisData, this.horzAxisData
-        ],
+    private readonly boxPlotData = remoteData<
+        IBoxScatterPlotData<IBoxScatterPlotPoint>[]
+    >({
+        await: () => [this.vertAxisData, this.horzAxisData],
         invoke: () => {
             const horzAxisData = this.horzAxisData.result!;
             const vertAxisData = this.vertAxisData.result;
@@ -127,108 +166,158 @@ export default class ExpressionEnrichmentsBoxPlot extends React.Component<IExpre
                 let categoryData: IStringAxisData = horzAxisData;
                 let numberData: INumberAxisData = vertAxisData;
 
-                return Promise.resolve(makeBoxScatterPlotData(
-                    categoryData,
-                    numberData,
-                    this.props.sampleKeyToSample,
-                    {},
-                    undefined,
-                    undefined
-                ));
+                return Promise.resolve(
+                    makeBoxScatterPlotData(
+                        categoryData,
+                        numberData,
+                        this.props.sampleKeyToSample,
+                        {},
+                        undefined,
+                        undefined
+                    )
+                );
             }
-        }
+        },
     });
 
     @computed get scatterPlotTooltip() {
         return (d: IBoxScatterPlotPoint) => {
-            let alterationContent: string | undefined = undefined
+            let alterationContent: string | undefined = undefined;
             if (this.props.oqlFilteredCaseAggregatedData) {
-                const alterations = this.props.oqlFilteredCaseAggregatedData ? this.props.oqlFilteredCaseAggregatedData[d.uniqueSampleKey] : [];
-                alterationContent = 'Alteration(s): ' + getAlterationsTooltipContent(alterations)
+                const alterations = this.props.oqlFilteredCaseAggregatedData
+                    ? this.props.oqlFilteredCaseAggregatedData[
+                          d.uniqueSampleKey
+                      ]
+                    : [];
+                alterationContent =
+                    'Alteration(s): ' +
+                    getAlterationsTooltipContent(alterations);
             }
 
-            let content = <span>Loading... (this shouldnt appear because the box plot shouldnt be visible)</span>;
+            let content = (
+                <span>
+                    Loading... (this shouldnt appear because the box plot
+                    shouldnt be visible)
+                </span>
+            );
             if (this.boxPlotData.isComplete) {
-                content = <div>
-                    <a href={getSampleViewUrl(d.studyId, d.sampleId)} target="_blank"><b>{d.sampleId}</b></a>
-                    <br />
-                    mRNA expression: {d.value.toFixed(3)}
-                    {!!alterationContent && <br />}
-                    {alterationContent}
-                </div>
+                content = (
+                    <div>
+                        <a
+                            href={getSampleViewUrl(d.studyId, d.sampleId)}
+                            target="_blank"
+                        >
+                            <b>{d.sampleId}</b>
+                        </a>
+                        <br />
+                        mRNA expression: {d.value.toFixed(3)}
+                        {!!alterationContent && <br />}
+                        {alterationContent}
+                    </div>
+                );
             }
             return content;
-        }
+        };
     }
 
     public render() {
-
         let plotElt: any = null;
         if (this.props.selectedRow === undefined) {
-
-            plotElt = (<div className={classNames("text-center", styles.BoxEmpty)}>
-                Click on a gene in the table to render this plot.
-                        </div>)
+            plotElt = (
+                <div className={classNames('text-center', styles.BoxEmpty)}>
+                    Click on a gene in the table to render this plot.
+                </div>
+            );
         } else if (this.boxPlotData.isPending) {
-
-            plotElt = <div className={classNames("text-center", styles.BoxEmpty)}>
-                <LoadingIndicator isLoading={true} size={"small"} className={styles.ChartLoader} />
-            </div>;
-        } else if (this.props.selectedRow.hugoGeneSymbol && this.boxPlotData.isComplete && this.boxPlotData.result.length > 0) {
-
+            plotElt = (
+                <div className={classNames('text-center', styles.BoxEmpty)}>
+                    <LoadingIndicator
+                        isLoading={true}
+                        size={'small'}
+                        className={styles.ChartLoader}
+                    />
+                </div>
+            );
+        } else if (
+            this.props.selectedRow.hugoGeneSymbol &&
+            this.boxPlotData.isComplete &&
+            this.boxPlotData.result.length > 0
+        ) {
             let axisLabelX = `group`;
             if (this.props.queriedHugoGeneSymbols !== undefined) {
-                axisLabelX = `Query: ${getGeneSummary(this.props.queriedHugoGeneSymbols)}`;
+                axisLabelX = `Query: ${getGeneSummary(
+                    this.props.queriedHugoGeneSymbols
+                )}`;
             }
 
-            plotElt = <div className={styles.BoxPlot} data-test="MiniBoxPlot">
-                <DownloadControls
-                    buttons={["SVG", "PNG", "Data"]}
-                    getSvg={() => this.svgContainer}
-                    getData={this.getData}
-                    filename={"expression_enrichment"}
-                    dontFade={true}
-                    style={{ position: 'absolute', right: 10, top: 10 }}
-                    type='button'
-                />
-                <EnrichmentsBoxPlotComponent
-                    domainPadding={10}
-                    startDataAxisAtZero={true}
-                    boxWidth={this.boxPlotData.result.length > 7 ? 30 : 60}
-                    axisLabelY={this.props.selectedRow.hugoGeneSymbol + ", " + this.props.selectedProfile.name}
-                    axisLabelX={axisLabelX}
-                    data={this.boxPlotData.result!}
-                    chartBase={320}
-                    scatterPlotTooltip={this.scatterPlotTooltip}
-                    horizontal={false}
-                    fill={"#00AAF8"}
-                    symbol="circle"
-                    useLogSpaceTicks={true}
-                    containerRef={(ref) => this.svgContainer = ref}
-                    compressXAxis
-                    legendData={
-                        [{
-                            name: `p-Value: ${toConditionalPrecision(this.props.selectedRow.pValue, 3, 0.01)}`,
-                            symbol: {
-                                fill: 'none',
-                                strokeWidth: 0
-                            }
-                        }, {
-                            name: `q-Value: ${toConditionalPrecision(this.props.selectedRow.qValue, 3, 0.01)}`,
-                            symbol: {
-                                fill: 'none',
-                                strokeWidth: 0
-                            }
-                        }]
-                    }
-                />
-            </div>
+            plotElt = (
+                <div className={styles.BoxPlot} data-test="MiniBoxPlot">
+                    <DownloadControls
+                        buttons={['SVG', 'PNG', 'Data']}
+                        getSvg={() => this.svgContainer}
+                        getData={this.getData}
+                        filename={'expression_enrichment'}
+                        dontFade={true}
+                        style={{ position: 'absolute', right: 10, top: 10 }}
+                        type="button"
+                    />
+                    <EnrichmentsBoxPlotComponent
+                        domainPadding={10}
+                        startDataAxisAtZero={true}
+                        boxWidth={this.boxPlotData.result.length > 7 ? 30 : 60}
+                        axisLabelY={
+                            this.props.selectedRow.hugoGeneSymbol +
+                            ', ' +
+                            this.props.selectedProfile.name
+                        }
+                        axisLabelX={axisLabelX}
+                        data={this.boxPlotData.result!}
+                        chartBase={320}
+                        scatterPlotTooltip={this.scatterPlotTooltip}
+                        horizontal={false}
+                        fill={'#00AAF8'}
+                        symbol="circle"
+                        useLogSpaceTicks={true}
+                        containerRef={ref => (this.svgContainer = ref)}
+                        compressXAxis
+                        legendData={[
+                            {
+                                name: `p-Value: ${toConditionalPrecision(
+                                    this.props.selectedRow.pValue,
+                                    3,
+                                    0.01
+                                )}`,
+                                symbol: {
+                                    fill: 'none',
+                                    strokeWidth: 0,
+                                },
+                            },
+                            {
+                                name: `q-Value: ${toConditionalPrecision(
+                                    this.props.selectedRow.qValue,
+                                    3,
+                                    0.01
+                                )}`,
+                                symbol: {
+                                    fill: 'none',
+                                    strokeWidth: 0,
+                                },
+                            },
+                        ]}
+                    />
+                </div>
+            );
         }
-        return <div style={{
-            position: 'relative',
-            display: 'inline-block'
-        }} className="borderedChart">
-            {plotElt}
-        </div>;
+        return (
+            <div
+                style={{
+                    position: 'relative',
+                    display: 'inline-block',
+                }}
+                className="borderedChart"
+            >
+                {plotElt}
+            </div>
+        );
     }
 }
diff --git a/src/pages/resultsView/enrichments/ExpressionEnrichmentsContainer.tsx b/src/pages/resultsView/enrichments/ExpressionEnrichmentsContainer.tsx
index 1afd1dac51b..7f9ec88eeaf 100644
--- a/src/pages/resultsView/enrichments/ExpressionEnrichmentsContainer.tsx
+++ b/src/pages/resultsView/enrichments/ExpressionEnrichmentsContainer.tsx
@@ -1,23 +1,29 @@
 import * as React from 'react';
-import { observer } from "mobx-react";
+import { observer } from 'mobx-react';
 import { observable, computed, action } from 'mobx';
-import ExpressionEnrichmentTable, { ExpressionEnrichmentTableColumnType } from 'pages/resultsView/enrichments/ExpressionEnrichmentsTable';
-import styles from "./styles.module.scss";
+import ExpressionEnrichmentTable, {
+    ExpressionEnrichmentTableColumnType,
+} from 'pages/resultsView/enrichments/ExpressionEnrichmentsTable';
+import styles from './styles.module.scss';
 import { MolecularProfile, Sample } from 'shared/api/generated/CBioPortalAPI';
 import {
     ExpressionEnrichmentWithQ,
     getExpressionRowData,
     getExpressionScatterData,
     getExpressionEnrichmentColumns,
-    getFilteredData
+    getFilteredData,
 } from 'pages/resultsView/enrichments/EnrichmentsUtil';
 import { ExpressionEnrichmentRow } from 'shared/model/ExpressionEnrichmentRow';
 import AddCheckedGenes from 'pages/resultsView/enrichments/AddCheckedGenes';
 import MiniScatterChart from 'pages/resultsView/enrichments/MiniScatterChart';
-import * as _ from "lodash";
+import * as _ from 'lodash';
 import autobind from 'autobind-decorator';
 import { EnrichmentsTableDataStore } from 'pages/resultsView/enrichments/EnrichmentsTableDataStore';
-import { CheckedSelect, EllipsisTextTooltip, Option } from "cbioportal-frontend-commons";
+import {
+    CheckedSelect,
+    EllipsisTextTooltip,
+    Option,
+} from 'cbioportal-frontend-commons';
 import { ExtendedAlteration } from '../ResultsViewPageStore';
 import ExpressionEnrichmentsBoxPlot from './ExpressionEnrichmentsBoxPlot';
 
@@ -25,28 +31,32 @@ export interface IExpressionEnrichmentContainerProps {
     data: ExpressionEnrichmentWithQ[];
     selectedProfile: MolecularProfile;
     groups: {
-        name: string,
-        description: string,
-        nameOfEnrichmentDirection?: string,
-        count: number,
-        color?: string,
-        samples:Pick<Sample, "uniqueSampleKey">[]
+        name: string;
+        description: string;
+        nameOfEnrichmentDirection?: string;
+        count: number;
+        color?: string;
+        samples: Pick<Sample, 'uniqueSampleKey'>[];
     }[];
     sampleKeyToSample: {
         [uniqueSampleKey: string]: Sample;
-    }
+    };
     alteredVsUnalteredMode?: boolean;
     queriedHugoGeneSymbols?: string[];
-    oqlFilteredCaseAggregatedData?: { [uniqueSampleKey: string]: ExtendedAlteration[] };
-    isGeneCheckBoxEnabled?:boolean
+    oqlFilteredCaseAggregatedData?: {
+        [uniqueSampleKey: string]: ExtendedAlteration[];
+    };
+    isGeneCheckBoxEnabled?: boolean;
 }
 
 @observer
-export default class ExpressionEnrichmentContainer extends React.Component<IExpressionEnrichmentContainerProps, {}> {
-
+export default class ExpressionEnrichmentContainer extends React.Component<
+    IExpressionEnrichmentContainerProps,
+    {}
+> {
     static defaultProps: Partial<IExpressionEnrichmentContainerProps> = {
         alteredVsUnalteredMode: true,
-        isGeneCheckBoxEnabled: false
+        isGeneCheckBoxEnabled: false,
     };
 
     @observable overExpressedFilter: boolean = true;
@@ -57,16 +67,26 @@ export default class ExpressionEnrichmentContainer extends React.Component<IExpr
     @observable clickedGeneEntrez: number;
     @observable.ref selectedGenes: string[] | null;
     @observable.ref highlightedRow: ExpressionEnrichmentRow | undefined;
-    @observable.ref _expressedGroups: string[] = this.props.groups.map(group => group.name);
+    @observable.ref _expressedGroups: string[] = this.props.groups.map(
+        group => group.name
+    );
     @observable private svgContainer: SVGElement | null;
 
     @computed get data(): ExpressionEnrichmentRow[] {
-        return getExpressionRowData(this.props.data, this.props.queriedHugoGeneSymbols || [], this.props.groups);
+        return getExpressionRowData(
+            this.props.data,
+            this.props.queriedHugoGeneSymbols || [],
+            this.props.groups
+        );
     }
 
     @computed get filteredData(): ExpressionEnrichmentRow[] {
-        return getFilteredData(this.data, this._expressedGroups, this.significanceFilter,
-            this.selectedGenes);
+        return getFilteredData(
+            this.data,
+            this._expressedGroups,
+            this.significanceFilter,
+            this.selectedGenes
+        );
     }
 
     @autobind
@@ -76,7 +96,6 @@ export default class ExpressionEnrichmentContainer extends React.Component<IExpr
 
     @autobind
     private onCheckGene(hugoGeneSymbol: string) {
-
         const index = this.checkedGenes.indexOf(hugoGeneSymbol);
         if (index !== -1) {
             this.checkedGenes.splice(index, 1);
@@ -125,17 +144,27 @@ export default class ExpressionEnrichmentContainer extends React.Component<IExpr
 
     @computed get group1CheckboxLabel() {
         if (this.props.alteredVsUnalteredMode) {
-            return "Over-expressed";
+            return 'Over-expressed';
         } else {
-            return <span style={{display:"flex", alignItems:"center"}}>Enriched in&nbsp;<EllipsisTextTooltip text={this.group1.name!}/></span>;
+            return (
+                <span style={{ display: 'flex', alignItems: 'center' }}>
+                    Enriched in&nbsp;
+                    <EllipsisTextTooltip text={this.group1.name!} />
+                </span>
+            );
         }
     }
 
     @computed get group2CheckboxLabel() {
         if (this.props.alteredVsUnalteredMode) {
-            return "Under-expressed";
+            return 'Under-expressed';
         } else {
-            return <span style={{display:"flex", alignItems:"center"}}>Enriched in&nbsp;<EllipsisTextTooltip text={this.group2.name!}/></span>;
+            return (
+                <span style={{ display: 'flex', alignItems: 'center' }}>
+                    Enriched in&nbsp;
+                    <EllipsisTextTooltip text={this.group2.name!} />
+                </span>
+            );
         }
     }
 
@@ -148,20 +177,25 @@ export default class ExpressionEnrichmentContainer extends React.Component<IExpr
     }
 
     @computed get customColumns() {
-        return getExpressionEnrichmentColumns(this.props.groups, this.props.alteredVsUnalteredMode);
+        return getExpressionEnrichmentColumns(
+            this.props.groups,
+            this.props.alteredVsUnalteredMode
+        );
     }
 
     @computed get visibleOrderedColumnNames() {
         const columns = [];
-        columns.push(ExpressionEnrichmentTableColumnType.GENE,
-            ExpressionEnrichmentTableColumnType.CYTOBAND);
+        columns.push(
+            ExpressionEnrichmentTableColumnType.GENE,
+            ExpressionEnrichmentTableColumnType.CYTOBAND
+        );
 
         this.props.groups.forEach(group => {
-            columns.push(group.name + " mean");
+            columns.push(group.name + ' mean');
         });
 
         this.props.groups.forEach(group => {
-            columns.push(group.name + " standard deviation");
+            columns.push(group.name + ' standard deviation');
         });
 
         if (this.isTwoGroupAnalysis) {
@@ -170,19 +204,21 @@ export default class ExpressionEnrichmentContainer extends React.Component<IExpr
 
         columns.push(
             ExpressionEnrichmentTableColumnType.P_VALUE,
-            ExpressionEnrichmentTableColumnType.Q_VALUE);
+            ExpressionEnrichmentTableColumnType.Q_VALUE
+        );
 
         if (this.isTwoGroupAnalysis && this.props.alteredVsUnalteredMode) {
             columns.push(ExpressionEnrichmentTableColumnType.TENDENCY);
         } else {
-            columns.push(ExpressionEnrichmentTableColumnType.EXPRESSED)
+            columns.push(ExpressionEnrichmentTableColumnType.EXPRESSED);
         }
 
         return columns;
     }
 
     @autobind
-    @action onChange(values: { value: string }[]) {
+    @action
+    onChange(values: { value: string }[]) {
         this._expressedGroups = _.map(values, datum => datum.value);
     }
 
@@ -193,51 +229,72 @@ export default class ExpressionEnrichmentContainer extends React.Component<IExpr
     @computed get options(): Option[] {
         return _.map(this.props.groups, group => {
             return {
-                label: group.nameOfEnrichmentDirection ? group.nameOfEnrichmentDirection : group.name,
-                value: group.name
-            }
+                label: group.nameOfEnrichmentDirection
+                    ? group.nameOfEnrichmentDirection
+                    : group.name,
+                value: group.name,
+            };
         });
     }
 
     @computed get selectedRow() {
         if (this.clickedGeneHugo) {
-            return this.props.data.filter(d => d.hugoGeneSymbol === this.clickedGeneHugo)[0];
+            return this.props.data.filter(
+                d => d.hugoGeneSymbol === this.clickedGeneHugo
+            )[0];
         }
         return undefined;
     }
 
     public render() {
-
         if (this.props.data.length === 0) {
-            return <div className={'alert alert-info'}>No data/result available</div>;
+            return (
+                <div className={'alert alert-info'}>
+                    No data/result available
+                </div>
+            );
         }
 
-        const data: any[] = getExpressionScatterData(this.data, this.props.queriedHugoGeneSymbols || []);
-        const maxData: any = _.maxBy(data, (d) => {
+        const data: any[] = getExpressionScatterData(
+            this.data,
+            this.props.queriedHugoGeneSymbols || []
+        );
+        const maxData: any = _.maxBy(data, d => {
             return Math.ceil(Math.abs(d.x));
         });
 
         return (
             <div className={styles.Container}>
                 <div className={styles.ChartsPanel}>
-                    {this.isTwoGroupAnalysis &&
+                    {this.isTwoGroupAnalysis && (
                         <MiniScatterChart
                             data={data}
                             selectedGenesSet={this.selectedGenesSet}
-                            xAxisLeftLabel={this.group2.nameOfEnrichmentDirection || this.group2.name}
-                            xAxisRightLabel={this.group1.nameOfEnrichmentDirection || this.group1.name}
+                            xAxisLeftLabel={
+                                this.group2.nameOfEnrichmentDirection ||
+                                this.group2.name
+                            }
+                            xAxisRightLabel={
+                                this.group1.nameOfEnrichmentDirection ||
+                                this.group1.name
+                            }
                             xAxisDomain={Math.ceil(Math.abs(maxData.x))}
                             xAxisTickValues={null}
                             onGeneNameClick={this.onGeneNameClick}
                             onSelection={this.onSelection}
-                            onSelectionCleared={this.onSelectionCleared} />
-                    }
+                            onSelectionCleared={this.onSelectionCleared}
+                        />
+                    )}
                     <ExpressionEnrichmentsBoxPlot
                         selectedProfile={this.props.selectedProfile}
                         groups={this.props.groups}
                         sampleKeyToSample={this.props.sampleKeyToSample}
-                        queriedHugoGeneSymbols={this.props.queriedHugoGeneSymbols}
-                        oqlFilteredCaseAggregatedData={this.props.oqlFilteredCaseAggregatedData}
+                        queriedHugoGeneSymbols={
+                            this.props.queriedHugoGeneSymbols
+                        }
+                        oqlFilteredCaseAggregatedData={
+                            this.props.oqlFilteredCaseAggregatedData
+                        }
                         selectedRow={this.selectedRow}
                     />
                 </div>
@@ -245,14 +302,22 @@ export default class ExpressionEnrichmentContainer extends React.Component<IExpr
                 <div className={styles.TableContainer}>
                     <div>
                         <h3>{this.props.selectedProfile.name}</h3>
-                        {!!this.props.isGeneCheckBoxEnabled && <AddCheckedGenes checkedGenes={this.checkedGenes} />}
+                        {!!this.props.isGeneCheckBoxEnabled && (
+                            <AddCheckedGenes checkedGenes={this.checkedGenes} />
+                        )}
                     </div>
-                    <hr style={{ marginTop: 0, marginBottom: 5, borderWidth: 2 }} />
+                    <hr
+                        style={{
+                            marginTop: 0,
+                            marginBottom: 5,
+                            borderWidth: 2,
+                        }}
+                    />
                     <div className={styles.Checkboxes}>
-                        <div style={{ width: 250, marginRight: 7 }} >
+                        <div style={{ width: 250, marginRight: 7 }}>
                             <CheckedSelect
-                                name={"enrichedGroupsSelector"}
-                                placeholder={"Select enriched groups"}
+                                name={'enrichedGroupsSelector'}
+                                placeholder={'Select enriched groups'}
                                 onChange={this.onChange}
                                 options={this.options}
                                 value={this.selectedValues}
@@ -271,13 +336,26 @@ export default class ExpressionEnrichmentContainer extends React.Component<IExpr
                     </div>
                     <ExpressionEnrichmentTable
                         data={this.filteredData}
-                        onCheckGene={!!this.props.isGeneCheckBoxEnabled ? this.onCheckGene : undefined}
+                        onCheckGene={
+                            !!this.props.isGeneCheckBoxEnabled
+                                ? this.onCheckGene
+                                : undefined
+                        }
                         onGeneNameClick={this.onGeneNameClick}
                         dataStore={this.dataStore}
                         mutexTendency={this.props.alteredVsUnalteredMode}
-                        checkedGenes={!!this.props.isGeneCheckBoxEnabled ? this.checkedGenes : undefined}
-                        visibleOrderedColumnNames={this.visibleOrderedColumnNames}
-                        customColumns={_.keyBy(this.customColumns, column => column.uniqueName || column.name)}
+                        checkedGenes={
+                            !!this.props.isGeneCheckBoxEnabled
+                                ? this.checkedGenes
+                                : undefined
+                        }
+                        visibleOrderedColumnNames={
+                            this.visibleOrderedColumnNames
+                        }
+                        customColumns={_.keyBy(
+                            this.customColumns,
+                            column => column.uniqueName || column.name
+                        )}
                     />
                 </div>
             </div>
diff --git a/src/pages/resultsView/enrichments/ExpressionEnrichmentsTable.tsx b/src/pages/resultsView/enrichments/ExpressionEnrichmentsTable.tsx
index fb9c65b5bfc..6b9ee7bab59 100644
--- a/src/pages/resultsView/enrichments/ExpressionEnrichmentsTable.tsx
+++ b/src/pages/resultsView/enrichments/ExpressionEnrichmentsTable.tsx
@@ -1,12 +1,14 @@
 import * as React from 'react';
-import * as _ from "lodash";
-import LazyMobXTable, { Column } from "../../../shared/components/lazyMobXTable/LazyMobXTable";
-import { observer } from "mobx-react";
-import { computed } from "mobx";
+import * as _ from 'lodash';
+import LazyMobXTable, {
+    Column,
+} from '../../../shared/components/lazyMobXTable/LazyMobXTable';
+import { observer } from 'mobx-react';
+import { computed } from 'mobx';
 import { Checkbox } from 'react-bootstrap';
-import { formatSignificanceValueWithStyle } from "shared/lib/FormatUtils";
-import { toConditionalPrecision, } from 'shared/lib/NumberUtils';
-import styles from "./styles.module.scss";
+import { formatSignificanceValueWithStyle } from 'shared/lib/FormatUtils';
+import { toConditionalPrecision } from 'shared/lib/NumberUtils';
+import styles from './styles.module.scss';
 import { ExpressionEnrichmentRow } from 'shared/model/ExpressionEnrichmentRow';
 import { cytobandFilter } from 'pages/resultsView/ResultsViewTableUtils';
 import autobind from 'autobind-decorator';
@@ -14,7 +16,7 @@ import { EnrichmentsTableDataStore } from 'pages/resultsView/enrichments/Enrichm
 
 export interface IExpressionEnrichmentTableProps {
     visibleOrderedColumnNames?: string[];
-    customColumns?: { [id: string]: ExpressionEnrichmentTableColumn }
+    customColumns?: { [id: string]: ExpressionEnrichmentTableColumn };
     data: ExpressionEnrichmentRow[];
     initialSortColumn?: string;
     dataStore: EnrichmentsTableDataStore;
@@ -25,35 +27,41 @@ export interface IExpressionEnrichmentTableProps {
 }
 
 export enum ExpressionEnrichmentTableColumnType {
-    GENE = "GENE",
-    CYTOBAND = "CYTOBAND",
-    LOG_RATIO = "Log Ratio",
-    P_VALUE = "P_VALUE",
-    Q_VALUE = "Q_VALUE",
-    TENDENCY = "Tendency",
-    EXPRESSED="Higher expression in",
-    MEAN_SUFFIX = " mean",
-    STANDARD_DEVIATION_SUFFIX=" standard deviation"
+    GENE = 'GENE',
+    CYTOBAND = 'CYTOBAND',
+    LOG_RATIO = 'Log Ratio',
+    P_VALUE = 'P_VALUE',
+    Q_VALUE = 'Q_VALUE',
+    TENDENCY = 'Tendency',
+    EXPRESSED = 'Higher expression in',
+    MEAN_SUFFIX = ' mean',
+    STANDARD_DEVIATION_SUFFIX = ' standard deviation',
 }
 
-export type ExpressionEnrichmentTableColumn = Column<ExpressionEnrichmentRow> & { uniqueName?: string, order?: number };
+export type ExpressionEnrichmentTableColumn = Column<
+    ExpressionEnrichmentRow
+> & { uniqueName?: string; order?: number };
 
 @observer
-export default class ExpressionEnrichmentTable extends React.Component<IExpressionEnrichmentTableProps, {}> {
-
+export default class ExpressionEnrichmentTable extends React.Component<
+    IExpressionEnrichmentTableProps,
+    {}
+> {
     public static defaultProps = {
         columns: [
             ExpressionEnrichmentTableColumnType.GENE,
             ExpressionEnrichmentTableColumnType.CYTOBAND,
             ExpressionEnrichmentTableColumnType.P_VALUE,
-            ExpressionEnrichmentTableColumnType.Q_VALUE
+            ExpressionEnrichmentTableColumnType.Q_VALUE,
         ],
-        initialSortColumn: "q-Value",
-        mutexTendency: true
+        initialSortColumn: 'q-Value',
+        mutexTendency: true,
     };
 
     private checkboxChange(hugoGeneSymbol: string) {
-        const row: ExpressionEnrichmentRow = _.find(this.props.data, { hugoGeneSymbol })!;
+        const row: ExpressionEnrichmentRow = _.find(this.props.data, {
+            hugoGeneSymbol,
+        })!;
         row.checked = !row.checked;
         this.props.onCheckGene!(hugoGeneSymbol);
     }
@@ -64,58 +72,86 @@ export default class ExpressionEnrichmentTable extends React.Component<IExpressi
         this.props.dataStore.setHighlighted(d);
     }
 
-    @computed get columns(): { [columnEnum: string]: ExpressionEnrichmentTableColumn } {
-        const columns: { [columnEnum: string]: ExpressionEnrichmentTableColumn } = this.props.customColumns || {};
+    @computed get columns(): {
+        [columnEnum: string]: ExpressionEnrichmentTableColumn;
+    } {
+        const columns: {
+            [columnEnum: string]: ExpressionEnrichmentTableColumn;
+        } = this.props.customColumns || {};
 
         columns[ExpressionEnrichmentTableColumnType.GENE] = {
-            name: "Gene",
-            render: (d: ExpressionEnrichmentRow) => <div style={{ display: 'flex' }}>
-                {this.props.onCheckGene && this.props.checkedGenes && (
-                    <Checkbox checked={this.props.checkedGenes.includes(d.hugoGeneSymbol)}
-                        disabled={d.disabled}
-                        key={d.hugoGeneSymbol}
-                        className={styles.Checkbox}
-                        onChange={() => {
-                            this.checkboxChange(d.hugoGeneSymbol);
-                        }}
-                        onClick={(e) => {
-                            e.stopPropagation();
-                        }}
-                        title={d.disabled ? "This is one of the query genes" : ""}
-                    />
-                )}
-                <span className={styles.GeneName}>
-                    <b>{d.hugoGeneSymbol}</b></span></div>,
+            name: 'Gene',
+            render: (d: ExpressionEnrichmentRow) => (
+                <div style={{ display: 'flex' }}>
+                    {this.props.onCheckGene && this.props.checkedGenes && (
+                        <Checkbox
+                            checked={this.props.checkedGenes.includes(
+                                d.hugoGeneSymbol
+                            )}
+                            disabled={d.disabled}
+                            key={d.hugoGeneSymbol}
+                            className={styles.Checkbox}
+                            onChange={() => {
+                                this.checkboxChange(d.hugoGeneSymbol);
+                            }}
+                            onClick={e => {
+                                e.stopPropagation();
+                            }}
+                            title={
+                                d.disabled
+                                    ? 'This is one of the query genes'
+                                    : ''
+                            }
+                        />
+                    )}
+                    <span className={styles.GeneName}>
+                        <b>{d.hugoGeneSymbol}</b>
+                    </span>
+                </div>
+            ),
             tooltip: <span>Gene</span>,
-            filter: (d: ExpressionEnrichmentRow, filterString: string, filterStringUpper: string) =>
-                d.hugoGeneSymbol.toUpperCase().includes(filterStringUpper),
+            filter: (
+                d: ExpressionEnrichmentRow,
+                filterString: string,
+                filterStringUpper: string
+            ) => d.hugoGeneSymbol.toUpperCase().includes(filterStringUpper),
             sortBy: (d: ExpressionEnrichmentRow) => d.hugoGeneSymbol,
-            download: (d: ExpressionEnrichmentRow) => d.hugoGeneSymbol
+            download: (d: ExpressionEnrichmentRow) => d.hugoGeneSymbol,
         };
 
         columns[ExpressionEnrichmentTableColumnType.CYTOBAND] = {
-            name: "Cytoband",
+            name: 'Cytoband',
             render: (d: ExpressionEnrichmentRow) => <span>{d.cytoband}</span>,
             tooltip: <span>Cytoband</span>,
             filter: cytobandFilter,
             sortBy: (d: ExpressionEnrichmentRow) => d.cytoband,
-            download: (d: ExpressionEnrichmentRow) => d.cytoband
+            download: (d: ExpressionEnrichmentRow) => d.cytoband,
         };
 
         columns[ExpressionEnrichmentTableColumnType.P_VALUE] = {
-            name: "p-Value",
-            render: (d: ExpressionEnrichmentRow) => <span style={{ whiteSpace: 'nowrap' }}>{toConditionalPrecision(d.pValue, 3, 0.01)}</span>,
+            name: 'p-Value',
+            render: (d: ExpressionEnrichmentRow) => (
+                <span style={{ whiteSpace: 'nowrap' }}>
+                    {toConditionalPrecision(d.pValue, 3, 0.01)}
+                </span>
+            ),
             tooltip: <span>Derived from Student's t-test</span>,
             sortBy: (d: ExpressionEnrichmentRow) => d.pValue,
-            download: (d: ExpressionEnrichmentRow) => toConditionalPrecision(d.pValue, 3, 0.01)
+            download: (d: ExpressionEnrichmentRow) =>
+                toConditionalPrecision(d.pValue, 3, 0.01),
         };
 
         columns[ExpressionEnrichmentTableColumnType.Q_VALUE] = {
-            name: "q-Value",
-            render: (d: ExpressionEnrichmentRow) => <span style={{ whiteSpace: 'nowrap' }}>{formatSignificanceValueWithStyle(d.qValue)}</span>,
+            name: 'q-Value',
+            render: (d: ExpressionEnrichmentRow) => (
+                <span style={{ whiteSpace: 'nowrap' }}>
+                    {formatSignificanceValueWithStyle(d.qValue)}
+                </span>
+            ),
             tooltip: <span>Derived from Benjamini-Hochberg procedure</span>,
             sortBy: (d: ExpressionEnrichmentRow) => d.qValue,
-            download: (d: ExpressionEnrichmentRow) => toConditionalPrecision(d.qValue, 3, 0.01)
+            download: (d: ExpressionEnrichmentRow) =>
+                toConditionalPrecision(d.qValue, 3, 0.01),
         };
 
         return columns;
@@ -123,17 +159,23 @@ export default class ExpressionEnrichmentTable extends React.Component<IExpressi
 
     public render() {
         const orderedColumns = _.sortBy(
-            this.props.visibleOrderedColumnNames!.map(column => this.columns[column]),
+            this.props.visibleOrderedColumnNames!.map(
+                column => this.columns[column]
+            ),
             (c: ExpressionEnrichmentTableColumn) => c.order
         );
         return (
             <LazyMobXTable
                 initialItemsPerPage={20}
                 paginationProps={{ itemsPerPageOptions: [20] }}
-                columns={orderedColumns} data={this.props.data}
+                columns={orderedColumns}
+                data={this.props.data}
                 initialSortColumn={this.props.initialSortColumn}
-                onRowClick={this.props.onGeneNameClick ? this.onRowClick : undefined}
-                dataStore={this.props.dataStore} />
+                onRowClick={
+                    this.props.onGeneNameClick ? this.onRowClick : undefined
+                }
+                dataStore={this.props.dataStore}
+            />
         );
     }
 }
diff --git a/src/pages/resultsView/enrichments/GeneBarPlot.tsx b/src/pages/resultsView/enrichments/GeneBarPlot.tsx
index a5f7df0d68d..387bfa9e2c7 100644
--- a/src/pages/resultsView/enrichments/GeneBarPlot.tsx
+++ b/src/pages/resultsView/enrichments/GeneBarPlot.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { observer } from 'mobx-react';
 import { observable, action, computed } from 'mobx';
-import {DownloadControls, DefaultTooltip}from 'cbioportal-frontend-commons';
+import { DownloadControls, DefaultTooltip } from 'cbioportal-frontend-commons';
 import autobind from 'autobind-decorator';
 import MultipleCategoryBarPlot from 'shared/components/plots/MultipleCategoryBarPlot';
 import ReactSelect from 'react-select';
@@ -184,10 +184,14 @@ export default class GeneBarPlot extends React.Component<
                     <tbody>{groupRows}</tbody>
                 </table>
                 <strong>p-Value</strong>:{' '}
-                {geneData.pValue ? toConditionalPrecision(geneData.pValue, 3, 0.01) : '-'}
+                {geneData.pValue
+                    ? toConditionalPrecision(geneData.pValue, 3, 0.01)
+                    : '-'}
                 <br />
                 <strong>q-Value</strong>:{' '}
-                {geneData.qValue ? toConditionalPrecision(geneData.qValue, 3, 0.01) : '-'}
+                {geneData.qValue
+                    ? toConditionalPrecision(geneData.qValue, 3, 0.01)
+                    : '-'}
             </div>
         );
     }
diff --git a/src/pages/resultsView/enrichments/HoverablePoint.tsx b/src/pages/resultsView/enrichments/HoverablePoint.tsx
index c8f7ec4c68f..cf34100812b 100644
--- a/src/pages/resultsView/enrichments/HoverablePoint.tsx
+++ b/src/pages/resultsView/enrichments/HoverablePoint.tsx
@@ -1,27 +1,30 @@
-import * as React from "react";
-import {observer} from "mobx-react";
-import autobind from "autobind-decorator";
+import * as React from 'react';
+import { observer } from 'mobx-react';
+import autobind from 'autobind-decorator';
 
 interface IHoverablePointProps {
-    onMouseOver:(datum:any, x:number, y:number)=>void;
-    onMouseOut:()=>void;
-    fill:(datum:any)=>string;
+    onMouseOver: (datum: any, x: number, y: number) => void;
+    onMouseOut: () => void;
+    fill: (datum: any) => string;
     // all optional props given by victory
-    datum?:any;
-    style?:any;
-    x?:number;
-    y?:number;
+    datum?: any;
+    style?: any;
+    x?: number;
+    y?: number;
 }
 
 @observer
-export default class HoverablePoint extends React.Component<IHoverablePointProps, {}> {
-    @autobind private onMouseOver(e:any) {
-        e.target.setAttribute("r", 10);
+export default class HoverablePoint extends React.Component<
+    IHoverablePointProps,
+    {}
+> {
+    @autobind private onMouseOver(e: any) {
+        e.target.setAttribute('r', 10);
         this.props.onMouseOver(this.props.datum, this.props.x!, this.props.y!);
     }
 
-    @autobind private onMouseOut(e:any) {
-        e.target.setAttribute("r", 3);
+    @autobind private onMouseOut(e: any) {
+        e.target.setAttribute('r', 3);
         this.props.onMouseOut();
     }
 
@@ -34,9 +37,9 @@ export default class HoverablePoint extends React.Component<IHoverablePointProps
                 onMouseOver={this.onMouseOver}
                 onMouseOut={this.onMouseOut}
                 style={Object.assign({}, this.props.style, {
-                    fill: this.props.fill(this.props.datum)
+                    fill: this.props.fill(this.props.datum),
                 })}
             />
         );
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/resultsView/enrichments/MRNAEnrichmentsTab.tsx b/src/pages/resultsView/enrichments/MRNAEnrichmentsTab.tsx
index ffafde6499c..5924a6f4e4f 100644
--- a/src/pages/resultsView/enrichments/MRNAEnrichmentsTab.tsx
+++ b/src/pages/resultsView/enrichments/MRNAEnrichmentsTab.tsx
@@ -1,49 +1,61 @@
 import * as React from 'react';
-import { observer } from "mobx-react";
-import { ResultsViewPageStore } from "../ResultsViewPageStore";
+import { observer } from 'mobx-react';
+import { ResultsViewPageStore } from '../ResultsViewPageStore';
 import ExpressionEnrichmentContainer from 'pages/resultsView/enrichments/ExpressionEnrichmentsContainer';
 import Loader from 'shared/components/loadingIndicator/LoadingIndicator';
 import EnrichmentsDataSetDropdown from 'pages/resultsView/enrichments/EnrichmentsDataSetDropdown';
 import { MolecularProfile } from 'shared/api/generated/CBioPortalAPI';
 import autobind from 'autobind-decorator';
-import ErrorMessage from "../../../shared/components/ErrorMessage";
+import ErrorMessage from '../../../shared/components/ErrorMessage';
 import { makeUniqueColorGetter } from 'shared/components/plots/PlotUtils';
 import { remoteData } from 'cbioportal-frontend-commons';
 import { MakeMobxView } from 'shared/components/MobxView';
 
 export interface IMRNAEnrichmentsTabProps {
-    store: ResultsViewPageStore
+    store: ResultsViewPageStore;
 }
 
 @observer
-export default class MRNAEnrichmentsTab extends React.Component<IMRNAEnrichmentsTabProps, {}> {
-
+export default class MRNAEnrichmentsTab extends React.Component<
+    IMRNAEnrichmentsTabProps,
+    {}
+> {
     @autobind
-    private onChangeProfile(profileMap:{[studyId:string]:MolecularProfile}) {
+    private onChangeProfile(profileMap: {
+        [studyId: string]: MolecularProfile;
+    }) {
         this.props.store.setmRNAEnrichmentProfile(profileMap);
     }
 
     private readonly enrichmentAnalysisGroups = remoteData({
-        await: () => [this.props.store.alteredSamples, this.props.store.unalteredSamples],
+        await: () => [
+            this.props.store.alteredSamples,
+            this.props.store.unalteredSamples,
+        ],
         invoke: () => {
             const uniqueColorGetter = makeUniqueColorGetter();
-            const groups = [{
-                name: "Altered group",
-                description: "samples that have alterations in the query gene(s).",
-                nameOfEnrichmentDirection: "Over-expressed",
-                count: this.props.store.alteredSamples.result!.length,
-                color: uniqueColorGetter(),
-                samples: this.props.store.alteredSamples.result || []
-            }, {
-                name: "Unaltered group",
-                description: "samples that do not have alterations in the query gene(s).",
-                nameOfEnrichmentDirection: "Under-expressed",
-                count: this.props.store.unalteredSamples.result!.length,
-                color: uniqueColorGetter(),
-                samples: this.props.store.unalteredSamples.result || []
-            }];
+            const groups = [
+                {
+                    name: 'Altered group',
+                    description:
+                        'samples that have alterations in the query gene(s).',
+                    nameOfEnrichmentDirection: 'Over-expressed',
+                    count: this.props.store.alteredSamples.result!.length,
+                    color: uniqueColorGetter(),
+                    samples: this.props.store.alteredSamples.result || [],
+                },
+                {
+                    name: 'Unaltered group',
+                    description:
+                        'samples that do not have alterations in the query gene(s).',
+                    nameOfEnrichmentDirection: 'Under-expressed',
+                    count: this.props.store.unalteredSamples.result!.length,
+                    color: uniqueColorGetter(),
+                    samples: this.props.store.unalteredSamples.result || [],
+                },
+            ];
             return Promise.resolve(groups);
-        }
+        },
     });
     readonly tabUI = MakeMobxView({
         await: () => [
@@ -51,34 +63,54 @@ export default class MRNAEnrichmentsTab extends React.Component<IMRNAEnrichments
             this.props.store.mRNAEnrichmentData,
             this.props.store.selectedmRNAEnrichmentProfileMap,
             this.enrichmentAnalysisGroups,
-            this.props.store.oqlFilteredCaseAggregatedData],
+            this.props.store.oqlFilteredCaseAggregatedData,
+        ],
         render: () => {
             // since mRNA enrichments tab is enabled only for one study, selectedProteinEnrichmentProfileMap
             // would contain only one key.
-            const studyIds = Object.keys(this.props.store.selectedmRNAEnrichmentProfileMap.result!);
-            const selectedProfile = this.props.store.selectedmRNAEnrichmentProfileMap.result![studyIds[0]];
+            const studyIds = Object.keys(
+                this.props.store.selectedmRNAEnrichmentProfileMap.result!
+            );
+            const selectedProfile = this.props.store
+                .selectedmRNAEnrichmentProfileMap.result![studyIds[0]];
             return (
                 <div data-test="MRNAEnrichmentsTab">
                     <EnrichmentsDataSetDropdown
                         dataSets={this.props.store.mRNAEnrichmentProfiles}
                         onChange={this.onChangeProfile}
-                        selectedProfileByStudyId={this.props.store.selectedmRNAEnrichmentProfileMap.result!}
-                        molecularProfileIdToProfiledSampleCount={this.props.store.molecularProfileIdToProfiledSampleCount}
+                        selectedProfileByStudyId={
+                            this.props.store.selectedmRNAEnrichmentProfileMap
+                                .result!
+                        }
+                        molecularProfileIdToProfiledSampleCount={
+                            this.props.store
+                                .molecularProfileIdToProfiledSampleCount
+                        }
                         studies={this.props.store.studies.result!}
                     />
                     <ExpressionEnrichmentContainer
                         data={this.props.store.mRNAEnrichmentData.result!}
                         groups={this.enrichmentAnalysisGroups.result}
                         selectedProfile={selectedProfile}
-                        sampleKeyToSample={this.props.store.sampleKeyToSample.result!}
-                        queriedHugoGeneSymbols={this.props.store.hugoGeneSymbols}
-                        oqlFilteredCaseAggregatedData={this.props.store.oqlFilteredCaseAggregatedData.result!.samples}
-                        isGeneCheckBoxEnabled={true} />
+                        sampleKeyToSample={
+                            this.props.store.sampleKeyToSample.result!
+                        }
+                        queriedHugoGeneSymbols={
+                            this.props.store.hugoGeneSymbols
+                        }
+                        oqlFilteredCaseAggregatedData={
+                            this.props.store.oqlFilteredCaseAggregatedData
+                                .result!.samples
+                        }
+                        isGeneCheckBoxEnabled={true}
+                    />
                 </div>
             );
         },
-        renderPending: () => <Loader isLoading={true} center={true} size={"big"}/>,
-        renderError: ()=> <ErrorMessage/>
+        renderPending: () => (
+            <Loader isLoading={true} center={true} size={'big'} />
+        ),
+        renderError: () => <ErrorMessage />,
     });
 
     public render() {
diff --git a/src/pages/resultsView/enrichments/MiniBarChart.tsx b/src/pages/resultsView/enrichments/MiniBarChart.tsx
index c95464a6a52..08250872286 100644
--- a/src/pages/resultsView/enrichments/MiniBarChart.tsx
+++ b/src/pages/resultsView/enrichments/MiniBarChart.tsx
@@ -1,107 +1,241 @@
 import * as React from 'react';
-import { observer } from "mobx-react";
+import { observer } from 'mobx-react';
 import { observable } from 'mobx';
-import styles from "./styles.module.scss";
-import { VictoryChart, VictoryContainer, VictoryAxis, VictoryBar, VictoryStack, VictoryLabel } from 'victory';
-import { DefaultTooltip } from "cbioportal-frontend-commons";
+import styles from './styles.module.scss';
+import {
+    VictoryChart,
+    VictoryContainer,
+    VictoryAxis,
+    VictoryBar,
+    VictoryStack,
+    VictoryLabel,
+} from 'victory';
+import { DefaultTooltip } from 'cbioportal-frontend-commons';
 import { Popover } from 'react-bootstrap';
 import { getBarChartTooltipContent } from 'pages/resultsView/enrichments/EnrichmentsUtil';
-import CBIOPORTAL_VICTORY_THEME from "../../../shared/theme/cBioPoralTheme";
+import CBIOPORTAL_VICTORY_THEME from '../../../shared/theme/cBioPoralTheme';
 
 export interface IMiniBarChartProps {
     totalAlteredCount: number;
     totalUnalteredCount: number;
     selectedGene: string;
-    selectedGeneStats: [number, number, number, number]|null;
+    selectedGeneStats: [number, number, number, number] | null;
 }
 
 @observer
-export default class MiniBarChart extends React.Component<IMiniBarChartProps, {}> {
-
+export default class MiniBarChart extends React.Component<
+    IMiniBarChartProps,
+    {}
+> {
     @observable tooltipModel: any;
 
     public render() {
-
-        const totalCount = this.props.totalAlteredCount + this.props.totalUnalteredCount;
+        const totalCount =
+            this.props.totalAlteredCount + this.props.totalUnalteredCount;
         const barWidth: number = 21;
 
-        const events = [{
-            childName: "all",
-            target: "data",
-            eventHandlers: {
-                onMouseOver: () => {
-                    return [
-                        {
-                            target: "data",
-                            mutation: (props: any) => {
-                                if (props.datum.y >= 1) {
-                                    this.tooltipModel = props;
-                                }
-                            }
-                        }
-                    ];
+        const events = [
+            {
+                childName: 'all',
+                target: 'data',
+                eventHandlers: {
+                    onMouseOver: () => {
+                        return [
+                            {
+                                target: 'data',
+                                mutation: (props: any) => {
+                                    if (props.datum.y >= 1) {
+                                        this.tooltipModel = props;
+                                    }
+                                },
+                            },
+                        ];
+                    },
+                    onMouseOut: () => {
+                        return [
+                            {
+                                target: 'data',
+                                mutation: () => {
+                                    this.tooltipModel = null;
+                                },
+                            },
+                        ];
+                    },
                 },
-                onMouseOut: () => {
-                    return [
-                        {
-                            target: "data",
-                            mutation: () => {
-                                this.tooltipModel = null;
-                            }
-                        }
-                    ];
-                }
-            }
-        }];
+            },
+        ];
 
         return (
             <div className="posRelative">
-                <div style={{display: 'flex', flexDirection: 'row'}}>
+                <div style={{ display: 'flex', flexDirection: 'row' }}>
                     <div>
-                        <div style={{paddingTop: 35}}>
-                            <DefaultTooltip placement="right" overlay={<span>Query genes selected by user</span>} destroyTooltipOnHide={true}>
+                        <div style={{ paddingTop: 35 }}>
+                            <DefaultTooltip
+                                placement="right"
+                                overlay={
+                                    <span>Query genes selected by user</span>
+                                }
+                                destroyTooltipOnHide={true}
+                            >
                                 <i className="fa fa-info-circle" />
                             </DefaultTooltip>
                         </div>
-                        <div style={{paddingTop: 8}}>
-                            <DefaultTooltip placement="right" overlay={<span>Gene selected in table</span>} destroyTooltipOnHide={true}>
+                        <div style={{ paddingTop: 8 }}>
+                            <DefaultTooltip
+                                placement="right"
+                                overlay={<span>Gene selected in table</span>}
+                                destroyTooltipOnHide={true}
+                            >
                                 <i className="fa fa-info-circle" />
                             </DefaultTooltip>
                         </div>
                     </div>
-                    <VictoryChart height={136} width={350} padding={{ top: 30, bottom: 60, left: 86, right: 40 }} theme={CBIOPORTAL_VICTORY_THEME}>
-                        <VictoryStack domain={{x: [0, totalCount], y: [1, 5]}} events={events}
-                            colorScale={["lightgrey", "#58acfa", "lightgrey", "#58acfa", "lightgrey"]} horizontal={true}>
-                            <VictoryBar data={[{x: 2, y: 0}, {x: 4, y: this.props.selectedGene ? this.props.selectedGeneStats![0] : 0, index: 0}]}
-                                style={{ data: { width: barWidth }}}/>
-                            <VictoryBar data={[{x: 2, y: this.props.totalAlteredCount, index: 0}, {x: 4, y: this.props.selectedGene ? 
-                                this.props.selectedGeneStats![1] : 0, index: 1}]} style={{ data: { width: barWidth }}}/>
-                            <VictoryBar data={[{x: 2, y: 0}, {x: 4, y: this.props.selectedGene ? totalCount * 0.001 : 0}]} 
-                                style={{ data: { width: barWidth }}}/>
-                            <VictoryBar data={[{x: 2, y: 0}, {x: 4, y: this.props.selectedGene ? this.props.selectedGeneStats![2] : 0, index: 2}]}
-                                style={{ data: { width: barWidth }}}/>
-                            <VictoryBar data={[{x: 2, y: this.props.totalUnalteredCount, index: 1}, {x: 4, y: this.props.selectedGene ? 
-                                this.props.selectedGeneStats![3] : 0, index: 3}]} style={{ data: { width: barWidth }}}/>
+                    <VictoryChart
+                        height={136}
+                        width={350}
+                        padding={{ top: 30, bottom: 60, left: 86, right: 40 }}
+                        theme={CBIOPORTAL_VICTORY_THEME}
+                    >
+                        <VictoryStack
+                            domain={{ x: [0, totalCount], y: [1, 5] }}
+                            events={events}
+                            colorScale={[
+                                'lightgrey',
+                                '#58acfa',
+                                'lightgrey',
+                                '#58acfa',
+                                'lightgrey',
+                            ]}
+                            horizontal={true}
+                        >
+                            <VictoryBar
+                                data={[
+                                    { x: 2, y: 0 },
+                                    {
+                                        x: 4,
+                                        y: this.props.selectedGene
+                                            ? this.props.selectedGeneStats![0]
+                                            : 0,
+                                        index: 0,
+                                    },
+                                ]}
+                                style={{ data: { width: barWidth } }}
+                            />
+                            <VictoryBar
+                                data={[
+                                    {
+                                        x: 2,
+                                        y: this.props.totalAlteredCount,
+                                        index: 0,
+                                    },
+                                    {
+                                        x: 4,
+                                        y: this.props.selectedGene
+                                            ? this.props.selectedGeneStats![1]
+                                            : 0,
+                                        index: 1,
+                                    },
+                                ]}
+                                style={{ data: { width: barWidth } }}
+                            />
+                            <VictoryBar
+                                data={[
+                                    { x: 2, y: 0 },
+                                    {
+                                        x: 4,
+                                        y: this.props.selectedGene
+                                            ? totalCount * 0.001
+                                            : 0,
+                                    },
+                                ]}
+                                style={{ data: { width: barWidth } }}
+                            />
+                            <VictoryBar
+                                data={[
+                                    { x: 2, y: 0 },
+                                    {
+                                        x: 4,
+                                        y: this.props.selectedGene
+                                            ? this.props.selectedGeneStats![2]
+                                            : 0,
+                                        index: 2,
+                                    },
+                                ]}
+                                style={{ data: { width: barWidth } }}
+                            />
+                            <VictoryBar
+                                data={[
+                                    {
+                                        x: 2,
+                                        y: this.props.totalUnalteredCount,
+                                        index: 1,
+                                    },
+                                    {
+                                        x: 4,
+                                        y: this.props.selectedGene
+                                            ? this.props.selectedGeneStats![3]
+                                            : 0,
+                                        index: 3,
+                                    },
+                                ]}
+                                style={{ data: { width: barWidth } }}
+                            />
                         </VictoryStack>
-                        <VictoryAxis dependentAxis={true} invertAxis={true} tickValues={["", "Query Genes", null, 
-                            this.props.selectedGene ? this.props.selectedGene : "None selected", ""]} 
-                            style={{ ticks: { size: 5, stroke: (tick: any) => tick != null ? "black" : "transparent" }, 
-                            tickLabels: { padding: 2, fontSize: 12, fill: "black" }, grid: {pointerEvents: "none", stroke: "none"}, 
-                            axis: { stroke: "black", strokeWidth: 1 } }}/>
-                        {!this.props.selectedGene &&
-                            <VictoryLabel text="Select gene in table or volcano plot" x={91} y={65} 
-                                style={{ fontSize: 12, fontFamily: "Arial, Helvetica" }}/>
-                        }
+                        <VictoryAxis
+                            dependentAxis={true}
+                            invertAxis={true}
+                            tickValues={[
+                                '',
+                                'Query Genes',
+                                null,
+                                this.props.selectedGene
+                                    ? this.props.selectedGene
+                                    : 'None selected',
+                                '',
+                            ]}
+                            style={{
+                                ticks: {
+                                    size: 5,
+                                    stroke: (tick: any) =>
+                                        tick != null ? 'black' : 'transparent',
+                                },
+                                tickLabels: {
+                                    padding: 2,
+                                    fontSize: 12,
+                                    fill: 'black',
+                                },
+                                grid: { pointerEvents: 'none', stroke: 'none' },
+                                axis: { stroke: 'black', strokeWidth: 1 },
+                            }}
+                        />
+                        {!this.props.selectedGene && (
+                            <VictoryLabel
+                                text="Select gene in table or volcano plot"
+                                x={91}
+                                y={65}
+                                style={{
+                                    fontSize: 12,
+                                    fontFamily: 'Arial, Helvetica',
+                                }}
+                            />
+                        )}
                     </VictoryChart>
                 </div>
-                {this.tooltipModel &&
-                    <Popover arrowOffsetTop={14} positionLeft={(this.tooltipModel.y * 1.06) + 16} 
-                        positionTop={this.tooltipModel.x - 13} className={styles.BarTooltip}>
+                {this.tooltipModel && (
+                    <Popover
+                        arrowOffsetTop={14}
+                        positionLeft={this.tooltipModel.y * 1.06 + 16}
+                        positionTop={this.tooltipModel.x - 13}
+                        className={styles.BarTooltip}
+                    >
                         <div>
-                            {getBarChartTooltipContent(this.tooltipModel, this.props.selectedGene)}
+                            {getBarChartTooltipContent(
+                                this.tooltipModel,
+                                this.props.selectedGene
+                            )}
                         </div>
                     </Popover>
-                }
+                )}
             </div>
         );
     }
diff --git a/src/pages/resultsView/enrichments/MiniFrequencyScatterChart.tsx b/src/pages/resultsView/enrichments/MiniFrequencyScatterChart.tsx
index d46e33c6ef6..80b2878fe41 100644
--- a/src/pages/resultsView/enrichments/MiniFrequencyScatterChart.tsx
+++ b/src/pages/resultsView/enrichments/MiniFrequencyScatterChart.tsx
@@ -1,64 +1,88 @@
-import * as React from "react";
-import {Observer, observer} from "mobx-react";
-import {action, computed, observable} from "mobx";
-import autobind from "autobind-decorator";
-import {VictoryAxis, VictoryChart, VictoryLabel, VictoryScatter, VictorySelectionContainer, VictoryLine} from "victory";
-import CBIOPORTAL_VICTORY_THEME, {axisLabelStyles} from "../../../shared/theme/cBioPoralTheme";
-import {Popover} from "react-bootstrap";
-import {formatLogOddsRatio} from "../../../shared/lib/FormatUtils";
-import {toConditionalPrecision} from "../../../shared/lib/NumberUtils";
-import SelectionComponent from "./SelectionComponent";
-import HoverablePoint from "./HoverablePoint";
-import {DownloadControls, getTextWidth, truncateWithEllipsis} from "cbioportal-frontend-commons";
+import * as React from 'react';
+import { Observer, observer } from 'mobx-react';
+import { action, computed, observable } from 'mobx';
+import autobind from 'autobind-decorator';
+import {
+    VictoryAxis,
+    VictoryChart,
+    VictoryLabel,
+    VictoryScatter,
+    VictorySelectionContainer,
+    VictoryLine,
+} from 'victory';
+import CBIOPORTAL_VICTORY_THEME, {
+    axisLabelStyles,
+} from '../../../shared/theme/cBioPoralTheme';
+import { Popover } from 'react-bootstrap';
+import { formatLogOddsRatio } from '../../../shared/lib/FormatUtils';
+import { toConditionalPrecision } from '../../../shared/lib/NumberUtils';
+import SelectionComponent from './SelectionComponent';
+import HoverablePoint from './HoverablePoint';
+import {
+    DownloadControls,
+    getTextWidth,
+    truncateWithEllipsis,
+} from 'cbioportal-frontend-commons';
 
 export interface IMiniFrequencyScatterChartData {
-    x:number;
-    y:number;
-    pValue:number;
-    qValue:number;
-    hugoGeneSymbol:string;
-    logRatio:number;
+    x: number;
+    y: number;
+    pValue: number;
+    qValue: number;
+    hugoGeneSymbol: string;
+    logRatio: number;
 }
 
 export interface IMiniFrequencyScatterChartProps {
     data: IMiniFrequencyScatterChartData[]; // x means percent in x group, y means percent in y group
-    xGroupName:string;
-    yGroupName:string;
+    xGroupName: string;
+    yGroupName: string;
     onGeneNameClick: (hugoGeneSymbol: string, entrezGeneId: number) => void;
     onSelection: (hugoGeneSymbols: string[]) => void;
     onSelectionCleared: () => void;
-    selectedGenesSet:{[hugoGeneSymbol:string]:any};
+    selectedGenesSet: { [hugoGeneSymbol: string]: any };
 }
 
 const MAX_DOT_SIZE = 10;
 
 @observer
-export default class MiniFrequencyScatterChart extends React.Component<IMiniFrequencyScatterChartProps, {}> {
-
+export default class MiniFrequencyScatterChart extends React.Component<
+    IMiniFrequencyScatterChartProps,
+    {}
+> {
     @observable tooltipModel: any;
     @observable private svgContainer: any;
     private dragging = false;
 
-
     @autobind
-    @action private svgRef(svgContainer:SVGElement|null) {
-        this.svgContainer = (svgContainer && svgContainer.children) ? svgContainer.children[0] : null;
+    @action
+    private svgRef(svgContainer: SVGElement | null) {
+        this.svgContainer =
+            svgContainer && svgContainer.children
+                ? svgContainer.children[0]
+                : null;
     }
 
     private handleSelection(points: any, bounds: any, props: any) {
-        this.props.onSelection(points[0].data.map((d:any) => d.hugoGeneSymbol));
+        this.props.onSelection(
+            points[0].data.map((d: any) => d.hugoGeneSymbol)
+        );
     }
 
     private handleSelectionCleared() {
         if (this.tooltipModel) {
-            this.props.onGeneNameClick(this.tooltipModel.datum.hugoGeneSymbol, this.tooltipModel.datum.entrezGeneId);
+            this.props.onGeneNameClick(
+                this.tooltipModel.datum.hugoGeneSymbol,
+                this.tooltipModel.datum.entrezGeneId
+            );
         }
         this.props.onSelectionCleared();
     }
 
     @computed get maxLabelWidth() {
-        const totalLabelWidths = getTextWidth(this.props.xGroupName, "Arial", "13px") +
-                                 getTextWidth(this.props.yGroupName, "Arial", "13px");
+        const totalLabelWidths =
+            getTextWidth(this.props.xGroupName, 'Arial', '13px') +
+            getTextWidth(this.props.yGroupName, 'Arial', '13px');
 
         if (totalLabelWidths > 150) {
             return 75;
@@ -68,11 +92,21 @@ export default class MiniFrequencyScatterChart extends React.Component<IMiniFreq
     }
 
     @computed get xLabel() {
-        return `Altered Frequency in ${truncateWithEllipsis(this.props.xGroupName, this.maxLabelWidth, "Arial", "13px")} (%)`;
+        return `Altered Frequency in ${truncateWithEllipsis(
+            this.props.xGroupName,
+            this.maxLabelWidth,
+            'Arial',
+            '13px'
+        )} (%)`;
     }
 
     @computed get yLabel() {
-        return `Altered Frequency in ${truncateWithEllipsis(this.props.yGroupName, this.maxLabelWidth, "Arial", "13px")} (%)`;
+        return `Altered Frequency in ${truncateWithEllipsis(
+            this.props.yGroupName,
+            this.maxLabelWidth,
+            'Arial',
+            '13px'
+        )} (%)`;
     }
 
     /*@computed get size() {
@@ -131,16 +165,20 @@ export default class MiniFrequencyScatterChart extends React.Component<IMiniFreq
                 responsive={false}
                 onSelectionCleared={this.handleSelectionCleared}
                 activateSelectedData={false}
-                selectionComponent={<SelectionComponent onRender={this.onSelectionComponentRender}/>}
+                selectionComponent={
+                    <SelectionComponent
+                        onRender={this.onSelectionComponentRender}
+                    />
+                }
             />
         );
     }
 
-    @autobind @action private onMouseOver(datum:any, x:number, y:number) {
+    @autobind @action private onMouseOver(datum: any, x: number, y: number) {
         this.tooltipModel = {
             datum,
             x,
-            y
+            y,
         };
     }
 
@@ -151,18 +189,37 @@ export default class MiniFrequencyScatterChart extends React.Component<IMiniFreq
     @autobind private getTooltip() {
         if (this.tooltipModel) {
             return (
-                <Popover className={"cbioTooltip"} positionLeft={this.tooltipModel.x + 15}
-                             positionTop={this.tooltipModel.y - 44}>
-                    Gene: {this.tooltipModel.datum.hugoGeneSymbol}<br/>
-                    Log Ratio: {formatLogOddsRatio(this.tooltipModel.datum.logRatio)}<br/>
-                    Alteration Frequency in {this.props.xGroupName}: {this.tooltipModel.datum.x.toFixed()}%<br/>
-                    Alteration Frequency in {this.props.yGroupName}: {this.tooltipModel.datum.y.toFixed()}%<br/>
-                    p-Value: {toConditionalPrecision(this.tooltipModel.datum.pValue, 3, 0.01)}<br/>
-                    q-Value: {toConditionalPrecision(this.tooltipModel.datum.qValue, 3, 0.01)}
+                <Popover
+                    className={'cbioTooltip'}
+                    positionLeft={this.tooltipModel.x + 15}
+                    positionTop={this.tooltipModel.y - 44}
+                >
+                    Gene: {this.tooltipModel.datum.hugoGeneSymbol}
+                    <br />
+                    Log Ratio:{' '}
+                    {formatLogOddsRatio(this.tooltipModel.datum.logRatio)}
+                    <br />
+                    Alteration Frequency in {this.props.xGroupName}:{' '}
+                    {this.tooltipModel.datum.x.toFixed()}%<br />
+                    Alteration Frequency in {this.props.yGroupName}:{' '}
+                    {this.tooltipModel.datum.y.toFixed()}%<br />
+                    p-Value:{' '}
+                    {toConditionalPrecision(
+                        this.tooltipModel.datum.pValue,
+                        3,
+                        0.01
+                    )}
+                    <br />
+                    q-Value:{' '}
+                    {toConditionalPrecision(
+                        this.tooltipModel.datum.qValue,
+                        3,
+                        0.01
+                    )}
                 </Popover>
             );
         } else {
-            return <span/>;
+            return <span />;
         }
     }
 
@@ -180,19 +237,19 @@ export default class MiniFrequencyScatterChart extends React.Component<IMiniFreq
     @computed get tickProps() {
         if (this.plotDomainMax > 40) {
             return {
-                tickValues: [0,25,50,75]
+                tickValues: [0, 25, 50, 75],
             };
         } else if (this.plotDomainMax > 20) {
             return {
-                tickValues: [0,10,20,30,40]
+                tickValues: [0, 10, 20, 30, 40],
             };
         } else if (this.plotDomainMax > 10) {
             return {
-                tickValues: [0,5,10,15,20]
+                tickValues: [0, 5, 10, 15, 20],
             };
         } else {
             return {
-                tickCount: 4
+                tickCount: 4,
             };
         }
     }
@@ -200,63 +257,87 @@ export default class MiniFrequencyScatterChart extends React.Component<IMiniFreq
     public render() {
         return (
             <div className="posRelative">
-                <div className="borderedChart inlineBlock" style={{position:"relative"}} onClick={this.onClick}>
-                    <VictoryChart containerComponent={this.containerComponent} theme={CBIOPORTAL_VICTORY_THEME}
-                                  domainPadding={{x:[0,20], y:[0,20]}} height={350} width={350} padding={{ top: 40, bottom: 60, left: 60, right: 40 }}
+                <div
+                    className="borderedChart inlineBlock"
+                    style={{ position: 'relative' }}
+                    onClick={this.onClick}
+                >
+                    <VictoryChart
+                        containerComponent={this.containerComponent}
+                        theme={CBIOPORTAL_VICTORY_THEME}
+                        domainPadding={{ x: [0, 20], y: [0, 20] }}
+                        height={350}
+                        width={350}
+                        padding={{ top: 40, bottom: 60, left: 60, right: 40 }}
                     >
-                        <VictoryAxis domain={[0,this.plotDomainMax]}
-                                     label={this.xLabel}
-                                     style={{
-                                        tickLabels: { padding: 5 }, axisLabel: { padding: 27 },
-                                        ticks: { size: 3 },
-                                        grid: {
-                                            strokeOpacity: 1,
-                                        }
-                                     }}
-                                     crossAxis={false}
-                                     orientation="bottom"
-                                     offsetY={45}
-                                     {...this.tickProps}
+                        <VictoryAxis
+                            domain={[0, this.plotDomainMax]}
+                            label={this.xLabel}
+                            style={{
+                                tickLabels: { padding: 5 },
+                                axisLabel: { padding: 27 },
+                                ticks: { size: 3 },
+                                grid: {
+                                    strokeOpacity: 1,
+                                },
+                            }}
+                            crossAxis={false}
+                            orientation="bottom"
+                            offsetY={45}
+                            {...this.tickProps}
                         />
-                        <VictoryAxis domain={[0,this.plotDomainMax]}
-                                     dependentAxis={true}
-                                     label={this.yLabel}
-                                     style={{
-                                         tickLabels: { padding: 5 }, axisLabel: { padding: 32 },
-                                         ticks: { size: 3 },
-                                         grid: {
-                                             strokeOpacity: 1,
-                                         }
-                                     }}
-                                     crossAxis={false}
-                                     orientation="left"
-                                     offsetX={45}
-                                     {...this.tickProps}
+                        <VictoryAxis
+                            domain={[0, this.plotDomainMax]}
+                            dependentAxis={true}
+                            label={this.yLabel}
+                            style={{
+                                tickLabels: { padding: 5 },
+                                axisLabel: { padding: 32 },
+                                ticks: { size: 3 },
+                                grid: {
+                                    strokeOpacity: 1,
+                                },
+                            }}
+                            crossAxis={false}
+                            orientation="left"
+                            offsetX={45}
+                            {...this.tickProps}
                         />
                         <VictoryLine
                             style={{
                                 data: {
-                                    stroke: "#cccccc", strokeWidth: 1, strokeDasharray:"10,5"
-                                }
+                                    stroke: '#cccccc',
+                                    strokeWidth: 1,
+                                    strokeDasharray: '10,5',
+                                },
                             }}
-                            data={[{x:0, y:0},{x:this.plotDomainMax, y:this.plotDomainMax}]}
+                            data={[
+                                { x: 0, y: 0 },
+                                {
+                                    x: this.plotDomainMax,
+                                    y: this.plotDomainMax,
+                                },
+                            ]}
                         />
                         <VictoryScatter
                             style={{
                                 data: {
-                                    fillOpacity: 0.4
-                                }
+                                    fillOpacity: 0.4,
+                                },
                             }}
                             data={this.splitData.insignificant}
                             dataComponent={
                                 <HoverablePoint
                                     onMouseOver={this.onMouseOver}
                                     onMouseOut={this.onMouseOut}
-                                    fill={(datum:any)=>{
-                                        if (datum.hugoGeneSymbol in this.props.selectedGenesSet) {
-                                            return "#FE9929";
+                                    fill={(datum: any) => {
+                                        if (
+                                            datum.hugoGeneSymbol in
+                                            this.props.selectedGenesSet
+                                        ) {
+                                            return '#FE9929';
                                         } else {
-                                            return "#D3D3D3";
+                                            return '#D3D3D3';
                                         }
                                     }}
                                 />
@@ -267,19 +348,22 @@ export default class MiniFrequencyScatterChart extends React.Component<IMiniFreq
                         <VictoryScatter
                             style={{
                                 data: {
-                                    fillOpacity: 0.6
-                                }
+                                    fillOpacity: 0.6,
+                                },
                             }}
                             data={this.splitData.significant}
                             dataComponent={
                                 <HoverablePoint
                                     onMouseOver={this.onMouseOver}
                                     onMouseOut={this.onMouseOut}
-                                    fill={(datum:any)=>{
-                                        if (datum.hugoGeneSymbol in this.props.selectedGenesSet) {
-                                            return "#FE9929";
+                                    fill={(datum: any) => {
+                                        if (
+                                            datum.hugoGeneSymbol in
+                                            this.props.selectedGenesSet
+                                        ) {
+                                            return '#FE9929';
                                         } else {
-                                            return "#58ACFA";
+                                            return '#58ACFA';
                                         }
                                     }}
                                 />
@@ -290,14 +374,17 @@ export default class MiniFrequencyScatterChart extends React.Component<IMiniFreq
                         getSvg={() => this.svgContainer}
                         filename="enrichments-frequency-scatter"
                         dontFade={true}
-                        type='button'
-                        style={{position:"absolute", top:10, right:10, zIndex:0}}
+                        type="button"
+                        style={{
+                            position: 'absolute',
+                            top: 10,
+                            right: 10,
+                            zIndex: 0,
+                        }}
                     />
                 </div>
-                <Observer>
-                    {this.getTooltip}
-                </Observer>
+                <Observer>{this.getTooltip}</Observer>
             </div>
         );
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/resultsView/enrichments/MiniScatterChart.tsx b/src/pages/resultsView/enrichments/MiniScatterChart.tsx
index 48f408cc941..a4daf9999ea 100644
--- a/src/pages/resultsView/enrichments/MiniScatterChart.tsx
+++ b/src/pages/resultsView/enrichments/MiniScatterChart.tsx
@@ -1,52 +1,79 @@
 import * as React from 'react';
-import {Observer, observer} from "mobx-react";
-import { VictoryChart, VictorySelectionContainer, VictoryAxis, VictoryLabel, VictoryScatter } from 'victory';
-import {observable, action, computed} from 'mobx';
+import { Observer, observer } from 'mobx-react';
+import {
+    VictoryChart,
+    VictorySelectionContainer,
+    VictoryAxis,
+    VictoryLabel,
+    VictoryScatter,
+} from 'victory';
+import { observable, action, computed } from 'mobx';
 import { Popover } from 'react-bootstrap';
-import CBIOPORTAL_VICTORY_THEME, {axisLabelStyles} from "../../../shared/theme/cBioPoralTheme";
-import { formatLogOddsRatio } from "shared/lib/FormatUtils";
-import { toConditionalPrecision, } from 'shared/lib/NumberUtils';
+import CBIOPORTAL_VICTORY_THEME, {
+    axisLabelStyles,
+} from '../../../shared/theme/cBioPoralTheme';
+import { formatLogOddsRatio } from 'shared/lib/FormatUtils';
+import { toConditionalPrecision } from 'shared/lib/NumberUtils';
 import autobind from 'autobind-decorator';
-import SelectionComponent from "./SelectionComponent";
-import HoverablePoint from "./HoverablePoint";
-import {DownloadControls, getTextWidth, truncateWithEllipsis} from "cbioportal-frontend-commons";
+import SelectionComponent from './SelectionComponent';
+import HoverablePoint from './HoverablePoint';
+import {
+    DownloadControls,
+    getTextWidth,
+    truncateWithEllipsis,
+} from 'cbioportal-frontend-commons';
 
 export interface IMiniScatterChartProps {
     data: any[];
     xAxisLeftLabel: string;
     xAxisRightLabel: string;
     xAxisDomain: number;
-    xAxisTickValues: number[]|null;
+    xAxisTickValues: number[] | null;
     onGeneNameClick: (hugoGeneSymbol: string, entrezGeneId: number) => void;
     onSelection: (hugoGeneSymbols: string[]) => void;
     onSelectionCleared: () => void;
-    selectedGenesSet:{[hugoGeneSymbol:string]:any};
+    selectedGenesSet: { [hugoGeneSymbol: string]: any };
 }
 
 @observer
-export default class MiniScatterChart extends React.Component<IMiniScatterChartProps, {}> {
-
+export default class MiniScatterChart extends React.Component<
+    IMiniScatterChartProps,
+    {}
+> {
     @observable tooltipModel: any;
     @observable private svgContainer: any;
     private dragging = false;
 
     @autobind
-    @action private svgRef(svgContainer:SVGElement|null) {
-        this.svgContainer = (svgContainer && svgContainer.children) ? svgContainer.children[0] : null;
+    @action
+    private svgRef(svgContainer: SVGElement | null) {
+        this.svgContainer =
+            svgContainer && svgContainer.children
+                ? svgContainer.children[0]
+                : null;
     }
 
     private handleSelection(points: any, bounds: any, props: any) {
-        this.props.onSelection(points[0].data.map((d:any) => d.hugoGeneSymbol));
+        this.props.onSelection(
+            points[0].data.map((d: any) => d.hugoGeneSymbol)
+        );
     }
 
     @autobind private handleSelectionCleared() {
         if (this.tooltipModel) {
-            this.props.onGeneNameClick(this.tooltipModel.hugoGeneSymbol, this.tooltipModel.entrezGeneId);
+            this.props.onGeneNameClick(
+                this.tooltipModel.hugoGeneSymbol,
+                this.tooltipModel.entrezGeneId
+            );
         }
         this.props.onSelectionCleared();
     }
 
-    @autobind @action private onGenePointMouseOver(datum:any, x:number, y:number) {
+    @autobind @action private onGenePointMouseOver(
+        datum: any,
+        x: number,
+        y: number
+    ) {
         this.tooltipModel = datum;
         this.tooltipModel.x = x;
         this.tooltipModel.y = y;
@@ -56,21 +83,27 @@ export default class MiniScatterChart extends React.Component<IMiniScatterChartP
         this.tooltipModel = null;
     }
 
-
     @autobind private getTooltip() {
         if (this.tooltipModel) {
             return (
                 <Popover
-                    className={"cbioTooltip"} positionLeft={this.tooltipModel.x + 15}
-                         positionTop={this.tooltipModel.y - 33}>
-                    Gene: {this.tooltipModel.hugoGeneSymbol}<br/>
-                    Log Ratio: {formatLogOddsRatio(this.tooltipModel.logRatio)}<br/>
-                    p-Value: {toConditionalPrecision(this.tooltipModel.pValue, 3, 0.01)}<br/>
-                    q-Value: {toConditionalPrecision(this.tooltipModel.qValue, 3, 0.01)}
+                    className={'cbioTooltip'}
+                    positionLeft={this.tooltipModel.x + 15}
+                    positionTop={this.tooltipModel.y - 33}
+                >
+                    Gene: {this.tooltipModel.hugoGeneSymbol}
+                    <br />
+                    Log Ratio: {formatLogOddsRatio(this.tooltipModel.logRatio)}
+                    <br />
+                    p-Value:{' '}
+                    {toConditionalPrecision(this.tooltipModel.pValue, 3, 0.01)}
+                    <br />
+                    q-Value:{' '}
+                    {toConditionalPrecision(this.tooltipModel.qValue, 3, 0.01)}
                 </Popover>
             );
         } else {
-            return <span/>;
+            return <span />;
         }
     }
 
@@ -86,13 +119,20 @@ export default class MiniScatterChart extends React.Component<IMiniScatterChartP
     }
 
     private get totalLabelWidths() {
-        return getTextWidth(this.props.xAxisLeftLabel, "Arial", "13px") +
-            getTextWidth(this.props.xAxisRightLabel, "Arial", "13px");
+        return (
+            getTextWidth(this.props.xAxisLeftLabel, 'Arial', '13px') +
+            getTextWidth(this.props.xAxisRightLabel, 'Arial', '13px')
+        );
     }
 
     @computed get xAxisLeftLabel() {
         if (this.totalLabelWidths > 200) {
-            return truncateWithEllipsis(this.props.xAxisLeftLabel, 90, "Arial", "13px");
+            return truncateWithEllipsis(
+                this.props.xAxisLeftLabel,
+                90,
+                'Arial',
+                '13px'
+            );
         } else {
             return this.props.xAxisLeftLabel;
         }
@@ -100,26 +140,46 @@ export default class MiniScatterChart extends React.Component<IMiniScatterChartP
 
     @computed get xAxisRightLabel() {
         if (this.totalLabelWidths > 180) {
-            return truncateWithEllipsis(this.props.xAxisRightLabel, 90, "Arial", "13px");
+            return truncateWithEllipsis(
+                this.props.xAxisRightLabel,
+                90,
+                'Arial',
+                '13px'
+            );
         } else {
             return this.props.xAxisRightLabel;
         }
     }
 
     public render() {
-
         return (
             <div className="posRelative">
-                <div className="borderedChart inlineBlock" style={{position:"relative"}} onClick={this.onClick}>
+                <div
+                    className="borderedChart inlineBlock"
+                    style={{ position: 'relative' }}
+                    onClick={this.onClick}
+                >
                     <VictoryChart
                         containerComponent={
                             <VictorySelectionContainer
                                 containerRef={this.svgRef}
                                 activateSelectedData={false}
-                                onSelection={(points: any, bounds: any, props: any) => this.handleSelection(points, bounds, props)}
+                                onSelection={(
+                                    points: any,
+                                    bounds: any,
+                                    props: any
+                                ) =>
+                                    this.handleSelection(points, bounds, props)
+                                }
                                 responsive={false}
                                 onSelectionCleared={this.handleSelectionCleared}
-                                selectionComponent={<SelectionComponent onRender={this.onSelectionComponentRender}/>}
+                                selectionComponent={
+                                    <SelectionComponent
+                                        onRender={
+                                            this.onSelectionComponentRender
+                                        }
+                                    />
+                                }
                             />
                         }
                         theme={CBIOPORTAL_VICTORY_THEME}
@@ -129,44 +189,78 @@ export default class MiniScatterChart extends React.Component<IMiniScatterChartP
                         padding={{ top: 40, bottom: 60, left: 60, right: 40 }}
                         singleQuadrantDomainPadding={false}
                     >
-                        <VictoryAxis tickValues={this.props.xAxisTickValues} domain={[-this.props.xAxisDomain, this.props.xAxisDomain]} 
-                            label="Log Ratio" tickFormat={(t: any) => t >= 1000 || t <= -1000 ? `${t/1000}k` : t} style={{
-                                tickLabels: { padding: 20 }, axisLabel: { padding: 40 },
+                        <VictoryAxis
+                            tickValues={this.props.xAxisTickValues}
+                            domain={[
+                                -this.props.xAxisDomain,
+                                this.props.xAxisDomain,
+                            ]}
+                            label="Log Ratio"
+                            tickFormat={(t: any) =>
+                                t >= 1000 || t <= -1000 ? `${t / 1000}k` : t
+                            }
+                            style={{
+                                tickLabels: { padding: 20 },
+                                axisLabel: { padding: 40 },
                                 ticks: { size: 0 },
                                 grid: {
                                     strokeOpacity: 1,
-                                }
+                                },
                             }}
                             crossAxis={false}
                             orientation="bottom"
                             offsetY={60}
                         />
-                        <VictoryAxis label="-log10 p-Value" dependentAxis={true} tickCount={4}
-                                    style={{
-                                        tickLabels: { padding: 135 },
-                                        axisLabel: { padding: 165 },
-                                        ticks: { size: 0 },
-                                        grid: {
-                                            strokeOpacity: 1,
-                                        }
-                                    }}
+                        <VictoryAxis
+                            label="-log10 p-Value"
+                            dependentAxis={true}
+                            tickCount={4}
+                            style={{
+                                tickLabels: { padding: 135 },
+                                axisLabel: { padding: 165 },
+                                ticks: { size: 0 },
+                                grid: {
+                                    strokeOpacity: 1,
+                                },
+                            }}
+                        />
+                        <VictoryLabel
+                            style={axisLabelStyles}
+                            text={'← ' + this.xAxisLeftLabel}
+                            x={60}
+                            y={300}
+                        />
+                        <VictoryLabel
+                            style={axisLabelStyles}
+                            text={this.xAxisRightLabel + ' →'}
+                            textAnchor="end"
+                            x={310}
+                            y={300}
+                        />
+                        <VictoryLabel
+                            style={axisLabelStyles}
+                            text="Significance →"
+                            x={320}
+                            y={210}
+                            angle={-90}
                         />
-                        <VictoryLabel style={axisLabelStyles} text={"← " + this.xAxisLeftLabel} x={60} y={300}/>
-                        <VictoryLabel style={axisLabelStyles} text={this.xAxisRightLabel + " →"} textAnchor="end" x={310} y={300}/>
-                        <VictoryLabel style={axisLabelStyles} text="Significance →" x={320} y={210} angle={-90}/>
-                        <VictoryScatter style={{ data: { fillOpacity: 0.4 } }}
+                        <VictoryScatter
+                            style={{ data: { fillOpacity: 0.4 } }}
                             data={this.props.data}
                             dataComponent={
                                 <HoverablePoint
                                     onMouseOver={this.onGenePointMouseOver}
                                     onMouseOut={this.onGenePointMouseOut}
-                                    fill={(datum:any)=>{
-                                        if (datum.hugoGeneSymbol in this.props.selectedGenesSet) {
-                                            return "#FE9929";
+                                    fill={(datum: any) => {
+                                        if (
+                                            datum.hugoGeneSymbol in
+                                            this.props.selectedGenesSet
+                                        ) {
+                                            return '#FE9929';
                                         } else if (datum.qValue < 0.05) {
-                                            return "#58ACFA";
+                                            return '#58ACFA';
                                         } else {
-                                            return "#D3D3D3";
+                                            return '#D3D3D3';
                                         }
                                     }}
                                 />
@@ -177,13 +271,16 @@ export default class MiniScatterChart extends React.Component<IMiniScatterChartP
                         getSvg={() => this.svgContainer}
                         filename="enrichments-volcano"
                         dontFade={true}
-                        type='button'
-                        style={{position:"absolute", top:10, right:10, zIndex:0}}
+                        type="button"
+                        style={{
+                            position: 'absolute',
+                            top: 10,
+                            right: 10,
+                            zIndex: 0,
+                        }}
                     />
                 </div>
-                <Observer>
-                    {this.getTooltip}
-                </Observer>
+                <Observer>{this.getTooltip}</Observer>
             </div>
         );
     }
diff --git a/src/pages/resultsView/enrichments/MutationEnrichmentsTab.tsx b/src/pages/resultsView/enrichments/MutationEnrichmentsTab.tsx
index 7b403212e34..f1a707b5d0d 100644
--- a/src/pages/resultsView/enrichments/MutationEnrichmentsTab.tsx
+++ b/src/pages/resultsView/enrichments/MutationEnrichmentsTab.tsx
@@ -1,51 +1,60 @@
 import * as React from 'react';
-import { observer } from "mobx-react";
-import { ResultsViewPageStore } from "../ResultsViewPageStore";
+import { observer } from 'mobx-react';
+import { ResultsViewPageStore } from '../ResultsViewPageStore';
 import AlterationEnrichmentContainer from 'pages/resultsView/enrichments/AlterationEnrichmentsContainer';
 import Loader from 'shared/components/loadingIndicator/LoadingIndicator';
 import EnrichmentsDataSetDropdown from 'pages/resultsView/enrichments/EnrichmentsDataSetDropdown';
 import { MolecularProfile } from 'shared/api/generated/CBioPortalAPI';
 import autobind from 'autobind-decorator';
-import ErrorMessage from "../../../shared/components/ErrorMessage";
+import ErrorMessage from '../../../shared/components/ErrorMessage';
 import { AlterationContainerType } from './EnrichmentsUtil';
-import {makeUniqueColorGetter} from "shared/components/plots/PlotUtils";
-import {MakeMobxView} from "../../../shared/components/MobxView";
-import _ from "lodash";
+import { makeUniqueColorGetter } from 'shared/components/plots/PlotUtils';
+import { MakeMobxView } from '../../../shared/components/MobxView';
+import _ from 'lodash';
 
 export interface IMutationEnrichmentsTabProps {
-    store: ResultsViewPageStore
+    store: ResultsViewPageStore;
 }
 
 @observer
-export default class MutationEnrichmentsTab extends React.Component<IMutationEnrichmentsTabProps, {}> {
-
+export default class MutationEnrichmentsTab extends React.Component<
+    IMutationEnrichmentsTabProps,
+    {}
+> {
     private uniqueColorGetter = makeUniqueColorGetter();
     private alteredColor = this.uniqueColorGetter();
     private unalteredColor = this.uniqueColorGetter();
 
     @autobind
-    private onProfileChange(profileMap:{[studyId:string]:MolecularProfile}) {
+    private onProfileChange(profileMap: {
+        [studyId: string]: MolecularProfile;
+    }) {
         this.props.store.setMutationEnrichmentProfileMap(profileMap);
     }
 
     readonly tabUI = MakeMobxView({
-        await:()=>[
+        await: () => [
             this.props.store.mutationEnrichmentData,
             this.props.store.alteredSampleKeys,
             this.props.store.unalteredSampleKeys,
             this.props.store.alteredPatientKeys,
             this.props.store.unalteredPatientKeys,
-            this.props.store.studies, 
-            this.props.store.selectedMutationEnrichmentProfileMap
+            this.props.store.studies,
+            this.props.store.selectedMutationEnrichmentProfileMap,
         ],
-        renderPending:()=><Loader isLoading={true} center={true} size={"big"}/>,
-        renderError:()=><ErrorMessage/>,
-        render:()=>{
+        renderPending: () => (
+            <Loader isLoading={true} center={true} size={'big'} />
+        ),
+        renderError: () => <ErrorMessage />,
+        render: () => {
             const patientLevel = this.props.store.usePatientLevelEnrichments;
-            let headerName = "Mutations";
+            let headerName = 'Mutations';
             const studies = this.props.store.studies.result!;
             if (studies.length === 1) {
-                headerName = this.props.store.selectedMutationEnrichmentProfileMap.result![studies[0].studyId].name
+                headerName = this.props.store
+                    .selectedMutationEnrichmentProfileMap.result![
+                    studies[0].studyId
+                ].name;
             }
 
             return (
@@ -53,35 +62,59 @@ export default class MutationEnrichmentsTab extends React.Component<IMutationEnr
                     <EnrichmentsDataSetDropdown
                         dataSets={this.props.store.mutationEnrichmentProfiles}
                         onChange={this.onProfileChange}
-                        selectedProfileByStudyId={this.props.store.selectedMutationEnrichmentProfileMap.result!}
-                        molecularProfileIdToProfiledSampleCount={this.props.store.molecularProfileIdToProfiledSampleCount}
+                        selectedProfileByStudyId={
+                            this.props.store
+                                .selectedMutationEnrichmentProfileMap.result!
+                        }
+                        molecularProfileIdToProfiledSampleCount={
+                            this.props.store
+                                .molecularProfileIdToProfiledSampleCount
+                        }
                         studies={this.props.store.studies.result!}
                     />
-                    <AlterationEnrichmentContainer data={this.props.store.mutationEnrichmentData.result!}
+                    <AlterationEnrichmentContainer
+                        data={this.props.store.mutationEnrichmentData.result!}
                         headerName={headerName}
                         store={this.props.store}
                         groups={[
-                                {
-                                    name: "Altered group",
-                                    description: `Number (percentage) of ${patientLevel ? "patients" : "samples"} that have alterations in the query gene(s) that also have a deep deletion in the listed gene.`,
-                                    nameOfEnrichmentDirection: "Co-occurrence",
-                                    count: patientLevel ? this.props.store.alteredPatientKeys.result!.length : this.props.store.alteredSampleKeys.result!.length,
-                                    color: this.alteredColor
-                                }, {
-                                    name: "Unaltered group",
-                                    description: `Number (percentage) of ${patientLevel ? "patients" : "samples"} that do not have alterations in the query gene(s) that have a deep deletion in the listed gene.`,
-                                    nameOfEnrichmentDirection: "Mutual exclusivity",
-                                    count: patientLevel ? this.props.store.unalteredPatientKeys.result!.length : this.props.store.unalteredSampleKeys.result!.length,
-                                    color: this.unalteredColor
-                                }
+                            {
+                                name: 'Altered group',
+                                description: `Number (percentage) of ${
+                                    patientLevel ? 'patients' : 'samples'
+                                } that have alterations in the query gene(s) that also have a deep deletion in the listed gene.`,
+                                nameOfEnrichmentDirection: 'Co-occurrence',
+                                count: patientLevel
+                                    ? this.props.store.alteredPatientKeys
+                                          .result!.length
+                                    : this.props.store.alteredSampleKeys.result!
+                                          .length,
+                                color: this.alteredColor,
+                            },
+                            {
+                                name: 'Unaltered group',
+                                description: `Number (percentage) of ${
+                                    patientLevel ? 'patients' : 'samples'
+                                } that do not have alterations in the query gene(s) that have a deep deletion in the listed gene.`,
+                                nameOfEnrichmentDirection: 'Mutual exclusivity',
+                                count: patientLevel
+                                    ? this.props.store.unalteredPatientKeys
+                                          .result!.length
+                                    : this.props.store.unalteredSampleKeys
+                                          .result!.length,
+                                color: this.unalteredColor,
+                            },
                         ]}
                         containerType={AlterationContainerType.MUTATION}
-                        patientLevelEnrichments={this.props.store.usePatientLevelEnrichments}
-                        onSetPatientLevelEnrichments={this.props.store.setUsePatientLevelEnrichments}
+                        patientLevelEnrichments={
+                            this.props.store.usePatientLevelEnrichments
+                        }
+                        onSetPatientLevelEnrichments={
+                            this.props.store.setUsePatientLevelEnrichments
+                        }
                     />
                 </div>
             );
-        }
+        },
     });
 
     public render() {
diff --git a/src/pages/resultsView/enrichments/ProteinEnrichmentsTab.tsx b/src/pages/resultsView/enrichments/ProteinEnrichmentsTab.tsx
index 3dee1e06817..dc82a995dd9 100644
--- a/src/pages/resultsView/enrichments/ProteinEnrichmentsTab.tsx
+++ b/src/pages/resultsView/enrichments/ProteinEnrichmentsTab.tsx
@@ -1,85 +1,117 @@
 import * as React from 'react';
-import { observer } from "mobx-react";
-import { ResultsViewPageStore } from "../ResultsViewPageStore";
+import { observer } from 'mobx-react';
+import { ResultsViewPageStore } from '../ResultsViewPageStore';
 import ExpressionEnrichmentContainer from 'pages/resultsView/enrichments/ExpressionEnrichmentsContainer';
 import Loader from 'shared/components/loadingIndicator/LoadingIndicator';
 import EnrichmentsDataSetDropdown from 'pages/resultsView/enrichments/EnrichmentsDataSetDropdown';
 import { MolecularProfile } from 'shared/api/generated/CBioPortalAPI';
 import autobind from 'autobind-decorator';
-import ErrorMessage from "../../../shared/components/ErrorMessage";
+import ErrorMessage from '../../../shared/components/ErrorMessage';
 import { makeUniqueColorGetter } from 'shared/components/plots/PlotUtils';
 import { remoteData } from 'cbioportal-frontend-commons';
 import { MakeMobxView } from 'shared/components/MobxView';
 
 export interface IProteinEnrichmentsTabProps {
-    store: ResultsViewPageStore
+    store: ResultsViewPageStore;
 }
 
 @observer
-export default class ProteinEnrichmentsTab extends React.Component<IProteinEnrichmentsTabProps, {}> {
-
+export default class ProteinEnrichmentsTab extends React.Component<
+    IProteinEnrichmentsTabProps,
+    {}
+> {
     @autobind
-    private onProfileChange(profileMap:{[studyId:string]:MolecularProfile}) {
+    private onProfileChange(profileMap: {
+        [studyId: string]: MolecularProfile;
+    }) {
         this.props.store.setProteinEnrichmentProfile(profileMap);
     }
 
     private readonly enrichmentAnalysisGroups = remoteData({
-        await: () => [this.props.store.alteredSamples, this.props.store.unalteredSamples],
+        await: () => [
+            this.props.store.alteredSamples,
+            this.props.store.unalteredSamples,
+        ],
         invoke: () => {
             const uniqueColorGetter = makeUniqueColorGetter();
-            const groups = [{
-                name: "Altered group",
-                description: "samples that have alterations in the query gene(s).",
-                nameOfEnrichmentDirection: "Over-expressed",
-                count: this.props.store.alteredSamples.result!.length,
-                color: uniqueColorGetter(),
-                samples: this.props.store.alteredSamples.result || []
-            }, {
-                name: "Unaltered group",
-                description: "samples that do not have alterations in the query gene(s).",
-                nameOfEnrichmentDirection: "Under-expressed",
-                count: this.props.store.unalteredSamples.result!.length,
-                color: uniqueColorGetter(),
-                samples: this.props.store.unalteredSamples.result || []
-            }];
+            const groups = [
+                {
+                    name: 'Altered group',
+                    description:
+                        'samples that have alterations in the query gene(s).',
+                    nameOfEnrichmentDirection: 'Over-expressed',
+                    count: this.props.store.alteredSamples.result!.length,
+                    color: uniqueColorGetter(),
+                    samples: this.props.store.alteredSamples.result || [],
+                },
+                {
+                    name: 'Unaltered group',
+                    description:
+                        'samples that do not have alterations in the query gene(s).',
+                    nameOfEnrichmentDirection: 'Under-expressed',
+                    count: this.props.store.unalteredSamples.result!.length,
+                    color: uniqueColorGetter(),
+                    samples: this.props.store.unalteredSamples.result || [],
+                },
+            ];
             return Promise.resolve(groups);
-        }
+        },
     });
-    
+
     readonly tabUI = MakeMobxView({
         await: () => [
             this.props.store.studies,
             this.props.store.proteinEnrichmentData,
             this.props.store.selectedProteinEnrichmentProfileMap,
             this.enrichmentAnalysisGroups,
-            this.props.store.oqlFilteredCaseAggregatedData],
+            this.props.store.oqlFilteredCaseAggregatedData,
+        ],
         render: () => {
             // since protein enrichments tab is enabled only for one study, selectedProteinEnrichmentProfileMap
             // would contain only one key.
-            const studyIds = Object.keys(this.props.store.selectedProteinEnrichmentProfileMap.result!);
-            const selectedProfile = this.props.store.selectedProteinEnrichmentProfileMap.result![studyIds[0]];
+            const studyIds = Object.keys(
+                this.props.store.selectedProteinEnrichmentProfileMap.result!
+            );
+            const selectedProfile = this.props.store
+                .selectedProteinEnrichmentProfileMap.result![studyIds[0]];
             return (
                 <div>
                     <EnrichmentsDataSetDropdown
                         dataSets={this.props.store.proteinEnrichmentProfiles}
                         onChange={this.onProfileChange}
-                        selectedProfileByStudyId={this.props.store.selectedProteinEnrichmentProfileMap.result!}
-                        molecularProfileIdToProfiledSampleCount={this.props.store.molecularProfileIdToProfiledSampleCount}
+                        selectedProfileByStudyId={
+                            this.props.store.selectedProteinEnrichmentProfileMap
+                                .result!
+                        }
+                        molecularProfileIdToProfiledSampleCount={
+                            this.props.store
+                                .molecularProfileIdToProfiledSampleCount
+                        }
                         studies={this.props.store.studies.result!}
                     />
                     <ExpressionEnrichmentContainer
                         data={this.props.store.proteinEnrichmentData.result!}
                         groups={this.enrichmentAnalysisGroups.result}
                         selectedProfile={selectedProfile}
-                        sampleKeyToSample={this.props.store.sampleKeyToSample.result!}
-                        queriedHugoGeneSymbols={this.props.store.hugoGeneSymbols}
-                        oqlFilteredCaseAggregatedData={this.props.store.oqlFilteredCaseAggregatedData.result!.samples}
-                        isGeneCheckBoxEnabled={true} />
+                        sampleKeyToSample={
+                            this.props.store.sampleKeyToSample.result!
+                        }
+                        queriedHugoGeneSymbols={
+                            this.props.store.hugoGeneSymbols
+                        }
+                        oqlFilteredCaseAggregatedData={
+                            this.props.store.oqlFilteredCaseAggregatedData
+                                .result!.samples
+                        }
+                        isGeneCheckBoxEnabled={true}
+                    />
                 </div>
             );
         },
-        renderPending: () => <Loader isLoading={true} center={true} size={"big"}/>,
-        renderError: ()=> <ErrorMessage/>
+        renderPending: () => (
+            <Loader isLoading={true} center={true} size={'big'} />
+        ),
+        renderError: () => <ErrorMessage />,
     });
 
     public render() {
diff --git a/src/pages/resultsView/enrichments/SelectionComponent.tsx b/src/pages/resultsView/enrichments/SelectionComponent.tsx
index a4eb95e9ee1..2a0afc104d9 100644
--- a/src/pages/resultsView/enrichments/SelectionComponent.tsx
+++ b/src/pages/resultsView/enrichments/SelectionComponent.tsx
@@ -1,21 +1,24 @@
-import * as React from "react";
+import * as React from 'react';
 
 interface ISelectionComponentProps {
-    onRender:()=>void;
+    onRender: () => void;
     // rest supplied by victory
-    x?:number; y?:number; width?:number; height?:number; style?:any;
+    x?: number;
+    y?: number;
+    width?: number;
+    height?: number;
+    style?: any;
 }
 
-export default class SelectionComponent extends React.Component<ISelectionComponentProps, {}> {
+export default class SelectionComponent extends React.Component<
+    ISelectionComponentProps,
+    {}
+> {
     render() {
-        const {onRender, ...props} = this.props;
+        const { onRender, ...props } = this.props;
         if (props.width! > 5 || props.height! > 5) {
             onRender();
         }
-        return (
-            <rect
-                {...props}
-            />
-        );
+        return <rect {...props} />;
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/resultsView/enrichments/frequencyPlotStyles.module.scss b/src/pages/resultsView/enrichments/frequencyPlotStyles.module.scss
index 33793867d37..f37ce2b1046 100644
--- a/src/pages/resultsView/enrichments/frequencyPlotStyles.module.scss
+++ b/src/pages/resultsView/enrichments/frequencyPlotStyles.module.scss
@@ -1,11 +1,10 @@
 .ChartControls {
-    display:flex !important;
+    display: flex !important;
     > * {
-      margin-right:10px;
+        margin-right: 10px;
     }
-    
-    > :last-child {	
-      margin-right:0;	
+
+    > :last-child {
+        margin-right: 0;
     }
-    
-  }
\ No newline at end of file
+}
diff --git a/src/pages/resultsView/enrichments/styles.module.scss b/src/pages/resultsView/enrichments/styles.module.scss
index 098065ff431..a9daab393b2 100644
--- a/src/pages/resultsView/enrichments/styles.module.scss
+++ b/src/pages/resultsView/enrichments/styles.module.scss
@@ -1,33 +1,30 @@
 .Container {
-
 }
 
 .ChartsPanel {
-    display:flex;
+    display: flex;
     justify-content: flex-start;
 
     > div {
-        margin-right:$standardMargin;
+        margin-right: $standardMargin;
         &:last-child {
-            margin-right:0;
+            margin-right: 0;
         }
     }
 
-
     margin-bottom: $standardMargin;
-
 }
 
 .Checkboxes {
     display: flex;
     flex-direction: row;
-    align-items:center;
+    align-items: center;
     height: 30px;
-    float:left;
+    float: left;
 }
 
 .Checkboxes > * {
-    margin-right:10px !important;
+    margin-right: 10px !important;
 }
 
 .TableContainer {
@@ -81,41 +78,39 @@
 .Tendency {
     display: flex;
     flex-direction: column;
-    align-items:flex-start;
+    align-items: flex-start;
 
     &.Significant {
         font-weight: bold;
     }
 
     &.ColoredBackground {
-        border-radius:3px;
-        padding:1px 5px 1px 5px;
-        display:inline-block;
-        line-height:1.4;
+        border-radius: 3px;
+        padding: 1px 5px 1px 5px;
+        display: inline-block;
+        line-height: 1.4;
     }
 }
 
 .FlexCheckbox label {
-    font-weight:normal !important;
+    font-weight: normal !important;
     display: flex;
     align-items: center;
 }
 
 .FlexCheckbox label input {
-    margin-top:1px !important;
-    margin-right:5px !important;
+    margin-top: 1px !important;
+    margin-right: 5px !important;
 }
 
-
 .ChartLoader {
-    position:absolute;
-    top:50%;
-    left:50%;
+    position: absolute;
+    top: 50%;
+    left: 50%;
     transform: translate(-50%, -50%);
     > div {
-        margin-left:0px !important;
+        margin-left: 0px !important;
     }
-
 }
 
 .BoxEmpty {
@@ -123,7 +118,7 @@
     height: 350px;
     display: flex;
     justify-content: center;
-    align-items: center
+    align-items: center;
 }
 
 .BoxPlot {
@@ -131,5 +126,5 @@
     overflow-y: hidden;
     height: 350px;
     min-width: 350px;
-    display: flex
-}
\ No newline at end of file
+    display: flex;
+}
diff --git a/src/pages/resultsView/enrichments/styles.scss b/src/pages/resultsView/enrichments/styles.scss
index 7a59defd5fb..358fa20a2a4 100644
--- a/src/pages/resultsView/enrichments/styles.scss
+++ b/src/pages/resultsView/enrichments/styles.scss
@@ -1,3 +1,3 @@
 .borderedChart {
     height: 100%;
-}
\ No newline at end of file
+}
diff --git a/src/pages/resultsView/expression/ExpressionWrapper.spec.tsx b/src/pages/resultsView/expression/ExpressionWrapper.spec.tsx
index c933403955c..4587aa24d9e 100644
--- a/src/pages/resultsView/expression/ExpressionWrapper.spec.tsx
+++ b/src/pages/resultsView/expression/ExpressionWrapper.spec.tsx
@@ -1,19 +1,20 @@
-import * as React from "react";
-import {assert} from 'chai';
+import * as React from 'react';
+import { assert } from 'chai';
 import { mount, shallow } from 'enzyme';
-import ExpressionWrapper, {ExpressionWrapperProps} from './ExpressionWrapper';
+import ExpressionWrapper, { ExpressionWrapperProps } from './ExpressionWrapper';
 
 const expressionTestData: ExpressionWrapperProps = require('./expressionTestData.json');
 
-describe('Expression Wrapper',()=>{
-
+describe('Expression Wrapper', () => {
     let wrapper: any;
     let instance: ExpressionWrapper;
 
-    beforeEach(()=>{
-        wrapper = shallow(<ExpressionWrapper
-            {...expressionTestData as ExpressionWrapperProps}
-        />);
+    beforeEach(() => {
+        wrapper = shallow(
+            <ExpressionWrapper
+                {...(expressionTestData as ExpressionWrapperProps)}
+            />
+        );
         instance = wrapper.instance() as ExpressionWrapper;
     });
 
@@ -27,5 +28,4 @@ describe('Expression Wrapper',()=>{
         assert.equal(instance.sortedData[2][0].studyId,  'laml_tcga', 'sort according to median values');
 
     });*/
-
-});
\ No newline at end of file
+});
diff --git a/src/pages/resultsView/expression/ExpressionWrapper.tsx b/src/pages/resultsView/expression/ExpressionWrapper.tsx
index a4103bb7cd3..295ab44d09d 100644
--- a/src/pages/resultsView/expression/ExpressionWrapper.tsx
+++ b/src/pages/resultsView/expression/ExpressionWrapper.tsx
@@ -1,85 +1,113 @@
 import * as React from 'react';
 import * as _ from 'lodash';
-import {observer, Observer} from "mobx-react";
+import { observer, Observer } from 'mobx-react';
 import './styles.scss';
 import {
-    CancerStudy, Gene, NumericGeneMolecularData, MolecularProfile
-} from "../../../shared/api/generated/CBioPortalAPI";
-import {computed, observable} from "mobx";
-import {ExpressionStyle, expressionTooltip, getPossibleRNASeqVersions} from "./expressionHelpers";
-import {Modal} from "react-bootstrap";
-import autobind from "autobind-decorator";
-import {ITooltipModel} from "../../../shared/model/ITooltipModel";
-import ChartContainer from "../../../shared/components/ChartContainer/ChartContainer";
-import {If, Then, Else} from 'react-if';
+    CancerStudy,
+    Gene,
+    NumericGeneMolecularData,
+    MolecularProfile,
+} from '../../../shared/api/generated/CBioPortalAPI';
+import { computed, observable } from 'mobx';
+import {
+    ExpressionStyle,
+    expressionTooltip,
+    getPossibleRNASeqVersions,
+} from './expressionHelpers';
+import { Modal } from 'react-bootstrap';
+import autobind from 'autobind-decorator';
+import { ITooltipModel } from '../../../shared/model/ITooltipModel';
+import ChartContainer from '../../../shared/components/ChartContainer/ChartContainer';
+import { If, Then, Else } from 'react-if';
 import jStat from 'jStat';
 import classNames from 'classnames';
-import {MSKTab, MSKTabs} from "../../../shared/components/MSKTabs/MSKTabs";
-import {CoverageInformation, isPanCanStudy, isTCGAProvStudy} from "../ResultsViewPageStoreUtils";
+import { MSKTab, MSKTabs } from '../../../shared/components/MSKTabs/MSKTabs';
+import {
+    CoverageInformation,
+    isPanCanStudy,
+    isTCGAProvStudy,
+} from '../ResultsViewPageStoreUtils';
 import {
     CNA_STROKE_WIDTH,
-    IBoxScatterPlotPoint, INumberAxisData, IPlotSampleData, IStringAxisData,
-    makeBoxScatterPlotData, makeScatterPlotPointAppearance,
-    MutationSummary, mutationSummaryToAppearance, scatterPlotLegendData,
-    scatterPlotZIndexSortBy, IAxisLogScaleParams
-} from "../plots/PlotsTabUtils";
-import {AnnotatedMutation, ResultsViewPageStore} from "../ResultsViewPageStore";
-import OqlStatusBanner from "../../../shared/components/banners/OqlStatusBanner";
-import {remoteData, stringListToSet} from "cbioportal-frontend-commons";
-import MobxPromiseCache from "../../../shared/lib/MobxPromiseCache";
-import {MobxPromise} from "mobxpromise";
-import LoadingIndicator from "shared/components/loadingIndicator/LoadingIndicator";
-import BoxScatterPlot from "../../../shared/components/plots/BoxScatterPlot";
-import {ViewType, PlotType} from "../plots/PlotsTab";
-import AlterationFilterWarning from "../../../shared/components/banners/AlterationFilterWarning";
+    IBoxScatterPlotPoint,
+    INumberAxisData,
+    IPlotSampleData,
+    IStringAxisData,
+    makeBoxScatterPlotData,
+    makeScatterPlotPointAppearance,
+    MutationSummary,
+    mutationSummaryToAppearance,
+    scatterPlotLegendData,
+    scatterPlotZIndexSortBy,
+    IAxisLogScaleParams,
+} from '../plots/PlotsTabUtils';
+import {
+    AnnotatedMutation,
+    ResultsViewPageStore,
+} from '../ResultsViewPageStore';
+import OqlStatusBanner from '../../../shared/components/banners/OqlStatusBanner';
+import { remoteData, stringListToSet } from 'cbioportal-frontend-commons';
+import MobxPromiseCache from '../../../shared/lib/MobxPromiseCache';
+import { MobxPromise } from 'mobxpromise';
+import LoadingIndicator from 'shared/components/loadingIndicator/LoadingIndicator';
+import BoxScatterPlot from '../../../shared/components/plots/BoxScatterPlot';
+import { ViewType, PlotType } from '../plots/PlotsTab';
+import AlterationFilterWarning from '../../../shared/components/banners/AlterationFilterWarning';
 
 export interface ExpressionWrapperProps {
-    store:ResultsViewPageStore;
-    expressionProfiles:MobxPromise<MolecularProfile[]>;
-    numericGeneMolecularDataCache:MobxPromiseCache<{entrezGeneId:number, molecularProfileId:string}, NumericGeneMolecularData[]>;
+    store: ResultsViewPageStore;
+    expressionProfiles: MobxPromise<MolecularProfile[]>;
+    numericGeneMolecularDataCache: MobxPromiseCache<
+        { entrezGeneId: number; molecularProfileId: string },
+        NumericGeneMolecularData[]
+    >;
     studyMap: { [studyId: string]: CancerStudy };
     genes: Gene[];
     mutations: AnnotatedMutation[];
-    coverageInformation: CoverageInformation
+    coverageInformation: CoverageInformation;
 }
 
 class ExpressionTabBoxPlot extends BoxScatterPlot<IBoxScatterPlotPoint> {}
 
-const SVG_ID = "expression-tab-plot-svg";
+const SVG_ID = 'expression-tab-plot-svg';
 
-export type ScatterPoint = { x: number, y: NumericGeneMolecularData };
+export type ScatterPoint = { x: number; y: NumericGeneMolecularData };
 
-type SortOptions = "alphabetic" | "median";
+type SortOptions = 'alphabetic' | 'median';
 
 type ExpressionTooltipModel = {
     studyName: string;
-    studyId:string;
-    mutationType:string | null;
-    proteinChange:string | null;
+    studyId: string;
+    mutationType: string | null;
+    proteinChange: string | null;
     sampleId: string;
-    expression: number,
-    style: ExpressionStyle
+    expression: number;
+    style: ExpressionStyle;
 };
 
 @observer
-export default class ExpressionWrapper extends React.Component<ExpressionWrapperProps, {}> {
-
+export default class ExpressionWrapper extends React.Component<
+    ExpressionWrapperProps,
+    {}
+> {
     constructor(props: ExpressionWrapperProps) {
         super(props);
         this.selectedGene = props.genes[0];
         (window as any).box = this;
     }
 
-    componentWillMount(){
+    componentWillMount() {
         // initialize selected study state. study is on except if it does not have any data (doesn't appear in data collection)
-        this.selectedStudyIds = _.mapValues(this.props.studyMap,(study)=>true);
+        this.selectedStudyIds = _.mapValues(this.props.studyMap, study => true);
     }
 
     svgContainer: SVGElement;
 
-    @observable private _rnaSeqVersion: 'rna_seq_mrna'|'rna_seq_v2_mrna';
+    @observable private _rnaSeqVersion: 'rna_seq_mrna' | 'rna_seq_v2_mrna';
 
-    @observable.ref tooltipModel: ITooltipModel<ExpressionTooltipModel> | null = null;
+    @observable.ref tooltipModel: ITooltipModel<
+        ExpressionTooltipModel
+    > | null = null;
 
     @observable.ref selectedGene: Gene;
 
@@ -95,7 +123,7 @@ export default class ExpressionWrapper extends React.Component<ExpressionWrapper
 
     @observable logScale = true;
 
-    @observable sortBy: SortOptions = "alphabetic";
+    @observable sortBy: SortOptions = 'alphabetic';
 
     @observable isTooltipHovered = false;
 
@@ -105,53 +133,62 @@ export default class ExpressionWrapper extends React.Component<ExpressionWrapper
     tooltipCounter: number = 0;
 
     @computed get selectedStudies() {
-        return _.filter(this.props.studyMap,(study)=>this.selectedStudyIds[study.studyId] === true);
+        return _.filter(
+            this.props.studyMap,
+            study => this.selectedStudyIds[study.studyId] === true
+        );
     }
 
-    @computed get widthThreshold(){
-        return (this.selectedStudies.length > 7);
+    @computed get widthThreshold() {
+        return this.selectedStudies.length > 7;
     }
 
-    @computed get boxWidth(){
+    @computed get boxWidth() {
         const maxWidth = 80; // width with 1 box
         const minWidth = 18; // width with 33 boxes - value of 18 is calibrated to fit all 33 tcga pan-can atlas studies
 
         // solving linear equation for maxWidth at 1 and minWidth at 33
-        const m = (minWidth - maxWidth)/32;
+        const m = (minWidth - maxWidth) / 32;
         const b = maxWidth - m;
 
         return Math.max(m * this.selectedStudies.length + b, minWidth);
     }
 
     readonly sampleStudyData = remoteData<IStringAxisData>({
-        await:()=>[this.props.store.samples],
-        invoke: ()=>{
+        await: () => [this.props.store.samples],
+        invoke: () => {
             // data representing the horizontal axis - which sample is in which study
-            return Promise.resolve(
-                {
-                    data: this.props.store.samples.result!.reduce((_data, sample)=>{
+            return Promise.resolve({
+                data: this.props.store.samples.result!.reduce(
+                    (_data, sample) => {
                         // filter out data for unselected studies
                         if (this.selectedStudyIds[sample.studyId]) {
                             _data.push({
                                 uniqueSampleKey: sample.uniqueSampleKey,
-                                value: this.props.studyMap[sample.studyId].shortName
+                                value: this.props.studyMap[sample.studyId]
+                                    .shortName,
                             });
                         }
                         return _data;
-                    }, [] as IStringAxisData["data"]),
-                    datatype: "string"
-                }
-            );
-        }
+                    },
+                    [] as IStringAxisData['data']
+                ),
+                datatype: 'string',
+            });
+        },
     });
 
     @computed get selectedRNASeqVersion() {
-        return this._rnaSeqVersion ? this._rnaSeqVersion : this.possibleRNASeqVersions[0].value;
+        return this._rnaSeqVersion
+            ? this._rnaSeqVersion
+            : this.possibleRNASeqVersions[0].value;
     }
 
     @computed get possibleRNASeqVersions() {
-        if(this.props.expressionProfiles.isComplete) {
-            return getPossibleRNASeqVersions(this.props.expressionProfiles.result!);
+        if (this.props.expressionProfiles.isComplete) {
+            return getPossibleRNASeqVersions(
+                this.props.expressionProfiles.result!
+            );
         }
         return [];
     }
@@ -160,65 +197,101 @@ export default class ExpressionWrapper extends React.Component<ExpressionWrapper
         await: () => [this.props.expressionProfiles],
         invoke: () => {
             return Promise.resolve(
-                _.filter(this.props.expressionProfiles.result, expressionProfile => {
-                    return RegExp(`${this.selectedRNASeqVersion}$|pan_can_atlas_2018_${this.selectedRNASeqVersion}_median$`)
-                        .test(expressionProfile.molecularProfileId);
-                }));
-        }
+                _.filter(
+                    this.props.expressionProfiles.result,
+                    expressionProfile => {
+                        return RegExp(
+                            `${this.selectedRNASeqVersion}$|pan_can_atlas_2018_${this.selectedRNASeqVersion}_median$`
+                        ).test(expressionProfile.molecularProfileId);
+                    }
+                )
+            );
+        },
     });
 
     readonly expressionData = remoteData<NumericGeneMolecularData[]>({
-        await:()=>this.props.numericGeneMolecularDataCache.await([this.selectedExpressionProfiles],
-            profiles=>profiles.map((p:MolecularProfile)=>({ entrezGeneId: this.selectedGene.entrezGeneId, molecularProfileId: p.molecularProfileId }))
-        ),
-        invoke:()=>{
+        await: () =>
+            this.props.numericGeneMolecularDataCache.await(
+                [this.selectedExpressionProfiles],
+                profiles =>
+                    profiles.map((p: MolecularProfile) => ({
+                        entrezGeneId: this.selectedGene.entrezGeneId,
+                        molecularProfileId: p.molecularProfileId,
+                    }))
+            ),
+        invoke: () => {
             // TODO: this cache is leading to some ugly code
-            return Promise.resolve(_.flatten(this.props.numericGeneMolecularDataCache.getAll(
-                this.selectedExpressionProfiles.result!.map(p=>({ entrezGeneId: this.selectedGene.entrezGeneId, molecularProfileId: p.molecularProfileId }))
-            ).map(promise=>promise.result!)) as NumericGeneMolecularData[]);
-        }
+            return Promise.resolve(_.flatten(
+                this.props.numericGeneMolecularDataCache
+                    .getAll(
+                        this.selectedExpressionProfiles.result!.map(p => ({
+                            entrezGeneId: this.selectedGene.entrezGeneId,
+                            molecularProfileId: p.molecularProfileId,
+                        }))
+                    )
+                    .map(promise => promise.result!)
+            ) as NumericGeneMolecularData[]);
+        },
     });
 
-    readonly studiesWithExpressionData = remoteData<{[studyId:string]:boolean}>({
-        await:()=>[this.expressionData],
-        invoke:()=>{
-            const studyIds = _.chain<NumericGeneMolecularData[]>(this.expressionData.result!)
-                    .map(d=>d.studyId)
-                    .uniq()
-                    .value();
+    readonly studiesWithExpressionData = remoteData<{
+        [studyId: string]: boolean;
+    }>({
+        await: () => [this.expressionData],
+        invoke: () => {
+            const studyIds = _.chain<NumericGeneMolecularData[]>(
+                this.expressionData.result!
+            )
+                .map(d => d.studyId)
+                .uniq()
+                .value();
             return Promise.resolve(stringListToSet(studyIds));
-        }
+        },
     });
 
     readonly mutationDataExists = remoteData({
-        await: ()=>[this.props.store.studyToMutationMolecularProfile],
-        invoke: ()=>{
-            return Promise.resolve(!!_.values(this.props.store.studyToMutationMolecularProfile).length);
-        }
+        await: () => [this.props.store.studyToMutationMolecularProfile],
+        invoke: () => {
+            return Promise.resolve(
+                !!_.values(this.props.store.studyToMutationMolecularProfile)
+                    .length
+            );
+        },
     });
 
     readonly cnaDataExists = remoteData({
-        await: ()=>[this.props.store.studyToMolecularProfileDiscrete],
-        invoke: ()=>{
-            return Promise.resolve(!!_.values(this.props.store.studyToMolecularProfileDiscrete).length);
-        }
+        await: () => [this.props.store.studyToMolecularProfileDiscrete],
+        invoke: () => {
+            return Promise.resolve(
+                !!_.values(this.props.store.studyToMolecularProfileDiscrete)
+                    .length
+            );
+        },
     });
 
     readonly cnaData = remoteData({
-        await:()=>{
+        await: () => {
             if (this.cnaDataShown && this.selectedGene !== undefined) {
-                return [this.props.store.annotatedCnaCache.get({ entrezGeneId: this.selectedGene.entrezGeneId })];
+                return [
+                    this.props.store.annotatedCnaCache.get({
+                        entrezGeneId: this.selectedGene.entrezGeneId,
+                    }),
+                ];
             } else {
                 return [];
             }
         },
-        invoke:()=>{
+        invoke: () => {
             if (this.cnaDataShown && this.selectedGene !== undefined) {
-                return Promise.resolve(this.props.store.annotatedCnaCache.get({ entrezGeneId: this.selectedGene.entrezGeneId }).result!);
+                return Promise.resolve(
+                    this.props.store.annotatedCnaCache.get({
+                        entrezGeneId: this.selectedGene.entrezGeneId,
+                    }).result!
+                );
             } else {
                 return Promise.resolve([]);
             }
-        }
+        },
     });
 
     @computed get mutationDataShown() {
@@ -230,39 +303,55 @@ export default class ExpressionWrapper extends React.Component<ExpressionWrapper
     }
 
     readonly _unsortedBoxPlotData = remoteData({
-        await:()=>[
+        await: () => [
             this.sampleStudyData,
             this.expressionData,
             this.props.store.sampleKeyToSample,
             this.props.store.studyToMutationMolecularProfile,
             this.props.store.studyToMolecularProfileDiscrete,
-            this.cnaData
+            this.cnaData,
         ],
-        invoke:()=>{
-            return Promise.resolve(makeBoxScatterPlotData(
-                this.sampleStudyData.result!,
-                {
-                    data: this.expressionData.result!,
-                    datatype: "number",
-                    hugoGeneSymbol: this.selectedGene.hugoGeneSymbol
-                } as INumberAxisData,
-                this.props.store.sampleKeyToSample.result!,
-                this.props.coverageInformation.samples,
-                this.mutationDataExists.result ? {
-                    molecularProfileIds: _.values(this.props.store.studyToMutationMolecularProfile.result!).map(p=>p.molecularProfileId),
-                    data: this.props.mutations.filter(m=>m.entrezGeneId === this.selectedGene.entrezGeneId)
-                } : undefined,
-                this.cnaDataShown ? {
-                    molecularProfileIds: _.values(this.props.store.studyToMolecularProfileDiscrete.result!).map(p=>p.molecularProfileId),
-                    data: this.cnaData.result!
-                }: undefined
-            ));
-        }
+        invoke: () => {
+            return Promise.resolve(
+                makeBoxScatterPlotData(
+                    this.sampleStudyData.result!,
+                    {
+                        data: this.expressionData.result!,
+                        datatype: 'number',
+                        hugoGeneSymbol: this.selectedGene.hugoGeneSymbol,
+                    } as INumberAxisData,
+                    this.props.store.sampleKeyToSample.result!,
+                    this.props.coverageInformation.samples,
+                    this.mutationDataExists.result
+                        ? {
+                              molecularProfileIds: _.values(
+                                  this.props.store
+                                      .studyToMutationMolecularProfile.result!
+                              ).map(p => p.molecularProfileId),
+                              data: this.props.mutations.filter(
+                                  m =>
+                                      m.entrezGeneId ===
+                                      this.selectedGene.entrezGeneId
+                              ),
+                          }
+                        : undefined,
+                    this.cnaDataShown
+                        ? {
+                              molecularProfileIds: _.values(
+                                  this.props.store
+                                      .studyToMolecularProfileDiscrete.result!
+                              ).map(p => p.molecularProfileId),
+                              data: this.cnaData.result!,
+                          }
+                        : undefined
+                )
+            );
+        },
     });
 
     readonly boxPlotData = remoteData({
-        await:()=>[this._unsortedBoxPlotData],
-        invoke:()=>{
+        await: () => [this._unsortedBoxPlotData],
+        invoke: () => {
             /*// sort data order within boxes, for rendering order (z-index)
             const sortedData = this._unsortedBoxPlotData.result!.map(labelAndData=>({
                 label: labelAndData.label,
@@ -271,29 +360,38 @@ export default class ExpressionWrapper extends React.Component<ExpressionWrapper
             const sortedData = this._unsortedBoxPlotData.result!;
 
             // sort box order
-            if (this.sortBy === "alphabetic") {
-                return Promise.resolve(_.sortBy<any>(sortedData, d=>d.label));
+            if (this.sortBy === 'alphabetic') {
+                return Promise.resolve(_.sortBy<any>(sortedData, d => d.label));
             } else {
-                return Promise.resolve(_.sortBy<any>(sortedData, d=>{
-                    //Note: we have to use slice to convert Seamless immutable array to real array, otherwise jStat chokes
-                    return jStat.median(Array.prototype.slice.apply((d.data.map((v:any)=>(v.value as number)))));
-                }));
+                return Promise.resolve(
+                    _.sortBy<any>(sortedData, d => {
+                        //Note: we have to use slice to convert Seamless immutable array to real array, otherwise jStat chokes
+                        return jStat.median(
+                            Array.prototype.slice.apply(
+                                d.data.map((v: any) => v.value as number)
+                            )
+                        );
+                    })
+                );
             }
-        }
+        },
     });
 
-    @computed get studyTypeCounts(){
+    @computed get studyTypeCounts() {
         const allStudies = _.values(this.props.studyMap);
         return {
-            provisional:allStudies.filter((study)=>isTCGAProvStudy(study.studyId)),
-            panCancer:allStudies.filter((study)=>isPanCanStudy(study.studyId))
-        }
+            provisional: allStudies.filter(study =>
+                isTCGAProvStudy(study.studyId)
+            ),
+            panCancer: allStudies.filter(study => isPanCanStudy(study.studyId)),
+        };
     }
 
     @autobind
     handleStudySelection(event: React.SyntheticEvent<HTMLInputElement>) {
         // toggle state of it
-        this.selectedStudyIds[event.currentTarget.value] = !this.selectedStudyIds[event.currentTarget.value];
+        this.selectedStudyIds[event.currentTarget.value] = !this
+            .selectedStudyIds[event.currentTarget.value];
     }
 
     @autobind
@@ -307,28 +405,32 @@ export default class ExpressionWrapper extends React.Component<ExpressionWrapper
     }
 
     @autobind
-    handleSelectAllStudies(){
+    handleSelectAllStudies() {
         if (this.studiesWithExpressionData.isComplete) {
-            this.applyStudyFilter((study)=>{
+            this.applyStudyFilter(study => {
                 return study.studyId in this.studiesWithExpressionData.result!;
             });
         }
     }
 
     @autobind
-    handleDeselectAllStudies(){
-        this.applyStudyFilter((study)=>{
+    handleDeselectAllStudies() {
+        this.applyStudyFilter(study => {
             return false;
         });
     }
 
-    @computed get hasUnselectedStudies(){
+    @computed get hasUnselectedStudies() {
         if (this.studiesWithExpressionData.isComplete) {
-            return undefined !== _.find(this.props.studyMap,(study)=>{
-                const hasData = study.studyId in this.studiesWithExpressionData.result!;
-                const isSelected = this.selectedStudies.includes(study);
-                return hasData && !isSelected;
-            });
+            return (
+                undefined !==
+                _.find(this.props.studyMap, study => {
+                    const hasData =
+                        study.studyId in this.studiesWithExpressionData.result!;
+                    const isSelected = this.selectedStudies.includes(study);
+                    return hasData && !isSelected;
+                })
+            );
         } else {
             return false;
         }
@@ -338,57 +440,102 @@ export default class ExpressionWrapper extends React.Component<ExpressionWrapper
     get alphabetizedAndFilteredStudies() {
         return _.chain(this.props.studyMap)
             .values()
-            .filter((study: CancerStudy) => study.studyId in (this.studiesWithExpressionData.result || {}))
+            .filter(
+                (study: CancerStudy) =>
+                    study.studyId in
+                    (this.studiesWithExpressionData.result || {})
+            )
             .sortBy((study: CancerStudy) => study.name)
             .value();
     }
 
     @computed
     get studySelectionModal() {
-
-        return (<Modal data-test="ExpressionStudyModal" show={true} onHide={() => {
-            this.studySelectorModalVisible = false
-        }} className="cbioportal-frontend">
-            <Modal.Header closeButton>
-                <Modal.Title>Select Studies</Modal.Title>
-            </Modal.Header>
-            <Modal.Body>
-                <div>
+        return (
+            <Modal
+                data-test="ExpressionStudyModal"
+                show={true}
+                onHide={() => {
+                    this.studySelectorModalVisible = false;
+                }}
+                className="cbioportal-frontend"
+            >
+                <Modal.Header closeButton>
+                    <Modal.Title>Select Studies</Modal.Title>
+                </Modal.Header>
+                <Modal.Body>
                     <div>
-                        <a data-test="ExpressionStudySelectAll" className={classNames({hidden:!this.hasUnselectedStudies})} onClick={this.handleSelectAllStudies}>Select all</a>
-                        <span className={classNames({hidden:!this.hasUnselectedStudies || this.selectedStudies.length === 0})}>&nbsp;|&nbsp;</span>
-                        <a data-test="ExpressionStudyUnselectAll" className={classNames({hidden:this.selectedStudies.length === 0})} onClick={this.handleDeselectAllStudies}>Deselect all</a>
+                        <div>
+                            <a
+                                data-test="ExpressionStudySelectAll"
+                                className={classNames({
+                                    hidden: !this.hasUnselectedStudies,
+                                })}
+                                onClick={this.handleSelectAllStudies}
+                            >
+                                Select all
+                            </a>
+                            <span
+                                className={classNames({
+                                    hidden:
+                                        !this.hasUnselectedStudies ||
+                                        this.selectedStudies.length === 0,
+                                })}
+                            >
+                                &nbsp;|&nbsp;
+                            </span>
+                            <a
+                                data-test="ExpressionStudyUnselectAll"
+                                className={classNames({
+                                    hidden: this.selectedStudies.length === 0,
+                                })}
+                                onClick={this.handleDeselectAllStudies}
+                            >
+                                Deselect all
+                            </a>
+                        </div>
+                        {_.map(
+                            this.alphabetizedAndFilteredStudies,
+                            (study: CancerStudy) => {
+                                return (
+                                    <div className="checkbox">
+                                        <label>
+                                            <input
+                                                type="checkbox"
+                                                checked={
+                                                    this.selectedStudyIds[
+                                                        study.studyId
+                                                    ] === true
+                                                }
+                                                value={study.studyId}
+                                                onChange={
+                                                    this.handleStudySelection
+                                                }
+                                            />
+                                            {study.name}
+                                        </label>
+                                    </div>
+                                );
+                            }
+                        )}
                     </div>
-                    {
-                        _.map(this.alphabetizedAndFilteredStudies, (study: CancerStudy) => {
-                            return (
-                                <div className='checkbox'>
-                                    <label>
-                                        <input type="checkbox"
-                                            checked={this.selectedStudyIds[study.studyId] === true}
-                                            value={study.studyId}
-                                            onChange={this.handleStudySelection} />
-                                        {study.name}
-                                    </label>
-                                </div>
-                            )
-                        })
-                    }
-                </div>
-            </Modal.Body>
-        </Modal>)
-
+                </Modal.Body>
+            </Modal>
+        );
     }
 
     @autobind
     public applyStudyFilter(test: (study: CancerStudy) => boolean) {
-        this.selectedStudyIds = _.mapValues(this.props.studyMap, (study: CancerStudy, studyId: string) => {
-            return test(study);
-        });
+        this.selectedStudyIds = _.mapValues(
+            this.props.studyMap,
+            (study: CancerStudy, studyId: string) => {
+                return test(study);
+            }
+        );
     }
 
     @autobind
-    public handleTabClick(id: string, datum:Gene) {
+    public handleTabClick(id: string, datum: Gene) {
         this.selectedGene = datum;
     }
 
@@ -404,7 +551,7 @@ export default class ExpressionWrapper extends React.Component<ExpressionWrapper
 
     @computed get fill() {
         if (this.showCna || this.showMutations) {
-            return (d:IPlotSampleData)=>this.scatterPlotAppearance(d).fill!;
+            return (d: IPlotSampleData) => this.scatterPlotAppearance(d).fill!;
         } else {
             return mutationSummaryToAppearance[MutationSummary.Neither].fill;
         }
@@ -428,17 +575,22 @@ export default class ExpressionWrapper extends React.Component<ExpressionWrapper
     }
 
     @autobind
-    private strokeOpacity(d:IPlotSampleData) {
+    private strokeOpacity(d: IPlotSampleData) {
         return this.scatterPlotAppearance(d).strokeOpacity;
     }
 
     @autobind
-    private stroke(d:IPlotSampleData) {
+    private stroke(d: IPlotSampleData) {
         return this.scatterPlotAppearance(d).stroke;
     }
 
     @computed get scatterPlotAppearance() {
-        return makeScatterPlotPointAppearance(this.viewType, this.mutationDataExists, this.cnaDataExists, this.props.store.driverAnnotationSettings.driversAnnotated);
+        return makeScatterPlotPointAppearance(
+            this.viewType,
+            this.mutationDataExists,
+            this.cnaDataExists,
+            this.props.store.driverAnnotationSettings.driversAnnotated
+        );
     }
 
     @computed get viewType() {
@@ -453,16 +605,19 @@ export default class ExpressionWrapper extends React.Component<ExpressionWrapper
         }
     }
 
-    private boxCalculationFilter(d:IBoxScatterPlotPoint) {
+    private boxCalculationFilter(d: IBoxScatterPlotPoint) {
         // filter out zero values from box calculation
         return d.value !== 0;
     }
 
     @autobind
-    private tooltip(d:IBoxScatterPlotPoint) {
+    private tooltip(d: IBoxScatterPlotPoint) {
         let content;
         if (this.props.store.studyIdToStudy.isComplete) {
-            content = expressionTooltip(d, this.props.store.studyIdToStudy.result!);
+            content = expressionTooltip(
+                d,
+                this.props.store.studyIdToStudy.result!
+            );
         } else {
             content = <span>Loading...</span>;
         }
@@ -470,22 +625,20 @@ export default class ExpressionWrapper extends React.Component<ExpressionWrapper
     }
 
     @computed get zIndexSortBy() {
-        return scatterPlotZIndexSortBy<IPlotSampleData>(
-            this.viewType
-        );
+        return scatterPlotZIndexSortBy<IPlotSampleData>(this.viewType);
     }
 
-    @computed get axisLogScaleFunction():IAxisLogScaleParams|undefined {
-
+    @computed get axisLogScaleFunction(): IAxisLogScaleParams | undefined {
         const MIN_LOG_ARGUMENT = 0.01;
 
         if (!this.logScale) {
             return undefined;
         }
         return {
-            label: "log2",
-            fLogScale: (x:number, offset:number) => Math.log2(Math.max(x, MIN_LOG_ARGUMENT)),
-            fInvLogScale: (x:number) => Math.pow(2, x)
+            label: 'log2',
+            fLogScale: (x: number, offset: number) =>
+                Math.log2(Math.max(x, MIN_LOG_ARGUMENT)),
+            fInvLogScale: (x: number) => Math.pow(2, x),
         };
     }
 
@@ -518,15 +671,22 @@ export default class ExpressionWrapper extends React.Component<ExpressionWrapper
                         strokeWidth={this.strokeWidth}
                         useLogSpaceTicks={true}
                         legendData={scatterPlotLegendData(
-                            _.flatten(this.boxPlotData.result.map(d=>d.data)), this.viewType, PlotType.BoxPlot, this.mutationDataExists, this.cnaDataExists, this.props.store.driverAnnotationSettings.driversAnnotated, []
+                            _.flatten(this.boxPlotData.result.map(d => d.data)),
+                            this.viewType,
+                            PlotType.BoxPlot,
+                            this.mutationDataExists,
+                            this.cnaDataExists,
+                            this.props.store.driverAnnotationSettings
+                                .driversAnnotated,
+                            []
                         )}
                         legendLocationWidthThreshold={900}
                         boxCalculationFilter={this.boxCalculationFilter}
-                />
+                    />
                 </ChartContainer>
             );
         } else {
-            return <span></span>
+            return <span></span>;
         }
     }
 
@@ -537,137 +697,231 @@ export default class ExpressionWrapper extends React.Component<ExpressionWrapper
 
     @computed get exportFileName() {
         // TODO: more specific?
-        return "Expression";
+        return 'Expression';
     }
 
     render() {
         return (
             <div data-test="expressionTabDiv">
-                <div className={"tabMessageContainer"}>
-                    <OqlStatusBanner className="expression-oql-status-banner" store={this.props.store} tabReflectsOql={false} style={{marginTop:-1, marginBottom:12}}/>
-                    <AlterationFilterWarning store={this.props.store}/>
+                <div className={'tabMessageContainer'}>
+                    <OqlStatusBanner
+                        className="expression-oql-status-banner"
+                        store={this.props.store}
+                        tabReflectsOql={false}
+                        style={{ marginTop: -1, marginBottom: 12 }}
+                    />
+                    <AlterationFilterWarning store={this.props.store} />
                 </div>
-                { (this.studySelectorModalVisible) && this.studySelectionModal }
-                <div style={{marginBottom:15}}>
-
-                    <MSKTabs onTabClick={this.handleTabClick}
-                             arrowStyle={{'line-height': .8}}
-                             enablePagination={false}
-                             unmountOnHide={true}
-                             tabButtonStyle="pills"
-                             activeTabId={"summaryTab" + this.selectedGene.hugoGeneSymbol}
-                             className="pillTabs">
-                        {
-                            this.props.genes.map((gene:Gene)=> {
-                               return <MSKTab key={gene.hugoGeneSymbol} datum={gene} id={"summaryTab" + gene.hugoGeneSymbol}
-                                        linkText={gene.hugoGeneSymbol}/>
-                            })
+                {this.studySelectorModalVisible && this.studySelectionModal}
+                <div style={{ marginBottom: 15 }}>
+                    <MSKTabs
+                        onTabClick={this.handleTabClick}
+                        arrowStyle={{ 'line-height': 0.8 }}
+                        enablePagination={false}
+                        unmountOnHide={true}
+                        tabButtonStyle="pills"
+                        activeTabId={
+                            'summaryTab' + this.selectedGene.hugoGeneSymbol
                         }
+                        className="pillTabs"
+                    >
+                        {this.props.genes.map((gene: Gene) => {
+                            return (
+                                <MSKTab
+                                    key={gene.hugoGeneSymbol}
+                                    datum={gene}
+                                    id={'summaryTab' + gene.hugoGeneSymbol}
+                                    linkText={gene.hugoGeneSymbol}
+                                />
+                            );
+                        })}
                     </MSKTabs>
 
-                    <form className="form-inline expression-controls" style={{marginBottom:10}}>
-
+                    <form
+                        className="form-inline expression-controls"
+                        style={{ marginBottom: 10 }}
+                    >
                         <div className="form-group">
                             <h5>Profile:</h5>
-                            
-                            <select className="form-control input-sm" value={this.selectedRNASeqVersion}
-                                    onChange={this.handleRNASeqVersionChange} title="Select profile">
-                                        {
-                                            this.possibleRNASeqVersions.map(option=>{
-                                                return  <option value={option.value}>{option.label}</option>
-                                            })
-                                        }
+
+                            <select
+                                className="form-control input-sm"
+                                value={this.selectedRNASeqVersion}
+                                onChange={this.handleRNASeqVersionChange}
+                                title="Select profile"
+                            >
+                                {this.possibleRNASeqVersions.map(option => {
+                                    return (
+                                        <option value={option.value}>
+                                            {option.label}
+                                        </option>
+                                    );
+                                })}
                             </select>
                         </div>
 
-                        {(this.boxPlotData.isComplete && this.boxPlotData.result.length > 1) && (
-                            <div className="form-group">
-                                <h5>Sort By:</h5>
-
-                                <select className="form-control input-sm" value={this.sortBy}
-                                        onChange={this.handleSortByChange} title="Select profile">
-                                    <option value={"alphabetic"}>Cancer Study</option>
-                                    <option value={"median"}>Median</option>
-                                </select>
-                            </div>
-                        )}
+                        {this.boxPlotData.isComplete &&
+                            this.boxPlotData.result.length > 1 && (
+                                <div className="form-group">
+                                    <h5>Sort By:</h5>
+
+                                    <select
+                                        className="form-control input-sm"
+                                        value={this.sortBy}
+                                        onChange={this.handleSortByChange}
+                                        title="Select profile"
+                                    >
+                                        <option value={'alphabetic'}>
+                                            Cancer Study
+                                        </option>
+                                        <option value={'median'}>Median</option>
+                                    </select>
+                                </div>
+                            )}
 
                         <div className="form-group">
                             <label className="checkbox-inline">
-                                <input type="checkbox" checked={this.logScale}
-                                       onChange={()=>this.logScale = !this.logScale} title="Log scale"/>
+                                <input
+                                    type="checkbox"
+                                    checked={this.logScale}
+                                    onChange={() =>
+                                        (this.logScale = !this.logScale)
+                                    }
+                                    title="Log scale"
+                                />
                                 Log scale
                             </label>
-                            { this.mutationDataExists.result && <label className="checkbox-inline">
-                                <input type="checkbox" checked={this.showMutations}
-                                       onChange={() => this.showMutations = !this.showMutations}
-                                       title="Show mutations *"/>
-                                Show mutations *
-                            </label>}
-                            { this.cnaDataExists.result && <label className="checkbox-inline">
-                                <input type="checkbox" checked={this.showCna}
-                                       onChange={() => this.showCna = !this.showCna}
-                                       title="Show copy number alterations"/>
-                                Show copy number alterations
-                            </label>}
+                            {this.mutationDataExists.result && (
+                                <label className="checkbox-inline">
+                                    <input
+                                        type="checkbox"
+                                        checked={this.showMutations}
+                                        onChange={() =>
+                                            (this.showMutations = !this
+                                                .showMutations)
+                                        }
+                                        title="Show mutations *"
+                                    />
+                                    Show mutations *
+                                </label>
+                            )}
+                            {this.cnaDataExists.result && (
+                                <label className="checkbox-inline">
+                                    <input
+                                        type="checkbox"
+                                        checked={this.showCna}
+                                        onChange={() =>
+                                            (this.showCna = !this.showCna)
+                                        }
+                                        title="Show copy number alterations"
+                                    />
+                                    Show copy number alterations
+                                </label>
+                            )}
                         </div>
-
                     </form>
 
-                    { this.studiesWithExpressionData.isComplete && <div>
-                        <label>Select studies:</label>&nbsp;
-                        <If condition={this.studyTypeCounts.provisional.length > 0}>
-                            <button className="btn btn-default btn-xs" style={{marginRight:5}}
-                                    onClick={() => this.applyStudyFilter((study: CancerStudy) => isTCGAProvStudy(study.studyId))}>
-                                 TCGA Provisional ({this.studyTypeCounts.provisional.length})
+                    {this.studiesWithExpressionData.isComplete && (
+                        <div>
+                            <label>Select studies:</label>&nbsp;
+                            <If
+                                condition={
+                                    this.studyTypeCounts.provisional.length > 0
+                                }
+                            >
+                                <button
+                                    className="btn btn-default btn-xs"
+                                    style={{ marginRight: 5 }}
+                                    onClick={() =>
+                                        this.applyStudyFilter(
+                                            (study: CancerStudy) =>
+                                                isTCGAProvStudy(study.studyId)
+                                        )
+                                    }
+                                >
+                                    TCGA Provisional (
+                                    {this.studyTypeCounts.provisional.length})
+                                </button>
+                            </If>
+                            <If
+                                condition={
+                                    this.studyTypeCounts.panCancer.length > 0
+                                }
+                            >
+                                <button
+                                    className="btn btn-default btn-xs"
+                                    style={{ marginRight: 5 }}
+                                    onClick={() =>
+                                        this.applyStudyFilter(
+                                            (study: CancerStudy) =>
+                                                isPanCanStudy(study.studyId)
+                                        )
+                                    }
+                                >
+                                    TCGA Pan-Can Atlas (
+                                    {this.studyTypeCounts.panCancer.length})
+                                </button>
+                            </If>
+                            <button
+                                data-test="ExpressionStudyModalButton"
+                                className="btn btn-default btn-xs"
+                                onClick={() =>
+                                    (this.studySelectorModalVisible = !this
+                                        .studySelectorModalVisible)
+                                }
+                            >
+                                Custom list
                             </button>
-                        </If>
-                        <If condition={this.studyTypeCounts.panCancer.length > 0}>
-                            <button className="btn btn-default btn-xs" style={{marginRight:5}}
-                                    onClick={() => this.applyStudyFilter((study: CancerStudy) => isPanCanStudy(study.studyId))}>
-                                TCGA Pan-Can Atlas ({this.studyTypeCounts.panCancer.length})
-                            </button>
-                        </If>
-                        <button data-test="ExpressionStudyModalButton"className="btn btn-default btn-xs"
-                                onClick={() => this.studySelectorModalVisible = !this.studySelectorModalVisible}>Custom list</button>
-
-                    </div>}
+                        </div>
+                    )}
 
                     <div className="collapse">
                         <div className="well"></div>
                     </div>
                 </div>
 
-                <LoadingIndicator center={true} size="big" isLoading={this.boxPlotData.isPending || this.studiesWithExpressionData.isPending} />
-
-                { this.boxPlotData.isComplete && <If condition={this.selectedStudies.length > 0}>
-                    <Then>
-                        <If condition={_.size(this.boxPlotData.result!) > 0}>
-                            <Then>
-                                <div className="posRelative">
-                                    <Observer>
-                                        {this.getChart}
-                                    </Observer>
-                                    {this.mutationDataExists.result && (
-                                        <div style={{marginTop:20}}>* Driver annotation settings are located in the Mutation Color menu of the Oncoprint.</div>
-                                    )}
-                                </div>
-                            </Then>
-                            <Else>
-                                <div className="alert alert-info">
-                                    No expression data for this query.
-                                </div>
-                            </Else>
-                        </If>
-                    </Then>
-                    <Else>
-                        <div className="alert alert-info">
-                            No studies selected.
-                        </div>
-                    </Else>
-                </If>}
+                <LoadingIndicator
+                    center={true}
+                    size="big"
+                    isLoading={
+                        this.boxPlotData.isPending ||
+                        this.studiesWithExpressionData.isPending
+                    }
+                />
+
+                {this.boxPlotData.isComplete && (
+                    <If condition={this.selectedStudies.length > 0}>
+                        <Then>
+                            <If
+                                condition={_.size(this.boxPlotData.result!) > 0}
+                            >
+                                <Then>
+                                    <div className="posRelative">
+                                        <Observer>{this.getChart}</Observer>
+                                        {this.mutationDataExists.result && (
+                                            <div style={{ marginTop: 20 }}>
+                                                * Driver annotation settings are
+                                                located in the Mutation Color
+                                                menu of the Oncoprint.
+                                            </div>
+                                        )}
+                                    </div>
+                                </Then>
+                                <Else>
+                                    <div className="alert alert-info">
+                                        No expression data for this query.
+                                    </div>
+                                </Else>
+                            </If>
+                        </Then>
+                        <Else>
+                            <div className="alert alert-info">
+                                No studies selected.
+                            </div>
+                        </Else>
+                    </If>
+                )}
             </div>
         );
     }
-
 }
diff --git a/src/pages/resultsView/expression/expressionHelpers.sample.js.REMOVED.git-id b/src/pages/resultsView/expression/expressionHelpers.sample.js.REMOVED.git-id
index 4a645f2b4b2..f1651d986f7 100644
--- a/src/pages/resultsView/expression/expressionHelpers.sample.js.REMOVED.git-id
+++ b/src/pages/resultsView/expression/expressionHelpers.sample.js.REMOVED.git-id
@@ -1 +1 @@
-fc1ae132c61a2016f4893759ec2478f23c934973
\ No newline at end of file
+4a4dbb13dbd8605ce78e0f04f621452082dbc8ea
\ No newline at end of file
diff --git a/src/pages/resultsView/expression/expressionHelpers.spec.ts b/src/pages/resultsView/expression/expressionHelpers.spec.ts
index 229c54c37bd..adce1f08f21 100644
--- a/src/pages/resultsView/expression/expressionHelpers.spec.ts
+++ b/src/pages/resultsView/expression/expressionHelpers.spec.ts
@@ -1,1581 +1,2307 @@
-import {assert} from "chai";
-import {getMolecularDataBuckets, prioritizeMutations, getPossibleRNASeqVersions} from "./expressionHelpers";
-import {CoverageInformation} from "../ResultsViewPageStoreUtils";
-import {studyData as sampleStudyData, mutationsKeyedBySampleId, coverageInformation} from './expressionHelpers.sample.js';
-import {Mutation, NumericGeneMolecularData} from "../../../shared/api/generated/CBioPortalAPI";
+import { assert } from 'chai';
+import {
+    getMolecularDataBuckets,
+    prioritizeMutations,
+    getPossibleRNASeqVersions,
+} from './expressionHelpers';
+import { CoverageInformation } from '../ResultsViewPageStoreUtils';
+import {
+    studyData as sampleStudyData,
+    mutationsKeyedBySampleId,
+    coverageInformation,
+} from './expressionHelpers.sample.js';
+import {
+    Mutation,
+    NumericGeneMolecularData,
+} from '../../../shared/api/generated/CBioPortalAPI';
 
 describe('getMolecularDataBuckets', () => {
-
-
     let expectedResult: any;
 
     let sampleMolecularData: NumericGeneMolecularData[];
 
-    before(()=>{
+    before(() => {
         sampleMolecularData = sampleStudyData as NumericGeneMolecularData[];
         expectedResult = {
-            "mutationBuckets": {
-                "missense": [{
-                    "uniqueSampleKey": "VENHQS1BQi0yODEzLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                    "uniquePatientKey": "VENHQS1BQi0yODEzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                    "entrezGeneId": 7157,
-                    "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                    "sampleId": "TCGA-AB-2813-03",
-                    "patientId": "TCGA-AB-2813",
-                    "studyId": "laml_tcga_pan_can_atlas_2018",
-                    "value": 1933.49628137823
-                }, {
-                    "uniqueSampleKey": "VENHQS1BQi0yODg1LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                    "uniquePatientKey": "VENHQS1BQi0yODg1OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                    "entrezGeneId": 7157,
-                    "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                    "sampleId": "TCGA-AB-2885-03",
-                    "patientId": "TCGA-AB-2885",
-                    "studyId": "laml_tcga_pan_can_atlas_2018",
-                    "value": 3611.93208371068
-                }, {
-                    "uniqueSampleKey": "VENHQS1BQi0yOTA0LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                    "uniquePatientKey": "VENHQS1BQi0yOTA0OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                    "entrezGeneId": 7157,
-                    "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                    "sampleId": "TCGA-AB-2904-03",
-                    "patientId": "TCGA-AB-2904",
-                    "studyId": "laml_tcga_pan_can_atlas_2018",
-                    "value": 2207.05060168879
-                }, {
-                    "uniqueSampleKey": "VENHQS1BQi0yOTA4LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                    "uniquePatientKey": "VENHQS1BQi0yOTA4OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                    "entrezGeneId": 7157,
-                    "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                    "sampleId": "TCGA-AB-2908-03",
-                    "patientId": "TCGA-AB-2908",
-                    "studyId": "laml_tcga_pan_can_atlas_2018",
-                    "value": 736.368378251112
-                }, {
-                    "uniqueSampleKey": "VENHQS1BQi0yOTM1LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                    "uniquePatientKey": "VENHQS1BQi0yOTM1OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                    "entrezGeneId": 7157,
-                    "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                    "sampleId": "TCGA-AB-2935-03",
-                    "patientId": "TCGA-AB-2935",
-                    "studyId": "laml_tcga_pan_can_atlas_2018",
-                    "value": 1360.59575189892
-                }, {
-                    "uniqueSampleKey": "VENHQS1BQi0yOTQxLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                    "uniquePatientKey": "VENHQS1BQi0yOTQxOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                    "entrezGeneId": 7157,
-                    "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                    "sampleId": "TCGA-AB-2941-03",
-                    "patientId": "TCGA-AB-2941",
-                    "studyId": "laml_tcga_pan_can_atlas_2018",
-                    "value": 1483.63187640152
-                }, {
-                    "uniqueSampleKey": "VENHQS1BQi0yOTQzLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                    "uniquePatientKey": "VENHQS1BQi0yOTQzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                    "entrezGeneId": 7157,
-                    "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                    "sampleId": "TCGA-AB-2943-03",
-                    "patientId": "TCGA-AB-2943",
-                    "studyId": "laml_tcga_pan_can_atlas_2018",
-                    "value": 1595.84612349971
-                }, {
-                    "uniqueSampleKey": "VENHQS1BQi0yOTUyLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                    "uniquePatientKey": "VENHQS1BQi0yOTUyOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                    "entrezGeneId": 7157,
-                    "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                    "sampleId": "TCGA-AB-2952-03",
-                    "patientId": "TCGA-AB-2952",
-                    "studyId": "laml_tcga_pan_can_atlas_2018",
-                    "value": 2711.30470514441
-                }],
-                "trunc": [{
-                    "uniqueSampleKey": "VENHQS1BQi0yODIwLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                    "uniquePatientKey": "VENHQS1BQi0yODIwOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                    "entrezGeneId": 7157,
-                    "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                    "sampleId": "TCGA-AB-2820-03",
-                    "patientId": "TCGA-AB-2820",
-                    "studyId": "laml_tcga_pan_can_atlas_2018",
-                    "value": 177.760665663725
-                }, {
-                    "uniqueSampleKey": "VENHQS1BQi0yODM4LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                    "uniquePatientKey": "VENHQS1BQi0yODM4OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                    "entrezGeneId": 7157,
-                    "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                    "sampleId": "TCGA-AB-2838-03",
-                    "patientId": "TCGA-AB-2838",
-                    "studyId": "laml_tcga_pan_can_atlas_2018",
-                    "value": 666.898408595377
-                }, {
-                    "uniqueSampleKey": "VENHQS1BQi0yODU3LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                    "uniquePatientKey": "VENHQS1BQi0yODU3OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                    "entrezGeneId": 7157,
-                    "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                    "sampleId": "TCGA-AB-2857-03",
-                    "patientId": "TCGA-AB-2857",
-                    "studyId": "laml_tcga_pan_can_atlas_2018",
-                    "value": 256.24401856776
-                }, {
-                    "uniqueSampleKey": "VENHQS1BQi0yODYwLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                    "uniquePatientKey": "VENHQS1BQi0yODYwOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                    "entrezGeneId": 7157,
-                    "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                    "sampleId": "TCGA-AB-2860-03",
-                    "patientId": "TCGA-AB-2860",
-                    "studyId": "laml_tcga_pan_can_atlas_2018",
-                    "value": 609.377468235893
-                },
-                {
-                    "uniqueSampleKey": "VENHQS1BQi0yODY4LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                    "uniquePatientKey": "VENHQS1BQi0yODY4OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                    "entrezGeneId": 7157,
-                    "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                    "sampleId": "TCGA-AB-2868-03",
-                    "patientId": "TCGA-AB-2868",
-                    "studyId": "laml_tcga_pan_can_atlas_2018",
-                    "value": 916.328015361695
-                },
-                {
-                    "uniqueSampleKey": "VENHQS1BQi0yOTM4LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                    "uniquePatientKey": "VENHQS1BQi0yOTM4OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                    "entrezGeneId": 7157,
-                    "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                    "sampleId": "TCGA-AB-2938-03",
-                    "patientId": "TCGA-AB-2938",
-                    "studyId": "laml_tcga_pan_can_atlas_2018",
-                    "value": 3676.54978407445
-                }]
+            mutationBuckets: {
+                missense: [
+                    {
+                        uniqueSampleKey:
+                            'VENHQS1BQi0yODEzLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                        uniquePatientKey:
+                            'VENHQS1BQi0yODEzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                        entrezGeneId: 7157,
+                        molecularProfileId:
+                            'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                        sampleId: 'TCGA-AB-2813-03',
+                        patientId: 'TCGA-AB-2813',
+                        studyId: 'laml_tcga_pan_can_atlas_2018',
+                        value: 1933.49628137823,
+                    },
+                    {
+                        uniqueSampleKey:
+                            'VENHQS1BQi0yODg1LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                        uniquePatientKey:
+                            'VENHQS1BQi0yODg1OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                        entrezGeneId: 7157,
+                        molecularProfileId:
+                            'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                        sampleId: 'TCGA-AB-2885-03',
+                        patientId: 'TCGA-AB-2885',
+                        studyId: 'laml_tcga_pan_can_atlas_2018',
+                        value: 3611.93208371068,
+                    },
+                    {
+                        uniqueSampleKey:
+                            'VENHQS1BQi0yOTA0LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                        uniquePatientKey:
+                            'VENHQS1BQi0yOTA0OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                        entrezGeneId: 7157,
+                        molecularProfileId:
+                            'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                        sampleId: 'TCGA-AB-2904-03',
+                        patientId: 'TCGA-AB-2904',
+                        studyId: 'laml_tcga_pan_can_atlas_2018',
+                        value: 2207.05060168879,
+                    },
+                    {
+                        uniqueSampleKey:
+                            'VENHQS1BQi0yOTA4LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                        uniquePatientKey:
+                            'VENHQS1BQi0yOTA4OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                        entrezGeneId: 7157,
+                        molecularProfileId:
+                            'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                        sampleId: 'TCGA-AB-2908-03',
+                        patientId: 'TCGA-AB-2908',
+                        studyId: 'laml_tcga_pan_can_atlas_2018',
+                        value: 736.368378251112,
+                    },
+                    {
+                        uniqueSampleKey:
+                            'VENHQS1BQi0yOTM1LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                        uniquePatientKey:
+                            'VENHQS1BQi0yOTM1OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                        entrezGeneId: 7157,
+                        molecularProfileId:
+                            'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                        sampleId: 'TCGA-AB-2935-03',
+                        patientId: 'TCGA-AB-2935',
+                        studyId: 'laml_tcga_pan_can_atlas_2018',
+                        value: 1360.59575189892,
+                    },
+                    {
+                        uniqueSampleKey:
+                            'VENHQS1BQi0yOTQxLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                        uniquePatientKey:
+                            'VENHQS1BQi0yOTQxOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                        entrezGeneId: 7157,
+                        molecularProfileId:
+                            'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                        sampleId: 'TCGA-AB-2941-03',
+                        patientId: 'TCGA-AB-2941',
+                        studyId: 'laml_tcga_pan_can_atlas_2018',
+                        value: 1483.63187640152,
+                    },
+                    {
+                        uniqueSampleKey:
+                            'VENHQS1BQi0yOTQzLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                        uniquePatientKey:
+                            'VENHQS1BQi0yOTQzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                        entrezGeneId: 7157,
+                        molecularProfileId:
+                            'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                        sampleId: 'TCGA-AB-2943-03',
+                        patientId: 'TCGA-AB-2943',
+                        studyId: 'laml_tcga_pan_can_atlas_2018',
+                        value: 1595.84612349971,
+                    },
+                    {
+                        uniqueSampleKey:
+                            'VENHQS1BQi0yOTUyLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                        uniquePatientKey:
+                            'VENHQS1BQi0yOTUyOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                        entrezGeneId: 7157,
+                        molecularProfileId:
+                            'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                        sampleId: 'TCGA-AB-2952-03',
+                        patientId: 'TCGA-AB-2952',
+                        studyId: 'laml_tcga_pan_can_atlas_2018',
+                        value: 2711.30470514441,
+                    },
+                ],
+                trunc: [
+                    {
+                        uniqueSampleKey:
+                            'VENHQS1BQi0yODIwLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                        uniquePatientKey:
+                            'VENHQS1BQi0yODIwOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                        entrezGeneId: 7157,
+                        molecularProfileId:
+                            'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                        sampleId: 'TCGA-AB-2820-03',
+                        patientId: 'TCGA-AB-2820',
+                        studyId: 'laml_tcga_pan_can_atlas_2018',
+                        value: 177.760665663725,
+                    },
+                    {
+                        uniqueSampleKey:
+                            'VENHQS1BQi0yODM4LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                        uniquePatientKey:
+                            'VENHQS1BQi0yODM4OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                        entrezGeneId: 7157,
+                        molecularProfileId:
+                            'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                        sampleId: 'TCGA-AB-2838-03',
+                        patientId: 'TCGA-AB-2838',
+                        studyId: 'laml_tcga_pan_can_atlas_2018',
+                        value: 666.898408595377,
+                    },
+                    {
+                        uniqueSampleKey:
+                            'VENHQS1BQi0yODU3LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                        uniquePatientKey:
+                            'VENHQS1BQi0yODU3OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                        entrezGeneId: 7157,
+                        molecularProfileId:
+                            'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                        sampleId: 'TCGA-AB-2857-03',
+                        patientId: 'TCGA-AB-2857',
+                        studyId: 'laml_tcga_pan_can_atlas_2018',
+                        value: 256.24401856776,
+                    },
+                    {
+                        uniqueSampleKey:
+                            'VENHQS1BQi0yODYwLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                        uniquePatientKey:
+                            'VENHQS1BQi0yODYwOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                        entrezGeneId: 7157,
+                        molecularProfileId:
+                            'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                        sampleId: 'TCGA-AB-2860-03',
+                        patientId: 'TCGA-AB-2860',
+                        studyId: 'laml_tcga_pan_can_atlas_2018',
+                        value: 609.377468235893,
+                    },
+                    {
+                        uniqueSampleKey:
+                            'VENHQS1BQi0yODY4LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                        uniquePatientKey:
+                            'VENHQS1BQi0yODY4OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                        entrezGeneId: 7157,
+                        molecularProfileId:
+                            'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                        sampleId: 'TCGA-AB-2868-03',
+                        patientId: 'TCGA-AB-2868',
+                        studyId: 'laml_tcga_pan_can_atlas_2018',
+                        value: 916.328015361695,
+                    },
+                    {
+                        uniqueSampleKey:
+                            'VENHQS1BQi0yOTM4LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                        uniquePatientKey:
+                            'VENHQS1BQi0yOTM4OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                        entrezGeneId: 7157,
+                        molecularProfileId:
+                            'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                        sampleId: 'TCGA-AB-2938-03',
+                        patientId: 'TCGA-AB-2938',
+                        studyId: 'laml_tcga_pan_can_atlas_2018',
+                        value: 3676.54978407445,
+                    },
+                ],
             },
-            "unmutatedBucket": [{
-                "uniqueSampleKey": "VENHQS1BQi0yODAzLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2803-03",
-                "patientId": "TCGA-AB-2803",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1788.21460808472
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODA1LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODA1OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2805-03",
-                "patientId": "TCGA-AB-2805",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1344.67858067715
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODA2LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODA2OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2806-03",
-                "patientId": "TCGA-AB-2806",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2540.32735948506
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODA3LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODA3OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2807-03",
-                "patientId": "TCGA-AB-2807",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1598.9317050419
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODA4LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODA4OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2808-03",
-                "patientId": "TCGA-AB-2808",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2061.40427018172
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODEwLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODEwOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2810-03",
-                "patientId": "TCGA-AB-2810",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2152.67057918194
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODExLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODExOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2811-03",
-                "patientId": "TCGA-AB-2811",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 624.24918630397
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODEyLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODEyOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2812-03",
-                "patientId": "TCGA-AB-2812",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1841.75214610246
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODE0LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODE0OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2814-03",
-                "patientId": "TCGA-AB-2814",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1683.19457756399
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODE1LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODE1OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2815-03",
-                "patientId": "TCGA-AB-2815",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2001.90237612469
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODE2LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODE2OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2816-03",
-                "patientId": "TCGA-AB-2816",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1236.75548752757
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODE3LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODE3OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2817-03",
-                "patientId": "TCGA-AB-2817",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2343.75827833472
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODE4LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODE4OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2818-03",
-                "patientId": "TCGA-AB-2818",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1315.45888900806
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODE5LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODE5OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2819-03",
-                "patientId": "TCGA-AB-2819",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2641.11811991005
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODIxLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODIxOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2821-03",
-                "patientId": "TCGA-AB-2821",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1975.51232008478
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODIyLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODIyOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2822-03",
-                "patientId": "TCGA-AB-2822",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1908.97942918316
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODIzLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODIzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2823-03",
-                "patientId": "TCGA-AB-2823",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1408.09488545273
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODI0LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODI0OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2824-03",
-                "patientId": "TCGA-AB-2824",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2567.96936244079
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODI1LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODI1OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2825-03",
-                "patientId": "TCGA-AB-2825",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1383.86669712374
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODI2LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODI2OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2826-03",
-                "patientId": "TCGA-AB-2826",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1674.01344676103
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODI4LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODI4OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2828-03",
-                "patientId": "TCGA-AB-2828",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2081.51850711245
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODMwLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODMwOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2830-03",
-                "patientId": "TCGA-AB-2830",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 3174.59718837311
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODMyLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODMyOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2832-03",
-                "patientId": "TCGA-AB-2832",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2639.71154964626
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODM0LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODM0OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2834-03",
-                "patientId": "TCGA-AB-2834",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2191.61245353832
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODM1LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODM1OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2835-03",
-                "patientId": "TCGA-AB-2835",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1632.62606197935
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODM2LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODM2OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2836-03",
-                "patientId": "TCGA-AB-2836",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1611.06550463004
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODM3LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODM3OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2837-03",
-                "patientId": "TCGA-AB-2837",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1311.63507520076
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODM5LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODM5OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2839-03",
-                "patientId": "TCGA-AB-2839",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1925.63450211081
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODQwLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODQwOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2840-03",
-                "patientId": "TCGA-AB-2840",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1253.1986917416
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODQxLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODQxOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2841-03",
-                "patientId": "TCGA-AB-2841",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1253.58845139798
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODQyLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODQyOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2842-03",
-                "patientId": "TCGA-AB-2842",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1215.75052973983
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODQ0LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODQ0OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2844-03",
-                "patientId": "TCGA-AB-2844",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2267.58609073223
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODQ1LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODQ1OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2845-03",
-                "patientId": "TCGA-AB-2845",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2735.70695031769
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODQ2LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODQ2OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2846-03",
-                "patientId": "TCGA-AB-2846",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1993.09392021168
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODQ4LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODQ4OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2848-03",
-                "patientId": "TCGA-AB-2848",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1188.04216802313
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODQ5LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODQ5OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2849-03",
-                "patientId": "TCGA-AB-2849",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1054.54795224178
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODUxLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODUxOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2851-03",
-                "patientId": "TCGA-AB-2851",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1694.19337687052
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODUzLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODUzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2853-03",
-                "patientId": "TCGA-AB-2853",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2082.66552795242
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODU0LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODU0OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2854-03",
-                "patientId": "TCGA-AB-2854",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1592.77859733259
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODU1LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODU1OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2855-03",
-                "patientId": "TCGA-AB-2855",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1324.85498862883
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODU4LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODU4OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2858-03",
-                "patientId": "TCGA-AB-2858",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2325.08690673244
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODU5LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODU5OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2859-03",
-                "patientId": "TCGA-AB-2859",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1648.48530924521
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODYxLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODYxOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2861-03",
-                "patientId": "TCGA-AB-2861",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2040.76473289326
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODYyLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODYyOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2862-03",
-                "patientId": "TCGA-AB-2862",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2370.2790217851
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODYzLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODYzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2863-03",
-                "patientId": "TCGA-AB-2863",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1803.45794611311
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODY1LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODY1OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2865-03",
-                "patientId": "TCGA-AB-2865",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1820.02929468688
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODY2LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODY2OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2866-03",
-                "patientId": "TCGA-AB-2866",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1868.20041144734
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODY3LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODY3OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2867-03",
-                "patientId": "TCGA-AB-2867",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1698.77907538236
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODY5LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODY5OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2869-03",
-                "patientId": "TCGA-AB-2869",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2838.7168106737
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODcwLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODcwOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2870-03",
-                "patientId": "TCGA-AB-2870",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2259.95885856607
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODcxLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODcxOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2871-03",
-                "patientId": "TCGA-AB-2871",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2201.29975547619
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODcyLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODcyOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2872-03",
-                "patientId": "TCGA-AB-2872",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1568.54456819753
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODczLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODczOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2873-03",
-                "patientId": "TCGA-AB-2873",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1252.87238067155
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODc0LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODc0OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2874-03",
-                "patientId": "TCGA-AB-2874",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1998.88494630076
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODc1LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODc1OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2875-03",
-                "patientId": "TCGA-AB-2875",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2394.39762742069
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODc3LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODc3OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2877-03",
-                "patientId": "TCGA-AB-2877",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2335.41991344316
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODc5LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODc5OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2879-03",
-                "patientId": "TCGA-AB-2879",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2698.24205966406
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODgwLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODgwOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2880-03",
-                "patientId": "TCGA-AB-2880",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2133.91566920404
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODgxLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODgxOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2881-03",
-                "patientId": "TCGA-AB-2881",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1773.75699784411
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODgyLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODgyOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2882-03",
-                "patientId": "TCGA-AB-2882",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2506.02666657686
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODg0LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODg0OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2884-03",
-                "patientId": "TCGA-AB-2884",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1585.76565899318
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODg2LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODg2OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2886-03",
-                "patientId": "TCGA-AB-2886",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1916.33562139233
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODg3LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODg3OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2887-03",
-                "patientId": "TCGA-AB-2887",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2307.80433815885
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODg4LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODg4OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2888-03",
-                "patientId": "TCGA-AB-2888",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1243.06463862956
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODg5LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODg5OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2889-03",
-                "patientId": "TCGA-AB-2889",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2112.21558451363
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODkwLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODkwOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2890-03",
-                "patientId": "TCGA-AB-2890",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1248.92034322393
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODk1LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODk1OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2895-03",
-                "patientId": "TCGA-AB-2895",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2157.07695692621
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODk2LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODk2OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2896-03",
-                "patientId": "TCGA-AB-2896",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2208.95548965813
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODk3LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODk3OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2897-03",
-                "patientId": "TCGA-AB-2897",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1797.32817297004
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODk4LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODk4OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2898-03",
-                "patientId": "TCGA-AB-2898",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1397.9420517842
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yODk5LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yODk5OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2899-03",
-                "patientId": "TCGA-AB-2899",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1837.53066101895
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTAwLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTAwOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2900-03",
-                "patientId": "TCGA-AB-2900",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1421.53459296011
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTAxLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTAxOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2901-03",
-                "patientId": "TCGA-AB-2901",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1571.95631424684
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTAzLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2903-03",
-                "patientId": "TCGA-AB-2903",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1604.80414703577
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTA5LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTA5OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2909-03",
-                "patientId": "TCGA-AB-2909",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2020.85543718553
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTEwLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTEwOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2910-03",
-                "patientId": "TCGA-AB-2910",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2509.24672510324
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTExLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTExOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2911-03",
-                "patientId": "TCGA-AB-2911",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1658.48159781717
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTEyLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTEyOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2912-03",
-                "patientId": "TCGA-AB-2912",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1999.78837178495
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTEzLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTEzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2913-03",
-                "patientId": "TCGA-AB-2913",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2167.84883763882
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTE0LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTE0OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2914-03",
-                "patientId": "TCGA-AB-2914",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2107.60987082658
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTE1LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTE1OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2915-03",
-                "patientId": "TCGA-AB-2915",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1841.05610296281
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTE2LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTE2OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2916-03",
-                "patientId": "TCGA-AB-2916",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1457.81914431299
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTE3LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTE3OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2917-03",
-                "patientId": "TCGA-AB-2917",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 787.562589276388
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTE5LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTE5OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2919-03",
-                "patientId": "TCGA-AB-2919",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2174.83726483412
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTIwLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTIwOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2920-03",
-                "patientId": "TCGA-AB-2920",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 426.671902090457
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTIxLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTIxOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2921-03",
-                "patientId": "TCGA-AB-2921",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1965.33869959136
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTI0LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTI0OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2924-03",
-                "patientId": "TCGA-AB-2924",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1517.29864192273
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTI1LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTI1OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2925-03",
-                "patientId": "TCGA-AB-2925",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2899.12774686378
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTI3LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTI3OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2927-03",
-                "patientId": "TCGA-AB-2927",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1733.81563868591
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTI4LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTI4OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2928-03",
-                "patientId": "TCGA-AB-2928",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1873.52409108823
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTI5LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTI5OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2929-03",
-                "patientId": "TCGA-AB-2929",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2258.12649044576
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTMwLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTMwOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2930-03",
-                "patientId": "TCGA-AB-2930",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2182.24085141973
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTMxLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTMxOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2931-03",
-                "patientId": "TCGA-AB-2931",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2537.85616022237
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTMyLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTMyOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2932-03",
-                "patientId": "TCGA-AB-2932",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1665.85415250103
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTMzLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTMzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2933-03",
-                "patientId": "TCGA-AB-2933",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1312.23311763241
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTM0LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTM0OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2934-03",
-                "patientId": "TCGA-AB-2934",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1352.78681027758
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTM2LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTM2OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2936-03",
-                "patientId": "TCGA-AB-2936",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1104.38112723191
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTM3LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTM3OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2937-03",
-                "patientId": "TCGA-AB-2937",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 3462.79318484978
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTM5LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTM5OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2939-03",
-                "patientId": "TCGA-AB-2939",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 3063.51008082741
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTQwLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTQwOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2940-03",
-                "patientId": "TCGA-AB-2940",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2599.68517658652
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTQyLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTQyOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2942-03",
-                "patientId": "TCGA-AB-2942",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1781.35209371164
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTQ0LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTQ0OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2944-03",
-                "patientId": "TCGA-AB-2944",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1310.54772037797
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTQ2LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTQ2OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2946-03",
-                "patientId": "TCGA-AB-2946",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1776.30680566074
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTQ4LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTQ4OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2948-03",
-                "patientId": "TCGA-AB-2948",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2117.55270494459
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTQ5LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTQ5OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2949-03",
-                "patientId": "TCGA-AB-2949",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1373.98435977826
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTUwLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTUwOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2950-03",
-                "patientId": "TCGA-AB-2950",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2074.81692571294
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTU0LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTU0OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2954-03",
-                "patientId": "TCGA-AB-2954",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2074.05824646957
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTU1LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTU1OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2955-03",
-                "patientId": "TCGA-AB-2955",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1979.3250732801
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTU2LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTU2OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2956-03",
-                "patientId": "TCGA-AB-2956",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1764.25376173983
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTU5LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTU5OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2959-03",
-                "patientId": "TCGA-AB-2959",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1345.87445301342
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTYzLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTYzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2963-03",
-                "patientId": "TCGA-AB-2963",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1881.45066184365
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTY0LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTY0OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2964-03",
-                "patientId": "TCGA-AB-2964",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2762.92891447724
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTY1LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTY1OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2965-03",
-                "patientId": "TCGA-AB-2965",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2200.20735351849
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTY2LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTY2OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2966-03",
-                "patientId": "TCGA-AB-2966",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1882.25505544704
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTY3LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTY3OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2967-03",
-                "patientId": "TCGA-AB-2967",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2073.39891648322
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTY5LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTY5OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2969-03",
-                "patientId": "TCGA-AB-2969",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2481.12208398712
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTcwLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTcwOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2970-03",
-                "patientId": "TCGA-AB-2970",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1713.85609070569
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTcxLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTcxOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2971-03",
-                "patientId": "TCGA-AB-2971",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1745.70739023164
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTcyLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTcyOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2972-03",
-                "patientId": "TCGA-AB-2972",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2117.06505322917
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTczLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTczOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2973-03",
-                "patientId": "TCGA-AB-2973",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1415.73860352769
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTc1LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTc1OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2975-03",
-                "patientId": "TCGA-AB-2975",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2151.88500923068
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTc2LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTc2OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2976-03",
-                "patientId": "TCGA-AB-2976",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2053.37444552453
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTc3LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTc3OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2977-03",
-                "patientId": "TCGA-AB-2977",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1698.1278572711
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTc4LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTc4OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2978-03",
-                "patientId": "TCGA-AB-2978",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2042.63454596292
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTgwLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTgwOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2980-03",
-                "patientId": "TCGA-AB-2980",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2006.16647353876
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTgyLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTgyOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2982-03",
-                "patientId": "TCGA-AB-2982",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1703.80786686657
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTgzLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTgzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2983-03",
-                "patientId": "TCGA-AB-2983",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2253.70348950725
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTg0LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTg0OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2984-03",
-                "patientId": "TCGA-AB-2984",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 5294.60157561752
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTg1LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTg1OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2985-03",
-                "patientId": "TCGA-AB-2985",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1280.90576164835
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTg2LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTg2OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2986-03",
-                "patientId": "TCGA-AB-2986",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 3106.35421390278
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTg3LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTg3OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2987-03",
-                "patientId": "TCGA-AB-2987",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1308.4907900295
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTg4LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTg4OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2988-03",
-                "patientId": "TCGA-AB-2988",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1850.79149845405
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTkwLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTkwOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2990-03",
-                "patientId": "TCGA-AB-2990",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1851.16210521772
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTkxLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTkxOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2991-03",
-                "patientId": "TCGA-AB-2991",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1951.00825996249
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTkyLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTkyOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2992-03",
-                "patientId": "TCGA-AB-2992",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1498.18012440288
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTkzLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTkzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2993-03",
-                "patientId": "TCGA-AB-2993",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2490.80089427716
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTk0LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTk0OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2994-03",
-                "patientId": "TCGA-AB-2994",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 795.090382923908
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTk1LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTk1OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2995-03",
-                "patientId": "TCGA-AB-2995",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2518.40163368769
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTk2LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTk2OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2996-03",
-                "patientId": "TCGA-AB-2996",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2335.69966719483
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTk4LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTk4OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2998-03",
-                "patientId": "TCGA-AB-2998",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1580.42662970776
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0yOTk5LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0yOTk5OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-2999-03",
-                "patientId": "TCGA-AB-2999",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1531.844589731
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0zMDAwLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0zMDAwOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-3000-03",
-                "patientId": "TCGA-AB-3000",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2742.81909818936
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0zMDAxLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0zMDAxOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-3001-03",
-                "patientId": "TCGA-AB-3001",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1467.50721737233
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0zMDAyLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0zMDAyOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-3002-03",
-                "patientId": "TCGA-AB-3002",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1451.67105608046
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0zMDA1LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0zMDA1OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-3005-03",
-                "patientId": "TCGA-AB-3005",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2650.43200590934
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0zMDA2LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0zMDA2OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-3006-03",
-                "patientId": "TCGA-AB-3006",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2813.46480265146
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0zMDA3LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0zMDA3OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-3007-03",
-                "patientId": "TCGA-AB-3007",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2044.87469252051
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0zMDA4LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0zMDA4OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-3008-03",
-                "patientId": "TCGA-AB-3008",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 3090.94450099928
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0zMDA5LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0zMDA5OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-3009-03",
-                "patientId": "TCGA-AB-3009",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2044.63983926182
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0zMDExLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0zMDExOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-3011-03",
-                "patientId": "TCGA-AB-3011",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 2310.5118505363
-            }, {
-                "uniqueSampleKey": "VENHQS1BQi0zMDEyLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "uniquePatientKey": "VENHQS1BQi0zMDEyOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                "entrezGeneId": 7157,
-                "molecularProfileId": "laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median",
-                "sampleId": "TCGA-AB-3012-03",
-                "patientId": "TCGA-AB-3012",
-                "studyId": "laml_tcga_pan_can_atlas_2018",
-                "value": 1683.52925246819
-            }],
-            "unsequencedBucket": []
+            unmutatedBucket: [
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODAzLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2803-03',
+                    patientId: 'TCGA-AB-2803',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1788.21460808472,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODA1LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODA1OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2805-03',
+                    patientId: 'TCGA-AB-2805',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1344.67858067715,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODA2LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODA2OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2806-03',
+                    patientId: 'TCGA-AB-2806',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2540.32735948506,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODA3LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODA3OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2807-03',
+                    patientId: 'TCGA-AB-2807',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1598.9317050419,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODA4LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODA4OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2808-03',
+                    patientId: 'TCGA-AB-2808',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2061.40427018172,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODEwLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODEwOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2810-03',
+                    patientId: 'TCGA-AB-2810',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2152.67057918194,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODExLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODExOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2811-03',
+                    patientId: 'TCGA-AB-2811',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 624.24918630397,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODEyLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODEyOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2812-03',
+                    patientId: 'TCGA-AB-2812',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1841.75214610246,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODE0LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODE0OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2814-03',
+                    patientId: 'TCGA-AB-2814',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1683.19457756399,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODE1LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODE1OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2815-03',
+                    patientId: 'TCGA-AB-2815',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2001.90237612469,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODE2LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODE2OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2816-03',
+                    patientId: 'TCGA-AB-2816',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1236.75548752757,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODE3LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODE3OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2817-03',
+                    patientId: 'TCGA-AB-2817',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2343.75827833472,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODE4LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODE4OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2818-03',
+                    patientId: 'TCGA-AB-2818',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1315.45888900806,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODE5LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODE5OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2819-03',
+                    patientId: 'TCGA-AB-2819',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2641.11811991005,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODIxLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODIxOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2821-03',
+                    patientId: 'TCGA-AB-2821',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1975.51232008478,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODIyLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODIyOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2822-03',
+                    patientId: 'TCGA-AB-2822',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1908.97942918316,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODIzLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODIzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2823-03',
+                    patientId: 'TCGA-AB-2823',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1408.09488545273,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODI0LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODI0OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2824-03',
+                    patientId: 'TCGA-AB-2824',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2567.96936244079,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODI1LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODI1OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2825-03',
+                    patientId: 'TCGA-AB-2825',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1383.86669712374,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODI2LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODI2OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2826-03',
+                    patientId: 'TCGA-AB-2826',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1674.01344676103,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODI4LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODI4OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2828-03',
+                    patientId: 'TCGA-AB-2828',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2081.51850711245,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODMwLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODMwOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2830-03',
+                    patientId: 'TCGA-AB-2830',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 3174.59718837311,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODMyLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODMyOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2832-03',
+                    patientId: 'TCGA-AB-2832',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2639.71154964626,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODM0LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODM0OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2834-03',
+                    patientId: 'TCGA-AB-2834',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2191.61245353832,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODM1LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODM1OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2835-03',
+                    patientId: 'TCGA-AB-2835',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1632.62606197935,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODM2LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODM2OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2836-03',
+                    patientId: 'TCGA-AB-2836',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1611.06550463004,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODM3LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODM3OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2837-03',
+                    patientId: 'TCGA-AB-2837',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1311.63507520076,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODM5LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODM5OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2839-03',
+                    patientId: 'TCGA-AB-2839',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1925.63450211081,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODQwLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODQwOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2840-03',
+                    patientId: 'TCGA-AB-2840',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1253.1986917416,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODQxLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODQxOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2841-03',
+                    patientId: 'TCGA-AB-2841',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1253.58845139798,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODQyLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODQyOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2842-03',
+                    patientId: 'TCGA-AB-2842',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1215.75052973983,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODQ0LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODQ0OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2844-03',
+                    patientId: 'TCGA-AB-2844',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2267.58609073223,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODQ1LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODQ1OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2845-03',
+                    patientId: 'TCGA-AB-2845',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2735.70695031769,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODQ2LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODQ2OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2846-03',
+                    patientId: 'TCGA-AB-2846',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1993.09392021168,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODQ4LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODQ4OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2848-03',
+                    patientId: 'TCGA-AB-2848',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1188.04216802313,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODQ5LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODQ5OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2849-03',
+                    patientId: 'TCGA-AB-2849',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1054.54795224178,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODUxLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODUxOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2851-03',
+                    patientId: 'TCGA-AB-2851',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1694.19337687052,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODUzLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODUzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2853-03',
+                    patientId: 'TCGA-AB-2853',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2082.66552795242,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODU0LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODU0OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2854-03',
+                    patientId: 'TCGA-AB-2854',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1592.77859733259,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODU1LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODU1OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2855-03',
+                    patientId: 'TCGA-AB-2855',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1324.85498862883,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODU4LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODU4OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2858-03',
+                    patientId: 'TCGA-AB-2858',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2325.08690673244,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODU5LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODU5OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2859-03',
+                    patientId: 'TCGA-AB-2859',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1648.48530924521,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODYxLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODYxOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2861-03',
+                    patientId: 'TCGA-AB-2861',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2040.76473289326,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODYyLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODYyOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2862-03',
+                    patientId: 'TCGA-AB-2862',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2370.2790217851,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODYzLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODYzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2863-03',
+                    patientId: 'TCGA-AB-2863',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1803.45794611311,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODY1LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODY1OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2865-03',
+                    patientId: 'TCGA-AB-2865',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1820.02929468688,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODY2LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODY2OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2866-03',
+                    patientId: 'TCGA-AB-2866',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1868.20041144734,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODY3LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODY3OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2867-03',
+                    patientId: 'TCGA-AB-2867',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1698.77907538236,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODY5LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODY5OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2869-03',
+                    patientId: 'TCGA-AB-2869',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2838.7168106737,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODcwLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODcwOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2870-03',
+                    patientId: 'TCGA-AB-2870',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2259.95885856607,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODcxLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODcxOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2871-03',
+                    patientId: 'TCGA-AB-2871',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2201.29975547619,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODcyLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODcyOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2872-03',
+                    patientId: 'TCGA-AB-2872',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1568.54456819753,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODczLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODczOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2873-03',
+                    patientId: 'TCGA-AB-2873',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1252.87238067155,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODc0LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODc0OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2874-03',
+                    patientId: 'TCGA-AB-2874',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1998.88494630076,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODc1LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODc1OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2875-03',
+                    patientId: 'TCGA-AB-2875',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2394.39762742069,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODc3LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODc3OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2877-03',
+                    patientId: 'TCGA-AB-2877',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2335.41991344316,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODc5LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODc5OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2879-03',
+                    patientId: 'TCGA-AB-2879',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2698.24205966406,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODgwLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODgwOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2880-03',
+                    patientId: 'TCGA-AB-2880',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2133.91566920404,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODgxLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODgxOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2881-03',
+                    patientId: 'TCGA-AB-2881',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1773.75699784411,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODgyLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODgyOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2882-03',
+                    patientId: 'TCGA-AB-2882',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2506.02666657686,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODg0LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODg0OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2884-03',
+                    patientId: 'TCGA-AB-2884',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1585.76565899318,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODg2LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODg2OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2886-03',
+                    patientId: 'TCGA-AB-2886',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1916.33562139233,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODg3LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODg3OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2887-03',
+                    patientId: 'TCGA-AB-2887',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2307.80433815885,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODg4LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODg4OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2888-03',
+                    patientId: 'TCGA-AB-2888',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1243.06463862956,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODg5LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODg5OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2889-03',
+                    patientId: 'TCGA-AB-2889',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2112.21558451363,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODkwLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODkwOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2890-03',
+                    patientId: 'TCGA-AB-2890',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1248.92034322393,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODk1LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODk1OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2895-03',
+                    patientId: 'TCGA-AB-2895',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2157.07695692621,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODk2LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODk2OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2896-03',
+                    patientId: 'TCGA-AB-2896',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2208.95548965813,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODk3LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODk3OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2897-03',
+                    patientId: 'TCGA-AB-2897',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1797.32817297004,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODk4LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODk4OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2898-03',
+                    patientId: 'TCGA-AB-2898',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1397.9420517842,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yODk5LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yODk5OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2899-03',
+                    patientId: 'TCGA-AB-2899',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1837.53066101895,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTAwLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTAwOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2900-03',
+                    patientId: 'TCGA-AB-2900',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1421.53459296011,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTAxLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTAxOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2901-03',
+                    patientId: 'TCGA-AB-2901',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1571.95631424684,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTAzLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2903-03',
+                    patientId: 'TCGA-AB-2903',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1604.80414703577,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTA5LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTA5OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2909-03',
+                    patientId: 'TCGA-AB-2909',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2020.85543718553,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTEwLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTEwOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2910-03',
+                    patientId: 'TCGA-AB-2910',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2509.24672510324,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTExLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTExOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2911-03',
+                    patientId: 'TCGA-AB-2911',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1658.48159781717,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTEyLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTEyOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2912-03',
+                    patientId: 'TCGA-AB-2912',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1999.78837178495,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTEzLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTEzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2913-03',
+                    patientId: 'TCGA-AB-2913',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2167.84883763882,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTE0LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTE0OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2914-03',
+                    patientId: 'TCGA-AB-2914',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2107.60987082658,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTE1LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTE1OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2915-03',
+                    patientId: 'TCGA-AB-2915',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1841.05610296281,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTE2LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTE2OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2916-03',
+                    patientId: 'TCGA-AB-2916',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1457.81914431299,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTE3LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTE3OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2917-03',
+                    patientId: 'TCGA-AB-2917',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 787.562589276388,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTE5LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTE5OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2919-03',
+                    patientId: 'TCGA-AB-2919',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2174.83726483412,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTIwLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTIwOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2920-03',
+                    patientId: 'TCGA-AB-2920',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 426.671902090457,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTIxLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTIxOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2921-03',
+                    patientId: 'TCGA-AB-2921',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1965.33869959136,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTI0LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTI0OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2924-03',
+                    patientId: 'TCGA-AB-2924',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1517.29864192273,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTI1LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTI1OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2925-03',
+                    patientId: 'TCGA-AB-2925',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2899.12774686378,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTI3LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTI3OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2927-03',
+                    patientId: 'TCGA-AB-2927',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1733.81563868591,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTI4LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTI4OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2928-03',
+                    patientId: 'TCGA-AB-2928',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1873.52409108823,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTI5LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTI5OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2929-03',
+                    patientId: 'TCGA-AB-2929',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2258.12649044576,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTMwLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTMwOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2930-03',
+                    patientId: 'TCGA-AB-2930',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2182.24085141973,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTMxLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTMxOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2931-03',
+                    patientId: 'TCGA-AB-2931',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2537.85616022237,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTMyLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTMyOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2932-03',
+                    patientId: 'TCGA-AB-2932',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1665.85415250103,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTMzLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTMzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2933-03',
+                    patientId: 'TCGA-AB-2933',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1312.23311763241,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTM0LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTM0OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2934-03',
+                    patientId: 'TCGA-AB-2934',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1352.78681027758,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTM2LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTM2OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2936-03',
+                    patientId: 'TCGA-AB-2936',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1104.38112723191,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTM3LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTM3OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2937-03',
+                    patientId: 'TCGA-AB-2937',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 3462.79318484978,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTM5LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTM5OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2939-03',
+                    patientId: 'TCGA-AB-2939',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 3063.51008082741,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTQwLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTQwOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2940-03',
+                    patientId: 'TCGA-AB-2940',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2599.68517658652,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTQyLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTQyOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2942-03',
+                    patientId: 'TCGA-AB-2942',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1781.35209371164,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTQ0LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTQ0OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2944-03',
+                    patientId: 'TCGA-AB-2944',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1310.54772037797,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTQ2LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTQ2OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2946-03',
+                    patientId: 'TCGA-AB-2946',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1776.30680566074,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTQ4LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTQ4OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2948-03',
+                    patientId: 'TCGA-AB-2948',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2117.55270494459,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTQ5LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTQ5OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2949-03',
+                    patientId: 'TCGA-AB-2949',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1373.98435977826,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTUwLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTUwOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2950-03',
+                    patientId: 'TCGA-AB-2950',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2074.81692571294,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTU0LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTU0OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2954-03',
+                    patientId: 'TCGA-AB-2954',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2074.05824646957,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTU1LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTU1OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2955-03',
+                    patientId: 'TCGA-AB-2955',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1979.3250732801,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTU2LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTU2OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2956-03',
+                    patientId: 'TCGA-AB-2956',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1764.25376173983,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTU5LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTU5OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2959-03',
+                    patientId: 'TCGA-AB-2959',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1345.87445301342,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTYzLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTYzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2963-03',
+                    patientId: 'TCGA-AB-2963',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1881.45066184365,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTY0LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTY0OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2964-03',
+                    patientId: 'TCGA-AB-2964',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2762.92891447724,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTY1LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTY1OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2965-03',
+                    patientId: 'TCGA-AB-2965',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2200.20735351849,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTY2LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTY2OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2966-03',
+                    patientId: 'TCGA-AB-2966',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1882.25505544704,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTY3LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTY3OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2967-03',
+                    patientId: 'TCGA-AB-2967',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2073.39891648322,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTY5LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTY5OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2969-03',
+                    patientId: 'TCGA-AB-2969',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2481.12208398712,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTcwLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTcwOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2970-03',
+                    patientId: 'TCGA-AB-2970',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1713.85609070569,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTcxLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTcxOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2971-03',
+                    patientId: 'TCGA-AB-2971',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1745.70739023164,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTcyLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTcyOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2972-03',
+                    patientId: 'TCGA-AB-2972',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2117.06505322917,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTczLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTczOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2973-03',
+                    patientId: 'TCGA-AB-2973',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1415.73860352769,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTc1LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTc1OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2975-03',
+                    patientId: 'TCGA-AB-2975',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2151.88500923068,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTc2LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTc2OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2976-03',
+                    patientId: 'TCGA-AB-2976',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2053.37444552453,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTc3LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTc3OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2977-03',
+                    patientId: 'TCGA-AB-2977',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1698.1278572711,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTc4LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTc4OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2978-03',
+                    patientId: 'TCGA-AB-2978',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2042.63454596292,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTgwLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTgwOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2980-03',
+                    patientId: 'TCGA-AB-2980',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2006.16647353876,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTgyLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTgyOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2982-03',
+                    patientId: 'TCGA-AB-2982',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1703.80786686657,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTgzLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTgzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2983-03',
+                    patientId: 'TCGA-AB-2983',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2253.70348950725,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTg0LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTg0OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2984-03',
+                    patientId: 'TCGA-AB-2984',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 5294.60157561752,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTg1LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTg1OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2985-03',
+                    patientId: 'TCGA-AB-2985',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1280.90576164835,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTg2LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTg2OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2986-03',
+                    patientId: 'TCGA-AB-2986',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 3106.35421390278,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTg3LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTg3OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2987-03',
+                    patientId: 'TCGA-AB-2987',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1308.4907900295,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTg4LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTg4OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2988-03',
+                    patientId: 'TCGA-AB-2988',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1850.79149845405,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTkwLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTkwOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2990-03',
+                    patientId: 'TCGA-AB-2990',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1851.16210521772,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTkxLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTkxOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2991-03',
+                    patientId: 'TCGA-AB-2991',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1951.00825996249,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTkyLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTkyOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2992-03',
+                    patientId: 'TCGA-AB-2992',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1498.18012440288,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTkzLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTkzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2993-03',
+                    patientId: 'TCGA-AB-2993',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2490.80089427716,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTk0LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTk0OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2994-03',
+                    patientId: 'TCGA-AB-2994',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 795.090382923908,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTk1LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTk1OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2995-03',
+                    patientId: 'TCGA-AB-2995',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2518.40163368769,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTk2LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTk2OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2996-03',
+                    patientId: 'TCGA-AB-2996',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2335.69966719483,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTk4LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTk4OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2998-03',
+                    patientId: 'TCGA-AB-2998',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1580.42662970776,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0yOTk5LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0yOTk5OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-2999-03',
+                    patientId: 'TCGA-AB-2999',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1531.844589731,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0zMDAwLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0zMDAwOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-3000-03',
+                    patientId: 'TCGA-AB-3000',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2742.81909818936,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0zMDAxLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0zMDAxOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-3001-03',
+                    patientId: 'TCGA-AB-3001',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1467.50721737233,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0zMDAyLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0zMDAyOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-3002-03',
+                    patientId: 'TCGA-AB-3002',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1451.67105608046,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0zMDA1LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0zMDA1OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-3005-03',
+                    patientId: 'TCGA-AB-3005',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2650.43200590934,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0zMDA2LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0zMDA2OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-3006-03',
+                    patientId: 'TCGA-AB-3006',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2813.46480265146,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0zMDA3LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0zMDA3OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-3007-03',
+                    patientId: 'TCGA-AB-3007',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2044.87469252051,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0zMDA4LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0zMDA4OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-3008-03',
+                    patientId: 'TCGA-AB-3008',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 3090.94450099928,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0zMDA5LTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0zMDA5OmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-3009-03',
+                    patientId: 'TCGA-AB-3009',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2044.63983926182,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0zMDExLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0zMDExOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-3011-03',
+                    patientId: 'TCGA-AB-3011',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 2310.5118505363,
+                },
+                {
+                    uniqueSampleKey:
+                        'VENHQS1BQi0zMDEyLTAzOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    uniquePatientKey:
+                        'VENHQS1BQi0zMDEyOmxhbWxfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                    entrezGeneId: 7157,
+                    molecularProfileId:
+                        'laml_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                    sampleId: 'TCGA-AB-3012-03',
+                    patientId: 'TCGA-AB-3012',
+                    studyId: 'laml_tcga_pan_can_atlas_2018',
+                    value: 1683.52925246819,
+                },
+            ],
+            unsequencedBucket: [],
         };
     });
 
     it('should assign items to appropriate mutation buckets', () => {
         let showMutations = true;
-        let hugoGeneSymbol = "TP53";
-        const ret = getMolecularDataBuckets(sampleMolecularData, showMutations, mutationsKeyedBySampleId, coverageInformation, hugoGeneSymbol);
+        let hugoGeneSymbol = 'TP53';
+        const ret = getMolecularDataBuckets(
+            sampleMolecularData,
+            showMutations,
+            mutationsKeyedBySampleId,
+            coverageInformation,
+            hugoGeneSymbol
+        );
         assert.deepEqual(ret, expectedResult);
-    })
+    });
 
     it('all items in unMutated collection if we are not showing mutations', () => {
         let showMutations = false;
-        let hugoGeneSymbol = "TP53";
-        const ret = getMolecularDataBuckets(sampleMolecularData, showMutations, mutationsKeyedBySampleId, coverageInformation, hugoGeneSymbol);
-        assert.deepEqual(ret.mutationBuckets, {}, "no mutations recorded");
-        assert.equal(ret.unsequencedBucket.length,0, "no unsequeced mutations");
+        let hugoGeneSymbol = 'TP53';
+        const ret = getMolecularDataBuckets(
+            sampleMolecularData,
+            showMutations,
+            mutationsKeyedBySampleId,
+            coverageInformation,
+            hugoGeneSymbol
+        );
+        assert.deepEqual(ret.mutationBuckets, {}, 'no mutations recorded');
+        assert.equal(
+            ret.unsequencedBucket.length,
+            0,
+            'no unsequeced mutations'
+        );
         assert.equal(ret.unmutatedBucket.length, sampleStudyData.length);
     });
 
-
-    it('puts unmutated items in unsequenced bucket if they don\'t appear in coverage info', () => {
+    it("puts unmutated items in unsequenced bucket if they don't appear in coverage info", () => {
         let showMutations = true;
-        let hugoGeneSymbol = "TP53";
+        let hugoGeneSymbol = 'TP53';
         let emptyCoverageInformation = {
-            samples: {}
+            samples: {},
         } as CoverageInformation;
-        const ret = getMolecularDataBuckets(sampleMolecularData, showMutations, mutationsKeyedBySampleId, emptyCoverageInformation, hugoGeneSymbol);
-        assert.deepEqual(ret.mutationBuckets, expectedResult.mutationBuckets, "mutations are recorded");
-        assert.equal(ret.unsequencedBucket.length,151, "categorized as unsequenced mutations");
+        const ret = getMolecularDataBuckets(
+            sampleMolecularData,
+            showMutations,
+            mutationsKeyedBySampleId,
+            emptyCoverageInformation,
+            hugoGeneSymbol
+        );
+        assert.deepEqual(
+            ret.mutationBuckets,
+            expectedResult.mutationBuckets,
+            'mutations are recorded'
+        );
+        assert.equal(
+            ret.unsequencedBucket.length,
+            151,
+            'categorized as unsequenced mutations'
+        );
     });
-
-
 });
 
-
-describe('prioritizeMutations',()=>{
-
-    it('reorders mutations appropriately',()=>{
+describe('prioritizeMutations', () => {
+    it('reorders mutations appropriately', () => {
         const mutations = [
-            {"mutationType":"Missense_Mutation"} as Mutation,
-            {"mutationType":"Splice_Region"} as Mutation
+            { mutationType: 'Missense_Mutation' } as Mutation,
+            { mutationType: 'Splice_Region' } as Mutation,
         ];
-        assert.deepEqual(prioritizeMutations(mutations), [{"mutationType":"Splice_Region"},{"mutationType":"Missense_Mutation"}] as Mutation[])
+        assert.deepEqual(prioritizeMutations(mutations), [
+            { mutationType: 'Splice_Region' },
+            { mutationType: 'Missense_Mutation' },
+        ] as Mutation[]);
     });
 
-    it('maintains mutation order appropriately',()=>{
+    it('maintains mutation order appropriately', () => {
         const mutations = [
-            {"mutationType":"Splice_Region"} as Mutation,
-            {"mutationType":"Missense_Mutation"} as Mutation
+            { mutationType: 'Splice_Region' } as Mutation,
+            { mutationType: 'Missense_Mutation' } as Mutation,
         ];
-        assert.deepEqual(prioritizeMutations(mutations), [{"mutationType":"Splice_Region"},{"mutationType":"Missense_Mutation"}] as Mutation[])
+        assert.deepEqual(prioritizeMutations(mutations), [
+            { mutationType: 'Splice_Region' },
+            { mutationType: 'Missense_Mutation' },
+        ] as Mutation[]);
     });
 
-    it('reorders mutation appropriately with three mutations',()=>{
+    it('reorders mutation appropriately with three mutations', () => {
         const mutations = [
-            {"mutationType":"Missense_Mutation"} as Mutation,
-            {"mutationType":"Splice_Region"} as Mutation,
-            {"mutationType":"in_frame_insertion"} as Mutation,
+            { mutationType: 'Missense_Mutation' } as Mutation,
+            { mutationType: 'Splice_Region' } as Mutation,
+            { mutationType: 'in_frame_insertion' } as Mutation,
         ];
-        assert.deepEqual(prioritizeMutations(mutations), [{"mutationType":"Splice_Region"}, {"mutationType":"in_frame_insertion"}, {"mutationType":"Missense_Mutation"}] as Mutation[])
+        assert.deepEqual(prioritizeMutations(mutations), [
+            { mutationType: 'Splice_Region' },
+            { mutationType: 'in_frame_insertion' },
+            { mutationType: 'Missense_Mutation' },
+        ] as Mutation[]);
     });
-
 });
 
 describe('getPossibleRNASeqVersions', () => {
     it('return appropriate RNA seq version options', () => {
-        assert.deepEqual(getPossibleRNASeqVersions([{ "molecularProfileId": "" }]), [])
-        assert.deepEqual(getPossibleRNASeqVersions([{ "molecularProfileId": "acc_tcga_rna_seq_v2_mrna" }]), [{"label":"RNA Seq V2","value":"rna_seq_v2_mrna"}])
-        assert.deepEqual(getPossibleRNASeqVersions([{ "molecularProfileId": "laml_tcga_rna_seq_mrna" }]), [{"label":"RNA Seq","value":"rna_seq_mrna"}])
-        assert.deepEqual(getPossibleRNASeqVersions([{ "molecularProfileId": "acc_tcga_rna_seq_v2_mrna" }, { "molecularProfileId": "laml_tcga_rna_seq_mrna" }]), [{"label":"RNA Seq V2","value":"rna_seq_v2_mrna"},{"label":"RNA Seq","value":"rna_seq_mrna"}])
+        assert.deepEqual(
+            getPossibleRNASeqVersions([{ molecularProfileId: '' }]),
+            []
+        );
+        assert.deepEqual(
+            getPossibleRNASeqVersions([
+                { molecularProfileId: 'acc_tcga_rna_seq_v2_mrna' },
+            ]),
+            [{ label: 'RNA Seq V2', value: 'rna_seq_v2_mrna' }]
+        );
+        assert.deepEqual(
+            getPossibleRNASeqVersions([
+                { molecularProfileId: 'laml_tcga_rna_seq_mrna' },
+            ]),
+            [{ label: 'RNA Seq', value: 'rna_seq_mrna' }]
+        );
+        assert.deepEqual(
+            getPossibleRNASeqVersions([
+                { molecularProfileId: 'acc_tcga_rna_seq_v2_mrna' },
+                { molecularProfileId: 'laml_tcga_rna_seq_mrna' },
+            ]),
+            [
+                { label: 'RNA Seq V2', value: 'rna_seq_v2_mrna' },
+                { label: 'RNA Seq', value: 'rna_seq_mrna' },
+            ]
+        );
     });
 });
diff --git a/src/pages/resultsView/expression/expressionHelpers.tsx b/src/pages/resultsView/expression/expressionHelpers.tsx
index 13f72cf91b3..3bfb74585c3 100644
--- a/src/pages/resultsView/expression/expressionHelpers.tsx
+++ b/src/pages/resultsView/expression/expressionHelpers.tsx
@@ -1,23 +1,30 @@
 import * as _ from 'lodash';
 import {
-    CancerStudy, GenePanelData, Mutation,
+    CancerStudy,
+    GenePanelData,
+    Mutation,
     NumericGeneMolecularData,
-    MolecularProfile
-} from "../../../shared/api/generated/CBioPortalAPI";
-import {CoverageInformation} from "../ResultsViewPageStoreUtils";
-import {isSampleProfiled} from "../../../shared/lib/isSampleProfiled";
-import {getOncoprintMutationType} from "../../../shared/components/oncoprint/DataUtils";
+    MolecularProfile,
+} from '../../../shared/api/generated/CBioPortalAPI';
+import { CoverageInformation } from '../ResultsViewPageStoreUtils';
+import { isSampleProfiled } from '../../../shared/lib/isSampleProfiled';
+import { getOncoprintMutationType } from '../../../shared/components/oncoprint/DataUtils';
 import {
-    IBoxScatterPlotPoint, mutationRenderPriority, tooltipCnaSection,
-    tooltipMutationsSection
-} from "../plots/PlotsTabUtils";
+    IBoxScatterPlotPoint,
+    mutationRenderPriority,
+    tooltipCnaSection,
+    tooltipMutationsSection,
+} from '../plots/PlotsTabUtils';
 import {
-    MUT_COLOR_FUSION, MUT_COLOR_INFRAME,
-    MUT_COLOR_MISSENSE, MUT_COLOR_PROMOTER, MUT_COLOR_TRUNC
-} from "shared/lib/Colors";
-import {getJitterForCase} from "../../../shared/components/plots/PlotUtils";
-import * as React from "react";
-import {getSampleViewUrl, getStudySummaryUrl} from "../../../shared/api/urls";
+    MUT_COLOR_FUSION,
+    MUT_COLOR_INFRAME,
+    MUT_COLOR_MISSENSE,
+    MUT_COLOR_PROMOTER,
+    MUT_COLOR_TRUNC,
+} from 'shared/lib/Colors';
+import { getJitterForCase } from '../../../shared/components/plots/PlotUtils';
+import * as React from 'react';
+import { getSampleViewUrl, getStudySummaryUrl } from '../../../shared/api/urls';
 
 export type ExpressionStyle = {
     typeName: string;
@@ -27,132 +34,144 @@ export type ExpressionStyle = {
     legendText: string;
 };
 
-
 export interface MolecularDataBuckets {
     mutationBuckets: { [mutationType: string]: NumericGeneMolecularData[] };
-    unmutatedBucket: NumericGeneMolecularData[],
-    unsequencedBucket: NumericGeneMolecularData[]
-};
+    unmutatedBucket: NumericGeneMolecularData[];
+    unsequencedBucket: NumericGeneMolecularData[];
+}
 
 enum VictoryShapeType {
-
-    circle = "circle",
-    diamond = "diamond",
-    plus = "plus",
-    square = "square",
-    star = "star",
-    triangleDown = "triangleDown",
-    triangleUp = "triangleUp"
-
+    circle = 'circle',
+    diamond = 'diamond',
+    plus = 'plus',
+    square = 'square',
+    star = 'star',
+    triangleDown = 'triangleDown',
+    triangleUp = 'triangleUp',
 }
 
-export const ExpressionStyleSheet: { [mutationType:string]:ExpressionStyle } = {
+export const ExpressionStyleSheet: {
+    [mutationType: string]: ExpressionStyle;
+} = {
     missense: {
-        typeName: "Missense",
+        typeName: 'Missense',
         symbol: VictoryShapeType.circle,
         fill: MUT_COLOR_MISSENSE,
-        stroke: "#000000",
-        legendText: "Missense"
+        stroke: '#000000',
+        legendText: 'Missense',
     },
     inframe: {
-        typeName:"Inframe",
-        symbol : VictoryShapeType.circle,
+        typeName: 'Inframe',
+        symbol: VictoryShapeType.circle,
         fill: MUT_COLOR_INFRAME,
-        stroke : "#000000",
-        legendText : "Inframe"
+        stroke: '#000000',
+        legendText: 'Inframe',
     },
-    fusion:{
-        typeName:"Fusion",
+    fusion: {
+        typeName: 'Fusion',
         symbol: VictoryShapeType.circle,
         fill: MUT_COLOR_FUSION,
-        stroke: "#000000",
-        legendText: "Fusion"
+        stroke: '#000000',
+        legendText: 'Fusion',
     },
-    trunc:{
-        typeName:"Truncating",
+    trunc: {
+        typeName: 'Truncating',
         symbol: VictoryShapeType.circle,
         fill: MUT_COLOR_TRUNC,
-        stroke: "#000000",
-        legendText: "Truncating"
+        stroke: '#000000',
+        legendText: 'Truncating',
     },
-    promoter:{
-        typeName:"Promoter",
+    promoter: {
+        typeName: 'Promoter',
         symbol: VictoryShapeType.circle,
         fill: MUT_COLOR_PROMOTER,
-        stroke: "#000000",
-        legendText: "Promoter"
+        stroke: '#000000',
+        legendText: 'Promoter',
     },
     one_mut: {
-        typeName: "one_mut",
+        typeName: 'one_mut',
         symbol: VictoryShapeType.circle,
-        fill: "#DBA901",
-        stroke: "#886A08",
-        legendText: "One Gene mutated"
+        fill: '#DBA901',
+        stroke: '#886A08',
+        legendText: 'One Gene mutated',
     },
     both_mut: {
-        typeName: "both_mut",
+        typeName: 'both_mut',
         symbol: VictoryShapeType.circle,
-        fill: "#FF0000",
-        stroke: "#B40404",
-        legendText: "Both mutated"
+        fill: '#FF0000',
+        stroke: '#B40404',
+        legendText: 'Both mutated',
     },
     not_showing_mut: {
-        typeName: "not_showing_mut",
+        typeName: 'not_showing_mut',
         symbol: VictoryShapeType.circle,
-        fill: "#00AAF8",
-        stroke: "#0089C6",
-        legendText:"shouldnt be in legend"
+        fill: '#00AAF8',
+        stroke: '#0089C6',
+        legendText: 'shouldnt be in legend',
     },
     non_mut: {
-        typeName: "non_mut",
+        typeName: 'non_mut',
         symbol: VictoryShapeType.circle,
-        fill: "#e3e3e3",
-        stroke: "#000000",
-        legendText: "Not mutated"
+        fill: '#e3e3e3',
+        stroke: '#000000',
+        legendText: 'Not mutated',
     },
     non_sequenced: {
-        typeName: "non_sequenced",
+        typeName: 'non_sequenced',
         symbol: VictoryShapeType.circle,
-        fill: "white",
-        stroke: "gray",
-        legendText: "Not sequenced"
-    }
-
+        fill: 'white',
+        stroke: 'gray',
+        legendText: 'Not sequenced',
+    },
 };
 
-export const RNASeqOptions = [{
-    label: 'RNA Seq V2',
-    value: 'rna_seq_v2_mrna'
-}, {
-    label: 'RNA Seq',
-    value: 'rna_seq_mrna'
-}];
+export const RNASeqOptions = [
+    {
+        label: 'RNA Seq V2',
+        value: 'rna_seq_v2_mrna',
+    },
+    {
+        label: 'RNA Seq',
+        value: 'rna_seq_mrna',
+    },
+];
 
-export function getExpressionStyle(mutationType: string){
+export function getExpressionStyle(mutationType: string) {
     return ExpressionStyleSheet[mutationType];
 }
 
 // this function classifies molecular data by corresponding mutation type or
 // non-mutated or non-sequenced status
 
-export function getMolecularDataBuckets(studyData: NumericGeneMolecularData[],
-                                 showMutations: boolean,
-                                 mutationsKeyedBySampleId: { [sampleId: string]: Pick<Mutation, "proteinChange" | "mutationType"> },
-                                 coverageInformation:CoverageInformation,
-                                        hugoGeneSymbol:string
-                                        ):MolecularDataBuckets {
-
+export function getMolecularDataBuckets(
+    studyData: NumericGeneMolecularData[],
+    showMutations: boolean,
+    mutationsKeyedBySampleId: {
+        [sampleId: string]: Pick<Mutation, 'proteinChange' | 'mutationType'>;
+    },
+    coverageInformation: CoverageInformation,
+    hugoGeneSymbol: string
+): MolecularDataBuckets {
     // if mutation mode is on, we want to fill buckets by mutation type (or unmutated)
-    const mutationModeInteratee = (memo: MolecularDataBuckets, molecularData: NumericGeneMolecularData) => {
-
-        const mutation = mutationsKeyedBySampleId[molecularData.uniqueSampleKey];
+    const mutationModeInteratee = (
+        memo: MolecularDataBuckets,
+        molecularData: NumericGeneMolecularData
+    ) => {
+        const mutation =
+            mutationsKeyedBySampleId[molecularData.uniqueSampleKey];
         if (mutation) {
             const oncoprintMutationType = getOncoprintMutationType(mutation);
-            const bucket = memo.mutationBuckets[oncoprintMutationType] = memo.mutationBuckets[oncoprintMutationType] || [];
+            const bucket = (memo.mutationBuckets[oncoprintMutationType] =
+                memo.mutationBuckets[oncoprintMutationType] || []);
             bucket.push(molecularData);
-        } else if (isSampleProfiled(molecularData.uniqueSampleKey,molecularData.molecularProfileId,
-                hugoGeneSymbol, coverageInformation)) {
-
+        } else if (
+            isSampleProfiled(
+                molecularData.uniqueSampleKey,
+                molecularData.molecularProfileId,
+                hugoGeneSymbol,
+                coverageInformation
+            )
+        ) {
             memo.unmutatedBucket.push(molecularData);
         } else {
             memo.unsequencedBucket.push(molecularData);
@@ -161,32 +180,43 @@ export function getMolecularDataBuckets(studyData: NumericGeneMolecularData[],
     };
 
     // if mutation mode is off, we don't care about mutation state
-    const noMutationModeIteratee = (memo: MolecularDataBuckets, molecularData: NumericGeneMolecularData) => {
+    const noMutationModeIteratee = (
+        memo: MolecularDataBuckets,
+        molecularData: NumericGeneMolecularData
+    ) => {
         memo.unmutatedBucket.push(molecularData);
         return memo;
     };
 
-    const iteratee = (showMutations) ? mutationModeInteratee : noMutationModeIteratee;
+    const iteratee = showMutations
+        ? mutationModeInteratee
+        : noMutationModeIteratee;
 
     // populate buckets using iteratee
-    const buckets = studyData.reduce(iteratee, {mutationBuckets: {}, unmutatedBucket: [], unsequencedBucket:[] });
+    const buckets = studyData.reduce(iteratee, {
+        mutationBuckets: {},
+        unmutatedBucket: [],
+        unsequencedBucket: [],
+    });
 
     return buckets;
-
 }
 
-export function calculateJitter(uniqueSampleKey:string) {
-    return getJitterForCase(uniqueSampleKey) * 0.30;
+export function calculateJitter(uniqueSampleKey: string) {
+    return getJitterForCase(uniqueSampleKey) * 0.3;
 }
 
-export function prioritizeMutations(mutations:Mutation[]){
-    return _.orderBy(mutations,(mutation:Mutation)=>{
+export function prioritizeMutations(mutations: Mutation[]) {
+    return _.orderBy(mutations, (mutation: Mutation) => {
         const oncoprintMutationType = getOncoprintMutationType(mutation);
         return mutationRenderPriority[oncoprintMutationType];
     });
 }
 
-export function expressionTooltip(d:IBoxScatterPlotPoint, studyIdToStudy:{[studyId:string]:CancerStudy}) {
+export function expressionTooltip(
+    d: IBoxScatterPlotPoint,
+    studyIdToStudy: { [studyId: string]: CancerStudy }
+) {
     let mutations = null;
     let cna = null;
 
@@ -194,37 +224,68 @@ export function expressionTooltip(d:IBoxScatterPlotPoint, studyIdToStudy:{[study
         mutations = tooltipMutationsSection(d.mutations);
     }
 
-    const nonDiploidCna = d.copyNumberAlterations.filter(x=>x.value !== 0);
+    const nonDiploidCna = d.copyNumberAlterations.filter(x => x.value !== 0);
     if (nonDiploidCna.length > 0) {
         cna = tooltipCnaSection(nonDiploidCna);
     }
 
     return (
         <div>
-            <span><b>Study:</b> <a href={getStudySummaryUrl(d.studyId)}>{studyIdToStudy[d.studyId].name}</a></span><br/>
-            <span><b>Sample ID:</b> <a href={getSampleViewUrl(d.studyId, d.sampleId)}>{d.sampleId}</a></span><br/>
-            <span><b>Expression:</b> {d.value}</span><br/>
-            { !!mutations && (
-                <span><b>Mutations:</b> {mutations}</span>
+            <span>
+                <b>Study:</b>{' '}
+                <a href={getStudySummaryUrl(d.studyId)}>
+                    {studyIdToStudy[d.studyId].name}
+                </a>
+            </span>
+            <br />
+            <span>
+                <b>Sample ID:</b>{' '}
+                <a href={getSampleViewUrl(d.studyId, d.sampleId)}>
+                    {d.sampleId}
+                </a>
+            </span>
+            <br />
+            <span>
+                <b>Expression:</b> {d.value}
+            </span>
+            <br />
+            {!!mutations && (
+                <span>
+                    <b>Mutations:</b> {mutations}
+                </span>
             )}
-            { !!mutations && <br/> }
-            { !!cna && (
-                <span><b>CNA:</b> {cna}</span>
+            {!!mutations && <br />}
+            {!!cna && (
+                <span>
+                    <b>CNA:</b> {cna}
+                </span>
             )}
         </div>
     );
 }
 
-export function getPossibleRNASeqVersions(expressionProfiles: Pick<MolecularProfile, "molecularProfileId">[]) {
+export function getPossibleRNASeqVersions(
+    expressionProfiles: Pick<MolecularProfile, 'molecularProfileId'>[]
+) {
     const possibleRNASeqVersions: { [id: string]: boolean } = {
-        'rna_seq_mrna': false,
-        'rna_seq_v2_mrna': false
+        rna_seq_mrna: false,
+        rna_seq_v2_mrna: false,
     };
 
-    possibleRNASeqVersions.rna_seq_mrna = _.some(expressionProfiles, expressionProfile =>
-        RegExp(`rna_seq_mrna$|pan_can_atlas_2018_rna_seq_mrna_median$`).test(expressionProfile.molecularProfileId));
-    possibleRNASeqVersions.rna_seq_v2_mrna = _.some(expressionProfiles, expressionProfile =>
-        RegExp(`rna_seq_v2_mrna$|pan_can_atlas_2018_rna_seq_v2_mrna_median$`).test(expressionProfile.molecularProfileId));
+    possibleRNASeqVersions.rna_seq_mrna = _.some(
+        expressionProfiles,
+        expressionProfile =>
+            RegExp(
+                `rna_seq_mrna$|pan_can_atlas_2018_rna_seq_mrna_median$`
+            ).test(expressionProfile.molecularProfileId)
+    );
+    possibleRNASeqVersions.rna_seq_v2_mrna = _.some(
+        expressionProfiles,
+        expressionProfile =>
+            RegExp(
+                `rna_seq_v2_mrna$|pan_can_atlas_2018_rna_seq_v2_mrna_median$`
+            ).test(expressionProfile.molecularProfileId)
+    );
 
     return RNASeqOptions.filter(option => possibleRNASeqVersions[option.value]);
-}
\ No newline at end of file
+}
diff --git a/src/pages/resultsView/expression/styles.scss b/src/pages/resultsView/expression/styles.scss
index 891b0c84645..ce1c6ff9f3c 100644
--- a/src/pages/resultsView/expression/styles.scss
+++ b/src/pages/resultsView/expression/styles.scss
@@ -1,27 +1,22 @@
 .expression-controls {
-
-  display:flex;
-  align-items:stretch;
-
-  .form-group {
-    margin-right:15px;
-    padding-right:15px;
-    border-right:1px dashed $borderColor;
-    display:flex !important;
-    align-items: center;
-
-    h5 {
-      font-weight:bold !important;
-      margin-right:5px;
-      margin-bottom: 0px;
-    }
-
-    &:last-child {
-      border-right:none;
+    display: flex;
+    align-items: stretch;
+
+    .form-group {
+        margin-right: 15px;
+        padding-right: 15px;
+        border-right: 1px dashed $borderColor;
+        display: flex !important;
+        align-items: center;
+
+        h5 {
+            font-weight: bold !important;
+            margin-right: 5px;
+            margin-bottom: 0px;
+        }
+
+        &:last-child {
+            border-right: none;
+        }
     }
-
-
-  }
-
-
-}
\ No newline at end of file
+}
diff --git a/src/pages/resultsView/mutation/MutationRateSummary.tsx b/src/pages/resultsView/mutation/MutationRateSummary.tsx
index b9d1365ba6d..f463f1b9fe3 100644
--- a/src/pages/resultsView/mutation/MutationRateSummary.tsx
+++ b/src/pages/resultsView/mutation/MutationRateSummary.tsx
@@ -1,78 +1,101 @@
 import * as React from 'react';
-import {DataFilter} from "react-mutation-mapper";
-import {MolecularProfile, Mutation, SampleIdentifier} from "shared/api/generated/CBioPortalAPI";
-import {germlineMutationRate, somaticMutationRate} from "shared/lib/MutationUtils";
-import {computed} from "mobx";
-import {MobxPromise} from "mobxpromise";
-import {observer} from "mobx-react";
+import { DataFilter } from 'react-mutation-mapper';
+import {
+    MolecularProfile,
+    Mutation,
+    SampleIdentifier,
+} from 'shared/api/generated/CBioPortalAPI';
+import {
+    germlineMutationRate,
+    somaticMutationRate,
+} from 'shared/lib/MutationUtils';
+import { computed } from 'mobx';
+import { MobxPromise } from 'mobxpromise';
+import { observer } from 'mobx-react';
 
-import MutationStatusSelector from "./MutationStatusSelector";
+import MutationStatusSelector from './MutationStatusSelector';
 
 export interface IMutationRateSummaryProps {
     mutations: Mutation[];
     hugoGeneSymbol: string;
     samples: SampleIdentifier[];
     germlineConsentedSamples: MobxPromise<SampleIdentifier[]>;
-    molecularProfileIdToMolecularProfile:MobxPromise<{[molecularProfileId:string]:MolecularProfile}>;
+    molecularProfileIdToMolecularProfile: MobxPromise<{
+        [molecularProfileId: string]: MolecularProfile;
+    }>;
     mutationStatusFilter?: DataFilter<string>;
-    onMutationStatusSelect?: (selectedOptionIds: string[], allValuesSelected?: boolean) => void;
+    onMutationStatusSelect?: (
+        selectedOptionIds: string[],
+        allValuesSelected?: boolean
+    ) => void;
 }
 
 @observer
-export default class MutationRateSummary extends React.Component<IMutationRateSummaryProps, {}>
-{
+export default class MutationRateSummary extends React.Component<
+    IMutationRateSummaryProps,
+    {}
+> {
     @computed
-    public get germlineMutationRate()
-    {
-        let samples: SampleIdentifier[]|undefined;
+    public get germlineMutationRate() {
+        let samples: SampleIdentifier[] | undefined;
 
-        if (this.props.germlineConsentedSamples.status !== "pending")
-        {
+        if (this.props.germlineConsentedSamples.status !== 'pending') {
             // for germline mutation rate
             // - only use germline constented samples for impact study
             // - in all other cases assume that every sample had germline testing
             //   if > 0 germline mutations are found
-            samples = (
+            samples =
                 this.props.germlineConsentedSamples &&
                 this.props.germlineConsentedSamples.result &&
                 this.props.germlineConsentedSamples.result.length > 0
-            ) ? this.props.germlineConsentedSamples.result : this.props.samples;
+                    ? this.props.germlineConsentedSamples.result
+                    : this.props.samples;
         }
 
-        return samples ? germlineMutationRate(this.props.hugoGeneSymbol,
-            this.props.mutations,
-            this.props.molecularProfileIdToMolecularProfile.result!,
-            samples): 0;
+        return samples
+            ? germlineMutationRate(
+                  this.props.hugoGeneSymbol,
+                  this.props.mutations,
+                  this.props.molecularProfileIdToMolecularProfile.result!,
+                  samples
+              )
+            : 0;
     }
 
     @computed
-    public get somaticMutationRate()
-    {
-        return this.props.samples.length > 0 ? somaticMutationRate(this.props.hugoGeneSymbol,
-            this.props.mutations,
-            this.props.molecularProfileIdToMolecularProfile.result!,
-            this.props.samples): 0;
+    public get somaticMutationRate() {
+        return this.props.samples.length > 0
+            ? somaticMutationRate(
+                  this.props.hugoGeneSymbol,
+                  this.props.mutations,
+                  this.props.molecularProfileIdToMolecularProfile.result!,
+                  this.props.samples
+              )
+            : 0;
     }
 
-    render()
-    {
+    render() {
         return (
             <span data-test="mutation-rate-summary">
                 <MutationStatusSelector
                     filter={this.props.mutationStatusFilter}
                     onSelect={this.props.onMutationStatusSelect}
                     rates={{
-                        "Germline": this.germlineMutationRate,
-                        "Somatic": this.somaticMutationRate
+                        Germline: this.germlineMutationRate,
+                        Somatic: this.somaticMutationRate,
                     }}
                     somaticContent={{
-                        title: "Somatic Mutation Frequency",
-                        description: `Percentage of samples with a somatic mutation in ${this.props.hugoGeneSymbol}`
+                        title: 'Somatic Mutation Frequency',
+                        description: `Percentage of samples with a somatic mutation in ${this.props.hugoGeneSymbol}`,
                     }}
-                    germlineContent={this.germlineMutationRate > 0 ? {
-                        title: "Germline Mutation Frequency",
-                        description: `Percentage of samples with a germline mutation in ${this.props.hugoGeneSymbol}`
-                    }: undefined}
+                    germlineContent={
+                        this.germlineMutationRate > 0
+                            ? {
+                                  title: 'Germline Mutation Frequency',
+                                  description: `Percentage of samples with a germline mutation in ${this.props.hugoGeneSymbol}`,
+                              }
+                            : undefined
+                    }
                 />
             </span>
         );
diff --git a/src/pages/resultsView/mutation/MutationStatusSelector.tsx b/src/pages/resultsView/mutation/MutationStatusSelector.tsx
index b96c4aa4410..20ec1156ad9 100644
--- a/src/pages/resultsView/mutation/MutationStatusSelector.tsx
+++ b/src/pages/resultsView/mutation/MutationStatusSelector.tsx
@@ -1,89 +1,96 @@
-import {computed} from "mobx";
-import {observer} from "mobx-react";
+import { computed } from 'mobx';
+import { observer } from 'mobx-react';
 import * as React from 'react';
 import {
     BadgeLabel,
     formatPercentValue,
     MUTATION_STATUS_BADGE_STYLE_OVERRIDE,
     MutationStatusBadgeSelector,
-    MutationStatusBadgeSelectorProps
-} from "react-mutation-mapper";
+    MutationStatusBadgeSelectorProps,
+} from 'react-mutation-mapper';
 
-import {DefaultTooltip} from "cbioportal-frontend-commons";
+import { DefaultTooltip } from 'cbioportal-frontend-commons';
 
-
-export function getFilterOptionLabel(content: {title: string, description?: string}): JSX.Element | string
-{
+export function getFilterOptionLabel(content: {
+    title: string;
+    description?: string;
+}): JSX.Element | string {
     if (content.description) {
         return (
             <span>
                 {content.title}
                 <DefaultTooltip
                     placement="right"
-                    overlay={
-                        <span>{content.description}</span>
-                    }
+                    overlay={<span>{content.description}</span>}
                 >
-                    <i className="fa fa-info-circle" style={{marginLeft: "0.2rem"}} />
+                    <i
+                        className="fa fa-info-circle"
+                        style={{ marginLeft: '0.2rem' }}
+                    />
                 </DefaultTooltip>
             </span>
         );
-    }
-    else {
+    } else {
         return content.title;
     }
 }
 
 type MutationStatusSelectorProps = MutationStatusBadgeSelectorProps & {
-    somaticContent: {title: string, description?: string};
-    germlineContent?: {title: string, description?: string};
+    somaticContent: { title: string; description?: string };
+    germlineContent?: { title: string; description?: string };
 };
 
 @observer
-export default class MutationStatusSelector extends React.Component<MutationStatusSelectorProps, {}>
-{
+export default class MutationStatusSelector extends React.Component<
+    MutationStatusSelectorProps,
+    {}
+> {
     @computed
-    private get mutationStatusFilterOptions()
-    {
+    private get mutationStatusFilterOptions() {
         const options = [
             {
-                value: "Somatic",
+                value: 'Somatic',
                 label: getFilterOptionLabel(this.props.somaticContent),
                 badgeStyleOverride: MUTATION_STATUS_BADGE_STYLE_OVERRIDE,
-                badgeStyleSelectedOverride: MUTATION_STATUS_BADGE_STYLE_OVERRIDE
-            }
+                badgeStyleSelectedOverride: MUTATION_STATUS_BADGE_STYLE_OVERRIDE,
+            },
         ];
 
-        if (this.props.germlineContent)
-        {
+        if (this.props.germlineContent) {
             options.push({
-                value: "Germline",
+                value: 'Germline',
                 label: getFilterOptionLabel(this.props.germlineContent),
                 badgeStyleOverride: MUTATION_STATUS_BADGE_STYLE_OVERRIDE,
-                badgeStyleSelectedOverride: MUTATION_STATUS_BADGE_STYLE_OVERRIDE
+                badgeStyleSelectedOverride: MUTATION_STATUS_BADGE_STYLE_OVERRIDE,
             });
         }
 
         return options;
     }
 
-    private get somaticInfo()
-    {
+    private get somaticInfo() {
         return this.props.rates ? (
             <BadgeLabel
                 label={getFilterOptionLabel(this.props.somaticContent)}
-                badgeContent={`${formatPercentValue(this.props.rates["Somatic"])}%`}
-                badgeStyleOverride={this.mutationStatusFilterOptions[0].badgeStyleOverride}
+                badgeContent={`${formatPercentValue(
+                    this.props.rates['Somatic']
+                )}%`}
+                badgeStyleOverride={
+                    this.mutationStatusFilterOptions[0].badgeStyleOverride
+                }
             />
-        ): null;
+        ) : null;
     }
 
     private get germlinePlaceholder() {
-        return <div data-test='germlineMutationRate' className="invisible">%</div>
+        return (
+            <div data-test="germlineMutationRate" className="invisible">
+                %
+            </div>
+        );
     }
 
-    public render()
-    {
+    public render() {
         // Render the actual selector only if germline content exists.
         // Otherwise just display the somatic info without a filter option.
         return this.props.germlineContent === undefined ? (
@@ -91,7 +98,7 @@ export default class MutationStatusSelector extends React.Component<MutationStat
                 {this.somaticInfo}
                 {this.germlinePlaceholder}
             </React.Fragment>
-        ): (
+        ) : (
             <MutationStatusBadgeSelector
                 badgeSelectorOptions={this.mutationStatusFilterOptions}
                 {...this.props}
diff --git a/src/pages/resultsView/mutation/Mutations.tsx b/src/pages/resultsView/mutation/Mutations.tsx
index 45a0db0b8dd..6c3c459d708 100644
--- a/src/pages/resultsView/mutation/Mutations.tsx
+++ b/src/pages/resultsView/mutation/Mutations.tsx
@@ -1,32 +1,34 @@
 import * as React from 'react';
-import {observer} from "mobx-react";
-import {MSKTabs, MSKTab} from "shared/components/MSKTabs/MSKTabs";
-import {ResultsViewPageStore} from "../ResultsViewPageStore";
-import ResultsViewMutationMapper from "./ResultsViewMutationMapper";
-import {convertToMutationMapperProps} from "shared/components/mutationMapper/MutationMapperConfig";
-import MutationMapperUserSelectionStore from "shared/components/mutationMapper/MutationMapperUserSelectionStore";
-import {observable} from "mobx";
+import { observer } from 'mobx-react';
+import { MSKTabs, MSKTab } from 'shared/components/MSKTabs/MSKTabs';
+import { ResultsViewPageStore } from '../ResultsViewPageStore';
+import ResultsViewMutationMapper from './ResultsViewMutationMapper';
+import { convertToMutationMapperProps } from 'shared/components/mutationMapper/MutationMapperConfig';
+import MutationMapperUserSelectionStore from 'shared/components/mutationMapper/MutationMapperUserSelectionStore';
+import { observable } from 'mobx';
 import AppConfig from 'appConfig';
-import OqlStatusBanner from "../../../shared/components/banners/OqlStatusBanner";
-import autobind from "autobind-decorator";
-import {AppStore} from "../../../AppStore";
+import OqlStatusBanner from '../../../shared/components/banners/OqlStatusBanner';
+import autobind from 'autobind-decorator';
+import { AppStore } from '../../../AppStore';
 
-import "./mutations.scss";
-import AlterationFilterWarning from "../../../shared/components/banners/AlterationFilterWarning";
-import {getOncoKbApiUrl} from "shared/api/urls";
+import './mutations.scss';
+import AlterationFilterWarning from '../../../shared/components/banners/AlterationFilterWarning';
+import { getOncoKbApiUrl } from 'shared/api/urls';
 
 export interface IMutationsPageProps {
     routing?: any;
     store: ResultsViewPageStore;
-    appStore:AppStore;
+    appStore: AppStore;
 }
 
 @observer
-export default class Mutations extends React.Component<IMutationsPageProps, {}>
-{
+export default class Mutations extends React.Component<
+    IMutationsPageProps,
+    {}
+> {
     private userSelectionStore: MutationMapperUserSelectionStore;
 
-    @observable mutationsGeneTab:string;
+    @observable mutationsGeneTab: string;
 
     constructor(props: IMutationsPageProps) {
         super(props);
@@ -37,34 +39,38 @@ export default class Mutations extends React.Component<IMutationsPageProps, {}>
 
     @autobind
     private onToggleOql() {
-        this.props.store.mutationsTabFilteringSettings.useOql = !this.props.store.mutationsTabFilteringSettings.useOql;
+        this.props.store.mutationsTabFilteringSettings.useOql = !this.props
+            .store.mutationsTabFilteringSettings.useOql;
     }
 
     @autobind
     private onToggleVUS() {
-        this.props.store.mutationsTabFilteringSettings.excludeVus = !this.props.store.mutationsTabFilteringSettings.excludeVus;
+        this.props.store.mutationsTabFilteringSettings.excludeVus = !this.props
+            .store.mutationsTabFilteringSettings.excludeVus;
     }
 
     @autobind
     private onToggleGermline() {
-        this.props.store.mutationsTabFilteringSettings.excludeGermline = !this.props.store.mutationsTabFilteringSettings.excludeGermline;
+        this.props.store.mutationsTabFilteringSettings.excludeGermline = !this
+            .props.store.mutationsTabFilteringSettings.excludeGermline;
     }
 
     public render() {
         // use routing if available, if not fall back to the observable variable
-        const activeTabId = this.props.routing ?
-            this.props.routing.location.query.mutationsGeneTab : this.mutationsGeneTab;
+        const activeTabId = this.props.routing
+            ? this.props.routing.location.query.mutationsGeneTab
+            : this.mutationsGeneTab;
 
         return (
             <div data-test="mutationsTabDiv">
-                {(this.props.store.mutationMapperStores.isComplete) && (
+                {this.props.store.mutationMapperStores.isComplete && (
                     <MSKTabs
                         id="mutationsPageTabs"
                         activeTabId={activeTabId}
-                        onTabClick={(id:string) => this.handleTabChange(id)}
+                        onTabClick={(id: string) => this.handleTabChange(id)}
                         className="pillTabs resultsPageMutationsGeneTabs"
                         enablePagination={false}
-                        arrowStyle={{'line-height': 0.8}}
+                        arrowStyle={{ 'line-height': 0.8 }}
                         tabButtonStyle="pills"
                         unmountOnHide={true}
                     >
@@ -75,54 +81,84 @@ export default class Mutations extends React.Component<IMutationsPageProps, {}>
         );
     }
 
-    protected generateTabs(genes: string[])
-    {
+    protected generateTabs(genes: string[]) {
         const tabs: JSX.Element[] = [];
 
         genes.forEach((gene: string) => {
-            const mutationMapperStore = this.props.store.getMutationMapperStore(gene);
+            const mutationMapperStore = this.props.store.getMutationMapperStore(
+                gene
+            );
 
-            if (mutationMapperStore)
-            {
-                const tabHasMutations = mutationMapperStore.mutations.length > 0;
+            if (mutationMapperStore) {
+                const tabHasMutations =
+                    mutationMapperStore.mutations.length > 0;
                 // gray out tab if no mutations
-                const anchorStyle = tabHasMutations ? undefined : { color:'#bbb' };
+                const anchorStyle = tabHasMutations
+                    ? undefined
+                    : { color: '#bbb' };
 
                 tabs.push(
-                    <MSKTab key={gene} id={gene} linkText={gene} anchorStyle={anchorStyle}>
-                        <div className={"tabMessageContainer"}>
+                    <MSKTab
+                        key={gene}
+                        id={gene}
+                        linkText={gene}
+                        anchorStyle={anchorStyle}
+                    >
+                        <div className={'tabMessageContainer'}>
                             <OqlStatusBanner
                                 className="mutations-oql-status-banner"
                                 store={this.props.store}
-                                tabReflectsOql={this.props.store.mutationsTabFilteringSettings.useOql}
-                                isUnaffected={!this.props.store.queryContainsMutationOql}
+                                tabReflectsOql={
+                                    this.props.store
+                                        .mutationsTabFilteringSettings.useOql
+                                }
+                                isUnaffected={
+                                    !this.props.store.queryContainsMutationOql
+                                }
                                 onToggle={this.onToggleOql}
                             />
                             <AlterationFilterWarning
                                 store={this.props.store}
                                 mutationsTabModeSettings={{
-                                    excludeVUS: this.props.store.mutationsTabFilteringSettings.excludeVus,
-                                    excludeGermline: this.props.store.mutationsTabFilteringSettings.excludeGermline,
+                                    excludeVUS: this.props.store
+                                        .mutationsTabFilteringSettings
+                                        .excludeVus,
+                                    excludeGermline: this.props.store
+                                        .mutationsTabFilteringSettings
+                                        .excludeGermline,
                                     toggleExcludeVUS: this.onToggleVUS,
-                                    toggleExcludeGermline: this.onToggleGermline,
-                                    hugoGeneSymbol: gene
+                                    toggleExcludeGermline: this
+                                        .onToggleGermline,
+                                    hugoGeneSymbol: gene,
                                 }}
                             />
                         </div>
                         <ResultsViewMutationMapper
-                            {...convertToMutationMapperProps(AppConfig.serverConfig)}
+                            {...convertToMutationMapperProps(
+                                AppConfig.serverConfig
+                            )}
                             oncoKbPublicApiUrl={getOncoKbApiUrl()}
                             store={mutationMapperStore}
-                            trackVisibility={this.userSelectionStore.trackVisibility}
+                            trackVisibility={
+                                this.userSelectionStore.trackVisibility
+                            }
                             discreteCNACache={this.props.store.discreteCNACache}
-                            oncoKbEvidenceCache={this.props.store.oncoKbEvidenceCache}
+                            oncoKbEvidenceCache={
+                                this.props.store.oncoKbEvidenceCache
+                            }
                             pubMedCache={this.props.store.pubMedCache}
                             cancerTypeCache={this.props.store.cancerTypeCache}
-                            mutationCountCache={this.props.store.mutationCountCache}
+                            mutationCountCache={
+                                this.props.store.mutationCountCache
+                            }
                             genomeNexusCache={this.props.store.genomeNexusCache}
-                            genomeNexusMyVariantInfoCache={this.props.store.genomeNexusMyVariantInfoCache}
+                            genomeNexusMyVariantInfoCache={
+                                this.props.store.genomeNexusMyVariantInfoCache
+                            }
                             pdbHeaderCache={this.props.store.pdbHeaderCache}
-                            myCancerGenomeData={this.props.store.myCancerGenomeData}
+                            myCancerGenomeData={
+                                this.props.store.myCancerGenomeData
+                            }
                             userEmailAddress={this.props.appStore.userName!}
                         />
                     </MSKTab>
diff --git a/src/pages/resultsView/mutation/ResultsViewMutationMapper.tsx b/src/pages/resultsView/mutation/ResultsViewMutationMapper.tsx
index 872300dc4c4..8684c4e5ad3 100644
--- a/src/pages/resultsView/mutation/ResultsViewMutationMapper.tsx
+++ b/src/pages/resultsView/mutation/ResultsViewMutationMapper.tsx
@@ -1,61 +1,68 @@
-import autobind from "autobind-decorator";
+import autobind from 'autobind-decorator';
 import * as React from 'react';
-import {DataFilterType, onFilterOptionSelect} from "react-mutation-mapper";
-import {observer} from "mobx-react";
-import {action, computed} from "mobx";
+import { DataFilterType, onFilterOptionSelect } from 'react-mutation-mapper';
+import { observer } from 'mobx-react';
+import { action, computed } from 'mobx';
 
-import {EnsemblTranscript} from "cbioportal-frontend-commons";
-import DiscreteCNACache from "shared/cache/DiscreteCNACache";
-import CancerTypeCache from "shared/cache/CancerTypeCache";
-import MutationCountCache from "shared/cache/MutationCountCache";
-import GenomeNexusMyVariantInfoCache from "shared/cache/GenomeNexusMyVariantInfoCache";
+import { EnsemblTranscript } from 'cbioportal-frontend-commons';
+import DiscreteCNACache from 'shared/cache/DiscreteCNACache';
+import CancerTypeCache from 'shared/cache/CancerTypeCache';
+import MutationCountCache from 'shared/cache/MutationCountCache';
+import GenomeNexusMyVariantInfoCache from 'shared/cache/GenomeNexusMyVariantInfoCache';
 
 import {
-    IMutationMapperProps, default as MutationMapper
-} from "shared/components/mutationMapper/MutationMapper";
-import {
-    MUTATION_STATUS_FILTER_ID
-} from "shared/components/mutationMapper/MutationMapperDataStore";
+    IMutationMapperProps,
+    default as MutationMapper,
+} from 'shared/components/mutationMapper/MutationMapper';
+import { MUTATION_STATUS_FILTER_ID } from 'shared/components/mutationMapper/MutationMapperDataStore';
 
-import MutationRateSummary from "pages/resultsView/mutation/MutationRateSummary";
-import ResultsViewMutationMapperStore from "pages/resultsView/mutation/ResultsViewMutationMapperStore";
-import ResultsViewMutationTable from "pages/resultsView/mutation/ResultsViewMutationTable";
-import {getMobxPromiseGroupStatus} from "shared/lib/getMobxPromiseGroupStatus";
+import MutationRateSummary from 'pages/resultsView/mutation/MutationRateSummary';
+import ResultsViewMutationMapperStore from 'pages/resultsView/mutation/ResultsViewMutationMapperStore';
+import ResultsViewMutationTable from 'pages/resultsView/mutation/ResultsViewMutationTable';
+import { getMobxPromiseGroupStatus } from 'shared/lib/getMobxPromiseGroupStatus';
 
-export interface IResultsViewMutationMapperProps extends IMutationMapperProps
-{
-    store:ResultsViewMutationMapperStore;
-    discreteCNACache?:DiscreteCNACache;
-    cancerTypeCache?:CancerTypeCache;
-    mutationCountCache?:MutationCountCache;
-    genomeNexusMyVariantInfoCache?:GenomeNexusMyVariantInfoCache;
-    userEmailAddress:string;
+export interface IResultsViewMutationMapperProps extends IMutationMapperProps {
+    store: ResultsViewMutationMapperStore;
+    discreteCNACache?: DiscreteCNACache;
+    cancerTypeCache?: CancerTypeCache;
+    mutationCountCache?: MutationCountCache;
+    genomeNexusMyVariantInfoCache?: GenomeNexusMyVariantInfoCache;
+    userEmailAddress: string;
 }
 
 @observer
-export default class ResultsViewMutationMapper extends MutationMapper<IResultsViewMutationMapperProps>
-{
+export default class ResultsViewMutationMapper extends MutationMapper<
+    IResultsViewMutationMapperProps
+> {
     constructor(props: IResultsViewMutationMapperProps) {
         super(props);
     }
 
     @computed get mutationStatusFilter() {
-        return this.store.dataStore.dataFilters.find(f => f.id === MUTATION_STATUS_FILTER_ID);
+        return this.store.dataStore.dataFilters.find(
+            f => f.id === MUTATION_STATUS_FILTER_ID
+        );
     }
 
-    @computed get mutationRateSummary():JSX.Element|null {
+    @computed get mutationRateSummary(): JSX.Element | null {
         // TODO we should not be even calculating mskImpactGermlineConsentedPatientIds for studies other than msk impact
-        if (this.props.store.germlineConsentedSamples &&
+        if (
+            this.props.store.germlineConsentedSamples &&
             this.props.store.germlineConsentedSamples.result &&
             this.props.store.mutationData.isComplete &&
-            this.props.store.mutationData.result.length > 0) {
+            this.props.store.mutationData.result.length > 0
+        ) {
             return (
                 <MutationRateSummary
                     hugoGeneSymbol={this.props.store.gene.hugoGeneSymbol}
-                    molecularProfileIdToMolecularProfile={this.props.store.molecularProfileIdToMolecularProfile}
+                    molecularProfileIdToMolecularProfile={
+                        this.props.store.molecularProfileIdToMolecularProfile
+                    }
                     mutations={this.props.store.mutationData.result}
                     samples={this.props.store.samples.result!}
-                    germlineConsentedSamples={this.props.store.germlineConsentedSamples}
+                    germlineConsentedSamples={
+                        this.props.store.germlineConsentedSamples
+                    }
                     onMutationStatusSelect={this.onMutationStatusSelect}
                     mutationStatusFilter={this.mutationStatusFilter}
                 />
@@ -66,40 +73,57 @@ export default class ResultsViewMutationMapper extends MutationMapper<IResultsVi
     }
 
     protected get isMutationTableDataLoading() {
-        return getMobxPromiseGroupStatus(
-            this.props.store.clinicalDataForSamples,
-            this.props.store.studiesForSamplesWithoutCancerTypeClinicalData,
-            this.props.store.canonicalTranscript
-        ) === "pending";
+        return (
+            getMobxPromiseGroupStatus(
+                this.props.store.clinicalDataForSamples,
+                this.props.store.studiesForSamplesWithoutCancerTypeClinicalData,
+                this.props.store.canonicalTranscript
+            ) === 'pending'
+        );
     }
 
     protected get totalExonNumber() {
-        const canonicalTranscriptId = this.props.store.canonicalTranscript.result && this.props.store.canonicalTranscript.result.transcriptId;
-        const transcript = (this.props.store.activeTranscript && (this.props.store.activeTranscript === canonicalTranscriptId) ?
-            this.props.store.canonicalTranscript.result : this.props.store.transcriptsByTranscriptId[this.props.store.activeTranscript!]) as EnsemblTranscript;
-        return transcript && transcript.exons && transcript.exons.length > 0 ? transcript.exons.length.toString() : 'None';
+        const canonicalTranscriptId =
+            this.props.store.canonicalTranscript.result &&
+            this.props.store.canonicalTranscript.result.transcriptId;
+        const transcript = (this.props.store.activeTranscript &&
+        this.props.store.activeTranscript === canonicalTranscriptId
+            ? this.props.store.canonicalTranscript.result
+            : this.props.store.transcriptsByTranscriptId[
+                  this.props.store.activeTranscript!
+              ]) as EnsemblTranscript;
+        return transcript && transcript.exons && transcript.exons.length > 0
+            ? transcript.exons.length.toString()
+            : 'None';
     }
 
-    protected get mutationTableComponent(): JSX.Element|null
-    {
+    protected get mutationTableComponent(): JSX.Element | null {
         return (
             <ResultsViewMutationTable
-                uniqueSampleKeyToTumorType={this.props.store.uniqueSampleKeyToTumorType}
+                uniqueSampleKeyToTumorType={
+                    this.props.store.uniqueSampleKeyToTumorType
+                }
                 oncoKbCancerGenes={this.props.store.oncoKbCancerGenes}
                 discreteCNACache={this.props.discreteCNACache}
                 studyIdToStudy={this.props.store.studyIdToStudy.result}
-                molecularProfileIdToMolecularProfile={this.props.store.molecularProfileIdToMolecularProfile.result}
+                molecularProfileIdToMolecularProfile={
+                    this.props.store.molecularProfileIdToMolecularProfile.result
+                }
                 oncoKbEvidenceCache={this.props.oncoKbEvidenceCache}
                 pubMedCache={this.props.pubMedCache}
                 mutationCountCache={this.props.mutationCountCache}
                 genomeNexusCache={this.props.genomeNexusCache}
-                genomeNexusMyVariantInfoCache={this.props.genomeNexusMyVariantInfoCache}
+                genomeNexusMyVariantInfoCache={
+                    this.props.genomeNexusMyVariantInfoCache
+                }
                 dataStore={this.props.store.dataStore}
                 itemsLabelPlural={this.itemsLabelPlural}
                 downloadDataFetcher={this.props.store.downloadDataFetcher}
                 myCancerGenomeData={this.props.myCancerGenomeData}
                 hotspotData={this.props.store.indexedHotspotData}
-                indexedVariantAnnotations={this.props.store.indexedVariantAnnotations}
+                indexedVariantAnnotations={
+                    this.props.store.indexedVariantAnnotations
+                }
                 cosmicData={this.props.store.cosmicData.result}
                 oncoKbData={this.props.store.oncoKbData}
                 civicGenes={this.props.store.civicGenes}
@@ -115,23 +139,27 @@ export default class ResultsViewMutationMapper extends MutationMapper<IResultsVi
         );
     }
 
-    protected get mutationTable(): JSX.Element|null
-    {
+    protected get mutationTable(): JSX.Element | null {
         return (
             <span>
-                {!this.isMutationTableDataLoading && this.mutationTableComponent}
+                {!this.isMutationTableDataLoading &&
+                    this.mutationTableComponent}
             </span>
         );
     }
 
     @autobind
     @action
-    protected onMutationStatusSelect(selectedMutationStatusIds: string[], allValuesSelected: boolean)
-    {
-        onFilterOptionSelect(selectedMutationStatusIds,
+    protected onMutationStatusSelect(
+        selectedMutationStatusIds: string[],
+        allValuesSelected: boolean
+    ) {
+        onFilterOptionSelect(
+            selectedMutationStatusIds,
             allValuesSelected,
             this.store.dataStore,
             DataFilterType.MUTATION_STATUS,
-            MUTATION_STATUS_FILTER_ID);
+            MUTATION_STATUS_FILTER_ID
+        );
     }
 }
diff --git a/src/pages/resultsView/mutation/ResultsViewMutationMapperStore.ts b/src/pages/resultsView/mutation/ResultsViewMutationMapperStore.ts
index b565a15886b..076939b0cd8 100644
--- a/src/pages/resultsView/mutation/ResultsViewMutationMapperStore.ts
+++ b/src/pages/resultsView/mutation/ResultsViewMutationMapperStore.ts
@@ -1,57 +1,75 @@
-import {IHotspotIndex} from "react-mutation-mapper";
+import { IHotspotIndex } from 'react-mutation-mapper';
 import {
-    Mutation, Gene, ClinicalData, CancerStudy, MolecularProfile, SampleIdentifier
-} from "shared/api/generated/CBioPortalAPI";
+    Mutation,
+    Gene,
+    ClinicalData,
+    CancerStudy,
+    MolecularProfile,
+    SampleIdentifier,
+} from 'shared/api/generated/CBioPortalAPI';
 import {
     CancerGene,
     remoteData,
-    VariantAnnotation
-} from "cbioportal-frontend-commons";
-import {labelMobxPromises, MobxPromise, cached} from "mobxpromise";
-import {IOncoKbData} from "shared/model/OncoKB";
-import {ICivicGene, ICivicVariant} from "shared/model/Civic";
+    VariantAnnotation,
+} from 'cbioportal-frontend-commons';
+import { labelMobxPromises, MobxPromise, cached } from 'mobxpromise';
+import { IOncoKbData } from 'shared/model/OncoKB';
+import { ICivicGene, ICivicVariant } from 'shared/model/Civic';
 import {
-    fetchCosmicData, fetchCivicGenes, fetchCivicVariants
-} from "shared/lib/StoreUtils";
-import MutationCountCache from "shared/cache/MutationCountCache";
-import DiscreteCNACache from "shared/cache/DiscreteCNACache";
-import GenomeNexusCache from "shared/cache/GenomeNexusCache";
-import GenomeNexusMyVariantInfoCache from "shared/cache/GenomeNexusMyVariantInfoCache";
-import {MutationTableDownloadDataFetcher} from "shared/lib/MutationTableDownloadDataFetcher";
-import MutationMapperStore, {IMutationMapperStoreConfig} from "shared/components/mutationMapper/MutationMapperStore";
-import {IServerConfig} from "../../../config/IAppConfig";
+    fetchCosmicData,
+    fetchCivicGenes,
+    fetchCivicVariants,
+} from 'shared/lib/StoreUtils';
+import MutationCountCache from 'shared/cache/MutationCountCache';
+import DiscreteCNACache from 'shared/cache/DiscreteCNACache';
+import GenomeNexusCache from 'shared/cache/GenomeNexusCache';
+import GenomeNexusMyVariantInfoCache from 'shared/cache/GenomeNexusMyVariantInfoCache';
+import { MutationTableDownloadDataFetcher } from 'shared/lib/MutationTableDownloadDataFetcher';
+import MutationMapperStore, {
+    IMutationMapperStoreConfig,
+} from 'shared/components/mutationMapper/MutationMapperStore';
+import { IServerConfig } from '../../../config/IAppConfig';
 
-
-export default class ResultsViewMutationMapperStore extends MutationMapperStore
-{
-    constructor(protected mutationMapperConfig: IServerConfig,
-                protected mutationMapperStoreConfig: IMutationMapperStoreConfig,
-                public gene:Gene,
-                public samples:MobxPromise<SampleIdentifier[]>,
-                public oncoKbCancerGenes:MobxPromise<CancerGene[] | Error>,
-                // getMutationDataCache needs to be a getter for the following reason:
-                // when the input parameters to the mutationDataCache change, the cache
-                // is recomputed. Mobx needs to respond to this. But if we pass the mutationDataCache
-                // in as a value, then when using it we don't access the observable property mutationDataCache,
-                // so that when it changes we won't react. Thus we need to access it as store.mutationDataCache
-                // (which will be done in the getter thats passed in here) so that the cache itself is observable
-                // and we will react when it changes to a new object.
-                getMutations:()=>Mutation[],
-                private getMutationCountCache: ()=>MutationCountCache,
-                private getGenomeNexusCache: ()=>GenomeNexusCache,
-                private getGenomeNexusMyVariantInfoCache: ()=>GenomeNexusMyVariantInfoCache,
-                private getDiscreteCNACache: ()=>DiscreteCNACache,
-                public studyToMolecularProfileDiscrete: {[studyId:string]:MolecularProfile},
-                public studyIdToStudy:MobxPromise<{[studyId:string]:CancerStudy}>,
-                public molecularProfileIdToMolecularProfile:MobxPromise<{[molecularProfileId:string]:MolecularProfile}>,
-                public clinicalDataForSamples: MobxPromise<ClinicalData[]>,
-                public studiesForSamplesWithoutCancerTypeClinicalData: MobxPromise<CancerStudy[]>,
-                public germlineConsentedSamples:MobxPromise<SampleIdentifier[]>,
-                public indexedHotspotData:MobxPromise<IHotspotIndex|undefined>,
-                public indexedVariantAnnotations:MobxPromise<{[genomicLocation: string]: VariantAnnotation}|undefined>,
-                public uniqueSampleKeyToTumorType:{[uniqueSampleKey:string]:string},
-                public oncoKbData:MobxPromise<IOncoKbData | Error>)
-    {
+export default class ResultsViewMutationMapperStore extends MutationMapperStore {
+    constructor(
+        protected mutationMapperConfig: IServerConfig,
+        protected mutationMapperStoreConfig: IMutationMapperStoreConfig,
+        public gene: Gene,
+        public samples: MobxPromise<SampleIdentifier[]>,
+        public oncoKbCancerGenes: MobxPromise<CancerGene[] | Error>,
+        // getMutationDataCache needs to be a getter for the following reason:
+        // when the input parameters to the mutationDataCache change, the cache
+        // is recomputed. Mobx needs to respond to this. But if we pass the mutationDataCache
+        // in as a value, then when using it we don't access the observable property mutationDataCache,
+        // so that when it changes we won't react. Thus we need to access it as store.mutationDataCache
+        // (which will be done in the getter thats passed in here) so that the cache itself is observable
+        // and we will react when it changes to a new object.
+        getMutations: () => Mutation[],
+        private getMutationCountCache: () => MutationCountCache,
+        private getGenomeNexusCache: () => GenomeNexusCache,
+        private getGenomeNexusMyVariantInfoCache: () => GenomeNexusMyVariantInfoCache,
+        private getDiscreteCNACache: () => DiscreteCNACache,
+        public studyToMolecularProfileDiscrete: {
+            [studyId: string]: MolecularProfile;
+        },
+        public studyIdToStudy: MobxPromise<{ [studyId: string]: CancerStudy }>,
+        public molecularProfileIdToMolecularProfile: MobxPromise<{
+            [molecularProfileId: string]: MolecularProfile;
+        }>,
+        public clinicalDataForSamples: MobxPromise<ClinicalData[]>,
+        public studiesForSamplesWithoutCancerTypeClinicalData: MobxPromise<
+            CancerStudy[]
+        >,
+        public germlineConsentedSamples: MobxPromise<SampleIdentifier[]>,
+        public indexedHotspotData: MobxPromise<IHotspotIndex | undefined>,
+        public indexedVariantAnnotations: MobxPromise<
+            { [genomicLocation: string]: VariantAnnotation } | undefined
+        >,
+        public uniqueSampleKeyToTumorType: {
+            [uniqueSampleKey: string]: string;
+        },
+        public oncoKbData: MobxPromise<IOncoKbData | Error>
+    ) {
         super(
             mutationMapperConfig,
             mutationMapperStoreConfig,
@@ -68,44 +86,55 @@ export default class ResultsViewMutationMapperStore extends MutationMapperStore
     }
 
     readonly cosmicData = remoteData({
-        await: () => [
-            this.mutationData
-        ],
-        invoke: () => fetchCosmicData(this.mutationData)
+        await: () => [this.mutationData],
+        invoke: () => fetchCosmicData(this.mutationData),
     });
 
-    readonly civicGenes = remoteData<ICivicGene | undefined>({
-        await: () => [
-            this.mutationData,
-            this.clinicalDataForSamples
-        ],
-        invoke: async() => this.mutationMapperConfig.show_civic ? fetchCivicGenes(this.mutationData) : {},
-        onError: (err: Error) => {
-            // fail silently
-        }
-    }, undefined);
+    readonly civicGenes = remoteData<ICivicGene | undefined>(
+        {
+            await: () => [this.mutationData, this.clinicalDataForSamples],
+            invoke: async () =>
+                this.mutationMapperConfig.show_civic
+                    ? fetchCivicGenes(this.mutationData)
+                    : {},
+            onError: (err: Error) => {
+                // fail silently
+            },
+        },
+        undefined
+    );
 
-    readonly civicVariants = remoteData<ICivicVariant | undefined>({
-        await: () => [
-            this.civicGenes,
-            this.mutationData
-        ],
-        invoke: async() => {
-            if (this.mutationMapperConfig.show_civic && this.civicGenes.result) {
-                return fetchCivicVariants(this.civicGenes.result as ICivicGene, this.mutationData);
-            }
-            else {
-                return {};
-            }
+    readonly civicVariants = remoteData<ICivicVariant | undefined>(
+        {
+            await: () => [this.civicGenes, this.mutationData],
+            invoke: async () => {
+                if (
+                    this.mutationMapperConfig.show_civic &&
+                    this.civicGenes.result
+                ) {
+                    return fetchCivicVariants(
+                        this.civicGenes.result as ICivicGene,
+                        this.mutationData
+                    );
+                } else {
+                    return {};
+                }
+            },
+            onError: (err: Error) => {
+                // fail silently
+            },
         },
-        onError: (err: Error) => {
-            // fail silently
-        }
-    }, undefined);
+        undefined
+    );
 
     @cached get downloadDataFetcher(): MutationTableDownloadDataFetcher {
-        return new MutationTableDownloadDataFetcher(this.mutationData, this.studyToMolecularProfileDiscrete, this.getGenomeNexusCache, this.getGenomeNexusMyVariantInfoCache, this.getMutationCountCache, this.getDiscreteCNACache);
+        return new MutationTableDownloadDataFetcher(
+            this.mutationData,
+            this.studyToMolecularProfileDiscrete,
+            this.getGenomeNexusCache,
+            this.getGenomeNexusMyVariantInfoCache,
+            this.getMutationCountCache,
+            this.getDiscreteCNACache
+        );
     }
-
-    
 }
diff --git a/src/pages/resultsView/mutation/ResultsViewMutationTable.tsx b/src/pages/resultsView/mutation/ResultsViewMutationTable.tsx
index c7ca09e3839..de016aead55 100644
--- a/src/pages/resultsView/mutation/ResultsViewMutationTable.tsx
+++ b/src/pages/resultsView/mutation/ResultsViewMutationTable.tsx
@@ -1,28 +1,30 @@
-import * as React from "react";
-import {observer} from "mobx-react";
+import * as React from 'react';
+import { observer } from 'mobx-react';
 import {
-    IMutationTableProps, MutationTableColumnType, default as MutationTable
-} from "shared/components/mutationTable/MutationTable";
-import CancerTypeColumnFormatter from "shared/components/mutationTable/column/CancerTypeColumnFormatter";
-import TumorAlleleFreqColumnFormatter from "shared/components/mutationTable/column/TumorAlleleFreqColumnFormatter";
-import { Mutation } from "shared/api/generated/CBioPortalAPI";
-import ExonColumnFormatter from "shared/components/mutationTable/column/ExonColumnFormatter";
-import GnomadColumnFormatter from "shared/components/mutationTable/column/GnomadColumnFormatter";
+    IMutationTableProps,
+    MutationTableColumnType,
+    default as MutationTable,
+} from 'shared/components/mutationTable/MutationTable';
+import CancerTypeColumnFormatter from 'shared/components/mutationTable/column/CancerTypeColumnFormatter';
+import TumorAlleleFreqColumnFormatter from 'shared/components/mutationTable/column/TumorAlleleFreqColumnFormatter';
+import { Mutation } from 'shared/api/generated/CBioPortalAPI';
+import ExonColumnFormatter from 'shared/components/mutationTable/column/ExonColumnFormatter';
+import GnomadColumnFormatter from 'shared/components/mutationTable/column/GnomadColumnFormatter';
 
 export interface IResultsViewMutationTableProps extends IMutationTableProps {
     // add results view specific props here if needed
-    totalNumberOfExons?:string;
+    totalNumberOfExons?: string;
 }
 //
 @observer
-export default class ResultsViewMutationTable extends MutationTable<IResultsViewMutationTableProps> {
-
-    constructor(props:IResultsViewMutationTableProps) {
+export default class ResultsViewMutationTable extends MutationTable<
+    IResultsViewMutationTableProps
+> {
+    constructor(props: IResultsViewMutationTableProps) {
         super(props);
     }
 
-    public static defaultProps =
-    {
+    public static defaultProps = {
         ...MutationTable.defaultProps,
         columns: [
             MutationTableColumnType.STUDY,
@@ -54,23 +56,36 @@ export default class ResultsViewMutationTable extends MutationTable<IResultsView
             MutationTableColumnType.HGVSC,
             MutationTableColumnType.GNOMAD,
             MutationTableColumnType.CLINVAR,
-            MutationTableColumnType.DBSNP
-        ]
+            MutationTableColumnType.DBSNP,
+        ],
     };
 
-    componentWillUpdate(nextProps:IResultsViewMutationTableProps) {
-        this._columns[MutationTableColumnType.STUDY].visible = !!(nextProps.studyIdToStudy && (Object.keys(nextProps.studyIdToStudy).length > 1));
+    componentWillUpdate(nextProps: IResultsViewMutationTableProps) {
+        this._columns[MutationTableColumnType.STUDY].visible = !!(
+            nextProps.studyIdToStudy &&
+            Object.keys(nextProps.studyIdToStudy).length > 1
+        );
     }
 
     protected generateColumns() {
         super.generateColumns();
 
         // override default visibility for some columns
-        this._columns[MutationTableColumnType.CANCER_TYPE].visible = CancerTypeColumnFormatter.isVisible(
-            this.props.dataStore ? this.props.dataStore.allData : this.props.data,
-            this.props.uniqueSampleKeyToTumorType);
-        this._columns[MutationTableColumnType.TUMOR_ALLELE_FREQ].visible = TumorAlleleFreqColumnFormatter.isVisible(
-            this.props.dataStore ? this.props.dataStore.allData : this.props.data);
+        this._columns[
+            MutationTableColumnType.CANCER_TYPE
+        ].visible = CancerTypeColumnFormatter.isVisible(
+            this.props.dataStore
+                ? this.props.dataStore.allData
+                : this.props.data,
+            this.props.uniqueSampleKeyToTumorType
+        );
+        this._columns[
+            MutationTableColumnType.TUMOR_ALLELE_FREQ
+        ].visible = TumorAlleleFreqColumnFormatter.isVisible(
+            this.props.dataStore
+                ? this.props.dataStore.allData
+                : this.props.data
+        );
 
         // order columns
         this._columns[MutationTableColumnType.STUDY].order = 0;
@@ -105,17 +120,29 @@ export default class ResultsViewMutationTable extends MutationTable<IResultsView
         this._columns[MutationTableColumnType.DBSNP].order = 280;
 
         // exclude
-        this._columns[MutationTableColumnType.CANCER_TYPE].shouldExclude = ()=>{
+        this._columns[
+            MutationTableColumnType.CANCER_TYPE
+        ].shouldExclude = () => {
             return !this.props.uniqueSampleKeyToTumorType;
         };
-        this._columns[MutationTableColumnType.NUM_MUTATIONS].shouldExclude = ()=>{
+        this._columns[
+            MutationTableColumnType.NUM_MUTATIONS
+        ].shouldExclude = () => {
             return !this.props.mutationCountCache;
         };
 
         // customization for columns
-        this._columns[MutationTableColumnType.EXON].render = 
-            (d:Mutation[]) => (ExonColumnFormatter.renderFunction(d, this.props.genomeNexusCache, false));
-        this._columns[MutationTableColumnType.EXON].headerRender = 
-            () => <span style = {{display:'inline-block'}}>Exon<br/>({this.props.totalNumberOfExons} in total)</span>;
+        this._columns[MutationTableColumnType.EXON].render = (d: Mutation[]) =>
+            ExonColumnFormatter.renderFunction(
+                d,
+                this.props.genomeNexusCache,
+                false
+            );
+        this._columns[MutationTableColumnType.EXON].headerRender = () => (
+            <span style={{ display: 'inline-block' }}>
+                Exon
+                <br />({this.props.totalNumberOfExons} in total)
+            </span>
+        );
     }
 }
diff --git a/src/pages/resultsView/mutation/mutations.scss b/src/pages/resultsView/mutation/mutations.scss
index 145a814d96d..b2faa02b173 100644
--- a/src/pages/resultsView/mutation/mutations.scss
+++ b/src/pages/resultsView/mutation/mutations.scss
@@ -1,8 +1,5 @@
 .resultsPageMutationsGeneTabs .tab-content {
-  .mutationMapperMetaColumn label {
-    margin-right:5px;
-  }
+    .mutationMapperMetaColumn label {
+        margin-right: 5px;
+    }
 }
-
-
-
diff --git a/src/pages/resultsView/mutationCountHelpers.spec.ts b/src/pages/resultsView/mutationCountHelpers.spec.ts
index 6ff74bc843d..2bdc91b961a 100644
--- a/src/pages/resultsView/mutationCountHelpers.spec.ts
+++ b/src/pages/resultsView/mutationCountHelpers.spec.ts
@@ -1,116 +1,133 @@
-import {assert} from 'chai';
+import { assert } from 'chai';
 
-import {countMutations} from "./mutationCountHelpers";
-import {Mutation} from "../../shared/api/generated/CBioPortalAPI";
+import { countMutations } from './mutationCountHelpers';
+import { Mutation } from '../../shared/api/generated/CBioPortalAPI';
 
 describe('#countMutations', () => {
-
     it('produces keyed table of position identifiers', () => {
-
         let mutations = [
             {
-                "uniqueSampleKey": "VENHQS1aSC1BOFk4LTAxOmNob2xfdGNnYQ",
-                "uniquePatientKey": "VENHQS1aSC1BOFk4OmNob2xfdGNnYQ",
-                "molecularProfileId": "chol_tcga_mutations",
-                "sampleId": "TCGA-ZH-A8Y8-01",
-                "patientId": "TCGA-ZH-A8Y8",
-                "entrezGeneId": 3845,
-                "gene": {
-                    "entrezGeneId": 3845,
-                    "hugoGeneSymbol": "KRAS",
-                    "type": "protein-coding"
+                uniqueSampleKey: 'VENHQS1aSC1BOFk4LTAxOmNob2xfdGNnYQ',
+                uniquePatientKey: 'VENHQS1aSC1BOFk4OmNob2xfdGNnYQ',
+                molecularProfileId: 'chol_tcga_mutations',
+                sampleId: 'TCGA-ZH-A8Y8-01',
+                patientId: 'TCGA-ZH-A8Y8',
+                entrezGeneId: 3845,
+                gene: {
+                    entrezGeneId: 3845,
+                    hugoGeneSymbol: 'KRAS',
+                    type: 'protein-coding',
                 },
-                "studyId": "chol_tcga",
-                "center": "hgsc.bcm.edu;broad.mit.edu;ucsc.edu;bcgsc.ca",
-                "mutationStatus": "Somatic",
-                "validationStatus": "Untested",
-                "tumorAltCount": -1,
-                "tumorRefCount": -1,
-                "normalAltCount": -1,
-                "normalRefCount": -1,
-                "startPosition": 25380277,
-                "endPosition": 25380278,
-                "referenceAllele": "GA",
-                "proteinChange": "Q61K",
-                "mutationType": "Missense_Mutation",
-                "functionalImpactScore": "[Not Available]",
-                "fisValue": 1.4013e-45,
-                "linkXvar": "[Not Available]",
-                "linkPdb": "[Not Available]",
-                "linkMsa": "[Not Available]",
-                "ncbiBuild": "GRCh37",
-                "variantType": "DNP",
-                "keyword": "KRAS Q61 missense",
-                "driverFilter": "",
-                "driverFilterAnnotation": "",
-                "driverTiersFilter": "",
-                "driverTiersFilterAnnotation": "",
-                "variantAllele": "TT",
-                "refseqMrnaId": "NM_033360.2",
-                "proteinPosStart": 60,
-                "proteinPosEnd": 61
-            }, {
-                "uniqueSampleKey": "VENHQS0zWC1BQVZCLTAxOmNob2xfdGNnYQ",
-                "uniquePatientKey": "VENHQS0zWC1BQVZCOmNob2xfdGNnYQ",
-                "molecularProfileId": "chol_tcga_mutations",
-                "sampleId": "TCGA-3X-AAVB-01",
-                "patientId": "TCGA-3X-AAVB",
-                "entrezGeneId": 3845,
-                "gene": {
-                    "entrezGeneId": 3845,
-                    "hugoGeneSymbol": "KRAS",
-                    "type": "protein-coding",
-                    "chromosome": "12"
+                studyId: 'chol_tcga',
+                center: 'hgsc.bcm.edu;broad.mit.edu;ucsc.edu;bcgsc.ca',
+                mutationStatus: 'Somatic',
+                validationStatus: 'Untested',
+                tumorAltCount: -1,
+                tumorRefCount: -1,
+                normalAltCount: -1,
+                normalRefCount: -1,
+                startPosition: 25380277,
+                endPosition: 25380278,
+                referenceAllele: 'GA',
+                proteinChange: 'Q61K',
+                mutationType: 'Missense_Mutation',
+                functionalImpactScore: '[Not Available]',
+                fisValue: 1.4013e-45,
+                linkXvar: '[Not Available]',
+                linkPdb: '[Not Available]',
+                linkMsa: '[Not Available]',
+                ncbiBuild: 'GRCh37',
+                variantType: 'DNP',
+                keyword: 'KRAS Q61 missense',
+                driverFilter: '',
+                driverFilterAnnotation: '',
+                driverTiersFilter: '',
+                driverTiersFilterAnnotation: '',
+                variantAllele: 'TT',
+                refseqMrnaId: 'NM_033360.2',
+                proteinPosStart: 60,
+                proteinPosEnd: 61,
+            },
+            {
+                uniqueSampleKey: 'VENHQS0zWC1BQVZCLTAxOmNob2xfdGNnYQ',
+                uniquePatientKey: 'VENHQS0zWC1BQVZCOmNob2xfdGNnYQ',
+                molecularProfileId: 'chol_tcga_mutations',
+                sampleId: 'TCGA-3X-AAVB-01',
+                patientId: 'TCGA-3X-AAVB',
+                entrezGeneId: 3845,
+                gene: {
+                    entrezGeneId: 3845,
+                    hugoGeneSymbol: 'KRAS',
+                    type: 'protein-coding',
+                    chromosome: '12',
                 },
-                "studyId": "chol_tcga",
-                "center": "hgsc.bcm.edu;broad.mit.edu;ucsc.edu;bcgsc.ca",
-                "mutationStatus": "Somatic",
-                "validationStatus": "Untested",
-                "tumorAltCount": -1,
-                "tumorRefCount": -1,
-                "normalAltCount": -1,
-                "normalRefCount": -1,
-                "startPosition": 25398285,
-                "endPosition": 25398285,
-                "referenceAllele": "C",
-                "proteinChange": "G12R",
-                "mutationType": "Missense_Mutation",
-                "functionalImpactScore": "M",
-                "fisValue": 2.675,
-                "linkXvar": "getma.org/?cm=var&var=hg19,12,25398285,C,G&fts=all",
-                "linkPdb": "getma.org/pdb.php?prot=RASK_HUMAN&from=5&to=165&var=G12R",
-                "linkMsa": "getma.org/?cm=msa&ty=f&p=RASK_HUMAN&rb=5&re=165&var=G12R",
-                "ncbiBuild": "GRCh37",
-                "variantType": "SNP",
-                "keyword": "KRAS G12 missense",
-                "driverFilter": "",
-                "driverFilterAnnotation": "",
-                "driverTiersFilter": "",
-                "driverTiersFilterAnnotation": "",
-                "variantAllele": "G",
-                "refseqMrnaId": "NM_033360.2",
-                "proteinPosStart": 12,
-                "proteinPosEnd": 12
-            }
+                studyId: 'chol_tcga',
+                center: 'hgsc.bcm.edu;broad.mit.edu;ucsc.edu;bcgsc.ca',
+                mutationStatus: 'Somatic',
+                validationStatus: 'Untested',
+                tumorAltCount: -1,
+                tumorRefCount: -1,
+                normalAltCount: -1,
+                normalRefCount: -1,
+                startPosition: 25398285,
+                endPosition: 25398285,
+                referenceAllele: 'C',
+                proteinChange: 'G12R',
+                mutationType: 'Missense_Mutation',
+                functionalImpactScore: 'M',
+                fisValue: 2.675,
+                linkXvar: 'getma.org/?cm=var&var=hg19,12,25398285,C,G&fts=all',
+                linkPdb:
+                    'getma.org/pdb.php?prot=RASK_HUMAN&from=5&to=165&var=G12R',
+                linkMsa:
+                    'getma.org/?cm=msa&ty=f&p=RASK_HUMAN&rb=5&re=165&var=G12R',
+                ncbiBuild: 'GRCh37',
+                variantType: 'SNP',
+                keyword: 'KRAS G12 missense',
+                driverFilter: '',
+                driverFilterAnnotation: '',
+                driverTiersFilter: '',
+                driverTiersFilterAnnotation: '',
+                variantAllele: 'G',
+                refseqMrnaId: 'NM_033360.2',
+                proteinPosStart: 12,
+                proteinPosEnd: 12,
+            },
         ] as Mutation[];
 
-
         const expectedResult_missense = {
-            "3845_60_61": {"entrezGeneId": 3845, "proteinPosStart": 60, "proteinPosEnd": 61},
-            "3845_12_12": {"entrezGeneId": 3845, "proteinPosStart": 12, "proteinPosEnd": 12}
+            '3845_60_61': {
+                entrezGeneId: 3845,
+                proteinPosStart: 60,
+                proteinPosEnd: 61,
+            },
+            '3845_12_12': {
+                entrezGeneId: 3845,
+                proteinPosStart: 12,
+                proteinPosEnd: 12,
+            },
         };
 
-        assert.deepEqual(countMutations(mutations), expectedResult_missense, 'missense mutations are counted');
+        assert.deepEqual(
+            countMutations(mutations),
+            expectedResult_missense,
+            'missense mutations are counted'
+        );
 
-        mutations[0].mutationType = "in_frame_del";
+        mutations[0].mutationType = 'in_frame_del';
 
-        assert.deepEqual(countMutations(mutations), expectedResult_missense, 'frame mutations are counted');
-
-        mutations[0].mutationType = "splice";
-
-        assert.deepEqual(countMutations(mutations), expectedResult_missense, 'splice mutations are counted');
+        assert.deepEqual(
+            countMutations(mutations),
+            expectedResult_missense,
+            'frame mutations are counted'
+        );
 
+        mutations[0].mutationType = 'splice';
 
+        assert.deepEqual(
+            countMutations(mutations),
+            expectedResult_missense,
+            'splice mutations are counted'
+        );
     });
-
 });
diff --git a/src/pages/resultsView/mutationCountHelpers.ts b/src/pages/resultsView/mutationCountHelpers.ts
index d48c90b2656..82ea2dbac3a 100644
--- a/src/pages/resultsView/mutationCountHelpers.ts
+++ b/src/pages/resultsView/mutationCountHelpers.ts
@@ -1,19 +1,28 @@
-import {Mutation} from "../../shared/api/generated/CBioPortalAPI";
-import {getSimplifiedMutationType} from "../../shared/lib/oql/AccessorsForOqlFilter";
+import { Mutation } from '../../shared/api/generated/CBioPortalAPI';
+import { getSimplifiedMutationType } from '../../shared/lib/oql/AccessorsForOqlFilter';
 
-export function countMutations(mutations: Pick<Mutation, "entrezGeneId"|"proteinPosStart"|"proteinPosEnd">[]){
-    const mutationPositionIdentifiers:any = {};
+export function countMutations(
+    mutations: Pick<
+        Mutation,
+        'entrezGeneId' | 'proteinPosStart' | 'proteinPosEnd'
+    >[]
+) {
+    const mutationPositionIdentifiers: any = {};
     for (const mutation of mutations) {
         const key = mutationCountByPositionKey(mutation);
         mutationPositionIdentifiers[key] = {
             entrezGeneId: mutation.entrezGeneId,
             proteinPosStart: mutation.proteinPosStart,
-            proteinPosEnd: mutation.proteinPosEnd
+            proteinPosEnd: mutation.proteinPosEnd,
         };
     }
     return mutationPositionIdentifiers;
 }
 
-export function mutationCountByPositionKey(obj:{entrezGeneId:number, proteinPosStart:number, proteinPosEnd:number}) {
+export function mutationCountByPositionKey(obj: {
+    entrezGeneId: number;
+    proteinPosStart: number;
+    proteinPosEnd: number;
+}) {
     return `${obj.entrezGeneId}_${obj.proteinPosStart}_${obj.proteinPosEnd}`;
-}
\ No newline at end of file
+}
diff --git a/src/pages/resultsView/mutualExclusivity/MutualExclusivityTab.tsx b/src/pages/resultsView/mutualExclusivity/MutualExclusivityTab.tsx
index 7d7bbba820d..d087d1ad23c 100644
--- a/src/pages/resultsView/mutualExclusivity/MutualExclusivityTab.tsx
+++ b/src/pages/resultsView/mutualExclusivity/MutualExclusivityTab.tsx
@@ -1,40 +1,52 @@
 import * as React from 'react';
 import * as _ from 'lodash';
-import MutualExclusivityTable from "./MutualExclusivityTable";
-import { observer } from "mobx-react";
+import MutualExclusivityTable from './MutualExclusivityTable';
+import { observer } from 'mobx-react';
 import { Checkbox } from 'react-bootstrap';
-import styles from "./styles.module.scss";
-import { computed, observable } from "mobx";
-import { MutualExclusivity } from "../../../shared/model/MutualExclusivity";
-import { ResultsViewPageStore } from "../ResultsViewPageStore";
-import DiscreteCNACache from "../../../shared/cache/DiscreteCNACache";
+import styles from './styles.module.scss';
+import { computed, observable } from 'mobx';
+import { MutualExclusivity } from '../../../shared/model/MutualExclusivity';
+import { ResultsViewPageStore } from '../ResultsViewPageStore';
+import DiscreteCNACache from '../../../shared/cache/DiscreteCNACache';
 import { If, Then, Else } from 'react-if';
-import Loader from "../../../shared/components/loadingIndicator/LoadingIndicator";
-import { getTrackPairsCountText, getData, getFilteredData, AlteredStatus, getSampleAlteredFilteredMap } from "./MutualExclusivityUtil";
-import OqlStatusBanner from "../../../shared/components/banners/OqlStatusBanner";
-import { OQLLineFilterOutput } from "../../../shared/lib/oql/oqlfilter";
-import MobxPromise from "mobxpromise";
-import {SampleAlteredMap} from "../ResultsViewPageStoreUtils";
+import Loader from '../../../shared/components/loadingIndicator/LoadingIndicator';
+import {
+    getTrackPairsCountText,
+    getData,
+    getFilteredData,
+    AlteredStatus,
+    getSampleAlteredFilteredMap,
+} from './MutualExclusivityUtil';
+import OqlStatusBanner from '../../../shared/components/banners/OqlStatusBanner';
+import { OQLLineFilterOutput } from '../../../shared/lib/oql/oqlfilter';
+import MobxPromise from 'mobxpromise';
+import { SampleAlteredMap } from '../ResultsViewPageStoreUtils';
 import Pluralize from 'pluralize';
-import AlterationFilterWarning from "../../../shared/components/banners/AlterationFilterWarning";
+import AlterationFilterWarning from '../../../shared/components/banners/AlterationFilterWarning';
 
 export interface IMutualExclusivityTabProps {
-    store?:ResultsViewPageStore;
-    isSampleAlteredMap:MobxPromise<SampleAlteredMap>;
+    store?: ResultsViewPageStore;
+    isSampleAlteredMap: MobxPromise<SampleAlteredMap>;
 }
 
 @observer
-export default class MutualExclusivityTab extends React.Component<IMutualExclusivityTabProps, {}> {
-
+export default class MutualExclusivityTab extends React.Component<
+    IMutualExclusivityTabProps,
+    {}
+> {
     @observable mutualExclusivityFilter: boolean = true;
     @observable coOccurenceFilter: boolean = true;
     @observable significantPairsFilter: boolean = false;
 
     constructor(props: IMutualExclusivityTabProps) {
         super(props);
-        this.mutualExclusivityFilterChange = this.mutualExclusivityFilterChange.bind(this);
+        this.mutualExclusivityFilterChange = this.mutualExclusivityFilterChange.bind(
+            this
+        );
         this.coOccurenceFilterChange = this.coOccurenceFilterChange.bind(this);
-        this.significantPairsFilterChange = this.significantPairsFilterChange.bind(this);
+        this.significantPairsFilterChange = this.significantPairsFilterChange.bind(
+            this
+        );
     }
 
     @computed get data(): MutualExclusivity[] {
@@ -42,25 +54,38 @@ export default class MutualExclusivityTab extends React.Component<IMutualExclusi
     }
 
     @computed get filteredData(): MutualExclusivity[] {
-        return getFilteredData(this.data, this.mutualExclusivityFilter, this.coOccurenceFilter,
-            this.significantPairsFilter);
+        return getFilteredData(
+            this.data,
+            this.mutualExclusivityFilter,
+            this.coOccurenceFilter,
+            this.significantPairsFilter
+        );
     }
 
     @computed get isSampleAlteredFilteredMap(): SampleAlteredMap {
-        return getSampleAlteredFilteredMap(this.props.isSampleAlteredMap.result!);
+        return getSampleAlteredFilteredMap(
+            this.props.isSampleAlteredMap.result!
+        );
     }
 
     @computed get filteredTrackOqls(): string[] {
-        return _.difference(Object.keys(this.props.isSampleAlteredMap.result!), Object.keys(this.isSampleAlteredFilteredMap));
+        return _.difference(
+            Object.keys(this.props.isSampleAlteredMap.result!),
+            Object.keys(this.isSampleAlteredFilteredMap)
+        );
     }
-    
+
     @computed get filteredTrackOqlsMessage(): string {
         if (this.filteredTrackOqls.length == 1) {
             return `${this.filteredTrackOqls[0]} is not profiled in any queried samples and therefore is excluded from this analysis.`;
         } else if (this.filteredTrackOqls.length > 1) {
-            return `${this.filteredTrackOqls.slice(0, -1).join(', ')} and ${this.filteredTrackOqls.slice(-1)} are not profiled in any queried samples and therefore are excluded from this analysis.`
+            return `${this.filteredTrackOqls
+                .slice(0, -1)
+                .join(', ')} and ${this.filteredTrackOqls.slice(
+                -1
+            )} are not profiled in any queried samples and therefore are excluded from this analysis.`;
         } else {
-            return "";
+            return '';
         }
     }
 
@@ -78,9 +103,9 @@ export default class MutualExclusivityTab extends React.Component<IMutualExclusi
 
     @computed private get notEnoughDataError() {
         if (_.size(this.props.isSampleAlteredMap.result) < 2) {
-            return "Mutual exclusivity analysis can only be performed when data from at least two genes is provided.";
+            return 'Mutual exclusivity analysis can only be performed when data from at least two genes is provided.';
         } else if (_.size(this.isSampleAlteredFilteredMap) < 2) {
-            return "Mutual exclusivity analysis can only be performed when at least two of the queried genes have been profiled in the queried samples.";
+            return 'Mutual exclusivity analysis can only be performed when at least two of the queried genes have been profiled in the queried samples.';
         } else {
             return null;
         }
@@ -88,34 +113,54 @@ export default class MutualExclusivityTab extends React.Component<IMutualExclusi
 
     public render() {
         if (this.props.isSampleAlteredMap.isPending) {
-            return <Loader isLoading={true} />
+            return <Loader isLoading={true} />;
         } else if (this.props.isSampleAlteredMap.isComplete) {
             if (!this.notEnoughDataError) {
                 return (
                     <div data-test="mutualExclusivityTabDiv">
                         {this.props.store && (
-                            <div className={"tabMessageContainer"}>
-                                <OqlStatusBanner className="mutex-oql-status-banner" store={this.props.store} tabReflectsOql={true} />
+                            <div className={'tabMessageContainer'}>
+                                <OqlStatusBanner
+                                    className="mutex-oql-status-banner"
+                                    store={this.props.store}
+                                    tabReflectsOql={true}
+                                />
                                 {this.filteredTrackOqls.length > 0 && (
-                                    <div className="alert alert-warning" role="alert">{this.filteredTrackOqlsMessage}</div>
+                                    <div
+                                        className="alert alert-warning"
+                                        role="alert"
+                                    >
+                                        {this.filteredTrackOqlsMessage}
+                                    </div>
                                 )}
-                                <AlterationFilterWarning store={this.props.store}/>
+                                <AlterationFilterWarning
+                                    store={this.props.store}
+                                />
                             </div>
                         )}
 
-                        {getTrackPairsCountText(this.data, _.size(this.isSampleAlteredFilteredMap))}
+                        {getTrackPairsCountText(
+                            this.data,
+                            _.size(this.isSampleAlteredFilteredMap)
+                        )}
 
                         <div className={styles.Checkboxes}>
-                            <Checkbox checked={this.mutualExclusivityFilter}
-                                      onChange={this.mutualExclusivityFilterChange}>
+                            <Checkbox
+                                checked={this.mutualExclusivityFilter}
+                                onChange={this.mutualExclusivityFilterChange}
+                            >
                                 Mutual exclusivity
                             </Checkbox>
-                            <Checkbox checked={this.coOccurenceFilter}
-                                      onChange={this.coOccurenceFilterChange}>
+                            <Checkbox
+                                checked={this.coOccurenceFilter}
+                                onChange={this.coOccurenceFilterChange}
+                            >
                                 Co-occurrence
                             </Checkbox>
-                            <Checkbox checked={this.significantPairsFilter}
-                                      onChange={this.significantPairsFilterChange}>
+                            <Checkbox
+                                checked={this.significantPairsFilter}
+                                onChange={this.significantPairsFilterChange}
+                            >
                                 Significant only
                             </Checkbox>
                         </div>
@@ -124,14 +169,18 @@ export default class MutualExclusivityTab extends React.Component<IMutualExclusi
                 );
             } else {
                 return (
-                    <div className={"tabMessageContainer"}>
-                        <div className={"alert alert-info"}>
+                    <div className={'tabMessageContainer'}>
+                        <div className={'alert alert-info'}>
                             {this.notEnoughDataError}
                         </div>
                         {this.filteredTrackOqls.length > 0 && (
-                            <div className="alert alert-warning" role="alert">{this.filteredTrackOqlsMessage}</div>
+                            <div className="alert alert-warning" role="alert">
+                                {this.filteredTrackOqlsMessage}
+                            </div>
+                        )}
+                        {this.props.store && (
+                            <AlterationFilterWarning store={this.props.store} />
                         )}
-                        {this.props.store && <AlterationFilterWarning store={this.props.store}/>}
                     </div>
                 );
             }
@@ -139,4 +188,4 @@ export default class MutualExclusivityTab extends React.Component<IMutualExclusi
             return null;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/resultsView/mutualExclusivity/MutualExclusivityTable.tsx b/src/pages/resultsView/mutualExclusivity/MutualExclusivityTable.tsx
index 96584b1d847..840a607ee41 100644
--- a/src/pages/resultsView/mutualExclusivity/MutualExclusivityTable.tsx
+++ b/src/pages/resultsView/mutualExclusivity/MutualExclusivityTable.tsx
@@ -1,13 +1,19 @@
 import * as React from 'react';
-import * as _ from "lodash";
-import LazyMobXTable, { Column } from "../../../shared/components/lazyMobXTable/LazyMobXTable";
-import { MutualExclusivity } from "../../../shared/model/MutualExclusivity";
-import { observer } from "mobx-react";
-import { observable } from "mobx";
+import * as _ from 'lodash';
+import LazyMobXTable, {
+    Column,
+} from '../../../shared/components/lazyMobXTable/LazyMobXTable';
+import { MutualExclusivity } from '../../../shared/model/MutualExclusivity';
+import { observer } from 'mobx-react';
+import { observable } from 'mobx';
 import { Badge } from 'react-bootstrap';
-import { formatPValue, formatQValueWithStyle, formatLogOddsRatio } from "./MutualExclusivityUtil";
-import styles from "./styles.module.scss";
-import classNames from "classnames";
+import {
+    formatPValue,
+    formatQValueWithStyle,
+    formatLogOddsRatio,
+} from './MutualExclusivityUtil';
+import styles from './styles.module.scss';
+import classNames from 'classnames';
 
 export interface IMutualExclusivityTableProps {
     columns?: MutualExclusivityTableColumnType[];
@@ -25,18 +31,26 @@ export enum MutualExclusivityTableColumnType {
     LOG_ODDS_RATIO,
     P_VALUE,
     Q_VALUE,
-    ASSOCIATION
+    ASSOCIATION,
 }
 
-type MutualExclusivityTableColumn = Column<MutualExclusivity> & { order?: number, shouldExclude?: () => boolean };
+type MutualExclusivityTableColumn = Column<MutualExclusivity> & {
+    order?: number;
+    shouldExclude?: () => boolean;
+};
 
-export class MutualExclusivityTableComponent extends LazyMobXTable<MutualExclusivity> {
-}
+export class MutualExclusivityTableComponent extends LazyMobXTable<
+    MutualExclusivity
+> {}
 
 @observer
-export default class MutualExclusivityTable extends React.Component<IMutualExclusivityTableProps, {}> {
-
-    @observable protected _columns: { [columnEnum: number]: MutualExclusivityTableColumn };
+export default class MutualExclusivityTable extends React.Component<
+    IMutualExclusivityTableProps,
+    {}
+> {
+    @observable protected _columns: {
+        [columnEnum: number]: MutualExclusivityTableColumn;
+    };
 
     constructor(props: IMutualExclusivityTableProps) {
         super(props);
@@ -55,96 +69,146 @@ export default class MutualExclusivityTable extends React.Component<IMutualExclu
             MutualExclusivityTableColumnType.LOG_ODDS_RATIO,
             MutualExclusivityTableColumnType.P_VALUE,
             MutualExclusivityTableColumnType.Q_VALUE,
-            MutualExclusivityTableColumnType.ASSOCIATION
+            MutualExclusivityTableColumnType.ASSOCIATION,
         ],
-        initialSortColumn: "q-Value"
+        initialSortColumn: 'q-Value',
     };
 
     protected generateColumns() {
         this._columns = {};
 
         this._columns[MutualExclusivityTableColumnType.TRACK_A] = {
-            name: "A",
-            render: (d: MutualExclusivity) => <span><b>{d.trackA}</b></span>,
+            name: 'A',
+            render: (d: MutualExclusivity) => (
+                <span>
+                    <b>{d.trackA}</b>
+                </span>
+            ),
             tooltip: <span>A</span>,
-            filter: (d: MutualExclusivity, filterString: string, filterStringUpper: string) =>
-                d.trackA.toUpperCase().includes(filterStringUpper),
+            filter: (
+                d: MutualExclusivity,
+                filterString: string,
+                filterStringUpper: string
+            ) => d.trackA.toUpperCase().includes(filterStringUpper),
             sortBy: (d: MutualExclusivity) => d.trackA,
-            download: (d: MutualExclusivity) => d.trackA
+            download: (d: MutualExclusivity) => d.trackA,
         };
 
         this._columns[MutualExclusivityTableColumnType.TRACK_B] = {
-            name: "B",
-            render: (d: MutualExclusivity) => <span><b>{d.trackB}</b></span>,
+            name: 'B',
+            render: (d: MutualExclusivity) => (
+                <span>
+                    <b>{d.trackB}</b>
+                </span>
+            ),
             tooltip: <span>B</span>,
-            filter: (d: MutualExclusivity, filterString: string, filterStringUpper: string) =>
-                d.trackB.toUpperCase().includes(filterStringUpper),
+            filter: (
+                d: MutualExclusivity,
+                filterString: string,
+                filterStringUpper: string
+            ) => d.trackB.toUpperCase().includes(filterStringUpper),
             sortBy: (d: MutualExclusivity) => d.trackB,
-            download: (d: MutualExclusivity) => d.trackB
+            download: (d: MutualExclusivity) => d.trackB,
         };
 
         this._columns[MutualExclusivityTableColumnType.NEITHER] = {
-            name: "Neither",
+            name: 'Neither',
             render: (d: MutualExclusivity) => <span>{d.neitherCount}</span>,
-            tooltip: <span>Number of samples with alterations in neither A nor B</span>,
+            tooltip: (
+                <span>
+                    Number of samples with alterations in neither A nor B
+                </span>
+            ),
             sortBy: (d: MutualExclusivity) => d.neitherCount,
-            download: (d: MutualExclusivity) => d.neitherCount.toString()
+            download: (d: MutualExclusivity) => d.neitherCount.toString(),
         };
 
         this._columns[MutualExclusivityTableColumnType.A_NOT_B] = {
-            name: "A Not B",
+            name: 'A Not B',
             render: (d: MutualExclusivity) => <span>{d.aNotBCount}</span>,
-            tooltip: <span>Number of samples with alterations in A but not in B</span>,
+            tooltip: (
+                <span>
+                    Number of samples with alterations in A but not in B
+                </span>
+            ),
             sortBy: (d: MutualExclusivity) => d.aNotBCount,
-            download: (d: MutualExclusivity) => d.aNotBCount.toString()
+            download: (d: MutualExclusivity) => d.aNotBCount.toString(),
         };
 
         this._columns[MutualExclusivityTableColumnType.B_NOT_A] = {
-            name: "B Not A",
+            name: 'B Not A',
             render: (d: MutualExclusivity) => <span>{d.bNotACount}</span>,
-            tooltip: <span>Number of samples with alterations in B but not in A</span>,
+            tooltip: (
+                <span>
+                    Number of samples with alterations in B but not in A
+                </span>
+            ),
             sortBy: (d: MutualExclusivity) => d.bNotACount,
-            download: (d: MutualExclusivity) => d.bNotACount.toString()
+            download: (d: MutualExclusivity) => d.bNotACount.toString(),
         };
 
         this._columns[MutualExclusivityTableColumnType.BOTH] = {
-            name: "Both",
+            name: 'Both',
             render: (d: MutualExclusivity) => <span>{d.bothCount}</span>,
-            tooltip: <span>Number of samples with alterations in both A and B</span>,
+            tooltip: (
+                <span>Number of samples with alterations in both A and B</span>
+            ),
             sortBy: (d: MutualExclusivity) => d.bothCount,
-            download: (d: MutualExclusivity) => d.bothCount.toString()
+            download: (d: MutualExclusivity) => d.bothCount.toString(),
         };
 
         this._columns[MutualExclusivityTableColumnType.LOG_ODDS_RATIO] = {
-            name: "Log2 Odds Ratio",
-            render: (d: MutualExclusivity) => <span>{formatLogOddsRatio(d.logOddsRatio)}</span>,
-            tooltip: <span style={{ display: 'inline-block', maxWidth: 300 }}>Quantifies how strongly the presence or
-                absence of alterations in A are associated with the presence or absence of alterations in B in
-                the selected samples. OR = (Neither * Both) / (A Not B * B Not A)</span>,
+            name: 'Log2 Odds Ratio',
+            render: (d: MutualExclusivity) => (
+                <span>{formatLogOddsRatio(d.logOddsRatio)}</span>
+            ),
+            tooltip: (
+                <span style={{ display: 'inline-block', maxWidth: 300 }}>
+                    Quantifies how strongly the presence or absence of
+                    alterations in A are associated with the presence or absence
+                    of alterations in B in the selected samples. OR = (Neither *
+                    Both) / (A Not B * B Not A)
+                </span>
+            ),
             sortBy: (d: MutualExclusivity) => d.logOddsRatio,
-            download: (d: MutualExclusivity) => formatLogOddsRatio(d.logOddsRatio)
+            download: (d: MutualExclusivity) =>
+                formatLogOddsRatio(d.logOddsRatio),
         };
 
         this._columns[MutualExclusivityTableColumnType.P_VALUE] = {
-            name: "p-Value",
-            render: (d: MutualExclusivity) => <span>{formatPValue(d.pValue)}</span>,
+            name: 'p-Value',
+            render: (d: MutualExclusivity) => (
+                <span>{formatPValue(d.pValue)}</span>
+            ),
             tooltip: <span>Derived from one-sided Fisher Exact Test</span>,
             sortBy: (d: MutualExclusivity) => d.pValue,
-            download: (d: MutualExclusivity) => formatPValue(d.pValue)
+            download: (d: MutualExclusivity) => formatPValue(d.pValue),
         };
 
         this._columns[MutualExclusivityTableColumnType.Q_VALUE] = {
-            name: "q-Value",
+            name: 'q-Value',
             render: (d: MutualExclusivity) => formatQValueWithStyle(d.qValue),
-            tooltip: <span>Derived from Benjamini-Hochberg FDR correction procedure</span>,
+            tooltip: (
+                <span>
+                    Derived from Benjamini-Hochberg FDR correction procedure
+                </span>
+            ),
             sortBy: (d: MutualExclusivity) => d.qValue,
-            download: (d: MutualExclusivity) => formatPValue(d.qValue)
+            download: (d: MutualExclusivity) => formatPValue(d.qValue),
         };
 
         this._columns[MutualExclusivityTableColumnType.ASSOCIATION] = {
-            name: "Tendency",
-            render: (d: MutualExclusivity) => <div className={classNames(styles.Tendency, {[styles.Significant]:(d.qValue < 0.05)})}>{d.association}</div>,
-            tooltip: 
+            name: 'Tendency',
+            render: (d: MutualExclusivity) => (
+                <div
+                    className={classNames(styles.Tendency, {
+                        [styles.Significant]: d.qValue < 0.05,
+                    })}
+                >
+                    {d.association}
+                </div>
+            ),
+            tooltip: (
                 <table>
                     <tr>
                         <td>Log2 ratio > 0</td>
@@ -158,19 +222,31 @@ export default class MutualExclusivityTable extends React.Component<IMutualExclu
                         <td>q-Value &lt; 0.05</td>
                         <td>: Significant association</td>
                     </tr>
-                </table>,
-            filter: (d: MutualExclusivity, filterString: string, filterStringUpper: string) =>
-                d.association.toUpperCase().includes(filterStringUpper),
+                </table>
+            ),
+            filter: (
+                d: MutualExclusivity,
+                filterString: string,
+                filterStringUpper: string
+            ) => d.association.toUpperCase().includes(filterStringUpper),
             sortBy: (d: MutualExclusivity) => d.association,
-            download: (d: MutualExclusivity) => d.association
+            download: (d: MutualExclusivity) => d.association,
         };
     }
 
     public render() {
-        const orderedColumns = _.sortBy(this._columns, (c: MutualExclusivityTableColumn) => c.order);
+        const orderedColumns = _.sortBy(
+            this._columns,
+            (c: MutualExclusivityTableColumn) => c.order
+        );
         return (
-            <MutualExclusivityTableComponent columns={orderedColumns} data={this.props.data} initialItemsPerPage={50}
-                initialSortColumn={this.props.initialSortColumn} paginationProps={{ itemsPerPageOptions: [50] }}/>
+            <MutualExclusivityTableComponent
+                columns={orderedColumns}
+                data={this.props.data}
+                initialItemsPerPage={50}
+                initialSortColumn={this.props.initialSortColumn}
+                paginationProps={{ itemsPerPageOptions: [50] }}
+            />
         );
     }
 }
diff --git a/src/pages/resultsView/mutualExclusivity/MutualExclusivityUtil.spec.tsx b/src/pages/resultsView/mutualExclusivity/MutualExclusivityUtil.spec.tsx
index 151f1e68349..5cd8a420220 100644
--- a/src/pages/resultsView/mutualExclusivity/MutualExclusivityUtil.spec.tsx
+++ b/src/pages/resultsView/mutualExclusivity/MutualExclusivityUtil.spec.tsx
@@ -2,153 +2,283 @@ import { assert } from 'chai';
 import React from 'react';
 import * as _ from 'lodash';
 import {
-    calculateAssociation, countOccurences, calculatePValue, calculateLogOddsRatio, getMutuallyExclusiveCounts,
-    getTrackPairsCountText, getData, getFilteredData, formatPValue, formatQValueWithStyle, formatLogOddsRatio, calculateAdjustedPValue, AlteredStatus
-} from "./MutualExclusivityUtil";
-import { MutualExclusivity } from "../../../shared/model/MutualExclusivity";
+    calculateAssociation,
+    countOccurences,
+    calculatePValue,
+    calculateLogOddsRatio,
+    getMutuallyExclusiveCounts,
+    getTrackPairsCountText,
+    getData,
+    getFilteredData,
+    formatPValue,
+    formatQValueWithStyle,
+    formatLogOddsRatio,
+    calculateAdjustedPValue,
+    AlteredStatus,
+} from './MutualExclusivityUtil';
+import { MutualExclusivity } from '../../../shared/model/MutualExclusivity';
 import expect from 'expect';
 import expectJSX from 'expect-jsx';
-import { mount } from "enzyme";
-import { Checkbox } from "react-bootstrap";
-import MutualExclusivityTable from "./MutualExclusivityTable";
+import { mount } from 'enzyme';
+import { Checkbox } from 'react-bootstrap';
+import MutualExclusivityTable from './MutualExclusivityTable';
 
 expect.extend(expectJSX);
 
 const exampleData = [
     {
-        "trackA": "EGFR",
-        "trackB": "KRAS",
-        "neitherCount": 0,
-        "aNotBCount": 5,
-        "bNotACount": 5,
-        "bothCount": 0,
-        "logOddsRatio": -Infinity,
-        "pValue": 0.003968253968253951,
-        "qValue": 0.023809523809523704,
-        "association": "Mutual exclusivity"
+        trackA: 'EGFR',
+        trackB: 'KRAS',
+        neitherCount: 0,
+        aNotBCount: 5,
+        bNotACount: 5,
+        bothCount: 0,
+        logOddsRatio: -Infinity,
+        pValue: 0.003968253968253951,
+        qValue: 0.023809523809523704,
+        association: 'Mutual exclusivity',
     },
     {
-        "trackA": "TP53",
-        "trackB": "BRAF",
-        "neitherCount": 6,
-        "aNotBCount": 0,
-        "bNotACount": 1,
-        "bothCount": 3,
-        "logOddsRatio": Infinity,
-        "pValue": 0.03333333333333314,
-        "qValue": 0.09999999999999942,
-        "association": "Co-occurrence"
+        trackA: 'TP53',
+        trackB: 'BRAF',
+        neitherCount: 6,
+        aNotBCount: 0,
+        bNotACount: 1,
+        bothCount: 3,
+        logOddsRatio: Infinity,
+        pValue: 0.03333333333333314,
+        qValue: 0.09999999999999942,
+        association: 'Co-occurrence',
     },
     {
-        "trackA": "EGFR",
-        "trackB": "TP53",
-        "neitherCount": 2,
-        "aNotBCount": 5,
-        "bNotACount": 3,
-        "bothCount": 0,
-        "logOddsRatio": -Infinity,
-        "pValue": 0.08333333333333293,
-        "qValue": 0.12499999999999939,
-        "association": "Mutual exclusivity"
+        trackA: 'EGFR',
+        trackB: 'TP53',
+        neitherCount: 2,
+        aNotBCount: 5,
+        bNotACount: 3,
+        bothCount: 0,
+        logOddsRatio: -Infinity,
+        pValue: 0.08333333333333293,
+        qValue: 0.12499999999999939,
+        association: 'Mutual exclusivity',
     },
     {
-        "trackA": "KRAS",
-        "trackB": "TP53",
-        "neitherCount": 5,
-        "aNotBCount": 2,
-        "bNotACount": 0,
-        "bothCount": 3,
-        "logOddsRatio": Infinity,
-        "pValue": 0.08333333333333293,
-        "qValue": 0.12499999999999939,
-        "association": "Co-occurrence"
+        trackA: 'KRAS',
+        trackB: 'TP53',
+        neitherCount: 5,
+        aNotBCount: 2,
+        bNotACount: 0,
+        bothCount: 3,
+        logOddsRatio: Infinity,
+        pValue: 0.08333333333333293,
+        qValue: 0.12499999999999939,
+        association: 'Co-occurrence',
     },
     {
-        "trackA": "EGFR",
-        "trackB": "BRAF",
-        "neitherCount": 2,
-        "aNotBCount": 4,
-        "bNotACount": 3,
-        "bothCount": 1,
-        "logOddsRatio": -2.584962500721156,
-        "pValue": 0.2619047619047609,
-        "qValue": 0.2619047619047609,
-        "association": "Mutual exclusivity"
+        trackA: 'EGFR',
+        trackB: 'BRAF',
+        neitherCount: 2,
+        aNotBCount: 4,
+        bNotACount: 3,
+        bothCount: 1,
+        logOddsRatio: -2.584962500721156,
+        pValue: 0.2619047619047609,
+        qValue: 0.2619047619047609,
+        association: 'Mutual exclusivity',
     },
     {
-        "trackA": "KRAS",
-        "trackB": "BRAF",
-        "neitherCount": 4,
-        "aNotBCount": 2,
-        "bNotACount": 1,
-        "bothCount": 3,
-        "logOddsRatio": 2.584962500721156,
-        "pValue": 0.2619047619047609,
-        "qValue": 0.2619047619047609,
-        "association": "Co-occurrence"
-    }
+        trackA: 'KRAS',
+        trackB: 'BRAF',
+        neitherCount: 4,
+        aNotBCount: 2,
+        bNotACount: 1,
+        bothCount: 3,
+        logOddsRatio: 2.584962500721156,
+        pValue: 0.2619047619047609,
+        qValue: 0.2619047619047609,
+        association: 'Co-occurrence',
+    },
 ];
 
 const isSampleAlteredMap: any = {
-    "EGFR": [AlteredStatus.ALTERED, AlteredStatus.UNALTERED, AlteredStatus.ALTERED, AlteredStatus.ALTERED, AlteredStatus.UNALTERED, AlteredStatus.UNALTERED, AlteredStatus.ALTERED, AlteredStatus.ALTERED, AlteredStatus.UNALTERED, AlteredStatus.UNALTERED],
-    "KRAS": [AlteredStatus.UNALTERED, AlteredStatus.ALTERED, AlteredStatus.UNALTERED, AlteredStatus.UNALTERED, AlteredStatus.ALTERED, AlteredStatus.ALTERED, AlteredStatus.UNALTERED, AlteredStatus.UNALTERED, AlteredStatus.ALTERED, AlteredStatus.ALTERED],
-    "TP53": [AlteredStatus.UNALTERED, AlteredStatus.UNALTERED, AlteredStatus.UNALTERED, AlteredStatus.UNALTERED, AlteredStatus.UNALTERED, AlteredStatus.ALTERED, AlteredStatus.UNALTERED, AlteredStatus.UNALTERED, AlteredStatus.ALTERED, AlteredStatus.ALTERED],
-    "BRAF": [AlteredStatus.UNALTERED, AlteredStatus.UNALTERED, AlteredStatus.UNALTERED, AlteredStatus.ALTERED, AlteredStatus.UNALTERED, AlteredStatus.ALTERED, AlteredStatus.UNALTERED, AlteredStatus.UNALTERED, AlteredStatus.ALTERED, AlteredStatus.ALTERED]
+    EGFR: [
+        AlteredStatus.ALTERED,
+        AlteredStatus.UNALTERED,
+        AlteredStatus.ALTERED,
+        AlteredStatus.ALTERED,
+        AlteredStatus.UNALTERED,
+        AlteredStatus.UNALTERED,
+        AlteredStatus.ALTERED,
+        AlteredStatus.ALTERED,
+        AlteredStatus.UNALTERED,
+        AlteredStatus.UNALTERED,
+    ],
+    KRAS: [
+        AlteredStatus.UNALTERED,
+        AlteredStatus.ALTERED,
+        AlteredStatus.UNALTERED,
+        AlteredStatus.UNALTERED,
+        AlteredStatus.ALTERED,
+        AlteredStatus.ALTERED,
+        AlteredStatus.UNALTERED,
+        AlteredStatus.UNALTERED,
+        AlteredStatus.ALTERED,
+        AlteredStatus.ALTERED,
+    ],
+    TP53: [
+        AlteredStatus.UNALTERED,
+        AlteredStatus.UNALTERED,
+        AlteredStatus.UNALTERED,
+        AlteredStatus.UNALTERED,
+        AlteredStatus.UNALTERED,
+        AlteredStatus.ALTERED,
+        AlteredStatus.UNALTERED,
+        AlteredStatus.UNALTERED,
+        AlteredStatus.ALTERED,
+        AlteredStatus.ALTERED,
+    ],
+    BRAF: [
+        AlteredStatus.UNALTERED,
+        AlteredStatus.UNALTERED,
+        AlteredStatus.UNALTERED,
+        AlteredStatus.ALTERED,
+        AlteredStatus.UNALTERED,
+        AlteredStatus.ALTERED,
+        AlteredStatus.UNALTERED,
+        AlteredStatus.UNALTERED,
+        AlteredStatus.ALTERED,
+        AlteredStatus.ALTERED,
+    ],
 };
 
-describe("MutualExclusivityUtil", () => {
-    describe("#calculateAssociation()", () => {
-        it("returns Co-occurrence if log odds ratio is positive", () => {
-            assert.equal(calculateAssociation(1), "Co-occurrence");
+describe('MutualExclusivityUtil', () => {
+    describe('#calculateAssociation()', () => {
+        it('returns Co-occurrence if log odds ratio is positive', () => {
+            assert.equal(calculateAssociation(1), 'Co-occurrence');
         });
 
-        it("returns Mutual exclusivity if log odds ratio is 0", () => {
-            assert.equal(calculateAssociation(0), "Mutual exclusivity");
+        it('returns Mutual exclusivity if log odds ratio is 0', () => {
+            assert.equal(calculateAssociation(0), 'Mutual exclusivity');
         });
 
-        it("returns Mutual exclusivity if log odds ratio is negative", () => {
-            assert.equal(calculateAssociation(-1), "Mutual exclusivity");
+        it('returns Mutual exclusivity if log odds ratio is negative', () => {
+            assert.equal(calculateAssociation(-1), 'Mutual exclusivity');
         });
     });
 
-    describe("#countOccurences()", () => {
-        it("returns [1, 0, 0, 1] for [AlteredStatus.UNALTERED, AlteredStatus.ALTERED] and [AlteredStatus.UNALTERED, AlteredStatus.ALTERED]", () => {
-            assert.deepEqual(countOccurences([AlteredStatus.UNALTERED, AlteredStatus.ALTERED], [AlteredStatus.UNALTERED, AlteredStatus.ALTERED]), [1, 0, 0, 1]);
+    describe('#countOccurences()', () => {
+        it('returns [1, 0, 0, 1] for [AlteredStatus.UNALTERED, AlteredStatus.ALTERED] and [AlteredStatus.UNALTERED, AlteredStatus.ALTERED]', () => {
+            assert.deepEqual(
+                countOccurences(
+                    [AlteredStatus.UNALTERED, AlteredStatus.ALTERED],
+                    [AlteredStatus.UNALTERED, AlteredStatus.ALTERED]
+                ),
+                [1, 0, 0, 1]
+            );
         });
 
-        it("returns [1, 1, 1, 1] for [AlteredStatus.UNALTERED, AlteredStatus.ALTERED, AlteredStatus.UNALTERED, AlteredStatus.ALTERED] and [AlteredStatus.UNALTERED, AlteredStatus.ALTERED, AlteredStatus.ALTERED, AlteredStatus.UNALTERED]", () => {
-            assert.deepEqual(countOccurences([AlteredStatus.UNALTERED, AlteredStatus.ALTERED, AlteredStatus.UNALTERED, AlteredStatus.ALTERED], [AlteredStatus.UNALTERED, AlteredStatus.ALTERED, AlteredStatus.ALTERED, AlteredStatus.UNALTERED]), [1, 1, 1, 1]);
+        it('returns [1, 1, 1, 1] for [AlteredStatus.UNALTERED, AlteredStatus.ALTERED, AlteredStatus.UNALTERED, AlteredStatus.ALTERED] and [AlteredStatus.UNALTERED, AlteredStatus.ALTERED, AlteredStatus.ALTERED, AlteredStatus.UNALTERED]', () => {
+            assert.deepEqual(
+                countOccurences(
+                    [
+                        AlteredStatus.UNALTERED,
+                        AlteredStatus.ALTERED,
+                        AlteredStatus.UNALTERED,
+                        AlteredStatus.ALTERED,
+                    ],
+                    [
+                        AlteredStatus.UNALTERED,
+                        AlteredStatus.ALTERED,
+                        AlteredStatus.ALTERED,
+                        AlteredStatus.UNALTERED,
+                    ]
+                ),
+                [1, 1, 1, 1]
+            );
         });
 
-        it("returns [2, 0, 0, 0] for [AlteredStatus.UNALTERED, AlteredStatus.UNALTERED] and [AlteredStatus.UNALTERED, AlteredStatus.UNALTERED]", () => {
-            assert.deepEqual(countOccurences([AlteredStatus.UNALTERED, AlteredStatus.UNALTERED], [AlteredStatus.UNALTERED, AlteredStatus.UNALTERED]), [2, 0, 0, 0]);
+        it('returns [2, 0, 0, 0] for [AlteredStatus.UNALTERED, AlteredStatus.UNALTERED] and [AlteredStatus.UNALTERED, AlteredStatus.UNALTERED]', () => {
+            assert.deepEqual(
+                countOccurences(
+                    [AlteredStatus.UNALTERED, AlteredStatus.UNALTERED],
+                    [AlteredStatus.UNALTERED, AlteredStatus.UNALTERED]
+                ),
+                [2, 0, 0, 0]
+            );
         });
 
-        it("returns [1, 0, 1, 1] for [AlteredStatus.UNPROFILED, AlteredStatus.UNPROFILED, AlteredStatus.ALTERED, AlteredStatus.UNALTERED] and [AlteredStatus.ALTERED, AlteredStatus.ALTERED, AlteredStatus.UNALTERED, AlteredStatus.UNALTERED]", () => {
-            assert.deepEqual(countOccurences([AlteredStatus.UNPROFILED, AlteredStatus.UNPROFILED, AlteredStatus.ALTERED, AlteredStatus.UNALTERED], [AlteredStatus.ALTERED, AlteredStatus.ALTERED, AlteredStatus.UNALTERED, AlteredStatus.UNALTERED]), [1, 0, 1, 0]);
+        it('returns [1, 0, 1, 1] for [AlteredStatus.UNPROFILED, AlteredStatus.UNPROFILED, AlteredStatus.ALTERED, AlteredStatus.UNALTERED] and [AlteredStatus.ALTERED, AlteredStatus.ALTERED, AlteredStatus.UNALTERED, AlteredStatus.UNALTERED]', () => {
+            assert.deepEqual(
+                countOccurences(
+                    [
+                        AlteredStatus.UNPROFILED,
+                        AlteredStatus.UNPROFILED,
+                        AlteredStatus.ALTERED,
+                        AlteredStatus.UNALTERED,
+                    ],
+                    [
+                        AlteredStatus.ALTERED,
+                        AlteredStatus.ALTERED,
+                        AlteredStatus.UNALTERED,
+                        AlteredStatus.UNALTERED,
+                    ]
+                ),
+                [1, 0, 1, 0]
+            );
         });
 
-        it("returns [0, 0, 0, 0] for [AlteredStatus.UNPROFILED, AlteredStatus.UNPROFILED, AlteredStatus.ALTERED, AlteredStatus.UNALTERED] and [AlteredStatus.ALTERED, AlteredStatus.ALTERED, AlteredStatus.UNPROFILED, AlteredStatus.UNPROFILED]", () => {
-            assert.deepEqual(countOccurences([AlteredStatus.UNPROFILED, AlteredStatus.UNPROFILED, AlteredStatus.ALTERED, AlteredStatus.UNALTERED], [AlteredStatus.ALTERED, AlteredStatus.ALTERED, AlteredStatus.UNPROFILED, AlteredStatus.UNPROFILED]), [0, 0, 0, 0]);
-        });
-        
-        it("returns [0, 0, 0, 0] for [AlteredStatus.UNPROFILED, AlteredStatus.UNPROFILED, AlteredStatus.UNPROFILED, AlteredStatus.UNPROFILED] and [AlteredStatus.ALTERED, AlteredStatus.ALTERED, AlteredStatus.UNALTERED, AlteredStatus.UNALTERED]", () => {
-            assert.deepEqual(countOccurences([AlteredStatus.UNPROFILED, AlteredStatus.UNPROFILED, AlteredStatus.UNPROFILED, AlteredStatus.UNPROFILED], [AlteredStatus.ALTERED, AlteredStatus.ALTERED, AlteredStatus.UNALTERED, AlteredStatus.UNALTERED]), [0, 0, 0, 0]);
+        it('returns [0, 0, 0, 0] for [AlteredStatus.UNPROFILED, AlteredStatus.UNPROFILED, AlteredStatus.ALTERED, AlteredStatus.UNALTERED] and [AlteredStatus.ALTERED, AlteredStatus.ALTERED, AlteredStatus.UNPROFILED, AlteredStatus.UNPROFILED]', () => {
+            assert.deepEqual(
+                countOccurences(
+                    [
+                        AlteredStatus.UNPROFILED,
+                        AlteredStatus.UNPROFILED,
+                        AlteredStatus.ALTERED,
+                        AlteredStatus.UNALTERED,
+                    ],
+                    [
+                        AlteredStatus.ALTERED,
+                        AlteredStatus.ALTERED,
+                        AlteredStatus.UNPROFILED,
+                        AlteredStatus.UNPROFILED,
+                    ]
+                ),
+                [0, 0, 0, 0]
+            );
         });
 
+        it('returns [0, 0, 0, 0] for [AlteredStatus.UNPROFILED, AlteredStatus.UNPROFILED, AlteredStatus.UNPROFILED, AlteredStatus.UNPROFILED] and [AlteredStatus.ALTERED, AlteredStatus.ALTERED, AlteredStatus.UNALTERED, AlteredStatus.UNALTERED]', () => {
+            assert.deepEqual(
+                countOccurences(
+                    [
+                        AlteredStatus.UNPROFILED,
+                        AlteredStatus.UNPROFILED,
+                        AlteredStatus.UNPROFILED,
+                        AlteredStatus.UNPROFILED,
+                    ],
+                    [
+                        AlteredStatus.ALTERED,
+                        AlteredStatus.ALTERED,
+                        AlteredStatus.UNALTERED,
+                        AlteredStatus.UNALTERED,
+                    ]
+                ),
+                [0, 0, 0, 0]
+            );
+        });
     });
 
-    describe("#calculatePValue()", () => {
-        it("returns 0.3653846153846146 for 4, 3, 7, 2", () => {
+    describe('#calculatePValue()', () => {
+        it('returns 0.3653846153846146 for 4, 3, 7, 2', () => {
             assert.equal(calculatePValue(4, 3, 7, 2), 0.3653846153846146);
         });
 
-        it("returns 0.07706146926536687 for 13, 7, 3, 7", () => {
+        it('returns 0.07706146926536687 for 13, 7, 3, 7', () => {
             assert.equal(calculatePValue(13, 7, 3, 7), 0.07706146926536687);
         });
     });
 
-/*     describe("#calculateAdjustedPValue()", () => {
+    /*     describe("#calculateAdjustedPValue()", () => {
         it("returns 1 if bigger than 1", () => {
             assert.equal(calculateAdjustedPValue(0.345, 4), 1);
         });
@@ -158,21 +288,27 @@ describe("MutualExclusivityUtil", () => {
         });
     }); */
 
-    describe("#calculateLogOddsRatio()", () => {
-        it("returns -1.3923174227787605 for 4, 3, 7, 2", () => {
-            assert.equal(calculateLogOddsRatio(4, 3, 7, 2), -1.3923174227787605);
+    describe('#calculateLogOddsRatio()', () => {
+        it('returns -1.3923174227787605 for 4, 3, 7, 2', () => {
+            assert.equal(
+                calculateLogOddsRatio(4, 3, 7, 2),
+                -1.3923174227787605
+            );
         });
 
-        it("returns 2.1154772174199357 for 13, 7, 3, 7", () => {
-            assert.equal(calculateLogOddsRatio(13, 7, 3, 7), 2.1154772174199357);
+        it('returns 2.1154772174199357 for 13, 7, 3, 7', () => {
+            assert.equal(
+                calculateLogOddsRatio(13, 7, 3, 7),
+                2.1154772174199357
+            );
         });
 
-        it("returns Infinity for 5, 0 ,1, 0", () => {
+        it('returns Infinity for 5, 0 ,1, 0', () => {
             assert.equal(calculateLogOddsRatio(5, 0, 1, 0), Infinity);
         });
     });
 
-/*     describe("#getMutuallyExclusiveCounts()", () => {
+    /*     describe("#getMutuallyExclusiveCounts()", () => {
         it("returns [<span><b>no</b> gene pair</span>, null] for empty list", () => {
             const data: MutualExclusivity[] = [];
             const result = getMutuallyExclusiveCounts(data, n => n <= 0);
@@ -279,138 +415,166 @@ describe("MutualExclusivityUtil", () => {
             });
     }); */
 
-    describe("#getCountsText()", () => {
-        it("returns correct text", () => {
-            const result = getTrackPairsCountText(exampleData, _.size(isSampleAlteredMap));
-            expect(result).toEqualJSX(<p>The analysis tested <b>6</b> pairs between the <b>4</b> tracks in the OncoPrint.</p>);
+    describe('#getCountsText()', () => {
+        it('returns correct text', () => {
+            const result = getTrackPairsCountText(
+                exampleData,
+                _.size(isSampleAlteredMap)
+            );
+            expect(result).toEqualJSX(
+                <p>
+                    The analysis tested <b>6</b> pairs between the <b>4</b>{' '}
+                    tracks in the OncoPrint.
+                </p>
+            );
         });
     });
 
-    describe("#getData()", () => {
-        it("returns correct data", () => {
-
+    describe('#getData()', () => {
+        it('returns correct data', () => {
             const result = getData(isSampleAlteredMap);
             assert.deepEqual(result, exampleData);
         });
     });
 
-    describe("#getFilteredData()", () => {
-        it("returns the data correctly", () => {
-            
+    describe('#getFilteredData()', () => {
+        it('returns the data correctly', () => {
             const result = getFilteredData(exampleData, true, false, true);
-            assert.deepEqual(result,
-                [
-                    {
-                        "trackA": "EGFR",
-                        "trackB": "KRAS",
-                        "neitherCount": 0,
-                        "aNotBCount": 5,
-                        "bNotACount": 5,
-                        "bothCount": 0,
-                        "logOddsRatio": -Infinity,
-                        "pValue": 0.003968253968253951,
-                        "qValue": 0.023809523809523704,
-                        "association": "Mutual exclusivity"
-                    }
-                ]
-            );
+            assert.deepEqual(result, [
+                {
+                    trackA: 'EGFR',
+                    trackB: 'KRAS',
+                    neitherCount: 0,
+                    aNotBCount: 5,
+                    bNotACount: 5,
+                    bothCount: 0,
+                    logOddsRatio: -Infinity,
+                    pValue: 0.003968253968253951,
+                    qValue: 0.023809523809523704,
+                    association: 'Mutual exclusivity',
+                },
+            ]);
         });
     });
 
-    describe("#formatPValue()", () => {
-        it("returns <0.001 for 0.0001", () => {
-            assert.equal(formatPValue(0.0001), "<0.001");
+    describe('#formatPValue()', () => {
+        it('returns <0.001 for 0.0001', () => {
+            assert.equal(formatPValue(0.0001), '<0.001');
         });
 
-        it("returns 0.001 for 0.001", () => {
-            assert.equal(formatPValue(0.001), "0.001");
+        it('returns 0.001 for 0.001', () => {
+            assert.equal(formatPValue(0.001), '0.001');
         });
 
-        it("returns 1.345 for 1.3454546", () => {
-            assert.equal(formatPValue(1.3454546), "1.345");
+        it('returns 1.345 for 1.3454546', () => {
+            assert.equal(formatPValue(1.3454546), '1.345');
         });
 
-        it("returns 0.050 for 0.05", () => {
-            assert.equal(formatPValue(0.05), "0.050");
+        it('returns 0.050 for 0.05', () => {
+            assert.equal(formatPValue(0.05), '0.050');
         });
     });
 
-    describe("#formatPValueWithStyle()", () => {
-        it("returns <span>0.050</span> for 0.05", () => {
+    describe('#formatPValueWithStyle()', () => {
+        it('returns <span>0.050</span> for 0.05', () => {
             expect(formatQValueWithStyle(0.05)).toEqualJSX(<span>0.050</span>);
         });
 
-        it("returns <b><span>0.042</span></b> for 0.042", () => {
-            expect(formatQValueWithStyle(0.042)).toEqualJSX(<b><span>0.042</span></b>);
+        it('returns <b><span>0.042</span></b> for 0.042', () => {
+            expect(formatQValueWithStyle(0.042)).toEqualJSX(
+                <b>
+                    <span>0.042</span>
+                </b>
+            );
         });
     });
 
-    describe("#formatLogOddsRatio()", () => {
-        it("returns <-3 for -6.32", () => {
-            assert.equal(formatLogOddsRatio(-6.32), "<-3");
+    describe('#formatLogOddsRatio()', () => {
+        it('returns <-3 for -6.32', () => {
+            assert.equal(formatLogOddsRatio(-6.32), '<-3');
         });
 
-        it("returns -3.000 for -3", () => {
-            assert.equal(formatLogOddsRatio(-3), "-3.000");
+        it('returns -3.000 for -3', () => {
+            assert.equal(formatLogOddsRatio(-3), '-3.000');
         });
 
-        it("returns 0.230 for 0.23", () => {
-            assert.equal(formatLogOddsRatio(0.23), "0.230");
+        it('returns 0.230 for 0.23', () => {
+            assert.equal(formatLogOddsRatio(0.23), '0.230');
         });
 
-        it("returns 3.000 for 3", () => {
-            assert.equal(formatLogOddsRatio(3), "3.000");
+        it('returns 3.000 for 3', () => {
+            assert.equal(formatLogOddsRatio(3), '3.000');
         });
 
-        it("returns >3 for 4.32", () => {
-            assert.equal(formatLogOddsRatio(4.32), ">3");
+        it('returns >3 for 4.32', () => {
+            assert.equal(formatLogOddsRatio(4.32), '>3');
         });
     });
 
-    describe("<MutualExclusivityTable/>", () => {
-        it("returns rows correctly", () => {
-
+    describe('<MutualExclusivityTable/>', () => {
+        it('returns rows correctly', () => {
             const data = [
                 {
-                    "trackA": "KRAS",
-                    "trackB": "BRAF",
-                    "neitherCount": 4,
-                    "aNotBCount": 2,
-                    "bNotACount": 1,
-                    "bothCount": 3,
-                    "logOddsRatio": 1.791759469228055,
-                    "pValue": 0.23809523809523808,
-                    "qValue": 0.47619047619047616,
-                    "association": "Co-occurrence"
+                    trackA: 'KRAS',
+                    trackB: 'BRAF',
+                    neitherCount: 4,
+                    aNotBCount: 2,
+                    bNotACount: 1,
+                    bothCount: 3,
+                    logOddsRatio: 1.791759469228055,
+                    pValue: 0.23809523809523808,
+                    qValue: 0.47619047619047616,
+                    association: 'Co-occurrence',
                 },
                 {
-                    "trackA": "TP53",
-                    "trackB": "BRAF",
-                    "neitherCount": 6,
-                    "aNotBCount": 0,
-                    "bNotACount": 1,
-                    "bothCount": 3,
-                    "logOddsRatio": Infinity,
-                    "pValue": 0.003968253968253951,
-                    "qValue": 0.023809523809523704,
-                    "association": "Co-occurrence"
-                }
+                    trackA: 'TP53',
+                    trackB: 'BRAF',
+                    neitherCount: 6,
+                    aNotBCount: 0,
+                    bNotACount: 1,
+                    bothCount: 3,
+                    logOddsRatio: Infinity,
+                    pValue: 0.003968253968253951,
+                    qValue: 0.023809523809523704,
+                    association: 'Co-occurrence',
+                },
             ];
 
             const wrapper = mount(<MutualExclusivityTable data={data} />);
             let cells = wrapper.find('td');
-            assert.equal(cells.at(0).html(), "<td><span><b>TP53</b></span></td>");
-            assert.equal(cells.at(1).html(), "<td><span><b>BRAF</b></span></td>");
-            assert.equal(cells.at(2).html(), "<td><span>6</span></td>");
-            assert.equal(cells.at(3).html(), "<td><span>0</span></td>");
-            assert.equal(cells.at(4).html(), "<td><span>1</span></td>");
-            assert.equal(cells.at(5).html(), "<td><span>3</span></td>");
-            assert.equal(cells.at(6).html(), "<td><span>&gt;3</span></td>");
-            assert.equal(cells.at(7).html(), "<td><span>0.004</span></td>");
-            assert.equal(cells.at(8).html(), "<td><b><span>0.024</span></b></td>");
-            assert.equal(cells.at(9).html().replace(/<!--[^>]*-->/g, ""), "<td><div class=\"styles-module__Tendency__2Y46X styles-module__Significant__34YnP\">" +
-                "Co-occurrence</div></td>");
-            assert.equal(cells.at(19).html().replace(/<!--[^>]*-->/g, ""), "<td><div class=\"styles-module__Tendency__2Y46X\">Co-occurrence</div></td>");
+            assert.equal(
+                cells.at(0).html(),
+                '<td><span><b>TP53</b></span></td>'
+            );
+            assert.equal(
+                cells.at(1).html(),
+                '<td><span><b>BRAF</b></span></td>'
+            );
+            assert.equal(cells.at(2).html(), '<td><span>6</span></td>');
+            assert.equal(cells.at(3).html(), '<td><span>0</span></td>');
+            assert.equal(cells.at(4).html(), '<td><span>1</span></td>');
+            assert.equal(cells.at(5).html(), '<td><span>3</span></td>');
+            assert.equal(cells.at(6).html(), '<td><span>&gt;3</span></td>');
+            assert.equal(cells.at(7).html(), '<td><span>0.004</span></td>');
+            assert.equal(
+                cells.at(8).html(),
+                '<td><b><span>0.024</span></b></td>'
+            );
+            assert.equal(
+                cells
+                    .at(9)
+                    .html()
+                    .replace(/<!--[^>]*-->/g, ''),
+                '<td><div class="styles-module__Tendency__2Y46X styles-module__Significant__34YnP">' +
+                    'Co-occurrence</div></td>'
+            );
+            assert.equal(
+                cells
+                    .at(19)
+                    .html()
+                    .replace(/<!--[^>]*-->/g, ''),
+                '<td><div class="styles-module__Tendency__2Y46X">Co-occurrence</div></td>'
+            );
         });
     });
-});
\ No newline at end of file
+});
diff --git a/src/pages/resultsView/mutualExclusivity/MutualExclusivityUtil.tsx b/src/pages/resultsView/mutualExclusivity/MutualExclusivityUtil.tsx
index 76999c16fac..39bf645b236 100644
--- a/src/pages/resultsView/mutualExclusivity/MutualExclusivityUtil.tsx
+++ b/src/pages/resultsView/mutualExclusivity/MutualExclusivityUtil.tsx
@@ -1,24 +1,26 @@
 import * as React from 'react';
-import { getCumulativePValue } from "../../../shared/lib/FisherExactTestCalculator";
-import { MutualExclusivity } from "../../../shared/model/MutualExclusivity";
-import {calculateQValues} from "../../../shared/lib/calculation/BenjaminiHochbergFDRCalculator";
+import { getCumulativePValue } from '../../../shared/lib/FisherExactTestCalculator';
+import { MutualExclusivity } from '../../../shared/model/MutualExclusivity';
+import { calculateQValues } from '../../../shared/lib/calculation/BenjaminiHochbergFDRCalculator';
 import Combinatorics from 'js-combinatorics';
 import Dictionary = _.Dictionary;
 import * as _ from 'lodash';
 import { SampleAlteredMap } from '../ResultsViewPageStoreUtils';
 
 export enum AlteredStatus {
-    UNPROFILED = "unprofiled",
-    ALTERED = "altered",
-    UNALTERED = "unaltered"
+    UNPROFILED = 'unprofiled',
+    ALTERED = 'altered',
+    UNALTERED = 'unaltered',
 }
 
 export function calculateAssociation(logOddsRatio: number): string {
-    return logOddsRatio > 0 ? "Co-occurrence" : "Mutual exclusivity";
+    return logOddsRatio > 0 ? 'Co-occurrence' : 'Mutual exclusivity';
 }
 
-export function countOccurences(valuesA: AlteredStatus[], valuesB: AlteredStatus[]): [number, number, number, number] {
-
+export function countOccurences(
+    valuesA: AlteredStatus[],
+    valuesB: AlteredStatus[]
+): [number, number, number, number] {
     let neither = 0;
     let bNotA = 0;
     let aNotB = 0;
@@ -26,15 +28,27 @@ export function countOccurences(valuesA: AlteredStatus[], valuesB: AlteredStatus
 
     valuesA.forEach((valueA, index) => {
         // jump over this comparison if there is a unprofiled value
-        if (valueA === AlteredStatus.UNPROFILED || valuesB[index] === AlteredStatus.UNPROFILED) {
+        if (
+            valueA === AlteredStatus.UNPROFILED ||
+            valuesB[index] === AlteredStatus.UNPROFILED
+        ) {
             return true;
         }
         const valueB = valuesB[index];
-        if (valueA === AlteredStatus.UNALTERED && valueB === AlteredStatus.UNALTERED) {
+        if (
+            valueA === AlteredStatus.UNALTERED &&
+            valueB === AlteredStatus.UNALTERED
+        ) {
             neither++;
-        } else if (valueA === AlteredStatus.UNALTERED && valueB === AlteredStatus.ALTERED) {
+        } else if (
+            valueA === AlteredStatus.UNALTERED &&
+            valueB === AlteredStatus.ALTERED
+        ) {
             bNotA++;
-        } else if (valueA === AlteredStatus.ALTERED && valueB === AlteredStatus.UNALTERED) {
+        } else if (
+            valueA === AlteredStatus.ALTERED &&
+            valueB === AlteredStatus.UNALTERED
+        ) {
             aNotB++;
         } else {
             both++;
@@ -43,7 +57,12 @@ export function countOccurences(valuesA: AlteredStatus[], valuesB: AlteredStatus
     return [neither, bNotA, aNotB, both];
 }
 
-export function calculatePValue(a: number, b: number, c: number, d: number): number {
+export function calculatePValue(
+    a: number,
+    b: number,
+    c: number,
+    d: number
+): number {
     return getCumulativePValue(a, b, c, d);
 }
 
@@ -52,81 +71,147 @@ export function calculateAdjustedPValue(pValue: number, count: number): number {
     return value > 1 ? 1 : value;
 }
 
-export function calculateLogOddsRatio(a: number, b: number, c: number, d: number): number {
-
-    if ((a * d) === 0 && (b * c) === 0) {
+export function calculateLogOddsRatio(
+    a: number,
+    b: number,
+    c: number,
+    d: number
+): number {
+    if (a * d === 0 && b * c === 0) {
         return Infinity;
     }
     return Math.log2((a * d) / (b * c));
 }
 
-export function getMutuallyExclusiveCounts(data: MutualExclusivity[],
-    exclusive: (n: number) => boolean): [JSX.Element | null, JSX.Element | null] {
-
+export function getMutuallyExclusiveCounts(
+    data: MutualExclusivity[],
+    exclusive: (n: number) => boolean
+): [JSX.Element | null, JSX.Element | null] {
     let exclusiveCount = null;
     let significantCount = null;
 
-    const exclusiveData = data.filter(mutualExclusivity => exclusive(mutualExclusivity.logOddsRatio));
-    const significantData = exclusiveData.filter(mutualExclusivity => mutualExclusivity.qValue < 0.05);
+    const exclusiveData = data.filter(mutualExclusivity =>
+        exclusive(mutualExclusivity.logOddsRatio)
+    );
+    const significantData = exclusiveData.filter(
+        mutualExclusivity => mutualExclusivity.qValue < 0.05
+    );
 
     const exclusiveLength = exclusiveData.length;
     const significantLength = significantData.length;
     if (exclusiveLength === 0) {
-        exclusiveCount = <span><b>no</b> track pair</span>;
+        exclusiveCount = (
+            <span>
+                <b>no</b> track pair
+            </span>
+        );
     } else if (exclusiveLength === 1) {
-        exclusiveCount = <span><b>1</b> track pair</span>;
+        exclusiveCount = (
+            <span>
+                <b>1</b> track pair
+            </span>
+        );
     } else {
-        exclusiveCount = <span><b>{exclusiveLength}</b> track pairs</span>;
+        exclusiveCount = (
+            <span>
+                <b>{exclusiveLength}</b> track pairs
+            </span>
+        );
     }
 
     if (exclusiveLength > 0) {
         if (significantLength === 0) {
             significantCount = <span> (none significant)</span>;
         } else {
-            significantCount = <span> (<b>{significantLength}</b> significant)</span>;
+            significantCount = (
+                <span>
+                    {' '}
+                    (<b>{significantLength}</b> significant)
+                </span>
+            );
         }
     }
 
     return [exclusiveCount, significantCount];
 }
 
-export function getTrackPairsCountText(data: MutualExclusivity[], trackCount: number): JSX.Element {
-
+export function getTrackPairsCountText(
+    data: MutualExclusivity[],
+    trackCount: number
+): JSX.Element {
     const trackPairsCount = _.size(data);
-    const pairText = trackPairsCount > 1 ? "pairs" : "pair";
-    return <p>The analysis tested <b>{trackPairsCount}</b> {pairText} between the <b>{trackCount}</b> tracks in the OncoPrint.</p>;
+    const pairText = trackPairsCount > 1 ? 'pairs' : 'pair';
+    return (
+        <p>
+            The analysis tested <b>{trackPairsCount}</b> {pairText} between the{' '}
+            <b>{trackCount}</b> tracks in the OncoPrint.
+        </p>
+    );
 }
 
 export function getCountsText(data: MutualExclusivity[]): JSX.Element {
-
-    const mutuallyExclusiveCounts = getMutuallyExclusiveCounts(data, n => n <= 0);
+    const mutuallyExclusiveCounts = getMutuallyExclusiveCounts(
+        data,
+        n => n <= 0
+    );
     const coOccurentCounts = getMutuallyExclusiveCounts(data, n => n > 0);
 
-    return <p>The query contains {mutuallyExclusiveCounts[0]} with mutually exclusive alterations{
-        mutuallyExclusiveCounts[1]}, and {coOccurentCounts[0]} with co-occurrent alterations{
-            coOccurentCounts[1]}.</p>;
+    return (
+        <p>
+            The query contains {mutuallyExclusiveCounts[0]} with mutually
+            exclusive alterations{mutuallyExclusiveCounts[1]}, and{' '}
+            {coOccurentCounts[0]} with co-occurrent alterations
+            {coOccurentCounts[1]}.
+        </p>
+    );
 }
 
-export function getData(isSampleAlteredMap: Dictionary<AlteredStatus[]>): MutualExclusivity[] {
-
+export function getData(
+    isSampleAlteredMap: Dictionary<AlteredStatus[]>
+): MutualExclusivity[] {
     let data: MutualExclusivity[] = [];
-    const combinations: string[][] = (Combinatorics as any).bigCombination(Object.keys(isSampleAlteredMap), 2).toArray();
+    const combinations: string[][] = (Combinatorics as any)
+        .bigCombination(Object.keys(isSampleAlteredMap), 2)
+        .toArray();
 
     combinations.forEach(combination => {
-
         const trackA = combination[0];
         const trackB = combination[1];
-        const counts = countOccurences(isSampleAlteredMap[trackA], isSampleAlteredMap[trackB]);
-        const pValue = calculatePValue(counts[0], counts[1], counts[2], counts[3]);
-        const logOddsRatio = calculateLogOddsRatio(counts[0], counts[1], counts[2], counts[3]);
+        const counts = countOccurences(
+            isSampleAlteredMap[trackA],
+            isSampleAlteredMap[trackB]
+        );
+        const pValue = calculatePValue(
+            counts[0],
+            counts[1],
+            counts[2],
+            counts[3]
+        );
+        const logOddsRatio = calculateLogOddsRatio(
+            counts[0],
+            counts[1],
+            counts[2],
+            counts[3]
+        );
         const association = calculateAssociation(logOddsRatio);
-        data.push({ trackA, trackB, neitherCount: counts[0], bNotACount: counts[1], aNotBCount: counts[2], 
-            bothCount: counts[3], logOddsRatio, pValue, 
-            qValue: 0, association });
+        data.push({
+            trackA,
+            trackB,
+            neitherCount: counts[0],
+            bNotACount: counts[1],
+            aNotBCount: counts[2],
+            bothCount: counts[3],
+            logOddsRatio,
+            pValue,
+            qValue: 0,
+            association,
+        });
     });
-    
-    data = _.sortBy(data, ["pValue"]);
-    const qValues = calculateQValues(_.map(data, mutexData => mutexData.pValue));
+
+    data = _.sortBy(data, ['pValue']);
+    const qValues = calculateQValues(
+        _.map(data, mutexData => mutexData.pValue)
+    );
     data.forEach((mutexData, index) => {
         mutexData.qValue = qValues[index];
     });
@@ -134,9 +219,12 @@ export function getData(isSampleAlteredMap: Dictionary<AlteredStatus[]>): Mutual
     return data;
 }
 
-export function getFilteredData(data: MutualExclusivity[], mutualExclusivityFilter: boolean, coOccurenceFilter: boolean,
-    significantPairsFilter: boolean): MutualExclusivity[] {
-
+export function getFilteredData(
+    data: MutualExclusivity[],
+    mutualExclusivityFilter: boolean,
+    coOccurenceFilter: boolean,
+    significantPairsFilter: boolean
+): MutualExclusivity[] {
     return data.filter(mutualExclusivity => {
         let result = false;
         if (mutualExclusivityFilter) {
@@ -153,11 +241,10 @@ export function getFilteredData(data: MutualExclusivity[], mutualExclusivityFilt
 }
 
 export function formatPValue(pValue: number): string {
-    return pValue < 0.001 ? "<0.001" : pValue.toFixed(3);
+    return pValue < 0.001 ? '<0.001' : pValue.toFixed(3);
 }
 
 export function formatQValueWithStyle(pValue: number): JSX.Element {
-
     let formattedPValue = <span>{formatPValue(pValue)}</span>;
     if (pValue < 0.05) {
         formattedPValue = <b>{formattedPValue}</b>;
@@ -166,23 +253,28 @@ export function formatQValueWithStyle(pValue: number): JSX.Element {
 }
 
 export function formatLogOddsRatio(logOddsRatio: number): string {
-
     if (logOddsRatio < -3) {
-        return "<-3";
+        return '<-3';
     } else if (logOddsRatio > 3) {
-        return ">3";
+        return '>3';
     }
     return logOddsRatio.toFixed(3);
 }
 
-export function getSampleAlteredFilteredMap(isSampleAlteredMap: SampleAlteredMap): SampleAlteredMap {
-    const filteredMap : SampleAlteredMap = {};
+export function getSampleAlteredFilteredMap(
+    isSampleAlteredMap: SampleAlteredMap
+): SampleAlteredMap {
+    const filteredMap: SampleAlteredMap = {};
     _.forIn(isSampleAlteredMap, (alteredStatus, trackOql) => {
         if (alteredStatus && alteredStatus.length > 0) {
-            if (alteredStatus.filter((status) => status != AlteredStatus.UNPROFILED).length > 0) {
+            if (
+                alteredStatus.filter(
+                    status => status != AlteredStatus.UNPROFILED
+                ).length > 0
+            ) {
                 filteredMap[trackOql] = alteredStatus;
             }
         }
     });
     return filteredMap;
-}
\ No newline at end of file
+}
diff --git a/src/pages/resultsView/mutualExclusivity/styles.module.scss b/src/pages/resultsView/mutualExclusivity/styles.module.scss
index 067875fb220..b93e47f9e31 100644
--- a/src/pages/resultsView/mutualExclusivity/styles.module.scss
+++ b/src/pages/resultsView/mutualExclusivity/styles.module.scss
@@ -1,18 +1,18 @@
 .Checkboxes {
-  display: flex;
-  flex-direction: row;
-  float: left;
+    display: flex;
+    flex-direction: row;
+    float: left;
 }
 
 .Checkboxes > * {
-  margin:0 10px !important;
+    margin: 0 10px !important;
 }
 
 .Tendency {
-  display: flex;
-  flex-direction: column;
+    display: flex;
+    flex-direction: column;
 
-  &.Significant {
-    font-weight: bold;
-  }
+    &.Significant {
+        font-weight: bold;
+    }
 }
diff --git a/src/pages/resultsView/oncoprint/AddClinicalTracks.tsx b/src/pages/resultsView/oncoprint/AddClinicalTracks.tsx
index b25c7c01931..8f83e2340e7 100644
--- a/src/pages/resultsView/oncoprint/AddClinicalTracks.tsx
+++ b/src/pages/resultsView/oncoprint/AddClinicalTracks.tsx
@@ -1,55 +1,66 @@
-import * as React from "react";
-import {observer} from "mobx-react";
-import {MSKTab, MSKTabs} from "../../../shared/components/MSKTabs/MSKTabs";
-import AddChartByType from "../../studyView/addChartButton/addChartByType/AddChartByType";
-import {action, computed, observable} from "mobx";
-import {DefaultTooltip, remoteData} from "cbioportal-frontend-commons";
-import classNames from "classnames";
-import {serializeEvent} from "../../../shared/lib/tracking";
-import autobind from "autobind-decorator";
-import {ResultsViewPageStore} from "../ResultsViewPageStore";
-import {ClinicalAttribute} from "../../../shared/api/generated/CBioPortalAPI";
+import * as React from 'react';
+import { observer } from 'mobx-react';
+import { MSKTab, MSKTabs } from '../../../shared/components/MSKTabs/MSKTabs';
+import AddChartByType from '../../studyView/addChartButton/addChartByType/AddChartByType';
+import { action, computed, observable } from 'mobx';
+import { DefaultTooltip, remoteData } from 'cbioportal-frontend-commons';
+import classNames from 'classnames';
+import { serializeEvent } from '../../../shared/lib/tracking';
+import autobind from 'autobind-decorator';
+import { ResultsViewPageStore } from '../ResultsViewPageStore';
+import { ClinicalAttribute } from '../../../shared/api/generated/CBioPortalAPI';
 import {
     clinicalAttributeIsINCOMPARISONGROUP,
     clinicalAttributeIsPROFILEDIN,
-    SpecialAttribute
-} from "../../../shared/cache/ClinicalDataCache";
-import * as _ from "lodash";
-import {MakeMobxView} from "../../../shared/components/MobxView";
-import LoadingIndicator from "../../../shared/components/loadingIndicator/LoadingIndicator";
-import {toggleIncluded} from "../../../shared/lib/ArrayUtils";
-import OncoprintDropdownCount from "./OncoprintDropdownCount";
+    SpecialAttribute,
+} from '../../../shared/cache/ClinicalDataCache';
+import * as _ from 'lodash';
+import { MakeMobxView } from '../../../shared/components/MobxView';
+import LoadingIndicator from '../../../shared/components/loadingIndicator/LoadingIndicator';
+import { toggleIncluded } from '../../../shared/lib/ArrayUtils';
+import OncoprintDropdownCount from './OncoprintDropdownCount';
 
 export interface IAddClinicalTrackProps {
-    store:ResultsViewPageStore;
-    selectedClinicalAttributeIds:(string|SpecialAttribute)[];
-    onChangeSelectedClinicalTracks:(ids:(string|SpecialAttribute)[])=>void;
+    store: ResultsViewPageStore;
+    selectedClinicalAttributeIds: (string | SpecialAttribute)[];
+    onChangeSelectedClinicalTracks: (
+        ids: (string | SpecialAttribute)[]
+    ) => void;
 }
 
 enum Tab {
-    CLINICAL = "Clinical",
-    GROUPS = "Groups"
+    CLINICAL = 'Clinical',
+    GROUPS = 'Groups',
 }
 
 @observer
-export default class AddClinicalTracks extends React.Component<IAddClinicalTrackProps, {}> {
+export default class AddClinicalTracks extends React.Component<
+    IAddClinicalTrackProps,
+    {}
+> {
     @observable open = false;
     @observable tabId = Tab.CLINICAL;
 
     @autobind
-    @action private updateTabId(newId:Tab) {
+    @action
+    private updateTabId(newId: Tab) {
         this.tabId = newId;
     }
 
     @autobind
-    @action private addAll(clinicalAttributeIds:string[]) {
+    @action
+    private addAll(clinicalAttributeIds: string[]) {
         this.props.onChangeSelectedClinicalTracks(
-            _.union(this.props.selectedClinicalAttributeIds, clinicalAttributeIds)
+            _.union(
+                this.props.selectedClinicalAttributeIds,
+                clinicalAttributeIds
+            )
         );
     }
 
     @autobind
-    @action private clear(clinicalAttributeIds:string[]) {
+    @action
+    private clear(clinicalAttributeIds: string[]) {
         this.props.onChangeSelectedClinicalTracks(
             _.difference(
                 this.props.selectedClinicalAttributeIds,
@@ -59,8 +70,14 @@ export default class AddClinicalTracks extends React.Component<IAddClinicalTrack
     }
 
     @autobind
-    @action private toggleClinicalTrack(clinicalAttributeId:string) {
-        this.props.onChangeSelectedClinicalTracks(toggleIncluded(clinicalAttributeId, this.props.selectedClinicalAttributeIds));
+    @action
+    private toggleClinicalTrack(clinicalAttributeId: string) {
+        this.props.onChangeSelectedClinicalTracks(
+            toggleIncluded(
+                clinicalAttributeId,
+                this.props.selectedClinicalAttributeIds
+            )
+        );
     }
 
     @computed get selectedClinicalAttributeIds() {
@@ -68,13 +85,20 @@ export default class AddClinicalTracks extends React.Component<IAddClinicalTrack
     }
 
     readonly options = remoteData({
-        await:()=>[this.props.store.clinicalAttributes, this.clinicalAttributeIdToAvailableFrequency],
-        invoke:()=>{
-            const uniqueAttributes = _.uniqBy(this.props.store.clinicalAttributes.result!, a=>a.clinicalAttributeId);
-            const availableFrequency = this.clinicalAttributeIdToAvailableFrequency.result!;
+        await: () => [
+            this.props.store.clinicalAttributes,
+            this.clinicalAttributeIdToAvailableFrequency,
+        ],
+        invoke: () => {
+            const uniqueAttributes = _.uniqBy(
+                this.props.store.clinicalAttributes.result!,
+                a => a.clinicalAttributeId
+            );
+            const availableFrequency = this
+                .clinicalAttributeIdToAvailableFrequency.result!;
             const sortedAttributes = {
-                clinical:[] as ClinicalAttribute[],
-                groups: [] as ClinicalAttribute[]
+                clinical: [] as ClinicalAttribute[],
+                groups: [] as ClinicalAttribute[],
             };
             for (const attr of uniqueAttributes) {
                 if (clinicalAttributeIsINCOMPARISONGROUP(attr)) {
@@ -85,61 +109,75 @@ export default class AddClinicalTracks extends React.Component<IAddClinicalTrack
             }
             sortedAttributes.clinical = _.sortBy<ClinicalAttribute>(
                 sortedAttributes.clinical,
-                [   (x:ClinicalAttribute)=>{
-                    if (x.clinicalAttributeId === SpecialAttribute.StudyOfOrigin) {
-                        return 0;
-                    } else if (x.clinicalAttributeId === SpecialAttribute.MutationSpectrum) {
-                        return 1;
-                    } else if (clinicalAttributeIsPROFILEDIN(x)) {
-                        return 2;
-                    } else {
-                        return 3;
-                    }
-                },
-                    (x:ClinicalAttribute)=>{
+                [
+                    (x: ClinicalAttribute) => {
+                        if (
+                            x.clinicalAttributeId ===
+                            SpecialAttribute.StudyOfOrigin
+                        ) {
+                            return 0;
+                        } else if (
+                            x.clinicalAttributeId ===
+                            SpecialAttribute.MutationSpectrum
+                        ) {
+                            return 1;
+                        } else if (clinicalAttributeIsPROFILEDIN(x)) {
+                            return 2;
+                        } else {
+                            return 3;
+                        }
+                    },
+                    (x: ClinicalAttribute) => {
                         let freq = availableFrequency[x.clinicalAttributeId];
                         if (freq === undefined) {
                             freq = 0;
                         }
                         return -freq;
                     },
-                    (x:ClinicalAttribute)=>-x.priority
-                    ,
-                    (x:ClinicalAttribute)=>x.displayName.toLowerCase()
+                    (x: ClinicalAttribute) => -x.priority,
+                    (x: ClinicalAttribute) => x.displayName.toLowerCase(),
                 ]
             );
 
-            sortedAttributes.groups = _.sortBy<ClinicalAttribute>(sortedAttributes.groups, x=>x.displayName.toLowerCase());
+            sortedAttributes.groups = _.sortBy<ClinicalAttribute>(
+                sortedAttributes.groups,
+                x => x.displayName.toLowerCase()
+            );
 
-            return Promise.resolve(_.mapValues(sortedAttributes, attrs=>{
-                return attrs.map(attr=>({
-                    label: attr.displayName,
-                    key: attr.clinicalAttributeId,
-                    selected: attr.clinicalAttributeId in this.selectedClinicalAttributeIds
-                }));
-            }));
-        }
+            return Promise.resolve(
+                _.mapValues(sortedAttributes, attrs => {
+                    return attrs.map(attr => ({
+                        label: attr.displayName,
+                        key: attr.clinicalAttributeId,
+                        selected:
+                            attr.clinicalAttributeId in
+                            this.selectedClinicalAttributeIds,
+                    }));
+                })
+            );
+        },
     });
 
     readonly clinicalAttributeIdToAvailableFrequency = remoteData({
-        await:()=>[
+        await: () => [
             this.props.store.clinicalAttributeIdToAvailableSampleCount,
-            this.props.store.samples
+            this.props.store.samples,
         ],
-        invoke:()=>{
+        invoke: () => {
             const numSamples = this.props.store.samples.result!.length;
             return Promise.resolve(
                 _.mapValues(
-                    this.props.store.clinicalAttributeIdToAvailableSampleCount.result!,
-                    count=>100*count/numSamples
+                    this.props.store.clinicalAttributeIdToAvailableSampleCount
+                        .result!,
+                    count => (100 * count) / numSamples
                 )
             );
-        }
+        },
     });
 
     readonly addClinicalTracksMenu = MakeMobxView({
-        await:()=>[this.options],
-        render:()=>(
+        await: () => [this.options],
+        render: () => (
             <AddChartByType
                 options={this.options.result!.clinical}
                 freqPromise={this.clinicalAttributeIdToAvailableFrequency}
@@ -149,13 +187,13 @@ export default class AddClinicalTracks extends React.Component<IAddClinicalTrack
                 optionsGivenInSortedOrder={true}
             />
         ),
-        renderPending:()=><LoadingIndicator isLoading={true} small={true}/>,
-        showLastRenderWhenPending:true
+        renderPending: () => <LoadingIndicator isLoading={true} small={true} />,
+        showLastRenderWhenPending: true,
     });
 
     readonly addGroupTracksMenu = MakeMobxView({
-        await:()=>[this.options],
-        render:()=>(
+        await: () => [this.options],
+        render: () => (
             <AddChartByType
                 options={this.options.result!.groups}
                 freqPromise={this.clinicalAttributeIdToAvailableFrequency}
@@ -166,22 +204,33 @@ export default class AddClinicalTracks extends React.Component<IAddClinicalTrack
                 frequencyHeaderTooltip="% samples in group"
             />
         ),
-        renderPending:()=><LoadingIndicator isLoading={true} small={true}/>,
-        showLastRenderWhenPending:true
+        renderPending: () => <LoadingIndicator isLoading={true} small={true} />,
+        showLastRenderWhenPending: true,
     });
 
     @computed get dropdown() {
-        if (this.props.store.comparisonGroups.isComplete && this.props.store.comparisonGroups.result!.length > 0) {
+        if (
+            this.props.store.comparisonGroups.isComplete &&
+            this.props.store.comparisonGroups.result!.length > 0
+        ) {
             return (
-                <MSKTabs activeTabId={this.tabId}
-                         onTabClick={this.updateTabId}
-                         className="mainTabs oncoprintAddClinicalTracks">
-
+                <MSKTabs
+                    activeTabId={this.tabId}
+                    onTabClick={this.updateTabId}
+                    className="mainTabs oncoprintAddClinicalTracks"
+                >
                     <MSKTab key={0} id={Tab.CLINICAL} linkText={Tab.CLINICAL}>
                         {this.addClinicalTracksMenu.component}
                     </MSKTab>
-                    <MSKTab key={1} id={Tab.GROUPS} linkText={Tab.GROUPS}
-                            hide={!this.props.store.comparisonGroups.isComplete || this.props.store.comparisonGroups.result!.length === 0}
+                    <MSKTab
+                        key={1}
+                        id={Tab.GROUPS}
+                        linkText={Tab.GROUPS}
+                        hide={
+                            !this.props.store.comparisonGroups.isComplete ||
+                            this.props.store.comparisonGroups.result!.length ===
+                                0
+                        }
                     >
                         {this.addGroupTracksMenu.component}
                     </MSKTab>
@@ -199,7 +248,8 @@ export default class AddClinicalTracks extends React.Component<IAddClinicalTrack
     }
 
     @autobind
-    @action private onDropdownChange(visible:boolean) {
+    @action
+    private onDropdownChange(visible: boolean) {
         this.open = visible;
     }
 
@@ -207,26 +257,41 @@ export default class AddClinicalTracks extends React.Component<IAddClinicalTrack
         return (
             <DefaultTooltip
                 visible={this.open}
-                trigger={["click"]}
+                trigger={['click']}
                 onVisibleChange={this.onDropdownChange}
-                placement={"bottomRight"}
+                placement={'bottomRight'}
                 destroyTooltipOnHide={true}
                 overlay={this.dropdown}
                 align={{
-                    overflow: { adjustX: true, adjustY: false}
+                    overflow: { adjustX: true, adjustY: false },
                 }}
-                arrowContent={<span/>}
+                arrowContent={<span />}
                 overlayClassName="oncoprintAddClinicalTracksDropdown"
             >
-                <button className={classNames('btn btn-default btn-md', {"active":this.open})}
-                        data-event={serializeEvent({ category:"resultsView", action:"addClinicalTrackMenuOpen", label:this.props.store.studyIds.result!.join(",")})}
-                        data-test="add-clinical-track-button"
+                <button
+                    className={classNames('btn btn-default btn-md', {
+                        active: this.open,
+                    })}
+                    data-event={serializeEvent({
+                        category: 'resultsView',
+                        action: 'addClinicalTrackMenuOpen',
+                        label: this.props.store.studyIds.result!.join(','),
+                    })}
+                    data-test="add-clinical-track-button"
                 >
-                    Add Clinical Tracks{" "}
-                    <OncoprintDropdownCount count={this.options.isComplete ? this.options.result!.clinical.length : undefined}/>
-                    &nbsp;<span className="caret"/>&nbsp;
+                    Add Clinical Tracks{' '}
+                    <OncoprintDropdownCount
+                        count={
+                            this.options.isComplete
+                                ? this.options.result!.clinical.length
+                                : undefined
+                        }
+                    />
+                    &nbsp;
+                    <span className="caret" />
+                    &nbsp;
                 </button>
             </DefaultTooltip>
         );
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/resultsView/oncoprint/OncoprintDropdownCount.tsx b/src/pages/resultsView/oncoprint/OncoprintDropdownCount.tsx
index 853d6e119b5..ca69c572e41 100644
--- a/src/pages/resultsView/oncoprint/OncoprintDropdownCount.tsx
+++ b/src/pages/resultsView/oncoprint/OncoprintDropdownCount.tsx
@@ -1,12 +1,17 @@
-import * as React from "react";
-import {observer} from "mobx-react";
+import * as React from 'react';
+import { observer } from 'mobx-react';
 
 @observer
-export default class OncoprintDropdownCount extends React.Component<{count: number | undefined}, {}> {
+export default class OncoprintDropdownCount extends React.Component<
+    { count: number | undefined },
+    {}
+> {
     render() {
         if (this.props.count === undefined) {
             return null;
         }
-        return <span className="oncoprintDropdownCount">{this.props.count}</span>;
+        return (
+            <span className="oncoprintDropdownCount">{this.props.count}</span>
+        );
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/resultsView/plots/LastPlotsTabSelectionForDatatype.spec.ts b/src/pages/resultsView/plots/LastPlotsTabSelectionForDatatype.spec.ts
index fcf46ca33ae..6b98d324116 100644
--- a/src/pages/resultsView/plots/LastPlotsTabSelectionForDatatype.spec.ts
+++ b/src/pages/resultsView/plots/LastPlotsTabSelectionForDatatype.spec.ts
@@ -1,4 +1,4 @@
-import {assert} from 'chai';
+import { assert } from 'chai';
 import LastPlotsTabSelectionForDatatype from './LastPlotsTabSelectionForDatatype';
 import { AxisMenuSelection, MutationCountBy } from './PlotsTab';
 import sinon from 'sinon';
@@ -10,7 +10,7 @@ function createFakeCallbacks() {
         geneSet: sinon.stub(),
         source: sinon.stub(),
         treatment: sinon.stub(),
-    }
+    };
 }
 
 // parts of AxisMenuSelection needed to make things compile that are not
@@ -18,21 +18,21 @@ function createFakeCallbacks() {
 const untestedSelectionFields: AxisMenuSelection = {
     mutationCountBy: MutationCountBy.MutationType,
     logScale: false,
-}
+};
 
-describe("PlotsTabSelectionHistory", () => {
-    describe("horizontal updates", () => {
-        it("should update nothing when no changes have been made", () =>{
+describe('PlotsTabSelectionHistory', () => {
+    describe('horizontal updates', () => {
+        it('should update nothing when no changes have been made', () => {
             const subject = new LastPlotsTabSelectionForDatatype();
             const fakes = createFakeCallbacks();
 
             subject.runHorizontalUpdaters(
-                "foo",
+                'foo',
                 fakes.gene,
                 fakes.geneSet,
                 fakes.source,
-                fakes.treatment,
-            )
+                fakes.treatment
+            );
 
             assert.equal(fakes.gene.args.length, 0);
             assert.equal(fakes.geneSet.args.length, 0);
@@ -40,172 +40,178 @@ describe("PlotsTabSelectionHistory", () => {
             assert.equal(fakes.treatment.args.length, 0);
         });
 
-        it("should update genes when changes have been made to genes", () => {
+        it('should update genes when changes have been made to genes', () => {
             const subject = new LastPlotsTabSelectionForDatatype();
             const fakes = createFakeCallbacks();
             const newSelection: AxisMenuSelection = {
-                dataType: "COPY_NUMBER_ALTERATION",
-                selectedGeneOption: {value: 0, label: "BRAF"},
+                dataType: 'COPY_NUMBER_ALTERATION',
+                selectedGeneOption: { value: 0, label: 'BRAF' },
                 ...untestedSelectionFields,
-            }
-            
-            subject.updateHorizontalFromSelection(newSelection)
+            };
+
+            subject.updateHorizontalFromSelection(newSelection);
             subject.runHorizontalUpdaters(
-                "COPY_NUMBER_ALTERATION",
+                'COPY_NUMBER_ALTERATION',
                 fakes.gene,
                 fakes.geneSet,
                 fakes.source,
-                fakes.treatment,
-            )
+                fakes.treatment
+            );
 
             assert.equal(fakes.gene.args.length, 1);
             assert.equal(fakes.geneSet.args.length, 0);
             assert.equal(fakes.source.args.length, 0);
             assert.equal(fakes.treatment.args.length, 0);
 
-            assert.deepEqual(fakes.gene.args[0], [{value: 0, label: "BRAF"}]);
+            assert.deepEqual(fakes.gene.args[0], [{ value: 0, label: 'BRAF' }]);
         });
 
-        it("should update genesets when changes have been made to genesets", () => {
+        it('should update genesets when changes have been made to genesets', () => {
             const subject = new LastPlotsTabSelectionForDatatype();
             const fakes = createFakeCallbacks();
             const newSelection: AxisMenuSelection = {
-                dataType: "COPY_NUMBER_ALTERATION",
-                selectedGenesetOption: {value: "BRAF", label: "BRAF"},
+                dataType: 'COPY_NUMBER_ALTERATION',
+                selectedGenesetOption: { value: 'BRAF', label: 'BRAF' },
                 ...untestedSelectionFields,
-            }
-            
-            subject.updateHorizontalFromSelection(newSelection)
+            };
+
+            subject.updateHorizontalFromSelection(newSelection);
             subject.runHorizontalUpdaters(
-                "COPY_NUMBER_ALTERATION",
+                'COPY_NUMBER_ALTERATION',
                 fakes.gene,
                 fakes.geneSet,
                 fakes.source,
-                fakes.treatment,
-            )
+                fakes.treatment
+            );
 
             assert.equal(fakes.gene.args.length, 0);
             assert.equal(fakes.geneSet.args.length, 1);
             assert.equal(fakes.source.args.length, 0);
             assert.equal(fakes.treatment.args.length, 0);
 
-            assert.deepEqual(fakes.geneSet.args[0], [{value: "BRAF", label: "BRAF"}]);
+            assert.deepEqual(fakes.geneSet.args[0], [
+                { value: 'BRAF', label: 'BRAF' },
+            ]);
         });
 
-        it("should update source when changes have been made to source", () => {
+        it('should update source when changes have been made to source', () => {
             const subject = new LastPlotsTabSelectionForDatatype();
             const fakes = createFakeCallbacks();
             const newSelection: AxisMenuSelection = {
-                dataType: "COPY_NUMBER_ALTERATION",
+                dataType: 'COPY_NUMBER_ALTERATION',
                 selectedDataSourceOption: {
-                    value: "coadread_tcga_pub_gistic",
-                    label: "Putative copy-number alterations from GISTIC"
+                    value: 'coadread_tcga_pub_gistic',
+                    label: 'Putative copy-number alterations from GISTIC',
                 },
                 ...untestedSelectionFields,
-            }
-            
-            subject.updateHorizontalFromSelection(newSelection)
+            };
+
+            subject.updateHorizontalFromSelection(newSelection);
             subject.runHorizontalUpdaters(
-                "COPY_NUMBER_ALTERATION",
+                'COPY_NUMBER_ALTERATION',
                 fakes.gene,
                 fakes.geneSet,
                 fakes.source,
-                fakes.treatment,
-            )
+                fakes.treatment
+            );
 
             assert.equal(fakes.gene.args.length, 0);
             assert.equal(fakes.geneSet.args.length, 0);
             assert.equal(fakes.source.args.length, 1);
             assert.equal(fakes.treatment.args.length, 0);
 
-            assert.deepEqual(
-                fakes.source.args[0],
-                [{
-                    value: "coadread_tcga_pub_gistic",
-                    label: "Putative copy-number alterations from GISTIC"
-                }]
-            );
+            assert.deepEqual(fakes.source.args[0], [
+                {
+                    value: 'coadread_tcga_pub_gistic',
+                    label: 'Putative copy-number alterations from GISTIC',
+                },
+            ]);
         });
 
-        it("should update treatments when changes have been made to treatments", () => {
+        it('should update treatments when changes have been made to treatments', () => {
             const subject = new LastPlotsTabSelectionForDatatype();
             const fakes = createFakeCallbacks();
             const newSelection: AxisMenuSelection = {
-                dataType: "COPY_NUMBER_ALTERATION",
+                dataType: 'COPY_NUMBER_ALTERATION',
                 selectedTreatmentOption: {
-                    value: "test value",
-                    label: "test label"
+                    value: 'test value',
+                    label: 'test label',
                 },
                 ...untestedSelectionFields,
-            }
-            
-            subject.updateHorizontalFromSelection(newSelection)
+            };
+
+            subject.updateHorizontalFromSelection(newSelection);
             subject.runHorizontalUpdaters(
-                "COPY_NUMBER_ALTERATION",
+                'COPY_NUMBER_ALTERATION',
                 fakes.gene,
                 fakes.geneSet,
                 fakes.source,
-                fakes.treatment,
-            )
+                fakes.treatment
+            );
 
             assert.equal(fakes.gene.args.length, 0);
             assert.equal(fakes.geneSet.args.length, 0);
             assert.equal(fakes.source.args.length, 0);
             assert.equal(fakes.treatment.args.length, 1);
 
-            assert.deepEqual(fakes.treatment.args[0], [{value: "test value", label: "test label"}]);
+            assert.deepEqual(fakes.treatment.args[0], [
+                { value: 'test value', label: 'test label' },
+            ]);
         });
-    })
+    });
 
-    describe("vertical updates", () => {
-        it("should update all the vertical fields", () => {
+    describe('vertical updates', () => {
+        it('should update all the vertical fields', () => {
             const subject = new LastPlotsTabSelectionForDatatype();
             const fakes = createFakeCallbacks();
             const newSelection: AxisMenuSelection = {
-                dataType: "COPY_NUMBER_ALTERATION",
+                dataType: 'COPY_NUMBER_ALTERATION',
                 selectedGeneOption: {
                     value: 0,
-                    label: "BRAF"
+                    label: 'BRAF',
                 },
                 selectedGenesetOption: {
-                    value: "BRAF",
-                    label: "BRAF"
+                    value: 'BRAF',
+                    label: 'BRAF',
                 },
                 selectedDataSourceOption: {
-                    value: "coadread_tcga_pub_gistic",
-                    label: "Putative copy-number alterations from GISTIC"
+                    value: 'coadread_tcga_pub_gistic',
+                    label: 'Putative copy-number alterations from GISTIC',
                 },
                 selectedTreatmentOption: {
-                    value: "test value",
-                    label: "test label"
+                    value: 'test value',
+                    label: 'test label',
                 },
                 ...untestedSelectionFields,
-            }
-            
-            subject.updateHorizontalFromSelection(newSelection)
+            };
+
+            subject.updateHorizontalFromSelection(newSelection);
             subject.runHorizontalUpdaters(
-                "COPY_NUMBER_ALTERATION",
+                'COPY_NUMBER_ALTERATION',
                 fakes.gene,
                 fakes.geneSet,
                 fakes.source,
-                fakes.treatment,
-            )
+                fakes.treatment
+            );
 
             assert.equal(fakes.gene.args.length, 1);
             assert.equal(fakes.geneSet.args.length, 1);
             assert.equal(fakes.source.args.length, 1);
             assert.equal(fakes.treatment.args.length, 1);
 
-            assert.deepEqual(fakes.gene.args[0], [{value: 0, label: "BRAF"}]);
-            assert.deepEqual(fakes.geneSet.args[0], [{value: "BRAF", label: "BRAF"}]);
-            assert.deepEqual(
-                fakes.source.args[0],
-                [{
-                    value: "coadread_tcga_pub_gistic",
-                    label: "Putative copy-number alterations from GISTIC"
-                }]
-            );
-            assert.deepEqual(fakes.treatment.args[0], [{value: "test value", label: "test label"}]);
-        })
+            assert.deepEqual(fakes.gene.args[0], [{ value: 0, label: 'BRAF' }]);
+            assert.deepEqual(fakes.geneSet.args[0], [
+                { value: 'BRAF', label: 'BRAF' },
+            ]);
+            assert.deepEqual(fakes.source.args[0], [
+                {
+                    value: 'coadread_tcga_pub_gistic',
+                    label: 'Putative copy-number alterations from GISTIC',
+                },
+            ]);
+            assert.deepEqual(fakes.treatment.args[0], [
+                { value: 'test value', label: 'test label' },
+            ]);
+        });
     });
-});
\ No newline at end of file
+});
diff --git a/src/pages/resultsView/plots/LastPlotsTabSelectionForDatatype.ts b/src/pages/resultsView/plots/LastPlotsTabSelectionForDatatype.ts
index b34795fad9b..5608fef0e35 100644
--- a/src/pages/resultsView/plots/LastPlotsTabSelectionForDatatype.ts
+++ b/src/pages/resultsView/plots/LastPlotsTabSelectionForDatatype.ts
@@ -1,13 +1,16 @@
-import { AxisMenuSelection, PlotsTabGeneOption, PlotsTabOption } from "./PlotsTab";
-import autobind from "autobind-decorator";
+import {
+    AxisMenuSelection,
+    PlotsTabGeneOption,
+    PlotsTabOption,
+} from './PlotsTab';
+import autobind from 'autobind-decorator';
 
 type Selection = {
-    gene?: PlotsTabGeneOption | undefined,
-    geneSet?: PlotsTabOption | undefined,
-    source?: PlotsTabOption | undefined,
-    treatment?: PlotsTabOption | undefined,
-
-}
+    gene?: PlotsTabGeneOption | undefined;
+    geneSet?: PlotsTabOption | undefined;
+    source?: PlotsTabOption | undefined;
+    treatment?: PlotsTabOption | undefined;
+};
 
 type FieldUpdater = (option: any) => void;
 
@@ -16,28 +19,42 @@ export default class LastPlotsTabSelectionForDatatype {
     private vertical: Map<string, Selection> = new Map();
 
     @autobind
-    public updateHorizontalFromSelection(newSelection: AxisMenuSelection): void {
+    public updateHorizontalFromSelection(
+        newSelection: AxisMenuSelection
+    ): void {
         this.updateAxisWithSelection(this.horizontal, newSelection);
     }
-    
+
     @autobind
     public updateVerticalFromSelection(newSelection: AxisMenuSelection): void {
         this.updateAxisWithSelection(this.vertical, newSelection);
     }
 
-    private updateAxisWithSelection(axis: Map<string, Selection>, newSelection: AxisMenuSelection): void {
+    private updateAxisWithSelection(
+        axis: Map<string, Selection>,
+        newSelection: AxisMenuSelection
+    ): void {
         if (newSelection.dataType !== undefined) {
-            let selectionToUpdate = axis.get(newSelection.dataType)
+            let selectionToUpdate = axis.get(newSelection.dataType);
 
             if (selectionToUpdate === undefined) {
                 selectionToUpdate = {};
             }
 
-            axis.set(newSelection.dataType, LastPlotsTabSelectionForDatatype.updateSelection(selectionToUpdate, newSelection))
+            axis.set(
+                newSelection.dataType,
+                LastPlotsTabSelectionForDatatype.updateSelection(
+                    selectionToUpdate,
+                    newSelection
+                )
+            );
         }
     }
 
-    private static updateSelection(selectionToUpdate: Selection, newSelection: AxisMenuSelection): Selection {
+    private static updateSelection(
+        selectionToUpdate: Selection,
+        newSelection: AxisMenuSelection
+    ): Selection {
         selectionToUpdate.gene = newSelection.selectedGeneOption;
         selectionToUpdate.geneSet = newSelection.selectedGenesetOption;
         selectionToUpdate.source = newSelection.selectedDataSourceOption;
@@ -46,10 +63,10 @@ export default class LastPlotsTabSelectionForDatatype {
     }
 
     /**
-     * Finds the old selections made for dataType type on the 
+     * Finds the old selections made for dataType type on the
      * horizontal axis. For each selection, it runs the
      * corresponding updater. Unused and unchanged selections
-     * are not updated. 
+     * are not updated.
      */
     @autobind
     public runHorizontalUpdaters(
@@ -57,16 +74,23 @@ export default class LastPlotsTabSelectionForDatatype {
         gene: FieldUpdater,
         geneSet: FieldUpdater,
         source: FieldUpdater,
-        treatment: FieldUpdater,
+        treatment: FieldUpdater
     ): void {
-        LastPlotsTabSelectionForDatatype.runSelectionUpdaters(this.horizontal, type, gene, geneSet, source, treatment);
+        LastPlotsTabSelectionForDatatype.runSelectionUpdaters(
+            this.horizontal,
+            type,
+            gene,
+            geneSet,
+            source,
+            treatment
+        );
     }
 
     /**
-     * Finds the old selections made for dataType type on the 
+     * Finds the old selections made for dataType type on the
      * vertical axis. For each selection, it runs the
      * corresponding updater. Unused and unchanged selections
-     * are not updated. 
+     * are not updated.
      */
     @autobind
     public runVerticalUpdaters(
@@ -74,9 +98,16 @@ export default class LastPlotsTabSelectionForDatatype {
         gene: FieldUpdater,
         geneSet: FieldUpdater,
         source: FieldUpdater,
-        treatment: FieldUpdater,
+        treatment: FieldUpdater
     ): void {
-        LastPlotsTabSelectionForDatatype.runSelectionUpdaters(this.vertical, type, gene, geneSet, source, treatment);
+        LastPlotsTabSelectionForDatatype.runSelectionUpdaters(
+            this.vertical,
+            type,
+            gene,
+            geneSet,
+            source,
+            treatment
+        );
     }
 
     private static runSelectionUpdaters(
@@ -85,21 +116,21 @@ export default class LastPlotsTabSelectionForDatatype {
         gene: FieldUpdater,
         geneSet: FieldUpdater,
         source: FieldUpdater,
-        treatment: FieldUpdater,
+        treatment: FieldUpdater
     ) {
         if (!axis.get(type)) {
             return;
-        } 
+        }
 
         const infoUpdaterPairs = [
-            {saved: axis.get(type)!.gene, updater: gene},
-            {saved: axis.get(type)!.geneSet, updater: geneSet},
-            {saved: axis.get(type)!.source, updater: source},
-            {saved: axis.get(type)!.treatment, updater: treatment},
-        ]
+            { saved: axis.get(type)!.gene, updater: gene },
+            { saved: axis.get(type)!.geneSet, updater: geneSet },
+            { saved: axis.get(type)!.source, updater: source },
+            { saved: axis.get(type)!.treatment, updater: treatment },
+        ];
 
         infoUpdaterPairs
-            .filter((tuple) => tuple.saved !== undefined)
-            .forEach((tuple) => tuple.updater(tuple.saved));
+            .filter(tuple => tuple.saved !== undefined)
+            .forEach(tuple => tuple.updater(tuple.saved));
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/resultsView/plots/PlotsTab.spec.tsx b/src/pages/resultsView/plots/PlotsTab.spec.tsx
index 03645abe0e9..b11745d37ad 100644
--- a/src/pages/resultsView/plots/PlotsTab.spec.tsx
+++ b/src/pages/resultsView/plots/PlotsTab.spec.tsx
@@ -1,39 +1,31 @@
-import {assert} from "chai";
+import { assert } from 'chai';
 import { AxisMenuSelection } from 'pages/resultsView/plots/PlotsTab';
 import { AlterationTypeConstants } from 'pages/resultsView/ResultsViewPageStore';
 
-describe("PlotsTab", ()=>{
-    describe("controls", ()=>{
-        describe("gene lock", ()=>{
-            it("genes can be freely selected when gene lock is off", ()=>{
-            });
-            it("when gene lock is selected, both axes gene selection should be the one from the axis where lock was clicked", ()=>{
-            });
-            it("genes are locked to be the same when gene lock is on and gene selection is changed in either axis", ()=>{
-            });
+describe('PlotsTab', () => {
+    describe('controls', () => {
+        describe('gene lock', () => {
+            it('genes can be freely selected when gene lock is off', () => {});
+            it('when gene lock is selected, both axes gene selection should be the one from the axis where lock was clicked', () => {});
+            it('genes are locked to be the same when gene lock is on and gene selection is changed in either axis', () => {});
         });
 
-        describe("apply log scale", ()=>{
-            it("should show log scale selector if and only if profile is of [TODO: what type???] type", ()=>{
-            });
+        describe('apply log scale', () => {
+            it('should show log scale selector if and only if profile is of [TODO: what type???] type', () => {});
         });
 
-        describe("utilities menu", ()=>{
-            describe("view section", ()=>{
-                it("should appear if and only if the same gene is selected in both axes", ()=>{
-                });
+        describe('utilities menu', () => {
+            describe('view section', () => {
+                it('should appear if and only if the same gene is selected in both axes', () => {});
             });
         });
 
-        describe("genetic profile menu", ()=>{
-            it("in each axis it should show the genetic profile controls when the genetic profile radio is selected", ()=>{
-            });
+        describe('genetic profile menu', () => {
+            it('in each axis it should show the genetic profile controls when the genetic profile radio is selected', () => {});
         });
 
-        describe("clinical attributes menu", ()=>{
-            it("in each axis it should show the clinical attribute selector when the clinical attribute radio is selected", ()=>{
-            });
+        describe('clinical attributes menu', () => {
+            it('in each axis it should show the clinical attribute selector when the clinical attribute radio is selected', () => {});
         });
     });
-
-});
\ No newline at end of file
+});
diff --git a/src/pages/resultsView/plots/PlotsTab.tsx b/src/pages/resultsView/plots/PlotsTab.tsx
index cedcbea48ea..a6cd31623bc 100644
--- a/src/pages/resultsView/plots/PlotsTab.tsx
+++ b/src/pages/resultsView/plots/PlotsTab.tsx
@@ -1,11 +1,14 @@
-import * as React from "react";
-import {action, computed, observable} from "mobx";
-import {Observer, observer} from "mobx-react";
-import "./styles.scss";
-import {AlterationTypeConstants,  ResultsViewPageStore} from "../ResultsViewPageStore";
-import {FormControl,Button} from "react-bootstrap";
-import ReactSelect from "react-select1";
-import _ from "lodash";
+import * as React from 'react';
+import { action, computed, observable } from 'mobx';
+import { Observer, observer } from 'mobx-react';
+import './styles.scss';
+import {
+    AlterationTypeConstants,
+    ResultsViewPageStore,
+} from '../ResultsViewPageStore';
+import { FormControl, Button } from 'react-bootstrap';
+import ReactSelect from 'react-select1';
+import _ from 'lodash';
 import {
     getAxisLabel,
     IScatterPlotData,
@@ -48,35 +51,38 @@ import {
     IAxisLogScaleParams,
     makeAxisLogScaleFunction,
     axisHasNegativeNumbers,
-    getLimitValues
-} from "./PlotsTabUtils";
-import {
-    ClinicalAttribute,
-} from '../../../shared/api/generated/CBioPortalAPI';
+    getLimitValues,
+} from './PlotsTabUtils';
+import { ClinicalAttribute } from '../../../shared/api/generated/CBioPortalAPI';
 import Timer = NodeJS.Timer;
-import ScatterPlot from "shared/components/plots/ScatterPlot";
-import WaterfallPlot from "shared/components/plots/WaterfallPlot";
-import TablePlot from "shared/components/plots/TablePlot";
-import LoadingIndicator from "shared/components/loadingIndicator/LoadingIndicator";
-import InfoIcon from "../../../shared/components/InfoIcon";
-import {DownloadControls, remoteData} from "cbioportal-frontend-commons";
-import BoxScatterPlot, {IBoxScatterPlotData} from "../../../shared/components/plots/BoxScatterPlot";
-import autobind from "autobind-decorator";
+import ScatterPlot from 'shared/components/plots/ScatterPlot';
+import WaterfallPlot from 'shared/components/plots/WaterfallPlot';
+import TablePlot from 'shared/components/plots/TablePlot';
+import LoadingIndicator from 'shared/components/loadingIndicator/LoadingIndicator';
+import InfoIcon from '../../../shared/components/InfoIcon';
+import { DownloadControls, remoteData } from 'cbioportal-frontend-commons';
+import BoxScatterPlot, {
+    IBoxScatterPlotData,
+} from '../../../shared/components/plots/BoxScatterPlot';
+import autobind from 'autobind-decorator';
 import fileDownload from 'react-file-download';
-import OqlStatusBanner from "../../../shared/components/banners/OqlStatusBanner";
-import ScrollBar from "../../../shared/components/Scrollbar/ScrollBar";
-import {scatterPlotSize, dataPointIsLimited} from "../../../shared/components/plots/PlotUtils";
-import {getTablePlotDownloadData} from "../../../shared/components/plots/TablePlotUtils";
-import {getMobxPromiseGroupStatus} from "../../../shared/lib/getMobxPromiseGroupStatus";
-import MultipleCategoryBarPlot from "../../../shared/components/plots/MultipleCategoryBarPlot";
-import {RESERVED_CLINICAL_VALUE_COLORS} from "shared/lib/Colors";
-import onMobxPromise from "../../../shared/lib/onMobxPromise";
-import "./styles.scss";
+import OqlStatusBanner from '../../../shared/components/banners/OqlStatusBanner';
+import ScrollBar from '../../../shared/components/Scrollbar/ScrollBar';
+import {
+    scatterPlotSize,
+    dataPointIsLimited,
+} from '../../../shared/components/plots/PlotUtils';
+import { getTablePlotDownloadData } from '../../../shared/components/plots/TablePlotUtils';
+import { getMobxPromiseGroupStatus } from '../../../shared/lib/getMobxPromiseGroupStatus';
+import MultipleCategoryBarPlot from '../../../shared/components/plots/MultipleCategoryBarPlot';
+import { RESERVED_CLINICAL_VALUE_COLORS } from 'shared/lib/Colors';
+import onMobxPromise from '../../../shared/lib/onMobxPromise';
+import './styles.scss';
 import { showWaterfallPlot } from 'pages/resultsView/plots/PlotsTabUtils';
-import AlterationFilterWarning from "../../../shared/components/banners/AlterationFilterWarning";
-import LastPlotsTabSelectionForDatatype from "./LastPlotsTabSelectionForDatatype";
-import { generateQuickPlots } from "./QuickPlots";
-import { Treatment } from "shared/lib/GenericAssayUtils/TreatmentUtils";
+import AlterationFilterWarning from '../../../shared/components/banners/AlterationFilterWarning';
+import LastPlotsTabSelectionForDatatype from './LastPlotsTabSelectionForDatatype';
+import { generateQuickPlots } from './QuickPlots';
+import { Treatment } from 'shared/lib/GenericAssayUtils/TreatmentUtils';
 import { GenericAssayTypeConstants } from 'pages/resultsView/ResultsViewPageStore';
 
 enum EventKey {
@@ -86,10 +92,9 @@ enum EventKey {
     utilities_viewCopyNumber,
     utilities_horizontalBars,
     utilities_showRegressionLine,
-    utilities_viewLimitValues
+    utilities_viewLimitValues,
 }
 
-
 export enum ViewType {
     MutationType,
     MutationTypeAndCopyNumber,
@@ -100,7 +105,7 @@ export enum ViewType {
     LimitValMutationType,
     LimitValCopyNumber,
     LimitValMutationTypeAndCopyNumber,
-    None
+    None,
 }
 
 export enum PotentialViewType {
@@ -109,7 +114,7 @@ export enum PotentialViewType {
     None,
     LimitValMutationTypeAndCopyNumber,
     LimitValMutationSummary,
-    LimitVal
+    LimitVal,
 }
 
 export enum PlotType {
@@ -117,42 +122,42 @@ export enum PlotType {
     WaterfallPlot,
     BoxPlot,
     DiscreteVsDiscrete,
-    Table
+    Table,
 }
 
 export enum DiscreteVsDiscretePlotType {
-    Bar = "Bar",
-    StackedBar = "StackedBar",
-    PercentageStackedBar = "PercentageStackedBar",
-    Table = "Table"
+    Bar = 'Bar',
+    StackedBar = 'StackedBar',
+    PercentageStackedBar = 'PercentageStackedBar',
+    Table = 'Table',
 }
 
 export enum MutationCountBy {
-    MutationType = "MutationType",
-    MutatedVsWildType = "MutatedVsWildType"
+    MutationType = 'MutationType',
+    MutatedVsWildType = 'MutatedVsWildType',
 }
 
 export type AxisMenuSelection = {
-    entrezGeneId?:number;
-    genesetId?:string;
-    treatmentId?:string;
-    selectedGeneOption?:PlotsTabGeneOption;
-    selectedDataSourceOption?:PlotsTabOption;
-    selectedGenesetOption?:PlotsTabOption;
-    selectedTreatmentOption?:PlotsTabOption;
-    dataType?:string;
-    dataSourceId?:string;
-    mutationCountBy:MutationCountBy;
+    entrezGeneId?: number;
+    genesetId?: string;
+    treatmentId?: string;
+    selectedGeneOption?: PlotsTabGeneOption;
+    selectedDataSourceOption?: PlotsTabOption;
+    selectedGenesetOption?: PlotsTabOption;
+    selectedTreatmentOption?: PlotsTabOption;
+    dataType?: string;
+    dataSourceId?: string;
+    mutationCountBy: MutationCountBy;
     logScale: boolean;
 };
 
 export type UtilitiesMenuSelection = {
-    entrezGeneIdForMutCNAStyling?:number;
-    selectedGeneOption?:{value:number, label:string};
+    entrezGeneIdForMutCNAStyling?: number;
+    selectedGeneOption?: { value: number; label: string };
 };
 
 export interface IPlotsTabProps {
-    store:ResultsViewPageStore;
+    store: ResultsViewPageStore;
 }
 
 export type PlotsTabDataSource = {
@@ -162,9 +167,9 @@ export type PlotsTabDataSource = {
 export type PlotsTabOption = { value: string; label: string };
 
 export type PlotsTabGeneOption = {
-    value: number, // entrez id
-    label: string, // hugo symbol
-}
+    value: number; // entrez id
+    label: string; // hugo symbol
+};
 export type PlotsTabDataTypeToSources = {
     [dataType: string]: { value: string; label: string }[];
 };
@@ -175,65 +180,71 @@ class PlotsTabScatterPlot extends ScatterPlot<IScatterPlotData> {}
 class PlotsTabBoxPlot extends BoxScatterPlot<IBoxScatterPlotPoint> {}
 class PlotsTabWaterfallPlot extends WaterfallPlot<IWaterfallPlotData> {}
 
-const SVG_ID = "plots-tab-plot-svg";
+const SVG_ID = 'plots-tab-plot-svg';
 
-export const NONE_SELECTED_OPTION_STRING_VALUE = "none";
+export const NONE_SELECTED_OPTION_STRING_VALUE = 'none';
 export const NONE_SELECTED_OPTION_NUMERICAL_VALUE = -1;
-export const NONE_SELECTED_OPTION_LABEL = "Ordered samples";
+export const NONE_SELECTED_OPTION_LABEL = 'Ordered samples';
 export const ALL_SELECTED_OPTION_NUMERICAL_VALUE = -3;
-export const SAME_SELECTED_OPTION_STRING_VALUE = "same";
+export const SAME_SELECTED_OPTION_STRING_VALUE = 'same';
 export const SAME_SELECTED_OPTION_NUMERICAL_VALUE = -2;
 const LEGEND_TO_BOTTOM_WIDTH_THRESHOLD = 550; // when plot is wider than this value, the legend moves from right to bottom of screen
 
 const mutationCountByOptions = [
-    { value: MutationCountBy.MutationType, label: "Mutation Type" },
-    { value: MutationCountBy.MutatedVsWildType, label: "Mutated vs Wild-type" }
+    { value: MutationCountBy.MutationType, label: 'Mutation Type' },
+    { value: MutationCountBy.MutatedVsWildType, label: 'Mutated vs Wild-type' },
 ];
 
 const discreteVsDiscretePlotTypeOptions = [
-    { value: DiscreteVsDiscretePlotType.Bar, label: "Bar chart" },
-    { value: DiscreteVsDiscretePlotType.StackedBar, label: "Stacked bar chart" },
-    { value: DiscreteVsDiscretePlotType.PercentageStackedBar, label: "100% stacked bar chart" },
-    { value: DiscreteVsDiscretePlotType.Table, label: "Table" }
-]
+    { value: DiscreteVsDiscretePlotType.Bar, label: 'Bar chart' },
+    {
+        value: DiscreteVsDiscretePlotType.StackedBar,
+        label: 'Stacked bar chart',
+    },
+    {
+        value: DiscreteVsDiscretePlotType.PercentageStackedBar,
+        label: '100% stacked bar chart',
+    },
+    { value: DiscreteVsDiscretePlotType.Table, label: 'Table' },
+];
 
 @observer
-export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
-
-    private horzSelection:AxisMenuSelection;
-    private vertSelection:AxisMenuSelection;
+export default class PlotsTab extends React.Component<IPlotsTabProps, {}> {
+    private horzSelection: AxisMenuSelection;
+    private vertSelection: AxisMenuSelection;
     private selectionHistory = new LastPlotsTabSelectionForDatatype();
-    private utilitiesMenuSelection:UtilitiesMenuSelection;
+    private utilitiesMenuSelection: UtilitiesMenuSelection;
 
-    private scrollPane:HTMLDivElement;
+    private scrollPane: HTMLDivElement;
 
-    @observable searchCaseInput:string;
-    @observable searchMutationInput:string;
-    @observable viewMutationType:boolean = true;
-    @observable viewCopyNumber:boolean = false;
+    @observable searchCaseInput: string;
+    @observable searchMutationInput: string;
+    @observable viewMutationType: boolean = true;
+    @observable viewCopyNumber: boolean = false;
     @observable showRegressionLine = false;
     // discrete vs discrete settings
-    @observable discreteVsDiscretePlotType:DiscreteVsDiscretePlotType = DiscreteVsDiscretePlotType.StackedBar;
+    @observable discreteVsDiscretePlotType: DiscreteVsDiscretePlotType =
+        DiscreteVsDiscretePlotType.StackedBar;
     @observable horizontalBars = false;
     @observable percentageBar = false;
     @observable stackedBar = false;
-    @observable viewLimitValues:boolean = true;
-    @observable _waterfallPlotSortOrder:string|undefined = undefined;
+    @observable viewLimitValues: boolean = true;
+    @observable _waterfallPlotSortOrder: string | undefined = undefined;
 
-    @observable searchCase:string = "";
-    @observable searchMutation:string = "";
+    @observable searchCase: string = '';
+    @observable searchMutation: string = '';
     @observable plotExists = false;
 
     @autobind
-    private getScrollPane(){
+    private getScrollPane() {
         return this.scrollPane;
     }
 
     // determine whether formatting for points in the scatter plot (based on
     // mutations type, CNA, ...) will actually be shown in the plot (depends
     // on user choice via check boxes).
-    @computed get viewType():ViewType {
-        let ret:ViewType = ViewType.None;
+    @computed get viewType(): ViewType {
+        let ret: ViewType = ViewType.None;
         switch (this.potentialViewType) {
             case PotentialViewType.MutationTypeAndCopyNumber:
                 if (this.viewMutationType && this.viewCopyNumber) {
@@ -254,7 +265,11 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
                 }
                 break;
             case PotentialViewType.LimitValMutationTypeAndCopyNumber:
-                if (this.viewMutationType && this.viewCopyNumber && this.viewLimitValues) {
+                if (
+                    this.viewMutationType &&
+                    this.viewCopyNumber &&
+                    this.viewLimitValues
+                ) {
                     ret = ViewType.LimitValMutationTypeAndCopyNumber;
                 } else if (this.viewMutationType && this.viewCopyNumber) {
                     ret = ViewType.MutationTypeAndCopyNumber;
@@ -271,7 +286,7 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
                 } else {
                     ret = ViewType.None;
                 }
-            break;
+                break;
             case PotentialViewType.LimitValMutationSummary:
                 if (this.viewMutationType && this.viewLimitValues) {
                     ret = ViewType.LimitValMutationSummary;
@@ -282,12 +297,12 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
                 } else {
                     ret = ViewType.None;
                 }
-            break;
+                break;
             case PotentialViewType.LimitVal:
                 if (this.viewLimitValues) {
                     ret = ViewType.LimitVal;
                 }
-            break;
+                break;
         }
         return ret;
     }
@@ -299,28 +314,27 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
             !this.props.store.samplesByDetailedCancerType.isComplete ||
             !this.props.store.mutations.isComplete
         ) {
-            return (
-                <LoadingIndicator
-                        isLoading={true}
-                        size={"small"}
-                    />
-            );
+            return <LoadingIndicator isLoading={true} size={'small'} />;
         }
 
-        const cancerTypes = Object.keys(this.props.store.samplesByDetailedCancerType.result);
+        const cancerTypes = Object.keys(
+            this.props.store.samplesByDetailedCancerType.result
+        );
         const mutationCount = this.props.store.mutations.result.length;
-        const horizontalSource = this.horzSelection.selectedDataSourceOption ?
-            this.horzSelection.selectedDataSourceOption.value : undefined;
-        const verticalSource = this.vertSelection.selectedDataSourceOption ?
-            this.vertSelection.selectedDataSourceOption.value : undefined;
+        const horizontalSource = this.horzSelection.selectedDataSourceOption
+            ? this.horzSelection.selectedDataSourceOption.value
+            : undefined;
+        const verticalSource = this.vertSelection.selectedDataSourceOption
+            ? this.vertSelection.selectedDataSourceOption.value
+            : undefined;
 
         const plots = generateQuickPlots(
             this.dataTypeOptions.result,
             this.dataTypeToDataSourceOptions.result,
             cancerTypes,
             mutationCount,
-            {type: this.horzSelection.dataType, source: horizontalSource},
-            {type: this.vertSelection.dataType, source: verticalSource}
+            { type: this.horzSelection.dataType, source: horizontalSource },
+            { type: this.vertSelection.dataType, source: verticalSource }
         );
 
         return (
@@ -328,7 +342,10 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
                 <ul className="nav nav-pills">
                     {plots.map(pill => (
                         <li
-                            className={'plots-tab-pills ' + (pill.selected ? 'active' : '')}
+                            className={
+                                'plots-tab-pills ' +
+                                (pill.selected ? 'active' : '')
+                            }
                             onClick={action(() => {
                                 if (pill.plotModel.horizontal.dataType) {
                                     this.onHorizontalAxisDataTypeSelect(
@@ -367,7 +384,7 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
     // for points in the scatter plot (based on mutations type, CNA, ...)
     // NOTE1: the order of these statements is critical for correct resolution
     // NOTE2: limit values are only supported for treatment outcome profiles
-    @computed get potentialViewType():PotentialViewType {
+    @computed get potentialViewType(): PotentialViewType {
         if (this.plotType.result === PlotType.DiscreteVsDiscrete) {
             // cant show either in table
             return PotentialViewType.None;
@@ -400,18 +417,18 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
         return PotentialViewType.None;
     }
 
-    private searchCaseTimeout:Timer;
-    private searchMutationTimeout:Timer;
+    private searchCaseTimeout: Timer;
+    private searchMutationTimeout: Timer;
 
-    constructor(props:IPlotsTabProps) {
+    constructor(props: IPlotsTabProps) {
         super(props);
 
         this.horzSelection = this.initAxisMenuSelection(false);
         this.vertSelection = this.initAxisMenuSelection(true);
         this.utilitiesMenuSelection = this.initUtilitiesGeneSelection();
 
-        this.searchCaseInput = "";
-        this.searchMutationInput = "";
+        this.searchCaseInput = '';
+        this.searchMutationInput = '';
 
         (window as any).resultsViewPlotsTab = this;
     }
@@ -421,15 +438,22 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
         return document.getElementById(SVG_ID) as SVGElement | null;
     }
 
-    private downloadFilename = "plot"; // todo: more specific?
+    private downloadFilename = 'plot'; // todo: more specific?
 
-    private initAxisMenuSelection(vertical:boolean):AxisMenuSelection {
+    private initAxisMenuSelection(vertical: boolean): AxisMenuSelection {
         const self = this;
 
         return observable({
             get entrezGeneId() {
-                if ( self.showGeneSelectBox(this.dataType) && this.selectedGeneOption) {
-                    if (vertical && this.selectedGeneOption.value === SAME_SELECTED_OPTION_NUMERICAL_VALUE) {
+                if (
+                    self.showGeneSelectBox(this.dataType) &&
+                    this.selectedGeneOption
+                ) {
+                    if (
+                        vertical &&
+                        this.selectedGeneOption.value ===
+                            SAME_SELECTED_OPTION_NUMERICAL_VALUE
+                    ) {
                         return self.horzSelection.entrezGeneId;
                     } else {
                         return this.selectedGeneOption.value;
@@ -439,12 +463,23 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
                 }
             },
             get selectedGeneOption() {
-                const geneOptions = vertical ? self.vertGeneOptions : self.horzGeneOptions.result || [];
-                if (this._selectedGeneOption === undefined && geneOptions.length) {
+                const geneOptions = vertical
+                    ? self.vertGeneOptions
+                    : self.horzGeneOptions.result || [];
+                if (
+                    this._selectedGeneOption === undefined &&
+                    geneOptions.length
+                ) {
                     // select default if _selectedGeneOption is undefined and theres defaults to choose from
                     return geneOptions[0];
-                } else if (vertical && this._selectedGeneOption && this._selectedGeneOption.value === SAME_SELECTED_OPTION_NUMERICAL_VALUE &&
-                            self.horzSelection.dataType && !self.showGeneSelectBox(self.horzSelection.dataType)) {
+                } else if (
+                    vertical &&
+                    this._selectedGeneOption &&
+                    this._selectedGeneOption.value ===
+                        SAME_SELECTED_OPTION_NUMERICAL_VALUE &&
+                    self.horzSelection.dataType &&
+                    !self.showGeneSelectBox(self.horzSelection.dataType)
+                ) {
                     // if vertical gene option is "same as horizontal", and horizontal is clinical, then use the actual
                     //      gene option value instead of "Same gene" option value, because that would be slightly weird UX
                     return self.horzSelection.selectedGeneOption;
@@ -453,7 +488,7 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
                     return this._selectedGeneOption;
                 }
             },
-            set selectedGeneOption(o:any) {
+            set selectedGeneOption(o: any) {
                 this._selectedGeneOption = o;
             },
             get dataType() {
@@ -465,29 +500,51 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
                 const dataTypeOptions = self.dataTypeOptions.result!;
                 if (this._dataType === undefined && dataTypeOptions.length) {
                     // return computed default if _dataType is undefined and if there are options to select a default value from
-                    if (vertical && !!dataTypeOptions.find(o=>(o.value === AlterationTypeConstants.MRNA_EXPRESSION))) {
+                    if (
+                        vertical &&
+                        !!dataTypeOptions.find(
+                            o =>
+                                o.value ===
+                                AlterationTypeConstants.MRNA_EXPRESSION
+                        )
+                    ) {
                         // default for the vertical axis is mrna, if one is available
                         return AlterationTypeConstants.MRNA_EXPRESSION;
-                    } else if (!vertical && !!dataTypeOptions.find(o=>(o.value === AlterationTypeConstants.COPY_NUMBER_ALTERATION))) {
+                    } else if (
+                        !vertical &&
+                        !!dataTypeOptions.find(
+                            o =>
+                                o.value ===
+                                AlterationTypeConstants.COPY_NUMBER_ALTERATION
+                        )
+                    ) {
                         // default for the horizontal axis is CNA, if one is available
                         return AlterationTypeConstants.COPY_NUMBER_ALTERATION;
                     } else {
                         // otherwise, just return the first option
                         return dataTypeOptions[0].value;
                     }
-                } else if (this._dataType === NONE_SELECTED_OPTION_STRING_VALUE) {
+                } else if (
+                    this._dataType === NONE_SELECTED_OPTION_STRING_VALUE
+                ) {
                     // when a `none` option was selected in the datatype menu
                     // and was removed (no treatment data selected on other axis)
                     // just return the first option.
-                    const firstDataTypeOption = vertical ? self.vertDatatypeOptions[0] : self.horzDatatypeOptions[0];
-                    const returnType = firstDataTypeOption.value === NONE_SELECTED_OPTION_STRING_VALUE ? this._dataType : dataTypeOptions[0].value;
+                    const firstDataTypeOption = vertical
+                        ? self.vertDatatypeOptions[0]
+                        : self.horzDatatypeOptions[0];
+                    const returnType =
+                        firstDataTypeOption.value ===
+                        NONE_SELECTED_OPTION_STRING_VALUE
+                            ? this._dataType
+                            : dataTypeOptions[0].value;
                     return returnType;
                 } else {
                     // otherwise, _dataType is defined, or there are no default options to choose from, so return _dataType
                     return this._dataType;
                 }
             },
-            set dataType(t:string|undefined) {
+            set dataType(t: string | undefined) {
                 if (this._dataType !== t) {
                     this._selectedDataSourceOption = undefined;
                 }
@@ -499,11 +556,14 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
                     return this._selectedDataSourceOption;
                 }
                 // otherwise, pick the default based on the current selected data type, and available sources
-                const dataSourceOptionsByType = self.dataTypeToDataSourceOptions.result!;
-                if (this._selectedDataSourceOption === undefined &&
+                const dataSourceOptionsByType = self.dataTypeToDataSourceOptions
+                    .result!;
+                if (
+                    this._selectedDataSourceOption === undefined &&
                     this.dataType &&
                     dataSourceOptionsByType[this.dataType] &&
-                    dataSourceOptionsByType[this.dataType].length) {
+                    dataSourceOptionsByType[this.dataType].length
+                ) {
                     // return computed default if _selectedDataSourceOption is undefined
                     return dataSourceOptionsByType[this.dataType][0];
                 } else {
@@ -511,7 +571,10 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
                     return this._selectedDataSourceOption;
                 }
             },
-            set selectedDataSourceOption(option:{value:string, label:string}) {
+            set selectedDataSourceOption(option: {
+                value: string;
+                label: string;
+            }) {
                 this._selectedDataSourceOption = option;
             },
             get dataSourceId() {
@@ -528,18 +591,21 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
                     return this._mutationCountBy;
                 }
             },
-            set mutationCountBy(m:MutationCountBy) {
+            set mutationCountBy(m: MutationCountBy) {
                 this._mutationCountBy = m;
             },
             get logScale() {
                 return this._logScale && logScalePossible(this);
             },
-            set logScale(v:boolean) {
+            set logScale(v: boolean) {
                 this._logScale = v;
             },
             get genesetId() {
                 if (this.selectedGenesetOption) {
-                    if (this.selectedGenesetOption.value === SAME_SELECTED_OPTION_STRING_VALUE) {
+                    if (
+                        this.selectedGenesetOption.value ===
+                        SAME_SELECTED_OPTION_STRING_VALUE
+                    ) {
                         return self.horzSelection.genesetId;
                     } else {
                         return this.selectedGenesetOption.value;
@@ -549,27 +615,43 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
                 }
             },
             get selectedGenesetOption() {
-                const genesetOptions = (vertical ? self.vertGenesetOptions : self.horzGenesetOptions
-                    .result) || [];
-                if (this._selectedGenesetOption === undefined && genesetOptions.length) {
+                const genesetOptions =
+                    (vertical
+                        ? self.vertGenesetOptions
+                        : self.horzGenesetOptions.result) || [];
+                if (
+                    this._selectedGenesetOption === undefined &&
+                    genesetOptions.length
+                ) {
                     // select default if _selectedGenesetOption is undefined and theres defaults to choose from
                     return genesetOptions[0];
-                } else if (vertical && this._selectedGenesetOption && this._selectedGenesetOption.value === SAME_SELECTED_OPTION_STRING_VALUE &&
-                    self.horzSelection.dataType === CLIN_ATTR_DATA_TYPE) {
-                        // if vertical gene set option is "same as horizontal", and horizontal is clinical, then use the actual
-                        //      gene set option value instead of "Same gene" option value, because that would be slightly weird UX
-                        return self.horzSelection.selectedGenesetOption;
-                    } else {
-                        // otherwise, return stored value for this variable
-                        return this._selectedGenesetOption;
-                    }
-                },
-            set selectedGenesetOption(o:any) {
+                } else if (
+                    vertical &&
+                    this._selectedGenesetOption &&
+                    this._selectedGenesetOption.value ===
+                        SAME_SELECTED_OPTION_STRING_VALUE &&
+                    self.horzSelection.dataType === CLIN_ATTR_DATA_TYPE
+                ) {
+                    // if vertical gene set option is "same as horizontal", and horizontal is clinical, then use the actual
+                    //      gene set option value instead of "Same gene" option value, because that would be slightly weird UX
+                    return self.horzSelection.selectedGenesetOption;
+                } else {
+                    // otherwise, return stored value for this variable
+                    return this._selectedGenesetOption;
+                }
+            },
+            set selectedGenesetOption(o: any) {
                 this._selectedGenesetOption = o;
             },
             get treatmentId() {
-                if (self.showTreatmentSelectBox(this.dataType) && this.selectedTreatmentOption) {
-                    if (this.selectedTreatmentOption.value === SAME_SELECTED_OPTION_STRING_VALUE) {
+                if (
+                    self.showTreatmentSelectBox(this.dataType) &&
+                    this.selectedTreatmentOption
+                ) {
+                    if (
+                        this.selectedTreatmentOption.value ===
+                        SAME_SELECTED_OPTION_STRING_VALUE
+                    ) {
                         return self.horzSelection.treatmentId;
                     } else {
                         return this.selectedTreatmentOption.value;
@@ -579,13 +661,23 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
                 }
             },
             get selectedTreatmentOption() {
-                const treatmentOptions = (vertical ? self.vertTreatmentOptions : self.horzTreatmentOptions.result) || [];
-                if (this._selectedTreatmentOption === undefined && treatmentOptions.length) {
+                const treatmentOptions =
+                    (vertical
+                        ? self.vertTreatmentOptions
+                        : self.horzTreatmentOptions.result) || [];
+                if (
+                    this._selectedTreatmentOption === undefined &&
+                    treatmentOptions.length
+                ) {
                     // select default if _selectedTreatmentOption is undefined and there are treatments to choose from
                     return treatmentOptions[0];
-                } else if (vertical && this._selectedTreatmentOption
-                    && this._selectedTreatmentOption.value === SAME_SELECTED_OPTION_STRING_VALUE
-                    && self.horzSelection.dataType === CLIN_ATTR_DATA_TYPE) {
+                } else if (
+                    vertical &&
+                    this._selectedTreatmentOption &&
+                    this._selectedTreatmentOption.value ===
+                        SAME_SELECTED_OPTION_STRING_VALUE &&
+                    self.horzSelection.dataType === CLIN_ATTR_DATA_TYPE
+                ) {
                     // if vertical gene set option is "same as horizontal", and horizontal is clinical, then use the actual
                     //      gene set option value instead of "Same gene" option value, because that would be slightly weird UX
                     return self.horzSelection.selectedTreatmentOption;
@@ -594,7 +686,7 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
                     return this._selectedTreatmentOption;
                 }
             },
-            set selectedTreatmentOption(o:any) {
+            set selectedTreatmentOption(o: any) {
                 this._selectedTreatmentOption = o;
             },
             _selectedGeneOption: undefined,
@@ -603,22 +695,30 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
             _dataType: undefined,
             _mutationCountBy: undefined,
             _logScale: false,
-            _selectedDataSourceOption: undefined
+            _selectedDataSourceOption: undefined,
         });
     }
 
-    private initUtilitiesGeneSelection():UtilitiesMenuSelection {
+    private initUtilitiesGeneSelection(): UtilitiesMenuSelection {
         const self = this;
         return observable({
             get entrezGeneIdForMutCNAStyling() {
-                if (self.showUtilitiesMenuGeneSelectBox && this.selectedGeneOption) {
+                if (
+                    self.showUtilitiesMenuGeneSelectBox &&
+                    this.selectedGeneOption
+                ) {
                     return this.selectedGeneOption.value;
                 }
                 return undefined;
             },
             get selectedGeneOption() {
-                const geneOptions = self.horzGeneOptions.isComplete ? self.horzGeneOptions.result : [];
-                if (this._selectedUtilitiesGeneOption === undefined && geneOptions.length) {
+                const geneOptions = self.horzGeneOptions.isComplete
+                    ? self.horzGeneOptions.result
+                    : [];
+                if (
+                    this._selectedUtilitiesGeneOption === undefined &&
+                    geneOptions.length
+                ) {
                     // select default if _selectedUtilitiesGeneOption is undefined and there are genes to choose from
                     return geneOptions[0];
                 } else {
@@ -626,16 +726,16 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
                     return this._selectedUtilitiesGeneOption;
                 }
             },
-            set selectedGeneOption(o:any) {
+            set selectedGeneOption(o: any) {
                 this._selectedUtilitiesGeneOption = o;
             },
-            _selectedUtilitiesGeneOption: undefined
+            _selectedUtilitiesGeneOption: undefined,
         });
     }
 
     @autobind
     @action
-    private onInputClick(event:React.MouseEvent<HTMLInputElement>) {
+    private onInputClick(event: React.MouseEvent<HTMLInputElement>) {
         const plotType = this.plotType.result!;
         switch (parseInt((event.target as HTMLInputElement).value, 10)) {
             case EventKey.horz_logScale:
@@ -681,11 +781,13 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
     @autobind
     private downloadData() {
         onMobxPromise<any>(
-            [this.props.store.entrezGeneIdToGene,
-            this.props.store.sampleKeyToSample,
-            this.horzLabel,
-            this.vertLabel],
-            (entrezGeneIdToGene, sampleKeyToSample, horzLabel, vertLabel)=>{
+            [
+                this.props.store.entrezGeneIdToGene,
+                this.props.store.sampleKeyToSample,
+                this.horzLabel,
+                this.vertLabel,
+            ],
+            (entrezGeneIdToGene, sampleKeyToSample, horzLabel, vertLabel) => {
                 const filename = `${this.downloadFilename}.txt`;
                 switch (this.plotType.result) {
                     case PlotType.ScatterPlot:
@@ -712,8 +814,13 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
                         );
                         break;
                     case PlotType.BoxPlot:
-                        const categoryLabel = this.boxPlotData.result!.horizontal ? vertLabel : horzLabel;
-                        const valueLabel = this.boxPlotData.result!.horizontal ? horzLabel : vertLabel;
+                        const categoryLabel = this.boxPlotData.result!
+                            .horizontal
+                            ? vertLabel
+                            : horzLabel;
+                        const valueLabel = this.boxPlotData.result!.horizontal
+                            ? horzLabel
+                            : vertLabel;
                         fileDownload(
                             getBoxPlotDownloadData(
                                 this.boxPlotData.result!.data,
@@ -727,8 +834,10 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
                     case PlotType.DiscreteVsDiscrete:
                         fileDownload(
                             getTablePlotDownloadData(
-                                (this.horzAxisDataPromise.result! as IStringAxisData).data,
-                                (this.vertAxisDataPromise.result! as IStringAxisData).data,
+                                (this.horzAxisDataPromise
+                                    .result! as IStringAxisData).data,
+                                (this.vertAxisDataPromise
+                                    .result! as IStringAxisData).data,
                                 sampleKeyToSample,
                                 horzLabel,
                                 vertLabel
@@ -738,41 +847,49 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
                         break;
                 }
             }
-        )
+        );
     }
 
     @autobind
     @action
-    private setSearchCaseInput(e:any) {
+    private setSearchCaseInput(e: any) {
         this.searchCaseInput = e.target.value;
         clearTimeout(this.searchCaseTimeout);
-        this.searchCaseTimeout = setTimeout(()=>this.executeSearchCase(this.searchCaseInput), searchInputTimeoutMs);
+        this.searchCaseTimeout = setTimeout(
+            () => this.executeSearchCase(this.searchCaseInput),
+            searchInputTimeoutMs
+        );
     }
 
     @autobind
     @action
-    private setSearchMutationInput(e:any) {
+    private setSearchMutationInput(e: any) {
         this.searchMutationInput = e.target.value;
         clearTimeout(this.searchMutationTimeout);
-        this.searchMutationTimeout = setTimeout(()=>this.executeSearchMutation(this.searchMutationInput), searchInputTimeoutMs);
+        this.searchMutationTimeout = setTimeout(
+            () => this.executeSearchMutation(this.searchMutationInput),
+            searchInputTimeoutMs
+        );
     }
 
     @autobind
     @action
-    public executeSearchCase(caseId:string) {
+    public executeSearchCase(caseId: string) {
         this.searchCase = caseId;
     }
 
     @autobind
     @action
-    public executeSearchMutation(proteinChange:string) {
+    public executeSearchMutation(proteinChange: string) {
         this.searchMutation = proteinChange;
     }
 
     @autobind
     private getHorizontalAxisMenu() {
-        if (!this.dataTypeOptions.isComplete ||
-            !this.dataTypeToDataSourceOptions.isComplete) {
+        if (
+            !this.dataTypeOptions.isComplete ||
+            !this.dataTypeToDataSourceOptions.isComplete
+        ) {
             return <span></span>;
         } else {
             return this.getAxisMenu(
@@ -785,8 +902,10 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
 
     @autobind
     private getVerticalAxisMenu() {
-        if (!this.dataTypeOptions.isComplete ||
-            !this.dataTypeToDataSourceOptions.isComplete) {
+        if (
+            !this.dataTypeOptions.isComplete ||
+            !this.dataTypeToDataSourceOptions.isComplete
+        ) {
             return <span></span>;
         } else {
             return this.getAxisMenu(
@@ -799,7 +918,7 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
 
     @autobind
     @action
-    private onVerticalAxisGeneSelect(option:any) {
+    private onVerticalAxisGeneSelect(option: any) {
         this.vertSelection.selectedGeneOption = option;
         this.viewLimitValues = true;
         this.selectionHistory.updateVerticalFromSelection(this.vertSelection);
@@ -807,7 +926,7 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
 
     @autobind
     @action
-    private onHorizontalAxisGeneSelect(option:any) {
+    private onHorizontalAxisGeneSelect(option: any) {
         this.horzSelection.selectedGeneOption = option;
         this.viewLimitValues = true;
         this.selectionHistory.updateHorizontalFromSelection(this.horzSelection);
@@ -816,7 +935,9 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
     @autobind
     @action
     private selectSameGeneOptionForVerticalAxis() {
-        const option = this.vertGeneOptions.find(o=>o.value === SAME_SELECTED_OPTION_NUMERICAL_VALUE);
+        const option = this.vertGeneOptions.find(
+            o => o.value === SAME_SELECTED_OPTION_NUMERICAL_VALUE
+        );
 
         if (option) {
             this.onVerticalAxisGeneSelect(option);
@@ -825,7 +946,7 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
 
     @autobind
     @action
-    private onVerticalAxisGenesetSelect(option:any) {
+    private onVerticalAxisGenesetSelect(option: any) {
         this.vertSelection.selectedGenesetOption = option;
         this.viewLimitValues = true;
         this.selectionHistory.updateVerticalFromSelection(this.vertSelection);
@@ -833,7 +954,7 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
 
     @autobind
     @action
-    private onHorizontalAxisGenesetSelect(option:any) {
+    private onHorizontalAxisGenesetSelect(option: any) {
         this.horzSelection.selectedGenesetOption = option;
         this.viewLimitValues = true;
         this.selectionHistory.updateHorizontalFromSelection(this.horzSelection);
@@ -841,7 +962,7 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
 
     @autobind
     @action
-    private onVerticalAxisTreatmentSelect(option:any) {
+    private onVerticalAxisTreatmentSelect(option: any) {
         this.vertSelection.selectedTreatmentOption = option;
         this.viewLimitValues = true;
         this.selectionHistory.updateVerticalFromSelection(this.vertSelection);
@@ -849,7 +970,7 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
 
     @autobind
     @action
-    private onHorizontalAxisTreatmentSelect(option:any) {
+    private onHorizontalAxisTreatmentSelect(option: any) {
         this.horzSelection.selectedTreatmentOption = option;
         this.viewLimitValues = true;
         this.selectionHistory.updateHorizontalFromSelection(this.horzSelection);
@@ -857,22 +978,22 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
 
     @autobind
     @action
-    private onUtilitiesGeneSelect(option:any) {
+    private onUtilitiesGeneSelect(option: any) {
         this.utilitiesMenuSelection.selectedGeneOption = option;
     }
 
-    public test__selectGeneOption(vertical:boolean, optionValue:any) {
+    public test__selectGeneOption(vertical: boolean, optionValue: any) {
         // for end to end testing
         // optionValue is either entrez id or the code for same gene
-        let options:any[];
+        let options: any[];
         if (vertical) {
             options = this.vertGeneOptions || [];
         } else {
             options = this.horzGeneOptions.result || [];
         }
-        const option = options.find(x=>(x.value === optionValue));
+        const option = options.find(x => x.value === optionValue);
         if (!option) {
-            throw "Option not found";
+            throw 'Option not found';
         }
         if (vertical) {
             this.onVerticalAxisGeneSelect(option);
@@ -884,44 +1005,79 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
     @computed get horzDatatypeOptions() {
         let noneDatatypeOption = undefined;
         // listen to updates of `dataTypeOptions` and on the selected data type for the vertical axis
-        if (this.dataTypeOptions && this.vertSelection.dataType && _.keys(GenericAssayTypeConstants).includes(this.vertSelection.dataType)) {
-            noneDatatypeOption = [{ value: NONE_SELECTED_OPTION_STRING_VALUE, label: NONE_SELECTED_OPTION_LABEL}];
+        if (
+            this.dataTypeOptions &&
+            this.vertSelection.dataType &&
+            _.keys(GenericAssayTypeConstants).includes(
+                this.vertSelection.dataType
+            )
+        ) {
+            noneDatatypeOption = [
+                {
+                    value: NONE_SELECTED_OPTION_STRING_VALUE,
+                    label: NONE_SELECTED_OPTION_LABEL,
+                },
+            ];
         }
-        const options = (noneDatatypeOption || []).concat((this.dataTypeOptions.result || []) as any[]);
+        const options = (noneDatatypeOption || []).concat((this.dataTypeOptions
+            .result || []) as any[]);
         return options;
     }
 
     @computed get vertDatatypeOptions() {
         let noneDatatypeOption = undefined;
         // listen to updates of `dataTypeOptions` and on the selected data type for the horzontal axis
-        if (this.dataTypeOptions && this.horzSelection.dataType && _.keys(GenericAssayTypeConstants).includes(this.horzSelection.dataType)) {
-            noneDatatypeOption = [{ value: NONE_SELECTED_OPTION_STRING_VALUE, label: NONE_SELECTED_OPTION_LABEL}];
+        if (
+            this.dataTypeOptions &&
+            this.horzSelection.dataType &&
+            _.keys(GenericAssayTypeConstants).includes(
+                this.horzSelection.dataType
+            )
+        ) {
+            noneDatatypeOption = [
+                {
+                    value: NONE_SELECTED_OPTION_STRING_VALUE,
+                    label: NONE_SELECTED_OPTION_LABEL,
+                },
+            ];
         }
-        return (noneDatatypeOption || []).concat((this.dataTypeOptions.result || []) as any[]);
+        return (noneDatatypeOption || []).concat((this.dataTypeOptions.result ||
+            []) as any[]);
     }
 
     @observable readonly horzGeneOptions = remoteData({
-        await:()=>[this.props.store.genes],
-        invoke:()=>{
+        await: () => [this.props.store.genes],
+        invoke: () => {
             return Promise.resolve(
-                this.props.store.genes.result!.map(gene=>({ value: gene.entrezGeneId, label: gene.hugoGeneSymbol }))
+                this.props.store.genes.result!.map(gene => ({
+                    value: gene.entrezGeneId,
+                    label: gene.hugoGeneSymbol,
+                }))
             );
-        }
+        },
     });
 
     @computed get vertGeneOptions() {
         let sameGeneOption = undefined;
         // // listen to updates of `horzGeneOptions` or the selected data type for the horzontal axis
-            // when the data type on the horizontal axis is a gene  profile
-            // add an option to select the same gene
-        if (this.horzSelection.dataType &&
+        // when the data type on the horizontal axis is a gene  profile
+        // add an option to select the same gene
+        if (
+            this.horzSelection.dataType &&
             this.showGeneSelectBox(this.horzSelection.dataType) &&
             this.horzSelection.selectedGeneOption &&
-            this.horzSelection.selectedGeneOption.value !== NONE_SELECTED_OPTION_NUMERICAL_VALUE
+            this.horzSelection.selectedGeneOption.value !==
+                NONE_SELECTED_OPTION_NUMERICAL_VALUE
         ) {
-            sameGeneOption = [{ value: SAME_SELECTED_OPTION_NUMERICAL_VALUE, label: `Same gene (${this.horzSelection.selectedGeneOption.label})`}];
+            sameGeneOption = [
+                {
+                    value: SAME_SELECTED_OPTION_NUMERICAL_VALUE,
+                    label: `Same gene (${this.horzSelection.selectedGeneOption.label})`,
+                },
+            ];
         }
-        return (sameGeneOption || []).concat((this.horzGeneOptions.result || []) as any[]);
+        return (sameGeneOption || []).concat((this.horzGeneOptions.result ||
+            []) as any[]);
     }
 
     @computed get utilityMenuGeneOptions() {
@@ -929,12 +1085,15 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
     }
 
     @observable readonly horzGenesetOptions = remoteData({
-        await:()=>[this.props.store.genesets],
-        invoke:()=>{
+        await: () => [this.props.store.genesets],
+        invoke: () => {
             return Promise.resolve(
-                this.props.store.genesets.result!.map(geneset=>({ value: geneset.genesetId, label: geneset.name }))
+                this.props.store.genesets.result!.map(geneset => ({
+                    value: geneset.genesetId,
+                    label: geneset.name,
+                }))
             );
-        }
+        },
     });
 
     @computed get vertGenesetOptions() {
@@ -943,68 +1102,109 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
         if (this.horzGenesetOptions || this.horzSelection.dataType) {
             // when the data type on the horizontal axis is a gene  profile
             // add an option to select the same gene
-            if (this.horzSelection.dataType && this.showGenesetSelectBox(this.horzSelection.dataType)
-                && this.horzSelection.selectedGenesetOption && this.horzSelection.selectedGenesetOption.value !== NONE_SELECTED_OPTION_STRING_VALUE) {
-                sameGenesetOption = [{ value: SAME_SELECTED_OPTION_STRING_VALUE, label: `Same gene set (${this.horzSelection.selectedGenesetOption.label})`}];
+            if (
+                this.horzSelection.dataType &&
+                this.showGenesetSelectBox(this.horzSelection.dataType) &&
+                this.horzSelection.selectedGenesetOption &&
+                this.horzSelection.selectedGenesetOption.value !==
+                    NONE_SELECTED_OPTION_STRING_VALUE
+            ) {
+                sameGenesetOption = [
+                    {
+                        value: SAME_SELECTED_OPTION_STRING_VALUE,
+                        label: `Same gene set (${this.horzSelection.selectedGenesetOption.label})`,
+                    },
+                ];
             }
         }
-        return (sameGenesetOption || []).concat((this.horzGenesetOptions.result || []) as any[]);
+        return (sameGenesetOption || []).concat((this.horzGenesetOptions
+            .result || []) as any[]);
     }
 
     @observable readonly horzTreatmentOptions = remoteData({
-        await:()=>[this.props.store.selectedTreatments],
-        invoke:()=>{
+        await: () => [this.props.store.selectedTreatments],
+        invoke: () => {
             return Promise.resolve(
-                this.props.store.selectedTreatments.result!.map((treatment:Treatment)=>({ value: treatment.treatmentId, label: treatment.name }))
+                this.props.store.selectedTreatments.result!.map(
+                    (treatment: Treatment) => ({
+                        value: treatment.treatmentId,
+                        label: treatment.name,
+                    })
+                )
             );
-        }
+        },
     });
 
     @computed get vertTreatmentOptions() {
         let sameTreatmentOption = undefined;
         // listen to updates of `horzTreatmentOptions` or the selected data type for the horzontal axis
         if (this.horzTreatmentOptions || this.horzSelection.dataType) {
-            if (this.horzSelection.dataType && _.keys(GenericAssayTypeConstants).includes(this.horzSelection.dataType)) {
+            if (
+                this.horzSelection.dataType &&
+                _.keys(GenericAssayTypeConstants).includes(
+                    this.horzSelection.dataType
+                )
+            ) {
                 // when the data type on the horizontal axis is a treatment profile
                 // add an option to select the same treatment
-                if (this.horzSelection.dataType && this.showTreatmentSelectBox(this.horzSelection.dataType)
-                    && this.horzSelection.selectedTreatmentOption && this.horzSelection.selectedTreatmentOption.value !== NONE_SELECTED_OPTION_STRING_VALUE) {
-                    sameTreatmentOption = [{ value: SAME_SELECTED_OPTION_STRING_VALUE, label: `Same treatment (${this.horzSelection.selectedTreatmentOption.label})`}];
+                if (
+                    this.horzSelection.dataType &&
+                    this.showTreatmentSelectBox(this.horzSelection.dataType) &&
+                    this.horzSelection.selectedTreatmentOption &&
+                    this.horzSelection.selectedTreatmentOption.value !==
+                        NONE_SELECTED_OPTION_STRING_VALUE
+                ) {
+                    sameTreatmentOption = [
+                        {
+                            value: SAME_SELECTED_OPTION_STRING_VALUE,
+                            label: `Same treatment (${this.horzSelection.selectedTreatmentOption.label})`,
+                        },
+                    ];
                 }
             }
         }
-        return (sameTreatmentOption || []).concat((this.horzTreatmentOptions.result || []) as {value:string, label:string}[]);
+        return (sameTreatmentOption || []).concat((this.horzTreatmentOptions
+            .result || []) as { value: string; label: string }[]);
     }
 
-    private showGeneSelectBox(dataType:string):boolean {
-        return dataType !== NONE_SELECTED_OPTION_STRING_VALUE
-                && dataType !== GENESET_DATA_TYPE
-                && dataType !== CLIN_ATTR_DATA_TYPE
-                && !_.keys(GenericAssayTypeConstants).includes(dataType);
+    private showGeneSelectBox(dataType: string): boolean {
+        return (
+            dataType !== NONE_SELECTED_OPTION_STRING_VALUE &&
+            dataType !== GENESET_DATA_TYPE &&
+            dataType !== CLIN_ATTR_DATA_TYPE &&
+            !_.keys(GenericAssayTypeConstants).includes(dataType)
+        );
     }
 
-    private showGenesetSelectBox(dataType:string):boolean {
-        return dataType !== NONE_SELECTED_OPTION_STRING_VALUE
-                && dataType === GENESET_DATA_TYPE;
+    private showGenesetSelectBox(dataType: string): boolean {
+        return (
+            dataType !== NONE_SELECTED_OPTION_STRING_VALUE &&
+            dataType === GENESET_DATA_TYPE
+        );
     }
 
-    private showTreatmentSelectBox(dataType:string):boolean {
-        return dataType !== NONE_SELECTED_OPTION_STRING_VALUE
-                && _.keys(GenericAssayTypeConstants).includes(dataType);
+    private showTreatmentSelectBox(dataType: string): boolean {
+        return (
+            dataType !== NONE_SELECTED_OPTION_STRING_VALUE &&
+            _.keys(GenericAssayTypeConstants).includes(dataType)
+        );
     }
 
-    private showDatasourceBox(dataType:string):boolean {
+    private showDatasourceBox(dataType: string): boolean {
         return dataType !== NONE_SELECTED_OPTION_STRING_VALUE;
     }
 
-    private showUtilitiesMenuGeneSelectBox():boolean {
-        return this.plotType.isComplete && this.plotType.result === PlotType.WaterfallPlot;
+    private showUtilitiesMenuGeneSelectBox(): boolean {
+        return (
+            this.plotType.isComplete &&
+            this.plotType.result === PlotType.WaterfallPlot
+        );
     }
 
-    private showSortOrderButton(onVerticalAxis:boolean):boolean {
-        if (this.waterfallPlotIsShown){
+    private showSortOrderButton(onVerticalAxis: boolean): boolean {
+        if (this.waterfallPlotIsShown) {
             if (onVerticalAxis) {
-                return ! this.isHorizontalWaterfallPlot;
+                return !this.isHorizontalWaterfallPlot;
             } else {
                 return this.isHorizontalWaterfallPlot;
             }
@@ -1012,50 +1212,67 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
         return false;
     }
 
-    @computed get waterfallPlotIsShown():boolean {
+    @computed get waterfallPlotIsShown(): boolean {
         return showWaterfallPlot(this.horzSelection, this.vertSelection);
     }
 
-    readonly clinicalAttributeIdToClinicalAttribute = remoteData<{[clinicalAttributeId:string]:ClinicalAttribute}>({
-        await:()=>[
+    readonly clinicalAttributeIdToClinicalAttribute = remoteData<{
+        [clinicalAttributeId: string]: ClinicalAttribute;
+    }>({
+        await: () => [
             this.props.store.clinicalAttributes,
-            this.props.store.studyIds
+            this.props.store.studyIds,
         ],
-        invoke:()=>{
-            let _map: {[clinicalAttributeId: string]: ClinicalAttribute} = _.keyBy(this.props.store.clinicalAttributes.result, c=>c.clinicalAttributeId);
+        invoke: () => {
+            let _map: {
+                [clinicalAttributeId: string]: ClinicalAttribute;
+            } = _.keyBy(
+                this.props.store.clinicalAttributes.result,
+                c => c.clinicalAttributeId
+            );
             return Promise.resolve(_map);
-        }
+        },
     });
 
     readonly clinicalAttributeOptions = remoteData({
-        await:()=>[this.props.store.clinicalAttributes],
-        invoke:()=>Promise.resolve(makeClinicalAttributeOptions(this.props.store.clinicalAttributes.result!))
+        await: () => [this.props.store.clinicalAttributes],
+        invoke: () =>
+            Promise.resolve(
+                makeClinicalAttributeOptions(
+                    this.props.store.clinicalAttributes.result!
+                )
+            ),
     });
 
-    readonly dataTypeOptions = remoteData<{value:string, label:string}[]>({
-        await:()=>[
+    readonly dataTypeOptions = remoteData<{ value: string; label: string }[]>({
+        await: () => [
             this.props.store.molecularProfilesWithData,
             this.clinicalAttributeOptions,
-            this.props.store.molecularProfilesInStudies
+            this.props.store.molecularProfilesInStudies,
         ],
-        invoke:()=>{
+        invoke: () => {
             const profiles = this.props.store.molecularProfilesWithData.result!;
 
             // show only data types we have profiles for
-            const dataTypeIds:string[] = _.uniq(
-                profiles.map(profile=>{
-                    if (profile.molecularAlterationType === AlterationTypeConstants.GENERIC_ASSAY) {
+            const dataTypeIds: string[] = _.uniq(
+                profiles.map(profile => {
+                    if (
+                        profile.molecularAlterationType ===
+                        AlterationTypeConstants.GENERIC_ASSAY
+                    ) {
                         return profile.genericAssayType;
-                    }
-                    else return profile.molecularAlterationType;
+                    } else return profile.molecularAlterationType;
                 })
-            ).filter(type=>!!dataTypeToDisplayType[type]); // only show profiles of the type we want to show
+            ).filter(type => !!dataTypeToDisplayType[type]); // only show profiles of the type we want to show
 
             // if no gene sets are queried, remove gene set profile from dataTypeIds
-            if (this.props.store.genesets.result!.length === 0 && dataTypeIds.includes("GENESET_SCORE")) {
-                    _.remove(dataTypeIds, function(n) {
-                        return n === "GENESET_SCORE";
-                      });
+            if (
+                this.props.store.genesets.result!.length === 0 &&
+                dataTypeIds.includes('GENESET_SCORE')
+            ) {
+                _.remove(dataTypeIds, function(n) {
+                    return n === 'GENESET_SCORE';
+                });
             }
 
             if (this.clinicalAttributeOptions.result!.length) {
@@ -1063,52 +1280,69 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
                 dataTypeIds.push(CLIN_ATTR_DATA_TYPE);
             }
 
-            if (this.props.store.molecularProfilesInStudies.result!.length && this.horzGenesetOptions.result && this.horzGenesetOptions.result!.length > 0) {
-              // add geneset profile to list if the study contains it and the query contains gene sets
-              this.props.store.molecularProfilesInStudies.result.filter(p=>{
-                if (p.molecularAlterationType === AlterationTypeConstants[GENESET_DATA_TYPE]) {
-                  if (dataTypeIds.indexOf(GENESET_DATA_TYPE) === -1) {
-                    dataTypeIds.push(GENESET_DATA_TYPE);
-                  }
-                }
-              });
+            if (
+                this.props.store.molecularProfilesInStudies.result!.length &&
+                this.horzGenesetOptions.result &&
+                this.horzGenesetOptions.result!.length > 0
+            ) {
+                // add geneset profile to list if the study contains it and the query contains gene sets
+                this.props.store.molecularProfilesInStudies.result.filter(p => {
+                    if (
+                        p.molecularAlterationType ===
+                        AlterationTypeConstants[GENESET_DATA_TYPE]
+                    ) {
+                        if (dataTypeIds.indexOf(GENESET_DATA_TYPE) === -1) {
+                            dataTypeIds.push(GENESET_DATA_TYPE);
+                        }
+                    }
+                });
             }
 
             return Promise.resolve(
-                _.sortBy(dataTypeIds, // sort them into display order
-                    type=>dataTypeDisplayOrder.indexOf(type)
-                ).map(type=>({
+                _.sortBy(
+                    dataTypeIds, // sort them into display order
+                    type => dataTypeDisplayOrder.indexOf(type)
+                ).map(type => ({
                     value: type,
-                    label: dataTypeToDisplayType[type]
+                    label: dataTypeToDisplayType[type],
                 })) // output options
             );
-        }
+        },
     });
 
-    readonly dataTypeToDataSourceOptions = remoteData<{[dataType:string]:{value:string, label:string}[]}>({
-        await:()=>[
+    readonly dataTypeToDataSourceOptions = remoteData<{
+        [dataType: string]: { value: string; label: string }[];
+    }>({
+        await: () => [
             this.props.store.molecularProfilesInStudies,
-            this.clinicalAttributeOptions
+            this.clinicalAttributeOptions,
         ],
-        invoke:()=>{
-            const profiles = this.props.store.molecularProfilesInStudies.result!;
+        invoke: () => {
+            const profiles = this.props.store.molecularProfilesInStudies
+                .result!;
             const map = _.mapValues(
-                _.groupBy(profiles, profile=> {
-                    if (profile.molecularAlterationType === AlterationTypeConstants.GENERIC_ASSAY) {
+                _.groupBy(profiles, profile => {
+                    if (
+                        profile.molecularAlterationType ===
+                        AlterationTypeConstants.GENERIC_ASSAY
+                    ) {
                         return profile.genericAssayType;
-                    }
-                    else return profile.molecularAlterationType;
+                    } else return profile.molecularAlterationType;
                 }), // create a map from profile type to list of profiles of that type
-                profilesOfType=>(
-                    sortMolecularProfilesForDisplay(profilesOfType).map(p=>({value:p.molecularProfileId, label:p.name}))// create options out of those profiles
-                )
+                profilesOfType =>
+                    sortMolecularProfilesForDisplay(profilesOfType).map(p => ({
+                        value: p.molecularProfileId,
+                        label: p.name,
+                    })) // create options out of those profiles
             );
             if (this.clinicalAttributeOptions.result!.length) {
                 // add clinical attributes
-                map[CLIN_ATTR_DATA_TYPE] = this.clinicalAttributeOptions.result!;
+                map[
+                    CLIN_ATTR_DATA_TYPE
+                ] = this.clinicalAttributeOptions.result!;
             }
             return Promise.resolve(map);
-        }
+        },
     });
 
     @autobind
@@ -1119,7 +1353,11 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
         this.vertSelection.dataType = option.value;
         // simultaneous selection of viewCNA and viewMutationType is not
         // supported by the waterfall plot
-        if (this.waterfallPlotIsShown && this.viewMutationType && this.viewCopyNumber) {
+        if (
+            this.waterfallPlotIsShown &&
+            this.viewMutationType &&
+            this.viewCopyNumber
+        ) {
             this.viewCopyNumber = false;
         }
         this.viewLimitValues = true;
@@ -1128,7 +1366,7 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
             this.onVerticalAxisGeneSelect,
             this.onVerticalAxisGenesetSelect,
             this.onVerticalAxisDataSourceSelect,
-            this.onVerticalAxisTreatmentSelect,
+            this.onVerticalAxisTreatmentSelect
         );
 
         if (
@@ -1149,7 +1387,11 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
         // simultaneous selection of viewCNA and viewMutationType is not
         // supported by the waterfall plot
         this.horzSelection.dataType = option.value;
-        if (this.waterfallPlotIsShown && this.viewMutationType && this.viewCopyNumber) {
+        if (
+            this.waterfallPlotIsShown &&
+            this.viewMutationType &&
+            this.viewCopyNumber
+        ) {
             this.viewCopyNumber = false;
         }
         this.viewLimitValues = true;
@@ -1158,7 +1400,7 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
             this.onHorizontalAxisGeneSelect,
             this.onHorizontalAxisGenesetSelect,
             this.onHorizontalAxisDataSourceSelect,
-            this.onHorizontalAxisTreatmentSelect,
+            this.onHorizontalAxisTreatmentSelect
         );
 
         if (
@@ -1189,44 +1431,54 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
 
     @autobind
     @action
-    public onVerticalAxisMutationCountBySelect(option:any) {
+    public onVerticalAxisMutationCountBySelect(option: any) {
         this.vertSelection.mutationCountBy = option.value;
         this.viewLimitValues = true;
     }
 
     @autobind
     @action
-    public onHorizontalAxisMutationCountBySelect(option:any) {
+    public onHorizontalAxisMutationCountBySelect(option: any) {
         this.horzSelection.mutationCountBy = option.value;
         this.viewLimitValues = true;
     }
 
     @autobind
     @action
-    private onDiscreteVsDiscretePlotTypeSelect(option:any){
+    private onDiscreteVsDiscretePlotTypeSelect(option: any) {
         this.discreteVsDiscretePlotType = option.value;
     }
 
     @autobind
     @action
     private onSortOrderButtonPressed() {
-        this._waterfallPlotSortOrder = this.waterfallPlotSortOrder === "ASC" ? "DESC" : "ASC";
+        this._waterfallPlotSortOrder =
+            this.waterfallPlotSortOrder === 'ASC' ? 'DESC' : 'ASC';
     }
 
     @autobind
     @action
     private swapHorzVertSelections() {
-        const keys:(keyof AxisMenuSelection)[] = ["dataType", "selectedDataSourceOption", "logScale", "mutationCountBy"];
+        const keys: (keyof AxisMenuSelection)[] = [
+            'dataType',
+            'selectedDataSourceOption',
+            'logScale',
+            'mutationCountBy',
+        ];
         // have to store all values for swap because values depend on each other in derived data way so the copy can mess up if you do it one by one
-        const horz = keys.map(k=>this.horzSelection[k]);
-        const vert = keys.map(k=>this.vertSelection[k]);
-        for (let i=0; i<keys.length; i++) {
+        const horz = keys.map(k => this.horzSelection[k]);
+        const vert = keys.map(k => this.vertSelection[k]);
+        for (let i = 0; i < keys.length; i++) {
             this.horzSelection[keys[i]] = vert[i];
             this.vertSelection[keys[i]] = horz[i];
         }
 
         // only swap genes if vertSelection is not set to "Same gene"
-        if (!this.vertSelection.selectedGeneOption || (this.vertSelection.selectedGeneOption.value !== SAME_SELECTED_OPTION_NUMERICAL_VALUE)) {
+        if (
+            !this.vertSelection.selectedGeneOption ||
+            this.vertSelection.selectedGeneOption.value !==
+                SAME_SELECTED_OPTION_NUMERICAL_VALUE
+        ) {
             const horzOption = this.horzSelection.selectedGeneOption;
             const vertOption = this.vertSelection.selectedGeneOption;
             this.horzSelection.selectedGeneOption = vertOption;
@@ -1234,7 +1486,11 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
         }
 
         // only swap gene sets if vertSelection is not set to "Same gene set"
-        if (!this.vertSelection.selectedGenesetOption || (this.vertSelection.selectedGenesetOption.value !== SAME_SELECTED_OPTION_STRING_VALUE)) {
+        if (
+            !this.vertSelection.selectedGenesetOption ||
+            this.vertSelection.selectedGenesetOption.value !==
+                SAME_SELECTED_OPTION_STRING_VALUE
+        ) {
             const horzOption = this.horzSelection.selectedGenesetOption;
             const vertOption = this.vertSelection.selectedGenesetOption;
             this.horzSelection.selectedGenesetOption = vertOption;
@@ -1242,7 +1498,11 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
         }
 
         // only swap treatments if vertSelection is not set to "Same treatment"
-        if (!this.vertSelection.selectedTreatmentOption || (this.vertSelection.selectedTreatmentOption.value !== SAME_SELECTED_OPTION_STRING_VALUE)) {
+        if (
+            !this.vertSelection.selectedTreatmentOption ||
+            this.vertSelection.selectedTreatmentOption.value !==
+                SAME_SELECTED_OPTION_STRING_VALUE
+        ) {
             const horzOption = this.horzSelection.selectedTreatmentOption;
             const vertOption = this.vertSelection.selectedTreatmentOption;
             this.horzSelection.selectedTreatmentOption = vertOption;
@@ -1251,115 +1511,206 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
     }
 
     @computed get bothAxesMolecularProfile() {
-        return (this.horzSelection.dataType === undefined || this.horzSelection.dataType !== CLIN_ATTR_DATA_TYPE && !_.keys(GenericAssayTypeConstants).includes(this.horzSelection.dataType)) &&
-             (this.vertSelection.dataType === undefined || this.vertSelection.dataType !== CLIN_ATTR_DATA_TYPE && !_.keys(GenericAssayTypeConstants).includes(this.vertSelection.dataType));
+        return (
+            (this.horzSelection.dataType === undefined ||
+                (this.horzSelection.dataType !== CLIN_ATTR_DATA_TYPE &&
+                    !_.keys(GenericAssayTypeConstants).includes(
+                        this.horzSelection.dataType
+                    ))) &&
+            (this.vertSelection.dataType === undefined ||
+                (this.vertSelection.dataType !== CLIN_ATTR_DATA_TYPE &&
+                    !_.keys(GenericAssayTypeConstants).includes(
+                        this.vertSelection.dataType
+                    )))
+        );
     }
 
     @computed get oneAxisMolecularProfile() {
-        return !this.bothAxesMolecularProfile && (this.horzSelection.dataType === undefined || ((this.horzSelection.dataType !== CLIN_ATTR_DATA_TYPE && this.horzSelection.dataType && !_.keys(GenericAssayTypeConstants).includes(this.horzSelection.dataType)) ||
-             (this.vertSelection.dataType === undefined || this.vertSelection.dataType !== CLIN_ATTR_DATA_TYPE && !_.keys(GenericAssayTypeConstants).includes(this.vertSelection.dataType))));
+        return (
+            !this.bothAxesMolecularProfile &&
+            (this.horzSelection.dataType === undefined ||
+                ((this.horzSelection.dataType !== CLIN_ATTR_DATA_TYPE &&
+                    this.horzSelection.dataType &&
+                    !_.keys(GenericAssayTypeConstants).includes(
+                        this.horzSelection.dataType
+                    )) ||
+                    (this.vertSelection.dataType === undefined ||
+                        (this.vertSelection.dataType !== CLIN_ATTR_DATA_TYPE &&
+                            !_.keys(GenericAssayTypeConstants).includes(
+                                this.vertSelection.dataType
+                            )))))
+        );
     }
 
     @computed get sameGeneInBothAxes() {
-        return  this.bothAxesMolecularProfile &&
-            (this.horzSelection.entrezGeneId === this.vertSelection.entrezGeneId);
+        return (
+            this.bothAxesMolecularProfile &&
+            this.horzSelection.entrezGeneId === this.vertSelection.entrezGeneId
+        );
     }
 
     @computed get cnaDataCanBeShown() {
-        return !!(this.cnaDataExists.result
-        && (this.potentialViewType === PotentialViewType.MutationTypeAndCopyNumber
-            || this.potentialViewType === PotentialViewType.LimitValMutationTypeAndCopyNumber)
+        return !!(
+            this.cnaDataExists.result &&
+            (this.potentialViewType ===
+                PotentialViewType.MutationTypeAndCopyNumber ||
+                this.potentialViewType ===
+                    PotentialViewType.LimitValMutationTypeAndCopyNumber)
         );
     }
 
-    @computed get limitValuesCanBeShown():boolean {
+    @computed get limitValuesCanBeShown(): boolean {
         return this.limitValueTypes.length > 0;
     }
 
-    @computed get limitValueTypes():string[] {
-        return _.uniq(this.horzLimitValueTypes.concat(this.vertLimitValueTypes));
+    @computed get limitValueTypes(): string[] {
+        return _.uniq(
+            this.horzLimitValueTypes.concat(this.vertLimitValueTypes)
+        );
     }
 
-    @computed get horzLimitValueTypes():string[] {
-        if (this.horzAxisDataPromise.result && this.horzSelection.dataType && _.keys(GenericAssayTypeConstants).includes(this.horzSelection.dataType)) {
+    @computed get horzLimitValueTypes(): string[] {
+        if (
+            this.horzAxisDataPromise.result &&
+            this.horzSelection.dataType &&
+            _.keys(GenericAssayTypeConstants).includes(
+                this.horzSelection.dataType
+            )
+        ) {
             console.log(this.horzAxisDataPromise.result);
             return getLimitValues(this.horzAxisDataPromise.result.data);
         }
         return [] as string[];
     }
 
-    @computed get horzLimitValuesCanBeShown():boolean {
+    @computed get horzLimitValuesCanBeShown(): boolean {
         return this.horzLimitValueTypes.length > 0;
     }
 
-    @computed get vertLimitValueTypes():string[] {
-        if (this.vertAxisDataPromise.result && this.vertSelection.dataType && _.keys(GenericAssayTypeConstants).includes(this.vertSelection.dataType)) {
+    @computed get vertLimitValueTypes(): string[] {
+        if (
+            this.vertAxisDataPromise.result &&
+            this.vertSelection.dataType &&
+            _.keys(GenericAssayTypeConstants).includes(
+                this.vertSelection.dataType
+            )
+        ) {
             return getLimitValues(this.vertAxisDataPromise.result.data);
         }
         return [] as string[];
     }
 
-    @computed get vertLimitValuesCanBeShown():boolean {
+    @computed get vertLimitValuesCanBeShown(): boolean {
         return this.vertLimitValueTypes.length > 0;
     }
 
     @computed get legendLimitValueLabel() {
-        return `value ${this.limitValueTypes.join(' or ')}${!this.isWaterfallPlot?' **':''}`;
+        return `value ${this.limitValueTypes.join(' or ')}${
+            !this.isWaterfallPlot ? ' **' : ''
+        }`;
     }
 
     @computed get vertMenuLimitValueLabel() {
-        return `Value ${this.vertLimitValueTypes.join(' or ')} Labels${!this.isWaterfallPlot?' **':''}`;
+        return `Value ${this.vertLimitValueTypes.join(' or ')} Labels${
+            !this.isWaterfallPlot ? ' **' : ''
+        }`;
     }
 
     @computed get horzMenuLimitValueLabel() {
-        return `Value ${this.horzLimitValueTypes.join(' or ')} Labels${!this.isWaterfallPlot?' **':''}`;
+        return `Value ${this.horzLimitValueTypes.join(' or ')} Labels${
+            !this.isWaterfallPlot ? ' **' : ''
+        }`;
     }
 
     @computed get cnaDataShown() {
-        return !!(this.cnaDataExists.result
-        && (this.viewType === ViewType.CopyNumber || this.viewType === ViewType.MutationTypeAndCopyNumber
-            || this.viewType === ViewType.LimitValCopyNumber || this.viewType === ViewType.LimitValMutationTypeAndCopyNumber
-        ));
+        return !!(
+            this.cnaDataExists.result &&
+            (this.viewType === ViewType.CopyNumber ||
+                this.viewType === ViewType.MutationTypeAndCopyNumber ||
+                this.viewType === ViewType.LimitValCopyNumber ||
+                this.viewType === ViewType.LimitValMutationTypeAndCopyNumber)
+        );
     }
 
     readonly cnaPromise = remoteData({
-        await:()=>this.props.store.annotatedCnaCache.getAll(
-            getCnaQueries(this.horzSelection, this.vertSelection, this.utilitiesMenuSelection)
-        ),
-        invoke:()=>{
-            const queries = getCnaQueries(this.horzSelection, this.vertSelection, this.utilitiesMenuSelection);
+        await: () =>
+            this.props.store.annotatedCnaCache.getAll(
+                getCnaQueries(
+                    this.horzSelection,
+                    this.vertSelection,
+                    this.utilitiesMenuSelection
+                )
+            ),
+        invoke: () => {
+            const queries = getCnaQueries(
+                this.horzSelection,
+                this.vertSelection,
+                this.utilitiesMenuSelection
+            );
             if (queries.length > 0) {
-                return Promise.resolve(_.flatten(this.props.store.annotatedCnaCache.getAll(queries).map(p=>p.result!)));
+                return Promise.resolve(
+                    _.flatten(
+                        this.props.store.annotatedCnaCache
+                            .getAll(queries)
+                            .map(p => p.result!)
+                    )
+                );
             } else {
                 return Promise.resolve([]);
             }
-        }
+        },
     });
 
     @computed get mutationDataCanBeShown() {
-        return !!(this.mutationDataExists.result && this.potentialViewType !== PotentialViewType.None && this.potentialViewType !== PotentialViewType.LimitVal);
+        return !!(
+            this.mutationDataExists.result &&
+            this.potentialViewType !== PotentialViewType.None &&
+            this.potentialViewType !== PotentialViewType.LimitVal
+        );
     }
 
     @computed get mutationDataShown() {
-        return !!(this.mutationDataExists.result &&
-            (this.viewType === ViewType.MutationType || this.viewType === ViewType.MutationSummary ||
-                this.viewType === ViewType.MutationTypeAndCopyNumber));
+        return !!(
+            this.mutationDataExists.result &&
+            (this.viewType === ViewType.MutationType ||
+                this.viewType === ViewType.MutationSummary ||
+                this.viewType === ViewType.MutationTypeAndCopyNumber)
+        );
     }
 
     readonly mutationPromise = remoteData({
-        await:()=>this.props.store.annotatedMutationCache.getAll(
-            getMutationQueries(this.horzSelection, this.vertSelection, this.utilitiesMenuSelection)
-        ),
-        invoke: ()=>{
-            return Promise.resolve(_.flatten(this.props.store.annotatedMutationCache.getAll(
-                getMutationQueries(this.horzSelection, this.vertSelection, this.utilitiesMenuSelection)
-            ).map(p=>p.result!)).filter(x=>!!x));
-        }
+        await: () =>
+            this.props.store.annotatedMutationCache.getAll(
+                getMutationQueries(
+                    this.horzSelection,
+                    this.vertSelection,
+                    this.utilitiesMenuSelection
+                )
+            ),
+        invoke: () => {
+            return Promise.resolve(
+                _.flatten(
+                    this.props.store.annotatedMutationCache
+                        .getAll(
+                            getMutationQueries(
+                                this.horzSelection,
+                                this.vertSelection,
+                                this.utilitiesMenuSelection
+                            )
+                        )
+                        .map(p => p.result!)
+                ).filter(x => !!x)
+            );
+        },
     });
 
     @computed get plotDataExistsForTwoAxes() {
-        return (this.horzAxisDataPromise.isComplete && this.horzAxisDataPromise.result!.data.length > 0)
-            && (this.vertAxisDataPromise.isComplete && this.vertAxisDataPromise.result!.data.length > 0);
+        return (
+            this.horzAxisDataPromise.isComplete &&
+            this.horzAxisDataPromise.result!.data.length > 0 &&
+            (this.vertAxisDataPromise.isComplete &&
+                this.vertAxisDataPromise.result!.data.length > 0)
+        );
     }
 
     @computed get horzAxisDataPromise() {
@@ -1398,100 +1749,125 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
         );
     }
 
-    @computed get vertAxisDataHasNegativeNumbers():boolean {
-        if (this.vertAxisDataPromise.isComplete && this.vertAxisDataPromise.result) {
+    @computed get vertAxisDataHasNegativeNumbers(): boolean {
+        if (
+            this.vertAxisDataPromise.isComplete &&
+            this.vertAxisDataPromise.result
+        ) {
             return axisHasNegativeNumbers(this.vertAxisDataPromise.result);
         }
         return false;
     }
 
-    @computed get horzAxisDataHasNegativeNumbers():boolean {
-        if (this.horzAxisDataPromise.isComplete && this.horzAxisDataPromise.result) {
+    @computed get horzAxisDataHasNegativeNumbers(): boolean {
+        if (
+            this.horzAxisDataPromise.isComplete &&
+            this.horzAxisDataPromise.result
+        ) {
             return axisHasNegativeNumbers(this.horzAxisDataPromise.result);
         }
         return false;
     }
 
     readonly mutationDataExists = remoteData({
-        await: ()=>[this.props.store.studyToMutationMolecularProfile],
-        invoke: ()=>{
-            return Promise.resolve(!!_.values(this.props.store.studyToMutationMolecularProfile).length);
-        }
+        await: () => [this.props.store.studyToMutationMolecularProfile],
+        invoke: () => {
+            return Promise.resolve(
+                !!_.values(this.props.store.studyToMutationMolecularProfile)
+                    .length
+            );
+        },
     });
 
     readonly cnaDataExists = remoteData({
-        await: ()=>[this.props.store.studyToMolecularProfileDiscrete],
-        invoke: ()=>{
-            return Promise.resolve(!!_.values(this.props.store.studyToMolecularProfileDiscrete).length);
-        }
+        await: () => [this.props.store.studyToMolecularProfileDiscrete],
+        invoke: () => {
+            return Promise.resolve(
+                !!_.values(this.props.store.studyToMolecularProfileDiscrete)
+                    .length
+            );
+        },
     });
 
-
     readonly horzLabel = remoteData({
-        await:()=>[
+        await: () => [
             this.props.store.molecularProfileIdToMolecularProfile,
             this.props.store.entrezGeneIdToGene,
             this.clinicalAttributeIdToClinicalAttribute,
-            this.plotType
+            this.plotType,
         ],
-        invoke:()=>{
-            return Promise.resolve(getAxisLabel(
-                this.horzSelection,
-                this.props.store.molecularProfileIdToMolecularProfile.result!,
-                this.props.store.entrezGeneIdToGene.result!,
-                this.clinicalAttributeIdToClinicalAttribute.result!,
-                this.horzLogScaleFunction
-            ));
-        }
+        invoke: () => {
+            return Promise.resolve(
+                getAxisLabel(
+                    this.horzSelection,
+                    this.props.store.molecularProfileIdToMolecularProfile
+                        .result!,
+                    this.props.store.entrezGeneIdToGene.result!,
+                    this.clinicalAttributeIdToClinicalAttribute.result!,
+                    this.horzLogScaleFunction
+                )
+            );
+        },
     });
 
     readonly vertLabel = remoteData({
-        await:()=>[
+        await: () => [
             this.props.store.molecularProfileIdToMolecularProfile,
             this.props.store.entrezGeneIdToGene,
-            this.clinicalAttributeIdToClinicalAttribute
+            this.clinicalAttributeIdToClinicalAttribute,
         ],
-        invoke:()=>{
-            return Promise.resolve(getAxisLabel(
-                this.vertSelection,
-                this.props.store.molecularProfileIdToMolecularProfile.result!,
-                this.props.store.entrezGeneIdToGene.result!,
-                this.clinicalAttributeIdToClinicalAttribute.result!,
-                this.vertLogScaleFunction
-            ));
-        }
+        invoke: () => {
+            return Promise.resolve(
+                getAxisLabel(
+                    this.vertSelection,
+                    this.props.store.molecularProfileIdToMolecularProfile
+                        .result!,
+                    this.props.store.entrezGeneIdToGene.result!,
+                    this.clinicalAttributeIdToClinicalAttribute.result!,
+                    this.vertLogScaleFunction
+                )
+            );
+        },
     });
 
     readonly waterfallLabel = remoteData({
-        await:()=>[
+        await: () => [
             this.props.store.molecularProfileIdToMolecularProfile,
             this.props.store.entrezGeneIdToGene,
             this.clinicalAttributeIdToClinicalAttribute,
-            this.plotType
+            this.plotType,
         ],
-        invoke:()=>{
-            const selection = this.isHorizontalWaterfallPlot? this.horzSelection: this.vertSelection;
-            const logScaleFunc = this.isHorizontalWaterfallPlot? this.horzLogScaleFunction: this.vertLogScaleFunction;
-
-            return Promise.resolve(getAxisLabel(
-                selection,
-                this.props.store.molecularProfileIdToMolecularProfile.result!,
-                this.props.store.entrezGeneIdToGene.result!,
-                this.clinicalAttributeIdToClinicalAttribute.result!,
-                logScaleFunc
-            ));
-        }
-    });
+        invoke: () => {
+            const selection = this.isHorizontalWaterfallPlot
+                ? this.horzSelection
+                : this.vertSelection;
+            const logScaleFunc = this.isHorizontalWaterfallPlot
+                ? this.horzLogScaleFunction
+                : this.vertLogScaleFunction;
 
-    @computed get waterfallPlotTitle():string {
+            return Promise.resolve(
+                getAxisLabel(
+                    selection,
+                    this.props.store.molecularProfileIdToMolecularProfile
+                        .result!,
+                    this.props.store.entrezGeneIdToGene.result!,
+                    this.clinicalAttributeIdToClinicalAttribute.result!,
+                    logScaleFunc
+                )
+            );
+        },
+    });
 
-        const selection = this.isHorizontalWaterfallPlot? this.horzSelection: this.vertSelection;
+    @computed get waterfallPlotTitle(): string {
+        const selection = this.isHorizontalWaterfallPlot
+            ? this.horzSelection
+            : this.vertSelection;
 
         const treatmentName = selection.selectedTreatmentOption!.label;
         const profileName = selection.selectedDataSourceOption!.label;
         const geneName = this.utilitiesMenuSelection.selectedGeneOption!.label;
 
-        let geneStyle = "";
+        let geneStyle = '';
         if (this.viewMutationType) {
             geneStyle = ` x ${geneName} mutation types`;
         } else if (this.viewCopyNumber) {
@@ -1500,30 +1876,51 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
         return `${treatmentName} ${profileName}${geneStyle}`;
     }
 
-    @computed get waterfallPlotWidth():number {
-        const noSamples = this.waterfallPlotData.isComplete ? this.waterfallPlotData.result.data.length : 0;
+    @computed get waterfallPlotWidth(): number {
+        const noSamples = this.waterfallPlotData.isComplete
+            ? this.waterfallPlotData.result.data.length
+            : 0;
         if (this.isHorizontalWaterfallPlot) {
             return WATERFALLPLOT_SIDELENGTH;
         }
-        return WATERFALLPLOT_BASE_SIDELENGTH + Math.round(noSamples * WATERFALLPLOT_SIDELENGTH_SAMPLE_MULTIPLICATION_FACTOR);
+        return (
+            WATERFALLPLOT_BASE_SIDELENGTH +
+            Math.round(
+                noSamples *
+                    WATERFALLPLOT_SIDELENGTH_SAMPLE_MULTIPLICATION_FACTOR
+            )
+        );
     }
 
-    @computed get waterfallPlotHeigth():number {
-        const noSamples = this.waterfallPlotData.isComplete ? this.waterfallPlotData.result.data.length : 0;
+    @computed get waterfallPlotHeigth(): number {
+        const noSamples = this.waterfallPlotData.isComplete
+            ? this.waterfallPlotData.result.data.length
+            : 0;
         if (this.isHorizontalWaterfallPlot) {
-            return WATERFALLPLOT_BASE_SIDELENGTH + Math.round(noSamples * WATERFALLPLOT_SIDELENGTH_SAMPLE_MULTIPLICATION_FACTOR);
+            return (
+                WATERFALLPLOT_BASE_SIDELENGTH +
+                Math.round(
+                    noSamples *
+                        WATERFALLPLOT_SIDELENGTH_SAMPLE_MULTIPLICATION_FACTOR
+                )
+            );
         }
         return WATERFALLPLOT_SIDELENGTH;
     }
 
     @computed get scatterPlotAppearance() {
-        return makeScatterPlotPointAppearance(this.viewType, this.mutationDataExists, this.cnaDataExists, this.props.store.driverAnnotationSettings.driversAnnotated);
+        return makeScatterPlotPointAppearance(
+            this.viewType,
+            this.mutationDataExists,
+            this.cnaDataExists,
+            this.props.store.driverAnnotationSettings.driversAnnotated
+        );
     }
 
     @computed get scatterPlotFill() {
         switch (this.viewType) {
             case ViewType.CopyNumber:
-                return "#000000";
+                return '#000000';
             case ViewType.MutationTypeAndCopyNumber:
             case ViewType.MutationType:
             case ViewType.MutationSummary:
@@ -1531,15 +1928,19 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
             case ViewType.LimitValMutationType:
             case ViewType.LimitValMutationSummary:
             case ViewType.LimitValMutationTypeAndCopyNumber:
-                return (d:IPlotSampleData)=>this.scatterPlotAppearance(d).fill!;
+                return (d: IPlotSampleData) =>
+                    this.scatterPlotAppearance(d).fill!;
             case ViewType.None:
-                return mutationSummaryToAppearance[MutationSummary.Neither].fill;
+                return mutationSummaryToAppearance[MutationSummary.Neither]
+                    .fill;
         }
     }
 
     @computed get scatterPlotFillOpacity() {
-        if (this.viewType === ViewType.CopyNumber
-            || this.viewType === ViewType.LimitValCopyNumber) {
+        if (
+            this.viewType === ViewType.CopyNumber ||
+            this.viewType === ViewType.LimitValCopyNumber
+        ) {
             return 0;
         } else {
             return 1;
@@ -1547,15 +1948,17 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
     }
 
     @autobind
-    private scatterPlotStroke(d:IPlotSampleData) {
+    private scatterPlotStroke(d: IPlotSampleData) {
         return this.scatterPlotAppearance(d).stroke;
     }
 
     @computed get scatterPlotStrokeWidth() {
-        if (this.viewType === ViewType.CopyNumber
-            || this.viewType === ViewType.MutationTypeAndCopyNumber
-            || this.viewType === ViewType.LimitValCopyNumber
-            || this.viewType === ViewType.LimitValMutationTypeAndCopyNumber) {
+        if (
+            this.viewType === ViewType.CopyNumber ||
+            this.viewType === ViewType.MutationTypeAndCopyNumber ||
+            this.viewType === ViewType.LimitValCopyNumber ||
+            this.viewType === ViewType.LimitValMutationTypeAndCopyNumber
+        ) {
             return CNA_STROKE_WIDTH;
         } else {
             return 1;
@@ -1563,17 +1966,17 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
     }
 
     @autobind
-    private scatterPlotStrokeOpacity(d:IPlotSampleData) {
+    private scatterPlotStrokeOpacity(d: IPlotSampleData) {
         return this.scatterPlotAppearance(d).strokeOpacity;
     }
 
     @autobind
-    private scatterPlotSymbol(d:IPlotSampleData) {
-        return this.scatterPlotAppearance(d).symbol || "circle";
+    private scatterPlotSymbol(d: IPlotSampleData) {
+        return this.scatterPlotAppearance(d).symbol || 'circle';
     }
 
     @autobind
-    private waterfallPlotColor(d:IPlotSampleData) {
+    private waterfallPlotColor(d: IPlotSampleData) {
         // With the waterfall plot coloring for mutation type
         // and copy number are mutually exclusive. Therefore,
         // combined viewTypes (such as MutationTypeAndCopyNumber)
@@ -1590,12 +1993,13 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
             case ViewType.LimitVal:
             case ViewType.None:
             default:
-                return mutationSummaryToAppearance[MutationSummary.Neither].fill;
+                return mutationSummaryToAppearance[MutationSummary.Neither]
+                    .fill;
         }
     }
 
     @autobind
-    private waterfallPlotLimitValueSymbolVisibility(d:IPlotSampleData) {
+    private waterfallPlotLimitValueSymbolVisibility(d: IPlotSampleData) {
         switch (this.viewType) {
             case ViewType.LimitVal:
             case ViewType.LimitValMutationType:
@@ -1609,29 +2013,37 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
     }
 
     @autobind
-    private scatterPlotTooltip(d:IScatterPlotData) {
+    private scatterPlotTooltip(d: IScatterPlotData) {
         return scatterPlotTooltip(d);
     }
 
     @autobind
-    private waterfallPlotTooltip(d:IWaterfallPlotData) {
+    private waterfallPlotTooltip(d: IWaterfallPlotData) {
         return waterfallPlotTooltip(d);
     }
 
     @computed get boxPlotTooltip() {
-        return (d:IBoxScatterPlotPoint)=>{
+        return (d: IBoxScatterPlotPoint) => {
             let content;
             if (this.boxPlotData.isComplete) {
                 content = boxPlotTooltip(d, this.boxPlotData.result.horizontal);
             } else {
-                content = <span>Loading... (this shouldnt appear because the box plot shouldnt be visible)</span>;
+                content = (
+                    <span>
+                        Loading... (this shouldnt appear because the box plot
+                        shouldnt be visible)
+                    </span>
+                );
             }
             return content;
-        }
+        };
     }
 
     @computed get searchMutationWords() {
-        return this.searchMutation.trim().split(/\s+/g).filter((m:string) => !!m.length);
+        return this.searchMutation
+            .trim()
+            .split(/\s+/g)
+            .filter((m: string) => !!m.length);
     }
 
     @computed get scatterPlotHighlight() {
@@ -1639,17 +2051,20 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
         const searchMutationWords = this.searchMutationWords;
 
         // need to regenerate the function whenever these change in order to trigger immediate Victory rerender
-        return (d:IPlotSampleData)=>{
+        return (d: IPlotSampleData) => {
             let caseMatch = false;
             for (const word of searchCaseWords) {
-                caseMatch = caseMatch || (!!word.length && (d.sampleId.indexOf(word) > -1));
+                caseMatch =
+                    caseMatch ||
+                    (!!word.length && d.sampleId.indexOf(word) > -1);
                 if (caseMatch) {
                     break;
                 }
             }
             let mutationMatch = false;
             for (const word of searchMutationWords) {
-                mutationMatch = mutationMatch || this.fDatumHasMutation(d, word);
+                mutationMatch =
+                    mutationMatch || this.fDatumHasMutation(d, word);
                 if (mutationMatch) {
                     break;
                 }
@@ -1660,16 +2075,30 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
 
     private fDatumHasMutation = (d: IPlotSampleData, word: string) => {
         const searchWordRegex = new RegExp(word, 'i');
-        return !!word && !!d.mutations.find((m) => !!(m.proteinChange && searchWordRegex.test(m.proteinChange)));
-    }
+        return (
+            !!word &&
+            !!d.mutations.find(
+                m =>
+                    !!(m.proteinChange && searchWordRegex.test(m.proteinChange))
+            )
+        );
+    };
 
-    @computed get showMutationNotFoundMessage():boolean {
+    @computed get showMutationNotFoundMessage(): boolean {
         let showMessage = false;
-        if (this.searchMutationWords.length > 0 && this.waterfallPlotIsShown && this.waterfallPlotData.isComplete) {
+        if (
+            this.searchMutationWords.length > 0 &&
+            this.waterfallPlotIsShown &&
+            this.waterfallPlotData.isComplete
+        ) {
             showMessage = true;
-            _.each(this.searchMutationWords, (word:string) => {
+            _.each(this.searchMutationWords, (word: string) => {
                 const dataPoints = this.waterfallPlotData.result!.data;
-                if (_.some(dataPoints, (d:any) => this.fDatumHasMutation(d, word))) {
+                if (
+                    _.some(dataPoints, (d: any) =>
+                        this.fDatumHasMutation(d, word)
+                    )
+                ) {
                     showMessage = false;
                 }
             });
@@ -1677,141 +2106,226 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
         return showMessage;
     }
 
-    isDisabledAxisLogCheckbox(vertical:boolean):boolean {
-        return vertical ? this.vertAxisDataHasNegativeNumbers : this.horzAxisDataHasNegativeNumbers;
+    isDisabledAxisLogCheckbox(vertical: boolean): boolean {
+        return vertical
+            ? this.vertAxisDataHasNegativeNumbers
+            : this.horzAxisDataHasNegativeNumbers;
     }
 
     private getAxisMenu(
-        vertical:boolean,
-        dataTypeOptions:{value:string, label:string}[],
-        dataSourceOptionsByType:{[type:string]:{value:string, label:string}[]}
+        vertical: boolean,
+        dataTypeOptions: { value: string; label: string }[],
+        dataSourceOptionsByType: {
+            [type: string]: { value: string; label: string }[];
+        }
     ) {
-        const axisSelection = vertical ? this.vertSelection : this.horzSelection;
+        const axisSelection = vertical
+            ? this.vertSelection
+            : this.horzSelection;
         if (
-            (axisSelection.dataType === CLIN_ATTR_DATA_TYPE && !this.clinicalAttributeIdToClinicalAttribute.isComplete) ||
-            (axisSelection.dataType !== CLIN_ATTR_DATA_TYPE && axisSelection.dataType !== AlterationTypeConstants.MUTATION_EXTENDED &&
-                !this.props.store.molecularProfileIdToMolecularProfile.isComplete)
+            (axisSelection.dataType === CLIN_ATTR_DATA_TYPE &&
+                !this.clinicalAttributeIdToClinicalAttribute.isComplete) ||
+            (axisSelection.dataType !== CLIN_ATTR_DATA_TYPE &&
+                axisSelection.dataType !==
+                    AlterationTypeConstants.MUTATION_EXTENDED &&
+                !this.props.store.molecularProfileIdToMolecularProfile
+                    .isComplete)
         ) {
-            return <LoadingIndicator isLoading={true}/>;
+            return <LoadingIndicator isLoading={true} />;
         }
 
-        const dataTestWhichAxis = vertical ? "Vertical" : "Horizontal";
+        const dataTestWhichAxis = vertical ? 'Vertical' : 'Horizontal';
 
-        let dataSourceLabel = "Profile";
+        let dataSourceLabel = 'Profile';
         let dataSourceValue = axisSelection.dataSourceId;
-        let dataSourceOptions = (axisSelection.dataType ? dataSourceOptionsByType[axisSelection.dataType] : []) || [];
-        let onDataSourceChange = vertical ? this.onVerticalAxisDataSourceSelect : this.onHorizontalAxisDataSourceSelect;
+        let dataSourceOptions =
+            (axisSelection.dataType
+                ? dataSourceOptionsByType[axisSelection.dataType]
+                : []) || [];
+        let onDataSourceChange = vertical
+            ? this.onVerticalAxisDataSourceSelect
+            : this.onHorizontalAxisDataSourceSelect;
 
         switch (axisSelection.dataType) {
             case CLIN_ATTR_DATA_TYPE:
-                dataSourceLabel = "Clinical Attribute";
+                dataSourceLabel = 'Clinical Attribute';
                 break;
             case AlterationTypeConstants.MUTATION_EXTENDED:
-                dataSourceLabel = "Group Mutations by";
+                dataSourceLabel = 'Group Mutations by';
                 dataSourceValue = axisSelection.mutationCountBy;
                 dataSourceOptions = mutationCountByOptions;
-                onDataSourceChange = vertical ? this.onVerticalAxisMutationCountBySelect : this.onHorizontalAxisMutationCountBySelect;
+                onDataSourceChange = vertical
+                    ? this.onVerticalAxisMutationCountBySelect
+                    : this.onHorizontalAxisMutationCountBySelect;
                 break;
             case undefined:
                 break;
             default:
-                dataSourceLabel = `${dataTypeToDisplayType[axisSelection.dataType!]} Profile`;
+                dataSourceLabel = `${
+                    dataTypeToDisplayType[axisSelection.dataType!]
+                } Profile`;
                 break;
         }
 
-        let dataSourceDescription:string = "";
-        if (dataSourceValue && axisSelection.dataType !== AlterationTypeConstants.MUTATION_EXTENDED) {
+        let dataSourceDescription: string = '';
+        if (
+            dataSourceValue &&
+            axisSelection.dataType !== AlterationTypeConstants.MUTATION_EXTENDED
+        ) {
             if (axisSelection.dataType === CLIN_ATTR_DATA_TYPE) {
-                dataSourceDescription = this.clinicalAttributeIdToClinicalAttribute.result![dataSourceValue].description;
+                dataSourceDescription = this
+                    .clinicalAttributeIdToClinicalAttribute.result![
+                    dataSourceValue
+                ].description;
             } else {
-                dataSourceDescription = this.props.store.molecularProfileIdToMolecularProfile.result![dataSourceValue].description;
+                dataSourceDescription = this.props.store
+                    .molecularProfileIdToMolecularProfile.result![
+                    dataSourceValue
+                ].description;
             }
         }
 
-        let dataTypeDescription:string = "";
+        let dataTypeDescription: string = '';
         if (axisSelection.dataType === NONE_SELECTED_OPTION_STRING_VALUE) {
-            const otherDataSourceId = vertical ? this.horzSelection.dataSourceId : this.vertSelection.dataSourceId;
-            const otherProfileName = this.props.store.molecularProfileIdToMolecularProfile.result![otherDataSourceId!].name;
+            const otherDataSourceId = vertical
+                ? this.horzSelection.dataSourceId
+                : this.vertSelection.dataSourceId;
+            const otherProfileName = this.props.store
+                .molecularProfileIdToMolecularProfile.result![
+                otherDataSourceId!
+            ].name;
             dataTypeDescription = `Sample order determined by values on the '${otherProfileName}' axis`;
         }
 
         return (
             <form className="main-form">
-                <h4 className="tab-title">{vertical ? "Vertical" : "Horizontal"} Axis</h4>
+                <h4 className="tab-title">
+                    {vertical ? 'Vertical' : 'Horizontal'} Axis
+                </h4>
                 <div>
-                    <div style={{marginBottom:"5px"}} className="form-group">
+                    <div style={{ marginBottom: '5px' }} className="form-group">
                         <label className="label-text">Data Type</label>
-                        <div style={{display:"flex", alignItems:"center"}}>
+                        <div style={{ display: 'flex', alignItems: 'center' }}>
                             <ReactSelect
-                                name={`${vertical ? "v" : "h"}-profile-type-selector`}
+                                name={`${
+                                    vertical ? 'v' : 'h'
+                                }-profile-type-selector`}
                                 value={axisSelection.dataType}
-                                onChange={vertical ? this.onVerticalAxisDataTypeSelect : this.onHorizontalAxisDataTypeSelect}
-                                options={this.horzDatatypeOptions && this.vertDatatypeOptions? (vertical ? this.vertDatatypeOptions : this.horzDatatypeOptions): []}
+                                onChange={
+                                    vertical
+                                        ? this.onVerticalAxisDataTypeSelect
+                                        : this.onHorizontalAxisDataTypeSelect
+                                }
+                                options={
+                                    this.horzDatatypeOptions &&
+                                    this.vertDatatypeOptions
+                                        ? vertical
+                                            ? this.vertDatatypeOptions
+                                            : this.horzDatatypeOptions
+                                        : []
+                                }
                                 clearable={false}
                                 searchable={false}
                             />
-                            { dataTypeDescription && (
+                            {dataTypeDescription && (
                                 <InfoIcon
                                     tooltip={<span>{dataTypeDescription}</span>}
                                     tooltipPlacement="right"
-                                    style={{marginLeft:7}}
+                                    style={{ marginLeft: 7 }}
                                 />
                             )}
                         </div>
                     </div>
-                    { this.showSortOrderButton(!vertical) && (
+                    {this.showSortOrderButton(!vertical) && (
                         <div className="checkbox">
                             <label>
                                 <Button
                                     className="btn btn-default sort-order"
                                     data-test="changeSortOrderButton"
                                     type="button"
-                                    onClick={this.onSortOrderButtonPressed}>
-                                    <i className={this.sortOrderImageClassName} />
+                                    onClick={this.onSortOrderButtonPressed}
+                                >
+                                    <i
+                                        className={this.sortOrderImageClassName}
+                                    />
                                 </Button>
                                 Sort Order
                             </label>
-                        </div>)}
-                    {(axisSelection.dataType && this.showDatasourceBox(axisSelection.dataType)) && (
-                    <div style={{marginBottom:"5px"}} className="form-group">
-                        <label className="label-text">{dataSourceLabel}</label>
-                        <div style={{display:"flex", alignItems:"center"}}>
-                            <ReactSelect
-                                className="data-source-id"
-                                name={`${vertical ? "v" : "h"}-profile-name-selector`}
-                                value={dataSourceValue}
-                                onChange={onDataSourceChange}
-                                options={dataSourceOptions}
-                                clearable={false}
-                                searchable={true}
-                            />
-                            { dataSourceDescription && (
-                                <InfoIcon
-                                    tooltip={<span>{dataSourceDescription}</span>}
-                                    tooltipPlacement="right"
-                                    style={{marginLeft:7}}
-                                />
-                            )}
                         </div>
-                    </div>
                     )}
-                    { logScalePossible(axisSelection) && (
+                    {axisSelection.dataType &&
+                        this.showDatasourceBox(axisSelection.dataType) && (
+                            <div
+                                style={{ marginBottom: '5px' }}
+                                className="form-group"
+                            >
+                                <label className="label-text">
+                                    {dataSourceLabel}
+                                </label>
+                                <div
+                                    style={{
+                                        display: 'flex',
+                                        alignItems: 'center',
+                                    }}
+                                >
+                                    <ReactSelect
+                                        className="data-source-id"
+                                        name={`${
+                                            vertical ? 'v' : 'h'
+                                        }-profile-name-selector`}
+                                        value={dataSourceValue}
+                                        onChange={onDataSourceChange}
+                                        options={dataSourceOptions}
+                                        clearable={false}
+                                        searchable={true}
+                                    />
+                                    {dataSourceDescription && (
+                                        <InfoIcon
+                                            tooltip={
+                                                <span>
+                                                    {dataSourceDescription}
+                                                </span>
+                                            }
+                                            tooltipPlacement="right"
+                                            style={{ marginLeft: 7 }}
+                                        />
+                                    )}
+                                </div>
+                            </div>
+                        )}
+                    {logScalePossible(axisSelection) && (
                         <div className="checkbox">
                             <label>
                                 <input
                                     data-test={`${dataTestWhichAxis}LogCheckbox`}
                                     type="checkbox"
-                                    name={vertical ? "vert_logScale" : "vert_logScale"}
-                                    value={vertical ? EventKey.vert_logScale : EventKey.horz_logScale}
-                                    checked={axisSelection.logScale && ! this.isDisabledAxisLogCheckbox(vertical)}
-                                    disabled={this.isDisabledAxisLogCheckbox(vertical)}
+                                    name={
+                                        vertical
+                                            ? 'vert_logScale'
+                                            : 'vert_logScale'
+                                    }
+                                    value={
+                                        vertical
+                                            ? EventKey.vert_logScale
+                                            : EventKey.horz_logScale
+                                    }
+                                    checked={
+                                        axisSelection.logScale &&
+                                        !this.isDisabledAxisLogCheckbox(
+                                            vertical
+                                        )
+                                    }
+                                    disabled={this.isDisabledAxisLogCheckbox(
+                                        vertical
+                                    )}
                                     onClick={this.onInputClick}
                                 />
                                 Log Scale
                             </label>
                         </div>
                     )}
-                    {((vertical && this.vertLimitValuesCanBeShown) || (!vertical && this.horzLimitValuesCanBeShown)) && (
+                    {((vertical && this.vertLimitValuesCanBeShown) ||
+                        (!vertical && this.horzLimitValuesCanBeShown)) && (
                         <div className="checkbox color-samples-toolbar-elt">
                             <label className="limit-value-label">
                                 <input
@@ -1821,59 +2335,173 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
                                     value={EventKey.utilities_viewLimitValues}
                                     checked={this.viewLimitValues}
                                     onClick={this.onInputClick}
-                                    disabled={(vertical && !this.vertLimitValuesCanBeShown) || (!vertical && !this.horzLimitValuesCanBeShown)}
-                                />{vertical? this.vertMenuLimitValueLabel : this.horzMenuLimitValueLabel}
+                                    disabled={
+                                        (vertical &&
+                                            !this.vertLimitValuesCanBeShown) ||
+                                        (!vertical &&
+                                            !this.horzLimitValuesCanBeShown)
+                                    }
+                                />
+                                {vertical
+                                    ? this.vertMenuLimitValueLabel
+                                    : this.horzMenuLimitValueLabel}
                             </label>
                         </div>
                     )}
-                    {(axisSelection.dataType && this.showGeneSelectBox(axisSelection.dataType))
-                        && (<div className="form-group" style={{display:(axisSelection.dataType === CLIN_ATTR_DATA_TYPE ? 'none' : 'block')}}>
-                        <label>Gene</label>
-                        <div style={{display:"flex"}}>
-                            <ReactSelect
-                                name={`${vertical ? "v" : "h"}-gene-selector`}
-                                value={axisSelection.selectedGeneOption ? axisSelection.selectedGeneOption.value : undefined}
-                                onChange={vertical ? this.onVerticalAxisGeneSelect : this.onHorizontalAxisGeneSelect}
-                                isLoading={this.horzGeneOptions.isPending}
-                                options={this.vertGeneOptions && this.horzGeneOptions? (vertical ? this.vertGeneOptions : this.horzGeneOptions.result): []}
-                                clearable={false}
-                                searchable={false}
-                                disabled={axisSelection.dataType === CLIN_ATTR_DATA_TYPE || axisSelection.dataType === GENESET_DATA_TYPE}
-                            />
-                        </div>
-                    </div>)}
-                    {(axisSelection.dataType && this.showGenesetSelectBox(axisSelection.dataType))
-                        && (<div className="form-group" style={{opacity:1}}>
-                        <label>Gene Set</label>
-                        <div style={{display:"flex"}}>
-                            <ReactSelect
-                                name={`${vertical ? "v" : "h"}-geneset-selector`}
-                                value={axisSelection.selectedGenesetOption ? axisSelection.selectedGenesetOption.value : undefined}
-                                onChange={vertical ? this.onVerticalAxisGenesetSelect : this.onHorizontalAxisGenesetSelect}
-                                isLoading={this.horzGenesetOptions.isPending}
-                                options={this.vertGenesetOptions && this.horzGenesetOptions? (vertical ? this.vertGenesetOptions : this.horzGenesetOptions.result): []}
-                                clearable={false}
-                                searchable={false}
-                                disabled={axisSelection.dataType !== GENESET_DATA_TYPE}
-                            />
-                        </div>
-                    </div>)}
-                    {(axisSelection.dataType && this.showTreatmentSelectBox(axisSelection.dataType))
-                        && (<div className="form-group" style={{opacity:1}}>
-                        <label>Treatment</label>
-                        <div style={{display:"flex", flexDirection:"row"}}>
-                            <ReactSelect
-                                name={`${vertical ? "v" : "h"}-treatment-selector`}
-                                value={axisSelection.selectedTreatmentOption ? axisSelection.selectedTreatmentOption.value : undefined}
-                                onChange={vertical ? this.onVerticalAxisTreatmentSelect : this.onHorizontalAxisTreatmentSelect}
-                                isLoading={this.horzTreatmentOptions.isPending}
-                                options={this.vertTreatmentOptions && this.horzTreatmentOptions? (vertical ? this.vertTreatmentOptions : this.horzTreatmentOptions.result): []}
-                                clearable={false}
-                                searchable={false}
-                                disabled={axisSelection.dataType === undefined || axisSelection.dataType === CLIN_ATTR_DATA_TYPE || !_.keys(GenericAssayTypeConstants).includes(axisSelection.dataType)}
-                            />
-                        </div>
-                    </div>)}
+                    {axisSelection.dataType &&
+                        this.showGeneSelectBox(axisSelection.dataType) && (
+                            <div
+                                className="form-group"
+                                style={{
+                                    display:
+                                        axisSelection.dataType ===
+                                        CLIN_ATTR_DATA_TYPE
+                                            ? 'none'
+                                            : 'block',
+                                }}
+                            >
+                                <label>Gene</label>
+                                <div style={{ display: 'flex' }}>
+                                    <ReactSelect
+                                        name={`${
+                                            vertical ? 'v' : 'h'
+                                        }-gene-selector`}
+                                        value={
+                                            axisSelection.selectedGeneOption
+                                                ? axisSelection
+                                                      .selectedGeneOption.value
+                                                : undefined
+                                        }
+                                        onChange={
+                                            vertical
+                                                ? this.onVerticalAxisGeneSelect
+                                                : this
+                                                      .onHorizontalAxisGeneSelect
+                                        }
+                                        isLoading={
+                                            this.horzGeneOptions.isPending
+                                        }
+                                        options={
+                                            this.vertGeneOptions &&
+                                            this.horzGeneOptions
+                                                ? vertical
+                                                    ? this.vertGeneOptions
+                                                    : this.horzGeneOptions
+                                                          .result
+                                                : []
+                                        }
+                                        clearable={false}
+                                        searchable={false}
+                                        disabled={
+                                            axisSelection.dataType ===
+                                                CLIN_ATTR_DATA_TYPE ||
+                                            axisSelection.dataType ===
+                                                GENESET_DATA_TYPE
+                                        }
+                                    />
+                                </div>
+                            </div>
+                        )}
+                    {axisSelection.dataType &&
+                        this.showGenesetSelectBox(axisSelection.dataType) && (
+                            <div className="form-group" style={{ opacity: 1 }}>
+                                <label>Gene Set</label>
+                                <div style={{ display: 'flex' }}>
+                                    <ReactSelect
+                                        name={`${
+                                            vertical ? 'v' : 'h'
+                                        }-geneset-selector`}
+                                        value={
+                                            axisSelection.selectedGenesetOption
+                                                ? axisSelection
+                                                      .selectedGenesetOption
+                                                      .value
+                                                : undefined
+                                        }
+                                        onChange={
+                                            vertical
+                                                ? this
+                                                      .onVerticalAxisGenesetSelect
+                                                : this
+                                                      .onHorizontalAxisGenesetSelect
+                                        }
+                                        isLoading={
+                                            this.horzGenesetOptions.isPending
+                                        }
+                                        options={
+                                            this.vertGenesetOptions &&
+                                            this.horzGenesetOptions
+                                                ? vertical
+                                                    ? this.vertGenesetOptions
+                                                    : this.horzGenesetOptions
+                                                          .result
+                                                : []
+                                        }
+                                        clearable={false}
+                                        searchable={false}
+                                        disabled={
+                                            axisSelection.dataType !==
+                                            GENESET_DATA_TYPE
+                                        }
+                                    />
+                                </div>
+                            </div>
+                        )}
+                    {axisSelection.dataType &&
+                        this.showTreatmentSelectBox(axisSelection.dataType) && (
+                            <div className="form-group" style={{ opacity: 1 }}>
+                                <label>Treatment</label>
+                                <div
+                                    style={{
+                                        display: 'flex',
+                                        flexDirection: 'row',
+                                    }}
+                                >
+                                    <ReactSelect
+                                        name={`${
+                                            vertical ? 'v' : 'h'
+                                        }-treatment-selector`}
+                                        value={
+                                            axisSelection.selectedTreatmentOption
+                                                ? axisSelection
+                                                      .selectedTreatmentOption
+                                                      .value
+                                                : undefined
+                                        }
+                                        onChange={
+                                            vertical
+                                                ? this
+                                                      .onVerticalAxisTreatmentSelect
+                                                : this
+                                                      .onHorizontalAxisTreatmentSelect
+                                        }
+                                        isLoading={
+                                            this.horzTreatmentOptions.isPending
+                                        }
+                                        options={
+                                            this.vertTreatmentOptions &&
+                                            this.horzTreatmentOptions
+                                                ? vertical
+                                                    ? this.vertTreatmentOptions
+                                                    : this.horzTreatmentOptions
+                                                          .result
+                                                : []
+                                        }
+                                        clearable={false}
+                                        searchable={false}
+                                        disabled={
+                                            axisSelection.dataType ===
+                                                undefined ||
+                                            axisSelection.dataType ===
+                                                CLIN_ATTR_DATA_TYPE ||
+                                            !_.keys(
+                                                GenericAssayTypeConstants
+                                            ).includes(axisSelection.dataType)
+                                        }
+                                    />
+                                </div>
+                            </div>
+                        )}
                 </div>
             </form>
         );
@@ -1881,48 +2509,72 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
 
     @autobind
     private getUtilitiesMenu() {
-        const showSearchOptions = this.plotType.isComplete && this.plotType.result !== PlotType.DiscreteVsDiscrete;
-        const showDiscreteVsDiscreteOption = this.plotType.isComplete && this.plotType.result === PlotType.DiscreteVsDiscrete;
-        const showStackedBarHorizontalOption = showDiscreteVsDiscreteOption && this.discreteVsDiscretePlotType !== DiscreteVsDiscretePlotType.Table;
-        const showSampleColoringOptions = this.mutationDataCanBeShown || this.cnaDataCanBeShown;
-        const showRegression = this.plotType.isComplete && this.plotType.result === PlotType.ScatterPlot;
-        if (!showSearchOptions && !showSampleColoringOptions && !showDiscreteVsDiscreteOption && !showStackedBarHorizontalOption && !showRegression) {
+        const showSearchOptions =
+            this.plotType.isComplete &&
+            this.plotType.result !== PlotType.DiscreteVsDiscrete;
+        const showDiscreteVsDiscreteOption =
+            this.plotType.isComplete &&
+            this.plotType.result === PlotType.DiscreteVsDiscrete;
+        const showStackedBarHorizontalOption =
+            showDiscreteVsDiscreteOption &&
+            this.discreteVsDiscretePlotType !==
+                DiscreteVsDiscretePlotType.Table;
+        const showSampleColoringOptions =
+            this.mutationDataCanBeShown || this.cnaDataCanBeShown;
+        const showRegression =
+            this.plotType.isComplete &&
+            this.plotType.result === PlotType.ScatterPlot;
+        if (
+            !showSearchOptions &&
+            !showSampleColoringOptions &&
+            !showDiscreteVsDiscreteOption &&
+            !showStackedBarHorizontalOption &&
+            !showRegression
+        ) {
             return <span></span>;
         }
         return (
-            <div style={{marginTop:10}}>
+            <div style={{ marginTop: 10 }}>
                 <div>
-                    {showSearchOptions && (<div>
-                        <div className="form-group">
-                            <label>Search Case(s)</label>
-                            <FormControl
-                                type="text"
-                                value={this.searchCaseInput}
-                                onChange={this.setSearchCaseInput}
-                                placeholder="Case ID.."
-                            />
-                        </div>
-                        {this.mutationDataCanBeShown && (
+                    {showSearchOptions && (
+                        <div>
                             <div className="form-group">
-                                <label>Search Mutation(s)</label>
+                                <label>Search Case(s)</label>
                                 <FormControl
                                     type="text"
-                                    value={this.searchMutationInput}
-                                    onChange={this.setSearchMutationInput}
-                                    placeholder="Protein Change.."
+                                    value={this.searchCaseInput}
+                                    onChange={this.setSearchCaseInput}
+                                    placeholder="Case ID.."
                                 />
-                            {this.showMutationNotFoundMessage && (<span className="mutation-message">Mutation not found for selected gene</span>)}
                             </div>
-                        )}
-                    </div>)}
+                            {this.mutationDataCanBeShown && (
+                                <div className="form-group">
+                                    <label>Search Mutation(s)</label>
+                                    <FormControl
+                                        type="text"
+                                        value={this.searchMutationInput}
+                                        onChange={this.setSearchMutationInput}
+                                        placeholder="Protein Change.."
+                                    />
+                                    {this.showMutationNotFoundMessage && (
+                                        <span className="mutation-message">
+                                            Mutation not found for selected gene
+                                        </span>
+                                    )}
+                                </div>
+                            )}
+                        </div>
+                    )}
                     {showDiscreteVsDiscreteOption && (
                         <div className="form-group">
                             <label>Plot Type</label>
-                            <div style={{ display: "flex"}}>
+                            <div style={{ display: 'flex' }}>
                                 <ReactSelect
                                     name="discrete-vs-discrete-plot-type"
                                     value={this.discreteVsDiscretePlotType}
-                                    onChange={this.onDiscreteVsDiscretePlotTypeSelect}
+                                    onChange={
+                                        this.onDiscreteVsDiscretePlotTypeSelect
+                                    }
                                     options={discreteVsDiscretePlotTypeOptions}
                                     clearable={false}
                                     searchable={true}
@@ -1931,28 +2583,36 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
                         </div>
                     )}
                     {showStackedBarHorizontalOption && (
-                        <div className="checkbox"><label>
-                            <input
-                                data-test="horizontalBars"
-                                type="checkbox"
-                                name="utilities_horizontalBars"
-                                value={EventKey.utilities_horizontalBars}
-                                checked={this.horizontalBars}
-                                onClick={this.onInputClick}
-                            /> Horizontal Bars
-                        </label></div>
+                        <div className="checkbox">
+                            <label>
+                                <input
+                                    data-test="horizontalBars"
+                                    type="checkbox"
+                                    name="utilities_horizontalBars"
+                                    value={EventKey.utilities_horizontalBars}
+                                    checked={this.horizontalBars}
+                                    onClick={this.onInputClick}
+                                />{' '}
+                                Horizontal Bars
+                            </label>
+                        </div>
                     )}
                     {showRegression && (
-                        <div className="checkbox" style={{marginTop:14}}><label>
-                            <input
-                                data-test="ShowRegressionline"
-                                type="checkbox"
-                                name="utilities_showRegressionLine"
-                                value={EventKey.utilities_showRegressionLine}
-                                checked={this.showRegressionLine}
-                                onClick={this.onInputClick}
-                            /> Show Regression Line
-                        </label></div>
+                        <div className="checkbox" style={{ marginTop: 14 }}>
+                            <label>
+                                <input
+                                    data-test="ShowRegressionline"
+                                    type="checkbox"
+                                    name="utilities_showRegressionLine"
+                                    value={
+                                        EventKey.utilities_showRegressionLine
+                                    }
+                                    checked={this.showRegressionLine}
+                                    onClick={this.onInputClick}
+                                />{' '}
+                                Show Regression Line
+                            </label>
+                        </div>
                     )}
                 </div>
             </div>
@@ -1960,64 +2620,71 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
     }
 
     @autobind
-    private assignScrollPaneRef(el:HTMLDivElement){
-        this.scrollPane=el;
+    private assignScrollPaneRef(el: HTMLDivElement) {
+        this.scrollPane = el;
     }
 
     @autobind
     private controls() {
         return (
-            <div style={{display:"flex", flexDirection:"column"}}>
+            <div style={{ display: 'flex', flexDirection: 'column' }}>
                 <div className="axisBlock">
-                    <Observer>
-                        {this.getHorizontalAxisMenu}
-                    </Observer>
+                    <Observer>{this.getHorizontalAxisMenu}</Observer>
                 </div>
-                <div className={"swapAxes"}>
-                    <button className="btn btn-link btn-xs" data-test="swapHorzVertButton" onClick={this.swapHorzVertSelections}><i className="fa fa-arrow-up"></i> Swap Axes <i className="fa fa-arrow-down"></i></button>
+                <div className={'swapAxes'}>
+                    <button
+                        className="btn btn-link btn-xs"
+                        data-test="swapHorzVertButton"
+                        onClick={this.swapHorzVertSelections}
+                    >
+                        <i className="fa fa-arrow-up"></i> Swap Axes{' '}
+                        <i className="fa fa-arrow-down"></i>
+                    </button>
                 </div>
                 <div className="axisBlock">
-                    <Observer>
-                        {this.getVerticalAxisMenu}
-                    </Observer>
+                    <Observer>{this.getVerticalAxisMenu}</Observer>
                 </div>
                 <div>
-                    <Observer>
-                        {this.getUtilitiesMenu}
-                    </Observer>
+                    <Observer>{this.getUtilitiesMenu}</Observer>
                 </div>
             </div>
         );
     }
 
     readonly plotType = remoteData({
-        await: ()=>[
-            this.horzAxisDataPromise,
-            this.vertAxisDataPromise
-        ],
-        invoke: ()=>{
+        await: () => [this.horzAxisDataPromise, this.vertAxisDataPromise],
+        invoke: () => {
             const horzAxisData = this.horzAxisDataPromise.result;
             const vertAxisData = this.vertAxisDataPromise.result;
-            const horzAxisNoneSelected = this.horzSelection.dataType === NONE_SELECTED_OPTION_STRING_VALUE;
-            const vertAxisNoneSelected = this.vertSelection.dataType === NONE_SELECTED_OPTION_STRING_VALUE;
+            const horzAxisNoneSelected =
+                this.horzSelection.dataType ===
+                NONE_SELECTED_OPTION_STRING_VALUE;
+            const vertAxisNoneSelected =
+                this.vertSelection.dataType ===
+                NONE_SELECTED_OPTION_STRING_VALUE;
 
             if (!horzAxisData || !vertAxisData) {
-                return new Promise<PlotType>(()=>0); // dont resolve
+                return new Promise<PlotType>(() => 0); // dont resolve
             }
 
-            if ((vertAxisNoneSelected && horzAxisData)
-                || (horzAxisNoneSelected && vertAxisData)) {
+            if (
+                (vertAxisNoneSelected && horzAxisData) ||
+                (horzAxisNoneSelected && vertAxisData)
+            ) {
                 return Promise.resolve(PlotType.WaterfallPlot);
             } else {
                 if (isStringData(horzAxisData) && isStringData(vertAxisData)) {
                     return Promise.resolve(PlotType.DiscreteVsDiscrete);
-                } else if (isNumberData(horzAxisData) && isNumberData(vertAxisData)) {
+                } else if (
+                    isNumberData(horzAxisData) &&
+                    isNumberData(vertAxisData)
+                ) {
                     return Promise.resolve(PlotType.ScatterPlot);
                 } else {
                     return Promise.resolve(PlotType.BoxPlot);
                 }
             }
-        }
+        },
     });
 
     // In case we want to handle samples differently
@@ -2037,7 +2704,7 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
     });*/
 
     readonly scatterPlotData = remoteData<IScatterPlotData[]>({
-        await: ()=>[
+        await: () => [
             this.horzAxisDataPromise,
             this.vertAxisDataPromise,
             this.props.store.sampleKeyToSample,
@@ -2045,38 +2712,53 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
             this.mutationPromise,
             this.props.store.studyToMutationMolecularProfile,
             this.cnaPromise,
-            this.props.store.studyToMolecularProfileDiscrete
+            this.props.store.studyToMolecularProfileDiscrete,
         ],
-        invoke: ()=>{
+        invoke: () => {
             const horzAxisData = this.horzAxisDataPromise.result;
             const vertAxisData = this.vertAxisDataPromise.result;
             if (!horzAxisData || !vertAxisData) {
-                return new Promise<IScatterPlotData[]>(()=>0); // dont resolve
+                return new Promise<IScatterPlotData[]>(() => 0); // dont resolve
             } else {
                 if (isNumberData(horzAxisData) && isNumberData(vertAxisData)) {
-                    return Promise.resolve(makeScatterPlotData(
-                        horzAxisData,
-                        vertAxisData,
-                        this.props.store.sampleKeyToSample.result!,
-                        this.props.store.coverageInformation.result!.samples,
-                        this.mutationDataExists.result ? {
-                            molecularProfileIds: _.values(this.props.store.studyToMutationMolecularProfile.result!).map(p=>p.molecularProfileId),
-                            data: this.mutationPromise.result!
-                        } : undefined,
-                        this.cnaDataExists.result ? {
-                            molecularProfileIds: _.values(this.props.store.studyToMolecularProfileDiscrete.result!).map(p=>p.molecularProfileId),
-                            data: this.cnaPromise.result!
-                        }: undefined
-                    ));
+                    return Promise.resolve(
+                        makeScatterPlotData(
+                            horzAxisData,
+                            vertAxisData,
+                            this.props.store.sampleKeyToSample.result!,
+                            this.props.store.coverageInformation.result!
+                                .samples,
+                            this.mutationDataExists.result
+                                ? {
+                                      molecularProfileIds: _.values(
+                                          this.props.store
+                                              .studyToMutationMolecularProfile
+                                              .result!
+                                      ).map(p => p.molecularProfileId),
+                                      data: this.mutationPromise.result!,
+                                  }
+                                : undefined,
+                            this.cnaDataExists.result
+                                ? {
+                                      molecularProfileIds: _.values(
+                                          this.props.store
+                                              .studyToMolecularProfileDiscrete
+                                              .result!
+                                      ).map(p => p.molecularProfileId),
+                                      data: this.cnaPromise.result!,
+                                  }
+                                : undefined
+                        )
+                    );
                 } else {
                     return Promise.resolve([]);
                 }
             }
-        }
+        },
     });
 
-    readonly waterfallPlotData = remoteData<{data:IWaterfallPlotData[]}>({
-        await: ()=>[
+    readonly waterfallPlotData = remoteData<{ data: IWaterfallPlotData[] }>({
+        await: () => [
             this.horzAxisDataPromise,
             this.vertAxisDataPromise,
             this.props.store.sampleKeyToSample,
@@ -2084,79 +2766,124 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
             this.mutationPromise,
             this.props.store.studyToMutationMolecularProfile,
             this.cnaPromise,
-            this.props.store.studyToMolecularProfileDiscrete
+            this.props.store.studyToMolecularProfileDiscrete,
         ],
-        invoke: ()=>{
+        invoke: () => {
             const horzAxisData = this.horzAxisDataPromise.result;
             const vertAxisData = this.vertAxisDataPromise.result;
 
             if (!horzAxisData && !vertAxisData) {
-                return new Promise<{horizontal:boolean, data:IWaterfallPlotData[]}>(()=>0); // dont resolve
+                return new Promise<{
+                    horizontal: boolean;
+                    data: IWaterfallPlotData[];
+                }>(() => 0); // dont resolve
             } else {
-                const axisData = this.isHorizontalWaterfallPlot? horzAxisData : vertAxisData;
+                const axisData = this.isHorizontalWaterfallPlot
+                    ? horzAxisData
+                    : vertAxisData;
 
                 // Note: for treatment profiles the identity of the selected gene is not
                 // naturally embedded in the genetic profile. Instead, the user selects
                 // the gene of interest from a select box in the Utilities menu.
-                const ensemblGeneId = this.utilitiesMenuSelection.selectedGeneOption!.value;
-                const selectedGene = this.props.store.entrezGeneIdToGene.result![ensemblGeneId];
+                const ensemblGeneId = this.utilitiesMenuSelection
+                    .selectedGeneOption!.value;
+                const selectedGene = this.props.store.entrezGeneIdToGene
+                    .result![ensemblGeneId];
 
                 if (isNumberData(axisData!)) {
                     return Promise.resolve({
                         data: makeWaterfallPlotData(
-                                axisData as INumberAxisData,
-                                this.props.store.sampleKeyToSample.result!,
-                                this.props.store.coverageInformation.result!.samples,
-                                selectedGene,
-                                this.mutationDataExists.result ? {
-                                    molecularProfileIds: _.values(this.props.store.studyToMutationMolecularProfile.result!).map(p=>p.molecularProfileId),
-                                    data: this.mutationPromise.result!
-                                } : undefined,
-                                this.cnaDataShown ? {
-                                    molecularProfileIds: _.values(this.props.store.studyToMolecularProfileDiscrete.result!).map(p=>p.molecularProfileId),
-                                    data: this.cnaPromise.result!
-                                }: undefined
-                            )
+                            axisData as INumberAxisData,
+                            this.props.store.sampleKeyToSample.result!,
+                            this.props.store.coverageInformation.result!
+                                .samples,
+                            selectedGene,
+                            this.mutationDataExists.result
+                                ? {
+                                      molecularProfileIds: _.values(
+                                          this.props.store
+                                              .studyToMutationMolecularProfile
+                                              .result!
+                                      ).map(p => p.molecularProfileId),
+                                      data: this.mutationPromise.result!,
+                                  }
+                                : undefined,
+                            this.cnaDataShown
+                                ? {
+                                      molecularProfileIds: _.values(
+                                          this.props.store
+                                              .studyToMolecularProfileDiscrete
+                                              .result!
+                                      ).map(p => p.molecularProfileId),
+                                      data: this.cnaPromise.result!,
+                                  }
+                                : undefined
+                        ),
                     });
                 } else {
-                    return Promise.resolve({data: []});
+                    return Promise.resolve({ data: [] });
                 }
             }
-        }
-
+        },
     });
 
-    @computed get waterfallPlotPivotThreshold():number {
-        const dataSourceId:string|undefined = this.isHorizontalWaterfallPlot ? this.horzSelection.dataSourceId! : this.vertSelection.dataSourceId!;
-        const profile = this.props.store.molecularProfileIdToMolecularProfile.result![dataSourceId];
+    @computed get waterfallPlotPivotThreshold(): number {
+        const dataSourceId: string | undefined = this.isHorizontalWaterfallPlot
+            ? this.horzSelection.dataSourceId!
+            : this.vertSelection.dataSourceId!;
+        const profile = this.props.store.molecularProfileIdToMolecularProfile
+            .result![dataSourceId];
         return profile.pivotThreshold;
     }
 
-    @computed get waterfallPlotSortOrder():string {
-        if (this._waterfallPlotSortOrder === undefined && this.isWaterfallPlot) {
-            const dataSourceId = this.horzSelection.dataSourceId || this.vertSelection.dataSourceId;
-            return this.props.store.molecularProfileIdToMolecularProfile.result![dataSourceId!].sortOrder;
+    @computed get waterfallPlotSortOrder(): string {
+        if (
+            this._waterfallPlotSortOrder === undefined &&
+            this.isWaterfallPlot
+        ) {
+            const dataSourceId =
+                this.horzSelection.dataSourceId ||
+                this.vertSelection.dataSourceId;
+            return this.props.store.molecularProfileIdToMolecularProfile
+                .result![dataSourceId!].sortOrder;
         }
         return this._waterfallPlotSortOrder!;
     }
 
-    @computed get isHorizontalWaterfallPlot():boolean {
-        return this.isWaterfallPlot && !!(this.vertAxisDataPromise.result) && this.vertAxisDataPromise.result['datatype'] === NONE_SELECTED_OPTION_STRING_VALUE;
+    @computed get isHorizontalWaterfallPlot(): boolean {
+        return (
+            this.isWaterfallPlot &&
+            !!this.vertAxisDataPromise.result &&
+            this.vertAxisDataPromise.result['datatype'] ===
+                NONE_SELECTED_OPTION_STRING_VALUE
+        );
     }
 
-    @computed get isWaterfallPlot():boolean {
-        return !!(this.plotType.result) && this.plotType.result === PlotType.WaterfallPlot;
+    @computed get isWaterfallPlot(): boolean {
+        return (
+            !!this.plotType.result &&
+            this.plotType.result === PlotType.WaterfallPlot
+        );
     }
 
-    @computed get sortOrderImageClassName():string {
-        const baseClass = "fa fa-signal";
-        const axisClass =  this.isHorizontalWaterfallPlot ? "horz" : "vert";
-        const sortClass =  (!this.isHorizontalWaterfallPlot && this.waterfallPlotSortOrder === "ASC") || (this.isHorizontalWaterfallPlot && this.waterfallPlotSortOrder === "DESC")? "ascending" : "descending";
+    @computed get sortOrderImageClassName(): string {
+        const baseClass = 'fa fa-signal';
+        const axisClass = this.isHorizontalWaterfallPlot ? 'horz' : 'vert';
+        const sortClass =
+            (!this.isHorizontalWaterfallPlot &&
+                this.waterfallPlotSortOrder === 'ASC') ||
+            (this.isHorizontalWaterfallPlot &&
+                this.waterfallPlotSortOrder === 'DESC')
+                ? 'ascending'
+                : 'descending';
         return `${baseClass} ${axisClass}-${sortClass}`;
     }
 
-    readonly boxPlotData = remoteData<{horizontal:boolean, data:IBoxScatterPlotData<IBoxScatterPlotPoint>[]}>({
-        await: ()=>[
+    readonly boxPlotData = remoteData<{
+        horizontal: boolean;
+        data: IBoxScatterPlotData<IBoxScatterPlotPoint>[];
+    }>({
+        await: () => [
             this.horzAxisDataPromise,
             this.vertAxisDataPromise,
             this.props.store.sampleKeyToSample,
@@ -2164,43 +2891,59 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
             this.mutationPromise,
             this.props.store.studyToMutationMolecularProfile,
             this.cnaPromise,
-            this.props.store.studyToMolecularProfileDiscrete
+            this.props.store.studyToMolecularProfileDiscrete,
         ],
-        invoke: ()=>{
+        invoke: () => {
             const horzAxisData = this.horzAxisDataPromise.result;
             const vertAxisData = this.vertAxisDataPromise.result;
             if (!horzAxisData || !vertAxisData) {
-                return new Promise<any>(()=>0); // dont resolve
+                return new Promise<any>(() => 0); // dont resolve
             } else {
-                let categoryData:IStringAxisData;
-                let numberData:INumberAxisData;
-                let horizontal:boolean;
+                let categoryData: IStringAxisData;
+                let numberData: INumberAxisData;
+                let horizontal: boolean;
                 if (isNumberData(horzAxisData) && isStringData(vertAxisData)) {
                     categoryData = vertAxisData;
                     numberData = horzAxisData;
                     horizontal = true;
-                } else if (isStringData(horzAxisData) && isNumberData(vertAxisData)) {
+                } else if (
+                    isStringData(horzAxisData) &&
+                    isNumberData(vertAxisData)
+                ) {
                     categoryData = horzAxisData;
                     numberData = vertAxisData;
                     horizontal = false;
                 } else {
-                    return Promise.resolve({horizontal:false, data:[]});
+                    return Promise.resolve({ horizontal: false, data: [] });
                 }
                 return Promise.resolve({
                     horizontal,
                     data: makeBoxScatterPlotData(
-                        categoryData, numberData,
+                        categoryData,
+                        numberData,
                         this.props.store.sampleKeyToSample.result!,
                         this.props.store.coverageInformation.result!.samples,
-                        this.mutationDataExists.result ? {
-                            molecularProfileIds: _.values(this.props.store.studyToMutationMolecularProfile.result!).map(p=>p.molecularProfileId),
-                            data: this.mutationPromise.result!
-                        } : undefined,
-                        this.cnaDataExists.result ? {
-                            molecularProfileIds: _.values(this.props.store.studyToMolecularProfileDiscrete.result!).map(p=>p.molecularProfileId),
-                            data: this.cnaPromise.result!
-                        }: undefined
-                    )
+                        this.mutationDataExists.result
+                            ? {
+                                  molecularProfileIds: _.values(
+                                      this.props.store
+                                          .studyToMutationMolecularProfile
+                                          .result!
+                                  ).map(p => p.molecularProfileId),
+                                  data: this.mutationPromise.result!,
+                              }
+                            : undefined,
+                        this.cnaDataExists.result
+                            ? {
+                                  molecularProfileIds: _.values(
+                                      this.props.store
+                                          .studyToMolecularProfileDiscrete
+                                          .result!
+                                  ).map(p => p.molecularProfileId),
+                                  data: this.cnaPromise.result!,
+                              }
+                            : undefined
+                    ),
                 });
             }
         },
@@ -2218,60 +2961,111 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
         const LARGE_BOX_WIDTH = 60;
 
         if (this.boxPlotData.isComplete) {
-            return this.boxPlotData.result.data.length > 7 ? SMALL_BOX_WIDTH : LARGE_BOX_WIDTH;
+            return this.boxPlotData.result.data.length > 7
+                ? SMALL_BOX_WIDTH
+                : LARGE_BOX_WIDTH;
         } else {
             // irrelevant - nothing should be plotted anyway
             return SMALL_BOX_WIDTH;
         }
     }
 
-    @computed get horzLogScaleFunction():IAxisLogScaleParams|undefined {
+    @computed get horzLogScaleFunction(): IAxisLogScaleParams | undefined {
         return makeAxisLogScaleFunction(this.horzSelection);
     }
 
-    @computed get vertLogScaleFunction():IAxisLogScaleParams|undefined {
+    @computed get vertLogScaleFunction(): IAxisLogScaleParams | undefined {
         return makeAxisLogScaleFunction(this.vertSelection);
     }
 
     @computed get showNoTreamentsSelectedWarning() {
-        return ( (this.vertSelection.dataType && _.keys(GenericAssayTypeConstants).includes(this.vertSelection.dataType) || this.horzSelection.dataType && _.keys(GenericAssayTypeConstants).includes(this.horzSelection.dataType))
-                  && this.vertTreatmentOptions.length === 0);
+        return (
+            ((this.vertSelection.dataType &&
+                _.keys(GenericAssayTypeConstants).includes(
+                    this.vertSelection.dataType
+                )) ||
+                (this.horzSelection.dataType &&
+                    _.keys(GenericAssayTypeConstants).includes(
+                        this.horzSelection.dataType
+                    ))) &&
+            this.vertTreatmentOptions.length === 0
+        );
     }
 
     @computed get plot() {
-        const promises = [this.plotType, this.horzAxisDataPromise, this.vertAxisDataPromise, this.horzLabel, this.vertLabel];
+        const promises = [
+            this.plotType,
+            this.horzAxisDataPromise,
+            this.vertAxisDataPromise,
+            this.horzLabel,
+            this.vertLabel,
+        ];
         const groupStatus = getMobxPromiseGroupStatus(...promises);
-        const isPercentage = this.discreteVsDiscretePlotType === DiscreteVsDiscretePlotType.PercentageStackedBar;
-        const isStacked = isPercentage || this.discreteVsDiscretePlotType === DiscreteVsDiscretePlotType.StackedBar;
-
+        const isPercentage =
+            this.discreteVsDiscretePlotType ===
+            DiscreteVsDiscretePlotType.PercentageStackedBar;
+        const isStacked =
+            isPercentage ||
+            this.discreteVsDiscretePlotType ===
+                DiscreteVsDiscretePlotType.StackedBar;
 
         if (this.showNoTreamentsSelectedWarning) {
             return (
                 <div>
-                    <i className="fa fa-exclamation-triangle text-danger" />&nbsp;
-                    <span>To visualize treatment response data, you must first visit the OncoPrint tab and use the "Heatmap" menu to add treatment response tracks to the OncoPrint. Any treatments added to the OncoPrint will then be available on this tab for visualization.</span>
+                    <i className="fa fa-exclamation-triangle text-danger" />
+                    &nbsp;
+                    <span>
+                        To visualize treatment response data, you must first
+                        visit the OncoPrint tab and use the "Heatmap" menu to
+                        add treatment response tracks to the OncoPrint. Any
+                        treatments added to the OncoPrint will then be available
+                        on this tab for visualization.
+                    </span>
                 </div>
-            )
+            );
         }
 
         switch (groupStatus) {
-            case "pending":
-                return <LoadingIndicator isLoading={true} center={true} size={"big"}/>;
-            case "error":
+            case 'pending':
+                return (
+                    <LoadingIndicator
+                        isLoading={true}
+                        center={true}
+                        size={'big'}
+                    />
+                );
+            case 'error':
                 return <span>Error loading plot data.</span>;
             default:
                 const plotType = this.plotType.result!;
-                let plotElt:any = null;
+                let plotElt: any = null;
                 switch (plotType) {
                     case PlotType.DiscreteVsDiscrete:
-                        if (this.discreteVsDiscretePlotType === DiscreteVsDiscretePlotType.Table) {
+                        if (
+                            this.discreteVsDiscretePlotType ===
+                            DiscreteVsDiscretePlotType.Table
+                        ) {
                             plotElt = (
                                 <TablePlot
                                     svgId={SVG_ID}
-                                    horzData={(this.horzAxisDataPromise.result! as IStringAxisData).data}
-                                    vertData={(this.vertAxisDataPromise.result! as IStringAxisData).data}
-                                    horzCategoryOrder={(this.horzAxisDataPromise.result! as IStringAxisData).categoryOrder}
-                                    vertCategoryOrder={(this.vertAxisDataPromise.result! as IStringAxisData).categoryOrder}
+                                    horzData={
+                                        (this.horzAxisDataPromise
+                                            .result! as IStringAxisData).data
+                                    }
+                                    vertData={
+                                        (this.vertAxisDataPromise
+                                            .result! as IStringAxisData).data
+                                    }
+                                    horzCategoryOrder={
+                                        (this.horzAxisDataPromise
+                                            .result! as IStringAxisData)
+                                            .categoryOrder
+                                    }
+                                    vertCategoryOrder={
+                                        (this.vertAxisDataPromise
+                                            .result! as IStringAxisData)
+                                            .categoryOrder
+                                    }
                                     minCellWidth={35}
                                     minCellHeight={35}
                                     minChartWidth={PLOT_SIDELENGTH}
@@ -2284,17 +3078,35 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
                             plotElt = (
                                 <MultipleCategoryBarPlot
                                     svgId={SVG_ID}
-                                    horzData={(this.horzAxisDataPromise.result! as IStringAxisData).data}
-                                    vertData={(this.vertAxisDataPromise.result! as IStringAxisData).data}
-                                    categoryToColor={RESERVED_CLINICAL_VALUE_COLORS}
-                                    horzCategoryOrder={(this.horzAxisDataPromise.result! as IStringAxisData).categoryOrder}
-                                    vertCategoryOrder={(this.vertAxisDataPromise.result! as IStringAxisData).categoryOrder}
+                                    horzData={
+                                        (this.horzAxisDataPromise
+                                            .result! as IStringAxisData).data
+                                    }
+                                    vertData={
+                                        (this.vertAxisDataPromise
+                                            .result! as IStringAxisData).data
+                                    }
+                                    categoryToColor={
+                                        RESERVED_CLINICAL_VALUE_COLORS
+                                    }
+                                    horzCategoryOrder={
+                                        (this.horzAxisDataPromise
+                                            .result! as IStringAxisData)
+                                            .categoryOrder
+                                    }
+                                    vertCategoryOrder={
+                                        (this.vertAxisDataPromise
+                                            .result! as IStringAxisData)
+                                            .categoryOrder
+                                    }
                                     barWidth={20}
                                     domainPadding={20}
                                     chartBase={PLOT_SIDELENGTH}
                                     axisLabelX={this.horzLabel.result!}
                                     axisLabelY={this.vertLabel.result!}
-                                    legendLocationWidthThreshold={LEGEND_TO_BOTTOM_WIDTH_THRESHOLD}
+                                    legendLocationWidthThreshold={
+                                        LEGEND_TO_BOTTOM_WIDTH_THRESHOLD
+                                    }
                                     horizontalBars={this.horizontalBars}
                                     percentage={isPercentage}
                                     stacked={isStacked}
@@ -2320,15 +3132,29 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
                                     logY={this.vertLogScaleFunction}
                                     fill={this.scatterPlotFill}
                                     stroke={this.scatterPlotStroke}
-                                    strokeOpacity={this.scatterPlotStrokeOpacity}
+                                    strokeOpacity={
+                                        this.scatterPlotStrokeOpacity
+                                    }
                                     zIndexSortBy={this.zIndexSortBy}
                                     symbol={this.scatterPlotSymbol}
                                     fillOpacity={this.scatterPlotFillOpacity}
                                     strokeWidth={this.scatterPlotStrokeWidth}
                                     useLogSpaceTicks={true}
-                                    excludeLimitValuesFromCorrelation={this.limitValuesCanBeShown && this.viewLimitValues}
+                                    excludeLimitValuesFromCorrelation={
+                                        this.limitValuesCanBeShown &&
+                                        this.viewLimitValues
+                                    }
                                     legendData={scatterPlotLegendData(
-                                        this.scatterPlotData.result, this.viewType, PlotType.ScatterPlot, this.mutationDataExists, this.cnaDataExists, this.props.store.driverAnnotationSettings.driversAnnotated, this.limitValueTypes, this.scatterPlotHighlight
+                                        this.scatterPlotData.result,
+                                        this.viewType,
+                                        PlotType.ScatterPlot,
+                                        this.mutationDataExists,
+                                        this.cnaDataExists,
+                                        this.props.store
+                                            .driverAnnotationSettings
+                                            .driversAnnotated,
+                                        this.limitValueTypes,
+                                        this.scatterPlotHighlight
                                     )}
                                 />
                             );
@@ -2336,7 +3162,13 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
                         } else if (this.scatterPlotData.isError) {
                             return <span>Error loading plot data.</span>;
                         } else {
-                            return <LoadingIndicator isLoading={true} center={true} size={"big"}/>;
+                            return (
+                                <LoadingIndicator
+                                    isLoading={true}
+                                    center={true}
+                                    size={'big'}
+                                />
+                            );
                         }
                     case PlotType.WaterfallPlot:
                         if (this.waterfallPlotData.isComplete) {
@@ -2352,7 +3184,11 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
                                     chartHeight={this.waterfallPlotHeigth}
                                     tooltip={this.waterfallPlotTooltip}
                                     highlight={this.scatterPlotHighlight}
-                                    log={horizontal ? this.horzLogScaleFunction : this.vertLogScaleFunction}
+                                    log={
+                                        horizontal
+                                            ? this.horzLogScaleFunction
+                                            : this.vertLogScaleFunction
+                                    }
                                     horizontal={horizontal}
                                     fill={this.waterfallPlotColor}
                                     fillOpacity={1}
@@ -2360,14 +3196,30 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
                                     strokeOpacity={1}
                                     strokeWidth={this.scatterPlotStrokeWidth}
                                     symbol={this.scatterPlotSymbol}
-                                    labelVisibility={this.waterfallPlotLimitValueSymbolVisibility}
+                                    labelVisibility={
+                                        this
+                                            .waterfallPlotLimitValueSymbolVisibility
+                                    }
                                     zIndexSortBy={this.zIndexSortBy}
                                     useLogSpaceTicks={true}
-                                    legendLocationWidthThreshold={LEGEND_TO_BOTTOM_WIDTH_THRESHOLD}
+                                    legendLocationWidthThreshold={
+                                        LEGEND_TO_BOTTOM_WIDTH_THRESHOLD
+                                    }
                                     sortOrder={this.waterfallPlotSortOrder}
-                                    pivotThreshold={this.waterfallPlotPivotThreshold}
+                                    pivotThreshold={
+                                        this.waterfallPlotPivotThreshold
+                                    }
                                     legendData={scatterPlotLegendData(
-                                        this.waterfallPlotData.result.data, this.viewType, PlotType.WaterfallPlot, this.mutationDataExists, this.cnaDataExists, this.props.store.driverAnnotationSettings.driversAnnotated, this.limitValueTypes, this.scatterPlotHighlight
+                                        this.waterfallPlotData.result.data,
+                                        this.viewType,
+                                        PlotType.WaterfallPlot,
+                                        this.mutationDataExists,
+                                        this.cnaDataExists,
+                                        this.props.store
+                                            .driverAnnotationSettings
+                                            .driversAnnotated,
+                                        this.limitValueTypes,
+                                        this.scatterPlotHighlight
                                     )}
                                 />
                             );
@@ -2375,11 +3227,18 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
                         } else if (this.scatterPlotData.isError) {
                             return <span>Error loading plot data.</span>;
                         } else {
-                            return <LoadingIndicator isLoading={true} center={true} size={"big"}/>;
+                            return (
+                                <LoadingIndicator
+                                    isLoading={true}
+                                    center={true}
+                                    size={'big'}
+                                />
+                            );
                         }
                     case PlotType.BoxPlot:
                         if (this.boxPlotData.isComplete) {
-                            const horizontal = this.boxPlotData.result.horizontal;
+                            const horizontal = this.boxPlotData.result
+                                .horizontal;
                             plotElt = (
                                 <PlotsTabBoxPlot
                                     svgId={SVG_ID}
@@ -2392,83 +3251,236 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
                                     scatterPlotTooltip={this.boxPlotTooltip}
                                     highlight={this.scatterPlotHighlight}
                                     horizontal={horizontal}
-                                    logScale={horizontal ? this.horzLogScaleFunction : this.vertLogScaleFunction}
+                                    logScale={
+                                        horizontal
+                                            ? this.horzLogScaleFunction
+                                            : this.vertLogScaleFunction
+                                    }
                                     size={scatterPlotSize}
                                     fill={this.scatterPlotFill}
                                     stroke={this.scatterPlotStroke}
-                                    strokeOpacity={this.scatterPlotStrokeOpacity}
+                                    strokeOpacity={
+                                        this.scatterPlotStrokeOpacity
+                                    }
                                     zIndexSortBy={this.zIndexSortBy}
                                     symbol={this.scatterPlotSymbol}
                                     fillOpacity={this.scatterPlotFillOpacity}
                                     strokeWidth={this.scatterPlotStrokeWidth}
                                     useLogSpaceTicks={true}
-                                    excludeLimitValuesFromBoxPlot={this.limitValuesCanBeShown && this.viewLimitValues}
+                                    excludeLimitValuesFromBoxPlot={
+                                        this.limitValuesCanBeShown &&
+                                        this.viewLimitValues
+                                    }
                                     legendData={scatterPlotLegendData(
-                                        _.flatten(this.boxPlotData.result.data.map(d=>d.data)), this.viewType, PlotType.BoxPlot, this.mutationDataExists, this.cnaDataExists, this.props.store.driverAnnotationSettings.driversAnnotated, this.limitValueTypes, this.scatterPlotHighlight
+                                        _.flatten(
+                                            this.boxPlotData.result.data.map(
+                                                d => d.data
+                                            )
+                                        ),
+                                        this.viewType,
+                                        PlotType.BoxPlot,
+                                        this.mutationDataExists,
+                                        this.cnaDataExists,
+                                        this.props.store
+                                            .driverAnnotationSettings
+                                            .driversAnnotated,
+                                        this.limitValueTypes,
+                                        this.scatterPlotHighlight
                                     )}
-                                    legendLocationWidthThreshold={LEGEND_TO_BOTTOM_WIDTH_THRESHOLD}
+                                    legendLocationWidthThreshold={
+                                        LEGEND_TO_BOTTOM_WIDTH_THRESHOLD
+                                    }
                                 />
                             );
                             break;
                         } else if (this.boxPlotData.isError) {
                             return <span>Error loading plot data.</span>;
                         } else {
-                            return <LoadingIndicator isLoading={true} center={true} size={"big"}/>;
+                            return (
+                                <LoadingIndicator
+                                    isLoading={true}
+                                    center={true}
+                                    size={'big'}
+                                />
+                            );
                         }
                     default:
-                        return <span>Not implemented yet</span>
+                        return <span>Not implemented yet</span>;
                 }
-                const geneSelectShownClassName = this.isWaterfallPlot? 'gene-select-shown':'';
+                const geneSelectShownClassName = this.isWaterfallPlot
+                    ? 'gene-select-shown'
+                    : '';
                 return (
                     <div>
-                        <div data-test="PlotsTabPlotDiv" className="borderedChart posRelative">
-                            <ScrollBar style={{position:'relative', top:-5}} getScrollEl={this.getScrollPane} />
-                                {((this.plotDataExistsForTwoAxes || this.waterfallPlotIsShown) && (this.mutationDataCanBeShown || this.cnaDataCanBeShown)) && (
-                                    <div style={{textAlign:"left", position:"relative", zIndex:1, marginTop:"-6px", marginBottom: this.isWaterfallPlot?"9px":"-16px", minWidth: this.mutationDataCanBeShown && this.cnaDataCanBeShown ? 600 : 0}}>
-                                        <div style={{display:"inline-block", position: "relative"}} className="utilities-menu">
-                                            <label className="legend-label">Style samples by:</label>
+                        <div
+                            data-test="PlotsTabPlotDiv"
+                            className="borderedChart posRelative"
+                        >
+                            <ScrollBar
+                                style={{ position: 'relative', top: -5 }}
+                                getScrollEl={this.getScrollPane}
+                            />
+                            {(this.plotDataExistsForTwoAxes ||
+                                this.waterfallPlotIsShown) &&
+                                (this.mutationDataCanBeShown ||
+                                    this.cnaDataCanBeShown) && (
+                                    <div
+                                        style={{
+                                            textAlign: 'left',
+                                            position: 'relative',
+                                            zIndex: 1,
+                                            marginTop: '-6px',
+                                            marginBottom: this.isWaterfallPlot
+                                                ? '9px'
+                                                : '-16px',
+                                            minWidth:
+                                                this.mutationDataCanBeShown &&
+                                                this.cnaDataCanBeShown
+                                                    ? 600
+                                                    : 0,
+                                        }}
+                                    >
+                                        <div
+                                            style={{
+                                                display: 'inline-block',
+                                                position: 'relative',
+                                            }}
+                                            className="utilities-menu"
+                                        >
+                                            <label className="legend-label">
+                                                Style samples by:
+                                            </label>
                                             &nbsp;
-                                            <div style={{display:"inline-block"}} className={`gene-select-background ${geneSelectShownClassName}`}>
+                                            <div
+                                                style={{
+                                                    display: 'inline-block',
+                                                }}
+                                                className={`gene-select-background ${geneSelectShownClassName}`}
+                                            >
                                                 {this.isWaterfallPlot && (
                                                     <div className="checkbox gene-select-container">
                                                         <label>Gene:</label>
                                                         &nbsp;
                                                         <ReactSelect
-                                                            className={'color-samples-toolbar-elt gene-select'}
+                                                            className={
+                                                                'color-samples-toolbar-elt gene-select'
+                                                            }
                                                             name={`utilities_geneSelectionBox`}
-                                                            value={this.utilitiesMenuSelection.selectedGeneOption ? this.utilitiesMenuSelection.selectedGeneOption.value : undefined}
-                                                            onChange={this.onUtilitiesGeneSelect}
-                                                            isLoading={this.horzGeneOptions.isPending}
-                                                            options={this.utilityMenuGeneOptions}
+                                                            value={
+                                                                this
+                                                                    .utilitiesMenuSelection
+                                                                    .selectedGeneOption
+                                                                    ? this
+                                                                          .utilitiesMenuSelection
+                                                                          .selectedGeneOption
+                                                                          .value
+                                                                    : undefined
+                                                            }
+                                                            onChange={
+                                                                this
+                                                                    .onUtilitiesGeneSelect
+                                                            }
+                                                            isLoading={
+                                                                this
+                                                                    .horzGeneOptions
+                                                                    .isPending
+                                                            }
+                                                            options={
+                                                                this
+                                                                    .utilityMenuGeneOptions
+                                                            }
                                                             clearable={false}
                                                             searchable={false}
-                                                            disabled={!this.mutationDataExists.isComplete || !this.mutationDataExists.result}
-                                                            />
+                                                            disabled={
+                                                                !this
+                                                                    .mutationDataExists
+                                                                    .isComplete ||
+                                                                !this
+                                                                    .mutationDataExists
+                                                                    .result
+                                                            }
+                                                        />
                                                     </div>
                                                 )}
-                                                {this.mutationDataCanBeShown && (
-                                                    <div className={`checkbox color-samples-toolbar-elt`}><label>
-                                                        <input
-                                                            data-test="ViewMutationType"
-                                                            type={this.plotType.result === PlotType.WaterfallPlot? "radio": "checkbox"}                                                name="utilities_viewMutationType"
-                                                            value={EventKey.utilities_viewMutationType}
-                                                            checked={this.viewMutationType}
-                                                            onClick={this.onInputClick}
-                                                            disabled={!this.mutationDataExists.isComplete || !this.mutationDataExists.result}
-                                                        />Mutation Type *
-                                                    </label></div>
+                                                {this
+                                                    .mutationDataCanBeShown && (
+                                                    <div
+                                                        className={`checkbox color-samples-toolbar-elt`}
+                                                    >
+                                                        <label>
+                                                            <input
+                                                                data-test="ViewMutationType"
+                                                                type={
+                                                                    this
+                                                                        .plotType
+                                                                        .result ===
+                                                                    PlotType.WaterfallPlot
+                                                                        ? 'radio'
+                                                                        : 'checkbox'
+                                                                }
+                                                                name="utilities_viewMutationType"
+                                                                value={
+                                                                    EventKey.utilities_viewMutationType
+                                                                }
+                                                                checked={
+                                                                    this
+                                                                        .viewMutationType
+                                                                }
+                                                                onClick={
+                                                                    this
+                                                                        .onInputClick
+                                                                }
+                                                                disabled={
+                                                                    !this
+                                                                        .mutationDataExists
+                                                                        .isComplete ||
+                                                                    !this
+                                                                        .mutationDataExists
+                                                                        .result
+                                                                }
+                                                            />
+                                                            Mutation Type *
+                                                        </label>
+                                                    </div>
                                                 )}
                                                 {this.cnaDataCanBeShown && (
-                                                    <div className="checkbox color-samples-toolbar-elt"><label>
-                                                        <input
-                                                            data-test="ViewCopyNumber"
-                                                            type={this.plotType.result === PlotType.WaterfallPlot? "radio": "checkbox"}                                                name="utilities_viewCopyNumber"
-                                                            value={EventKey.utilities_viewCopyNumber}
-                                                            checked={this.viewCopyNumber}
-                                                            onClick={this.onInputClick}
-                                                            disabled={!this.cnaDataExists.isComplete || !this.cnaDataExists.result}
-                                                        />Copy Number Alteration
-                                                    </label></div>
+                                                    <div className="checkbox color-samples-toolbar-elt">
+                                                        <label>
+                                                            <input
+                                                                data-test="ViewCopyNumber"
+                                                                type={
+                                                                    this
+                                                                        .plotType
+                                                                        .result ===
+                                                                    PlotType.WaterfallPlot
+                                                                        ? 'radio'
+                                                                        : 'checkbox'
+                                                                }
+                                                                name="utilities_viewCopyNumber"
+                                                                value={
+                                                                    EventKey.utilities_viewCopyNumber
+                                                                }
+                                                                checked={
+                                                                    this
+                                                                        .viewCopyNumber
+                                                                }
+                                                                onClick={
+                                                                    this
+                                                                        .onInputClick
+                                                                }
+                                                                disabled={
+                                                                    !this
+                                                                        .cnaDataExists
+                                                                        .isComplete ||
+                                                                    !this
+                                                                        .cnaDataExists
+                                                                        .result
+                                                                }
+                                                            />
+                                                            Copy Number
+                                                            Alteration
+                                                        </label>
+                                                    </div>
                                                 )}
                                             </div>
                                         </div>
@@ -2478,34 +3490,70 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
                                 <DownloadControls
                                     getSvg={this.getSvg}
                                     filename={this.downloadFilename}
-                                    additionalRightButtons={[{
-                                        key:"Data",
-                                        content:<span>Data <i className="fa fa-cloud-download" aria-hidden="true"/></span>,
-                                        onClick:this.downloadData,
-                                        disabled: !this.props.store.entrezGeneIdToGene.isComplete
-                                    }]}
+                                    additionalRightButtons={[
+                                        {
+                                            key: 'Data',
+                                            content: (
+                                                <span>
+                                                    Data{' '}
+                                                    <i
+                                                        className="fa fa-cloud-download"
+                                                        aria-hidden="true"
+                                                    />
+                                                </span>
+                                            ),
+                                            onClick: this.downloadData,
+                                            disabled: !this.props.store
+                                                .entrezGeneIdToGene.isComplete,
+                                        },
+                                    ]}
                                     dontFade={true}
-                                    style={{position:'absolute', right:10, top:10 }}
-                                    type='button'
+                                    style={{
+                                        position: 'absolute',
+                                        right: 10,
+                                        top: 10,
+                                    }}
+                                    type="button"
                                 />
                             )}
-                            <div ref={this.assignScrollPaneRef} style={{position:"relative", display:"inline-block"}}>
+                            <div
+                                ref={this.assignScrollPaneRef}
+                                style={{
+                                    position: 'relative',
+                                    display: 'inline-block',
+                                }}
+                            >
                                 {plotElt}
                             </div>
                         </div>
                         {this.mutationDataCanBeShown && (
-                            <div style={{marginTop:5}}>* Driver annotation settings are located in the settings menu <i className="fa fa-sliders fa-sm"/> at the top of the page.</div>
-                        )}
-                        {this.limitValuesCanBeShown && this.plotType.result === PlotType.ScatterPlot && (
-                            <div style={{marginTop:5}}>
-                                <div>** Labeling of threshold values (e.g. >8.00) excludes threshold values from correlation coefficient calculation.</div>
-                            </div>
-                            )}
-                        {this.limitValuesCanBeShown && this.plotType.result === PlotType.BoxPlot && (
-                            <div style={{marginTop:5}}>
-                                <div>** Labeling of threshold values (e.g. >8.00) excludes threshold values from box plot calculation.</div>
+                            <div style={{ marginTop: 5 }}>
+                                * Driver annotation settings are located in the
+                                settings menu{' '}
+                                <i className="fa fa-sliders fa-sm" /> at the top
+                                of the page.
                             </div>
                         )}
+                        {this.limitValuesCanBeShown &&
+                            this.plotType.result === PlotType.ScatterPlot && (
+                                <div style={{ marginTop: 5 }}>
+                                    <div>
+                                        ** Labeling of threshold values (e.g.
+                                        >8.00) excludes threshold values from
+                                        correlation coefficient calculation.
+                                    </div>
+                                </div>
+                            )}
+                        {this.limitValuesCanBeShown &&
+                            this.plotType.result === PlotType.BoxPlot && (
+                                <div style={{ marginTop: 5 }}>
+                                    <div>
+                                        ** Labeling of threshold values (e.g.
+                                        >8.00) excludes threshold values from
+                                        box plot calculation.
+                                    </div>
+                                </div>
+                            )}
                         {/*this.mutationProfileDuplicateSamplesReport.isComplete && this.mutationProfileDuplicateSamplesReport.result.showMessage && (
                             <div className="alert alert-info" style={{marginTop:5, padding: 7}}>
                                 Notice: With Mutation profiles, there is one data point per mutation type, per sample. In
@@ -2527,26 +3575,36 @@ export default class PlotsTab extends React.Component<IPlotsTabProps,{}> {
         return (
             <div data-test="PlotsTabEntireDiv">
                 <div className={'tabMessageContainer'}>
-                    <OqlStatusBanner className="plots-oql-status-banner" store={this.props.store} tabReflectsOql={false} />
-                    <AlterationFilterWarning store={this.props.store} isUnaffected={true}/>
+                    <OqlStatusBanner
+                        className="plots-oql-status-banner"
+                        store={this.props.store}
+                        tabReflectsOql={false}
+                    />
+                    <AlterationFilterWarning
+                        store={this.props.store}
+                        isUnaffected={true}
+                    />
                 </div>
-                <div className={"plotsTab"}>
+                <div className={'plotsTab'}>
                     <div className="quickPlotsContainer">
                         <strong className="quickPlotsTitle">Examples: </strong>
                         {this.quickPlotButtons}
                     </div>
-                    <div style={{display:"flex"}}>
-                    <div className="leftColumn">
-                        { (this.dataTypeOptions.isComplete &&
-                            this.dataTypeToDataSourceOptions.isComplete) ? (
-                            <Observer>
-                                {this.controls}
-                            </Observer>
-                        ) : <LoadingIndicator isLoading={true} center={true} size={"big"}/> }
+                    <div style={{ display: 'flex' }}>
+                        <div className="leftColumn">
+                            {this.dataTypeOptions.isComplete &&
+                            this.dataTypeToDataSourceOptions.isComplete ? (
+                                <Observer>{this.controls}</Observer>
+                            ) : (
+                                <LoadingIndicator
+                                    isLoading={true}
+                                    center={true}
+                                    size={'big'}
+                                />
+                            )}
+                        </div>
+                        <div className="chartWrapper">{this.plot}</div>
                     </div>
-                    <div className="chartWrapper">
-                        {this.plot}
-                    </div></div>
                 </div>
             </div>
         );
diff --git a/src/pages/resultsView/plots/PlotsTabUtils.spec.ts b/src/pages/resultsView/plots/PlotsTabUtils.spec.ts
index 1b02a712c17..bed18cadc99 100644
--- a/src/pages/resultsView/plots/PlotsTabUtils.spec.ts
+++ b/src/pages/resultsView/plots/PlotsTabUtils.spec.ts
@@ -1,4 +1,4 @@
-import {assert} from "chai";
+import { assert } from 'chai';
 import {
     CLIN_ATTR_DATA_TYPE,
     getMutationProfileDuplicateSamplesReport,
@@ -15,520 +15,769 @@ import {
     makeWaterfallPlotData,
     IWaterfallPlotData,
     getWaterfallPlotDownloadData,
-    getLimitValues
-} from "./PlotsTabUtils";
-import { Mutation, Sample, Gene} from "../../../shared/api/generated/CBioPortalAPI";
-import {AlterationTypeConstants, AnnotatedNumericGeneMolecularData, AnnotatedMutation, GenericAssayTypeConstants} from "../ResultsViewPageStore";
-import {MutationCountBy, AxisMenuSelection} from "./PlotsTab";
-import {CoverageInformation, CoverageInformationForCase} from "../ResultsViewPageStoreUtils";
-import { makeAxisLogScaleFunction, IAxisData, axisHasNegativeNumbers } from 'pages/resultsView/plots/PlotsTabUtils';
-import * as _ from "lodash";
-
-
-describe("PlotsTabUtils", ()=>{
-    describe("makeClinicalAttributeOptions", ()=>{
-        it("returns correct for empty input", ()=>{
+    getLimitValues,
+} from './PlotsTabUtils';
+import {
+    Mutation,
+    Sample,
+    Gene,
+} from '../../../shared/api/generated/CBioPortalAPI';
+import {
+    AlterationTypeConstants,
+    AnnotatedNumericGeneMolecularData,
+    AnnotatedMutation,
+    GenericAssayTypeConstants,
+} from '../ResultsViewPageStore';
+import { MutationCountBy, AxisMenuSelection } from './PlotsTab';
+import {
+    CoverageInformation,
+    CoverageInformationForCase,
+} from '../ResultsViewPageStoreUtils';
+import {
+    makeAxisLogScaleFunction,
+    IAxisData,
+    axisHasNegativeNumbers,
+} from 'pages/resultsView/plots/PlotsTabUtils';
+import * as _ from 'lodash';
+
+describe('PlotsTabUtils', () => {
+    describe('makeClinicalAttributeOptions', () => {
+        it('returns correct for empty input', () => {
             assert.deepEqual(makeClinicalAttributeOptions([]), []);
         });
-        it("returns correct options, sorted and filtering out everything besides number and string", ()=>{
+        it('returns correct options, sorted and filtering out everything besides number and string', () => {
             assert.deepEqual(
                 makeClinicalAttributeOptions([
                     {
-                        datatype:"string",
-                        clinicalAttributeId:"attribute2",
-                        displayName:"Second Attribute",
-                        priority:""
+                        datatype: 'string',
+                        clinicalAttributeId: 'attribute2',
+                        displayName: 'Second Attribute',
+                        priority: '',
                     },
                     {
-                        datatype:"number",
-                        clinicalAttributeId:"attribute1",
-                        displayName:"First Attribute",
-                        priority:"0"
+                        datatype: 'number',
+                        clinicalAttributeId: 'attribute1',
+                        displayName: 'First Attribute',
+                        priority: '0',
                     },
                     {
-                        datatype:"string",
-                        clinicalAttributeId:"attribute3",
-                        displayName:"Third Attribute",
-                        priority:""
+                        datatype: 'string',
+                        clinicalAttributeId: 'attribute3',
+                        displayName: 'Third Attribute',
+                        priority: '',
                     },
                     {
-                        datatype:"counts_map",
-                        clinicalAttributeId:"attribute4",
-                        displayName:"Bad attribute",
-                        priority:"3"
-                    }
+                        datatype: 'counts_map',
+                        clinicalAttributeId: 'attribute4',
+                        displayName: 'Bad attribute',
+                        priority: '3',
+                    },
                 ]),
-                [{
-                    value: "attribute1",
-                    label:"First Attribute",
-                    priority:0
-                },{
-                    value:"attribute2",
-                    label:"Second Attribute",
-                    priority:-1
-                },{
-                    value:"attribute3",
-                    label:"Third Attribute",
-                    priority:-1
-                }]
-            );
-        });
-    });
-    describe("makeScatterPlotData", ()=>{
-        it ("does not create data for NaN values", ()=>{
-            const data = makeScatterPlotData(
+                [
                     {
-                        datatype:"number",
-                        data:[
-                            { uniqueSampleKey:"sample1", value:NaN}, { uniqueSampleKey:"sample2", value:3},
-                            { uniqueSampleKey:"sample3", value:1}
-                        ],
+                        value: 'attribute1',
+                        label: 'First Attribute',
+                        priority: 0,
                     },
                     {
-                        datatype:"number",
-                        data:[
-                            { uniqueSampleKey:"sample1", value:0}, { uniqueSampleKey:"sample2", value:NaN},
-                            { uniqueSampleKey:"sample3", value:4}
-                        ],
+                        value: 'attribute2',
+                        label: 'Second Attribute',
+                        priority: -1,
                     },
-                    { sample1: {sampleId:"sample1", studyId:"study"} as Sample,
-                        sample2: {sampleId:"sample2", studyId:"study"} as Sample,
-                        sample3: {sampleId:"sample3", studyId:"study"} as Sample
+                    {
+                        value: 'attribute3',
+                        label: 'Third Attribute',
+                        priority: -1,
                     },
-                    {}
-                );
-            assert.equal(data.length, 1, "only one datum - others have NaN");
-            const datum:any = data[0];
-            const target:any = {
-                uniqueSampleKey:"sample3",
-                sampleId:"sample3",
-                studyId:"study",
-                x:1,
-                y:4,
+                ]
+            );
+        });
+    });
+    describe('makeScatterPlotData', () => {
+        it('does not create data for NaN values', () => {
+            const data = makeScatterPlotData(
+                {
+                    datatype: 'number',
+                    data: [
+                        { uniqueSampleKey: 'sample1', value: NaN },
+                        { uniqueSampleKey: 'sample2', value: 3 },
+                        { uniqueSampleKey: 'sample3', value: 1 },
+                    ],
+                },
+                {
+                    datatype: 'number',
+                    data: [
+                        { uniqueSampleKey: 'sample1', value: 0 },
+                        { uniqueSampleKey: 'sample2', value: NaN },
+                        { uniqueSampleKey: 'sample3', value: 4 },
+                    ],
+                },
+                {
+                    sample1: {
+                        sampleId: 'sample1',
+                        studyId: 'study',
+                    } as Sample,
+                    sample2: {
+                        sampleId: 'sample2',
+                        studyId: 'study',
+                    } as Sample,
+                    sample3: {
+                        sampleId: 'sample3',
+                        studyId: 'study',
+                    } as Sample,
+                },
+                {}
+            );
+            assert.equal(data.length, 1, 'only one datum - others have NaN');
+            const datum: any = data[0];
+            const target: any = {
+                uniqueSampleKey: 'sample3',
+                sampleId: 'sample3',
+                studyId: 'study',
+                x: 1,
+                y: 4,
             };
-            for (const key of ["uniqueSampleKey", "sampleId", "studyId", "x", "y"]) {
+            for (const key of [
+                'uniqueSampleKey',
+                'sampleId',
+                'studyId',
+                'x',
+                'y',
+            ]) {
                 assert.equal(target[key], datum[key], key);
             }
         });
     });
 
-    describe("makeWaterfallPlotData", ()=>{
-
+    describe('makeWaterfallPlotData', () => {
         const mockParams = {
             axisData: {
-                datatype:"number",
-                data:[
-                    {uniqueSampleKey:"sample1", value:1}
-                ],
+                datatype: 'number',
+                data: [{ uniqueSampleKey: 'sample1', value: 1 }],
             },
             uniqueSampleKeyToSample: {
-                sample1: {sampleId:"sample1", studyId:"study"} as any as Sample,
-                sample2: {sampleId:"sample2", studyId:"study"} as any as Sample,
-                sample3: {sampleId:"sample3", studyId:"study"} as any as Sample
+                sample1: ({
+                    sampleId: 'sample1',
+                    studyId: 'study',
+                } as any) as Sample,
+                sample2: ({
+                    sampleId: 'sample2',
+                    studyId: 'study',
+                } as any) as Sample,
+                sample3: ({
+                    sampleId: 'sample3',
+                    studyId: 'study',
+                } as any) as Sample,
             },
             coverageInformation: {
-                sample1: {byGene:{}, allGenes:[]} as any as CoverageInformationForCase,
-                sample2: {byGene:{}, allGenes:[]} as any as CoverageInformationForCase,
-                sample3: {byGene:{}, allGenes:[]} as any as CoverageInformationForCase
+                sample1: ({
+                    byGene: {},
+                    allGenes: [],
+                } as any) as CoverageInformationForCase,
+                sample2: ({
+                    byGene: {},
+                    allGenes: [],
+                } as any) as CoverageInformationForCase,
+                sample3: ({
+                    byGene: {},
+                    allGenes: [],
+                } as any) as CoverageInformationForCase,
             },
-            selectedGene: { entrezGeneId: 1234, hugoGeneSymbol: 'geneA'} as any as Gene,
+            selectedGene: ({
+                entrezGeneId: 1234,
+                hugoGeneSymbol: 'geneA',
+            } as any) as Gene,
             mutations: {
                 molecularProfileIds: [],
                 data: [
-                    {entrezGeneId: 1234 , uniqueSampleKey: "sample1", oncoKbOncogenic: "MutationA", mutationType: "fusion"},
-                    {entrezGeneId: 1234 , uniqueSampleKey: "sample1", oncoKbOncogenic: "MutationB", mutationType: "fusion"},
-                    {entrezGeneId: 5678 , uniqueSampleKey: "sample2", oncoKbOncogenic: "MutationC", mutationType: "fusion"},
-                    {entrezGeneId: 5678 , uniqueSampleKey: "sample2", oncoKbOncogenic: "MutationD", mutationType: "fusion"}
-                ] as AnnotatedMutation[]
+                    {
+                        entrezGeneId: 1234,
+                        uniqueSampleKey: 'sample1',
+                        oncoKbOncogenic: 'MutationA',
+                        mutationType: 'fusion',
+                    },
+                    {
+                        entrezGeneId: 1234,
+                        uniqueSampleKey: 'sample1',
+                        oncoKbOncogenic: 'MutationB',
+                        mutationType: 'fusion',
+                    },
+                    {
+                        entrezGeneId: 5678,
+                        uniqueSampleKey: 'sample2',
+                        oncoKbOncogenic: 'MutationC',
+                        mutationType: 'fusion',
+                    },
+                    {
+                        entrezGeneId: 5678,
+                        uniqueSampleKey: 'sample2',
+                        oncoKbOncogenic: 'MutationD',
+                        mutationType: 'fusion',
+                    },
+                ] as AnnotatedMutation[],
             },
             copyNumberAlterations: {
                 molecularProfileIds: [],
                 data: [
-                    {entrezGeneId: 1234 , uniqueSampleKey: "sample1", oncoKbOncogenic: "DuplicationA", value: 1},
-                    {entrezGeneId: 1234 , uniqueSampleKey: "sample1", oncoKbOncogenic: "DuplicationB", value: 2},
-                    {entrezGeneId: 5678 , uniqueSampleKey: "sample2", oncoKbOncogenic: "DuplicationC", value: 3},
-                    {entrezGeneId: 5678 , uniqueSampleKey: "sample2", oncoKbOncogenic: "DuplicationD", value: 4}
-                ] as AnnotatedNumericGeneMolecularData[]
-            }
+                    {
+                        entrezGeneId: 1234,
+                        uniqueSampleKey: 'sample1',
+                        oncoKbOncogenic: 'DuplicationA',
+                        value: 1,
+                    },
+                    {
+                        entrezGeneId: 1234,
+                        uniqueSampleKey: 'sample1',
+                        oncoKbOncogenic: 'DuplicationB',
+                        value: 2,
+                    },
+                    {
+                        entrezGeneId: 5678,
+                        uniqueSampleKey: 'sample2',
+                        oncoKbOncogenic: 'DuplicationC',
+                        value: 3,
+                    },
+                    {
+                        entrezGeneId: 5678,
+                        uniqueSampleKey: 'sample2',
+                        oncoKbOncogenic: 'DuplicationD',
+                        value: 4,
+                    },
+                ] as AnnotatedNumericGeneMolecularData[],
+            },
         };
 
-        it ("does not create data for NaN values", ()=>{
-
+        it('does not create data for NaN values', () => {
             const i = {
                 ...mockParams,
                 axisData: {
-                    datatype:"number",
-                    data:[
-                        { uniqueSampleKey:"sample1", value:NaN}, 
-                        { uniqueSampleKey:"sample2", value:NaN},
-                        { uniqueSampleKey:"sample3", value:3}
+                    datatype: 'number',
+                    data: [
+                        { uniqueSampleKey: 'sample1', value: NaN },
+                        { uniqueSampleKey: 'sample2', value: NaN },
+                        { uniqueSampleKey: 'sample3', value: 3 },
                     ],
-                }
-            }
-            
-            const data = makeWaterfallPlotData(i.axisData, i.uniqueSampleKeyToSample, i.coverageInformation, i.selectedGene, undefined, undefined);
-            assert.equal(data.length, 1, "only one datum - others have NaN");
-            const datum:any = data[0];
-            const target:any = {
-                uniqueSampleKey:"sample3",
-                sampleId:"sample3",
-                studyId:"study",
-                value:3,
+                },
             };
-            for (const key of ["uniqueSampleKey", "sampleId", "studyId", "x", "y"]) {
+
+            const data = makeWaterfallPlotData(
+                i.axisData,
+                i.uniqueSampleKeyToSample,
+                i.coverageInformation,
+                i.selectedGene,
+                undefined,
+                undefined
+            );
+            assert.equal(data.length, 1, 'only one datum - others have NaN');
+            const datum: any = data[0];
+            const target: any = {
+                uniqueSampleKey: 'sample3',
+                sampleId: 'sample3',
+                studyId: 'study',
+                value: 3,
+            };
+            for (const key of [
+                'uniqueSampleKey',
+                'sampleId',
+                'studyId',
+                'x',
+                'y',
+            ]) {
                 assert.equal(target[key], datum[key], key);
             }
         });
 
-        it ("should return most severe CNA of user-selected gene", () => {
-
+        it('should return most severe CNA of user-selected gene', () => {
             const i = {
                 ...mockParams,
-                mutations: undefined
-            }
+                mutations: undefined,
+            };
 
-            const data = makeWaterfallPlotData(i.axisData, i.uniqueSampleKeyToSample, i.coverageInformation, i.selectedGene, i.mutations, i.copyNumberAlterations);
+            const data = makeWaterfallPlotData(
+                i.axisData,
+                i.uniqueSampleKeyToSample,
+                i.coverageInformation,
+                i.selectedGene,
+                i.mutations,
+                i.copyNumberAlterations
+            );
             assert.equal(data.length, 1);
-            assert.equal(data[0].dispCna!.oncoKbOncogenic, "DuplicationB");
+            assert.equal(data[0].dispCna!.oncoKbOncogenic, 'DuplicationB');
         });
 
-        it ("should return no CNA when user-selected gene has no CNA's", () => {
-
+        it("should return no CNA when user-selected gene has no CNA's", () => {
             const i = {
                 ...mockParams,
                 axisData: {
-                    datatype:"number",
-                    data:[
-                        { uniqueSampleKey:"sample2", value:1}
-                    ],
+                    datatype: 'number',
+                    data: [{ uniqueSampleKey: 'sample2', value: 1 }],
                 },
                 mutations: undefined,
-            }
+            };
 
-            const data = makeWaterfallPlotData(i.axisData, i.uniqueSampleKeyToSample, i.coverageInformation, i.selectedGene, i.mutations, i.copyNumberAlterations);
+            const data = makeWaterfallPlotData(
+                i.axisData,
+                i.uniqueSampleKeyToSample,
+                i.coverageInformation,
+                i.selectedGene,
+                i.mutations,
+                i.copyNumberAlterations
+            );
             assert.equal(data.length, 1);
             assert.isUndefined(data[0].dispCna);
         });
 
-        it ("should return most severe mutation of user-selected gene", () => {
-
+        it('should return most severe mutation of user-selected gene', () => {
             const i = {
                 ...mockParams,
-                copyNumberAlterations: undefined
-            }
+                copyNumberAlterations: undefined,
+            };
 
-            const data = makeWaterfallPlotData(i.axisData, i.uniqueSampleKeyToSample, i.coverageInformation, i.selectedGene, i.mutations, i.copyNumberAlterations);
+            const data = makeWaterfallPlotData(
+                i.axisData,
+                i.uniqueSampleKeyToSample,
+                i.coverageInformation,
+                i.selectedGene,
+                i.mutations,
+                i.copyNumberAlterations
+            );
             assert.equal(data.length, 1);
-            assert.equal(data[0].dispMutationType!, "fusion");
+            assert.equal(data[0].dispMutationType!, 'fusion');
         });
 
-        it ("should return no mutation when user-selected gene has no mutations's", () => {
-
+        it("should return no mutation when user-selected gene has no mutations's", () => {
             const i = {
                 ...mockParams,
                 axisData: {
-                    datatype:"number",
-                    data:[
-                        { uniqueSampleKey:"sample2", value:1}
-                    ],
+                    datatype: 'number',
+                    data: [{ uniqueSampleKey: 'sample2', value: 1 }],
                 },
                 copyNumberAlterations: undefined,
-            }
+            };
 
-            const data = makeWaterfallPlotData(i.axisData, i.uniqueSampleKeyToSample, i.coverageInformation, i.selectedGene, i.mutations, i.copyNumberAlterations);
+            const data = makeWaterfallPlotData(
+                i.axisData,
+                i.uniqueSampleKeyToSample,
+                i.coverageInformation,
+                i.selectedGene,
+                i.mutations,
+                i.copyNumberAlterations
+            );
             assert.equal(data.length, 1);
             assert.isUndefined(data[0].dispMutationType);
         });
     });
 
-    describe("getMutationProfileDuplicateSamplesReport", ()=>{
-        let horzAxisDataWithDuplicates:any;
-        let vertAxisDataWithDuplicates:any;
-        let horzAxisData:any;
-        let vertAxisData:any;
+    describe('getMutationProfileDuplicateSamplesReport', () => {
+        let horzAxisDataWithDuplicates: any;
+        let vertAxisDataWithDuplicates: any;
+        let horzAxisData: any;
+        let vertAxisData: any;
 
-        before(()=>{
+        before(() => {
             horzAxisData = {
-                data: [{ uniqueSampleKey:"sample1", value:[0]}, { uniqueSampleKey:"sample2", value:[1]}, { uniqueSampleKey:"sample3", value:[3]}]
+                data: [
+                    { uniqueSampleKey: 'sample1', value: [0] },
+                    { uniqueSampleKey: 'sample2', value: [1] },
+                    { uniqueSampleKey: 'sample3', value: [3] },
+                ],
             };
             vertAxisData = {
-                data: [{ uniqueSampleKey:"sample1", value:[0]}, { uniqueSampleKey:"sample2", value:[3]}, { uniqueSampleKey:"sample3", value:[1]}]
+                data: [
+                    { uniqueSampleKey: 'sample1', value: [0] },
+                    { uniqueSampleKey: 'sample2', value: [3] },
+                    { uniqueSampleKey: 'sample3', value: [1] },
+                ],
             };
             horzAxisDataWithDuplicates = {
-                data: [{ uniqueSampleKey:"sample1", value:[0,1]}, { uniqueSampleKey:"sample2", value:[1]}, { uniqueSampleKey:"sample3", value:[1,2,3]}]
+                data: [
+                    { uniqueSampleKey: 'sample1', value: [0, 1] },
+                    { uniqueSampleKey: 'sample2', value: [1] },
+                    { uniqueSampleKey: 'sample3', value: [1, 2, 3] },
+                ],
             };
             vertAxisDataWithDuplicates = {
-                data: [{ uniqueSampleKey:"sample1", value:[0]}, { uniqueSampleKey:"sample2", value:[1,2,3,4]}, { uniqueSampleKey:"sample3", value:[1,2]}]
+                data: [
+                    { uniqueSampleKey: 'sample1', value: [0] },
+                    { uniqueSampleKey: 'sample2', value: [1, 2, 3, 4] },
+                    { uniqueSampleKey: 'sample3', value: [1, 2] },
+                ],
             };
         });
 
-        it ("gives the correct result with zero mutation profiles", ()=>{
-            assert.deepEqual(getMutationProfileDuplicateSamplesReport(
-                horzAxisData, vertAxisData, { dataType:CLIN_ATTR_DATA_TYPE }, {dataType: AlterationTypeConstants.COPY_NUMBER_ALTERATION}
-            ), { showMessage: false, numSamples: 0, numSurplusPoints: 0 });
+        it('gives the correct result with zero mutation profiles', () => {
+            assert.deepEqual(
+                getMutationProfileDuplicateSamplesReport(
+                    horzAxisData,
+                    vertAxisData,
+                    { dataType: CLIN_ATTR_DATA_TYPE },
+                    { dataType: AlterationTypeConstants.COPY_NUMBER_ALTERATION }
+                ),
+                { showMessage: false, numSamples: 0, numSurplusPoints: 0 }
+            );
 
-            assert.deepEqual(getMutationProfileDuplicateSamplesReport(
-                horzAxisDataWithDuplicates, vertAxisDataWithDuplicates, { dataType:CLIN_ATTR_DATA_TYPE }, {dataType: AlterationTypeConstants.COPY_NUMBER_ALTERATION}
-            ), { showMessage: false, numSamples: 0, numSurplusPoints: 0 });
-        });
-        it ("gives the correct result with one mutation profile", ()=>{
-            assert.deepEqual(getMutationProfileDuplicateSamplesReport(
-                horzAxisData, vertAxisData, { dataType:CLIN_ATTR_DATA_TYPE }, {dataType: AlterationTypeConstants.MUTATION_EXTENDED}
-            ), { showMessage: false, numSamples: 0, numSurplusPoints: 0 });
-
-            assert.deepEqual(getMutationProfileDuplicateSamplesReport(
-                horzAxisDataWithDuplicates, vertAxisDataWithDuplicates, { dataType:CLIN_ATTR_DATA_TYPE }, {dataType: AlterationTypeConstants.MUTATION_EXTENDED}
-            ), { showMessage: true, numSamples: 2, numSurplusPoints: 4 });
+            assert.deepEqual(
+                getMutationProfileDuplicateSamplesReport(
+                    horzAxisDataWithDuplicates,
+                    vertAxisDataWithDuplicates,
+                    { dataType: CLIN_ATTR_DATA_TYPE },
+                    { dataType: AlterationTypeConstants.COPY_NUMBER_ALTERATION }
+                ),
+                { showMessage: false, numSamples: 0, numSurplusPoints: 0 }
+            );
         });
-        it ("gives the correct result with two mutation profiles", ()=>{
-            assert.deepEqual(getMutationProfileDuplicateSamplesReport(
-                horzAxisData, vertAxisData, { dataType:AlterationTypeConstants.MUTATION_EXTENDED }, {dataType: AlterationTypeConstants.MUTATION_EXTENDED}
-            ), { showMessage: false, numSamples: 0, numSurplusPoints: 0 });
+        it('gives the correct result with one mutation profile', () => {
+            assert.deepEqual(
+                getMutationProfileDuplicateSamplesReport(
+                    horzAxisData,
+                    vertAxisData,
+                    { dataType: CLIN_ATTR_DATA_TYPE },
+                    { dataType: AlterationTypeConstants.MUTATION_EXTENDED }
+                ),
+                { showMessage: false, numSamples: 0, numSurplusPoints: 0 }
+            );
 
-            assert.deepEqual(getMutationProfileDuplicateSamplesReport(
-                horzAxisDataWithDuplicates, vertAxisData, { dataType:AlterationTypeConstants.MUTATION_EXTENDED }, {dataType: AlterationTypeConstants.MUTATION_EXTENDED}
-            ), { showMessage: true, numSamples: 2, numSurplusPoints: 3 });
+            assert.deepEqual(
+                getMutationProfileDuplicateSamplesReport(
+                    horzAxisDataWithDuplicates,
+                    vertAxisDataWithDuplicates,
+                    { dataType: CLIN_ATTR_DATA_TYPE },
+                    { dataType: AlterationTypeConstants.MUTATION_EXTENDED }
+                ),
+                { showMessage: true, numSamples: 2, numSurplusPoints: 4 }
+            );
+        });
+        it('gives the correct result with two mutation profiles', () => {
+            assert.deepEqual(
+                getMutationProfileDuplicateSamplesReport(
+                    horzAxisData,
+                    vertAxisData,
+                    { dataType: AlterationTypeConstants.MUTATION_EXTENDED },
+                    { dataType: AlterationTypeConstants.MUTATION_EXTENDED }
+                ),
+                { showMessage: false, numSamples: 0, numSurplusPoints: 0 }
+            );
 
-            assert.deepEqual(getMutationProfileDuplicateSamplesReport(
-                horzAxisDataWithDuplicates, vertAxisDataWithDuplicates, { dataType:AlterationTypeConstants.MUTATION_EXTENDED }, {dataType: AlterationTypeConstants.MUTATION_EXTENDED}
-            ), { showMessage: true, numSamples: 3, numSurplusPoints: 9 });
+            assert.deepEqual(
+                getMutationProfileDuplicateSamplesReport(
+                    horzAxisDataWithDuplicates,
+                    vertAxisData,
+                    { dataType: AlterationTypeConstants.MUTATION_EXTENDED },
+                    { dataType: AlterationTypeConstants.MUTATION_EXTENDED }
+                ),
+                { showMessage: true, numSamples: 2, numSurplusPoints: 3 }
+            );
 
+            assert.deepEqual(
+                getMutationProfileDuplicateSamplesReport(
+                    horzAxisDataWithDuplicates,
+                    vertAxisDataWithDuplicates,
+                    { dataType: AlterationTypeConstants.MUTATION_EXTENDED },
+                    { dataType: AlterationTypeConstants.MUTATION_EXTENDED }
+                ),
+                { showMessage: true, numSamples: 3, numSurplusPoints: 9 }
+            );
         });
     });
 
-    describe("makeAxisDataPromise_Molecular_MakeMutationData", ()=>{
-        let mutations:Pick<Mutation, "uniqueSampleKey"|"proteinChange"|"mutationType">[];
-        let coverageInformation:CoverageInformation;
-        let samples:Pick<Sample, "uniqueSampleKey">[];
-        let molecularProfileId:string;
-
-        before(()=>{
-            molecularProfileId = "mutations";
-            mutations = [{
-                uniqueSampleKey: "sample1",
-                proteinChange: "",
-                mutationType: "missense"
-            },{
-                uniqueSampleKey: "sample1",
-                proteinChange: "",
-                mutationType: "missense"
-            },{
-                uniqueSampleKey: "sample2",
-                proteinChange: "",
-                mutationType: "in_frame_del"
-            },{
-                uniqueSampleKey: "sample2",
-                proteinChange: "",
-                mutationType:"nonsense"
-            },{
-                uniqueSampleKey: "sample3",
-                proteinChange: "",
-                mutationType:"fusion"
-            }];
+    describe('makeAxisDataPromise_Molecular_MakeMutationData', () => {
+        let mutations: Pick<
+            Mutation,
+            'uniqueSampleKey' | 'proteinChange' | 'mutationType'
+        >[];
+        let coverageInformation: CoverageInformation;
+        let samples: Pick<Sample, 'uniqueSampleKey'>[];
+        let molecularProfileId: string;
+
+        before(() => {
+            molecularProfileId = 'mutations';
+            mutations = [
+                {
+                    uniqueSampleKey: 'sample1',
+                    proteinChange: '',
+                    mutationType: 'missense',
+                },
+                {
+                    uniqueSampleKey: 'sample1',
+                    proteinChange: '',
+                    mutationType: 'missense',
+                },
+                {
+                    uniqueSampleKey: 'sample2',
+                    proteinChange: '',
+                    mutationType: 'in_frame_del',
+                },
+                {
+                    uniqueSampleKey: 'sample2',
+                    proteinChange: '',
+                    mutationType: 'nonsense',
+                },
+                {
+                    uniqueSampleKey: 'sample3',
+                    proteinChange: '',
+                    mutationType: 'fusion',
+                },
+            ];
             coverageInformation = {
                 samples: {
                     sample1: {
-                        byGene: {"BRCA1":[{molecularProfileId} as any]},
+                        byGene: { BRCA1: [{ molecularProfileId } as any] },
                         allGenes: [],
-                        notProfiledByGene:{},
-                        notProfiledAllGenes:[]
+                        notProfiledByGene: {},
+                        notProfiledAllGenes: [],
                     },
                     sample2: {
                         byGene: {},
-                        allGenes: [{molecularProfileId} as any],
-                        notProfiledByGene:{},
-                        notProfiledAllGenes:[]
+                        allGenes: [{ molecularProfileId } as any],
+                        notProfiledByGene: {},
+                        notProfiledAllGenes: [],
                     },
                     sample3: {
-                        byGene: {"BRCA1":[{molecularProfileId} as any]},
+                        byGene: { BRCA1: [{ molecularProfileId } as any] },
                         allGenes: [],
-                        notProfiledByGene:{},
-                        notProfiledAllGenes:[]
+                        notProfiledByGene: {},
+                        notProfiledAllGenes: [],
                     },
                     sample4: {
                         byGene: {},
-                        allGenes: [{molecularProfileId} as any],
-                        notProfiledByGene:{},
-                        notProfiledAllGenes:[]
+                        allGenes: [{ molecularProfileId } as any],
+                        notProfiledByGene: {},
+                        notProfiledAllGenes: [],
                     },
                     sample5: {
                         byGene: {},
                         allGenes: [],
-                        notProfiledByGene:{"BRCA1":[{molecularProfileId} as any]},
-                        notProfiledAllGenes:[]
+                        notProfiledByGene: {
+                            BRCA1: [{ molecularProfileId } as any],
+                        },
+                        notProfiledAllGenes: [],
                     },
                     sample6: {
                         byGene: {},
                         allGenes: [],
-                        notProfiledByGene:{},
-                        notProfiledAllGenes:[{molecularProfileId} as any]
-                    }
+                        notProfiledByGene: {},
+                        notProfiledAllGenes: [{ molecularProfileId } as any],
+                    },
                 },
-                patients: {
-                }
+                patients: {},
             };
             samples = [
-                { uniqueSampleKey: "sample1" },{ uniqueSampleKey: "sample2" },{ uniqueSampleKey: "sample3" },
-                { uniqueSampleKey: "sample4" },{ uniqueSampleKey: "sample5" }, { uniqueSampleKey: "sample6" }
+                { uniqueSampleKey: 'sample1' },
+                { uniqueSampleKey: 'sample2' },
+                { uniqueSampleKey: 'sample3' },
+                { uniqueSampleKey: 'sample4' },
+                { uniqueSampleKey: 'sample5' },
+                { uniqueSampleKey: 'sample6' },
             ];
         });
 
-        it("gives the correct result with no mutations", ()=>{
+        it('gives the correct result with no mutations', () => {
             assert.deepEqual(
                 makeAxisDataPromise_Molecular_MakeMutationData(
-                    molecularProfileId, "BRCA1", [], {} as any, MutationCountBy.MutationType, []
+                    molecularProfileId,
+                    'BRCA1',
+                    [],
+                    {} as any,
+                    MutationCountBy.MutationType,
+                    []
                 ),
                 {
-                    data:[],
-                    hugoGeneSymbol: "BRCA1",
-                    datatype: "string",
-                    categoryOrder: mutTypeCategoryOrder
+                    data: [],
+                    hugoGeneSymbol: 'BRCA1',
+                    datatype: 'string',
+                    categoryOrder: mutTypeCategoryOrder,
                 }
             );
         });
-        it("gives the correct result for mutated vs wild type data", ()=>{
+        it('gives the correct result for mutated vs wild type data', () => {
             assert.deepEqual(
                 makeAxisDataPromise_Molecular_MakeMutationData(
-                    molecularProfileId, "BRCA1", mutations, coverageInformation, MutationCountBy.MutatedVsWildType, samples
+                    molecularProfileId,
+                    'BRCA1',
+                    mutations,
+                    coverageInformation,
+                    MutationCountBy.MutatedVsWildType,
+                    samples
                 ),
                 {
-                    data:[
-                        {uniqueSampleKey:"sample1", value:MUT_PROFILE_COUNT_MUTATED},
-                        {uniqueSampleKey:"sample2", value:MUT_PROFILE_COUNT_MUTATED},
-                        {uniqueSampleKey:"sample3", value:MUT_PROFILE_COUNT_MUTATED},
-                        {uniqueSampleKey:"sample4", value:MUT_PROFILE_COUNT_NOT_MUTATED},
-                        {uniqueSampleKey:"sample5", value:MUT_PROFILE_COUNT_NOT_PROFILED},
-                        {uniqueSampleKey:"sample6", value:MUT_PROFILE_COUNT_NOT_PROFILED},
+                    data: [
+                        {
+                            uniqueSampleKey: 'sample1',
+                            value: MUT_PROFILE_COUNT_MUTATED,
+                        },
+                        {
+                            uniqueSampleKey: 'sample2',
+                            value: MUT_PROFILE_COUNT_MUTATED,
+                        },
+                        {
+                            uniqueSampleKey: 'sample3',
+                            value: MUT_PROFILE_COUNT_MUTATED,
+                        },
+                        {
+                            uniqueSampleKey: 'sample4',
+                            value: MUT_PROFILE_COUNT_NOT_MUTATED,
+                        },
+                        {
+                            uniqueSampleKey: 'sample5',
+                            value: MUT_PROFILE_COUNT_NOT_PROFILED,
+                        },
+                        {
+                            uniqueSampleKey: 'sample6',
+                            value: MUT_PROFILE_COUNT_NOT_PROFILED,
+                        },
                     ],
-                    hugoGeneSymbol: "BRCA1",
-                    datatype: "string",
-                    categoryOrder: mutVsWildCategoryOrder
+                    hugoGeneSymbol: 'BRCA1',
+                    datatype: 'string',
+                    categoryOrder: mutVsWildCategoryOrder,
                 }
             );
         });
-        it("gives the correct result for mutation type data", ()=>{
+        it('gives the correct result for mutation type data', () => {
             assert.deepEqual(
                 makeAxisDataPromise_Molecular_MakeMutationData(
-                    molecularProfileId, "BRCA1", mutations, coverageInformation, MutationCountBy.MutationType, samples
+                    molecularProfileId,
+                    'BRCA1',
+                    mutations,
+                    coverageInformation,
+                    MutationCountBy.MutationType,
+                    samples
                 ),
                 {
-                    data:[
-                        {uniqueSampleKey:"sample1", value:[mutationTypeToDisplayName.missense]},
-                        {uniqueSampleKey:"sample2", value:MUT_PROFILE_COUNT_MULTIPLE},
-                        {uniqueSampleKey:"sample3", value:[mutationTypeToDisplayName.fusion]},
-                        {uniqueSampleKey:"sample4", value:MUT_PROFILE_COUNT_NOT_MUTATED},
-                        {uniqueSampleKey:"sample5", value:MUT_PROFILE_COUNT_NOT_PROFILED},
-                        {uniqueSampleKey:"sample6", value:MUT_PROFILE_COUNT_NOT_PROFILED},
+                    data: [
+                        {
+                            uniqueSampleKey: 'sample1',
+                            value: [mutationTypeToDisplayName.missense],
+                        },
+                        {
+                            uniqueSampleKey: 'sample2',
+                            value: MUT_PROFILE_COUNT_MULTIPLE,
+                        },
+                        {
+                            uniqueSampleKey: 'sample3',
+                            value: [mutationTypeToDisplayName.fusion],
+                        },
+                        {
+                            uniqueSampleKey: 'sample4',
+                            value: MUT_PROFILE_COUNT_NOT_MUTATED,
+                        },
+                        {
+                            uniqueSampleKey: 'sample5',
+                            value: MUT_PROFILE_COUNT_NOT_PROFILED,
+                        },
+                        {
+                            uniqueSampleKey: 'sample6',
+                            value: MUT_PROFILE_COUNT_NOT_PROFILED,
+                        },
                     ],
-                    hugoGeneSymbol: "BRCA1",
-                    datatype: "string",
-                    categoryOrder: mutTypeCategoryOrder
+                    hugoGeneSymbol: 'BRCA1',
+                    datatype: 'string',
+                    categoryOrder: mutTypeCategoryOrder,
                 }
             );
         });
     });
 
     describe('makeAxisLogScaleFunction', () => {
-
         it('should return log2-transformation function for non treatment data', () => {
-            const axisMenuSelection = { 
+            const axisMenuSelection = ({
                 dataType: AlterationTypeConstants.MRNA_EXPRESSION,
-                logScale: true
-            } as any as AxisMenuSelection;
+                logScale: true,
+            } as any) as AxisMenuSelection;
             const funcs = makeAxisLogScaleFunction(axisMenuSelection);
             assert.equal(funcs!.fLogScale(2), 1);
             assert.equal(funcs!.fInvLogScale(1), 2);
             assert.equal(funcs!.fLogScale(8), 3);
             assert.equal(funcs!.fInvLogScale(3), 8);
         });
-        
+
         it('should return log10-transformation function for non treatment data', () => {
-            const axisMenuSelection = { 
+            const axisMenuSelection = ({
                 dataType: GenericAssayTypeConstants.TREATMENT_RESPONSE,
-                logScale: true
-            } as any as AxisMenuSelection;
+                logScale: true,
+            } as any) as AxisMenuSelection;
             const funcs = makeAxisLogScaleFunction(axisMenuSelection);
             assert.equal(funcs!.fLogScale(10), 1);
             assert.equal(funcs!.fInvLogScale(1), 10);
             assert.equal(funcs!.fLogScale(100), 2);
             assert.equal(funcs!.fInvLogScale(2), 100);
         });
-        
+
         it('should apply offset before log10-transformation for treatment data', () => {
-            const axisMenuSelection = { 
+            const axisMenuSelection = ({
                 dataType: GenericAssayTypeConstants.TREATMENT_RESPONSE,
-                logScale: true
-            } as any as AxisMenuSelection;
+                logScale: true,
+            } as any) as AxisMenuSelection;
             const funcs = makeAxisLogScaleFunction(axisMenuSelection);
             assert.equal(funcs!.fLogScale(0, 10), 1);
             assert.equal(funcs!.fLogScale(90, 10), 2);
             assert.equal(funcs!.fInvLogScale(11, 10), 10);
         });
-
     });
 
     describe('axisHasNegativeNumbers', () => {
-
         it('should return false when data is not numerical', () => {
-            const axisData = {
-                datatype: "string",
-                data: [{value:"category2"}, {value:"category1"}]
-            } as any as IAxisData;
-            assert.isFalse(axisHasNegativeNumbers(axisData)); 
+            const axisData = ({
+                datatype: 'string',
+                data: [{ value: 'category2' }, { value: 'category1' }],
+            } as any) as IAxisData;
+            assert.isFalse(axisHasNegativeNumbers(axisData));
         });
 
         it('should return false when data consists of positive numbers', () => {
-            const axisData = {
-                datatype: "number",
-                data: [{value:1}, {value:2}]
-            } as any as IAxisData;
-            assert.isFalse(axisHasNegativeNumbers(axisData)); 
+            const axisData = ({
+                datatype: 'number',
+                data: [{ value: 1 }, { value: 2 }],
+            } as any) as IAxisData;
+            assert.isFalse(axisHasNegativeNumbers(axisData));
         });
 
         it('should return true when data has negative numbers', () => {
-            const axisData = {
-                datatype: "number",
-                data: [{value:1}, {value:-2}]
-            } as any as IAxisData;
-            assert.isTrue(axisHasNegativeNumbers(axisData)); 
+            const axisData = ({
+                datatype: 'number',
+                data: [{ value: 1 }, { value: -2 }],
+            } as any) as IAxisData;
+            assert.isTrue(axisHasNegativeNumbers(axisData));
         });
 
         it('should return false when no data points are passed', () => {
-            const axisData = {
-                datatype: "number",
-                data: []
-            } as any as IAxisData;
-            assert.isFalse(axisHasNegativeNumbers(axisData)); 
+            const axisData = ({
+                datatype: 'number',
+                data: [],
+            } as any) as IAxisData;
+            assert.isFalse(axisHasNegativeNumbers(axisData));
         });
-
     });
 
     describe('getWaterfallPlotDownloadData', () => {
-
         const mockProps = {
-            data: [
+            data: ([
                 {
                     sampleId: 'sample1',
                     value: 1,
-                    mutations: [
-                        {entrezGeneId: '1234', proteinChange: "changeA"},
-                        {entrezGeneId: '1234', proteinChange: "changeB"}
-                    ] as any as AnnotatedMutation
+                    mutations: ([
+                        { entrezGeneId: '1234', proteinChange: 'changeA' },
+                        { entrezGeneId: '1234', proteinChange: 'changeB' },
+                    ] as any) as AnnotatedMutation,
                 },
                 {
                     sampleId: 'sample2',
-                    value: 2, 
-                    mutations: [
-                        {entrezGeneId: '1234', proteinChange: "changeC"},
-                        {entrezGeneId: '1234', proteinChange: "changeD"}
-                    ] as any as AnnotatedMutation
-                }
-         ] as any as IWaterfallPlotData[],
-         sortOrder: "ASC",
-         pivotThreshold: 0.1,
-         axisLabel: "profile1",
-         entrezGeneIdToGene: { 1234: {entrezGeneId: '1234', hugoGeneSymbol: 'GeneA' } as any as Gene }
-        }
+                    value: 2,
+                    mutations: ([
+                        { entrezGeneId: '1234', proteinChange: 'changeC' },
+                        { entrezGeneId: '1234', proteinChange: 'changeD' },
+                    ] as any) as AnnotatedMutation,
+                },
+            ] as any) as IWaterfallPlotData[],
+            sortOrder: 'ASC',
+            pivotThreshold: 0.1,
+            axisLabel: 'profile1',
+            entrezGeneIdToGene: {
+                1234: ({
+                    entrezGeneId: '1234',
+                    hugoGeneSymbol: 'GeneA',
+                } as any) as Gene,
+            },
+        };
 
         const text = getWaterfallPlotDownloadData(
             mockProps.data,
@@ -538,8 +787,8 @@ describe("PlotsTabUtils", ()=>{
             mockProps.entrezGeneIdToGene
         );
 
-        const elements = _.map(text.split('\n'), (d)=>d.split('\t'));
-        
+        const elements = _.map(text.split('\n'), d => d.split('\t'));
+
         it('should sort data points in ascending order', () => {
             assert.equal(elements.length, 3);
             assert.equal(elements[1][0], 'sample1');
@@ -547,11 +796,10 @@ describe("PlotsTabUtils", ()=>{
         });
 
         it('should sort data points in descending order', () => {
-
             const i = {
                 ...mockProps,
-                sortOrder: "DESC"
-            }
+                sortOrder: 'DESC',
+            };
 
             const myText = getWaterfallPlotDownloadData(
                 i.data,
@@ -561,7 +809,7 @@ describe("PlotsTabUtils", ()=>{
                 i.entrezGeneIdToGene
             );
 
-            const myElements = _.map(myText.split('\n'), (d)=>d.split('\t'));
+            const myElements = _.map(myText.split('\n'), d => d.split('\t'));
 
             assert.equal(myElements.length, 3);
             assert.equal(myElements[1][0], 'sample2');
@@ -570,32 +818,29 @@ describe("PlotsTabUtils", ()=>{
 
         it('should add mutation summary when mutations are known for sample', () => {
             assert.equal(elements[0].length, 5);
-            assert.equal(elements[1][4], "GeneA: changeA, changeB");
-            assert.equal(elements[2][4], "GeneA: changeC, changeD");
+            assert.equal(elements[1][4], 'GeneA: changeA, changeB');
+            assert.equal(elements[2][4], 'GeneA: changeC, changeD');
         });
-
     });
 
     describe('limitValueTypes', () => {
-        
         it('returns unique list of concatenated thresholdTypes and values', () => {
             const data = [
-                { uniqueSampleKey:'A', value:5, thresholdType:undefined},
-                { uniqueSampleKey:'B', value:6, thresholdType:''},
-                { uniqueSampleKey:'C', value:7, thresholdType:'>'},
-                { uniqueSampleKey:'D', value:8, thresholdType:'>'},
+                { uniqueSampleKey: 'A', value: 5, thresholdType: undefined },
+                { uniqueSampleKey: 'B', value: 6, thresholdType: '' },
+                { uniqueSampleKey: 'C', value: 7, thresholdType: '>' },
+                { uniqueSampleKey: 'D', value: 8, thresholdType: '>' },
             ];
             const types = getLimitValues(data);
-            assert.deepEqual(types, ['>7.00','>8.00']);
+            assert.deepEqual(types, ['>7.00', '>8.00']);
         });
-    
+
         it('returns empty array when multiple values in dattum', () => {
             const data = [
-                { uniqueSampleKey:'A', value:[5,5], thresholdType:'>'}
+                { uniqueSampleKey: 'A', value: [5, 5], thresholdType: '>' },
             ];
             const types = getLimitValues(data);
             assert.deepEqual(types, []);
         });
     });
-
-});
\ No newline at end of file
+});
diff --git a/src/pages/resultsView/plots/PlotsTabUtils.tsx b/src/pages/resultsView/plots/PlotsTabUtils.tsx
index 717edf1c387..9926f9b41a3 100644
--- a/src/pages/resultsView/plots/PlotsTabUtils.tsx
+++ b/src/pages/resultsView/plots/PlotsTabUtils.tsx
@@ -1,79 +1,115 @@
-import { AxisMenuSelection, MutationCountBy, NONE_SELECTED_OPTION_NUMERICAL_VALUE, NONE_SELECTED_OPTION_STRING_VALUE, ViewType, PlotType, UtilitiesMenuSelection } from "./PlotsTab";
-import {MobxPromise} from "mobxpromise";
 import {
-    ClinicalAttribute, ClinicalData, Gene, MolecularProfile, Mutation, NumericGeneMolecularData,
-    Sample
-} from "../../../shared/api/generated/CBioPortalAPI";
-import {remoteData, stringListToIndexSet} from "cbioportal-frontend-commons";
-import MobxPromiseCache from "../../../shared/lib/MobxPromiseCache";
-import {getSampleViewUrl} from "../../../shared/api/urls";
-import _ from "lodash";
-import * as React from "react";
+    AxisMenuSelection,
+    MutationCountBy,
+    NONE_SELECTED_OPTION_NUMERICAL_VALUE,
+    NONE_SELECTED_OPTION_STRING_VALUE,
+    ViewType,
+    PlotType,
+    UtilitiesMenuSelection,
+} from './PlotsTab';
+import { MobxPromise } from 'mobxpromise';
 import {
-    getOncoprintMutationType, OncoprintMutationType,
-    selectDisplayValue
-} from "../../../shared/components/oncoprint/DataUtils";
+    ClinicalAttribute,
+    ClinicalData,
+    Gene,
+    MolecularProfile,
+    Mutation,
+    NumericGeneMolecularData,
+    Sample,
+} from '../../../shared/api/generated/CBioPortalAPI';
+import { remoteData, stringListToIndexSet } from 'cbioportal-frontend-commons';
+import MobxPromiseCache from '../../../shared/lib/MobxPromiseCache';
+import { getSampleViewUrl } from '../../../shared/api/urls';
+import _ from 'lodash';
+import * as React from 'react';
+import {
+    getOncoprintMutationType,
+    OncoprintMutationType,
+    selectDisplayValue,
+} from '../../../shared/components/oncoprint/DataUtils';
 import {
     CNA_COLOR_AMP,
     CNA_COLOR_HOMDEL,
     DEFAULT_GREY,
-    MUT_COLOR_FUSION, MUT_COLOR_INFRAME, MUT_COLOR_INFRAME_PASSENGER,
-    MUT_COLOR_MISSENSE, MUT_COLOR_MISSENSE_PASSENGER, MUT_COLOR_OTHER, MUT_COLOR_PROMOTER, MUT_COLOR_TRUNC,
-    MUT_COLOR_TRUNC_PASSENGER
-} from "shared/lib/Colors";
-import {CoverageInformation} from "../ResultsViewPageStoreUtils";
-import {IBoxScatterPlotData} from "../../../shared/components/plots/BoxScatterPlot";
-import {AlterationTypeConstants, GenericAssayTypeConstants, AnnotatedMutation, AnnotatedNumericGeneMolecularData} from "../ResultsViewPageStore";
-import numeral from "numeral";
-import GenesetMolecularDataCache from "../../../shared/cache/GenesetMolecularDataCache";
-import { GenesetMolecularData } from "../../../shared/api/generated/CBioPortalAPIInternal";
-import {MUTATION_COUNT} from "../../studyView/StudyViewPageStore";
-import ClinicalDataCache from "../../../shared/cache/ClinicalDataCache";
-import TreatmentMolecularDataCache, { TreatmentMolecularDataEnhanced } from "../../../shared/cache/TreatmentMolecularDataCache";
-import { getJitterForCase, dataPointIsLimited } from "../../../shared/components/plots/PlotUtils";
-import { isSampleProfiled } from "../../../shared/lib/isSampleProfiled";
-
-
-export const CLIN_ATTR_DATA_TYPE = "clinical_attribute";
-export const GENESET_DATA_TYPE = "GENESET_SCORE";
-export const dataTypeToDisplayType:{[s:string]:string} = {
-    [AlterationTypeConstants.MUTATION_EXTENDED]: "Mutation",
-    [AlterationTypeConstants.COPY_NUMBER_ALTERATION]: "Copy Number",
-    [AlterationTypeConstants.MRNA_EXPRESSION]: "mRNA",
-    [AlterationTypeConstants.PROTEIN_LEVEL]: "Protein Level",
-    [AlterationTypeConstants.METHYLATION]: "DNA Methylation",
-    [CLIN_ATTR_DATA_TYPE]:"Clinical Attribute",
-    [GENESET_DATA_TYPE]:"Gene Sets",
-    [GenericAssayTypeConstants.TREATMENT_RESPONSE]: "Treatment Response"
+    MUT_COLOR_FUSION,
+    MUT_COLOR_INFRAME,
+    MUT_COLOR_INFRAME_PASSENGER,
+    MUT_COLOR_MISSENSE,
+    MUT_COLOR_MISSENSE_PASSENGER,
+    MUT_COLOR_OTHER,
+    MUT_COLOR_PROMOTER,
+    MUT_COLOR_TRUNC,
+    MUT_COLOR_TRUNC_PASSENGER,
+} from 'shared/lib/Colors';
+import { CoverageInformation } from '../ResultsViewPageStoreUtils';
+import { IBoxScatterPlotData } from '../../../shared/components/plots/BoxScatterPlot';
+import {
+    AlterationTypeConstants,
+    GenericAssayTypeConstants,
+    AnnotatedMutation,
+    AnnotatedNumericGeneMolecularData,
+} from '../ResultsViewPageStore';
+import numeral from 'numeral';
+import GenesetMolecularDataCache from '../../../shared/cache/GenesetMolecularDataCache';
+import { GenesetMolecularData } from '../../../shared/api/generated/CBioPortalAPIInternal';
+import { MUTATION_COUNT } from '../../studyView/StudyViewPageStore';
+import ClinicalDataCache from '../../../shared/cache/ClinicalDataCache';
+import TreatmentMolecularDataCache, {
+    TreatmentMolecularDataEnhanced,
+} from '../../../shared/cache/TreatmentMolecularDataCache';
+import {
+    getJitterForCase,
+    dataPointIsLimited,
+} from '../../../shared/components/plots/PlotUtils';
+import { isSampleProfiled } from '../../../shared/lib/isSampleProfiled';
+
+export const CLIN_ATTR_DATA_TYPE = 'clinical_attribute';
+export const GENESET_DATA_TYPE = 'GENESET_SCORE';
+export const dataTypeToDisplayType: { [s: string]: string } = {
+    [AlterationTypeConstants.MUTATION_EXTENDED]: 'Mutation',
+    [AlterationTypeConstants.COPY_NUMBER_ALTERATION]: 'Copy Number',
+    [AlterationTypeConstants.MRNA_EXPRESSION]: 'mRNA',
+    [AlterationTypeConstants.PROTEIN_LEVEL]: 'Protein Level',
+    [AlterationTypeConstants.METHYLATION]: 'DNA Methylation',
+    [CLIN_ATTR_DATA_TYPE]: 'Clinical Attribute',
+    [GENESET_DATA_TYPE]: 'Gene Sets',
+    [GenericAssayTypeConstants.TREATMENT_RESPONSE]: 'Treatment Response',
 };
 
-export const mutationTypeToDisplayName:{[oncoprintMutationType:string]:string} = {
-    "missense":"Missense",
-    "inframe":"Inframe",
-    "fusion":"Fusion",
-    "promoter":"Promoter",
-    "trunc":"Truncating",
-    "other":"Other"
+export const mutationTypeToDisplayName: {
+    [oncoprintMutationType: string]: string;
+} = {
+    missense: 'Missense',
+    inframe: 'Inframe',
+    fusion: 'Fusion',
+    promoter: 'Promoter',
+    trunc: 'Truncating',
+    other: 'Other',
 };
 
 export const dataTypeDisplayOrder = [
-    CLIN_ATTR_DATA_TYPE, AlterationTypeConstants.MUTATION_EXTENDED, AlterationTypeConstants.COPY_NUMBER_ALTERATION,
-    AlterationTypeConstants.MRNA_EXPRESSION, GENESET_DATA_TYPE, AlterationTypeConstants.PROTEIN_LEVEL,
-    AlterationTypeConstants.METHYLATION, ..._.keys(GenericAssayTypeConstants)
+    CLIN_ATTR_DATA_TYPE,
+    AlterationTypeConstants.MUTATION_EXTENDED,
+    AlterationTypeConstants.COPY_NUMBER_ALTERATION,
+    AlterationTypeConstants.MRNA_EXPRESSION,
+    GENESET_DATA_TYPE,
+    AlterationTypeConstants.PROTEIN_LEVEL,
+    AlterationTypeConstants.METHYLATION,
+    ..._.keys(GenericAssayTypeConstants),
 ];
-export function sortMolecularProfilesForDisplay(profiles:MolecularProfile[]) {
+export function sortMolecularProfilesForDisplay(profiles: MolecularProfile[]) {
     if (!profiles.length) {
         return [];
     }
 
     const type = profiles[0].molecularAlterationType;
-    let sortBy:(p:MolecularProfile)=>any;
+    let sortBy: (p: MolecularProfile) => any;
     switch (type) {
         case AlterationTypeConstants.COPY_NUMBER_ALTERATION:
-            sortBy = p=>(p.datatype === "DISCRETE" ? 0 : 1);
+            sortBy = p => (p.datatype === 'DISCRETE' ? 0 : 1);
             break;
         default:
-            sortBy = p=>p.name;
+            sortBy = p => p.name;
             break;
     }
     return _.sortBy<MolecularProfile>(profiles, sortBy);
@@ -86,115 +122,135 @@ export const WATERFALLPLOT_BASE_SIDELENGTH = 480;
 export const WATERFALLPLOT_SIDELENGTH_SAMPLE_MULTIPLICATION_FACTOR = 1.6;
 
 export interface IAxisData {
-    data:{
-        uniqueSampleKey:string;
-        value:string|number|(string[])|(number[]); // if theres a list, then we'll make one data point per value
+    data: {
+        uniqueSampleKey: string;
+        value: string | number | (string[]) | (number[]); // if theres a list, then we'll make one data point per value
     }[];
-    hugoGeneSymbol?:string;
-    datatype:string;//"string" or "number"
-};
+    hugoGeneSymbol?: string;
+    datatype: string; //"string" or "number"
+}
 
 export interface IStringAxisData {
-    data:{
-        uniqueSampleKey:string;
-        value:string | (string[]);
-        thresholdType?:'>'|'<'|undefined;
+    data: {
+        uniqueSampleKey: string;
+        value: string | (string[]);
+        thresholdType?: '>' | '<' | undefined;
     }[];
-    categoryOrder?:string[];
-    hugoGeneSymbol?:string;
-    datatype:string;
-};
+    categoryOrder?: string[];
+    hugoGeneSymbol?: string;
+    datatype: string;
+}
 export interface INumberAxisData {
-    data:{
-        uniqueSampleKey:string;
-        value:number | (number[]);
-        thresholdType?:'>'|'<'|undefined;
+    data: {
+        uniqueSampleKey: string;
+        value: number | (number[]);
+        thresholdType?: '>' | '<' | undefined;
     }[];
-    hugoGeneSymbol?:string;
-    datatype:string;
+    hugoGeneSymbol?: string;
+    datatype: string;
 }
 
 export enum MutationSummary {
-    Neither="Neither", Both="Both", One="One"
+    Neither = 'Neither',
+    Both = 'Both',
+    One = 'One',
 }
 
-const NOT_PROFILED_MUTATION_LEGEND_LABEL = ["Not profiled","for mutations"];
-const NOT_PROFILED_CNA_LEGEND_LABEL = ["Not profiled", "for CNA"];
-const MUTATION_TYPE_NOT_PROFILED = "not_profiled_mutation";
-const MUTATION_TYPE_NOT_MUTATED = "not_mutated";
-const CNA_TYPE_NOT_PROFILED = "not_profiled_cna";
-const CNA_TYPE_NO_DATA = "not_profiled_cna";
+const NOT_PROFILED_MUTATION_LEGEND_LABEL = ['Not profiled', 'for mutations'];
+const NOT_PROFILED_CNA_LEGEND_LABEL = ['Not profiled', 'for CNA'];
+const MUTATION_TYPE_NOT_PROFILED = 'not_profiled_mutation';
+const MUTATION_TYPE_NOT_MUTATED = 'not_mutated';
+const CNA_TYPE_NOT_PROFILED = 'not_profiled_cna';
+const CNA_TYPE_NO_DATA = 'not_profiled_cna';
 
-// this interface contains all attributes needed to provide correct styling of 
+// this interface contains all attributes needed to provide correct styling of
 // graph elements (points, bars, ...)
 export interface IPlotSampleData {
-    uniqueSampleKey:string;
-    sampleId:string;
-    studyId:string;
-    dispCna?:AnnotatedNumericGeneMolecularData;
-    dispMutationType?:OncoprintMutationType;
-    dispMutationSummary?:MutationSummary;
-    profiledCna?:boolean;
-    profiledMutations?:boolean;
+    uniqueSampleKey: string;
+    sampleId: string;
+    studyId: string;
+    dispCna?: AnnotatedNumericGeneMolecularData;
+    dispMutationType?: OncoprintMutationType;
+    dispMutationSummary?: MutationSummary;
+    profiledCna?: boolean;
+    profiledMutations?: boolean;
     mutations: AnnotatedMutation[];
     copyNumberAlterations: AnnotatedNumericGeneMolecularData[];
 }
 
 export interface IThreshold1D {
-    thresholdType?:'>'|'<'|undefined;
+    thresholdType?: '>' | '<' | undefined;
 }
 export interface IThreshold2D {
-    xThresholdType?: '>'|'<'|undefined;
-    yThresholdType?: '>'|'<'|undefined;
+    xThresholdType?: '>' | '<' | undefined;
+    yThresholdType?: '>' | '<' | undefined;
 }
 
 export interface IValue1D {
-    value:number;
+    value: number;
 }
 
 export interface IValue2D {
-    x:number;
-    y:number;
+    x: number;
+    y: number;
 }
-export interface IBoxScatterPlotPoint extends IValue1D, IThreshold1D, IPlotSampleData, IThreshold1D {
-    category:string;
-    jitter:number;
+export interface IBoxScatterPlotPoint
+    extends IValue1D,
+        IThreshold1D,
+        IPlotSampleData,
+        IThreshold1D {
+    category: string;
+    jitter: number;
 }
 
-export interface IScatterPlotData extends IPlotSampleData, IValue2D, IThreshold2D {};
-export interface IWaterfallPlotData extends IPlotSampleData, IValue1D, IThreshold1D {};
+export interface IScatterPlotData
+    extends IPlotSampleData,
+        IValue2D,
+        IThreshold2D {}
+export interface IWaterfallPlotData
+    extends IPlotSampleData,
+        IValue1D,
+        IThreshold1D {}
 
 export interface IAxisLogScaleParams {
-    label:string;
+    label: string;
 
     // Function for transforming `number` into its log-scale representation
     // `offset` is a constant added to the value before transformation (used
     // for transformation of data sets with negative numbers)
-    fLogScale:((x:number, offset?:number)=>number);
+    fLogScale: (x: number, offset?: number) => number;
 
     // Function for back-transforming `number` transformed with fLogScale
     // function into its linear-scale representation
-    fInvLogScale:((x:number, offset?:number)=>number);
+    fInvLogScale: (x: number, offset?: number) => number;
 }
 
-export function isStringData(d:IAxisData): d is IStringAxisData {
-    return d.datatype === "string";
+export function isStringData(d: IAxisData): d is IStringAxisData {
+    return d.datatype === 'string';
 }
-export function isNumberData(d:IAxisData): d is INumberAxisData {
-    return d.datatype === "number";
+export function isNumberData(d: IAxisData): d is INumberAxisData {
+    return d.datatype === 'number';
 }
-export function isNone(d:IAxisData): d is IAxisData {
-    return d.datatype === "none";
+export function isNone(d: IAxisData): d is IAxisData {
+    return d.datatype === 'none';
 }
 
-export function scatterPlotZIndexSortBy<D extends Pick<IPlotSampleData, "dispMutationType" | "dispMutationSummary" | "profiledMutations" | "dispCna" | "profiledCna">>(
-    viewType:ViewType,
-    highlight?: (d:D)=>boolean
-) {
+export function scatterPlotZIndexSortBy<
+    D extends Pick<
+        IPlotSampleData,
+        | 'dispMutationType'
+        | 'dispMutationSummary'
+        | 'profiledMutations'
+        | 'dispCna'
+        | 'profiledCna'
+    >
+>(viewType: ViewType, highlight?: (d: D) => boolean) {
     // sort by render priority
-    const sortByHighlight = highlight ? ((d:D)=>(highlight(d) ? 1 : 0)) : ((d:D)=>0);
+    const sortByHighlight = highlight
+        ? (d: D) => (highlight(d) ? 1 : 0)
+        : (d: D) => 0;
 
-    const sortByMutation = (d:D)=>{
+    const sortByMutation = (d: D) => {
         if (!d.profiledMutations) {
             return -mutationRenderPriority[MUTATION_TYPE_NOT_PROFILED];
         } else if (!d.dispMutationType) {
@@ -206,13 +262,13 @@ export function scatterPlotZIndexSortBy<D extends Pick<IPlotSampleData, "dispMut
         }
     };
 
-    const sortByCna = (d:D)=>{
+    const sortByCna = (d: D) => {
         if (!d.profiledCna) {
             return -cnaRenderPriority[CNA_TYPE_NOT_PROFILED];
         } else if (!d.dispCna) {
             return -cnaRenderPriority[CNA_TYPE_NO_DATA];
         } else if (d.dispCna.value in cnaRenderPriority) {
-            return -cnaRenderPriority[d.dispCna.value]
+            return -cnaRenderPriority[d.dispCna.value];
         } else {
             return Number.NEGATIVE_INFINITY;
         }
@@ -230,51 +286,100 @@ export function scatterPlotZIndexSortBy<D extends Pick<IPlotSampleData, "dispMut
             sortBy = [sortByHighlight, sortByCna];
             break;
         case ViewType.MutationType:
-            sortBy = [sortByHighlight, (d:D)=>{
-                if (d.dispMutationSummary! in mutationSummaryRenderPriority) {
-                    return -mutationSummaryRenderPriority[d.dispMutationSummary!]        ;
-                } else if (!d.profiledMutations) {
-                    return -mutationSummaryRenderPriority[MUTATION_TYPE_NOT_PROFILED];
-                } else {
-                    return Number.NEGATIVE_INFINITY;
-                }
-            }];
+            sortBy = [
+                sortByHighlight,
+                (d: D) => {
+                    if (
+                        d.dispMutationSummary! in mutationSummaryRenderPriority
+                    ) {
+                        return -mutationSummaryRenderPriority[
+                            d.dispMutationSummary!
+                        ];
+                    } else if (!d.profiledMutations) {
+                        return -mutationSummaryRenderPriority[
+                            MUTATION_TYPE_NOT_PROFILED
+                        ];
+                    } else {
+                        return Number.NEGATIVE_INFINITY;
+                    }
+                },
+            ];
             break;
     }
     return sortBy;
 }
 
 export function scatterPlotLegendData(
-    data:IPlotSampleData[],
-    viewType:ViewType,
-    plotType:PlotType,
+    data: IPlotSampleData[],
+    viewType: ViewType,
+    plotType: PlotType,
     mutationDataExists: MobxPromise<boolean>,
     cnaDataExists: MobxPromise<boolean>,
     driversAnnotated: boolean,
-    limitValueTypes:string[],
-    highlight?:(d:IPlotSampleData)=>boolean
+    limitValueTypes: string[],
+    highlight?: (d: IPlotSampleData) => boolean
 ) {
-    const _mutationDataExists = mutationDataExists.isComplete && mutationDataExists.result;
+    const _mutationDataExists =
+        mutationDataExists.isComplete && mutationDataExists.result;
     const _cnaDataExists = cnaDataExists.isComplete && cnaDataExists.result;
-    let legend:any[] = [];
+    let legend: any[] = [];
     if (viewType === ViewType.CopyNumber && _cnaDataExists) {
         legend = scatterPlotCnaLegendData(data, plotType);
     } else if (viewType === ViewType.LimitValCopyNumber && _cnaDataExists) {
-        legend = scatterPlotCnaLegendData(data, plotType).concat(scatterPlotLimitValLegendData(plotType, limitValueTypes));
-    } else if (viewType === ViewType.LimitValMutationType && _mutationDataExists) {
-        legend = scatterPlotMutationLegendData(data, driversAnnotated, true, plotType).concat(scatterPlotLimitValLegendData(plotType, limitValueTypes));
+        legend = scatterPlotCnaLegendData(data, plotType).concat(
+            scatterPlotLimitValLegendData(plotType, limitValueTypes)
+        );
+    } else if (
+        viewType === ViewType.LimitValMutationType &&
+        _mutationDataExists
+    ) {
+        legend = scatterPlotMutationLegendData(
+            data,
+            driversAnnotated,
+            true,
+            plotType
+        ).concat(scatterPlotLimitValLegendData(plotType, limitValueTypes));
     } else if (viewType === ViewType.MutationType && _mutationDataExists) {
-        legend = scatterPlotMutationLegendData(data, driversAnnotated, true, plotType);
+        legend = scatterPlotMutationLegendData(
+            data,
+            driversAnnotated,
+            true,
+            plotType
+        );
     } else if (viewType === ViewType.MutationType && _mutationDataExists) {
         legend = scatterPlotMutationSummaryLegendData(data, plotType);
-    } else if (viewType === ViewType.MutationTypeAndCopyNumber && _mutationDataExists && _cnaDataExists) {
-        legend = scatterPlotMutationLegendData(data, driversAnnotated, false, plotType).concat(scatterPlotCnaLegendData(data, plotType));
-    } else if (viewType === ViewType.LimitValMutationTypeAndCopyNumber && _mutationDataExists && cnaDataExists) {
-        legend = scatterPlotMutationLegendData(data, driversAnnotated, false, plotType).concat(scatterPlotCnaLegendData(data, plotType)).concat(scatterPlotLimitValLegendData(plotType, limitValueTypes));
+    } else if (
+        viewType === ViewType.MutationTypeAndCopyNumber &&
+        _mutationDataExists &&
+        _cnaDataExists
+    ) {
+        legend = scatterPlotMutationLegendData(
+            data,
+            driversAnnotated,
+            false,
+            plotType
+        ).concat(scatterPlotCnaLegendData(data, plotType));
+    } else if (
+        viewType === ViewType.LimitValMutationTypeAndCopyNumber &&
+        _mutationDataExists &&
+        cnaDataExists
+    ) {
+        legend = scatterPlotMutationLegendData(
+            data,
+            driversAnnotated,
+            false,
+            plotType
+        )
+            .concat(scatterPlotCnaLegendData(data, plotType))
+            .concat(scatterPlotLimitValLegendData(plotType, limitValueTypes));
     } else if (viewType === ViewType.LimitVal) {
         legend = scatterPlotLimitValLegendData(plotType, limitValueTypes);
     }
-    const searchIndicatorLegendData = scatterPlotSearchIndicatorLegendData(data, plotType, highlight);
+    const searchIndicatorLegendData = scatterPlotSearchIndicatorLegendData(
+        data,
+        plotType,
+        highlight
+    );
     if (searchIndicatorLegendData) {
         legend = legend.concat(searchIndicatorLegendData);
     }
@@ -282,147 +387,176 @@ export function scatterPlotLegendData(
 }
 
 function scatterPlotMutationSummaryLegendData(
-    data:IPlotSampleData[],
-    plotType:PlotType
+    data: IPlotSampleData[],
+    plotType: PlotType
 ) {
-
     // set plot type-dependent legend properties
-    const legendSymbol = plotType === PlotType.WaterfallPlot? "square" : "circle";
+    const legendSymbol =
+        plotType === PlotType.WaterfallPlot ? 'square' : 'circle';
 
     let showNotProfiledElement = false;
-    const unique =
-        _.chain(data)
-        .map(d=>{
+    const unique = _.chain(data)
+        .map(d => {
             const ret = d.dispMutationSummary;
             if (!d.profiledMutations) {
                 showNotProfiledElement = true;
             }
             return ret;
-        }).uniq().filter(x=>!!x).value();
+        })
+        .uniq()
+        .filter(x => !!x)
+        .value();
     // no data, not profiled
 
-    const legendData:any[] = mutationSummaryLegendOrder.filter(x=>(unique.indexOf(x) > -1)).map((x:MutationSummary)=>{
-        const appearance = mutationSummaryToAppearance[x];
-        const stroke = plotType === PlotType.WaterfallPlot? appearance.fill : appearance.stroke;
-        return {
-            name: appearance.legendLabel,
-            symbol: {
-                stroke: stroke,
-                strokeOpacity: appearance.strokeOpacity,
-                fill: appearance.fill,
-                type: legendSymbol
-            }
-        };
-    });
+    const legendData: any[] = mutationSummaryLegendOrder
+        .filter(x => unique.indexOf(x) > -1)
+        .map((x: MutationSummary) => {
+            const appearance = mutationSummaryToAppearance[x];
+            const stroke =
+                plotType === PlotType.WaterfallPlot
+                    ? appearance.fill
+                    : appearance.stroke;
+            return {
+                name: appearance.legendLabel,
+                symbol: {
+                    stroke: stroke,
+                    strokeOpacity: appearance.strokeOpacity,
+                    fill: appearance.fill,
+                    type: legendSymbol,
+                },
+            };
+        });
     if (showNotProfiledElement) {
-        const stroke = plotType === PlotType.WaterfallPlot? notProfiledMutationsAppearance.fill : notProfiledMutationsAppearance.stroke;
+        const stroke =
+            plotType === PlotType.WaterfallPlot
+                ? notProfiledMutationsAppearance.fill
+                : notProfiledMutationsAppearance.stroke;
         legendData.push({
             name: NOT_PROFILED_MUTATION_LEGEND_LABEL,
             symbol: {
                 stroke: stroke,
                 strokeOpacity: notProfiledMutationsAppearance.strokeOpacity,
                 fill: notProfiledMutationsAppearance.fill,
-                type: legendSymbol
-            }
+                type: legendSymbol,
+            },
         });
     }
     return legendData;
 }
 
 function scatterPlotMutationLegendData(
-    data:IPlotSampleData[],
-    driversAnnotated:boolean,
-    showStroke:boolean,
-    plotType:PlotType
+    data: IPlotSampleData[],
+    driversAnnotated: boolean,
+    showStroke: boolean,
+    plotType: PlotType
 ) {
-    const oncoprintMutationTypeToAppearance = driversAnnotated ? oncoprintMutationTypeToAppearanceDrivers: oncoprintMutationTypeToAppearanceDefault;
+    const oncoprintMutationTypeToAppearance = driversAnnotated
+        ? oncoprintMutationTypeToAppearanceDrivers
+        : oncoprintMutationTypeToAppearanceDefault;
     let showNoMutationElement = false;
     let showNotProfiledElement = false;
-    const uniqueMutations =
-    _.chain(data)
-    .map(d=>{
-        const ret = d.dispMutationType? d.dispMutationType : null;
-        if (!d.profiledMutations) {
-            showNotProfiledElement = true;
-        }
-        return ret;
-    })
-    .uniq()
-    .filter(x=>{
-        const ret = !!x;
-        if (!ret) {
-            showNoMutationElement = true;
-        }
-        return ret;
-    })
-    .keyBy(x=>x)
-    .value();
-    
-    const legendData:any[] =
-    _.chain(mutationLegendOrder)
-    .filter(type=>!!uniqueMutations[type])
-    .map(type=>{
-        const appearance = oncoprintMutationTypeToAppearance[type];
-        const legendSymbol = plotType === PlotType.WaterfallPlot? "square" : appearance.symbol;
-        const stroke = plotType === PlotType.WaterfallPlot? appearance.fill : appearance.stroke;
-        return {
-            name: appearance.legendLabel,
-            symbol: {
-                stroke: stroke,
-                strokeOpacity: (showStroke ? appearance.strokeOpacity : 0),
-                fill: appearance.fill,
-                type: legendSymbol
+    const uniqueMutations = _.chain(data)
+        .map(d => {
+            const ret = d.dispMutationType ? d.dispMutationType : null;
+            if (!d.profiledMutations) {
+                showNotProfiledElement = true;
             }
-        };
-    })
-    .value();
+            return ret;
+        })
+        .uniq()
+        .filter(x => {
+            const ret = !!x;
+            if (!ret) {
+                showNoMutationElement = true;
+            }
+            return ret;
+        })
+        .keyBy(x => x)
+        .value();
+
+    const legendData: any[] = _.chain(mutationLegendOrder)
+        .filter(type => !!uniqueMutations[type])
+        .map(type => {
+            const appearance = oncoprintMutationTypeToAppearance[type];
+            const legendSymbol =
+                plotType === PlotType.WaterfallPlot
+                    ? 'square'
+                    : appearance.symbol;
+            const stroke =
+                plotType === PlotType.WaterfallPlot
+                    ? appearance.fill
+                    : appearance.stroke;
+            return {
+                name: appearance.legendLabel,
+                symbol: {
+                    stroke: stroke,
+                    strokeOpacity: showStroke ? appearance.strokeOpacity : 0,
+                    fill: appearance.fill,
+                    type: legendSymbol,
+                },
+            };
+        })
+        .value();
     if (showNoMutationElement) {
-        const legendSymbol = plotType === PlotType.WaterfallPlot? "square" : noMutationAppearance.symbol;
-        const stroke = plotType === PlotType.WaterfallPlot? noMutationAppearance.fill : noMutationAppearance.stroke;
+        const legendSymbol =
+            plotType === PlotType.WaterfallPlot
+                ? 'square'
+                : noMutationAppearance.symbol;
+        const stroke =
+            plotType === PlotType.WaterfallPlot
+                ? noMutationAppearance.fill
+                : noMutationAppearance.stroke;
         legendData.push({
             name: noMutationAppearance.legendLabel,
             symbol: {
                 stroke: stroke,
-                strokeOpacity: (showStroke ? noMutationAppearance.strokeOpacity : 0),
+                strokeOpacity: showStroke
+                    ? noMutationAppearance.strokeOpacity
+                    : 0,
                 fill: noMutationAppearance.fill,
-                type: legendSymbol
-            }
+                type: legendSymbol,
+            },
         });
     }
     if (showNotProfiledElement) {
-        const legendSymbol = plotType === PlotType.WaterfallPlot? "square" : "circle";
-        const stroke = plotType === PlotType.WaterfallPlot? notProfiledMutationsAppearance.fill : notProfiledMutationsAppearance.stroke;
+        const legendSymbol =
+            plotType === PlotType.WaterfallPlot ? 'square' : 'circle';
+        const stroke =
+            plotType === PlotType.WaterfallPlot
+                ? notProfiledMutationsAppearance.fill
+                : notProfiledMutationsAppearance.stroke;
         legendData.push({
             name: NOT_PROFILED_MUTATION_LEGEND_LABEL,
             symbol: {
                 stroke: stroke,
                 strokeOpacity: notProfiledMutationsAppearance.strokeOpacity, // always show because its white
                 fill: notProfiledMutationsAppearance.fill,
-                type: legendSymbol
-            }
+                type: legendSymbol,
+            },
         });
     }
     return legendData;
 }
 
-function scatterPlotLimitValLegendData(plotType:PlotType, limitValueTypes:string[]) {
-
-    const legendData:any[] = [];
+function scatterPlotLimitValLegendData(
+    plotType: PlotType,
+    limitValueTypes: string[]
+) {
+    const legendData: any[] = [];
 
     if (limitValueTypes && limitValueTypes.length > 0) {
-
-        const fillOpacity = plotType === PlotType.WaterfallPlot? 0 : 1;
-        const stroke = plotType === PlotType.WaterfallPlot? "#000000" : "#999";
+        const fillOpacity = plotType === PlotType.WaterfallPlot ? 0 : 1;
+        const stroke = plotType === PlotType.WaterfallPlot ? '#000000' : '#999';
 
         legendData.push({
             name: `value ${limitValueTypes.join(' or ')}`,
             symbol: {
-                fill: "#999",
+                fill: '#999',
                 fillOpacity: fillOpacity,
                 stroke: stroke,
                 strokeOpacity: 1,
                 type: limitValueAppearance.symbol,
-            }
+            },
         });
     }
 
@@ -430,11 +564,15 @@ function scatterPlotLimitValLegendData(plotType:PlotType, limitValueTypes:string
 }
 
 function scatterPlotSearchIndicatorLegendData(
-    data:IPlotSampleData[],
-    plotType:PlotType,
-    highlight?:(d:IPlotSampleData)=>boolean 
+    data: IPlotSampleData[],
+    plotType: PlotType,
+    highlight?: (d: IPlotSampleData) => boolean
 ) {
-    if (plotType === PlotType.WaterfallPlot && highlight && _.some(data, (d)=>highlight(d))) {
+    if (
+        plotType === PlotType.WaterfallPlot &&
+        highlight &&
+        _.some(data, d => highlight(d))
+    ) {
         return {
             name: waterfallSearchIndicatorAppearance.legendLabel,
             symbol: {
@@ -442,26 +580,23 @@ function scatterPlotSearchIndicatorLegendData(
                 fillOpacity: waterfallSearchIndicatorAppearance.fillOpacity,
                 stroke: waterfallSearchIndicatorAppearance.stroke,
                 strokeOpacity: waterfallSearchIndicatorAppearance.strokeOpacity,
-                type: waterfallSearchIndicatorAppearance.symbol
-            }
+                type: waterfallSearchIndicatorAppearance.symbol,
+            },
         };
     }
     return undefined;
 }
 
-function scatterPlotCnaLegendData(
-    data:IPlotSampleData[],
-    plotType:PlotType
-) {
+function scatterPlotCnaLegendData(data: IPlotSampleData[], plotType: PlotType) {
     let showNotProfiledElement = false;
 
     // set plot type-dependent legend properties
-    const legendSymbol = plotType === PlotType.WaterfallPlot? "square" : "circle";
-    const fillOpacity = plotType === PlotType.WaterfallPlot? 1 : 0;
-    
-    const uniqueDispCna =
-        _.chain(data)
-        .map(d=>{
+    const legendSymbol =
+        plotType === PlotType.WaterfallPlot ? 'square' : 'circle';
+    const fillOpacity = plotType === PlotType.WaterfallPlot ? 1 : 0;
+
+    const uniqueDispCna = _.chain(data)
+        .map(d => {
             const ret = d.dispCna ? d.dispCna.value : null;
             if (!d.profiledCna) {
                 showNotProfiledElement = true;
@@ -469,17 +604,17 @@ function scatterPlotCnaLegendData(
             return ret;
         })
         .uniq()
-        .filter(x=>{
+        .filter(x => {
             if (x === null) {
                 showNotProfiledElement = true;
             }
             return x !== null;
         })
-        .sortBy((v:number)=>-v) // sorted descending
+        .sortBy((v: number) => -v) // sorted descending
         .value();
-        
-    const legendData:any[] = uniqueDispCna.map(v=>{
-        const appearance = cnaToAppearance[v as -2|-1|0|1|2];
+
+    const legendData: any[] = uniqueDispCna.map(v => {
+        const appearance = cnaToAppearance[v as -2 | -1 | 0 | 1 | 2];
         return {
             name: appearance.legendLabel,
             symbol: {
@@ -487,8 +622,8 @@ function scatterPlotCnaLegendData(
                 fillOpacity: fillOpacity,
                 fill: appearance.stroke, // for waterfall plot
                 type: legendSymbol,
-                strokeWidth: CNA_STROKE_WIDTH
-            }
+                strokeWidth: CNA_STROKE_WIDTH,
+            },
         };
     });
     if (showNotProfiledElement) {
@@ -497,29 +632,35 @@ function scatterPlotCnaLegendData(
             symbol: {
                 stroke: notProfiledCnaAppearance.stroke,
                 fillOpacity: fillOpacity,
-                fill: notProfiledCnaAppearance.stroke,  // for waterfall plot
+                fill: notProfiledCnaAppearance.stroke, // for waterfall plot
                 type: legendSymbol,
-                strokeWidth: CNA_STROKE_WIDTH
-            }
+                strokeWidth: CNA_STROKE_WIDTH,
+            },
         });
     }
     return legendData;
 }
 
 function makeAxisDataPromise_Clinical(
-    attribute:ClinicalAttribute,
-    clinicalDataCache:ClinicalDataCache,
-    patientKeyToSamples:MobxPromise<{[uniquePatientKey:string]:Sample[]}>,
-    studyToMutationMolecularProfile: MobxPromise<{[studyId: string]: MolecularProfile}>
-):MobxPromise<IAxisData> {
+    attribute: ClinicalAttribute,
+    clinicalDataCache: ClinicalDataCache,
+    patientKeyToSamples: MobxPromise<{ [uniquePatientKey: string]: Sample[] }>,
+    studyToMutationMolecularProfile: MobxPromise<{
+        [studyId: string]: MolecularProfile;
+    }>
+): MobxPromise<IAxisData> {
     const promise = clinicalDataCache.get(attribute);
-    let ret:MobxPromise<IAxisData> = remoteData({
-        await:()=>[promise, patientKeyToSamples],
-        invoke:()=>{
+    let ret: MobxPromise<IAxisData> = remoteData({
+        await: () => [promise, patientKeyToSamples],
+        invoke: () => {
             const _patientKeyToSamples = patientKeyToSamples.result!;
-            const data:ClinicalData[] = promise.result! as ClinicalData[]; // we know it won't be MutationSpectrum
-            const axisData:IAxisData = { data:[], datatype:attribute.datatype.toLowerCase() };
-            const shouldParseFloat = attribute.datatype.toLowerCase() === "number";
+            const data: ClinicalData[] = promise.result! as ClinicalData[]; // we know it won't be MutationSpectrum
+            const axisData: IAxisData = {
+                data: [],
+                datatype: attribute.datatype.toLowerCase(),
+            };
+            const shouldParseFloat =
+                attribute.datatype.toLowerCase() === 'number';
             const axisData_Data = axisData.data;
             if (attribute.patientAttribute) {
                 // produce sample data from patient clinical data
@@ -537,7 +678,7 @@ function makeAxisDataPromise_Clinical(
                 for (const d of data) {
                     axisData_Data.push({
                         uniqueSampleKey: d.uniqueSampleKey,
-                        value: d.value
+                        value: d.value,
                     });
                 }
             }
@@ -547,38 +688,49 @@ function makeAxisDataPromise_Clinical(
                 }
             }
             return Promise.resolve(axisData);
-        }
+        },
     });
 
     return ret;
 }
 
 function makeAxisDataPromise_Molecular(
-    entrezGeneId:number,
-    molecularProfileId:string,
-    mutationCache:MobxPromiseCache<{entrezGeneId:number}, Mutation[]>,
-    numericGeneMolecularDataCache:MobxPromiseCache<{entrezGeneId:number, molecularProfileId:string}, NumericGeneMolecularData[]>,
-    entrezGeneIdToGene:MobxPromise<{[entrezGeneId:number]:Gene}>,
-    molecularProfileIdToMolecularProfile:MobxPromise<{[molecularProfileId:string]:MolecularProfile}>,
+    entrezGeneId: number,
+    molecularProfileId: string,
+    mutationCache: MobxPromiseCache<{ entrezGeneId: number }, Mutation[]>,
+    numericGeneMolecularDataCache: MobxPromiseCache<
+        { entrezGeneId: number; molecularProfileId: string },
+        NumericGeneMolecularData[]
+    >,
+    entrezGeneIdToGene: MobxPromise<{ [entrezGeneId: number]: Gene }>,
+    molecularProfileIdToMolecularProfile: MobxPromise<{
+        [molecularProfileId: string]: MolecularProfile;
+    }>,
     mutationCountBy: MutationCountBy,
-    coverageInformation:MobxPromise<CoverageInformation>,
-    samples:MobxPromise<Sample[]>
-):MobxPromise<IAxisData> {
-
-    let promise:MobxPromise<any>;/* = ;*/
+    coverageInformation: MobxPromise<CoverageInformation>,
+    samples: MobxPromise<Sample[]>
+): MobxPromise<IAxisData> {
+    let promise: MobxPromise<any>; /* = ;*/
     return remoteData({
-        await:()=>{
-            const ret:MobxPromise<any>[] = [];
+        await: () => {
+            const ret: MobxPromise<any>[] = [];
             if (molecularProfileIdToMolecularProfile.isComplete) {
-                if (molecularProfileIdToMolecularProfile.result![molecularProfileId].molecularAlterationType ===
-                        AlterationTypeConstants.MUTATION_EXTENDED) {
+                if (
+                    molecularProfileIdToMolecularProfile.result![
+                        molecularProfileId
+                    ].molecularAlterationType ===
+                    AlterationTypeConstants.MUTATION_EXTENDED
+                ) {
                     // mutation profile
                     promise = mutationCache.get({ entrezGeneId });
                     ret.push(coverageInformation);
                     ret.push(samples);
                 } else {
                     // non-mutation profile
-                    promise = numericGeneMolecularDataCache.get({ entrezGeneId, molecularProfileId });
+                    promise = numericGeneMolecularDataCache.get({
+                        entrezGeneId,
+                        molecularProfileId,
+                    });
                 }
                 ret.push(promise);
             } else {
@@ -587,67 +739,97 @@ function makeAxisDataPromise_Molecular(
             ret.push(entrezGeneIdToGene);
             return ret;
         },
-        invoke:()=>{
-            const profile = molecularProfileIdToMolecularProfile.result![molecularProfileId];
-            const hugoGeneSymbol = entrezGeneIdToGene.result![entrezGeneId].hugoGeneSymbol;
-
-            if (profile.molecularAlterationType === AlterationTypeConstants.MUTATION_EXTENDED) {
+        invoke: () => {
+            const profile = molecularProfileIdToMolecularProfile.result![
+                molecularProfileId
+            ];
+            const hugoGeneSymbol = entrezGeneIdToGene.result![entrezGeneId]
+                .hugoGeneSymbol;
+
+            if (
+                profile.molecularAlterationType ===
+                AlterationTypeConstants.MUTATION_EXTENDED
+            ) {
                 // mutation profile
-                const mutations:Mutation[] = promise.result!;
+                const mutations: Mutation[] = promise.result!;
                 return Promise.resolve(
                     makeAxisDataPromise_Molecular_MakeMutationData(
-                        molecularProfileId, hugoGeneSymbol, mutations, coverageInformation.result!, mutationCountBy, samples.result!
+                        molecularProfileId,
+                        hugoGeneSymbol,
+                        mutations,
+                        coverageInformation.result!,
+                        mutationCountBy,
+                        samples.result!
                     )
                 );
             } else {
                 // non-mutation profile
-                const isDiscreteCna = (profile.molecularAlterationType === AlterationTypeConstants.COPY_NUMBER_ALTERATION
-                    && profile.datatype === "DISCRETE");
-                const data:NumericGeneMolecularData[] = promise.result!;
+                const isDiscreteCna =
+                    profile.molecularAlterationType ===
+                        AlterationTypeConstants.COPY_NUMBER_ALTERATION &&
+                    profile.datatype === 'DISCRETE';
+                const data: NumericGeneMolecularData[] = promise.result!;
                 return Promise.resolve({
-                    data: data.map(d=>{
+                    data: data.map(d => {
                         let value = d.value;
                         if (isDiscreteCna) {
-                            const appearance = (cnaToAppearance as any)[d.value];
+                            const appearance = (cnaToAppearance as any)[
+                                d.value
+                            ];
                             if (appearance) {
                                 value = appearance.legendLabel;
                             }
                         }
                         return {
                             uniqueSampleKey: d.uniqueSampleKey,
-                            value
-                        }
+                            value,
+                        };
                     }),
                     hugoGeneSymbol,
-                    datatype: isDiscreteCna ? "string" : "number",
-                    categoryOrder: isDiscreteCna ? cnaCategoryOrder : undefined
+                    datatype: isDiscreteCna ? 'string' : 'number',
+                    categoryOrder: isDiscreteCna ? cnaCategoryOrder : undefined,
                 } as IAxisData);
             }
-        }
+        },
     });
 }
 
 export function makeAxisDataPromise_Molecular_MakeMutationData(
-    molecularProfileId:string,
-    hugoGeneSymbol:string,
-    mutations:Pick<Mutation,"uniqueSampleKey"|"proteinChange"|"mutationType">[],
-    coverageInformation:CoverageInformation,
+    molecularProfileId: string,
+    hugoGeneSymbol: string,
+    mutations: Pick<
+        Mutation,
+        'uniqueSampleKey' | 'proteinChange' | 'mutationType'
+    >[],
+    coverageInformation: CoverageInformation,
     mutationCountBy: MutationCountBy,
-    samples:Pick<Sample, "uniqueSampleKey">[]
+    samples: Pick<Sample, 'uniqueSampleKey'>[]
 ) {
     // collect mutations by sample by type
     const sampleToMutationTypes = _.mapValues(
-        _.groupBy(mutations, m=>m.uniqueSampleKey),
-        sampleMuts=>_.uniq(sampleMuts.map(m=>mutationTypeToDisplayName[getOncoprintMutationType(m)]))
+        _.groupBy(mutations, m => m.uniqueSampleKey),
+        sampleMuts =>
+            _.uniq(
+                sampleMuts.map(
+                    m => mutationTypeToDisplayName[getOncoprintMutationType(m)]
+                )
+            )
     );
 
-    const data = samples.map(s=>{
+    const data = samples.map(s => {
         const sampleMutTypes = sampleToMutationTypes[s.uniqueSampleKey];
-        let value:string|string[];
+        let value: string | string[];
         if (!sampleMutTypes) {
             // sampleMutTypes would never be an empty array because its generated by _.groupBy,
             //  so we need only check if it exists
-            if (!isSampleProfiled(s.uniqueSampleKey, molecularProfileId, hugoGeneSymbol, coverageInformation)) {
+            if (
+                !isSampleProfiled(
+                    s.uniqueSampleKey,
+                    molecularProfileId,
+                    hugoGeneSymbol,
+                    coverageInformation
+                )
+            ) {
                 // its not profiled
                 value = MUT_PROFILE_COUNT_NOT_PROFILED;
             } else {
@@ -673,10 +855,10 @@ export function makeAxisDataPromise_Molecular_MakeMutationData(
         }
         return {
             uniqueSampleKey: s.uniqueSampleKey,
-            value
+            value,
         };
     });
-    let categoryOrder:string[] = [];
+    let categoryOrder: string[] = [];
     switch (mutationCountBy) {
         case MutationCountBy.MutationType:
             categoryOrder = mutTypeCategoryOrder;
@@ -689,96 +871,137 @@ export function makeAxisDataPromise_Molecular_MakeMutationData(
     return {
         data,
         hugoGeneSymbol,
-        datatype: "string",
-        categoryOrder
+        datatype: 'string',
+        categoryOrder,
     } as IStringAxisData;
 }
 
 function makeAxisDataPromise_Geneset(
-    genesetId:string,
-    molecularProfileId:string,
-    genesetMolecularDataCachePromise:MobxPromise<GenesetMolecularDataCache>,
-    molecularProfileIdToMolecularProfile:MobxPromise<{[molecularProfileId:string]:MolecularProfile}>
-):MobxPromise<IAxisData> {
-    
+    genesetId: string,
+    molecularProfileId: string,
+    genesetMolecularDataCachePromise: MobxPromise<GenesetMolecularDataCache>,
+    molecularProfileIdToMolecularProfile: MobxPromise<{
+        [molecularProfileId: string]: MolecularProfile;
+    }>
+): MobxPromise<IAxisData> {
     return remoteData({
-        await:()=>[genesetMolecularDataCachePromise, molecularProfileIdToMolecularProfile],
+        await: () => [
+            genesetMolecularDataCachePromise,
+            molecularProfileIdToMolecularProfile,
+        ],
         invoke: async () => {
-            const profile = molecularProfileIdToMolecularProfile.result![molecularProfileId];
+            const profile = molecularProfileIdToMolecularProfile.result![
+                molecularProfileId
+            ];
             // const isDiscreteCna = (profile.molecularAlterationType === AlterationTypeConstants.COPY_NUMBER_ALTERATION
             //                         && profile.datatype === "DISCRETE");
             const makeRequest = true;
             await genesetMolecularDataCachePromise.result!.getPromise(
-                 {genesetId, molecularProfileId}, makeRequest);
-            const data:GenesetMolecularData[] = genesetMolecularDataCachePromise.result!.get({molecularProfileId, genesetId})!.data!;
+                { genesetId, molecularProfileId },
+                makeRequest
+            );
+            const data: GenesetMolecularData[] = genesetMolecularDataCachePromise.result!.get(
+                { molecularProfileId, genesetId }
+            )!.data!;
             return Promise.resolve({
-                data: data.map(d=>{
+                data: data.map(d => {
                     const value = d.value;
                     return {
                         uniqueSampleKey: d.uniqueSampleKey,
-                        value: Number(value)
+                        value: Number(value),
                     };
                 }),
                 genesetId: genesetId,
-                datatype: "number"
+                datatype: 'number',
             });
-        }
+        },
     });
 }
 
 function makeAxisDataPromise_Treatment(
-    treatmentId:string,
-    molecularProfileId:string,
-    treatmentMolecularDataCachePromise:MobxPromise<TreatmentMolecularDataCache>,
-    molecularProfileIdToMolecularProfile:MobxPromise<{[molecularProfileId:string]:MolecularProfile}>
-):MobxPromise<IAxisData> {
-
+    treatmentId: string,
+    molecularProfileId: string,
+    treatmentMolecularDataCachePromise: MobxPromise<
+        TreatmentMolecularDataCache
+    >,
+    molecularProfileIdToMolecularProfile: MobxPromise<{
+        [molecularProfileId: string]: MolecularProfile;
+    }>
+): MobxPromise<IAxisData> {
     return remoteData({
-        await:()=>[treatmentMolecularDataCachePromise, molecularProfileIdToMolecularProfile],
+        await: () => [
+            treatmentMolecularDataCachePromise,
+            molecularProfileIdToMolecularProfile,
+        ],
         invoke: async () => {
-            const profile = molecularProfileIdToMolecularProfile.result![molecularProfileId];
+            const profile = molecularProfileIdToMolecularProfile.result![
+                molecularProfileId
+            ];
             const makeRequest = true;
             await treatmentMolecularDataCachePromise.result!.getPromise(
-                 {treatmentId, molecularProfileId}, makeRequest);
-            const data:TreatmentMolecularDataEnhanced[] = treatmentMolecularDataCachePromise.result!.get({molecularProfileId, treatmentId})!.data!;
+                { treatmentId, molecularProfileId },
+                makeRequest
+            );
+            const data: TreatmentMolecularDataEnhanced[] = treatmentMolecularDataCachePromise.result!.get(
+                { molecularProfileId, treatmentId }
+            )!.data!;
             return Promise.resolve({
-                data: data.map(d=>{
+                data: data.map(d => {
                     return {
                         uniqueSampleKey: d.uniqueSampleKey,
                         value: parseFloat(d.value),
-                        thresholdType: d.thresholdType
+                        thresholdType: d.thresholdType,
                     };
                 }),
-                datatype: "number",
-                treatmentId: treatmentId
+                datatype: 'number',
+                treatmentId: treatmentId,
             });
-        }
+        },
     });
 }
 
 export function makeAxisDataPromise(
-    selection:AxisMenuSelection,
-    clinicalAttributeIdToClinicalAttribute:MobxPromise<{[clinicalAttributeId:string]:ClinicalAttribute}>,
-    molecularProfileIdToMolecularProfile:MobxPromise<{[molecularProfileId:string]:MolecularProfile}>,
-    patientKeyToSamples:MobxPromise<{[uniquePatientKey:string]:Sample[]}>,
-    entrezGeneIdToGene:MobxPromise<{[entrezGeneId:number]:Gene}>,
-    clinicalDataCache:ClinicalDataCache,
-    mutationCache:MobxPromiseCache<{entrezGeneId:number}, Mutation[]>,
-    numericGeneMolecularDataCache:MobxPromiseCache<{entrezGeneId:number, molecularProfileId:string}, NumericGeneMolecularData[]>,
-    studyToMutationMolecularProfile: MobxPromise<{[studyId: string]: MolecularProfile}>,
-    coverageInformation:MobxPromise<CoverageInformation>,
-    samples:MobxPromise<Sample[]>,
+    selection: AxisMenuSelection,
+    clinicalAttributeIdToClinicalAttribute: MobxPromise<{
+        [clinicalAttributeId: string]: ClinicalAttribute;
+    }>,
+    molecularProfileIdToMolecularProfile: MobxPromise<{
+        [molecularProfileId: string]: MolecularProfile;
+    }>,
+    patientKeyToSamples: MobxPromise<{ [uniquePatientKey: string]: Sample[] }>,
+    entrezGeneIdToGene: MobxPromise<{ [entrezGeneId: number]: Gene }>,
+    clinicalDataCache: ClinicalDataCache,
+    mutationCache: MobxPromiseCache<{ entrezGeneId: number }, Mutation[]>,
+    numericGeneMolecularDataCache: MobxPromiseCache<
+        { entrezGeneId: number; molecularProfileId: string },
+        NumericGeneMolecularData[]
+    >,
+    studyToMutationMolecularProfile: MobxPromise<{
+        [studyId: string]: MolecularProfile;
+    }>,
+    coverageInformation: MobxPromise<CoverageInformation>,
+    samples: MobxPromise<Sample[]>,
     genesetMolecularDataCachePromise: MobxPromise<GenesetMolecularDataCache>,
     treatmentMolecularDataCachePromise: MobxPromise<TreatmentMolecularDataCache>
-):MobxPromise<IAxisData> {
-
-    let ret:MobxPromise<IAxisData> = remoteData(()=>new Promise<IAxisData>(()=>0));
+): MobxPromise<IAxisData> {
+    let ret: MobxPromise<IAxisData> = remoteData(
+        () => new Promise<IAxisData>(() => 0)
+    );
 
-    if (selection.dataType && _.keys(GenericAssayTypeConstants).includes(selection.dataType)) {
-        if (selection.treatmentId !== undefined && selection.dataSourceId !== undefined) {
+    if (
+        selection.dataType &&
+        _.keys(GenericAssayTypeConstants).includes(selection.dataType)
+    ) {
+        if (
+            selection.treatmentId !== undefined &&
+            selection.dataSourceId !== undefined
+        ) {
             ret = makeAxisDataPromise_Treatment(
-                selection.treatmentId, selection.dataSourceId, treatmentMolecularDataCachePromise,
-                molecularProfileIdToMolecularProfile);
+                selection.treatmentId,
+                selection.dataSourceId,
+                treatmentMolecularDataCachePromise,
+                molecularProfileIdToMolecularProfile
+            );
             return ret;
         }
     }
@@ -788,33 +1011,59 @@ export function makeAxisDataPromise(
             break;
         // when no datatype is selected (`None`), return a resolved Promise that is of the `none` datatype
         case NONE_SELECTED_OPTION_STRING_VALUE:
-            ret = remoteData(() => Promise.resolve({
-                data: [],
-                datatype: "none"
-            } as IAxisData));;
-        break;
+            ret = remoteData(() =>
+                Promise.resolve({
+                    data: [],
+                    datatype: 'none',
+                } as IAxisData)
+            );
+            break;
         case CLIN_ATTR_DATA_TYPE:
-        if (selection.dataSourceId !== undefined && clinicalAttributeIdToClinicalAttribute.isComplete) {
-            const attribute = clinicalAttributeIdToClinicalAttribute.result![selection.dataSourceId];
-            ret = makeAxisDataPromise_Clinical(attribute, clinicalDataCache, patientKeyToSamples, studyToMutationMolecularProfile);
-        }
-        break;
+            if (
+                selection.dataSourceId !== undefined &&
+                clinicalAttributeIdToClinicalAttribute.isComplete
+            ) {
+                const attribute = clinicalAttributeIdToClinicalAttribute.result![
+                    selection.dataSourceId
+                ];
+                ret = makeAxisDataPromise_Clinical(
+                    attribute,
+                    clinicalDataCache,
+                    patientKeyToSamples,
+                    studyToMutationMolecularProfile
+                );
+            }
+            break;
         case GENESET_DATA_TYPE:
-        if (selection.genesetId !== undefined && selection.dataSourceId !== undefined) {
+            if (
+                selection.genesetId !== undefined &&
+                selection.dataSourceId !== undefined
+            ) {
                 ret = makeAxisDataPromise_Geneset(
-                    selection.genesetId, selection.dataSourceId, genesetMolecularDataCachePromise,
-                    molecularProfileIdToMolecularProfile);
+                    selection.genesetId,
+                    selection.dataSourceId,
+                    genesetMolecularDataCachePromise,
+                    molecularProfileIdToMolecularProfile
+                );
             }
             break;
         default:
             // molecular profile
-            if (selection.entrezGeneId !== undefined
+            if (
+                selection.entrezGeneId !== undefined &&
                 // && selection.entrezGeneId !== NONE_SELECTED_OPTION_NUMERICAL_VALUE
-                && selection.dataSourceId !== undefined) {
+                selection.dataSourceId !== undefined
+            ) {
                 ret = makeAxisDataPromise_Molecular(
-                    selection.entrezGeneId, selection.dataSourceId, mutationCache, numericGeneMolecularDataCache,
-                    entrezGeneIdToGene, molecularProfileIdToMolecularProfile, selection.mutationCountBy,
-                    coverageInformation, samples
+                    selection.entrezGeneId,
+                    selection.dataSourceId,
+                    mutationCache,
+                    numericGeneMolecularDataCache,
+                    entrezGeneIdToGene,
+                    molecularProfileIdToMolecularProfile,
+                    selection.mutationCountBy,
+                    coverageInformation,
+                    samples
                 );
             }
             break;
@@ -822,24 +1071,29 @@ export function makeAxisDataPromise(
     return ret;
 }
 
-export function tableCellTextColor(val:number, min:number, max:number) {
-    if (val > (max+min)/2) {
-        return "rgb(255,255,255)";
+export function tableCellTextColor(val: number, min: number, max: number) {
+    if (val > (max + min) / 2) {
+        return 'rgb(255,255,255)';
     } else {
-        return "rgb(0,0,0)";
+        return 'rgb(0,0,0)';
     }
 }
 
 export function getAxisLabel(
-    selection:AxisMenuSelection,
-    molecularProfileIdToMolecularProfile:{[molecularProfileId:string]:MolecularProfile},
-    entrezGeneIdToGene:{[entrezGeneId:number]:Gene},
-    clinicalAttributeIdToClinicalAttribute:{[clinicalAttributeId:string]:ClinicalAttribute},
-    logScaleFunc:IAxisLogScaleParams|undefined
+    selection: AxisMenuSelection,
+    molecularProfileIdToMolecularProfile: {
+        [molecularProfileId: string]: MolecularProfile;
+    },
+    entrezGeneIdToGene: { [entrezGeneId: number]: Gene },
+    clinicalAttributeIdToClinicalAttribute: {
+        [clinicalAttributeId: string]: ClinicalAttribute;
+    },
+    logScaleFunc: IAxisLogScaleParams | undefined
 ) {
-    let label = "";
-    const profile = molecularProfileIdToMolecularProfile[selection.dataSourceId!];
-    let transformationSection = "";
+    let label = '';
+    const profile =
+        molecularProfileIdToMolecularProfile[selection.dataSourceId!];
+    let transformationSection = '';
     if (logScaleFunc) {
         transformationSection = logScaleFunc.label;
     }
@@ -847,7 +1101,8 @@ export function getAxisLabel(
         case NONE_SELECTED_OPTION_STRING_VALUE:
             break;
         case CLIN_ATTR_DATA_TYPE:
-            const attribute = clinicalAttributeIdToClinicalAttribute[selection.dataSourceId!];
+            const attribute =
+                clinicalAttributeIdToClinicalAttribute[selection.dataSourceId!];
             if (attribute) {
                 label = attribute.displayName;
             }
@@ -859,15 +1114,26 @@ export function getAxisLabel(
             break;
         default:
             // molecular profile
-            if (profile
-                && selection.entrezGeneId !== undefined
-                && selection.entrezGeneId !== NONE_SELECTED_OPTION_NUMERICAL_VALUE) {
+            if (
+                profile &&
+                selection.entrezGeneId !== undefined &&
+                selection.entrezGeneId !== NONE_SELECTED_OPTION_NUMERICAL_VALUE
+            ) {
                 label = `${entrezGeneIdToGene[selection.entrezGeneId].hugoGeneSymbol}: ${profile.name}`;
             }
             break;
     }
-    if (selection.dataType && _.keys(GenericAssayTypeConstants).includes(selection.dataType)) {
-        if (!!(profile && selection.selectedTreatmentOption && selection.selectedTreatmentOption.label)) {
+    if (
+        selection.dataType &&
+        _.keys(GenericAssayTypeConstants).includes(selection.dataType)
+    ) {
+        if (
+            !!(
+                profile &&
+                selection.selectedTreatmentOption &&
+                selection.selectedTreatmentOption.label
+            )
+        ) {
             const treatmentName = selection.selectedTreatmentOption.label;
             label = `${treatmentName}: ${profile.name}`;
         }
@@ -880,21 +1146,27 @@ export function getAxisLabel(
 }
 
 export function getAxisDescription(
-    selection:AxisMenuSelection,
-    molecularProfileIdToMolecularProfile:{[molecularProfileId:string]:MolecularProfile},
-    clinicalAttributeIdToClinicalAttribute:{[clinicalAttributeId:string]:ClinicalAttribute}
+    selection: AxisMenuSelection,
+    molecularProfileIdToMolecularProfile: {
+        [molecularProfileId: string]: MolecularProfile;
+    },
+    clinicalAttributeIdToClinicalAttribute: {
+        [clinicalAttributeId: string]: ClinicalAttribute;
+    }
 ) {
-    let ret = "";
+    let ret = '';
     switch (selection.dataType) {
         case CLIN_ATTR_DATA_TYPE:
-            const attribute = clinicalAttributeIdToClinicalAttribute[selection.dataSourceId!];
+            const attribute =
+                clinicalAttributeIdToClinicalAttribute[selection.dataSourceId!];
             if (attribute) {
                 ret = attribute.description;
             }
             break;
         default:
             // molecular profile
-            const profile = molecularProfileIdToMolecularProfile[selection.dataSourceId!];
+            const profile =
+                molecularProfileIdToMolecularProfile[selection.dataSourceId!];
             if (profile) {
                 ret = profile.description;
             }
@@ -905,218 +1177,259 @@ export function getAxisDescription(
 
 const NON_CNA_STROKE_OPACITY = 0.5;
 
-export const oncoprintMutationTypeToAppearanceDrivers:{[mutType:string]:{symbol:string, fill:string, stroke:string, strokeOpacity:number, legendLabel:string}}
-= {
-    "inframe": {
-        symbol : "circle",
-        fill : MUT_COLOR_INFRAME_PASSENGER,
-        stroke : "#000000",
-        strokeOpacity:NON_CNA_STROKE_OPACITY,
-        legendLabel : "Inframe (VUS)"
+export const oncoprintMutationTypeToAppearanceDrivers: {
+    [mutType: string]: {
+        symbol: string;
+        fill: string;
+        stroke: string;
+        strokeOpacity: number;
+        legendLabel: string;
+    };
+} = {
+    inframe: {
+        symbol: 'circle',
+        fill: MUT_COLOR_INFRAME_PASSENGER,
+        stroke: '#000000',
+        strokeOpacity: NON_CNA_STROKE_OPACITY,
+        legendLabel: 'Inframe (VUS)',
     },
-    "inframe.driver": {
-        symbol : "circle",
+    'inframe.driver': {
+        symbol: 'circle',
         fill: MUT_COLOR_INFRAME,
-        stroke : "#000000",
-        strokeOpacity:NON_CNA_STROKE_OPACITY,
-        legendLabel : "Inframe (Driver)"
+        stroke: '#000000',
+        strokeOpacity: NON_CNA_STROKE_OPACITY,
+        legendLabel: 'Inframe (Driver)',
     },
-    "missense":{
-        symbol : "circle",
-        fill : MUT_COLOR_MISSENSE_PASSENGER,
-        stroke : "#000000",
-        strokeOpacity:NON_CNA_STROKE_OPACITY,
-        legendLabel : "Missense (VUS)"
+    missense: {
+        symbol: 'circle',
+        fill: MUT_COLOR_MISSENSE_PASSENGER,
+        stroke: '#000000',
+        strokeOpacity: NON_CNA_STROKE_OPACITY,
+        legendLabel: 'Missense (VUS)',
     },
-    "missense.driver":{
-        symbol : "circle",
-        fill : MUT_COLOR_MISSENSE,
-        stroke : "#000000",
-        strokeOpacity:NON_CNA_STROKE_OPACITY,
-        legendLabel : "Missense (Driver)"
+    'missense.driver': {
+        symbol: 'circle',
+        fill: MUT_COLOR_MISSENSE,
+        stroke: '#000000',
+        strokeOpacity: NON_CNA_STROKE_OPACITY,
+        legendLabel: 'Missense (Driver)',
     },
-    "fusion":{
-        symbol: "circle",
+    fusion: {
+        symbol: 'circle',
         fill: MUT_COLOR_FUSION,
-        stroke: "#000000",
-        strokeOpacity:NON_CNA_STROKE_OPACITY,
-        legendLabel: "Fusion"
+        stroke: '#000000',
+        strokeOpacity: NON_CNA_STROKE_OPACITY,
+        legendLabel: 'Fusion',
     },
-    "trunc":{
-        symbol: "circle",
+    trunc: {
+        symbol: 'circle',
         fill: MUT_COLOR_TRUNC_PASSENGER,
-        stroke: "#000000",
-        strokeOpacity:NON_CNA_STROKE_OPACITY,
-        legendLabel: "Truncating (VUS)"
+        stroke: '#000000',
+        strokeOpacity: NON_CNA_STROKE_OPACITY,
+        legendLabel: 'Truncating (VUS)',
     },
-    "trunc.driver":{
-        symbol: "circle",
+    'trunc.driver': {
+        symbol: 'circle',
         fill: MUT_COLOR_TRUNC,
-        stroke: "#000000",
-        strokeOpacity:NON_CNA_STROKE_OPACITY,
-        legendLabel: "Truncating (Driver)"
+        stroke: '#000000',
+        strokeOpacity: NON_CNA_STROKE_OPACITY,
+        legendLabel: 'Truncating (Driver)',
     },
-    "promoter":{
-        symbol: "circle",
+    promoter: {
+        symbol: 'circle',
         fill: MUT_COLOR_PROMOTER,
-        stroke: "#000000",
-        strokeOpacity:NON_CNA_STROKE_OPACITY,
-        legendLabel: "Promoter"
+        stroke: '#000000',
+        strokeOpacity: NON_CNA_STROKE_OPACITY,
+        legendLabel: 'Promoter',
     },
-    "other":{
-        symbol: "circle",
+    other: {
+        symbol: 'circle',
         fill: MUT_COLOR_OTHER,
-        stroke: "#000000",
-        strokeOpacity:NON_CNA_STROKE_OPACITY,
-        legendLabel: "Other"
-    }
+        stroke: '#000000',
+        strokeOpacity: NON_CNA_STROKE_OPACITY,
+        legendLabel: 'Other',
+    },
 };
 
-export const oncoprintMutationTypeToAppearanceDefault:{[mutType:string]:{symbol:string, fill:string, stroke:string, strokeOpacity:number, legendLabel:string}}
-    = {
-    "inframe": {
-        symbol : "circle",
+export const oncoprintMutationTypeToAppearanceDefault: {
+    [mutType: string]: {
+        symbol: string;
+        fill: string;
+        stroke: string;
+        strokeOpacity: number;
+        legendLabel: string;
+    };
+} = {
+    inframe: {
+        symbol: 'circle',
         fill: MUT_COLOR_INFRAME,
-        stroke : "#000000",
-        strokeOpacity:NON_CNA_STROKE_OPACITY,
-        legendLabel : "Inframe"
+        stroke: '#000000',
+        strokeOpacity: NON_CNA_STROKE_OPACITY,
+        legendLabel: 'Inframe',
     },
-    "missense":{
-        symbol : "circle",
-        fill : MUT_COLOR_MISSENSE,
-        stroke : "#000000",
-        strokeOpacity:NON_CNA_STROKE_OPACITY,
-        legendLabel : "Missense"
+    missense: {
+        symbol: 'circle',
+        fill: MUT_COLOR_MISSENSE,
+        stroke: '#000000',
+        strokeOpacity: NON_CNA_STROKE_OPACITY,
+        legendLabel: 'Missense',
     },
-    "fusion":{
-        symbol: "circle",
+    fusion: {
+        symbol: 'circle',
         fill: MUT_COLOR_FUSION,
-        stroke: "#000000",
-        strokeOpacity:NON_CNA_STROKE_OPACITY,
-        legendLabel: "Fusion"
+        stroke: '#000000',
+        strokeOpacity: NON_CNA_STROKE_OPACITY,
+        legendLabel: 'Fusion',
     },
-    "trunc":{
-        symbol: "circle",
+    trunc: {
+        symbol: 'circle',
         fill: MUT_COLOR_TRUNC,
-        stroke: "#000000",
-        strokeOpacity:NON_CNA_STROKE_OPACITY,
-        legendLabel: "Truncating"
+        stroke: '#000000',
+        strokeOpacity: NON_CNA_STROKE_OPACITY,
+        legendLabel: 'Truncating',
     },
-    "promoter":{
-        symbol: "circle",
+    promoter: {
+        symbol: 'circle',
         fill: MUT_COLOR_PROMOTER,
-        stroke: "#000000",
-        strokeOpacity:NON_CNA_STROKE_OPACITY,
-        legendLabel: "Promoter"
+        stroke: '#000000',
+        strokeOpacity: NON_CNA_STROKE_OPACITY,
+        legendLabel: 'Promoter',
     },
-    "other":{
-        symbol: "circle",
+    other: {
+        symbol: 'circle',
         fill: MUT_COLOR_OTHER,
-        stroke: "#000000",
-        strokeOpacity:NON_CNA_STROKE_OPACITY,
-        legendLabel: "Other"
-    }
+        stroke: '#000000',
+        strokeOpacity: NON_CNA_STROKE_OPACITY,
+        legendLabel: 'Other',
+    },
 };
 
 export const notProfiledCnaAppearance = {
-    symbol: "circle",
-    stroke: "#000000",
-    strokeOpacity:0.3,
+    symbol: 'circle',
+    stroke: '#000000',
+    strokeOpacity: 0.3,
 };
-export const notProfiledMutationsAppearance = Object.assign({}, {fill: "#ffffff"}, notProfiledCnaAppearance);
+export const notProfiledMutationsAppearance = Object.assign(
+    {},
+    { fill: '#ffffff' },
+    notProfiledCnaAppearance
+);
 
 export const mutationLegendOrder = [
-    "fusion",
-    "promoter.driver", "promoter",
-    "trunc.driver", "trunc",
-    "inframe.driver", "inframe",
-    "missense.driver", "missense", "other"
+    'fusion',
+    'promoter.driver',
+    'promoter',
+    'trunc.driver',
+    'trunc',
+    'inframe.driver',
+    'inframe',
+    'missense.driver',
+    'missense',
+    'other',
 ];
 export const mutationRenderPriority = stringListToIndexSet([
-    "fusion", "promoter.driver", "trunc.driver", "inframe.driver", "missense.driver",
-    "promoter", "trunc", "inframe", "missense", "other", MUTATION_TYPE_NOT_MUTATED, MUTATION_TYPE_NOT_PROFILED
+    'fusion',
+    'promoter.driver',
+    'trunc.driver',
+    'inframe.driver',
+    'missense.driver',
+    'promoter',
+    'trunc',
+    'inframe',
+    'missense',
+    'other',
+    MUTATION_TYPE_NOT_MUTATED,
+    MUTATION_TYPE_NOT_PROFILED,
 ]);
 
 export const noMutationAppearance = {
-    symbol : "circle",
-    fill: "#c4e5f5",
-    stroke : "#000000",
-    strokeOpacity:0.3,
-    legendLabel : "Not mutated"
+    symbol: 'circle',
+    fill: '#c4e5f5',
+    stroke: '#000000',
+    strokeOpacity: 0.3,
+    legendLabel: 'Not mutated',
 };
 
 export const mutationSummaryToAppearance = {
-    "Neither":{
-        fill: "#00AAF8",
-        stroke: "#0089C6",
-        strokeOpacity:1,
-        legendLabel: "Neither mutated"
+    Neither: {
+        fill: '#00AAF8',
+        stroke: '#0089C6',
+        strokeOpacity: 1,
+        legendLabel: 'Neither mutated',
     },
-    "One":{
-        fill : "#DBA901",
-        stroke : "#886A08",
-        strokeOpacity:1,
-        legendLabel : "One Gene mutated"
+    One: {
+        fill: '#DBA901',
+        stroke: '#886A08',
+        strokeOpacity: 1,
+        legendLabel: 'One Gene mutated',
+    },
+    Both: {
+        fill: '#FF0000',
+        stroke: '#B40404',
+        strokeOpacity: 1,
+        legendLabel: 'Both mutated',
     },
-    "Both":{
-        fill : "#FF0000",
-        stroke : "#B40404",
-        strokeOpacity:1,
-        legendLabel: "Both mutated"
-    }
 };
-export const mutationSummaryLegendOrder = [MutationSummary.Both, MutationSummary.One, MutationSummary.Neither];
-export const mutationSummaryRenderPriority = stringListToIndexSet((mutationSummaryLegendOrder as any[]).concat(MUTATION_TYPE_NOT_PROFILED));
+export const mutationSummaryLegendOrder = [
+    MutationSummary.Both,
+    MutationSummary.One,
+    MutationSummary.Neither,
+];
+export const mutationSummaryRenderPriority = stringListToIndexSet(
+    (mutationSummaryLegendOrder as any[]).concat(MUTATION_TYPE_NOT_PROFILED)
+);
 
 const cnaToAppearance = {
-    "-2":{
-        legendLabel: "Deep Deletion",
-        stroke:CNA_COLOR_HOMDEL,
-        strokeOpacity:1,
+    '-2': {
+        legendLabel: 'Deep Deletion',
+        stroke: CNA_COLOR_HOMDEL,
+        strokeOpacity: 1,
     },
-    "-1":{
-        legendLabel: "Shallow Deletion",
-        stroke:"#2aced4",
-        strokeOpacity:1,
+    '-1': {
+        legendLabel: 'Shallow Deletion',
+        stroke: '#2aced4',
+        strokeOpacity: 1,
     },
-    "0":{
-        legendLabel: "Diploid",
-        stroke:DEFAULT_GREY,
-        strokeOpacity:1,
+    '0': {
+        legendLabel: 'Diploid',
+        stroke: DEFAULT_GREY,
+        strokeOpacity: 1,
     },
-    "1":{
-        legendLabel: "Gain",
-        stroke: "#ff8c9f",
-        strokeOpacity:1,
+    '1': {
+        legendLabel: 'Gain',
+        stroke: '#ff8c9f',
+        strokeOpacity: 1,
     },
-    "2":{
-        legendLabel: "Amplification",
+    '2': {
+        legendLabel: 'Amplification',
         stroke: CNA_COLOR_AMP,
-        strokeOpacity:1,
-    }
+        strokeOpacity: 1,
+    },
 };
 
 export const limitValueAppearance = {
     legendLabel: `Limit value`,
-    symbol: "diamond"
+    symbol: 'diamond',
 };
 
 export const waterfallSearchIndicatorAppearance = {
-    legendLabel: "Sample match",
-    symbol: "plus", 
-    fill: "white",
+    legendLabel: 'Sample match',
+    symbol: 'plus',
+    fill: 'white',
     fillOpacity: 1,
-    stroke: "red",
+    stroke: 'red',
     strokeWidth: 1,
     strokeOpacity: 1,
-    size: 3
+    size: 3,
 };
 
-const cnaCategoryOrder = ["-2", "-1", "0", "1", "2"].map(x=>(cnaToAppearance as any)[x].legendLabel);
-export const MUT_PROFILE_COUNT_MUTATED = "Mutated";
-export const MUT_PROFILE_COUNT_MULTIPLE = "Multiple";
-export const MUT_PROFILE_COUNT_NOT_MUTATED = "Wild type";
-export const MUT_PROFILE_COUNT_NOT_PROFILED = "Not profiled";
+const cnaCategoryOrder = ['-2', '-1', '0', '1', '2'].map(
+    x => (cnaToAppearance as any)[x].legendLabel
+);
+export const MUT_PROFILE_COUNT_MUTATED = 'Mutated';
+export const MUT_PROFILE_COUNT_MULTIPLE = 'Multiple';
+export const MUT_PROFILE_COUNT_NOT_MUTATED = 'Wild type';
+export const MUT_PROFILE_COUNT_NOT_PROFILED = 'Not profiled';
 export const mutTypeCategoryOrder = [
     mutationTypeToDisplayName.missense,
     mutationTypeToDisplayName.inframe,
@@ -1125,15 +1438,36 @@ export const mutTypeCategoryOrder = [
     mutationTypeToDisplayName.promoter,
     mutationTypeToDisplayName.other,
     MUT_PROFILE_COUNT_MULTIPLE,
-    MUT_PROFILE_COUNT_NOT_MUTATED, MUT_PROFILE_COUNT_NOT_PROFILED
+    MUT_PROFILE_COUNT_NOT_MUTATED,
+    MUT_PROFILE_COUNT_NOT_PROFILED,
+];
+export const mutVsWildCategoryOrder = [
+    MUT_PROFILE_COUNT_MUTATED,
+    MUT_PROFILE_COUNT_NOT_MUTATED,
+    MUT_PROFILE_COUNT_NOT_PROFILED,
 ];
-export const mutVsWildCategoryOrder = [MUT_PROFILE_COUNT_MUTATED, MUT_PROFILE_COUNT_NOT_MUTATED, MUT_PROFILE_COUNT_NOT_PROFILED];
 
 export const cnaRenderPriority = stringListToIndexSet([
-    "-2", "2", "-1", "1", "0", CNA_TYPE_NOT_PROFILED
+    '-2',
+    '2',
+    '-1',
+    '1',
+    '0',
+    CNA_TYPE_NOT_PROFILED,
 ]);
 
-function getMutationTypeAppearance(d:IPlotSampleData, oncoprintMutationTypeToAppearance:{[mutType:string]:{symbol:string, fill:string, stroke:string, strokeOpacity:number, legendLabel:string}}) {
+function getMutationTypeAppearance(
+    d: IPlotSampleData,
+    oncoprintMutationTypeToAppearance: {
+        [mutType: string]: {
+            symbol: string;
+            fill: string;
+            stroke: string;
+            strokeOpacity: number;
+            legendLabel: string;
+        };
+    }
+) {
     if (!d.profiledMutations) {
         return notProfiledMutationsAppearance;
     } else if (!d.dispMutationType) {
@@ -1142,7 +1476,7 @@ function getMutationTypeAppearance(d:IPlotSampleData, oncoprintMutationTypeToApp
         return oncoprintMutationTypeToAppearance[d.dispMutationType];
     }
 }
-function getCopyNumberAppearance(d:IPlotSampleData) {
+function getCopyNumberAppearance(d: IPlotSampleData) {
     if (!d.profiledCna || !d.dispCna) {
         return notProfiledCnaAppearance;
     } else {
@@ -1150,7 +1484,7 @@ function getCopyNumberAppearance(d:IPlotSampleData) {
     }
 }
 
-function getLimitValueAppearance(d:IPlotSampleData) {
+function getLimitValueAppearance(d: IPlotSampleData) {
     if (dataPointIsLimited(d)) {
         return limitValueAppearance;
     } else {
@@ -1163,107 +1497,181 @@ export function makeScatterPlotPointAppearance(
     mutationDataExists: MobxPromise<boolean>,
     cnaDataExists: MobxPromise<boolean>,
     driversAnnotated: boolean
-):(d:IPlotSampleData)=>{ stroke:string, strokeOpacity:number, fill?:string, fillOpacity?:number, symbol?:string} {
-    const oncoprintMutationTypeToAppearance = driversAnnotated ? oncoprintMutationTypeToAppearanceDrivers: oncoprintMutationTypeToAppearanceDefault;
-    
+): (
+    d: IPlotSampleData
+) => {
+    stroke: string;
+    strokeOpacity: number;
+    fill?: string;
+    fillOpacity?: number;
+    symbol?: string;
+} {
+    const oncoprintMutationTypeToAppearance = driversAnnotated
+        ? oncoprintMutationTypeToAppearanceDrivers
+        : oncoprintMutationTypeToAppearanceDefault;
+
     switch (viewType) {
         case ViewType.MutationTypeAndCopyNumber:
-        if (cnaDataExists.isComplete && cnaDataExists.result && mutationDataExists.isComplete && mutationDataExists.result) {
-            return (d:IPlotSampleData)=>{
-                const cnaAppearance = getCopyNumberAppearance(d);
-                const mutAppearance = getMutationTypeAppearance(d, oncoprintMutationTypeToAppearance);
-                return Object.assign({}, mutAppearance, cnaAppearance); // overwrite with cna stroke
-            };
-        }
-        break;
+            if (
+                cnaDataExists.isComplete &&
+                cnaDataExists.result &&
+                mutationDataExists.isComplete &&
+                mutationDataExists.result
+            ) {
+                return (d: IPlotSampleData) => {
+                    const cnaAppearance = getCopyNumberAppearance(d);
+                    const mutAppearance = getMutationTypeAppearance(
+                        d,
+                        oncoprintMutationTypeToAppearance
+                    );
+                    return Object.assign({}, mutAppearance, cnaAppearance); // overwrite with cna stroke
+                };
+            }
+            break;
         case ViewType.CopyNumber:
-        if (cnaDataExists.isComplete && cnaDataExists.result) {
-            return getCopyNumberAppearance;
-        }
-        break;
+            if (cnaDataExists.isComplete && cnaDataExists.result) {
+                return getCopyNumberAppearance;
+            }
+            break;
         case ViewType.MutationType:
             if (mutationDataExists.isComplete && mutationDataExists.result) {
-                return (d:IPlotSampleData)=>{
-                    return getMutationTypeAppearance(d, oncoprintMutationTypeToAppearance);
-                }
+                return (d: IPlotSampleData) => {
+                    return getMutationTypeAppearance(
+                        d,
+                        oncoprintMutationTypeToAppearance
+                    );
+                };
             }
             break;
         case ViewType.LimitValMutationTypeAndCopyNumber:
-            if (cnaDataExists.isComplete && cnaDataExists.result && mutationDataExists.isComplete && mutationDataExists.result) {
-                return (d:IPlotSampleData)=>{
+            if (
+                cnaDataExists.isComplete &&
+                cnaDataExists.result &&
+                mutationDataExists.isComplete &&
+                mutationDataExists.result
+            ) {
+                return (d: IPlotSampleData) => {
                     const limitValAppearance = getLimitValueAppearance(d);
                     const cnaAppearance = getCopyNumberAppearance(d);
-                    const mutAppearance = getMutationTypeAppearance(d, oncoprintMutationTypeToAppearance);
-                    return Object.assign({}, mutAppearance, cnaAppearance, limitValAppearance); // overwrite with cna stroke
-                }
+                    const mutAppearance = getMutationTypeAppearance(
+                        d,
+                        oncoprintMutationTypeToAppearance
+                    );
+                    return Object.assign(
+                        {},
+                        mutAppearance,
+                        cnaAppearance,
+                        limitValAppearance
+                    ); // overwrite with cna stroke
+                };
             }
             break;
         case ViewType.LimitValCopyNumber:
             if (cnaDataExists.isComplete && cnaDataExists.result) {
-                return (d:IPlotSampleData)=>{
+                return (d: IPlotSampleData) => {
                     const limitValAppearance = getLimitValueAppearance(d);
                     const cnaAppearance = getCopyNumberAppearance(d);
                     return Object.assign({}, cnaAppearance, limitValAppearance);
-                }
+                };
             }
             break;
         case ViewType.LimitValMutationType:
             if (mutationDataExists.isComplete && mutationDataExists.result) {
-                return (d:IPlotSampleData)=>{
+                return (d: IPlotSampleData) => {
                     const limitValAppearance = getLimitValueAppearance(d);
-                    const mutAppearance = getMutationTypeAppearance(d, oncoprintMutationTypeToAppearance);
+                    const mutAppearance = getMutationTypeAppearance(
+                        d,
+                        oncoprintMutationTypeToAppearance
+                    );
                     return Object.assign({}, mutAppearance, limitValAppearance); // overwrite with appearance for limit values
-                }
+                };
             }
             break;
         case ViewType.LimitVal:
-            return (d:IPlotSampleData)=>{
+            return (d: IPlotSampleData) => {
                 const limitValAppearance = getLimitValueAppearance(d);
-                const defaultAppearance = mutationSummaryToAppearance[MutationSummary.Neither];
+                const defaultAppearance =
+                    mutationSummaryToAppearance[MutationSummary.Neither];
                 return Object.assign({}, defaultAppearance, limitValAppearance);
-            }
+            };
         case ViewType.MutationSummary:
             if (mutationDataExists.isComplete && mutationDataExists.result) {
-                return (d:IPlotSampleData)=>{
+                return (d: IPlotSampleData) => {
                     if (!d.profiledMutations) {
                         return notProfiledMutationsAppearance;
                     } else if (!d.dispMutationSummary) {
                         return noMutationAppearance;
                     } else {
-                        return mutationSummaryToAppearance[d.dispMutationSummary];
+                        return mutationSummaryToAppearance[
+                            d.dispMutationSummary
+                        ];
                     }
                 };
             }
             break;
     }
     // By default, return same circle as mutation summary "Neither"
-    return ()=>mutationSummaryToAppearance[MutationSummary.Neither];
+    return () => mutationSummaryToAppearance[MutationSummary.Neither];
 }
 
 function mutationsProteinChanges(
-    mutations:Mutation[],
-    entrezGeneIdToGene:{[entrezGeneId:number]:Gene}
+    mutations: Mutation[],
+    entrezGeneIdToGene: { [entrezGeneId: number]: Gene }
 ) {
-    const mutationsByGene = _.groupBy(mutations, m=>entrezGeneIdToGene[m.entrezGeneId].hugoGeneSymbol);
-    const sorted = _.chain(mutationsByGene).entries().sortBy(x=>x[0]).value();
-    return sorted.map(entry=>`${entry[0]}: ${entry[1].filter(m=>!!m.proteinChange).map(m=>m.proteinChange).join(", ")}`);
+    const mutationsByGene = _.groupBy(
+        mutations,
+        m => entrezGeneIdToGene[m.entrezGeneId].hugoGeneSymbol
+    );
+    const sorted = _.chain(mutationsByGene)
+        .entries()
+        .sortBy(x => x[0])
+        .value();
+    return sorted.map(
+        entry =>
+            `${entry[0]}: ${entry[1]
+                .filter(m => !!m.proteinChange)
+                .map(m => m.proteinChange)
+                .join(', ')}`
+    );
 }
 
-export function tooltipMutationsSection(
-    mutations:AnnotatedMutation[],
-) {
-    const oncoKbIcon = (mutation:AnnotatedMutation)=>(<img src={require("../../../rootImages/oncokb-oncogenic-1.svg")} title={mutation.oncoKbOncogenic} style={{height:11, width:11, marginLeft:2, marginBottom: 2}}/>);
-    const hotspotIcon = <img src={require("../../../rootImages/cancer-hotspots.svg")} title="Hotspot" style={{height:11, width:11, marginLeft:2, marginBottom:3}}/>;
-    const mutationsByGene = _.groupBy(mutations.filter(m=>!!m.proteinChange), m=>m.hugoGeneSymbol);
-    const sorted = _.chain(mutationsByGene).entries().sortBy(x=>x[0]).value();
+export function tooltipMutationsSection(mutations: AnnotatedMutation[]) {
+    const oncoKbIcon = (mutation: AnnotatedMutation) => (
+        <img
+            src={require('../../../rootImages/oncokb-oncogenic-1.svg')}
+            title={mutation.oncoKbOncogenic}
+            style={{ height: 11, width: 11, marginLeft: 2, marginBottom: 2 }}
+        />
+    );
+    const hotspotIcon = (
+        <img
+            src={require('../../../rootImages/cancer-hotspots.svg')}
+            title="Hotspot"
+            style={{ height: 11, width: 11, marginLeft: 2, marginBottom: 3 }}
+        />
+    );
+    const mutationsByGene = _.groupBy(
+        mutations.filter(m => !!m.proteinChange),
+        m => m.hugoGeneSymbol
+    );
+    const sorted = _.chain(mutationsByGene)
+        .entries()
+        .sortBy(x => x[0])
+        .value();
     return (
         <span>
-            {sorted.map(entry=>{
+            {sorted.map(entry => {
                 const proteinChangeComponents = [];
                 for (const mutation of entry[1]) {
                     proteinChangeComponents.push(
                         <span key={mutation.proteinChange}>
-                            {mutation.proteinChange}<span style={{marginLeft:1}}>{mutation.isHotspot ? hotspotIcon : null}{mutation.oncoKbOncogenic ? oncoKbIcon(mutation) : null}</span>
+                            {mutation.proteinChange}
+                            <span style={{ marginLeft: 1 }}>
+                                {mutation.isHotspot ? hotspotIcon : null}
+                                {mutation.oncoKbOncogenic
+                                    ? oncoKbIcon(mutation)
+                                    : null}
+                            </span>
                         </span>
                     );
                     proteinChangeComponents.push(<span>, </span>);
@@ -1279,21 +1687,36 @@ export function tooltipMutationsSection(
     );
 }
 
-export function tooltipCnaSection(
-    data:AnnotatedNumericGeneMolecularData[],
-) {
-    const oncoKbIcon = (alt:AnnotatedNumericGeneMolecularData)=>(<img src={require("../../../rootImages/oncokb-oncogenic-1.svg")} title={alt.oncoKbOncogenic} style={{height:11, width:11, marginLeft:2, marginBottom: 2}}/>);
-    const altsByGene = _.groupBy(data, alt=>alt.hugoGeneSymbol);
-    const sorted = _.chain(altsByGene).entries().sortBy(x=>x[0]).value();
+export function tooltipCnaSection(data: AnnotatedNumericGeneMolecularData[]) {
+    const oncoKbIcon = (alt: AnnotatedNumericGeneMolecularData) => (
+        <img
+            src={require('../../../rootImages/oncokb-oncogenic-1.svg')}
+            title={alt.oncoKbOncogenic}
+            style={{ height: 11, width: 11, marginLeft: 2, marginBottom: 2 }}
+        />
+    );
+    const altsByGene = _.groupBy(data, alt => alt.hugoGeneSymbol);
+    const sorted = _.chain(altsByGene)
+        .entries()
+        .sortBy(x => x[0])
+        .value();
     return (
         <span>
-            {sorted.map(entry=>{
+            {sorted.map(entry => {
                 const alterationComponents = [];
                 for (const alt of entry[1]) {
                     if (alt.value in cnaToAppearance) {
                         alterationComponents.push(
                             <span key={alt.value}>
-                                {(cnaToAppearance as any)[alt.value].legendLabel}<span style={{marginLeft:1}}>{alt.oncoKbOncogenic ? oncoKbIcon(alt) : null}</span>
+                                {
+                                    (cnaToAppearance as any)[alt.value]
+                                        .legendLabel
+                                }
+                                <span style={{ marginLeft: 1 }}>
+                                    {alt.oncoKbOncogenic
+                                        ? oncoKbIcon(alt)
+                                        : null}
+                                </span>
                             </span>
                         );
                         alterationComponents.push(<span>, </span>);
@@ -1311,99 +1734,136 @@ export function tooltipCnaSection(
 }
 
 function generalScatterPlotTooltip<D extends IPlotSampleData>(
-    d:D,
-    horizontalKey:keyof D,
-    verticalKey:keyof D,
-    horzKeyThresholdType:keyof D,
-    vertKeyThresholdType:keyof D
+    d: D,
+    horizontalKey: keyof D,
+    verticalKey: keyof D,
+    horzKeyThresholdType: keyof D,
+    vertKeyThresholdType: keyof D
 ) {
-    let mutationsSection:any = null;
+    let mutationsSection: any = null;
     if (d.mutations.length > 0) {
         mutationsSection = tooltipMutationsSection(d.mutations);
     }
-    let cnaSection:any = null;
+    let cnaSection: any = null;
     if (d.copyNumberAlterations.length > 0) {
         cnaSection = tooltipCnaSection(d.copyNumberAlterations);
     }
-    
-    let horzLabel = horzKeyThresholdType? `${d[horzKeyThresholdType]}${d[horizontalKey]}` : d[horizontalKey];
-    let vertLabel = vertKeyThresholdType? `${d[vertKeyThresholdType]}${d[verticalKey]}` : d[verticalKey];
+
+    let horzLabel = horzKeyThresholdType
+        ? `${d[horzKeyThresholdType]}${d[horizontalKey]}`
+        : d[horizontalKey];
+    let vertLabel = vertKeyThresholdType
+        ? `${d[vertKeyThresholdType]}${d[verticalKey]}`
+        : d[verticalKey];
     return (
         <div>
-            <a href={getSampleViewUrl(d.studyId, d.sampleId)} target="_blank">{d.sampleId}</a>
-            <div>Horizontal: <span style={{fontWeight:"bold"}}> {horzLabel}</span></div>
-            <div>Vertical: <span style={{fontWeight:"bold"}}> {vertLabel}</span></div>
+            <a href={getSampleViewUrl(d.studyId, d.sampleId)} target="_blank">
+                {d.sampleId}
+            </a>
+            <div>
+                Horizontal:{' '}
+                <span style={{ fontWeight: 'bold' }}> {horzLabel}</span>
+            </div>
+            <div>
+                Vertical:{' '}
+                <span style={{ fontWeight: 'bold' }}> {vertLabel}</span>
+            </div>
             {mutationsSection}
-            {!!mutationsSection && <br/>}
+            {!!mutationsSection && <br />}
             {cnaSection}
         </div>
     );
 }
 
-export function waterfallPlotTooltip(d:IWaterfallPlotData) {
-    return generalWaterfallPlotTooltip<IWaterfallPlotData>(d, "value", "thresholdType");
+export function waterfallPlotTooltip(d: IWaterfallPlotData) {
+    return generalWaterfallPlotTooltip<IWaterfallPlotData>(
+        d,
+        'value',
+        'thresholdType'
+    );
 }
 
 function generalWaterfallPlotTooltip<D extends IWaterfallPlotData>(
-    d:D,
-    valueKey:keyof D,
-    thresholdTypeKey?:keyof D
+    d: D,
+    valueKey: keyof D,
+    thresholdTypeKey?: keyof D
 ) {
-    let mutationsSection:any = null;
+    let mutationsSection: any = null;
     if (d.mutations.length > 0) {
         mutationsSection = tooltipMutationsSection(d.mutations);
     }
-    let cnaSection:any = null;
+    let cnaSection: any = null;
     if (d.copyNumberAlterations.length > 0) {
         cnaSection = tooltipCnaSection(d.copyNumberAlterations);
     }
-    
-    let value:any = d[valueKey];
+
+    let value: any = d[valueKey];
     value = value.toFixed(4);
-    const thresholdType = thresholdTypeKey && d[thresholdTypeKey]? d[thresholdTypeKey] : "";
+    const thresholdType =
+        thresholdTypeKey && d[thresholdTypeKey] ? d[thresholdTypeKey] : '';
 
     return (
         <div>
             <a
                 href={getSampleViewUrl(d.studyId, d.sampleId)}
                 target="_blank"
-                style={{whiteSpace: 'pre-line', wordBreak: 'break-word'}}
+                style={{ whiteSpace: 'pre-line', wordBreak: 'break-word' }}
             >
                 {d.sampleId}
             </a>
-            <div>Value: <span style={{fontWeight:"bold"}}> {thresholdType}{value} </span></div>
+            <div>
+                Value:{' '}
+                <span style={{ fontWeight: 'bold' }}>
+                    {' '}
+                    {thresholdType}
+                    {value}{' '}
+                </span>
+            </div>
             {mutationsSection}
-            {!!mutationsSection && <br/>}
+            {!!mutationsSection && <br />}
             {cnaSection}
         </div>
     );
 }
 
-export function scatterPlotTooltip(d:IScatterPlotData) {
-    return generalScatterPlotTooltip(d, "x", "y", "xThresholdType", "yThresholdType");
+export function scatterPlotTooltip(d: IScatterPlotData) {
+    return generalScatterPlotTooltip(
+        d,
+        'x',
+        'y',
+        'xThresholdType',
+        'yThresholdType'
+    );
 }
 
-export function boxPlotTooltip(
-    d:IBoxScatterPlotPoint,
-    horizontal:boolean
-) {
-    let horzAxisKey = horizontal ? "value" : "category" as any;
-    let vertAxisKey = horizontal ? "category" : "value" as any;
-    let horzThresholdTypeKey = horizontal ? "thresholdType" : undefined as any;
-    let vertThresholdTypeKey = horizontal ? undefined : "thresholdType" as any;
-    return generalScatterPlotTooltip(d, horzAxisKey, vertAxisKey, horzThresholdTypeKey, vertThresholdTypeKey);
+export function boxPlotTooltip(d: IBoxScatterPlotPoint, horizontal: boolean) {
+    let horzAxisKey = horizontal ? 'value' : ('category' as any);
+    let vertAxisKey = horizontal ? 'category' : ('value' as any);
+    let horzThresholdTypeKey = horizontal
+        ? 'thresholdType'
+        : (undefined as any);
+    let vertThresholdTypeKey = horizontal
+        ? undefined
+        : ('thresholdType' as any);
+    return generalScatterPlotTooltip(
+        d,
+        horzAxisKey,
+        vertAxisKey,
+        horzThresholdTypeKey,
+        vertThresholdTypeKey
+    );
 }
 
-export function logScalePossibleForProfile(profileId:string) {
-    return !(/zscore/i.test(profileId)) &&
-        /rna_seq/i.test(profileId);
+export function logScalePossibleForProfile(profileId: string) {
+    return !/zscore/i.test(profileId) && /rna_seq/i.test(profileId);
 }
 
-export function logScalePossible(
-    axisSelection: AxisMenuSelection
-) {
+export function logScalePossible(axisSelection: AxisMenuSelection) {
     if (axisSelection.dataType !== CLIN_ATTR_DATA_TYPE) {
-        if (axisSelection.dataType && _.keys(GenericAssayTypeConstants).includes(axisSelection.dataType)) {
+        if (
+            axisSelection.dataType &&
+            _.keys(GenericAssayTypeConstants).includes(axisSelection.dataType)
+        ) {
             return true;
         }
         // molecular profile
@@ -1415,92 +1875,111 @@ export function logScalePossible(
         // clinical attribute
         return axisSelection.dataSourceId === MUTATION_COUNT;
     }
-
 }
 
 export function makeBoxScatterPlotData(
     horzData: IStringAxisData,
     vertData: INumberAxisData,
-    uniqueSampleKeyToSample:{[uniqueSampleKey:string]:Sample},
-    coverageInformation:CoverageInformation["samples"],
-    mutations?:{
-        molecularProfileIds:string[],
-        data: AnnotatedMutation[]
+    uniqueSampleKeyToSample: { [uniqueSampleKey: string]: Sample },
+    coverageInformation: CoverageInformation['samples'],
+    mutations?: {
+        molecularProfileIds: string[];
+        data: AnnotatedMutation[];
     },
-    copyNumberAlterations?:{
-        molecularProfileIds:string[],
-        data:AnnotatedNumericGeneMolecularData[]
+    copyNumberAlterations?: {
+        molecularProfileIds: string[];
+        data: AnnotatedNumericGeneMolecularData[];
     }
-):IBoxScatterPlotData<IBoxScatterPlotPoint>[] {
+): IBoxScatterPlotData<IBoxScatterPlotPoint>[] {
     const boxScatterPlotPoints = makeScatterPlotData(
-        horzData, vertData, uniqueSampleKeyToSample, coverageInformation, mutations, copyNumberAlterations
+        horzData,
+        vertData,
+        uniqueSampleKeyToSample,
+        coverageInformation,
+        mutations,
+        copyNumberAlterations
     );
-    const categoryToData = _.groupBy(boxScatterPlotPoints, p=>p.category);
-    let ret = _.entries(categoryToData).map(entry=>({
+    const categoryToData = _.groupBy(boxScatterPlotPoints, p => p.category);
+    let ret = _.entries(categoryToData).map(entry => ({
         label: entry[0],
-        data: entry[1]
+        data: entry[1],
     }));
     const categoryOrder = horzData.categoryOrder;
     if (categoryOrder) {
-        ret = _.sortBy(ret, datum=>categoryOrder.indexOf(datum.label));
+        ret = _.sortBy(ret, datum => categoryOrder.indexOf(datum.label));
     }
     return ret;
 }
 
-
 export function makeScatterPlotData(
     horzData: IStringAxisData,
     vertData: INumberAxisData,
-    uniqueSampleKeyToSample:{[uniqueSampleKey:string]:Sample},
-    coverageInformation:CoverageInformation["samples"],
-    mutations?:{
-        molecularProfileIds:string[],
-        data: AnnotatedMutation[]
+    uniqueSampleKeyToSample: { [uniqueSampleKey: string]: Sample },
+    coverageInformation: CoverageInformation['samples'],
+    mutations?: {
+        molecularProfileIds: string[];
+        data: AnnotatedMutation[];
     },
-    copyNumberAlterations?:{
-        molecularProfileIds:string[],
-        data:AnnotatedNumericGeneMolecularData[]
+    copyNumberAlterations?: {
+        molecularProfileIds: string[];
+        data: AnnotatedNumericGeneMolecularData[];
     }
-):IBoxScatterPlotPoint[];
+): IBoxScatterPlotPoint[];
 
 export function makeScatterPlotData(
     horzData: INumberAxisData,
     vertData: INumberAxisData,
-    uniqueSampleKeyToSample:{[uniqueSampleKey:string]:Sample},
-    coverageInformation:CoverageInformation["samples"],
-    mutations?:{
-        molecularProfileIds:string[],
-        data: AnnotatedMutation[]
+    uniqueSampleKeyToSample: { [uniqueSampleKey: string]: Sample },
+    coverageInformation: CoverageInformation['samples'],
+    mutations?: {
+        molecularProfileIds: string[];
+        data: AnnotatedMutation[];
     },
-    copyNumberAlterations?:{
-        molecularProfileIds:string[],
-        data:AnnotatedNumericGeneMolecularData[]
+    copyNumberAlterations?: {
+        molecularProfileIds: string[];
+        data: AnnotatedNumericGeneMolecularData[];
     }
-):IScatterPlotData[];
+): IScatterPlotData[];
 
 export function makeScatterPlotData(
-    horzData: INumberAxisData|IStringAxisData,
+    horzData: INumberAxisData | IStringAxisData,
     vertData: INumberAxisData,
-    uniqueSampleKeyToSample:{[uniqueSampleKey:string]:Sample},
-    coverageInformation:CoverageInformation["samples"],
-    mutations?:{
-        molecularProfileIds:string[],
-        data: AnnotatedMutation[]
+    uniqueSampleKeyToSample: { [uniqueSampleKey: string]: Sample },
+    coverageInformation: CoverageInformation['samples'],
+    mutations?: {
+        molecularProfileIds: string[];
+        data: AnnotatedMutation[];
     },
-    copyNumberAlterations?:{
-        molecularProfileIds:string[],
-        data:AnnotatedNumericGeneMolecularData[]
-    }
-):IScatterPlotData[]|IBoxScatterPlotPoint[] {
-    const mutationsMap:{[uniqueSampleKey:string]:AnnotatedMutation[]} =
-        mutations ? _.groupBy(mutations.data, m=>m.uniqueSampleKey) : {};
-    const cnaMap:{[uniqueSampleKey:string]:AnnotatedNumericGeneMolecularData[]} =
-        copyNumberAlterations? _.groupBy(copyNumberAlterations.data, d=>d.uniqueSampleKey) : {};
-    const dataMap:{[uniqueSampleKey:string]:Partial<IPlotSampleData & { horzValues:string[]|number[], horzThresholdTypes:string[], vertValues:number[], vertThresholdTypes:string[], jitter:number }>} = {};
+    copyNumberAlterations?: {
+        molecularProfileIds: string[];
+        data: AnnotatedNumericGeneMolecularData[];
+    }
+): IScatterPlotData[] | IBoxScatterPlotPoint[] {
+    const mutationsMap: {
+        [uniqueSampleKey: string]: AnnotatedMutation[];
+    } = mutations ? _.groupBy(mutations.data, m => m.uniqueSampleKey) : {};
+    const cnaMap: {
+        [uniqueSampleKey: string]: AnnotatedNumericGeneMolecularData[];
+    } = copyNumberAlterations
+        ? _.groupBy(copyNumberAlterations.data, d => d.uniqueSampleKey)
+        : {};
+    const dataMap: {
+        [uniqueSampleKey: string]: Partial<
+            IPlotSampleData & {
+                horzValues: string[] | number[];
+                horzThresholdTypes: string[];
+                vertValues: number[];
+                vertThresholdTypes: string[];
+                jitter: number;
+            }
+        >;
+    } = {};
     for (const d of horzData.data) {
         const sample = uniqueSampleKeyToSample[d.uniqueSampleKey];
-        const sampleCopyNumberAlterations:AnnotatedNumericGeneMolecularData[] | undefined = cnaMap[d.uniqueSampleKey];
-        let dispCna:AnnotatedNumericGeneMolecularData | undefined = undefined;
+        const sampleCopyNumberAlterations:
+            | AnnotatedNumericGeneMolecularData[]
+            | undefined = cnaMap[d.uniqueSampleKey];
+        let dispCna: AnnotatedNumericGeneMolecularData | undefined = undefined;
         if (sampleCopyNumberAlterations && sampleCopyNumberAlterations.length) {
             dispCna = sampleCopyNumberAlterations[0];
             for (const alt of sampleCopyNumberAlterations) {
@@ -1509,19 +1988,28 @@ export function makeScatterPlotData(
                 }
             }
         }
-        let dispMutationType:OncoprintMutationType | undefined = undefined;
-        const sampleMutations:AnnotatedMutation[] | undefined = mutationsMap[d.uniqueSampleKey];
+        let dispMutationType: OncoprintMutationType | undefined = undefined;
+        const sampleMutations: AnnotatedMutation[] | undefined =
+            mutationsMap[d.uniqueSampleKey];
         if (sampleMutations && sampleMutations.length) {
-            const counts =
-                _.chain(sampleMutations)
-                .groupBy(mutation=>{
+            const counts = _.chain(sampleMutations)
+                .groupBy(mutation => {
                     const mutationType = getOncoprintMutationType(mutation);
-                    const driverSuffix = (mutationType !== "fusion" && mutationType !== "promoter" && mutationType !== "other" && mutation.putativeDriver) ? ".driver" : "";
+                    const driverSuffix =
+                        mutationType !== 'fusion' &&
+                        mutationType !== 'promoter' &&
+                        mutationType !== 'other' &&
+                        mutation.putativeDriver
+                            ? '.driver'
+                            : '';
                     return `${mutationType}${driverSuffix}`;
                 })
-                .mapValues(muts=>muts.length)
+                .mapValues(muts => muts.length)
                 .value();
-            dispMutationType = selectDisplayValue(counts, mutationRenderPriority) as OncoprintMutationType;
+            dispMutationType = selectDisplayValue(
+                counts,
+                mutationRenderPriority
+            ) as OncoprintMutationType;
         }
         const sampleCoverageInfo = coverageInformation[d.uniqueSampleKey];
         let profiledMutations = undefined;
@@ -1535,19 +2023,25 @@ export function makeScatterPlotData(
             if (mutations) {
                 profiledMutations = false;
                 for (const molecularProfileId of mutations.molecularProfileIds) {
-                    profiledMutations = profiledMutations || !!profiledReport[molecularProfileId];
+                    profiledMutations =
+                        profiledMutations ||
+                        !!profiledReport[molecularProfileId];
                 }
             }
             if (copyNumberAlterations) {
                 profiledCna = false;
                 for (const molecularProfileId of copyNumberAlterations.molecularProfileIds) {
-                    profiledCna = profiledCna || !!profiledReport[molecularProfileId];
+                    profiledCna =
+                        profiledCna || !!profiledReport[molecularProfileId];
                 }
             }
         }
-        let dispMutationSummary:MutationSummary | undefined = undefined;
+        let dispMutationSummary: MutationSummary | undefined = undefined;
         if (profiledMutations) {
-            const genesMutatedCount = _.uniqBy(sampleMutations, m=>m.entrezGeneId).length;
+            const genesMutatedCount = _.uniqBy(
+                sampleMutations,
+                m => m.entrezGeneId
+            ).length;
             if (genesMutatedCount === 0) {
                 dispMutationSummary = MutationSummary.Neither;
             } else if (genesMutatedCount === 1) {
@@ -1561,36 +2055,41 @@ export function makeScatterPlotData(
             sampleId: sample.sampleId,
             studyId: sample.studyId,
             horzValues: ([] as string[]).concat(d.value as string),
-            horzThresholdTypes: ([] as string[]).concat(d.thresholdType || ""),
+            horzThresholdTypes: ([] as string[]).concat(d.thresholdType || ''),
             mutations: sampleMutations || [],
-            copyNumberAlterations:sampleCopyNumberAlterations || [],
+            copyNumberAlterations: sampleCopyNumberAlterations || [],
             dispCna,
             dispMutationType,
             dispMutationSummary,
             profiledCna,
-            profiledMutations
+            profiledMutations,
         };
     }
-    const data:any[] = [];
+    const data: any[] = [];
     for (const d of vertData.data) {
         const datum = dataMap[d.uniqueSampleKey];
         if (datum) {
             // we only care about cases with both x and y data
             datum.vertValues = ([] as number[]).concat(d.value);
-            datum.vertThresholdTypes = ([] as string[]).concat(d.thresholdType || "");
+            datum.vertThresholdTypes = ([] as string[]).concat(
+                d.thresholdType || ''
+            );
             datum.jitter = getJitterForCase(d.uniqueSampleKey);
             data.push(datum);
         }
     }
     // expand horz and vert values in case theres multiple
-    const expandedData:any[] = [];
+    const expandedData: any[] = [];
     for (const d of data) {
         for (let h_cnt = 0; h_cnt < d.horzValues.length; h_cnt++) {
             let horzValue = d.horzValues[h_cnt];
             for (let v_cnt = 0; v_cnt < d.vertValues.length; v_cnt++) {
                 let vertValue = d.vertValues[v_cnt];
                 // filter out NaN number values
-                if (!Number.isNaN(horzValue as any) && !Number.isNaN(vertValue as any)) {
+                if (
+                    !Number.isNaN(horzValue as any) &&
+                    !Number.isNaN(vertValue as any)
+                ) {
                     let h_trType = d.horzThresholdTypes[h_cnt];
                     let v_trType = d.vertThresholdTypes[v_cnt];
                     expandedData.push(
@@ -1601,7 +2100,7 @@ export function makeScatterPlotData(
                             y: vertValue as number,
                             yThresholdType: v_trType,
                             value: vertValue as number,
-                            thresholdType: v_trType
+                            thresholdType: v_trType,
                         })
                     );
                 }
@@ -1613,64 +2112,83 @@ export function makeScatterPlotData(
 
 export function makeWaterfallPlotData(
     axisData: INumberAxisData,
-    uniqueSampleKeyToSample:{[uniqueSampleKey:string]:Sample},
-    coverageInformation:CoverageInformation["samples"],
-    selectedGene:Gene,
-    mutations?:{
-        molecularProfileIds:string[],
-        data: AnnotatedMutation[]
+    uniqueSampleKeyToSample: { [uniqueSampleKey: string]: Sample },
+    coverageInformation: CoverageInformation['samples'],
+    selectedGene: Gene,
+    mutations?: {
+        molecularProfileIds: string[];
+        data: AnnotatedMutation[];
     },
-    copyNumberAlterations?:{
-        molecularProfileIds:string[],
-        data:AnnotatedNumericGeneMolecularData[]
+    copyNumberAlterations?: {
+        molecularProfileIds: string[];
+        data: AnnotatedNumericGeneMolecularData[];
     }
-):IWaterfallPlotData[] {
-
-    const mutationsMap:{[uniqueSampleKey:string]:AnnotatedMutation[]} =
-        mutations ? _.groupBy(mutations.data, m=>m.uniqueSampleKey) : {};
+): IWaterfallPlotData[] {
+    const mutationsMap: {
+        [uniqueSampleKey: string]: AnnotatedMutation[];
+    } = mutations ? _.groupBy(mutations.data, m => m.uniqueSampleKey) : {};
 
-    const cnaMap:{[uniqueSampleKey:string]:AnnotatedNumericGeneMolecularData[]} =
-        copyNumberAlterations? _.groupBy(copyNumberAlterations.data, d=>d.uniqueSampleKey) : {};
+    const cnaMap: {
+        [uniqueSampleKey: string]: AnnotatedNumericGeneMolecularData[];
+    } = copyNumberAlterations
+        ? _.groupBy(copyNumberAlterations.data, d => d.uniqueSampleKey)
+        : {};
 
-    const contractedData:any[] = [];
+    const contractedData: any[] = [];
 
     for (const d of axisData.data) {
-
         const sample = uniqueSampleKeyToSample[d.uniqueSampleKey];
-        const sampleCopyNumberAlterations:AnnotatedNumericGeneMolecularData[] | undefined = cnaMap[d.uniqueSampleKey];
-        let dispCna:AnnotatedNumericGeneMolecularData | undefined = undefined;
-        let dispMutationType:OncoprintMutationType | undefined = undefined;
-        const sampleMutations:AnnotatedMutation[] | undefined = mutationsMap[d.uniqueSampleKey];
-        
+        const sampleCopyNumberAlterations:
+            | AnnotatedNumericGeneMolecularData[]
+            | undefined = cnaMap[d.uniqueSampleKey];
+        let dispCna: AnnotatedNumericGeneMolecularData | undefined = undefined;
+        let dispMutationType: OncoprintMutationType | undefined = undefined;
+        const sampleMutations: AnnotatedMutation[] | undefined =
+            mutationsMap[d.uniqueSampleKey];
+
         // For waterfall plot the datum styling looks at the currently selected gene
         // in the utilities menu. Below evalute which CNA to show for a sample.
         if (sampleCopyNumberAlterations && sampleCopyNumberAlterations.length) {
-            // filter CNA's for the selected gene and return (a random) one with the highest value 
+            // filter CNA's for the selected gene and return (a random) one with the highest value
             dispCna = _(sampleCopyNumberAlterations)
-                        .filter((d:AnnotatedNumericGeneMolecularData) => d.entrezGeneId === selectedGene.entrezGeneId)
-                        .maxBy("value");
+                .filter(
+                    (d: AnnotatedNumericGeneMolecularData) =>
+                        d.entrezGeneId === selectedGene.entrezGeneId
+                )
+                .maxBy('value');
         }
 
         // For waterfall plot the datum styling looks at the currently selected gene
         // in the utilities menu. Below evalute which mutation to show for a sample.
         if (sampleMutations && sampleMutations.length) {
-            const counts =
-                _(sampleMutations)
-                .filter((d:AnnotatedMutation) => d.entrezGeneId === selectedGene.entrezGeneId) // filter mutations by gene
-                .groupBy( (mutation:AnnotatedMutation) =>{
+            const counts = _(sampleMutations)
+                .filter(
+                    (d: AnnotatedMutation) =>
+                        d.entrezGeneId === selectedGene.entrezGeneId
+                ) // filter mutations by gene
+                .groupBy((mutation: AnnotatedMutation) => {
                     const mutationType = getOncoprintMutationType(mutation);
-                    const driverSuffix = (mutationType !== "fusion" && mutationType !== "promoter" && mutationType !== "other" && mutation.putativeDriver) ? ".driver" : "";
+                    const driverSuffix =
+                        mutationType !== 'fusion' &&
+                        mutationType !== 'promoter' &&
+                        mutationType !== 'other' &&
+                        mutation.putativeDriver
+                            ? '.driver'
+                            : '';
                     return `${mutationType}${driverSuffix}`;
                 })
-                .mapValues( (muts:AnnotatedMutation[]) =>muts.length)
+                .mapValues((muts: AnnotatedMutation[]) => muts.length)
                 .value();
-            dispMutationType = selectDisplayValue(counts, mutationRenderPriority) as OncoprintMutationType;
+            dispMutationType = selectDisplayValue(
+                counts,
+                mutationRenderPriority
+            ) as OncoprintMutationType;
         }
 
         const sampleCoverageInfo = coverageInformation[d.uniqueSampleKey];
-        
-        let profiledMutations:boolean|undefined = undefined;
-        let profiledCna:boolean|undefined = undefined;
+
+        let profiledMutations: boolean | undefined = undefined;
+        let profiledCna: boolean | undefined = undefined;
 
         if (mutations || copyNumberAlterations) {
             const profiledReport = makeWaterfallPlotData_profiledReport(
@@ -1680,18 +2198,21 @@ export function makeWaterfallPlotData(
             if (mutations) {
                 profiledMutations = false;
                 for (const molecularProfileId of mutations.molecularProfileIds) {
-                    profiledMutations = profiledMutations || !!profiledReport[molecularProfileId];
+                    profiledMutations =
+                        profiledMutations ||
+                        !!profiledReport[molecularProfileId];
                 }
             }
             if (copyNumberAlterations) {
                 profiledCna = false;
                 for (const molecularProfileId of copyNumberAlterations.molecularProfileIds) {
-                    profiledCna = profiledCna || !!profiledReport[molecularProfileId];
+                    profiledCna =
+                        profiledCna || !!profiledReport[molecularProfileId];
                 }
             }
         }
 
-        let dispMutationSummary:MutationSummary | undefined = undefined;
+        let dispMutationSummary: MutationSummary | undefined = undefined;
 
         contractedData.push({
             uniqueSampleKey: d.uniqueSampleKey,
@@ -1700,36 +2221,33 @@ export function makeWaterfallPlotData(
             values: ([] as number[]).concat(d.value),
             thresholdTypes: ([] as any[]).concat(d.thresholdType || undefined),
             mutations: sampleMutations || [],
-            copyNumberAlterations:sampleCopyNumberAlterations || [],
+            copyNumberAlterations: sampleCopyNumberAlterations || [],
             jitter: getJitterForCase(d.uniqueSampleKey),
             dispCna,
             dispMutationType,
             dispMutationSummary: undefined,
             profiledCna,
-            profiledMutations
+            profiledMutations,
         });
     }
 
     // expand values in case theres multiple value attached to a datum
-    const expandedData:any[] = [];
+    const expandedData: any[] = [];
     for (const d of contractedData) {
         for (let cnt = 0; cnt < d.values.length; cnt++) {
-
             let value = d.values[cnt];
 
             // filter out NaN number values
-            if (! Number.isNaN(value as any)) {
-
+            if (!Number.isNaN(value as any)) {
                 let trType = d.thresholdTypes[cnt];
 
                 expandedData.push(
                     Object.assign({}, d, {
                         value: value as number,
                         thresholdType: trType as string,
-                        category: value as string
+                        category: value as string,
                     })
                 );
-
             }
         }
     }
@@ -1738,19 +2256,19 @@ export function makeWaterfallPlotData(
 }
 
 function makeScatterPlotData_profiledReport(
-    horzHugoSymbol:string|undefined,
-    vertHugoSymbol:string|undefined,
-    sampleCoverageInfo: CoverageInformation["samples"][""]
-):{[molecularProfileId:string]:boolean} {
+    horzHugoSymbol: string | undefined,
+    vertHugoSymbol: string | undefined,
+    sampleCoverageInfo: CoverageInformation['samples']['']
+): { [molecularProfileId: string]: boolean } {
     // returns a map from molecular profile id to boolean, which is undefined iff both genes not profiled
-    const ret:{[molecularProfileId:string]:boolean} = {};
+    const ret: { [molecularProfileId: string]: boolean } = {};
     if (horzHugoSymbol) {
-        for (const gpData of (sampleCoverageInfo.byGene[horzHugoSymbol] || [])) {
+        for (const gpData of sampleCoverageInfo.byGene[horzHugoSymbol] || []) {
             ret[gpData.molecularProfileId] = true;
         }
     }
     if (vertHugoSymbol) {
-        for (const gpData of (sampleCoverageInfo.byGene[vertHugoSymbol] || [])) {
+        for (const gpData of sampleCoverageInfo.byGene[vertHugoSymbol] || []) {
             ret[gpData.molecularProfileId] = true;
         }
     }
@@ -1761,13 +2279,13 @@ function makeScatterPlotData_profiledReport(
 }
 
 function makeWaterfallPlotData_profiledReport(
-    hugoSymbol:string|undefined,
-    sampleCoverageInfo: CoverageInformation["samples"][""]
-):{[molecularProfileId:string]:boolean} {
+    hugoSymbol: string | undefined,
+    sampleCoverageInfo: CoverageInformation['samples']['']
+): { [molecularProfileId: string]: boolean } {
     // returns a map from molecular profile id to boolean, which is undefined iff both genes not profiled
-    const ret:{[molecularProfileId:string]:boolean} = {};
+    const ret: { [molecularProfileId: string]: boolean } = {};
     if (hugoSymbol) {
-        for (const gpData of (sampleCoverageInfo.byGene[hugoSymbol] || [])) {
+        for (const gpData of sampleCoverageInfo.byGene[hugoSymbol] || []) {
             ret[gpData.molecularProfileId] = true;
         }
     }
@@ -1778,172 +2296,232 @@ function makeWaterfallPlotData_profiledReport(
 }
 
 export function getCnaQueries(
-    horzSelection:AxisMenuSelection,
-    vertSelection:AxisMenuSelection,
-    utilitiesSelection:UtilitiesMenuSelection,
+    horzSelection: AxisMenuSelection,
+    vertSelection: AxisMenuSelection,
+    utilitiesSelection: UtilitiesMenuSelection
 ) {
-    const queries:{entrezGeneId:number}[] = [];
-    if (horzSelection.dataType !== CLIN_ATTR_DATA_TYPE
-        && (horzSelection.dataType === undefined || !_.keys(GenericAssayTypeConstants).includes(horzSelection.dataType))
-        && horzSelection.entrezGeneId !== undefined) {
-        queries.push({entrezGeneId: horzSelection.entrezGeneId});
-    }
-    if (vertSelection.dataType !== CLIN_ATTR_DATA_TYPE
-        && (horzSelection.dataType === undefined || !_.keys(GenericAssayTypeConstants).includes(horzSelection.dataType))
-        && vertSelection.entrezGeneId !== undefined) {
-        queries.push({entrezGeneId: vertSelection.entrezGeneId});
-    }
-    if (vertSelection.dataType === AlterationTypeConstants.COPY_NUMBER_ALTERATION
-        && (horzSelection.dataType === undefined || !_.keys(GenericAssayTypeConstants).includes(horzSelection.dataType))
-        && vertSelection.entrezGeneId !== undefined) {
-        queries.push({entrezGeneId: vertSelection.entrezGeneId});
-    }
-    if (showWaterfallPlot(horzSelection, vertSelection)
-        && utilitiesSelection.entrezGeneIdForMutCNAStyling !== undefined) {
-        queries.push({entrezGeneId: utilitiesSelection.entrezGeneIdForMutCNAStyling});
-    }
-    return _.uniqBy(queries,"entrezGeneId");
+    const queries: { entrezGeneId: number }[] = [];
+    if (
+        horzSelection.dataType !== CLIN_ATTR_DATA_TYPE &&
+        (horzSelection.dataType === undefined ||
+            !_.keys(GenericAssayTypeConstants).includes(
+                horzSelection.dataType
+            )) &&
+        horzSelection.entrezGeneId !== undefined
+    ) {
+        queries.push({ entrezGeneId: horzSelection.entrezGeneId });
+    }
+    if (
+        vertSelection.dataType !== CLIN_ATTR_DATA_TYPE &&
+        (horzSelection.dataType === undefined ||
+            !_.keys(GenericAssayTypeConstants).includes(
+                horzSelection.dataType
+            )) &&
+        vertSelection.entrezGeneId !== undefined
+    ) {
+        queries.push({ entrezGeneId: vertSelection.entrezGeneId });
+    }
+    if (
+        vertSelection.dataType ===
+            AlterationTypeConstants.COPY_NUMBER_ALTERATION &&
+        (horzSelection.dataType === undefined ||
+            !_.keys(GenericAssayTypeConstants).includes(
+                horzSelection.dataType
+            )) &&
+        vertSelection.entrezGeneId !== undefined
+    ) {
+        queries.push({ entrezGeneId: vertSelection.entrezGeneId });
+    }
+    if (
+        showWaterfallPlot(horzSelection, vertSelection) &&
+        utilitiesSelection.entrezGeneIdForMutCNAStyling !== undefined
+    ) {
+        queries.push({
+            entrezGeneId: utilitiesSelection.entrezGeneIdForMutCNAStyling,
+        });
+    }
+    return _.uniqBy(queries, 'entrezGeneId');
 }
 
 export function getMutationQueries(
-    horzSelection:AxisMenuSelection,
-    vertSelection:AxisMenuSelection,
-    utilitiesSelection:UtilitiesMenuSelection,
+    horzSelection: AxisMenuSelection,
+    vertSelection: AxisMenuSelection,
+    utilitiesSelection: UtilitiesMenuSelection
 ) {
-    const queries:{entrezGeneId:number}[] = [];
-    let horzEntrezGeneId:number|undefined;
-    if (horzSelection.dataType !== CLIN_ATTR_DATA_TYPE &&
-            horzSelection.entrezGeneId !== undefined) {
+    const queries: { entrezGeneId: number }[] = [];
+    let horzEntrezGeneId: number | undefined;
+    if (
+        horzSelection.dataType !== CLIN_ATTR_DATA_TYPE &&
+        horzSelection.entrezGeneId !== undefined
+    ) {
         horzEntrezGeneId = horzSelection.entrezGeneId;
         queries.push({ entrezGeneId: horzEntrezGeneId });
     }
-    if (vertSelection.dataType !== CLIN_ATTR_DATA_TYPE &&
-            vertSelection.entrezGeneId !== undefined &&
-            vertSelection.entrezGeneId !== horzEntrezGeneId) {
+    if (
+        vertSelection.dataType !== CLIN_ATTR_DATA_TYPE &&
+        vertSelection.entrezGeneId !== undefined &&
+        vertSelection.entrezGeneId !== horzEntrezGeneId
+    ) {
         queries.push({ entrezGeneId: vertSelection.entrezGeneId });
     }
-    if (showWaterfallPlot(horzSelection, vertSelection)
-        && utilitiesSelection.entrezGeneIdForMutCNAStyling !== undefined) {
-        queries.push({entrezGeneId: utilitiesSelection.entrezGeneIdForMutCNAStyling});
+    if (
+        showWaterfallPlot(horzSelection, vertSelection) &&
+        utilitiesSelection.entrezGeneIdForMutCNAStyling !== undefined
+    ) {
+        queries.push({
+            entrezGeneId: utilitiesSelection.entrezGeneIdForMutCNAStyling,
+        });
     }
-    return _.uniqBy(queries,"entrezGeneId");
+    return _.uniqBy(queries, 'entrezGeneId');
 }
 
-export function showWaterfallPlot(horzSelection:AxisMenuSelection, vertSelection:AxisMenuSelection):boolean {
-    return (vertSelection.dataType !== undefined && _.keys(GenericAssayTypeConstants).includes(vertSelection.dataType) && horzSelection.dataType === NONE_SELECTED_OPTION_STRING_VALUE)
-    || (horzSelection.dataType !== undefined && _.keys(GenericAssayTypeConstants).includes(horzSelection.dataType) && vertSelection.dataType === NONE_SELECTED_OPTION_STRING_VALUE);
+export function showWaterfallPlot(
+    horzSelection: AxisMenuSelection,
+    vertSelection: AxisMenuSelection
+): boolean {
+    return (
+        (vertSelection.dataType !== undefined &&
+            _.keys(GenericAssayTypeConstants).includes(
+                vertSelection.dataType
+            ) &&
+            horzSelection.dataType === NONE_SELECTED_OPTION_STRING_VALUE) ||
+        (horzSelection.dataType !== undefined &&
+            _.keys(GenericAssayTypeConstants).includes(
+                horzSelection.dataType
+            ) &&
+            vertSelection.dataType === NONE_SELECTED_OPTION_STRING_VALUE)
+    );
 }
 
 export function getScatterPlotDownloadData(
-    data:IScatterPlotData[],
-    xAxisLabel:string,
-    yAxisLabel:string,
-    entrezGeneIdToGene:{[entrezGeneId:number]:Gene}
+    data: IScatterPlotData[],
+    xAxisLabel: string,
+    yAxisLabel: string,
+    entrezGeneIdToGene: { [entrezGeneId: number]: Gene }
 ) {
-    const dataRows:string[] = [];
+    const dataRows: string[] = [];
     let hasMutations = false;
     for (const datum of data) {
-        const row:string[] = [];
+        const row: string[] = [];
         row.push(datum.sampleId);
         row.push(numeral(datum.x).format('0[.][000000]'));
         row.push(numeral(datum.y).format('0[.][000000]'));
         if (datum.mutations.length) {
-            row.push(mutationsProteinChanges(datum.mutations, entrezGeneIdToGene).join("; "));
+            row.push(
+                mutationsProteinChanges(
+                    datum.mutations,
+                    entrezGeneIdToGene
+                ).join('; ')
+            );
             hasMutations = true;
         } else if (datum.profiledMutations === false) {
-            row.push("Not Profiled");
+            row.push('Not Profiled');
             hasMutations = true;
         }
-        dataRows.push(row.join("\t"));
+        dataRows.push(row.join('\t'));
     }
-    const header = ["Sample Id", xAxisLabel, yAxisLabel];
+    const header = ['Sample Id', xAxisLabel, yAxisLabel];
     if (hasMutations) {
-        header.push("Mutations");
+        header.push('Mutations');
     }
-    return header.join("\t")+"\n"+dataRows.join("\n");
+    return header.join('\t') + '\n' + dataRows.join('\n');
 }
 
 export function getWaterfallPlotDownloadData(
-    data:IWaterfallPlotData[],
-    sortOrder:string,
-    pivotThreshold:number,
-    axisLabel:string,
-    entrezGeneIdToGene:{[enstrezGeneId:number]:Gene}
+    data: IWaterfallPlotData[],
+    sortOrder: string,
+    pivotThreshold: number,
+    axisLabel: string,
+    entrezGeneIdToGene: { [enstrezGeneId: number]: Gene }
 ) {
-
     let dataPoints = _.cloneDeep(data);
-    dataPoints = _.sortBy(dataPoints, (d:IWaterfallPlotData) => d.value);
-    if (sortOrder === "DESC") {
+    dataPoints = _.sortBy(dataPoints, (d: IWaterfallPlotData) => d.value);
+    if (sortOrder === 'DESC') {
         dataPoints = _.reverse(dataPoints);
     }
 
-    const dataRows:string[] = [];
+    const dataRows: string[] = [];
     let hasMutations = false;
     for (const datum of dataPoints) {
-        const row:string[] = [];
+        const row: string[] = [];
 
         row.push(datum.sampleId);
         row.push(numeral(datum.value).format('0[.][000000]'));
         row.push(numeral(pivotThreshold).format('0[.][000000]'));
-        row.push(sortOrder || "");
+        row.push(sortOrder || '');
         if (datum.mutations.length) {
-            row.push(mutationsProteinChanges(datum.mutations, entrezGeneIdToGene).join("; ")); // 4 concatenated mutations
+            row.push(
+                mutationsProteinChanges(
+                    datum.mutations,
+                    entrezGeneIdToGene
+                ).join('; ')
+            ); // 4 concatenated mutations
             hasMutations = true;
         } else if (datum.profiledMutations === false) {
-            row.push("Not Profiled");
+            row.push('Not Profiled');
             hasMutations = true;
         }
-        dataRows.push(row.join("\t"));
-    }
-    const header = ["Sample Id", `${axisLabel}`, "pivot threshold", "sort order" ];
+        dataRows.push(row.join('\t'));
+    }
+    const header = [
+        'Sample Id',
+        `${axisLabel}`,
+        'pivot threshold',
+        'sort order',
+    ];
     if (hasMutations) {
-        header.push("Mutations");
+        header.push('Mutations');
     }
-    return header.join("\t")+"\n"+dataRows.join("\n");
+    return header.join('\t') + '\n' + dataRows.join('\n');
 }
 
 export function getBoxPlotDownloadData(
-    data:IBoxScatterPlotData<IBoxScatterPlotPoint>[],
-    categoryLabel:string,
-    valueLabel:string,
-    entrezGeneIdToGene:{[entrezGeneId:number]:Gene}
+    data: IBoxScatterPlotData<IBoxScatterPlotPoint>[],
+    categoryLabel: string,
+    valueLabel: string,
+    entrezGeneIdToGene: { [entrezGeneId: number]: Gene }
 ) {
-    const dataRows:string[] = [];
+    const dataRows: string[] = [];
     let hasMutations = false;
     for (const categoryDatum of data) {
         const category = categoryDatum.label;
         for (const datum of categoryDatum.data) {
-            const row:string[] = [];
+            const row: string[] = [];
             row.push(datum.sampleId);
             row.push(category);
             row.push(numeral(datum.value).format('0[.][000000]'));
             if (datum.mutations.length) {
-                row.push(mutationsProteinChanges(datum.mutations, entrezGeneIdToGene).join("; "));
+                row.push(
+                    mutationsProteinChanges(
+                        datum.mutations,
+                        entrezGeneIdToGene
+                    ).join('; ')
+                );
                 hasMutations = true;
             } else if (datum.profiledMutations === false) {
-                row.push("Not Profiled");
+                row.push('Not Profiled');
                 hasMutations = true;
             }
-            dataRows.push(row.join("\t"));
+            dataRows.push(row.join('\t'));
         }
     }
-    const header = ["Sample Id", categoryLabel, valueLabel];
+    const header = ['Sample Id', categoryLabel, valueLabel];
     if (hasMutations) {
-        header.push("Mutations");
+        header.push('Mutations');
     }
-    return header.join("\t")+"\n"+dataRows.join("\n");
+    return header.join('\t') + '\n' + dataRows.join('\n');
 }
 
 export function getMutationProfileDuplicateSamplesReport(
-    horzAxisData:Pick<IAxisData,"data">,
-    vertAxisData:Pick<IAxisData,"data">,
-    horzSelection:Pick<AxisMenuSelection,"dataType">,
-    vertSelection:Pick<AxisMenuSelection,"dataType">
+    horzAxisData: Pick<IAxisData, 'data'>,
+    vertAxisData: Pick<IAxisData, 'data'>,
+    horzSelection: Pick<AxisMenuSelection, 'dataType'>,
+    vertSelection: Pick<AxisMenuSelection, 'dataType'>
 ) {
     // sampleToNumPoints maps a sample key to the number of points in the plot
     //  which are due to this sample. only samples with more than one point are
     //  entered.
-    const sampleToNumPoints:{[uniqueSampleKey:string]:number} = {};
+    const sampleToNumPoints: { [uniqueSampleKey: string]: number } = {};
 
     if (horzSelection.dataType === AlterationTypeConstants.MUTATION_EXTENDED) {
         for (const d of horzAxisData.data) {
@@ -1963,40 +2541,55 @@ export function getMutationProfileDuplicateSamplesReport(
 
                 // we combine the contribution from horz and vert data - we multiply them, bc a point is `create`d
                 //  for each horz value for each vert value
-                sampleToNumPoints[d.uniqueSampleKey] = (sampleToNumPoints[d.uniqueSampleKey] || 1)*d.value.length;
+                sampleToNumPoints[d.uniqueSampleKey] =
+                    (sampleToNumPoints[d.uniqueSampleKey] || 1) *
+                    d.value.length;
             }
         }
     }
 
     const numSamples = Object.keys(sampleToNumPoints).length;
-    const numPointsForTheseSamples = _.reduce(sampleToNumPoints, (sum, nextNumPoints)=>sum+nextNumPoints, 0);
+    const numPointsForTheseSamples = _.reduce(
+        sampleToNumPoints,
+        (sum, nextNumPoints) => sum + nextNumPoints,
+        0
+    );
     const numSurplusPoints = numPointsForTheseSamples - numSamples;
 
     return {
         showMessage: numSamples > 0,
-        numSamples, numSurplusPoints
+        numSamples,
+        numSurplusPoints,
     };
 }
 
 export function makeClinicalAttributeOptions(
-    attributes:Pick<ClinicalAttribute, "datatype"|"clinicalAttributeId"|"displayName"|"priority">[]
+    attributes: Pick<
+        ClinicalAttribute,
+        'datatype' | 'clinicalAttributeId' | 'displayName' | 'priority'
+    >[]
 ) {
     {
-
         // filter out anything but NUMBER or STRING
-        const validDataTypes = ["number", "string"];
+        const validDataTypes = ['number', 'string'];
         const validClinicalAttributes = attributes.filter(
-            attribute=>(validDataTypes.indexOf(attribute.datatype.toLowerCase()) > -1)
+            attribute =>
+                validDataTypes.indexOf(attribute.datatype.toLowerCase()) > -1
         );
 
         // sort
-        let options = _.sortBy<{value:string, label:string, priority:number}>(validClinicalAttributes.map(attribute=>(
-            {
+        let options = _.sortBy<{
+            value: string;
+            label: string;
+            priority: number;
+        }>(
+            validClinicalAttributes.map(attribute => ({
                 value: attribute.clinicalAttributeId,
                 label: attribute.displayName,
-                priority: parseFloat(attribute.priority || "-1")
-            }
-        )), [(o: any)=>-o.priority, (o: any)=>o.label]);
+                priority: parseFloat(attribute.priority || '-1'),
+            })),
+            [(o: any) => -o.priority, (o: any) => o.label]
+        );
 
         // to load more quickly, only filter and annotate with data availability once its ready
         // TODO: temporarily disabled because cant figure out a way right now to make this work nicely
@@ -2017,62 +2610,78 @@ export function makeClinicalAttributeOptions(
     }
 }
 
-export function makeAxisLogScaleFunction(axisSelection:AxisMenuSelection):IAxisLogScaleParams|undefined {
-
+export function makeAxisLogScaleFunction(
+    axisSelection: AxisMenuSelection
+): IAxisLogScaleParams | undefined {
     const MIN_LOG_ARGUMENT = 0.01;
 
     if (!axisSelection.logScale) {
         return undefined;
     }
 
-    let label;         // suffix that will appear in the axis label
-    let fLogScale;     // function for (log-)transforming a value
-    let fInvLogScale;  // function for back-transforming a value transformed with fLogScale
+    let label; // suffix that will appear in the axis label
+    let fLogScale; // function for (log-)transforming a value
+    let fInvLogScale; // function for back-transforming a value transformed with fLogScale
 
-    if(axisSelection.dataType === undefined || !_.keys(GenericAssayTypeConstants).includes(axisSelection.dataType)) {
-        // log-transformation parameters for non-treatment reponse 
+    if (
+        axisSelection.dataType === undefined ||
+        !_.keys(GenericAssayTypeConstants).includes(axisSelection.dataType)
+    ) {
+        // log-transformation parameters for non-treatment reponse
         // profile data. Note: log2-transformation is used by default
-        label = "log2";
-        fLogScale = (x:number) => Math.log2(Math.max(x, MIN_LOG_ARGUMENT));
-        fInvLogScale = (x:number) => Math.pow(2, x);
+        label = 'log2';
+        fLogScale = (x: number) => Math.log2(Math.max(x, MIN_LOG_ARGUMENT));
+        fInvLogScale = (x: number) => Math.pow(2, x);
     } else {
         // log-transformation parameters for treatment reponse profile
         // data. Note: log10-transformation is used for treatments
-        label = "log10";
-        fLogScale = (x:number, offset?:number) => {
+        label = 'log10';
+        fLogScale = (x: number, offset?: number) => {
             // for log transformation one should be able to handle negative values;
             // this is done by pre-application of a externally provided offset.
             if (!offset) {
                 offset = 0;
             }
-            if (x+offset === 0) {
+            if (x + offset === 0) {
                 // 0 cannot be log-transformed, return 0 when input is 0
                 return 0;
             }
-            return Math.log10(x+offset);
+            return Math.log10(x + offset);
         };
-        fInvLogScale = (x:number, offset?:number) => {
+        fInvLogScale = (x: number, offset?: number) => {
             if (!offset) {
                 offset = 0;
             }
-            return Math.pow(10, x-offset);
+            return Math.pow(10, x - offset);
         };
     }
 
-    return {label, fLogScale, fInvLogScale};
+    return { label, fLogScale, fInvLogScale };
 }
 
-export function axisHasNegativeNumbers(axisData:IAxisData):boolean {
+export function axisHasNegativeNumbers(axisData: IAxisData): boolean {
     if (isNumberData(axisData)) {
-        return _(axisData.data).filter((d:any)=>d.value < 0).size() > 0;
+        return (
+            _(axisData.data)
+                .filter((d: any) => d.value < 0)
+                .size() > 0
+        );
     }
     return false;
 }
 
-export function getLimitValues(data:any[]):string[] {
+export function getLimitValues(data: any[]): string[] {
     return _(data)
-    .filter(d => { return d.thresholdType !== undefined && d.thresholdType !== "" && !Array.isArray(d.value)})
-    .map(d => {return `${d.thresholdType}${d.value.toFixed(2)}`})
-    .uniq()
-    .value();
+        .filter(d => {
+            return (
+                d.thresholdType !== undefined &&
+                d.thresholdType !== '' &&
+                !Array.isArray(d.value)
+            );
+        })
+        .map(d => {
+            return `${d.thresholdType}${d.value.toFixed(2)}`;
+        })
+        .uniq()
+        .value();
 }
diff --git a/src/pages/resultsView/plots/QuickPlots.spec.ts b/src/pages/resultsView/plots/QuickPlots.spec.ts
index 898b100a3df..289107ac52f 100644
--- a/src/pages/resultsView/plots/QuickPlots.spec.ts
+++ b/src/pages/resultsView/plots/QuickPlots.spec.ts
@@ -1,49 +1,74 @@
-import {assert} from "chai";
-import { PlotsTabOption, PlotsTabDataSource } from "./PlotsTab";
-import { generateQuickPlots, ButtonInfo, TypeSourcePair } from "./QuickPlots";
+import { assert } from 'chai';
+import { PlotsTabOption, PlotsTabDataSource } from './PlotsTab';
+import { generateQuickPlots, ButtonInfo, TypeSourcePair } from './QuickPlots';
 
-describe("Quick Plot Links in the Plots Tab", () => {
-    describe("generateQuickplots", () => {
-        it("should make no quickplots", () => {
+describe('Quick Plot Links in the Plots Tab', () => {
+    describe('generateQuickplots', () => {
+        it('should make no quickplots', () => {
             const dataTypes: PlotsTabOption[] = [];
             const dataSources: PlotsTabDataSource = {};
-            const horizontal: TypeSourcePair = {type: undefined, source: undefined};
-            const vertical: TypeSourcePair = {type: undefined, source: undefined};
+            const horizontal: TypeSourcePair = {
+                type: undefined,
+                source: undefined,
+            };
+            const vertical: TypeSourcePair = {
+                type: undefined,
+                source: undefined,
+            };
 
-            const actual = generateQuickPlots(dataTypes, dataSources, [], 0, horizontal, vertical);
+            const actual = generateQuickPlots(
+                dataTypes,
+                dataSources,
+                [],
+                0,
+                horizontal,
+                vertical
+            );
             const expected: ButtonInfo[] = [];
 
             assert.deepEqual(actual, expected);
-        })
+        });
 
-
-        it("should make a mRNA vs CNA quickplot", () => {
+        it('should make a mRNA vs CNA quickplot', () => {
             const dataTypes: PlotsTabOption[] = [
-                {value: "COPY_NUMBER_ALTERATION", label: "Copy Number"},
-                {value: "MRNA_EXPRESSION", label: "mRNA"},
+                { value: 'COPY_NUMBER_ALTERATION', label: 'Copy Number' },
+                { value: 'MRNA_EXPRESSION', label: 'mRNA' },
             ];
             const dataSources: PlotsTabDataSource = {};
-            const horizontal: TypeSourcePair = {type: "COPY_NUMBER_ALTERATION", source: undefined};
-            const vertical: TypeSourcePair = {type: "MRNA_EXPRESSION", source: undefined};
+            const horizontal: TypeSourcePair = {
+                type: 'COPY_NUMBER_ALTERATION',
+                source: undefined,
+            };
+            const vertical: TypeSourcePair = {
+                type: 'MRNA_EXPRESSION',
+                source: undefined,
+            };
 
-            const actual = generateQuickPlots(dataTypes, dataSources, [], 0, horizontal, vertical);
+            const actual = generateQuickPlots(
+                dataTypes,
+                dataSources,
+                [],
+                0,
+                horizontal,
+                vertical
+            );
             const expected: ButtonInfo[] = [
                 {
                     selected: true,
-                    display: "mRNA vs CNA",
+                    display: 'mRNA vs CNA',
                     plotModel: {
                         vertical: {
                             dataType: {
-                                value: "MRNA_EXPRESSION",
-                                label: "mRNA",
+                                value: 'MRNA_EXPRESSION',
+                                label: 'mRNA',
                             },
                             dataSource: undefined,
-                            useSameGene:true
+                            useSameGene: true,
                         },
                         horizontal: {
                             dataType: {
-                                value: "COPY_NUMBER_ALTERATION",
-                                label: "Copy Number",
+                                value: 'COPY_NUMBER_ALTERATION',
+                                label: 'Copy Number',
                             },
                             dataSource: undefined,
                         },
@@ -52,36 +77,48 @@ describe("Quick Plot Links in the Plots Tab", () => {
             ];
 
             assert.deepEqual(actual, expected);
-        })
-
+        });
 
-        it("should make a mRNA vs methyl quickplot", () => {
+        it('should make a mRNA vs methyl quickplot', () => {
             const dataTypes: PlotsTabOption[] = [
-                {value: "METHYLATION", label: "DNA Methylation"},
-                {value: "MRNA_EXPRESSION", label: "mRNA"},
+                { value: 'METHYLATION', label: 'DNA Methylation' },
+                { value: 'MRNA_EXPRESSION', label: 'mRNA' },
             ];
             const dataSources: PlotsTabDataSource = {};
-            const horizontal: TypeSourcePair = {type: "METHYLATION", source: undefined};
-            const vertical: TypeSourcePair = {type: "MRNA_EXPRESSION", source: undefined};
+            const horizontal: TypeSourcePair = {
+                type: 'METHYLATION',
+                source: undefined,
+            };
+            const vertical: TypeSourcePair = {
+                type: 'MRNA_EXPRESSION',
+                source: undefined,
+            };
 
-            const actual = generateQuickPlots(dataTypes, dataSources, [], 0, horizontal, vertical);
+            const actual = generateQuickPlots(
+                dataTypes,
+                dataSources,
+                [],
+                0,
+                horizontal,
+                vertical
+            );
             const expected: ButtonInfo[] = [
                 {
                     selected: true,
-                    display: "mRNA vs methyl",
+                    display: 'mRNA vs methyl',
                     plotModel: {
                         vertical: {
                             dataType: {
-                                value: "MRNA_EXPRESSION",
-                                label: "mRNA",
+                                value: 'MRNA_EXPRESSION',
+                                label: 'mRNA',
                             },
                             dataSource: undefined,
-                            useSameGene:true
+                            useSameGene: true,
                         },
                         horizontal: {
                             dataType: {
-                                value: "METHYLATION",
-                                label: "DNA Methylation",
+                                value: 'METHYLATION',
+                                label: 'DNA Methylation',
                             },
                             dataSource: undefined,
                         },
@@ -90,23 +127,38 @@ describe("Quick Plot Links in the Plots Tab", () => {
             ];
 
             assert.deepEqual(actual, expected);
-        })
+        });
 
-
-        it("should make a mutation count vs FGA quickplot", () => {
+        it('should make a mutation count vs FGA quickplot', () => {
             const dataTypes: PlotsTabOption[] = [
-                {value: "clinical_attribute", label: "Clinical Attribute"},
+                { value: 'clinical_attribute', label: 'Clinical Attribute' },
             ];
             const dataSources: PlotsTabDataSource = {
-                "clinical_attribute": [
-                    {value: "MUTATION_COUNT", label: "Mutation Count"},
-                    {value: "FRACTION_GENOME_ALTERED", label: "Fraction Genome Altered"},
+                clinical_attribute: [
+                    { value: 'MUTATION_COUNT', label: 'Mutation Count' },
+                    {
+                        value: 'FRACTION_GENOME_ALTERED',
+                        label: 'Fraction Genome Altered',
+                    },
                 ],
             };
-            const horizontal: TypeSourcePair = {type: "clinical_attribute", source: "FRACTION_GENOME_ALTERED"};
-            const vertical: TypeSourcePair = {type: "clinical_attribute", source: "MUTATION_COUNT"};
+            const horizontal: TypeSourcePair = {
+                type: 'clinical_attribute',
+                source: 'FRACTION_GENOME_ALTERED',
+            };
+            const vertical: TypeSourcePair = {
+                type: 'clinical_attribute',
+                source: 'MUTATION_COUNT',
+            };
 
-            const actual = generateQuickPlots(dataTypes, dataSources, [], 0, horizontal, vertical);
+            const actual = generateQuickPlots(
+                dataTypes,
+                dataSources,
+                [],
+                0,
+                horizontal,
+                vertical
+            );
             const expected: ButtonInfo[] = [
                 {
                     selected: true,
@@ -137,23 +189,43 @@ describe("Quick Plot Links in the Plots Tab", () => {
             ];
 
             assert.deepEqual(actual, expected);
-        })
+        });
 
-        it("should make mutation count vs cancer type detailed quickplot", () => {
+        it('should make mutation count vs cancer type detailed quickplot', () => {
             const dataTypes: PlotsTabOption[] = [
-                {value: "clinical_attribute", label: "Clinical Attribute"},
+                { value: 'clinical_attribute', label: 'Clinical Attribute' },
             ];
             const dataSources: PlotsTabDataSource = {
-                "clinical_attribute": [
-                    {value: "MUTATION_COUNT", label: "Mutation Count"},
-                    {value: "CANCER_TYPE_DETAILED", label: "Cancer Type Detailed"},
+                clinical_attribute: [
+                    { value: 'MUTATION_COUNT', label: 'Mutation Count' },
+                    {
+                        value: 'CANCER_TYPE_DETAILED',
+                        label: 'Cancer Type Detailed',
+                    },
                 ],
             };
-            const cancerTypes = ["Colon Adenocarcinoma", "Colorectal Adenocarcinoma", "Rectal Adenocarcinoma"];
-            const horizontal: TypeSourcePair = {type: "clinical_attribute", source: "CANCER_TYPE_DETAILED"};
-            const vertical: TypeSourcePair = {type: "clinical_attribute", source: "MUTATION_COUNT"};
+            const cancerTypes = [
+                'Colon Adenocarcinoma',
+                'Colorectal Adenocarcinoma',
+                'Rectal Adenocarcinoma',
+            ];
+            const horizontal: TypeSourcePair = {
+                type: 'clinical_attribute',
+                source: 'CANCER_TYPE_DETAILED',
+            };
+            const vertical: TypeSourcePair = {
+                type: 'clinical_attribute',
+                source: 'MUTATION_COUNT',
+            };
 
-            const actual = generateQuickPlots(dataTypes, dataSources, cancerTypes, 0, horizontal, vertical);
+            const actual = generateQuickPlots(
+                dataTypes,
+                dataSources,
+                cancerTypes,
+                0,
+                horizontal,
+                vertical
+            );
             const expected: ButtonInfo[] = [
                 {
                     selected: true,
@@ -184,40 +256,53 @@ describe("Quick Plot Links in the Plots Tab", () => {
             ];
 
             assert.deepEqual(actual, expected);
-        })
+        });
 
-        it("should make mutation count vs cancer type quickplot", () => {
+        it('should make mutation count vs cancer type quickplot', () => {
             const dataTypes: PlotsTabOption[] = [
-                {value: "clinical_attribute", label: "Clinical Attribute"},
+                { value: 'clinical_attribute', label: 'Clinical Attribute' },
             ];
             const dataSources: PlotsTabDataSource = {
-                "clinical_attribute": [
-                    {value: "MUTATION_COUNT", label: "Mutation Count"},
-                    {value: "CANCER_TYPE", label: "Cancer Type"},
+                clinical_attribute: [
+                    { value: 'MUTATION_COUNT', label: 'Mutation Count' },
+                    { value: 'CANCER_TYPE', label: 'Cancer Type' },
                 ],
             };
             const cancerTypes = [
-                "Breast Invasive Ductal Carcinoma",
-                "Peritoneal Mesothelioma",
-                "Uterine Endometrioid Carcinoma",
-                "ural Mesothelioma, Epithelioid Type",
-                "Lung Adenocarcinoma",
-                "Bladder Urothelial Carcinoma",
-                "Hepatocellular Carcinoma",
-                "Uterine Clear Cell Carcinoma",
-                "Breast Mixed Ductal and Lobular Carcinoma",
-                "Stomach Adenocarcinoma",
-                "Upper Tract Urothelial Carcinoma",
-                "High-Grade Serous Ovarian Cancer",
-                "Clear Cell Ovarian Cancer",
-                "Uterine Undifferentiated Carcinoma",
-                "Uterine Leiomyosarcoma",
-                "Yolk Sac Tumor",
+                'Breast Invasive Ductal Carcinoma',
+                'Peritoneal Mesothelioma',
+                'Uterine Endometrioid Carcinoma',
+                'ural Mesothelioma, Epithelioid Type',
+                'Lung Adenocarcinoma',
+                'Bladder Urothelial Carcinoma',
+                'Hepatocellular Carcinoma',
+                'Uterine Clear Cell Carcinoma',
+                'Breast Mixed Ductal and Lobular Carcinoma',
+                'Stomach Adenocarcinoma',
+                'Upper Tract Urothelial Carcinoma',
+                'High-Grade Serous Ovarian Cancer',
+                'Clear Cell Ovarian Cancer',
+                'Uterine Undifferentiated Carcinoma',
+                'Uterine Leiomyosarcoma',
+                'Yolk Sac Tumor',
             ];
-            const horizontal: TypeSourcePair = {type: "clinical_attribute", source: "CANCER_TYPE_DETAILED"};
-            const vertical: TypeSourcePair = {type: "clinical_attribute", source: "MUTATION_COUNT"};
+            const horizontal: TypeSourcePair = {
+                type: 'clinical_attribute',
+                source: 'CANCER_TYPE_DETAILED',
+            };
+            const vertical: TypeSourcePair = {
+                type: 'clinical_attribute',
+                source: 'MUTATION_COUNT',
+            };
 
-            const actual = generateQuickPlots(dataTypes, dataSources, cancerTypes, 0, horizontal, vertical);
+            const actual = generateQuickPlots(
+                dataTypes,
+                dataSources,
+                cancerTypes,
+                0,
+                horizontal,
+                vertical
+            );
             const expected: ButtonInfo[] = [
                 {
                     selected: true,
@@ -248,23 +333,43 @@ describe("Quick Plot Links in the Plots Tab", () => {
             ];
 
             assert.deepEqual(actual, expected);
-        })
+        });
 
-        it("should make mRNA vs cancer type detailed quickplot", () => {
+        it('should make mRNA vs cancer type detailed quickplot', () => {
             const dataTypes: PlotsTabOption[] = [
-                {value: "clinical_attribute", label: "Clinical Attribute"},
-                {value: "MRNA_EXPRESSION", label: "mRNA"},
+                { value: 'clinical_attribute', label: 'Clinical Attribute' },
+                { value: 'MRNA_EXPRESSION', label: 'mRNA' },
             ];
             const dataSources: PlotsTabDataSource = {
-                "clinical_attribute": [
-                    {value: "CANCER_TYPE_DETAILED", label: "Cancer Type Detailed"},
+                clinical_attribute: [
+                    {
+                        value: 'CANCER_TYPE_DETAILED',
+                        label: 'Cancer Type Detailed',
+                    },
                 ],
             };
-            const cancerTypes = ["Colon Adenocarcinoma", "Colorectal Adenocarcinoma", "Rectal Adenocarcinoma"];
-            const horizontal: TypeSourcePair = {type: "clinical_attribute", source: "CANCER_TYPE_DETAILED"};
-            const vertical: TypeSourcePair = {type: "MRNA_EXPRESSION", source: undefined};
+            const cancerTypes = [
+                'Colon Adenocarcinoma',
+                'Colorectal Adenocarcinoma',
+                'Rectal Adenocarcinoma',
+            ];
+            const horizontal: TypeSourcePair = {
+                type: 'clinical_attribute',
+                source: 'CANCER_TYPE_DETAILED',
+            };
+            const vertical: TypeSourcePair = {
+                type: 'MRNA_EXPRESSION',
+                source: undefined,
+            };
 
-            const actual = generateQuickPlots(dataTypes, dataSources, cancerTypes, 0, horizontal, vertical);
+            const actual = generateQuickPlots(
+                dataTypes,
+                dataSources,
+                cancerTypes,
+                0,
+                horizontal,
+                vertical
+            );
             const expected: ButtonInfo[] = [
                 {
                     selected: true,
@@ -292,36 +397,49 @@ describe("Quick Plot Links in the Plots Tab", () => {
             ];
 
             assert.deepEqual(actual, expected);
-        })
+        });
 
-        it("should make mRNA vs mutation type detailed quickplot", () => {
+        it('should make mRNA vs mutation type detailed quickplot', () => {
             const dataTypes: PlotsTabOption[] = [
-                {value: "MUTATION_EXTENDED", label: "Mutation"},
-                {value: "MRNA_EXPRESSION", label: "mRNA"},
+                { value: 'MUTATION_EXTENDED', label: 'Mutation' },
+                { value: 'MRNA_EXPRESSION', label: 'mRNA' },
             ];
             const dataSources: PlotsTabDataSource = {};
             const mutationCount = 1;
-            const horizontal: TypeSourcePair = {type: "MUTATION_EXTENDED", source: undefined};
-            const vertical: TypeSourcePair = {type: "MRNA_EXPRESSION", source: undefined};
+            const horizontal: TypeSourcePair = {
+                type: 'MUTATION_EXTENDED',
+                source: undefined,
+            };
+            const vertical: TypeSourcePair = {
+                type: 'MRNA_EXPRESSION',
+                source: undefined,
+            };
 
-            const actual = generateQuickPlots(dataTypes, dataSources, [], mutationCount, horizontal, vertical);
+            const actual = generateQuickPlots(
+                dataTypes,
+                dataSources,
+                [],
+                mutationCount,
+                horizontal,
+                vertical
+            );
             const expected: ButtonInfo[] = [
                 {
                     selected: true,
-                    display: "mRNA vs mut type",
+                    display: 'mRNA vs mut type',
                     plotModel: {
                         vertical: {
                             dataType: {
-                                value: "MRNA_EXPRESSION",
-                                label: "mRNA"
+                                value: 'MRNA_EXPRESSION',
+                                label: 'mRNA',
                             },
                             dataSource: undefined,
-                            useSameGene:true
+                            useSameGene: true,
                         },
                         horizontal: {
                             dataType: {
-                                value: "MUTATION_EXTENDED",
-                                label: "Mutation"
+                                value: 'MUTATION_EXTENDED',
+                                label: 'Mutation',
                             },
                             dataSource: undefined,
                         },
@@ -330,42 +448,60 @@ describe("Quick Plot Links in the Plots Tab", () => {
             ];
 
             assert.deepEqual(actual, expected);
-        })
+        });
 
-        it("should make Protein vs mRNA quickplot", () => {
+        it('should make Protein vs mRNA quickplot', () => {
             const dataTypes: PlotsTabOption[] = [
-                {value: "PROTEIN_LEVEL", label: "Protein"},
-                {value: "MRNA_EXPRESSION", label: "mRNA"},
+                { value: 'PROTEIN_LEVEL', label: 'Protein' },
+                { value: 'MRNA_EXPRESSION', label: 'mRNA' },
             ];
             const dataSources: PlotsTabDataSource = {
-                "PROTEIN_LEVEL": [
-                    {value: "brca_tcga_protein_quantification", label: "Protein levels (mass spectrometry by CPTAC)"}
+                PROTEIN_LEVEL: [
+                    {
+                        value: 'brca_tcga_protein_quantification',
+                        label: 'Protein levels (mass spectrometry by CPTAC)',
+                    },
                 ],
             };
             const mutationCount = 1;
-            const horizontal: TypeSourcePair = {type: "MRNA_EXPRESSION", source: undefined};
-            const vertical: TypeSourcePair = {type: "PROTEIN_LEVEL", source: "undefined"};
+            const horizontal: TypeSourcePair = {
+                type: 'MRNA_EXPRESSION',
+                source: undefined,
+            };
+            const vertical: TypeSourcePair = {
+                type: 'PROTEIN_LEVEL',
+                source: 'undefined',
+            };
 
-            const actual = generateQuickPlots(dataTypes, dataSources, [], mutationCount, horizontal, vertical);
+            const actual = generateQuickPlots(
+                dataTypes,
+                dataSources,
+                [],
+                mutationCount,
+                horizontal,
+                vertical
+            );
             const expected: ButtonInfo[] = [
                 {
                     selected: true,
-                    display: "Protein vs mRNA",
+                    display: 'Protein vs mRNA',
                     plotModel: {
                         vertical: {
                             dataType: {
-                                value: "PROTEIN_LEVEL",
-                                label: "Protein"
-                        }, dataSource: {
-                            value: "brca_tcga_protein_quantification",
-                            label: "Protein levels (mass spectrometry by CPTAC)",
+                                value: 'PROTEIN_LEVEL',
+                                label: 'Protein',
+                            },
+                            dataSource: {
+                                value: 'brca_tcga_protein_quantification',
+                                label:
+                                    'Protein levels (mass spectrometry by CPTAC)',
                             },
-                            useSameGene:true
+                            useSameGene: true,
                         },
                         horizontal: {
                             dataType: {
-                                value: "MRNA_EXPRESSION",
-                                label: "mRNA"
+                                value: 'MRNA_EXPRESSION',
+                                label: 'mRNA',
                             },
                             dataSource: undefined,
                         },
@@ -374,42 +510,60 @@ describe("Quick Plot Links in the Plots Tab", () => {
             ];
 
             assert.deepEqual(actual, expected);
-        })
+        });
 
-        it("should make Protein vs mRNA quickplot", () => {
+        it('should make Protein vs mRNA quickplot', () => {
             const dataTypes: PlotsTabOption[] = [
-                {value: "PROTEIN_LEVEL", label: "Protein"},
-                {value: "MRNA_EXPRESSION", label: "mRNA"},
+                { value: 'PROTEIN_LEVEL', label: 'Protein' },
+                { value: 'MRNA_EXPRESSION', label: 'mRNA' },
             ];
             const dataSources: PlotsTabDataSource = {
-                "PROTEIN_LEVEL": [
-                    {value: "brca_tcga_protein_quantification", label: "Protein levels (mass spectrometry by CPTAC)"}
+                PROTEIN_LEVEL: [
+                    {
+                        value: 'brca_tcga_protein_quantification',
+                        label: 'Protein levels (mass spectrometry by CPTAC)',
+                    },
                 ],
             };
             const mutationCount = 1;
-            const horizontal: TypeSourcePair = {type: "MRNA_EXPRESSION", source: undefined};
-            const vertical: TypeSourcePair = {type: "PROTEIN_LEVEL", source: undefined};
+            const horizontal: TypeSourcePair = {
+                type: 'MRNA_EXPRESSION',
+                source: undefined,
+            };
+            const vertical: TypeSourcePair = {
+                type: 'PROTEIN_LEVEL',
+                source: undefined,
+            };
 
-            const actual = generateQuickPlots(dataTypes, dataSources, [], mutationCount, horizontal, vertical);
+            const actual = generateQuickPlots(
+                dataTypes,
+                dataSources,
+                [],
+                mutationCount,
+                horizontal,
+                vertical
+            );
             const expected: ButtonInfo[] = [
                 {
                     selected: true,
-                    display: "Protein vs mRNA",
+                    display: 'Protein vs mRNA',
                     plotModel: {
                         vertical: {
                             dataType: {
-                                value: "PROTEIN_LEVEL",
-                                label: "Protein"
-                        }, dataSource: {
-                            value: "brca_tcga_protein_quantification",
-                            label: "Protein levels (mass spectrometry by CPTAC)",
+                                value: 'PROTEIN_LEVEL',
+                                label: 'Protein',
+                            },
+                            dataSource: {
+                                value: 'brca_tcga_protein_quantification',
+                                label:
+                                    'Protein levels (mass spectrometry by CPTAC)',
                             },
-                            useSameGene:true
+                            useSameGene: true,
                         },
                         horizontal: {
                             dataType: {
-                                value: "MRNA_EXPRESSION",
-                                label: "mRNA"
+                                value: 'MRNA_EXPRESSION',
+                                label: 'mRNA',
                             },
                             dataSource: undefined,
                         },
@@ -418,33 +572,46 @@ describe("Quick Plot Links in the Plots Tab", () => {
             ];
 
             assert.deepEqual(actual, expected);
-        })
+        });
 
-        it("should make sample order vs treatment IC50 quickplot", () => {
+        it('should make sample order vs treatment IC50 quickplot', () => {
             const dataTypes: PlotsTabOption[] = [
-                {value: "GENERIC_ASSAY", label: "Treatments"},
+                { value: 'GENERIC_ASSAY', label: 'Treatments' },
             ];
             const dataSources: PlotsTabDataSource = {};
-            const horizontal: TypeSourcePair = {type: "none", source: undefined};
-            const vertical: TypeSourcePair = {type: "GENERIC_ASSAY", source: undefined};
+            const horizontal: TypeSourcePair = {
+                type: 'none',
+                source: undefined,
+            };
+            const vertical: TypeSourcePair = {
+                type: 'GENERIC_ASSAY',
+                source: undefined,
+            };
 
-            const actual = generateQuickPlots(dataTypes, dataSources, [], 0, horizontal, vertical);
+            const actual = generateQuickPlots(
+                dataTypes,
+                dataSources,
+                [],
+                0,
+                horizontal,
+                vertical
+            );
             const expected: ButtonInfo[] = [
                 {
                     selected: true,
-                    display: "Tx Waterfall",
+                    display: 'Tx Waterfall',
                     plotModel: {
                         vertical: {
                             dataType: {
-                                value: "GENERIC_ASSAY",
-                                label: "Treatments"
+                                value: 'GENERIC_ASSAY',
+                                label: 'Treatments',
                             },
                             dataSource: undefined,
                         },
                         horizontal: {
                             dataType: {
-                                value: "none",
-                                label: "Ordered samples"
+                                value: 'none',
+                                label: 'Ordered samples',
                             },
                             dataSource: undefined,
                         },
@@ -453,23 +620,46 @@ describe("Quick Plot Links in the Plots Tab", () => {
             ];
 
             assert.deepEqual(actual, expected);
-        })
+        });
 
-        it("should make fraction genome altered vs cancer type detailed quickplot", () => {
+        it('should make fraction genome altered vs cancer type detailed quickplot', () => {
             const dataTypes: PlotsTabOption[] = [
-                {value: "clinical_attribute", label: "Clinical Attribute"},
+                { value: 'clinical_attribute', label: 'Clinical Attribute' },
             ];
             const dataSources: PlotsTabDataSource = {
-                "clinical_attribute": [
-                    {value: "FRACTION_GENOME_ALTERED", label: "Fraction Genome Altered"},
-                    {value: "CANCER_TYPE_DETAILED", label: "Cancer Type Detailed"},
+                clinical_attribute: [
+                    {
+                        value: 'FRACTION_GENOME_ALTERED',
+                        label: 'Fraction Genome Altered',
+                    },
+                    {
+                        value: 'CANCER_TYPE_DETAILED',
+                        label: 'Cancer Type Detailed',
+                    },
                 ],
             };
-            const cancerTypes = ["Colon Adenocarcinoma", "Colorectal Adenocarcinoma", "Rectal Adenocarcinoma"];
-            const horizontal: TypeSourcePair = {type: "clinical_attribute", source: "CANCER_TYPE_DETAILED"};
-            const vertical: TypeSourcePair = {type: "clinical_attribute", source: "FRACTION_GENOME_ALTERED"};
+            const cancerTypes = [
+                'Colon Adenocarcinoma',
+                'Colorectal Adenocarcinoma',
+                'Rectal Adenocarcinoma',
+            ];
+            const horizontal: TypeSourcePair = {
+                type: 'clinical_attribute',
+                source: 'CANCER_TYPE_DETAILED',
+            };
+            const vertical: TypeSourcePair = {
+                type: 'clinical_attribute',
+                source: 'FRACTION_GENOME_ALTERED',
+            };
 
-            const actual = generateQuickPlots(dataTypes, dataSources, cancerTypes, 0, horizontal, vertical);
+            const actual = generateQuickPlots(
+                dataTypes,
+                dataSources,
+                cancerTypes,
+                0,
+                horizontal,
+                vertical
+            );
             const expected: ButtonInfo[] = [
                 {
                     selected: true,
@@ -500,40 +690,56 @@ describe("Quick Plot Links in the Plots Tab", () => {
             ];
 
             assert.deepEqual(actual, expected);
-        })
+        });
 
-        it("should make fraction genome altered vs cancer type quickplot", () => {
+        it('should make fraction genome altered vs cancer type quickplot', () => {
             const dataTypes: PlotsTabOption[] = [
-                {value: "clinical_attribute", label: "Clinical Attribute"},
+                { value: 'clinical_attribute', label: 'Clinical Attribute' },
             ];
             const dataSources: PlotsTabDataSource = {
-                "clinical_attribute": [
-                    {value: "FRACTION_GENOME_ALTERED", label: "Fraction Genome Altered"},
-                    {value: "CANCER_TYPE", label: "Cancer Type"},
+                clinical_attribute: [
+                    {
+                        value: 'FRACTION_GENOME_ALTERED',
+                        label: 'Fraction Genome Altered',
+                    },
+                    { value: 'CANCER_TYPE', label: 'Cancer Type' },
                 ],
             };
             const cancerTypes = [
-                "Breast Invasive Ductal Carcinoma",
-                "Peritoneal Mesothelioma",
-                "Uterine Endometrioid Carcinoma",
-                "ural Mesothelioma, Epithelioid Type",
-                "Lung Adenocarcinoma",
-                "Bladder Urothelial Carcinoma",
-                "Hepatocellular Carcinoma",
-                "Uterine Clear Cell Carcinoma",
-                "Breast Mixed Ductal and Lobular Carcinoma",
-                "Stomach Adenocarcinoma",
-                "Upper Tract Urothelial Carcinoma",
-                "High-Grade Serous Ovarian Cancer",
-                "Clear Cell Ovarian Cancer",
-                "Uterine Undifferentiated Carcinoma",
-                "Uterine Leiomyosarcoma",
-                "Yolk Sac Tumor",
+                'Breast Invasive Ductal Carcinoma',
+                'Peritoneal Mesothelioma',
+                'Uterine Endometrioid Carcinoma',
+                'ural Mesothelioma, Epithelioid Type',
+                'Lung Adenocarcinoma',
+                'Bladder Urothelial Carcinoma',
+                'Hepatocellular Carcinoma',
+                'Uterine Clear Cell Carcinoma',
+                'Breast Mixed Ductal and Lobular Carcinoma',
+                'Stomach Adenocarcinoma',
+                'Upper Tract Urothelial Carcinoma',
+                'High-Grade Serous Ovarian Cancer',
+                'Clear Cell Ovarian Cancer',
+                'Uterine Undifferentiated Carcinoma',
+                'Uterine Leiomyosarcoma',
+                'Yolk Sac Tumor',
             ];
-            const horizontal: TypeSourcePair = {type: "clinical_attribute", source: "CANCER_TYPE_DETAILED"};
-            const vertical: TypeSourcePair = {type: "clinical_attribute", source: "FRACTION_GENOME_ALTERED"};
+            const horizontal: TypeSourcePair = {
+                type: 'clinical_attribute',
+                source: 'CANCER_TYPE_DETAILED',
+            };
+            const vertical: TypeSourcePair = {
+                type: 'clinical_attribute',
+                source: 'FRACTION_GENOME_ALTERED',
+            };
 
-            const actual = generateQuickPlots(dataTypes, dataSources, cancerTypes, 0, horizontal, vertical);
+            const actual = generateQuickPlots(
+                dataTypes,
+                dataSources,
+                cancerTypes,
+                0,
+                horizontal,
+                vertical
+            );
             const expected: ButtonInfo[] = [
                 {
                     selected: true,
@@ -564,6 +770,6 @@ describe("Quick Plot Links in the Plots Tab", () => {
             ];
 
             assert.deepEqual(actual, expected);
-        })
+        });
     });
-});
\ No newline at end of file
+});
diff --git a/src/pages/resultsView/plots/QuickPlots.ts b/src/pages/resultsView/plots/QuickPlots.ts
index a1ebaa52dc1..e6207bc1286 100644
--- a/src/pages/resultsView/plots/QuickPlots.ts
+++ b/src/pages/resultsView/plots/QuickPlots.ts
@@ -12,19 +12,19 @@ export type ButtonInfo = {
         vertical: {
             dataSource: PlotsTabOption | undefined;
             dataType: PlotsTabOption | undefined;
-            useSameGene?:boolean;
+            useSameGene?: boolean;
         };
         horizontal: {
             dataSource: PlotsTabOption | undefined;
             dataType: PlotsTabOption | undefined;
         };
-    }
+    };
 };
 
 export type TypeSourcePair = {
-    type: string | undefined,
-    source: string | undefined,
-}
+    type: string | undefined;
+    source: string | undefined;
+};
 
 /**
  * This is how the example links are created.
@@ -45,8 +45,8 @@ type QuickPlot = {
         dataSources?: PlotsTabDataSource,
         cancerTypes?: string[],
         mutationCount?: number
-    ) => boolean,
-}
+    ) => boolean;
+};
 
 const quickPlots: QuickPlot[] = [
     {
@@ -57,24 +57,30 @@ const quickPlots: QuickPlot[] = [
         ): boolean => {
             const clinicalAttributes = dataSources['clinical_attribute'];
             return (
-                dataTypes.find((dataType) => dataType.value === "clinical_attribute") !== undefined &&
-                clinicalAttributes.find((attritube) => attritube.value === "MUTATION_COUNT") !== undefined &&
-                clinicalAttributes.find((attritube) => attritube.value === "CANCER_TYPE_DETAILED") !== undefined &&
+                dataTypes.find(
+                    dataType => dataType.value === 'clinical_attribute'
+                ) !== undefined &&
+                clinicalAttributes.find(
+                    attritube => attritube.value === 'MUTATION_COUNT'
+                ) !== undefined &&
+                clinicalAttributes.find(
+                    attritube => attritube.value === 'CANCER_TYPE_DETAILED'
+                ) !== undefined &&
                 cancerTypes.length > 1 &&
                 cancerTypes.length < 16
             );
-        }, toButtonInfo: (
+        },
+        toButtonInfo: (
             vertical: TypeSourcePair,
             horizontal: TypeSourcePair,
             dataTypes: PlotsTabOption[],
             dataSources: PlotsTabDataSource
         ): ButtonInfo => {
-            const selected = (
-                vertical.type === "clinical_attribute" &&
-                vertical.source === "MUTATION_COUNT" &&
-                horizontal.type === "clinical_attribute" &&
-                horizontal.source === "CANCER_TYPE_DETAILED"
-            )
+            const selected =
+                vertical.type === 'clinical_attribute' &&
+                vertical.source === 'MUTATION_COUNT' &&
+                horizontal.type === 'clinical_attribute' &&
+                horizontal.source === 'CANCER_TYPE_DETAILED';
 
             return {
                 selected,
@@ -93,10 +99,11 @@ const quickPlots: QuickPlot[] = [
                             dataType => dataType.value === 'clinical_attribute'
                         ),
                         dataSource: dataSources['clinical_attribute'].find(
-                            attritube => attritube.value === 'CANCER_TYPE_DETAILED'
+                            attritube =>
+                                attritube.value === 'CANCER_TYPE_DETAILED'
                         ),
                     },
-                }
+                },
             };
         },
     },
@@ -108,23 +115,29 @@ const quickPlots: QuickPlot[] = [
         ): boolean => {
             const clinicalAttributes = dataSources['clinical_attribute'];
             return (
-                dataTypes.find((dataType) => dataType.value === "clinical_attribute") !== undefined &&
-                clinicalAttributes.find((attritube) => attritube.value === "MUTATION_COUNT") !== undefined &&
-                clinicalAttributes.find((attritube) => attritube.value === "CANCER_TYPE") !== undefined &&
+                dataTypes.find(
+                    dataType => dataType.value === 'clinical_attribute'
+                ) !== undefined &&
+                clinicalAttributes.find(
+                    attritube => attritube.value === 'MUTATION_COUNT'
+                ) !== undefined &&
+                clinicalAttributes.find(
+                    attritube => attritube.value === 'CANCER_TYPE'
+                ) !== undefined &&
                 cancerTypes.length > 15
             );
-        }, toButtonInfo: (
+        },
+        toButtonInfo: (
             vertical: TypeSourcePair,
             horizontal: TypeSourcePair,
             dataTypes: PlotsTabOption[],
             dataSources: PlotsTabDataSource
         ): ButtonInfo => {
-            const selected = (
-                vertical.type === "clinical_attribute" &&
-                vertical.source === "MUTATION_COUNT" &&
-                horizontal.type === "clinical_attribute" &&
-                horizontal.source === "CANCER_TYPE_DETAILED"
-            )
+            const selected =
+                vertical.type === 'clinical_attribute' &&
+                vertical.source === 'MUTATION_COUNT' &&
+                horizontal.type === 'clinical_attribute' &&
+                horizontal.source === 'CANCER_TYPE_DETAILED';
 
             return {
                 selected,
@@ -146,7 +159,7 @@ const quickPlots: QuickPlot[] = [
                             attritube => attritube.value === 'CANCER_TYPE'
                         ),
                     },
-                }
+                },
             };
         },
     },
@@ -158,24 +171,30 @@ const quickPlots: QuickPlot[] = [
         ): boolean => {
             const clinicalAttributes = dataSources['clinical_attribute'];
             return (
-                dataTypes.find((dataType) => dataType.value === "clinical_attribute") !== undefined &&
-                clinicalAttributes.find((attritube) => attritube.value === "FRACTION_GENOME_ALTERED") !== undefined &&
-                clinicalAttributes.find((attritube) => attritube.value === "CANCER_TYPE_DETAILED") !== undefined &&
+                dataTypes.find(
+                    dataType => dataType.value === 'clinical_attribute'
+                ) !== undefined &&
+                clinicalAttributes.find(
+                    attritube => attritube.value === 'FRACTION_GENOME_ALTERED'
+                ) !== undefined &&
+                clinicalAttributes.find(
+                    attritube => attritube.value === 'CANCER_TYPE_DETAILED'
+                ) !== undefined &&
                 cancerTypes.length > 1 &&
                 cancerTypes.length < 16
             );
-        }, toButtonInfo: (
+        },
+        toButtonInfo: (
             vertical: TypeSourcePair,
             horizontal: TypeSourcePair,
             dataTypes: PlotsTabOption[],
             dataSources: PlotsTabDataSource
         ): ButtonInfo => {
-            const selected = (
-                vertical.type === "clinical_attribute" &&
-                vertical.source === "FRACTION_GENOME_ALTERED" &&
-                horizontal.type === "clinical_attribute" &&
-                horizontal.source === "CANCER_TYPE_DETAILED"
-            )
+            const selected =
+                vertical.type === 'clinical_attribute' &&
+                vertical.source === 'FRACTION_GENOME_ALTERED' &&
+                horizontal.type === 'clinical_attribute' &&
+                horizontal.source === 'CANCER_TYPE_DETAILED';
 
             return {
                 selected,
@@ -186,7 +205,8 @@ const quickPlots: QuickPlot[] = [
                             dataType => dataType.value === 'clinical_attribute'
                         ),
                         dataSource: dataSources['clinical_attribute'].find(
-                            attritube => attritube.value === "FRACTION_GENOME_ALTERED"
+                            attritube =>
+                                attritube.value === 'FRACTION_GENOME_ALTERED'
                         ),
                     },
                     horizontal: {
@@ -194,10 +214,11 @@ const quickPlots: QuickPlot[] = [
                             dataType => dataType.value === 'clinical_attribute'
                         ),
                         dataSource: dataSources['clinical_attribute'].find(
-                            attritube => attritube.value === 'CANCER_TYPE_DETAILED'
+                            attritube =>
+                                attritube.value === 'CANCER_TYPE_DETAILED'
                         ),
                     },
-                }
+                },
             };
         },
     },
@@ -209,23 +230,29 @@ const quickPlots: QuickPlot[] = [
         ): boolean => {
             const clinicalAttributes = dataSources['clinical_attribute'];
             return (
-                dataTypes.find((dataType) => dataType.value === "clinical_attribute") !== undefined &&
-                clinicalAttributes.find((attritube) => attritube.value === "FRACTION_GENOME_ALTERED") !== undefined &&
-                clinicalAttributes.find((attritube) => attritube.value === "CANCER_TYPE") !== undefined &&
+                dataTypes.find(
+                    dataType => dataType.value === 'clinical_attribute'
+                ) !== undefined &&
+                clinicalAttributes.find(
+                    attritube => attritube.value === 'FRACTION_GENOME_ALTERED'
+                ) !== undefined &&
+                clinicalAttributes.find(
+                    attritube => attritube.value === 'CANCER_TYPE'
+                ) !== undefined &&
                 cancerTypes.length > 15
             );
-        }, toButtonInfo: (
+        },
+        toButtonInfo: (
             vertical: TypeSourcePair,
             horizontal: TypeSourcePair,
             dataTypes: PlotsTabOption[],
             dataSources: PlotsTabDataSource
         ): ButtonInfo => {
-            const selected = (
-                vertical.type === "clinical_attribute" &&
-                vertical.source === "FRACTION_GENOME_ALTERED" &&
-                horizontal.type === "clinical_attribute" &&
-                horizontal.source === "CANCER_TYPE_DETAILED"
-            )
+            const selected =
+                vertical.type === 'clinical_attribute' &&
+                vertical.source === 'FRACTION_GENOME_ALTERED' &&
+                horizontal.type === 'clinical_attribute' &&
+                horizontal.source === 'CANCER_TYPE_DETAILED';
 
             return {
                 selected,
@@ -236,7 +263,8 @@ const quickPlots: QuickPlot[] = [
                             dataType => dataType.value === 'clinical_attribute'
                         ),
                         dataSource: dataSources['clinical_attribute'].find(
-                            attritube => attritube.value === 'FRACTION_GENOME_ALTERED'
+                            attritube =>
+                                attritube.value === 'FRACTION_GENOME_ALTERED'
                         ),
                     },
                     horizontal: {
@@ -247,30 +275,39 @@ const quickPlots: QuickPlot[] = [
                             attritube => attritube.value === 'CANCER_TYPE'
                         ),
                     },
-                }
+                },
             };
         },
     },
     {
-        isApplicableToQuery: (dataTypes: PlotsTabOption[], dataSources: PlotsTabDataSource): boolean => {
+        isApplicableToQuery: (
+            dataTypes: PlotsTabOption[],
+            dataSources: PlotsTabDataSource
+        ): boolean => {
             const clinicalAttributes = dataSources['clinical_attribute'];
             return (
-                dataTypes.find((dataType) => dataType.value === "clinical_attribute") !== undefined &&
-                clinicalAttributes.find((attritube) => attritube.value === "MUTATION_COUNT") !== undefined &&
-                clinicalAttributes.find((attritube) => attritube.value === "FRACTION_GENOME_ALTERED") !== undefined
+                dataTypes.find(
+                    dataType => dataType.value === 'clinical_attribute'
+                ) !== undefined &&
+                clinicalAttributes.find(
+                    attritube => attritube.value === 'MUTATION_COUNT'
+                ) !== undefined &&
+                clinicalAttributes.find(
+                    attritube => attritube.value === 'FRACTION_GENOME_ALTERED'
+                ) !== undefined
             );
-        }, toButtonInfo: (
+        },
+        toButtonInfo: (
             vertical: TypeSourcePair,
             horizontal: TypeSourcePair,
             dataTypes: PlotsTabOption[],
             dataSources: PlotsTabDataSource
         ): ButtonInfo => {
-            const selected = (
-                vertical.type === "clinical_attribute" &&
-                vertical.source === "MUTATION_COUNT" &&
-                horizontal.type === "clinical_attribute" &&
-                horizontal.source === "FRACTION_GENOME_ALTERED"
-            )
+            const selected =
+                vertical.type === 'clinical_attribute' &&
+                vertical.source === 'MUTATION_COUNT' &&
+                horizontal.type === 'clinical_attribute' &&
+                horizontal.source === 'FRACTION_GENOME_ALTERED';
 
             return {
                 selected,
@@ -293,7 +330,7 @@ const quickPlots: QuickPlot[] = [
                                 attritube.value === 'FRACTION_GENOME_ALTERED'
                         ),
                     },
-                }
+                },
             };
         },
     },
@@ -305,22 +342,28 @@ const quickPlots: QuickPlot[] = [
         ): boolean => {
             const clinicalAttributes = dataSources['clinical_attribute'];
             return (
-                dataTypes.find((dataType) => dataType.value === "clinical_attribute") !== undefined &&
-                dataTypes.find((dataType) => dataType.value === "MRNA_EXPRESSION") !== undefined &&
-                clinicalAttributes.find((attritube) => attritube.value === "CANCER_TYPE_DETAILED") !== undefined &&
+                dataTypes.find(
+                    dataType => dataType.value === 'clinical_attribute'
+                ) !== undefined &&
+                dataTypes.find(
+                    dataType => dataType.value === 'MRNA_EXPRESSION'
+                ) !== undefined &&
+                clinicalAttributes.find(
+                    attritube => attritube.value === 'CANCER_TYPE_DETAILED'
+                ) !== undefined &&
                 cancerTypes.length > 1
             );
-        }, toButtonInfo: (
+        },
+        toButtonInfo: (
             vertical: TypeSourcePair,
             horizontal: TypeSourcePair,
             dataTypes: PlotsTabOption[],
             dataSources: PlotsTabDataSource
         ): ButtonInfo => {
-            const selected = (
-                vertical.type === "MRNA_EXPRESSION" &&
-                horizontal.type === "clinical_attribute" &&
-                horizontal.source === "CANCER_TYPE_DETAILED"
-            )
+            const selected =
+                vertical.type === 'MRNA_EXPRESSION' &&
+                horizontal.type === 'clinical_attribute' &&
+                horizontal.source === 'CANCER_TYPE_DETAILED';
 
             return {
                 selected,
@@ -337,10 +380,11 @@ const quickPlots: QuickPlot[] = [
                             dataType => dataType.value === 'clinical_attribute'
                         ),
                         dataSource: dataSources['clinical_attribute'].find(
-                            attritube => attritube.value === 'CANCER_TYPE_DETAILED'
+                            attritube =>
+                                attritube.value === 'CANCER_TYPE_DETAILED'
                         ),
                     },
-                }
+                },
             };
         },
     },
@@ -352,15 +396,23 @@ const quickPlots: QuickPlot[] = [
             mutationCount: number
         ): boolean => {
             return (
-                dataTypes.find((dataType) => dataType.value === "MUTATION_EXTENDED") !== undefined &&
-                dataTypes.find((dataType) => dataType.value === "MRNA_EXPRESSION") !== undefined &&
+                dataTypes.find(
+                    dataType => dataType.value === 'MUTATION_EXTENDED'
+                ) !== undefined &&
+                dataTypes.find(
+                    dataType => dataType.value === 'MRNA_EXPRESSION'
+                ) !== undefined &&
                 mutationCount > 0
             );
-        }, toButtonInfo: (vertical: TypeSourcePair, horizontal: TypeSourcePair, dataTypes: PlotsTabOption[],): ButtonInfo => {
-            const selected = (
-                vertical.type === "MRNA_EXPRESSION" &&
-                horizontal.type === "MUTATION_EXTENDED"
-            )
+        },
+        toButtonInfo: (
+            vertical: TypeSourcePair,
+            horizontal: TypeSourcePair,
+            dataTypes: PlotsTabOption[]
+        ): ButtonInfo => {
+            const selected =
+                vertical.type === 'MRNA_EXPRESSION' &&
+                horizontal.type === 'MUTATION_EXTENDED';
 
             return {
                 selected,
@@ -371,7 +423,7 @@ const quickPlots: QuickPlot[] = [
                             dataType => dataType.value === 'MRNA_EXPRESSION'
                         ),
                         dataSource: undefined,
-                        useSameGene:true
+                        useSameGene: true,
                     },
                     horizontal: {
                         dataType: dataTypes.find(
@@ -379,15 +431,19 @@ const quickPlots: QuickPlot[] = [
                         ),
                         dataSource: undefined,
                     },
-                }
+                },
             };
         },
     },
     {
         isApplicableToQuery: (dataTypes: PlotsTabOption[]): boolean => {
             return (
-                dataTypes.find((dataType) => dataType.value === "COPY_NUMBER_ALTERATION") !== undefined &&
-                dataTypes.find((dataType) => dataType.value === "MRNA_EXPRESSION") !== undefined
+                dataTypes.find(
+                    dataType => dataType.value === 'COPY_NUMBER_ALTERATION'
+                ) !== undefined &&
+                dataTypes.find(
+                    dataType => dataType.value === 'MRNA_EXPRESSION'
+                ) !== undefined
             );
         },
         toButtonInfo: (
@@ -395,31 +451,40 @@ const quickPlots: QuickPlot[] = [
             horizontal: TypeSourcePair,
             dataTypes: PlotsTabOption[]
         ): ButtonInfo => {
-            const selected = (
-                vertical.type === "MRNA_EXPRESSION" &&
-                horizontal.type === "COPY_NUMBER_ALTERATION"
-            )
+            const selected =
+                vertical.type === 'MRNA_EXPRESSION' &&
+                horizontal.type === 'COPY_NUMBER_ALTERATION';
 
             return {
                 selected,
-                display: "mRNA vs CNA",
-                plotModel: {vertical: {
-                    dataType: dataTypes.find((dataType) => dataType.value === "MRNA_EXPRESSION"),
-                    dataSource: undefined,
-                    useSameGene:true
-                },
-                horizontal: {
-                    dataType: dataTypes.find((dataType) => dataType.value === "COPY_NUMBER_ALTERATION"),
-                    dataSource: undefined,},
+                display: 'mRNA vs CNA',
+                plotModel: {
+                    vertical: {
+                        dataType: dataTypes.find(
+                            dataType => dataType.value === 'MRNA_EXPRESSION'
+                        ),
+                        dataSource: undefined,
+                        useSameGene: true,
+                    },
+                    horizontal: {
+                        dataType: dataTypes.find(
+                            dataType =>
+                                dataType.value === 'COPY_NUMBER_ALTERATION'
+                        ),
+                        dataSource: undefined,
+                    },
                 },
-            }
-        }
+            };
+        },
     },
     {
         isApplicableToQuery: (dataTypes: PlotsTabOption[]): boolean => {
             return (
-                dataTypes.find((dataType) => dataType.value === "METHYLATION") !== undefined &&
-                dataTypes.find((dataType) => dataType.value === "MRNA_EXPRESSION") !== undefined
+                dataTypes.find(dataType => dataType.value === 'METHYLATION') !==
+                    undefined &&
+                dataTypes.find(
+                    dataType => dataType.value === 'MRNA_EXPRESSION'
+                ) !== undefined
             );
         },
         toButtonInfo: (
@@ -427,10 +492,9 @@ const quickPlots: QuickPlot[] = [
             horizontal: TypeSourcePair,
             dataTypes: PlotsTabOption[]
         ): ButtonInfo => {
-            const selected = (
-                vertical.type === "MRNA_EXPRESSION" &&
-                horizontal.type === "METHYLATION"
-            )
+            const selected =
+                vertical.type === 'MRNA_EXPRESSION' &&
+                horizontal.type === 'METHYLATION';
 
             return {
                 selected,
@@ -441,7 +505,7 @@ const quickPlots: QuickPlot[] = [
                             dataType => dataType.value === 'MRNA_EXPRESSION'
                         ),
                         dataSource: undefined,
-                        useSameGene:true
+                        useSameGene: true,
                     },
                     horizontal: {
                         dataType: dataTypes.find(
@@ -449,21 +513,30 @@ const quickPlots: QuickPlot[] = [
                         ),
                         dataSource: undefined,
                     },
-                }
+                },
             };
         },
     },
     {
         isApplicableToQuery: (dataTypes: PlotsTabOption[]): boolean => {
             return (
-                dataTypes.find((dataType) => dataType.value === "PROTEIN_LEVEL") !== undefined &&
-                dataTypes.find((dataType) => dataType.value === "MRNA_EXPRESSION") !== undefined
+                dataTypes.find(
+                    dataType => dataType.value === 'PROTEIN_LEVEL'
+                ) !== undefined &&
+                dataTypes.find(
+                    dataType => dataType.value === 'MRNA_EXPRESSION'
+                ) !== undefined
             );
-        }, toButtonInfo: (vertical: TypeSourcePair, horizontal: TypeSourcePair, dataTypes: PlotsTabOption[], dataSources: PlotsTabDataSource): ButtonInfo => {
-            const selected = (
-                vertical.type === "PROTEIN_LEVEL" &&
-                horizontal.type === "MRNA_EXPRESSION"
-            )
+        },
+        toButtonInfo: (
+            vertical: TypeSourcePair,
+            horizontal: TypeSourcePair,
+            dataTypes: PlotsTabOption[],
+            dataSources: PlotsTabDataSource
+        ): ButtonInfo => {
+            const selected =
+                vertical.type === 'PROTEIN_LEVEL' &&
+                horizontal.type === 'MRNA_EXPRESSION';
 
             return {
                 selected,
@@ -475,9 +548,10 @@ const quickPlots: QuickPlot[] = [
                         ),
                         dataSource: dataSources['PROTEIN_LEVEL'].find(
                             source =>
-                                source.value === 'brca_tcga_protein_quantification'
+                                source.value ===
+                                'brca_tcga_protein_quantification'
                         ),
-                        useSameGene:true
+                        useSameGene: true,
                     },
                     horizontal: {
                         dataType: dataTypes.find(
@@ -485,20 +559,26 @@ const quickPlots: QuickPlot[] = [
                         ),
                         dataSource: undefined,
                     },
-                }
+                },
             };
         },
     },
     {
         isApplicableToQuery: (dataTypes: PlotsTabOption[]): boolean => {
             return (
-                dataTypes.find((dataType) => dataType.value === "GENERIC_ASSAY") !== undefined
+                dataTypes.find(
+                    dataType => dataType.value === 'GENERIC_ASSAY'
+                ) !== undefined
             );
-        }, toButtonInfo: (vertical: TypeSourcePair, horizontal: TypeSourcePair, dataTypes: PlotsTabOption[]): ButtonInfo => {
-            const selected = (
-                vertical.type === "GENERIC_ASSAY" &&
-                horizontal.type === NONE_SELECTED_OPTION_STRING_VALUE
-            )
+        },
+        toButtonInfo: (
+            vertical: TypeSourcePair,
+            horizontal: TypeSourcePair,
+            dataTypes: PlotsTabOption[]
+        ): ButtonInfo => {
+            const selected =
+                vertical.type === 'GENERIC_ASSAY' &&
+                horizontal.type === NONE_SELECTED_OPTION_STRING_VALUE;
 
             return {
                 selected,
@@ -517,11 +597,11 @@ const quickPlots: QuickPlot[] = [
                         ),
                         dataSource: undefined,
                     },
-                }
+                },
             };
         },
     },
-]
+];
 
 export function generateQuickPlots(
     dataTypes: PlotsTabOption[],
@@ -529,9 +609,18 @@ export function generateQuickPlots(
     cancerTypes: string[],
     mutationCount: number,
     horizontal: TypeSourcePair,
-    vertical: TypeSourcePair,
+    vertical: TypeSourcePair
 ): ButtonInfo[] {
     return quickPlots
-        .filter((plot) => plot.isApplicableToQuery(dataTypes, dataSources, cancerTypes, mutationCount))
-        .map((plot) => plot.toButtonInfo(vertical, horizontal, dataTypes, dataSources));
-}
\ No newline at end of file
+        .filter(plot =>
+            plot.isApplicableToQuery(
+                dataTypes,
+                dataSources,
+                cancerTypes,
+                mutationCount
+            )
+        )
+        .map(plot =>
+            plot.toButtonInfo(vertical, horizontal, dataTypes, dataSources)
+        );
+}
diff --git a/src/pages/resultsView/plots/styles.scss b/src/pages/resultsView/plots/styles.scss
index 53dc974f35f..3e9f2b3b577 100644
--- a/src/pages/resultsView/plots/styles.scss
+++ b/src/pages/resultsView/plots/styles.scss
@@ -1,178 +1,171 @@
 .lockIcon {
-  color: #000000;
+    color: #000000;
 }
 
 .plotsTab {
+    .chartWrapper {
+        float: left;
+        overflow: hidden;
+    }
 
-  .chartWrapper {
-    float: left;
-    overflow: hidden;
-  }
-
-  .leftColumn {
-    width:304px;
+    .leftColumn {
+        width: 304px;
 
-    margin-right:$standardMargin;
+        margin-right: $standardMargin;
 
-    .Select {
-      width:240px;
-    }
+        .Select {
+            width: 240px;
+        }
 
-    .Select.is-open.is-searchable {
-      .Select-value-label {
-        color:#aaaaaa !important;
-      }
-    }
+        .Select.is-open.is-searchable {
+            .Select-value-label {
+                color: #aaaaaa !important;
+            }
+        }
 
-    /*.Select.data-source-id {
+        /*.Select.data-source-id {
       .Select-menu-outer {
         width: 300px;
       }
     }*/
 
-    .swapAxes {
-      text-align: center;
-      padding:0;
-    }
-
-    .axisBlock {
-      background: #eee;
-      border-radius: 4px;
-      padding: 10px;
-
-      form {
-        display: flex;
-      }
+        .swapAxes {
+            text-align: center;
+            padding: 0;
+        }
 
-      h4 {
-        writing-mode: vertical-lr;
-        padding: 0 !important;
-        margin: 0 !important;
-        width: 23px;
-        text-align: center;
-        transform:rotate(180deg);
-        position:relative;
-        left:-8px;
-      }
-    }
+        .axisBlock {
+            background: #eee;
+            border-radius: 4px;
+            padding: 10px;
+
+            form {
+                display: flex;
+            }
+
+            h4 {
+                writing-mode: vertical-lr;
+                padding: 0 !important;
+                margin: 0 !important;
+                width: 23px;
+                text-align: center;
+                transform: rotate(180deg);
+                position: relative;
+                left: -8px;
+            }
+        }
 
-    .label-text {
-      color: #333333;
-      margin-bottom: 5px;
-      padding: 0px;
-    }
+        .label-text {
+            color: #333333;
+            margin-bottom: 5px;
+            padding: 0px;
+        }
 
-    .form-group-bspace {
-      margin-bottom: 5px;
-    }
+        .form-group-bspace {
+            margin-bottom: 5px;
+        }
 
-    .PlotsTab {
-      width: 120%;
-    }
+        .PlotsTab {
+            width: 120%;
+        }
 
-    .color-samples{
-      right: 10px;
-      bottom: 0;
-      position: absolute;
-    }
+        .color-samples {
+            right: 10px;
+            bottom: 0;
+            position: absolute;
+        }
 
-    .btn.sort-order {
-      margin-right: 10px;
-      padding: 4px 9px;
-      margin-left: -20px;
-    }
+        .btn.sort-order {
+            margin-right: 10px;
+            padding: 4px 9px;
+            margin-left: -20px;
+        }
 
-    i.horz-descending {
-      transform: rotate(-90deg) scaleY(-1) scaleX(-1);
-    }
+        i.horz-descending {
+            transform: rotate(-90deg) scaleY(-1) scaleX(-1);
+        }
 
-    i.horz-ascending {
-      transform: rotate(-90deg) scaleY(-1);
-    }
+        i.horz-ascending {
+            transform: rotate(-90deg) scaleY(-1);
+        }
 
-    i.vert-descending {
-      transform: scaleX(-1);
-    }
+        i.vert-descending {
+            transform: scaleX(-1);
+        }
 
-    .mutation-message {
-      color: red;
-      margin: 3px;
+        .mutation-message {
+            color: red;
+            margin: 3px;
+        }
     }
 
-  }
+    .utilities-menu {
+        margin-bottom: -20px;
 
-  .utilities-menu {
-
-    margin-bottom: -20px;
-
-    * {
-      vertical-align: middle;
-      margin: 0;
-    }
+        * {
+            vertical-align: middle;
+            margin: 0;
+        }
 
-    label {
-      padding: 0px;
-      margin: 0 0 0 8px;
-    }
+        label {
+            padding: 0px;
+            margin: 0 0 0 8px;
+        }
 
-    .legend-label {
-      margin-right: 4px;
-    }
+        .legend-label {
+            margin-right: 4px;
+        }
 
-    input[type='checkbox'] {
-      margin: 0 8px 1px 0;
-      padding: 0;
-      position: relative;
-    }
+        input[type='checkbox'] {
+            margin: 0 8px 1px 0;
+            padding: 0;
+            position: relative;
+        }
 
-    input[type='radio'] {
-      margin: 0px 8px 0px 2px;
-    }
+        input[type='radio'] {
+            margin: 0px 8px 0px 2px;
+        }
 
-    .gene-select-background {
-      
-      border-radius: 4px;
-      vertical-align: middle;
-      padding: 2px 2px 2px 2px;
-      margin-right: -10px;
-      
-      label {
-        margin: 0 0 0 0;
-      }
-      
-      .checkbox {
-        display: inline-block;
-        margin: 0;
-      }
-      
-  
-      // the styles below are applied when
-      // the gene select box is shown
-      &.gene-select-shown {
-        background-color: $main-bg;
-        margin-right: 2px;
-      }
-      
-      .gene-select-container {
-        margin-left: 8px;
-        
-        .gene-select {
-          text-align: left;
-          margin-right: 0;
-          width: 100px;
+        .gene-select-background {
+            border-radius: 4px;
+            vertical-align: middle;
+            padding: 2px 2px 2px 2px;
+            margin-right: -10px;
+
+            label {
+                margin: 0 0 0 0;
+            }
+
+            .checkbox {
+                display: inline-block;
+                margin: 0;
+            }
+
+            // the styles below are applied when
+            // the gene select box is shown
+            &.gene-select-shown {
+                background-color: $main-bg;
+                margin-right: 2px;
+            }
+
+            .gene-select-container {
+                margin-left: 8px;
+
+                .gene-select {
+                    text-align: left;
+                    margin-right: 0;
+                    width: 100px;
+                }
+            }
         }
-      }
-      
     }
-
-  }
     strong.quickPlotsTitle {
-      margin-right: 5px;
+        margin-right: 5px;
     }
 
     .quickPlotsContainer {
-      display: flex;
-      margin-right: 5px;
+        display: flex;
+        margin-right: 5px;
     }
 }
 
diff --git a/src/pages/resultsView/querySummary/QuerySummary.tsx b/src/pages/resultsView/querySummary/QuerySummary.tsx
index 6b29d4db73c..a2af116c09b 100644
--- a/src/pages/resultsView/querySummary/QuerySummary.tsx
+++ b/src/pages/resultsView/querySummary/QuerySummary.tsx
@@ -1,90 +1,122 @@
 import * as React from 'react';
-import { observer} from "mobx-react";
-import {ResultsViewPageStore} from "../ResultsViewPageStore";
+import { observer } from 'mobx-react';
+import { ResultsViewPageStore } from '../ResultsViewPageStore';
 
-import {CancerStudy} from "../../../shared/api/generated/CBioPortalAPI";
+import { CancerStudy } from '../../../shared/api/generated/CBioPortalAPI';
 import classNames from 'classnames';
 import './styles.scss';
-import {DefaultTooltip, getBrowserWindow, setArrowLeft} from "cbioportal-frontend-commons";
-import Loader, {default as LoadingIndicator} from "../../../shared/components/loadingIndicator/LoadingIndicator";
-import {action, computed, observable} from "mobx";
-import QueryAndDownloadTabs from "../../../shared/components/query/QueryAndDownloadTabs";
-import autobind from "autobind-decorator";
-import ExtendedRouterStore from "../../../shared/lib/ExtendedRouterStore";
-import {ShareUI} from "./ShareUI";
-import {ServerConfigHelpers} from "../../../config/config";
-import AppConfig from "appConfig";
-import {StudyLink} from "../../../shared/components/StudyLink/StudyLink";
-import {getAlterationSummary, getGeneSummary, getPatientSampleSummary, submitToStudyViewPage} from "./QuerySummaryUtils";
-import {MakeMobxView} from "../../../shared/components/MobxView";
-import {getGAInstance} from "../../../shared/lib/tracking";
-import {buildCBioPortalPageUrl} from "../../../shared/api/urls";
-import ResultsPageSettings from "../settings/ResultsPageSettings";
-import {createQueryStore} from "shared/lib/createQueryStore";
-import _ from "lodash";
+import {
+    DefaultTooltip,
+    getBrowserWindow,
+    setArrowLeft,
+} from 'cbioportal-frontend-commons';
+import Loader, {
+    default as LoadingIndicator,
+} from '../../../shared/components/loadingIndicator/LoadingIndicator';
+import { action, computed, observable } from 'mobx';
+import QueryAndDownloadTabs from '../../../shared/components/query/QueryAndDownloadTabs';
+import autobind from 'autobind-decorator';
+import ExtendedRouterStore from '../../../shared/lib/ExtendedRouterStore';
+import { ShareUI } from './ShareUI';
+import { ServerConfigHelpers } from '../../../config/config';
+import AppConfig from 'appConfig';
+import { StudyLink } from '../../../shared/components/StudyLink/StudyLink';
+import {
+    getAlterationSummary,
+    getGeneSummary,
+    getPatientSampleSummary,
+    submitToStudyViewPage,
+} from './QuerySummaryUtils';
+import { MakeMobxView } from '../../../shared/components/MobxView';
+import { getGAInstance } from '../../../shared/lib/tracking';
+import { buildCBioPortalPageUrl } from '../../../shared/api/urls';
+import ResultsPageSettings from '../settings/ResultsPageSettings';
+import { createQueryStore } from 'shared/lib/createQueryStore';
+import _ from 'lodash';
 
 interface QuerySummaryProps {
-    routingStore:ExtendedRouterStore;
+    routingStore: ExtendedRouterStore;
     store: ResultsViewPageStore;
-    onToggleQueryFormVisibility:(visible:boolean)=>void;
-    onToggleOQLEditUIVisibility:()=>void;
+    onToggleQueryFormVisibility: (visible: boolean) => void;
+    onToggleOQLEditUIVisibility: () => void;
 }
 
 @observer
-export default class QuerySummary extends React.Component<QuerySummaryProps, {}> {
-
+export default class QuerySummary extends React.Component<
+    QuerySummaryProps,
+    {}
+> {
     @autobind
     @action
     private toggleQueryFormVisibility() {
-        this.props.onToggleQueryFormVisibility(this.props.store.queryFormVisible);
+        this.props.onToggleQueryFormVisibility(
+            this.props.store.queryFormVisible
+        );
         // if clicked the query button in the download tab and want to close the query form, clear the selected sample ids
-        if (this.props.store.modifyQueryParams && this.props.store.queryFormVisible === true) {
+        if (
+            this.props.store.modifyQueryParams &&
+            this.props.store.queryFormVisible === true
+        ) {
             this.props.store.modifyQueryParams = undefined;
         }
         this.props.store.queryFormVisible = !this.props.store.queryFormVisible;
     }
 
-    @computed get queryFormVisible(){
+    @computed get queryFormVisible() {
         return this.props.store.queryFormVisible || this.isQueryOrGeneInvalid;
     }
 
     @computed get studyPageFilteredCasesLink() {
-        return <a onClick={() => {
-            submitToStudyViewPage(
-                this.props.store.queriedStudies.result,
-                this.props.store.samples.result,
-                this.props.store.queriedVirtualStudies.result.length > 0,
-                this.props.store.sampleLists.result)
-        }}>
-            {getPatientSampleSummary(this.props.store.samples.result, this.props.store.patients.result)}
-        </a>
+        return (
+            <a
+                onClick={() => {
+                    submitToStudyViewPage(
+                        this.props.store.queriedStudies.result,
+                        this.props.store.samples.result,
+                        this.props.store.queriedVirtualStudies.result.length >
+                            0,
+                        this.props.store.sampleLists.result
+                    );
+                }}
+            >
+                {getPatientSampleSummary(
+                    this.props.store.samples.result,
+                    this.props.store.patients.result
+                )}
+            </a>
+        );
     }
 
-
     readonly singleStudyUI = MakeMobxView({
-        await:()=>[
+        await: () => [
             this.props.store.queriedStudies,
             this.props.store.sampleLists,
             this.props.store.samples,
-            this.props.store.patients
+            this.props.store.patients,
         ],
-        render:()=>{
-            const sampleListName = (this.props.store.sampleLists.result!.length > 0) ?
-                (<span>{this.props.store.sampleLists.result![0].name}</span>) :
-                (<span>User-defined Patient List</span>);
+        render: () => {
+            const sampleListName =
+                this.props.store.sampleLists.result!.length > 0 ? (
+                    <span>{this.props.store.sampleLists.result![0].name}</span>
+                ) : (
+                    <span>User-defined Patient List</span>
+                );
 
             return (
                 <div>
                     <h3>
                         <a
-                            href={buildCBioPortalPageUrl(`study`, {id: this.props.store.queriedStudies.result.map(study => study.studyId).join(',')})}
+                            href={buildCBioPortalPageUrl(`study`, {
+                                id: this.props.store.queriedStudies.result
+                                    .map(study => study.studyId)
+                                    .join(','),
+                            })}
                             target="_blank"
                         >
                             {this.props.store.queriedStudies.result[0].name}
                         </a>
                     </h3>
                     {sampleListName}&nbsp;({this.studyPageFilteredCasesLink})
-
                     &nbsp;-&nbsp;
                     {getGeneSummary(this.props.store.hugoGeneSymbols)}
                     &nbsp;
@@ -95,12 +127,12 @@ export default class QuerySummary extends React.Component<QuerySummaryProps, {}>
                     </DefaultTooltip>
                 </div>
             );
-        }
+        },
     });
 
     @autobind
     @action
-    closeQueryForm(){
+    closeQueryForm() {
         // toggle QueryForm visibility only when queryFormVisible is true
         if (this.props.store.queryFormVisible === true) {
             this.toggleQueryFormVisibility();
@@ -109,84 +141,129 @@ export default class QuerySummary extends React.Component<QuerySummaryProps, {}>
     }
 
     readonly multipleStudyUI = MakeMobxView({
-        await:()=>[this.props.store.samples, this.props.store.patients, this.props.store.queriedStudies, this.props.store.sampleLists],
-        render:()=>{
+        await: () => [
+            this.props.store.samples,
+            this.props.store.patients,
+            this.props.store.queriedStudies,
+            this.props.store.sampleLists,
+        ],
+        render: () => {
             return (
-            <div>
-                <h3>
-                    <a
-                        href={buildCBioPortalPageUrl(`study`, {id: this.props.store.queriedStudies.result.map(study => study.studyId).join(',')})}
-                        target="_blank"
-                    >
-                        Combined Study ({_.sumBy(this.props.store.queriedStudies.result,study=>study.allSampleCount)} samples)
-                    </a>
-                </h3>
-                <span>
-                    Querying {this.studyPageFilteredCasesLink} in {this.props.store.queriedStudies.result.length} studies
-
-
-                    &nbsp;-&nbsp;
-                    {getGeneSummary(this.props.store.hugoGeneSymbols)}
-                    &nbsp;
-                    <DefaultTooltip
-                        placement='bottom'
-                        overlay={this.studyList}
-                        destroyTooltipOnHide={true}
-                    ><i className="fa fa-info-circle"/>
-                    </DefaultTooltip>
-                </span>
-            </div>
-        )}
+                <div>
+                    <h3>
+                        <a
+                            href={buildCBioPortalPageUrl(`study`, {
+                                id: this.props.store.queriedStudies.result
+                                    .map(study => study.studyId)
+                                    .join(','),
+                            })}
+                            target="_blank"
+                        >
+                            Combined Study (
+                            {_.sumBy(
+                                this.props.store.queriedStudies.result,
+                                study => study.allSampleCount
+                            )}{' '}
+                            samples)
+                        </a>
+                    </h3>
+                    <span>
+                        Querying {this.studyPageFilteredCasesLink} in{' '}
+                        {this.props.store.queriedStudies.result.length} studies
+                        &nbsp;-&nbsp;
+                        {getGeneSummary(this.props.store.hugoGeneSymbols)}
+                        &nbsp;
+                        <DefaultTooltip
+                            placement="bottom"
+                            overlay={this.studyList}
+                            destroyTooltipOnHide={true}
+                        >
+                            <i className="fa fa-info-circle" />
+                        </DefaultTooltip>
+                    </span>
+                </div>
+            );
+        },
     });
 
     readonly cohortAndGeneSummary = MakeMobxView({
-        await:()=>[this.singleStudyUI, this.multipleStudyUI, this.props.store.queriedStudies],
-        render:()=>{
+        await: () => [
+            this.singleStudyUI,
+            this.multipleStudyUI,
+            this.props.store.queriedStudies,
+        ],
+        render: () => {
             if (this.props.store.queriedStudies.result.length === 1) {
                 return this.singleStudyUI.component!;
             } else {
                 return this.multipleStudyUI.component!;
             }
-        }
+        },
     });
 
     readonly alterationSummary = MakeMobxView({
-        await:()=>[this.props.store.samples, this.props.store.patients,
-            this.props.store.alteredSampleKeys, this.props.store.alteredPatientKeys],
-        render:()=>(getAlterationSummary(this.props.store.samples.result!.length, this.props.store.patients.result!.length,
-            this.props.store.alteredSampleKeys.result!.length, this.props.store.alteredPatientKeys.result!.length, this.props.store.hugoGeneSymbols.length))
+        await: () => [
+            this.props.store.samples,
+            this.props.store.patients,
+            this.props.store.alteredSampleKeys,
+            this.props.store.alteredPatientKeys,
+        ],
+        render: () =>
+            getAlterationSummary(
+                this.props.store.samples.result!.length,
+                this.props.store.patients.result!.length,
+                this.props.store.alteredSampleKeys.result!.length,
+                this.props.store.alteredPatientKeys.result!.length,
+                this.props.store.hugoGeneSymbols.length
+            ),
     });
 
-    private get studyList(){
-
-        return (<div className="cbioportal-frontend">
-                <ul className="list-unstyled" style={{marginBottom:0}}>
-                {
-                    this.props.store.queriedStudies.result.map((study:CancerStudy)=>{
-                        return <li><StudyLink studyId={study.studyId}>{study.name}</StudyLink></li>
-                    })
-                }
+    private get studyList() {
+        return (
+            <div className="cbioportal-frontend">
+                <ul className="list-unstyled" style={{ marginBottom: 0 }}>
+                    {this.props.store.queriedStudies.result.map(
+                        (study: CancerStudy) => {
+                            return (
+                                <li>
+                                    <StudyLink studyId={study.studyId}>
+                                        {study.name}
+                                    </StudyLink>
+                                </li>
+                            );
+                        }
+                    )}
                 </ul>
-        </div>)
+            </div>
+        );
     }
 
     @autobind
-    onSubmit(){
+    onSubmit() {
         this.closeQueryForm();
         getGAInstance()('send', 'event', 'resultsView', 'query modified');
     }
 
-    @computed get queryForm(){
-        return <div style={{margin:"10px -20px 0 -20px"}}>
-            <QueryAndDownloadTabs onSubmit={this.onSubmit}
-                                  forkedMode={false}
-                                  showQuickSearchTab={false}
-                                  showDownloadTab={false}
-                                  showAlerts={true}
-                                  modifyQueryParams={this.props.store.modifyQueryParams}
-                                  getQueryStore={()=>createQueryStore(this.props.store.urlWrapper.query, this.props.store.urlWrapper,false)}
-            />
-        </div>
+    @computed get queryForm() {
+        return (
+            <div style={{ margin: '10px -20px 0 -20px' }}>
+                <QueryAndDownloadTabs
+                    onSubmit={this.onSubmit}
+                    forkedMode={false}
+                    showQuickSearchTab={false}
+                    showDownloadTab={false}
+                    showAlerts={true}
+                    modifyQueryParams={this.props.store.modifyQueryParams}
+                    getQueryStore={() =>
+                        createQueryStore(
+                            this.props.store.urlWrapper.query,
+                            this.props.store.urlWrapper,
+                            false
+                        )
+                    }
+                />
+            </div>
+        );
     }
 
     @computed get isQueryOrGeneInvalid() {
@@ -194,68 +271,96 @@ export default class QuerySummary extends React.Component<QuerySummaryProps, {}>
     }
 
     render() {
-
-        if (!this.cohortAndGeneSummary.isError && !this.alterationSummary.isError) {
-
-            const loadingComplete = this.cohortAndGeneSummary.isComplete && this.alterationSummary.isComplete;
+        if (
+            !this.cohortAndGeneSummary.isError &&
+            !this.alterationSummary.isError
+        ) {
+            const loadingComplete =
+                this.cohortAndGeneSummary.isComplete &&
+                this.alterationSummary.isComplete;
 
             return (
                 <div>
                     <div className="query-summary">
                         <div className="query-summary__leftItems">
-                            {
-                                (!this.isQueryOrGeneInvalid) && (
-                                    <div>
-                                        <button id="modifyQueryBtn" onClick={this.toggleQueryFormVisibility} className={classNames('btn btn-primary' , { disabled:!loadingComplete  })}>
-                                            {(this.queryFormVisible) ? 'Cancel Modify Query' : 'Modify Query'}
-                                        </button>
-                                        <DefaultTooltip
-                                            trigger={["click"]}
-                                            placement="bottomRight"
-                                            overlay={<ResultsPageSettings store={this.props.store} />}
-                                            visible={this.props.store.resultsPageSettingsVisible}
-                                            onVisibleChange={visible=>{ this.props.store.resultsPageSettingsVisible = !!visible; }}
-                                            onPopupAlign={tooltipEl=>setArrowLeft(tooltipEl, "22px")}
+                            {!this.isQueryOrGeneInvalid && (
+                                <div>
+                                    <button
+                                        id="modifyQueryBtn"
+                                        onClick={this.toggleQueryFormVisibility}
+                                        className={classNames(
+                                            'btn btn-primary',
+                                            { disabled: !loadingComplete }
+                                        )}
+                                    >
+                                        {this.queryFormVisible
+                                            ? 'Cancel Modify Query'
+                                            : 'Modify Query'}
+                                    </button>
+                                    <DefaultTooltip
+                                        trigger={['click']}
+                                        placement="bottomRight"
+                                        overlay={
+                                            <ResultsPageSettings
+                                                store={this.props.store}
+                                            />
+                                        }
+                                        visible={
+                                            this.props.store
+                                                .resultsPageSettingsVisible
+                                        }
+                                        onVisibleChange={visible => {
+                                            this.props.store.resultsPageSettingsVisible = !!visible;
+                                        }}
+                                        onPopupAlign={tooltipEl =>
+                                            setArrowLeft(tooltipEl, '22px')
+                                        }
+                                    >
+                                        <button
+                                            data-test="GlobalSettingsButton"
+                                            style={{ marginLeft: 5 }}
+                                            className="btn btn-primary"
                                         >
-                                            <button data-test="GlobalSettingsButton" style={{marginLeft:5}} className="btn btn-primary">
-                                                <i className="fa fa-sliders fa-lg"/>
-                                            </button>
-                                        </DefaultTooltip>
-                                    </div>
-                                )
-                            }
-
-                            <LoadingIndicator isLoading={!loadingComplete} small={true}/>
-                            {
-                                (loadingComplete) && this.cohortAndGeneSummary.component!
-                            }
+                                            <i className="fa fa-sliders fa-lg" />
+                                        </button>
+                                    </DefaultTooltip>
+                                </div>
+                            )}
+
+                            <LoadingIndicator
+                                isLoading={!loadingComplete}
+                                small={true}
+                            />
+                            {loadingComplete &&
+                                this.cohortAndGeneSummary.component!}
                         </div>
 
                         <div className="query-summary__rightItems">
                             <div className="query-summary__alterationData">
-                            {
-                                (loadingComplete) && <strong>{this.alterationSummary.component!}</strong>
-                            }
+                                {loadingComplete && (
+                                    <strong>
+                                        {this.alterationSummary.component!}
+                                    </strong>
+                                )}
                             </div>
 
-                            <ShareUI sessionEnabled={ServerConfigHelpers.sessionServiceIsEnabled()}
-                                     bitlyAccessToken={AppConfig.serverConfig.bitly_access_token}
-
-                                     urlWrapper={this.props.store.urlWrapper}/>
+                            <ShareUI
+                                sessionEnabled={ServerConfigHelpers.sessionServiceIsEnabled()}
+                                bitlyAccessToken={
+                                    AppConfig.serverConfig.bitly_access_token
+                                }
+                                urlWrapper={this.props.store.urlWrapper}
+                            />
                         </div>
-
                     </div>
 
-                    {
-                        (this.queryFormVisible) && this.queryForm
-                    }
+                    {this.queryFormVisible && this.queryForm}
                 </div>
-            )
+            );
         } else if (this.isQueryOrGeneInvalid) {
             return this.queryForm;
         } else {
             return null;
         }
     }
-
 }
diff --git a/src/pages/resultsView/querySummary/QuerySummaryUtils.spec.tsx b/src/pages/resultsView/querySummary/QuerySummaryUtils.spec.tsx
index 63468931025..c42f8015ec8 100644
--- a/src/pages/resultsView/querySummary/QuerySummaryUtils.spec.tsx
+++ b/src/pages/resultsView/querySummary/QuerySummaryUtils.spec.tsx
@@ -1,36 +1,72 @@
-import {assert} from "chai";
-import {getAlterationSummary, getGeneSummary} from "./QuerySummaryUtils";
-import * as React from "react";
+import { assert } from 'chai';
+import { getAlterationSummary, getGeneSummary } from './QuerySummaryUtils';
+import * as React from 'react';
 import expect from 'expect';
 import expectJSX from 'expect-jsx';
 expect.extend(expectJSX);
 
-describe("QuerySummaryUtils", () => {
-    describe("getGeneSummary", ()=>{
-        it("gives correct summary for various numbers of genes", ()=>{
-            assert.equal(getGeneSummary([]), "");
-            assert.equal(getGeneSummary(["BRCA1"]), "BRCA1");
-            assert.equal(getGeneSummary(["BRCA1","BRCA2"]), "BRCA1 & BRCA2");
-            assert.equal(getGeneSummary(["A","B","C"]), "A, B & C");
-            assert.equal(getGeneSummary(["A","B","C","D"]), "A, B & 2 other genes");
-            assert.equal(getGeneSummary(["A","B","C","D","E"]), "A, B & 3 other genes");
-            assert.equal(getGeneSummary(["A","B","C","D","E","F","G","H"]), "A, B & 6 other genes");
+describe('QuerySummaryUtils', () => {
+    describe('getGeneSummary', () => {
+        it('gives correct summary for various numbers of genes', () => {
+            assert.equal(getGeneSummary([]), '');
+            assert.equal(getGeneSummary(['BRCA1']), 'BRCA1');
+            assert.equal(getGeneSummary(['BRCA1', 'BRCA2']), 'BRCA1 & BRCA2');
+            assert.equal(getGeneSummary(['A', 'B', 'C']), 'A, B & C');
+            assert.equal(
+                getGeneSummary(['A', 'B', 'C', 'D']),
+                'A, B & 2 other genes'
+            );
+            assert.equal(
+                getGeneSummary(['A', 'B', 'C', 'D', 'E']),
+                'A, B & 3 other genes'
+            );
+            assert.equal(
+                getGeneSummary(['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H']),
+                'A, B & 6 other genes'
+            );
         });
     });
-    describe("getAlterationSummary", ()=>{
-        it("gives correct summary for various inputs", ()=>{
-            expect(getAlterationSummary(10, 10, 10, 10, 5)).toEqualJSX(<strong><span>
-                Queried genes are altered in 10 (100%) of queried patients/samples
-            </span></strong>, "all altered, same number samples and patients");
+    describe('getAlterationSummary', () => {
+        it('gives correct summary for various inputs', () => {
+            expect(getAlterationSummary(10, 10, 10, 10, 5)).toEqualJSX(
+                <strong>
+                    <span>
+                        Queried genes are altered in 10 (100%) of queried
+                        patients/samples
+                    </span>
+                </strong>,
+                'all altered, same number samples and patients'
+            );
 
-            const notAllAlteredDifferentSamplesAndPatients = getAlterationSummary(10, 8, 7, 4, 1);
-            expect(notAllAlteredDifferentSamplesAndPatients).toIncludeJSX("Queried gene is altered in ", "not all altered, different number samples and patients 1");
-            expect(notAllAlteredDifferentSamplesAndPatients).toIncludeJSX("4 (50%) of queried patients", "not all altered, different number samples and patients 2");
-            expect(notAllAlteredDifferentSamplesAndPatients).toIncludeJSX("7 (70%) of queried samples", "not all altered, different number samples and patients 3");
+            const notAllAlteredDifferentSamplesAndPatients = getAlterationSummary(
+                10,
+                8,
+                7,
+                4,
+                1
+            );
+            expect(notAllAlteredDifferentSamplesAndPatients).toIncludeJSX(
+                'Queried gene is altered in ',
+                'not all altered, different number samples and patients 1'
+            );
+            expect(notAllAlteredDifferentSamplesAndPatients).toIncludeJSX(
+                '4 (50%) of queried patients',
+                'not all altered, different number samples and patients 2'
+            );
+            expect(notAllAlteredDifferentSamplesAndPatients).toIncludeJSX(
+                '7 (70%) of queried samples',
+                'not all altered, different number samples and patients 3'
+            );
 
-            expect(getAlterationSummary(8, 8, 0, 0, 1)).toEqualJSX(<strong><span>
-                Queried gene is altered in 0 (0%) of queried patients/samples
-            </span></strong>, "none altered, same number samples and patients");
+            expect(getAlterationSummary(8, 8, 0, 0, 1)).toEqualJSX(
+                <strong>
+                    <span>
+                        Queried gene is altered in 0 (0%) of queried
+                        patients/samples
+                    </span>
+                </strong>,
+                'none altered, same number samples and patients'
+            );
         });
     });
-});
\ No newline at end of file
+});
diff --git a/src/pages/resultsView/querySummary/QuerySummaryUtils.tsx b/src/pages/resultsView/querySummary/QuerySummaryUtils.tsx
index 9ecdb8fd019..03afbde7dfa 100644
--- a/src/pages/resultsView/querySummary/QuerySummaryUtils.tsx
+++ b/src/pages/resultsView/querySummary/QuerySummaryUtils.tsx
@@ -1,57 +1,80 @@
-import {getPercentage} from "../../../shared/lib/FormatUtils";
-import * as React from "react";
-import { SampleList, Sample, CancerStudy } from "shared/api/generated/CBioPortalAPI";
-import _ from "lodash";
-import {buildCBioPortalPageUrl} from "../../../shared/api/urls";
+import { getPercentage } from '../../../shared/lib/FormatUtils';
+import * as React from 'react';
+import {
+    SampleList,
+    Sample,
+    CancerStudy,
+} from 'shared/api/generated/CBioPortalAPI';
+import _ from 'lodash';
+import { buildCBioPortalPageUrl } from '../../../shared/api/urls';
 
-export function getPatientSampleSummary(
-    samples:any[],
-    patients:any[]
-) {
+export function getPatientSampleSummary(samples: any[], patients: any[]) {
     if (samples.length !== patients.length) {
         return (
             <span>
-                <strong>{patients.length}</strong> patients / <strong>{samples.length}</strong> samples
-        </span>
-    );
+                <strong>{patients.length}</strong> patients /{' '}
+                <strong>{samples.length}</strong> samples
+            </span>
+        );
     } else {
         return (
             <span>
                 <strong>{samples.length}</strong> patients/samples
-        </span>
-    );
+            </span>
+        );
     }
 }
 
-export function getGeneSummary(hugoSymbols:string[]) {
+export function getGeneSummary(hugoSymbols: string[]) {
     switch (hugoSymbols.length) {
         case 0:
-            return "";
+            return '';
         case 1:
             return hugoSymbols[0];
         case 2:
-            return hugoSymbols.join(" & ");
+            return hugoSymbols.join(' & ');
         default:
-            return `${hugoSymbols[0]}, ${hugoSymbols[1]} & ${(hugoSymbols.length === 3) ? hugoSymbols[2] : `${hugoSymbols.length - 2} other genes`}`;
+            return `${hugoSymbols[0]}, ${hugoSymbols[1]} & ${
+                hugoSymbols.length === 3
+                    ? hugoSymbols[2]
+                    : `${hugoSymbols.length - 2} other genes`
+            }`;
     }
 }
 
 export function getAlterationSummary(
-    numSamples:number, numPatients:number, numAlteredSamples:number, numAlteredPatients:number, numGenes:number
+    numSamples: number,
+    numPatients: number,
+    numAlteredSamples: number,
+    numAlteredPatients: number,
+    numGenes: number
 ) {
-    const prefix = `Queried gene${numGenes !== 1 ? "s are" : " is"} altered in`;
-    const sampleSummaryPrefix = `${numAlteredSamples} (${getPercentage(numAlteredSamples/numSamples, 0)}) of queried`;
+    const prefix = `Queried gene${numGenes !== 1 ? 's are' : ' is'} altered in`;
+    const sampleSummaryPrefix = `${numAlteredSamples} (${getPercentage(
+        numAlteredSamples / numSamples,
+        0
+    )}) of queried`;
     if (numSamples !== numPatients) {
         // note that by the pigeonhole principle, its not possible to have same number of samples and patients and
         //  for there to be more than one sample in a single patient. thus in the case that there are same # of samples
         //  and patients, it must be that numAlteredSamples === numAlteredPatients. Thus we're not hiding any info
         //  by only showing # altered patients if there are different # of samples and patients.
         return (
-            <strong style={{display:"flex"}}>
-                <span style={{marginRight: 13}}>{prefix}</span>
+            <strong style={{ display: 'flex' }}>
+                <span style={{ marginRight: 13 }}>{prefix}</span>
                 <table>
-                    <tr><td>&#8226;&nbsp;{`${numAlteredPatients} (${getPercentage(numAlteredPatients/numPatients, 0)}) of queried patients`}</td></tr>
-                    <tr><td>&#8226;&nbsp;{`${sampleSummaryPrefix} samples`}</td></tr>
+                    <tr>
+                        <td>
+                            &#8226;&nbsp;
+                            {`${numAlteredPatients} (${getPercentage(
+                                numAlteredPatients / numPatients,
+                                0
+                            )}) of queried patients`}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>&#8226;&nbsp;{`${sampleSummaryPrefix} samples`}</td>
+                    </tr>
                 </table>
             </strong>
         );
@@ -65,23 +88,36 @@ export function getAlterationSummary(
 }
 
 export function submitToStudyViewPage(
-    queriedStudies: Pick<CancerStudy, "studyId">[],
-    samples: Pick<Sample, "sampleId" | "studyId">[],
+    queriedStudies: Pick<CancerStudy, 'studyId'>[],
+    samples: Pick<Sample, 'sampleId' | 'studyId'>[],
     hasVirtualStudies: boolean,
-    sampleLists?: Pick<SampleList, "category">[]) {
-    const hasAllCaseLists = _.some(sampleLists, sampleList => sampleList.category === 'all_cases_in_study');
+    sampleLists?: Pick<SampleList, 'category'>[]
+) {
+    const hasAllCaseLists = _.some(
+        sampleLists,
+        sampleList => sampleList.category === 'all_cases_in_study'
+    );
     const sampleIdentifiers: {
         sampleId: string;
         studyId: string;
     }[] = [];
     if (samples.length > 0 && (hasVirtualStudies || !hasAllCaseLists)) {
-        samples.forEach(sample => sampleIdentifiers.push({
-            sampleId: sample.sampleId,
-            studyId: sample.studyId
-        }));
+        samples.forEach(sample =>
+            sampleIdentifiers.push({
+                sampleId: sample.sampleId,
+                studyId: sample.studyId,
+            })
+        );
     }
-    const studyPage = window.open(buildCBioPortalPageUrl(`study`, { id: queriedStudies.map(study => study.studyId).join(',') }), "_blank");
+    const studyPage = window.open(
+        buildCBioPortalPageUrl(`study`, {
+            id: queriedStudies.map(study => study.studyId).join(','),
+        }),
+        '_blank'
+    );
     if (sampleIdentifiers.length > 0) {
-        (studyPage as any).studyPageFilter = `filterJson=${JSON.stringify({ sampleIdentifiers })}`;
+        (studyPage as any).studyPageFilter = `filterJson=${JSON.stringify({
+            sampleIdentifiers,
+        })}`;
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/resultsView/querySummary/ShareUI.tsx b/src/pages/resultsView/querySummary/ShareUI.tsx
index 01c1bd7e015..1a8ae5b2dc9 100644
--- a/src/pages/resultsView/querySummary/ShareUI.tsx
+++ b/src/pages/resultsView/querySummary/ShareUI.tsx
@@ -1,35 +1,33 @@
-import {DefaultTooltip, getBrowserWindow} from "cbioportal-frontend-commons";
-import ExtendedRouterStore from "../../../shared/lib/ExtendedRouterStore";
-import {observer} from "mobx-react";
-import * as React from "react";
-import URL, {QueryParams} from 'url';
+import { DefaultTooltip, getBrowserWindow } from 'cbioportal-frontend-commons';
+import ExtendedRouterStore from '../../../shared/lib/ExtendedRouterStore';
+import { observer } from 'mobx-react';
+import * as React from 'react';
+import URL, { QueryParams } from 'url';
 import styles from './shareUI.module.scss';
-import autobind from "autobind-decorator";
-import {BookmarkModal} from "../bookmark/BookmarkModal";
-import {action, observable} from "mobx";
-import ResultsViewURLWrapper from "pages/resultsView/ResultsViewURLWrapper";
+import autobind from 'autobind-decorator';
+import { BookmarkModal } from '../bookmark/BookmarkModal';
+import { action, observable } from 'mobx';
+import ResultsViewURLWrapper from 'pages/resultsView/ResultsViewURLWrapper';
 
 interface IShareUI {
     sessionEnabled: boolean;
-    urlWrapper:ResultsViewURLWrapper;
+    urlWrapper: ResultsViewURLWrapper;
     bitlyAccessToken?: string | null;
 }
 
 const win = getBrowserWindow();
 
 export interface ShareUrls {
-    bitlyUrl:string|undefined;
-    fullUrl:string;
-    sessionUrl:string|undefined;
+    bitlyUrl: string | undefined;
+    fullUrl: string;
+    sessionUrl: string | undefined;
 }
 
 @observer
 export class ShareUI extends React.Component<IShareUI, {}> {
+    @observable showBookmarkDialog: boolean = false;
 
-    @observable showBookmarkDialog:boolean = false;
-
-    async getUrls():Promise<ShareUrls> {
-
+    async getUrls(): Promise<ShareUrls> {
         let sessionUrl = win.location.href;
 
         let bitlyResponse;
@@ -39,7 +37,9 @@ export class ShareUI extends React.Component<IShareUI, {}> {
         if (this.props.bitlyAccessToken) {
             try {
                 bitlyResponse = await $.ajax({
-                    url: `https://api-ssl.bitly.com/v3/shorten?access_token=${this.props.bitlyAccessToken}&longUrl=${encodeURIComponent(sessionUrl)}`
+                    url: `https://api-ssl.bitly.com/v3/shorten?access_token=${
+                        this.props.bitlyAccessToken
+                    }&longUrl=${encodeURIComponent(sessionUrl)}`,
                 });
             } catch (ex) {
                 // fail silently.  we can just reutrn sessionUrl without shortening
@@ -47,34 +47,42 @@ export class ShareUI extends React.Component<IShareUI, {}> {
         }
 
         return {
-            bitlyUrl: ((bitlyResponse && bitlyResponse.data && bitlyResponse.data.url) ? bitlyResponse.data.url : undefined),
+            bitlyUrl:
+                bitlyResponse && bitlyResponse.data && bitlyResponse.data.url
+                    ? bitlyResponse.data.url
+                    : undefined,
             fullUrl: win.location.href,
-            sessionUrl:sessionUrl
-        }
-
+            sessionUrl: sessionUrl,
+        };
     }
 
     @autobind
     @action
-    toggleBookmarkDialog(){
+    toggleBookmarkDialog() {
         this.showBookmarkDialog = !this.showBookmarkDialog;
     }
 
     render() {
-        return <div className={styles.shareModule}>
-
-            <DefaultTooltip placement={"topLeft"} overlay={<div>Get bookmark link</div>}>
-                <a onClick={this.toggleBookmarkDialog}>
-                    <span className="fa-stack fa-4x">
-                        <i className="fa fa-circle fa-stack-2x"></i>
-                        <i className="fa fa-link fa-stack-1x"></i>
-                    </span>
-                </a>
-            </DefaultTooltip>
-            {
-                (this.showBookmarkDialog) && (<BookmarkModal onHide={this.toggleBookmarkDialog} urlPromise={this.getUrls()}/>)
-            }
-        </div>
+        return (
+            <div className={styles.shareModule}>
+                <DefaultTooltip
+                    placement={'topLeft'}
+                    overlay={<div>Get bookmark link</div>}
+                >
+                    <a onClick={this.toggleBookmarkDialog}>
+                        <span className="fa-stack fa-4x">
+                            <i className="fa fa-circle fa-stack-2x"></i>
+                            <i className="fa fa-link fa-stack-1x"></i>
+                        </span>
+                    </a>
+                </DefaultTooltip>
+                {this.showBookmarkDialog && (
+                    <BookmarkModal
+                        onHide={this.toggleBookmarkDialog}
+                        urlPromise={this.getUrls()}
+                    />
+                )}
+            </div>
+        );
     }
-
 }
diff --git a/src/pages/resultsView/querySummary/shareUI.module.scss b/src/pages/resultsView/querySummary/shareUI.module.scss
index 0b2cdb9a5dd..6ba4d323937 100644
--- a/src/pages/resultsView/querySummary/shareUI.module.scss
+++ b/src/pages/resultsView/querySummary/shareUI.module.scss
@@ -1,29 +1,25 @@
 .shareModule {
+    margin-left: $standardMargin;
+    display: flex;
 
-  margin-left:$standardMargin;
-  display:flex;
+    a {
+        span {
+            font-size: 16px;
+            i {
+                color: #ffffff;
+            }
+            i:first-child {
+                color: $brand-primary;
+            }
+            i:last-child {
+                font-size: 0.8em;
+            }
+        }
 
-  a {
-    span {
-      font-size:16px;
-      i{
-        color:#ffffff;
-      }
-      i:first-child {
-        color: $brand-primary;
-      }
-      i:last-child {
-        font-size:.8em;
-      }
+        &:hover {
+            i:first-child {
+                color: darken($brand-primary, 10%);
+            }
+        }
     }
-
-    &:hover {
-      i:first-child {
-        color:darken( $brand-primary, 10% );
-      }
-    }
-
-  }
-
-
 }
diff --git a/src/pages/resultsView/querySummary/styles.scss b/src/pages/resultsView/querySummary/styles.scss
index d49ef56a861..8a94062e6cc 100644
--- a/src/pages/resultsView/querySummary/styles.scss
+++ b/src/pages/resultsView/querySummary/styles.scss
@@ -1,53 +1,49 @@
 .query-summary {
-  display:flex;
-  justify-content: space-between;
+    display: flex;
+    justify-content: space-between;
 
-  .query-summary__leftItems {
-    display:flex;
-    align-items:center;
+    .query-summary__leftItems {
+        display: flex;
+        align-items: center;
 
-    > div {
-      margin-right:10px;
-    }
+        > div {
+            margin-right: 10px;
+        }
 
-    h3 {
-      margin-bottom:0px;
+        h3 {
+            margin-bottom: 0px;
+        }
     }
 
-  }
-
-  .query-summary__rightItems {
-    display:flex;
-    align-items:center;
-  }
-
+    .query-summary__rightItems {
+        display: flex;
+        align-items: center;
+    }
 }
 
 .query-summary {
-  font-size:13px;
-  h3 {
-    max-width:1000px;
-    white-space: nowrap;
-    overflow:hidden;
-    text-overflow:ellipsis;
-  }
-
+    font-size: 13px;
+    h3 {
+        max-width: 1000px;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+    }
 }
 
 @media only screen and (max-width: 1400px) {
-  .query-summary {
-    font-size:12px;
-    h4 {
-      max-width:800px;
+    .query-summary {
+        font-size: 12px;
+        h4 {
+            max-width: 800px;
+        }
     }
-  }
 }
 
-
 @media only screen and (max-width: 1280px) {
-  .query-summary {
-    h4 {
-      max-width:600px;
+    .query-summary {
+        h4 {
+            max-width: 600px;
+        }
     }
-  }
-}
\ No newline at end of file
+}
diff --git a/src/pages/resultsView/settings/DriverAnnotationControls.tsx b/src/pages/resultsView/settings/DriverAnnotationControls.tsx
index f4b46d5b4c6..75ab2b02b64 100644
--- a/src/pages/resultsView/settings/DriverAnnotationControls.tsx
+++ b/src/pages/resultsView/settings/DriverAnnotationControls.tsx
@@ -1,16 +1,15 @@
-import * as React from "react";
-import {observer} from "mobx-react";
-import ErrorIcon from "../../../shared/components/ErrorIcon";
-import {IObservableObject, ObservableMap} from "mobx";
-import autobind from "autobind-decorator";
+import * as React from 'react';
+import { observer } from 'mobx-react';
+import ErrorIcon from '../../../shared/components/ErrorIcon';
+import { IObservableObject, ObservableMap } from 'mobx';
+import autobind from 'autobind-decorator';
 import {
     EditableSpan,
     DefaultTooltip,
-    getNCBIlink
-} from "cbioportal-frontend-commons";
+    getNCBIlink,
+} from 'cbioportal-frontend-commons';
 import 'rc-tooltip/assets/bootstrap_white.css';
 
-
 export interface IDriverAnnotationControlsState {
     distinguishDrivers: boolean;
 
@@ -22,11 +21,11 @@ export interface IDriverAnnotationControlsState {
     annotateDriversHotspotsError?: boolean;
     annotateDriversHotspots?: boolean;
 
-    annotateDriversCBioPortal: boolean,
-    annotateCBioPortalInputValue: string,
+    annotateDriversCBioPortal: boolean;
+    annotateCBioPortalInputValue: string;
 
-    annotateDriversCOSMIC?: boolean,
-    annotateCOSMICInputValue?: string,
+    annotateDriversCOSMIC?: boolean;
+    annotateCOSMICInputValue?: string;
 
     customDriverAnnotationBinaryMenuLabel?: string;
     customDriverAnnotationTiersMenuLabel?: string;
@@ -36,60 +35,75 @@ export interface IDriverAnnotationControlsState {
 }
 
 export interface IDriverAnnotationControlsHandlers {
-    onSelectDistinguishDrivers: (distinguish: boolean) => void,
-    onSelectAnnotateOncoKb: (annotate: boolean) => void,
-    onSelectAnnotateHotspots?: (annotate: boolean) => void,
-    onSelectAnnotateCBioPortal: (annotate: boolean) => void,
-    onSelectAnnotateCOSMIC?: (annotate: boolean) => void,
-    onChangeAnnotateCBioPortalInputValue: (value: string) => void,
-    onChangeAnnotateCOSMICInputValue?: (value: string) => void,
+    onSelectDistinguishDrivers: (distinguish: boolean) => void;
+    onSelectAnnotateOncoKb: (annotate: boolean) => void;
+    onSelectAnnotateHotspots?: (annotate: boolean) => void;
+    onSelectAnnotateCBioPortal: (annotate: boolean) => void;
+    onSelectAnnotateCOSMIC?: (annotate: boolean) => void;
+    onChangeAnnotateCBioPortalInputValue: (value: string) => void;
+    onChangeAnnotateCOSMICInputValue?: (value: string) => void;
     onSelectCustomDriverAnnotationBinary?: (s: boolean) => void;
     onSelectCustomDriverAnnotationTier?: (value: string, s: boolean) => void;
-    onCustomDriverTierCheckboxClick?: (event: React.MouseEvent<HTMLInputElement>) => void;
+    onCustomDriverTierCheckboxClick?: (
+        event: React.MouseEvent<HTMLInputElement>
+    ) => void;
 }
 
 export interface IDriverAnnotationControlsProps {
     state: IDriverAnnotationControlsState & IObservableObject;
-    handlers: IDriverAnnotationControlsHandlers
+    handlers: IDriverAnnotationControlsHandlers;
 }
 
 enum EVENT_KEY {
-    distinguishDrivers = "0",
-    annotateOncoKb = "1",
-    annotateHotspots = "2",
-    annotateCBioPortal = "3",
-    annotateCOSMIC = "4",
-    customDriverBinaryAnnotation = "5",
+    distinguishDrivers = '0',
+    annotateOncoKb = '1',
+    annotateHotspots = '2',
+    annotateCBioPortal = '3',
+    annotateCOSMIC = '4',
+    customDriverBinaryAnnotation = '5',
 }
 
 @observer
-export default class DriverAnnotationControls extends React.Component<IDriverAnnotationControlsProps, {}> {
-
+export default class DriverAnnotationControls extends React.Component<
+    IDriverAnnotationControlsProps,
+    {}
+> {
     @autobind
     private onInputClick(event: React.MouseEvent<HTMLInputElement>) {
         switch ((event.target as HTMLInputElement).value) {
             case EVENT_KEY.distinguishDrivers:
-                this.props.handlers.onSelectDistinguishDrivers(!this.props.state.distinguishDrivers);
+                this.props.handlers.onSelectDistinguishDrivers(
+                    !this.props.state.distinguishDrivers
+                );
                 break;
             case EVENT_KEY.annotateOncoKb:
-                this.props.handlers.onSelectAnnotateOncoKb(!this.props.state.annotateDriversOncoKb);
+                this.props.handlers.onSelectAnnotateOncoKb(
+                    !this.props.state.annotateDriversOncoKb
+                );
                 break;
             case EVENT_KEY.annotateHotspots:
                 this.props.handlers.onSelectAnnotateHotspots &&
-                this.props.handlers.onSelectAnnotateHotspots(!this.props.state.annotateDriversHotspots);
+                    this.props.handlers.onSelectAnnotateHotspots(
+                        !this.props.state.annotateDriversHotspots
+                    );
                 break;
             case EVENT_KEY.annotateCBioPortal:
-                this.props.handlers.onSelectAnnotateCBioPortal(!this.props.state.annotateDriversCBioPortal);
+                this.props.handlers.onSelectAnnotateCBioPortal(
+                    !this.props.state.annotateDriversCBioPortal
+                );
                 break;
             case EVENT_KEY.annotateCOSMIC:
                 this.props.handlers.onSelectAnnotateCOSMIC &&
-                this.props.handlers.onSelectAnnotateCOSMIC(!this.props.state.annotateDriversCOSMIC);
+                    this.props.handlers.onSelectAnnotateCOSMIC(
+                        !this.props.state.annotateDriversCOSMIC
+                    );
                 break;
             case EVENT_KEY.customDriverBinaryAnnotation:
                 this.props.handlers.onSelectCustomDriverAnnotationBinary &&
-                this.props.handlers.onSelectCustomDriverAnnotationBinary(!this.props.state.annotateCustomDriverBinary);
+                    this.props.handlers.onSelectCustomDriverAnnotationBinary(
+                        !this.props.state.annotateCustomDriverBinary
+                    );
                 break;
-
         }
     }
 
@@ -102,25 +116,21 @@ export default class DriverAnnotationControls extends React.Component<IDriverAnn
                             data-test="ColorByDriver"
                             type="checkbox"
                             value={EVENT_KEY.distinguishDrivers}
-                            checked={
-                                this.props.state.distinguishDrivers
-                            }
+                            checked={this.props.state.distinguishDrivers}
                             onClick={this.onInputClick}
                         />{' '}
                         Putative drivers vs VUS:
                     </label>
                 </div>
-                <div style={{marginLeft: '20px'}}>
-                    {!this.props.state
-                        .annotateDriversOncoKbDisabled && (
+                <div style={{ marginLeft: '20px' }}>
+                    {!this.props.state.annotateDriversOncoKbDisabled && (
                         <div className="checkbox">
                             <label>
                                 <input
                                     type="checkbox"
                                     value={EVENT_KEY.annotateOncoKb}
                                     checked={
-                                        this.props.state
-                                            .annotateDriversOncoKb
+                                        this.props.state.annotateDriversOncoKb
                                     }
                                     onClick={this.onInputClick}
                                     data-test="annotateOncoKb"
@@ -132,26 +142,24 @@ export default class DriverAnnotationControls extends React.Component<IDriverAnn
                                 {this.props.state
                                     .annotateDriversOncoKbError && (
                                     <ErrorIcon
-                                        style={{marginRight: 4}}
+                                        style={{ marginRight: 4 }}
                                         tooltip={
                                             <span>
-                                                        Error loading OncoKb
-                                                        data. Please refresh the
-                                                        page or try again later.
-                                                    </span>
+                                                Error loading OncoKb data.
+                                                Please refresh the page or try
+                                                again later.
+                                            </span>
                                         }
                                     />
                                 )}
                                 <DefaultTooltip
                                     overlay={
-                                        <span>
-                                                    Oncogenicity from OncoKB
-                                                </span>
+                                        <span>Oncogenicity from OncoKB</span>
                                     }
                                     placement="top"
                                 >
                                     <img
-                                        src={require("../../../rootImages/oncokb.png")}
+                                        src={require('../../../rootImages/oncokb.png')}
                                         style={{
                                             maxHeight: '12px',
                                             cursor: 'pointer',
@@ -164,91 +172,84 @@ export default class DriverAnnotationControls extends React.Component<IDriverAnn
                         </div>
                     )}
                     {this.props.handlers.onSelectAnnotateHotspots &&
-                    !this.props.state
-                        .annotateDriversHotspotsDisabled && (
-                        <div className="checkbox">
-                            <label>
-                                <input
-                                    type="checkbox"
-                                    value={
-                                        EVENT_KEY.annotateHotspots
-                                    }
-                                    checked={
-                                        this.props.state
-                                            .annotateDriversHotspots
-                                    }
-                                    onClick={this.onInputClick}
-                                    data-test="annotateHotspots"
-                                    disabled={
-                                        this.props.state
-                                            .annotateDriversHotspotsError
-                                    }
-                                />
-                                {this.props.state
-                                    .annotateDriversHotspotsError && (
-                                    <ErrorIcon
-                                        style={{marginRight: 4}}
-                                        tooltip={
-                                            <span>
-                                                            Error loading
-                                                            Hotspots data.
-                                                            Please refresh the
-                                                            page or try again
-                                                            later.
-                                                        </span>
+                        !this.props.state.annotateDriversHotspotsDisabled && (
+                            <div className="checkbox">
+                                <label>
+                                    <input
+                                        type="checkbox"
+                                        value={EVENT_KEY.annotateHotspots}
+                                        checked={
+                                            this.props.state
+                                                .annotateDriversHotspots
+                                        }
+                                        onClick={this.onInputClick}
+                                        data-test="annotateHotspots"
+                                        disabled={
+                                            this.props.state
+                                                .annotateDriversHotspotsError
                                         }
                                     />
-                                )}
-                                Hotspots
-                                <DefaultTooltip
-                                    overlay={
-                                        <div
+                                    {this.props.state
+                                        .annotateDriversHotspotsError && (
+                                        <ErrorIcon
+                                            style={{ marginRight: 4 }}
+                                            tooltip={
+                                                <span>
+                                                    Error loading Hotspots data.
+                                                    Please refresh the page or
+                                                    try again later.
+                                                </span>
+                                            }
+                                        />
+                                    )}
+                                    Hotspots
+                                    <DefaultTooltip
+                                        overlay={
+                                            <div
+                                                style={{
+                                                    maxWidth: '400px',
+                                                }}
+                                            >
+                                                Identified as a recurrent
+                                                hotspot (statistically
+                                                significant) in a
+                                                population-scale cohort of tumor
+                                                samples of various cancer types
+                                                using methodology based in part
+                                                on{' '}
+                                                <a
+                                                    href={getNCBIlink(
+                                                        '/pubmed/26619011'
+                                                    )}
+                                                    target="_blank"
+                                                >
+                                                    Chang et al., Nat
+                                                    Biotechnol, 2016.
+                                                </a>
+                                                Explore all mutations at{' '}
+                                                <a
+                                                    href="https://www.cancerhotspots.org"
+                                                    target="_blank"
+                                                >
+                                                    https://cancerhotspots.org
+                                                </a>
+                                            </div>
+                                        }
+                                        placement="top"
+                                    >
+                                        <img
+                                            src={require('../../../rootImages/cancer-hotspots.svg')}
                                             style={{
-                                                maxWidth: '400px',
+                                                height: '15px',
+                                                width: '15px',
+                                                cursor: 'pointer',
+                                                marginLeft: '5px',
                                             }}
-                                        >
-                                            Identified as a
-                                            recurrent hotspot
-                                            (statistically
-                                            significant) in a
-                                            population-scale cohort
-                                            of tumor samples of
-                                            various cancer types
-                                            using methodology based
-                                            in part on{' '}
-                                            <a
-                                                href={getNCBIlink(
-                                                    '/pubmed/26619011'
-                                                )}
-                                                target="_blank"
-                                            >
-                                                Chang et al., Nat
-                                                Biotechnol, 2016.
-                                            </a>
-                                            Explore all mutations at{' '}
-                                            <a
-                                                href="https://www.cancerhotspots.org"
-                                                target="_blank"
-                                            >
-                                                https://cancerhotspots.org
-                                            </a>
-                                        </div>
-                                    }
-                                    placement="top"
-                                >
-                                    <img
-                                        src={require("../../../rootImages/cancer-hotspots.svg")}
-                                        style={{
-                                            height: '15px',
-                                            width: '15px',
-                                            cursor: 'pointer',
-                                            marginLeft: '5px',
-                                        }}
-                                    />
-                                </DefaultTooltip>
-                            </label>
-                        </div>
-                    )}
+                                        />
+                                    </DefaultTooltip>
+                                </label>
+                            </div>
+                        )}
                     {this.props.handlers
                         .onChangeAnnotateCBioPortalInputValue && (
                         <div className="checkbox">
@@ -268,8 +269,7 @@ export default class DriverAnnotationControls extends React.Component<IDriverAnn
                             <EditableSpan
                                 value={
                                     this.props.state
-                                        .annotateCBioPortalInputValue ||
-                                    ''
+                                        .annotateCBioPortalInputValue || ''
                                 }
                                 setValue={
                                     this.props.handlers
@@ -281,16 +281,14 @@ export default class DriverAnnotationControls extends React.Component<IDriverAnn
                             />
                         </div>
                     )}
-                    {this.props.handlers
-                        .onChangeAnnotateCOSMICInputValue && (
+                    {this.props.handlers.onChangeAnnotateCOSMICInputValue && (
                         <div className="checkbox">
                             <label>
                                 <input
                                     type="checkbox"
                                     value={EVENT_KEY.annotateCOSMIC}
                                     checked={
-                                        this.props.state
-                                            .annotateDriversCOSMIC
+                                        this.props.state.annotateDriversCOSMIC
                                     }
                                     onClick={this.onInputClick}
                                     data-test="annotateCOSMICCount"
@@ -299,8 +297,8 @@ export default class DriverAnnotationControls extends React.Component<IDriverAnn
                             </label>
                             <EditableSpan
                                 value={
-                                    this.props.state
-                                        .annotateCOSMICInputValue || ''
+                                    this.props.state.annotateCOSMICInputValue ||
+                                    ''
                                 }
                                 setValue={
                                     this.props.handlers
@@ -333,7 +331,7 @@ export default class DriverAnnotationControls extends React.Component<IDriverAnn
                                         .customDriverAnnotationBinaryMenuLabel
                                 }
                                 <img
-                                    src={require("../../../rootImages/driver.png")}
+                                    src={require('../../../rootImages/driver.png')}
                                     alt="driver filter"
                                     style={{
                                         height: '15px',
@@ -348,17 +346,17 @@ export default class DriverAnnotationControls extends React.Component<IDriverAnn
                     {!!this.props.state
                         .customDriverAnnotationTiersMenuLabel && (
                         <span>
-                                    <span className="caret"/>
+                            <span className="caret" />
                             &nbsp;&nbsp;
                             <span>
-                                        {
-                                            this.props.state
-                                                .customDriverAnnotationTiersMenuLabel
-                                        }
-                                    </span>
+                                {
+                                    this.props.state
+                                        .customDriverAnnotationTiersMenuLabel
+                                }
+                            </span>
                             &nbsp;
                             <img
-                                src={require("../../../rootImages/driver_tiers.png")}
+                                src={require('../../../rootImages/driver_tiers.png')}
                                 alt="driver tiers filter"
                                 style={{
                                     height: '15px',
@@ -367,39 +365,39 @@ export default class DriverAnnotationControls extends React.Component<IDriverAnn
                                     marginLeft: '5px',
                                 }}
                             />
-                                    <div style={{marginLeft: '30px'}}>
-                                        {(
-                                            this.props.state
-                                                .customDriverAnnotationTiers ||
-                                            []
-                                        ).map(tier => (
-                                            <div className="checkbox">
-                                                <label>
-                                                    <input
-                                                        type="checkbox"
-                                                        value={tier}
-                                                        checked={
-                                                            !!(
-                                                                this.props.state
-                                                                    .selectedCustomDriverAnnotationTiers &&
-                                                                this.props.state.selectedCustomDriverAnnotationTiers.get(
-                                                                    tier
-                                                                )
-                                                            )
-                                                        }
-                                                        onClick={
-                                                            this.props.handlers.onCustomDriverTierCheckboxClick
-                                                        }
-                                                    />{' '}
-                                                    {tier}
-                                                </label>
-                                            </div>
-                                        ))}
+                            <div style={{ marginLeft: '30px' }}>
+                                {(
+                                    this.props.state
+                                        .customDriverAnnotationTiers || []
+                                ).map(tier => (
+                                    <div className="checkbox">
+                                        <label>
+                                            <input
+                                                type="checkbox"
+                                                value={tier}
+                                                checked={
+                                                    !!(
+                                                        this.props.state
+                                                            .selectedCustomDriverAnnotationTiers &&
+                                                        this.props.state.selectedCustomDriverAnnotationTiers.get(
+                                                            tier
+                                                        )
+                                                    )
+                                                }
+                                                onClick={
+                                                    this.props.handlers
+                                                        .onCustomDriverTierCheckboxClick
+                                                }
+                                            />{' '}
+                                            {tier}
+                                        </label>
                                     </div>
-                                </span>
+                                ))}
+                            </div>
+                        </span>
                     )}
                 </div>
             </div>
         );
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/resultsView/settings/ResultsPageSettings.tsx b/src/pages/resultsView/settings/ResultsPageSettings.tsx
index 179368b5b35..e1dc8e1b233 100644
--- a/src/pages/resultsView/settings/ResultsPageSettings.tsx
+++ b/src/pages/resultsView/settings/ResultsPageSettings.tsx
@@ -1,63 +1,79 @@
-import * as React from "react";
-import {observer} from "mobx-react";
-import {ResultsViewPageStore} from "../ResultsViewPageStore";
-import autobind from "autobind-decorator";
+import * as React from 'react';
+import { observer } from 'mobx-react';
+import { ResultsViewPageStore } from '../ResultsViewPageStore';
+import autobind from 'autobind-decorator';
 import DriverAnnotationControls, {
     IDriverAnnotationControlsHandlers,
-    IDriverAnnotationControlsState
-} from "./DriverAnnotationControls";
-import {IObservableObject} from "mobx";
+    IDriverAnnotationControlsState,
+} from './DriverAnnotationControls';
+import { IObservableObject } from 'mobx';
 import {
     boldedTabList,
     buildDriverAnnotationControlsHandlers,
-    buildDriverAnnotationControlsState
-} from "./ResultsPageSettingsUtils";
-import InfoIcon from "../../../shared/components/InfoIcon";
-import styles from "./styles.module.scss";
-import classNames from "classnames";
-import {OncoprintAnalysisCaseType} from "../ResultsViewPageStoreUtils";
+    buildDriverAnnotationControlsState,
+} from './ResultsPageSettingsUtils';
+import InfoIcon from '../../../shared/components/InfoIcon';
+import styles from './styles.module.scss';
+import classNames from 'classnames';
+import { OncoprintAnalysisCaseType } from '../ResultsViewPageStoreUtils';
 
 export interface IResultsPageSettingsProps {
-    store:ResultsViewPageStore;
+    store: ResultsViewPageStore;
 }
 
 enum EVENT_KEY {
-    hidePutativePassengers="0",
-    showGermlineMutations="1",
+    hidePutativePassengers = '0',
+    showGermlineMutations = '1',
 
-    dataTypeSample="2",
-    dataTypePatient="3"
+    dataTypeSample = '2',
+    dataTypePatient = '3',
 }
 
 @observer
-export default class ResultsPageSettings extends React.Component<IResultsPageSettingsProps, {}> {
-    @autobind private onChange(v:{ label:string, value:OncoprintAnalysisCaseType}) {
+export default class ResultsPageSettings extends React.Component<
+    IResultsPageSettingsProps,
+    {}
+> {
+    @autobind private onChange(v: {
+        label: string;
+        value: OncoprintAnalysisCaseType;
+    }) {
         this.props.store.setOncoprintAnalysisCaseType(v.value);
     }
 
-    private driverSettingsState:IDriverAnnotationControlsState & IObservableObject;
-    private driverSettingsHandlers:IDriverAnnotationControlsHandlers;
+    private driverSettingsState: IDriverAnnotationControlsState &
+        IObservableObject;
+    private driverSettingsHandlers: IDriverAnnotationControlsHandlers;
 
-
-    constructor(props:IResultsPageSettingsProps) {
+    constructor(props: IResultsPageSettingsProps) {
         super(props);
         this.driverSettingsState = buildDriverAnnotationControlsState(this);
-        this.driverSettingsHandlers = buildDriverAnnotationControlsHandlers(this, this.driverSettingsState);
+        this.driverSettingsHandlers = buildDriverAnnotationControlsHandlers(
+            this,
+            this.driverSettingsState
+        );
     }
 
-    @autobind private onInputClick(event:React.MouseEvent<HTMLInputElement>) {
+    @autobind private onInputClick(event: React.MouseEvent<HTMLInputElement>) {
         switch ((event.target as HTMLInputElement).value) {
             case EVENT_KEY.hidePutativePassengers:
-                this.props.store.driverAnnotationSettings.excludeVUS = !this.props.store.driverAnnotationSettings.excludeVUS;
+                this.props.store.driverAnnotationSettings.excludeVUS = !this
+                    .props.store.driverAnnotationSettings.excludeVUS;
                 break;
             case EVENT_KEY.showGermlineMutations:
-                this.props.store.setExcludeGermlineMutations(!this.props.store.excludeGermlineMutations);
+                this.props.store.setExcludeGermlineMutations(
+                    !this.props.store.excludeGermlineMutations
+                );
                 break;
             case EVENT_KEY.dataTypeSample:
-                this.props.store.setOncoprintAnalysisCaseType(OncoprintAnalysisCaseType.SAMPLE);
+                this.props.store.setOncoprintAnalysisCaseType(
+                    OncoprintAnalysisCaseType.SAMPLE
+                );
                 break;
             case EVENT_KEY.dataTypePatient:
-                this.props.store.setOncoprintAnalysisCaseType(OncoprintAnalysisCaseType.PATIENT);
+                this.props.store.setOncoprintAnalysisCaseType(
+                    OncoprintAnalysisCaseType.PATIENT
+                );
                 break;
         }
     }
@@ -66,60 +82,87 @@ export default class ResultsPageSettings extends React.Component<IResultsPageSet
         return (
             <div
                 data-test="GlobalSettingsDropdown"
-                className={classNames("cbioportal-frontend", styles.globalSettingsDropdown)}
-                style={{padding:5}}
+                className={classNames(
+                    'cbioportal-frontend',
+                    styles.globalSettingsDropdown
+                )}
+                style={{ padding: 5 }}
             >
-                <h5 style={{ marginTop:"auto", marginBottom:"auto"}}>
+                <h5 style={{ marginTop: 'auto', marginBottom: 'auto' }}>
                     Annotate Data
                 </h5>
                 <InfoIcon
-                    divStyle={{display:"inline-block", marginLeft:6}}
-                    style={{color:"rgb(54, 134, 194)"}}
+                    divStyle={{ display: 'inline-block', marginLeft: 6 }}
+                    style={{ color: 'rgb(54, 134, 194)' }}
                     tooltip={
-                        <span>These settings affect every tab except {boldedTabList(["Co-expression", "CN Segments"])}</span>
+                        <span>
+                            These settings affect every tab except{' '}
+                            {boldedTabList(['Co-expression', 'CN Segments'])}
+                        </span>
                     }
                 />
-                <div style={{marginLeft:10}}>
+                <div style={{ marginLeft: 10 }}>
                     <DriverAnnotationControls
                         state={this.driverSettingsState}
                         handlers={this.driverSettingsHandlers}
                     />
                 </div>
 
-                <hr/>
+                <hr />
 
-                <h5 style={{ marginTop:"auto", marginBottom:"auto"}}>
+                <h5 style={{ marginTop: 'auto', marginBottom: 'auto' }}>
                     Filter Data
                 </h5>
                 <InfoIcon
-                    divStyle={{display:"inline-block", marginLeft:6}}
-                    style={{color:"rgb(54, 134, 194)"}}
+                    divStyle={{ display: 'inline-block', marginLeft: 6 }}
+                    style={{ color: 'rgb(54, 134, 194)' }}
                     tooltip={
-                        <span>These settings affect every tab except {boldedTabList(["Plots", "Co-expression", "CN Segments"])}</span>
+                        <span>
+                            These settings affect every tab except{' '}
+                            {boldedTabList([
+                                'Plots',
+                                'Co-expression',
+                                'CN Segments',
+                            ])}
+                        </span>
                     }
                 />
-                <div style={{marginLeft:10}}>
-                    <div className="checkbox"><label>
-                        <input
-                            data-test="HideVUS"
-                            type="checkbox"
-                            value={EVENT_KEY.hidePutativePassengers}
-                            checked={this.props.store.driverAnnotationSettings.excludeVUS}
-                            onClick={this.onInputClick}
-                            disabled={!this.driverSettingsState.distinguishDrivers}
-                        /> Exclude mutations and copy number alterations of unknown significance
-                    </label></div>
-                    <div className="checkbox"><label>
-                        <input
-                            data-test="HideGermline"
-                            type="checkbox"
-                            value={EVENT_KEY.showGermlineMutations}
-                            checked={this.props.store.excludeGermlineMutations}
-                            onClick={this.onInputClick}
-                        /> Exclude germline mutations
-                    </label></div>
+                <div style={{ marginLeft: 10 }}>
+                    <div className="checkbox">
+                        <label>
+                            <input
+                                data-test="HideVUS"
+                                type="checkbox"
+                                value={EVENT_KEY.hidePutativePassengers}
+                                checked={
+                                    this.props.store.driverAnnotationSettings
+                                        .excludeVUS
+                                }
+                                onClick={this.onInputClick}
+                                disabled={
+                                    !this.driverSettingsState.distinguishDrivers
+                                }
+                            />{' '}
+                            Exclude mutations and copy number alterations of
+                            unknown significance
+                        </label>
+                    </div>
+                    <div className="checkbox">
+                        <label>
+                            <input
+                                data-test="HideGermline"
+                                type="checkbox"
+                                value={EVENT_KEY.showGermlineMutations}
+                                checked={
+                                    this.props.store.excludeGermlineMutations
+                                }
+                                onClick={this.onInputClick}
+                            />{' '}
+                            Exclude germline mutations
+                        </label>
+                    </div>
                 </div>
             </div>
         );
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/resultsView/settings/ResultsPageSettingsUtils.tsx b/src/pages/resultsView/settings/ResultsPageSettingsUtils.tsx
index 658f8c1b169..adfe206bf51 100644
--- a/src/pages/resultsView/settings/ResultsPageSettingsUtils.tsx
+++ b/src/pages/resultsView/settings/ResultsPageSettingsUtils.tsx
@@ -1,10 +1,10 @@
-import ResultsPageSettings from "./ResultsPageSettings";
-import {action, observable} from "mobx";
-import AppConfig from "appConfig";
-import {IDriverAnnotationControlsState} from "./DriverAnnotationControls";
-import * as React from "react";
+import ResultsPageSettings from './ResultsPageSettings';
+import { action, observable } from 'mobx';
+import AppConfig from 'appConfig';
+import { IDriverAnnotationControlsState } from './DriverAnnotationControls';
+import * as React from 'react';
 
-export function buildDriverAnnotationControlsState(self:ResultsPageSettings) {
+export function buildDriverAnnotationControlsState(self: ResultsPageSettings) {
     return observable({
         get distinguishDrivers() {
             return self.props.store.driverAnnotationSettings.driversAnnotated;
@@ -37,14 +37,23 @@ export function buildDriverAnnotationControlsState(self:ResultsPageSettings) {
             return self.props.store.driverAnnotationSettings.excludeVUS;
         },
         get annotateCBioPortalInputValue() {
-            return self.props.store.driverAnnotationSettings.cbioportalCountThreshold + "";
+            return (
+                self.props.store.driverAnnotationSettings
+                    .cbioportalCountThreshold + ''
+            );
         },
         get annotateCOSMICInputValue() {
-            return self.props.store.driverAnnotationSettings.cosmicCountThreshold + "";
+            return (
+                self.props.store.driverAnnotationSettings.cosmicCountThreshold +
+                ''
+            );
         },
         get customDriverAnnotationBinaryMenuLabel() {
-            const label = AppConfig.serverConfig.oncoprint_custom_driver_annotation_binary_menu_label;
-            const customDriverReport = self.props.store.customDriverAnnotationReport.result;
+            const label =
+                AppConfig.serverConfig
+                    .oncoprint_custom_driver_annotation_binary_menu_label;
+            const customDriverReport =
+                self.props.store.customDriverAnnotationReport.result;
             if (label && customDriverReport && customDriverReport.hasBinary) {
                 return label;
             } else {
@@ -52,16 +61,24 @@ export function buildDriverAnnotationControlsState(self:ResultsPageSettings) {
             }
         },
         get customDriverAnnotationTiersMenuLabel() {
-            const label = AppConfig.serverConfig.oncoprint_custom_driver_annotation_tiers_menu_label;
-            const customDriverReport = self.props.store.customDriverAnnotationReport.result;
-            if (label && customDriverReport && customDriverReport.tiers.length) {
+            const label =
+                AppConfig.serverConfig
+                    .oncoprint_custom_driver_annotation_tiers_menu_label;
+            const customDriverReport =
+                self.props.store.customDriverAnnotationReport.result;
+            if (
+                label &&
+                customDriverReport &&
+                customDriverReport.tiers.length
+            ) {
                 return label;
             } else {
                 return undefined;
             }
         },
         get customDriverAnnotationTiers() {
-            const customDriverReport = self.props.store.customDriverAnnotationReport.result;
+            const customDriverReport =
+                self.props.store.customDriverAnnotationReport.result;
             if (customDriverReport && customDriverReport.tiers.length) {
                 return customDriverReport.tiers;
             } else {
@@ -78,73 +95,107 @@ export function buildDriverAnnotationControlsState(self:ResultsPageSettings) {
 }
 
 export function buildDriverAnnotationControlsHandlers(
-    self:ResultsPageSettings,
-    state:IDriverAnnotationControlsState
+    self: ResultsPageSettings,
+    state: IDriverAnnotationControlsState
 ) {
     const handlers = {
-        onSelectDistinguishDrivers:action((s:boolean)=>{
+        onSelectDistinguishDrivers: action((s: boolean) => {
             if (!s) {
                 self.props.store.driverAnnotationSettings.oncoKb = false;
                 self.props.store.driverAnnotationSettings.hotspots = false;
                 self.props.store.driverAnnotationSettings.cbioportalCount = false;
                 self.props.store.driverAnnotationSettings.cosmicCount = false;
                 self.props.store.driverAnnotationSettings.customBinary = false;
-                self.props.store.driverAnnotationSettings.driverTiers.forEach((value, key)=>{
-                    self.props.store.driverAnnotationSettings.driverTiers.set(key, false);
-                });
+                self.props.store.driverAnnotationSettings.driverTiers.forEach(
+                    (value, key) => {
+                        self.props.store.driverAnnotationSettings.driverTiers.set(
+                            key,
+                            false
+                        );
+                    }
+                );
                 self.props.store.driverAnnotationSettings.excludeVUS = false;
             } else {
-                if (!state.annotateDriversOncoKbDisabled && !state.annotateDriversOncoKbError)
+                if (
+                    !state.annotateDriversOncoKbDisabled &&
+                    !state.annotateDriversOncoKbError
+                )
                     self.props.store.driverAnnotationSettings.oncoKb = true;
 
-                if (!state.annotateDriversHotspotsDisabled && !state.annotateDriversHotspotsError)
+                if (
+                    !state.annotateDriversHotspotsDisabled &&
+                    !state.annotateDriversHotspotsError
+                )
                     self.props.store.driverAnnotationSettings.hotspots = true;
 
                 self.props.store.driverAnnotationSettings.cbioportalCount = true;
                 self.props.store.driverAnnotationSettings.cosmicCount = true;
                 self.props.store.driverAnnotationSettings.customBinary = true;
-                self.props.store.driverAnnotationSettings.driverTiers.forEach((value, key)=>{
-                    self.props.store.driverAnnotationSettings.driverTiers.set(key, true);
-                });
+                self.props.store.driverAnnotationSettings.driverTiers.forEach(
+                    (value, key) => {
+                        self.props.store.driverAnnotationSettings.driverTiers.set(
+                            key,
+                            true
+                        );
+                    }
+                );
             }
         }),
-        onSelectAnnotateOncoKb:action((s:boolean)=>{
+        onSelectAnnotateOncoKb: action((s: boolean) => {
             self.props.store.driverAnnotationSettings.oncoKb = s;
         }),
-        onSelectAnnotateHotspots:action((s:boolean)=>{
+        onSelectAnnotateHotspots: action((s: boolean) => {
             self.props.store.driverAnnotationSettings.hotspots = s;
         }),
-        onSelectAnnotateCBioPortal:action((s:boolean)=>{
+        onSelectAnnotateCBioPortal: action((s: boolean) => {
             self.props.store.driverAnnotationSettings.cbioportalCount = s;
         }),
-        onSelectAnnotateCOSMIC:action((s:boolean)=>{
+        onSelectAnnotateCOSMIC: action((s: boolean) => {
             self.props.store.driverAnnotationSettings.cosmicCount = s;
         }),
-        onChangeAnnotateCBioPortalInputValue:action((s:string)=>{
-            self.props.store.driverAnnotationSettings.cbioportalCountThreshold = parseInt(s, 10);
-            handlers.onSelectAnnotateCBioPortal && handlers.onSelectAnnotateCBioPortal(true);
+        onChangeAnnotateCBioPortalInputValue: action((s: string) => {
+            self.props.store.driverAnnotationSettings.cbioportalCountThreshold = parseInt(
+                s,
+                10
+            );
+            handlers.onSelectAnnotateCBioPortal &&
+                handlers.onSelectAnnotateCBioPortal(true);
         }),
-        onChangeAnnotateCOSMICInputValue:action((s:string)=>{
-            self.props.store.driverAnnotationSettings.cosmicCountThreshold = parseInt(s, 10);
-            handlers.onSelectAnnotateCOSMIC && handlers.onSelectAnnotateCOSMIC(true);
+        onChangeAnnotateCOSMICInputValue: action((s: string) => {
+            self.props.store.driverAnnotationSettings.cosmicCountThreshold = parseInt(
+                s,
+                10
+            );
+            handlers.onSelectAnnotateCOSMIC &&
+                handlers.onSelectAnnotateCOSMIC(true);
         }),
-        onSelectCustomDriverAnnotationBinary:action((s:boolean)=>{
+        onSelectCustomDriverAnnotationBinary: action((s: boolean) => {
             self.props.store.driverAnnotationSettings.customBinary = s;
         }),
-        onSelectCustomDriverAnnotationTier:action((value:string, checked:boolean)=>{
-            self.props.store.driverAnnotationSettings.driverTiers.set(value, checked);
-        }),
-        onSelectHidePutativePassengers:(s:boolean)=>{
+        onSelectCustomDriverAnnotationTier: action(
+            (value: string, checked: boolean) => {
+                self.props.store.driverAnnotationSettings.driverTiers.set(
+                    value,
+                    checked
+                );
+            }
+        ),
+        onSelectHidePutativePassengers: (s: boolean) => {
             self.props.store.driverAnnotationSettings.excludeVUS = s;
         },
     };
     return handlers;
 }
 
-export function boldedTabList(tabs:string[]) {
+export function boldedTabList(tabs: string[]) {
     return (
         <span>
-            {tabs.map((tab, index)=><span><strong>{tab}</strong>{index < tabs.length - 1 ? ", " : ""}</span>)}
+            {tabs.map((tab, index) => (
+                <span>
+                    <strong>{tab}</strong>
+                    {index < tabs.length - 1 ? ', ' : ''}
+                </span>
+            ))}
         </span>
     );
-}
\ No newline at end of file
+}
diff --git a/src/pages/resultsView/settings/styles.module.scss b/src/pages/resultsView/settings/styles.module.scss
index 744b15e04a7..8440b501f59 100644
--- a/src/pages/resultsView/settings/styles.module.scss
+++ b/src/pages/resultsView/settings/styles.module.scss
@@ -1,17 +1,17 @@
 .globalSettingsDropdown {
-  width:300px;
+    width: 300px;
 
-  label {
-    font-size:14px;
-  }
+    label {
+        font-size: 14px;
+    }
 
-  h5 {
-    display:inline-block;
-  }
-  i.fa-info-circle {
-    margin-left:5px;
-  }
-  hr {
-    border-top-color:#dddddd;
-  }
-}
\ No newline at end of file
+    h5 {
+        display: inline-block;
+    }
+    i.fa-info-circle {
+        margin-left: 5px;
+    }
+    hr {
+        border-top-color: #dddddd;
+    }
+}
diff --git a/src/pages/resultsView/styles.scss b/src/pages/resultsView/styles.scss
index 873d03502d8..eb5f2ddd3ef 100644
--- a/src/pages/resultsView/styles.scss
+++ b/src/pages/resultsView/styles.scss
@@ -70,9 +70,10 @@
 
     #oncoprintDiv {
         .oncoprintjs__track_options__toggle_btn_img {
-            top:4px;
+            top: 4px;
         }
-        .oncoprintjs__track_options__toggle_btn_img, .oncoprintjs__header__toggle_btn_img {
+        .oncoprintjs__track_options__toggle_btn_img,
+        .oncoprintjs__header__toggle_btn_img {
             border-width: 0px !important;
             border-radius: $cornerBorderRadius;
             position: relative;
@@ -81,15 +82,17 @@
             }
         }
 
-        .oncoprintjs__track_options__dropdown, .oncoprintjs__header__dropdown {
+        .oncoprintjs__track_options__dropdown,
+        .oncoprintjs__header__dropdown {
             border: 1px solid rgba(0, 0, 0, 0.15) !important;
             margin: 0 !important;
             padding: 0 !important;
             box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
             border-radius: $cornerBorderRadius;
-            z-index:10000;
+            z-index: 10000;
             li {
-                &.oncoprintjs__track_options__separator, &.oncoprintjs__header__separator {
+                &.oncoprintjs__track_options__separator,
+                &.oncoprintjs__header__separator {
                     border-top: 1px solid #dddddd !important;
                 }
                 &:not(.oncoprintjs__track_options__separator, .oncoprintjs__header__separator) {
@@ -127,12 +130,11 @@
 }
 
 .quick_oql_edit {
-    display:flex;
-    margin-top:10px;
+    display: flex;
+    margin-top: 10px;
     align-items: flex-start;
 
     .oqlValidationContainer {
-        min-height:27px;
+        min-height: 27px;
     }
-
 }
diff --git a/src/pages/resultsView/survival/SurvivalChart.tsx b/src/pages/resultsView/survival/SurvivalChart.tsx
index 8604b09fa39..325ff56c1b9 100644
--- a/src/pages/resultsView/survival/SurvivalChart.tsx
+++ b/src/pages/resultsView/survival/SurvivalChart.tsx
@@ -1,49 +1,74 @@
 import * as React from 'react';
-import { observer } from "mobx-react";
-import { PatientSurvival } from "../../../shared/model/PatientSurvival";
-import {action, computed, observable, runInAction} from "mobx";
+import { observer } from 'mobx-react';
+import { PatientSurvival } from '../../../shared/model/PatientSurvival';
+import { action, computed, observable, runInAction } from 'mobx';
 import Slider from 'react-rangeslider';
 import { Popover, Table } from 'react-bootstrap';
-import styles from "./styles.module.scss";
-import "./styles.scss";
-import { sleep } from "../../../shared/lib/TimeUtils";
+import styles from './styles.module.scss';
+import './styles.scss';
+import { sleep } from '../../../shared/lib/TimeUtils';
 import * as _ from 'lodash';
 import {
-    VictoryChart, VictoryContainer, VictoryLine, VictoryTooltip,
-    VictoryAxis, VictoryLegend, VictoryLabel, VictoryScatter, VictoryTheme, VictoryZoomContainer
+    VictoryChart,
+    VictoryContainer,
+    VictoryLine,
+    VictoryTooltip,
+    VictoryAxis,
+    VictoryLegend,
+    VictoryLabel,
+    VictoryScatter,
+    VictoryTheme,
+    VictoryZoomContainer,
 } from 'victory';
 import {
-    getEstimates, getMedian, getLineData, getScatterData, getScatterDataWithOpacity, getStats, calculateLogRank,
-    getDownloadContent, convertScatterDataToDownloadData, downSampling, GroupedScatterData, filterScatterData,
-    SurvivalPlotFilters
-} from "./SurvivalUtil";
-import CBIOPORTAL_VICTORY_THEME, {baseLabelStyles} from "../../../shared/theme/cBioPoralTheme";
+    getEstimates,
+    getMedian,
+    getLineData,
+    getScatterData,
+    getScatterDataWithOpacity,
+    getStats,
+    calculateLogRank,
+    getDownloadContent,
+    convertScatterDataToDownloadData,
+    downSampling,
+    GroupedScatterData,
+    filterScatterData,
+    SurvivalPlotFilters,
+} from './SurvivalUtil';
+import CBIOPORTAL_VICTORY_THEME, {
+    baseLabelStyles,
+} from '../../../shared/theme/cBioPoralTheme';
 import { toConditionalPrecision } from 'shared/lib/NumberUtils';
-import {getPatientViewUrl} from "../../../shared/api/urls";
-import {DefaultTooltip, DownloadControls} from "cbioportal-frontend-commons";
-import autobind from "autobind-decorator";
-import {AnalysisGroup} from "../../studyView/StudyViewUtils";
-import {AbstractChart} from "../../studyView/charts/ChartContainer";
-import {toSvgDomNodeWithLegend} from "../../studyView/StudyViewUtils";
-import classnames from "classnames";
-import {ClinicalAttribute} from "../../../shared/api/generated/CBioPortalAPI";
-import TruncatedTextWithTooltipSVG from "../../../shared/components/TruncatedTextWithTooltipSVG";
+import { getPatientViewUrl } from '../../../shared/api/urls';
+import { DefaultTooltip, DownloadControls } from 'cbioportal-frontend-commons';
+import autobind from 'autobind-decorator';
+import { AnalysisGroup } from '../../studyView/StudyViewUtils';
+import { AbstractChart } from '../../studyView/charts/ChartContainer';
+import { toSvgDomNodeWithLegend } from '../../studyView/StudyViewUtils';
+import classnames from 'classnames';
+import { ClinicalAttribute } from '../../../shared/api/generated/CBioPortalAPI';
+import TruncatedTextWithTooltipSVG from '../../../shared/components/TruncatedTextWithTooltipSVG';
 import { EditableSpan, pluralize } from 'cbioportal-frontend-commons';
 
 export enum LegendLocation {
-    TOOLTIP = "tooltip",
-    CHART = "chart"
+    TOOLTIP = 'tooltip',
+    CHART = 'chart',
 }
 
-export const SURVIVAL_CHART_ATTRIBUTES = ["OS_STATUS", "OS_MONTHS", "DFS_STATUS", "DFS_MONTHS"]
+export const SURVIVAL_CHART_ATTRIBUTES = [
+    'OS_STATUS',
+    'OS_MONTHS',
+    'DFS_STATUS',
+    'DFS_MONTHS',
+];
 
 export interface ISurvivalChartProps {
-    patientSurvivals:ReadonlyArray<PatientSurvival>;
-    patientToAnalysisGroups:{[uniquePatientKey:string]:string[]};
-    analysisGroups:ReadonlyArray<AnalysisGroup>; // identified by `value`
-    analysisClinicalAttribute?:ClinicalAttribute;
-    naPatientsHiddenInSurvival?:boolean;
-    toggleSurvivalHideNAPatients?:()=>void;
+    patientSurvivals: ReadonlyArray<PatientSurvival>;
+    patientToAnalysisGroups: { [uniquePatientKey: string]: string[] };
+    analysisGroups: ReadonlyArray<AnalysisGroup>; // identified by `value`
+    analysisClinicalAttribute?: ClinicalAttribute;
+    naPatientsHiddenInSurvival?: boolean;
+    toggleSurvivalHideNAPatients?: () => void;
     totalCasesHeader: string;
     statusCasesHeader: string;
     medianMonthsHeader: string;
@@ -55,113 +80,128 @@ export interface ISurvivalChartProps {
     xLabelWithoutEventTooltip: string;
     fileName: string;
     showTable?: boolean;
-    legendLocation?:LegendLocation;
-    showNaPatientsHiddenToggle?:boolean;
-    showLogRankPVal?:boolean;
+    legendLocation?: LegendLocation;
+    showNaPatientsHiddenToggle?: boolean;
+    showLogRankPVal?: boolean;
     showDownloadButtons?: boolean;
     showSlider?: boolean;
     styleOpts?: any; // see victory styles, and styleOptsDefaultProps for examples
     className?: string;
-    showCurveInTooltip?:boolean;
-    legendLabelComponent?:any;
+    showCurveInTooltip?: boolean;
+    legendLabelComponent?: any;
 }
 
 // Start to down sampling when there are more than 1000 dots in the plot.
 const SURVIVAL_DOWN_SAMPLING_THRESHOLD = 1000;
 
 @observer
-export default class SurvivalChart extends React.Component<ISurvivalChartProps, {}> implements AbstractChart {
-
+export default class SurvivalChart
+    extends React.Component<ISurvivalChartProps, {}>
+    implements AbstractChart {
     @observable.ref tooltipModel: any;
     @observable scatterFilter: SurvivalPlotFilters;
-    @observable highlightedCurve = "";
+    @observable highlightedCurve = '';
     @observable public sliderValue = this.maximumDataMonthValue;
     // The denominator should be determined based on the plot width and height.
     private isTooltipHovered: boolean = false;
     private tooltipCounter: number = 0;
     private svgContainer: any;
-    private styleOptsDefaultProps:any = {
+    private styleOptsDefaultProps: any = {
         width: 900,
         height: 500,
-        padding: {top: 20, bottom: 50, left: 60, right: 20},
-        tooltipXOffset:20,
-        tooltipYOffset:-47,
+        padding: { top: 20, bottom: 50, left: 60, right: 20 },
+        tooltipXOffset: 20,
+        tooltipYOffset: -47,
         axis: {
             x: {
                 axisLabel: {
-                    padding: 35
+                    padding: 35,
                 },
-                grid: {opacity: 0}
+                grid: { opacity: 0 },
             },
             y: {
                 axisLabel: {
-                    padding: 45, fill: "black"
+                    padding: 45,
+                    fill: 'black',
                 },
-                grid: {opacity: 0}
-
-            }
+                grid: { opacity: 0 },
+            },
         },
         pValue: {
             x: 610,
             y: 30,
-            textAnchor:"start"
+            textAnchor: 'start',
         },
         legend: {
             x: 600,
-            y: 50
-        }
+            y: 50,
+        },
     };
 
-    private events = [{
-        target: "data",
-        eventHandlers: {
-            onMouseOver: () => {
-                return [
-                    {
-                        target: "data",
-                        mutation: (props: any) => {
-                            this.tooltipModel = props;
-                            this.tooltipCounter++;
-                            return { active: true };
-                        }
-                    }
-                ];
+    private events = [
+        {
+            target: 'data',
+            eventHandlers: {
+                onMouseOver: () => {
+                    return [
+                        {
+                            target: 'data',
+                            mutation: (props: any) => {
+                                this.tooltipModel = props;
+                                this.tooltipCounter++;
+                                return { active: true };
+                            },
+                        },
+                    ];
+                },
+                onMouseOut: () => {
+                    return [
+                        {
+                            target: 'data',
+                            mutation: async () => {
+                                await sleep(100);
+                                if (
+                                    !this.isTooltipHovered &&
+                                    this.tooltipCounter === 1
+                                ) {
+                                    this.tooltipModel = null;
+                                }
+                                this.tooltipCounter--;
+                                return { active: false };
+                            },
+                        },
+                    ];
+                },
             },
-            onMouseOut: () => {
-                return [
-                    {
-                        target: "data",
-                        mutation: async () => {
-                            await sleep(100);
-                            if (!this.isTooltipHovered && this.tooltipCounter === 1) {
-                                this.tooltipModel = null;
-                            }
-                            this.tooltipCounter--;
-                            return { active: false };
-                        }
-                    }
-                ];
-            }
-        }
-    }];
+        },
+    ];
 
     public toSVGDOMNode(): SVGElement {
-        return toSvgDomNodeWithLegend(
-            this.svgContainer.firstChild,
-            {
-                legendGroupSelector: ".survivalChartDownloadLegend",
-                selectorToHide: ".survivalChartLegendHideForDownload"
-            }
-        );
+        return toSvgDomNodeWithLegend(this.svgContainer.firstChild, {
+            legendGroupSelector: '.survivalChartDownloadLegend',
+            selectorToHide: '.survivalChartLegendHideForDownload',
+        });
     }
 
     @computed
     get styleOpts() {
-        let configurableOpts: any = _.merge({}, this.styleOptsDefaultProps, this.props.styleOpts);
-        configurableOpts.padding.right = this.props.legendLocation === LegendLocation.CHART ? 300 : configurableOpts.padding.right;
-        if (!this.props.styleOpts || !this.props.styleOpts.legend || this.props.styleOpts.legend.x === undefined) {
+        let configurableOpts: any = _.merge(
+            {},
+            this.styleOptsDefaultProps,
+            this.props.styleOpts
+        );
+        configurableOpts.padding.right =
+            this.props.legendLocation === LegendLocation.CHART
+                ? 300
+                : configurableOpts.padding.right;
+        if (
+            !this.props.styleOpts ||
+            !this.props.styleOpts.legend ||
+            this.props.styleOpts.legend.x === undefined
+        ) {
             // only set legend x if its not passed in
-            configurableOpts.legend.x = configurableOpts.width - configurableOpts.padding.right;
+            configurableOpts.legend.x =
+                configurableOpts.width - configurableOpts.padding.right;
         }
         return configurableOpts;
     }
@@ -169,44 +209,64 @@ export default class SurvivalChart extends React.Component<ISurvivalChartProps,
     @computed
     get downSamplingDenominators() {
         return {
-            x: this.styleOpts.width - this.styleOpts.padding.left - this.styleOpts.padding.right,
-            y: this.styleOpts.height - this.styleOpts.padding.top - this.styleOpts.padding.bottom
-        }
+            x:
+                this.styleOpts.width -
+                this.styleOpts.padding.left -
+                this.styleOpts.padding.right,
+            y:
+                this.styleOpts.height -
+                this.styleOpts.padding.top -
+                this.styleOpts.padding.bottom,
+        };
     }
 
-    @computed get sortedGroupedSurvivals():{[groupValue:string]:PatientSurvival[]} {
+    @computed get sortedGroupedSurvivals(): {
+        [groupValue: string]: PatientSurvival[];
+    } {
         const patientToAnalysisGroups = this.props.patientToAnalysisGroups;
-        const survivalsByAnalysisGroup = _.reduce(this.props.patientSurvivals, (map, nextSurv)=>{
-            if (nextSurv.uniquePatientKey in patientToAnalysisGroups) {
-                // only include this data if theres an analysis group (curve) to put it in
-                const groups = patientToAnalysisGroups[nextSurv.uniquePatientKey];
-                groups.forEach(group=>{
-                    map[group] = map[group] || [];
-                    map[group].push(nextSurv);
-                })
-
-            }
-            return map;
-        }, {} as {[groupValue:string]:PatientSurvival[]});
+        const survivalsByAnalysisGroup = _.reduce(
+            this.props.patientSurvivals,
+            (map, nextSurv) => {
+                if (nextSurv.uniquePatientKey in patientToAnalysisGroups) {
+                    // only include this data if theres an analysis group (curve) to put it in
+                    const groups =
+                        patientToAnalysisGroups[nextSurv.uniquePatientKey];
+                    groups.forEach(group => {
+                        map[group] = map[group] || [];
+                        map[group].push(nextSurv);
+                    });
+                }
+                return map;
+            },
+            {} as { [groupValue: string]: PatientSurvival[] }
+        );
 
-        return _.mapValues(survivalsByAnalysisGroup, survivals=>survivals.sort((a,b)=>(a.months - b.months)));
+        return _.mapValues(survivalsByAnalysisGroup, survivals =>
+            survivals.sort((a, b) => a.months - b.months)
+        );
     }
 
-    @computed get estimates():{[groupValue:string]:number[]} {
-        return _.mapValues(this.sortedGroupedSurvivals, survivals=>getEstimates(survivals));
+    @computed get estimates(): { [groupValue: string]: number[] } {
+        return _.mapValues(this.sortedGroupedSurvivals, survivals =>
+            getEstimates(survivals)
+        );
     }
 
     @computed
     get unfilteredScatterData(): GroupedScatterData {
         // map through groups and generate plot data for each
-        return _.mapValues(this.sortedGroupedSurvivals, (survivals, group)=>{
+        return _.mapValues(this.sortedGroupedSurvivals, (survivals, group) => {
             const estimates = this.estimates[group];
             const groupName = this.analysisGroupsMap[group].name;
             return {
                 numOfCases: survivals.length,
                 line: getLineData(survivals, estimates),
-                scatterWithOpacity: getScatterDataWithOpacity(survivals, estimates, groupName),
-                scatter: getScatterData(survivals, estimates, groupName)
+                scatterWithOpacity: getScatterDataWithOpacity(
+                    survivals,
+                    estimates,
+                    groupName
+                ),
+                scatter: getScatterData(survivals, estimates, groupName),
             };
         });
     }
@@ -215,11 +275,15 @@ export default class SurvivalChart extends React.Component<ISurvivalChartProps,
     // The filter is only available when user zooms in the plot.
     @computed
     get scatterData(): GroupedScatterData {
-        return filterScatterData(this.unfilteredScatterData, this.scatterFilter, {
-            xDenominator: this.downSamplingDenominators.x,
-            yDenominator: this.downSamplingDenominators.y,
-            threshold: SURVIVAL_DOWN_SAMPLING_THRESHOLD
-        });
+        return filterScatterData(
+            this.unfilteredScatterData,
+            this.scatterFilter,
+            {
+                xDenominator: this.downSamplingDenominators.x,
+                yDenominator: this.downSamplingDenominators.y,
+                threshold: SURVIVAL_DOWN_SAMPLING_THRESHOLD,
+            }
+        );
     }
 
     public static defaultProps: Partial<ISurvivalChartProps> = {
@@ -237,17 +301,20 @@ export default class SurvivalChart extends React.Component<ISurvivalChartProps,
         this.tooltipMouseLeave = this.tooltipMouseLeave.bind(this);
     }
 
-
     @computed get analysisGroupsMap() {
-        return _.keyBy(this.props.analysisGroups, g=>g.value);
+        return _.keyBy(this.props.analysisGroups, g => g.value);
     }
 
     @computed get logRankTestPVal(): number | null {
         if (this.analysisGroupsWithData.length === 2) {
             // log rank test only makes sense with two groups
             return calculateLogRank(
-                this.sortedGroupedSurvivals[this.analysisGroupsWithData[0].value],
-                this.sortedGroupedSurvivals[this.analysisGroupsWithData[1].value]
+                this.sortedGroupedSurvivals[
+                    this.analysisGroupsWithData[0].value
+                ],
+                this.sortedGroupedSurvivals[
+                    this.analysisGroupsWithData[1].value
+                ]
             );
         } else {
             return null;
@@ -255,12 +322,17 @@ export default class SurvivalChart extends React.Component<ISurvivalChartProps,
     }
 
     @computed get victoryLegendData() {
-        const data:any = [];
+        const data: any = [];
         if (this.props.legendLocation === LegendLocation.CHART) {
             for (const grp of this.analysisGroupsWithData) {
                 data.push({
                     name: grp.legendText || grp.name || grp.value,
-                    symbol: { fill: grp.color, strokeOpacity:0, type:"square", size: 6 },
+                    symbol: {
+                        fill: grp.color,
+                        strokeOpacity: 0,
+                        type: 'square',
+                        size: 6,
+                    },
                 });
             }
         }
@@ -275,7 +347,11 @@ export default class SurvivalChart extends React.Component<ISurvivalChartProps,
                     y={this.styleOpts.pValue.y}
                     style={baseLabelStyles}
                     textAnchor={this.styleOpts.pValue.textAnchor}
-                    text={`Logrank Test P-Value: ${toConditionalPrecision(this.logRankTestPVal, 3, 0.01)}`}
+                    text={`Logrank Test P-Value: ${toConditionalPrecision(
+                        this.logRankTestPVal,
+                        3,
+                        0.01
+                    )}`}
                 />
             );
         } else {
@@ -286,14 +362,20 @@ export default class SurvivalChart extends React.Component<ISurvivalChartProps,
     @computed get legendDataForDownload() {
         const data: any = this.analysisGroupsWithData.map(grp => ({
             name: !!grp.name ? grp.name : grp.value,
-            symbol: { fill: grp.color, strokeOpacity:0, type:"square", size: 6 }
+            symbol: {
+                fill: grp.color,
+                strokeOpacity: 0,
+                type: 'square',
+                size: 6,
+            },
         }));
 
         // add an indicator in case NA is excluded
         if (this.props.naPatientsHiddenInSurvival) {
             data.push({
-                name: "* Patients with NA for any of the selected attributes are excluded",
-                symbol: { opacity: 0 }
+                name:
+                    '* Patients with NA for any of the selected attributes are excluded',
+                symbol: { opacity: 0 },
             });
         }
 
@@ -319,19 +401,26 @@ export default class SurvivalChart extends React.Component<ISurvivalChartProps,
         const data = [];
         for (const group of this.analysisGroupsWithData) {
             data.push({
-                scatterData:getScatterData(this.sortedGroupedSurvivals[group.value], this.estimates[group.value], group.value),
-                title: group.name !== undefined ? group.name : group.value
+                scatterData: getScatterData(
+                    this.sortedGroupedSurvivals[group.value],
+                    this.estimates[group.value],
+                    group.value
+                ),
+                title: group.name !== undefined ? group.name : group.value,
             });
         }
         return getDownloadContent(data, this.props.title);
     }
 
     @autobind
-    private hoverCircleFillOpacity(datum:any, active:any) {
-        if (active ||
-            (this.isTooltipHovered && this.tooltipModel &&
-            this.tooltipModel.datum.studyId === datum.studyId &&
-                this.tooltipModel.datum.patientId === datum.patientId)) {
+    private hoverCircleFillOpacity(datum: any, active: any) {
+        if (
+            active ||
+            (this.isTooltipHovered &&
+                this.tooltipModel &&
+                this.tooltipModel.datum.studyId === datum.studyId &&
+                this.tooltipModel.datum.patientId === datum.patientId)
+        ) {
             return 0.3;
         } else {
             return 0;
@@ -341,46 +430,76 @@ export default class SurvivalChart extends React.Component<ISurvivalChartProps,
     @computed get analysisGroupsWithData() {
         let analysisGroups = this.props.analysisGroups;
         // filter out groups with no data
-        analysisGroups = analysisGroups.filter(grp=>((grp.value in this.scatterData) && (this.scatterData[grp.value].numOfCases > 0)));
+        analysisGroups = analysisGroups.filter(
+            grp =>
+                grp.value in this.scatterData &&
+                this.scatterData[grp.value].numOfCases > 0
+        );
         return analysisGroups;
     }
 
     @computed get scattersAndLines() {
         // sort highlighted group to the end to show its elements on top
         let analysisGroupsWithData = this.analysisGroupsWithData;
-        analysisGroupsWithData = _.sortBy(analysisGroupsWithData, grp=>(this.highlightedCurve === grp.value ? 1 : 0));
-
-        const lineElements = analysisGroupsWithData.map(grp=>(
-            <VictoryLine key={grp.value} interpolation="stepAfter" data={this.scatterData[grp.value].line}
-                        style={{data:{
-                            stroke:grp.color,
-                            strokeWidth: this.highlightedCurve === grp.value ? 4 : 1,
-                            fill:"#000000",
-                            fillOpacity:0
-                        }}}
+        analysisGroupsWithData = _.sortBy(analysisGroupsWithData, grp =>
+            this.highlightedCurve === grp.value ? 1 : 0
+        );
+
+        const lineElements = analysisGroupsWithData.map(grp => (
+            <VictoryLine
+                key={grp.value}
+                interpolation="stepAfter"
+                data={this.scatterData[grp.value].line}
+                style={{
+                    data: {
+                        stroke: grp.color,
+                        strokeWidth:
+                            this.highlightedCurve === grp.value ? 4 : 1,
+                        fill: '#000000',
+                        fillOpacity: 0,
+                    },
+                }}
             />
         ));
-        const scatterWithOpacityElements = analysisGroupsWithData.map(grp=>(
-            <VictoryScatter key={grp.value} data={this.scatterData[grp.value].scatterWithOpacity}
-                            symbol="plus" style={{ data: { fill: grp.color, opacity: (d:any) => d.opacity } }}
-                            size={3} />
+        const scatterWithOpacityElements = analysisGroupsWithData.map(grp => (
+            <VictoryScatter
+                key={grp.value}
+                data={this.scatterData[grp.value].scatterWithOpacity}
+                symbol="plus"
+                style={{
+                    data: { fill: grp.color, opacity: (d: any) => d.opacity },
+                }}
+                size={3}
+            />
         ));
-        const scatterElements = analysisGroupsWithData.map(grp=>(
-            <VictoryScatter key={grp.value} data={this.scatterData[grp.value].scatter}
-                            symbol="circle" style={{ data: { fill: grp.color, fillOpacity: this.hoverCircleFillOpacity} }}
-                            size={10} events={this.events} />
+        const scatterElements = analysisGroupsWithData.map(grp => (
+            <VictoryScatter
+                key={grp.value}
+                data={this.scatterData[grp.value].scatter}
+                symbol="circle"
+                style={{
+                    data: {
+                        fill: grp.color,
+                        fillOpacity: this.hoverCircleFillOpacity,
+                    },
+                }}
+                size={10}
+                events={this.events}
+            />
         ));
-        return lineElements.concat(scatterWithOpacityElements).concat(scatterElements);
+        return lineElements
+            .concat(scatterWithOpacityElements)
+            .concat(scatterElements);
     }
 
     @computed get legendForDownload() {
         // override the legend style without mutating the actual theme object
         const theme = _.cloneDeep(CBIOPORTAL_VICTORY_THEME);
         theme.legend.style.data = {
-            type: "square",
+            type: 'square',
             size: 5,
             strokeWidth: 0,
-            stroke: "black"
+            stroke: 'black',
         };
 
         return (
@@ -389,7 +508,7 @@ export default class SurvivalChart extends React.Component<ISurvivalChartProps,
                 y={this.styleOpts.height + 1}
                 style={{
                     ...theme.legend.style,
-                    title: { fontWeight: "bold" }
+                    title: { fontWeight: 'bold' },
                 }}
                 title={this.props.title}
                 rowGutter={-10}
@@ -401,7 +520,9 @@ export default class SurvivalChart extends React.Component<ISurvivalChartProps,
 
     @computed
     get xAxisTickCount() {
-        return this.getAxisTickCount(this.showLegend ? this.styleOpts.legend.x : this.styleOpts.width);
+        return this.getAxisTickCount(
+            this.showLegend ? this.styleOpts.legend.x : this.styleOpts.width
+        );
     }
 
     getAxisTickCount(size: number) {
@@ -415,10 +536,10 @@ export default class SurvivalChart extends React.Component<ISurvivalChartProps,
 
     @computed get maximumDataMonthValue() {
         return _.chain(this.sortedGroupedSurvivals)
-                .map((survivals) => survivals[survivals.length - 1].months)
-                .max()
-                .ceil()
-                .value();
+            .map(survivals => survivals[survivals.length - 1].months)
+            .max()
+            .ceil()
+            .value();
     }
 
     @autobind
@@ -437,75 +558,115 @@ export default class SurvivalChart extends React.Component<ISurvivalChartProps,
     get chart() {
         return (
             <div className={this.props.className} data-test={'SurvivalChart'}>
+                {this.props.showDownloadButtons && (
+                    <DownloadControls
+                        dontFade={true}
+                        filename={this.props.fileName}
+                        buttons={['SVG', 'PNG', 'PDF', 'Data']}
+                        getSvg={this.getSvg}
+                        getData={this.getData}
+                        style={{ position: 'absolute', zIndex: 10, right: 10 }}
+                        type="button"
+                    />
+                )}
 
-                {this.props.showDownloadButtons &&
-                <DownloadControls
-                    dontFade={true}
-                    filename={this.props.fileName}
-                    buttons={["SVG", "PNG", "PDF", "Data"]}
-                    getSvg={this.getSvg}
-                    getData={this.getData}
-                    style={{position:'absolute', zIndex: 10, right: 10}}
-                    type='button'
-                />
-                }
-
-                {
-                    (this.props.showSlider) && (
-                        <div className="small" style={{display: "flex", alignItems: "center", marginLeft: 60}}>
-                            <span>X-Axis Max:</span>
-                            <div
-                                className={"RangeSliderContainer"}
-                                style={{
-                                    width: 300,
-                                    marginLeft: 10,
-                                    marginRight: 10
-                                }}
-                            >
-                                <Slider
-                                    min={0}
-                                    max={this.maximumDataMonthValue}
-                                    value={this.sliderValue}
-                                    onChange={this.onSliderChange}
-                                    tooltip={false}
-                                    step={1}
-                                />
-                            </div>
-                            <EditableSpan
-                                className={styles["XmaxNumberInput"]}
-                                value={this.sliderValue.toString()}
-                                setValue={this.onSliderTextChange}
-                                numericOnly={true}
+                {this.props.showSlider && (
+                    <div
+                        className="small"
+                        style={{
+                            display: 'flex',
+                            alignItems: 'center',
+                            marginLeft: 60,
+                        }}
+                    >
+                        <span>X-Axis Max:</span>
+                        <div
+                            className={'RangeSliderContainer'}
+                            style={{
+                                width: 300,
+                                marginLeft: 10,
+                                marginRight: 10,
+                            }}
+                        >
+                            <Slider
+                                min={0}
+                                max={this.maximumDataMonthValue}
+                                value={this.sliderValue}
+                                onChange={this.onSliderChange}
+                                tooltip={false}
+                                step={1}
                             />
-                            <span>{pluralize("Month", this.sliderValue)} Survival</span>
                         </div>
-                    )
-                }
+                        <EditableSpan
+                            className={styles['XmaxNumberInput']}
+                            value={this.sliderValue.toString()}
+                            setValue={this.onSliderTextChange}
+                            numericOnly={true}
+                        />
+                        <span>
+                            {pluralize('Month', this.sliderValue)} Survival
+                        </span>
+                    </div>
+                )}
 
-                <VictoryChart containerComponent={<VictoryZoomContainer responsive={false}
-                                                                        disable={true}
-                                                                        zoomDomain={this.props.showSlider ? {x: [0, this.sliderValue]} : undefined}
-                                                                        onZoomDomainChange={_.debounce((domain: any) => {
-                                                                            this.scatterFilter = domain as SurvivalPlotFilters;
-                                                                        }, 1000)}
-                                                                        containerRef={(ref: any) => this.svgContainer = ref}/>}
-                              height={this.styleOpts.height} width={this.styleOpts.width}
-                              padding={this.styleOpts.padding}
-                              theme={CBIOPORTAL_VICTORY_THEME}
-                              domainPadding={{x: [10, 50], y: [20, 20]}}>
-                    <VictoryAxis style={this.styleOpts.axis.x} crossAxis={false} tickCount={this.xAxisTickCount}
-                                 label={this.props.xAxisLabel}/>
-                    <VictoryAxis label={this.props.yAxisLabel} dependentAxis={true} tickFormat={(t: any) => `${t}%`}
-                                 tickCount={11}
-                                 style={this.styleOpts.axis.y} domain={[0, 100]} crossAxis={false}/>
-                    {this.scattersAndLines}
-                    {this.showLegend &&
-                    <VictoryLegend x={this.styleOpts.legend.x} y={this.styleOpts.legend.y}
-                                   data={this.victoryLegendData}
-                                   labelComponent={this.props.legendLabelComponent || <TruncatedTextWithTooltipSVG dy="0.3em" maxWidth={256}/>}
-                                   groupComponent={<g className="survivalChartLegendHideForDownload"/>}
-                    />
+                <VictoryChart
+                    containerComponent={
+                        <VictoryZoomContainer
+                            responsive={false}
+                            disable={true}
+                            zoomDomain={
+                                this.props.showSlider
+                                    ? { x: [0, this.sliderValue] }
+                                    : undefined
+                            }
+                            onZoomDomainChange={_.debounce((domain: any) => {
+                                this.scatterFilter = domain as SurvivalPlotFilters;
+                            }, 1000)}
+                            containerRef={(ref: any) =>
+                                (this.svgContainer = ref)
+                            }
+                        />
                     }
+                    height={this.styleOpts.height}
+                    width={this.styleOpts.width}
+                    padding={this.styleOpts.padding}
+                    theme={CBIOPORTAL_VICTORY_THEME}
+                    domainPadding={{ x: [10, 50], y: [20, 20] }}
+                >
+                    <VictoryAxis
+                        style={this.styleOpts.axis.x}
+                        crossAxis={false}
+                        tickCount={this.xAxisTickCount}
+                        label={this.props.xAxisLabel}
+                    />
+                    <VictoryAxis
+                        label={this.props.yAxisLabel}
+                        dependentAxis={true}
+                        tickFormat={(t: any) => `${t}%`}
+                        tickCount={11}
+                        style={this.styleOpts.axis.y}
+                        domain={[0, 100]}
+                        crossAxis={false}
+                    />
+                    {this.scattersAndLines}
+                    {this.showLegend && (
+                        <VictoryLegend
+                            x={this.styleOpts.legend.x}
+                            y={this.styleOpts.legend.y}
+                            data={this.victoryLegendData}
+                            labelComponent={
+                                this.props.legendLabelComponent || (
+                                    <TruncatedTextWithTooltipSVG
+                                        dy="0.3em"
+                                        maxWidth={256}
+                                    />
+                                )
+                            }
+                            groupComponent={
+                                <g className="survivalChartLegendHideForDownload" />
+                            }
+                        />
+                    )}
                     {this.legendForDownload}
                     {this.pValueText}
                 </VictoryChart>
@@ -515,38 +676,69 @@ export default class SurvivalChart extends React.Component<ISurvivalChartProps,
 
     @computed get chartTooltip() {
         return (
-            <div style={{maxWidth: 250}}>
-                {this.analysisGroupsWithData.map(group=>(
+            <div style={{ maxWidth: 250 }}>
+                {this.analysisGroupsWithData.map(group => (
                     <span
                         key={group.value}
-                        style={{display:"inline-block", marginRight:12, fontWeight: this.highlightedCurve === group.value ? "bold" : "initial", cursor:"pointer"}}
-                        onClick={()=>{ this.highlightedCurve = (this.highlightedCurve === group.value ? "" : group.value)}}
+                        style={{
+                            display: 'inline-block',
+                            marginRight: 12,
+                            fontWeight:
+                                this.highlightedCurve === group.value
+                                    ? 'bold'
+                                    : 'initial',
+                            cursor: 'pointer',
+                        }}
+                        onClick={() => {
+                            this.highlightedCurve =
+                                this.highlightedCurve === group.value
+                                    ? ''
+                                    : group.value;
+                        }}
                     >
-                        <div style={{width:10, height:10, display:"inline-block", backgroundColor:group.color, marginRight:5}}/>
+                        <div
+                            style={{
+                                width: 10,
+                                height: 10,
+                                display: 'inline-block',
+                                backgroundColor: group.color,
+                                marginRight: 5,
+                            }}
+                        />
                         {!!group.name ? group.name : group.value}
                     </span>
                 ))}
-                { this.props.showNaPatientsHiddenToggle && (
-                    <div className="checkbox"><label>
-                        <input
-                            type="checkbox"
-                            checked={this.props.naPatientsHiddenInSurvival}
-                            onClick={this.props.toggleSurvivalHideNAPatients}
-                        /> Exclude patients with NA for any of the selected attributes.
-                    </label></div>
+                {this.props.showNaPatientsHiddenToggle && (
+                    <div className="checkbox">
+                        <label>
+                            <input
+                                type="checkbox"
+                                checked={this.props.naPatientsHiddenInSurvival}
+                                onClick={
+                                    this.props.toggleSurvivalHideNAPatients
+                                }
+                            />{' '}
+                            Exclude patients with NA for any of the selected
+                            attributes.
+                        </label>
+                    </div>
                 )}
             </div>
         );
     }
 
     @computed get tableRows() {
-        return this.props.analysisGroups.map(grp=>(
+        return this.props.analysisGroups.map(grp => (
             <tr>
                 <td>{!!grp.name ? grp.name : grp.value}</td>
-                {
-                    getStats(this.sortedGroupedSurvivals[grp.value], this.estimates[grp.value]).map(stat =>
-                        <td><b>{stat}</b></td>)
-                }
+                {getStats(
+                    this.sortedGroupedSurvivals[grp.value],
+                    this.estimates[grp.value]
+                ).map(stat => (
+                    <td>
+                        <b>{stat}</b>
+                    </td>
+                ))}
             </tr>
         ));
     }
@@ -556,43 +748,87 @@ export default class SurvivalChart extends React.Component<ISurvivalChartProps,
             return <div className={'alert alert-info'}>No data to plot.</div>;
         } else {
             return (
-
-                <div style={{position:"relative"}}>
-                    { (this.props.legendLocation === LegendLocation.TOOLTIP) ? (
+                <div style={{ position: 'relative' }}>
+                    {this.props.legendLocation === LegendLocation.TOOLTIP ? (
                         <DefaultTooltip
-                            mouseLeaveDelay={.2}
+                            mouseLeaveDelay={0.2}
                             placement="rightBottom"
                             overlay={this.chartTooltip}
                         >
                             {this.chart}
                         </DefaultTooltip>
-                    ) : this.chart }
-                    {this.tooltipModel &&
-                        <Popover arrowOffsetTop={56} className={classnames("cbioportal-frontend", "cbioTooltip", styles.Tooltip)} positionLeft={this.tooltipModel.x + this.styleOpts.tooltipXOffset}
-                                 { ...{container:this} }
-                            positionTop={this.tooltipModel.y + this.styleOpts.tooltipYOffset}
-                            onMouseEnter={this.tooltipMouseEnter} onMouseLeave={this.tooltipMouseLeave}>
+                    ) : (
+                        this.chart
+                    )}
+                    {this.tooltipModel && (
+                        <Popover
+                            arrowOffsetTop={56}
+                            className={classnames(
+                                'cbioportal-frontend',
+                                'cbioTooltip',
+                                styles.Tooltip
+                            )}
+                            positionLeft={
+                                this.tooltipModel.x +
+                                this.styleOpts.tooltipXOffset
+                            }
+                            {...{ container: this }}
+                            positionTop={
+                                this.tooltipModel.y +
+                                this.styleOpts.tooltipYOffset
+                            }
+                            onMouseEnter={this.tooltipMouseEnter}
+                            onMouseLeave={this.tooltipMouseLeave}
+                        >
                             <div>
-                                Patient ID: <a href={getPatientViewUrl(this.tooltipModel.datum.studyId, this.tooltipModel.datum.patientId)} target="_blank">{this.tooltipModel.datum.patientId}</a><br />
+                                Patient ID:{' '}
+                                <a
+                                    href={getPatientViewUrl(
+                                        this.tooltipModel.datum.studyId,
+                                        this.tooltipModel.datum.patientId
+                                    )}
+                                    target="_blank"
+                                >
+                                    {this.tooltipModel.datum.patientId}
+                                </a>
+                                <br />
                                 {!!this.props.showCurveInTooltip && [
                                     `Curve: ${this.tooltipModel.datum.group}`,
-                                    <br/>
+                                    <br />,
                                 ]}
-                                {this.props.yLabelTooltip}: {(this.tooltipModel.datum.y).toFixed(2)}%<br />
-                                {this.tooltipModel.datum.status ? this.props.xLabelWithEventTooltip :
-                                    this.props.xLabelWithoutEventTooltip}
-                                : {this.tooltipModel.datum.x.toFixed(2)} months {this.tooltipModel.datum.status ? "" :
-                                "(censored)"}<br/>
+                                {this.props.yLabelTooltip}:{' '}
+                                {this.tooltipModel.datum.y.toFixed(2)}%<br />
+                                {this.tooltipModel.datum.status
+                                    ? this.props.xLabelWithEventTooltip
+                                    : this.props.xLabelWithoutEventTooltip}
+                                : {this.tooltipModel.datum.x.toFixed(2)} months{' '}
+                                {this.tooltipModel.datum.status
+                                    ? ''
+                                    : '(censored)'}
+                                <br />
                                 {this.props.analysisClinicalAttribute && (
                                     <span>
-                                        {this.props.analysisClinicalAttribute.displayName}: {this.props.patientToAnalysisGroups[this.tooltipModel.datum.uniquePatientKey]}
+                                        {
+                                            this.props.analysisClinicalAttribute
+                                                .displayName
+                                        }
+                                        :{' '}
+                                        {
+                                            this.props.patientToAnalysisGroups[
+                                                this.tooltipModel.datum
+                                                    .uniquePatientKey
+                                            ]
+                                        }
                                     </span>
                                 )}
                             </div>
                         </Popover>
-                    }
-                    {this.props.showTable &&
-                        <table className="table table-striped" style={{marginTop:20, width: '100%'}}>
+                    )}
+                    {this.props.showTable && (
+                        <table
+                            className="table table-striped"
+                            style={{ marginTop: 20, width: '100%' }}
+                        >
                             <tbody>
                                 <tr>
                                     <td />
@@ -603,7 +839,7 @@ export default class SurvivalChart extends React.Component<ISurvivalChartProps,
                                 {this.tableRows}
                             </tbody>
                         </table>
-                    }
+                    )}
                 </div>
             );
         }
diff --git a/src/pages/resultsView/survival/SurvivalDescriptionTable.tsx b/src/pages/resultsView/survival/SurvivalDescriptionTable.tsx
index 32ad590b25c..d4f4ca3f073 100644
--- a/src/pages/resultsView/survival/SurvivalDescriptionTable.tsx
+++ b/src/pages/resultsView/survival/SurvivalDescriptionTable.tsx
@@ -1,6 +1,6 @@
-import {observer} from "mobx-react";
+import { observer } from 'mobx-react';
 import * as React from 'react';
-import LazyMobXTable from "shared/components/lazyMobXTable/LazyMobXTable";
+import LazyMobXTable from 'shared/components/lazyMobXTable/LazyMobXTable';
 
 export interface ISurvivalDescription {
     studyName: string;
@@ -11,29 +11,36 @@ export interface ISurvivalDescriptionTableProps {
     survivalDescriptionData: ISurvivalDescription[];
 }
 
-class SurvivalDescriptionTableComponent extends LazyMobXTable<ISurvivalDescription> {}
+class SurvivalDescriptionTableComponent extends LazyMobXTable<
+    ISurvivalDescription
+> {}
 
 @observer
-export default class SurvivalDescriptionTable extends React.Component<ISurvivalDescriptionTableProps, {}> {
-    public render()
-    {
+export default class SurvivalDescriptionTable extends React.Component<
+    ISurvivalDescriptionTableProps,
+    {}
+> {
+    public render() {
         return (
             <SurvivalDescriptionTableComponent
                 data={this.props.survivalDescriptionData}
-                columns={
-                    [
-                        {
-                            name: 'Study',
-                            render: (data: ISurvivalDescription) => <span>{data.studyName}</span>,
-                            sortBy: (data: ISurvivalDescription) => data.studyName
-                        },
-                        {
-                            name: 'Description',
-                            render: (data: ISurvivalDescription) => <span>{data.description}</span>,
-                            sortBy: (data: ISurvivalDescription) => data.description
-                        }
-                    ]
-                }
+                columns={[
+                    {
+                        name: 'Study',
+                        render: (data: ISurvivalDescription) => (
+                            <span>{data.studyName}</span>
+                        ),
+                        sortBy: (data: ISurvivalDescription) => data.studyName,
+                    },
+                    {
+                        name: 'Description',
+                        render: (data: ISurvivalDescription) => (
+                            <span>{data.description}</span>
+                        ),
+                        sortBy: (data: ISurvivalDescription) =>
+                            data.description,
+                    },
+                ]}
                 initialSortColumn="Description"
                 initialSortDirection={'desc'}
                 showPagination={true}
@@ -44,4 +51,4 @@ export default class SurvivalDescriptionTable extends React.Component<ISurvivalD
             />
         );
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/resultsView/survival/SurvivalTab.tsx b/src/pages/resultsView/survival/SurvivalTab.tsx
index c52bc4f2215..d9eed07867a 100644
--- a/src/pages/resultsView/survival/SurvivalTab.tsx
+++ b/src/pages/resultsView/survival/SurvivalTab.tsx
@@ -1,98 +1,151 @@
 import * as React from 'react';
-import SurvivalChart from "./SurvivalChart";
-import { ResultsViewPageStore } from "../ResultsViewPageStore";
-import LoadingIndicator from "../../../shared/components/loadingIndicator/LoadingIndicator";
-import { observer } from "mobx-react";
-import {DefaultTooltip, remoteData} from "cbioportal-frontend-commons";
-import {ALTERED_GROUP_VALUE, getSurvivalChartDataByAlteredStatus, UNALTERED_GROUP_VALUE} from "./SurvivalUtil";
-import OqlStatusBanner from "../../../shared/components/banners/OqlStatusBanner";
+import SurvivalChart from './SurvivalChart';
+import { ResultsViewPageStore } from '../ResultsViewPageStore';
+import LoadingIndicator from '../../../shared/components/loadingIndicator/LoadingIndicator';
+import { observer } from 'mobx-react';
+import { DefaultTooltip, remoteData } from 'cbioportal-frontend-commons';
+import {
+    ALTERED_GROUP_VALUE,
+    getSurvivalChartDataByAlteredStatus,
+    UNALTERED_GROUP_VALUE,
+} from './SurvivalUtil';
+import OqlStatusBanner from '../../../shared/components/banners/OqlStatusBanner';
 import _ from 'lodash';
 import SurvivalDescriptionTable from './SurvivalDescriptionTable';
-import NotUsingGenePanelWarning from "../NotUsingGenePanelWarning";
-import AlterationFilterWarning from "../../../shared/components/banners/AlterationFilterWarning";
+import NotUsingGenePanelWarning from '../NotUsingGenePanelWarning';
+import AlterationFilterWarning from '../../../shared/components/banners/AlterationFilterWarning';
 
 export interface ISurvivalTabProps {
-    store: ResultsViewPageStore
+    store: ResultsViewPageStore;
 }
 
-const analysisGroups = [{
-    value:ALTERED_GROUP_VALUE,
-    color: "red",
-    name: "Cases with Alteration(s) in Query Gene(s)"
-},{
-    value: UNALTERED_GROUP_VALUE,
-    color: "blue",
-    name: "Cases without Alteration(s) in Query Gene(s)"
-}];
+const analysisGroups = [
+    {
+        value: ALTERED_GROUP_VALUE,
+        color: 'red',
+        name: 'Cases with Alteration(s) in Query Gene(s)',
+    },
+    {
+        value: UNALTERED_GROUP_VALUE,
+        color: 'blue',
+        name: 'Cases without Alteration(s) in Query Gene(s)',
+    },
+];
 
 @observer
-export default class SurvivalTab extends React.Component<ISurvivalTabProps, {}> {
-
+export default class SurvivalTab extends React.Component<
+    ISurvivalTabProps,
+    {}
+> {
     private overallSurvivalTitleText = 'Overall Survival Kaplan-Meier Estimate';
-    private diseaseFreeSurvivalTitleText = 'Disease/Progression-free Kaplan-Meier Estimate';
-    private multipleDescriptionWarningMessageWithoutTooltip = "The survival data on patients from different cohorts may have been defined by ";
-    private multipleDescriptionWarningMessageWithTooltip = "different criteria.";
-    private differentDescriptionExistMessage = "Different descriptions of survival data were used for different studies.";
+    private diseaseFreeSurvivalTitleText =
+        'Disease/Progression-free Kaplan-Meier Estimate';
+    private multipleDescriptionWarningMessageWithoutTooltip =
+        'The survival data on patients from different cohorts may have been defined by ';
+    private multipleDescriptionWarningMessageWithTooltip =
+        'different criteria.';
+    private differentDescriptionExistMessage =
+        'Different descriptions of survival data were used for different studies.';
 
     readonly overallPatientSurvivalData = remoteData({
-        await: ()=>[
+        await: () => [
             this.props.store.overallAlteredPatientSurvivals,
             this.props.store.overallUnalteredPatientSurvivals,
         ],
-        invoke:()=>{
-            return Promise.resolve(getSurvivalChartDataByAlteredStatus(
-                this.props.store.overallAlteredPatientSurvivals.result!,
-                this.props.store.overallUnalteredPatientSurvivals.result!
-            ));
-        }
+        invoke: () => {
+            return Promise.resolve(
+                getSurvivalChartDataByAlteredStatus(
+                    this.props.store.overallAlteredPatientSurvivals.result!,
+                    this.props.store.overallUnalteredPatientSurvivals.result!
+                )
+            );
+        },
     });
 
     readonly diseaseFreePatientSurvivalData = remoteData({
-        await: ()=>[
+        await: () => [
             this.props.store.diseaseFreeAlteredPatientSurvivals,
             this.props.store.diseaseFreeUnalteredPatientSurvivals,
         ],
-        invoke:()=>{
-            return Promise.resolve(getSurvivalChartDataByAlteredStatus(
-                this.props.store.diseaseFreeAlteredPatientSurvivals.result!,
-                this.props.store.diseaseFreeUnalteredPatientSurvivals.result!
-            ));
-        }
+        invoke: () => {
+            return Promise.resolve(
+                getSurvivalChartDataByAlteredStatus(
+                    this.props.store.diseaseFreeAlteredPatientSurvivals.result!,
+                    this.props.store.diseaseFreeUnalteredPatientSurvivals
+                        .result!
+                )
+            );
+        },
     });
 
     public render() {
-
-        if (this.overallPatientSurvivalData.isPending ||
-            this.diseaseFreePatientSurvivalData.isPending || 
+        if (
+            this.overallPatientSurvivalData.isPending ||
+            this.diseaseFreePatientSurvivalData.isPending ||
             this.props.store.overallSurvivalDescriptions.isPending ||
-            this.props.store.diseaseFreeSurvivalDescriptions.isPending) {
-            return <LoadingIndicator isLoading={true} size={"big"} center={true} />;
+            this.props.store.diseaseFreeSurvivalDescriptions.isPending
+        ) {
+            return (
+                <LoadingIndicator isLoading={true} size={'big'} center={true} />
+            );
         }
 
         let content: any = [];
         let overallNotAvailable: boolean = false;
         let diseaseFreeNotAvailable: boolean = false;
-        const overallSurvivalDescription = this.props.store.overallSurvivalDescriptions && this.props.store.overallSurvivalDescriptions.result!.length == 1 ? this.props.store.overallSurvivalDescriptions.result![0].description : "";
-        const diseaseFreeSurvivalDescription = this.props.store.diseaseFreeSurvivalDescriptions && this.props.store.diseaseFreeSurvivalDescriptions.result!.length == 1 ? this.props.store.diseaseFreeSurvivalDescriptions.result![0].description : "";
+        const overallSurvivalDescription =
+            this.props.store.overallSurvivalDescriptions &&
+            this.props.store.overallSurvivalDescriptions.result!.length == 1
+                ? this.props.store.overallSurvivalDescriptions.result![0]
+                      .description
+                : '';
+        const diseaseFreeSurvivalDescription =
+            this.props.store.diseaseFreeSurvivalDescriptions &&
+            this.props.store.diseaseFreeSurvivalDescriptions.result!.length == 1
+                ? this.props.store.diseaseFreeSurvivalDescriptions.result![0]
+                      .description
+                : '';
 
-        if (this.overallPatientSurvivalData.isComplete &&
-            this.overallPatientSurvivalData.result.patientSurvivals.length > 0) {
-            if (this.props.store.overallSurvivalDescriptions && this.props.store.overallSurvivalDescriptions.result!.length > 1) {
-                let messageBeforeTooltip = this.multipleDescriptionWarningMessageWithoutTooltip;
-                const uniqDescriptions = _.uniq(_.map(this.props.store.overallSurvivalDescriptions.result!, (d) => d.description));
+        if (
+            this.overallPatientSurvivalData.isComplete &&
+            this.overallPatientSurvivalData.result.patientSurvivals.length > 0
+        ) {
+            if (
+                this.props.store.overallSurvivalDescriptions &&
+                this.props.store.overallSurvivalDescriptions.result!.length > 1
+            ) {
+                let messageBeforeTooltip = this
+                    .multipleDescriptionWarningMessageWithoutTooltip;
+                const uniqDescriptions = _.uniq(
+                    _.map(
+                        this.props.store.overallSurvivalDescriptions.result!,
+                        d => d.description
+                    )
+                );
                 if (uniqDescriptions.length > 1) {
                     messageBeforeTooltip = `${this.differentDescriptionExistMessage} ${messageBeforeTooltip}`;
                 }
                 content.push(
-                    <div className={"tabMessageContainer"}>
-                        <div className={"alert alert-warning"} role="alert">
+                    <div className={'tabMessageContainer'}>
+                        <div className={'alert alert-warning'} role="alert">
                             {messageBeforeTooltip}
                             <DefaultTooltip
                                 placement="bottom"
-                                overlay={(<SurvivalDescriptionTable survivalDescriptionData = {this.props.store.overallSurvivalDescriptions.result!}/>)}
+                                overlay={
+                                    <SurvivalDescriptionTable
+                                        survivalDescriptionData={
+                                            this.props.store
+                                                .overallSurvivalDescriptions
+                                                .result!
+                                        }
+                                    />
+                                }
                             >
                                 <a href="javascript:void(0)">
-                                    {this.multipleDescriptionWarningMessageWithTooltip}
+                                    {
+                                        this
+                                            .multipleDescriptionWarningMessageWithTooltip
+                                    }
                                 </a>
                             </DefaultTooltip>
                         </div>
@@ -100,14 +153,24 @@ export default class SurvivalTab extends React.Component<ISurvivalTabProps, {}>
                 );
             }
             content.push(
-                <div style={{marginBottom:40}}>
-                    <h4 className='forceHeaderStyle h4'>{overallSurvivalDescription ? `${this.overallSurvivalTitleText} (${overallSurvivalDescription})` : this.overallSurvivalTitleText}</h4>
-                    <div style={{width: '920px'}}>
+                <div style={{ marginBottom: 40 }}>
+                    <h4 className="forceHeaderStyle h4">
+                        {overallSurvivalDescription
+                            ? `${this.overallSurvivalTitleText} (${overallSurvivalDescription})`
+                            : this.overallSurvivalTitleText}
+                    </h4>
+                    <div style={{ width: '920px' }}>
                         <SurvivalChart
-                            className='borderedChart'
-                            patientSurvivals = {this.overallPatientSurvivalData.result.patientSurvivals}
+                            className="borderedChart"
+                            patientSurvivals={
+                                this.overallPatientSurvivalData.result
+                                    .patientSurvivals
+                            }
                             analysisGroups={analysisGroups}
-                            patientToAnalysisGroups={this.overallPatientSurvivalData.result.patientToAnalysisGroups}
+                            patientToAnalysisGroups={
+                                this.overallPatientSurvivalData.result
+                                    .patientToAnalysisGroups
+                            }
                             title={this.overallSurvivalTitleText}
                             xAxisLabel="Months Survival"
                             yAxisLabel="Overall Survival"
@@ -117,7 +180,8 @@ export default class SurvivalTab extends React.Component<ISurvivalTabProps, {}>
                             yLabelTooltip="Survival estimate"
                             xLabelWithEventTooltip="Time of death"
                             xLabelWithoutEventTooltip="Time of last observation"
-                            fileName="Overall_Survival" />
+                            fileName="Overall_Survival"
+                        />
                     </div>
                 </div>
             );
@@ -125,24 +189,49 @@ export default class SurvivalTab extends React.Component<ISurvivalTabProps, {}>
             overallNotAvailable = true;
         }
 
-        if (this.diseaseFreePatientSurvivalData.isComplete &&
-            this.diseaseFreePatientSurvivalData.result.patientSurvivals.length > 0) {
-            if (this.props.store.diseaseFreeSurvivalDescriptions && this.props.store.diseaseFreeSurvivalDescriptions.result!.length > 1) {
-                let messageBeforeTooltip = this.multipleDescriptionWarningMessageWithoutTooltip;
-                const uniqDescriptions = _.uniq(_.map(this.props.store.diseaseFreeSurvivalDescriptions.result!, (d) => d.description));
+        if (
+            this.diseaseFreePatientSurvivalData.isComplete &&
+            this.diseaseFreePatientSurvivalData.result.patientSurvivals.length >
+                0
+        ) {
+            if (
+                this.props.store.diseaseFreeSurvivalDescriptions &&
+                this.props.store.diseaseFreeSurvivalDescriptions.result!
+                    .length > 1
+            ) {
+                let messageBeforeTooltip = this
+                    .multipleDescriptionWarningMessageWithoutTooltip;
+                const uniqDescriptions = _.uniq(
+                    _.map(
+                        this.props.store.diseaseFreeSurvivalDescriptions
+                            .result!,
+                        d => d.description
+                    )
+                );
                 if (uniqDescriptions.length > 1) {
                     messageBeforeTooltip = `${this.differentDescriptionExistMessage} ${messageBeforeTooltip}`;
                 }
                 content.push(
-                    <div className={"tabMessageContainer"}>
-                        <div className={"alert alert-warning"} role="alert">
+                    <div className={'tabMessageContainer'}>
+                        <div className={'alert alert-warning'} role="alert">
                             {messageBeforeTooltip}
                             <DefaultTooltip
                                 placement="bottom"
-                                overlay={(<SurvivalDescriptionTable survivalDescriptionData = {this.props.store.diseaseFreeSurvivalDescriptions.result!}/>)}
+                                overlay={
+                                    <SurvivalDescriptionTable
+                                        survivalDescriptionData={
+                                            this.props.store
+                                                .diseaseFreeSurvivalDescriptions
+                                                .result!
+                                        }
+                                    />
+                                }
                             >
                                 <a href="javascript:void(0)">
-                                    {this.multipleDescriptionWarningMessageWithTooltip}
+                                    {
+                                        this
+                                            .multipleDescriptionWarningMessageWithTooltip
+                                    }
                                 </a>
                             </DefaultTooltip>
                         </div>
@@ -151,13 +240,23 @@ export default class SurvivalTab extends React.Component<ISurvivalTabProps, {}>
             }
             content.push(
                 <div>
-                    <h4 className='forceHeaderStyle h4'>{diseaseFreeSurvivalDescription ? `${this.diseaseFreeSurvivalTitleText} (${diseaseFreeSurvivalDescription})` : this.diseaseFreeSurvivalTitleText}</h4>
-                    <div style={{width: '920px'}}>
+                    <h4 className="forceHeaderStyle h4">
+                        {diseaseFreeSurvivalDescription
+                            ? `${this.diseaseFreeSurvivalTitleText} (${diseaseFreeSurvivalDescription})`
+                            : this.diseaseFreeSurvivalTitleText}
+                    </h4>
+                    <div style={{ width: '920px' }}>
                         <SurvivalChart
-                            className='borderedChart'
-                            patientSurvivals = {this.diseaseFreePatientSurvivalData.result.patientSurvivals}
+                            className="borderedChart"
+                            patientSurvivals={
+                                this.diseaseFreePatientSurvivalData.result
+                                    .patientSurvivals
+                            }
                             analysisGroups={analysisGroups}
-                            patientToAnalysisGroups={this.diseaseFreePatientSurvivalData.result.patientToAnalysisGroups}
+                            patientToAnalysisGroups={
+                                this.diseaseFreePatientSurvivalData.result
+                                    .patientToAnalysisGroups
+                            }
                             title={this.diseaseFreeSurvivalTitleText}
                             xAxisLabel="Months Disease/Progression-free"
                             yAxisLabel="Disease/Progression-free Survival"
@@ -167,7 +266,8 @@ export default class SurvivalTab extends React.Component<ISurvivalTabProps, {}>
                             yLabelTooltip="Disease-free Estimate"
                             xLabelWithEventTooltip="Time of Relapse"
                             xLabelWithoutEventTooltip="Time of Last Observation"
-                            fileName="Disease_Free_Survival" />
+                            fileName="Disease_Free_Survival"
+                        />
                     </div>
                 </div>
             );
@@ -176,16 +276,28 @@ export default class SurvivalTab extends React.Component<ISurvivalTabProps, {}>
         }
 
         if (overallNotAvailable && diseaseFreeNotAvailable) {
-            content.push(<div className={'alert alert-info'}>{this.overallSurvivalTitleText} not available</div>);
-            content.push(<div className={'alert alert-info'}>{this.diseaseFreeSurvivalTitleText} not available</div>);
+            content.push(
+                <div className={'alert alert-info'}>
+                    {this.overallSurvivalTitleText} not available
+                </div>
+            );
+            content.push(
+                <div className={'alert alert-info'}>
+                    {this.diseaseFreeSurvivalTitleText} not available
+                </div>
+            );
         }
 
         return (
             <div data-test="survivalTabDiv">
-                <div className={"tabMessageContainer"}>
-                    <OqlStatusBanner className="survival-oql-status-banner" store={this.props.store} tabReflectsOql={true} />
-                    <NotUsingGenePanelWarning store={this.props.store}/>
-                    <AlterationFilterWarning store={this.props.store}/>
+                <div className={'tabMessageContainer'}>
+                    <OqlStatusBanner
+                        className="survival-oql-status-banner"
+                        store={this.props.store}
+                        tabReflectsOql={true}
+                    />
+                    <NotUsingGenePanelWarning store={this.props.store} />
+                    <AlterationFilterWarning store={this.props.store} />
                 </div>
                 {content}
             </div>
diff --git a/src/pages/resultsView/survival/SurvivalUtil.spec.tsx b/src/pages/resultsView/survival/SurvivalUtil.spec.tsx
index 7145d7df61b..e34af039d57 100644
--- a/src/pages/resultsView/survival/SurvivalUtil.spec.tsx
+++ b/src/pages/resultsView/survival/SurvivalUtil.spec.tsx
@@ -1,4 +1,4 @@
-import {assert} from 'chai';
+import { assert } from 'chai';
 import {
     calculateLogRank,
     convertScatterDataToDownloadData,
@@ -11,59 +11,57 @@ import {
     getScatterData,
     getScatterDataWithOpacity,
     getStats,
-    ScatterData
-} from "./SurvivalUtil";
+    ScatterData,
+} from './SurvivalUtil';
 
 const exampleAlteredPatientSurvivals = [
     {
-        uniquePatientKey: "TCGA-OR-A5J1",
-        patientId: "TCGA-OR-A5J1",
-        studyId: "acc_tcga",
+        uniquePatientKey: 'TCGA-OR-A5J1',
+        patientId: 'TCGA-OR-A5J1',
+        studyId: 'acc_tcga',
         months: 5.09,
-        status: false
+        status: false,
     },
     {
-        uniquePatientKey: "TCGA-OR-A5J2",
-        patientId: "TCGA-OR-A5J2",
-        studyId: "acc_tcga",
+        uniquePatientKey: 'TCGA-OR-A5J2',
+        patientId: 'TCGA-OR-A5J2',
+        studyId: 'acc_tcga',
         months: 0.09,
-        status: true
+        status: true,
     },
 ];
 
 const exampleUnalteredPatientSurvivals = [
-
     {
-        uniquePatientKey: "TCGA-OR-A5J3",
-        patientId: "TCGA-OR-A5J3",
-        studyId: "acc_tcga",
+        uniquePatientKey: 'TCGA-OR-A5J3',
+        patientId: 'TCGA-OR-A5J3',
+        studyId: 'acc_tcga',
         months: 0,
-        status: false
+        status: false,
     },
     {
-        uniquePatientKey: "TCGA-2F-A9KO",
-        patientId: "TCGA-2F-A9KO",
-        studyId: "blca_tcga",
+        uniquePatientKey: 'TCGA-2F-A9KO',
+        patientId: 'TCGA-2F-A9KO',
+        studyId: 'blca_tcga',
         months: 63.83,
-        status: true
+        status: true,
     },
     {
-        uniquePatientKey: "TCGA-2F-A9KP",
-        patientId: "TCGA-2F-A9KP",
-        studyId: "blca_tcga",
+        uniquePatientKey: 'TCGA-2F-A9KP',
+        patientId: 'TCGA-2F-A9KP',
+        studyId: 'blca_tcga',
         months: 0.13,
-        status: false
+        status: false,
     },
     {
-        uniquePatientKey: "TCGA-2F-A9KQ",
-        patientId: "TCGA-2F-A9KQ",
-        studyId: "blca_tcga",
+        uniquePatientKey: 'TCGA-2F-A9KQ',
+        patientId: 'TCGA-2F-A9KQ',
+        studyId: 'blca_tcga',
         months: 182.19,
-        status: true
-    }
+        status: true,
+    },
 ];
 
-
 const allScatterData: ScatterData[] = [
     {
         x: 0,
@@ -71,7 +69,7 @@ const allScatterData: ScatterData[] = [
         patientId: '',
         uniquePatientKey: '',
         studyId: '',
-        status: true
+        status: true,
     },
     {
         x: 0.5,
@@ -79,7 +77,7 @@ const allScatterData: ScatterData[] = [
         patientId: '',
         uniquePatientKey: '',
         studyId: '',
-        status: true
+        status: true,
     },
     {
         x: 1,
@@ -87,7 +85,7 @@ const allScatterData: ScatterData[] = [
         patientId: '',
         uniquePatientKey: '',
         studyId: '',
-        status: true
+        status: true,
     },
     {
         x: 0,
@@ -95,7 +93,7 @@ const allScatterData: ScatterData[] = [
         patientId: '',
         uniquePatientKey: '',
         studyId: '',
-        status: true
+        status: true,
     },
     {
         x: 0,
@@ -103,466 +101,828 @@ const allScatterData: ScatterData[] = [
         patientId: '',
         uniquePatientKey: '',
         studyId: '',
-        status: true
-    }
+        status: true,
+    },
 ];
 
-const examplePatientSurvivals = exampleAlteredPatientSurvivals.concat(exampleUnalteredPatientSurvivals);
+const examplePatientSurvivals = exampleAlteredPatientSurvivals.concat(
+    exampleUnalteredPatientSurvivals
+);
 
 const exampleAlteredEstimates = [1, 0.8];
-const exampleUnalteredEstimates = [0.8, 0.5333333333333333, 0.5333333333333333, 0];
-const exampleEstimates = exampleAlteredEstimates.concat(exampleUnalteredEstimates);
+const exampleUnalteredEstimates = [
+    0.8,
+    0.5333333333333333,
+    0.5333333333333333,
+    0,
+];
+const exampleEstimates = exampleAlteredEstimates.concat(
+    exampleUnalteredEstimates
+);
 
-describe("SurvivalUtil", () => {
-    describe("#getEstimates()", () => {
-        it("returns empty list for empty list", () => {
+describe('SurvivalUtil', () => {
+    describe('#getEstimates()', () => {
+        it('returns empty list for empty list', () => {
             assert.deepEqual(getEstimates([]), []);
         });
 
-        it("returns correct estimates for the example data", () => {
-            assert.deepEqual(getEstimates(examplePatientSurvivals), exampleEstimates);
+        it('returns correct estimates for the example data', () => {
+            assert.deepEqual(
+                getEstimates(examplePatientSurvivals),
+                exampleEstimates
+            );
         });
     });
 
-    describe("#getMedian()", () => {
-        it("returns NA for empty list", () => {
-            assert.equal(getMedian([], []), "NA");
+    describe('#getMedian()', () => {
+        it('returns NA for empty list', () => {
+            assert.equal(getMedian([], []), 'NA');
         });
 
-        it("returns 182.19 for the example data", () => {
-            assert.equal(getMedian(examplePatientSurvivals, exampleEstimates), "182.19");
+        it('returns 182.19 for the example data', () => {
+            assert.equal(
+                getMedian(examplePatientSurvivals, exampleEstimates),
+                '182.19'
+            );
         });
     });
 
-    describe("#getLineData()", () => {
-        it("returns [{x: 0, y: 100}] for empty list", () => {
+    describe('#getLineData()', () => {
+        it('returns [{x: 0, y: 100}] for empty list', () => {
             assert.deepEqual(getLineData([], []), [{ x: 0, y: 100 }]);
         });
 
-        it("returns correct line data for the example data", () => {
-            assert.deepEqual(getLineData(examplePatientSurvivals, exampleEstimates), [
-                { x: 0, y: 100 },
-                { x: 5.09, y: 100 },
-                { x: 0.09, y: 80 },
-                { x: 0, y: 80 },
-                { x: 63.83, y: 53.3333333333333333 },
-                { x: 0.13, y: 53.3333333333333333 },
-                { x: 182.19, y: 0 }
-            ]);
+        it('returns correct line data for the example data', () => {
+            assert.deepEqual(
+                getLineData(examplePatientSurvivals, exampleEstimates),
+                [
+                    { x: 0, y: 100 },
+                    { x: 5.09, y: 100 },
+                    { x: 0.09, y: 80 },
+                    { x: 0, y: 80 },
+                    { x: 63.83, y: 53.3333333333333333 },
+                    { x: 0.13, y: 53.3333333333333333 },
+                    { x: 182.19, y: 0 },
+                ]
+            );
         });
     });
 
-    describe("#getScatterData()", () => {
-        it("returns empty list for empty list", () => {
+    describe('#getScatterData()', () => {
+        it('returns empty list for empty list', () => {
             assert.deepEqual(getScatterData([], []), []);
         });
 
-        it("returns correct scatter data for the example data", () => {
-            assert.deepEqual(getScatterData(examplePatientSurvivals, exampleEstimates), [
-                { x: 5.09, y: 100, patientId: "TCGA-OR-A5J1", uniquePatientKey: "TCGA-OR-A5J1", studyId: "acc_tcga", status: false },
-                { x: 0.09, y: 80, patientId: "TCGA-OR-A5J2", uniquePatientKey: "TCGA-OR-A5J2", studyId: "acc_tcga", status: true },
-                { x: 0, y: 80, patientId: "TCGA-OR-A5J3", uniquePatientKey: "TCGA-OR-A5J3", studyId: "acc_tcga", status: false },
-                { x: 63.83, y: 53.3333333333333333, patientId: "TCGA-2F-A9KO", uniquePatientKey: "TCGA-2F-A9KO", studyId: "blca_tcga", status: true },
-                { x: 0.13, y: 53.3333333333333333, patientId: "TCGA-2F-A9KP", uniquePatientKey: "TCGA-2F-A9KP", studyId: "blca_tcga", status: false },
-                { x: 182.19, y: 0, patientId: "TCGA-2F-A9KQ", uniquePatientKey: "TCGA-2F-A9KQ", studyId: "blca_tcga", status: true }
-            ]);
+        it('returns correct scatter data for the example data', () => {
+            assert.deepEqual(
+                getScatterData(examplePatientSurvivals, exampleEstimates),
+                [
+                    {
+                        x: 5.09,
+                        y: 100,
+                        patientId: 'TCGA-OR-A5J1',
+                        uniquePatientKey: 'TCGA-OR-A5J1',
+                        studyId: 'acc_tcga',
+                        status: false,
+                    },
+                    {
+                        x: 0.09,
+                        y: 80,
+                        patientId: 'TCGA-OR-A5J2',
+                        uniquePatientKey: 'TCGA-OR-A5J2',
+                        studyId: 'acc_tcga',
+                        status: true,
+                    },
+                    {
+                        x: 0,
+                        y: 80,
+                        patientId: 'TCGA-OR-A5J3',
+                        uniquePatientKey: 'TCGA-OR-A5J3',
+                        studyId: 'acc_tcga',
+                        status: false,
+                    },
+                    {
+                        x: 63.83,
+                        y: 53.3333333333333333,
+                        patientId: 'TCGA-2F-A9KO',
+                        uniquePatientKey: 'TCGA-2F-A9KO',
+                        studyId: 'blca_tcga',
+                        status: true,
+                    },
+                    {
+                        x: 0.13,
+                        y: 53.3333333333333333,
+                        patientId: 'TCGA-2F-A9KP',
+                        uniquePatientKey: 'TCGA-2F-A9KP',
+                        studyId: 'blca_tcga',
+                        status: false,
+                    },
+                    {
+                        x: 182.19,
+                        y: 0,
+                        patientId: 'TCGA-2F-A9KQ',
+                        uniquePatientKey: 'TCGA-2F-A9KQ',
+                        studyId: 'blca_tcga',
+                        status: true,
+                    },
+                ]
+            );
         });
     });
 
-    describe("#getScatterDataWithOpacity()", () => {
-        it("returns empty list for empty list", () => {
+    describe('#getScatterDataWithOpacity()', () => {
+        it('returns empty list for empty list', () => {
             assert.deepEqual(getScatterDataWithOpacity([], []), []);
         });
 
-        it("returns correct scatter data with opacity for the example data", () => {
-            assert.deepEqual(getScatterDataWithOpacity(examplePatientSurvivals, exampleEstimates), [
-                { x: 5.09, y: 100, patientId: "TCGA-OR-A5J1", uniquePatientKey: "TCGA-OR-A5J1", studyId: "acc_tcga", status: false, opacity: 1 },
-                { x: 0.09, y: 80, patientId: "TCGA-OR-A5J2", uniquePatientKey: "TCGA-OR-A5J2", studyId: "acc_tcga", status: true, opacity: 0 },
-                { x: 0, y: 80, patientId: "TCGA-OR-A5J3", uniquePatientKey: "TCGA-OR-A5J3", studyId: "acc_tcga", status: false, opacity: 1 },
-                { x: 63.83, y: 53.3333333333333333, patientId: "TCGA-2F-A9KO", uniquePatientKey: "TCGA-2F-A9KO", studyId: "blca_tcga", status: true, opacity: 0 },
-                { x: 0.13, y: 53.3333333333333333, patientId: "TCGA-2F-A9KP", uniquePatientKey: "TCGA-2F-A9KP", studyId: "blca_tcga", status: false, opacity: 1 },
-                { x: 182.19, y: 0, patientId: "TCGA-2F-A9KQ", uniquePatientKey: "TCGA-2F-A9KQ", studyId: "blca_tcga", status: true, opacity: 0 }
-            ]);
+        it('returns correct scatter data with opacity for the example data', () => {
+            assert.deepEqual(
+                getScatterDataWithOpacity(
+                    examplePatientSurvivals,
+                    exampleEstimates
+                ),
+                [
+                    {
+                        x: 5.09,
+                        y: 100,
+                        patientId: 'TCGA-OR-A5J1',
+                        uniquePatientKey: 'TCGA-OR-A5J1',
+                        studyId: 'acc_tcga',
+                        status: false,
+                        opacity: 1,
+                    },
+                    {
+                        x: 0.09,
+                        y: 80,
+                        patientId: 'TCGA-OR-A5J2',
+                        uniquePatientKey: 'TCGA-OR-A5J2',
+                        studyId: 'acc_tcga',
+                        status: true,
+                        opacity: 0,
+                    },
+                    {
+                        x: 0,
+                        y: 80,
+                        patientId: 'TCGA-OR-A5J3',
+                        uniquePatientKey: 'TCGA-OR-A5J3',
+                        studyId: 'acc_tcga',
+                        status: false,
+                        opacity: 1,
+                    },
+                    {
+                        x: 63.83,
+                        y: 53.3333333333333333,
+                        patientId: 'TCGA-2F-A9KO',
+                        uniquePatientKey: 'TCGA-2F-A9KO',
+                        studyId: 'blca_tcga',
+                        status: true,
+                        opacity: 0,
+                    },
+                    {
+                        x: 0.13,
+                        y: 53.3333333333333333,
+                        patientId: 'TCGA-2F-A9KP',
+                        uniquePatientKey: 'TCGA-2F-A9KP',
+                        studyId: 'blca_tcga',
+                        status: false,
+                        opacity: 1,
+                    },
+                    {
+                        x: 182.19,
+                        y: 0,
+                        patientId: 'TCGA-2F-A9KQ',
+                        uniquePatientKey: 'TCGA-2F-A9KQ',
+                        studyId: 'blca_tcga',
+                        status: true,
+                        opacity: 0,
+                    },
+                ]
+            );
         });
     });
 
-    describe("#getStats()", () => {
-        it("returns [0, 0, \"NA\"] for empty list", () => {
-            assert.deepEqual(getStats([], []), [0, 0, "NA"]);
+    describe('#getStats()', () => {
+        it('returns [0, 0, "NA"] for empty list', () => {
+            assert.deepEqual(getStats([], []), [0, 0, 'NA']);
         });
 
-        it("returns correct stats for the example data", () => {
-            assert.deepEqual(getStats(examplePatientSurvivals, exampleEstimates), [6, 3, "182.19"]);
+        it('returns correct stats for the example data', () => {
+            assert.deepEqual(
+                getStats(examplePatientSurvivals, exampleEstimates),
+                [6, 3, '182.19']
+            );
         });
     });
 
-    describe("#calculateLogRank()", () => {
-        it("returns NaN for empty list", () => {
+    describe('#calculateLogRank()', () => {
+        it('returns NaN for empty list', () => {
             assert.isNaN(calculateLogRank([], []));
         });
 
-        it("returns correct log rank for the example data", () => {
-            assert.equal(calculateLogRank(exampleAlteredPatientSurvivals, exampleUnalteredPatientSurvivals), 0.08326451662523682);
-            assert.equal(calculateLogRank([
-                    {months: 0, status: true, patientId: "", studyId: "", uniquePatientKey: ""}
-                ], [
-                    {months: 0, status: false, patientId: "", studyId: "", uniquePatientKey: ""}
-                ]), 0.31731050786294357);
-            assert.isNaN(calculateLogRank([
-                    {months: 1, status: false, patientId: "", studyId: "", uniquePatientKey: ""}
-                ], [
-                    {months: 2, status: false, patientId: "", studyId: "", uniquePatientKey: ""}
-                ]), "returns NaN if every status is false");
-            assert.equal(calculateLogRank([
-                    {months: 1, status: true, patientId: "", studyId: "", uniquePatientKey: ""},
-                    {months: 2, status: false, patientId: "", studyId: "", uniquePatientKey: ""}
-                ], [
-                    {months: 2, status: false, patientId: "", studyId: "", uniquePatientKey: ""}
-                ]), 0.4795001221869757);
-            assert.equal(calculateLogRank([
-                    {months: 1, status: false, patientId: "", studyId: "", uniquePatientKey: ""},
-                    {months: 2, status: false, patientId: "", studyId: "", uniquePatientKey: ""},
-                    {months: 3, status: false, patientId: "", studyId: "", uniquePatientKey: ""}
-                ], [
-                    {months: 3, status: true, patientId: "", studyId: "", uniquePatientKey: ""},
-                    {months: 2, status: true, patientId: "", studyId: "", uniquePatientKey: ""},
-                    {months: 1, status: true, patientId: "", studyId: "", uniquePatientKey: ""}
-                ]), 0.5637028616507919);
+        it('returns correct log rank for the example data', () => {
+            assert.equal(
+                calculateLogRank(
+                    exampleAlteredPatientSurvivals,
+                    exampleUnalteredPatientSurvivals
+                ),
+                0.08326451662523682
+            );
+            assert.equal(
+                calculateLogRank(
+                    [
+                        {
+                            months: 0,
+                            status: true,
+                            patientId: '',
+                            studyId: '',
+                            uniquePatientKey: '',
+                        },
+                    ],
+                    [
+                        {
+                            months: 0,
+                            status: false,
+                            patientId: '',
+                            studyId: '',
+                            uniquePatientKey: '',
+                        },
+                    ]
+                ),
+                0.31731050786294357
+            );
+            assert.isNaN(
+                calculateLogRank(
+                    [
+                        {
+                            months: 1,
+                            status: false,
+                            patientId: '',
+                            studyId: '',
+                            uniquePatientKey: '',
+                        },
+                    ],
+                    [
+                        {
+                            months: 2,
+                            status: false,
+                            patientId: '',
+                            studyId: '',
+                            uniquePatientKey: '',
+                        },
+                    ]
+                ),
+                'returns NaN if every status is false'
+            );
+            assert.equal(
+                calculateLogRank(
+                    [
+                        {
+                            months: 1,
+                            status: true,
+                            patientId: '',
+                            studyId: '',
+                            uniquePatientKey: '',
+                        },
+                        {
+                            months: 2,
+                            status: false,
+                            patientId: '',
+                            studyId: '',
+                            uniquePatientKey: '',
+                        },
+                    ],
+                    [
+                        {
+                            months: 2,
+                            status: false,
+                            patientId: '',
+                            studyId: '',
+                            uniquePatientKey: '',
+                        },
+                    ]
+                ),
+                0.4795001221869757
+            );
+            assert.equal(
+                calculateLogRank(
+                    [
+                        {
+                            months: 1,
+                            status: false,
+                            patientId: '',
+                            studyId: '',
+                            uniquePatientKey: '',
+                        },
+                        {
+                            months: 2,
+                            status: false,
+                            patientId: '',
+                            studyId: '',
+                            uniquePatientKey: '',
+                        },
+                        {
+                            months: 3,
+                            status: false,
+                            patientId: '',
+                            studyId: '',
+                            uniquePatientKey: '',
+                        },
+                    ],
+                    [
+                        {
+                            months: 3,
+                            status: true,
+                            patientId: '',
+                            studyId: '',
+                            uniquePatientKey: '',
+                        },
+                        {
+                            months: 2,
+                            status: true,
+                            patientId: '',
+                            studyId: '',
+                            uniquePatientKey: '',
+                        },
+                        {
+                            months: 1,
+                            status: true,
+                            patientId: '',
+                            studyId: '',
+                            uniquePatientKey: '',
+                        },
+                    ]
+                ),
+                0.5637028616507919
+            );
         });
     });
 
-    describe("#getDownloadContent()", () => {
-        it("returns correct download content for the example data", () => {
+    describe('#getDownloadContent()', () => {
+        it('returns correct download content for the example data', () => {
             const data = [];
             data.push({
-                scatterData: getScatterData(exampleAlteredPatientSurvivals, exampleAlteredEstimates),
-                title:"test_altered_title"
+                scatterData: getScatterData(
+                    exampleAlteredPatientSurvivals,
+                    exampleAlteredEstimates
+                ),
+                title: 'test_altered_title',
             });
             data.push({
-                scatterData:getScatterData(exampleUnalteredPatientSurvivals, exampleUnalteredEstimates),
-                title:"test_unaltered_title"
+                scatterData: getScatterData(
+                    exampleUnalteredPatientSurvivals,
+                    exampleUnalteredEstimates
+                ),
+                title: 'test_unaltered_title',
             });
 
-            const targetDownloadContent = "test_main_title\n\ntest_altered_title\nCase ID\tStudy ID\t" +
-                "Number at Risk\tStatus\tSurvival Rate\tTime (months)\nTCGA-OR-A5J1\tacc_tcga\t2\tcensored\t1\t5.09\nTCGA-OR-A5J2\tacc_tcga\t1\t" +
-                "deceased\t0.8\t0.09\n\ntest_unaltered_title\nCase ID\tStudy ID\tNumber at Risk\tStatus\tSurvival Rate\tTime (months)\nTCGA-OR-A5J3\t" +
-                "acc_tcga\t4\tcensored\t0.8\t0\nTCGA-2F-A9KO\tblca_tcga\t3\tdeceased\t0.5333333333333333\t63.83\nTCGA-2F-A9KP\tblca_tcga\t2\tcensored\t" +
-                "0.5333333333333333\t0.13\nTCGA-2F-A9KQ\tblca_tcga\t1\tdeceased\t0\t182.19";
-
-            assert.equal(getDownloadContent(data, "test_main_title"), targetDownloadContent);
+            const targetDownloadContent =
+                'test_main_title\n\ntest_altered_title\nCase ID\tStudy ID\t' +
+                'Number at Risk\tStatus\tSurvival Rate\tTime (months)\nTCGA-OR-A5J1\tacc_tcga\t2\tcensored\t1\t5.09\nTCGA-OR-A5J2\tacc_tcga\t1\t' +
+                'deceased\t0.8\t0.09\n\ntest_unaltered_title\nCase ID\tStudy ID\tNumber at Risk\tStatus\tSurvival Rate\tTime (months)\nTCGA-OR-A5J3\t' +
+                'acc_tcga\t4\tcensored\t0.8\t0\nTCGA-2F-A9KO\tblca_tcga\t3\tdeceased\t0.5333333333333333\t63.83\nTCGA-2F-A9KP\tblca_tcga\t2\tcensored\t' +
+                '0.5333333333333333\t0.13\nTCGA-2F-A9KQ\tblca_tcga\t1\tdeceased\t0\t182.19';
+
+            assert.equal(
+                getDownloadContent(data, 'test_main_title'),
+                targetDownloadContent
+            );
         });
     });
 
-    describe("#convertScatterDataToDownloadData()", () => {
-        it("returns empty list for empty list", () => {
-            assert.deepEqual(convertScatterDataToDownloadData(getScatterData([], [])), []);
+    describe('#convertScatterDataToDownloadData()', () => {
+        it('returns empty list for empty list', () => {
+            assert.deepEqual(
+                convertScatterDataToDownloadData(getScatterData([], [])),
+                []
+            );
         });
 
-        it("returns correct download data for the example data", () => {
-            assert.deepEqual(convertScatterDataToDownloadData(getScatterData(examplePatientSurvivals, exampleEstimates)), [
-                { "Time (months)": 5.09, "Survival Rate": 1, "Case ID": "TCGA-OR-A5J1", "Study ID": "acc_tcga", "Status": "censored", "Number at Risk": 6 },
-                { "Time (months)": 0.09, "Survival Rate": 0.8, "Case ID": "TCGA-OR-A5J2", "Study ID": "acc_tcga", "Status": "deceased", "Number at Risk": 5 },
-                { "Time (months)": 0, "Survival Rate": 0.8, "Case ID": "TCGA-OR-A5J3", "Study ID": "acc_tcga", "Status": "censored", "Number at Risk": 4 },
-                { "Time (months)": 63.83, "Survival Rate": 0.5333333333333333, "Case ID": "TCGA-2F-A9KO", "Study ID": "blca_tcga", "Status": "deceased", "Number at Risk": 3 },
-                { "Time (months)": 0.13, "Survival Rate": 0.5333333333333333, "Case ID": "TCGA-2F-A9KP", "Study ID": "blca_tcga", "Status": "censored", "Number at Risk": 2 },
-                { "Time (months)": 182.19, "Survival Rate": 0, "Case ID": "TCGA-2F-A9KQ", "Study ID": "blca_tcga", "Status": "deceased", "Number at Risk": 1 }
-            ]);
+        it('returns correct download data for the example data', () => {
+            assert.deepEqual(
+                convertScatterDataToDownloadData(
+                    getScatterData(examplePatientSurvivals, exampleEstimates)
+                ),
+                [
+                    {
+                        'Time (months)': 5.09,
+                        'Survival Rate': 1,
+                        'Case ID': 'TCGA-OR-A5J1',
+                        'Study ID': 'acc_tcga',
+                        Status: 'censored',
+                        'Number at Risk': 6,
+                    },
+                    {
+                        'Time (months)': 0.09,
+                        'Survival Rate': 0.8,
+                        'Case ID': 'TCGA-OR-A5J2',
+                        'Study ID': 'acc_tcga',
+                        Status: 'deceased',
+                        'Number at Risk': 5,
+                    },
+                    {
+                        'Time (months)': 0,
+                        'Survival Rate': 0.8,
+                        'Case ID': 'TCGA-OR-A5J3',
+                        'Study ID': 'acc_tcga',
+                        Status: 'censored',
+                        'Number at Risk': 4,
+                    },
+                    {
+                        'Time (months)': 63.83,
+                        'Survival Rate': 0.5333333333333333,
+                        'Case ID': 'TCGA-2F-A9KO',
+                        'Study ID': 'blca_tcga',
+                        Status: 'deceased',
+                        'Number at Risk': 3,
+                    },
+                    {
+                        'Time (months)': 0.13,
+                        'Survival Rate': 0.5333333333333333,
+                        'Case ID': 'TCGA-2F-A9KP',
+                        'Study ID': 'blca_tcga',
+                        Status: 'censored',
+                        'Number at Risk': 2,
+                    },
+                    {
+                        'Time (months)': 182.19,
+                        'Survival Rate': 0,
+                        'Case ID': 'TCGA-2F-A9KQ',
+                        'Study ID': 'blca_tcga',
+                        Status: 'deceased',
+                        'Number at Risk': 1,
+                    },
+                ]
+            );
         });
     });
 
-    describe("#downSampling()", () => {
-        it("return empty list for empty list", () => {
-            assert.deepEqual(downSampling([], {
-                xDenominator: 100,
-                yDenominator: 100,
-                threshold: 100
-            }), []);
+    describe('#downSampling()', () => {
+        it('return empty list for empty list', () => {
+            assert.deepEqual(
+                downSampling([], {
+                    xDenominator: 100,
+                    yDenominator: 100,
+                    threshold: 100,
+                }),
+                []
+            );
         });
 
-        it("when any denominator is 0, return the full data", () => {
+        it('when any denominator is 0, return the full data', () => {
             let opts = {
                 xDenominator: 0,
                 yDenominator: 100,
-                threshold: 100
+                threshold: 100,
             };
-            assert.deepEqual(downSampling(allScatterData, opts), allScatterData);
+            assert.deepEqual(
+                downSampling(allScatterData, opts),
+                allScatterData
+            );
         });
 
-        it("when any denominator is negative value, return the full data", () => {
+        it('when any denominator is negative value, return the full data', () => {
             let opts = {
                 xDenominator: -1,
                 yDenominator: 100,
-                threshold: 100
+                threshold: 100,
             };
-            assert.deepEqual(downSampling(allScatterData, opts), allScatterData);
+            assert.deepEqual(
+                downSampling(allScatterData, opts),
+                allScatterData
+            );
         });
 
-        it("Remove the dot which too close from the last dot", () => {
+        it('Remove the dot which too close from the last dot', () => {
             // In this case, the hypotenuse is always 1, keep the threshold at 2.5
-            assert.deepEqual(downSampling([{
-                x: 0,
-                y: 10,
-                opacity: 1,
-                patientId: '',
-                uniquePatientKey: '',
-                studyId: '',
-                status: true
-            },{
-                x: 2,
-                y: 10,
-                opacity: 1,
-                patientId: '',
-                uniquePatientKey: '',
-                studyId: '',
-                status: true
-            },{
-                x: 10,
-                y: 10,
-                opacity: 1,
-                patientId: '',
-                uniquePatientKey: '',
-                studyId: '',
-                status: true
-            }], {
-                xDenominator: 4,
-                yDenominator: 4,
-                threshold: 100
-            }), [{
-                x: 0,
-                y: 10,
-                patientId: '',
-                uniquePatientKey: '',
-                studyId: '',
-                opacity: 1,
-                status: true
-            },{
-                x: 10,
-                y: 10,
-                opacity: 1,
-                patientId: '',
-                uniquePatientKey: '',
-                studyId: '',
-                status: true
-            }]);
+            assert.deepEqual(
+                downSampling(
+                    [
+                        {
+                            x: 0,
+                            y: 10,
+                            opacity: 1,
+                            patientId: '',
+                            uniquePatientKey: '',
+                            studyId: '',
+                            status: true,
+                        },
+                        {
+                            x: 2,
+                            y: 10,
+                            opacity: 1,
+                            patientId: '',
+                            uniquePatientKey: '',
+                            studyId: '',
+                            status: true,
+                        },
+                        {
+                            x: 10,
+                            y: 10,
+                            opacity: 1,
+                            patientId: '',
+                            uniquePatientKey: '',
+                            studyId: '',
+                            status: true,
+                        },
+                    ],
+                    {
+                        xDenominator: 4,
+                        yDenominator: 4,
+                        threshold: 100,
+                    }
+                ),
+                [
+                    {
+                        x: 0,
+                        y: 10,
+                        patientId: '',
+                        uniquePatientKey: '',
+                        studyId: '',
+                        opacity: 1,
+                        status: true,
+                    },
+                    {
+                        x: 10,
+                        y: 10,
+                        opacity: 1,
+                        patientId: '',
+                        uniquePatientKey: '',
+                        studyId: '',
+                        status: true,
+                    },
+                ]
+            );
         });
 
-        it("Remove the dot which too close from the last dot, ignore the status", () => {
+        it('Remove the dot which too close from the last dot, ignore the status', () => {
             // In this case, the hypotenuse is always 1, keep the threshold at 2.5
-            assert.deepEqual(downSampling([{
-                x: 0,
-                y: 10,
-                opacity: 1,
-                patientId: '',
-                uniquePatientKey: '',
-                studyId: '',
-                status: true
-            },{
-                x: 2,
-                y: 10,
-                opacity: 0,
-                patientId: '',
-                uniquePatientKey: '',
-                studyId: '',
-                status: false
-            },{
-                x: 10,
-                y: 10,
-                opacity: 1,
-                patientId: '',
-                uniquePatientKey: '',
-                studyId: '',
-                status: true
-            }], {
-                threshold: 100,
-                xDenominator: 4,
-                yDenominator: 4
-            }), [{
-                x: 0,
-                y: 10,
-                opacity: 1,
-                patientId: '',
-                uniquePatientKey: '',
-                studyId: '',
-                status: true
-            },{
-                x: 10,
-                y: 10,
-                opacity: 1,
-                patientId: '',
-                uniquePatientKey: '',
-                studyId: '',
-                status: true
-            }]);
+            assert.deepEqual(
+                downSampling(
+                    [
+                        {
+                            x: 0,
+                            y: 10,
+                            opacity: 1,
+                            patientId: '',
+                            uniquePatientKey: '',
+                            studyId: '',
+                            status: true,
+                        },
+                        {
+                            x: 2,
+                            y: 10,
+                            opacity: 0,
+                            patientId: '',
+                            uniquePatientKey: '',
+                            studyId: '',
+                            status: false,
+                        },
+                        {
+                            x: 10,
+                            y: 10,
+                            opacity: 1,
+                            patientId: '',
+                            uniquePatientKey: '',
+                            studyId: '',
+                            status: true,
+                        },
+                    ],
+                    {
+                        threshold: 100,
+                        xDenominator: 4,
+                        yDenominator: 4,
+                    }
+                ),
+                [
+                    {
+                        x: 0,
+                        y: 10,
+                        opacity: 1,
+                        patientId: '',
+                        uniquePatientKey: '',
+                        studyId: '',
+                        status: true,
+                    },
+                    {
+                        x: 10,
+                        y: 10,
+                        opacity: 1,
+                        patientId: '',
+                        uniquePatientKey: '',
+                        studyId: '',
+                        status: true,
+                    },
+                ]
+            );
         });
 
-        it("Remove the dot when the distance from last dot equals to the threshold", () => {
+        it('Remove the dot when the distance from last dot equals to the threshold', () => {
             // In this case, the hypotenuse is always 1, keep the threshold at 2
-            assert.deepEqual(downSampling([{
-                x: 0,
-                y: 10,
-                opacity: 1,
-                patientId: '',
-                uniquePatientKey: '',
-                studyId: '',
-                status: true
-            },{
-                x: 2,
-                y: 10,
-                opacity: 1,
-                patientId: '',
-                uniquePatientKey: '',
-                studyId: '',
-                status: true
-            },{
-                x: 10,
-                y: 10,
-                opacity: 1,
-                patientId: '',
-                uniquePatientKey: '',
-                studyId: '',
-                status: true
-            }], {
-                threshold: 100,
-                xDenominator: 5,
-                yDenominator: 5
-            }), [{
-                x: 0,
-                y: 10,
-                opacity: 1,
-                patientId: '',
-                uniquePatientKey: '',
-                studyId: '',
-                status: true
-            },{
-                x: 10,
-                y: 10,
-                opacity: 1,
-                patientId: '',
-                uniquePatientKey: '',
-                studyId: '',
-                status: true
-            }]);
+            assert.deepEqual(
+                downSampling(
+                    [
+                        {
+                            x: 0,
+                            y: 10,
+                            opacity: 1,
+                            patientId: '',
+                            uniquePatientKey: '',
+                            studyId: '',
+                            status: true,
+                        },
+                        {
+                            x: 2,
+                            y: 10,
+                            opacity: 1,
+                            patientId: '',
+                            uniquePatientKey: '',
+                            studyId: '',
+                            status: true,
+                        },
+                        {
+                            x: 10,
+                            y: 10,
+                            opacity: 1,
+                            patientId: '',
+                            uniquePatientKey: '',
+                            studyId: '',
+                            status: true,
+                        },
+                    ],
+                    {
+                        threshold: 100,
+                        xDenominator: 5,
+                        yDenominator: 5,
+                    }
+                ),
+                [
+                    {
+                        x: 0,
+                        y: 10,
+                        opacity: 1,
+                        patientId: '',
+                        uniquePatientKey: '',
+                        studyId: '',
+                        status: true,
+                    },
+                    {
+                        x: 10,
+                        y: 10,
+                        opacity: 1,
+                        patientId: '',
+                        uniquePatientKey: '',
+                        studyId: '',
+                        status: true,
+                    },
+                ]
+            );
         });
 
-        it("when a hidden dot between two visualized dots, the distance between two vis dots should be calculated separately from the hidden dot", () => {
+        it('when a hidden dot between two visualized dots, the distance between two vis dots should be calculated separately from the hidden dot', () => {
             // In this case, the hypotenuse is always 1, keep the threshold at 1.25
-            assert.deepEqual(downSampling([{
-                x: 0,
-                y: 10,
-                opacity: 1,
-                patientId: '',
-                uniquePatientKey: '',
-                studyId: '',
-                status: true
-            },{
-                x: 1,
-                y: 10,
-                opacity: 0,
-                patientId: '',
-                uniquePatientKey: '',
-                studyId: '',
-                status: false
-            },{
-                x: 2,
-                y: 10,
-                opacity: 1,
-                patientId: '',
-                uniquePatientKey: '',
-                studyId: '',
-                status: true
-            },{
-                x: 10,
-                y: 10,
-                opacity: 1,
-                patientId: '',
-                uniquePatientKey: '',
-                studyId: '',
-                status: true
-            }], {
-                threshold: 100,
-                xDenominator: 8,
-                yDenominator: 8
-            }), [{
-                x: 0,
-                y: 10,
-                opacity: 1,
-                patientId: '',
-                uniquePatientKey: '',
-                studyId: '',
-                status: true
-            },{
-                x: 2,
-                y: 10,
-                opacity: 1,
-                patientId: '',
-                uniquePatientKey: '',
-                studyId: '',
-                status: true
-            },{
-                x: 10,
-                y: 10,
-                opacity: 1,
-                patientId: '',
-                uniquePatientKey: '',
-                studyId: '',
-                status: true
-            }]);
+            assert.deepEqual(
+                downSampling(
+                    [
+                        {
+                            x: 0,
+                            y: 10,
+                            opacity: 1,
+                            patientId: '',
+                            uniquePatientKey: '',
+                            studyId: '',
+                            status: true,
+                        },
+                        {
+                            x: 1,
+                            y: 10,
+                            opacity: 0,
+                            patientId: '',
+                            uniquePatientKey: '',
+                            studyId: '',
+                            status: false,
+                        },
+                        {
+                            x: 2,
+                            y: 10,
+                            opacity: 1,
+                            patientId: '',
+                            uniquePatientKey: '',
+                            studyId: '',
+                            status: true,
+                        },
+                        {
+                            x: 10,
+                            y: 10,
+                            opacity: 1,
+                            patientId: '',
+                            uniquePatientKey: '',
+                            studyId: '',
+                            status: true,
+                        },
+                    ],
+                    {
+                        threshold: 100,
+                        xDenominator: 8,
+                        yDenominator: 8,
+                    }
+                ),
+                [
+                    {
+                        x: 0,
+                        y: 10,
+                        opacity: 1,
+                        patientId: '',
+                        uniquePatientKey: '',
+                        studyId: '',
+                        status: true,
+                    },
+                    {
+                        x: 2,
+                        y: 10,
+                        opacity: 1,
+                        patientId: '',
+                        uniquePatientKey: '',
+                        studyId: '',
+                        status: true,
+                    },
+                    {
+                        x: 10,
+                        y: 10,
+                        opacity: 1,
+                        patientId: '',
+                        uniquePatientKey: '',
+                        studyId: '',
+                        status: true,
+                    },
+                ]
+            );
         });
     });
 
-    describe("filterScatterData()", () => {
-        it("Return full data if the filers are undefined", () => {
+    describe('filterScatterData()', () => {
+        it('Return full data if the filers are undefined', () => {
             let testData = {
                 altered: {
                     numOfCases: allScatterData.length,
                     line: [],
                     scatter: allScatterData,
-                    scatterWithOpacity: allScatterData
-                }
+                    scatterWithOpacity: allScatterData,
+                },
             };
-            assert.deepEqual(filterScatterData(testData, undefined, {
-                xDenominator: 100,
-                yDenominator: 100,
-                threshold: 100
-            }), testData);
+            assert.deepEqual(
+                filterScatterData(testData, undefined, {
+                    xDenominator: 100,
+                    yDenominator: 100,
+                    threshold: 100,
+                }),
+                testData
+            );
         });
 
-        it("return correct data after filtering and down sampling", () => {
-            let testScatterData = [{
-                x: 0,
-                y: 10,
-                patientId: '',
-                uniquePatientKey: '',
-                studyId: '',
-                status: true
-            }, {
-                x: 0.5,
-                y: 9,
-                patientId: '',
-                uniquePatientKey: '',
-                studyId: '',
-                status: true
-            }, {
-                x: 1,
-                y: 8,
-                patientId: '',
-                uniquePatientKey: '',
-                studyId: '',
-                status: true
-            }];
+        it('return correct data after filtering and down sampling', () => {
+            let testScatterData = [
+                {
+                    x: 0,
+                    y: 10,
+                    patientId: '',
+                    uniquePatientKey: '',
+                    studyId: '',
+                    status: true,
+                },
+                {
+                    x: 0.5,
+                    y: 9,
+                    patientId: '',
+                    uniquePatientKey: '',
+                    studyId: '',
+                    status: true,
+                },
+                {
+                    x: 1,
+                    y: 8,
+                    patientId: '',
+                    uniquePatientKey: '',
+                    studyId: '',
+                    status: true,
+                },
+            ];
             let testData = {
                 altered: {
                     numOfCases: testScatterData.length,
                     line: [],
                     scatter: testScatterData,
-                    scatterWithOpacity: testScatterData
-                }
+                    scatterWithOpacity: testScatterData,
+                },
             };
-            var result = filterScatterData(testData, {x: [0, 10], y: [9, 10]}, {
-                xDenominator: 2,
-                yDenominator: 2,
-                threshold: 2
-            });
+            var result = filterScatterData(
+                testData,
+                { x: [0, 10], y: [9, 10] },
+                {
+                    xDenominator: 2,
+                    yDenominator: 2,
+                    threshold: 2,
+                }
+            );
             assert.deepEqual(result.altered.numOfCases, 2);
             assert.deepEqual(result.altered.scatter[1], {
                 x: 0.5,
@@ -570,7 +930,7 @@ describe("SurvivalUtil", () => {
                 patientId: '',
                 uniquePatientKey: '',
                 studyId: '',
-                status: true
+                status: true,
             });
         });
     });
diff --git a/src/pages/resultsView/survival/SurvivalUtil.tsx b/src/pages/resultsView/survival/SurvivalUtil.tsx
index b8f45815cc4..7e39cfd73ed 100644
--- a/src/pages/resultsView/survival/SurvivalUtil.tsx
+++ b/src/pages/resultsView/survival/SurvivalUtil.tsx
@@ -1,43 +1,42 @@
-import {PatientSurvival} from "../../../shared/model/PatientSurvival";
-import {tsvFormat} from 'd3-dsv';
+import { PatientSurvival } from '../../../shared/model/PatientSurvival';
+import { tsvFormat } from 'd3-dsv';
 import jStat from 'jStat';
 import * as _ from 'lodash';
 
 export type ScatterData = {
-    x: number,
-    y: number,
-    patientId: string,
-    uniquePatientKey:string,
-    studyId: string,
-    status: boolean,
-    opacity?: number,
-    group?:string
-}
+    x: number;
+    y: number;
+    patientId: string;
+    uniquePatientKey: string;
+    studyId: string;
+    status: boolean;
+    opacity?: number;
+    group?: string;
+};
 
 export type DownSamplingOpts = {
-    xDenominator: number,
-    yDenominator: number,
-    threshold: number
-}
+    xDenominator: number;
+    yDenominator: number;
+    threshold: number;
+};
 
 export type GroupedScatterData = {
-    [key: string]: SurvivalCurveData
-}
+    [key: string]: SurvivalCurveData;
+};
 
 export type SurvivalCurveData = {
-    numOfCases: number,
-    line: any[],
-    scatterWithOpacity: ScatterData[],
-    scatter: ScatterData[]
-}
+    numOfCases: number;
+    line: any[];
+    scatterWithOpacity: ScatterData[];
+    scatter: ScatterData[];
+};
 
 export type SurvivalPlotFilters = {
-    x: [number, number],
-    y: [number, number]
-}
+    x: [number, number];
+    y: [number, number];
+};
 
 export function getEstimates(patientSurvivals: PatientSurvival[]): number[] {
-
     let estimates: number[] = [];
     let previousEstimate: number = 1;
     patientSurvivals.forEach((patientSurvival, index) => {
@@ -53,9 +52,11 @@ export function getEstimates(patientSurvivals: PatientSurvival[]): number[] {
     return estimates;
 }
 
-export function getMedian(patientSurvivals: PatientSurvival[], estimates: number[]): string {
-
-    let median: string = "NA";
+export function getMedian(
+    patientSurvivals: PatientSurvival[],
+    estimates: number[]
+): string {
+    let median: string = 'NA';
     for (let i = 0; i < estimates.length; i++) {
         if (estimates[i] <= 0.5) {
             median = patientSurvivals[i].months.toString();
@@ -65,26 +66,36 @@ export function getMedian(patientSurvivals: PatientSurvival[], estimates: number
     return median;
 }
 
-export function getLineData(patientSurvivals: PatientSurvival[], estimates: number[]): any[] {
-
+export function getLineData(
+    patientSurvivals: PatientSurvival[],
+    estimates: number[]
+): any[] {
     let chartData: any[] = [];
 
     chartData.push({ x: 0, y: 100 });
     patientSurvivals.forEach((patientSurvival, index) => {
-        chartData.push({ x: patientSurvival.months, y: estimates[index] * 100 })
+        chartData.push({
+            x: patientSurvival.months,
+            y: estimates[index] * 100,
+        });
     });
 
     return chartData;
 }
 
-export function getScatterData(patientSurvivals: PatientSurvival[], estimates: number[], group?:string): ScatterData[] {
-
+export function getScatterData(
+    patientSurvivals: PatientSurvival[],
+    estimates: number[],
+    group?: string
+): ScatterData[] {
     return patientSurvivals.map((patientSurvival, index) => {
-        const ret:ScatterData = {
-            x: patientSurvival.months, y: estimates[index] * 100,
-            patientId: patientSurvival.patientId, studyId: patientSurvival.studyId,
+        const ret: ScatterData = {
+            x: patientSurvival.months,
+            y: estimates[index] * 100,
+            patientId: patientSurvival.patientId,
+            studyId: patientSurvival.studyId,
             uniquePatientKey: patientSurvival.uniquePatientKey,
-            status: patientSurvival.status
+            status: patientSurvival.status,
         };
         if (group) {
             ret.group = group;
@@ -93,8 +104,11 @@ export function getScatterData(patientSurvivals: PatientSurvival[], estimates: n
     });
 }
 
-export function getScatterDataWithOpacity(patientSurvivals: PatientSurvival[], estimates: number[], group?:string): any[] {
-
+export function getScatterDataWithOpacity(
+    patientSurvivals: PatientSurvival[],
+    estimates: number[],
+    group?: string
+): any[] {
     let scatterData = getScatterData(patientSurvivals, estimates, group);
     let chartData: any[] = [];
     let previousEstimate: number;
@@ -112,70 +126,95 @@ export function getScatterDataWithOpacity(patientSurvivals: PatientSurvival[], e
     return chartData;
 }
 
-export function getStats(patientSurvivals?: PatientSurvival[], estimates?: number[]): [number, number, string] {
+export function getStats(
+    patientSurvivals?: PatientSurvival[],
+    estimates?: number[]
+): [number, number, string] {
     if (patientSurvivals && estimates) {
-        return [patientSurvivals.length,
-        patientSurvivals.filter(patientSurvival => patientSurvival.status === true).length,
-        getMedian(patientSurvivals, estimates)];
+        return [
+            patientSurvivals.length,
+            patientSurvivals.filter(
+                patientSurvival => patientSurvival.status === true
+            ).length,
+            getMedian(patientSurvivals, estimates),
+        ];
     } else {
-        return [0, 0, "N/A"];
+        return [0, 0, 'N/A'];
     }
 }
 
-export function calculateLogRank(alteredPatientSurvivals: PatientSurvival[],
-    unalteredPatientSurvivals: PatientSurvival[]): number {
-
+export function calculateLogRank(
+    alteredPatientSurvivals: PatientSurvival[],
+    unalteredPatientSurvivals: PatientSurvival[]
+): number {
     let alteredIndex = 0;
     let unalteredIndex = 0;
     let totalAlteredNumberOfFailure = 0;
     let totalExpectation = 0;
     let totalVariance = 0;
 
-    while (alteredIndex < alteredPatientSurvivals.length && unalteredIndex < unalteredPatientSurvivals.length) {
-
+    while (
+        alteredIndex < alteredPatientSurvivals.length &&
+        unalteredIndex < unalteredPatientSurvivals.length
+    ) {
         let alteredNumberOfFailure = 0;
         let unalteredNumberOfFailure = 0;
         const alteredAtRisk = alteredPatientSurvivals.length - alteredIndex;
-        const unalteredAtRisk = unalteredPatientSurvivals.length - unalteredIndex;
+        const unalteredAtRisk =
+            unalteredPatientSurvivals.length - unalteredIndex;
         const alteredPatientSurvival = alteredPatientSurvivals[alteredIndex];
-        const unalteredPatientSurvival = unalteredPatientSurvivals[unalteredIndex];
+        const unalteredPatientSurvival =
+            unalteredPatientSurvivals[unalteredIndex];
 
-        if (alteredPatientSurvival.months < unalteredPatientSurvival.months ||
-            alteredPatientSurvival.months === unalteredPatientSurvival.months) {
+        if (
+            alteredPatientSurvival.months < unalteredPatientSurvival.months ||
+            alteredPatientSurvival.months === unalteredPatientSurvival.months
+        ) {
             if (alteredPatientSurvival.status) {
                 alteredNumberOfFailure = 1;
             }
             alteredIndex += 1;
         }
 
-        if (alteredPatientSurvival.months > unalteredPatientSurvival.months ||
-            alteredPatientSurvival.months === unalteredPatientSurvival.months) {
+        if (
+            alteredPatientSurvival.months > unalteredPatientSurvival.months ||
+            alteredPatientSurvival.months === unalteredPatientSurvival.months
+        ) {
             if (unalteredPatientSurvival.status) {
                 unalteredNumberOfFailure = 1;
             }
             unalteredIndex += 1;
         }
 
-        const numberOfFailures = alteredNumberOfFailure + unalteredNumberOfFailure;
+        const numberOfFailures =
+            alteredNumberOfFailure + unalteredNumberOfFailure;
         const atRisk = alteredAtRisk + unalteredAtRisk;
-        const expectation = (alteredAtRisk / (atRisk)) * (numberOfFailures);
-        const variance = (numberOfFailures * (atRisk - numberOfFailures) * alteredAtRisk * unalteredAtRisk) /
-            ((atRisk * atRisk) * (atRisk - 1));
+        const expectation = (alteredAtRisk / atRisk) * numberOfFailures;
+        const variance =
+            (numberOfFailures *
+                (atRisk - numberOfFailures) *
+                alteredAtRisk *
+                unalteredAtRisk) /
+            (atRisk * atRisk * (atRisk - 1));
 
         totalAlteredNumberOfFailure += alteredNumberOfFailure;
         totalExpectation += expectation;
         totalVariance += variance;
     }
 
-    const chiSquareScore = (totalAlteredNumberOfFailure - totalExpectation) *
-        (totalAlteredNumberOfFailure - totalExpectation) / totalVariance;
+    const chiSquareScore =
+        ((totalAlteredNumberOfFailure - totalExpectation) *
+            (totalAlteredNumberOfFailure - totalExpectation)) /
+        totalVariance;
 
     return 1 - jStat.chisquare.cdf(chiSquareScore, 1);
 }
 
-export function getDownloadContent(data:{ scatterData: ScatterData[], title:string}[], mainTitle:string):string {
-
-    let content: string = mainTitle;// + '\n\n';// + alteredTitle + '\n';
+export function getDownloadContent(
+    data: { scatterData: ScatterData[]; title: string }[],
+    mainTitle: string
+): string {
+    let content: string = mainTitle; // + '\n\n';// + alteredTitle + '\n';
     for (const d of data) {
         content += '\n\n';
         content += d.title;
@@ -186,15 +225,18 @@ export function getDownloadContent(data:{ scatterData: ScatterData[], title:stri
 }
 
 export function convertScatterDataToDownloadData(patientData: any[]): any[] {
-
     const downloadData: any[] = [];
 
     patientData.map((datum, index) => {
         downloadData.push({
-            "Case ID": datum.patientId, "Study ID": datum.studyId, "Number at Risk": patientData.length - index,
-            "Status": datum.status ? "deceased" : "censored", "Survival Rate": datum.y / 100, "Time (months)": datum.x
+            'Case ID': datum.patientId,
+            'Study ID': datum.studyId,
+            'Number at Risk': patientData.length - index,
+            Status: datum.status ? 'deceased' : 'censored',
+            'Survival Rate': datum.y / 100,
+            'Time (months)': datum.x,
         });
-    })
+    });
 
     return downloadData;
 }
@@ -205,30 +247,35 @@ export function convertScatterDataToDownloadData(patientData: any[]): any[] {
  * @param {DownSampling} opts
  * @returns {ScatterData[]}
  */
-export function downSampling(data: ScatterData[], opts: DownSamplingOpts): ScatterData[] {
+export function downSampling(
+    data: ScatterData[],
+    opts: DownSamplingOpts
+): ScatterData[] {
     let xMax = _.maxBy(data, 'x');
     let xMin = _.minBy(data, 'x');
 
     let yMax = _.maxBy(data, 'y');
     let yMin = _.minBy(data, 'y');
 
-    if (opts.xDenominator <= 0 || opts.yDenominator <= 0)
-        return data;
+    if (opts.xDenominator <= 0 || opts.yDenominator <= 0) return data;
 
-    let timeThreshold = ((xMax ? xMax.x : 0) - (xMin ? xMin.x : 0)) / opts.xDenominator;
-    let survivalRateThreshold = ((yMax ? yMax.y : 0) - (yMin ? yMin.y : 0)) / opts.yDenominator;
+    let timeThreshold =
+        ((xMax ? xMax.x : 0) - (xMin ? xMin.x : 0)) / opts.xDenominator;
+    let survivalRateThreshold =
+        ((yMax ? yMax.y : 0) - (yMin ? yMin.y : 0)) / opts.yDenominator;
     let averageThreshold = Math.hypot(timeThreshold, survivalRateThreshold);
     let lastVisibleDataPoint = {
         x: 0,
-        y: 0
+        y: 0,
     };
     let lastDataPoint = {
         x: 0,
-        y: 0
+        y: 0,
     };
 
-    return data.filter(function (dataItem, index) {
-        let isVisibleDot = _.isUndefined(dataItem.opacity) || dataItem.opacity > 0;
+    return data.filter(function(dataItem, index) {
+        let isVisibleDot =
+            _.isUndefined(dataItem.opacity) || dataItem.opacity > 0;
         if (index == 0) {
             lastDataPoint.x = dataItem.x;
             lastDataPoint.y = dataItem.y;
@@ -238,9 +285,15 @@ export function downSampling(data: ScatterData[], opts: DownSamplingOpts): Scatt
         }
         let distance = 0;
         if (isVisibleDot) {
-            distance = Math.hypot(dataItem.x - lastVisibleDataPoint.x, dataItem.y - lastVisibleDataPoint.y)
+            distance = Math.hypot(
+                dataItem.x - lastVisibleDataPoint.x,
+                dataItem.y - lastVisibleDataPoint.y
+            );
         } else {
-            distance = Math.hypot(dataItem.x - lastDataPoint.x, dataItem.y - lastDataPoint.y);
+            distance = Math.hypot(
+                dataItem.x - lastDataPoint.x,
+                dataItem.y - lastDataPoint.y
+            );
         }
         if (distance > averageThreshold) {
             lastDataPoint.x = dataItem.x;
@@ -256,39 +309,56 @@ export function downSampling(data: ScatterData[], opts: DownSamplingOpts): Scatt
     });
 }
 
-export function filterScatterData(allScatterData: GroupedScatterData, filters: SurvivalPlotFilters | undefined, downSamplingOpts: DownSamplingOpts):GroupedScatterData {
+export function filterScatterData(
+    allScatterData: GroupedScatterData,
+    filters: SurvivalPlotFilters | undefined,
+    downSamplingOpts: DownSamplingOpts
+): GroupedScatterData {
     let filteredData = _.cloneDeep(allScatterData);
-    _.forEach(filteredData, (value:SurvivalCurveData) => {
+    _.forEach(filteredData, (value: SurvivalCurveData) => {
         if (value.numOfCases > downSamplingOpts.threshold) {
             if (filters) {
-                value.scatter = value.scatter.filter((_val) => filterBasedOnCoordinates(filters, _val));
-                value.scatterWithOpacity = value.scatterWithOpacity.filter((_val) => filterBasedOnCoordinates(filters, _val));
+                value.scatter = value.scatter.filter(_val =>
+                    filterBasedOnCoordinates(filters, _val)
+                );
+                value.scatterWithOpacity = value.scatterWithOpacity.filter(
+                    _val => filterBasedOnCoordinates(filters, _val)
+                );
             }
             value.scatter = downSampling(value.scatter, downSamplingOpts);
-            value.scatterWithOpacity = downSampling(value.scatterWithOpacity, downSamplingOpts);
+            value.scatterWithOpacity = downSampling(
+                value.scatterWithOpacity,
+                downSamplingOpts
+            );
             value.numOfCases = value.scatter.length;
         }
     });
     return filteredData;
 }
 
-function filterBasedOnCoordinates(filters: SurvivalPlotFilters, _val:ScatterData) {
-    if (_val.x <= filters.x[1] && _val.x >= filters.x[0]
-        && _val.y <= filters.y[1] && _val.y >= filters.y[0]) {
+function filterBasedOnCoordinates(
+    filters: SurvivalPlotFilters,
+    _val: ScatterData
+) {
+    if (
+        _val.x <= filters.x[1] &&
+        _val.x >= filters.x[0] &&
+        _val.y <= filters.y[1] &&
+        _val.y >= filters.y[0]
+    ) {
         return true;
     }
     return false;
 }
 
-
-export const ALTERED_GROUP_VALUE = "Altered";
-export const UNALTERED_GROUP_VALUE = "Unaltered";
+export const ALTERED_GROUP_VALUE = 'Altered';
+export const UNALTERED_GROUP_VALUE = 'Unaltered';
 
 export function getSurvivalChartDataByAlteredStatus(
-    alteredSurvivals:PatientSurvival[],
-    unalteredSurvivals:PatientSurvival[]
+    alteredSurvivals: PatientSurvival[],
+    unalteredSurvivals: PatientSurvival[]
 ) {
-    const patientToAnalysisGroups:{[patientKey:string]:string[]} = {};
+    const patientToAnalysisGroups: { [patientKey: string]: string[] } = {};
     for (const s of alteredSurvivals) {
         patientToAnalysisGroups[s.uniquePatientKey] = [ALTERED_GROUP_VALUE];
     }
@@ -297,6 +367,6 @@ export function getSurvivalChartDataByAlteredStatus(
     }
     return {
         patientSurvivals: alteredSurvivals.concat(unalteredSurvivals),
-        patientToAnalysisGroups
+        patientToAnalysisGroups,
     };
-}
\ No newline at end of file
+}
diff --git a/src/pages/resultsView/survival/styles.module.scss b/src/pages/resultsView/survival/styles.module.scss
index a118f5157f5..5ec7740b698 100644
--- a/src/pages/resultsView/survival/styles.module.scss
+++ b/src/pages/resultsView/survival/styles.module.scss
@@ -1,40 +1,40 @@
 .SurvivalTable {
-  margin: 30px auto;
-  width: 70%;
+    margin: 30px auto;
+    width: 70%;
 }
 
 .SurvivalTable table {
-  border-collapse: collapse !important;
+    border-collapse: collapse !important;
 }
 
 .SurvivalTable td {
-  border: 1px solid black;
-  padding: 0 10px;
-  text-align: center;
-  font-size: 12px;
-  background-color: #f8f8f8;
-  white-space: nowrap;
+    border: 1px solid black;
+    padding: 0 10px;
+    text-align: center;
+    font-size: 12px;
+    background-color: #f8f8f8;
+    white-space: nowrap;
 }
 
 .Tooltip {
-  div {
-    font-size: 12px;
-  }
-  max-width:none !important; //override bootstrap
-  white-space: nowrap;
+    div {
+        font-size: 12px;
+    }
+    max-width: none !important; //override bootstrap
+    white-space: nowrap;
 }
 
 .NotAvailable {
-  font-size: 18px;
-  text-align: center;
-  margin: 20px 0;
+    font-size: 18px;
+    text-align: center;
+    margin: 20px 0;
 }
 
 .XmaxNumberInput {
-  margin-right: 5px;
-  cursor: auto !important;
-  border: 1px inset;
-  height: 18px;
-  padding: 0 5px 0 5px;
-  display: inline-block;
-}
\ No newline at end of file
+    margin-right: 5px;
+    cursor: auto !important;
+    border: 1px inset;
+    height: 18px;
+    padding: 0 5px 0 5px;
+    display: inline-block;
+}
diff --git a/src/pages/resultsView/survival/styles.scss b/src/pages/resultsView/survival/styles.scss
index 140a0731906..be86c6b6bbc 100644
--- a/src/pages/resultsView/survival/styles.scss
+++ b/src/pages/resultsView/survival/styles.scss
@@ -3,19 +3,27 @@
     margin-left: 10px;
     margin-right: 10px;
     .rangeslider {
-      margin: 0;
-      .rangeslider__handle {
-        height:10px;
-        width:10px;
-        &:after {
-            display:none;
+        margin: 0;
+        .rangeslider__handle {
+            height: 10px;
+            width: 10px;
+            &:after {
+                display: none;
+            }
+        }
+        .rangeslider__fill {
+            background-image: -webkit-linear-gradient(
+                top,
+                #89cdef 0,
+                #81bfde 100%
+            );
+            background-image: -o-linear-gradient(top, #89cdef 0, #81bfde 100%);
+            background-image: linear-gradient(
+                to bottom,
+                #89cdef 0,
+                #81bfde 100%
+            );
+            background-repeat: repeat-x;
         }
-      }
-      .rangeslider__fill {
-        background-image: -webkit-linear-gradient(top,#89cdef 0,#81bfde 100%);
-        background-image: -o-linear-gradient(top,#89cdef 0,#81bfde 100%);
-        background-image: linear-gradient(to bottom,#89cdef 0,#81bfde 100%);
-        background-repeat: repeat-x;
-      }
     }
-  }
+}
diff --git a/src/pages/staticPages/aboutus/AboutUs.tsx b/src/pages/staticPages/aboutus/AboutUs.tsx
index fecf0eb07df..cd9632dae16 100644
--- a/src/pages/staticPages/aboutus/AboutUs.tsx
+++ b/src/pages/staticPages/aboutus/AboutUs.tsx
@@ -1,23 +1,22 @@
 import * as React from 'react';
-import {PageLayout} from "../../../shared/components/PageLayout/PageLayout";
+import { PageLayout } from '../../../shared/components/PageLayout/PageLayout';
 import './styles.scss';
-import AppConfig from "appConfig";
-import StaticContent from "../../../shared/components/staticContent/StaticContent";
-import Helmet from "react-helmet";
+import AppConfig from 'appConfig';
+import StaticContent from '../../../shared/components/staticContent/StaticContent';
+import Helmet from 'react-helmet';
 
 export default class AboutUs extends React.Component<{}, {}> {
-
     public render() {
-        return <PageLayout className={'whiteBackground staticPage'}>
-            <Helmet>
-                <title>{'cBioPortal for Cancer Genomics::About Us'}</title>
-            </Helmet>
-            <StaticContent sourceUrl={AppConfig.serverConfig.skin_documentation_about!} title={"About Us"}/>
-        </PageLayout>
+        return (
+            <PageLayout className={'whiteBackground staticPage'}>
+                <Helmet>
+                    <title>{'cBioPortal for Cancer Genomics::About Us'}</title>
+                </Helmet>
+                <StaticContent
+                    sourceUrl={AppConfig.serverConfig.skin_documentation_about!}
+                    title={'About Us'}
+                />
+            </PageLayout>
+        );
     }
-
 }
-
-
-
-
diff --git a/src/pages/staticPages/aboutus/styles.scss b/src/pages/staticPages/aboutus/styles.scss
index 3f026401078..6d3b132051a 100644
--- a/src/pages/staticPages/aboutus/styles.scss
+++ b/src/pages/staticPages/aboutus/styles.scss
@@ -1,5 +1,5 @@
 .commandDocumentation {
-  table {
-    margin-bottom:30px !important;
-  }
-}
\ No newline at end of file
+    table {
+        margin-bottom: 30px !important;
+    }
+}
diff --git a/src/pages/staticPages/datasetView/DatasetList.spec.tsx b/src/pages/staticPages/datasetView/DatasetList.spec.tsx
index 248a70942ed..cf392d6ab00 100644
--- a/src/pages/staticPages/datasetView/DatasetList.spec.tsx
+++ b/src/pages/staticPages/datasetView/DatasetList.spec.tsx
@@ -5,17 +5,9 @@ import { shallow, mount } from 'enzyme';
 import sinon from 'sinon';
 
 describe('DatasetList', () => {
+    before(() => {});
 
-    before(()=>{
-
-    });
-
-    after(()=>{
-
-    });
-
-    it('what does it do?', ()=>{
-
-    });
+    after(() => {});
 
+    it('what does it do?', () => {});
 });
diff --git a/src/pages/staticPages/datasetView/DatasetList.tsx b/src/pages/staticPages/datasetView/DatasetList.tsx
index 8ddd60033d6..f834993ff38 100644
--- a/src/pages/staticPages/datasetView/DatasetList.tsx
+++ b/src/pages/staticPages/datasetView/DatasetList.tsx
@@ -1,14 +1,13 @@
-import * as React from "react";
+import * as React from 'react';
 import * as _ from 'lodash';
-import {CancerStudy} from 'shared/api/generated/CBioPortalAPI';
-import {ThreeBounce} from 'better-react-spinkit';
+import { CancerStudy } from 'shared/api/generated/CBioPortalAPI';
+import { ThreeBounce } from 'better-react-spinkit';
 import request from 'superagent';
-import LazyMobXTable from "shared/components/lazyMobXTable/LazyMobXTable";
-import {getStudyDownloadListUrl} from "../../../shared/api/urls";
-import {getNCBIlink} from "cbioportal-frontend-commons";
-import {StudyLink} from "../../../shared/components/StudyLink/StudyLink";
-import {StudyDataDownloadLink} from "../../../shared/components/StudyDataDownloadLink/StudyDataDownloadLink";
-
+import LazyMobXTable from 'shared/components/lazyMobXTable/LazyMobXTable';
+import { getStudyDownloadListUrl } from '../../../shared/api/urls';
+import { getNCBIlink } from 'cbioportal-frontend-commons';
+import { StudyLink } from '../../../shared/components/StudyLink/StudyLink';
+import { StudyDataDownloadLink } from '../../../shared/components/StudyDataDownloadLink/StudyDataDownloadLink';
 
 interface IDataTableRow {
     name: string;
@@ -47,147 +46,200 @@ interface IReferenceCellProps {
     pmid: string;
 }
 
-class DataTable extends LazyMobXTable<IDataTableRow> {
-}
-
-class CancerStudyCell extends React.Component<ICancerStudyCellProps,{}> {
+class DataTable extends LazyMobXTable<IDataTableRow> {}
 
+class CancerStudyCell extends React.Component<ICancerStudyCellProps, {}> {
     render() {
         return (
-            <StudyLink studyId={this.props.studyId}>{this.props.name}</StudyLink>
+            <StudyLink studyId={this.props.studyId}>
+                {this.props.name}
+            </StudyLink>
         );
-
     }
-
 }
 
-class ReferenceCell extends React.Component<IReferenceCellProps ,{}> {
-
+class ReferenceCell extends React.Component<IReferenceCellProps, {}> {
     render() {
         return (
-            <a target='_blank'
-               href={getNCBIlink(`/pubmed/${this.props.pmid}`)}> {this.props.citation} </a>
+            <a target="_blank" href={getNCBIlink(`/pubmed/${this.props.pmid}`)}>
+                {' '}
+                {this.props.citation}{' '}
+            </a>
         );
-
     }
-
 }
 
-export default class DataSetsPageTable extends React.Component <IDataSetsTableProps, IDataSetsTableState> {
+export default class DataSetsPageTable extends React.Component<
+    IDataSetsTableProps,
+    IDataSetsTableState
+> {
+    chartTarget: HTMLElement;
 
-    chartTarget:HTMLElement;
-
-    constructor(props:IDataSetsTableProps) {
+    constructor(props: IDataSetsTableProps) {
         super(props);
 
         this.state = {
-            downloadable: []
+            downloadable: [],
         };
-
     }
 
     componentDidMount() {
-
-        request(getStudyDownloadListUrl()).then(
-            (response:any)=> this.setState({downloadable:response.body})
+        request(getStudyDownloadListUrl()).then((response: any) =>
+            this.setState({ downloadable: response.body })
         );
-
     }
 
-
-
     render() {
-
         if (this.props.datasets) {
-
-            const tableData: IDataTableRow[] = _.map(this.props.datasets, (study: CancerStudy) => ({
-                name: study.name,
-                reference: study.citation,
-                all: study.allSampleCount || "",
-                pmid: study.pmid,
-                studyId: study.studyId,
-                sequenced: study.sequencedSampleCount || "",
-                cna: study.cnaSampleCount,
-                citation: study.citation || "",
-                mrnaRnaSeq: study.mrnaRnaSeqSampleCount || "",
-                mrnaRnaSeqV2: study.mrnaRnaSeqV2SampleCount || "",
-                mrnaMicroarray: study.mrnaMicroarraySampleCount || "",
-                miRna: study.miRnaSampleCount || "",
-                methylation: study.methylationHm27SampleCount || "",
-                rppa: study.rppaSampleCount || "",
-                complete: study.completeSampleCount || ""
-            }));
+            const tableData: IDataTableRow[] = _.map(
+                this.props.datasets,
+                (study: CancerStudy) => ({
+                    name: study.name,
+                    reference: study.citation,
+                    all: study.allSampleCount || '',
+                    pmid: study.pmid,
+                    studyId: study.studyId,
+                    sequenced: study.sequencedSampleCount || '',
+                    cna: study.cnaSampleCount,
+                    citation: study.citation || '',
+                    mrnaRnaSeq: study.mrnaRnaSeqSampleCount || '',
+                    mrnaRnaSeqV2: study.mrnaRnaSeqV2SampleCount || '',
+                    mrnaMicroarray: study.mrnaMicroarraySampleCount || '',
+                    miRna: study.miRnaSampleCount || '',
+                    methylation: study.methylationHm27SampleCount || '',
+                    rppa: study.rppaSampleCount || '',
+                    complete: study.completeSampleCount || '',
+                })
+            );
             return (
-                <div ref={(el:HTMLDivElement) => this.chartTarget = el}>
+                <div ref={(el: HTMLDivElement) => (this.chartTarget = el)}>
                     <DataTable
                         data={tableData}
-                        columns={
-                            [
-                                {
-                                    name:'Name',
-                                    type: 'name',
-                                    render:(data:IDataTableRow)=> <CancerStudyCell studyId={data.studyId} name={data.name}/>,
-                                    filter:(data:any, filterString:string, filterStringUpper:string) => {
-                                        return data.name.toUpperCase().includes(filterStringUpper);
-                                     }
-
+                        columns={[
+                            {
+                                name: 'Name',
+                                type: 'name',
+                                render: (data: IDataTableRow) => (
+                                    <CancerStudyCell
+                                        studyId={data.studyId}
+                                        name={data.name}
+                                    />
+                                ),
+                                filter: (
+                                    data: any,
+                                    filterString: string,
+                                    filterStringUpper: string
+                                ) => {
+                                    return data.name
+                                        .toUpperCase()
+                                        .includes(filterStringUpper);
                                 },
-                                {
-                                    name: '', sortBy: false, togglable: false, download: false, type: 'download',
-                                    render: (data: IDataTableRow) => {
-                                        const studyIsDownloadable = this.state.downloadable.includes(data.studyId);
-                                        if (studyIsDownloadable) {
-                                            return <StudyDataDownloadLink studyId={data.studyId}/>;
-                                        } else {
-                                            return null;
-                                        }
+                            },
+                            {
+                                name: '',
+                                sortBy: false,
+                                togglable: false,
+                                download: false,
+                                type: 'download',
+                                render: (data: IDataTableRow) => {
+                                    const studyIsDownloadable = this.state.downloadable.includes(
+                                        data.studyId
+                                    );
+                                    if (studyIsDownloadable) {
+                                        return (
+                                            <StudyDataDownloadLink
+                                                studyId={data.studyId}
+                                            />
+                                        );
+                                    } else {
+                                        return null;
                                     }
                                 },
-                                {
-                                    name: 'Reference',
-                                    type: 'citation', render:(data:IDataTableRow)=><ReferenceCell pmid={data.pmid} citation={data.citation}/>,
-                                     filter:(data:any, filterString:string, filterStringUpper:string) => {
-                                        return data.citation.toUpperCase().includes(filterStringUpper);
-                                     }
-
+                            },
+                            {
+                                name: 'Reference',
+                                type: 'citation',
+                                render: (data: IDataTableRow) => (
+                                    <ReferenceCell
+                                        pmid={data.pmid}
+                                        citation={data.citation}
+                                    />
+                                ),
+                                filter: (
+                                    data: any,
+                                    filterString: string,
+                                    filterStringUpper: string
+                                ) => {
+                                    return data.citation
+                                        .toUpperCase()
+                                        .includes(filterStringUpper);
                                 },
-                                {name:'All', type: 'all'},
-                                {name:'Sequenced', type: 'sequenced'},
-                                {name:'CNA', type: 'cna'},
-                                {
-                                    name:'RNA-Seq',
-                                    type: 'mrnaRnaSeq',
-                                    render: (data:IDataTableRow) => {
-                                        return (
-                                            <span>
-                                                {Number(data.mrnaRnaSeqV2) || Number(data.mrnaRnaSeq) || 0}
-                                            </span>
-                                        );
-                                    },
-                                    sortBy: (data:IDataTableRow) =>
-                                        Number(data.mrnaRnaSeqV2) || Number(data.mrnaRnaSeq) || 0
+                            },
+                            { name: 'All', type: 'all' },
+                            { name: 'Sequenced', type: 'sequenced' },
+                            { name: 'CNA', type: 'cna' },
+                            {
+                                name: 'RNA-Seq',
+                                type: 'mrnaRnaSeq',
+                                render: (data: IDataTableRow) => {
+                                    return (
+                                        <span>
+                                            {Number(data.mrnaRnaSeqV2) ||
+                                                Number(data.mrnaRnaSeq) ||
+                                                0}
+                                        </span>
+                                    );
                                 },
-                                {name:'Tumor mRNA (microarray)', type: 'mrnaMicroarray', visible:false},
-                                {name:'Tumor miRNA', type: 'miRna', visible:false },
-                                {name:'Methylation (HM27)', type: 'methylation', visible:false },
-                                {name:'RPPA', type: 'rppa', visible:false },
-                                {name:'Complete', type: 'complete', visible:false },
-                            ].map((column:any) => (
-                                {
-                                    visible:(column.visible === false) ? false : true,
-                                    togglable:(column.togglable === false) ? false : true,
-                                    name: column.name,
-                                    defaultSortDirection:'asc' as 'asc',
-                                    sortBy: (column.hasOwnProperty('sortBy')) ? column.sortBy : ((data:any)=>(data[column.type])),
-                                    render: column.hasOwnProperty('render') ? column.render : (data:any) => {
-                                        const style = {};// {textAlign: 'center', width: '100%', display: 'block'}
-                                        return <span style={style}>{data[column.type] || 0}</span>;
-                                    },
-                                    download: column.hasOwnProperty('download') ? column.download : false,
-                                    filter: column.filter || undefined
-                                }
-                            ))
-                        }
+                                sortBy: (data: IDataTableRow) =>
+                                    Number(data.mrnaRnaSeqV2) ||
+                                    Number(data.mrnaRnaSeq) ||
+                                    0,
+                            },
+                            {
+                                name: 'Tumor mRNA (microarray)',
+                                type: 'mrnaMicroarray',
+                                visible: false,
+                            },
+                            {
+                                name: 'Tumor miRNA',
+                                type: 'miRna',
+                                visible: false,
+                            },
+                            {
+                                name: 'Methylation (HM27)',
+                                type: 'methylation',
+                                visible: false,
+                            },
+                            { name: 'RPPA', type: 'rppa', visible: false },
+                            {
+                                name: 'Complete',
+                                type: 'complete',
+                                visible: false,
+                            },
+                        ].map((column: any) => ({
+                            visible: column.visible === false ? false : true,
+                            togglable:
+                                column.togglable === false ? false : true,
+                            name: column.name,
+                            defaultSortDirection: 'asc' as 'asc',
+                            sortBy: column.hasOwnProperty('sortBy')
+                                ? column.sortBy
+                                : (data: any) => data[column.type],
+                            render: column.hasOwnProperty('render')
+                                ? column.render
+                                : (data: any) => {
+                                      const style = {}; // {textAlign: 'center', width: '100%', display: 'block'}
+                                      return (
+                                          <span style={style}>
+                                              {data[column.type] || 0}
+                                          </span>
+                                      );
+                                  },
+                            download: column.hasOwnProperty('download')
+                                ? column.download
+                                : false,
+                            filter: column.filter || undefined,
+                        }))}
                         initialSortColumn={'Name'}
                         initialSortDirection={'asc'}
                         showPagination={false}
@@ -198,12 +250,12 @@ export default class DataSetsPageTable extends React.Component <IDataSetsTablePr
                     />
                 </div>
             );
-
         } else {
-            return <div><ThreeBounce/></div>;
+            return (
+                <div>
+                    <ThreeBounce />
+                </div>
+            );
         }
     }
-
 }
-
-
diff --git a/src/pages/staticPages/datasetView/DatasetPage.spec.tsx b/src/pages/staticPages/datasetView/DatasetPage.spec.tsx
index 2ee384d5234..525bda1b443 100644
--- a/src/pages/staticPages/datasetView/DatasetPage.spec.tsx
+++ b/src/pages/staticPages/datasetView/DatasetPage.spec.tsx
@@ -5,17 +5,9 @@ import { shallow, mount } from 'enzyme';
 import sinon from 'sinon';
 
 describe('DatasetPage', () => {
+    before(() => {});
 
-    before(()=>{
-
-    });
-
-    after(()=>{
-
-    });
-
-    it('what does it do?', ()=>{
-
-    });
+    after(() => {});
 
+    it('what does it do?', () => {});
 });
diff --git a/src/pages/staticPages/datasetView/DatasetPage.tsx b/src/pages/staticPages/datasetView/DatasetPage.tsx
index 0a34e1e64a0..5c719488450 100644
--- a/src/pages/staticPages/datasetView/DatasetPage.tsx
+++ b/src/pages/staticPages/datasetView/DatasetPage.tsx
@@ -1,68 +1,82 @@
 import * as React from 'react';
 import * as _ from 'lodash';
 import DatasetList from './DatasetList';
-import {observer} from 'mobx-react';
-import client from "shared/api/cbioportalClientInstance";
-import {remoteData} from "cbioportal-frontend-commons";
-import AppConfig from "appConfig";
+import { observer } from 'mobx-react';
+import client from 'shared/api/cbioportalClientInstance';
+import { remoteData } from 'cbioportal-frontend-commons';
+import AppConfig from 'appConfig';
 import styles from './styles.module.scss';
-import {PageLayout} from "../../../shared/components/PageLayout/PageLayout";
-import LoadingIndicator from "shared/components/loadingIndicator/LoadingIndicator";
-import Helmet from "react-helmet";
+import { PageLayout } from '../../../shared/components/PageLayout/PageLayout';
+import LoadingIndicator from 'shared/components/loadingIndicator/LoadingIndicator';
+import Helmet from 'react-helmet';
 
 export class DatasetPageStore {
-
     readonly data = remoteData({
         invoke: () => {
-            return client.getAllStudiesUsingGET({projection: "DETAILED"});
-
-        }
+            return client.getAllStudiesUsingGET({ projection: 'DETAILED' });
+        },
     });
 }
 
 @observer
 export default class DatasetPage extends React.Component<{}, {}> {
+    private store: DatasetPageStore;
 
-    private store:DatasetPageStore;
-
-    constructor(props:any) {
+    constructor(props: any) {
         super(props);
         this.store = new DatasetPageStore();
     }
 
     public render() {
-
-        const header:JSX.Element|null = !_.isEmpty(AppConfig.serverConfig.skin_data_sets_header) ? <p style={{marginBottom:"20px"}} dangerouslySetInnerHTML={{__html: AppConfig.serverConfig.skin_data_sets_header!}}></p> : null;
-        const footer:JSX.Element|null = !_.isEmpty(AppConfig.serverConfig.skin_data_sets_footer) ? <p style={{marginTop:"20px"}} dangerouslySetInnerHTML={{__html: AppConfig.serverConfig.skin_data_sets_footer!}}></p> : null;
-
-        return <PageLayout className={"whiteBackground"}>
-            <div className={styles.dataSets}>
-
-                <Helmet>
-                    <title>{'cBioPortal for Cancer Genomics::Datasets'}</title>
-                </Helmet>
-
-                <h1>Datasets</h1>
-
-                {
-                    (this.store.data.isComplete) && (
-
+        const header: JSX.Element | null = !_.isEmpty(
+            AppConfig.serverConfig.skin_data_sets_header
+        ) ? (
+            <p
+                style={{ marginBottom: '20px' }}
+                dangerouslySetInnerHTML={{
+                    __html: AppConfig.serverConfig.skin_data_sets_header!,
+                }}
+            ></p>
+        ) : null;
+        const footer: JSX.Element | null = !_.isEmpty(
+            AppConfig.serverConfig.skin_data_sets_footer
+        ) ? (
+            <p
+                style={{ marginTop: '20px' }}
+                dangerouslySetInnerHTML={{
+                    __html: AppConfig.serverConfig.skin_data_sets_footer!,
+                }}
+            ></p>
+        ) : null;
+
+        return (
+            <PageLayout className={'whiteBackground'}>
+                <div className={styles.dataSets}>
+                    <Helmet>
+                        <title>
+                            {'cBioPortal for Cancer Genomics::Datasets'}
+                        </title>
+                    </Helmet>
+
+                    <h1>Datasets</h1>
+
+                    {this.store.data.isComplete && (
                         <div className={styles.dataSets}>
                             {header}
-                            <DatasetList datasets={this.store.data.result}/>
+                            <DatasetList datasets={this.store.data.result} />
                             {footer}
                         </div>
-                    )
-                }
-
-                {
-                    (this.store.data.isPending) && (
-                        <LoadingIndicator isLoading={true} size={"big"} center={true}></LoadingIndicator>
-                    )
-                }
-
-            </div>
-        </PageLayout>
-
+                    )}
+
+                    {this.store.data.isPending && (
+                        <LoadingIndicator
+                            isLoading={true}
+                            size={'big'}
+                            center={true}
+                        ></LoadingIndicator>
+                    )}
+                </div>
+            </PageLayout>
+        );
     }
 }
diff --git a/src/pages/staticPages/datasetView/styles.module.scss b/src/pages/staticPages/datasetView/styles.module.scss
index 78905627ac4..3289e6a6b27 100644
--- a/src/pages/staticPages/datasetView/styles.module.scss
+++ b/src/pages/staticPages/datasetView/styles.module.scss
@@ -1,7 +1,7 @@
 .dataSets {
-  :global(.tableMainToolbar) {
-    :global(.tableFilter) {
-      float: left !important;
+    :global(.tableMainToolbar) {
+        :global(.tableFilter) {
+            float: left !important;
+        }
     }
-  }
 }
diff --git a/src/pages/staticPages/faq/FAQ.tsx b/src/pages/staticPages/faq/FAQ.tsx
index 972a7af1e63..b66a4cb9212 100644
--- a/src/pages/staticPages/faq/FAQ.tsx
+++ b/src/pages/staticPages/faq/FAQ.tsx
@@ -1,50 +1,61 @@
 import * as React from 'react';
-import {PageLayout} from "../../../shared/components/PageLayout/PageLayout";
-import AppConfig from "appConfig";
-import StaticContent from "../../../shared/components/staticContent/StaticContent";
-import Helmet from "react-helmet";
+import { PageLayout } from '../../../shared/components/PageLayout/PageLayout';
+import AppConfig from 'appConfig';
+import StaticContent from '../../../shared/components/staticContent/StaticContent';
+import Helmet from 'react-helmet';
 import './styles.scss';
-import {computed} from "mobx";
+import { computed } from 'mobx';
 
-class Heading extends React.Component<{ level:number },{}>{
-    render(){
+class Heading extends React.Component<{ level: number }, {}> {
+    render() {
         const CustomTag = `h${this.props.level}` as any;
         const firstChild: string = (this.props.children as any[])[0] as string;
-        const text:string = (firstChild && typeof firstChild === 'string') ? firstChild : "";
+        const text: string =
+            firstChild && typeof firstChild === 'string' ? firstChild : '';
 
         // this transformation is to match headers to internal anchors (#) produced by markdown renderer
         // unfortunately, we rely on the text of the headers matching the text of urls in the markdown
         // replace spaces with dash, kill all non-word chars (but leave dashes!)
-        const id = text.toLowerCase().replace(/\s/g,'-').replace(/[\W]/g,(c)=>(/-/.test(c) ? c : ""));
-        const topLink = this.props.level > 1 ? <a href="#pageTop" title={"Return to top"}><i className={"fa fa-arrow-circle-up"}></i></a> : "";
-
-        return <CustomTag id={id}>{text} {topLink}</CustomTag>
+        const id = text
+            .toLowerCase()
+            .replace(/\s/g, '-')
+            .replace(/[\W]/g, c => (/-/.test(c) ? c : ''));
+        const topLink =
+            this.props.level > 1 ? (
+                <a href="#pageTop" title={'Return to top'}>
+                    <i className={'fa fa-arrow-circle-up'}></i>
+                </a>
+            ) : (
+                ''
+            );
+
+        return (
+            <CustomTag id={id}>
+                {text} {topLink}
+            </CustomTag>
+        );
     }
 }
 
 const renderers = {
-    heading:Heading
+    heading: Heading,
 };
 
 export default class FAQ extends React.Component<{}, {}> {
-
-
     public render() {
-
-        return <PageLayout className={'whiteBackground staticPage faqPage'}>
-
-            <Helmet>
-                <title>{'cBioPortal for Cancer Genomics::FAQ'}</title>
-            </Helmet>
-
-            <a id="pageTop" />
-            <StaticContent sourceUrl={AppConfig.serverConfig.skin_documentation_faq!} title={"FAQs"} renderers={renderers} />
-
-        </PageLayout>
+        return (
+            <PageLayout className={'whiteBackground staticPage faqPage'}>
+                <Helmet>
+                    <title>{'cBioPortal for Cancer Genomics::FAQ'}</title>
+                </Helmet>
+
+                <a id="pageTop" />
+                <StaticContent
+                    sourceUrl={AppConfig.serverConfig.skin_documentation_faq!}
+                    title={'FAQs'}
+                    renderers={renderers}
+                />
+            </PageLayout>
+        );
     }
-
 }
-
-
-
-
diff --git a/src/pages/staticPages/faq/styles.scss b/src/pages/staticPages/faq/styles.scss
index 4b1e4550d79..b6c91f2141e 100644
--- a/src/pages/staticPages/faq/styles.scss
+++ b/src/pages/staticPages/faq/styles.scss
@@ -1,10 +1,9 @@
 .faqPage {
-  h3:nth-child(n+1) {
-    margin-top:60px;
-  }
-
-  h2:nth-child(n+1) {
-    padding-top:60px;
-  }
+    h3:nth-child(n + 1) {
+        margin-top: 60px;
+    }
 
+    h2:nth-child(n + 1) {
+        padding-top: 60px;
+    }
 }
diff --git a/src/pages/staticPages/news/News.tsx b/src/pages/staticPages/news/News.tsx
index 6c75da95109..195d0537ef9 100644
--- a/src/pages/staticPages/news/News.tsx
+++ b/src/pages/staticPages/news/News.tsx
@@ -1,29 +1,28 @@
 import * as React from 'react';
-import {PageLayout} from "../../../shared/components/PageLayout/PageLayout";
-import AppConfig from "appConfig";
-import StaticContent from "../../../shared/components/staticContent/StaticContent";
+import { PageLayout } from '../../../shared/components/PageLayout/PageLayout';
+import AppConfig from 'appConfig';
+import StaticContent from '../../../shared/components/staticContent/StaticContent';
 import './styles.scss';
-import Helmet from "react-helmet";
+import Helmet from 'react-helmet';
 
 export default class News extends React.Component<{}, {}> {
-
     public render() {
-        return <PageLayout className={'whiteBackground staticPage newsPage'}>
-            <Helmet>
-                <title>{'cBioPortal for Cancer Genomics::News'}</title>
-            </Helmet>
-            <StaticContent sourceUrl={AppConfig.serverConfig.skin_documentation_news!} title={"News"}/>
-            <a
-                id="releasesLink"
-                href="https://github.com/cBioPortal/cbioportal/releases"
-            >
-                Release notes
-            </a>
-        </PageLayout>
+        return (
+            <PageLayout className={'whiteBackground staticPage newsPage'}>
+                <Helmet>
+                    <title>{'cBioPortal for Cancer Genomics::News'}</title>
+                </Helmet>
+                <StaticContent
+                    sourceUrl={AppConfig.serverConfig.skin_documentation_news!}
+                    title={'News'}
+                />
+                <a
+                    id="releasesLink"
+                    href="https://github.com/cBioPortal/cbioportal/releases"
+                >
+                    Release notes
+                </a>
+            </PageLayout>
+        );
     }
-
 }
-
-
-
-
diff --git a/src/pages/staticPages/news/styles.scss b/src/pages/staticPages/news/styles.scss
index 4ace2641874..c07f37772d2 100644
--- a/src/pages/staticPages/news/styles.scss
+++ b/src/pages/staticPages/news/styles.scss
@@ -1,26 +1,25 @@
 .newsPage {
-  #mainColumn {
-    li {
-      margin-bottom:5px;
-      img {
-        @extend .framedImage;
-      }
-      ul {
-        margin-top:5px;
-      }
-    }
+    #mainColumn {
+        li {
+            margin-bottom: 5px;
+            img {
+                @extend .framedImage;
+            }
+            ul {
+                margin-top: 5px;
+            }
+        }
 
-    #releasesLink {
-      position: absolute;
-      right: 20px;
-      top: 80px;
+        #releasesLink {
+            position: absolute;
+            right: 20px;
+            top: 80px;
+        }
     }
-  }
-
 
-  .markdown-body {
-    img {
-      max-width: 800px;
+    .markdown-body {
+        img {
+            max-width: 800px;
+        }
     }
-  }
 }
diff --git a/src/pages/staticPages/oql/OQL.tsx b/src/pages/staticPages/oql/OQL.tsx
index 636fd403459..76cd7bc0768 100644
--- a/src/pages/staticPages/oql/OQL.tsx
+++ b/src/pages/staticPages/oql/OQL.tsx
@@ -1,23 +1,21 @@
 import * as React from 'react';
-import {PageLayout} from "../../../shared/components/PageLayout/PageLayout";
-import AppConfig from "appConfig";
-import StaticContent from "../../../shared/components/staticContent/StaticContent";
+import { PageLayout } from '../../../shared/components/PageLayout/PageLayout';
+import AppConfig from 'appConfig';
+import StaticContent from '../../../shared/components/staticContent/StaticContent';
 import './styles.scss';
-import Helmet from "react-helmet";
+import Helmet from 'react-helmet';
 
 export default class OQL extends React.Component<{}, {}> {
-
     public render() {
-        return <PageLayout className={'whiteBackground staticPage'}>
-            <Helmet>
-                <title>{'cBioPortal for Cancer Genomics::OQL Guide'}</title>
-            </Helmet>
-            <StaticContent sourceUrl={AppConfig.serverConfig.skin_documentation_oql!} />
-        </PageLayout>
+        return (
+            <PageLayout className={'whiteBackground staticPage'}>
+                <Helmet>
+                    <title>{'cBioPortal for Cancer Genomics::OQL Guide'}</title>
+                </Helmet>
+                <StaticContent
+                    sourceUrl={AppConfig.serverConfig.skin_documentation_oql!}
+                />
+            </PageLayout>
+        );
     }
-
 }
-
-
-
-
diff --git a/src/pages/staticPages/rmatlab/RMatLAB.tsx b/src/pages/staticPages/rmatlab/RMatLAB.tsx
index 993759b0dc1..ef1544d479d 100644
--- a/src/pages/staticPages/rmatlab/RMatLAB.tsx
+++ b/src/pages/staticPages/rmatlab/RMatLAB.tsx
@@ -1,22 +1,18 @@
 import * as React from 'react';
-import {PageLayout} from "../../../shared/components/PageLayout/PageLayout";
-import Helmet from "react-helmet";
-import StaticContent from "shared/components/staticContent/StaticContent";
+import { PageLayout } from '../../../shared/components/PageLayout/PageLayout';
+import Helmet from 'react-helmet';
+import StaticContent from 'shared/components/staticContent/StaticContent';
 
 export default class CGDS extends React.Component<{}, {}> {
-//
+    //
     public render() {
-
-        return <PageLayout className={'whiteBackground staticPage'}>
-            <Helmet>
-                <title>{'cBioPortal for Cancer Genomics::R/MATLAB'}</title>
-            </Helmet>
-            <StaticContent sourceUrl={"RMatlab.md"} title={"R/Matlab"} />
-        </PageLayout>;
+        return (
+            <PageLayout className={'whiteBackground staticPage'}>
+                <Helmet>
+                    <title>{'cBioPortal for Cancer Genomics::R/MATLAB'}</title>
+                </Helmet>
+                <StaticContent sourceUrl={'RMatlab.md'} title={'R/Matlab'} />
+            </PageLayout>
+        );
     }
-
 }
-
-
-
-
diff --git a/src/pages/staticPages/rmatlab/styles.scss b/src/pages/staticPages/rmatlab/styles.scss
index 3f026401078..6d3b132051a 100644
--- a/src/pages/staticPages/rmatlab/styles.scss
+++ b/src/pages/staticPages/rmatlab/styles.scss
@@ -1,5 +1,5 @@
 .commandDocumentation {
-  table {
-    margin-bottom:30px !important;
-  }
-}
\ No newline at end of file
+    table {
+        margin-bottom: 30px !important;
+    }
+}
diff --git a/src/pages/staticPages/testimonialsPage/TestimonialsPage.tsx b/src/pages/staticPages/testimonialsPage/TestimonialsPage.tsx
index ab917bac063..7de48d3bdad 100644
--- a/src/pages/staticPages/testimonialsPage/TestimonialsPage.tsx
+++ b/src/pages/staticPages/testimonialsPage/TestimonialsPage.tsx
@@ -1,45 +1,46 @@
 import * as React from 'react';
 
-import {observer} from "mobx-react";
+import { observer } from 'mobx-react';
 
 import { ITestimonial } from 'shared/components/testimonials/Testimonials';
 import { TestimonialStore } from 'shared/components/testimonials/Testimonials';
 
 import styles from './testimonialsPage.module.scss';
-import {PageLayout} from "../../../shared/components/PageLayout/PageLayout";
+import { PageLayout } from '../../../shared/components/PageLayout/PageLayout';
 
 @observer
-export default class TestimonialsPage extends React.Component<{},{}> {
+export default class TestimonialsPage extends React.Component<{}, {}> {
+    private store: TestimonialStore;
 
-    private store:TestimonialStore;
-
-    constructor(props:any) {
+    constructor(props: any) {
         super(props);
 
         this.store = new TestimonialStore();
     }
 
     renderTestimonials() {
-        return this.store.testimonials.map((testimonial:ITestimonial, i:number) => (
-            <div className='testimonial-blockquote' key={i}>
-                <blockquote className="blockquote">"{testimonial.quote}"
-                <footer className="blockquote-footer"><cite title="Source Title">{testimonial.cite}</cite></footer>
-                </blockquote>
-            </div>
-        ));
+        return this.store.testimonials.map(
+            (testimonial: ITestimonial, i: number) => (
+                <div className="testimonial-blockquote" key={i}>
+                    <blockquote className="blockquote">
+                        "{testimonial.quote}"
+                        <footer className="blockquote-footer">
+                            <cite title="Source Title">{testimonial.cite}</cite>
+                        </footer>
+                    </blockquote>
+                </div>
+            )
+        );
     }
 
     public render() {
-
-        return (<PageLayout className={"whiteBackground"}>
-
-            <div id="testimonialsPage" className={styles.testimonialsPage}>
-                <h1>What People Are Saying</h1>
-                {this.renderTestimonials()}
-            </div>
-
-        </PageLayout>)
-
+        return (
+            <PageLayout className={'whiteBackground'}>
+                <div id="testimonialsPage" className={styles.testimonialsPage}>
+                    <h1>What People Are Saying</h1>
+                    {this.renderTestimonials()}
+                </div>
+            </PageLayout>
+        );
     }
-
 }
diff --git a/src/pages/staticPages/testimonialsPage/testimonialsPage.module.scss b/src/pages/staticPages/testimonialsPage/testimonialsPage.module.scss
index 53d7ed97bf4..488f0678399 100644
--- a/src/pages/staticPages/testimonialsPage/testimonialsPage.module.scss
+++ b/src/pages/staticPages/testimonialsPage/testimonialsPage.module.scss
@@ -1,16 +1,9 @@
 .testimonialsPage {
-
     > div {
-
         margin: 25px 0;
 
         p {
-
-          margin: 0 0 5px;
-
+            margin: 0 0 5px;
         }
-
     }
-
 }
-
diff --git a/src/pages/staticPages/tools/mutationMapper/MutationMapperTool.tsx b/src/pages/staticPages/tools/mutationMapper/MutationMapperTool.tsx
index e602034364b..02821fec210 100644
--- a/src/pages/staticPages/tools/mutationMapper/MutationMapperTool.tsx
+++ b/src/pages/staticPages/tools/mutationMapper/MutationMapperTool.tsx
@@ -1,23 +1,23 @@
 import * as React from 'react';
-import { inject, observer } from "mobx-react";
-import {action, computed, observable} from "mobx";
+import { inject, observer } from 'mobx-react';
+import { action, computed, observable } from 'mobx';
 import autobind from 'autobind-decorator';
-import {Collapse} from 'react-collapse';
-import {ControlLabel, FormControl, FormGroup} from "react-bootstrap";
-import {PageLayout} from "shared/components/PageLayout/PageLayout";
-import Helmet from "react-helmet";
+import { Collapse } from 'react-collapse';
+import { ControlLabel, FormControl, FormGroup } from 'react-bootstrap';
+import { PageLayout } from 'shared/components/PageLayout/PageLayout';
+import Helmet from 'react-helmet';
 
-import Loader from "shared/components/loadingIndicator/LoadingIndicator";
-import {MSKTab, MSKTabs} from "shared/components/MSKTabs/MSKTabs";
-import {convertToMutationMapperProps} from "shared/components/mutationMapper/MutationMapperConfig";
-import MutationMapperUserSelectionStore from "shared/components/mutationMapper/MutationMapperUserSelectionStore";
-import {parseInput} from "shared/lib/MutationInputParser";
+import Loader from 'shared/components/loadingIndicator/LoadingIndicator';
+import { MSKTab, MSKTabs } from 'shared/components/MSKTabs/MSKTabs';
+import { convertToMutationMapperProps } from 'shared/components/mutationMapper/MutationMapperConfig';
+import MutationMapperUserSelectionStore from 'shared/components/mutationMapper/MutationMapperUserSelectionStore';
+import { parseInput } from 'shared/lib/MutationInputParser';
 
-import StandaloneMutationMapper from "./StandaloneMutationMapper";
-import MutationMapperToolStore from "./MutationMapperToolStore";
+import StandaloneMutationMapper from './StandaloneMutationMapper';
+import MutationMapperToolStore from './MutationMapperToolStore';
 
-import AppConfig from "appConfig";
-import {getOncoKbApiUrl} from "shared/api/urls";
+import AppConfig from 'appConfig';
+import { getOncoKbApiUrl } from 'shared/api/urls';
 
 interface IMutationMapperToolProps {
     routing: any;
@@ -25,17 +25,19 @@ interface IMutationMapperToolProps {
 
 @inject('routing')
 @observer
-export default class MutationMapperTool extends React.Component<IMutationMapperToolProps, {}>
-{
+export default class MutationMapperTool extends React.Component<
+    IMutationMapperToolProps,
+    {}
+> {
     private userSelectionStore: MutationMapperUserSelectionStore;
 
-    @observable standaloneMutationMapperGeneTab:string|undefined;
+    @observable standaloneMutationMapperGeneTab: string | undefined;
     @observable dataFormatCollapsed = true;
-    @observable inputText: string|undefined;
+    @observable inputText: string | undefined;
     @observable inputControlsVisible = true;
-    @observable inputFileContent: string|undefined;
+    @observable inputFileContent: string | undefined;
     @observable showIncorrectInput = false;
-    @observable lastParsedInputContent: string|undefined;
+    @observable lastParsedInputContent: string | undefined;
 
     private store: MutationMapperToolStore = new MutationMapperToolStore();
 
@@ -51,43 +53,50 @@ export default class MutationMapperTool extends React.Component<IMutationMapperT
         return (
             <PageLayout className={'whiteBackground staticPage'}>
                 <Helmet>
-                    <title>{'cBioPortal for Cancer Genomics::MutationMapper'}</title>
+                    <title>
+                        {'cBioPortal for Cancer Genomics::MutationMapper'}
+                    </title>
                 </Helmet>
                 <div className="cbioportal-frontend">
-                    <h1 style={{display: "inline"}}>MutationMapper</h1> interprets mutations with protein annotations
-                    <div style={{padding:4}}/>
+                    <h1 style={{ display: 'inline' }}>MutationMapper</h1>{' '}
+                    interprets mutations with protein annotations
+                    <div style={{ padding: 4 }} />
                     {this.input()}
-                    <div style={{padding:4}}/>
-                    <Loader isLoading={this.store.mutations.isPending} children={
-                        <span style={{paddingLeft:20}}>Annotating mutations with{' '}
-                            <a
-                                href={"https://www.genomenexus.org"}
-                                target="_blank"
-                            >
-                            Genome Nexus
-                            </a>
-                        </span>
-                    } />
-                    {this.store.mutationsNotAnnotated.length > 0 && this.inputParseWarning()}
+                    <div style={{ padding: 4 }} />
+                    <Loader
+                        isLoading={this.store.mutations.isPending}
+                        children={
+                            <span style={{ paddingLeft: 20 }}>
+                                Annotating mutations with{' '}
+                                <a
+                                    href={'https://www.genomenexus.org'}
+                                    target="_blank"
+                                >
+                                    Genome Nexus
+                                </a>
+                            </span>
+                        }
+                    />
+                    {this.store.mutationsNotAnnotated.length > 0 &&
+                        this.inputParseWarning()}
                     {this.store.mutationData && this.mainTabs()}
                 </div>
             </PageLayout>
         );
     }
 
-    @computed get activeTabId(): string|undefined
-    {
+    @computed get activeTabId(): string | undefined {
         // use routing if available, if not fall back to the observable variable
-        return this.props.routing ?
-            this.props.routing.location.query.standaloneMutationMapperGeneTab : this.standaloneMutationMapperGeneTab;
+        return this.props.routing
+            ? this.props.routing.location.query.standaloneMutationMapperGeneTab
+            : this.standaloneMutationMapperGeneTab;
     }
 
-    @computed get inputContent(): string
-    {
+    @computed get inputContent(): string {
         // input field has priority over input file
         const content = this.inputText || this.inputFileContent;
 
-        return content ? content.trim() : "";
+        return content ? content.trim() : '';
     }
 
     @autobind
@@ -95,23 +104,41 @@ export default class MutationMapperTool extends React.Component<IMutationMapperT
         this.showIncorrectInput = !this.showIncorrectInput;
     }
 
-    protected inputParseWarning()
-    {
-        if (this.store.hugoGeneSymbols.isComplete &&
+    protected inputParseWarning() {
+        if (
+            this.store.hugoGeneSymbols.isComplete &&
             this.store.hugoGeneSymbols.result &&
             this.store.hugoGeneSymbols.result.length > 0 &&
             this.lastParsedInputContent &&
-            this.store.mutationsNotAnnotated.length > 0)
-        {
+            this.store.mutationsNotAnnotated.length > 0
+        ) {
             return (
                 <div className="alert alert-warning" role="alert">
-                    Failed to annotate {this.store.mutationsNotAnnotated.length} mutation{this.store.mutationsNotAnnotated.length > 1? 's' : ''}&nbsp;
-                    {this.showIncorrectInput && this.lastParsedInputContent && (
-                        this.store.mutationsNotAnnotated.map((failedAnnotation) =>
-                            <div>Line {failedAnnotation.lineNumber}: {this.lastParsedInputContent && this.lastParsedInputContent.split('\n')[failedAnnotation.lineNumber-1]}</div>
-                        )
-                    )}
-                    (<a data-test="ShowWarningsButton" onClick={this.toggleIncorrectInput}>{this.showIncorrectInput? "Hide" : "Show"}</a>)
+                    Failed to annotate {this.store.mutationsNotAnnotated.length}{' '}
+                    mutation
+                    {this.store.mutationsNotAnnotated.length > 1 ? 's' : ''}
+                    &nbsp;
+                    {this.showIncorrectInput &&
+                        this.lastParsedInputContent &&
+                        this.store.mutationsNotAnnotated.map(
+                            failedAnnotation => (
+                                <div>
+                                    Line {failedAnnotation.lineNumber}:{' '}
+                                    {this.lastParsedInputContent &&
+                                        this.lastParsedInputContent.split('\n')[
+                                            failedAnnotation.lineNumber - 1
+                                        ]}
+                                </div>
+                            )
+                        )}
+                    (
+                    <a
+                        data-test="ShowWarningsButton"
+                        onClick={this.toggleIncorrectInput}
+                    >
+                        {this.showIncorrectInput ? 'Hide' : 'Show'}
+                    </a>
+                    )
                 </div>
             );
         } else {
@@ -119,71 +146,117 @@ export default class MutationMapperTool extends React.Component<IMutationMapperT
         }
     }
 
-    protected mainTabs()
-    {
-        if (this.store.hugoGeneSymbols.isComplete &&
+    protected mainTabs() {
+        if (
+            this.store.hugoGeneSymbols.isComplete &&
             this.store.hugoGeneSymbols.result &&
-            this.store.hugoGeneSymbols.result.length > 0)
-        {
-            const activeTabId = this.activeTabId || this.store.hugoGeneSymbols.result[0];
+            this.store.hugoGeneSymbols.result.length > 0
+        ) {
+            const activeTabId =
+                this.activeTabId || this.store.hugoGeneSymbols.result[0];
 
             return (
                 <div>
-                    <Loader isLoading={this.store.mutationMapperStores.isPending} />
-                    {(this.store.mutationMapperStores.isComplete) && (
+                    <Loader
+                        isLoading={this.store.mutationMapperStores.isPending}
+                    />
+                    {this.store.mutationMapperStores.isComplete && (
                         <MSKTabs
                             id="mutationMapperToolTabs"
                             activeTabId={activeTabId}
-                            onTabClick={(id:string) => this.handleTabChange(id)}
+                            onTabClick={(id: string) =>
+                                this.handleTabChange(id)
+                            }
                             className="pillTabs"
                             enablePagination={false}
-                            arrowStyle={{'line-height': 0.8}}
+                            arrowStyle={{ 'line-height': 0.8 }}
                             tabButtonStyle="pills"
                             unmountOnHide={true}
                         >
-                            {this.generateTabs(this.store.hugoGeneSymbols.result)}
+                            {this.generateTabs(
+                                this.store.hugoGeneSymbols.result
+                            )}
                         </MSKTabs>
                     )}
                 </div>
             );
-        }
-        else if (this.store.hugoGeneSymbols.isComplete && !this.inputControlsVisible) {
+        } else if (
+            this.store.hugoGeneSymbols.isComplete &&
+            !this.inputControlsVisible
+        ) {
             return (
                 <div className="alert alert-danger">
-                    Error processing the input. Please review your input and try again.
+                    Error processing the input. Please review your input and try
+                    again.
                 </div>
             );
-        }
-        else if (this.store.criticalErrors.length > 0) {
+        } else if (this.store.criticalErrors.length > 0) {
             return (
                 <div className="alert alert-danger">
-                    Critical annotation error. Annotation services might be temporarily down, or your input format might be invalid.
+                    Critical annotation error. Annotation services might be
+                    temporarily down, or your input format might be invalid.
                 </div>
             );
-        }
-        else {
+        } else {
             return null;
         }
     }
 
-    protected input()
-    {
+    protected input() {
         if (this.inputControlsVisible) {
             return (
                 <div className="standalone-mutation-input">
                     <p>
-                        Please input <b>tab-delimited</b> or <b>space-delimited</b> mutation data. (Load example data:
-                        <span> <a onClick={this.handleLoadExampleGenomicCoordinates} data-test="GenomicChangesExampleButton">Genomic Changes</a></span>,
-                        <span> <a onClick={this.handleLoadExampleGeneAndProteinChange} data-test="ProteinChangesExampleButton">Protein Changes</a></span>,
-                        <span> <a onClick={this.handleLoadExamplePartiallyAnnotated} data-test="GenomicAndProteinChangesExampleButton">Genomic and Protein Changes</a></span>)
-                        <br /><br />
+                        Please input <b>tab-delimited</b> or{' '}
+                        <b>space-delimited</b> mutation data. (Load example
+                        data:
+                        <span>
+                            {' '}
+                            <a
+                                onClick={
+                                    this.handleLoadExampleGenomicCoordinates
+                                }
+                                data-test="GenomicChangesExampleButton"
+                            >
+                                Genomic Changes
+                            </a>
+                        </span>
+                        ,
+                        <span>
+                            {' '}
+                            <a
+                                onClick={
+                                    this.handleLoadExampleGeneAndProteinChange
+                                }
+                                data-test="ProteinChangesExampleButton"
+                            >
+                                Protein Changes
+                            </a>
+                        </span>
+                        ,
+                        <span>
+                            {' '}
+                            <a
+                                onClick={
+                                    this.handleLoadExamplePartiallyAnnotated
+                                }
+                                data-test="GenomicAndProteinChangesExampleButton"
+                            >
+                                Genomic and Protein Changes
+                            </a>
+                        </span>
+                        )
+                        <br />
+                        <br />
                         The annotations are based on genome build GRCh37 (hg19).
                     </p>
 
                     {this.dataFormatToggler()}
 
                     <FormGroup controlId="standaloneMutationTextInput">
-                        <ControlLabel>Copy and paste your own mutation data</ControlLabel>
+                        <ControlLabel>
+                            Copy and paste your own mutation data
+                        </ControlLabel>
                         <FormControl
                             componentClass="textarea"
                             rows={15}
@@ -194,7 +267,9 @@ export default class MutationMapperTool extends React.Component<IMutationMapperT
                     </FormGroup>
 
                     <FormGroup controlId="standaloneMutationFileUpload">
-                        <ControlLabel>Upload your own mutation file</ControlLabel>
+                        <ControlLabel>
+                            Upload your own mutation file
+                        </ControlLabel>
                         <FormControl
                             type="file"
                             accept="text/plain"
@@ -212,11 +287,13 @@ export default class MutationMapperTool extends React.Component<IMutationMapperT
                     </button>
                 </div>
             );
-        }
-        else {
+        } else {
             return (
-                <div className='mutation-input-field-expander'>
-                    <button onClick={this.handleModifyInput} className='btn btn-primary'>
+                <div className="mutation-input-field-expander">
+                    <button
+                        onClick={this.handleModifyInput}
+                        className="btn btn-primary"
+                    >
                         Modify Input
                     </button>
                 </div>
@@ -224,26 +301,27 @@ export default class MutationMapperTool extends React.Component<IMutationMapperT
         }
     }
 
-    protected dataFormatToggler()
-    {
+    protected dataFormatToggler() {
         return (
             <p>
-                <div className="collapsible-header" onClick={this.handleDataFormatToggle}>
+                <div
+                    className="collapsible-header"
+                    onClick={this.handleDataFormatToggle}
+                >
                     <a>Data Format</a>
-                    <span style={{paddingLeft: 4}}>
-                        {this.dataFormatCollapsed ?
-                            <i className="fa fa-chevron-down"/> : <i className="fa fa-chevron-up"/>
-                        }
+                    <span style={{ paddingLeft: 4 }}>
+                        {this.dataFormatCollapsed ? (
+                            <i className="fa fa-chevron-down" />
+                        ) : (
+                            <i className="fa fa-chevron-up" />
+                        )}
                     </span>
                 </div>
                 <Collapse isOpened={!this.dataFormatCollapsed}>
                     <div className="mutation-data-info">
-
                         {this.essentialColumnsInfo()}
 
-                        <p>
-                            List of valid input headers:
-                        </p>
+                        <p>List of valid input headers:</p>
                         <div className="full-list-of-headers">
                             {this.inputFormatDesc()}
                         </div>
@@ -253,19 +331,19 @@ export default class MutationMapperTool extends React.Component<IMutationMapperT
         );
     }
 
-    protected essentialColumnsInfo()
-    {
+    protected essentialColumnsInfo() {
         return (
             <div className="mutation-input-format-info">
                 <p>
-                    You can either copy and paste your input into the text field below or
-                    select a file with mutation data for upload.<br />
+                    You can either copy and paste your input into the text field
+                    below or select a file with mutation data for upload.
+                    <br />
                 </p>
                 <p>
-                    Mutation files should be tab delimited, and should at
-                    least have the genomic location headers in the first line
-                    for a successful annotation. Note that all variants have
-                    to be reported for genome build GRCh37 (hg19).
+                    Mutation files should be tab delimited, and should at least
+                    have the genomic location headers in the first line for a
+                    successful annotation. Note that all variants have to be
+                    reported for genome build GRCh37 (hg19).
                 </p>
                 <ul>
                     <li>Chromosome</li>
@@ -275,8 +353,9 @@ export default class MutationMapperTool extends React.Component<IMutationMapperT
                     <li>Variant_Allele</li>
                 </ul>
                 <p>
-                    If your mutation input doesn't contain the genomic location headers, but you still want
-                    to visualize your data, your input should at least have the following headers:
+                    If your mutation input doesn't contain the genomic location
+                    headers, but you still want to visualize your data, your
+                    input should at least have the following headers:
                 </p>
                 <ul>
                     <li>Hugo_Symbol</li>
@@ -285,8 +364,7 @@ export default class MutationMapperTool extends React.Component<IMutationMapperT
             </div>
         );
     }
-    protected inputFormatDesc()
-    {
+    protected inputFormatDesc() {
         // TODO add & support more columns
         return (
             <table className="table table-striped">
@@ -325,17 +403,25 @@ export default class MutationMapperTool extends React.Component<IMutationMapperT
                     </tr>
                     <tr>
                         <td>Start_Position</td>
-                        <td>Lowest numeric position of the reported variant on the genomic reference sequence</td>
+                        <td>
+                            Lowest numeric position of the reported variant on
+                            the genomic reference sequence
+                        </td>
                         <td>666</td>
                     </tr>
                     <tr>
                         <td>End_Position</td>
-                        <td>Highest numeric position of the reported variant on the genomic reference sequence</td>
+                        <td>
+                            Highest numeric position of the reported variant on
+                            the genomic reference sequence
+                        </td>
                         <td>667</td>
                     </tr>
                     <tr>
                         <td>Reference_Allele</td>
-                        <td>The plus strand reference allele at this position</td>
+                        <td>
+                            The plus strand reference allele at this position
+                        </td>
                         <td>A</td>
                     </tr>
                     <tr>
@@ -363,31 +449,37 @@ export default class MutationMapperTool extends React.Component<IMutationMapperT
         );
     }
 
-    protected generateTabs(genes: string[])
-    {
+    protected generateTabs(genes: string[]) {
         const tabs: JSX.Element[] = [];
 
         genes.forEach((gene: string) => {
             const mutationMapperStore = this.store.getMutationMapperStore(gene);
 
-            if (mutationMapperStore)
-            {
+            if (mutationMapperStore) {
                 tabs.push(
                     <MSKTab key={gene} id={gene} linkText={gene}>
                         <StandaloneMutationMapper
-                            {...convertToMutationMapperProps(AppConfig.serverConfig)}
+                            {...convertToMutationMapperProps(
+                                AppConfig.serverConfig
+                            )}
                             oncoKbPublicApiUrl={getOncoKbApiUrl()}
                             store={mutationMapperStore}
-                            trackVisibility={this.userSelectionStore.trackVisibility}
+                            trackVisibility={
+                                this.userSelectionStore.trackVisibility
+                            }
                             downloadDataFetcher={this.store.downloadDataFetcher}
                             genomeNexusCache={this.store.genomeNexusCache}
-                            genomeNexusMyVariantInfoCache={this.store.genomeNexusMyVariantInfoCache}
+                            genomeNexusMyVariantInfoCache={
+                                this.store.genomeNexusMyVariantInfoCache
+                            }
                             oncoKbEvidenceCache={this.store.oncoKbEvidenceCache}
                             pubMedCache={this.store.pubMedCache}
                             pdbHeaderCache={this.store.pdbHeaderCache}
                             myCancerGenomeData={this.store.myCancerGenomeData}
                             showTranscriptDropDown={true}
-                            showOnlyAnnotatedTranscriptsInDropdown={!this.store.hasInputWithProteinChanges}
+                            showOnlyAnnotatedTranscriptsInDropdown={
+                                !this.store.hasInputWithProteinChanges
+                            }
                         />
                     </MSKTab>
                 );
@@ -399,47 +491,45 @@ export default class MutationMapperTool extends React.Component<IMutationMapperT
 
     @autobind
     @action
-    protected handleFileSelect(e: any)
-    {
+    protected handleFileSelect(e: any) {
         const reader = new FileReader();
         reader.addEventListener('loadend', this.fileLoadEndHandler);
 
         if (e.target.files && e.target.files[0]) {
             // this will fire a "loadend" event
             reader.readAsText(e.target.files[0]);
-        }
-        else {
+        } else {
             // reset input file content if no file is selected
-            this.inputFileContent = "";
+            this.inputFileContent = '';
         }
     }
 
     @autobind
     @action
-    protected fileLoadEndHandler(e: any)
-    {
-        if(e.srcElement && e.srcElement.result) {
+    protected fileLoadEndHandler(e: any) {
+        if (e.srcElement && e.srcElement.result) {
             // update input file content
             this.inputFileContent = e.srcElement.result;
 
             // reset input text to avoid confusion
-            this.inputText = "";
+            this.inputText = '';
         }
     }
 
     @autobind
     @action
-    protected handleInputChange(e: any)
-    {
+    protected handleInputChange(e: any) {
         this.inputText = e.target.value;
     }
 
     @autobind
     @action
-    protected handleTabChange(id: string|undefined) {
+    protected handleTabChange(id: string | undefined) {
         // update the hash if routing exits
         if (this.props.routing) {
-            this.props.routing.updateRoute({ standaloneMutationMapperGeneTab: id });
+            this.props.routing.updateRoute({
+                standaloneMutationMapperGeneTab: id,
+            });
         }
         // update the observable if no routing
         else {
@@ -449,8 +539,7 @@ export default class MutationMapperTool extends React.Component<IMutationMapperT
 
     @autobind
     @action
-    protected handleModifyInput()
-    {
+    protected handleModifyInput() {
         // clear previous critical errors
         this.store.clearCriticalErrors();
 
@@ -460,8 +549,7 @@ export default class MutationMapperTool extends React.Component<IMutationMapperT
 
     @autobind
     @action
-    protected handleVisualize()
-    {
+    protected handleVisualize() {
         // clear previous critical errors
         this.store.clearCriticalErrors();
 
@@ -476,29 +564,25 @@ export default class MutationMapperTool extends React.Component<IMutationMapperT
 
     @autobind
     @action
-    protected handleDataFormatToggle()
-    {
+    protected handleDataFormatToggle() {
         this.dataFormatCollapsed = !this.dataFormatCollapsed;
     }
 
     @autobind
     @action
-    protected handleLoadExamplePartiallyAnnotated()
-    {
+    protected handleLoadExamplePartiallyAnnotated() {
         this.inputText = require('raw-loader!./resources/standaloneMutationDataExample.txt');
     }
 
     @autobind
     @action
-    protected handleLoadExampleGenomicCoordinates()
-    {
+    protected handleLoadExampleGenomicCoordinates() {
         this.inputText = require('raw-loader!./resources/standaloneMutationDataExampleWithGenomicCoordinatesOnly.txt');
     }
 
     @autobind
     @action
-    protected handleLoadExampleGeneAndProteinChange()
-    {
+    protected handleLoadExampleGeneAndProteinChange() {
         this.inputText = require('raw-loader!./resources/standaloneMutationDataExampleWithGeneAndProteinChangeOnly.txt');
     }
 }
diff --git a/src/pages/staticPages/tools/mutationMapper/MutationMapperToolStore.ts b/src/pages/staticPages/tools/mutationMapper/MutationMapperToolStore.ts
index 214c9933094..fb7f3a6eb16 100644
--- a/src/pages/staticPages/tools/mutationMapper/MutationMapperToolStore.ts
+++ b/src/pages/staticPages/tools/mutationMapper/MutationMapperToolStore.ts
@@ -1,262 +1,371 @@
-import {action, computed, observable} from "mobx";
-import * as _ from "lodash";
-import {cached} from "mobxpromise";
+import { action, computed, observable } from 'mobx';
+import * as _ from 'lodash';
+import { cached } from 'mobxpromise';
 import {
     annotateMutations,
     IHotspotIndex,
     indexHotspotsData,
-    resolveDefaultsForMissingValues
-} from "react-mutation-mapper";
+    resolveDefaultsForMissingValues,
+} from 'react-mutation-mapper';
 
-import AppConfig from "appConfig";
+import AppConfig from 'appConfig';
 
 import {
     CancerGene,
     EnsemblTranscript,
     remoteData,
-    VariantAnnotation
-} from "cbioportal-frontend-commons";
-import {ClinicalData, Gene, Mutation} from "shared/api/generated/CBioPortalAPI";
+    VariantAnnotation,
+} from 'cbioportal-frontend-commons';
 import {
-    fetchGenes, fetchMyCancerGenomeData, fetchOncoKbData,
+    ClinicalData,
+    Gene,
+    Mutation,
+} from 'shared/api/generated/CBioPortalAPI';
+import {
+    fetchGenes,
+    fetchMyCancerGenomeData,
+    fetchOncoKbData,
     ONCOKB_DEFAULT,
     getCanonicalTranscriptsByHugoSymbol,
     fetchOncoKbCancerGenes,
-    fetchVariantAnnotationsIndexedByGenomicLocation
-} from "shared/lib/StoreUtils";
-import {getClinicalData, getGeneList, mutationInputToMutation, MutationInput} from "shared/lib/MutationInputParser";
-import {updateMissingGeneInfo} from "shared/lib/MutationUtils";
-import {IOncoKbData} from "shared/model/OncoKB";
-import {fetchHotspotsData} from "shared/lib/CancerHotspotsUtils";
-import OncoKbEvidenceCache from "shared/cache/OncoKbEvidenceCache";
-import PubMedCache from "shared/cache/PubMedCache";
-import GenomeNexusCache from "shared/cache/GenomeNexusCache";
-import GenomeNexusMyVariantInfoCache from "shared/cache/GenomeNexusMyVariantInfoCache";
-import PdbHeaderCache from "shared/cache/PdbHeaderCache";
-import MutationMapperStore from "shared/components/mutationMapper/MutationMapperStore";
-import {MutationTableDownloadDataFetcher} from "shared/lib/MutationTableDownloadDataFetcher";
-import {normalizeMutations} from "../../../../shared/components/mutationMapper/MutationMapperUtils";
-
-export default class MutationMapperToolStore
-{
-    @observable mutationData: Partial<MutationInput>[]|undefined;
+    fetchVariantAnnotationsIndexedByGenomicLocation,
+} from 'shared/lib/StoreUtils';
+import {
+    getClinicalData,
+    getGeneList,
+    mutationInputToMutation,
+    MutationInput,
+} from 'shared/lib/MutationInputParser';
+import { updateMissingGeneInfo } from 'shared/lib/MutationUtils';
+import { IOncoKbData } from 'shared/model/OncoKB';
+import { fetchHotspotsData } from 'shared/lib/CancerHotspotsUtils';
+import OncoKbEvidenceCache from 'shared/cache/OncoKbEvidenceCache';
+import PubMedCache from 'shared/cache/PubMedCache';
+import GenomeNexusCache from 'shared/cache/GenomeNexusCache';
+import GenomeNexusMyVariantInfoCache from 'shared/cache/GenomeNexusMyVariantInfoCache';
+import PdbHeaderCache from 'shared/cache/PdbHeaderCache';
+import MutationMapperStore from 'shared/components/mutationMapper/MutationMapperStore';
+import { MutationTableDownloadDataFetcher } from 'shared/lib/MutationTableDownloadDataFetcher';
+import { normalizeMutations } from '../../../../shared/components/mutationMapper/MutationMapperUtils';
+
+export default class MutationMapperToolStore {
+    @observable mutationData: Partial<MutationInput>[] | undefined;
     @observable criticalErrors: Error[] = [];
 
-    readonly genes = remoteData<Gene[]>({
-        await: () => [
-            this.hugoGeneSymbols
-        ],
-        invoke: () => fetchGenes(this.hugoGeneSymbols.result)
-    }, []);
-
-    readonly canonicalTranscriptsByHugoSymbol = remoteData<{[hugoGeneSymbol:string]:EnsemblTranscript} | undefined>({
-        await: () => [
-            this.hugoGeneSymbols
-        ],
-        invoke: async()=>{
-            if (this.hugoGeneSymbols.result) {
-                return getCanonicalTranscriptsByHugoSymbol(this.hugoGeneSymbols.result, this.isoformOverrideSource);
-            } else {
-                return undefined;
-            }
+    readonly genes = remoteData<Gene[]>(
+        {
+            await: () => [this.hugoGeneSymbols],
+            invoke: () => fetchGenes(this.hugoGeneSymbols.result),
+        },
+        []
+    );
+
+    readonly canonicalTranscriptsByHugoSymbol = remoteData<
+        { [hugoGeneSymbol: string]: EnsemblTranscript } | undefined
+    >(
+        {
+            await: () => [this.hugoGeneSymbols],
+            invoke: async () => {
+                if (this.hugoGeneSymbols.result) {
+                    return getCanonicalTranscriptsByHugoSymbol(
+                        this.hugoGeneSymbols.result,
+                        this.isoformOverrideSource
+                    );
+                } else {
+                    return undefined;
+                }
+            },
+            onError: (err: Error) => {
+                throw new Error('Failed to get canonical transcript');
+            },
         },
-        onError: (err: Error) => {
-            throw new Error("Failed to get canonical transcript");
-        }
-    }, undefined);
+        undefined
+    );
 
     @computed get isoformOverrideSource(): string {
         return AppConfig.serverConfig.isoformOverrideSource;
     }
 
-    readonly hugoGeneSymbols = remoteData({
-        await: () => [
-            this.indexedVariantAnnotations
-        ],
-        invoke: () => Promise.resolve(getGeneList(this.annotatedMutations))
-    }, []);
-
-    readonly oncoKbCancerGenes = remoteData({
-        invoke: () => {
-            if (AppConfig.serverConfig.show_oncokb) {
-                return fetchOncoKbCancerGenes();
-            } else {
-                return Promise.resolve([]);
-            }
-        }
-    }, []);
-
-    readonly oncoKbAnnotatedGenes = remoteData({
-        await: () => [this.oncoKbCancerGenes],
-        invoke: () => {
-            if (AppConfig.serverConfig.show_oncokb) {
-                return Promise.resolve(_.reduce(this.oncoKbCancerGenes.result, (map: { [entrezGeneId: number]: boolean }, next: CancerGene) => {
-                    if (next.oncokbAnnotated) {
-                        map[next.entrezGeneId] = true;
-                    }
-                    return map;
-                }, {}));
-            } else {
-                return Promise.resolve({});
-            }
-        }
-    }, {});
+    readonly hugoGeneSymbols = remoteData(
+        {
+            await: () => [this.indexedVariantAnnotations],
+            invoke: () => Promise.resolve(getGeneList(this.annotatedMutations)),
+        },
+        []
+    );
+
+    readonly oncoKbCancerGenes = remoteData(
+        {
+            invoke: () => {
+                if (AppConfig.serverConfig.show_oncokb) {
+                    return fetchOncoKbCancerGenes();
+                } else {
+                    return Promise.resolve([]);
+                }
+            },
+        },
+        []
+    );
+
+    readonly oncoKbAnnotatedGenes = remoteData(
+        {
+            await: () => [this.oncoKbCancerGenes],
+            invoke: () => {
+                if (AppConfig.serverConfig.show_oncokb) {
+                    return Promise.resolve(
+                        _.reduce(
+                            this.oncoKbCancerGenes.result,
+                            (
+                                map: { [entrezGeneId: number]: boolean },
+                                next: CancerGene
+                            ) => {
+                                if (next.oncokbAnnotated) {
+                                    map[next.entrezGeneId] = true;
+                                }
+                                return map;
+                            },
+                            {}
+                        )
+                    );
+                } else {
+                    return Promise.resolve({});
+                }
+            },
+        },
+        {}
+    );
+
+    readonly oncoKbData = remoteData<IOncoKbData | Error>(
+        {
+            await: () => [
+                this.mutations,
+                this.oncoKbAnnotatedGenes,
+                this.uniqueSampleKeyToTumorType,
+            ],
+            invoke: () =>
+                fetchOncoKbData(
+                    this.uniqueSampleKeyToTumorType.result!,
+                    this.oncoKbAnnotatedGenes.result!,
+                    this.mutations
+                ),
+            onError: (err: Error) => {
+                // fail silently, leave the error handling responsibility to the data consumer
+            },
+        },
+        ONCOKB_DEFAULT
+    );
 
-    readonly oncoKbData = remoteData<IOncoKbData|Error>({
-        await: () => [
-            this.mutations,
-            this.oncoKbAnnotatedGenes,
-            this.uniqueSampleKeyToTumorType
-        ],
-        invoke: () => fetchOncoKbData(this.uniqueSampleKeyToTumorType.result!, this.oncoKbAnnotatedGenes.result!, this.mutations),
-        onError: (err: Error) => {
-            // fail silently, leave the error handling responsibility to the data consumer
-        }
-    }, ONCOKB_DEFAULT);
-
-    readonly uniqueSampleKeyToTumorType = remoteData<{[uniqueSampleKey: string]: string}>({
-        await:()=>[
-            this.mutations,
-            this.clinicalDataForSamples
-        ],
+    readonly uniqueSampleKeyToTumorType = remoteData<{
+        [uniqueSampleKey: string]: string;
+    }>({
+        await: () => [this.mutations, this.clinicalDataForSamples],
         invoke: () => {
-            const map: {[uniqueSampleKey: string]: string} = {};
+            const map: { [uniqueSampleKey: string]: string } = {};
 
             if (this.mutations.result) {
                 this.mutations.result.forEach(mutation => {
-                    const cancerTypeClinicalData: ClinicalData|undefined = _.find(
-                        this.clinicalDataByUniqueSampleKey[mutation.uniqueSampleKey],
-                        {clinicalAttributeId: "CANCER_TYPE"});
-                    map[mutation.uniqueSampleKey] = cancerTypeClinicalData ? cancerTypeClinicalData.value : "Unknown";
+                    const cancerTypeClinicalData:
+                        | ClinicalData
+                        | undefined = _.find(
+                        this.clinicalDataByUniqueSampleKey[
+                            mutation.uniqueSampleKey
+                        ],
+                        { clinicalAttributeId: 'CANCER_TYPE' }
+                    );
+                    map[mutation.uniqueSampleKey] = cancerTypeClinicalData
+                        ? cancerTypeClinicalData.value
+                        : 'Unknown';
                 });
             }
 
             return Promise.resolve(map);
-        }
+        },
     });
 
-    readonly clinicalDataForSamples = remoteData<ClinicalData[]>({
-        await: () => [
-            this.mutations
-        ],
-        invoke: () => Promise.resolve(getClinicalData(this.mutationData))
-    }, []);
-
-    readonly mutations = remoteData<Mutation[]>({
-        await: () => [
-            this.indexedVariantAnnotations,
-            this.genes
-        ],
-        invoke: () => {
-            let mutations: Partial<Mutation>[] = [];
-
-            if (this.annotatedMutations) {
-                mutations = normalizeMutations(this.annotatedMutations as Pick<Mutation, "chr">[]) as Partial<Mutation>[];
-                resolveDefaultsForMissingValues(mutations);
-                updateMissingGeneInfo(mutations, this.genesByHugoSymbol);
-            }
-
-            return Promise.resolve(mutations as Mutation[]);
-        }
-    }, []);
-
-    readonly indexedVariantAnnotations = remoteData<{[genomicLocation: string]: VariantAnnotation} | undefined>({
-        invoke: async () => await fetchVariantAnnotationsIndexedByGenomicLocation(this.rawMutations, ["annotation_summary","hotspots"], AppConfig.serverConfig.isoformOverrideSource),
-        onError: (err: Error) => {
-            this.criticalErrors.push(err);
-        }
-    }, undefined);
+    readonly clinicalDataForSamples = remoteData<ClinicalData[]>(
+        {
+            await: () => [this.mutations],
+            invoke: () => Promise.resolve(getClinicalData(this.mutationData)),
+        },
+        []
+    );
+
+    readonly mutations = remoteData<Mutation[]>(
+        {
+            await: () => [this.indexedVariantAnnotations, this.genes],
+            invoke: () => {
+                let mutations: Partial<Mutation>[] = [];
+
+                if (this.annotatedMutations) {
+                    mutations = normalizeMutations(this
+                        .annotatedMutations as Pick<
+                        Mutation,
+                        'chr'
+                    >[]) as Partial<Mutation>[];
+                    resolveDefaultsForMissingValues(mutations);
+                    updateMissingGeneInfo(mutations, this.genesByHugoSymbol);
+                }
+
+                return Promise.resolve(mutations as Mutation[]);
+            },
+        },
+        []
+    );
+
+    readonly indexedVariantAnnotations = remoteData<
+        { [genomicLocation: string]: VariantAnnotation } | undefined
+    >(
+        {
+            invoke: async () =>
+                await fetchVariantAnnotationsIndexedByGenomicLocation(
+                    this.rawMutations,
+                    ['annotation_summary', 'hotspots'],
+                    AppConfig.serverConfig.isoformOverrideSource
+                ),
+            onError: (err: Error) => {
+                this.criticalErrors.push(err);
+            },
+        },
+        undefined
+    );
 
     readonly hotspotData = remoteData({
-        await:()=>[
-            this.mutations
-        ],
-        invoke:() => {
+        await: () => [this.mutations],
+        invoke: () => {
             return fetchHotspotsData(this.mutations);
-        }
+        },
     });
 
-    readonly indexedHotspotData = remoteData<IHotspotIndex |undefined>({
-        await:() => [
-            this.hotspotData
-        ],
-        invoke:() => Promise.resolve(indexHotspotsData(this.hotspotData))
+    readonly indexedHotspotData = remoteData<IHotspotIndex | undefined>({
+        await: () => [this.hotspotData],
+        invoke: () => Promise.resolve(indexHotspotsData(this.hotspotData)),
     });
 
-    readonly mutationMapperStores = remoteData<{ [hugoGeneSymbol: string]: MutationMapperStore }>({
-        await: () => [
-            this.genes,
-            this.mutations,
-            this.uniqueSampleKeyToTumorType,
-            this.indexedVariantAnnotations,
-            this.canonicalTranscriptsByHugoSymbol
-        ],
-        invoke: () => {
-            if (this.genes.result) {
-                // we have to use _.reduce, otherwise this.genes.result (Immutable, due to remoteData) will return
-                //  an Immutable as the result of reduce, and MutationMapperStore when it is made immutable all the
-                //  mobx machinery going on in the readonly remoteDatas and observables somehow gets messed up.
-                return Promise.resolve(_.reduce(this.genes.result, (map: { [hugoGeneSymbol: string]: MutationMapperStore }, gene: Gene) => {
-                    const getMutations = () => {
-                        return this.mutationsByGene[gene.hugoGeneSymbol];
-                    };
-                    map[gene.hugoGeneSymbol] = new MutationMapperStore(AppConfig.serverConfig, {filterMutationsBySelectedTranscript:!this.hasInputWithProteinChanges},
-                        gene,
-                        getMutations,
-                        this.indexedHotspotData,
-                        this.indexedVariantAnnotations,
-                        this.oncoKbCancerGenes,
-                        this.oncoKbData,
-                        this.uniqueSampleKeyToTumorType.result || {},
+    readonly mutationMapperStores = remoteData<{
+        [hugoGeneSymbol: string]: MutationMapperStore;
+    }>(
+        {
+            await: () => [
+                this.genes,
+                this.mutations,
+                this.uniqueSampleKeyToTumorType,
+                this.indexedVariantAnnotations,
+                this.canonicalTranscriptsByHugoSymbol,
+            ],
+            invoke: () => {
+                if (this.genes.result) {
+                    // we have to use _.reduce, otherwise this.genes.result (Immutable, due to remoteData) will return
+                    //  an Immutable as the result of reduce, and MutationMapperStore when it is made immutable all the
+                    //  mobx machinery going on in the readonly remoteDatas and observables somehow gets messed up.
+                    return Promise.resolve(
+                        _.reduce(
+                            this.genes.result,
+                            (
+                                map: {
+                                    [hugoGeneSymbol: string]: MutationMapperStore;
+                                },
+                                gene: Gene
+                            ) => {
+                                const getMutations = () => {
+                                    return this.mutationsByGene[
+                                        gene.hugoGeneSymbol
+                                    ];
+                                };
+                                map[
+                                    gene.hugoGeneSymbol
+                                ] = new MutationMapperStore(
+                                    AppConfig.serverConfig,
+                                    {
+                                        filterMutationsBySelectedTranscript: !this
+                                            .hasInputWithProteinChanges,
+                                    },
+                                    gene,
+                                    getMutations,
+                                    this.indexedHotspotData,
+                                    this.indexedVariantAnnotations,
+                                    this.oncoKbCancerGenes,
+                                    this.oncoKbData,
+                                    this.uniqueSampleKeyToTumorType.result || {}
+                                );
+                                return map;
+                            },
+                            {}
+                        )
                     );
-                    return map;
-                }, {}));
-            } else {
-                return Promise.resolve({});
-            }
-        }
-    }, {});
+                } else {
+                    return Promise.resolve({});
+                }
+            },
+        },
+        {}
+    );
 
-    public getMutationMapperStore(hugoGeneSymbol: string): MutationMapperStore | undefined {
+    public getMutationMapperStore(
+        hugoGeneSymbol: string
+    ): MutationMapperStore | undefined {
         return this.mutationMapperStores.result[hugoGeneSymbol];
     }
 
-    @computed get hasInputWithProteinChanges(): boolean
-    {
-        return _.some(this.mutationData, m => (m.proteinChange && m.proteinChange.length > 0));
+    @computed get hasInputWithProteinChanges(): boolean {
+        return _.some(
+            this.mutationData,
+            m => m.proteinChange && m.proteinChange.length > 0
+        );
     }
 
-    @computed get rawMutations(): Mutation[]
-    {
-        return mutationInputToMutation(this.mutationData) as Mutation[] || [];
+    @computed get rawMutations(): Mutation[] {
+        return (mutationInputToMutation(this.mutationData) as Mutation[]) || [];
     }
 
-    @computed get annotatedMutations(): Partial<Mutation>[]
-    {
-        return this.indexedVariantAnnotations.result ?
-            annotateMutations(normalizeMutations(this.rawMutations), this.indexedVariantAnnotations.result) as Partial<Mutation>[]:
-            [];
+    @computed get annotatedMutations(): Partial<Mutation>[] {
+        return this.indexedVariantAnnotations.result
+            ? (annotateMutations(
+                  normalizeMutations(this.rawMutations),
+                  this.indexedVariantAnnotations.result
+              ) as Partial<Mutation>[])
+            : [];
     }
-    @computed get mutationsNotAnnotated(): {lineNumber:number, mutationInput:Partial<MutationInput>}[]
-    {
-        return _.compact(this.mutations.result.map((mutation: Mutation, index:number) => {
-            if (!mutation || !mutation.gene || !mutation.gene.hugoGeneSymbol) {
-                return this.mutationData && {lineNumber:index+2, mutationInput:this.mutationData[index]};
-            } else {
-                return null;
-            }
-        }));
+    @computed get mutationsNotAnnotated(): {
+        lineNumber: number;
+        mutationInput: Partial<MutationInput>;
+    }[] {
+        return _.compact(
+            this.mutations.result.map((mutation: Mutation, index: number) => {
+                if (
+                    !mutation ||
+                    !mutation.gene ||
+                    !mutation.gene.hugoGeneSymbol
+                ) {
+                    return (
+                        this.mutationData && {
+                            lineNumber: index + 2,
+                            mutationInput: this.mutationData[index],
+                        }
+                    );
+                } else {
+                    return null;
+                }
+            })
+        );
     }
-    @computed get mutationsByGene(): {[hugoGeneSymbol:string]: Mutation[]} {
-        return _.groupBy(this.mutations.result,(mutation: Mutation) => mutation.gene.hugoGeneSymbol);
+    @computed get mutationsByGene(): { [hugoGeneSymbol: string]: Mutation[] } {
+        return _.groupBy(
+            this.mutations.result,
+            (mutation: Mutation) => mutation.gene.hugoGeneSymbol
+        );
     }
 
-    @computed get genesByHugoSymbol(): {[hugoGeneSymbol:string]: Gene} {
-        return _.keyBy(this.genes.result,(gene: Gene) => gene.hugoGeneSymbol);
+    @computed get genesByHugoSymbol(): { [hugoGeneSymbol: string]: Gene } {
+        return _.keyBy(this.genes.result, (gene: Gene) => gene.hugoGeneSymbol);
     }
 
-    @computed get clinicalDataByUniqueSampleKey(): {[uniqueSampleKey: string]: ClinicalData[]} {
-        return _.groupBy(this.clinicalDataForSamples.result,(clinicalData: ClinicalData) => clinicalData.uniqueSampleKey);
+    @computed get clinicalDataByUniqueSampleKey(): {
+        [uniqueSampleKey: string]: ClinicalData[];
+    } {
+        return _.groupBy(
+            this.clinicalDataForSamples.result,
+            (clinicalData: ClinicalData) => clinicalData.uniqueSampleKey
+        );
     }
 
     @cached get oncoKbEvidenceCache() {
@@ -284,7 +393,12 @@ export default class MutationMapperToolStore
     }
 
     @cached get downloadDataFetcher() {
-        return new MutationTableDownloadDataFetcher(this.mutations, undefined, () => this.genomeNexusCache, () => this.genomeNexusMyVariantInfoCache);
+        return new MutationTableDownloadDataFetcher(
+            this.mutations,
+            undefined,
+            () => this.genomeNexusCache,
+            () => this.genomeNexusMyVariantInfoCache
+        );
     }
 
     @action public clearCriticalErrors() {
diff --git a/src/pages/staticPages/tools/mutationMapper/StandaloneMutationMapper.tsx b/src/pages/staticPages/tools/mutationMapper/StandaloneMutationMapper.tsx
index a90991286aa..d863dcb3953 100644
--- a/src/pages/staticPages/tools/mutationMapper/StandaloneMutationMapper.tsx
+++ b/src/pages/staticPages/tools/mutationMapper/StandaloneMutationMapper.tsx
@@ -1,32 +1,38 @@
 import * as React from 'react';
-import { observer } from "mobx-react";
-import StandaloneMutationTable from "./StandaloneMutationTable";
+import { observer } from 'mobx-react';
+import StandaloneMutationTable from './StandaloneMutationTable';
 import {
-    IMutationMapperProps, default as MutationMapper
-} from "shared/components/mutationMapper/MutationMapper";
-import {MutationTableDownloadDataFetcher} from "shared/lib/MutationTableDownloadDataFetcher";
-
+    IMutationMapperProps,
+    default as MutationMapper,
+} from 'shared/components/mutationMapper/MutationMapper';
+import { MutationTableDownloadDataFetcher } from 'shared/lib/MutationTableDownloadDataFetcher';
 
 export interface IStandaloneMutationMapperProps extends IMutationMapperProps {
     // add standalone view specific props here if needed
-    downloadDataFetcher?:MutationTableDownloadDataFetcher;
+    downloadDataFetcher?: MutationTableDownloadDataFetcher;
 }
 @observer
-export default class StandaloneMutationMapper extends MutationMapper<IStandaloneMutationMapperProps>
-{
+export default class StandaloneMutationMapper extends MutationMapper<
+    IStandaloneMutationMapperProps
+> {
     constructor(props: IMutationMapperProps) {
         super(props);
     }
 
-    protected get mutationTableComponent(): JSX.Element | null
-    {
+    protected get mutationTableComponent(): JSX.Element | null {
         return (
             <StandaloneMutationTable
-                uniqueSampleKeyToTumorType={this.props.store.uniqueSampleKeyToTumorType}
+                uniqueSampleKeyToTumorType={
+                    this.props.store.uniqueSampleKeyToTumorType
+                }
                 oncoKbCancerGenes={this.props.store.oncoKbCancerGenes}
-                indexedVariantAnnotations={this.props.store.indexedVariantAnnotations}
+                indexedVariantAnnotations={
+                    this.props.store.indexedVariantAnnotations
+                }
                 genomeNexusCache={this.props.genomeNexusCache}
-                genomeNexusMyVariantInfoCache={this.props.genomeNexusMyVariantInfoCache}
+                genomeNexusMyVariantInfoCache={
+                    this.props.genomeNexusMyVariantInfoCache
+                }
                 oncoKbEvidenceCache={this.props.oncoKbEvidenceCache}
                 pubMedCache={this.props.pubMedCache}
                 dataStore={this.props.store.dataStore}
@@ -43,4 +49,4 @@ export default class StandaloneMutationMapper extends MutationMapper<IStandalone
             />
         );
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/staticPages/tools/mutationMapper/StandaloneMutationTable.tsx b/src/pages/staticPages/tools/mutationMapper/StandaloneMutationTable.tsx
index d3761ee964f..381243e25fa 100644
--- a/src/pages/staticPages/tools/mutationMapper/StandaloneMutationTable.tsx
+++ b/src/pages/staticPages/tools/mutationMapper/StandaloneMutationTable.tsx
@@ -1,24 +1,26 @@
-import * as React from "react";
-import {observer} from "mobx-react";
+import * as React from 'react';
+import { observer } from 'mobx-react';
 import {
-    IMutationTableProps, MutationTableColumnType, default as MutationTable
-} from "shared/components/mutationTable/MutationTable";
-import TumorAlleleFreqColumnFormatter from "shared/components/mutationTable/column/TumorAlleleFreqColumnFormatter";
-import CancerTypeColumnFormatter from "shared/components/mutationTable/column/CancerTypeColumnFormatter";
+    IMutationTableProps,
+    MutationTableColumnType,
+    default as MutationTable,
+} from 'shared/components/mutationTable/MutationTable';
+import TumorAlleleFreqColumnFormatter from 'shared/components/mutationTable/column/TumorAlleleFreqColumnFormatter';
+import CancerTypeColumnFormatter from 'shared/components/mutationTable/column/CancerTypeColumnFormatter';
 
 export interface IStandaloneMutationTableProps extends IMutationTableProps {
     // add standalone specific props here if needed
 }
 
 @observer
-export default class StandaloneMutationTable extends MutationTable<IStandaloneMutationTableProps> {
-
+export default class StandaloneMutationTable extends MutationTable<
+    IStandaloneMutationTableProps
+> {
     constructor(props: IStandaloneMutationTableProps) {
         super(props);
     }
 
-    public static defaultProps =
-    {
+    public static defaultProps = {
         ...MutationTable.defaultProps,
         columns: [
             MutationTableColumnType.SAMPLE_ID,
@@ -46,19 +48,29 @@ export default class StandaloneMutationTable extends MutationTable<IStandaloneMu
             MutationTableColumnType.HGVSC,
             MutationTableColumnType.GNOMAD,
             MutationTableColumnType.CLINVAR,
-            MutationTableColumnType.DBSNP
-        ]
+            MutationTableColumnType.DBSNP,
+        ],
     };
 
     protected generateColumns() {
         super.generateColumns();
 
         // override default visibility for some columns
-        this._columns[MutationTableColumnType.TUMOR_ALLELE_FREQ].visible = TumorAlleleFreqColumnFormatter.isVisible(
-            this.props.dataStore ? this.props.dataStore.allData : this.props.data);
-        this._columns[MutationTableColumnType.CANCER_TYPE].visible = CancerTypeColumnFormatter.isVisible(
-            this.props.dataStore ? this.props.dataStore.allData : this.props.data,
-            this.props.uniqueSampleKeyToTumorType);
+        this._columns[
+            MutationTableColumnType.TUMOR_ALLELE_FREQ
+        ].visible = TumorAlleleFreqColumnFormatter.isVisible(
+            this.props.dataStore
+                ? this.props.dataStore.allData
+                : this.props.data
+        );
+        this._columns[
+            MutationTableColumnType.CANCER_TYPE
+        ].visible = CancerTypeColumnFormatter.isVisible(
+            this.props.dataStore
+                ? this.props.dataStore.allData
+                : this.props.data,
+            this.props.uniqueSampleKeyToTumorType
+        );
         this._columns[MutationTableColumnType.FUNCTIONAL_IMPACT].visible = true;
 
         // order columns
diff --git a/src/pages/staticPages/tools/oncoprinter/Oncoprinter.tsx b/src/pages/staticPages/tools/oncoprinter/Oncoprinter.tsx
index b448595122d..0b480f69566 100644
--- a/src/pages/staticPages/tools/oncoprinter/Oncoprinter.tsx
+++ b/src/pages/staticPages/tools/oncoprinter/Oncoprinter.tsx
@@ -1,29 +1,29 @@
-import * as React from "react";
-import {observer, Observer} from "mobx-react";
-import {action, computed, IObservableObject, observable} from "mobx";
-import Oncoprint from "../../../../shared/components/oncoprint/Oncoprint";
+import * as React from 'react';
+import { observer, Observer } from 'mobx-react';
+import { action, computed, IObservableObject, observable } from 'mobx';
+import Oncoprint from '../../../../shared/components/oncoprint/Oncoprint';
 import OncoprintControls, {
     IOncoprintControlsHandlers,
-    IOncoprintControlsState
-} from "shared/components/oncoprint/controls/OncoprintControls";
-import {Sample} from "../../../../shared/api/generated/CBioPortalAPI";
-import {percentAltered} from "../../../../shared/components/oncoprint/OncoprintUtils";
-import AppConfig from "appConfig";
-import OncoprintJS from "oncoprintjs";
-import fileDownload from "react-file-download";
+    IOncoprintControlsState,
+} from 'shared/components/oncoprint/controls/OncoprintControls';
+import { Sample } from '../../../../shared/api/generated/CBioPortalAPI';
+import { percentAltered } from '../../../../shared/components/oncoprint/OncoprintUtils';
+import AppConfig from 'appConfig';
+import OncoprintJS from 'oncoprintjs';
+import fileDownload from 'react-file-download';
 import {
     isWebdriver,
     FadeInteraction,
-    svgToPdfDownload
-} from "cbioportal-frontend-commons";
-import classNames from "classnames";
-import OncoprinterStore from "./OncoprinterStore";
-import autobind from "autobind-decorator";
-import onMobxPromise from "../../../../shared/lib/onMobxPromise";
-import WindowStore from "../../../../shared/components/window/WindowStore";
-import {getGeneticTrackKey} from "./OncoprinterGeneticUtils";
-import SuccessBanner from "../../../studyView/infoBanner/SuccessBanner";
-import InfoBanner from "../../../../shared/components/banners/InfoBanner";
+    svgToPdfDownload,
+} from 'cbioportal-frontend-commons';
+import classNames from 'classnames';
+import OncoprinterStore from './OncoprinterStore';
+import autobind from 'autobind-decorator';
+import onMobxPromise from '../../../../shared/lib/onMobxPromise';
+import WindowStore from '../../../../shared/components/window/WindowStore';
+import { getGeneticTrackKey } from './OncoprinterGeneticUtils';
+import SuccessBanner from '../../../studyView/infoBanner/SuccessBanner';
+import InfoBanner from '../../../../shared/components/banners/InfoBanner';
 
 interface IOncoprinterProps {
     divId: string;
@@ -31,30 +31,32 @@ interface IOncoprinterProps {
 }
 
 @observer
-export default class Oncoprinter extends React.Component<IOncoprinterProps, {}> {
-
-    @observable distinguishMutationType:boolean = true;
+export default class Oncoprinter extends React.Component<
+    IOncoprinterProps,
+    {}
+> {
+    @observable distinguishMutationType: boolean = true;
     @observable distinguishGermlineMutations = true;
-    @observable sortByMutationType:boolean = true;
-    @observable sortByDrivers:boolean = true;
+    @observable sortByMutationType: boolean = true;
+    @observable sortByDrivers: boolean = true;
 
-    @observable showWhitespaceBetweenColumns:boolean = true;
-    @observable showClinicalTrackLegends:boolean = true;
+    @observable showWhitespaceBetweenColumns: boolean = true;
+    @observable showClinicalTrackLegends: boolean = true;
 
-    @observable showMinimap:boolean = false;
+    @observable showMinimap: boolean = false;
 
-    @observable horzZoom:number = 0.5;
+    @observable horzZoom: number = 0.5;
 
-    @observable mouseInsideBounds:boolean = false;
+    @observable mouseInsideBounds: boolean = false;
 
     @observable renderingComplete = true;
 
-    private controlsHandlers:IOncoprintControlsHandlers;
-    private controlsState:IOncoprintControlsState & IObservableObject;
+    private controlsHandlers: IOncoprintControlsHandlers;
+    private controlsState: IOncoprintControlsState & IObservableObject;
 
-    @observable.ref public oncoprint:OncoprintJS;
+    @observable.ref public oncoprint: OncoprintJS;
 
-    constructor(props:IOncoprinterProps) {
+    constructor(props: IOncoprinterProps) {
         super(props);
 
         (window as any).oncoprinter = this;
@@ -101,7 +103,8 @@ export default class Oncoprinter extends React.Component<IOncoprinterProps, {}>
                 return self.props.store.didOncoKbFail;
             },
             get annotateDriversCBioPortal() {
-                return self.props.store.driverAnnotationSettings.cbioportalCount;
+                return self.props.store.driverAnnotationSettings
+                    .cbioportalCount;
             },
             get hidePutativePassengers() {
                 return self.props.store.driverAnnotationSettings.excludeVUS;
@@ -110,7 +113,10 @@ export default class Oncoprinter extends React.Component<IOncoprinterProps, {}>
                 return self.props.store.hideGermlineMutations;
             },
             get annotateCBioPortalInputValue() {
-                return self.props.store.driverAnnotationSettings.cbioportalCountThreshold + "";
+                return (
+                    self.props.store.driverAnnotationSettings
+                        .cbioportalCountThreshold + ''
+                );
             },
             get sortByDrivers() {
                 return self.sortByDrivers;
@@ -133,11 +139,11 @@ export default class Oncoprinter extends React.Component<IOncoprinterProps, {}>
             },
             get customDriverAnnotationBinaryMenuLabel() {
                 if (self.props.store.existCustomDrivers) {
-                    return "User-specified drivers";
+                    return 'User-specified drivers';
                 } else {
                     return undefined;
                 }
-            }
+            },
         });
     }
 
@@ -146,36 +152,52 @@ export default class Oncoprinter extends React.Component<IOncoprinterProps, {}>
     }
 
     @autobind
-    onMouseEnter(){
+    onMouseEnter() {
         this.mouseInsideBounds = true;
     }
 
     @autobind
-    onMouseLeave(){
+    onMouseLeave() {
         this.mouseInsideBounds = false;
     }
 
     @action
-    public setAnnotateCBioPortalInputValue(value:string) {
-        this.controlsHandlers.onChangeAnnotateCBioPortalInputValue && this.controlsHandlers.onChangeAnnotateCBioPortalInputValue(value);
+    public setAnnotateCBioPortalInputValue(value: string) {
+        this.controlsHandlers.onChangeAnnotateCBioPortalInputValue &&
+            this.controlsHandlers.onChangeAnnotateCBioPortalInputValue(value);
     }
 
     private buildControlsHandlers() {
         return {
-            onSelectShowUnalteredColumns:(show:boolean)=>{this.props.store.showUnalteredColumns = show;},
-            onSelectShowWhitespaceBetweenColumns:(show:boolean)=>{this.showWhitespaceBetweenColumns = show;},
-            onSelectShowClinicalTrackLegends:(show:boolean)=>{this.showClinicalTrackLegends = show;},
-            onSelectShowMinimap:(show:boolean)=>{this.showMinimap = show;},
-            onSelectDistinguishMutationType:(s:boolean)=>{this.distinguishMutationType = s;},
-            onSelectDistinguishGermlineMutations:(s:boolean)=>{this.distinguishGermlineMutations = s;},
-            onSelectDistinguishDrivers:action((s:boolean)=>{
+            onSelectShowUnalteredColumns: (show: boolean) => {
+                this.props.store.showUnalteredColumns = show;
+            },
+            onSelectShowWhitespaceBetweenColumns: (show: boolean) => {
+                this.showWhitespaceBetweenColumns = show;
+            },
+            onSelectShowClinicalTrackLegends: (show: boolean) => {
+                this.showClinicalTrackLegends = show;
+            },
+            onSelectShowMinimap: (show: boolean) => {
+                this.showMinimap = show;
+            },
+            onSelectDistinguishMutationType: (s: boolean) => {
+                this.distinguishMutationType = s;
+            },
+            onSelectDistinguishGermlineMutations: (s: boolean) => {
+                this.distinguishGermlineMutations = s;
+            },
+            onSelectDistinguishDrivers: action((s: boolean) => {
                 if (!s) {
                     this.props.store.driverAnnotationSettings.oncoKb = false;
                     this.props.store.driverAnnotationSettings.cbioportalCount = false;
                     this.props.store.driverAnnotationSettings.customBinary = false;
                     this.props.store.driverAnnotationSettings.excludeVUS = false;
                 } else {
-                    if (!this.controlsState.annotateDriversOncoKbDisabled && !this.controlsState.annotateDriversOncoKbError) {
+                    if (
+                        !this.controlsState.annotateDriversOncoKbDisabled &&
+                        !this.controlsState.annotateDriversOncoKbError
+                    ) {
                         this.props.store.driverAnnotationSettings.oncoKb = true;
                     }
 
@@ -183,137 +205,164 @@ export default class Oncoprinter extends React.Component<IOncoprinterProps, {}>
                     this.props.store.driverAnnotationSettings.customBinary = true;
                 }
             }),
-            onSelectAnnotateOncoKb:action((s:boolean)=>{
+            onSelectAnnotateOncoKb: action((s: boolean) => {
                 this.props.store.driverAnnotationSettings.oncoKb = s;
             }),
-            onSelectAnnotateCBioPortal:action((s:boolean)=>{
+            onSelectAnnotateCBioPortal: action((s: boolean) => {
                 this.props.store.driverAnnotationSettings.cbioportalCount = s;
             }),
             /*onSelectAnnotateHotspots:action((s:boolean)=>{
                 this.props.store.driverAnnotationSettings.hotspots = s;
             }),*/
-            onChangeAnnotateCBioPortalInputValue:action((s:string)=>{
-                this.props.store.driverAnnotationSettings.cbioportalCountThreshold = parseInt(s, 10);
-                this.controlsHandlers.onSelectAnnotateCBioPortal && this.controlsHandlers.onSelectAnnotateCBioPortal(true);
+            onChangeAnnotateCBioPortalInputValue: action((s: string) => {
+                this.props.store.driverAnnotationSettings.cbioportalCountThreshold = parseInt(
+                    s,
+                    10
+                );
+                this.controlsHandlers.onSelectAnnotateCBioPortal &&
+                    this.controlsHandlers.onSelectAnnotateCBioPortal(true);
             }),
-            onSelectCustomDriverAnnotationBinary:action((s:boolean)=>{
+            onSelectCustomDriverAnnotationBinary: action((s: boolean) => {
                 this.props.store.driverAnnotationSettings.customBinary = s;
             }),
-            onSelectHidePutativePassengers:(s:boolean)=>{
+            onSelectHidePutativePassengers: (s: boolean) => {
                 this.props.store.driverAnnotationSettings.excludeVUS = s;
             },
-            onSelectHideGermlineMutations:(s:boolean)=>{
+            onSelectHideGermlineMutations: (s: boolean) => {
                 this.props.store.hideGermlineMutations = s;
             },
-            onSelectSortByMutationType:(s:boolean)=>{this.sortByMutationType = s;},
-            onSelectSortByDrivers:(sort:boolean)=>{this.sortByDrivers=sort;},
-            onClickDownload:(type:string)=>{
-                switch(type) {
-                    case "pdf":
-                        svgToPdfDownload("oncoprint.pdf", this.oncoprint.toSVG(false));
+            onSelectSortByMutationType: (s: boolean) => {
+                this.sortByMutationType = s;
+            },
+            onSelectSortByDrivers: (sort: boolean) => {
+                this.sortByDrivers = sort;
+            },
+            onClickDownload: (type: string) => {
+                switch (type) {
+                    case 'pdf':
+                        svgToPdfDownload(
+                            'oncoprint.pdf',
+                            this.oncoprint.toSVG(false)
+                        );
                         // if (!pdfDownload("oncoprint.pdf", this.oncoprint.toSVG(true))) {
                         //     alert("Oncoprint too big to download as PDF - please download as SVG.");
                         // }
                         break;
-                    case "png":
-                        const img = this.oncoprint.toCanvas((canvas, truncated)=>{
-                            canvas.toBlob(blob=>{
-                                if (truncated) {
-                                    alert(
-                                        `Oncoprint too large - PNG truncated to ${canvas.getAttribute("width")}x${canvas.getAttribute("height")}`
-                                    );
-                                }
-                                fileDownload(
-                                    blob,
-                                    "oncoprint.png"
-                                );
-                            });
-                        }, 2);
+                    case 'png':
+                        const img = this.oncoprint.toCanvas(
+                            (canvas, truncated) => {
+                                canvas.toBlob(blob => {
+                                    if (truncated) {
+                                        alert(
+                                            `Oncoprint too large - PNG truncated to ${canvas.getAttribute(
+                                                'width'
+                                            )}x${canvas.getAttribute('height')}`
+                                        );
+                                    }
+                                    fileDownload(blob, 'oncoprint.png');
+                                });
+                            },
+                            2
+                        );
                         break;
-                    case "svg":
+                    case 'svg':
                         fileDownload(
-                            (new XMLSerializer).serializeToString(this.oncoprint.toSVG(false)),
-                            "oncoprint.svg"
+                            new XMLSerializer().serializeToString(
+                                this.oncoprint.toSVG(false)
+                            ),
+                            'oncoprint.svg'
                         );
                         break;
-                    case "order":
-                        const capitalizedColumnMode = "Sample";
+                    case 'order':
+                        const capitalizedColumnMode = 'Sample';
                         let file = `${capitalizedColumnMode} order in the Oncoprint is:\n`;
                         const caseIds = this.oncoprint.getIdOrder();
                         for (const caseId of caseIds) {
                             file += `${caseId}\n`;
                         }
-                        fileDownload(
-                            file,
-                            `OncoPrintSamples.txt`
-                        );
+                        fileDownload(file, `OncoPrintSamples.txt`);
                         break;
                 }
             },
-            onSetHorzZoom:(z:number)=>{
+            onSetHorzZoom: (z: number) => {
                 this.oncoprint.setHorzZoom(z);
             },
-            onClickZoomIn:()=>{
-                this.oncoprint.setHorzZoom(this.oncoprint.getHorzZoom()/0.7);
+            onClickZoomIn: () => {
+                this.oncoprint.setHorzZoom(this.oncoprint.getHorzZoom() / 0.7);
             },
-            onClickZoomOut:()=>{
-                this.oncoprint.setHorzZoom(this.oncoprint.getHorzZoom()*0.7);
+            onClickZoomOut: () => {
+                this.oncoprint.setHorzZoom(this.oncoprint.getHorzZoom() * 0.7);
             },
-            onClickNGCHM:()=>{}	// do nothing in oncoprinter mode
+            onClickNGCHM: () => {}, // do nothing in oncoprinter mode
         };
     }
 
     @action
     private initializeOncoprint() {
-        onMobxPromise(this.props.store.alteredSampleIds,
-            (alteredUids:string[])=>{
+        onMobxPromise(
+            this.props.store.alteredSampleIds,
+            (alteredUids: string[]) => {
                 this.oncoprint.setHorzZoomToFit(alteredUids);
-            });
+            }
+        );
 
-        this.oncoprint.onHorzZoom(z=>(this.horzZoom = z));
+        this.oncoprint.onHorzZoom(z => (this.horzZoom = z));
         this.horzZoom = this.oncoprint.getHorzZoom();
     }
 
     @autobind
     @action
-    private oncoprintRef(oncoprint:OncoprintJS) {
+    private oncoprintRef(oncoprint: OncoprintJS) {
         this.oncoprint = oncoprint;
 
         this.initializeOncoprint();
     }
 
     @autobind
-    @action private onMinimapClose() {
+    @action
+    private onMinimapClose() {
         this.showMinimap = false;
     }
 
     @autobind
-    @action private onSuppressRendering() {
+    @action
+    private onSuppressRendering() {
         this.renderingComplete = false;
     }
 
     @autobind
-    @action private onReleaseRendering() {
+    @action
+    private onReleaseRendering() {
         this.renderingComplete = true;
     }
 
     @computed get sortConfig() {
         return {
-            sortByMutationType:this.sortByMutationType,
-            sortByDrivers:this.sortByDrivers,
+            sortByMutationType: this.sortByMutationType,
+            sortByDrivers: this.sortByDrivers,
             order: this.props.store.inputSampleIdOrder,
         };
     }
 
     @computed get alterationInfo() {
-        if (this.props.store.alteredSampleIds.isComplete ) {
+        if (this.props.store.alteredSampleIds.isComplete) {
             const numSamples = this.props.store.sampleIds.length;
-            const alteredSamples = this.props.store.alteredSampleIds.result.length;
+            const alteredSamples = this.props.store.alteredSampleIds.result
+                .length;
             return (
-                <span style={{marginTop:"15px", marginBottom:"15px", display: "block"}}>
-                    {`Altered in ${alteredSamples} (${percentAltered(alteredSamples, numSamples)}) of ${numSamples} samples.`}
+                <span
+                    style={{
+                        marginTop: '15px',
+                        marginBottom: '15px',
+                        display: 'block',
+                    }}
+                >
+                    {`Altered in ${alteredSamples} (${percentAltered(
+                        alteredSamples,
+                        numSamples
+                    )}) of ${numSamples} samples.`}
                 </span>
-            )
+            );
         } else {
             return null;
         }
@@ -321,9 +370,11 @@ export default class Oncoprinter extends React.Component<IOncoprinterProps, {}>
 
     @computed get isLoading() {
         // todo: use mobxview
-        return this.props.store.geneticTracks.isPending ||
+        return (
+            this.props.store.geneticTracks.isPending ||
             this.props.store.alteredSampleIds.isPending ||
-                this.props.store.unalteredSampleIds.isPending;
+            this.props.store.unalteredSampleIds.isPending
+        );
     }
 
     @computed get isHidden() {
@@ -333,15 +384,17 @@ export default class Oncoprinter extends React.Component<IOncoprinterProps, {}>
     @autobind
     private getControls() {
         if (this.oncoprint && !this.oncoprint.webgl_unavailable) {
-            return (<FadeInteraction showByDefault={true} show={true}>
-                <OncoprintControls
-                    handlers={this.controlsHandlers}
-                    state={this.controlsState}
-                    oncoprinterMode={true}
-                />
-            </FadeInteraction>);
+            return (
+                <FadeInteraction showByDefault={true} show={true}>
+                    <OncoprintControls
+                        handlers={this.controlsHandlers}
+                        state={this.controlsState}
+                        oncoprinterMode={true}
+                    />
+                </FadeInteraction>
+            );
         } else {
-            return <span/>;
+            return <span />;
         }
     }
 
@@ -352,35 +405,46 @@ export default class Oncoprinter extends React.Component<IOncoprinterProps, {}>
     public render() {
         return (
             <div className="posRelative">
-                <div className={classNames('oncoprintContainer', { fadeIn: !this.isHidden })}
-                     onMouseEnter={this.onMouseEnter}
-                     onMouseLeave={this.onMouseLeave}
+                <div
+                    className={classNames('oncoprintContainer', {
+                        fadeIn: !this.isHidden,
+                    })}
+                    onMouseEnter={this.onMouseEnter}
+                    onMouseLeave={this.onMouseLeave}
                 >
-                    { this.props.store.existCustomDrivers && !this.props.store.customDriverWarningHidden &&
-                        this.props.store.driverAnnotationSettings.customBinary && (
+                    {this.props.store.existCustomDrivers &&
+                        !this.props.store.customDriverWarningHidden &&
+                        this.props.store.driverAnnotationSettings
+                            .customBinary && (
                             <InfoBanner
-                                message={
-                                    `Driver annotations reflect only user-provided data. Use the Mutations menu to modify annotation settings.`
+                                message={`Driver annotations reflect only user-provided data. Use the Mutations menu to modify annotation settings.`}
+                                style={{ marginBottom: 10 }}
+                                hidden={
+                                    this.props.store.customDriverWarningHidden
                                 }
-                                style={{marginBottom:10}}
-                                hidden={this.props.store.customDriverWarningHidden}
-                                hide={()=>{ this.props.store.customDriverWarningHidden = true; }}
+                                hide={() => {
+                                    this.props.store.customDriverWarningHidden = true;
+                                }}
                             />
-                        )
-                    }
-                    <Observer>
-                        {this.getControls}
-                    </Observer>
+                        )}
+                    <Observer>{this.getControls}</Observer>
 
-                    <div style={{position:"relative"}} >
+                    <div style={{ position: 'relative' }}>
                         <div id="oncoprintDiv">
                             {this.alterationInfo}
                             <Oncoprint
                                 key={this.props.store.submitCount}
                                 oncoprintRef={this.oncoprintRef}
                                 clinicalTracks={this.props.store.clinicalTracks}
-                                geneticTracks={this.props.store.geneticTracks.result}
-                                geneticTracksOrder={this.props.store.geneOrder && this.props.store.geneOrder.map(getGeneticTrackKey)}
+                                geneticTracks={
+                                    this.props.store.geneticTracks.result
+                                }
+                                geneticTracksOrder={
+                                    this.props.store.geneOrder &&
+                                    this.props.store.geneOrder.map(
+                                        getGeneticTrackKey
+                                    )
+                                }
                                 genesetHeatmapTracks={[]}
                                 heatmapTracks={[]}
                                 divId={this.props.divId}
@@ -389,15 +453,26 @@ export default class Oncoprinter extends React.Component<IOncoprinterProps, {}>
                                 suppressRendering={this.isLoading}
                                 onSuppressRendering={this.onSuppressRendering}
                                 onReleaseRendering={this.onReleaseRendering}
-                                hiddenIds={this.props.store.hiddenSampleIds.result}
-                                showClinicalTrackLegends={this.showClinicalTrackLegends}
-
-                                horzZoomToFitIds={this.props.store.alteredSampleIds.result}
-                                distinguishMutationType={this.distinguishMutationType}
-                                distinguishGermlineMutations={this.distinguishGermlineMutations}
+                                hiddenIds={
+                                    this.props.store.hiddenSampleIds.result
+                                }
+                                showClinicalTrackLegends={
+                                    this.showClinicalTrackLegends
+                                }
+                                horzZoomToFitIds={
+                                    this.props.store.alteredSampleIds.result
+                                }
+                                distinguishMutationType={
+                                    this.distinguishMutationType
+                                }
+                                distinguishGermlineMutations={
+                                    this.distinguishGermlineMutations
+                                }
                                 distinguishDrivers={this.distinguishDrivers}
                                 sortConfig={this.sortConfig}
-                                showWhitespaceBetweenColumns={this.showWhitespaceBetweenColumns}
+                                showWhitespaceBetweenColumns={
+                                    this.showWhitespaceBetweenColumns
+                                }
                                 showMinimap={this.showMinimap}
                                 onMinimapClose={this.onMinimapClose}
                             />
@@ -407,4 +482,4 @@ export default class Oncoprinter extends React.Component<IOncoprinterProps, {}>
             </div>
         );
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/staticPages/tools/oncoprinter/OncoprinterClinicalUtils.ts b/src/pages/staticPages/tools/oncoprinter/OncoprinterClinicalUtils.ts
index 6a3d93819ad..24a7f9a4adf 100644
--- a/src/pages/staticPages/tools/oncoprinter/OncoprinterClinicalUtils.ts
+++ b/src/pages/staticPages/tools/oncoprinter/OncoprinterClinicalUtils.ts
@@ -1,65 +1,99 @@
-import _ from "lodash";
-import {fillGeneticTrackDatum} from "../../../../shared/components/oncoprint/DataUtils";
-import {OncoprinterGeneticTrackDatum, OncoprinterGeneticTrackDatum_Data} from "./OncoprinterGeneticUtils";
-import {CustomTrackOption} from "oncoprintjs";
-import {ClinicalTrackDatum, ClinicalTrackSpec} from "../../../../shared/components/oncoprint/Oncoprint";
-
-export const ONCOPRINTER_CLINICAL_VAL_NA = "N/A";
+import _ from 'lodash';
+import { fillGeneticTrackDatum } from '../../../../shared/components/oncoprint/DataUtils';
+import {
+    OncoprinterGeneticTrackDatum,
+    OncoprinterGeneticTrackDatum_Data,
+} from './OncoprinterGeneticUtils';
+import { CustomTrackOption } from 'oncoprintjs';
+import {
+    ClinicalTrackDatum,
+    ClinicalTrackSpec,
+} from '../../../../shared/components/oncoprint/Oncoprint';
+
+export const ONCOPRINTER_CLINICAL_VAL_NA = 'N/A';
 
 export type OncoprinterClinicalInputLine = {
-    sampleId:string;
-    orderedValues:string[];
+    sampleId: string;
+    orderedValues: string[];
 };
 
-type AttributeSpec = { clinicalAttributeName:string, datatype:ClinicalTrackDataType };
+type AttributeSpec = {
+    clinicalAttributeName: string;
+    datatype: ClinicalTrackDataType;
+};
 
-type OncoprinterClinicalTrackDatum = Pick<ClinicalTrackDatum, "attr_id"|"uid"|"attr_val_counts"|"na"> & {sample:string, attr_val:string|number};
+type OncoprinterClinicalTrackDatum = Pick<
+    ClinicalTrackDatum,
+    'attr_id' | 'uid' | 'attr_val_counts' | 'na'
+> & { sample: string; attr_val: string | number };
 
 const ATTRIBUTE_REGEX = /^((?:[^\(\)])+)(?:\(([^\(\)]+)\))?$/;
 
 enum ClinicalTrackDataType {
-    NUMBER="number", LOG_NUMBER="lognumber", STRING="string"
+    NUMBER = 'number',
+    LOG_NUMBER = 'lognumber',
+    STRING = 'string',
 }
 
-function parseClinicalDataHeader(headerLine:string[]) {
+function parseClinicalDataHeader(headerLine: string[]) {
     // we dont care about the first column, it's just "sample" or something
     headerLine.shift();
 
-    const errorPrefix = "Clinical data input error in line 1 (header): ";
-    const ret:AttributeSpec[] = [];
+    const errorPrefix = 'Clinical data input error in line 1 (header): ';
+    const ret: AttributeSpec[] = [];
     for (const attribute of headerLine) {
         const match = attribute.match(ATTRIBUTE_REGEX);
         if (!match) {
-            throw new Error(`${errorPrefix}misformatted attribute name ${attribute}`);
+            throw new Error(
+                `${errorPrefix}misformatted attribute name ${attribute}`
+            );
         }
-        const datatype = (match[2] || ClinicalTrackDataType.STRING).toLowerCase();
+        const datatype = (
+            match[2] || ClinicalTrackDataType.STRING
+        ).toLowerCase();
         if (
             datatype !== ClinicalTrackDataType.NUMBER &&
             datatype !== ClinicalTrackDataType.LOG_NUMBER &&
             datatype !== ClinicalTrackDataType.STRING
         ) {
-            throw new Error(`${errorPrefix}invalid track data type ${datatype}`);
+            throw new Error(
+                `${errorPrefix}invalid track data type ${datatype}`
+            );
         }
         ret.push({
             clinicalAttributeName: match[1],
-            datatype: datatype as ClinicalTrackDataType
+            datatype: datatype as ClinicalTrackDataType,
         });
     }
 
     return ret;
 }
 
-export function parseClinicalInput(input:string):{ status:"complete", result:{ headers:AttributeSpec[], data:OncoprinterClinicalInputLine[]}, error:undefined }|{ status:"error", result:undefined, error:string } {
+export function parseClinicalInput(
+    input: string
+):
+    | {
+          status: 'complete';
+          result: {
+              headers: AttributeSpec[];
+              data: OncoprinterClinicalInputLine[];
+          };
+          error: undefined;
+      }
+    | { status: 'error'; result: undefined; error: string } {
     // Output mimics mobxpromise form but thats just because its a nice way to package status and result.
     // This isn't meant to be plugged into mobxpromise machinery i.e. with `await`
 
-    const lines = input.trim().split("\n").map(line=>line.trim().split(/\s+/));
+    const lines = input
+        .trim()
+        .split('\n')
+        .map(line => line.trim().split(/\s+/));
 
     if (lines.length === 0) {
         return {
-            status: "complete",
-            result: { headers:[], data:[]},
-            error:undefined
+            status: 'complete',
+            result: { headers: [], data: [] },
+            error: undefined,
         };
     }
 
@@ -67,61 +101,72 @@ export function parseClinicalInput(input:string):{ status:"complete", result:{ h
         // Get attribute names from first line
         const attributes = parseClinicalDataHeader(lines.shift()!);
 
-        const result = lines.map((line, lineIndex)=>{
+        const result = lines.map((line, lineIndex) => {
             //                                                  add 2 to line index: 1 because we removed header, 1 because changing from 0- to 1-indexing
-            const errorPrefix = `Clinical data input error on line ${lineIndex+2}: \n${line.join("\t")}\n\n`;
+            const errorPrefix = `Clinical data input error on line ${lineIndex +
+                2}: \n${line.join('\t')}\n\n`;
             if (line.length === attributes.length + 1) {
-                const ret:OncoprinterClinicalInputLine = {
+                const ret: OncoprinterClinicalInputLine = {
                     sampleId: line[0],
-                    orderedValues: line.slice(1)
+                    orderedValues: line.slice(1),
                 };
                 return ret;
             } else {
-                throw new Error(`${errorPrefix}data lines must have ${attributes.length + 1} columns, the same number as in the header.`);
+                throw new Error(
+                    `${errorPrefix}data lines must have ${attributes.length +
+                        1} columns, the same number as in the header.`
+                );
             }
         });
         return {
-            status: "complete",
-            result: { headers: attributes, data: result.filter(x=>!!x) as OncoprinterClinicalInputLine[]},
-            error:undefined
+            status: 'complete',
+            result: {
+                headers: attributes,
+                data: result.filter(x => !!x) as OncoprinterClinicalInputLine[],
+            },
+            error: undefined,
         };
     } catch (e) {
         return {
-            status:"error",
-            result:undefined,
-            error:e.message
+            status: 'error',
+            result: undefined,
+            error: e.message,
         };
     }
 }
 
 export function getClinicalOncoprintData(
-    attributes:AttributeSpec[],
-    parsedLines:OncoprinterClinicalInputLine[]
+    attributes: AttributeSpec[],
+    parsedLines: OncoprinterClinicalInputLine[]
 ) {
-
-    const ret:{[clinicalAttributeName:string]:OncoprinterClinicalTrackDatum[]} = {};
+    const ret: {
+        [clinicalAttributeName: string]: OncoprinterClinicalTrackDatum[];
+    } = {};
     for (const attr of attributes) {
         ret[attr.clinicalAttributeName] = [];
     }
 
     for (const line of parsedLines) {
-        for (let i=0; i<attributes.length; i++) {
+        for (let i = 0; i < attributes.length; i++) {
             const rawValue = line.orderedValues[i];
-            const value = attributes[i].datatype === ClinicalTrackDataType.STRING ? rawValue : parseFloat(rawValue);
+            const value =
+                attributes[i].datatype === ClinicalTrackDataType.STRING
+                    ? rawValue
+                    : parseFloat(rawValue);
             ret[attributes[i].clinicalAttributeName].push({
                 sample: line.sampleId,
                 attr_id: attributes[i].clinicalAttributeName,
-                attr_val_counts: {[value]:1},
-                attr_val:value,
+                attr_val_counts: { [value]: 1 },
+                attr_val: value,
                 uid: line.sampleId,
-                na: rawValue === ONCOPRINTER_CLINICAL_VAL_NA
+                na: rawValue === ONCOPRINTER_CLINICAL_VAL_NA,
             });
         }
     }
     return ret;
 }
 
-function getNumberRange(data:OncoprinterClinicalTrackDatum[]) {
+function getNumberRange(data: OncoprinterClinicalTrackDatum[]) {
     let min = Number.POSITIVE_INFINITY;
     let max = Number.NEGATIVE_INFINITY;
     for (const d of data) {
@@ -133,33 +178,44 @@ function getNumberRange(data:OncoprinterClinicalTrackDatum[]) {
     return [min, max];
 }
 
-export function getClinicalTrackKey(attributeName:string) {
+export function getClinicalTrackKey(attributeName: string) {
     return `clinicalTrack_${attributeName}`;
 }
 
 export function getClinicalTracks(
-    attributes:AttributeSpec[],
-    parsedLines:OncoprinterClinicalInputLine[],
-    excludedSampleIds?:string[]
-):ClinicalTrackSpec[] {
-
-    let attributeToOncoprintData = getClinicalOncoprintData(attributes, parsedLines);
+    attributes: AttributeSpec[],
+    parsedLines: OncoprinterClinicalInputLine[],
+    excludedSampleIds?: string[]
+): ClinicalTrackSpec[] {
+    let attributeToOncoprintData = getClinicalOncoprintData(
+        attributes,
+        parsedLines
+    );
     // remove excluded sample data
     const excludedSampleIdsMap = _.keyBy(excludedSampleIds || []);
-    attributeToOncoprintData = _.mapValues(attributeToOncoprintData, data=>{
-        return data.filter(d=>!(d.sample in excludedSampleIdsMap));
+    attributeToOncoprintData = _.mapValues(attributeToOncoprintData, data => {
+        return data.filter(d => !(d.sample in excludedSampleIdsMap));
     });
 
-    return attributes.map(attr=>{
+    return attributes.map(attr => {
         const data = attributeToOncoprintData[attr.clinicalAttributeName];
         return {
             key: getClinicalTrackKey(attr.clinicalAttributeName),
             label: attr.clinicalAttributeName,
             data,
-            datatype:attr.datatype === ClinicalTrackDataType.STRING ? "string" : "number",
-            description:"",
-            numberRange: attr.datatype === ClinicalTrackDataType.STRING ? undefined : getNumberRange(data),
-            numberLogScale: attr.datatype === ClinicalTrackDataType.LOG_NUMBER ? true : undefined
+            datatype:
+                attr.datatype === ClinicalTrackDataType.STRING
+                    ? 'string'
+                    : 'number',
+            description: '',
+            numberRange:
+                attr.datatype === ClinicalTrackDataType.STRING
+                    ? undefined
+                    : getNumberRange(data),
+            numberLogScale:
+                attr.datatype === ClinicalTrackDataType.LOG_NUMBER
+                    ? true
+                    : undefined,
         } as ClinicalTrackSpec;
     });
-}
\ No newline at end of file
+}
diff --git a/src/pages/staticPages/tools/oncoprinter/OncoprinterConstants.ts b/src/pages/staticPages/tools/oncoprinter/OncoprinterConstants.ts
index dc596d41b67..058ce89faa2 100644
--- a/src/pages/staticPages/tools/oncoprinter/OncoprinterConstants.ts
+++ b/src/pages/staticPages/tools/oncoprinter/OncoprinterConstants.ts
@@ -1,4 +1,4 @@
-import {ONCOPRINTER_CLINICAL_VAL_NA} from "./OncoprinterClinicalUtils";
+import { ONCOPRINTER_CLINICAL_VAL_NA } from './OncoprinterClinicalUtils';
 
 export const exampleGeneticData = `TCGA-25-2392-01	TP53	FUSION	FUSION
 TCGA-04-1331-01	PTEN	HOMDEL	CNA
@@ -592,7 +592,6 @@ TCGA-25-2392-01
 TCGA-25-2393-01
 `;
 
-
 export const exampleClinicalData = `sample\tAGE(number)\tCANCER_TYPE\tMUTATION_COUNT(lognumber)
 TCGA-25-2392-01\t24\tProstate\t63
 TCGA-25-2393-01\t33\tLung\t83
@@ -962,4 +961,4 @@ TCGA-25-2042-01\t50\tProstate\t49
 TCGA-25-2390-01\t21\tProstate\t17
 TCGA-25-2396-01\t51\tBreast\t1
 TCGA-25-2397-01\t33\tBreast\t40
-`;
\ No newline at end of file
+`;
diff --git a/src/pages/staticPages/tools/oncoprinter/OncoprinterGeneticUtils.spec.ts b/src/pages/staticPages/tools/oncoprinter/OncoprinterGeneticUtils.spec.ts
index f54a187644a..ef3a89ce393 100644
--- a/src/pages/staticPages/tools/oncoprinter/OncoprinterGeneticUtils.spec.ts
+++ b/src/pages/staticPages/tools/oncoprinter/OncoprinterGeneticUtils.spec.ts
@@ -1,107 +1,122 @@
-import {assert} from "chai";
-import OncoprinterStore from "./OncoprinterStore";
-import {initDriverAnnotationSettings, parseGeneticInput} from "./OncoprinterGeneticUtils";
-import AppConfig from "appConfig";
+import { assert } from 'chai';
+import OncoprinterStore from './OncoprinterStore';
+import {
+    initDriverAnnotationSettings,
+    parseGeneticInput,
+} from './OncoprinterGeneticUtils';
+import AppConfig from 'appConfig';
 
-describe("OncoprinterGeneticUtils", () => {
-   describe("initDriverAnnotationSettings", ()=>{
-       it("initializes correctly with custom drivers", ()=>{
-           // only custom drivers selected as annotation source
-           const store = { existCustomDrivers:true } as OncoprinterStore;
-           const settings = initDriverAnnotationSettings(store);
-           assert.isTrue(settings.customBinary);
-           assert.isFalse(settings.oncoKb);
-           assert.isFalse(settings.cbioportalCount);
-       });
-       it("initializes correctly without custom drivers", ()=>{
-           // only oncokb selected as annotation source
-           AppConfig.serverConfig.show_oncokb = true;
-           const store = { existCustomDrivers:false } as OncoprinterStore;
-           const settings = initDriverAnnotationSettings(store);
-           assert.isTrue(settings.oncoKb);
-           assert.isFalse(settings.customBinary);
-           assert.isFalse(settings.cbioportalCount);
-       });
-   });
+describe('OncoprinterGeneticUtils', () => {
+    describe('initDriverAnnotationSettings', () => {
+        it('initializes correctly with custom drivers', () => {
+            // only custom drivers selected as annotation source
+            const store = { existCustomDrivers: true } as OncoprinterStore;
+            const settings = initDriverAnnotationSettings(store);
+            assert.isTrue(settings.customBinary);
+            assert.isFalse(settings.oncoKb);
+            assert.isFalse(settings.cbioportalCount);
+        });
+        it('initializes correctly without custom drivers', () => {
+            // only oncokb selected as annotation source
+            AppConfig.serverConfig.show_oncokb = true;
+            const store = { existCustomDrivers: false } as OncoprinterStore;
+            const settings = initDriverAnnotationSettings(store);
+            assert.isTrue(settings.oncoKb);
+            assert.isFalse(settings.customBinary);
+            assert.isFalse(settings.cbioportalCount);
+        });
+    });
 
-   describe("parseGeneticInput", ()=>{
-       it("parses fusion command correctly", ()=>{
-           assert.deepEqual(
-               parseGeneticInput("sample_id TP53 FUSION FUSION"),
-               {
-                   status: "complete",
-                   result: [{
-                       sampleId: "sample_id",
-                       hugoGeneSymbol:"TP53",
-                       alteration: "fusion",
-                       proteinChange: "FUSION",
-                   }],
-                   error: undefined
-               }
-           );
-       });
-       it("throws an error if fusion is not specified correctly", ()=>{
-           try {
-               const parsed = parseGeneticInput("sample_id TP53 FUSION apsoidjfpaos");
-               assert(false);
-           } catch(e) {
-           }
-       });
-       it("parses germline mutation correctly", ()=>{
-           assert.deepEqual(
-               parseGeneticInput("sampleid	BRCA1	Q1538A	MISSENSE_GERMLINE"),
-               {
-                   status: "complete",
-                   result: [{
-                       sampleId:"sampleid",
-                       hugoGeneSymbol:"BRCA1",
-                       alteration:"missense",
-                       proteinChange:"Q1538A",
-                       isGermline: true,
-                   }],
-                   error: undefined
-               }
-           );
-       });
-       it("parses driver mutation correctly", ()=>{
-           assert.deepEqual(
-               parseGeneticInput("sampleid	BRCA1	Q1538A	TRUNC_DRIVER"),
-               {
-                   status: "complete",
-                   result: [{
-                       sampleId:"sampleid",
-                       hugoGeneSymbol:"BRCA1",
-                       alteration:"trunc",
-                       proteinChange:"Q1538A",
-                       isCustomDriver:true
-                   }],
-                   error: undefined
-               }
-           );
-       });
-       it("parses germline & driver mutation correctly", ()=>{
-           assert.deepEqual(
-               parseGeneticInput("sampleid	BRCA1	Q1538A	MISSENSE_GERMLINE_DRIVER"),
-               {
-                   status: "complete",
-                   result: [{
-                       sampleId:"sampleid",
-                       hugoGeneSymbol:"BRCA1",
-                       alteration:"missense",
-                       proteinChange:"Q1538A",
-                       isGermline: true,
-                       isCustomDriver:true
-                   }],
-                   error: undefined
-               }
-           );
-       });
-       it("throws an error for an invalid mutation modifier", ()=>{
-           try {
-               const parsed = parseGeneticInput("sample_id TP53 protienchange MISSENSE_JIDFPAOIJFP");
-               assert(false);
-           } catch(e) {
-           }
-       });
-   });
-});
\ No newline at end of file
+    describe('parseGeneticInput', () => {
+        it('parses fusion command correctly', () => {
+            assert.deepEqual(
+                parseGeneticInput('sample_id TP53 FUSION FUSION'),
+                {
+                    status: 'complete',
+                    result: [
+                        {
+                            sampleId: 'sample_id',
+                            hugoGeneSymbol: 'TP53',
+                            alteration: 'fusion',
+                            proteinChange: 'FUSION',
+                        },
+                    ],
+                    error: undefined,
+                }
+            );
+        });
+        it('throws an error if fusion is not specified correctly', () => {
+            try {
+                const parsed = parseGeneticInput(
+                    'sample_id TP53 FUSION apsoidjfpaos'
+                );
+                assert(false);
+            } catch (e) {}
+        });
+        it('parses germline mutation correctly', () => {
+            assert.deepEqual(
+                parseGeneticInput('sampleid	BRCA1	Q1538A	MISSENSE_GERMLINE'),
+                {
+                    status: 'complete',
+                    result: [
+                        {
+                            sampleId: 'sampleid',
+                            hugoGeneSymbol: 'BRCA1',
+                            alteration: 'missense',
+                            proteinChange: 'Q1538A',
+                            isGermline: true,
+                        },
+                    ],
+                    error: undefined,
+                }
+            );
+        });
+        it('parses driver mutation correctly', () => {
+            assert.deepEqual(
+                parseGeneticInput('sampleid	BRCA1	Q1538A	TRUNC_DRIVER'),
+                {
+                    status: 'complete',
+                    result: [
+                        {
+                            sampleId: 'sampleid',
+                            hugoGeneSymbol: 'BRCA1',
+                            alteration: 'trunc',
+                            proteinChange: 'Q1538A',
+                            isCustomDriver: true,
+                        },
+                    ],
+                    error: undefined,
+                }
+            );
+        });
+        it('parses germline & driver mutation correctly', () => {
+            assert.deepEqual(
+                parseGeneticInput(
+                    'sampleid	BRCA1	Q1538A	MISSENSE_GERMLINE_DRIVER'
+                ),
+                {
+                    status: 'complete',
+                    result: [
+                        {
+                            sampleId: 'sampleid',
+                            hugoGeneSymbol: 'BRCA1',
+                            alteration: 'missense',
+                            proteinChange: 'Q1538A',
+                            isGermline: true,
+                            isCustomDriver: true,
+                        },
+                    ],
+                    error: undefined,
+                }
+            );
+        });
+        it('throws an error for an invalid mutation modifier', () => {
+            try {
+                const parsed = parseGeneticInput(
+                    'sample_id TP53 protienchange MISSENSE_JIDFPAOIJFP'
+                );
+                assert(false);
+            } catch (e) {}
+        });
+    });
+});
diff --git a/src/pages/staticPages/tools/oncoprinter/OncoprinterGeneticUtils.ts b/src/pages/staticPages/tools/oncoprinter/OncoprinterGeneticUtils.ts
index 42975ca9b2b..6933599da88 100644
--- a/src/pages/staticPages/tools/oncoprinter/OncoprinterGeneticUtils.ts
+++ b/src/pages/staticPages/tools/oncoprinter/OncoprinterGeneticUtils.ts
@@ -1,38 +1,70 @@
-import {observable} from "mobx";
-import AppConfig from "appConfig";
-import {default as OncoprinterStore} from "./OncoprinterStore";
-import _ from "lodash";
-import {GeneticTrackDatum, GeneticTrackDatum_Data,} from "../../../../shared/components/oncoprint/Oncoprint";
-import {percentAltered} from "../../../../shared/components/oncoprint/OncoprintUtils";
-import {AlterationTypeConstants} from "../../../resultsView/ResultsViewPageStore";
-import {cna_profile_data_to_string} from "../../../../shared/lib/oql/AccessorsForOqlFilter";
-import {fillGeneticTrackDatum, OncoprintMutationType} from "../../../../shared/components/oncoprint/DataUtils";
-import {Gene, Mutation, NumericGeneMolecularData} from "../../../../shared/api/generated/CBioPortalAPI";
+import { observable } from 'mobx';
+import AppConfig from 'appConfig';
+import { default as OncoprinterStore } from './OncoprinterStore';
+import _ from 'lodash';
+import {
+    GeneticTrackDatum,
+    GeneticTrackDatum_Data,
+} from '../../../../shared/components/oncoprint/Oncoprint';
+import { percentAltered } from '../../../../shared/components/oncoprint/OncoprintUtils';
+import { AlterationTypeConstants } from '../../../resultsView/ResultsViewPageStore';
+import { cna_profile_data_to_string } from '../../../../shared/lib/oql/AccessorsForOqlFilter';
+import {
+    fillGeneticTrackDatum,
+    OncoprintMutationType,
+} from '../../../../shared/components/oncoprint/DataUtils';
+import {
+    Gene,
+    Mutation,
+    NumericGeneMolecularData,
+} from '../../../../shared/api/generated/CBioPortalAPI';
 import {
     generateQueryVariantId,
     getProteinPositionFromProteinChange,
     OncoKbAPI,
     Query,
-} from "cbioportal-frontend-commons";
-import {ONCOKB_DEFAULT, queryOncoKbData} from "../../../../shared/lib/StoreUtils";
-import {generateQueryVariant} from "../../../../shared/lib/OncoKbUtils";
-import {default as oncokbClient} from "../../../../shared/api/oncokbClientInstance";
-import {IOncoKbData} from "../../../../shared/model/OncoKB";
-import MobxPromise from "mobxpromise";
-import {getOncoKbOncogenic} from "../../../resultsView/ResultsViewPageStoreUtils";
-import {mutationCountByPositionKey} from "../../../resultsView/mutationCountHelpers";
-import {getAlterationString} from "../../../../shared/lib/CopyNumberUtils";
-import {GERMLINE_REGEXP} from "../../../../shared/lib/MutationUtils";
-import {parseOQLQuery} from "../../../../shared/lib/oql/oqlfilter";
-import {Alteration, MUTCommand} from "../../../../shared/lib/oql/oql-parser";
-import {MUTATION_STATUS_GERMLINE, PUTATIVE_DRIVER} from "../../../../shared/constants";
-
-export type OncoprinterGeneticTrackDatum =
-    Pick<GeneticTrackDatum, "trackLabel" | "study_id" | "uid" |
-                            "disp_mut" | "disp_cna" | "disp_mrna" | "disp_prot" | "disp_fusion" | "disp_germ"> & { sample:string, patient:string, data:OncoprinterGeneticTrackDatum_Data[]} ;
-
-export type OncoprinterGeneticTrackDatum_Data =
-    GeneticTrackDatum_Data & Pick<Partial<Mutation>, "proteinPosStart" | "proteinPosEnd" | "startPosition" | "endPosition">;
+} from 'cbioportal-frontend-commons';
+import {
+    ONCOKB_DEFAULT,
+    queryOncoKbData,
+} from '../../../../shared/lib/StoreUtils';
+import { generateQueryVariant } from '../../../../shared/lib/OncoKbUtils';
+import { default as oncokbClient } from '../../../../shared/api/oncokbClientInstance';
+import { IOncoKbData } from '../../../../shared/model/OncoKB';
+import MobxPromise from 'mobxpromise';
+import { getOncoKbOncogenic } from '../../../resultsView/ResultsViewPageStoreUtils';
+import { mutationCountByPositionKey } from '../../../resultsView/mutationCountHelpers';
+import { getAlterationString } from '../../../../shared/lib/CopyNumberUtils';
+import { GERMLINE_REGEXP } from '../../../../shared/lib/MutationUtils';
+import { parseOQLQuery } from '../../../../shared/lib/oql/oqlfilter';
+import { Alteration, MUTCommand } from '../../../../shared/lib/oql/oql-parser';
+import {
+    MUTATION_STATUS_GERMLINE,
+    PUTATIVE_DRIVER,
+} from '../../../../shared/constants';
+
+export type OncoprinterGeneticTrackDatum = Pick<
+    GeneticTrackDatum,
+    | 'trackLabel'
+    | 'study_id'
+    | 'uid'
+    | 'disp_mut'
+    | 'disp_cna'
+    | 'disp_mrna'
+    | 'disp_prot'
+    | 'disp_fusion'
+    | 'disp_germ'
+> & {
+    sample: string;
+    patient: string;
+    data: OncoprinterGeneticTrackDatum_Data[];
+};
+
+export type OncoprinterGeneticTrackDatum_Data = GeneticTrackDatum_Data &
+    Pick<
+        Partial<Mutation>,
+        'proteinPosStart' | 'proteinPosEnd' | 'startPosition' | 'endPosition'
+    >;
 
 type OncoprinterGeneticTrackSpec = {
     key: string; // for efficient diffing, just like in React. must be unique
@@ -42,14 +74,23 @@ type OncoprinterGeneticTrackSpec = {
 };
 
 export type OncoprinterGeneticInputLineType1 = {
-    sampleId:string;
-}
+    sampleId: string;
+};
 export type OncoprinterGeneticInputLineType2 = OncoprinterGeneticInputLineType1 & {
-    hugoGeneSymbol:string;
-    alteration:OncoprintMutationType | "amp" | "homdel" | "gain" | "hetloss" | "mrnaHigh" | "mrnaLow" | "protHigh" | "protLow";
-    isGermline?:boolean;
-    isCustomDriver?:boolean;
-    proteinChange?:string;
+    hugoGeneSymbol: string;
+    alteration:
+        | OncoprintMutationType
+        | 'amp'
+        | 'homdel'
+        | 'gain'
+        | 'hetloss'
+        | 'mrnaHigh'
+        | 'mrnaLow'
+        | 'protHigh'
+        | 'protLow';
+    isGermline?: boolean;
+    isCustomDriver?: boolean;
+    proteinChange?: string;
 };
 /* Leaving commented only for reference, this will be replaced by unified input strategy
 export type OncoprinterInputLineType3_Incomplete = OncoprinterInputLineType1 & {
@@ -71,18 +112,22 @@ export type OncoprinterInputLineType3 = OncoprinterInputLineType3_Incomplete & {
 export type OncoprinterInputLineIncomplete = OncoprinterInputLineType1 | OncoprinterInputLineType2 | OncoprinterInputLineType3_Incomplete;
 */
 
-export type OncoprinterGeneticInputLine = OncoprinterGeneticInputLineType1 | OncoprinterGeneticInputLineType2;
+export type OncoprinterGeneticInputLine =
+    | OncoprinterGeneticInputLineType1
+    | OncoprinterGeneticInputLineType2;
 
-export function isType2(inputLine:OncoprinterGeneticInputLine):inputLine is OncoprinterGeneticInputLineType2 {
-    return inputLine.hasOwnProperty("alteration");
+export function isType2(
+    inputLine: OncoprinterGeneticInputLine
+): inputLine is OncoprinterGeneticInputLineType2 {
+    return inputLine.hasOwnProperty('alteration');
 }
 /* Leaving commented only for reference, this will be replaced by unified input strategy
 export function isType3NoGene(inputLine:OncoprinterInputLine):inputLine is OncoprinterInputLineType3_Incomplete {
     return inputLine.hasOwnProperty("chromosome");
 }*/
 
-export function initDriverAnnotationSettings(store:OncoprinterStore) {
-    let _oncoKb:boolean, _cbioportalCount:boolean, _customBinary:boolean;
+export function initDriverAnnotationSettings(store: OncoprinterStore) {
+    let _oncoKb: boolean, _cbioportalCount: boolean, _customBinary: boolean;
     if (store.existCustomDrivers) {
         // if custom drivers, start with only custom drivers annotated
         _oncoKb = false;
@@ -102,29 +147,32 @@ export function initDriverAnnotationSettings(store:OncoprinterStore) {
         _excludeVUS: false,
         hotspots: false, // for now
 
-
         get customBinary() {
             return this._customBinary;
         },
-        set customBinary(val:boolean) {
+        set customBinary(val: boolean) {
             this._customBinary = val;
             store.customDriverWarningHidden = true;
         },
         get cbioportalCount() {
             return this._cbioportalCount;
         },
-        set cbioportalCount(val:boolean) {
+        set cbioportalCount(val: boolean) {
             this._cbioportalCount = val;
             store.customDriverWarningHidden = true;
         },
-        set oncoKb(val:boolean) {
+        set oncoKb(val: boolean) {
             this._oncoKb = val;
             store.customDriverWarningHidden = true;
         },
         get oncoKb() {
-            return !!(AppConfig.serverConfig.show_oncokb && this._oncoKb && !store.didOncoKbFail);
+            return !!(
+                AppConfig.serverConfig.show_oncokb &&
+                this._oncoKb &&
+                !store.didOncoKbFail
+            );
         },
-        set excludeVUS(val:boolean) {
+        set excludeVUS(val: boolean) {
             this._excludeVUS = val;
         },
         get excludeVUS() {
@@ -138,73 +186,107 @@ export function initDriverAnnotationSettings(store:OncoprinterStore) {
                 (store.existCustomDrivers && this.customBinary);
 
             return anySelected;
-        }
+        },
     });
 }
 
-export function getSampleIds(oncoprinterInput:Pick<OncoprinterGeneticInputLine, "sampleId">[]):string[] {
-    return _.chain(oncoprinterInput).map(o=>o.sampleId).uniq().value();
+export function getSampleIds(
+    oncoprinterInput: Pick<OncoprinterGeneticInputLine, 'sampleId'>[]
+): string[] {
+    return _.chain(oncoprinterInput)
+        .map(o => o.sampleId)
+        .uniq()
+        .value();
 }
 
-export function getGeneSymbols(oncoprinterInput:OncoprinterGeneticInputLine[]):string[] {
-    return (_.chain(oncoprinterInput).filter(o=>isType2(o)) as any)
-        .map((o:OncoprinterGeneticInputLineType2)=>o.hugoGeneSymbol)
+export function getGeneSymbols(
+    oncoprinterInput: OncoprinterGeneticInputLine[]
+): string[] {
+    return (_.chain(oncoprinterInput).filter(o => isType2(o)) as any)
+        .map((o: OncoprinterGeneticInputLineType2) => o.hugoGeneSymbol)
         .uniq()
         .value();
 }
 
-export async function fetchOncoKbDataForMutations(annotatedGenes:{[entrezGeneId:number]:boolean}|Error,
-                                                   data:OncoprinterGeneticTrackDatum_Data[],
-                                                   client: OncoKbAPI = oncokbClient)
-{
+export async function fetchOncoKbDataForMutations(
+    annotatedGenes: { [entrezGeneId: number]: boolean } | Error,
+    data: OncoprinterGeneticTrackDatum_Data[],
+    client: OncoKbAPI = oncokbClient
+) {
     if (annotatedGenes instanceof Error) {
         return new Error();
     }
 
-    const mutationsToQuery = _.chain(data).filter(m=>!!annotatedGenes[m.entrezGeneId])
-        .filter(d=>(d.proteinPosStart !== undefined && d.proteinPosEnd !== undefined))
+    const mutationsToQuery = _.chain(data)
+        .filter(m => !!annotatedGenes[m.entrezGeneId])
+        .filter(
+            d =>
+                d.proteinPosStart !== undefined && d.proteinPosEnd !== undefined
+        )
         .value();
 
     if (mutationsToQuery.length === 0) {
         return ONCOKB_DEFAULT;
     }
 
-    const queryVariants = _.uniqBy(_.map(mutationsToQuery, (mutation) => {
-        return generateQueryVariant(mutation.entrezGeneId,
-            null,
-            mutation.proteinChange,
-            mutation.mutationType,
-            mutation.proteinPosStart,
-            mutation.proteinPosEnd);
-    }), "id");
-    return queryOncoKbData(queryVariants, {}, client, "ONCOGENIC");
+    const queryVariants = _.uniqBy(
+        _.map(mutationsToQuery, mutation => {
+            return generateQueryVariant(
+                mutation.entrezGeneId,
+                null,
+                mutation.proteinChange,
+                mutation.mutationType,
+                mutation.proteinPosStart,
+                mutation.proteinPosEnd
+            );
+        }),
+        'id'
+    );
+    return queryOncoKbData(queryVariants, {}, client, 'ONCOGENIC');
 }
 
-export async function fetchOncoKbDataForCna(annotatedGenes:{[entrezGeneId:number]:boolean}|Error,
-                                            data:OncoprinterGeneticTrackDatum_Data[],
-                                            client: OncoKbAPI = oncokbClient)
-{
+export async function fetchOncoKbDataForCna(
+    annotatedGenes: { [entrezGeneId: number]: boolean } | Error,
+    data: OncoprinterGeneticTrackDatum_Data[],
+    client: OncoKbAPI = oncokbClient
+) {
     if (annotatedGenes instanceof Error) {
         return new Error();
     }
 
-    const alterationsToQuery = _.chain(data).filter(m=>!!annotatedGenes[m.entrezGeneId])
-                                .filter(d=>(d.molecularProfileAlterationType === AlterationTypeConstants.COPY_NUMBER_ALTERATION))
-                                .value();
+    const alterationsToQuery = _.chain(data)
+        .filter(m => !!annotatedGenes[m.entrezGeneId])
+        .filter(
+            d =>
+                d.molecularProfileAlterationType ===
+                AlterationTypeConstants.COPY_NUMBER_ALTERATION
+        )
+        .value();
 
     if (alterationsToQuery.length === 0) {
         return ONCOKB_DEFAULT;
     }
-    const queryVariants = _.chain(alterationsToQuery).map((datum: NumericGeneMolecularData) => {
-        return generateQueryVariant(datum.entrezGeneId,
-            null,
-            getAlterationString(datum.value));
-    }).uniqBy("id").value() as any as Query[]; // lodash typings not perfect
-    return queryOncoKbData(queryVariants, {}, client, "ONCOGENIC");
+    const queryVariants = (_.chain(alterationsToQuery)
+        .map((datum: NumericGeneMolecularData) => {
+            return generateQueryVariant(
+                datum.entrezGeneId,
+                null,
+                getAlterationString(datum.value)
+            );
+        })
+        .uniqBy('id')
+        .value() as any) as Query[]; // lodash typings not perfect
+    return queryOncoKbData(queryVariants, {}, client, 'ONCOGENIC');
 }
 
-function makeGeneticTrackDatum_Data(oncoprinterInputLine:OncoprinterGeneticInputLineType2, hugoGeneSymbolToGene:{[hugoGeneSymbol:string]:Gene}) {
-    return makeGeneticTrackDatum_Data_Type2(oncoprinterInputLine, hugoGeneSymbolToGene);
+function makeGeneticTrackDatum_Data(
+    oncoprinterInputLine: OncoprinterGeneticInputLineType2,
+    hugoGeneSymbolToGene: { [hugoGeneSymbol: string]: Gene }
+) {
+    return makeGeneticTrackDatum_Data_Type2(
+        oncoprinterInputLine,
+        hugoGeneSymbolToGene
+    );
 }
 /* Leaving commented only for reference, this will be replaced by unified input strategy
 function makeGeneticTrackDatum_Data_Type3(oncoprinterInputLine:OncoprinterInputLineType3, hugoGeneSymbolToGene:{[hugoGeneSymbol:string]:Gene}) {
@@ -252,32 +334,41 @@ function makeGeneticTrackDatum_Data_Type3(oncoprinterInputLine:OncoprinterInputL
     return ret as OncoprinterGeneticTrackDatum_Data;
 }*/
 
-export function makeGeneticTrackDatum_Data_Type2(oncoprinterInputLine:OncoprinterGeneticInputLineType2, hugoGeneSymbolToGene:{[hugoGeneSymbol:string]:Gene}) {
-    let ret:Partial<OncoprinterGeneticTrackDatum_Data> = {
+export function makeGeneticTrackDatum_Data_Type2(
+    oncoprinterInputLine: OncoprinterGeneticInputLineType2,
+    hugoGeneSymbolToGene: { [hugoGeneSymbol: string]: Gene }
+) {
+    let ret: Partial<OncoprinterGeneticTrackDatum_Data> = {
         // we'll never set these values - theyre not needed for oncoprinter
-        driverTiersFilter:"",
-        driverTiersFilterAnnotation:"",
+        driverTiersFilter: '',
+        driverTiersFilterAnnotation: '',
 
         // we'll update these values later, not in this function
-        oncoKbOncogenic: "",
-        isHotspot:false,
+        oncoKbOncogenic: '',
+        isHotspot: false,
         putativeDriver: false,
 
         // these are the same always or almost always
-        hugoGeneSymbol:oncoprinterInputLine.hugoGeneSymbol,
-        proteinChange:oncoprinterInputLine.proteinChange,
-        mutationStatus: oncoprinterInputLine.isGermline ? MUTATION_STATUS_GERMLINE : "",
-        driverFilter:oncoprinterInputLine.isCustomDriver ? PUTATIVE_DRIVER : "",
-        driverFilterAnnotation:oncoprinterInputLine.isCustomDriver ? "You indicated that this mutation is a driver." : "",
+        hugoGeneSymbol: oncoprinterInputLine.hugoGeneSymbol,
+        proteinChange: oncoprinterInputLine.proteinChange,
+        mutationStatus: oncoprinterInputLine.isGermline
+            ? MUTATION_STATUS_GERMLINE
+            : '',
+        driverFilter: oncoprinterInputLine.isCustomDriver
+            ? PUTATIVE_DRIVER
+            : '',
+        driverFilterAnnotation: oncoprinterInputLine.isCustomDriver
+            ? 'You indicated that this mutation is a driver.'
+            : '',
 
         // we'll update these later in this function
         molecularProfileAlterationType: undefined, // the profile type in AlterationTypeConstants
-        alterationSubType: "", // high or low or cna_profile_data_to_string[value] or SimplifiedMutationType,
-        value:undefined, // numeric cna
-        mutationType: "",
-        entrezGeneId:0,
-        proteinPosStart:undefined,
-        proteinPosEnd:undefined
+        alterationSubType: '', // high or low or cna_profile_data_to_string[value] or SimplifiedMutationType,
+        value: undefined, // numeric cna
+        mutationType: '',
+        entrezGeneId: 0,
+        proteinPosStart: undefined,
+        proteinPosEnd: undefined,
     };
 
     const gene = hugoGeneSymbolToGene[oncoprinterInputLine.hugoGeneSymbol];
@@ -287,125 +378,156 @@ export function makeGeneticTrackDatum_Data_Type2(oncoprinterInputLine:Oncoprinte
     }
     if (ret.proteinChange) {
         // add protein change information if it exists
-        const parsedInfo = getProteinPositionFromProteinChange(ret.proteinChange);
+        const parsedInfo = getProteinPositionFromProteinChange(
+            ret.proteinChange
+        );
         if (parsedInfo) {
             ret.proteinPosStart = parsedInfo.start;
             ret.proteinPosEnd = parsedInfo.end;
         }
     }
     switch (oncoprinterInputLine.alteration) {
-        case "missense":
+        case 'missense':
             ret = Object.assign(ret, {
-                molecularProfileAlterationType: AlterationTypeConstants.MUTATION_EXTENDED,
-                alterationSubType:"missense",
-                mutationType: "missense_mutation"
+                molecularProfileAlterationType:
+                    AlterationTypeConstants.MUTATION_EXTENDED,
+                alterationSubType: 'missense',
+                mutationType: 'missense_mutation',
             });
             break;
-        case "inframe":
+        case 'inframe':
             ret = Object.assign(ret, {
-                molecularProfileAlterationType: AlterationTypeConstants.MUTATION_EXTENDED,
-                alterationSubType:"inframe",
-                mutationType: "indel"
+                molecularProfileAlterationType:
+                    AlterationTypeConstants.MUTATION_EXTENDED,
+                alterationSubType: 'inframe',
+                mutationType: 'indel',
             });
             break;
-        case "fusion":
+        case 'fusion':
             ret = Object.assign(ret, {
-                molecularProfileAlterationType: AlterationTypeConstants.MUTATION_EXTENDED,
-                mutationType: "fusion",
+                molecularProfileAlterationType:
+                    AlterationTypeConstants.MUTATION_EXTENDED,
+                mutationType: 'fusion',
             });
             break;
-        case "promoter":
+        case 'promoter':
             ret = Object.assign(ret, {
-                molecularProfileAlterationType: AlterationTypeConstants.MUTATION_EXTENDED,
-                proteinChange: "promoter",
+                molecularProfileAlterationType:
+                    AlterationTypeConstants.MUTATION_EXTENDED,
+                proteinChange: 'promoter',
             });
             break;
-        case "trunc":
+        case 'trunc':
             ret = Object.assign(ret, {
-                molecularProfileAlterationType: AlterationTypeConstants.MUTATION_EXTENDED,
-                alterationSubType: "nonsense",
-                mutationType: "nonsense"
+                molecularProfileAlterationType:
+                    AlterationTypeConstants.MUTATION_EXTENDED,
+                alterationSubType: 'nonsense',
+                mutationType: 'nonsense',
             });
             break;
-        case "other":
+        case 'other':
             ret = Object.assign(ret, {
-                molecularProfileAlterationType: AlterationTypeConstants.MUTATION_EXTENDED,
-                alterationSubType: "other"
+                molecularProfileAlterationType:
+                    AlterationTypeConstants.MUTATION_EXTENDED,
+                alterationSubType: 'other',
             });
             break;
-        case "amp":
+        case 'amp':
             ret = Object.assign(ret, {
-                molecularProfileAlterationType: AlterationTypeConstants.COPY_NUMBER_ALTERATION,
-                alterationSubType: cna_profile_data_to_string["2"],
-                value:2
+                molecularProfileAlterationType:
+                    AlterationTypeConstants.COPY_NUMBER_ALTERATION,
+                alterationSubType: cna_profile_data_to_string['2'],
+                value: 2,
             });
             break;
-        case "homdel":
+        case 'homdel':
             ret = Object.assign(ret, {
-                molecularProfileAlterationType: AlterationTypeConstants.COPY_NUMBER_ALTERATION,
-                alterationSubType: cna_profile_data_to_string["-2"],
-                value:-2
+                molecularProfileAlterationType:
+                    AlterationTypeConstants.COPY_NUMBER_ALTERATION,
+                alterationSubType: cna_profile_data_to_string['-2'],
+                value: -2,
             });
             break;
-        case "gain":
+        case 'gain':
             ret = Object.assign(ret, {
-                molecularProfileAlterationType: AlterationTypeConstants.COPY_NUMBER_ALTERATION,
-                alterationSubType: cna_profile_data_to_string["1"],
-                value:1
+                molecularProfileAlterationType:
+                    AlterationTypeConstants.COPY_NUMBER_ALTERATION,
+                alterationSubType: cna_profile_data_to_string['1'],
+                value: 1,
             });
             break;
-        case "hetloss":
+        case 'hetloss':
             ret = Object.assign(ret, {
-                molecularProfileAlterationType: AlterationTypeConstants.COPY_NUMBER_ALTERATION,
-                alterationSubType: cna_profile_data_to_string["-1"],
-                value:-1
+                molecularProfileAlterationType:
+                    AlterationTypeConstants.COPY_NUMBER_ALTERATION,
+                alterationSubType: cna_profile_data_to_string['-1'],
+                value: -1,
             });
             break;
-        case "mrnaHigh":
+        case 'mrnaHigh':
             ret = Object.assign(ret, {
-                molecularProfileAlterationType: AlterationTypeConstants.MRNA_EXPRESSION,
-                alterationSubType: "high",
+                molecularProfileAlterationType:
+                    AlterationTypeConstants.MRNA_EXPRESSION,
+                alterationSubType: 'high',
             });
             break;
-        case "mrnaLow":
+        case 'mrnaLow':
             ret = Object.assign(ret, {
-                molecularProfileAlterationType: AlterationTypeConstants.MRNA_EXPRESSION,
-                alterationSubType: "low",
+                molecularProfileAlterationType:
+                    AlterationTypeConstants.MRNA_EXPRESSION,
+                alterationSubType: 'low',
             });
             break;
-        case "protHigh":
+        case 'protHigh':
             ret = Object.assign(ret, {
-                molecularProfileAlterationType: AlterationTypeConstants.PROTEIN_LEVEL,
-                alterationSubType: "high",
+                molecularProfileAlterationType:
+                    AlterationTypeConstants.PROTEIN_LEVEL,
+                alterationSubType: 'high',
             });
             break;
-        case "protLow":
+        case 'protLow':
             ret = Object.assign(ret, {
-                molecularProfileAlterationType: AlterationTypeConstants.PROTEIN_LEVEL,
-                alterationSubType: "low",
+                molecularProfileAlterationType:
+                    AlterationTypeConstants.PROTEIN_LEVEL,
+                alterationSubType: 'low',
             });
             break;
     }
     return ret as OncoprinterGeneticTrackDatum_Data;
 }
 
-export function isAltered(d:OncoprinterGeneticTrackDatum) {
-    return (d.disp_mut || d.disp_cna || d.disp_mrna || d.disp_prot || d.disp_fusion);
+export function isAltered(d: OncoprinterGeneticTrackDatum) {
+    return (
+        d.disp_mut || d.disp_cna || d.disp_mrna || d.disp_prot || d.disp_fusion
+    );
 }
-function getPercentAltered(data:OncoprinterGeneticTrackDatum[]) {
-    const numAltered = _.chain(data).filter(isAltered)
-        .size().value();
+function getPercentAltered(data: OncoprinterGeneticTrackDatum[]) {
+    const numAltered = _.chain(data)
+        .filter(isAltered)
+        .size()
+        .value();
     return percentAltered(numAltered, data.length);
 }
 
 export function getSampleGeneticTrackData(
-    oncoprinterInput:OncoprinterGeneticInputLine[],
-    hugoGeneSymbolToGene:{[hugoGeneSymbol:string]:Gene},
-    excludeGermlineMutations:boolean
-):{[hugoGeneSymbol:string]:{ sampleId:string, data:OncoprinterGeneticTrackDatum_Data[]}[]} {
-    const geneToSampleIdToData:{[hugoGeneSymbol:string]:{[sampleId:string]:OncoprinterGeneticTrackDatum["data"]}} = {};
+    oncoprinterInput: OncoprinterGeneticInputLine[],
+    hugoGeneSymbolToGene: { [hugoGeneSymbol: string]: Gene },
+    excludeGermlineMutations: boolean
+): {
+    [hugoGeneSymbol: string]: {
+        sampleId: string;
+        data: OncoprinterGeneticTrackDatum_Data[];
+    }[];
+} {
+    const geneToSampleIdToData: {
+        [hugoGeneSymbol: string]: {
+            [sampleId: string]: OncoprinterGeneticTrackDatum['data'];
+        };
+    } = {};
 
-    const type2Lines = oncoprinterInput.filter(d=>(isType2(d))) as OncoprinterGeneticInputLineType2[];
+    const type2Lines = oncoprinterInput.filter(d =>
+        isType2(d)
+    ) as OncoprinterGeneticInputLineType2[];
     // collect data by gene x sample
     for (const inputLine of type2Lines) {
         if (!(inputLine.hugoGeneSymbol in geneToSampleIdToData)) {
@@ -416,79 +538,117 @@ export function getSampleGeneticTrackData(
         if (!(inputLine.sampleId in sampleIdToData)) {
             sampleIdToData[inputLine.sampleId] = [];
         }
-        const newDatum = makeGeneticTrackDatum_Data(inputLine, hugoGeneSymbolToGene);
-        if (!excludeGermlineMutations || !GERMLINE_REGEXP.test(newDatum.mutationStatus)) {
+        const newDatum = makeGeneticTrackDatum_Data(
+            inputLine,
+            hugoGeneSymbolToGene
+        );
+        if (
+            !excludeGermlineMutations ||
+            !GERMLINE_REGEXP.test(newDatum.mutationStatus)
+        ) {
             sampleIdToData[inputLine.sampleId].push(newDatum);
         }
     }
     // add missing samples
     for (const inputLine of oncoprinterInput) {
-        _.forEach(geneToSampleIdToData, (sampleToData, gene)=>{
+        _.forEach(geneToSampleIdToData, (sampleToData, gene) => {
             if (!(inputLine.sampleId in sampleToData)) {
                 sampleToData[inputLine.sampleId] = [];
             }
         });
     }
 
-    return _.mapValues(geneToSampleIdToData, sampleIdToData=>_.chain(sampleIdToData).map((data, sampleId)=>({ sampleId, data })).value());
+    return _.mapValues(geneToSampleIdToData, sampleIdToData =>
+        _.chain(sampleIdToData)
+            .map((data, sampleId) => ({ sampleId, data }))
+            .value()
+    );
 }
 
-export function getGeneticOncoprintData(
-    geneToSampleData:{[hugoGeneSymbol:string]:{ sampleId:string, data:OncoprinterGeneticTrackDatum_Data[]}[]}
-):{[hugoGeneSymbol:string]:OncoprinterGeneticTrackDatum[]} {
-    return _.mapValues(
-        geneToSampleData,
-        (sampleData, gene)=>sampleData.map(o=>(
-            fillGeneticTrackDatum(
-                { sample: o.sampleId, patient: o.sampleId, study_id: "", uid: o.sampleId },
-                gene, o.data
-            ) as OncoprinterGeneticTrackDatum
-        ))
+export function getGeneticOncoprintData(geneToSampleData: {
+    [hugoGeneSymbol: string]: {
+        sampleId: string;
+        data: OncoprinterGeneticTrackDatum_Data[];
+    }[];
+}): { [hugoGeneSymbol: string]: OncoprinterGeneticTrackDatum[] } {
+    return _.mapValues(geneToSampleData, (sampleData, gene) =>
+        sampleData.map(
+            o =>
+                fillGeneticTrackDatum(
+                    {
+                        sample: o.sampleId,
+                        patient: o.sampleId,
+                        study_id: '',
+                        uid: o.sampleId,
+                    },
+                    gene,
+                    o.data
+                ) as OncoprinterGeneticTrackDatum
+        )
     );
 }
 
-export function getGeneticTrackKey(hugoGeneSymbol:string) {
+export function getGeneticTrackKey(hugoGeneSymbol: string) {
     return `geneticTrack_${hugoGeneSymbol}`;
 }
 
 export function getGeneticTracks(
-    geneToOncoprintData:{[hugoGeneSymbol:string]:OncoprinterGeneticTrackDatum[]},
-    geneOrder?:string[],
-    excludedSampleIds?:string[]
-):OncoprinterGeneticTrackSpec[] {
+    geneToOncoprintData: {
+        [hugoGeneSymbol: string]: OncoprinterGeneticTrackDatum[];
+    },
+    geneOrder?: string[],
+    excludedSampleIds?: string[]
+): OncoprinterGeneticTrackSpec[] {
     // remove excluded sample data
     const excludedSampleIdsMap = _.keyBy(excludedSampleIds || []);
-    geneToOncoprintData = _.mapValues(geneToOncoprintData, data=>data.filter(d=>!(d.sample in excludedSampleIdsMap)));
+    geneToOncoprintData = _.mapValues(geneToOncoprintData, data =>
+        data.filter(d => !(d.sample in excludedSampleIdsMap))
+    );
 
-    const geneToPercentAltered:{[hugoGeneSymbol:string]:string} = _.mapValues(geneToOncoprintData, getPercentAltered);
-    const genes = geneOrder ? geneOrder.filter(gene=>(gene in geneToOncoprintData)) : Object.keys(geneToOncoprintData);
-    return genes.map(gene=>({
+    const geneToPercentAltered: {
+        [hugoGeneSymbol: string]: string;
+    } = _.mapValues(geneToOncoprintData, getPercentAltered);
+    const genes = geneOrder
+        ? geneOrder.filter(gene => gene in geneToOncoprintData)
+        : Object.keys(geneToOncoprintData);
+    return genes.map(gene => ({
         key: getGeneticTrackKey(gene),
         label: gene,
         info: geneToPercentAltered[gene],
-        data: geneToOncoprintData[gene]
+        data: geneToOncoprintData[gene],
     }));
 }
 
 export function annotateGeneticTrackData(
-    geneToSampleData:{[hugoGeneSymbol:string]:{ sampleId:string, data:OncoprinterGeneticTrackDatum_Data[]}[]},
-    promisesMap:{
-        oncoKbCna:MobxPromise<IOncoKbData|Error>,
-        oncoKb?:MobxPromise<IOncoKbData|Error>,
-        cbioportalCount?:MobxPromise<{[mutationPositionKey:string]:number}>,
+    geneToSampleData: {
+        [hugoGeneSymbol: string]: {
+            sampleId: string;
+            data: OncoprinterGeneticTrackDatum_Data[];
+        }[];
     },
-    params:{
-        cbioportalCountThreshold?:number;
-        useHotspots:boolean;
-        useCustomBinary:boolean;
+    promisesMap: {
+        oncoKbCna: MobxPromise<IOncoKbData | Error>;
+        oncoKb?: MobxPromise<IOncoKbData | Error>;
+        cbioportalCount?: MobxPromise<{
+            [mutationPositionKey: string]: number;
+        }>;
     },
-    excludeVUS:boolean
+    params: {
+        cbioportalCountThreshold?: number;
+        useHotspots: boolean;
+        useCustomBinary: boolean;
+    },
+    excludeVUS: boolean
 ) {
     // build annotater functions
-    let getOncoKbCnaAnnotation = (d:OncoprinterGeneticTrackDatum_Data)=>"";
-    if (promisesMap.oncoKbCna.isComplete && !(promisesMap.oncoKbCna.result instanceof Error)) {
-        const indicatorMap = (promisesMap.oncoKbCna!.result! as IOncoKbData).indicatorMap!;
-        getOncoKbCnaAnnotation = (d:OncoprinterGeneticTrackDatum_Data)=>{
+    let getOncoKbCnaAnnotation = (d: OncoprinterGeneticTrackDatum_Data) => '';
+    if (
+        promisesMap.oncoKbCna.isComplete &&
+        !(promisesMap.oncoKbCna.result instanceof Error)
+    ) {
+        const indicatorMap = (promisesMap.oncoKbCna!.result! as IOncoKbData)
+            .indicatorMap!;
+        getOncoKbCnaAnnotation = (d: OncoprinterGeneticTrackDatum_Data) => {
             const id = generateQueryVariantId(
                 d.entrezGeneId,
                 null,
@@ -498,15 +658,20 @@ export function annotateGeneticTrackData(
             if (indicator) {
                 return getOncoKbOncogenic(indicator);
             } else {
-                return "";
+                return '';
             }
         };
     }
 
-    let getOncoKbAnnotation = (d:OncoprinterGeneticTrackDatum_Data)=>"";
-    if (promisesMap.oncoKb && promisesMap.oncoKb.isComplete && !(promisesMap.oncoKb.result instanceof Error)) {
-        const indicatorMap = (promisesMap.oncoKb!.result! as IOncoKbData).indicatorMap!;
-        getOncoKbAnnotation = (d:OncoprinterGeneticTrackDatum_Data)=>{
+    let getOncoKbAnnotation = (d: OncoprinterGeneticTrackDatum_Data) => '';
+    if (
+        promisesMap.oncoKb &&
+        promisesMap.oncoKb.isComplete &&
+        !(promisesMap.oncoKb.result instanceof Error)
+    ) {
+        const indicatorMap = (promisesMap.oncoKb!.result! as IOncoKbData)
+            .indicatorMap!;
+        getOncoKbAnnotation = (d: OncoprinterGeneticTrackDatum_Data) => {
             const id = generateQueryVariantId(
                 d.entrezGeneId,
                 null,
@@ -517,35 +682,38 @@ export function annotateGeneticTrackData(
             if (oncoKbIndicator) {
                 return getOncoKbOncogenic(oncoKbIndicator);
             } else {
-                return "";
+                return '';
             }
         };
     }
 
-    let getCBioAnnotation = (d:OncoprinterGeneticTrackDatum_Data)=>false;
+    let getCBioAnnotation = (d: OncoprinterGeneticTrackDatum_Data) => false;
     if (promisesMap.cbioportalCount && promisesMap.cbioportalCount.isComplete) {
         const countMap = promisesMap.cbioportalCount!.result!;
         const threshold = params.cbioportalCountThreshold!;
-        getCBioAnnotation = (d:OncoprinterGeneticTrackDatum_Data)=>{
-            if (d.molecularProfileAlterationType === AlterationTypeConstants.MUTATION_EXTENDED) {
+        getCBioAnnotation = (d: OncoprinterGeneticTrackDatum_Data) => {
+            if (
+                d.molecularProfileAlterationType ===
+                AlterationTypeConstants.MUTATION_EXTENDED
+            ) {
                 const key = mutationCountByPositionKey(d as any);
                 const count = countMap[key];
-                return (threshold <= count);
+                return threshold <= count;
             } else {
                 return false;
             }
         };
     }
 
-    return _.mapValues(geneToSampleData, (sampleData, gene)=>{
-        return sampleData.map(object=>{
+    return _.mapValues(geneToSampleData, (sampleData, gene) => {
+        return sampleData.map(object => {
             const newObj = _.clone(object);
-            newObj.data = newObj.data.filter(d=>{
+            newObj.data = newObj.data.filter(d => {
                 // clear previous annotations
                 delete d.oncoKbOncogenic;
                 delete d.putativeDriver;
                 // annotate and filter out if necessary
-                switch(d.molecularProfileAlterationType) {
+                switch (d.molecularProfileAlterationType) {
                     case AlterationTypeConstants.COPY_NUMBER_ALTERATION:
                         d.oncoKbOncogenic = getOncoKbCnaAnnotation(d);
                         break;
@@ -553,15 +721,19 @@ export function annotateGeneticTrackData(
                         d.oncoKbOncogenic = getOncoKbAnnotation(d);
                         break;
                 }
-                if (d.molecularProfileAlterationType === AlterationTypeConstants.MUTATION_EXTENDED) {
+                if (
+                    d.molecularProfileAlterationType ===
+                    AlterationTypeConstants.MUTATION_EXTENDED
+                ) {
                     // tag mutations as putative driver, and filter them
                     d.putativeDriver = !!(
                         d.oncoKbOncogenic ||
                         (params.useHotspots && d.isHotspot) ||
                         getCBioAnnotation(d) ||
-                        (params.useCustomBinary && d.driverFilter === "Putative_Driver")
+                        (params.useCustomBinary &&
+                            d.driverFilter === 'Putative_Driver')
                     );
-                    return (!excludeVUS || d.putativeDriver);
+                    return !excludeVUS || d.putativeDriver;
                 } else {
                     return true;
                 }
@@ -571,15 +743,34 @@ export function annotateGeneticTrackData(
     });
 }
 
-export function parseGeneticInput(input:string):{status:"complete", result:OncoprinterGeneticInputLine[], error:undefined}|{status:"error", result:undefined, error:string} {
-    const lines = input.trim().split("\n").map(line=>line.trim().split(/\s+/));
+export function parseGeneticInput(
+    input: string
+):
+    | {
+          status: 'complete';
+          result: OncoprinterGeneticInputLine[];
+          error: undefined;
+      }
+    | { status: 'error'; result: undefined; error: string } {
+    const lines = input
+        .trim()
+        .split('\n')
+        .map(line => line.trim().split(/\s+/));
     try {
-        const result = lines.map((line, lineIndex)=>{
-            if (lineIndex === 0 &&
-                _.isEqual(lines[0].map(s=>s.toLowerCase()), ["sample", "gene", "alteration", "type"])) {
+        const result = lines.map((line, lineIndex) => {
+            if (
+                lineIndex === 0 &&
+                _.isEqual(lines[0].map(s => s.toLowerCase()), [
+                    'sample',
+                    'gene',
+                    'alteration',
+                    'type',
+                ])
+            ) {
                 return null; // skip header line
             }
-            const errorPrefix = `Genetic data input error on line ${lineIndex+1}: \n${line.join("\t")}\n\n`;
+            const errorPrefix = `Genetic data input error on line ${lineIndex +
+                1}: \n${line.join('\t')}\n\n`;
             if (line.length === 1) {
                 // Type 1 line
                 return { sampleId: line[0] };
@@ -591,36 +782,55 @@ export function parseGeneticInput(input:string):{status:"complete", result:Oncop
                 const lcAlteration = alteration.toLowerCase();
                 const type = line[3];
                 const lcType = type.toLowerCase();
-                let ret:Partial<OncoprinterGeneticInputLineType2> = { sampleId, hugoGeneSymbol };
+                let ret: Partial<OncoprinterGeneticInputLineType2> = {
+                    sampleId,
+                    hugoGeneSymbol,
+                };
 
                 switch (lcType) {
-                    case "cna":
-                        if (["amp", "gain", "hetloss", "homdel"].indexOf(lcAlteration) === -1) {
-                            throw new Error(`${errorPrefix}Alteration "${alteration}" is not valid - it must be "AMP", "GAIN" ,"HETLOSS", or "HOMDEL" since Type is "CNA"`);
+                    case 'cna':
+                        if (
+                            ['amp', 'gain', 'hetloss', 'homdel'].indexOf(
+                                lcAlteration
+                            ) === -1
+                        ) {
+                            throw new Error(
+                                `${errorPrefix}Alteration "${alteration}" is not valid - it must be "AMP", "GAIN" ,"HETLOSS", or "HOMDEL" since Type is "CNA"`
+                            );
                         }
-                        ret.alteration = lcAlteration as "amp"|"gain"|"hetloss"|"homdel";
+                        ret.alteration = lcAlteration as
+                            | 'amp'
+                            | 'gain'
+                            | 'hetloss'
+                            | 'homdel';
                         break;
-                    case "exp":
-                        if (lcAlteration === "high") {
-                            ret.alteration = "mrnaHigh";
-                        } else if (lcAlteration === "low") {
-                            ret.alteration = "mrnaLow";
+                    case 'exp':
+                        if (lcAlteration === 'high') {
+                            ret.alteration = 'mrnaHigh';
+                        } else if (lcAlteration === 'low') {
+                            ret.alteration = 'mrnaLow';
                         } else {
-                            throw new Error(`${errorPrefix}Alteration "${alteration}" is not valid - it must be "HIGH" or "LOW" if Type is "EXP"`);
+                            throw new Error(
+                                `${errorPrefix}Alteration "${alteration}" is not valid - it must be "HIGH" or "LOW" if Type is "EXP"`
+                            );
                         }
                         break;
-                    case "prot":
-                        if (lcAlteration === "high") {
-                            ret.alteration = "protHigh";
-                        } else if (lcAlteration === "low") {
-                            ret.alteration = "protLow";
+                    case 'prot':
+                        if (lcAlteration === 'high') {
+                            ret.alteration = 'protHigh';
+                        } else if (lcAlteration === 'low') {
+                            ret.alteration = 'protLow';
                         } else {
-                            throw new Error(`${errorPrefix}Alteration "${alteration}" is not valid - it must be "HIGH" or "LOW" if Type is "PROT"`);
+                            throw new Error(
+                                `${errorPrefix}Alteration "${alteration}" is not valid - it must be "HIGH" or "LOW" if Type is "PROT"`
+                            );
                         }
                         break;
-                    case "fusion":
-                        if (lcType !== "fusion") {
-                            throw new Error(`${errorPrefix}Type "${type}" is not valid - it must be "FUSION" if Alteration is "FUSION"`);
+                    case 'fusion':
+                        if (lcType !== 'fusion') {
+                            throw new Error(
+                                `${errorPrefix}Type "${type}" is not valid - it must be "FUSION" if Alteration is "FUSION"`
+                            );
                         } else {
                             ret.alteration = lcType as OncoprintMutationType;
                             ret.proteinChange = alteration;
@@ -629,30 +839,48 @@ export function parseGeneticInput(input:string):{status:"complete", result:Oncop
                     default:
                         // everything else is a mutation
                         // use OQL parsing for handling mutation modifiers
-                        let parsedMutation:MUTCommand<any>;
+                        let parsedMutation: MUTCommand<any>;
                         try {
-                            parsedMutation = (parseOQLQuery(`GENE: ${lcType}`)[0].alterations as Alteration[])[0] as MUTCommand<any>;
+                            parsedMutation = (parseOQLQuery(
+                                `GENE: ${lcType}`
+                            )[0].alterations as Alteration[])[0] as MUTCommand<
+                                any
+                            >;
                         } catch (e) {
-                            throw new Error(`${errorPrefix}Mutation type ${type} is not valid.`);
+                            throw new Error(
+                                `${errorPrefix}Mutation type ${type} is not valid.`
+                            );
                         }
 
                         for (const modifier of parsedMutation.modifiers) {
                             switch (modifier) {
-                                case "GERMLINE":
+                                case 'GERMLINE':
                                     ret.isGermline = true;
                                     break;
-                                case "DRIVER":
+                                case 'DRIVER':
                                     ret.isCustomDriver = true;
                                     break;
                                 default:
-                                    throw new Error(`${errorPrefix}Only allowed mutation modifiers are GERMLINE and DRIVER`);
+                                    throw new Error(
+                                        `${errorPrefix}Only allowed mutation modifiers are GERMLINE and DRIVER`
+                                    );
                             }
                         }
 
                         const lcMutationType = parsedMutation.constr_val!.toLowerCase();
 
-                        if (["missense", "inframe", "promoter", "trunc", "other"].indexOf(lcMutationType) === -1) {
-                            throw new Error(`${errorPrefix}Type "${type}" is not valid - it must be "MISSENSE", "INFRAME", "TRUNC", "PROMOTER", or "OTHER" for a mutation alteration.`);
+                        if (
+                            [
+                                'missense',
+                                'inframe',
+                                'promoter',
+                                'trunc',
+                                'other',
+                            ].indexOf(lcMutationType) === -1
+                        ) {
+                            throw new Error(
+                                `${errorPrefix}Type "${type}" is not valid - it must be "MISSENSE", "INFRAME", "TRUNC", "PROMOTER", or "OTHER" for a mutation alteration.`
+                            );
                         }
                         ret.alteration = lcMutationType as OncoprintMutationType;
                         ret.proteinChange = alteration;
@@ -661,19 +889,21 @@ export function parseGeneticInput(input:string):{status:"complete", result:Oncop
                 }
                 return ret as OncoprinterGeneticInputLineType2;
             } else {
-                throw new Error(`${errorPrefix}input lines must have either 1 or 4 columns.`);
+                throw new Error(
+                    `${errorPrefix}input lines must have either 1 or 4 columns.`
+                );
             }
         });
         return {
-            status: "complete",
-            result: result.filter(x=>!!x) as OncoprinterGeneticInputLine[],
-            error:undefined
+            status: 'complete',
+            result: result.filter(x => !!x) as OncoprinterGeneticInputLine[],
+            error: undefined,
         };
     } catch (e) {
         return {
-            status:"error",
-            result:undefined,
-            error:e.message
+            status: 'error',
+            result: undefined,
+            error: e.message,
         };
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/staticPages/tools/oncoprinter/OncoprinterStore.ts b/src/pages/staticPages/tools/oncoprinter/OncoprinterStore.ts
index 42451eb7a7a..2b42e42cda3 100644
--- a/src/pages/staticPages/tools/oncoprinter/OncoprinterStore.ts
+++ b/src/pages/staticPages/tools/oncoprinter/OncoprinterStore.ts
@@ -1,6 +1,6 @@
-import {DriverAnnotationSettings} from "../../../resultsView/ResultsViewPageStore";
-import {action, computed, observable} from "mobx";
-import AppConfig from "appConfig";
+import { DriverAnnotationSettings } from '../../../resultsView/ResultsViewPageStore';
+import { action, computed, observable } from 'mobx';
+import AppConfig from 'appConfig';
 import {
     annotateGeneticTrackData,
     fetchOncoKbDataForCna,
@@ -11,25 +11,45 @@ import {
     getSampleGeneticTrackData,
     getSampleIds,
     initDriverAnnotationSettings,
-    isAltered, isType2,
-    OncoprinterGeneticInputLine, OncoprinterGeneticInputLineType2,
-    parseGeneticInput
-} from "./OncoprinterGeneticUtils";
+    isAltered,
+    isType2,
+    OncoprinterGeneticInputLine,
+    OncoprinterGeneticInputLineType2,
+    parseGeneticInput,
+} from './OncoprinterGeneticUtils';
+import { CancerGene, remoteData } from 'cbioportal-frontend-commons';
+import { IOncoKbData } from '../../../../shared/model/OncoKB';
 import {
-    CancerGene,
-    remoteData
-} from "cbioportal-frontend-commons";
-import {IOncoKbData} from "../../../../shared/model/OncoKB";
-import {fetchOncoKbCancerGenes, ONCOKB_DEFAULT} from "../../../../shared/lib/StoreUtils";
-import client from "../../../../shared/api/cbioportalClientInstance";
-import _ from "lodash";
-import {countMutations, mutationCountByPositionKey} from "../../../resultsView/mutationCountHelpers";
-import {Mutation, MutationCountByPosition} from "../../../../shared/api/generated/CBioPortalAPI";
-import {SampleAlteredMap} from "../../../resultsView/ResultsViewPageStoreUtils";
-import { AlteredStatus } from "pages/resultsView/mutualExclusivity/MutualExclusivityUtil";
-import {getClinicalTracks, parseClinicalInput} from "./OncoprinterClinicalUtils";
-
-export type OncoprinterDriverAnnotationSettings = Pick<DriverAnnotationSettings, "excludeVUS" | "customBinary" | "hotspots" | "cbioportalCount" | "cbioportalCountThreshold" | "oncoKb" | "driversAnnotated">;
+    fetchOncoKbCancerGenes,
+    ONCOKB_DEFAULT,
+} from '../../../../shared/lib/StoreUtils';
+import client from '../../../../shared/api/cbioportalClientInstance';
+import _ from 'lodash';
+import {
+    countMutations,
+    mutationCountByPositionKey,
+} from '../../../resultsView/mutationCountHelpers';
+import {
+    Mutation,
+    MutationCountByPosition,
+} from '../../../../shared/api/generated/CBioPortalAPI';
+import { SampleAlteredMap } from '../../../resultsView/ResultsViewPageStoreUtils';
+import { AlteredStatus } from 'pages/resultsView/mutualExclusivity/MutualExclusivityUtil';
+import {
+    getClinicalTracks,
+    parseClinicalInput,
+} from './OncoprinterClinicalUtils';
+
+export type OncoprinterDriverAnnotationSettings = Pick<
+    DriverAnnotationSettings,
+    | 'excludeVUS'
+    | 'customBinary'
+    | 'hotspots'
+    | 'cbioportalCount'
+    | 'cbioportalCountThreshold'
+    | 'oncoKb'
+    | 'driversAnnotated'
+>;
 
 /* Leaving commented only for reference, this will be replaced by unified input strategy
 function genomeNexusKey(l:OncoprinterInputLineType3_Incomplete){
@@ -41,20 +61,19 @@ function genomeNexusKey2(l:{chromosome:string, start:number, end:number, referen
 }*/
 
 export default class OncoprinterStore {
-
     // NOTE: we are not annotating hotspot because that needs nucleotide positions
     //      we are not annotating COSMIC because that needs keywords
 
     @observable submitCount = 0;
 
-    @observable.ref _inputSampleIdOrder:string | undefined = undefined;
-    @observable.ref _geneOrder:string | undefined = undefined;
-    @observable driverAnnotationSettings:OncoprinterDriverAnnotationSettings;
-    @observable.ref _geneticDataInput:string|undefined = undefined;
-    @observable.ref _clinicalDataInput:string|undefined = undefined;
-    @observable public showUnalteredColumns:boolean = true;
+    @observable.ref _inputSampleIdOrder: string | undefined = undefined;
+    @observable.ref _geneOrder: string | undefined = undefined;
+    @observable driverAnnotationSettings: OncoprinterDriverAnnotationSettings;
+    @observable.ref _geneticDataInput: string | undefined = undefined;
+    @observable.ref _clinicalDataInput: string | undefined = undefined;
+    @observable public showUnalteredColumns: boolean = true;
     @observable hideGermlineMutations = false;
-    @observable customDriverWarningHidden:boolean;
+    @observable customDriverWarningHidden: boolean;
 
     constructor() {
         this.initialize();
@@ -66,7 +85,10 @@ export default class OncoprinterStore {
     }
 
     @computed get didOncoKbFail() {
-        return this.oncoKbData.peekStatus === "complete" && (this.oncoKbData.result instanceof Error);
+        return (
+            this.oncoKbData.peekStatus === 'complete' &&
+            this.oncoKbData.result instanceof Error
+        );
     }
 
     @computed get sampleIds() {
@@ -78,7 +100,13 @@ export default class OncoprinterStore {
     }
 
     @computed get allSampleIds() {
-        const parsedInputLines = (this.parsedGeneticInputLines.result || []).concat(this.parsedClinicalInputLines.result && this.parsedClinicalInputLines.result.data || []);
+        const parsedInputLines = (
+            this.parsedGeneticInputLines.result || []
+        ).concat(
+            (this.parsedClinicalInputLines.result &&
+                this.parsedClinicalInputLines.result.data) ||
+                []
+        );
         if (parsedInputLines.length > 0) {
             return getSampleIds(parsedInputLines);
         } else {
@@ -86,14 +114,17 @@ export default class OncoprinterStore {
         }
     }
 
-    @action setSampleIdOrder(input:string) {
+    @action setSampleIdOrder(input: string) {
         this._inputSampleIdOrder = input.trim();
     }
 
     @computed get inputSampleIdOrder() {
         if (this._inputSampleIdOrder) {
             // intersection - only take into account specified sample ids
-            return _.intersection(this._inputSampleIdOrder.split(/[,\s]+/), this.allSampleIds);
+            return _.intersection(
+                this._inputSampleIdOrder.split(/[,\s]+/),
+                this.allSampleIds
+            );
         } else {
             return undefined;
         }
@@ -108,12 +139,13 @@ export default class OncoprinterStore {
     }
 
     readonly hiddenSampleIds = remoteData({
-        await:()=>[this.unalteredSampleIds],
-        invoke:async()=>(this.showUnalteredColumns ? [] : this.unalteredSampleIds.result!),
-        default: []
+        await: () => [this.unalteredSampleIds],
+        invoke: async () =>
+            this.showUnalteredColumns ? [] : this.unalteredSampleIds.result!,
+        default: [],
     });
 
-    @action setGeneOrder(input:string) {
+    @action setGeneOrder(input: string) {
         this._geneOrder = input.trim();
     }
 
@@ -125,17 +157,21 @@ export default class OncoprinterStore {
         }
     }
 
-
     public hasData() {
-        return (!!this._geneticDataInput) || (!!this._clinicalDataInput);
+        return !!this._geneticDataInput || !!this._clinicalDataInput;
     }
 
-    @action setDataInput(geneticData:string, clinicalData:string) {
+    @action setDataInput(geneticData: string, clinicalData: string) {
         this._geneticDataInput = geneticData;
         this._clinicalDataInput = clinicalData;
     }
 
-    @action public setInput(geneticData:string, clinicalData:string, genes:string, samples:string) {
+    @action public setInput(
+        geneticData: string,
+        clinicalData: string,
+        genes: string,
+        samples: string
+    ) {
         this.submitCount += 1;
         this.setDataInput(geneticData, clinicalData);
         this.setGeneOrder(genes);
@@ -147,43 +183,43 @@ export default class OncoprinterStore {
     @computed get parsedGeneticInputLines() {
         if (!this._geneticDataInput) {
             return {
-                error:null,
-                result:[]
+                error: null,
+                result: [],
             };
         }
 
         const parsed = parseGeneticInput(this._geneticDataInput);
-        if (parsed.status === "error") {
+        if (parsed.status === 'error') {
             return {
                 error: parsed.error,
-                result: null
+                result: null,
             };
         } else {
             return {
-                error:null,
-                result: parsed.result
-            }
+                error: null,
+                result: parsed.result,
+            };
         }
     }
 
     @computed get parsedClinicalInputLines() {
         if (!this._clinicalDataInput) {
             return {
-                error:null,
-                result:{ headers:[], data:[]}
+                error: null,
+                result: { headers: [], data: [] },
             };
         }
 
         const parsed = parseClinicalInput(this._clinicalDataInput);
-        if (parsed.status === "error") {
+        if (parsed.status === 'error') {
             return {
                 error: parsed.error,
-                result:null
+                result: null,
             };
         } else {
             return {
-                error:null,
-                result:parsed.result
+                error: null,
+                result: parsed.result,
             };
         }
     }
@@ -211,163 +247,217 @@ export default class OncoprinterStore {
     }
 
     @computed get existCustomDrivers() {
-        return this.parsedGeneticInputLines.result &&
-            this.parsedGeneticInputLines.result.findIndex(x=>!!(isType2(x) && x.isCustomDriver)) > -1;
+        return (
+            this.parsedGeneticInputLines.result &&
+            this.parsedGeneticInputLines.result.findIndex(
+                x => !!(isType2(x) && x.isCustomDriver)
+            ) > -1
+        );
     }
 
     readonly hugoGeneSymbolToGene = remoteData({
-        invoke:async()=>{
+        invoke: async () => {
             const geneIds = this.hugoGeneSymbols;
             if (geneIds.length > 0) {
-                return _.keyBy(await client.fetchGenesUsingPOST({
-                    geneIdType: "HUGO_GENE_SYMBOL",
-                    geneIds
-                }), o=>o.hugoGeneSymbol);
+                return _.keyBy(
+                    await client.fetchGenesUsingPOST({
+                        geneIdType: 'HUGO_GENE_SYMBOL',
+                        geneIds,
+                    }),
+                    o => o.hugoGeneSymbol
+                );
             } else {
                 return {};
             }
-        }
+        },
     });
 
-    readonly oncoKbCancerGenes = remoteData({
-        invoke: () => {
-            if (AppConfig.serverConfig.show_oncokb) {
-                return fetchOncoKbCancerGenes();
-            } else {
-                return Promise.resolve([]);
-            }
-        }
-    }, []);
-
-    readonly oncoKbAnnotatedGenes = remoteData({
-        await: () => [this.oncoKbCancerGenes],
-        invoke: () => {
-            if (AppConfig.serverConfig.show_oncokb) {
-                return Promise.resolve(_.reduce(this.oncoKbCancerGenes.result, (map: { [entrezGeneId: number]: boolean }, next: CancerGene) => {
-                    if (next.oncokbAnnotated) {
-                        map[next.entrezGeneId] = true;
+    readonly oncoKbCancerGenes = remoteData(
+        {
+            invoke: () => {
+                if (AppConfig.serverConfig.show_oncokb) {
+                    return fetchOncoKbCancerGenes();
+                } else {
+                    return Promise.resolve([]);
+                }
+            },
+        },
+        []
+    );
+
+    readonly oncoKbAnnotatedGenes = remoteData(
+        {
+            await: () => [this.oncoKbCancerGenes],
+            invoke: () => {
+                if (AppConfig.serverConfig.show_oncokb) {
+                    return Promise.resolve(
+                        _.reduce(
+                            this.oncoKbCancerGenes.result,
+                            (
+                                map: { [entrezGeneId: number]: boolean },
+                                next: CancerGene
+                            ) => {
+                                if (next.oncokbAnnotated) {
+                                    map[next.entrezGeneId] = true;
+                                }
+                                return map;
+                            },
+                            {}
+                        )
+                    );
+                } else {
+                    return Promise.resolve({});
+                }
+            },
+        },
+        {}
+    );
+
+    readonly oncoKbData = remoteData<IOncoKbData | Error>(
+        {
+            await: () => [
+                this.nonAnnotatedGeneticData,
+                this.oncoKbAnnotatedGenes,
+            ],
+            invoke: async () => {
+                if (AppConfig.serverConfig.show_oncokb) {
+                    let result;
+                    try {
+                        result = await fetchOncoKbDataForMutations(
+                            this.oncoKbAnnotatedGenes.result!,
+                            this.nonAnnotatedGeneticData.result!
+                        );
+                    } catch (e) {
+                        result = new Error();
                     }
-                    return map;
-                }, {}));
-            } else {
-                return Promise.resolve({});
-            }
-        }
-    }, {});
-
-    readonly oncoKbData = remoteData<IOncoKbData|Error>({
-        await: () => [
-            this.nonAnnotatedGeneticData,
-            this.oncoKbAnnotatedGenes
-        ],
-        invoke: async() => {
-            if (AppConfig.serverConfig.show_oncokb) {
-                let result;
-                try {
-                    result = await fetchOncoKbDataForMutations(this.oncoKbAnnotatedGenes.result!, this.nonAnnotatedGeneticData.result!);
-                } catch(e) {
-                    result = new Error();
+                    return result;
+                } else {
+                    return ONCOKB_DEFAULT;
                 }
-                return result;
-            } else {
-                return ONCOKB_DEFAULT;
-            }
+            },
+            onError: (err: Error) => {
+                // fail silently, leave the error handling responsibility to the data consumer
+            },
         },
-        onError: (err: Error) => {
-            // fail silently, leave the error handling responsibility to the data consumer
-        }
-    }, ONCOKB_DEFAULT);
-
-    readonly oncoKbCnaData = remoteData<IOncoKbData|Error>({
-        await: () => [
-            this.nonAnnotatedGeneticData,
-            this.oncoKbAnnotatedGenes
-        ],
-        invoke: async() => {
-            if (AppConfig.serverConfig.show_oncokb) {
-                let result;
-                try {
-                    result = await fetchOncoKbDataForCna(this.oncoKbAnnotatedGenes.result!, this.nonAnnotatedGeneticData.result!);
-                } catch(e) {
-                    result = new Error();
+        ONCOKB_DEFAULT
+    );
+
+    readonly oncoKbCnaData = remoteData<IOncoKbData | Error>(
+        {
+            await: () => [
+                this.nonAnnotatedGeneticData,
+                this.oncoKbAnnotatedGenes,
+            ],
+            invoke: async () => {
+                if (AppConfig.serverConfig.show_oncokb) {
+                    let result;
+                    try {
+                        result = await fetchOncoKbDataForCna(
+                            this.oncoKbAnnotatedGenes.result!,
+                            this.nonAnnotatedGeneticData.result!
+                        );
+                    } catch (e) {
+                        result = new Error();
+                    }
+                    return result;
+                } else {
+                    return ONCOKB_DEFAULT;
                 }
-                return result;
-            } else {
-                return ONCOKB_DEFAULT;
-            }
+            },
+            onError: (err: Error) => {
+                // fail silently, leave the error handling responsibility to the data consumer
+            },
         },
-        onError: (err: Error) => {
-            // fail silently, leave the error handling responsibility to the data consumer
-        }
-    }, ONCOKB_DEFAULT);
-
-    readonly cbioportalCountData = remoteData<{[mutationPositionKey:string]:number}>({
-        await: ()=>[
-            this.nonAnnotatedGeneticData
-        ],
-        invoke: async()=>{
-
-            const mutations =
-                this.nonAnnotatedGeneticData.result!.filter(
-                    x=>(x.proteinPosStart !== undefined && x.proteinPosEnd !== undefined)
-                ) as Pick<Mutation, "entrezGeneId"|"proteinPosStart"|"proteinPosEnd">[];
-
-            const mutationPositionIdentifiers = _.values(countMutations(mutations));
+        ONCOKB_DEFAULT
+    );
+
+    readonly cbioportalCountData = remoteData<{
+        [mutationPositionKey: string]: number;
+    }>({
+        await: () => [this.nonAnnotatedGeneticData],
+        invoke: async () => {
+            const mutations = this.nonAnnotatedGeneticData.result!.filter(
+                x =>
+                    x.proteinPosStart !== undefined &&
+                    x.proteinPosEnd !== undefined
+            ) as Pick<
+                Mutation,
+                'entrezGeneId' | 'proteinPosStart' | 'proteinPosEnd'
+            >[];
+
+            const mutationPositionIdentifiers = _.values(
+                countMutations(mutations)
+            );
 
             const data = await client.fetchMutationCountsByPositionUsingPOST({
-                mutationPositionIdentifiers
+                mutationPositionIdentifiers,
             });
 
-            return _.chain(data).groupBy(mutationCountByPositionKey).mapValues((counts:MutationCountByPosition[])=>_.sumBy(counts, c=>c.count)).value();
-        }
+            return _.chain(data)
+                .groupBy(mutationCountByPositionKey)
+                .mapValues((counts: MutationCountByPosition[]) =>
+                    _.sumBy(counts, c => c.count)
+                )
+                .value();
+        },
     });
 
     readonly alteredSampleIds = remoteData({
-        await:()=>[this.geneticTracks],
-        invoke: async()=>{
-            const allAlteredIds = _.chain(this.geneticTracks.result!).map(track=>track.data.filter(isAltered))
-                    .flatten().map(datum=>datum.sample).uniq().value();
-            const visibleAlteredIds = _.intersection(this.sampleIds, allAlteredIds);
+        await: () => [this.geneticTracks],
+        invoke: async () => {
+            const allAlteredIds = _.chain(this.geneticTracks.result!)
+                .map(track => track.data.filter(isAltered))
+                .flatten()
+                .map(datum => datum.sample)
+                .uniq()
+                .value();
+            const visibleAlteredIds = _.intersection(
+                this.sampleIds,
+                allAlteredIds
+            );
             return visibleAlteredIds;
         },
-        default: []
+        default: [],
     });
 
     readonly unalteredSampleIds = remoteData({
-        await:()=>[this.alteredSampleIds],
-        invoke: async()=>{
+        await: () => [this.alteredSampleIds],
+        invoke: async () => {
             return _.difference(this.sampleIds, this.alteredSampleIds.result!);
         },
-        default: []
+        default: [],
     });
 
     readonly isSampleAlteredMap = remoteData<SampleAlteredMap>({
-        await:()=>[this.geneticTracks],
-        invoke:async ()=>{
+        await: () => [this.geneticTracks],
+        invoke: async () => {
             // The boolean array value represents "is sample altered in this track" for each sample id.
             // The samples in the lists corresponding to each entry are assumed to be the same and in the same order.
 
-            return _.reduce(this.geneticTracks.result!, (map:SampleAlteredMap, next)=>{
-                const sampleToDatum = _.keyBy(next.data, d=>d.sample);
-                map[next.label] = this.sampleIds.map(sampleId=>{
-                    const datum = sampleToDatum[sampleId];
-                    if (!datum) {
-                        return AlteredStatus.UNPROFILED;
-                    } else if (datum.data.length > 0) {
-                        return AlteredStatus.ALTERED;
-                    } else {
-                        return AlteredStatus.UNALTERED;
-                    }
-                });
-                return map;
-            }, {});
-
-        }
+            return _.reduce(
+                this.geneticTracks.result!,
+                (map: SampleAlteredMap, next) => {
+                    const sampleToDatum = _.keyBy(next.data, d => d.sample);
+                    map[next.label] = this.sampleIds.map(sampleId => {
+                        const datum = sampleToDatum[sampleId];
+                        if (!datum) {
+                            return AlteredStatus.UNPROFILED;
+                        } else if (datum.data.length > 0) {
+                            return AlteredStatus.ALTERED;
+                        } else {
+                            return AlteredStatus.UNALTERED;
+                        }
+                    });
+                    return map;
+                },
+                {}
+            );
+        },
     });
 
-    @computed get annotationData():any {
-        const promisesMap:any = {};
-        const params:any = {};
+    @computed get annotationData(): any {
+        const promisesMap: any = {};
+        const params: any = {};
         // always
         params.useHotspots = this.driverAnnotationSettings.hotspots;
         params.useCustomBinary = this.driverAnnotationSettings.customBinary;
@@ -386,51 +476,66 @@ export default class OncoprinterStore {
         return {
             promises: _.values(promisesMap),
             params,
-            promisesMap
-        }
+            promisesMap,
+        };
     }
 
     readonly nonAnnotatedGeneticTrackData = remoteData({
-        await:()=>[this.hugoGeneSymbolToGene],
-        invoke: async()=>{
+        await: () => [this.hugoGeneSymbolToGene],
+        invoke: async () => {
             if (this.parsedGeneticInputLines.result) {
-                return getSampleGeneticTrackData(this.parsedGeneticInputLines.result, this.hugoGeneSymbolToGene.result!, this.hideGermlineMutations)
+                return getSampleGeneticTrackData(
+                    this.parsedGeneticInputLines.result,
+                    this.hugoGeneSymbolToGene.result!,
+                    this.hideGermlineMutations
+                );
             } else {
                 return {};
             }
-        }
+        },
     });
 
     readonly nonAnnotatedGeneticData = remoteData({
-        await:()=>[this.nonAnnotatedGeneticTrackData],
-        invoke:async()=>{
-            return _.chain(this.nonAnnotatedGeneticTrackData.result!).values().flatten().map(o=>o.data).flatten().value();
-        }
+        await: () => [this.nonAnnotatedGeneticTrackData],
+        invoke: async () => {
+            return _.chain(this.nonAnnotatedGeneticTrackData.result!)
+                .values()
+                .flatten()
+                .map(o => o.data)
+                .flatten()
+                .value();
+        },
     });
 
     readonly annotatedGeneticTrackData = remoteData({
-        await:()=>[this.nonAnnotatedGeneticTrackData,  ...this.annotationData.promises],
-        invoke:async()=>annotateGeneticTrackData(
-            this.nonAnnotatedGeneticTrackData.result!,
-            this.annotationData.promisesMap,
-            this.annotationData.params,
-            this.driverAnnotationSettings.excludeVUS
-        )
+        await: () => [
+            this.nonAnnotatedGeneticTrackData,
+            ...this.annotationData.promises,
+        ],
+        invoke: async () =>
+            annotateGeneticTrackData(
+                this.nonAnnotatedGeneticTrackData.result!,
+                this.annotationData.promisesMap,
+                this.annotationData.params,
+                this.driverAnnotationSettings.excludeVUS
+            ),
     });
 
     readonly annotatedGeneticOncoprintData = remoteData({
-        await:()=>[this.annotatedGeneticTrackData],
-        invoke: async()=>getGeneticOncoprintData(this.annotatedGeneticTrackData.result!)
+        await: () => [this.annotatedGeneticTrackData],
+        invoke: async () =>
+            getGeneticOncoprintData(this.annotatedGeneticTrackData.result!),
     });
 
     readonly geneticTracks = remoteData({
-        await:()=>[this.annotatedGeneticOncoprintData],
-        invoke:async()=>getGeneticTracks(
-            this.annotatedGeneticOncoprintData.result!,
-            this.geneOrder,
-            this.sampleIdsNotInInputOrder
-        ),
-        default:[]
+        await: () => [this.annotatedGeneticOncoprintData],
+        invoke: async () =>
+            getGeneticTracks(
+                this.annotatedGeneticOncoprintData.result!,
+                this.geneOrder,
+                this.sampleIdsNotInInputOrder
+            ),
+        default: [],
     });
 
     @computed get clinicalTracks() {
@@ -440,6 +545,10 @@ export default class OncoprinterStore {
             return [];
         }
 
-        return getClinicalTracks(clinicalResult.headers, clinicalResult.data, this.sampleIdsNotInInputOrder);
+        return getClinicalTracks(
+            clinicalResult.headers,
+            clinicalResult.data,
+            this.sampleIdsNotInInputOrder
+        );
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/staticPages/tools/oncoprinter/OncoprinterTool.tsx b/src/pages/staticPages/tools/oncoprinter/OncoprinterTool.tsx
index 738f9055b2b..8ecd3551592 100644
--- a/src/pages/staticPages/tools/oncoprinter/OncoprinterTool.tsx
+++ b/src/pages/staticPages/tools/oncoprinter/OncoprinterTool.tsx
@@ -1,122 +1,209 @@
-import * as React from "react";
-import {observer, Observer} from "mobx-react";
-import {Helmet} from "react-helmet";
-import {PageLayout} from "../../../../shared/components/PageLayout/PageLayout";
-import OncoprinterStore from "./OncoprinterStore";
-import Oncoprinter from "./Oncoprinter";
-import {action, observable} from "mobx";
-import {Button, ControlLabel, FormControl, FormGroup} from "react-bootstrap";
-import {Collapse} from "react-collapse";
-import autobind from "autobind-decorator";
-import {exampleClinicalData, exampleGeneticData} from "./OncoprinterConstants";
-import {MSKTab, MSKTabs} from "../../../../shared/components/MSKTabs/MSKTabs";
-import MutualExclusivityTab from "../../../resultsView/mutualExclusivity/MutualExclusivityTab";
-import {getDataForSubmission} from "./OncoprinterToolUtils";
-import {ONCOPRINTER_CLINICAL_VAL_NA} from "./OncoprinterClinicalUtils";
-import styles from "./styles.module.scss";
+import * as React from 'react';
+import { observer, Observer } from 'mobx-react';
+import { Helmet } from 'react-helmet';
+import { PageLayout } from '../../../../shared/components/PageLayout/PageLayout';
+import OncoprinterStore from './OncoprinterStore';
+import Oncoprinter from './Oncoprinter';
+import { action, observable } from 'mobx';
+import { Button, ControlLabel, FormControl, FormGroup } from 'react-bootstrap';
+import { Collapse } from 'react-collapse';
+import autobind from 'autobind-decorator';
+import {
+    exampleClinicalData,
+    exampleGeneticData,
+} from './OncoprinterConstants';
+import { MSKTab, MSKTabs } from '../../../../shared/components/MSKTabs/MSKTabs';
+import MutualExclusivityTab from '../../../resultsView/mutualExclusivity/MutualExclusivityTab';
+import { getDataForSubmission } from './OncoprinterToolUtils';
+import { ONCOPRINTER_CLINICAL_VAL_NA } from './OncoprinterClinicalUtils';
+import styles from './styles.module.scss';
 
-export interface IOncoprinterToolProps {
-}
+export interface IOncoprinterToolProps {}
 
 export enum OncoprinterTab {
-    ONCOPRINT="oncoprint",
-    MUTUAL_EXCLUSIVITY="mutualExclusivity",
+    ONCOPRINT = 'oncoprint',
+    MUTUAL_EXCLUSIVITY = 'mutualExclusivity',
 }
 
 const helpSection = (
     <div className={styles.dataFormatHelp}>
         <div className={styles.dataFormatHelpSection}>
             <h4>Genomic data format</h4>
-            Each row of the data can take one of two formats, with tab- or space-delimited columns:<br/>
-            <strong>(1)</strong> <code>Sample</code> only (e.g. so that percent altered in your data can be properly calculated by including unaltered samples).<br/>
-            <strong>(2)</strong> <code>Sample</code>&#9;<code>Gene</code>&#9;<code>Alteration (defined below)</code>&#9;<code>Type (defined below)</code><br/>
+            Each row of the data can take one of two formats, with tab- or
+            space-delimited columns:
+            <br />
+            <strong>(1)</strong> <code>Sample</code> only (e.g. so that percent
+            altered in your data can be properly calculated by including
+            unaltered samples).
+            <br />
+            <strong>(2)</strong> <code>Sample</code>&#9;<code>Gene</code>&#9;
+            <code>Alteration (defined below)</code>&#9;
+            <code>Type (defined below)</code>
+            <br />
             {/*<strong>(3) (MAF format, mutation only)</strong> <code>Sample</code>, <code>Cancer Type</code>, <code>Protein Change</code>, <code>Mutation Type</code>,	<code>Chromosome</code>,
             <code>Start position</code>, <code>End position</code>, <code>Reference allele</code>,	<code>Variant allele</code><br/>
             <br/>*/}
             For rows of type 2, the definition is below:
             <ol>
-                <li><code>Sample</code>: Sample ID</li>
-                <li><code>Gene</code>: Gene symbol (or other gene identifier)</li>
-                <li><code>Alteration</code>: Definition of the alteration event
+                <li>
+                    <code>Sample</code>: Sample ID
+                </li>
+                <li>
+                    <code>Gene</code>: Gene symbol (or other gene identifier)
+                </li>
+                <li>
+                    <code>Alteration</code>: Definition of the alteration event
                     <ul>
-                        <li>Mutation event: amino acid change or any other information about the mutation</li>
+                        <li>
+                            Mutation event: amino acid change or any other
+                            information about the mutation
+                        </li>
                         <li>Fusion event: fusion information</li>
-                        <li>Copy number alteration (CNA) - please use one of the four events below:
+                        <li>
+                            Copy number alteration (CNA) - please use one of the
+                            four events below:
                             <ul>
-                                <li><code>AMP</code>: high level amplification</li>
-                                <li><code>GAIN</code>: low level gain</li>
-                                <li><code>HETLOSS</code>: shallow deletion</li>
-                                <li><code>HOMDEL</code>: deep deletion</li>
+                                <li>
+                                    <code>AMP</code>: high level amplification
+                                </li>
+                                <li>
+                                    <code>GAIN</code>: low level gain
+                                </li>
+                                <li>
+                                    <code>HETLOSS</code>: shallow deletion
+                                </li>
+                                <li>
+                                    <code>HOMDEL</code>: deep deletion
+                                </li>
                             </ul>
                         </li>
-                        <li>mRNA expression - please use one of the two events below:
+                        <li>
+                            mRNA expression - please use one of the two events
+                            below:
                             <ul>
-                                <li><code>HIGH</code>: expression high</li>
-                                <li><code>LOW</code>: expression low</li>
+                                <li>
+                                    <code>HIGH</code>: expression high
+                                </li>
+                                <li>
+                                    <code>LOW</code>: expression low
+                                </li>
                             </ul>
                         </li>
-                        <li>Protein expression - please use one of the two events below:
+                        <li>
+                            Protein expression - please use one of the two
+                            events below:
                             <ul>
-                                <li><code>HIGH</code>: Protein high</li>
-                                <li><code>LOW</code>: Protein low</li>
+                                <li>
+                                    <code>HIGH</code>: Protein high
+                                </li>
+                                <li>
+                                    <code>LOW</code>: Protein low
+                                </li>
                             </ul>
                         </li>
                     </ul>
                 </li>
-                <li><code>Type</code>: Definition of the alteration type. It has to be one of the following.
+                <li>
+                    <code>Type</code>: Definition of the alteration type. It has
+                    to be one of the following.
                     <ul>
-                        <li>For a mutation event, please use one of the five mutation types below:
+                        <li>
+                            For a mutation event, please use one of the five
+                            mutation types below:
                             <ul>
-                                <li><code>MISSENSE</code>: a missense mutation</li>
-                                <li><code>INFRAME</code>: a inframe mutation</li>
-                                <li><code>TRUNC</code>: a truncation mutation</li>
-                                <li><code>PROMOTER</code>: a promoter mutation</li>
-                                <li><code>OTHER</code>: any other kind of mutation</li>
+                                <li>
+                                    <code>MISSENSE</code>: a missense mutation
+                                </li>
+                                <li>
+                                    <code>INFRAME</code>: a inframe mutation
+                                </li>
+                                <li>
+                                    <code>TRUNC</code>: a truncation mutation
+                                </li>
+                                <li>
+                                    <code>PROMOTER</code>: a promoter mutation
+                                </li>
+                                <li>
+                                    <code>OTHER</code>: any other kind of
+                                    mutation
+                                </li>
                             </ul>
-                            <br/>
-                            In addition, mutation types can be augmented with the modifiers <span style={{whiteSpace:"nowrap"}}><code>_GERMLINE</code> and <code>_DRIVER</code></span>
-                            to indicate that they are, respectively, germline and driver mutations.
-                            <br/>
-                            For example: <code>INFRAME_GERMLINE</code> or <code>MISSENSE_GERMLINE_DRIVER</code> or <code>TRUNC_DRIVER</code>.
-                            <br/>
+                            <br />
+                            In addition, mutation types can be augmented with
+                            the modifiers{' '}
+                            <span style={{ whiteSpace: 'nowrap' }}>
+                                <code>_GERMLINE</code> and <code>_DRIVER</code>
+                            </span>
+                            to indicate that they are, respectively, germline
+                            and driver mutations.
+                            <br />
+                            For example: <code>INFRAME_GERMLINE</code> or{' '}
+                            <code>MISSENSE_GERMLINE_DRIVER</code> or{' '}
+                            <code>TRUNC_DRIVER</code>.
+                            <br />
                         </li>
-                        <li><code>FUSION</code>: a fusion event
+                        <li>
+                            <code>FUSION</code>: a fusion event
                         </li>
-                        <li><code>CNA</code>: a copy number alteration event
+                        <li>
+                            <code>CNA</code>: a copy number alteration event
                         </li>
-                        <li><code>EXP</code>: a expression event
+                        <li>
+                            <code>EXP</code>: a expression event
                         </li>
-                        <li><code>PROT</code>: a protein expression event
+                        <li>
+                            <code>PROT</code>: a protein expression event
                         </li>
                     </ul>
                 </li>
             </ol>
         </div>
-        <div className={styles.dataFormatHelpBorder}/>
+        <div className={styles.dataFormatHelpBorder} />
         <div className={styles.dataFormatHelpSection}>
             <h4>Clinical data format</h4>
-            All rows are tab- or space-delimited.<br/>
-            The first (header) row gives the names of the clinical attributes, as well as their data type (number, lognumber, or string, default is string). An example first row is:<br/>
-            <code>Sample</code>&#9;<code>Age(number)</code>&#9;<code>Cancer_Type(string)</code>&#9;<code>Mutation_Count(lognumber)</code><br/>
-            Each following row gives the sample id, then the value for each clinical attribute, or the special value {ONCOPRINTER_CLINICAL_VAL_NA} which indicates that there's no data.<br/>
-            Some example data rows would then be:<br/>
-            <code>sample1</code>&#9;<code>30</code>&#9;<code>{ONCOPRINTER_CLINICAL_VAL_NA}</code>&#9;<code>1</code><br/>
-            <code>sample2</code>&#9;<code>27</code>&#9;<code>Colorectal</code>&#9;<code>100</code><br/>
-            <code>sample3</code>&#9;<code>{ONCOPRINTER_CLINICAL_VAL_NA}</code>&#9;<code>Breast</code>&#9;<code>{ONCOPRINTER_CLINICAL_VAL_NA}</code><br/>
+            All rows are tab- or space-delimited.
+            <br />
+            The first (header) row gives the names of the clinical attributes,
+            as well as their data type (number, lognumber, or string, default is
+            string). An example first row is:
+            <br />
+            <code>Sample</code>&#9;<code>Age(number)</code>&#9;
+            <code>Cancer_Type(string)</code>&#9;
+            <code>Mutation_Count(lognumber)</code>
+            <br />
+            Each following row gives the sample id, then the value for each
+            clinical attribute, or the special value{' '}
+            {ONCOPRINTER_CLINICAL_VAL_NA} which indicates that there's no data.
+            <br />
+            Some example data rows would then be:
+            <br />
+            <code>sample1</code>&#9;<code>30</code>&#9;
+            <code>{ONCOPRINTER_CLINICAL_VAL_NA}</code>&#9;<code>1</code>
+            <br />
+            <code>sample2</code>&#9;<code>27</code>&#9;<code>Colorectal</code>
+            &#9;<code>100</code>
+            <br />
+            <code>sample3</code>&#9;<code>{ONCOPRINTER_CLINICAL_VAL_NA}</code>
+            &#9;<code>Breast</code>&#9;
+            <code>{ONCOPRINTER_CLINICAL_VAL_NA}</code>
+            <br />
         </div>
     </div>
 );
 
 @observer
-export default class OncoprinterTool extends React.Component<IOncoprinterToolProps, {}> {
+export default class OncoprinterTool extends React.Component<
+    IOncoprinterToolProps,
+    {}
+> {
     private store = new OncoprinterStore();
-    private oncoprinter:Oncoprinter|null;
-    private geneticFileInput:HTMLInputElement|null;
-    private clinicalFileInput:HTMLInputElement|null;
-    @observable private activeTabId:OncoprinterTab = OncoprinterTab.ONCOPRINT;
+    private oncoprinter: Oncoprinter | null;
+    private geneticFileInput: HTMLInputElement | null;
+    private clinicalFileInput: HTMLInputElement | null;
+    @observable private activeTabId: OncoprinterTab = OncoprinterTab.ONCOPRINT;
 
     @autobind
-    private oncoprinterRef(o:Oncoprinter|null) {
+    private oncoprinterRef(o: Oncoprinter | null) {
         this.oncoprinter = o;
     }
 
@@ -126,10 +213,10 @@ export default class OncoprinterTool extends React.Component<IOncoprinterToolPro
     @observable helpOpened = false;
 
     // input
-    @observable geneticDataInput = "";
-    @observable clinicalDataInput = "";
-    @observable geneOrderInput = "";
-    @observable sampleOrderInput = "";
+    @observable geneticDataInput = '';
+    @observable clinicalDataInput = '';
+    @observable geneOrderInput = '';
+    @observable sampleOrderInput = '';
 
     @autobind
     private toggleHelpOpened() {
@@ -166,34 +253,49 @@ export default class OncoprinterTool extends React.Component<IOncoprinterToolPro
         this.sampleOrderInput = e.currentTarget.value;
     }
 
-    @action private doSubmit(geneticDataInput:string, clinicalDataInput:string) {
-        this.store.setInput(geneticDataInput, clinicalDataInput, this.geneOrderInput, this.sampleOrderInput);
+    @action private doSubmit(
+        geneticDataInput: string,
+        clinicalDataInput: string
+    ) {
+        this.store.setInput(
+            geneticDataInput,
+            clinicalDataInput,
+            this.geneOrderInput,
+            this.sampleOrderInput
+        );
 
         if (this.store.parseErrors.length === 0) {
             this.dataInputOpened = false;
         }
     }
 
-    @autobind private geneticFileInputRef(input:HTMLInputElement|null) {
+    @autobind private geneticFileInputRef(input: HTMLInputElement | null) {
         this.geneticFileInput = input;
     }
 
-    @autobind private clinicalFileInputRef(input:HTMLInputElement|null) {
+    @autobind private clinicalFileInputRef(input: HTMLInputElement | null) {
         this.clinicalFileInput = input;
     }
 
     @autobind
     private getGeneticDataForSubmission() {
-        return getDataForSubmission(this.geneticFileInput, this.geneticDataInput);
+        return getDataForSubmission(
+            this.geneticFileInput,
+            this.geneticDataInput
+        );
     }
 
     @autobind
     private getClinicalDataForSubmission() {
-        return getDataForSubmission(this.clinicalFileInput, this.clinicalDataInput);
+        return getDataForSubmission(
+            this.clinicalFileInput,
+            this.clinicalDataInput
+        );
     }
 
     @autobind
-    @action private async onClickSubmit() {
+    @action
+    private async onClickSubmit() {
         const geneticData = await this.getGeneticDataForSubmission();
         const clinicalData = await this.getClinicalDataForSubmission();
 
@@ -203,12 +305,20 @@ export default class OncoprinterTool extends React.Component<IOncoprinterToolPro
     @autobind
     private getHelpSection() {
         return (
-            <div style={{marginBottom:7}}>
-                <span>Please input <strong>tab-delimited or space-delimited</strong> data.</span>
-                <Button style={{marginLeft:7}} bsStyle="primary" bsSize="small" onClick={this.toggleHelpOpened}>{`${this.helpOpened ? "Close" : "Open"} data format help`}</Button>
-                <Collapse isOpened={this.helpOpened}>
-                    {helpSection}
-                </Collapse>
+            <div style={{ marginBottom: 7 }}>
+                <span>
+                    Please input{' '}
+                    <strong>tab-delimited or space-delimited</strong> data.
+                </span>
+                <Button
+                    style={{ marginLeft: 7 }}
+                    bsStyle="primary"
+                    bsSize="small"
+                    onClick={this.toggleHelpOpened}
+                >{`${
+                    this.helpOpened ? 'Close' : 'Open'
+                } data format help`}</Button>
+                <Collapse isOpened={this.helpOpened}>{helpSection}</Collapse>
             </div>
         );
     }
@@ -217,17 +327,17 @@ export default class OncoprinterTool extends React.Component<IOncoprinterToolPro
     private getInputSection() {
         return (
             <FormGroup
-                style={{ display:this.dataInputOpened ? undefined : "none" }}
+                style={{ display: this.dataInputOpened ? undefined : 'none' }}
             >
-                <div style={{ display:"flex", justifyContent:"space-between" }}>
-                    <div style={{ width:"45%"}}>
-                        <ControlLabel
-                            style={{marginBottom:7}}
-                        >
+                <div
+                    style={{ display: 'flex', justifyContent: 'space-between' }}
+                >
+                    <div style={{ width: '45%' }}>
+                        <ControlLabel style={{ marginBottom: 7 }}>
                             Input genomic alteration data (optional):
                             <Button
                                 className="oncoprinterGeneticExampleData"
-                                style={{marginLeft:7}}
+                                style={{ marginLeft: 7 }}
                                 bsStyle="primary"
                                 bsSize="small"
                                 onClick={this.populateGeneticExampleData}
@@ -241,19 +351,17 @@ export default class OncoprinterTool extends React.Component<IOncoprinterToolPro
                             value={this.geneticDataInput}
                             placeholder="Enter data here..."
                             onChange={this.onGeneticDataInputChange}
-                            style={{"height":200, width:"100%"}}
+                            style={{ height: 200, width: '100%' }}
                         />
                         <ControlLabel>or input data from file:</ControlLabel>
-                        <input ref={this.geneticFileInputRef} type="file"/>
+                        <input ref={this.geneticFileInputRef} type="file" />
                     </div>
-                    <div style={{ width:"45%"}}>
-                        <ControlLabel
-                            style={{marginBottom:7}}
-                        >
+                    <div style={{ width: '45%' }}>
+                        <ControlLabel style={{ marginBottom: 7 }}>
                             Input clinical data (optional):
                             <Button
                                 className="oncoprinterClinicalExampleData"
-                                style={{marginLeft:7}}
+                                style={{ marginLeft: 7 }}
                                 bsStyle="primary"
                                 bsSize="small"
                                 onClick={this.populateClinicalExampleData}
@@ -267,46 +375,58 @@ export default class OncoprinterTool extends React.Component<IOncoprinterToolPro
                             value={this.clinicalDataInput}
                             placeholder="Enter data here..."
                             onChange={this.onClinicalDataInputChange}
-                            style={{"height":200, width:"100%"}}
+                            style={{ height: 200, width: '100%' }}
                         />
                         <ControlLabel>or input data from file:</ControlLabel>
-                        <input ref={this.clinicalFileInputRef} type="file"/>
+                        <input ref={this.clinicalFileInputRef} type="file" />
                     </div>
                 </div>
-                <br/>
-                <ControlLabel>Please define the order of genes (optional):</ControlLabel>
+                <br />
+                <ControlLabel>
+                    Please define the order of genes (optional):
+                </ControlLabel>
                 <FormControl
                     className="oncoprinterGenesInput"
                     componentClass="textarea"
                     value={this.geneOrderInput}
                     placeholder="Enter genes here, comma- or whitespace-delimited..."
                     onChange={this.onGeneOrderInputChange}
-                    style={{"height":35, width:475}}
+                    style={{ height: 35, width: 475 }}
                 />
-                <br/>
-                <ControlLabel>Please define the order of samples (optional):</ControlLabel>
+                <br />
+                <ControlLabel>
+                    Please define the order of samples (optional):
+                </ControlLabel>
                 <FormControl
                     className="oncoprinterSamplesInput"
                     componentClass="textarea"
                     value={this.sampleOrderInput}
                     placeholder="Enter samples here, comma- or whitespace-delimited..."
                     onChange={this.onSampleOrderInputChange}
-                    style={{"height":35, width:475}}
+                    style={{ height: 35, width: 475 }}
                 />
-                <br/>
+                <br />
                 <Button
                     className="oncoprinterSubmit"
                     bsSize="large"
                     bsStyle="primary"
-                    disabled={this.geneticDataInput.trim().length === 0 && this.clinicalDataInput.trim().length === 0}
+                    disabled={
+                        this.geneticDataInput.trim().length === 0 &&
+                        this.clinicalDataInput.trim().length === 0
+                    }
                     onClick={this.onClickSubmit}
-                    style={{marginBottom:20}}
+                    style={{ marginBottom: 20 }}
                 >
                     Submit
                 </Button>
-                { (this.store.parseErrors.length > 0) && (
-                    <div className="alert alert-danger" style={{marginTop:5, whiteSpace:"pre-wrap"}}>
-                        {this.store.parseErrors.map(err=>(<div>{err}</div>))}
+                {this.store.parseErrors.length > 0 && (
+                    <div
+                        className="alert alert-danger"
+                        style={{ marginTop: 5, whiteSpace: 'pre-wrap' }}
+                    >
+                        {this.store.parseErrors.map(err => (
+                            <div>{err}</div>
+                        ))}
                     </div>
                 )}
             </FormGroup>
@@ -314,46 +434,72 @@ export default class OncoprinterTool extends React.Component<IOncoprinterToolPro
     }
 
     render() {
-
-        const numCells = this.store.hugoGeneSymbols.length * this.store.sampleIds.length;
+        const numCells =
+            this.store.hugoGeneSymbols.length * this.store.sampleIds.length;
         return (
             <PageLayout className={'whiteBackground staticPage'}>
                 <Helmet>
-                    <title>{'cBioPortal for Cancer Genomics::Oncoprinter'}</title>
+                    <title>
+                        {'cBioPortal for Cancer Genomics::Oncoprinter'}
+                    </title>
                 </Helmet>
                 <div className="cbioportal-frontend">
-                    <h1 style={{display: "inline", marginRight:10}}>Oncoprinter</h1> Generate Oncoprints and perform mutual exclusivity analysis from your own data.
-                    <br/><br/>
-                    <Observer>
-                        {this.getHelpSection}
-                    </Observer>
-                    <Observer>
-                        {this.getInputSection}
-                    </Observer>
-                    { !this.dataInputOpened && (
-                        <button className="btn btn-primary btn-lg oncoprinterModifyInput" style={{paddingLeft:50, paddingRight:50, marginBottom:15}}
-                                onClick={()=>{ this.dataInputOpened = true; }}
+                    <h1 style={{ display: 'inline', marginRight: 10 }}>
+                        Oncoprinter
+                    </h1>{' '}
+                    Generate Oncoprints and perform mutual exclusivity analysis
+                    from your own data.
+                    <br />
+                    <br />
+                    <Observer>{this.getHelpSection}</Observer>
+                    <Observer>{this.getInputSection}</Observer>
+                    {!this.dataInputOpened && (
+                        <button
+                            className="btn btn-primary btn-lg oncoprinterModifyInput"
+                            style={{
+                                paddingLeft: 50,
+                                paddingRight: 50,
+                                marginBottom: 15,
+                            }}
+                            onClick={() => {
+                                this.dataInputOpened = true;
+                            }}
                         >
                             Modify Input
                         </button>
                     )}
-                    <div style={{display:(this.store.hasData() && !this.store.parseErrors.length) ? "block" : "none"}}>
-                        <MSKTabs activeTabId={this.activeTabId} unmountOnHide={false}
-                                 onTabClick={(id:string)=>{ this.activeTabId=id as OncoprinterTab; }}
-                                 className="mainTabs"
+                    <div
+                        style={{
+                            display:
+                                this.store.hasData() &&
+                                !this.store.parseErrors.length
+                                    ? 'block'
+                                    : 'none',
+                        }}
+                    >
+                        <MSKTabs
+                            activeTabId={this.activeTabId}
+                            unmountOnHide={false}
+                            onTabClick={(id: string) => {
+                                this.activeTabId = id as OncoprinterTab;
+                            }}
+                            className="mainTabs"
                         >
-                            <MSKTab key={0} id={OncoprinterTab.ONCOPRINT} linkText="Oncoprint">
-                                {(numCells > 100000) && (
-                                    <div
-                                        className="alert alert-warning"
-                                    >
-                                        Warning: Because your inputted data is very large,
-                                        the Oncoprinter may be slow, and downloaded PDF, SVG, and PNG
-                                        may be huge and unresponsive. We recommend plotting
-                                        data for fewer genes at a time.
+                            <MSKTab
+                                key={0}
+                                id={OncoprinterTab.ONCOPRINT}
+                                linkText="Oncoprint"
+                            >
+                                {numCells > 100000 && (
+                                    <div className="alert alert-warning">
+                                        Warning: Because your inputted data is
+                                        very large, the Oncoprinter may be slow,
+                                        and downloaded PDF, SVG, and PNG may be
+                                        huge and unresponsive. We recommend
+                                        plotting data for fewer genes at a time.
                                     </div>
                                 )}
-                                <div style={{marginTop:10}}>
+                                <div style={{ marginTop: 10 }}>
                                     <Oncoprinter
                                         ref={this.oncoprinterRef}
                                         divId="oncoprinter"
@@ -361,8 +507,16 @@ export default class OncoprinterTool extends React.Component<IOncoprinterToolPro
                                     />
                                 </div>
                             </MSKTab>
-                            <MSKTab key={1} id={OncoprinterTab.MUTUAL_EXCLUSIVITY} linkText="Mutual Exclusivity">
-                                <MutualExclusivityTab isSampleAlteredMap={this.store.isSampleAlteredMap}/>
+                            <MSKTab
+                                key={1}
+                                id={OncoprinterTab.MUTUAL_EXCLUSIVITY}
+                                linkText="Mutual Exclusivity"
+                            >
+                                <MutualExclusivityTab
+                                    isSampleAlteredMap={
+                                        this.store.isSampleAlteredMap
+                                    }
+                                />
                             </MSKTab>
                         </MSKTabs>
                     </div>
@@ -370,4 +524,4 @@ export default class OncoprinterTool extends React.Component<IOncoprinterToolPro
             </PageLayout>
         );
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/staticPages/tools/oncoprinter/OncoprinterToolUtils.ts b/src/pages/staticPages/tools/oncoprinter/OncoprinterToolUtils.ts
index bf41ef6fc96..7e6dbae7a94 100644
--- a/src/pages/staticPages/tools/oncoprinter/OncoprinterToolUtils.ts
+++ b/src/pages/staticPages/tools/oncoprinter/OncoprinterToolUtils.ts
@@ -1,14 +1,17 @@
-export function getDataForSubmission(fileInput:HTMLInputElement|null, stringInput:string) {
-    return new Promise<string>(resolve=>{
+export function getDataForSubmission(
+    fileInput: HTMLInputElement | null,
+    stringInput: string
+) {
+    return new Promise<string>(resolve => {
         if (fileInput && fileInput.files && fileInput.files.length > 0) {
             // get data from file upload
             const fileReader = new FileReader();
-            fileReader.onload = ()=>{
+            fileReader.onload = () => {
                 const data = fileReader.result as string | null;
                 if (data) {
                     resolve(data);
                 } else {
-                    resolve("");
+                    resolve('');
                 }
             };
             fileReader.readAsText(fileInput.files[0]);
@@ -17,4 +20,4 @@ export function getDataForSubmission(fileInput:HTMLInputElement|null, stringInpu
             resolve(stringInput);
         }
     });
-}
\ No newline at end of file
+}
diff --git a/src/pages/staticPages/tools/oncoprinter/styles.module.scss b/src/pages/staticPages/tools/oncoprinter/styles.module.scss
index c3ce9220295..d4ae950d3bb 100644
--- a/src/pages/staticPages/tools/oncoprinter/styles.module.scss
+++ b/src/pages/staticPages/tools/oncoprinter/styles.module.scss
@@ -1,17 +1,17 @@
 .dataFormatHelp {
-  background-color:#eee;
-  padding:13px;
-  border-radius: 11px;
-  margin-top:10px;
-  display:inline-flex;
+    background-color: #eee;
+    padding: 13px;
+    border-radius: 11px;
+    margin-top: 10px;
+    display: inline-flex;
 
-  .dataFormatHelpSection {
-    max-width:600px;
-  }
+    .dataFormatHelpSection {
+        max-width: 600px;
+    }
 
-  .dataFormatHelpBorder {
-    border-left:1px solid black;
-    margin-left:15px;
-    margin-right:15px;
-  }
-}
\ No newline at end of file
+    .dataFormatHelpBorder {
+        border-left: 1px solid black;
+        margin-left: 15px;
+        margin-right: 15px;
+    }
+}
diff --git a/src/pages/staticPages/tutorials/Tutorials.tsx b/src/pages/staticPages/tutorials/Tutorials.tsx
index aefbb66dda2..ab7c6c61fbf 100644
--- a/src/pages/staticPages/tutorials/Tutorials.tsx
+++ b/src/pages/staticPages/tutorials/Tutorials.tsx
@@ -1,83 +1,166 @@
 import * as React from 'react';
-import {observer} from 'mobx-react';
-import {PageLayout} from "../../../shared/components/PageLayout/PageLayout";
+import { observer } from 'mobx-react';
+import { PageLayout } from '../../../shared/components/PageLayout/PageLayout';
 import './styles.scss';
-import Helmet from "react-helmet";
-import {getNCBIlink} from "cbioportal-frontend-commons";
+import Helmet from 'react-helmet';
+import { getNCBIlink } from 'cbioportal-frontend-commons';
 import AppConfig from 'appConfig';
 
 @observer
 export default class Tutorials extends React.Component<{}, {}> {
-
     public render() {
-
-        return <PageLayout className={'whiteBackground staticPage'}>
-            <Helmet>
-                <title>{'cBioPortal for Cancer Genomics::Tutorials'}</title>
-            </Helmet>
-            <h1>Tutorials</h1>
-
-            <h2>Step-by-step Guide to cBioPortal: a Protocol Paper</h2>
-            <p>Gao, Aksoy, Dogrusoz, Dresdner, Gross, Sumer, Sun, Jacobsen, Sinha, Larsson, Cerami, Sander,
-                Schultz. <br/>
-                <b>Integrative analysis of complex cancer genomics and clinical profiles using the cBioPortal.</b> <br/>
-                <i>Sci. Signal.</i> 6, pl1 (2013).
-                [<a href={getNCBIlink('/pubmed/23550210')}>Reprint</a>].</p>
-
-            <hr />
-            <h2 className={'tutorialsFolderText'}>View tutorial slides below or download from <a href="https://drive.google.com/drive/u/0/folders/0B9KTQJAGhFhhRi1qaTdUWmpLQTA">Google Drive</a> or <a href={`${AppConfig.serverConfig.skin_documentation_baseurl!.replace("raw.githubusercontent.com", "www.github.com").replace("/master/", "/tree/master/")}tutorials`}>GitHub</a>.</h2>
-            <hr/>
-
-            <h2 id={"single-study-exploration"}>Tutorial #1: Single Study Exploration</h2>
-            <iframe src="https://docs.google.com/presentation/d/1_OGK69lO4Z62WaxHHkNYmWvY0LQN2v0slfaLyY1_IQ0/embed?start=false&loop=false&delayms=60000"
-                frameBorder="0" width="720" height="434" allowFullScreen={true}></iframe>
-            <h4><a href={`${AppConfig.serverConfig.skin_documentation_baseurl!}tutorials/cBioPortal Tutorial 1 Single Study Exploration.pdf`}>Download tutorial</a></h4>
-            <hr/>
-
-            <h2 id={"single-study-query"}>Tutorial #2: Single Study Query</h2>
-            <iframe
-                src="https://docs.google.com/presentation/d/1y9UTIr5vHmsNVWqtGTVGgiuYX9wkK_a_RPNYiR8kYD8/embed?start=false&loop=false&delayms=60000"
-                frameBorder="0" width="720" height="434" allowFullScreen={true}></iframe>
-            <h4><a href={`${AppConfig.serverConfig.skin_documentation_baseurl!}tutorials/cBioPortal Tutorial 2 Single Study Query.pdf`}>Download tutorial</a></h4>
-            <hr/>
-
-            <h2 id={"patient-view"}>Tutorial #3: Patient View</h2>
-            <iframe src="https://docs.google.com/presentation/d/1Jr_2yEfgjKBn4DBiXRk4kmhIbtsRp6gd0iD3k1fIUUk/embed?start=false&loop=false&delayms=60000"
-                frameBorder="0" width="720" height="434" allowFullScreen={true}></iframe>
-            <h4><a href={`${AppConfig.serverConfig.skin_documentation_baseurl!}tutorials/cBioPortal Tutorial 3 Patient View.pdf`}>Download tutorial</a></h4>
-            <hr/>
-
-
-            <h2 id={"virtual-studies"}>Tutorial #4: Virtual Studies</h2>
-            <iframe
-                src="https://docs.google.com/presentation/d/1rQE5rbFNdmup-rAtySHFxlLp3i4qa8SBA7MiQpMdn1I/embed?start=false&loop=false&delayms=60000"
-                frameBorder="0" width="720" height="434"
-                allowFullScreen={true}></iframe>
-            <h4><a href={`${AppConfig.serverConfig.skin_documentation_baseurl!}tutorials/cBioPortal Tutorial 4 Virtual Studies.pdf`}>Download tutorial</a></h4>
-            <hr />
-
-            <h2 id={"oql"}>Tutorial #5: Onco Query Language (OQL)</h2>
-            <iframe
-                src="https://docs.google.com/presentation/d/1U39xgVujtBodwW20qIfcGu4E5n2zzaKkl2KmzzHqj4A/embed?startfalse&loop=false&delayms=60000"
-                frameBorder="0" width="720" height="434"
-                allowFullScreen={true}></iframe>
-            <h4><a href={`${AppConfig.serverConfig.skin_documentation_baseurl!}tutorials/cBioPortal Tutorial 5 Onco Query Language.pdf`}>Download tutorial</a></h4>
-            <hr />
-
-            <h2 id={"group-comparison"}>Tutorial #6: Group Comparison</h2>
-            <iframe
-                src="https://docs.google.com/presentation/d/1P2boDph8IfpvjxoxDj_496CLHGtshzJnbbZhszPsmf4/embed?startfalse&loop=false&delayms=60000"
-                frameBorder="0" width="720" height="434"
-                allowFullScreen={true}></iframe>
-            <h4><a href={`${AppConfig.serverConfig.skin_documentation_baseurl!}tutorials/cBioPortal Tutorial 6 Group Comparison.pdf`}>Download tutorial</a></h4>
-            
-
-        </PageLayout>
-
+        return (
+            <PageLayout className={'whiteBackground staticPage'}>
+                <Helmet>
+                    <title>{'cBioPortal for Cancer Genomics::Tutorials'}</title>
+                </Helmet>
+                <h1>Tutorials</h1>
+
+                <h2>Step-by-step Guide to cBioPortal: a Protocol Paper</h2>
+                <p>
+                    Gao, Aksoy, Dogrusoz, Dresdner, Gross, Sumer, Sun, Jacobsen,
+                    Sinha, Larsson, Cerami, Sander, Schultz. <br />
+                    <b>
+                        Integrative analysis of complex cancer genomics and
+                        clinical profiles using the cBioPortal.
+                    </b>{' '}
+                    <br />
+                    <i>Sci. Signal.</i> 6, pl1 (2013). [
+                    <a href={getNCBIlink('/pubmed/23550210')}>Reprint</a>].
+                </p>
+
+                <hr />
+                <h2 className={'tutorialsFolderText'}>
+                    View tutorial slides below or download from{' '}
+                    <a href="https://drive.google.com/drive/u/0/folders/0B9KTQJAGhFhhRi1qaTdUWmpLQTA">
+                        Google Drive
+                    </a>{' '}
+                    or{' '}
+                    <a
+                        href={`${AppConfig.serverConfig
+                            .skin_documentation_baseurl!.replace(
+                                'raw.githubusercontent.com',
+                                'www.github.com'
+                            )
+                            .replace('/master/', '/tree/master/')}tutorials`}
+                    >
+                        GitHub
+                    </a>
+                    .
+                </h2>
+                <hr />
+
+                <h2 id={'single-study-exploration'}>
+                    Tutorial #1: Single Study Exploration
+                </h2>
+                <iframe
+                    src="https://docs.google.com/presentation/d/1_OGK69lO4Z62WaxHHkNYmWvY0LQN2v0slfaLyY1_IQ0/embed?start=false&loop=false&delayms=60000"
+                    frameBorder="0"
+                    width="720"
+                    height="434"
+                    allowFullScreen={true}
+                ></iframe>
+                <h4>
+                    <a
+                        href={`${AppConfig.serverConfig
+                            .skin_documentation_baseurl!}tutorials/cBioPortal Tutorial 1 Single Study Exploration.pdf`}
+                    >
+                        Download tutorial
+                    </a>
+                </h4>
+                <hr />
+
+                <h2 id={'single-study-query'}>
+                    Tutorial #2: Single Study Query
+                </h2>
+                <iframe
+                    src="https://docs.google.com/presentation/d/1y9UTIr5vHmsNVWqtGTVGgiuYX9wkK_a_RPNYiR8kYD8/embed?start=false&loop=false&delayms=60000"
+                    frameBorder="0"
+                    width="720"
+                    height="434"
+                    allowFullScreen={true}
+                ></iframe>
+                <h4>
+                    <a
+                        href={`${AppConfig.serverConfig
+                            .skin_documentation_baseurl!}tutorials/cBioPortal Tutorial 2 Single Study Query.pdf`}
+                    >
+                        Download tutorial
+                    </a>
+                </h4>
+                <hr />
+
+                <h2 id={'patient-view'}>Tutorial #3: Patient View</h2>
+                <iframe
+                    src="https://docs.google.com/presentation/d/1Jr_2yEfgjKBn4DBiXRk4kmhIbtsRp6gd0iD3k1fIUUk/embed?start=false&loop=false&delayms=60000"
+                    frameBorder="0"
+                    width="720"
+                    height="434"
+                    allowFullScreen={true}
+                ></iframe>
+                <h4>
+                    <a
+                        href={`${AppConfig.serverConfig
+                            .skin_documentation_baseurl!}tutorials/cBioPortal Tutorial 3 Patient View.pdf`}
+                    >
+                        Download tutorial
+                    </a>
+                </h4>
+                <hr />
+
+                <h2 id={'virtual-studies'}>Tutorial #4: Virtual Studies</h2>
+                <iframe
+                    src="https://docs.google.com/presentation/d/1rQE5rbFNdmup-rAtySHFxlLp3i4qa8SBA7MiQpMdn1I/embed?start=false&loop=false&delayms=60000"
+                    frameBorder="0"
+                    width="720"
+                    height="434"
+                    allowFullScreen={true}
+                ></iframe>
+                <h4>
+                    <a
+                        href={`${AppConfig.serverConfig
+                            .skin_documentation_baseurl!}tutorials/cBioPortal Tutorial 4 Virtual Studies.pdf`}
+                    >
+                        Download tutorial
+                    </a>
+                </h4>
+                <hr />
+
+                <h2 id={'oql'}>Tutorial #5: Onco Query Language (OQL)</h2>
+                <iframe
+                    src="https://docs.google.com/presentation/d/1U39xgVujtBodwW20qIfcGu4E5n2zzaKkl2KmzzHqj4A/embed?startfalse&loop=false&delayms=60000"
+                    frameBorder="0"
+                    width="720"
+                    height="434"
+                    allowFullScreen={true}
+                ></iframe>
+                <h4>
+                    <a
+                        href={`${AppConfig.serverConfig
+                            .skin_documentation_baseurl!}tutorials/cBioPortal Tutorial 5 Onco Query Language.pdf`}
+                    >
+                        Download tutorial
+                    </a>
+                </h4>
+                <hr />
+
+                <h2 id={'group-comparison'}>Tutorial #6: Group Comparison</h2>
+                <iframe
+                    src="https://docs.google.com/presentation/d/1P2boDph8IfpvjxoxDj_496CLHGtshzJnbbZhszPsmf4/embed?startfalse&loop=false&delayms=60000"
+                    frameBorder="0"
+                    width="720"
+                    height="434"
+                    allowFullScreen={true}
+                ></iframe>
+                <h4>
+                    <a
+                        href={`${AppConfig.serverConfig
+                            .skin_documentation_baseurl!}tutorials/cBioPortal Tutorial 6 Group Comparison.pdf`}
+                    >
+                        Download tutorial
+                    </a>
+                </h4>
+            </PageLayout>
+        );
     }
-
 }
-
-
-
-
diff --git a/src/pages/staticPages/tutorials/styles.scss b/src/pages/staticPages/tutorials/styles.scss
index 54b0e7a61c2..067aa0ccc2d 100644
--- a/src/pages/staticPages/tutorials/styles.scss
+++ b/src/pages/staticPages/tutorials/styles.scss
@@ -1,11 +1,11 @@
 .commandDocumentation {
-  table {
-    margin-bottom:30px !important;
-  }
+    table {
+        margin-bottom: 30px !important;
+    }
 }
 
 .tutorialsFolderText {
-  a {
-    text-decoration: underline !important;
-  }
-}
\ No newline at end of file
+    a {
+        text-decoration: underline !important;
+    }
+}
diff --git a/src/pages/staticPages/visualize/Visualize.tsx b/src/pages/staticPages/visualize/Visualize.tsx
index 31735e99540..f4c0d2aa024 100644
--- a/src/pages/staticPages/visualize/Visualize.tsx
+++ b/src/pages/staticPages/visualize/Visualize.tsx
@@ -1,77 +1,134 @@
 import * as React from 'react';
-import {observer} from 'mobx-react';
-import Helmet from "react-helmet";
-import {PageLayout} from "shared/components/PageLayout/PageLayout";
+import { observer } from 'mobx-react';
+import Helmet from 'react-helmet';
+import { PageLayout } from 'shared/components/PageLayout/PageLayout';
 
 import './styles.scss';
 import styles from './visualize.module.scss';
-import {getNCBIlink} from "cbioportal-frontend-commons";
+import { getNCBIlink } from 'cbioportal-frontend-commons';
 
 @observer
 export default class Visualize extends React.Component<{}, {}> {
-
     public render() {
-
         return (
             <PageLayout className={'whiteBackground staticPage'}>
                 <Helmet>
-                    <title>{'cBioPortal for Cancer Genomics::Visualize Your Data'}</title>
+                    <title>
+                        {'cBioPortal for Cancer Genomics::Visualize Your Data'}
+                    </title>
                 </Helmet>
 
                 <h1>Visualize Your Data</h1>
 
-                <h2 id="download-and-install-a-local-version-of-cbioportal">1. Download and install a local version of cBioPortal</h2>
+                <h2 id="download-and-install-a-local-version-of-cbioportal">
+                    1. Download and install a local version of cBioPortal
+                </h2>
                 <ul>
                     <li>
-                        The source code of cBioPortal is available
-                        on <a href="https://github.com/cBioPortal/cbioportal">GitHub</a> under the terms of Affero GPL V3.
+                        The source code of cBioPortal is available on{' '}
+                        <a href="https://github.com/cBioPortal/cbioportal">
+                            GitHub
+                        </a>{' '}
+                        under the terms of Affero GPL V3.
                     </li>
                     <li>
-                        Please note that, installing a local version requires system administration skills, for example,
-                        installing and configuring Tomcat and MySQL. With limited resources,
-                        we cannot provide technical support on system administration.
+                        Please note that, installing a local version requires
+                        system administration skills, for example, installing
+                        and configuring Tomcat and MySQL. With limited
+                        resources, we cannot provide technical support on system
+                        administration.
                     </li>
                 </ul>
 
                 <h2>2. We host data for you (academic use)</h2>
                 <ul>
-                    <li>Public data will be available to everyone. Suggestions on data sets are welcome.</li>
-                    <li>Private data will be accessible by you and your collaborators.</li>
-                    <li>Please <a href="mailto:cbioportal@cbio.mskcc.org?subject=Uploading public data">contact us</a> for details.</li>
+                    <li>
+                        Public data will be available to everyone. Suggestions
+                        on data sets are welcome.
+                    </li>
+                    <li>
+                        Private data will be accessible by you and your
+                        collaborators.
+                    </li>
+                    <li>
+                        Please{' '}
+                        <a href="mailto:cbioportal@cbio.mskcc.org?subject=Uploading public data">
+                            contact us
+                        </a>{' '}
+                        for details.
+                    </li>
                 </ul>
 
                 <h2>3. Commercial support</h2>
                 <ul>
                     <li>
-                        <a href="http://thehyve.nl" target="_blank">The Hyve</a> is an open source software company
-                        that provides commercial support for cBioPortal.
-                        They can help with deployment, data loading, development, consulting and training.
-                        Please <a href="http://thehyve.nl/contact/" target="_blank">contact The Hyve</a> for details.
+                        <a href="http://thehyve.nl" target="_blank">
+                            The Hyve
+                        </a>{' '}
+                        is an open source software company that provides
+                        commercial support for cBioPortal. They can help with
+                        deployment, data loading, development, consulting and
+                        training. Please{' '}
+                        <a href="http://thehyve.nl/contact/" target="_blank">
+                            contact The Hyve
+                        </a>{' '}
+                        for details.
                     </li>
                 </ul>
 
                 <hr />
 
-                <h2>The following tools are for visualization and analysis of custom datasets</h2>
+                <h2>
+                    The following tools are for visualization and analysis of
+                    custom datasets
+                </h2>
 
                 <div className="alert alert-info" role="alert">
-                    When using these tools in your publication, <b>please cite</b> <a href={getNCBIlink('/pubmed/23550210')}>Gao et al. <i>Sci. Signal.</i> 2013</a> &amp; <a href="http://cancerdiscovery.aacrjournals.org/content/2/5/401.abstract">Cerami et al. <i>Cancer Discov.</i> 2012</a>.
+                    When using these tools in your publication,{' '}
+                    <b>please cite</b>{' '}
+                    <a href={getNCBIlink('/pubmed/23550210')}>
+                        Gao et al. <i>Sci. Signal.</i> 2013
+                    </a>{' '}
+                    &amp;{' '}
+                    <a href="http://cancerdiscovery.aacrjournals.org/content/2/5/401.abstract">
+                        Cerami et al. <i>Cancer Discov.</i> 2012
+                    </a>
+                    .
                 </div>
 
-                <div style={{display: "flex"}} className={styles.toolArray}>
-                    <div style={{marginRight: 60}}>
-                        <h2><a href="oncoprinter">OncoPrinter</a></h2>
-                        <p>Generates oncoprints from your own data. <a href="/oncoprinter.jsp">Try it!</a></p>
+                <div style={{ display: 'flex' }} className={styles.toolArray}>
+                    <div style={{ marginRight: 60 }}>
+                        <h2>
+                            <a href="oncoprinter">OncoPrinter</a>
+                        </h2>
+                        <p>
+                            Generates oncoprints from your own data.{' '}
+                            <a href="/oncoprinter.jsp">Try it!</a>
+                        </p>
                         <a href="oncoprinter">
-                            <img className="tile-image top-image" alt="Oncoprint" src={require("./images/oncoprint_example_small.png")} />
+                            <img
+                                className="tile-image top-image"
+                                alt="Oncoprint"
+                                src={require('./images/oncoprint_example_small.png')}
+                            />
                         </a>
                     </div>
 
                     <div>
-                        <h2><a href="mutation_mapper">MutationMapper</a></h2>
-                        <p>Maps mutations on a linear protein and its domains (lollipop plots). <a href="mutation_mapper">Try it!</a></p>
+                        <h2>
+                            <a href="mutation_mapper">MutationMapper</a>
+                        </h2>
+                        <p>
+                            Maps mutations on a linear protein and its domains
+                            (lollipop plots).{' '}
+                            <a href="mutation_mapper">Try it!</a>
+                        </p>
                         <a href="mutation_mapper">
-                            <img alt="MutationMapper" style={{height: 147}} src={require("./images/lollipop_example.png")} />
+                            <img
+                                alt="MutationMapper"
+                                style={{ height: 147 }}
+                                src={require('./images/lollipop_example.png')}
+                            />
                         </a>
                     </div>
                 </div>
@@ -79,7 +136,3 @@ export default class Visualize extends React.Component<{}, {}> {
         );
     }
 }
-
-
-
-
diff --git a/src/pages/staticPages/visualize/styles.scss b/src/pages/staticPages/visualize/styles.scss
index 3f026401078..6d3b132051a 100644
--- a/src/pages/staticPages/visualize/styles.scss
+++ b/src/pages/staticPages/visualize/styles.scss
@@ -1,5 +1,5 @@
 .commandDocumentation {
-  table {
-    margin-bottom:30px !important;
-  }
-}
\ No newline at end of file
+    table {
+        margin-bottom: 30px !important;
+    }
+}
diff --git a/src/pages/staticPages/visualize/visualize.module.scss b/src/pages/staticPages/visualize/visualize.module.scss
index ef71b2cb246..51c54ed3edc 100644
--- a/src/pages/staticPages/visualize/visualize.module.scss
+++ b/src/pages/staticPages/visualize/visualize.module.scss
@@ -1,6 +1,6 @@
 .toolArray {
-  > div {
-    width:275px;
-    padding-right:40px;
-  }
-}
\ No newline at end of file
+    > div {
+        width: 275px;
+        padding-right: 40px;
+    }
+}
diff --git a/src/pages/staticPages/webAPI/WebAPIPage.tsx b/src/pages/staticPages/webAPI/WebAPIPage.tsx
index 2a8c1e59f68..774b1a46c88 100644
--- a/src/pages/staticPages/webAPI/WebAPIPage.tsx
+++ b/src/pages/staticPages/webAPI/WebAPIPage.tsx
@@ -1,22 +1,27 @@
 import * as React from 'react';
-import {observer} from 'mobx-react';
-import {observable} from "mobx";
-import {PageLayout} from "../../../shared/components/PageLayout/PageLayout";
-import internalClient from "shared/api/cbioportalInternalClientInstance";
+import { observer } from 'mobx-react';
+import { observable } from 'mobx';
+import { PageLayout } from '../../../shared/components/PageLayout/PageLayout';
+import internalClient from 'shared/api/cbioportalInternalClientInstance';
 import './styles.scss';
-import Helmet from "react-helmet";
+import Helmet from 'react-helmet';
 import { Link } from 'react-router';
-import AppConfig from "appConfig";
-import {isNullOrUndefined} from "util";
+import AppConfig from 'appConfig';
+import { isNullOrUndefined } from 'util';
 import fileDownload from 'react-file-download';
-import {getBrowserWindow} from "cbioportal-frontend-commons";
+import { getBrowserWindow } from 'cbioportal-frontend-commons';
 
 export class UserDataAccessToken {
-    @observable token : string;
+    @observable token: string;
     @observable creationDate: string;
     @observable expirationDate: string;
     @observable username: string;
-    constructor(token: string, creationDate: string, expirationDate: string, username: string) {
+    constructor(
+        token: string,
+        creationDate: string,
+        expirationDate: string,
+        username: string
+    ) {
         this.token = token;
         this.creationDate = creationDate;
         this.expirationDate = expirationDate;
@@ -24,29 +29,40 @@ export class UserDataAccessToken {
     }
 }
 
-function buildDataAccessTokenFileContents(dat:UserDataAccessToken | undefined) {
+function buildDataAccessTokenFileContents(
+    dat: UserDataAccessToken | undefined
+) {
     if (!isNullOrUndefined(dat)) {
         var token = dat!.token;
         var creation_date = new Date(dat!.creationDate).toISOString();
         var expiration_date = new Date(dat!.expirationDate).toISOString();
         return `token: ${token}\ncreation_date: ${creation_date}\nexpiration_date: ${expiration_date}\n`;
     } else {
-        alert("Cannot create Data Access Token file for user with non-existent tokens.");
+        alert(
+            'Cannot create Data Access Token file for user with non-existent tokens.'
+        );
         return null;
     }
 }
 
 @observer
 export default class WebAPIPage extends React.Component<{}, {}> {
-    private get appStore(){
+    private get appStore() {
         return getBrowserWindow().globalStores.appStore;
     }
 
     async generateNewDataAccessToken() {
         if (this.appStore.isLoggedIn) {
-            let _token = await internalClient.createDataAccessTokenUsingPOST(
-                    {'allowRevocationOfOtherTokens':AppConfig.serverConfig.dat_uuid_revoke_other_tokens});
-            const dat = new UserDataAccessToken(_token.token, _token.creation, _token.expiration, _token.username);
+            let _token = await internalClient.createDataAccessTokenUsingPOST({
+                allowRevocationOfOtherTokens:
+                    AppConfig.serverConfig.dat_uuid_revoke_other_tokens,
+            });
+            const dat = new UserDataAccessToken(
+                _token.token,
+                _token.creation,
+                _token.expiration,
+                _token.username
+            );
             return dat;
         } else {
             return undefined;
@@ -57,644 +73,1134 @@ export default class WebAPIPage extends React.Component<{}, {}> {
         const dat = this.generateNewDataAccessToken();
         if (!isNullOrUndefined(dat)) {
             const fileContents = buildDataAccessTokenFileContents(await dat);
-            fileDownload(fileContents, "cbioportal_data_access_token.txt");
+            fileDownload(fileContents, 'cbioportal_data_access_token.txt');
         }
     }
 
     renderDataAccessTokensDiv() {
-        if ((AppConfig.serverConfig.authenticationMethod === "social_auth" || (AppConfig.serverConfig.dat_method !== "uuid" && AppConfig.serverConfig.dat_method !== "jwt"))) {
+        if (
+            AppConfig.serverConfig.authenticationMethod === 'social_auth' ||
+            (AppConfig.serverConfig.dat_method !== 'uuid' &&
+                AppConfig.serverConfig.dat_method !== 'jwt')
+        ) {
             return <div></div>;
-        }
-        else {
+        } else {
             return (
                 <div id="using-data-access-tokens">
-                    <p>To directly access the cBioPortal web services on installations which require login,
-                        clients will need to obtain a data access token and present this token with each web service request.</p>
-                    <button className="btn btn-primary btn-sm" onClick={() => this.downloadDataAccessTokenFile()}>Download Token</button>
-                    <p>There are instructions for making requests to the Web API using Data Access Tokens&nbsp;
-                        <a href="https://docs.cbioportal.org/2.2-authorization-and-authentication/authenticating-users-via-tokens#using-data-access-tokens">here</a></p>
+                    <p>
+                        To directly access the cBioPortal web services on
+                        installations which require login, clients will need to
+                        obtain a data access token and present this token with
+                        each web service request.
+                    </p>
+                    <button
+                        className="btn btn-primary btn-sm"
+                        onClick={() => this.downloadDataAccessTokenFile()}
+                    >
+                        Download Token
+                    </button>
+                    <p>
+                        There are instructions for making requests to the Web
+                        API using Data Access Tokens&nbsp;
+                        <a href="https://docs.cbioportal.org/2.2-authorization-and-authentication/authenticating-users-via-tokens#using-data-access-tokens">
+                            here
+                        </a>
+                    </p>
                 </div>
             );
         }
     }
 
     public render() {
+        return (
+            <PageLayout className={'whiteBackground staticPage'}>
+                <Helmet>
+                    <title>{'cBioPortal for Cancer Genomics::Helmet'}</title>
+                </Helmet>
 
-        return <PageLayout className={'whiteBackground staticPage'}>
-            <Helmet>
-                <title>{'cBioPortal for Cancer Genomics::Helmet'}</title>
-            </Helmet>
-
-            <h1>Web API</h1>
-
-            <h2 id="introduction">Introduction</h2>
-            <p>The Cancer Genomic Data Server (CGDS) web service interface provides direct programmatic access to all
-                genomic data stored within the server. This enables you to easily access data from your favorite
-                programming language, such as Python, Java, Perl, R or MatLab. The CGDS web service is REST-based,
-                meaning that client applications create a query consisting of parameters appended to a URL, and receive
-                back either either text or an XML response. For CGDS, all responses are currently tab-delimited text.
-                Clients of the CGDS web service can issue the following types of queries:</p>
-            <ul>
-                <li>What cancer studies are stored on the server?</li>
-                <li>What genetic profile types are available for cancer study X? For example, does the server store
-                    mutation and copy number data for the TCGA Glioblastoma data?
-                </li>
-                <li>What case sets are available for cancer study X? For example, what case sets are available for TCGA
-                    Glioblastoma?
-                </li>
-            </ul>
-            <p>Additionally, clients can easily retrieve "slices" of genomic data. For example, a client can retrieve
-                all mutation data from PTEN and EGFR in the TCGA Glioblastoma data.</p>
-            <p>Please note that the example queries below are accurate, but they are not guaranteed to return data, as
-                our database is constantly being updated.</p>
-            {this.renderDataAccessTokensDiv()}
-            <h2 id="the-cgds-r-package">The CGDS R Package</h2>
-            <p>If you are interested in accessing CGDS via R, please check out our <Link to={"/rmatlab"}> CGDS-R
-                library</Link>.</p>
-            <h2 id="basic-query-syntax">Basic Query Syntax</h2>
-            <p>All web queries are available at: <a href="webservice.do">webservice.do</a>. All calls to the Web
-                interface are constructed by appending URL parameters. Within each call, you must specify:</p>
-            <ul>
-                <li><strong>cmd</strong> = the command that you wish to execute. The command must be equal to one of the
-                    following: getTypesOfCancer, getNetwork, getCancerStudies, getGeneticProfiles, getProfileData,
-                    getCaseLists, getClinicalData, or getMutationData.
-                </li>
-                <li>optional additional parameters, depending of the command (see below).</li>
-            </ul>
-            <p>For example, the following query will request all case lists for the TCGA GBM data:</p>
-            <p><a
-                href="webservice.do?cmd=getCaseLists&amp;cancer_study_id=gbm_tcga">webservice.do?cmd=getCaseLists&amp;cancer_study_id=gbm_tcga</a>
-            </p>
-            <h2 id="response-header-and-error-messages">Response Header and Error Messages</h2>
-            <p>The first line of each response begins with a hash mark (#), and will contain data regarding the server
-                status. For example:</p>
-            <pre><code>
-# CGDS Kernel:  Data served up fresh at:  Wed Oct 27 13:02:30 EDT 2010
-</code></pre>
-            <p>If any errors have occurred in processing your query, this will appear directly after the status message.
-                Error messages begin with the "Error:" tag. Warning messages begin with the "# Warning:" tag.
-                Unrecoverable errors are reported as errors. For example:</p>
-            <pre><code>
-# CGDS Kernel:  Data served up fresh at:  Wed Oct 27 13:02:30 EDT 2010<br />
-Error:  No case lists available for cancer_study_id:  gbs.
-</code></pre>
-            <p>Recoverable errors, such as invalid gene symbols are reported as warnings. Multiple warnings may also be
-                returned. For example:</p>
-            <pre><code>
-# CGDS Kernel:  Data served up fresh at:  Wed Oct 27 13:06:34 EDT 2010<br />
-# Warning:  Unknown gene:  EGFR11<br />
-# Warning:  Unknown gene:  EGFR12<br />
-</code></pre>
-            <h2 id="deprecated-api">Deprecated API</h2>
-            <p>As of August, 2011:</p>
-            <ul>
-                <li>
-                    <p>In previous versions of the API, the <strong>getCancerStudies</strong> command was referred to
-                        as <strong>getCancerTypes</strong>. For backward
-                        compatibility, <strong>getCancerTypes</strong> still works, but is now considered deprecated.
-                    </p>
-                </li>
-                <li>
-                    <p>In previous versions of the API, the <strong>cancer_study_id</strong> parameter was referred to
-                        as <strong>cancer_type_id</strong>. For backward
-                        compatibility,, <strong>cancer_type_id</strong> still works, but is now considered deprecated.
-                    </p>
-                </li>
-            </ul>
-
-            <h2 id="commands">Commands</h2>
-            <div className="commandDocumentation">
-                <table className="table table-bordered">
-                    <tbody>
-                    <tr>
-                        <th colSpan={2}>Get All Types of Cancer</th>
-                    </tr>
-                    <tr>
-                        <td>Description</td>
-                        <td>Retrieves a list of all the clinical types of cancer stored on the server.</td>
-                    </tr>
-                    <tr>
-                        <td>Query Format</td>
-                        <td><strong>cmd=getTypesOfCancer</strong> (required)</td>
-                    </tr>
-                    <tr>
-                        <td>Response Format</td>
-                        <td><p>A tab-delimited file with two columns:</p>
-                            <ul>
-                                <li><strong>type_of_cancer_id:</strong> a unique text identifier used to identify the
-                                    type of cancer. For example, "gbm" identifies Glioblastoma multiforme.
-                                </li>
-                                <li><strong>name:</strong> short name of the type of cancer.</li>
-                            </ul>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>Example</td>
-                        <td><a href="webservice.do?cmd=getTypesOfCancer">Get all Types of Cancer.</a></td>
-                    </tr>
-                    </tbody>
-                </table>
-
-                <table className="table table-bordered">
-                    <tbody>
-                    <tr>
-                        <th colSpan={2}>Get All Cancer Studies</th>
-                    </tr>
+                <h1>Web API</h1>
 
-                    <tr>
-                        <td>Description</td>
-                        <td>Retrieves meta-data regarding cancer studies stored on the server.</td>
-                    </tr>
-                    <tr>
-                        <td>Query Format</td>
-                        <td><strong>cmd=getCancerStudies</strong> (required)</td>
-                    </tr>
-                    <tr>
-                        <td>Response Format</td>
-                        <td><p>A tab-delimited file with three columns:</p>
-                            <ul>
-                                <li><strong>cancer_study_id:</strong> a unique ID that should be used to identify the
-                                    cancer study in subsequent interface calls.
-                                </li>
-                                <li><strong>name:</strong> short name of the cancer study.</li>
-                                <li><strong>description:</strong> short description of the cancer study.</li>
-                            </ul>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>Example</td>
-                        <td><a href="webservice.do?cmd=getCancerStudies">Get all Cancer Studies.</a></td>
-                    </tr>
-                    </tbody>
-                </table>
-
-                <table className="table table-bordered">
-
-                    <tbody>
-                    <tr>
-                        <th colSpan={2}>Get All Genetic Profiles for a Specific Cancer Study</th>
-                    </tr>
+                <h2 id="introduction">Introduction</h2>
+                <p>
+                    The Cancer Genomic Data Server (CGDS) web service interface
+                    provides direct programmatic access to all genomic data
+                    stored within the server. This enables you to easily access
+                    data from your favorite programming language, such as
+                    Python, Java, Perl, R or MatLab. The CGDS web service is
+                    REST-based, meaning that client applications create a query
+                    consisting of parameters appended to a URL, and receive back
+                    either either text or an XML response. For CGDS, all
+                    responses are currently tab-delimited text. Clients of the
+                    CGDS web service can issue the following types of queries:
+                </p>
+                <ul>
+                    <li>What cancer studies are stored on the server?</li>
+                    <li>
+                        What genetic profile types are available for cancer
+                        study X? For example, does the server store mutation and
+                        copy number data for the TCGA Glioblastoma data?
+                    </li>
+                    <li>
+                        What case sets are available for cancer study X? For
+                        example, what case sets are available for TCGA
+                        Glioblastoma?
+                    </li>
+                </ul>
+                <p>
+                    Additionally, clients can easily retrieve "slices" of
+                    genomic data. For example, a client can retrieve all
+                    mutation data from PTEN and EGFR in the TCGA Glioblastoma
+                    data.
+                </p>
+                <p>
+                    Please note that the example queries below are accurate, but
+                    they are not guaranteed to return data, as our database is
+                    constantly being updated.
+                </p>
+                {this.renderDataAccessTokensDiv()}
+                <h2 id="the-cgds-r-package">The CGDS R Package</h2>
+                <p>
+                    If you are interested in accessing CGDS via R, please check
+                    out our <Link to={'/rmatlab'}> CGDS-R library</Link>.
+                </p>
+                <h2 id="basic-query-syntax">Basic Query Syntax</h2>
+                <p>
+                    All web queries are available at:{' '}
+                    <a href="webservice.do">webservice.do</a>. All calls to the
+                    Web interface are constructed by appending URL parameters.
+                    Within each call, you must specify:
+                </p>
+                <ul>
+                    <li>
+                        <strong>cmd</strong> = the command that you wish to
+                        execute. The command must be equal to one of the
+                        following: getTypesOfCancer, getNetwork,
+                        getCancerStudies, getGeneticProfiles, getProfileData,
+                        getCaseLists, getClinicalData, or getMutationData.
+                    </li>
+                    <li>
+                        optional additional parameters, depending of the command
+                        (see below).
+                    </li>
+                </ul>
+                <p>
+                    For example, the following query will request all case lists
+                    for the TCGA GBM data:
+                </p>
+                <p>
+                    <a href="webservice.do?cmd=getCaseLists&amp;cancer_study_id=gbm_tcga">
+                        webservice.do?cmd=getCaseLists&amp;cancer_study_id=gbm_tcga
+                    </a>
+                </p>
+                <h2 id="response-header-and-error-messages">
+                    Response Header and Error Messages
+                </h2>
+                <p>
+                    The first line of each response begins with a hash mark (#),
+                    and will contain data regarding the server status. For
+                    example:
+                </p>
+                <pre>
+                    <code>
+                        # CGDS Kernel: Data served up fresh at: Wed Oct 27
+                        13:02:30 EDT 2010
+                    </code>
+                </pre>
+                <p>
+                    If any errors have occurred in processing your query, this
+                    will appear directly after the status message. Error
+                    messages begin with the "Error:" tag. Warning messages begin
+                    with the "# Warning:" tag. Unrecoverable errors are reported
+                    as errors. For example:
+                </p>
+                <pre>
+                    <code>
+                        # CGDS Kernel: Data served up fresh at: Wed Oct 27
+                        13:02:30 EDT 2010
+                        <br />
+                        Error: No case lists available for cancer_study_id: gbs.
+                    </code>
+                </pre>
+                <p>
+                    Recoverable errors, such as invalid gene symbols are
+                    reported as warnings. Multiple warnings may also be
+                    returned. For example:
+                </p>
+                <pre>
+                    <code>
+                        # CGDS Kernel: Data served up fresh at: Wed Oct 27
+                        13:06:34 EDT 2010
+                        <br />
+                        # Warning: Unknown gene: EGFR11
+                        <br />
+                        # Warning: Unknown gene: EGFR12
+                        <br />
+                    </code>
+                </pre>
+                <h2 id="deprecated-api">Deprecated API</h2>
+                <p>As of August, 2011:</p>
+                <ul>
+                    <li>
+                        <p>
+                            In previous versions of the API, the{' '}
+                            <strong>getCancerStudies</strong> command was
+                            referred to as <strong>getCancerTypes</strong>. For
+                            backward compatibility,{' '}
+                            <strong>getCancerTypes</strong> still works, but is
+                            now considered deprecated.
+                        </p>
+                    </li>
+                    <li>
+                        <p>
+                            In previous versions of the API, the{' '}
+                            <strong>cancer_study_id</strong> parameter was
+                            referred to as <strong>cancer_type_id</strong>. For
+                            backward compatibility,,{' '}
+                            <strong>cancer_type_id</strong> still works, but is
+                            now considered deprecated.
+                        </p>
+                    </li>
+                </ul>
 
-                    <tr>
-                        <td>Description</td>
-                        <td>Retrieves meta-data regarding all genetic profiles, e.g. mutation or copy number profiles,
-                            stored about a specific cancer study.
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>Query Format</td>
-                        <td>
-                            <ul>
-                                <li><strong>cmd</strong>=getGeneticProfiles (required)</li>
-                                <li><strong>cancer_study_id</strong>=[cancer study ID] (required)</li>
-                            </ul>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>Response Format</td>
-                        <td>
-                            <p>A tab-delimited file with six columns:</p>
-                            <ul>
-                                <li><strong>genetic_profile_id</strong>: a unique ID used to identify the genetic
-                                    profile ID in subsequent interface calls. This is a human readable ID. For example,
-                                    "gbm_mutations" identifies the TCGA GBM mutation genetic profile.
-                                </li>
-                                <li><strong>genetic_profile_name</strong>: short profile name.</li>
-                                <li><strong>genetic_profile_description</strong>: short profile description.</li>
-                                <li><strong>cancer_study_id</strong>: cancer study ID tied to this genetic profile. Will
-                                    match the input cancer_study_id.
-                                </li>
-                                <li><strong>genetic_alteration_type</strong>: indicates the profile type. Will be one
-                                    of:
+                <h2 id="commands">Commands</h2>
+                <div className="commandDocumentation">
+                    <table className="table table-bordered">
+                        <tbody>
+                            <tr>
+                                <th colSpan={2}>Get All Types of Cancer</th>
+                            </tr>
+                            <tr>
+                                <td>Description</td>
+                                <td>
+                                    Retrieves a list of all the clinical types
+                                    of cancer stored on the server.
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>Query Format</td>
+                                <td>
+                                    <strong>cmd=getTypesOfCancer</strong>{' '}
+                                    (required)
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>Response Format</td>
+                                <td>
+                                    <p>
+                                        A tab-delimited file with two columns:
+                                    </p>
                                     <ul>
-                                        <li>MUTATION</li>
-                                        <li>MUTATION_EXTENDED</li>
-                                        <li>COPY_NUMBER_ALTERATION</li>
-                                        <li>MRNA_EXPRESSION</li>
-                                        <li>METHYLATION</li>
+                                        <li>
+                                            <strong>type_of_cancer_id:</strong>{' '}
+                                            a unique text identifier used to
+                                            identify the type of cancer. For
+                                            example, "gbm" identifies
+                                            Glioblastoma multiforme.
+                                        </li>
+                                        <li>
+                                            <strong>name:</strong> short name of
+                                            the type of cancer.
+                                        </li>
                                     </ul>
-                                </li>
-                                <li><strong>show_profile_in_analysis_tab</strong>: a boolean flag used for internal
-                                    purposes (you can safely ignore it).
-                                </li>
-                            </ul>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>Example</td>
-                        <td><a href="webservice.do?cmd=getGeneticProfiles&amp;cancer_study_id=gbm_tcga">Get all Genetic
-                            Profiles for Glioblastoma (TCGA).</a></td>
-                    </tr>
-                    </tbody>
-                </table>
-
-                <table className="table table-bordered">
-
-                    <tbody>
-                    <tr>
-                        <th colSpan={2}>Get All Case Lists for a Specific Cancer Study</th>
-                    </tr>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>Example</td>
+                                <td>
+                                    <a href="webservice.do?cmd=getTypesOfCancer">
+                                        Get all Types of Cancer.
+                                    </a>
+                                </td>
+                            </tr>
+                        </tbody>
+                    </table>
 
-                    <tr>
-                        <td>Description</td>
-                        <td>Retrieves meta-data regarding all case lists stored about a specific cancer study. For
-                            example, a within a particular study, only some cases may have sequence data, and another
-                            subset of cases may have been sequenced and treated with a specific therapeutic protocol.
-                            Multiple case lists may be associated with each cancer study, and this method enables you to
-                            retrieve meta-data regarding all of these case lists.
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>Query Format</td>
-                        <td>
-                            <ul>
-                                <li><strong>cmd</strong>=getCaseLists (required)</li>
-                                <li><strong>cancer_study_id</strong>=[cancer study ID] (required)</li>
-                            </ul>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>Response Format</td>
-                        <td><p>A tab-delimited file with five columns:</p>
-                            <ul>
-                                <li><strong>case_list_id</strong>: a unique ID used to identify the case list ID in
-                                    subsequent interface calls. This is a human readable ID. For example, "gbm_all"
-                                    identifies all cases profiles in the TCGA GBM study.
-                                </li>
-                                <li><strong>case_list_name</strong>: short name for the case list.</li>
-                                <li><strong>case_list_description</strong>: short description of the case list.</li>
-                                <li><strong>cancer_study_id</strong>: cancer study ID tied to this genetic profile. Will
-                                    match the input cancer_study_id.
-                                </li>
-                                <li><strong>case_ids</strong>: space delimited list of all case IDs that make up this
-                                    case list.
-                                </li>
-                            </ul>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>Example</td>
-                        <td><a href="webservice.do?cmd=getCaseLists&amp;cancer_study_id=gbm_tcga">Get all Case Lists for
-                            Glioblastoma (TCGA).</a></td>
-                    </tr>
-                    </tbody>
-                </table>
+                    <table className="table table-bordered">
+                        <tbody>
+                            <tr>
+                                <th colSpan={2}>Get All Cancer Studies</th>
+                            </tr>
 
-                <table className="table table-bordered">
-
-
-                    <tbody>
-                    <tr>
-                        <th colSpan={2}>Get Profile Data</th>
-                    </tr>
+                            <tr>
+                                <td>Description</td>
+                                <td>
+                                    Retrieves meta-data regarding cancer studies
+                                    stored on the server.
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>Query Format</td>
+                                <td>
+                                    <strong>cmd=getCancerStudies</strong>{' '}
+                                    (required)
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>Response Format</td>
+                                <td>
+                                    <p>
+                                        A tab-delimited file with three columns:
+                                    </p>
+                                    <ul>
+                                        <li>
+                                            <strong>cancer_study_id:</strong> a
+                                            unique ID that should be used to
+                                            identify the cancer study in
+                                            subsequent interface calls.
+                                        </li>
+                                        <li>
+                                            <strong>name:</strong> short name of
+                                            the cancer study.
+                                        </li>
+                                        <li>
+                                            <strong>description:</strong> short
+                                            description of the cancer study.
+                                        </li>
+                                    </ul>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>Example</td>
+                                <td>
+                                    <a href="webservice.do?cmd=getCancerStudies">
+                                        Get all Cancer Studies.
+                                    </a>
+                                </td>
+                            </tr>
+                        </tbody>
+                    </table>
 
+                    <table className="table table-bordered">
+                        <tbody>
+                            <tr>
+                                <th colSpan={2}>
+                                    Get All Genetic Profiles for a Specific
+                                    Cancer Study
+                                </th>
+                            </tr>
 
-                    <tr>
-                        <td>Description</td>
-                        <td>Retrieves genomic profile data for one or more genes.</td>
-                    </tr>
-                    <tr>
-                        <td>Query Format</td>
-                        <td>
-                            <ul>
-                                <li><strong>cmd</strong>=getProfileData (required)</li>
-                                <li><strong>case_set_id</strong>= [case set ID] (required)</li>
-                                <li><strong>genetic_profile_id</strong>= [one or more genetic profile IDs] (required).
-                                    Multiple genetic profile IDs must be separated by comma (,) characters, or URL
-                                    encoded spaces, e.g. +
-                                </li>
-                                <li><strong>gene_list</strong>= [one or more genes, specified as HUGO Gene Symbols or
-                                    Entrez Gene IDs] (required). Multiple genes must be separated by comma (,)
-                                    characters, or URL encoded spaces, e.g. +
-                                </li>
-                            </ul>
-                            <p>You can either:</p>
-                            <ul>
-                                <li><a
-                                    href="webservice.do?cmd=getProfileData&amp;case_set_id=gbm_tcga_all&amp;genetic_profile_id=gbm_tcga_mutations&amp;gene_list=BRCA1+BRCA2+TP53">Specify
-                                    multiple genes and a single genetic profile ID.</a></li>
-                                <li><a
-                                    href="webservice.do?cmd=getProfileData&amp;case_set_id=gbm_tcga_all&amp;genetic_profile_id=gbm_tcga_log2CNA,gbm_tcga_gistic&amp;gene_list=EGFR">Specify
-                                    a single gene and multiple genetic profile IDs.</a></li>
-                            </ul>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>Response Format</td>
-                        <td><p>When requesting one or multiple genes and a single genetic profile ID (see above), you
-                            will receive a tab-delimited matrix with the following columns:</p>
-                            <ol>
-                                <li><strong>GENE_ID</strong>: Entrez Gene ID</li>
-                                <li><strong>COMMON</strong>: HUGO Gene Symbol</li>
-                                <li><strong>Columns 3 - N</strong>: Data for each case</li>
-                            </ol>
-                            <h4 id="response-format-2">Response Format 2</h4>
-                            <p>When requesting a single gene and multiple genetic profile IDs (see above), you will
-                                receive a tab-delimited matrix with the following columns:</p>
-                            <ol>
-                                <li><strong>GENETIC_PROFILE_ID</strong>: The Genetic Profile ID.</li>
-                                <li><strong>ALTERATION_TYPE</strong>: The Genetic Alteration Type, e.g. MUTATION,
-                                    MUTATION_EXTENDED, COPY_NUMBER_ALTERATION, or MRNA_EXPRESSION.
-                                </li>
-                                <li><strong>GENE_ID</strong>: Entrez Gene ID.</li>
-                                <li><strong>COMMON</strong>: HUGO Gene Symbol.</li>
-                                <li><strong>Columns 5 - N</strong>: Data for each case.</li>
-                            </ol>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>Example</td>
-                        <td>See Query Format above.</td>
-                    </tr>
-                    </tbody>
-                </table>
+                            <tr>
+                                <td>Description</td>
+                                <td>
+                                    Retrieves meta-data regarding all genetic
+                                    profiles, e.g. mutation or copy number
+                                    profiles, stored about a specific cancer
+                                    study.
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>Query Format</td>
+                                <td>
+                                    <ul>
+                                        <li>
+                                            <strong>cmd</strong>
+                                            =getGeneticProfiles (required)
+                                        </li>
+                                        <li>
+                                            <strong>cancer_study_id</strong>
+                                            =[cancer study ID] (required)
+                                        </li>
+                                    </ul>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>Response Format</td>
+                                <td>
+                                    <p>
+                                        A tab-delimited file with six columns:
+                                    </p>
+                                    <ul>
+                                        <li>
+                                            <strong>genetic_profile_id</strong>:
+                                            a unique ID used to identify the
+                                            genetic profile ID in subsequent
+                                            interface calls. This is a human
+                                            readable ID. For example,
+                                            "gbm_mutations" identifies the TCGA
+                                            GBM mutation genetic profile.
+                                        </li>
+                                        <li>
+                                            <strong>
+                                                genetic_profile_name
+                                            </strong>
+                                            : short profile name.
+                                        </li>
+                                        <li>
+                                            <strong>
+                                                genetic_profile_description
+                                            </strong>
+                                            : short profile description.
+                                        </li>
+                                        <li>
+                                            <strong>cancer_study_id</strong>:
+                                            cancer study ID tied to this genetic
+                                            profile. Will match the input
+                                            cancer_study_id.
+                                        </li>
+                                        <li>
+                                            <strong>
+                                                genetic_alteration_type
+                                            </strong>
+                                            : indicates the profile type. Will
+                                            be one of:
+                                            <ul>
+                                                <li>MUTATION</li>
+                                                <li>MUTATION_EXTENDED</li>
+                                                <li>COPY_NUMBER_ALTERATION</li>
+                                                <li>MRNA_EXPRESSION</li>
+                                                <li>METHYLATION</li>
+                                            </ul>
+                                        </li>
+                                        <li>
+                                            <strong>
+                                                show_profile_in_analysis_tab
+                                            </strong>
+                                            : a boolean flag used for internal
+                                            purposes (you can safely ignore it).
+                                        </li>
+                                    </ul>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>Example</td>
+                                <td>
+                                    <a href="webservice.do?cmd=getGeneticProfiles&amp;cancer_study_id=gbm_tcga">
+                                        Get all Genetic Profiles for
+                                        Glioblastoma (TCGA).
+                                    </a>
+                                </td>
+                            </tr>
+                        </tbody>
+                    </table>
 
-                <table className="table table-bordered">
+                    <table className="table table-bordered">
+                        <tbody>
+                            <tr>
+                                <th colSpan={2}>
+                                    Get All Case Lists for a Specific Cancer
+                                    Study
+                                </th>
+                            </tr>
 
-                    <tbody>
-                    <tr>
-                        <th colSpan={2}>Get Extended Mutation Data</th>
-                    </tr>
+                            <tr>
+                                <td>Description</td>
+                                <td>
+                                    Retrieves meta-data regarding all case lists
+                                    stored about a specific cancer study. For
+                                    example, a within a particular study, only
+                                    some cases may have sequence data, and
+                                    another subset of cases may have been
+                                    sequenced and treated with a specific
+                                    therapeutic protocol. Multiple case lists
+                                    may be associated with each cancer study,
+                                    and this method enables you to retrieve
+                                    meta-data regarding all of these case lists.
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>Query Format</td>
+                                <td>
+                                    <ul>
+                                        <li>
+                                            <strong>cmd</strong>=getCaseLists
+                                            (required)
+                                        </li>
+                                        <li>
+                                            <strong>cancer_study_id</strong>
+                                            =[cancer study ID] (required)
+                                        </li>
+                                    </ul>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>Response Format</td>
+                                <td>
+                                    <p>
+                                        A tab-delimited file with five columns:
+                                    </p>
+                                    <ul>
+                                        <li>
+                                            <strong>case_list_id</strong>: a
+                                            unique ID used to identify the case
+                                            list ID in subsequent interface
+                                            calls. This is a human readable ID.
+                                            For example, "gbm_all" identifies
+                                            all cases profiles in the TCGA GBM
+                                            study.
+                                        </li>
+                                        <li>
+                                            <strong>case_list_name</strong>:
+                                            short name for the case list.
+                                        </li>
+                                        <li>
+                                            <strong>
+                                                case_list_description
+                                            </strong>
+                                            : short description of the case
+                                            list.
+                                        </li>
+                                        <li>
+                                            <strong>cancer_study_id</strong>:
+                                            cancer study ID tied to this genetic
+                                            profile. Will match the input
+                                            cancer_study_id.
+                                        </li>
+                                        <li>
+                                            <strong>case_ids</strong>: space
+                                            delimited list of all case IDs that
+                                            make up this case list.
+                                        </li>
+                                    </ul>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>Example</td>
+                                <td>
+                                    <a href="webservice.do?cmd=getCaseLists&amp;cancer_study_id=gbm_tcga">
+                                        Get all Case Lists for Glioblastoma
+                                        (TCGA).
+                                    </a>
+                                </td>
+                            </tr>
+                        </tbody>
+                    </table>
 
+                    <table className="table table-bordered">
+                        <tbody>
+                            <tr>
+                                <th colSpan={2}>Get Profile Data</th>
+                            </tr>
 
-                    <tr>
-                        <td>Description</td>
-                        <td>For data of type EXTENDED_MUTATION, you can request the full set of annotated extended
-                            mutation data.
-                            This enables you to, for example, determine which sequencing center sequenced the mutation,
-                            the
-                            amino acid change that results from the mutation, or gather links to predicted functional
-                            consequences of the
-                            mutation.
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>Query Format</td>
-                        <td>
-                            <ul>
-                                <li><strong>cmd</strong>=getMutationData (required)</li>
-                                <li><strong>genetic_profile_id</strong>= [one or more mutation profile IDs] (required).
-                                    Multiple genetic profile IDs must be separated by comma (,) characters, or URL
-                                    encoded spaces, e.g. +
-                                </li>
-                                <li><strong>case_set_id</strong>= [case set ID] (optional). If not provided, all cases
-                                    that have data in the specified mutation profiles will be queried.
-                                </li>
-                                <li><strong>gene_list</strong>= [one or more genes, specified as HUGO Gene Symbols or
-                                    Entrez Gene IDs] (required). Multiple genes must be separated by comma (,)
-                                    characters, or URL encoded spaces, e.g. +
-                                </li>
-                            </ul>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>Response Format</td>
-                        <td><p>A tab-delimited file with the following columns:</p>
-                            <ul>
-                                <li><strong>entrez_gene_id</strong>: Entrez Gene ID.</li>
-                                <li><strong>gene_symbol</strong>: HUGO Gene Symbol.</li>
-                                <li><strong>case_id</strong>: Case ID.</li>
-                                <li><strong>sequencing_center</strong>: Sequencer Center responsible for identifying
-                                    this mutation. For example: broad.mit.edu.
-                                </li>
-                                <li><strong>mutation_status</strong>: somatic or germline mutation status. all mutations
-                                    returned will be of type somatic.
-                                </li>
-                                <li><strong>mutation_type</strong>: mutation type, such as nonsense, missense, or
-                                    frameshift_ins.
-                                </li>
-                                <li><strong>validation_status</strong>: validation status. Usually valid, invalid, or
-                                    unknown.
-                                </li>
-                                <li><strong>amino_acid_change</strong>: amino acid change resulting from the mutation.
-                                </li>
-                                <li><strong>functional_impact_score</strong>: predicted functional impact score, as
-                                    predicted by: <a href="http://mutationassessor.org/">Mutation Assessor</a>.
-                                </li>
-                                <li><strong>xvar_link</strong>: Link to the Mutation Assessor web site.</li>
-                                <li><strong>xvar_link_pdb</strong>: Link to the Protein Data Bank (PDB) View within
-                                    Mutation Assessor web site.
-                                </li>
-                                <li><strong>xvar_link_msa</strong>: Link the Multiple Sequence Alignment (MSA) view
-                                    within the Mutation Assessor web site.
-                                </li>
-                                <li><strong>chr</strong>: chromosome where mutation occurs.</li>
-                                <li><strong>start_position</strong>: start position of mutation.</li>
-                                <li><strong>end_position</strong>: end position of mutation.</li>
-                                <li><strong>genetic_profile_id</strong>: mutation profile id.</li>
-                            </ul>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>Example</td>
-                        <td>
-                            <ul>
-                                <li><a
-                                    href="webservice.do?cmd=getMutationData&amp;case_set_id=gbm_tcga_all&amp;genetic_profile_id=gbm_tcga_mutations&amp;gene_list=EGFR+PTEN">Get
-                                    Extended Mutation Data for EGFR and PTEN in TCGA GBM.</a></li>
-                                <li><a
-                                    href="webservice.do?cmd=getMutationData&amp;genetic_profile_id=ov_tcga_mutations+ucec_tcga_mutations&amp;gene_list=BRCA1">Get
-                                    Extended Mutation Data for BRCA1 in TCGA OV and UCEC.</a></li>
-                            </ul>
-                        </td>
-                    </tr>
-                    </tbody>
-                </table>
+                            <tr>
+                                <td>Description</td>
+                                <td>
+                                    Retrieves genomic profile data for one or
+                                    more genes.
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>Query Format</td>
+                                <td>
+                                    <ul>
+                                        <li>
+                                            <strong>cmd</strong>=getProfileData
+                                            (required)
+                                        </li>
+                                        <li>
+                                            <strong>case_set_id</strong>= [case
+                                            set ID] (required)
+                                        </li>
+                                        <li>
+                                            <strong>genetic_profile_id</strong>=
+                                            [one or more genetic profile IDs]
+                                            (required). Multiple genetic profile
+                                            IDs must be separated by comma (,)
+                                            characters, or URL encoded spaces,
+                                            e.g. +
+                                        </li>
+                                        <li>
+                                            <strong>gene_list</strong>= [one or
+                                            more genes, specified as HUGO Gene
+                                            Symbols or Entrez Gene IDs]
+                                            (required). Multiple genes must be
+                                            separated by comma (,) characters,
+                                            or URL encoded spaces, e.g. +
+                                        </li>
+                                    </ul>
+                                    <p>You can either:</p>
+                                    <ul>
+                                        <li>
+                                            <a href="webservice.do?cmd=getProfileData&amp;case_set_id=gbm_tcga_all&amp;genetic_profile_id=gbm_tcga_mutations&amp;gene_list=BRCA1+BRCA2+TP53">
+                                                Specify multiple genes and a
+                                                single genetic profile ID.
+                                            </a>
+                                        </li>
+                                        <li>
+                                            <a href="webservice.do?cmd=getProfileData&amp;case_set_id=gbm_tcga_all&amp;genetic_profile_id=gbm_tcga_log2CNA,gbm_tcga_gistic&amp;gene_list=EGFR">
+                                                Specify a single gene and
+                                                multiple genetic profile IDs.
+                                            </a>
+                                        </li>
+                                    </ul>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>Response Format</td>
+                                <td>
+                                    <p>
+                                        When requesting one or multiple genes
+                                        and a single genetic profile ID (see
+                                        above), you will receive a tab-delimited
+                                        matrix with the following columns:
+                                    </p>
+                                    <ol>
+                                        <li>
+                                            <strong>GENE_ID</strong>: Entrez
+                                            Gene ID
+                                        </li>
+                                        <li>
+                                            <strong>COMMON</strong>: HUGO Gene
+                                            Symbol
+                                        </li>
+                                        <li>
+                                            <strong>Columns 3 - N</strong>: Data
+                                            for each case
+                                        </li>
+                                    </ol>
+                                    <h4 id="response-format-2">
+                                        Response Format 2
+                                    </h4>
+                                    <p>
+                                        When requesting a single gene and
+                                        multiple genetic profile IDs (see
+                                        above), you will receive a tab-delimited
+                                        matrix with the following columns:
+                                    </p>
+                                    <ol>
+                                        <li>
+                                            <strong>GENETIC_PROFILE_ID</strong>:
+                                            The Genetic Profile ID.
+                                        </li>
+                                        <li>
+                                            <strong>ALTERATION_TYPE</strong>:
+                                            The Genetic Alteration Type, e.g.
+                                            MUTATION, MUTATION_EXTENDED,
+                                            COPY_NUMBER_ALTERATION, or
+                                            MRNA_EXPRESSION.
+                                        </li>
+                                        <li>
+                                            <strong>GENE_ID</strong>: Entrez
+                                            Gene ID.
+                                        </li>
+                                        <li>
+                                            <strong>COMMON</strong>: HUGO Gene
+                                            Symbol.
+                                        </li>
+                                        <li>
+                                            <strong>Columns 5 - N</strong>: Data
+                                            for each case.
+                                        </li>
+                                    </ol>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>Example</td>
+                                <td>See Query Format above.</td>
+                            </tr>
+                        </tbody>
+                    </table>
 
-                <table className="table table-bordered">
-                    <tbody>
-                    <tr>
-                        <th colSpan={2}>Get Clinical Data</th>
-                    </tr>
+                    <table className="table table-bordered">
+                        <tbody>
+                            <tr>
+                                <th colSpan={2}>Get Extended Mutation Data</th>
+                            </tr>
 
-                    <tr>
-                        <td>Description</td>
-                        <td>Retrieves overall survival, disease free survival and age at diagnosis for specified cases.
-                            Due to patient privacy restrictions, no other clinical data is available.
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>Query Format</td>
-                        <td>
-                            <ul>
-                                <li><strong>cmd</strong>=getClinicalData (required)</li>
-                                <li><strong>case_set_id</strong>= [case set ID] (required)</li>
-                            </ul>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>Response Format</td>
-                        <td><p>A tab-delimited file with the following columns:</p>
-                            <ul>
-                                <li><strong>case_id</strong>: Unique Case Identifier.</li>
-                                <li><strong>overall_survival_months</strong>: Overall survival, in months.</li>
-                                <li><strong>overall_survival_status</strong>: Overall survival status, usually indicated
-                                    as "LIVING" or "DECEASED".
-                                </li>
-                                <li><strong>disease_free_survival_months</strong>: Disease free survival, in months.
-                                </li>
-                                <li><strong>disease_free_survival_status</strong>: Disease free survival status, usually
-                                    indicated as "DiseaseFree" or "Recurred/Progressed".
-                                </li>
-                                <li><strong>age_at_diagnosis</strong>: Age at diagnosis.</li>
-                            </ul>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>Example</td>
-                        <td><a href="webservice.do?cmd=getClinicalData&amp;case_set_id=ov_tcga_all">Get Clinical Data
-                            for All TCGA Ovarian Cases.</a></td>
-                    </tr>
-                    </tbody>
-                </table>
+                            <tr>
+                                <td>Description</td>
+                                <td>
+                                    For data of type EXTENDED_MUTATION, you can
+                                    request the full set of annotated extended
+                                    mutation data. This enables you to, for
+                                    example, determine which sequencing center
+                                    sequenced the mutation, the amino acid
+                                    change that results from the mutation, or
+                                    gather links to predicted functional
+                                    consequences of the mutation.
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>Query Format</td>
+                                <td>
+                                    <ul>
+                                        <li>
+                                            <strong>cmd</strong>=getMutationData
+                                            (required)
+                                        </li>
+                                        <li>
+                                            <strong>genetic_profile_id</strong>=
+                                            [one or more mutation profile IDs]
+                                            (required). Multiple genetic profile
+                                            IDs must be separated by comma (,)
+                                            characters, or URL encoded spaces,
+                                            e.g. +
+                                        </li>
+                                        <li>
+                                            <strong>case_set_id</strong>= [case
+                                            set ID] (optional). If not provided,
+                                            all cases that have data in the
+                                            specified mutation profiles will be
+                                            queried.
+                                        </li>
+                                        <li>
+                                            <strong>gene_list</strong>= [one or
+                                            more genes, specified as HUGO Gene
+                                            Symbols or Entrez Gene IDs]
+                                            (required). Multiple genes must be
+                                            separated by comma (,) characters,
+                                            or URL encoded spaces, e.g. +
+                                        </li>
+                                    </ul>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>Response Format</td>
+                                <td>
+                                    <p>
+                                        A tab-delimited file with the following
+                                        columns:
+                                    </p>
+                                    <ul>
+                                        <li>
+                                            <strong>entrez_gene_id</strong>:
+                                            Entrez Gene ID.
+                                        </li>
+                                        <li>
+                                            <strong>gene_symbol</strong>: HUGO
+                                            Gene Symbol.
+                                        </li>
+                                        <li>
+                                            <strong>case_id</strong>: Case ID.
+                                        </li>
+                                        <li>
+                                            <strong>sequencing_center</strong>:
+                                            Sequencer Center responsible for
+                                            identifying this mutation. For
+                                            example: broad.mit.edu.
+                                        </li>
+                                        <li>
+                                            <strong>mutation_status</strong>:
+                                            somatic or germline mutation status.
+                                            all mutations returned will be of
+                                            type somatic.
+                                        </li>
+                                        <li>
+                                            <strong>mutation_type</strong>:
+                                            mutation type, such as nonsense,
+                                            missense, or frameshift_ins.
+                                        </li>
+                                        <li>
+                                            <strong>validation_status</strong>:
+                                            validation status. Usually valid,
+                                            invalid, or unknown.
+                                        </li>
+                                        <li>
+                                            <strong>amino_acid_change</strong>:
+                                            amino acid change resulting from the
+                                            mutation.
+                                        </li>
+                                        <li>
+                                            <strong>
+                                                functional_impact_score
+                                            </strong>
+                                            : predicted functional impact score,
+                                            as predicted by:{' '}
+                                            <a href="http://mutationassessor.org/">
+                                                Mutation Assessor
+                                            </a>
+                                            .
+                                        </li>
+                                        <li>
+                                            <strong>xvar_link</strong>: Link to
+                                            the Mutation Assessor web site.
+                                        </li>
+                                        <li>
+                                            <strong>xvar_link_pdb</strong>: Link
+                                            to the Protein Data Bank (PDB) View
+                                            within Mutation Assessor web site.
+                                        </li>
+                                        <li>
+                                            <strong>xvar_link_msa</strong>: Link
+                                            the Multiple Sequence Alignment
+                                            (MSA) view within the Mutation
+                                            Assessor web site.
+                                        </li>
+                                        <li>
+                                            <strong>chr</strong>: chromosome
+                                            where mutation occurs.
+                                        </li>
+                                        <li>
+                                            <strong>start_position</strong>:
+                                            start position of mutation.
+                                        </li>
+                                        <li>
+                                            <strong>end_position</strong>: end
+                                            position of mutation.
+                                        </li>
+                                        <li>
+                                            <strong>genetic_profile_id</strong>:
+                                            mutation profile id.
+                                        </li>
+                                    </ul>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>Example</td>
+                                <td>
+                                    <ul>
+                                        <li>
+                                            <a href="webservice.do?cmd=getMutationData&amp;case_set_id=gbm_tcga_all&amp;genetic_profile_id=gbm_tcga_mutations&amp;gene_list=EGFR+PTEN">
+                                                Get Extended Mutation Data for
+                                                EGFR and PTEN in TCGA GBM.
+                                            </a>
+                                        </li>
+                                        <li>
+                                            <a href="webservice.do?cmd=getMutationData&amp;genetic_profile_id=ov_tcga_mutations+ucec_tcga_mutations&amp;gene_list=BRCA1">
+                                                Get Extended Mutation Data for
+                                                BRCA1 in TCGA OV and UCEC.
+                                            </a>
+                                        </li>
+                                    </ul>
+                                </td>
+                            </tr>
+                        </tbody>
+                    </table>
 
-                <table className="table table-bordered">
+                    <table className="table table-bordered">
+                        <tbody>
+                            <tr>
+                                <th colSpan={2}>Get Clinical Data</th>
+                            </tr>
 
-                    <tbody>
-                    <tr>
-                        <th colSpan={2}>Get Protein/Phosphoprotein Antibody Information</th>
-                    </tr>
+                            <tr>
+                                <td>Description</td>
+                                <td>
+                                    Retrieves overall survival, disease free
+                                    survival and age at diagnosis for specified
+                                    cases. Due to patient privacy restrictions,
+                                    no other clinical data is available.
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>Query Format</td>
+                                <td>
+                                    <ul>
+                                        <li>
+                                            <strong>cmd</strong>=getClinicalData
+                                            (required)
+                                        </li>
+                                        <li>
+                                            <strong>case_set_id</strong>= [case
+                                            set ID] (required)
+                                        </li>
+                                    </ul>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>Response Format</td>
+                                <td>
+                                    <p>
+                                        A tab-delimited file with the following
+                                        columns:
+                                    </p>
+                                    <ul>
+                                        <li>
+                                            <strong>case_id</strong>: Unique
+                                            Case Identifier.
+                                        </li>
+                                        <li>
+                                            <strong>
+                                                overall_survival_months
+                                            </strong>
+                                            : Overall survival, in months.
+                                        </li>
+                                        <li>
+                                            <strong>
+                                                overall_survival_status
+                                            </strong>
+                                            : Overall survival status, usually
+                                            indicated as "LIVING" or "DECEASED".
+                                        </li>
+                                        <li>
+                                            <strong>
+                                                disease_free_survival_months
+                                            </strong>
+                                            : Disease free survival, in months.
+                                        </li>
+                                        <li>
+                                            <strong>
+                                                disease_free_survival_status
+                                            </strong>
+                                            : Disease free survival status,
+                                            usually indicated as "DiseaseFree"
+                                            or "Recurred/Progressed".
+                                        </li>
+                                        <li>
+                                            <strong>age_at_diagnosis</strong>:
+                                            Age at diagnosis.
+                                        </li>
+                                    </ul>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>Example</td>
+                                <td>
+                                    <a href="webservice.do?cmd=getClinicalData&amp;case_set_id=ov_tcga_all">
+                                        Get Clinical Data for All TCGA Ovarian
+                                        Cases.
+                                    </a>
+                                </td>
+                            </tr>
+                        </tbody>
+                    </table>
 
-                    <tr>
-                        <td>Description</td>
-                        <td>Retrieves information on antibodies used by reverse-phase protein arrays (RPPA) to measure
-                            protein/phosphoprotein levels.
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>Query Format</td>
-                        <td>
-                            <ul>
-                                <li><strong>cmd</strong>=getProteinArrayInfo (required)</li>
-                                <li><strong>cancer_study_id</strong>= [cancer study ID] (required)</li>
-                                <li><strong>protein_array_type</strong>= [protein_level or phosphorylation]</li>
-                                <li><strong>gene_list</strong>= [one or more genes, specified as HUGO Gene Symbols or
-                                    Entrez Gene IDs]. Multiple genes must be separated by comma (,) characters, or URL
-                                    encoded spaces, e.g. +
-                                </li>
-                            </ul>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>Response Format</td>
-                        <td><p>You will receive a tab-delimited matrix with the following 4 columns:</p>
-                            <ul>
-                                <li><strong>ARRAY_ID</strong>: The protein array ID.</li>
-                                <li><strong>ARRAY_TYPE</strong>: The protein array antibody type, i.e. protein_level or
-                                    phosphorylation.
-                                </li>
-                                <li><strong>GENE</strong>: The targeted gene name (HUGO gene symbol).</li>
-                                <li><strong>RESIDUE</strong>: The targeted resdue(s).</li>
-                            </ul>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>Example</td>
-                        <td>
-                            <ul>
-                                <li><a href="webservice.do?cmd=getProteinArrayInfo&amp;cancer_study_id=coadread_tcga">Get
-                                    Information on RPPA Antibodies Measuring TCGA Colorectal Cases.</a></li>
-                                <li><a
-                                    href="webservice.do?cmd=getProteinArrayInfo&amp;cancer_study_id=coadread_tcga&amp;protein_array_type=phosphorylation">Get
-                                    Information on RPPA Phosphoprotein Antibodies Measuring TCGA Colorectal Cases.</a>
-                                </li>
-                                <li><a
-                                    href="webservice.do?cmd=getProteinArrayInfo&amp;cancer_study_id=coadread_tcga&amp;protein_array_type=protein_level&amp;gene_list=ERBB2+TP53">Get
-                                    Information on ERBB2 and TP53 RPPA Protein Antibodies Measuring TCGA Colorectal
-                                    Cases.</a></li>
-                            </ul>
-                        </td>
-                    </tr>
-                    </tbody>
-                </table>
+                    <table className="table table-bordered">
+                        <tbody>
+                            <tr>
+                                <th colSpan={2}>
+                                    Get Protein/Phosphoprotein Antibody
+                                    Information
+                                </th>
+                            </tr>
 
-                <table className="table table-bordered">
+                            <tr>
+                                <td>Description</td>
+                                <td>
+                                    Retrieves information on antibodies used by
+                                    reverse-phase protein arrays (RPPA) to
+                                    measure protein/phosphoprotein levels.
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>Query Format</td>
+                                <td>
+                                    <ul>
+                                        <li>
+                                            <strong>cmd</strong>
+                                            =getProteinArrayInfo (required)
+                                        </li>
+                                        <li>
+                                            <strong>cancer_study_id</strong>=
+                                            [cancer study ID] (required)
+                                        </li>
+                                        <li>
+                                            <strong>protein_array_type</strong>=
+                                            [protein_level or phosphorylation]
+                                        </li>
+                                        <li>
+                                            <strong>gene_list</strong>= [one or
+                                            more genes, specified as HUGO Gene
+                                            Symbols or Entrez Gene IDs].
+                                            Multiple genes must be separated by
+                                            comma (,) characters, or URL encoded
+                                            spaces, e.g. +
+                                        </li>
+                                    </ul>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>Response Format</td>
+                                <td>
+                                    <p>
+                                        You will receive a tab-delimited matrix
+                                        with the following 4 columns:
+                                    </p>
+                                    <ul>
+                                        <li>
+                                            <strong>ARRAY_ID</strong>: The
+                                            protein array ID.
+                                        </li>
+                                        <li>
+                                            <strong>ARRAY_TYPE</strong>: The
+                                            protein array antibody type, i.e.
+                                            protein_level or phosphorylation.
+                                        </li>
+                                        <li>
+                                            <strong>GENE</strong>: The targeted
+                                            gene name (HUGO gene symbol).
+                                        </li>
+                                        <li>
+                                            <strong>RESIDUE</strong>: The
+                                            targeted resdue(s).
+                                        </li>
+                                    </ul>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>Example</td>
+                                <td>
+                                    <ul>
+                                        <li>
+                                            <a href="webservice.do?cmd=getProteinArrayInfo&amp;cancer_study_id=coadread_tcga">
+                                                Get Information on RPPA
+                                                Antibodies Measuring TCGA
+                                                Colorectal Cases.
+                                            </a>
+                                        </li>
+                                        <li>
+                                            <a href="webservice.do?cmd=getProteinArrayInfo&amp;cancer_study_id=coadread_tcga&amp;protein_array_type=phosphorylation">
+                                                Get Information on RPPA
+                                                Phosphoprotein Antibodies
+                                                Measuring TCGA Colorectal Cases.
+                                            </a>
+                                        </li>
+                                        <li>
+                                            <a href="webservice.do?cmd=getProteinArrayInfo&amp;cancer_study_id=coadread_tcga&amp;protein_array_type=protein_level&amp;gene_list=ERBB2+TP53">
+                                                Get Information on ERBB2 and
+                                                TP53 RPPA Protein Antibodies
+                                                Measuring TCGA Colorectal Cases.
+                                            </a>
+                                        </li>
+                                    </ul>
+                                </td>
+                            </tr>
+                        </tbody>
+                    </table>
 
-                    <tbody>
-                    <tr>
-                        <th colSpan={2}>Get RPPA-based Proteomics Data</th>
-                    </tr>
+                    <table className="table table-bordered">
+                        <tbody>
+                            <tr>
+                                <th colSpan={2}>
+                                    Get RPPA-based Proteomics Data
+                                </th>
+                            </tr>
 
-                    <tr>
-                        <td>Description</td>
-                        <td>Retrieves protein and/or phosphoprotein levels measured by reverse-phase protein arrays
-                            (RPPA).
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>Query Format</td>
-                        <td>
-                            <ul>
-                                <li><strong>cmd</strong>=getProteinArrayData (required)</li>
-                                <li><strong>case_set_id</strong>= [case set ID] (required)</li>
-                                <li><strong>array_info</strong>= [1 or 0]. If 1, antibody information will also be
-                                    exported.
-                                </li>
-                            </ul>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>Response Format 1</td>
-                        <td>
-                            <p>If the parameter of array_info is not specified or it is not 1, you will receive a
-                                tab-delimited matrix with the following columns:</p>
-                            <ul>
-                                <li><strong>ARRAY_ID</strong>: The protein array ID.</li>
-                                <li><strong>Columns 2 - N</strong>: Data for each case.</li>
-                            </ul>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>Response Format 2</td>
-                        <td>
-                            <p>If the parameter of array_info is 1, you will receive a tab-delimited matrix with the
-                                following columns:</p>
-                            <ul>
-                                <li><strong>ARRAY_ID</strong>: The protein array ID.</li>
-                                <li><strong>ARRAY_TYPE</strong>: The protein array antibody type, i.e. protein_level or
-                                    phosphorylation.
-                                </li>
-                                <li><strong>GENE</strong>: The targeted gene name (HUGO gene symbol).</li>
-                                <li><strong>RESIDUE</strong>: The targeted resdue(s).</li>
-                                <li><strong>Columns 5 - N</strong>: Data for each case.</li>
-                            </ul>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>Example</td>
-                        <td>
-                            <ul>
-                                <li><a href="webservice.do?cmd=getProteinArrayData&amp;case_set_id=coadread_tcga_RPPA">Get
-                                    All RPPA Data in TCGA Colorectal Cases.</a></li>
-                                <li><a
-                                    href="webservice.do?cmd=getProteinArrayData&amp;case_set_id=coadread_tcga_RPPA&amp;array_info=1">Get
-                                    All RPPA Data with antibody information in TCGA Colorectal Cases.</a></li>
-                            </ul>
-                        </td>
-                    </tr>
-                    </tbody>
-                </table>
-            </div>
-            <hr />
+                            <tr>
+                                <td>Description</td>
+                                <td>
+                                    Retrieves protein and/or phosphoprotein
+                                    levels measured by reverse-phase protein
+                                    arrays (RPPA).
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>Query Format</td>
+                                <td>
+                                    <ul>
+                                        <li>
+                                            <strong>cmd</strong>
+                                            =getProteinArrayData (required)
+                                        </li>
+                                        <li>
+                                            <strong>case_set_id</strong>= [case
+                                            set ID] (required)
+                                        </li>
+                                        <li>
+                                            <strong>array_info</strong>= [1 or
+                                            0]. If 1, antibody information will
+                                            also be exported.
+                                        </li>
+                                    </ul>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>Response Format 1</td>
+                                <td>
+                                    <p>
+                                        If the parameter of array_info is not
+                                        specified or it is not 1, you will
+                                        receive a tab-delimited matrix with the
+                                        following columns:
+                                    </p>
+                                    <ul>
+                                        <li>
+                                            <strong>ARRAY_ID</strong>: The
+                                            protein array ID.
+                                        </li>
+                                        <li>
+                                            <strong>Columns 2 - N</strong>: Data
+                                            for each case.
+                                        </li>
+                                    </ul>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>Response Format 2</td>
+                                <td>
+                                    <p>
+                                        If the parameter of array_info is 1, you
+                                        will receive a tab-delimited matrix with
+                                        the following columns:
+                                    </p>
+                                    <ul>
+                                        <li>
+                                            <strong>ARRAY_ID</strong>: The
+                                            protein array ID.
+                                        </li>
+                                        <li>
+                                            <strong>ARRAY_TYPE</strong>: The
+                                            protein array antibody type, i.e.
+                                            protein_level or phosphorylation.
+                                        </li>
+                                        <li>
+                                            <strong>GENE</strong>: The targeted
+                                            gene name (HUGO gene symbol).
+                                        </li>
+                                        <li>
+                                            <strong>RESIDUE</strong>: The
+                                            targeted resdue(s).
+                                        </li>
+                                        <li>
+                                            <strong>Columns 5 - N</strong>: Data
+                                            for each case.
+                                        </li>
+                                    </ul>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>Example</td>
+                                <td>
+                                    <ul>
+                                        <li>
+                                            <a href="webservice.do?cmd=getProteinArrayData&amp;case_set_id=coadread_tcga_RPPA">
+                                                Get All RPPA Data in TCGA
+                                                Colorectal Cases.
+                                            </a>
+                                        </li>
+                                        <li>
+                                            <a href="webservice.do?cmd=getProteinArrayData&amp;case_set_id=coadread_tcga_RPPA&amp;array_info=1">
+                                                Get All RPPA Data with antibody
+                                                information in TCGA Colorectal
+                                                Cases.
+                                            </a>
+                                        </li>
+                                    </ul>
+                                </td>
+                            </tr>
+                        </tbody>
+                    </table>
+                </div>
+                <hr />
 
                 <h2 id="linking-to-us">Linking to Us</h2>
-                <p>Once you have a cancer_study_id, it is very easy to create stable links from your web site to the
-                    cBio Portal. Stable links must point to ln, and can include the following parameters:</p>
+                <p>
+                    Once you have a cancer_study_id, it is very easy to create
+                    stable links from your web site to the cBio Portal. Stable
+                    links must point to ln, and can include the following
+                    parameters:
+                </p>
                 <ul>
-                    <li><strong>q</strong>=[a query following <a href="oql" target="_blank">Onco Query Language</a>,
-                        e.g. a space separated list of HUGO gene symbols] (required)
+                    <li>
+                        <strong>q</strong>=[a query following{' '}
+                        <a href="oql" target="_blank">
+                            Onco Query Language
+                        </a>
+                        , e.g. a space separated list of HUGO gene symbols]
+                        (required)
                     </li>
-                    <li><strong>cancer_study_id</strong>=[cancer study ID] (if not specified, do a cross cancer query)
+                    <li>
+                        <strong>cancer_study_id</strong>=[cancer study ID] (if
+                        not specified, do a cross cancer query)
+                    </li>
+                    <li>
+                        <strong>report</strong>=[report to display; can be one
+                        of: full (default), oncoprint_html]
                     </li>
-                    <li><strong>report</strong>=[report to display; can be one of: full (default), oncoprint_html]</li>
                 </ul>
-                <p>For example, here is a link to the TCGA GBM data for EGFR and NF1:</p>
-                <p><a href="ln?cancer_study_id=gbm_tcga&amp;q=EGFR+NF1">ln?cancer_study_id=gbm_tcga&amp;q=EGFR+NF1</a>
+                <p>
+                    For example, here is a link to the TCGA GBM data for EGFR
+                    and NF1:
+                </p>
+                <p>
+                    <a href="ln?cancer_study_id=gbm_tcga&amp;q=EGFR+NF1">
+                        ln?cancer_study_id=gbm_tcga&amp;q=EGFR+NF1
+                    </a>
                 </p>
                 <p>And a link to TP53 mutations across all cancer studies:</p>
-                <p><a href="ln?q=TP53:MUT">ln?q=TP53:MUT</a></p>
-        </PageLayout>;
-
+                <p>
+                    <a href="ln?q=TP53:MUT">ln?q=TP53:MUT</a>
+                </p>
+            </PageLayout>
+        );
     }
-
 }
diff --git a/src/pages/staticPages/webAPI/styles.scss b/src/pages/staticPages/webAPI/styles.scss
index 3f026401078..6d3b132051a 100644
--- a/src/pages/staticPages/webAPI/styles.scss
+++ b/src/pages/staticPages/webAPI/styles.scss
@@ -1,5 +1,5 @@
 .commandDocumentation {
-  table {
-    margin-bottom:30px !important;
-  }
-}
\ No newline at end of file
+    table {
+        margin-bottom: 30px !important;
+    }
+}
diff --git a/src/pages/studyView/StudyViewConfig.ts b/src/pages/studyView/StudyViewConfig.ts
index f7cc0518396..7084291afb5 100644
--- a/src/pages/studyView/StudyViewConfig.ts
+++ b/src/pages/studyView/StudyViewConfig.ts
@@ -1,62 +1,62 @@
-import AppConfig from "appConfig";
-import {StudyView} from "../../config/IAppConfig";
-import {Layout} from 'react-grid-layout';
+import AppConfig from 'appConfig';
+import { StudyView } from '../../config/IAppConfig';
+import { Layout } from 'react-grid-layout';
 import * as _ from 'lodash';
-import {ChartType} from "./StudyViewUtils";
+import { ChartType } from './StudyViewUtils';
 
 export type StudyViewColor = {
-    theme: StudyViewColorTheme
-}
+    theme: StudyViewColorTheme;
+};
 
 export type StudyViewColorTheme = {
-    primary: string,
-    secondary: string,
-    tertiary: string,
-    quaternary: string,
-
-    unselectedGroup: string,
-    selectedGroup: string,
-    clinicalFilterTitle: string,
-    clinicalFilterContent: string,
-}
+    primary: string;
+    secondary: string;
+    tertiary: string;
+    quaternary: string;
+
+    unselectedGroup: string;
+    selectedGroup: string;
+    clinicalFilterTitle: string;
+    clinicalFilterContent: string;
+};
 
 export type StudyViewThreshold = {
-    pieToTable: number,
-    piePadding: number,
-    barRatio: number,
-    rowsInTableForOneGrid: number,
-    clinicalCharts: number,
-    chartHighlight: number,
-}
+    pieToTable: number;
+    piePadding: number;
+    barRatio: number;
+    rowsInTableForOneGrid: number;
+    clinicalCharts: number;
+    chartHighlight: number;
+};
 
 export type ChartDimension = {
-    w: number,
-    h: number
-}
+    w: number;
+    h: number;
+};
 
 export type Position = {
-    x: number,
-    y: number
-}
+    x: number;
+    y: number;
+};
 
 export type StudyViewLayout = {
-    layout: Layout[],
-    cols: number,
-    grid: ChartDimension,
-    gridMargin: Position,
-    dimensions: {[chartType in ChartType]: ChartDimension}
-}
+    layout: Layout[];
+    cols: number;
+    grid: ChartDimension;
+    gridMargin: Position;
+    dimensions: { [chartType in ChartType]: ChartDimension };
+};
 
 export type StudyViewFrontEndConfig = {
-    thresholds: StudyViewThreshold,
-    initialBins: { [uniqueKey: string]: number[] }
-    colors: StudyViewColor,
-    alwaysShownClinicalAttributes: string[],
-    layout: StudyViewLayout,
-    defaultPriority: number,
-}
+    thresholds: StudyViewThreshold;
+    initialBins: { [uniqueKey: string]: number[] };
+    colors: StudyViewColor;
+    alwaysShownClinicalAttributes: string[];
+    layout: StudyViewLayout;
+    defaultPriority: number;
+};
 
-export type StudyViewConfig = StudyView & StudyViewFrontEndConfig
+export type StudyViewConfig = StudyView & StudyViewFrontEndConfig;
 
 export enum ChartTypeEnum {
     PIE_CHART = 'PIE_CHART',
@@ -67,7 +67,7 @@ export enum ChartTypeEnum {
     MUTATED_GENES_TABLE = 'MUTATED_GENES_TABLE',
     FUSION_GENES_TABLE = 'FUSION_GENES_TABLE',
     CNA_GENES_TABLE = 'CNA_GENES_TABLE',
-    NONE = 'NONE'
+    NONE = 'NONE',
 }
 
 export enum ChartTypeNameEnum {
@@ -79,7 +79,7 @@ export enum ChartTypeNameEnum {
     MUTATED_GENES_TABLE = 'table',
     FUSION_GENES_TABLE = 'table',
     CNA_GENES_TABLE = 'table',
-    NONE = 'none'
+    NONE = 'none',
 }
 
 export const DEFAULT_SORTING_COLUMN = 'Freq';
@@ -89,33 +89,33 @@ const studyViewFrontEnd = {
     defaultPriority: 1,
     tableAttrs: ['CANCER_TYPE', 'CANCER_TYPE_DETAILED'],
     initialBins: {
-        'MSI_SCORE': [1, 2, 5, 10, 30]
+        MSI_SCORE: [1, 2, 5, 10, 30],
     },
     priority: {
-        "CANCER_TYPE": 3000,
-        "CANCER_TYPE_DETAILED": 2000,
-        "OS_SURVIVAL": 400,
-        "DFS_SURVIVAL": 300,
-        "MUTATION_COUNT_CNA_FRACTION": 200,
-        "MUTATED_GENES_TABLE": 90,
-        "FUSION_GENES_TABLE": 85,
-        "CNA_GENES_TABLE": 80,
-        "CANCER_STUDIES": 70,
-        "SEQUENCED": 60,
-        "HAS_CNA_DATA": 50,
-        "SAMPLE_COUNT": 40,
-        "MUTATION_COUNT": 30,
-        "FRACTION_GENOME_ALTERED": 20,
-        "GENDER": 9,
-        "SEX": 9,
-        "AGE": 9,
-        "RACE": 8,
-        "ETHNICITY": 8,
-        "SAMPLE_TYPE": 8,
-        "HISTOLOGY": 8,
-        "TUMOR_TYPE": 8,
-        "SUBTYPE": 8,
-        "TUMOR_SITE": 8
+        CANCER_TYPE: 3000,
+        CANCER_TYPE_DETAILED: 2000,
+        OS_SURVIVAL: 400,
+        DFS_SURVIVAL: 300,
+        MUTATION_COUNT_CNA_FRACTION: 200,
+        MUTATED_GENES_TABLE: 90,
+        FUSION_GENES_TABLE: 85,
+        CNA_GENES_TABLE: 80,
+        CANCER_STUDIES: 70,
+        SEQUENCED: 60,
+        HAS_CNA_DATA: 50,
+        SAMPLE_COUNT: 40,
+        MUTATION_COUNT: 30,
+        FRACTION_GENOME_ALTERED: 20,
+        GENDER: 9,
+        SEX: 9,
+        AGE: 9,
+        RACE: 8,
+        ETHNICITY: 8,
+        SAMPLE_TYPE: 8,
+        HISTOLOGY: 8,
+        TUMOR_TYPE: 8,
+        SUBTYPE: 8,
+        TUMOR_SITE: 8,
     },
     thresholds: {
         pieToTable: 20,
@@ -123,57 +123,57 @@ const studyViewFrontEnd = {
         barRatio: 0.8,
         rowsInTableForOneGrid: 4,
         clinicalCharts: 20,
-        chartHighlight: 10000
+        chartHighlight: 10000,
     },
     layout: {
         layout: [],
         cols: 6,
         grid: {
             w: 195,
-            h: 170
+            h: 170,
         },
         gridMargin: {
             x: 5,
-            y: 5
+            y: 5,
         },
         dimensions: {
             [ChartTypeEnum.PIE_CHART]: {
                 w: 1,
-                h: 1
+                h: 1,
             },
             [ChartTypeEnum.BAR_CHART]: {
                 w: 2,
-                h: 1
+                h: 1,
             },
             [ChartTypeEnum.SCATTER]: {
                 w: 2,
-                h: 2
+                h: 2,
             },
             [ChartTypeEnum.TABLE]: {
                 w: 2,
-                h: 2
+                h: 2,
             },
             [ChartTypeEnum.SURVIVAL]: {
                 w: 2,
-                h: 2
+                h: 2,
             },
             [ChartTypeEnum.MUTATED_GENES_TABLE]: {
                 w: 2,
-                h: 2
+                h: 2,
             },
             [ChartTypeEnum.FUSION_GENES_TABLE]: {
                 w: 2,
-                h: 2
+                h: 2,
             },
             [ChartTypeEnum.CNA_GENES_TABLE]: {
                 w: 2,
-                h: 2
+                h: 2,
             },
             [ChartTypeEnum.NONE]: {
                 w: 0,
-                h: 0
-            }
-        }
+                h: 0,
+            },
+        },
     },
 
     colors: {
@@ -187,8 +187,11 @@ const studyViewFrontEnd = {
             selectedGroup: '#DC3912',
             clinicalFilterTitle: '#A9A9A9',
             clinicalFilterContent: '#2986E2',
-        }
-    }
+        },
+    },
 };
 
-export const STUDY_VIEW_CONFIG: StudyViewConfig = _.assign(studyViewFrontEnd, AppConfig.serverConfig.study_view);
+export const STUDY_VIEW_CONFIG: StudyViewConfig = _.assign(
+    studyViewFrontEnd,
+    AppConfig.serverConfig.study_view
+);
diff --git a/src/pages/studyView/StudyViewPage.tsx b/src/pages/studyView/StudyViewPage.tsx
index 512c2235cf5..cb3b42991ce 100644
--- a/src/pages/studyView/StudyViewPage.tsx
+++ b/src/pages/studyView/StudyViewPage.tsx
@@ -1,50 +1,57 @@
-import * as React from "react";
-import * as _ from "lodash";
-import { inject, Observer, observer } from "mobx-react";
-import { MSKTab, MSKTabs } from "../../shared/components/MSKTabs/MSKTabs";
-import { computed, IReactionDisposer, reaction, observable } from "mobx";
+import * as React from 'react';
+import * as _ from 'lodash';
+import { inject, Observer, observer } from 'mobx-react';
+import { MSKTab, MSKTabs } from '../../shared/components/MSKTabs/MSKTabs';
+import { computed, IReactionDisposer, reaction, observable } from 'mobx';
 import {
     CustomChart,
     StudyViewPageStore,
     StudyViewPageTabDescriptions,
     StudyViewURLQuery,
-} from "pages/studyView/StudyViewPageStore";
-import { StudyViewPageTabKeyEnum } from "pages/studyView/StudyViewPageTabs";
-import LoadingIndicator from "shared/components/loadingIndicator/LoadingIndicator";
-import { ClinicalDataTab } from "./tabs/ClinicalDataTab";
+} from 'pages/studyView/StudyViewPageStore';
+import { StudyViewPageTabKeyEnum } from 'pages/studyView/StudyViewPageTabs';
+import LoadingIndicator from 'shared/components/loadingIndicator/LoadingIndicator';
+import { ClinicalDataTab } from './tabs/ClinicalDataTab';
 import {
     DefaultTooltip,
     getBrowserWindow,
     isWebdriver,
-    remoteData
-} from "cbioportal-frontend-commons";
-import { PageLayout } from "../../shared/components/PageLayout/PageLayout";
-import IFrameLoader from "../../shared/components/iframeLoader/IFrameLoader";
-import { StudySummaryTab } from "pages/studyView/tabs/SummaryTab";
-import StudyPageHeader from "./studyPageHeader/StudyPageHeader";
-import CNSegments from "./tabs/CNSegments";
+    remoteData,
+} from 'cbioportal-frontend-commons';
+import { PageLayout } from '../../shared/components/PageLayout/PageLayout';
+import IFrameLoader from '../../shared/components/iframeLoader/IFrameLoader';
+import { StudySummaryTab } from 'pages/studyView/tabs/SummaryTab';
+import StudyPageHeader from './studyPageHeader/StudyPageHeader';
+import CNSegments from './tabs/CNSegments';
 
-import AddChartButton from "./addChartButton/AddChartButton";
-import { CSSTransition } from "react-transition-group";
-import { sleep } from "../../shared/lib/TimeUtils";
-import { Else, If, Then } from "react-if";
-import CustomCaseSelection from "./addChartButton/customCaseSelection/CustomCaseSelection";
-import { AppStore } from "../../AppStore";
-import ActionButtons from "./studyPageHeader/ActionButtons";
-import onMobxPromise from "../../shared/lib/onMobxPromise";
-import { GACustomFieldsEnum, serializeEvent, trackEvent } from "../../shared/lib/tracking";
-import ComparisonGroupManager from "../groupComparison/comparisonGroupManager/ComparisonGroupManager";
-import classNames from "classnames";
-import AppConfig from "appConfig";
-import SocialAuthButton from "../../shared/components/SocialAuthButton";
-import { ServerConfigHelpers } from "../../config/config";
-import { getStudyViewTabId, getButtonNameWithDownPointer } from "./StudyViewUtils";
-import { Alert, Modal } from "react-bootstrap";
+import AddChartButton from './addChartButton/AddChartButton';
+import { CSSTransition } from 'react-transition-group';
+import { sleep } from '../../shared/lib/TimeUtils';
+import { Else, If, Then } from 'react-if';
+import CustomCaseSelection from './addChartButton/customCaseSelection/CustomCaseSelection';
+import { AppStore } from '../../AppStore';
+import ActionButtons from './studyPageHeader/ActionButtons';
+import onMobxPromise from '../../shared/lib/onMobxPromise';
+import {
+    GACustomFieldsEnum,
+    serializeEvent,
+    trackEvent,
+} from '../../shared/lib/tracking';
+import ComparisonGroupManager from '../groupComparison/comparisonGroupManager/ComparisonGroupManager';
+import classNames from 'classnames';
+import AppConfig from 'appConfig';
+import SocialAuthButton from '../../shared/components/SocialAuthButton';
+import { ServerConfigHelpers } from '../../config/config';
+import {
+    getStudyViewTabId,
+    getButtonNameWithDownPointer,
+} from './StudyViewUtils';
+import { Alert, Modal } from 'react-bootstrap';
 import 'cbioportal-frontend-commons/dist/styles.css';
-import "react-grid-layout/css/styles.css";
-import "react-resizable/css/styles.css";
-import styles from "./styles.module.scss";
-import "./styles.scss";
+import 'react-grid-layout/css/styles.css';
+import 'react-resizable/css/styles.css';
+import styles from './styles.module.scss';
+import './styles.scss';
 
 export interface IStudyViewPageProps {
     routing: any;
@@ -73,16 +80,22 @@ export class StudyResultsSummary extends React.Component<
     }
 }
 
-@inject("routing", "appStore")
+@inject('routing', 'appStore')
 @observer
-export default class StudyViewPage extends React.Component<IStudyViewPageProps, {}> {
+export default class StudyViewPage extends React.Component<
+    IStudyViewPageProps,
+    {}
+> {
     private store: StudyViewPageStore;
     private enableCustomSelectionInTabs = [
         StudyViewPageTabKeyEnum.SUMMARY,
         StudyViewPageTabKeyEnum.CLINICAL_DATA,
         StudyViewPageTabKeyEnum.CN_SEGMENTS,
     ];
-    private enableAddChartInTabs = [StudyViewPageTabKeyEnum.SUMMARY, StudyViewPageTabKeyEnum.CLINICAL_DATA];
+    private enableAddChartInTabs = [
+        StudyViewPageTabKeyEnum.SUMMARY,
+        StudyViewPageTabKeyEnum.CLINICAL_DATA,
+    ];
     private queryReaction: IReactionDisposer;
     @observable showCustomSelectTooltip = false;
     @observable showGroupsTooltip = false;
@@ -91,29 +104,39 @@ export default class StudyViewPage extends React.Component<IStudyViewPageProps,
 
     constructor(props: IStudyViewPageProps) {
         super(props);
-        this.store = new StudyViewPageStore(this.props.appStore, ServerConfigHelpers.sessionServiceIsEnabled());
+        this.store = new StudyViewPageStore(
+            this.props.appStore,
+            ServerConfigHelpers.sessionServiceIsEnabled()
+        );
 
         this.queryReaction = reaction(
             () => [props.routing.location.query, props.routing.location.hash],
             ([query, hash]) => {
-                if (!getBrowserWindow().globalStores.routing.location.pathname.includes("/study")) {
+                if (
+                    !getBrowserWindow().globalStores.routing.location.pathname.includes(
+                        '/study'
+                    )
+                ) {
                     return;
                 }
 
                 this.store.updateCurrentTab(
-                    getStudyViewTabId(getBrowserWindow().globalStores.routing.location.pathname)
+                    getStudyViewTabId(
+                        getBrowserWindow().globalStores.routing.location
+                            .pathname
+                    )
                 );
                 const newStudyViewFilter: StudyViewURLQuery = _.pick(query, [
-                    "id",
-                    "studyId",
-                    "cancer_study_id",
-                    "filters",
-                    "filterAttributeId",
-                    "filterValues",
+                    'id',
+                    'studyId',
+                    'cancer_study_id',
+                    'filters',
+                    'filterAttributeId',
+                    'filterValues',
                 ]);
 
                 const filterJson = hash || getBrowserWindow().studyPageFilter;
-                delete (window as any).studyPageFilter
+                delete (window as any).studyPageFilter;
 
                 if (filterJson) {
                     const filters = filterJson.match(/filterJson=([^&]*)/);
@@ -129,23 +152,31 @@ export default class StudyViewPage extends React.Component<IStudyViewPageProps,
             { fireImmediately: true }
         );
 
-        onMobxPromise(this.store.queriedPhysicalStudyIds, (strArr: string[]) => {
-            trackEvent({
-                category: "studyPage",
-                action: "studyPageLoad",
-                label: strArr.join(",") + ",",
-                fieldsObject: {
-                    [GACustomFieldsEnum.VirtualStudy]: (
-                        this.store.filteredVirtualStudies.result!.length > 0
-                    ).toString(),
-                },
-            });
-        });
+        onMobxPromise(
+            this.store.queriedPhysicalStudyIds,
+            (strArr: string[]) => {
+                trackEvent({
+                    category: 'studyPage',
+                    action: 'studyPageLoad',
+                    label: strArr.join(',') + ',',
+                    fieldsObject: {
+                        [GACustomFieldsEnum.VirtualStudy]: (
+                            this.store.filteredVirtualStudies.result!.length > 0
+                        ).toString(),
+                    },
+                });
+            }
+        );
     }
 
     componentDidMount() {
         // make the route as the default tab value
-        this.props.routing.updateRoute({}, `study/${this.store.currentTab}`, false, true);
+        this.props.routing.updateRoute(
+            {},
+            `study/${this.store.currentTab}`,
+            false,
+            true
+        );
     }
 
     private handleTabChange(id: string) {
@@ -175,11 +206,13 @@ export default class StudyViewPage extends React.Component<IStudyViewPageProps,
     @computed
     get addChartButtonText() {
         if (this.store.currentTab === StudyViewPageTabKeyEnum.SUMMARY) {
-            return getButtonNameWithDownPointer("Charts");
-        } else if (this.store.currentTab === StudyViewPageTabKeyEnum.CLINICAL_DATA) {
-            return getButtonNameWithDownPointer("Columns");
+            return getButtonNameWithDownPointer('Charts');
+        } else if (
+            this.store.currentTab === StudyViewPageTabKeyEnum.CLINICAL_DATA
+        ) {
+            return getButtonNameWithDownPointer('Columns');
         } else {
-            return "";
+            return '';
         }
     }
 
@@ -201,32 +234,47 @@ export default class StudyViewPage extends React.Component<IStudyViewPageProps,
                 {/*</If>*/}
                 <DefaultTooltip
                     visible={this.showGroupsTooltip}
-                    trigger={["click"]}
+                    trigger={['click']}
                     placement="bottomLeft"
                     destroyTooltipOnHide={true}
                     onPopupAlign={(tooltipEl: any) => {
-                        const arrowEl = tooltipEl.querySelector(".rc-tooltip-arrow");
-                        arrowEl.style.right = "10px";
+                        const arrowEl = tooltipEl.querySelector(
+                            '.rc-tooltip-arrow'
+                        );
+                        arrowEl.style.right = '10px';
                     }}
                     onVisibleChange={visible => {
                         this.showGroupsTooltip = !!visible;
                     }}
-                    getTooltipContainer={() => document.getElementById("comparisonGroupManagerContainer")!}
+                    getTooltipContainer={() =>
+                        document.getElementById(
+                            'comparisonGroupManagerContainer'
+                        )!
+                    }
                     overlay={
                         <div style={{ width: 350 }}>
                             {this.props.appStore.isLoggedIn ? (
                                 <ComparisonGroupManager store={this.store} />
                             ) : (
                                 <span>
-                                    Please log in to use the custom groups feature to save and compare sub-cohorts.
+                                    Please log in to use the custom groups
+                                    feature to save and compare sub-cohorts.
                                     <If
                                         condition={
-                                            AppConfig.serverConfig.authenticationMethod &&
-                                            AppConfig.serverConfig.authenticationMethod.includes("social_auth")
+                                            AppConfig.serverConfig
+                                                .authenticationMethod &&
+                                            AppConfig.serverConfig.authenticationMethod.includes(
+                                                'social_auth'
+                                            )
                                         }
                                     >
-                                        <div className={"text-center"} style={{ padding: 20 }}>
-                                            <SocialAuthButton appStore={this.props.appStore} />
+                                        <div
+                                            className={'text-center'}
+                                            style={{ padding: 20 }}
+                                        >
+                                            <SocialAuthButton
+                                                appStore={this.props.appStore}
+                                            />
                                         </div>
                                     </If>
                                 </span>
@@ -235,18 +283,20 @@ export default class StudyViewPage extends React.Component<IStudyViewPageProps,
                     }
                 >
                     <button
-                        className={classNames("btn btn-primary btn-xs", { active: this.showGroupsTooltip })}
-                        id={"groupManagementButton"}
+                        className={classNames('btn btn-primary btn-xs', {
+                            active: this.showGroupsTooltip,
+                        })}
+                        id={'groupManagementButton'}
                         data-test="groups-button"
                         aria-pressed={this.showGroupsTooltip}
-                        style={{ marginLeft: "10px" }}
+                        style={{ marginLeft: '10px' }}
                         data-event={serializeEvent({
-                            action: "openGroupManagement",
-                            label: "",
-                            category: "groupComparison",
+                            action: 'openGroupManagement',
+                            label: '',
+                            category: 'groupComparison',
                         })}
                     >
-                        {getButtonNameWithDownPointer("Groups")}
+                        {getButtonNameWithDownPointer('Groups')}
                     </button>
                 </DefaultTooltip>
             </>
@@ -257,14 +307,21 @@ export default class StudyViewPage extends React.Component<IStudyViewPageProps,
         return (
             <div className="studyView">
                 {this.store.comparisonConfirmationModal}
-                {this.store.unknownQueriedIds.isComplete && this.store.unknownQueriedIds.result.length > 0 && (
-                    <Alert bsStyle="danger">
-                        <span>Unknown/Unauthorized studies {this.store.unknownQueriedIds.result.join(", ")}</span>
-                    </Alert>
-                )}
+                {this.store.unknownQueriedIds.isComplete &&
+                    this.store.unknownQueriedIds.result.length > 0 && (
+                        <Alert bsStyle="danger">
+                            <span>
+                                Unknown/Unauthorized studies{' '}
+                                {this.store.unknownQueriedIds.result.join(', ')}
+                            </span>
+                        </Alert>
+                    )}
                 <LoadingIndicator
-                    size={"big"}
-                    isLoading={this.store.queriedSampleIdentifiers.isPending || this.store.invalidSampleIds.isPending}
+                    size={'big'}
+                    isLoading={
+                        this.store.queriedSampleIdentifiers.isPending ||
+                        this.store.invalidSampleIds.isPending
+                    }
                     center={true}
                 />
                 {this.store.queriedSampleIdentifiers.isComplete &&
@@ -278,29 +335,44 @@ export default class StudyViewPage extends React.Component<IStudyViewPageProps,
                                 <MSKTabs
                                     id="studyViewTabs"
                                     activeTabId={this.store.currentTab}
-                                    onTabClick={(id: string) => this.handleTabChange(id)}
+                                    onTabClick={(id: string) =>
+                                        this.handleTabChange(id)
+                                    }
                                     className="mainTabs"
                                     unmountOnHide={false}
                                 >
                                     <MSKTab
                                         key={0}
                                         id={StudyViewPageTabKeyEnum.SUMMARY}
-                                        linkText={StudyViewPageTabDescriptions.SUMMARY}
+                                        linkText={
+                                            StudyViewPageTabDescriptions.SUMMARY
+                                        }
                                     >
-                                        <StudySummaryTab store={this.store}></StudySummaryTab>
+                                        <StudySummaryTab
+                                            store={this.store}
+                                        ></StudySummaryTab>
                                     </MSKTab>
                                     <MSKTab
                                         key={1}
-                                        id={StudyViewPageTabKeyEnum.CLINICAL_DATA}
-                                        linkText={StudyViewPageTabDescriptions.CLINICAL_DATA}
+                                        id={
+                                            StudyViewPageTabKeyEnum.CLINICAL_DATA
+                                        }
+                                        linkText={
+                                            StudyViewPageTabDescriptions.CLINICAL_DATA
+                                        }
                                     >
                                         <ClinicalDataTab store={this.store} />
                                     </MSKTab>
                                     <MSKTab
                                         key={2}
                                         id={StudyViewPageTabKeyEnum.HEATMAPS}
-                                        linkText={StudyViewPageTabDescriptions.HEATMAPS}
-                                        hide={this.store.MDACCHeatmapStudyMeta.result.length === 0}
+                                        linkText={
+                                            StudyViewPageTabDescriptions.HEATMAPS
+                                        }
+                                        hide={
+                                            this.store.MDACCHeatmapStudyMeta
+                                                .result.length === 0
+                                        }
                                     >
                                         <IFrameLoader
                                             className="mdacc-heatmap-iframe"
@@ -310,12 +382,19 @@ export default class StudyViewPage extends React.Component<IStudyViewPageProps,
                                     <MSKTab
                                         key={3}
                                         id={StudyViewPageTabKeyEnum.CN_SEGMENTS}
-                                        linkText={StudyViewPageTabDescriptions.CN_SEGMENTS}
+                                        linkText={
+                                            StudyViewPageTabDescriptions.CN_SEGMENTS
+                                        }
                                         hide={
-                                            !this.store.initialMolecularProfileSampleCounts.result ||
+                                            !this.store
+                                                .initialMolecularProfileSampleCounts
+                                                .result ||
                                             !(
-                                                this.store.initialMolecularProfileSampleCounts.result
-                                                    .numberOfCNSegmentSamples > 0
+                                                this.store
+                                                    .initialMolecularProfileSampleCounts
+                                                    .result
+                                                    .numberOfCNSegmentSamples >
+                                                0
                                             )
                                         }
                                     >
@@ -330,15 +409,25 @@ export default class StudyViewPage extends React.Component<IStudyViewPageProps,
                                             const summary = (
                                                 <StudyResultsSummary
                                                     store={this.store}
-                                                    appStore={this.props.appStore}
-                                                    loadingComplete={this.chartDataPromises.isComplete}
+                                                    appStore={
+                                                        this.props.appStore
+                                                    }
+                                                    loadingComplete={
+                                                        this.chartDataPromises
+                                                            .isComplete
+                                                    }
                                                 />
                                             );
                                             const buttons = (
                                                 <ActionButtons
                                                     store={this.store}
-                                                    appStore={this.props.appStore}
-                                                    loadingComplete={this.chartDataPromises.isComplete}
+                                                    appStore={
+                                                        this.props.appStore
+                                                    }
+                                                    loadingComplete={
+                                                        this.chartDataPromises
+                                                            .isComplete
+                                                    }
                                                 />
                                             );
 
@@ -351,21 +440,42 @@ export default class StudyViewPage extends React.Component<IStudyViewPageProps,
                                                 >
                                                     {() => {
                                                         return (
-                                                            <div className={styles.studyFilterResult}>
-                                                                <If condition={this.store.selectedSamples.isComplete}>
+                                                            <div
+                                                                className={
+                                                                    styles.studyFilterResult
+                                                                }
+                                                            >
+                                                                <If
+                                                                    condition={
+                                                                        this
+                                                                            .store
+                                                                            .selectedSamples
+                                                                            .isComplete
+                                                                    }
+                                                                >
                                                                     <Then>
-                                                                        {summary}
-                                                                        {buttons}
+                                                                        {
+                                                                            summary
+                                                                        }
+                                                                        {
+                                                                            buttons
+                                                                        }
                                                                     </Then>
                                                                     <Else>
                                                                         <LoadingIndicator
-                                                                            isLoading={true}
-                                                                            size={"small"}
+                                                                            isLoading={
+                                                                                true
+                                                                            }
+                                                                            size={
+                                                                                'small'
+                                                                            }
                                                                             className={
                                                                                 styles.selectedInfoLoadingIndicator
                                                                             }
                                                                         />
-                                                                        {buttons}
+                                                                        {
+                                                                            buttons
+                                                                        }
                                                                     </Else>
                                                                 </If>
                                                             </div>
@@ -377,56 +487,102 @@ export default class StudyViewPage extends React.Component<IStudyViewPageProps,
                                     </Observer>
                                     <div
                                         id="comparisonGroupManagerContainer"
-                                        style={{ display: "flex", position: "relative" }}
+                                        style={{
+                                            display: 'flex',
+                                            position: 'relative',
+                                        }}
                                     >
-                                        {this.enableCustomSelectionInTabs.includes(this.store.currentTab) && (
+                                        {this.enableCustomSelectionInTabs.includes(
+                                            this.store.currentTab
+                                        ) && (
                                             <>
                                                 <DefaultTooltip
-                                                    visible={this.showCustomSelectTooltip}
-                                                    trigger={["click"]}
-                                                    placement={"bottomLeft"}
+                                                    visible={
+                                                        this
+                                                            .showCustomSelectTooltip
+                                                    }
+                                                    trigger={['click']}
+                                                    placement={'bottomLeft'}
                                                     onVisibleChange={visible =>
                                                         (this.showCustomSelectTooltip = !!visible)
                                                     }
                                                     destroyTooltipOnHide={true}
                                                     overlay={() => (
-                                                        <div style={{ width: "350px" }}>
+                                                        <div
+                                                            style={{
+                                                                width: '350px',
+                                                            }}
+                                                        >
                                                             <CustomCaseSelection
-                                                                allSamples={this.store.samples.result}
-                                                                selectedSamples={this.store.selectedSamples.result}
-                                                                disableGrouping={true}
+                                                                allSamples={
+                                                                    this.store
+                                                                        .samples
+                                                                        .result
+                                                                }
+                                                                selectedSamples={
+                                                                    this.store
+                                                                        .selectedSamples
+                                                                        .result
+                                                                }
+                                                                disableGrouping={
+                                                                    true
+                                                                }
                                                                 queriedStudies={
-                                                                    this.store.queriedPhysicalStudyIds.result
+                                                                    this.store
+                                                                        .queriedPhysicalStudyIds
+                                                                        .result
                                                                 }
-                                                                onSubmit={(chart: CustomChart) => {
+                                                                onSubmit={(
+                                                                    chart: CustomChart
+                                                                ) => {
                                                                     this.showCustomSelectTooltip = false;
-                                                                    this.store.updateCustomSelect(chart);
+                                                                    this.store.updateCustomSelect(
+                                                                        chart
+                                                                    );
                                                                 }}
                                                             />
                                                         </div>
                                                     )}
                                                 >
                                                     <button
-                                                        className={classNames("btn btn-primary btn-sm", {
-                                                            active: this.showCustomSelectTooltip,
-                                                        })}
-                                                        aria-pressed={this.showCustomSelectTooltip}
+                                                        className={classNames(
+                                                            'btn btn-primary btn-sm',
+                                                            {
+                                                                active: this
+                                                                    .showCustomSelectTooltip,
+                                                            }
+                                                        )}
+                                                        aria-pressed={
+                                                            this
+                                                                .showCustomSelectTooltip
+                                                        }
                                                         data-test="custom-selection-button"
-                                                        style={{ marginLeft: "10px" }}
+                                                        style={{
+                                                            marginLeft: '10px',
+                                                        }}
                                                     >
-                                                        {getButtonNameWithDownPointer("Custom Selection")}
+                                                        {getButtonNameWithDownPointer(
+                                                            'Custom Selection'
+                                                        )}
                                                     </button>
                                                 </DefaultTooltip>
                                             </>
                                         )}
-                                        {this.enableAddChartInTabs.includes(this.store.currentTab) && (
+                                        {this.enableAddChartInTabs.includes(
+                                            this.store.currentTab
+                                        ) && (
                                             <AddChartButton
-                                                buttonText={this.addChartButtonText}
+                                                buttonText={
+                                                    this.addChartButtonText
+                                                }
                                                 store={this.store}
-                                                currentTab={this.store.currentTab}
+                                                currentTab={
+                                                    this.store.currentTab
+                                                }
                                                 addChartOverlayClassName="studyViewAddChartOverlay"
                                                 disableCustomTab={
-                                                    this.store.currentTab === StudyViewPageTabKeyEnum.CLINICAL_DATA
+                                                    this.store.currentTab ===
+                                                    StudyViewPageTabKeyEnum.CLINICAL_DATA
                                                 }
                                                 showResetPopup={() => {
                                                     this.showReturnToDefaultChartListModal = true;
@@ -435,26 +591,36 @@ export default class StudyViewPage extends React.Component<IStudyViewPageProps,
                                         )}
 
                                         <Modal
-                                            bsSize={"small"}
-                                            show={this.showReturnToDefaultChartListModal}
+                                            bsSize={'small'}
+                                            show={
+                                                this
+                                                    .showReturnToDefaultChartListModal
+                                            }
                                             onHide={() => {
                                                 this.showReturnToDefaultChartListModal = false;
                                             }}
                                             keyboard
                                         >
                                             <Modal.Header closeButton>
-                                                <Modal.Title>Reset charts</Modal.Title>
+                                                <Modal.Title>
+                                                    Reset charts
+                                                </Modal.Title>
                                             </Modal.Header>
                                             <Modal.Body>
                                                 <div>
-                                                    Please confirm that you would like to replace the current charts
-                                                    with the default list.
+                                                    Please confirm that you
+                                                    would like to replace the
+                                                    current charts with the
+                                                    default list.
                                                 </div>
                                             </Modal.Body>
                                             <Modal.Footer>
                                                 <button
                                                     className="btn btn-primary btn-sm"
-                                                    style={{ marginTop: "10px", marginBottom: "0" }}
+                                                    style={{
+                                                        marginTop: '10px',
+                                                        marginBottom: '0',
+                                                    }}
                                                     onClick={() => {
                                                         this.store.resetToDefaultSettings();
                                                         this.showReturnToDefaultChartListModal = false;
@@ -464,7 +630,10 @@ export default class StudyViewPage extends React.Component<IStudyViewPageProps,
                                                 </button>
                                                 <button
                                                     className="btn btn-primary btn-sm"
-                                                    style={{ marginTop: "10px", marginBottom: "0" }}
+                                                    style={{
+                                                        marginTop: '10px',
+                                                        marginBottom: '0',
+                                                    }}
                                                     onClick={() => {
                                                         this.showReturnToDefaultChartListModal = false;
                                                     }}
@@ -474,7 +643,8 @@ export default class StudyViewPage extends React.Component<IStudyViewPageProps,
                                             </Modal.Footer>
                                         </Modal>
 
-                                        {ServerConfigHelpers.sessionServiceIsEnabled() && this.groupsButton}
+                                        {ServerConfigHelpers.sessionServiceIsEnabled() &&
+                                            this.groupsButton}
                                     </div>
                                 </div>
                             </div>
@@ -491,7 +661,11 @@ export default class StudyViewPage extends React.Component<IStudyViewPageProps,
 
     render() {
         return (
-            <PageLayout noMargin={true} hideFooter={true} className={"subhead-dark"}>
+            <PageLayout
+                noMargin={true}
+                hideFooter={true}
+                className={'subhead-dark'}
+            >
                 {this.content()}
             </PageLayout>
         );
diff --git a/src/pages/studyView/StudyViewPageStore.ts b/src/pages/studyView/StudyViewPageStore.ts
index 708c82746f2..1dce27ca2eb 100644
--- a/src/pages/studyView/StudyViewPageStore.ts
+++ b/src/pages/studyView/StudyViewPageStore.ts
@@ -1,9 +1,16 @@
 import * as _ from 'lodash';
-import AppConfig from "appConfig";
-import internalClient from "shared/api/cbioportalInternalClientInstance";
-import defaultClient from "shared/api/cbioportalClientInstance";
-import oncoKBClient from "shared/api/oncokbClientInstance";
-import {action, computed, IReactionDisposer, observable, reaction, toJS} from "mobx";
+import AppConfig from 'appConfig';
+import internalClient from 'shared/api/cbioportalInternalClientInstance';
+import defaultClient from 'shared/api/cbioportalClientInstance';
+import oncoKBClient from 'shared/api/oncokbClientInstance';
+import {
+    action,
+    computed,
+    IReactionDisposer,
+    observable,
+    reaction,
+    toJS,
+} from 'mobx';
 import {
     ClinicalDataBinCountFilter,
     ClinicalDataBinFilter,
@@ -18,7 +25,7 @@ import {
     SampleIdentifier,
     StudyViewFilter,
     ClinicalDataFilterValue,
-    GeneFilter
+    GeneFilter,
 } from 'shared/api/generated/CBioPortalAPIInternal';
 import {
     CancerStudy,
@@ -31,11 +38,11 @@ import {
     GenePanel,
     MolecularProfile,
     MolecularProfileFilter,
-    Patient
+    Patient,
 } from 'shared/api/generated/CBioPortalAPI';
-import {fetchCopyNumberSegmentsForSamples} from "shared/lib/StoreUtils";
-import {PatientSurvival} from 'shared/model/PatientSurvival';
-import {getPatientSurvivals} from 'pages/resultsView/SurvivalStoreHelper';
+import { fetchCopyNumberSegmentsForSamples } from 'shared/lib/StoreUtils';
+import { PatientSurvival } from 'shared/model/PatientSurvival';
+import { getPatientSurvivals } from 'pages/resultsView/SurvivalStoreHelper';
 import {
     AnalysisGroup,
     calculateLayout,
@@ -69,7 +76,8 @@ import {
     showOriginStudiesInSummaryDescription,
     SPECIAL_CHARTS,
     StudyWithSamples,
-    submitToPage, ChartMetaWithDimensionAndChartType,
+    submitToPage,
+    ChartMetaWithDimensionAndChartType,
     UniqueKey,
     getChartSettingsMap,
     getGroupsFromBins,
@@ -82,147 +90,156 @@ import {
     getMolecularProfileIdsFromUniqueKey,
 } from './StudyViewUtils';
 import MobxPromise from 'mobxpromise';
-import {SingleGeneQuery} from 'shared/lib/oql/oql-parser';
-import autobind from "autobind-decorator";
-import {updateGeneQuery} from 'pages/studyView/StudyViewUtils';
-import {generateDownloadFilenamePrefixByStudies} from "shared/lib/FilenameUtils";
-import {unparseOQLQueryLine} from 'shared/lib/oql/oqlfilter';
-import sessionServiceClient from "shared/api//sessionServiceInstance";
-import {VirtualStudy} from 'shared/model/VirtualStudy';
+import { SingleGeneQuery } from 'shared/lib/oql/oql-parser';
+import autobind from 'autobind-decorator';
+import { updateGeneQuery } from 'pages/studyView/StudyViewUtils';
+import { generateDownloadFilenamePrefixByStudies } from 'shared/lib/FilenameUtils';
+import { unparseOQLQueryLine } from 'shared/lib/oql/oqlfilter';
+import sessionServiceClient from 'shared/api//sessionServiceInstance';
+import { VirtualStudy } from 'shared/model/VirtualStudy';
 import windowStore from 'shared/components/window/WindowStore';
-import {getHeatmapMeta} from "../../shared/lib/MDACCUtils";
-import {ChartDimension, ChartTypeEnum, STUDY_VIEW_CONFIG, StudyViewLayout} from "./StudyViewConfig";
+import { getHeatmapMeta } from '../../shared/lib/MDACCUtils';
+import {
+    ChartDimension,
+    ChartTypeEnum,
+    STUDY_VIEW_CONFIG,
+    StudyViewLayout,
+} from './StudyViewConfig';
 import {
     getComparisonLoadingUrl,
     getMDAndersonHeatmapStudyMetaUrl,
     getStudyDownloadListUrl,
-    redirectToComparisonPage
-} from "../../shared/api/urls";
-import onMobxPromise from "../../shared/lib/onMobxPromise";
+    redirectToComparisonPage,
+} from '../../shared/api/urls';
+import onMobxPromise from '../../shared/lib/onMobxPromise';
 import request from 'superagent';
-import {trackStudyViewFilterEvent} from "../../shared/lib/tracking";
-import {SessionGroupData} from "../../shared/api/ComparisonGroupClient";
-import comparisonClient from "../../shared/api/comparisonGroupClientInstance";
+import { trackStudyViewFilterEvent } from '../../shared/lib/tracking';
+import { SessionGroupData } from '../../shared/api/ComparisonGroupClient';
+import comparisonClient from '../../shared/api/comparisonGroupClientInstance';
 import {
     finalizeStudiesAttr,
-    getSampleIdentifiers, MAX_GROUPS_IN_SESSION,
+    getSampleIdentifiers,
+    MAX_GROUPS_IN_SESSION,
     StudyViewComparisonGroup,
-    splitData
-} from "../groupComparison/GroupComparisonUtils";
-import client from "../../shared/api/cbioportalClientInstance";
-import {LoadingPhase} from "../groupComparison/GroupComparisonLoading";
-import {sleepUntil} from "../../shared/lib/TimeUtils";
-import ComplexKeyMap from "../../shared/lib/complexKeyDataStructures/ComplexKeyMap";
-import MobxPromiseCache from "shared/lib/MobxPromiseCache";
+    splitData,
+} from '../groupComparison/GroupComparisonUtils';
+import client from '../../shared/api/cbioportalClientInstance';
+import { LoadingPhase } from '../groupComparison/GroupComparisonLoading';
+import { sleepUntil } from '../../shared/lib/TimeUtils';
+import ComplexKeyMap from '../../shared/lib/complexKeyDataStructures/ComplexKeyMap';
+import MobxPromiseCache from 'shared/lib/MobxPromiseCache';
 import {
     DataType as DownloadDataType,
     CancerGene,
     OncoKbGene,
     remoteData,
-    stringListToSet
-} from "cbioportal-frontend-commons";
+    stringListToSet,
+} from 'cbioportal-frontend-commons';
 
 import { AppStore } from 'AppStore';
-import {
-    getGeneCNAOQL
-} from "pages/studyView/TableUtils";
+import { getGeneCNAOQL } from 'pages/studyView/TableUtils';
 import { GeneTableRow } from './table/GeneTable';
-import { getSelectedGroups, getGroupParameters } from '../groupComparison/comparisonGroupManager/ComparisonGroupManagerUtils';
+import {
+    getSelectedGroups,
+    getGroupParameters,
+} from '../groupComparison/comparisonGroupManager/ComparisonGroupManagerUtils';
 import { IStudyViewScatterPlotData } from './charts/scatterPlot/StudyViewScatterPlotUtils';
-import { StudyViewPageTabKeyEnum } from "pages/studyView/StudyViewPageTabs";
+import { StudyViewPageTabKeyEnum } from 'pages/studyView/StudyViewPageTabs';
 
 export type ChartUserSetting = {
-    id: string,
-    name?: string,
-    chartType?: ChartType,
-    groups?: CustomGroup[], //used when it is custom chart
+    id: string;
+    name?: string;
+    chartType?: ChartType;
+    groups?: CustomGroup[]; //used when it is custom chart
     layout?: {
-        x: number,
-        y: number,
+        x: number;
+        y: number;
         w: number;
         h: number;
-    },
-    patientAttribute: boolean,
-    filterByCancerGenes?: boolean,
-    customBins?: number[],
-    disableLogScale?: boolean
-}
+    };
+    patientAttribute: boolean;
+    filterByCancerGenes?: boolean;
+    customBins?: number[];
+    disableLogScale?: boolean;
+};
 
 export type StudyPageSettings = {
-    chartSettings:ChartUserSetting[],
-    origin:string[]
-}
+    chartSettings: ChartUserSetting[];
+    origin: string[];
+};
 
 export type StudyViewPageTabKey =
-    StudyViewPageTabKeyEnum.CLINICAL_DATA | StudyViewPageTabKeyEnum.SUMMARY | StudyViewPageTabKeyEnum.HEATMAPS |
-    StudyViewPageTabKeyEnum.CN_SEGMENTS;
+    | StudyViewPageTabKeyEnum.CLINICAL_DATA
+    | StudyViewPageTabKeyEnum.SUMMARY
+    | StudyViewPageTabKeyEnum.HEATMAPS
+    | StudyViewPageTabKeyEnum.CN_SEGMENTS;
 
 export enum StudyViewPageTabDescriptions {
     SUMMARY = 'Summary',
     CLINICAL_DATA = 'Clinical Data',
     HEATMAPS = 'Heatmaps',
-    CN_SEGMENTS = 'CN Segments'
+    CN_SEGMENTS = 'CN Segments',
 }
 
 const DEFAULT_CHART_NAME = 'Custom Chart';
 
 export const MUTATION_COUNT = 'MUTATION_COUNT';
 export const FRACTION_GENOME_ALTERED = 'FRACTION_GENOME_ALTERED';
-export const OS_STATUS = "OS_STATUS";
-export const OS_MONTHS = "OS_MONTHS";
-export const DFS_STATUS = "DFS_STATUS";
-export const DFS_MONTHS = "DFS_MONTHS";
+export const OS_STATUS = 'OS_STATUS';
+export const OS_MONTHS = 'OS_MONTHS';
+export const DFS_STATUS = 'DFS_STATUS';
+export const DFS_MONTHS = 'DFS_MONTHS';
 
-export const SELECTED_ANALYSIS_GROUP_VALUE = "Selected";
-export const UNSELECTED_ANALYSIS_GROUP_VALUE = "Unselected";
+export const SELECTED_ANALYSIS_GROUP_VALUE = 'Selected';
+export const UNSELECTED_ANALYSIS_GROUP_VALUE = 'Unselected';
 
 export type SurvivalType = {
-    id: string,
-    title: string,
-    associatedAttrs: ['OS_STATUS', 'OS_MONTHS'] | ['DFS_STATUS', 'DFS_MONTHS'],
-    filter: string[],
-    survivalData: PatientSurvival[]
-}
+    id: string;
+    title: string;
+    associatedAttrs: ['OS_STATUS', 'OS_MONTHS'] | ['DFS_STATUS', 'DFS_MONTHS'];
+    filter: string[];
+    survivalData: PatientSurvival[];
+};
 
 export type StudyViewURLQuery = {
-    tab?: StudyViewPageTabKeyEnum,
-    id?: string,
-    studyId?: string,
-    cancer_study_id?: string,
-    filters?: string,
-    filterAttributeId?: string,
-    filterValues?: string
-}
+    tab?: StudyViewPageTabKeyEnum;
+    id?: string;
+    studyId?: string;
+    cancer_study_id?: string;
+    filters?: string;
+    filterAttributeId?: string;
+    filterValues?: string;
+};
 
 export type CustomGroup = {
-    name: string,
-    sampleIdentifiers: CustomChartIdentifier[]
-}
+    name: string;
+    sampleIdentifiers: CustomChartIdentifier[];
+};
 
 export type CustomChart = {
-    name?: string,
-    patientAttribute: boolean,
-    groups: CustomGroup[]
-}
+    name?: string;
+    patientAttribute: boolean;
+    groups: CustomGroup[];
+};
 
-export const DataBinMethodConstants: {[key: string]: 'DYNAMIC' | 'STATIC'}= {
+export const DataBinMethodConstants: { [key: string]: 'DYNAMIC' | 'STATIC' } = {
     STATIC: 'STATIC',
-    DYNAMIC: 'DYNAMIC'
+    DYNAMIC: 'DYNAMIC',
 };
 
 export type CustomChartIdentifier = {
-    studyId: string,
-    sampleId: string,
-    patientId: string
-}
+    studyId: string;
+    sampleId: string;
+    patientId: string;
+};
 
 export type CustomChartIdentifierWithValue = CustomChartIdentifier & {
-    value: string
-}
+    value: string;
+};
 
 export type StatusMessage = {
-    status: 'success' | 'warning' | 'danger' | 'info',
-    message: string
+    status: 'success' | 'warning' | 'danger' | 'info';
+    message: string;
 };
 
 export type OncokbCancerGene = {
@@ -233,64 +250,102 @@ export type OncokbCancerGene = {
 };
 
 export class StudyViewPageStore {
-    private reactionDisposers:IReactionDisposer[] = [];
-
-    constructor(private appStore: AppStore, private sessionServiceIsEnabled: boolean) {
-        this.reactionDisposers.push(reaction(() => this.loadingInitialDataForSummaryTab, () => {
-            if (!this.loadingInitialDataForSummaryTab) {
-                this.updateChartStats();
-                this.loadUserSettings();
-            }
-        }));
-
-        this.reactionDisposers.push(reaction(() => [this.visibleAttributes, this.columns, this.chartsDimension.toJS(), this.chartsType.toJS()], () => {
-            this.updateLayout();
-        }));
-
-        this.reactionDisposers.push(reaction(() => toJS(this.currentChartSettingsMap), () => {
-            if(this.isSavingUserSettingsPossible){
-                if (!this.hideRestoreSettingsMsg) {
-                    // hide restore message if its already shown
-                    // this is because the user setting session is going to be updated for every operation once the user is logged in
-                    this.hideRestoreSettingsMsg = true;
+    private reactionDisposers: IReactionDisposer[] = [];
+
+    constructor(
+        private appStore: AppStore,
+        private sessionServiceIsEnabled: boolean
+    ) {
+        this.reactionDisposers.push(
+            reaction(
+                () => this.loadingInitialDataForSummaryTab,
+                () => {
+                    if (!this.loadingInitialDataForSummaryTab) {
+                        this.updateChartStats();
+                        this.loadUserSettings();
+                    }
                 }
-                this.updateUserSettingsDebounce();
-            }
-        }));
+            )
+        );
 
-        this.reactionDisposers.push(reaction(() => this.fetchUserSettings.isComplete, (isComplete) => {
-            //execute if user log in from study page
-            if (isComplete && this.isSavingUserPreferencePossible && !this._loadUserSettingsInitially) {
-                this.previousSettings = this.currentChartSettingsMap;
-                this.loadUserSettings();
-            }
-        }));
+        this.reactionDisposers.push(
+            reaction(
+                () => [
+                    this.visibleAttributes,
+                    this.columns,
+                    this.chartsDimension.toJS(),
+                    this.chartsType.toJS(),
+                ],
+                () => {
+                    this.updateLayout();
+                }
+            )
+        );
+
+        this.reactionDisposers.push(
+            reaction(
+                () => toJS(this.currentChartSettingsMap),
+                () => {
+                    if (this.isSavingUserSettingsPossible) {
+                        if (!this.hideRestoreSettingsMsg) {
+                            // hide restore message if its already shown
+                            // this is because the user setting session is going to be updated for every operation once the user is logged in
+                            this.hideRestoreSettingsMsg = true;
+                        }
+                        this.updateUserSettingsDebounce();
+                    }
+                }
+            )
+        );
+
+        this.reactionDisposers.push(
+            reaction(
+                () => this.fetchUserSettings.isComplete,
+                isComplete => {
+                    //execute if user log in from study page
+                    if (
+                        isComplete &&
+                        this.isSavingUserPreferencePossible &&
+                        !this._loadUserSettingsInitially
+                    ) {
+                        this.previousSettings = this.currentChartSettingsMap;
+                        this.loadUserSettings();
+                    }
+                }
+            )
+        );
 
         // Include special charts into custom charts list
-       SPECIAL_CHARTS.forEach((chartMeta:ChartMetaWithDimensionAndChartType) => {
-           const uniqueKey = chartMeta.uniqueKey;
-           if (!this.chartsType.has(uniqueKey)) {
-               this.chartsType.set(uniqueKey, chartMeta.chartType);
-           }
-           const chartType = this.chartsType.get(uniqueKey);
-           if (chartType !== undefined) {
-               this._customCharts.set(uniqueKey, {
-                   displayName: chartMeta.displayName,
-                   uniqueKey: uniqueKey,
-                   dataType: getChartMetaDataType(uniqueKey),
-                   patientAttribute: chartMeta.patientAttribute,
-                   description: chartMeta.description,
-                   renderWhenDataChange: false,
-                   priority: STUDY_VIEW_CONFIG.priority[uniqueKey] || chartMeta.priority
-               });
-               this.chartsType.set(uniqueKey, chartMeta.chartType);
-               this.chartsDimension.set(uniqueKey, chartMeta.dimension);
-
-               if (uniqueKey === UniqueKey.CANCER_STUDIES) {
-                   this.customChartsPromises[uniqueKey] = this.cancerStudiesData;
-               }
-           }
-       });
+        SPECIAL_CHARTS.forEach(
+            (chartMeta: ChartMetaWithDimensionAndChartType) => {
+                const uniqueKey = chartMeta.uniqueKey;
+                if (!this.chartsType.has(uniqueKey)) {
+                    this.chartsType.set(uniqueKey, chartMeta.chartType);
+                }
+                const chartType = this.chartsType.get(uniqueKey);
+                if (chartType !== undefined) {
+                    this._customCharts.set(uniqueKey, {
+                        displayName: chartMeta.displayName,
+                        uniqueKey: uniqueKey,
+                        dataType: getChartMetaDataType(uniqueKey),
+                        patientAttribute: chartMeta.patientAttribute,
+                        description: chartMeta.description,
+                        renderWhenDataChange: false,
+                        priority:
+                            STUDY_VIEW_CONFIG.priority[uniqueKey] ||
+                            chartMeta.priority,
+                    });
+                    this.chartsType.set(uniqueKey, chartMeta.chartType);
+                    this.chartsDimension.set(uniqueKey, chartMeta.dimension);
+
+                    if (uniqueKey === UniqueKey.CANCER_STUDIES) {
+                        this.customChartsPromises[
+                            uniqueKey
+                        ] = this.cancerStudiesData;
+                    }
+                }
+            }
+        );
     }
 
     @computed get isLoggedIn() {
@@ -313,33 +368,49 @@ export class StudyViewPageStore {
         }
     }
 
-    @observable.ref private _comparisonConfirmationModal:JSX.Element|null = null;
+    @observable.ref
+    private _comparisonConfirmationModal: JSX.Element | null = null;
     public get comparisonConfirmationModal() {
         return this._comparisonConfirmationModal;
     }
     @autobind
     @action
-    public setComparisonConfirmationModal(getModal:((hideModal:()=>void)=>JSX.Element)) {
-        this._comparisonConfirmationModal = getModal(()=>{this._comparisonConfirmationModal = null; });
+    public setComparisonConfirmationModal(
+        getModal: (hideModal: () => void) => JSX.Element
+    ) {
+        this._comparisonConfirmationModal = getModal(() => {
+            this._comparisonConfirmationModal = null;
+        });
     }
 
     // <comparison groups code>
     private _selectedComparisonGroups = observable.shallowMap<boolean>();
-    private _comparisonGroupsMarkedForDeletion = observable.shallowMap<boolean>();
+    private _comparisonGroupsMarkedForDeletion = observable.shallowMap<
+        boolean
+    >();
 
-    @action public setComparisonGroupSelected(groupId:string, selected=true) {
+    @action public setComparisonGroupSelected(
+        groupId: string,
+        selected = true
+    ) {
         this._selectedComparisonGroups.set(groupId, selected);
     }
 
-    @action public toggleComparisonGroupSelected(groupId:string) {
-        this.setComparisonGroupSelected(groupId, !this.isComparisonGroupSelected(groupId));
+    @action public toggleComparisonGroupSelected(groupId: string) {
+        this.setComparisonGroupSelected(
+            groupId,
+            !this.isComparisonGroupSelected(groupId)
+        );
     }
 
-    @action public toggleComparisonGroupMarkedForDeletion(groupId:string) {
-        this._comparisonGroupsMarkedForDeletion.set(groupId, !this.isComparisonGroupMarkedForDeletion(groupId));
+    @action public toggleComparisonGroupMarkedForDeletion(groupId: string) {
+        this._comparisonGroupsMarkedForDeletion.set(
+            groupId,
+            !this.isComparisonGroupMarkedForDeletion(groupId)
+        );
     }
 
-    public isComparisonGroupSelected(groupId:string):boolean {
+    public isComparisonGroupSelected(groupId: string): boolean {
         if (this.isComparisonGroupMarkedForDeletion(groupId)) {
             return false; // if marked for deletion, its not selected
         } else if (!this._selectedComparisonGroups.has(groupId)) {
@@ -350,7 +421,7 @@ export class StudyViewPageStore {
         }
     }
 
-    public isComparisonGroupMarkedForDeletion(groupId:string):boolean {
+    public isComparisonGroupMarkedForDeletion(groupId: string): boolean {
         if (!this._comparisonGroupsMarkedForDeletion.has(groupId)) {
             return false; // default to no
         } else {
@@ -360,16 +431,13 @@ export class StudyViewPageStore {
     }
 
     @action public markSelectedGroupsForDeletion() {
-        onMobxPromise(
-            this.comparisonGroups,
-            groups=>{
-                for (const group of groups) {
-                    if (this.isComparisonGroupSelected(group.uid)) {
-                        this.toggleComparisonGroupMarkedForDeletion(group.uid);
-                    }
+        onMobxPromise(this.comparisonGroups, groups => {
+            for (const group of groups) {
+                if (this.isComparisonGroupSelected(group.uid)) {
+                    this.toggleComparisonGroupMarkedForDeletion(group.uid);
                 }
             }
-        );
+        });
     }
 
     @action public async deleteMarkedComparisonGroups() {
@@ -386,17 +454,25 @@ export class StudyViewPageStore {
     }
 
     readonly comparisonGroups = remoteData<StudyViewComparisonGroup[]>({
-        await:()=>[this.sampleSet],
-        invoke:async()=>{
+        await: () => [this.sampleSet],
+        invoke: async () => {
             // reference this so its responsive to changes
             this._comparisonGroupsChangeCount;
             if (this.studyIds.length > 0) {
-                const groups = await comparisonClient.getGroupsForStudies(this.studyIds.slice()); // slice because cant pass mobx
-                return groups.map(group=>Object.assign(group.data, { uid: group.id }, finalizeStudiesAttr(group.data, this.sampleSet.result!)));
+                const groups = await comparisonClient.getGroupsForStudies(
+                    this.studyIds.slice()
+                ); // slice because cant pass mobx
+                return groups.map(group =>
+                    Object.assign(
+                        group.data,
+                        { uid: group.id },
+                        finalizeStudiesAttr(group.data, this.sampleSet.result!)
+                    )
+                );
             } else {
                 return [];
             }
-        }
+        },
     });
 
     @observable private _comparisonGroupsChangeCount = 0;
@@ -405,22 +481,37 @@ export class StudyViewPageStore {
     }
 
     private async createNumberAttributeComparisonSession(
-        clinicalAttribute:ClinicalAttribute,
+        clinicalAttribute: ClinicalAttribute,
         categorizationType: NumericalGroupComparisonType,
-        statusCallback:(phase:LoadingPhase)=>void
+        statusCallback: (phase: LoadingPhase) => void
     ) {
         statusCallback(LoadingPhase.DOWNLOADING_GROUPS);
-        return new Promise<string>((resolve)=>{
-            onMobxPromise<any>([this.selectedSamples, this.clinicalDataBinPromises[getUniqueKey(clinicalAttribute)]],
-                async (selectedSamples:Sample[], dataBins:DataBin[])=>{
+        return new Promise<string>(resolve => {
+            onMobxPromise<any>(
+                [
+                    this.selectedSamples,
+                    this.clinicalDataBinPromises[
+                        getUniqueKey(clinicalAttribute)
+                    ],
+                ],
+                async (selectedSamples: Sample[], dataBins: DataBin[]) => {
                     // get clinical data for the given attribute
-                    const entityIdKey = clinicalAttribute.patientAttribute ? "patientId" : "sampleId";
+                    const entityIdKey = clinicalAttribute.patientAttribute
+                        ? 'patientId'
+                        : 'sampleId';
                     let data = await client.fetchClinicalDataUsingPOST({
-                        clinicalDataType: clinicalAttribute.patientAttribute ? ClinicalDataTypeEnum.PATIENT : ClinicalDataTypeEnum.SAMPLE,
+                        clinicalDataType: clinicalAttribute.patientAttribute
+                            ? ClinicalDataTypeEnum.PATIENT
+                            : ClinicalDataTypeEnum.SAMPLE,
                         clinicalDataMultiStudyFilter: {
-                            attributeIds: [clinicalAttribute.clinicalAttributeId],
-                            identifiers: selectedSamples.map(s=>({ studyId: s.studyId, entityId: s[entityIdKey] }))
-                        }
+                            attributeIds: [
+                                clinicalAttribute.clinicalAttributeId,
+                            ],
+                            identifiers: selectedSamples.map(s => ({
+                                studyId: s.studyId,
+                                entityId: s[entityIdKey],
+                            })),
+                        },
                     });
 
                     let groups: SessionGroupData[] = [];
@@ -428,26 +519,42 @@ export class StudyViewPageStore {
 
                     switch (categorizationType) {
                         case NumericalGroupComparisonType.BINS:
-                            groups = getGroupsFromBins(selectedSamples, clinicalAttribute.patientAttribute, data, dataBins, this.studyIds);
-                            clinicalAttributeName = `Bins of ${clinicalAttribute.displayName}`
+                            groups = getGroupsFromBins(
+                                selectedSamples,
+                                clinicalAttribute.patientAttribute,
+                                data,
+                                dataBins,
+                                this.studyIds
+                            );
+                            clinicalAttributeName = `Bins of ${clinicalAttribute.displayName}`;
                             break;
                         case NumericalGroupComparisonType.MEDIAN:
-                            groups = getGroupsFromQuartiles(selectedSamples, clinicalAttribute.patientAttribute, splitData(data,2), this.studyIds);
+                            groups = getGroupsFromQuartiles(
+                                selectedSamples,
+                                clinicalAttribute.patientAttribute,
+                                splitData(data, 2),
+                                this.studyIds
+                            );
                             clinicalAttributeName = `Median of ${clinicalAttribute.displayName}`;
                             break;
                         case NumericalGroupComparisonType.QUARTILES:
                         default:
-                            groups = getGroupsFromQuartiles(selectedSamples, clinicalAttribute.patientAttribute, splitData(data,4), this.studyIds);
+                            groups = getGroupsFromQuartiles(
+                                selectedSamples,
+                                clinicalAttribute.patientAttribute,
+                                splitData(data, 4),
+                                this.studyIds
+                            );
                             clinicalAttributeName = `Quartiles of ${clinicalAttribute.displayName}`;
                     }
 
                     statusCallback(LoadingPhase.CREATING_SESSION);
                     // create session and get id
-                    const {id} = await comparisonClient.addComparisonSession({
+                    const { id } = await comparisonClient.addComparisonSession({
                         groups,
                         clinicalAttributeName,
-                        origin:this.studyIds,
-                        groupNameOrder: groups.map(g=>g.name)
+                        origin: this.studyIds,
+                        groupNameOrder: groups.map(g => g.name),
                     });
                     return resolve(id);
                 }
@@ -462,79 +569,135 @@ export class StudyViewPageStore {
     ) {
         statusCallback(LoadingPhase.DOWNLOADING_GROUPS);
 
-        const promises: any = [this.selectedSamples]
+        const promises: any = [this.selectedSamples];
         if (chartMeta.uniqueKey === UniqueKey.WITH_MUTATION_DATA) {
-            promises.push(this.mutationAsClinicalData)
+            promises.push(this.mutationAsClinicalData);
         } else if (chartMeta.uniqueKey === UniqueKey.WITH_CNA_DATA) {
-            promises.push(this.cnaAsClinicalData)
+            promises.push(this.cnaAsClinicalData);
         } else if (chartMeta.uniqueKey === UniqueKey.CANCER_STUDIES) {
-            promises.push(this.cancerStudyAsClinicalData)
+            promises.push(this.cancerStudyAsClinicalData);
         }
 
         return new Promise<string>(resolve => {
-            onMobxPromise<any>(promises,
-                async (selectedSamples: Sample[], clinicalDataList?: ClinicalData[]) => {
-
+            onMobxPromise<any>(
+                promises,
+                async (
+                    selectedSamples: Sample[],
+                    clinicalDataList?: ClinicalData[]
+                ) => {
                     let data: CustomChartIdentifierWithValue[] = [];
 
                     if (this.isCustomChart(chartMeta.uniqueKey)) {
                         if (clinicalDataList === undefined) {
                             //combine studyId and sampleId to create sample unique key
-                            const sampleKeyToData = _.keyBy(this._customChartsSelectedCases.get(chartMeta.uniqueKey), d => d.studyId + d.sampleId);
+                            const sampleKeyToData = _.keyBy(
+                                this._customChartsSelectedCases.get(
+                                    chartMeta.uniqueKey
+                                ),
+                                d => d.studyId + d.sampleId
+                            );
                             data = selectedSamples.map(sample => {
-                                const datum = sampleKeyToData[sample.studyId + sample.sampleId];
+                                const datum =
+                                    sampleKeyToData[
+                                        sample.studyId + sample.sampleId
+                                    ];
                                 return {
                                     sampleId: sample.sampleId,
                                     studyId: sample.studyId,
                                     value: datum ? datum.value : Datalabel.NA,
-                                } as CustomChartIdentifierWithValue
+                                } as CustomChartIdentifierWithValue;
                             });
                         } else {
-                            const selectedSampleByKey = _.keyBy(selectedSamples, (d: Sample) => d.uniqueSampleKey);
-                            data = _.filter(clinicalDataList, d => selectedSampleByKey[d.uniqueSampleKey] !== undefined);
+                            const selectedSampleByKey = _.keyBy(
+                                selectedSamples,
+                                (d: Sample) => d.uniqueSampleKey
+                            );
+                            data = _.filter(
+                                clinicalDataList,
+                                d =>
+                                    selectedSampleByKey[d.uniqueSampleKey] !==
+                                    undefined
+                            );
                         }
                     } else {
-
                         // get clinical data for the given attribute
-                        const isPatientAttribute = (chartMeta.clinicalAttribute && chartMeta.clinicalAttribute.patientAttribute) || false;
-                        const entityIdKey = (isPatientAttribute ? "patientId" : "sampleId")
+                        const isPatientAttribute =
+                            (chartMeta.clinicalAttribute &&
+                                chartMeta.clinicalAttribute.patientAttribute) ||
+                            false;
+                        const entityIdKey = isPatientAttribute
+                            ? 'patientId'
+                            : 'sampleId';
                         data = await client.fetchClinicalDataUsingPOST({
-                            clinicalDataType: isPatientAttribute ? "PATIENT" : "SAMPLE",
+                            clinicalDataType: isPatientAttribute
+                                ? 'PATIENT'
+                                : 'SAMPLE',
                             clinicalDataMultiStudyFilter: {
-                                attributeIds: [chartMeta.clinicalAttribute!.clinicalAttributeId],
-                                identifiers: selectedSamples.map(s => ({ studyId: s.studyId, entityId: s[entityIdKey] }))
-                            }
+                                attributeIds: [
+                                    chartMeta.clinicalAttribute!
+                                        .clinicalAttributeId,
+                                ],
+                                identifiers: selectedSamples.map(s => ({
+                                    studyId: s.studyId,
+                                    entityId: s[entityIdKey],
+                                })),
+                            },
                         });
 
                         if (isPatientAttribute) {
-                            const patientKeyToData = _.keyBy(data, (d: ClinicalData) => d.uniquePatientKey);
+                            const patientKeyToData = _.keyBy(
+                                data,
+                                (d: ClinicalData) => d.uniquePatientKey
+                            );
                             data = selectedSamples.map(sample => {
-                                const datum = patientKeyToData[sample.uniquePatientKey];
+                                const datum =
+                                    patientKeyToData[sample.uniquePatientKey];
                                 return {
                                     sampleId: sample.sampleId,
                                     studyId: sample.studyId,
                                     value: datum ? datum.value : Datalabel.NA,
-                                } as CustomChartIdentifierWithValue
-                            })
+                                } as CustomChartIdentifierWithValue;
+                            });
                         }
                     }
 
-                    const lcValueToSampleIdentifiers = _.groupBy(data, d => d.value.toLowerCase());
-                    const lcValueToColor = _.keyBy(clinicalAttributeValues, d => d.value.toLowerCase());
+                    const lcValueToSampleIdentifiers = _.groupBy(data, d =>
+                        d.value.toLowerCase()
+                    );
+                    const lcValueToColor = _.keyBy(clinicalAttributeValues, d =>
+                        d.value.toLowerCase()
+                    );
 
-                    const groups: SessionGroupData[] = _.chain(clinicalAttributeValues)
+                    const groups: SessionGroupData[] = _.chain(
+                        clinicalAttributeValues
+                    )
                         .sortBy(attrVal => -attrVal.count)
                         // do not slice for comparison on cancer studies chart
-                        .slice(0, chartMeta.uniqueKey === UniqueKey.CANCER_STUDIES ? undefined : MAX_GROUPS_IN_SESSION)
+                        .slice(
+                            0,
+                            chartMeta.uniqueKey === UniqueKey.CANCER_STUDIES
+                                ? undefined
+                                : MAX_GROUPS_IN_SESSION
+                        )
                         .filter(attrVal => {
                             const lcValue = attrVal.value.toLowerCase();
-                            const sampleIdentifiers = lcValueToSampleIdentifiers[lcValue];
-                            return sampleIdentifiers && sampleIdentifiers.length > 0
+                            const sampleIdentifiers =
+                                lcValueToSampleIdentifiers[lcValue];
+                            return (
+                                sampleIdentifiers &&
+                                sampleIdentifiers.length > 0
+                            );
                         })
                         .map(attrVal => {
                             const lcValue = attrVal.value.toLowerCase();
-                            const sampleIdentifiers = lcValueToSampleIdentifiers[lcValue];
-                            return getGroupParameters(attrVal.value, sampleIdentifiers, this.studyIds, lcValueToColor[lcValue].color);
+                            const sampleIdentifiers =
+                                lcValueToSampleIdentifiers[lcValue];
+                            return getGroupParameters(
+                                attrVal.value,
+                                sampleIdentifiers,
+                                this.studyIds,
+                                lcValueToColor[lcValue].color
+                            );
                         })
                         .value();
 
@@ -544,7 +707,7 @@ export class StudyViewPageStore {
                     const { id } = await comparisonClient.addComparisonSession({
                         groups,
                         clinicalAttributeName: chartMeta.displayName,
-                        origin: this.studyIds
+                        origin: this.studyIds,
                     });
                     return resolve(id);
                 }
@@ -553,24 +716,29 @@ export class StudyViewPageStore {
     }
 
     @autobind
-    public async openComparisonPage(params:{
-        chartMeta: ChartMeta,
-        categorizationType?: NumericalGroupComparisonType
-        clinicalAttributeValues?: ClinicalDataCountSummary[]
+    public async openComparisonPage(params: {
+        chartMeta: ChartMeta;
+        categorizationType?: NumericalGroupComparisonType;
+        clinicalAttributeValues?: ClinicalDataCountSummary[];
     }) {
-
         // open window before the first `await` call - this makes it a synchronous window.open,
         //  which doesnt trigger pop-up blockers. We'll send it to the correct url once we get the result
-        const comparisonWindow:any = window.open(getComparisonLoadingUrl({
-            phase: LoadingPhase.DOWNLOADING_GROUPS,
-            clinicalAttributeName: params.chartMeta.displayName,
-            origin: this.studyIds.join(",")
-        }), "_blank");
+        const comparisonWindow: any = window.open(
+            getComparisonLoadingUrl({
+                phase: LoadingPhase.DOWNLOADING_GROUPS,
+                clinicalAttributeName: params.chartMeta.displayName,
+                origin: this.studyIds.join(','),
+            }),
+            '_blank'
+        );
 
         // wait until the new window has routingStore available, or its closed
-        await sleepUntil(()=>{
-            return comparisonWindow.closed ||
-                (comparisonWindow.globalStores && comparisonWindow.globalStores.appStore.appReady);
+        await sleepUntil(() => {
+            return (
+                comparisonWindow.closed ||
+                (comparisonWindow.globalStores &&
+                    comparisonWindow.globalStores.appStore.appReady)
+            );
         });
 
         if (comparisonWindow.closed) {
@@ -580,7 +748,7 @@ export class StudyViewPageStore {
 
         // set up ping by which the new window can infer whether the study view window has been closed, and
         //  show an error accordingly
-        const pingInterval = setInterval(()=>{
+        const pingInterval = setInterval(() => {
             try {
                 if (!comparisonWindow.closed) {
                     comparisonWindow.ping();
@@ -591,30 +759,33 @@ export class StudyViewPageStore {
         }, 500);
 
         // save comparison session, and get id
-        let sessionId:string;
-        const statusCallback = (phase:LoadingPhase)=>{
+        let sessionId: string;
+        const statusCallback = (phase: LoadingPhase) => {
             if (!comparisonWindow.closed) {
-                comparisonWindow.routingStore.updateRoute({phase}, undefined, false);
+                comparisonWindow.routingStore.updateRoute(
+                    { phase },
+                    undefined,
+                    false
+                );
             }
         };
 
         switch (this.chartsType.get(params.chartMeta.uniqueKey)) {
             case ChartTypeEnum.PIE_CHART:
             case ChartTypeEnum.TABLE:
-                sessionId =
-                    await this.createCategoricalAttributeComparisonSession(
-                        params.chartMeta,
-                        params.clinicalAttributeValues!,
-                        statusCallback
-                    );
+                sessionId = await this.createCategoricalAttributeComparisonSession(
+                    params.chartMeta,
+                    params.clinicalAttributeValues!,
+                    statusCallback
+                );
                 break;
             default:
-                sessionId =
-                    await this.createNumberAttributeComparisonSession(
-                        params.chartMeta.clinicalAttribute!,
-                        params.categorizationType || NumericalGroupComparisonType.QUARTILES,
-                        statusCallback
-                    );
+                sessionId = await this.createNumberAttributeComparisonSession(
+                    params.chartMeta.clinicalAttribute!,
+                    params.categorizationType ||
+                        NumericalGroupComparisonType.QUARTILES,
+                    statusCallback
+                );
                 break;
         }
 
@@ -633,11 +804,17 @@ export class StudyViewPageStore {
 
     @observable private sampleIdentifiers: SampleIdentifier[] = [];
 
-    private _clinicalDataFilterSet = observable.shallowMap<ClinicalDataFilter>();
+    private _clinicalDataFilterSet = observable.shallowMap<
+        ClinicalDataFilter
+    >();
 
-    private _customBinsFromScatterPlotSelectionSet = observable.shallowMap<number[]>();
+    private _customBinsFromScatterPlotSelectionSet = observable.shallowMap<
+        number[]
+    >();
 
-    @observable private _clinicalDataBinFilterSet = observable.map<ClinicalDataBinFilter>();
+    @observable private _clinicalDataBinFilterSet = observable.map<
+        ClinicalDataBinFilter
+    >();
 
     @observable.ref private _geneFilterSet = observable.map<string[][]>();
 
@@ -660,49 +837,71 @@ export class StudyViewPageStore {
 
     private newlyAddedCharts = observable.array<string>();
 
-    private unfilteredClinicalDataCountCache: { [uniqueKey: string]: ClinicalDataCountItem } = {};
-    private unfilteredClinicalDataBinCountCache: { [uniqueKey: string]: DataBin[] } = {};
+    private unfilteredClinicalDataCountCache: {
+        [uniqueKey: string]: ClinicalDataCountItem;
+    } = {};
+    private unfilteredClinicalDataBinCountCache: {
+        [uniqueKey: string]: DataBin[];
+    } = {};
 
     @observable currentTab: StudyViewPageTabKey;
 
     @action
     updateCurrentTab(newTabId: StudyViewPageTabKey | undefined) {
-        this.currentTab = newTabId === undefined ? StudyViewPageTabKeyEnum.SUMMARY : newTabId;
+        this.currentTab =
+            newTabId === undefined ? StudyViewPageTabKeyEnum.SUMMARY : newTabId;
     }
 
     @observable pageStatusMessages: { [code: string]: StatusMessage } = {};
 
-    public isNewlyAdded(uniqueKey:string) {
+    public isNewlyAdded(uniqueKey: string) {
         return this.newlyAddedCharts.includes(uniqueKey);
     }
 
     @action
-    updateStoreByFilters(filters:Partial<StudyViewFilter>) {
-        if (_.isArray(filters.clinicalDataFilters) && filters.clinicalDataFilters.length > 0) {
+    updateStoreByFilters(filters: Partial<StudyViewFilter>) {
+        if (
+            _.isArray(filters.clinicalDataFilters) &&
+            filters.clinicalDataFilters.length > 0
+        ) {
             _.each(filters.clinicalDataFilters, filter => {
                 this._clinicalDataFilterSet.set(filter.attributeId, {
                     attributeId: filter.attributeId,
-                    values: _.reduce(filter.values, (acc, next) => {
-                        acc.push({
-                            end: next.end,
-                            start: next.start,
-                            value: next.value
-                        });
-                        return acc;
-                    }, [] as ClinicalDataFilterValue[])
+                    values: _.reduce(
+                        filter.values,
+                        (acc, next) => {
+                            acc.push({
+                                end: next.end,
+                                start: next.start,
+                                value: next.value,
+                            });
+                            return acc;
+                        },
+                        [] as ClinicalDataFilterValue[]
+                    ),
                 });
             });
         }
 
         if (_.isArray(filters.geneFilters) && filters.geneFilters.length > 0) {
             filters.geneFilters.forEach(geneFilter => {
-                const key = getUniqueKeyFromMolecularProfileIds(geneFilter.molecularProfileIds);
+                const key = getUniqueKeyFromMolecularProfileIds(
+                    geneFilter.molecularProfileIds
+                );
                 this._geneFilterSet.set(key, _.clone(geneFilter.geneQueries));
             });
         }
-        if (_.isArray(filters.sampleIdentifiers) && filters.sampleIdentifiers.length > 0) {
-            this.numberOfSelectedSamplesInCustomSelection = filters.sampleIdentifiers.length;
-            this.updateChartSampleIdentifierFilter(UniqueKey.CUSTOM_SELECT, filters.sampleIdentifiers, false);
+        if (
+            _.isArray(filters.sampleIdentifiers) &&
+            filters.sampleIdentifiers.length > 0
+        ) {
+            this.numberOfSelectedSamplesInCustomSelection =
+                filters.sampleIdentifiers.length;
+            this.updateChartSampleIdentifierFilter(
+                UniqueKey.CUSTOM_SELECT,
+                filters.sampleIdentifiers,
+                false
+            );
         }
 
         if (filters.withCNAData !== undefined) {
@@ -713,8 +912,12 @@ export class StudyViewPageStore {
 
         if (filters.withMutationData !== undefined) {
             this._withMutationDataFilter = filters.withMutationData;
-            const value = filters.withMutationData ? Datalabel.YES : Datalabel.NO;
-            this.customChartFilterSet.set(UniqueKey.WITH_MUTATION_DATA, [value]);
+            const value = filters.withMutationData
+                ? Datalabel.YES
+                : Datalabel.NO;
+            this.customChartFilterSet.set(UniqueKey.WITH_MUTATION_DATA, [
+                value,
+            ]);
         }
 
         if (filters.withFusionData !== undefined) {
@@ -723,14 +926,14 @@ export class StudyViewPageStore {
             this.customChartFilterSet.set(UniqueKey.WITH_FUSION_DATA, [value]);
         }
 
-        if(!_.isEqual(toJS(this.initialFiltersQuery), filters)) {
+        if (!_.isEqual(toJS(this.initialFiltersQuery), filters)) {
             this.initialFiltersQuery = filters;
         }
     }
 
     @action
     async updateStoreFromURL(query: StudyViewURLQuery) {
-        let studyIdsString:string = '';
+        let studyIdsString: string = '';
         let studyIds: string[] = [];
         if (query.studyId) {
             studyIdsString = query.studyId;
@@ -742,7 +945,7 @@ export class StudyViewPageStore {
             studyIdsString = query.id;
         }
         if (studyIdsString) {
-            studyIds = studyIdsString.trim().split(",");
+            studyIds = studyIdsString.trim().split(',');
             if (!_.isEqual(studyIds, toJS(this.studyIds))) {
                 // update if different
                 this.studyIds = studyIds;
@@ -753,38 +956,57 @@ export class StudyViewPageStore {
         let filters: Partial<StudyViewFilter> = {};
         if (query.filters) {
             try {
-                filters = JSON.parse(decodeURIComponent(query.filters)) as Partial<StudyViewFilter>;
+                filters = JSON.parse(
+                    decodeURIComponent(query.filters)
+                ) as Partial<StudyViewFilter>;
                 this.updateStoreByFilters(filters);
-            } catch (e) { }
+            } catch (e) {}
         } else if (query.filterAttributeId && query.filterValues) {
-            const clinicalAttributes = _.uniqBy(await defaultClient.fetchClinicalAttributesUsingPOST({
-                studyIds: studyIds
-            }), clinicalAttribute => `${clinicalAttribute.patientAttribute}-${clinicalAttribute.clinicalAttributeId}`);
+            const clinicalAttributes = _.uniqBy(
+                await defaultClient.fetchClinicalAttributesUsingPOST({
+                    studyIds: studyIds,
+                }),
+                clinicalAttribute =>
+                    `${clinicalAttribute.patientAttribute}-${clinicalAttribute.clinicalAttributeId}`
+            );
 
-            const matchedAttr = _.find(clinicalAttributes, (attr: ClinicalAttribute) => attr.clinicalAttributeId.toUpperCase() === query.filterAttributeId!.toUpperCase());
+            const matchedAttr = _.find(
+                clinicalAttributes,
+                (attr: ClinicalAttribute) =>
+                    attr.clinicalAttributeId.toUpperCase() ===
+                    query.filterAttributeId!.toUpperCase()
+            );
             if (matchedAttr !== undefined) {
                 if (matchedAttr.datatype == DataType.NUMBER) {
-                    filters.clinicalDataFilters = [{
-                        'attributeId': matchedAttr.clinicalAttributeId,
-                        'values': query.filterValues!.split(',').map(range => {
-                            const convertResult = range.split('-');
-                            return {
-                                start: Number(convertResult[0]),
-                                end: Number(convertResult[1]),
-                            } as ClinicalDataFilterValue
-                        })
-                    } as ClinicalDataFilter];
+                    filters.clinicalDataFilters = [
+                        {
+                            attributeId: matchedAttr.clinicalAttributeId,
+                            values: query
+                                .filterValues!.split(',')
+                                .map(range => {
+                                    const convertResult = range.split('-');
+                                    return {
+                                        start: Number(convertResult[0]),
+                                        end: Number(convertResult[1]),
+                                    } as ClinicalDataFilterValue;
+                                }),
+                        } as ClinicalDataFilter,
+                    ];
                 } else {
-                    filters.clinicalDataFilters = [{
-                        'attributeId': matchedAttr.clinicalAttributeId,
-                        'values': getClinicalEqualityFilterValuesByString(query.filterValues).map(value=>({value}))
-                    } as ClinicalDataFilter];
+                    filters.clinicalDataFilters = [
+                        {
+                            attributeId: matchedAttr.clinicalAttributeId,
+                            values: getClinicalEqualityFilterValuesByString(
+                                query.filterValues
+                            ).map(value => ({ value })),
+                        } as ClinicalDataFilter,
+                    ];
                 }
                 this.updateStoreByFilters(filters);
             } else {
                 this.pageStatusMessages['unknownClinicalAttribute'] = {
                     message: `The clinical attribute ${query.filterAttributeId} is not available for this study`,
-                    status: 'danger'
+                    status: 'danger',
                 };
             }
         }
@@ -799,7 +1021,11 @@ export class StudyViewPageStore {
             initialFilter.sampleIdentifiers = this.queriedSampleIdentifiers.result;
         }
 
-        const studyViewFilter: StudyViewFilter = Object.assign({}, toJS(this.initialFiltersQuery), initialFilter);
+        const studyViewFilter: StudyViewFilter = Object.assign(
+            {},
+            toJS(this.initialFiltersQuery),
+            initialFilter
+        );
         //studyViewFilter can only have studyIds or sampleIdentifiers
         if (!_.isEmpty(studyViewFilter.sampleIdentifiers)) {
             delete studyViewFilter.studyIds;
@@ -815,17 +1041,32 @@ export class StudyViewPageStore {
 
     @computed
     get containerWidth(): number {
-        return this.columns * STUDY_VIEW_CONFIG.layout.grid.w + (this.columns + 1) * STUDY_VIEW_CONFIG.layout.gridMargin.x;
+        return (
+            this.columns * STUDY_VIEW_CONFIG.layout.grid.w +
+            (this.columns + 1) * STUDY_VIEW_CONFIG.layout.gridMargin.x
+        );
     }
 
     @computed
     private get columns(): number {
-        return Math.floor((windowStore.size.width - 40) / (STUDY_VIEW_CONFIG.layout.grid.w + STUDY_VIEW_CONFIG.layout.gridMargin.x));
+        return Math.floor(
+            (windowStore.size.width - 40) /
+                (STUDY_VIEW_CONFIG.layout.grid.w +
+                    STUDY_VIEW_CONFIG.layout.gridMargin.x)
+        );
     }
 
-    @autobind @action
+    @autobind
+    @action
     private updateLayout() {
-        this.currentGridLayout = calculateLayout(this.visibleAttributes, this.columns, this.chartsDimension.toJS(), this.useCurrentGridLayout ? this.currentGridLayout : [], this.currentFocusedChartByUser, this.currentFocusedChartByUserDimension);
+        this.currentGridLayout = calculateLayout(
+            this.visibleAttributes,
+            this.columns,
+            this.chartsDimension.toJS(),
+            this.useCurrentGridLayout ? this.currentGridLayout : [],
+            this.currentFocusedChartByUser,
+            this.currentFocusedChartByUserDimension
+        );
         if (this.useCurrentGridLayout) {
             this.useCurrentGridLayout = false;
         }
@@ -839,11 +1080,12 @@ export class StudyViewPageStore {
             grid: STUDY_VIEW_CONFIG.layout.grid,
             gridMargin: STUDY_VIEW_CONFIG.layout.gridMargin,
             layout: this.currentGridLayout,
-            dimensions: STUDY_VIEW_CONFIG.layout.dimensions
+            dimensions: STUDY_VIEW_CONFIG.layout.dimensions,
         };
     }
 
-    @autobind @action
+    @autobind
+    @action
     updateCurrentGridLayout(newGridLayout: ReactGridLayout.Layout[]) {
         this.currentGridLayout = newGridLayout;
     }
@@ -853,50 +1095,74 @@ export class StudyViewPageStore {
 
     @observable.ref private currentGridLayout: ReactGridLayout.Layout[] = [];
     //@observable private currentGridLayoutUpdated = false;
-    @observable private previousSettings: { [id: string]: ChartUserSetting } = {};
+    @observable private previousSettings: {
+        [id: string]: ChartUserSetting;
+    } = {};
 
     private currentFocusedChartByUser: ChartMeta | undefined = undefined;
-    private currentFocusedChartByUserDimension: ChartDimension | undefined = undefined;
-
-    public clinicalDataBinPromises: { [id: string]: MobxPromise<DataBin[]> } = {};
-    public clinicalDataCountPromises: { [id: string]: MobxPromise<ClinicalDataCountSummary[]> } = {};
-    public customChartsPromises: { [id: string]: MobxPromise<ClinicalDataCountSummary[]> } = {};
-
-    private _chartSampleIdentifiersFilterSet =  observable.map<SampleIdentifier[]>();
-
-    public customChartFilterSet =  observable.map<string[]>();
+    private currentFocusedChartByUserDimension:
+        | ChartDimension
+        | undefined = undefined;
+
+    public clinicalDataBinPromises: {
+        [id: string]: MobxPromise<DataBin[]>;
+    } = {};
+    public clinicalDataCountPromises: {
+        [id: string]: MobxPromise<ClinicalDataCountSummary[]>;
+    } = {};
+    public customChartsPromises: {
+        [id: string]: MobxPromise<ClinicalDataCountSummary[]>;
+    } = {};
+
+    private _chartSampleIdentifiersFilterSet = observable.map<
+        SampleIdentifier[]
+    >();
+
+    public customChartFilterSet = observable.map<string[]>();
 
     @observable numberOfSelectedSamplesInCustomSelection: number = 0;
-    @observable _filterComparisonGroups:StudyViewComparisonGroup[] = [];
+    @observable _filterComparisonGroups: StudyViewComparisonGroup[] = [];
 
     @observable private _filterMutatedGenesTableByCancerGenes: boolean = true;
     @observable private _filterFusionGenesTableByCancerGenes: boolean = true;
     @observable private _filterCNAGenesTableByCancerGenes: boolean = true;
 
     @autobind
-    @action updateMutatedGenesTableByCancerGenesFilter(filtered: boolean) {
+    @action
+    updateMutatedGenesTableByCancerGenesFilter(filtered: boolean) {
         this._filterMutatedGenesTableByCancerGenes = filtered;
     }
     @autobind
-    @action updateFusionGenesTableByCancerGenesFilter(filtered: boolean) {
+    @action
+    updateFusionGenesTableByCancerGenesFilter(filtered: boolean) {
         this._filterFusionGenesTableByCancerGenes = filtered;
     }
 
     @autobind
-    @action updateCNAGenesTableByCancerGenesFilter(filtered: boolean) {
+    @action
+    updateCNAGenesTableByCancerGenesFilter(filtered: boolean) {
         this._filterCNAGenesTableByCancerGenes = filtered;
     }
 
     @computed get filterMutatedGenesTableByCancerGenes() {
-        return this.oncokbCancerGeneFilterEnabled && this._filterMutatedGenesTableByCancerGenes;
+        return (
+            this.oncokbCancerGeneFilterEnabled &&
+            this._filterMutatedGenesTableByCancerGenes
+        );
     }
 
     @computed get filterFusionGenesTableByCancerGenes() {
-        return this.oncokbCancerGeneFilterEnabled && this._filterFusionGenesTableByCancerGenes;
+        return (
+            this.oncokbCancerGeneFilterEnabled &&
+            this._filterFusionGenesTableByCancerGenes
+        );
     }
 
     @computed get filterCNAGenesTableByCancerGenes() {
-        return this.oncokbCancerGeneFilterEnabled && this._filterCNAGenesTableByCancerGenes;
+        return (
+            this.oncokbCancerGeneFilterEnabled &&
+            this._filterCNAGenesTableByCancerGenes
+        );
     }
 
     public get filterComparisonGroups() {
@@ -904,38 +1170,42 @@ export class StudyViewPageStore {
     }
 
     @action public updateComparisonGroupsFilter() {
-        onMobxPromise(
-            this.comparisonGroups,
-            comparisonGroups=>{
-                this._filterComparisonGroups = getSelectedGroups(comparisonGroups, this);
-                this.updateChartSampleIdentifierFilter(
-                    UniqueKey.SELECTED_COMPARISON_GROUPS,
-                    getSampleIdentifiers(
-                        this._filterComparisonGroups
-                    )
-                );
-            }
-        )
+        onMobxPromise(this.comparisonGroups, comparisonGroups => {
+            this._filterComparisonGroups = getSelectedGroups(
+                comparisonGroups,
+                this
+            );
+            this.updateChartSampleIdentifierFilter(
+                UniqueKey.SELECTED_COMPARISON_GROUPS,
+                getSampleIdentifiers(this._filterComparisonGroups)
+            );
+        });
     }
 
     //used in saving custom added charts
     @observable private _customChartMap = observable.shallowMap<CustomChart>();
     @observable private _customCharts = observable.shallowMap<ChartMeta>();
-    @observable private _customChartsSelectedCases = observable.shallowMap<CustomChartIdentifierWithValue[]>();
+    @observable private _customChartsSelectedCases = observable.shallowMap<
+        CustomChartIdentifierWithValue[]
+    >();
 
     @autobind
-    @action onCheckGene(hugoGeneSymbol: string) {
+    @action
+    onCheckGene(hugoGeneSymbol: string) {
         //only update geneQueryStr whenever a table gene is clicked.
         this.geneQueries = updateGeneQuery(this.geneQueries, hugoGeneSymbol);
-        this.geneQueryStr = this.geneQueries.map(query=>unparseOQLQueryLine(query)).join(' ');
+        this.geneQueryStr = this.geneQueries
+            .map(query => unparseOQLQueryLine(query))
+            .join(' ');
     }
 
     @computed get selectedGenes(): string[] {
-        return this.geneQueries.map(singleGeneQuery=>singleGeneQuery.gene);
+        return this.geneQueries.map(singleGeneQuery => singleGeneQuery.gene);
     }
 
     @autobind
-    @action updateSelectedGenes(query: SingleGeneQuery[], queryStr: string) {
+    @action
+    updateSelectedGenes(query: SingleGeneQuery[], queryStr: string) {
         this.geneQueries = query;
         this.geneQueryStr = queryStr;
     }
@@ -961,8 +1231,10 @@ export class StudyViewPageStore {
         let isSelected = !this._withMutationDataFilter;
         this._withMutationDataFilter = isSelected;
         if (isSelected) {
-            trackStudyViewFilterEvent("withMutationQuickFilter", this);
-            this.customChartFilterSet.set(UniqueKey.WITH_MUTATION_DATA, [Datalabel.YES]);
+            trackStudyViewFilterEvent('withMutationQuickFilter', this);
+            this.customChartFilterSet.set(UniqueKey.WITH_MUTATION_DATA, [
+                Datalabel.YES,
+            ]);
         } else {
             this.customChartFilterSet.delete(UniqueKey.WITH_MUTATION_DATA);
         }
@@ -974,8 +1246,10 @@ export class StudyViewPageStore {
         let isSelected = !this._withCNADataFilter;
         this._withCNADataFilter = isSelected;
         if (isSelected) {
-            trackStudyViewFilterEvent("withCNADataQuickFilter", this);
-            this.customChartFilterSet.set(UniqueKey.WITH_CNA_DATA, [Datalabel.YES]);
+            trackStudyViewFilterEvent('withCNADataQuickFilter', this);
+            this.customChartFilterSet.set(UniqueKey.WITH_CNA_DATA, [
+                Datalabel.YES,
+            ]);
         } else {
             this.customChartFilterSet.delete(UniqueKey.WITH_CNA_DATA);
         }
@@ -987,8 +1261,10 @@ export class StudyViewPageStore {
         let isSelected = !this._withFusionDataFilter;
         this._withFusionDataFilter = isSelected;
         if (isSelected) {
-            trackStudyViewFilterEvent("withFusionQuickFilter", this);
-            this.customChartFilterSet.set(UniqueKey.WITH_FUSION_DATA, [Datalabel.YES]);
+            trackStudyViewFilterEvent('withFusionQuickFilter', this);
+            this.customChartFilterSet.set(UniqueKey.WITH_FUSION_DATA, [
+                Datalabel.YES,
+            ]);
         } else {
             this.customChartFilterSet.delete(UniqueKey.WITH_FUSION_DATA);
         }
@@ -999,43 +1275,66 @@ export class StudyViewPageStore {
         // analysis groups for selected/unselected
         // unselected goes on bottom, selected should be rendered on top
         return {
-            groups: [{
-                value: SELECTED_ANALYSIS_GROUP_VALUE,
-                // In the initial load when no case selected(the same affect of all cases selected), the curve should be shown as blue instead of red
-                color: STUDY_VIEW_CONFIG.colors.theme.unselectedGroup,
-                name: this.chartsAreFiltered ? "Selected patients" : "All patients"
-            }] as AnalysisGroup[]
-        }
+            groups: [
+                {
+                    value: SELECTED_ANALYSIS_GROUP_VALUE,
+                    // In the initial load when no case selected(the same affect of all cases selected), the curve should be shown as blue instead of red
+                    color: STUDY_VIEW_CONFIG.colors.theme.unselectedGroup,
+                    name: this.chartsAreFiltered
+                        ? 'Selected patients'
+                        : 'All patients',
+                },
+            ] as AnalysisGroup[],
+        };
     }
 
     readonly sampleToAnalysisGroup = remoteData({
-        await:()=>[this.samples, this.selectedSamples],
-        invoke:()=>{
-            const selectedSamplesMap = _.keyBy(this.selectedSamples.result!, s=>s.uniqueSampleKey);
-            return Promise.resolve(_.reduce(this.samples.result!, (map, nextSample)=>{
-                const sampleKey = nextSample.uniqueSampleKey;
-                if (sampleKey in selectedSamplesMap) {
-                    map[sampleKey] = SELECTED_ANALYSIS_GROUP_VALUE;
-                } else {
-                    map[sampleKey] = UNSELECTED_ANALYSIS_GROUP_VALUE;
-                }
-                return map;
-            }, {} as {[sampleKey:string]:string}));
-        }
+        await: () => [this.samples, this.selectedSamples],
+        invoke: () => {
+            const selectedSamplesMap = _.keyBy(
+                this.selectedSamples.result!,
+                s => s.uniqueSampleKey
+            );
+            return Promise.resolve(
+                _.reduce(
+                    this.samples.result!,
+                    (map, nextSample) => {
+                        const sampleKey = nextSample.uniqueSampleKey;
+                        if (sampleKey in selectedSamplesMap) {
+                            map[sampleKey] = SELECTED_ANALYSIS_GROUP_VALUE;
+                        } else {
+                            map[sampleKey] = UNSELECTED_ANALYSIS_GROUP_VALUE;
+                        }
+                        return map;
+                    },
+                    {} as { [sampleKey: string]: string }
+                )
+            );
+        },
     });
 
-    readonly patientToAnalysisGroup = remoteData<{[patientKey:string]:string}>({
-        await:()=>[this.samples, this.selectedPatientKeys],
-        invoke:()=>{
-            const selectedPatientsMap = _.keyBy(this.selectedPatientKeys.result!);
-            return Promise.resolve(_.reduce(this.samples.result!, (map, nextSample)=>{
-                const patientKey = nextSample.uniquePatientKey;
-                if (patientKey in selectedPatientsMap) {
-                    map[patientKey] = SELECTED_ANALYSIS_GROUP_VALUE;
-                }
-                return map;
-            }, {} as {[patientKey:string]:string}));
-        }
+    readonly patientToAnalysisGroup = remoteData<{
+        [patientKey: string]: string;
+    }>({
+        await: () => [this.samples, this.selectedPatientKeys],
+        invoke: () => {
+            const selectedPatientsMap = _.keyBy(
+                this.selectedPatientKeys.result!
+            );
+            return Promise.resolve(
+                _.reduce(
+                    this.samples.result!,
+                    (map, nextSample) => {
+                        const patientKey = nextSample.uniquePatientKey;
+                        if (patientKey in selectedPatientsMap) {
+                            map[patientKey] = SELECTED_ANALYSIS_GROUP_VALUE;
+                        }
+                        return map;
+                    },
+                    {} as { [patientKey: string]: string }
+                )
+            );
+        },
     });
 
     readonly hasRawDataForDownload = remoteData<boolean>({
@@ -1048,37 +1347,50 @@ export class StudyViewPageStore {
             }
         },
         onError: () => false,
-        default: false
+        default: false,
     });
 
     @action
-    updateClinicalDataIntervalFilters(chartUniqueKey: string, dataBins: DataBin[]) {
-
-        if(chartUniqueKey === FRACTION_GENOME_ALTERED) {
-            this._customBinsFromScatterPlotSelectionSet.delete(FRACTION_GENOME_ALTERED);
+    updateClinicalDataIntervalFilters(
+        chartUniqueKey: string,
+        dataBins: DataBin[]
+    ) {
+        if (chartUniqueKey === FRACTION_GENOME_ALTERED) {
+            this._customBinsFromScatterPlotSelectionSet.delete(
+                FRACTION_GENOME_ALTERED
+            );
         }
-        if(chartUniqueKey === MUTATION_COUNT) {
+        if (chartUniqueKey === MUTATION_COUNT) {
             this._customBinsFromScatterPlotSelectionSet.delete(MUTATION_COUNT);
         }
-        
-        trackStudyViewFilterEvent("clinicalDataInterval", this);
 
-        const values: ClinicalDataFilterValue[] = getClinicalDataIntervalFilterValues(dataBins);
+        trackStudyViewFilterEvent('clinicalDataInterval', this);
+
+        const values: ClinicalDataFilterValue[] = getClinicalDataIntervalFilterValues(
+            dataBins
+        );
         this.updateClinicalDataFilterByValues(chartUniqueKey, values);
     }
 
     @autobind
     @action
-    updateClinicalDataFilterByValues(chartUniqueKey: string, values: ClinicalDataFilterValue[]) {
+    updateClinicalDataFilterByValues(
+        chartUniqueKey: string,
+        values: ClinicalDataFilterValue[]
+    ) {
         if (this.chartMetaSet[chartUniqueKey]) {
             let chartMeta = this.chartMetaSet[chartUniqueKey];
-            trackStudyViewFilterEvent("clinicalDataFilters", this);
+            trackStudyViewFilterEvent('clinicalDataFilters', this);
             if (values.length > 0) {
                 const clinicalDataIntervalFilter = {
-                    attributeId: chartMeta.clinicalAttribute!.clinicalAttributeId,
-                    values: values
+                    attributeId: chartMeta.clinicalAttribute!
+                        .clinicalAttributeId,
+                    values: values,
                 };
-                this._clinicalDataFilterSet.set(chartMeta.uniqueKey, clinicalDataIntervalFilter);
+                this._clinicalDataFilterSet.set(
+                    chartMeta.uniqueKey,
+                    clinicalDataIntervalFilter
+                );
             } else {
                 this._clinicalDataFilterSet.delete(chartMeta.uniqueKey);
             }
@@ -1087,13 +1399,20 @@ export class StudyViewPageStore {
 
     @autobind
     @action
-    updateScatterPlotFilterByValues(chartMeta: ChartMeta, bounds?: RectangleBounds) {
+    updateScatterPlotFilterByValues(
+        chartMeta: ChartMeta,
+        bounds?: RectangleBounds
+    ) {
         if (chartMeta.uniqueKey === UniqueKey.MUTATION_COUNT_CNA_FRACTION) {
             if (bounds === undefined) {
                 this._clinicalDataFilterSet.delete(FRACTION_GENOME_ALTERED);
                 this._clinicalDataFilterSet.delete(MUTATION_COUNT);
-                this._customBinsFromScatterPlotSelectionSet.delete(FRACTION_GENOME_ALTERED);
-                this._customBinsFromScatterPlotSelectionSet.delete(MUTATION_COUNT);
+                this._customBinsFromScatterPlotSelectionSet.delete(
+                    FRACTION_GENOME_ALTERED
+                );
+                this._customBinsFromScatterPlotSelectionSet.delete(
+                    MUTATION_COUNT
+                );
             } else {
                 const mutationCountFilter: ClinicalDataFilterValue = {
                     start: bounds.yStart,
@@ -1101,10 +1420,16 @@ export class StudyViewPageStore {
                 } as any;
                 const mutationCountIntervalFilter = {
                     attributeId: MUTATION_COUNT,
-                    values: [mutationCountFilter]
+                    values: [mutationCountFilter],
                 };
-                this._customBinsFromScatterPlotSelectionSet.set(MUTATION_COUNT,[mutationCountFilter.start, mutationCountFilter.end])
-                this._clinicalDataFilterSet.set(MUTATION_COUNT, mutationCountIntervalFilter);
+                this._customBinsFromScatterPlotSelectionSet.set(
+                    MUTATION_COUNT,
+                    [mutationCountFilter.start, mutationCountFilter.end]
+                );
+                this._clinicalDataFilterSet.set(
+                    MUTATION_COUNT,
+                    mutationCountIntervalFilter
+                );
 
                 const fgaFilter: ClinicalDataFilterValue = {
                     start: bounds.xStart,
@@ -1112,10 +1437,16 @@ export class StudyViewPageStore {
                 } as any;
                 const fgaIntervalFilter = {
                     attributeId: FRACTION_GENOME_ALTERED,
-                    values: [fgaFilter]
+                    values: [fgaFilter],
                 };
-                this._customBinsFromScatterPlotSelectionSet.set(FRACTION_GENOME_ALTERED,[fgaFilter.start, fgaFilter.end])
-                this._clinicalDataFilterSet.set(FRACTION_GENOME_ALTERED, fgaIntervalFilter);
+                this._customBinsFromScatterPlotSelectionSet.set(
+                    FRACTION_GENOME_ALTERED,
+                    [fgaFilter.start, fgaFilter.end]
+                );
+                this._clinicalDataFilterSet.set(
+                    FRACTION_GENOME_ALTERED,
+                    fgaIntervalFilter
+                );
             }
         }
     }
@@ -1123,9 +1454,10 @@ export class StudyViewPageStore {
     @autobind
     @action
     addGeneFilters(chartMeta: ChartMeta, hugoGeneSymbols: string[]) {
-        trackStudyViewFilterEvent("geneFilter", this);
-        let geneFilters = toJS(this._geneFilterSet.get(chartMeta.uniqueKey)) || [];
-        geneFilters = [...geneFilters, hugoGeneSymbols]
+        trackStudyViewFilterEvent('geneFilter', this);
+        let geneFilters =
+            toJS(this._geneFilterSet.get(chartMeta.uniqueKey)) || [];
+        geneFilters = [...geneFilters, hugoGeneSymbols];
         this._geneFilterSet.set(chartMeta.uniqueKey, geneFilters);
     }
 
@@ -1133,13 +1465,17 @@ export class StudyViewPageStore {
     @action
     removeGeneFilter(chartUniqueKey: string, toBeRemoved: string) {
         let geneFilters = toJS(this._geneFilterSet.get(chartUniqueKey)) || [];
-        geneFilters = _.reduce(geneFilters, (acc, next) => {
-            const newGroup = next.filter(oql => oql !== toBeRemoved);
-            if (newGroup.length > 0) {
-                acc.push(newGroup);
-            }
-            return acc;
-        }, [] as string[][]);
+        geneFilters = _.reduce(
+            geneFilters,
+            (acc, next) => {
+                const newGroup = next.filter(oql => oql !== toBeRemoved);
+                if (newGroup.length > 0) {
+                    acc.push(newGroup);
+                }
+                return acc;
+            },
+            [] as string[][]
+        );
         if (geneFilters.length === 0) {
             this._geneFilterSet.delete(chartUniqueKey);
         } else {
@@ -1148,53 +1484,72 @@ export class StudyViewPageStore {
     }
 
     @autobind
-    @action resetGeneFilter(chartUniqueKey: string) {
+    @action
+    resetGeneFilter(chartUniqueKey: string) {
         this._geneFilterSet.delete(chartUniqueKey);
     }
 
     @autobind
     @action
-    updateChartSampleIdentifierFilter(chartKey:string, cases: SampleIdentifier[], keepCurrent?:boolean) {
-
-        let newSampleIdentifiers:SampleIdentifier[] = cases;
-        const newSampleIdentifiersMap = _.keyBy(newSampleIdentifiers, s=>`${s.studyId}:${s.sampleId}`);
+    updateChartSampleIdentifierFilter(
+        chartKey: string,
+        cases: SampleIdentifier[],
+        keepCurrent?: boolean
+    ) {
+        let newSampleIdentifiers: SampleIdentifier[] = cases;
+        const newSampleIdentifiersMap = _.keyBy(
+            newSampleIdentifiers,
+            s => `${s.studyId}:${s.sampleId}`
+        );
         if (keepCurrent) {
             // if we should keep the current selection, go through and add samples back, taking care not to duplicate
-            newSampleIdentifiers = _.reduce(this._chartSampleIdentifiersFilterSet.get(chartKey)|| [],(acc, s)=>{
-                if (!(`${s.studyId}:${s.sampleId}` in newSampleIdentifiersMap)) {
-                    acc.push(s);
-                }
-                return acc
-            }, newSampleIdentifiers);
+            newSampleIdentifiers = _.reduce(
+                this._chartSampleIdentifiersFilterSet.get(chartKey) || [],
+                (acc, s) => {
+                    if (
+                        !(
+                            `${s.studyId}:${s.sampleId}` in
+                            newSampleIdentifiersMap
+                        )
+                    ) {
+                        acc.push(s);
+                    }
+                    return acc;
+                },
+                newSampleIdentifiers
+            );
         }
 
-        if(_.isEmpty(newSampleIdentifiers)){
-            this._chartSampleIdentifiersFilterSet.delete(chartKey)
+        if (_.isEmpty(newSampleIdentifiers)) {
+            this._chartSampleIdentifiersFilterSet.delete(chartKey);
         } else {
-            this._chartSampleIdentifiersFilterSet.set(chartKey,newSampleIdentifiers)
+            this._chartSampleIdentifiersFilterSet.set(
+                chartKey,
+                newSampleIdentifiers
+            );
         }
     }
 
-    public getChartSampleIdentifiersFilter(chartKey:string) {
+    public getChartSampleIdentifiersFilter(chartKey: string) {
         //return this._sampleIdentifiers;
-        return this._chartSampleIdentifiersFilterSet.get(chartKey)|| [];
+        return this._chartSampleIdentifiersFilterSet.get(chartKey) || [];
     }
 
-    public getCustomChartFilters(chartKey:string) {
-        return this.customChartFilterSet.get(chartKey)|| [];
+    public getCustomChartFilters(chartKey: string) {
+        return this.customChartFilterSet.get(chartKey) || [];
     }
 
-    public newCustomChartUniqueKey():string {
+    public newCustomChartUniqueKey(): string {
         return `CUSTOM_FILTERS_${this._customCharts.keys().length}`;
     }
 
-    public isCustomChart(uniqueKey:string):boolean {
+    public isCustomChart(uniqueKey: string): boolean {
         return this._customCharts.has(uniqueKey);
     }
 
     @action
-    changeChartVisibility(uniqueKey:string, visible: boolean) {
-        if(visible){
+    changeChartVisibility(uniqueKey: string, visible: boolean) {
+        if (visible) {
             this._chartVisibility.set(uniqueKey, true);
         } else {
             this._chartVisibility.delete(uniqueKey);
@@ -1213,36 +1568,48 @@ export class StudyViewPageStore {
     }
 
     @action
-    resetFilterAndChangeChartVisibility(chartMeta: ChartMeta, visible: boolean) {
+    resetFilterAndChangeChartVisibility(
+        chartMeta: ChartMeta,
+        visible: boolean
+    ) {
         if (!visible) {
             switch (this.chartsType.get(chartMeta.uniqueKey)) {
                 case ChartTypeEnum.MUTATED_GENES_TABLE:
                 case ChartTypeEnum.FUSION_GENES_TABLE:
                 case ChartTypeEnum.CNA_GENES_TABLE:
-                    this.resetGeneFilter(chartMeta.uniqueKey)
+                    this.resetGeneFilter(chartMeta.uniqueKey);
                     break;
                 case ChartTypeEnum.SCATTER:
-                    this._chartSampleIdentifiersFilterSet.delete(chartMeta.uniqueKey)
-                    if (chartMeta.uniqueKey === UniqueKey.MUTATION_COUNT_CNA_FRACTION) {
+                    this._chartSampleIdentifiersFilterSet.delete(
+                        chartMeta.uniqueKey
+                    );
+                    if (
+                        chartMeta.uniqueKey ===
+                        UniqueKey.MUTATION_COUNT_CNA_FRACTION
+                    ) {
                         this._clinicalDataFilterSet.delete(MUTATION_COUNT);
-                        this._clinicalDataFilterSet.delete(FRACTION_GENOME_ALTERED);
+                        this._clinicalDataFilterSet.delete(
+                            FRACTION_GENOME_ALTERED
+                        );
                     }
                     break;
                 case ChartTypeEnum.SURVIVAL:
                     break;
                 default:
-                    if(chartMeta.uniqueKey === UniqueKey.WITH_MUTATION_DATA) {
+                    if (chartMeta.uniqueKey === UniqueKey.WITH_MUTATION_DATA) {
                         this._withMutationDataFilter = undefined;
                     }
-                    if(chartMeta.uniqueKey === UniqueKey.WITH_CNA_DATA) {
+                    if (chartMeta.uniqueKey === UniqueKey.WITH_CNA_DATA) {
                         this._withCNADataFilter = undefined;
                     }
-                    if(chartMeta.uniqueKey === UniqueKey.WITH_FUSION_DATA) {
+                    if (chartMeta.uniqueKey === UniqueKey.WITH_FUSION_DATA) {
                         this._withFusionDataFilter = undefined;
                     }
                     this._clinicalDataFilterSet.delete(chartMeta.uniqueKey);
-                    this._chartSampleIdentifiersFilterSet.delete(chartMeta.uniqueKey)
-                    this.customChartFilterSet.delete(chartMeta.uniqueKey)
+                    this._chartSampleIdentifiersFilterSet.delete(
+                        chartMeta.uniqueKey
+                    );
+                    this.customChartFilterSet.delete(chartMeta.uniqueKey);
 
                     break;
             }
@@ -1253,7 +1620,9 @@ export class StudyViewPageStore {
     @autobind
     @action
     removeComparisonGroupSelectionFilter() {
-        this._chartSampleIdentifiersFilterSet.delete(UniqueKey.SELECTED_COMPARISON_GROUPS);
+        this._chartSampleIdentifiersFilterSet.delete(
+            UniqueKey.SELECTED_COMPARISON_GROUPS
+        );
         this._filterComparisonGroups = [];
     }
 
@@ -1277,14 +1646,18 @@ export class StudyViewPageStore {
 
     public isLogScaleToggleVisible(uniqueKey: string, dataBins?: DataBin[]) {
         return (
-            (this._clinicalDataBinFilterSet.get(uniqueKey) !== undefined &&  this._clinicalDataBinFilterSet.get(uniqueKey)!.disableLogScale) ||
+            (this._clinicalDataBinFilterSet.get(uniqueKey) !== undefined &&
+                this._clinicalDataBinFilterSet.get(uniqueKey)!
+                    .disableLogScale) ||
             isLogScaleByDataBins(dataBins)
         );
     }
 
     public isLogScaleChecked(uniqueKey: string) {
-        return this._clinicalDataBinFilterSet.get(uniqueKey) !== undefined &&
-            !this._clinicalDataBinFilterSet.get(uniqueKey)!.disableLogScale;
+        return (
+            this._clinicalDataBinFilterSet.get(uniqueKey) !== undefined &&
+            !this._clinicalDataBinFilterSet.get(uniqueKey)!.disableLogScale
+        );
     }
 
     @autobind
@@ -1294,42 +1667,51 @@ export class StudyViewPageStore {
         if (bins.length > 0) {
             newFilter.customBins = bins;
         } else {
-            delete newFilter.customBins
+            delete newFilter.customBins;
         }
         this._clinicalDataBinFilterSet.set(uniqueKey, newFilter);
     }
 
     public geCurrentBins(chartMeta: ChartMeta): number[] {
-        return _.uniq(_.reduce(this.getClinicalDataBin(chartMeta).result, (acc, next) => {
-            if (next.start) {
-                acc.push(next.start);
-            }
-            if (next.end) {
-                acc.push(next.end);
-            }
-            return acc;
-        }, [] as number[]));
+        return _.uniq(
+            _.reduce(
+                this.getClinicalDataBin(chartMeta).result,
+                (acc, next) => {
+                    if (next.start) {
+                        acc.push(next.start);
+                    }
+                    if (next.end) {
+                        acc.push(next.end);
+                    }
+                    return acc;
+                },
+                [] as number[]
+            )
+        );
     }
 
     @action addCharts(visibleChartIds: string[]) {
         visibleChartIds.forEach(chartId => {
-            if(!this._chartVisibility.keys().includes(chartId)) {
+            if (!this._chartVisibility.keys().includes(chartId)) {
                 this.newlyAddedCharts.push(chartId);
             }
         });
         this.updateChartsVisibility(visibleChartIds);
     }
 
-    @action updateChartsVisibility(visibleChartIds:string[]){
-        _.each(this._chartVisibility.keys(),chartId=>{
-            if(!_.includes(visibleChartIds,chartId) || !this._chartVisibility.get(chartId)){
+    @action updateChartsVisibility(visibleChartIds: string[]) {
+        _.each(this._chartVisibility.keys(), chartId => {
+            if (
+                !_.includes(visibleChartIds, chartId) ||
+                !this._chartVisibility.get(chartId)
+            ) {
                 // delete it instead of setting it to false
                 // because adding chart back would insert in middle instead of appending at last
                 this._chartVisibility.delete(chartId);
             }
-        })
-        _.each(visibleChartIds,uniqueKey=>{
-            if(this._chartVisibility.get(uniqueKey) === undefined) {
+        });
+        _.each(visibleChartIds, uniqueKey => {
+            if (this._chartVisibility.get(uniqueKey) === undefined) {
                 this._chartVisibility.set(uniqueKey, true);
             }
         });
@@ -1339,12 +1721,12 @@ export class StudyViewPageStore {
         return this._clinicalDataFilterSet.values();
     }
 
-    @computed get geneFilters():GeneFilter[] {
+    @computed get geneFilters(): GeneFilter[] {
         return _.map(this._geneFilterSet.entries(), ([key, value]) => {
             return {
                 molecularProfileIds: getMolecularProfileIdsFromUniqueKey(key),
-                geneQueries: value
-            }
+                geneQueries: value,
+            };
         });
     }
 
@@ -1362,44 +1744,58 @@ export class StudyViewPageStore {
             filters.geneFilters = this.geneFilters;
         }
 
-        let sampleIdentifiersFilterSets = this._chartSampleIdentifiersFilterSet.values()
+        let sampleIdentifiersFilterSets = this._chartSampleIdentifiersFilterSet.values();
 
         // nested array need to be spread for _.intersectionWith
-        let _sampleIdentifiers: SampleIdentifier[] = _.intersectionWith(...sampleIdentifiersFilterSets,
+        let _sampleIdentifiers: SampleIdentifier[] = _.intersectionWith(
+            ...sampleIdentifiersFilterSets,
             ((a: SampleIdentifier, b: SampleIdentifier) => {
-                return a.sampleId === b.sampleId &&
-                    a.studyId === b.studyId;
-            }) as any);
+                return a.sampleId === b.sampleId && a.studyId === b.studyId;
+            }) as any
+        );
 
-        if(_sampleIdentifiers && _sampleIdentifiers.length>0) {
+        if (_sampleIdentifiers && _sampleIdentifiers.length > 0) {
             filters.sampleIdentifiers = _sampleIdentifiers;
         } else {
-            if(_.isEmpty(this.queriedSampleIdentifiers.result)){
+            if (_.isEmpty(this.queriedSampleIdentifiers.result)) {
                 filters.studyIds = this.queriedPhysicalStudyIds.result;
             } else {
                 filters.sampleIdentifiers = this.queriedSampleIdentifiers.result;
             }
         }
 
-        if(this._withMutationDataFilter !== undefined) {
-            let customChartFilterSet = this.customChartFilterSet.get(UniqueKey.WITH_MUTATION_DATA)
-            if(customChartFilterSet !== undefined && customChartFilterSet.length === 1) {
+        if (this._withMutationDataFilter !== undefined) {
+            let customChartFilterSet = this.customChartFilterSet.get(
+                UniqueKey.WITH_MUTATION_DATA
+            );
+            if (
+                customChartFilterSet !== undefined &&
+                customChartFilterSet.length === 1
+            ) {
                 filters.withMutationData = this._withMutationDataFilter;
             }
-
         }
-        if(this._withCNADataFilter !== undefined) {
-            let customChartFilterSet = this.customChartFilterSet.get(UniqueKey.WITH_CNA_DATA)
-            if(customChartFilterSet !== undefined && customChartFilterSet.length === 1) {
+        if (this._withCNADataFilter !== undefined) {
+            let customChartFilterSet = this.customChartFilterSet.get(
+                UniqueKey.WITH_CNA_DATA
+            );
+            if (
+                customChartFilterSet !== undefined &&
+                customChartFilterSet.length === 1
+            ) {
                 filters.withCNAData = this._withCNADataFilter;
             }
         }
-        if(this._withFusionDataFilter !== undefined) {
-            let customChartFilterSet = this.customChartFilterSet.get(UniqueKey.WITH_FUSION_DATA)
-            if(customChartFilterSet !== undefined && customChartFilterSet.length === 1) {
+        if (this._withFusionDataFilter !== undefined) {
+            let customChartFilterSet = this.customChartFilterSet.get(
+                UniqueKey.WITH_FUSION_DATA
+            );
+            if (
+                customChartFilterSet !== undefined &&
+                customChartFilterSet.length === 1
+            ) {
                 filters.withFusionData = this._withFusionDataFilter;
             }
-
         }
 
         return filters as StudyViewFilter;
@@ -1407,8 +1803,10 @@ export class StudyViewPageStore {
 
     @computed
     get userSelections() {
-        let sampleIdentifiersSet: { [id: string]: SampleIdentifier[] } = this._chartSampleIdentifiersFilterSet.toJS();
-        return { ...this.filters, sampleIdentifiersSet }
+        let sampleIdentifiersSet: {
+            [id: string]: SampleIdentifier[];
+        } = this._chartSampleIdentifiersFilterSet.toJS();
+        return { ...this.filters, sampleIdentifiersSet };
     }
 
     public getGeneFiltersByUniqueKey(uniqueKey: string) {
@@ -1421,22 +1819,26 @@ export class StudyViewPageStore {
     }
 
     public getScatterPlotFiltersByUniqueKey(uniqueKey: string) {
-
         if (uniqueKey === UniqueKey.MUTATION_COUNT_CNA_FRACTION) {
-
-            const xAxisFilter = this._clinicalDataFilterSet.get(FRACTION_GENOME_ALTERED);
+            const xAxisFilter = this._clinicalDataFilterSet.get(
+                FRACTION_GENOME_ALTERED
+            );
             const yAxisFilter = this._clinicalDataFilterSet.get(MUTATION_COUNT);
             const scatterPlotFilter: RectangleBounds = {};
 
             if (xAxisFilter) {
-                let clinicalDataFilterValue = getFilteredAndCompressedDataIntervalFilters(xAxisFilter.values);
+                let clinicalDataFilterValue = getFilteredAndCompressedDataIntervalFilters(
+                    xAxisFilter.values
+                );
                 scatterPlotFilter.xStart = clinicalDataFilterValue.start;
-                scatterPlotFilter.xEnd = clinicalDataFilterValue.end
+                scatterPlotFilter.xEnd = clinicalDataFilterValue.end;
             }
             if (yAxisFilter) {
-                let clinicalDataFilterValue = getFilteredAndCompressedDataIntervalFilters(yAxisFilter.values);
+                let clinicalDataFilterValue = getFilteredAndCompressedDataIntervalFilters(
+                    yAxisFilter.values
+                );
                 scatterPlotFilter.yStart = clinicalDataFilterValue.start;
-                scatterPlotFilter.yEnd = clinicalDataFilterValue.end
+                scatterPlotFilter.yEnd = clinicalDataFilterValue.end;
             }
             if (xAxisFilter || yAxisFilter) {
                 return [scatterPlotFilter];
@@ -1447,68 +1849,83 @@ export class StudyViewPageStore {
 
     @computed
     get unfilteredAttrsForNonNumerical() {
-        const visibleNonNumericalAttributes = this.visibleAttributes.filter((chartMeta: ChartMeta) => {
-            if(chartMeta.clinicalAttribute !== undefined && chartMeta.clinicalAttribute.datatype !== DataType.NUMBER) {
-                const key = getUniqueKey(chartMeta.clinicalAttribute);
-                return !this._clinicalDataFilterSet.has(key);
+        const visibleNonNumericalAttributes = this.visibleAttributes.filter(
+            (chartMeta: ChartMeta) => {
+                if (
+                    chartMeta.clinicalAttribute !== undefined &&
+                    chartMeta.clinicalAttribute.datatype !== DataType.NUMBER
+                ) {
+                    const key = getUniqueKey(chartMeta.clinicalAttribute);
+                    return !this._clinicalDataFilterSet.has(key);
+                }
+                return false;
             }
-            return false;
-        });
+        );
 
         return visibleNonNumericalAttributes.map((chartMeta: ChartMeta) => {
             return {
-                attributeId: chartMeta.clinicalAttribute!.clinicalAttributeId
+                attributeId: chartMeta.clinicalAttribute!.clinicalAttributeId,
             } as ClinicalDataFilter;
         });
     }
 
     @computed
     get newlyAddedUnfilteredAttrsForNonNumerical() {
-        return this.clinicalAttributes.result.filter((attr:ClinicalAttribute) => {
-            if(attr.datatype !== DataType.NUMBER) {
-                const key = getUniqueKey(attr);
-                if(this.newlyAddedCharts.includes(key)) {
-                    return true;
+        return this.clinicalAttributes.result
+            .filter((attr: ClinicalAttribute) => {
+                if (attr.datatype !== DataType.NUMBER) {
+                    const key = getUniqueKey(attr);
+                    if (this.newlyAddedCharts.includes(key)) {
+                        return true;
+                    }
+                    return false;
                 }
                 return false;
-            }
-            return false;
-        }).map(attr => {
-            return {
-                attributeId: attr.clinicalAttributeId
-            };
-        });
+            })
+            .map(attr => {
+                return {
+                    attributeId: attr.clinicalAttributeId,
+                };
+            });
     }
 
     @computed
     get newlyAddedUnfilteredAttrsForNumerical() {
-        return this.clinicalAttributes.result.filter((attr:ClinicalAttribute) => {
-            if(attr.datatype === DataType.NUMBER) {
-                const key = getUniqueKey(attr);
-                if(this.newlyAddedCharts.includes(key)) {
-                    return true;
+        return this.clinicalAttributes.result
+            .filter((attr: ClinicalAttribute) => {
+                if (attr.datatype === DataType.NUMBER) {
+                    const key = getUniqueKey(attr);
+                    if (this.newlyAddedCharts.includes(key)) {
+                        return true;
+                    }
+                    return false;
                 }
                 return false;
-            }
-            return false;
-        }).map(attr => {
-            return this._clinicalDataBinFilterSet.get(getUniqueKey( attr))!;
-        });
+            })
+            .map(attr => {
+                return this._clinicalDataBinFilterSet.get(getUniqueKey(attr))!;
+            });
     }
 
-
     @computed
     get unfilteredAttrsForNumerical() {
-        const visibleNumericalAttributes = this.visibleAttributes.filter((chartMeta: ChartMeta) => {
-            if (chartMeta.clinicalAttribute !== undefined && chartMeta.clinicalAttribute.datatype === DataType.NUMBER) {
-                const key = getUniqueKey(chartMeta.clinicalAttribute);
-                return !this._clinicalDataFilterSet.has(key);
+        const visibleNumericalAttributes = this.visibleAttributes.filter(
+            (chartMeta: ChartMeta) => {
+                if (
+                    chartMeta.clinicalAttribute !== undefined &&
+                    chartMeta.clinicalAttribute.datatype === DataType.NUMBER
+                ) {
+                    const key = getUniqueKey(chartMeta.clinicalAttribute);
+                    return !this._clinicalDataFilterSet.has(key);
+                }
+                return false;
             }
-            return false;
-        });
+        );
 
         return visibleNumericalAttributes.map((chartMeta: ChartMeta) => {
-            return this._clinicalDataBinFilterSet.get(getUniqueKey(chartMeta.clinicalAttribute!))!;
+            return this._clinicalDataBinFilterSet.get(
+                getUniqueKey(chartMeta.clinicalAttribute!)
+            )!;
         });
     }
 
@@ -1517,12 +1934,12 @@ export class StudyViewPageStore {
             return internalClient.fetchClinicalDataCountsUsingPOST({
                 clinicalDataCountFilter: {
                     attributes: this.unfilteredAttrsForNonNumerical,
-                    studyViewFilter: this.filters
-                } as ClinicalDataCountFilter
+                    studyViewFilter: this.filters,
+                } as ClinicalDataCountFilter,
             });
         },
-        onError: (error => {}),
-        onResult: (data=>{
+        onError: error => {},
+        onResult: data => {
             data.forEach(item => {
                 const uniqueKey = item.attributeId;
                 if (this.isNewlyAdded(uniqueKey)) {
@@ -1530,29 +1947,31 @@ export class StudyViewPageStore {
                     this.newlyAddedCharts.remove(uniqueKey);
                 }
             });
-        }),
-        default: []
+        },
+        default: [],
     });
 
-    readonly newlyAddedUnfilteredClinicalDataCount = remoteData<ClinicalDataCountItem[]>({
+    readonly newlyAddedUnfilteredClinicalDataCount = remoteData<
+        ClinicalDataCountItem[]
+    >({
         invoke: () => {
             return internalClient.fetchClinicalDataCountsUsingPOST({
                 clinicalDataCountFilter: {
                     attributes: this.newlyAddedUnfilteredAttrsForNonNumerical,
-                    studyViewFilter: this.filters
-                } as ClinicalDataCountFilter
+                    studyViewFilter: this.filters,
+                } as ClinicalDataCountFilter,
             });
         },
         default: [],
-        onError: (error => {}),
-        onResult: (data) => {
+        onError: error => {},
+        onResult: data => {
             data.forEach(item => {
                 const uniqueKey = item.attributeId;
                 this.unfilteredClinicalDataCountCache[uniqueKey] = item;
                 this.showAsPieChart(uniqueKey, item.counts.length);
                 this.newlyAddedCharts.remove(uniqueKey);
             });
-        }
+        },
     });
 
     readonly newlyAddedUnfilteredClinicalDataBinCount = remoteData<DataBin[]>({
@@ -1561,18 +1980,18 @@ export class StudyViewPageStore {
                 dataBinMethod: 'STATIC',
                 clinicalDataBinCountFilter: {
                     attributes: this.newlyAddedUnfilteredAttrsForNumerical,
-                    studyViewFilter: this.filters
-                } as ClinicalDataBinCountFilter
+                    studyViewFilter: this.filters,
+                } as ClinicalDataBinCountFilter,
             });
         },
         default: [],
-        onError: (error => {}),
-        onResult: (data) => {
+        onError: error => {},
+        onResult: data => {
             _.each(_.groupBy(data, item => item.attributeId), (item, key) => {
                 this.unfilteredClinicalDataBinCountCache[key] = item;
                 this.newlyAddedCharts.remove(key);
             });
-        }
+        },
     });
 
     readonly unfilteredClinicalDataBinCount = remoteData<DataBin[]>({
@@ -1581,12 +2000,12 @@ export class StudyViewPageStore {
                 dataBinMethod: 'STATIC',
                 clinicalDataBinCountFilter: {
                     attributes: this.unfilteredAttrsForNumerical,
-                    studyViewFilter: this.filters
-                } as ClinicalDataBinCountFilter
+                    studyViewFilter: this.filters,
+                } as ClinicalDataBinCountFilter,
             });
         },
-        onError: (error => {}),
-        default: []
+        onError: error => {},
+        default: [],
     });
 
     @autobind
@@ -1596,53 +2015,83 @@ export class StudyViewPageStore {
     }
 
     public getClinicalDataCount(chartMeta: ChartMeta) {
-        let uniqueKey:string = getUniqueKey(chartMeta.clinicalAttribute!);
-        if(!this.clinicalDataCountPromises.hasOwnProperty(uniqueKey)) {
-            const isDefaultAttr = _.find(this.defaultVisibleAttributes.result, attr => getUniqueKey(attr) === uniqueKey) !== undefined;
-            this.clinicalDataCountPromises[uniqueKey] = remoteData<ClinicalDataCountSummary[]>({
+        let uniqueKey: string = getUniqueKey(chartMeta.clinicalAttribute!);
+        if (!this.clinicalDataCountPromises.hasOwnProperty(uniqueKey)) {
+            const isDefaultAttr =
+                _.find(
+                    this.defaultVisibleAttributes.result,
+                    attr => getUniqueKey(attr) === uniqueKey
+                ) !== undefined;
+            this.clinicalDataCountPromises[uniqueKey] = remoteData<
+                ClinicalDataCountSummary[]
+            >({
                 await: () => {
                     return getRequestedAwaitPromisesForClinicalData(
                         isDefaultAttr,
-                        this.isInitialFilterState, this.chartsAreFiltered,
+                        this.isInitialFilterState,
+                        this.chartsAreFiltered,
                         this._clinicalDataFilterSet.has(uniqueKey),
-                        this.unfilteredClinicalDataCount, this.newlyAddedUnfilteredClinicalDataCount,
-                        this.initialVisibleAttributesClinicalDataCountData);
+                        this.unfilteredClinicalDataCount,
+                        this.newlyAddedUnfilteredClinicalDataCount,
+                        this.initialVisibleAttributesClinicalDataCountData
+                    );
                 },
                 invoke: async () => {
                     let result: ClinicalDataCountItem[] = [];
-                    if (this.isInitialFilterState && isDefaultAttr && !this._clinicalDataFilterSet.has(uniqueKey)) {
-                        result = this.initialVisibleAttributesClinicalDataCountData.result;
+                    if (
+                        this.isInitialFilterState &&
+                        isDefaultAttr &&
+                        !this._clinicalDataFilterSet.has(uniqueKey)
+                    ) {
+                        result = this
+                            .initialVisibleAttributesClinicalDataCountData
+                            .result;
                     } else {
                         // Mostly the case when user adds new chart. It would be nice only fetching
                         // the chart specific data instead of using the unfilteredClinicalDataCount which will require
                         // all unfiltered clinical attributes data.
 
-                        if (this._clinicalDataFilterSet.has(uniqueKey) || this.isInitialFilterState) {
-                            result = await internalClient.fetchClinicalDataCountsUsingPOST({
-                                clinicalDataCountFilter: {
-                                    attributes: [{
-                                        attributeId: chartMeta.clinicalAttribute!.clinicalAttributeId
-                                    } as ClinicalDataFilter],
-                                    studyViewFilter: this.filters
-                                } as ClinicalDataCountFilter
-                            });
+                        if (
+                            this._clinicalDataFilterSet.has(uniqueKey) ||
+                            this.isInitialFilterState
+                        ) {
+                            result = await internalClient.fetchClinicalDataCountsUsingPOST(
+                                {
+                                    clinicalDataCountFilter: {
+                                        attributes: [
+                                            {
+                                                attributeId: chartMeta.clinicalAttribute!
+                                                    .clinicalAttributeId,
+                                            } as ClinicalDataFilter,
+                                        ],
+                                        studyViewFilter: this.filters,
+                                    } as ClinicalDataCountFilter,
+                                }
+                            );
                         } else if (!isDefaultAttr && !this.chartsAreFiltered) {
-                            result = [this.unfilteredClinicalDataCountCache[uniqueKey]];
-                        } else{
+                            result = [
+                                this.unfilteredClinicalDataCountCache[
+                                    uniqueKey
+                                ],
+                            ];
+                        } else {
                             result = this.unfilteredClinicalDataCount.result;
                         }
                     }
                     let data = _.find(result, {
-                        attributeId: chartMeta.clinicalAttribute!.clinicalAttributeId,
+                        attributeId: chartMeta.clinicalAttribute!
+                            .clinicalAttributeId,
                     } as ClinicalDataCountItem);
-                    let counts:ClinicalDataCount[] = [];
+                    let counts: ClinicalDataCount[] = [];
                     if (data !== undefined) {
                         counts = data.counts;
                     }
-                    return getClinicalDataCountWithColorByClinicalDataCount(counts)
+                    return getClinicalDataCountWithColorByClinicalDataCount(
+                        counts
+                    );
                 },
-                onError: (error => {}),
-                default: []
+                onError: error => {},
+                default: [],
             });
         }
         return this.clinicalDataCountPromises[uniqueKey];
@@ -1651,305 +2100,443 @@ export class StudyViewPageStore {
     public getClinicalDataBin(chartMeta: ChartMeta) {
         const uniqueKey: string = getUniqueKey(chartMeta.clinicalAttribute!);
         if (!this.clinicalDataBinPromises.hasOwnProperty(uniqueKey)) {
-            const defaultAttr = _.find(this.defaultVisibleAttributes.result, attr => getUniqueKey(attr) === uniqueKey);
+            const defaultAttr = _.find(
+                this.defaultVisibleAttributes.result,
+                attr => getUniqueKey(attr) === uniqueKey
+            );
             const isDefaultAttr = defaultAttr !== undefined;
             this.clinicalDataBinPromises[uniqueKey] = remoteData<DataBin[]>({
                 await: () => {
                     return getRequestedAwaitPromisesForClinicalData(
-                        isDefaultAttr, this.isInitialFilterState, this.chartsAreFiltered,
+                        isDefaultAttr,
+                        this.isInitialFilterState,
+                        this.chartsAreFiltered,
                         this._clinicalDataFilterSet.has(uniqueKey),
-                        this.unfilteredClinicalDataBinCount, this.newlyAddedUnfilteredClinicalDataBinCount,
-                        this.initialVisibleAttributesClinicalDataBinCountData);
+                        this.unfilteredClinicalDataBinCount,
+                        this.newlyAddedUnfilteredClinicalDataBinCount,
+                        this.initialVisibleAttributesClinicalDataBinCountData
+                    );
                 },
                 invoke: async () => {
                     // TODO this.barChartFilters.length > 0 ? 'STATIC' : 'DYNAMIC' (not trivial when multiple filters involved)
                     const dataBinMethod = DataBinMethodConstants.STATIC;
                     let result = [];
 
-                    const initDataBinFilter = _.find(this.initialVisibleAttributesClinicalDataBinAttributes.result,
-                        item => item.attributeId === getUniqueKey(chartMeta.clinicalAttribute!));
-                    let attribute = _.clone(this._clinicalDataBinFilterSet.get(getUniqueKey(chartMeta.clinicalAttribute!))!);
+                    const initDataBinFilter = _.find(
+                        this.initialVisibleAttributesClinicalDataBinAttributes
+                            .result,
+                        item =>
+                            item.attributeId ===
+                            getUniqueKey(chartMeta.clinicalAttribute!)
+                    );
+                    let attribute = _.clone(
+                        this._clinicalDataBinFilterSet.get(
+                            getUniqueKey(chartMeta.clinicalAttribute!)
+                        )!
+                    );
 
-                    if(this._customBinsFromScatterPlotSelectionSet.has(chartMeta.uniqueKey)) {
-                        const additioncustomBins = this._customBinsFromScatterPlotSelectionSet.get(chartMeta.uniqueKey) || [];
-                        attribute.customBins = _.sortBy([...attribute.customBins || [], ...additioncustomBins])
+                    if (
+                        this._customBinsFromScatterPlotSelectionSet.has(
+                            chartMeta.uniqueKey
+                        )
+                    ) {
+                        const additioncustomBins =
+                            this._customBinsFromScatterPlotSelectionSet.get(
+                                chartMeta.uniqueKey
+                            ) || [];
+                        attribute.customBins = _.sortBy([
+                            ...(attribute.customBins || []),
+                            ...additioncustomBins,
+                        ]);
                     }
-                    const attributeChanged = isDefaultAttr && !_.isEqual(toJS(attribute), initDataBinFilter);
-                    if (this.isInitialFilterState &&
+                    const attributeChanged =
+                        isDefaultAttr &&
+                        !_.isEqual(toJS(attribute), initDataBinFilter);
+                    if (
+                        this.isInitialFilterState &&
                         isDefaultAttr &&
                         !this._clinicalDataFilterSet.has(uniqueKey) &&
-                        !attributeChanged) {
-                        result = this.initialVisibleAttributesClinicalDataBinCountData.result;
+                        !attributeChanged
+                    ) {
+                        result = this
+                            .initialVisibleAttributesClinicalDataBinCountData
+                            .result;
                     } else {
-                        if (this._clinicalDataFilterSet.has(uniqueKey) || this.isInitialFilterState) {
-                            result = await internalClient.fetchClinicalDataBinCountsUsingPOST({
-                                dataBinMethod,
-                                clinicalDataBinCountFilter: {
-                                    attributes: [attribute],
-                                    studyViewFilter: this.filters
-                                } as ClinicalDataBinCountFilter
-                            });
+                        if (
+                            this._clinicalDataFilterSet.has(uniqueKey) ||
+                            this.isInitialFilterState
+                        ) {
+                            result = await internalClient.fetchClinicalDataBinCountsUsingPOST(
+                                {
+                                    dataBinMethod,
+                                    clinicalDataBinCountFilter: {
+                                        attributes: [attribute],
+                                        studyViewFilter: this.filters,
+                                    } as ClinicalDataBinCountFilter,
+                                }
+                            );
                         } else if (!isDefaultAttr && !this.chartsAreFiltered) {
-                            result = this.unfilteredClinicalDataBinCountCache[uniqueKey];
+                            result = this.unfilteredClinicalDataBinCountCache[
+                                uniqueKey
+                            ];
                         } else {
                             result = this.unfilteredClinicalDataBinCount.result;
                         }
                     }
 
-                    return _.filter(result, {
-                        attributeId: chartMeta.clinicalAttribute!.clinicalAttributeId
-                    }) || [];
+                    return (
+                        _.filter(result, {
+                            attributeId: chartMeta.clinicalAttribute!
+                                .clinicalAttributeId,
+                        }) || []
+                    );
                 },
-                onError: (error => {}),
-                default: []
+                onError: error => {},
+                default: [],
             });
         }
         return this.clinicalDataBinPromises[uniqueKey];
     }
 
     private async getClinicalDataBySamples(samples: Sample[]) {
-        let clinicalData:{[sampleId:string]: {[attributeId: string]: string}} = {};
+        let clinicalData: {
+            [sampleId: string]: { [attributeId: string]: string };
+        } = {};
 
-        let sampleClinicalData = await defaultClient.fetchClinicalDataUsingPOST({
-            'clinicalDataType': "SAMPLE",
-            'clinicalDataMultiStudyFilter': {
-                'identifiers': _.map(samples, sample => {
-                    return {
-                        entityId: sample.sampleId,
-                        studyId: sample.studyId
-                    }
-                })
-            } as ClinicalDataMultiStudyFilter
-        });
+        let sampleClinicalData = await defaultClient.fetchClinicalDataUsingPOST(
+            {
+                clinicalDataType: 'SAMPLE',
+                clinicalDataMultiStudyFilter: {
+                    identifiers: _.map(samples, sample => {
+                        return {
+                            entityId: sample.sampleId,
+                            studyId: sample.studyId,
+                        };
+                    }),
+                } as ClinicalDataMultiStudyFilter,
+            }
+        );
 
         _.forEach(sampleClinicalData, item => {
-            clinicalData[item.uniqueSampleKey] = { ...(clinicalData[item.uniqueSampleKey] || {}), [item.clinicalAttributeId]: item.value };
-        })
-
-        let patientClinicalData = await defaultClient.fetchClinicalDataUsingPOST({
-            'clinicalDataType': ClinicalDataTypeEnum.PATIENT,
-            'clinicalDataMultiStudyFilter': {
-                'identifiers': _.map(samples, sample => {
-                    return {
-                        entityId: sample.patientId,
-                        studyId: sample.studyId
-                    }
-                })
-            } as ClinicalDataMultiStudyFilter
+            clinicalData[item.uniqueSampleKey] = {
+                ...(clinicalData[item.uniqueSampleKey] || {}),
+                [item.clinicalAttributeId]: item.value,
+            };
         });
 
-        const patientSamplesMap = _.groupBy(samples, sample => sample.uniquePatientKey);
+        let patientClinicalData = await defaultClient.fetchClinicalDataUsingPOST(
+            {
+                clinicalDataType: ClinicalDataTypeEnum.PATIENT,
+                clinicalDataMultiStudyFilter: {
+                    identifiers: _.map(samples, sample => {
+                        return {
+                            entityId: sample.patientId,
+                            studyId: sample.studyId,
+                        };
+                    }),
+                } as ClinicalDataMultiStudyFilter,
+            }
+        );
+
+        const patientSamplesMap = _.groupBy(
+            samples,
+            sample => sample.uniquePatientKey
+        );
 
         _.forEach(patientClinicalData, item => {
             (patientSamplesMap[item.uniquePatientKey] || []).forEach(sample => {
-                clinicalData[sample.uniqueSampleKey] = { ...(clinicalData[sample.uniqueSampleKey] || {}), [item.clinicalAttributeId]: item.value };
+                clinicalData[sample.uniqueSampleKey] = {
+                    ...(clinicalData[sample.uniqueSampleKey] || {}),
+                    [item.clinicalAttributeId]: item.value,
+                };
             });
         });
         return clinicalData;
-
     }
 
     readonly molecularProfiles = remoteData<MolecularProfile[]>({
-        await: ()=>[this.queriedPhysicalStudyIds],
+        await: () => [this.queriedPhysicalStudyIds],
         invoke: async () => {
             return await defaultClient.fetchMolecularProfilesUsingPOST({
                 molecularProfileFilter: {
-                    studyIds: this.queriedPhysicalStudyIds.result
-                } as MolecularProfileFilter
-            })
+                    studyIds: this.queriedPhysicalStudyIds.result,
+                } as MolecularProfileFilter,
+            });
         },
-        onError: (error => {}),
-        default: []
+        onError: error => {},
+        default: [],
     });
 
-
     readonly allPhysicalStudies = remoteData({
         invoke: async () => {
             if (this.studyIds.length > 0) {
                 return defaultClient
                     .fetchStudiesUsingPOST({
                         studyIds: toJS(this.studyIds),
-                        projection: 'SUMMARY'
-                    }).then((studies) => {
-                        return studies
-                    }).catch((error) => {
-                        return defaultClient.getAllStudiesUsingGET({ projection: 'SUMMARY' });
+                        projection: 'SUMMARY',
                     })
+                    .then(studies => {
+                        return studies;
+                    })
+                    .catch(error => {
+                        return defaultClient.getAllStudiesUsingGET({
+                            projection: 'SUMMARY',
+                        });
+                    });
             }
             return [];
         },
-        default: []
+        default: [],
     });
 
-    readonly physicalStudiesSet = remoteData<{[id:string]:CancerStudy}>({
-        await: ()=>[this.allPhysicalStudies],
+    readonly physicalStudiesSet = remoteData<{ [id: string]: CancerStudy }>({
+        await: () => [this.allPhysicalStudies],
         invoke: async () => {
-            return _.keyBy(this.allPhysicalStudies.result, s=>s.studyId);
+            return _.keyBy(this.allPhysicalStudies.result, s => s.studyId);
         },
-        default: {}
+        default: {},
     });
 
     // contains queried physical studies
     readonly filteredPhysicalStudies = remoteData({
-        await: ()=>[this.physicalStudiesSet],
+        await: () => [this.physicalStudiesSet],
         invoke: async () => {
             const physicalStudiesSet = this.physicalStudiesSet.result;
-            return _.reduce(this.studyIds, (acc: CancerStudy[], next) => {
-                if (physicalStudiesSet[next]) {
-                    acc.push(physicalStudiesSet[next]);
-                }
-                return acc;
-            }, []);
+            return _.reduce(
+                this.studyIds,
+                (acc: CancerStudy[], next) => {
+                    if (physicalStudiesSet[next]) {
+                        acc.push(physicalStudiesSet[next]);
+                    }
+                    return acc;
+                },
+                []
+            );
         },
-        default: []
+        default: [],
     });
 
     // contains queried vaild virtual studies
     readonly filteredVirtualStudies = remoteData({
         await: () => [this.filteredPhysicalStudies],
         invoke: async () => {
-            if (this.filteredPhysicalStudies.result.length === this.studyIds.length) {
+            if (
+                this.filteredPhysicalStudies.result.length ===
+                this.studyIds.length
+            ) {
                 return [];
             }
             let filteredVirtualStudies: VirtualStudy[] = [];
-            let validFilteredPhysicalStudyIds = this.filteredPhysicalStudies.result.map(study => study.studyId);
-            let virtualStudyIds = _.filter(this.studyIds, id => !_.includes(validFilteredPhysicalStudyIds, id));
-
-            await Promise.all(virtualStudyIds.map(id =>
-                sessionServiceClient
-                    .getVirtualStudy(id)
-                    .then((res) => {
-                        filteredVirtualStudies.push(res);
-                    })
-                    .catch(error => { /*do nothing*/ })
-            ));
+            let validFilteredPhysicalStudyIds = this.filteredPhysicalStudies.result.map(
+                study => study.studyId
+            );
+            let virtualStudyIds = _.filter(
+                this.studyIds,
+                id => !_.includes(validFilteredPhysicalStudyIds, id)
+            );
+
+            await Promise.all(
+                virtualStudyIds.map(id =>
+                    sessionServiceClient
+                        .getVirtualStudy(id)
+                        .then(res => {
+                            filteredVirtualStudies.push(res);
+                        })
+                        .catch(error => {
+                            /*do nothing*/
+                        })
+                )
+            );
             return filteredVirtualStudies;
         },
-        default: []
+        default: [],
     });
 
     // includes all physical studies from queried virtual studies
     readonly queriedPhysicalStudies = remoteData({
-        await: () => [this.filteredPhysicalStudies, this.filteredVirtualStudies],
+        await: () => [
+            this.filteredPhysicalStudies,
+            this.filteredVirtualStudies,
+        ],
         invoke: async () => {
-
             let physicalStudiesSet = this.physicalStudiesSet.result;
 
-            const virtualStudyRelatedPhysicalStudiesIds = _.uniq(_.flatten(this.filteredVirtualStudies.result.map((vs:VirtualStudy)=>vs.data.studies.map(study => study.id))));
-            const unsettledPhysicalStudies = _.without(virtualStudyRelatedPhysicalStudiesIds, ..._.keys(physicalStudiesSet));
-            if(unsettledPhysicalStudies.length > 0) {
-                const virtualStudyRelatedPhysicalStudies = await defaultClient.fetchStudiesUsingPOST({
-                    studyIds:unsettledPhysicalStudies,
-                    projection: 'SUMMARY'
-                });
-                physicalStudiesSet = _.merge(physicalStudiesSet, _.keyBy(virtualStudyRelatedPhysicalStudies, 'studyId'));
+            const virtualStudyRelatedPhysicalStudiesIds = _.uniq(
+                _.flatten(
+                    this.filteredVirtualStudies.result.map((vs: VirtualStudy) =>
+                        vs.data.studies.map(study => study.id)
+                    )
+                )
+            );
+            const unsettledPhysicalStudies = _.without(
+                virtualStudyRelatedPhysicalStudiesIds,
+                ..._.keys(physicalStudiesSet)
+            );
+            if (unsettledPhysicalStudies.length > 0) {
+                const virtualStudyRelatedPhysicalStudies = await defaultClient.fetchStudiesUsingPOST(
+                    {
+                        studyIds: unsettledPhysicalStudies,
+                        projection: 'SUMMARY',
+                    }
+                );
+                physicalStudiesSet = _.merge(
+                    physicalStudiesSet,
+                    _.keyBy(virtualStudyRelatedPhysicalStudies, 'studyId')
+                );
             }
-            let studies = _.reduce(this.filteredPhysicalStudies.result, (acc, next) => {
-                acc[next.studyId] = physicalStudiesSet[next.studyId];
-                return acc;
-            }, {} as { [id: string]: CancerStudy })
+            let studies = _.reduce(
+                this.filteredPhysicalStudies.result,
+                (acc, next) => {
+                    acc[next.studyId] = physicalStudiesSet[next.studyId];
+                    return acc;
+                },
+                {} as { [id: string]: CancerStudy }
+            );
 
             this.filteredVirtualStudies.result.forEach(virtualStudy => {
                 virtualStudy.data.studies.forEach(study => {
                     if (!studies[study.id] && physicalStudiesSet[study.id]) {
                         studies[study.id] = physicalStudiesSet[study.id];
                     }
-                })
+                });
             });
             return _.values(studies);
         },
-        default: []
+        default: [],
     });
 
     // includes all physical studies from queried virtual studies
     readonly queriedPhysicalStudyIds = remoteData({
         await: () => [this.queriedPhysicalStudies],
         invoke: () => {
-            return Promise.resolve(_.map(this.queriedPhysicalStudies.result, study => study.studyId));
+            return Promise.resolve(
+                _.map(
+                    this.queriedPhysicalStudies.result,
+                    study => study.studyId
+                )
+            );
         },
-        default: []
+        default: [],
     });
 
     readonly queriedSampleIdentifiers = remoteData<SampleIdentifier[]>({
-        await: () => [this.filteredPhysicalStudies, this.filteredVirtualStudies],
+        await: () => [
+            this.filteredPhysicalStudies,
+            this.filteredVirtualStudies,
+        ],
         invoke: async () => {
-            let result = _.reduce(this.filteredVirtualStudies.result, (acc, next) => {
-                next.data.studies.forEach(study => {
-                    let samples = study.samples;
-                    if (acc[study.id]) {
-                        samples = _.union(acc[study.id], samples);
-                    }
-                    acc[study.id] = samples;
-                })
-                return acc;
-            }, {} as { [id: string]: string[] });
+            let result = _.reduce(
+                this.filteredVirtualStudies.result,
+                (acc, next) => {
+                    next.data.studies.forEach(study => {
+                        let samples = study.samples;
+                        if (acc[study.id]) {
+                            samples = _.union(acc[study.id], samples);
+                        }
+                        acc[study.id] = samples;
+                    });
+                    return acc;
+                },
+                {} as { [id: string]: string[] }
+            );
 
             if (!_.isEmpty(result)) {
-                result = _.reduce(this.filteredPhysicalStudies.result, (acc, next) => {
-                    acc[next.studyId] = [];
-                    return acc;
-                }, result);
+                result = _.reduce(
+                    this.filteredPhysicalStudies.result,
+                    (acc, next) => {
+                        acc[next.studyId] = [];
+                        return acc;
+                    },
+                    result
+                );
 
-                let studySamplesToFetch = _.reduce(result, (acc, samples, studyId) => {
-                    if (samples.length === 0) {
-                        acc.push(studyId);
-                    }
-                    return acc;
-                }, [] as string[])
+                let studySamplesToFetch = _.reduce(
+                    result,
+                    (acc, samples, studyId) => {
+                        if (samples.length === 0) {
+                            acc.push(studyId);
+                        }
+                        return acc;
+                    },
+                    [] as string[]
+                );
 
-                await Promise.all(_.map(studySamplesToFetch, studyId => {
-                    return defaultClient.getAllSamplesInStudyUsingGET({
-                        studyId: studyId
-                    }).then(samples => {
-                        result[studyId] = samples.map(sample => sample.sampleId);
+                await Promise.all(
+                    _.map(studySamplesToFetch, studyId => {
+                        return defaultClient
+                            .getAllSamplesInStudyUsingGET({
+                                studyId: studyId,
+                            })
+                            .then(samples => {
+                                result[studyId] = samples.map(
+                                    sample => sample.sampleId
+                                );
+                            });
                     })
-                }))
+                );
             }
 
-            return _.flatten(_.map(result, (samples, studyId) =>
-                samples.map(sampleId => {
-                    return {
-                        sampleId,
-                        studyId
-                    }
-                })
-            ));
+            return _.flatten(
+                _.map(result, (samples, studyId) =>
+                    samples.map(sampleId => {
+                        return {
+                            sampleId,
+                            studyId,
+                        };
+                    })
+                )
+            );
         },
-        default: []
+        default: [],
     });
 
     // all queried studies, includes both physcial and virtual studies
     // this is used in page header(name and description)
     readonly displayedStudies = remoteData({
-        await: () => [this.filteredVirtualStudies, this.filteredPhysicalStudies, this.queriedPhysicalStudies],
+        await: () => [
+            this.filteredVirtualStudies,
+            this.filteredPhysicalStudies,
+            this.queriedPhysicalStudies,
+        ],
         invoke: async () => {
-            if (this.filteredPhysicalStudies.result.length === 0 && this.filteredVirtualStudies.result.length === 1) {
-
-                const virtualStudy = this.filteredVirtualStudies.result[0]
-                return [{
-                    name: virtualStudy.data.name,
-                    description: virtualStudy.data.description,
-                    studyId: virtualStudy.id,
-                } as CancerStudy]
+            if (
+                this.filteredPhysicalStudies.result.length === 0 &&
+                this.filteredVirtualStudies.result.length === 1
+            ) {
+                const virtualStudy = this.filteredVirtualStudies.result[0];
+                return [
+                    {
+                        name: virtualStudy.data.name,
+                        description: virtualStudy.data.description,
+                        studyId: virtualStudy.id,
+                    } as CancerStudy,
+                ];
             } else {
                 return this.queriedPhysicalStudies.result;
             }
         },
-        default: []
+        default: [],
     });
 
     @computed get showOriginStudiesInSummaryDescription() {
-        return showOriginStudiesInSummaryDescription(this.filteredPhysicalStudies.result, this.filteredVirtualStudies.result);
+        return showOriginStudiesInSummaryDescription(
+            this.filteredPhysicalStudies.result,
+            this.filteredVirtualStudies.result
+        );
     }
 
     // origin/parent studies to be shown in summary description
     // this would be empty in all cases except if only one virtual study in queried
     readonly originStudies = remoteData({
-        await: () => [this.filteredPhysicalStudies, this.filteredVirtualStudies],
+        await: () => [
+            this.filteredPhysicalStudies,
+            this.filteredVirtualStudies,
+        ],
         invoke: async () => {
             let studies: CancerStudy[] = [];
-            if(this.showOriginStudiesInSummaryDescription) {
-                const originStudyIds = this.filteredVirtualStudies.result[0].data.origin;
+            if (this.showOriginStudiesInSummaryDescription) {
+                const originStudyIds = this.filteredVirtualStudies.result[0]
+                    .data.origin;
                 const virtualStudyIds: string[] = [];
                 const physicalStudiesSet = this.physicalStudiesSet.result;
                 _.each(originStudyIds, studyId => {
@@ -1958,159 +2545,210 @@ export class StudyViewPageStore {
                     } else {
                         virtualStudyIds.push(studyId);
                     }
-                })
-                await Promise.all(virtualStudyIds.map(id =>
-                    sessionServiceClient
-                        .getVirtualStudy(id)
-                        .then((virtualStudy) => {
-                            studies.push({
-                                name: virtualStudy.data.name,
-                                description: virtualStudy.data.description,
-                                studyId: virtualStudy.id,
-                            } as CancerStudy);
-                        })
-                        .catch(error => { /*do nothing*/ })
-                ));
+                });
+                await Promise.all(
+                    virtualStudyIds.map(id =>
+                        sessionServiceClient
+                            .getVirtualStudy(id)
+                            .then(virtualStudy => {
+                                studies.push({
+                                    name: virtualStudy.data.name,
+                                    description: virtualStudy.data.description,
+                                    studyId: virtualStudy.id,
+                                } as CancerStudy);
+                            })
+                            .catch(error => {
+                                /*do nothing*/
+                            })
+                    )
+                );
             }
             return studies;
         },
-        default: []
+        default: [],
     });
 
     readonly unknownQueriedIds = remoteData({
-        await: () => [this.filteredPhysicalStudies, this.filteredVirtualStudies],
+        await: () => [
+            this.filteredPhysicalStudies,
+            this.filteredVirtualStudies,
+        ],
         invoke: async () => {
-            let validIds:string[] = [];
-            _.each(this.filteredPhysicalStudies.result,study => validIds.push(study.studyId));
-            _.each(this.filteredVirtualStudies.result,study => validIds.push(study.id));
+            let validIds: string[] = [];
+            _.each(this.filteredPhysicalStudies.result, study =>
+                validIds.push(study.studyId)
+            );
+            _.each(this.filteredVirtualStudies.result, study =>
+                validIds.push(study.id)
+            );
             return _.filter(this.studyIds, id => !_.includes(validIds, id));
         },
-        onError: (error => {
-        }),
-        onResult: (unknownIds) => {
+        onError: error => {},
+        onResult: unknownIds => {
             if (unknownIds.length > 0) {
                 this.pageStatusMessages['unknownIds'] = {
                     status: 'danger',
-                    message: `Unknown/Unauthorized ${unknownIds.length > 1 ? 'studies' : 'study'} ${unknownIds.join(', ')}`
+                    message: `Unknown/Unauthorized ${
+                        unknownIds.length > 1 ? 'studies' : 'study'
+                    } ${unknownIds.join(', ')}`,
                 };
             }
         },
-        default: []
+        default: [],
     });
 
     readonly mutationProfiles = remoteData({
-        await: ()=>[this.molecularProfiles],
-        invoke: async ()=>{
-            return Promise.resolve(this.getMolecularProfilesByAlterationType("MUTATION_EXTENDED"))
+        await: () => [this.molecularProfiles],
+        invoke: async () => {
+            return Promise.resolve(
+                this.getMolecularProfilesByAlterationType('MUTATION_EXTENDED')
+            );
         },
-        onError: (error => {}),
-        default: []
+        onError: error => {},
+        default: [],
     });
 
     readonly structuralVariantProfiles = remoteData({
-        await: ()=>[this.molecularProfiles],
-        invoke: async ()=>{
-            return Promise.resolve(this.getMolecularProfilesByAlterationType("STRUCTURAL_VARIANT"))
+        await: () => [this.molecularProfiles],
+        invoke: async () => {
+            return Promise.resolve(
+                this.getMolecularProfilesByAlterationType('STRUCTURAL_VARIANT')
+            );
         },
-        onError: (error => {}),
-        default: []
+        onError: error => {},
+        default: [],
     });
 
     readonly cnaProfiles = remoteData({
-        await: ()=>[this.molecularProfiles],
-        invoke: async ()=>{
+        await: () => [this.molecularProfiles],
+        invoke: async () => {
             return Promise.resolve(
-                this.getMolecularProfilesByAlterationType("COPY_NUMBER_ALTERATION","DISCRETE"))
+                this.getMolecularProfilesByAlterationType(
+                    'COPY_NUMBER_ALTERATION',
+                    'DISCRETE'
+                )
+            );
         },
-        onError: (error => {}),
-        default: []
+        onError: error => {},
+        default: [],
     });
 
-    private getMolecularProfilesByAlterationType(alterationType:string, dataType?:string) {
+    private getMolecularProfilesByAlterationType(
+        alterationType: string,
+        dataType?: string
+    ) {
         if (_.isEmpty(dataType)) {
-            return this.molecularProfiles
-                .result
-                .filter(profile => profile.molecularAlterationType === alterationType)
+            return this.molecularProfiles.result.filter(
+                profile => profile.molecularAlterationType === alterationType
+            );
         } else {
-            return this.molecularProfiles
-                .result
-                .filter(profile => profile.molecularAlterationType === alterationType && profile.datatype === dataType)
+            return this.molecularProfiles.result.filter(
+                profile =>
+                    profile.molecularAlterationType === alterationType &&
+                    profile.datatype === dataType
+            );
         }
-
     }
 
     private getDefaultClinicalDataBinFilter(attribute: ClinicalAttribute) {
         return {
             attributeId: attribute.clinicalAttributeId,
-            disableLogScale: false
+            disableLogScale: false,
         } as ClinicalDataBinFilter;
     }
 
     readonly clinicalAttributes = remoteData({
         await: () => [this.queriedPhysicalStudyIds],
-        invoke: async () => _.uniqBy(await defaultClient.fetchClinicalAttributesUsingPOST({
-            studyIds: this.queriedPhysicalStudyIds.result
-        }), clinicalAttribute => `${clinicalAttribute.patientAttribute}-${clinicalAttribute.clinicalAttributeId}`),
+        invoke: async () =>
+            _.uniqBy(
+                await defaultClient.fetchClinicalAttributesUsingPOST({
+                    studyIds: this.queriedPhysicalStudyIds.result,
+                }),
+                clinicalAttribute =>
+                    `${clinicalAttribute.patientAttribute}-${clinicalAttribute.clinicalAttributeId}`
+            ),
         default: [],
-        onError: (error => {}),
-        onResult:(clinicalAttributes)=>{
-            clinicalAttributes.forEach((obj:ClinicalAttribute) => {
-                if(obj.datatype === DataType.NUMBER) {
+        onError: error => {},
+        onResult: clinicalAttributes => {
+            clinicalAttributes.forEach((obj: ClinicalAttribute) => {
+                if (obj.datatype === DataType.NUMBER) {
                     const uniqueKey = getUniqueKey(obj);
                     let filter = this.getDefaultClinicalDataBinFilter(obj);
 
                     if (STUDY_VIEW_CONFIG.initialBins[uniqueKey]) {
-                        filter.customBins = STUDY_VIEW_CONFIG.initialBins[uniqueKey];
+                        filter.customBins =
+                            STUDY_VIEW_CONFIG.initialBins[uniqueKey];
                     }
                     this._clinicalDataBinFilterSet.set(uniqueKey, filter);
                 }
             });
-        }
+        },
     });
 
     readonly clinicalAttributeIdToClinicalAttribute = remoteData({
-        await:()=>[this.clinicalAttributes],
-        invoke:async()=>{
-            return _.keyBy(this.clinicalAttributes.result!, "clinicalAttributeId");
-        }
+        await: () => [this.clinicalAttributes],
+        invoke: async () => {
+            return _.keyBy(
+                this.clinicalAttributes.result!,
+                'clinicalAttributeId'
+            );
+        },
     });
 
     readonly clinicalAttributeIdToDataType = remoteData({
         await: () => [this.clinicalAttributes],
         invoke: async () => {
-            return _.reduce(this.clinicalAttributes.result!, (acc, clinicalAttribute) => {
-                if (acc[clinicalAttribute.clinicalAttributeId] === undefined) {
-                    acc[clinicalAttribute.clinicalAttributeId] = clinicalAttribute.datatype;
-                } else if (acc[clinicalAttribute.clinicalAttributeId] !== clinicalAttribute.datatype) {
-                    acc[clinicalAttribute.clinicalAttributeId] = DataType.STRING;
-                }
-                return acc;
-            }, {} as { [id: string]: string });
-        }
+            return _.reduce(
+                this.clinicalAttributes.result!,
+                (acc, clinicalAttribute) => {
+                    if (
+                        acc[clinicalAttribute.clinicalAttributeId] === undefined
+                    ) {
+                        acc[clinicalAttribute.clinicalAttributeId] =
+                            clinicalAttribute.datatype;
+                    } else if (
+                        acc[clinicalAttribute.clinicalAttributeId] !==
+                        clinicalAttribute.datatype
+                    ) {
+                        acc[clinicalAttribute.clinicalAttributeId] =
+                            DataType.STRING;
+                    }
+                    return acc;
+                },
+                {} as { [id: string]: string }
+            );
+        },
     });
 
-    readonly MDACCHeatmapStudyMeta = remoteData({
-        await: () => [this.queriedPhysicalStudyIds],
-        onError: (error => {}),
-        invoke: async () => {
-            if (AppConfig.serverConfig.show_mdacc_heatmap) {
-                let isSinglePhysicalStudy = this.queriedPhysicalStudyIds.result.length === 1;
-                if (isSinglePhysicalStudy) {
-                    return await getHeatmapMeta(getMDAndersonHeatmapStudyMetaUrl(this.queriedPhysicalStudyIds.result[0]));
+    readonly MDACCHeatmapStudyMeta = remoteData(
+        {
+            await: () => [this.queriedPhysicalStudyIds],
+            onError: error => {},
+            invoke: async () => {
+                if (AppConfig.serverConfig.show_mdacc_heatmap) {
+                    let isSinglePhysicalStudy =
+                        this.queriedPhysicalStudyIds.result.length === 1;
+                    if (isSinglePhysicalStudy) {
+                        return await getHeatmapMeta(
+                            getMDAndersonHeatmapStudyMetaUrl(
+                                this.queriedPhysicalStudyIds.result[0]
+                            )
+                        );
+                    }
                 }
-            }
-            return [];  // if not enabled or conditions not met, just return default answer
-        }
-    }, []);
+                return []; // if not enabled or conditions not met, just return default answer
+            },
+        },
+        []
+    );
 
     readonly oncokbCancerGenes = remoteData<CancerGene[]>({
         await: () => [],
         invoke: async () => {
             return oncoKBClient.utilsCancerGeneListGetUsingGET_1({});
         },
-        onError: (error => {
-        }),
-        default: []
+        onError: error => {},
+        default: [],
     });
 
     readonly oncokbGenes = remoteData<OncoKbGene[]>({
@@ -2118,9 +2756,8 @@ export class StudyViewPageStore {
         invoke: async () => {
             return oncoKBClient.genesGetUsingGET({});
         },
-        onError: (error => {
-        }),
-        default: []
+        onError: error => {},
+        default: [],
     });
 
     readonly oncokbCancerGeneEntrezGeneIds = remoteData<number[]>({
@@ -2128,31 +2765,37 @@ export class StudyViewPageStore {
         invoke: async () => {
             return this.oncokbCancerGenes.result.map(gene => gene.entrezGeneId);
         },
-        default: []
+        default: [],
     });
 
     readonly oncokbAnnotatedGeneEntrezGeneIds = remoteData<number[]>({
         await: () => [this.oncokbCancerGenes],
         invoke: async () => {
-            return this.oncokbCancerGenes.result.filter(gene => gene.oncokbAnnotated).map(gene => gene.entrezGeneId);
+            return this.oncokbCancerGenes.result
+                .filter(gene => gene.oncokbAnnotated)
+                .map(gene => gene.entrezGeneId);
         },
-        default: []
+        default: [],
     });
 
     readonly oncokbOncogeneEntrezGeneIds = remoteData<number[]>({
         await: () => [this.oncokbGenes],
         invoke: async () => {
-            return this.oncokbGenes.result.filter(gene => gene.oncogene).map(gene => gene.entrezGeneId);
+            return this.oncokbGenes.result
+                .filter(gene => gene.oncogene)
+                .map(gene => gene.entrezGeneId);
         },
-        default: []
+        default: [],
     });
 
     readonly oncokbTumorSuppressorGeneEntrezGeneIds = remoteData<number[]>({
         await: () => [this.oncokbGenes],
         invoke: async () => {
-            return this.oncokbGenes.result.filter(gene => gene.tsg).map(gene => gene.entrezGeneId);
+            return this.oncokbGenes.result
+                .filter(gene => gene.tsg)
+                .map(gene => gene.entrezGeneId);
         },
-        default: []
+        default: [],
     });
 
     @computed get oncokbCancerGeneFilterEnabled() {
@@ -2163,13 +2806,21 @@ export class StudyViewPageStore {
     }
 
     @computed get isSingleVirtualStudyPageWithoutFilter() {
-        return (this.filteredPhysicalStudies.result.length + this.filteredVirtualStudies.result.length) === 1 && this.filteredVirtualStudies.result.length > 0 && !this.chartsAreFiltered;
+        return (
+            this.filteredPhysicalStudies.result.length +
+                this.filteredVirtualStudies.result.length ===
+                1 &&
+            this.filteredVirtualStudies.result.length > 0 &&
+            !this.chartsAreFiltered
+        );
     }
 
     @computed get analysisGroupsPossible() {
         // analysis groups possible iff there are visible analysis groups-capable charts
-        const analysisGroupsCharts =
-            [UniqueKey.DISEASE_FREE_SURVIVAL, UniqueKey.OVERALL_SURVIVAL] as string[];
+        const analysisGroupsCharts = [
+            UniqueKey.DISEASE_FREE_SURVIVAL,
+            UniqueKey.OVERALL_SURVIVAL,
+        ] as string[];
         let ret = false;
         for (const chartMeta of this.visibleAttributes) {
             if (analysisGroupsCharts.includes(chartMeta.uniqueKey)) {
@@ -2182,51 +2833,71 @@ export class StudyViewPageStore {
 
     @autobind
     isChartNameValid(chartName: string) {
-        const match = _.find(this.chartMetaSet, chartMeta => chartMeta.displayName.toUpperCase() === chartName.toUpperCase());
+        const match = _.find(
+            this.chartMetaSet,
+            chartMeta =>
+                chartMeta.displayName.toUpperCase() === chartName.toUpperCase()
+        );
         return match === undefined;
     }
     @autobind
     getDefaultCustomChartName() {
-        return `${DEFAULT_CHART_NAME} ${this._customCharts.size - SPECIAL_CHARTS.length + 1}`;
+        return `${DEFAULT_CHART_NAME} ${this._customCharts.size -
+            SPECIAL_CHARTS.length +
+            1}`;
     }
 
     @autobind
-    @action addCustomChart(newChart:CustomChart, uniqueKey:string = this.newCustomChartUniqueKey(), loadedfromUserSettings:boolean=false) {
-        const newChartName = newChart.name ? newChart.name : this.getDefaultCustomChartName();
-        let chartMeta:ChartMeta = {
+    @action
+    addCustomChart(
+        newChart: CustomChart,
+        uniqueKey: string = this.newCustomChartUniqueKey(),
+        loadedfromUserSettings: boolean = false
+    ) {
+        const newChartName = newChart.name
+            ? newChart.name
+            : this.getDefaultCustomChartName();
+        let chartMeta: ChartMeta = {
             uniqueKey: uniqueKey,
             displayName: newChartName,
             description: newChartName,
             dataType: getChartMetaDataType(uniqueKey),
             patientAttribute: false,
             renderWhenDataChange: false,
-            priority: 1
+            priority: 1,
         };
         let allCases: CustomChartIdentifierWithValue[] = [];
-        if(newChart.patientAttribute) {
+        if (newChart.patientAttribute) {
             chartMeta.patientAttribute = true;
         }
-        _.each(newChart.groups, (group:CustomGroup) => {
-            _.reduce(group.sampleIdentifiers, (acc, next) => {
-                acc.push({
-                    studyId: next.studyId,
-                    sampleId: next.sampleId,
-                    patientId: next.patientId,
-                    value: group.name
-                });
-                return acc;
-            }, allCases)
+        _.each(newChart.groups, (group: CustomGroup) => {
+            _.reduce(
+                group.sampleIdentifiers,
+                (acc, next) => {
+                    acc.push({
+                        studyId: next.studyId,
+                        sampleId: next.sampleId,
+                        patientId: next.patientId,
+                        value: group.name,
+                    });
+                    return acc;
+                },
+                allCases
+            );
         });
         this._customCharts.set(uniqueKey, chartMeta);
-        this._customChartMap.set(uniqueKey, newChart)
+        this._customChartMap.set(uniqueKey, newChart);
         this._chartVisibility.set(uniqueKey, true);
         this._customChartsSelectedCases.set(uniqueKey, allCases);
         this.chartsType.set(uniqueKey, ChartTypeEnum.PIE_CHART);
-        this.chartsDimension.set(uniqueKey, {w: 1, h: 1});
+        this.chartsDimension.set(uniqueKey, { w: 1, h: 1 });
 
         // Autoselect the groups
-        if(!loadedfromUserSettings) {
-            this.setCustomChartFilters(chartMeta.uniqueKey, newChart.groups.map(group=>group.name));
+        if (!loadedfromUserSettings) {
+            this.setCustomChartFilters(
+                chartMeta.uniqueKey,
+                newChart.groups.map(group => group.name)
+            );
             this.newlyAddedCharts.clear();
             this.newlyAddedCharts.push(uniqueKey);
         }
@@ -2236,158 +2907,241 @@ export class StudyViewPageStore {
     @action
     updateCustomSelect(newChart: CustomChart) {
         this.clearAllFilters();
-        const sampleIdentifiers = _.reduce(newChart.groups, (acc, next) => {
-            acc.push(...next.sampleIdentifiers.map((customCase: CustomChartIdentifier) => {
-                return {
-                    sampleId: customCase.sampleId,
-                    studyId: customCase.studyId
-                };
-            }));
-            return acc;
-        }, [] as SampleIdentifier[]);
-        this.numberOfSelectedSamplesInCustomSelection = sampleIdentifiers.length;
-        this.updateChartSampleIdentifierFilter(UniqueKey.CUSTOM_SELECT, sampleIdentifiers, false);
+        const sampleIdentifiers = _.reduce(
+            newChart.groups,
+            (acc, next) => {
+                acc.push(
+                    ...next.sampleIdentifiers.map(
+                        (customCase: CustomChartIdentifier) => {
+                            return {
+                                sampleId: customCase.sampleId,
+                                studyId: customCase.studyId,
+                            };
+                        }
+                    )
+                );
+                return acc;
+            },
+            [] as SampleIdentifier[]
+        );
+        this.numberOfSelectedSamplesInCustomSelection =
+            sampleIdentifiers.length;
+        this.updateChartSampleIdentifierFilter(
+            UniqueKey.CUSTOM_SELECT,
+            sampleIdentifiers,
+            false
+        );
     }
 
     @computed
     get chartMetaSet(): { [id: string]: ChartMeta } {
-        let _chartMetaSet: { [id: string]: ChartMeta } = _.reduce(this._customCharts.values(), (acc: { [id: string]: ChartMeta }, chartMeta:ChartMeta) => {
-            acc[chartMeta.uniqueKey] = toJS(chartMeta);
-            return acc
-        }, {} as { [id: string]: ChartMeta });
+        let _chartMetaSet: { [id: string]: ChartMeta } = _.reduce(
+            this._customCharts.values(),
+            (acc: { [id: string]: ChartMeta }, chartMeta: ChartMeta) => {
+                acc[chartMeta.uniqueKey] = toJS(chartMeta);
+                return acc;
+            },
+            {} as { [id: string]: ChartMeta }
+        );
 
         // Add meta information for each of the clinical attribute
         // Convert to a Set for easy access and to update attribute meta information(would be useful while adding new features)
-        _.reduce(this.clinicalAttributes.result, (acc: { [id: string]: ChartMeta }, attribute) => {
-            const uniqueKey = getUniqueKey(attribute);
-            acc[uniqueKey] = {
-                displayName: attribute.displayName,
-                uniqueKey: uniqueKey,
-                dataType: getChartMetaDataType(uniqueKey),
-                patientAttribute:attribute.patientAttribute,
-                description: attribute.description,
-                priority: getPriorityByClinicalAttribute(attribute),
-                renderWhenDataChange: false,
-                clinicalAttribute: attribute
-            };
-            return acc
-        }, _chartMetaSet);
-
-        _.reduce(this.survivalPlots, (acc: { [id: string]: ChartMeta }, survivalPlot) => {
-            acc[survivalPlot.id] = {
-                uniqueKey: survivalPlot.id,
-                dataType: getChartMetaDataType(survivalPlot.id),
-                patientAttribute:true,
-                displayName: survivalPlot.title,
-                priority: getDefaultPriorityByUniqueKey(survivalPlot.id),
-                renderWhenDataChange: false,
-                description: ''
-            };
-            return acc;
-        }, _chartMetaSet);
+        _.reduce(
+            this.clinicalAttributes.result,
+            (acc: { [id: string]: ChartMeta }, attribute) => {
+                const uniqueKey = getUniqueKey(attribute);
+                acc[uniqueKey] = {
+                    displayName: attribute.displayName,
+                    uniqueKey: uniqueKey,
+                    dataType: getChartMetaDataType(uniqueKey),
+                    patientAttribute: attribute.patientAttribute,
+                    description: attribute.description,
+                    priority: getPriorityByClinicalAttribute(attribute),
+                    renderWhenDataChange: false,
+                    clinicalAttribute: attribute,
+                };
+                return acc;
+            },
+            _chartMetaSet
+        );
+
+        _.reduce(
+            this.survivalPlots,
+            (acc: { [id: string]: ChartMeta }, survivalPlot) => {
+                acc[survivalPlot.id] = {
+                    uniqueKey: survivalPlot.id,
+                    dataType: getChartMetaDataType(survivalPlot.id),
+                    patientAttribute: true,
+                    displayName: survivalPlot.title,
+                    priority: getDefaultPriorityByUniqueKey(survivalPlot.id),
+                    renderWhenDataChange: false,
+                    description: '',
+                };
+                return acc;
+            },
+            _chartMetaSet
+        );
 
         if (!_.isEmpty(this.mutationProfiles.result)) {
-            const uniqueKey = getUniqueKeyFromMolecularProfileIds(this.mutationProfiles.result.map(mutationProfile=>mutationProfile.molecularProfileId))
+            const uniqueKey = getUniqueKeyFromMolecularProfileIds(
+                this.mutationProfiles.result.map(
+                    mutationProfile => mutationProfile.molecularProfileId
+                )
+            );
             _chartMetaSet[uniqueKey] = {
                 uniqueKey: uniqueKey,
                 dataType: getChartMetaDataType(UniqueKey.MUTATED_GENES_TABLE),
-                patientAttribute:false,
+                patientAttribute: false,
                 displayName: 'Mutated Genes',
-                priority: getDefaultPriorityByUniqueKey(UniqueKey.MUTATED_GENES_TABLE),
+                priority: getDefaultPriorityByUniqueKey(
+                    UniqueKey.MUTATED_GENES_TABLE
+                ),
                 renderWhenDataChange: false,
-                description: ''
+                description: '',
             };
         }
 
         if (!_.isEmpty(this.structuralVariantProfiles.result)) {
-            const uniqueKey = getUniqueKeyFromMolecularProfileIds(this.structuralVariantProfiles.result.map(profile=>profile.molecularProfileId))
+            const uniqueKey = getUniqueKeyFromMolecularProfileIds(
+                this.structuralVariantProfiles.result.map(
+                    profile => profile.molecularProfileId
+                )
+            );
             _chartMetaSet[uniqueKey] = {
                 uniqueKey: uniqueKey,
                 dataType: getChartMetaDataType(UniqueKey.FUSION_GENES_TABLE),
                 patientAttribute: false,
                 displayName: 'Fusion Genes',
-                priority: getDefaultPriorityByUniqueKey(UniqueKey.FUSION_GENES_TABLE),
+                priority: getDefaultPriorityByUniqueKey(
+                    UniqueKey.FUSION_GENES_TABLE
+                ),
                 renderWhenDataChange: true,
-                description: ''
+                description: '',
             };
         }
 
         if (!_.isEmpty(this.cnaProfiles.result)) {
-            const uniqueKey = getUniqueKeyFromMolecularProfileIds(this.cnaProfiles.result.map(mutationProfile=>mutationProfile.molecularProfileId))
+            const uniqueKey = getUniqueKeyFromMolecularProfileIds(
+                this.cnaProfiles.result.map(
+                    mutationProfile => mutationProfile.molecularProfileId
+                )
+            );
             _chartMetaSet[uniqueKey] = {
                 uniqueKey: uniqueKey,
                 dataType: getChartMetaDataType(UniqueKey.CNA_GENES_TABLE),
-                patientAttribute:false,
+                patientAttribute: false,
                 displayName: 'CNA Genes',
                 renderWhenDataChange: false,
-                priority: getDefaultPriorityByUniqueKey(UniqueKey.CNA_GENES_TABLE),
-                description: ''
+                priority: getDefaultPriorityByUniqueKey(
+                    UniqueKey.CNA_GENES_TABLE
+                ),
+                description: '',
             };
         }
 
-        const scatterRequiredParams = _.reduce(this.clinicalAttributes.result, (acc, next) => {
-            if (MUTATION_COUNT === next.clinicalAttributeId) {
-                acc[MUTATION_COUNT] = true
-            }
-            if (FRACTION_GENOME_ALTERED === next.clinicalAttributeId) {
-                acc[FRACTION_GENOME_ALTERED] = true
-            }
-            return acc;
-        }, {[MUTATION_COUNT]: false, [FRACTION_GENOME_ALTERED]: false});
+        const scatterRequiredParams = _.reduce(
+            this.clinicalAttributes.result,
+            (acc, next) => {
+                if (MUTATION_COUNT === next.clinicalAttributeId) {
+                    acc[MUTATION_COUNT] = true;
+                }
+                if (FRACTION_GENOME_ALTERED === next.clinicalAttributeId) {
+                    acc[FRACTION_GENOME_ALTERED] = true;
+                }
+                return acc;
+            },
+            { [MUTATION_COUNT]: false, [FRACTION_GENOME_ALTERED]: false }
+        );
 
-        if (scatterRequiredParams[MUTATION_COUNT] && scatterRequiredParams[FRACTION_GENOME_ALTERED]) {
+        if (
+            scatterRequiredParams[MUTATION_COUNT] &&
+            scatterRequiredParams[FRACTION_GENOME_ALTERED]
+        ) {
             _chartMetaSet[UniqueKey.MUTATION_COUNT_CNA_FRACTION] = {
-                dataType: getChartMetaDataType(UniqueKey.MUTATION_COUNT_CNA_FRACTION),
-                patientAttribute:false,
+                dataType: getChartMetaDataType(
+                    UniqueKey.MUTATION_COUNT_CNA_FRACTION
+                ),
+                patientAttribute: false,
                 uniqueKey: UniqueKey.MUTATION_COUNT_CNA_FRACTION,
                 displayName: 'Mutation Count vs Fraction of Genome Altered',
-                priority: getDefaultPriorityByUniqueKey(UniqueKey.MUTATION_COUNT_CNA_FRACTION),
+                priority: getDefaultPriorityByUniqueKey(
+                    UniqueKey.MUTATION_COUNT_CNA_FRACTION
+                ),
                 renderWhenDataChange: false,
-                description: ''
+                description: '',
             };
         }
         return _chartMetaSet;
     }
 
     @computed
-    get chartMetaSetWithChartType(): { [id: string]: ChartMeta & { chartType: ChartType } } {
-        return _.reduce(this.chartMetaSet, (acc, chartMeta) => {
-            acc[chartMeta.uniqueKey] = {
-                ...chartMeta,
-                chartType: this.chartsType.get(chartMeta.uniqueKey)
-            }
-            return acc;
-        }, {} as any);
+    get chartMetaSetWithChartType(): {
+        [id: string]: ChartMeta & { chartType: ChartType };
+    } {
+        return _.reduce(
+            this.chartMetaSet,
+            (acc, chartMeta) => {
+                acc[chartMeta.uniqueKey] = {
+                    ...chartMeta,
+                    chartType: this.chartsType.get(chartMeta.uniqueKey),
+                };
+                return acc;
+            },
+            {} as any
+        );
     }
 
     @computed
     get visibleAttributes(): ChartMeta[] {
-        return _.reduce(this._chartVisibility.entries(), (acc, [chartUniqueKey, visible]) => {
-            if (visible && this.chartMetaSet[chartUniqueKey]) {
-                let chartMeta = this.chartMetaSet[chartUniqueKey];
-                acc.push(chartMeta);
-            }
-            return acc;
-        }, [] as ChartMeta[]);
+        return _.reduce(
+            this._chartVisibility.entries(),
+            (acc, [chartUniqueKey, visible]) => {
+                if (visible && this.chartMetaSet[chartUniqueKey]) {
+                    let chartMeta = this.chartMetaSet[chartUniqueKey];
+                    acc.push(chartMeta);
+                }
+                return acc;
+            },
+            [] as ChartMeta[]
+        );
     }
 
     @computed
     get showSettingRestoreMsg() {
-        return this.isSavingUserPreferencePossible &&
+        return (
+            this.isSavingUserPreferencePossible &&
             !this.hideRestoreSettingsMsg &&
             this.fetchUserSettings.isComplete &&
-            !_.isEqual(this.previousSettings, _.keyBy(this.fetchUserSettings.result, chartUserSetting => chartUserSetting.id));
+            !_.isEqual(
+                this.previousSettings,
+                _.keyBy(
+                    this.fetchUserSettings.result,
+                    chartUserSetting => chartUserSetting.id
+                )
+            )
+        );
     }
 
     @computed
     get isSavingUserSettingsPossible() {
-        return this.isSavingUserPreferencePossible && this.fetchUserSettings.isComplete &&
-            (!this.showSettingRestoreMsg || !_.isEqual(this.currentChartSettingsMap, _.keyBy(this.fetchUserSettings.result, chartSetting => chartSetting.id)))
+        return (
+            this.isSavingUserPreferencePossible &&
+            this.fetchUserSettings.isComplete &&
+            (!this.showSettingRestoreMsg ||
+                !_.isEqual(
+                    this.currentChartSettingsMap,
+                    _.keyBy(
+                        this.fetchUserSettings.result,
+                        chartSetting => chartSetting.id
+                    )
+                ))
+        );
     }
 
     @computed
     get loadingInitialDataForSummaryTab() {
-        let pending = this.defaultVisibleAttributes.isPending ||
+        let pending =
+            this.defaultVisibleAttributes.isPending ||
             this.initialVisibleAttributesClinicalDataBinCountData.isPending ||
             this.initialVisibleAttributesClinicalDataCountData.isPending ||
             this.mutationProfiles.isPending ||
@@ -2395,7 +3149,7 @@ export class StudyViewPageStore {
             this.structuralVariantProfiles.isPending;
 
         if (this._loadUserSettingsInitially) {
-            pending = pending || this.fetchUserSettings.isPending
+            pending = pending || this.fetchUserSettings.isPending;
         }
         return pending;
     }
@@ -2406,14 +3160,16 @@ export class StudyViewPageStore {
             if (!_.isEmpty(this.currentChartSettingsMap)) {
                 sessionServiceClient.updateUserSettings({
                     origin: toJS(this.studyIds),
-                    chartSettings: _.values(this.currentChartSettingsMap)
+                    chartSettings: _.values(this.currentChartSettingsMap),
                 });
             }
         }
     }, 3000);
 
     // return contains settings for all visible charts each chart setting
-    @computed private get currentChartSettingsMap(): { [chartId: string]: ChartUserSetting } {
+    @computed private get currentChartSettingsMap(): {
+        [chartId: string]: ChartUserSetting;
+    } {
         let chartSettingsMap: { [chartId: string]: ChartUserSetting } = {};
         if (this.isSavingUserPreferencePossible) {
             chartSettingsMap = getChartSettingsMap(
@@ -2434,9 +3190,14 @@ export class StudyViewPageStore {
 
     readonly fetchUserSettings = remoteData<ChartUserSetting[]>({
         invoke: async () => {
-            if (this.isSavingUserPreferencePossible && this.studyIds.length > 0) {
-                let userSettings = await sessionServiceClient.fetchUserSettings(toJS(this.studyIds));
-                if(userSettings) {
+            if (
+                this.isSavingUserPreferencePossible &&
+                this.studyIds.length > 0
+            ) {
+                let userSettings = await sessionServiceClient.fetchUserSettings(
+                    toJS(this.studyIds)
+                );
+                if (userSettings) {
                     return userSettings.chartSettings || [];
                 }
             }
@@ -2445,11 +3206,12 @@ export class StudyViewPageStore {
         default: [],
         onError: () => {
             // fail silently when an error occurs
-        }
+        },
     });
 
     @autobind
-    @action private clearPageSettings() {
+    @action
+    private clearPageSettings() {
         this._chartVisibility.clear();
         this.currentGridLayout = [];
         this.currentFocusedChartByUser = undefined;
@@ -2457,17 +3219,25 @@ export class StudyViewPageStore {
         this._filterMutatedGenesTableByCancerGenes = true;
         this._filterFusionGenesTableByCancerGenes = true;
         this._filterCNAGenesTableByCancerGenes = true;
-        this._clinicalDataBinFilterSet = observable.map(toJS(this._defaultClinicalDataBinFilterSet));
+        this._clinicalDataBinFilterSet = observable.map(
+            toJS(this._defaultClinicalDataBinFilterSet)
+        );
     }
 
     @autobind
     @action
     loadUserSettings() {
-        if (this.isSavingUserPreferencePossible && !_.isEmpty(this.fetchUserSettings.result)) {
+        if (
+            this.isSavingUserPreferencePossible &&
+            !_.isEmpty(this.fetchUserSettings.result)
+        ) {
             this.loadSettings(this.fetchUserSettings.result);
             // set previousSettings only if user is already logged in
-            if(this._loadUserSettingsInitially){
-                this.previousSettings = _.keyBy(this.fetchUserSettings.result, chartSetting => chartSetting.id);
+            if (this._loadUserSettingsInitially) {
+                this.previousSettings = _.keyBy(
+                    this.fetchUserSettings.result,
+                    chartSetting => chartSetting.id
+                );
             }
         }
     }
@@ -2481,10 +3251,14 @@ export class StudyViewPageStore {
 
     // had to create default variables for eachsince the default chart settings
     // depends on the number of columns (browser width)
-    @observable private _defualtChartsDimension = observable.map<ChartDimension>();
+    @observable private _defualtChartsDimension = observable.map<
+        ChartDimension
+    >();
     @observable private _defaultChartsType = observable.map<ChartType>();
     @observable private _defaultVisibleChartIds: string[] = [];
-    @observable private _defaultClinicalDataBinFilterSet = observable.map<ClinicalDataBinFilter>();
+    @observable private _defaultClinicalDataBinFilterSet = observable.map<
+        ClinicalDataBinFilter
+    >();
 
     @autobind
     @action
@@ -2494,30 +3268,46 @@ export class StudyViewPageStore {
     }
 
     @computed get showResetToDefaultButton() {
-        return !_.isEqual(this.currentChartSettingsMap, this.defaultChartSettingsMap);
+        return !_.isEqual(
+            this.currentChartSettingsMap,
+            this.defaultChartSettingsMap
+        );
     }
 
-    @computed private get defaultChartSettingsMap(): { [chartId: string]: ChartUserSetting } {
+    @computed private get defaultChartSettingsMap(): {
+        [chartId: string]: ChartUserSetting;
+    } {
         return getChartSettingsMap(
-            this._defaultVisibleChartIds.map(chartUniqueKey => this.chartMetaSet[chartUniqueKey]),
+            this._defaultVisibleChartIds.map(
+                chartUniqueKey => this.chartMetaSet[chartUniqueKey]
+            ),
             this.columns,
             this._defualtChartsDimension.toJS(),
             this._defaultChartsType.toJS(),
             {},
-            this._defaultClinicalDataBinFilterSet.toJS());
+            this._defaultClinicalDataBinFilterSet.toJS()
+        );
     }
 
     @autobind
     @action
-    private loadSettings(chartSettngs: ChartUserSetting[]){
+    private loadSettings(chartSettngs: ChartUserSetting[]) {
         this.clearPageSettings();
         _.map(chartSettngs, chartUserSettings => {
-            if (chartUserSettings.name && chartUserSettings.groups && chartUserSettings.groups.length > 0) {
-                this.addCustomChart({
-                    name: chartUserSettings.name,
-                    groups: chartUserSettings.groups || [],
-                    patientAttribute: chartUserSettings.patientAttribute,
-                }, chartUserSettings.id, true);
+            if (
+                chartUserSettings.name &&
+                chartUserSettings.groups &&
+                chartUserSettings.groups.length > 0
+            ) {
+                this.addCustomChart(
+                    {
+                        name: chartUserSettings.name,
+                        groups: chartUserSettings.groups || [],
+                        patientAttribute: chartUserSettings.patientAttribute,
+                    },
+                    chartUserSettings.id,
+                    true
+                );
             }
 
             if (chartUserSettings.layout) {
@@ -2526,32 +3316,44 @@ export class StudyViewPageStore {
                     isResizable: false,
                     moved: false,
                     static: false,
-                    ...chartUserSettings.layout
+                    ...chartUserSettings.layout,
                 });
                 this.chartsDimension.set(chartUserSettings.id, {
                     w: chartUserSettings.layout.w,
-                    h: chartUserSettings.layout.h
+                    h: chartUserSettings.layout.h,
                 });
             }
 
             switch (chartUserSettings.chartType) {
                 case UniqueKey.MUTATED_GENES_TABLE:
-                    this._filterMutatedGenesTableByCancerGenes = chartUserSettings.filterByCancerGenes === undefined ? true : chartUserSettings.filterByCancerGenes;
+                    this._filterMutatedGenesTableByCancerGenes =
+                        chartUserSettings.filterByCancerGenes === undefined
+                            ? true
+                            : chartUserSettings.filterByCancerGenes;
                     break;
                 case UniqueKey.FUSION_GENES_TABLE:
-                    this._filterFusionGenesTableByCancerGenes = chartUserSettings.filterByCancerGenes === undefined ? true : chartUserSettings.filterByCancerGenes;
+                    this._filterFusionGenesTableByCancerGenes =
+                        chartUserSettings.filterByCancerGenes === undefined
+                            ? true
+                            : chartUserSettings.filterByCancerGenes;
                     break;
                 case UniqueKey.CNA_GENES_TABLE:
-                    this._filterCNAGenesTableByCancerGenes = chartUserSettings.filterByCancerGenes === undefined ? true : chartUserSettings.filterByCancerGenes;
+                    this._filterCNAGenesTableByCancerGenes =
+                        chartUserSettings.filterByCancerGenes === undefined
+                            ? true
+                            : chartUserSettings.filterByCancerGenes;
                     break;
                 case ChartTypeEnum.BAR_CHART:
-                    let ref = this._clinicalDataBinFilterSet.get(chartUserSettings.id);
+                    let ref = this._clinicalDataBinFilterSet.get(
+                        chartUserSettings.id
+                    );
                     if (ref) {
                         if (chartUserSettings.customBins) {
                             ref.customBins = chartUserSettings.customBins;
                         }
                         if (chartUserSettings.disableLogScale) {
-                            ref.disableLogScale = chartUserSettings.disableLogScale;
+                            ref.disableLogScale =
+                                chartUserSettings.disableLogScale;
                         }
                     }
                     break;
@@ -2559,7 +3361,11 @@ export class StudyViewPageStore {
                     break;
             }
             this.changeChartVisibility(chartUserSettings.id, true);
-            chartUserSettings.chartType && this.chartsType.set(chartUserSettings.id, chartUserSettings.chartType);
+            chartUserSettings.chartType &&
+                this.chartsType.set(
+                    chartUserSettings.id,
+                    chartUserSettings.chartType
+                );
         });
         this.useCurrentGridLayout = true;
     }
@@ -2570,28 +3376,64 @@ export class StudyViewPageStore {
         this.initializeChartStatsByClinicalAttributes();
 
         if (!_.isEmpty(this.mutationProfiles.result)) {
-            const uniqueKey = getUniqueKeyFromMolecularProfileIds(this.mutationProfiles.result.map(mutationProfile=>mutationProfile.molecularProfileId))
-            const mutatedGeneMeta = _.find(this.chartMetaSet, chartMeta => chartMeta.uniqueKey ===uniqueKey);
+            const uniqueKey = getUniqueKeyFromMolecularProfileIds(
+                this.mutationProfiles.result.map(
+                    mutationProfile => mutationProfile.molecularProfileId
+                )
+            );
+            const mutatedGeneMeta = _.find(
+                this.chartMetaSet,
+                chartMeta => chartMeta.uniqueKey === uniqueKey
+            );
             this.chartsType.set(uniqueKey, ChartTypeEnum.MUTATED_GENES_TABLE);
-            this.chartsDimension.set(uniqueKey, STUDY_VIEW_CONFIG.layout.dimensions[ChartTypeEnum.MUTATED_GENES_TABLE]);
+            this.chartsDimension.set(
+                uniqueKey,
+                STUDY_VIEW_CONFIG.layout.dimensions[
+                    ChartTypeEnum.MUTATED_GENES_TABLE
+                ]
+            );
             if (mutatedGeneMeta && mutatedGeneMeta.priority !== 0) {
                 this.changeChartVisibility(mutatedGeneMeta.uniqueKey, true);
             }
         }
         if (!_.isEmpty(this.structuralVariantProfiles.result)) {
-            const uniqueKey = getUniqueKeyFromMolecularProfileIds(this.structuralVariantProfiles.result.map(profile=>profile.molecularProfileId))
-            const fusionGeneMeta = _.find(this.chartMetaSet, chartMeta => chartMeta.uniqueKey === uniqueKey);
+            const uniqueKey = getUniqueKeyFromMolecularProfileIds(
+                this.structuralVariantProfiles.result.map(
+                    profile => profile.molecularProfileId
+                )
+            );
+            const fusionGeneMeta = _.find(
+                this.chartMetaSet,
+                chartMeta => chartMeta.uniqueKey === uniqueKey
+            );
             if (fusionGeneMeta && fusionGeneMeta.priority !== 0) {
                 this.changeChartVisibility(fusionGeneMeta.uniqueKey, true);
             }
             this.chartsType.set(uniqueKey, ChartTypeEnum.FUSION_GENES_TABLE);
-            this.chartsDimension.set(uniqueKey,STUDY_VIEW_CONFIG.layout.dimensions[ChartTypeEnum.FUSION_GENES_TABLE]);
+            this.chartsDimension.set(
+                uniqueKey,
+                STUDY_VIEW_CONFIG.layout.dimensions[
+                    ChartTypeEnum.FUSION_GENES_TABLE
+                ]
+            );
         }
         if (!_.isEmpty(this.cnaProfiles.result)) {
-            const uniqueKey = getUniqueKeyFromMolecularProfileIds(this.cnaProfiles.result.map(mutationProfile=>mutationProfile.molecularProfileId))
-            const cnaGeneMeta = _.find(this.chartMetaSet, chartMeta => chartMeta.uniqueKey === uniqueKey);
+            const uniqueKey = getUniqueKeyFromMolecularProfileIds(
+                this.cnaProfiles.result.map(
+                    mutationProfile => mutationProfile.molecularProfileId
+                )
+            );
+            const cnaGeneMeta = _.find(
+                this.chartMetaSet,
+                chartMeta => chartMeta.uniqueKey === uniqueKey
+            );
             this.chartsType.set(uniqueKey, ChartTypeEnum.CNA_GENES_TABLE);
-            this.chartsDimension.set(uniqueKey, STUDY_VIEW_CONFIG.layout.dimensions[ChartTypeEnum.CNA_GENES_TABLE]);
+            this.chartsDimension.set(
+                uniqueKey,
+                STUDY_VIEW_CONFIG.layout.dimensions[
+                    ChartTypeEnum.CNA_GENES_TABLE
+                ]
+            );
             if (cnaGeneMeta && cnaGeneMeta.priority !== 0) {
                 this.changeChartVisibility(cnaGeneMeta.uniqueKey, true);
             }
@@ -2599,10 +3441,16 @@ export class StudyViewPageStore {
 
         this.initializeClinicalDataCountCharts();
         this.initializeClinicalDataBinCountCharts();
-        this._defualtChartsDimension = observable.map(this.chartsDimension.toJS());
+        this._defualtChartsDimension = observable.map(
+            this.chartsDimension.toJS()
+        );
         this._defaultChartsType = observable.map(this.chartsType.toJS());
-        this._defaultVisibleChartIds = this.visibleAttributes.map(attribute => attribute.uniqueKey);
-        this._defaultClinicalDataBinFilterSet = observable.map(toJS(this._clinicalDataBinFilterSet));
+        this._defaultVisibleChartIds = this.visibleAttributes.map(
+            attribute => attribute.uniqueKey
+        );
+        this._defaultClinicalDataBinFilterSet = observable.map(
+            toJS(this._clinicalDataBinFilterSet)
+        );
     }
 
     @action
@@ -2616,7 +3464,7 @@ export class StudyViewPageStore {
 
         this.clinicalAttributes.result.forEach((obj: ClinicalAttribute) => {
             const uniqueKey = getUniqueKey(obj);
-            if (obj.priority !== "0") {
+            if (obj.priority !== '0') {
                 if (obj.clinicalAttributeId === OS_STATUS) {
                     osStatusFlag = true;
                 } else if (obj.clinicalAttributeId === OS_MONTHS) {
@@ -2627,55 +3475,107 @@ export class StudyViewPageStore {
                     dfsMonthsFlag = true;
                 } else if (MUTATION_COUNT === obj.clinicalAttributeId) {
                     mutationCountFlag = true;
-                } else if (FRACTION_GENOME_ALTERED === obj.clinicalAttributeId) {
+                } else if (
+                    FRACTION_GENOME_ALTERED === obj.clinicalAttributeId
+                ) {
                     fractionGenomeAlteredFlag = true;
                 }
             }
 
             if (obj.datatype === DataType.NUMBER) {
                 this.chartsType.set(uniqueKey, ChartTypeEnum.BAR_CHART);
-                this.chartsDimension.set(uniqueKey, STUDY_VIEW_CONFIG.layout.dimensions[ChartTypeEnum.BAR_CHART]);
+                this.chartsDimension.set(
+                    uniqueKey,
+                    STUDY_VIEW_CONFIG.layout.dimensions[ChartTypeEnum.BAR_CHART]
+                );
             } else {
                 this.chartsType.set(uniqueKey, ChartTypeEnum.PIE_CHART);
-                this.chartsDimension.set(uniqueKey, STUDY_VIEW_CONFIG.layout.dimensions[ChartTypeEnum.PIE_CHART]);
+                this.chartsDimension.set(
+                    uniqueKey,
+                    STUDY_VIEW_CONFIG.layout.dimensions[ChartTypeEnum.PIE_CHART]
+                );
             }
         });
 
-        const cancerTypeIds = _.uniq(this.queriedPhysicalStudies.result.map(study => study.cancerTypeId));
+        const cancerTypeIds = _.uniq(
+            this.queriedPhysicalStudies.result.map(study => study.cancerTypeId)
+        );
 
         this.chartsType.set(UniqueKey.OVERALL_SURVIVAL, ChartTypeEnum.SURVIVAL);
-        this.chartsDimension.set(UniqueKey.OVERALL_SURVIVAL, STUDY_VIEW_CONFIG.layout.dimensions[ChartTypeEnum.SURVIVAL]);
-        if (osStatusFlag && osMonthsFlag && getDefaultPriorityByUniqueKey(UniqueKey.OVERALL_SURVIVAL) !== 0) {
+        this.chartsDimension.set(
+            UniqueKey.OVERALL_SURVIVAL,
+            STUDY_VIEW_CONFIG.layout.dimensions[ChartTypeEnum.SURVIVAL]
+        );
+        if (
+            osStatusFlag &&
+            osMonthsFlag &&
+            getDefaultPriorityByUniqueKey(UniqueKey.OVERALL_SURVIVAL) !== 0
+        ) {
             // hide OVERALL_SURVIVAL chart if cancer type is mixed or have more than one cancer type
             if (cancerTypeIds.length === 1 && cancerTypeIds[0] !== 'mixed') {
                 this.changeChartVisibility(UniqueKey.OVERALL_SURVIVAL, true);
             }
         }
-        this.chartsType.set(UniqueKey.DISEASE_FREE_SURVIVAL, ChartTypeEnum.SURVIVAL);
-        this.chartsDimension.set(UniqueKey.DISEASE_FREE_SURVIVAL, STUDY_VIEW_CONFIG.layout.dimensions[ChartTypeEnum.SURVIVAL]);
-        if (dfsStatusFlag && dfsMonthsFlag && getDefaultPriorityByUniqueKey(UniqueKey.DISEASE_FREE_SURVIVAL) !== 0) {
+        this.chartsType.set(
+            UniqueKey.DISEASE_FREE_SURVIVAL,
+            ChartTypeEnum.SURVIVAL
+        );
+        this.chartsDimension.set(
+            UniqueKey.DISEASE_FREE_SURVIVAL,
+            STUDY_VIEW_CONFIG.layout.dimensions[ChartTypeEnum.SURVIVAL]
+        );
+        if (
+            dfsStatusFlag &&
+            dfsMonthsFlag &&
+            getDefaultPriorityByUniqueKey(UniqueKey.DISEASE_FREE_SURVIVAL) !== 0
+        ) {
             // hide DISEASE_FREE_SURVIVAL chart if cancer type is mixed or have more than one cancer type
             if (cancerTypeIds.length === 1 && cancerTypeIds[0] !== 'mixed') {
-                this.changeChartVisibility(UniqueKey.DISEASE_FREE_SURVIVAL, true);
+                this.changeChartVisibility(
+                    UniqueKey.DISEASE_FREE_SURVIVAL,
+                    true
+                );
             }
         }
 
-        this.chartsType.set(UniqueKey.MUTATION_COUNT_CNA_FRACTION, ChartTypeEnum.SCATTER);
-        this.chartsDimension.set(UniqueKey.MUTATION_COUNT_CNA_FRACTION, STUDY_VIEW_CONFIG.layout.dimensions[ChartTypeEnum.SCATTER]);
-        if (mutationCountFlag && fractionGenomeAlteredFlag && getDefaultPriorityByUniqueKey(UniqueKey.MUTATION_COUNT_CNA_FRACTION)!== 0) {
-            this.changeChartVisibility(UniqueKey.MUTATION_COUNT_CNA_FRACTION, true);
-        }
+        this.chartsType.set(
+            UniqueKey.MUTATION_COUNT_CNA_FRACTION,
+            ChartTypeEnum.SCATTER
+        );
+        this.chartsDimension.set(
+            UniqueKey.MUTATION_COUNT_CNA_FRACTION,
+            STUDY_VIEW_CONFIG.layout.dimensions[ChartTypeEnum.SCATTER]
+        );
+        if (
+            mutationCountFlag &&
+            fractionGenomeAlteredFlag &&
+            getDefaultPriorityByUniqueKey(
+                UniqueKey.MUTATION_COUNT_CNA_FRACTION
+            ) !== 0
+        ) {
+            this.changeChartVisibility(
+                UniqueKey.MUTATION_COUNT_CNA_FRACTION,
+                true
+            );
+        }
 
         // This is also the proper place to initialize the special charts visibility
         _.each(this.specialChartKeysInCustomCharts, key => {
-            this.showAsPieChart(key, key === UniqueKey.CANCER_STUDIES ? this.cancerStudiesData.result.length : 2);
+            this.showAsPieChart(
+                key,
+                key === UniqueKey.CANCER_STUDIES
+                    ? this.cancerStudiesData.result.length
+                    : 2
+            );
         });
     }
     private getTableDimensionByNumberOfRecords(records: number) {
-        return records <= STUDY_VIEW_CONFIG.thresholds.rowsInTableForOneGrid ? {
-            w: 2,
-            h: 1
-        } : {w: 2, h: 2};
+        return records <= STUDY_VIEW_CONFIG.thresholds.rowsInTableForOneGrid
+            ? {
+                  w: 2,
+                  h: 1,
+              }
+            : { w: 2, h: 2 };
     }
 
     @computed
@@ -2683,15 +3583,18 @@ export class StudyViewPageStore {
         if (this.queriedPhysicalStudyIds.result.length > 1) {
             return [UniqueKey.CANCER_STUDIES];
         } else {
-            return []
+            return [];
         }
     }
 
-    @autobind @action
+    @autobind
+    @action
     changeChartType(attr: ChartMeta, newChartType: ChartType) {
-        let data: MobxPromise<ClinicalDataCountSummary[]> | undefined
+        let data: MobxPromise<ClinicalDataCountSummary[]> | undefined;
         if (newChartType === ChartTypeEnum.TABLE) {
-            if (_.includes(this.specialChartKeysInCustomCharts, attr.uniqueKey)) {
+            if (
+                _.includes(this.specialChartKeysInCustomCharts, attr.uniqueKey)
+            ) {
                 if (attr.uniqueKey === UniqueKey.CANCER_STUDIES) {
                     data = this.cancerStudiesData;
                 }
@@ -2701,16 +3604,24 @@ export class StudyViewPageStore {
                 data = this.getClinicalDataCount(attr);
             }
             if (data !== undefined) {
-                this.chartsDimension.set(attr.uniqueKey, this.getTableDimensionByNumberOfRecords(data.result!.length));
+                this.chartsDimension.set(
+                    attr.uniqueKey,
+                    this.getTableDimensionByNumberOfRecords(data.result!.length)
+                );
             }
             this.chartsType.set(attr.uniqueKey, ChartTypeEnum.TABLE);
         } else {
-            this.chartsDimension.set(attr.uniqueKey, STUDY_VIEW_CONFIG.layout.dimensions[newChartType]);
+            this.chartsDimension.set(
+                attr.uniqueKey,
+                STUDY_VIEW_CONFIG.layout.dimensions[newChartType]
+            );
             this.chartsType.set(attr.uniqueKey, newChartType);
         }
         this.currentFocusedChartByUser = _.clone(attr);
-        this.currentFocusedChartByUserDimension = this.chartsDimension.get(attr.uniqueKey);
-        this.useCurrentGridLayout=true
+        this.currentFocusedChartByUserDimension = this.chartsDimension.get(
+            attr.uniqueKey
+        );
+        this.useCurrentGridLayout = true;
     }
 
     readonly defaultVisibleAttributes = remoteData({
@@ -2721,34 +3632,53 @@ export class StudyViewPageStore {
                 return attr;
             });
 
-            let filterAttributes: ClinicalAttribute[] = queriedAttributes.sort(clinicalAttributeComparator).slice(0, 20);
+            let filterAttributes: ClinicalAttribute[] = queriedAttributes
+                .sort(clinicalAttributeComparator)
+                .slice(0, 20);
 
             // Also check the initial filters, make sure all clinical attributes in initial filters will be added in default visible attributes
-            let initialFilteredAttributeIds:string[] = [];
-            if(this.initialFilters.clinicalDataFilters !== undefined){
-                initialFilteredAttributeIds = initialFilteredAttributeIds.concat(this.initialFilters.clinicalDataFilters.map(item => item.attributeId));
+            let initialFilteredAttributeIds: string[] = [];
+            if (this.initialFilters.clinicalDataFilters !== undefined) {
+                initialFilteredAttributeIds = initialFilteredAttributeIds.concat(
+                    this.initialFilters.clinicalDataFilters.map(
+                        item => item.attributeId
+                    )
+                );
             }
 
             if (initialFilteredAttributeIds.length > 0) {
-                const initialFilteredAttributes = _.filter(this.clinicalAttributes.result, item => initialFilteredAttributeIds.includes(item.clinicalAttributeId));
+                const initialFilteredAttributes = _.filter(
+                    this.clinicalAttributes.result,
+                    item =>
+                        initialFilteredAttributeIds.includes(
+                            item.clinicalAttributeId
+                        )
+                );
                 if (filterAttributes !== undefined) {
-                    filterAttributes = filterAttributes.concat(initialFilteredAttributes);
+                    filterAttributes = filterAttributes.concat(
+                        initialFilteredAttributes
+                    );
                 }
             }
             return _.uniq(filterAttributes);
         },
-        onError: (error => {}),
-        default: []
+        onError: error => {},
+        default: [],
     });
 
-    readonly initialVisibleAttributesClinicalDataCountData = remoteData<ClinicalDataCountItem[]>({
+    readonly initialVisibleAttributesClinicalDataCountData = remoteData<
+        ClinicalDataCountItem[]
+    >({
         await: () => [this.defaultVisibleAttributes],
         invoke: async () => {
             const attributes = _.uniqBy(
-                _.filter(this.defaultVisibleAttributes.result, attr => attr.datatype === DataType.STRING).map(attr => {
+                _.filter(
+                    this.defaultVisibleAttributes.result,
+                    attr => attr.datatype === DataType.STRING
+                ).map(attr => {
                     return {
-                        attributeId: attr.clinicalAttributeId
-                    } as ClinicalDataFilter
+                        attributeId: attr.clinicalAttributeId,
+                    } as ClinicalDataFilter;
                 }),
                 attr => attr.attributeId
             );
@@ -2756,15 +3686,17 @@ export class StudyViewPageStore {
             return internalClient.fetchClinicalDataCountsUsingPOST({
                 clinicalDataCountFilter: {
                     attributes,
-                    studyViewFilter: this.initialFilters
-                } as ClinicalDataCountFilter
+                    studyViewFilter: this.initialFilters,
+                } as ClinicalDataCountFilter,
             });
         },
-        onError: (error => {}),
-        default: []
+        onError: error => {},
+        default: [],
     });
 
-    readonly initialVisibleAttributesClinicalDataBinAttributes = remoteData<ClinicalDataBinFilter[]>({
+    readonly initialVisibleAttributesClinicalDataBinAttributes = remoteData<
+        ClinicalDataBinFilter[]
+    >({
         await: () => [this.defaultVisibleAttributes],
         invoke: async () => {
             return _.chain(this.defaultVisibleAttributes.result)
@@ -2773,43 +3705,63 @@ export class StudyViewPageStore {
                 .uniqBy(attr => attr.attributeId)
                 .value();
         },
-        onError: (error => {
-        }),
-        default: []
+        onError: error => {},
+        default: [],
     });
 
-    readonly initialVisibleAttributesClinicalDataBinCountData = remoteData<DataBin[]>({
+    readonly initialVisibleAttributesClinicalDataBinCountData = remoteData<
+        DataBin[]
+    >({
         await: () => [this.initialVisibleAttributesClinicalDataBinAttributes],
         invoke: async () => {
             return internalClient.fetchClinicalDataBinCountsUsingPOST({
                 dataBinMethod: 'STATIC',
                 clinicalDataBinCountFilter: {
-                    attributes: this.initialVisibleAttributesClinicalDataBinAttributes.result,
-                    studyViewFilter: this.initialFilters
-                } as ClinicalDataBinCountFilter
+                    attributes: this
+                        .initialVisibleAttributesClinicalDataBinAttributes
+                        .result,
+                    studyViewFilter: this.initialFilters,
+                } as ClinicalDataBinCountFilter,
             });
         },
-        onError: (error => {
-        }),
-        default: []
+        onError: error => {},
+        default: [],
     });
 
     @action
     initializeClinicalDataCountCharts() {
-        _.each(this.initialVisibleAttributesClinicalDataCountData.result, item => {
-            this.showAsPieChart(item.attributeId, item.counts.length);
-        });
+        _.each(
+            this.initialVisibleAttributesClinicalDataCountData.result,
+            item => {
+                this.showAsPieChart(item.attributeId, item.counts.length);
+            }
+        );
     }
 
     @action
     initializeClinicalDataBinCountCharts() {
-        _.each(_.groupBy(this.initialVisibleAttributesClinicalDataBinCountData.result, 'attributeId'), (item: DataBin[], attributeId: string) => {
-            if (shouldShowChart(this.initialFilters, item.length, this.samples.result.length)) {
-                this._chartVisibility.set(attributeId, true);
+        _.each(
+            _.groupBy(
+                this.initialVisibleAttributesClinicalDataBinCountData.result,
+                'attributeId'
+            ),
+            (item: DataBin[], attributeId: string) => {
+                if (
+                    shouldShowChart(
+                        this.initialFilters,
+                        item.length,
+                        this.samples.result.length
+                    )
+                ) {
+                    this._chartVisibility.set(attributeId, true);
+                }
+                this.chartsType.set(attributeId, ChartTypeEnum.BAR_CHART);
+                this.chartsDimension.set(
+                    attributeId,
+                    STUDY_VIEW_CONFIG.layout.dimensions[ChartTypeEnum.BAR_CHART]
+                );
             }
-            this.chartsType.set(attributeId, ChartTypeEnum.BAR_CHART);
-            this.chartsDimension.set(attributeId, STUDY_VIEW_CONFIG.layout.dimensions[ChartTypeEnum.BAR_CHART]);
-        });
+        );
     }
 
     @computed
@@ -2818,9 +3770,13 @@ export class StudyViewPageStore {
     }
 
     readonly samples = remoteData<Sample[]>({
-        await: () => [this.clinicalAttributes, this.queriedSampleIdentifiers, this.queriedPhysicalStudyIds],
+        await: () => [
+            this.clinicalAttributes,
+            this.queriedSampleIdentifiers,
+            this.queriedPhysicalStudyIds,
+        ],
         invoke: () => {
-            let studyViewFilter: StudyViewFilter = {} as any
+            let studyViewFilter: StudyViewFilter = {} as any;
             //this logic is need since fetchFilteredSamplesUsingPOST api accepts sampleIdentifiers or studyIds not both
             if (this.queriedSampleIdentifiers.result.length > 0) {
                 studyViewFilter.sampleIdentifiers = this.queriedSampleIdentifiers.result;
@@ -2829,58 +3785,78 @@ export class StudyViewPageStore {
             }
 
             return internalClient.fetchFilteredSamplesUsingPOST({
-                studyViewFilter: studyViewFilter
+                studyViewFilter: studyViewFilter,
             });
         },
-        onError: (error => {}),
-        default: []
+        onError: error => {},
+        default: [],
     });
 
     public readonly sampleSet = remoteData({
-        await: () => [
-            this.samples
-        ],
+        await: () => [this.samples],
         invoke: () => {
             const sampleSet = new ComplexKeyMap<Sample>();
             for (const sample of this.samples.result!) {
-                sampleSet.set({studyId: sample.studyId, sampleId: sample.sampleId}, sample);
+                sampleSet.set(
+                    { studyId: sample.studyId, sampleId: sample.sampleId },
+                    sample
+                );
             }
             return Promise.resolve(sampleSet);
-        }
+        },
     });
 
-
     readonly invalidSampleIds = remoteData<SampleIdentifier[]>({
         await: () => [this.queriedSampleIdentifiers, this.samples],
         invoke: async () => {
-            if (this.queriedSampleIdentifiers.result.length > 0 &&
-                this.samples.result.length !== this.queriedSampleIdentifiers.result.length) {
-
-                let validSampleIdentifiers = _.reduce(this.samples.result, (acc, next) => {
-                    acc[next.studyId + '_' + next.sampleId] = true
-                    return acc;
-                }, {} as { [id: string]: boolean })
-                return _.filter(this.queriedSampleIdentifiers.result, sampleIdentifier => {
-                    return !validSampleIdentifiers[sampleIdentifier.studyId + '_' + sampleIdentifier.sampleId]
-                })
+            if (
+                this.queriedSampleIdentifiers.result.length > 0 &&
+                this.samples.result.length !==
+                    this.queriedSampleIdentifiers.result.length
+            ) {
+                let validSampleIdentifiers = _.reduce(
+                    this.samples.result,
+                    (acc, next) => {
+                        acc[next.studyId + '_' + next.sampleId] = true;
+                        return acc;
+                    },
+                    {} as { [id: string]: boolean }
+                );
+                return _.filter(
+                    this.queriedSampleIdentifiers.result,
+                    sampleIdentifier => {
+                        return !validSampleIdentifiers[
+                            sampleIdentifier.studyId +
+                                '_' +
+                                sampleIdentifier.sampleId
+                        ];
+                    }
+                );
             }
-            return []
+            return [];
         },
-        onError: (error => {}),
-        default: []
+        onError: error => {},
+        default: [],
     });
 
     // used in building virtual study
     readonly studyWithSamples = remoteData<StudyWithSamples[]>({
-        await: () => [this.selectedSamples, this.filteredPhysicalStudies, this.filteredVirtualStudies],
+        await: () => [
+            this.selectedSamples,
+            this.filteredPhysicalStudies,
+            this.filteredVirtualStudies,
+        ],
         invoke: () => {
-            return Promise.resolve(getFilteredStudiesWithSamples(
-                this.selectedSamples.result,
-                this.filteredPhysicalStudies.result,
-                this.filteredVirtualStudies.result));
+            return Promise.resolve(
+                getFilteredStudiesWithSamples(
+                    this.selectedSamples.result,
+                    this.filteredPhysicalStudies.result,
+                    this.filteredVirtualStudies.result
+                )
+            );
         },
-        onError: (error => {}),
-        default: []
+        onError: error => {},
+        default: [],
     });
 
     readonly selectedSamples = remoteData<Sample[]>({
@@ -2889,157 +3865,260 @@ export class StudyViewPageStore {
             //fetch samples when there are only filters applied
             if (this.chartsAreFiltered) {
                 return internalClient.fetchFilteredSamplesUsingPOST({
-                    studyViewFilter: this.filters
-                })
+                    studyViewFilter: this.filters,
+                });
             }
-            return Promise.resolve(this.samples.result)
+            return Promise.resolve(this.samples.result);
         },
-        onError: (error => {}),
-        default: []
+        onError: error => {},
+        default: [],
     });
 
     @computed
     get selectedSamplesMap() {
-        return _.keyBy(this.selectedSamples.result!, s=>s.uniqueSampleKey);
+        return _.keyBy(this.selectedSamples.result!, s => s.uniqueSampleKey);
     }
 
     readonly selectedPatientKeys = remoteData<string[]>({
         await: () => [this.selectedSamples],
         invoke: async () => {
-            return _.uniq(this.selectedSamples.result.map(sample => sample.uniquePatientKey));
+            return _.uniq(
+                this.selectedSamples.result.map(
+                    sample => sample.uniquePatientKey
+                )
+            );
         },
-        onError: (error => {}),
-        default: []
+        onError: error => {},
+        default: [],
     });
 
     @computed
     get selectedPatients(): Patient[] {
-        return _.values(_.reduce(this.selectedSamples.result, (acc, sample) => {
-            acc[sample.uniquePatientKey] = {
-                cancerStudy: {} as any,
-                patientId: sample.patientId,
-                uniquePatientKey: sample.uniquePatientKey,
-                studyId: sample.studyId,
-                uniqueSampleKey: sample.uniqueSampleKey
-            };
-            return acc;
-        }, {} as { [key: string]: Patient }))
-    };
+        return _.values(
+            _.reduce(
+                this.selectedSamples.result,
+                (acc, sample) => {
+                    acc[sample.uniquePatientKey] = {
+                        cancerStudy: {} as any,
+                        patientId: sample.patientId,
+                        uniquePatientKey: sample.uniquePatientKey,
+                        studyId: sample.studyId,
+                        uniqueSampleKey: sample.uniqueSampleKey,
+                    };
+                    return acc;
+                },
+                {} as { [key: string]: Patient }
+            )
+        );
+    }
 
     readonly unSelectedPatientKeys = remoteData<string[]>({
         await: () => [this.samples, this.selectedPatientKeys],
         invoke: async () => {
-            const selectedPatientKeysObj = _.reduce(this.selectedPatientKeys.result, (acc, next)=>{
-                acc[next] = true;
-                return acc;
-            },{} as {[patientKey:string]:boolean});
-            const unselectedPatientSet = _.reduce(this.samples.result, (acc: { [id: string]: boolean }, next) => {
-                if (selectedPatientKeysObj[next.uniquePatientKey] === undefined) {
-                    acc[next.uniquePatientKey] = true;
-                }
-                return acc;
-            }, {});
+            const selectedPatientKeysObj = _.reduce(
+                this.selectedPatientKeys.result,
+                (acc, next) => {
+                    acc[next] = true;
+                    return acc;
+                },
+                {} as { [patientKey: string]: boolean }
+            );
+            const unselectedPatientSet = _.reduce(
+                this.samples.result,
+                (acc: { [id: string]: boolean }, next) => {
+                    if (
+                        selectedPatientKeysObj[next.uniquePatientKey] ===
+                        undefined
+                    ) {
+                        acc[next.uniquePatientKey] = true;
+                    }
+                    return acc;
+                },
+                {}
+            );
             return Object.keys(unselectedPatientSet);
         },
-        onError: (error => {}),
-        default: []
+        onError: error => {},
+        default: [],
     });
 
-    public genePanelCache = new MobxPromiseCache<{ genePanelId: string }, GenePanel>(q => ({
+    public genePanelCache = new MobxPromiseCache<
+        { genePanelId: string },
+        GenePanel
+    >(q => ({
         invoke: () => {
             return defaultClient.getGenePanelUsingGET(q);
-        }
+        },
     }));
 
     readonly mutatedGeneTableRowData = remoteData<GeneTableRow[]>({
-        await: () => this.oncokbCancerGeneFilterEnabled ?
-            [this.mutationProfiles, this.oncokbAnnotatedGeneEntrezGeneIds, this.oncokbOncogeneEntrezGeneIds, this.oncokbTumorSuppressorGeneEntrezGeneIds, this.oncokbCancerGeneEntrezGeneIds] :
-            [this.mutationProfiles],
+        await: () =>
+            this.oncokbCancerGeneFilterEnabled
+                ? [
+                      this.mutationProfiles,
+                      this.oncokbAnnotatedGeneEntrezGeneIds,
+                      this.oncokbOncogeneEntrezGeneIds,
+                      this.oncokbTumorSuppressorGeneEntrezGeneIds,
+                      this.oncokbCancerGeneEntrezGeneIds,
+                  ]
+                : [this.mutationProfiles],
         invoke: async () => {
             if (!_.isEmpty(this.mutationProfiles.result)) {
-                let mutatedGenes = await internalClient.fetchMutatedGenesUsingPOST({
-                    studyViewFilter: this.filters
-                });
+                let mutatedGenes = await internalClient.fetchMutatedGenesUsingPOST(
+                    {
+                        studyViewFilter: this.filters,
+                    }
+                );
                 return mutatedGenes.map(item => {
                     return {
                         ...item,
                         uniqueKey: item.hugoGeneSymbol,
-                        oncokbAnnotated: this.oncokbCancerGeneFilterEnabled ? this.oncokbAnnotatedGeneEntrezGeneIds.result.includes(item.entrezGeneId) : false,
-                        isOncokbOncogene: this.oncokbCancerGeneFilterEnabled ? this.oncokbOncogeneEntrezGeneIds.result.includes(item.entrezGeneId) : false,
-                        isOncokbTumorSuppressorGene: this.oncokbCancerGeneFilterEnabled ? this.oncokbTumorSuppressorGeneEntrezGeneIds.result.includes(item.entrezGeneId) : false,
-                        isCancerGene: this.oncokbCancerGeneFilterEnabled ? this.oncokbCancerGeneEntrezGeneIds.result.includes(item.entrezGeneId) : false
+                        oncokbAnnotated: this.oncokbCancerGeneFilterEnabled
+                            ? this.oncokbAnnotatedGeneEntrezGeneIds.result.includes(
+                                  item.entrezGeneId
+                              )
+                            : false,
+                        isOncokbOncogene: this.oncokbCancerGeneFilterEnabled
+                            ? this.oncokbOncogeneEntrezGeneIds.result.includes(
+                                  item.entrezGeneId
+                              )
+                            : false,
+                        isOncokbTumorSuppressorGene: this
+                            .oncokbCancerGeneFilterEnabled
+                            ? this.oncokbTumorSuppressorGeneEntrezGeneIds.result.includes(
+                                  item.entrezGeneId
+                              )
+                            : false,
+                        isCancerGene: this.oncokbCancerGeneFilterEnabled
+                            ? this.oncokbCancerGeneEntrezGeneIds.result.includes(
+                                  item.entrezGeneId
+                              )
+                            : false,
                     };
                 });
             } else {
                 return [];
             }
         },
-        onError: (error => {
-        }),
-        default: []
+        onError: error => {},
+        default: [],
     });
 
     readonly fusionGeneTableRowData = remoteData<GeneTableRow[]>({
-        await: () => this.oncokbCancerGeneFilterEnabled ?
-            [this.structuralVariantProfiles, this.oncokbAnnotatedGeneEntrezGeneIds, this.oncokbOncogeneEntrezGeneIds, this.oncokbTumorSuppressorGeneEntrezGeneIds, this.oncokbCancerGeneEntrezGeneIds] :
-            [this.mutationProfiles],
+        await: () =>
+            this.oncokbCancerGeneFilterEnabled
+                ? [
+                      this.structuralVariantProfiles,
+                      this.oncokbAnnotatedGeneEntrezGeneIds,
+                      this.oncokbOncogeneEntrezGeneIds,
+                      this.oncokbTumorSuppressorGeneEntrezGeneIds,
+                      this.oncokbCancerGeneEntrezGeneIds,
+                  ]
+                : [this.mutationProfiles],
         invoke: async () => {
             if (!_.isEmpty(this.structuralVariantProfiles.result)) {
-                const fusionGenes = await internalClient.fetchFusionGenesUsingPOST({
-                    studyViewFilter: this.filters
-                });
+                const fusionGenes = await internalClient.fetchFusionGenesUsingPOST(
+                    {
+                        studyViewFilter: this.filters,
+                    }
+                );
                 return fusionGenes.map(item => {
                     return {
                         ...item,
                         uniqueKey: item.hugoGeneSymbol,
-                        oncokbAnnotated: this.oncokbCancerGeneFilterEnabled ? this.oncokbAnnotatedGeneEntrezGeneIds.result.includes(item.entrezGeneId) : false,
-                        isOncokbOncogene: this.oncokbCancerGeneFilterEnabled ? this.oncokbOncogeneEntrezGeneIds.result.includes(item.entrezGeneId) : false,
-                        isOncokbTumorSuppressorGene: this.oncokbCancerGeneFilterEnabled ? this.oncokbTumorSuppressorGeneEntrezGeneIds.result.includes(item.entrezGeneId) : false,
-                        isCancerGene: this.oncokbCancerGeneFilterEnabled ? this.oncokbCancerGeneEntrezGeneIds.result.includes(item.entrezGeneId) : false
+                        oncokbAnnotated: this.oncokbCancerGeneFilterEnabled
+                            ? this.oncokbAnnotatedGeneEntrezGeneIds.result.includes(
+                                  item.entrezGeneId
+                              )
+                            : false,
+                        isOncokbOncogene: this.oncokbCancerGeneFilterEnabled
+                            ? this.oncokbOncogeneEntrezGeneIds.result.includes(
+                                  item.entrezGeneId
+                              )
+                            : false,
+                        isOncokbTumorSuppressorGene: this
+                            .oncokbCancerGeneFilterEnabled
+                            ? this.oncokbTumorSuppressorGeneEntrezGeneIds.result.includes(
+                                  item.entrezGeneId
+                              )
+                            : false,
+                        isCancerGene: this.oncokbCancerGeneFilterEnabled
+                            ? this.oncokbCancerGeneEntrezGeneIds.result.includes(
+                                  item.entrezGeneId
+                              )
+                            : false,
                     };
                 });
             } else {
                 return [];
             }
         },
-        onError: (error => {
-        }),
-        default: []
+        onError: error => {},
+        default: [],
     });
 
     readonly cnaGeneTableRowData = remoteData<GeneTableRow[]>({
-        await: () => this.oncokbCancerGeneFilterEnabled ?
-            [this.cnaProfiles, this.oncokbAnnotatedGeneEntrezGeneIds, this.oncokbOncogeneEntrezGeneIds, this.oncokbTumorSuppressorGeneEntrezGeneIds, this.oncokbCancerGeneEntrezGeneIds] :
-            [this.mutationProfiles],
+        await: () =>
+            this.oncokbCancerGeneFilterEnabled
+                ? [
+                      this.cnaProfiles,
+                      this.oncokbAnnotatedGeneEntrezGeneIds,
+                      this.oncokbOncogeneEntrezGeneIds,
+                      this.oncokbTumorSuppressorGeneEntrezGeneIds,
+                      this.oncokbCancerGeneEntrezGeneIds,
+                  ]
+                : [this.mutationProfiles],
         invoke: async () => {
             if (!_.isEmpty(this.cnaProfiles.result)) {
                 let cnaGenes = await internalClient.fetchCNAGenesUsingPOST({
-                    studyViewFilter: this.filters
+                    studyViewFilter: this.filters,
                 });
                 return cnaGenes.map(item => {
                     return {
                         ...item,
-                        uniqueKey: getGeneCNAOQL(item.hugoGeneSymbol, item.alteration),
-                        oncokbAnnotated: this.oncokbCancerGeneFilterEnabled ? this.oncokbAnnotatedGeneEntrezGeneIds.result.includes(item.entrezGeneId) : false,
-                        isOncokbOncogene: this.oncokbCancerGeneFilterEnabled ? this.oncokbOncogeneEntrezGeneIds.result.includes(item.entrezGeneId) : false,
-                        isOncokbTumorSuppressorGene: this.oncokbCancerGeneFilterEnabled ? this.oncokbTumorSuppressorGeneEntrezGeneIds.result.includes(item.entrezGeneId) : false,
-                        isCancerGene: this.oncokbCancerGeneFilterEnabled ? this.oncokbCancerGeneEntrezGeneIds.result.includes(item.entrezGeneId) : false,
+                        uniqueKey: getGeneCNAOQL(
+                            item.hugoGeneSymbol,
+                            item.alteration
+                        ),
+                        oncokbAnnotated: this.oncokbCancerGeneFilterEnabled
+                            ? this.oncokbAnnotatedGeneEntrezGeneIds.result.includes(
+                                  item.entrezGeneId
+                              )
+                            : false,
+                        isOncokbOncogene: this.oncokbCancerGeneFilterEnabled
+                            ? this.oncokbOncogeneEntrezGeneIds.result.includes(
+                                  item.entrezGeneId
+                              )
+                            : false,
+                        isOncokbTumorSuppressorGene: this
+                            .oncokbCancerGeneFilterEnabled
+                            ? this.oncokbTumorSuppressorGeneEntrezGeneIds.result.includes(
+                                  item.entrezGeneId
+                              )
+                            : false,
+                        isCancerGene: this.oncokbCancerGeneFilterEnabled
+                            ? this.oncokbCancerGeneEntrezGeneIds.result.includes(
+                                  item.entrezGeneId
+                              )
+                            : false,
                     };
                 });
             } else {
                 return [];
             }
         },
-        onError: (error => {}),
-        default: []
+        onError: error => {},
+        default: [],
     });
 
-    readonly cnSegments = remoteData<CopyNumberSeg[]>({
-        await: () => [
-            this.selectedSamples
-        ],
-        invoke: () => fetchCopyNumberSegmentsForSamples(this.selectedSamples.result)
-    }, []);
+    readonly cnSegments = remoteData<CopyNumberSeg[]>(
+        {
+            await: () => [this.selectedSamples],
+            invoke: () =>
+                fetchCopyNumberSegmentsForSamples(this.selectedSamples.result),
+        },
+        []
+    );
 
     @computed private get survivalPlots() {
         let osStatusFlag = false;
@@ -3066,9 +4145,8 @@ export class StudyViewPageStore {
                 title: 'Overall Survival',
                 associatedAttrs: [OS_STATUS, OS_MONTHS],
                 filter: ['DECEASED'],
-                survivalData: []
+                survivalData: [],
             });
-
         }
         if (dfsStatusFlag && dfsMonthsFlag) {
             survivalTypes.push({
@@ -3076,164 +4154,266 @@ export class StudyViewPageStore {
                 title: 'Disease Free Survival',
                 associatedAttrs: [DFS_STATUS, DFS_MONTHS],
                 filter: ['Recurred/Progressed', 'Recurred'],
-                survivalData: []
+                survivalData: [],
             });
         }
 
         return survivalTypes;
     }
 
-    public async getPieChartDataDownload(chartMeta: ChartMeta, dataType?: DownloadDataType) {
+    public async getPieChartDataDownload(
+        chartMeta: ChartMeta,
+        dataType?: DownloadDataType
+    ) {
         const isCustomChart = this.isCustomChart(chartMeta.uniqueKey);
         if (dataType && dataType === 'summary') {
             if (isCustomChart) {
-                return this.getClinicalDataCountSummary(chartMeta, this.getCustomChartDataCount(chartMeta).result!);
+                return this.getClinicalDataCountSummary(
+                    chartMeta,
+                    this.getCustomChartDataCount(chartMeta).result!
+                );
             } else {
-                return this.getClinicalDataCountSummary(chartMeta, this.getClinicalDataCount(chartMeta).result!)
+                return this.getClinicalDataCountSummary(
+                    chartMeta,
+                    this.getClinicalDataCount(chartMeta).result!
+                );
             }
         } else {
             if (isCustomChart) {
-                return this.getCustomChartDownloadData(chartMeta)
+                return this.getCustomChartDownloadData(chartMeta);
             } else {
-                return this.getClinicalData(chartMeta)
+                return this.getClinicalData(chartMeta);
             }
         }
     }
 
-    public getClinicalDataCountSummary(chartMeta: ChartMeta, clinicalDataCountSummaries:ClinicalDataCountSummary[]) {
+    public getClinicalDataCountSummary(
+        chartMeta: ChartMeta,
+        clinicalDataCountSummaries: ClinicalDataCountSummary[]
+    ) {
         const subInfo = chartMeta.patientAttribute ? 'patients' : 'samples';
-        const header: string[] = ["Category", `Number of ${subInfo}`, `Percentage of ${subInfo}`];
-        let data = [header.join("\t")];
-        data = data.concat(clinicalDataCountSummaries.map(clinicalData => [clinicalData.value, clinicalData.count, clinicalData.freq].join("\t")));
-        return data.join("\n");
+        const header: string[] = [
+            'Category',
+            `Number of ${subInfo}`,
+            `Percentage of ${subInfo}`,
+        ];
+        let data = [header.join('\t')];
+        data = data.concat(
+            clinicalDataCountSummaries.map(clinicalData =>
+                [
+                    clinicalData.value,
+                    clinicalData.count,
+                    clinicalData.freq,
+                ].join('\t')
+            )
+        );
+        return data.join('\n');
     }
 
     public async getClinicalData(chartMeta: ChartMeta) {
         if (chartMeta.clinicalAttribute && this.samples.result) {
-            const clinicalDataList = await defaultClient.fetchClinicalDataUsingPOST({
-                clinicalDataType: chartMeta.clinicalAttribute.patientAttribute ? ClinicalDataTypeEnum.PATIENT : ClinicalDataTypeEnum.SAMPLE,
-                clinicalDataMultiStudyFilter: {
-                    attributeIds: [chartMeta.clinicalAttribute.clinicalAttributeId],
-                    identifiers: this.selectedSamples.result.map(sample => ({
-                        entityId: chartMeta.clinicalAttribute!.patientAttribute ? sample.patientId : sample.sampleId,
-                        studyId: sample.studyId
-                    }))
+            const clinicalDataList = await defaultClient.fetchClinicalDataUsingPOST(
+                {
+                    clinicalDataType: chartMeta.clinicalAttribute
+                        .patientAttribute
+                        ? ClinicalDataTypeEnum.PATIENT
+                        : ClinicalDataTypeEnum.SAMPLE,
+                    clinicalDataMultiStudyFilter: {
+                        attributeIds: [
+                            chartMeta.clinicalAttribute.clinicalAttributeId,
+                        ],
+                        identifiers: this.selectedSamples.result.map(
+                            sample => ({
+                                entityId: chartMeta.clinicalAttribute!
+                                    .patientAttribute
+                                    ? sample.patientId
+                                    : sample.sampleId,
+                                studyId: sample.studyId,
+                            })
+                        ),
+                    },
                 }
-            });
+            );
 
-            const header: string[] = ["Study ID", "Patient ID"];
+            const header: string[] = ['Study ID', 'Patient ID'];
 
             if (!chartMeta.clinicalAttribute!.patientAttribute) {
-                header.push("Sample ID");
+                header.push('Sample ID');
             }
 
             header.push(chartMeta.clinicalAttribute.displayName);
 
-            let data = [header.join("\t")];
+            let data = [header.join('\t')];
 
-            data = data.concat(clinicalDataList.map(clinicalData => {
-                const row = [clinicalData.studyId || Datalabel.NA, clinicalData.patientId || Datalabel.NA];
+            data = data.concat(
+                clinicalDataList.map(clinicalData => {
+                    const row = [
+                        clinicalData.studyId || Datalabel.NA,
+                        clinicalData.patientId || Datalabel.NA,
+                    ];
 
-                if (!chartMeta.clinicalAttribute!.patientAttribute) {
-                    row.push(clinicalData.sampleId || Datalabel.NA);
-                }
+                    if (!chartMeta.clinicalAttribute!.patientAttribute) {
+                        row.push(clinicalData.sampleId || Datalabel.NA);
+                    }
 
-                row.push(clinicalData.value || Datalabel.NA);
+                    row.push(clinicalData.value || Datalabel.NA);
 
-                return row.join("\t");
-            }));
+                    return row.join('\t');
+                })
+            );
 
-            return data.join("\n");
-        }
-        else {
-            return "";
+            return data.join('\n');
+        } else {
+            return '';
         }
     }
 
     public getCustomChartDownloadData(chartMeta: ChartMeta) {
-        return new Promise<string>((resolve) => {
-            if (chartMeta && chartMeta.uniqueKey && this._customChartsSelectedCases.has(chartMeta.uniqueKey)) {
+        return new Promise<string>(resolve => {
+            if (
+                chartMeta &&
+                chartMeta.uniqueKey &&
+                this._customChartsSelectedCases.has(chartMeta.uniqueKey)
+            ) {
                 let isPatientChart = true;
-                let header = ["Study ID", "Patient ID",];
+                let header = ['Study ID', 'Patient ID'];
 
                 if (!chartMeta.patientAttribute) {
                     isPatientChart = false;
                     header.push('Sample ID');
                 }
                 header.push(chartMeta.displayName);
-                let data = [header.join("\t")];
+                let data = [header.join('\t')];
                 if (isPatientChart) {
-                    data = data.concat(this.selectedPatients.map((patient: Patient) => {
-                        let record = _.find(this._customChartsSelectedCases.get(chartMeta.uniqueKey), (caseIdentifier: CustomChartIdentifierWithValue) => {
-                            return caseIdentifier.studyId === patient.studyId && patient.patientId === caseIdentifier.patientId;
-                        });
-                        return [patient.studyId || Datalabel.NA, patient.patientId || Datalabel.NA, record === undefined ? 'NA' : record.value].join("\t");
-                    }));
+                    data = data.concat(
+                        this.selectedPatients.map((patient: Patient) => {
+                            let record = _.find(
+                                this._customChartsSelectedCases.get(
+                                    chartMeta.uniqueKey
+                                ),
+                                (
+                                    caseIdentifier: CustomChartIdentifierWithValue
+                                ) => {
+                                    return (
+                                        caseIdentifier.studyId ===
+                                            patient.studyId &&
+                                        patient.patientId ===
+                                            caseIdentifier.patientId
+                                    );
+                                }
+                            );
+                            return [
+                                patient.studyId || Datalabel.NA,
+                                patient.patientId || Datalabel.NA,
+                                record === undefined ? 'NA' : record.value,
+                            ].join('\t');
+                        })
+                    );
                 } else {
-                    data = data.concat(this.selectedSamples.result!.map((sample: Sample) => {
-                        let record = _.find(this._customChartsSelectedCases.get(chartMeta.uniqueKey), (caseIdentifier: CustomChartIdentifierWithValue) => {
-                            return caseIdentifier.studyId === sample.studyId && sample.sampleId === caseIdentifier.sampleId;
-                        });
-                        return [sample.studyId || Datalabel.NA, sample.patientId || Datalabel.NA, sample.sampleId || Datalabel.NA, record === undefined ? 'NA' : record.value].join("\t");
-                    }));
+                    data = data.concat(
+                        this.selectedSamples.result!.map((sample: Sample) => {
+                            let record = _.find(
+                                this._customChartsSelectedCases.get(
+                                    chartMeta.uniqueKey
+                                ),
+                                (
+                                    caseIdentifier: CustomChartIdentifierWithValue
+                                ) => {
+                                    return (
+                                        caseIdentifier.studyId ===
+                                            sample.studyId &&
+                                        sample.sampleId ===
+                                            caseIdentifier.sampleId
+                                    );
+                                }
+                            );
+                            return [
+                                sample.studyId || Datalabel.NA,
+                                sample.patientId || Datalabel.NA,
+                                sample.sampleId || Datalabel.NA,
+                                record === undefined ? 'NA' : record.value,
+                            ].join('\t');
+                        })
+                    );
                 }
-                resolve(data.join("\n"));
+                resolve(data.join('\n'));
             } else {
-                resolve("");
+                resolve('');
             }
         });
     }
 
-    public getScatterDownloadData()
-    {
-        return new Promise<string>((resolve)=>{
-            onMobxPromise(this.mutationCountVsFGAData, data=>{
+    public getScatterDownloadData() {
+        return new Promise<string>(resolve => {
+            onMobxPromise(this.mutationCountVsFGAData, data => {
                 if (data) {
-                    resolve(generateScatterPlotDownloadData(
-                        data,
-                        this.sampleToAnalysisGroup.result,
-                        undefined,
-                        this.analysisGroupsSettings.groups as AnalysisGroup[]
-                    ));
+                    resolve(
+                        generateScatterPlotDownloadData(
+                            data,
+                            this.sampleToAnalysisGroup.result,
+                            undefined,
+                            this.analysisGroupsSettings
+                                .groups as AnalysisGroup[]
+                        )
+                    );
                 } else {
-                    resolve("");
+                    resolve('');
                 }
             });
         });
     }
 
-    public async getSurvivalDownloadData(chartMeta: ChartMeta)
-    {
-        const matchedPlot = _.find(this.survivalPlots, plot =>plot.id===chartMeta.uniqueKey);
-        if (matchedPlot && this.survivalData.result)
-        {
+    public async getSurvivalDownloadData(chartMeta: ChartMeta) {
+        const matchedPlot = _.find(
+            this.survivalPlots,
+            plot => plot.id === chartMeta.uniqueKey
+        );
+        if (matchedPlot && this.survivalData.result) {
             const data: string[] = [];
 
             // find the unique clinical attribute ids
             const uniqueClinicalAttributeIds = matchedPlot.associatedAttrs;
 
             // add the header row
-            data.push(["Study ID", "Patient ID", ...uniqueClinicalAttributeIds].join("\t"));
+            data.push(
+                ['Study ID', 'Patient ID', ...uniqueClinicalAttributeIds].join(
+                    '\t'
+                )
+            );
 
             // add the data rows
-            const selectedPatientMap = _.reduce(this.selectedPatients, (acc, next)=>{
-                acc[next.uniquePatientKey] = next;
-                return acc;
-            }, {} as {[uniquePatientKey:string]:Patient});
+            const selectedPatientMap = _.reduce(
+                this.selectedPatients,
+                (acc, next) => {
+                    acc[next.uniquePatientKey] = next;
+                    return acc;
+                },
+                {} as { [uniquePatientKey: string]: Patient }
+            );
             this.selectedPatientKeys.result.forEach(uniquePatientKey => {
-                const clinicalDataList = this.survivalData.result[uniquePatientKey];
+                const clinicalDataList = this.survivalData.result[
+                    uniquePatientKey
+                ];
                 const row: string[] = [];
 
                 if (clinicalDataList && clinicalDataList.length > 0) {
                     row.push(clinicalDataList[0].studyId || Datalabel.NA);
                     row.push(clinicalDataList[0].patientId || Datalabel.NA);
-                    const keyed = _.keyBy(clinicalDataList, 'clinicalAttributeId');
+                    const keyed = _.keyBy(
+                        clinicalDataList,
+                        'clinicalAttributeId'
+                    );
 
                     _.each(uniqueClinicalAttributeIds, id => {
-                        row.push(keyed[id] ? keyed[id].value || Datalabel.NA : Datalabel.NA);
+                        row.push(
+                            keyed[id]
+                                ? keyed[id].value || Datalabel.NA
+                                : Datalabel.NA
+                        );
                     });
                 } else {
-                    const selectedPatient = selectedPatientMap[uniquePatientKey];
+                    const selectedPatient =
+                        selectedPatientMap[uniquePatientKey];
                     if (selectedPatient) {
                         row.push(selectedPatient.studyId || Datalabel.NA);
                         row.push(selectedPatient.patientId || Datalabel.NA);
@@ -3244,68 +4424,100 @@ export class StudyViewPageStore {
                     }
                 }
 
-                data.push(row.join("\t"));
+                data.push(row.join('\t'));
             });
 
-            return data.join("\n");
-        }
-        else {
-            return "";
+            return data.join('\n');
+        } else {
+            return '';
         }
     }
 
     public async getMutatedGenesDownloadData() {
         if (this.mutatedGeneTableRowData.result) {
             let header = ['Gene', 'MutSig(Q-value)', '# Mut', '#', 'Freq'];
-            if(this.oncokbCancerGeneFilterEnabled) {
+            if (this.oncokbCancerGeneFilterEnabled) {
                 header.push('Is Cancer Gene (source: OncoKB)');
             }
             let data = [header.join('\t')];
-            _.each(this.mutatedGeneTableRowData.result, (record: GeneTableRow) => {
-                let rowData = [
-                    record.hugoGeneSymbol,
-                    record.qValue === undefined ? '' : getQValue(record.qValue),
-                    record.totalCount,
-                    record.numberOfAlteredCases,
-                    getFrequencyStr(record.numberOfAlteredCases / record.numberOfProfiledCases * 100)
-                ];
-                if (this.oncokbCancerGeneFilterEnabled) {
-                    rowData.push(this.oncokbCancerGeneFilterEnabled ? (record.isCancerGene ? 'Yes' : 'No') : 'NA');
+            _.each(
+                this.mutatedGeneTableRowData.result,
+                (record: GeneTableRow) => {
+                    let rowData = [
+                        record.hugoGeneSymbol,
+                        record.qValue === undefined
+                            ? ''
+                            : getQValue(record.qValue),
+                        record.totalCount,
+                        record.numberOfAlteredCases,
+                        getFrequencyStr(
+                            (record.numberOfAlteredCases /
+                                record.numberOfProfiledCases) *
+                                100
+                        ),
+                    ];
+                    if (this.oncokbCancerGeneFilterEnabled) {
+                        rowData.push(
+                            this.oncokbCancerGeneFilterEnabled
+                                ? record.isCancerGene
+                                    ? 'Yes'
+                                    : 'No'
+                                : 'NA'
+                        );
+                    }
+                    data.push(rowData.join('\t'));
                 }
-                data.push(rowData.join("\t"));
-            });
-            return data.join("\n");
-        } else
-            return '';
+            );
+            return data.join('\n');
+        } else return '';
     }
 
     public getFusionGenesDownloadData() {
         if (this.fusionGeneTableRowData.result) {
-            const header = ['Gene','# Fusion', '#', 'Freq'];
-            if(this.oncokbCancerGeneFilterEnabled) {
+            const header = ['Gene', '# Fusion', '#', 'Freq'];
+            if (this.oncokbCancerGeneFilterEnabled) {
                 header.push('Is Cancer Gene (source: OncoKB)');
             }
             const data = [header.join('\t')];
-            _.each(this.fusionGeneTableRowData.result, (record: GeneTableRow) => {
-                const rowData = [
-                    record.hugoGeneSymbol,
-                    record.totalCount,
-                    record.numberOfAlteredCases,
-                    getFrequencyStr(record.numberOfAlteredCases / record.numberOfProfiledCases * 100)
-                ];
-                if (this.oncokbCancerGeneFilterEnabled) {
-                    rowData.push(this.oncokbCancerGeneFilterEnabled ? (record.isCancerGene ? 'Yes' : 'No') : 'NA');
+            _.each(
+                this.fusionGeneTableRowData.result,
+                (record: GeneTableRow) => {
+                    const rowData = [
+                        record.hugoGeneSymbol,
+                        record.totalCount,
+                        record.numberOfAlteredCases,
+                        getFrequencyStr(
+                            (record.numberOfAlteredCases /
+                                record.numberOfProfiledCases) *
+                                100
+                        ),
+                    ];
+                    if (this.oncokbCancerGeneFilterEnabled) {
+                        rowData.push(
+                            this.oncokbCancerGeneFilterEnabled
+                                ? record.isCancerGene
+                                    ? 'Yes'
+                                    : 'No'
+                                : 'NA'
+                        );
+                    }
+                    data.push(rowData.join('\t'));
                 }
-                data.push(rowData.join("\t"));
-            });
-            return data.join("\n");
-        } else
-            return '';
+            );
+            return data.join('\n');
+        } else return '';
     }
 
     public async getGenesCNADownloadData() {
         if (this.cnaGeneTableRowData.result) {
-            let header = ['Gene', 'Gistic(Q-value)', 'Cytoband', 'CNA', '#', 'Freq'];
+            let header = [
+                'Gene',
+                'Gistic(Q-value)',
+                'Cytoband',
+                'CNA',
+                '#',
+                'Freq',
+            ];
             if (this.oncokbCancerGeneFilterEnabled) {
                 header.push('Is Cancer Gene (source: OncoKB)');
             }
@@ -3314,215 +4526,276 @@ export class StudyViewPageStore {
                 let rowData = [
                     record.hugoGeneSymbol,
                     record.qValue === undefined ? '' : getQValue(record.qValue),
-                    record.cytoband, getCNAByAlteration(record.alteration!),
-                    record.numberOfAlteredCases, getFrequencyStr(record.numberOfAlteredCases / record.numberOfProfiledCases * 100)
+                    record.cytoband,
+                    getCNAByAlteration(record.alteration!),
+                    record.numberOfAlteredCases,
+                    getFrequencyStr(
+                        (record.numberOfAlteredCases /
+                            record.numberOfProfiledCases) *
+                            100
+                    ),
                 ];
                 if (this.oncokbCancerGeneFilterEnabled) {
-                    rowData.push(this.oncokbCancerGeneFilterEnabled ? (record.isCancerGene ? 'Yes' : 'No') : 'NA');
+                    rowData.push(
+                        this.oncokbCancerGeneFilterEnabled
+                            ? record.isCancerGene
+                                ? 'Yes'
+                                : 'No'
+                            : 'NA'
+                    );
                 }
-                data.push(rowData.join("\t"));
+                data.push(rowData.join('\t'));
             });
-            return data.join("\n");
-        } else
-            return '';
+            return data.join('\n');
+        } else return '';
     }
 
     readonly survivalPlotData = remoteData<SurvivalType[]>({
         await: () => [this.survivalData, this.selectedPatientKeys],
         invoke: async () => {
-
             return this.survivalPlots.map(obj => {
                 obj.survivalData = getPatientSurvivals(
                     this.survivalData.result,
-                    this.selectedPatientKeys.result!, obj.associatedAttrs[0], obj.associatedAttrs[1], s => obj.filter.includes(s));
-                return obj
+                    this.selectedPatientKeys.result!,
+                    obj.associatedAttrs[0],
+                    obj.associatedAttrs[1],
+                    s => obj.filter.includes(s)
+                );
+                return obj;
             });
         },
-        onError: (error => {}),
-        default: []
+        onError: error => {},
+        default: [],
     });
 
     readonly survivalData = remoteData<{ [id: string]: ClinicalData[] }>({
         await: () => [this.clinicalAttributes, this.samples],
         invoke: async () => {
-            const attributeIds = _.flatten(this.survivalPlots.map(obj => obj.associatedAttrs))
-            if(!_.isEmpty(attributeIds)){
+            const attributeIds = _.flatten(
+                this.survivalPlots.map(obj => obj.associatedAttrs)
+            );
+            if (!_.isEmpty(attributeIds)) {
                 const filter: ClinicalDataMultiStudyFilter = {
                     attributeIds: attributeIds,
                     identifiers: _.map(this.samples.result!, obj => {
                         return {
-                            "entityId": obj.patientId,
-                            "studyId": obj.studyId
-                        }
-                    })
+                            entityId: obj.patientId,
+                            studyId: obj.studyId,
+                        };
+                    }),
                 };
 
                 let data = await defaultClient.fetchClinicalDataUsingPOST({
                     clinicalDataType: ClinicalDataTypeEnum.PATIENT,
-                    clinicalDataMultiStudyFilter: filter
-                })
+                    clinicalDataMultiStudyFilter: filter,
+                });
 
-                return _.groupBy(data, 'uniquePatientKey')
+                return _.groupBy(data, 'uniquePatientKey');
             }
-            return {}
+            return {};
         },
-        onError: (error => {}),
-        default: {}
+        onError: error => {},
+        default: {},
     });
 
-    readonly mutationCountVsCNADensityData = remoteData<{bins:DensityPlotBin[], xBinSize:number, yBinSize:number}>({
-        await:()=>[this.clinicalAttributes],
-        invoke:async()=>{
-            if (!!this.clinicalAttributes.result!.find(a=>a.clinicalAttributeId === MUTATION_COUNT) &&
-                !!this.clinicalAttributes.result!.find(a=>a.clinicalAttributeId === FRACTION_GENOME_ALTERED)) {
+    readonly mutationCountVsCNADensityData = remoteData<{
+        bins: DensityPlotBin[];
+        xBinSize: number;
+        yBinSize: number;
+    }>({
+        await: () => [this.clinicalAttributes],
+        invoke: async () => {
+            if (
+                !!this.clinicalAttributes.result!.find(
+                    a => a.clinicalAttributeId === MUTATION_COUNT
+                ) &&
+                !!this.clinicalAttributes.result!.find(
+                    a => a.clinicalAttributeId === FRACTION_GENOME_ALTERED
+                )
+            ) {
                 const yAxisBinCount = MutationCountVsCnaYBinsMin;
                 const xAxisBinCount = 50;
-                const bins = (await internalClient.fetchClinicalDataDensityPlotUsingPOST({
-                    xAxisAttributeId: FRACTION_GENOME_ALTERED,
-                    yAxisAttributeId: MUTATION_COUNT,
-                    xAxisStart:0, xAxisEnd:1, // FGA always goes 0 to 1
-                    yAxisStart:0, // mutation always starts at 0
-                    xAxisBinCount,
-                    yAxisBinCount,
-                    studyViewFilter:this.filters
-                })).filter(bin=>(bin.count > 0));// only show points for bins with stuff in them
-                const xBinSize = 1/xAxisBinCount;
-                const yBinSize = Math.max(...bins.map(bin=>bin.binY)) / (yAxisBinCount - 1);
+                const bins = (await internalClient.fetchClinicalDataDensityPlotUsingPOST(
+                    {
+                        xAxisAttributeId: FRACTION_GENOME_ALTERED,
+                        yAxisAttributeId: MUTATION_COUNT,
+                        xAxisStart: 0,
+                        xAxisEnd: 1, // FGA always goes 0 to 1
+                        yAxisStart: 0, // mutation always starts at 0
+                        xAxisBinCount,
+                        yAxisBinCount,
+                        studyViewFilter: this.filters,
+                    }
+                )).filter(bin => bin.count > 0); // only show points for bins with stuff in them
+                const xBinSize = 1 / xAxisBinCount;
+                const yBinSize =
+                    Math.max(...bins.map(bin => bin.binY)) /
+                    (yAxisBinCount - 1);
                 return {
-                    bins, xBinSize, yBinSize
+                    bins,
+                    xBinSize,
+                    yBinSize,
                 };
             } else {
                 return {
                     bins: [],
-                    xBinSize:-1,
-                    yBinSize:-1
+                    xBinSize: -1,
+                    yBinSize: -1,
                 };
             }
         },
-        onError: (error => {}),
+        onError: error => {},
         default: {
             bins: [],
-            xBinSize:-1,
-            yBinSize:-1
-        }
+            xBinSize: -1,
+            yBinSize: -1,
+        },
     });
 
     readonly sampleMutationCountAndFractionGenomeAlteredData = remoteData({
-        await:()=>[this.clinicalAttributes, this.selectedSamples],
-        invoke:()=>{
+        await: () => [this.clinicalAttributes, this.selectedSamples],
+        invoke: () => {
             const filter: ClinicalDataMultiStudyFilter = {
                 attributeIds: [MUTATION_COUNT, FRACTION_GENOME_ALTERED],
                 identifiers: _.map(this.selectedSamples.result!, obj => {
                     return {
-                        "entityId": obj.sampleId,
-                        "studyId": obj.studyId
-                    }
-                })
+                        entityId: obj.sampleId,
+                        studyId: obj.studyId,
+                    };
+                }),
             };
 
             return defaultClient.fetchClinicalDataUsingPOST({
                 clinicalDataType: ClinicalDataTypeEnum.SAMPLE,
-                clinicalDataMultiStudyFilter: filter
+                clinicalDataMultiStudyFilter: filter,
             });
         },
-        onError: (error => {}),
-        default: []
+        onError: error => {},
+        default: [],
     });
 
     readonly mutationCountVsFGAData = remoteData({
-        await:()=>[this.sampleMutationCountAndFractionGenomeAlteredData],
-        onError: (error => {}),
-        invoke: async ()=>{
-            return _.reduce(_.groupBy(this.sampleMutationCountAndFractionGenomeAlteredData.result, datum => datum.uniqueSampleKey), (acc, data) => {
-                if (data.length == 2) { // 2 => number of attribute ids
-                    let _datum: IStudyViewScatterPlotData = {
-                        studyId: data[0].studyId,
-                        sampleId: data[0].sampleId,
-                        patientId: data[0].patientId,
-                        uniqueSampleKey: data[0].uniqueSampleKey,
-                        x: 0,
-                        y: 0
-                    };
-                    _.forEach(data, datum => {
-                        if (datum.clinicalAttributeId === MUTATION_COUNT) {
-                            _datum.y = Number(datum.value)
-                        } else if (datum.clinicalAttributeId === FRACTION_GENOME_ALTERED) {
-                            _datum.x = Number(datum.value)
-                        }
-                    });
-                    acc.push(_datum)
-                }
-                return acc
-            }, [] as IStudyViewScatterPlotData[]);
-        }
+        await: () => [this.sampleMutationCountAndFractionGenomeAlteredData],
+        onError: error => {},
+        invoke: async () => {
+            return _.reduce(
+                _.groupBy(
+                    this.sampleMutationCountAndFractionGenomeAlteredData.result,
+                    datum => datum.uniqueSampleKey
+                ),
+                (acc, data) => {
+                    if (data.length == 2) {
+                        // 2 => number of attribute ids
+                        let _datum: IStudyViewScatterPlotData = {
+                            studyId: data[0].studyId,
+                            sampleId: data[0].sampleId,
+                            patientId: data[0].patientId,
+                            uniqueSampleKey: data[0].uniqueSampleKey,
+                            x: 0,
+                            y: 0,
+                        };
+                        _.forEach(data, datum => {
+                            if (datum.clinicalAttributeId === MUTATION_COUNT) {
+                                _datum.y = Number(datum.value);
+                            } else if (
+                                datum.clinicalAttributeId ===
+                                FRACTION_GENOME_ALTERED
+                            ) {
+                                _datum.x = Number(datum.value);
+                            }
+                        });
+                        acc.push(_datum);
+                    }
+                    return acc;
+                },
+                [] as IStudyViewScatterPlotData[]
+            );
+        },
     });
 
-
-    readonly mutationCountVsFractionGenomeAlteredDataSet = remoteData<{ [id: string]: IStudyViewScatterPlotData }>({
+    readonly mutationCountVsFractionGenomeAlteredDataSet = remoteData<{
+        [id: string]: IStudyViewScatterPlotData;
+    }>({
         await: () => [this.mutationCountVsFGAData],
         invoke: () => {
-            return Promise.resolve(_.keyBy(this.mutationCountVsFGAData.result, datum => datum.uniqueSampleKey));
+            return Promise.resolve(
+                _.keyBy(
+                    this.mutationCountVsFGAData.result,
+                    datum => datum.uniqueSampleKey
+                )
+            );
         },
-        default: {}
+        default: {},
     });
 
     readonly getDataForClinicalDataTab = remoteData({
         await: () => [this.clinicalAttributes, this.selectedSamples],
-        onError: (error => {}),
+        onError: error => {},
         invoke: async () => {
-            let sampleClinicalDataMap: { [attributeId: string]: { [attributeId: string]: string; } } = await this.getClinicalDataBySamples(this.selectedSamples.result)
-            return _.reduce(this.selectedSamples.result, (acc, next) => {
-
-                let sampleData: { [attributeId: string]: string; } = {
-                    studyId: next.studyId,
-                    patientId: next.patientId,
-                    sampleId: next.sampleId,
-                    ...(sampleClinicalDataMap[next.uniqueSampleKey] || {})
-                };
+            let sampleClinicalDataMap: {
+                [attributeId: string]: { [attributeId: string]: string };
+            } = await this.getClinicalDataBySamples(
+                this.selectedSamples.result
+            );
+            return _.reduce(
+                this.selectedSamples.result,
+                (acc, next) => {
+                    let sampleData: { [attributeId: string]: string } = {
+                        studyId: next.studyId,
+                        patientId: next.patientId,
+                        sampleId: next.sampleId,
+                        ...(sampleClinicalDataMap[next.uniqueSampleKey] || {}),
+                    };
 
-                acc.push(sampleData);
-                return acc;
-            }, [] as { [id: string]: string }[]);
+                    acc.push(sampleData);
+                    return acc;
+                },
+                [] as { [id: string]: string }[]
+            );
         },
-        default: []
+        default: [],
     });
 
-    readonly molecularProfileSampleCounts = remoteData<MolecularProfileSampleCount>({
-        onError: (error => {}),
+    readonly molecularProfileSampleCounts = remoteData<
+        MolecularProfileSampleCount
+    >({
+        onError: error => {},
         invoke: async () => {
             return internalClient.fetchMolecularProfileSampleCountsUsingPOST({
-                studyViewFilter: this.filters
+                studyViewFilter: this.filters,
             });
-        }
+        },
     });
 
-    readonly initialMolecularProfileSampleCounts = remoteData<MolecularProfileSampleCount>({
-        onError: (error => {}),
+    readonly initialMolecularProfileSampleCounts = remoteData<
+        MolecularProfileSampleCount
+    >({
+        onError: error => {},
         invoke: async () => {
             return internalClient.fetchMolecularProfileSampleCountsUsingPOST({
-                studyViewFilter: this.initialFilters
+                studyViewFilter: this.initialFilters,
             });
-        }
+        },
     });
 
     readonly clinicalAttributesCounts = remoteData({
         await: () => [this.selectedSamples],
-        onError: (error => {}),
+        onError: error => {},
         invoke: () => {
             let sampleIdentifiers = this.selectedSamples.result.map(sample => {
                 return {
                     sampleId: sample.sampleId,
-                    studyId: sample.studyId
-                }
+                    studyId: sample.studyId,
+                };
             });
 
             let clinicalAttributeCountFilter = {
-                sampleIdentifiers
+                sampleIdentifiers,
             } as ClinicalAttributeCountFilter;
             return defaultClient.getClinicalAttributeCountsUsingPOST({
-                clinicalAttributeCountFilter
+                clinicalAttributeCountFilter,
             });
-        }
+        },
     });
 
     readonly clinicalDataWithCount = remoteData<ClinicalDataCountSet>({
@@ -3535,44 +4808,63 @@ export class StudyViewPageStore {
         ],
         invoke: async () => {
             if (!_.isEmpty(this.chartMetaSet)) {
-                const attributeIdToAttribute = this.clinicalAttributeIdToClinicalAttribute.result!;
+                const attributeIdToAttribute = this
+                    .clinicalAttributeIdToClinicalAttribute.result!;
                 // build map
-                const ret: { [clinicalAttributeId: string]: number } =
-                    _.reduce(this.clinicalAttributesCounts.result || [], (map: ClinicalDataCountSet, next: ClinicalAttributeCount) => {
-                        const attribute = attributeIdToAttribute[next.clinicalAttributeId];
+                const ret: { [clinicalAttributeId: string]: number } = _.reduce(
+                    this.clinicalAttributesCounts.result || [],
+                    (
+                        map: ClinicalDataCountSet,
+                        next: ClinicalAttributeCount
+                    ) => {
+                        const attribute =
+                            attributeIdToAttribute[next.clinicalAttributeId];
                         if (attribute) {
                             let key = getUniqueKey(attribute);
                             map[key] = map[key] || 0;
                             map[key] += next.count;
                         }
                         return map;
-                    }, {});
+                    },
+                    {}
+                );
 
-                _.each(this.survivalPlotData.result, (survivalPlot) => {
+                _.each(this.survivalPlotData.result, survivalPlot => {
                     if (survivalPlot.id in this.chartMetaSet) {
                         ret[survivalPlot.id] = survivalPlot.survivalData.length;
                     }
                 });
 
                 if (UniqueKey.CANCER_STUDIES in this.chartMetaSet) {
-                    ret[UniqueKey.CANCER_STUDIES] = _.sumBy(this.cancerStudiesData.result, data => data.count);
+                    ret[UniqueKey.CANCER_STUDIES] = _.sumBy(
+                        this.cancerStudiesData.result,
+                        data => data.count
+                    );
                 }
 
                 // Add all custom chart counts, and they should all get 100%
-                _.reduce(this._customCharts.keys(), (acc, next) => {
-                    acc[next] = this.selectedSamples.result.length;
-                    return acc;
-                }, ret);
+                _.reduce(
+                    this._customCharts.keys(),
+                    (acc, next) => {
+                        acc[next] = this.selectedSamples.result.length;
+                        return acc;
+                    },
+                    ret
+                );
 
-                return _.reduce(this.chartMetaSet, (acc, next, key) => {
-                    acc[key] = ret[key] || 0;
-                    return acc;
-                }, {} as ClinicalDataCountSet);
+                return _.reduce(
+                    this.chartMetaSet,
+                    (acc, next, key) => {
+                        acc[key] = ret[key] || 0;
+                        return acc;
+                    },
+                    {} as ClinicalDataCountSet
+                );
             }
-            return {}
+            return {};
         },
-        onError: (error => {}),
-        default: {}
+        onError: error => {},
+        default: {},
     });
 
     readonly genomicDataWithCount = remoteData<ClinicalDataCountSet>({
@@ -3580,146 +4872,224 @@ export class StudyViewPageStore {
             this.molecularProfileSampleCounts,
             this.clinicalAttributeIdToClinicalAttribute,
             this.clinicalAttributesCounts,
-            this.mutationCountVsFractionGenomeAlteredDataSet],
+            this.mutationCountVsFractionGenomeAlteredDataSet,
+        ],
         invoke: async () => {
             if (!_.isEmpty(this.chartMetaSet)) {
-                const attributeIdToAttribute = this.clinicalAttributeIdToClinicalAttribute.result!;
+                const attributeIdToAttribute = this
+                    .clinicalAttributeIdToClinicalAttribute.result!;
                 // build map
-                const ret: ClinicalDataCountSet =
-                    _.reduce(this.clinicalAttributesCounts.result || [], (map: ClinicalDataCountSet, next: ClinicalAttributeCount) => {
-                        const attribute = attributeIdToAttribute[next.clinicalAttributeId];
+                const ret: ClinicalDataCountSet = _.reduce(
+                    this.clinicalAttributesCounts.result || [],
+                    (
+                        map: ClinicalDataCountSet,
+                        next: ClinicalAttributeCount
+                    ) => {
+                        const attribute =
+                            attributeIdToAttribute[next.clinicalAttributeId];
                         if (attribute) {
-                            let key = getUniqueKey(attribute)
+                            let key = getUniqueKey(attribute);
                             map[key] = map[key] || 0;
                             map[key] += next.count;
                         }
                         return map;
-                    }, {});
-
+                    },
+                    {}
+                );
 
                 if (UniqueKey.MUTATED_GENES_TABLE in this.chartMetaSet) {
-                    ret[UniqueKey.MUTATED_GENES_TABLE] = this.molecularProfileSampleCounts.result ? this.molecularProfileSampleCounts.result.numberOfMutationProfiledSamples : 0;
-                    ret[UniqueKey.WITH_MUTATION_DATA] = this.molecularProfileSampleCounts.result ? this.molecularProfileSampleCounts.result.numberOfMutationProfiledSamples : 0;
+                    ret[UniqueKey.MUTATED_GENES_TABLE] = this
+                        .molecularProfileSampleCounts.result
+                        ? this.molecularProfileSampleCounts.result
+                              .numberOfMutationProfiledSamples
+                        : 0;
+                    ret[UniqueKey.WITH_MUTATION_DATA] = this
+                        .molecularProfileSampleCounts.result
+                        ? this.molecularProfileSampleCounts.result
+                              .numberOfMutationProfiledSamples
+                        : 0;
                 }
 
                 if (UniqueKey.FUSION_GENES_TABLE in this.chartMetaSet) {
-                    ret[UniqueKey.FUSION_GENES_TABLE] = this.molecularProfileSampleCounts.result ? this.molecularProfileSampleCounts.result.numberOfFusionProfiledSamples : 0;
-                    ret[UniqueKey.WITH_FUSION_DATA] = this.molecularProfileSampleCounts.result ? this.molecularProfileSampleCounts.result.numberOfFusionProfiledSamples : 0;
+                    ret[UniqueKey.FUSION_GENES_TABLE] = this
+                        .molecularProfileSampleCounts.result
+                        ? this.molecularProfileSampleCounts.result
+                              .numberOfFusionProfiledSamples
+                        : 0;
+                    ret[UniqueKey.WITH_FUSION_DATA] = this
+                        .molecularProfileSampleCounts.result
+                        ? this.molecularProfileSampleCounts.result
+                              .numberOfFusionProfiledSamples
+                        : 0;
                 }
 
                 if (UniqueKey.CNA_GENES_TABLE in this.chartMetaSet) {
-                    ret[UniqueKey.CNA_GENES_TABLE] = this.molecularProfileSampleCounts.result ? this.molecularProfileSampleCounts.result.numberOfCNAProfiledSamples : 0;
-                    ret[UniqueKey.WITH_CNA_DATA] = this.molecularProfileSampleCounts.result ? this.molecularProfileSampleCounts.result.numberOfCNAProfiledSamples : 0;
+                    ret[UniqueKey.CNA_GENES_TABLE] = this
+                        .molecularProfileSampleCounts.result
+                        ? this.molecularProfileSampleCounts.result
+                              .numberOfCNAProfiledSamples
+                        : 0;
+                    ret[UniqueKey.WITH_CNA_DATA] = this
+                        .molecularProfileSampleCounts.result
+                        ? this.molecularProfileSampleCounts.result
+                              .numberOfCNAProfiledSamples
+                        : 0;
                 }
 
-                if (UniqueKey.MUTATION_COUNT_CNA_FRACTION in this.chartMetaSet) {
+                if (
+                    UniqueKey.MUTATION_COUNT_CNA_FRACTION in this.chartMetaSet
+                ) {
                     // number of samples containing mutationCountVsFractionGenomeAlteredData should be
                     // calculated from the selected samples
-                    const mutationCountVsFractionGenomeAlteredDataSet = this.mutationCountVsFractionGenomeAlteredDataSet.result;
-                    const selectedSamplesMap = _.keyBy(this.selectedSamples.result!, s => s.uniqueSampleKey);
-                    const filteredData = _.reduce(selectedSamplesMap, (acc, next) => {
-                        if (mutationCountVsFractionGenomeAlteredDataSet[next.uniqueSampleKey]) {
-                            acc.push(mutationCountVsFractionGenomeAlteredDataSet[next.uniqueSampleKey]);
-                        }
-                        return acc;
-                    }, [] as IStudyViewScatterPlotData[]);
-                    ret[UniqueKey.MUTATION_COUNT_CNA_FRACTION] = filteredData.length;
+                    const mutationCountVsFractionGenomeAlteredDataSet = this
+                        .mutationCountVsFractionGenomeAlteredDataSet.result;
+                    const selectedSamplesMap = _.keyBy(
+                        this.selectedSamples.result!,
+                        s => s.uniqueSampleKey
+                    );
+                    const filteredData = _.reduce(
+                        selectedSamplesMap,
+                        (acc, next) => {
+                            if (
+                                mutationCountVsFractionGenomeAlteredDataSet[
+                                    next.uniqueSampleKey
+                                ]
+                            ) {
+                                acc.push(
+                                    mutationCountVsFractionGenomeAlteredDataSet[
+                                        next.uniqueSampleKey
+                                    ]
+                                );
+                            }
+                            return acc;
+                        },
+                        [] as IStudyViewScatterPlotData[]
+                    );
+                    ret[UniqueKey.MUTATION_COUNT_CNA_FRACTION] =
+                        filteredData.length;
                 }
 
-                return _.reduce(this.chartMetaSet, (acc, next, key) => {
-                    acc[key] = ret[key] || 0;
-                    return acc;
-                }, {} as ClinicalDataCountSet);
+                return _.reduce(
+                    this.chartMetaSet,
+                    (acc, next, key) => {
+                        acc[key] = ret[key] || 0;
+                        return acc;
+                    },
+                    {} as ClinicalDataCountSet
+                );
             }
-            return {}
+            return {};
         },
-        onError: (error => {}),
-        default: {}
+        onError: error => {},
+        default: {},
     });
 
     @computed
-    public get clinicalDataDownloadFilename()
-    {
+    public get clinicalDataDownloadFilename() {
         return `${this.downloadFilenamePrefix}clinical_data.tsv`;
     }
 
     @computed
     public get downloadFilenamePrefix() {
-        return generateDownloadFilenamePrefixByStudies(_.values(this.physicalStudiesSet.result));
+        return generateDownloadFilenamePrefixByStudies(
+            _.values(this.physicalStudiesSet.result)
+        );
     }
 
     @autobind
     public async getDownloadDataPromise() {
+        let sampleClinicalDataMap = await this.getClinicalDataBySamples(
+            this.selectedSamples.result
+        );
 
-        let sampleClinicalDataMap = await this.getClinicalDataBySamples(this.selectedSamples.result)
-
-        let clinicalAttributesNameSet = _.reduce(this.clinicalAttributes.result, (acc, next) => {
-            const uniqueKey = getUniqueKey(next);
-            acc[uniqueKey] = next.displayName;
-            return acc;
-        }, {
-            studyId: 'Study ID',
-            patientId: 'Patient ID',
-            sampleId: 'Sample ID',
-        } as { [id: string]: string })
-
-        let dataRows = _.reduce(this.selectedSamples.result, (acc, next) => {
-
-            let sampleData: { [attributeId: string]: string; } = {
-                studyId: next.studyId,
-                patientId: next.patientId,
-                sampleId: next.sampleId,
-                ...(sampleClinicalDataMap[next.uniqueSampleKey] || {})
-            };
+        let clinicalAttributesNameSet = _.reduce(
+            this.clinicalAttributes.result,
+            (acc, next) => {
+                const uniqueKey = getUniqueKey(next);
+                acc[uniqueKey] = next.displayName;
+                return acc;
+            },
+            {
+                studyId: 'Study ID',
+                patientId: 'Patient ID',
+                sampleId: 'Sample ID',
+            } as { [id: string]: string }
+        );
 
-            acc.push(
-                _.map(Object.keys(clinicalAttributesNameSet), (attributrId) => {
-                    return sampleData[attributrId] || Datalabel.NA;
-                })
-            );
-            return acc;
-        }, [_.values(clinicalAttributesNameSet)]);
+        let dataRows = _.reduce(
+            this.selectedSamples.result,
+            (acc, next) => {
+                let sampleData: { [attributeId: string]: string } = {
+                    studyId: next.studyId,
+                    patientId: next.patientId,
+                    sampleId: next.sampleId,
+                    ...(sampleClinicalDataMap[next.uniqueSampleKey] || {}),
+                };
+
+                acc.push(
+                    _.map(
+                        Object.keys(clinicalAttributesNameSet),
+                        attributrId => {
+                            return sampleData[attributrId] || Datalabel.NA;
+                        }
+                    )
+                );
+                return acc;
+            },
+            [_.values(clinicalAttributesNameSet)]
+        );
 
         return dataRows.map(mutation => mutation.join('\t')).join('\n');
     }
 
     @autobind
     onSubmitQuery() {
-        const unknownQueriedIdsMap = stringListToSet(this.unknownQueriedIds.result);
+        const unknownQueriedIdsMap = stringListToSet(
+            this.unknownQueriedIds.result
+        );
         let formOps: { [id: string]: string } = {
-            cancer_study_list: this.studyIds.filter(studyId => !unknownQueriedIdsMap[studyId]).join(','),
+            cancer_study_list: this.studyIds
+                .filter(studyId => !unknownQueriedIdsMap[studyId])
+                .join(','),
             tab_index: 'tab_visualize',
-        }
+        };
 
-        if (this.filteredVirtualStudies.result.length === 0 && this.studyIds.length === 1) {
+        if (
+            this.filteredVirtualStudies.result.length === 0 &&
+            this.studyIds.length === 1
+        ) {
             if (!_.isEmpty(this.mutationProfiles.result)) {
-                formOps['genetic_profile_ids_PROFILE_MUTATION_EXTENDED'] = this.mutationProfiles.result[0].molecularProfileId
+                formOps[
+                    'genetic_profile_ids_PROFILE_MUTATION_EXTENDED'
+                ] = this.mutationProfiles.result[0].molecularProfileId;
             }
             if (!_.isEmpty(this.cnaProfiles.result)) {
-                formOps['genetic_profile_ids_PROFILE_COPY_NUMBER_ALTERATION'] = this.cnaProfiles.result[0].molecularProfileId
+                formOps[
+                    'genetic_profile_ids_PROFILE_COPY_NUMBER_ALTERATION'
+                ] = this.cnaProfiles.result[0].molecularProfileId;
             }
         } else {
             let data_priority = '0';
             let { mutation, cna } = {
                 mutation: !_.isEmpty(this.mutationProfiles.result),
-                cna: !_.isEmpty(this.cnaProfiles)
+                cna: !_.isEmpty(this.cnaProfiles),
             };
-            if (mutation && cna)
-                data_priority = '0';
-            else if (mutation)
-                data_priority = '1';
-            else if (cna)
-                data_priority = '2';
+            if (mutation && cna) data_priority = '0';
+            else if (mutation) data_priority = '1';
+            else if (cna) data_priority = '2';
             formOps.data_priority = data_priority;
         }
 
         if (this.chartsAreFiltered) {
-            formOps.case_set_id = '-1'
+            formOps.case_set_id = '-1';
             formOps.case_ids = _.map(this.selectedSamples.result, sample => {
-                return sample.studyId + ":" + sample.sampleId;
+                return sample.studyId + ':' + sample.sampleId;
             }).join('+');
         } else {
-            if (this.filteredVirtualStudies.result.length === 0 && this.studyIds.length === 1) {
+            if (
+                this.filteredVirtualStudies.result.length === 0 &&
+                this.studyIds.length === 1
+            ) {
                 formOps.case_set_id = this.studyIds[0] + '_all';
             } else {
                 formOps.case_set_id = 'all';
@@ -3729,7 +5099,9 @@ export class StudyViewPageStore {
         let url = '/';
         if (!_.isEmpty(this.geneQueries)) {
             formOps.Action = 'Submit';
-            formOps.gene_list = this.geneQueries.map(query => unparseOQLQueryLine(query)).join('\n');
+            formOps.gene_list = this.geneQueries
+                .map(query => unparseOQLQueryLine(query))
+                .join('\n');
             url = '/results';
         }
         submitToPage(url, formOps, '_blank');
@@ -3737,18 +5109,26 @@ export class StudyViewPageStore {
 
     @autobind
     @action
-    setCustomChartFilters(chartUniqueKey:string, values: string[]) {
+    setCustomChartFilters(chartUniqueKey: string, values: string[]) {
         if (values.length > 0) {
             switch (chartUniqueKey) {
                 case UniqueKey.CANCER_STUDIES: {
-                    let filteredSampleIdentifiers = getFilteredSampleIdentifiers(this.samples.result.filter(sample => values.includes(sample.studyId)));
-                    this._chartSampleIdentifiersFilterSet.set(chartUniqueKey, filteredSampleIdentifiers);
+                    let filteredSampleIdentifiers = getFilteredSampleIdentifiers(
+                        this.samples.result.filter(sample =>
+                            values.includes(sample.studyId)
+                        )
+                    );
+                    this._chartSampleIdentifiersFilterSet.set(
+                        chartUniqueKey,
+                        filteredSampleIdentifiers
+                    );
                     break;
                 }
                 case UniqueKey.WITH_MUTATION_DATA: {
                     switch (values.length) {
                         case 1: {
-                            this._withMutationDataFilter = values[0] === Datalabel.YES ? true : false;
+                            this._withMutationDataFilter =
+                                values[0] === Datalabel.YES ? true : false;
                             break;
                         }
                         case 2: {
@@ -3761,7 +5141,8 @@ export class StudyViewPageStore {
                 case UniqueKey.WITH_CNA_DATA: {
                     switch (values.length) {
                         case 1: {
-                            this._withCNADataFilter = values[0] === Datalabel.YES ? true : false;
+                            this._withCNADataFilter =
+                                values[0] === Datalabel.YES ? true : false;
                             break;
                         }
                         case 2: {
@@ -3774,7 +5155,8 @@ export class StudyViewPageStore {
                 case UniqueKey.WITH_FUSION_DATA: {
                     switch (values.length) {
                         case 1: {
-                            this._withFusionDataFilter = values[0] === Datalabel.YES ? true : false;
+                            this._withFusionDataFilter =
+                                values[0] === Datalabel.YES ? true : false;
                             break;
                         }
                         case 2: {
@@ -3785,32 +5167,38 @@ export class StudyViewPageStore {
                     break;
                 }
                 default: {
-                    let filteredSampleIdentifiers = _.reduce(this._customChartsSelectedCases.get(chartUniqueKey), (acc, next) => {
-                        if(values.includes(next.value)) {
-                            acc.push({
-                                studyId: next.studyId,
-                                sampleId: next.sampleId
-                            });
-                        }
-                        return acc;
-                    }, [] as SampleIdentifier[]);
-                    this._chartSampleIdentifiersFilterSet.set(chartUniqueKey, filteredSampleIdentifiers);
+                    let filteredSampleIdentifiers = _.reduce(
+                        this._customChartsSelectedCases.get(chartUniqueKey),
+                        (acc, next) => {
+                            if (values.includes(next.value)) {
+                                acc.push({
+                                    studyId: next.studyId,
+                                    sampleId: next.sampleId,
+                                });
+                            }
+                            return acc;
+                        },
+                        [] as SampleIdentifier[]
+                    );
+                    this._chartSampleIdentifiersFilterSet.set(
+                        chartUniqueKey,
+                        filteredSampleIdentifiers
+                    );
                 }
             }
             this.customChartFilterSet.set(chartUniqueKey, values);
-        }
-        else {
-            if(UniqueKey.WITH_MUTATION_DATA === chartUniqueKey) {
+        } else {
+            if (UniqueKey.WITH_MUTATION_DATA === chartUniqueKey) {
                 this._withMutationDataFilter = undefined;
             }
-            if(UniqueKey.WITH_CNA_DATA === chartUniqueKey) {
+            if (UniqueKey.WITH_CNA_DATA === chartUniqueKey) {
                 this._withCNADataFilter = undefined;
             }
-            if(UniqueKey.WITH_FUSION_DATA === chartUniqueKey) {
+            if (UniqueKey.WITH_FUSION_DATA === chartUniqueKey) {
                 this._withFusionDataFilter = undefined;
             }
-            this._chartSampleIdentifiersFilterSet.delete(chartUniqueKey)
-            this.customChartFilterSet.delete(chartUniqueKey)
+            this._chartSampleIdentifiersFilterSet.delete(chartUniqueKey);
+            this.customChartFilterSet.delete(chartUniqueKey);
         }
     }
 
@@ -3818,7 +5206,12 @@ export class StudyViewPageStore {
         await: () => [this.selectedSamples],
         invoke: async () => {
             let selectedSamples = [];
-            if (_.includes(this._chartSampleIdentifiersFilterSet.keys(), UniqueKey.CANCER_STUDIES)) {
+            if (
+                _.includes(
+                    this._chartSampleIdentifiersFilterSet.keys(),
+                    UniqueKey.CANCER_STUDIES
+                )
+            ) {
                 selectedSamples = await getSamplesByExcludingFiltersOnChart(
                     UniqueKey.CANCER_STUDIES,
                     this.filters,
@@ -3826,34 +5219,60 @@ export class StudyViewPageStore {
                     this.queriedSampleIdentifiers.result,
                     this.queriedPhysicalStudyIds.result
                 );
-            }else {
+            } else {
                 selectedSamples = this.selectedSamples.result;
             }
-            return getClinicalDataCountWithColorByClinicalDataCount(_.values(_.reduce(selectedSamples, (acc, sample) => {
-                const studyId = sample.studyId;
-                if (acc[studyId]) {
-                    acc[studyId].count = acc[studyId].count + 1
-                } else {
-                    acc[studyId] = {value: `${studyId}`, count: 1}
-                }
-                return acc
-            }, {} as { [id: string]: ClinicalDataCount })));
+            return getClinicalDataCountWithColorByClinicalDataCount(
+                _.values(
+                    _.reduce(
+                        selectedSamples,
+                        (acc, sample) => {
+                            const studyId = sample.studyId;
+                            if (acc[studyId]) {
+                                acc[studyId].count = acc[studyId].count + 1;
+                            } else {
+                                acc[studyId] = {
+                                    value: `${studyId}`,
+                                    count: 1,
+                                };
+                            }
+                            return acc;
+                        },
+                        {} as { [id: string]: ClinicalDataCount }
+                    )
+                )
+            );
         },
-        onError: (error => {}),
-        default: []
+        onError: error => {},
+        default: [],
     });
 
     @action
     showAsPieChart(uniqueKey: string, dataSize: number) {
-        if (shouldShowChart(this.initialFilters, dataSize, this.samples.result.length)) {
+        if (
+            shouldShowChart(
+                this.initialFilters,
+                dataSize,
+                this.samples.result.length
+            )
+        ) {
             this.changeChartVisibility(uniqueKey, true);
 
-            if (dataSize > STUDY_VIEW_CONFIG.thresholds.pieToTable || _.includes(STUDY_VIEW_CONFIG.tableAttrs, uniqueKey)) {
+            if (
+                dataSize > STUDY_VIEW_CONFIG.thresholds.pieToTable ||
+                _.includes(STUDY_VIEW_CONFIG.tableAttrs, uniqueKey)
+            ) {
                 this.chartsType.set(uniqueKey, ChartTypeEnum.TABLE);
-                this.chartsDimension.set(uniqueKey, this.getTableDimensionByNumberOfRecords(dataSize));
-            }else {
+                this.chartsDimension.set(
+                    uniqueKey,
+                    this.getTableDimensionByNumberOfRecords(dataSize)
+                );
+            } else {
                 this.chartsType.set(uniqueKey, ChartTypeEnum.PIE_CHART);
-                this.chartsDimension.set(uniqueKey, STUDY_VIEW_CONFIG.layout.dimensions[ChartTypeEnum.PIE_CHART]);
+                this.chartsDimension.set(
+                    uniqueKey,
+                    STUDY_VIEW_CONFIG.layout.dimensions[ChartTypeEnum.PIE_CHART]
+                );
             }
         }
     }
@@ -3864,24 +5283,50 @@ export class StudyViewPageStore {
         if (!this.customChartsPromises.hasOwnProperty(uniqueKey)) {
             switch (uniqueKey) {
                 case UniqueKey.WITH_MUTATION_DATA:
-                    this.customChartsPromises[uniqueKey] = this.withMutationDataChartCounts;
+                    this.customChartsPromises[
+                        uniqueKey
+                    ] = this.withMutationDataChartCounts;
                     break;
                 case UniqueKey.WITH_CNA_DATA:
-                    this.customChartsPromises[uniqueKey] = this.withCNADataChartCounts;
+                    this.customChartsPromises[
+                        uniqueKey
+                    ] = this.withCNADataChartCounts;
                     break;
                 case UniqueKey.WITH_FUSION_DATA:
-                    this.customChartsPromises[uniqueKey] = this.withFusionDataChartCounts;
+                    this.customChartsPromises[
+                        uniqueKey
+                    ] = this.withFusionDataChartCounts;
                     break;
                 default:
-                    this.customChartsPromises[uniqueKey] = remoteData<ClinicalDataCountSummary[]>({
+                    this.customChartsPromises[uniqueKey] = remoteData<
+                        ClinicalDataCountSummary[]
+                    >({
                         await: () => {
-                            return _.includes([UniqueKey.WITH_MUTATION_DATA, UniqueKey.WITH_CNA_DATA, UniqueKey.WITH_FUSION_DATA], uniqueKey) ? [this.molecularProfileSampleCounts, this.selectedSamples] : [this.selectedSamples];
+                            return _.includes(
+                                [
+                                    UniqueKey.WITH_MUTATION_DATA,
+                                    UniqueKey.WITH_CNA_DATA,
+                                    UniqueKey.WITH_FUSION_DATA,
+                                ],
+                                uniqueKey
+                            )
+                                ? [
+                                      this.molecularProfileSampleCounts,
+                                      this.selectedSamples,
+                                  ]
+                                : [this.selectedSamples];
                         },
                         invoke: async () => {
-                            let dataCountSet: { [id: string]: ClinicalDataCount } = {};
+                            let dataCountSet: {
+                                [id: string]: ClinicalDataCount;
+                            } = {};
 
                             let selectedSamples: Sample[] = [];
-                            if (this._chartSampleIdentifiersFilterSet.has(uniqueKey)) {
+                            if (
+                                this._chartSampleIdentifiersFilterSet.has(
+                                    uniqueKey
+                                )
+                            ) {
                                 selectedSamples = await getSamplesByExcludingFiltersOnChart(
                                     uniqueKey,
                                     this.filters,
@@ -3890,35 +5335,59 @@ export class StudyViewPageStore {
                                     this.queriedPhysicalStudyIds.result
                                 );
                             } else {
-                                selectedSamples = this.selectedSamples.result
+                                selectedSamples = this.selectedSamples.result;
                             }
 
-                            dataCountSet = _.reduce(selectedSamples, (acc, sample) => {
-                                const matchedCases = _.filter(this._customChartsSelectedCases.get(uniqueKey), (selectedCase: CustomChartIdentifierWithValue) => (selectedCase.studyId === sample.studyId) && (selectedCase.sampleId === sample.sampleId));
-                                const valDefault = Datalabel.NA;
-                                let matchedValues: string[] = [];
-                                if (matchedCases.length >= 1) {
-                                    matchedValues = matchedCases.map(item => {
-                                        return item.value ? item.value : valDefault;
-                                    });
-                                } else {
-                                    matchedValues = [valDefault];
-                                }
-                                matchedValues.forEach(value => {
-                                    if (acc[value]) {
-                                        acc[value].count = acc[value].count + 1
+                            dataCountSet = _.reduce(
+                                selectedSamples,
+                                (acc, sample) => {
+                                    const matchedCases = _.filter(
+                                        this._customChartsSelectedCases.get(
+                                            uniqueKey
+                                        ),
+                                        (
+                                            selectedCase: CustomChartIdentifierWithValue
+                                        ) =>
+                                            selectedCase.studyId ===
+                                                sample.studyId &&
+                                            selectedCase.sampleId ===
+                                                sample.sampleId
+                                    );
+                                    const valDefault = Datalabel.NA;
+                                    let matchedValues: string[] = [];
+                                    if (matchedCases.length >= 1) {
+                                        matchedValues = matchedCases.map(
+                                            item => {
+                                                return item.value
+                                                    ? item.value
+                                                    : valDefault;
+                                            }
+                                        );
                                     } else {
-                                        acc[value] = {
-                                            value: value,
-                                            count: 1
-                                        }
+                                        matchedValues = [valDefault];
                                     }
-                                });
-                                return acc;
-                            }, dataCountSet);
-                            return Promise.resolve(getClinicalDataCountWithColorByClinicalDataCount(_.values(dataCountSet)));
+                                    matchedValues.forEach(value => {
+                                        if (acc[value]) {
+                                            acc[value].count =
+                                                acc[value].count + 1;
+                                        } else {
+                                            acc[value] = {
+                                                value: value,
+                                                count: 1,
+                                            };
+                                        }
+                                    });
+                                    return acc;
+                                },
+                                dataCountSet
+                            );
+                            return Promise.resolve(
+                                getClinicalDataCountWithColorByClinicalDataCount(
+                                    _.values(dataCountSet)
+                                )
+                            );
                         },
-                        default: []
+                        default: [],
                     });
                     break;
             }
@@ -3926,113 +5395,157 @@ export class StudyViewPageStore {
         return this.customChartsPromises[uniqueKey];
     }
 
-    private withMutationDataChartCounts = remoteData<ClinicalDataCountSummary[]>({
+    private withMutationDataChartCounts = remoteData<
+        ClinicalDataCountSummary[]
+    >({
         invoke: async () => {
-            let molecularProfileSampleCounts = await internalClient.fetchMolecularProfileSampleCountsUsingPOST({
-                studyViewFilter: Object.assign({}, this.filters, { withMutationData: undefined })
-            });
+            let molecularProfileSampleCounts = await internalClient.fetchMolecularProfileSampleCountsUsingPOST(
+                {
+                    studyViewFilter: Object.assign({}, this.filters, {
+                        withMutationData: undefined,
+                    }),
+                }
+            );
             return Promise.resolve(
                 getClinicalDataCountWithColorByCategoryCounts(
                     molecularProfileSampleCounts.numberOfMutationProfiledSamples,
-                    molecularProfileSampleCounts.numberOfMutationUnprofiledSamples));
+                    molecularProfileSampleCounts.numberOfMutationUnprofiledSamples
+                )
+            );
         },
-        default: []
-    })
+        default: [],
+    });
 
     private withFusionDataChartCounts = remoteData<ClinicalDataCountSummary[]>({
         invoke: async () => {
-            let molecularProfileSampleCounts = await internalClient.fetchMolecularProfileSampleCountsUsingPOST({
-                studyViewFilter: Object.assign({}, this.filters, { withFusionData: undefined })
-            });
+            let molecularProfileSampleCounts = await internalClient.fetchMolecularProfileSampleCountsUsingPOST(
+                {
+                    studyViewFilter: Object.assign({}, this.filters, {
+                        withFusionData: undefined,
+                    }),
+                }
+            );
             return getClinicalDataCountWithColorByCategoryCounts(
-                    molecularProfileSampleCounts.numberOfFusionProfiledSamples,
-                    molecularProfileSampleCounts.numberOfFusionUnprofiledSamples);
+                molecularProfileSampleCounts.numberOfFusionProfiledSamples,
+                molecularProfileSampleCounts.numberOfFusionUnprofiledSamples
+            );
         },
-        default: []
-    })
+        default: [],
+    });
 
     private withCNADataChartCounts = remoteData<ClinicalDataCountSummary[]>({
         invoke: async () => {
-            let molecularProfileSampleCounts = await internalClient.fetchMolecularProfileSampleCountsUsingPOST({
-                studyViewFilter: Object.assign({}, this.filters, { withCNAData: undefined })
-            });
+            let molecularProfileSampleCounts = await internalClient.fetchMolecularProfileSampleCountsUsingPOST(
+                {
+                    studyViewFilter: Object.assign({}, this.filters, {
+                        withCNAData: undefined,
+                    }),
+                }
+            );
             return Promise.resolve(
                 getClinicalDataCountWithColorByCategoryCounts(
                     molecularProfileSampleCounts.numberOfCNAProfiledSamples,
-                    molecularProfileSampleCounts.numberOfCNAUnprofiledSamples));
+                    molecularProfileSampleCounts.numberOfCNAUnprofiledSamples
+                )
+            );
         },
-        default: []
+        default: [],
     });
 
     readonly mutationAsClinicalData = remoteData<ClinicalData[]>({
         await: () => [this.samples],
         invoke: async () => {
-            const filteredSamples = await internalClient.fetchFilteredSamplesUsingPOST({
-                studyViewFilter: Object.assign({}, this.initialFilters, { withMutationData: true })
-            });
+            const filteredSamples = await internalClient.fetchFilteredSamplesUsingPOST(
+                {
+                    studyViewFilter: Object.assign({}, this.initialFilters, {
+                        withMutationData: true,
+                    }),
+                }
+            );
 
-            const filteredSampleByKey = _.keyBy(filteredSamples, sample => sample.uniqueSampleKey);
+            const filteredSampleByKey = _.keyBy(
+                filteredSamples,
+                sample => sample.uniqueSampleKey
+            );
 
-            return Promise.resolve(this.samples.result.map(sample => {
-                return {
-                    clinicalAttributeId: UniqueKey.WITH_MUTATION_DATA,
-                    patientId: sample.patientId,
-                    sampleId: sample.sampleId,
-                    studyId: sample.studyId,
-                    uniquePatientKey: sample.uniquePatientKey,
-                    uniqueSampleKey: sample.uniqueSampleKey,
-                    value: filteredSampleByKey[sample.uniqueSampleKey] !== undefined ? Datalabel.YES : Datalabel.NO
-                } as ClinicalData
-            }));
+            return Promise.resolve(
+                this.samples.result.map(sample => {
+                    return {
+                        clinicalAttributeId: UniqueKey.WITH_MUTATION_DATA,
+                        patientId: sample.patientId,
+                        sampleId: sample.sampleId,
+                        studyId: sample.studyId,
+                        uniquePatientKey: sample.uniquePatientKey,
+                        uniqueSampleKey: sample.uniqueSampleKey,
+                        value:
+                            filteredSampleByKey[sample.uniqueSampleKey] !==
+                            undefined
+                                ? Datalabel.YES
+                                : Datalabel.NO,
+                    } as ClinicalData;
+                })
+            );
         },
-        onError: (error => Promise.resolve([])),
-        default: []
+        onError: error => Promise.resolve([]),
+        default: [],
     });
 
     readonly cnaAsClinicalData = remoteData<ClinicalData[]>({
         await: () => [this.samples],
         invoke: async () => {
+            const filteredSamples = await internalClient.fetchFilteredSamplesUsingPOST(
+                {
+                    studyViewFilter: Object.assign({}, this.initialFilters, {
+                        withCNAData: true,
+                    }),
+                }
+            );
 
-            const filteredSamples = await internalClient.fetchFilteredSamplesUsingPOST({
-                studyViewFilter: Object.assign({}, this.initialFilters, { withCNAData: true })
-            });
-
-            const filteredSampleByKey = _.keyBy(filteredSamples, sample => sample.uniqueSampleKey);
+            const filteredSampleByKey = _.keyBy(
+                filteredSamples,
+                sample => sample.uniqueSampleKey
+            );
 
-            return Promise.resolve(this.samples.result.map(sample => {
-                return {
-                    clinicalAttributeId: UniqueKey.WITH_MUTATION_DATA,
-                    patientId: sample.patientId,
-                    sampleId: sample.sampleId,
-                    studyId: sample.studyId,
-                    uniquePatientKey: sample.uniquePatientKey,
-                    uniqueSampleKey: sample.uniqueSampleKey,
-                    value: filteredSampleByKey[sample.uniqueSampleKey] !== undefined ? Datalabel.YES : Datalabel.NO
-                } as ClinicalData
-            }));
+            return Promise.resolve(
+                this.samples.result.map(sample => {
+                    return {
+                        clinicalAttributeId: UniqueKey.WITH_MUTATION_DATA,
+                        patientId: sample.patientId,
+                        sampleId: sample.sampleId,
+                        studyId: sample.studyId,
+                        uniquePatientKey: sample.uniquePatientKey,
+                        uniqueSampleKey: sample.uniqueSampleKey,
+                        value:
+                            filteredSampleByKey[sample.uniqueSampleKey] !==
+                            undefined
+                                ? Datalabel.YES
+                                : Datalabel.NO,
+                    } as ClinicalData;
+                })
+            );
         },
-        onError: (error => Promise.resolve([])),
-        default: []
+        onError: error => Promise.resolve([]),
+        default: [],
     });
 
     readonly cancerStudyAsClinicalData = remoteData<ClinicalData[]>({
         await: () => [this.samples],
         invoke: async () => {
-
-            return Promise.resolve(this.samples.result.map(sample => {
-                return {
-                    clinicalAttributeId: UniqueKey.CANCER_STUDIES,
-                    patientId: sample.patientId,
-                    sampleId: sample.sampleId,
-                    studyId: sample.studyId,
-                    uniquePatientKey: sample.uniquePatientKey,
-                    uniqueSampleKey: sample.uniqueSampleKey,
-                    value: sample.studyId
-                } as ClinicalData
-            }));
+            return Promise.resolve(
+                this.samples.result.map(sample => {
+                    return {
+                        clinicalAttributeId: UniqueKey.CANCER_STUDIES,
+                        patientId: sample.patientId,
+                        sampleId: sample.sampleId,
+                        studyId: sample.studyId,
+                        uniquePatientKey: sample.uniquePatientKey,
+                        uniqueSampleKey: sample.uniqueSampleKey,
+                        value: sample.studyId,
+                    } as ClinicalData;
+                })
+            );
         },
-        onError: (error => Promise.resolve([])),
-        default: []
+        onError: error => Promise.resolve([]),
+        default: [],
     });
-
 }
diff --git a/src/pages/studyView/StudyViewUtils.spec.ts b/src/pages/studyView/StudyViewUtils.spec.ts
index 8c144ed3d4d..5d4551afe39 100644
--- a/src/pages/studyView/StudyViewUtils.spec.ts
+++ b/src/pages/studyView/StudyViewUtils.spec.ts
@@ -1,4 +1,4 @@
-import {assert} from 'chai';
+import { assert } from 'chai';
 import {
     calcIntervalBinValues,
     calculateLayout,
@@ -59,70 +59,123 @@ import {
     DataBin,
     Sample,
     StudyViewFilter,
-    ClinicalDataFilterValue
+    ClinicalDataFilterValue,
 } from 'shared/api/generated/CBioPortalAPIInternal';
-import {CancerStudy, ClinicalAttribute, Gene} from 'shared/api/generated/CBioPortalAPI';
-import { StudyViewPageTabKeyEnum } from "pages/studyView/StudyViewPageTabs";
 import {
-    UniqueKey
-} from "./StudyViewUtils";
-import {Layout} from 'react-grid-layout';
+    CancerStudy,
+    ClinicalAttribute,
+    Gene,
+} from 'shared/api/generated/CBioPortalAPI';
+import { StudyViewPageTabKeyEnum } from 'pages/studyView/StudyViewPageTabs';
+import { UniqueKey } from './StudyViewUtils';
+import { Layout } from 'react-grid-layout';
 import sinon from 'sinon';
 import internalClient from 'shared/api/cbioportalInternalClientInstance';
-import {VirtualStudy} from 'shared/model/VirtualStudy';
-import {ChartDimension, ChartTypeEnum} from "./StudyViewConfig";
-import {MobxPromise} from "mobxpromise";
-import {CLI_NO_COLOR, CLI_YES_COLOR, DEFAULT_NA_COLOR, RESERVED_CLINICAL_VALUE_COLORS} from "shared/lib/Colors";
+import { VirtualStudy } from 'shared/model/VirtualStudy';
+import { ChartDimension, ChartTypeEnum } from './StudyViewConfig';
+import { MobxPromise } from 'mobxpromise';
+import {
+    CLI_NO_COLOR,
+    CLI_YES_COLOR,
+    DEFAULT_NA_COLOR,
+    RESERVED_CLINICAL_VALUE_COLORS,
+} from 'shared/lib/Colors';
 import { IStudyViewDensityScatterPlotDatum } from './charts/scatterPlot/StudyViewDensityScatterPlot';
 import { shallow } from 'enzyme';
 
 describe('StudyViewUtils', () => {
     const emptyStudyViewFilter: StudyViewFilter = {
         clinicalDataFilters: [],
-        geneFilters: []
+        geneFilters: [],
     } as any;
 
     describe('updateGeneQuery', () => {
         it('when gene selected in table', () => {
-            assert.deepEqual(updateGeneQuery([{gene: 'TP53', alterations: false}], 'TTN'), [{
-                gene: 'TP53',
-                alterations: false
-            }, {gene: 'TTN', alterations: false}]);
-            assert.deepEqual(updateGeneQuery([{gene: 'TP53', alterations: false}, {
-                gene: 'TTN',
-                alterations: false
-            }], 'ALK'), [{gene: 'TP53', alterations: false}, {gene: 'TTN', alterations: false}, {
-                gene: 'ALK',
-                alterations: false
-            }]);
+            assert.deepEqual(
+                updateGeneQuery([{ gene: 'TP53', alterations: false }], 'TTN'),
+                [
+                    {
+                        gene: 'TP53',
+                        alterations: false,
+                    },
+                    { gene: 'TTN', alterations: false },
+                ]
+            );
+            assert.deepEqual(
+                updateGeneQuery(
+                    [
+                        { gene: 'TP53', alterations: false },
+                        {
+                            gene: 'TTN',
+                            alterations: false,
+                        },
+                    ],
+                    'ALK'
+                ),
+                [
+                    { gene: 'TP53', alterations: false },
+                    { gene: 'TTN', alterations: false },
+                    {
+                        gene: 'ALK',
+                        alterations: false,
+                    },
+                ]
+            );
         });
         it('when gene unselected in table', () => {
-            assert.deepEqual(updateGeneQuery([{gene: 'TP53', alterations: false}], 'TP53'), []);
-            assert.deepEqual(updateGeneQuery([{gene: 'TP53', alterations: false}, {
-                gene: 'TTN',
-                alterations: false
-            }], 'TP53'), [{gene: 'TTN', alterations: false}]);
-            assert.deepEqual(updateGeneQuery([{gene: 'TP53', alterations: false}, {
-                gene: 'TTN',
-                alterations: false
-            }], 'ALK'), [{gene: 'TP53', alterations: false}, {gene: 'TTN', alterations: false}, {
-                gene: 'ALK',
-                alterations: false
-            }]);
+            assert.deepEqual(
+                updateGeneQuery([{ gene: 'TP53', alterations: false }], 'TP53'),
+                []
+            );
+            assert.deepEqual(
+                updateGeneQuery(
+                    [
+                        { gene: 'TP53', alterations: false },
+                        {
+                            gene: 'TTN',
+                            alterations: false,
+                        },
+                    ],
+                    'TP53'
+                ),
+                [{ gene: 'TTN', alterations: false }]
+            );
+            assert.deepEqual(
+                updateGeneQuery(
+                    [
+                        { gene: 'TP53', alterations: false },
+                        {
+                            gene: 'TTN',
+                            alterations: false,
+                        },
+                    ],
+                    'ALK'
+                ),
+                [
+                    { gene: 'TP53', alterations: false },
+                    { gene: 'TTN', alterations: false },
+                    {
+                        gene: 'ALK',
+                        alterations: false,
+                    },
+                ]
+            );
         });
     });
 
     describe('getVirtualStudyDescription', () => {
-        let studies = [{
-            name: 'Study 1',
-            studyId: 'study1',
-            uniqueSampleKeys: ['1', '2']
-        },
-        {
-            name: 'Study 2',
-            studyId: 'study2',
-            uniqueSampleKeys: ['3', '4']
-        }];
+        let studies = [
+            {
+                name: 'Study 1',
+                studyId: 'study1',
+                uniqueSampleKeys: ['1', '2'],
+            },
+            {
+                name: 'Study 2',
+                studyId: 'study2',
+                uniqueSampleKeys: ['3', '4'],
+            },
+        ];
 
         it('when all samples are selected', () => {
             assert.isTrue(
@@ -131,73 +184,93 @@ describe('StudyViewUtils', () => {
                     studies as any,
                     {} as any,
                     {} as any
-                ).startsWith('4 samples from 2 studies:\n- Study 1 (2 samples)\n- Study 2 (2 samples)'));
+                ).startsWith(
+                    '4 samples from 2 studies:\n- Study 1 (2 samples)\n- Study 2 (2 samples)'
+                )
+            );
         });
         it('when filters are applied', () => {
             let filter = {
-                clinicalDataFilters: [{
-                    'attributeId': 'attribute1',
-                    'values': [{
-                        'value':'value1'
-                    }]
-                },{
-                    'attributeId': 'attribute2',
-                    'values': [{
-                        'end': 0,
-                        'start': 10,
-                        'value': `10`
-                    }]
-                }],
-                geneFilters:[{
-                    geneQueries:[["GENE1"]],
-                    molecularProfileIds:["cancer_study_sequenced"]
-                },{
-                    geneQueries:[["GENE1"]],
-                    molecularProfileIds:["cancer_study_fusion"]
-                },{
-                    geneQueries:[["GENE2:HOMDEL"]],
-                    molecularProfileIds:["cancer_study_cna"]
-                }],
+                clinicalDataFilters: [
+                    {
+                        attributeId: 'attribute1',
+                        values: [
+                            {
+                                value: 'value1',
+                            },
+                        ],
+                    },
+                    {
+                        attributeId: 'attribute2',
+                        values: [
+                            {
+                                end: 0,
+                                start: 10,
+                                value: `10`,
+                            },
+                        ],
+                    },
+                ],
+                geneFilters: [
+                    {
+                        geneQueries: [['GENE1']],
+                        molecularProfileIds: ['cancer_study_sequenced'],
+                    },
+                    {
+                        geneQueries: [['GENE1']],
+                        molecularProfileIds: ['cancer_study_fusion'],
+                    },
+                    {
+                        geneQueries: [['GENE2:HOMDEL']],
+                        molecularProfileIds: ['cancer_study_cna'],
+                    },
+                ],
                 studyIds: ['study1', 'study2'],
                 sampleIdentifiers: [],
                 sampleIdentifiersSet: {
-                    'attribute3': [{
-                        'sampleId': 'sample 1',
-                        'studyId': 'study1'
-                    }, {
-                        'sampleId': 'sample 1',
-                        'studyId': 'study2'
-                    }]
+                    attribute3: [
+                        {
+                            sampleId: 'sample 1',
+                            studyId: 'study1',
+                        },
+                        {
+                            sampleId: 'sample 1',
+                            studyId: 'study2',
+                        },
+                    ],
                 },
                 mutationCountVsCNASelection: {
-                    xEnd: 0, xStart: 0, yEnd: 0, yStart: 0
+                    xEnd: 0,
+                    xStart: 0,
+                    yEnd: 0,
+                    yStart: 0,
                 },
                 numberOfSamplesPerPatient: [],
                 withCNAData: false,
                 withMutationData: false,
-                withFusionData:false
+                withFusionData: false,
             } as StudyViewFilterWithSampleIdentifierFilters;
 
-            let genes = [{ entrezGeneId: 1, hugoGeneSymbol: "GENE1" }, { entrezGeneId: 2, hugoGeneSymbol: "GENE2" }] as Gene[];
-
+            let genes = [
+                { entrezGeneId: 1, hugoGeneSymbol: 'GENE1' },
+                { entrezGeneId: 2, hugoGeneSymbol: 'GENE2' },
+            ] as Gene[];
 
             assert.isTrue(
-                getVirtualStudyDescription(
-                    '',
-                    studies as any,
-                    filter,
-                    {
-                        'attribute1': 'attribute1 name',
-                        'attribute2': 'attribute2 name',
-                        'attribute3': 'attribute3 name',
-                        'cancer_study_sequenced': ' Mutated Genes',
-                        'cancer_study_fusion': 'Fusion Genes',
-                        'cancer_study_cna': 'CNA Genes'
-                    }
-                ).startsWith('4 samples from 2 studies:\n- Study 1 (2 samples)\n- Study 2 (2 samples)' +
-                    '\n\nFilters:\n-  Mutated Genes:\n  - GENE1\n- Fusion Genes:\n  - GENE1\n- CNA Genes:' +
-                    '\n  - GENE2:HOMDEL\nWith Mutation data: NO\nWith CNA data: NO\n- attribute1 name: value1\n' +
-                    '- attribute2 name: 10 < x ≤ 0\n- attribute3 name: 2 samples\n\nCreated on'));
+                getVirtualStudyDescription('', studies as any, filter, {
+                    attribute1: 'attribute1 name',
+                    attribute2: 'attribute2 name',
+                    attribute3: 'attribute3 name',
+                    cancer_study_sequenced: ' Mutated Genes',
+                    cancer_study_fusion: 'Fusion Genes',
+                    cancer_study_cna: 'CNA Genes',
+                }).startsWith(
+                    '4 samples from 2 studies:\n- Study 1 (2 samples)\n- Study 2 (2 samples)' +
+                        '\n\nFilters:\n-  Mutated Genes:\n  - GENE1\n- Fusion Genes:\n  - GENE1\n- CNA Genes:' +
+                        '\n  - GENE2:HOMDEL\nWith Mutation data: NO\nWith CNA data: NO\n- attribute1 name: value1\n' +
+                        '- attribute2 name: 10 < x ≤ 0\n- attribute3 name: 2 samples\n\nCreated on'
+                )
+            );
         });
         it('when username is not null', () => {
             assert.isTrue(
@@ -207,7 +280,10 @@ describe('StudyViewUtils', () => {
                     {} as any,
                     {} as any,
                     'user1'
-                ).startsWith('4 samples from 2 studies:\n- Study 1 (2 samples)\n- Study 2 (2 samples)'));
+                ).startsWith(
+                    '4 samples from 2 studies:\n- Study 1 (2 samples)\n- Study 2 (2 samples)'
+                )
+            );
             assert.isTrue(
                 getVirtualStudyDescription(
                     '',
@@ -215,16 +291,21 @@ describe('StudyViewUtils', () => {
                     {} as any,
                     {} as any,
                     'user1'
-                ).endsWith('by user1'));
+                ).endsWith('by user1')
+            );
         });
         it('when previousDescription is defined', () => {
             let filter = {
-                clinicalDataFilters: [{
-                    'attributeId': 'attribute1',
-                    'values': [{
-                        'value':"value1"
-                    }]
-                }]
+                clinicalDataFilters: [
+                    {
+                        attributeId: 'attribute1',
+                        values: [
+                            {
+                                value: 'value1',
+                            },
+                        ],
+                    },
+                ],
             } as any;
 
             assert.isTrue(
@@ -233,68 +314,117 @@ describe('StudyViewUtils', () => {
                     studies as any,
                     filter,
                     {
-                        'attribute1': 'attribute1 name',
-                        'attribute2': 'attribute2 name',
-                        'attribute3': 'attribute3 name'
-                    },
-                ).startsWith('test\n\nCreated on'));
+                        attribute1: 'attribute1 name',
+                        attribute2: 'attribute2 name',
+                        attribute3: 'attribute3 name',
+                    }
+                ).startsWith('test\n\nCreated on')
+            );
         });
     });
 
     describe('shouldShowChart', () => {
         const hasInfoFilter = {
-            clinicalDataFilters: [{
-                'attributeId': 'attribute1',
-                'values': [{
-                    'value':"value1"
-                }]
-            }],
-            geneFilters: []
+            clinicalDataFilters: [
+                {
+                    attributeId: 'attribute1',
+                    values: [
+                        {
+                            value: 'value1',
+                        },
+                    ],
+                },
+            ],
+            geneFilters: [],
         } as any;
-        it("return true when there is only one sample in the study", () => {
+        it('return true when there is only one sample in the study', () => {
             assert.isTrue(shouldShowChart(emptyStudyViewFilter, 1, 1));
         });
-        it("return true when unique number of data bigger than one", () => {
+        it('return true when unique number of data bigger than one', () => {
             assert.isTrue(shouldShowChart(emptyStudyViewFilter, 2, 2));
         });
-        it("return true when study view is filtered", () => {
+        it('return true when study view is filtered', () => {
             assert.isTrue(shouldShowChart(hasInfoFilter, 1, 2));
         });
-        it("return false when study view is not filtered, unique number of data less than 2, and there are more than one sample in the study", () => {
+        it('return false when study view is not filtered, unique number of data less than 2, and there are more than one sample in the study', () => {
             assert.isFalse(shouldShowChart(emptyStudyViewFilter, 1, 2));
         });
     });
 
-    describe('makePatientToClinicalAnalysisGroup', ()=>{
-        it("returns correct result on empty input", ()=>{
+    describe('makePatientToClinicalAnalysisGroup', () => {
+        it('returns correct result on empty input', () => {
             assert.deepEqual(makePatientToClinicalAnalysisGroup([], {}), {});
         });
-        it("returns correct result with no conflicting samples", ()=>{
+        it('returns correct result with no conflicting samples', () => {
             assert.deepEqual(
                 makePatientToClinicalAnalysisGroup(
-                    [{ uniqueSampleKey: "sample1.1", uniquePatientKey: "patient1"},
-                    { uniqueSampleKey: "sample1.2", uniquePatientKey: "patient1"},
-                        { uniqueSampleKey: "sample2.1", uniquePatientKey: "patient2"},
-                        { uniqueSampleKey: "sample3.1", uniquePatientKey: "patient3"},
-                        { uniqueSampleKey: "sample3.2", uniquePatientKey: "patient3"}
+                    [
+                        {
+                            uniqueSampleKey: 'sample1.1',
+                            uniquePatientKey: 'patient1',
+                        },
+                        {
+                            uniqueSampleKey: 'sample1.2',
+                            uniquePatientKey: 'patient1',
+                        },
+                        {
+                            uniqueSampleKey: 'sample2.1',
+                            uniquePatientKey: 'patient2',
+                        },
+                        {
+                            uniqueSampleKey: 'sample3.1',
+                            uniquePatientKey: 'patient3',
+                        },
+                        {
+                            uniqueSampleKey: 'sample3.2',
+                            uniquePatientKey: 'patient3',
+                        },
                     ],
-                    { "sample1.1":"a", "sample1.2":"a", "sample2.1":"b", "sample3.1":"c", "sample3.2":"c"}
+                    {
+                        'sample1.1': 'a',
+                        'sample1.2': 'a',
+                        'sample2.1': 'b',
+                        'sample3.1': 'c',
+                        'sample3.2': 'c',
+                    }
                 ),
-                { "patient1":"a", "patient2":"b", "patient3":"c"}
+                { patient1: 'a', patient2: 'b', patient3: 'c' }
             );
         });
-        it("omits patients with samples in different analysis groups", ()=>{
+        it('omits patients with samples in different analysis groups', () => {
             assert.deepEqual(
                 makePatientToClinicalAnalysisGroup(
-                    [{ uniqueSampleKey: "sample1.1", uniquePatientKey: "patient1"},
-                        { uniqueSampleKey: "sample1.2", uniquePatientKey: "patient1"},
-                        { uniqueSampleKey: "sample2.1", uniquePatientKey: "patient2"},
-                        { uniqueSampleKey: "sample3.1", uniquePatientKey: "patient3"},
-                        { uniqueSampleKey: "sample3.2", uniquePatientKey: "patient3"}
+                    [
+                        {
+                            uniqueSampleKey: 'sample1.1',
+                            uniquePatientKey: 'patient1',
+                        },
+                        {
+                            uniqueSampleKey: 'sample1.2',
+                            uniquePatientKey: 'patient1',
+                        },
+                        {
+                            uniqueSampleKey: 'sample2.1',
+                            uniquePatientKey: 'patient2',
+                        },
+                        {
+                            uniqueSampleKey: 'sample3.1',
+                            uniquePatientKey: 'patient3',
+                        },
+                        {
+                            uniqueSampleKey: 'sample3.2',
+                            uniquePatientKey: 'patient3',
+                        },
                     ],
-                    { "sample1.1":"a", "sample1.2":"b", "sample2.1":"b", "sample3.1":"c", "sample3.2":"c"}
+                    {
+                        'sample1.1': 'a',
+                        'sample1.2': 'b',
+                        'sample2.1': 'b',
+                        'sample3.1': 'c',
+                        'sample3.2': 'c',
+                    }
                 ),
-                { "patient2":"b", "patient3":"c"}
+                { patient2: 'b', patient3: 'c' }
             );
         });
     });
@@ -302,351 +432,371 @@ describe('StudyViewUtils', () => {
     describe('processDataBins', () => {
         const linearScaleDataBinsWithNa = [
             {
-                "attributeId": "PB_BLAST_PERCENTAGE",
-                "specialValue": "<=",
-                "end": 20,
-                "count": 70
+                attributeId: 'PB_BLAST_PERCENTAGE',
+                specialValue: '<=',
+                end: 20,
+                count: 70,
             },
             {
-                "attributeId": "PB_BLAST_PERCENTAGE",
-                "start": 20,
-                "end": 40,
-                "count": 3
+                attributeId: 'PB_BLAST_PERCENTAGE',
+                start: 20,
+                end: 40,
+                count: 3,
             },
             {
-                "attributeId": "PB_BLAST_PERCENTAGE",
-                "start": 40,
-                "end": 60,
-                "count": 5
+                attributeId: 'PB_BLAST_PERCENTAGE',
+                start: 40,
+                end: 60,
+                count: 5,
             },
             {
-                "attributeId": "PB_BLAST_PERCENTAGE",
-                "start": 60,
-                "end": 80,
-                "count": 11
+                attributeId: 'PB_BLAST_PERCENTAGE',
+                start: 60,
+                end: 80,
+                count: 11,
             },
             {
-                "attributeId": "PB_BLAST_PERCENTAGE",
-                "start": 80,
-                "end": 100,
-                "count": 69
+                attributeId: 'PB_BLAST_PERCENTAGE',
+                start: 80,
+                end: 100,
+                count: 69,
             },
             {
-                "attributeId": "PB_BLAST_PERCENTAGE",
-                "specialValue": "NA",
-                "count": 2
-            }
+                attributeId: 'PB_BLAST_PERCENTAGE',
+                specialValue: 'NA',
+                count: 2,
+            },
         ] as any;
 
         const logScaleDataBinsWithNaAndSpecialValues = [
             {
-                "attributeId": "DAYS_TO_LAST_FOLLOWUP",
-                "specialValue": "<=",
-                "end": 10,
-                "count": 1
+                attributeId: 'DAYS_TO_LAST_FOLLOWUP',
+                specialValue: '<=',
+                end: 10,
+                count: 1,
             },
             {
-                "attributeId": "DAYS_TO_LAST_FOLLOWUP",
-                "start": 10,
-                "end": 31,
-                "count": 3
+                attributeId: 'DAYS_TO_LAST_FOLLOWUP',
+                start: 10,
+                end: 31,
+                count: 3,
             },
             {
-                "attributeId": "DAYS_TO_LAST_FOLLOWUP",
-                "start": 31,
-                "end": 100,
-                "count": 5
+                attributeId: 'DAYS_TO_LAST_FOLLOWUP',
+                start: 31,
+                end: 100,
+                count: 5,
             },
             {
-                "attributeId": "DAYS_TO_LAST_FOLLOWUP",
-                "start": 100,
-                "end": 316,
-                "count": 23
+                attributeId: 'DAYS_TO_LAST_FOLLOWUP',
+                start: 100,
+                end: 316,
+                count: 23,
             },
             {
-                "attributeId": "DAYS_TO_LAST_FOLLOWUP",
-                "start": 316,
-                "end": 1000,
-                "count": 67
+                attributeId: 'DAYS_TO_LAST_FOLLOWUP',
+                start: 316,
+                end: 1000,
+                count: 67,
             },
             {
-                "attributeId": "DAYS_TO_LAST_FOLLOWUP",
-                "start": 1000,
-                "end": 3162,
-                "count": 55
+                attributeId: 'DAYS_TO_LAST_FOLLOWUP',
+                start: 1000,
+                end: 3162,
+                count: 55,
             },
             {
-                "attributeId": "DAYS_TO_LAST_FOLLOWUP",
-                "start": 3162,
-                "end": 10000,
-                "count": 6
+                attributeId: 'DAYS_TO_LAST_FOLLOWUP',
+                start: 3162,
+                end: 10000,
+                count: 6,
             },
             {
-                "attributeId": "DAYS_TO_LAST_FOLLOWUP",
-                "specialValue": ">",
-                "start": 10000,
-                "count": 16
+                attributeId: 'DAYS_TO_LAST_FOLLOWUP',
+                specialValue: '>',
+                start: 10000,
+                count: 16,
             },
             {
-                "attributeId": "DAYS_TO_LAST_FOLLOWUP",
-                "specialValue": "NA",
-                "count": 66
+                attributeId: 'DAYS_TO_LAST_FOLLOWUP',
+                specialValue: 'NA',
+                count: 66,
             },
             {
-                "attributeId": "DAYS_TO_LAST_FOLLOWUP",
-                "specialValue": "REDACTED",
-                "count": 666
-            }
+                attributeId: 'DAYS_TO_LAST_FOLLOWUP',
+                specialValue: 'REDACTED',
+                count: 666,
+            },
         ] as any;
 
         const scientificSmallNumberBins = [
             {
-                "attributeId": "SILENT_RATE",
-                "start": 1E-8,
-                "end": 1E-7,
-                "count": 1
+                attributeId: 'SILENT_RATE',
+                start: 1e-8,
+                end: 1e-7,
+                count: 1,
             },
             {
-                "attributeId": "SILENT_RATE",
-                "start": 1E-7,
-                "end": 1E-6,
-                "count": 16
+                attributeId: 'SILENT_RATE',
+                start: 1e-7,
+                end: 1e-6,
+                count: 16,
             },
             {
-                "attributeId": "SILENT_RATE",
-                "start": 1E-6,
-                "end": 1E-5,
-                "count": 32
+                attributeId: 'SILENT_RATE',
+                start: 1e-6,
+                end: 1e-5,
+                count: 32,
             },
             {
-                "attributeId": "SILENT_RATE",
-                "specialValue": ">",
-                "start": 1E-5,
-                "count": 1
-            }
+                attributeId: 'SILENT_RATE',
+                specialValue: '>',
+                start: 1e-5,
+                count: 1,
+            },
         ] as any;
 
         const noNumericalDataBins = [
             {
-                "attributeId": "CANCER_TYPE",
-                "specialValue": "BREAST",
-                "count": 1
+                attributeId: 'CANCER_TYPE',
+                specialValue: 'BREAST',
+                count: 1,
             },
             {
-                "attributeId": "CANCER_TYPE",
-                "specialValue": "SKIN",
-                "count": 11
+                attributeId: 'CANCER_TYPE',
+                specialValue: 'SKIN',
+                count: 11,
             },
             {
-                "attributeId": "CANCER_TYPE",
-                "specialValue": "BRAIN",
-                "count": 121
+                attributeId: 'CANCER_TYPE',
+                specialValue: 'BRAIN',
+                count: 121,
             },
             {
-                "attributeId": "CANCER_TYPE",
-                "specialValue": "NA",
-                "count": 66
+                attributeId: 'CANCER_TYPE',
+                specialValue: 'NA',
+                count: 66,
             },
             {
-                "attributeId": "CANCER_TYPE",
-                "specialValue": "REDACTED",
-                "count": 666
-            }
+                attributeId: 'CANCER_TYPE',
+                specialValue: 'REDACTED',
+                count: 666,
+            },
         ] as any;
 
         const logScaleDataBinsWithNegativeAndNaAndSpecialValues = [
             {
-                "attributeId": "DAYS_TO_BIRTH",
-                "start": -31622,
-                "end": -10000,
-                "count": 78
+                attributeId: 'DAYS_TO_BIRTH',
+                start: -31622,
+                end: -10000,
+                count: 78,
             },
             {
-                "attributeId": "DAYS_TO_BIRTH",
-                "start": -10000,
-                "end": -3162,
-                "count": 14
+                attributeId: 'DAYS_TO_BIRTH',
+                start: -10000,
+                end: -3162,
+                count: 14,
             },
             {
-                "attributeId": "DAYS_TO_BIRTH",
-                "start": -3162,
-                "end": -1000,
-                "count": 31
+                attributeId: 'DAYS_TO_BIRTH',
+                start: -3162,
+                end: -1000,
+                count: 31,
             },
             {
-                "attributeId": "DAYS_TO_BIRTH",
-                "start": -1000,
-                "end": -316,
-                "count": 12
+                attributeId: 'DAYS_TO_BIRTH',
+                start: -1000,
+                end: -316,
+                count: 12,
             },
             {
-                "attributeId": "DAYS_TO_BIRTH",
-                "start": -316,
-                "end": -100,
-                "count": 6
+                attributeId: 'DAYS_TO_BIRTH',
+                start: -316,
+                end: -100,
+                count: 6,
             },
             {
-                "attributeId": "DAYS_TO_BIRTH",
-                "start": -100,
-                "end": -31,
-                "count": 2
+                attributeId: 'DAYS_TO_BIRTH',
+                start: -100,
+                end: -31,
+                count: 2,
             },
             {
-                "attributeId": "DAYS_TO_BIRTH",
-                "start": -31,
-                "end": -10,
-                "count": 2
+                attributeId: 'DAYS_TO_BIRTH',
+                start: -31,
+                end: -10,
+                count: 2,
             },
             {
-                "attributeId": "DAYS_TO_BIRTH",
-                "start": -10,
-                "end": -1,
-                "count": 0
+                attributeId: 'DAYS_TO_BIRTH',
+                start: -10,
+                end: -1,
+                count: 0,
             },
             {
-                "attributeId": "DAYS_TO_BIRTH",
-                "start": -1,
-                "end": 1,
-                "count": 0
+                attributeId: 'DAYS_TO_BIRTH',
+                start: -1,
+                end: 1,
+                count: 0,
             },
             {
-                "attributeId": "DAYS_TO_BIRTH",
-                "start": 1,
-                "end": 10,
-                "count": 2
+                attributeId: 'DAYS_TO_BIRTH',
+                start: 1,
+                end: 10,
+                count: 2,
             },
             {
-                "attributeId": "DAYS_TO_BIRTH",
-                "start": 10,
-                "end": 31,
-                "count": 7
+                attributeId: 'DAYS_TO_BIRTH',
+                start: 10,
+                end: 31,
+                count: 7,
             },
             {
-                "attributeId": "DAYS_TO_BIRTH",
-                "specialValue": "NA",
-                "count": 66
+                attributeId: 'DAYS_TO_BIRTH',
+                specialValue: 'NA',
+                count: 66,
             },
             {
-                "attributeId": "DAYS_TO_BIRTH",
-                "specialValue": "REDACTED",
-                "count": 666
-            }
+                attributeId: 'DAYS_TO_BIRTH',
+                specialValue: 'REDACTED',
+                count: 666,
+            },
         ] as any;
 
         const logScaleDataBinsStartingWithZeroAndContainsNa = [
             {
-                "attributeId": "DAYS_TO_COLLECTION",
-                "start": 0,
-                "end": 3,
-                "count": 1
+                attributeId: 'DAYS_TO_COLLECTION',
+                start: 0,
+                end: 3,
+                count: 1,
             },
             {
-                "attributeId": "DAYS_TO_COLLECTION",
-                "start": 3,
-                "end": 10,
-                "count": 1
+                attributeId: 'DAYS_TO_COLLECTION',
+                start: 3,
+                end: 10,
+                count: 1,
             },
             {
-                "attributeId": "DAYS_TO_COLLECTION",
-                "start": 10,
-                "end": 31,
-                "count": 13
+                attributeId: 'DAYS_TO_COLLECTION',
+                start: 10,
+                end: 31,
+                count: 13,
             },
             {
-                "attributeId": "DAYS_TO_COLLECTION",
-                "start": 31,
-                "end": 100,
-                "count": 47
+                attributeId: 'DAYS_TO_COLLECTION',
+                start: 31,
+                end: 100,
+                count: 47,
             },
             {
-                "attributeId": "DAYS_TO_COLLECTION",
-                "start": 100,
-                "end": 316,
-                "count": 78
+                attributeId: 'DAYS_TO_COLLECTION',
+                start: 100,
+                end: 316,
+                count: 78,
             },
             {
-                "attributeId": "DAYS_TO_COLLECTION",
-                "start": 316,
-                "end": 1000,
-                "count": 82
+                attributeId: 'DAYS_TO_COLLECTION',
+                start: 316,
+                end: 1000,
+                count: 82,
             },
             {
-                "attributeId": "DAYS_TO_COLLECTION",
-                "start": 1000,
-                "end": 3162,
-                "count": 63
+                attributeId: 'DAYS_TO_COLLECTION',
+                start: 1000,
+                end: 3162,
+                count: 63,
             },
             {
-                "attributeId": "DAYS_TO_COLLECTION",
-                "start": 3162,
-                "end": 10000,
-                "count": 22
+                attributeId: 'DAYS_TO_COLLECTION',
+                start: 3162,
+                end: 10000,
+                count: 22,
             },
             {
-                "attributeId": "DAYS_TO_COLLECTION",
-                "specialValue": "NA",
-                "count": 225
-            }
+                attributeId: 'DAYS_TO_COLLECTION',
+                specialValue: 'NA',
+                count: 225,
+            },
         ] as any;
 
         const noGroupingDataBinsWithNa = [
             {
-                "attributeId": "ACTIONABLE_ALTERATIONS",
-                "start": 0,
-                "end": 0,
-                "count": 16
+                attributeId: 'ACTIONABLE_ALTERATIONS',
+                start: 0,
+                end: 0,
+                count: 16,
             },
             {
-                "attributeId": "ACTIONABLE_ALTERATIONS",
-                "start": 1,
-                "end": 1,
-                "count": 6
+                attributeId: 'ACTIONABLE_ALTERATIONS',
+                start: 1,
+                end: 1,
+                count: 6,
             },
             {
-                "attributeId": "ACTIONABLE_ALTERATIONS",
-                "start": 2,
-                "end": 2,
-                "count": 4
+                attributeId: 'ACTIONABLE_ALTERATIONS',
+                start: 2,
+                end: 2,
+                count: 4,
             },
             {
-                "attributeId": "ACTIONABLE_ALTERATIONS",
-                "start": 3,
-                "end": 3,
-                "count": 1
+                attributeId: 'ACTIONABLE_ALTERATIONS',
+                start: 3,
+                end: 3,
+                count: 1,
             },
             {
-                "attributeId": "ACTIONABLE_ALTERATIONS",
-                "start": 5,
-                "end": 5,
-                "count": 1
+                attributeId: 'ACTIONABLE_ALTERATIONS',
+                start: 5,
+                end: 5,
+                count: 1,
             },
             {
-                "attributeId": "ACTIONABLE_ALTERATIONS",
-                "specialValue": "NA",
-                "count": 4
+                attributeId: 'ACTIONABLE_ALTERATIONS',
+                specialValue: 'NA',
+                count: 4,
             },
         ] as any;
 
         it('generates clinical data interval filter values from data bins', () => {
             const values: ClinicalDataFilterValue[] = getClinicalDataIntervalFilterValues(
-                [linearScaleDataBinsWithNa[0], linearScaleDataBinsWithNa[2], linearScaleDataBinsWithNa[5]] as any);
+                [
+                    linearScaleDataBinsWithNa[0],
+                    linearScaleDataBinsWithNa[2],
+                    linearScaleDataBinsWithNa[5],
+                ] as any
+            );
 
             assert.deepEqual(values, [
-                {end: 20, start: undefined, value: undefined},
-                {start: 40, end: 60, value: undefined},
-                {value: "NA", start: undefined, end: undefined}
+                { end: 20, start: undefined, value: undefined },
+                { start: 40, end: 60, value: undefined },
+                { value: 'NA', start: undefined, end: undefined },
             ] as any);
         });
 
         it('processes linear scaled data bins including NA count', () => {
-            const numericalBins = filterNumericalBins(linearScaleDataBinsWithNa);
-            assert.equal(numericalBins.length, 5, "NA should be filtered out");
+            const numericalBins = filterNumericalBins(
+                linearScaleDataBinsWithNa
+            );
+            assert.equal(numericalBins.length, 5, 'NA should be filtered out');
 
-            const formattedTickValues = formatNumericalTickValues(numericalBins);
-            assert.deepEqual(formattedTickValues, ["≤20", "20", "40", "60", "80", "100"]);
+            const formattedTickValues = formatNumericalTickValues(
+                numericalBins
+            );
+            assert.deepEqual(formattedTickValues, [
+                '≤20',
+                '20',
+                '40',
+                '60',
+                '80',
+                '100',
+            ]);
 
             const intervalBins = filterIntervalBins(numericalBins);
-            assert.equal(intervalBins.length, 4, "First bin with the special values (<=) should be filtered out");
+            assert.equal(
+                intervalBins.length,
+                4,
+                'First bin with the special values (<=) should be filtered out'
+            );
 
             const intervalBinValues = calcIntervalBinValues(intervalBins);
             assert.deepEqual(intervalBinValues, [20, 40, 60, 80, 100]);
@@ -655,154 +805,373 @@ describe('StudyViewUtils', () => {
             assert.isFalse(isLogScale);
 
             const categoryBins = filterCategoryBins(linearScaleDataBinsWithNa);
-            assert.equal(categoryBins.length, 1, "Only the bin with NA special value should be included");
+            assert.equal(
+                categoryBins.length,
+                1,
+                'Only the bin with NA special value should be included'
+            );
 
-            const needAdditionShift = needAdditionShiftForLogScaleBarChart(numericalBins);
+            const needAdditionShift = needAdditionShiftForLogScaleBarChart(
+                numericalBins
+            );
             assert.isFalse(needAdditionShift);
 
-            const normalizedNumericalData = generateNumericalData(numericalBins);
-            assert.deepEqual(normalizedNumericalData.map(data => data.x), [1, 2.5, 3.5, 4.5, 5.5]);
-
-            const normalizedCategoryData = generateCategoricalData(categoryBins, 6);
+            const normalizedNumericalData = generateNumericalData(
+                numericalBins
+            );
+            assert.deepEqual(normalizedNumericalData.map(data => data.x), [
+                1,
+                2.5,
+                3.5,
+                4.5,
+                5.5,
+            ]);
+
+            const normalizedCategoryData = generateCategoricalData(
+                categoryBins,
+                6
+            );
             assert.deepEqual(normalizedCategoryData.map(data => data.x), [7]);
         });
 
         it('processes log scaled data bins including NA and REDACTED counts', () => {
-            const numericalBins = filterNumericalBins(logScaleDataBinsWithNaAndSpecialValues);
-            assert.equal(numericalBins.length, 8, "NA and REDACTED should be filtered out");
+            const numericalBins = filterNumericalBins(
+                logScaleDataBinsWithNaAndSpecialValues
+            );
+            assert.equal(
+                numericalBins.length,
+                8,
+                'NA and REDACTED should be filtered out'
+            );
 
-            const formattedTickValues = formatNumericalTickValues(numericalBins);
-            assert.deepEqual(formattedTickValues, ["≤10", "10", "", "10^2", "", "10^3", "", "10^4", ">10^4"]);
+            const formattedTickValues = formatNumericalTickValues(
+                numericalBins
+            );
+            assert.deepEqual(formattedTickValues, [
+                '≤10',
+                '10',
+                '',
+                '10^2',
+                '',
+                '10^3',
+                '',
+                '10^4',
+                '>10^4',
+            ]);
 
             const intervalBins = filterIntervalBins(numericalBins);
-            assert.equal(intervalBins.length, 6,
-                "First and last bins with the special values (<= and >) should be filtered out");
+            assert.equal(
+                intervalBins.length,
+                6,
+                'First and last bins with the special values (<= and >) should be filtered out'
+            );
 
             const intervalBinValues = calcIntervalBinValues(intervalBins);
-            assert.deepEqual(intervalBinValues, [10, 31, 100, 316, 1000, 3162, 10000]);
+            assert.deepEqual(intervalBinValues, [
+                10,
+                31,
+                100,
+                316,
+                1000,
+                3162,
+                10000,
+            ]);
 
             const isLogScale = isLogScaleByValues(intervalBinValues);
             assert.isTrue(isLogScale);
 
-            const categoryBins = filterCategoryBins(logScaleDataBinsWithNaAndSpecialValues);
-            assert.equal(categoryBins.length, 2,
-                "Only the bins with NA and REDACTED special values should be included");
+            const categoryBins = filterCategoryBins(
+                logScaleDataBinsWithNaAndSpecialValues
+            );
+            assert.equal(
+                categoryBins.length,
+                2,
+                'Only the bins with NA and REDACTED special values should be included'
+            );
 
-            const needAdditionShift = needAdditionShiftForLogScaleBarChart(numericalBins);
+            const needAdditionShift = needAdditionShiftForLogScaleBarChart(
+                numericalBins
+            );
             assert.isFalse(needAdditionShift);
 
-            const normalizedNumericalData = generateNumericalData(numericalBins);
-            assert.deepEqual(normalizedNumericalData.map(data => data.x),
-                [1, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 9]);
-
-            const normalizedCategoryData = generateCategoricalData(categoryBins, 9);
-            assert.deepEqual(normalizedCategoryData.map(data => data.x), [10, 11]);
+            const normalizedNumericalData = generateNumericalData(
+                numericalBins
+            );
+            assert.deepEqual(normalizedNumericalData.map(data => data.x), [
+                1,
+                2.5,
+                3.5,
+                4.5,
+                5.5,
+                6.5,
+                7.5,
+                9,
+            ]);
+
+            const normalizedCategoryData = generateCategoricalData(
+                categoryBins,
+                9
+            );
+            assert.deepEqual(normalizedCategoryData.map(data => data.x), [
+                10,
+                11,
+            ]);
         });
 
         it('processes log scaled data bins including negative values and NA and REDACTED counts', () => {
-            const numericalBins = filterNumericalBins(logScaleDataBinsWithNegativeAndNaAndSpecialValues);
-            assert.equal(numericalBins.length, 11, "NA and REDACTED should be filtered out");
+            const numericalBins = filterNumericalBins(
+                logScaleDataBinsWithNegativeAndNaAndSpecialValues
+            );
+            assert.equal(
+                numericalBins.length,
+                11,
+                'NA and REDACTED should be filtered out'
+            );
 
-            const formattedTickValues = formatNumericalTickValues(numericalBins);
-            assert.deepEqual(formattedTickValues, ["-10^5", "", "-10^4", "", "-10^3", "", "-10^2", "", "-10", "-1", "1", "10", "", "10^2"]);
+            const formattedTickValues = formatNumericalTickValues(
+                numericalBins
+            );
+            assert.deepEqual(formattedTickValues, [
+                '-10^5',
+                '',
+                '-10^4',
+                '',
+                '-10^3',
+                '',
+                '-10^2',
+                '',
+                '-10',
+                '-1',
+                '1',
+                '10',
+                '',
+                '10^2',
+            ]);
 
             const intervalBins = filterIntervalBins(numericalBins);
-            assert.equal(intervalBins.length, 11,
-                "Should be same as the number of mumerical bins");
+            assert.equal(
+                intervalBins.length,
+                11,
+                'Should be same as the number of mumerical bins'
+            );
 
             const intervalBinValues = calcIntervalBinValues(intervalBins);
-            assert.deepEqual(intervalBinValues, [-31622, -10000, -3162, -1000, -316, -100, -31, -10, -1, 1, 10, 31]);
+            assert.deepEqual(intervalBinValues, [
+                -31622,
+                -10000,
+                -3162,
+                -1000,
+                -316,
+                -100,
+                -31,
+                -10,
+                -1,
+                1,
+                10,
+                31,
+            ]);
 
             const isLogScale = isLogScaleByValues(intervalBinValues);
             assert.isTrue(isLogScale);
 
-            const categoryBins = filterCategoryBins(logScaleDataBinsWithNegativeAndNaAndSpecialValues);
-            assert.equal(categoryBins.length, 2,
-                "Only the bins with NA and REDACTED special values should be included");
+            const categoryBins = filterCategoryBins(
+                logScaleDataBinsWithNegativeAndNaAndSpecialValues
+            );
+            assert.equal(
+                categoryBins.length,
+                2,
+                'Only the bins with NA and REDACTED special values should be included'
+            );
 
-            const needAdditionShift = needAdditionShiftForLogScaleBarChart(numericalBins);
+            const needAdditionShift = needAdditionShiftForLogScaleBarChart(
+                numericalBins
+            );
             assert.isTrue(needAdditionShift);
 
-            const normalizedNumericalData = generateNumericalData(numericalBins);
-            assert.deepEqual(normalizedNumericalData.map(data => data.x),
-                [2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5, 9.5, 10.5, 11.5, 12.5]);
-
-            const normalizedCategoryData = generateCategoricalData(categoryBins, 13);
-            assert.deepEqual(normalizedCategoryData.map(data => data.x), [14, 15]);
+            const normalizedNumericalData = generateNumericalData(
+                numericalBins
+            );
+            assert.deepEqual(normalizedNumericalData.map(data => data.x), [
+                2.5,
+                3.5,
+                4.5,
+                5.5,
+                6.5,
+                7.5,
+                8.5,
+                9.5,
+                10.5,
+                11.5,
+                12.5,
+            ]);
+
+            const normalizedCategoryData = generateCategoricalData(
+                categoryBins,
+                13
+            );
+            assert.deepEqual(normalizedCategoryData.map(data => data.x), [
+                14,
+                15,
+            ]);
         });
 
         it('processes log scaled data bins starting with zero and including NA counts', () => {
-            const numericalBins = filterNumericalBins(logScaleDataBinsStartingWithZeroAndContainsNa);
-            assert.equal(numericalBins.length, 8, "NA should be filtered out");
+            const numericalBins = filterNumericalBins(
+                logScaleDataBinsStartingWithZeroAndContainsNa
+            );
+            assert.equal(numericalBins.length, 8, 'NA should be filtered out');
 
-            const formattedTickValues = formatNumericalTickValues(numericalBins);
-            assert.deepEqual(formattedTickValues, ["0", "", "10", "", "10^2", "", "10^3", "", "10^4"]);
+            const formattedTickValues = formatNumericalTickValues(
+                numericalBins
+            );
+            assert.deepEqual(formattedTickValues, [
+                '0',
+                '',
+                '10',
+                '',
+                '10^2',
+                '',
+                '10^3',
+                '',
+                '10^4',
+            ]);
 
             const intervalBins = filterIntervalBins(numericalBins);
-            assert.equal(intervalBins.length, 8,
-                "Should be same as the number of mumerical bins");
+            assert.equal(
+                intervalBins.length,
+                8,
+                'Should be same as the number of mumerical bins'
+            );
 
             const intervalBinValues = calcIntervalBinValues(intervalBins);
-            assert.deepEqual(intervalBinValues, [0, 3, 10, 31, 100, 316, 1000, 3162, 10000]);
+            assert.deepEqual(intervalBinValues, [
+                0,
+                3,
+                10,
+                31,
+                100,
+                316,
+                1000,
+                3162,
+                10000,
+            ]);
 
             const isLogScale = isLogScaleByValues(intervalBinValues);
             assert.isTrue(isLogScale);
 
-            const categoryBins = filterCategoryBins(logScaleDataBinsStartingWithZeroAndContainsNa);
-            assert.equal(categoryBins.length, 1,
-                "Only NA bin should be included");
+            const categoryBins = filterCategoryBins(
+                logScaleDataBinsStartingWithZeroAndContainsNa
+            );
+            assert.equal(
+                categoryBins.length,
+                1,
+                'Only NA bin should be included'
+            );
 
-            const needAdditionShift = needAdditionShiftForLogScaleBarChart(numericalBins);
+            const needAdditionShift = needAdditionShiftForLogScaleBarChart(
+                numericalBins
+            );
             assert.isFalse(needAdditionShift);
 
-            const normalizedNumericalData = generateNumericalData(numericalBins);
-            assert.deepEqual(normalizedNumericalData.map(data => data.x),
-                [1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5]);
-
-            const normalizedCategoryData = generateCategoricalData(categoryBins, 9);
+            const normalizedNumericalData = generateNumericalData(
+                numericalBins
+            );
+            assert.deepEqual(normalizedNumericalData.map(data => data.x), [
+                1.5,
+                2.5,
+                3.5,
+                4.5,
+                5.5,
+                6.5,
+                7.5,
+                8.5,
+            ]);
+
+            const normalizedCategoryData = generateCategoricalData(
+                categoryBins,
+                9
+            );
             assert.deepEqual(normalizedCategoryData.map(data => data.x), [10]);
         });
 
         it('processes scientific small numbers data bins', () => {
-            const numericalBins = filterNumericalBins(scientificSmallNumberBins);
-            assert.equal(numericalBins.length, 4, "all bins should be included");
+            const numericalBins = filterNumericalBins(
+                scientificSmallNumberBins
+            );
+            assert.equal(
+                numericalBins.length,
+                4,
+                'all bins should be included'
+            );
 
-            const formattedTickValues = formatNumericalTickValues(numericalBins);
-            assert.deepEqual(formattedTickValues, ["1e-8", "1e-7", "1e-6", "1e-5", ">1e-5"]);
+            const formattedTickValues = formatNumericalTickValues(
+                numericalBins
+            );
+            assert.deepEqual(formattedTickValues, [
+                '1e-8',
+                '1e-7',
+                '1e-6',
+                '1e-5',
+                '>1e-5',
+            ]);
 
             const intervalBins = filterIntervalBins(numericalBins);
-            assert.equal(intervalBins.length, 3,
-                "Last bin with the special values (>) should be filtered out");
+            assert.equal(
+                intervalBins.length,
+                3,
+                'Last bin with the special values (>) should be filtered out'
+            );
 
             const intervalBinValues = calcIntervalBinValues(intervalBins);
-            assert.deepEqual(intervalBinValues, [1E-8, 1E-7, 1E-6, 1E-5]);
+            assert.deepEqual(intervalBinValues, [1e-8, 1e-7, 1e-6, 1e-5]);
 
             const isLogScale = isLogScaleByValues(intervalBinValues);
             assert.isFalse(isLogScale);
 
             const categoryBins = filterCategoryBins(scientificSmallNumberBins);
-            assert.equal(categoryBins.length, 0, "There should not be any category bin");
+            assert.equal(
+                categoryBins.length,
+                0,
+                'There should not be any category bin'
+            );
 
-            const needAdditionShift = needAdditionShiftForLogScaleBarChart(numericalBins);
+            const needAdditionShift = needAdditionShiftForLogScaleBarChart(
+                numericalBins
+            );
             assert.isFalse(needAdditionShift);
 
-            const normalizedNumericalData = generateNumericalData(numericalBins);
-            assert.deepEqual(normalizedNumericalData.map(data => data.x),
-                [1.5, 2.5, 3.5, 5]);
-
-            const normalizedCategoryData = generateCategoricalData(categoryBins, 5);
+            const normalizedNumericalData = generateNumericalData(
+                numericalBins
+            );
+            assert.deepEqual(normalizedNumericalData.map(data => data.x), [
+                1.5,
+                2.5,
+                3.5,
+                5,
+            ]);
+
+            const normalizedCategoryData = generateCategoricalData(
+                categoryBins,
+                5
+            );
             assert.equal(normalizedCategoryData.length, 0);
         });
 
         it('processes no grouping data bins including NA count', () => {
             const numericalBins = filterNumericalBins(noGroupingDataBinsWithNa);
-            assert.equal(numericalBins.length, 5, "NA should be filtered out");
+            assert.equal(numericalBins.length, 5, 'NA should be filtered out');
 
-            const formattedTickValues = formatNumericalTickValues(numericalBins);
-            assert.deepEqual(formattedTickValues, ["0", "1", "2", "3", "5"]);
+            const formattedTickValues = formatNumericalTickValues(
+                numericalBins
+            );
+            assert.deepEqual(formattedTickValues, ['0', '1', '2', '3', '5']);
 
             const intervalBins = filterIntervalBins(numericalBins);
-            assert.equal(intervalBins.length, 5, "should be equal to number of numerical bins");
+            assert.equal(
+                intervalBins.length,
+                5,
+                'should be equal to number of numerical bins'
+            );
 
             const intervalBinValues = calcIntervalBinValues(intervalBins);
             assert.deepEqual(intervalBinValues, [0, 1, 2, 3, 5]);
@@ -811,242 +1180,322 @@ describe('StudyViewUtils', () => {
             assert.isFalse(isLogScale);
 
             const categoryBins = filterCategoryBins(noGroupingDataBinsWithNa);
-            assert.equal(categoryBins.length, 1,
-                "Only the bin with NA special value should be included");
-
-            const normalizedNumericalData = generateNumericalData(numericalBins);
-            assert.deepEqual(normalizedNumericalData.map(data => data.x),
-                [1, 2, 3, 4, 5]);
+            assert.equal(
+                categoryBins.length,
+                1,
+                'Only the bin with NA special value should be included'
+            );
 
-            const normalizedCategoryData = generateCategoricalData(categoryBins, 5);
+            const normalizedNumericalData = generateNumericalData(
+                numericalBins
+            );
+            assert.deepEqual(normalizedNumericalData.map(data => data.x), [
+                1,
+                2,
+                3,
+                4,
+                5,
+            ]);
+
+            const normalizedCategoryData = generateCategoricalData(
+                categoryBins,
+                5
+            );
             assert.deepEqual(normalizedCategoryData.map(data => data.x), [6]);
         });
 
         it('processes no numerical data bins', () => {
             const numericalBins = filterNumericalBins(noNumericalDataBins);
-            assert.equal(numericalBins.length, 0, "all bins should be filtered out");
+            assert.equal(
+                numericalBins.length,
+                0,
+                'all bins should be filtered out'
+            );
 
-            const formattedTickValues = formatNumericalTickValues(numericalBins);
-            assert.equal(formattedTickValues.length, 0, "there should be no numerical tick values");
+            const formattedTickValues = formatNumericalTickValues(
+                numericalBins
+            );
+            assert.equal(
+                formattedTickValues.length,
+                0,
+                'there should be no numerical tick values'
+            );
 
             const intervalBins = filterIntervalBins(numericalBins);
-            assert.equal(intervalBins.length, 0, "should be equal to number of numerical bins");
+            assert.equal(
+                intervalBins.length,
+                0,
+                'should be equal to number of numerical bins'
+            );
 
             const intervalBinValues = calcIntervalBinValues(intervalBins);
-            assert.equal(intervalBinValues.length, 0, "there should be no interval bin values");
+            assert.equal(
+                intervalBinValues.length,
+                0,
+                'there should be no interval bin values'
+            );
 
             const isLogScale = isLogScaleByValues(intervalBinValues);
             assert.isFalse(isLogScale);
 
             const categoryBins = filterCategoryBins(noNumericalDataBins);
-            assert.equal(categoryBins.length, 5, "all bins should be included");
+            assert.equal(categoryBins.length, 5, 'all bins should be included');
 
-            const normalizedNumericalData = generateNumericalData(numericalBins);
+            const normalizedNumericalData = generateNumericalData(
+                numericalBins
+            );
             assert.deepEqual(normalizedNumericalData.map(data => data.x), []);
 
-            const normalizedCategoryData = generateCategoricalData(categoryBins, 0);
-            assert.deepEqual(normalizedCategoryData.map(data => data.x), [1, 2, 3, 4, 5]);
+            const normalizedCategoryData = generateCategoricalData(
+                categoryBins,
+                0
+            );
+            assert.deepEqual(normalizedCategoryData.map(data => data.x), [
+                1,
+                2,
+                3,
+                4,
+                5,
+            ]);
         });
 
         it('determines log scale from an array of data bins', () => {
             assert.isFalse(isLogScaleByDataBins(linearScaleDataBinsWithNa));
             assert.isFalse(isLogScaleByDataBins(noGroupingDataBinsWithNa));
             assert.isFalse(isLogScaleByDataBins(noNumericalDataBins));
-            assert.isTrue(isLogScaleByDataBins(logScaleDataBinsWithNaAndSpecialValues));
-            assert.isTrue(isLogScaleByDataBins(logScaleDataBinsWithNegativeAndNaAndSpecialValues));
+            assert.isTrue(
+                isLogScaleByDataBins(logScaleDataBinsWithNaAndSpecialValues)
+            );
+            assert.isTrue(
+                isLogScaleByDataBins(
+                    logScaleDataBinsWithNegativeAndNaAndSpecialValues
+                )
+            );
         });
     });
 
     describe('intervalFiltersDisplayValue', () => {
         const filterValuesWithBothEndsClosed = [
-            {start: 10, end: 20},
-            {start: 20, end: 30},
-            {start: 30, end: 40},
-            {start: 40, end: 50}
+            { start: 10, end: 20 },
+            { start: 20, end: 30 },
+            { start: 30, end: 40 },
+            { start: 40, end: 50 },
         ] as ClinicalDataFilterValue[];
 
         const filterValuesWithBothEndsClosedAndSpecialValues = [
             ...filterValuesWithBothEndsClosed,
-            {value: "NA"},
-            {value: "REDACTED"}
+            { value: 'NA' },
+            { value: 'REDACTED' },
         ] as ClinicalDataFilterValue[];
 
         const filterValuesWithBothEndsOpen = [
-            {end: 10},
-            {start: 10, end: 20},
-            {start: 20, end: 30},
-            {start: 30, end: 40},
-            {start: 40, end: 50},
-            {start: 50}
+            { end: 10 },
+            { start: 10, end: 20 },
+            { start: 20, end: 30 },
+            { start: 30, end: 40 },
+            { start: 40, end: 50 },
+            { start: 50 },
         ] as ClinicalDataFilterValue[];
 
         const filterValuesWithBothEndsOpenAndSpecialValues = [
             ...filterValuesWithBothEndsOpen,
-            {value: "NA"},
-            {value: "REDACTED"}
+            { value: 'NA' },
+            { value: 'REDACTED' },
         ] as ClinicalDataFilterValue[];
 
         const filterValuesWithStartOpen = [
-            {end: 10},
-            {start: 10, end: 20},
-            {start: 20, end: 30},
-            {start: 30, end: 40},
-            {start: 40, end: 50},
+            { end: 10 },
+            { start: 10, end: 20 },
+            { start: 20, end: 30 },
+            { start: 30, end: 40 },
+            { start: 40, end: 50 },
         ] as ClinicalDataFilterValue[];
 
         const filterValuesWithStartOpenAndSpecialValues = [
             ...filterValuesWithStartOpen,
-            {value: "NA"},
-            {value: "REDACTED"}
+            { value: 'NA' },
+            { value: 'REDACTED' },
         ] as ClinicalDataFilterValue[];
 
         const filterValuesWithEndOpen = [
-            {start: 10, end: 20},
-            {start: 20, end: 30},
-            {start: 30, end: 40},
-            {start: 40, end: 50},
-            {start: 50}
+            { start: 10, end: 20 },
+            { start: 20, end: 30 },
+            { start: 30, end: 40 },
+            { start: 40, end: 50 },
+            { start: 50 },
         ] as ClinicalDataFilterValue[];
 
         const filterValuesWithEndOpenAndSpecialValues = [
             ...filterValuesWithEndOpen,
-            {value: "NA"},
-            {value: "REDACTED"}
+            { value: 'NA' },
+            { value: 'REDACTED' },
         ] as ClinicalDataFilterValue[];
 
         const filterValuesWithSpecialValuesOnly = [
-            {value: "NA"},
-            {value: "REDACTED"}
+            { value: 'NA' },
+            { value: 'REDACTED' },
         ] as ClinicalDataFilterValue[];
 
         const filterValuesWithDistinctNumerals = [
-            {start: 20, end: 20},
-            {start: 30, end: 30},
-            {start: 40, end: 40}
+            { start: 20, end: 20 },
+            { start: 30, end: 30 },
+            { start: 40, end: 40 },
         ] as ClinicalDataFilterValue[];
 
         const filterValuesWithDistinctNumeralsAndSpecialValues = [
             ...filterValuesWithDistinctNumerals,
-            {value: "NA"},
-            {value: "REDACTED"}
+            { value: 'NA' },
+            { value: 'REDACTED' },
         ] as ClinicalDataFilterValue[];
 
         const filterValuesWithSingleDistinctValue = [
-            {start: 666, end: 666}
+            { start: 666, end: 666 },
         ] as ClinicalDataFilterValue[];
 
         const filterValuesWithSingleDistinctValueAndSpecialValues = [
             ...filterValuesWithSingleDistinctValue,
-            {value: "NA"},
-            {value: "REDACTED"}
+            { value: 'NA' },
+            { value: 'REDACTED' },
         ] as ClinicalDataFilterValue[];
 
-        it ('generates display value for filter values with both ends closed', () => {
-            const value = intervalFiltersDisplayValue(filterValuesWithBothEndsClosed);
-            assert.equal(value, "10 < x ≤ 50");
+        it('generates display value for filter values with both ends closed', () => {
+            const value = intervalFiltersDisplayValue(
+                filterValuesWithBothEndsClosed
+            );
+            assert.equal(value, '10 < x ≤ 50');
         });
 
-        it ('generates display value for filter values with both ends closed, with special values', () => {
-            const value = intervalFiltersDisplayValue(filterValuesWithBothEndsClosedAndSpecialValues);
-            assert.equal(value, "10 < x ≤ 50, NA, REDACTED");
+        it('generates display value for filter values with both ends closed, with special values', () => {
+            const value = intervalFiltersDisplayValue(
+                filterValuesWithBothEndsClosedAndSpecialValues
+            );
+            assert.equal(value, '10 < x ≤ 50, NA, REDACTED');
         });
 
-        it ('generates display value for filter values with both ends open', () => {
-            const value = intervalFiltersDisplayValue(filterValuesWithBothEndsOpen);
-            assert.equal(value, "All Numbers");
+        it('generates display value for filter values with both ends open', () => {
+            const value = intervalFiltersDisplayValue(
+                filterValuesWithBothEndsOpen
+            );
+            assert.equal(value, 'All Numbers');
         });
 
-        it ('generates display value for filter values with both ends open, with special values', () => {
-            const value = intervalFiltersDisplayValue(filterValuesWithBothEndsOpenAndSpecialValues);
-            assert.equal(value, "All Numbers, NA, REDACTED");
+        it('generates display value for filter values with both ends open, with special values', () => {
+            const value = intervalFiltersDisplayValue(
+                filterValuesWithBothEndsOpenAndSpecialValues
+            );
+            assert.equal(value, 'All Numbers, NA, REDACTED');
         });
 
-        it ('generates display value for filter values with start open, end closed', () => {
-            const value = intervalFiltersDisplayValue(filterValuesWithStartOpen);
-            assert.equal(value, "≤ 50");
+        it('generates display value for filter values with start open, end closed', () => {
+            const value = intervalFiltersDisplayValue(
+                filterValuesWithStartOpen
+            );
+            assert.equal(value, '≤ 50');
         });
 
-        it ('generates display value for filter values with start open, end closed, with special values', () => {
-            const value = intervalFiltersDisplayValue(filterValuesWithStartOpenAndSpecialValues);
-            assert.equal(value, "≤ 50, NA, REDACTED");
+        it('generates display value for filter values with start open, end closed, with special values', () => {
+            const value = intervalFiltersDisplayValue(
+                filterValuesWithStartOpenAndSpecialValues
+            );
+            assert.equal(value, '≤ 50, NA, REDACTED');
         });
 
-        it ('generates display value for filter values with start closed, end open', () => {
+        it('generates display value for filter values with start closed, end open', () => {
             const value = intervalFiltersDisplayValue(filterValuesWithEndOpen);
-            assert.equal(value, "> 10");
+            assert.equal(value, '> 10');
         });
 
-        it ('generates display value for filter values with start closed, end open, with special values', () => {
-            const value = intervalFiltersDisplayValue(filterValuesWithEndOpenAndSpecialValues);
-            assert.equal(value, "> 10, NA, REDACTED");
+        it('generates display value for filter values with start closed, end open, with special values', () => {
+            const value = intervalFiltersDisplayValue(
+                filterValuesWithEndOpenAndSpecialValues
+            );
+            assert.equal(value, '> 10, NA, REDACTED');
         });
 
-        it ('generates display value for filter values with special values only', () => {
-            const value = intervalFiltersDisplayValue(filterValuesWithSpecialValuesOnly);
-            assert.equal(value, "NA, REDACTED");
+        it('generates display value for filter values with special values only', () => {
+            const value = intervalFiltersDisplayValue(
+                filterValuesWithSpecialValuesOnly
+            );
+            assert.equal(value, 'NA, REDACTED');
         });
 
-        it ('generates display value for filter values with distinct values only', () => {
-            const value = intervalFiltersDisplayValue(filterValuesWithDistinctNumerals);
-            assert.equal(value, "20 ≤ x ≤ 40");
+        it('generates display value for filter values with distinct values only', () => {
+            const value = intervalFiltersDisplayValue(
+                filterValuesWithDistinctNumerals
+            );
+            assert.equal(value, '20 ≤ x ≤ 40');
         });
 
-        it ('generates display value for filter values with distinct values and special values', () => {
-            const value = intervalFiltersDisplayValue(filterValuesWithDistinctNumeralsAndSpecialValues);
-            assert.equal(value, "20 ≤ x ≤ 40, NA, REDACTED");
+        it('generates display value for filter values with distinct values and special values', () => {
+            const value = intervalFiltersDisplayValue(
+                filterValuesWithDistinctNumeralsAndSpecialValues
+            );
+            assert.equal(value, '20 ≤ x ≤ 40, NA, REDACTED');
         });
 
-        it ('generates display value for filter values with a single distinct value', () => {
-            const value = intervalFiltersDisplayValue(filterValuesWithSingleDistinctValue);
-            assert.equal(value, "666");
+        it('generates display value for filter values with a single distinct value', () => {
+            const value = intervalFiltersDisplayValue(
+                filterValuesWithSingleDistinctValue
+            );
+            assert.equal(value, '666');
         });
 
-        it ('generates display value for filter values with a single distinct value and special values', () => {
-            const value = intervalFiltersDisplayValue(filterValuesWithSingleDistinctValueAndSpecialValues);
-            assert.equal(value, "666, NA, REDACTED");
+        it('generates display value for filter values with a single distinct value and special values', () => {
+            const value = intervalFiltersDisplayValue(
+                filterValuesWithSingleDistinctValueAndSpecialValues
+            );
+            assert.equal(value, '666, NA, REDACTED');
         });
     });
 
     describe('isEveryBinDistinct', () => {
         const noBinDistinct = [
-            {start: 10, end: 20},
-            {start: 20, end: 30},
-            {start: 30, end: 40},
-            {start: 40, end: 50}
+            { start: 10, end: 20 },
+            { start: 20, end: 30 },
+            { start: 30, end: 40 },
+            { start: 40, end: 50 },
         ] as DataBin[];
 
         const everyBinDistinct = [
-            {start: 0, end: 0},
-            {start: 10, end: 10},
-            {start: 20, end: 20},
-            {start: 30, end: 30}
+            { start: 0, end: 0 },
+            { start: 10, end: 10 },
+            { start: 20, end: 20 },
+            { start: 30, end: 30 },
         ] as DataBin[];
 
         const someBinsDistinct = [
-            {start: 0, end: 0},
-            {start: 10, end: 10},
-            {start: 20, end: 30},
-            {start: 30, end: 40}
+            { start: 0, end: 0 },
+            { start: 10, end: 10 },
+            { start: 20, end: 30 },
+            { start: 30, end: 40 },
         ] as DataBin[];
 
-        it ('accepts a list of bins with all distinct values', () => {
-            assert.isTrue(isEveryBinDistinct(everyBinDistinct),
-                "should be true when every bin is distinct");
+        it('accepts a list of bins with all distinct values', () => {
+            assert.isTrue(
+                isEveryBinDistinct(everyBinDistinct),
+                'should be true when every bin is distinct'
+            );
         });
 
-        it ('rejects an empty list', () => {
-            assert.isFalse(isEveryBinDistinct([]),
-                "empty list should not be classified as distinct");
+        it('rejects an empty list', () => {
+            assert.isFalse(
+                isEveryBinDistinct([]),
+                'empty list should not be classified as distinct'
+            );
         });
 
-        it ('rejects a list of bins with no distinct values', () => {
-            assert.isFalse(isEveryBinDistinct(noBinDistinct),
-                "should be false when no bin is distinct");
+        it('rejects a list of bins with no distinct values', () => {
+            assert.isFalse(
+                isEveryBinDistinct(noBinDistinct),
+                'should be false when no bin is distinct'
+            );
         });
 
-        it ('rejects a list of bins with some distinct values', () => {
-            assert.isFalse(isEveryBinDistinct(someBinsDistinct),
-                "should be false when some bins are distinct");
+        it('rejects a list of bins with some distinct values', () => {
+            assert.isFalse(
+                isEveryBinDistinct(someBinsDistinct),
+                'should be false when some bins are distinct'
+            );
         });
     });
 
@@ -1058,7 +1507,7 @@ describe('StudyViewUtils', () => {
             -2.0000000000001,
             -1,
             -0.6000000000000001,
-            -0.002499999998
+            -0.002499999998,
         ];
 
         const positiveValues = [
@@ -1069,145 +1518,161 @@ describe('StudyViewUtils', () => {
             1.7999999999999998,
             2.0000000000000001,
             16.99999999999998,
-            666.666
+            666.666,
         ];
 
-        it ('handles negative values properly', () => {
-            assert.equal(toFixedDigit(negativeValues[0]), "-666.67");
-            assert.equal(toFixedDigit(negativeValues[1]), "-3");
-            assert.equal(toFixedDigit(negativeValues[2]), "-2.25");
-            assert.equal(toFixedDigit(negativeValues[3]), "-2");
-            assert.equal(toFixedDigit(negativeValues[4]), "-1");
-            assert.equal(toFixedDigit(negativeValues[5]), "-0.6");
-            assert.equal(toFixedDigit(negativeValues[6]), "-0.0025");
+        it('handles negative values properly', () => {
+            assert.equal(toFixedDigit(negativeValues[0]), '-666.67');
+            assert.equal(toFixedDigit(negativeValues[1]), '-3');
+            assert.equal(toFixedDigit(negativeValues[2]), '-2.25');
+            assert.equal(toFixedDigit(negativeValues[3]), '-2');
+            assert.equal(toFixedDigit(negativeValues[4]), '-1');
+            assert.equal(toFixedDigit(negativeValues[5]), '-0.6');
+            assert.equal(toFixedDigit(negativeValues[6]), '-0.0025');
         });
 
-        it ('handles zero properly', () => {
-            assert.equal(toFixedDigit(0), "0");
+        it('handles zero properly', () => {
+            assert.equal(toFixedDigit(0), '0');
         });
 
-        it ('handles positive values properly', () => {
+        it('handles positive values properly', () => {
             //assert.equal(toFixedDigit(positiveValues[0]), "0.0025");
-            assert.equal(toFixedDigit(positiveValues[0]), "0.0025");
-            assert.equal(toFixedDigit(positiveValues[1]), "0.6");
-            assert.equal(toFixedDigit(positiveValues[2]), "1");
-            assert.equal(toFixedDigit(positiveValues[3]), "1.6");
-            assert.equal(toFixedDigit(positiveValues[4]), "1.8");
-            assert.equal(toFixedDigit(positiveValues[5]), "2");
-            assert.equal(toFixedDigit(positiveValues[6]), "17");
-            assert.equal(toFixedDigit(positiveValues[7]), "666.67");
+            assert.equal(toFixedDigit(positiveValues[0]), '0.0025');
+            assert.equal(toFixedDigit(positiveValues[1]), '0.6');
+            assert.equal(toFixedDigit(positiveValues[2]), '1');
+            assert.equal(toFixedDigit(positiveValues[3]), '1.6');
+            assert.equal(toFixedDigit(positiveValues[4]), '1.8');
+            assert.equal(toFixedDigit(positiveValues[5]), '2');
+            assert.equal(toFixedDigit(positiveValues[6]), '17');
+            assert.equal(toFixedDigit(positiveValues[7]), '666.67');
         });
     });
 
     describe('pickClinicalDataColors', () => {
         const clinicalDataCountWithFixedValues = [
             {
-                "value": "FALSE",
-                "count": 26
+                value: 'FALSE',
+                count: 26,
             },
             {
-                "value": "TRUE",
-                "count": 66
+                value: 'TRUE',
+                count: 66,
             },
             {
-                "value": "NA",
-                "count": 16
-            }
+                value: 'NA',
+                count: 16,
+            },
         ];
 
         const clinicalDataCountWithFixedMixedCaseValues = [
             {
-                "value": "Yes",
-                "count": 26
+                value: 'Yes',
+                count: 26,
             },
             {
-                "value": "No",
-                "count": 66
+                value: 'No',
+                count: 66,
             },
             {
-                "value": "Male",
-                "count": 36
+                value: 'Male',
+                count: 36,
             },
             {
-                "value": "F",
-                "count": 26
+                value: 'F',
+                count: 26,
             },
             {
-                "value": "Na",
-                "count": 16
-            }
+                value: 'Na',
+                count: 16,
+            },
         ];
 
         const clinicalDataCountWithBothFixedAndOtherValues = [
             {
-                "value": "Yes",
-                "count": 26
+                value: 'Yes',
+                count: 26,
             },
             {
-                "value": "NO",
-                "count": 66
+                value: 'NO',
+                count: 66,
             },
             {
-                "value": "na",
-                "count": 16
+                value: 'na',
+                count: 16,
             },
             {
-                "value": "WHY",
-                "count": 46
+                value: 'WHY',
+                count: 46,
             },
             {
-                "value": "weather",
-                "count": 36
+                value: 'weather',
+                count: 36,
             },
             {
-                "value": "is",
-                "count": 36
+                value: 'is',
+                count: 36,
             },
             {
-                "value": "so",
-                "count": 36
+                value: 'so',
+                count: 36,
             },
             {
-                "value": "hot",
-                "count": 36
-            }
+                value: 'hot',
+                count: 36,
+            },
         ];
 
-        it ('picks predefined colors for known clinical attribute values', () => {
-            const colors = pickClinicalDataColors(clinicalDataCountWithFixedValues);
-            assert.equal(colors["TRUE"], RESERVED_CLINICAL_VALUE_COLORS.true);
-            assert.equal(colors["FALSE"], RESERVED_CLINICAL_VALUE_COLORS.false);
-            assert.equal(colors["NA"], RESERVED_CLINICAL_VALUE_COLORS.na);
-        });
-
-        it ('picks predefined colors for known clinical attribute values in mixed letter case', () => {
-            const colors = pickClinicalDataColors(clinicalDataCountWithFixedMixedCaseValues);
-
-            assert.equal(colors["Yes"], RESERVED_CLINICAL_VALUE_COLORS.yes);
-            assert.equal(colors["No"], RESERVED_CLINICAL_VALUE_COLORS.no);
-            assert.equal(colors["Na"], RESERVED_CLINICAL_VALUE_COLORS.na);
-            assert.equal(colors["Male"], RESERVED_CLINICAL_VALUE_COLORS.male);
-            assert.equal(colors["F"], RESERVED_CLINICAL_VALUE_COLORS.f);
+        it('picks predefined colors for known clinical attribute values', () => {
+            const colors = pickClinicalDataColors(
+                clinicalDataCountWithFixedValues
+            );
+            assert.equal(colors['TRUE'], RESERVED_CLINICAL_VALUE_COLORS.true);
+            assert.equal(colors['FALSE'], RESERVED_CLINICAL_VALUE_COLORS.false);
+            assert.equal(colors['NA'], RESERVED_CLINICAL_VALUE_COLORS.na);
         });
 
-        it ('does not pick already picked colors again for non-fixed values', () => {
-            const availableColors = ["#66AA00", "#666666", "#2986E2", RESERVED_CLINICAL_VALUE_COLORS.na, RESERVED_CLINICAL_VALUE_COLORS.no, "#f88508", RESERVED_CLINICAL_VALUE_COLORS.yes, "#f88507"];
+        it('picks predefined colors for known clinical attribute values in mixed letter case', () => {
+            const colors = pickClinicalDataColors(
+                clinicalDataCountWithFixedMixedCaseValues
+            );
 
-            const colors = pickClinicalDataColors(clinicalDataCountWithBothFixedAndOtherValues, availableColors);
+            assert.equal(colors['Yes'], RESERVED_CLINICAL_VALUE_COLORS.yes);
+            assert.equal(colors['No'], RESERVED_CLINICAL_VALUE_COLORS.no);
+            assert.equal(colors['Na'], RESERVED_CLINICAL_VALUE_COLORS.na);
+            assert.equal(colors['Male'], RESERVED_CLINICAL_VALUE_COLORS.male);
+            assert.equal(colors['F'], RESERVED_CLINICAL_VALUE_COLORS.f);
+        });
+
+        it('does not pick already picked colors again for non-fixed values', () => {
+            const availableColors = [
+                '#66AA00',
+                '#666666',
+                '#2986E2',
+                RESERVED_CLINICAL_VALUE_COLORS.na,
+                RESERVED_CLINICAL_VALUE_COLORS.no,
+                '#f88508',
+                RESERVED_CLINICAL_VALUE_COLORS.yes,
+                '#f88507',
+            ];
+
+            const colors = pickClinicalDataColors(
+                clinicalDataCountWithBothFixedAndOtherValues,
+                availableColors
+            );
 
-            assert.equal(colors["Yes"], RESERVED_CLINICAL_VALUE_COLORS.yes);
-            assert.equal(colors["NO"], RESERVED_CLINICAL_VALUE_COLORS.no);
-            assert.equal(colors["na"], RESERVED_CLINICAL_VALUE_COLORS.na);
-            assert.equal(colors["WHY"], "#66AA00");
-            assert.equal(colors["weather"], "#666666");
-            assert.equal(colors["is"], "#2986E2");
-            assert.equal(colors["so"], "#f88508");
-            assert.equal(colors["hot"], "#f88507");
+            assert.equal(colors['Yes'], RESERVED_CLINICAL_VALUE_COLORS.yes);
+            assert.equal(colors['NO'], RESERVED_CLINICAL_VALUE_COLORS.no);
+            assert.equal(colors['na'], RESERVED_CLINICAL_VALUE_COLORS.na);
+            assert.equal(colors['WHY'], '#66AA00');
+            assert.equal(colors['weather'], '#666666');
+            assert.equal(colors['is'], '#2986E2');
+            assert.equal(colors['so'], '#f88508');
+            assert.equal(colors['hot'], '#f88507');
         });
     });
 
     describe('getExponent', () => {
-        it ('handles negative values properly', () => {
+        it('handles negative values properly', () => {
             assert.equal(getExponent(-1), 0);
             assert.equal(getExponent(-3), 0.5);
             assert.equal(getExponent(-10), 1);
@@ -1217,11 +1682,11 @@ describe('StudyViewUtils', () => {
             assert.equal(getExponent(-1000), 3);
         });
 
-        it ('handles zero properly', () => {
+        it('handles zero properly', () => {
             assert.equal(getExponent(0), -Infinity);
         });
 
-        it ('handles positive values properly', () => {
+        it('handles positive values properly', () => {
             //assert.equal(toFixedDigit(positiveValues[0]), "0.0025");
             assert.equal(getExponent(1), 0);
             assert.equal(getExponent(3), 0.5);
@@ -1233,13 +1698,13 @@ describe('StudyViewUtils', () => {
         });
     });
 
-    describe('getCNAByAlteration', ()=>{
-        it('return proper string from proper alteration', ()=>{
+    describe('getCNAByAlteration', () => {
+        it('return proper string from proper alteration', () => {
             assert.isTrue(getCNAByAlteration(-2) === 'HOMDEL');
             assert.isTrue(getCNAByAlteration(2) === 'AMP');
         });
 
-        it('return empty string when alteration is not 2 or -2', ()=>{
+        it('return empty string when alteration is not 2 or -2', () => {
             assert.isTrue(getCNAByAlteration(0) === '');
             assert.isTrue(getCNAByAlteration(1) === '');
             assert.isTrue(getCNAByAlteration(-1) === '');
@@ -1249,83 +1714,170 @@ describe('StudyViewUtils', () => {
     describe('getDefaultChartTypeByClinicalAttribute', () => {
         it('return TABLE when the clinical attributes are pre-defined as table', () => {
             let attr: ClinicalAttribute = {
-                clinicalAttributeId: 'CANCER_TYPE'
+                clinicalAttributeId: 'CANCER_TYPE',
             } as ClinicalAttribute;
-            assert.isTrue(getDefaultChartTypeByClinicalAttribute(attr) === ChartTypeEnum.TABLE);
+            assert.isTrue(
+                getDefaultChartTypeByClinicalAttribute(attr) ===
+                    ChartTypeEnum.TABLE
+            );
 
             attr.clinicalAttributeId = 'CANCER_TYPE_DETAILED';
-            assert.isTrue(getDefaultChartTypeByClinicalAttribute(attr) === ChartTypeEnum.TABLE);
+            assert.isTrue(
+                getDefaultChartTypeByClinicalAttribute(attr) ===
+                    ChartTypeEnum.TABLE
+            );
         });
 
         it('return PIE_CHART when clinical attribute has data type as STRING', () => {
-            const attr:ClinicalAttribute = {
-                datatype: 'STRING'
+            const attr: ClinicalAttribute = {
+                datatype: 'STRING',
             } as ClinicalAttribute;
-            assert.isTrue(getDefaultChartTypeByClinicalAttribute(attr) === ChartTypeEnum.PIE_CHART);
+            assert.isTrue(
+                getDefaultChartTypeByClinicalAttribute(attr) ===
+                    ChartTypeEnum.PIE_CHART
+            );
         });
 
         it('return BAR_CHART when clinical attribute has data type as STRING', () => {
-            const attr:ClinicalAttribute = {
-                datatype: 'NUMBER'
+            const attr: ClinicalAttribute = {
+                datatype: 'NUMBER',
             } as ClinicalAttribute;
-            assert.isTrue(getDefaultChartTypeByClinicalAttribute(attr) === ChartTypeEnum.BAR_CHART);
+            assert.isTrue(
+                getDefaultChartTypeByClinicalAttribute(attr) ===
+                    ChartTypeEnum.BAR_CHART
+            );
         });
     });
 
-    describe("isOccupied", () => {
-        it("Return false if the matrix is empty", () => {
-            assert.isFalse(isOccupied([], {x: 0, y: 0}, {w: 1, h: 1}));
+    describe('isOccupied', () => {
+        it('Return false if the matrix is empty', () => {
+            assert.isFalse(isOccupied([], { x: 0, y: 0 }, { w: 1, h: 1 }));
         });
-        it("Check the bigger chart starts from even index", () => {
+        it('Check the bigger chart starts from even index', () => {
             // x
-            assert.isTrue(isOccupied([['1', '', '', '2', '', '']], {x: 1, y: 0}, {w: 2, h: 1},));
-            assert.isTrue(isOccupied([['1', '', '', '2', '', '']], {x: 2, y: 0}, {w: 2, h: 1}));
-            assert.isFalse(isOccupied([['1', '', '', '2', '', '']], {x: 4, y: 0}, {w: 2, h: 1}));
+            assert.isTrue(
+                isOccupied(
+                    [['1', '', '', '2', '', '']],
+                    { x: 1, y: 0 },
+                    { w: 2, h: 1 }
+                )
+            );
+            assert.isTrue(
+                isOccupied(
+                    [['1', '', '', '2', '', '']],
+                    { x: 2, y: 0 },
+                    { w: 2, h: 1 }
+                )
+            );
+            assert.isFalse(
+                isOccupied(
+                    [['1', '', '', '2', '', '']],
+                    { x: 4, y: 0 },
+                    { w: 2, h: 1 }
+                )
+            );
 
             // y
-            assert.isTrue(isOccupied([['1', '1', '', ''], ['2', '2', '', '']], {x: 2, y: 1}, {w: 2, h: 2}));
+            assert.isTrue(
+                isOccupied(
+                    [['1', '1', '', ''], ['2', '2', '', '']],
+                    { x: 2, y: 1 },
+                    { w: 2, h: 2 }
+                )
+            );
         });
-        it("Return proper value", () => {
-            assert.isTrue(isOccupied([['1', '2', '']], {x: 0, y: 0}, {w: 1, h: 1}));
-            assert.isTrue(isOccupied([['1', '2', '']], {x: 1, y: 0}, {w: 1, h: 1}));
-            assert.isFalse(isOccupied([['1', '2', '']], {x: 2, y: 0}, {w: 1, h: 1}));
+        it('Return proper value', () => {
+            assert.isTrue(
+                isOccupied([['1', '2', '']], { x: 0, y: 0 }, { w: 1, h: 1 })
+            );
+            assert.isTrue(
+                isOccupied([['1', '2', '']], { x: 1, y: 0 }, { w: 1, h: 1 })
+            );
+            assert.isFalse(
+                isOccupied([['1', '2', '']], { x: 2, y: 0 }, { w: 1, h: 1 })
+            );
 
-            assert.isTrue(isOccupied([['1', '2', '']], {x: 2, y: 0}, {w: 2, h: 1}));
+            assert.isTrue(
+                isOccupied([['1', '2', '']], { x: 2, y: 0 }, { w: 2, h: 1 })
+            );
 
-            assert.isTrue(isOccupied([['1', '1', ''], ['2', '2', '']], {x: 0, y: 0}, {w: 1, h: 1}));
-            assert.isTrue(isOccupied([['1', '1', ''], ['2', '2', '']], {x: 0, y: 1}, {w: 1, h: 1}));
+            assert.isTrue(
+                isOccupied(
+                    [['1', '1', ''], ['2', '2', '']],
+                    { x: 0, y: 0 },
+                    { w: 1, h: 1 }
+                )
+            );
+            assert.isTrue(
+                isOccupied(
+                    [['1', '1', ''], ['2', '2', '']],
+                    { x: 0, y: 1 },
+                    { w: 1, h: 1 }
+                )
+            );
 
-            assert.isFalse(isOccupied([['1', '1', '', ''], ['2', '2', '', '']], {x: 2, y: 0}, {w: 2, h: 2}));
-            assert.isFalse(isOccupied([['1', '1', '', ''], ['2', '2', '', ''], ['3', '3', '', '']], {x: 2, y: 2}, {w: 2, h: 2}));
+            assert.isFalse(
+                isOccupied(
+                    [['1', '1', '', ''], ['2', '2', '', '']],
+                    { x: 2, y: 0 },
+                    { w: 2, h: 2 }
+                )
+            );
+            assert.isFalse(
+                isOccupied(
+                    [
+                        ['1', '1', '', ''],
+                        ['2', '2', '', ''],
+                        ['3', '3', '', ''],
+                    ],
+                    { x: 2, y: 2 },
+                    { w: 2, h: 2 }
+                )
+            );
         });
     });
 
-    describe("findSpot", () => {
-        it("0,0 should be returned if the matrix is empty", () => {
-            assert.deepEqual(findSpot([], {w: 1, h: 1}), {x: 0, y: 0});
+    describe('findSpot', () => {
+        it('0,0 should be returned if the matrix is empty', () => {
+            assert.deepEqual(findSpot([], { w: 1, h: 1 }), { x: 0, y: 0 });
         });
-        it("The first index in next row should be returned if the matrix is fully occupied", () => {
-            assert.deepEqual(findSpot([['1', '2']], {w: 1, h: 1}), {x: 0, y: 1});
+        it('The first index in next row should be returned if the matrix is fully occupied', () => {
+            assert.deepEqual(findSpot([['1', '2']], { w: 1, h: 1 }), {
+                x: 0,
+                y: 1,
+            });
         });
-        it("Return proper position", () => {
-            assert.deepEqual(findSpot([['1', '2', '']], {w: 1, h: 1}), {x: 2, y: 0});
-            assert.deepEqual(findSpot([['1', '2', '']], {w: 2, h: 1}), {x: 0, y: 1});
-            assert.deepEqual(findSpot([['1', '1', ''], ['2', '2', '']], {w: 1, h: 1}), {x: 2, y: 0});
-            assert.deepEqual(findSpot([['1', '1', ''], ['2', '2', '']], {w: 2, h: 1}), {x: 0, y: 2});
+        it('Return proper position', () => {
+            assert.deepEqual(findSpot([['1', '2', '']], { w: 1, h: 1 }), {
+                x: 2,
+                y: 0,
+            });
+            assert.deepEqual(findSpot([['1', '2', '']], { w: 2, h: 1 }), {
+                x: 0,
+                y: 1,
+            });
+            assert.deepEqual(
+                findSpot([['1', '1', ''], ['2', '2', '']], { w: 1, h: 1 }),
+                { x: 2, y: 0 }
+            );
+            assert.deepEqual(
+                findSpot([['1', '1', ''], ['2', '2', '']], { w: 2, h: 1 }),
+                { x: 0, y: 2 }
+            );
         });
     });
 
-    describe("calculateLayout", () => {
+    describe('calculateLayout', () => {
         let visibleAttrs: ChartMeta[] = [];
         let visibleAttrsChartDimensions: { [id: string]: ChartDimension } = {};
         const clinicalAttr: ClinicalAttribute = {
-            'clinicalAttributeId': 'test',
-            'datatype': 'STRING',
-            'description': '',
-            'displayName': '',
-            'patientAttribute': true,
-            'priority': '1',
-            'studyId': ''
+            clinicalAttributeId: 'test',
+            datatype: 'STRING',
+            description: '',
+            displayName: '',
+            patientAttribute: true,
+            priority: '1',
+            studyId: '',
         };
         for (let i = 0; i < 8; i++) {
             const uniqueKey = 'test' + i;
@@ -1339,17 +1891,27 @@ describe('StudyViewUtils', () => {
                 renderWhenDataChange: false,
                 priority: 1,
             });
-            visibleAttrsChartDimensions[uniqueKey] = {w: 1, h: 1};
+            visibleAttrsChartDimensions[uniqueKey] = { w: 1, h: 1 };
         }
 
-        it("Empty array should be returned when no attributes given", () => {
-            let layout: Layout[] = calculateLayout([], 6, visibleAttrsChartDimensions, []);
+        it('Empty array should be returned when no attributes given', () => {
+            let layout: Layout[] = calculateLayout(
+                [],
+                6,
+                visibleAttrsChartDimensions,
+                []
+            );
             assert.isArray(layout);
             assert.equal(layout.length, 0);
         });
 
-        it("The layout is not expected - 1", () => {
-            let layout: Layout[] = calculateLayout(visibleAttrs, 6, visibleAttrsChartDimensions, []);
+        it('The layout is not expected - 1', () => {
+            let layout: Layout[] = calculateLayout(
+                visibleAttrs,
+                6,
+                visibleAttrsChartDimensions,
+                []
+            );
             assert.equal(layout.length, 8);
             assert.equal(layout[0].i, 'test0');
             assert.equal(layout[0].x, 0);
@@ -1377,8 +1939,13 @@ describe('StudyViewUtils', () => {
             assert.equal(layout[7].y, 1);
         });
 
-        it("The layout is not expected - 2", () => {
-            let layout: Layout[] = calculateLayout(visibleAttrs, 2, visibleAttrsChartDimensions, []);
+        it('The layout is not expected - 2', () => {
+            let layout: Layout[] = calculateLayout(
+                visibleAttrs,
+                2,
+                visibleAttrsChartDimensions,
+                []
+            );
             assert.equal(layout.length, 8);
             assert.equal(layout[0].i, 'test0');
             assert.equal(layout[0].x, 0);
@@ -1406,31 +1973,41 @@ describe('StudyViewUtils', () => {
             assert.equal(layout[7].y, 3);
         });
 
-        it("Higher priority chart should be displayed first", () => {
-            let visibleAttrsChartDimensions: { [id: string]: ChartDimension } = {};
-            visibleAttrs = [{
-                clinicalAttribute: clinicalAttr,
-                displayName: clinicalAttr.displayName,
-                description: clinicalAttr.description,
-                uniqueKey: 'test0',
-                dataType: ChartMetaDataTypeEnum.CLINICAL,
-                patientAttribute: clinicalAttr.patientAttribute,
-                renderWhenDataChange: true,
-                priority: 10,
-            }, {
-                clinicalAttribute: clinicalAttr,
-                displayName: clinicalAttr.displayName,
-                description: clinicalAttr.description,
-                uniqueKey: 'test1',
-                dataType: ChartMetaDataTypeEnum.CLINICAL,
-                patientAttribute: clinicalAttr.patientAttribute,
-                renderWhenDataChange: false,
-                priority: 20,
-            }];
-            visibleAttrsChartDimensions['test0'] = {w: 2, h: 2};
-            visibleAttrsChartDimensions['test1'] = {w: 1, h: 1};
-
-            let layout: Layout[] = calculateLayout(visibleAttrs, 4, visibleAttrsChartDimensions, []);
+        it('Higher priority chart should be displayed first', () => {
+            let visibleAttrsChartDimensions: {
+                [id: string]: ChartDimension;
+            } = {};
+            visibleAttrs = [
+                {
+                    clinicalAttribute: clinicalAttr,
+                    displayName: clinicalAttr.displayName,
+                    description: clinicalAttr.description,
+                    uniqueKey: 'test0',
+                    dataType: ChartMetaDataTypeEnum.CLINICAL,
+                    patientAttribute: clinicalAttr.patientAttribute,
+                    renderWhenDataChange: true,
+                    priority: 10,
+                },
+                {
+                    clinicalAttribute: clinicalAttr,
+                    displayName: clinicalAttr.displayName,
+                    description: clinicalAttr.description,
+                    uniqueKey: 'test1',
+                    dataType: ChartMetaDataTypeEnum.CLINICAL,
+                    patientAttribute: clinicalAttr.patientAttribute,
+                    renderWhenDataChange: false,
+                    priority: 20,
+                },
+            ];
+            visibleAttrsChartDimensions['test0'] = { w: 2, h: 2 };
+            visibleAttrsChartDimensions['test1'] = { w: 1, h: 1 };
+
+            let layout: Layout[] = calculateLayout(
+                visibleAttrs,
+                4,
+                visibleAttrsChartDimensions,
+                []
+            );
             assert.equal(layout.length, 2);
             assert.equal(layout[0].i, 'test1');
             assert.equal(layout[0].x, 0);
@@ -1441,41 +2018,52 @@ describe('StudyViewUtils', () => {
             assert.equal(layout[1].y, 0);
         });
 
-        it("The lower priority chart should occupy the empty space first", () => {
-            let visibleAttrsChartDimensions: { [id: string]: ChartDimension } = {};
-            visibleAttrs = [{
-                clinicalAttribute: clinicalAttr,
-                displayName: clinicalAttr.displayName,
-                description: clinicalAttr.description,
-                uniqueKey: 'test0',
-                dataType: ChartMetaDataTypeEnum.CLINICAL,
-                patientAttribute: clinicalAttr.patientAttribute,
-                renderWhenDataChange: false,
-                priority: 10,
-            }, {
-                clinicalAttribute: clinicalAttr,
-                displayName: clinicalAttr.displayName,
-                description: clinicalAttr.description,
-                uniqueKey: 'test1',
-                dataType: ChartMetaDataTypeEnum.CLINICAL,
-                patientAttribute: clinicalAttr.patientAttribute,
-                renderWhenDataChange: true,
-                priority: 5,
-            }, {
-                clinicalAttribute: clinicalAttr,
-                displayName: clinicalAttr.displayName,
-                description: clinicalAttr.description,
-                uniqueKey: 'test2',
-                dataType: ChartMetaDataTypeEnum.CLINICAL,
-                patientAttribute: clinicalAttr.patientAttribute,
-                renderWhenDataChange: false,
-                priority: 2,
-            }];
-            visibleAttrsChartDimensions['test0'] = {w: 2, h: 1};
-            visibleAttrsChartDimensions['test1'] = {w: 2, h: 2};
-            visibleAttrsChartDimensions['test2'] = {w: 1, h: 1};
-
-            let layout: Layout[] = calculateLayout(visibleAttrs, 4, visibleAttrsChartDimensions, []);
+        it('The lower priority chart should occupy the empty space first', () => {
+            let visibleAttrsChartDimensions: {
+                [id: string]: ChartDimension;
+            } = {};
+            visibleAttrs = [
+                {
+                    clinicalAttribute: clinicalAttr,
+                    displayName: clinicalAttr.displayName,
+                    description: clinicalAttr.description,
+                    uniqueKey: 'test0',
+                    dataType: ChartMetaDataTypeEnum.CLINICAL,
+                    patientAttribute: clinicalAttr.patientAttribute,
+                    renderWhenDataChange: false,
+                    priority: 10,
+                },
+                {
+                    clinicalAttribute: clinicalAttr,
+                    displayName: clinicalAttr.displayName,
+                    description: clinicalAttr.description,
+                    uniqueKey: 'test1',
+                    dataType: ChartMetaDataTypeEnum.CLINICAL,
+                    patientAttribute: clinicalAttr.patientAttribute,
+                    renderWhenDataChange: true,
+                    priority: 5,
+                },
+                {
+                    clinicalAttribute: clinicalAttr,
+                    displayName: clinicalAttr.displayName,
+                    description: clinicalAttr.description,
+                    uniqueKey: 'test2',
+                    dataType: ChartMetaDataTypeEnum.CLINICAL,
+                    patientAttribute: clinicalAttr.patientAttribute,
+                    renderWhenDataChange: false,
+                    priority: 2,
+                },
+            ];
+            visibleAttrsChartDimensions['test0'] = { w: 2, h: 1 };
+            visibleAttrsChartDimensions['test1'] = { w: 2, h: 2 };
+            visibleAttrsChartDimensions['test2'] = { w: 1, h: 1 };
+
+            let layout: Layout[] = calculateLayout(
+                visibleAttrs,
+                4,
+                visibleAttrsChartDimensions,
+                []
+            );
             assert.equal(layout.length, 3);
             assert.equal(layout[0].i, 'test0');
             assert.equal(layout[0].x, 0);
@@ -1485,67 +2073,79 @@ describe('StudyViewUtils', () => {
             assert.equal(layout[1].x, 2);
             assert.equal(layout[1].y, 0);
 
-
             assert.equal(layout[2].i, 'test2');
             assert.equal(layout[2].x, 0);
             assert.equal(layout[2].y, 1);
         });
 
-        it("The chart should utilize the horizontal space in the last row", () => {
-            let visibleAttrsChartDimensions: { [id: string]: ChartDimension } = {};
-            visibleAttrs = [{
-                clinicalAttribute: clinicalAttr,
-                displayName: clinicalAttr.displayName,
-                description: clinicalAttr.description,
-                uniqueKey: 'test0',
-                dataType: ChartMetaDataTypeEnum.CLINICAL,
-                patientAttribute: clinicalAttr.patientAttribute,
-                renderWhenDataChange: false,
-                priority: 1,
-            }, {
-                clinicalAttribute: clinicalAttr,
-                displayName: clinicalAttr.displayName,
-                description: clinicalAttr.description,
-                uniqueKey: 'test1',
-                dataType: ChartMetaDataTypeEnum.CLINICAL,
-                patientAttribute: clinicalAttr.patientAttribute,
-                renderWhenDataChange: true,
-                priority: 1,
-            }, {
-                clinicalAttribute: clinicalAttr,
-                displayName: clinicalAttr.displayName,
-                description: clinicalAttr.description,
-                uniqueKey: 'test2',
-                dataType: ChartMetaDataTypeEnum.CLINICAL,
-                patientAttribute: clinicalAttr.patientAttribute,
-                renderWhenDataChange: false,
-                priority: 1,
-            }, {
-                clinicalAttribute: clinicalAttr,
-                displayName: clinicalAttr.displayName,
-                description: clinicalAttr.description,
-                uniqueKey: 'test3',
-                dataType: ChartMetaDataTypeEnum.CLINICAL,
-                patientAttribute: clinicalAttr.patientAttribute,
-                renderWhenDataChange: false,
-                priority: 1,
-            }, {
-                clinicalAttribute: clinicalAttr,
-                displayName: clinicalAttr.displayName,
-                description: clinicalAttr.description,
-                uniqueKey: 'test4',
-                dataType: ChartMetaDataTypeEnum.CLINICAL,
-                patientAttribute: clinicalAttr.patientAttribute,
-                renderWhenDataChange: false,
-                priority: 1,
-            }];
-            visibleAttrsChartDimensions['test0'] = {w: 2, h: 2};
-            visibleAttrsChartDimensions['test1'] = {w: 2, h: 2};
-            visibleAttrsChartDimensions['test2'] = {w: 2, h: 1};
-            visibleAttrsChartDimensions['test3'] = {w: 1, h: 1};
-            visibleAttrsChartDimensions['test4'] = {w: 1, h: 1};
-
-            let layout: Layout[] = calculateLayout(visibleAttrs, 4, visibleAttrsChartDimensions, []);
+        it('The chart should utilize the horizontal space in the last row', () => {
+            let visibleAttrsChartDimensions: {
+                [id: string]: ChartDimension;
+            } = {};
+            visibleAttrs = [
+                {
+                    clinicalAttribute: clinicalAttr,
+                    displayName: clinicalAttr.displayName,
+                    description: clinicalAttr.description,
+                    uniqueKey: 'test0',
+                    dataType: ChartMetaDataTypeEnum.CLINICAL,
+                    patientAttribute: clinicalAttr.patientAttribute,
+                    renderWhenDataChange: false,
+                    priority: 1,
+                },
+                {
+                    clinicalAttribute: clinicalAttr,
+                    displayName: clinicalAttr.displayName,
+                    description: clinicalAttr.description,
+                    uniqueKey: 'test1',
+                    dataType: ChartMetaDataTypeEnum.CLINICAL,
+                    patientAttribute: clinicalAttr.patientAttribute,
+                    renderWhenDataChange: true,
+                    priority: 1,
+                },
+                {
+                    clinicalAttribute: clinicalAttr,
+                    displayName: clinicalAttr.displayName,
+                    description: clinicalAttr.description,
+                    uniqueKey: 'test2',
+                    dataType: ChartMetaDataTypeEnum.CLINICAL,
+                    patientAttribute: clinicalAttr.patientAttribute,
+                    renderWhenDataChange: false,
+                    priority: 1,
+                },
+                {
+                    clinicalAttribute: clinicalAttr,
+                    displayName: clinicalAttr.displayName,
+                    description: clinicalAttr.description,
+                    uniqueKey: 'test3',
+                    dataType: ChartMetaDataTypeEnum.CLINICAL,
+                    patientAttribute: clinicalAttr.patientAttribute,
+                    renderWhenDataChange: false,
+                    priority: 1,
+                },
+                {
+                    clinicalAttribute: clinicalAttr,
+                    displayName: clinicalAttr.displayName,
+                    description: clinicalAttr.description,
+                    uniqueKey: 'test4',
+                    dataType: ChartMetaDataTypeEnum.CLINICAL,
+                    patientAttribute: clinicalAttr.patientAttribute,
+                    renderWhenDataChange: false,
+                    priority: 1,
+                },
+            ];
+            visibleAttrsChartDimensions['test0'] = { w: 2, h: 2 };
+            visibleAttrsChartDimensions['test1'] = { w: 2, h: 2 };
+            visibleAttrsChartDimensions['test2'] = { w: 2, h: 1 };
+            visibleAttrsChartDimensions['test3'] = { w: 1, h: 1 };
+            visibleAttrsChartDimensions['test4'] = { w: 1, h: 1 };
+
+            let layout: Layout[] = calculateLayout(
+                visibleAttrs,
+                4,
+                visibleAttrsChartDimensions,
+                []
+            );
             assert.equal(layout.length, 5);
             assert.equal(layout[0].i, 'test0');
             assert.equal(layout[0].x, 0);
@@ -1567,138 +2167,251 @@ describe('StudyViewUtils', () => {
             assert.equal(layout[4].x, 3);
             assert.equal(layout[4].y, 2);
         });
-
     });
 
     describe('getSamplesByExcludingFiltersOnChart', () => {
-        it("Test getQValue", () => {
+        it('Test getQValue', () => {
             assert.equal(getQValue(0), '0');
             assert.equal(getQValue(0.00001), '1.000e-5');
             assert.equal(getQValue(-0.01), '-1.000e-2');
-        })
+        });
     });
 
     describe('getSamplesByExcludingFiltersOnChart', () => {
         let fetchStub: sinon.SinonStub;
         beforeEach(() => {
-            fetchStub = sinon.stub(internalClient, 'fetchFilteredSamplesUsingPOST');
-            fetchStub
-                .returns(Promise.resolve([]));
+            fetchStub = sinon.stub(
+                internalClient,
+                'fetchFilteredSamplesUsingPOST'
+            );
+            fetchStub.returns(Promise.resolve([]));
         });
         afterEach(() => {
             fetchStub.restore();
         });
 
-        it('no filters selected', (done) => {
+        it('no filters selected', done => {
             getSamplesByExcludingFiltersOnChart(
                 UniqueKey.CANCER_STUDIES,
                 emptyStudyViewFilter,
                 {},
                 [{ sampleId: 'sample1', studyId: 'study1' }],
                 ['study1']
-            ).then(() => {
-                assert.isTrue(fetchStub.calledWith({ studyViewFilter: { ...emptyStudyViewFilter, sampleIdentifiers: [{ sampleId: 'sample1', studyId: 'study1' }] } }));
-                done();
-            }).catch(done);
-        });
-
-
-        it('has filter for one chart', (done) => {
+            )
+                .then(() => {
+                    assert.isTrue(
+                        fetchStub.calledWith({
+                            studyViewFilter: {
+                                ...emptyStudyViewFilter,
+                                sampleIdentifiers: [
+                                    { sampleId: 'sample1', studyId: 'study1' },
+                                ],
+                            },
+                        })
+                    );
+                    done();
+                })
+                .catch(done);
+        });
+
+        it('has filter for one chart', done => {
             getSamplesByExcludingFiltersOnChart(
                 UniqueKey.MUTATION_COUNT,
                 emptyStudyViewFilter,
-                { [UniqueKey.CANCER_STUDIES]: [{ sampleId: 'sample1', studyId: 'study1' }] },
-                [{ sampleId: 'sample1', studyId: 'study1' }, { sampleId: 'sample2', studyId: 'study1' }],
+                {
+                    [UniqueKey.CANCER_STUDIES]: [
+                        { sampleId: 'sample1', studyId: 'study1' },
+                    ],
+                },
+                [
+                    { sampleId: 'sample1', studyId: 'study1' },
+                    { sampleId: 'sample2', studyId: 'study1' },
+                ],
                 ['study1']
-            ).then(() => {
-                assert.isTrue(fetchStub.calledWith({ studyViewFilter: { ...emptyStudyViewFilter, sampleIdentifiers: [{ sampleId: 'sample1', studyId: 'study1' }] } }));
-                done();
-            }).catch(done);
-        });
-
-        it('no filters selected and queriedSampleIdentifiers is empty', (done) => {
+            )
+                .then(() => {
+                    assert.isTrue(
+                        fetchStub.calledWith({
+                            studyViewFilter: {
+                                ...emptyStudyViewFilter,
+                                sampleIdentifiers: [
+                                    { sampleId: 'sample1', studyId: 'study1' },
+                                ],
+                            },
+                        })
+                    );
+                    done();
+                })
+                .catch(done);
+        });
+
+        it('no filters selected and queriedSampleIdentifiers is empty', done => {
             getSamplesByExcludingFiltersOnChart(
                 UniqueKey.CANCER_STUDIES,
                 emptyStudyViewFilter,
                 {},
                 [],
                 ['study1']
-            ).then(() => {
-                assert.isTrue(fetchStub.calledWith({ studyViewFilter: { ...emptyStudyViewFilter, studyIds: ['study1'] } }));
-                done();
-            }).catch(done);
-        });
-
-        it('has filter for one chart and queriedSampleIdentifiers is empty', (done) => {
+            )
+                .then(() => {
+                    assert.isTrue(
+                        fetchStub.calledWith({
+                            studyViewFilter: {
+                                ...emptyStudyViewFilter,
+                                studyIds: ['study1'],
+                            },
+                        })
+                    );
+                    done();
+                })
+                .catch(done);
+        });
+
+        it('has filter for one chart and queriedSampleIdentifiers is empty', done => {
             getSamplesByExcludingFiltersOnChart(
                 UniqueKey.MUTATION_COUNT,
                 emptyStudyViewFilter,
-                { [UniqueKey.CANCER_STUDIES]: [{ sampleId: 'sample1', studyId: 'study1' }] },
+                {
+                    [UniqueKey.CANCER_STUDIES]: [
+                        { sampleId: 'sample1', studyId: 'study1' },
+                    ],
+                },
                 [],
                 ['study1']
-            ).then(() => {
-                assert.isTrue(fetchStub.calledWith({ studyViewFilter: { ...emptyStudyViewFilter, sampleIdentifiers: [{ sampleId: 'sample1', studyId: 'study1' }] } }));
-                done();
-            }).catch(done);
+            )
+                .then(() => {
+                    assert.isTrue(
+                        fetchStub.calledWith({
+                            studyViewFilter: {
+                                ...emptyStudyViewFilter,
+                                sampleIdentifiers: [
+                                    { sampleId: 'sample1', studyId: 'study1' },
+                                ],
+                            },
+                        })
+                    );
+                    done();
+                })
+                .catch(done);
         });
     });
 
-    describe('getFilteredSampleIdentifiers', ()=>{
-        let samples:Sample[] = [
-            { sampleId: 'sample1', studyId: 'study1' , sequenced: true , copyNumberSegmentPresent:false},
-            { sampleId: 'sample2', studyId: 'study1' , sequenced: false , copyNumberSegmentPresent: true}
-        ] as any
-        it('when filter function is not present', ()=>{
-            assert.deepEqual(getFilteredSampleIdentifiers([]),[]);
-            assert.deepEqual(getFilteredSampleIdentifiers(samples),[{ sampleId: 'sample1', studyId: 'study1' }, { sampleId: 'sample2', studyId: 'study1' }]);
+    describe('getFilteredSampleIdentifiers', () => {
+        let samples: Sample[] = [
+            {
+                sampleId: 'sample1',
+                studyId: 'study1',
+                sequenced: true,
+                copyNumberSegmentPresent: false,
+            },
+            {
+                sampleId: 'sample2',
+                studyId: 'study1',
+                sequenced: false,
+                copyNumberSegmentPresent: true,
+            },
+        ] as any;
+        it('when filter function is not present', () => {
+            assert.deepEqual(getFilteredSampleIdentifiers([]), []);
+            assert.deepEqual(getFilteredSampleIdentifiers(samples), [
+                { sampleId: 'sample1', studyId: 'study1' },
+                { sampleId: 'sample2', studyId: 'study1' },
+            ]);
         });
 
-        it('when filter function is present', ()=>{
-            assert.deepEqual(getFilteredSampleIdentifiers(samples,  (sample) => sample.sequenced),[{ sampleId: 'sample1', studyId: 'study1' }]);
-            assert.deepEqual(getFilteredSampleIdentifiers(samples,  (sample) => sample.copyNumberSegmentPresent),[{ sampleId: 'sample2', studyId: 'study1' }]);
+        it('when filter function is present', () => {
+            assert.deepEqual(
+                getFilteredSampleIdentifiers(
+                    samples,
+                    sample => sample.sequenced
+                ),
+                [{ sampleId: 'sample1', studyId: 'study1' }]
+            );
+            assert.deepEqual(
+                getFilteredSampleIdentifiers(
+                    samples,
+                    sample => sample.copyNumberSegmentPresent
+                ),
+                [{ sampleId: 'sample2', studyId: 'study1' }]
+            );
         });
     });
 
     describe('showOriginStudiesInSummaryDescription', () => {
         it('hide origin studies in summary description', () => {
             assert.equal(showOriginStudiesInSummaryDescription([], []), false);
-            assert.equal(showOriginStudiesInSummaryDescription([{ studyId: 'CancerStudy1' }] as CancerStudy[], [] as VirtualStudy[]), false);
-            assert.equal(showOriginStudiesInSummaryDescription([{ studyId: 'CancerStudy1' }] as CancerStudy[], [{ id: 'VirtualStudy1' }] as VirtualStudy[]), false);
+            assert.equal(
+                showOriginStudiesInSummaryDescription(
+                    [{ studyId: 'CancerStudy1' }] as CancerStudy[],
+                    [] as VirtualStudy[]
+                ),
+                false
+            );
+            assert.equal(
+                showOriginStudiesInSummaryDescription(
+                    [{ studyId: 'CancerStudy1' }] as CancerStudy[],
+                    [{ id: 'VirtualStudy1' }] as VirtualStudy[]
+                ),
+                false
+            );
         });
         it('show origin studies in summary description', () => {
-            assert.equal(showOriginStudiesInSummaryDescription([], [{ id: 'VirtualStudy1' }] as VirtualStudy[]), true);
+            assert.equal(
+                showOriginStudiesInSummaryDescription([], [
+                    { id: 'VirtualStudy1' },
+                ] as VirtualStudy[]),
+                true
+            );
         });
     });
 
     describe('getFilteredStudiesWithSamples', () => {
-
-        const samples: Sample[] = [{ sampleId: 'sample1', studyId: 'study1', uniqueSampleKey: 'sample1' }] as any;
+        const samples: Sample[] = [
+            {
+                sampleId: 'sample1',
+                studyId: 'study1',
+                uniqueSampleKey: 'sample1',
+            },
+        ] as any;
         const physicalStudies: CancerStudy[] = [{ studyId: 'study1' }] as any;
-        const virtualStudies: VirtualStudy[] = [{
-            id: 'virtualStudy1', data: {
-                name: 'virtual study 1',
-                description: 'virtual study 1',
-                studies: [{ id: 'study1', samples: ['sample1'] }, { id: 'study2', samples: ['sample1'] }]
-            }
-        }] as any;
+        const virtualStudies: VirtualStudy[] = [
+            {
+                id: 'virtualStudy1',
+                data: {
+                    name: 'virtual study 1',
+                    description: 'virtual study 1',
+                    studies: [
+                        { id: 'study1', samples: ['sample1'] },
+                        { id: 'study2', samples: ['sample1'] },
+                    ],
+                },
+            },
+        ] as any;
         it('returns expected results', () => {
             assert.deepEqual(getFilteredStudiesWithSamples([], [], []), []);
-            assert.deepEqual(getFilteredStudiesWithSamples(samples, physicalStudies, []), [{ studyId: 'study1', uniqueSampleKeys: ['sample1'] }] as any);
             assert.deepEqual(
-                getFilteredStudiesWithSamples(samples, physicalStudies, virtualStudies),
+                getFilteredStudiesWithSamples(samples, physicalStudies, []),
+                [{ studyId: 'study1', uniqueSampleKeys: ['sample1'] }] as any
+            );
+            assert.deepEqual(
+                getFilteredStudiesWithSamples(
+                    samples,
+                    physicalStudies,
+                    virtualStudies
+                ),
                 [
                     {
                         studyId: 'study1',
-                        uniqueSampleKeys: ['sample1']
+                        uniqueSampleKeys: ['sample1'],
                     },
                     {
-                        studyId: "virtualStudy1",
-                        name: "virtual study 1",
-                        description: "virtual study 1",
-                        uniqueSampleKeys: [
-                            "sample1"
-                        ]
-                    }] as any);
+                        studyId: 'virtualStudy1',
+                        name: 'virtual study 1',
+                        description: 'virtual study 1',
+                        uniqueSampleKeys: ['sample1'],
+                    },
+                ] as any
+            );
         });
     });
 
@@ -1709,7 +2422,7 @@ describe('StudyViewUtils', () => {
             -2.2499999999999,
             -1,
             -0.6000000000000001,
-            -0.002499999998
+            -0.002499999998,
         ];
 
         const positiveValues = [
@@ -1722,42 +2435,39 @@ describe('StudyViewUtils', () => {
             16.99999999999998,
             16.77,
             16.74,
-            666.666
+            666.666,
         ];
 
-        it ('handles negative values properly', () => {
-            assert.equal(getFrequencyStr(negativeValues[0]), "NA");
-            assert.equal(getFrequencyStr(negativeValues[1]), "NA");
-            assert.equal(getFrequencyStr(negativeValues[2]), "NA");
-            assert.equal(getFrequencyStr(negativeValues[3]), "NA");
-            assert.equal(getFrequencyStr(negativeValues[4]), "NA");
-            assert.equal(getFrequencyStr(negativeValues[5]), "NA");
+        it('handles negative values properly', () => {
+            assert.equal(getFrequencyStr(negativeValues[0]), 'NA');
+            assert.equal(getFrequencyStr(negativeValues[1]), 'NA');
+            assert.equal(getFrequencyStr(negativeValues[2]), 'NA');
+            assert.equal(getFrequencyStr(negativeValues[3]), 'NA');
+            assert.equal(getFrequencyStr(negativeValues[4]), 'NA');
+            assert.equal(getFrequencyStr(negativeValues[5]), 'NA');
         });
 
-        it ('handles zero properly', () => {
-            assert.equal(getFrequencyStr(0), "0%");
+        it('handles zero properly', () => {
+            assert.equal(getFrequencyStr(0), '0%');
         });
 
-        it ('handles positive values properly', () => {
+        it('handles positive values properly', () => {
             //assert.equal(getFrequencyStr(positiveValues[0]), "0.0025");
-            assert.equal(getFrequencyStr(positiveValues[0]), "<0.1%");
-            assert.equal(getFrequencyStr(positiveValues[1]), "0.6%");
-            assert.equal(getFrequencyStr(positiveValues[2]), "1.0%");
-            assert.equal(getFrequencyStr(positiveValues[3]), "1.0%");
-            assert.equal(getFrequencyStr(positiveValues[4]), "1.6%");
-            assert.equal(getFrequencyStr(positiveValues[5]), "1.8%");
-            assert.equal(getFrequencyStr(positiveValues[6]), "17.0%");
-            assert.equal(getFrequencyStr(positiveValues[7]), "16.8%");
-            assert.equal(getFrequencyStr(positiveValues[8]), "16.7%");
-            assert.equal(getFrequencyStr(positiveValues[9]), "666.7%");
+            assert.equal(getFrequencyStr(positiveValues[0]), '<0.1%');
+            assert.equal(getFrequencyStr(positiveValues[1]), '0.6%');
+            assert.equal(getFrequencyStr(positiveValues[2]), '1.0%');
+            assert.equal(getFrequencyStr(positiveValues[3]), '1.0%');
+            assert.equal(getFrequencyStr(positiveValues[4]), '1.6%');
+            assert.equal(getFrequencyStr(positiveValues[5]), '1.8%');
+            assert.equal(getFrequencyStr(positiveValues[6]), '17.0%');
+            assert.equal(getFrequencyStr(positiveValues[7]), '16.8%');
+            assert.equal(getFrequencyStr(positiveValues[8]), '16.7%');
+            assert.equal(getFrequencyStr(positiveValues[9]), '666.7%');
         });
     });
 
     describe('formatFrequency', () => {
-        const negativeValues = [
-            -666.666,
-            -0.002499999998
-        ];
+        const negativeValues = [-666.666, -0.002499999998];
 
         const positiveValues = [
             0.002499999998,
@@ -1769,7 +2479,7 @@ describe('StudyViewUtils', () => {
             16.99999999999998,
             16.77,
             16.74,
-            666.666
+            666.666,
         ];
 
         it('handles negative values properly', () => {
@@ -1797,26 +2507,32 @@ describe('StudyViewUtils', () => {
 
     describe('getClinicalDataCountWithColorByClinicalDataCount', () => {
         it('NA should be placed at the last and also get predefined color for NA', () => {
-            const result = getClinicalDataCountWithColorByClinicalDataCount([{
-                count: 50,
-                value: 'NA'
-            }, {
-                count: 10,
-                value: 'Stage I'
-            }]);
+            const result = getClinicalDataCountWithColorByClinicalDataCount([
+                {
+                    count: 50,
+                    value: 'NA',
+                },
+                {
+                    count: 10,
+                    value: 'Stage I',
+                },
+            ]);
             assert.equal(result.length, 2);
             assert.equal(result[0].value, 'Stage I');
             assert.equal(result[1].color, DEFAULT_NA_COLOR);
         });
 
         it('Test the reserved value', () => {
-            const result = getClinicalDataCountWithColorByClinicalDataCount([{
-                count: 50,
-                value: 'Male'
-            }, {
-                count: 10,
-                value: 'F'
-            }]);
+            const result = getClinicalDataCountWithColorByClinicalDataCount([
+                {
+                    count: 50,
+                    value: 'Male',
+                },
+                {
+                    count: 10,
+                    value: 'F',
+                },
+            ]);
             assert.equal(result.length, 2);
             assert.equal(result[0].color, RESERVED_CLINICAL_VALUE_COLORS.male);
             assert.equal(result[1].color, RESERVED_CLINICAL_VALUE_COLORS.f);
@@ -1825,43 +2541,109 @@ describe('StudyViewUtils', () => {
 
     describe('clinicalDataCountComparator', () => {
         it('returns zero if both NA', () => {
-            assert.equal(clinicalDataCountComparator({value: "NA", count: 1}, {value: "na", count: 666}), 0);
+            assert.equal(
+                clinicalDataCountComparator(
+                    { value: 'NA', count: 1 },
+                    { value: 'na', count: 666 }
+                ),
+                0
+            );
         });
 
         it('returns 1 if a is NA, but not b', () => {
-            assert.equal(clinicalDataCountComparator({value: "NA", count: 666}, {value: "HIGH", count: 66}), 1);
+            assert.equal(
+                clinicalDataCountComparator(
+                    { value: 'NA', count: 666 },
+                    { value: 'HIGH', count: 66 }
+                ),
+                1
+            );
         });
 
         it('returns -1 if b is NA, but not a', () => {
-            assert.equal(clinicalDataCountComparator({value: "FEMALE", count: 6}, {value: "NA", count: 666}), -1);
+            assert.equal(
+                clinicalDataCountComparator(
+                    { value: 'FEMALE', count: 6 },
+                    { value: 'NA', count: 666 }
+                ),
+                -1
+            );
         });
 
         it('returns count difference if none NA', () => {
-            assert.equal(clinicalDataCountComparator({value: "FEMALE", count: 6}, {value: "MALE", count: 16}), 10);
-            assert.equal(clinicalDataCountComparator({value: "FEMALE", count: 16}, {value: "MALE", count: 6}), -10);
-            assert.equal(clinicalDataCountComparator({value: "FEMALE", count: 666}, {value: "MALE", count: 666}), 0);
+            assert.equal(
+                clinicalDataCountComparator(
+                    { value: 'FEMALE', count: 6 },
+                    { value: 'MALE', count: 16 }
+                ),
+                10
+            );
+            assert.equal(
+                clinicalDataCountComparator(
+                    { value: 'FEMALE', count: 16 },
+                    { value: 'MALE', count: 6 }
+                ),
+                -10
+            );
+            assert.equal(
+                clinicalDataCountComparator(
+                    { value: 'FEMALE', count: 666 },
+                    { value: 'MALE', count: 666 }
+                ),
+                0
+            );
         });
     });
 
     describe('chartMetaComparator', () => {
         it('returns 0 if priority and display name are exactly same', () => {
-            assert.equal(chartMetaComparator({priority: 100, displayName: "test chart"} as ChartMeta, {priority: 100, displayName: "test chart"} as ChartMeta), 0);
+            assert.equal(
+                chartMetaComparator(
+                    { priority: 100, displayName: 'test chart' } as ChartMeta,
+                    { priority: 100, displayName: 'test chart' } as ChartMeta
+                ),
+                0
+            );
         });
 
         it('returns difference if priority is higher', () => {
-            assert.equal(chartMetaComparator({priority: 100, displayName: "name b"} as ChartMeta, {priority: 50, displayName: "name a"} as ChartMeta), -50);
+            assert.equal(
+                chartMetaComparator(
+                    { priority: 100, displayName: 'name b' } as ChartMeta,
+                    { priority: 50, displayName: 'name a' } as ChartMeta
+                ),
+                -50
+            );
         });
 
         it('returns difference if priority is lower', () => {
-            assert.equal(chartMetaComparator({priority: 50, displayName: "name a"} as ChartMeta, {priority: 100, displayName: "name b"} as ChartMeta), 50);
+            assert.equal(
+                chartMetaComparator(
+                    { priority: 50, displayName: 'name a' } as ChartMeta,
+                    { priority: 100, displayName: 'name b' } as ChartMeta
+                ),
+                50
+            );
         });
 
         it('when priority is same, returns 1 if displayName is alphabet higher', () => {
-            assert.equal(chartMetaComparator({priority: 100, displayName: "name z"} as ChartMeta, {priority: 100, displayName: "name a"} as ChartMeta), 1);
+            assert.equal(
+                chartMetaComparator(
+                    { priority: 100, displayName: 'name z' } as ChartMeta,
+                    { priority: 100, displayName: 'name a' } as ChartMeta
+                ),
+                1
+            );
         });
 
         it('when priority is same, returns -1 if displayName is alphabet lower', () => {
-            assert.equal(chartMetaComparator({priority: 100, displayName: "name a"} as ChartMeta, {priority: 100, displayName: "name z"} as ChartMeta), -1);
+            assert.equal(
+                chartMetaComparator(
+                    { priority: 100, displayName: 'name a' } as ChartMeta,
+                    { priority: 100, displayName: 'name z' } as ChartMeta
+                ),
+                -1
+            );
         });
     });
 
@@ -1874,7 +2656,7 @@ describe('StudyViewUtils', () => {
             isPending: false,
             isError: false,
             isComplete: true,
-            error: undefined
+            error: undefined,
         };
         const newlyAddedUnfilteredPromise: MobxPromise<any> = {
             result: [],
@@ -1883,7 +2665,7 @@ describe('StudyViewUtils', () => {
             isPending: false,
             isError: false,
             isComplete: true,
-            error: undefined
+            error: undefined,
         };
         const initialVisibleAttributesPromise: MobxPromise<any> = {
             result: [],
@@ -1892,69 +2674,125 @@ describe('StudyViewUtils', () => {
             isPending: false,
             isError: false,
             isComplete: true,
-            error: undefined
+            error: undefined,
         };
         it('initialVisibleAttributesPromise should be used when the chart is default visible attribute and in initial state', () => {
-            const promises = getRequestedAwaitPromisesForClinicalData(true, true, false, false, unfilteredPromise, newlyAddedUnfilteredPromise, initialVisibleAttributesPromise);
+            const promises = getRequestedAwaitPromisesForClinicalData(
+                true,
+                true,
+                false,
+                false,
+                unfilteredPromise,
+                newlyAddedUnfilteredPromise,
+                initialVisibleAttributesPromise
+            );
             assert.equal(promises.length, 1);
             assert.isTrue(promises[0] === initialVisibleAttributesPromise);
         });
         it('newlyAddedUnfilteredPromise should be used when the chart is not default visible attribute, at the time the chart is not filtered', () => {
-            const promises = getRequestedAwaitPromisesForClinicalData(false, true, false,  false, unfilteredPromise, newlyAddedUnfilteredPromise, initialVisibleAttributesPromise);
+            const promises = getRequestedAwaitPromisesForClinicalData(
+                false,
+                true,
+                false,
+                false,
+                unfilteredPromise,
+                newlyAddedUnfilteredPromise,
+                initialVisibleAttributesPromise
+            );
             assert.equal(promises.length, 1);
             assert.isTrue(promises[0] === newlyAddedUnfilteredPromise);
         });
         it('unfilteredPromise should be used when there are filters applied, but attribute is unfiltered, ignore whether the chart is default visible attribute', () => {
-            let promises = getRequestedAwaitPromisesForClinicalData(true, false, true,  false, unfilteredPromise, newlyAddedUnfilteredPromise, initialVisibleAttributesPromise);
+            let promises = getRequestedAwaitPromisesForClinicalData(
+                true,
+                false,
+                true,
+                false,
+                unfilteredPromise,
+                newlyAddedUnfilteredPromise,
+                initialVisibleAttributesPromise
+            );
             assert.equal(promises.length, 1);
             assert.isTrue(promises[0] === unfilteredPromise);
 
-            promises = getRequestedAwaitPromisesForClinicalData(false, false, true,  false, unfilteredPromise, newlyAddedUnfilteredPromise, initialVisibleAttributesPromise);
+            promises = getRequestedAwaitPromisesForClinicalData(
+                false,
+                false,
+                true,
+                false,
+                unfilteredPromise,
+                newlyAddedUnfilteredPromise,
+                initialVisibleAttributesPromise
+            );
             assert.equal(promises.length, 1);
             assert.isTrue(promises[0] === unfilteredPromise);
         });
 
         it('unfilteredPromise should be used when there are filters applied, when it is newly added chart', () => {
-            let promises = getRequestedAwaitPromisesForClinicalData(true, false, true, false, unfilteredPromise, newlyAddedUnfilteredPromise, initialVisibleAttributesPromise);
+            let promises = getRequestedAwaitPromisesForClinicalData(
+                true,
+                false,
+                true,
+                false,
+                unfilteredPromise,
+                newlyAddedUnfilteredPromise,
+                initialVisibleAttributesPromise
+            );
             assert.equal(promises.length, 1);
             assert.isTrue(promises[0] === unfilteredPromise);
         });
 
         it('When chart is filtered and not in initial state, empty array should be returned. Ignore whether the chart is default visible attribute', () => {
-            let promises = getRequestedAwaitPromisesForClinicalData(true, false, true,  true, unfilteredPromise, newlyAddedUnfilteredPromise, initialVisibleAttributesPromise);
+            let promises = getRequestedAwaitPromisesForClinicalData(
+                true,
+                false,
+                true,
+                true,
+                unfilteredPromise,
+                newlyAddedUnfilteredPromise,
+                initialVisibleAttributesPromise
+            );
             assert.equal(promises.length, 0);
 
-            promises = getRequestedAwaitPromisesForClinicalData(false, false, true,  true, unfilteredPromise, newlyAddedUnfilteredPromise, initialVisibleAttributesPromise);
+            promises = getRequestedAwaitPromisesForClinicalData(
+                false,
+                false,
+                true,
+                true,
+                unfilteredPromise,
+                newlyAddedUnfilteredPromise,
+                initialVisibleAttributesPromise
+            );
             assert.equal(promises.length, 0);
         });
-    })
+    });
 
     describe('getPriorityByClinicalAttribute', () => {
         it('The priority from database needs to overwrite the frontned config in the frontend', () => {
             let attr = {
-                'clinicalAttributeId': 'AGE',
-                'datatype': 'STRING',
-                'description': '',
-                'displayName': '',
-                'patientAttribute': true,
-                'priority': '10',
-                'studyId': ''
+                clinicalAttributeId: 'AGE',
+                datatype: 'STRING',
+                description: '',
+                displayName: '',
+                patientAttribute: true,
+                priority: '10',
+                studyId: '',
             };
             assert.equal(getPriorityByClinicalAttribute(attr), 10);
         });
         it('The frontned config priority should be used when the DB priority is set to default', () => {
             let attr = {
-                'clinicalAttributeId': 'AGE',
-                'datatype': 'STRING',
-                'description': '',
-                'displayName': '',
-                'patientAttribute': true,
-                'priority': '1',
-                'studyId': ''
+                clinicalAttributeId: 'AGE',
+                datatype: 'STRING',
+                description: '',
+                displayName: '',
+                patientAttribute: true,
+                priority: '1',
+                studyId: '',
             };
             assert.equal(getPriorityByClinicalAttribute(attr), 9);
         });
-    })
+    });
 
     describe('getClinicalEqualityFilterValuesByString', () => {
         it('the values should be separated by comma', () => {
@@ -1967,13 +2805,17 @@ describe('StudyViewUtils', () => {
         });
 
         it('Allow using back slash to escape the comma actually in the content', () => {
-            let result = getClinicalEqualityFilterValuesByString('test1\\,test2');
+            let result = getClinicalEqualityFilterValuesByString(
+                'test1\\,test2'
+            );
             assert.equal(result.length, 1);
             assert.equal(result[0], 'test1,test2');
         });
 
         it('Allow using back slash to escape the comma actually in the content, multiple instances', () => {
-            let result = getClinicalEqualityFilterValuesByString('test1\\,test2,test3, test4\\,test5\\,test6');
+            let result = getClinicalEqualityFilterValuesByString(
+                'test1\\,test2,test3, test4\\,test5\\,test6'
+            );
             assert.equal(result.length, 3);
             assert.equal(result[0], 'test1,test2');
             assert.equal(result[1], 'test3');
@@ -1983,39 +2825,78 @@ describe('StudyViewUtils', () => {
 
     describe('getClinicalDataCountWithColorByCategoryCounts', () => {
         it('When both counts are zero', () => {
-            assert.deepEqual([], getClinicalDataCountWithColorByCategoryCounts(0, 0))
+            assert.deepEqual(
+                [],
+                getClinicalDataCountWithColorByCategoryCounts(0, 0)
+            );
         });
         it('When only yesCount is > 0', () => {
-            assert.deepEqual([{ count: 10, value: "YES", color: CLI_YES_COLOR, freq: '100.0%', percentage: 1 }], getClinicalDataCountWithColorByCategoryCounts(10, 0))
+            assert.deepEqual(
+                [
+                    {
+                        count: 10,
+                        value: 'YES',
+                        color: CLI_YES_COLOR,
+                        freq: '100.0%',
+                        percentage: 1,
+                    },
+                ],
+                getClinicalDataCountWithColorByCategoryCounts(10, 0)
+            );
         });
         it('When only noCount is > 0', () => {
-            assert.deepEqual([{ count: 10, value: "NO", color: CLI_NO_COLOR, freq: '100.0%', percentage: 1 }], getClinicalDataCountWithColorByCategoryCounts(0, 10))
+            assert.deepEqual(
+                [
+                    {
+                        count: 10,
+                        value: 'NO',
+                        color: CLI_NO_COLOR,
+                        freq: '100.0%',
+                        percentage: 1,
+                    },
+                ],
+                getClinicalDataCountWithColorByCategoryCounts(0, 10)
+            );
         });
         it('When both counts are > 0', () => {
             assert.deepEqual(
                 [
-                    { count: 10, value: "YES", color: CLI_YES_COLOR, freq: '50.0%', percentage: 0.5 },
-                    { count: 10, value: "NO", color: CLI_NO_COLOR , freq: '50.0%', percentage: 0.5}
-                ], getClinicalDataCountWithColorByCategoryCounts(10, 10))
+                    {
+                        count: 10,
+                        value: 'YES',
+                        color: CLI_YES_COLOR,
+                        freq: '50.0%',
+                        percentage: 0.5,
+                    },
+                    {
+                        count: 10,
+                        value: 'NO',
+                        color: CLI_NO_COLOR,
+                        freq: '50.0%',
+                        percentage: 0.5,
+                    },
+                ],
+                getClinicalDataCountWithColorByCategoryCounts(10, 10)
+            );
         });
     });
 
-    describe ('calculateNewLayoutForFocusedChart', () => {
+    describe('calculateNewLayoutForFocusedChart', () => {
         it('should return the previous x, y, and new chartMeta dimension for not overflow position', () => {
             const clinicalAttr: ClinicalAttribute = {
-                'clinicalAttributeId': 'test',
-                'datatype': 'STRING',
-                'description': '',
-                'displayName': '',
-                'patientAttribute': true,
-                'priority': '1',
-                'studyId': ''
+                clinicalAttributeId: 'test',
+                datatype: 'STRING',
+                description: '',
+                displayName: '',
+                patientAttribute: true,
+                priority: '1',
+                studyId: '',
             };
             const layout = {
                 x: 1,
                 y: 1,
                 w: 1,
-                h: 1
+                h: 1,
             };
             const focusedChartMeta = {
                 clinicalAttribute: clinicalAttr,
@@ -2027,9 +2908,14 @@ describe('StudyViewUtils', () => {
                 renderWhenDataChange: false,
                 priority: 1,
             };
-            const focusedChartDimension = {w: 2, h: 2};
+            const focusedChartDimension = { w: 2, h: 2 };
             const cols = 5;
-            const newLayout = calculateNewLayoutForFocusedChart(layout, focusedChartMeta, cols, focusedChartDimension);
+            const newLayout = calculateNewLayoutForFocusedChart(
+                layout,
+                focusedChartMeta,
+                cols,
+                focusedChartDimension
+            );
             assert.equal(newLayout.i, 'test');
             assert.equal(newLayout.x, 1);
             assert.equal(newLayout.y, 1);
@@ -2040,19 +2926,19 @@ describe('StudyViewUtils', () => {
 
         it('should return the fixed x, previous y, and new chartMeta dimension for the overflow positions', () => {
             const clinicalAttr: ClinicalAttribute = {
-                'clinicalAttributeId': 'test',
-                'datatype': 'STRING',
-                'description': '',
-                'displayName': '',
-                'patientAttribute': true,
-                'priority': '1',
-                'studyId': ''
+                clinicalAttributeId: 'test',
+                datatype: 'STRING',
+                description: '',
+                displayName: '',
+                patientAttribute: true,
+                priority: '1',
+                studyId: '',
             };
             const layout = {
                 x: 4,
                 y: 1,
                 w: 1,
-                h: 1
+                h: 1,
             };
             const focusedChartMeta = {
                 clinicalAttribute: clinicalAttr,
@@ -2064,9 +2950,14 @@ describe('StudyViewUtils', () => {
                 renderWhenDataChange: false,
                 priority: 1,
             };
-            const focusedChartDimension = {w: 2, h: 2};
+            const focusedChartDimension = { w: 2, h: 2 };
             const cols = 5;
-            const newLayout = calculateNewLayoutForFocusedChart(layout, focusedChartMeta, cols, focusedChartDimension);
+            const newLayout = calculateNewLayoutForFocusedChart(
+                layout,
+                focusedChartMeta,
+                cols,
+                focusedChartDimension
+            );
             assert.equal(newLayout.i, 'test');
             assert.equal(newLayout.x, 3);
             assert.equal(newLayout.y, 1);
@@ -2077,19 +2968,19 @@ describe('StudyViewUtils', () => {
 
         it('should return the fixed x, previous y, and new chartMeta dimension for the shrunk chart', () => {
             const clinicalAttr: ClinicalAttribute = {
-                'clinicalAttributeId': 'test',
-                'datatype': 'STRING',
-                'description': '',
-                'displayName': '',
-                'patientAttribute': true,
-                'priority': '1',
-                'studyId': ''
+                clinicalAttributeId: 'test',
+                datatype: 'STRING',
+                description: '',
+                displayName: '',
+                patientAttribute: true,
+                priority: '1',
+                studyId: '',
             };
             const layout = {
                 x: 1,
                 y: 1,
                 w: 2,
-                h: 2
+                h: 2,
             };
             const focusedChartMeta = {
                 clinicalAttribute: clinicalAttr,
@@ -2101,9 +2992,14 @@ describe('StudyViewUtils', () => {
                 renderWhenDataChange: false,
                 priority: 1,
             };
-            const focusedChartDimension = {w: 1, h: 1};
+            const focusedChartDimension = { w: 1, h: 1 };
             const cols = 5;
-            const newLayout = calculateNewLayoutForFocusedChart(layout, focusedChartMeta, cols, focusedChartDimension);
+            const newLayout = calculateNewLayoutForFocusedChart(
+                layout,
+                focusedChartMeta,
+                cols,
+                focusedChartDimension
+            );
             assert.equal(newLayout.i, 'test');
             assert.equal(newLayout.x, 2);
             assert.equal(newLayout.y, 1);
@@ -2111,9 +3007,9 @@ describe('StudyViewUtils', () => {
             assert.equal(newLayout.h, 1);
             assert.equal(newLayout.isResizable, false);
         });
-    })
+    });
 
-    describe ('generateMatrixByLayout', () => {
+    describe('generateMatrixByLayout', () => {
         it('should return the generated matrix', () => {
             const layout = {
                 i: 'test',
@@ -2121,7 +3017,7 @@ describe('StudyViewUtils', () => {
                 y: 1,
                 w: 1,
                 h: 1,
-                isResizable: false
+                isResizable: false,
             };
             const cols = 5;
             const matrix = generateMatrixByLayout(layout, cols);
@@ -2135,22 +3031,34 @@ describe('StudyViewUtils', () => {
                 }
             }
         });
-    })
+    });
 
-    describe ('isFocusedChartShrunk', () => {
-        const largeDimension = {w: 2, h: 2};
-        const smallDimension = {w: 1, h: 1};
+    describe('isFocusedChartShrunk', () => {
+        const largeDimension = { w: 2, h: 2 };
+        const smallDimension = { w: 1, h: 1 };
         it('should return true if the chart shrunk', () => {
-            assert.equal(isFocusedChartShrunk(largeDimension, smallDimension), true);
+            assert.equal(
+                isFocusedChartShrunk(largeDimension, smallDimension),
+                true
+            );
         });
         it('should return false if the chart not shrunk', () => {
-            assert.equal(isFocusedChartShrunk(smallDimension, largeDimension), false);
+            assert.equal(
+                isFocusedChartShrunk(smallDimension, largeDimension),
+                false
+            );
         });
         it('should return false if the dimension is not changed', () => {
-            assert.equal(isFocusedChartShrunk(smallDimension, smallDimension), false);
-            assert.equal(isFocusedChartShrunk(largeDimension, largeDimension), false);
+            assert.equal(
+                isFocusedChartShrunk(smallDimension, smallDimension),
+                false
+            );
+            assert.equal(
+                isFocusedChartShrunk(largeDimension, largeDimension),
+                false
+            );
         });
-    })
+    });
 
     const layoutForPositionTest = [
         {
@@ -2158,39 +3066,57 @@ describe('StudyViewUtils', () => {
             x: 1,
             y: 1,
             w: 1,
-            h: 1
-        } as Layout
+            h: 1,
+        } as Layout,
     ];
 
-    describe ('getPositionXByUniqueKey', () => {
+    describe('getPositionXByUniqueKey', () => {
         it('should return undefined for the not exist uniqueKey', () => {
-            assert.equal(getPositionXByUniqueKey(layoutForPositionTest, 'test1'), undefined);
+            assert.equal(
+                getPositionXByUniqueKey(layoutForPositionTest, 'test1'),
+                undefined
+            );
             assert.equal(getPositionXByUniqueKey([], 'test'), undefined);
             assert.equal(getPositionXByUniqueKey([], ''), undefined);
         });
         it('should return the X value of the layout which matches the uniqueKey', () => {
-            assert.equal(getPositionXByUniqueKey(layoutForPositionTest, 'test'), 1);
+            assert.equal(
+                getPositionXByUniqueKey(layoutForPositionTest, 'test'),
+                1
+            );
         });
-    })
+    });
 
-    describe ('getPositionYByUniqueKey', () => {
+    describe('getPositionYByUniqueKey', () => {
         it('should return undefined for the not exist uniqueKey', () => {
-            assert.equal(getPositionYByUniqueKey(layoutForPositionTest, 'test1'), undefined);
+            assert.equal(
+                getPositionYByUniqueKey(layoutForPositionTest, 'test1'),
+                undefined
+            );
             assert.equal(getPositionYByUniqueKey([], 'test'), undefined);
             assert.equal(getPositionYByUniqueKey([], ''), undefined);
         });
         it('should return the Y value of the layout which matches the uniqueKey', () => {
-            assert.equal(getPositionYByUniqueKey(layoutForPositionTest, 'test'), 1);
+            assert.equal(
+                getPositionYByUniqueKey(layoutForPositionTest, 'test'),
+                1
+            );
         });
-    })
+    });
 
-    describe("getStudyViewTabId", ()=>{
-        it("gets study view tab id correctly", ()=>{
-            assert.equal(getStudyViewTabId("study"), undefined);
-            assert.equal(getStudyViewTabId("study/"), undefined);
-            assert.equal(getStudyViewTabId("study/asdf"), "asdf" as any);
-            assert.equal(getStudyViewTabId("study/summary"), StudyViewPageTabKeyEnum.SUMMARY);
-            assert.equal(getStudyViewTabId("study/summary/"), StudyViewPageTabKeyEnum.SUMMARY);
+    describe('getStudyViewTabId', () => {
+        it('gets study view tab id correctly', () => {
+            assert.equal(getStudyViewTabId('study'), undefined);
+            assert.equal(getStudyViewTabId('study/'), undefined);
+            assert.equal(getStudyViewTabId('study/asdf'), 'asdf' as any);
+            assert.equal(
+                getStudyViewTabId('study/summary'),
+                StudyViewPageTabKeyEnum.SUMMARY
+            );
+            assert.equal(
+                getStudyViewTabId('study/summary/'),
+                StudyViewPageTabKeyEnum.SUMMARY
+            );
         });
     });
 
@@ -2204,166 +3130,202 @@ describe('StudyViewUtils', () => {
         it('Test a valid bin', () => {
             assert.isTrue(customBinsAreValid(['1', '2']));
         });
-    })
+    });
 
-    describe("formatRange", () => {
-        it("should format min max range with no special value", () => {
-            const actual = formatRange(1.5, 2.5, undefined)
-            const expected = "1.5-2.5";
+    describe('formatRange', () => {
+        it('should format min max range with no special value', () => {
+            const actual = formatRange(1.5, 2.5, undefined);
+            const expected = '1.5-2.5';
             assert.equal(actual, expected);
         });
 
-        it("should format min max range with special value", () => {
-            const actual = formatRange(1, 2, "Foo ");
-            const expected = "Foo 1-2";
+        it('should format min max range with special value', () => {
+            const actual = formatRange(1, 2, 'Foo ');
+            const expected = 'Foo 1-2';
 
             assert.equal(actual, expected);
         });
 
-        it("should format min range with special value", () => {
-            const acutal = formatRange(1, undefined, "<=");
-            const expected = "≤1";
+        it('should format min range with special value', () => {
+            const acutal = formatRange(1, undefined, '<=');
+            const expected = '≤1';
 
             assert.equal(acutal, expected);
         });
 
-        it("should format max range with special value", () => {
-            const actual = formatRange(undefined, 2, ">=");
-            const expected = "≥2";
+        it('should format max range with special value', () => {
+            const actual = formatRange(undefined, 2, '>=');
+            const expected = '≥2';
 
             assert.equal(actual, expected);
         });
 
-        it("should format min max range where min = max", () => {
+        it('should format min max range where min = max', () => {
             const actual = formatRange(10, 10, undefined);
-            const expected = "10";
+            const expected = '10';
 
             assert.equal(actual, expected);
         });
     });
 
-    describe("getBinName", () => {
-        it("should return correct bin name", () => {
-            assert.equal(getBinName({ specialValue:"NA" } as any), "NA");
-            assert.equal(getBinName({ start:10, end:20 } as any), "10-20");
-            assert.equal(getBinName({ start:10, specialValue:"<=" } as any), "<=10");
-            assert.equal(getBinName({ specialValue:">", end:20 } as any), ">20");
+    describe('getBinName', () => {
+        it('should return correct bin name', () => {
+            assert.equal(getBinName({ specialValue: 'NA' } as any), 'NA');
+            assert.equal(getBinName({ start: 10, end: 20 } as any), '10-20');
+            assert.equal(
+                getBinName({ start: 10, specialValue: '<=' } as any),
+                '<=10'
+            );
+            assert.equal(
+                getBinName({ specialValue: '>', end: 20 } as any),
+                '>20'
+            );
         });
     });
 
-    describe("getGroupedClinicalDataByBins", () => {
-
-        let clinicalData = [{
-            patientId: 'patient1',
-            sampleId: 'sample1',
-            studyId: 'study1',
-            uniquePatientKey: 'patient1',
-            value: 10
-        }, {
-            patientId: 'patient2',
-            sampleId: 'sample2',
-            studyId: 'study1',
-            uniquePatientKey: 'patient2',
-            value: 11
-        }, {
-            patientId: 'patient3',
-            sampleId: 'sample3',
-            studyId: 'study1',
-            uniquePatientKey: 'patient3',
-            value: 20
-        }, {
-            patientId: 'patient4',
-            sampleId: 'sample4',
-            studyId: 'study1',
-            uniquePatientKey: 'patient4',
-            value: 30
-        }, {
-            patientId: 'patient5',
-            sampleId: 'sample5',
-            studyId: 'study1',
-            uniquePatientKey: 'patient5',
-            value: 40
-        }, {
-            patientId: 'patient6',
-            sampleId: 'sample6',
-            studyId: 'study1',
-            uniquePatientKey: 'patient6',
-            value: 45
-        }, {
-            patientId: 'patient7',
-            sampleId: 'sample7',
-            studyId: 'study1',
-            uniquePatientKey: 'patient7',
-            value: 'NA'
-        }]
-
-        let dataBins = [{
-            'end': 10,
-            'specialValue': '<='
-        }, {
-            'start': 10,
-            'end': 20,
-        }, {
-            'start': 20,
-            'end': 40,
-        }, {
-            'start': 40,
-            'specialValue': '>'
-        }, {
-            'specialValue': 'NA'
-        }]
-
-
-        it("should return grouped clinicalData by bins", () => {
-            assert.deepEqual(getGroupedClinicalDataByBins(clinicalData as any, dataBins as any), {
-                "<=10": [{
-                    "patientId": "patient1",
-                    "sampleId": "sample1",
-                    "studyId": "study1",
-                    "uniquePatientKey": "patient1",
-                    "value": 10
-                }],
-                "10-20": [{
-                    "patientId": "patient2",
-                    "sampleId": "sample2",
-                    "studyId": "study1",
-                    "uniquePatientKey": "patient2",
-                    "value": 11
-                }, {
-                    "patientId": "patient3",
-                    "sampleId": "sample3",
-                    "studyId": "study1",
-                    "uniquePatientKey": "patient3",
-                    "value": 20
-                }],
-                "20-40": [{
-                    "patientId": "patient4",
-                    "sampleId": "sample4",
-                    "studyId": "study1",
-                    "uniquePatientKey": "patient4",
-                    "value": 30
-                }, {
-                    "patientId": "patient5",
-                    "sampleId": "sample5",
-                    "studyId": "study1",
-                    "uniquePatientKey": "patient5",
-                    "value": 40
-                }],
-                ">40": [{
-                    "patientId": "patient6",
-                    "sampleId": "sample6",
-                    "studyId": "study1",
-                    "uniquePatientKey": "patient6",
-                    "value": 45
-                }],
-                "NA": [{
-                    "patientId": "patient7",
-                    "sampleId": "sample7",
-                    "studyId": "study1",
-                    "uniquePatientKey": "patient7",
-                    "value": "NA"
-                }]
-            } as any);
+    describe('getGroupedClinicalDataByBins', () => {
+        let clinicalData = [
+            {
+                patientId: 'patient1',
+                sampleId: 'sample1',
+                studyId: 'study1',
+                uniquePatientKey: 'patient1',
+                value: 10,
+            },
+            {
+                patientId: 'patient2',
+                sampleId: 'sample2',
+                studyId: 'study1',
+                uniquePatientKey: 'patient2',
+                value: 11,
+            },
+            {
+                patientId: 'patient3',
+                sampleId: 'sample3',
+                studyId: 'study1',
+                uniquePatientKey: 'patient3',
+                value: 20,
+            },
+            {
+                patientId: 'patient4',
+                sampleId: 'sample4',
+                studyId: 'study1',
+                uniquePatientKey: 'patient4',
+                value: 30,
+            },
+            {
+                patientId: 'patient5',
+                sampleId: 'sample5',
+                studyId: 'study1',
+                uniquePatientKey: 'patient5',
+                value: 40,
+            },
+            {
+                patientId: 'patient6',
+                sampleId: 'sample6',
+                studyId: 'study1',
+                uniquePatientKey: 'patient6',
+                value: 45,
+            },
+            {
+                patientId: 'patient7',
+                sampleId: 'sample7',
+                studyId: 'study1',
+                uniquePatientKey: 'patient7',
+                value: 'NA',
+            },
+        ];
+
+        let dataBins = [
+            {
+                end: 10,
+                specialValue: '<=',
+            },
+            {
+                start: 10,
+                end: 20,
+            },
+            {
+                start: 20,
+                end: 40,
+            },
+            {
+                start: 40,
+                specialValue: '>',
+            },
+            {
+                specialValue: 'NA',
+            },
+        ];
+
+        it('should return grouped clinicalData by bins', () => {
+            assert.deepEqual(
+                getGroupedClinicalDataByBins(
+                    clinicalData as any,
+                    dataBins as any
+                ),
+                {
+                    '<=10': [
+                        {
+                            patientId: 'patient1',
+                            sampleId: 'sample1',
+                            studyId: 'study1',
+                            uniquePatientKey: 'patient1',
+                            value: 10,
+                        },
+                    ],
+                    '10-20': [
+                        {
+                            patientId: 'patient2',
+                            sampleId: 'sample2',
+                            studyId: 'study1',
+                            uniquePatientKey: 'patient2',
+                            value: 11,
+                        },
+                        {
+                            patientId: 'patient3',
+                            sampleId: 'sample3',
+                            studyId: 'study1',
+                            uniquePatientKey: 'patient3',
+                            value: 20,
+                        },
+                    ],
+                    '20-40': [
+                        {
+                            patientId: 'patient4',
+                            sampleId: 'sample4',
+                            studyId: 'study1',
+                            uniquePatientKey: 'patient4',
+                            value: 30,
+                        },
+                        {
+                            patientId: 'patient5',
+                            sampleId: 'sample5',
+                            studyId: 'study1',
+                            uniquePatientKey: 'patient5',
+                            value: 40,
+                        },
+                    ],
+                    '>40': [
+                        {
+                            patientId: 'patient6',
+                            sampleId: 'sample6',
+                            studyId: 'study1',
+                            uniquePatientKey: 'patient6',
+                            value: 45,
+                        },
+                    ],
+                    NA: [
+                        {
+                            patientId: 'patient7',
+                            sampleId: 'sample7',
+                            studyId: 'study1',
+                            uniquePatientKey: 'patient7',
+                            value: 'NA',
+                        },
+                    ],
+                } as any
+            );
         });
     });
 });
diff --git a/src/pages/studyView/StudyViewUtils.tsx b/src/pages/studyView/StudyViewUtils.tsx
index 88f1aa02392..a9324525b73 100644
--- a/src/pages/studyView/StudyViewUtils.tsx
+++ b/src/pages/studyView/StudyViewUtils.tsx
@@ -1,36 +1,59 @@
-import _ from "lodash";
-import {SingleGeneQuery} from "shared/lib/oql/oql-parser";
-import {unparseOQLQueryLine} from "shared/lib/oql/oqlfilter";
+import _ from 'lodash';
+import { SingleGeneQuery } from 'shared/lib/oql/oql-parser';
+import { unparseOQLQueryLine } from 'shared/lib/oql/oqlfilter';
 import {
     ClinicalDataCount,
     DataBin,
     SampleIdentifier,
     StudyViewFilter,
     ClinicalDataBinFilter,
-    ClinicalDataFilterValue
-} from "shared/api/generated/CBioPortalAPIInternal";
-import {CancerStudy, ClinicalAttribute, Gene, PatientIdentifier, Sample, ClinicalData} from "shared/api/generated/CBioPortalAPI";
-import * as React from "react";
-import {buildCBioPortalPageUrl} from "../../shared/api/urls";
-import {BarDatum} from "./charts/barChart/BarChart";
-import { ChartUserSetting, CustomChart } from "./StudyViewPageStore";
-import { StudyViewPageTabKeyEnum } from "pages/studyView/StudyViewPageTabs";
-
-import {Layout} from 'react-grid-layout';
-import internalClient from "shared/api/cbioportalInternalClientInstance";
-import {VirtualStudy} from "shared/model/VirtualStudy";
-import defaultClient from "shared/api/cbioportalClientInstance";
-import {ChartDimension, ChartTypeEnum, Position, STUDY_VIEW_CONFIG} from "./StudyViewConfig";
-import {IStudyViewDensityScatterPlotDatum} from "./charts/scatterPlot/StudyViewDensityScatterPlot";
+    ClinicalDataFilterValue,
+} from 'shared/api/generated/CBioPortalAPIInternal';
+import {
+    CancerStudy,
+    ClinicalAttribute,
+    Gene,
+    PatientIdentifier,
+    Sample,
+    ClinicalData,
+} from 'shared/api/generated/CBioPortalAPI';
+import * as React from 'react';
+import { buildCBioPortalPageUrl } from '../../shared/api/urls';
+import { BarDatum } from './charts/barChart/BarChart';
+import { ChartUserSetting, CustomChart } from './StudyViewPageStore';
+import { StudyViewPageTabKeyEnum } from 'pages/studyView/StudyViewPageTabs';
+
+import { Layout } from 'react-grid-layout';
+import internalClient from 'shared/api/cbioportalInternalClientInstance';
+import { VirtualStudy } from 'shared/model/VirtualStudy';
+import defaultClient from 'shared/api/cbioportalClientInstance';
+import {
+    ChartDimension,
+    ChartTypeEnum,
+    Position,
+    STUDY_VIEW_CONFIG,
+} from './StudyViewConfig';
+import { IStudyViewDensityScatterPlotDatum } from './charts/scatterPlot/StudyViewDensityScatterPlot';
 import MobxPromise from 'mobxpromise';
-import {getTextWidth, stringListToIndexSet} from "cbioportal-frontend-commons";
-import {CNA_COLOR_AMP, CNA_COLOR_HOMDEL, DEFAULT_NA_COLOR, getClinicalValueColor} from "shared/lib/Colors";
-import {StudyViewComparisonGroup} from "../groupComparison/GroupComparisonUtils";
+import {
+    getTextWidth,
+    stringListToIndexSet,
+} from 'cbioportal-frontend-commons';
+import {
+    CNA_COLOR_AMP,
+    CNA_COLOR_HOMDEL,
+    DEFAULT_NA_COLOR,
+    getClinicalValueColor,
+} from 'shared/lib/Colors';
+import { StudyViewComparisonGroup } from '../groupComparison/GroupComparisonUtils';
 import styles from './styles.module.scss';
-import { getGroupParameters, getStudiesAttr } from "pages/groupComparison/comparisonGroupManager/ComparisonGroupManagerUtils";
-import { SessionGroupData } from "shared/api/ComparisonGroupClient";
-import { IStudyViewScatterPlotData } from "./charts/scatterPlot/StudyViewScatterPlotUtils";
-import { CNA_TO_ALTERATION } from "pages/resultsView/enrichments/EnrichmentsUtil";
+import {
+    getGroupParameters,
+    getStudiesAttr,
+} from 'pages/groupComparison/comparisonGroupManager/ComparisonGroupManagerUtils';
+import { SessionGroupData } from 'shared/api/ComparisonGroupClient';
+import { IStudyViewScatterPlotData } from './charts/scatterPlot/StudyViewScatterPlotUtils';
+import { CNA_TO_ALTERATION } from 'pages/resultsView/enrichments/EnrichmentsUtil';
 
 // Cannot use ClinicalDataTypeEnum here for the strong type. The model in the type is not strongly typed
 export enum ClinicalDataTypeEnum {
@@ -40,18 +63,18 @@ export enum ClinicalDataTypeEnum {
 
 export enum NumericalGroupComparisonType {
     QUARTILES = 'QUARTILES',
-    MEDIAN='MEDIAN',
-    BINS = 'BINS'
+    MEDIAN = 'MEDIAN',
+    BINS = 'BINS',
 }
 
 export enum DataType {
     STRING = 'STRING',
-    NUMBER = "NUMBER"
+    NUMBER = 'NUMBER',
 }
 
 export type ClinicalDataType = 'SAMPLE' | 'PATIENT';
 export type ChartType =
-    'PIE_CHART'
+    | 'PIE_CHART'
     | 'BAR_CHART'
     | 'SURVIVAL'
     | 'TABLE'
@@ -71,70 +94,78 @@ export enum UniqueKey {
     DISEASE_FREE_SURVIVAL = 'DFS_SURVIVAL',
     OVERALL_SURVIVAL = 'OS_SURVIVAL',
     CANCER_STUDIES = 'CANCER_STUDIES',
-    MUTATION_COUNT = "MUTATION_COUNT",
-    FRACTION_GENOME_ALTERED = "FRACTION_GENOME_ALTERED",
-    WITH_MUTATION_DATA = "WITH_MUTATION_DATA",
-    WITH_FUSION_DATA = "WITH_FUSION_DATA",
-    WITH_CNA_DATA = "WITH_CNA_DATA"
-}
-
-export type AnalysisGroup = { name?:string, value: string, color: string, legendText?: string };
+    MUTATION_COUNT = 'MUTATION_COUNT',
+    FRACTION_GENOME_ALTERED = 'FRACTION_GENOME_ALTERED',
+    WITH_MUTATION_DATA = 'WITH_MUTATION_DATA',
+    WITH_FUSION_DATA = 'WITH_FUSION_DATA',
+    WITH_CNA_DATA = 'WITH_CNA_DATA',
+}
+
+export type AnalysisGroup = {
+    name?: string;
+    value: string;
+    color: string;
+    legendText?: string;
+};
 
 export enum ChartMetaDataTypeEnum {
     CLINICAL = 'CLINICAL',
-    GENOMIC = 'GENOMIC'
+    GENOMIC = 'GENOMIC',
 }
 
-export type ChartMetaDataType = ChartMetaDataTypeEnum.CLINICAL | ChartMetaDataTypeEnum.GENOMIC;
+export type ChartMetaDataType =
+    | ChartMetaDataTypeEnum.CLINICAL
+    | ChartMetaDataTypeEnum.GENOMIC;
 export type ChartMeta = {
-    clinicalAttribute?: ClinicalAttribute,
-    uniqueKey: string,
-    displayName: string,
-    description: string,
-    priority: number,
-    dataType: ChartMetaDataType,
-    patientAttribute: boolean,
-    renderWhenDataChange: boolean
-}
+    clinicalAttribute?: ClinicalAttribute;
+    uniqueKey: string;
+    displayName: string;
+    description: string;
+    priority: number;
+    dataType: ChartMetaDataType;
+    patientAttribute: boolean;
+    renderWhenDataChange: boolean;
+};
 export type ChartMetaWithDimensionAndChartType = ChartMeta & {
-    dimension: ChartDimension,
-    chartType: ChartType,
-}
+    dimension: ChartDimension;
+    chartType: ChartType;
+};
 export type ClinicalDataCountSet = { [attrId: string]: number };
 export type StudyWithSamples = CancerStudy & {
-    uniqueSampleKeys: string[]
-}
+    uniqueSampleKeys: string[];
+};
 export type StudyViewFilterWithSampleIdentifierFilters = StudyViewFilter & {
-    sampleIdentifiersSet: { [id: string]: SampleIdentifier[] }
-}
+    sampleIdentifiersSet: { [id: string]: SampleIdentifier[] };
+};
 
 export enum Datalabel {
     YES = 'YES',
     NO = 'NO',
-    NA = "NA"
+    NA = 'NA',
 }
 
 export type RectangleBounds = {
-    xEnd?: number,
-    xStart?: number,
-    yEnd?: number,
-    yStart?: number
-}
-
-export const SPECIAL_CHARTS: ChartMetaWithDimensionAndChartType[] = [{
-    uniqueKey: UniqueKey.CANCER_STUDIES,
-    displayName: 'Cancer Studies',
-    description: 'Cancer Studies',
-    dataType: ChartMetaDataTypeEnum.CLINICAL,
-    patientAttribute: false,
-    chartType: ChartTypeEnum.PIE_CHART,
-    dimension: {
-        w: 1,
-        h: 1
+    xEnd?: number;
+    xStart?: number;
+    yEnd?: number;
+    yStart?: number;
+};
+
+export const SPECIAL_CHARTS: ChartMetaWithDimensionAndChartType[] = [
+    {
+        uniqueKey: UniqueKey.CANCER_STUDIES,
+        displayName: 'Cancer Studies',
+        description: 'Cancer Studies',
+        dataType: ChartMetaDataTypeEnum.CLINICAL,
+        patientAttribute: false,
+        chartType: ChartTypeEnum.PIE_CHART,
+        dimension: {
+            w: 1,
+            h: 1,
+        },
+        renderWhenDataChange: false,
+        priority: 70,
     },
-    renderWhenDataChange: false,
-    priority: 70
-},
     {
         uniqueKey: UniqueKey.WITH_MUTATION_DATA,
         displayName: 'With Mutation Data',
@@ -144,10 +175,10 @@ export const SPECIAL_CHARTS: ChartMetaWithDimensionAndChartType[] = [{
         patientAttribute: false,
         dimension: {
             w: 1,
-            h: 1
+            h: 1,
         },
         priority: 0,
-        renderWhenDataChange: false
+        renderWhenDataChange: false,
     },
     {
         uniqueKey: UniqueKey.WITH_FUSION_DATA,
@@ -158,10 +189,10 @@ export const SPECIAL_CHARTS: ChartMetaWithDimensionAndChartType[] = [{
         patientAttribute: false,
         dimension: {
             w: 1,
-            h: 1
+            h: 1,
         },
         priority: 0,
-        renderWhenDataChange: false
+        renderWhenDataChange: false,
     },
     {
         uniqueKey: UniqueKey.WITH_CNA_DATA,
@@ -172,120 +203,303 @@ export const SPECIAL_CHARTS: ChartMetaWithDimensionAndChartType[] = [{
         patientAttribute: false,
         dimension: {
             w: 1,
-            h: 1
+            h: 1,
         },
         priority: 0,
-        renderWhenDataChange: false
-    }];
+        renderWhenDataChange: false,
+    },
+];
 
 export const COLORS = [
-    STUDY_VIEW_CONFIG.colors.theme.primary, STUDY_VIEW_CONFIG.colors.theme.secondary,
-    STUDY_VIEW_CONFIG.colors.theme.tertiary, STUDY_VIEW_CONFIG.colors.theme.quaternary,
-    '#990099', '#0099c6', '#dd4477', '#66aa00',
-    '#b82e2e', '#316395', '#994499', '#22aa99',
-    '#aaaa11', '#6633cc', '#e67300', '#8b0707',
-    '#651067', '#329262', '#5574a6', '#3b3eac',
-    '#b77322', '#16d620', '#b91383', '#f4359e',
-    '#9c5935', '#a9c413', '#2a778d', '#668d1c',
-    '#bea413', '#0c5922', '#743411', '#743440',
-    '#9986e2', '#6c3912', '#788508', '#609618',
-    '#790099', '#5099c6', '#2d4477', '#76aa00',
-    '#882e2e', '#916395', '#794499', '#92aa99',
-    '#2aaa11', '#5633cc', '#667300', '#100707',
-    '#751067', '#229262', '#4574a6', '#103eac',
-    '#177322', '#66d620', '#291383', '#94359e',
-    '#5c5935', '#29c413', '#6a778d', '#868d1c',
-    '#5ea413', '#6c5922', '#243411', '#103440',
-    '#2886e2', '#d93912', '#f28508', '#110618',
-    '#970099', '#0109c6', '#d10477', '#68aa00',
-    '#b12e2e', '#310395', '#944499', '#24aa99',
-    '#a4aa11', '#6333cc', '#e77300', '#820707',
-    '#610067', '#339262', '#5874a6', '#313eac',
-    '#b67322', '#13d620', '#b81383', '#f8359e',
-    '#935935', '#a10413', '#29778d', '#678d1c',
-    '#b2a413', '#075922', '#763411', '#773440',
-    '#2996e2', '#dc4912', '#f81508', '#104618',
-    '#991099', '#0049c6', '#dd2477', '#663a00',
-    '#b84e2e', '#312395', '#993499', '#223a99',
-    '#aa1a11', '#6673cc', '#e66300', '#8b5707',
-    '#656067', '#323262', '#5514a6', '#3b8eac',
-    '#b71322', '#165620', '#b99383', '#f4859e',
-    '#9c4935', '#a91413', '#2a978d', '#669d1c',
-    '#be1413', '#0c8922', '#742411', '#744440',
-    '#2983e2', '#dc3612', '#f88808', '#109518',
-    '#990599', '#0092c6', '#dd4977', '#66a900',
-    '#b8282e', '#316295', '#994199', '#22a499',
-    '#aaa101', '#66310c', '#e67200', '#8b0907',
-    '#651167', '#329962', '#5573a6', '#3b37ac',
-    '#b77822', '#16d120', '#b91783', '#f4339e',
-    '#9c5105', '#a9c713', '#2a710d', '#66841c',
-    '#bea913', '#0c5822', '#743911', '#743740',
-    '#298632', '#dc3922', '#f88588', '#109658',
-    '#990010', '#009916', '#dd4447', '#66aa60',
-    '#b82e9e', '#316365', '#994489', '#22aa69',
-    '#aaaa51', '#66332c', '#e67390', '#8b0777',
-    '#651037', '#329232', '#557486', '#3b3e4c',
-    '#b77372', '#16d690', '#b91310', '#f4358e',
-    '#9c5910', '#a9c493', '#2a773d', '#668d5c',
-    '#bea463', '#0c5952', '#743471', '#743450',
-    '#2986e3', '#dc3914', '#f88503', '#109614',
-    '#990092', '#0099c8', '#dd4476', '#66aa04',
-    '#b82e27', '#316397', '#994495', '#22aa93',
-    '#aaaa14', '#6633c1', '#e67303', '#8b0705',
-    '#651062', '#329267', '#5574a1', '#3b3ea5'
+    STUDY_VIEW_CONFIG.colors.theme.primary,
+    STUDY_VIEW_CONFIG.colors.theme.secondary,
+    STUDY_VIEW_CONFIG.colors.theme.tertiary,
+    STUDY_VIEW_CONFIG.colors.theme.quaternary,
+    '#990099',
+    '#0099c6',
+    '#dd4477',
+    '#66aa00',
+    '#b82e2e',
+    '#316395',
+    '#994499',
+    '#22aa99',
+    '#aaaa11',
+    '#6633cc',
+    '#e67300',
+    '#8b0707',
+    '#651067',
+    '#329262',
+    '#5574a6',
+    '#3b3eac',
+    '#b77322',
+    '#16d620',
+    '#b91383',
+    '#f4359e',
+    '#9c5935',
+    '#a9c413',
+    '#2a778d',
+    '#668d1c',
+    '#bea413',
+    '#0c5922',
+    '#743411',
+    '#743440',
+    '#9986e2',
+    '#6c3912',
+    '#788508',
+    '#609618',
+    '#790099',
+    '#5099c6',
+    '#2d4477',
+    '#76aa00',
+    '#882e2e',
+    '#916395',
+    '#794499',
+    '#92aa99',
+    '#2aaa11',
+    '#5633cc',
+    '#667300',
+    '#100707',
+    '#751067',
+    '#229262',
+    '#4574a6',
+    '#103eac',
+    '#177322',
+    '#66d620',
+    '#291383',
+    '#94359e',
+    '#5c5935',
+    '#29c413',
+    '#6a778d',
+    '#868d1c',
+    '#5ea413',
+    '#6c5922',
+    '#243411',
+    '#103440',
+    '#2886e2',
+    '#d93912',
+    '#f28508',
+    '#110618',
+    '#970099',
+    '#0109c6',
+    '#d10477',
+    '#68aa00',
+    '#b12e2e',
+    '#310395',
+    '#944499',
+    '#24aa99',
+    '#a4aa11',
+    '#6333cc',
+    '#e77300',
+    '#820707',
+    '#610067',
+    '#339262',
+    '#5874a6',
+    '#313eac',
+    '#b67322',
+    '#13d620',
+    '#b81383',
+    '#f8359e',
+    '#935935',
+    '#a10413',
+    '#29778d',
+    '#678d1c',
+    '#b2a413',
+    '#075922',
+    '#763411',
+    '#773440',
+    '#2996e2',
+    '#dc4912',
+    '#f81508',
+    '#104618',
+    '#991099',
+    '#0049c6',
+    '#dd2477',
+    '#663a00',
+    '#b84e2e',
+    '#312395',
+    '#993499',
+    '#223a99',
+    '#aa1a11',
+    '#6673cc',
+    '#e66300',
+    '#8b5707',
+    '#656067',
+    '#323262',
+    '#5514a6',
+    '#3b8eac',
+    '#b71322',
+    '#165620',
+    '#b99383',
+    '#f4859e',
+    '#9c4935',
+    '#a91413',
+    '#2a978d',
+    '#669d1c',
+    '#be1413',
+    '#0c8922',
+    '#742411',
+    '#744440',
+    '#2983e2',
+    '#dc3612',
+    '#f88808',
+    '#109518',
+    '#990599',
+    '#0092c6',
+    '#dd4977',
+    '#66a900',
+    '#b8282e',
+    '#316295',
+    '#994199',
+    '#22a499',
+    '#aaa101',
+    '#66310c',
+    '#e67200',
+    '#8b0907',
+    '#651167',
+    '#329962',
+    '#5573a6',
+    '#3b37ac',
+    '#b77822',
+    '#16d120',
+    '#b91783',
+    '#f4339e',
+    '#9c5105',
+    '#a9c713',
+    '#2a710d',
+    '#66841c',
+    '#bea913',
+    '#0c5822',
+    '#743911',
+    '#743740',
+    '#298632',
+    '#dc3922',
+    '#f88588',
+    '#109658',
+    '#990010',
+    '#009916',
+    '#dd4447',
+    '#66aa60',
+    '#b82e9e',
+    '#316365',
+    '#994489',
+    '#22aa69',
+    '#aaaa51',
+    '#66332c',
+    '#e67390',
+    '#8b0777',
+    '#651037',
+    '#329232',
+    '#557486',
+    '#3b3e4c',
+    '#b77372',
+    '#16d690',
+    '#b91310',
+    '#f4358e',
+    '#9c5910',
+    '#a9c493',
+    '#2a773d',
+    '#668d5c',
+    '#bea463',
+    '#0c5952',
+    '#743471',
+    '#743450',
+    '#2986e3',
+    '#dc3914',
+    '#f88503',
+    '#109614',
+    '#990092',
+    '#0099c8',
+    '#dd4476',
+    '#66aa04',
+    '#b82e27',
+    '#316397',
+    '#994495',
+    '#22aa93',
+    '#aaaa14',
+    '#6633c1',
+    '#e67303',
+    '#8b0705',
+    '#651062',
+    '#329267',
+    '#5574a1',
+    '#3b3ea5',
 ];
 
 export const EXPONENTIAL_FRACTION_DIGITS = 3;
 
 export const MutationCountVsCnaYBinsMin = 52; // calibrated so that the dots are right up against each other. needs to correspond with the width and height of the chart
 
-
-const OPERATOR_MAP: {[op:string]: string} = {
-    "<=": "≤",
-    "<" : "<",
-    ">=": "≥",
-    ">": ">"
+const OPERATOR_MAP: { [op: string]: string } = {
+    '<=': '≤',
+    '<': '<',
+    '>=': '≥',
+    '>': '>',
 };
 
-export function getClinicalAttributeOverlay(displayName: string, description: string, clinicalAttributeId?: string): JSX.Element {
+export function getClinicalAttributeOverlay(
+    displayName: string,
+    description: string,
+    clinicalAttributeId?: string
+): JSX.Element {
     const comparisonDisplayName = displayName.toLowerCase().trim();
-    let comparisonDescription = description.toLowerCase().trim().replace(/.&/, '');
-    return <div style={{maxWidth: '300px'}}>
-        <div><b>{displayName}</b> {!!clinicalAttributeId &&
-        <span className={styles.titleMeta}>ID: {clinicalAttributeId}</span>}</div>
-        {comparisonDescription !== comparisonDisplayName && <div>{description}</div>}
-    </div>;
+    let comparisonDescription = description
+        .toLowerCase()
+        .trim()
+        .replace(/.&/, '');
+    return (
+        <div style={{ maxWidth: '300px' }}>
+            <div>
+                <b>{displayName}</b>{' '}
+                {!!clinicalAttributeId && (
+                    <span className={styles.titleMeta}>
+                        ID: {clinicalAttributeId}
+                    </span>
+                )}
+            </div>
+            {comparisonDescription !== comparisonDisplayName && (
+                <div>{description}</div>
+            )}
+        </div>
+    );
 }
 
-export function updateGeneQuery(geneQueries: SingleGeneQuery[], selectedGene: string): SingleGeneQuery[] {
-
-    let updatedQueries = _.filter(geneQueries,query=> query.gene !== selectedGene)
-    if(updatedQueries.length === geneQueries.length){
+export function updateGeneQuery(
+    geneQueries: SingleGeneQuery[],
+    selectedGene: string
+): SingleGeneQuery[] {
+    let updatedQueries = _.filter(
+        geneQueries,
+        query => query.gene !== selectedGene
+    );
+    if (updatedQueries.length === geneQueries.length) {
         updatedQueries.push({
             gene: selectedGene,
-            alterations: false
-        })
+            alterations: false,
+        });
     }
     return updatedQueries;
-
 }
 
 function translateSpecialText(text: string | undefined): string {
     if (!text) {
-        return "";
-    } else if (text === ">=") {
-        return "≥";
-    } else if (text === "<=") {
-        return "≤";
+        return '';
+    } else if (text === '>=') {
+        return '≥';
+    } else if (text === '<=') {
+        return '≤';
     }
 
     return text;
 }
 
-export function formatRange(min: number | undefined, max: number | undefined, special: string | undefined): string {
+export function formatRange(
+    min: number | undefined,
+    max: number | undefined,
+    special: string | undefined
+): string {
     special = translateSpecialText(special);
 
-    if(min === undefined) {
+    if (min === undefined) {
         if (max === undefined) {
             return special;
         } else {
@@ -297,46 +511,64 @@ export function formatRange(min: number | undefined, max: number | undefined, sp
         } else if (min !== max) {
             return `${special}${min.toLocaleString()}-${max.toLocaleString()}`;
         } else {
-            return `${special}${min.toLocaleString()}`
+            return `${special}${min.toLocaleString()}`;
         }
     }
 }
 
-function getBinStatsForTooltip(d:IStudyViewDensityScatterPlotDatum) {
+function getBinStatsForTooltip(d: IStudyViewDensityScatterPlotDatum) {
     let mutRange = formatRange(d.minY, d.maxY, undefined);
-    let fgaRange = "";
+    let fgaRange = '';
     if (d.maxX.toFixed(2) !== d.minX.toFixed(2)) {
         fgaRange = `${d.minX.toFixed(2)}-${d.maxX.toFixed(2)}`;
     } else {
         fgaRange = d.minX.toFixed(2);
     }
-    return {mutRange, fgaRange};
+    return { mutRange, fgaRange };
 }
 
-export function mutationCountVsCnaTooltip(d:IStudyViewDensityScatterPlotDatum) {
+export function mutationCountVsCnaTooltip(
+    d: IStudyViewDensityScatterPlotDatum
+) {
     const binStats = getBinStatsForTooltip(d);
     return (
         <div>
-            <div>Number of Samples: <b>{d.count.toLocaleString()}</b></div>
-            <div>Mutation Count: <b>{binStats.mutRange}</b></div>
-            <div>Fraction Genome Altered: <b>{binStats.fgaRange}</b></div>
+            <div>
+                Number of Samples: <b>{d.count.toLocaleString()}</b>
+            </div>
+            <div>
+                Mutation Count: <b>{binStats.mutRange}</b>
+            </div>
+            <div>
+                Fraction Genome Altered: <b>{binStats.fgaRange}</b>
+            </div>
         </div>
     );
 }
 
-export function generateScatterPlotDownloadData(data: IStudyViewScatterPlotData[],
-                                                sampleToAnalysisGroup?: {[sampleKey:string]:string},
-                                                analysisClinicalAttribute?: ClinicalAttribute,
-                                                analysisGroups?: AnalysisGroup[])
-{
-    const header = ["Cancer Study", "Patient ID", "Sample ID", "Mutation Count", "CNA Fraction"];
-    let valueToGroup: {[value: string] : AnalysisGroup};
+export function generateScatterPlotDownloadData(
+    data: IStudyViewScatterPlotData[],
+    sampleToAnalysisGroup?: { [sampleKey: string]: string },
+    analysisClinicalAttribute?: ClinicalAttribute,
+    analysisGroups?: AnalysisGroup[]
+) {
+    const header = [
+        'Cancer Study',
+        'Patient ID',
+        'Sample ID',
+        'Mutation Count',
+        'CNA Fraction',
+    ];
+    let valueToGroup: { [value: string]: AnalysisGroup };
 
-    if (analysisClinicalAttribute !== undefined && sampleToAnalysisGroup !== undefined) {
+    if (
+        analysisClinicalAttribute !== undefined &&
+        sampleToAnalysisGroup !== undefined
+    ) {
         header.push(analysisClinicalAttribute.displayName);
 
         if (analysisGroups !== undefined) {
-            header.push("Color");
+            header.push('Color');
             valueToGroup = _.keyBy(analysisGroups, 'value');
         }
     }
@@ -347,26 +579,39 @@ export function generateScatterPlotDownloadData(data: IStudyViewScatterPlotData[
             `${datum.patientId}`,
             `${datum.sampleId}`,
             `${datum.y}`,
-            `${datum.x}`
+            `${datum.x}`,
         ];
 
-        if (analysisClinicalAttribute !== undefined && sampleToAnalysisGroup !== undefined) {
+        if (
+            analysisClinicalAttribute !== undefined &&
+            sampleToAnalysisGroup !== undefined
+        ) {
             const value = sampleToAnalysisGroup[datum.uniqueSampleKey];
 
             row.push(value !== undefined ? `${value}` : Datalabel.NA);
 
             if (analysisGroups !== undefined && value !== undefined) {
-                row.push(valueToGroup[value] !== undefined ? valueToGroup[value].color : Datalabel.NA);
+                row.push(
+                    valueToGroup[value] !== undefined
+                        ? valueToGroup[value].color
+                        : Datalabel.NA
+                );
             }
         }
 
         return row;
     });
 
-    return [header].concat(rows).map(row => row.join("\t")).join("\n");
+    return [header]
+        .concat(rows)
+        .map(row => row.join('\t'))
+        .join('\n');
 }
 
-export function isSelected(datum: { uniqueSampleKey: string }, selectedSamples: { [uniqueSampleKey: string]: any }) {
+export function isSelected(
+    datum: { uniqueSampleKey: string },
+    selectedSamples: { [uniqueSampleKey: string]: any }
+) {
     return datum.uniqueSampleKey in selectedSamples;
 }
 
@@ -386,9 +631,11 @@ export function getUniqueKey(attribute: ClinicalAttribute): string {
     return attribute.clinicalAttributeId;
 }
 
-const UNIQUE_KEY_SEPARATOR = ":";
+const UNIQUE_KEY_SEPARATOR = ':';
 
-export function getUniqueKeyFromMolecularProfileIds(molecularProfileIds: string[]) {
+export function getUniqueKeyFromMolecularProfileIds(
+    molecularProfileIds: string[]
+) {
     return _.sortBy(molecularProfileIds).join(UNIQUE_KEY_SEPARATOR);
 }
 
@@ -401,11 +648,12 @@ export function getCurrentDate() {
 }
 
 export function getVirtualStudyDescription(
-                                            previousDescription: string | undefined,
-                                            studyWithSamples: StudyWithSamples[],
-                                            filter: StudyViewFilterWithSampleIdentifierFilters,
-                                            attributeNamesSet: { [id: string]: string },
-                                            user?: string) {
+    previousDescription: string | undefined,
+    studyWithSamples: StudyWithSamples[],
+    filter: StudyViewFilterWithSampleIdentifierFilters,
+    attributeNamesSet: { [id: string]: string },
+    user?: string
+) {
     let descriptionLines: string[] = [];
     const createdOnStr = 'Created on';
     if (previousDescription) {
@@ -413,43 +661,77 @@ export function getVirtualStudyDescription(
         const regex = new RegExp(`${createdOnStr}.*`);
         descriptionLines.push(previousDescription.replace(regex, ''));
     } else {
-
         //add to samples and studies count
-        let uniqueSampleKeys = _.uniq(_.flatMap(studyWithSamples, study => study.uniqueSampleKeys))
-        descriptionLines.push(`${uniqueSampleKeys.length} sample${uniqueSampleKeys.length > 1 ? 's' : ''} from ${studyWithSamples.length} ${studyWithSamples.length > 1 ? 'studies:' : 'study:'}`);
+        let uniqueSampleKeys = _.uniq(
+            _.flatMap(studyWithSamples, study => study.uniqueSampleKeys)
+        );
+        descriptionLines.push(
+            `${uniqueSampleKeys.length} sample${
+                uniqueSampleKeys.length > 1 ? 's' : ''
+            } from ${studyWithSamples.length} ${
+                studyWithSamples.length > 1 ? 'studies:' : 'study:'
+            }`
+        );
         //add individual studies sample count
         studyWithSamples.forEach(studyObj => {
-            descriptionLines.push(`- ${studyObj.name} (${studyObj.uniqueSampleKeys.length} sample${uniqueSampleKeys.length > 1 ? 's' : ''})`);
-        })
+            descriptionLines.push(
+                `- ${studyObj.name} (${
+                    studyObj.uniqueSampleKeys.length
+                } sample${uniqueSampleKeys.length > 1 ? 's' : ''})`
+            );
+        });
         //add filters
         let filterLines: string[] = [];
         if (!_.isEmpty(filter)) {
-
-            _.each(filter.geneFilters || [], (geneFilter) => {
-                let name = attributeNamesSet[getUniqueKeyFromMolecularProfileIds(geneFilter.molecularProfileIds)];
+            _.each(filter.geneFilters || [], geneFilter => {
+                let name =
+                    attributeNamesSet[
+                        getUniqueKeyFromMolecularProfileIds(
+                            geneFilter.molecularProfileIds
+                        )
+                    ];
                 filterLines.push(`- ${name}:`);
-                filterLines = filterLines.concat(geneFilter.geneQueries.map(geneQuery => {
-                    return geneQuery.join(', ').trim();
-                }).map(line => '  - ' + line));
+                filterLines = filterLines.concat(
+                    geneFilter.geneQueries
+                        .map(geneQuery => {
+                            return geneQuery.join(', ').trim();
+                        })
+                        .map(line => '  - ' + line)
+                );
             });
 
             if (filter.withMutationData !== undefined) {
-                filterLines.push(`With Mutation data: ${filter.withMutationData ? 'YES' : 'NO'}`);
+                filterLines.push(
+                    `With Mutation data: ${
+                        filter.withMutationData ? 'YES' : 'NO'
+                    }`
+                );
             }
 
             if (filter.withCNAData !== undefined) {
-                filterLines.push(`With CNA data: ${filter.withCNAData ? 'YES' : 'NO'}`);
+                filterLines.push(
+                    `With CNA data: ${filter.withCNAData ? 'YES' : 'NO'}`
+                );
             }
 
-            _.each(filter.clinicalDataFilters || [], (clinicalDataFilter) => {
+            _.each(filter.clinicalDataFilters || [], clinicalDataFilter => {
                 let name = attributeNamesSet[clinicalDataFilter.attributeId];
-                filterLines.push(`- ${name}: ${intervalFiltersDisplayValue(clinicalDataFilter.values)}`);
+                filterLines.push(
+                    `- ${name}: ${intervalFiltersDisplayValue(
+                        clinicalDataFilter.values
+                    )}`
+                );
             });
 
-            _.each(filter.sampleIdentifiersSet || {}, (sampleIdentifiers, id) => {
-                let name = attributeNamesSet[id] || id;
-                filterLines.push(`- ${name}: ${sampleIdentifiers.length} samples`);
-            })
+            _.each(
+                filter.sampleIdentifiersSet || {},
+                (sampleIdentifiers, id) => {
+                    let name = attributeNamesSet[id] || id;
+                    filterLines.push(
+                        `- ${name}: ${sampleIdentifiers.length} samples`
+                    );
+                }
+            );
         }
         if (filterLines.length > 0) {
             descriptionLines.push('');
@@ -459,77 +741,92 @@ export function getVirtualStudyDescription(
         descriptionLines.push('');
     }
     //add creation and user name
-    descriptionLines.push(`${createdOnStr} ` + getCurrentDate() + (user ? ' by ' + user : ''));
+    descriptionLines.push(
+        `${createdOnStr} ` + getCurrentDate() + (user ? ' by ' + user : '')
+    );
     return descriptionLines.join('\n');
 }
 
-export function isFiltered(filter: Partial<StudyViewFilterWithSampleIdentifierFilters>) {
-    const flag = !(_.isEmpty(filter) || (
-            _.isEmpty(filter.clinicalDataFilters) &&
+export function isFiltered(
+    filter: Partial<StudyViewFilterWithSampleIdentifierFilters>
+) {
+    const flag = !(
+        _.isEmpty(filter) ||
+        (_.isEmpty(filter.clinicalDataFilters) &&
             _.isEmpty(filter.geneFilters) &&
             filter.withMutationData === undefined &&
             filter.withCNAData === undefined)
     );
 
     if (filter.sampleIdentifiersSet) {
-        return flag || !_.isEmpty(filter.sampleIdentifiersSet)
+        return flag || !_.isEmpty(filter.sampleIdentifiersSet);
     } else {
         return flag;
     }
 }
 
 export function makePatientToClinicalAnalysisGroup(
-    samples:Pick<Sample, "uniqueSampleKey"|"uniquePatientKey">[],
-    sampleToAnalysisGroup:{[sampleKey:string]:string}
+    samples: Pick<Sample, 'uniqueSampleKey' | 'uniquePatientKey'>[],
+    sampleToAnalysisGroup: { [sampleKey: string]: string }
 ) {
     // only include a patient if all its samples are in the same analysis group
-    const badPatients:{[patientKey:string]:boolean} = {};
-    return _.reduce(samples, (map, sample)=>{
-        const patientKey = sample.uniquePatientKey;
-        if (!(patientKey in badPatients)) {
-            // weve not already determined that not all this patients samples are in the same group
-
-            const sampleGroup = sampleToAnalysisGroup[sample.uniqueSampleKey];
-            if (patientKey in map) {
-                if (map[patientKey] !== sampleGroup) {
-                    // this means that weve seen another sample for this patient thats not
-                    //  in the same group. therefore, not all this patients samples are in
-                    //  the same group, so we're going to omit it
-                    delete map[patientKey];
-                    badPatients[patientKey] = true;
-                } // otherwise, we already have the right group, so dont do anything
-            } else {
-                // this is the first sample weve seen from this patient
-                map[patientKey] = sampleGroup;
+    const badPatients: { [patientKey: string]: boolean } = {};
+    return _.reduce(
+        samples,
+        (map, sample) => {
+            const patientKey = sample.uniquePatientKey;
+            if (!(patientKey in badPatients)) {
+                // weve not already determined that not all this patients samples are in the same group
+
+                const sampleGroup =
+                    sampleToAnalysisGroup[sample.uniqueSampleKey];
+                if (patientKey in map) {
+                    if (map[patientKey] !== sampleGroup) {
+                        // this means that weve seen another sample for this patient thats not
+                        //  in the same group. therefore, not all this patients samples are in
+                        //  the same group, so we're going to omit it
+                        delete map[patientKey];
+                        badPatients[patientKey] = true;
+                    } // otherwise, we already have the right group, so dont do anything
+                } else {
+                    // this is the first sample weve seen from this patient
+                    map[patientKey] = sampleGroup;
+                }
             }
-        }
-        return map;
-    }, {} as {[patientKey:string]:string});
-}
-
-export function toSvgDomNodeWithLegend(svgElement: SVGElement,
-                                       params:{
-                                           legendGroupSelector: string,
-                                           selectorToHide?:string,
-                                           chartGroupSelector?: string,
-                                           centerLegend?: boolean
-                                       })
-{
+            return map;
+        },
+        {} as { [patientKey: string]: string }
+    );
+}
+
+export function toSvgDomNodeWithLegend(
+    svgElement: SVGElement,
+    params: {
+        legendGroupSelector: string;
+        selectorToHide?: string;
+        chartGroupSelector?: string;
+        centerLegend?: boolean;
+    }
+) {
     const svg = svgElement.cloneNode(true) as SVGElement;
-    const legend = $(svgElement).find(params.legendGroupSelector).get(0);
+    const legend = $(svgElement)
+        .find(params.legendGroupSelector)
+        .get(0);
     const legendBBox = legend.getBoundingClientRect();
 
     if (params.selectorToHide) {
-        $(svg).find(params.selectorToHide).remove();
+        $(svg)
+            .find(params.selectorToHide)
+            .remove();
     }
 
-    const height = + $(svgElement).height()! + legendBBox.height;
+    const height = +$(svgElement).height()! + legendBBox.height;
     const width = Math.max($(svgElement).width()!, legendBBox.width);
 
     // adjust width and height to make sure that the legend is fully visible
-    $(svg).attr("height", height + 5);
-    $(svg).attr("width", width);
-    $(svg).css({height: height + 5, width});
+    $(svg).attr('height', height + 5);
+    $(svg).attr('width', width);
+    $(svg).css({ height: height + 5, width });
 
     // center elements
     if (params.centerLegend) {
@@ -539,35 +836,52 @@ export function toSvgDomNodeWithLegend(svgElement: SVGElement,
 
         if ($(svgElement).width()! > legendBBox.width) {
             // legend needs to be centered wrt the chart
-            $(svg).find(params.legendGroupSelector).attr("transform", transform);
-        }
-        else if (params.chartGroupSelector) {
+            $(svg)
+                .find(params.legendGroupSelector)
+                .attr('transform', transform);
+        } else if (params.chartGroupSelector) {
             // chart needs to be centered wrt the legend
-            $(svg).find(params.chartGroupSelector).attr("transform", transform);
+            $(svg)
+                .find(params.chartGroupSelector)
+                .attr('transform', transform);
         }
     }
 
     return svg;
 }
 
-export function getClinicalDataIntervalFilterValues(data: DataBin[]): ClinicalDataFilterValue[] {
-    return data.map(dataBin => ({
-        start: dataBin.start,
-        end: dataBin.end,
-        value: dataBin.start === undefined && dataBin.end === undefined ? dataBin.specialValue : undefined
-    } as ClinicalDataFilterValue));
+export function getClinicalDataIntervalFilterValues(
+    data: DataBin[]
+): ClinicalDataFilterValue[] {
+    return data.map(
+        dataBin =>
+            ({
+                start: dataBin.start,
+                end: dataBin.end,
+                value:
+                    dataBin.start === undefined && dataBin.end === undefined
+                        ? dataBin.specialValue
+                        : undefined,
+            } as ClinicalDataFilterValue)
+    );
 }
 
 export function filterNumericalBins(data: DataBin[]) {
-    return data.filter(dataBin => dataBin.start !== undefined || dataBin.end !== undefined);
+    return data.filter(
+        dataBin => dataBin.start !== undefined || dataBin.end !== undefined
+    );
 }
 
 export function filterCategoryBins(data: DataBin[]) {
-    return data.filter(dataBin => dataBin.start === undefined && dataBin.end === undefined);
+    return data.filter(
+        dataBin => dataBin.start === undefined && dataBin.end === undefined
+    );
 }
 
 export function filterIntervalBins(numericalBins: DataBin[]) {
-    return numericalBins.filter(dataBin => dataBin.start !== undefined && dataBin.end !== undefined);
+    return numericalBins.filter(
+        dataBin => dataBin.start !== undefined && dataBin.end !== undefined
+    );
 }
 
 export function calcIntervalBinValues(intervalBins: DataBin[]) {
@@ -584,11 +898,15 @@ export function calcIntervalBinValues(intervalBins: DataBin[]) {
     return values;
 }
 
-export function needAdditionShiftForLogScaleBarChart(numericalBins: DataBin[]):boolean {
-    return isLogScaleByDataBins(numericalBins) &&
+export function needAdditionShiftForLogScaleBarChart(
+    numericalBins: DataBin[]
+): boolean {
+    return (
+        isLogScaleByDataBins(numericalBins) &&
         numericalBins[0].start !== undefined &&
         numericalBins[0].start !== 0 &&
-        !isIntegerPowerOfTen(numericalBins[0].start);
+        !isIntegerPowerOfTen(numericalBins[0].start)
+    );
 }
 
 export function generateNumericalData(numericalBins: DataBin[]): BarDatum[] {
@@ -604,13 +922,18 @@ export function generateNumericalData(numericalBins: DataBin[]): BarDatum[] {
             x = index;
         }
         // we want to show special values (> or >=) right on the tick (or next tick depending on the prev bin end)
-        else if (index === numericalBins.length - 1 && dataBin.end === undefined) {
+        else if (
+            index === numericalBins.length - 1 &&
+            dataBin.end === undefined
+        ) {
             x = index;
 
             // in case the previous data bin is a single value data bin (i.e start === end),
             // no need to add 1 (no interval needed for the previous value)
-            if (index - 1 > -1 &&
-                numericalBins[index - 1].start !== numericalBins[index - 1].end) {
+            if (
+                index - 1 > -1 &&
+                numericalBins[index - 1].start !== numericalBins[index - 1].end
+            ) {
                 x++;
             }
         }
@@ -628,18 +951,21 @@ export function generateNumericalData(numericalBins: DataBin[]): BarDatum[] {
         return {
             x: x + xShift,
             y: dataBin.count,
-            dataBin
+            dataBin,
         };
     });
 }
 
-export function generateCategoricalData(categoryBins: DataBin[], startIndex: number): BarDatum[] {
+export function generateCategoricalData(
+    categoryBins: DataBin[],
+    startIndex: number
+): BarDatum[] {
     // x is not the actual data value, it is the normalized data for representation
     // y is the actual count value
     return categoryBins.map((dataBin: DataBin, index: number) => ({
         x: startIndex + index + 1,
         y: dataBin.count,
-        dataBin
+        dataBin,
     }));
 }
 
@@ -647,22 +973,28 @@ export function isLogScaleByValues(values: number[]) {
     return (
         // empty list is not considered log scale
         values.length > 0 &&
-        values.find(value =>
-            // any value between -1 and 1 (except 0) indicates that this is not a log scale
-            (value !== 0 && -1 < value && value < 1) ||
-            // any value not in the form of 10^0.5, 10^2, etc. also indicates that this is not a log scale
-            (value !== 0 && getExponent(value) % 0.5 !== 0)
+        values.find(
+            value =>
+                // any value between -1 and 1 (except 0) indicates that this is not a log scale
+                (value !== 0 && -1 < value && value < 1) ||
+                // any value not in the form of 10^0.5, 10^2, etc. also indicates that this is not a log scale
+                (value !== 0 && getExponent(value) % 0.5 !== 0)
         ) === undefined
     );
 }
 
-export function shouldShowChart(filer: Partial<StudyViewFilterWithSampleIdentifierFilters>, uniqueDataSize: number, sizeOfAllSamples: number) {
+export function shouldShowChart(
+    filer: Partial<StudyViewFilterWithSampleIdentifierFilters>,
+    uniqueDataSize: number,
+    sizeOfAllSamples: number
+) {
     return isFiltered(filer) || uniqueDataSize >= 2 || sizeOfAllSamples === 1;
 }
 
 export function isEveryBinDistinct(data?: DataBin[]) {
     return (
-        data && data.length > 0 &&
+        data &&
+        data.length > 0 &&
         data.find(dataBin => dataBin.start !== dataBin.end) === undefined
     );
 }
@@ -696,27 +1028,32 @@ export function formatNumericalTickValues(numericalBins: DataBin[]) {
     let values = calcIntervalBinValues(intervalBins);
 
     // use only interval bin values when determining logScale
-    const isLogScale = !isEveryBinDistinct(intervalBins) && isLogScaleByValues(values);
+    const isLogScale =
+        !isEveryBinDistinct(intervalBins) && isLogScaleByValues(values);
 
     if (firstBin.start === undefined) {
         values = [firstBin.end, ...values];
-    }
-    else if (isLogScale && firstBin.start !== 0)
-    {
+    } else if (isLogScale && firstBin.start !== 0) {
         // we don't want to start with a value like 10^0.5, -10^3.5, etc. we prefer integer powers of 10
         if (!isIntegerPowerOfTen(firstBin.start)) {
-            values = [closestIntegerPowerOfTen(firstBin.start, DataBinPosition.LEADING), ...values];
+            values = [
+                closestIntegerPowerOfTen(
+                    firstBin.start,
+                    DataBinPosition.LEADING
+                ),
+                ...values,
+            ];
         }
     }
 
     if (lastBin.end === undefined) {
         values.push(lastBin.start);
-    }
-    else if (isLogScale && lastBin.end !== 0)
-    {
+    } else if (isLogScale && lastBin.end !== 0) {
         // we don't want to end with a value like 10^3.5, -10^0.5, etc. we prefer integer powers of 10
         if (!isIntegerPowerOfTen(lastBin.end)) {
-            values.push(closestIntegerPowerOfTen(lastBin.end, DataBinPosition.TRAILING));
+            values.push(
+                closestIntegerPowerOfTen(lastBin.end, DataBinPosition.TRAILING)
+            );
         }
     }
 
@@ -724,53 +1061,61 @@ export function formatNumericalTickValues(numericalBins: DataBin[]) {
 
     if (isLogScale) {
         formatted = formatLogScaleValues(values);
-    }
-    else if (intervalBins.length > 0 &&
-        isScientificSmallValue(intervalBins[Math.floor(intervalBins.length / 2)].end))
-    {
+    } else if (
+        intervalBins.length > 0 &&
+        isScientificSmallValue(
+            intervalBins[Math.floor(intervalBins.length / 2)].end
+        )
+    ) {
         // scientific notation
         formatted = values.map(value => value.toExponential(0));
-    }
-    else {
+    } else {
         formatted = formatLinearScaleValues(values);
     }
 
     if (firstBin.start === undefined) {
-        formatted[0] = `${OPERATOR_MAP[firstBin.specialValue] || firstBin.specialValue}${formatted[0]}`;
+        formatted[0] = `${OPERATOR_MAP[firstBin.specialValue] ||
+            firstBin.specialValue}${formatted[0]}`;
     }
 
     if (lastBin.end === undefined) {
-        formatted[formatted.length - 1] =
-            `${OPERATOR_MAP[lastBin.specialValue] || lastBin.specialValue}${formatted[formatted.length - 1]}`;
+        formatted[formatted.length - 1] = `${OPERATOR_MAP[
+            lastBin.specialValue
+        ] || lastBin.specialValue}${formatted[formatted.length - 1]}`;
     }
 
     return formatted;
 }
 
-export function formatLinearScaleValues(values: number[])
-{
-    return values.map(value => isScientificSmallValue(value) ?
-        value.toExponential(0) : toFixedDigit(value));
+export function formatLinearScaleValues(values: number[]) {
+    return values.map(value =>
+        isScientificSmallValue(value)
+            ? value.toExponential(0)
+            : toFixedDigit(value)
+    );
 }
 
 export function formatLogScaleValues(values: number[]) {
     return values.map(value => {
         let displayValue;
 
-        if (value === -10 || value === -1 || value === 0 || value === 1 || value === 10) {
+        if (
+            value === -10 ||
+            value === -1 ||
+            value === 0 ||
+            value === 1 ||
+            value === 10
+        ) {
             displayValue = `${value}`;
-        }
-        else {
+        } else {
             const exponent = getExponent(value);
 
             if (Number.isInteger(exponent)) {
                 displayValue = `10^${exponent.toFixed(0)}`;
-            }
-            else if (exponent % 0.5 === 0) {
+            } else if (exponent % 0.5 === 0) {
                 // hide non integer powers of 10 (but we still show the tick itself)
-                displayValue = "";
-            }
-            else {
+                displayValue = '';
+            } else {
                 // show special outliers (if any) as is
                 displayValue = `${value}`;
             }
@@ -800,18 +1145,23 @@ export function isIntegerPowerOfTen(value: number) {
 
 export enum DataBinPosition {
     LEADING = 1,
-    TRAILING = -1
+    TRAILING = -1,
 }
 
-export function closestIntegerPowerOfTen(value: number, dataBinPosition: DataBinPosition) {
+export function closestIntegerPowerOfTen(
+    value: number,
+    dataBinPosition: DataBinPosition
+) {
     if (value) {
         const absLogValue = Math.log10(Math.abs(value));
-        const power = value * dataBinPosition > 0 ? Math.floor(absLogValue) : Math.ceil(absLogValue);
+        const power =
+            value * dataBinPosition > 0
+                ? Math.floor(absLogValue)
+                : Math.ceil(absLogValue);
         const integerPower = Math.pow(10, power);
 
         return Math.sign(value) * integerPower;
-    }
-    else {
+    } else {
         return 1;
     }
 }
@@ -821,33 +1171,37 @@ export function intervalFiltersDisplayValue(values: ClinicalDataFilterValue[]) {
         .filter(value => value.start === undefined && value.end === undefined)
         .map(value => value.value);
 
-    const numericals = values.filter(value => value.start !== undefined || value.end !== undefined);
+    const numericals = values.filter(
+        value => value.start !== undefined || value.end !== undefined
+    );
 
     // merge numericals into one interval
     const start = numericals.length > 0 ? numericals[0].start : undefined;
-    const end = numericals.length > 0 ? numericals[numericals.length - 1].end : undefined;
+    const end =
+        numericals.length > 0
+            ? numericals[numericals.length - 1].end
+            : undefined;
 
     let displayValues: string[] = [];
 
     if (numericals.length > 0) {
         // both ends open
         if (start === undefined && end === undefined) {
-            displayValues.push("All Numbers");
-        }
-        else if (start === undefined) {
+            displayValues.push('All Numbers');
+        } else if (start === undefined) {
             displayValues.push(`≤ ${formatValue(end)}`);
-        }
-        else if (end === undefined) {
+        } else if (end === undefined) {
             displayValues.push(`> ${formatValue(start)}`);
-        }
-        else if (start === end) {
+        } else if (start === end) {
             displayValues.push(`${formatValue(start)}`);
-        }
-        else if (numericals[0].start === numericals[0].end) {
-            displayValues.push(`${formatValue(start)} ≤ x ≤ ${formatValue(end)}`);
-        }
-        else {
-            displayValues.push(`${formatValue(start)} < x ≤ ${formatValue(end)}`);
+        } else if (numericals[0].start === numericals[0].end) {
+            displayValues.push(
+                `${formatValue(start)} ≤ x ≤ ${formatValue(end)}`
+            );
+        } else {
+            displayValues.push(
+                `${formatValue(start)} < x ≤ ${formatValue(end)}`
+            );
         }
     }
 
@@ -856,17 +1210,16 @@ export function intervalFiltersDisplayValue(values: ClinicalDataFilterValue[]) {
         displayValues = displayValues.concat(categories);
     }
 
-    return displayValues.length > 0 ? displayValues.join(", ") : "";
+    return displayValues.length > 0 ? displayValues.join(', ') : '';
 }
 
-export function formatValue(value: number|undefined) {
+export function formatValue(value: number | undefined) {
     let formatted;
 
     if (value !== undefined) {
         if (isScientificSmallValue(value)) {
             formatted = value.toExponential(0);
-        }
-        else {
+        } else {
             formatted = toFixedDigit(value);
         }
     }
@@ -874,8 +1227,7 @@ export function formatValue(value: number|undefined) {
     return formatted;
 }
 
-export function toFixedDigit(value: number, fractionDigits: number = 2)
-{
+export function toFixedDigit(value: number, fractionDigits: number = 2) {
     if (!value) {
         return `${value}`;
     }
@@ -892,8 +1244,9 @@ export function toFixedDigit(value: number, fractionDigits: number = 2)
     // for small numbers we need to know the exact number of leading decimal zeroes
     if (value < 1 && value > -1) {
         const absLogValue = Math.abs(Math.log10(absValue % 1));
-        const numberOfLeadingDecimalZeroes = Number.isInteger(absLogValue) ?
-            Math.floor(absLogValue) - 1 : Math.floor(absLogValue);
+        const numberOfLeadingDecimalZeroes = Number.isInteger(absLogValue)
+            ? Math.floor(absLogValue) - 1
+            : Math.floor(absLogValue);
 
         digits += numberOfLeadingDecimalZeroes;
     }
@@ -903,19 +1256,35 @@ export function toFixedDigit(value: number, fractionDigits: number = 2)
 
 export function getChartMetaDataType(uniqueKey: string): ChartMetaDataType {
     const GENOMIC_DATA_TYPES = [
-        UniqueKey.MUTATION_COUNT_CNA_FRACTION, UniqueKey.CNA_GENES_TABLE, UniqueKey.MUTATED_GENES_TABLE,
-        UniqueKey.MUTATION_COUNT, UniqueKey.FRACTION_GENOME_ALTERED, UniqueKey.WITH_MUTATION_DATA, UniqueKey.WITH_CNA_DATA,
-        UniqueKey.WITH_FUSION_DATA, UniqueKey.FUSION_GENES_TABLE
+        UniqueKey.MUTATION_COUNT_CNA_FRACTION,
+        UniqueKey.CNA_GENES_TABLE,
+        UniqueKey.MUTATED_GENES_TABLE,
+        UniqueKey.MUTATION_COUNT,
+        UniqueKey.FRACTION_GENOME_ALTERED,
+        UniqueKey.WITH_MUTATION_DATA,
+        UniqueKey.WITH_CNA_DATA,
+        UniqueKey.WITH_FUSION_DATA,
+        UniqueKey.FUSION_GENES_TABLE,
     ];
-    return _.includes(GENOMIC_DATA_TYPES, uniqueKey) ? ChartMetaDataTypeEnum.GENOMIC : ChartMetaDataTypeEnum.CLINICAL;
+    return _.includes(GENOMIC_DATA_TYPES, uniqueKey)
+        ? ChartMetaDataTypeEnum.GENOMIC
+        : ChartMetaDataTypeEnum.CLINICAL;
 }
 
 // 10px is reserved by ReactVisualized library as margin right
-export function getFixedHeaderNumberCellMargin(columnWidth: number, theLongestString:string) {
-    return Math.floor((columnWidth - 10 - getFixedHeaderTableMaxLengthStringPixel(theLongestString)) / 2);
+export function getFixedHeaderNumberCellMargin(
+    columnWidth: number,
+    theLongestString: string
+) {
+    return Math.floor(
+        (columnWidth -
+            10 -
+            getFixedHeaderTableMaxLengthStringPixel(theLongestString)) /
+            2
+    );
 }
 
-export function getFixedHeaderTableMaxLengthStringPixel(text:string) {
+export function getFixedHeaderTableMaxLengthStringPixel(text: string) {
     // This is a very specified function to calculate the text length
     // For fixed header table used in study view only
     const FRONT_SIZE = '13px';
@@ -953,7 +1322,7 @@ export function formatFrequency(value: number) {
     } else if (value === 0) {
         return 0;
     } else if (value < 100 && value >= 99.9) {
-         return 99.9;
+        return 99.9;
     } else if (value >= 0.1) {
         value = Math.round(value * 10) / 10;
     } else {
@@ -964,8 +1333,7 @@ export function formatFrequency(value: number) {
     return value;
 }
 
-export function getExponent(value: number): number
-{
+export function getExponent(value: number): number {
     // less precision for values like 3 and 31
     const fractionDigits = Math.abs(value) < 50 ? 1 : 2;
 
@@ -976,16 +1344,25 @@ export function getCNAByAlteration(alteration: number) {
     return CNA_TO_ALTERATION[alteration] || '';
 }
 
-export function getCNAColorByAlteration(alteration: string): string | undefined {
+export function getCNAColorByAlteration(
+    alteration: string
+): string | undefined {
     switch (alteration) {
-        case "HOMDEL": return CNA_COLOR_HOMDEL;
-        case "AMP": return CNA_COLOR_AMP;
-        default: return undefined;
+        case 'HOMDEL':
+            return CNA_COLOR_HOMDEL;
+        case 'AMP':
+            return CNA_COLOR_AMP;
+        default:
+            return undefined;
     }
 }
 
-export function getDefaultChartTypeByClinicalAttribute(clinicalAttribute: ClinicalAttribute): ChartType | undefined {
-    if (STUDY_VIEW_CONFIG.tableAttrs.includes(getUniqueKey(clinicalAttribute))) {
+export function getDefaultChartTypeByClinicalAttribute(
+    clinicalAttribute: ClinicalAttribute
+): ChartType | undefined {
+    if (
+        STUDY_VIEW_CONFIG.tableAttrs.includes(getUniqueKey(clinicalAttribute))
+    ) {
         return ChartTypeEnum.TABLE;
     }
 
@@ -1010,19 +1387,28 @@ export function getDefaultChartTypeByClinicalAttribute(clinicalAttribute: Clinic
  * @returns {ReactGridLayout.Layout[]}
  */
 
-
-export function findSpot(matrix: string[][], chartDimension: ChartDimension): Position {
+export function findSpot(
+    matrix: string[][],
+    chartDimension: ChartDimension
+): Position {
     if (matrix.length === 0) {
         return {
             x: 0,
-            y: 0
+            y: 0,
         };
     }
     let found: Position | undefined = undefined;
     _.each(matrix, (row: string[], rowIndex: number) => {
         _.each(row, (item: string, columnIndex: number) => {
-            if (!item && !isOccupied(matrix, {x: columnIndex, y: rowIndex}, chartDimension)) {
-                found = {x: columnIndex, y: rowIndex};
+            if (
+                !item &&
+                !isOccupied(
+                    matrix,
+                    { x: columnIndex, y: rowIndex },
+                    chartDimension
+                )
+            ) {
+                found = { x: columnIndex, y: rowIndex };
                 return false;
             }
         });
@@ -1034,14 +1420,18 @@ export function findSpot(matrix: string[][], chartDimension: ChartDimension): Po
     if (!found) {
         return {
             x: 0,
-            y: matrix.length
-        }
+            y: matrix.length,
+        };
     } else {
         return found;
     }
 }
 
-export function isOccupied(matrix: string[][], position: Position, chartDimension: ChartDimension) {
+export function isOccupied(
+    matrix: string[][],
+    position: Position,
+    chartDimension: ChartDimension
+) {
     let occupied = false;
     if (matrix.length === 0) {
         return false;
@@ -1076,7 +1466,7 @@ export function isOccupied(matrix: string[][], position: Position, chartDimensio
 }
 
 export function getDefaultChartDimension(): ChartDimension {
-    return {w: 1, h: 1};
+    return { w: 1, h: 1 };
 }
 
 export function calculateLayout(
@@ -1085,27 +1475,41 @@ export function calculateLayout(
     chartsDimension: { [uniqueId: string]: ChartDimension },
     currentGridLayout: Layout[],
     currentFocusedChartByUser?: ChartMeta,
-    currentFocusedChartByUserDimension?: ChartDimension): Layout[] {
+    currentFocusedChartByUserDimension?: ChartDimension
+): Layout[] {
     let layout: Layout[] = [];
-    let availableChartLayoutsMap:{[chartId:string]:boolean} = {}
+    let availableChartLayoutsMap: { [chartId: string]: boolean } = {};
     let matrix = [new Array(cols).fill('')] as string[][];
     // sort the visibleAttributes by priority
     visibleAttributes.sort(chartMetaComparator);
     // look if we need to put the chart to a fixed position and add the position to the matrix
     if (currentGridLayout.length > 0) {
         if (currentFocusedChartByUser && currentFocusedChartByUserDimension) {
-            const currentChartLayout = currentGridLayout.find((layout) => layout.i === currentFocusedChartByUser.uniqueKey)!;
+            const currentChartLayout = currentGridLayout.find(
+                layout => layout.i === currentFocusedChartByUser.uniqueKey
+            )!;
             if (currentChartLayout) {
-                const newChartLayout = calculateNewLayoutForFocusedChart(currentChartLayout, currentFocusedChartByUser, cols, currentFocusedChartByUserDimension);
+                const newChartLayout = calculateNewLayoutForFocusedChart(
+                    currentChartLayout,
+                    currentFocusedChartByUser,
+                    cols,
+                    currentFocusedChartByUserDimension
+                );
                 layout.push(newChartLayout);
-                availableChartLayoutsMap[currentFocusedChartByUser.uniqueKey] = true;
+                availableChartLayoutsMap[
+                    currentFocusedChartByUser.uniqueKey
+                ] = true;
                 matrix = generateMatrixByLayout(newChartLayout, cols);
-            }
-            else {
-                throw (new Error("cannot find matching unique key in the grid layout"));
+            } else {
+                throw new Error(
+                    'cannot find matching unique key in the grid layout'
+                );
             }
         } else {
-            const chartOrderMap = _.keyBy(currentGridLayout, chartLayout => chartLayout.i);
+            const chartOrderMap = _.keyBy(
+                currentGridLayout,
+                chartLayout => chartLayout.i
+            );
             // order charts based on x and y (first order by y, if y is same for both then order by x)
             // push all undefined charts to last
             visibleAttributes.sort((a, b) => {
@@ -1118,7 +1522,9 @@ export function calculateLayout(
                     if (!chart1) {
                         return 1;
                     }
-                    return (chart1.y === chart2.y ? chart1.x - chart2.x : chart1.y - chart2.y);
+                    return chart1.y === chart2.y
+                        ? chart1.x - chart2.x
+                        : chart1.y - chart2.y;
                 }
                 return 0;
             });
@@ -1126,42 +1532,61 @@ export function calculateLayout(
     }
 
     // filter out the fixed position chart then calculate layout
-    _.forEach(_.filter(visibleAttributes, (chart: ChartMeta) => !availableChartLayoutsMap[chart.uniqueKey]), (chart: ChartMeta) => {
-        const dimension = chartsDimension[chart.uniqueKey] || getDefaultChartDimension();
-        const position = findSpot(matrix, dimension);
-        while ((position.y + dimension.h) >= matrix.length) {
-            matrix.push(new Array(cols).fill(''));
-        }
-        layout.push({
-            i: chart.uniqueKey,
-            x: position.x,
-            y: position.y,
-            w: dimension.w,
-            h: dimension.h,
-            isResizable: false
-        });
-        const xMax = position.x + dimension.w;
-        const yMax = position.y + dimension.h;
-        for (let i = position.y; i < yMax; i++) {
-            for (let j = position.x; j < xMax; j++) {
-                matrix[i][j] = chart.uniqueKey;
+    _.forEach(
+        _.filter(
+            visibleAttributes,
+            (chart: ChartMeta) => !availableChartLayoutsMap[chart.uniqueKey]
+        ),
+        (chart: ChartMeta) => {
+            const dimension =
+                chartsDimension[chart.uniqueKey] || getDefaultChartDimension();
+            const position = findSpot(matrix, dimension);
+            while (position.y + dimension.h >= matrix.length) {
+                matrix.push(new Array(cols).fill(''));
+            }
+            layout.push({
+                i: chart.uniqueKey,
+                x: position.x,
+                y: position.y,
+                w: dimension.w,
+                h: dimension.h,
+                isResizable: false,
+            });
+            const xMax = position.x + dimension.w;
+            const yMax = position.y + dimension.h;
+            for (let i = position.y; i < yMax; i++) {
+                for (let j = position.x; j < xMax; j++) {
+                    matrix[i][j] = chart.uniqueKey;
+                }
             }
         }
-    });
+    );
     return layout;
 }
 
-export function calculateNewLayoutForFocusedChart(previousLayout: Layout, currentFocusedChartByUser: ChartMeta, cols: number, currentFocusedChartByUserDimension:ChartDimension): Layout {
+export function calculateNewLayoutForFocusedChart(
+    previousLayout: Layout,
+    currentFocusedChartByUser: ChartMeta,
+    cols: number,
+    currentFocusedChartByUserDimension: ChartDimension
+): Layout {
     const initialX = previousLayout.x;
     const initialY = previousLayout.y;
     const dimensionWidth = currentFocusedChartByUserDimension.w;
     let x = initialX;
     let y = initialY;
 
-    if (isFocusedChartShrunk({w: previousLayout.w, h: previousLayout.h}, currentFocusedChartByUserDimension)) {
+    if (
+        isFocusedChartShrunk(
+            { w: previousLayout.w, h: previousLayout.h },
+            currentFocusedChartByUserDimension
+        )
+    ) {
         x = initialX + previousLayout.w - dimensionWidth;
-    }
-    else if (initialX + dimensionWidth >= cols && initialX - dimensionWidth >= 0) {
+    } else if (
+        initialX + dimensionWidth >= cols &&
+        initialX - dimensionWidth >= 0
+    ) {
         x = cols - dimensionWidth;
     }
 
@@ -1171,11 +1596,14 @@ export function calculateNewLayoutForFocusedChart(previousLayout: Layout, curren
         y,
         w: currentFocusedChartByUserDimension.w,
         h: currentFocusedChartByUserDimension.h,
-        isResizable: false
+        isResizable: false,
     };
 }
 
-export function generateMatrixByLayout(layout: Layout, cols: number) : string[][] {
+export function generateMatrixByLayout(
+    layout: Layout,
+    cols: number
+): string[][] {
     let matrix = [new Array(cols).fill('')] as string[][];
     const xMax = layout.x + layout.w;
     const yMax = layout.y + layout.h;
@@ -1190,12 +1618,18 @@ export function generateMatrixByLayout(layout: Layout, cols: number) : string[][
     return matrix;
 }
 
-export function isFocusedChartShrunk(oldDimension: ChartDimension, newDimension: ChartDimension): boolean {
-    return (oldDimension.w + oldDimension.h) > (newDimension.w + newDimension.h);
+export function isFocusedChartShrunk(
+    oldDimension: ChartDimension,
+    newDimension: ChartDimension
+): boolean {
+    return oldDimension.w + oldDimension.h > newDimension.w + newDimension.h;
 }
 
-export function getPositionXByUniqueKey(layouts: Layout[], uniqueKey: string): number | undefined {
-    const findLayoutResult = _.find(layouts, (layout) => {
+export function getPositionXByUniqueKey(
+    layouts: Layout[],
+    uniqueKey: string
+): number | undefined {
+    const findLayoutResult = _.find(layouts, layout => {
         if (layout.i === uniqueKey) {
             return layout;
         }
@@ -1203,8 +1637,11 @@ export function getPositionXByUniqueKey(layouts: Layout[], uniqueKey: string): n
     return findLayoutResult ? findLayoutResult.x : undefined;
 }
 
-export function getPositionYByUniqueKey(layouts: Layout[], uniqueKey: string): number | undefined {
-    const findLayoutResult = _.find(layouts, (layout) => {
+export function getPositionYByUniqueKey(
+    layouts: Layout[],
+    uniqueKey: string
+): number | undefined {
+    const findLayoutResult = _.find(layouts, layout => {
         if (layout.i === uniqueKey) {
             return layout;
         }
@@ -1213,62 +1650,98 @@ export function getPositionYByUniqueKey(layouts: Layout[], uniqueKey: string): n
 }
 
 export function getDefaultPriorityByUniqueKey(uniqueKey: string): number {
-    return STUDY_VIEW_CONFIG.priority[uniqueKey] === undefined ? 1 : STUDY_VIEW_CONFIG.priority[uniqueKey];
+    return STUDY_VIEW_CONFIG.priority[uniqueKey] === undefined
+        ? 1
+        : STUDY_VIEW_CONFIG.priority[uniqueKey];
 }
 
-export function getPriorityByClinicalAttribute(clinicalAttribute: ClinicalAttribute): number {
+export function getPriorityByClinicalAttribute(
+    clinicalAttribute: ClinicalAttribute
+): number {
     // If the priority is the default which means the priority has not been manually modified, then we should check
     // the whether there are priorities predefined
     const priorityFromDB = Number(clinicalAttribute.priority);
     if (priorityFromDB === STUDY_VIEW_CONFIG.defaultPriority) {
         const uniqueKey = getUniqueKey(clinicalAttribute);
-        return STUDY_VIEW_CONFIG.priority[uniqueKey] === undefined ? STUDY_VIEW_CONFIG.defaultPriority : STUDY_VIEW_CONFIG.priority[uniqueKey];
+        return STUDY_VIEW_CONFIG.priority[uniqueKey] === undefined
+            ? STUDY_VIEW_CONFIG.defaultPriority
+            : STUDY_VIEW_CONFIG.priority[uniqueKey];
     } else {
-        return priorityFromDB
+        return priorityFromDB;
     }
 }
 
 // Grid includes 10px margin
-export function getWidthByDimension(chartDimension: ChartDimension, borderWidth: number) {
-    return STUDY_VIEW_CONFIG.layout.grid.w * chartDimension.w + (chartDimension.w - 1) * STUDY_VIEW_CONFIG.layout.gridMargin.x - borderWidth * 2;
+export function getWidthByDimension(
+    chartDimension: ChartDimension,
+    borderWidth: number
+) {
+    return (
+        STUDY_VIEW_CONFIG.layout.grid.w * chartDimension.w +
+        (chartDimension.w - 1) * STUDY_VIEW_CONFIG.layout.gridMargin.x -
+        borderWidth * 2
+    );
 }
 
 // Grid includes 15px header and 35px tool section
-export function getHeightByDimension(chartDimension: ChartDimension, chartHeight: number) {
-    return STUDY_VIEW_CONFIG.layout.grid.h * chartDimension.h + (chartDimension.h - 1) * STUDY_VIEW_CONFIG.layout.gridMargin.y - chartHeight;
+export function getHeightByDimension(
+    chartDimension: ChartDimension,
+    chartHeight: number
+) {
+    return (
+        STUDY_VIEW_CONFIG.layout.grid.h * chartDimension.h +
+        (chartDimension.h - 1) * STUDY_VIEW_CONFIG.layout.gridMargin.y -
+        chartHeight
+    );
 }
 
 // 30px tool section
-export function getTableHeightByDimension(chartDimension: ChartDimension, chartHeight: number) {
+export function getTableHeightByDimension(
+    chartDimension: ChartDimension,
+    chartHeight: number
+) {
     return getHeightByDimension(chartDimension, chartHeight) - 30;
 }
 
-export function getQValue(qvalue: number):string {
+export function getQValue(qvalue: number): string {
     if (qvalue === 0) {
         return '0';
     } else {
-        return qvalue.toExponential(EXPONENTIAL_FRACTION_DIGITS)
+        return qvalue.toExponential(EXPONENTIAL_FRACTION_DIGITS);
     }
 }
 
-export function pickClinicalAttrFixedColors(data: ClinicalDataCount[]): {[attribute: string]: string}
-{
-    return _.reduce(data, (acc: { [id: string]: string }, slice) => {
-        // pick a fixed color if predefined
-        const fixed = isNAClinicalValue(slice.value) ? DEFAULT_NA_COLOR : getClinicalValueColor(slice.value);
+export function pickClinicalAttrFixedColors(
+    data: ClinicalDataCount[]
+): { [attribute: string]: string } {
+    return _.reduce(
+        data,
+        (acc: { [id: string]: string }, slice) => {
+            // pick a fixed color if predefined
+            const fixed = isNAClinicalValue(slice.value)
+                ? DEFAULT_NA_COLOR
+                : getClinicalValueColor(slice.value);
 
-        if (fixed) {
-            // update the map
-            acc[slice.value] = fixed;
-        }
+            if (fixed) {
+                // update the map
+                acc[slice.value] = fixed;
+            }
 
-        return acc;
-    }, {});
+            return acc;
+        },
+        {}
+    );
 }
 
-export type ClinicalDataCountSummary = ClinicalDataCount & { color: string , percentage: number, freq: string}
+export type ClinicalDataCountSummary = ClinicalDataCount & {
+    color: string;
+    percentage: number;
+    freq: string;
+};
 
-export function getClinicalDataCountWithColorByClinicalDataCount(counts:ClinicalDataCount[]):ClinicalDataCountSummary[] {
+export function getClinicalDataCountWithColorByClinicalDataCount(
+    counts: ClinicalDataCount[]
+): ClinicalDataCountSummary[] {
     counts.sort(clinicalDataCountComparator);
     const colors = pickClinicalDataColors(counts);
     const sum = _.sumBy(counts, count => count.count);
@@ -1278,50 +1751,72 @@ export function getClinicalDataCountWithColorByClinicalDataCount(counts:Clinical
             ...slice,
             color: colors[slice.value],
             percentage: percentage,
-            freq: getFrequencyStr(percentage * 100)
+            freq: getFrequencyStr(percentage * 100),
         };
     });
 }
 
-export function pickClinicalAttrColorsByIndex(data: ClinicalDataCount[],
-                                              availableColors: string[]): {[attribute: string]: string}
-{
+export function pickClinicalAttrColorsByIndex(
+    data: ClinicalDataCount[],
+    availableColors: string[]
+): { [attribute: string]: string } {
     let colorIndex = 0;
 
-    return _.reduce(data, (acc: { [id: string]: string }, slice) => {
-        if (!isNAClinicalValue(slice.value) && !getClinicalValueColor(slice.value)) {
-            acc[slice.value] = availableColors[colorIndex % availableColors.length];
-            colorIndex++;
-        }
-        return acc;
-    }, {});
+    return _.reduce(
+        data,
+        (acc: { [id: string]: string }, slice) => {
+            if (
+                !isNAClinicalValue(slice.value) &&
+                !getClinicalValueColor(slice.value)
+            ) {
+                acc[slice.value] =
+                    availableColors[colorIndex % availableColors.length];
+                colorIndex++;
+            }
+            return acc;
+        },
+        {}
+    );
 }
 
-export function calculateClinicalDataCountFrequency(data: ClinicalDataCountSet, numOfSelectedSamples: number): ClinicalDataCountSet {
-    return _.reduce(data, (acc, next, key) => {
-        acc[key] = next * 100 / numOfSelectedSamples;
-        return acc;
-    }, {} as { [attrId: string]: number });
+export function calculateClinicalDataCountFrequency(
+    data: ClinicalDataCountSet,
+    numOfSelectedSamples: number
+): ClinicalDataCountSet {
+    return _.reduce(
+        data,
+        (acc, next, key) => {
+            acc[key] = (next * 100) / numOfSelectedSamples;
+            return acc;
+        },
+        {} as { [attrId: string]: number }
+    );
 }
 
-
-export function getOptionsByChartMetaDataType(type: ChartMetaDataType, allCharts: { [id: string]: ChartMeta }, selectedAttrs: string[], allChartTypes:{[id:string]:ChartType}) {
-    return _.filter(allCharts, chartMeta => chartMeta.dataType === type)
-        .map(chartMeta => {
+export function getOptionsByChartMetaDataType(
+    type: ChartMetaDataType,
+    allCharts: { [id: string]: ChartMeta },
+    selectedAttrs: string[],
+    allChartTypes: { [id: string]: ChartType }
+) {
+    return _.filter(allCharts, chartMeta => chartMeta.dataType === type).map(
+        chartMeta => {
             return {
                 label: chartMeta.displayName,
                 key: chartMeta.uniqueKey,
                 chartType: allChartTypes[chartMeta.uniqueKey],
                 disabled: false,
                 selected: selectedAttrs.includes(chartMeta.uniqueKey),
-                freq: 100
-            }
-        });
+                freq: 100,
+            };
+        }
+    );
 }
 
-export function pickClinicalDataColors(data: ClinicalDataCount[],
-                                       colors: string[] = COLORS): {[attribute: string]: string}
-{
+export function pickClinicalDataColors(
+    data: ClinicalDataCount[],
+    colors: string[] = COLORS
+): { [attribute: string]: string } {
     let availableColors = _.cloneDeep(colors);
 
     // pick colors for the fixed clinical attribute values first
@@ -1332,23 +1827,33 @@ export function pickClinicalDataColors(data: ClinicalDataCount[],
     availableColors = _.difference(availableColors, _.values(fixedColors));
 
     // then pick colors for the remaining attributes
-    return {...pickClinicalAttrColorsByIndex(data, availableColors), ...fixedColors};
+    return {
+        ...pickClinicalAttrColorsByIndex(data, availableColors),
+        ...fixedColors,
+    };
 }
 
-export function isNAClinicalValue(value:string) {
+export function isNAClinicalValue(value: string) {
     return value.toLowerCase().trim() === 'na';
 }
 
-export function getFilteredSampleIdentifiers(samples:Sample[], isFiltered?:(sample:Sample)=>boolean){
-    return _.reduce(samples, (acc, sample) => {
-        if (isFiltered === undefined || isFiltered(sample)) {
-            acc.push({
-                sampleId: sample.sampleId,
-                studyId: sample.studyId
-            });
-        }
-        return acc;
-    }, [] as SampleIdentifier[])
+export function getFilteredSampleIdentifiers(
+    samples: Sample[],
+    isFiltered?: (sample: Sample) => boolean
+) {
+    return _.reduce(
+        samples,
+        (acc, sample) => {
+            if (isFiltered === undefined || isFiltered(sample)) {
+                acc.push({
+                    sampleId: sample.sampleId,
+                    studyId: sample.studyId,
+                });
+            }
+            return acc;
+        },
+        [] as SampleIdentifier[]
+    );
 }
 
 /**
@@ -1359,25 +1864,33 @@ export function getSamplesByExcludingFiltersOnChart(
     filter: StudyViewFilter,
     sampleIdentiferFilterSet: { [id: string]: SampleIdentifier[] },
     queriedSampleIdentifiers: SampleIdentifier[],
-    queriedStudyIds: string[]): Promise<Sample[]> {
-
+    queriedStudyIds: string[]
+): Promise<Sample[]> {
     //create filter without study/sample identifiers
     let updatedFilter: StudyViewFilter = {
         clinicalDataFilters: filter.clinicalDataFilters,
-        geneFilters: filter.geneFilters
+        geneFilters: filter.geneFilters,
     } as any;
 
-    let _sampleIdentifiers = _.reduce(sampleIdentiferFilterSet, (acc, sampleIdentifiers, key) => {
-        //exclude chart filters
-        if (chartKey !== key) {
-            if (acc.length === 0) {
-                acc = sampleIdentifiers;
-            } else {
-                acc = _.intersectionWith(acc, sampleIdentifiers, _.isEqual) as SampleIdentifier[];
+    let _sampleIdentifiers = _.reduce(
+        sampleIdentiferFilterSet,
+        (acc, sampleIdentifiers, key) => {
+            //exclude chart filters
+            if (chartKey !== key) {
+                if (acc.length === 0) {
+                    acc = sampleIdentifiers;
+                } else {
+                    acc = _.intersectionWith(
+                        acc,
+                        sampleIdentifiers,
+                        _.isEqual
+                    ) as SampleIdentifier[];
+                }
             }
-        }
-        return acc
-    }, [] as SampleIdentifier[]);
+            return acc;
+        },
+        [] as SampleIdentifier[]
+    );
 
     if (_sampleIdentifiers && _sampleIdentifiers.length > 0) {
         updatedFilter.sampleIdentifiers = _sampleIdentifiers;
@@ -1389,11 +1902,19 @@ export function getSamplesByExcludingFiltersOnChart(
         }
     }
     return internalClient.fetchFilteredSamplesUsingPOST({
-        studyViewFilter: updatedFilter
+        studyViewFilter: updatedFilter,
     });
 }
 
-export function getRequestedAwaitPromisesForClinicalData(isDefaultVisibleAttribute:boolean, isInitialFilterState: boolean, chartsAreFiltered: boolean, chartIsFiltered: boolean, unfilteredPromise: MobxPromise<any>, newlyAddedUnfilteredPromise: MobxPromise<any>, initialVisibleAttributesPromise: MobxPromise<any>): MobxPromise<any>[] {
+export function getRequestedAwaitPromisesForClinicalData(
+    isDefaultVisibleAttribute: boolean,
+    isInitialFilterState: boolean,
+    chartsAreFiltered: boolean,
+    chartIsFiltered: boolean,
+    unfilteredPromise: MobxPromise<any>,
+    newlyAddedUnfilteredPromise: MobxPromise<any>,
+    initialVisibleAttributesPromise: MobxPromise<any>
+): MobxPromise<any>[] {
     if (isInitialFilterState && isDefaultVisibleAttribute && !chartIsFiltered) {
         return [initialVisibleAttributesPromise];
     } else if (!isDefaultVisibleAttribute && !chartsAreFiltered) {
@@ -1415,107 +1936,147 @@ export function customBinsAreValid(newBins: string[]): boolean {
     });
 }
 
-export async function getHugoSymbolByEntrezGeneId(entrezGeneId: number): Promise<string> {
+export async function getHugoSymbolByEntrezGeneId(
+    entrezGeneId: number
+): Promise<string> {
     const gene: Gene = await defaultClient.getGeneUsingGET({
-        geneId: entrezGeneId.toString()
+        geneId: entrezGeneId.toString(),
     });
     return gene.hugoGeneSymbol;
 }
 
 // returns true when there is only one virtual study and no physical studies
-export function showOriginStudiesInSummaryDescription(physicalStudies: CancerStudy[], virtualStudies: VirtualStudy[]) {
+export function showOriginStudiesInSummaryDescription(
+    physicalStudies: CancerStudy[],
+    virtualStudies: VirtualStudy[]
+) {
     return physicalStudies.length === 0 && virtualStudies.length === 1;
 }
 
 export function getFilteredStudiesWithSamples(
     samples: Sample[],
     physicalStudies: CancerStudy[],
-    virtualStudies: VirtualStudy[]) {
-
+    virtualStudies: VirtualStudy[]
+) {
     let queriedStudiesWithSamples: StudyWithSamples[] = [];
     const selectedStudySampleSet = _.groupBy(samples, sample => sample.studyId);
 
     _.each(physicalStudies, study => {
         const samples = selectedStudySampleSet[study.studyId];
         if (samples && samples.length > 0) {
-            queriedStudiesWithSamples.push({ ...study, uniqueSampleKeys: _.map(samples, sample => sample.uniqueSampleKey) });
+            queriedStudiesWithSamples.push({
+                ...study,
+                uniqueSampleKeys: _.map(
+                    samples,
+                    sample => sample.uniqueSampleKey
+                ),
+            });
         }
-    })
+    });
 
     _.each(virtualStudies, virtualStudy => {
-        let selectedSamples: Sample[] = []
+        let selectedSamples: Sample[] = [];
         virtualStudy.data.studies.forEach(study => {
             let samples = selectedStudySampleSet[study.id];
             if (samples && samples.length > 0) {
                 selectedSamples = selectedSamples.concat(samples);
             }
-        })
+        });
 
         if (selectedSamples.length > 0) {
             let study = {
                 name: virtualStudy.data.name,
                 description: virtualStudy.data.description,
                 studyId: virtualStudy.id,
-            } as CancerStudy
-            queriedStudiesWithSamples.push({ ...study, uniqueSampleKeys: _.map(selectedSamples, sample => sample.uniqueSampleKey) });
+            } as CancerStudy;
+            queriedStudiesWithSamples.push({
+                ...study,
+                uniqueSampleKeys: _.map(
+                    selectedSamples,
+                    sample => sample.uniqueSampleKey
+                ),
+            });
         }
     });
     return queriedStudiesWithSamples;
 }
 
-export function clinicalDataCountComparator(a: ClinicalDataCount, b: ClinicalDataCount): number
-{
+export function clinicalDataCountComparator(
+    a: ClinicalDataCount,
+    b: ClinicalDataCount
+): number {
     if (isNAClinicalValue(a.value)) {
         return isNAClinicalValue(b.value) ? 0 : 1;
-    }
-    else if (isNAClinicalValue(b.value)) {
+    } else if (isNAClinicalValue(b.value)) {
         return -1;
-    }
-    else {
+    } else {
         return b.count - a.count;
     }
 }
 
 type ClinicalAttributeSorting = {
-    priority: number,
-    displayName: string
-}
+    priority: number;
+    displayName: string;
+};
 
-export function clinicalAttributeSortingComparator(a: ClinicalAttributeSorting, b: ClinicalAttributeSorting): number {
-    return b.priority - a.priority || a.displayName.localeCompare(b.displayName);
+export function clinicalAttributeSortingComparator(
+    a: ClinicalAttributeSorting,
+    b: ClinicalAttributeSorting
+): number {
+    return (
+        b.priority - a.priority || a.displayName.localeCompare(b.displayName)
+    );
 }
 
-export function clinicalAttributeComparator(a: ClinicalAttribute, b: ClinicalAttribute): number {
-    return clinicalAttributeSortingComparator({
-        priority: Number(a.priority),
-        displayName: a.displayName
-    }, {
-        priority: Number(b.priority),
-        displayName: b.displayName
-    });
+export function clinicalAttributeComparator(
+    a: ClinicalAttribute,
+    b: ClinicalAttribute
+): number {
+    return clinicalAttributeSortingComparator(
+        {
+            priority: Number(a.priority),
+            displayName: a.displayName,
+        },
+        {
+            priority: Number(b.priority),
+            displayName: b.displayName,
+        }
+    );
 }
 
 // Descent sort priority then ascent sort by display name
 export function chartMetaComparator(a: ChartMeta, b: ChartMeta): number {
-    return clinicalAttributeSortingComparator({
-        priority: a.priority,
-        displayName: a.displayName
-    }, {
-        priority: b.priority,
-        displayName: b.displayName
-    });
+    return clinicalAttributeSortingComparator(
+        {
+            priority: a.priority,
+            displayName: a.displayName,
+        },
+        {
+            priority: b.priority,
+            displayName: b.displayName,
+        }
+    );
 }
 
-
-export function submitToPage(url:string, params: { [id: string]: string }, target?: string) {
+export function submitToPage(
+    url: string,
+    params: { [id: string]: string },
+    target?: string
+) {
     try {
-        window.localStorage.setItem("legacyStudySubmission", JSON.stringify(params))
+        window.localStorage.setItem(
+            'legacyStudySubmission',
+            JSON.stringify(params)
+        );
         window.open(buildCBioPortalPageUrl(url), target);
     } catch (e) {
         // try clearing localStorage
         window.localStorage.clear();
         try {
-            window.localStorage.setItem("legacyStudySubmission", JSON.stringify(params));
+            window.localStorage.setItem(
+                'legacyStudySubmission',
+                JSON.stringify(params)
+            );
             window.open(buildCBioPortalPageUrl(url), target);
         } catch (e) {
             // TODO - currenlty alerting user with message until we have a proper solution
@@ -1524,29 +2085,38 @@ export function submitToPage(url:string, params: { [id: string]: string }, targe
     }
 }
 
-export function getClinicalEqualityFilterValuesByString(filterValues: string):string[] {
-    return filterValues.replace(/\\,/g,'$@$').split(",").map(val=>val.trim().replace(/\$@\$/g,','));
+export function getClinicalEqualityFilterValuesByString(
+    filterValues: string
+): string[] {
+    return filterValues
+        .replace(/\\,/g, '$@$')
+        .split(',')
+        .map(val => val.trim().replace(/\$@\$/g, ','));
 }
 
-export function getClinicalDataCountWithColorByCategoryCounts(yesCount:number, noCount: number):ClinicalDataCountSummary[] {
-
+export function getClinicalDataCountWithColorByCategoryCounts(
+    yesCount: number,
+    noCount: number
+): ClinicalDataCountSummary[] {
     let dataCountSet: { [id: string]: ClinicalDataCount } = {};
     if (yesCount > 0) {
         dataCountSet[Datalabel.YES] = {
-            'count': yesCount,
-            'value': Datalabel.YES
-        }
+            count: yesCount,
+            value: Datalabel.YES,
+        };
     }
     if (noCount > 0) {
         dataCountSet[Datalabel.NO] = {
-            'count': noCount,
-            'value': Datalabel.NO
-        }
+            count: noCount,
+            value: Datalabel.NO,
+        };
     }
-    return getClinicalDataCountWithColorByClinicalDataCount(_.values(dataCountSet));
+    return getClinicalDataCountWithColorByClinicalDataCount(
+        _.values(dataCountSet)
+    );
 }
 
-export function getStudyViewTabId(pathname:string) {
+export function getStudyViewTabId(pathname: string) {
     const match = pathname.match(/study\/([^\/]+)/);
     if (match) {
         return match[1] as StudyViewPageTabKeyEnum;
@@ -1556,37 +2126,44 @@ export function getStudyViewTabId(pathname:string) {
 }
 
 export function getSelectedGroupNames(
-    groups:Pick<StudyViewComparisonGroup, "name">[]
+    groups: Pick<StudyViewComparisonGroup, 'name'>[]
 ) {
     if (groups.length <= 2) {
-        return groups.map(group=>group.name).join(" and ");
+        return groups.map(group => group.name).join(' and ');
     } else {
-        return `${groups[0].name} and ${groups.length-1} other groups`;
+        return `${groups[0].name} and ${groups.length - 1} other groups`;
     }
 }
 
 export function getPatientIdentifiers(
-    groups:Pick<StudyViewComparisonGroup, "studies">[]
+    groups: Pick<StudyViewComparisonGroup, 'studies'>[]
 ) {
     return _.uniqWith(
         _.flattenDeep<PatientIdentifier>(
-            groups.map(group=>group.studies.map(study=>{
-                const studyId = study.id;
-                return study.patients.map(patientId=>({ studyId, patientId }));
-            }))
+            groups.map(group =>
+                group.studies.map(study => {
+                    const studyId = study.id;
+                    return study.patients.map(patientId => ({
+                        studyId,
+                        patientId,
+                    }));
+                })
+            )
         ),
-        (id1, id2)=>((id1.patientId === id2.patientId) && (id1.studyId === id2.studyId))
+        (id1, id2) =>
+            id1.patientId === id2.patientId && id1.studyId === id2.studyId
     );
 }
 
 export function isSpecialChart(chartMeta: ChartMeta) {
-    return SPECIAL_CHARTS.findIndex(
-        cm => cm.uniqueKey === chartMeta.uniqueKey
-    ) > -1;
+    return (
+        SPECIAL_CHARTS.findIndex(cm => cm.uniqueKey === chartMeta.uniqueKey) >
+        -1
+    );
 }
 
-
-export function getChartSettingsMap(visibleAttributes: ChartMeta[],
+export function getChartSettingsMap(
+    visibleAttributes: ChartMeta[],
     columns: number,
     chartDimensionSet: { [uniqueId: string]: ChartDimension },
     chartTypeSet: { [uniqueId: string]: ChartType },
@@ -1595,30 +2172,42 @@ export function getChartSettingsMap(visibleAttributes: ChartMeta[],
     filterMutatedGenesTableByCancerGenes: boolean = true,
     filterFusionGenesTableByCancerGenes: boolean = true,
     filterCNAGenesTableByCancerGenes: boolean = true,
-    gridLayout?: ReactGridLayout.Layout[]) {
-
+    gridLayout?: ReactGridLayout.Layout[]
+) {
     if (!gridLayout) {
-        gridLayout = calculateLayout(visibleAttributes, columns, chartDimensionSet, []);
+        gridLayout = calculateLayout(
+            visibleAttributes,
+            columns,
+            chartDimensionSet,
+            []
+        );
     }
 
     let chartSettingsMap: { [chartId: string]: ChartUserSetting } = {};
     visibleAttributes.forEach(attribute => {
-        const id = attribute.uniqueKey
+        const id = attribute.uniqueKey;
         const chartType = chartTypeSet[id] || 'NONE';
         chartSettingsMap[attribute.uniqueKey] = {
             id: attribute.uniqueKey,
             chartType,
-            patientAttribute: attribute.patientAttribute // add chart attribute type
-        }
+            patientAttribute: attribute.patientAttribute, // add chart attribute type
+        };
         if (chartType === UniqueKey.MUTATED_GENES_TABLE) {
-            chartSettingsMap[attribute.uniqueKey].filterByCancerGenes = filterMutatedGenesTableByCancerGenes;
+            chartSettingsMap[
+                attribute.uniqueKey
+            ].filterByCancerGenes = filterMutatedGenesTableByCancerGenes;
         } else if (chartType === UniqueKey.FUSION_GENES_TABLE) {
-            chartSettingsMap[attribute.uniqueKey].filterByCancerGenes = filterFusionGenesTableByCancerGenes;
+            chartSettingsMap[
+                attribute.uniqueKey
+            ].filterByCancerGenes = filterFusionGenesTableByCancerGenes;
         } else if (chartType === UniqueKey.CNA_GENES_TABLE) {
-            chartSettingsMap[attribute.uniqueKey].filterByCancerGenes = filterCNAGenesTableByCancerGenes;
+            chartSettingsMap[
+                attribute.uniqueKey
+            ].filterByCancerGenes = filterCNAGenesTableByCancerGenes;
         }
         const customChart = customChartSet[id];
-        if (customChart) { // if its custom chart add groups and name
+        if (customChart) {
+            // if its custom chart add groups and name
             chartSettingsMap[id].groups = customChart.groups;
             chartSettingsMap[id].name = attribute.displayName;
         }
@@ -1627,7 +2216,8 @@ export function getChartSettingsMap(visibleAttributes: ChartMeta[],
                 chartSettingsMap[id].disableLogScale = true;
             }
             if (!_.isEmpty(clinicalDataBinFilter[id].customBins)) {
-                chartSettingsMap[id].customBins = clinicalDataBinFilter[id].customBins;
+                chartSettingsMap[id].customBins =
+                    clinicalDataBinFilter[id].customBins;
             }
         }
     });
@@ -1638,14 +2228,16 @@ export function getChartSettingsMap(visibleAttributes: ChartMeta[],
                 x: layout.x,
                 y: layout.y,
                 w: layout.w,
-                h: layout.h
+                h: layout.h,
             };
         }
     });
     return chartSettingsMap;
 }
 
-export function getBinName(dataBin: Pick<DataBin, "specialValue"|"start"|"end">) {
+export function getBinName(
+    dataBin: Pick<DataBin, 'specialValue' | 'start' | 'end'>
+) {
     // specialValue can be any non-numeric character. ex: "=<", ">", "NA"
     if (dataBin.specialValue !== undefined) {
         if (dataBin.start !== undefined) {
@@ -1659,83 +2251,120 @@ export function getBinName(dataBin: Pick<DataBin, "specialValue"|"start"|"end">)
     if (dataBin.start !== undefined && dataBin.end !== undefined) {
         return `${dataBin.start}-${dataBin.end}`;
     }
-    return ''
-}
-
-export function getGroupedClinicalDataByBins(data: ClinicalData[], dataBins: DataBin[]) {
-    const numericDataBins = dataBins.filter(dataBin => dataBin.specialValue === undefined);
-    const specialDataBins = dataBins.filter(dataBin => dataBin.specialValue !== undefined);
-    return _.reduce(data, (acc, datum) => {
-        let dataBin: DataBin | undefined;
-        // Check if the ClinicalData value is number
-        if (!isNaN(datum.value as any)) {
-            //find if it belongs to any of numeric bins.
-            dataBin = _.find(numericDataBins, dataBin => parseFloat(datum.value) > dataBin.start && parseFloat(datum.value) <= dataBin.end);
-        }
+    return '';
+}
 
-        //If ClinicalData value is not a number of does not belong to any number bins
-        if (dataBin === undefined) {
-            //find if it belongs to any of sepcial bins.
-            dataBin = _.find(specialDataBins, dataBin => {
-                if (!isNaN(datum.value as any)) {
-                    if (dataBin.end !== undefined) {
-                        return parseFloat(datum.value) <= dataBin.end;
-                    }
-                    else if (dataBin.start !== undefined) {
-                        return parseFloat(datum.value) > dataBin.start;
+export function getGroupedClinicalDataByBins(
+    data: ClinicalData[],
+    dataBins: DataBin[]
+) {
+    const numericDataBins = dataBins.filter(
+        dataBin => dataBin.specialValue === undefined
+    );
+    const specialDataBins = dataBins.filter(
+        dataBin => dataBin.specialValue !== undefined
+    );
+    return _.reduce(
+        data,
+        (acc, datum) => {
+            let dataBin: DataBin | undefined;
+            // Check if the ClinicalData value is number
+            if (!isNaN(datum.value as any)) {
+                //find if it belongs to any of numeric bins.
+                dataBin = _.find(
+                    numericDataBins,
+                    dataBin =>
+                        parseFloat(datum.value) > dataBin.start &&
+                        parseFloat(datum.value) <= dataBin.end
+                );
+            }
+
+            //If ClinicalData value is not a number of does not belong to any number bins
+            if (dataBin === undefined) {
+                //find if it belongs to any of sepcial bins.
+                dataBin = _.find(specialDataBins, dataBin => {
+                    if (!isNaN(datum.value as any)) {
+                        if (dataBin.end !== undefined) {
+                            return parseFloat(datum.value) <= dataBin.end;
+                        } else if (dataBin.start !== undefined) {
+                            return parseFloat(datum.value) > dataBin.start;
+                        }
                     }
+                    return dataBin.specialValue === datum.value;
+                });
+            }
+            if (dataBin) {
+                let name = getBinName(dataBin);
+                if (acc[name] === undefined) {
+                    acc[name] = [];
                 }
-                return dataBin.specialValue === datum.value;
-            });
-        }
-        if (dataBin) {
-            let name = getBinName(dataBin);
-            if (acc[name] === undefined) {
-                acc[name] = [];
+                acc[name].push(datum);
             }
-            acc[name].push(datum);
+            return acc;
+        },
+        {} as {
+            [id: string]: ClinicalData[];
         }
-        return acc;
-    }, {} as {
-        [id: string]: ClinicalData[];
-    });
+    );
 }
 
-export function getGroupsFromBins(samples: Sample[], patientAttribute: boolean, data: ClinicalData[], dataBins: DataBin[], origin: string[]) {
-
-    let patientToSamples: { [uniquePatientKey: string]: SampleIdentifier[] } = {};
+export function getGroupsFromBins(
+    samples: Sample[],
+    patientAttribute: boolean,
+    data: ClinicalData[],
+    dataBins: DataBin[],
+    origin: string[]
+) {
+    let patientToSamples: {
+        [uniquePatientKey: string]: SampleIdentifier[];
+    } = {};
     if (patientAttribute) {
         patientToSamples = _.groupBy(samples, s => s.uniquePatientKey);
     }
 
     const clinicalDataByBins = getGroupedClinicalDataByBins(data, dataBins);
-    const binsOrder = dataBins.map(dataBin=>getBinName(dataBin))
-    const binsOrderSet = stringListToIndexSet(binsOrder)
-
-    return _.reduce(clinicalDataByBins, (acc, clinicalData, name) => {
-        if (clinicalData.length !== 0) {
-            let sampleIdentifiers: SampleIdentifier[] = []
+    const binsOrder = dataBins.map(dataBin => getBinName(dataBin));
+    const binsOrderSet = stringListToIndexSet(binsOrder);
+
+    return _.reduce(
+        clinicalDataByBins,
+        (acc, clinicalData, name) => {
+            if (clinicalData.length !== 0) {
+                let sampleIdentifiers: SampleIdentifier[] = [];
+
+                if (patientAttribute) {
+                    sampleIdentifiers = _.flatMapDeep(
+                        clinicalData,
+                        (d: ClinicalData) => {
+                            return patientToSamples[d.uniquePatientKey].map(
+                                s => ({
+                                    studyId: s.studyId,
+                                    sampleId: s.sampleId,
+                                })
+                            );
+                        }
+                    );
+                } else {
+                    sampleIdentifiers = clinicalData.map(d => ({
+                        studyId: d.studyId,
+                        sampleId: d.sampleId,
+                    }));
+                }
 
-            if (patientAttribute) {
-                sampleIdentifiers = _.flatMapDeep(clinicalData, (d: ClinicalData) => {
-                    return patientToSamples[d.uniquePatientKey].map(s => ({ studyId: s.studyId, sampleId: s.sampleId }));
-                });
-            } else {
-                sampleIdentifiers = clinicalData.map(d => ({ studyId: d.studyId, sampleId: d.sampleId }));
+                acc.push(getGroupParameters(name, sampleIdentifiers, origin));
             }
-
-            acc.push(getGroupParameters(
-                name,
-                sampleIdentifiers,
-                origin
-            ))
-        }
-        return acc;
-    }, [] as SessionGroupData[]).sort((a, b) => binsOrderSet[a.name] - binsOrderSet[b.name]);
+            return acc;
+        },
+        [] as SessionGroupData[]
+    ).sort((a, b) => binsOrderSet[a.name] - binsOrderSet[b.name]);
 }
 
-export function getGroupsFromQuartiles(samples: Sample[], patientAttribute: boolean, quartiles: ClinicalData[][], origin: string[]) {
-
+export function getGroupsFromQuartiles(
+    samples: Sample[],
+    patientAttribute: boolean,
+    quartiles: ClinicalData[][],
+    origin: string[]
+) {
     let patientToSamples: {
         [uniquePatientKey: string]: SampleIdentifier[];
     } = {};
@@ -1744,15 +2373,19 @@ export function getGroupsFromQuartiles(samples: Sample[], patientAttribute: bool
     }
     // create groups using data
     return quartiles.map(quartile => {
-
-        let sampleIdentifiers: SampleIdentifier[] = []
+        let sampleIdentifiers: SampleIdentifier[] = [];
         if (patientAttribute) {
             sampleIdentifiers = _.flatMapDeep(quartile, (d: ClinicalData) => {
-                return patientToSamples[d.uniquePatientKey].map(s => ({ studyId: s.studyId, sampleId: s.sampleId }));
+                return patientToSamples[d.uniquePatientKey].map(s => ({
+                    studyId: s.studyId,
+                    sampleId: s.sampleId,
+                }));
             });
-        }
-        else {
-            sampleIdentifiers = quartile.map(d => ({ studyId: d.studyId, sampleId: d.sampleId }));
+        } else {
+            sampleIdentifiers = quartile.map(d => ({
+                studyId: d.studyId,
+                sampleId: d.sampleId,
+            }));
         }
 
         return getGroupParameters(
@@ -1764,14 +2397,23 @@ export function getGroupsFromQuartiles(samples: Sample[], patientAttribute: bool
 }
 
 export function getButtonNameWithDownPointer(buttonName: string) {
-    return buttonName + " " + String.fromCharCode(9662);/*small solid down triangle*/
+    return (
+        buttonName + ' ' + String.fromCharCode(9662)
+    ); /*small solid down triangle*/
 }
 
-export function getFilteredAndCompressedDataIntervalFilters(values: ClinicalDataFilterValue[]): ClinicalDataFilterValue {
-    const numericals = values.filter(value => value.start !== undefined || value.end !== undefined);
+export function getFilteredAndCompressedDataIntervalFilters(
+    values: ClinicalDataFilterValue[]
+): ClinicalDataFilterValue {
+    const numericals = values.filter(
+        value => value.start !== undefined || value.end !== undefined
+    );
 
     // merge numericals into one interval
     const start = numericals.length > 0 ? numericals[0].start : undefined;
-    const end = numericals.length > 0 ? numericals[numericals.length - 1].end : undefined;
-    return { start, end } as any
+    const end =
+        numericals.length > 0
+            ? numericals[numericals.length - 1].end
+            : undefined;
+    return { start, end } as any;
 }
diff --git a/src/pages/studyView/TableUtils.tsx b/src/pages/studyView/TableUtils.tsx
index cb4f6e29d8b..c6af2554d7a 100644
--- a/src/pages/studyView/TableUtils.tsx
+++ b/src/pages/studyView/TableUtils.tsx
@@ -1,13 +1,19 @@
 import * as React from 'react';
-import {getOncoKBCancerGeneListLinkout, getOncoKBReferenceInfo} from "./oncokb/OncoKBUtils";
-import styles from "./table/tables.module.scss";
+import {
+    getOncoKBCancerGeneListLinkout,
+    getOncoKBReferenceInfo,
+} from './oncokb/OncoKBUtils';
+import styles from './table/tables.module.scss';
 import classnames from 'classnames';
-import {DefaultTooltip} from "cbioportal-frontend-commons";
-import {ICON_FILTER_OFF, ICON_FILTER_ON} from "shared/lib/Colors";
-import {getFrequencyStr, getCNAByAlteration} from "pages/studyView/StudyViewUtils";
-import {GenePanelList} from "pages/studyView/table/StudyViewGenePanelModal";
-import {CSSProperties} from "react";
-import * as _ from "lodash";
+import { DefaultTooltip } from 'cbioportal-frontend-commons';
+import { ICON_FILTER_OFF, ICON_FILTER_ON } from 'shared/lib/Colors';
+import {
+    getFrequencyStr,
+    getCNAByAlteration,
+} from 'pages/studyView/StudyViewUtils';
+import { GenePanelList } from 'pages/studyView/table/StudyViewGenePanelModal';
+import { CSSProperties } from 'react';
+import * as _ from 'lodash';
 
 export type AlteredGenesTableUserSelectionWithIndex = {
     entrezGeneId: number;
@@ -19,52 +25,129 @@ export function getGeneCNAOQL(hugoGeneSymbol: string, alteration: number) {
     return [hugoGeneSymbol, getCNAByAlteration(alteration)].join(':');
 }
 
-export function getGeneColumnHeaderRender(cellMargin: number, headerName: string, cancerGeneListFilterEnabled: boolean, isFilteredByCancerGeneList: boolean, cancerGeneIconToggle: (event: any) => void) {
-    return <div style={{marginLeft: cellMargin}} className={styles.displayFlex} data-test='gene-column-header'>
-        {cancerGeneListFilterEnabled && (
-            <DefaultTooltip
-                mouseEnterDelay={0}
-                placement="top"
-                overlay={getCancerGeneToggledOverlay(isFilteredByCancerGeneList)}
-            >
-                <div onClick={cancerGeneIconToggle} className={styles.displayFlex}>
-                    {getCancerGeneFilterToggleIcon(isFilteredByCancerGeneList)}
-                </div>
-            </DefaultTooltip>
-        )}
-        {headerName}
-    </div>
+export function getGeneColumnHeaderRender(
+    cellMargin: number,
+    headerName: string,
+    cancerGeneListFilterEnabled: boolean,
+    isFilteredByCancerGeneList: boolean,
+    cancerGeneIconToggle: (event: any) => void
+) {
+    return (
+        <div
+            style={{ marginLeft: cellMargin }}
+            className={styles.displayFlex}
+            data-test="gene-column-header"
+        >
+            {cancerGeneListFilterEnabled && (
+                <DefaultTooltip
+                    mouseEnterDelay={0}
+                    placement="top"
+                    overlay={getCancerGeneToggledOverlay(
+                        isFilteredByCancerGeneList
+                    )}
+                >
+                    <div
+                        onClick={cancerGeneIconToggle}
+                        className={styles.displayFlex}
+                    >
+                        {getCancerGeneFilterToggleIcon(
+                            isFilteredByCancerGeneList
+                        )}
+                    </div>
+                </DefaultTooltip>
+            )}
+            {headerName}
+        </div>
+    );
 }
 
-export function getGeneColumnCellOverlaySimple(hugoGeneSymbol: string, geneIsSelected: boolean, isCancerGene: boolean, oncokbAnnotated: boolean, isOncogene: boolean, isTumorSuppressorGene: boolean) {
-    return <div style={{display: 'flex', flexDirection: 'column', maxWidth: 300, fontSize: 12}}>
-        <span>
-            {getOncoKBReferenceInfo(hugoGeneSymbol, isCancerGene, oncokbAnnotated, isOncogene, isTumorSuppressorGene)}
-        </span>
-    </div>;
+export function getGeneColumnCellOverlaySimple(
+    hugoGeneSymbol: string,
+    geneIsSelected: boolean,
+    isCancerGene: boolean,
+    oncokbAnnotated: boolean,
+    isOncogene: boolean,
+    isTumorSuppressorGene: boolean
+) {
+    return (
+        <div
+            style={{
+                display: 'flex',
+                flexDirection: 'column',
+                maxWidth: 300,
+                fontSize: 12,
+            }}
+        >
+            <span>
+                {getOncoKBReferenceInfo(
+                    hugoGeneSymbol,
+                    isCancerGene,
+                    oncokbAnnotated,
+                    isOncogene,
+                    isTumorSuppressorGene
+                )}
+            </span>
+        </div>
+    );
 }
 
 export function getCancerGeneToggledOverlay(cancerGeneFilterEnabled: boolean) {
     if (cancerGeneFilterEnabled) {
-        return <span>Filtered by {getOncoKBCancerGeneListLinkout()}. Click to show all genes.</span>
+        return (
+            <span>
+                Filtered by {getOncoKBCancerGeneListLinkout()}. Click to show
+                all genes.
+            </span>
+        );
     } else {
-        return <span>Showing all genes. Click to filter by {getOncoKBCancerGeneListLinkout()}.</span>
+        return (
+            <span>
+                Showing all genes. Click to filter by{' '}
+                {getOncoKBCancerGeneListLinkout()}.
+            </span>
+        );
     }
 }
 
-
-export function getCancerGeneFilterToggleIcon(isFilteredByCancerGeneList: boolean) {
-    return <span data-test='cancer-gene-filter' className={classnames(styles.cancerGeneIcon, styles.displayFlex)}
-                 style={{color: isFilteredByCancerGeneList ? ICON_FILTER_ON : ICON_FILTER_OFF}}><i
-        className='fa fa-filter'></i></span>;
+export function getCancerGeneFilterToggleIcon(
+    isFilteredByCancerGeneList: boolean
+) {
+    return (
+        <span
+            data-test="cancer-gene-filter"
+            className={classnames(styles.cancerGeneIcon, styles.displayFlex)}
+            style={{
+                color: isFilteredByCancerGeneList
+                    ? ICON_FILTER_ON
+                    : ICON_FILTER_OFF,
+            }}
+        >
+            <i className="fa fa-filter"></i>
+        </span>
+    );
 }
 
 type FreqColumnType = 'mutation' | 'fusion' | 'cna';
 
-export function getFreqColumnRender(type: FreqColumnType, numberOfProfiledCases: number, numberOfAlteredCases: number, matchingGenePanelIds: string[], toggleModal?: (panelName: string) => void, style?: CSSProperties) {
-    const detailedTypeInfo = type === 'mutation' ? 'mutations' : (type === 'cna' ? 'copy number alterations' : 'fusions')
+export function getFreqColumnRender(
+    type: FreqColumnType,
+    numberOfProfiledCases: number,
+    numberOfAlteredCases: number,
+    matchingGenePanelIds: string[],
+    toggleModal?: (panelName: string) => void,
+    style?: CSSProperties
+) {
+    const detailedTypeInfo =
+        type === 'mutation'
+            ? 'mutations'
+            : type === 'cna'
+            ? 'copy number alterations'
+            : 'fusions';
     const addTotalProfiledOverlay = () => (
-        <span style={{display: 'flex', flexDirection: 'column'}} data-test='freq-cell-tooltip'>
+        <span
+            style={{ display: 'flex', flexDirection: 'column' }}
+            data-test="freq-cell-tooltip"
+        >
             <span>{`# of samples profiled for ${detailedTypeInfo} in this gene: ${numberOfProfiledCases.toLocaleString()}`}</span>
             <GenePanelList
                 genePanelIds={matchingGenePanelIds}
@@ -79,7 +162,7 @@ export function getFreqColumnRender(type: FreqColumnType, numberOfProfiledCases:
             overlay={addTotalProfiledOverlay}
             destroyTooltipOnHide={true}
         >
-            <span data-test='freq-cell' style={style}>
+            <span data-test="freq-cell" style={style}>
                 {getFrequencyStr(
                     (numberOfAlteredCases / numberOfProfiledCases) * 100
                 )}
diff --git a/src/pages/studyView/UserSelections.tsx b/src/pages/studyView/UserSelections.tsx
index 3934a240cc2..e14f9a47ddd 100644
--- a/src/pages/studyView/UserSelections.tsx
+++ b/src/pages/studyView/UserSelections.tsx
@@ -1,46 +1,61 @@
 import * as React from 'react';
 import * as _ from 'lodash';
-import {observer} from "mobx-react";
-import {computed} from 'mobx';
-import styles from "./styles.module.scss";
-import {ClinicalDataFilterValue} from 'shared/api/generated/CBioPortalAPIInternal';
-import {UniqueKey, DataType, getUniqueKeyFromMolecularProfileIds, ChartType} from 'pages/studyView/StudyViewUtils';
+import { observer } from 'mobx-react';
+import { computed } from 'mobx';
+import styles from './styles.module.scss';
+import { ClinicalDataFilterValue } from 'shared/api/generated/CBioPortalAPIInternal';
+import {
+    UniqueKey,
+    DataType,
+    getUniqueKeyFromMolecularProfileIds,
+    ChartType,
+} from 'pages/studyView/StudyViewUtils';
 import {
     ChartMeta,
-    getCNAColorByAlteration, getPatientIdentifiers,
+    getCNAColorByAlteration,
+    getPatientIdentifiers,
     getSelectedGroupNames,
-    intervalFiltersDisplayValue, StudyViewFilterWithSampleIdentifierFilters
+    intervalFiltersDisplayValue,
+    StudyViewFilterWithSampleIdentifierFilters,
 } from 'pages/studyView/StudyViewUtils';
-import {PillTag} from "../../shared/components/PillTag/PillTag";
-import {GroupLogic} from "./filters/groupLogic/GroupLogic";
+import { PillTag } from '../../shared/components/PillTag/PillTag';
+import { GroupLogic } from './filters/groupLogic/GroupLogic';
 import classnames from 'classnames';
-import {STUDY_VIEW_CONFIG} from "./StudyViewConfig";
-import {DEFAULT_NA_COLOR, MUT_COLOR_FUSION, MUT_COLOR_MISSENSE} from "shared/lib/Colors";
+import { STUDY_VIEW_CONFIG } from './StudyViewConfig';
+import {
+    DEFAULT_NA_COLOR,
+    MUT_COLOR_FUSION,
+    MUT_COLOR_MISSENSE,
+} from 'shared/lib/Colors';
 import {
     caseCounts,
     getSampleIdentifiers,
-    StudyViewComparisonGroup
-} from "../groupComparison/GroupComparisonUtils";
+    StudyViewComparisonGroup,
+} from '../groupComparison/GroupComparisonUtils';
 
 export interface IUserSelectionsProps {
     filter: StudyViewFilterWithSampleIdentifierFilters;
-    customChartsFilter: {[key:string]:string[]};
+    customChartsFilter: { [key: string]: string[] };
     numberOfSelectedSamplesInCustomSelection: number;
-    comparisonGroupSelection:StudyViewComparisonGroup[];
+    comparisonGroupSelection: StudyViewComparisonGroup[];
     attributesMetaSet: { [id: string]: ChartMeta & { chartType: ChartType } };
-    updateClinicalDataFilterByValues: (uniqueKey: string, values: ClinicalDataFilterValue[]) => void;
+    updateClinicalDataFilterByValues: (
+        uniqueKey: string,
+        values: ClinicalDataFilterValue[]
+    ) => void;
     updateCustomChartFilter: (uniqueKey: string, values: string[]) => void;
-    removeGeneFilter:(uniqueKey: string, oql: string) => void;
-    removeCustomSelectionFilter: () => void,
-    removeComparisonGroupSelectionFilter: ()=>void,
-    clearAllFilters: () => void
-    clinicalAttributeIdToDataType: {[key:string]:string};
+    removeGeneFilter: (uniqueKey: string, oql: string) => void;
+    removeCustomSelectionFilter: () => void;
+    removeComparisonGroupSelectionFilter: () => void;
+    clearAllFilters: () => void;
+    clinicalAttributeIdToDataType: { [key: string]: string };
 }
 
-
 @observer
-export default class UserSelections extends React.Component<IUserSelectionsProps, {}> {
-
+export default class UserSelections extends React.Component<
+    IUserSelectionsProps,
+    {}
+> {
     @computed
     get showFilters() {
         //return isFiltered(this.props.filter)
@@ -53,161 +68,319 @@ export default class UserSelections extends React.Component<IUserSelectionsProps
 
         // Show the filter for the custom selection
         if (this.props.numberOfSelectedSamplesInCustomSelection > 0) {
-            components.push(<div className={styles.parentGroupLogic}>
-                <GroupLogic
-                    components={[
-                        <span className={styles.filterClinicalAttrName}>Custom Selection</span>,
-                        <PillTag
-                            content={`${this.props.numberOfSelectedSamplesInCustomSelection} sample${this.props.numberOfSelectedSamplesInCustomSelection > 1 ? 's' : ''}`}
-                            backgroundColor={STUDY_VIEW_CONFIG.colors.theme.clinicalFilterContent}
-                            onDelete={() => this.props.removeCustomSelectionFilter()}
-                        />
-                    ]}
-                    operation={':'}
-                    group={false}/></div>);
+            components.push(
+                <div className={styles.parentGroupLogic}>
+                    <GroupLogic
+                        components={[
+                            <span className={styles.filterClinicalAttrName}>
+                                Custom Selection
+                            </span>,
+                            <PillTag
+                                content={`${
+                                    this.props
+                                        .numberOfSelectedSamplesInCustomSelection
+                                } sample${
+                                    this.props
+                                        .numberOfSelectedSamplesInCustomSelection >
+                                    1
+                                        ? 's'
+                                        : ''
+                                }`}
+                                backgroundColor={
+                                    STUDY_VIEW_CONFIG.colors.theme
+                                        .clinicalFilterContent
+                                }
+                                onDelete={() =>
+                                    this.props.removeCustomSelectionFilter()
+                                }
+                            />,
+                        ]}
+                        operation={':'}
+                        group={false}
+                    />
+                </div>
+            );
         }
 
         // Show the filter for the comparison group selection
         if (this.props.comparisonGroupSelection.length > 0) {
-            const numSamples = getSampleIdentifiers(this.props.comparisonGroupSelection).length;
-            const numPatients = getPatientIdentifiers(this.props.comparisonGroupSelection).length;
-            components.push(<div className={styles.parentGroupLogic}>
-                <GroupLogic
-                    components={[
-                        <span className={styles.filterClinicalAttrName}>{getSelectedGroupNames(this.props.comparisonGroupSelection)}</span>,
-                        <PillTag
-                            content={caseCounts(numSamples, numPatients)}
-                            backgroundColor={STUDY_VIEW_CONFIG.colors.theme.clinicalFilterContent}
-                            onDelete={() => this.props.removeComparisonGroupSelectionFilter()}
-                        />
-                    ]}
-                    operation={':'}
-                    group={false}/></div>);
+            const numSamples = getSampleIdentifiers(
+                this.props.comparisonGroupSelection
+            ).length;
+            const numPatients = getPatientIdentifiers(
+                this.props.comparisonGroupSelection
+            ).length;
+            components.push(
+                <div className={styles.parentGroupLogic}>
+                    <GroupLogic
+                        components={[
+                            <span className={styles.filterClinicalAttrName}>
+                                {getSelectedGroupNames(
+                                    this.props.comparisonGroupSelection
+                                )}
+                            </span>,
+                            <PillTag
+                                content={caseCounts(numSamples, numPatients)}
+                                backgroundColor={
+                                    STUDY_VIEW_CONFIG.colors.theme
+                                        .clinicalFilterContent
+                                }
+                                onDelete={() =>
+                                    this.props.removeComparisonGroupSelectionFilter()
+                                }
+                            />,
+                        ]}
+                        operation={':'}
+                        group={false}
+                    />
+                </div>
+            );
         }
 
-        _.reduce((this.props.filter.clinicalDataFilters || []), (acc, clinicalDataFilter) => {
-            const chartMeta = this.props.attributesMetaSet[clinicalDataFilter.attributeId];
-            if (chartMeta) {
-                const dataType = this.props.clinicalAttributeIdToDataType[clinicalDataFilter.attributeId];
-                if(dataType === DataType.STRING) {
-                    // Pie chart filter
-                    acc.push(
-                        <div className={styles.parentGroupLogic}>
-                            <GroupLogic
-                                components={[
-                                    <span className={styles.filterClinicalAttrName}>{chartMeta.displayName}</span>,
-                                    <GroupLogic
-                                        components={clinicalDataFilter.values.map(clinicalDataFilterValue => {
-                                            return <PillTag
-                                                content={clinicalDataFilterValue.value}
-                                                backgroundColor={STUDY_VIEW_CONFIG.colors.theme.clinicalFilterContent}
-                                                onDelete={() => this.props.updateClinicalDataFilterByValues(chartMeta.uniqueKey,
-                                                    _.remove(clinicalDataFilter.values, value => value.value !== clinicalDataFilterValue.value))}
-                                            />
-                                        })}
-                                        operation={'or'}
-                                        group={false}
-                                    />
-                                ]}
-                                operation={':'}
-                                group={false}
-                            />
-                        </div>
-                    );
-                } else {
-                     // Bar chart filter
-                    acc.push(
-                        <div className={styles.parentGroupLogic}>
-                            <GroupLogic
-                                components={[
-                                    <span className={styles.filterClinicalAttrName}>{chartMeta.displayName}</span>,
-                                    <PillTag
-                                        content={intervalFiltersDisplayValue(clinicalDataFilter.values)}
-                                        backgroundColor={STUDY_VIEW_CONFIG.colors.theme.clinicalFilterContent}
-                                        onDelete={() => this.props.updateClinicalDataFilterByValues(chartMeta.uniqueKey, [])}
-                                    />
-                                ]}
-                                operation={':'}
-                                group={false}
-                            />
-                        </div>
-                    );
+        _.reduce(
+            this.props.filter.clinicalDataFilters || [],
+            (acc, clinicalDataFilter) => {
+                const chartMeta = this.props.attributesMetaSet[
+                    clinicalDataFilter.attributeId
+                ];
+                if (chartMeta) {
+                    const dataType = this.props.clinicalAttributeIdToDataType[
+                        clinicalDataFilter.attributeId
+                    ];
+                    if (dataType === DataType.STRING) {
+                        // Pie chart filter
+                        acc.push(
+                            <div className={styles.parentGroupLogic}>
+                                <GroupLogic
+                                    components={[
+                                        <span
+                                            className={
+                                                styles.filterClinicalAttrName
+                                            }
+                                        >
+                                            {chartMeta.displayName}
+                                        </span>,
+                                        <GroupLogic
+                                            components={clinicalDataFilter.values.map(
+                                                clinicalDataFilterValue => {
+                                                    return (
+                                                        <PillTag
+                                                            content={
+                                                                clinicalDataFilterValue.value
+                                                            }
+                                                            backgroundColor={
+                                                                STUDY_VIEW_CONFIG
+                                                                    .colors
+                                                                    .theme
+                                                                    .clinicalFilterContent
+                                                            }
+                                                            onDelete={() =>
+                                                                this.props.updateClinicalDataFilterByValues(
+                                                                    chartMeta.uniqueKey,
+                                                                    _.remove(
+                                                                        clinicalDataFilter.values,
+                                                                        value =>
+                                                                            value.value !==
+                                                                            clinicalDataFilterValue.value
+                                                                    )
+                                                                )
+                                                            }
+                                                        />
+                                                    );
+                                                }
+                                            )}
+                                            operation={'or'}
+                                            group={false}
+                                        />,
+                                    ]}
+                                    operation={':'}
+                                    group={false}
+                                />
+                            </div>
+                        );
+                    } else {
+                        // Bar chart filter
+                        acc.push(
+                            <div className={styles.parentGroupLogic}>
+                                <GroupLogic
+                                    components={[
+                                        <span
+                                            className={
+                                                styles.filterClinicalAttrName
+                                            }
+                                        >
+                                            {chartMeta.displayName}
+                                        </span>,
+                                        <PillTag
+                                            content={intervalFiltersDisplayValue(
+                                                clinicalDataFilter.values
+                                            )}
+                                            backgroundColor={
+                                                STUDY_VIEW_CONFIG.colors.theme
+                                                    .clinicalFilterContent
+                                            }
+                                            onDelete={() =>
+                                                this.props.updateClinicalDataFilterByValues(
+                                                    chartMeta.uniqueKey,
+                                                    []
+                                                )
+                                            }
+                                        />,
+                                    ]}
+                                    operation={':'}
+                                    group={false}
+                                />
+                            </div>
+                        );
+                    }
                 }
-            }
-            return acc;
-        }, components);
+                return acc;
+            },
+            components
+        );
 
         // All custom charts
-        if(!_.isEmpty(this.props.customChartsFilter)) {
-            _.reduce((this.props.customChartsFilter), (acc, content:string[], key:string) => {
-                const chartMeta = this.props.attributesMetaSet[key];
+        if (!_.isEmpty(this.props.customChartsFilter)) {
+            _.reduce(
+                this.props.customChartsFilter,
+                (acc, content: string[], key: string) => {
+                    const chartMeta = this.props.attributesMetaSet[key];
+                    if (chartMeta) {
+                        acc.push(
+                            <div className={styles.parentGroupLogic}>
+                                <GroupLogic
+                                    components={[
+                                        <span
+                                            className={
+                                                styles.filterClinicalAttrName
+                                            }
+                                        >
+                                            {chartMeta.displayName}
+                                        </span>,
+                                        <GroupLogic
+                                            components={content.map(label => {
+                                                return (
+                                                    <PillTag
+                                                        content={label}
+                                                        backgroundColor={
+                                                            STUDY_VIEW_CONFIG
+                                                                .colors.theme
+                                                                .clinicalFilterContent
+                                                        }
+                                                        onDelete={() =>
+                                                            this.props.updateCustomChartFilter(
+                                                                chartMeta.uniqueKey,
+                                                                _.remove(
+                                                                    content,
+                                                                    value =>
+                                                                        value !==
+                                                                        label
+                                                                )
+                                                            )
+                                                        }
+                                                    />
+                                                );
+                                            })}
+                                            operation={'or'}
+                                            group={false}
+                                        />,
+                                    ]}
+                                    operation={':'}
+                                    group={false}
+                                />
+                            </div>
+                        );
+                    }
+                    return acc;
+                },
+                components
+            );
+        }
+
+        _.reduce(
+            this.props.filter.geneFilters || [],
+            (acc, geneFilter) => {
+                const uniqueKey = getUniqueKeyFromMolecularProfileIds(
+                    geneFilter.molecularProfileIds
+                );
+                const chartMeta = this.props.attributesMetaSet[uniqueKey];
                 if (chartMeta) {
                     acc.push(
                         <div className={styles.parentGroupLogic}>
                             <GroupLogic
-                                components={[
-                                    <span className={styles.filterClinicalAttrName}>{chartMeta.displayName}</span>,
-                                    <GroupLogic components={content.map(label => {
-                                        return <PillTag
-                                            content={label}
-                                            backgroundColor={STUDY_VIEW_CONFIG.colors.theme.clinicalFilterContent}
-                                            onDelete={() => this.props.updateCustomChartFilter(chartMeta.uniqueKey, _.remove(content, value => value !== label))}
-                                        />
-                                    })} operation={'or'} group={false}/>
-                                ]}
-                                operation={':'}
-                                group={false}/>
+                                components={geneFilter.geneQueries.map(
+                                    geneQuery => {
+                                        return (
+                                            <GroupLogic
+                                                components={geneQuery.map(
+                                                    oql => {
+                                                        let color = DEFAULT_NA_COLOR;
+                                                        let displayGeneSymbol = oql;
+                                                        switch (
+                                                            chartMeta.chartType
+                                                        ) {
+                                                            case UniqueKey.MUTATED_GENES_TABLE:
+                                                                color = MUT_COLOR_MISSENSE;
+                                                                break;
+                                                            case UniqueKey.FUSION_GENES_TABLE:
+                                                                color = MUT_COLOR_FUSION;
+                                                                break;
+                                                            case UniqueKey.CNA_GENES_TABLE: {
+                                                                const oqlParts = oql
+                                                                    .trim()
+                                                                    .split(':');
+                                                                if (
+                                                                    oqlParts.length ===
+                                                                    2
+                                                                ) {
+                                                                    displayGeneSymbol =
+                                                                        oqlParts[0];
+                                                                    let tagColor = getCNAColorByAlteration(
+                                                                        oqlParts[1]
+                                                                    );
+                                                                    if (
+                                                                        tagColor
+                                                                    ) {
+                                                                        color = tagColor;
+                                                                    }
+                                                                }
+                                                                break;
+                                                            }
+                                                        }
+                                                        return (
+                                                            <PillTag
+                                                                content={
+                                                                    displayGeneSymbol
+                                                                }
+                                                                backgroundColor={
+                                                                    color
+                                                                }
+                                                                onDelete={() =>
+                                                                    this.props.removeGeneFilter(
+                                                                        chartMeta.uniqueKey,
+                                                                        oql
+                                                                    )
+                                                                }
+                                                            />
+                                                        );
+                                                    }
+                                                )}
+                                                operation="or"
+                                                group={geneQuery.length > 1}
+                                            />
+                                        );
+                                    }
+                                )}
+                                operation={'and'}
+                                group={false}
+                            />
                         </div>
                     );
                 }
                 return acc;
-            }, components);
-        }
-
-        _.reduce((this.props.filter.geneFilters || []), (acc, geneFilter) => {
-            const uniqueKey = getUniqueKeyFromMolecularProfileIds(geneFilter.molecularProfileIds);
-            const chartMeta = this.props.attributesMetaSet[uniqueKey];
-            if (chartMeta) {
-                acc.push(
-                    <div className={styles.parentGroupLogic}><GroupLogic
-                        components={geneFilter.geneQueries.map(geneQuery => {
-                            return <GroupLogic
-                                components={geneQuery.map(oql => {
-                                    let color = DEFAULT_NA_COLOR;
-                                    let displayGeneSymbol = oql;
-                                    switch (chartMeta.chartType) {
-                                        case UniqueKey.MUTATED_GENES_TABLE:
-                                            color = MUT_COLOR_MISSENSE;
-                                            break;
-                                        case UniqueKey.FUSION_GENES_TABLE:
-                                            color = MUT_COLOR_FUSION;
-                                            break;
-                                        case UniqueKey.CNA_GENES_TABLE: {
-                                            const oqlParts = oql.trim().split(":")
-                                            if (oqlParts.length === 2) {
-                                                displayGeneSymbol = oqlParts[0];
-                                                let tagColor = getCNAColorByAlteration(oqlParts[1])
-                                                if (tagColor) {
-                                                    color = tagColor;
-                                                }
-                                            }
-                                            break;
-                                        }
-                                    }
-                                    return <PillTag
-                                        content={displayGeneSymbol}
-                                        backgroundColor={color}
-                                        onDelete={() => this.props.removeGeneFilter(chartMeta.uniqueKey, oql)}
-                                    />
-                                })}
-                                operation="or"
-                                group={geneQuery.length > 1}
-                            />
-                        })} operation={"and"} group={false} /></div>
-                );
-            }
-            return acc;
-        }, components);
+            },
+            components
+        );
 
         return components;
     }
@@ -215,12 +388,23 @@ export default class UserSelections extends React.Component<IUserSelectionsProps
     render() {
         if (this.showFilters) {
             return (
-                <div className={classnames(styles.userSelections, 'userSelections')}>
+                <div
+                    className={classnames(
+                        styles.userSelections,
+                        'userSelections'
+                    )}
+                >
                     {this.allComponents}
                     <button
                         data-test="clear-all-filters"
-                        className={classnames('btn btn-default btn-sm', styles.summaryHeaderBtn, styles.summaryClearAllBtn)}
-                        onClick={this.props.clearAllFilters}>Clear All Filters
+                        className={classnames(
+                            'btn btn-default btn-sm',
+                            styles.summaryHeaderBtn,
+                            styles.summaryClearAllBtn
+                        )}
+                        onClick={this.props.clearAllFilters}
+                    >
+                        Clear All Filters
                     </button>
                 </div>
             );
@@ -228,4 +412,4 @@ export default class UserSelections extends React.Component<IUserSelectionsProps
             return null;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/studyView/addChartButton/AddChartButton.tsx b/src/pages/studyView/addChartButton/AddChartButton.tsx
index 725b81192bc..3b67ae7d3fd 100644
--- a/src/pages/studyView/addChartButton/AddChartButton.tsx
+++ b/src/pages/studyView/addChartButton/AddChartButton.tsx
@@ -1,73 +1,78 @@
 import * as React from 'react';
-import {action, computed, observable} from "mobx";
-import {observer} from "mobx-react";
-import {ChildButton, MainButton, Menu} from 'react-mfb';
+import { action, computed, observable } from 'mobx';
+import { observer } from 'mobx-react';
+import { ChildButton, MainButton, Menu } from 'react-mfb';
 import 'react-mfb/mfb.css';
 import {
     CustomChart,
     StudyViewPageStore,
     StudyViewPageTabKey,
-} from "../StudyViewPageStore";
-import { StudyViewPageTabKeyEnum } from "pages/studyView/StudyViewPageTabs";
+} from '../StudyViewPageStore';
+import { StudyViewPageTabKeyEnum } from 'pages/studyView/StudyViewPageTabs';
 import autobind from 'autobind-decorator';
 import * as _ from 'lodash';
-import AddChartByType from "./addChartByType/AddChartByType";
-import {DefaultTooltip, remoteData} from "cbioportal-frontend-commons";
-import CustomCaseSelection from "./customCaseSelection/CustomCaseSelection";
+import AddChartByType from './addChartByType/AddChartByType';
+import { DefaultTooltip, remoteData } from 'cbioportal-frontend-commons';
+import CustomCaseSelection from './customCaseSelection/CustomCaseSelection';
 import {
-    calculateClinicalDataCountFrequency, ChartMetaDataTypeEnum, ChartType,
+    calculateClinicalDataCountFrequency,
+    ChartMetaDataTypeEnum,
+    ChartType,
     ClinicalDataCountSet,
-    getOptionsByChartMetaDataType
-} from "../StudyViewUtils";
-import {MSKTab, MSKTabs} from "../../../shared/components/MSKTabs/MSKTabs";
-import {ChartTypeEnum, ChartTypeNameEnum} from "../StudyViewConfig";
-import SuccessBanner from "../infoBanner/SuccessBanner";
-import {GAEvent, serializeEvent, trackEvent} from "../../../shared/lib/tracking";
-import classNames from "classnames";
+    getOptionsByChartMetaDataType,
+} from '../StudyViewUtils';
+import { MSKTab, MSKTabs } from '../../../shared/components/MSKTabs/MSKTabs';
+import { ChartTypeEnum, ChartTypeNameEnum } from '../StudyViewConfig';
+import SuccessBanner from '../infoBanner/SuccessBanner';
+import {
+    GAEvent,
+    serializeEvent,
+    trackEvent,
+} from '../../../shared/lib/tracking';
+import classNames from 'classnames';
 
 export interface IAddChartTabsProps {
-    store: StudyViewPageStore,
-    currentTab: StudyViewPageTabKey,
-    initialActiveTab?: TabKeys,
-    disableGenomicTab?: boolean,
-    disableClinicalTab?: boolean,
-    disableCustomTab?: boolean,
-    onInfoMessageChange?: (newMessage: string) => void,
-    showResetPopup:()=>void
+    store: StudyViewPageStore;
+    currentTab: StudyViewPageTabKey;
+    initialActiveTab?: TabKeys;
+    disableGenomicTab?: boolean;
+    disableClinicalTab?: boolean;
+    disableCustomTab?: boolean;
+    onInfoMessageChange?: (newMessage: string) => void;
+    showResetPopup: () => void;
 }
 
 export interface IAddChartButtonProps extends IAddChartTabsProps {
-    buttonText: string,
-    addChartOverlayClassName?: string
+    buttonText: string;
+    addChartOverlayClassName?: string;
 }
 
-
 export enum TabKeysEnum {
     CUSTOM_DATA = 'Custom_Data',
     CLINICAL = 'Clinical',
-    GENOMIC = 'Genomic'
+    GENOMIC = 'Genomic',
 }
 
 export enum TabNamesEnum {
     CUSTOM_DATA = 'Custom Data',
     CLINICAL = 'Clinical',
-    GENOMIC = 'Genomic'
+    GENOMIC = 'Genomic',
 }
 
 export type TabKeys =
-    TabKeysEnum.CUSTOM_DATA
+    | TabKeysEnum.CUSTOM_DATA
     | TabKeysEnum.GENOMIC
     | TabKeysEnum.CLINICAL
-    | "";
+    | '';
 
 export type ChartOption = {
-    label: string,
-    key: string,
-    chartType: ChartType,
-    disabled?: boolean,
-    selected?: boolean,
-    freq: number
-}
+    label: string;
+    key: string;
+    chartType: ChartType;
+    disabled?: boolean;
+    selected?: boolean;
+    freq: number;
+};
 
 export const INFO_TIMEOUT = 5000;
 
@@ -78,30 +83,45 @@ class AddChartTabs extends React.Component<IAddChartTabsProps, {}> {
     public static defaultProps = {
         disableGenomicTab: false,
         disableClinicalTab: false,
-        disableCustomTab: false
+        disableCustomTab: false,
     };
 
     constructor(props: IAddChartTabsProps, context: any) {
         super(props, context);
 
-        this.activeId = props.initialActiveTab || (props.disableClinicalTab ? "" : TabKeysEnum.CLINICAL) || (props.disableGenomicTab ? "" : TabKeysEnum.GENOMIC) || (props.disableCustomTab ? "" : TabKeysEnum.CUSTOM_DATA)
+        this.activeId =
+            props.initialActiveTab ||
+            (props.disableClinicalTab ? '' : TabKeysEnum.CLINICAL) ||
+            (props.disableGenomicTab ? '' : TabKeysEnum.GENOMIC) ||
+            (props.disableCustomTab ? '' : TabKeysEnum.CUSTOM_DATA);
     }
 
     readonly getClinicalDataCount = remoteData<ClinicalDataCountSet>({
-        await: () => [this.props.store.clinicalDataWithCount, this.props.store.selectedSamples],
+        await: () => [
+            this.props.store.clinicalDataWithCount,
+            this.props.store.selectedSamples,
+        ],
         invoke: async () => {
-            return calculateClinicalDataCountFrequency(this.props.store.clinicalDataWithCount.result, this.props.store.selectedSamples.result.length);
+            return calculateClinicalDataCountFrequency(
+                this.props.store.clinicalDataWithCount.result,
+                this.props.store.selectedSamples.result.length
+            );
         },
-        default: {}
+        default: {},
     });
 
-
     readonly getGenomicDataCount = remoteData<ClinicalDataCountSet>({
-        await: () => [this.props.store.genomicDataWithCount, this.props.store.selectedSamples],
+        await: () => [
+            this.props.store.genomicDataWithCount,
+            this.props.store.selectedSamples,
+        ],
         invoke: async () => {
-            return calculateClinicalDataCountFrequency(this.props.store.genomicDataWithCount.result, this.props.store.selectedSamples.result.length);
+            return calculateClinicalDataCountFrequency(
+                this.props.store.genomicDataWithCount.result,
+                this.props.store.selectedSamples.result.length
+            );
         },
-        default: {}
+        default: {},
     });
 
     @autobind
@@ -124,14 +144,23 @@ class AddChartTabs extends React.Component<IAddChartTabsProps, {}> {
     @autobind
     @action
     resetInfoMessage() {
-        this.infoMessage = "";
+        this.infoMessage = '';
     }
 
     @computed
     get genomicDataOptions(): ChartOption[] {
-        const genomicDataOptions = getOptionsByChartMetaDataType(ChartMetaDataTypeEnum.GENOMIC, this.props.store.chartMetaSet, this.selectedAttrs, this.props.store.chartsType.toJS());
+        const genomicDataOptions = getOptionsByChartMetaDataType(
+            ChartMetaDataTypeEnum.GENOMIC,
+            this.props.store.chartMetaSet,
+            this.selectedAttrs,
+            this.props.store.chartsType.toJS()
+        );
         if (this.props.currentTab === StudyViewPageTabKeyEnum.CLINICAL_DATA) {
-            return genomicDataOptions.filter(option => option.chartType === ChartTypeEnum.BAR_CHART || option.chartType === ChartTypeEnum.PIE_CHART);
+            return genomicDataOptions.filter(
+                option =>
+                    option.chartType === ChartTypeEnum.BAR_CHART ||
+                    option.chartType === ChartTypeEnum.PIE_CHART
+            );
         } else {
             return genomicDataOptions;
         }
@@ -139,7 +168,12 @@ class AddChartTabs extends React.Component<IAddChartTabsProps, {}> {
 
     @computed
     get clinicalDataOptions(): ChartOption[] {
-        return getOptionsByChartMetaDataType(ChartMetaDataTypeEnum.CLINICAL, this.props.store.chartMetaSet, this.selectedAttrs, this.props.store.chartsType.toJS());
+        return getOptionsByChartMetaDataType(
+            ChartMetaDataTypeEnum.CLINICAL,
+            this.props.store.chartMetaSet,
+            this.selectedAttrs,
+            this.props.store.chartsType.toJS()
+        );
     }
 
     @computed
@@ -158,9 +192,13 @@ class AddChartTabs extends React.Component<IAddChartTabsProps, {}> {
     private onAddAll(keys: string[]) {
         this.props.store.addCharts(this.selectedAttrs.concat(keys));
 
-        const addInSummaryInfoMessage = `${keys.length} chart${keys.length > 1 ? 's' : ''} added`;
+        const addInSummaryInfoMessage = `${keys.length} chart${
+            keys.length > 1 ? 's' : ''
+        } added`;
         if (this.props.currentTab === StudyViewPageTabKeyEnum.CLINICAL_DATA) {
-            this.infoMessage = `${keys.length} column${keys.length > 1 ? 's' : ''} added to table and ${addInSummaryInfoMessage} in Summary tab`;
+            this.infoMessage = `${keys.length} column${
+                keys.length > 1 ? 's' : ''
+            } added to table and ${addInSummaryInfoMessage} in Summary tab`;
         } else if (this.props.currentTab === StudyViewPageTabKeyEnum.SUMMARY) {
             this.infoMessage = addInSummaryInfoMessage;
         } else {
@@ -170,17 +208,27 @@ class AddChartTabs extends React.Component<IAddChartTabsProps, {}> {
 
     @autobind
     private onClearAll(keys: string[]) {
-        this.props.store.updateChartsVisibility(_.reduce(this.selectedAttrs, (acc, attr) => {
-            if (!keys.includes(attr)) {
-                acc.push(attr);
-            }
-            return acc;
-        }, [] as string[]));
+        this.props.store.updateChartsVisibility(
+            _.reduce(
+                this.selectedAttrs,
+                (acc, attr) => {
+                    if (!keys.includes(attr)) {
+                        acc.push(attr);
+                    }
+                    return acc;
+                },
+                [] as string[]
+            )
+        );
 
-        const removeInSummaryInfoMessage = `${keys.length} chart${keys.length > 1 ? 's' : ''} removed`;
+        const removeInSummaryInfoMessage = `${keys.length} chart${
+            keys.length > 1 ? 's' : ''
+        } removed`;
 
         if (this.props.currentTab === StudyViewPageTabKeyEnum.CLINICAL_DATA) {
-            this.infoMessage = `${keys.length} column${keys.length > 1 ? 's' : ''} removed from table and ${removeInSummaryInfoMessage} from Summary tab`;
+            this.infoMessage = `${keys.length} column${
+                keys.length > 1 ? 's' : ''
+            } removed from table and ${removeInSummaryInfoMessage} from Summary tab`;
         } else if (this.props.currentTab === StudyViewPageTabKeyEnum.SUMMARY) {
             this.infoMessage = removeInSummaryInfoMessage;
         } else {
@@ -191,133 +239,204 @@ class AddChartTabs extends React.Component<IAddChartTabsProps, {}> {
     @autobind
     @action
     private onToggleOption(key: string) {
-        const option = _.find(this.clinicalDataOptions.concat(this.genomicDataOptions), option => option.key === key);
+        const option = _.find(
+            this.clinicalDataOptions.concat(this.genomicDataOptions),
+            option => option.key === key
+        );
         if (option !== undefined) {
             if (this.selectedAttrs.includes(key)) {
-                this.props.store.addCharts(_.reduce(this.selectedAttrs, (acc, next) => {
-                    if (next !== key) {
-                        acc.push(next);
-                    }
-                    return acc;
-                }, [] as string[]));
+                this.props.store.addCharts(
+                    _.reduce(
+                        this.selectedAttrs,
+                        (acc, next) => {
+                            if (next !== key) {
+                                acc.push(next);
+                            }
+                            return acc;
+                        },
+                        [] as string[]
+                    )
+                );
 
                 let additionType = '';
                 if (this.props.currentTab === StudyViewPageTabKeyEnum.SUMMARY) {
                     additionType = ` ${ChartTypeNameEnum[option.chartType]}`;
-                } else if (this.props.currentTab === StudyViewPageTabKeyEnum.CLINICAL_DATA) {
+                } else if (
+                    this.props.currentTab ===
+                    StudyViewPageTabKeyEnum.CLINICAL_DATA
+                ) {
                     additionType = ' column';
                 }
 
-                trackEvent({ category:"studyPage", action:"removeChart", label:key });
+                trackEvent({
+                    category: 'studyPage',
+                    action: 'removeChart',
+                    label: key,
+                });
 
                 this.infoMessage = `${option.label}${additionType} was removed`;
-
             } else {
                 this.props.store.addCharts(this.selectedAttrs.concat([key]));
 
                 let additionType = '';
                 if (this.props.currentTab === StudyViewPageTabKeyEnum.SUMMARY) {
-                    additionType = ` as a ${ChartTypeNameEnum[option.chartType]}`;
-                } else if (this.props.currentTab === StudyViewPageTabKeyEnum.CLINICAL_DATA) {
-                    additionType = ` to table and as ${ChartTypeNameEnum[option.chartType]} in Summary tab`;
+                    additionType = ` as a ${
+                        ChartTypeNameEnum[option.chartType]
+                    }`;
+                } else if (
+                    this.props.currentTab ===
+                    StudyViewPageTabKeyEnum.CLINICAL_DATA
+                ) {
+                    additionType = ` to table and as ${
+                        ChartTypeNameEnum[option.chartType]
+                    } in Summary tab`;
                 }
                 this.infoMessage = `${option.label} added${additionType}`;
 
-                trackEvent({ category:"studyPage", action:"addChart", label:key });
-
+                trackEvent({
+                    category: 'studyPage',
+                    action: 'addChart',
+                    label: key,
+                });
             }
         }
     }
 
     render() {
-        return <div style={{width: '400px', display: 'flex', flexDirection: 'column'}}>
-            <MSKTabs activeTabId={this.activeId}
-                     onTabClick={this.updateActiveId}
-                     className="addChartTabs mainTabs">
-
-                <MSKTab key={0} id={TabKeysEnum.CLINICAL} linkText={TabNamesEnum.CLINICAL}
-                        hide={this.props.disableClinicalTab}>
-                    <AddChartByType options={this.clinicalDataOptions}
-                                    freqPromise={this.getClinicalDataCount}
-                                    onAddAll={this.onAddAll}
-                                    onClearAll={this.onClearAll}
-                                    onToggleOption={this.onToggleOption}
-                    />
-                </MSKTab>
-                <MSKTab key={1} id={TabKeysEnum.GENOMIC} linkText={TabNamesEnum.GENOMIC}
-                        hide={this.props.disableGenomicTab}>
-                    <AddChartByType options={this.genomicDataOptions}
-                                    freqPromise={this.getGenomicDataCount}
-                                    onAddAll={this.onAddAll}
-                                    onClearAll={this.onClearAll}
-                                    onToggleOption={this.onToggleOption}/>
-                </MSKTab>
-                <MSKTab key={2} id={TabKeysEnum.CUSTOM_DATA} linkText={TabNamesEnum.CUSTOM_DATA}
-                        hide={this.props.disableCustomTab}>
-                    <CustomCaseSelection
-                        allSamples={this.props.store.samples.result}
-                        selectedSamples={this.props.store.selectedSamples.result}
-                        submitButtonText={"Add Chart"}
-                        queriedStudies={this.props.store.queriedPhysicalStudyIds.result}
-                        isChartNameValid={this.props.store.isChartNameValid}
-                        getDefaultChartName={this.props.store.getDefaultCustomChartName}
-                        onSubmit={(chart: CustomChart) => {
-                            this.infoMessage = `${chart.name} has been added.`;
-                            this.props.store.addCustomChart(chart);
-
-                        }}
-                    />
-                </MSKTab>
-            </MSKTabs>
-            {
-                this.props.store.isLoggedIn &&
-                this.props.currentTab === StudyViewPageTabKeyEnum.SUMMARY &&
-                this.props.store.showResetToDefaultButton && (
-                    <button
-                        style={{
-                            position: 'absolute',
-                            top: '14px',
-                            right: '18px',
-                            zIndex: 2
-                        }}
-                        className="btn btn-primary btn-xs"
-                        onClick={this.props.showResetPopup}>
-                        Reset charts
-                    </button>
-                )
-            }
-            {this.infoMessage && <SuccessBanner message={this.infoMessage}/>}
-        </div>
+        return (
+            <div
+                style={{
+                    width: '400px',
+                    display: 'flex',
+                    flexDirection: 'column',
+                }}
+            >
+                <MSKTabs
+                    activeTabId={this.activeId}
+                    onTabClick={this.updateActiveId}
+                    className="addChartTabs mainTabs"
+                >
+                    <MSKTab
+                        key={0}
+                        id={TabKeysEnum.CLINICAL}
+                        linkText={TabNamesEnum.CLINICAL}
+                        hide={this.props.disableClinicalTab}
+                    >
+                        <AddChartByType
+                            options={this.clinicalDataOptions}
+                            freqPromise={this.getClinicalDataCount}
+                            onAddAll={this.onAddAll}
+                            onClearAll={this.onClearAll}
+                            onToggleOption={this.onToggleOption}
+                        />
+                    </MSKTab>
+                    <MSKTab
+                        key={1}
+                        id={TabKeysEnum.GENOMIC}
+                        linkText={TabNamesEnum.GENOMIC}
+                        hide={this.props.disableGenomicTab}
+                    >
+                        <AddChartByType
+                            options={this.genomicDataOptions}
+                            freqPromise={this.getGenomicDataCount}
+                            onAddAll={this.onAddAll}
+                            onClearAll={this.onClearAll}
+                            onToggleOption={this.onToggleOption}
+                        />
+                    </MSKTab>
+                    <MSKTab
+                        key={2}
+                        id={TabKeysEnum.CUSTOM_DATA}
+                        linkText={TabNamesEnum.CUSTOM_DATA}
+                        hide={this.props.disableCustomTab}
+                    >
+                        <CustomCaseSelection
+                            allSamples={this.props.store.samples.result}
+                            selectedSamples={
+                                this.props.store.selectedSamples.result
+                            }
+                            submitButtonText={'Add Chart'}
+                            queriedStudies={
+                                this.props.store.queriedPhysicalStudyIds.result
+                            }
+                            isChartNameValid={this.props.store.isChartNameValid}
+                            getDefaultChartName={
+                                this.props.store.getDefaultCustomChartName
+                            }
+                            onSubmit={(chart: CustomChart) => {
+                                this.infoMessage = `${chart.name} has been added.`;
+                                this.props.store.addCustomChart(chart);
+                            }}
+                        />
+                    </MSKTab>
+                </MSKTabs>
+                {this.props.store.isLoggedIn &&
+                    this.props.currentTab === StudyViewPageTabKeyEnum.SUMMARY &&
+                    this.props.store.showResetToDefaultButton && (
+                        <button
+                            style={{
+                                position: 'absolute',
+                                top: '14px',
+                                right: '18px',
+                                zIndex: 2,
+                            }}
+                            className="btn btn-primary btn-xs"
+                            onClick={this.props.showResetPopup}
+                        >
+                            Reset charts
+                        </button>
+                    )}
+                {this.infoMessage && (
+                    <SuccessBanner message={this.infoMessage} />
+                )}
+            </div>
+        );
     }
 }
 
 @observer
-export default class AddChartButton extends React.Component<IAddChartButtonProps, {}> {
+export default class AddChartButton extends React.Component<
+    IAddChartButtonProps,
+    {}
+> {
     @observable showTooltip = false;
     render() {
         return (
             <DefaultTooltip
                 visible={this.showTooltip}
-                onVisibleChange={visible => this.showTooltip = !!visible}
-                trigger={["click"]}
-                placement={"bottomRight"}
+                onVisibleChange={visible => (this.showTooltip = !!visible)}
+                trigger={['click']}
+                placement={'bottomRight'}
                 destroyTooltipOnHide={true}
-                overlay={() => <AddChartTabs store={this.props.store}
-                                             initialActiveTab={this.props.initialActiveTab}
-                                             currentTab={this.props.currentTab}
-                                             disableClinicalTab={this.props.disableClinicalTab}
-                                             disableGenomicTab={this.props.disableGenomicTab}
-                                             disableCustomTab={this.props.disableCustomTab}
-                                             showResetPopup={this.props.showResetPopup}/>}
+                overlay={() => (
+                    <AddChartTabs
+                        store={this.props.store}
+                        initialActiveTab={this.props.initialActiveTab}
+                        currentTab={this.props.currentTab}
+                        disableClinicalTab={this.props.disableClinicalTab}
+                        disableGenomicTab={this.props.disableGenomicTab}
+                        disableCustomTab={this.props.disableCustomTab}
+                        showResetPopup={this.props.showResetPopup}
+                    />
+                )}
                 overlayClassName={this.props.addChartOverlayClassName}
             >
-                <button className={classNames('btn btn-primary btn-sm', {"active":this.showTooltip})}
-                        style={{marginLeft: '10px'}}
-                        aria-pressed={this.showTooltip}
-                        data-event={serializeEvent({ category:"studyPage", action:"addChartMenuOpen", label:this.props.store.studyIds.join(",")})}
-                        data-test="add-charts-button"
-                >{this.props.buttonText}</button>
+                <button
+                    className={classNames('btn btn-primary btn-sm', {
+                        active: this.showTooltip,
+                    })}
+                    style={{ marginLeft: '10px' }}
+                    aria-pressed={this.showTooltip}
+                    data-event={serializeEvent({
+                        category: 'studyPage',
+                        action: 'addChartMenuOpen',
+                        label: this.props.store.studyIds.join(','),
+                    })}
+                    data-test="add-charts-button"
+                >
+                    {this.props.buttonText}
+                </button>
             </DefaultTooltip>
-        )
+        );
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/studyView/addChartButton/addChartByType/AddChartByType.tsx b/src/pages/studyView/addChartButton/addChartByType/AddChartByType.tsx
index 4aa3daaa130..20762b3c779 100644
--- a/src/pages/studyView/addChartButton/addChartByType/AddChartByType.tsx
+++ b/src/pages/studyView/addChartButton/addChartByType/AddChartByType.tsx
@@ -1,56 +1,63 @@
 import * as React from 'react';
-import {action, computed} from 'mobx';
-import {observer} from "mobx-react";
-import styles from "./styles.module.scss";
-import {ChartOption} from "../AddChartButton";
+import { action, computed } from 'mobx';
+import { observer } from 'mobx-react';
+import styles from './styles.module.scss';
+import { ChartOption } from '../AddChartButton';
 import * as _ from 'lodash';
-import LabeledCheckbox from "../../../../shared/components/labeledCheckbox/LabeledCheckbox";
-import {Column} from "../../../../shared/components/lazyMobXTable/LazyMobXTable";
-import {getFrequencyStr} from "../../StudyViewUtils";
-import LoadingIndicator from "../../../../shared/components/loadingIndicator/LoadingIndicator";
+import LabeledCheckbox from '../../../../shared/components/labeledCheckbox/LabeledCheckbox';
+import { Column } from '../../../../shared/components/lazyMobXTable/LazyMobXTable';
+import { getFrequencyStr } from '../../StudyViewUtils';
+import LoadingIndicator from '../../../../shared/components/loadingIndicator/LoadingIndicator';
 import MobxPromise from 'mobxpromise';
-import {ClinicalDataCountSet} from "../../StudyViewUtils";
-import FixedHeaderTable from "../../table/FixedHeaderTable";
+import { ClinicalDataCountSet } from '../../StudyViewUtils';
+import FixedHeaderTable from '../../table/FixedHeaderTable';
 import autobind from 'autobind-decorator';
 import classnames from 'classnames';
-import {EllipsisTextTooltip} from "cbioportal-frontend-commons";
-import {Omit} from "../../../../shared/lib/TypeScriptUtils";
-import ifNotDefined from "../../../../shared/lib/ifNotDefined";
+import { EllipsisTextTooltip } from 'cbioportal-frontend-commons';
+import { Omit } from '../../../../shared/lib/TypeScriptUtils';
+import ifNotDefined from '../../../../shared/lib/ifNotDefined';
 
-export type AddChartOption = Omit<ChartOption, "chartType">;
+export type AddChartOption = Omit<ChartOption, 'chartType'>;
 export interface IAddChartByTypeProps {
-    options: Omit<AddChartOption, "freq">[];
+    options: Omit<AddChartOption, 'freq'>[];
     freqPromise: MobxPromise<ClinicalDataCountSet>;
     onAddAll: (keys: string[]) => void;
     onClearAll: (keys: string[]) => void;
     onToggleOption: (key: string) => void;
-    optionsGivenInSortedOrder?:boolean;
-    frequencyHeaderTooltip?:string;
+    optionsGivenInSortedOrder?: boolean;
+    frequencyHeaderTooltip?: string;
 }
 
-
-class AddChartTableComponent extends FixedHeaderTable<AddChartOption> {
-}
+class AddChartTableComponent extends FixedHeaderTable<AddChartOption> {}
 
 const NUM_ROWS_SHOWN = 15;
 
 @observer
-export default class AddChartByType extends React.Component<IAddChartByTypeProps, {}> {
-
+export default class AddChartByType extends React.Component<
+    IAddChartByTypeProps,
+    {}
+> {
     @computed
     get options() {
         if (this.props.freqPromise.isComplete) {
-            const options = _.reduce(this.props.options, (acc, next) => {
-                const disabled = this.props.freqPromise.result![next.key] === 0;
-                acc.push({
-                    label: next.label,
-                    key: next.key,
-                    disabled: disabled,
-                    selected: next.selected,
-                    freq: disabled ? 0 : this.props.freqPromise.result![next.key]
-                });
-                return acc;
-            }, [] as AddChartOption[]);
+            const options = _.reduce(
+                this.props.options,
+                (acc, next) => {
+                    const disabled =
+                        this.props.freqPromise.result![next.key] === 0;
+                    acc.push({
+                        label: next.label,
+                        key: next.key,
+                        disabled: disabled,
+                        selected: next.selected,
+                        freq: disabled
+                            ? 0
+                            : this.props.freqPromise.result![next.key],
+                    });
+                    return acc;
+                },
+                [] as AddChartOption[]
+            );
             if (this.props.optionsGivenInSortedOrder) {
                 return options;
             } else {
@@ -59,7 +66,9 @@ export default class AddChartByType extends React.Component<IAddChartByTypeProps
                 });
             }
         } else {
-            const options = this.props.options.map(o=>Object.assign({freq:100}, o));
+            const options = this.props.options.map(o =>
+                Object.assign({ freq: 100 }, o)
+            );
             if (this.props.optionsGivenInSortedOrder) {
                 return options;
             } else {
@@ -68,55 +77,95 @@ export default class AddChartByType extends React.Component<IAddChartByTypeProps
         }
     }
 
-    private _columns: Column<AddChartOption>[] = [{
-        name: 'Name',
-        render: (option: AddChartOption) => {
-            return (
-                <div className={classnames(styles.option, 'add-chart-option')}
-                     data-test={`add-chart-option-${option.label.toLowerCase().replace(/\s/g,'-')}`}>
-                    <LabeledCheckbox
-                        checked={option.selected}
-                        disabled={option.disabled}
-                        labelProps={{
-                            className: classnames(styles.label, option.disabled ? styles.labelDisabled : '')
-                        }}
-                        inputProps={{
-                            className: styles.input
-                        }}
-                        onChange={() => this.onOptionChange(option)}
+    private _columns: Column<AddChartOption>[] = [
+        {
+            name: 'Name',
+            render: (option: AddChartOption) => {
+                return (
+                    <div
+                        className={classnames(
+                            styles.option,
+                            'add-chart-option'
+                        )}
+                        data-test={`add-chart-option-${option.label
+                            .toLowerCase()
+                            .replace(/\s/g, '-')}`}
                     >
-                        <EllipsisTextTooltip text={option.label}/>
-                    </LabeledCheckbox>
-                </div>
-            )
+                        <LabeledCheckbox
+                            checked={option.selected}
+                            disabled={option.disabled}
+                            labelProps={{
+                                className: classnames(
+                                    styles.label,
+                                    option.disabled ? styles.labelDisabled : ''
+                                ),
+                            }}
+                            inputProps={{
+                                className: styles.input,
+                            }}
+                            onChange={() => this.onOptionChange(option)}
+                        >
+                            <EllipsisTextTooltip text={option.label} />
+                        </LabeledCheckbox>
+                    </div>
+                );
+            },
+            filter: (d: AddChartOption, f: string, filterStringUpper: string) =>
+                d.label.toUpperCase().includes(filterStringUpper),
+            sortBy: (d: AddChartOption) => d.label,
+            width: 320,
+            defaultSortDirection: 'asc' as 'asc',
         },
-        filter: (d: AddChartOption, f: string, filterStringUpper: string) => d.label.toUpperCase().includes(filterStringUpper),
-        sortBy: (d: AddChartOption) => d.label,
-        width: 320,
-        defaultSortDirection: 'asc' as 'asc'
-    }, {
-        name: 'Freq',
-        tooltip: <span>{ifNotDefined(this.props.frequencyHeaderTooltip, "% samples with data")}</span>,
-        render: (option: AddChartOption) =>
-            <span style={{display: 'flex', flexDirection: 'row-reverse'}}
-                  className={classnames(option.disabled ? styles.labelDisabled : '')}>
-                {this.props.freqPromise.isComplete ? getFrequencyStr(option.freq) : ''}
-            </span>,
-        sortBy: (d: AddChartOption) => d.freq,
-        headerRender: () => {
-            return <span style={{display: 'flex', flexDirection: 'row-reverse', flexGrow: 1}}>Freq</span>
+        {
+            name: 'Freq',
+            tooltip: (
+                <span>
+                    {ifNotDefined(
+                        this.props.frequencyHeaderTooltip,
+                        '% samples with data'
+                    )}
+                </span>
+            ),
+            render: (option: AddChartOption) => (
+                <span
+                    style={{ display: 'flex', flexDirection: 'row-reverse' }}
+                    className={classnames(
+                        option.disabled ? styles.labelDisabled : ''
+                    )}
+                >
+                    {this.props.freqPromise.isComplete
+                        ? getFrequencyStr(option.freq)
+                        : ''}
+                </span>
+            ),
+            sortBy: (d: AddChartOption) => d.freq,
+            headerRender: () => {
+                return (
+                    <span
+                        style={{
+                            display: 'flex',
+                            flexDirection: 'row-reverse',
+                            flexGrow: 1,
+                        }}
+                    >
+                        Freq
+                    </span>
+                );
+            },
+            defaultSortDirection: 'desc' as 'desc',
+            width: 60,
         },
-        defaultSortDirection: 'desc' as 'desc',
-        width: 60
-    }];
+    ];
 
     @computed
     get tableHeight() {
-        return this.options.length > NUM_ROWS_SHOWN ? NUM_ROWS_SHOWN * 25 : (this.options.length + 1) * 25;
+        return this.options.length > NUM_ROWS_SHOWN
+            ? NUM_ROWS_SHOWN * 25
+            : (this.options.length + 1) * 25;
     }
 
     @autobind
-    getCurrentSelectedRows():AddChartOption[] {
+    getCurrentSelectedRows(): AddChartOption[] {
         return this.options.filter(option => option.selected);
     }
 
@@ -128,7 +177,11 @@ export default class AddChartByType extends React.Component<IAddChartByTypeProps
     @autobind
     @action
     addAll(selectedOptions: AddChartOption[]) {
-        this.props.onAddAll(_.filter(selectedOptions, option => !option.disabled).map(option => option.key));
+        this.props.onAddAll(
+            _.filter(selectedOptions, option => !option.disabled).map(
+                option => option.key
+            )
+        );
     }
 
     @autobind
@@ -145,7 +198,10 @@ export default class AddChartByType extends React.Component<IAddChartByTypeProps
 
     render() {
         return (
-            <div style={{display: 'flex', flexDirection: 'column'}} data-test='add-by-type'>
+            <div
+                style={{ display: 'flex', flexDirection: 'column' }}
+                data-test="add-by-type"
+            >
                 <AddChartTableComponent
                     width={380}
                     height={this.tableHeight}
@@ -157,17 +213,15 @@ export default class AddChartByType extends React.Component<IAddChartByTypeProps
                     showSelectableNumber={true}
                     showAddRemoveAllButtons={true}
                     autoFocusSearchAfterRendering={true}
-                    removeAllDisabled={!_.some(this.options, o=>o.selected)}
+                    removeAllDisabled={!_.some(this.options, o => o.selected)}
                 />
-                {
-                    this.props.freqPromise.isPending && (
-                        <span>
-                            <LoadingIndicator isLoading={true}/>
-                            Calculating data availability...
-                        </span>
-                    )
-                }
+                {this.props.freqPromise.isPending && (
+                    <span>
+                        <LoadingIndicator isLoading={true} />
+                        Calculating data availability...
+                    </span>
+                )}
             </div>
-        )
+        );
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/studyView/addChartButton/addChartByType/styles.module.scss b/src/pages/studyView/addChartButton/addChartByType/styles.module.scss
index 5dbc1bec044..dbf5271e5e4 100644
--- a/src/pages/studyView/addChartButton/addChartByType/styles.module.scss
+++ b/src/pages/studyView/addChartButton/addChartByType/styles.module.scss
@@ -1,46 +1,46 @@
 .main {
-  display: flex;
-  flex-direction: column;
+    display: flex;
+    flex-direction: column;
 }
 
 .operations {
-  display: flex;
-  justify-content: space-between;
+    display: flex;
+    justify-content: space-between;
 }
 
 .options {
-  display: flex;
-  flex-direction: column;
+    display: flex;
+    flex-direction: column;
 }
 
 .option {
-  margin-top: 5px;
-  overflow: hidden;
-  white-space: nowrap;
-  display: flex;
-  align-items: center;
+    margin-top: 5px;
+    overflow: hidden;
+    white-space: nowrap;
+    display: flex;
+    align-items: center;
 }
 
 .footer {
-  display: flex;
-  justify-content: space-between;
+    display: flex;
+    justify-content: space-between;
 }
 
 .input {
-  margin-right: 5px !important;
+    margin-right: 5px !important;
 }
 
 .label {
-  white-space: nowrap;
-  overflow: hidden;
-  -ms-text-overflow: ellipsis;
-  text-overflow: ellipsis;
-  font-weight: normal !important;
-  cursor: pointer;
-  display: flex !important;
+    white-space: nowrap;
+    overflow: hidden;
+    -ms-text-overflow: ellipsis;
+    text-overflow: ellipsis;
+    font-weight: normal !important;
+    cursor: pointer;
+    display: flex !important;
 }
 
-.labelDisabled{
-  color: #cccccc;
-  cursor: default;
-}
\ No newline at end of file
+.labelDisabled {
+    color: #cccccc;
+    cursor: default;
+}
diff --git a/src/pages/studyView/addChartButton/customCaseSelection/CustomCaseSelection.tsx b/src/pages/studyView/addChartButton/customCaseSelection/CustomCaseSelection.tsx
index 4f349e2f7c1..ef0fde4183e 100644
--- a/src/pages/studyView/addChartButton/customCaseSelection/CustomCaseSelection.tsx
+++ b/src/pages/studyView/addChartButton/customCaseSelection/CustomCaseSelection.tsx
@@ -1,23 +1,24 @@
 import * as React from 'react';
 import * as _ from 'lodash';
-import {Sample} from 'shared/api/generated/CBioPortalAPIInternal';
-import {observer} from "mobx-react";
-import styles from "./styles.module.scss";
-import {action, computed, observable} from 'mobx';
-import {ButtonGroup, Modal, Radio} from 'react-bootstrap';
-import { CustomChart} from "../../StudyViewPageStore";
-import ErrorBox from "../../../../shared/components/errorBox/ErrorBox";
-import {STUDY_VIEW_CONFIG} from "../../StudyViewConfig";
+import { Sample } from 'shared/api/generated/CBioPortalAPIInternal';
+import { observer } from 'mobx-react';
+import styles from './styles.module.scss';
+import { action, computed, observable } from 'mobx';
+import { ButtonGroup, Modal, Radio } from 'react-bootstrap';
+import { CustomChart } from '../../StudyViewPageStore';
+import ErrorBox from '../../../../shared/components/errorBox/ErrorBox';
+import { STUDY_VIEW_CONFIG } from '../../StudyViewConfig';
 import {
-    DEFAULT_GROUP_NAME_WITHOUT_USER_INPUT, CodeEnum,
+    DEFAULT_GROUP_NAME_WITHOUT_USER_INPUT,
+    CodeEnum,
     parseContent,
     ParseResult,
-    ValidationResult
-} from "./CustomCaseSelectionUtils";
+    ValidationResult,
+} from './CustomCaseSelectionUtils';
 import autobind from 'autobind-decorator';
-import {Collapse} from "react-collapse";
-import {serializeEvent} from "../../../../shared/lib/tracking";
-import {ClinicalDataType, ClinicalDataTypeEnum} from "../../StudyViewUtils";
+import { Collapse } from 'react-collapse';
+import { serializeEvent } from '../../../../shared/lib/tracking';
+import { ClinicalDataType, ClinicalDataTypeEnum } from '../../StudyViewUtils';
 
 export interface ICustomCaseSelectionProps {
     allSamples: Sample[];
@@ -27,21 +28,25 @@ export interface ICustomCaseSelectionProps {
     queriedStudies: string[];
     disableGrouping?: boolean;
     getDefaultChartName?: () => string;
-    isChartNameValid?: (chartName: string) => boolean
+    isChartNameValid?: (chartName: string) => boolean;
 }
 
-const GroupByOptions: { value: ClinicalDataType, label: string; }[] = [
-    {value: ClinicalDataTypeEnum.SAMPLE, label: 'By sample ID'},
-    {value: ClinicalDataTypeEnum.PATIENT, label: 'By patient ID'}
+const GroupByOptions: { value: ClinicalDataType; label: string }[] = [
+    { value: ClinicalDataTypeEnum.SAMPLE, label: 'By sample ID' },
+    { value: ClinicalDataTypeEnum.PATIENT, label: 'By patient ID' },
 ];
 
 enum SelectMode {
-    SELECTED, UNSELECTED
+    SELECTED,
+    UNSELECTED,
 }
 @observer
-export default class CustomCaseSelection extends React.Component<ICustomCaseSelectionProps, {}> {
+export default class CustomCaseSelection extends React.Component<
+    ICustomCaseSelectionProps,
+    {}
+> {
     private validateContent: boolean = false;
-    private chartNameValidation: ValidationResult = {warning: [], error: []};
+    private chartNameValidation: ValidationResult = { warning: [], error: [] };
     @observable dataFormatCollapsed: boolean = true;
     @observable chartName: string;
     @observable showCaseIds: boolean = false;
@@ -50,13 +55,16 @@ export default class CustomCaseSelection extends React.Component<ICustomCaseSele
     @observable validContent: string = '';
 
     public static defaultProps = {
-        submitButtonText: "Submit",
-        disableGrouping: false
+        submitButtonText: 'Submit',
+        disableGrouping: false,
     };
 
     @computed
     get sampleSet(): { [id: string]: Sample } {
-        return _.keyBy(this.props.selectedSamples, s => `${s.studyId}:${s.sampleId}`)
+        return _.keyBy(
+            this.props.selectedSamples,
+            s => `${s.studyId}:${s.sampleId}`
+        );
     }
 
     @computed
@@ -66,16 +74,30 @@ export default class CustomCaseSelection extends React.Component<ICustomCaseSele
 
     @computed
     get result(): ParseResult {
-        return parseContent(this.validContent, this.validateContent, this.props.queriedStudies, this.caseIdsMode, this.props.allSamples, this.isSingleStudy);
+        return parseContent(
+            this.validContent,
+            this.validateContent,
+            this.props.queriedStudies,
+            this.caseIdsMode,
+            this.props.allSamples,
+            this.isSingleStudy
+        );
     }
 
     @computed
     get newChartInfo(): CustomChart {
         return {
-            name: this.chartName ? this.chartName : this.props.getDefaultChartName ? this.props.getDefaultChartName() : '',
+            name: this.chartName
+                ? this.chartName
+                : this.props.getDefaultChartName
+                ? this.props.getDefaultChartName()
+                : '',
             patientAttribute: this.caseIdsMode === ClinicalDataTypeEnum.PATIENT,
-            groups: this.result.validationResult.error.length === 0 ? this.result.groups : []
-        }
+            groups:
+                this.result.validationResult.error.length === 0
+                    ? this.result.groups
+                    : [],
+        };
     }
 
     @autobind
@@ -85,18 +107,29 @@ export default class CustomCaseSelection extends React.Component<ICustomCaseSele
         if (selectMode === SelectMode.SELECTED) {
             selectedCases = this.props.selectedSamples;
         } else {
-            const _selectedCaseIds = _.keyBy(this.props.selectedSamples, (sample) => sample.uniqueSampleKey);
+            const _selectedCaseIds = _.keyBy(
+                this.props.selectedSamples,
+                sample => sample.uniqueSampleKey
+            );
             selectedCases = this.props.allSamples.filter(sample => {
                 return !_selectedCaseIds[sample.uniqueSampleKey];
             });
         }
         let cases = selectedCases.map(sample => {
-            return `${sample.studyId}:${(this.caseIdsMode === ClinicalDataTypeEnum.SAMPLE) ? sample.sampleId : sample.patientId}${this.props.disableGrouping ? '' : ` ${DEFAULT_GROUP_NAME_WITHOUT_USER_INPUT}`}`
+            return `${sample.studyId}:${
+                this.caseIdsMode === ClinicalDataTypeEnum.SAMPLE
+                    ? sample.sampleId
+                    : sample.patientId
+            }${
+                this.props.disableGrouping
+                    ? ''
+                    : ` ${DEFAULT_GROUP_NAME_WITHOUT_USER_INPUT}`
+            }`;
         });
         if (this.caseIdsMode === ClinicalDataTypeEnum.PATIENT) {
             cases = _.uniq(cases);
         }
-        this.content = cases.join("\n");
+        this.content = cases.join('\n');
         this.validateContent = false;
         this.validContent = this.content;
     }
@@ -112,20 +145,24 @@ export default class CustomCaseSelection extends React.Component<ICustomCaseSele
     @action
     onChartNameChange(event: any) {
         this.chartName = event.currentTarget.value;
-        const validChartName = this.props.isChartNameValid ? this.props.isChartNameValid(this.chartName) : true;
+        const validChartName = this.props.isChartNameValid
+            ? this.props.isChartNameValid(this.chartName)
+            : true;
         if (!validChartName) {
             this.chartNameValidation = {
-                error: [{
-                    code: CodeEnum.INVALID,
-                    message: new Error('Chart name exists.')
-                }],
-                warning: []
-            }
+                error: [
+                    {
+                        code: CodeEnum.INVALID,
+                        message: new Error('Chart name exists.'),
+                    },
+                ],
+                warning: [],
+            };
         } else {
             this.chartNameValidation = {
                 error: [],
-                warning: []
-            }
+                warning: [],
+            };
         }
     }
 
@@ -143,20 +180,40 @@ export default class CustomCaseSelection extends React.Component<ICustomCaseSele
 
     @computed
     get addChartButtonDisabled() {
-        return this.result.validationResult.error.length > 0 || this.newChartInfo.groups.length === 0 || this.chartNameValidation.error.length > 0;
+        return (
+            this.result.validationResult.error.length > 0 ||
+            this.newChartInfo.groups.length === 0 ||
+            this.chartNameValidation.error.length > 0
+        );
     }
 
     @computed
     get dataFormatContent() {
-        return <span>Each row can have two columns separated by space or tab:
-                <br/>1) study_id:{this.caseIdsMode === ClinicalDataTypeEnum.SAMPLE ? 'sample_id ' : 'patient_id '}
-            and<br/>2) group_name of your choice<br/>group_name is optional if there is only one group.</span>;
+        return (
+            <span>
+                Each row can have two columns separated by space or tab:
+                <br />
+                1) study_id:
+                {this.caseIdsMode === ClinicalDataTypeEnum.SAMPLE
+                    ? 'sample_id '
+                    : 'patient_id '}
+                and
+                <br />
+                2) group_name of your choice
+                <br />
+                group_name is optional if there is only one group.
+            </span>
+        );
     }
 
     @computed
     get submitButtonText() {
-        if(this.props.disableGrouping) {
-            return `Filter to listed ${this.caseIdsMode === ClinicalDataTypeEnum.SAMPLE ? "samples" : "patients"}`
+        if (this.props.disableGrouping) {
+            return `Filter to listed ${
+                this.caseIdsMode === ClinicalDataTypeEnum.SAMPLE
+                    ? 'samples'
+                    : 'patients'
+            }`;
         }
         return this.props.submitButtonText;
     }
@@ -165,53 +222,80 @@ export default class CustomCaseSelection extends React.Component<ICustomCaseSele
         return (
             <div className={styles.body}>
                 <ButtonGroup>
-                    {
-                        GroupByOptions.map((option, i) => {
-                            return <Radio
+                    {GroupByOptions.map((option, i) => {
+                        return (
+                            <Radio
                                 checked={option.value === this.caseIdsMode}
-                                onChange={(e) => {
-                                    this.caseIdsMode = $(e.target).attr("data-value") as any;
+                                onChange={e => {
+                                    this.caseIdsMode = $(e.target).attr(
+                                        'data-value'
+                                    ) as any;
                                     this.validateContent = true;
                                 }}
                                 inline
                                 data-value={option.value}
-                            >{option.label}</Radio>
-                        })
-                    }
+                            >
+                                {option.label}
+                            </Radio>
+                        );
+                    })}
                 </ButtonGroup>
 
-
                 <span>
-                    <div style={{display: 'flex', justifyContent: 'space-between', marginTop: 5}}>
+                    <div
+                        style={{
+                            display: 'flex',
+                            justifyContent: 'space-between',
+                            marginTop: 5,
+                        }}
+                    >
                         <span
                             className={styles.selection}
                             onClick={() => {
                                 this.onClick(SelectMode.SELECTED);
-                            }}>
-                            <i className='fa fa-arrow-down' style={{marginRight: 5}}></i>
-                            <span className={styles.selectionText}>currently selected</span>
+                            }}
+                        >
+                            <i
+                                className="fa fa-arrow-down"
+                                style={{ marginRight: 5 }}
+                            ></i>
+                            <span className={styles.selectionText}>
+                                currently selected
+                            </span>
                         </span>
                         <span
                             className={styles.selection}
                             onClick={() => {
                                 this.onClick(SelectMode.UNSELECTED);
-                            }}>
-                            <i className='fa fa-arrow-down' style={{marginRight: 5}}></i>
-                            <span className={styles.selectionText}>currently unselected</span>
+                            }}
+                        >
+                            <i
+                                className="fa fa-arrow-down"
+                                style={{ marginRight: 5 }}
+                            ></i>
+                            <span className={styles.selectionText}>
+                                currently unselected
+                            </span>
                         </span>
 
-                        <div className="collapsible-header" onClick={this.handleDataFormatToggle}>
+                        <div
+                            className="collapsible-header"
+                            onClick={this.handleDataFormatToggle}
+                        >
                             <a>Data Format</a>
-                            <span style={{paddingLeft: 4, cursor: 'pointer'}}>
-                            {this.dataFormatCollapsed ?
-                                <i className="fa fa-chevron-down"/> :
-                                <i className="fa fa-chevron-up"/>
-                            }
-                        </span>
+                            <span style={{ paddingLeft: 4, cursor: 'pointer' }}>
+                                {this.dataFormatCollapsed ? (
+                                    <i className="fa fa-chevron-down" />
+                                ) : (
+                                    <i className="fa fa-chevron-up" />
+                                )}
+                            </span>
                         </div>
                     </div>
                     <Collapse isOpened={!this.dataFormatCollapsed}>
-                        <div style={{marginTop: '5px'}}>{this.dataFormatContent}</div>
+                        <div style={{ marginTop: '5px' }}>
+                            {this.dataFormatContent}
+                        </div>
                     </Collapse>
                 </span>
 
@@ -219,59 +303,83 @@ export default class CustomCaseSelection extends React.Component<ICustomCaseSele
                     className="form-control"
                     rows={5}
                     value={this.content}
-                    onChange={(event) => {
+                    onChange={event => {
                         this.content = event.currentTarget.value;
                         _.delay(() => {
                             this.onChange(this.content);
                         }, 500);
                     }}
-                    data-test='CustomCaseSetInput'
+                    data-test="CustomCaseSetInput"
                 />
 
-                {this.props.disableGrouping &&
-                    <div className="alert alert-warning" style={{ marginTop: "15px", marginBottom: "5px" }}>
+                {this.props.disableGrouping && (
+                    <div
+                        className="alert alert-warning"
+                        style={{ marginTop: '15px', marginBottom: '5px' }}
+                    >
                         <i
                             className="fa fa-warning"
                             style={{ marginRight: 3 }}
                         />
                         Submitting will clear current filters.
                     </div>
-                }
+                )}
 
                 <div className={styles.operations}>
                     {!this.props.disableGrouping && (
-                        <input placeholder={"Chart name (optional)"}
-                               style={{width: '200px'}}
-                               type="text"
-                               onInput={this.onChartNameChange}
-                               className='form-control input-sm'/>
+                        <input
+                            placeholder={'Chart name (optional)'}
+                            style={{ width: '200px' }}
+                            type="text"
+                            onInput={this.onChartNameChange}
+                            className="form-control input-sm"
+                        />
                     )}
                     <button
                         disabled={this.addChartButtonDisabled}
                         className="btn btn-primary btn-sm"
-                        data-test='CustomCaseSetSubmitButton'
-                        data-event={serializeEvent({ category:'studyPage', action:'customCaseSetSelection', label:this.props.queriedStudies.join(",")})}
-                        onClick={this.onAddChart}>
+                        data-test="CustomCaseSetSubmitButton"
+                        data-event={serializeEvent({
+                            category: 'studyPage',
+                            action: 'customCaseSetSelection',
+                            label: this.props.queriedStudies.join(','),
+                        })}
+                        onClick={this.onAddChart}
+                    >
                         {this.submitButtonText}
                     </button>
                 </div>
-                {
-                    this.result.validationResult.error.concat(this.chartNameValidation.error).map(error => {
-                        return <div className="alert alert-danger" role="alert" style={{marginTop: '10px', marginBottom: '0'}}>{error.message.message}</div>
-                    })
-                }
-                {
-                    this.result.validationResult.warning.concat(this.chartNameValidation.warning).map(warning => {
-                        return <div className="alert alert-warning" role="alert"  style={{marginTop: '10px', marginBottom: '0'}}>{warning.message.message}</div>
-                    })
-                }
+                {this.result.validationResult.error
+                    .concat(this.chartNameValidation.error)
+                    .map(error => {
+                        return (
+                            <div
+                                className="alert alert-danger"
+                                role="alert"
+                                style={{ marginTop: '10px', marginBottom: '0' }}
+                            >
+                                {error.message.message}
+                            </div>
+                        );
+                    })}
+                {this.result.validationResult.warning
+                    .concat(this.chartNameValidation.warning)
+                    .map(warning => {
+                        return (
+                            <div
+                                className="alert alert-warning"
+                                role="alert"
+                                style={{ marginTop: '10px', marginBottom: '0' }}
+                            >
+                                {warning.message.message}
+                            </div>
+                        );
+                    })}
             </div>
         );
     }
 
     render() {
-        return (
-            this.mainContent()
-        )
+        return this.mainContent();
     }
 }
diff --git a/src/pages/studyView/addChartButton/customCaseSelection/CustomCaseSelectionUtils.spec.ts b/src/pages/studyView/addChartButton/customCaseSelection/CustomCaseSelectionUtils.spec.ts
index 77958d1b7b0..9884734a576 100644
--- a/src/pages/studyView/addChartButton/customCaseSelection/CustomCaseSelectionUtils.spec.ts
+++ b/src/pages/studyView/addChartButton/customCaseSelection/CustomCaseSelectionUtils.spec.ts
@@ -1,62 +1,84 @@
-import {assert} from 'chai';
+import { assert } from 'chai';
 import * as _ from 'lodash';
 import {
     DEFAULT_GROUP_NAME_WITH_USER_INPUT,
     DEFAULT_GROUP_NAME_WITHOUT_USER_INPUT,
-    CodeEnum, getGroups,
+    CodeEnum,
+    getGroups,
     getLine,
     getLines,
     InputLine,
     LineTypeEnum,
     ValidationResult,
-    validateLines
-} from "./CustomCaseSelectionUtils";
-import {ClinicalDataTypeEnum} from "../../StudyViewUtils";
-import {Sample} from "../../../../shared/api/generated/CBioPortalAPI";
+    validateLines,
+} from './CustomCaseSelectionUtils';
+import { ClinicalDataTypeEnum } from '../../StudyViewUtils';
+import { Sample } from '../../../../shared/api/generated/CBioPortalAPI';
 
 describe('CustomCaseSelectionUtils', () => {
     describe('getGroups', () => {
         const s1 = {
-            "studyId": "s1",
-            "sampleId": "c1",
-            "patientId": "p1",
-            "copyNumberSegmentPresent": false,
-            "sampleType": "Primary Solid Tumor",
-            "sequenced": true,
-            "uniquePatientKey": "s1_p1",
-            "uniqueSampleKey": "s1_c1"
+            studyId: 's1',
+            sampleId: 'c1',
+            patientId: 'p1',
+            copyNumberSegmentPresent: false,
+            sampleType: 'Primary Solid Tumor',
+            sequenced: true,
+            uniquePatientKey: 's1_p1',
+            uniqueSampleKey: 's1_c1',
         } as Sample;
 
         const s2 = {
-            "studyId": "s1",
-            "sampleId": "c2",
-            "patientId": "p2",
-            "copyNumberSegmentPresent": false,
-            "sampleType": "Primary Solid Tumor",
-            "sequenced": true,
-            "uniquePatientKey": "s1_p2",
-            "uniqueSampleKey": "s1_c2"
+            studyId: 's1',
+            sampleId: 'c2',
+            patientId: 'p2',
+            copyNumberSegmentPresent: false,
+            sampleType: 'Primary Solid Tumor',
+            sequenced: true,
+            uniquePatientKey: 's1_p2',
+            uniqueSampleKey: 's1_c2',
         } as Sample;
 
-        it('group name should be Selected when it\'s not specified by user', () => {
-            const groups = getGroups([{
-                line: 's1:c1',
-                studyId: 's1',
-                caseId: 'c1'
-            }], 's1', ClinicalDataTypeEnum.SAMPLE, [s1], false);
+        it("group name should be Selected when it's not specified by user", () => {
+            const groups = getGroups(
+                [
+                    {
+                        line: 's1:c1',
+                        studyId: 's1',
+                        caseId: 'c1',
+                    },
+                ],
+                's1',
+                ClinicalDataTypeEnum.SAMPLE,
+                [s1],
+                false
+            );
             assert.isTrue(groups.length === 1);
-            assert.isTrue(groups[0].name === DEFAULT_GROUP_NAME_WITHOUT_USER_INPUT);
+            assert.isTrue(
+                groups[0].name === DEFAULT_GROUP_NAME_WITHOUT_USER_INPUT
+            );
         });
 
-        it('group name should be NA when it\'s specified by user', () => {
-            const groups = getGroups([{line: 's1:c1', studyId: 's1', caseId: 'c1'}, {
-                line: 's1:c2',
-                studyId: 's1',
-                caseId: 'c2',
-                groupName: 'Group1'
-            }], 's1', ClinicalDataTypeEnum.SAMPLE, [s1, s2], true);
+        it("group name should be NA when it's specified by user", () => {
+            const groups = getGroups(
+                [
+                    { line: 's1:c1', studyId: 's1', caseId: 'c1' },
+                    {
+                        line: 's1:c2',
+                        studyId: 's1',
+                        caseId: 'c2',
+                        groupName: 'Group1',
+                    },
+                ],
+                's1',
+                ClinicalDataTypeEnum.SAMPLE,
+                [s1, s2],
+                true
+            );
             assert.isTrue(groups.length === 2);
-            assert.isTrue(groups[0].name === DEFAULT_GROUP_NAME_WITH_USER_INPUT);
+            assert.isTrue(
+                groups[0].name === DEFAULT_GROUP_NAME_WITH_USER_INPUT
+            );
             assert.isTrue(groups[1].name === 'Group1');
         });
     });
@@ -124,138 +146,213 @@ describe('CustomCaseSelectionUtils', () => {
     describe('validateLines', () => {
         const st1 = _.map(new Array(10), (item, index) => {
             return {
-                "studyId": "chol_nus_2012",
-                "sampleId": "s" + index,
-                "patientId": "p" + index,
-                "copyNumberSegmentPresent": false,
-                "sampleType": "Primary Solid Tumor",
-                "sequenced": true,
-                "uniquePatientKey": "chol_nus_2012_p" + index,
-                "uniqueSampleKey": "chol_nus_2012_s" + index
+                studyId: 'chol_nus_2012',
+                sampleId: 's' + index,
+                patientId: 'p' + index,
+                copyNumberSegmentPresent: false,
+                sampleType: 'Primary Solid Tumor',
+                sequenced: true,
+                uniquePatientKey: 'chol_nus_2012_p' + index,
+                uniqueSampleKey: 'chol_nus_2012_s' + index,
             };
         }) as Sample[];
 
         const st2 = _.map(new Array(5), (item, index) => {
             return {
-                "studyId": "lgg_tcga",
-                "sampleId": "s" + index,
-                "patientId": "p" + index,
-                "copyNumberSegmentPresent": false,
-                "sampleType": "Primary Solid Tumor",
-                "sequenced": true,
-                "uniquePatientKey": "lgg_tcga_p" + index,
-                "uniqueSampleKey": "lgg_tcga_s" + index
+                studyId: 'lgg_tcga',
+                sampleId: 's' + index,
+                patientId: 'p' + index,
+                copyNumberSegmentPresent: false,
+                sampleType: 'Primary Solid Tumor',
+                sequenced: true,
+                uniquePatientKey: 'lgg_tcga_p' + index,
+                uniqueSampleKey: 'lgg_tcga_s' + index,
             };
         }) as Sample[];
 
         it('In multiple studies, study id needs to be specified', () => {
-            const lines: InputLine[] = [{
-                line: 'chol_nus_2012:s1',
-                studyId: 'chol_nus_2012',
-                caseId: 's1'
-            }, {
-
-                line: 'lgg_tcga:s1',
-                studyId: 'lgg_tcga',
-                caseId: 's1'
-            }, {
-
-                line: 's1',
-                caseId: 's1'
-            }];
-            const result: ValidationResult = validateLines(lines, ClinicalDataTypeEnum.SAMPLE, st1.concat(st2), false, ['chol_nus_2012', 'lgg_tcga']);
+            const lines: InputLine[] = [
+                {
+                    line: 'chol_nus_2012:s1',
+                    studyId: 'chol_nus_2012',
+                    caseId: 's1',
+                },
+                {
+                    line: 'lgg_tcga:s1',
+                    studyId: 'lgg_tcga',
+                    caseId: 's1',
+                },
+                {
+                    line: 's1',
+                    caseId: 's1',
+                },
+            ];
+            const result: ValidationResult = validateLines(
+                lines,
+                ClinicalDataTypeEnum.SAMPLE,
+                st1.concat(st2),
+                false,
+                ['chol_nus_2012', 'lgg_tcga']
+            );
 
             assert.isTrue(result.warning.length !== 0);
-            assert.isTrue(_.keyBy(result.warning, 'code')[CodeEnum.INVALID_CASE_ID] !== undefined);
+            assert.isTrue(
+                _.keyBy(result.warning, 'code')[CodeEnum.INVALID_CASE_ID] !==
+                    undefined
+            );
         });
 
         it('Give error for unknown study ids', () => {
-            const lines: InputLine[] = [{
-                line: 'chol_nus_2012:s1',
-                studyId: 'chol_nus_2012',
-                caseId: 's1'
-            }, {
-                line: 'lgg_tcga:s1',
-                studyId: 'lgg_tcga',
-                caseId: 's1'
-            }, {
-                line: 'test:s1',
-                studyId: 'test',
-                caseId: 's1'
-            }];
-            const result: ValidationResult = validateLines(lines, ClinicalDataTypeEnum.SAMPLE, st1.concat(st2), false, ['chol_nus_2012', 'lgg_tcga']);
+            const lines: InputLine[] = [
+                {
+                    line: 'chol_nus_2012:s1',
+                    studyId: 'chol_nus_2012',
+                    caseId: 's1',
+                },
+                {
+                    line: 'lgg_tcga:s1',
+                    studyId: 'lgg_tcga',
+                    caseId: 's1',
+                },
+                {
+                    line: 'test:s1',
+                    studyId: 'test',
+                    caseId: 's1',
+                },
+            ];
+            const result: ValidationResult = validateLines(
+                lines,
+                ClinicalDataTypeEnum.SAMPLE,
+                st1.concat(st2),
+                false,
+                ['chol_nus_2012', 'lgg_tcga']
+            );
             assert.isTrue(result.error.length !== 0);
-            assert.isTrue(_.keyBy(result.error, 'code')[CodeEnum.STUDY_NOT_SELECTED] !== undefined);
+            assert.isTrue(
+                _.keyBy(result.error, 'code')[CodeEnum.STUDY_NOT_SELECTED] !==
+                    undefined
+            );
         });
 
         it('In single study, study id does not need to be specified', () => {
-            const lines: InputLine[] = [{
-                line: 's1',
-                caseId: 's1'
-            }];
-            const result: ValidationResult = validateLines(lines, ClinicalDataTypeEnum.SAMPLE, st1, true, ['chol_nus_2012']);
+            const lines: InputLine[] = [
+                {
+                    line: 's1',
+                    caseId: 's1',
+                },
+            ];
+            const result: ValidationResult = validateLines(
+                lines,
+                ClinicalDataTypeEnum.SAMPLE,
+                st1,
+                true,
+                ['chol_nus_2012']
+            );
             assert.isTrue(result.error.length === 0);
         });
 
         describe('The warning message should be given when case is invalid', () => {
-            it('Check when study id is not specified', function () {
-                const lines: InputLine[] = [{
-                    line: 's1test',
-                    caseId: 's1test'
-                }];
-                const result: ValidationResult = validateLines(lines, ClinicalDataTypeEnum.SAMPLE, st1, true, ['chol_nus_2012']);
+            it('Check when study id is not specified', function() {
+                const lines: InputLine[] = [
+                    {
+                        line: 's1test',
+                        caseId: 's1test',
+                    },
+                ];
+                const result: ValidationResult = validateLines(
+                    lines,
+                    ClinicalDataTypeEnum.SAMPLE,
+                    st1,
+                    true,
+                    ['chol_nus_2012']
+                );
                 assert.isTrue(result.warning.length === 1);
                 assert.equal(result.warning[0].code, CodeEnum.INVALID_CASE_ID);
             });
-            it('Check when study id is specified', function () {
-                const lines: InputLine[] = [{
-                    line: 's1test',
-                    studyId: 'chol_nus_2012',
-                    caseId: 's1test'
-                }];
-                const result: ValidationResult = validateLines(lines, ClinicalDataTypeEnum.SAMPLE, st1, true, ['chol_nus_2012']);
+            it('Check when study id is specified', function() {
+                const lines: InputLine[] = [
+                    {
+                        line: 's1test',
+                        studyId: 'chol_nus_2012',
+                        caseId: 's1test',
+                    },
+                ];
+                const result: ValidationResult = validateLines(
+                    lines,
+                    ClinicalDataTypeEnum.SAMPLE,
+                    st1,
+                    true,
+                    ['chol_nus_2012']
+                );
                 assert.isTrue(result.warning.length === 1);
                 assert.equal(result.warning[0].code, CodeEnum.INVALID_CASE_ID);
             });
         });
 
         describe('The warning message should be given when case id is sample but asking for validation on patient', () => {
-            it('Check when study id is not specified', function () {
-                const lines: InputLine[] = [{
-                    line: 's1',
-                    caseId: 's1'
-                }];
-                const result: ValidationResult = validateLines(lines, ClinicalDataTypeEnum.PATIENT, st1, true, ['chol_nus_2012']);
+            it('Check when study id is not specified', function() {
+                const lines: InputLine[] = [
+                    {
+                        line: 's1',
+                        caseId: 's1',
+                    },
+                ];
+                const result: ValidationResult = validateLines(
+                    lines,
+                    ClinicalDataTypeEnum.PATIENT,
+                    st1,
+                    true,
+                    ['chol_nus_2012']
+                );
                 assert.isTrue(result.warning.length === 1);
                 assert.equal(result.warning[0].code, CodeEnum.INVALID_CASE_ID);
             });
-            it('Check when study id is specified', function () {
-                const lines: InputLine[] = [{
-                    line: 's1',
-                    studyId: 'chol_nus_2012',
-                    caseId: 's1'
-                }];
-                const result: ValidationResult = validateLines(lines, ClinicalDataTypeEnum.PATIENT, st1, true, ['chol_nus_2012']);
+            it('Check when study id is specified', function() {
+                const lines: InputLine[] = [
+                    {
+                        line: 's1',
+                        studyId: 'chol_nus_2012',
+                        caseId: 's1',
+                    },
+                ];
+                const result: ValidationResult = validateLines(
+                    lines,
+                    ClinicalDataTypeEnum.PATIENT,
+                    st1,
+                    true,
+                    ['chol_nus_2012']
+                );
                 assert.isTrue(result.warning.length === 1);
                 assert.equal(result.warning[0].code, CodeEnum.INVALID_CASE_ID);
             });
         });
 
         it('For duplicate cases, give POTENTIAL_OVERLAP warning when the case is in different group', () => {
-            const lines: InputLine[] = [{
-                line: 's1',
-                caseId: 's1',
-                groupName: 't1'
-            }, {
-                line: 's1',
-                caseId: 's1',
-                groupName: 't2'
-            }];
-            const noGroupNameResult: ValidationResult = validateLines(lines, ClinicalDataTypeEnum.SAMPLE, st1, true, ['chol_nus_2012']);
+            const lines: InputLine[] = [
+                {
+                    line: 's1',
+                    caseId: 's1',
+                    groupName: 't1',
+                },
+                {
+                    line: 's1',
+                    caseId: 's1',
+                    groupName: 't2',
+                },
+            ];
+            const noGroupNameResult: ValidationResult = validateLines(
+                lines,
+                ClinicalDataTypeEnum.SAMPLE,
+                st1,
+                true,
+                ['chol_nus_2012']
+            );
             assert.isTrue(noGroupNameResult.warning.length === 1);
             assert.isTrue(noGroupNameResult.error.length === 0);
-            assert.equal(noGroupNameResult.warning[0].code, CodeEnum.POTENTIAL_OVERLAP);
+            assert.equal(
+                noGroupNameResult.warning[0].code,
+                CodeEnum.POTENTIAL_OVERLAP
+            );
         });
     });
-
 });
diff --git a/src/pages/studyView/addChartButton/customCaseSelection/CustomCaseSelectionUtils.tsx b/src/pages/studyView/addChartButton/customCaseSelection/CustomCaseSelectionUtils.tsx
index 8b937a165a5..d3d1e0476fc 100644
--- a/src/pages/studyView/addChartButton/customCaseSelection/CustomCaseSelectionUtils.tsx
+++ b/src/pages/studyView/addChartButton/customCaseSelection/CustomCaseSelectionUtils.tsx
@@ -1,14 +1,11 @@
-import {
-    CustomChartIdentifier,
-    CustomGroup
-} from "../../StudyViewPageStore";
+import { CustomChartIdentifier, CustomGroup } from '../../StudyViewPageStore';
 import * as _ from 'lodash';
-import {Sample} from "../../../../shared/api/generated/CBioPortalAPI";
-import {ClinicalDataType, ClinicalDataTypeEnum} from "../../StudyViewUtils";
-import Pluralize from "pluralize";
+import { Sample } from '../../../../shared/api/generated/CBioPortalAPI';
+import { ClinicalDataType, ClinicalDataTypeEnum } from '../../StudyViewUtils';
+import Pluralize from 'pluralize';
 
 type Code =
-    'MULTI_NAME'
+    | 'MULTI_NAME'
     | 'NO_GROUP_NAME'
     | 'OVERLAP'
     | 'POTENTIAL_OVERLAP'
@@ -31,17 +28,17 @@ export enum CodeEnum {
     INPUT_ERROR = 'INPUT_ERROR',
     NO_CHART_NAME = 'NO_CHART_NAME',
     NO_GROUP_NAME = 'NO_GROUP_NAME',
-};
+}
 
 export type ValidationMessage = {
-    code: Code,
-    message: Error
+    code: Code;
+    message: Error;
 };
 
 export type ParseResult = {
-    groups: CustomGroup[],
-    validationResult: ValidationResult
-}
+    groups: CustomGroup[];
+    validationResult: ValidationResult;
+};
 
 export enum LineTypeEnum {
     GROUP_NAME = 'GROUP_NAME',
@@ -50,22 +47,22 @@ export enum LineTypeEnum {
 }
 
 export type InputLine = {
-    line: string,
-    studyId?: string,
-    caseId: string,
-    groupName?: string
-}
+    line: string;
+    studyId?: string;
+    caseId: string;
+    groupName?: string;
+};
 
 export type ValidationResult = {
-    error: ValidationMessage[],
-    warning: ValidationMessage[],
-    updatedLines?: InputLine[]
-}
+    error: ValidationMessage[];
+    warning: ValidationMessage[];
+    updatedLines?: InputLine[];
+};
 
 export function getLine(line: string): InputLine {
     let parsedResult: InputLine = {
         line: line,
-        caseId: ''
+        caseId: '',
     };
 
     const content = line.split(':');
@@ -83,13 +80,17 @@ export function getLine(line: string): InputLine {
 }
 
 export function getLines(content: string): InputLine[] {
-    return _.reduce(content.trim().split(/\n|\r/g), (acc, line) => {
-        line = line.trim();
-        if (line) {
-            acc.push(getLine(line));
-        }
-        return acc;
-    }, [] as InputLine[])
+    return _.reduce(
+        content.trim().split(/\n|\r/g),
+        (acc, line) => {
+            line = line.trim();
+            if (line) {
+                acc.push(getLine(line));
+            }
+            return acc;
+        },
+        [] as InputLine[]
+    );
 }
 
 function getUniqueCaseId(studyId: string, caseId: string) {
@@ -100,120 +101,182 @@ function getInputLineKey(line: InputLine) {
     return [line.studyId || '', line.caseId, line.groupName || ''].join('&');
 }
 
-export function validateLines(lines: InputLine[], caseType: ClinicalDataType, allSamples: Sample[], isSingleStudy: boolean, selectedStudies: string[]): ValidationResult {
+export function validateLines(
+    lines: InputLine[],
+    caseType: ClinicalDataType,
+    allSamples: Sample[],
+    isSingleStudy: boolean,
+    selectedStudies: string[]
+): ValidationResult {
     let errorMessages: ValidationMessage[] = [];
     let warningMessages: ValidationMessage[] = [];
-    const groupNameDefault='_TEST_';
+    const groupNameDefault = '_TEST_';
 
     // Find out the invalid cases
     let invalidCases: string[] = [];
 
-    const validPair: { [key: string]: boolean } = _.reduce(allSamples, (acc, sample) => {
-        acc[`${sample.studyId}:${caseType === ClinicalDataTypeEnum.PATIENT ? sample.patientId : sample.sampleId}`] = true;
-        return acc;
-    }, {} as { [key: string]: boolean });
+    const validPair: { [key: string]: boolean } = _.reduce(
+        allSamples,
+        (acc, sample) => {
+            acc[
+                `${sample.studyId}:${
+                    caseType === ClinicalDataTypeEnum.PATIENT
+                        ? sample.patientId
+                        : sample.sampleId
+                }`
+            ] = true;
+            return acc;
+        },
+        {} as { [key: string]: boolean }
+    );
 
     let occurrence: { [key: string]: number } = {};
     let validLines: { [key: string]: InputLine } = {};
 
     // Remove all dups, not necessary to mention in the message
-    _.reduce(_.uniqBy(lines, line => {
-        return getInputLineKey(line);
-    }), (acc, line) => {
-        let _case = '';
-        let validLine = true;
-        if (line.studyId === undefined || line.studyId === '') {
-            if (!isSingleStudy) {
-                warningMessages.push({
-                    code: CodeEnum.INVALID_CASE_ID,
-                    message: new Error(`No study specified for ${caseType} id: ${line.caseId}, and more than one study selected for query. The case will be ignored.`)
-                });
-                validLine = false;
-            } else {
-                _case = getUniqueCaseId(selectedStudies[0], line.caseId);
-                if (!validPair[_case]) {
-                    invalidCases.push(line.caseId);
+    _.reduce(
+        _.uniqBy(lines, line => {
+            return getInputLineKey(line);
+        }),
+        (acc, line) => {
+            let _case = '';
+            let validLine = true;
+            if (line.studyId === undefined || line.studyId === '') {
+                if (!isSingleStudy) {
+                    warningMessages.push({
+                        code: CodeEnum.INVALID_CASE_ID,
+                        message: new Error(
+                            `No study specified for ${caseType} id: ${line.caseId}, and more than one study selected for query. The case will be ignored.`
+                        ),
+                    });
                     validLine = false;
                 } else {
-                    if (occurrence[_case] === undefined) {
-                        occurrence[_case] = 0;
+                    _case = getUniqueCaseId(selectedStudies[0], line.caseId);
+                    if (!validPair[_case]) {
+                        invalidCases.push(line.caseId);
+                        validLine = false;
+                    } else {
+                        if (occurrence[_case] === undefined) {
+                            occurrence[_case] = 0;
+                        }
+                        occurrence[_case]++;
                     }
-                    occurrence[_case]++;
                 }
-            }
-        } else {
-            if (!_.includes(selectedStudies, line.studyId)) {
-                errorMessages.push({
-                    code: CodeEnum.STUDY_NOT_SELECTED,
-                    message: new Error(`Incorrect study id: ${line.studyId}`)
-                });
-                validLine = false;
             } else {
-                _case = getUniqueCaseId(line.studyId, line.caseId);
-                if (validPair[_case] !== undefined) {
-                    if (occurrence[_case] === undefined) {
-                        occurrence[_case] = 0;
-                    }
-                    occurrence[_case]++;
-                } else {
-                    invalidCases.push(line.caseId);
+                if (!_.includes(selectedStudies, line.studyId)) {
+                    errorMessages.push({
+                        code: CodeEnum.STUDY_NOT_SELECTED,
+                        message: new Error(
+                            `Incorrect study id: ${line.studyId}`
+                        ),
+                    });
                     validLine = false;
+                } else {
+                    _case = getUniqueCaseId(line.studyId, line.caseId);
+                    if (validPair[_case] !== undefined) {
+                        if (occurrence[_case] === undefined) {
+                            occurrence[_case] = 0;
+                        }
+                        occurrence[_case]++;
+                    } else {
+                        invalidCases.push(line.caseId);
+                        validLine = false;
+                    }
                 }
             }
-        }
-        if (validLine) {
-            acc[getInputLineKey(line)] = line;
-        }
-        return acc;
-    }, validLines);
+            if (validLine) {
+                acc[getInputLineKey(line)] = line;
+            }
+            return acc;
+        },
+        validLines
+    );
 
     // Find duplication cases
-    const dups = _.reduce(occurrence, (acc, count, caseId) => {
-        if (count > 1) {
-            acc.push(caseId);
-        }
-        return acc;
-    }, [] as string[]);
-    if (dups.length > 0) {
-        // when dups exist, we need to figure out the damage
-        const groupDistribution = _.reduce(lines, (acc, line) => {
-            let groupName = line.groupName ? line.groupName : groupNameDefault;
-            if (acc[groupName] === undefined) {
-                acc[groupName] = [];
+    const dups = _.reduce(
+        occurrence,
+        (acc, count, caseId) => {
+            if (count > 1) {
+                acc.push(caseId);
             }
-            acc[groupName].push(getUniqueCaseId(line.studyId ? line.studyId : '', line.caseId));
             return acc;
-        }, {} as { [groupName: string]: string[] });
+        },
+        [] as string[]
+    );
+    if (dups.length > 0) {
+        // when dups exist, we need to figure out the damage
+        const groupDistribution = _.reduce(
+            lines,
+            (acc, line) => {
+                let groupName = line.groupName
+                    ? line.groupName
+                    : groupNameDefault;
+                if (acc[groupName] === undefined) {
+                    acc[groupName] = [];
+                }
+                acc[groupName].push(
+                    getUniqueCaseId(
+                        line.studyId ? line.studyId : '',
+                        line.caseId
+                    )
+                );
+                return acc;
+            },
+            {} as { [groupName: string]: string[] }
+        );
 
-        const dupCount = _.reduce(groupDistribution, (acc, group) => {
-            acc += group.length - _.uniq(group).length;
-            return acc;
-        }, 0);
+        const dupCount = _.reduce(
+            groupDistribution,
+            (acc, group) => {
+                acc += group.length - _.uniq(group).length;
+                return acc;
+            },
+            0
+        );
 
         // when the dupCount is not the same as dups length, means that the case is in different groups, that should be ok.
         if (_.keys(groupDistribution).length > 1 && dupCount !== dups.length) {
             warningMessages.push({
                 code: CodeEnum.POTENTIAL_OVERLAP,
-                message: new Error(`${dups.join(', ')} ${Pluralize('exist', dups.length - dupCount)} in different groups.`)
+                message: new Error(
+                    `${dups.join(', ')} ${Pluralize(
+                        'exist',
+                        dups.length - dupCount
+                    )} in different groups.`
+                ),
             });
         }
     }
 
-    if(invalidCases.length > 0) {
+    if (invalidCases.length > 0) {
         warningMessages.push({
             code: CodeEnum.INVALID_CASE_ID,
-            message: new Error(`The following ${Pluralize('case', invalidCases.length)} ${Pluralize('is', invalidCases.length)} invalid and will be ignored. ${invalidCases.join(', ')}`)
+            message: new Error(
+                `The following ${Pluralize(
+                    'case',
+                    invalidCases.length
+                )} ${Pluralize(
+                    'is',
+                    invalidCases.length
+                )} invalid and will be ignored. ${invalidCases.join(', ')}`
+            ),
         });
     }
     return {
         error: errorMessages,
         warning: warningMessages,
-        updatedLines: _.values(validLines)
-    }
+        updatedLines: _.values(validLines),
+    };
 }
 
 // the lines should already be validated
-export function getGroups(lines: InputLine[], singleStudyId: string, caseType: ClinicalDataType, allSamples: Sample[], hasGroupName: boolean): CustomGroup[] {
+export function getGroups(
+    lines: InputLine[],
+    singleStudyId: string,
+    caseType: ClinicalDataType,
+    allSamples: Sample[],
+    hasGroupName: boolean
+): CustomGroup[] {
     const sampleMap: { [id: string]: Sample } = {};
     const patientMap: { [id: string]: Sample[] } = {};
     const isPatientId = caseType === ClinicalDataTypeEnum.PATIENT;
@@ -228,37 +291,69 @@ export function getGroups(lines: InputLine[], singleStudyId: string, caseType: C
         patientMap[patientKey].push(sample);
     });
 
-    let groups = _.values(_.reduce(lines, (acc, line) => {
-        const groupName = line.groupName || (hasGroupName ? DEFAULT_GROUP_NAME_WITH_USER_INPUT : DEFAULT_GROUP_NAME_WITHOUT_USER_INPUT);
-        if (acc[groupName] == undefined) {
-            acc[groupName] = {
-                name: groupName,
-                sampleIdentifiers: []
-            }
-        }
+    let groups = _.values(
+        _.reduce(
+            lines,
+            (acc, line) => {
+                const groupName =
+                    line.groupName ||
+                    (hasGroupName
+                        ? DEFAULT_GROUP_NAME_WITH_USER_INPUT
+                        : DEFAULT_GROUP_NAME_WITHOUT_USER_INPUT);
+                if (acc[groupName] == undefined) {
+                    acc[groupName] = {
+                        name: groupName,
+                        sampleIdentifiers: [],
+                    };
+                }
 
-        const caseId = line.studyId === undefined ? `${singleStudyId}:${line.caseId}` : `${line.studyId}:${line.caseId}`;
-        const caseMap = isPatientId ? patientMap[caseId] : [sampleMap[caseId]];
-        const caseIdentifiers = caseMap === undefined ? [] : parseCase(caseMap);
-        acc[groupName].sampleIdentifiers.push(...caseIdentifiers);
-        return acc;
-    }, {} as { [key: string]: CustomGroup }));
+                const caseId =
+                    line.studyId === undefined
+                        ? `${singleStudyId}:${line.caseId}`
+                        : `${line.studyId}:${line.caseId}`;
+                const caseMap = isPatientId
+                    ? patientMap[caseId]
+                    : [sampleMap[caseId]];
+                const caseIdentifiers =
+                    caseMap === undefined ? [] : parseCase(caseMap);
+                acc[groupName].sampleIdentifiers.push(...caseIdentifiers);
+                return acc;
+            },
+            {} as { [key: string]: CustomGroup }
+        )
+    );
 
-    return groups.map(group=>{
-        group.sampleIdentifiers = _.uniqBy(group.sampleIdentifiers, item => `${item.studyId}:${item.sampleId}`);
+    return groups.map(group => {
+        group.sampleIdentifiers = _.uniqBy(
+            group.sampleIdentifiers,
+            item => `${item.studyId}:${item.sampleId}`
+        );
         return group;
     });
 }
 
-export function parseContent(content: string, needToValidate: boolean = false, selectedStudies: string[], caseType: ClinicalDataType, allSamples: Sample[], isSingleStudy: boolean): ParseResult {
+export function parseContent(
+    content: string,
+    needToValidate: boolean = false,
+    selectedStudies: string[],
+    caseType: ClinicalDataType,
+    allSamples: Sample[],
+    isSingleStudy: boolean
+): ParseResult {
     let validationResult: ValidationResult = {
         error: [],
-        warning: []
+        warning: [],
     };
     let lines: InputLine[] = getLines(content);
     if (lines.length > 0) {
         if (needToValidate) {
-            const result = validateLines(lines, caseType, allSamples, isSingleStudy, selectedStudies);
+            const result = validateLines(
+                lines,
+                caseType,
+                allSamples,
+                isSingleStudy,
+                selectedStudies
+            );
             validationResult.warning.push(...result.warning);
             validationResult.error.push(...result.error);
             if (result.updatedLines !== undefined) {
@@ -267,16 +362,26 @@ export function parseContent(content: string, needToValidate: boolean = false, s
         }
     }
 
-    const hasGroupName = _.find(lines, (line => line.groupName !== undefined && line.groupName !== '')) !== undefined;
+    const hasGroupName =
+        _.find(
+            lines,
+            line => line.groupName !== undefined && line.groupName !== ''
+        ) !== undefined;
     if (validationResult.error.length > 0) {
         return {
             groups: [],
-            validationResult: validationResult
+            validationResult: validationResult,
         };
     } else {
         return {
-            groups: getGroups(lines, selectedStudies[0], caseType, allSamples, hasGroupName),
-            validationResult: validationResult
+            groups: getGroups(
+                lines,
+                selectedStudies[0],
+                caseType,
+                allSamples,
+                hasGroupName
+            ),
+            validationResult: validationResult,
         };
     }
 }
@@ -286,7 +391,7 @@ export function parseCase(mappedSamples: Sample[]): CustomChartIdentifier[] {
         return {
             studyId: sample.studyId,
             sampleId: sample.sampleId,
-            patientId: sample.patientId
-        }
+            patientId: sample.patientId,
+        };
     });
-}
\ No newline at end of file
+}
diff --git a/src/pages/studyView/addChartButton/customCaseSelection/styles.module.scss b/src/pages/studyView/addChartButton/customCaseSelection/styles.module.scss
index 93dd480135d..c0dd12af143 100644
--- a/src/pages/studyView/addChartButton/customCaseSelection/styles.module.scss
+++ b/src/pages/studyView/addChartButton/customCaseSelection/styles.module.scss
@@ -1,4 +1,3 @@
-
 .body {
     display: flex;
     flex-direction: column;
diff --git a/src/pages/studyView/addChartButton/styles.module.scss b/src/pages/studyView/addChartButton/styles.module.scss
index 6aecb4e0e37..4346ad2ab7f 100644
--- a/src/pages/studyView/addChartButton/styles.module.scss
+++ b/src/pages/studyView/addChartButton/styles.module.scss
@@ -1,48 +1,50 @@
 .modalHeader {
-  font-size: 15px;
-  font-weight: bold;
+    font-size: 15px;
+    font-weight: bold;
 }
 
 .addChart {
-  position: absolute;
-  z-index: 999;
-  opacity: 0.8;
+    position: absolute;
+    z-index: 999;
+    opacity: 0.8;
 }
 
-.addChart:focus, .addChart:hover {
-  opacity: 1;
+.addChart:focus,
+.addChart:hover {
+    opacity: 1;
 }
 
 .child {
-  background-color: $brand-primary !important;
-  color: white !important;
+    background-color: $brand-primary !important;
+    color: white !important;
 }
 
-.child:focus, .child:hover {
-  color: white !important;
+.child:focus,
+.child:hover {
+    color: white !important;
 }
 
 .childContent {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  height: 100%;
-  width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 100%;
+    width: 100%;
 }
 
 .modalHeader {
-  font-size: 15px;
-  font-weight: bold;
+    font-size: 15px;
+    font-weight: bold;
 }
 
 .faCharC:before {
-  font-family: Arial; /* your font family here! */
-  font-weight: bold;
-  content: 'C';
+    font-family: Arial; /* your font family here! */
+    font-weight: bold;
+    content: 'C';
 }
 
 .faCharG:before {
-  font-family: Arial; /* your font family here! */
-  font-weight: bold;
-  content: 'G';
-}
\ No newline at end of file
+    font-family: Arial; /* your font family here! */
+    font-weight: bold;
+    content: 'G';
+}
diff --git a/src/pages/studyView/chartHeader/ChartHeader.tsx b/src/pages/studyView/chartHeader/ChartHeader.tsx
index 6ca6bc0a99c..959dcb45ea0 100644
--- a/src/pages/studyView/chartHeader/ChartHeader.tsx
+++ b/src/pages/studyView/chartHeader/ChartHeader.tsx
@@ -1,22 +1,25 @@
-import * as React from "react";
-import styles from "./styles.module.scss";
-import {If} from 'react-if';
-import {ChartType, NumericalGroupComparisonType} from "pages/studyView/StudyViewUtils";
+import * as React from 'react';
+import styles from './styles.module.scss';
+import { If } from 'react-if';
+import {
+    ChartType,
+    NumericalGroupComparisonType,
+} from 'pages/studyView/StudyViewUtils';
 import autobind from 'autobind-decorator';
 import classnames from 'classnames';
-import {action, computed, observable} from "mobx";
-import {observer} from "mobx-react";
-import {ChartTypeEnum} from "../StudyViewConfig";
-import {ChartMeta, getClinicalAttributeOverlay} from "../StudyViewUtils";
+import { action, computed, observable } from 'mobx';
+import { observer } from 'mobx-react';
+import { ChartTypeEnum } from '../StudyViewConfig';
+import { ChartMeta, getClinicalAttributeOverlay } from '../StudyViewUtils';
 import {
     DataType,
     DefaultTooltip,
     DownloadControls,
-    DownloadControlsButton
-} from "cbioportal-frontend-commons";
-import FlexAlignedCheckbox from "../../../shared/components/FlexAlignedCheckbox";
-import CustomBinsModal from "pages/studyView/charts/barChart/CustomBinsModal";
-import {StudyViewPageStore} from "pages/studyView/StudyViewPageStore";
+    DownloadControlsButton,
+} from 'cbioportal-frontend-commons';
+import FlexAlignedCheckbox from '../../../shared/components/FlexAlignedCheckbox';
+import CustomBinsModal from 'pages/studyView/charts/barChart/CustomBinsModal';
+import { StudyViewPageStore } from 'pages/studyView/StudyViewPageStore';
 
 export interface IChartHeaderProps {
     chartMeta: ChartMeta;
@@ -24,37 +27,40 @@ export interface IChartHeaderProps {
     store: StudyViewPageStore;
     title: string;
     height: number;
-    placement: 'left' | 'right',
-    active           : boolean;
-    resetChart       : () => void;
-    deleteChart      : () => void;
-    toggleLogScale?  : () => void;
-    hideLabel?       : boolean;
-    chartControls?   : ChartControls;
-    changeChartType  : (chartType: ChartType) => void;
-    getSVG?          : ()=>Promise<SVGElement | null>;
-    getData?         : ((dataType?:DataType)=>Promise<string | null>) | ((dataType?:DataType)=>string);
-    downloadTypes?   : DownloadControlsButton[];
-    openComparisonPage: (categorizationType?: NumericalGroupComparisonType) => void;
+    placement: 'left' | 'right';
+    active: boolean;
+    resetChart: () => void;
+    deleteChart: () => void;
+    toggleLogScale?: () => void;
+    hideLabel?: boolean;
+    chartControls?: ChartControls;
+    changeChartType: (chartType: ChartType) => void;
+    getSVG?: () => Promise<SVGElement | null>;
+    getData?:
+        | ((dataType?: DataType) => Promise<string | null>)
+        | ((dataType?: DataType) => string);
+    downloadTypes?: DownloadControlsButton[];
+    openComparisonPage: (
+        categorizationType?: NumericalGroupComparisonType
+    ) => void;
 }
 
 export interface ChartControls {
-    showResetIcon?      : boolean;
-    showTableIcon?      : boolean;
-    showPieIcon?        : boolean;
-    showComparisonPageIcon?   : boolean;
-    showLogScaleToggle? : boolean;
-    logScaleChecked?    : boolean;
+    showResetIcon?: boolean;
+    showTableIcon?: boolean;
+    showPieIcon?: boolean;
+    showComparisonPageIcon?: boolean;
+    showLogScaleToggle?: boolean;
+    logScaleChecked?: boolean;
 }
 
 @observer
 export class ChartHeader extends React.Component<IChartHeaderProps, {}> {
-
     @observable menuOpen = false;
     @observable downloadSubmenuOpen = false;
     @observable comparisonSubmenuOpen = false;
-    @observable showCustomBinModal:boolean = false;
-    private closeMenuTimeout:number|undefined = undefined;
+    @observable showCustomBinModal: boolean = false;
+    private closeMenuTimeout: number | undefined = undefined;
 
     @computed
     get fileName() {
@@ -73,7 +79,7 @@ export class ChartHeader extends React.Component<IChartHeaderProps, {}> {
     @action
     private closeMenu() {
         if (!this.closeMenuTimeout) {
-            this.closeMenuTimeout = window.setTimeout(()=>{
+            this.closeMenuTimeout = window.setTimeout(() => {
                 this.menuOpen = false;
                 this.closeMenuTimeout = undefined;
             }, 125);
@@ -88,91 +94,156 @@ export class ChartHeader extends React.Component<IChartHeaderProps, {}> {
         const submenuWidth = 120;
         if (this.props.chartType === ChartTypeEnum.BAR_CHART) {
             return (
-                <div className={classnames('dropdown-item', styles.dropdownHoverEffect)}
-                    style={{ 'display': 'flex', justifyContent: 'space-between', padding: '3px 20px' }}
-                    onMouseEnter={() => this.comparisonSubmenuOpen = true}
-                    onMouseLeave={() => this.comparisonSubmenuOpen = false}
+                <div
+                    className={classnames(
+                        'dropdown-item',
+                        styles.dropdownHoverEffect
+                    )}
+                    style={{
+                        display: 'flex',
+                        justifyContent: 'space-between',
+                        padding: '3px 20px',
+                    }}
+                    onMouseEnter={() => (this.comparisonSubmenuOpen = true)}
+                    onMouseLeave={() => (this.comparisonSubmenuOpen = false)}
                 >
                     <div>
-                        <img src={require("../../../rootImages/compare_vs.svg")}
-                            className={classnames('fa fa-fw', styles.menuItemIcon)}
+                        <img
+                            src={require('../../../rootImages/compare_vs.svg')}
+                            className={classnames(
+                                'fa fa-fw',
+                                styles.menuItemIcon
+                            )}
                         />
                         <span>Compare Groups</span>
                     </div>
-                    <i className={"fa fa-xs fa-fw fa-caret-right"}
-                        style={{ lineHeight: 'inherit' }} />
+                    <i
+                        className={'fa fa-xs fa-fw fa-caret-right'}
+                        style={{ lineHeight: 'inherit' }}
+                    />
 
-                    {this.comparisonSubmenuOpen &&
-                        <ul className={classnames("dropdown-menu", { show: this.comparisonSubmenuOpen })}
-                        style={{
-                            top: 0,
-                            margin: '-6px 0',
-                            left: this.props.placement === 'left' ? -submenuWidth : '100%',
-                            minWidth: submenuWidth
-                        }}>
-                        <li>
-                            <a className="dropdown-item"
-                                onClick={() => {
-                                    console.log('here')
-                                    this.props.openComparisonPage(NumericalGroupComparisonType.QUARTILES)}
-                                }
-                            >Quartiles</a>
-                        </li>
-                        <li>
-                            <a className="dropdown-item"
-                                onClick={() => {
-                                    console.log('here')
-                                    this.props.openComparisonPage(NumericalGroupComparisonType.MEDIAN)}
-                                }
-                            >Median</a>
-                        </li>
-                        <li>
-                            <a className="dropdown-item"
-                                onClick={() => this.props.openComparisonPage(NumericalGroupComparisonType.BINS)}
-                            >Current bins</a>
-                        </li>
-                    </ul>
-                    }
+                    {this.comparisonSubmenuOpen && (
+                        <ul
+                            className={classnames('dropdown-menu', {
+                                show: this.comparisonSubmenuOpen,
+                            })}
+                            style={{
+                                top: 0,
+                                margin: '-6px 0',
+                                left:
+                                    this.props.placement === 'left'
+                                        ? -submenuWidth
+                                        : '100%',
+                                minWidth: submenuWidth,
+                            }}
+                        >
+                            <li>
+                                <a
+                                    className="dropdown-item"
+                                    onClick={() => {
+                                        console.log('here');
+                                        this.props.openComparisonPage(
+                                            NumericalGroupComparisonType.QUARTILES
+                                        );
+                                    }}
+                                >
+                                    Quartiles
+                                </a>
+                            </li>
+                            <li>
+                                <a
+                                    className="dropdown-item"
+                                    onClick={() => {
+                                        console.log('here');
+                                        this.props.openComparisonPage(
+                                            NumericalGroupComparisonType.MEDIAN
+                                        );
+                                    }}
+                                >
+                                    Median
+                                </a>
+                            </li>
+                            <li>
+                                <a
+                                    className="dropdown-item"
+                                    onClick={() =>
+                                        this.props.openComparisonPage(
+                                            NumericalGroupComparisonType.BINS
+                                        )
+                                    }
+                                >
+                                    Current bins
+                                </a>
+                            </li>
+                        </ul>
+                    )}
                 </div>
-            )
+            );
         }
 
         return (
-            <a className="dropdown-item"
-                onClick={() => this.props.openComparisonPage()} >
-                <img src={require("../../../rootImages/compare_vs.svg")}
+            <a
+                className="dropdown-item"
+                onClick={() => this.props.openComparisonPage()}
+            >
+                <img
+                    src={require('../../../rootImages/compare_vs.svg')}
                     className={classnames('fa fa-fw', styles.menuItemIcon)}
                 />
                 Compare Groups
             </a>
-        )
+        );
     }
 
     @computed get menuItems() {
         const items = [];
-        if (this.props.chartControls && !!this.props.chartControls.showLogScaleToggle) {
+        if (
+            this.props.chartControls &&
+            !!this.props.chartControls.showLogScaleToggle
+        ) {
             items.push(
                 <li>
-                    <a className="dropdown-item logScaleCheckbox"  onClick={this.props.toggleLogScale}>
+                    <a
+                        className="dropdown-item logScaleCheckbox"
+                        onClick={this.props.toggleLogScale}
+                    >
                         <FlexAlignedCheckbox
-                            checked={!!(this.props.chartControls && this.props.chartControls.logScaleChecked)}
+                            checked={
+                                !!(
+                                    this.props.chartControls &&
+                                    this.props.chartControls.logScaleChecked
+                                )
+                            }
                             onClick={this.props.toggleLogScale}
-                            label={<span style={{marginTop:-3}}>Log Scale</span>}
-                            style={{ marginTop:1, marginBottom:-3 }}
+                            label={
+                                <span style={{ marginTop: -3 }}>Log Scale</span>
+                            }
+                            style={{ marginTop: 1, marginBottom: -3 }}
                         />
                     </a>
                 </li>
             );
         }
 
-        if (this.props.chartControls && !!this.props.chartControls.showTableIcon) {
+        if (
+            this.props.chartControls &&
+            !!this.props.chartControls.showTableIcon
+        ) {
             items.push(
                 <li>
-                    <a className="dropdown-item"
-                        onClick={() => this.props.changeChartType(ChartTypeEnum.TABLE)}
+                    <a
+                        className="dropdown-item"
+                        onClick={() =>
+                            this.props.changeChartType(ChartTypeEnum.TABLE)
+                        }
                     >
-                        <i className={classnames("fa fa-xs fa-fw", "fa-table", styles.menuItemIcon)}
-                           aria-hidden="true"
+                        <i
+                            className={classnames(
+                                'fa fa-xs fa-fw',
+                                'fa-table',
+                                styles.menuItemIcon
+                            )}
+                            aria-hidden="true"
                         />
                         Show Table
                     </a>
@@ -180,14 +251,25 @@ export class ChartHeader extends React.Component<IChartHeaderProps, {}> {
             );
         }
 
-        if (this.props.chartControls && !!this.props.chartControls.showPieIcon) {
+        if (
+            this.props.chartControls &&
+            !!this.props.chartControls.showPieIcon
+        ) {
             items.push(
                 <li>
-                    <a className="dropdown-item"
-                        onClick={() => this.props.changeChartType(ChartTypeEnum.PIE_CHART)}
+                    <a
+                        className="dropdown-item"
+                        onClick={() =>
+                            this.props.changeChartType(ChartTypeEnum.PIE_CHART)
+                        }
                     >
-                        <i className={classnames("fa fa-xs fa-fw", "fa-pie-chart", styles.menuItemIcon)}
-                           aria-hidden="true"
+                        <i
+                            className={classnames(
+                                'fa fa-xs fa-fw',
+                                'fa-pie-chart',
+                                styles.menuItemIcon
+                            )}
+                            aria-hidden="true"
                         />
                         Show Pie
                     </a>
@@ -195,7 +277,10 @@ export class ChartHeader extends React.Component<IChartHeaderProps, {}> {
             );
         }
 
-        if (this.props.chartControls && this.props.chartControls.showComparisonPageIcon) {
+        if (
+            this.props.chartControls &&
+            this.props.chartControls.showComparisonPageIcon
+        ) {
             items.push(
                 <li style={{ position: 'relative' }}>
                     {this.comparisonButton}
@@ -206,58 +291,92 @@ export class ChartHeader extends React.Component<IChartHeaderProps, {}> {
         if (this.props.chartType === ChartTypeEnum.BAR_CHART) {
             items.push(
                 <li>
-                    <a className="dropdown-item" onClick={()=>this.showCustomBinModal=true}>
-                        <i className={classnames("fa fa-xs fa-fw", "fa-bar-chart", styles.menuItemIcon)}
-                           aria-hidden="true"
+                    <a
+                        className="dropdown-item"
+                        onClick={() => (this.showCustomBinModal = true)}
+                    >
+                        <i
+                            className={classnames(
+                                'fa fa-xs fa-fw',
+                                'fa-bar-chart',
+                                styles.menuItemIcon
+                            )}
+                            aria-hidden="true"
                         />
                         Custom Bins
                     </a>
                     <CustomBinsModal
                         show={this.showCustomBinModal}
-                        onHide={() => this.showCustomBinModal = false}
+                        onHide={() => (this.showCustomBinModal = false)}
                         chartMeta={this.props.chartMeta}
-                        currentBins={this.props.store.geCurrentBins(this.props.chartMeta)}
+                        currentBins={this.props.store.geCurrentBins(
+                            this.props.chartMeta
+                        )}
                         updateCustomBins={this.props.store.updateCustomBins}
                     />
                 </li>
             );
         }
 
-        if (this.props.chartControls && this.props.downloadTypes && this.props.downloadTypes.length > 0) {
+        if (
+            this.props.chartControls &&
+            this.props.downloadTypes &&
+            this.props.downloadTypes.length > 0
+        ) {
             const downloadSubmenuWidth = 70;
             items.push(
-                <li style={{position: 'relative'}}>
-                    <div className={classnames('dropdown-item', styles.dropdownHoverEffect)}
-                         style={{'display': 'flex', justifyContent: 'space-between', padding: '3px 20px'}}
-                         onMouseEnter={() => this.downloadSubmenuOpen = true}
-                         onMouseLeave={() => this.downloadSubmenuOpen = false}
+                <li style={{ position: 'relative' }}>
+                    <div
+                        className={classnames(
+                            'dropdown-item',
+                            styles.dropdownHoverEffect
+                        )}
+                        style={{
+                            display: 'flex',
+                            justifyContent: 'space-between',
+                            padding: '3px 20px',
+                        }}
+                        onMouseEnter={() => (this.downloadSubmenuOpen = true)}
+                        onMouseLeave={() => (this.downloadSubmenuOpen = false)}
                     >
                         <div>
-                            <i className={classnames("fa fa-xs", "fa-download", styles.menuItemIcon)}
-                               aria-hidden="true"
+                            <i
+                                className={classnames(
+                                    'fa fa-xs',
+                                    'fa-download',
+                                    styles.menuItemIcon
+                                )}
+                                aria-hidden="true"
                             />
                             <span>Download</span>
                         </div>
-                        <i className={"fa fa-xs fa-fw fa-caret-right"}
-                           style={{lineHeight: 'inherit'}}/>
-
-                        {this.downloadSubmenuOpen &&
-                        <DownloadControls
-                            filename={this.fileName}
-                            buttons={this.props.downloadTypes}
-                            getSvg={this.props.getSVG}
-                            getData={this.props.getData}
-                            type='dropdown'
-                            className={classnames({show: this.downloadSubmenuOpen})}
-                            style={{
-                                top: 0,
-                                margin: '-6px 0',
-                                left: this.props.placement === 'left' ? -downloadSubmenuWidth : '100%',
-                                minWidth: downloadSubmenuWidth
-                            }}
-                            dontFade={true}
+                        <i
+                            className={'fa fa-xs fa-fw fa-caret-right'}
+                            style={{ lineHeight: 'inherit' }}
                         />
-                        }
+
+                        {this.downloadSubmenuOpen && (
+                            <DownloadControls
+                                filename={this.fileName}
+                                buttons={this.props.downloadTypes}
+                                getSvg={this.props.getSVG}
+                                getData={this.props.getData}
+                                type="dropdown"
+                                className={classnames({
+                                    show: this.downloadSubmenuOpen,
+                                })}
+                                style={{
+                                    top: 0,
+                                    margin: '-6px 0',
+                                    left:
+                                        this.props.placement === 'left'
+                                            ? -downloadSubmenuWidth
+                                            : '100%',
+                                    minWidth: downloadSubmenuWidth,
+                                }}
+                                dontFade={true}
+                            />
+                        )}
                     </div>
                 </li>
             );
@@ -270,56 +389,98 @@ export class ChartHeader extends React.Component<IChartHeaderProps, {}> {
     // were breaking at far right of page
     @computed
     get tooltipPosition() {
-        return  this.props.placement == 'left' ? 'topRight' : 'top';
+        return this.props.placement == 'left' ? 'topRight' : 'top';
     }
 
     @computed
     get tooltipAlign() {
-        return this.props.placement == 'left' ? { offset:[0,-6] } : undefined;
+        return this.props.placement == 'left' ? { offset: [0, -6] } : undefined;
     }
 
     public render() {
         return (
-            <div className={classnames(styles.header, 'chartHeader')}
-                 style={{position:"relative", height: `${this.props.height}px`, lineHeight: `${this.props.height}px`}}>
+            <div
+                className={classnames(styles.header, 'chartHeader')}
+                style={{
+                    position: 'relative',
+                    height: `${this.props.height}px`,
+                    lineHeight: `${this.props.height}px`,
+                }}
+            >
                 <div className={classnames(styles.name, styles.draggable)}>
-                    {!this.props.hideLabel && <span className='chartTitle'>{this.props.title}</span>}
+                    {!this.props.hideLabel && (
+                        <span className="chartTitle">{this.props.title}</span>
+                    )}
                 </div>
                 {this.active && (
                     <div className={classnames(styles.controls, 'controls')}>
                         <div className="btn-group">
-                            <If condition={!!this.props.chartMeta.clinicalAttribute || !!this.props.chartMeta.description}>
+                            <If
+                                condition={
+                                    !!this.props.chartMeta.clinicalAttribute ||
+                                    !!this.props.chartMeta.description
+                                }
+                            >
                                 <DefaultTooltip
                                     mouseEnterDelay={0}
-                                    trigger={["hover"]}
+                                    trigger={['hover']}
                                     placement={this.tooltipPosition}
                                     align={this.tooltipAlign}
-                                    overlay={getClinicalAttributeOverlay(this.props.chartMeta.displayName, this.props.chartMeta.description, this.props.chartMeta.clinicalAttribute ? this.props.chartMeta.clinicalAttribute.clinicalAttributeId : undefined)}
+                                    overlay={getClinicalAttributeOverlay(
+                                        this.props.chartMeta.displayName,
+                                        this.props.chartMeta.description,
+                                        this.props.chartMeta.clinicalAttribute
+                                            ? this.props.chartMeta
+                                                  .clinicalAttribute
+                                                  .clinicalAttributeId
+                                            : undefined
+                                    )}
                                     destroyTooltipOnHide={true}
                                 >
                                     <div
-                                        className={classnames("btn btn-xs btn-default", styles.item)}
+                                        className={classnames(
+                                            'btn btn-xs btn-default',
+                                            styles.item
+                                        )}
                                     >
                                         <i
-                                            className={classnames("fa fa-xs fa-fw", "fa-info-circle")}
+                                            className={classnames(
+                                                'fa fa-xs fa-fw',
+                                                'fa-info-circle'
+                                            )}
                                             aria-hidden="true"
                                         />
                                     </div>
                                 </DefaultTooltip>
                             </If>
-                            <If condition={this.props.chartControls && !!this.props.chartControls.showResetIcon}>
+                            <If
+                                condition={
+                                    this.props.chartControls &&
+                                    !!this.props.chartControls.showResetIcon
+                                }
+                            >
                                 <DefaultTooltip
                                     placement={this.tooltipPosition}
                                     align={this.tooltipAlign}
-                                    overlay={<span>Reset filters in chart</span>}
+                                    overlay={
+                                        <span>Reset filters in chart</span>
+                                    }
                                     destroyTooltipOnHide={true}
                                 >
                                     <button
-                                        className={classnames("btn btn-xs btn-default", styles.item)}
+                                        className={classnames(
+                                            'btn btn-xs btn-default',
+                                            styles.item
+                                        )}
                                         onClick={this.props.resetChart}
                                     >
                                         <i
-                                            className={classnames("fa fa-xs fa-fw", "fa-undo", styles.undo, styles.clickable)}
+                                            className={classnames(
+                                                'fa fa-xs fa-fw',
+                                                'fa-undo',
+                                                styles.undo,
+                                                styles.clickable
+                                            )}
                                             aria-hidden="true"
                                         />
                                     </button>
@@ -331,28 +492,53 @@ export class ChartHeader extends React.Component<IChartHeaderProps, {}> {
                                 overlay={<span>Delete chart</span>}
                             >
                                 <button
-                                    className={classnames("btn btn-xs btn-default", styles.item)}
+                                    className={classnames(
+                                        'btn btn-xs btn-default',
+                                        styles.item
+                                    )}
                                     onClick={this.props.deleteChart}
                                 >
-                                    <i className={classnames("fa fa-xs fa-fw", "fa-times", styles.clickable)}
-                                       aria-hidden="true"></i>
+                                    <i
+                                        className={classnames(
+                                            'fa fa-xs fa-fw',
+                                            'fa-times',
+                                            styles.clickable
+                                        )}
+                                        aria-hidden="true"
+                                    ></i>
                                 </button>
                             </DefaultTooltip>
-                            {(this.menuItems.length > 0) && (
+                            {this.menuItems.length > 0 && (
                                 <div
                                     onMouseEnter={this.openMenu}
                                     onMouseLeave={this.closeMenu}
-                                    data-test='chart-header-hamburger-icon'
-                                    className={classnames("dropdown btn-group", styles.chartMenu, {show:this.menuOpen})}
+                                    data-test="chart-header-hamburger-icon"
+                                    className={classnames(
+                                        'dropdown btn-group',
+                                        styles.chartMenu,
+                                        { show: this.menuOpen }
+                                    )}
                                 >
-                                    <button className={classnames("btn btn-xs btn-default dropdown-toggle", {active:this.menuOpen})}>
+                                    <button
+                                        className={classnames(
+                                            'btn btn-xs btn-default dropdown-toggle',
+                                            { active: this.menuOpen }
+                                        )}
+                                    >
                                         <i
-                                            className={classnames("fa fa-xs fa-fw fa-bars")}
+                                            className={classnames(
+                                                'fa fa-xs fa-fw fa-bars'
+                                            )}
                                         />
                                     </button>
-                                    <ul data-test='chart-header-hamburger-icon-menu'
-                                        className={classnames("dropdown-menu pull-right", {show:this.menuOpen})}
-                                        style={{width:'190px'}}>
+                                    <ul
+                                        data-test="chart-header-hamburger-icon-menu"
+                                        className={classnames(
+                                            'dropdown-menu pull-right',
+                                            { show: this.menuOpen }
+                                        )}
+                                        style={{ width: '190px' }}
+                                    >
                                         {this.menuItems}
                                     </ul>
                                 </div>
@@ -363,16 +549,13 @@ export class ChartHeader extends React.Component<IChartHeaderProps, {}> {
                 {this.active && (
                     <div
                         style={{
-                            position:"absolute",
-                            top:2,
-                            right:2
+                            position: 'absolute',
+                            top: 2,
+                            right: 2,
                         }}
-                    >
-
-                    </div>
+                    ></div>
                 )}
             </div>
         );
     }
-
 }
diff --git a/src/pages/studyView/chartHeader/styles.module.scss b/src/pages/studyView/chartHeader/styles.module.scss
index d3fb5738045..558b08f8e3a 100644
--- a/src/pages/studyView/chartHeader/styles.module.scss
+++ b/src/pages/studyView/chartHeader/styles.module.scss
@@ -2,76 +2,76 @@ $fontSize: 11px;
 $iconFontSize: 14px;
 
 .header {
-  display: flex;
-  align-items: center;
-  border-radius:$border-radius-base;
-  font-size: $fontSize;
+    display: flex;
+    align-items: center;
+    border-radius: $border-radius-base;
+    font-size: $fontSize;
 }
 
 .name {
-  flex-grow: 1;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  text-align: center !important;
-  font-weight: bold;
-  background:#f5f5f5;
-  border-radius:$border-radius-base;
+    flex-grow: 1;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    text-align: center !important;
+    font-weight: bold;
+    background: #f5f5f5;
+    border-radius: $border-radius-base;
 }
 
 .draggable {
-  cursor: move;
+    cursor: move;
 }
 
 .controls {
-  position:absolute;
-  border-radius:$border-radius-base;
-  right:-1px;
-  top:-1px;
+    position: absolute;
+    border-radius: $border-radius-base;
+    right: -1px;
+    top: -1px;
 }
 
 .menuToggle {
-  padding:1px !important;
-  line-height:1 !important;
-  font-size:$iconFontSize - 1px !important;
-  margin-left:4px;
+    padding: 1px !important;
+    line-height: 1 !important;
+    font-size: $iconFontSize - 1px !important;
+    margin-left: 4px;
 
-  i {
-    font-size: $iconFontSize;
-  }
+    i {
+        font-size: $iconFontSize;
+    }
 }
 
 .item {
-  margin-left:4px;
+    margin-left: 4px;
 }
 
 .menuItemIcon {
-  margin-right: 5px;
-  width: 15px;
+    margin-right: 5px;
+    width: 15px;
 }
 
 .survivalIcon {
-  width: $fontSize - 1px;
-  height: $fontSize - 1px;
+    width: $fontSize - 1px;
+    height: $fontSize - 1px;
 }
 
 .clickable {
-  cursor: pointer;
+    cursor: pointer;
 }
 
 .undo {
-  color: $brand-primary;
+    color: $brand-primary;
 }
 
 .downloadControl {
-  display: flex;
-  flex-direction: column;
-  button {
-    margin-top: 2px;
-    margin-bottom: 2px;
-  }
+    display: flex;
+    flex-direction: column;
+    button {
+        margin-top: 2px;
+        margin-bottom: 2px;
+    }
 }
 
 .dropdownHoverEffect:hover {
-  background-color: #f5f5f5;
-}
\ No newline at end of file
+    background-color: #f5f5f5;
+}
diff --git a/src/pages/studyView/charts/ChartContainer.tsx b/src/pages/studyView/charts/ChartContainer.tsx
index 09a55c0fce3..dbf5f42cfe8 100644
--- a/src/pages/studyView/charts/ChartContainer.tsx
+++ b/src/pages/studyView/charts/ChartContainer.tsx
@@ -1,19 +1,30 @@
-import * as React from "react";
-import styles from "./styles.module.scss";
-import {observer} from "mobx-react";
-import {action, computed, observable} from "mobx";
-import _ from "lodash";
-import {ChartControls, ChartHeader} from "pages/studyView/chartHeader/ChartHeader";
-import {StudyViewPageStore, SurvivalType} from "pages/studyView/StudyViewPageStore";
-import {DataBin, StudyViewFilter} from "shared/api/generated/CBioPortalAPIInternal";
-import PieChart from "pages/studyView/charts/pieChart/PieChart";
-import classnames from "classnames";
-import ClinicalTable from "pages/studyView/table/ClinicalTable";
-import MobxPromise from "mobxpromise";
-import SurvivalChart, {LegendLocation} from "../../resultsView/survival/SurvivalChart";
+import * as React from 'react';
+import styles from './styles.module.scss';
+import { observer } from 'mobx-react';
+import { action, computed, observable } from 'mobx';
+import _ from 'lodash';
+import {
+    ChartControls,
+    ChartHeader,
+} from 'pages/studyView/chartHeader/ChartHeader';
+import {
+    StudyViewPageStore,
+    SurvivalType,
+} from 'pages/studyView/StudyViewPageStore';
+import {
+    DataBin,
+    StudyViewFilter,
+} from 'shared/api/generated/CBioPortalAPIInternal';
+import PieChart from 'pages/studyView/charts/pieChart/PieChart';
+import classnames from 'classnames';
+import ClinicalTable from 'pages/studyView/table/ClinicalTable';
+import MobxPromise from 'mobxpromise';
+import SurvivalChart, {
+    LegendLocation,
+} from '../../resultsView/survival/SurvivalChart';
 
 import autobind from 'autobind-decorator';
-import BarChart from "./barChart/BarChart";
+import BarChart from './barChart/BarChart';
 import {
     ChartMeta,
     ChartType,
@@ -24,20 +35,24 @@ import {
     mutationCountVsCnaTooltip,
     MutationCountVsCnaYBinsMin,
     UniqueKey,
-    NumericalGroupComparisonType
-} from "../StudyViewUtils";
-import {GenePanel} from "../../../shared/api/generated/CBioPortalAPI";
-import {makeSurvivalChartData} from "./survival/StudyViewSurvivalUtils";
-import StudyViewDensityScatterPlot from "./scatterPlot/StudyViewDensityScatterPlot";
-import {ChartDimension, ChartTypeEnum, STUDY_VIEW_CONFIG} from "../StudyViewConfig";
-import LoadingIndicator from "../../../shared/components/loadingIndicator/LoadingIndicator";
-import {DataType, DownloadControlsButton} from "cbioportal-frontend-commons";
-import {MAX_GROUPS_IN_SESSION} from "../../groupComparison/GroupComparisonUtils";
-import {Modal} from "react-bootstrap";
-import MobxPromiseCache from "shared/lib/MobxPromiseCache";
-import WindowStore from "shared/components/window/WindowStore";
+    NumericalGroupComparisonType,
+} from '../StudyViewUtils';
+import { GenePanel } from '../../../shared/api/generated/CBioPortalAPI';
+import { makeSurvivalChartData } from './survival/StudyViewSurvivalUtils';
+import StudyViewDensityScatterPlot from './scatterPlot/StudyViewDensityScatterPlot';
+import {
+    ChartDimension,
+    ChartTypeEnum,
+    STUDY_VIEW_CONFIG,
+} from '../StudyViewConfig';
+import LoadingIndicator from '../../../shared/components/loadingIndicator/LoadingIndicator';
+import { DataType, DownloadControlsButton } from 'cbioportal-frontend-commons';
+import { MAX_GROUPS_IN_SESSION } from '../../groupComparison/GroupComparisonUtils';
+import { Modal } from 'react-bootstrap';
+import MobxPromiseCache from 'shared/lib/MobxPromiseCache';
+import WindowStore from 'shared/components/window/WindowStore';
 import Timer = NodeJS.Timer;
-import {GeneTableColumnKey, GeneTable} from "pages/studyView/table/GeneTable";
+import { GeneTableColumnKey, GeneTable } from 'pages/studyView/table/GeneTable';
 
 export interface AbstractChart {
     toSVGDOMNode: () => Element;
@@ -50,7 +65,11 @@ export interface IChartContainerDownloadProps {
     initDownload?: () => Promise<string>;
 }
 
-const COMPARISON_CHART_TYPES:ChartType[] = [ChartTypeEnum.PIE_CHART, ChartTypeEnum.TABLE, ChartTypeEnum.BAR_CHART];
+const COMPARISON_CHART_TYPES: ChartType[] = [
+    ChartTypeEnum.PIE_CHART,
+    ChartTypeEnum.TABLE,
+    ChartTypeEnum.BAR_CHART,
+];
 
 export interface IChartContainerProps {
     chartMeta: ChartMeta;
@@ -60,33 +79,37 @@ export interface IChartContainerProps {
     title: string;
     promise: MobxPromise<any>;
     filters: any;
-    studyViewFilters:StudyViewFilter;
-    setComparisonConfirmationModal:StudyViewPageStore["setComparisonConfirmationModal"];
+    studyViewFilters: StudyViewFilter;
+    setComparisonConfirmationModal: StudyViewPageStore['setComparisonConfirmationModal'];
     onValueSelection?: any;
     onDataBinSelection?: any;
-    getData?: ((dataType?: DataType)=>Promise<string|null>) | ((dataType?:DataType)=>string);
-    downloadTypes?:DownloadControlsButton[];
+    getData?:
+        | ((dataType?: DataType) => Promise<string | null>)
+        | ((dataType?: DataType) => string);
+    downloadTypes?: DownloadControlsButton[];
     onResetSelection?: any;
     onDeleteChart: (chartMeta: ChartMeta) => void;
     onChangeChartType: (chartMeta: ChartMeta, newChartType: ChartType) => void;
-    onToggleLogScale?:any;
-    logScaleChecked?:boolean;
-    showLogScaleToggle?:boolean;
-    selectedGenes?:any;
-    cancerGenes:number[];
-    onGeneSelect?:any;
+    onToggleLogScale?: any;
+    logScaleChecked?: boolean;
+    showLogScaleToggle?: boolean;
+    selectedGenes?: any;
+    cancerGenes: number[];
+    onGeneSelect?: any;
     isNewlyAdded: (uniqueKey: string) => boolean;
     cancerGeneFilterEnabled: boolean;
     filterByCancerGenes?: boolean;
     onChangeCancerGeneFilter?: (filtered: boolean) => void;
-    openComparisonPage:(params:{
-        chartMeta: ChartMeta,
-        categorizationType?: NumericalGroupComparisonType,
-        clinicalAttributeValues?:{ value:string, color:string }[]
-    })=>void;
-    analysisGroupsSettings:StudyViewPageStore["analysisGroupsSettings"];
-    patientToAnalysisGroup?:MobxPromise<{[uniquePatientKey:string]:string}>;
-    sampleToAnalysisGroup?:MobxPromise<{[uniqueSampleKey:string]:string}>;
+    openComparisonPage: (params: {
+        chartMeta: ChartMeta;
+        categorizationType?: NumericalGroupComparisonType;
+        clinicalAttributeValues?: { value: string; color: string }[];
+    }) => void;
+    analysisGroupsSettings: StudyViewPageStore['analysisGroupsSettings'];
+    patientToAnalysisGroup?: MobxPromise<{
+        [uniquePatientKey: string]: string;
+    }>;
+    sampleToAnalysisGroup?: MobxPromise<{ [uniqueSampleKey: string]: string }>;
     genePanelCache: MobxPromiseCache<{ genePanelId: string }, GenePanel>;
 }
 
@@ -97,7 +120,7 @@ export class ChartContainer extends React.Component<IChartContainerProps, {}> {
     private handlers: any;
     private plot: AbstractChart;
 
-    private mouseLeaveTimeout:Timer;
+    private mouseLeaveTimeout: Timer;
 
     @observable mouseInChart: boolean = false;
     @observable placement: 'left' | 'right' = 'right';
@@ -132,7 +155,10 @@ export class ChartContainer extends React.Component<IChartContainerProps, {}> {
                 if (this.mouseLeaveTimeout) {
                     clearTimeout(this.mouseLeaveTimeout);
                 }
-                this.placement = event.nativeEvent.x > WindowStore.size.width - 400 ? 'left' : 'right';
+                this.placement =
+                    event.nativeEvent.x > WindowStore.size.width - 400
+                        ? 'left'
+                        : 'right';
                 this.mouseInChart = true;
             }),
             onMouseLeaveChart: action(() => {
@@ -142,17 +168,25 @@ export class ChartContainer extends React.Component<IChartContainerProps, {}> {
                 }, 100);
             }),
             defaultDownload: {
-                SVG: () => Promise.resolve((new XMLSerializer()).serializeToString(this.toSVGDOMNode())),
+                SVG: () =>
+                    Promise.resolve(
+                        new XMLSerializer().serializeToString(
+                            this.toSVGDOMNode()
+                        )
+                    ),
                 PNG: () => Promise.resolve(this.toSVGDOMNode()),
-                PDF: () => Promise.resolve(this.toSVGDOMNode())
+                PDF: () => Promise.resolve(this.toSVGDOMNode()),
             },
             onChangeChartType: (newChartType: ChartType) => {
                 this.mouseInChart = false;
-                this.props.onChangeChartType(this.props.chartMeta, newChartType)
+                this.props.onChangeChartType(
+                    this.props.chartMeta,
+                    newChartType
+                );
             },
             onDeleteChart: () => {
                 this.props.onDeleteChart(this.props.chartMeta);
-            }
+            },
         };
     }
 
@@ -161,27 +195,30 @@ export class ChartContainer extends React.Component<IChartContainerProps, {}> {
             // Get result of plot
             return this.plot.toSVGDOMNode() as SVGElement;
         } else {
-            return document.createElementNS("http://www.w3.org/2000/svg", "svg");
+            return document.createElementNS(
+                'http://www.w3.org/2000/svg',
+                'svg'
+            );
         }
     }
 
     @computed
     get chartControls(): ChartControls {
-        let controls:Partial<ChartControls> = {};
+        let controls: Partial<ChartControls> = {};
         switch (this.chartType) {
             case ChartTypeEnum.BAR_CHART: {
                 controls = {
                     showLogScaleToggle: this.props.showLogScaleToggle,
-                    logScaleChecked: this.props.logScaleChecked
+                    logScaleChecked: this.props.logScaleChecked,
                 };
                 break;
             }
             case ChartTypeEnum.PIE_CHART: {
-                controls = {showTableIcon: true}
+                controls = { showTableIcon: true };
                 break;
             }
             case ChartTypeEnum.TABLE: {
-                controls = {showPieIcon: true}
+                controls = { showPieIcon: true };
                 break;
             }
         }
@@ -190,7 +227,7 @@ export class ChartContainer extends React.Component<IChartContainerProps, {}> {
         }
         return {
             ...controls,
-            showResetIcon: this.props.filters && this.props.filters.length > 0
+            showResetIcon: this.props.filters && this.props.filters.length > 0,
         } as ChartControls;
     }
 
@@ -203,37 +240,57 @@ export class ChartContainer extends React.Component<IChartContainerProps, {}> {
 
     @computed
     get comparisonPagePossible() {
-        return this.props.promise.isComplete &&
+        return (
+            this.props.promise.isComplete &&
             this.props.promise.result!.length > 1 &&
-            (COMPARISON_CHART_TYPES.indexOf(this.props.chartType) > -1);
+            COMPARISON_CHART_TYPES.indexOf(this.props.chartType) > -1
+        );
     }
 
     @autobind
     @action
-    openComparisonPage(categorizationType?:NumericalGroupComparisonType) {
+    openComparisonPage(categorizationType?: NumericalGroupComparisonType) {
         if (this.comparisonPagePossible) {
             switch (this.props.chartType) {
                 case ChartTypeEnum.PIE_CHART:
                 case ChartTypeEnum.TABLE:
-                    const openComparison = ()=>this.props.openComparisonPage({
-                        chartMeta: this.props.chartMeta,
-                        clinicalAttributeValues:(this.props.promise.result! as ClinicalDataCountSummary[]),
-                    });
-                    const values = (this.props.promise.result! as ClinicalDataCountSummary[]);
+                    const openComparison = () =>
+                        this.props.openComparisonPage({
+                            chartMeta: this.props.chartMeta,
+                            clinicalAttributeValues: this.props.promise
+                                .result! as ClinicalDataCountSummary[],
+                        });
+                    const values = this.props.promise
+                        .result! as ClinicalDataCountSummary[];
                     if (values.length > MAX_GROUPS_IN_SESSION) {
-                        this.props.setComparisonConfirmationModal((hideModal)=>{
+                        this.props.setComparisonConfirmationModal(hideModal => {
                             return (
-                                <Modal show={true} onHide={()=>{}} backdrop="static">
+                                <Modal
+                                    show={true}
+                                    onHide={() => {}}
+                                    backdrop="static"
+                                >
                                     <Modal.Body>
-                                        Group comparisons are limited to 20 groups.
-                                        Click OK to compare the 20 largest groups in this chart.
-                                        Or, select up to 20 specific groups in the chart to compare.
+                                        Group comparisons are limited to 20
+                                        groups. Click OK to compare the 20
+                                        largest groups in this chart. Or, select
+                                        up to 20 specific groups in the chart to
+                                        compare.
                                     </Modal.Body>
                                     <Modal.Footer>
-                                        <button className="btn btn-md btn-primary" onClick={()=>{ openComparison(); hideModal(); }}>
+                                        <button
+                                            className="btn btn-md btn-primary"
+                                            onClick={() => {
+                                                openComparison();
+                                                hideModal();
+                                            }}
+                                        >
                                             OK
                                         </button>
-                                        <button className="btn btn-md btn-default" onClick={hideModal}>
+                                        <button
+                                            className="btn btn-md btn-default"
+                                            onClick={hideModal}
+                                        >
                                             Cancel
                                         </button>
                                     </Modal.Footer>
@@ -247,7 +304,7 @@ export class ChartContainer extends React.Component<IChartContainerProps, {}> {
                 case ChartTypeEnum.BAR_CHART:
                     this.props.openComparisonPage({
                         chartMeta: this.props.chartMeta,
-                        categorizationType
+                        categorizationType,
                     });
                     break;
             }
@@ -257,22 +314,32 @@ export class ChartContainer extends React.Component<IChartContainerProps, {}> {
     @computed get survivalChartData() {
         // need to put this in @computed instead of a remoteData, because in a remoteData any changes to props trigger
         //   a rerender with delay
-        if (this.props.promise.isComplete && this.props.patientToAnalysisGroup && this.props.patientToAnalysisGroup.isComplete) {
-            const survival:SurvivalType = _.find(this.props.promise.result!, (survivalPlot) => {
-                return survivalPlot.id === this.props.chartMeta.uniqueKey;
-            });
-            return  makeSurvivalChartData(survival.survivalData,
+        if (
+            this.props.promise.isComplete &&
+            this.props.patientToAnalysisGroup &&
+            this.props.patientToAnalysisGroup.isComplete
+        ) {
+            const survival: SurvivalType = _.find(
+                this.props.promise.result!,
+                survivalPlot => {
+                    return survivalPlot.id === this.props.chartMeta.uniqueKey;
+                }
+            );
+            return makeSurvivalChartData(
+                survival.survivalData,
                 this.props.analysisGroupsSettings.groups,
                 this.props.patientToAnalysisGroup!.result!
             );
         } else {
             return undefined;
         }
-    };
+    }
 
     // Scatter plot has a weird height setting.
     getScatterPlotHeight() {
-        return STUDY_VIEW_CONFIG.layout.grid.h * 2 - this.chartHeaderHeight + 33;
+        return (
+            STUDY_VIEW_CONFIG.layout.grid.h * 2 - this.chartHeaderHeight + 33
+        );
     }
 
     @computed
@@ -282,27 +349,50 @@ export class ChartContainer extends React.Component<IChartContainerProps, {}> {
 
     @computed
     get chart() {
-        const {BAR_CHART, SURVIVAL, CNA_GENES_TABLE, TABLE, SCATTER, PIE_CHART, MUTATED_GENES_TABLE, FUSION_GENES_TABLE} = ChartTypeEnum;
+        const {
+            BAR_CHART,
+            SURVIVAL,
+            CNA_GENES_TABLE,
+            TABLE,
+            SCATTER,
+            PIE_CHART,
+            MUTATED_GENES_TABLE,
+            FUSION_GENES_TABLE,
+        } = ChartTypeEnum;
         switch (this.chartType) {
             case PIE_CHART: {
-                return ()=>(<PieChart
-                    width={getWidthByDimension(this.props.dimension, this.borderWidth)}
-                    height={getHeightByDimension(this.props.dimension, this.chartHeaderHeight)}
-                    ref={this.handlers.ref}
-                    onUserSelection={this.handlers.onValueSelection}
-                    filters={this.props.filters}
-                    data={this.props.promise.result}
-                    placement={this.placement}
-                    label={this.props.title}
-                    labelDescription={this.props.chartMeta.description}
-                    patientAttribute={this.props.chartMeta.patientAttribute}
-                />);
+                return () => (
+                    <PieChart
+                        width={getWidthByDimension(
+                            this.props.dimension,
+                            this.borderWidth
+                        )}
+                        height={getHeightByDimension(
+                            this.props.dimension,
+                            this.chartHeaderHeight
+                        )}
+                        ref={this.handlers.ref}
+                        onUserSelection={this.handlers.onValueSelection}
+                        filters={this.props.filters}
+                        data={this.props.promise.result}
+                        placement={this.placement}
+                        label={this.props.title}
+                        labelDescription={this.props.chartMeta.description}
+                        patientAttribute={this.props.chartMeta.patientAttribute}
+                    />
+                );
             }
             case BAR_CHART: {
-                return ()=>(
+                return () => (
                     <BarChart
-                        width={getWidthByDimension(this.props.dimension, this.borderWidth)}
-                        height={getHeightByDimension(this.props.dimension, this.chartHeaderHeight)}
+                        width={getWidthByDimension(
+                            this.props.dimension,
+                            this.borderWidth
+                        )}
+                        height={getHeightByDimension(
+                            this.props.dimension,
+                            this.chartHeaderHeight
+                        )}
                         ref={this.handlers.ref}
                         onUserSelection={this.handlers.onDataBinSelection}
                         filters={this.props.filters}
@@ -311,40 +401,57 @@ export class ChartContainer extends React.Component<IChartContainerProps, {}> {
                 );
             }
             case TABLE: {
-                return ()=>(<ClinicalTable
-                    data={this.props.promise.result}
-                    width={getWidthByDimension(this.props.dimension, this.borderWidth)}
-                    height={getTableHeightByDimension(this.props.dimension, this.chartHeaderHeight)}
-                    filters={this.props.filters}
-                    onUserSelection={this.handlers.onValueSelection}
-                    labelDescription={this.props.chartMeta.description}
-                    patientAttribute={this.props.chartMeta.patientAttribute}
-                    showAddRemoveAllButtons={this.mouseInChart}
-                />);
+                return () => (
+                    <ClinicalTable
+                        data={this.props.promise.result}
+                        width={getWidthByDimension(
+                            this.props.dimension,
+                            this.borderWidth
+                        )}
+                        height={getTableHeightByDimension(
+                            this.props.dimension,
+                            this.chartHeaderHeight
+                        )}
+                        filters={this.props.filters}
+                        onUserSelection={this.handlers.onValueSelection}
+                        labelDescription={this.props.chartMeta.description}
+                        patientAttribute={this.props.chartMeta.patientAttribute}
+                        showAddRemoveAllButtons={this.mouseInChart}
+                    />
+                );
             }
             case MUTATED_GENES_TABLE: {
-                return ()=>(
+                return () => (
                     <GeneTable
                         tableType={'mutation'}
                         promise={this.props.promise}
-                        width={getWidthByDimension(this.props.dimension, this.borderWidth)}
-                        height={getTableHeightByDimension(this.props.dimension, this.chartHeaderHeight)}
+                        width={getWidthByDimension(
+                            this.props.dimension,
+                            this.borderWidth
+                        )}
+                        height={getTableHeightByDimension(
+                            this.props.dimension,
+                            this.chartHeaderHeight
+                        )}
                         numOfSelectedSamples={100}
                         filters={this.props.filters}
                         onUserSelection={this.handlers.onValueSelection}
                         onGeneSelect={this.props.onGeneSelect}
                         selectedGenes={this.props.selectedGenes}
                         genePanelCache={this.props.genePanelCache}
-                        cancerGeneFilterEnabled={this.props.cancerGeneFilterEnabled}
+                        cancerGeneFilterEnabled={
+                            this.props.cancerGeneFilterEnabled
+                        }
                         filterByCancerGenes={this.props.filterByCancerGenes!}
-                        onChangeCancerGeneFilter={this.props.onChangeCancerGeneFilter!}
+                        onChangeCancerGeneFilter={
+                            this.props.onChangeCancerGeneFilter!
+                        }
                         columns={[
-                            {columnKey: GeneTableColumnKey.GENE},
-                            {columnKey: GeneTableColumnKey.NUMBER_MUTATIONS},
-                            {columnKey: GeneTableColumnKey.NUMBER},
-                            {columnKey: GeneTableColumnKey.FREQ},
+                            { columnKey: GeneTableColumnKey.GENE },
+                            { columnKey: GeneTableColumnKey.NUMBER_MUTATIONS },
+                            { columnKey: GeneTableColumnKey.NUMBER },
+                            { columnKey: GeneTableColumnKey.FREQ },
                         ]}
-
                         defaultSortBy={GeneTableColumnKey.FREQ}
                     />
                 );
@@ -354,49 +461,84 @@ export class ChartContainer extends React.Component<IChartContainerProps, {}> {
                     <GeneTable
                         tableType={'fusion'}
                         promise={this.props.promise}
-                        width={getWidthByDimension(this.props.dimension, this.borderWidth)}
-                        height={getTableHeightByDimension(this.props.dimension, this.chartHeaderHeight)}
+                        width={getWidthByDimension(
+                            this.props.dimension,
+                            this.borderWidth
+                        )}
+                        height={getTableHeightByDimension(
+                            this.props.dimension,
+                            this.chartHeaderHeight
+                        )}
                         numOfSelectedSamples={100}
                         filters={this.props.filters}
                         onUserSelection={this.handlers.onValueSelection}
                         onGeneSelect={this.props.onGeneSelect}
                         selectedGenes={this.props.selectedGenes}
                         genePanelCache={this.props.genePanelCache}
-                        cancerGeneFilterEnabled={this.props.cancerGeneFilterEnabled}
+                        cancerGeneFilterEnabled={
+                            this.props.cancerGeneFilterEnabled
+                        }
                         filterByCancerGenes={this.props.filterByCancerGenes!}
-                        onChangeCancerGeneFilter={this.props.onChangeCancerGeneFilter!}
+                        onChangeCancerGeneFilter={
+                            this.props.onChangeCancerGeneFilter!
+                        }
                         columns={[
-                            {columnKey: GeneTableColumnKey.GENE},
-                            {columnKey: GeneTableColumnKey.NUMBER_FUSIONS},
-                            {columnKey: GeneTableColumnKey.NUMBER},
-                            {columnKey: GeneTableColumnKey.FREQ},
+                            { columnKey: GeneTableColumnKey.GENE },
+                            { columnKey: GeneTableColumnKey.NUMBER_FUSIONS },
+                            { columnKey: GeneTableColumnKey.NUMBER },
+                            { columnKey: GeneTableColumnKey.FREQ },
                         ]}
                         defaultSortBy={GeneTableColumnKey.FREQ}
                     />
                 );
             }
             case CNA_GENES_TABLE: {
-                return ()=>(
+                return () => (
                     <GeneTable
                         tableType={'cna'}
                         promise={this.props.promise}
-                        width={getWidthByDimension(this.props.dimension, this.borderWidth)}
-                        height={getTableHeightByDimension(this.props.dimension, this.chartHeaderHeight)}
+                        width={getWidthByDimension(
+                            this.props.dimension,
+                            this.borderWidth
+                        )}
+                        height={getTableHeightByDimension(
+                            this.props.dimension,
+                            this.chartHeaderHeight
+                        )}
                         numOfSelectedSamples={100}
                         filters={this.props.filters}
                         onUserSelection={this.handlers.onValueSelection}
                         onGeneSelect={this.props.onGeneSelect}
                         selectedGenes={this.props.selectedGenes}
                         genePanelCache={this.props.genePanelCache}
-                        cancerGeneFilterEnabled={this.props.cancerGeneFilterEnabled}
+                        cancerGeneFilterEnabled={
+                            this.props.cancerGeneFilterEnabled
+                        }
                         filterByCancerGenes={this.props.filterByCancerGenes!}
-                        onChangeCancerGeneFilter={this.props.onChangeCancerGeneFilter!}
+                        onChangeCancerGeneFilter={
+                            this.props.onChangeCancerGeneFilter!
+                        }
                         columns={[
-                            {columnKey: GeneTableColumnKey.GENE, columnWidthRatio: 0.24},
-                            {columnKey: GeneTableColumnKey.CYTOBAND, columnWidthRatio: 0.24},
-                            {columnKey: GeneTableColumnKey.CNA, columnWidthRatio: 0.18},
-                            {columnKey: GeneTableColumnKey.NUMBER, columnWidthRatio: 0.17},
-                            {columnKey: GeneTableColumnKey.FREQ, columnWidthRatio: 0.17}
+                            {
+                                columnKey: GeneTableColumnKey.GENE,
+                                columnWidthRatio: 0.24,
+                            },
+                            {
+                                columnKey: GeneTableColumnKey.CYTOBAND,
+                                columnWidthRatio: 0.24,
+                            },
+                            {
+                                columnKey: GeneTableColumnKey.CNA,
+                                columnWidthRatio: 0.18,
+                            },
+                            {
+                                columnKey: GeneTableColumnKey.NUMBER,
+                                columnWidthRatio: 0.17,
+                            },
+                            {
+                                columnKey: GeneTableColumnKey.FREQ,
+                                columnWidthRatio: 0.17,
+                            },
                         ]}
                         defaultSortBy={GeneTableColumnKey.FREQ}
                     />
@@ -405,43 +547,56 @@ export class ChartContainer extends React.Component<IChartContainerProps, {}> {
             case SURVIVAL: {
                 if (this.survivalChartData) {
                     const data = this.survivalChartData;
-                    return ()=>(
-                        <SurvivalChart ref={this.handlers.ref}
-                                       patientSurvivals={data.patientSurvivals}
-                                       patientToAnalysisGroups={data.patientToAnalysisGroups}
-                                       analysisGroups={data.analysisGroups}
-                                       legendLocation={LegendLocation.TOOLTIP}
-                                       title={this.props.title}
-                                       xAxisLabel="Months Survival"
-                                       yAxisLabel="Surviving"
-                                       totalCasesHeader="Number of Cases, Total"
-                                       statusCasesHeader="Number of Cases, Deceased"
-                                       medianMonthsHeader="Median Months Survival"
-                                       yLabelTooltip="Survival estimate"
-                                       xLabelWithEventTooltip="Time of death"
-                                       xLabelWithoutEventTooltip="Time of last observation"
-                                       showDownloadButtons={false}
-                                       showSlider={false}
-                                       showTable={false}
-                                       styleOpts={{
-                                           width: getWidthByDimension(this.props.dimension, this.borderWidth),
-                                           height: getHeightByDimension(this.props.dimension, this.chartHeaderHeight),
-                                           tooltipXOffset:10,
-                                           tooltipYOffset:-58,
-                                           pValue: {
-                                               x:getWidthByDimension(this.props.dimension, this.borderWidth)-10,
-                                               y:30,
-                                               textAnchor:"end"
-                                           },
-                                           axis: {
-                                               y: {
-                                                   axisLabel: {
-                                                       padding: 40
-                                                   }
-                                               }
-                                           }
-                                       }}
-                                       fileName={this.props.title.replace(' ', '_')}
+                    return () => (
+                        <SurvivalChart
+                            ref={this.handlers.ref}
+                            patientSurvivals={data.patientSurvivals}
+                            patientToAnalysisGroups={
+                                data.patientToAnalysisGroups
+                            }
+                            analysisGroups={data.analysisGroups}
+                            legendLocation={LegendLocation.TOOLTIP}
+                            title={this.props.title}
+                            xAxisLabel="Months Survival"
+                            yAxisLabel="Surviving"
+                            totalCasesHeader="Number of Cases, Total"
+                            statusCasesHeader="Number of Cases, Deceased"
+                            medianMonthsHeader="Median Months Survival"
+                            yLabelTooltip="Survival estimate"
+                            xLabelWithEventTooltip="Time of death"
+                            xLabelWithoutEventTooltip="Time of last observation"
+                            showDownloadButtons={false}
+                            showSlider={false}
+                            showTable={false}
+                            styleOpts={{
+                                width: getWidthByDimension(
+                                    this.props.dimension,
+                                    this.borderWidth
+                                ),
+                                height: getHeightByDimension(
+                                    this.props.dimension,
+                                    this.chartHeaderHeight
+                                ),
+                                tooltipXOffset: 10,
+                                tooltipYOffset: -58,
+                                pValue: {
+                                    x:
+                                        getWidthByDimension(
+                                            this.props.dimension,
+                                            this.borderWidth
+                                        ) - 10,
+                                    y: 30,
+                                    textAnchor: 'end',
+                                },
+                                axis: {
+                                    y: {
+                                        axisLabel: {
+                                            padding: 40,
+                                        },
+                                    },
+                                },
+                            }}
+                            fileName={this.props.title.replace(' ', '_')}
                         />
                     );
                 } else {
@@ -449,24 +604,39 @@ export class ChartContainer extends React.Component<IChartContainerProps, {}> {
                 }
             }
             case SCATTER: {
-                return ()=>(
-                    <div style={{overflow:"hidden", height:getHeightByDimension(this.props.dimension, this.chartHeaderHeight)}}>
+                return () => (
+                    <div
+                        style={{
+                            overflow: 'hidden',
+                            height: getHeightByDimension(
+                                this.props.dimension,
+                                this.chartHeaderHeight
+                            ),
+                        }}
+                    >
                         {/* have to do all this weird positioning to decrease gap btwn chart and title, bc I cant do it from within Victory */}
                         {/* overflow: "hidden" because otherwise the large SVG (I have to make it larger to make the plot large enough to
                             decrease the gap) will cover the header controls and make them unclickable */}
-                        <div style={{marginTop:-33}}>
+                        <div style={{ marginTop: -33 }}>
                             <StudyViewDensityScatterPlot
                                 ref={this.handlers.ref}
-                                width={getWidthByDimension(this.props.dimension, this.borderWidth)}
+                                width={getWidthByDimension(
+                                    this.props.dimension,
+                                    this.borderWidth
+                                )}
                                 height={this.getScatterPlotHeight()}
                                 yBinsMin={MutationCountVsCnaYBinsMin}
                                 onSelection={this.props.onValueSelection}
-                                selectionBounds={(this.props.filters && this.props.filters.length > 0) ? this.props.filters[0] : undefined}
+                                selectionBounds={
+                                    this.props.filters &&
+                                    this.props.filters.length > 0
+                                        ? this.props.filters[0]
+                                        : undefined
+                                }
                                 data={this.props.promise.result.bins}
                                 xBinSize={this.props.promise.result.xBinSize}
                                 yBinSize={this.props.promise.result.yBinSize}
                                 isLoading={this.props.promise.isPending}
-
                                 axisLabelX="Fraction of copy number altered genome"
                                 axisLabelY="# of mutations"
                                 tooltip={mutationCountVsCnaTooltip}
@@ -488,11 +658,17 @@ export class ChartContainer extends React.Component<IChartContainerProps, {}> {
     componentDidMount() {
         if (this.props.isNewlyAdded(this.props.chartMeta.uniqueKey)) {
             this.newlyAdded = true;
-            setTimeout(() => this.newlyAdded = false, STUDY_VIEW_CONFIG.thresholds.chartHighlight);
+            setTimeout(
+                () => (this.newlyAdded = false),
+                STUDY_VIEW_CONFIG.thresholds.chartHighlight
+            );
         }
     }
 
-    componentWillReceiveProps(nextProps: Readonly<IChartContainerProps>, nextContext: any): void {
+    componentWillReceiveProps(
+        nextProps: Readonly<IChartContainerProps>,
+        nextContext: any
+    ): void {
         if (nextProps.chartType !== this.chartType) {
             this.chartType = nextProps.chartType;
         }
@@ -500,10 +676,14 @@ export class ChartContainer extends React.Component<IChartContainerProps, {}> {
 
     public render() {
         return (
-            <div className={classnames(styles.chart, { [styles.highlight]: this.highlightChart})}
-                 data-test={`chart-container-${this.props.chartMeta.uniqueKey}`}
-                 onMouseEnter={this.handlers.onMouseEnterChart}
-                 onMouseLeave={this.handlers.onMouseLeaveChart}>
+            <div
+                className={classnames(styles.chart, {
+                    [styles.highlight]: this.highlightChart,
+                })}
+                data-test={`chart-container-${this.props.chartMeta.uniqueKey}`}
+                onMouseEnter={this.handlers.onMouseEnterChart}
+                onMouseLeave={this.handlers.onMouseLeaveChart}
+            >
                 <ChartHeader
                     height={this.chartHeaderHeight}
                     chartMeta={this.props.chartMeta}
@@ -516,26 +696,43 @@ export class ChartContainer extends React.Component<IChartContainerProps, {}> {
                     toggleLogScale={this.handlers.onToggleLogScale}
                     chartControls={this.chartControls}
                     changeChartType={this.changeChartType}
-                    getSVG={()=>Promise.resolve(this.toSVGDOMNode())}
+                    getSVG={() => Promise.resolve(this.toSVGDOMNode())}
                     getData={this.props.getData}
                     downloadTypes={this.props.downloadTypes}
                     openComparisonPage={this.openComparisonPage}
                     placement={this.placement}
                 />
-                <div style={{display: 'flex', flexGrow: 1, margin: 'auto', alignItems: 'center'}}>
-                    {(this.props.promise.isPending) && (
+                <div
+                    style={{
+                        display: 'flex',
+                        flexGrow: 1,
+                        margin: 'auto',
+                        alignItems: 'center',
+                    }}
+                >
+                    {this.props.promise.isPending && (
                         <LoadingIndicator
                             isLoading={true}
                             className={styles.chartLoader}
                         />
                     )}
-                    {this.props.promise.isError && (<div>Error when loading data.</div>)}
+                    {this.props.promise.isError && (
+                        <div>Error when loading data.</div>
+                    )}
 
-                    {(!this.props.chartMeta.renderWhenDataChange || this.props.promise.isComplete) &&
-                    <div style={{visibility: this.props.promise.isPending ? 'hidden' : 'visible', display: 'flex'}}>
-                        {this.chart && this.chart()}
-                    </div>
-                    }
+                    {(!this.props.chartMeta.renderWhenDataChange ||
+                        this.props.promise.isComplete) && (
+                        <div
+                            style={{
+                                visibility: this.props.promise.isPending
+                                    ? 'hidden'
+                                    : 'visible',
+                                display: 'flex',
+                            }}
+                        >
+                            {this.chart && this.chart()}
+                        </div>
+                    )}
                 </div>
             </div>
         );
diff --git a/src/pages/studyView/charts/barChart/BarChart.tsx b/src/pages/studyView/charts/barChart/BarChart.tsx
index 5ffc4e0cb91..5c55e178884 100644
--- a/src/pages/studyView/charts/barChart/BarChart.tsx
+++ b/src/pages/studyView/charts/barChart/BarChart.tsx
@@ -1,27 +1,39 @@
-import * as React from "react";
-import {observer} from "mobx-react";
-import {VictoryAxis, VictoryBar, VictoryChart, VictorySelectionContainer} from 'victory';
-import {computed, observable} from "mobx";
-import _ from "lodash";
-import CBIOPORTAL_VICTORY_THEME from "shared/theme/cBioPoralTheme";
-import {ClinicalDataFilterValue, DataBin} from "shared/api/generated/CBioPortalAPIInternal";
-import {AbstractChart} from "pages/studyView/charts/ChartContainer";
+import * as React from 'react';
+import { observer } from 'mobx-react';
+import {
+    VictoryAxis,
+    VictoryBar,
+    VictoryChart,
+    VictorySelectionContainer,
+} from 'victory';
+import { computed, observable } from 'mobx';
+import _ from 'lodash';
+import CBIOPORTAL_VICTORY_THEME from 'shared/theme/cBioPoralTheme';
+import {
+    ClinicalDataFilterValue,
+    DataBin,
+} from 'shared/api/generated/CBioPortalAPIInternal';
+import { AbstractChart } from 'pages/studyView/charts/ChartContainer';
 import autobind from 'autobind-decorator';
-import BarChartAxisLabel from "./BarChartAxisLabel";
+import BarChartAxisLabel from './BarChartAxisLabel';
 import {
     filterCategoryBins,
     filterNumericalBins,
     formatNumericalTickValues,
     generateCategoricalData,
     generateNumericalData,
-    needAdditionShiftForLogScaleBarChart
-} from "../../StudyViewUtils";
-import {STUDY_VIEW_CONFIG} from "../../StudyViewConfig";
-import {getTextDiagonal, getTextHeight, getTextWidth} from "cbioportal-frontend-commons";
-import {DEFAULT_NA_COLOR} from "shared/lib/Colors";
-import BarChartToolTip, { ToolTipModel } from "./BarChartToolTip";
-import WindowStore from "shared/components/window/WindowStore";
-import ReactDOM from "react-dom";
+    needAdditionShiftForLogScaleBarChart,
+} from '../../StudyViewUtils';
+import { STUDY_VIEW_CONFIG } from '../../StudyViewConfig';
+import {
+    getTextDiagonal,
+    getTextHeight,
+    getTextWidth,
+} from 'cbioportal-frontend-commons';
+import { DEFAULT_NA_COLOR } from 'shared/lib/Colors';
+import BarChartToolTip, { ToolTipModel } from './BarChartToolTip';
+import WindowStore from 'shared/components/window/WindowStore';
+import ReactDOM from 'react-dom';
 
 export interface IBarChartProps {
     data: DataBin[];
@@ -32,9 +44,9 @@ export interface IBarChartProps {
 }
 
 export type BarDatum = {
-    x: number,
-    y: number,
-    dataBin: DataBin
+    x: number;
+    y: number;
+    dataBin: DataBin;
 };
 
 function generateTheme() {
@@ -48,12 +60,12 @@ const VICTORY_THEME = generateTheme();
 const TILT_ANGLE = 50;
 
 @observer
-export default class BarChart extends React.Component<IBarChartProps, {}> implements AbstractChart {
-
+export default class BarChart extends React.Component<IBarChartProps, {}>
+    implements AbstractChart {
     private svgContainer: any;
-    
+
     @observable.ref
-    private mousePosition = {x: 0, y: 0};
+    private mousePosition = { x: 0, y: 0 };
 
     @observable
     private currentBarIndex = -1;
@@ -66,22 +78,34 @@ export default class BarChart extends React.Component<IBarChartProps, {}> implem
     }
 
     @autobind
-    private onSelection(bars: { data: BarDatum[] }[], bounds: { x: number, y: number }[], props: any) {
-        const dataBins = _.flatten(bars.map(bar => bar.data.map(barDatum => barDatum.dataBin)));
+    private onSelection(
+        bars: { data: BarDatum[] }[],
+        bounds: { x: number; y: number }[],
+        props: any
+    ) {
+        const dataBins = _.flatten(
+            bars.map(bar => bar.data.map(barDatum => barDatum.dataBin))
+        );
         this.props.onUserSelection(dataBins);
     }
 
-    private isDataBinSelected(dataBin: DataBin, filters: ClinicalDataFilterValue[]) {
+    private isDataBinSelected(
+        dataBin: DataBin,
+        filters: ClinicalDataFilterValue[]
+    ) {
         return _.some(filters, filter => {
             let isFiltered = false;
             if (filter.start !== undefined && filter.end !== undefined) {
-                isFiltered = filter.start <= dataBin.start && filter.end >= dataBin.end;
+                isFiltered =
+                    filter.start <= dataBin.start && filter.end >= dataBin.end;
             } else if (filter.start !== undefined && filter.end === undefined) {
                 isFiltered = dataBin.start >= filter.start;
             } else if (filter.start === undefined && filter.end !== undefined) {
                 isFiltered = dataBin.end <= filter.end;
             } else {
-                isFiltered = filter.value !== undefined && filter.value === dataBin.specialValue;
+                isFiltered =
+                    filter.value !== undefined &&
+                    filter.value === dataBin.specialValue;
             }
             return isFiltered;
         });
@@ -108,7 +132,10 @@ export default class BarChart extends React.Component<IBarChartProps, {}> implem
 
     @computed
     get categoricalData(): BarDatum[] {
-        return generateCategoricalData(this.categoryBins, this.numericalTickFormat.length);
+        return generateCategoricalData(
+            this.categoryBins,
+            this.numericalTickFormat.length
+        );
     }
 
     @computed
@@ -117,28 +144,34 @@ export default class BarChart extends React.Component<IBarChartProps, {}> implem
 
         // if the value contains ^ we need to return an array of values, instead of a single value
         // to be compatible with BarChartAxisLabel
-        return formatted.map(value => value.includes("^") ? value.split("^") : value);
+        return formatted.map(value =>
+            value.includes('^') ? value.split('^') : value
+        );
     }
 
     @computed
     get barData(): BarDatum[] {
-        return [
-            ...this.numericalData,
-            ...this.categoricalData
-        ];
+        return [...this.numericalData, ...this.categoricalData];
     }
 
     @computed
     get categories() {
         return this.categoryBins.map(dataBin =>
-            dataBin.specialValue === undefined ? `${dataBin.start}` : dataBin.specialValue);
+            dataBin.specialValue === undefined
+                ? `${dataBin.start}`
+                : dataBin.specialValue
+        );
     }
 
     @computed
     get tickValues() {
         const values: number[] = [];
 
-        for (let i = 1; i <= this.numericalTickFormat.length + this.categories.length; i++) {
+        for (
+            let i = 1;
+            i <= this.numericalTickFormat.length + this.categories.length;
+            i++
+        ) {
             values.push(i);
         }
 
@@ -148,25 +181,37 @@ export default class BarChart extends React.Component<IBarChartProps, {}> implem
     @computed
     get tickFormat() {
         // copy non-numerical categories as is
-        return [
-            ...this.numericalTickFormat,
-            ...this.categories
-        ];
+        return [...this.numericalTickFormat, ...this.categories];
     }
 
     @computed
     get bottomPadding(): number {
         const MAX_PADDING = 40;
         const MIN_PADDING = 10; // used when tickFormat is empty
-        const padding = _.max(this.tickFormat.map((tick: string | string[]) => {
-            const content = _.isArray(tick) ? tick.join() : tick;
-            const fontFamily = VICTORY_THEME.axis.style.tickLabels.fontFamily;
-            const fontSize = `${VICTORY_THEME.axis.style.tickLabels.fontSize}px`;
-            const textHeight = getTextHeight(content, fontFamily, fontSize);
-            const textWidth = getTextWidth(content, fontFamily, fontSize);
-            const textDiagonal = getTextDiagonal(textHeight, textWidth);
-            return 10 + (textDiagonal * Math.sin(Math.PI * TILT_ANGLE / 180));
-        })) || MIN_PADDING;
+        const padding =
+            _.max(
+                this.tickFormat.map((tick: string | string[]) => {
+                    const content = _.isArray(tick) ? tick.join() : tick;
+                    const fontFamily =
+                        VICTORY_THEME.axis.style.tickLabels.fontFamily;
+                    const fontSize = `${VICTORY_THEME.axis.style.tickLabels.fontSize}px`;
+                    const textHeight = getTextHeight(
+                        content,
+                        fontFamily,
+                        fontSize
+                    );
+                    const textWidth = getTextWidth(
+                        content,
+                        fontFamily,
+                        fontSize
+                    );
+                    const textDiagonal = getTextDiagonal(textHeight, textWidth);
+                    return (
+                        10 +
+                        textDiagonal * Math.sin((Math.PI * TILT_ANGLE) / 180)
+                    );
+                })
+            ) || MIN_PADDING;
         return padding > MAX_PADDING ? MAX_PADDING : padding;
     }
 
@@ -174,7 +219,11 @@ export default class BarChart extends React.Component<IBarChartProps, {}> implem
     get barRatio(): number {
         // In log scale bar chart, when the first bin is .5 exponential, the bars will be shifted to the right
         // for one bar. We need to adjust the bar ratio since it's calculated based on the range / # of bars
-        const additionRatio = needAdditionShiftForLogScaleBarChart(this.numericalBins) ? this.barData.length / (this.barData.length + 1) : 1;
+        const additionRatio = needAdditionShiftForLogScaleBarChart(
+            this.numericalBins
+        )
+            ? this.barData.length / (this.barData.length + 1)
+            : 1;
         return additionRatio * STUDY_VIEW_CONFIG.thresholds.barRatio;
     }
 
@@ -183,92 +232,123 @@ export default class BarChart extends React.Component<IBarChartProps, {}> implem
         this.mousePosition = { x: event.pageX, y: event.pageY };
     }
 
-     /*
+    /*
      * Supplies the BarPlot with the event handlers needed to record when the mouse enters
      * or leaves a bar on the plot.
      */
-    private get barPlotEvents(){
+    private get barPlotEvents() {
         const self = this;
-        return [{
-            target: "data",
-            eventHandlers: {
-                onMouseEnter: () => {
-                    return [{
-                        target: "data",
-                        mutation: (event: any) => {
-                            self.currentBarIndex = event.datum.eventKey;
-                            self.toolTipModel = {
-                                start: self.barData[self.currentBarIndex].dataBin.start,
-                                end: self.barData[self.currentBarIndex].dataBin.end,
-                                special: self.barData[self.currentBarIndex].dataBin.specialValue,
-                                sampleCount: event.datum.y,                            
-                            }
-                        }
-                    }];
+        return [
+            {
+                target: 'data',
+                eventHandlers: {
+                    onMouseEnter: () => {
+                        return [
+                            {
+                                target: 'data',
+                                mutation: (event: any) => {
+                                    self.currentBarIndex = event.datum.eventKey;
+                                    self.toolTipModel = {
+                                        start:
+                                            self.barData[self.currentBarIndex]
+                                                .dataBin.start,
+                                        end:
+                                            self.barData[self.currentBarIndex]
+                                                .dataBin.end,
+                                        special:
+                                            self.barData[self.currentBarIndex]
+                                                .dataBin.specialValue,
+                                        sampleCount: event.datum.y,
+                                    };
+                                },
+                            },
+                        ];
+                    },
+                    onMouseLeave: () => {
+                        return [
+                            {
+                                target: 'data',
+                                mutation: () => {
+                                    self.toolTipModel = null;
+                                },
+                            },
+                        ];
+                    },
                 },
-                onMouseLeave: () => {
-                    return [{
-                        target: "data",
-                        mutation: () => {
-                            self.toolTipModel = null;
-                        }
-                    }];
-                }
-            }
-        }];
+            },
+        ];
     }
 
     public render() {
-
         return (
             <div onMouseMove={this.onMouseMove}>
-                {this.barData.length > 0 &&
-                <VictoryChart
-                    containerComponent={
-                        <VictorySelectionContainer
-                            containerRef={(ref: any) => this.svgContainer = ref}
-                            selectionDimension="x"
-                            onSelection={this.onSelection} />
-                    }
-                    style={{
-                        parent: {
-                            width: this.props.width, height: this.props.height
+                {this.barData.length > 0 && (
+                    <VictoryChart
+                        containerComponent={
+                            <VictorySelectionContainer
+                                containerRef={(ref: any) =>
+                                    (this.svgContainer = ref)
+                                }
+                                selectionDimension="x"
+                                onSelection={this.onSelection}
+                            />
                         }
-                    }}
-                    height={this.props.height - this.bottomPadding}
-                    padding={{left: 40, right: 20, top: 10, bottom: this.bottomPadding}}
-                    theme={VICTORY_THEME}
-                >
-                    <VictoryAxis
-                        tickValues={this.tickValues}
-                        tickFormat={(t: number) => this.tickFormat[t - 1]}
-                        domain={[0, this.tickValues[this.tickValues.length - 1] + 1]}
-                        tickLabelComponent={<BarChartAxisLabel />}
                         style={{
-                            tickLabels: {
-                                angle: TILT_ANGLE,
-                                verticalAnchor: "start",
-                                textAnchor: "start"
-                            }
+                            parent: {
+                                width: this.props.width,
+                                height: this.props.height,
+                            },
                         }}
-                    />
-                    <VictoryAxis
-                        dependentAxis={true}
-                        tickFormat={(t: number) => Number.isInteger(t) ? t.toFixed(0) : ''}
-                    />
-                    <VictoryBar
-                        barRatio={this.barRatio}
-                        style={{
-                            data: {
-                                fill: (d: BarDatum) =>
-                                    (this.isDataBinSelected(d.dataBin, this.props.filters) || this.props.filters.length === 0) ?
-                                        STUDY_VIEW_CONFIG.colors.theme.primary : DEFAULT_NA_COLOR
-                            }
+                        height={this.props.height - this.bottomPadding}
+                        padding={{
+                            left: 40,
+                            right: 20,
+                            top: 10,
+                            bottom: this.bottomPadding,
                         }}
-                        data={this.barData}
-                        events={this.barPlotEvents}
-                    />
-                </VictoryChart>}
+                        theme={VICTORY_THEME}
+                    >
+                        <VictoryAxis
+                            tickValues={this.tickValues}
+                            tickFormat={(t: number) => this.tickFormat[t - 1]}
+                            domain={[
+                                0,
+                                this.tickValues[this.tickValues.length - 1] + 1,
+                            ]}
+                            tickLabelComponent={<BarChartAxisLabel />}
+                            style={{
+                                tickLabels: {
+                                    angle: TILT_ANGLE,
+                                    verticalAnchor: 'start',
+                                    textAnchor: 'start',
+                                },
+                            }}
+                        />
+                        <VictoryAxis
+                            dependentAxis={true}
+                            tickFormat={(t: number) =>
+                                Number.isInteger(t) ? t.toFixed(0) : ''
+                            }
+                        />
+                        <VictoryBar
+                            barRatio={this.barRatio}
+                            style={{
+                                data: {
+                                    fill: (d: BarDatum) =>
+                                        this.isDataBinSelected(
+                                            d.dataBin,
+                                            this.props.filters
+                                        ) || this.props.filters.length === 0
+                                            ? STUDY_VIEW_CONFIG.colors.theme
+                                                  .primary
+                                            : DEFAULT_NA_COLOR,
+                                },
+                            }}
+                            data={this.barData}
+                            events={this.barPlotEvents}
+                        />
+                    </VictoryChart>
+                )}
                 {ReactDOM.createPortal(
                     <BarChartToolTip
                         mousePosition={this.mousePosition}
diff --git a/src/pages/studyView/charts/barChart/BarChartAxisLabel.tsx b/src/pages/studyView/charts/barChart/BarChartAxisLabel.tsx
index 563ad2d0878..1b58ce3e183 100644
--- a/src/pages/studyView/charts/barChart/BarChartAxisLabel.tsx
+++ b/src/pages/studyView/charts/barChart/BarChartAxisLabel.tsx
@@ -1,29 +1,31 @@
-import * as React from "react";
+import * as React from 'react';
 import { VictoryLabel, Helpers } from 'victory';
 
 export class BarChartAxisLabel extends VictoryLabel {
-
     // Contents mostly copied from https://github.com/FormidableLabs/victory-core/blob/master/src/victory-label/victory-label.js
     // The original renderElements function is designed to create multi-line labels.
     // This one is designed to create labels with superscript.
     renderElements(props: any, content: string[]) {
         const { datum, active, inline, className, title, desc, events } = props;
         const style = this.getStyles(props);
-        const lineHeight = this.getHeight(props, "lineHeight");
-        const textAnchor = props.textAnchor ?
-            Helpers.evaluateProp(props.textAnchor, datum, active) : "start";
+        const lineHeight = this.getHeight(props, 'lineHeight');
+        const textAnchor = props.textAnchor
+            ? Helpers.evaluateProp(props.textAnchor, datum, active)
+            : 'start';
         const dx = props.dx ? Helpers.evaluateProp(props.dx, datum, active) : 0;
         const dy = this.getDy(props, style, content, lineHeight);
         const transform = this.getTransform(props, style);
-        const x = props.x !== undefined ? props.x : this.getPosition(props, "x");
-        const y = props.y !== undefined ? props.y : this.getPosition(props, "y");
+        const x =
+            props.x !== undefined ? props.x : this.getPosition(props, 'x');
+        const y =
+            props.y !== undefined ? props.y : this.getPosition(props, 'y');
 
         const tspanProps = {
             x: !inline ? props.x : undefined,
             dx,
             textAnchor: style[0].textAnchor || textAnchor,
             style: style[0],
-            key: style[0].textAnchor || textAnchor
+            key: style[0].textAnchor || textAnchor,
         };
 
         let tspan = [];
@@ -34,14 +36,14 @@ export class BarChartAxisLabel extends VictoryLabel {
         if (content.length > 1) {
             tspan.push(<tspan {...tspanProps}>{content[0]}</tspan>);
             tspan.push(
-                        <tspan
-                            dy={-style[0].fontSize/2}
-                            style={{...style[0], fontSize: style[0].fontSize * 0.7}}
-                        >
-                            {content[1]}
-                        </tspan>);
-        }
-        else {
+                <tspan
+                    dy={-style[0].fontSize / 2}
+                    style={{ ...style[0], fontSize: style[0].fontSize * 0.7 }}
+                >
+                    {content[1]}
+                </tspan>
+            );
+        } else {
             tspan.push(<tspan {...tspanProps}>{content[0]}</tspan>);
         }
 
diff --git a/src/pages/studyView/charts/barChart/BarChartToolTip.tsx b/src/pages/studyView/charts/barChart/BarChartToolTip.tsx
index 3a89a0bf65c..ad9b771aa16 100644
--- a/src/pages/studyView/charts/barChart/BarChartToolTip.tsx
+++ b/src/pages/studyView/charts/barChart/BarChartToolTip.tsx
@@ -1,24 +1,24 @@
-import * as React from "react";
+import * as React from 'react';
 import * as _ from 'lodash';
-import {computed} from "mobx";
-import { Popover } from "react-bootstrap";
-import classnames from "classnames";
-import { formatRange } from "pages/studyView/StudyViewUtils";
-import { observer } from "mobx-react";
+import { computed } from 'mobx';
+import { Popover } from 'react-bootstrap';
+import classnames from 'classnames';
+import { formatRange } from 'pages/studyView/StudyViewUtils';
+import { observer } from 'mobx-react';
 
 export type ToolTipModel = {
-    start: number | undefined,
-    end: number | undefined,
-    special: string | undefined
-    sampleCount: number,
+    start: number | undefined;
+    end: number | undefined;
+    special: string | undefined;
+    sampleCount: number;
 };
 
 export type BarChartToolTipProps = {
-    mousePosition: { x: number, y: number },
-    totalBars: number,
-    currentBarIndex: number,
-    model: ToolTipModel | null,
-    windowWidth: number,
+    mousePosition: { x: number; y: number };
+    totalBars: number;
+    currentBarIndex: number;
+    model: ToolTipModel | null;
+    windowWidth: number;
 };
 
 export const VERTICAL_OFFSET = 17;
@@ -26,21 +26,24 @@ export const HORIZONTAL_OFFSET = 8;
 
 const WIDTH = 150;
 
-
 @observer
-export default class BarChartToolTip extends React.Component<BarChartToolTipProps, {}> {
-
+export default class BarChartToolTip extends React.Component<
+    BarChartToolTipProps,
+    {}
+> {
     /**
      * When the active bar is past the middle of the plot, render on the left side of the bar
      */
     @computed
-    get placement(): "left" | "right" {
-        return (this.props.totalBars < this.props.currentBarIndex * 2) ? "left" : "right";
+    get placement(): 'left' | 'right' {
+        return this.props.totalBars < this.props.currentBarIndex * 2
+            ? 'left'
+            : 'right';
     }
 
     @computed
     get positionLeft(): number {
-        if (this.placement === "left") {
+        if (this.placement === 'left') {
             return this.props.mousePosition.x - (HORIZONTAL_OFFSET + WIDTH);
         } else {
             return this.props.mousePosition.x + HORIZONTAL_OFFSET;
@@ -49,32 +52,40 @@ export default class BarChartToolTip extends React.Component<BarChartToolTipProp
 
     @computed
     get transform(): string | undefined {
-        return (this.placement === "left" ? "translate(-100%,0%)" : undefined)
+        return this.placement === 'left' ? 'translate(-100%,0%)' : undefined;
     }
-    
+
     render() {
         if (!this.props.model) {
             return null;
         }
 
-        return <Popover
-            arrowOffsetTop={VERTICAL_OFFSET}
-            className={classnames("cbioportal-frontent", "cbioTooltip")}
-            positionLeft={this.positionLeft}
-            positionTop={this.props.mousePosition.y - VERTICAL_OFFSET}
-            style={{ width: WIDTH, }}
-            placement={this.placement}
-        >
-            <div>
-                <div>
-                    Number of samples: <strong>{this.props.model.sampleCount}</strong>
-                </div>
+        return (
+            <Popover
+                arrowOffsetTop={VERTICAL_OFFSET}
+                className={classnames('cbioportal-frontent', 'cbioTooltip')}
+                positionLeft={this.positionLeft}
+                positionTop={this.props.mousePosition.y - VERTICAL_OFFSET}
+                style={{ width: WIDTH }}
+                placement={this.placement}
+            >
                 <div>
-                    Range: <strong>
-                        {formatRange(this.props.model.start, this.props.model.end, this.props.model.special)}
-                    </strong>
+                    <div>
+                        Number of samples:{' '}
+                        <strong>{this.props.model.sampleCount}</strong>
+                    </div>
+                    <div>
+                        Range:{' '}
+                        <strong>
+                            {formatRange(
+                                this.props.model.start,
+                                this.props.model.end,
+                                this.props.model.special
+                            )}
+                        </strong>
+                    </div>
                 </div>
-            </div>
-        </Popover>
+            </Popover>
+        );
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/studyView/charts/barChart/CustomBinsModal.tsx b/src/pages/studyView/charts/barChart/CustomBinsModal.tsx
index 332ff1f6c46..80c0a940a64 100644
--- a/src/pages/studyView/charts/barChart/CustomBinsModal.tsx
+++ b/src/pages/studyView/charts/barChart/CustomBinsModal.tsx
@@ -1,34 +1,41 @@
-import * as React from "react";
-import * as _ from "lodash";
-import {ChartMeta, customBinsAreValid} from "pages/studyView/StudyViewUtils";
+import * as React from 'react';
+import * as _ from 'lodash';
+import { ChartMeta, customBinsAreValid } from 'pages/studyView/StudyViewUtils';
 import autobind from 'autobind-decorator';
-import {observable, computed} from 'mobx';
-import {observer} from 'mobx-react';
-import { Modal, Button } from "react-bootstrap";
+import { observable, computed } from 'mobx';
+import { observer } from 'mobx-react';
+import { Modal, Button } from 'react-bootstrap';
 
 export type ICustomBinsProps = {
     show: boolean;
-    onHide: ()=>void;
-    chartMeta: ChartMeta,
-    currentBins: number[],
-    updateCustomBins: (uniqueKey: string, bins: number[]) => void,
+    onHide: () => void;
+    chartMeta: ChartMeta;
+    currentBins: number[];
+    updateCustomBins: (uniqueKey: string, bins: number[]) => void;
 };
 
 @observer
-export default class CustomBinsModal extends React.Component<ICustomBinsProps, {}> {
+export default class CustomBinsModal extends React.Component<
+    ICustomBinsProps,
+    {}
+> {
     binSeparator: string = ',';
     @observable private currentBinsValue = '';
 
     constructor(props: Readonly<ICustomBinsProps>) {
         super(props);
         if (this.props.currentBins) {
-            this.currentBinsValue = _.sortBy(this.props.currentBins).join(`${this.binSeparator} `);
+            this.currentBinsValue = _.sortBy(this.props.currentBins).join(
+                `${this.binSeparator} `
+            );
         }
     }
 
     @autobind
     updateCurrentBinsValue() {
-        const newBins = _.sortBy(this.newStringBins.map(item => Number(item.trim())));
+        const newBins = _.sortBy(
+            this.newStringBins.map(item => Number(item.trim()))
+        );
         this.currentBinsValue = newBins.join(`${this.binSeparator} `);
         this.props.updateCustomBins(this.props.chartMeta.uniqueKey, newBins);
         this.props.onHide();
@@ -36,7 +43,7 @@ export default class CustomBinsModal extends React.Component<ICustomBinsProps, {
 
     @computed
     get newStringBins() {
-        return this.currentBinsValue.trim().split(this.binSeparator)
+        return this.currentBinsValue.trim().split(this.binSeparator);
     }
 
     @computed
@@ -45,27 +52,48 @@ export default class CustomBinsModal extends React.Component<ICustomBinsProps, {
     }
 
     render() {
-        return <Modal bsSize={'small'} show={this.props.show} onHide={this.props.onHide} keyboard>
-            <Modal.Header closeButton>
-                <Modal.Title>Custom Bins</Modal.Title>
-            </Modal.Header>
-            <Modal.Body>
-                <div>Please specify bin boundaries of the x axis</div>
-                <textarea
-                    style={{resize: 'none'}}
-                    rows={5}
-                    value={this.currentBinsValue}
-                    className='form-control input-sm'
-                    onChange={(event) => this.currentBinsValue = event.currentTarget.value}
-                />
-                {!this.contentIsValid && (<div className="alert alert-danger" role="alert"
-                                               style={{marginTop: '10px', marginBottom: '0'}}>Invalid bins</div>)}
-            </Modal.Body>
-            <Modal.Footer>
-                <button className='btn btn-primary btn-sm' onClick={this.updateCurrentBinsValue}
-                        disabled={!this.contentIsValid} style={{marginTop: '10px', marginBottom: '0'}}>Update
-                </button>
-            </Modal.Footer>
-        </Modal>
+        return (
+            <Modal
+                bsSize={'small'}
+                show={this.props.show}
+                onHide={this.props.onHide}
+                keyboard
+            >
+                <Modal.Header closeButton>
+                    <Modal.Title>Custom Bins</Modal.Title>
+                </Modal.Header>
+                <Modal.Body>
+                    <div>Please specify bin boundaries of the x axis</div>
+                    <textarea
+                        style={{ resize: 'none' }}
+                        rows={5}
+                        value={this.currentBinsValue}
+                        className="form-control input-sm"
+                        onChange={event =>
+                            (this.currentBinsValue = event.currentTarget.value)
+                        }
+                    />
+                    {!this.contentIsValid && (
+                        <div
+                            className="alert alert-danger"
+                            role="alert"
+                            style={{ marginTop: '10px', marginBottom: '0' }}
+                        >
+                            Invalid bins
+                        </div>
+                    )}
+                </Modal.Body>
+                <Modal.Footer>
+                    <button
+                        className="btn btn-primary btn-sm"
+                        onClick={this.updateCurrentBinsValue}
+                        disabled={!this.contentIsValid}
+                        style={{ marginTop: '10px', marginBottom: '0' }}
+                    >
+                        Update
+                    </button>
+                </Modal.Footer>
+            </Modal>
+        );
     }
-};
\ No newline at end of file
+}
diff --git a/src/pages/studyView/charts/pieChart/PieChart.tsx b/src/pages/studyView/charts/pieChart/PieChart.tsx
index 1e727cba1ea..3847e39c952 100644
--- a/src/pages/studyView/charts/pieChart/PieChart.tsx
+++ b/src/pages/studyView/charts/pieChart/PieChart.tsx
@@ -1,18 +1,27 @@
-import * as React from "react";
-import {observer} from "mobx-react";
-import {Slice, VictoryContainer, VictoryLabel, VictoryLegend, VictoryPie} from 'victory';
-import {action, computed, observable, toJS} from "mobx";
-import _ from "lodash";
-import {getFrequencyStr, toSvgDomNodeWithLegend} from "pages/studyView/StudyViewUtils";
-import CBIOPORTAL_VICTORY_THEME from "shared/theme/cBioPoralTheme";
-import {AbstractChart} from "pages/studyView/charts/ChartContainer";
+import * as React from 'react';
+import { observer } from 'mobx-react';
+import {
+    Slice,
+    VictoryContainer,
+    VictoryLabel,
+    VictoryLegend,
+    VictoryPie,
+} from 'victory';
+import { action, computed, observable, toJS } from 'mobx';
+import _ from 'lodash';
+import {
+    getFrequencyStr,
+    toSvgDomNodeWithLegend,
+} from 'pages/studyView/StudyViewUtils';
+import CBIOPORTAL_VICTORY_THEME from 'shared/theme/cBioPoralTheme';
+import { AbstractChart } from 'pages/studyView/charts/ChartContainer';
 import autobind from 'autobind-decorator';
-import {ClinicalDataCountSummary} from "pages/studyView/StudyViewUtils";
-import ClinicalTable from "pages/studyView/table/ClinicalTable";
-import {STUDY_VIEW_CONFIG} from "../../StudyViewConfig";
-import {DefaultTooltip, getTextWidth} from "cbioportal-frontend-commons";
-import {DEFAULT_NA_COLOR} from "shared/lib/Colors";
-import ifNotDefined from "../../../../shared/lib/ifNotDefined";
+import { ClinicalDataCountSummary } from 'pages/studyView/StudyViewUtils';
+import ClinicalTable from 'pages/studyView/table/ClinicalTable';
+import { STUDY_VIEW_CONFIG } from '../../StudyViewConfig';
+import { DefaultTooltip, getTextWidth } from 'cbioportal-frontend-commons';
+import { DEFAULT_NA_COLOR } from 'shared/lib/Colors';
+import ifNotDefined from '../../../../shared/lib/ifNotDefined';
 
 export interface IPieChartProps {
     width: number;
@@ -27,8 +36,8 @@ export interface IPieChartProps {
 }
 
 @observer
-export default class PieChart extends React.Component<IPieChartProps, {}> implements AbstractChart {
-
+export default class PieChart extends React.Component<IPieChartProps, {}>
+    implements AbstractChart {
     private svg: SVGElement;
 
     constructor(props: IPieChartProps) {
@@ -37,11 +46,17 @@ export default class PieChart extends React.Component<IPieChartProps, {}> implem
 
     @computed
     get filters() {
-        const mappedValueSet = _.reduce(this.props.data, (acc, datum) => {
-            acc[datum.value.toLowerCase()] = datum.value;
-            return acc;
-        }, {} as { [id: string]: string });
-        return this.props.filters.map(filter => mappedValueSet[filter.toLowerCase()] || filter);
+        const mappedValueSet = _.reduce(
+            this.props.data,
+            (acc, datum) => {
+                acc[datum.value.toLowerCase()] = datum.value;
+                return acc;
+            },
+            {} as { [id: string]: string }
+        );
+        return this.props.filters.map(
+            filter => mappedValueSet[filter.toLowerCase()] || filter
+        );
     }
 
     @autobind
@@ -57,13 +72,16 @@ export default class PieChart extends React.Component<IPieChartProps, {}> implem
 
     private get userEvents() {
         const self = this;
-        return [{
-            target: "data",
-            eventHandlers: this.pieSliceOnClickEventHandlers
-        }, {
-            target: "labels",
-            eventHandlers: this.pieSliceOnClickEventHandlers
-        }];
+        return [
+            {
+                target: 'data',
+                eventHandlers: this.pieSliceOnClickEventHandlers,
+            },
+            {
+                target: 'labels',
+                eventHandlers: this.pieSliceOnClickEventHandlers,
+            },
+        ];
     }
 
     private get pieSliceOnClickEventHandlers() {
@@ -71,14 +89,14 @@ export default class PieChart extends React.Component<IPieChartProps, {}> implem
             onClick: () => {
                 return [
                     {
-                        target: "data",
+                        target: 'data',
                         mutation: (props: any) => {
                             this.onUserSelection(props.datum.value);
-                        }
-                    }
+                        },
+                    },
                 ];
-            }
-        }
+            },
+        };
     }
 
     @observable isTooltipHovered: boolean = false;
@@ -91,26 +109,31 @@ export default class PieChart extends React.Component<IPieChartProps, {}> implem
     }
 
     public downloadData() {
-        return this.props.data.map(obj => obj.value + '\t' + obj.count).join('\n');
+        return this.props.data
+            .map(obj => obj.value + '\t' + obj.count)
+            .join('\n');
     }
 
     public toSVGDOMNode(): Element {
         return toSvgDomNodeWithLegend(this.svg, {
-            legendGroupSelector: ".studyViewPieChartLegend",
-            chartGroupSelector: ".studyViewPieChartGroup",
-            centerLegend: true
+            legendGroupSelector: '.studyViewPieChartLegend',
+            chartGroupSelector: '.studyViewPieChartGroup',
+            centerLegend: true,
         });
     }
 
     @computed
     get totalCount() {
-        return _.sumBy(this.props.data, obj => obj.count)
+        return _.sumBy(this.props.data, obj => obj.count);
     }
 
     @computed
     get fill() {
         return (d: ClinicalDataCountSummary) => {
-            if (!_.isEmpty(this.filters) && !_.includes(this.filters, d.value)) {
+            if (
+                !_.isEmpty(this.filters) &&
+                !_.includes(this.filters, d.value)
+            ) {
                 return DEFAULT_NA_COLOR;
             }
             return d.color;
@@ -121,7 +144,7 @@ export default class PieChart extends React.Component<IPieChartProps, {}> implem
     get stroke() {
         return (d: ClinicalDataCountSummary) => {
             if (!_.isEmpty(this.filters) && _.includes(this.filters, d.value)) {
-                return "#cccccc";
+                return '#cccccc';
             }
             return null;
         };
@@ -140,7 +163,10 @@ export default class PieChart extends React.Component<IPieChartProps, {}> implem
     @computed
     get fillOpacity() {
         return (d: ClinicalDataCountSummary) => {
-            if (!_.isEmpty(this.filters) && !_.includes(this.filters, d.value)) {
+            if (
+                !_.isEmpty(this.filters) &&
+                !_.includes(this.filters, d.value)
+            ) {
                 return '0.5';
             }
             return 1;
@@ -159,24 +185,33 @@ export default class PieChart extends React.Component<IPieChartProps, {}> implem
 
     @autobind
     private label(d: ClinicalDataCountSummary) {
-        return d.count / this.totalCount > 0.5 ? d.count.toLocaleString() : (
-            this.maxLength(d.count / this.totalCount, this.pieSliceRadius / 3) <
-            getTextWidth(
-                d.count.toLocaleString(),
-                CBIOPORTAL_VICTORY_THEME.axis.style.tickLabels.fontFamily,
-                `${CBIOPORTAL_VICTORY_THEME.axis.style.tickLabels.fontSize}px`
-            ) ? '' : d.count.toLocaleString());
+        return d.count / this.totalCount > 0.5
+            ? d.count.toLocaleString()
+            : this.maxLength(
+                  d.count / this.totalCount,
+                  this.pieSliceRadius / 3
+              ) <
+              getTextWidth(
+                  d.count.toLocaleString(),
+                  CBIOPORTAL_VICTORY_THEME.axis.style.tickLabels.fontFamily,
+                  `${CBIOPORTAL_VICTORY_THEME.axis.style.tickLabels.fontSize}px`
+              )
+            ? ''
+            : d.count.toLocaleString();
     }
 
     // We don't want to show a bigger pie chart when the height is way smaller than width
     @computed
     get chartSize() {
-        return (this.props.width + this.props.height ) / 2;
+        return (this.props.width + this.props.height) / 2;
     }
 
     @computed
     get pieSliceRadius(): number {
-        const chartWidth = this.props.width > this.props.height ? this.props.height : this.props.width;
+        const chartWidth =
+            this.props.width > this.props.height
+                ? this.props.height
+                : this.props.width;
         return chartWidth / 2 - STUDY_VIEW_CONFIG.thresholds.piePadding;
     }
 
@@ -186,29 +221,34 @@ export default class PieChart extends React.Component<IPieChartProps, {}> implem
             <VictoryPie
                 standalone={false}
                 theme={CBIOPORTAL_VICTORY_THEME}
-                containerComponent={<VictoryContainer responsive={false}/>}
-                groupComponent={<g className="studyViewPieChartGroup" transform="translate(0, -12)"/>}
+                containerComponent={<VictoryContainer responsive={false} />}
+                groupComponent={
+                    <g
+                        className="studyViewPieChartGroup"
+                        transform="translate(0, -12)"
+                    />
+                }
                 width={this.props.width}
                 height={this.chartSize}
                 labelRadius={this.pieSliceRadius / 3}
                 radius={this.pieSliceRadius}
                 labels={this.label}
                 data={this.props.data}
-                dataComponent={<CustomSlice/>}
-                labelComponent={<VictoryLabel/>}
+                dataComponent={<CustomSlice />}
+                labelComponent={<VictoryLabel />}
                 events={this.userEvents}
                 style={{
                     data: {
-                        fill: ifNotDefined(this.fill, "#cccccc"),
-                        stroke: ifNotDefined(this.stroke, "0x000000"),
+                        fill: ifNotDefined(this.fill, '#cccccc'),
+                        stroke: ifNotDefined(this.stroke, '0x000000'),
                         strokeWidth: ifNotDefined(this.strokeWidth, 0),
                         fillOpacity: ifNotDefined(this.fillOpacity, 1),
-                        cursor: 'pointer'
+                        cursor: 'pointer',
                     },
                     labels: {
-                        fill: "white",
-                        cursor: 'pointer'
-                    }
+                        fill: 'white',
+                        cursor: 'pointer',
+                    },
                 }}
                 x={this.x}
                 y={this.y}
@@ -218,17 +258,20 @@ export default class PieChart extends React.Component<IPieChartProps, {}> implem
 
     @computed
     get victoryLegend() {
-        const legendData = this.props.data.map(data =>
-            ({name: `${data.value}: ${data.count} (${getFrequencyStr(100 * data.count / this.totalCount)})`}));
+        const legendData = this.props.data.map(data => ({
+            name: `${data.value}: ${data.count} (${getFrequencyStr(
+                (100 * data.count) / this.totalCount
+            )})`,
+        }));
         const colorScale = this.props.data.map(data => data.color);
 
         // override the legend style without mutating the actual theme object
         const theme = _.cloneDeep(CBIOPORTAL_VICTORY_THEME);
         theme.legend.style.data = {
-            type: "square",
+            type: 'square',
             size: 5,
             strokeWidth: 0,
-            stroke: "black"
+            stroke: 'black',
         };
 
         return (
@@ -236,26 +279,27 @@ export default class PieChart extends React.Component<IPieChartProps, {}> implem
                 standalone={false}
                 theme={theme}
                 colorScale={colorScale}
-                x={0} y={this.props.height + 1}
+                x={0}
+                y={this.props.height + 1}
                 rowGutter={-10}
-                title={this.props.label || "Legend"}
+                title={this.props.label || 'Legend'}
                 centerTitle={true}
-                style={{title: {fontWeight: "bold"}}}
+                style={{ title: { fontWeight: 'bold' } }}
                 data={legendData}
-                groupComponent={<g className="studyViewPieChartLegend"/>}
+                groupComponent={<g className="studyViewPieChartLegend" />}
             />
         );
     }
 
     private maxLength(ratioOfPie: number, radius: number) {
-        return Math.abs(Math.tan(Math.PI * ratioOfPie / 2)) * radius * 2;
+        return Math.abs(Math.tan((Math.PI * ratioOfPie) / 2)) * radius * 2;
     }
 
     public render() {
         return (
             <DefaultTooltip
                 placement={this.props.placement}
-                overlay={(
+                overlay={
                     <ClinicalTable
                         width={300}
                         height={150}
@@ -267,14 +311,15 @@ export default class PieChart extends React.Component<IPieChartProps, {}> implem
                         filters={this.filters}
                         highlightedRow={this.highlightedRow}
                         onUserSelection={this.props.onUserSelection}
-                    />)}
+                    />
+                }
                 destroyTooltipOnHide={true}
-                trigger={["hover"]}
+                trigger={['hover']}
             >
                 <svg
                     width={this.props.width}
                     height={this.props.height}
-                    ref={(ref: any) => this.svg = ref}
+                    ref={(ref: any) => (this.svg = ref)}
                 >
                     {this.victoryPie}
                     {this.victoryLegend}
@@ -282,7 +327,6 @@ export default class PieChart extends React.Component<IPieChartProps, {}> implem
             </DefaultTooltip>
         );
     }
-
 }
 
 class CustomSlice extends React.Component<{}, {}> {
@@ -295,4 +339,4 @@ class CustomSlice extends React.Component<{}, {}> {
             </g>
         );
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/studyView/charts/scatterPlot/StudyViewDensityScatterPlot.tsx b/src/pages/studyView/charts/scatterPlot/StudyViewDensityScatterPlot.tsx
index 7d2dfcad6ae..fd8faa414bd 100644
--- a/src/pages/studyView/charts/scatterPlot/StudyViewDensityScatterPlot.tsx
+++ b/src/pages/studyView/charts/scatterPlot/StudyViewDensityScatterPlot.tsx
@@ -1,43 +1,46 @@
-import {observer} from "mobx-react";
-import * as React from "react";
+import { observer } from 'mobx-react';
+import * as React from 'react';
 import {
     VictoryAxis,
     VictoryChart,
     VictoryLabel,
     VictoryScatter,
-    VictorySelectionContainer
-} from "victory";
-import CBIOPORTAL_VICTORY_THEME from "../../../../shared/theme/cBioPoralTheme";
-import {computed, observable} from "mobx";
-import autobind from "autobind-decorator";
-import {tickFormatNumeral} from "../../../../shared/components/plots/TickUtils";
-import {makeMouseEvents} from "../../../../shared/components/plots/PlotUtils";
-import _ from "lodash";
-import ScatterPlotTooltip from "../../../../shared/components/plots/ScatterPlotTooltip";
-import LoadingIndicator from "shared/components/loadingIndicator/LoadingIndicator";
-import {AbstractChart} from "../ChartContainer";
-import {interpolatePlasma} from "d3-scale-chromatic";
-import {DensityPlotBin} from "../../../../shared/api/generated/CBioPortalAPIInternal";
-import { RectangleBounds } from "pages/studyView/StudyViewUtils";
-
-export type IStudyViewDensityScatterPlotDatum = DensityPlotBin & {x:number, y:number};
+    VictorySelectionContainer,
+} from 'victory';
+import CBIOPORTAL_VICTORY_THEME from '../../../../shared/theme/cBioPoralTheme';
+import { computed, observable } from 'mobx';
+import autobind from 'autobind-decorator';
+import { tickFormatNumeral } from '../../../../shared/components/plots/TickUtils';
+import { makeMouseEvents } from '../../../../shared/components/plots/PlotUtils';
+import _ from 'lodash';
+import ScatterPlotTooltip from '../../../../shared/components/plots/ScatterPlotTooltip';
+import LoadingIndicator from 'shared/components/loadingIndicator/LoadingIndicator';
+import { AbstractChart } from '../ChartContainer';
+import { interpolatePlasma } from 'd3-scale-chromatic';
+import { DensityPlotBin } from '../../../../shared/api/generated/CBioPortalAPIInternal';
+import { RectangleBounds } from 'pages/studyView/StudyViewUtils';
+
+export type IStudyViewDensityScatterPlotDatum = DensityPlotBin & {
+    x: number;
+    y: number;
+};
 
 export interface IStudyViewDensityScatterPlotProps {
-    width:number;
-    height:number;
-    yBinsMin:number;
-    data:DensityPlotBin[]
-    xBinSize:number;
-    yBinSize:number;
-    onSelection:(bounds:RectangleBounds)=>void;
-    selectionBounds?:RectangleBounds;
-
-    isLoading?:boolean;
-    svgRef?:(svg:SVGElement|null)=>void;
-    tooltip?:(d:DensityPlotBin)=>JSX.Element;
+    width: number;
+    height: number;
+    yBinsMin: number;
+    data: DensityPlotBin[];
+    xBinSize: number;
+    yBinSize: number;
+    onSelection: (bounds: RectangleBounds) => void;
+    selectionBounds?: RectangleBounds;
+
+    isLoading?: boolean;
+    svgRef?: (svg: SVGElement | null) => void;
+    tooltip?: (d: DensityPlotBin) => JSX.Element;
     axisLabelX?: string;
     axisLabelY?: string;
-    title?:string;
+    title?: string;
 }
 
 const NUM_AXIS_TICKS = 8;
@@ -48,16 +51,26 @@ class _VictorySelectionContainerWithLegend extends VictorySelectionContainer {
     //  VictoryChart layout system
 
     render() {
-        const {activateSelectedData, onSelection, containerRef, gradient, legend, children, ...rest} = this.props as any;
+        const {
+            activateSelectedData,
+            onSelection,
+            containerRef,
+            gradient,
+            legend,
+            children,
+            ...rest
+        } = this.props as any;
         return (
             <VictorySelectionContainer
                 activateSelectedData={false}
                 onSelection={onSelection}
                 containerRef={containerRef}
-                children={children.concat(legend).concat(<defs>{gradient}</defs>)}
+                children={children
+                    .concat(legend)
+                    .concat(<defs>{gradient}</defs>)}
                 {...rest}
             />
-        )
+        );
     }
 }
 
@@ -65,25 +78,27 @@ class _VictorySelectionContainerWithLegend extends VictorySelectionContainer {
 const VictorySelectionContainerWithLegend = _VictorySelectionContainerWithLegend as any;
 
 @observer
-export default class StudyViewDensityScatterPlot extends React.Component<IStudyViewDensityScatterPlotProps, {}> implements AbstractChart {
-    @observable tooltipModel:any|null = null;
-    @observable pointHovered:boolean = false;
-    @observable mouseIsDown:boolean = false;
-    public mouseEvents:any = makeMouseEvents(this);
+export default class StudyViewDensityScatterPlot
+    extends React.Component<IStudyViewDensityScatterPlotProps, {}>
+    implements AbstractChart {
+    @observable tooltipModel: any | null = null;
+    @observable pointHovered: boolean = false;
+    @observable mouseIsDown: boolean = false;
+    public mouseEvents: any = makeMouseEvents(this);
 
-    private xAxis:any | null = null;
-    private yAxis:any | null = null;
+    private xAxis: any | null = null;
+    private yAxis: any | null = null;
 
-    @observable.ref private container:HTMLDivElement;
-    private svg:SVGElement|null;
+    @observable.ref private container: HTMLDivElement;
+    private svg: SVGElement | null;
 
     @autobind
-    private containerRef(container:HTMLDivElement) {
+    private containerRef(container: HTMLDivElement) {
         this.container = container;
     }
 
     @autobind
-    private svgRef(svg:SVGElement|null) {
+    private svgRef(svg: SVGElement | null) {
         this.svg = svg;
         if (this.props.svgRef) {
             this.props.svgRef(this.svg);
@@ -99,10 +114,10 @@ export default class StudyViewDensityScatterPlot extends React.Component<IStudyV
             return (
                 <VictoryLabel
                     style={{
-                        fontWeight:"bold",
-                        textAnchor: "middle"
+                        fontWeight: 'bold',
+                        textAnchor: 'middle',
                     }}
-                    x={this.props.width/2}
+                    x={this.props.width / 2}
                     y="1.2em"
                     text={this.props.title}
                 />
@@ -116,15 +131,21 @@ export default class StudyViewDensityScatterPlot extends React.Component<IStudyV
         // enforce plot constraints - because of dot size and wanting them to be
         //  right up against each other, we cant have less than yBinsMin on the y axis
         return {
-            x: [0,1] as [number, number],
-            y: [0, Math.max(this.props.yBinsMin, this.dataDomain.y[1])]
+            x: [0, 1] as [number, number],
+            y: [0, Math.max(this.props.yBinsMin, this.dataDomain.y[1])],
         };
     }
 
     @computed get dataDomain() {
         // get data extremes
-        const max = {x:Number.NEGATIVE_INFINITY, y:Number.NEGATIVE_INFINITY};
-        const min = {x:Number.POSITIVE_INFINITY, y:Number.POSITIVE_INFINITY};
+        const max = {
+            x: Number.NEGATIVE_INFINITY,
+            y: Number.NEGATIVE_INFINITY,
+        };
+        const min = {
+            x: Number.POSITIVE_INFINITY,
+            y: Number.POSITIVE_INFINITY,
+        };
         for (const d of this.data) {
             max.x = Math.max(d.x + this.props.xBinSize, max.x);
             max.y = Math.max(d.y + this.props.yBinSize, max.y);
@@ -134,13 +155,13 @@ export default class StudyViewDensityScatterPlot extends React.Component<IStudyV
         return {
             //x: [min.x, max.x],
             //y: [min.y, max.y]
-            x: [0, 1] as [number,number],
-            y:[0, max.y] as [number,number]
+            x: [0, 1] as [number, number],
+            y: [0, max.y] as [number, number],
         };
     }
 
     @autobind
-    private tickFormat(t:number, index:number, ticks:number[]) {
+    private tickFormat(t: number, index: number, ticks: number[]) {
         return tickFormatNumeral(t, ticks);
     }
 
@@ -155,7 +176,7 @@ export default class StudyViewDensityScatterPlot extends React.Component<IStudyV
     }
 
     @autobind
-    private onSelection(scatters:any, bounds:any) {
+    private onSelection(scatters: any, bounds: any) {
         if (this.xAxis && this.yAxis) {
             let xStart = Number.POSITIVE_INFINITY;
             let yStart = Number.POSITIVE_INFINITY;
@@ -191,29 +212,31 @@ export default class StudyViewDensityScatterPlot extends React.Component<IStudyV
             if (Math.abs(xEnd - 1) < 0.00005) {
                 // same reasoning as above, in case a sample has 1.0 FGA
                 // but we don't have to check the data because we know the bin range ends at 1
-                
+
                 xEnd += 1;
             }
 
-            xStart = + (xStart.toFixed(2));
-            xEnd = + (xEnd.toFixed(2));
-            yStart = + (yStart.toFixed(2));
-            yEnd = + (yEnd.toFixed(2));
+            xStart = +xStart.toFixed(2);
+            xEnd = +xEnd.toFixed(2);
+            yStart = +yStart.toFixed(2);
+            yEnd = +yEnd.toFixed(2);
             this.props.onSelection({ xStart, xEnd, yStart, yEnd });
         }
     }
 
-    @computed get data():IStudyViewDensityScatterPlotDatum[] {
-        return this.props.data.map(d=>Object.assign({}, d, { x: d.binX, y: d.binY }));
+    @computed get data(): IStudyViewDensityScatterPlotDatum[] {
+        return this.props.data.map(d =>
+            Object.assign({}, d, { x: d.binX, y: d.binY })
+        );
     }
 
-    private isSelected(d:IStudyViewDensityScatterPlotDatum) {
+    private isSelected(d: IStudyViewDensityScatterPlotDatum) {
         if (!this.props.selectionBounds) {
             return true;
         } else {
             const bounds = this.props.selectionBounds;
             let xFiltered = true;
-            let yFiltered = true
+            let yFiltered = true;
 
             if (bounds.xStart !== undefined && bounds.xEnd !== undefined) {
                 xFiltered = d.binX >= bounds.xStart && d.binX < bounds.xEnd;
@@ -251,13 +274,13 @@ export default class StudyViewDensityScatterPlot extends React.Component<IStudyV
             }
         }
 
-        const selectedDataByAreaCount = _.groupBy(selectedData, d=>{
+        const selectedDataByAreaCount = _.groupBy(selectedData, d => {
             const areaCount = d.count;
             max = Math.max(areaCount, max);
             min = Math.min(areaCount, min);
             return areaCount;
         });
-        const unselectedDataByAreaCount = _.groupBy(unselectedData, d=>{
+        const unselectedDataByAreaCount = _.groupBy(unselectedData, d => {
             const areaCount = d.count;
             max = Math.max(areaCount, max);
             min = Math.min(areaCount, min);
@@ -275,20 +298,23 @@ export default class StudyViewDensityScatterPlot extends React.Component<IStudyV
         const logMax = Math.log(max);
         const logMin = Math.log(min);
 
-        let countToColorCoord:(count:number)=>number;
-        let colorCoordToCount:((colorCoord:number)=>number) | null;
-        let colorCoordToColor:((colorCoord:number)=>string);
+        let countToColorCoord: (count: number) => number;
+        let colorCoordToCount: ((colorCoord: number) => number) | null;
+        let colorCoordToColor: (colorCoord: number) => string;
         const colorCoordMax = 0.75;
         if (min === max) {
             // this means min = max = 1;
-            countToColorCoord = ()=>0;
-            colorCoordToColor = ()=>interpolatePlasma(0);
+            countToColorCoord = () => 0;
+            colorCoordToColor = () => interpolatePlasma(0);
             colorCoordToCount = null;
         } else {
             // scale between 0 and some limit, to avoid lighter colors on top which are not visible against white bg
-            countToColorCoord = count=>((Math.log(count) - logMin) / (logMax - logMin));
-            colorCoordToCount = coord=>Math.exp((coord*(logMax-logMin)/colorCoordMax) + logMin);
-            colorCoordToColor = coord=>interpolatePlasma(colorCoordMax*coord);
+            countToColorCoord = count =>
+                (Math.log(count) - logMin) / (logMax - logMin);
+            colorCoordToCount = coord =>
+                Math.exp((coord * (logMax - logMin)) / colorCoordMax + logMin);
+            colorCoordToColor = coord =>
+                interpolatePlasma(colorCoordMax * coord);
         }
 
         return {
@@ -296,15 +322,16 @@ export default class StudyViewDensityScatterPlot extends React.Component<IStudyV
             unselectedDataByAreaCount,
             colorCoordToCount,
             colorCoordMax,
-            countToSelectedColor:(count:number)=>colorCoordToColor(countToColorCoord(count)),
-            countToUnselectedColor:(count:number)=>{
-                return "rgb(200,200,200)";
+            countToSelectedColor: (count: number) =>
+                colorCoordToColor(countToColorCoord(count)),
+            countToUnselectedColor: (count: number) => {
+                return 'rgb(200,200,200)';
                 /*const val = Math.round(countToColorCoord(count)*255);
                 return `rgba(${val},${val},${val},0.3)`;&*/
             },
             colorCoordToColor,
-            countMax:max,
-            countMin:min
+            countMax: max,
+            countMin: min,
         };
     }
 
@@ -313,32 +340,35 @@ export default class StudyViewDensityScatterPlot extends React.Component<IStudyV
             return [];
         }
 
-        const scatters:JSX.Element[] = [];
+        const scatters: JSX.Element[] = [];
         const scatterCategories = [
             {
                 dataByAreaCount: this.plotComputations.selectedDataByAreaCount,
                 countToColor: this.plotComputations.countToSelectedColor,
-                size: 3
+                size: 3,
             },
             {
-                dataByAreaCount: this.plotComputations.unselectedDataByAreaCount,
+                dataByAreaCount: this.plotComputations
+                    .unselectedDataByAreaCount,
                 countToColor: this.plotComputations.countToUnselectedColor,
-                size: 2.5
-            }
+                size: 2.5,
+            },
         ];
         for (const scatterCategory of scatterCategories) {
-            _.forEach(scatterCategory.dataByAreaCount, (data, areaCount)=>{
-                const color = scatterCategory.countToColor(parseInt(areaCount, 10));
+            _.forEach(scatterCategory.dataByAreaCount, (data, areaCount) => {
+                const color = scatterCategory.countToColor(
+                    parseInt(areaCount, 10)
+                );
                 scatters.push(
                     <VictoryScatter
                         key={`${areaCount}`}
                         style={{
                             data: {
                                 fill: color,
-                                stroke: "black",
+                                stroke: 'black',
                                 strokeWidth: 1,
-                                strokeOpacity: 0
-                            }
+                                strokeOpacity: 0,
+                            },
                         }}
                         size={scatterCategory.size}
                         symbol="circle"
@@ -356,19 +386,30 @@ export default class StudyViewDensityScatterPlot extends React.Component<IStudyV
         if (!colorCoordToCount) {
             return null;
         } else {
-            const gradientId = "legendGradient";
+            const gradientId = 'legendGradient';
             const GRADIENTMESH = 30;
             const gradientStopPoints = [];
-            for (let i=0; i<GRADIENTMESH; i++) {
+            for (let i = 0; i < GRADIENTMESH; i++) {
                 gradientStopPoints.push(
                     <stop
-                        offset={`${((i/GRADIENTMESH)*100).toFixed(0)}%`}
-                        style={{stopColor:this.plotComputations.colorCoordToColor(i/GRADIENTMESH)}}
+                        offset={`${((i / GRADIENTMESH) * 100).toFixed(0)}%`}
+                        style={{
+                            stopColor: this.plotComputations.colorCoordToColor(
+                                i / GRADIENTMESH
+                            ),
+                        }}
                     />
                 );
             }
             const gradientElt = (
-                <linearGradient id={gradientId} key={gradientId} x1="0%" y1="100%" x2="0%" y2="0%">
+                <linearGradient
+                    id={gradientId}
+                    key={gradientId}
+                    x1="0%"
+                    y1="100%"
+                    x2="0%"
+                    y2="0%"
+                >
                     {gradientStopPoints}
                 </linearGradient>
             );
@@ -376,42 +417,80 @@ export default class StudyViewDensityScatterPlot extends React.Component<IStudyV
             const rectX = this.props.width - 45;
             const rectY = 70;
             const rectWidth = 10;
-            const largeRange = (this.plotComputations.countMax - this.plotComputations.countMin) >= 2;
+            const largeRange =
+                this.plotComputations.countMax -
+                    this.plotComputations.countMin >=
+                2;
             const rectHeight = largeRange ? 68 : 38;
 
             const rect = (
-                <rect fill={`url(#${gradientId})`} x={rectX} y={rectY} width={rectWidth} height={rectHeight}/>
+                <rect
+                    fill={`url(#${gradientId})`}
+                    x={rectX}
+                    y={rectY}
+                    width={rectWidth}
+                    height={rectHeight}
+                />
             );
 
             const labels = [
-                <text fontSize={11} x={rectX+rectWidth+4} y={rectY} dy="1em">{this.plotComputations.countMax.toLocaleString()}</text>,
-                <text fontSize={11} x={rectX+rectWidth+4} y={rectY+rectHeight} dy="-0.3em">{this.plotComputations.countMin.toLocaleString()}</text>
+                <text
+                    fontSize={11}
+                    x={rectX + rectWidth + 4}
+                    y={rectY}
+                    dy="1em"
+                >
+                    {this.plotComputations.countMax.toLocaleString()}
+                </text>,
+                <text
+                    fontSize={11}
+                    x={rectX + rectWidth + 4}
+                    y={rectY + rectHeight}
+                    dy="-0.3em"
+                >
+                    {this.plotComputations.countMin.toLocaleString()}
+                </text>,
             ];
             if (largeRange) {
                 // only add a middle label if theres room for another whole number in between
-                labels.push(<text fontSize={11} x={rectX+rectWidth+4} y={rectY+(rectHeight/2)} dy="0.3em">{Math.round(colorCoordToCount(0.5)).toLocaleString()}</text>);
+                labels.push(
+                    <text
+                        fontSize={11}
+                        x={rectX + rectWidth + 4}
+                        y={rectY + rectHeight / 2}
+                        dy="0.3em"
+                    >
+                        {Math.round(colorCoordToCount(0.5)).toLocaleString()}
+                    </text>
+                );
             }
 
-            const title = <text fontSize={11} x={rectX} y={rectY} dy="-0.5em" dx="-12px"># samples</text>;
+            const title = (
+                <text fontSize={11} x={rectX} y={rectY} dy="-0.5em" dx="-12px">
+                    # samples
+                </text>
+            );
 
             return {
-                gradient:gradientElt,
-                legend: (<g>
-                    {title}
-                    {rect}
-                    {labels}
-                </g>)
+                gradient: gradientElt,
+                legend: (
+                    <g>
+                        {title}
+                        {rect}
+                        {labels}
+                    </g>
+                ),
             };
         }
     }
 
     @autobind
-    private xAxisRef(axis:any|null) {
+    private xAxisRef(axis: any | null) {
         this.xAxis = axis;
     }
 
     @autobind
-    private yAxisRef(axis:any|null) {
+    private yAxisRef(axis: any | null) {
         this.yAxis = axis;
     }
 
@@ -419,7 +498,11 @@ export default class StudyViewDensityScatterPlot extends React.Component<IStudyV
         return (
             <div>
                 <div
-                    style={{width:this.props.width, height:this.props.height, position:"relative"}}
+                    style={{
+                        width: this.props.width,
+                        height: this.props.height,
+                        position: 'relative',
+                    }}
                     ref={this.containerRef}
                     onMouseDown={this.onMouseDown}
                     onMouseUp={this.onMouseUp}
@@ -453,7 +536,7 @@ export default class StudyViewDensityScatterPlot extends React.Component<IStudyV
                             crossAxis={false}
                             tickCount={NUM_AXIS_TICKS}
                             tickFormat={this.tickFormat}
-                            axisLabelComponent={<VictoryLabel dy={20}/>}
+                            axisLabelComponent={<VictoryLabel dy={20} />}
                             label={this.props.axisLabelX}
                         />
                         <VictoryAxis
@@ -465,36 +548,44 @@ export default class StudyViewDensityScatterPlot extends React.Component<IStudyV
                             tickCount={NUM_AXIS_TICKS}
                             tickFormat={this.tickFormat}
                             dependentAxis={true}
-                            axisLabelComponent={<VictoryLabel dy={-27}/>}
+                            axisLabelComponent={<VictoryLabel dy={-27} />}
                             label={this.props.axisLabelY}
                         />
                         {this.scatters}
                     </VictoryChart>
                     <span
                         style={{
-                            position:"absolute",
-                            top:0,
-                            left:0,
-                            width:"100%",
-                            height:"100%",
-                            backgroundColor:"rgba(255,255,255,0.8)",
-                            display:this.props.isLoading ? "block" : "none"
+                            position: 'absolute',
+                            top: 0,
+                            left: 0,
+                            width: '100%',
+                            height: '100%',
+                            backgroundColor: 'rgba(255,255,255,0.8)',
+                            display: this.props.isLoading ? 'block' : 'none',
                         }}
                     />
                     <LoadingIndicator
                         isLoading={!!this.props.isLoading}
-                        style={{position:"absolute", top:"50%", left:"50%", marginLeft:-10}}
+                        style={{
+                            position: 'absolute',
+                            top: '50%',
+                            left: '50%',
+                            marginLeft: -10,
+                        }}
                     />
                 </div>
-                { this.tooltipModel && this.props.tooltip && !this.mouseIsDown && (
+                {this.tooltipModel && this.props.tooltip && !this.mouseIsDown && (
                     <ScatterPlotTooltip
                         container={this.container}
                         targetHovered={this.pointHovered}
-                        targetCoords={{x: this.tooltipModel.x, y: this.tooltipModel.y}}
+                        targetCoords={{
+                            x: this.tooltipModel.x,
+                            y: this.tooltipModel.y,
+                        }}
                         overlay={this.props.tooltip(this.tooltipModel.datum)}
                     />
                 )}
             </div>
         );
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/studyView/charts/scatterPlot/StudyViewScatterPlotUtils.spec.ts b/src/pages/studyView/charts/scatterPlot/StudyViewScatterPlotUtils.spec.ts
index 17f46ae2659..9c7406df29a 100644
--- a/src/pages/studyView/charts/scatterPlot/StudyViewScatterPlotUtils.spec.ts
+++ b/src/pages/studyView/charts/scatterPlot/StudyViewScatterPlotUtils.spec.ts
@@ -1,61 +1,99 @@
-import {assert} from "chai";
-import _ from "lodash";
-import {getBinnedData} from "./StudyViewScatterPlotUtils";
+import { assert } from 'chai';
+import _ from 'lodash';
+import { getBinnedData } from './StudyViewScatterPlotUtils';
 
-describe("StudyViewScatterPlotUtils", ()=>{
-    describe("getBinnedData", ()=>{
-        let plotDomain:any;
-        before(()=>{
-            plotDomain = {x:[0,10], y:[0,10]};
+describe('StudyViewScatterPlotUtils', () => {
+    describe('getBinnedData', () => {
+        let plotDomain: any;
+        before(() => {
+            plotDomain = { x: [0, 10], y: [0, 10] };
         });
-        it("returns the correct result for empty data", ()=>{
-            assert.deepEqual(
-                getBinnedData([], plotDomain, 3),
-                []
-            );
+        it('returns the correct result for empty data', () => {
+            assert.deepEqual(getBinnedData([], plotDomain, 3), []);
         });
-        it("returns the correct result for one data", ()=>{
+        it('returns the correct result for one data', () => {
             assert.deepEqual(
-                getBinnedData([{x:0,y:0, asdf:"YO"}], plotDomain, 3),
-                [{x:0, y:0, data:[{x:0, y:0, asdf:"YO"}]}],
-                "data at origin"
+                getBinnedData([{ x: 0, y: 0, asdf: 'YO' }], plotDomain, 3),
+                [{ x: 0, y: 0, data: [{ x: 0, y: 0, asdf: 'YO' }] }],
+                'data at origin'
             );
             assert.deepEqual(
-                getBinnedData([{x:3,y:5, asdf:"YO"}], plotDomain, 5),
-                [{x:2, y:4, data:[{x:3, y:5, asdf:"YO"}]}],
-                "data in middle"
+                getBinnedData([{ x: 3, y: 5, asdf: 'YO' }], plotDomain, 5),
+                [{ x: 2, y: 4, data: [{ x: 3, y: 5, asdf: 'YO' }] }],
+                'data in middle'
             );
         });
-        it("returns the correct result for one data per bin for several bins", ()=>{
+        it('returns the correct result for one data per bin for several bins', () => {
             assert.deepEqual(
-                _.sortBy(getBinnedData([
-                    {x:1, y:2, asdf:"YO1"},{x:7, y:1, asdf:"YO2"},{x:3, y:4, asdf:"YO3"},{x:0, y:9, asdf:"YO4"},
-                    {x:6, y:2, asdf:"YO5"},{x:8, y:1, asdf:"YO6"},{x:7, y:5, asdf:"YO7"},{x:4, y:4, asdf:"YO8"}
-                ], plotDomain, 5)),
-                [{x:0, y:2, data: [{x:1, y:2, asdf:"YO1"}]},
-                    {x:6, y:0, data:[{x:7, y:1, asdf:"YO2"}]},
-                    {x:2, y:4, data:[{x:3, y:4, asdf:"YO3"}]},
-                    {x:0, y:8, data:[{x:0, y:9, asdf:"YO4"}]},
-                    {x:6, y:2, data:[{x:6, y:2, asdf:"YO5"}]},
-                    {x:8, y:0, data:[{x:8, y:1, asdf:"YO6"}]},
-                    {x:6, y:4, data:[{x:7, y:5, asdf:"YO7"}]},
-                    {x:4, y:4, data:[{x:4, y:4, asdf:"YO8"}]}
+                _.sortBy(
+                    getBinnedData(
+                        [
+                            { x: 1, y: 2, asdf: 'YO1' },
+                            { x: 7, y: 1, asdf: 'YO2' },
+                            { x: 3, y: 4, asdf: 'YO3' },
+                            { x: 0, y: 9, asdf: 'YO4' },
+                            { x: 6, y: 2, asdf: 'YO5' },
+                            { x: 8, y: 1, asdf: 'YO6' },
+                            { x: 7, y: 5, asdf: 'YO7' },
+                            { x: 4, y: 4, asdf: 'YO8' },
+                        ],
+                        plotDomain,
+                        5
+                    )
+                ),
+                [
+                    { x: 0, y: 2, data: [{ x: 1, y: 2, asdf: 'YO1' }] },
+                    { x: 6, y: 0, data: [{ x: 7, y: 1, asdf: 'YO2' }] },
+                    { x: 2, y: 4, data: [{ x: 3, y: 4, asdf: 'YO3' }] },
+                    { x: 0, y: 8, data: [{ x: 0, y: 9, asdf: 'YO4' }] },
+                    { x: 6, y: 2, data: [{ x: 6, y: 2, asdf: 'YO5' }] },
+                    { x: 8, y: 0, data: [{ x: 8, y: 1, asdf: 'YO6' }] },
+                    { x: 6, y: 4, data: [{ x: 7, y: 5, asdf: 'YO7' }] },
+                    { x: 4, y: 4, data: [{ x: 4, y: 4, asdf: 'YO8' }] },
                 ]
             );
         });
-        it("returns the correct result for a bunch of data fitting into some bins", ()=>{
+        it('returns the correct result for a bunch of data fitting into some bins', () => {
             assert.deepEqual(
-                _.sortBy(getBinnedData([
-                    {x:1, y:2, asdf:"YO1"},{x:0, y:2, asdf:"YO2"},{x:3, y:4, asdf:"YO3"},{x:0, y:9, asdf:"YO4"},
-                    {x:1, y:9, asdf:"YO5"},{x:1, y:8, asdf:"YO6"},{x:7, y:5, asdf:"YO7"},{x:4, y:4, asdf:"YO8"}
-                ], plotDomain, 5)),
-                [{x:0, y:2, data: [{x:1, y:2, asdf:"YO1"},{x:0, y:2, asdf:"YO2"}]},
-                    {x:2, y:4, data:[{x:3, y:4, asdf:"YO3"}]},
-                    {x:0, y:8, data:[{x:0, y:9, asdf:"YO4"},{x:1, y:9, asdf:"YO5"},{x:1, y:8, asdf:"YO6"}]},
-                    {x:6, y:4, data:[{x:7, y:5, asdf:"YO7"}]},
-                    {x:4, y:4, data:[{x:4, y:4, asdf:"YO8"}]}
+                _.sortBy(
+                    getBinnedData(
+                        [
+                            { x: 1, y: 2, asdf: 'YO1' },
+                            { x: 0, y: 2, asdf: 'YO2' },
+                            { x: 3, y: 4, asdf: 'YO3' },
+                            { x: 0, y: 9, asdf: 'YO4' },
+                            { x: 1, y: 9, asdf: 'YO5' },
+                            { x: 1, y: 8, asdf: 'YO6' },
+                            { x: 7, y: 5, asdf: 'YO7' },
+                            { x: 4, y: 4, asdf: 'YO8' },
+                        ],
+                        plotDomain,
+                        5
+                    )
+                ),
+                [
+                    {
+                        x: 0,
+                        y: 2,
+                        data: [
+                            { x: 1, y: 2, asdf: 'YO1' },
+                            { x: 0, y: 2, asdf: 'YO2' },
+                        ],
+                    },
+                    { x: 2, y: 4, data: [{ x: 3, y: 4, asdf: 'YO3' }] },
+                    {
+                        x: 0,
+                        y: 8,
+                        data: [
+                            { x: 0, y: 9, asdf: 'YO4' },
+                            { x: 1, y: 9, asdf: 'YO5' },
+                            { x: 1, y: 8, asdf: 'YO6' },
+                        ],
+                    },
+                    { x: 6, y: 4, data: [{ x: 7, y: 5, asdf: 'YO7' }] },
+                    { x: 4, y: 4, data: [{ x: 4, y: 4, asdf: 'YO8' }] },
                 ]
             );
         });
     });
-});
\ No newline at end of file
+});
diff --git a/src/pages/studyView/charts/scatterPlot/StudyViewScatterPlotUtils.ts b/src/pages/studyView/charts/scatterPlot/StudyViewScatterPlotUtils.ts
index 2e63ecb372e..deff53409a3 100644
--- a/src/pages/studyView/charts/scatterPlot/StudyViewScatterPlotUtils.ts
+++ b/src/pages/studyView/charts/scatterPlot/StudyViewScatterPlotUtils.ts
@@ -1,93 +1,124 @@
-import {downsampleByGrouping, DSData} from "../../../../shared/components/plots/downsampleByGrouping";
-import _ from "lodash";
-import { SampleIdentifier } from "shared/api/generated/CBioPortalAPIInternal";
-import { AnalysisGroup } from "pages/studyView/StudyViewUtils";
-import { ClinicalAttribute } from "shared/api/generated/CBioPortalAPI";
-
+import {
+    downsampleByGrouping,
+    DSData,
+} from '../../../../shared/components/plots/downsampleByGrouping';
+import _ from 'lodash';
+import { SampleIdentifier } from 'shared/api/generated/CBioPortalAPIInternal';
+import { AnalysisGroup } from 'pages/studyView/StudyViewUtils';
+import { ClinicalAttribute } from 'shared/api/generated/CBioPortalAPI';
 
 export interface IStudyViewScatterPlotData {
-    x:number;
-    y:number;
-    uniqueSampleKey:string;
-    studyId:string;
-    sampleId:string;
-    patientId:string;
+    x: number;
+    y: number;
+    uniqueSampleKey: string;
+    studyId: string;
+    sampleId: string;
+    patientId: string;
 }
 
 export interface IStudyViewScatterPlotProps {
-    width:number;
-    height:number;
-    data:IStudyViewScatterPlotData[]
-    onSelection:(sampleIdentifiers:SampleIdentifier[], keepCurrent:boolean)=>void;
+    width: number;
+    height: number;
+    data: IStudyViewScatterPlotData[];
+    onSelection: (
+        sampleIdentifiers: SampleIdentifier[],
+        keepCurrent: boolean
+    ) => void;
 
-    isLoading?:boolean;
-    svgRef?:(svg:SVGElement|null)=>void;
-    tooltip?:(d:DSData<IStudyViewScatterPlotData>)=>JSX.Element;
+    isLoading?: boolean;
+    svgRef?: (svg: SVGElement | null) => void;
+    tooltip?: (d: DSData<IStudyViewScatterPlotData>) => JSX.Element;
     axisLabelX?: string;
     axisLabelY?: string;
-    title?:string;
+    title?: string;
 
-    sampleToAnalysisGroup:{[uniqueSampleKey:string]:string};
-    analysisGroups:ReadonlyArray<AnalysisGroup>; // identified by `value`
-    analysisClinicalAttribute?:ClinicalAttribute;
+    sampleToAnalysisGroup: { [uniqueSampleKey: string]: string };
+    analysisGroups: ReadonlyArray<AnalysisGroup>; // identified by `value`
+    analysisClinicalAttribute?: ClinicalAttribute;
 }
 
-
 export const DOWNSAMPLE_PIXEL_DISTANCE_THRESHOLD = 4;
 export const MAX_DOT_SIZE = 5;
 
 export function getDownsampledData(
-    data:IStudyViewScatterPlotProps["data"],
-    dataSpaceToPixelSpace:{x:(val:number)=>number, y:(val:number)=>number},
-):DSData<IStudyViewScatterPlotData>[];
+    data: IStudyViewScatterPlotProps['data'],
+    dataSpaceToPixelSpace: {
+        x: (val: number) => number;
+        y: (val: number) => number;
+    }
+): DSData<IStudyViewScatterPlotData>[];
 
 export function getDownsampledData(
-    data:IStudyViewScatterPlotProps["data"],
-    dataSpaceToPixelSpace:{x:(val:number)=>number, y:(val:number)=>number},
-    sampleToAnalysisGroup:IStudyViewScatterPlotProps["sampleToAnalysisGroup"]
-):{[groupVal:string]:DSData<IStudyViewScatterPlotData>[]};
+    data: IStudyViewScatterPlotProps['data'],
+    dataSpaceToPixelSpace: {
+        x: (val: number) => number;
+        y: (val: number) => number;
+    },
+    sampleToAnalysisGroup: IStudyViewScatterPlotProps['sampleToAnalysisGroup']
+): { [groupVal: string]: DSData<IStudyViewScatterPlotData>[] };
 
 export function getDownsampledData(
-    data:IStudyViewScatterPlotProps["data"],
-    dataSpaceToPixelSpace:{x:(val:number)=>number, y:(val:number)=>number},
-    sampleToAnalysisGroup?:IStudyViewScatterPlotProps["sampleToAnalysisGroup"]
+    data: IStudyViewScatterPlotProps['data'],
+    dataSpaceToPixelSpace: {
+        x: (val: number) => number;
+        y: (val: number) => number;
+    },
+    sampleToAnalysisGroup?: IStudyViewScatterPlotProps['sampleToAnalysisGroup']
 ) {
     if (sampleToAnalysisGroup) {
         // group data by analysis group
-        const groupedData = _.groupBy(data, d=>sampleToAnalysisGroup[d.uniqueSampleKey]);
+        const groupedData = _.groupBy(
+            data,
+            d => sampleToAnalysisGroup[d.uniqueSampleKey]
+        );
         // downsample, and sort by number of points in the downsample group
-        const downsampledGroups = _.mapValues(groupedData, dataForGroup=>{
-            return _.sortBy(downsampleByGrouping(dataForGroup, DOWNSAMPLE_PIXEL_DISTANCE_THRESHOLD, dataSpaceToPixelSpace), d=>d.data.length);
+        const downsampledGroups = _.mapValues(groupedData, dataForGroup => {
+            return _.sortBy(
+                downsampleByGrouping(
+                    dataForGroup,
+                    DOWNSAMPLE_PIXEL_DISTANCE_THRESHOLD,
+                    dataSpaceToPixelSpace
+                ),
+                d => d.data.length
+            );
         });
         return downsampledGroups;
     } else {
         // downsample, and sort by number of points in the downsample group
-        return _.sortBy(downsampleByGrouping(data, DOWNSAMPLE_PIXEL_DISTANCE_THRESHOLD, dataSpaceToPixelSpace), d=>d.data.length);
+        return _.sortBy(
+            downsampleByGrouping(
+                data,
+                DOWNSAMPLE_PIXEL_DISTANCE_THRESHOLD,
+                dataSpaceToPixelSpace
+            ),
+            d => d.data.length
+        );
     }
 }
 
-export function getBinnedData<D extends {x:number, y:number}>(
-    unbinnedData:D[],
-    plotDomain:{x:[number,number], y:[number,number]},
-    mesh:number
-):DSData<D>[] {
-    const X_STEP = (plotDomain.x[1] - plotDomain.x[0])/mesh;
-    const Y_STEP = (plotDomain.y[1] - plotDomain.y[0])/mesh;
-    const getGridCoords = (d:{x:number, y:number})=>{
-        const x = Math.floor((d.x - plotDomain.x[0])/X_STEP);
-        const y = Math.floor((d.y - plotDomain.y[0])/Y_STEP);
+export function getBinnedData<D extends { x: number; y: number }>(
+    unbinnedData: D[],
+    plotDomain: { x: [number, number]; y: [number, number] },
+    mesh: number
+): DSData<D>[] {
+    const X_STEP = (plotDomain.x[1] - plotDomain.x[0]) / mesh;
+    const Y_STEP = (plotDomain.y[1] - plotDomain.y[0]) / mesh;
+    const getGridCoords = (d: { x: number; y: number }) => {
+        const x = Math.floor((d.x - plotDomain.x[0]) / X_STEP);
+        const y = Math.floor((d.y - plotDomain.y[0]) / Y_STEP);
         return { x, y };
     };
 
-    const getAreaHash = (gridCoords:{x:number, y:number})=>`${gridCoords.x},${gridCoords.y}`;
+    const getAreaHash = (gridCoords: { x: number; y: number }) =>
+        `${gridCoords.x},${gridCoords.y}`;
 
-    const bins = _.groupBy(unbinnedData, d=>getAreaHash(getGridCoords(d)));
-    return _.values(bins).map(data=>{
+    const bins = _.groupBy(unbinnedData, d => getAreaHash(getGridCoords(d)));
+    return _.values(bins).map(data => {
         const gridCoords = getGridCoords(data[0]);
         return {
-            x: gridCoords.x*X_STEP,
-            y: gridCoords.y*Y_STEP,
-            data
+            x: gridCoords.x * X_STEP,
+            y: gridCoords.y * Y_STEP,
+            data,
         };
     });
-}
\ No newline at end of file
+}
diff --git a/src/pages/studyView/charts/styles.module.scss b/src/pages/studyView/charts/styles.module.scss
index 9f6b456366b..b0aaf37bd6f 100644
--- a/src/pages/studyView/charts/styles.module.scss
+++ b/src/pages/studyView/charts/styles.module.scss
@@ -4,7 +4,7 @@
     position: relative;
     display: flex;
     height: 100%;
-    border-radius:$border-radius-base;
+    border-radius: $border-radius-base;
     background: white;
 
     &.highlight {
@@ -12,7 +12,6 @@
     }
 }
 
-
 .chartHeightOne {
     height: 195px;
 }
@@ -22,20 +21,19 @@
 }
 
 .chartWidthOne {
-    width:195px;
+    width: 195px;
 }
 
 .chartWidthTwo {
-    width:400px;
+    width: 400px;
 }
 
 .chartLoader {
-    position:absolute;
-    top:50%;
-    left:50%;
+    position: absolute;
+    top: 50%;
+    left: 50%;
     transform: translate(-50%, -50%);
     > div {
-        margin-left:0px !important;
+        margin-left: 0px !important;
     }
-
-}
\ No newline at end of file
+}
diff --git a/src/pages/studyView/charts/survival/StudyViewSurvivalUtils.ts b/src/pages/studyView/charts/survival/StudyViewSurvivalUtils.ts
index d159bdf4e45..cafd1cc7613 100644
--- a/src/pages/studyView/charts/survival/StudyViewSurvivalUtils.ts
+++ b/src/pages/studyView/charts/survival/StudyViewSurvivalUtils.ts
@@ -1,20 +1,22 @@
-import {PatientSurvival} from "../../../../shared/model/PatientSurvival";
-import {IChartContainerProps} from "../ChartContainer";
-import {AnalysisGroup} from "../../StudyViewUtils";
-import _ from "lodash";
+import { PatientSurvival } from '../../../../shared/model/PatientSurvival';
+import { IChartContainerProps } from '../ChartContainer';
+import { AnalysisGroup } from '../../StudyViewUtils';
+import _ from 'lodash';
 
 export function makeSurvivalChartData(
     patientSurvivals: ReadonlyArray<PatientSurvival>,
     analysisGroups: ReadonlyArray<AnalysisGroup>,
-    patientToAnalysisGroup: {[uniquePatientKey:string]:string}
+    patientToAnalysisGroup: { [uniquePatientKey: string]: string }
 ) {
-    let patientToAnalysisGroups = _.mapValues(patientToAnalysisGroup, group => [group])
+    let patientToAnalysisGroups = _.mapValues(patientToAnalysisGroup, group => [
+        group,
+    ]);
 
     return {
-        patientToAnalysisGroups, patientSurvivals, analysisGroups
+        patientToAnalysisGroups,
+        patientSurvivals,
+        analysisGroups,
     };
 }
 
-export function makeScatterPlotData(
-) {
-}
\ No newline at end of file
+export function makeScatterPlotData() {}
diff --git a/src/pages/studyView/filters/groupLogic/GroupLogic.tsx b/src/pages/studyView/filters/groupLogic/GroupLogic.tsx
index 586a1774bed..2d42b039279 100644
--- a/src/pages/studyView/filters/groupLogic/GroupLogic.tsx
+++ b/src/pages/studyView/filters/groupLogic/GroupLogic.tsx
@@ -1,14 +1,14 @@
 import * as React from 'react';
 import * as _ from 'lodash';
-import {observer} from "mobx-react";
-import {computed} from 'mobx';
-import styles from "./styles.module.scss";
+import { observer } from 'mobx-react';
+import { computed } from 'mobx';
+import styles from './styles.module.scss';
 import classnames from 'classnames';
 
 export interface IGroupLogicProps {
-    components: JSX.Element[],
-    operation: string,
-    group: boolean,
+    components: JSX.Element[];
+    operation: string;
+    group: boolean;
 }
 
 @observer
@@ -17,25 +17,38 @@ export class GroupLogic extends React.Component<IGroupLogicProps, {}> {
     get child() {
         let elements = [];
         if (this.props.group) {
-            elements.push(<span className={classnames(styles.text, styles.mostLeft)}>(</span>);
+            elements.push(
+                <span className={classnames(styles.text, styles.mostLeft)}>
+                    (
+                </span>
+            );
         }
-        _.reduce(this.props.components, (acc, next, index): any => {
+        _.reduce(
+            this.props.components,
+            (acc, next, index): any => {
                 if (index > 0) {
-                    acc.push(<span className={styles.text}>{this.props.operation}</span>);
+                    acc.push(
+                        <span className={styles.text}>
+                            {this.props.operation}
+                        </span>
+                    );
                 }
                 acc.push(next);
                 return acc;
-            }, elements
+            },
+            elements
         );
         if (this.props.group) {
-            elements.push(<span className={classnames(styles.text, styles.mostRight)}>)</span>);
+            elements.push(
+                <span className={classnames(styles.text, styles.mostRight)}>
+                    )
+                </span>
+            );
         }
         return elements;
     }
 
     render() {
-        return <div className={styles.main}>{
-            this.child
-        }</div>;
-    };
+        return <div className={styles.main}>{this.child}</div>;
+    }
 }
diff --git a/src/pages/studyView/filters/groupLogic/styles.module.scss b/src/pages/studyView/filters/groupLogic/styles.module.scss
index 121babc3f7d..add297844fc 100644
--- a/src/pages/studyView/filters/groupLogic/styles.module.scss
+++ b/src/pages/studyView/filters/groupLogic/styles.module.scss
@@ -15,4 +15,4 @@
 
 .mostRight {
     margin-right: 0;
-}
\ No newline at end of file
+}
diff --git a/src/pages/studyView/infoBanner/SuccessBanner.tsx b/src/pages/studyView/infoBanner/SuccessBanner.tsx
index cf51f90faab..944869bcc10 100644
--- a/src/pages/studyView/infoBanner/SuccessBanner.tsx
+++ b/src/pages/studyView/infoBanner/SuccessBanner.tsx
@@ -1,20 +1,25 @@
 import * as React from 'react';
-import {observer} from "mobx-react";
+import { observer } from 'mobx-react';
 
 export interface ISuccessBannerProps {
-    message:string;
+    message: string;
 }
 
-
 @observer
-export default class SuccessBanner extends React.Component<ISuccessBannerProps, {}> {
+export default class SuccessBanner extends React.Component<
+    ISuccessBannerProps,
+    {}
+> {
     render() {
         return (
-            <div className='alert alert-success' style={{marginTop: '10px', marginBottom: '0'}}>
+            <div
+                className="alert alert-success"
+                style={{ marginTop: '10px', marginBottom: '0' }}
+            >
                 <span>
-                    <i className='fa fa-md fa-check'/> {this.props.message}
+                    <i className="fa fa-md fa-check" /> {this.props.message}
                 </span>
             </div>
         );
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/studyView/oncokb/OncoKBUtils.tsx b/src/pages/studyView/oncokb/OncoKBUtils.tsx
index b6f649b1b08..f1a50121427 100644
--- a/src/pages/studyView/oncokb/OncoKBUtils.tsx
+++ b/src/pages/studyView/oncokb/OncoKBUtils.tsx
@@ -1,11 +1,17 @@
-import * as React from "react";
-import {If, Then, Else} from 'react-if';
+import * as React from 'react';
+import { If, Then, Else } from 'react-if';
 
-const oncoKbImg = require("shared/components/annotation/images/oncogenic-only.svg");
+const oncoKbImg = require('shared/components/annotation/images/oncogenic-only.svg');
 
-const ONCOKB_URL = "https://oncokb.org";
+const ONCOKB_URL = 'https://oncokb.org';
 
-export function getOncoKBReferenceInfo(hugoGeneSymbol: string, isCancerGene: boolean, oncokbAnnotated: boolean, isOncogene: boolean, isTumorSuppressorGene: boolean): JSX.Element | undefined {
+export function getOncoKBReferenceInfo(
+    hugoGeneSymbol: string,
+    isCancerGene: boolean,
+    oncokbAnnotated: boolean,
+    isOncogene: boolean,
+    isTumorSuppressorGene: boolean
+): JSX.Element | undefined {
     if (isCancerGene) {
         let content = '';
 
@@ -20,32 +26,41 @@ export function getOncoKBReferenceInfo(hugoGeneSymbol: string, isCancerGene: boo
             }
             content = `${content} ${subContent.join(' and ')}`;
         }
-        return <span>
-            <If condition={oncokbAnnotated}>
-                <Then>
-                    <a href={`${ONCOKB_URL}/gene/${hugoGeneSymbol}`} target="_blank">
-                        {hugoGeneSymbol}
-                    </a>
-                </Then>
-                <Else>
-                    <span>{hugoGeneSymbol}</span>
-                </Else>
-            </If>
-            <span> is included in the </span>
-            {getOncoKBCancerGeneListLinkout()}
-            {(isOncogene || isTumorSuppressorGene) && (
-                <span>{content}</span>
-            )}
-            .
-        </span>
+        return (
+            <span>
+                <If condition={oncokbAnnotated}>
+                    <Then>
+                        <a
+                            href={`${ONCOKB_URL}/gene/${hugoGeneSymbol}`}
+                            target="_blank"
+                        >
+                            {hugoGeneSymbol}
+                        </a>
+                    </Then>
+                    <Else>
+                        <span>{hugoGeneSymbol}</span>
+                    </Else>
+                </If>
+                <span> is included in the </span>
+                {getOncoKBCancerGeneListLinkout()}
+                {(isOncogene || isTumorSuppressorGene) && (
+                    <span>{content}</span>
+                )}
+                .
+            </span>
+        );
     }
     return undefined;
 }
 
 export function getOncoKBCancerGeneListLinkout() {
-    return <a href={`${ONCOKB_URL}/cancerGenes`} target="_blank">OncoKB Cancer Gene List</a>;
+    return (
+        <a href={`${ONCOKB_URL}/cancerGenes`} target="_blank">
+            OncoKB Cancer Gene List
+        </a>
+    );
 }
 
 export function getOncoKbImage() {
-    return <img src={oncoKbImg} alt='OncoKB Oncogenic Symbol' />;
+    return <img src={oncoKbImg} alt="OncoKB Oncogenic Symbol" />;
 }
diff --git a/src/pages/studyView/studyPageHeader/ActionButtons.tsx b/src/pages/studyView/studyPageHeader/ActionButtons.tsx
index 5c4b9657433..5ab65c7bcfb 100644
--- a/src/pages/studyView/studyPageHeader/ActionButtons.tsx
+++ b/src/pages/studyView/studyPageHeader/ActionButtons.tsx
@@ -1,18 +1,18 @@
 import * as React from 'react';
 import * as _ from 'lodash';
-import {observer} from "mobx-react";
-import {action, computed, observable} from 'mobx';
-import styles from "../styles.module.scss";
-import autobind from "autobind-decorator";
-import {getPatientViewUrl} from 'shared/api/urls';
-import {DefaultTooltip} from 'cbioportal-frontend-commons';
+import { observer } from 'mobx-react';
+import { action, computed, observable } from 'mobx';
+import styles from '../styles.module.scss';
+import autobind from 'autobind-decorator';
+import { getPatientViewUrl } from 'shared/api/urls';
+import { DefaultTooltip } from 'cbioportal-frontend-commons';
 import VirtualStudy from 'pages/studyView/virtualStudy/VirtualStudy';
 import fileDownload from 'react-file-download';
-import {Else, If, Then} from 'react-if';
-import {StudyViewPageStore} from 'pages/studyView/StudyViewPageStore';
-import classNames from "classnames";
-import {AppStore} from "../../../AppStore";
-import {serializeEvent} from "../../../shared/lib/tracking";
+import { Else, If, Then } from 'react-if';
+import { StudyViewPageStore } from 'pages/studyView/StudyViewPageStore';
+import classNames from 'classnames';
+import { AppStore } from '../../../AppStore';
+import { serializeEvent } from '../../../shared/lib/tracking';
 
 export interface ActionButtonsProps {
     loadingComplete: boolean;
@@ -21,8 +21,10 @@ export interface ActionButtonsProps {
 }
 
 @observer
-export default class ActionButtons extends React.Component<ActionButtonsProps, {}> {
-
+export default class ActionButtons extends React.Component<
+    ActionButtonsProps,
+    {}
+> {
     @observable downloadingData = false;
     @observable showDownloadErrorMessage = false;
 
@@ -30,13 +32,19 @@ export default class ActionButtons extends React.Component<ActionButtonsProps, {
     private initiateDownload() {
         this.downloadingData = true;
         this.showDownloadErrorMessage = false;
-        this.props.store.getDownloadDataPromise().then(text => {
-            this.downloadingData = false;
-            fileDownload(text, this.props.store.clinicalDataDownloadFilename);
-        }).catch(() => {
-            this.downloadingData = false;
-            this.showDownloadErrorMessage = true;
-        });
+        this.props.store
+            .getDownloadDataPromise()
+            .then(text => {
+                this.downloadingData = false;
+                fileDownload(
+                    text,
+                    this.props.store.clinicalDataDownloadFilename
+                );
+            })
+            .catch(() => {
+                this.downloadingData = false;
+                this.showDownloadErrorMessage = true;
+            });
     }
 
     @autobind
@@ -44,23 +52,38 @@ export default class ActionButtons extends React.Component<ActionButtonsProps, {
         if (!_.isEmpty(this.props.store.selectedPatients)) {
             const firstPatient = this.props.store.selectedPatients[0];
 
-            let navCaseIds = _.map(this.props.store.selectedPatients, patient => {
-                return {patientId: patient.patientId, studyId: patient.studyId}
-            });
+            let navCaseIds = _.map(
+                this.props.store.selectedPatients,
+                patient => {
+                    return {
+                        patientId: patient.patientId,
+                        studyId: patient.studyId,
+                    };
+                }
+            );
 
-            window.open(getPatientViewUrl(firstPatient.studyId, firstPatient.patientId, navCaseIds));
+            window.open(
+                getPatientViewUrl(
+                    firstPatient.studyId,
+                    firstPatient.patientId,
+                    navCaseIds
+                )
+            );
         }
     }
 
     @computed
     get virtualStudyButtonTooltip() {
-        return ((!this.props.appStore.isLoggedIn) ? '' : 'Save/') + 'Share Virtual Study';
+        return (
+            (!this.props.appStore.isLoggedIn ? '' : 'Save/') +
+            'Share Virtual Study'
+        );
     }
 
     @computed
     get downloadButtonTooltip() {
         if (this.showDownloadErrorMessage) {
-            return "An error occurred while downloading the data. Please try again.";
+            return 'An error occurred while downloading the data. Please try again.';
         }
         return 'Download clinical data for the selected cases';
     }
@@ -68,32 +91,48 @@ export default class ActionButtons extends React.Component<ActionButtonsProps, {
     @computed
     get virtualStudy(): JSX.Element | null {
         if (this.props.loadingComplete) {
-            return <VirtualStudy
-                user={this.props.appStore.userName}
-                name={this.props.store.isSingleVirtualStudyPageWithoutFilter ? this.props.store.filteredVirtualStudies.result[0].data.name : undefined}
-                description={this.props.store.isSingleVirtualStudyPageWithoutFilter ? this.props.store.filteredVirtualStudies.result[0].data.description : undefined}
-                studyWithSamples={this.props.store.studyWithSamples.result}
-                selectedSamples={this.props.store.selectedSamples.result}
-                filter={this.props.store.userSelections}
-                attributesMetaSet={this.props.store.chartMetaSet}
-            />
+            return (
+                <VirtualStudy
+                    user={this.props.appStore.userName}
+                    name={
+                        this.props.store.isSingleVirtualStudyPageWithoutFilter
+                            ? this.props.store.filteredVirtualStudies.result[0]
+                                  .data.name
+                            : undefined
+                    }
+                    description={
+                        this.props.store.isSingleVirtualStudyPageWithoutFilter
+                            ? this.props.store.filteredVirtualStudies.result[0]
+                                  .data.description
+                            : undefined
+                    }
+                    studyWithSamples={this.props.store.studyWithSamples.result}
+                    selectedSamples={this.props.store.selectedSamples.result}
+                    filter={this.props.store.userSelections}
+                    attributesMetaSet={this.props.store.chartMetaSet}
+                />
+            );
         }
         return null;
     }
 
-    render() {       
+    render() {
         return (
-            <div className={classNames(styles.actionButtons, "btn-group")}>
-
+            <div className={classNames(styles.actionButtons, 'btn-group')}>
                 <DefaultTooltip
-                    trigger={["hover"]}
-                    placement={"top"}
+                    trigger={['hover']}
+                    placement={'top'}
                     overlay={<span>View selected cases</span>}
                 >
                     <button
                         className="btn btn-default btn-sm"
                         onClick={this.openCases}
-                        data-event={serializeEvent({category:"studyPage", action:"viewPatientCohort", label:this.props.store.queriedPhysicalStudyIds.result})}
+                        data-event={serializeEvent({
+                            category: 'studyPage',
+                            action: 'viewPatientCohort',
+                            label: this.props.store.queriedPhysicalStudyIds
+                                .result,
+                        })}
                     >
                         <i className="fa fa-user-circle-o"></i>
                     </button>
@@ -106,7 +145,7 @@ export default class ActionButtons extends React.Component<ActionButtonsProps, {
                     placement="bottom"
                 >
                     <DefaultTooltip
-                        placement={"top"}
+                        placement={'top'}
                         trigger={['hover']}
                         overlay={<span>{this.virtualStudyButtonTooltip}</span>}
                     >
@@ -120,8 +159,8 @@ export default class ActionButtons extends React.Component<ActionButtonsProps, {
                 </DefaultTooltip>
 
                 <DefaultTooltip
-                    trigger={["hover"]}
-                    placement={"top"}
+                    trigger={['hover']}
+                    placement={'top'}
                     overlay={<span>{this.downloadButtonTooltip}</span>}
                 >
                     <button
@@ -129,22 +168,23 @@ export default class ActionButtons extends React.Component<ActionButtonsProps, {
                         disabled={!this.props.loadingComplete}
                         onClick={this.initiateDownload}
                         data-event={serializeEvent({
-                            category:"studyPage",
-                            action:"dataDownload",
-                            label:this.props.store.queriedPhysicalStudyIds.result
+                            category: 'studyPage',
+                            action: 'dataDownload',
+                            label: this.props.store.queriedPhysicalStudyIds
+                                .result,
                         })}
                     >
-                            <If condition={this.downloadingData}>
-                                <Then>
-                                    <i className="fa fa-spinner fa-spin"></i>
-                                </Then>
-                                <Else>
-                                    <i className="fa fa-download"></i>
-                                </Else>
-                            </If>
+                        <If condition={this.downloadingData}>
+                            <Then>
+                                <i className="fa fa-spinner fa-spin"></i>
+                            </Then>
+                            <Else>
+                                <i className="fa fa-download"></i>
+                            </Else>
+                        </If>
                     </button>
                 </DefaultTooltip>
             </div>
-        )
+        );
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/studyView/studyPageHeader/StudyPageHeader.tsx b/src/pages/studyView/studyPageHeader/StudyPageHeader.tsx
index 5e9acbcde45..cf23a5de123 100644
--- a/src/pages/studyView/studyPageHeader/StudyPageHeader.tsx
+++ b/src/pages/studyView/studyPageHeader/StudyPageHeader.tsx
@@ -1,55 +1,87 @@
 import * as React from 'react';
-import {observer} from "mobx-react";
-import {StudyViewPageStore} from 'pages/studyView/StudyViewPageStore';
-import RightPanel from "./rightPanel/RightPanel";
-import StudySummary from "./studySummary/StudySummary";
-import UserSelections from "../UserSelections";
+import { observer } from 'mobx-react';
+import { StudyViewPageStore } from 'pages/studyView/StudyViewPageStore';
+import RightPanel from './rightPanel/RightPanel';
+import StudySummary from './studySummary/StudySummary';
+import UserSelections from '../UserSelections';
 import * as _ from 'lodash';
 
-
 export interface IStudyPageHeaderProps {
-    store: StudyViewPageStore,
+    store: StudyViewPageStore;
 }
 
 @observer
-export default class StudyPageHeader extends React.Component<IStudyPageHeaderProps, {}> {
+export default class StudyPageHeader extends React.Component<
+    IStudyPageHeaderProps,
+    {}
+> {
     render() {
         return (
             <div className={'headBlock'} data-test="study-view-header">
                 {_.keys(this.props.store.pageStatusMessages).length > 0 && (
                     <div>
-                        {_.values(this.props.store.pageStatusMessages).map(statusMessage => <div
-                            className={`alert alert-${statusMessage.status}`}>{statusMessage.message}</div>)}
+                        {_.values(this.props.store.pageStatusMessages).map(
+                            statusMessage => (
+                                <div
+                                    className={`alert alert-${statusMessage.status}`}
+                                >
+                                    {statusMessage.message}
+                                </div>
+                            )
+                        )}
                     </div>
                 )}
-                <div style={{display: 'flex'}}>
-                <StudySummary
-                    hasRawDataForDownload={this.props.store.hasRawDataForDownload.result}
-                    studies={this.props.store.displayedStudies.result}
-                    originStudies={this.props.store.originStudies}
-                    showOriginStudiesInSummaryDescription={this.props.store.showOriginStudiesInSummaryDescription}
-                />
-                <RightPanel
-                    store={this.props.store}/>
+                <div style={{ display: 'flex' }}>
+                    <StudySummary
+                        hasRawDataForDownload={
+                            this.props.store.hasRawDataForDownload.result
+                        }
+                        studies={this.props.store.displayedStudies.result}
+                        originStudies={this.props.store.originStudies}
+                        showOriginStudiesInSummaryDescription={
+                            this.props.store
+                                .showOriginStudiesInSummaryDescription
+                        }
+                    />
+                    <RightPanel store={this.props.store} />
                 </div>
 
-                {this.props.store.clinicalAttributeIdToDataType.isComplete &&
+                {this.props.store.clinicalAttributeIdToDataType.isComplete && (
                     <UserSelections
                         filter={this.props.store.userSelections}
-                        comparisonGroupSelection={this.props.store.filterComparisonGroups}
-                        numberOfSelectedSamplesInCustomSelection={this.props.store.numberOfSelectedSamplesInCustomSelection}
+                        comparisonGroupSelection={
+                            this.props.store.filterComparisonGroups
+                        }
+                        numberOfSelectedSamplesInCustomSelection={
+                            this.props.store
+                                .numberOfSelectedSamplesInCustomSelection
+                        }
                         customChartsFilter={this.props.store.customChartFilterSet.toJS()}
-                        attributesMetaSet={this.props.store.chartMetaSetWithChartType}
-                        clinicalAttributeIdToDataType={this.props.store.clinicalAttributeIdToDataType.result!}
-                        updateClinicalDataFilterByValues={this.props.store.updateClinicalDataFilterByValues}
-                        updateCustomChartFilter={this.props.store.setCustomChartFilters}
+                        attributesMetaSet={
+                            this.props.store.chartMetaSetWithChartType
+                        }
+                        clinicalAttributeIdToDataType={
+                            this.props.store.clinicalAttributeIdToDataType
+                                .result!
+                        }
+                        updateClinicalDataFilterByValues={
+                            this.props.store.updateClinicalDataFilterByValues
+                        }
+                        updateCustomChartFilter={
+                            this.props.store.setCustomChartFilters
+                        }
                         removeGeneFilter={this.props.store.removeGeneFilter}
-                        removeCustomSelectionFilter={this.props.store.removeCustomSelectFilter}
-                        removeComparisonGroupSelectionFilter={this.props.store.removeComparisonGroupSelectionFilter}
+                        removeCustomSelectionFilter={
+                            this.props.store.removeCustomSelectFilter
+                        }
+                        removeComparisonGroupSelectionFilter={
+                            this.props.store
+                                .removeComparisonGroupSelectionFilter
+                        }
                         clearAllFilters={this.props.store.clearAllFilters}
                     />
-                }
+                )}
             </div>
-        )
+        );
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/studyView/studyPageHeader/rightPanel/RightPanel.tsx b/src/pages/studyView/studyPageHeader/rightPanel/RightPanel.tsx
index 3383d1a24ee..1127a3cc8b4 100644
--- a/src/pages/studyView/studyPageHeader/rightPanel/RightPanel.tsx
+++ b/src/pages/studyView/studyPageHeader/rightPanel/RightPanel.tsx
@@ -57,13 +57,13 @@ export default class RightPanel extends React.Component<IRightPanelProps, {}> {
         return (
             <div className="studyViewSummaryHeader">
                 <div className={styles.rightPanel}>
-                    <div className={"small"}>
-                    <OQLTextArea
-                        inputGeneQuery={this.props.store.geneQueryStr}
-                        validateInputGeneQuery={false}
-                        callback={this.updateSelectedGenes}
-                        location={GeneBoxType.STUDY_VIEW_PAGE}
-                    />
+                    <div className={'small'}>
+                        <OQLTextArea
+                            inputGeneQuery={this.props.store.geneQueryStr}
+                            validateInputGeneQuery={false}
+                            callback={this.updateSelectedGenes}
+                            location={GeneBoxType.STUDY_VIEW_PAGE}
+                        />
                     </div>
                     <button
                         disabled={this.isQueryButtonDisabled}
diff --git a/src/pages/studyView/studyPageHeader/studySummary/StudySummary.tsx b/src/pages/studyView/studyPageHeader/studySummary/StudySummary.tsx
index 24cc8ddcd2d..5ec4143fb67 100644
--- a/src/pages/studyView/studyPageHeader/studySummary/StudySummary.tsx
+++ b/src/pages/studyView/studyPageHeader/studySummary/StudySummary.tsx
@@ -1,55 +1,79 @@
 import * as React from 'react';
-import {CancerStudy} from "../../../../shared/api/generated/CBioPortalAPI";
-import {computed, observable, action} from 'mobx';
-import {observer} from "mobx-react"
-import classnames from "classnames";
+import { CancerStudy } from '../../../../shared/api/generated/CBioPortalAPI';
+import { computed, observable, action } from 'mobx';
+import { observer } from 'mobx-react';
+import classnames from 'classnames';
 import * as _ from 'lodash';
-import styles from "../styles.module.scss";
-import {StudySummaryRecord} from "../../virtualStudy/VirtualStudy";
-import LoadingIndicator from "../../../../shared/components/loadingIndicator/LoadingIndicator";
-import {getStudySummaryUrl} from "../../../../shared/api/urls";
-import {DefaultTooltip, getNCBIlink} from "cbioportal-frontend-commons";
+import styles from '../styles.module.scss';
+import { StudySummaryRecord } from '../../virtualStudy/VirtualStudy';
+import LoadingIndicator from '../../../../shared/components/loadingIndicator/LoadingIndicator';
+import { getStudySummaryUrl } from '../../../../shared/api/urls';
+import { DefaultTooltip, getNCBIlink } from 'cbioportal-frontend-commons';
 import MobxPromise from 'mobxpromise';
-import {StudyDataDownloadLink} from "../../../../shared/components/StudyDataDownloadLink/StudyDataDownloadLink";
-import {serializeEvent} from "../../../../shared/lib/tracking";
+import { StudyDataDownloadLink } from '../../../../shared/components/StudyDataDownloadLink/StudyDataDownloadLink';
+import { serializeEvent } from '../../../../shared/lib/tracking';
 
 interface IStudySummaryProps {
-    studies: CancerStudy[],
-    hasRawDataForDownload: boolean,
-    originStudies: MobxPromise<CancerStudy[]>,
-    showOriginStudiesInSummaryDescription: boolean
+    studies: CancerStudy[];
+    hasRawDataForDownload: boolean;
+    originStudies: MobxPromise<CancerStudy[]>;
+    showOriginStudiesInSummaryDescription: boolean;
 }
 
 @observer
-export default class StudySummary extends React.Component<IStudySummaryProps, {}> {
-
+export default class StudySummary extends React.Component<
+    IStudySummaryProps,
+    {}
+> {
     @observable private showMoreDescription = false;
 
     @computed
     get name() {
-        return this.props.studies.length === 1 ? this.props.studies[0].name : 'Combined Study';
+        return this.props.studies.length === 1
+            ? this.props.studies[0].name
+            : 'Combined Study';
     }
 
     @computed
     get descriptionFirstLine() {
         if (this.props.studies.length === 1) {
-            let elems = [<span
-                dangerouslySetInnerHTML={{__html: this.props.studies[0].description.split(/\n+/g)[0]}}/>];
+            let elems = [
+                <span
+                    dangerouslySetInnerHTML={{
+                        __html: this.props.studies[0].description.split(
+                            /\n+/g
+                        )[0],
+                    }}
+                />,
+            ];
             if (this.props.studies[0].pmid) {
-                elems.push(<a target="_blank" href={getNCBIlink(`/pubmed/${this.props.studies[0].pmid}`)}
-                              style={{marginLeft: '5px'}}>PubMed</a>);
+                elems.push(
+                    <a
+                        target="_blank"
+                        href={getNCBIlink(
+                            `/pubmed/${this.props.studies[0].pmid}`
+                        )}
+                        style={{ marginLeft: '5px' }}
+                    >
+                        PubMed
+                    </a>
+                );
             }
-            return <span>{elems}</span>
+            return <span>{elems}</span>;
         } else {
-            return <span>{`This combined study contains samples from ${this.props.studies.length} studies`}</span>;
+            return (
+                <span>{`This combined study contains samples from ${this.props.studies.length} studies`}</span>
+            );
         }
     }
 
     @computed
     get hasMoreDescription() {
-        return this.props.showOriginStudiesInSummaryDescription ||
+        return (
+            this.props.showOriginStudiesInSummaryDescription ||
             this.props.studies.length > 1 ||
-            this.props.studies[0].description.split(/\n/g).length > 1;
+            this.props.studies[0].description.split(/\n/g).length > 1
+        );
     }
 
     @computed
@@ -58,17 +82,28 @@ export default class StudySummary extends React.Component<IStudySummaryProps, {}
             const lines = this.props.studies[0].description.split(/\n/g);
             if (lines.length > 1) {
                 //slice fist line as its already shown
-                return [<span style={{whiteSpace: 'pre'}}
-                              dangerouslySetInnerHTML={{__html: lines.slice(1).join('\n')}}/>]
+                return [
+                    <span
+                        style={{ whiteSpace: 'pre' }}
+                        dangerouslySetInnerHTML={{
+                            __html: lines.slice(1).join('\n'),
+                        }}
+                    />,
+                ];
             }
         } else {
             return _.map(this.props.studies, study => {
                 return (
                     <li>
-                        <a href={getStudySummaryUrl(study.studyId)} target="_blank">{study.name}</a>
+                        <a
+                            href={getStudySummaryUrl(study.studyId)}
+                            target="_blank"
+                        >
+                            {study.name}
+                        </a>
                     </li>
-                )
-            })
+                );
+            });
         }
         return [];
     }
@@ -76,20 +111,39 @@ export default class StudySummary extends React.Component<IStudySummaryProps, {}
     render() {
         return (
             <div className={classnames(styles.summary)}>
-                <h3 style={{marginBottom:3, display: 'flex', alignItems: 'baseline'}}>
+                <h3
+                    style={{
+                        marginBottom: 3,
+                        display: 'flex',
+                        alignItems: 'baseline',
+                    }}
+                >
                     {this.name}
-                    {this.props.hasRawDataForDownload &&
-                    (
+                    {this.props.hasRawDataForDownload && (
                         <DefaultTooltip
-                            trigger={["hover"]}
-                            placement={"top"}
-                            overlay={<span>Download all clinical and genomic data of this study</span>}
+                            trigger={['hover']}
+                            placement={'top'}
+                            overlay={
+                                <span>
+                                    Download all clinical and genomic data of
+                                    this study
+                                </span>
+                            }
                         >
-                            <span data-test="studySummaryRawDataDownloadIcon"
-                                  data-event={serializeEvent({ category:'studyPage', action:'dataDownload', label:this.props.studies.map((s)=>s.studyId).join(",") })}
-                                  style={{marginLeft: '10px', fontSize: '14px'}}
+                            <span
+                                data-test="studySummaryRawDataDownloadIcon"
+                                data-event={serializeEvent({
+                                    category: 'studyPage',
+                                    action: 'dataDownload',
+                                    label: this.props.studies
+                                        .map(s => s.studyId)
+                                        .join(','),
+                                })}
+                                style={{ marginLeft: '10px', fontSize: '14px' }}
                             >
-                                    <StudyDataDownloadLink studyId={this.props.studies[0].studyId}/>
+                                <StudyDataDownloadLink
+                                    studyId={this.props.studies[0].studyId}
+                                />
                             </span>
                         </DefaultTooltip>
                     )}
@@ -97,41 +151,64 @@ export default class StudySummary extends React.Component<IStudySummaryProps, {}
                 <div className={styles.description}>
                     <div>
                         {this.descriptionFirstLine}
-                        {this.hasMoreDescription && <i
-                            className={`fa fa-${this.showMoreDescription ? 'minus' : 'plus'}-circle`}
-                            onClick={() => this.showMoreDescription = !this.showMoreDescription}
-                            style={{marginLeft: '5px', cursor: 'pointer'}}
-                        />}
+                        {this.hasMoreDescription && (
+                            <i
+                                className={`fa fa-${
+                                    this.showMoreDescription ? 'minus' : 'plus'
+                                }-circle`}
+                                onClick={() =>
+                                    (this.showMoreDescription = !this
+                                        .showMoreDescription)
+                                }
+                                style={{ marginLeft: '5px', cursor: 'pointer' }}
+                            />
+                        )}
                     </div>
 
-                    {this.showMoreDescription &&
-                    <div>
-                        <ul className={styles.studyLinks}>{this.descriptionRemainingLines}</ul>
-                        {
-                            this.props.showOriginStudiesInSummaryDescription &&
-                            (<div>
-                                {
-                                    this.props.originStudies.isComplete &&
-                                    this.props.originStudies.result!.length > 0 &&
-                                    (<span>
-                                            <span style={{fontWeight: 'bold', marginBottom: '5px', display: 'block'}}>
-                                                This virtual study was derived from:
+                    {this.showMoreDescription && (
+                        <div>
+                            <ul className={styles.studyLinks}>
+                                {this.descriptionRemainingLines}
+                            </ul>
+                            {this.props
+                                .showOriginStudiesInSummaryDescription && (
+                                <div>
+                                    {this.props.originStudies.isComplete &&
+                                        this.props.originStudies.result!
+                                            .length > 0 && (
+                                            <span>
+                                                <span
+                                                    style={{
+                                                        fontWeight: 'bold',
+                                                        marginBottom: '5px',
+                                                        display: 'block',
+                                                    }}
+                                                >
+                                                    This virtual study was
+                                                    derived from:
+                                                </span>
+                                                {this.props.originStudies.result!.map(
+                                                    study => (
+                                                        <StudySummaryRecord
+                                                            {...study}
+                                                        />
+                                                    )
+                                                )}
                                             </span>
-                                        {this.props.originStudies.result!.map(study =>
-                                            <StudySummaryRecord {...study} />)}
-                                    </span>)
-                                }
-                                <LoadingIndicator
-                                    isLoading={this.props.originStudies.isPending}
-                                    center={true}
-                                    size={"big"}
-                                />
-                            </div>)
-                        }
-                    </div>
-                    }
+                                        )}
+                                    <LoadingIndicator
+                                        isLoading={
+                                            this.props.originStudies.isPending
+                                        }
+                                        center={true}
+                                        size={'big'}
+                                    />
+                                </div>
+                            )}
+                        </div>
+                    )}
                 </div>
             </div>
-        )
+        );
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/studyView/studyPageHeader/styles.module.scss b/src/pages/studyView/studyPageHeader/styles.module.scss
index 0f922838991..345800b5aed 100644
--- a/src/pages/studyView/studyPageHeader/styles.module.scss
+++ b/src/pages/studyView/studyPageHeader/styles.module.scss
@@ -1,32 +1,32 @@
 .rightPanel {
-  font-size: 16px;
-  display: flex;
-  align-items: flex-start;
+    font-size: 16px;
+    display: flex;
+    align-items: flex-start;
 
-  textarea{
-    width: 280px !important;
-    margin: 0 !important;
-  }
+    textarea {
+        width: 280px !important;
+        margin: 0 !important;
+    }
 }
 
 .summary {
-  flex-grow: 1;
+    flex-grow: 1;
 }
 
 .description {
-  font-size: 13px;
-  word-break: break-word;
+    font-size: 13px;
+    word-break: break-word;
 }
 
 .submitQuery {
-  margin-left: 5px !important;
+    margin-left: 5px !important;
 }
 
 .iconGroup {
-  display: flex;
+    display: flex;
 }
 
 .studyLinks {
-  list-style: none;
-  padding-left: 0;
-}
\ No newline at end of file
+    list-style: none;
+    padding-left: 0;
+}
diff --git a/src/pages/studyView/styles.module.scss b/src/pages/studyView/styles.module.scss
index 6d33baecfd2..4aaafa391c3 100644
--- a/src/pages/studyView/styles.module.scss
+++ b/src/pages/studyView/styles.module.scss
@@ -1,8 +1,7 @@
-
 .absolutePanel {
     position: absolute;
     top: 5px;
-    right:18px;
+    right: 18px;
     z-index: 2;
     display: flex;
 }
@@ -13,16 +12,16 @@
 }
 
 .selectedInfo {
-    display:flex;
-    align-items:center;
-    margin-right:10px;
+    display: flex;
+    align-items: center;
+    margin-right: 10px;
 }
 
 .selectedInfoCheckbox {
     margin: 2px 3px 0 0 !important;
 }
 
-.mainTabs{
+.mainTabs {
     position: relative;
 }
 
@@ -39,7 +38,7 @@
 }
 
 .studyViewSurvivalPlotBody {
-    position: relative
+    position: relative;
 }
 
 .studyViewAutoMargin {
@@ -58,12 +57,12 @@
     display: flex;
     align-items: center;
     flex-wrap: wrap;
-    margin-bottom:10px;
+    margin-bottom: 10px;
 }
 
 .parentGroupLogic {
     background-color: $lightGrey;
-    border:1px solid $borderColor;
+    border: 1px solid $borderColor;
     border-radius: 5px;
     margin: 2px 5px 2px 0;
     padding: 5px;
@@ -79,35 +78,34 @@
     font-weight: bold;
 }
 
-.summary{
+.summary {
     flex-grow: 1;
-    .description{
+    .description {
         font-size: 13px;
     }
 }
 
 .actionButtons {
-    display:flex;
+    display: flex;
     button {
-        margin-left:10px;
+        margin-left: 10px;
     }
 }
 
 .studyFilterResult {
     transition: all 500ms;
     transform: scale(0); /* Standard syntax */
-    display:flex;
-    z-index:2;
+    display: flex;
+    z-index: 2;
     > div {
         white-space: nowrap;
-        &:nth-child(n+2) {
-            margin-left:5px;
+        &:nth-child(n + 2) {
+            margin-left: 5px;
         }
     }
-
 }
 
 .titleMeta {
     font-size: smaller;
-    color: #A9A9A9;
-}
\ No newline at end of file
+    color: #a9a9a9;
+}
diff --git a/src/pages/studyView/table/ClinicalTable.tsx b/src/pages/studyView/table/ClinicalTable.tsx
index eb16b8641eb..5f9ed261fb0 100644
--- a/src/pages/studyView/table/ClinicalTable.tsx
+++ b/src/pages/studyView/table/ClinicalTable.tsx
@@ -1,53 +1,65 @@
-import * as React from "react";
-import {observer} from "mobx-react";
-import {action, computed, observable, toJS, reaction, IReactionDisposer} from "mobx";
+import * as React from 'react';
+import { observer } from 'mobx-react';
+import {
+    action,
+    computed,
+    observable,
+    toJS,
+    reaction,
+    IReactionDisposer,
+} from 'mobx';
 import autobind from 'autobind-decorator';
-import _ from "lodash";
-import LabeledCheckbox from "shared/components/labeledCheckbox/LabeledCheckbox";
-import {ClinicalDataCountSummary} from "pages/studyView/StudyViewUtils";
-import FixedHeaderTable from "./FixedHeaderTable";
-import styles from "./tables.module.scss";
+import _ from 'lodash';
+import LabeledCheckbox from 'shared/components/labeledCheckbox/LabeledCheckbox';
+import { ClinicalDataCountSummary } from 'pages/studyView/StudyViewUtils';
+import FixedHeaderTable from './FixedHeaderTable';
+import styles from './tables.module.scss';
 import {
     correctColumnWidth,
-    correctMargin, getClinicalAttributeOverlay,
-    getFixedHeaderNumberCellMargin, getFixedHeaderTableMaxLengthStringPixel,
-    getFrequencyStr
-} from "../StudyViewUtils";
-import {SortDirection} from "../../../shared/components/lazyMobXTable/LazyMobXTable";
-import {EllipsisTextTooltip} from "cbioportal-frontend-commons";
-import {DEFAULT_SORTING_COLUMN} from "../StudyViewConfig";
+    correctMargin,
+    getClinicalAttributeOverlay,
+    getFixedHeaderNumberCellMargin,
+    getFixedHeaderTableMaxLengthStringPixel,
+    getFrequencyStr,
+} from '../StudyViewUtils';
+import { SortDirection } from '../../../shared/components/lazyMobXTable/LazyMobXTable';
+import { EllipsisTextTooltip } from 'cbioportal-frontend-commons';
+import { DEFAULT_SORTING_COLUMN } from '../StudyViewConfig';
 
 export interface IClinicalTableProps {
     data: ClinicalDataCountSummary[];
     filters: string[];
     highlightedRow?: (value: string | undefined) => void;
     onUserSelection: (values: string[]) => void;
-    label?: string,
-    labelDescription?: string,
-    patientAttribute: boolean,
-    width?: number,
-    height?: number,
-    showAddRemoveAllButtons?: boolean
+    label?: string;
+    labelDescription?: string;
+    patientAttribute: boolean;
+    width?: number;
+    height?: number;
+    showAddRemoveAllButtons?: boolean;
 }
 
-class ClinicalTableComponent extends FixedHeaderTable<ClinicalDataCountSummary> {
-
-}
+class ClinicalTableComponent extends FixedHeaderTable<
+    ClinicalDataCountSummary
+> {}
 
 export enum ColumnKey {
     CATEGORY = 'Category',
     NUMBER = '#',
-    FREQ = 'Freq'
+    FREQ = 'Freq',
 }
 
 @observer
-export default class ClinicalTable extends React.Component<IClinicalTableProps, {}> {
+export default class ClinicalTable extends React.Component<
+    IClinicalTableProps,
+    {}
+> {
     @observable private sortBy: string = DEFAULT_SORTING_COLUMN;
     @observable private sortDirection: SortDirection;
 
     static readonly defaultProps = {
         width: 300,
-        showAddRemoveAllButtons: false
+        showAddRemoveAllButtons: false,
     };
 
     @computed
@@ -56,7 +68,7 @@ export default class ClinicalTable extends React.Component<IClinicalTableProps,
         return {
             [ColumnKey.CATEGORY]: correctColumnWidth(this.props.width! - 140),
             [ColumnKey.NUMBER]: 80,
-            [ColumnKey.FREQ]: 60
+            [ColumnKey.FREQ]: 60,
         };
     }
 
@@ -64,18 +76,32 @@ export default class ClinicalTable extends React.Component<IClinicalTableProps,
     get cellMargin() {
         return {
             [ColumnKey.CATEGORY]: 0,
-            [ColumnKey.NUMBER]: this.props.data.length === 0 ? 0 : correctMargin(
-                (this.columnsWidth[ColumnKey.NUMBER] - 10 - (
-                        getFixedHeaderTableMaxLengthStringPixel(
-                            _.max(this.props.data.map(item => item.count))!.toLocaleString()
-                        ) + 20)
-                ) / 2),
-            [ColumnKey.FREQ]: this.props.data.length === 0 ? 0 : correctMargin(
-                getFixedHeaderNumberCellMargin(
-                    this.columnsWidth[ColumnKey.FREQ],
-                    _.sortBy(this.props.data, item => item.percentage)[this.props.data.length - 1].freq
-                )
-            ),
+            [ColumnKey.NUMBER]:
+                this.props.data.length === 0
+                    ? 0
+                    : correctMargin(
+                          (this.columnsWidth[ColumnKey.NUMBER] -
+                              10 -
+                              (getFixedHeaderTableMaxLengthStringPixel(
+                                  _.max(
+                                      this.props.data.map(item => item.count)
+                                  )!.toLocaleString()
+                              ) +
+                                  20)) /
+                              2
+                      ),
+            [ColumnKey.FREQ]:
+                this.props.data.length === 0
+                    ? 0
+                    : correctMargin(
+                          getFixedHeaderNumberCellMargin(
+                              this.columnsWidth[ColumnKey.FREQ],
+                              _.sortBy(
+                                  this.props.data,
+                                  item => item.percentage
+                              )[this.props.data.length - 1].freq
+                          )
+                      ),
         };
     }
 
@@ -84,94 +110,151 @@ export default class ClinicalTable extends React.Component<IClinicalTableProps,
         return this.props.label ? this.props.label : ColumnKey.CATEGORY;
     }
 
-    private _columns = [{
-        name: this.firstColumnName,
-        render: (data: ClinicalDataCountSummary) => {
-            return (
-                <div
-                    className={styles.labelContent}
-                    onMouseEnter={event => {
-                        this.tooltipLabelMouseEnter(data.value)
-                    }}
-                    onMouseLeave={this.tooltipLabelMouseLeave}>
-                    <svg width="18" height="12" className={styles.labelContentSVG}>
-                        <g>
-                            <rect x="0" y="0" width="12" height="12" fill={data.color}/>
-                        </g>
-                    </svg>
-                    <EllipsisTextTooltip text={data.value}></EllipsisTextTooltip>
-                </div>
-            )
-        },
-        headerRender: () => {
-            const style:any = {};
-            let text = this.firstColumnName;
-            if (!this.props.label) {
-                style.opacity = 0;
-                text = ".";
-            }
-            return <EllipsisTextTooltip style={style} text={text} hideTooltip={true}></EllipsisTextTooltip>;
+    private _columns = [
+        {
+            name: this.firstColumnName,
+            render: (data: ClinicalDataCountSummary) => {
+                return (
+                    <div
+                        className={styles.labelContent}
+                        onMouseEnter={event => {
+                            this.tooltipLabelMouseEnter(data.value);
+                        }}
+                        onMouseLeave={this.tooltipLabelMouseLeave}
+                    >
+                        <svg
+                            width="18"
+                            height="12"
+                            className={styles.labelContentSVG}
+                        >
+                            <g>
+                                <rect
+                                    x="0"
+                                    y="0"
+                                    width="12"
+                                    height="12"
+                                    fill={data.color}
+                                />
+                            </g>
+                        </svg>
+                        <EllipsisTextTooltip
+                            text={data.value}
+                        ></EllipsisTextTooltip>
+                    </div>
+                );
+            },
+            headerRender: () => {
+                const style: any = {};
+                let text = this.firstColumnName;
+                if (!this.props.label) {
+                    style.opacity = 0;
+                    text = '.';
+                }
+                return (
+                    <EllipsisTextTooltip
+                        style={style}
+                        text={text}
+                        hideTooltip={true}
+                    ></EllipsisTextTooltip>
+                );
+            },
+            tooltip: getClinicalAttributeOverlay(
+                this.firstColumnName,
+                this.props.labelDescription ? this.props.labelDescription : ''
+            ),
+            filter: (
+                d: ClinicalDataCountSummary,
+                f: string,
+                filterStringUpper: string
+            ) => d.value.toUpperCase().includes(filterStringUpper),
+            sortBy: (d: ClinicalDataCountSummary) => d.value,
+            defaultSortDirection: 'asc' as 'asc',
+            width: this.columnsWidth[ColumnKey.CATEGORY],
         },
-        tooltip: getClinicalAttributeOverlay(this.firstColumnName, this.props.labelDescription ? this.props.labelDescription : ''),
-        filter: (d: ClinicalDataCountSummary, f: string, filterStringUpper: string) => (d.value.toUpperCase().includes(filterStringUpper)),
-        sortBy: (d: ClinicalDataCountSummary) => d.value,
-        defaultSortDirection: 'asc' as 'asc',
-        width: this.columnsWidth[ColumnKey.CATEGORY]
-    }, {
-        name: ColumnKey.NUMBER,
-        headerRender: () => {
-            return <div style={{marginLeft: this.cellMargin[ColumnKey.NUMBER]}}>#</div>
+        {
+            name: ColumnKey.NUMBER,
+            headerRender: () => {
+                return (
+                    <div
+                        style={{
+                            marginLeft: this.cellMargin[ColumnKey.NUMBER],
+                        }}
+                    >
+                        #
+                    </div>
+                );
+            },
+            render: (data: ClinicalDataCountSummary) => (
+                <LabeledCheckbox
+                    checked={_.includes(this.props.filters, data.value)}
+                    onChange={event => this.onUserSelection(data.value)}
+                    labelProps={{
+                        style: {
+                            display: 'flex',
+                            justifyContent: 'space-between',
+                            marginLeft: this.cellMargin[ColumnKey.NUMBER],
+                            marginRight: this.cellMargin[ColumnKey.NUMBER],
+                        },
+                    }}
+                    inputProps={{
+                        className: styles.autoMarginCheckbox,
+                    }}
+                >
+                    {data.count.toLocaleString()}
+                </LabeledCheckbox>
+            ),
+            tooltip: (
+                <span>
+                    Number of{' '}
+                    {this.props.patientAttribute ? 'patients' : 'samples'}
+                </span>
+            ),
+            filter: (d: ClinicalDataCountSummary, f: string) =>
+                d.count.toString().includes(f),
+            sortBy: (d: ClinicalDataCountSummary) => d.count,
+            defaultSortDirection: 'desc' as 'desc',
+            width: this.columnsWidth[ColumnKey.NUMBER],
         },
-        render: (data: ClinicalDataCountSummary) =>
-            <LabeledCheckbox
-                checked={_.includes(this.props.filters, data.value)}
-                onChange={event => this.onUserSelection(data.value)}
-                labelProps={{
-                    style: {
+        {
+            name: ColumnKey.FREQ,
+            headerRender: () => {
+                return (
+                    <div
+                        style={{ marginLeft: this.cellMargin[ColumnKey.FREQ] }}
+                    >
+                        Freq
+                    </div>
+                );
+            },
+            render: (data: ClinicalDataCountSummary) => (
+                <span
+                    style={{
+                        flexDirection: 'row-reverse',
                         display: 'flex',
-                        justifyContent: 'space-between',
-                        marginLeft: this.cellMargin[ColumnKey.NUMBER],
-                        marginRight: this.cellMargin[ColumnKey.NUMBER]
-                    }
-                }}
-                inputProps={{
-                    className: styles.autoMarginCheckbox
-                }}
-            >
-                {data.count.toLocaleString()}
-            </LabeledCheckbox>,
-        tooltip: (
-            <span>Number of {this.props.patientAttribute ? 'patients' : 'samples'}</span>),
-        filter: (d: ClinicalDataCountSummary, f: string) => (d.count.toString().includes(f)),
-        sortBy: (d: ClinicalDataCountSummary) => d.count,
-        defaultSortDirection: 'desc' as 'desc',
-        width: this.columnsWidth[ColumnKey.NUMBER]
-    }, {
-        name: ColumnKey.FREQ,
-        headerRender: () => {
-            return <div style={{marginLeft: this.cellMargin[ColumnKey.FREQ]}}>Freq</div>
-        },
-        render: (data: ClinicalDataCountSummary) =>
-            <span
-                style={{
-                    flexDirection: 'row-reverse',
-                    display: 'flex',
-                    marginRight: this.cellMargin[ColumnKey.FREQ]
-                }}
-            >{data.freq}</span>,
-        tooltip: (
-            <span>Percentage of {this.props.patientAttribute ? 'patients' : 'samples'}</span>),
-        filter: (d: ClinicalDataCountSummary, f: string) => {
-            return d.freq.includes(f)
+                        marginRight: this.cellMargin[ColumnKey.FREQ],
+                    }}
+                >
+                    {data.freq}
+                </span>
+            ),
+            tooltip: (
+                <span>
+                    Percentage of{' '}
+                    {this.props.patientAttribute ? 'patients' : 'samples'}
+                </span>
+            ),
+            filter: (d: ClinicalDataCountSummary, f: string) => {
+                return d.freq.includes(f);
+            },
+            sortBy: (d: ClinicalDataCountSummary) => d.percentage, //sort freq column using count
+            defaultSortDirection: 'desc' as 'desc',
+            width: this.columnsWidth[ColumnKey.FREQ],
         },
-        sortBy: (d: ClinicalDataCountSummary) => d.percentage,//sort freq column using count
-        defaultSortDirection: 'desc' as 'desc',
-        width: this.columnsWidth[ColumnKey.FREQ]
-    }];
+    ];
 
     @autobind
     private onUserSelection(filter: string) {
-        let filters = toJS(this.props.filters)
+        let filters = toJS(this.props.filters);
         if (_.includes(filters, filter)) {
             filters = _.filter(filters, obj => obj !== filter);
         } else {
@@ -202,7 +285,9 @@ export default class ClinicalTable extends React.Component<IClinicalTableProps,
     @autobind
     removeAll(deselectedRows: ClinicalDataCountSummary[]) {
         const deselectRows = deselectedRows.map(row => row.value);
-        this.props.onUserSelection(this.props.filters.filter(filter => !deselectRows.includes(filter)));
+        this.props.onUserSelection(
+            this.props.filters.filter(filter => !deselectRows.includes(filter))
+        );
     }
 
     @autobind
@@ -226,6 +311,6 @@ export default class ClinicalTable extends React.Component<IClinicalTableProps,
                 sortDirection={this.sortDirection}
                 afterSorting={this.afterSorting}
             />
-        )
+        );
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/studyView/table/FixedHeaderTable.tsx b/src/pages/studyView/table/FixedHeaderTable.tsx
index 73558a9df53..1580ed2c42f 100644
--- a/src/pages/studyView/table/FixedHeaderTable.tsx
+++ b/src/pages/studyView/table/FixedHeaderTable.tsx
@@ -1,34 +1,39 @@
-import * as React from "react";
-import {Column, LazyMobXTableStore, SortDirection, lazyMobXTableSort} from "../../../shared/components/lazyMobXTable/LazyMobXTable";
+import * as React from 'react';
+import {
+    Column,
+    LazyMobXTableStore,
+    SortDirection,
+    lazyMobXTableSort,
+} from '../../../shared/components/lazyMobXTable/LazyMobXTable';
 import {
     Column as RVColumn,
     SortDirection as RVSortDirection,
     Table as RVTable,
     TableCellProps,
-    TableHeaderProps
+    TableHeaderProps,
 } from 'react-virtualized';
 import 'react-virtualized/styles.css';
-import {action, computed, observable} from "mobx";
-import styles from "./tables.module.scss";
+import { action, computed, observable } from 'mobx';
+import styles from './tables.module.scss';
 import * as _ from 'lodash';
-import {observer} from "mobx-react";
+import { observer } from 'mobx-react';
 import classnames from 'classnames';
-import {If} from 'react-if';
+import { If } from 'react-if';
 import autobind from 'autobind-decorator';
-import {inputBoxChangeTimeoutEvent} from "../../../shared/lib/EventUtils";
-import {DefaultTooltip} from "cbioportal-frontend-commons";
-import { SimpleGetterLazyMobXTableApplicationDataStore } from "shared/lib/ILazyMobXTableApplicationDataStore";
+import { inputBoxChangeTimeoutEvent } from '../../../shared/lib/EventUtils';
+import { DefaultTooltip } from 'cbioportal-frontend-commons';
+import { SimpleGetterLazyMobXTableApplicationDataStore } from 'shared/lib/ILazyMobXTableApplicationDataStore';
 
 export type IFixedHeaderTableProps<T> = {
-    columns: Column<T>[],
+    columns: Column<T>[];
     fixedTopRowsData?: T[];
     data: T[];
     sortBy?: string;
     sortDirection?: SortDirection;
     width?: number;
     height?: number;
-    headerHeight? :number;
-    rowHeight? :number;
+    headerHeight?: number;
+    rowHeight?: number;
     showSelectSamples?: boolean;
     afterSelectingRows?: () => void;
     showControls?: boolean;
@@ -37,21 +42,22 @@ export type IFixedHeaderTableProps<T> = {
     showAddRemoveAllButtons?: boolean;
     addAll?: (data: T[]) => void;
     removeAll?: (data: T[]) => void;
-    removeAllDisabled?:boolean;
+    removeAllDisabled?: boolean;
     showSelectableNumber?: boolean;
     isSelectedRow?: (data: T) => boolean;
     highlightedRowClassName?: (data: T) => string;
-    autoFocusSearchAfterRendering?:boolean;
+    autoFocusSearchAfterRendering?: boolean;
     afterSorting?: (sortBy: string, sortDirection: SortDirection) => void;
 };
 
 const RVSDTtoStrType = {
     ['desc' as SortDirection]: RVSortDirection.DESC,
-    ['asc' as SortDirection]: RVSortDirection.ASC
+    ['asc' as SortDirection]: RVSortDirection.ASC,
 };
 
-export class FixedHeaderTableDataStore extends SimpleGetterLazyMobXTableApplicationDataStore<any> {
-
+export class FixedHeaderTableDataStore extends SimpleGetterLazyMobXTableApplicationDataStore<
+    any
+> {
     constructor(getData: () => any[], fixedTopRowsData: any[]) {
         super(getData);
         this.fixedTopRowsData = fixedTopRowsData;
@@ -62,16 +68,23 @@ export class FixedHeaderTableDataStore extends SimpleGetterLazyMobXTableApplicat
     @computed get sortedData() {
         // if not defined, use default values for sortMetric and sortAscending
         const sortMetric = this.sortMetric || (() => 0);
-        const sortAscending = this.sortAscending !== undefined ? this.sortAscending : true;
+        const sortAscending =
+            this.sortAscending !== undefined ? this.sortAscending : true;
 
-        return [...this.fixedTopRowsData, ...lazyMobXTableSort(this.allData, sortMetric, sortAscending)];
+        return [
+            ...this.fixedTopRowsData,
+            ...lazyMobXTableSort(this.allData, sortMetric, sortAscending),
+        ];
     }
 }
 
 @observer
-export default class FixedHeaderTable<T> extends React.Component<IFixedHeaderTableProps<T>, {}> {
+export default class FixedHeaderTable<T> extends React.Component<
+    IFixedHeaderTableProps<T>,
+    {}
+> {
     private _store: LazyMobXTableStore<T>;
-    inputElement:HTMLSpanElement;
+    inputElement: HTMLSpanElement;
 
     @observable private _sortBy: string;
     @observable private _sortDirection: SortDirection;
@@ -87,58 +100,65 @@ export default class FixedHeaderTable<T> extends React.Component<IFixedHeaderTab
         headerHeight: 25,
         rowHeight: 25,
         showSelectableNumber: false,
-        sortBy: ''
+        sortBy: '',
     };
 
     constructor(props: IFixedHeaderTableProps<T>) {
         super(props);
         this._sortBy = props.sortBy!;
-        const sortByColumn = _.find(this.props.columns, column => column.name === this._sortBy);
-        this._sortDirection = props.sortDirection === undefined ? (_.isUndefined(sortByColumn) ? 'desc' as 'desc' : sortByColumn.defaultSortDirection || 'desc' as 'desc') : props.sortDirection;
+        const sortByColumn = _.find(
+            this.props.columns,
+            column => column.name === this._sortBy
+        );
+        this._sortDirection =
+            props.sortDirection === undefined
+                ? _.isUndefined(sortByColumn)
+                    ? ('desc' as 'desc')
+                    : sortByColumn.defaultSortDirection || ('desc' as 'desc')
+                : props.sortDirection;
 
         this.initDataStore();
     }
 
-    componentWillReceiveProps(nextProps:  IFixedHeaderTableProps<T>) {
+    componentWillReceiveProps(nextProps: IFixedHeaderTableProps<T>) {
         this.updateDataStore(nextProps);
     }
 
     updateDataStore(nextProps: IFixedHeaderTableProps<T>) {
-        const tableDataStore = new FixedHeaderTableDataStore(
-            () => {
-                return this.props.data;
-            },
-            this.props.fixedTopRowsData || []
-        );
+        const tableDataStore = new FixedHeaderTableDataStore(() => {
+            return this.props.data;
+        }, this.props.fixedTopRowsData || []);
         this._store.setProps({
             columns: nextProps.columns,
             dataStore: tableDataStore,
             initialSortColumn: this._sortBy,
-            initialSortDirection: this._sortDirection
+            initialSortDirection: this._sortDirection,
         });
     }
 
     initDataStore() {
-        const tableDataStore = new FixedHeaderTableDataStore(
-            () => {
-                return this.props.data;
-            },
-            this.props.fixedTopRowsData || []
-        );
+        const tableDataStore = new FixedHeaderTableDataStore(() => {
+            return this.props.data;
+        }, this.props.fixedTopRowsData || []);
         this._store = new LazyMobXTableStore<T>({
             columns: this.props.columns,
             dataStore: tableDataStore,
             initialSortColumn: this._sortBy,
-            initialSortDirection: this._sortDirection
+            initialSortDirection: this._sortDirection,
         });
     }
 
     @autobind
     rowClassName({ index }: any) {
-        if (index > -1 && this.isSelectedRow(this._store.dataStore.sortedFilteredData[index])) {
-            const classNames: string[] = [styles.row]
+        if (
+            index > -1 &&
+            this.isSelectedRow(this._store.dataStore.sortedFilteredData[index])
+        ) {
+            const classNames: string[] = [styles.row];
             if (this.props.highlightedRowClassName) {
-                const className = this.props.highlightedRowClassName(this._store.dataStore.sortedFilteredData[index]);
+                const className = this.props.highlightedRowClassName(
+                    this._store.dataStore.sortedFilteredData[index]
+                );
                 classNames.push(className);
             } else {
                 classNames.push(styles.highlightedRow);
@@ -147,12 +167,15 @@ export default class FixedHeaderTable<T> extends React.Component<IFixedHeaderTab
         } else if (index < 0) {
             return styles.headerRow;
         } else {
-            return classnames(styles.row, index % 2 === 0 ? styles.evenRow : styles.oddRow);
+            return classnames(
+                styles.row,
+                index % 2 === 0 ? styles.evenRow : styles.oddRow
+            );
         }
     }
 
     @autobind
-    rowGetter({index}: any) {
+    rowGetter({ index }: any) {
         return this._store.dataStore.sortedFilteredData[index];
     }
 
@@ -163,10 +186,12 @@ export default class FixedHeaderTable<T> extends React.Component<IFixedHeaderTab
 
     @autobind
     @action
-    sort({sortBy}: any) {
+    sort({ sortBy }: any) {
         this._store.defaultHeaderClick(this.getColumn(sortBy));
         this._sortBy = sortBy;
-        this._sortDirection = this._store.dataStore.sortAscending ? 'asc' as 'asc' : 'desc' as 'desc';
+        this._sortDirection = this._store.dataStore.sortAscending
+            ? ('asc' as 'asc')
+            : ('desc' as 'desc');
         if (this.props.afterSorting) {
             this.props.afterSorting(this._sortBy, this._sortDirection);
         }
@@ -175,7 +200,7 @@ export default class FixedHeaderTable<T> extends React.Component<IFixedHeaderTab
     @autobind
     @action
     onFilterTextChange() {
-        return inputBoxChangeTimeoutEvent((filterValue) => {
+        return inputBoxChangeTimeoutEvent(filterValue => {
             this._store.setFilterString(filterValue);
         }, 400);
     }
@@ -223,14 +248,26 @@ export default class FixedHeaderTable<T> extends React.Component<IFixedHeaderTab
                 }
 
                 if (column.name === this._sortBy) {
-                    label.push(<i
-                        className={classnames(styles.headerSortingIcon, 'fa', this._sortDirection === 'desc' ? 'fa-sort-desc' : 'fa-sort-asc')}></i>);
+                    label.push(
+                        <i
+                            className={classnames(
+                                styles.headerSortingIcon,
+                                'fa',
+                                this._sortDirection === 'desc'
+                                    ? 'fa-sort-desc'
+                                    : 'fa-sort-asc'
+                            )}
+                        ></i>
+                    );
                 }
 
-                const content = <div style={{display: 'flex'}}>{label}</div>
+                const content = <div style={{ display: 'flex' }}>{label}</div>;
                 if (column.tooltip) {
                     return (
-                        <DefaultTooltip placement="top" overlay={column.tooltip}>
+                        <DefaultTooltip
+                            placement="top"
+                            overlay={column.tooltip}
+                        >
                             {content}
                         </DefaultTooltip>
                     );
@@ -242,7 +279,7 @@ export default class FixedHeaderTable<T> extends React.Component<IFixedHeaderTab
     }
 
     @autobind
-    setInputRef(el: any ) {
+    setInputRef(el: any) {
         this.inputElement = el;
     }
 
@@ -253,45 +290,82 @@ export default class FixedHeaderTable<T> extends React.Component<IFixedHeaderTab
     }
 
     getControls() {
-        return <div className={classnames(styles.controls)}>
-            {!this.props.showControlsAtTop &&
-            <input placeholder={"Search..."} type="text" onInput={this.onFilterTextChange()}
-                   className={classnames('form-control', styles.tableSearchInput)}/>}
-            <If condition={this.props.showAddRemoveAllButtons}>
-                <div className={"btn-group"} role={"group"}>
-                    {this.props.addAll && (
-                        <button className="btn btn-default btn-xs" onClick={this.onAddAll} data-test="fixed-header-table-add-all">
-                        {`Select all${this.props.showSelectableNumber ? ` (${this._store.dataStore.sortedFilteredData.length})` : ''}`}
-                        </button>
-                    )}
-                    {this.props.removeAll && (
-                        <button className="btn btn-default btn-xs"
+        return (
+            <div className={classnames(styles.controls)}>
+                {!this.props.showControlsAtTop && (
+                    <input
+                        placeholder={'Search...'}
+                        type="text"
+                        onInput={this.onFilterTextChange()}
+                        className={classnames(
+                            'form-control',
+                            styles.tableSearchInput
+                        )}
+                    />
+                )}
+                <If condition={this.props.showAddRemoveAllButtons}>
+                    <div className={'btn-group'} role={'group'}>
+                        {this.props.addAll && (
+                            <button
+                                className="btn btn-default btn-xs"
+                                onClick={this.onAddAll}
+                                data-test="fixed-header-table-add-all"
+                            >
+                                {`Select all${
+                                    this.props.showSelectableNumber
+                                        ? ` (${this._store.dataStore.sortedFilteredData.length})`
+                                        : ''
+                                }`}
+                            </button>
+                        )}
+                        {this.props.removeAll && (
+                            <button
+                                className="btn btn-default btn-xs"
                                 data-test="fixed-header-table-remove-all"
                                 onClick={this.onRemoveAll}
                                 disabled={this.props.removeAllDisabled}
-                        >Deselect all</button>
-                    )}
-                </div>
-            </If>
-
-            <If condition={this.props.showSelectSamples}>
-                <button className={classnames("btn btn-primary btn-xs", styles.controlsBtn)}
+                            >
+                                Deselect all
+                            </button>
+                        )}
+                    </div>
+                </If>
+
+                <If condition={this.props.showSelectSamples}>
+                    <button
+                        className={classnames(
+                            'btn btn-primary btn-xs',
+                            styles.controlsBtn
+                        )}
                         data-test="fixed-header-table-select-sample"
-                        onClick={this.afterSelectingRows}>Select Samples
-                </button>
-            </If>
-            {this.props.showControlsAtTop &&
-            <input placeholder={"Search..."} type="text" onInput={this.onFilterTextChange()}
-                   ref={this.setInputRef}
-                   data-test="fixed-header-table-search-input"
-                   className={classnames('form-control', styles.tableSearchInput)}/>}
-        </div>
+                        onClick={this.afterSelectingRows}
+                    >
+                        Select Samples
+                    </button>
+                </If>
+                {this.props.showControlsAtTop && (
+                    <input
+                        placeholder={'Search...'}
+                        type="text"
+                        onInput={this.onFilterTextChange()}
+                        ref={this.setInputRef}
+                        data-test="fixed-header-table-search-input"
+                        className={classnames(
+                            'form-control',
+                            styles.tableSearchInput
+                        )}
+                    />
+                )}
+            </div>
+        );
     }
 
     public render() {
         return (
             <div className={styles.studyViewTablesTable}>
-                {this.props.showControls && this.props.showControlsAtTop && this.getControls()}
+                {this.props.showControls &&
+                    this.props.showControlsAtTop &&
+                    this.getControls()}
                 <RVTable
                     width={this.props.width!}
                     height={this.props.height!}
@@ -306,21 +380,26 @@ export default class FixedHeaderTable<T> extends React.Component<IFixedHeaderTab
                     sortDirection={RVSDTtoStrType[this._sortDirection]}
                     sortBy={this._sortBy}
                 >
-
-                    {
-                        this.props.columns.map((column, index) => {
-                            return <RVColumn key={column.name} label={column.name} dataKey={column.name}
-                                             width={Number(column.width)}
-                                             className={styles.columnCell}
-                                             headerRenderer={this.columnHeaders[index]}
-                                             cellRenderer={(props: TableCellProps) => {
-                                                 return column.render(props.rowData);
-                                             }}/>;
-                        })
-                    }
+                    {this.props.columns.map((column, index) => {
+                        return (
+                            <RVColumn
+                                key={column.name}
+                                label={column.name}
+                                dataKey={column.name}
+                                width={Number(column.width)}
+                                className={styles.columnCell}
+                                headerRenderer={this.columnHeaders[index]}
+                                cellRenderer={(props: TableCellProps) => {
+                                    return column.render(props.rowData);
+                                }}
+                            />
+                        );
+                    })}
                 </RVTable>
-                {this.props.showControls && !this.props.showControlsAtTop && this.getControls()}
+                {this.props.showControls &&
+                    !this.props.showControlsAtTop &&
+                    this.getControls()}
             </div>
         );
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/studyView/table/GeneCell.tsx b/src/pages/studyView/table/GeneCell.tsx
index 0a0affcf33a..df1c3826681 100644
--- a/src/pages/studyView/table/GeneCell.tsx
+++ b/src/pages/studyView/table/GeneCell.tsx
@@ -1,28 +1,29 @@
 import * as React from 'react';
 import * as _ from 'lodash';
-import styles from "./tables.module.scss";
+import styles from './tables.module.scss';
 import classnames from 'classnames';
 import {
-    DefaultTooltip, EllipsisTextTooltip
-} from "cbioportal-frontend-commons";
-import {getGeneColumnCellOverlaySimple} from "../TableUtils";
-import {getQValue} from "../StudyViewUtils";
-import {action, observable} from 'mobx';
-import {observer} from 'mobx-react';
+    DefaultTooltip,
+    EllipsisTextTooltip,
+} from 'cbioportal-frontend-commons';
+import { getGeneColumnCellOverlaySimple } from '../TableUtils';
+import { getQValue } from '../StudyViewUtils';
+import { action, observable } from 'mobx';
+import { observer } from 'mobx-react';
 import autobind from 'autobind-decorator';
-import {If, Then, Else} from 'react-if';
+import { If, Then, Else } from 'react-if';
 
 export type IGeneCellProps = {
-    tableType: 'mutation' | 'fusion' | 'cna',
-    selectedGenes: string[],
-    hugoGeneSymbol: string,
-    qValue: number,
-    isCancerGene: boolean,
-    oncokbAnnotated: boolean,
-    isOncogene: boolean,
-    isTumorSuppressorGene: boolean,
-    onGeneSelect: (hugoGeneSymbol: string) => void
-}
+    tableType: 'mutation' | 'fusion' | 'cna';
+    selectedGenes: string[];
+    hugoGeneSymbol: string;
+    qValue: number;
+    isCancerGene: boolean;
+    oncokbAnnotated: boolean;
+    isOncogene: boolean;
+    isTumorSuppressorGene: boolean;
+    onGeneSelect: (hugoGeneSymbol: string) => void;
+};
 
 @observer
 export class GeneCell extends React.Component<IGeneCellProps, {}> {
@@ -35,25 +36,52 @@ export class GeneCell extends React.Component<IGeneCellProps, {}> {
     }
 
     render() {
-        const geneIsSelected = _.includes(this.props.selectedGenes, this.props.hugoGeneSymbol);
-        const qvalTypeName = this.props.tableType === 'mutation' ? 'MutSig' : 'Gistic';
+        const geneIsSelected = _.includes(
+            this.props.selectedGenes,
+            this.props.hugoGeneSymbol
+        );
+        const qvalTypeName =
+            this.props.tableType === 'mutation' ? 'MutSig' : 'Gistic';
         const qvalType = qvalTypeName.toLowerCase();
-        const qvalOverlay = () =>
-            <div><b>{qvalTypeName}</b><br/><i>Q-value: </i><span>{getQValue(this.props.qValue)}</span></div>;
+        const qvalOverlay = () => (
+            <div>
+                <b>{qvalTypeName}</b>
+                <br />
+                <i>Q-value: </i>
+                <span>{getQValue(this.props.qValue)}</span>
+            </div>
+        );
 
         return (
             <DefaultTooltip
                 placement="left"
                 disabled={!this.props.isCancerGene}
-                overlay={getGeneColumnCellOverlaySimple(this.props.hugoGeneSymbol, geneIsSelected, this.props.isCancerGene, this.props.oncokbAnnotated, this.props.isOncogene, this.props.isTumorSuppressorGene)}
+                overlay={getGeneColumnCellOverlaySimple(
+                    this.props.hugoGeneSymbol,
+                    geneIsSelected,
+                    this.props.isCancerGene,
+                    this.props.oncokbAnnotated,
+                    this.props.isOncogene,
+                    this.props.isTumorSuppressorGene
+                )}
                 destroyTooltipOnHide={true}
             >
-                <div className={classnames(styles.geneSymbol, styles.displayFlex)}
-                     onMouseEnter={()=>this.onVisibleChange(true)}
-                     onMouseLeave={()=>this.onVisibleChange(false)}
-                     onClick={() => this.props.onGeneSelect(this.props.hugoGeneSymbol)}>
-                    <EllipsisTextTooltip text={this.props.hugoGeneSymbol} hideTooltip={this.props.isCancerGene} />
-                    <span style={{marginLeft: 5}}>
+                <div
+                    className={classnames(
+                        styles.geneSymbol,
+                        styles.displayFlex
+                    )}
+                    onMouseEnter={() => this.onVisibleChange(true)}
+                    onMouseLeave={() => this.onVisibleChange(false)}
+                    onClick={() =>
+                        this.props.onGeneSelect(this.props.hugoGeneSymbol)
+                    }
+                >
+                    <EllipsisTextTooltip
+                        text={this.props.hugoGeneSymbol}
+                        hideTooltip={this.props.isCancerGene}
+                    />
+                    <span style={{ marginLeft: 5 }}>
                         <If condition={geneIsSelected}>
                             <Then>
                                 <i className="fa fa-check-square-o"></i>
@@ -71,13 +99,16 @@ export class GeneCell extends React.Component<IGeneCellProps, {}> {
                             overlay={qvalOverlay}
                             destroyTooltipOnHide={true}
                         >
-                    <span>
-                        <img src={require(`./images/${qvalType}.png`)} className={styles[qvalType]}></img>
-                    </span>
+                            <span>
+                                <img
+                                    src={require(`./images/${qvalType}.png`)}
+                                    className={styles[qvalType]}
+                                ></img>
+                            </span>
                         </DefaultTooltip>
                     </If>
                 </div>
             </DefaultTooltip>
-        )
+        );
     }
 }
diff --git a/src/pages/studyView/table/GeneTable.tsx b/src/pages/studyView/table/GeneTable.tsx
index 87e56223943..2c18594ad5d 100644
--- a/src/pages/studyView/table/GeneTable.tsx
+++ b/src/pages/studyView/table/GeneTable.tsx
@@ -1,60 +1,70 @@
-import * as React from "react";
-import {observer} from "mobx-react";
-import * as _ from "lodash";
-import FixedHeaderTable from "./FixedHeaderTable";
-import {action, computed, observable} from "mobx";
-import autobind from "autobind-decorator";
-import {Column, SortDirection} from "../../../shared/components/lazyMobXTable/LazyMobXTable";
-import {StudyViewGenePanelModal} from "./StudyViewGenePanelModal";
-import MobxPromiseCache from "shared/lib/MobxPromiseCache";
-import {GenePanel} from "shared/api/generated/CBioPortalAPI";
+import * as React from 'react';
+import { observer } from 'mobx-react';
+import * as _ from 'lodash';
+import FixedHeaderTable from './FixedHeaderTable';
+import { action, computed, observable } from 'mobx';
+import autobind from 'autobind-decorator';
+import {
+    Column,
+    SortDirection,
+} from '../../../shared/components/lazyMobXTable/LazyMobXTable';
+import { StudyViewGenePanelModal } from './StudyViewGenePanelModal';
+import MobxPromiseCache from 'shared/lib/MobxPromiseCache';
+import { GenePanel } from 'shared/api/generated/CBioPortalAPI';
 import {
     correctColumnWidth,
-    correctMargin, getCNAByAlteration, getCNAColorByAlteration,
+    correctMargin,
+    getCNAByAlteration,
+    getCNAColorByAlteration,
     getFixedHeaderNumberCellMargin,
-    getFixedHeaderTableMaxLengthStringPixel, getFrequencyStr
-} from "pages/studyView/StudyViewUtils";
+    getFixedHeaderTableMaxLengthStringPixel,
+    getFrequencyStr,
+} from 'pages/studyView/StudyViewUtils';
+import { OncokbCancerGene } from 'pages/studyView/StudyViewPageStore';
+import {
+    getFreqColumnRender,
+    getGeneColumnHeaderRender,
+} from 'pages/studyView/TableUtils';
+import { GeneCell } from 'pages/studyView/table/GeneCell';
+import LabeledCheckbox from 'shared/components/labeledCheckbox/LabeledCheckbox';
+import styles from 'pages/studyView/table/tables.module.scss';
+import MobxPromise from 'mobxpromise';
 import {
-    OncokbCancerGene
-} from "pages/studyView/StudyViewPageStore";
-import {getFreqColumnRender, getGeneColumnHeaderRender} from "pages/studyView/TableUtils";
-import {GeneCell} from "pages/studyView/table/GeneCell";
-import LabeledCheckbox from "shared/components/labeledCheckbox/LabeledCheckbox";
-import styles from "pages/studyView/table/tables.module.scss";
-import MobxPromise from "mobxpromise";
-import { stringListToIndexSet, stringListToSet } from "cbioportal-frontend-commons";
-import ifNotDefined from "shared/lib/ifNotDefined";
+    stringListToIndexSet,
+    stringListToSet,
+} from 'cbioportal-frontend-commons';
+import ifNotDefined from 'shared/lib/ifNotDefined';
 
 export type GeneTableRow = OncokbCancerGene & {
-    entrezGeneId: number
-    hugoGeneSymbol: string
-    matchingGenePanelIds: Array<string>
-    numberOfAlteredCases: number
-    numberOfProfiledCases: number
-    qValue: number
-    totalCount: number
-    alteration?: number
-    cytoband?: string
-    uniqueKey: string
-}
+    entrezGeneId: number;
+    hugoGeneSymbol: string;
+    matchingGenePanelIds: Array<string>;
+    numberOfAlteredCases: number;
+    numberOfProfiledCases: number;
+    qValue: number;
+    totalCount: number;
+    alteration?: number;
+    cytoband?: string;
+    uniqueKey: string;
+};
 
 export enum GeneTableColumnKey {
-    GENE = "Gene",
-    NUMBER_FUSIONS = "# Fusion",
-    NUMBER_MUTATIONS = "# Mut",
-    CYTOBAND = "Cytoband",
-    CNA = "CNA",
-    NUMBER = "#",
-    FREQ = "Freq"
+    GENE = 'Gene',
+    NUMBER_FUSIONS = '# Fusion',
+    NUMBER_MUTATIONS = '# Mut',
+    CYTOBAND = 'Cytoband',
+    CNA = 'CNA',
+    NUMBER = '#',
+    FREQ = 'Freq',
 }
 
 export type GeneTableColumn = {
-    columnKey: GeneTableColumnKey,
-    columnWidthRatio?: number
-}
+    columnKey: GeneTableColumnKey;
+    columnWidthRatio?: number;
+};
 
-export type GeneTableProps = & {
-    tableType: 'mutation' | 'fusion' | 'cna',
+export type GeneTableProps = {
+    tableType: 'mutation' | 'fusion' | 'cna';
     promise: MobxPromise<GeneTableRow[]>;
     width: number;
     height: number;
@@ -68,8 +78,8 @@ export type GeneTableProps = & {
     filterByCancerGenes: boolean;
     onChangeCancerGeneFilter: (filtered: boolean) => void;
     defaultSortBy: GeneTableColumnKey;
-    columns: GeneTableColumn[],
-}
+    columns: GeneTableColumn[];
+};
 
 const DEFAULT_COLUMN_WIDTH_RATIO: { [key in GeneTableColumnKey]: number } = {
     [GeneTableColumnKey.GENE]: 0.35,
@@ -81,8 +91,7 @@ const DEFAULT_COLUMN_WIDTH_RATIO: { [key in GeneTableColumnKey]: number } = {
     [GeneTableColumnKey.CNA]: 0.14,
 };
 
-class GeneTableComponent extends FixedHeaderTable<GeneTableRow> {
-}
+class GeneTableComponent extends FixedHeaderTable<GeneTableRow> {}
 
 @observer
 export class GeneTable extends React.Component<GeneTableProps, {}> {
@@ -94,190 +103,229 @@ export class GeneTable extends React.Component<GeneTableProps, {}> {
         modalPanelName: string;
     } = {
         modalOpen: false,
-        modalPanelName: ""
+        modalPanelName: '',
     };
 
     public static defaultProps = {
-        cancerGeneFilterEnabled: false
+        cancerGeneFilterEnabled: false,
     };
 
-
     constructor(props: GeneTableProps, context: any) {
         super(props, context);
         this.sortBy = this.props.defaultSortBy;
     }
 
-    getDefaultColumnDefinition = (columnKey: GeneTableColumnKey, columnWidth: number, cellMargin: number) => {
-        const defaults: { [key in GeneTableColumnKey]: Column<GeneTableRow> } = {
+    getDefaultColumnDefinition = (
+        columnKey: GeneTableColumnKey,
+        columnWidth: number,
+        cellMargin: number
+    ) => {
+        const defaults: {
+            [key in GeneTableColumnKey]: Column<GeneTableRow>;
+        } = {
             [GeneTableColumnKey.GENE]: {
                 name: columnKey,
                 headerRender: () => {
-                    return getGeneColumnHeaderRender(cellMargin, columnKey, this.props.cancerGeneFilterEnabled!, this.isFilteredByCancerGeneList, this.toggleCancerGeneFilter);
+                    return getGeneColumnHeaderRender(
+                        cellMargin,
+                        columnKey,
+                        this.props.cancerGeneFilterEnabled!,
+                        this.isFilteredByCancerGeneList,
+                        this.toggleCancerGeneFilter
+                    );
                 },
                 render: (data: GeneTableRow) => {
-                    return <GeneCell
-                        tableType={this.props.tableType}
-                        selectedGenes={this.props.selectedGenes}
-                        hugoGeneSymbol={data.hugoGeneSymbol}
-                        qValue={data.qValue}
-                        isCancerGene={data.isCancerGene}
-                        oncokbAnnotated={data.oncokbAnnotated}
-                        isOncogene={data.isOncokbOncogene}
-                        isTumorSuppressorGene={data.isOncokbTumorSuppressorGene}
-                        onGeneSelect={this.props.onGeneSelect}
-                    />
+                    return (
+                        <GeneCell
+                            tableType={this.props.tableType}
+                            selectedGenes={this.props.selectedGenes}
+                            hugoGeneSymbol={data.hugoGeneSymbol}
+                            qValue={data.qValue}
+                            isCancerGene={data.isCancerGene}
+                            oncokbAnnotated={data.oncokbAnnotated}
+                            isOncogene={data.isOncokbOncogene}
+                            isTumorSuppressorGene={
+                                data.isOncokbTumorSuppressorGene
+                            }
+                            onGeneSelect={this.props.onGeneSelect}
+                        />
+                    );
                 },
                 sortBy: (data: GeneTableRow) => data.hugoGeneSymbol,
-                defaultSortDirection: "asc" as "asc",
+                defaultSortDirection: 'asc' as 'asc',
                 filter: (
                     data: GeneTableRow,
                     filterString: string,
                     filterStringUpper: string
                 ) => {
-                    return data.hugoGeneSymbol.toUpperCase().includes(filterStringUpper);
+                    return data.hugoGeneSymbol
+                        .toUpperCase()
+                        .includes(filterStringUpper);
                 },
-                width: columnWidth
+                width: columnWidth,
             },
             [GeneTableColumnKey.NUMBER]: {
                 name: columnKey,
-                tooltip: <span>Number of samples with one or more mutations</span>,
+                tooltip: (
+                    <span>Number of samples with one or more mutations</span>
+                ),
                 headerRender: () => {
-                    return <div style={{marginLeft: cellMargin}}>#</div>;
+                    return <div style={{ marginLeft: cellMargin }}>#</div>;
                 },
                 render: (data: GeneTableRow) => (
                     <LabeledCheckbox
                         checked={this.isChecked(data.uniqueKey)}
                         disabled={this.isDisabled(data.uniqueKey)}
-                        onChange={event => this.togglePreSelectRow(data.uniqueKey)}
+                        onChange={event =>
+                            this.togglePreSelectRow(data.uniqueKey)
+                        }
                         labelProps={{
                             style: {
-                                display: "flex",
-                                justifyContent: "space-between",
+                                display: 'flex',
+                                justifyContent: 'space-between',
                                 marginLeft: cellMargin,
-                                marginRight: cellMargin
-                            }
+                                marginRight: cellMargin,
+                            },
                         }}
                         inputProps={{
-                            className: styles.autoMarginCheckbox
+                            className: styles.autoMarginCheckbox,
                         }}
                     >
-                        <span>{data.numberOfAlteredCases.toLocaleString()}</span>
+                        <span>
+                            {data.numberOfAlteredCases.toLocaleString()}
+                        </span>
                     </LabeledCheckbox>
                 ),
                 sortBy: (data: GeneTableRow) => data.numberOfAlteredCases,
-                defaultSortDirection: "desc" as "desc",
+                defaultSortDirection: 'desc' as 'desc',
                 filter: (data: GeneTableRow, filterString: string) => {
-                    return _.toString(data.numberOfAlteredCases).includes(filterString);
+                    return _.toString(data.numberOfAlteredCases).includes(
+                        filterString
+                    );
                 },
-                width: columnWidth
+                width: columnWidth,
             },
             [GeneTableColumnKey.FREQ]: {
                 name: columnKey,
-                tooltip: <span>Percentage of samples with one or more mutations</span>,
+                tooltip: (
+                    <span>
+                        Percentage of samples with one or more mutations
+                    </span>
+                ),
                 headerRender: () => {
-                    return <div style={{marginLeft: cellMargin}}>Freq</div>;
+                    return <div style={{ marginLeft: cellMargin }}>Freq</div>;
                 },
                 render: (data: GeneTableRow) => {
-                    return getFreqColumnRender(this.props.tableType, data.numberOfProfiledCases, data.numberOfAlteredCases, data.matchingGenePanelIds, this.toggleModal, {marginLeft: cellMargin});
+                    return getFreqColumnRender(
+                        this.props.tableType,
+                        data.numberOfProfiledCases,
+                        data.numberOfAlteredCases,
+                        data.matchingGenePanelIds,
+                        this.toggleModal,
+                        { marginLeft: cellMargin }
+                    );
                 },
                 sortBy: (data: GeneTableRow) =>
-                    (data.numberOfAlteredCases / data.numberOfProfiledCases) * 100,
-                defaultSortDirection: "desc" as "desc",
+                    (data.numberOfAlteredCases / data.numberOfProfiledCases) *
+                    100,
+                defaultSortDirection: 'desc' as 'desc',
                 filter: (data: GeneTableRow, filterString: string) => {
                     return _.toString(
-                        getFrequencyStr(data.numberOfAlteredCases / data.numberOfProfiledCases)
+                        getFrequencyStr(
+                            data.numberOfAlteredCases /
+                                data.numberOfProfiledCases
+                        )
                     ).includes(filterString);
                 },
-                width: columnWidth
+                width: columnWidth,
             },
             [GeneTableColumnKey.NUMBER_MUTATIONS]: {
                 name: columnKey,
                 tooltip: <span>Total number of mutations</span>,
                 headerRender: () => {
-                    return (
-                        <div style={{marginLeft: cellMargin}}>
-                            # Mut
-                        </div>
-                    );
+                    return <div style={{ marginLeft: cellMargin }}># Mut</div>;
                 },
                 render: (data: GeneTableRow) => (
                     <span
                         style={{
-                            flexDirection: "row-reverse",
-                            display: "flex",
-                            marginRight: cellMargin
+                            flexDirection: 'row-reverse',
+                            display: 'flex',
+                            marginRight: cellMargin,
                         }}
                     >
                         {data.totalCount.toLocaleString()}
                     </span>
                 ),
                 sortBy: (data: GeneTableRow) => data.totalCount,
-                defaultSortDirection: "desc" as "desc",
+                defaultSortDirection: 'desc' as 'desc',
                 filter: (data: GeneTableRow, filterString: string) => {
                     return _.toString(data.totalCount).includes(filterString);
                 },
-                width: columnWidth
+                width: columnWidth,
             },
             [GeneTableColumnKey.NUMBER_FUSIONS]: {
                 name: GeneTableColumnKey.NUMBER_FUSIONS,
                 tooltip: <span>Total number of mutations</span>,
                 headerRender: () => {
-                    return (
-                        <span># Fusion</span>
-                    );
+                    return <span># Fusion</span>;
                 },
                 render: (data: GeneTableRow) => (
                     <span
                         style={{
-                            flexDirection: "row-reverse",
-                            display: "flex",
-                            marginRight: cellMargin
+                            flexDirection: 'row-reverse',
+                            display: 'flex',
+                            marginRight: cellMargin,
                         }}
                     >
                         {data.totalCount.toLocaleString()}
                     </span>
                 ),
                 sortBy: (data: GeneTableRow) => data.totalCount,
-                defaultSortDirection: "desc" as "desc",
+                defaultSortDirection: 'desc' as 'desc',
                 filter: (data: GeneTableRow, filterString: string) => {
                     return _.toString(data.totalCount).includes(filterString);
                 },
-                width: columnWidth
+                width: columnWidth,
             },
             [GeneTableColumnKey.CNA]: {
                 name: GeneTableColumnKey.CNA,
                 tooltip: (
                     <span>
-                        Copy number alteration, only amplifications and deep deletions are shown
+                        Copy number alteration, only amplifications and deep
+                        deletions are shown
                     </span>
                 ),
                 render: (data: GeneTableRow) => (
                     <span
                         style={{
-                            color: getCNAColorByAlteration(getCNAByAlteration(data.alteration!)),
-                            fontWeight: "bold"
+                            color: getCNAColorByAlteration(
+                                getCNAByAlteration(data.alteration!)
+                            ),
+                            fontWeight: 'bold',
                         }}
                     >
                         {getCNAByAlteration(data.alteration!)}
                     </span>
                 ),
                 sortBy: (data: GeneTableRow) => data.alteration!,
-                defaultSortDirection: "asc" as "asc",
+                defaultSortDirection: 'asc' as 'asc',
                 filter: (
                     data: GeneTableRow,
                     filterString: string,
                     filterStringUpper: string
                 ) => {
-                    return getCNAByAlteration(data.alteration!).includes(filterStringUpper);
+                    return getCNAByAlteration(data.alteration!).includes(
+                        filterStringUpper
+                    );
                 },
-                width: columnWidth
+                width: columnWidth,
             },
             [GeneTableColumnKey.CYTOBAND]: {
                 name: GeneTableColumnKey.CYTOBAND,
                 tooltip: <span>Cytoband</span>,
                 render: (data: GeneTableRow) => <span>{data.cytoband}</span>,
                 sortBy: (data: GeneTableRow) => data.cytoband!,
-                defaultSortDirection: "asc" as "asc",
+                defaultSortDirection: 'asc' as 'asc',
                 filter: (
                     data: GeneTableRow,
                     filterString: string,
@@ -285,15 +333,20 @@ export class GeneTable extends React.Component<GeneTableProps, {}> {
                 ) => {
                     return _.isUndefined(data.cytoband)
                         ? false
-                        : data.cytoband.toUpperCase().includes(filterStringUpper);
+                        : data.cytoband
+                              .toUpperCase()
+                              .includes(filterStringUpper);
                 },
-                width: columnWidth
+                width: columnWidth,
             },
-        }
+        };
         return defaults[columnKey];
-    }
+    };
 
-    getDefaultCellMargin = (columnKey: GeneTableColumnKey, columnWidth: number) => {
+    getDefaultCellMargin = (
+        columnKey: GeneTableColumnKey,
+        columnWidth: number
+    ) => {
         const defaults: { [key in GeneTableColumnKey]: number } = {
             [GeneTableColumnKey.GENE]: 0,
             [GeneTableColumnKey.NUMBER_MUTATIONS]: correctMargin(
@@ -309,13 +362,27 @@ export class GeneTable extends React.Component<GeneTableProps, {}> {
                 )
             ),
             [GeneTableColumnKey.NUMBER]: correctMargin(
-                (columnWidth - 10 - (
-                        getFixedHeaderTableMaxLengthStringPixel(this.alteredCasesLocaleString) + 20)
-                ) / 2),
+                (columnWidth -
+                    10 -
+                    (getFixedHeaderTableMaxLengthStringPixel(
+                        this.alteredCasesLocaleString
+                    ) +
+                        20)) /
+                    2
+            ),
             [GeneTableColumnKey.FREQ]: correctMargin(
                 getFixedHeaderNumberCellMargin(
                     columnWidth,
-                    getFrequencyStr(_.max(this.tableData.map(item => (item.numberOfAlteredCases! / item.numberOfProfiledCases!) * 100))!)
+                    getFrequencyStr(
+                        _.max(
+                            this.tableData.map(
+                                item =>
+                                    (item.numberOfAlteredCases! /
+                                        item.numberOfProfiledCases!) *
+                                    100
+                            )
+                        )!
+                    )
                 )
             ),
             [GeneTableColumnKey.CYTOBAND]: 0,
@@ -336,32 +403,54 @@ export class GeneTable extends React.Component<GeneTableProps, {}> {
 
     @computed
     get totalCountLocaleString() {
-        return this.maxNumberTotalCount === undefined ? '' : this.maxNumberTotalCount.toLocaleString();
+        return this.maxNumberTotalCount === undefined
+            ? ''
+            : this.maxNumberTotalCount.toLocaleString();
     }
 
     @computed
     get alteredCasesLocaleString() {
-        return this.maxNumberAlteredCasesColumn === undefined ? '' : this.maxNumberAlteredCasesColumn.toLocaleString();
+        return this.maxNumberAlteredCasesColumn === undefined
+            ? ''
+            : this.maxNumberAlteredCasesColumn.toLocaleString();
     }
 
     @computed
     get columnsWidth() {
-        return _.reduce(this.props.columns, (acc, column) => {
-            acc[column.columnKey] = correctColumnWidth((column.columnWidthRatio ? column.columnWidthRatio : DEFAULT_COLUMN_WIDTH_RATIO[column.columnKey]) * this.props.width);
-            return acc;
-        }, {} as { [key in GeneTableColumnKey]: number });
+        return _.reduce(
+            this.props.columns,
+            (acc, column) => {
+                acc[column.columnKey] = correctColumnWidth(
+                    (column.columnWidthRatio
+                        ? column.columnWidthRatio
+                        : DEFAULT_COLUMN_WIDTH_RATIO[column.columnKey]) *
+                        this.props.width
+                );
+                return acc;
+            },
+            {} as { [key in GeneTableColumnKey]: number }
+        );
     }
 
     @computed
     get cellMargin() {
-        return _.reduce(this.props.columns, (acc, column) => {
-            acc[column.columnKey] = this.getDefaultCellMargin(column.columnKey, this.columnsWidth[column.columnKey]);
-            return acc;
-        }, {} as { [key in GeneTableColumnKey]: number });
+        return _.reduce(
+            this.props.columns,
+            (acc, column) => {
+                acc[column.columnKey] = this.getDefaultCellMargin(
+                    column.columnKey,
+                    this.columnsWidth[column.columnKey]
+                );
+                return acc;
+            },
+            {} as { [key in GeneTableColumnKey]: number }
+        );
     }
 
     @computed get tableData() {
-        return this.isFilteredByCancerGeneList ? _.filter(this.props.promise.result, data => data.isCancerGene) : (this.props.promise.result || []);
+        return this.isFilteredByCancerGeneList
+            ? _.filter(this.props.promise.result, data => data.isCancerGene)
+            : this.props.promise.result || [];
     }
 
     @computed get flattenedFilters() {
@@ -372,7 +461,10 @@ export class GeneTable extends React.Component<GeneTableProps, {}> {
         if (this.flattenedFilters.length === 0) {
             return this.tableData;
         }
-        return _.filter(this.tableData, data => !this.flattenedFilters.includes(data.uniqueKey));
+        return _.filter(
+            this.tableData,
+            data => !this.flattenedFilters.includes(data.uniqueKey)
+        );
     }
 
     @computed
@@ -383,7 +475,9 @@ export class GeneTable extends React.Component<GeneTableProps, {}> {
         const order = stringListToIndexSet(this.flattenedFilters);
         return _.chain(this.tableData)
             .filter(data => this.flattenedFilters.includes(data.uniqueKey))
-            .sortBy<GeneTableRow>(data => ifNotDefined(order[data.uniqueKey], Number.POSITIVE_INFINITY))
+            .sortBy<GeneTableRow>(data =>
+                ifNotDefined(order[data.uniqueKey], Number.POSITIVE_INFINITY)
+            )
             .value();
     }
 
@@ -394,7 +488,13 @@ export class GeneTable extends React.Component<GeneTableProps, {}> {
 
     @computed
     get tableColumns() {
-        return this.props.columns.map(column => this.getDefaultColumnDefinition(column.columnKey, this.columnsWidth[column.columnKey], this.cellMargin[column.columnKey]));
+        return this.props.columns.map(column =>
+            this.getDefaultColumnDefinition(
+                column.columnKey,
+                this.columnsWidth[column.columnKey],
+                this.cellMargin[column.columnKey]
+            )
+        );
     }
 
     @autobind
@@ -416,15 +516,21 @@ export class GeneTable extends React.Component<GeneTableProps, {}> {
     @autobind
     toggleCancerGeneFilter(event: any) {
         event.stopPropagation();
-        this.props.onChangeCancerGeneFilter(!this.props.filterByCancerGenes)
+        this.props.onChangeCancerGeneFilter(!this.props.filterByCancerGenes);
     }
 
     @computed get isFilteredByCancerGeneList() {
-        return !!this.props.cancerGeneFilterEnabled && this.props.filterByCancerGenes;
+        return (
+            !!this.props.cancerGeneFilterEnabled &&
+            this.props.filterByCancerGenes
+        );
     }
 
     @computed get allSelectedRowsKeysSet() {
-        return stringListToSet([...this.selectedRowsKeys, ...this.preSelectedRowsKeys]);
+        return stringListToSet([
+            ...this.selectedRowsKeys,
+            ...this.preSelectedRowsKeys,
+        ]);
     }
 
     @autobind
@@ -434,12 +540,12 @@ export class GeneTable extends React.Component<GeneTableProps, {}> {
 
     @autobind
     isDisabled(uniqueKey: string) {
-        return _.some(this.preSelectedRowsKeys, (key) => key === uniqueKey);
+        return _.some(this.preSelectedRowsKeys, key => key === uniqueKey);
     }
 
     @autobind
     togglePreSelectRow(uniqueKey: string) {
-        const record = _.find(this.selectedRowsKeys,(key) => key === uniqueKey);
+        const record = _.find(this.selectedRowsKeys, key => key === uniqueKey);
         if (_.isUndefined(record)) {
             this.selectedRowsKeys.push(uniqueKey);
         } else {
@@ -460,21 +566,29 @@ export class GeneTable extends React.Component<GeneTableProps, {}> {
     }
 
     @computed get filterKeyToIndexSet() {
-        return _.reduce(this.props.filters, (acc, next, index) => {
-            next.forEach(key => {
-                acc[key] = index;
-            });
-            return acc;
-        }, {} as { [id: string]: number });
+        return _.reduce(
+            this.props.filters,
+            (acc, next, index) => {
+                next.forEach(key => {
+                    acc[key] = index;
+                });
+                return acc;
+            },
+            {} as { [id: string]: number }
+        );
     }
 
     @autobind
     selectedRowClassName(data: GeneTableRow) {
         const index = this.filterKeyToIndexSet[data.uniqueKey];
         if (index === undefined) {
-            return this.props.filters.length % 2 === 0 ? styles.highlightedEvenRow : styles.highlightedOddRow;
+            return this.props.filters.length % 2 === 0
+                ? styles.highlightedEvenRow
+                : styles.highlightedOddRow;
         }
-        return index % 2 === 0 ? styles.highlightedEvenRow : styles.highlightedOddRow;
+        return index % 2 === 0
+            ? styles.highlightedEvenRow
+            : styles.highlightedOddRow;
     }
 
     @autobind
@@ -485,7 +599,7 @@ export class GeneTable extends React.Component<GeneTableProps, {}> {
     }
 
     public render() {
-        const tableId= `${this.props.tableType}-genes-table`
+        const tableId = `${this.props.tableType}-genes-table`;
         return (
             <div data-test={tableId} key={tableId}>
                 {this.props.promise.isComplete && (
@@ -494,7 +608,9 @@ export class GeneTable extends React.Component<GeneTableProps, {}> {
                         height={this.props.height}
                         data={this.selectableTableData}
                         columns={this.tableColumns}
-                        showSelectSamples={true && this.selectedRowsKeys.length > 0}
+                        showSelectSamples={
+                            true && this.selectedRowsKeys.length > 0
+                        }
                         isSelectedRow={this.isSelectedRow}
                         afterSelectingRows={this.afterSelectingRows}
                         sortBy={this.sortBy}
diff --git a/src/pages/studyView/table/StudyViewGenePanelModal.tsx b/src/pages/studyView/table/StudyViewGenePanelModal.tsx
index 5ed584c2ce5..fa25a609e97 100644
--- a/src/pages/studyView/table/StudyViewGenePanelModal.tsx
+++ b/src/pages/studyView/table/StudyViewGenePanelModal.tsx
@@ -1,8 +1,8 @@
-import * as React from "react";
-import {GenePanel} from "shared/api/generated/CBioPortalAPI";
-import { observer } from "mobx-react";
-import MobxPromiseCache from "shared/lib/MobxPromiseCache";
-import GenePanelModal from "shared/components/GenePanelModal/GenePanelModal";
+import * as React from 'react';
+import { GenePanel } from 'shared/api/generated/CBioPortalAPI';
+import { observer } from 'mobx-react';
+import MobxPromiseCache from 'shared/lib/MobxPromiseCache';
+import GenePanelModal from 'shared/components/GenePanelModal/GenePanelModal';
 
 interface IStudyViewGeneModalProps {
     genePanelCache: MobxPromiseCache<{ genePanelId: string }, GenePanel>;
@@ -18,23 +18,24 @@ interface IGenePanelTooltipProps {
 
 export const GenePanelList: React.FunctionComponent<IGenePanelTooltipProps> = ({
     genePanelIds,
-    toggleModal
+    toggleModal,
 }) => {
     if (genePanelIds.length > 0) {
         return (
-            <span style={{maxWidth: 400}}>
-                Gene panels:{" "}
+            <span style={{ maxWidth: 400 }}>
+                Gene panels:{' '}
                 {genePanelIds.map((genePanelId, i) => [
-                    i > 0 && ", ",
-                    <a key={genePanelId}
-                       data-test={`gene-panel-linkout-${genePanelId}`}
+                    i > 0 && ', ',
+                    <a
+                        key={genePanelId}
+                        data-test={`gene-panel-linkout-${genePanelId}`}
                         href="#"
                         onClick={() => {
                             toggleModal(genePanelId);
                         }}
                     >
                         {genePanelId}
-                    </a>
+                    </a>,
                 ])}
             </span>
         );
@@ -44,18 +45,23 @@ export const GenePanelList: React.FunctionComponent<IGenePanelTooltipProps> = ({
 };
 
 @observer
-export class StudyViewGenePanelModal extends React.Component<IStudyViewGeneModalProps, {}> {
-    getGenesList = (result:GenePanel|undefined) => {
+export class StudyViewGenePanelModal extends React.Component<
+    IStudyViewGeneModalProps,
+    {}
+> {
+    getGenesList = (result: GenePanel | undefined) => {
         if (result && result.genes) {
             return result.genes.map(gene => (
                 <p key={gene.entrezGeneId}>{gene.hugoGeneSymbol}</p>
-            ))
+            ));
         }
         return null;
-    }
-    
+    };
+
     render() {
-        const mobxPromise = this.props.genePanelCache.get({genePanelId: this.props.panelName});
+        const mobxPromise = this.props.genePanelCache.get({
+            genePanelId: this.props.panelName,
+        });
         return (
             <GenePanelModal
                 panelName={this.props.panelName}
@@ -63,8 +69,9 @@ export class StudyViewGenePanelModal extends React.Component<IStudyViewGeneModal
                 onHide={this.props.onHide}
                 isLoading={mobxPromise.isPending}
             >
-                {mobxPromise.isComplete && this.getGenesList(mobxPromise.result)}
+                {mobxPromise.isComplete &&
+                    this.getGenesList(mobxPromise.result)}
             </GenePanelModal>
         );
     }
-};
+}
diff --git a/src/pages/studyView/table/tables.module.scss b/src/pages/studyView/table/tables.module.scss
index caea251ffa9..89759df3908 100644
--- a/src/pages/studyView/table/tables.module.scss
+++ b/src/pages/studyView/table/tables.module.scss
@@ -1,116 +1,120 @@
 $study-view-table-icon-size: 10px;
 
 .studyViewTablesTable {
-  display: flex;
-  flex-direction: column;
-  flex-grow: 1;
+    display: flex;
+    flex-direction: column;
+    flex-grow: 1;
 }
 
 // The current portal is wrapped a class .cbioportal-frontend to overwrite the legacy styles
 // May need to come back to clean up the important statements after in SPA
 .tableSearchInput {
-  width: 150px !important;
-  height: 25px !important;
+    width: 150px !important;
+    height: 25px !important;
 }
 
 .labelContent {
-  overflow: hidden;
-  white-space: nowrap;
-  display: flex;
-  align-items: center;
+    overflow: hidden;
+    white-space: nowrap;
+    display: flex;
+    align-items: center;
 }
 
 .labelContentSVG {
-  flex-shrink: 0;
+    flex-shrink: 0;
 }
 
 .controls {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  flex-grow: 1;
-  font-size: 13px !important;
-  padding: 0 5px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    flex-grow: 1;
+    font-size: 13px !important;
+    padding: 0 5px;
 }
 
 .controlsBtn {
-  padding: 2px 5px;
+    padding: 2px 5px;
 }
 
 .geneSymbol:hover {
-  cursor: pointer;
+    cursor: pointer;
 }
 
 .cancerGene {
-  font-weight: bold
+    font-weight: bold;
 }
 
 .headerColumn {
-  text-transform: none;
-  font-size: 13px;
-  line-height: 15px;
+    text-transform: none;
+    font-size: 13px;
+    line-height: 15px;
 }
 
 .headerRow {
-  border-bottom: 1px solid #d1d1d1;
+    border-bottom: 1px solid #d1d1d1;
 }
 
 .row {
-  font-size: 13px;
+    font-size: 13px;
 }
 
 .oddRow {
-  background-color: #f9f9f9;
+    background-color: #f9f9f9;
 }
 
 .evenRow {
-  background-color: #ffffff;
+    background-color: #ffffff;
 }
 
-.highlightedEvenRow, .highlightedRow {
-  background-color: #d3d3d3;
+.highlightedEvenRow,
+.highlightedRow {
+    background-color: #d3d3d3;
 }
 
 .highlightedOddRow {
-  background-color: #e0e0e0;
+    background-color: #e0e0e0;
 }
 
 .cancerGeneIcon {
-  margin-right: 5px;
+    margin-right: 5px;
 }
 
 .cancerGeneIcon > img {
-  height: $study-view-table-icon-size;
+    height: $study-view-table-icon-size;
 }
 
-.gistic, .mutsig, .cancerGenesRow > img {
-  height: $study-view-table-icon-size;
-  margin-left: 2px;
-  vertical-align: inherit !important;
+.gistic,
+.mutsig,
+.cancerGenesRow > img {
+    height: $study-view-table-icon-size;
+    margin-left: 2px;
+    vertical-align: inherit !important;
 }
 
 .amp {
-  color: red;
+    color: red;
 }
 
 .del {
-  color: #0000ff;
+    color: #0000ff;
 }
 
-.amp, .del {
-  font-weight: bold;
+.amp,
+.del {
+    font-weight: bold;
 }
 
 .displayFlex {
-  display: flex;
-  align-items: center;
+    display: flex;
+    align-items: center;
 }
 
 .headerSortingIcon {
-  margin-left: 5px;
+    margin-left: 5px;
 }
 
 .autoMarginCheckbox {
-  margin-top: auto !important;
-  margin-bottom: auto !important;
-}
\ No newline at end of file
+    margin-top: auto !important;
+    margin-bottom: auto !important;
+}
diff --git a/src/pages/studyView/tabs/CNSegments.tsx b/src/pages/studyView/tabs/CNSegments.tsx
index 6fb3052129b..f04c7860b8c 100644
--- a/src/pages/studyView/tabs/CNSegments.tsx
+++ b/src/pages/studyView/tabs/CNSegments.tsx
@@ -1,43 +1,55 @@
 import * as React from 'react';
-import {observer} from "mobx-react";
-import {action, computed, observable} from "mobx";
-import autobind from "autobind-decorator";
-
-import {CopyNumberSeg} from "shared/api/generated/CBioPortalAPI";
-import IntegrativeGenomicsViewer from "shared/components/igv/IntegrativeGenomicsViewer";
-import {calcSegmentTrackHeight, defaultSegmentTrackProps, generateSegmentFeatures} from "shared/lib/IGVUtils";
-import {DEFAULT_GENOME} from "../../resultsView/ResultsViewPageStoreUtils";
-import ProgressIndicator, {IProgressIndicatorItem} from "shared/components/progressIndicator/ProgressIndicator";
-import LoadingIndicator from "shared/components/loadingIndicator/LoadingIndicator";
-import CNSegmentsDownloader from "shared/components/cnSegments/CNSegmentsDownloader";
-import WindowStore from "shared/components/window/WindowStore";
-
-import { StudyViewPageTabKeyEnum } from "pages/studyView/StudyViewPageTabs";
-import {StudyViewPageStore} from "../StudyViewPageStore";
+import { observer } from 'mobx-react';
+import { action, computed, observable } from 'mobx';
+import autobind from 'autobind-decorator';
+
+import { CopyNumberSeg } from 'shared/api/generated/CBioPortalAPI';
+import IntegrativeGenomicsViewer from 'shared/components/igv/IntegrativeGenomicsViewer';
+import {
+    calcSegmentTrackHeight,
+    defaultSegmentTrackProps,
+    generateSegmentFeatures,
+} from 'shared/lib/IGVUtils';
+import { DEFAULT_GENOME } from '../../resultsView/ResultsViewPageStoreUtils';
+import ProgressIndicator, {
+    IProgressIndicatorItem,
+} from 'shared/components/progressIndicator/ProgressIndicator';
+import LoadingIndicator from 'shared/components/loadingIndicator/LoadingIndicator';
+import CNSegmentsDownloader from 'shared/components/cnSegments/CNSegmentsDownloader';
+import WindowStore from 'shared/components/window/WindowStore';
+
+import { StudyViewPageTabKeyEnum } from 'pages/studyView/StudyViewPageTabs';
+import { StudyViewPageStore } from '../StudyViewPageStore';
 
 @observer
-export default class CNSegments extends React.Component<{ store: StudyViewPageStore }, {}> {
+export default class CNSegments extends React.Component<
+    { store: StudyViewPageStore },
+    {}
+> {
     @observable renderingComplete = false;
-    @observable segmentTrackMaxHeight: number|undefined;
+    @observable segmentTrackMaxHeight: number | undefined;
 
-    constructor(props: {store: StudyViewPageStore})
-    {
+    constructor(props: { store: StudyViewPageStore }) {
         super(props);
         this.segmentTrackMaxHeight = WindowStore.size.height * 0.7;
     }
 
     @computed get segmentTrackHeight() {
-        return calcSegmentTrackHeight(this.features, this.segmentTrackMaxHeight);
+        return calcSegmentTrackHeight(
+            this.features,
+            this.segmentTrackMaxHeight
+        );
     }
 
     @computed get features() {
-        const segments: CopyNumberSeg[] = this.activePromise ? this.activePromise.result || [] : [];
+        const segments: CopyNumberSeg[] = this.activePromise
+            ? this.activePromise.result || []
+            : [];
 
         return generateSegmentFeatures(segments);
     }
 
-    @computed get filename()
-    {
+    @computed get filename() {
         return `${this.props.store.downloadFilenamePrefix}segments.seg`;
     }
 
@@ -45,8 +57,7 @@ export default class CNSegments extends React.Component<{ store: StudyViewPageSt
         return this.isLoading || !this.renderingComplete;
     }
 
-    @computed get isLoading()
-    {
+    @computed get isLoading() {
         return this.activePromise ? this.activePromise.isPending : true;
     }
 
@@ -57,62 +68,85 @@ export default class CNSegments extends React.Component<{ store: StudyViewPageSt
     @computed get progressItems(): IProgressIndicatorItem[] {
         return [
             {
-                label: "Loading copy number segments data...",
-                promises: [this.activePromise]
+                label: 'Loading copy number segments data...',
+                promises: [this.activePromise],
             },
             {
-                label: "Rendering"
-            }
+                label: 'Rendering',
+            },
         ];
     }
 
-    @computed get hasNoSegmentData()
-    {
-        return this.activePromise.isComplete && (!this.activePromise.result || this.activePromise.result.length === 0);
+    @computed get hasNoSegmentData() {
+        return (
+            this.activePromise.isComplete &&
+            (!this.activePromise.result ||
+                this.activePromise.result.length === 0)
+        );
     }
 
     @computed get genome() {
-        const study = this.props.store.allPhysicalStudies.result?
-            this.props.store.allPhysicalStudies.result[0]: undefined;
-        return study? study.referenceGenome: DEFAULT_GENOME;
+        const study = this.props.store.allPhysicalStudies.result
+            ? this.props.store.allPhysicalStudies.result[0]
+            : undefined;
+        return study ? study.referenceGenome : DEFAULT_GENOME;
     }
 
     public render() {
         return (
             <div>
-                <LoadingIndicator isLoading={this.isHidden} size={"big"} center={true}>
-                    <ProgressIndicator getItems={() => this.progressItems} show={this.isHidden} sequential={true}/>
+                <LoadingIndicator
+                    isLoading={this.isHidden}
+                    size={'big'}
+                    center={true}
+                >
+                    <ProgressIndicator
+                        getItems={() => this.progressItems}
+                        show={this.isHidden}
+                        sequential={true}
+                    />
                 </LoadingIndicator>
-                <div style={{marginBottom: 15, marginLeft: 15}}>
+                <div style={{ marginBottom: 15, marginLeft: 15 }}>
                     <span>
-                        {this.hasNoSegmentData ? "No segmented" : "Segmented"} copy-number data for the selected {
-                            this.props.store.selectedSamples.result && this.props.store.selectedSamples.result.length
-                        } {
-                            this.props.store.selectedSamples.result && this.props.store.selectedSamples.result.length === 1 ?
-                            "sample." : "samples."
-                        }
+                        {this.hasNoSegmentData ? 'No segmented' : 'Segmented'}{' '}
+                        copy-number data for the selected{' '}
+                        {this.props.store.selectedSamples.result &&
+                            this.props.store.selectedSamples.result.length}{' '}
+                        {this.props.store.selectedSamples.result &&
+                        this.props.store.selectedSamples.result.length === 1
+                            ? 'sample.'
+                            : 'samples.'}
                     </span>
-                    {
-                        !this.hasNoSegmentData &&
+                    {!this.hasNoSegmentData && (
                         <CNSegmentsDownloader
                             promise={this.activePromise}
                             filename={this.filename}
                         />
-                    }
+                    )}
                 </div>
-                <div style={this.isHidden || this.hasNoSegmentData ? {opacity: 0} : undefined}>
+                <div
+                    style={
+                        this.isHidden || this.hasNoSegmentData
+                            ? { opacity: 0 }
+                            : undefined
+                    }
+                >
                     <IntegrativeGenomicsViewer
                         tracks={[
                             {
                                 ...defaultSegmentTrackProps(),
                                 height: this.segmentTrackHeight,
-                                features: this.features
-                            }
+                                features: this.features,
+                            },
                         ]}
                         genome={this.genome}
                         onRenderingStart={this.onIgvRenderingStart}
                         onRenderingComplete={this.onIgvRenderingComplete}
-                        isVisible={this.props.store.currentTab === StudyViewPageTabKeyEnum.CN_SEGMENTS && !this.isHidden}
+                        isVisible={
+                            this.props.store.currentTab ===
+                                StudyViewPageTabKeyEnum.CN_SEGMENTS &&
+                            !this.isHidden
+                        }
                     />
                 </div>
             </div>
@@ -120,12 +154,14 @@ export default class CNSegments extends React.Component<{ store: StudyViewPageSt
     }
 
     @autobind
-    @action private onIgvRenderingStart() {
+    @action
+    private onIgvRenderingStart() {
         this.renderingComplete = false;
     }
 
     @autobind
-    @action private onIgvRenderingComplete() {
+    @action
+    private onIgvRenderingComplete() {
         this.renderingComplete = true;
     }
 }
diff --git a/src/pages/studyView/tabs/ClinicalDataTab.tsx b/src/pages/studyView/tabs/ClinicalDataTab.tsx
index 946623486e6..55f9ad22fe0 100644
--- a/src/pages/studyView/tabs/ClinicalDataTab.tsx
+++ b/src/pages/studyView/tabs/ClinicalDataTab.tsx
@@ -1,132 +1,226 @@
-import * as React from "react";
-import {Column, default as LazyMobXTable} from "shared/components/lazyMobXTable/LazyMobXTable";
-import {observer} from "mobx-react";
+import * as React from 'react';
+import {
+    Column,
+    default as LazyMobXTable,
+} from 'shared/components/lazyMobXTable/LazyMobXTable';
+import { observer } from 'mobx-react';
 import * as _ from 'lodash';
-import {getPatientViewUrl, getSampleViewUrl} from "shared/api/urls";
+import { getPatientViewUrl, getSampleViewUrl } from 'shared/api/urls';
 import {
     chartMetaComparator,
     getClinicalAttributeOverlay,
     getUniqueKey,
     ChartMeta,
     UniqueKey,
-    DataType
-} from "../StudyViewUtils";
-import LoadingIndicator from "shared/components/loadingIndicator/LoadingIndicator";
-import {StudyViewPageStore} from "pages/studyView/StudyViewPageStore";
-import {isUrl, remoteData} from "cbioportal-frontend-commons";
-import {Else, If, Then} from 'react-if';
-import ProgressIndicator, {IProgressIndicatorItem} from "../../../shared/components/progressIndicator/ProgressIndicator";
+    DataType,
+} from '../StudyViewUtils';
+import LoadingIndicator from 'shared/components/loadingIndicator/LoadingIndicator';
+import { StudyViewPageStore } from 'pages/studyView/StudyViewPageStore';
+import { isUrl, remoteData } from 'cbioportal-frontend-commons';
+import { Else, If, Then } from 'react-if';
+import ProgressIndicator, {
+    IProgressIndicatorItem,
+} from '../../../shared/components/progressIndicator/ProgressIndicator';
 import autobind from 'autobind-decorator';
-import {WindowWidthBox} from "../../../shared/components/WindowWidthBox/WindowWidthBox";
+import { WindowWidthBox } from '../../../shared/components/WindowWidthBox/WindowWidthBox';
 
 export interface IClinicalDataTabTable {
     store: StudyViewPageStore;
 }
 
-class ClinicalDataTabTableComponent extends LazyMobXTable<{ [id: string]: string }> {
-}
+class ClinicalDataTabTableComponent extends LazyMobXTable<{
+    [id: string]: string;
+}> {}
 
 @observer
-export class ClinicalDataTab extends React.Component<IClinicalDataTabTable, {}> {
-
-    getDefaultColumnConfig(key: string, columnName:string, isNumber?: boolean) {
+export class ClinicalDataTab extends React.Component<
+    IClinicalDataTabTable,
+    {}
+> {
+    getDefaultColumnConfig(
+        key: string,
+        columnName: string,
+        isNumber?: boolean
+    ) {
         return {
             name: columnName || '',
-            headerRender: (data: string) => <span data-test={data}>{data}</span>,
+            headerRender: (data: string) => (
+                <span data-test={data}>{data}</span>
+            ),
             render: (data: { [id: string]: string }) => {
                 if (isUrl(data[key])) {
-                    return <a href={data[key]} target="_blank">{data[key]}</a>
+                    return (
+                        <a href={data[key]} target="_blank">
+                            {data[key]}
+                        </a>
+                    );
                 }
-                return <span data-test={data[key]}>{data[key]}</span>
+                return <span data-test={data[key]}>{data[key]}</span>;
             },
             download: (data: { [id: string]: string }) => data[key] || '',
             sortBy: (data: { [id: string]: any }) => {
                 if (data[key]) {
                     if (isNumber) {
                         return parseFloat(data[key]);
-                    }
-                    else {
+                    } else {
                         return data[key];
                     }
                 }
                 return null;
             },
-            filter: (data: { [id: string]: string }, filterString: string, filterStringUpper: string) => (data[key] || '').toUpperCase().includes(filterStringUpper)
+            filter: (
+                data: { [id: string]: string },
+                filterString: string,
+                filterStringUpper: string
+            ) => (data[key] || '').toUpperCase().includes(filterStringUpper),
         };
     }
 
     readonly columns = remoteData({
         invoke: async () => {
-            let defaultColumns: Column<{ [id: string]: string }>[] = [{
-                ...this.getDefaultColumnConfig('patientId', 'Patient ID'),
-                render: (data: { [id: string]: string }) => {
-                    return <a href={getPatientViewUrl(data.studyId, data.patientId)}
-                              target='_blank'>{data.patientId}</a>
-                }
-            }, {
-                ...this.getDefaultColumnConfig('sampleId', 'Sample ID'),
-                render: (data: { [id: string]: string }) => {
-                    return <a href={getSampleViewUrl(data.studyId, data.sampleId)} target='_blank'>{data.sampleId}</a>
-                }
-            }];
+            let defaultColumns: Column<{ [id: string]: string }>[] = [
+                {
+                    ...this.getDefaultColumnConfig('patientId', 'Patient ID'),
+                    render: (data: { [id: string]: string }) => {
+                        return (
+                            <a
+                                href={getPatientViewUrl(
+                                    data.studyId,
+                                    data.patientId
+                                )}
+                                target="_blank"
+                            >
+                                {data.patientId}
+                            </a>
+                        );
+                    },
+                },
+                {
+                    ...this.getDefaultColumnConfig('sampleId', 'Sample ID'),
+                    render: (data: { [id: string]: string }) => {
+                        return (
+                            <a
+                                href={getSampleViewUrl(
+                                    data.studyId,
+                                    data.sampleId
+                                )}
+                                target="_blank"
+                            >
+                                {data.sampleId}
+                            </a>
+                        );
+                    },
+                },
+            ];
 
-            if (_.find(this.props.store.visibleAttributes, chartMeta => chartMeta.uniqueKey === UniqueKey.CANCER_STUDIES) !== undefined) {
+            if (
+                _.find(
+                    this.props.store.visibleAttributes,
+                    chartMeta =>
+                        chartMeta.uniqueKey === UniqueKey.CANCER_STUDIES
+                ) !== undefined
+            ) {
                 defaultColumns.push({
-                    ...this.getDefaultColumnConfig('studyId', 'Cancer Study')
+                    ...this.getDefaultColumnConfig('studyId', 'Cancer Study'),
                 });
             }
-            return _.reduce(this.props.store.visibleAttributes.sort(chartMetaComparator),
-                (acc: Column<{ [id: string]: string }>[], chartMeta: ChartMeta, index: number) => {
+            return _.reduce(
+                this.props.store.visibleAttributes.sort(chartMetaComparator),
+                (
+                    acc: Column<{ [id: string]: string }>[],
+                    chartMeta: ChartMeta,
+                    index: number
+                ) => {
                     if (chartMeta.clinicalAttribute !== undefined) {
                         acc.push({
-                            ...this.getDefaultColumnConfig(getUniqueKey(chartMeta.clinicalAttribute), chartMeta.clinicalAttribute.displayName, chartMeta.clinicalAttribute.datatype === DataType.NUMBER),
-                            tooltip: getClinicalAttributeOverlay(chartMeta.clinicalAttribute.displayName, chartMeta.description ? chartMeta.description : '', chartMeta.clinicalAttribute ? chartMeta.clinicalAttribute.clinicalAttributeId : undefined)
+                            ...this.getDefaultColumnConfig(
+                                getUniqueKey(chartMeta.clinicalAttribute),
+                                chartMeta.clinicalAttribute.displayName,
+                                chartMeta.clinicalAttribute.datatype ===
+                                    DataType.NUMBER
+                            ),
+                            tooltip: getClinicalAttributeOverlay(
+                                chartMeta.clinicalAttribute.displayName,
+                                chartMeta.description
+                                    ? chartMeta.description
+                                    : '',
+                                chartMeta.clinicalAttribute
+                                    ? chartMeta.clinicalAttribute
+                                          .clinicalAttributeId
+                                    : undefined
+                            ),
                         });
                     }
                     return acc;
-                }, defaultColumns);
+                },
+                defaultColumns
+            );
         },
-        default: []
+        default: [],
     });
 
     @autobind
     getProgressItems(elapsedSecs: number): IProgressIndicatorItem[] {
-        return [{
-            label: 'Loading clinical data' + (elapsedSecs > 2 ? ' - this can take several seconds' : ''),
-            promises: [this.props.store.getDataForClinicalDataTab]
-        }];
+        return [
+            {
+                label:
+                    'Loading clinical data' +
+                    (elapsedSecs > 2 ? ' - this can take several seconds' : ''),
+                promises: [this.props.store.getDataForClinicalDataTab],
+            },
+        ];
     }
 
     public render() {
         return (
             <span data-test="clinical-data-tab-content">
-            <WindowWidthBox offset={60}>
-                <If condition={this.columns.isPending || this.props.store.getDataForClinicalDataTab.isPending}>
-                    <Then>
-                        <LoadingIndicator
-                            isLoading={this.columns.isPending || this.props.store.getDataForClinicalDataTab.isPending}
-                            size={"big"} center={true}>
-                            <ProgressIndicator getItems={this.getProgressItems}
-                                               show={this.columns.isPending || this.props.store.getDataForClinicalDataTab.isPending}/>
-                        </LoadingIndicator>
-                    </Then>
-                    <Else>
-                        <ClinicalDataTabTableComponent
-                            initialItemsPerPage={20}
-                            showCopyDownload={true}
-                            showColumnVisibility={false}
-                            data={this.props.store.getDataForClinicalDataTab.result || []}
-                            columns={this.columns.result}
-                            copyDownloadProps={{
-                                showCopy: false,
-                                downloadFilename: this.props.store.clinicalDataDownloadFilename
-                            }}
-                        />
-                    </Else>
-                </If>
-            </WindowWidthBox>
+                <WindowWidthBox offset={60}>
+                    <If
+                        condition={
+                            this.columns.isPending ||
+                            this.props.store.getDataForClinicalDataTab.isPending
+                        }
+                    >
+                        <Then>
+                            <LoadingIndicator
+                                isLoading={
+                                    this.columns.isPending ||
+                                    this.props.store.getDataForClinicalDataTab
+                                        .isPending
+                                }
+                                size={'big'}
+                                center={true}
+                            >
+                                <ProgressIndicator
+                                    getItems={this.getProgressItems}
+                                    show={
+                                        this.columns.isPending ||
+                                        this.props.store
+                                            .getDataForClinicalDataTab.isPending
+                                    }
+                                />
+                            </LoadingIndicator>
+                        </Then>
+                        <Else>
+                            <ClinicalDataTabTableComponent
+                                initialItemsPerPage={20}
+                                showCopyDownload={true}
+                                showColumnVisibility={false}
+                                data={
+                                    this.props.store.getDataForClinicalDataTab
+                                        .result || []
+                                }
+                                columns={this.columns.result}
+                                copyDownloadProps={{
+                                    showCopy: false,
+                                    downloadFilename: this.props.store
+                                        .clinicalDataDownloadFilename,
+                                }}
+                            />
+                        </Else>
+                    </If>
+                </WindowWidthBox>
             </span>
         );
     }
 }
-
diff --git a/src/pages/studyView/tabs/SummaryTab.tsx b/src/pages/studyView/tabs/SummaryTab.tsx
index 901570e2093..3de8107490c 100644
--- a/src/pages/studyView/tabs/SummaryTab.tsx
+++ b/src/pages/studyView/tabs/SummaryTab.tsx
@@ -1,32 +1,42 @@
 import * as React from 'react';
-import styles from "./studySummaryTabStyles.module.scss";
-import chartHeaderStyles from "../chartHeader/styles.module.scss";
-import {ChartContainer, IChartContainerProps} from 'pages/studyView/charts/ChartContainer';
-import {observable} from 'mobx';
-import {StudyViewPageStore} from 'pages/studyView/StudyViewPageStore';
-import {ClinicalDataFilterValue, DataBin} from "shared/api/generated/CBioPortalAPIInternal";
-import LoadingIndicator from "shared/components/loadingIndicator/LoadingIndicator";
+import styles from './studySummaryTabStyles.module.scss';
+import chartHeaderStyles from '../chartHeader/styles.module.scss';
+import {
+    ChartContainer,
+    IChartContainerProps,
+} from 'pages/studyView/charts/ChartContainer';
+import { observable } from 'mobx';
+import { StudyViewPageStore } from 'pages/studyView/StudyViewPageStore';
+import {
+    ClinicalDataFilterValue,
+    DataBin,
+} from 'shared/api/generated/CBioPortalAPIInternal';
+import LoadingIndicator from 'shared/components/loadingIndicator/LoadingIndicator';
 import ReactGridLayout from 'react-grid-layout';
 import 'react-grid-layout/css/styles.css';
 import 'react-resizable/css/styles.css';
-import {observer} from 'mobx-react';
-import {ChartTypeEnum, STUDY_VIEW_CONFIG} from "../StudyViewConfig";
-import ProgressIndicator, {IProgressIndicatorItem} from "../../../shared/components/progressIndicator/ProgressIndicator";
+import { observer } from 'mobx-react';
+import { ChartTypeEnum, STUDY_VIEW_CONFIG } from '../StudyViewConfig';
+import ProgressIndicator, {
+    IProgressIndicatorItem,
+} from '../../../shared/components/progressIndicator/ProgressIndicator';
 import autobind from 'autobind-decorator';
-import LabeledCheckbox from "../../../shared/components/labeledCheckbox/LabeledCheckbox";
-import {ChartMeta, ChartType, RectangleBounds} from "../StudyViewUtils";
-import {DataType} from "cbioportal-frontend-commons";
+import LabeledCheckbox from '../../../shared/components/labeledCheckbox/LabeledCheckbox';
+import { ChartMeta, ChartType, RectangleBounds } from '../StudyViewUtils';
+import { DataType } from 'cbioportal-frontend-commons';
 
 export interface IStudySummaryTabProps {
-    store: StudyViewPageStore
+    store: StudyViewPageStore;
 }
 
 // making this an observer (mobx-react) causes this component to re-render any time
 // there is a change to any observable value which is referenced in its render method.
 // Even if this value is referenced deep within some helper method
 @observer
-export class StudySummaryTab extends React.Component<IStudySummaryTabProps, {}> {
-
+export class StudySummaryTab extends React.Component<
+    IStudySummaryTabProps,
+    {}
+> {
     private store: StudyViewPageStore;
     private handlers: any;
 
@@ -38,21 +48,33 @@ export class StudySummaryTab extends React.Component<IStudySummaryTabProps, {}>
 
         this.handlers = {
             onValueSelection: (chartMeta: ChartMeta, values: string[]) => {
-                this.store.updateClinicalDataFilterByValues(chartMeta.uniqueKey, values.map(value=>({value} as ClinicalDataFilterValue)));
+                this.store.updateClinicalDataFilterByValues(
+                    chartMeta.uniqueKey,
+                    values.map(value => ({ value } as ClinicalDataFilterValue))
+                );
             },
             onDataBinSelection: (chartMeta: ChartMeta, dataBins: DataBin[]) => {
-                this.store.updateClinicalDataIntervalFilters(chartMeta.uniqueKey, dataBins);
+                this.store.updateClinicalDataIntervalFilters(
+                    chartMeta.uniqueKey,
+                    dataBins
+                );
             },
             onToggleLogScale: (chartMeta: ChartMeta) => {
                 this.store.toggleLogScale(chartMeta.uniqueKey);
             },
             onDeleteChart: (chartMeta: ChartMeta) => {
-                this.store.resetFilterAndChangeChartVisibility(chartMeta, false);
+                this.store.resetFilterAndChangeChartVisibility(
+                    chartMeta,
+                    false
+                );
             },
-            onChangeChartType: (chartMeta: ChartMeta, newChartType: ChartType) => {
+            onChangeChartType: (
+                chartMeta: ChartMeta,
+                newChartType: ChartType
+            ) => {
                 this.store.changeChartType(chartMeta, newChartType);
             },
-            isNewlyAdded:(uniqueKey: string) => {
+            isNewlyAdded: (uniqueKey: string) => {
                 return this.store.isNewlyAdded(uniqueKey);
             },
             setCustomChartFilters: (chartMeta: ChartMeta, values: string[]) => {
@@ -61,14 +83,14 @@ export class StudySummaryTab extends React.Component<IStudySummaryTabProps, {}>
             onLayoutChange: (layout: ReactGridLayout.Layout[]) => {
                 this.store.updateCurrentGridLayout(layout);
             },
-            resetGeneFilter:(chartMeta: ChartMeta) => {
-                this.store.resetGeneFilter(chartMeta.uniqueKey)
-            }
-        }
+            resetGeneFilter: (chartMeta: ChartMeta) => {
+                this.store.resetGeneFilter(chartMeta.uniqueKey);
+            },
+        };
     }
 
     renderAttributeChart = (chartMeta: ChartMeta) => {
-        const props:Partial<IChartContainerProps> = {
+        const props: Partial<IChartContainerProps> = {
             chartMeta: chartMeta,
             chartType: this.props.store.chartsType.get(chartMeta.uniqueKey),
             store: this.props.store,
@@ -81,124 +103,198 @@ export class StudySummaryTab extends React.Component<IStudySummaryTabProps, {}>
             studyViewFilters: this.store.filters,
             analysisGroupsSettings: this.store.analysisGroupsSettings,
             cancerGeneFilterEnabled: this.store.oncokbCancerGeneFilterEnabled,
-            setComparisonConfirmationModal: this.store.setComparisonConfirmationModal
+            setComparisonConfirmationModal: this.store
+                .setComparisonConfirmationModal,
         };
 
-        const {BAR_CHART, SURVIVAL, CNA_GENES_TABLE, TABLE, SCATTER, PIE_CHART, MUTATED_GENES_TABLE, FUSION_GENES_TABLE} = ChartTypeEnum;
+        const {
+            BAR_CHART,
+            SURVIVAL,
+            CNA_GENES_TABLE,
+            TABLE,
+            SCATTER,
+            PIE_CHART,
+            MUTATED_GENES_TABLE,
+            FUSION_GENES_TABLE,
+        } = ChartTypeEnum;
         switch (this.store.chartsType.get(chartMeta.uniqueKey)) {
             case PIE_CHART: {
-
                 //if the chart is one of the custom charts then get the appropriate promise
-                if(this.store.isCustomChart(chartMeta.uniqueKey)) {
-                    props.filters = this.store.getCustomChartFilters(props.chartMeta!.uniqueKey);
+                if (this.store.isCustomChart(chartMeta.uniqueKey)) {
+                    props.filters = this.store.getCustomChartFilters(
+                        props.chartMeta!.uniqueKey
+                    );
                     props.onValueSelection = this.handlers.setCustomChartFilters;
                     props.onResetSelection = this.handlers.setCustomChartFilters;
-                    props.promise = this.store.getCustomChartDataCount(chartMeta);
+                    props.promise = this.store.getCustomChartDataCount(
+                        chartMeta
+                    );
                 } else {
                     props.promise = this.store.getClinicalDataCount(chartMeta);
-                    props.filters = this.store.getClinicalDataFiltersByUniqueKey(chartMeta.uniqueKey).map(clinicalDataFilterValue => clinicalDataFilterValue.value);
+                    props.filters = this.store
+                        .getClinicalDataFiltersByUniqueKey(chartMeta.uniqueKey)
+                        .map(
+                            clinicalDataFilterValue =>
+                                clinicalDataFilterValue.value
+                        );
                     props.onValueSelection = this.handlers.onValueSelection;
                     props.onResetSelection = this.handlers.onValueSelection;
                 }
                 props.onChangeChartType = this.handlers.onChangeChartType;
-                props.getData = (dataType?: DataType) => this.store.getPieChartDataDownload(chartMeta, dataType);
-                props.downloadTypes = ["Summary Data", "Full Data", "SVG", "PDF"];
+                props.getData = (dataType?: DataType) =>
+                    this.store.getPieChartDataDownload(chartMeta, dataType);
+                props.downloadTypes = [
+                    'Summary Data',
+                    'Full Data',
+                    'SVG',
+                    'PDF',
+                ];
                 break;
             }
             case BAR_CHART: {
                 props.promise = this.store.getClinicalDataBin(chartMeta);
-                props.filters = this.store.getClinicalDataFiltersByUniqueKey(chartMeta.uniqueKey);
+                props.filters = this.store.getClinicalDataFiltersByUniqueKey(
+                    chartMeta.uniqueKey
+                );
                 props.onDataBinSelection = this.handlers.onDataBinSelection;
                 props.onResetSelection = this.handlers.onDataBinSelection;
                 props.onToggleLogScale = this.handlers.onToggleLogScale;
                 props.showLogScaleToggle = this.store.isLogScaleToggleVisible(
-                    chartMeta.uniqueKey, props.promise!.result);
-                props.logScaleChecked = this.store.isLogScaleChecked(chartMeta.uniqueKey);
+                    chartMeta.uniqueKey,
+                    props.promise!.result
+                );
+                props.logScaleChecked = this.store.isLogScaleChecked(
+                    chartMeta.uniqueKey
+                );
                 props.getData = () => this.store.getClinicalData(chartMeta);
-                props.downloadTypes = ["Data", "SVG", "PDF"];
+                props.downloadTypes = ['Data', 'SVG', 'PDF'];
                 break;
             }
             case TABLE: {
                 if (this.store.isCustomChart(chartMeta.uniqueKey)) {
-                    props.filters = this.store.getCustomChartFilters(props.chartMeta!.uniqueKey);
+                    props.filters = this.store.getCustomChartFilters(
+                        props.chartMeta!.uniqueKey
+                    );
                     props.onValueSelection = this.handlers.setCustomChartFilters;
                     props.onResetSelection = this.handlers.setCustomChartFilters;
-                    props.promise = this.store.getCustomChartDataCount(chartMeta);
+                    props.promise = this.store.getCustomChartDataCount(
+                        chartMeta
+                    );
                 } else {
-                    props.filters = this.store.getClinicalDataFiltersByUniqueKey(chartMeta.uniqueKey).map(clinicalDataFilterValue => clinicalDataFilterValue.value);
+                    props.filters = this.store
+                        .getClinicalDataFiltersByUniqueKey(chartMeta.uniqueKey)
+                        .map(
+                            clinicalDataFilterValue =>
+                                clinicalDataFilterValue.value
+                        );
                     props.promise = this.store.getClinicalDataCount(chartMeta);
                     props.onValueSelection = this.handlers.onValueSelection;
                     props.onResetSelection = this.handlers.onValueSelection;
                 }
                 props.onChangeChartType = this.handlers.onChangeChartType;
                 props.getData = () => this.store.getClinicalData(chartMeta);
-                props.downloadTypes = ["Data"];
+                props.downloadTypes = ['Data'];
                 break;
             }
             case MUTATED_GENES_TABLE: {
-                props.filters = this.store.getGeneFiltersByUniqueKey(chartMeta.uniqueKey);
+                props.filters = this.store.getGeneFiltersByUniqueKey(
+                    chartMeta.uniqueKey
+                );
                 props.promise = this.store.mutatedGeneTableRowData;
                 props.onValueSelection = this.store.addGeneFilters;
-                props.onResetSelection = () => this.store.resetGeneFilter(chartMeta.uniqueKey)
-                props.selectedGenes=this.store.selectedGenes;
-                props.onGeneSelect=this.store.onCheckGene;
-                props.title = props.title + ( !this.store.molecularProfileSampleCounts.isComplete || this.store.molecularProfileSampleCounts.result === undefined ? '' : ` (${this.store.molecularProfileSampleCounts.result.numberOfMutationProfiledSamples} profiled samples)`),
-                props.getData = () => this.store.getMutatedGenesDownloadData();
+                props.onResetSelection = () =>
+                    this.store.resetGeneFilter(chartMeta.uniqueKey);
+                props.selectedGenes = this.store.selectedGenes;
+                props.onGeneSelect = this.store.onCheckGene;
+                (props.title =
+                    props.title +
+                    (!this.store.molecularProfileSampleCounts.isComplete ||
+                    this.store.molecularProfileSampleCounts.result === undefined
+                        ? ''
+                        : ` (${this.store.molecularProfileSampleCounts.result.numberOfMutationProfiledSamples} profiled samples)`)),
+                    (props.getData = () =>
+                        this.store.getMutatedGenesDownloadData());
                 props.genePanelCache = this.store.genePanelCache;
-                props.downloadTypes = ["Data"];
-                props.filterByCancerGenes= this.store.filterMutatedGenesTableByCancerGenes;
+                props.downloadTypes = ['Data'];
+                props.filterByCancerGenes = this.store.filterMutatedGenesTableByCancerGenes;
                 props.onChangeCancerGeneFilter = this.store.updateMutatedGenesTableByCancerGenesFilter;
                 break;
             }
             case FUSION_GENES_TABLE: {
-                props.filters = this.store.getGeneFiltersByUniqueKey(chartMeta.uniqueKey);
+                props.filters = this.store.getGeneFiltersByUniqueKey(
+                    chartMeta.uniqueKey
+                );
                 props.promise = this.store.fusionGeneTableRowData;
                 props.onValueSelection = this.store.addGeneFilters;
-                props.onResetSelection = () => this.store.resetGeneFilter(chartMeta.uniqueKey)
-                props.selectedGenes=this.store.selectedGenes;
-                props.onGeneSelect=this.store.onCheckGene;
-                props.title = props.title + ( !this.store.molecularProfileSampleCounts.isComplete || this.store.molecularProfileSampleCounts.result === undefined ? '' : ` (${this.store.molecularProfileSampleCounts.result.numberOfFusionProfiledSamples} profiled samples)`),
-                props.getData = () => this.store.getFusionGenesDownloadData();
+                props.onResetSelection = () =>
+                    this.store.resetGeneFilter(chartMeta.uniqueKey);
+                props.selectedGenes = this.store.selectedGenes;
+                props.onGeneSelect = this.store.onCheckGene;
+                (props.title =
+                    props.title +
+                    (!this.store.molecularProfileSampleCounts.isComplete ||
+                    this.store.molecularProfileSampleCounts.result === undefined
+                        ? ''
+                        : ` (${this.store.molecularProfileSampleCounts.result.numberOfFusionProfiledSamples} profiled samples)`)),
+                    (props.getData = () =>
+                        this.store.getFusionGenesDownloadData());
                 props.genePanelCache = this.store.genePanelCache;
-                props.downloadTypes = ["Data"];
-                props.filterByCancerGenes= this.store.filterFusionGenesTableByCancerGenes;
+                props.downloadTypes = ['Data'];
+                props.filterByCancerGenes = this.store.filterFusionGenesTableByCancerGenes;
                 props.onChangeCancerGeneFilter = this.store.updateFusionGenesTableByCancerGenesFilter;
                 break;
             }
             case CNA_GENES_TABLE: {
-                props.filters = this.store.getGeneFiltersByUniqueKey(chartMeta.uniqueKey);
+                props.filters = this.store.getGeneFiltersByUniqueKey(
+                    chartMeta.uniqueKey
+                );
                 props.promise = this.store.cnaGeneTableRowData;
                 props.onValueSelection = this.store.addGeneFilters;
-                props.onResetSelection = () => this.store.resetGeneFilter(chartMeta.uniqueKey)
-                props.selectedGenes=this.store.selectedGenes;
-                props.onGeneSelect=this.store.onCheckGene;
-                props.title = props.title + ( !this.store.molecularProfileSampleCounts.isComplete || this.store.molecularProfileSampleCounts.result === undefined ? '' : ` (${this.store.molecularProfileSampleCounts.result.numberOfCNAProfiledSamples} profiled samples)`),
-                props.getData = () => this.store.getGenesCNADownloadData();
+                props.onResetSelection = () =>
+                    this.store.resetGeneFilter(chartMeta.uniqueKey);
+                props.selectedGenes = this.store.selectedGenes;
+                props.onGeneSelect = this.store.onCheckGene;
+                (props.title =
+                    props.title +
+                    (!this.store.molecularProfileSampleCounts.isComplete ||
+                    this.store.molecularProfileSampleCounts.result === undefined
+                        ? ''
+                        : ` (${this.store.molecularProfileSampleCounts.result.numberOfCNAProfiledSamples} profiled samples)`)),
+                    (props.getData = () =>
+                        this.store.getGenesCNADownloadData());
                 props.genePanelCache = this.store.genePanelCache;
-                props.downloadTypes = ["Data"];
-                props.filterByCancerGenes= this.store.filterCNAGenesTableByCancerGenes;
-                props.onChangeCancerGeneFilter = this.store.updateCNAGenesTableByCancerGenesFilter
+                props.downloadTypes = ['Data'];
+                props.filterByCancerGenes = this.store.filterCNAGenesTableByCancerGenes;
+                props.onChangeCancerGeneFilter = this.store.updateCNAGenesTableByCancerGenesFilter;
                 break;
             }
             case SURVIVAL: {
                 props.promise = this.store.survivalPlotData;
-                props.getData = () => this.store.getSurvivalDownloadData(chartMeta);
+                props.getData = () =>
+                    this.store.getSurvivalDownloadData(chartMeta);
                 props.patientToAnalysisGroup = this.store.patientToAnalysisGroup;
-                props.downloadTypes = ["Data", "SVG", "PDF"];
+                props.downloadTypes = ['Data', 'SVG', 'PDF'];
                 break;
             }
             case SCATTER: {
-                props.filters = this.store.getScatterPlotFiltersByUniqueKey(props.chartMeta!.uniqueKey)
+                props.filters = this.store.getScatterPlotFiltersByUniqueKey(
+                    props.chartMeta!.uniqueKey
+                );
                 props.promise = this.store.mutationCountVsCNADensityData;
-                props.onValueSelection = (bounds:RectangleBounds)=>{
-                    this.store.updateScatterPlotFilterByValues(props.chartMeta!,bounds)
-                }
-                props.onResetSelection = ()=>{
-                    this.store.updateScatterPlotFilterByValues(props.chartMeta!)
-                }
+                props.onValueSelection = (bounds: RectangleBounds) => {
+                    this.store.updateScatterPlotFilterByValues(
+                        props.chartMeta!,
+                        bounds
+                    );
+                };
+                props.onResetSelection = () => {
+                    this.store.updateScatterPlotFilterByValues(
+                        props.chartMeta!
+                    );
+                };
                 props.sampleToAnalysisGroup = this.store.sampleToAnalysisGroup;
                 props.getData = () => this.store.getScatterDownloadData();
-                props.downloadTypes = ["Data", "SVG", "PDF"];
+                props.downloadTypes = ['Data', 'SVG', 'PDF'];
                 break;
             }
             default:
@@ -217,45 +313,96 @@ export class StudySummaryTab extends React.Component<IStudySummaryTabProps, {}>
         // 2.   The maintainer of RGL repo currently not actively accepts pull requests. So we don't know when the
         //      issue will be solved.
         return (
-        <div key={chartMeta.uniqueKey}>
-            <ChartContainer key={chartMeta.uniqueKey} {...(props as any)}/>
-        </div>);
+            <div key={chartMeta.uniqueKey}>
+                <ChartContainer key={chartMeta.uniqueKey} {...(props as any)} />
+            </div>
+        );
     };
 
     @autobind
-    getProgressItems(elapsedSecs:number): IProgressIndicatorItem[] {
-        return [{
-            label: 'Loading meta information',
-            promises: [this.store.defaultVisibleAttributes, this.store.mutationProfiles, this.store.cnaProfiles]
-        }, {
-            label: 'Loading clinical data' + (elapsedSecs > 2 ? ' - this can take several seconds' : ''),
-            promises: [this.store.initialVisibleAttributesClinicalDataBinCountData, this.store.initialVisibleAttributesClinicalDataCountData]
-        }];
+    getProgressItems(elapsedSecs: number): IProgressIndicatorItem[] {
+        return [
+            {
+                label: 'Loading meta information',
+                promises: [
+                    this.store.defaultVisibleAttributes,
+                    this.store.mutationProfiles,
+                    this.store.cnaProfiles,
+                ],
+            },
+            {
+                label:
+                    'Loading clinical data' +
+                    (elapsedSecs > 2 ? ' - this can take several seconds' : ''),
+                promises: [
+                    this.store.initialVisibleAttributesClinicalDataBinCountData,
+                    this.store.initialVisibleAttributesClinicalDataCountData,
+                ],
+            },
+        ];
     }
 
     render() {
-        const numberOfMutationProfiledSamples : number | undefined = this.props.store.molecularProfileSampleCounts.isComplete ? this.props.store.molecularProfileSampleCounts.result.numberOfMutationProfiledSamples : undefined;
-        const numberOfCNAProfiledSamples : number | undefined = this.props.store.molecularProfileSampleCounts.isComplete ? this.props.store.molecularProfileSampleCounts.result.numberOfCNAProfiledSamples : undefined;
+        const numberOfMutationProfiledSamples: number | undefined = this.props
+            .store.molecularProfileSampleCounts.isComplete
+            ? this.props.store.molecularProfileSampleCounts.result
+                  .numberOfMutationProfiledSamples
+            : undefined;
+        const numberOfCNAProfiledSamples: number | undefined = this.props.store
+            .molecularProfileSampleCounts.isComplete
+            ? this.props.store.molecularProfileSampleCounts.result
+                  .numberOfCNAProfiledSamples
+            : undefined;
         return (
             <div>
-
                 <div className="secondaryNavigation">
                     <div className={styles.quickFilters}>
                         <strong>Quick Filters:</strong>
 
                         <LoadingIndicator
-                            isLoading={this.props.store.molecularProfileSampleCounts.isPending || this.props.store.molecularProfileSampleCounts.isPending}/>
+                            isLoading={
+                                this.props.store.molecularProfileSampleCounts
+                                    .isPending ||
+                                this.props.store.molecularProfileSampleCounts
+                                    .isPending
+                            }
+                        />
 
-                        {this.props.store.mutationProfiles.result.length > 0 && (
+                        {this.props.store.mutationProfiles.result.length >
+                            0 && (
                             <div data-test="with-mutation-data">
-                                {this.props.store.molecularProfileSampleCounts.isComplete && (
+                                {this.props.store.molecularProfileSampleCounts
+                                    .isComplete && (
                                     <LabeledCheckbox
-                                        inputProps={{className: styles.selectedInfoCheckbox}}
-                                        checked={!!this.props.store.filters.withMutationData}
-                                        onChange={this.props.store.toggleWithMutationDataFilter}
-                                        disabled={this.props.store.molecularProfileSampleCounts.result.numberOfMutationProfiledSamples === undefined}
+                                        inputProps={{
+                                            className:
+                                                styles.selectedInfoCheckbox,
+                                        }}
+                                        checked={
+                                            !!this.props.store.filters
+                                                .withMutationData
+                                        }
+                                        onChange={
+                                            this.props.store
+                                                .toggleWithMutationDataFilter
+                                        }
+                                        disabled={
+                                            this.props.store
+                                                .molecularProfileSampleCounts
+                                                .result
+                                                .numberOfMutationProfiledSamples ===
+                                            undefined
+                                        }
                                     >
-                                        {numberOfMutationProfiledSamples === undefined ? '0 samples' : numberOfMutationProfiledSamples.toLocaleString() + (numberOfMutationProfiledSamples === 1 ? " sample" : " samples")} with mutation data
+                                        {numberOfMutationProfiledSamples ===
+                                        undefined
+                                            ? '0 samples'
+                                            : numberOfMutationProfiledSamples.toLocaleString() +
+                                              (numberOfMutationProfiledSamples ===
+                                              1
+                                                  ? ' sample'
+                                                  : ' samples')}{' '}
+                                        with mutation data
                                     </LabeledCheckbox>
                                 )}
                             </div>
@@ -263,94 +410,168 @@ export class StudySummaryTab extends React.Component<IStudySummaryTabProps, {}>
 
                         {this.props.store.cnaProfiles.result.length > 0 && (
                             <div data-test="with-cna-data">
-                                {this.props.store.molecularProfileSampleCounts.isComplete && (
+                                {this.props.store.molecularProfileSampleCounts
+                                    .isComplete && (
                                     <LabeledCheckbox
-                                        inputProps={{className: styles.selectedInfoCheckbox}}
-                                        checked={!!this.props.store.filters.withCNAData}
-                                        onChange={this.props.store.toggleWithCNADataFilter}
-                                        disabled={this.props.store.molecularProfileSampleCounts.result.numberOfCNAProfiledSamples === undefined}
+                                        inputProps={{
+                                            className:
+                                                styles.selectedInfoCheckbox,
+                                        }}
+                                        checked={
+                                            !!this.props.store.filters
+                                                .withCNAData
+                                        }
+                                        onChange={
+                                            this.props.store
+                                                .toggleWithCNADataFilter
+                                        }
+                                        disabled={
+                                            this.props.store
+                                                .molecularProfileSampleCounts
+                                                .result
+                                                .numberOfCNAProfiledSamples ===
+                                            undefined
+                                        }
                                     >
-                                        {numberOfCNAProfiledSamples === undefined ? '0 samples' : numberOfCNAProfiledSamples.toLocaleString() + (numberOfCNAProfiledSamples === 1 ? " sample" : " samples")} with CNA data
+                                        {numberOfCNAProfiledSamples ===
+                                        undefined
+                                            ? '0 samples'
+                                            : numberOfCNAProfiledSamples.toLocaleString() +
+                                              (numberOfCNAProfiledSamples === 1
+                                                  ? ' sample'
+                                                  : ' samples')}{' '}
+                                        with CNA data
                                     </LabeledCheckbox>
                                 )}
                             </div>
                         )}
-
                     </div>
                 </div>
 
-                <LoadingIndicator isLoading={this.store.loadingInitialDataForSummaryTab} size={"big"} center={true}>
-                    <ProgressIndicator getItems={this.getProgressItems} show={this.store.loadingInitialDataForSummaryTab} sequential={false}/>
+                <LoadingIndicator
+                    isLoading={this.store.loadingInitialDataForSummaryTab}
+                    size={'big'}
+                    center={true}
+                >
+                    <ProgressIndicator
+                        getItems={this.getProgressItems}
+                        show={this.store.loadingInitialDataForSummaryTab}
+                        sequential={false}
+                    />
                 </LoadingIndicator>
 
-                {
-                    this.store.invalidSampleIds.result.length > 0 &&
-                    this.showErrorMessage &&
-                    <div>
-                        <div className="alert alert-danger">
-                            <button type="button" className="close"
-                                    onClick={(event) => this.showErrorMessage = false}>&times;</button>
-                            The following sample(s) might have been deleted/updated with the recent data updates
-                            <br />
-
-                            <ul style={{ listStyle: "none", padding: "10px", maxHeight: "300px", overflowY: "scroll" }}>
-                                {this.store.invalidSampleIds.result.map(sample => <li>{sample.studyId + ':' + sample.sampleId}</li>)}
-                            </ul>
+                {this.store.invalidSampleIds.result.length > 0 &&
+                    this.showErrorMessage && (
+                        <div>
+                            <div className="alert alert-danger">
+                                <button
+                                    type="button"
+                                    className="close"
+                                    onClick={event =>
+                                        (this.showErrorMessage = false)
+                                    }
+                                >
+                                    &times;
+                                </button>
+                                The following sample(s) might have been
+                                deleted/updated with the recent data updates
+                                <br />
+                                <ul
+                                    style={{
+                                        listStyle: 'none',
+                                        padding: '10px',
+                                        maxHeight: '300px',
+                                        overflowY: 'scroll',
+                                    }}
+                                >
+                                    {this.store.invalidSampleIds.result.map(
+                                        sample => (
+                                            <li>
+                                                {sample.studyId +
+                                                    ':' +
+                                                    sample.sampleId}
+                                            </li>
+                                        )
+                                    )}
+                                </ul>
+                            </div>
                         </div>
-                    </div>
-                }
-                {
-                    this.store.showSettingRestoreMsg &&
+                    )}
+                {this.store.showSettingRestoreMsg && (
                     <div>
                         <div className="alert alert-info">
-                            <button type="button" className="close"
-                                    onClick={() => {
-                                        this.store.hideRestoreSettingsMsg = true;
-                                    }
-                                   }>&times;</button>
-                            Your previously saved layout preferences have been applied.
-                            <button className='btn btn-primary btn-sm'
-                                    onClick={() => {
-                                        this.store.hideRestoreSettingsMsg = true;
-                                    }}
-                                    style={{marginLeft: '10px'}}>Keep Saved Layout
+                            <button
+                                type="button"
+                                className="close"
+                                onClick={() => {
+                                    this.store.hideRestoreSettingsMsg = true;
+                                }}
+                            >
+                                &times;
                             </button>
-
-                            <button className='btn btn-primary btn-sm'
-                                    onClick={() => {
-                                        this.store.hideRestoreSettingsMsg = true;
-                                        this.store.undoUserSettings();
-                                    }}
-                                    style={{marginLeft: '10px'}}>Revert to Previous Layout
+                            Your previously saved layout preferences have been
+                            applied.
+                            <button
+                                className="btn btn-primary btn-sm"
+                                onClick={() => {
+                                    this.store.hideRestoreSettingsMsg = true;
+                                }}
+                                style={{ marginLeft: '10px' }}
+                            >
+                                Keep Saved Layout
+                            </button>
+                            <button
+                                className="btn btn-primary btn-sm"
+                                onClick={() => {
+                                    this.store.hideRestoreSettingsMsg = true;
+                                    this.store.undoUserSettings();
+                                }}
+                                style={{ marginLeft: '10px' }}
+                            >
+                                Revert to Previous Layout
                             </button>
                         </div>
                     </div>
+                )}
 
-                }
-
-                {!this.store.loadingInitialDataForSummaryTab &&
-                <div data-test="summary-tab-content">
-                    <div className={styles.studyViewFlexContainer}>
-                        {this.store.defaultVisibleAttributes.isComplete && (
-                            <ReactGridLayout className="layout"
-                                             style={{width: this.store.containerWidth}}
-                                             width={this.store.containerWidth}
-                                             cols={this.store.studyViewPageLayoutProps.cols}
-                                             rowHeight={this.store.studyViewPageLayoutProps.grid.h}
-                                             layout={this.store.studyViewPageLayoutProps.layout}
-                                             margin={[STUDY_VIEW_CONFIG.layout.gridMargin.x, STUDY_VIEW_CONFIG.layout.gridMargin.y]}
-                                             useCSSTransforms={false}
-                                             draggableHandle={`.${chartHeaderStyles.draggable}`}
-                                             onLayoutChange={this.handlers.onLayoutChange} >
-                                {this.store.visibleAttributes.map(this.renderAttributeChart)}
-                            </ReactGridLayout>
-                        )}
-
+                {!this.store.loadingInitialDataForSummaryTab && (
+                    <div data-test="summary-tab-content">
+                        <div className={styles.studyViewFlexContainer}>
+                            {this.store.defaultVisibleAttributes.isComplete && (
+                                <ReactGridLayout
+                                    className="layout"
+                                    style={{ width: this.store.containerWidth }}
+                                    width={this.store.containerWidth}
+                                    cols={
+                                        this.store.studyViewPageLayoutProps.cols
+                                    }
+                                    rowHeight={
+                                        this.store.studyViewPageLayoutProps.grid
+                                            .h
+                                    }
+                                    layout={
+                                        this.store.studyViewPageLayoutProps
+                                            .layout
+                                    }
+                                    margin={[
+                                        STUDY_VIEW_CONFIG.layout.gridMargin.x,
+                                        STUDY_VIEW_CONFIG.layout.gridMargin.y,
+                                    ]}
+                                    useCSSTransforms={false}
+                                    draggableHandle={`.${chartHeaderStyles.draggable}`}
+                                    onLayoutChange={
+                                        this.handlers.onLayoutChange
+                                    }
+                                >
+                                    {this.store.visibleAttributes.map(
+                                        this.renderAttributeChart
+                                    )}
+                                </ReactGridLayout>
+                            )}
+                        </div>
                     </div>
-
-                </div>
-                }
+                )}
             </div>
-        )
+        );
     }
 }
diff --git a/src/pages/studyView/tabs/studySummaryTabStyles.module.scss b/src/pages/studyView/tabs/studySummaryTabStyles.module.scss
index 5e35d1113a2..093dc746368 100644
--- a/src/pages/studyView/tabs/studySummaryTabStyles.module.scss
+++ b/src/pages/studyView/tabs/studySummaryTabStyles.module.scss
@@ -6,17 +6,17 @@
 }
 
 .quickFilters {
-    display:flex;
-    padding:5px 10px;
-    justify-content:center;
+    display: flex;
+    padding: 5px 10px;
+    justify-content: center;
     margin-bottom: 10px;
 
     > * {
-        margin-left:10px;
+        margin-left: 10px;
     }
 
     input {
-        position:relative;
-        top:3px;
+        position: relative;
+        top: 3px;
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/studyView/virtualStudy/VirtualStudy.tsx b/src/pages/studyView/virtualStudy/VirtualStudy.tsx
index 7caebbbd99b..c559da0f178 100644
--- a/src/pages/studyView/virtualStudy/VirtualStudy.tsx
+++ b/src/pages/studyView/virtualStudy/VirtualStudy.tsx
@@ -1,22 +1,23 @@
 import * as React from 'react';
 import * as _ from 'lodash';
-import styles from "./styles.module.scss";
-import { observer } from "mobx-react";
+import styles from './styles.module.scss';
+import { observer } from 'mobx-react';
 import { computed, observable, action } from 'mobx';
 import { CancerStudy, Sample } from 'shared/api/generated/CBioPortalAPI';
 import classnames from 'classnames';
 import { DefaultTooltip, remoteData } from 'cbioportal-frontend-commons';
-import sessionServiceClient from "shared/api//sessionServiceInstance";
+import sessionServiceClient from 'shared/api//sessionServiceInstance';
 import { If, Then, Else } from 'react-if';
 import { buildCBioPortalPageUrl } from 'shared/api/urls';
-import { ChartMeta} from 'pages/studyView/StudyViewUtils';
+import { ChartMeta } from 'pages/studyView/StudyViewUtils';
 import {
     getVirtualStudyDescription,
     getCurrentDate,
-    StudyViewFilterWithSampleIdentifierFilters, StudyWithSamples
+    StudyViewFilterWithSampleIdentifierFilters,
+    StudyWithSamples,
 } from 'pages/studyView/StudyViewUtils';
 import autobind from 'autobind-decorator';
-import {serializeEvent} from "../../../shared/lib/tracking";
+import { serializeEvent } from '../../../shared/lib/tracking';
 
 const Clipboard = require('clipboard');
 
@@ -25,8 +26,8 @@ export interface IVirtualStudyProps {
     selectedSamples: Sample[];
     filter: StudyViewFilterWithSampleIdentifierFilters;
     attributesMetaSet: { [id: string]: ChartMeta };
-    name?: string,
-    description?: string,
+    name?: string;
+    description?: string;
     user?: string;
 }
 
@@ -41,27 +42,52 @@ export class StudySummaryRecord extends React.Component<CancerStudy, {}> {
                     <div className="panel-heading">
                         <span className={styles.studyName}>
                             <i
-                                className={`fa fa-${this.showDescription ? 'minus' : 'plus'}-circle`}
-                                onClick={() => this.showDescription = !this.showDescription}
+                                className={`fa fa-${
+                                    this.showDescription ? 'minus' : 'plus'
+                                }-circle`}
+                                onClick={() =>
+                                    (this.showDescription = !this
+                                        .showDescription)
+                                }
                             />
                             {this.props.name}
                         </span>
-                        <a target="_blank" href={`study?id=${this.props.studyId}`}>
-                            <i className="fa fa-external-link" aria-hidden="true"></i>
+                        <a
+                            target="_blank"
+                            href={`study?id=${this.props.studyId}`}
+                        >
+                            <i
+                                className="fa fa-external-link"
+                                aria-hidden="true"
+                            ></i>
                         </a>
                     </div>
-                    <div className={styles.studyDescription} style={{ display: this.showDescription ? 'block' : 'none' }}>
-                        <span dangerouslySetInnerHTML={{ __html: `${this.props.description.replace(/\r?\n/g, '<br/>')}` }} />
+                    <div
+                        className={styles.studyDescription}
+                        style={{
+                            display: this.showDescription ? 'block' : 'none',
+                        }}
+                    >
+                        <span
+                            dangerouslySetInnerHTML={{
+                                __html: `${this.props.description.replace(
+                                    /\r?\n/g,
+                                    '<br/>'
+                                )}`,
+                            }}
+                        />
                     </div>
                 </div>
             </div>
-        )
+        );
     }
 }
 
 @observer
-export default class VirtualStudy extends React.Component<IVirtualStudyProps, {}> {
-
+export default class VirtualStudy extends React.Component<
+    IVirtualStudyProps,
+    {}
+> {
     @observable private name: string;
     @observable private description: string;
 
@@ -72,87 +98,125 @@ export default class VirtualStudy extends React.Component<IVirtualStudyProps, {}
     constructor(props: IVirtualStudyProps) {
         super(props);
         this.name = props.name || '';
-        this.description = props.description || getVirtualStudyDescription(
-            this.props.description,
-            this.props.studyWithSamples,
-            this.props.filter,
-            this.attributeNamesSet,
-            this.props.user);
+        this.description =
+            props.description ||
+            getVirtualStudyDescription(
+                this.props.description,
+                this.props.studyWithSamples,
+                this.props.filter,
+                this.attributeNamesSet,
+                this.props.user
+            );
     }
 
     @computed get namePlaceHolder() {
-        return `Selected sample${this.props.selectedSamples.length > 1 ? 's' : ''} (${getCurrentDate()})`
+        return `Selected sample${
+            this.props.selectedSamples.length > 1 ? 's' : ''
+        } (${getCurrentDate()})`;
     }
 
     @computed get buttonsDisabled() {
         return _.isEmpty(this.namePlaceHolder) && _.isEmpty(this.name);
     }
 
-    readonly virtualStudy = remoteData({
-        invoke: async () => {
-            if (this.saving || this.sharing) {
-                let selectedSampleSet = _.groupBy(this.props.selectedSamples, (sample: Sample) => sample.studyId);
-                let studies = _.reduce(selectedSampleSet, (acc: { id: string; samples: string[] }[], samples, studyId) => {
-                    acc.push({
-                        id: studyId,
-                        samples: samples.map(sample => sample.sampleId)
-                    })
-                    return acc;
-                }, []);
+    readonly virtualStudy = remoteData(
+        {
+            invoke: async () => {
+                if (this.saving || this.sharing) {
+                    let selectedSampleSet = _.groupBy(
+                        this.props.selectedSamples,
+                        (sample: Sample) => sample.studyId
+                    );
+                    let studies = _.reduce(
+                        selectedSampleSet,
+                        (
+                            acc: { id: string; samples: string[] }[],
+                            samples,
+                            studyId
+                        ) => {
+                            acc.push({
+                                id: studyId,
+                                samples: samples.map(sample => sample.sampleId),
+                            });
+                            return acc;
+                        },
+                        []
+                    );
 
-                let { sampleIdentifiersSet, ...studyViewFilter } = this.props.filter;
+                    let {
+                        sampleIdentifiersSet,
+                        ...studyViewFilter
+                    } = this.props.filter;
 
-                let parameters = {
-                    name: this.name || this.namePlaceHolder,
-                    description: '',
-                    studyViewFilter: studyViewFilter,
-                    origin: this.props.studyWithSamples.map(study => study.studyId),
-                    studies: studies
+                    let parameters = {
+                        name: this.name || this.namePlaceHolder,
+                        description: '',
+                        studyViewFilter: studyViewFilter,
+                        origin: this.props.studyWithSamples.map(
+                            study => study.studyId
+                        ),
+                        studies: studies,
+                    };
+                    return await sessionServiceClient.saveVirtualStudy(
+                        parameters,
+                        this.saving
+                    );
                 }
-                return await sessionServiceClient.saveVirtualStudy(parameters, this.saving);
-            }
-            return undefined;
-        }
-    }, undefined);
+                return undefined;
+            },
+        },
+        undefined
+    );
 
     @computed get virtualStudyUrl() {
         // TODO: update path name once fully refactored
-        return buildCBioPortalPageUrl({pathname:'study', query: {id: this.virtualStudy.result ? this.virtualStudy.result.id : ''}});
+        return buildCBioPortalPageUrl({
+            pathname: 'study',
+            query: {
+                id: this.virtualStudy.result ? this.virtualStudy.result.id : '',
+            },
+        });
     }
 
     @autobind
     private copyLinkRef(el: HTMLAnchorElement | null) {
         if (el) {
             new Clipboard(el, {
-                text: () => this.virtualStudyUrl
+                text: () => this.virtualStudyUrl,
             });
         }
     }
 
     @autobind
-    @action onCopyClick() {
+    @action
+    onCopyClick() {
         this.copied = true;
     }
 
     @autobind
     @action
     private onTooltipVisibleChange(visible: boolean) {
-        this.copied = !visible
+        this.copied = !visible;
     }
 
     @computed get showSaveButton() {
         //default value of userEmailAddress is anonymousUser. see my-index.ejs
-        return !(_.isUndefined(this.props.user) ||
+        return !(
+            _.isUndefined(this.props.user) ||
             _.isEmpty(this.props.user) ||
             _.isEqual(this.props.user.toLowerCase(), 'anonymoususer')
         );
     }
 
     @computed get attributeNamesSet() {
-        return _.reduce(this.props.attributesMetaSet, (acc: { [id: string]: string }, next, key) => {
-            acc[key] = next.displayName
-            return acc
-        }, {});
+        return _.reduce(
+            this.props.attributesMetaSet,
+            (acc: { [id: string]: string }, next, key) => {
+                acc[key] = next.displayName;
+                return acc;
+            },
+            {}
+        );
     }
 
     render() {
@@ -161,38 +225,106 @@ export default class VirtualStudy extends React.Component<IVirtualStudyProps, {}
                 <If condition={this.virtualStudy.isError}>
                     <Then>
                         <div style={{ textAlign: 'center' }}>
-                            <i className="fa fa-exclamation-triangle" aria-hidden="true" style={{ color: "orange" }} />
-                            <span style={{ marginLeft: "5px" }}>{`Failed to ${this.saving ? 'save' : 'share'} virtual study, please try again later.`}</span>
+                            <i
+                                className="fa fa-exclamation-triangle"
+                                aria-hidden="true"
+                                style={{ color: 'orange' }}
+                            />
+                            <span style={{ marginLeft: '5px' }}>{`Failed to ${
+                                this.saving ? 'save' : 'share'
+                            } virtual study, please try again later.`}</span>
                         </div>
                     </Then>
                     <Else>
-                        <If condition={this.virtualStudy.isPending || _.isUndefined(this.virtualStudy.result)}>
+                        <If
+                            condition={
+                                this.virtualStudy.isPending ||
+                                _.isUndefined(this.virtualStudy.result)
+                            }
+                        >
                             <Then>
                                 <div>
-                                    <div className={classnames(styles.virtualStudyForm, this.virtualStudy.isPending ? styles.disabled : undefined)}>
+                                    <div
+                                        className={classnames(
+                                            styles.virtualStudyForm,
+                                            this.virtualStudy.isPending
+                                                ? styles.disabled
+                                                : undefined
+                                        )}
+                                    >
                                         <div className="input-group">
                                             <input
                                                 type="text"
                                                 className="form-control"
                                                 value={this.name}
-                                                placeholder={this.namePlaceHolder || "Virtual study name"}
-                                                onInput={(event) => this.name = event.currentTarget.value} />
+                                                placeholder={
+                                                    this.namePlaceHolder ||
+                                                    'Virtual study name'
+                                                }
+                                                onInput={event =>
+                                                    (this.name =
+                                                        event.currentTarget.value)
+                                                }
+                                            />
                                             <div className="input-group-btn">
-                                                {this.showSaveButton && <button
-                                                    className={classnames("btn btn-default", styles.saveButton)}
-                                                    data-event={serializeEvent({category:"studyPage", action:"saveVirtualStudy"})}
-                                                    type="button"
-                                                    disabled={this.buttonsDisabled}
-                                                    onClick={(event) => { this.saving = true; }}>
-                                                    {this.saving ? <i className="fa fa-spinner fa-spin" aria-hidden="true"></i> : "Save"}
-                                                </button>}
+                                                {this.showSaveButton && (
+                                                    <button
+                                                        className={classnames(
+                                                            'btn btn-default',
+                                                            styles.saveButton
+                                                        )}
+                                                        data-event={serializeEvent(
+                                                            {
+                                                                category:
+                                                                    'studyPage',
+                                                                action:
+                                                                    'saveVirtualStudy',
+                                                            }
+                                                        )}
+                                                        type="button"
+                                                        disabled={
+                                                            this.buttonsDisabled
+                                                        }
+                                                        onClick={event => {
+                                                            this.saving = true;
+                                                        }}
+                                                    >
+                                                        {this.saving ? (
+                                                            <i
+                                                                className="fa fa-spinner fa-spin"
+                                                                aria-hidden="true"
+                                                            ></i>
+                                                        ) : (
+                                                            'Save'
+                                                        )}
+                                                    </button>
+                                                )}
                                                 <button
-                                                    className={classnames("btn btn-default", styles.saveButton)}
+                                                    className={classnames(
+                                                        'btn btn-default',
+                                                        styles.saveButton
+                                                    )}
                                                     type="button"
-                                                    disabled={this.buttonsDisabled}
-                                                    data-event={serializeEvent({category:"studyPage", action:"shareVirtualStudy"})}
-                                                    onClick={(event) => { this.sharing = true; }}>
-                                                    {this.sharing ? <i className="fa fa-spinner fa-spin" aria-hidden="true"></i> : "Share"}
+                                                    disabled={
+                                                        this.buttonsDisabled
+                                                    }
+                                                    data-event={serializeEvent({
+                                                        category: 'studyPage',
+                                                        action:
+                                                            'shareVirtualStudy',
+                                                    })}
+                                                    onClick={event => {
+                                                        this.sharing = true;
+                                                    }}
+                                                >
+                                                    {this.sharing ? (
+                                                        <i
+                                                            className="fa fa-spinner fa-spin"
+                                                            aria-hidden="true"
+                                                        ></i>
+                                                    ) : (
+                                                        'Share'
+                                                    )}
                                                 </button>
                                             </div>
                                         </div>
@@ -201,14 +333,28 @@ export default class VirtualStudy extends React.Component<IVirtualStudyProps, {}
                                             rows={10}
                                             placeholder="Virtual study description (Optional)"
                                             value={this.description}
-                                            onChange={event => this.description = event.currentTarget.value}
+                                            onChange={event =>
+                                                (this.description =
+                                                    event.currentTarget.value)
+                                            }
                                         />
                                     </div>
-                                    <span style={{ display: 'block', fontWeight: 'bold' }}>This virtual study was derived from:</span>
+                                    <span
+                                        style={{
+                                            display: 'block',
+                                            fontWeight: 'bold',
+                                        }}
+                                    >
+                                        This virtual study was derived from:
+                                    </span>
                                     <div className={styles.studiesSummaryInfo}>
-                                        {
-                                            this.props.studyWithSamples.map(study => <StudySummaryRecord {...study} />)
-                                        }
+                                        {this.props.studyWithSamples.map(
+                                            study => (
+                                                <StudySummaryRecord
+                                                    {...study}
+                                                />
+                                            )
+                                        )}
                                     </div>
                                 </div>
                             </Then>
@@ -216,48 +362,81 @@ export default class VirtualStudy extends React.Component<IVirtualStudyProps, {}
                                 <div className={classnames(styles.result)}>
                                     <div className={styles.name}>
                                         <a
-                                            target='_blank'
+                                            target="_blank"
                                             href={`${this.virtualStudyUrl}`}
-                                            style={{ width: '220px' }}>
+                                            style={{ width: '220px' }}
+                                        >
                                             {this.virtualStudyUrl}
                                         </a>
                                     </div>
-                                    <div className={classnames("btn-group btn-group-xs", styles.controls)}>
+                                    <div
+                                        className={classnames(
+                                            'btn-group btn-group-xs',
+                                            styles.controls
+                                        )}
+                                    >
                                         <DefaultTooltip
                                             overlay={
                                                 <If condition={this.copied}>
                                                     <Then>
-                                                        <span className="alert-success">Copied!</span>
+                                                        <span className="alert-success">
+                                                            Copied!
+                                                        </span>
                                                     </Then>
                                                     <Else>
                                                         <span>Copy</span>
                                                     </Else>
-                                                </If>}
+                                                </If>
+                                            }
                                             placement="top"
-                                            onVisibleChange={this.onTooltipVisibleChange}
+                                            onVisibleChange={
+                                                this.onTooltipVisibleChange
+                                            }
                                         >
                                             <span
                                                 className="btn btn-default"
                                                 ref={this.copyLinkRef}
-                                                onClick={this.onCopyClick}>
+                                                onClick={this.onCopyClick}
+                                            >
                                                 Copy
-                                        </span>
+                                            </span>
                                         </DefaultTooltip>
                                         <span
                                             className="btn btn-default"
-                                            onClick={(event) => window.open(this.virtualStudyUrl, "_blank")}>
+                                            onClick={event =>
+                                                window.open(
+                                                    this.virtualStudyUrl,
+                                                    '_blank'
+                                                )
+                                            }
+                                        >
                                             View
-                                    </span>
-                                        {this.saving &&
+                                        </span>
+                                        {this.saving && (
                                             <span
                                                 className="btn btn-default"
-                                                onClick={(event) => {
-                                                    if (this.virtualStudy.result) {
-                                                        window.open(buildCBioPortalPageUrl('results', { cancer_study_id: this.virtualStudy.result.id }), "_blank")
+                                                onClick={event => {
+                                                    if (
+                                                        this.virtualStudy.result
+                                                    ) {
+                                                        window.open(
+                                                            buildCBioPortalPageUrl(
+                                                                'results',
+                                                                {
+                                                                    cancer_study_id: this
+                                                                        .virtualStudy
+                                                                        .result
+                                                                        .id,
+                                                                }
+                                                            ),
+                                                            '_blank'
+                                                        );
                                                     }
-                                                }}>
+                                                }}
+                                            >
                                                 Query
-                                    </span>}
+                                            </span>
+                                        )}
                                     </div>
                                 </div>
                             </Else>
@@ -265,6 +444,6 @@ export default class VirtualStudy extends React.Component<IVirtualStudyProps, {}
                     </Else>
                 </If>
             </div>
-        )
+        );
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/studyView/virtualStudy/styles.module.scss b/src/pages/studyView/virtualStudy/styles.module.scss
index 0deb4bf9629..cf2bb8c51b2 100644
--- a/src/pages/studyView/virtualStudy/styles.module.scss
+++ b/src/pages/studyView/virtualStudy/styles.module.scss
@@ -1,16 +1,16 @@
 .virtualStudy {
     width: 350px;
-    
-    .virtualStudyForm{
+
+    .virtualStudyForm {
         margin-bottom: 5px;
         textarea {
             resize: none;
         }
         .saveButton {
-            height:34px;
+            height: 34px;
         }
     }
-    
+
     .studiesSummaryInfo {
         margin-top: 5px;
         font-size: 12px;
@@ -18,13 +18,13 @@
         overflow-y: auto;
     }
 
-    .result{
+    .result {
         display: flex;
         align-items: center;
         .name {
             flex-grow: 1;
         }
-    
+
         .controls {
             flex-shrink: 0;
             float: right;
@@ -59,7 +59,8 @@
         .panel {
             margin-bottom: 5px;
         }
-        .panel-heading, .panel-body {
+        .panel-heading,
+        .panel-body {
             padding: 7px;
         }
     }
diff --git a/src/routes.jsx b/src/routes.jsx
index cf448f9b0a3..ae9b36dcf40 100755
--- a/src/routes.jsx
+++ b/src/routes.jsx
@@ -43,15 +43,14 @@ import OQL from 'bundle-loader?lazy!babel-loader!./pages/staticPages/oql/OQL';
 import GroupComparisonPage from 'bundle-loader?lazy!babel-loader!./pages/groupComparison/GroupComparisonPage';
 import ErrorPage from 'bundle-loader?lazy!babel-loader!./pages/resultsView/ErrorPage';
 
-
 import $ from 'jquery';
-import {getBrowserWindow} from 'cbioportal-frontend-commons';
+import { getBrowserWindow } from 'cbioportal-frontend-commons';
 import { seekUrlHash } from 'shared/lib/seekUrlHash';
 import { PagePath } from 'shared/enums/PagePaths';
-import { ResultsViewTab } from 'pages/resultsView/ResultsViewPageHelpers'
-import { StudyViewPageTabKeyEnum } from 'pages/studyView/StudyViewPageTabs'
-import { PatientViewPageTabs } from 'pages/patientView/PatientViewPageTabs'
-import { GroupComparisonTab } from 'pages/groupComparison/GroupComparisonTabs'
+import { ResultsViewTab } from 'pages/resultsView/ResultsViewPageHelpers';
+import { StudyViewPageTabKeyEnum } from 'pages/studyView/StudyViewPageTabs';
+import { PatientViewPageTabs } from 'pages/patientView/PatientViewPageTabs';
+import { GroupComparisonTab } from 'pages/groupComparison/GroupComparisonTabs';
 
 /**
  * Validates that the parameters either do not have
@@ -62,12 +61,12 @@ import { GroupComparisonTab } from 'pages/groupComparison/GroupComparisonTabs'
 function tabParamValidator(tabEnum) {
     return function(params) {
         return !params.tab || Object.values(tabEnum).indexOf(params.tab) > -1;
-    }
+    };
 }
 
 /**
  * Validates results page custom tab
- * @param location 
+ * @param location
  */
 function customTabParamValidator(location) {
     var regex = /results\/customTab\d+/;
@@ -76,14 +75,30 @@ function customTabParamValidator(location) {
 
 // accepts bundle-loader's deferred loader function and defers execution of route's render
 // until chunk is loaded
-function lazyLoadComponent(loader, loadingCallback, validator = (_) => {return true;}) {
+function lazyLoadComponent(
+    loader,
+    loadingCallback,
+    validator = _ => {
+        return true;
+    }
+) {
     return (location, cb) => {
-        if (location && !(validator(location.params) || customTabParamValidator(location.location))) {
+        if (
+            location &&
+            !(
+                validator(location.params) ||
+                customTabParamValidator(location.location)
+            )
+        ) {
             loader = ErrorPage;
         }
         loader(module => {
-            if (cb) { cb(null, module.default); }
-            if (loadingCallback) { loadingCallback(); }
+            if (cb) {
+                cb(null, module.default);
+            }
+            if (loadingCallback) {
+                loadingCallback();
+            }
         });
     };
 }
@@ -148,28 +163,44 @@ export const makeRoutes = routing => {
             <Route
                 path="/results(/:tab)"
                 onEnter={() => {}}
-                getComponent={lazyLoadComponent(ResultsViewPage, null, tabParamValidator(ResultsViewTab))}
+                getComponent={lazyLoadComponent(
+                    ResultsViewPage,
+                    null,
+                    tabParamValidator(ResultsViewTab)
+                )}
             />
             <Route
                 path={'/' + PagePath.Patient + '(/:tab)'}
                 onEnter={() => {
                     $(document).scrollTop(0);
                 }}
-                getComponent={lazyLoadComponent(PatientViewPage, null, tabParamValidator(PatientViewPageTabs))}
+                getComponent={lazyLoadComponent(
+                    PatientViewPage,
+                    null,
+                    tabParamValidator(PatientViewPageTabs)
+                )}
             />
             <Route
-                path={"/" + PagePath.Study + "(/:tab)" }
+                path={'/' + PagePath.Study + '(/:tab)'}
                 onEnter={() => {
                     $(document).scrollTop(0);
                 }}
-                getComponent={lazyLoadComponent(StudyViewPage, null, tabParamValidator(StudyViewPageTabKeyEnum))}
+                getComponent={lazyLoadComponent(
+                    StudyViewPage,
+                    null,
+                    tabParamValidator(StudyViewPageTabKeyEnum)
+                )}
             />
             <Route
                 path="/comparison(/:tab)"
                 onEnter={() => {
                     $(document).scrollTop(0);
                 }}
-                getComponent={lazyLoadComponent(GroupComparisonPage, null, tabParamValidator(GroupComparisonTab))}
+                getComponent={lazyLoadComponent(
+                    GroupComparisonPage,
+                    null,
+                    tabParamValidator(GroupComparisonTab)
+                )}
             />
 
             <Route
diff --git a/src/shared/Empty.tsx b/src/shared/Empty.tsx
index 22e69f0e13c..8e79ec646f9 100644
--- a/src/shared/Empty.tsx
+++ b/src/shared/Empty.tsx
@@ -1,13 +1,15 @@
 import * as React from 'react';
 
 export class Timeline extends React.Component<any, {}> {
-
-    componentDidMount(){
+    componentDidMount() {
         this.props.onLoad();
     }
 
-    render(){
-        return <div style={{background:'blue',padding:20, color:'white'}}>This is dummy content to replace twitter feed.</div>
+    render() {
+        return (
+            <div style={{ background: 'blue', padding: 20, color: 'white' }}>
+                This is dummy content to replace twitter feed.
+            </div>
+        );
     }
-
-}
\ No newline at end of file
+}
diff --git a/src/shared/api/CivicAPI.ts b/src/shared/api/CivicAPI.ts
index 4c783e99b33..f01d8a8a316 100644
--- a/src/shared/api/CivicAPI.ts
+++ b/src/shared/api/CivicAPI.ts
@@ -1,5 +1,10 @@
 import * as request from 'superagent';
-import {ICivicGene, ICivicGeneData, ICivicVariant, ICivicVariantData} from "shared/model/Civic.ts";
+import {
+    ICivicGene,
+    ICivicGeneData,
+    ICivicVariant,
+    ICivicVariantData,
+} from 'shared/model/Civic.ts';
 
 type CivicAPIGene = {
     id: number;
@@ -12,7 +17,7 @@ type CivicAPIGene = {
 type CivicAPIGeneVariant = {
     name: string;
     id: number;
-    [propName: string]: any; 
+    [propName: string]: any;
 };
 
 type CivicAPIVariant = {
@@ -29,32 +34,35 @@ type Evidence = {
 /**
  * Returns a map with the different types of evidence and the number of times that each evidence happens.
  */
-function countEvidenceTypes(evidenceItems: Array<Evidence>): {[evidenceType: string]: number} {
-    let evidence: {[evidenceType: string]: number} = {};
-    evidenceItems.forEach(function (evidenceItem: Evidence) {
+function countEvidenceTypes(
+    evidenceItems: Array<Evidence>
+): { [evidenceType: string]: number } {
+    let evidence: { [evidenceType: string]: number } = {};
+    evidenceItems.forEach(function(evidenceItem: Evidence) {
         let evidenceType = evidenceItem.evidence_type;
         if (evidence.hasOwnProperty(evidenceType)) {
             evidence[evidenceType] += 1;
-        }
-        else {
+        } else {
             evidence[evidenceType] = 1;
         }
     });
     return evidence;
-};
+}
 
 /**
  * Returns a map with the different variant names and their variant id.
  */
-function createVariantMap(variantArray: Array<CivicAPIGeneVariant>): {[variantName: string]: number} {
-    let variantMap: {[variantName: string]: number} = {};
+function createVariantMap(
+    variantArray: Array<CivicAPIGeneVariant>
+): { [variantName: string]: number } {
+    let variantMap: { [variantName: string]: number } = {};
     if (variantArray && variantArray.length > 0) {
         variantArray.forEach(function(variant) {
             variantMap[variant.name] = variant.id;
         });
     }
     return variantMap;
-};
+}
 
 /**
  * CIViC
@@ -64,43 +72,55 @@ export default class CivicAPI {
      * Retrieves the gene entries for the ids given, if they are in the Civic API.
      */
     getCivicGenesBatch(ids: string): Promise<Array<ICivicGeneData>> {
-    return request.get('https://civicdb.org/api/genes/' + ids)
-           .query({identifier_type: 'entrez_id'})
-           .then((res) => {
+        return request
+            .get('https://civicdb.org/api/genes/' + ids)
+            .query({ identifier_type: 'entrez_id' })
+            .then(res => {
                 let response = res.body;
                 let result: Array<CivicAPIGene>;
                 if (response instanceof Array) {
-                  result = response;
+                    result = response;
                 } else {
-                  result = [response];
+                    result = [response];
                 }
                 return result.map((record: CivicAPIGene) => ({
                     id: record.id,
                     name: record.name,
                     description: record.description,
-                    url: 'https://civicdb.org/#/events/genes/'
-                    + record.id + '/summary',
-                    variants: createVariantMap(record.variants)
+                    url:
+                        'https://civicdb.org/#/events/genes/' +
+                        record.id +
+                        '/summary',
+                    variants: createVariantMap(record.variants),
                 }));
             });
     }
-    
+
     /**
      * Returns a promise that resolves with the variants for the parameters given.
      */
-     getVariant(id: number, name: string, geneId: number): Promise<ICivicVariantData> {
-        return request.get('https://civicdb.org/api/variants/' + id)
-               .then((res) => {
-                   let result = res.body;
-                   return {
-                       id,
-                       name,
-                       geneId,
-                       description: result.description,
-                       url: 'https://civicdb.org/#/events/genes/' + geneId +
-                            '/summary/variants/' + id + '/summary#variant',
-                       evidence: countEvidenceTypes(result.evidence_items)
-                   };
-              });
+    getVariant(
+        id: number,
+        name: string,
+        geneId: number
+    ): Promise<ICivicVariantData> {
+        return request
+            .get('https://civicdb.org/api/variants/' + id)
+            .then(res => {
+                let result = res.body;
+                return {
+                    id,
+                    name,
+                    geneId,
+                    description: result.description,
+                    url:
+                        'https://civicdb.org/#/events/genes/' +
+                        geneId +
+                        '/summary/variants/' +
+                        id +
+                        '/summary#variant',
+                    evidence: countEvidenceTypes(result.evidence_items),
+                };
+            });
     }
 }
diff --git a/src/shared/api/ComparisonGroupClient.ts b/src/shared/api/ComparisonGroupClient.ts
index 53f2312c232..6c56931b336 100644
--- a/src/shared/api/ComparisonGroupClient.ts
+++ b/src/shared/api/ComparisonGroupClient.ts
@@ -1,109 +1,115 @@
-import * as request from "superagent";
+import * as request from 'superagent';
 import {
     fetchComparisonGroupsServiceUrl,
     getComparisonGroupServiceUrl,
-    getComparisonSessionServiceUrl
-} from "./urls";
-import {VirtualStudy, VirtualStudyData} from "../model/VirtualStudy";
-import {ClinicalAttribute} from "./generated/CBioPortalAPI";
-import PromisePlus from "../lib/PromisePlus";
-import {Omit} from "../lib/TypeScriptUtils";
+    getComparisonSessionServiceUrl,
+} from './urls';
+import { VirtualStudy, VirtualStudyData } from '../model/VirtualStudy';
+import { ClinicalAttribute } from './generated/CBioPortalAPI';
+import PromisePlus from '../lib/PromisePlus';
+import { Omit } from '../lib/TypeScriptUtils';
 
-export type SessionGroupData = Omit<VirtualStudyData, "studyViewFilter"> & {
+export type SessionGroupData = Omit<VirtualStudyData, 'studyViewFilter'> & {
     uid?: string;
-    color?:string; // for charts
+    color?: string; // for charts
 };
 export type Session = {
-    id:string,
-    groups:SessionGroupData[],
-    origin:string[],
-    clinicalAttributeName?:string
-    groupNameOrder?:string[];
+    id: string;
+    groups: SessionGroupData[];
+    origin: string[];
+    clinicalAttributeName?: string;
+    groupNameOrder?: string[];
 };
 export type Group = {
-    id:string;
-    data:GroupData;
+    id: string;
+    data: GroupData;
 };
-export type GroupData = Omit<VirtualStudyData, "studyViewFilter">;
+export type GroupData = Omit<VirtualStudyData, 'studyViewFilter'>;
 
 export default class ComparisonGroupClient {
-
     // edge case: user deletes a group, then opens the panel again,
     //          and the getGroups request responds before the deleteGroup
     //          request completes, thus showing a group that should be
     //          (and soon will be) deleted. We fix this by waiting
     //          until deletions are done before allowing getGroups requests.
-    private _pendingDeletions:PromisePlus<any>[] = [];
+    private _pendingDeletions: PromisePlus<any>[] = [];
 
     private getPendingDeletions() {
         // filter out non-pending deletions
-        this._pendingDeletions = this._pendingDeletions.filter(x=>x.status !== "pending");
-        return this._pendingDeletions.map(p=>p.promise);
+        this._pendingDeletions = this._pendingDeletions.filter(
+            x => x.status !== 'pending'
+        );
+        return this._pendingDeletions.map(p => p.promise);
     }
 
     // Groups
-    public addGroup(group:GroupData):Promise<{ id:string }> {
+    public addGroup(group: GroupData): Promise<{ id: string }> {
         return request
             .post(getComparisonGroupServiceUrl())
             .send(group)
-            .then((res:any) => {
+            .then((res: any) => {
                 let result = res.body;
                 return {
-                    id:result.id
-                }
+                    id: result.id,
+                };
             });
     }
 
-    public updateGroup(id:string, group:GroupData) {
+    public updateGroup(id: string, group: GroupData) {
         return request
             .post(`${getComparisonGroupServiceUrl()}/${id}`)
             .send(group);
     }
 
-    public getGroup(id:string) {
+    public getGroup(id: string) {
         return request
             .get(`${getComparisonGroupServiceUrl()}/${id}`)
-            .then((res:any)=>res.body);
+            .then((res: any) => res.body);
     }
 
-    public async getGroupsForStudies(studyIds:string[]):Promise<Group[]> {
+    public async getGroupsForStudies(studyIds: string[]): Promise<Group[]> {
         await Promise.all(this.getPendingDeletions()); // wait for pending deletions to finish
 
         return request
             .post(fetchComparisonGroupsServiceUrl())
             .send(studyIds)
-            .then((res:any) => {
+            .then((res: any) => {
                 return res.body;
             });
     }
 
-    public deleteGroup(id:string) {
+    public deleteGroup(id: string) {
         const req = request
             .get(`${getComparisonGroupServiceUrl()}/delete/${id}`)
-            .then(()=>{});
+            .then(() => {});
 
         this._pendingDeletions.push(new PromisePlus(req));
         return req;
     }
 
     // Group Comparison Sessions
-    public addComparisonSession(session:Omit<Session, "id">):Promise<{ id:string }> {
+    public addComparisonSession(
+        session: Omit<Session, 'id'>
+    ): Promise<{ id: string }> {
         return request
             .post(getComparisonSessionServiceUrl())
             .send(session)
-            .then((res:any) => {
+            .then((res: any) => {
                 let result = res.body;
                 return {
-                    id:result.id
-                }
+                    id: result.id,
+                };
             });
     }
 
-    public async getComparisonSession(id:string):Promise<Session> {
-        const storedValue:{ id:string, data: Omit<Session, "id"> } =
-            await request.get(`${getComparisonSessionServiceUrl()}/${id}`)
-                .then((res:any)=>res.body);
+    public async getComparisonSession(id: string): Promise<Session> {
+        const storedValue: {
+            id: string;
+            data: Omit<Session, 'id'>;
+        } = await request
+            .get(`${getComparisonSessionServiceUrl()}/${id}`)
+            .then((res: any) => res.body);
 
-        return Object.assign(storedValue.data, { id: storedValue.id});
+        return Object.assign(storedValue.data, { id: storedValue.id });
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/api/LazyCache.ts b/src/shared/api/LazyCache.ts
index a2d6b528c5d..c459d10d6f8 100644
--- a/src/shared/api/LazyCache.ts
+++ b/src/shared/api/LazyCache.ts
@@ -1,10 +1,10 @@
-import {observable, action} from 'mobx';
+import { observable, action } from 'mobx';
 
 export default class LazyCache {
-    @observable.ref protected _cache:any;
-    protected dependencies:any[];
+    @observable.ref protected _cache: any;
+    protected dependencies: any[];
 
-    constructor(..._dependencies:any[]) {
+    constructor(..._dependencies: any[]) {
         this._cache = {};
         this.dependencies = _dependencies;
     }
@@ -13,22 +13,24 @@ export default class LazyCache {
         return this._cache;
     }
 
-    public populate(args:any) {
-        this.populateCache(args, ...this.dependencies).then((didChange:boolean)=>{
-            if (didChange) {
-                this.redefineCacheToTriggerMobX();
+    public populate(args: any) {
+        this.populateCache(args, ...this.dependencies).then(
+            (didChange: boolean) => {
+                if (didChange) {
+                    this.redefineCacheToTriggerMobX();
+                }
             }
-        });
+        );
     }
 
-    @action private redefineCacheToTriggerMobX():void {
-        this._cache = {...this._cache};
+    @action private redefineCacheToTriggerMobX(): void {
+        this._cache = { ...this._cache };
     }
 
     /* This is all that should be overridden */
-    protected populateCache(...argsAndDependencies:any[]):Promise<boolean> {
+    protected populateCache(...argsAndDependencies: any[]): Promise<boolean> {
         // Should resolve with true if a change to cache has been made, false if not.
         // You can see how it's used in LazyCache.populate
-        throw new Error("not implemented in abstract class");
+        throw new Error('not implemented in abstract class');
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/api/MatchMinerAPI.ts b/src/shared/api/MatchMinerAPI.ts
index ee007ae8390..a6e1c0bfa6d 100644
--- a/src/shared/api/MatchMinerAPI.ts
+++ b/src/shared/api/MatchMinerAPI.ts
@@ -1,44 +1,67 @@
 import * as request from 'superagent';
-import { ITrial, ITrialMatch } from "shared/model/MatchMiner.ts";
-import { buildCBioPortalAPIUrl } from "./urls";
+import { ITrial, ITrialMatch } from 'shared/model/MatchMiner.ts';
+import { buildCBioPortalAPIUrl } from './urls';
 
 /**
  * Retrieves the trial matches for the query given, if they are in the MatchMiner API.
  */
 // It cannot be set globally since it will cause test error: undefined of 'replace'.
 // const cbioportalUrl = buildCBioPortalAPIUrl('api-legacy/proxy/matchminer/api');
-export async function fetchTrialMatchesUsingPOST(query: object): Promise<Array<ITrialMatch>> {
-    const cbioportalUrl = buildCBioPortalAPIUrl('api-legacy/proxy/matchminer/api');
-    return request.post(cbioportalUrl + '/post_trial_match')
-    .set('Content-Type', 'application/json')
-    .send(query)
-    .then((res) => {
-        const response = JSON.parse(res.text);
-        return response.map((record:any) => ({
-            id: record.nct_id + '+' + record.protocol_no,
-            nctId: record.nct_id,
-            protocolNo: record.protocol_no,
-            gender: record.gender ? record.gender : '',
-            matchType: record.match_type ? record.match_type : '',
-            armDescription: record.arm_description ? record.arm_description : '',
-            armType: record.arm_type ? record.arm_type : '',
-            sampleId: record.sample_id,
-            mrn: record.mrn,
-            vitalStatus: record.vital_status ? record.vital_status : '',
-            genomicAlteration: record.genomic_alteration ? record.genomic_alteration : '',
-            trueHugoSymbol: record.true_hugo_symbol ? record.true_hugo_symbol : '',
-            trueProteinChange: record.true_protein_change ? record.true_protein_change : '',
-            oncotreePrimaryDiagnosisName: record.oncotreePrimaryDiagnosisName ? record.oncotreePrimaryDiagnosisName : '',
-            trialAgeNumerical: record.trial_age_numerical ? record.trial_age_numerical : '',
-            trialOncotreePrimaryDiagnosis: record.trial_oncotree_primary_diagnosis ? record.trial_oncotree_primary_diagnosis : ''
-        }));
-    });
+export async function fetchTrialMatchesUsingPOST(
+    query: object
+): Promise<Array<ITrialMatch>> {
+    const cbioportalUrl = buildCBioPortalAPIUrl(
+        'api-legacy/proxy/matchminer/api'
+    );
+    return request
+        .post(cbioportalUrl + '/post_trial_match')
+        .set('Content-Type', 'application/json')
+        .send(query)
+        .then(res => {
+            const response = JSON.parse(res.text);
+            return response.map((record: any) => ({
+                id: record.nct_id + '+' + record.protocol_no,
+                nctId: record.nct_id,
+                protocolNo: record.protocol_no,
+                gender: record.gender ? record.gender : '',
+                matchType: record.match_type ? record.match_type : '',
+                armDescription: record.arm_description
+                    ? record.arm_description
+                    : '',
+                armType: record.arm_type ? record.arm_type : '',
+                sampleId: record.sample_id,
+                mrn: record.mrn,
+                vitalStatus: record.vital_status ? record.vital_status : '',
+                genomicAlteration: record.genomic_alteration
+                    ? record.genomic_alteration
+                    : '',
+                trueHugoSymbol: record.true_hugo_symbol
+                    ? record.true_hugo_symbol
+                    : '',
+                trueProteinChange: record.true_protein_change
+                    ? record.true_protein_change
+                    : '',
+                oncotreePrimaryDiagnosisName: record.oncotreePrimaryDiagnosisName
+                    ? record.oncotreePrimaryDiagnosisName
+                    : '',
+                trialAgeNumerical: record.trial_age_numerical
+                    ? record.trial_age_numerical
+                    : '',
+                trialOncotreePrimaryDiagnosis: record.trial_oncotree_primary_diagnosis
+                    ? record.trial_oncotree_primary_diagnosis
+                    : '',
+            }));
+        });
 }
 
-export async function fetchTrialsByTypeAndId(type: string, id: string): Promise<ITrial> {
-    const cbioportalUrl = buildCBioPortalAPIUrl('api-legacy/proxy/matchminer/api');
-    return request.get(cbioportalUrl + '/' + type + '/'+ id)
-    .then((res) => {
+export async function fetchTrialsByTypeAndId(
+    type: string,
+    id: string
+): Promise<ITrial> {
+    const cbioportalUrl = buildCBioPortalAPIUrl(
+        'api-legacy/proxy/matchminer/api'
+    );
+    return request.get(cbioportalUrl + '/' + type + '/' + id).then(res => {
         const response = JSON.parse(res.text);
         return {
             id: response.nct_id + '+' + response.protocol_no,
@@ -48,46 +71,54 @@ export async function fetchTrialsByTypeAndId(type: string, id: string): Promise<
             phase: response.phase,
             shortTitle: response.short_title,
             status: response.status,
-            treatmentList: response.treatment_list
+            treatmentList: response.treatment_list,
         };
     });
 }
 
-export async function fetchTrialsUsingPost(query: object): Promise<Array<ITrial>> {
-    const cbioportalUrl = buildCBioPortalAPIUrl('api-legacy/proxy/matchminer/api');
-    return request.post(cbioportalUrl + '/post_trial')
-    .set('Content-Type', 'application/json')
-    .send(query)
-    .then((res) => {
-        const response = JSON.parse(res.text);
-        return response.map((record:any) => ({
-            id: record.nct_id + '+' + record.protocol_no,
-            nctId: record.nct_id,
-            protocolNo: record.protocol_no,
-            phase: record.phase,
-            shortTitle: record.short_title,
-            status: record.status,
-            treatmentList: record.treatment_list
-        }));
-    });
+export async function fetchTrialsUsingPost(
+    query: object
+): Promise<Array<ITrial>> {
+    const cbioportalUrl = buildCBioPortalAPIUrl(
+        'api-legacy/proxy/matchminer/api'
+    );
+    return request
+        .post(cbioportalUrl + '/post_trial')
+        .set('Content-Type', 'application/json')
+        .send(query)
+        .then(res => {
+            const response = JSON.parse(res.text);
+            return response.map((record: any) => ({
+                id: record.nct_id + '+' + record.protocol_no,
+                nctId: record.nct_id,
+                protocolNo: record.protocol_no,
+                phase: record.phase,
+                shortTitle: record.short_title,
+                status: record.status,
+                treatmentList: record.treatment_list,
+            }));
+        });
 }
 
 export async function fetchTrialsById(query: object): Promise<Array<ITrial>> {
-    const cbioportalUrl = buildCBioPortalAPIUrl('api-legacy/proxy/matchminer/api');
-    return request.post(cbioportalUrl + '/trials')
-    .set('Content-Type', 'application/json')
-    .send(query)
-    .then((res) => {
-        const response = JSON.parse(res.text);
-        return response.map((record:any) => ({
-            id: record.nct_id + '+' + record.protocol_no,
-            nctId: record.nct_id,
-            protocolNo: record.protocol_no,
-            principalInvestigator: record.principal_investigator,
-            phase: record.phase,
-            shortTitle: record.short_title,
-            status: record.status,
-            treatmentList: record.treatment_list
-        }));
-    });
+    const cbioportalUrl = buildCBioPortalAPIUrl(
+        'api-legacy/proxy/matchminer/api'
+    );
+    return request
+        .post(cbioportalUrl + '/trials')
+        .set('Content-Type', 'application/json')
+        .send(query)
+        .then(res => {
+            const response = JSON.parse(res.text);
+            return response.map((record: any) => ({
+                id: record.nct_id + '+' + record.protocol_no,
+                nctId: record.nct_id,
+                protocolNo: record.protocol_no,
+                principalInvestigator: record.principal_investigator,
+                phase: record.phase,
+                shortTitle: record.short_title,
+                status: record.status,
+                treatmentList: record.treatment_list,
+            }));
+        });
 }
diff --git a/src/shared/api/api-types-extended.ts b/src/shared/api/api-types-extended.ts
index 02a28a4ca93..7200e724910 100644
--- a/src/shared/api/api-types-extended.ts
+++ b/src/shared/api/api-types-extended.ts
@@ -1,4 +1,4 @@
-import { ClinicalData } from "./generated/CBioPortalAPI";
+import { ClinicalData } from './generated/CBioPortalAPI';
 
 export type ClinicalDataBySampleId = {
     id: string;
diff --git a/src/shared/api/cbioportalClientInstance.ts b/src/shared/api/cbioportalClientInstance.ts
index cccdae251d3..4d645cc5f6f 100644
--- a/src/shared/api/cbioportalClientInstance.ts
+++ b/src/shared/api/cbioportalClientInstance.ts
@@ -1,4 +1,4 @@
-import CBioPortalAPI from "./generated/CBioPortalAPI";
+import CBioPortalAPI from './generated/CBioPortalAPI';
 
 const client = new CBioPortalAPI();
 
diff --git a/src/shared/api/cbioportalInternalClientInstance.ts b/src/shared/api/cbioportalInternalClientInstance.ts
index 8abd3d7d8af..0be64943d2e 100644
--- a/src/shared/api/cbioportalInternalClientInstance.ts
+++ b/src/shared/api/cbioportalInternalClientInstance.ts
@@ -1,4 +1,4 @@
-import CBioPortalAPIInternal from "./generated/CBioPortalAPIInternal";
+import CBioPortalAPIInternal from './generated/CBioPortalAPIInternal';
 
 const internalClient = new CBioPortalAPIInternal();
 
diff --git a/src/shared/api/civicClientInstance.ts b/src/shared/api/civicClientInstance.ts
index 7f480296d0a..7d2193e29a0 100644
--- a/src/shared/api/civicClientInstance.ts
+++ b/src/shared/api/civicClientInstance.ts
@@ -1,6 +1,5 @@
-import CivicAPI from "./CivicAPI";
+import CivicAPI from './CivicAPI';
 
 const client = new CivicAPI();
 
 export default client;
-
diff --git a/src/shared/api/comparisonGroupClientInstance.ts b/src/shared/api/comparisonGroupClientInstance.ts
index f9dfc2eb386..931350cc83d 100644
--- a/src/shared/api/comparisonGroupClientInstance.ts
+++ b/src/shared/api/comparisonGroupClientInstance.ts
@@ -1,4 +1,4 @@
-import ComparisonGroupClient from "./ComparisonGroupClient";
+import ComparisonGroupClient from './ComparisonGroupClient';
 
 const comparisonClient = new ComparisonGroupClient();
 
diff --git a/src/shared/api/g2sClientInstance.ts b/src/shared/api/g2sClientInstance.ts
index a1edc9df5f3..07814ebf888 100644
--- a/src/shared/api/g2sClientInstance.ts
+++ b/src/shared/api/g2sClientInstance.ts
@@ -1,4 +1,4 @@
-import {Genome2StructureAPI} from "cbioportal-frontend-commons";
+import { Genome2StructureAPI } from 'cbioportal-frontend-commons';
 
 const client = new Genome2StructureAPI();
 
diff --git a/src/shared/api/genomeNexusClientInstance.ts b/src/shared/api/genomeNexusClientInstance.ts
index 3f9c33f19f3..0d9b98c77d5 100644
--- a/src/shared/api/genomeNexusClientInstance.ts
+++ b/src/shared/api/genomeNexusClientInstance.ts
@@ -1,9 +1,12 @@
-import {GenomeNexusAPI} from "cbioportal-frontend-commons";
+import { GenomeNexusAPI } from 'cbioportal-frontend-commons';
 
-async function checkVersion(client:GenomeNexusAPI) {
+async function checkVersion(client: GenomeNexusAPI) {
     const versionResp = await client.fetchVersionGET({});
-    if (parseInt(versionResp.version.split(".")[0]) !== 1) {
-        console.error("Expected version of Genome Nexus to be 1.x.y, but found: " + versionResp.version);
+    if (parseInt(versionResp.version.split('.')[0]) !== 1) {
+        console.error(
+            'Expected version of Genome Nexus to be 1.x.y, but found: ' +
+                versionResp.version
+        );
     }
 }
 
diff --git a/src/shared/api/genomeNexusInternalClientInstance.ts b/src/shared/api/genomeNexusInternalClientInstance.ts
index 658489d07b6..be53cb0e0be 100644
--- a/src/shared/api/genomeNexusInternalClientInstance.ts
+++ b/src/shared/api/genomeNexusInternalClientInstance.ts
@@ -1,4 +1,4 @@
-import {GenomeNexusAPIInternal} from "cbioportal-frontend-commons";
+import { GenomeNexusAPIInternal } from 'cbioportal-frontend-commons';
 
 const client = new GenomeNexusAPIInternal();
 
diff --git a/src/shared/api/gsuploadwindow.ts b/src/shared/api/gsuploadwindow.ts
index 82d386a7072..618efe4100d 100644
--- a/src/shared/api/gsuploadwindow.ts
+++ b/src/shared/api/gsuploadwindow.ts
@@ -2,81 +2,119 @@
 
 import request from 'superagent';
 
-let jsuiRoot = "https://gsui.genomespace.org/jsui/";
+let jsuiRoot = 'https://gsui.genomespace.org/jsui/';
 
-type Callback = (data:any) => void;
+type Callback = (data: any) => void;
 
-export function gsUploadByGet(config:{url:string, filename?:string, successCallback?:Callback, errorCallback?:Callback}) {
+export function gsUploadByGet(config: {
+    url: string;
+    filename?: string;
+    successCallback?: Callback;
+    errorCallback?: Callback;
+}) {
     // expect an object with url, filename (optional), successCallback(optional), errorCallback (optional)
 
-    let gsUploadUrl = jsuiRoot + "/upload/loadUrlToGenomespace.html?uploadUrl=";
+    let gsUploadUrl = jsuiRoot + '/upload/loadUrlToGenomespace.html?uploadUrl=';
     let dest = encodeURIComponent(config.url);
-    let filenameParam = "";
+    let filenameParam = '';
     if (config['filename'] != null) {
-        filenameParam = "&fileName=" + config.filename;
+        filenameParam = '&fileName=' + config.filename;
     }
 
-    let newWin = window.open(gsUploadUrl + dest + filenameParam, "GenomeSpace Upload", "height=340px,width=550px");
-    if (!newWin)
-        return alert('GenomeSpace popup was blocked by the browser');
+    let newWin = window.open(
+        gsUploadUrl + dest + filenameParam,
+        'GenomeSpace Upload',
+        'height=340px,width=550px'
+    );
+    if (!newWin) return alert('GenomeSpace popup was blocked by the browser');
     else {
         newWin.focus();
-        if (config['successCallback'] != null) (newWin as any).setCallbackOnGSUploadComplete = config['successCallback'];
+        if (config['successCallback'] != null)
+            (newWin as any).setCallbackOnGSUploadComplete =
+                config['successCallback'];
 
-        if (config['errorCallback'] != null) (newWin as any).setCallbackOnGSUploadError = config['errorCallback'];
+        if (config['errorCallback'] != null)
+            (newWin as any).setCallbackOnGSUploadError =
+                config['errorCallback'];
     }
 }
 
-export function gsLocationByGet(config:{successCallback:Callback, errorCallback?:Callback}){
+export function gsLocationByGet(config: {
+    successCallback: Callback;
+    errorCallback?: Callback;
+}) {
     // expect an object with url, filename (optional), successCallback, errorCallback (optional)
 
-    let gsUploadUrl = jsuiRoot +"/upload/loadUrlToGenomespace.html?getLocation=true";
+    let gsUploadUrl =
+        jsuiRoot + '/upload/loadUrlToGenomespace.html?getLocation=true';
 
-    let newWin = window.open(gsUploadUrl, "GenomeSpace Upload", "height=360px,width=600px");
+    let newWin = window.open(
+        gsUploadUrl,
+        'GenomeSpace Upload',
+        'height=360px,width=600px'
+    );
 
     let successCallback = config['successCallback'];
-    window.addEventListener( "message",
-        function (e) {
+    window.addEventListener(
+        'message',
+        function(e) {
             successCallback(e.data);
         },
-        false);
+        false
+    );
 
     if (newWin) {
         newWin.focus();
     }
 
-    if (config['errorCallback'] != null) (newWin as any).setCallbackOnGSUploadError = config['errorCallback'];
+    if (config['errorCallback'] != null)
+        (newWin as any).setCallbackOnGSUploadError = config['errorCallback'];
 }
 
-export function gsSelectFileByGet(config:{successCallback:Callback, errorCallback?:Callback}){
+export function gsSelectFileByGet(config: {
+    successCallback: Callback;
+    errorCallback?: Callback;
+}) {
     // expect an object with url, filename (optional), successCallback, errorCallback (optional)
-    let gsUploadUrl = jsuiRoot +"/upload/loadUrlToGenomespace.html?getFile=true";
-    let newWin = window.open(gsUploadUrl , "GenomeSpace Upload", "height=340px,width=550px");
+    let gsUploadUrl =
+        jsuiRoot + '/upload/loadUrlToGenomespace.html?getFile=true';
+    let newWin = window.open(
+        gsUploadUrl,
+        'GenomeSpace Upload',
+        'height=340px,width=550px'
+    );
     if (newWin) {
         newWin.focus();
 
-        (newWin as any).setCallbackOnGSLocationComplete = config['successCallback'];
+        (newWin as any).setCallbackOnGSLocationComplete =
+            config['successCallback'];
 
-        if (config['errorCallback'] != null) (newWin as any).setCallbackOnGSUploadError = config['errorCallback'];
+        if (config['errorCallback'] != null)
+            (newWin as any).setCallbackOnGSUploadError =
+                config['errorCallback'];
     }
 }
 
-export async function gsUploadByPost(formData:any){
+export async function gsUploadByPost(formData: any) {
     // expects an object with formData( the file(s)),
 
-    function gsUploadByPostErrorHandler(err:any){
+    function gsUploadByPostErrorHandler(err: any) {
         alert('An error occurred while posting the file to GenomeSpace');
-    };
+    }
 
-    function gsUploadByPostCompleteHandler(responseObj:any){
-        if (typeof responseObj == "string"){
+    function gsUploadByPostCompleteHandler(responseObj: any) {
+        if (typeof responseObj == 'string') {
             responseObj = JSON.parse(responseObj);
         }
-        let newWin = window.open(responseObj.completionUrl, "GenomeSpace Upload", "height=340px,width=550px");
+        let newWin = window.open(
+            responseObj.completionUrl,
+            'GenomeSpace Upload',
+            'height=340px,width=550px'
+        );
         (newWin as any).focus();
-    };
+    }
     let params = {
-        url: jsuiRoot + '/postToGenomeSpace',  //server script to process data
+        url: jsuiRoot + '/postToGenomeSpace', //server script to process data
         type: 'POST',
         crossDomain: true,
         success: gsUploadByPostCompleteHandler,
@@ -85,12 +123,15 @@ export async function gsUploadByPost(formData:any){
         //Options to tell JQuery not to process data or worry about content-type
         cache: false,
         contentType: false,
-        processData: false
+        processData: false,
     };
 
     // $.ajax(params);
 
-    let req = request.agent()
-        .post(params.url, (err, res) => err ? params.error(err) : params.success(res))
+    let req = request
+        .agent()
+        .post(params.url, (err, res) =>
+            err ? params.error(err) : params.success(res)
+        )
         .send(params.data);
 }
diff --git a/src/shared/api/index.jsx b/src/shared/api/index.jsx
index 76fa6ec33bb..a60523e1ff9 100644
--- a/src/shared/api/index.jsx
+++ b/src/shared/api/index.jsx
@@ -1,8 +1,8 @@
 import Swagger from 'swagger-client';
-import AppConfig from "appConfig";
+import AppConfig from 'appConfig';
 
 const clientPromise = new Swagger({
     url: `http://${AppConfig.apiRoot}/v2/api-docs`,
-    usePromise: true
+    usePromise: true,
 });
 export default clientPromise;
diff --git a/src/shared/api/oncokbClientInstance.ts b/src/shared/api/oncokbClientInstance.ts
index 3b51735e0fe..33370bf6199 100644
--- a/src/shared/api/oncokbClientInstance.ts
+++ b/src/shared/api/oncokbClientInstance.ts
@@ -1,4 +1,4 @@
-import {OncoKbAPI} from "cbioportal-frontend-commons";
+import { OncoKbAPI } from 'cbioportal-frontend-commons';
 
 const client = new OncoKbAPI();
 
diff --git a/src/shared/api/sessionServiceAPI.ts b/src/shared/api/sessionServiceAPI.ts
index 2295dd1f311..28cf012a086 100644
--- a/src/shared/api/sessionServiceAPI.ts
+++ b/src/shared/api/sessionServiceAPI.ts
@@ -1,113 +1,125 @@
 import * as request from 'superagent';
-import {getSessionUrl} from "./urls";
-import {VirtualStudy} from "shared/model/VirtualStudy";
+import { getSessionUrl } from './urls';
+import { VirtualStudy } from 'shared/model/VirtualStudy';
 import { StudyPageSettings } from 'pages/studyView/StudyViewPageStore';
 
 export default class sessionServiceAPI {
-
     getVirtualStudyServiceUrl() {
         return `${getSessionUrl()}/virtual_study`;
     }
-    
+
     getSessionServiceUrl() {
         return `${getSessionUrl()}/main_session`;
     }
-    
-   getUserSettingUrl() {
+
+    getUserSettingUrl() {
         return `${getSessionUrl()}/settings`;
     }
-    
+
     /**
      * Retrieve Virtual Studies
      */
     getUserVirtualStudies(): Promise<Array<VirtualStudy>> {
-
-        return request
+        return (
+            request
                 .get(this.getVirtualStudyServiceUrl())
                 // @ts-ignore: this method comes from caching plugin and isn't in typing
                 .forceUpdate(true)
-                .then((res:any) => {
+                .then((res: any) => {
                     return res.body;
-                });              
+                })
+        );
     }
 
-    getVirtualStudy(id:string): Promise<VirtualStudy> {
-        return request
+    getVirtualStudy(id: string): Promise<VirtualStudy> {
+        return (
+            request
                 .get(`${this.getVirtualStudyServiceUrl()}/${id}`)
                 // @ts-ignore: this method comes from caching plugin and isn't in typing
                 .forceUpdate(true)
-                .then((res:any) => {
+                .then((res: any) => {
                     return res.body;
-                });              
+                })
+        );
     }
 
-    deleteVirtualStudy(id:string){
-        return request
+    deleteVirtualStudy(id: string) {
+        return (
+            request
                 .get(`${this.getVirtualStudyServiceUrl()}/delete/${id}`)
                 // @ts-ignore: this method comes from caching plugin and isn't in typing
                 .forceUpdate(true)
-                             
+        );
     }
 
-    addVirtualStudy(id:string){
-        return request
+    addVirtualStudy(id: string) {
+        return (
+            request
                 .get(`${this.getVirtualStudyServiceUrl()}/add/${id}`)
                 // @ts-ignore: this method comes from caching plugin and isn't in typing
                 .forceUpdate(true)
+        );
     }
-    
+
     saveVirtualStudy(object: any, save: boolean) {
         return request
             .post(this.getVirtualStudyServiceUrl() + (save ? '/save' : ''))
             .send(object)
-            .then((res:any) => {
+            .then((res: any) => {
                 let result = res.body;
-                   return {
-                       id:result.id
-                   }
+                return {
+                    id: result.id,
+                };
             });
     }
 
-    saveSession(data:any) {
+    saveSession(data: any) {
         return request
             .post(this.getSessionServiceUrl())
             .send(data)
-            .then((res:any) => {
-                return res.body
+            .then((res: any) => {
+                return res.body;
             });
     }
 
-    getSession(sessionId:string) {
-        return request
-            .get(`${this.getSessionServiceUrl()}/${sessionId}`)
-            // @ts-ignore: this method comes from caching plugin and isn't in typing
-            .forceUpdate(true)
-            .then((res:any) => {
-                return res.body
-            });
+    getSession(sessionId: string) {
+        return (
+            request
+                .get(`${this.getSessionServiceUrl()}/${sessionId}`)
+                // @ts-ignore: this method comes from caching plugin and isn't in typing
+                .forceUpdate(true)
+                .then((res: any) => {
+                    return res.body;
+                })
+        );
     }
 
-
-    fetchUserSettings(studyIds:string[]): Promise<StudyPageSettings|undefined> {
-        return request
-            .post(`${this.getUserSettingUrl()}/fetch`)
-            .send({page:'study_view', origin:studyIds})
-            // @ts-ignore: this method comes from caching plugin and isn't in typing
-            .forceUpdate(true)
-            .then((res:any) => {
-                //can be undefined if noting was saved previously
-                return res.body;
-            });
+    fetchUserSettings(
+        studyIds: string[]
+    ): Promise<StudyPageSettings | undefined> {
+        return (
+            request
+                .post(`${this.getUserSettingUrl()}/fetch`)
+                .send({ page: 'study_view', origin: studyIds })
+                // @ts-ignore: this method comes from caching plugin and isn't in typing
+                .forceUpdate(true)
+                .then((res: any) => {
+                    //can be undefined if noting was saved previously
+                    return res.body;
+                })
+        );
     }
 
-    updateUserSettings(data:StudyPageSettings) {
-        return request
-            .post(`${this.getUserSettingUrl()}`)
-            .send({page:'study_view', ...data})
-            // @ts-ignore: this method comes from caching plugin and isn't in typing
-            .forceUpdate(true)
-            .then((res:any) => {
-                return res.body;
-            });
+    updateUserSettings(data: StudyPageSettings) {
+        return (
+            request
+                .post(`${this.getUserSettingUrl()}`)
+                .send({ page: 'study_view', ...data })
+                // @ts-ignore: this method comes from caching plugin and isn't in typing
+                .forceUpdate(true)
+                .then((res: any) => {
+                    return res.body;
+                })
+        );
     }
 }
diff --git a/src/shared/api/sessionServiceInstance.ts b/src/shared/api/sessionServiceInstance.ts
index bec3b97a12f..16585dc3e60 100644
--- a/src/shared/api/sessionServiceInstance.ts
+++ b/src/shared/api/sessionServiceInstance.ts
@@ -1,4 +1,4 @@
-import sessionServiceAPI from "./sessionServiceAPI";
+import sessionServiceAPI from './sessionServiceAPI';
 
 const client = new sessionServiceAPI();
 
diff --git a/src/shared/api/urls.spec.ts b/src/shared/api/urls.spec.ts
index dea63fa8052..a977e8e4972 100644
--- a/src/shared/api/urls.spec.ts
+++ b/src/shared/api/urls.spec.ts
@@ -1,4 +1,4 @@
-import {getGenomeNexusApiUrl} from './urls';
+import { getGenomeNexusApiUrl } from './urls';
 import React from 'react';
 import { assert } from 'chai';
 import { shallow, mount } from 'enzyme';
@@ -6,27 +6,28 @@ import sinon from 'sinon';
 import AppConfig from 'appConfig';
 
 describe('url library', () => {
-
-    before(()=>{
+    before(() => {
         //global.window = { location: { protocol: 'https://' } };
         AppConfig.serverConfig.genomenexus_url = 'http://www.test.com/hello/';
         AppConfig.apiRoot = 'http://www.cbioportal.org';
     });
 
-    after(()=>{
+    after(() => {
         delete AppConfig.serverConfig.genomenexus_url;
         delete AppConfig.apiRoot;
     });
 
-    it('transforms genome nexus url configuration url to proxied url: removes protocol and trailing slash', ()=>{
-
+    it('transforms genome nexus url configuration url to proxied url: removes protocol and trailing slash', () => {
         // note that this is WRONG (http: should be followed by double shlash)
         // but this is due to testing env and url builder library
         // this works correctly in browser env
-        assert.equal(getGenomeNexusApiUrl(), 'http://www.cbioportal.org/proxy/www.test.com/hello');
+        assert.equal(
+            getGenomeNexusApiUrl(),
+            'http://www.cbioportal.org/proxy/www.test.com/hello'
+        );
     });
 
-    it('transforms genome nexus url configuration url to proxied url: removes protocol and trailing slash', ()=>{
+    it('transforms genome nexus url configuration url to proxied url: removes protocol and trailing slash', () => {
         AppConfig.serverConfig.genomenexus_url = null;
         // note that this is WRONG (http: should be followed by double shlash)
         // note that this is WRONG (http: should be followed by double shlash)
@@ -34,5 +35,4 @@ describe('url library', () => {
         // this works correctly in browser env
         assert.isUndefined(getGenomeNexusApiUrl());
     });
-
 });
diff --git a/src/shared/api/urls.ts b/src/shared/api/urls.ts
index 91730ef58e0..168d1632899 100644
--- a/src/shared/api/urls.ts
+++ b/src/shared/api/urls.ts
@@ -1,42 +1,66 @@
-import {default as URL, QueryParams} from "url";
-import AppConfig from "appConfig";
-import {BuildUrlParams, getBrowserWindow} from "cbioportal-frontend-commons";
+import { default as URL, QueryParams } from 'url';
+import AppConfig from 'appConfig';
+import { BuildUrlParams, getBrowserWindow } from 'cbioportal-frontend-commons';
 import * as _ from 'lodash';
-import {GroupComparisonLoadingParams} from "../../pages/groupComparison/GroupComparisonLoading";
-import {GroupComparisonURLQuery} from "../../pages/groupComparison/GroupComparisonURLWrapper";
-import { PagePath } from "shared/enums/PagePaths";
-
-export function trimTrailingSlash(str:string){
-   return str.replace(/\/$/g,"");
-}
-
-export function buildCBioPortalAPIUrl(params:BuildUrlParams):string;
-export function buildCBioPortalAPIUrl(pathname:string, query?:QueryParams, hash?:string):string;
-export function buildCBioPortalAPIUrl(pathnameOrParams:string | BuildUrlParams, query?:QueryParams, hash?:string) {
-    let params:BuildUrlParams = typeof pathnameOrParams === 'string' ? {pathname: pathnameOrParams, query, hash} : pathnameOrParams;
-
+import { GroupComparisonLoadingParams } from '../../pages/groupComparison/GroupComparisonLoading';
+import { GroupComparisonURLQuery } from '../../pages/groupComparison/GroupComparisonURLWrapper';
+import { PagePath } from 'shared/enums/PagePaths';
+
+export function trimTrailingSlash(str: string) {
+    return str.replace(/\/$/g, '');
+}
+
+export function buildCBioPortalAPIUrl(params: BuildUrlParams): string;
+export function buildCBioPortalAPIUrl(
+    pathname: string,
+    query?: QueryParams,
+    hash?: string
+): string;
+export function buildCBioPortalAPIUrl(
+    pathnameOrParams: string | BuildUrlParams,
+    query?: QueryParams,
+    hash?: string
+) {
+    let params: BuildUrlParams =
+        typeof pathnameOrParams === 'string'
+            ? { pathname: pathnameOrParams, query, hash }
+            : pathnameOrParams;
 
     const apiRootUrl = URL.parse(trimTrailingSlash(AppConfig.apiRoot!));
 
     // prepend the root path (e.g. "beta"
-    params.pathname = trimTrailingSlash(apiRootUrl.pathname || "") + "/" + (params.pathname || "");
+    params.pathname =
+        trimTrailingSlash(apiRootUrl.pathname || '') +
+        '/' +
+        (params.pathname || '');
 
     return URL.format({
         protocol: apiRootUrl.protocol || getBrowserWindow().location.protocol,
         host: apiRootUrl.host,
-        ...params
+        ...params,
     });
 }
 
 // this will produce a URL relative to the host protocol of the current HTML page in browser
-export function buildCBioPortalPageUrl(params:BuildUrlParams):string;
-export function buildCBioPortalPageUrl(pathname:string, query?:QueryParams, hash?:string):string;
-export function buildCBioPortalPageUrl(pathnameOrParams:string | BuildUrlParams, query?:QueryParams, hash?:string) {
-    let params:BuildUrlParams = typeof pathnameOrParams === 'string' ? {pathname: pathnameOrParams, query, hash} : pathnameOrParams;
+export function buildCBioPortalPageUrl(params: BuildUrlParams): string;
+export function buildCBioPortalPageUrl(
+    pathname: string,
+    query?: QueryParams,
+    hash?: string
+): string;
+export function buildCBioPortalPageUrl(
+    pathnameOrParams: string | BuildUrlParams,
+    query?: QueryParams,
+    hash?: string
+) {
+    let params: BuildUrlParams =
+        typeof pathnameOrParams === 'string'
+            ? { pathname: pathnameOrParams, query, hash }
+            : pathnameOrParams;
     return URL.format({
         protocol: window.location.protocol,
         host: AppConfig.baseUrl,
-        ...params
+        ...params,
     });
 }
 
@@ -45,12 +69,12 @@ export function getCurrentURLWithoutHash() {
         protocol: window.location.protocol,
         host: window.location.host,
         pathname: window.location.pathname,
-        search: window.location.search
+        search: window.location.search,
     });
 }
 
 // this gives us the root of the instance (.e.g. //www.bioportal.org/beta)
-export function buildCBioLink(path:string){
+export function buildCBioLink(path: string) {
     return '//' + AppConfig.baseUrl + '/' + path;
 }
 
@@ -59,69 +83,93 @@ export function getCbioPortalApiUrl() {
     return `${root}/api`;
 }
 
-export function getFrontendAssetUrl(path:string) {
+export function getFrontendAssetUrl(path: string) {
     const root = trimTrailingSlash(AppConfig.frontendUrl!);
     return `${root}/${path}`;
 }
 
-
-function getStudySummaryUrlParams(studyIds:string | ReadonlyArray<string>) {
-    let cohortsArray:ReadonlyArray<string>;
-    if (typeof studyIds === "string") {
+function getStudySummaryUrlParams(studyIds: string | ReadonlyArray<string>) {
+    let cohortsArray: ReadonlyArray<string>;
+    if (typeof studyIds === 'string') {
         cohortsArray = [studyIds];
     } else {
         cohortsArray = studyIds;
     }
-    return {pathname:'study', query: {id: cohortsArray.join(",")}};
+    return { pathname: 'study', query: { id: cohortsArray.join(',') } };
 }
 
-export function getStudySummaryUrl(studyIds:string | ReadonlyArray<string>) {
+export function getStudySummaryUrl(studyIds: string | ReadonlyArray<string>) {
     const params = getStudySummaryUrlParams(studyIds);
     return buildCBioPortalPageUrl(params.pathname, params.query);
 }
 export function redirectToStudyView(studyIds: string | ReadonlyArray<string>) {
     const params = getStudySummaryUrlParams(studyIds);
-    (window as any).routingStore.updateRoute(params.query, PagePath.Study, true);
-}
-export function getSampleViewUrl(studyId:string, sampleId:string, navIds?:{patientId:string, studyId:string}[]) {
-    let hash:any = undefined;
+    (window as any).routingStore.updateRoute(
+        params.query,
+        PagePath.Study,
+        true
+    );
+}
+export function getSampleViewUrl(
+    studyId: string,
+    sampleId: string,
+    navIds?: { patientId: string; studyId: string }[]
+) {
+    let hash: any = undefined;
     if (navIds) {
-        hash = `navCaseIds=${navIds.map(id=>`${id.studyId}:${id.patientId}`).join(",")}`;
+        hash = `navCaseIds=${navIds
+            .map(id => `${id.studyId}:${id.patientId}`)
+            .join(',')}`;
     }
     return buildCBioPortalPageUrl('patient', { sampleId, studyId }, hash);
 }
-export function getPatientViewUrl(studyId:string, caseId:string, navIds?:{patientId:string, studyId:string}[]) {
-    let hash:any = undefined;
+export function getPatientViewUrl(
+    studyId: string,
+    caseId: string,
+    navIds?: { patientId: string; studyId: string }[]
+) {
+    let hash: any = undefined;
     if (navIds) {
-        hash = `navCaseIds=${navIds.map(id=>`${id.studyId}:${id.patientId}`).join(",")}`;
+        hash = `navCaseIds=${navIds
+            .map(id => `${id.studyId}:${id.patientId}`)
+            .join(',')}`;
     }
     return buildCBioPortalPageUrl('patient', { studyId, caseId }, hash);
 }
 
-export function getComparisonUrl(params:Partial<GroupComparisonURLQuery>){
-    return buildCBioPortalPageUrl('comparison', params)
+export function getComparisonUrl(params: Partial<GroupComparisonURLQuery>) {
+    return buildCBioPortalPageUrl('comparison', params);
 }
 
-export function redirectToComparisonPage(win:Window, params:Partial<GroupComparisonURLQuery>) {
+export function redirectToComparisonPage(
+    win: Window,
+    params: Partial<GroupComparisonURLQuery>
+) {
     (win as any).location.href = getComparisonUrl(params);
 
     //(win as any).routingStore.updateRoute(params, "comparison", true);
 }
 
-export function getComparisonLoadingUrl(params?:Partial<GroupComparisonLoadingParams>) {
-    return buildCBioPortalPageUrl("loading/comparison",params || {});
+export function getComparisonLoadingUrl(
+    params?: Partial<GroupComparisonLoadingParams>
+) {
+    return buildCBioPortalPageUrl('loading/comparison', params || {});
 }
 
-export function getPubMedUrl(pmid:string) {
+export function getPubMedUrl(pmid: string) {
     return _.template(AppConfig.serverConfig.pubmed_url!)({ pmid });
 }
 
 export function getMyGeneUrl(entrezGeneId: number) {
-    return _.template(AppConfig.serverConfig.mygene_info_url!)({ entrezGeneId });
+    return _.template(AppConfig.serverConfig.mygene_info_url!)({
+        entrezGeneId,
+    });
 }
 
 export function getUniprotIdUrl(swissProtAccession: string) {
-    return _.template(AppConfig.serverConfig.uniprot_id_url!)({swissProtAccession:swissProtAccession});
+    return _.template(AppConfig.serverConfig.uniprot_id_url!)({
+        swissProtAccession: swissProtAccession,
+    });
 }
 
 export function getMutationAlignerUrl() {
@@ -129,24 +177,24 @@ export function getMutationAlignerUrl() {
 }
 
 export function getOncoQueryDocUrl() {
-    return buildCBioPortalPageUrl("/oql");
+    return buildCBioPortalPageUrl('/oql');
 }
 
-export function trimProtocol(url:string) {
+export function trimProtocol(url: string) {
     // we need to support legacy configuration values
-    url = url.replace(/^http[s]?:\/\//,''); // get rid of protocol
-    url = url.replace(/\/$/,""); // get rid of trailing slashes
-    url = url.replace(/^\/+/,""); // get rid of leading slashes
+    url = url.replace(/^http[s]?:\/\//, ''); // get rid of protocol
+    url = url.replace(/\/$/, ''); // get rid of trailing slashes
+    url = url.replace(/^\/+/, ''); // get rid of leading slashes
     return url;
 }
-export function getProxyUrlIfNecessary(url:any) {
+export function getProxyUrlIfNecessary(url: any) {
     if (typeof url === 'string') {
         // use url if https, otherwise use proxy
         if (url.startsWith('https://')) {
-            return url
+            return url;
         } else {
             url = trimProtocol(url);
-            return buildCBioPortalAPIUrl(`proxy/${url}`)
+            return buildCBioPortalAPIUrl(`proxy/${url}`);
         }
     } else {
         return undefined;
@@ -154,19 +202,18 @@ export function getProxyUrlIfNecessary(url:any) {
 }
 
 export function getOncoKbApiUrl() {
-
     // if (AppConfig.serverConfig.oncoKbTokenDefined) {
     //     return buildCBioPortalAPIUrl(`proxy/oncokb`);
     // }
     // TODO workaround for temporary backward compatibility
     //  remove this after documenting OncoKB token for all portal instances
     //else {
-        let url = AppConfig.serverConfig.oncokb_public_api_url;
-        if (typeof url === 'string') {
-            return buildCBioPortalAPIUrl(`proxy/${trimProtocol(url)}`);
-        } else {
-            return undefined;
-        }
+    let url = AppConfig.serverConfig.oncokb_public_api_url;
+    if (typeof url === 'string') {
+        return buildCBioPortalAPIUrl(`proxy/${trimProtocol(url)}`);
+    } else {
+        return undefined;
+    }
     //}
 }
 
@@ -180,118 +227,153 @@ export function buildGenomeNexusHgvsgUrl(hgvsg: string) {
 }
 
 export function getSessionUrl() {
-    if (AppConfig.serverConfig && AppConfig.serverConfig.hasOwnProperty("apiRoot")) {
+    if (
+        AppConfig.serverConfig &&
+        AppConfig.serverConfig.hasOwnProperty('apiRoot')
+    ) {
         // TODO: remove this after switch to AWS. This is a hack to use proxy
         // session-service from non apiRoot. We'll have to come up with a better
         // solution for auth portals
-        return buildCBioPortalPageUrl("api-legacy/proxy/session");
+        return buildCBioPortalPageUrl('api-legacy/proxy/session');
     } else {
-        return buildCBioPortalAPIUrl("api-legacy/proxy/session");
+        return buildCBioPortalAPIUrl('api-legacy/proxy/session');
     }
 }
 
 export function fetchComparisonGroupsServiceUrl() {
-    if (AppConfig.serverConfig && AppConfig.serverConfig.hasOwnProperty("apiRoot")) {
+    if (
+        AppConfig.serverConfig &&
+        AppConfig.serverConfig.hasOwnProperty('apiRoot')
+    ) {
         // TODO: remove this after switch to AWS. This is a hack to use proxy
         // session-service from non apiRoot. We'll have to come up with a better
         // solution for auth portals
-        return buildCBioPortalPageUrl("api-legacy/proxy/session/groups/fetch");
+        return buildCBioPortalPageUrl('api-legacy/proxy/session/groups/fetch');
     } else {
-        return buildCBioPortalAPIUrl("api-legacy/proxy/session/groups/fetch");
+        return buildCBioPortalAPIUrl('api-legacy/proxy/session/groups/fetch');
     }
 }
 
 export function getComparisonGroupServiceUrl() {
-    if (AppConfig.serverConfig && AppConfig.serverConfig.hasOwnProperty("apiRoot")) {
+    if (
+        AppConfig.serverConfig &&
+        AppConfig.serverConfig.hasOwnProperty('apiRoot')
+    ) {
         // TODO: remove this after switch to AWS. This is a hack to use proxy
         // session-service from non apiRoot. We'll have to come up with a better
         // solution for auth portals
-        return buildCBioPortalPageUrl("api-legacy/proxy/session/group");
+        return buildCBioPortalPageUrl('api-legacy/proxy/session/group');
     } else {
-        return buildCBioPortalAPIUrl("api-legacy/proxy/session/group");
+        return buildCBioPortalAPIUrl('api-legacy/proxy/session/group');
     }
 }
 
 export function getComparisonSessionServiceUrl() {
-    if (AppConfig.serverConfig && AppConfig.serverConfig.hasOwnProperty("apiRoot")) {
+    if (
+        AppConfig.serverConfig &&
+        AppConfig.serverConfig.hasOwnProperty('apiRoot')
+    ) {
         // TODO: remove this after switch to AWS. This is a hack to use proxy
         // session-service from non apiRoot. We'll have to come up with a better
         // solution for auth portals
-        return buildCBioPortalPageUrl("api-legacy/proxy/session/comparison_session");
+        return buildCBioPortalPageUrl(
+            'api-legacy/proxy/session/comparison_session'
+        );
     } else {
-        return buildCBioPortalAPIUrl("api-legacy/proxy/session/comparison_session");
+        return buildCBioPortalAPIUrl(
+            'api-legacy/proxy/session/comparison_session'
+        );
     }
 }
 
 export function getConfigurationServiceApiUrl() {
-    return AppConfig.configurationServiceUrl || buildCBioPortalAPIUrl("config_service.jsp");
+    return (
+        AppConfig.configurationServiceUrl ||
+        buildCBioPortalAPIUrl('config_service.jsp')
+    );
 }
 
 export function getG2SApiUrl() {
     return AppConfig.serverConfig.g2s_url;
 }
 
-export function getDigitalSlideArchiveMetaUrl(patientId:string) {
+export function getDigitalSlideArchiveMetaUrl(patientId: string) {
     return AppConfig.serverConfig.digital_slide_archive_meta_url + patientId;
 }
-export function getDigitalSlideArchiveIFrameUrl(patientId:string){
+export function getDigitalSlideArchiveIFrameUrl(patientId: string) {
     return AppConfig.serverConfig.digital_slide_archive_iframe_url + patientId;
 }
 
-export function getDarwinUrl(sampleIds:string[], caseId:string) {
-    return buildCBioPortalAPIUrl('checkDarwinAccess.do', {sample_id: sampleIds.join(','), case_id: caseId});
+export function getDarwinUrl(sampleIds: string[], caseId: string) {
+    return buildCBioPortalAPIUrl('checkDarwinAccess.do', {
+        sample_id: sampleIds.join(','),
+        case_id: caseId,
+    });
 }
 
-export function getStudyDownloadListUrl(){
-    return buildCBioPortalAPIUrl('proxy/download.cbioportal.org/study_list.json');
+export function getStudyDownloadListUrl() {
+    return buildCBioPortalAPIUrl(
+        'proxy/download.cbioportal.org/study_list.json'
+    );
 }
 
-export function getBitlyServiceUrl(){
+export function getBitlyServiceUrl() {
     return buildCBioPortalAPIUrl('api-legacy/proxy/bitly');
 }
 
-export function getLegacyCopyNumberUrl(){
-    return buildCBioPortalAPIUrl("api-legacy/copynumbersegments");
+export function getLegacyCopyNumberUrl() {
+    return buildCBioPortalAPIUrl('api-legacy/copynumbersegments');
 }
 
-export function getMDAndersonHeatmapPatientUrl(patientId:string){
+export function getMDAndersonHeatmapPatientUrl(patientId: string) {
     return AppConfig.serverConfig.mdacc_heatmap_patient_url + patientId;
 }
 
-export function getMDAndersonHeatMapMetaUrl(patientId:string){
+export function getMDAndersonHeatMapMetaUrl(patientId: string) {
     return AppConfig.serverConfig.mdacc_heatmap_meta_url + patientId;
 }
 
-export function getMDAndersonHeatmapStudyMetaUrl(studyId:string){
+export function getMDAndersonHeatmapStudyMetaUrl(studyId: string) {
     return AppConfig.serverConfig.mdacc_heatmap_study_meta_url + studyId;
 }
 
-export function getMDAndersonHeatmapStudyUrl(studyId:string){
+export function getMDAndersonHeatmapStudyUrl(studyId: string) {
     return AppConfig.serverConfig.mdacc_heatmap_study_url + studyId;
 }
 
-export function getBasePath(){
-    return AppConfig.baseUrl!.replace(/[^\/]*/,"");
+export function getBasePath() {
+    return AppConfig.baseUrl!.replace(/[^\/]*/, '');
 }
 
-export function getDocsUrl(sourceUrl:string,docsBaseUrl?:string): string {
+export function getDocsUrl(sourceUrl: string, docsBaseUrl?: string): string {
     // if it's complete url, then return it, otherwise, prefix with base url
     if (/^http/.test(sourceUrl)) {
         return sourceUrl;
     } else {
-        return docsBaseUrl + "/" + sourceUrl;
+        return docsBaseUrl + '/' + sourceUrl;
     }
 }
 
-export function getWholeSlideViewerUrl(ids: string[], userName: string): string {
+export function getWholeSlideViewerUrl(
+    ids: string[],
+    userName: string
+): string {
     try {
-        const tokenInfo = JSON.parse(AppConfig.serverConfig.mskWholeSlideViewerToken);
+        const tokenInfo = JSON.parse(
+            AppConfig.serverConfig.mskWholeSlideViewerToken
+        );
         const token = `&token=${tokenInfo.token}`;
         const time = `&t=${tokenInfo.time}`;
         const filterTree = ids.length === 1 ? '&filetree=off' : '';
-        return ids.length >= 1 ? `https://slides.mskcc.org/cbioportal?ids=${_.map(ids, (id)=>id+".svs").join(";")}&user=${userName}${time}${token}&annotation=off${filterTree}` : "";
-    }
-    catch (ex) {
-        throw("error parsing mskWholeSlideViewerToken");
+        return ids.length >= 1
+            ? `https://slides.mskcc.org/cbioportal?ids=${_.map(
+                  ids,
+                  id => id + '.svs'
+              ).join(
+                  ';'
+              )}&user=${userName}${time}${token}&annotation=off${filterTree}`
+            : '';
+    } catch (ex) {
+        throw 'error parsing mskWholeSlideViewerToken';
     }
 }
diff --git a/src/shared/cache/CancerTypeCache.ts b/src/shared/cache/CancerTypeCache.ts
index 381722737b6..946a413c910 100644
--- a/src/shared/cache/CancerTypeCache.ts
+++ b/src/shared/cache/CancerTypeCache.ts
@@ -1,7 +1,7 @@
-import ClinicalDataForAttributesCache from "./ClinicalDataForAttributesCache";
+import ClinicalDataForAttributesCache from './ClinicalDataForAttributesCache';
 
 export default class CancerTypeCache extends ClinicalDataForAttributesCache {
     constructor() {
-        super(["CANCER_TYPE_DETAILED"], "SAMPLE", "SUMMARY");
+        super(['CANCER_TYPE_DETAILED'], 'SAMPLE', 'SUMMARY');
     }
 }
diff --git a/src/shared/cache/ClinicalDataCache.ts b/src/shared/cache/ClinicalDataCache.ts
index e6be8174b61..4e84daaba79 100644
--- a/src/shared/cache/ClinicalDataCache.ts
+++ b/src/shared/cache/ClinicalDataCache.ts
@@ -1,48 +1,75 @@
-import MobxPromiseCache from "../lib/MobxPromiseCache";
+import MobxPromiseCache from '../lib/MobxPromiseCache';
 import {
-    CancerStudy, ClinicalAttribute, ClinicalData, GenePanelData, MolecularProfile,
-    Patient, Sample
-} from "../api/generated/CBioPortalAPI";
+    CancerStudy,
+    ClinicalAttribute,
+    ClinicalData,
+    GenePanelData,
+    MolecularProfile,
+    Patient,
+    Sample,
+} from '../api/generated/CBioPortalAPI';
 import {
-    MutationSpectrum, MutationSpectrumFilter
-} from "../api/generated/CBioPortalAPIInternal";
-import {MobxPromise} from "mobxpromise";
-import {CoverageInformation, ExtendedClinicalAttribute} from "../../pages/resultsView/ResultsViewPageStoreUtils";
-import _ from "lodash";
-import client from "../api/cbioportalClientInstance";
-import internalClient from "../api/cbioportalInternalClientInstance";
-import {Group} from "../api/ComparisonGroupClient";
-import ComplexKeySet from "../lib/complexKeyDataStructures/ComplexKeySet";
+    MutationSpectrum,
+    MutationSpectrumFilter,
+} from '../api/generated/CBioPortalAPIInternal';
+import { MobxPromise } from 'mobxpromise';
+import {
+    CoverageInformation,
+    ExtendedClinicalAttribute,
+} from '../../pages/resultsView/ResultsViewPageStoreUtils';
+import _ from 'lodash';
+import client from '../api/cbioportalClientInstance';
+import internalClient from '../api/cbioportalInternalClientInstance';
+import { Group } from '../api/ComparisonGroupClient';
+import ComplexKeySet from '../lib/complexKeyDataStructures/ComplexKeySet';
 
 export enum SpecialAttribute {
-    MutationSpectrum = "NO_CONTEXT_MUTATION_SIGNATURE",
-    StudyOfOrigin = "CANCER_STUDY",
-    ProfiledInPrefix = "PROFILED_IN",
-    ComparisonGroupPrefix = "IN_COMPARISON_GROUP",
-    NumSamplesPerPatient = "NUM_SAMPLES_PER_PATIENT"
+    MutationSpectrum = 'NO_CONTEXT_MUTATION_SIGNATURE',
+    StudyOfOrigin = 'CANCER_STUDY',
+    ProfiledInPrefix = 'PROFILED_IN',
+    ComparisonGroupPrefix = 'IN_COMPARISON_GROUP',
+    NumSamplesPerPatient = 'NUM_SAMPLES_PER_PATIENT',
 }
 
-const locallyComputedSpecialAttributes = [SpecialAttribute.StudyOfOrigin, SpecialAttribute.NumSamplesPerPatient];
+const locallyComputedSpecialAttributes = [
+    SpecialAttribute.StudyOfOrigin,
+    SpecialAttribute.NumSamplesPerPatient,
+];
 
-export function clinicalAttributeIsPROFILEDIN(attribute:{clinicalAttributeId:string|SpecialAttribute}) {
-    return attribute.clinicalAttributeId.startsWith(SpecialAttribute.ProfiledInPrefix);
+export function clinicalAttributeIsPROFILEDIN(attribute: {
+    clinicalAttributeId: string | SpecialAttribute;
+}) {
+    return attribute.clinicalAttributeId.startsWith(
+        SpecialAttribute.ProfiledInPrefix
+    );
 }
 
-export function clinicalAttributeIsINCOMPARISONGROUP(attribute:{clinicalAttributeId:string|SpecialAttribute}) {
-    return attribute.clinicalAttributeId.startsWith(SpecialAttribute.ComparisonGroupPrefix);
+export function clinicalAttributeIsINCOMPARISONGROUP(attribute: {
+    clinicalAttributeId: string | SpecialAttribute;
+}) {
+    return attribute.clinicalAttributeId.startsWith(
+        SpecialAttribute.ComparisonGroupPrefix
+    );
 }
 
-export function clinicalAttributeIsLocallyComputed(attribute:{clinicalAttributeId:string|SpecialAttribute}) {
-    return clinicalAttributeIsPROFILEDIN(attribute) || clinicalAttributeIsINCOMPARISONGROUP(attribute) ||
-        locallyComputedSpecialAttributes.indexOf(attribute.clinicalAttributeId as any) > -1;
+export function clinicalAttributeIsLocallyComputed(attribute: {
+    clinicalAttributeId: string | SpecialAttribute;
+}) {
+    return (
+        clinicalAttributeIsPROFILEDIN(attribute) ||
+        clinicalAttributeIsINCOMPARISONGROUP(attribute) ||
+        locallyComputedSpecialAttributes.indexOf(
+            attribute.clinicalAttributeId as any
+        ) > -1
+    );
 }
 
-type OncoprintClinicalData = ClinicalData[]|MutationSpectrum[];
+type OncoprintClinicalData = ClinicalData[] | MutationSpectrum[];
 
 function makeComparisonGroupData(
-    attribute:ExtendedClinicalAttribute,
-    samples:Sample[]
-):ClinicalData[] {
+    attribute: ExtendedClinicalAttribute,
+    samples: Sample[]
+): ClinicalData[] {
     const ret = [];
     const samplesInGroup = new ComplexKeySet();
     for (const study of attribute.comparisonGroup!.data.studies) {
@@ -60,7 +87,12 @@ function makeComparisonGroupData(
             studyId: sample.studyId,
             uniquePatientKey: sample.uniquePatientKey,
             uniqueSampleKey: sample.uniqueSampleKey,
-            value: samplesInGroup.has({ studyId: sample.studyId, sampleId: sample.sampleId }) ? "Yes" : "No"
+            value: samplesInGroup.has({
+                studyId: sample.studyId,
+                sampleId: sample.sampleId,
+            })
+                ? 'Yes'
+                : 'No',
         });
     }
     return ret;
@@ -68,20 +100,28 @@ function makeComparisonGroupData(
 
 function makeProfiledData(
     attribute: ExtendedClinicalAttribute,
-    samples:Sample[],
-    coverageInformation:CoverageInformation,
-):ClinicalData[] {
+    samples: Sample[],
+    coverageInformation: CoverageInformation
+): ClinicalData[] {
     const molecularProfileIds = attribute.molecularProfileIds!;
     const ret = [];
     for (const sample of samples) {
-        const coverageInfo = coverageInformation.samples[sample.uniqueSampleKey];
+        const coverageInfo =
+            coverageInformation.samples[sample.uniqueSampleKey];
         if (!coverageInfo) {
             continue;
         }
-        const allCoverage:{ molecularProfileId:string }[] =
-            (_.flatten(_.values(coverageInfo.byGene)) as { molecularProfileId:string }[]).concat(coverageInfo.allGenes);
-        const coveredMolecularProfiles = _.keyBy(allCoverage, "molecularProfileId");
-        const profiled = _.some(molecularProfileIds, molecularProfileId=>(molecularProfileId in coveredMolecularProfiles));
+        const allCoverage: { molecularProfileId: string }[] = (_.flatten(
+            _.values(coverageInfo.byGene)
+        ) as { molecularProfileId: string }[]).concat(coverageInfo.allGenes);
+        const coveredMolecularProfiles = _.keyBy(
+            allCoverage,
+            'molecularProfileId'
+        );
+        const profiled = _.some(
+            molecularProfileIds,
+            molecularProfileId => molecularProfileId in coveredMolecularProfiles
+        );
         if (profiled) {
             ret.push({
                 clinicalAttribute: attribute as ClinicalAttribute,
@@ -91,7 +131,7 @@ function makeProfiledData(
                 studyId: sample.studyId,
                 uniquePatientKey: sample.uniquePatientKey,
                 uniqueSampleKey: sample.uniqueSampleKey,
-                value: "Yes"
+                value: 'Yes',
             });
         }
     }
@@ -99,57 +139,73 @@ function makeProfiledData(
 }
 
 async function fetch(
-    attribute:ExtendedClinicalAttribute,
-    samples:Sample[],
-    patients:Patient[],
-    studyToMutationMolecularProfile:{[studyId:string]:MolecularProfile},
-    studyIdToStudy:{[studyId:string]:CancerStudy},
-    coverageInformation:CoverageInformation
+    attribute: ExtendedClinicalAttribute,
+    samples: Sample[],
+    patients: Patient[],
+    studyToMutationMolecularProfile: { [studyId: string]: MolecularProfile },
+    studyIdToStudy: { [studyId: string]: CancerStudy },
+    coverageInformation: CoverageInformation
 ) {
-    let ret:OncoprintClinicalData;
-    let studyToSamples:{[studyId:string]:Sample[]};
-    switch(attribute.clinicalAttributeId) {
+    let ret: OncoprintClinicalData;
+    let studyToSamples: { [studyId: string]: Sample[] };
+    switch (attribute.clinicalAttributeId) {
         case SpecialAttribute.MutationSpectrum:
-            studyToSamples = _.groupBy(samples, sample=>sample.studyId);
-            ret = _.flatten(await Promise.all(Object.keys(studyToMutationMolecularProfile).map(studyId=>{
-                const samplesInStudy = studyToSamples[studyId];
-                if (samplesInStudy.length) {
-                    return internalClient.fetchMutationSpectrumsUsingPOST({
-                        molecularProfileId: studyToMutationMolecularProfile[studyId].molecularProfileId,
-                        mutationSpectrumFilter: {
-                            sampleIds: samplesInStudy.map(s=>s.sampleId)
-                        } as MutationSpectrumFilter
-                    });
-                } else {
-                    return Promise.resolve([]);
-                }
-            })));
+            studyToSamples = _.groupBy(samples, sample => sample.studyId);
+            ret = _.flatten(
+                await Promise.all(
+                    Object.keys(studyToMutationMolecularProfile).map(
+                        studyId => {
+                            const samplesInStudy = studyToSamples[studyId];
+                            if (samplesInStudy.length) {
+                                return internalClient.fetchMutationSpectrumsUsingPOST(
+                                    {
+                                        molecularProfileId:
+                                            studyToMutationMolecularProfile[
+                                                studyId
+                                            ].molecularProfileId,
+                                        mutationSpectrumFilter: {
+                                            sampleIds: samplesInStudy.map(
+                                                s => s.sampleId
+                                            ),
+                                        } as MutationSpectrumFilter,
+                                    }
+                                );
+                            } else {
+                                return Promise.resolve([]);
+                            }
+                        }
+                    )
+                )
+            );
             break;
         case SpecialAttribute.StudyOfOrigin:
-            ret = samples.map(sample=>({
-                clinicalAttribute: attribute,
-                clinicalAttributeId: attribute.clinicalAttributeId,
-                patientId: sample.patientId,
-                sampleId: sample.sampleId,
-                studyId: sample.studyId,
-                uniquePatientKey: sample.uniquePatientKey,
-                uniqueSampleKey: sample.uniqueSampleKey,
-                value: studyIdToStudy[sample.studyId].name
-            } as ClinicalData));
+            ret = samples.map(
+                sample =>
+                    ({
+                        clinicalAttribute: attribute,
+                        clinicalAttributeId: attribute.clinicalAttributeId,
+                        patientId: sample.patientId,
+                        sampleId: sample.sampleId,
+                        studyId: sample.studyId,
+                        uniquePatientKey: sample.uniquePatientKey,
+                        uniqueSampleKey: sample.uniqueSampleKey,
+                        value: studyIdToStudy[sample.studyId].name,
+                    } as ClinicalData)
+            );
             break;
         case SpecialAttribute.NumSamplesPerPatient:
-            const patientToSamples = _.groupBy(samples, "uniquePatientKey");
-            const patientKeyToPatient = _.keyBy(patients, "uniquePatientKey");
-            ret = _.map(patientToSamples, (samples, patientKey)=>{
+            const patientToSamples = _.groupBy(samples, 'uniquePatientKey');
+            const patientKeyToPatient = _.keyBy(patients, 'uniquePatientKey');
+            ret = _.map(patientToSamples, (samples, patientKey) => {
                 const patient = patientKeyToPatient[patientKey];
-                return {
+                return ({
                     clinicalAttribute: attribute,
                     clinicalAttributeId: attribute.clinicalAttributeId,
                     patientId: patient.patientId,
                     uniquePatientKey: patientKey,
                     studyId: patient.studyId,
-                    value: samples.length
-                } as any as ClinicalData;
+                    value: samples.length,
+                } as any) as ClinicalData;
             });
             break;
         default:
@@ -159,11 +215,21 @@ async function fetch(
                 ret = makeComparisonGroupData(attribute, samples);
             } else {
                 ret = await client.fetchClinicalDataUsingPOST({
-                    clinicalDataType: attribute.patientAttribute ? "PATIENT" : "SAMPLE",
+                    clinicalDataType: attribute.patientAttribute
+                        ? 'PATIENT'
+                        : 'SAMPLE',
                     clinicalDataMultiStudyFilter: {
                         attributeIds: [attribute.clinicalAttributeId as string],
-                        identifiers: attribute.patientAttribute ? patients.map(p=>({entityId:p.patientId, studyId:p.studyId})) : samples.map(s=>({entityId:s.sampleId, studyId:s.studyId}))
-                    }
+                        identifiers: attribute.patientAttribute
+                            ? patients.map(p => ({
+                                  entityId: p.patientId,
+                                  studyId: p.studyId,
+                              }))
+                            : samples.map(s => ({
+                                  entityId: s.sampleId,
+                                  studyId: s.studyId,
+                              })),
+                    },
                 });
             }
             break;
@@ -171,33 +237,42 @@ async function fetch(
     return ret;
 }
 
-export default class ClinicalDataCache extends MobxPromiseCache<ExtendedClinicalAttribute, OncoprintClinicalData> {
+export default class ClinicalDataCache extends MobxPromiseCache<
+    ExtendedClinicalAttribute,
+    OncoprintClinicalData
+> {
     constructor(
-        samplesPromise:MobxPromise<Sample[]>,
-        patientsPromise:MobxPromise<Patient[]>,
-        studyToMutationMolecularProfilePromise:MobxPromise<{[studyId:string]:MolecularProfile}>,
-        studyIdToStudyPromise:MobxPromise<{[studyId:string]:CancerStudy}>,
-        coverageInformationPromise:MobxPromise<CoverageInformation>
+        samplesPromise: MobxPromise<Sample[]>,
+        patientsPromise: MobxPromise<Patient[]>,
+        studyToMutationMolecularProfilePromise: MobxPromise<{
+            [studyId: string]: MolecularProfile;
+        }>,
+        studyIdToStudyPromise: MobxPromise<{ [studyId: string]: CancerStudy }>,
+        coverageInformationPromise: MobxPromise<CoverageInformation>
     ) {
         super(
-            q=>({
-                await:()=>[
+            q => ({
+                await: () => [
                     samplesPromise,
                     patientsPromise,
                     studyToMutationMolecularProfilePromise,
                     studyIdToStudyPromise,
-                    coverageInformationPromise
+                    coverageInformationPromise,
                 ],
-                invoke:()=>fetch(
-                    q,
-                    samplesPromise.result!,
-                    patientsPromise.result!,
-                    studyToMutationMolecularProfilePromise.result!,
-                    studyIdToStudyPromise.result!,
-                    coverageInformationPromise.result!
-                )
+                invoke: () =>
+                    fetch(
+                        q,
+                        samplesPromise.result!,
+                        patientsPromise.result!,
+                        studyToMutationMolecularProfilePromise.result!,
+                        studyIdToStudyPromise.result!,
+                        coverageInformationPromise.result!
+                    ),
             }),
-            q=>`${q.clinicalAttributeId},${(q.molecularProfileIds || []).join("-")},${q.patientAttribute}`
+            q =>
+                `${q.clinicalAttributeId},${(q.molecularProfileIds || []).join(
+                    '-'
+                )},${q.patientAttribute}`
         );
     }
 }
diff --git a/src/shared/cache/ClinicalDataForAttributesCache.ts b/src/shared/cache/ClinicalDataForAttributesCache.ts
index 689dbbe930d..281851cbf81 100644
--- a/src/shared/cache/ClinicalDataForAttributesCache.ts
+++ b/src/shared/cache/ClinicalDataForAttributesCache.ts
@@ -1,37 +1,58 @@
-import client from "../api/cbioportalClientInstance";
-import LazyMobXCache, {AugmentedData} from "../lib/LazyMobXCache";
-import {ClinicalDataIdentifier, ClinicalData, ClinicalDataMultiStudyFilter} from "../api/generated/CBioPortalAPI";
-import _ from "lodash";
+import client from '../api/cbioportalClientInstance';
+import LazyMobXCache, { AugmentedData } from '../lib/LazyMobXCache';
+import {
+    ClinicalDataIdentifier,
+    ClinicalData,
+    ClinicalDataMultiStudyFilter,
+} from '../api/generated/CBioPortalAPI';
+import _ from 'lodash';
 
-function key(d:{studyId?:string, entityId:string}, m?:string) {
+function key(d: { studyId?: string; entityId: string }, m?: string) {
     const studyId = d.studyId ? d.studyId : m;
     return `${studyId}~${d.entityId}`;
 }
-async function fetch(queries:ClinicalDataIdentifier[],
-                     attributeIds:string[],
-                     clinicalDataType:"SAMPLE"|"PATIENT",
-                     projection:"ID" | "SUMMARY" | "DETAILED" | "META"):Promise<AugmentedData<ClinicalData, string>[]> {
-
+async function fetch(
+    queries: ClinicalDataIdentifier[],
+    attributeIds: string[],
+    clinicalDataType: 'SAMPLE' | 'PATIENT',
+    projection: 'ID' | 'SUMMARY' | 'DETAILED' | 'META'
+): Promise<AugmentedData<ClinicalData, string>[]> {
     const studyToIdentifiers = _.groupBy(queries, 'studyId');
     const studies = Object.keys(studyToIdentifiers);
-    const results:ClinicalData[][] = await Promise.all(studies.map(studyId=>{
-        return client.fetchClinicalDataUsingPOST({
-            clinicalDataType,
-            clinicalDataMultiStudyFilter: {attributeIds, identifiers: studyToIdentifiers[studyId]},
-            projection
-        });
+    const results: ClinicalData[][] = await Promise.all(
+        studies.map(studyId => {
+            return client.fetchClinicalDataUsingPOST({
+                clinicalDataType,
+                clinicalDataMultiStudyFilter: {
+                    attributeIds,
+                    identifiers: studyToIdentifiers[studyId],
+                },
+                projection,
+            });
+        })
+    );
+    return results.map((data: ClinicalData[], index: number) => ({
+        data,
+        meta: studies[index],
     }));
-    return results.map((data:ClinicalData[], index:number)=>({ data, meta:studies[index] }));
 }
 
-export default class ClinicalDataForAttributesCache extends LazyMobXCache<ClinicalData, ClinicalDataIdentifier> {
-    constructor(attributeIds:string[],
-                clinicalDataType:"SAMPLE"|"PATIENT",
-                projection:"ID" | "SUMMARY" | "DETAILED" | "META") {
+export default class ClinicalDataForAttributesCache extends LazyMobXCache<
+    ClinicalData,
+    ClinicalDataIdentifier
+> {
+    constructor(
+        attributeIds: string[],
+        clinicalDataType: 'SAMPLE' | 'PATIENT',
+        projection: 'ID' | 'SUMMARY' | 'DETAILED' | 'META'
+    ) {
         super(
             key,
             d => `${d.studyId}~${d.sampleId}`,
             fetch,
-            attributeIds, clinicalDataType, projection);
+            attributeIds,
+            clinicalDataType,
+            projection
+        );
     }
 }
diff --git a/src/shared/cache/DiscreteCNACache.ts b/src/shared/cache/DiscreteCNACache.ts
index db38d4ccb7a..e8d8225947c 100644
--- a/src/shared/cache/DiscreteCNACache.ts
+++ b/src/shared/cache/DiscreteCNACache.ts
@@ -1,85 +1,125 @@
 import * as _ from 'lodash';
-import {AugmentedData, CacheData, default as LazyMobXCache} from "shared/lib/LazyMobXCache";
-import client from "shared/api/cbioportalClientInstance";
-import {DiscreteCopyNumberData, DiscreteCopyNumberFilter, MolecularProfile} from "shared/api/generated/CBioPortalAPI";
+import {
+    AugmentedData,
+    CacheData,
+    default as LazyMobXCache,
+} from 'shared/lib/LazyMobXCache';
+import client from 'shared/api/cbioportalClientInstance';
+import {
+    DiscreteCopyNumberData,
+    DiscreteCopyNumberFilter,
+    MolecularProfile,
+} from 'shared/api/generated/CBioPortalAPI';
 
 export type DiscreteCNACacheDataType = CacheData<DiscreteCopyNumberData>;
-type Query = {studyId:string, sampleId:string, entrezGeneId:number};
+type Query = { studyId: string; sampleId: string; entrezGeneId: number };
 
-async function fetchForStudy(queries:Query[], studyId:string, molecularProfileIdDiscrete:string|undefined):Promise<AugmentedData<DiscreteCopyNumberData, string>> {
+async function fetchForStudy(
+    queries: Query[],
+    studyId: string,
+    molecularProfileIdDiscrete: string | undefined
+): Promise<AugmentedData<DiscreteCopyNumberData, string>> {
     try {
-        const uniqueSamples = _.uniq(queries.map(q=>q.sampleId));
-        const uniqueGenes = _.uniq(queries.map(q=>q.entrezGeneId));
-        let filters:DiscreteCopyNumberFilter[];
+        const uniqueSamples = _.uniq(queries.map(q => q.sampleId));
+        const uniqueGenes = _.uniq(queries.map(q => q.entrezGeneId));
+        let filters: DiscreteCopyNumberFilter[];
         if (uniqueSamples.length < uniqueGenes.length) {
             // Make one query per sample, since there are fewer samples than genes
-            const sampleToEntrezList:{[sampleId:string]:number[]} = {};
+            const sampleToEntrezList: { [sampleId: string]: number[] } = {};
             for (const query of queries) {
-                sampleToEntrezList[query.sampleId] = sampleToEntrezList[query.sampleId] || [];
+                sampleToEntrezList[query.sampleId] =
+                    sampleToEntrezList[query.sampleId] || [];
                 sampleToEntrezList[query.sampleId].push(query.entrezGeneId);
             }
-            filters = Object.keys(sampleToEntrezList).map(sample=>{
+            filters = Object.keys(sampleToEntrezList).map(sample => {
                 return {
                     sampleIds: [sample],
-                    entrezGeneIds: sampleToEntrezList[sample]
+                    entrezGeneIds: sampleToEntrezList[sample],
                 } as DiscreteCopyNumberFilter;
             });
         } else {
             // Make one query per gene
-            const entrezToSampleList:{[entrez:string]:string[]} = {};
+            const entrezToSampleList: { [entrez: string]: string[] } = {};
             for (const query of queries) {
-                entrezToSampleList[query.entrezGeneId] = entrezToSampleList[query.entrezGeneId] || [];
+                entrezToSampleList[query.entrezGeneId] =
+                    entrezToSampleList[query.entrezGeneId] || [];
                 entrezToSampleList[query.entrezGeneId].push(query.sampleId);
             }
-            filters = Object.keys(entrezToSampleList).map(entrez=>{
+            filters = Object.keys(entrezToSampleList).map(entrez => {
                 return {
                     sampleIds: entrezToSampleList[entrez],
-                    entrezGeneIds: [parseInt(entrez, 10)]
+                    entrezGeneIds: [parseInt(entrez, 10)],
                 } as DiscreteCopyNumberFilter;
             });
         }
-        const allData:DiscreteCopyNumberData[][] = await Promise.all(filters.map(filter=>{
-            if (typeof molecularProfileIdDiscrete === "undefined") {
-                return Promise.reject("No molecular profile id given.");
-            } else {
-                return client.fetchDiscreteCopyNumbersInMolecularProfileUsingPOST({
-                    projection: "DETAILED",
-                    molecularProfileId: molecularProfileIdDiscrete,
-                    discreteCopyNumberFilter: filter,
-                    discreteCopyNumberEventType: "ALL"
-                });
-            }
-        }));
-        return {data:_.flatten(allData), meta:studyId};
+        const allData: DiscreteCopyNumberData[][] = await Promise.all(
+            filters.map(filter => {
+                if (typeof molecularProfileIdDiscrete === 'undefined') {
+                    return Promise.reject('No molecular profile id given.');
+                } else {
+                    return client.fetchDiscreteCopyNumbersInMolecularProfileUsingPOST(
+                        {
+                            projection: 'DETAILED',
+                            molecularProfileId: molecularProfileIdDiscrete,
+                            discreteCopyNumberFilter: filter,
+                            discreteCopyNumberEventType: 'ALL',
+                        }
+                    );
+                }
+            })
+        );
+        return { data: _.flatten(allData), meta: studyId };
     } catch (err) {
         throw err;
     }
 }
-export function fetch(queries:Query[], studyToMolecularProfileDiscrete:{[studyId:string]:MolecularProfile}):Promise<AugmentedData<DiscreteCopyNumberData, string>[]> {
+export function fetch(
+    queries: Query[],
+    studyToMolecularProfileDiscrete: { [studyId: string]: MolecularProfile }
+): Promise<AugmentedData<DiscreteCopyNumberData, string>[]> {
     if (!studyToMolecularProfileDiscrete) {
-        throw "No study to molecular profile id map given";
+        throw 'No study to molecular profile id map given';
     } else {
         const studyToQueries = _.groupBy(queries, 'studyId');
-        return Promise.all(Object.keys(studyToQueries)
-            .map(studyId=>{
+        return Promise.all(
+            Object.keys(studyToQueries).map(studyId => {
                 const profile = studyToMolecularProfileDiscrete[studyId];
                 if (profile) {
-                    return fetchForStudy(studyToQueries[studyId], studyId, profile.molecularProfileId);
+                    return fetchForStudy(
+                        studyToQueries[studyId],
+                        studyId,
+                        profile.molecularProfileId
+                    );
                 } else {
-                    return Promise.resolve({data: [], meta: studyId});
+                    return Promise.resolve({ data: [], meta: studyId });
                 }
-            }));
+            })
+        );
     }
 }
-function key(d:{studyId?:string, sampleId:string, entrezGeneId:number}, m?:string) {
+function key(
+    d: { studyId?: string; sampleId: string; entrezGeneId: number },
+    m?: string
+) {
     const studyId = d.studyId ? d.studyId : m;
     return `${studyId}~${d.sampleId}~${d.entrezGeneId}`;
 }
-export default class DiscreteCNACache extends LazyMobXCache<DiscreteCopyNumberData, Query, string> {
-    constructor(private studyToMolecularProfileDiscrete?:{[studyId:string]:MolecularProfile}) {
+export default class DiscreteCNACache extends LazyMobXCache<
+    DiscreteCopyNumberData,
+    Query,
+    string
+> {
+    constructor(
+        private studyToMolecularProfileDiscrete?: {
+            [studyId: string]: MolecularProfile;
+        }
+    ) {
         super(key, key, fetch, studyToMolecularProfileDiscrete);
     }
-    public get isActive():boolean {
-        return !!(this.studyToMolecularProfileDiscrete && Object.keys(this.studyToMolecularProfileDiscrete).length > 0);
+    public get isActive(): boolean {
+        return !!(
+            this.studyToMolecularProfileDiscrete &&
+            Object.keys(this.studyToMolecularProfileDiscrete).length > 0
+        );
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/cache/GeneCache.ts b/src/shared/cache/GeneCache.ts
index 09ce77b91e3..a44f5fc34af 100644
--- a/src/shared/cache/GeneCache.ts
+++ b/src/shared/cache/GeneCache.ts
@@ -1,25 +1,24 @@
-import LazyMobXCache from "../lib/LazyMobXCache";
-import {Gene} from "../api/generated/CBioPortalAPI";
-import client from "../api/cbioportalClientInstance";
+import LazyMobXCache from '../lib/LazyMobXCache';
+import { Gene } from '../api/generated/CBioPortalAPI';
+import client from '../api/cbioportalClientInstance';
 
 type Query = {
-    hugoGeneSymbol:string;
+    hugoGeneSymbol: string;
 };
 
-function key(o:{hugoGeneSymbol:string}) {
+function key(o: { hugoGeneSymbol: string }) {
     return o.hugoGeneSymbol.toUpperCase();
 }
 
-async function fetch(queries:Query[]) {
+async function fetch(queries: Query[]) {
     return client.fetchGenesUsingPOST({
-        geneIdType: "HUGO_GENE_SYMBOL",
-        geneIds: queries.map(q=>q.hugoGeneSymbol.toUpperCase())
-    })
+        geneIdType: 'HUGO_GENE_SYMBOL',
+        geneIds: queries.map(q => q.hugoGeneSymbol.toUpperCase()),
+    });
 }
 
 export default class GeneCache extends LazyMobXCache<Gene, Query> {
-
     constructor() {
         super(key, key, fetch);
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/cache/GeneMolecularDataCache.ts b/src/shared/cache/GeneMolecularDataCache.ts
index 88c5c257cf7..761de7b127f 100644
--- a/src/shared/cache/GeneMolecularDataCache.ts
+++ b/src/shared/cache/GeneMolecularDataCache.ts
@@ -1,37 +1,57 @@
-import LazyMobXCache, {AugmentedData} from "../lib/LazyMobXCache";
-import {NumericGeneMolecularData, MolecularDataFilter} from "../api/generated/CBioPortalAPI";
-import client from "shared/api/cbioportalClientInstance";
-import _ from "lodash";
-import {IDataQueryFilter} from "../lib/StoreUtils";
+import LazyMobXCache, { AugmentedData } from '../lib/LazyMobXCache';
+import {
+    NumericGeneMolecularData,
+    MolecularDataFilter,
+} from '../api/generated/CBioPortalAPI';
+import client from 'shared/api/cbioportalClientInstance';
+import _ from 'lodash';
+import { IDataQueryFilter } from '../lib/StoreUtils';
 
 type Query = {
-    entrezGeneId:number;
-    molecularProfileId:string;
+    entrezGeneId: number;
+    molecularProfileId: string;
 };
 
-function queryToKey(q:Query) {
+function queryToKey(q: Query) {
     return `${q.molecularProfileId}~${q.entrezGeneId}`;
 }
 
-function dataToKey(d:NumericGeneMolecularData[], q:Query) {
+function dataToKey(d: NumericGeneMolecularData[], q: Query) {
     return `${q.molecularProfileId}~${q.entrezGeneId}`;
 }
 
-async function fetch(queries:Query[], molecularProfileIdToSampleFilter:{[molecularProfileId:string]:IDataQueryFilter}) {
-    const molecularProfileIdToEntrezGeneIds = _.mapValues(_.groupBy(queries, q=>q.molecularProfileId), profileQueries=>profileQueries.map(q=>q.entrezGeneId));
-    const params = Object.keys(molecularProfileIdToEntrezGeneIds).map(molecularProfileId=>({
-        molecularProfileId,
-        molecularDataFilter:{
-            entrezGeneIds: molecularProfileIdToEntrezGeneIds[molecularProfileId],
-            ...molecularProfileIdToSampleFilter[molecularProfileId]
-        } as MolecularDataFilter
-    }));
-    const results:NumericGeneMolecularData[][] = await Promise.all(params.map(param=>client.fetchAllMolecularDataInMolecularProfileUsingPOST(param)));
-    const ret:{[key:string]:AugmentedData<NumericGeneMolecularData[], Query>} = {};
+async function fetch(
+    queries: Query[],
+    molecularProfileIdToSampleFilter: {
+        [molecularProfileId: string]: IDataQueryFilter;
+    }
+) {
+    const molecularProfileIdToEntrezGeneIds = _.mapValues(
+        _.groupBy(queries, q => q.molecularProfileId),
+        profileQueries => profileQueries.map(q => q.entrezGeneId)
+    );
+    const params = Object.keys(molecularProfileIdToEntrezGeneIds).map(
+        molecularProfileId => ({
+            molecularProfileId,
+            molecularDataFilter: {
+                entrezGeneIds:
+                    molecularProfileIdToEntrezGeneIds[molecularProfileId],
+                ...molecularProfileIdToSampleFilter[molecularProfileId],
+            } as MolecularDataFilter,
+        })
+    );
+    const results: NumericGeneMolecularData[][] = await Promise.all(
+        params.map(param =>
+            client.fetchAllMolecularDataInMolecularProfileUsingPOST(param)
+        )
+    );
+    const ret: {
+        [key: string]: AugmentedData<NumericGeneMolecularData[], Query>;
+    } = {};
     for (const query of queries) {
         ret[queryToKey(query)] = {
-            data:[[]],
-            meta:query
+            data: [[]],
+            meta: query,
         };
     }
     for (const queryResult of results) {
@@ -42,8 +62,16 @@ async function fetch(queries:Query[], molecularProfileIdToSampleFilter:{[molecul
     return _.values(ret);
 }
 
-export default class GeneMolecularDataCache extends LazyMobXCache<NumericGeneMolecularData[], Query, Query>{
-    constructor(private molecularProfileIdToSampleFilter:{[molecularProfileId:string]:IDataQueryFilter}) {
+export default class GeneMolecularDataCache extends LazyMobXCache<
+    NumericGeneMolecularData[],
+    Query,
+    Query
+> {
+    constructor(
+        private molecularProfileIdToSampleFilter: {
+            [molecularProfileId: string]: IDataQueryFilter;
+        }
+    ) {
         super(queryToKey, dataToKey, fetch, molecularProfileIdToSampleFilter);
     }
 }
diff --git a/src/shared/cache/GenesetCache.ts b/src/shared/cache/GenesetCache.ts
index 2e1a31547d1..0daf0745fe2 100644
--- a/src/shared/cache/GenesetCache.ts
+++ b/src/shared/cache/GenesetCache.ts
@@ -1,21 +1,22 @@
-import LazyMobXCache from "../lib/LazyMobXCache";
-import {Geneset} from "../api/generated/CBioPortalAPIInternal";
-import internalClient from "../api/cbioportalInternalClientInstance";
+import LazyMobXCache from '../lib/LazyMobXCache';
+import { Geneset } from '../api/generated/CBioPortalAPIInternal';
+import internalClient from '../api/cbioportalInternalClientInstance';
 
 type Query = {
-    genesetId:string;
+    genesetId: string;
 };
 
-function key(o:{genesetId:string}) {
+function key(o: { genesetId: string }) {
     return o.genesetId.toUpperCase();
 }
 
-async function fetch(queries:Query[]) {
-    return internalClient.fetchGenesetsUsingPOST({genesetIds: queries.map(q=>q.genesetId.toUpperCase())});
+async function fetch(queries: Query[]) {
+    return internalClient.fetchGenesetsUsingPOST({
+        genesetIds: queries.map(q => q.genesetId.toUpperCase()),
+    });
 }
 
 export default class GenesetCache extends LazyMobXCache<Geneset, Query> {
-
     constructor() {
         super(key, key, fetch);
     }
diff --git a/src/shared/cache/GenesetCorrelatedGeneCache.spec.ts b/src/shared/cache/GenesetCorrelatedGeneCache.spec.ts
index af3b0160255..375291f4cc0 100644
--- a/src/shared/cache/GenesetCorrelatedGeneCache.spec.ts
+++ b/src/shared/cache/GenesetCorrelatedGeneCache.spec.ts
@@ -14,67 +14,118 @@ describe('GenesetCorrelatedGeneCache', () => {
 
     it('provides as many genes as requested if more available', () => {
         // given an API client with 4 available genes and a cache with a started iteration
-        (client.fetchCorrelatedGenesUsingPOST as sinon.SinonStub)
-            .returns(Promise.resolve([
-                {"entrezGeneId": 0, "hugoGeneSymbol": "string0", "correlationValue": 0, "expressionGeneticProfileId": "string", "zScoreGeneticProfileId": "string"},
-                {"entrezGeneId": 1, "hugoGeneSymbol": "string1", "correlationValue": 0, "expressionGeneticProfileId": "string", "zScoreGeneticProfileId": "string"},
-                {"entrezGeneId": 2, "hugoGeneSymbol": "string2", "correlationValue": 0, "expressionGeneticProfileId": "string", "zScoreGeneticProfileId": "string"},
-                {"entrezGeneId": 3, "hugoGeneSymbol": "string2", "correlationValue": 0, "expressionGeneticProfileId": "string", "zScoreGeneticProfileId": "string"}
-            ]));
-        const cache = new GenesetCorrelatedGeneCache(
-            {profile1: {sampleIds: ['sample1', 'sample2']}}
-        );
-        cache.initIteration(
-            'track1_expansions',
-            {genesetId: 'geneset1', molecularProfileId: 'profile1'}
+        (client.fetchCorrelatedGenesUsingPOST as sinon.SinonStub).returns(
+            Promise.resolve([
+                {
+                    entrezGeneId: 0,
+                    hugoGeneSymbol: 'string0',
+                    correlationValue: 0,
+                    expressionGeneticProfileId: 'string',
+                    zScoreGeneticProfileId: 'string',
+                },
+                {
+                    entrezGeneId: 1,
+                    hugoGeneSymbol: 'string1',
+                    correlationValue: 0,
+                    expressionGeneticProfileId: 'string',
+                    zScoreGeneticProfileId: 'string',
+                },
+                {
+                    entrezGeneId: 2,
+                    hugoGeneSymbol: 'string2',
+                    correlationValue: 0,
+                    expressionGeneticProfileId: 'string',
+                    zScoreGeneticProfileId: 'string',
+                },
+                {
+                    entrezGeneId: 3,
+                    hugoGeneSymbol: 'string2',
+                    correlationValue: 0,
+                    expressionGeneticProfileId: 'string',
+                    zScoreGeneticProfileId: 'string',
+                },
+            ])
         );
+        const cache = new GenesetCorrelatedGeneCache({
+            profile1: { sampleIds: ['sample1', 'sample2'] },
+        });
+        cache.initIteration('track1_expansions', {
+            genesetId: 'geneset1',
+            molecularProfileId: 'profile1',
+        });
         // when next is called to request 2 genes in the iteration
         const geneListPromise = cache.next('track1_expansions', 2);
         // then it should resolve with 2 genes
-        return geneListPromise.then((genes) => {
+        return geneListPromise.then(genes => {
             assert.lengthOf(genes, 2);
         });
     });
 
     it('provides as many genes as available if more requested', () => {
         // given an API client with 4 available genes and a cache with a started iteration
-        (client.fetchCorrelatedGenesUsingPOST as sinon.SinonStub)
-            .returns(Promise.resolve([
-                {"entrezGeneId": 0, "hugoGeneSymbol": "string0", "correlationValue": 0, "expressionGeneticProfileId": "string", "zScoreGeneticProfileId": "string"},
-                {"entrezGeneId": 1, "hugoGeneSymbol": "string1", "correlationValue": 0, "expressionGeneticProfileId": "string", "zScoreGeneticProfileId": "string"},
-                {"entrezGeneId": 2, "hugoGeneSymbol": "string2", "correlationValue": 0, "expressionGeneticProfileId": "string", "zScoreGeneticProfileId": "string"},
-                {"entrezGeneId": 3, "hugoGeneSymbol": "string2", "correlationValue": 0, "expressionGeneticProfileId": "string", "zScoreGeneticProfileId": "string"}
-            ]));
-        const cache = new GenesetCorrelatedGeneCache(
-            {profile1: {sampleIds: ['sample1', 'sample2']}}
-        );
-        cache.initIteration(
-            'track1_expansions',
-            {genesetId: 'geneset1', molecularProfileId: 'profile1'}
+        (client.fetchCorrelatedGenesUsingPOST as sinon.SinonStub).returns(
+            Promise.resolve([
+                {
+                    entrezGeneId: 0,
+                    hugoGeneSymbol: 'string0',
+                    correlationValue: 0,
+                    expressionGeneticProfileId: 'string',
+                    zScoreGeneticProfileId: 'string',
+                },
+                {
+                    entrezGeneId: 1,
+                    hugoGeneSymbol: 'string1',
+                    correlationValue: 0,
+                    expressionGeneticProfileId: 'string',
+                    zScoreGeneticProfileId: 'string',
+                },
+                {
+                    entrezGeneId: 2,
+                    hugoGeneSymbol: 'string2',
+                    correlationValue: 0,
+                    expressionGeneticProfileId: 'string',
+                    zScoreGeneticProfileId: 'string',
+                },
+                {
+                    entrezGeneId: 3,
+                    hugoGeneSymbol: 'string2',
+                    correlationValue: 0,
+                    expressionGeneticProfileId: 'string',
+                    zScoreGeneticProfileId: 'string',
+                },
+            ])
         );
+        const cache = new GenesetCorrelatedGeneCache({
+            profile1: { sampleIds: ['sample1', 'sample2'] },
+        });
+        cache.initIteration('track1_expansions', {
+            genesetId: 'geneset1',
+            molecularProfileId: 'profile1',
+        });
         // when next is called to request 5 genes in the iteration
         const geneListPromise = cache.next('track1_expansions', 5);
         // then it should resolve with 4 genes
-        return geneListPromise.then((genes) => {
+        return geneListPromise.then(genes => {
             assert.lengthOf(genes, 4);
         });
     });
 
     it('provides an empty array if nothing available', () => {
         // given an API client with 0 available genes and a cache with a started iteration
-        (client.fetchCorrelatedGenesUsingPOST as sinon.SinonStub)
-            .returns(Promise.resolve([]));
-        const cache = new GenesetCorrelatedGeneCache(
-            {profile1: {sampleIds: ['sample1', 'sample2']}}
-        );
-        cache.initIteration(
-            'track1_expansions',
-            {genesetId: 'geneset1', molecularProfileId: 'profile1'}
+        (client.fetchCorrelatedGenesUsingPOST as sinon.SinonStub).returns(
+            Promise.resolve([])
         );
+        const cache = new GenesetCorrelatedGeneCache({
+            profile1: { sampleIds: ['sample1', 'sample2'] },
+        });
+        cache.initIteration('track1_expansions', {
+            genesetId: 'geneset1',
+            molecularProfileId: 'profile1',
+        });
         // when next is called to request 4 genes in the iteration
         const geneListPromise = cache.next('track1_expansions', 4);
         // then it should resolve with two genes
-        return geneListPromise.then((genes) => {
+        return geneListPromise.then(genes => {
             assert.instanceOf(genes, Array);
             assert.lengthOf(genes, 0);
         });
@@ -83,52 +134,102 @@ describe('GenesetCorrelatedGeneCache', () => {
     it('provides the next n genes if called a second time', () => {
         // given an API client with 4 available genes and a cache with a started
         // iteration
-        (client.fetchCorrelatedGenesUsingPOST as sinon.SinonStub)
-            .returns(Promise.resolve([
-                {"entrezGeneId": 0, "hugoGeneSymbol": "string0", "correlationValue": 0, "expressionGeneticProfileId": "string", "zScoreGeneticProfileId": "string"},
-                {"entrezGeneId": 1, "hugoGeneSymbol": "string1", "correlationValue": 0, "expressionGeneticProfileId": "string", "zScoreGeneticProfileId": "string"},
-                {"entrezGeneId": 2, "hugoGeneSymbol": "string2", "correlationValue": 0, "expressionGeneticProfileId": "string", "zScoreGeneticProfileId": "string"},
-                {"entrezGeneId": 3, "hugoGeneSymbol": "string2", "correlationValue": 0, "expressionGeneticProfileId": "string", "zScoreGeneticProfileId": "string"}
-            ]));
-        const cache = new GenesetCorrelatedGeneCache(
-            {profile1: {sampleIds: ['sample1', 'sample2']}}
-        );
-        cache.initIteration(
-            'track1_expansions',
-            {genesetId: 'geneset1', molecularProfileId: 'profile1'}
+        (client.fetchCorrelatedGenesUsingPOST as sinon.SinonStub).returns(
+            Promise.resolve([
+                {
+                    entrezGeneId: 0,
+                    hugoGeneSymbol: 'string0',
+                    correlationValue: 0,
+                    expressionGeneticProfileId: 'string',
+                    zScoreGeneticProfileId: 'string',
+                },
+                {
+                    entrezGeneId: 1,
+                    hugoGeneSymbol: 'string1',
+                    correlationValue: 0,
+                    expressionGeneticProfileId: 'string',
+                    zScoreGeneticProfileId: 'string',
+                },
+                {
+                    entrezGeneId: 2,
+                    hugoGeneSymbol: 'string2',
+                    correlationValue: 0,
+                    expressionGeneticProfileId: 'string',
+                    zScoreGeneticProfileId: 'string',
+                },
+                {
+                    entrezGeneId: 3,
+                    hugoGeneSymbol: 'string2',
+                    correlationValue: 0,
+                    expressionGeneticProfileId: 'string',
+                    zScoreGeneticProfileId: 'string',
+                },
+            ])
         );
+        const cache = new GenesetCorrelatedGeneCache({
+            profile1: { sampleIds: ['sample1', 'sample2'] },
+        });
+        cache.initIteration('track1_expansions', {
+            genesetId: 'geneset1',
+            molecularProfileId: 'profile1',
+        });
         // when next is called to request 2 genes in the iteration twice
         const geneListPromise1 = cache.next('track1_expansions', 2);
         const geneListPromise2 = cache.next('track1_expansions', 2);
         // then the two promises should resolve with arrays starting at gene 0
         // and 2 respectively
         return Promise.all([
-            geneListPromise1.then((genes) => {
+            geneListPromise1.then(genes => {
                 assert.equal(genes[0].entrezGeneId, 0);
             }),
-            geneListPromise2.then((genes) => {
+            geneListPromise2.then(genes => {
                 assert.equal(genes[0].entrezGeneId, 2);
-            })
+            }),
         ]);
     });
 
     it('provides the first n genes again after reset is called', () => {
         // given an API client with 4 available genes and a cache with a started
         // iteration
-        (client.fetchCorrelatedGenesUsingPOST as sinon.SinonStub)
-            .returns(Promise.resolve([
-                {"entrezGeneId": 0, "hugoGeneSymbol": "string0", "correlationValue": 0, "expressionGeneticProfileId": "string", "zScoreGeneticProfileId": "string"},
-                {"entrezGeneId": 1, "hugoGeneSymbol": "string1", "correlationValue": 0, "expressionGeneticProfileId": "string", "zScoreGeneticProfileId": "string"},
-                {"entrezGeneId": 2, "hugoGeneSymbol": "string2", "correlationValue": 0, "expressionGeneticProfileId": "string", "zScoreGeneticProfileId": "string"},
-                {"entrezGeneId": 3, "hugoGeneSymbol": "string2", "correlationValue": 0, "expressionGeneticProfileId": "string", "zScoreGeneticProfileId": "string"}
-            ]));
-        const cache = new GenesetCorrelatedGeneCache(
-            {profile1: {sampleIds: ['sample1', 'sample2']}}
-        );
-        cache.initIteration(
-            'track1_expansions',
-            {genesetId: 'geneset1', molecularProfileId: 'profile1'}
+        (client.fetchCorrelatedGenesUsingPOST as sinon.SinonStub).returns(
+            Promise.resolve([
+                {
+                    entrezGeneId: 0,
+                    hugoGeneSymbol: 'string0',
+                    correlationValue: 0,
+                    expressionGeneticProfileId: 'string',
+                    zScoreGeneticProfileId: 'string',
+                },
+                {
+                    entrezGeneId: 1,
+                    hugoGeneSymbol: 'string1',
+                    correlationValue: 0,
+                    expressionGeneticProfileId: 'string',
+                    zScoreGeneticProfileId: 'string',
+                },
+                {
+                    entrezGeneId: 2,
+                    hugoGeneSymbol: 'string2',
+                    correlationValue: 0,
+                    expressionGeneticProfileId: 'string',
+                    zScoreGeneticProfileId: 'string',
+                },
+                {
+                    entrezGeneId: 3,
+                    hugoGeneSymbol: 'string2',
+                    correlationValue: 0,
+                    expressionGeneticProfileId: 'string',
+                    zScoreGeneticProfileId: 'string',
+                },
+            ])
         );
+        const cache = new GenesetCorrelatedGeneCache({
+            profile1: { sampleIds: ['sample1', 'sample2'] },
+        });
+        cache.initIteration('track1_expansions', {
+            genesetId: 'geneset1',
+            molecularProfileId: 'profile1',
+        });
         // when next is called to request 2 genes in the iteration twice with a
         // call to reset for the iteration in between
         const geneListPromise1 = cache.next('track1_expansions', 2);
@@ -136,36 +237,61 @@ describe('GenesetCorrelatedGeneCache', () => {
         const geneListPromise2 = cache.next('track1_expansions', 2);
         // then the both promises should resolve with arrays starting at gene 0
         return Promise.all([
-            geneListPromise1.then((genes) => {
+            geneListPromise1.then(genes => {
                 assert.equal(genes[0].entrezGeneId, 0);
             }),
-            geneListPromise2.then((genes) => {
+            geneListPromise2.then(genes => {
                 assert.equal(genes[0].entrezGeneId, 0);
-            })
+            }),
         ]);
     });
 
     it('leaves pre-existing iterations untouched when requesting', () => {
         // given an API client with 4 available genes and a cache with 2 started
         // iterations
-        (client.fetchCorrelatedGenesUsingPOST as sinon.SinonStub)
-            .returns(Promise.resolve([
-                {"entrezGeneId": 0, "hugoGeneSymbol": "string0", "correlationValue": 0, "expressionGeneticProfileId": "string", "zScoreGeneticProfileId": "string"},
-                {"entrezGeneId": 1, "hugoGeneSymbol": "string1", "correlationValue": 0, "expressionGeneticProfileId": "string", "zScoreGeneticProfileId": "string"},
-                {"entrezGeneId": 2, "hugoGeneSymbol": "string2", "correlationValue": 0, "expressionGeneticProfileId": "string", "zScoreGeneticProfileId": "string"},
-                {"entrezGeneId": 3, "hugoGeneSymbol": "string2", "correlationValue": 0, "expressionGeneticProfileId": "string", "zScoreGeneticProfileId": "string"}
-            ]));
-        const cache = new GenesetCorrelatedGeneCache(
-            {profile1: {sampleIds: ['sample1', 'sample2']}}
-        );
-        cache.initIteration(
-            'track1_expansions',
-            {genesetId: 'geneset1', molecularProfileId: 'profile1'}
-        );
-        cache.initIteration(
-            'track2_expansions',
-            {genesetId: 'geneset2', molecularProfileId: 'profile1'}
+        (client.fetchCorrelatedGenesUsingPOST as sinon.SinonStub).returns(
+            Promise.resolve([
+                {
+                    entrezGeneId: 0,
+                    hugoGeneSymbol: 'string0',
+                    correlationValue: 0,
+                    expressionGeneticProfileId: 'string',
+                    zScoreGeneticProfileId: 'string',
+                },
+                {
+                    entrezGeneId: 1,
+                    hugoGeneSymbol: 'string1',
+                    correlationValue: 0,
+                    expressionGeneticProfileId: 'string',
+                    zScoreGeneticProfileId: 'string',
+                },
+                {
+                    entrezGeneId: 2,
+                    hugoGeneSymbol: 'string2',
+                    correlationValue: 0,
+                    expressionGeneticProfileId: 'string',
+                    zScoreGeneticProfileId: 'string',
+                },
+                {
+                    entrezGeneId: 3,
+                    hugoGeneSymbol: 'string2',
+                    correlationValue: 0,
+                    expressionGeneticProfileId: 'string',
+                    zScoreGeneticProfileId: 'string',
+                },
+            ])
         );
+        const cache = new GenesetCorrelatedGeneCache({
+            profile1: { sampleIds: ['sample1', 'sample2'] },
+        });
+        cache.initIteration('track1_expansions', {
+            genesetId: 'geneset1',
+            molecularProfileId: 'profile1',
+        });
+        cache.initIteration('track2_expansions', {
+            genesetId: 'geneset2',
+            molecularProfileId: 'profile1',
+        });
         // when next is called to request 2 genes in the first iteration twice with a
         // call for the second iteration in between
         const geneListPromise1 = cache.next('track1_expansions', 2);
@@ -174,36 +300,61 @@ describe('GenesetCorrelatedGeneCache', () => {
         // then the promises for the first iteration should resolve with arrays
         // starting at gene 0 and 2 respectively
         return Promise.all([
-            geneListPromise1.then((genes) => {
+            geneListPromise1.then(genes => {
                 assert.equal(genes[0].entrezGeneId, 0);
             }),
-            geneListPromise2.then((genes) => {
+            geneListPromise2.then(genes => {
                 assert.equal(genes[0].entrezGeneId, 2);
-            })
+            }),
         ]);
     });
 
     it('leaves pre-existing iterations untouched when resetting', () => {
         // given an API client with 4 available genes and a cache with 2 started
         // iterations
-        (client.fetchCorrelatedGenesUsingPOST as sinon.SinonStub)
-            .returns(Promise.resolve([
-                {"entrezGeneId": 0, "hugoGeneSymbol": "string0", "correlationValue": 0, "expressionGeneticProfileId": "string", "zScoreGeneticProfileId": "string"},
-                {"entrezGeneId": 1, "hugoGeneSymbol": "string1", "correlationValue": 0, "expressionGeneticProfileId": "string", "zScoreGeneticProfileId": "string"},
-                {"entrezGeneId": 2, "hugoGeneSymbol": "string2", "correlationValue": 0, "expressionGeneticProfileId": "string", "zScoreGeneticProfileId": "string"},
-                {"entrezGeneId": 3, "hugoGeneSymbol": "string2", "correlationValue": 0, "expressionGeneticProfileId": "string", "zScoreGeneticProfileId": "string"}
-            ]));
-        const cache = new GenesetCorrelatedGeneCache(
-            {profile1: {sampleIds: ['sample1', 'sample2']}}
-        );
-        cache.initIteration(
-            'track1_expansions',
-            {genesetId: 'geneset1', molecularProfileId: 'profile1'}
-        );
-        cache.initIteration(
-            'track2_expansions',
-            {genesetId: 'geneset2', molecularProfileId: 'profile1'}
+        (client.fetchCorrelatedGenesUsingPOST as sinon.SinonStub).returns(
+            Promise.resolve([
+                {
+                    entrezGeneId: 0,
+                    hugoGeneSymbol: 'string0',
+                    correlationValue: 0,
+                    expressionGeneticProfileId: 'string',
+                    zScoreGeneticProfileId: 'string',
+                },
+                {
+                    entrezGeneId: 1,
+                    hugoGeneSymbol: 'string1',
+                    correlationValue: 0,
+                    expressionGeneticProfileId: 'string',
+                    zScoreGeneticProfileId: 'string',
+                },
+                {
+                    entrezGeneId: 2,
+                    hugoGeneSymbol: 'string2',
+                    correlationValue: 0,
+                    expressionGeneticProfileId: 'string',
+                    zScoreGeneticProfileId: 'string',
+                },
+                {
+                    entrezGeneId: 3,
+                    hugoGeneSymbol: 'string2',
+                    correlationValue: 0,
+                    expressionGeneticProfileId: 'string',
+                    zScoreGeneticProfileId: 'string',
+                },
+            ])
         );
+        const cache = new GenesetCorrelatedGeneCache({
+            profile1: { sampleIds: ['sample1', 'sample2'] },
+        });
+        cache.initIteration('track1_expansions', {
+            genesetId: 'geneset1',
+            molecularProfileId: 'profile1',
+        });
+        cache.initIteration('track2_expansions', {
+            genesetId: 'geneset2',
+            molecularProfileId: 'profile1',
+        });
         // when next is called to request 2 genes in the first iteration twice with a
         // call to reset for the second iteration in between
         const geneListPromise1 = cache.next('track1_expansions', 2);
@@ -212,12 +363,12 @@ describe('GenesetCorrelatedGeneCache', () => {
         // then the promises for the first iteration should resolve with arrays
         // starting at gene 0 and 2 respectively
         return Promise.all([
-            geneListPromise1.then((genes) => {
+            geneListPromise1.then(genes => {
                 assert.equal(genes[0].entrezGeneId, 0);
             }),
-            geneListPromise2.then((genes) => {
+            geneListPromise2.then(genes => {
                 assert.equal(genes[0].entrezGeneId, 2);
-            })
+            }),
         ]);
     });
 });
diff --git a/src/shared/cache/GenesetCorrelatedGeneCache.ts b/src/shared/cache/GenesetCorrelatedGeneCache.ts
index 5c34b6f0ed7..47386848e41 100644
--- a/src/shared/cache/GenesetCorrelatedGeneCache.ts
+++ b/src/shared/cache/GenesetCorrelatedGeneCache.ts
@@ -1,7 +1,7 @@
-import {GenesetCorrelation} from "../api/generated/CBioPortalAPIInternal";
-import client from "shared/api/cbioportalInternalClientInstance";
-import _ from "lodash";
-import {IDataQueryFilter} from "../lib/StoreUtils";
+import { GenesetCorrelation } from '../api/generated/CBioPortalAPIInternal';
+import client from 'shared/api/cbioportalInternalClientInstance';
+import _ from 'lodash';
+import { IDataQueryFilter } from '../lib/StoreUtils';
 
 interface IQuery {
     genesetId: string;
@@ -9,17 +9,17 @@ interface IQuery {
 }
 
 type SampleFilterByProfile = {
-    [molecularProfileId: string]: IDataQueryFilter
+    [molecularProfileId: string]: IDataQueryFilter;
 };
 
 async function fetch(
-    {genesetId, molecularProfileId}: IQuery,
+    { genesetId, molecularProfileId }: IQuery,
     sampleFilterByProfile: SampleFilterByProfile
 ): Promise<GenesetCorrelation[]> {
     const param = {
         genesetId,
         geneticProfileId: molecularProfileId,
-        ...sampleFilterByProfile[molecularProfileId]
+        ...sampleFilterByProfile[molecularProfileId],
     };
     return client.fetchCorrelatedGenesUsingPOST(param);
 }
@@ -30,7 +30,7 @@ class AsyncStateChain<S> {
         this.stateChain = Promise.resolve(initState);
     }
     appendTransition<A>(
-        useState: (currentState: S) => Promise<{newState: S, output: A}>
+        useState: (currentState: S) => Promise<{ newState: S; output: A }>
     ): Promise<A> {
         // Synchronously replace stateChain by a promise of the new state,
         // and return a promise of the output
@@ -51,33 +51,42 @@ class GenesetCorrelatedGeneIteration {
         this.sampleFilterByProfile = sampleFilterByProfile;
     }
     async next(maxNumber: number) {
-        return this.nextGeneIndexStateChain.appendTransition(async currentIndex => {
-            if (this.data === undefined) {
-                this.data = await fetch(this.query, this.sampleFilterByProfile);
+        return this.nextGeneIndexStateChain.appendTransition(
+            async currentIndex => {
+                if (this.data === undefined) {
+                    this.data = await fetch(
+                        this.query,
+                        this.sampleFilterByProfile
+                    );
+                }
+                // select the first n genes starting from the index,
+                // up to the end of the array
+                const nextGenes = this.data.slice(
+                    currentIndex,
+                    currentIndex + maxNumber
+                );
+                return {
+                    newState: currentIndex + nextGenes.length,
+                    output: nextGenes,
+                };
             }
-            // select the first n genes starting from the index,
-            // up to the end of the array
-            const nextGenes = this.data.slice(
-                currentIndex,
-                currentIndex + maxNumber
-            );
-            return {newState: currentIndex + nextGenes.length, output: nextGenes};
-        });
+        );
     }
 
     /**
      * Resets the iteration so that next() will start from the beginning.
      */
     reset(): void {
-        this.nextGeneIndexStateChain.appendTransition((currentIndex) => Promise.resolve({newState: 0, output: undefined}));
+        this.nextGeneIndexStateChain.appendTransition(currentIndex =>
+            Promise.resolve({ newState: 0, output: undefined })
+        );
     }
 }
 
-export default class GenesetCorrelatedGeneCache  {
-
+export default class GenesetCorrelatedGeneCache {
     private sampleFilterByProfile: SampleFilterByProfile;
     private iterations: {
-        [iterationKey: string]: GenesetCorrelatedGeneIteration
+        [iterationKey: string]: GenesetCorrelatedGeneIteration;
     } = {};
 
     constructor(sampleFilterByProfile: SampleFilterByProfile) {
@@ -85,9 +94,12 @@ export default class GenesetCorrelatedGeneCache  {
     }
 
     initIteration(iterationKey: string, query: IQuery) {
-        if (!Object.prototype.hasOwnProperty.call(this.iterations, iterationKey)) {
+        if (
+            !Object.prototype.hasOwnProperty.call(this.iterations, iterationKey)
+        ) {
             this.iterations[iterationKey] = new GenesetCorrelatedGeneIteration(
-                query, this.sampleFilterByProfile
+                query,
+                this.sampleFilterByProfile
             );
         }
     }
@@ -102,5 +114,4 @@ export default class GenesetCorrelatedGeneCache  {
     reset(iterationKey: string): void {
         this.iterations[iterationKey].reset();
     }
-
 }
diff --git a/src/shared/cache/GenesetMolecularDataCache.ts b/src/shared/cache/GenesetMolecularDataCache.ts
index 50ffaac7ead..60a34905f9c 100644
--- a/src/shared/cache/GenesetMolecularDataCache.ts
+++ b/src/shared/cache/GenesetMolecularDataCache.ts
@@ -1,8 +1,11 @@
-import LazyMobXCache, {AugmentedData} from "../lib/LazyMobXCache";
-import {GenesetMolecularData, GenesetDataFilterCriteria} from "../api/generated/CBioPortalAPIInternal";
-import client from "shared/api/cbioportalInternalClientInstance";
-import _ from "lodash";
-import {IDataQueryFilter} from "../lib/StoreUtils";
+import LazyMobXCache, { AugmentedData } from '../lib/LazyMobXCache';
+import {
+    GenesetMolecularData,
+    GenesetDataFilterCriteria,
+} from '../api/generated/CBioPortalAPIInternal';
+import client from 'shared/api/cbioportalInternalClientInstance';
+import _ from 'lodash';
+import { IDataQueryFilter } from '../lib/StoreUtils';
 
 interface IQuery {
     genesetId: string;
@@ -10,26 +13,31 @@ interface IQuery {
 }
 
 type SampleFilterByProfile = {
-    [molecularProfileId: string]: IDataQueryFilter
+    [molecularProfileId: string]: IDataQueryFilter;
 };
 
 function queryToKey(q: IQuery) {
     return `${q.molecularProfileId}~${q.genesetId}`;
 }
 
-function dataToKey(d:GenesetMolecularData[], q:IQuery) {
+function dataToKey(d: GenesetMolecularData[], q: IQuery) {
     return `${q.molecularProfileId}~${q.genesetId}`;
 }
 
 /**
 /* Pairs each IQuery with an (array-wrapped) array of any matching data.
 */
-function augmentQueryResults(queries: IQuery[], results: GenesetMolecularData[][]) {
-    const keyedAugments: {[key: string]: AugmentedData<GenesetMolecularData[], IQuery>} = {};
+function augmentQueryResults(
+    queries: IQuery[],
+    results: GenesetMolecularData[][]
+) {
+    const keyedAugments: {
+        [key: string]: AugmentedData<GenesetMolecularData[], IQuery>;
+    } = {};
     for (const query of queries) {
         keyedAugments[queryToKey(query)] = {
             data: [[]],
-            meta: query
+            meta: query,
         };
     }
     for (const queryResult of results) {
@@ -37,7 +45,7 @@ function augmentQueryResults(queries: IQuery[], results: GenesetMolecularData[][
             keyedAugments[
                 queryToKey({
                     molecularProfileId: datum.geneticProfileId,
-                    genesetId: datum.genesetId
+                    genesetId: datum.genesetId,
                 })
             ].data[0].push(datum);
         }
@@ -46,32 +54,36 @@ function augmentQueryResults(queries: IQuery[], results: GenesetMolecularData[][
 }
 
 async function fetch(
-    queries:IQuery[],
+    queries: IQuery[],
     sampleFilterByProfile: SampleFilterByProfile
 ): Promise<AugmentedData<GenesetMolecularData[], IQuery>[]> {
     const genesetIdsByProfile = _.mapValues(
         _.groupBy(queries, q => q.molecularProfileId),
         profileQueries => profileQueries.map(q => q.genesetId)
     );
-    const params = Object.keys(genesetIdsByProfile)
-        .map(profileId => ({
-            geneticProfileId: profileId,
-            // the Swagger-generated type expected by the client method below
-            // incorrectly requires both samples and a sample list;
-            // use 'as' to tell TypeScript that this object really does fit.
-            // tslint:disable-next-line: no-object-literal-type-assertion
-            genesetDataFilterCriteria: {
-                genesetIds: genesetIdsByProfile[profileId],
-                ...sampleFilterByProfile[profileId]
-            } as GenesetDataFilterCriteria
-        })
+    const params = Object.keys(genesetIdsByProfile).map(profileId => ({
+        geneticProfileId: profileId,
+        // the Swagger-generated type expected by the client method below
+        // incorrectly requires both samples and a sample list;
+        // use 'as' to tell TypeScript that this object really does fit.
+        // tslint:disable-next-line: no-object-literal-type-assertion
+        genesetDataFilterCriteria: {
+            genesetIds: genesetIdsByProfile[profileId],
+            ...sampleFilterByProfile[profileId],
+        } as GenesetDataFilterCriteria,
+    }));
+    const dataPromises = params.map(param =>
+        client.fetchGeneticDataItemsUsingPOST(param)
     );
-    const dataPromises = params.map(param => client.fetchGeneticDataItemsUsingPOST(param));
     const results: GenesetMolecularData[][] = await Promise.all(dataPromises);
     return augmentQueryResults(queries, results);
 }
 
-export default class GenesetMolecularDataCache extends LazyMobXCache<GenesetMolecularData[], IQuery, IQuery>{
+export default class GenesetMolecularDataCache extends LazyMobXCache<
+    GenesetMolecularData[],
+    IQuery,
+    IQuery
+> {
     constructor(molecularProfileIdToSampleFilter: SampleFilterByProfile) {
         super(queryToKey, dataToKey, fetch, molecularProfileIdToSampleFilter);
     }
diff --git a/src/shared/cache/GenomeNexusCache.ts b/src/shared/cache/GenomeNexusCache.ts
index 72c7f5abdf6..cb971ae97f6 100644
--- a/src/shared/cache/GenomeNexusCache.ts
+++ b/src/shared/cache/GenomeNexusCache.ts
@@ -1,36 +1,48 @@
-import {fetchVariantAnnotationsByMutation} from "shared/lib/StoreUtils";
-import {extractGenomicLocation, genomicLocationString} from "shared/lib/MutationUtils";
-import {VariantAnnotation} from "cbioportal-frontend-commons";
-import {Mutation} from "shared/api/generated/CBioPortalAPI";
-import LazyMobXCache, {CacheData} from "shared/lib/LazyMobXCache";
-import AppConfig from "appConfig";
+import { fetchVariantAnnotationsByMutation } from 'shared/lib/StoreUtils';
+import {
+    extractGenomicLocation,
+    genomicLocationString,
+} from 'shared/lib/MutationUtils';
+import { VariantAnnotation } from 'cbioportal-frontend-commons';
+import { Mutation } from 'shared/api/generated/CBioPortalAPI';
+import LazyMobXCache, { CacheData } from 'shared/lib/LazyMobXCache';
+import AppConfig from 'appConfig';
 
 export type GenomeNexusCacheDataType = CacheData<VariantAnnotation>;
 
-
-export function fetch(queries: Mutation[]):Promise<VariantAnnotation[]> {
+export function fetch(queries: Mutation[]): Promise<VariantAnnotation[]> {
     if (queries.length > 0) {
-        return fetchVariantAnnotationsByMutation(queries, ["annotation_summary", "mutation_assessor"], AppConfig.serverConfig.isoformOverrideSource);
+        return fetchVariantAnnotationsByMutation(
+            queries,
+            ['annotation_summary', 'mutation_assessor'],
+            AppConfig.serverConfig.isoformOverrideSource
+        );
     } else {
         return Promise.resolve([]);
     }
 }
 
-export function queryToKey(m:Mutation) {
+export function queryToKey(m: Mutation) {
     const genomicLocation = extractGenomicLocation(m);
     if (genomicLocation) {
         return genomicLocationString(genomicLocation);
     } else {
         // TODO: might be a better way to handle mutations w/o genomic location
         // info. They should maybe not be fed to the cache in the first place
-        return "";
+        return '';
     }
 }
 
-export default class GenomeNexusCache extends LazyMobXCache<VariantAnnotation, Mutation> {
+export default class GenomeNexusCache extends LazyMobXCache<
+    VariantAnnotation,
+    Mutation
+> {
     constructor() {
-        super((m:Mutation) => (queryToKey(m)), // queryToKey
-              (v:VariantAnnotation) => genomicLocationString(v.annotation_summary.genomicLocation), // dataToKey
-              fetch);
+        super(
+            (m: Mutation) => queryToKey(m), // queryToKey
+            (v: VariantAnnotation) =>
+                genomicLocationString(v.annotation_summary.genomicLocation), // dataToKey
+            fetch
+        );
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/cache/GenomeNexusMyVariantInfoCache.ts b/src/shared/cache/GenomeNexusMyVariantInfoCache.ts
index 7dd8b29d2a0..048655fde4c 100644
--- a/src/shared/cache/GenomeNexusMyVariantInfoCache.ts
+++ b/src/shared/cache/GenomeNexusMyVariantInfoCache.ts
@@ -1,52 +1,75 @@
-import {fetchVariantAnnotationsByMutation} from "shared/lib/StoreUtils";
-import {extractGenomicLocation, genomicLocationString} from "shared/lib/MutationUtils";
-import {VariantAnnotation} from "cbioportal-frontend-commons";
-import {Mutation} from "shared/api/generated/CBioPortalAPI";
-import LazyMobXCache, {CacheData} from "shared/lib/LazyMobXCache";
-import AppConfig from "appConfig";
+import { fetchVariantAnnotationsByMutation } from 'shared/lib/StoreUtils';
+import {
+    extractGenomicLocation,
+    genomicLocationString,
+} from 'shared/lib/MutationUtils';
+import { VariantAnnotation } from 'cbioportal-frontend-commons';
+import { Mutation } from 'shared/api/generated/CBioPortalAPI';
+import LazyMobXCache, { CacheData } from 'shared/lib/LazyMobXCache';
+import AppConfig from 'appConfig';
 
 export type GenomeNexusCacheDataType = CacheData<VariantAnnotation>;
 
-
-export function fetch(queries: Mutation[]):Promise<VariantAnnotation[]> {
+export function fetch(queries: Mutation[]): Promise<VariantAnnotation[]> {
     if (queries.length > 0) {
-
-        return fetchVariantAnnotationsByMutation(queries, ["my_variant_info"], AppConfig.serverConfig.isoformOverrideSource);
-
+        return fetchVariantAnnotationsByMutation(
+            queries,
+            ['my_variant_info'],
+            AppConfig.serverConfig.isoformOverrideSource
+        );
     } else {
         return Promise.resolve([]);
     }
 }
 
-export function queryToKey(m:Mutation) {
+export function queryToKey(m: Mutation) {
     const genomicLocation = extractGenomicLocation(m);
     if (genomicLocation) {
         return genomicLocationString(genomicLocation);
     } else {
         // TODO: might be a better way to handle mutations w/o genomic location
         // info. They should maybe not be fed to the cache in the first place
-        return "";
+        return '';
     }
 }
 
+export function generateGenomicLocationString(
+    chromosome: string,
+    start: number,
+    end: number,
+    allele: string
+) {
+    let ref = allele.split('/')[0];
+    let alt = allele.split('/')[1];
 
-export function generateGenomicLocationString(chromosome: string, start: number, end: number, allele: string) {
-    let ref = allele.split("/")[0];
-    let alt = allele.split("/")[1];
-    
-    return chromosome + "," + start.toString() + "," + end.toString() + "," + ref + "," + alt;
+    return (
+        chromosome +
+        ',' +
+        start.toString() +
+        ',' +
+        end.toString() +
+        ',' +
+        ref +
+        ',' +
+        alt
+    );
 }
 
-
-export default class GenomeNexusMyVariantInfoCache extends LazyMobXCache<VariantAnnotation, Mutation> {
-
+export default class GenomeNexusMyVariantInfoCache extends LazyMobXCache<
+    VariantAnnotation,
+    Mutation
+> {
     constructor() {
-        super((m:Mutation) => (queryToKey(m)), // queryToKey
-              (v:VariantAnnotation) => generateGenomicLocationString(v.seq_region_name,
-                                                                     v.start,
-                                                                     v.end,
-                                                                     v.allele_string), // dataToKey
-              fetch);
-              
+        super(
+            (m: Mutation) => queryToKey(m), // queryToKey
+            (v: VariantAnnotation) =>
+                generateGenomicLocationString(
+                    v.seq_region_name,
+                    v.start,
+                    v.end,
+                    v.allele_string
+                ), // dataToKey
+            fetch
+        );
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/cache/MolecularProfilesInStudyCache.ts b/src/shared/cache/MolecularProfilesInStudyCache.ts
index 4f506b4ec30..a91bdc2d40b 100644
--- a/src/shared/cache/MolecularProfilesInStudyCache.ts
+++ b/src/shared/cache/MolecularProfilesInStudyCache.ts
@@ -1,34 +1,45 @@
-import LazyMobXCache, {AugmentedData} from "../lib/LazyMobXCache";
-import {MolecularProfile, MolecularProfileFilter} from "../api/generated/CBioPortalAPI";
-import client from "../api/cbioportalClientInstance";
-import * as _ from "lodash";
+import LazyMobXCache, { AugmentedData } from '../lib/LazyMobXCache';
+import {
+    MolecularProfile,
+    MolecularProfileFilter,
+} from '../api/generated/CBioPortalAPI';
+import client from '../api/cbioportalClientInstance';
+import * as _ from 'lodash';
 
-function queryToKey(studyId:string) {
+function queryToKey(studyId: string) {
     return studyId;
 }
 
-function dataToKey(molecularProfiles:MolecularProfile[], studyId:string) {
+function dataToKey(molecularProfiles: MolecularProfile[], studyId: string) {
     return studyId;
 }
 
-async function fetch(studyIds:string[]):Promise<AugmentedData<MolecularProfile[], string>[]> {
-    const profiles:MolecularProfile[] = await client.fetchMolecularProfilesUsingPOST({
-        molecularProfileFilter:{
-            studyIds
-        } as MolecularProfileFilter
-    });
-    const profilesByStudy = _.groupBy(profiles, profile=>profile.studyId);
-    return studyIds.map(studyId=>{
-        const data = [(profilesByStudy[studyId] || [])];
+async function fetch(
+    studyIds: string[]
+): Promise<AugmentedData<MolecularProfile[], string>[]> {
+    const profiles: MolecularProfile[] = await client.fetchMolecularProfilesUsingPOST(
+        {
+            molecularProfileFilter: {
+                studyIds,
+            } as MolecularProfileFilter,
+        }
+    );
+    const profilesByStudy = _.groupBy(profiles, profile => profile.studyId);
+    return studyIds.map(studyId => {
+        const data = [profilesByStudy[studyId] || []];
         return {
             data,
-            meta: studyId
+            meta: studyId,
         };
     });
 }
 
-export default class MolecularProfilesInStudyCache extends LazyMobXCache<MolecularProfile[],string,string> {
+export default class MolecularProfilesInStudyCache extends LazyMobXCache<
+    MolecularProfile[],
+    string,
+    string
+> {
     constructor() {
         super(queryToKey, dataToKey, fetch);
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/cache/MrnaExprRankCache.ts b/src/shared/cache/MrnaExprRankCache.ts
index d59764702c4..76e2ba31a93 100644
--- a/src/shared/cache/MrnaExprRankCache.ts
+++ b/src/shared/cache/MrnaExprRankCache.ts
@@ -1,27 +1,35 @@
 import * as _ from 'lodash';
-import {default as SampleGeneCache, SampleAndGene} from 'shared/lib/SampleGeneCache';
-import internalClient from "shared/api/cbioportalInternalClientInstance";
-import {MrnaPercentile} from "shared/api/generated/CBioPortalAPIInternal";
-import {CacheData} from "shared/lib/LazyMobXCache";
+import {
+    default as SampleGeneCache,
+    SampleAndGene,
+} from 'shared/lib/SampleGeneCache';
+import internalClient from 'shared/api/cbioportalInternalClientInstance';
+import { MrnaPercentile } from 'shared/api/generated/CBioPortalAPIInternal';
+import { CacheData } from 'shared/lib/LazyMobXCache';
 
 export type MrnaExprRankCacheDataType = CacheData<MrnaPercentile>;
 
-async function fetch(queries:SampleAndGene[], mrnaRankMolecularProfileId:string|null):Promise<MrnaPercentile[]> {
+async function fetch(
+    queries: SampleAndGene[],
+    mrnaRankMolecularProfileId: string | null
+): Promise<MrnaPercentile[]> {
     try {
-        const sampleToEntrezList:{[sampleId:string]:number[]} = {};
+        const sampleToEntrezList: { [sampleId: string]: number[] } = {};
         for (const query of queries) {
-            sampleToEntrezList[query.sampleId] = sampleToEntrezList[query.sampleId] || [];
+            sampleToEntrezList[query.sampleId] =
+                sampleToEntrezList[query.sampleId] || [];
             sampleToEntrezList[query.sampleId].push(query.entrezGeneId);
         }
-        const allMrnaPercentiles:MrnaPercentile[][] = await Promise.all(Object.keys(sampleToEntrezList).map((sampleId:string)=>
-            ( mrnaRankMolecularProfileId === null ?
-                    Promise.reject("No molecular profile id given.") :
-                    internalClient.fetchMrnaPercentileUsingPOST({
-                        molecularProfileId: mrnaRankMolecularProfileId,
-                        sampleId,
-                        entrezGeneIds: sampleToEntrezList[sampleId]
-                    })
-            ))
+        const allMrnaPercentiles: MrnaPercentile[][] = await Promise.all(
+            Object.keys(sampleToEntrezList).map((sampleId: string) =>
+                mrnaRankMolecularProfileId === null
+                    ? Promise.reject('No molecular profile id given.')
+                    : internalClient.fetchMrnaPercentileUsingPOST({
+                          molecularProfileId: mrnaRankMolecularProfileId,
+                          sampleId,
+                          entrezGeneIds: sampleToEntrezList[sampleId],
+                      })
+            )
         );
         return _.flatten(allMrnaPercentiles);
     } catch (err) {
@@ -30,8 +38,7 @@ async function fetch(queries:SampleAndGene[], mrnaRankMolecularProfileId:string|
 }
 
 export default class MrnaExprRankCache extends SampleGeneCache<MrnaPercentile> {
-
-    constructor(mrnaRankMolecularProfileId:string|null) {
+    constructor(mrnaRankMolecularProfileId: string | null) {
         super(fetch, mrnaRankMolecularProfileId);
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/cache/MutationCountCache.ts b/src/shared/cache/MutationCountCache.ts
index 4e35df96208..e0b8ad706a8 100644
--- a/src/shared/cache/MutationCountCache.ts
+++ b/src/shared/cache/MutationCountCache.ts
@@ -1,32 +1,41 @@
-import client from "../api/cbioportalClientInstance";
-import LazyMobXCache from "../lib/LazyMobXCache";
-import {ClinicalData, ClinicalDataMultiStudyFilter} from "../api/generated/CBioPortalAPI";
-import _ from "lodash";
+import client from '../api/cbioportalClientInstance';
+import LazyMobXCache from '../lib/LazyMobXCache';
+import {
+    ClinicalData,
+    ClinicalDataMultiStudyFilter,
+} from '../api/generated/CBioPortalAPI';
+import _ from 'lodash';
 
 type Query = {
     sampleId: string;
     studyId: string;
 };
 
-function key(d:{studyId:string, sampleId:string}) {
+function key(d: { studyId: string; sampleId: string }) {
     return `${d.studyId}~${d.sampleId}`;
 }
-export async function fetch(queries:Query[]):Promise<ClinicalData[]> {
-
+export async function fetch(queries: Query[]): Promise<ClinicalData[]> {
     if (queries.length > 0) {
         const filter: ClinicalDataMultiStudyFilter = {
-            attributeIds: ["MUTATION_COUNT"],
-            identifiers: queries.map((s: any) => ({entityId: s.sampleId, studyId: s.studyId}))
+            attributeIds: ['MUTATION_COUNT'],
+            identifiers: queries.map((s: any) => ({
+                entityId: s.sampleId,
+                studyId: s.studyId,
+            })),
         };
         return client.fetchClinicalDataUsingPOST({
-            clinicalDataType: "SAMPLE",
-            clinicalDataMultiStudyFilter: filter
+            clinicalDataType: 'SAMPLE',
+            clinicalDataMultiStudyFilter: filter,
         });
     } else {
         return Promise.resolve([]);
     }
 }
-export default class MutationCountCache extends LazyMobXCache<ClinicalData, Query, string> {
+export default class MutationCountCache extends LazyMobXCache<
+    ClinicalData,
+    Query,
+    string
+> {
     constructor() {
         super(key, key, fetch);
     }
diff --git a/src/shared/cache/MutationDataCache.ts b/src/shared/cache/MutationDataCache.ts
index 129e5f6bef5..c457b85dfb6 100644
--- a/src/shared/cache/MutationDataCache.ts
+++ b/src/shared/cache/MutationDataCache.ts
@@ -1,67 +1,87 @@
-import client from "../api/cbioportalClientInstance";
-import LazyMobXCache, {AugmentedData} from "../lib/LazyMobXCache";
-import {MolecularProfile, Mutation, MutationFilter} from "../api/generated/CBioPortalAPI";
-import {IDataQueryFilter} from "../lib/StoreUtils";
-import _ from "lodash";
+import client from '../api/cbioportalClientInstance';
+import LazyMobXCache, { AugmentedData } from '../lib/LazyMobXCache';
+import {
+    MolecularProfile,
+    Mutation,
+    MutationFilter,
+} from '../api/generated/CBioPortalAPI';
+import { IDataQueryFilter } from '../lib/StoreUtils';
+import _ from 'lodash';
 
 type Query = {
-    entrezGeneId:number
+    entrezGeneId: number;
 };
 
-function dataToKey(d:Mutation[], entrezGeneId:number) {
+function dataToKey(d: Mutation[], entrezGeneId: number) {
     return `${entrezGeneId}`;
 }
 
-function queryToKey(q:Query) {
+function queryToKey(q: Query) {
     return `${q.entrezGeneId}`;
 }
 
-async function fetch(queries:Query[],
-               studyToMolecularProfile:{[studyId:string]:MolecularProfile},
-                studyToDataQueryFilter:{[studyId:string]:IDataQueryFilter}):Promise<AugmentedData<Mutation[], number>[]> {
+async function fetch(
+    queries: Query[],
+    studyToMolecularProfile: { [studyId: string]: MolecularProfile },
+    studyToDataQueryFilter: { [studyId: string]: IDataQueryFilter }
+): Promise<AugmentedData<Mutation[], number>[]> {
     const studies = Object.keys(studyToMolecularProfile);
-    const results:Mutation[][] = await Promise.all(studies.map(studyId=>{
-        const filter = studyToDataQueryFilter[studyId];
-        const molecularProfile = studyToMolecularProfile[studyId];
-        const entrezGeneIds = queries.map(x=>x.entrezGeneId);
-        if (filter && molecularProfile && entrezGeneIds.length > 0) {
-            return client.fetchMutationsInMolecularProfileUsingPOST({
-                molecularProfileId: molecularProfile.molecularProfileId,
-                mutationFilter: {
-                    ...filter,
-                    entrezGeneIds
-                } as MutationFilter,
-                projection: "DETAILED"
-            });
-        } else {
-            return Promise.resolve([]);
-        }
-    }));
-    const genes = _.keyBy(queries, x=>x.entrezGeneId);
+    const results: Mutation[][] = await Promise.all(
+        studies.map(studyId => {
+            const filter = studyToDataQueryFilter[studyId];
+            const molecularProfile = studyToMolecularProfile[studyId];
+            const entrezGeneIds = queries.map(x => x.entrezGeneId);
+            if (filter && molecularProfile && entrezGeneIds.length > 0) {
+                return client.fetchMutationsInMolecularProfileUsingPOST({
+                    molecularProfileId: molecularProfile.molecularProfileId,
+                    mutationFilter: {
+                        ...filter,
+                        entrezGeneIds,
+                    } as MutationFilter,
+                    projection: 'DETAILED',
+                });
+            } else {
+                return Promise.resolve([]);
+            }
+        })
+    );
+    const genes = _.keyBy(queries, x => x.entrezGeneId);
     const groupedData = _.values(_.groupBy(_.flatten(results), 'entrezGeneId'));
     const ret = [];
     for (const geneData of groupedData) {
         if (geneData.length) {
             ret.push({
                 meta: geneData[0].entrezGeneId,
-                data: [geneData]
+                data: [geneData],
             });
             delete genes[geneData[0].entrezGeneId];
         }
     }
-    for (const remainingGene of Object.keys(genes)){
+    for (const remainingGene of Object.keys(genes)) {
         ret.push({
             meta: parseInt(remainingGene, 10),
-            data: []
+            data: [],
         });
     }
 
     return ret;
 }
 
-export default class MutationDataCache extends LazyMobXCache<Mutation[], Query, number> {
-    constructor(studyToMolecularProfile:{[studyId:string]:MolecularProfile},
-                studyToDataQueryFilter:{[studyId:string]:IDataQueryFilter}) {
-        super(queryToKey, dataToKey, fetch, studyToMolecularProfile, studyToDataQueryFilter);
+export default class MutationDataCache extends LazyMobXCache<
+    Mutation[],
+    Query,
+    number
+> {
+    constructor(
+        studyToMolecularProfile: { [studyId: string]: MolecularProfile },
+        studyToDataQueryFilter: { [studyId: string]: IDataQueryFilter }
+    ) {
+        super(
+            queryToKey,
+            dataToKey,
+            fetch,
+            studyToMolecularProfile,
+            studyToDataQueryFilter
+        );
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/cache/OncoKbEvidenceCache.ts b/src/shared/cache/OncoKbEvidenceCache.ts
index eb809028380..411b5d5b1a6 100644
--- a/src/shared/cache/OncoKbEvidenceCache.ts
+++ b/src/shared/cache/OncoKbEvidenceCache.ts
@@ -1,42 +1,45 @@
-import {ICache, Query, SimpleCache} from "cbioportal-frontend-commons";
-import oncokbClient from "shared/api/oncokbClientInstance";
-import {generateEvidenceQuery, processEvidence} from "shared/lib/OncoKbUtils";
-import {IEvidence} from "shared/model/OncoKB";
+import { ICache, Query, SimpleCache } from 'cbioportal-frontend-commons';
+import oncokbClient from 'shared/api/oncokbClientInstance';
+import { generateEvidenceQuery, processEvidence } from 'shared/lib/OncoKbUtils';
+import { IEvidence } from 'shared/model/OncoKB';
 
-export default class OncoKbEvidenceCache extends SimpleCache<IEvidence, Query[]>
-{
-    constructor()
-    {
+export default class OncoKbEvidenceCache extends SimpleCache<
+    IEvidence,
+    Query[]
+> {
+    constructor() {
         super();
     }
 
-    protected async fetch(queryVariants: Query[])
-    {
+    protected async fetch(queryVariants: Query[]) {
         const cache: ICache<IEvidence> = {};
 
         try {
             const evidenceLookup = await oncokbClient.evidencesLookupPostUsingPOST(
-                {body: generateEvidenceQuery(queryVariants, "STANDARD_THERAPEUTIC_IMPLICATIONS_FOR_DRUG_SENSITIVITY,STANDARD_THERAPEUTIC_IMPLICATIONS_FOR_DRUG_RESISTANCE,INVESTIGATIONAL_THERAPEUTIC_IMPLICATIONS_DRUG_SENSITIVITY,INVESTIGATIONAL_THERAPEUTIC_IMPLICATIONS_DRUG_RESISTANCE")}
+                {
+                    body: generateEvidenceQuery(
+                        queryVariants,
+                        'STANDARD_THERAPEUTIC_IMPLICATIONS_FOR_DRUG_SENSITIVITY,STANDARD_THERAPEUTIC_IMPLICATIONS_FOR_DRUG_RESISTANCE,INVESTIGATIONAL_THERAPEUTIC_IMPLICATIONS_DRUG_SENSITIVITY,INVESTIGATIONAL_THERAPEUTIC_IMPLICATIONS_DRUG_RESISTANCE'
+                    ),
+                }
             );
 
             const evidenceMap = processEvidence(evidenceLookup);
 
             for (const id in evidenceMap) {
-                if (evidenceMap.hasOwnProperty(id))
-                {
+                if (evidenceMap.hasOwnProperty(id)) {
                     cache[id] = {
-                        status: "complete",
-                        data: evidenceMap[id]
+                        status: 'complete',
+                        data: evidenceMap[id],
                     };
                 }
             }
 
             this.putData(cache);
-        }
-        catch (err) {
-            queryVariants.forEach((queryVariant:Query) => {
+        } catch (err) {
+            queryVariants.forEach((queryVariant: Query) => {
                 cache[queryVariant.id] = {
-                    status: "error"
+                    status: 'error',
                 };
             });
 
diff --git a/src/shared/cache/PdbHeaderCache.ts b/src/shared/cache/PdbHeaderCache.ts
index 157a2cbafc7..12e8e51419c 100644
--- a/src/shared/cache/PdbHeaderCache.ts
+++ b/src/shared/cache/PdbHeaderCache.ts
@@ -1,18 +1,18 @@
-import client from "shared/api/genomeNexusClientInstance";
-import LazyMobXCache from "shared/lib/LazyMobXCache";
-import {PdbHeader} from "cbioportal-frontend-commons";
+import client from 'shared/api/genomeNexusClientInstance';
+import LazyMobXCache from 'shared/lib/LazyMobXCache';
+import { PdbHeader } from 'cbioportal-frontend-commons';
 
-function fetch(pdbIds:string[]):Promise<PdbHeader[]> {
+function fetch(pdbIds: string[]): Promise<PdbHeader[]> {
     if (pdbIds.length === 0) {
-        return Promise.reject("No pdb ids given");
+        return Promise.reject('No pdb ids given');
     } else {
         return client.fetchPdbHeaderPOST({
-            pdbIds: pdbIds
+            pdbIds: pdbIds,
         });
     }
 }
 export default class PdbHeaderCache extends LazyMobXCache<PdbHeader, string> {
     constructor() {
-        super(q=>q, (d:PdbHeader)=>d.pdbId, fetch);
+        super(q => q, (d: PdbHeader) => d.pdbId, fetch);
     }
 }
diff --git a/src/shared/cache/PubMedCache.ts b/src/shared/cache/PubMedCache.ts
index f961887a8df..d60b7b78b36 100644
--- a/src/shared/cache/PubMedCache.ts
+++ b/src/shared/cache/PubMedCache.ts
@@ -1,25 +1,30 @@
-import LazyMobXCache from "../lib/LazyMobXCache";
-import {AugmentedData} from "../lib/LazyMobXCache";
-import request from "superagent";
-import {PubMedRecord} from "../model/PubMedRecord";
+import LazyMobXCache from '../lib/LazyMobXCache';
+import { AugmentedData } from '../lib/LazyMobXCache';
+import request from 'superagent';
+import { PubMedRecord } from '../model/PubMedRecord';
 
 export type PubMedRecords = {
-        [pmid:string]:PubMedRecord;
+    [pmid: string]: PubMedRecord;
 };
 
-async function fetch(pmids: number[]):Promise<AugmentedData<PubMedRecord, string>[]>
-{
-        const pubMedRecords:PubMedRecords = await new Promise<PubMedRecords>((resolve, reject) => {
+async function fetch(
+    pmids: number[]
+): Promise<AugmentedData<PubMedRecord, string>[]> {
+    const pubMedRecords: PubMedRecords = await new Promise<PubMedRecords>(
+        (resolve, reject) => {
             // TODO better to separate this call to a configurable client
-            request.post('https://eutils.ncbi.nlm.nih.gov/entrez/eutils/esummary.fcgi?db=pubmed&retmode=json')
-                .type("form")
-                .send({id: pmids.join(',')})
-                .end((err, res)=>{
+            request
+                .post(
+                    'https://eutils.ncbi.nlm.nih.gov/entrez/eutils/esummary.fcgi?db=pubmed&retmode=json'
+                )
+                .type('form')
+                .send({ id: pmids.join(',') })
+                .end((err, res) => {
                     if (!err && res.ok) {
                         const response = JSON.parse(res.text);
                         const result = response.result;
                         const uids = result.uids;
-                        const ret:PubMedRecords = {};
+                        const ret: PubMedRecords = {};
                         for (let uid of uids) {
                             ret[uid] = result[uid];
                         }
@@ -28,27 +33,26 @@ async function fetch(pmids: number[]):Promise<AugmentedData<PubMedRecord, string
                         reject(err);
                     }
                 });
-        });
-
-        const ret:AugmentedData<PubMedRecord, string>[] = [];
-        for (const pmidStr of Object.keys(pubMedRecords)) {
-            ret.push({
-                data: [pubMedRecords[pmidStr]],
-                meta: pmidStr
-            });
         }
+    );
+
+    const ret: AugmentedData<PubMedRecord, string>[] = [];
+    for (const pmidStr of Object.keys(pubMedRecords)) {
+        ret.push({
+            data: [pubMedRecords[pmidStr]],
+            meta: pmidStr,
+        });
+    }
 
-        return ret;
+    return ret;
 }
 
-export default class PubMedCache extends LazyMobXCache<PubMedRecord, number, string>
-{
-    constructor()
-    {
-        super(
-            q=>q+"",
-            (d:any, pmidStr:string)=>pmidStr,
-            fetch
-        );
+export default class PubMedCache extends LazyMobXCache<
+    PubMedRecord,
+    number,
+    string
+> {
+    constructor() {
+        super(q => q + '', (d: any, pmidStr: string) => pmidStr, fetch);
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/cache/ResidueMappingCache.ts b/src/shared/cache/ResidueMappingCache.ts
index 10f9768c157..d968432a09c 100644
--- a/src/shared/cache/ResidueMappingCache.ts
+++ b/src/shared/cache/ResidueMappingCache.ts
@@ -1,8 +1,12 @@
-import {Genome2StructureAPI, Alignment, ResidueMapping} from "cbioportal-frontend-commons";
-import g2sClient from "shared/api/g2sClientInstance";
-import {CacheData} from "shared/lib/LazyMobXCache";
-import {remoteData} from "cbioportal-frontend-commons";
-import {MobxPromise} from "mobxpromise";
+import {
+    Genome2StructureAPI,
+    Alignment,
+    ResidueMapping,
+} from 'cbioportal-frontend-commons';
+import g2sClient from 'shared/api/g2sClientInstance';
+import { CacheData } from 'shared/lib/LazyMobXCache';
+import { remoteData } from 'cbioportal-frontend-commons';
+import { MobxPromise } from 'mobxpromise';
 
 export type ResidueMappingQuery = {
     uniprotId: string;
@@ -11,19 +15,20 @@ export type ResidueMappingQuery = {
     uniprotPositions: number[];
 };
 
-export async function fetchAlignments(positions: number[],
-                                      uniprotId: string,
-                                      pdbId: string,
-                                      chainId: string,
-                                      client: Genome2StructureAPI = g2sClient)
-{
+export async function fetchAlignments(
+    positions: number[],
+    uniprotId: string,
+    pdbId: string,
+    chainId: string,
+    client: Genome2StructureAPI = g2sClient
+) {
     if (positions.length > 0) {
         return await client.postResidueMappingByPDBUsingPOST({
-            idType: "uniprot",
+            idType: 'uniprot',
             id: uniprotId,
             pdbId,
             chainId,
-            positionList: positions.map(position => `${position}`)
+            positionList: positions.map(position => `${position}`),
         });
     } else {
         return [];
@@ -33,49 +38,70 @@ export async function fetchAlignments(positions: number[],
 // TODO implement a cache that extends LazyMobXCache...
 // this one is just doing a very basic caching based on the query parameters,
 // ideally we should implement a fine caching based on "uniprotPositions"
-export default class ResidueMappingCache  {
-    private queries: {[key: string]: MobxPromise<Array<CacheData<ResidueMapping>|null>>} = {};
+export default class ResidueMappingCache {
+    private queries: {
+        [key: string]: MobxPromise<Array<CacheData<ResidueMapping> | null>>;
+    } = {};
 
     public get(query: ResidueMappingQuery) {
         const key = this.generateQueryKey(query);
 
-        if (!this.queries[key])
-        {
-            this.queries[key] = remoteData<Array<CacheData<ResidueMapping>|null>>({
-                invoke: async() => {
-                    let residueMappingCacheData: Array<CacheData<ResidueMapping>|null> = [];
-                    let residueMappings: ResidueMapping[] = [];
+        if (!this.queries[key]) {
+            this.queries[key] = remoteData<
+                Array<CacheData<ResidueMapping> | null>
+            >(
+                {
+                    invoke: async () => {
+                        let residueMappingCacheData: Array<CacheData<
+                            ResidueMapping
+                        > | null> = [];
+                        let residueMappings: ResidueMapping[] = [];
 
-                    const alignments = await fetchAlignments(query.uniprotPositions, query.uniprotId, query.pdbId, query.chainId);
+                        const alignments = await fetchAlignments(
+                            query.uniprotPositions,
+                            query.uniprotId,
+                            query.pdbId,
+                            query.chainId
+                        );
 
-                    if (alignments.length > 0) {
-                        alignments.forEach((alignment: Alignment) => {
-                            residueMappings = residueMappings.concat(alignment.residueMapping)
-                        });
+                        if (alignments.length > 0) {
+                            alignments.forEach((alignment: Alignment) => {
+                                residueMappings = residueMappings.concat(
+                                    alignment.residueMapping
+                                );
+                            });
 
-                        residueMappingCacheData = residueMappings.map((residueMapping: ResidueMapping) => ({
-                            status: "complete",
-                            data: residueMapping
-                        } as CacheData<ResidueMapping>));
-                    }
+                            residueMappingCacheData = residueMappings.map(
+                                (residueMapping: ResidueMapping) =>
+                                    ({
+                                        status: 'complete',
+                                        data: residueMapping,
+                                    } as CacheData<ResidueMapping>)
+                            );
+                        }
 
-                    return residueMappingCacheData;
+                        return residueMappingCacheData;
+                    },
+                    onError: (err: Error) => {
+                        // fail silently
+                    },
                 },
-                onError: (err: Error) => {
-                    // fail silently
-                }
-            }, this.defaultData(query));
+                this.defaultData(query)
+            );
         }
 
         return this.queries[key];
     }
 
     private generateQueryKey(query: ResidueMappingQuery): string {
-        return `${query.uniprotId}_${query.pdbId}_${query.chainId}_${query.uniprotPositions.join(",")}`;
+        return `${query.uniprotId}_${query.pdbId}_${
+            query.chainId
+        }_${query.uniprotPositions.join(',')}`;
     }
 
-    private defaultData(query: ResidueMappingQuery): Array<CacheData<ResidueMapping>|null>
-    {
+    private defaultData(
+        query: ResidueMappingQuery
+    ): Array<CacheData<ResidueMapping> | null> {
         return [null];
     }
 }
diff --git a/src/shared/cache/SampleListsInStudyCache.ts b/src/shared/cache/SampleListsInStudyCache.ts
index 096d08fedd9..8e843d60b81 100644
--- a/src/shared/cache/SampleListsInStudyCache.ts
+++ b/src/shared/cache/SampleListsInStudyCache.ts
@@ -1,19 +1,22 @@
-import client from "../api/cbioportalClientInstance";
-import { SampleList } from "shared/api/generated/CBioPortalAPI";
-import MobxPromiseCache from "shared/lib/MobxPromiseCache";
+import client from '../api/cbioportalClientInstance';
+import { SampleList } from 'shared/api/generated/CBioPortalAPI';
+import MobxPromiseCache from 'shared/lib/MobxPromiseCache';
 
 async function fetch(studyId: string) {
     return await client.getAllSampleListsInStudyUsingGET({
         studyId: studyId,
-        projection: 'DETAILED'
-    })
+        projection: 'DETAILED',
+    });
 }
 
-export default class SampleListsInStudyCache extends MobxPromiseCache<string, SampleList[]> {
+export default class SampleListsInStudyCache extends MobxPromiseCache<
+    string,
+    SampleList[]
+> {
     constructor() {
         super(
             q => ({
-                invoke: () => fetch(q)
+                invoke: () => fetch(q),
             }),
             q => q
         );
diff --git a/src/shared/cache/TreatmentMolecularDataCache.ts b/src/shared/cache/TreatmentMolecularDataCache.ts
index 8a0adfb1075..baf725ae367 100644
--- a/src/shared/cache/TreatmentMolecularDataCache.ts
+++ b/src/shared/cache/TreatmentMolecularDataCache.ts
@@ -1,13 +1,21 @@
-import LazyMobXCache, {AugmentedData} from "../lib/LazyMobXCache";
-import internalClient from "shared/api/cbioportalInternalClientInstance";
-import client from "shared/api/cbioportalClientInstance";
-import _ from "lodash";
-import {IDataQueryFilter} from "../lib/StoreUtils";
-import { SampleMolecularIdentifier, GenericAssayDataMultipleStudyFilter, GenericAssayData, GenericAssayDataFilter } from "shared/api/generated/CBioPortalAPI";
-import { fetchTreatmentData, TreatmentMolecularData } from "shared/lib/GenericAssayUtils/TreatmentUtils";
+import LazyMobXCache, { AugmentedData } from '../lib/LazyMobXCache';
+import internalClient from 'shared/api/cbioportalInternalClientInstance';
+import client from 'shared/api/cbioportalClientInstance';
+import _ from 'lodash';
+import { IDataQueryFilter } from '../lib/StoreUtils';
+import {
+    SampleMolecularIdentifier,
+    GenericAssayDataMultipleStudyFilter,
+    GenericAssayData,
+    GenericAssayDataFilter,
+} from 'shared/api/generated/CBioPortalAPI';
+import {
+    fetchTreatmentData,
+    TreatmentMolecularData,
+} from 'shared/lib/GenericAssayUtils/TreatmentUtils';
 
 export type TreatmentMolecularDataEnhanced = TreatmentMolecularData & {
-    thresholdType?: ">"|"<";
+    thresholdType?: '>' | '<';
 };
 
 interface IQuery {
@@ -16,26 +24,31 @@ interface IQuery {
 }
 
 type SampleFilterByProfile = {
-    [molecularProfileId: string]: IDataQueryFilter
+    [molecularProfileId: string]: IDataQueryFilter;
 };
 
 function queryToKey(q: IQuery) {
     return `${q.molecularProfileId}~${q.treatmentId}`;
 }
 
-function dataToKey(d:TreatmentMolecularData[], q:IQuery) {
+function dataToKey(d: TreatmentMolecularData[], q: IQuery) {
     return `${q.molecularProfileId}~${q.treatmentId}`;
 }
 
 /**
 /* Pairs each IQuery with an (array-wrapped) array of any matching data.
 */
-function augmentQueryResults(queries: IQuery[], results: TreatmentMolecularData[][]) {
-    const keyedAugments: {[key: string]: AugmentedData<TreatmentMolecularDataEnhanced[], IQuery>} = {};
+function augmentQueryResults(
+    queries: IQuery[],
+    results: TreatmentMolecularData[][]
+) {
+    const keyedAugments: {
+        [key: string]: AugmentedData<TreatmentMolecularDataEnhanced[], IQuery>;
+    } = {};
     for (const query of queries) {
         keyedAugments[queryToKey(query)] = {
             data: [[]],
-            meta: query
+            meta: query,
         };
     }
     for (const queryResult of results) {
@@ -44,7 +57,7 @@ function augmentQueryResults(queries: IQuery[], results: TreatmentMolecularData[
             keyedAugments[
                 queryToKey({
                     molecularProfileId: datum.geneticProfileId,
-                    treatmentId: datum.treatmentId
+                    treatmentId: datum.treatmentId,
                 })
             ].data[0].push(datum);
         }
@@ -55,9 +68,11 @@ function augmentQueryResults(queries: IQuery[], results: TreatmentMolecularData[
 // Values are passed as strings from the REST facility
 // check for value threshold indicators ('>' or '<') to appear in front of values
 // and convert to a numeric value and a separate value threshold indicator
-function handleValueThreshold(datum:TreatmentMolecularDataEnhanced):TreatmentMolecularDataEnhanced {
-
-    if (! datum.thresholdType) { // this is to prevent repeated extraction of '>' and '<' symbols
+function handleValueThreshold(
+    datum: TreatmentMolecularDataEnhanced
+): TreatmentMolecularDataEnhanced {
+    if (!datum.thresholdType) {
+        // this is to prevent repeated extraction of '>' and '<' symbols
         const matches = /([><]?)(.+)/.exec(datum.value);
         datum.thresholdType = undefined;
         if (matches) {
@@ -71,24 +86,31 @@ function handleValueThreshold(datum:TreatmentMolecularDataEnhanced):TreatmentMol
             }
         }
     }
-    
+
     return datum;
 }
 
 async function fetch(
-    queries:IQuery[],
+    queries: IQuery[],
     sampleFilterByProfile: SampleFilterByProfile
 ): Promise<AugmentedData<TreatmentMolecularData[], IQuery>[]> {
     const treatmentIdsByProfile = _.mapValues(
         _.groupBy(queries, q => q.molecularProfileId),
         profileQueries => profileQueries.map(q => q.treatmentId)
     );
-    const treatmentDataResult = await fetchTreatmentData(treatmentIdsByProfile, sampleFilterByProfile);
+    const treatmentDataResult = await fetchTreatmentData(
+        treatmentIdsByProfile,
+        sampleFilterByProfile
+    );
     return augmentQueryResults(queries, treatmentDataResult);
 }
 
-export default class TreatmentMolecularDataCache extends LazyMobXCache<TreatmentMolecularData[], IQuery, IQuery>{
+export default class TreatmentMolecularDataCache extends LazyMobXCache<
+    TreatmentMolecularData[],
+    IQuery,
+    IQuery
+> {
     constructor(molecularProfileIdToSampleFilter: SampleFilterByProfile) {
         super(queryToKey, dataToKey, fetch, molecularProfileIdToSampleFilter);
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/cache/VariantCountCache.ts b/src/shared/cache/VariantCountCache.ts
index 5cd28e04516..8e749f7ee37 100644
--- a/src/shared/cache/VariantCountCache.ts
+++ b/src/shared/cache/VariantCountCache.ts
@@ -1,31 +1,41 @@
-import LazyMobXCache from "shared/lib/LazyMobXCache";
-import client from "shared/api/cbioportalInternalClientInstance";
-import {VariantCount, VariantCountIdentifier} from "shared/api/generated/CBioPortalAPIInternal";
+import LazyMobXCache from 'shared/lib/LazyMobXCache';
+import client from 'shared/api/cbioportalInternalClientInstance';
+import {
+    VariantCount,
+    VariantCountIdentifier,
+} from 'shared/api/generated/CBioPortalAPIInternal';
 
-function getKey<T extends { entrezGeneId:number, keyword?:string}>(obj:T):string {
+function getKey<T extends { entrezGeneId: number; keyword?: string }>(
+    obj: T
+): string {
     if (obj.keyword) {
-        return obj.entrezGeneId+"~"+obj.keyword;
+        return obj.entrezGeneId + '~' + obj.keyword;
     } else {
-        return obj.entrezGeneId+"";
+        return obj.entrezGeneId + '';
     }
 }
 
-function fetch(queries:VariantCountIdentifier[], mutationMolecularProfileId:string|undefined):Promise<VariantCount[]> {
+function fetch(
+    queries: VariantCountIdentifier[],
+    mutationMolecularProfileId: string | undefined
+): Promise<VariantCount[]> {
     if (!mutationMolecularProfileId) {
-        return Promise.reject("No mutation molecular profile id given");
+        return Promise.reject('No mutation molecular profile id given');
     } else if (queries.length > 0) {
         return client.fetchVariantCountsUsingPOST({
             molecularProfileId: mutationMolecularProfileId,
-            variantCountIdentifiers: queries
+            variantCountIdentifiers: queries,
         });
     } else {
         return Promise.resolve([]);
     }
 }
 
-export default class VariantCountCache extends LazyMobXCache<VariantCount, VariantCountIdentifier> {
-    constructor(mutationMolecularProfileId:string|undefined) {
-        super(getKey, getKey,
-            fetch, mutationMolecularProfileId);
+export default class VariantCountCache extends LazyMobXCache<
+    VariantCount,
+    VariantCountIdentifier
+> {
+    constructor(mutationMolecularProfileId: string | undefined) {
+        super(getKey, getKey, fetch, mutationMolecularProfileId);
     }
 }
diff --git a/src/shared/components/AjaxErrorModal.tsx b/src/shared/components/AjaxErrorModal.tsx
index 3a060dbdb46..5f1796be65e 100644
--- a/src/shared/components/AjaxErrorModal.tsx
+++ b/src/shared/components/AjaxErrorModal.tsx
@@ -8,20 +8,34 @@ export interface IAjaxErrorModalProps {
     troubleshooting?: string[];
 }
 
-export default class AjaxErrorModal extends React.Component<IAjaxErrorModalProps, {}> {
-
-    private defaultTitle = "Sorry, something went wrong!";
-    private defaultTroubleshooting = ["Check that your URL parameters are valid.", "Make sure you are connected to the internet."];
+export default class AjaxErrorModal extends React.Component<
+    IAjaxErrorModalProps,
+    {}
+> {
+    private defaultTitle = 'Sorry, something went wrong!';
+    private defaultTroubleshooting = [
+        'Check that your URL parameters are valid.',
+        'Make sure you are connected to the internet.',
+    ];
     public render() {
         return (
             <Modal show={this.props.show} onHide={this.props.onHide}>
                 <Modal.Header closeButton>
-                    <Modal.Title>{typeof this.props.title === "undefined" ? this.defaultTitle : this.props.title}</Modal.Title>
+                    <Modal.Title>
+                        {typeof this.props.title === 'undefined'
+                            ? this.defaultTitle
+                            : this.props.title}
+                    </Modal.Title>
                 </Modal.Header>
                 <Modal.Body>
                     <p>Troubleshooting:</p>
                     <ul>
-                        {(this.props.troubleshooting || this.defaultTroubleshooting).map(s=>(<li>{s}</li>))}
+                        {(
+                            this.props.troubleshooting ||
+                            this.defaultTroubleshooting
+                        ).map(s => (
+                            <li>{s}</li>
+                        ))}
                     </ul>
                 </Modal.Body>
             </Modal>
diff --git a/src/shared/components/ChartContainer/ChartContainer.tsx b/src/shared/components/ChartContainer/ChartContainer.tsx
index b6e5a4c5cc8..3ed8e2e547c 100644
--- a/src/shared/components/ChartContainer/ChartContainer.tsx
+++ b/src/shared/components/ChartContainer/ChartContainer.tsx
@@ -1,31 +1,34 @@
 import * as React from 'react';
-import {DownloadControls} from "cbioportal-frontend-commons";
+import { DownloadControls } from 'cbioportal-frontend-commons';
 
 interface IChartContainer {
-    getSVGElement?:()=>SVGElement|null;
-    exportFileName?:string;
+    getSVGElement?: () => SVGElement | null;
+    exportFileName?: string;
 }
 
-export default class ChartContainer extends React.Component<IChartContainer, {}> {
-
-    render(){
-
-        return  (
+export default class ChartContainer extends React.Component<
+    IChartContainer,
+    {}
+> {
+    render() {
+        return (
             <div className="borderedChart inlineBlock">
                 <DownloadControls
-                    filename={this.props.exportFileName || "chart-download"}
+                    filename={this.props.exportFileName || 'chart-download'}
                     dontFade={true}
                     getSvg={this.props.getSVGElement!}
-                    type='button'
-                    style={{position:"absolute", top:10, right:10, zIndex:10}}
+                    type="button"
+                    style={{
+                        position: 'absolute',
+                        top: 10,
+                        right: 10,
+                        zIndex: 10,
+                    }}
                 />
-                <div style={{ overflowX:'auto', overflowY:'hidden'}}>
+                <div style={{ overflowX: 'auto', overflowY: 'hidden' }}>
                     {this.props.children}
                 </div>
-         </div>
-        )
-
+            </div>
+        );
     }
-
-
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/ErrorIcon.tsx b/src/shared/components/ErrorIcon.tsx
index 607cd0c76af..0444df1c37d 100644
--- a/src/shared/components/ErrorIcon.tsx
+++ b/src/shared/components/ErrorIcon.tsx
@@ -1,25 +1,27 @@
-import * as React from "react";
-import {DefaultTooltip} from "cbioportal-frontend-commons";
+import * as React from 'react';
+import { DefaultTooltip } from 'cbioportal-frontend-commons';
 
 export interface IErrorIconProps {
-    tooltip:JSX.Element;
-    style?:any;
+    tooltip: JSX.Element;
+    style?: any;
 }
 
 export default class ErrorIcon extends React.Component<IErrorIconProps, {}> {
     render() {
         return (
-            <DefaultTooltip
-                overlay={this.props.tooltip}
-            >
+            <DefaultTooltip overlay={this.props.tooltip}>
                 <i
                     className="fa fa-md fa-exclamation-triangle"
-                    style={Object.assign({}, {
-                        color: "#BB1700",
-                        cursor: "pointer",
-                    }, this.props.style || {})}
+                    style={Object.assign(
+                        {},
+                        {
+                            color: '#BB1700',
+                            cursor: 'pointer',
+                        },
+                        this.props.style || {}
+                    )}
                 />
             </DefaultTooltip>
         );
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/ErrorMessage.tsx b/src/shared/components/ErrorMessage.tsx
index 635446e7709..a555bfed563 100644
--- a/src/shared/components/ErrorMessage.tsx
+++ b/src/shared/components/ErrorMessage.tsx
@@ -1,29 +1,42 @@
-import * as React from "react";
-import {observer} from "mobx-react";
-import ErrorIcon from "./ErrorIcon";
-import AppConfig from "appConfig";
+import * as React from 'react';
+import { observer } from 'mobx-react';
+import ErrorIcon from './ErrorIcon';
+import AppConfig from 'appConfig';
 
 export interface IErrorMessageProps {
-    message?:string;
+    message?: string;
 }
 
 @observer
-export default class ErrorMessage extends React.Component<IErrorMessageProps, {}> {
+export default class ErrorMessage extends React.Component<
+    IErrorMessageProps,
+    {}
+> {
     static defaultProps = {
-        message: "Error encountered."
+        message: 'Error encountered.',
     };
 
     render() {
-        return <span>
-            <i
-                className="fa fa-md fa-exclamation-triangle"
-                style={{
-                    color: "#BB1700",
-                    cursor: "pointer",
-                    marginRight:7
-                }}
-            />
-            {this.props.message!} Please let us know about this error and how you got here at <b style={{ whiteSpace: "nowrap" }}><a href={`mailto:${AppConfig.serverConfig.skin_email_contact}`}>{AppConfig.serverConfig.skin_email_contact}</a></b>
-        </span>
+        return (
+            <span>
+                <i
+                    className="fa fa-md fa-exclamation-triangle"
+                    style={{
+                        color: '#BB1700',
+                        cursor: 'pointer',
+                        marginRight: 7,
+                    }}
+                />
+                {this.props.message!} Please let us know about this error and
+                how you got here at{' '}
+                <b style={{ whiteSpace: 'nowrap' }}>
+                    <a
+                        href={`mailto:${AppConfig.serverConfig.skin_email_contact}`}
+                    >
+                        {AppConfig.serverConfig.skin_email_contact}
+                    </a>
+                </b>
+            </span>
+        );
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/FlexAlignedCheckbox.tsx b/src/shared/components/FlexAlignedCheckbox.tsx
index fc252f37dfb..ae3623c3ba5 100644
--- a/src/shared/components/FlexAlignedCheckbox.tsx
+++ b/src/shared/components/FlexAlignedCheckbox.tsx
@@ -1,30 +1,41 @@
-import * as React from "react";
-import {observer} from "mobx-react";
+import * as React from 'react';
+import { observer } from 'mobx-react';
 
 export interface ICheckboxProps {
-    value?:string;
-    checked:boolean;
-    onClick?:()=>void;
-    label:any;
-    style?:any;
+    value?: string;
+    checked: boolean;
+    onClick?: () => void;
+    label: any;
+    style?: any;
 }
 
 @observer
-export default class FlexAlignedCheckbox extends React.Component<ICheckboxProps, {}> {
+export default class FlexAlignedCheckbox extends React.Component<
+    ICheckboxProps,
+    {}
+> {
     render() {
         return (
-            <div className="checkbox" style={Object.assign({display:"flex", alignItems:"center"}, this.props.style)}>
+            <div
+                className="checkbox"
+                style={Object.assign(
+                    { display: 'flex', alignItems: 'center' },
+                    this.props.style
+                )}
+            >
                 <label>
                     <input
                         type="checkbox"
                         value={this.props.value}
                         checked={this.props.checked}
                         onClick={this.props.onClick}
-                        style={{marginTop:1}}
+                        style={{ marginTop: 1 }}
                     />
                 </label>
-                {typeof this.props.label === "function" ? this.props.label() : this.props.label}
+                {typeof this.props.label === 'function'
+                    ? this.props.label()
+                    : this.props.label}
             </div>
         );
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/GenePanelModal/GenePanelModal.spec.tsx b/src/shared/components/GenePanelModal/GenePanelModal.spec.tsx
index cb7b67fc6f5..689c2af985b 100644
--- a/src/shared/components/GenePanelModal/GenePanelModal.spec.tsx
+++ b/src/shared/components/GenePanelModal/GenePanelModal.spec.tsx
@@ -4,29 +4,40 @@ import { assert } from 'chai';
 import { shallow } from 'enzyme';
 
 describe('GenePanelModal', () => {
-  let wrapper:any;
-  const props = {
-    panelName: "TESTPANEL1",
-    show: true,
-    onHide: () => {},
-    isLoading: true
-  }
-  
-  after(() => {
-    wrapper.unmount();
-  });
-  
-  it('only renders modal body when isLoading is false', () => {
-    wrapper = shallow(<GenePanelModal {...props}/>);
-    assert(wrapper.find('[data-test="gene-panel-modal-body"]').length === 0);
-    
-    wrapper.unmount();
-    wrapper = shallow(<GenePanelModal {...props} isLoading={false} />);
-    assert(wrapper.find('[data-test="gene-panel-modal-body"]').length === 1);
-  });
-  
-  it('renders panel modal name', () => {
-    const panelTitle = wrapper.find('[data-test="gene-panel-modal-title"]').at(0);
-    assert(panelTitle.dive().text().includes('TESTPANEL1'));
-  });
-})
+    let wrapper: any;
+    const props = {
+        panelName: 'TESTPANEL1',
+        show: true,
+        onHide: () => {},
+        isLoading: true,
+    };
+
+    after(() => {
+        wrapper.unmount();
+    });
+
+    it('only renders modal body when isLoading is false', () => {
+        wrapper = shallow(<GenePanelModal {...props} />);
+        assert(
+            wrapper.find('[data-test="gene-panel-modal-body"]').length === 0
+        );
+
+        wrapper.unmount();
+        wrapper = shallow(<GenePanelModal {...props} isLoading={false} />);
+        assert(
+            wrapper.find('[data-test="gene-panel-modal-body"]').length === 1
+        );
+    });
+
+    it('renders panel modal name', () => {
+        const panelTitle = wrapper
+            .find('[data-test="gene-panel-modal-title"]')
+            .at(0);
+        assert(
+            panelTitle
+                .dive()
+                .text()
+                .includes('TESTPANEL1')
+        );
+    });
+});
diff --git a/src/shared/components/GenePanelModal/GenePanelModal.tsx b/src/shared/components/GenePanelModal/GenePanelModal.tsx
index a3153bd9e52..40dec9e86bc 100644
--- a/src/shared/components/GenePanelModal/GenePanelModal.tsx
+++ b/src/shared/components/GenePanelModal/GenePanelModal.tsx
@@ -23,7 +23,7 @@ export default class GenePanelModal extends React.Component<
         // passing of the event object to the parent component
         this.props.onHide();
     }
-    
+
     render() {
         return (
             <Modal
diff --git a/src/shared/components/GeneSelectionBox/GeneSelectionBoxUtils.spec.ts b/src/shared/components/GeneSelectionBox/GeneSelectionBoxUtils.spec.ts
index 68a68d1a2d5..3e2e4a020c3 100644
--- a/src/shared/components/GeneSelectionBox/GeneSelectionBoxUtils.spec.ts
+++ b/src/shared/components/GeneSelectionBox/GeneSelectionBoxUtils.spec.ts
@@ -4,7 +4,15 @@ import { getFocusOutText } from './GeneSelectionBoxUtils';
 describe('GeneSelectionBoxUtils', () => {
     it('should return correct gene box focus out text', () => {
         assert.equal(getFocusOutText([]), '', 'when no genes selected');
-        assert.equal(getFocusOutText(['TP53']), 'TP53', 'when selected genes can fit in 13 characters');
-        assert.equal(getFocusOutText(['TP53', 'CDKN2A', 'EGFR_PY992']), 'TP53 CDKN2A and 1 more', 'when selected genes cannott fit in 13 characters');
+        assert.equal(
+            getFocusOutText(['TP53']),
+            'TP53',
+            'when selected genes can fit in 13 characters'
+        );
+        assert.equal(
+            getFocusOutText(['TP53', 'CDKN2A', 'EGFR_PY992']),
+            'TP53 CDKN2A and 1 more',
+            'when selected genes cannott fit in 13 characters'
+        );
     });
-});
\ No newline at end of file
+});
diff --git a/src/shared/components/GeneSelectionBox/GeneSymbolValidator.spec.tsx b/src/shared/components/GeneSelectionBox/GeneSymbolValidator.spec.tsx
index a07e4dac74a..c1ea76d5107 100644
--- a/src/shared/components/GeneSelectionBox/GeneSymbolValidator.spec.tsx
+++ b/src/shared/components/GeneSelectionBox/GeneSymbolValidator.spec.tsx
@@ -1,11 +1,12 @@
-import {assert} from 'chai';
-import {mount} from "enzyme";
-import * as React from "react";
-import GeneSymbolValidator, {IGeneSymbolValidatorProps} from './GeneSymbolValidator';
+import { assert } from 'chai';
+import { mount } from 'enzyme';
+import * as React from 'react';
+import GeneSymbolValidator, {
+    IGeneSymbolValidatorProps,
+} from './GeneSymbolValidator';
 import sinon from 'sinon';
 
 describe('GeneSymbolValidator', () => {
-
     let props: IGeneSymbolValidatorProps;
     let wrapper: any;
     let instance: GeneSymbolValidator;
@@ -13,18 +14,17 @@ describe('GeneSymbolValidator', () => {
     beforeEach(() => {
         props = {
             oql: {
-                query: [{gene: 'TP53', alterations: false}]
+                query: [{ gene: 'TP53', alterations: false }],
             },
             geneQuery: 'TP53',
             skipGeneValidation: false,
-            replaceGene: ()=>{},
+            replaceGene: () => {},
             updateGeneQuery: () => null,
         } as IGeneSymbolValidatorProps;
         wrapper = mount(<GeneSymbolValidator {...props} />);
         instance = wrapper.instance() as GeneSymbolValidator;
     });
-    afterEach(() => {
-    });
+    afterEach(() => {});
 
     it('Validate geneQuery properly', () => {
         sinon.stub(instance, 'genes').get(() => {
@@ -34,17 +34,19 @@ describe('GeneSymbolValidator', () => {
                 isError: false,
                 isComplete: true,
                 result: {
-                    found: [{
-                        entrezGeneId: 7157,
-                        hugoGeneSymbol: "TP53",
-                        type: "protein-coding",
-                        cytoband: "17p13.1",
-                        length: 19149,
-                        chromosome: "17"
-                    }],
-                    suggestions: []
+                    found: [
+                        {
+                            entrezGeneId: 7157,
+                            hugoGeneSymbol: 'TP53',
+                            type: 'protein-coding',
+                            cytoband: '17p13.1',
+                            length: 19149,
+                            chromosome: '17',
+                        },
+                    ],
+                    suggestions: [],
                 },
-                error: undefined
+                error: undefined,
             };
         });
 
@@ -52,7 +54,8 @@ describe('GeneSymbolValidator', () => {
 
         assert.equal(
             wrapper.find('#geneBoxValidationStatus').text(),
-            "All gene symbols are valid.");
+            'All gene symbols are valid.'
+        );
     });
 
     it('api error', () => {
@@ -62,8 +65,8 @@ describe('GeneSymbolValidator', () => {
                 isPending: false,
                 isError: true,
                 isComplete: true,
-                result: {found: [], suggestions: []},
-                error: new Error('error')
+                result: { found: [], suggestions: [] },
+                error: new Error('error'),
             };
         });
 
@@ -71,6 +74,7 @@ describe('GeneSymbolValidator', () => {
 
         assert.equal(
             wrapper.find('#geneBoxValidationStatus').text(),
-            "Unable to validate gene symbols.");
+            'Unable to validate gene symbols.'
+        );
     });
 });
diff --git a/src/shared/components/GeneSelectionBox/GeneSymbolValidator.tsx b/src/shared/components/GeneSelectionBox/GeneSymbolValidator.tsx
index 209fe120a56..a96ab3f4e2a 100644
--- a/src/shared/components/GeneSelectionBox/GeneSymbolValidator.tsx
+++ b/src/shared/components/GeneSelectionBox/GeneSymbolValidator.tsx
@@ -33,7 +33,7 @@ export interface IGeneSymbolValidatorProps {
         oql: OQL
     ) => void;
     wrap?: boolean;
-    replaceGene:(oldSymbol: string, newSymbol: string)=>void;
+    replaceGene: (oldSymbol: string, newSymbol: string) => void;
 }
 
 export type GeneValidationResult = {
diff --git a/src/shared/components/GeneSelectionBox/GeneSymbolValidatorMessage.spec.tsx b/src/shared/components/GeneSelectionBox/GeneSymbolValidatorMessage.spec.tsx
index 0e3366a2609..1b73dc70eaf 100644
--- a/src/shared/components/GeneSelectionBox/GeneSymbolValidatorMessage.spec.tsx
+++ b/src/shared/components/GeneSelectionBox/GeneSymbolValidatorMessage.spec.tsx
@@ -1,116 +1,125 @@
-import {assert, expect} from 'chai';
-import {mount, shallow} from "enzyme";
-import * as React from "react";
-import GeneSymbolValidatorMessage, {GeneSymbolValidatorMessageProps} from "shared/components/GeneSelectionBox/GeneSymbolValidatorMessage";
+import { assert, expect } from 'chai';
+import { mount, shallow } from 'enzyme';
+import * as React from 'react';
+import GeneSymbolValidatorMessage, {
+    GeneSymbolValidatorMessageProps,
+} from 'shared/components/GeneSelectionBox/GeneSymbolValidatorMessage';
 
 describe('GeneSymbolValidatorMessage', () => {
-
     let props: GeneSymbolValidatorMessageProps;
 
     beforeEach(() => {
         props = {
             oql: {
-                query: []
+                query: [],
             },
             validatingGenes: false,
             genes: {
                 found: [],
-                suggestions: []
+                suggestions: [],
             },
-            replaceGene: ()=>null,
+            replaceGene: () => null,
         } as GeneSymbolValidatorMessageProps;
     });
-    afterEach(() => {
-    });
+    afterEach(() => {});
 
     it('Valid input', () => {
-
         props.oql = {
-            query: [{gene: 'TP53', alterations: false}]
+            query: [{ gene: 'TP53', alterations: false }],
         };
         props.genes = {
-            found: [{
-                geneticEntityId:5808,
-                entrezGeneId: 7157,
-                hugoGeneSymbol: "TP53",
-                type: "protein-coding",
-            }], suggestions: []
+            found: [
+                {
+                    geneticEntityId: 5808,
+                    entrezGeneId: 7157,
+                    hugoGeneSymbol: 'TP53',
+                    type: 'protein-coding',
+                },
+            ],
+            suggestions: [],
         };
         const wrapper = mount(<GeneSymbolValidatorMessage {...props} />);
         assert.equal(
             wrapper.find('#geneBoxValidationStatus').text(),
-            "All gene symbols are valid.");
+            'All gene symbols are valid.'
+        );
 
-        wrapper.setProps({errorMessageOnly: true});
+        wrapper.setProps({ errorMessageOnly: true });
 
-        assert.equal(wrapper.find('#geneBoxValidationStatus').text(), "");
+        assert.equal(wrapper.find('#geneBoxValidationStatus').text(), '');
     });
 
     it('invalid input', () => {
         const wrapper = mount(<GeneSymbolValidatorMessage {...props} />);
-        assert.equal(wrapper.find('#geneBoxValidationStatus').text(), "");
+        assert.equal(wrapper.find('#geneBoxValidationStatus').text(), '');
 
-        wrapper.setProps({oql: new Error("Error")})
+        wrapper.setProps({ oql: new Error('Error') });
         assert.equal(
             wrapper.find('#geneBoxValidationStatus').text(),
-            "Cannot validate gene symbols because of invalid OQL. Error");
-
+            'Cannot validate gene symbols because of invalid OQL. Error'
+        );
     });
 
     it('genes api error', async () => {
         props.oql = {
-            query: [{gene: 'TP53', alterations: false}]
+            query: [{ gene: 'TP53', alterations: false }],
         };
-        props.genes = new Error("Error");
+        props.genes = new Error('Error');
         const wrapper = mount(<GeneSymbolValidatorMessage {...props} />);
         assert.equal(
             wrapper.find('#geneBoxValidationStatus').text(),
-            "Unable to validate gene symbols.");
+            'Unable to validate gene symbols.'
+        );
     });
 
     it('genes api pending', () => {
         props.oql = {
-            query: [{gene: 'TP53', alterations: false}]
+            query: [{ gene: 'TP53', alterations: false }],
         };
         props.validatingGenes = true;
         const wrapper = mount(<GeneSymbolValidatorMessage {...props} />);
         assert.equal(
             wrapper.find('#geneBoxValidationStatus').text(),
-            "Validating gene symbols...");
-
+            'Validating gene symbols...'
+        );
     });
 
     it('invalid genes with no suggestions', () => {
         props.oql = {
-            query: [{gene: 'TP53', alterations: false}]
+            query: [{ gene: 'TP53', alterations: false }],
         };
-        props.genes = {found: [], suggestions: [{alias: 'TP5', genes: []}]}
+        props.genes = { found: [], suggestions: [{ alias: 'TP5', genes: [] }] };
         const wrapper = mount(<GeneSymbolValidatorMessage {...props} />);
         assert.equal(
             wrapper.find('#geneBoxValidationStatus').text(),
-            "Invalid gene symbols.TP5");
+            'Invalid gene symbols.TP5'
+        );
     });
 
     it('invalid genes with suggestions', () => {
         props.oql = {
-            query: [{gene: 'AAA', alterations: false}]
+            query: [{ gene: 'AAA', alterations: false }],
         };
         props.genes = {
-            found: [], suggestions: [{
-                alias: 'AAA',
-                genes: [
-                    {
-                        "geneticEntityId":296,
-                        "entrezGeneId": 351,
-                        "hugoGeneSymbol": "APP",
-                        "type": "protein-coding"
-                    }
-                ]
-            }]
+            found: [],
+            suggestions: [
+                {
+                    alias: 'AAA',
+                    genes: [
+                        {
+                            geneticEntityId: 296,
+                            entrezGeneId: 351,
+                            hugoGeneSymbol: 'APP',
+                            type: 'protein-coding',
+                        },
+                    ],
+                },
+            ],
         };
         const wrapper = mount(<GeneSymbolValidatorMessage {...props} />);
         assert.equal(
             wrapper.find('#geneBoxValidationStatus').text(),
-            "Invalid gene symbols.AAA: APP");
+            'Invalid gene symbols.AAA: APP'
+        );
     });
 });
diff --git a/src/shared/components/GeneSelectionBox/GeneSymbolValidatorMessage.tsx b/src/shared/components/GeneSelectionBox/GeneSymbolValidatorMessage.tsx
index c82bbeb4d1c..c53320ab57f 100644
--- a/src/shared/components/GeneSelectionBox/GeneSymbolValidatorMessage.tsx
+++ b/src/shared/components/GeneSelectionBox/GeneSymbolValidatorMessage.tsx
@@ -7,7 +7,7 @@ import { GeneReplacement } from 'shared/components/query/QueryStore';
 import ReactSelect from 'react-select1';
 import classNames from 'classnames';
 import * as _ from 'lodash';
-import {DropdownButton, MenuItem} from "react-bootstrap";
+import { DropdownButton, MenuItem } from 'react-bootstrap';
 
 export type GeneSymbolValidatorMessageProps = {
     errorMessageOnly?: boolean;
@@ -75,14 +75,19 @@ const RenderSuggestion = function(props: RenderSuggestionProps) {
                 title="Select symbol"
                 id={`geneReplace_${props.alias}`}
             >
-                {
-                    options.map((item, i)=>{
-                        return <MenuItem onClick={()=>{ props.replaceGene(props.alias, item.value)  }} eventKey={i+1}>{item.label}</MenuItem>
-                    })
-                }
+                {options.map((item, i) => {
+                    return (
+                        <MenuItem
+                            onClick={() => {
+                                props.replaceGene(props.alias, item.value);
+                            }}
+                            eventKey={i + 1}
+                        >
+                            {item.label}
+                        </MenuItem>
+                    );
+                })}
             </DropdownButton>
-
-
         </div>
     );
 };
@@ -138,27 +143,33 @@ const GeneSymbolValidatorMessageChild = (
                     <span>Invalid gene symbols.</span>
                 </div>
 
-                {
-                    props.genes.suggestions.map((suggestion, index) =>
+                {props.genes.suggestions.map((suggestion, index) => (
                     <RenderSuggestion
                         key={index}
                         genes={suggestion.genes}
                         alias={suggestion.alias}
                         replaceGene={props.replaceGene}
-                    />)
-                }
+                    />
+                ))}
             </div>
         );
     }
 
     // TDOD: remove this condition once multiple entrez gene ids is supported
-    const hugoGeneSymbolSet = _.groupBy(props.genes.found, gene => gene.hugoGeneSymbol);
-    const genesWithMultipleEntrezGeneIds = _.reduce(hugoGeneSymbolSet, (acc, genes, hugoGeneSymbol) => {
-        if (genes.length > 1) {
-            acc.push(hugoGeneSymbol);
-        }
-        return acc;
-    }, [] as string[]);
+    const hugoGeneSymbolSet = _.groupBy(
+        props.genes.found,
+        gene => gene.hugoGeneSymbol
+    );
+    const genesWithMultipleEntrezGeneIds = _.reduce(
+        hugoGeneSymbolSet,
+        (acc, genes, hugoGeneSymbol) => {
+            if (genes.length > 1) {
+                acc.push(hugoGeneSymbol);
+            }
+            return acc;
+        },
+        [] as string[]
+    );
 
     if (genesWithMultipleEntrezGeneIds.length > 0) {
         return (
@@ -171,7 +182,10 @@ const GeneSymbolValidatorMessageChild = (
                         className={styles.icon}
                         name="exclamation-circle"
                     />
-                    <span>The portal does not currently support the following gene(s):</span>
+                    <span>
+                        The portal does not currently support the following
+                        gene(s):
+                    </span>
                 </div>
 
                 {genesWithMultipleEntrezGeneIds.map((gene, index) => (
@@ -221,7 +235,10 @@ class GeneSymbolValidatorMessage extends React.Component<
 
         return (
             <div id="geneBoxValidationStatus">
-                <GeneSymbolValidatorMessageChild replaceGene={this.props.replaceGene} {...this.props} />
+                <GeneSymbolValidatorMessageChild
+                    replaceGene={this.props.replaceGene}
+                    {...this.props}
+                />
             </div>
         );
     }
diff --git a/src/shared/components/GeneSelectionBox/OQLTextArea.tsx b/src/shared/components/GeneSelectionBox/OQLTextArea.tsx
index 01ec2820ed7..1ed0881c6e5 100644
--- a/src/shared/components/GeneSelectionBox/OQLTextArea.tsx
+++ b/src/shared/components/GeneSelectionBox/OQLTextArea.tsx
@@ -12,7 +12,11 @@ import {
 } from 'mobx';
 import { Gene } from 'shared/api/generated/CBioPortalAPI';
 import { SingleGeneQuery } from 'shared/lib/oql/oql-parser';
-import {GeneReplacement, Focus, normalizeQuery} from 'shared/components/query/QueryStore';
+import {
+    GeneReplacement,
+    Focus,
+    normalizeQuery,
+} from 'shared/components/query/QueryStore';
 import {
     getEmptyGeneValidationResult,
     getFocusOutText,
@@ -22,7 +26,7 @@ import GeneSymbolValidator, {
     GeneValidationResult,
 } from './GeneSymbolValidator';
 import autobind from 'autobind-decorator';
-import bind from "bind-decorator";
+import bind from 'bind-decorator';
 
 export interface IGeneSelectionBoxProps {
     focus?: Focus;
@@ -30,7 +34,7 @@ export interface IGeneSelectionBoxProps {
     validateInputGeneQuery?: boolean;
     location?: GeneBoxType;
     textBoxPrompt?: string;
-    submitButton?:JSX.Element;
+    submitButton?: JSX.Element;
     callback?: (
         oql: {
             query: SingleGeneQuery[];
@@ -236,17 +240,17 @@ export default class OQLTextArea extends React.Component<
             : 'Click gene symbols below or enter here';
     }
 
-    @bind onChange(event:any){
+    @bind onChange(event: any) {
         this.currentTextAreaValue = event.currentTarget.value;
         this.geneQuery = this.currentTextAreaValue;
         this.updateQueryToBeValidateDebounce();
     }
 
-    @bind onFocus(){
+    @bind onFocus() {
         this.isFocused = true;
     }
 
-    @bind onBlur(){
+    @bind onBlur() {
         this.isFocused = false;
     }
 
@@ -266,38 +270,36 @@ export default class OQLTextArea extends React.Component<
         return (
             <div className={styles.genesSelection}>
                 <div className={styles.topRow}>
-                <textarea
-                    ref={this.textAreaRef as any}
-                    onFocus={this.onFocus}
-                    onBlur={this.onBlur}
-                    className={classnames(this.textAreaClasses)}
-                    rows={5}
-                    cols={80}
-                    placeholder={this.promptText}
-                    title={this.promptText}
-                    defaultValue={this.getTextAreaValue()}
-                    onChange={this.onChange}
-                    data-test="geneSet"
-                />
+                    <textarea
+                        ref={this.textAreaRef as any}
+                        onFocus={this.onFocus}
+                        onBlur={this.onBlur}
+                        className={classnames(this.textAreaClasses)}
+                        rows={5}
+                        cols={80}
+                        placeholder={this.promptText}
+                        title={this.promptText}
+                        defaultValue={this.getTextAreaValue()}
+                        onChange={this.onChange}
+                        data-test="geneSet"
+                    />
 
-                {
-                    (this.props.submitButton) && this.props.submitButton
-                }
+                    {this.props.submitButton && this.props.submitButton}
                 </div>
                 <div className={'oqlValidationContainer'}>
-                <GeneSymbolValidator
-                    focus={this.props.focus}
-                    geneQuery={this.queryToBeValidated}
-                    skipGeneValidation={this.skipGenesValidation}
-                    updateGeneQuery={this.updateGeneQuery}
-                    afterValidation={this.afterGeneSymbolValidation}
-                    replaceGene={this.replaceGene}
-                    errorMessageOnly={
-                        this.props.location === GeneBoxType.STUDY_VIEW_PAGE
-                    }
-                >
-                    {this.props.children}
-                </GeneSymbolValidator>
+                    <GeneSymbolValidator
+                        focus={this.props.focus}
+                        geneQuery={this.queryToBeValidated}
+                        skipGeneValidation={this.skipGenesValidation}
+                        updateGeneQuery={this.updateGeneQuery}
+                        afterValidation={this.afterGeneSymbolValidation}
+                        replaceGene={this.replaceGene}
+                        errorMessageOnly={
+                            this.props.location === GeneBoxType.STUDY_VIEW_PAGE
+                        }
+                    >
+                        {this.props.children}
+                    </GeneSymbolValidator>
                 </div>
             </div>
         );
diff --git a/src/shared/components/GeneSelectionBox/styles.module.scss b/src/shared/components/GeneSelectionBox/styles.module.scss
index cce2831d08f..efbe3a65571 100644
--- a/src/shared/components/GeneSelectionBox/styles.module.scss
+++ b/src/shared/components/GeneSelectionBox/styles.module.scss
@@ -1,133 +1,130 @@
 .validationBubbleBase {
-	margin: 0px 5px 3px 0;
-	padding: 2px 5px;
-	border-radius: $border-radius-base;
-	font-size:.8rem;
+    margin: 0px 5px 3px 0;
+    padding: 2px 5px;
+    border-radius: $border-radius-base;
+    font-size: 0.8rem;
 }
 
 .topRow {
-	display:flex;
-	align-items: flex-start;
-	margin-bottom:5px;
+    display: flex;
+    align-items: flex-start;
+    margin-bottom: 5px;
 }
 
-
 .genesSelection {
+    textarea.default {
+        width: 555px;
+        resize: vertical;
+    }
+    textarea.oncoprintHeatmap {
+        width: 100%;
+        resize: vertical;
+        border-radius: 2px;
+    }
+    textarea {
+        border-radius: $border-radius-base;
+        padding: 5px;
+        &.empty {
+        }
+        border-color: $borderColor;
+    }
 
-	textarea.default {
-		width: 555px;
-		resize: vertical;
-	}
-	textarea.oncoprintHeatmap {
-		width: 100%;
-		resize: vertical;
-		border-radius: 2px;
-	}
-	textarea{
-		border-radius: $border-radius-base;
-		padding: 5px;
-		&.empty {
-		}
-		border-color: $borderColor;
-	}
-
-	textarea.studyView {
-		width: 200px;
-		height: 30px;
-		border-radius: $border-radius-base;
-		outline-offset: -2px;
-		font-size:12px;
-		resize: none;
-		margin: 0px 3px;
-		line-height:18px;
-		padding-left:10px;
-	}
+    textarea.studyView {
+        width: 200px;
+        height: 30px;
+        border-radius: $border-radius-base;
+        outline-offset: -2px;
+        font-size: 12px;
+        resize: none;
+        margin: 0px 3px;
+        line-height: 18px;
+        padding-left: 10px;
+    }
 
-	textarea.studyViewFocus{
-		height: 5em;
-		font-size: 13px;
-	}
+    textarea.studyViewFocus {
+        height: 5em;
+        font-size: 13px;
+    }
 
     .GeneSymbolValidator {
-		cursor: default;
-		display: flex;
-		align-items: center;
-		padding-top: 1px;
-		flex-wrap:wrap;
-		&.nowrap {
-			white-space: nowrap;
-			flex-wrap:nowrap;
-			width:200px;
-		}
-
-		button {
-			line-height:1 !important;
-		}
+        cursor: default;
+        display: flex;
+        align-items: center;
+        padding-top: 1px;
+        flex-wrap: wrap;
+        &.nowrap {
+            white-space: nowrap;
+            flex-wrap: nowrap;
+            width: 200px;
+        }
 
-		span.icon {
-			text-align: center;
-			margin-right: 4px;
-			width: 16px;
-			height: 16px;
-			line-height: 17px;
-		}
-		span.pendingMessage,
-		span.oqlNotice,
-		span.errorMessage {
-			font-size: small;
-			color: $redError;
-			font-weight: bold;
-		}
-		div.validBubble,
-		div.invalidBubble {
-			color: #fff;
-			display: flex;
-			align-items: center;
-			@extend .validationBubbleBase;
-			span.icon {
-				color: #fff;
-				line-height: 17px;
-			}
-		}
-		div.invalidBubble {
-			background: $redError;
-			white-space:nowrap;
-		}
-		div.validBubble {
-			background: $greenSuccess;
-			white-space:nowrap;
-		}
-		div.suggestionBubble {
-			color: rgba(0, 0, 0, 0.5);
-			white-space:nowrap;
-			cursor: pointer;
-			display: flex;
-			align-items: center;
-			@extend .validationBubbleBase;
-			background-color: $lightGrey;
-			border-radius: 2px;
-			&:hover {
-				background-color: $mediumGrey;
-			}
-			span.icon {
-				color: $darkGrey;
-				line-height: 17px;
-			}
-			span.noChoiceLabel {
-				font-weight: normal;
-			}
-			span.singleChoiceLabel {
-				font-weight: bold;
-			}
-			span.multiChoiceLabel {
-				font-weight: normal;
-			}
-			div:global(.Select) {
-				width: 140px;
-				margin-left: 4px;
-				float: left;
-			}
-		}
-  	}
+        button {
+            line-height: 1 !important;
+        }
 
+        span.icon {
+            text-align: center;
+            margin-right: 4px;
+            width: 16px;
+            height: 16px;
+            line-height: 17px;
+        }
+        span.pendingMessage,
+        span.oqlNotice,
+        span.errorMessage {
+            font-size: small;
+            color: $redError;
+            font-weight: bold;
+        }
+        div.validBubble,
+        div.invalidBubble {
+            color: #fff;
+            display: flex;
+            align-items: center;
+            @extend .validationBubbleBase;
+            span.icon {
+                color: #fff;
+                line-height: 17px;
+            }
+        }
+        div.invalidBubble {
+            background: $redError;
+            white-space: nowrap;
+        }
+        div.validBubble {
+            background: $greenSuccess;
+            white-space: nowrap;
+        }
+        div.suggestionBubble {
+            color: rgba(0, 0, 0, 0.5);
+            white-space: nowrap;
+            cursor: pointer;
+            display: flex;
+            align-items: center;
+            @extend .validationBubbleBase;
+            background-color: $lightGrey;
+            border-radius: 2px;
+            &:hover {
+                background-color: $mediumGrey;
+            }
+            span.icon {
+                color: $darkGrey;
+                line-height: 17px;
+            }
+            span.noChoiceLabel {
+                font-weight: normal;
+            }
+            span.singleChoiceLabel {
+                font-weight: bold;
+            }
+            span.multiChoiceLabel {
+                font-weight: normal;
+            }
+            div:global(.Select) {
+                width: 140px;
+                margin-left: 4px;
+                float: left;
+            }
+        }
+    }
 }
diff --git a/src/shared/components/InfoIcon.tsx b/src/shared/components/InfoIcon.tsx
index 1b98ddc17c2..1f0c849bc91 100644
--- a/src/shared/components/InfoIcon.tsx
+++ b/src/shared/components/InfoIcon.tsx
@@ -1,30 +1,34 @@
-import * as React from "react";
-import {DefaultTooltip} from "cbioportal-frontend-commons";
+import * as React from 'react';
+import { DefaultTooltip } from 'cbioportal-frontend-commons';
 
 export interface IInfoIconProps {
-    tooltip:JSX.Element;
-    tooltipPlacement?:string;
-    style?:any;
-    divStyle?:any;
+    tooltip: JSX.Element;
+    tooltipPlacement?: string;
+    style?: any;
+    divStyle?: any;
 }
 
 export default class InfoIcon extends React.Component<IInfoIconProps, {}> {
-   render() {
-       return (
-           <DefaultTooltip
-               overlay={this.props.tooltip}
-               placement={this.props.tooltipPlacement || "right"}
-           >
-               <div style={this.props.divStyle}>
-                   <i
-                       className="fa fa-info-circle"
-                       style={Object.assign({}, {
-                           color: "#000000",
-                           cursor: "pointer",
-                       }, this.props.style || {})}
-                   />
-               </div>
-           </DefaultTooltip>
-       );
-   }
-}
\ No newline at end of file
+    render() {
+        return (
+            <DefaultTooltip
+                overlay={this.props.tooltip}
+                placement={this.props.tooltipPlacement || 'right'}
+            >
+                <div style={this.props.divStyle}>
+                    <i
+                        className="fa fa-info-circle"
+                        style={Object.assign(
+                            {},
+                            {
+                                color: '#000000',
+                                cursor: 'pointer',
+                            },
+                            this.props.style || {}
+                        )}
+                    />
+                </div>
+            </DefaultTooltip>
+        );
+    }
+}
diff --git a/src/shared/components/InputWithIndeterminate.tsx b/src/shared/components/InputWithIndeterminate.tsx
index 144cdf5cac8..5d0d23143c1 100644
--- a/src/shared/components/InputWithIndeterminate.tsx
+++ b/src/shared/components/InputWithIndeterminate.tsx
@@ -1,35 +1,39 @@
-import * as React from "react";
-import {observer} from "mobx-react";
-import {DetailedHTMLProps, InputHTMLAttributes} from "react";
-import {observable} from "mobx";
-import autobind from "autobind-decorator";
+import * as React from 'react';
+import { observer } from 'mobx-react';
+import { DetailedHTMLProps, InputHTMLAttributes } from 'react';
+import { observable } from 'mobx';
+import autobind from 'autobind-decorator';
 
-export interface IInputWithIndeterminateCheckboxProps extends DetailedHTMLProps<InputHTMLAttributes<HTMLInputElement>, HTMLInputElement> {
-    indeterminate?:boolean;
+export interface IInputWithIndeterminateCheckboxProps
+    extends DetailedHTMLProps<
+        InputHTMLAttributes<HTMLInputElement>,
+        HTMLInputElement
+    > {
+    indeterminate?: boolean;
 }
 
 @observer
-export default class InputWithIndeterminate extends React.Component<IInputWithIndeterminateCheckboxProps, {}> {
-    @observable.ref input:HTMLInputElement|null = null;
+export default class InputWithIndeterminate extends React.Component<
+    IInputWithIndeterminateCheckboxProps,
+    {}
+> {
+    @observable.ref input: HTMLInputElement | null = null;
 
     @autobind
-    private ref(input:HTMLInputElement|null) {
+    private ref(input: HTMLInputElement | null) {
         this.input = input;
     }
 
-    componentWillReceiveProps(nextProps: Readonly<IInputWithIndeterminateCheckboxProps>) {
+    componentWillReceiveProps(
+        nextProps: Readonly<IInputWithIndeterminateCheckboxProps>
+    ) {
         if (this.input) {
             this.input.indeterminate = !!nextProps.indeterminate;
         }
     }
 
     render() {
-        const {indeterminate, ref, ...restProps} = this.props;
-        return (
-            <input
-                ref={this.ref}
-                {...restProps}
-            />
-        );
+        const { indeterminate, ref, ...restProps } = this.props;
+        return <input ref={this.ref} {...restProps} />;
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/LockIcon.tsx b/src/shared/components/LockIcon.tsx
index 5a48f0ba76a..2d01fb4ce33 100644
--- a/src/shared/components/LockIcon.tsx
+++ b/src/shared/components/LockIcon.tsx
@@ -1,19 +1,36 @@
-import * as React from "react";
-import classNames from "classnames";
-import autobind from "autobind-decorator";
+import * as React from 'react';
+import classNames from 'classnames';
+import autobind from 'autobind-decorator';
 
-export default class LockIcon extends React.Component<{locked:boolean, size?:string, onClick?:()=>void, className?:string, disabled?:boolean}, {}> {
+export default class LockIcon extends React.Component<
+    {
+        locked: boolean;
+        size?: string;
+        onClick?: () => void;
+        className?: string;
+        disabled?: boolean;
+    },
+    {}
+> {
     private get icon() {
-        let iconName = "fa-lock";
+        let iconName = 'fa-lock';
         if (!this.props.locked) {
-            iconName = "fa-unlock";
+            iconName = 'fa-unlock';
         }
         return (
             <i
-                className={classNames("fa", this.props.size || "fa-lg", iconName, this.props.className)}
+                className={classNames(
+                    'fa',
+                    this.props.size || 'fa-lg',
+                    iconName,
+                    this.props.className
+                )}
                 style={{
-                    cursor: (this.props.onClick && !this.props.disabled) ? "pointer" : "auto",
-                    paddingTop:"0.2em",
+                    cursor:
+                        this.props.onClick && !this.props.disabled
+                            ? 'pointer'
+                            : 'auto',
+                    paddingTop: '0.2em',
                 }}
             />
         );
@@ -27,12 +44,6 @@ export default class LockIcon extends React.Component<{locked:boolean, size?:str
     }
 
     render() {
-        return (
-            <div
-                onClick={this.onClick}
-            >
-                {this.icon}
-            </div>
-        );
+        return <div onClick={this.onClick}>{this.icon}</div>;
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/MSKTabs/MSKTabs.spec.tsx b/src/shared/components/MSKTabs/MSKTabs.spec.tsx
index 796c5282551..9a84b4e2ab0 100644
--- a/src/shared/components/MSKTabs/MSKTabs.spec.tsx
+++ b/src/shared/components/MSKTabs/MSKTabs.spec.tsx
@@ -1,101 +1,133 @@
 import { MSKTab, MSKTabs } from './MSKTabs';
 import React from 'react';
 import { assert } from 'chai';
-import {shallow, mount, ReactWrapper} from 'enzyme';
+import { shallow, mount, ReactWrapper } from 'enzyme';
 import sinon from 'sinon';
-import {ThreeBounce} from 'better-react-spinkit';
-import {sleep} from "../../lib/TimeUtils";
+import { ThreeBounce } from 'better-react-spinkit';
+import { sleep } from '../../lib/TimeUtils';
 
 describe('MSKTabs', () => {
-
     let tabs: any;
 
-    function tabText(tabs:ReactWrapper<any,any>):string[] {
-        return tabs.find('ul.nav-tabs').find('li').map(x=>x.text());
+    function tabText(tabs: ReactWrapper<any, any>): string[] {
+        return tabs
+            .find('ul.nav-tabs')
+            .find('li')
+            .map(x => x.text());
     }
 
-    beforeEach(()=>{
-
+    beforeEach(() => {
         tabs = mount(
-          <MSKTabs>
-              <MSKTab id="one" linkText="One"><span className="content">One</span></MSKTab>
-              <MSKTab linkText="Two" id="two"><span className="content">Two</span></MSKTab>
-          </MSKTabs>
+            <MSKTabs>
+                <MSKTab id="one" linkText="One">
+                    <span className="content">One</span>
+                </MSKTab>
+                <MSKTab linkText="Two" id="two">
+                    <span className="content">Two</span>
+                </MSKTab>
+            </MSKTabs>
         );
 
         tabs.update();
-
     });
 
-    after(()=>{
+    after(() => {});
 
-    });
-
-    it('initial render only mounts first tab', (done)=>{
-        setTimeout(function(){
+    it('initial render only mounts first tab', done => {
+        setTimeout(function() {
             assert.equal(tabs.update().find('.msk-tab').length, 1);
             done();
         });
     });
 
-    it('render of tab is deferred to frame following',(done)=>{
+    it('render of tab is deferred to frame following', done => {
         assert.equal(tabs.find('.msk-tab').length, 0);
-        setTimeout(function(){
+        setTimeout(function() {
             assert.equal(tabs.update().find('.msk-tab').length, 1);
             done();
         });
     });
 
-
-    it('creates two tab buttons and toggles them properly', (done)=>{
-        setTimeout(()=>{
+    it('creates two tab buttons and toggles them properly', done => {
+        setTimeout(() => {
             assert.equal(tabs.update().find('li').length, 2);
-            assert.isTrue(tabs.find('li').at(0).hasClass('active'));
-            assert.isFalse(tabs.find('li').at(1).hasClass('active'));
-            tabs.setProps({ activeTabId:"two" });
-            assert.isFalse(tabs.find('li').at(0).hasClass('active'));
-            assert.isTrue(tabs.find('li').at(1).hasClass('active'));
+            assert.isTrue(
+                tabs
+                    .find('li')
+                    .at(0)
+                    .hasClass('active')
+            );
+            assert.isFalse(
+                tabs
+                    .find('li')
+                    .at(1)
+                    .hasClass('active')
+            );
+            tabs.setProps({ activeTabId: 'two' });
+            assert.isFalse(
+                tabs
+                    .find('li')
+                    .at(0)
+                    .hasClass('active')
+            );
+            assert.isTrue(
+                tabs
+                    .find('li')
+                    .at(1)
+                    .hasClass('active')
+            );
             done();
         });
     });
 
-    it('if unmount on hide is false, we retain tabs when we click away',(done)=>{
+    it('if unmount on hide is false, we retain tabs when we click away', done => {
         var tabs = mount(
             <MSKTabs unmountOnHide={false}>
-                <MSKTab id="one" linkText="One"><span className="content">One</span></MSKTab>
-                <MSKTab linkText="Two" id="two"><span className="content">Two</span></MSKTab>
+                <MSKTab id="one" linkText="One">
+                    <span className="content">One</span>
+                </MSKTab>
+                <MSKTab linkText="Two" id="two">
+                    <span className="content">Two</span>
+                </MSKTab>
             </MSKTabs>
         );
 
-        setTimeout(()=>{
+        setTimeout(() => {
             assert.equal(tabs.update().find('.msk-tab').length, 1);
-            tabs.setProps({ activeTabId:"two" });
+            tabs.setProps({ activeTabId: 'two' });
             assert.equal(tabs.find('.msk-tab').length, 2, "didn't unmount");
-            assert.isTrue(tabs.find('.msk-tab').at(0).hasClass('hiddenByPosition'));
+            assert.isTrue(
+                tabs
+                    .find('.msk-tab')
+                    .at(0)
+                    .hasClass('hiddenByPosition')
+            );
 
-            tabs.setProps({ activeTabId:"one" });
+            tabs.setProps({ activeTabId: 'one' });
 
             // assert.isTrue(tabs.find('.msk-tab').at(1).hasClass('hiddenByPosition'));
             // assert.isFalse(tabs.find('.msk-tab').at(0).hasClass('hiddenByPosition'));
 
             done();
         });
-
     });
 
-    it('if unmount on hide is true, we DO NOT retain tabs when we click away',(done)=>{
+    it('if unmount on hide is true, we DO NOT retain tabs when we click away', done => {
         var tabs = mount(
             <MSKTabs unmountOnHide={true}>
-                <MSKTab id="one" linkText="One"><span className="content">One</span></MSKTab>
-                <MSKTab linkText="Two" id="two"><span className="content">Two</span></MSKTab>
+                <MSKTab id="one" linkText="One">
+                    <span className="content">One</span>
+                </MSKTab>
+                <MSKTab linkText="Two" id="two">
+                    <span className="content">Two</span>
+                </MSKTab>
             </MSKTabs>
         );
 
-        setTimeout(function(){
-
+        setTimeout(function() {
             assert.equal(tabs.update().find('.msk-tab').length, 1);
 
-            tabs.setProps({ activeTabId:"two" });
+            tabs.setProps({ activeTabId: 'two' });
 
             // assert.equal(tabs.find('.msk-tab').length, 1, "did unmount");
             // assert.isFalse(tabs.find('.msk-tab').at(0).hasClass('hiddenByPosition'));
@@ -105,92 +137,101 @@ describe('MSKTabs', () => {
             // assert.isFalse(tabs.find('.msk-tab').at(0).hasClass('hiddenByPosition'));
 
             done();
-
-        })
-
+        });
     });
 
-    it('if unMountOnHide = false, switch tab causes mounting, switching again causes hide/show',(done)=>{
+    it('if unMountOnHide = false, switch tab causes mounting, switching again causes hide/show', done => {
         var tabs = mount(
             <MSKTabs unmountOnHide={false}>
-                <MSKTab id="one" linkText="One"><span className="content">One</span></MSKTab>
-                <MSKTab linkText="Two" id="two"><span className="content">Two</span></MSKTab>
+                <MSKTab id="one" linkText="One">
+                    <span className="content">One</span>
+                </MSKTab>
+                <MSKTab linkText="Two" id="two">
+                    <span className="content">Two</span>
+                </MSKTab>
             </MSKTabs>
         );
-        setTimeout(()=>{
+        setTimeout(() => {
             assert.equal(tabs.update().find('.msk-tab').length, 1);
-            tabs.setProps({ activeTabId:"two" });
+            tabs.setProps({ activeTabId: 'two' });
             assert.equal(tabs.update().find('.msk-tab').length, 2);
-            tabs.setProps({ activeTabId:"one" });
+            tabs.setProps({ activeTabId: 'one' });
             done();
         });
     });
 
-    it('if individual tab is unmountOnHide false then it will not be unmounted', (done)=>{
+    it('if individual tab is unmountOnHide false then it will not be unmounted', done => {
         tabs = mount(
             <MSKTabs>
-                <MSKTab unmountOnHide={false} id="one" linkText="One"><span className="content">One</span></MSKTab>
-                <MSKTab linkText="Two" id="two"><span className="content">Two</span></MSKTab>
+                <MSKTab unmountOnHide={false} id="one" linkText="One">
+                    <span className="content">One</span>
+                </MSKTab>
+                <MSKTab linkText="Two" id="two">
+                    <span className="content">Two</span>
+                </MSKTab>
             </MSKTabs>
         );
 
-        setTimeout(()=>{
+        setTimeout(() => {
             assert.equal(tabs.update().find('.msk-tab').length, 1);
 
-            tabs.setProps({ activeTabId:"two" });
+            tabs.setProps({ activeTabId: 'two' });
             assert.equal(tabs.find('.msk-tab').length, 2);
 
-            tabs.setProps({ activeTabId:"one" });
+            tabs.setProps({ activeTabId: 'one' });
             assert.equal(tabs.find('.msk-tab').length, 1);
 
             done();
         });
-
     });
 
-    it('if individual tab is unmountOnHide false then it will not be unmounted even if parent unmountOnHide is true', (done)=>{
-
+    it('if individual tab is unmountOnHide false then it will not be unmounted even if parent unmountOnHide is true', done => {
         var tabs = mount(
             <MSKTabs unmountOnHide={true}>
-                <MSKTab unmountOnHide={false} id="one" linkText="One"><span className="content">One</span></MSKTab>
-                <MSKTab linkText="Two" id="two"><span className="content">Two</span></MSKTab>
+                <MSKTab unmountOnHide={false} id="one" linkText="One">
+                    <span className="content">One</span>
+                </MSKTab>
+                <MSKTab linkText="Two" id="two">
+                    <span className="content">Two</span>
+                </MSKTab>
             </MSKTabs>
         );
 
-        setTimeout(()=>{
+        setTimeout(() => {
             assert.equal(tabs.update().find('.msk-tab').length, 1);
 
-            tabs.setProps({ activeTabId:"two" });
+            tabs.setProps({ activeTabId: 'two' });
             assert.equal(tabs.find('.msk-tab').length, 2);
 
-            tabs.setProps({ activeTabId:"one" });
+            tabs.setProps({ activeTabId: 'one' });
             assert.equal(tabs.find('.msk-tab').length, 1);
 
             done();
         });
-
     });
 
-    it('if individual tab is unmountOnHide true then it will be unmounted even if parent unmountOnHide is false', (done)=>{
+    it('if individual tab is unmountOnHide true then it will be unmounted even if parent unmountOnHide is false', done => {
         var tabs = mount(
             <MSKTabs unmountOnHide={false}>
-                <MSKTab unmountOnHide={true} id="one" linkText="One"><span className="content">One</span></MSKTab>
-                <MSKTab linkText="Two" id="two"><span className="content">Two</span></MSKTab>
+                <MSKTab unmountOnHide={true} id="one" linkText="One">
+                    <span className="content">One</span>
+                </MSKTab>
+                <MSKTab linkText="Two" id="two">
+                    <span className="content">Two</span>
+                </MSKTab>
             </MSKTabs>
         );
 
-        setTimeout(()=>{
+        setTimeout(() => {
             assert.equal(tabs.update().find('.msk-tab').length, 1);
 
-            tabs.setProps({ activeTabId:"two" });
+            tabs.setProps({ activeTabId: 'two' });
             assert.equal(tabs.find('.msk-tab').length, 1);
 
-            tabs.setProps({ activeTabId:"one" });
+            tabs.setProps({ activeTabId: 'one' });
             assert.equal(tabs.find('.msk-tab').length, 2);
 
             done();
         });
-
     });
-
 });
diff --git a/src/shared/components/MSKTabs/MSKTabs.tsx b/src/shared/components/MSKTabs/MSKTabs.tsx
index c9ebb73327f..25a8feb0ec9 100644
--- a/src/shared/components/MSKTabs/MSKTabs.tsx
+++ b/src/shared/components/MSKTabs/MSKTabs.tsx
@@ -1,156 +1,167 @@
 import * as React from 'react';
 import * as _ from 'lodash';
 import classnames from 'classnames';
-import {ThreeBounce} from 'better-react-spinkit';
+import { ThreeBounce } from 'better-react-spinkit';
 import ReactResizeDetector from 'react-resize-detector';
 import './styles.scss';
-import autobind from "autobind-decorator";
-import Spinner from "react-spinkit";
-import LoadingIndicator from "../loadingIndicator/LoadingIndicator";
-import {observable} from "mobx";
-import {ReactChild} from "react";
-import {observer} from "mobx-react";
-import {JsxElement} from "typescript";
-import MemoizedHandlerFactory from "../../lib/MemoizedHandlerFactory";
+import autobind from 'autobind-decorator';
+import Spinner from 'react-spinkit';
+import LoadingIndicator from '../loadingIndicator/LoadingIndicator';
+import { observable } from 'mobx';
+import { ReactChild } from 'react';
+import { observer } from 'mobx-react';
+import { JsxElement } from 'typescript';
+import MemoizedHandlerFactory from '../../lib/MemoizedHandlerFactory';
 
 export interface IMSKTabProps {
-    inactive?:boolean;
-    id:string;
-    linkText:string | JSX.Element;
-    activeId?:string;
-    className?:string;
-    hide?:boolean;
-    datum?:any;
-    anchorStyle?:{[k:string]:string|number|boolean};
-    anchorClassName?:string;
-    unmountOnHide?:boolean;
-    onTabDidMount?:(tab:HTMLDivElement)=>void;
-    onTabUnmount?:(tab:HTMLDivElement)=>void;
+    inactive?: boolean;
+    id: string;
+    linkText: string | JSX.Element;
+    activeId?: string;
+    className?: string;
+    hide?: boolean;
+    datum?: any;
+    anchorStyle?: { [k: string]: string | number | boolean };
+    anchorClassName?: string;
+    unmountOnHide?: boolean;
+    onTabDidMount?: (tab: HTMLDivElement) => void;
+    onTabUnmount?: (tab: HTMLDivElement) => void;
 }
 
 @observer
-export class DeferredRender extends React.Component<{ className:string, loadingState?:JSX.Element },{}> {
-
+export class DeferredRender extends React.Component<
+    { className: string; loadingState?: JSX.Element },
+    {}
+> {
     @observable renderedOnce = false;
 
-    render(){
-
+    render() {
         if (!this.renderedOnce) {
-            setTimeout(()=>this.renderedOnce = true)
+            setTimeout(() => (this.renderedOnce = true));
         }
 
-        return (<div className={this.props.className}>
-            {
-                this.renderedOnce && this.props.children
-            }
-            {
-                !this.renderedOnce && (this.props.loadingState || null)
-            }
-        </div>)
+        return (
+            <div className={this.props.className}>
+                {this.renderedOnce && this.props.children}
+                {!this.renderedOnce && (this.props.loadingState || null)}
+            </div>
+        );
     }
 }
 
-
-export class MSKTab extends React.Component<IMSKTabProps,{}> {
-
-    constructor(props: IMSKTabProps){
+export class MSKTab extends React.Component<IMSKTabProps, {}> {
+    constructor(props: IMSKTabProps) {
         super(props);
     }
 
-    public div:HTMLDivElement;
+    public div: HTMLDivElement;
 
-    componentDidMount(){
+    componentDidMount() {
         if (this.props.onTabDidMount) {
             this.props.onTabDidMount(this.div);
         }
     }
 
-    componentWillUnmount(){
+    componentWillUnmount() {
         if (this.props.onTabUnmount) {
             this.props.onTabUnmount(this.div);
         }
     }
 
     @autobind
-    assignRef(div:HTMLDivElement){
+    assignRef(div: HTMLDivElement) {
         this.div = div;
     }
 
-    render(){
+    render() {
         return (
             <div
-                ref={(div:HTMLDivElement)=>this.div=div}
-                className={classnames({ 'msk-tab':true, 'hiddenByPosition':!!this.props.inactive  }, this.props.className )}
+                ref={(div: HTMLDivElement) => (this.div = div)}
+                className={classnames(
+                    {
+                        'msk-tab': true,
+                        hiddenByPosition: !!this.props.inactive,
+                    },
+                    this.props.className
+                )}
             >
                 {this.props.children}
             </div>
         );
     }
-
 }
 
 interface IMSKTabsState {
-    activeTabId:string;
-    currentPage:number;
-    pageBreaks:string[];
-    deferedActiveTabId:string;
+    activeTabId: string;
+    currentPage: number;
+    pageBreaks: string[];
+    deferedActiveTabId: string;
 }
 
 interface IMSKTabsProps {
-    className?:string;
-    id?:string;
-    activeTabId?:string;
-    onTabClick?:(tabId:string, datum:any)=>void;
-    getTabHref?:(tabId:string)=>string;
-    enablePagination?:boolean;
+    className?: string;
+    id?: string;
+    activeTabId?: string;
+    onTabClick?: (tabId: string, datum: any) => void;
+    getTabHref?: (tabId: string) => string;
+    enablePagination?: boolean;
     // only used when pagination is true to style arrows
-    arrowStyle?:{[k:string]:string|number|boolean};
-    tabButtonStyle?:string;
-    unmountOnHide?:boolean;
-    loadingComponent?:JSX.Element;
+    arrowStyle?: { [k: string]: string | number | boolean };
+    tabButtonStyle?: string;
+    unmountOnHide?: boolean;
+    loadingComponent?: JSX.Element;
 }
 
 export class MSKTabs extends React.Component<IMSKTabsProps, IMSKTabsState> {
-
-    private shownTabs:string[] = [];
+    private shownTabs: string[] = [];
     private navTabsRef: HTMLUListElement;
-    private tabRefs: {id:string, element:HTMLLIElement}[] = [];
+    private tabRefs: { id: string; element: HTMLLIElement }[] = [];
 
     public static defaultProps: Partial<IMSKTabsProps> = {
         unmountOnHide: true,
-        loadingComponent:<LoadingIndicator isLoading={true} center={true} size={"big"}/>
+        loadingComponent: (
+            <LoadingIndicator isLoading={true} center={true} size={'big'} />
+        ),
     };
 
-    private tabClickHandlers = MemoizedHandlerFactory((e:React.MouseEvent<any>, tabProps:Pick<IMSKTabProps, "id"|"datum">)=>{
-        e.preventDefault();
-        this.setActiveTab(tabProps.id, tabProps.datum);
-    });
+    private tabClickHandlers = MemoizedHandlerFactory(
+        (
+            e: React.MouseEvent<any>,
+            tabProps: Pick<IMSKTabProps, 'id' | 'datum'>
+        ) => {
+            e.preventDefault();
+            this.setActiveTab(tabProps.id, tabProps.datum);
+        }
+    );
 
-    constructor(props:IMSKTabsProps){
+    constructor(props: IMSKTabsProps) {
         super(props);
 
         this.state = {
             currentPage: 1,
-            pageBreaks: [] as string[]
+            pageBreaks: [] as string[],
         } as IMSKTabsState;
     }
 
-    private cloneTab(tab:React.ReactElement<IMSKTabProps>, inactive:boolean, loading?:boolean):React.ReactElement<IMSKTabProps> {
+    private cloneTab(
+        tab: React.ReactElement<IMSKTabProps>,
+        inactive: boolean,
+        loading?: boolean
+    ): React.ReactElement<IMSKTabProps> {
         if (loading) {
             return React.cloneElement(
                 tab,
                 { inactive } as Partial<IMSKTabProps>,
-                (this.props.loadingComponent!)
+                this.props.loadingComponent!
             );
         } else {
-            return React.cloneElement(
-                tab,
-                { inactive } as Partial<IMSKTabProps>
-            );
+            return React.cloneElement(tab, { inactive } as Partial<
+                IMSKTabProps
+            >);
         }
     }
 
-    setActiveTab(id: string, datum?:any){
+    setActiveTab(id: string, datum?: any) {
         this.props.onTabClick && this.props.onTabClick(id, datum);
     }
 
@@ -160,24 +171,24 @@ export class MSKTabs extends React.Component<IMSKTabsProps, IMSKTabsState> {
 
     tabRefHandler(id: string, li: HTMLLIElement) {
         if (id && li) {
-            this.tabRefs.push({id, element: li});
+            this.tabRefs.push({ id, element: li });
         }
     }
 
     nextPage() {
         this.setState({
-            currentPage: this.state.currentPage + 1
+            currentPage: this.state.currentPage + 1,
         } as IMSKTabsState);
     }
 
     prevPage() {
         this.setState({
-            currentPage: this.state.currentPage - 1
+            currentPage: this.state.currentPage - 1,
         } as IMSKTabsState);
     }
 
     initOnResize(width: number, height: number) {
-        let timeout:number|null = null;
+        let timeout: number | null = null;
 
         return (evt: any) => {
             if (timeout !== null) {
@@ -192,52 +203,83 @@ export class MSKTabs extends React.Component<IMSKTabsProps, IMSKTabsState> {
         };
     }
 
-    render(){
-
-
+    render() {
         if (this.props.children && React.Children.count(this.props.children)) {
+            let children = this.props.children as React.ReactElement<
+                IMSKTabProps
+            >[];
 
-            let children = (this.props.children as React.ReactElement<IMSKTabProps>[]);
-
-            const toArrayedChildren:ReactChild[] = React.Children.toArray(children);
+            const toArrayedChildren: ReactChild[] = React.Children.toArray(
+                children
+            );
 
-            const targetTabId = (()=>{
-                if (this.props.activeTabId && _.some(toArrayedChildren,(child:React.ReactElement<IMSKTabProps>)=>child.props.id===this.props.activeTabId)) {
+            const targetTabId = (() => {
+                if (
+                    this.props.activeTabId &&
+                    _.some(
+                        toArrayedChildren,
+                        (child: React.ReactElement<IMSKTabProps>) =>
+                            child.props.id === this.props.activeTabId
+                    )
+                ) {
                     return this.props.activeTabId;
                 } else {
-                    return (toArrayedChildren[0] as React.ReactElement<IMSKTabProps>).props.id;
+                    return (toArrayedChildren[0] as React.ReactElement<
+                        IMSKTabProps
+                    >).props.id;
                 }
             })();
 
-            let arr:React.ReactElement<IMSKTabProps>[] = [];
-
-            arr = _.reduce(toArrayedChildren, (memo: React.ReactElement<IMSKTabProps>[], child: React.ReactElement<IMSKTabProps>) => {
-                if (!child.props.hide) {
-                    if (child.props.id === targetTabId) {
-                        this.shownTabs.push(child.props.id);
-                        memo.push(this.cloneTab(child, false));
-                    } else if (
-                        (child.props.unmountOnHide === false || (child.props.unmountOnHide === undefined && this.props.unmountOnHide === false))
-                        && _.includes(this.shownTabs, child.props.id)) {
-                        // if we're NOT unmounting it and the tab has been shown and it's not loading, include it
-                        memo.push(this.cloneTab(child, true));
+            let arr: React.ReactElement<IMSKTabProps>[] = [];
+
+            arr = _.reduce(
+                toArrayedChildren,
+                (
+                    memo: React.ReactElement<IMSKTabProps>[],
+                    child: React.ReactElement<IMSKTabProps>
+                ) => {
+                    if (!child.props.hide) {
+                        if (child.props.id === targetTabId) {
+                            this.shownTabs.push(child.props.id);
+                            memo.push(this.cloneTab(child, false));
+                        } else if (
+                            (child.props.unmountOnHide === false ||
+                                (child.props.unmountOnHide === undefined &&
+                                    this.props.unmountOnHide === false)) &&
+                            _.includes(this.shownTabs, child.props.id)
+                        ) {
+                            // if we're NOT unmounting it and the tab has been shown and it's not loading, include it
+                            memo.push(this.cloneTab(child, true));
+                        }
                     }
-                }
-                return memo;
-            }, []);
-
+                    return memo;
+                },
+                []
+            );
 
             return (
                 <div
-                    id={(this.props.id) ? this.props.id : ''}
-                    className={ classnames('msk-tabs', 'posRelative', this.props.className) }
+                    id={this.props.id ? this.props.id : ''}
+                    className={classnames(
+                        'msk-tabs',
+                        'posRelative',
+                        this.props.className
+                    )}
                 >
                     {this.navTabs(children, targetTabId)}
 
-                    <DeferredRender className="tab-content" loadingState={<LoadingIndicator isLoading={true} center={true} size={"big"}/>}>
+                    <DeferredRender
+                        className="tab-content"
+                        loadingState={
+                            <LoadingIndicator
+                                isLoading={true}
+                                center={true}
+                                size={'big'}
+                            />
+                        }
+                    >
                         {arr}
                     </DeferredRender>
-
                 </div>
             );
         } else {
@@ -245,8 +287,10 @@ export class MSKTabs extends React.Component<IMSKTabsProps, IMSKTabsState> {
         }
     }
 
-    protected navTabs(children: React.ReactElement<IMSKTabProps>[], effectiveActiveTab: string)
-    {
+    protected navTabs(
+        children: React.ReactElement<IMSKTabProps>[],
+        effectiveActiveTab: string
+    ) {
         // restart the tab refs before each tab rendering
         this.tabRefs = [];
 
@@ -256,105 +300,126 @@ export class MSKTabs extends React.Component<IMSKTabsProps, IMSKTabsState> {
 
         // we need a little style tweak to prevent initial overflow flashing when paging enabled
         // TODO disabling maxHeight tweak due to inconsistencies for now
-        const navBarStyle = this.props.enablePagination ? {
-           border: 0, overflow: "hidden" as "hidden"
-        } : {};
-
-        const prev = this.state.currentPage > 1 ? (
-            <li
-                key="prevPage"
-                style={{ cursor:'pointer' }}
-            >
-                <a onClick={this.prevPage.bind(this)}><i className="fa fa-chevron-left" style={this.props.arrowStyle} /></a>
-            </li>
-        ) : null;
-
-        const next = this.state.currentPage < pageCount ? (
-            <li
-                key="nextPage"
-                style={{ cursor:'pointer' }}
-            >
-                <a onClick={this.nextPage.bind(this)}><i className="fa fa-chevron-right" style={this.props.arrowStyle} /></a>
-            </li>
-        ) : null;
+        const navBarStyle = this.props.enablePagination
+            ? {
+                  border: 0,
+                  overflow: 'hidden' as 'hidden',
+              }
+            : {};
+
+        const prev =
+            this.state.currentPage > 1 ? (
+                <li key="prevPage" style={{ cursor: 'pointer' }}>
+                    <a onClick={this.prevPage.bind(this)}>
+                        <i
+                            className="fa fa-chevron-left"
+                            style={this.props.arrowStyle}
+                        />
+                    </a>
+                </li>
+            ) : null;
+
+        const next =
+            this.state.currentPage < pageCount ? (
+                <li key="nextPage" style={{ cursor: 'pointer' }}>
+                    <a onClick={this.nextPage.bind(this)}>
+                        <i
+                            className="fa fa-chevron-right"
+                            style={this.props.arrowStyle}
+                        />
+                    </a>
+                </li>
+            ) : null;
 
-        const navButtonStyle : string = this.props.tabButtonStyle || 'tabs';
+        const navButtonStyle: string = this.props.tabButtonStyle || 'tabs';
 
         return (
             <ul
                 ref={this.navTabsRefHandler.bind(this)}
-                className={classnames('nav',`nav-${navButtonStyle}`)}
+                className={classnames('nav', `nav-${navButtonStyle}`)}
                 style={navBarStyle}
             >
                 {prev}
                 {pages[this.state.currentPage - 1]}
                 {next}
-                {// TODO this doesn't always calculate the page size properly after resize, disabling for now
-                // this.props.enablePagination && (
-                //     <ReactResizeDetector handleWidth={true} onResize={this.initOnResize.bind(this)()} />
-                // )
+                {
+                    // TODO this doesn't always calculate the page size properly after resize, disabling for now
+                    // this.props.enablePagination && (
+                    //     <ReactResizeDetector handleWidth={true} onResize={this.initOnResize.bind(this)()} />
+                    // )
                 }
             </ul>
         );
     }
 
-    protected tabPages(children: React.ReactElement<IMSKTabProps>[], effectiveActiveTab: string): JSX.Element[][]
-    {
+    protected tabPages(
+        children: React.ReactElement<IMSKTabProps>[],
+        effectiveActiveTab: string
+    ): JSX.Element[][] {
         const pages: JSX.Element[][] = [[]];
         let currentPage = 1;
 
-        React.Children.forEach(children, (tab: React.ReactElement<IMSKTabProps>) => {
-            if (!tab || tab.props.hide) {
-                return;
-            }
+        React.Children.forEach(
+            children,
+            (tab: React.ReactElement<IMSKTabProps>) => {
+                if (!tab || tab.props.hide) {
+                    return;
+                }
 
-            let activeClass = (effectiveActiveTab === tab.props.id) ? 'active' : '';
+                let activeClass =
+                    effectiveActiveTab === tab.props.id ? 'active' : '';
 
-            // find out if we need to add another page
-            if (this.props.enablePagination &&
-                this.state.pageBreaks.length > 0 &&
-                this.state.pageBreaks[currentPage - 1] === tab.props.id)
-            {
-                currentPage++;
-                pages[currentPage - 1] = [];
-            }
+                // find out if we need to add another page
+                if (
+                    this.props.enablePagination &&
+                    this.state.pageBreaks.length > 0 &&
+                    this.state.pageBreaks[currentPage - 1] === tab.props.id
+                ) {
+                    currentPage++;
+                    pages[currentPage - 1] = [];
+                }
 
-            pages[currentPage - 1].push(
-                <li
-                    key={tab.props.id}
-                    style={{ cursor:'pointer' }}
-                    ref={this.tabRefHandler.bind(this, tab.props.id)}
-                    className={activeClass}
-                >
-                    <a
-                        className={classnames("tabAnchor", `tabAnchor_${tab.props.id}`, tab.props.anchorClassName)}
-                        onClick={this.tabClickHandlers(tab.props)}
-                        href={this.props.getTabHref && this.props.getTabHref(tab.props.id)}
-                        style={tab.props.anchorStyle}
+                pages[currentPage - 1].push(
+                    <li
+                        key={tab.props.id}
+                        style={{ cursor: 'pointer' }}
+                        ref={this.tabRefHandler.bind(this, tab.props.id)}
+                        className={activeClass}
                     >
-                        {tab.props.linkText}
-                    </a>
-                </li>
-            );
-        });
+                        <a
+                            className={classnames(
+                                'tabAnchor',
+                                `tabAnchor_${tab.props.id}`,
+                                tab.props.anchorClassName
+                            )}
+                            onClick={this.tabClickHandlers(tab.props)}
+                            href={
+                                this.props.getTabHref &&
+                                this.props.getTabHref(tab.props.id)
+                            }
+                            style={tab.props.anchorStyle}
+                        >
+                            {tab.props.linkText}
+                        </a>
+                    </li>
+                );
+            }
+        );
 
         return pages;
     }
 
     componentDidMount() {
-
         setTimeout(() => {
             // if there are page breaks, it means that page calculations already performed
-            if (this.state.pageBreaks.length  === 0) {
+            if (this.state.pageBreaks.length === 0) {
                 this.initPaging();
             }
-        },1);
-
+        }, 1);
     }
 
     initPaging() {
-        if (this.props.enablePagination)
-        {
+        if (this.props.enablePagination) {
             // find page breaks: depends on width of the container
             const pageBreaks: string[] = this.findPageBreaks();
 
@@ -363,7 +428,7 @@ export class MSKTabs extends React.Component<IMSKTabsProps, IMSKTabsState> {
 
             this.setState({
                 currentPage,
-                pageBreaks
+                pageBreaks,
             } as IMSKTabsState);
         }
     }
@@ -393,13 +458,12 @@ export class MSKTabs extends React.Component<IMSKTabsProps, IMSKTabsState> {
         return found ? currentPage : 1;
     }
 
-    findPageBreaks()
-    {
+    findPageBreaks() {
         const pageBreaks: string[] = [];
-        const containerWidth: number = (this.navTabsRef && this.navTabsRef.offsetWidth) || 0;
+        const containerWidth: number =
+            (this.navTabsRef && this.navTabsRef.offsetWidth) || 0;
         // do not attempt paging if container width is zero
-        if (containerWidth > 0)
-        {
+        if (containerWidth > 0) {
             let width = 0;
 
             _.each(this.tabRefs, ref => {
diff --git a/src/shared/components/MobxView.tsx b/src/shared/components/MobxView.tsx
index d6bbb9fd3bb..af40c694da7 100644
--- a/src/shared/components/MobxView.tsx
+++ b/src/shared/components/MobxView.tsx
@@ -1,87 +1,90 @@
-import {observable} from "mobx";
-import {getMobxPromiseGroupStatus} from "../lib/getMobxPromiseGroupStatus";
+import { observable } from 'mobx';
+import { getMobxPromiseGroupStatus } from '../lib/getMobxPromiseGroupStatus';
 
 export type MobxView = {
     isComplete: boolean;
     isError: boolean;
     isPending: boolean;
-} &
-({
-    status:"pending"|"error";
-    component:ValidRender;
-} | {
-    status:"complete"
-    component:JSX.Element;
-});
+} & (
+    | {
+          status: 'pending' | 'error';
+          component: ValidRender;
+      }
+    | {
+          status: 'complete';
+          component: JSX.Element;
+      });
 
-type MobxView_await = ()=>({status:"complete"|"error"|"pending"}[]);
-type MobxView_render = ()=>ValidRender
-export type MobxViewAlwaysComponent = MobxView & { component:JSX.Element };
-type ValidRender = JSX.Element|undefined|null;
+type MobxView_await = () => { status: 'complete' | 'error' | 'pending' }[];
+type MobxView_render = () => ValidRender;
+export type MobxViewAlwaysComponent = MobxView & { component: JSX.Element };
+type ValidRender = JSX.Element | undefined | null;
 
-export function MakeMobxView(params:{
-    await: MobxView_await,
-    render: MobxView_render,
-    renderError:MobxView_render,
-    renderPending:MobxView_render,
-    showLastRenderWhenPending?:boolean
-}):MobxViewAlwaysComponent;
+export function MakeMobxView(params: {
+    await: MobxView_await;
+    render: MobxView_render;
+    renderError: MobxView_render;
+    renderPending: MobxView_render;
+    showLastRenderWhenPending?: boolean;
+}): MobxViewAlwaysComponent;
 
-export function MakeMobxView(params:{
-    await: MobxView_await,
-    render: MobxView_render,
-    renderError?:MobxView_render,
-    renderPending?:MobxView_render,
-    showLastRenderWhenPending?:boolean
-}):MobxView;
+export function MakeMobxView(params: {
+    await: MobxView_await;
+    render: MobxView_render;
+    renderError?: MobxView_render;
+    renderPending?: MobxView_render;
+    showLastRenderWhenPending?: boolean;
+}): MobxView;
 
-export function MakeMobxView(params:{
-    await: MobxView_await,
-    render: MobxView_render,
-    renderError?:MobxView_render,
-    renderPending?:MobxView_render,
-    showLastRenderWhenPending?:boolean
-}):MobxView {
+export function MakeMobxView(params: {
+    await: MobxView_await;
+    render: MobxView_render;
+    renderError?: MobxView_render;
+    renderPending?: MobxView_render;
+    showLastRenderWhenPending?: boolean;
+}): MobxView {
     let hasRendered = false;
-    let lastRender:ValidRender;
+    let lastRender: ValidRender;
 
     return observable({
         get status() {
             const awaitElements = params.await();
-            const promiseStatus = getMobxPromiseGroupStatus(...awaitElements) as any;
+            const promiseStatus = getMobxPromiseGroupStatus(
+                ...awaitElements
+            ) as any;
             return promiseStatus;
         },
         get isComplete() {
-            return this.status === "complete";
+            return this.status === 'complete';
         },
         get isError() {
-            return this.status === "error";
+            return this.status === 'error';
         },
         get isPending() {
-            return this.status === "pending";
+            return this.status === 'pending';
         },
         get component() {
             let ret = null;
             switch (this.status) {
-                case "complete":
+                case 'complete':
                     ret = params.render();
                     hasRendered = true;
                     lastRender = ret;
                     break;
-                case "pending":
+                case 'pending':
                     if (params.showLastRenderWhenPending && hasRendered) {
                         ret = lastRender;
                     } else if (params.renderPending) {
                         ret = params.renderPending();
                     }
                     break;
-                case "error":
+                case 'error':
                     if (params.renderError) {
                         ret = params.renderError();
                     }
                     break;
             }
             return ret;
-        }
+        },
     });
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/MolecularProfileSelector.tsx b/src/shared/components/MolecularProfileSelector.tsx
index 884555468fa..2ae728fd55d 100644
--- a/src/shared/components/MolecularProfileSelector.tsx
+++ b/src/shared/components/MolecularProfileSelector.tsx
@@ -1,28 +1,35 @@
-import {observer} from "mobx-react";
-import * as React from "react";
-import {MolecularProfile} from "../api/generated/CBioPortalAPI";
-import Select from "react-select1";
-import { getProfileOptions } from "pages/resultsView/coExpression/CoExpressionTabUtils";
-
+import { observer } from 'mobx-react';
+import * as React from 'react';
+import { MolecularProfile } from '../api/generated/CBioPortalAPI';
+import Select from 'react-select1';
+import { getProfileOptions } from 'pages/resultsView/coExpression/CoExpressionTabUtils';
 
 export interface IMolecularProfileSelector {
-    name?:string;
-    className?:string;
-    value:string;
-    onChange:(option:{label:string, value:string})=>void;
-    molecularProfiles:MolecularProfile[];
-    molecularProfileIdToProfiledSampleCount?:{[molecularProfileId:string]:number};
+    name?: string;
+    className?: string;
+    value: string;
+    onChange: (option: { label: string; value: string }) => void;
+    molecularProfiles: MolecularProfile[];
+    molecularProfileIdToProfiledSampleCount?: {
+        [molecularProfileId: string]: number;
+    };
 }
 
 @observer
-export default class MolecularProfileSelector extends React.Component<IMolecularProfileSelector, {}> {
+export default class MolecularProfileSelector extends React.Component<
+    IMolecularProfileSelector,
+    {}
+> {
     render() {
         return (
             <Select
                 name={this.props.name}
                 value={this.props.value}
                 onChange={this.props.onChange}
-                options={getProfileOptions(this.props.molecularProfiles,this.props.molecularProfileIdToProfiledSampleCount)}
+                options={getProfileOptions(
+                    this.props.molecularProfiles,
+                    this.props.molecularProfileIdToProfiledSampleCount
+                )}
                 searchable={false}
                 clearable={false}
                 className={this.props.className}
diff --git a/src/shared/components/PageDecorator/PageDecorator.spec.tsx b/src/shared/components/PageDecorator/PageDecorator.spec.tsx
index efa69cf31bf..2a51d82ae0d 100644
--- a/src/shared/components/PageDecorator/PageDecorator.spec.tsx
+++ b/src/shared/components/PageDecorator/PageDecorator.spec.tsx
@@ -5,17 +5,9 @@ import { shallow, mount } from 'enzyme';
 import sinon from 'sinon';
 
 describe('PageDecorator', () => {
+    before(() => {});
 
-    before(()=>{
-
-    });
-
-    after(()=>{
-
-    });
-
-    it('what does it do?', ()=>{
-
-    });
+    after(() => {});
 
+    it('what does it do?', () => {});
 });
diff --git a/src/shared/components/PageDecorator/PageDecorator.tsx b/src/shared/components/PageDecorator/PageDecorator.tsx
index 0f27b581b0d..49284041e8b 100644
--- a/src/shared/components/PageDecorator/PageDecorator.tsx
+++ b/src/shared/components/PageDecorator/PageDecorator.tsx
@@ -1,13 +1,13 @@
 import * as React from 'react';
 
-export default function (component: typeof React.Component): any {
+export default function(component: typeof React.Component): any {
     return class extends component<any, any> {
         render() {
             if ((window as any).devContext) {
                 return super.render();
             } else {
-                return <span style={{ display:'none' }} />;
+                return <span style={{ display: 'none' }} />;
             }
         }
     };
-};
+}
diff --git a/src/shared/components/PageLayout/PageLayout.tsx b/src/shared/components/PageLayout/PageLayout.tsx
index 0cbbba696ec..ee1514e6b04 100644
--- a/src/shared/components/PageLayout/PageLayout.tsx
+++ b/src/shared/components/PageLayout/PageLayout.tsx
@@ -1,49 +1,45 @@
-import * as React from "react";
-import RightBar from "../rightbar/RightBar";
-import {Component} from "react";
+import * as React from 'react';
+import RightBar from '../rightbar/RightBar';
+import { Component } from 'react';
 import classNames from 'classnames';
-import {inject} from "mobx-react";
-import {AppStore} from "../../../AppStore";
-import PortalFooter from "../../../appShell/App/PortalFooter";
+import { inject } from 'mobx-react';
+import { AppStore } from '../../../AppStore';
+import PortalFooter from '../../../appShell/App/PortalFooter';
 
 interface IPageLayout {
-    rightBar?:any;
-    className?:string;
-    noMargin?:boolean;
-    appStore?:AppStore;
-    hideFooter?:boolean;
+    rightBar?: any;
+    className?: string;
+    noMargin?: boolean;
+    appStore?: AppStore;
+    hideFooter?: boolean;
 }
 
-@inject("appStore")
-export class PageLayout extends React.Component<IPageLayout,{}> {
-
-    render(){
-
-        const noMargin = this.props.noMargin ? "noMargin" : "";
+@inject('appStore')
+export class PageLayout extends React.Component<IPageLayout, {}> {
+    render() {
+        const noMargin = this.props.noMargin ? 'noMargin' : '';
 
         return (
             <div className={'mainContainer'}>
-                <div className={classNames('contentWidth',this.props.className, noMargin) }>
+                <div
+                    className={classNames(
+                        'contentWidth',
+                        this.props.className,
+                        noMargin
+                    )}
+                >
                     <div id="mainColumn">
-                        <div>
-                            {this.props.children}
-                        </div>
+                        <div>{this.props.children}</div>
                     </div>
-                    {(this.props.rightBar) &&
-                    (<div id="rightColumn">
-                        {
-                            this.props.rightBar
-                        }
-                    </div>)
-                    }
+                    {this.props.rightBar && (
+                        <div id="rightColumn">{this.props.rightBar}</div>
+                    )}
                 </div>
 
-                {
-                    (!this.props.hideFooter) && <PortalFooter appStore={this.props.appStore!}/>
-                }
-
+                {!this.props.hideFooter && (
+                    <PortalFooter appStore={this.props.appStore!} />
+                )}
             </div>
         );
     }
-
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/PdbChainInfo.tsx b/src/shared/components/PdbChainInfo.tsx
index 075da16f1c4..19a58d0ff48 100644
--- a/src/shared/components/PdbChainInfo.tsx
+++ b/src/shared/components/PdbChainInfo.tsx
@@ -1,42 +1,63 @@
-import * as React from "react";
-import PdbHeaderCache from "../cache/PdbHeaderCache";
-import {observer} from "mobx-react";
-import {TableCellStatusIndicator, TableCellStatus} from "cbioportal-frontend-commons";
-import {generatePdbInfoSummary} from "../lib/PdbUtils";
-import TextExpander from "./TextExpander";
+import * as React from 'react';
+import PdbHeaderCache from '../cache/PdbHeaderCache';
+import { observer } from 'mobx-react';
+import {
+    TableCellStatusIndicator,
+    TableCellStatus,
+} from 'cbioportal-frontend-commons';
+import { generatePdbInfoSummary } from '../lib/PdbUtils';
+import TextExpander from './TextExpander';
 
 export interface IPdbChainInfoProps {
-    pdbId:string;
-    chainId:string;
-    cache?:PdbHeaderCache;
-    truncateText?:boolean;
-    summaryFormat?:boolean;
-};
+    pdbId: string;
+    chainId: string;
+    cache?: PdbHeaderCache;
+    truncateText?: boolean;
+    summaryFormat?: boolean;
+}
 
 @observer
-export default class PdbChainInfo extends React.Component<IPdbChainInfoProps, {}> {
+export default class PdbChainInfo extends React.Component<
+    IPdbChainInfoProps,
+    {}
+> {
     render() {
         let pdbInfo = null;
         let moleculeInfo = null;
 
-        if (this.props.cache)
-        {
+        if (this.props.cache) {
             const cacheData = this.props.cache.get(this.props.pdbId);
 
             if (cacheData === null) {
-                pdbInfo = <TableCellStatusIndicator status={TableCellStatus.LOADING} />;
-                moleculeInfo = <TableCellStatusIndicator status={TableCellStatus.LOADING} />;
-            }
-            else if (cacheData.status === "error") {
-                pdbInfo = <TableCellStatusIndicator status={TableCellStatus.ERROR} />;
-                moleculeInfo = <TableCellStatusIndicator status={TableCellStatus.ERROR} />;
-            }
-            else if (cacheData.data === null) {
-                pdbInfo = <TableCellStatusIndicator status={TableCellStatus.NA} />;
-                moleculeInfo = <TableCellStatusIndicator status={TableCellStatus.NA} />;
-            }
-            else {
-                const summary = generatePdbInfoSummary(cacheData.data, this.props.chainId);
+                pdbInfo = (
+                    <TableCellStatusIndicator
+                        status={TableCellStatus.LOADING}
+                    />
+                );
+                moleculeInfo = (
+                    <TableCellStatusIndicator
+                        status={TableCellStatus.LOADING}
+                    />
+                );
+            } else if (cacheData.status === 'error') {
+                pdbInfo = (
+                    <TableCellStatusIndicator status={TableCellStatus.ERROR} />
+                );
+                moleculeInfo = (
+                    <TableCellStatusIndicator status={TableCellStatus.ERROR} />
+                );
+            } else if (cacheData.data === null) {
+                pdbInfo = (
+                    <TableCellStatusIndicator status={TableCellStatus.NA} />
+                );
+                moleculeInfo = (
+                    <TableCellStatusIndicator status={TableCellStatus.NA} />
+                );
+            } else {
+                const summary = generatePdbInfoSummary(
+                    cacheData.data,
+                    this.props.chainId
+                );
 
                 pdbInfo = summary.pdbInfo;
                 moleculeInfo = summary.moleculeInfo;
@@ -44,13 +65,21 @@ export default class PdbChainInfo extends React.Component<IPdbChainInfoProps, {}
         }
 
         return (
-            <div className={this.props.truncateText ? "col col-sm-12" : ""}>
-                <div className={this.props.truncateText ? "row" : ""}>
-                    <div className="pull-left" style={{paddingRight: 5}}>
-                        <span style={{fontWeight:this.props.summaryFormat ? "bold" : "normal"}}>
-                            <span>{this.props.summaryFormat ? "pdb" : "PDB"}</span>
-                            { !this.props.summaryFormat && (
-                                <span style={{paddingLeft: 5}}>
+            <div className={this.props.truncateText ? 'col col-sm-12' : ''}>
+                <div className={this.props.truncateText ? 'row' : ''}>
+                    <div className="pull-left" style={{ paddingRight: 5 }}>
+                        <span
+                            style={{
+                                fontWeight: this.props.summaryFormat
+                                    ? 'bold'
+                                    : 'normal',
+                            }}
+                        >
+                            <span>
+                                {this.props.summaryFormat ? 'pdb' : 'PDB'}
+                            </span>
+                            {!this.props.summaryFormat && (
+                                <span style={{ paddingLeft: 5 }}>
                                     <a
                                         href={`http://www.rcsb.org/pdb/explore/explore.do?structureId=${this.props.pdbId}`}
                                         target="_blank"
@@ -63,18 +92,27 @@ export default class PdbChainInfo extends React.Component<IPdbChainInfoProps, {}
                         </span>
                     </div>
                     <div data-test="pdbChainInfoText">
-                        {this.props.truncateText ?
-                            (<TextExpander text={pdbInfo}/>) :
-                            (<span>{pdbInfo}</span>)
-                        }
+                        {this.props.truncateText ? (
+                            <TextExpander text={pdbInfo} />
+                        ) : (
+                            <span>{pdbInfo}</span>
+                        )}
                     </div>
                 </div>
-                <div className={this.props.truncateText ? "row" : ""}>
-                    <div className="pull-left" style={{paddingRight: 5}}>
-                        <span style={{fontWeight:this.props.summaryFormat ? "bold" : "normal"}}>
-                            <span>{this.props.summaryFormat ? "chain" : "Chain"}</span>
-                            { !this.props.summaryFormat && (
-                                <span style={{paddingLeft: 3}}>
+                <div className={this.props.truncateText ? 'row' : ''}>
+                    <div className="pull-left" style={{ paddingRight: 5 }}>
+                        <span
+                            style={{
+                                fontWeight: this.props.summaryFormat
+                                    ? 'bold'
+                                    : 'normal',
+                            }}
+                        >
+                            <span>
+                                {this.props.summaryFormat ? 'chain' : 'Chain'}
+                            </span>
+                            {!this.props.summaryFormat && (
+                                <span style={{ paddingLeft: 3 }}>
                                     <b>{this.props.chainId}</b>
                                 </span>
                             )}
@@ -82,10 +120,11 @@ export default class PdbChainInfo extends React.Component<IPdbChainInfoProps, {}
                         </span>
                     </div>
                     <div>
-                        {this.props.truncateText ?
-                            (<TextExpander text={moleculeInfo} />) :
-                            (<span>{moleculeInfo}</span>)
-                        }
+                        {this.props.truncateText ? (
+                            <TextExpander text={moleculeInfo} />
+                        ) : (
+                            <span>{moleculeInfo}</span>
+                        )}
                     </div>
                 </div>
             </div>
diff --git a/src/shared/components/PillTag/PillTag.tsx b/src/shared/components/PillTag/PillTag.tsx
index bb90d4ea3b6..ce5ac335ffd 100644
--- a/src/shared/components/PillTag/PillTag.tsx
+++ b/src/shared/components/PillTag/PillTag.tsx
@@ -1,9 +1,9 @@
 import * as React from 'react';
 import * as _ from 'lodash';
 import styles from './styles.module.scss';
-import {If} from 'react-if';
+import { If } from 'react-if';
 import contrast from 'contrast';
-import {computed} from 'mobx';
+import { computed } from 'mobx';
 
 export interface IPillTagProps {
     content: string;
@@ -12,23 +12,36 @@ export interface IPillTagProps {
 }
 
 export class PillTag extends React.Component<IPillTagProps, {}> {
-
     @computed
     get contentColor() {
         let _contrast = contrast(this.props.backgroundColor);
         if (_contrast === 'light') {
             return '#000';
         } else {
-            return '#fff'
+            return '#fff';
         }
     }
 
     render() {
-        return (<div className={styles.main} style={{background: this.props.backgroundColor, color: this.contentColor}}>
-            <span className={styles.content}>{this.props.content}</span>
-            <If condition={_.isFunction(this.props.onDelete)}>
-                <span data-test="pill-tag-delete" className={styles.delete} onClick={this.props.onDelete}><i className="fa fa-times-circle"></i></span>
-            </If>
-        </div>)
+        return (
+            <div
+                className={styles.main}
+                style={{
+                    background: this.props.backgroundColor,
+                    color: this.contentColor,
+                }}
+            >
+                <span className={styles.content}>{this.props.content}</span>
+                <If condition={_.isFunction(this.props.onDelete)}>
+                    <span
+                        data-test="pill-tag-delete"
+                        className={styles.delete}
+                        onClick={this.props.onDelete}
+                    >
+                        <i className="fa fa-times-circle"></i>
+                    </span>
+                </If>
+            </div>
+        );
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/PillTag/styles.module.scss b/src/shared/components/PillTag/styles.module.scss
index 4344c78b1ca..14c65ac68aa 100644
--- a/src/shared/components/PillTag/styles.module.scss
+++ b/src/shared/components/PillTag/styles.module.scss
@@ -2,21 +2,21 @@ $wide: 10px;
 $regular: 5px;
 
 .main {
-  -webkit-border-radius: 5px;
-  -moz-border-radius: 5px;
-  border-radius: 5px;
-  font-size: 13px;
-  display: flex;
-  align-content: center;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+    font-size: 13px;
+    display: flex;
+    align-content: center;
 }
 
 .content {
-  margin: $regular $wide $regular $wide;
+    margin: $regular $wide $regular $wide;
 }
 
 .delete {
-  padding-left: $regular;
-  margin: $regular $regular $regular 0;
-  border-left: 1px dashed white;
-  cursor: pointer;
-}
\ No newline at end of file
+    padding-left: $regular;
+    margin: $regular $regular $regular 0;
+    border-left: 1px dashed white;
+    cursor: pointer;
+}
diff --git a/src/shared/components/Scrollbar/ScrollBar.tsx b/src/shared/components/Scrollbar/ScrollBar.tsx
index 61a9591beae..a9b38527caa 100644
--- a/src/shared/components/Scrollbar/ScrollBar.tsx
+++ b/src/shared/components/Scrollbar/ScrollBar.tsx
@@ -1,90 +1,101 @@
-import * as React from "react";
-import Draggable from "react-draggable";
-import {CSSProperties} from "react";
-import {observer} from "mobx-react";
-import {action, observable, runInAction} from "mobx";
+import * as React from 'react';
+import Draggable from 'react-draggable';
+import { CSSProperties } from 'react';
+import { observer } from 'mobx-react';
+import { action, observable, runInAction } from 'mobx';
 
 import styles from './styles.module.scss';
-import autobind from "autobind-decorator";
+import autobind from 'autobind-decorator';
 
 export interface ScrollBarScrollEvent {
-    percentage:number;
-};
+    percentage: number;
+}
 
 interface IScrollBar {
-    onScroll?:(ev:ScrollBarScrollEvent)=>void;
-    getScrollEl:()=>HTMLElement;
-    style?:CSSProperties
+    onScroll?: (ev: ScrollBarScrollEvent) => void;
+    getScrollEl: () => HTMLElement;
+    style?: CSSProperties;
 }
 
 @observer
-export default class ScrollBar extends React.Component<IScrollBar,{}> {
-
-    public scrollbarEl:HTMLDivElement|undefined;
+export default class ScrollBar extends React.Component<IScrollBar, {}> {
+    public scrollbarEl: HTMLDivElement | undefined;
 
-    public get scrollEl(){
+    public get scrollEl() {
         return this.props.getScrollEl();
     }
 
-    public get overflow(){
-        return this.scrollEl.offsetWidth - (this.scrollEl.parentNode as HTMLElement).offsetWidth;
+    public get overflow() {
+        return (
+            this.scrollEl.offsetWidth -
+            (this.scrollEl.parentNode as HTMLElement).offsetWidth
+        );
     }
 
     @observable visible = false;
-    @observable handleWidth = "10%";
+    @observable handleWidth = '10%';
 
-    doScroll(ratio:number){
+    doScroll(ratio: number) {
         if (this.overflow > 0) {
-            this.scrollEl.style.left = ((ratio * this.overflow) * -1) + "px";
+            this.scrollEl.style.left = ratio * this.overflow * -1 + 'px';
         }
     }
 
-    componentDidMount(){
+    componentDidMount() {
         this.updateScrollbar();
     }
 
-    componentDidUpdate(){
+    componentDidUpdate() {
         this.updateScrollbar();
     }
 
-    updateScrollbar(){
+    updateScrollbar() {
         // we need to use a timeout here in order to account for fact that parent component ref
         // has not yet fired in lifecycle
-        setTimeout(()=>{
+        setTimeout(() => {
             if (this.overflow > 0) {
-                runInAction(()=>{
+                runInAction(() => {
                     this.visible = true;
-                    var overflowRatio = ((this.scrollEl.parentNode as HTMLElement).offsetWidth / this.scrollEl.offsetWidth );
-                    this.handleWidth = overflowRatio * 75 + "%";
+                    var overflowRatio =
+                        (this.scrollEl.parentNode as HTMLElement).offsetWidth /
+                        this.scrollEl.offsetWidth;
+                    this.handleWidth = overflowRatio * 75 + '%';
                 });
             }
-        },1);
+        }, 1);
     }
 
     @autobind
-    handleDragEvent(mouseEvent:any, dragEvent:any){
+    handleDragEvent(mouseEvent: any, dragEvent: any) {
         const node = dragEvent.node;
-        let percentage = dragEvent.x/(node.parentNode.offsetWidth - node.offsetWidth);
-        percentage = (percentage > 1) ? 1 : percentage;
-        percentage = (percentage < 0) ? 0 : percentage;
+        let percentage =
+            dragEvent.x / (node.parentNode.offsetWidth - node.offsetWidth);
+        percentage = percentage > 1 ? 1 : percentage;
+        percentage = percentage < 0 ? 0 : percentage;
         if (this.props.onScroll) this.props.onScroll({ percentage });
         this.doScroll(percentage);
     }
 
-    render(){
-
-        const style = Object.assign({}, { visibility:(this.visible) ? 'visible' : 'hidden' }, this.props.style);
-
-        return(
-
-            <div className={styles.scrollbar} style={style} ref={(el:HTMLDivElement)=>this.scrollbarEl=el}>
-                <Draggable bounds={"parent"} onDrag={this.handleDragEvent}>
-                    <div className={styles.handle} style={{width:this.handleWidth}}></div>
+    render() {
+        const style = Object.assign(
+            {},
+            { visibility: this.visible ? 'visible' : 'hidden' },
+            this.props.style
+        );
+
+        return (
+            <div
+                className={styles.scrollbar}
+                style={style}
+                ref={(el: HTMLDivElement) => (this.scrollbarEl = el)}
+            >
+                <Draggable bounds={'parent'} onDrag={this.handleDragEvent}>
+                    <div
+                        className={styles.handle}
+                        style={{ width: this.handleWidth }}
+                    ></div>
                 </Draggable>
             </div>
-
-        )
-
+        );
     }
-
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/Scrollbar/Scrollbar.spec.tsx b/src/shared/components/Scrollbar/Scrollbar.spec.tsx
index c0a22e95de1..68ffba74802 100644
--- a/src/shared/components/Scrollbar/Scrollbar.spec.tsx
+++ b/src/shared/components/Scrollbar/Scrollbar.spec.tsx
@@ -1,100 +1,93 @@
 import React from 'react';
-import {default as chai, assert} from 'chai';
+import { default as chai, assert } from 'chai';
 import chaiEnzyme from 'chai-enzyme';
-import {shallow, mount, ReactWrapper} from 'enzyme';
+import { shallow, mount, ReactWrapper } from 'enzyme';
 import sinon from 'sinon';
-import ScrollBar from "./ScrollBar";
-import {runInAction} from "mobx";
-
-describe('Scrollbar',()=>{
+import ScrollBar from './ScrollBar';
+import { runInAction } from 'mobx';
 
+describe('Scrollbar', () => {
     var wrapper;
     var instance: ScrollBar;
     var fakeInstance: any;
 
-    before(()=>{
-
+    before(() => {
         fakeInstance = {
-            overflow:false,
-            visible:false,
+            overflow: false,
+            visible: false,
             scrollEl: {
                 parentNode: {
-                    offsetWidth:500
+                    offsetWidth: 500,
                 },
-                offsetWidth:400,
-                style:{}
-            }
+                offsetWidth: 400,
+                style: {},
+            },
         };
 
-        wrapper = mount(<ScrollBar getScrollEl={()=>fakeInstance.scrollEl} />);
+        wrapper = mount(
+            <ScrollBar getScrollEl={() => fakeInstance.scrollEl} />
+        );
         instance = wrapper.instance() as ScrollBar;
     });
 
-    beforeEach(()=>{
-
-    });
-
-   it('detects absence of overflow and hides',(done)=>{
-
-       assert.equal(instance.overflow, -100, 'overflow is negative');
+    beforeEach(() => {});
 
-       setTimeout(()=>{
-           assert.isFalse(instance.visible, "not visible if overflow <=0");
-           done();
-       },3);
+    it('detects absence of overflow and hides', done => {
+        assert.equal(instance.overflow, -100, 'overflow is negative');
 
-   });
-
-    it('detects overflow, shows, calculates handle percentage',(done)=>{
+        setTimeout(() => {
+            assert.isFalse(instance.visible, 'not visible if overflow <=0');
+            done();
+        }, 3);
+    });
 
+    it('detects overflow, shows, calculates handle percentage', done => {
         fakeInstance.scrollEl.parentNode.offsetWidth = 300;
 
         instance.forceUpdate();
 
         assert.equal(instance.overflow, 100, 'overflow is positive');
 
-        setTimeout(()=>{
-            assert.isTrue(instance.visible, "visible if overflow > 0");
-            assert.equal(instance.handleWidth,"56.25%");
+        setTimeout(() => {
+            assert.isTrue(instance.visible, 'visible if overflow > 0');
+            assert.equal(instance.handleWidth, '56.25%');
             done();
-        },3);
-
+        }, 3);
     });
 
-    it('handles drag event properly',()=>{
-
+    it('handles drag event properly', () => {
         fakeInstance.scrollEl.parentNode.offsetWidth = 300;
 
         instance.forceUpdate();
 
-        const doScrollStub = sinon.stub(instance,"doScroll");
+        const doScrollStub = sinon.stub(instance, 'doScroll');
 
         const handleNode = {
-            offsetWidth:50,
+            offsetWidth: 50,
             parentNode: {
-                offsetWidth:350
-            }
+                offsetWidth: 350,
+            },
         };
 
-        instance.handleDragEvent({},{ node:handleNode, x:30 });
-        assert(doScrollStub.calledOnce, "calls doScroll");
-        assert.equal(doScrollStub.args[0][0] , 0.1, "calls doScroll with correct percentage");
+        instance.handleDragEvent({}, { node: handleNode, x: 30 });
+        assert(doScrollStub.calledOnce, 'calls doScroll');
+        assert.equal(
+            doScrollStub.args[0][0],
+            0.1,
+            'calls doScroll with correct percentage'
+        );
 
-        instance.handleDragEvent({},{ node:handleNode, x:1000 });
-        assert.equal(doScrollStub.args[1][0] , 1, "handles ratio above 1");
+        instance.handleDragEvent({}, { node: handleNode, x: 1000 });
+        assert.equal(doScrollStub.args[1][0], 1, 'handles ratio above 1');
 
         handleNode.offsetWidth = 400;
-        instance.handleDragEvent({},{ node:handleNode, x:30 });
-        assert.equal(doScrollStub.args[2][0] , 0, "handles ratio below 1");
-
-
+        instance.handleDragEvent({}, { node: handleNode, x: 30 });
+        assert.equal(doScrollStub.args[2][0], 0, 'handles ratio below 1');
     });
 
-    it('sets left prop on scroll pane', ()=>{
+    it('sets left prop on scroll pane', () => {
         fakeInstance.scrollEl.parentNode.offsetWidth = 300;
-        instance.doScroll(.1);
-        instance.scrollEl.style.left = "-10px";
+        instance.doScroll(0.1);
+        instance.scrollEl.style.left = '-10px';
     });
-
-
-});
\ No newline at end of file
+});
diff --git a/src/shared/components/Scrollbar/styles.module.scss b/src/shared/components/Scrollbar/styles.module.scss
index 5c267d9cb38..3c1f5bdd742 100644
--- a/src/shared/components/Scrollbar/styles.module.scss
+++ b/src/shared/components/Scrollbar/styles.module.scss
@@ -1,17 +1,17 @@
 .scrollbar {
-  width:100%;
-  background:#eee;
-  position:relative;
-  border-radius:4px;
-  margin-bottom: 1px;
+    width: 100%;
+    background: #eee;
+    position: relative;
+    border-radius: 4px;
+    margin-bottom: 1px;
 }
 
 .handle {
-  border-radius:4px;
-  width:10%;
-  height:5px;
-  background:#999;
-  &:hover {
-    background:#666;
-  }
+    border-radius: 4px;
+    width: 10%;
+    height: 5px;
+    background: #999;
+    &:hover {
+        background: #666;
+    }
 }
diff --git a/src/shared/components/SocialAuthButton.tsx b/src/shared/components/SocialAuthButton.tsx
index bffcdce965d..0f8c3d18066 100644
--- a/src/shared/components/SocialAuthButton.tsx
+++ b/src/shared/components/SocialAuthButton.tsx
@@ -1,19 +1,25 @@
-import * as React from "react";
-import {AppStore} from "../../AppStore";
-import {openSocialAuthWindow} from "../lib/openSocialAuthWindow";
+import * as React from 'react';
+import { AppStore } from '../../AppStore';
+import { openSocialAuthWindow } from '../lib/openSocialAuthWindow';
 
 export interface ISocialAuthButtonProps {
-    appStore:AppStore;
+    appStore: AppStore;
 }
 
-export default class SocialAuthButton extends React.Component<ISocialAuthButtonProps,{}> {
+export default class SocialAuthButton extends React.Component<
+    ISocialAuthButtonProps,
+    {}
+> {
     render() {
         return (
             <div className="identity">
-                <button className="btn btn-default" onClick={()=>openSocialAuthWindow(this.props.appStore)}>
+                <button
+                    className="btn btn-default"
+                    onClick={() => openSocialAuthWindow(this.props.appStore)}
+                >
                     Login
                 </button>
             </div>
         );
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/StudyDataDownloadLink/StudyDataDownloadLink.tsx b/src/shared/components/StudyDataDownloadLink/StudyDataDownloadLink.tsx
index 3f34e318953..a69b94e0127 100644
--- a/src/shared/components/StudyDataDownloadLink/StudyDataDownloadLink.tsx
+++ b/src/shared/components/StudyDataDownloadLink/StudyDataDownloadLink.tsx
@@ -1,11 +1,31 @@
-import * as React from "react";
-import { trackEvent } from "shared/lib/tracking";
+import * as React from 'react';
+import { trackEvent } from 'shared/lib/tracking';
 
-export class StudyDataDownloadLink extends React.Component<{ studyId: string, className?: string }, {}> {
+export class StudyDataDownloadLink extends React.Component<
+    { studyId: string; className?: string },
+    {}
+> {
     render() {
-        return <a className="dataset-table-download-link" style={{display: 'block'}}
-                  href={'http://download.cbioportal.org/' + this.props.studyId + '.tar.gz'} download onClick={() => trackEvent({ category:"download", action: "study download", label:this.props.studyId })}>
-            <i className='fa fa-download'/>
-        </a>
+        return (
+            <a
+                className="dataset-table-download-link"
+                style={{ display: 'block' }}
+                href={
+                    'http://download.cbioportal.org/' +
+                    this.props.studyId +
+                    '.tar.gz'
+                }
+                download
+                onClick={() =>
+                    trackEvent({
+                        category: 'download',
+                        action: 'study download',
+                        label: this.props.studyId,
+                    })
+                }
+            >
+                <i className="fa fa-download" />
+            </a>
+        );
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/StudyLink/StudyLink.tsx b/src/shared/components/StudyLink/StudyLink.tsx
index d8143e316ff..dced8c88964 100644
--- a/src/shared/components/StudyLink/StudyLink.tsx
+++ b/src/shared/components/StudyLink/StudyLink.tsx
@@ -1,10 +1,19 @@
-import * as React from "react";
-import {CancerStudy} from "../../api/generated/CBioPortalAPI";
-import {Link} from "react-router";
+import * as React from 'react';
+import { CancerStudy } from '../../api/generated/CBioPortalAPI';
+import { Link } from 'react-router';
 
-export class StudyLink extends React.Component<{ studyId: string, className?: string }, {}> {
+export class StudyLink extends React.Component<
+    { studyId: string; className?: string },
+    {}
+> {
     render() {
-        return <Link to={`/study?id=${this.props.studyId}`}
-                     className={this.props.className}>{this.props.children}</Link>
+        return (
+            <Link
+                to={`/study?id=${this.props.studyId}`}
+                className={this.props.className}
+            >
+                {this.props.children}
+            </Link>
+        );
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/TextExpander.tsx b/src/shared/components/TextExpander.tsx
index 6e644f223f2..38736e90e1a 100644
--- a/src/shared/components/TextExpander.tsx
+++ b/src/shared/components/TextExpander.tsx
@@ -1,72 +1,70 @@
 import * as React from 'react';
-import {observer} from "mobx-react";
-import {If, Else, Then} from 'react-if';
+import { observer } from 'mobx-react';
+import { If, Else, Then } from 'react-if';
 import TextTruncate from 'react-text-truncate';
-import {observable} from "mobx";
+import { observable } from 'mobx';
 
-export interface ITextExpanderProps
-{
-    text?: string|JSX.Element|null;
+export interface ITextExpanderProps {
+    text?: string | JSX.Element | null;
     line?: number;
-    expandIndicator?: string|JSX.Element;
-    collapseIndicator?: string|JSX.Element;
+    expandIndicator?: string | JSX.Element;
+    collapseIndicator?: string | JSX.Element;
     truncateText?: string;
 }
 
 @observer
-export default class TextExpander extends React.Component<ITextExpanderProps, {}> {
+export default class TextExpander extends React.Component<
+    ITextExpanderProps,
+    {}
+> {
     @observable protected isTextTruncated: boolean = true;
 
     public static defaultProps = {
         line: 1,
-        expandIndicator: "[...]",
-        collapseIndicator: "[^]",
-        truncateText: " "
+        expandIndicator: '[...]',
+        collapseIndicator: '[^]',
+        truncateText: ' ',
     };
 
-    constructor(props:ITextExpanderProps) {
+    constructor(props: ITextExpanderProps) {
         super(props);
 
         this.toggleText = this.toggleText.bind(this);
     }
 
-    public render()
-    {
+    public render() {
         let content = this.props.text;
 
         // TextTruncate can only handle "string", otherwise we get a warning message
         // If "text" is not string we just display it as is
-        if (typeof this.props.text === "string") {
+        if (typeof this.props.text === 'string') {
             content = (
                 <TextTruncate
                     text={this.props.text}
                     line={this.props.line}
                     truncateText={this.props.truncateText}
-                    textTruncateChild={(
+                    textTruncateChild={
                         <a
                             onClick={this.toggleText}
-                            style={{cursor: "pointer"}}
+                            style={{ cursor: 'pointer' }}
                         >
                             {this.props.expandIndicator}
                         </a>
-                    )}
+                    }
                 />
             );
         }
 
-
         return (
             <If condition={this.isTextTruncated}>
-                <Then>
-                    {content}
-                </Then>
+                <Then>{content}</Then>
                 <Else>
                     <span>
                         <span>{this.props.text} </span>
                         <span>
                             <a
                                 onClick={this.toggleText}
-                                style={{cursor: "pointer"}}
+                                style={{ cursor: 'pointer' }}
                             >
                                 {this.props.collapseIndicator}
                             </a>
diff --git a/src/shared/components/TruncatedText.spec.tsx b/src/shared/components/TruncatedText.spec.tsx
index ef3a4b2728a..2ad45d0a69e 100644
--- a/src/shared/components/TruncatedText.spec.tsx
+++ b/src/shared/components/TruncatedText.spec.tsx
@@ -1,43 +1,66 @@
-import {default as TruncatedText, truncateText} from "./TruncatedText";
-import {DefaultTooltip} from "cbioportal-frontend-commons";
+import { default as TruncatedText, truncateText } from './TruncatedText';
+import { DefaultTooltip } from 'cbioportal-frontend-commons';
 import React from 'react';
 import { assert } from 'chai';
-import {shallow, mount, ReactWrapper} from 'enzyme';
+import { shallow, mount, ReactWrapper } from 'enzyme';
 
 /**
  * @author Selcuk Onur Sumer
  */
 describe('TruncatedText', () => {
-
-    let componentShort:ReactWrapper<any, any>;
-    let componentLong:ReactWrapper<any, any>;
+    let componentShort: ReactWrapper<any, any>;
+    let componentLong: ReactWrapper<any, any>;
 
     before(() => {
-        const shortText = "noTip";
-        const longText = "it might be a good idea to truncate this text and show the full value in a tooltip";
+        const shortText = 'noTip';
+        const longText =
+            'it might be a good idea to truncate this text and show the full value in a tooltip';
 
-        componentShort = mount(<TruncatedText text={shortText} tooltip={<span>{shortText}</span>}/>);
-        componentLong = mount(<TruncatedText text={longText} tooltip={<span>{longText}</span>}/>);
+        componentShort = mount(
+            <TruncatedText
+                text={shortText}
+                tooltip={<span>{shortText}</span>}
+            />
+        );
+        componentLong = mount(
+            <TruncatedText text={longText} tooltip={<span>{longText}</span>} />
+        );
     });
 
     it('truncates the text properly with a suffix', () => {
-        const shortText = "short_text";
-        const longText = "this_is_a_quite_long_text_in_my_opinion!";
+        const shortText = 'short_text';
+        const longText = 'this_is_a_quite_long_text_in_my_opinion!';
 
-        assert.equal(truncateText(shortText, "...", shortText.length + 5, 2), shortText,
-            "actual and truncated values should be the same for short texts");
-        assert.notEqual(truncateText(longText, "...", 16, 2), longText,
-            "actual and truncated values should be the different for long texts");
-        assert.equal(truncateText(longText, "...", 16, 2).length, 16 + "...".length,
-            "truncated size should have fixed number of characters");
-        assert.equal(truncateText(longText, "...", 16, 2).indexOf("..."), 16,
-            "suffix should be at the end");
+        assert.equal(
+            truncateText(shortText, '...', shortText.length + 5, 2),
+            shortText,
+            'actual and truncated values should be the same for short texts'
+        );
+        assert.notEqual(
+            truncateText(longText, '...', 16, 2),
+            longText,
+            'actual and truncated values should be the different for long texts'
+        );
+        assert.equal(
+            truncateText(longText, '...', 16, 2).length,
+            16 + '...'.length,
+            'truncated size should have fixed number of characters'
+        );
+        assert.equal(
+            truncateText(longText, '...', 16, 2).indexOf('...'),
+            16,
+            'suffix should be at the end'
+        );
     });
 
     it('properly adds tooltip', () => {
-        assert.isFalse(componentShort.find(DefaultTooltip).exists(),
-            'Tooltip should not exists for short texts');
-        assert.isTrue(componentLong.find(DefaultTooltip).exists(),
-            'Tooltip should exists for long texts');
+        assert.isFalse(
+            componentShort.find(DefaultTooltip).exists(),
+            'Tooltip should not exists for short texts'
+        );
+        assert.isTrue(
+            componentLong.find(DefaultTooltip).exists(),
+            'Tooltip should exists for long texts'
+        );
     });
-});
\ No newline at end of file
+});
diff --git a/src/shared/components/TruncatedText.tsx b/src/shared/components/TruncatedText.tsx
index d29866d95f8..ecbb582eeff 100644
--- a/src/shared/components/TruncatedText.tsx
+++ b/src/shared/components/TruncatedText.tsx
@@ -1,32 +1,36 @@
 import * as React from 'react';
 import classNames from 'classnames';
-import {observer} from "mobx-react";
-import {computed} from "mobx";
-import {DefaultTooltip} from "cbioportal-frontend-commons";
+import { observer } from 'mobx-react';
+import { computed } from 'mobx';
+import { DefaultTooltip } from 'cbioportal-frontend-commons';
 
-export interface ITruncatedTextProps
-{
+export interface ITruncatedTextProps {
     text: string;
     className?: string;
     maxLength?: number; // max allowed length of the text
-    buffer?: number;    // buffer length before considering truncating the text
-    suffix?: string;    // will be added to the end of the text if truncated
-    addTooltip?: 'truncated'|'always' | 'never'; // when to add the tooltip
+    buffer?: number; // buffer length before considering truncating the text
+    suffix?: string; // will be added to the end of the text if truncated
+    addTooltip?: 'truncated' | 'always' | 'never'; // when to add the tooltip
     tooltip?: JSX.Element; // tooltip content
 }
 
-export function isTooLong(text: string, maxLength: number, buffer?: number):boolean
-{
-    return text != null && (text.length > maxLength + (buffer || 0));
+export function isTooLong(
+    text: string,
+    maxLength: number,
+    buffer?: number
+): boolean {
+    return text != null && text.length > maxLength + (buffer || 0);
 }
 
-export function truncateText(text: string, suffix: string, maxLength: number, buffer?: number)
-{
-    if (isTooLong(text, maxLength, buffer))
-    {
+export function truncateText(
+    text: string,
+    suffix: string,
+    maxLength: number,
+    buffer?: number
+) {
+    if (isTooLong(text, maxLength, buffer)) {
         return text.substring(0, maxLength) + suffix;
-    }
-    else {
+    } else {
         return text;
     }
 }
@@ -35,19 +39,21 @@ export function truncateText(text: string, suffix: string, maxLength: number, bu
  * @author Selcuk Onur Sumer
  */
 @observer
-export default class TruncatedText extends React.Component<ITruncatedTextProps, {}> {
+export default class TruncatedText extends React.Component<
+    ITruncatedTextProps,
+    {}
+> {
     public static defaultProps = {
         maxLength: 50,
         buffer: 2,
-        suffix: "...",
-        addTooltip: 'truncated'
+        suffix: '...',
+        addTooltip: 'truncated',
     };
 
-    public render()
-    {
+    public render() {
         let content = (
             <span
-                style={{whiteSpace: "nowrap"}}
+                style={{ whiteSpace: 'nowrap' }}
                 className={classNames(this.props.className)}
             >
                 {this.truncatedText}
@@ -57,7 +63,13 @@ export default class TruncatedText extends React.Component<ITruncatedTextProps,
         if (this.needsTooltip) {
             content = (
                 <DefaultTooltip
-                    overlay={() => this.props.tooltip || <div style={{maxWidth: 500}}>{this.props.text}</div>}
+                    overlay={() =>
+                        this.props.tooltip || (
+                            <div style={{ maxWidth: 500 }}>
+                                {this.props.text}
+                            </div>
+                        )
+                    }
                     placement="right"
                     destroyTooltipOnHide={true}
                 >
@@ -69,16 +81,15 @@ export default class TruncatedText extends React.Component<ITruncatedTextProps,
         return content;
     }
 
-    @computed get needsTooltip(): boolean
-    {
+    @computed get needsTooltip(): boolean {
         return (
             this.props.addTooltip !== 'never' &&
-            (this.props.addTooltip === 'always' || (this.props.addTooltip === 'truncated' && this.isTooLong))
+            (this.props.addTooltip === 'always' ||
+                (this.props.addTooltip === 'truncated' && this.isTooLong))
         );
     }
 
-    @computed get isTooLong(): boolean
-    {
+    @computed get isTooLong(): boolean {
         return isTooLong(
             this.props.text,
             this.props.maxLength || TruncatedText.defaultProps.maxLength,
@@ -86,8 +97,7 @@ export default class TruncatedText extends React.Component<ITruncatedTextProps,
         );
     }
 
-    @computed get truncatedText(): string
-    {
+    @computed get truncatedText(): string {
         return truncateText(
             this.props.text,
             this.props.suffix || TruncatedText.defaultProps.suffix,
diff --git a/src/shared/components/TruncatedTextWithTooltipSVG.tsx b/src/shared/components/TruncatedTextWithTooltipSVG.tsx
index 9c7ed297c39..2b04b1ecf45 100644
--- a/src/shared/components/TruncatedTextWithTooltipSVG.tsx
+++ b/src/shared/components/TruncatedTextWithTooltipSVG.tsx
@@ -1,47 +1,49 @@
-import * as React from "react";
-import {observer} from "mobx-react";
-import {action, computed, observable} from "mobx";
-import autobind from "autobind-decorator";
-import {Popover} from "react-bootstrap";
-import classnames from "classnames";
-import styles from "../../pages/resultsView/survival/styles.module.scss";
-import {truncateWithEllipsisReport} from "cbioportal-frontend-commons";
-import {Portal} from "react-portal";
+import * as React from 'react';
+import { observer } from 'mobx-react';
+import { action, computed, observable } from 'mobx';
+import autobind from 'autobind-decorator';
+import { Popover } from 'react-bootstrap';
+import classnames from 'classnames';
+import styles from '../../pages/resultsView/survival/styles.module.scss';
+import { truncateWithEllipsisReport } from 'cbioportal-frontend-commons';
+import { Portal } from 'react-portal';
 
 export interface ITruncatedTextSVGProps {
-    x?:number;
-    y?:number;
-    text?:string;
-    prefixTspans?:any[]; // tspans. typescript doesn't play nice though so it has to be any
-    renderTruncatedText?:(truncatedText:string)=>any[]; // tspans. typescript doesn't play nice though so it has to be any
-    maxWidth?:number;
-    suffix?:string;
-    tooltip?:(datum?:any)=>JSX.Element;
-    tooltipPlacement?:string;
-    alwaysShowTooltip?:boolean;
-    dy?:any;
-    dx?:any;
-    textRef?:(elt:SVGTextElement|null)=>void;
+    x?: number;
+    y?: number;
+    text?: string;
+    prefixTspans?: any[]; // tspans. typescript doesn't play nice though so it has to be any
+    renderTruncatedText?: (truncatedText: string) => any[]; // tspans. typescript doesn't play nice though so it has to be any
+    maxWidth?: number;
+    suffix?: string;
+    tooltip?: (datum?: any) => JSX.Element;
+    tooltipPlacement?: string;
+    alwaysShowTooltip?: boolean;
+    dy?: any;
+    dx?: any;
+    textRef?: (elt: SVGTextElement | null) => void;
     //victory
-    datum?:any;
-    transform?:(x:number, y:number)=>string;
-    verticalAnchor?:string;
-    textAnchor?:string;
-    style?:{
-        fontSize:number;
-        fontFamily:string;
+    datum?: any;
+    transform?: (x: number, y: number) => string;
+    verticalAnchor?: string;
+    textAnchor?: string;
+    style?: {
+        fontSize: number;
+        fontFamily: string;
     };
 }
 
 @observer
-export default class TruncatedTextWithTooltipSVG extends React.Component<ITruncatedTextSVGProps, {}> {
-
-    static defaultProps:Partial<ITruncatedTextSVGProps> = {
-        maxWidth:100,
-        suffix:"..."
+export default class TruncatedTextWithTooltipSVG extends React.Component<
+    ITruncatedTextSVGProps,
+    {}
+> {
+    static defaultProps: Partial<ITruncatedTextSVGProps> = {
+        maxWidth: 100,
+        suffix: '...',
     };
 
-    @observable mousePosition = { x:0, y:0 };
+    @observable mousePosition = { x: 0, y: 0 };
     @observable tooltipOpen = false;
 
     @computed get tooltipElt() {
@@ -53,39 +55,41 @@ export default class TruncatedTextWithTooltipSVG extends React.Component<ITrunca
     }
 
     @autobind
-    @action private onMouseOver() {
+    @action
+    private onMouseOver() {
         this.tooltipOpen = true;
     }
 
     @autobind
-    @action private onMouseOut() {
+    @action
+    private onMouseOut() {
         this.tooltipOpen = false;
     }
 
-    @autobind private onMouseMove(e:React.MouseEvent<any>) {
+    @autobind private onMouseMove(e: React.MouseEvent<any>) {
         this.mousePosition.x = e.pageX;
         this.mousePosition.y = e.pageY;
     }
 
     @computed get fontFamily() {
-        let font = "Arial";
+        let font = 'Arial';
         if (this.props.style && this.props.style.fontFamily) {
-            font = this.props.style.fontFamily.split(", ")[0];
+            font = this.props.style.fontFamily.split(', ')[0];
         }
         return font;
     }
 
     @computed get fontSize() {
-        let size = "13px";
+        let size = '13px';
         if (this.props.style && this.props.style.fontSize) {
-            size = this.props.style.fontSize + "px";
+            size = this.props.style.fontSize + 'px';
         }
         return size;
     }
 
     @computed get textReport() {
         return truncateWithEllipsisReport(
-            this.props.text || "",
+            this.props.text || '',
             this.props.maxWidth!,
             this.fontFamily,
             this.fontSize
@@ -101,12 +105,27 @@ export default class TruncatedTextWithTooltipSVG extends React.Component<ITrunca
     }
 
     render() {
-        const {text, maxWidth, datum, suffix, tooltip,
-            prefixTspans, alwaysShowTooltip, renderTruncatedText,
-            transform, tooltipPlacement, textRef, ...rest} = this.props;
+        const {
+            text,
+            maxWidth,
+            datum,
+            suffix,
+            tooltip,
+            prefixTspans,
+            alwaysShowTooltip,
+            renderTruncatedText,
+            transform,
+            tooltipPlacement,
+            textRef,
+            ...rest
+        } = this.props;
 
         let transformApplied = undefined;
-        if (transform && this.props.x !== undefined && this.props.y !== undefined) {
+        if (
+            transform &&
+            this.props.x !== undefined &&
+            this.props.y !== undefined
+        ) {
             transformApplied = transform(this.props.x, this.props.y);
         }
 
@@ -123,23 +142,35 @@ export default class TruncatedTextWithTooltipSVG extends React.Component<ITrunca
                     {this.props.prefixTspans}
                     {this.truncatedText}
                 </text>
-                {(this.textReport.isTruncated || this.props.alwaysShowTooltip) && this.tooltipOpen && (
-                    <Portal isOpened={true} node={document.body}>
-                        <Popover
-                            arrowOffsetTop={17}
-                            className={classnames("cbioportal-frontend", "cbioTooltip", styles.Tooltip)}
-                            positionLeft={this.mousePosition.x+(tooltipPlacement === "left" ? -8 : 8)}
-                            positionTop={this.mousePosition.y-17}
-                            style={{
-                            transform: (tooltipPlacement === "left" ? "translate(-100%,0%)" : undefined)
-                        }}
-                            placement={tooltipPlacement}
-                        >
-                            {this.tooltipElt}
-                        </Popover>
-                    </Portal>
-                )}
+                {(this.textReport.isTruncated ||
+                    this.props.alwaysShowTooltip) &&
+                    this.tooltipOpen && (
+                        <Portal isOpened={true} node={document.body}>
+                            <Popover
+                                arrowOffsetTop={17}
+                                className={classnames(
+                                    'cbioportal-frontend',
+                                    'cbioTooltip',
+                                    styles.Tooltip
+                                )}
+                                positionLeft={
+                                    this.mousePosition.x +
+                                    (tooltipPlacement === 'left' ? -8 : 8)
+                                }
+                                positionTop={this.mousePosition.y - 17}
+                                style={{
+                                    transform:
+                                        tooltipPlacement === 'left'
+                                            ? 'translate(-100%,0%)'
+                                            : undefined,
+                                }}
+                                placement={tooltipPlacement}
+                            >
+                                {this.tooltipElt}
+                            </Popover>
+                        </Portal>
+                    )}
             </>
-        )
+        );
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/ValidationAlert.tsx b/src/shared/components/ValidationAlert.tsx
index 974f1b514a5..858ecac3540 100644
--- a/src/shared/components/ValidationAlert.tsx
+++ b/src/shared/components/ValidationAlert.tsx
@@ -4,20 +4,23 @@ export interface IValidationAlertProps {
     urlValidationError: string;
 }
 
-export default class ValidationAlert extends React.Component<IValidationAlertProps, {}> {
-
+export default class ValidationAlert extends React.Component<
+    IValidationAlertProps,
+    {}
+> {
     public render() {
         return (
             <div className="alert alert-danger urlError" role="alert">
                 <i className="fa fa-warning" aria-hidden="true"></i>
                 <h3>The URL is invalid</h3>
                 <ul>
-                    { this.props.urlValidationError.split(".").map(
-                        (message: string) => (message.length > 0) ? <li>{message}</li> : null)
-                    }
+                    {this.props.urlValidationError
+                        .split('.')
+                        .map((message: string) =>
+                            message.length > 0 ? <li>{message}</li> : null
+                        )}
                 </ul>
             </div>
         );
     }
-
 }
diff --git a/src/shared/components/WindowWidthBox/WindowWidthBox.tsx b/src/shared/components/WindowWidthBox/WindowWidthBox.tsx
index 89a18255290..ab5d945278f 100644
--- a/src/shared/components/WindowWidthBox/WindowWidthBox.tsx
+++ b/src/shared/components/WindowWidthBox/WindowWidthBox.tsx
@@ -1,32 +1,38 @@
-import WindowStore from "../window/WindowStore";
-import * as React from "react";
-import {computed, observable} from "mobx";
-import {observer} from "mobx-react";
-import {CSSProperties, HTMLProps} from "react";
+import WindowStore from '../window/WindowStore';
+import * as React from 'react';
+import { computed, observable } from 'mobx';
+import { observer } from 'mobx-react';
+import { CSSProperties, HTMLProps } from 'react';
 
 interface IWindowWidthBoxProps extends React.HTMLProps<HTMLDivElement> {
-    offset:number;
+    offset: number;
 }
 
 @observer
-export class WindowWidthBox extends React.Component<IWindowWidthBoxProps,{}>{
+export class WindowWidthBox extends React.Component<IWindowWidthBoxProps, {}> {
+    wrapper: HTMLDivElement;
 
-    wrapper:HTMLDivElement;
-
-    @computed get offset(){
+    @computed get offset() {
         return this.props.offset || 0;
     }
 
-    @computed get style():CSSProperties {
-        return {width: WindowStore.size.width - this.offset, overflowX: 'auto'};
+    @computed get style(): CSSProperties {
+        return {
+            width: WindowStore.size.width - this.offset,
+            overflowX: 'auto',
+        };
     }
 
-    render(){
+    render() {
         return (
-            <div className={this.props.className||""} {...this.props} ref={(el:HTMLDivElement)=>this.wrapper = el} style={this.style}>
-                { this.props.children }
+            <div
+                className={this.props.className || ''}
+                {...this.props}
+                ref={(el: HTMLDivElement) => (this.wrapper = el)}
+                style={this.style}
+            >
+                {this.props.children}
             </div>
-        )
+        );
     }
-
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/annotation/Civic.spec.tsx b/src/shared/components/annotation/Civic.spec.tsx
index de7946f7116..adfe51cf22d 100644
--- a/src/shared/components/annotation/Civic.spec.tsx
+++ b/src/shared/components/annotation/Civic.spec.tsx
@@ -1,131 +1,140 @@
 import Civic from './Civic';
 import React from 'react';
 import { assert, expect } from 'chai';
-import {shallow, mount, ReactWrapper} from 'enzyme';
+import { shallow, mount, ReactWrapper } from 'enzyme';
 import sinon from 'sinon';
-import {getExpectedCivicEntry, getExpectedCnaCivicEntry} from "test/CivicMockUtils";
-import CivicCard from "./CivicCard";
-import {ICivicProps} from "./Civic";
+import {
+    getExpectedCivicEntry,
+    getExpectedCnaCivicEntry,
+} from 'test/CivicMockUtils';
+import CivicCard from './CivicCard';
+import { ICivicProps } from './Civic';
 
 describe('Civic with no data', () => {
     const props = {
         civicEntry: undefined,
-        civicStatus: "complete",
-        hasCivicVariants: true
+        civicStatus: 'complete',
+        hasCivicVariants: true,
     } as ICivicProps;
 
     let component: ReactWrapper<any, any>;
 
     before(() => {
-        component = mount(<Civic {...props}/>);
+        component = mount(<Civic {...props} />);
     });
 
     it('displays a load spinner when there is no civic data', () => {
-        const spinner = component.find(".fa-spinner");
+        const spinner = component.find('.fa-spinner');
 
-        assert.isTrue(spinner.exists(),
-            "Spinner component should exist");
+        assert.isTrue(spinner.exists(), 'Spinner component should exist');
     });
 
-    after(() => {
-
-    });
+    after(() => {});
 });
 
 describe('Civic with data with variants', () => {
     const props = {
         civicEntry: getExpectedCivicEntry(),
-        civicStatus: "complete",
-        hasCivicVariants: true
+        civicStatus: 'complete',
+        hasCivicVariants: true,
     } as ICivicProps;
 
     let component: ReactWrapper<any, any>;
 
     before(() => {
-        component = mount(<Civic {...props}/>);
+        component = mount(<Civic {...props} />);
     });
 
     it('displays the correct Civic icon', () => {
         const civicIcon = component.find('img');
 
-        assert.isTrue(civicIcon.exists(),
-        "Civic icon should exist");
-
-        assert.equal(civicIcon.prop("width"), 14,
-        "Civic icon width should be equal to 14");
-
-        assert.equal(civicIcon.prop("height"), 14,
-        "Civic icon height should be equal to 14");
-
-        assert.equal(civicIcon.prop("src"), require("./images/civic-logo.png"),
-        "Civic icon should be civic-logo.png");
+        assert.isTrue(civicIcon.exists(), 'Civic icon should exist');
+
+        assert.equal(
+            civicIcon.prop('width'),
+            14,
+            'Civic icon width should be equal to 14'
+        );
+
+        assert.equal(
+            civicIcon.prop('height'),
+            14,
+            'Civic icon height should be equal to 14'
+        );
+
+        assert.equal(
+            civicIcon.prop('src'),
+            require('./images/civic-logo.png'),
+            'Civic icon should be civic-logo.png'
+        );
     });
 
-    after(() => {
-
-    });
+    after(() => {});
 });
 
 describe('Civic with data with no variants', () => {
     const props = {
         civicEntry: getExpectedCnaCivicEntry(),
-        civicStatus: "complete",
-        hasCivicVariants: false
+        civicStatus: 'complete',
+        hasCivicVariants: false,
     } as ICivicProps;
 
     let component: ReactWrapper<any, any>;
 
     before(() => {
-        component = mount(<Civic {...props}/>);
+        component = mount(<Civic {...props} />);
     });
 
     it('displays the correct Civic icon', () => {
         const civicIcon = component.find('img');
 
-        assert.isTrue(civicIcon.exists(),
-        "Civic icon should exist");
-
-        assert.equal(civicIcon.prop("width"), 14,
-        "Civic icon width should be equal to 14");
-
-        assert.equal(civicIcon.prop("height"), 14,
-        "Civic icon height should be equal to 14");
-
-        assert.equal(civicIcon.prop("src"), require("./images/civic-logo-no-variants.png"),
-        "Civic icon should be civic-logo-no-variants.png");
+        assert.isTrue(civicIcon.exists(), 'Civic icon should exist');
+
+        assert.equal(
+            civicIcon.prop('width'),
+            14,
+            'Civic icon width should be equal to 14'
+        );
+
+        assert.equal(
+            civicIcon.prop('height'),
+            14,
+            'Civic icon height should be equal to 14'
+        );
+
+        assert.equal(
+            civicIcon.prop('src'),
+            require('./images/civic-logo-no-variants.png'),
+            'Civic icon should be civic-logo-no-variants.png'
+        );
     });
 
-    after(() => {
-
-    });
+    after(() => {});
 });
 
 describe('Counts correctly', () => {
-
-    before(() => {
-    });
+    before(() => {});
 
     it('Gives 1 point per entry', () => {
         const value = Civic.sortValue(getExpectedCnaCivicEntry());
-        
-        assert.equal(value, 1,
-        "Correctly gives 1 point for an entry");
+
+        assert.equal(value, 1, 'Correctly gives 1 point for an entry');
     });
 
     it('Gives 0 points if the entry is undefined', () => {
         const value = Civic.sortValue(undefined);
-        
-        assert.equal(value, 0,
-        "Correctly gives 0 points if the entry is undefined");
+
+        assert.equal(
+            value,
+            0,
+            'Correctly gives 0 points if the entry is undefined'
+        );
     });
-    
+
     it('Gives 0 points if the entry is null', () => {
         const value = Civic.sortValue(null);
-        
-        assert.equal(value, 0,
-        "Correctly gives 0 points if the entry is null");
-    });
-    after(() => {
 
+        assert.equal(value, 0, 'Correctly gives 0 points if the entry is null');
     });
+    after(() => {});
 });
diff --git a/src/shared/components/annotation/Civic.tsx b/src/shared/components/annotation/Civic.tsx
index e4814fd2b45..f7b8fa92f77 100644
--- a/src/shared/components/annotation/Civic.tsx
+++ b/src/shared/components/annotation/Civic.tsx
@@ -1,16 +1,16 @@
 import * as React from 'react';
 import * as _ from 'lodash';
-import {observer} from "mobx-react";
-import {errorIcon, loaderIcon} from "react-mutation-mapper";
-import {DefaultTooltip} from 'cbioportal-frontend-commons';
-import annotationStyles from "./styles/annotation.module.scss";
-import {ICivicVariant, ICivicEntry} from "shared/model/Civic.ts";
-import {observable} from "mobx";
-import CivicCard from "./CivicCard";
-
-export interface ICivicProps { 
+import { observer } from 'mobx-react';
+import { errorIcon, loaderIcon } from 'react-mutation-mapper';
+import { DefaultTooltip } from 'cbioportal-frontend-commons';
+import annotationStyles from './styles/annotation.module.scss';
+import { ICivicVariant, ICivicEntry } from 'shared/model/Civic.ts';
+import { observable } from 'mobx';
+import CivicCard from './CivicCard';
+
+export interface ICivicProps {
     civicEntry: ICivicEntry | null | undefined;
-    civicStatus: "pending" | "error" | "complete";
+    civicStatus: 'pending' | 'error' | 'complete';
     hasCivicVariants: boolean;
 }
 
@@ -20,12 +20,12 @@ export function hideArrow(tooltipEl: any) {
 }
 
 @observer
-export default class Civic extends React.Component<ICivicProps, {}>
-{
-    @observable tooltipDataLoadComplete:boolean = false;
-    
-    public static sortValue(civicEntry:ICivicEntry | null | undefined): number
-    {
+export default class Civic extends React.Component<ICivicProps, {}> {
+    @observable tooltipDataLoadComplete: boolean = false;
+
+    public static sortValue(
+        civicEntry: ICivicEntry | null | undefined
+    ): number {
         let score: number = 0;
 
         if (civicEntry) {
@@ -35,17 +35,15 @@ export default class Civic extends React.Component<ICivicProps, {}>
         return score;
     }
 
-    public static download(civicEntry:ICivicEntry | null | undefined): string
-    {
+    public static download(civicEntry: ICivicEntry | null | undefined): string {
         if (!civicEntry) {
-            return "NA";
+            return 'NA';
         }
 
         const variants = _.values(civicEntry.variants);
         const values: string[] = [];
 
-        if (variants && variants.length > 0 && variants[0].evidence)
-        {
+        if (variants && variants.length > 0 && variants[0].evidence) {
             _.toPairs(variants[0].evidence).forEach(pair => {
                 values.push(`${pair[0]}: ${pair[1]}`);
             });
@@ -53,56 +51,56 @@ export default class Civic extends React.Component<ICivicProps, {}>
 
         // TODO actually this indicates that we have an entry but the evidence is empty
         if (values.length === 0) {
-            return "NA";
+            return 'NA';
         }
 
-        return values.join(", ");
+        return values.join(', ');
     }
 
-    constructor(props: ICivicProps)
-    {
+    constructor(props: ICivicProps) {
         super(props);
 
         this.cardContent = this.cardContent.bind(this);
     }
 
-    public render()
-    {
-        let civicContent:JSX.Element = (
-            <span className={`${annotationStyles["annotation-item"]}`} />
+    public render() {
+        let civicContent: JSX.Element = (
+            <span className={`${annotationStyles['annotation-item']}`} />
         );
-        
-        const civicImgWidth:number = 14;
-        let civicImgHeight:number = 14;
-        let civicImgSrc = require("./images/civic-logo.png");
-        if (!this.props.hasCivicVariants)
-        {
-            civicImgSrc = require("./images/civic-logo-no-variants.png");
-        }
 
-        if (this.props.civicStatus == "error") {
-            civicContent = errorIcon("Error fetching Civic data");
+        const civicImgWidth: number = 14;
+        let civicImgHeight: number = 14;
+        let civicImgSrc = require('./images/civic-logo.png');
+        if (!this.props.hasCivicVariants) {
+            civicImgSrc = require('./images/civic-logo-no-variants.png');
         }
-        else if (this.props.civicEntry !== undefined)
-        {
-            if (this.props.civicEntry !== null && this.props.civicStatus == "complete")
-            {
+
+        if (this.props.civicStatus == 'error') {
+            civicContent = errorIcon('Error fetching Civic data');
+        } else if (this.props.civicEntry !== undefined) {
+            if (
+                this.props.civicEntry !== null &&
+                this.props.civicStatus == 'complete'
+            ) {
                 civicContent = (
-                    <span className={`${annotationStyles["annotation-item"]}`}>
+                    <span className={`${annotationStyles['annotation-item']}`}>
                         <img
                             width={civicImgWidth}
                             height={civicImgHeight}
                             src={civicImgSrc}
-                            alt='Civic Variant Entry'
+                            alt="Civic Variant Entry"
                         />
                     </span>
                 );
-    
-                const arrowContent = <div className="rc-tooltip-arrow-inner"/>;
+
+                const arrowContent = <div className="rc-tooltip-arrow-inner" />;
 
                 civicContent = (
                     <DefaultTooltip
-                        overlay={this.cardContent.bind(this, this.props.civicEntry)}
+                        overlay={this.cardContent.bind(
+                            this,
+                            this.props.civicEntry
+                        )}
                         placement="right"
                         trigger={['hover', 'focus']}
                         arrowContent={arrowContent}
@@ -113,18 +111,15 @@ export default class Civic extends React.Component<ICivicProps, {}>
                     </DefaultTooltip>
                 );
             }
-        }
-        else
-        {
+        } else {
             // It's still unknown (undefined) if the current gene has a Civic entry or not.
-            civicContent = loaderIcon("pull-left");
+            civicContent = loaderIcon('pull-left');
         }
 
         return civicContent;
     }
 
-    private cardContent(civicEntry: ICivicEntry): JSX.Element
-    {
+    private cardContent(civicEntry: ICivicEntry): JSX.Element {
         return (
             <CivicCard
                 title={`CIViC Variants`}
diff --git a/src/shared/components/annotation/CivicCard.spec.tsx b/src/shared/components/annotation/CivicCard.spec.tsx
index 0778030d8cd..715c75b09b1 100644
--- a/src/shared/components/annotation/CivicCard.spec.tsx
+++ b/src/shared/components/annotation/CivicCard.spec.tsx
@@ -10,7 +10,7 @@ describe('CivicCard', () => {
         geneName: 'fooGeneName',
         geneDescription: 'fooGeneDesc',
         geneUrl: 'http://fooGeneURL',
-        variants: {}
+        variants: {},
     };
 
     const props_2 = {
@@ -19,35 +19,35 @@ describe('CivicCard', () => {
         geneDescription: 'fooGeneDesc',
         geneUrl: 'http://fooGeneURL',
         variants: {
-            'var1' : getCivicVariantData(),
-            'var2' : getCivicVariantData()
-        }
+            var1: getCivicVariantData(),
+            var2: getCivicVariantData(),
+        },
     };
 
-    before(() => {
-
-    });
+    before(() => {});
 
     it('should render civic-card', () => {
-        const wrapper = shallow(<CivicCard {...props}/>);
+        const wrapper = shallow(<CivicCard {...props} />);
         expect(wrapper.find('.civic-card')).to.have.length(1);
     });
 
     it('should not have variant', () => {
-        const wrapper = shallow(<CivicCard {...props}/>);
+        const wrapper = shallow(<CivicCard {...props} />);
         expect(wrapper.find('.civic-card-variant-header')).to.have.length(0);
         expect(wrapper.find('.civic-card-variant-name')).to.have.length(0);
-        expect(wrapper.find('.civic-card-variant-entry-types')).to.have.length(0);
+        expect(wrapper.find('.civic-card-variant-entry-types')).to.have.length(
+            0
+        );
     });
 
     it('should have two variants', () => {
-        const wrapper = shallow(<CivicCard {...props_2}/>);
+        const wrapper = shallow(<CivicCard {...props_2} />);
         expect(wrapper.find('.civic-card-variant-header')).to.have.length(2);
         expect(wrapper.find('.civic-card-variant-name')).to.have.length(2);
-        expect(wrapper.find('.civic-card-variant-entry-types')).to.have.length(2);
+        expect(wrapper.find('.civic-card-variant-entry-types')).to.have.length(
+            2
+        );
     });
 
-    after(() => {
-
-    });
+    after(() => {});
 });
diff --git a/src/shared/components/annotation/CivicCard.tsx b/src/shared/components/annotation/CivicCard.tsx
index 4540b5c0354..1d8c8cd9506 100644
--- a/src/shared/components/annotation/CivicCard.tsx
+++ b/src/shared/components/annotation/CivicCard.tsx
@@ -1,8 +1,8 @@
 import * as React from 'react';
 import { If, Then, Else } from 'react-if';
-import { ICivicVariantData } from "shared/model/Civic.ts";
-import "./styles/civicCard.scss";
-import * as _ from "lodash";
+import { ICivicVariantData } from 'shared/model/Civic.ts';
+import './styles/civicCard.scss';
+import * as _ from 'lodash';
 
 export interface ICivicCardProps {
     title: string;
@@ -13,7 +13,6 @@ export interface ICivicCardProps {
 }
 
 export default class CivicCard extends React.Component<ICivicCardProps, {}> {
-
     /**
      * Generate variants
      * @param variantMap
@@ -30,11 +29,22 @@ export default class CivicCard extends React.Component<ICivicCardProps, {}> {
                     let variant = variantMap[name];
                     let entryTypes: string = '';
                     for (let evidenceType in variant.evidence) {
-                        entryTypes += evidenceType.toLowerCase() + ': ' + variant.evidence[evidenceType] + ', ';
+                        entryTypes +=
+                            evidenceType.toLowerCase() +
+                            ': ' +
+                            variant.evidence[evidenceType] +
+                            ', ';
                     }
                     entryTypes = entryTypes.slice(0, -2) + '.';
 
-                    list.push(this.variantItem(variant.url, variant.name, entryTypes, variant.description));
+                    list.push(
+                        this.variantItem(
+                            variant.url,
+                            variant.name,
+                            entryTypes,
+                            variant.description
+                        )
+                    );
                 }
             }
         } else {
@@ -52,24 +62,39 @@ export default class CivicCard extends React.Component<ICivicCardProps, {}> {
      * @param description
      * @returns {any}
      */
-    public variantItem(url?: string, name?: string, entryTypes?: string, description?: string) {
+    public variantItem(
+        url?: string,
+        name?: string,
+        entryTypes?: string,
+        description?: string
+    ) {
         let result;
 
         if (url || name || entryTypes || description) {
             result = (
                 <div className="civic-card-variant">
                     <div className="civic-card-variant-header">
-                        <span className="civic-card-variant-name"><a href={url} target="_blank">{name}</a></span>
-                        <span className="civic-card-variant-entry-types"> Entries: {entryTypes}</span>
+                        <span className="civic-card-variant-name">
+                            <a href={url} target="_blank">
+                                {name}
+                            </a>
+                        </span>
+                        <span className="civic-card-variant-entry-types">
+                            {' '}
+                            Entries: {entryTypes}
+                        </span>
+                    </div>
+                    <div className="civic-card-variant-description summary">
+                        {description}
                     </div>
-                    <div className="civic-card-variant-description summary">{description}</div>
                 </div>
             );
         } else {
             result = (
                 <div className="civic-card-variant">
-                    <div className="civic-card-variant-description summary">Information about the oncogenic activity of
-                        this alteration is not yet available in CIViC.
+                    <div className="civic-card-variant-description summary">
+                        Information about the oncogenic activity of this
+                        alteration is not yet available in CIViC.
                     </div>
                 </div>
             );
@@ -86,15 +111,19 @@ export default class CivicCard extends React.Component<ICivicCardProps, {}> {
         return (
             <div className="civic-card">
                 <span>
-                    <div className="col s12 tip-header">
-                        {this.props.title}
-                    </div>
+                    <div className="col s12 tip-header">{this.props.title}</div>
                     <div className="col s12 civic-card-content">
                         <div className="col s12 civic-card-gene">
                             <p>
                                 <span className="civic-card-gene-name">
-                                    <a href={this.props.geneUrl} target="_blank"><b>{this.props.geneName}</b></a>
-                                </span> - {this.props.geneDescription}
+                                    <a
+                                        href={this.props.geneUrl}
+                                        target="_blank"
+                                    >
+                                        <b>{this.props.geneName}</b>
+                                    </a>
+                                </span>{' '}
+                                - {this.props.geneDescription}
                             </p>
                         </div>
                         <div className="col s12">
@@ -105,8 +134,9 @@ export default class CivicCard extends React.Component<ICivicCardProps, {}> {
 
                         <div className="item disclaimer">
                             <span>
-                                Disclaimer: This resource is intended for purely research purposes.
-                                It should not be used for emergencies or medical or professional advice.
+                                Disclaimer: This resource is intended for purely
+                                research purposes. It should not be used for
+                                emergencies or medical or professional advice.
                             </span>
                         </div>
                     </div>
@@ -114,7 +144,11 @@ export default class CivicCard extends React.Component<ICivicCardProps, {}> {
 
                 <div className="item footer">
                     <a href={this.props.geneUrl} target="_blank">
-                        <img src={require("./images/civic_text_logo.png")} className="civic-logo" alt="CIViC"/>
+                        <img
+                            src={require('./images/civic_text_logo.png')}
+                            className="civic-logo"
+                            alt="CIViC"
+                        />
                     </a>
                 </div>
             </div>
diff --git a/src/shared/components/annotation/MyCancerGenome.spec.tsx b/src/shared/components/annotation/MyCancerGenome.spec.tsx
index f6fc1efc00d..1d5ed3b556a 100644
--- a/src/shared/components/annotation/MyCancerGenome.spec.tsx
+++ b/src/shared/components/annotation/MyCancerGenome.spec.tsx
@@ -1,7 +1,7 @@
-import MyCancerGenome, {parseMyCancerGenomeLink} from './MyCancerGenome';
+import MyCancerGenome, { parseMyCancerGenomeLink } from './MyCancerGenome';
 import React from 'react';
 import { assert } from 'chai';
-import {shallow, mount, ReactWrapper} from 'enzyme';
+import { shallow, mount, ReactWrapper } from 'enzyme';
 import sinon from 'sinon';
 
 describe('MyCancerGenome', () => {
@@ -11,25 +11,32 @@ describe('MyCancerGenome', () => {
     let emptyListTooltip: ReactWrapper<any, any>;
 
     before(() => {
-        component = mount(<MyCancerGenome linksHTML={["link1, link2"]}/>);
-        emptyListComponent = mount(<MyCancerGenome linksHTML={[]}/>);
-        tooltip = mount(MyCancerGenome.myCancerGenomeLinks(["link1, link2"]));
+        component = mount(<MyCancerGenome linksHTML={['link1, link2']} />);
+        emptyListComponent = mount(<MyCancerGenome linksHTML={[]} />);
+        tooltip = mount(MyCancerGenome.myCancerGenomeLinks(['link1, link2']));
         emptyListTooltip = mount(MyCancerGenome.myCancerGenomeLinks([]));
-
     });
 
     it('component icon', () => {
-        assert.isTrue(component.find("img").exists(),
-            "There should be an image icon for a valid list of links");
-        assert.isFalse(emptyListComponent.find("img").exists(),
-            "There should not be an image icon for an invalid list of links");
+        assert.isTrue(
+            component.find('img').exists(),
+            'There should be an image icon for a valid list of links'
+        );
+        assert.isFalse(
+            emptyListComponent.find('img').exists(),
+            'There should not be an image icon for an invalid list of links'
+        );
     });
 
     it('tooltip content', () => {
-        assert.isTrue(tooltip.find("li").exists(),
-            "There should be a list element for a valid list of links");
-        assert.isFalse(emptyListTooltip.find("li").exists(),
-            "There should not be a list element for an invalid list of links");
+        assert.isTrue(
+            tooltip.find('li').exists(),
+            'There should be a list element for a valid list of links'
+        );
+        assert.isFalse(
+            emptyListTooltip.find('li').exists(),
+            'There should not be a list element for an invalid list of links'
+        );
     });
 
     it('extracts URL and text from a pre-formatted my cancer genome HTML string', () => {
@@ -39,11 +46,15 @@ describe('MyCancerGenome', () => {
         const parsed = parseMyCancerGenomeLink(htmlLink);
 
         assert.isNotNull(parsed);
-        assert.equal(parsed!.text, "KRAS c.37G>T (G13C) Mutation in Colorectal Cancer");
-        assert.equal(parsed!.url, "http://mycancergenome.org/content/disease/colorectal-cancer/kras/38/");
+        assert.equal(
+            parsed!.text,
+            'KRAS c.37G>T (G13C) Mutation in Colorectal Cancer'
+        );
+        assert.equal(
+            parsed!.url,
+            'http://mycancergenome.org/content/disease/colorectal-cancer/kras/38/'
+        );
     });
 
-    after(() => {
-
-    });
+    after(() => {});
 });
diff --git a/src/shared/components/annotation/MyCancerGenome.tsx b/src/shared/components/annotation/MyCancerGenome.tsx
index 5a180c97bae..b8013150e1f 100644
--- a/src/shared/components/annotation/MyCancerGenome.tsx
+++ b/src/shared/components/annotation/MyCancerGenome.tsx
@@ -1,8 +1,8 @@
 import * as React from 'react';
 import * as _ from 'lodash';
-import {DefaultTooltip} from 'cbioportal-frontend-commons';
-import annotationStyles from "./styles/annotation.module.scss";
-import mcgStyles from "./styles/myCancerGenome.module.scss";
+import { DefaultTooltip } from 'cbioportal-frontend-commons';
+import annotationStyles from './styles/annotation.module.scss';
+import mcgStyles from './styles/myCancerGenome.module.scss';
 
 export interface IMyCancerGenomeProps {
     linksHTML: string[];
@@ -18,8 +18,7 @@ export function placeArrow(tooltipEl: any) {
  * DOMParser can be used for generic parsing purposes, but it is not compatible with the current test environment.
  * (i.e: DOMParser unit tests always fail, but it works fine in the browser)
  */
-export function parseMyCancerGenomeLink(link: string)
-{
+export function parseMyCancerGenomeLink(link: string) {
     // Generic DOMParser solution (not compatible with the current unit test environment):
     // const parser = new DOMParser();
     // const htmlDoc = parser.parseFromString(link, "text/html");
@@ -30,8 +29,8 @@ export function parseMyCancerGenomeLink(link: string)
     const hrefEnd = hrefStart + link.slice(hrefStart).indexOf('"');
 
     // assuming that the text starts right after the first >, and ends right before the </a>
-    const textStart = link.indexOf(">") + 1;
-    const textEnd = link.indexOf("</a>");
+    const textStart = link.indexOf('>') + 1;
+    const textEnd = link.indexOf('</a>');
 
     const href = link.slice(hrefStart, hrefEnd).trim();
     const text = link.slice(textStart, textEnd).trim();
@@ -39,10 +38,9 @@ export function parseMyCancerGenomeLink(link: string)
     if (href.length > 0 && text.length > 0) {
         return {
             url: href,
-            text: text
+            text: text,
         };
-    }
-    else {
+    } else {
         return undefined;
     }
 }
@@ -50,23 +48,22 @@ export function parseMyCancerGenomeLink(link: string)
 /**
  * @author Selcuk Onur Sumer
  */
-export default class MyCancerGenome extends React.Component<IMyCancerGenomeProps, {}>
-{
-    public static sortValue(links: string[]):number
-    {
-        return (links.length > 0) ? 1 : 0;
+export default class MyCancerGenome extends React.Component<
+    IMyCancerGenomeProps,
+    {}
+> {
+    public static sortValue(links: string[]): number {
+        return links.length > 0 ? 1 : 0;
     }
 
-    public static download(links: string[]): string
-    {
-        return (links.length > 0) ? "present" : "not present";
+    public static download(links: string[]): string {
+        return links.length > 0 ? 'present' : 'not present';
     }
 
-    public static myCancerGenomeLinks(linksHTML:string[])
-    {
-        const links:any[] = [];
+    public static myCancerGenomeLinks(linksHTML: string[]) {
+        const links: any[] = [];
 
-        _.each(linksHTML, (link:string, index:number) => {
+        _.each(linksHTML, (link: string, index: number) => {
             // TODO this is a workaround, ideally we should fix the data itself
             // parse the data as an HTML dom element, since it is formatted as an HTML link.
             const myCancerGenomeLink = parseMyCancerGenomeLink(link);
@@ -74,7 +71,9 @@ export default class MyCancerGenome extends React.Component<IMyCancerGenomeProps
             if (myCancerGenomeLink) {
                 links.push(
                     <li key={index}>
-                        <a href={myCancerGenomeLink.url} target="_blank">{myCancerGenomeLink.text}</a>
+                        <a href={myCancerGenomeLink.url} target="_blank">
+                            {myCancerGenomeLink.text}
+                        </a>
                     </li>
                 );
             }
@@ -83,30 +82,27 @@ export default class MyCancerGenome extends React.Component<IMyCancerGenomeProps
         return (
             <span>
                 <b>My Cancer Genome links:</b>
-                <br/>
-                <ul className={mcgStyles["link-list"]}>
-                    {links}
-                </ul>
+                <br />
+                <ul className={mcgStyles['link-list']}>{links}</ul>
             </span>
         );
     }
 
-    constructor(props: IMyCancerGenomeProps)
-    {
+    constructor(props: IMyCancerGenomeProps) {
         super(props);
         this.state = {};
     }
 
-    public render()
-    {
-        let myCancerGenomeContent:JSX.Element = (
-            <span className={`${annotationStyles["annotation-item"]}`} />
+    public render() {
+        let myCancerGenomeContent: JSX.Element = (
+            <span className={`${annotationStyles['annotation-item']}`} />
         );
 
-        if (this.props.linksHTML.length > 0)
-        {
-            const arrowContent = <div className="rc-tooltip-arrow-inner"/>;
-            const tooltipContent = MyCancerGenome.myCancerGenomeLinks(this.props.linksHTML);
+        if (this.props.linksHTML.length > 0) {
+            const arrowContent = <div className="rc-tooltip-arrow-inner" />;
+            const tooltipContent = MyCancerGenome.myCancerGenomeLinks(
+                this.props.linksHTML
+            );
 
             myCancerGenomeContent = (
                 <DefaultTooltip
@@ -116,8 +112,15 @@ export default class MyCancerGenome extends React.Component<IMyCancerGenomeProps
                     arrowContent={arrowContent}
                     onPopupAlign={placeArrow}
                 >
-                    <span className={`${annotationStyles["annotation-item"]} mcg`}>
-                        <img width='14' height='14' src={require("./images/mcg_logo.png")} alt='My Cancer Genome Symbol' />
+                    <span
+                        className={`${annotationStyles['annotation-item']} mcg`}
+                    >
+                        <img
+                            width="14"
+                            height="14"
+                            src={require('./images/mcg_logo.png')}
+                            alt="My Cancer Genome Symbol"
+                        />
                     </span>
                 </DefaultTooltip>
             );
diff --git a/src/shared/components/annotation/genomeNexus/MutationAssessor.tsx b/src/shared/components/annotation/genomeNexus/MutationAssessor.tsx
index 6d4d611e200..9f37ed9544c 100644
--- a/src/shared/components/annotation/genomeNexus/MutationAssessor.tsx
+++ b/src/shared/components/annotation/genomeNexus/MutationAssessor.tsx
@@ -1,12 +1,12 @@
-import * as React from "react";
-import annotationStyles from "./../styles/annotation.module.scss";
+import * as React from 'react';
+import annotationStyles from './../styles/annotation.module.scss';
 import classNames from 'classnames';
-import tooltipStyles from "./styles/mutationAssessorTooltip.module.scss";
+import tooltipStyles from './styles/mutationAssessorTooltip.module.scss';
 import {
     DefaultTooltip,
-    MutationAssessor as MutationAssessorData
+    MutationAssessor as MutationAssessorData,
 } from 'cbioportal-frontend-commons';
-import mutationAssessorColumn from "./styles/mutationAssessorColumn.module.scss";
+import mutationAssessorColumn from './styles/mutationAssessorColumn.module.scss';
 
 export interface IMutationAssessorProps {
     mutationAssessor: MutationAssessorData;
@@ -17,8 +17,11 @@ export function hideArrow(tooltipEl: any) {
     arrowEl.style.display = 'none';
 }
 
-export default class MutationAssessor extends React.Component<IMutationAssessorProps, {}> {
-    static MUTATION_ASSESSOR_URL:string = "http://mutationassessor.org/r3/";
+export default class MutationAssessor extends React.Component<
+    IMutationAssessorProps,
+    {}
+> {
+    static MUTATION_ASSESSOR_URL: string = 'http://mutationassessor.org/r3/';
 
     constructor(props: IMutationAssessorProps) {
         super(props);
@@ -26,30 +29,37 @@ export default class MutationAssessor extends React.Component<IMutationAssessorP
         this.tooltipContent = this.tooltipContent.bind(this);
     }
 
-    public static download(mutationAssessorData: MutationAssessorData|undefined): string
-    {
+    public static download(
+        mutationAssessorData: MutationAssessorData | undefined
+    ): string {
         if (mutationAssessorData) {
             return `impact: ${mutationAssessorData.functionalImpact}, score: ${mutationAssessorData.functionalImpactScore}`;
-        }
-        else {
-            return "Error";
+        } else {
+            return 'Error';
         }
     }
 
     public render() {
         let maContent: JSX.Element = (
-            <span className={`${annotationStyles["annotation-item-text"]}`}/>
+            <span className={`${annotationStyles['annotation-item-text']}`} />
         );
 
-        if (this.props.mutationAssessor && this.props.mutationAssessor.functionalImpact !== null) {
+        if (
+            this.props.mutationAssessor &&
+            this.props.mutationAssessor.functionalImpact !== null
+        ) {
             const maData = this.props.mutationAssessor;
             maContent = (
-                <span className={classNames(annotationStyles["annotation-item-text"],
-                                            mutationAssessorColumn[`ma-${maData.functionalImpact}`])}>
-                    <i className='fa fa-circle' aria-hidden="true"></i>
+                <span
+                    className={classNames(
+                        annotationStyles['annotation-item-text'],
+                        mutationAssessorColumn[`ma-${maData.functionalImpact}`]
+                    )}
+                >
+                    <i className="fa fa-circle" aria-hidden="true"></i>
                 </span>
             );
-            const arrowContent = <div className="rc-tooltip-arrow-inner"/>;
+            const arrowContent = <div className="rc-tooltip-arrow-inner" />;
             maContent = (
                 <DefaultTooltip
                     overlay={this.tooltipContent}
@@ -69,48 +79,86 @@ export default class MutationAssessor extends React.Component<IMutationAssessorP
 
     private tooltipContent() {
         const maData = this.props.mutationAssessor;
-        const xVarLink = MutationAssessor.maLink(`http://mutationassessor.org/r3/?cm=var&p=${maData.uniprotId}&var=${maData.variant}`);
+        const xVarLink = MutationAssessor.maLink(
+            `http://mutationassessor.org/r3/?cm=var&p=${maData.uniprotId}&var=${maData.variant}`
+        );
         const msaLink = MutationAssessor.maLink(maData.msaLink);
         const pdbLink = MutationAssessor.maLink(maData.pdbLink);
 
-        const impact = maData.functionalImpact? (
+        const impact = maData.functionalImpact ? (
             <div>
                 <table className={tooltipStyles['ma-tooltip-table']}>
-                    <tr><td>Source</td><td><a href="http://mutationassessor.org/r3">MutationAssessor</a></td></tr>
-                    <tr><td>Impact</td><td><span className={mutationAssessorColumn[`ma-${maData.functionalImpact}`]}>{maData.functionalImpact}</span></td></tr>
-                    {(maData.functionalImpactScore || maData.functionalImpactScore === 0) && (<tr><td>Score</td><td><b>{maData.functionalImpactScore.toFixed(2)}</b></td></tr>)}
+                    <tr>
+                        <td>Source</td>
+                        <td>
+                            <a href="http://mutationassessor.org/r3">
+                                MutationAssessor
+                            </a>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>Impact</td>
+                        <td>
+                            <span
+                                className={
+                                    mutationAssessorColumn[
+                                        `ma-${maData.functionalImpact}`
+                                    ]
+                                }
+                            >
+                                {maData.functionalImpact}
+                            </span>
+                        </td>
+                    </tr>
+                    {(maData.functionalImpactScore ||
+                        maData.functionalImpactScore === 0) && (
+                        <tr>
+                            <td>Score</td>
+                            <td>
+                                <b>{maData.functionalImpactScore.toFixed(2)}</b>
+                            </td>
+                        </tr>
+                    )}
                 </table>
             </div>
         ) : null;
 
-        const xVar = xVarLink? (
+        const xVar = xVarLink ? (
             <div className={tooltipStyles['mutation-assessor-link']}>
-                <a href={xVarLink} target='_blank'>
+                <a href={xVarLink} target="_blank">
                     <img
-                        height='15'
-                        width='19'
-                        src={require("./../../mutationTable/column/mutationAssessor.png")}
+                        height="15"
+                        width="19"
+                        src={require('./../../mutationTable/column/mutationAssessor.png')}
                         className={tooltipStyles['mutation-assessor-main-img']}
-                        alt='Mutation Assessor'
+                        alt="Mutation Assessor"
                     />
                     Go to Mutation Assessor
                 </a>
             </div>
         ) : null;
 
-        const msa = msaLink? (
+        const msa = msaLink ? (
             <div className={tooltipStyles['mutation-assessor-link']}>
-                <a href={msaLink} target='_blank'>
-                    <span className={`${tooltipStyles['ma-icon']} ${tooltipStyles['ma-msa-icon']}`}>msa</span>
+                <a href={msaLink} target="_blank">
+                    <span
+                        className={`${tooltipStyles['ma-icon']} ${tooltipStyles['ma-msa-icon']}`}
+                    >
+                        msa
+                    </span>
                     Multiple Sequence Alignment
                 </a>
             </div>
         ) : null;
 
-        const pdb = pdbLink? (
+        const pdb = pdbLink ? (
             <div className={tooltipStyles['mutation-assessor-link']}>
-                <a href={pdbLink} target='_blank'>
-                    <span className={`${tooltipStyles['ma-icon']} ${tooltipStyles['ma-3d-icon']}`}>3D</span>
+                <a href={pdbLink} target="_blank">
+                    <span
+                        className={`${tooltipStyles['ma-icon']} ${tooltipStyles['ma-3d-icon']}`}
+                    >
+                        3D
+                    </span>
                     Mutation Assessor 3D View
                 </a>
             </div>
@@ -127,19 +175,16 @@ export default class MutationAssessor extends React.Component<IMutationAssessorP
     }
 
     // This is mostly to make the legacy MA links work
-    public static maLink(link:string|undefined)
-    {
+    public static maLink(link: string | undefined) {
         let url = null;
 
         // ignore invalid links ("", "NA", "Not Available")
-        if (link)
-        {
+        if (link) {
             // getma.org is the legacy link, need to replace it with the actual value
-            url = link.replace("getma.org", "mutationassessor.org/r3");
+            url = link.replace('getma.org', 'mutationassessor.org/r3');
 
             // prepend "http://" if needed
-            if (url.indexOf("http://") !== 0)
-            {
+            if (url.indexOf('http://') !== 0) {
                 url = `http://${url}`;
             }
         }
diff --git a/src/shared/components/annotation/genomeNexus/PolyPhen2.tsx b/src/shared/components/annotation/genomeNexus/PolyPhen2.tsx
index 73dbf27161b..4c8fdc87c64 100644
--- a/src/shared/components/annotation/genomeNexus/PolyPhen2.tsx
+++ b/src/shared/components/annotation/genomeNexus/PolyPhen2.tsx
@@ -1,8 +1,8 @@
-import * as React from "react";
-import {DefaultTooltip} from 'cbioportal-frontend-commons';
-import annotationStyles from "./../styles/annotation.module.scss";
+import * as React from 'react';
+import { DefaultTooltip } from 'cbioportal-frontend-commons';
+import annotationStyles from './../styles/annotation.module.scss';
 import classNames from 'classnames';
-import tooltipStyles from "./styles/polyPhen2Tooltip.module.scss";
+import tooltipStyles from './styles/polyPhen2Tooltip.module.scss';
 
 export interface IPolyPhen2Props {
     polyPhenPrediction: string; // benign, possibly_damaging, probably_damging
@@ -15,30 +15,42 @@ export function hideArrow(tooltipEl: any) {
 }
 
 export default class PolyPhen2 extends React.Component<IPolyPhen2Props, {}> {
-    static POLYPHEN2_URL:string = "http://genetics.bwh.harvard.edu/pph2/";
+    static POLYPHEN2_URL: string = 'http://genetics.bwh.harvard.edu/pph2/';
 
     constructor(props: IPolyPhen2Props) {
         super(props);
         this.tooltipContent = this.tooltipContent.bind(this);
     }
 
-    public static download(polyPhenScore: number, polyPhenPrediction: string): string
-    {
+    public static download(
+        polyPhenScore: number,
+        polyPhenPrediction: string
+    ): string {
         return `impact: ${polyPhenPrediction}, score: ${polyPhenScore}`;
     }
 
     public render() {
         let content: JSX.Element = (
-            <span className={`${annotationStyles["annotation-item-text"]}`}/>
+            <span className={`${annotationStyles['annotation-item-text']}`} />
         );
 
-        if (this.props.polyPhenPrediction && this.props.polyPhenPrediction.length > 0) {
+        if (
+            this.props.polyPhenPrediction &&
+            this.props.polyPhenPrediction.length > 0
+        ) {
             content = (
-                <span className={classNames(annotationStyles["annotation-item-text"], tooltipStyles[`polyPhen2-${this.props.polyPhenPrediction}`])}>
-                    <i className='fa fa-circle' aria-hidden="true"></i>
+                <span
+                    className={classNames(
+                        annotationStyles['annotation-item-text'],
+                        tooltipStyles[
+                            `polyPhen2-${this.props.polyPhenPrediction}`
+                        ]
+                    )}
+                >
+                    <i className="fa fa-circle" aria-hidden="true"></i>
                 </span>
             );
-            const arrowContent = <div className="rc-tooltip-arrow-inner"/>;
+            const arrowContent = <div className="rc-tooltip-arrow-inner" />;
             content = (
                 <DefaultTooltip
                     overlay={this.tooltipContent}
@@ -57,20 +69,44 @@ export default class PolyPhen2 extends React.Component<IPolyPhen2Props, {}> {
     }
 
     private tooltipContent() {
-        const impact = this.props.polyPhenPrediction? (
+        const impact = this.props.polyPhenPrediction ? (
             <div>
                 <table className={tooltipStyles['polyPhen2-tooltip-table']}>
-                    <tr><td>Source</td><td><a href="http://genetics.bwh.harvard.edu/pph2/">PolyPhen-2</a></td></tr>
-                    <tr><td>Impact</td><td><span className={tooltipStyles[`polyPhen2-${this.props.polyPhenPrediction}`]}>{this.props.polyPhenPrediction}</span></td></tr>
-                    {(this.props.polyPhenScore || this.props.polyPhenScore === 0) && (<tr><td>Score</td><td><b>{this.props.polyPhenScore.toFixed(2)}</b></td></tr>)}
+                    <tr>
+                        <td>Source</td>
+                        <td>
+                            <a href="http://genetics.bwh.harvard.edu/pph2/">
+                                PolyPhen-2
+                            </a>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>Impact</td>
+                        <td>
+                            <span
+                                className={
+                                    tooltipStyles[
+                                        `polyPhen2-${this.props.polyPhenPrediction}`
+                                    ]
+                                }
+                            >
+                                {this.props.polyPhenPrediction}
+                            </span>
+                        </td>
+                    </tr>
+                    {(this.props.polyPhenScore ||
+                        this.props.polyPhenScore === 0) && (
+                        <tr>
+                            <td>Score</td>
+                            <td>
+                                <b>{this.props.polyPhenScore.toFixed(2)}</b>
+                            </td>
+                        </tr>
+                    )}
                 </table>
             </div>
         ) : null;
 
-        return (
-            <span>
-                {impact}
-            </span>
-        );
+        return <span>{impact}</span>;
     }
 }
diff --git a/src/shared/components/annotation/genomeNexus/Sift.tsx b/src/shared/components/annotation/genomeNexus/Sift.tsx
index 7215f3d498d..a29e1b7a0a4 100644
--- a/src/shared/components/annotation/genomeNexus/Sift.tsx
+++ b/src/shared/components/annotation/genomeNexus/Sift.tsx
@@ -1,8 +1,8 @@
-import * as React from "react";
-import {DefaultTooltip} from 'cbioportal-frontend-commons';
-import annotationStyles from "./../styles/annotation.module.scss";
+import * as React from 'react';
+import { DefaultTooltip } from 'cbioportal-frontend-commons';
+import annotationStyles from './../styles/annotation.module.scss';
 import classNames from 'classnames';
-import tooltipStyles from "./styles/siftTooltip.module.scss";
+import tooltipStyles from './styles/siftTooltip.module.scss';
 
 export interface ISiftProps {
     siftPrediction: string; // deleterious, deleterious_low_confidence, tolerated, tolerated_low_confidence
@@ -15,30 +15,34 @@ export function hideArrow(tooltipEl: any) {
 }
 
 export default class Sift extends React.Component<ISiftProps, {}> {
-    static SIFT_URL:string = "http://sift.bii.a-star.edu.sg/";
+    static SIFT_URL: string = 'http://sift.bii.a-star.edu.sg/';
 
     constructor(props: ISiftProps) {
         super(props);
         this.tooltipContent = this.tooltipContent.bind(this);
     }
 
-    public static download(siftScore: number, siftPrediction: string): string
-    {
+    public static download(siftScore: number, siftPrediction: string): string {
         return `impact: ${siftPrediction}, score: ${siftScore}`;
     }
 
     public render() {
         let siftContent: JSX.Element = (
-            <span className={`${annotationStyles["annotation-item-text"]}`}/>
+            <span className={`${annotationStyles['annotation-item-text']}`} />
         );
 
         if (this.props.siftPrediction && this.props.siftPrediction.length > 0) {
             siftContent = (
-                <span className={classNames(annotationStyles["annotation-item-text"], tooltipStyles[`sift-${this.props.siftPrediction}`])}>
-                    <i className='fa fa-circle' aria-hidden="true"></i>
+                <span
+                    className={classNames(
+                        annotationStyles['annotation-item-text'],
+                        tooltipStyles[`sift-${this.props.siftPrediction}`]
+                    )}
+                >
+                    <i className="fa fa-circle" aria-hidden="true"></i>
                 </span>
             );
-            const arrowContent = <div className="rc-tooltip-arrow-inner"/>;
+            const arrowContent = <div className="rc-tooltip-arrow-inner" />;
             siftContent = (
                 <DefaultTooltip
                     overlay={this.tooltipContent}
@@ -57,20 +61,41 @@ export default class Sift extends React.Component<ISiftProps, {}> {
     }
 
     private tooltipContent() {
-        const impact = this.props.siftPrediction? (
+        const impact = this.props.siftPrediction ? (
             <div>
                 <table className={tooltipStyles['sift-tooltip-table']}>
-                    <tr><td>Source</td><td><a href="http://sift.bii.a-star.edu.sg/">SIFT</a></td></tr>
-                    <tr><td>Impact</td><td><span className={tooltipStyles[`sift-${this.props.siftPrediction}`]}>{this.props.siftPrediction}</span></td></tr>
-                    {(this.props.siftScore || this.props.siftScore === 0) && (<tr><td>Score</td><td><b>{this.props.siftScore.toFixed(2)}</b></td></tr>)}
+                    <tr>
+                        <td>Source</td>
+                        <td>
+                            <a href="http://sift.bii.a-star.edu.sg/">SIFT</a>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>Impact</td>
+                        <td>
+                            <span
+                                className={
+                                    tooltipStyles[
+                                        `sift-${this.props.siftPrediction}`
+                                    ]
+                                }
+                            >
+                                {this.props.siftPrediction}
+                            </span>
+                        </td>
+                    </tr>
+                    {(this.props.siftScore || this.props.siftScore === 0) && (
+                        <tr>
+                            <td>Score</td>
+                            <td>
+                                <b>{this.props.siftScore.toFixed(2)}</b>
+                            </td>
+                        </tr>
+                    )}
                 </table>
             </div>
         ) : null;
 
-        return (
-            <span>
-                {impact}
-            </span>
-        );
+        return <span>{impact}</span>;
     }
 }
diff --git a/src/shared/components/annotation/genomeNexus/styles/mutationAssessorColumn.module.scss b/src/shared/components/annotation/genomeNexus/styles/mutationAssessorColumn.module.scss
index 8461f1f8e15..2ba91daea96 100644
--- a/src/shared/components/annotation/genomeNexus/styles/mutationAssessorColumn.module.scss
+++ b/src/shared/components/annotation/genomeNexus/styles/mutationAssessorColumn.module.scss
@@ -1,21 +1,21 @@
-@import "functionalImpact";
+@import 'functionalImpact';
 
 .ma-high {
-  color: $high;
-  font-weight: bold;
+    color: $high;
+    font-weight: bold;
 }
 
 .ma-medium {
-  color: $medium;
-  font-weight: bold;
+    color: $medium;
+    font-weight: bold;
 }
 
 .ma-low {
-  color: $low;
-  font-weight: bold;
+    color: $low;
+    font-weight: bold;
 }
 
 .ma-neutral {
-  color: $neutral;
-  font-weight: bold;
+    color: $neutral;
+    font-weight: bold;
 }
diff --git a/src/shared/components/annotation/genomeNexus/styles/mutationAssessorTooltip.module.scss b/src/shared/components/annotation/genomeNexus/styles/mutationAssessorTooltip.module.scss
index ef336cfa8fb..26e7e6251c9 100644
--- a/src/shared/components/annotation/genomeNexus/styles/mutationAssessorTooltip.module.scss
+++ b/src/shared/components/annotation/genomeNexus/styles/mutationAssessorTooltip.module.scss
@@ -1,36 +1,36 @@
 .ma-link {
-  font-weight:normal;
+    font-weight: normal;
 }
 
 .mutation-assessor-link {
-  margin-bottom: 1px;
+    margin-bottom: 1px;
 }
 
 .ma-icon {
-  background-color: #88C;
-  color: white;
-  font-size: 80%;
-  margin-right: 3px;
+    background-color: #88c;
+    color: white;
+    font-size: 80%;
+    margin-right: 3px;
 }
 
-.ma-msa-icon{
-  padding-left: 3px;
-  padding-right: 3px;
+.ma-msa-icon {
+    padding-left: 3px;
+    padding-right: 3px;
 }
 
 .ma-3d-icon {
-  padding-left: 6px;
-  padding-right: 6px;
+    padding-left: 6px;
+    padding-right: 6px;
 }
 
 .mutation-assessor-main-img {
-  padding-left: 3px;
-  padding-right: 3px;
-  margin-right: 5px;
+    padding-left: 3px;
+    padding-right: 3px;
+    margin-right: 5px;
 }
 
 .ma-tooltip-table {
-  td:first-child {
-    padding-right: 5px;
-  }
+    td:first-child {
+        padding-right: 5px;
+    }
 }
diff --git a/src/shared/components/annotation/genomeNexus/styles/polyPhen2Tooltip.module.scss b/src/shared/components/annotation/genomeNexus/styles/polyPhen2Tooltip.module.scss
index a26a77d23d6..30113823154 100644
--- a/src/shared/components/annotation/genomeNexus/styles/polyPhen2Tooltip.module.scss
+++ b/src/shared/components/annotation/genomeNexus/styles/polyPhen2Tooltip.module.scss
@@ -1,22 +1,22 @@
-@import "functionalImpact";
+@import 'functionalImpact';
 
 .polyPhen2-probably_damaging {
-  color: $high;
-  font-weight:bold;
+    color: $high;
+    font-weight: bold;
 }
 .polyPhen2-possibly_damaging {
-  color: $low;
-  font-weight:bold;
+    color: $low;
+    font-weight: bold;
 }
 .polyPhen2-benign {
-  color: $neutral;
-  font-weight:bold;
+    color: $neutral;
+    font-weight: bold;
 }
 .polyPhen2-unknown {
-  display: none;
+    display: none;
 }
 .polyPhen2-tooltip-table {
-  td:first-child {
-    padding-right: 5px;
-  }
+    td:first-child {
+        padding-right: 5px;
+    }
 }
diff --git a/src/shared/components/annotation/genomeNexus/styles/siftTooltip.module.scss b/src/shared/components/annotation/genomeNexus/styles/siftTooltip.module.scss
index e5c2cd3641d..a80dfa4e060 100644
--- a/src/shared/components/annotation/genomeNexus/styles/siftTooltip.module.scss
+++ b/src/shared/components/annotation/genomeNexus/styles/siftTooltip.module.scss
@@ -1,23 +1,23 @@
-@import "functionalImpact";
+@import 'functionalImpact';
 
 .sift-deleterious {
-  color: $high;
-  font-weight:bold;
+    color: $high;
+    font-weight: bold;
 }
 
 .sift-deleterious_low_confidence {
-  color: $low;
-  font-weight:bold;
+    color: $low;
+    font-weight: bold;
 }
 
 .sift-tolerated_low_confidence,
 .sift-tolerated {
-  color: $neutral;
-  font-weight:bold;
+    color: $neutral;
+    font-weight: bold;
 }
 
 .sift-tooltip-table {
-  td:first-child {
-    padding-right: 5px;
-  }
+    td:first-child {
+        padding-right: 5px;
+    }
 }
diff --git a/src/shared/components/annotation/styles/annotation.module.scss b/src/shared/components/annotation/styles/annotation.module.scss
index 7a276c60be3..55fea0df1a9 100644
--- a/src/shared/components/annotation/styles/annotation.module.scss
+++ b/src/shared/components/annotation/styles/annotation.module.scss
@@ -1,21 +1,21 @@
 .annotation-item-text {
-  display: inline-block;
-  font-size: 9px;
-  width: 22px;
-  cursor: default;
+    display: inline-block;
+    font-size: 9px;
+    width: 22px;
+    cursor: default;
 }
 
 .annotation-item-error {
-  width: 16px;
-  height: 18px;
-  float: left;
-  line-height: 22px;
-  display: inline-block;
+    width: 16px;
+    height: 18px;
+    float: left;
+    line-height: 22px;
+    display: inline-block;
 }
 
 .annotation-item {
-  width: 22px;
-  display: flex;
-  justify-content: space-around;
-  align-items: center;
+    width: 22px;
+    display: flex;
+    justify-content: space-around;
+    align-items: center;
 }
diff --git a/src/shared/components/annotation/styles/civicCard.scss b/src/shared/components/annotation/styles/civicCard.scss
index 37138370b3a..b8746796ef9 100644
--- a/src/shared/components/annotation/styles/civicCard.scss
+++ b/src/shared/components/annotation/styles/civicCard.scss
@@ -1,35 +1,42 @@
 .civic-card {
-  margin: auto;
-  width: 500px;
-  font-size: 14px;
-  line-height: 18px; }
+    margin: auto;
+    width: 500px;
+    font-size: 14px;
+    line-height: 18px;
+}
 .civic-card * {
-  border-collapse: collapse;
-  box-sizing: border-box; }
+    border-collapse: collapse;
+    box-sizing: border-box;
+}
 .civic-card ul {
-  padding: 0; }
+    padding: 0;
+}
 .civic-card .disclaimer {
-  color: grey;
-  font-style: italic;
-  padding: 5px 10px; }
+    color: grey;
+    font-style: italic;
+    padding: 5px 10px;
+}
 .civic-card .footer {
-  width: 100%;
-  padding-top: 3px;
-  line-height: 32px;
-  height: 32px; 
-  background: #333; }
+    width: 100%;
+    padding-top: 3px;
+    line-height: 32px;
+    height: 32px;
+    background: #333;
+}
 .civic-card .footer .civic-logo {
-  height: 32px;
-  margin-left: 10px;
-  margin-top: -3px;
-  vertical-align: top; }
+    height: 32px;
+    margin-left: 10px;
+    margin-top: -3px;
+    vertical-align: top;
+}
 .civic-card .tip-header {
-  line-height: 22px;
-  font-size: 22px;
-  background-color: #8539b2;
-  color: #fff;
-  text-align: center;
-  padding: 5px 10px; }
+    line-height: 22px;
+    font-size: 22px;
+    background-color: #8539b2;
+    color: #fff;
+    text-align: center;
+    padding: 5px 10px;
+}
 .civic-card-content {
     max-height: 400px;
     overflow: auto;
@@ -51,4 +58,4 @@
 .civic-card-variant-name a {
     font-weight: bold;
     color: #1974b8;
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/annotation/styles/myCancerGenome.module.scss b/src/shared/components/annotation/styles/myCancerGenome.module.scss
index 7ccce247381..d50dc61ea95 100644
--- a/src/shared/components/annotation/styles/myCancerGenome.module.scss
+++ b/src/shared/components/annotation/styles/myCancerGenome.module.scss
@@ -1,4 +1,4 @@
 .link-list {
-  list-style-position: inside;
-  padding-left: 0;
-}
\ No newline at end of file
+    list-style-position: inside;
+    padding-left: 0;
+}
diff --git a/src/shared/components/banners/AlterationFilterWarning.tsx b/src/shared/components/banners/AlterationFilterWarning.tsx
index cc45bedbc7c..3af6bcd4480 100644
--- a/src/shared/components/banners/AlterationFilterWarning.tsx
+++ b/src/shared/components/banners/AlterationFilterWarning.tsx
@@ -1,38 +1,42 @@
-import * as React from "react";
-import {observer} from "mobx-react";
-import {ResultsViewPageStore} from "../../../pages/resultsView/ResultsViewPageStore";
-import {computed} from "mobx";
-import {MakeMobxView} from "../MobxView";
-import classnames from "classnames";
+import * as React from 'react';
+import { observer } from 'mobx-react';
+import { ResultsViewPageStore } from '../../../pages/resultsView/ResultsViewPageStore';
+import { computed } from 'mobx';
+import { MakeMobxView } from '../MobxView';
+import classnames from 'classnames';
 
 export interface IAlterationFilterWarningProps {
-    store:ResultsViewPageStore;
-    isUnaffected?:boolean;
-    mutationsTabModeSettings?:{ // if set, then we show in "mutations tab mode" - different text, different source of exclude state, and toggleable exclude state
-        excludeVUS:boolean;
-        excludeGermline:boolean;
-        toggleExcludeVUS:()=>void;
-        toggleExcludeGermline:()=>void;
-        hugoGeneSymbol:string;
-    }
+    store: ResultsViewPageStore;
+    isUnaffected?: boolean;
+    mutationsTabModeSettings?: {
+        // if set, then we show in "mutations tab mode" - different text, different source of exclude state, and toggleable exclude state
+        excludeVUS: boolean;
+        excludeGermline: boolean;
+        toggleExcludeVUS: () => void;
+        toggleExcludeGermline: () => void;
+        hugoGeneSymbol: string;
+    };
 }
 
 function getVusDescription(
-    types:{ mutation:boolean, cna:boolean},
-    plural:boolean
+    types: { mutation: boolean; cna: boolean },
+    plural: boolean
 ) {
     const descriptions = [];
     if (types.mutation) {
-        descriptions.push(`mutation${plural?"s":""}`);
+        descriptions.push(`mutation${plural ? 's' : ''}`);
     }
     if (types.cna) {
-        descriptions.push(`copy number alteration${plural?"s":""}`);
+        descriptions.push(`copy number alteration${plural ? 's' : ''}`);
     }
-    return `${descriptions.join(" and ")} of unknown significance`;
+    return `${descriptions.join(' and ')} of unknown significance`;
 }
 
 @observer
-export default class AlterationFilterWarning extends React.Component<IAlterationFilterWarningProps, {}> {
+export default class AlterationFilterWarning extends React.Component<
+    IAlterationFilterWarningProps,
+    {}
+> {
     @computed get excludeVUS() {
         if (this.props.mutationsTabModeSettings) {
             return this.props.mutationsTabModeSettings.excludeVUS;
@@ -50,39 +54,52 @@ export default class AlterationFilterWarning extends React.Component<IAlteration
     }
 
     @computed get vusToggleable() {
-        return this.props.mutationsTabModeSettings && this.props.store.driverAnnotationSettings.excludeVUS;
+        return (
+            this.props.mutationsTabModeSettings &&
+            this.props.store.driverAnnotationSettings.excludeVUS
+        );
     }
 
     @computed get germlineToggleable() {
-        return this.props.mutationsTabModeSettings && this.props.store.excludeGermlineMutations;
+        return (
+            this.props.mutationsTabModeSettings &&
+            this.props.store.excludeGermlineMutations
+        );
     }
 
     readonly vusWarning = MakeMobxView({
-        await:()=>{
+        await: () => {
             if (this.props.mutationsTabModeSettings) {
                 return [this.props.store.mutationsReportByGene];
             } else {
                 return [
                     this.props.store.oqlFilteredMutationsReport,
-                    this.props.store.oqlFilteredMolecularDataReport
+                    this.props.store.oqlFilteredMolecularDataReport,
                 ];
             }
         },
-        render:()=>{
+        render: () => {
             let vusCount = 0;
             const vusTypes = {
-                mutation: false, cna: false
+                mutation: false,
+                cna: false,
             };
             if (this.props.mutationsTabModeSettings) {
-                const report = this.props.store.mutationsReportByGene.result![this.props.mutationsTabModeSettings.hugoGeneSymbol];
+                const report = this.props.store.mutationsReportByGene.result![
+                    this.props.mutationsTabModeSettings.hugoGeneSymbol
+                ];
                 vusCount = report.vus.length + report.vusAndGermline.length;
                 if (vusCount > 0) {
                     vusTypes.mutation = true;
                 }
             } else {
-                const mutationReport = this.props.store.oqlFilteredMutationsReport.result!;
-                const mutationVusCount = mutationReport.vus.length + mutationReport.vusAndGermline.length;
-                const cnaVusCount = this.props.store.oqlFilteredMolecularDataReport.result!.vus.length;
+                const mutationReport = this.props.store
+                    .oqlFilteredMutationsReport.result!;
+                const mutationVusCount =
+                    mutationReport.vus.length +
+                    mutationReport.vusAndGermline.length;
+                const cnaVusCount = this.props.store
+                    .oqlFilteredMolecularDataReport.result!.vus.length;
                 vusCount = mutationVusCount + cnaVusCount;
                 if (mutationVusCount > 0) {
                     vusTypes.mutation = true;
@@ -93,38 +110,68 @@ export default class AlterationFilterWarning extends React.Component<IAlteration
             }
 
             if (vusCount > 0) {
-                const is = (vusCount === 1) ? "is" : "are";
+                const is = vusCount === 1 ? 'is' : 'are';
                 if (this.props.isUnaffected && this.excludeVUS) {
                     return (
                         <div className="alert alert-unaffected">
                             <i
                                 className="fa fa-md fa-info-circle"
-                                style={{verticalAlign:"middle !important", marginRight:6, marginBottom:1}}
+                                style={{
+                                    verticalAlign: 'middle !important',
+                                    marginRight: 6,
+                                    marginBottom: 1,
+                                }}
                             />
-                            {`${vusCount} ${getVusDescription(vusTypes, vusCount !== 1)} ${is} included in analysis.`}
+                            {`${vusCount} ${getVusDescription(
+                                vusTypes,
+                                vusCount !== 1
+                            )} ${is} included in analysis.`}
                         </div>
                     );
                 } else if (this.excludeVUS || this.vusToggleable) {
                     return (
                         <div className="alert alert-info">
                             <img
-                                src={require("../../../rootImages/funnel.svg")}
-                                style={{marginRight:6, width:15, marginTop:-2}}
+                                src={require('../../../rootImages/funnel.svg')}
+                                style={{
+                                    marginRight: 6,
+                                    width: 15,
+                                    marginTop: -2,
+                                }}
                             />
-                            {this.excludeVUS ?
-                                `${vusCount} ${getVusDescription(vusTypes, vusCount !== 1)} ${is} ${this.props.mutationsTabModeSettings ? "hidden below." : "excluded from analysis."}` :
-                                `${vusCount} ${getVusDescription(vusTypes, vusCount !== 1)} ${is} ${this.props.mutationsTabModeSettings ? "shown below." : "included in analysis."}`
-                            }
+                            {this.excludeVUS
+                                ? `${vusCount} ${getVusDescription(
+                                      vusTypes,
+                                      vusCount !== 1
+                                  )} ${is} ${
+                                      this.props.mutationsTabModeSettings
+                                          ? 'hidden below.'
+                                          : 'excluded from analysis.'
+                                  }`
+                                : `${vusCount} ${getVusDescription(
+                                      vusTypes,
+                                      vusCount !== 1
+                                  )} ${is} ${
+                                      this.props.mutationsTabModeSettings
+                                          ? 'shown below.'
+                                          : 'included in analysis.'
+                                  }`}
                             {this.vusToggleable && (
                                 <button
-                                    onClick={this.props.mutationsTabModeSettings!.toggleExcludeVUS}
+                                    onClick={
+                                        this.props.mutationsTabModeSettings!
+                                            .toggleExcludeVUS
+                                    }
                                     className="btn btn-default btn-xs"
-                                    style={{marginLeft:5}}
+                                    style={{ marginLeft: 5 }}
                                 >
-                                    {this.excludeVUS ?
-                                        (this.props.mutationsTabModeSettings ? "Show" : "Include") :
-                                        (this.props.mutationsTabModeSettings ? "Hide" : "Exclude")
-                                    }
+                                    {this.excludeVUS
+                                        ? this.props.mutationsTabModeSettings
+                                            ? 'Show'
+                                            : 'Include'
+                                        : this.props.mutationsTabModeSettings
+                                        ? 'Hide'
+                                        : 'Exclude'}
                                 </button>
                             )}
                         </div>
@@ -133,37 +180,42 @@ export default class AlterationFilterWarning extends React.Component<IAlteration
             } else {
                 return null;
             }
-        }
+        },
     });
 
     readonly germlineWarning = MakeMobxView({
-        await:()=>{
+        await: () => {
             if (this.props.mutationsTabModeSettings) {
                 return [this.props.store.mutationsReportByGene];
             } else {
-                return [
-                    this.props.store.oqlFilteredMutationsReport,
-                ];
+                return [this.props.store.oqlFilteredMutationsReport];
             }
         },
-        render:()=>{
+        render: () => {
             let report;
             if (this.props.mutationsTabModeSettings) {
-                report = this.props.store.mutationsReportByGene.result![this.props.mutationsTabModeSettings.hugoGeneSymbol];
+                report = this.props.store.mutationsReportByGene.result![
+                    this.props.mutationsTabModeSettings.hugoGeneSymbol
+                ];
             } else {
                 report = this.props.store.oqlFilteredMutationsReport.result!;
             }
 
-            const germlineCount = report.germline.length + report.vusAndGermline.length;
+            const germlineCount =
+                report.germline.length + report.vusAndGermline.length;
 
             if (germlineCount > 0) {
-                const is = (germlineCount === 1) ? "is" : "are";
+                const is = germlineCount === 1 ? 'is' : 'are';
                 if (this.props.isUnaffected && this.excludeGermline) {
                     return (
                         <div className="alert alert-unaffected">
                             <i
                                 className="fa fa-md fa-info-circle"
-                                style={{verticalAlign:"middle !important", marginRight:6, marginBottom:1}}
+                                style={{
+                                    verticalAlign: 'middle !important',
+                                    marginRight: 6,
+                                    marginBottom: 1,
+                                }}
                             />
                             {`${germlineCount} germline mutations ${is} included in analysis.`}
                         </div>
@@ -172,23 +224,40 @@ export default class AlterationFilterWarning extends React.Component<IAlteration
                     return (
                         <div className="alert alert-info">
                             <img
-                                src={require("../../../rootImages/funnel.svg")}
-                                style={{marginRight:6, width:15, marginTop:-2}}
+                                src={require('../../../rootImages/funnel.svg')}
+                                style={{
+                                    marginRight: 6,
+                                    width: 15,
+                                    marginTop: -2,
+                                }}
                             />
-                            {this.excludeGermline ?
-                                `${germlineCount} germline mutations ${is} ${this.props.mutationsTabModeSettings ? "hidden below." : "excluded from analysis."}` :
-                                `${germlineCount} germline mutations ${is} ${this.props.mutationsTabModeSettings ? "shown below." : "included in analysis."}`
-                            }
+                            {this.excludeGermline
+                                ? `${germlineCount} germline mutations ${is} ${
+                                      this.props.mutationsTabModeSettings
+                                          ? 'hidden below.'
+                                          : 'excluded from analysis.'
+                                  }`
+                                : `${germlineCount} germline mutations ${is} ${
+                                      this.props.mutationsTabModeSettings
+                                          ? 'shown below.'
+                                          : 'included in analysis.'
+                                  }`}
                             {this.germlineToggleable && (
                                 <button
-                                    onClick={this.props.mutationsTabModeSettings!.toggleExcludeGermline}
+                                    onClick={
+                                        this.props.mutationsTabModeSettings!
+                                            .toggleExcludeGermline
+                                    }
                                     className="btn btn-default btn-xs"
-                                    style={{marginLeft:5}}
+                                    style={{ marginLeft: 5 }}
                                 >
-                                    {this.excludeGermline ?
-                                        (this.props.mutationsTabModeSettings ? "Show" : "Include") :
-                                        (this.props.mutationsTabModeSettings ? "Hide" : "Exclude")
-                                    }
+                                    {this.excludeGermline
+                                        ? this.props.mutationsTabModeSettings
+                                            ? 'Show'
+                                            : 'Include'
+                                        : this.props.mutationsTabModeSettings
+                                        ? 'Hide'
+                                        : 'Exclude'}
                                 </button>
                             )}
                         </div>
@@ -197,7 +266,7 @@ export default class AlterationFilterWarning extends React.Component<IAlteration
             } else {
                 return null;
             }
-        }
+        },
     });
 
     render() {
@@ -208,4 +277,4 @@ export default class AlterationFilterWarning extends React.Component<IAlteration
             </>
         );
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/banners/InfoBanner.tsx b/src/shared/components/banners/InfoBanner.tsx
index 787b510a1c3..451aaa5be63 100644
--- a/src/shared/components/banners/InfoBanner.tsx
+++ b/src/shared/components/banners/InfoBanner.tsx
@@ -1,25 +1,32 @@
-import * as React from "react";
-import {observer} from "mobx-react";
+import * as React from 'react';
+import { observer } from 'mobx-react';
 
 export interface IInfoBannerProps {
-    message:string;
-    hidden:boolean;
-    hide:()=>void;
-    style?:any;
+    message: string;
+    hidden: boolean;
+    hide: () => void;
+    style?: any;
 }
 
 @observer
 export default class InfoBanner extends React.Component<IInfoBannerProps, {}> {
     render() {
         return (
-            <div className='alert alert-info' style={Object.assign({marginTop: '10px', marginBottom: '0'}, this.props.style)}>
+            <div
+                className="alert alert-info"
+                style={Object.assign(
+                    { marginTop: '10px', marginBottom: '0' },
+                    this.props.style
+                )}
+            >
                 <span>
-                    <i className='fa fa-md fa-info-circle'/> {this.props.message}
+                    <i className="fa fa-md fa-info-circle" />{' '}
+                    {this.props.message}
                 </span>
                 {!this.props.hidden && (
                     <button
                         className="btn btn-sm btn-default"
-                        style={{marginLeft:7}}
+                        style={{ marginLeft: 7 }}
                         onClick={this.props.hide}
                     >
                         Hide
@@ -28,4 +35,4 @@ export default class InfoBanner extends React.Component<IInfoBannerProps, {}> {
             </div>
         );
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/banners/OqlStatusBanner.tsx b/src/shared/components/banners/OqlStatusBanner.tsx
index 1b6e9ebd997..e068c5271ec 100644
--- a/src/shared/components/banners/OqlStatusBanner.tsx
+++ b/src/shared/components/banners/OqlStatusBanner.tsx
@@ -1,21 +1,24 @@
-import * as React from "react";
-import {ResultsViewPageStore} from "../../../pages/resultsView/ResultsViewPageStore";
-import {observer} from "mobx-react";
-import classnames from "classnames";
-import {computed} from "mobx";
-import "./styles.scss";
+import * as React from 'react';
+import { ResultsViewPageStore } from '../../../pages/resultsView/ResultsViewPageStore';
+import { observer } from 'mobx-react';
+import classnames from 'classnames';
+import { computed } from 'mobx';
+import './styles.scss';
 
 interface IOqlStatusBannerProps {
-    store:ResultsViewPageStore;
-    tabReflectsOql:boolean;
-    isUnaffected?:boolean;
-    onToggle?:()=>void;
-    className?:string;
-    style?:any;
+    store: ResultsViewPageStore;
+    tabReflectsOql: boolean;
+    isUnaffected?: boolean;
+    onToggle?: () => void;
+    className?: string;
+    style?: any;
 }
 
 @observer
-export default class OqlStatusBanner extends React.Component<IOqlStatusBannerProps, {}> {
+export default class OqlStatusBanner extends React.Component<
+    IOqlStatusBannerProps,
+    {}
+> {
     @computed get toggleButton() {
         if (this.props.onToggle && !this.props.isUnaffected) {
             return (
@@ -23,12 +26,11 @@ export default class OqlStatusBanner extends React.Component<IOqlStatusBannerPro
                     <button
                         onClick={this.props.onToggle}
                         className="btn btn-default btn-xs"
-                        style={{marginLeft:5}}
+                        style={{ marginLeft: 5 }}
                     >
-                        { this.props.tabReflectsOql ?
-                            "Do not filter by OQL" :
-                            "Filter by OQL"
-                        }
+                        {this.props.tabReflectsOql
+                            ? 'Do not filter by OQL'
+                            : 'Filter by OQL'}
                     </button>
                 </span>
             );
@@ -39,34 +41,49 @@ export default class OqlStatusBanner extends React.Component<IOqlStatusBannerPro
 
     render() {
         if (this.props.store.queryContainsOql) {
-            let className:string;
-            let message:string;
-            let iconClassName:string;
-            let dataTest:string;
+            let className: string;
+            let message: string;
+            let iconClassName: string;
+            let dataTest: string;
 
             if (this.props.isUnaffected) {
-                className="alert alert-unaffected";
-                message = "The results below are not affected by the OQL specification from your query.";
-                iconClassName = "fa fa-md fa-info-circle";
-                dataTest="OqlStatusBannerUnaffected";
+                className = 'alert alert-unaffected';
+                message =
+                    'The results below are not affected by the OQL specification from your query.';
+                iconClassName = 'fa fa-md fa-info-circle';
+                dataTest = 'OqlStatusBannerUnaffected';
             } else if (this.props.tabReflectsOql) {
-                className="alert alert-success";
-                message = "The results below reflect the OQL specification from your query.";
-                iconClassName = "fa fa-md fa-check";
-                dataTest="OqlStatusBannerYes";
+                className = 'alert alert-success';
+                message =
+                    'The results below reflect the OQL specification from your query.';
+                iconClassName = 'fa fa-md fa-check';
+                dataTest = 'OqlStatusBannerYes';
             } else {
-                className="alert alert-info";
-                message = "The results below do not reflect the OQL specification from your query.";
-                iconClassName = "fa fa-md fa-exclamation-triangle";
-                dataTest="OqlStatusBannerNo";
+                className = 'alert alert-info';
+                message =
+                    'The results below do not reflect the OQL specification from your query.';
+                iconClassName = 'fa fa-md fa-exclamation-triangle';
+                dataTest = 'OqlStatusBannerNo';
             }
 
             return (
-                <div data-test={dataTest} className={classnames("oql-status-banner", className, this.props.className)} style={Object.assign({}, this.props.style || {})}>
-                    <span style={{verticalAlign:"middle"}}>
+                <div
+                    data-test={dataTest}
+                    className={classnames(
+                        'oql-status-banner',
+                        className,
+                        this.props.className
+                    )}
+                    style={Object.assign({}, this.props.style || {})}
+                >
+                    <span style={{ verticalAlign: 'middle' }}>
                         <i
-                            className={classnames("banner-icon", iconClassName)}
-                            style={{verticalAlign:"middle !important", marginRight:6, marginBottom:1}}
+                            className={classnames('banner-icon', iconClassName)}
+                            style={{
+                                verticalAlign: 'middle !important',
+                                marginRight: 6,
+                                marginBottom: 1,
+                            }}
                         />
                         {message}
                         {this.toggleButton}
@@ -77,4 +94,4 @@ export default class OqlStatusBanner extends React.Component<IOqlStatusBannerPro
             return null;
         }
     }
-};
+}
diff --git a/src/shared/components/banners/styles.scss b/src/shared/components/banners/styles.scss
index 06f3a242e64..09462e596b6 100644
--- a/src/shared/components/banners/styles.scss
+++ b/src/shared/components/banners/styles.scss
@@ -1,11 +1,11 @@
 .oql-status-banner {
-  .banner-icon {
-    vertical-align:middle !important;
-  }
+    .banner-icon {
+        vertical-align: middle !important;
+    }
 }
 
 .alert-unaffected {
-  background-color: #f3f3f3;
-  border-color: #bce8f1;
-  color: #31708f;
-}
\ No newline at end of file
+    background-color: #f3f3f3;
+    border-color: #bce8f1;
+    color: #31708f;
+}
diff --git a/src/shared/components/barGraph/BarGraph.tsx b/src/shared/components/barGraph/BarGraph.tsx
index 4b0573d5879..4da48f29ed6 100644
--- a/src/shared/components/barGraph/BarGraph.tsx
+++ b/src/shared/components/barGraph/BarGraph.tsx
@@ -1,4 +1,4 @@
-import * as React from "react";
+import * as React from 'react';
 import * as _ from 'lodash';
 import wordwrap from 'word-wrap';
 import { ThreeBounce } from 'better-react-spinkit';
@@ -11,135 +11,180 @@ interface ICancerTypeStudy {
     shortName: string;
     color: string;
     studies: CancerStudy[];
-    caseCount?:number;
+    caseCount?: number;
 }
 
 export interface IBarGraphProps {
-    data:ICancerTypeStudy[];
-    openStudy:(studyId:string)=>void;
-};
+    data: ICancerTypeStudy[];
+    openStudy: (studyId: string) => void;
+}
 
 export default class BarGraph extends React.Component<IBarGraphProps, {}> {
-
-    chartTarget:HTMLCanvasElement;
+    chartTarget: HTMLCanvasElement;
 
     shouldComponentUpdate() {
         return false;
     }
 
-    getShortName(study:ICancerTypeStudy) {
-        const aliases:{[id:string]:string} = {
+    getShortName(study: ICancerTypeStudy) {
+        const aliases: { [id: string]: string } = {
             'Esophagus/Stomach': 'Stomach',
             'Ovary/Fallopian Tube': 'Ovary',
             'Bladder/Urinary Tract': 'Bladder',
             'Head and Neck': 'Head/Neck',
             'Peripheral Nervous System': 'PNS',
-            'Ampulla of Vater': 'Amp. of Vater'
+            'Ampulla of Vater': 'Amp. of Vater',
         };
         const shortName = study.shortName;
         return {
             ...study,
-            shortName: aliases[shortName] || shortName
+            shortName: aliases[shortName] || shortName,
         };
     }
 
-    lightenDarkenColor(color:string, amt:number):string {
+    lightenDarkenColor(color: string, amt: number): string {
         const hexColor = convertCssColorNameToHex(color).slice(1);
 
-        const num = parseInt(hexColor,16);
+        const num = parseInt(hexColor, 16);
 
         let r = (num >> 16) + amt;
 
         if (r > 255) r = 255;
-        else if  (r < 0) r = 0;
+        else if (r < 0) r = 0;
 
-        let b = ((num >> 8) & 0x00FF) + amt;
+        let b = ((num >> 8) & 0x00ff) + amt;
 
         if (b > 255) b = 255;
-        else if  (b < 0) b = 0;
+        else if (b < 0) b = 0;
 
-        let g = (num & 0x0000FF) + amt;
+        let g = (num & 0x0000ff) + amt;
 
         if (g > 255) g = 255;
         else if (g < 0) g = 0;
 
         const luma = 0.2126 * r + 0.7152 * g + 0.0722 * b;
         if (luma >= 254 && color !== 'White' && amt > 1) {
-            return this.lightenDarkenColor(color, amt/2);
+            return this.lightenDarkenColor(color, amt / 2);
         }
 
-        return "#" + (g | (b << 8) | (r << 16)).toString(16);
+        return '#' + (g | (b << 8) | (r << 16)).toString(16);
     }
 
     formatTooltipString(label: string) {
-        return wordwrap(label, {width: 30}).split(/\r?\n/).map(_label => _label.trim());
+        return wordwrap(label, { width: 30 })
+            .split(/\r?\n/)
+            .map(_label => _label.trim());
     }
 
     get byPrimarySiteStudies() {
-        return this.props.data.filter(cancers => _.every(cancers.studies, study => study.cancerTypeId !== "other" &&  study.cancerTypeId  !== "mixed"));
+        return this.props.data.filter(cancers =>
+            _.every(
+                cancers.studies,
+                study =>
+                    study.cancerTypeId !== 'other' &&
+                    study.cancerTypeId !== 'mixed'
+            )
+        );
     }
 
     componentDidMount() {
-
         const cancerStudies = this.byPrimarySiteStudies;
 
         if (!cancerStudies.length) return;
-        cancerStudies.forEach(study => {study.caseCount = study.studies.reduce((sum:number, cStudy) => sum + cStudy.allSampleCount, 0)});
-
-        const cancerTypeStudiesArray = cancerStudies.sort((a, b) => b.caseCount! - a.caseCount!).slice(0, 20).map(study => this.getShortName(study));
-
-        const datasets:any = _.flattenDeep(cancerTypeStudiesArray.map((cancerStudySet, i) => (
-            cancerStudySet.studies.sort((a: CancerStudy, b:CancerStudy) => b.allSampleCount - a.allSampleCount).map((cancerStudy: CancerStudy, j: number) => {
-                let lightenColorConstant = 3;
-                const cancerColor = cancerStudySet.color;
-                const {name, studyId, allSampleCount} = cancerStudy;
-                const max = cancerStudySet.studies.length;
-                if (cancerColor === "Cyan") {
-                    lightenColorConstant = 18;
-                } else if (cancerColor === "Yellow") {
-                    lightenColorConstant = 11;
-                } else if (_.includes(["LightBlue", "LightSkyBlue", "PeachPuff", "LightYellow"], cancerColor)) {
-                    lightenColorConstant = 0;
-                } else if (cancerColor === "Teal") {
-                    lightenColorConstant = 1;
-                } else if (cancerColor === "LightYellow") {
-                    lightenColorConstant = -3;
-                } else if (cancerColor === "Black") {
-                    lightenColorConstant = 6;
-                }
-                const color = this.lightenDarkenColor(cancerColor, (j + lightenColorConstant)/max * 90);
-                return {
-                    studyId,
-                    borderColor: _.includes(['Gainsboro', 'White', 'LightYellow'], cancerColor) ? '#dddddd' : '#F1F6FE',
-                    backgroundColor: color,
-                    borderWidth: 1,
-                    label: name,
-                    total: cancerStudySet.caseCount,
-                    data: i === 0 ? [allSampleCount] : [...Array(i).fill(0), allSampleCount]
-                };}
-            ))
-        ));
+        cancerStudies.forEach(study => {
+            study.caseCount = study.studies.reduce(
+                (sum: number, cStudy) => sum + cStudy.allSampleCount,
+                0
+            );
+        });
+
+        const cancerTypeStudiesArray = cancerStudies
+            .sort((a, b) => b.caseCount! - a.caseCount!)
+            .slice(0, 20)
+            .map(study => this.getShortName(study));
+
+        const datasets: any = _.flattenDeep(
+            cancerTypeStudiesArray.map((cancerStudySet, i) =>
+                cancerStudySet.studies
+                    .sort(
+                        (a: CancerStudy, b: CancerStudy) =>
+                            b.allSampleCount - a.allSampleCount
+                    )
+                    .map((cancerStudy: CancerStudy, j: number) => {
+                        let lightenColorConstant = 3;
+                        const cancerColor = cancerStudySet.color;
+                        const { name, studyId, allSampleCount } = cancerStudy;
+                        const max = cancerStudySet.studies.length;
+                        if (cancerColor === 'Cyan') {
+                            lightenColorConstant = 18;
+                        } else if (cancerColor === 'Yellow') {
+                            lightenColorConstant = 11;
+                        } else if (
+                            _.includes(
+                                [
+                                    'LightBlue',
+                                    'LightSkyBlue',
+                                    'PeachPuff',
+                                    'LightYellow',
+                                ],
+                                cancerColor
+                            )
+                        ) {
+                            lightenColorConstant = 0;
+                        } else if (cancerColor === 'Teal') {
+                            lightenColorConstant = 1;
+                        } else if (cancerColor === 'LightYellow') {
+                            lightenColorConstant = -3;
+                        } else if (cancerColor === 'Black') {
+                            lightenColorConstant = 6;
+                        }
+                        const color = this.lightenDarkenColor(
+                            cancerColor,
+                            ((j + lightenColorConstant) / max) * 90
+                        );
+                        return {
+                            studyId,
+                            borderColor: _.includes(
+                                ['Gainsboro', 'White', 'LightYellow'],
+                                cancerColor
+                            )
+                                ? '#dddddd'
+                                : '#F1F6FE',
+                            backgroundColor: color,
+                            borderWidth: 1,
+                            label: name,
+                            total: cancerStudySet.caseCount,
+                            data:
+                                i === 0
+                                    ? [allSampleCount]
+                                    : [...Array(i).fill(0), allSampleCount],
+                        };
+                    })
+            )
+        );
 
         const data = {
-            labels: cancerTypeStudiesArray.map(cancer => (cancer.shortName)),
-            datasets
+            labels: cancerTypeStudiesArray.map(cancer => cancer.shortName),
+            datasets,
         };
 
         var self = this;
 
         const options = {
-            animation:{
-                duration:0
+            animation: {
+                duration: 0,
             },
             title: {
                 display: true,
                 text: 'Cases by Top 20 Primary Sites',
                 fontSize: 14,
-                fontStyle: 'normal'
+                fontStyle: 'normal',
             },
-            onClick: function (e: Event) {
+            onClick: function(e: Event) {
                 if (this.getElementAtEvent(e)[0]) {
-                    const {studyId} = datasets[this.getElementAtEvent(e)[0]._datasetIndex];
+                    const { studyId } = datasets[
+                        this.getElementAtEvent(e)[0]._datasetIndex
+                    ];
                     self.props.openStudy(studyId);
                 }
                 return false;
@@ -156,33 +201,44 @@ export default class BarGraph extends React.Component<IBarGraphProps, {}> {
                 bodyFontSize: 11,
                 titleFontColor: '#000',
                 titleFontStyle: 'normal',
-                filter: function (tooltipItem:ChartTooltipItem) {
+                filter: function(tooltipItem: ChartTooltipItem) {
                     if (tooltipItem) {
                         return Number(tooltipItem.xLabel) > 0;
                     }
                     return false;
                 },
                 callbacks: {
-                    title: (tooltipItem:ChartTooltipItem[], _data:any) => {
+                    title: (tooltipItem: ChartTooltipItem[], _data: any) => {
                         if (tooltipItem.length > 0) {
                             const tooltipItems = tooltipItem[0];
-                            const label = tooltipItems.yLabel + ': ' + _data.datasets[tooltipItems.datasetIndex!].total + ' cases';
+                            const label =
+                                tooltipItems.yLabel +
+                                ': ' +
+                                _data.datasets[tooltipItems.datasetIndex!]
+                                    .total +
+                                ' cases';
                             return this.formatTooltipString(label);
                         }
                     },
-                    label: (tooltipItems:ChartTooltipItem, _data:any) => {
-                        const label = _data.datasets[tooltipItems.datasetIndex!].label + ': ' + tooltipItems.xLabel + ' cases';
+                    label: (tooltipItems: ChartTooltipItem, _data: any) => {
+                        const label =
+                            _data.datasets[tooltipItems.datasetIndex!].label +
+                            ': ' +
+                            tooltipItems.xLabel +
+                            ' cases';
                         return this.formatTooltipString(label);
                     },
-                }
+                },
             },
             scales: {
                 xAxes: [{ stacked: true }],
-                yAxes: [{
-                    stacked: true,
-                    gridLines: {display: false},
-                    ticks: {fontSize: 11}
-                }]
+                yAxes: [
+                    {
+                        stacked: true,
+                        gridLines: { display: false },
+                        ticks: { fontSize: 11 },
+                    },
+                ],
             },
             legend: { display: false },
         };
@@ -191,27 +247,30 @@ export default class BarGraph extends React.Component<IBarGraphProps, {}> {
             type: 'horizontalBar',
             data,
             options,
-            plugins: [this.backgroundColorPlugin]
+            plugins: [this.backgroundColorPlugin],
         } as any);
-
     }
 
     private backgroundColorPlugin = {
-        beforeDraw: function(chartInstance:any) {
+        beforeDraw: function(chartInstance: any) {
             var ctx = chartInstance.chart.ctx;
-            ctx.fillStyle = "#F1F6FE";
-            ctx.fillRect(0, 0, chartInstance.chart.width, chartInstance.chart.height);
-        }
+            ctx.fillStyle = '#F1F6FE';
+            ctx.fillRect(
+                0,
+                0,
+                chartInstance.chart.width,
+                chartInstance.chart.height
+            );
+        },
     };
 
     render() {
         const length = this.byPrimarySiteStudies.length;
         return length ? (
             <canvas
-                ref={(el:HTMLCanvasElement) => this.chartTarget = el}
-                height={70 + 430 * (length > 20 ? 20 : length)/20}
+                ref={(el: HTMLCanvasElement) => (this.chartTarget = el)}
+                height={70 + (430 * (length > 20 ? 20 : length)) / 20}
             />
-        ): null;
+        ) : null;
     }
-
-};
\ No newline at end of file
+}
diff --git a/src/shared/components/cnSegments/CNSegmentsDownloader.tsx b/src/shared/components/cnSegments/CNSegmentsDownloader.tsx
index ddb09a453c3..10615fa690a 100644
--- a/src/shared/components/cnSegments/CNSegmentsDownloader.tsx
+++ b/src/shared/components/cnSegments/CNSegmentsDownloader.tsx
@@ -1,15 +1,15 @@
-import * as React from "react";
-import MobxPromise from "mobxpromise/dist/src/MobxPromise";
-import {observable} from "mobx";
-import {observer} from "mobx-react";
-import {Button} from "react-bootstrap";
-import classnames from "classnames";
-import {DefaultTooltip} from "cbioportal-frontend-commons";
-import {CopyNumberSeg} from "shared/api/generated/CBioPortalAPI";
-import {generateSegmentFileContent} from "shared/lib/IGVUtils";
-import onMobxPromise from "shared/lib/onMobxPromise";
-import fileDownload from "react-file-download";
-import autobind from "autobind-decorator";
+import * as React from 'react';
+import MobxPromise from 'mobxpromise/dist/src/MobxPromise';
+import { observable } from 'mobx';
+import { observer } from 'mobx-react';
+import { Button } from 'react-bootstrap';
+import classnames from 'classnames';
+import { DefaultTooltip } from 'cbioportal-frontend-commons';
+import { CopyNumberSeg } from 'shared/api/generated/CBioPortalAPI';
+import { generateSegmentFileContent } from 'shared/lib/IGVUtils';
+import onMobxPromise from 'shared/lib/onMobxPromise';
+import fileDownload from 'react-file-download';
+import autobind from 'autobind-decorator';
 
 export type CNSegmentsDownloaderProps = {
     promise: MobxPromise<CopyNumberSeg[]>;
@@ -19,11 +19,14 @@ export type CNSegmentsDownloaderProps = {
 };
 
 @observer
-export default class CNSegmentsDownloader extends React.Component<CNSegmentsDownloaderProps, {}> {
+export default class CNSegmentsDownloader extends React.Component<
+    CNSegmentsDownloaderProps,
+    {}
+> {
     public static defaultProps = {
-        filename: "segments.seg",
-        buttonClassName: "btn btn-sm pull-right",
-        tooltipPlacement: "left"
+        filename: 'segments.seg',
+        buttonClassName: 'btn btn-sm pull-right',
+        tooltipPlacement: 'left',
     };
 
     @observable downloading = false;
@@ -31,7 +34,12 @@ export default class CNSegmentsDownloader extends React.Component<CNSegmentsDown
     public render() {
         return (
             <DefaultTooltip
-                overlay={<span>Download a copy number segment file for the selected samples</span>}
+                overlay={
+                    <span>
+                        Download a copy number segment file for the selected
+                        samples
+                    </span>
+                }
                 placement={this.props.tooltipPlacement}
             >
                 <Button
@@ -39,9 +47,12 @@ export default class CNSegmentsDownloader extends React.Component<CNSegmentsDown
                     onClick={this.handleDownload}
                     disabled={this.downloading}
                 >
-                    <i className={classnames({'fa': true,
-                        'fa-cloud-download': !this.downloading,
-                        'fa-spinner fa-pulse': this.downloading})}
+                    <i
+                        className={classnames({
+                            fa: true,
+                            'fa-cloud-download': !this.downloading,
+                            'fa-spinner fa-pulse': this.downloading,
+                        })}
                     />
                 </Button>
             </DefaultTooltip>
@@ -52,12 +63,9 @@ export default class CNSegmentsDownloader extends React.Component<CNSegmentsDown
     private handleDownload() {
         this.downloading = true;
 
-        onMobxPromise(
-            this.props.promise,
-            data => {
-                fileDownload(generateSegmentFileContent(data), this.props.filename);
-                this.downloading = false;
-            }
-        );
+        onMobxPromise(this.props.promise, data => {
+            fileDownload(generateSegmentFileContent(data), this.props.filename);
+            this.downloading = false;
+        });
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/cohort/FrequencyBar.spec.tsx b/src/shared/components/cohort/FrequencyBar.spec.tsx
index 5e8b7bb4c82..d30353e6c88 100644
--- a/src/shared/components/cohort/FrequencyBar.spec.tsx
+++ b/src/shared/components/cohort/FrequencyBar.spec.tsx
@@ -1,75 +1,100 @@
 import React from 'react';
 import { assert } from 'chai';
-import {shallow, mount, ReactWrapper} from 'enzyme';
+import { shallow, mount, ReactWrapper } from 'enzyme';
 import sinon from 'sinon';
-import FrequencyBar from "./FrequencyBar";
-import {DefaultTooltip} from "cbioportal-frontend-commons";
+import FrequencyBar from './FrequencyBar';
+import { DefaultTooltip } from 'cbioportal-frontend-commons';
 
 describe('FrequencyBar', () => {
-
     const props = {
         totalCount: 100,
         counts: [43, 6],
-        freqColors: ["#666", "maroon"],
-        barColor: "black",
+        freqColors: ['#666', 'maroon'],
+        barColor: 'black',
         barWidth: 50,
         barHeight: 15,
         textMargin: 10,
         textWidth: 40,
-        tooltip: (<span>This used to be an amazing bar.</span>)
+        tooltip: <span>This used to be an amazing bar.</span>,
     };
 
     let component: ReactWrapper<any, any>;
     let rootSvg: ReactWrapper<any, any>;
     let barRect: ReactWrapper<any, any>;
     let mainFreqRect: ReactWrapper<any, any>;
-    let secondaryFreqRect:ReactWrapper<any, any>;
+    let secondaryFreqRect: ReactWrapper<any, any>;
 
     before(() => {
-        component = mount(<FrequencyBar {...props}/>);
-        rootSvg = component.find("svg");
-        barRect = rootSvg.find("rect").find("[width=50]");
-        mainFreqRect = rootSvg.find("rect").find(`[width=${(43/100) * 50}]`);
-        secondaryFreqRect = rootSvg.find("rect").find(`[width=${(6/100) * 50}]`);
+        component = mount(<FrequencyBar {...props} />);
+        rootSvg = component.find('svg');
+        barRect = rootSvg.find('rect').find('[width=50]');
+        mainFreqRect = rootSvg.find('rect').find(`[width=${(43 / 100) * 50}]`);
+        secondaryFreqRect = rootSvg
+            .find('rect')
+            .find(`[width=${(6 / 100) * 50}]`);
     });
 
     it('renders the components with correct dimensions', () => {
-        assert.equal(rootSvg.prop("width"), (50 + 10 + 40),
-            "total width should respect bar width and text margin");
-
-        assert.isTrue(barRect.exists(),
-            "main bar rectangle should exist with correct width");
-
-        assert.isTrue(mainFreqRect.exists(),
-            "main frequency rectangle should exist with correct width");
-
-        assert.isTrue(secondaryFreqRect.exists(),
-            "main frequency rectangle should exist with correct width");
+        assert.equal(
+            rootSvg.prop('width'),
+            50 + 10 + 40,
+            'total width should respect bar width and text margin'
+        );
+
+        assert.isTrue(
+            barRect.exists(),
+            'main bar rectangle should exist with correct width'
+        );
+
+        assert.isTrue(
+            mainFreqRect.exists(),
+            'main frequency rectangle should exist with correct width'
+        );
+
+        assert.isTrue(
+            secondaryFreqRect.exists(),
+            'main frequency rectangle should exist with correct width'
+        );
     });
 
     it('renders the components with correct fill color', () => {
-        assert.equal(mainFreqRect.prop("fill"), "#666",
-            "main frequency rectangle should have the designated fill color");
-
-        assert.equal(secondaryFreqRect.prop("fill"), "maroon",
-            "secondary frequency rectangle should have the designated fill color");
-
-        assert.equal(barRect.prop("fill"), "black",
-            "main bar should have the designated fill color");
+        assert.equal(
+            mainFreqRect.prop('fill'),
+            '#666',
+            'main frequency rectangle should have the designated fill color'
+        );
+
+        assert.equal(
+            secondaryFreqRect.prop('fill'),
+            'maroon',
+            'secondary frequency rectangle should have the designated fill color'
+        );
+
+        assert.equal(
+            barRect.prop('fill'),
+            'black',
+            'main bar should have the designated fill color'
+        );
     });
 
     it('renders the component with correct content', () => {
-        assert.equal(rootSvg.find("text").prop("x"), (50 + 10),
-            "percentage text position should respect bar width and text margin");
-
-        assert.equal(rootSvg.find("text").text(), "43.0%",
-            "percentage text should reflect only the first value in the count array");
-
-        assert.isTrue(component.find(DefaultTooltip).exists(),
-            "component should have a tooltip");
+        assert.equal(
+            rootSvg.find('text').prop('x'),
+            50 + 10,
+            'percentage text position should respect bar width and text margin'
+        );
+
+        assert.equal(
+            rootSvg.find('text').text(),
+            '43.0%',
+            'percentage text should reflect only the first value in the count array'
+        );
+
+        assert.isTrue(
+            component.find(DefaultTooltip).exists(),
+            'component should have a tooltip'
+        );
     });
 
-    after(() => {
-
-    });
+    after(() => {});
 });
diff --git a/src/shared/components/cohort/FrequencyBar.tsx b/src/shared/components/cohort/FrequencyBar.tsx
index af5137026e3..2d098919cd4 100644
--- a/src/shared/components/cohort/FrequencyBar.tsx
+++ b/src/shared/components/cohort/FrequencyBar.tsx
@@ -1,9 +1,8 @@
 import * as React from 'react';
-import {DefaultTooltip} from 'cbioportal-frontend-commons';
-import {getPercentage} from "shared/lib/FormatUtils";
+import { DefaultTooltip } from 'cbioportal-frontend-commons';
+import { getPercentage } from 'shared/lib/FormatUtils';
 
-export interface IFrequencyBarProps
-{
+export interface IFrequencyBarProps {
     totalCount: number;
     counts: number[];
     mainCountIndex?: number;
@@ -19,36 +18,45 @@ export interface IFrequencyBarProps
 /**
  * @author Selcuk Onur Sumer
  */
-export default class FrequencyBar extends React.Component<IFrequencyBarProps, {}>
-{
+export default class FrequencyBar extends React.Component<
+    IFrequencyBarProps,
+    {}
+> {
     public static defaultProps = {
-        freqColors: ["lightgreen", "green"],
-        barColor: "#ccc",
+        freqColors: ['lightgreen', 'green'],
+        barColor: '#ccc',
         textMargin: 6,
         textWidth: 35,
         barWidth: 30,
-        barHeight: 8
+        barHeight: 8,
     };
 
-    constructor(props:IFrequencyBarProps) {
+    constructor(props: IFrequencyBarProps) {
         super(props);
     }
 
-    public mainContent()
-    {
+    public mainContent() {
         const {
-            barWidth, barHeight, barColor, totalCount, counts, textMargin, textWidth
+            barWidth,
+            barHeight,
+            barColor,
+            totalCount,
+            counts,
+            textMargin,
+            textWidth,
         } = this.props;
 
-        const freqColors = this.props.freqColors || FrequencyBar.defaultProps.freqColors;
+        const freqColors =
+            this.props.freqColors || FrequencyBar.defaultProps.freqColors;
 
         // if no mainCountIndex is provided or it is not a valid index, then use the first count in the list
         // (main count is used to calculate the percentage to display)
-        const mainCountIndex = (
+        const mainCountIndex =
             this.props.mainCountIndex &&
             this.props.mainCountIndex >= 0 &&
             this.props.mainCountIndex < counts.length
-        ) ? this.props.mainCountIndex : 0;
+                ? this.props.mainCountIndex
+                : 0;
 
         const mainProportion = counts[mainCountIndex] / totalCount;
         const textPos = (barWidth || 0) + (textMargin || 0);
@@ -66,12 +74,7 @@ export default class FrequencyBar extends React.Component<IFrequencyBarProps, {}
 
         return (
             <svg width={totalWidth} height="12">
-                <text
-                    x={textPos}
-                    y="9.5"
-                    textAnchor="start"
-                    fontSize="10"
-                >
+                <text x={textPos} y="9.5" textAnchor="start" fontSize="10">
                     {getPercentage(mainProportion)}
                 </text>
                 <rect
@@ -85,10 +88,13 @@ export default class FrequencyBar extends React.Component<IFrequencyBarProps, {}
         );
     }
 
-    public frequencyRectangle(count: number, totalCount: number, color: string)
-    {
+    public frequencyRectangle(
+        count: number,
+        totalCount: number,
+        color: string
+    ) {
         const proportion = count / totalCount;
-        const {barWidth, barHeight} = this.props;
+        const { barWidth, barHeight } = this.props;
 
         return (
             <rect
@@ -100,18 +106,16 @@ export default class FrequencyBar extends React.Component<IFrequencyBarProps, {}
         );
     }
 
-    public render()
-    {
+    public render() {
         let content = this.mainContent();
 
         // add tooltip if provided
-        if (this.props.tooltip)
-        {
+        if (this.props.tooltip) {
             content = (
                 <DefaultTooltip
                     placement="left"
                     overlay={this.props.tooltip}
-                    arrowContent={<div className="rc-tooltip-arrow-inner"/>}
+                    arrowContent={<div className="rc-tooltip-arrow-inner" />}
                 >
                     {content}
                 </DefaultTooltip>
diff --git a/src/shared/components/cohort/LetterIcon.tsx b/src/shared/components/cohort/LetterIcon.tsx
index 53b5975efb1..2e33e2d2006 100644
--- a/src/shared/components/cohort/LetterIcon.tsx
+++ b/src/shared/components/cohort/LetterIcon.tsx
@@ -1,10 +1,9 @@
 import * as React from 'react';
-import {DefaultTooltip} from "cbioportal-frontend-commons";
+import { DefaultTooltip } from 'cbioportal-frontend-commons';
 
-export interface ILetterIconProps
-{
+export interface ILetterIconProps {
     text: string;
-    tooltip?: JSX.Element|(() => JSX.Element);
+    tooltip?: JSX.Element | (() => JSX.Element);
     stroke?: string;
     circleFill?: string;
     fontSize?: number;
@@ -14,33 +13,41 @@ export interface ILetterIconProps
 /**
  * @author Selcuk Onur Sumer
  */
-export default class LetterIcon extends React.Component<ILetterIconProps, {}>
-{
+export default class LetterIcon extends React.Component<ILetterIconProps, {}> {
     public static defaultProps = {
-        stroke: "#55C",
-        circleFill: "none",
+        stroke: '#55C',
+        circleFill: 'none',
         fontSize: 7,
-        textFill: "#66C"
+        textFill: '#66C',
     };
 
-    public render()
-    {
+    public render() {
         let content = (
             <svg width="12" height="12">
-                <circle r="5" cx="6" cy="6" stroke={this.props.stroke} fill={this.props.circleFill}/>
-                <text x="3" y="8.5" fontSize={this.props.fontSize} fill={this.props.textFill}>
-                    {this.props.text.slice(0,1)}
+                <circle
+                    r="5"
+                    cx="6"
+                    cy="6"
+                    stroke={this.props.stroke}
+                    fill={this.props.circleFill}
+                />
+                <text
+                    x="3"
+                    y="8.5"
+                    fontSize={this.props.fontSize}
+                    fill={this.props.textFill}
+                >
+                    {this.props.text.slice(0, 1)}
                 </text>
             </svg>
         );
 
-        if (this.props.tooltip)
-        {
+        if (this.props.tooltip) {
             content = (
                 <DefaultTooltip
                     placement="right"
                     overlay={this.props.tooltip}
-                    arrowContent={<div className="rc-tooltip-arrow-inner"/>}
+                    arrowContent={<div className="rc-tooltip-arrow-inner" />}
                 >
                     {content}
                 </DefaultTooltip>
diff --git a/src/shared/components/columnVisibilityControls/ColumnVisibilityControls.spec.tsx b/src/shared/components/columnVisibilityControls/ColumnVisibilityControls.spec.tsx
index b65abc3e528..d5d13bfddf0 100644
--- a/src/shared/components/columnVisibilityControls/ColumnVisibilityControls.spec.tsx
+++ b/src/shared/components/columnVisibilityControls/ColumnVisibilityControls.spec.tsx
@@ -2,40 +2,46 @@ import React from 'react';
 import { assert } from 'chai';
 import { mount } from 'enzyme';
 import sinon from 'sinon';
-import {IColumnVisibilityDef, ColumnVisibilityControls} from "./ColumnVisibilityControls";
+import {
+    IColumnVisibilityDef,
+    ColumnVisibilityControls,
+} from './ColumnVisibilityControls';
 
 describe('ColumnVisibilityControls', () => {
+    beforeEach(() => {});
 
-    beforeEach(()=>{
-
-
-    });
-
-    after(()=>{
-
-    });
-
-    it('does not render list item if togglabe is false', ()=>{
+    after(() => {});
 
+    it('does not render list item if togglabe is false', () => {
         var cols: IColumnVisibilityDef[] = [
             {
-                id:'one', name:'one', visible:true, togglable:true
+                id: 'one',
+                name: 'one',
+                visible: true,
+                togglable: true,
             },
             {
-                id:'two', name:'two', visible:true, togglable:true
-            }
+                id: 'two',
+                name: 'two',
+                visible: true,
+                togglable: true,
+            },
         ];
 
-        const controls = mount(<ColumnVisibilityControls columnVisibility={cols} />);
+        const controls = mount(
+            <ColumnVisibilityControls columnVisibility={cols} />
+        );
 
-        assert.equal(controls.find('li').length,2);
+        assert.equal(controls.find('li').length, 2);
 
         cols[0].togglable = false;
 
-        controls.setProps({columnVisibility:cols});
-
-        assert.equal(controls.find('li').length,1, 'does NOT render togglable false cols');
-
-});
+        controls.setProps({ columnVisibility: cols });
 
+        assert.equal(
+            controls.find('li').length,
+            1,
+            'does NOT render togglable false cols'
+        );
+    });
 });
diff --git a/src/shared/components/columnVisibilityControls/ColumnVisibilityControls.tsx b/src/shared/components/columnVisibilityControls/ColumnVisibilityControls.tsx
index e552ccd0a29..507d8bb464e 100644
--- a/src/shared/components/columnVisibilityControls/ColumnVisibilityControls.tsx
+++ b/src/shared/components/columnVisibilityControls/ColumnVisibilityControls.tsx
@@ -1,8 +1,8 @@
 import * as React from 'react';
 import * as _ from 'lodash';
-import {Dropdown, Checkbox} from 'react-bootstrap';
-import {DropdownToggleProps} from "react-bootstrap/lib/DropdownToggle";
-import {DropdownMenuProps} from "react-bootstrap/lib/DropdownMenu";
+import { Dropdown, Checkbox } from 'react-bootstrap';
+import { DropdownToggleProps } from 'react-bootstrap/lib/DropdownToggle';
+import { DropdownMenuProps } from 'react-bootstrap/lib/DropdownMenu';
 
 export interface IColumnVisibilityDef {
     id: string;
@@ -15,61 +15,80 @@ export interface IColumnVisibilityControlsProps {
     className?: string;
     buttonText?: string | JSX.Element;
     columnVisibility?: IColumnVisibilityDef[];
-    onColumnToggled?: (columnId: string, columnVisibility?: IColumnVisibilityDef[]) => void;
+    onColumnToggled?: (
+        columnId: string,
+        columnVisibility?: IColumnVisibilityDef[]
+    ) => void;
 }
 
 /**
  * @author Selcuk Onur Sumer
  * @author Aaron Lisman
  */
-export class ColumnVisibilityControls extends React.Component<IColumnVisibilityControlsProps, {}>
-{
-    public static defaultProps:IColumnVisibilityControlsProps = {
-        className: "",
-        buttonText: "Columns"
+export class ColumnVisibilityControls extends React.Component<
+    IColumnVisibilityControlsProps,
+    {}
+> {
+    public static defaultProps: IColumnVisibilityControlsProps = {
+        className: '',
+        buttonText: 'Columns',
     };
 
-    constructor(props:IColumnVisibilityControlsProps)
-    {
+    constructor(props: IColumnVisibilityControlsProps) {
         super(props);
         this.handleSelect = this.handleSelect.bind(this);
     }
 
-    public render()
-    {
+    public render() {
         return (
             <Dropdown className={this.props.className} id="dropdown-custom-1">
-                <Dropdown.Toggle {...({rootCloseEvent: "click"} as DropdownToggleProps)} className="btn-sm">
+                <Dropdown.Toggle
+                    {...({ rootCloseEvent: 'click' } as DropdownToggleProps)}
+                    className="btn-sm"
+                >
                     {this.props.buttonText}
                 </Dropdown.Toggle>
-                <Dropdown.Menu {...({bsRole: "menu"} as DropdownMenuProps)} style={{ paddingLeft:10, overflow:'auto', maxHeight:300, whiteSpace:'nowrap' }}>
+                <Dropdown.Menu
+                    {...({ bsRole: 'menu' } as DropdownMenuProps)}
+                    style={{
+                        paddingLeft: 10,
+                        overflow: 'auto',
+                        maxHeight: 300,
+                        whiteSpace: 'nowrap',
+                    }}
+                >
                     <ul className="list-unstyled">
-                        {
-                            this.props.columnVisibility &&
-                            _.map(this.props.columnVisibility, (visibility: IColumnVisibilityDef) => {
-                                return (visibility.togglable) ? (
-                                    <li key={visibility.id}>
-                                        <Checkbox
-                                            data-id={visibility.id}
-                                            onChange={this.handleSelect as React.FormEventHandler<any>}
-                                            checked={visibility.visible}
-                                            inline
-                                        >
+                        {this.props.columnVisibility &&
+                            _.map(
+                                this.props.columnVisibility,
+                                (visibility: IColumnVisibilityDef) => {
+                                    return visibility.togglable ? (
+                                        <li key={visibility.id}>
+                                            <Checkbox
+                                                data-id={visibility.id}
+                                                onChange={
+                                                    this
+                                                        .handleSelect as React.FormEventHandler<
+                                                        any
+                                                    >
+                                                }
+                                                checked={visibility.visible}
+                                                inline
+                                            >
                                                 {visibility.name}
-                                        </Checkbox>
-                                    </li>
-                                ) : null;
-                            })
-                        }
+                                            </Checkbox>
+                                        </li>
+                                    ) : null;
+                                }
+                            )}
                     </ul>
                 </Dropdown.Menu>
             </Dropdown>
         );
     }
 
-    private handleSelect(evt: React.FormEvent<HTMLInputElement>)
-    {
-        const id = evt.currentTarget.getAttribute("data-id");
+    private handleSelect(evt: React.FormEvent<HTMLInputElement>) {
+        const id = evt.currentTarget.getAttribute('data-id');
 
         if (this.props.onColumnToggled && id) {
             this.props.onColumnToggled(id, this.props.columnVisibility);
diff --git a/src/shared/components/copyDownloadControls/CopyDownloadButtons.tsx b/src/shared/components/copyDownloadControls/CopyDownloadButtons.tsx
index 7ba156548bb..ba62bfbde36 100644
--- a/src/shared/components/copyDownloadControls/CopyDownloadButtons.tsx
+++ b/src/shared/components/copyDownloadControls/CopyDownloadButtons.tsx
@@ -1,35 +1,35 @@
 import * as React from 'react';
-import {If} from 'react-if';
-import {Button, ButtonGroup} from 'react-bootstrap';
-import {DefaultTooltip} from 'cbioportal-frontend-commons';
-import {ICopyDownloadInputsProps} from "./ICopyDownloadControls";
+import { If } from 'react-if';
+import { Button, ButtonGroup } from 'react-bootstrap';
+import { DefaultTooltip } from 'cbioportal-frontend-commons';
+import { ICopyDownloadInputsProps } from './ICopyDownloadControls';
 
 export interface ICopyDownloadButtonsProps extends ICopyDownloadInputsProps {
-    copyButtonRef?: (el: HTMLButtonElement|null) => void;
+    copyButtonRef?: (el: HTMLButtonElement | null) => void;
 }
 
-export class CopyDownloadButtons extends React.Component<ICopyDownloadButtonsProps, {}>
-{
+export class CopyDownloadButtons extends React.Component<
+    ICopyDownloadButtonsProps,
+    {}
+> {
     public static defaultProps = {
-        className: "",
-        copyLabel: "",
-        downloadLabel: "",
+        className: '',
+        copyLabel: '',
+        downloadLabel: '',
         showCopy: true,
         showDownload: true,
-        showCopyMessage: false
+        showCopyMessage: false,
     };
 
-    get baseTooltipProps()
-    {
+    get baseTooltipProps() {
         return {
-            placement: "top",
+            placement: 'top',
             mouseLeaveDelay: 0,
-            mouseEnterDelay: 0.5
+            mouseEnterDelay: 0.5,
         };
     }
 
-    copyButton()
-    {
+    copyButton() {
         const button = (
             <button
                 ref={this.props.copyButtonRef}
@@ -38,7 +38,7 @@ export class CopyDownloadButtons extends React.Component<ICopyDownloadButtonsPro
                 id="copyButton"
                 onClick={this.props.handleCopy}
             >
-                {this.props.copyLabel} <i className='fa fa-clipboard'/>
+                {this.props.copyLabel} <i className="fa fa-clipboard" />
             </button>
         );
 
@@ -63,8 +63,7 @@ export class CopyDownloadButtons extends React.Component<ICopyDownloadButtonsPro
         );
     }
 
-    downloadButton()
-    {
+    downloadButton() {
         return (
             <DefaultTooltip
                 overlay={<span>Download TSV</span>}
@@ -72,7 +71,8 @@ export class CopyDownloadButtons extends React.Component<ICopyDownloadButtonsPro
                 overlayClassName={this.props.className}
             >
                 <Button className="btn-sm" onClick={this.props.handleDownload}>
-                    {this.props.downloadLabel} <i className='fa fa-cloud-download'/>
+                    {this.props.downloadLabel}{' '}
+                    <i className="fa fa-cloud-download" />
                 </Button>
             </DefaultTooltip>
         );
@@ -82,9 +82,7 @@ export class CopyDownloadButtons extends React.Component<ICopyDownloadButtonsPro
         return (
             <span className={this.props.className}>
                 <ButtonGroup className={this.props.className}>
-                    <If condition={this.props.showCopy}>
-                        {this.copyButton()}
-                    </If>
+                    <If condition={this.props.showCopy}>{this.copyButton()}</If>
                     <If condition={this.props.showDownload}>
                         {this.downloadButton()}
                     </If>
diff --git a/src/shared/components/copyDownloadControls/CopyDownloadControls.spec.tsx b/src/shared/components/copyDownloadControls/CopyDownloadControls.spec.tsx
index 64056db5bd2..7167bac36ca 100644
--- a/src/shared/components/copyDownloadControls/CopyDownloadControls.spec.tsx
+++ b/src/shared/components/copyDownloadControls/CopyDownloadControls.spec.tsx
@@ -1,89 +1,122 @@
-import {CopyDownloadControls, ICopyDownloadData} from './CopyDownloadControls';
+import {
+    CopyDownloadControls,
+    ICopyDownloadData,
+} from './CopyDownloadControls';
 import React from 'react';
 import { assert } from 'chai';
-import {mount, ReactWrapper} from 'enzyme';
+import { mount, ReactWrapper } from 'enzyme';
 import sinon from 'sinon';
 
 describe('CopyDownloadControls', () => {
     const completeData: ICopyDownloadData = {
-        status: "complete",
-        text: "This is your complete & shiny download data!"
+        status: 'complete',
+        text: 'This is your complete & shiny download data!',
     };
 
     const incompleteData: ICopyDownloadData = {
-        status: "incomplete",
-        text: "This data is incomplete, because sometimes shift happens!"
+        status: 'incomplete',
+        text: 'This data is incomplete, because sometimes shift happens!',
     };
 
-    before(() => {
+    before(() => {});
 
-    });
-
-    after(() => {
-
-    });
+    after(() => {});
 
-    it("downloads the complete data without any error messages", (done) => {
+    it('downloads the complete data without any error messages', done => {
         const resolvedPromiseWithCompleteData = Promise.resolve(completeData);
         const downloadData = () => resolvedPromiseWithCompleteData;
-        const component: ReactWrapper<any, any> = mount(<CopyDownloadControls downloadData={downloadData} />);
-        const instance = component.instance()  as CopyDownloadControls;
-        const downloadStub = sinon.stub(instance, "download");
+        const component: ReactWrapper<any, any> = mount(
+            <CopyDownloadControls downloadData={downloadData} />
+        );
+        const instance = component.instance() as CopyDownloadControls;
+        const downloadStub = sinon.stub(instance, 'download');
 
         instance.handleDownload();
 
-        resolvedPromiseWithCompleteData.then(() => {
-            assert.isTrue(downloadStub.calledWith("This is your complete & shiny download data!"));
-            assert.isFalse(instance.showErrorMessage);
-            done();
-        }).catch(done);
+        resolvedPromiseWithCompleteData
+            .then(() => {
+                assert.isTrue(
+                    downloadStub.calledWith(
+                        'This is your complete & shiny download data!'
+                    )
+                );
+                assert.isFalse(instance.showErrorMessage);
+                done();
+            })
+            .catch(done);
     });
 
-    it("downloads the incomplete data, and shows a warning message", (done) => {
-        const resolvedPromiseWithIncompleteData = Promise.resolve(incompleteData);
+    it('downloads the incomplete data, and shows a warning message', done => {
+        const resolvedPromiseWithIncompleteData = Promise.resolve(
+            incompleteData
+        );
         const downloadData = () => resolvedPromiseWithIncompleteData;
-        const component: ReactWrapper<any, any> = mount(<CopyDownloadControls downloadData={downloadData} />);
+        const component: ReactWrapper<any, any> = mount(
+            <CopyDownloadControls downloadData={downloadData} />
+        );
         const instance = component.instance() as CopyDownloadControls;
-        const downloadStub = sinon.stub(instance, "download");
+        const downloadStub = sinon.stub(instance, 'download');
 
         instance.handleDownload();
 
-        resolvedPromiseWithIncompleteData.then(() => {
-            assert.isTrue(downloadStub.calledWith("This data is incomplete, because sometimes shift happens!"));
-            assert.isTrue(instance.showErrorMessage);
-            done();
-        }).catch(done);
+        resolvedPromiseWithIncompleteData
+            .then(() => {
+                assert.isTrue(
+                    downloadStub.calledWith(
+                        'This data is incomplete, because sometimes shift happens!'
+                    )
+                );
+                assert.isTrue(instance.showErrorMessage);
+                done();
+            })
+            .catch(done);
     });
 
-    it("copies the complete data without any error messages", (done) => {
+    it('copies the complete data without any error messages', done => {
         const resolvedPromiseWithCompleteData = Promise.resolve(completeData);
         const downloadData = () => resolvedPromiseWithCompleteData;
-        const component: ReactWrapper<any, any> = mount(<CopyDownloadControls downloadData={downloadData} />);
-        const instance = component.instance()  as CopyDownloadControls;
+        const component: ReactWrapper<any, any> = mount(
+            <CopyDownloadControls downloadData={downloadData} />
+        );
+        const instance = component.instance() as CopyDownloadControls;
 
         instance.initCopyProcess();
 
-        resolvedPromiseWithCompleteData.then(() => {
-            assert.equal(instance.getText(), "This is your complete & shiny download data!");
-            assert.isTrue(instance.copyingData);
-            assert.isFalse(instance.showErrorMessage);
-            done();
-        }).catch(done);
+        resolvedPromiseWithCompleteData
+            .then(() => {
+                assert.equal(
+                    instance.getText(),
+                    'This is your complete & shiny download data!'
+                );
+                assert.isTrue(instance.copyingData);
+                assert.isFalse(instance.showErrorMessage);
+                done();
+            })
+            .catch(done);
     });
 
-    it("copies the incomplete data, and shows a warning message", (done) => {
-        const resolvedPromiseWithIncompleteData = Promise.resolve(incompleteData);
+    it('copies the incomplete data, and shows a warning message', done => {
+        const resolvedPromiseWithIncompleteData = Promise.resolve(
+            incompleteData
+        );
         const downloadData = () => resolvedPromiseWithIncompleteData;
-        const component: ReactWrapper<any, any> = mount(<CopyDownloadControls downloadData={downloadData} />);
+        const component: ReactWrapper<any, any> = mount(
+            <CopyDownloadControls downloadData={downloadData} />
+        );
         const instance = component.instance() as CopyDownloadControls;
 
         instance.initCopyProcess();
 
-        resolvedPromiseWithIncompleteData.then(() => {
-            assert.equal(instance.getText(), "This data is incomplete, because sometimes shift happens!");
-            assert.isTrue(instance.copyingData);
-            assert.isTrue(instance.showErrorMessage);
-            done();
-        }).catch(done);
+        resolvedPromiseWithIncompleteData
+            .then(() => {
+                assert.equal(
+                    instance.getText(),
+                    'This data is incomplete, because sometimes shift happens!'
+                );
+                assert.isTrue(instance.copyingData);
+                assert.isTrue(instance.showErrorMessage);
+                done();
+            })
+            .catch(done);
     });
 });
diff --git a/src/shared/components/copyDownloadControls/CopyDownloadControls.tsx b/src/shared/components/copyDownloadControls/CopyDownloadControls.tsx
index 46b6cfac416..2a9b9b7fbeb 100644
--- a/src/shared/components/copyDownloadControls/CopyDownloadControls.tsx
+++ b/src/shared/components/copyDownloadControls/CopyDownloadControls.tsx
@@ -1,23 +1,24 @@
 import * as React from 'react';
-import {Modal, Button} from 'react-bootstrap';
-import {ThreeBounce} from 'better-react-spinkit';
-import {If} from 'react-if';
+import { Modal, Button } from 'react-bootstrap';
+import { ThreeBounce } from 'better-react-spinkit';
+import { If } from 'react-if';
 import fileDownload from 'react-file-download';
-import {action, observable} from "mobx";
-import {observer} from "mobx-react";
+import { action, observable } from 'mobx';
+import { observer } from 'mobx-react';
 const Clipboard = require('clipboard');
 
-import copyDownloadStyles from "./copyDownloadControls.module.scss";
-import {CopyDownloadButtons} from "./CopyDownloadButtons";
-import {ICopyDownloadControlsProps} from "./ICopyDownloadControls";
-import autobind from "autobind-decorator";
+import copyDownloadStyles from './copyDownloadControls.module.scss';
+import { CopyDownloadButtons } from './CopyDownloadButtons';
+import { ICopyDownloadControlsProps } from './ICopyDownloadControls';
+import autobind from 'autobind-decorator';
 
-export interface IAsyncCopyDownloadControlsProps extends ICopyDownloadControlsProps {
+export interface IAsyncCopyDownloadControlsProps
+    extends ICopyDownloadControlsProps {
     downloadData?: () => Promise<ICopyDownloadData>;
 }
 
 export interface ICopyDownloadData {
-    status: 'complete'|'incomplete';
+    status: 'complete' | 'incomplete';
     text: string;
 }
 
@@ -26,29 +27,30 @@ export interface ICopyDownloadData {
  * @author Aaron Lisman
  */
 @observer
-export class CopyDownloadControls extends React.Component<IAsyncCopyDownloadControlsProps, {}>
-{
+export class CopyDownloadControls extends React.Component<
+    IAsyncCopyDownloadControlsProps,
+    {}
+> {
     @observable downloadingData = false;
     @observable copyingData = false;
     @observable showErrorMessage = false;
     @observable showTooltipCopyMessage = false;
 
-    private _copyButton: HTMLButtonElement|null = null;
-    private _modalCopyButton: HTMLButtonElement|null = null;
-    private _modalCopyButtonContainer: HTMLElement|null = null;
+    private _copyButton: HTMLButtonElement | null = null;
+    private _modalCopyButton: HTMLButtonElement | null = null;
+    private _modalCopyButtonContainer: HTMLElement | null = null;
 
-    private _copyText: string|null = null;
+    private _copyText: string | null = null;
 
-    public static defaultProps:IAsyncCopyDownloadControlsProps = {
-        className: "",
+    public static defaultProps: IAsyncCopyDownloadControlsProps = {
+        className: '',
         copyMessageDuration: 3000,
         showCopy: true,
         showDownload: true,
-        downloadFilename: "data.tsv"
+        downloadFilename: 'data.tsv',
     };
 
-    constructor(props:IAsyncCopyDownloadControlsProps)
-    {
+    constructor(props: IAsyncCopyDownloadControlsProps) {
         super(props);
         this.handleDownload = this.handleDownload.bind(this);
         this.handleCopy = this.handleCopy.bind(this);
@@ -63,20 +65,21 @@ export class CopyDownloadControls extends React.Component<IAsyncCopyDownloadCont
         }
     }
 
-    public bindCopyButton(button: HTMLButtonElement|null, container?: HTMLElement|null)
-    {
+    public bindCopyButton(
+        button: HTMLButtonElement | null,
+        container?: HTMLElement | null
+    ) {
         if (button) {
             new Clipboard(button, {
                 text: this.getText.bind(this),
                 // we need to pass a container to the clipboard when we use it in a Modal element
                 // see https://stackoverflow.com/questions/38398070/bootstrap-modal-does-not-work-with-clipboard-js-on-firefox
-                container: container
+                container: container,
             });
         }
     }
 
-    public render()
-    {
+    public render() {
         return (
             <span>
                 <CopyDownloadButtons
@@ -88,7 +91,9 @@ export class CopyDownloadControls extends React.Component<IAsyncCopyDownloadCont
                     downloadLabel={this.props.downloadLabel}
                     handleDownload={this.handleDownload}
                     handleCopy={this.handleCopy}
-                    copyButtonRef={(el:HTMLButtonElement) => {this._copyButton = el;}}
+                    copyButtonRef={(el: HTMLButtonElement) => {
+                        this._copyButton = el;
+                    }}
                 />
                 {this.downloadIndicatorModal()}
                 {this.copyIndicatorModal()}
@@ -97,46 +102,56 @@ export class CopyDownloadControls extends React.Component<IAsyncCopyDownloadCont
         );
     }
 
-    public downloadIndicatorModal(): JSX.Element
-    {
+    public downloadIndicatorModal(): JSX.Element {
         return (
             <Modal
                 show={this.downloadingData}
                 onHide={() => undefined}
                 bsSize="sm"
-                className={`${copyDownloadStyles["centered-modal-dialog"]}`}
+                className={`${copyDownloadStyles['centered-modal-dialog']}`}
             >
                 <Modal.Body>
-                    <ThreeBounce style={{ display:'inline-block', marginRight:10 }} />
+                    <ThreeBounce
+                        style={{ display: 'inline-block', marginRight: 10 }}
+                    />
                     <span>Downloading Table Data...</span>
                 </Modal.Body>
             </Modal>
         );
     }
 
-    public copyIndicatorModal(): JSX.Element
-    {
+    public copyIndicatorModal(): JSX.Element {
         return (
             <Modal
                 show={this.copyingData}
                 onHide={() => undefined}
-                onEntered={() => {this.bindCopyButton(this._modalCopyButton, this._modalCopyButtonContainer);}}
+                onEntered={() => {
+                    this.bindCopyButton(
+                        this._modalCopyButton,
+                        this._modalCopyButtonContainer
+                    );
+                }}
                 bsSize="sm"
-                className={`${copyDownloadStyles["centered-modal-dialog"]}`}
+                className={`${copyDownloadStyles['centered-modal-dialog']}`}
             >
                 <Modal.Header>
-                    {this.showErrorMessage ? "Copy Error!" : "Copy Ready!"}
+                    {this.showErrorMessage ? 'Copy Error!' : 'Copy Ready!'}
                 </Modal.Header>
                 <Modal.Body>
-                    {this.showErrorMessage && "An error occurred while copying the data. Data may be incomplete."}
+                    {this.showErrorMessage &&
+                        'An error occurred while copying the data. Data may be incomplete.'}
                     Please click on Copy to copy the data to clipboard.
                 </Modal.Body>
                 <Modal.Footer>
                     <span
-                        ref={(el: HTMLElement|null) => {this._modalCopyButtonContainer = el;}}
+                        ref={(el: HTMLElement | null) => {
+                            this._modalCopyButtonContainer = el;
+                        }}
                     >
                         <button
-                            ref={(el:HTMLButtonElement) => {this._modalCopyButton = el;}}
+                            ref={(el: HTMLButtonElement) => {
+                                this._modalCopyButton = el;
+                            }}
                             onClick={this.handleModalClose}
                             className="btn btn-primary"
                             data-clipboard-text="NA"
@@ -150,20 +165,18 @@ export class CopyDownloadControls extends React.Component<IAsyncCopyDownloadCont
         );
     }
 
-    public downloadErrorModal(): JSX.Element
-    {
+    public downloadErrorModal(): JSX.Element {
         return (
             <Modal
                 show={!this.copyingData && this.showErrorMessage}
                 onHide={this.handleModalClose}
                 bsSize="sm"
-                className={`${copyDownloadStyles["centered-modal-dialog"]}`}
+                className={`${copyDownloadStyles['centered-modal-dialog']}`}
             >
-                <Modal.Header>
-                    Download Error!
-                </Modal.Header>
+                <Modal.Header>Download Error!</Modal.Header>
                 <Modal.Body>
-                    An error occurred while downloading the data. Downloaded file may contain incomplete data.
+                    An error occurred while downloading the data. Downloaded
+                    file may contain incomplete data.
                 </Modal.Body>
                 <Modal.Footer>
                     <Button
@@ -177,18 +190,15 @@ export class CopyDownloadControls extends React.Component<IAsyncCopyDownloadCont
         );
     }
 
-    public getText(): string
-    {
-        return this._copyText || "";
+    public getText(): string {
+        return this._copyText || '';
     }
 
-    public handleCopy()
-    {
+    public handleCopy() {
         this.initCopyProcess();
     }
-    
-    public initCopyProcess()
-    {
+
+    public initCopyProcess() {
         // this makes sure that copy data and the download data are the same/consistent
         this.initDownloadProcess(text => {
             // do not update if the copy text is not updated since the last copy request
@@ -196,15 +206,13 @@ export class CopyDownloadControls extends React.Component<IAsyncCopyDownloadCont
             if (this._copyText !== text) {
                 this._copyText = text;
                 this.copyingData = true;
-            }
-            else {
+            } else {
                 this.showSimpleCopyMessage();
             }
         });
     }
 
-    public handleDownload()
-    {
+    public handleDownload() {
         this.initDownloadProcess(text => {
             // save the text so that we won't prompt it again for copy action
             this._copyText = text;
@@ -214,36 +222,35 @@ export class CopyDownloadControls extends React.Component<IAsyncCopyDownloadCont
         });
     }
 
-    public initDownloadProcess(callback: (text: string) => void)
-    {
+    public initDownloadProcess(callback: (text: string) => void) {
         if (this.props.downloadData) {
             // mark downloading data true, so that we can show a loading message
             this.downloadingData = true;
 
-            this.props.downloadData().then(copyDownloadData => {
-                if (copyDownloadData.status === "complete") {
-                    // promise is resolved, we need to hide the download indicator
-                    this.downloadingData = false;
-                }
-                else {
-                    this.triggerDownloadError();
-                }
+            this.props
+                .downloadData()
+                .then(copyDownloadData => {
+                    if (copyDownloadData.status === 'complete') {
+                        // promise is resolved, we need to hide the download indicator
+                        this.downloadingData = false;
+                    } else {
+                        this.triggerDownloadError();
+                    }
 
-                callback(copyDownloadData.text);
-            }).catch(() => {
-                this.triggerDownloadError();
-            });
+                    callback(copyDownloadData.text);
+                })
+                .catch(() => {
+                    this.triggerDownloadError();
+                });
         }
     }
 
-    public download(text: string)
-    {
+    public download(text: string) {
         fileDownload(text, this.props.downloadFilename);
     }
 
     @action
-    private handleModalClose()
-    {
+    private handleModalClose() {
         // need to set both flags to false,
         // in order to not show multiple modals in case of a download error during copy action
         this.copyingData = false;
@@ -251,16 +258,14 @@ export class CopyDownloadControls extends React.Component<IAsyncCopyDownloadCont
     }
 
     @action
-    private triggerDownloadError()
-    {
+    private triggerDownloadError() {
         // promise is rejected: we need to hide the download indicator and show an error message
         this.downloadingData = false;
         this.showErrorMessage = true;
     }
 
     @action
-    private showSimpleCopyMessage()
-    {
+    private showSimpleCopyMessage() {
         this.showTooltipCopyMessage = true;
 
         // we only want to show the notification for a limited time
diff --git a/src/shared/components/copyDownloadControls/CopyDownloadLinks.tsx b/src/shared/components/copyDownloadControls/CopyDownloadLinks.tsx
index b27c607e990..1ae7e53a31a 100644
--- a/src/shared/components/copyDownloadControls/CopyDownloadLinks.tsx
+++ b/src/shared/components/copyDownloadControls/CopyDownloadLinks.tsx
@@ -1,17 +1,19 @@
 import * as React from 'react';
-import {If} from 'react-if';
-import {ICopyDownloadInputsProps} from "./ICopyDownloadControls";
+import { If } from 'react-if';
+import { ICopyDownloadInputsProps } from './ICopyDownloadControls';
 
 export interface ICopyDownloadLinksProps extends ICopyDownloadInputsProps {
-    copyLinkRef?: (el: HTMLAnchorElement|null) => void;
+    copyLinkRef?: (el: HTMLAnchorElement | null) => void;
 }
 
-export class CopyDownloadLinks extends React.Component<ICopyDownloadLinksProps, {}>
-{
+export class CopyDownloadLinks extends React.Component<
+    ICopyDownloadLinksProps,
+    {}
+> {
     public static defaultProps = {
-        className: "",
-        copyButtonLabel: "Copy",
-        downloadButtonLabel: "Download",
+        className: '',
+        copyButtonLabel: 'Copy',
+        downloadButtonLabel: 'Download',
         showCopy: true,
         showDownload: true,
     };
@@ -19,27 +21,37 @@ export class CopyDownloadLinks extends React.Component<ICopyDownloadLinksProps,
     public render() {
         return (
             <span className={this.props.className}>
-                {
-                    this.props.showCopy &&
-                    <a onClick={this.props.handleCopy} ref={this.props.copyLinkRef}>
-                        <i className='fa fa-clipboard' style={{marginRight: 5}}/>{this.props.copyLabel}
+                {this.props.showCopy && (
+                    <a
+                        onClick={this.props.handleCopy}
+                        ref={this.props.copyLinkRef}
+                    >
+                        <i
+                            className="fa fa-clipboard"
+                            style={{ marginRight: 5 }}
+                        />
+                        {this.props.copyLabel}
                     </a>
-                }
-                {
-                    this.props.showCopy && this.props.showDownload &&
-                    <span style={{margin: '0px 10px'}}>|</span>
-                }
-                {
-                    this.props.showDownload &&
-                    <a onClick={this.props.handleDownload} style={{marginRight: 10}}>
-                        <i className='fa fa-cloud-download' style={{marginRight: 5}}/>{this.props.downloadLabel}
+                )}
+                {this.props.showCopy && this.props.showDownload && (
+                    <span style={{ margin: '0px 10px' }}>|</span>
+                )}
+                {this.props.showDownload && (
+                    <a
+                        onClick={this.props.handleDownload}
+                        style={{ marginRight: 10 }}
+                    >
+                        <i
+                            className="fa fa-cloud-download"
+                            style={{ marginRight: 5 }}
+                        />
+                        {this.props.downloadLabel}
                     </a>
-                }
-                {
-                    this.props.showCopyMessage &&
+                )}
+                {this.props.showCopyMessage && (
                     <span className="alert-success">Copied!</span>
-                }
+                )}
             </span>
         );
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/copyDownloadControls/CopyDownloadQueryLinks.tsx b/src/shared/components/copyDownloadControls/CopyDownloadQueryLinks.tsx
index 316a9fc97ba..9d7ba211381 100644
--- a/src/shared/components/copyDownloadControls/CopyDownloadQueryLinks.tsx
+++ b/src/shared/components/copyDownloadControls/CopyDownloadQueryLinks.tsx
@@ -1,13 +1,15 @@
 import * as React from 'react';
-import {If} from 'react-if';
-import {ICopyDownloadInputsProps} from "./ICopyDownloadControls";
-import classnames from "classnames";
-import styles from "./copyDownloadControls.module.scss";
+import { If } from 'react-if';
+import { ICopyDownloadInputsProps } from './ICopyDownloadControls';
+import classnames from 'classnames';
+import styles from './copyDownloadControls.module.scss';
 import { DefaultTooltip } from 'cbioportal-frontend-commons';
-import VirtualStudy, { IVirtualStudyProps } from 'pages/studyView/virtualStudy/VirtualStudy';
+import VirtualStudy, {
+    IVirtualStudyProps,
+} from 'pages/studyView/virtualStudy/VirtualStudy';
 
 export interface ICopyDownloadLinksProps extends ICopyDownloadInputsProps {
-    copyLinkRef?: (el: HTMLAnchorElement|null) => void;
+    copyLinkRef?: (el: HTMLAnchorElement | null) => void;
     showQuery?: boolean;
     showVirtualStudy?: boolean;
     queryButtonLabel?: string;
@@ -16,81 +18,103 @@ export interface ICopyDownloadLinksProps extends ICopyDownloadInputsProps {
     virtualStudyParams?: IVirtualStudyProps;
 }
 
-export class CopyDownloadQueryLinks extends React.Component<ICopyDownloadLinksProps, {}>
-{
+export class CopyDownloadQueryLinks extends React.Component<
+    ICopyDownloadLinksProps,
+    {}
+> {
     public static defaultProps = {
-        className: "",
-        copyButtonLabel: "Copy",
-        downloadButtonLabel: "Download",
-        queryButtonLabel: "Query",
-        virtualStudyButtonLabel: "Virtual Study",
+        className: '',
+        copyButtonLabel: 'Copy',
+        downloadButtonLabel: 'Download',
+        queryButtonLabel: 'Query',
+        virtualStudyButtonLabel: 'Virtual Study',
         showCopy: true,
         showDownload: true,
         showQuery: false,
-        showVirtualStudy: false
+        showVirtualStudy: false,
     };
 
     public render() {
         return (
-            <span className={classnames(styles.downloadTabLinksGroup, this.props.className)}>
-                {
-                    this.props.showCopy &&
-                    <a onClick={this.props.handleCopy} ref={this.props.copyLinkRef}>
-                        <i className='fa fa-clipboard'/>{this.props.copyLabel}
+            <span
+                className={classnames(
+                    styles.downloadTabLinksGroup,
+                    this.props.className
+                )}
+            >
+                {this.props.showCopy && (
+                    <a
+                        onClick={this.props.handleCopy}
+                        ref={this.props.copyLinkRef}
+                    >
+                        <i className="fa fa-clipboard" />
+                        {this.props.copyLabel}
                     </a>
-                }
-                {
-                    this.props.showCopy && this.props.showDownload &&
+                )}
+                {this.props.showCopy && this.props.showDownload && (
                     <span>|</span>
-                }
-                {
-                    this.props.showDownload &&
+                )}
+                {this.props.showDownload && (
                     <a onClick={this.props.handleDownload}>
-                        <i className='fa fa-cloud-download'/>{this.props.downloadLabel}
+                        <i className="fa fa-cloud-download" />
+                        {this.props.downloadLabel}
                     </a>
-                }
-                {
-                    this.props.showDownload && this.props.showQuery &&
+                )}
+                {this.props.showDownload && this.props.showQuery && (
                     <span>|</span>
-                }
-                {
-                    this.props.showQuery &&
+                )}
+                {this.props.showQuery && (
                     <a onClick={this.props.handleQuery}>
-                        <i className='fa fa-external-link-square'/>{this.props.queryButtonLabel}
+                        <i className="fa fa-external-link-square" />
+                        {this.props.queryButtonLabel}
                     </a>
-                }
-                {
-                    this.props.showQuery && this.props.showVirtualStudy &&
+                )}
+                {this.props.showQuery && this.props.showVirtualStudy && (
                     <span>|</span>
-                }
-                {
-                    this.props.showVirtualStudy &&
+                )}
+                {this.props.showVirtualStudy && (
                     <DefaultTooltip
                         trigger={['click']}
                         destroyTooltipOnHide={true}
                         overlay={
-                            this.props.virtualStudyParams && <VirtualStudy
-                                user={this.props.virtualStudyParams.user}
-                                name={this.props.virtualStudyParams.name}
-                                description={this.props.virtualStudyParams.description}
-                                studyWithSamples={this.props.virtualStudyParams.studyWithSamples}
-                                selectedSamples={this.props.virtualStudyParams.selectedSamples}
-                                filter={this.props.virtualStudyParams.filter}
-                                attributesMetaSet={this.props.virtualStudyParams.attributesMetaSet}
-                            />
+                            this.props.virtualStudyParams && (
+                                <VirtualStudy
+                                    user={this.props.virtualStudyParams.user}
+                                    name={this.props.virtualStudyParams.name}
+                                    description={
+                                        this.props.virtualStudyParams
+                                            .description
+                                    }
+                                    studyWithSamples={
+                                        this.props.virtualStudyParams
+                                            .studyWithSamples
+                                    }
+                                    selectedSamples={
+                                        this.props.virtualStudyParams
+                                            .selectedSamples
+                                    }
+                                    filter={
+                                        this.props.virtualStudyParams.filter
+                                    }
+                                    attributesMetaSet={
+                                        this.props.virtualStudyParams
+                                            .attributesMetaSet
+                                    }
+                                />
+                            )
                         }
                         placement="bottom"
                     >
                         <a>
-                            <i className='fa fa-pie-chart'/>{this.props.virtualStudyButtonLabel}
+                            <i className="fa fa-pie-chart" />
+                            {this.props.virtualStudyButtonLabel}
                         </a>
                     </DefaultTooltip>
-                }
-                {
-                    this.props.showCopyMessage &&
+                )}
+                {this.props.showCopyMessage && (
                     <span className="alert-success">Copied!</span>
-                }
+                )}
             </span>
         );
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/copyDownloadControls/ICopyDownloadControls.ts b/src/shared/components/copyDownloadControls/ICopyDownloadControls.ts
index 3f4af26abce..48ec3390bda 100644
--- a/src/shared/components/copyDownloadControls/ICopyDownloadControls.ts
+++ b/src/shared/components/copyDownloadControls/ICopyDownloadControls.ts
@@ -1,7 +1,6 @@
 export type CopyDownloadControlsStyle = 'BUTTON' | 'LINK' | 'QUERY';
 
-export interface ICopyDownloadControlsProps
-{
+export interface ICopyDownloadControlsProps {
     className?: string;
     downloadFilename?: string;
     showCopy?: boolean;
@@ -12,8 +11,7 @@ export interface ICopyDownloadControlsProps
     controlsStyle?: CopyDownloadControlsStyle;
 }
 
-export interface ICopyDownloadInputsProps
-{
+export interface ICopyDownloadInputsProps {
     className?: string;
     showCopy?: boolean;
     showCopyMessage?: boolean;
@@ -23,4 +21,3 @@ export interface ICopyDownloadInputsProps
     handleDownload?: () => void;
     handleCopy?: () => void;
 }
-
diff --git a/src/shared/components/copyDownloadControls/SimpleCopyDownloadControls.tsx b/src/shared/components/copyDownloadControls/SimpleCopyDownloadControls.tsx
index 22145f2b767..f84943a320c 100644
--- a/src/shared/components/copyDownloadControls/SimpleCopyDownloadControls.tsx
+++ b/src/shared/components/copyDownloadControls/SimpleCopyDownloadControls.tsx
@@ -1,43 +1,45 @@
 import * as React from 'react';
 import fileDownload from 'react-file-download';
-import {observer} from "mobx-react";
-import {observable} from "mobx";
-import {CopyDownloadLinks} from "./CopyDownloadLinks";
-import {CopyDownloadButtons} from "./CopyDownloadButtons";
-import {ICopyDownloadControlsProps} from "./ICopyDownloadControls";
+import { observer } from 'mobx-react';
+import { observable } from 'mobx';
+import { CopyDownloadLinks } from './CopyDownloadLinks';
+import { CopyDownloadButtons } from './CopyDownloadButtons';
+import { ICopyDownloadControlsProps } from './ICopyDownloadControls';
 import { CopyDownloadQueryLinks } from './CopyDownloadQueryLinks';
 const Clipboard = require('clipboard');
 
-export interface ISimpleCopyDownloadControlsProps extends ICopyDownloadControlsProps {
+export interface ISimpleCopyDownloadControlsProps
+    extends ICopyDownloadControlsProps {
     downloadData?: () => string;
     showQuery?: boolean;
     showVirtualStudy?: boolean;
     handleQuery?: () => void;
     virtualStudyParams?: any;
-    containerId?: string|undefined;
+    containerId?: string | undefined;
 }
 
 @observer
-export class SimpleCopyDownloadControls extends React.Component<ISimpleCopyDownloadControlsProps, {}>
-{
+export class SimpleCopyDownloadControls extends React.Component<
+    ISimpleCopyDownloadControlsProps,
+    {}
+> {
     public static defaultProps: ISimpleCopyDownloadControlsProps = {
-        className: "",
+        className: '',
         showCopy: true,
         copyMessageDuration: 3000,
         showDownload: true,
         showQuery: true,
         showVirtualStudy: true,
-        copyLabel: "Copy",
-        downloadLabel: "Download",
-        downloadFilename: "data.tsv",
-        controlsStyle: 'LINK'
+        copyLabel: 'Copy',
+        downloadLabel: 'Download',
+        downloadFilename: 'data.tsv',
+        controlsStyle: 'LINK',
     };
 
     @observable
     private showCopyMessage = false;
 
-    constructor(props: ISimpleCopyDownloadControlsProps)
-    {
+    constructor(props: ISimpleCopyDownloadControlsProps) {
         super(props);
 
         this.handleDownload = this.handleDownload.bind(this);
@@ -46,8 +48,7 @@ export class SimpleCopyDownloadControls extends React.Component<ISimpleCopyDownl
         this.handleAfterCopy = this.handleAfterCopy.bind(this);
     }
 
-    public render()
-    {
+    public render() {
         if (this.props.controlsStyle === 'LINK') {
             return (
                 <CopyDownloadLinks
@@ -60,8 +61,7 @@ export class SimpleCopyDownloadControls extends React.Component<ISimpleCopyDownl
                     showCopyMessage={this.showCopyMessage}
                 />
             );
-        }
-        else if (this.props.controlsStyle === 'QUERY') {
+        } else if (this.props.controlsStyle === 'QUERY') {
             return (
                 <CopyDownloadQueryLinks
                     className={this.props.className}
@@ -77,8 +77,7 @@ export class SimpleCopyDownloadControls extends React.Component<ISimpleCopyDownl
                     virtualStudyParams={this.props.virtualStudyParams}
                 />
             );
-        }
-        else {
+        } else {
             return (
                 <CopyDownloadButtons
                     className={this.props.className}
@@ -93,39 +92,39 @@ export class SimpleCopyDownloadControls extends React.Component<ISimpleCopyDownl
         }
     }
 
-    private handleDownload()
-    {
+    private handleDownload() {
         if (this.props.downloadData) {
-            fileDownload(this.props.downloadData(), this.props.downloadFilename);
+            fileDownload(
+                this.props.downloadData(),
+                this.props.downloadFilename
+            );
         }
     }
 
-    private copyLinkRef(el: HTMLAnchorElement|null)
-    {
+    private copyLinkRef(el: HTMLAnchorElement | null) {
         this.handleCopyRef(el);
     }
 
-    private copyButtonRef(el: HTMLButtonElement|null)
-    {
+    private copyButtonRef(el: HTMLButtonElement | null) {
         this.handleCopyRef(el);
     }
 
-    private handleCopyRef(el: HTMLElement|null)
-    {
+    private handleCopyRef(el: HTMLElement | null) {
         if (el) {
             const { downloadData, containerId } = this.props;
-            const options = containerId ? {
-                text: downloadData,
-                container: document.getElementById(containerId) // point to the exact container of copy control if it is inside a modal dialog
-            } : {
-                text: downloadData
-            }
+            const options = containerId
+                ? {
+                      text: downloadData,
+                      container: document.getElementById(containerId), // point to the exact container of copy control if it is inside a modal dialog
+                  }
+                : {
+                      text: downloadData,
+                  };
             new Clipboard(el, options);
         }
     }
 
-    private handleAfterCopy()
-    {
+    private handleAfterCopy() {
         this.showCopyMessage = true;
 
         setTimeout(() => {
diff --git a/src/shared/components/copyDownloadControls/copyDownloadControls.module.scss b/src/shared/components/copyDownloadControls/copyDownloadControls.module.scss
index aa43df3717c..4c3c6c5f73b 100644
--- a/src/shared/components/copyDownloadControls/copyDownloadControls.module.scss
+++ b/src/shared/components/copyDownloadControls/copyDownloadControls.module.scss
@@ -8,7 +8,7 @@
 
 .downloadTabLinksGroup {
     > a {
-        > i{
+        > i {
             margin-right: 5px !important;
         }
     }
@@ -24,4 +24,4 @@
     > span:last-child {
         margin: 0px;
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/cosmic/CosmicMutationTable.spec.tsx b/src/shared/components/cosmic/CosmicMutationTable.spec.tsx
index 79803ff4408..87855b51855 100644
--- a/src/shared/components/cosmic/CosmicMutationTable.spec.tsx
+++ b/src/shared/components/cosmic/CosmicMutationTable.spec.tsx
@@ -5,17 +5,9 @@ import { shallow, mount } from 'enzyme';
 import sinon from 'sinon';
 
 describe('CosmicMutationTable', () => {
+    before(() => {});
 
-    before(()=>{
-
-    });
-
-    after(()=>{
-
-    });
-
-    it('what does it do?', ()=>{
-
-    });
+    after(() => {});
 
+    it('what does it do?', () => {});
 });
diff --git a/src/shared/components/cosmic/CosmicMutationTable.tsx b/src/shared/components/cosmic/CosmicMutationTable.tsx
index 3b499aaf905..aeb73314888 100644
--- a/src/shared/components/cosmic/CosmicMutationTable.tsx
+++ b/src/shared/components/cosmic/CosmicMutationTable.tsx
@@ -1,16 +1,18 @@
 import * as React from 'react';
-import {calcProteinChangeSortValue} from "cbioportal-frontend-commons";
-import {CosmicMutation} from "shared/api/generated/CBioPortalAPIInternal";
-import {Column, default as LazyMobXTable} from "../lazyMobXTable/LazyMobXTable";
+import { calcProteinChangeSortValue } from 'cbioportal-frontend-commons';
+import { CosmicMutation } from 'shared/api/generated/CBioPortalAPIInternal';
+import {
+    Column,
+    default as LazyMobXTable,
+} from '../lazyMobXTable/LazyMobXTable';
 
 // TODO interface ICosmicTableProps extends IMSKTableProps<CosmicMutation>
 // To avoid duplication, it would be nice here to have an extendable interface for LazyMobXTableProps
-export interface ICosmicTableProps
-{
+export interface ICosmicTableProps {
     data: CosmicMutation[];
     columns?: Array<Column<CosmicMutation>>;
     initialSortColumn?: string;
-    initialSortDirection?: 'asc'|'desc';
+    initialSortDirection?: 'asc' | 'desc';
     initialItemsPerPage?: number;
 }
 
@@ -20,15 +22,17 @@ class CosmicTable extends LazyMobXTable<CosmicMutation> {}
 /**
  * @author Selcuk Onur Sumer
  */
-export default class CosmicMutationTable extends React.Component<ICosmicTableProps, {}>
-{
+export default class CosmicMutationTable extends React.Component<
+    ICosmicTableProps,
+    {}
+> {
     public static defaultProps = {
         data: [],
         columns: [
             {
-                name: "COSMIC ID",
-                order: 1.00,
-                render: (d:CosmicMutation) => (
+                name: 'COSMIC ID',
+                order: 1.0,
+                render: (d: CosmicMutation) => (
                     <span>
                         <a
                             href={`http://cancer.sanger.ac.uk/cosmic/mutation/overview?id=${d.cosmicMutationId}`}
@@ -38,34 +42,33 @@ export default class CosmicMutationTable extends React.Component<ICosmicTablePro
                         </a>
                     </span>
                 ),
-                sortBy: (d:CosmicMutation) => d.cosmicMutationId
+                sortBy: (d: CosmicMutation) => d.cosmicMutationId,
             },
             {
-                name: "Protein Change",
-                order: 2.00,
-                render: (d:CosmicMutation) => (<span>{d.proteinChange}</span>),
-                sortBy: (d:CosmicMutation) => calcProteinChangeSortValue(d.proteinChange)
+                name: 'Protein Change',
+                order: 2.0,
+                render: (d: CosmicMutation) => <span>{d.proteinChange}</span>,
+                sortBy: (d: CosmicMutation) =>
+                    calcProteinChangeSortValue(d.proteinChange),
             },
             {
-                name: "Occurrence",
-                order: 3.00,
-                render: (d:CosmicMutation) => (<span>{d.count}</span>),
-                sortBy: (d:CosmicMutation) => d.count
-            }
+                name: 'Occurrence',
+                order: 3.0,
+                render: (d: CosmicMutation) => <span>{d.count}</span>,
+                sortBy: (d: CosmicMutation) => d.count,
+            },
         ],
-        initialSortColumn: "Occurrence",
-        initialSortDirection: "desc",
-        initialItemsPerPage: 10
+        initialSortColumn: 'Occurrence',
+        initialSortDirection: 'desc',
+        initialItemsPerPage: 10,
     };
 
-    constructor(props: ICosmicTableProps)
-    {
+    constructor(props: ICosmicTableProps) {
         super(props);
         this.state = {};
     }
 
-    public render()
-    {
+    public render() {
         const {
             data,
             columns,
@@ -74,14 +77,18 @@ export default class CosmicMutationTable extends React.Component<ICosmicTablePro
             initialItemsPerPage,
         } = this.props;
 
-        const showPagination = data.length >
-            (this.props.initialItemsPerPage || CosmicMutationTable.defaultProps.initialItemsPerPage);
+        const showPagination =
+            data.length >
+            (this.props.initialItemsPerPage ||
+                CosmicMutationTable.defaultProps.initialItemsPerPage);
 
         return (
-            <div className='cbioportal-frontend'>
+            <div className="cbioportal-frontend">
                 <CosmicTable
                     data={data}
-                    columns={columns || CosmicMutationTable.defaultProps.columns}
+                    columns={
+                        columns || CosmicMutationTable.defaultProps.columns
+                    }
                     initialSortColumn={initialSortColumn}
                     initialSortDirection={initialSortDirection}
                     initialItemsPerPage={initialItemsPerPage}
@@ -90,7 +97,7 @@ export default class CosmicMutationTable extends React.Component<ICosmicTablePro
                     showFilter={false}
                     showPagination={showPagination}
                     showPaginationAtTop={true}
-                    paginationProps={{showMoreButton:false}}
+                    paginationProps={{ showMoreButton: false }}
                 />
             </div>
         );
diff --git a/src/shared/components/dataAccessTokens/DataAccessTokensDropdown.tsx b/src/shared/components/dataAccessTokens/DataAccessTokensDropdown.tsx
index 9564ed5790e..15bf7eec0ac 100644
--- a/src/shared/components/dataAccessTokens/DataAccessTokensDropdown.tsx
+++ b/src/shared/components/dataAccessTokens/DataAccessTokensDropdown.tsx
@@ -1,18 +1,23 @@
-import * as React from "react";
-import AppConfig from "appConfig";
+import * as React from 'react';
+import AppConfig from 'appConfig';
 import { Link } from 'react-router';
-import {AppStore} from "../../../AppStore";
-import LoadingIndicator from "../loadingIndicator/LoadingIndicator";
-import {observer} from "mobx-react";
-import {observable, computed} from "mobx";
-import {buildCBioPortalPageUrl} from "../../api/urls";
+import { AppStore } from '../../../AppStore';
+import LoadingIndicator from '../loadingIndicator/LoadingIndicator';
+import { observer } from 'mobx-react';
+import { observable, computed } from 'mobx';
+import { buildCBioPortalPageUrl } from '../../api/urls';
 
 export class UserDataAccessToken {
-    @observable token : string;
+    @observable token: string;
     @observable creationDate: string;
     @observable expirationDate: string;
     @observable username: string;
-    constructor(token: string, creationDate: string, expirationDate: string, username: string) {
+    constructor(
+        token: string,
+        creationDate: string,
+        expirationDate: string,
+        username: string
+    ) {
         this.token = token;
         this.creationDate = creationDate;
         this.expirationDate = expirationDate;
@@ -21,52 +26,65 @@ export class UserDataAccessToken {
 }
 
 export interface IDataAccessTokensProps {
-    token?:string;
-    creationDate?:string;
-    expirationDate?:string;
-    loadingComponent?:JSX.Element;
-    appStore:AppStore;
+    token?: string;
+    creationDate?: string;
+    expirationDate?: string;
+    loadingComponent?: JSX.Element;
+    appStore: AppStore;
 }
 
 @observer
-export class DataAccessTokensDropdown extends React.Component<IDataAccessTokensProps, {}> {
+export class DataAccessTokensDropdown extends React.Component<
+    IDataAccessTokensProps,
+    {}
+> {
     public static defaultProps: Partial<IDataAccessTokensProps> = {
-        loadingComponent:<LoadingIndicator isLoading={true}/>
+        loadingComponent: <LoadingIndicator isLoading={true} />,
     };
 
     constructor(props: IDataAccessTokensProps) {
         super(props);
     }
 
-    @computed get getDatDropdownList() : any {
+    @computed get getDatDropdownList(): any {
         const listItems = [
             {
-                id:"signout",
-                action:<a href={buildCBioPortalPageUrl(this.props.appStore.logoutUrl)}>Sign out</a>,
-                hide:false
+                id: 'signout',
+                action: (
+                    <a
+                        href={buildCBioPortalPageUrl(
+                            this.props.appStore.logoutUrl
+                        )}
+                    >
+                        Sign out
+                    </a>
+                ),
+                hide: false,
             },
             {
-                id:"datDownload",
-                action:<Link to="/webAPI#using-data-access-tokens">Data Access Token</Link>,
-                hide:(AppConfig.serverConfig.authenticationMethod === "social_auth" || (AppConfig.serverConfig.dat_method !== "uuid" && AppConfig.serverConfig.dat_method !== "jwt"))
-            }
+                id: 'datDownload',
+                action: (
+                    <Link to="/webAPI#using-data-access-tokens">
+                        Data Access Token
+                    </Link>
+                ),
+                hide:
+                    AppConfig.serverConfig.authenticationMethod ===
+                        'social_auth' ||
+                    (AppConfig.serverConfig.dat_method !== 'uuid' &&
+                        AppConfig.serverConfig.dat_method !== 'jwt'),
+            },
         ];
-        const shownListItems = listItems.filter((l)=>{
+        const shownListItems = listItems.filter(l => {
             return !l.hide;
         });
 
-        return shownListItems.map((l)=>{
+        return shownListItems.map(l => {
             return <li>{l.action}</li>;
         });
     }
 
-    render(){
-        return(
-        <ul className="list-unstyled">
-            {
-                this.getDatDropdownList
-            }
-        </ul>
-        );
+    render() {
+        return <ul className="list-unstyled">{this.getDatDropdownList}</ul>;
     }
 }
diff --git a/src/shared/components/enhancedFixedDataTable/EnhancedFixedDataTable.jsx b/src/shared/components/enhancedFixedDataTable/EnhancedFixedDataTable.jsx
index e3b7e549769..79c350b0b7a 100644
--- a/src/shared/components/enhancedFixedDataTable/EnhancedFixedDataTable.jsx
+++ b/src/shared/components/enhancedFixedDataTable/EnhancedFixedDataTable.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import FixedDataTable from 'fixed-data-table';
-import {Button, ButtonGroup} from 'react-bootstrap';
+import { Button, ButtonGroup } from 'react-bootstrap';
 import _ from 'underscore';
 import 'fixed-data-table/dist/fixed-data-table.min.css';
 
@@ -11,70 +11,73 @@ const Cell = FixedDataTable.Cell;
 
 import ReactZeroClipboard from 'react-zeroclipboard';
 
-var EnhancedFixedDataTable = (function () {
-// Data button component
+var EnhancedFixedDataTable = (function() {
+    // Data button component
     var FileGrabber = React.createClass({
-        displayName: "FileGrabber",
+        displayName: 'FileGrabber',
         // Saves table content to a text file
-        saveFile: function () {
+        saveFile: function() {
             var formatData = this.state.formatData || this.props.content();
             this.state.formatData = formatData;
 
-            var blob = new Blob([formatData], {type: 'text/plain'});
-            var fileName = this.props.downloadFileName ? this.props.downloadFileName : "data.txt";
+            var blob = new Blob([formatData], { type: 'text/plain' });
+            var fileName = this.props.downloadFileName
+                ? this.props.downloadFileName
+                : 'data.txt';
 
-            var downloadLink = document.createElement("a");
+            var downloadLink = document.createElement('a');
             downloadLink.download = fileName;
-            downloadLink.innerHTML = "Download File";
+            downloadLink.innerHTML = 'Download File';
             if (window.webkitURL) {
                 // Chrome allows the link to be clicked
                 // without actually adding it to the DOM.
                 downloadLink.href = window.webkitURL.createObjectURL(blob);
-            }
-            else {
+            } else {
                 // Firefox requires the link to be added to the DOM
                 // before it can be clicked.
                 downloadLink.href = window.URL.createObjectURL(blob);
-                downloadLink.onclick = function (event) {
+                downloadLink.onclick = function(event) {
                     document.body.removeChild(event.target);
                 };
-                downloadLink.style.display = "none";
+                downloadLink.style.display = 'none';
                 document.body.appendChild(downloadLink);
             }
 
             downloadLink.click();
         },
 
-        getInitialState: function () {
+        getInitialState: function() {
             return {
-                formatData: ''
+                formatData: '',
             };
         },
 
-        render: function () {
-            return (
-                React.createElement("button", {className: "btn btn-default", onClick: this.saveFile},
-                    this.props.buttonText || "Download CSV")
+        render: function() {
+            return React.createElement(
+                'button',
+                { className: 'btn btn-default', onClick: this.saveFile },
+                this.props.buttonText || 'Download CSV'
             );
-        }
+        },
     });
 
-
-// Container of FileGrabber and ClipboardGrabber
+    // Container of FileGrabber and ClipboardGrabber
     var DataGrabber = React.createClass({
-        displayName: "DataGrabber",
+        displayName: 'DataGrabber',
         // Prepares table content data for download or copy button
-        prepareContent: function () {
-            var content = [], cols = this.props.cols, rows = this.props.rows;
+        prepareContent: function() {
+            var content = [],
+                cols = this.props.cols,
+                rows = this.props.rows;
 
-            _.each(cols, function (e) {
-                content.push((e.displayName || 'Unknown'), '\t');
+            _.each(cols, function(e) {
+                content.push(e.displayName || 'Unknown', '\t');
             });
             content.pop();
 
-            _.each(rows, function (row) {
+            _.each(rows, function(row) {
                 content.push('\r\n');
-                _.each(cols, function (col) {
+                _.each(cols, function(col) {
                     content.push(row[col.name], '\t');
                 });
                 content.pop();
@@ -82,56 +85,75 @@ var EnhancedFixedDataTable = (function () {
             return content.join('');
         },
 
-        render: function () {
+        render: function() {
             var getData = this.props.getData;
-            if (getData === "NONE") {
-                return React.createElement("div", null);
+            if (getData === 'NONE') {
+                return React.createElement('div', null);
             }
 
             var content = this.prepareContent;
 
             return (
-
                 <ButtonGroup>
-                    <FileGrabber content={this.prepareContent} downloadFileName={this.props.downloadFileName}></FileGrabber>
+                    <FileGrabber
+                        content={this.prepareContent}
+                        downloadFileName={this.props.downloadFileName}
+                    ></FileGrabber>
 
                     <ReactZeroClipboard
                         swfPath={require('react-zeroclipboard/assets/ZeroClipboard.swf')}
-                        getText={this.prepareContent}>
+                        getText={this.prepareContent}
+                    >
                         <button className="btn btn-default">Copy</button>
                     </ReactZeroClipboard>
-
                 </ButtonGroup>
-
-
             );
-
-        }
+        },
     });
 
-// Wrapper of qTip for string
-// Generates qTip when string length is larger than 20
+    // Wrapper of qTip for string
+    // Generates qTip when string length is larger than 20
     var QtipWrapper = React.createClass({
-        displayName: "QtipWrapper",
-        render: function () {
-            var label = this.props.label, qtipFlag = false, attr = this.props.attr;
+        displayName: 'QtipWrapper',
+        render: function() {
+            var label = this.props.label,
+                qtipFlag = false,
+                attr = this.props.attr;
             var shortLabel = this.props.shortLabel;
 
-            if (label && shortLabel && label.toString().length > shortLabel.toString().length) {
+            if (
+                label &&
+                shortLabel &&
+                label.toString().length > shortLabel.toString().length
+            ) {
                 qtipFlag = true;
             }
 
             if (window.hasOwnProperty('cbio') && cbio.hasOwnProperty('util')) {
                 if (attr === 'CASE_ID') {
-                    shortLabel = React.createElement("a", {
-                        target: "_blank",
-                        href: cbio.util.getLinkToSampleView(cancerStudyId, label)
-                    }, shortLabel)
+                    shortLabel = React.createElement(
+                        'a',
+                        {
+                            target: '_blank',
+                            href: cbio.util.getLinkToSampleView(
+                                cancerStudyId,
+                                label
+                            ),
+                        },
+                        shortLabel
+                    );
                 } else if (attr === 'PATIENT_ID') {
-                    shortLabel = React.createElement("a", {
-                        target: "_blank",
-                        href: cbio.util.getLinkToPatientView(cancerStudyId, label)
-                    }, shortLabel)
+                    shortLabel = React.createElement(
+                        'a',
+                        {
+                            target: '_blank',
+                            href: cbio.util.getLinkToPatientView(
+                                cancerStudyId,
+                                label
+                            ),
+                        },
+                        shortLabel
+                    );
                 }
             }
 
@@ -143,22 +165,23 @@ var EnhancedFixedDataTable = (function () {
                 }
             }
 
-            return (
-                React.createElement("span", {className: qtipFlag ? "hasQtip" : "", "data-qtip": label},
-                    shortLabel
-                )
+            return React.createElement(
+                'span',
+                { className: qtipFlag ? 'hasQtip' : '', 'data-qtip': label },
+                shortLabel
             );
-        }
+        },
     });
 
-// Column show/hide component
+    // Column show/hide component
     var ColumnHider = React.createClass({
-        displayName: "ColumnHider",
-        tableCols: [],// For the checklist
+        displayName: 'ColumnHider',
+        tableCols: [], // For the checklist
 
         // Updates column show/hide settings
-        hideColumns: function (list) {
-            var cols = this.props.cols, filters = this.props.filters;
+        hideColumns: function(list) {
+            var cols = this.props.cols,
+                filters = this.props.filters;
             for (var i = 0; i < list.length; i++) {
                 cols[i].show = list[i].isChecked;
                 if (this.props.hideFilter) {
@@ -169,19 +192,19 @@ var EnhancedFixedDataTable = (function () {
         },
 
         // Prepares tableCols
-        componentWillMount: function () {
+        componentWillMount: function() {
             var cols = this.props.cols;
             var colsL = cols.length;
             for (var i = 0; i < colsL; i++) {
                 this.tableCols.push({
                     id: cols[i].name,
                     label: cols[i].displayName,
-                    isChecked: cols[i].show
+                    isChecked: cols[i].show,
                 });
             }
         },
 
-        componentDidMount: function () {
+        componentDidMount: function() {
             var hideColumns = this.hideColumns;
 
             // Dropdown checklist
@@ -189,39 +212,45 @@ var EnhancedFixedDataTable = (function () {
                 .dropdownCheckbox({
                     data: this.tableCols,
                     autosearch: true,
-                    title: "Show / Hide Columns",
+                    title: 'Show / Hide Columns',
                     hideHeader: false,
-                    showNbSelected: true
+                    showNbSelected: true,
                 })
                 // Handles dropdown checklist event
-                .on("change", function () {
-                    var list = ($("#hide_column_checklist").dropdownCheckbox("items"));
+                .on('change', function() {
+                    var list = $('#hide_column_checklist').dropdownCheckbox(
+                        'items'
+                    );
                     hideColumns(list);
                 });
             // add title attributes to unlabeled inputs generated by
             // .dropdownCheckbox() for accessibility, until
             // https://github.com/Nelrohd/bootstrap-dropdown-checkbox/issues/33 is
             // fixed upstream
-            $('#hide_column_checklist input[type="checkbox"].checkbox-all')
-                .attr('title', 'Select all');
-            $('#hide_column_checklist input[type="text"].search')
-                .attr('title', 'Search');
+            $(
+                '#hide_column_checklist input[type="checkbox"].checkbox-all'
+            ).attr('title', 'Select all');
+            $('#hide_column_checklist input[type="text"].search').attr(
+                'title',
+                'Search'
+            );
         },
 
-        render: function () {
-            return (
-                React.createElement("div", {id: "hide_column_checklist", className: "EFDT-top-btn"})
-            );
-        }
+        render: function() {
+            return React.createElement('div', {
+                id: 'hide_column_checklist',
+                className: 'EFDT-top-btn',
+            });
+        },
     });
 
-// Choose fixed columns component
+    // Choose fixed columns component
     var PinColumns = React.createClass({
-        displayName: "PinColumns",
-        tableCols: [],// For the checklist
+        displayName: 'PinColumns',
+        tableCols: [], // For the checklist
 
         // Updates fixed column settings
-        pinColumns: function (list) {
+        pinColumns: function(list) {
             var cols = this.props.cols;
             for (var i = 0; i < list.length; i++) {
                 cols[i].fixed = list[i].isChecked;
@@ -230,58 +259,68 @@ var EnhancedFixedDataTable = (function () {
         },
 
         // Prepares tableCols
-        componentWillMount: function () {
+        componentWillMount: function() {
             var cols = this.props.cols;
             var colsL = cols.length;
             for (var i = 0; i < colsL; i++) {
                 this.tableCols.push({
                     id: cols[i].name,
                     label: cols[i].displayName,
-                    isChecked: cols[i].fixed
+                    isChecked: cols[i].fixed,
                 });
             }
         },
 
-        componentDidMount: function () {
+        componentDidMount: function() {
             var pinColumns = this.pinColumns;
 
             // Dropdown checklist
-            $("#pin_column_checklist")
+            $('#pin_column_checklist')
                 .dropdownCheckbox({
                     data: this.tableCols,
                     autosearch: true,
-                    title: "Choose Fixed Columns",
+                    title: 'Choose Fixed Columns',
                     hideHeader: false,
-                    showNbSelected: true
+                    showNbSelected: true,
                 })
                 // Handles dropdown checklist event
-                .on("change", function () {
-                    var list = ($("#pin_column_checklist").dropdownCheckbox("items"));
+                .on('change', function() {
+                    var list = $('#pin_column_checklist').dropdownCheckbox(
+                        'items'
+                    );
                     pinColumns(list);
                 });
             // add title attributes to unlabeled inputs generated by
             // .dropdownCheckbox() for accessibility, until
             // https://github.com/Nelrohd/bootstrap-dropdown-checkbox/issues/33 is
             // fixed upstream
-            $('#pin_column_checklist input[type="checkbox"].checkbox-all')
-                .attr('title', 'Select all');
-            $('#pin_column_checklist input[type="text"].search')
-                .attr('title', 'Search');
+            $('#pin_column_checklist input[type="checkbox"].checkbox-all').attr(
+                'title',
+                'Select all'
+            );
+            $('#pin_column_checklist input[type="text"].search').attr(
+                'title',
+                'Search'
+            );
         },
 
-        render: function () {
-            return (
-                React.createElement("div", {id: "pin_column_checklist", className: "EFDT-top-btn"})
-            );
-        }
+        render: function() {
+            return React.createElement('div', {
+                id: 'pin_column_checklist',
+                className: 'EFDT-top-btn',
+            });
+        },
     });
 
-// Column scroller component
+    // Column scroller component
     var ColumnScroller = React.createClass({
-        displayName: "ColumnScroller",
+        displayName: 'ColumnScroller',
         // Scrolls to user selected column
-        scrollToColumn: function (e) {
-            var name = e.target.value, cols = this.props.cols, index, colsL = cols.length;
+        scrollToColumn: function(e) {
+            var name = e.target.value,
+                cols = this.props.cols,
+                index,
+                colsL = cols.length;
             for (var i = 0; i < colsL; i++) {
                 if (name === cols[i].name) {
                     index = i;
@@ -291,90 +330,113 @@ var EnhancedFixedDataTable = (function () {
             this.props.updateGoToColumn(index);
         },
 
-        render: function () {
-            return (
-                React.createElement(Chosen, {
-                        "data-placeholder": "Column Scroller",
-                        onChange: this.scrollToColumn
-                    },
-
-                    this.props.cols.map(function (col) {
-                        return (
-                            React.createElement("option", {title: col.displayName, value: col.name},
-                                React.createElement(QtipWrapper, {label: col.displayName})
-                            )
-                        );
-                    })
-                )
+        render: function() {
+            return React.createElement(
+                Chosen,
+                {
+                    'data-placeholder': 'Column Scroller',
+                    onChange: this.scrollToColumn,
+                },
+
+                this.props.cols.map(function(col) {
+                    return React.createElement(
+                        'option',
+                        { title: col.displayName, value: col.name },
+                        React.createElement(QtipWrapper, {
+                            label: col.displayName,
+                        })
+                    );
+                })
             );
-        }
+        },
     });
 
-// Filter component
+    // Filter component
     var Filter = React.createClass({
-        displayName: "Filter",
-        getInitialState: function () {
-            return {key: ''};
+        displayName: 'Filter',
+        getInitialState: function() {
+            return { key: '' };
         },
-        handleChange: function (event) {
-            this.setState({key: event.target.value});
+        handleChange: function(event) {
+            this.setState({ key: event.target.value });
             this.props.onFilterKeywordChange(event);
         },
-        componentWillUpdate: function () {
+        componentWillUpdate: function() {
             if (this.props.type === 'STRING') {
-                if (!_.isUndefined(this.props.filter) && this.props.filter.key !== this.state.key && this.props.filter.key === '' && this.props.filter.reset) {
+                if (
+                    !_.isUndefined(this.props.filter) &&
+                    this.props.filter.key !== this.state.key &&
+                    this.props.filter.key === '' &&
+                    this.props.filter.reset
+                ) {
                     this.state.key = '';
                     this.props.filter.reset = false;
                 }
             }
         },
-        render: function () {
-            if (this.props.type === "NUMBER" || this.props.type === "PERCENTAGE") {
+        render: function() {
+            if (
+                this.props.type === 'NUMBER' ||
+                this.props.type === 'PERCENTAGE'
+            ) {
                 // explicitly set anchors without href for the handles, as
                 // jQuery UI 1.10 otherwise adds href="#" which may confuse
                 // assistive technologies
-                return (
-                    React.createElement("div", {className: `${styles.header - filters} pull-right`},
-                        React.createElement("span", {id: "range-" + this.props.name}),
-
-                        React.createElement("div", {
-                                className: "rangeSlider", "data-max": this.props.max,
-                                "data-min": this.props.min, "data-column": this.props.name,
-                                "data-type": this.props.type
-                            },
-                            React.createElement("a", {className: "ui-slider-handle", tabIndex: "0"}),
-                            React.createElement("a", {className: "ui-slider-handle", tabIndex: "0"})
-                        )
+                return React.createElement(
+                    'div',
+                    { className: `${styles.header - filters} pull-right` },
+                    React.createElement('span', {
+                        id: 'range-' + this.props.name,
+                    }),
+
+                    React.createElement(
+                        'div',
+                        {
+                            className: 'rangeSlider',
+                            'data-max': this.props.max,
+                            'data-min': this.props.min,
+                            'data-column': this.props.name,
+                            'data-type': this.props.type,
+                        },
+                        React.createElement('a', {
+                            className: 'ui-slider-handle',
+                            tabIndex: '0',
+                        }),
+                        React.createElement('a', {
+                            className: 'ui-slider-handle',
+                            tabIndex: '0',
+                        })
                     )
                 );
             } else {
                 return (
-
                     <div className={`${styles.headerFilters} pull-right`}>
-
                         <div className={styles.searchWrapper}>
                             <i className="fa fa-search" aria-hidden="true"></i>
-                            <input className="form-control"
-                                   value={this.state.key}
-                                   onChange={this.handleChange}
-                                   data-column={ this.props.name }
-                                   placeholder={ (this.props.hasOwnProperty('placeholder')) ? this.props.placeholder : "Filter"}
+                            <input
+                                className="form-control"
+                                value={this.state.key}
+                                onChange={this.handleChange}
+                                data-column={this.props.name}
+                                placeholder={
+                                    this.props.hasOwnProperty('placeholder')
+                                        ? this.props.placeholder
+                                        : 'Filter'
+                                }
                             />
                         </div>
-
                     </div>
                 );
             }
-        }
+        },
     });
 
-// Table prefix component
-// Contains components above the main part of table
+    // Table prefix component
+    // Contains components above the main part of table
     var TablePrefix = React.createClass({
-        displayName: "TablePrefix",
-        render: function () {
+        displayName: 'TablePrefix',
+        render: function() {
             return (
-
                 // React.createElement("div", null,
                 //
                 //     this.props.hider ?
@@ -419,47 +481,59 @@ var EnhancedFixedDataTable = (function () {
                 //
                 // ),
                 <div className={`${styles.tableControls} clearfix`}>
-
-
                     <div className="EFDT-download pull-left">
-                        <DataGrabber cols={this.props.cols} rows={this.props.rows}
-                                     downloadFileName={this.props.downloadFileName}/>
+                        <DataGrabber
+                            cols={this.props.cols}
+                            rows={this.props.rows}
+                            downloadFileName={this.props.downloadFileName}
+                        />
                     </div>
 
+                    {this.props.filter === 'ALL' ||
+                    this.props.filter === 'GLOBAL' ? (
+                        <Filter
+                            type="STRING"
+                            name="all"
+                            className="EFDT-filter pull-right"
+                            onFilterKeywordChange={
+                                this.props.onFilterKeywordChange
+                            }
+                        ></Filter>
+                    ) : null}
 
-                    {
-                        (this.props.filter === "ALL" || this.props.filter === "GLOBAL")
-                        ?   <Filter type="STRING" name="all" className="EFDT-filter pull-right"
-                                onFilterKeywordChange={this.props.onFilterKeywordChange}></Filter>
-                        :   null
-                    }
-
-                    {
-                        (this.props.resultInfo)
-                        ?   <div className={`${styles.resultInfo}`}>Showing {this.props.filteredRowsSize} results</div>
-                        :   null
-                    }
-
-
+                    {this.props.resultInfo ? (
+                        <div className={`${styles.resultInfo}`}>
+                            Showing {this.props.filteredRowsSize} results
+                        </div>
+                    ) : null}
                 </div>
-
-            )
-
-        }
+            );
+        },
     });
 
-// Wrapper for the header rendering
+    // Wrapper for the header rendering
     var HeaderWrapper = React.createClass({
-        displayName: "HeaderWrapper",
-        render: function () {
+        displayName: 'HeaderWrapper',
+        render: function() {
             var columnData = this.props.columnData;
             var shortLabel = this.props.shortLabel;
 
-            const sortIcon = (columnData.sortFlag) ? <i className="fa fa-unsorted"></i> : null;
+            const sortIcon = columnData.sortFlag ? (
+                <i className="fa fa-unsorted"></i>
+            ) : null;
 
             return (
-                <Cell><a className={ styles.sortHeaderButton }
-                         onClick={ this.props.sortNSet.bind(null, this.props.cellDataKey)}>{ shortLabel } {sortIcon}</a></Cell>
+                <Cell>
+                    <a
+                        className={styles.sortHeaderButton}
+                        onClick={this.props.sortNSet.bind(
+                            null,
+                            this.props.cellDataKey
+                        )}
+                    >
+                        {shortLabel} {sortIcon}
+                    </a>
+                </Cell>
                 // React.createElement("div", {className: "EFDT-header"},
                 //     React.createElement("a", {className: "EFDT-header-sort", href: "#",
                 //             onClick: this.props.sortNSet.bind(null, this.props.cellDataKey)},
@@ -473,37 +547,45 @@ var EnhancedFixedDataTable = (function () {
                 //     )
                 // )
             );
-        }
+        },
     });
 
     var CustomizeCell = React.createClass({
-        displayName: "CustomizeCell",
-        render: function () {
-
-            var rowIndex = this.props.rowIndex, data = this.props.data, field = this.props.field, filterAll = this.props.filterAll;
-            var flag = (data[rowIndex][field] && filterAll.length > 0) ?
-                (data[rowIndex][field].toLowerCase().indexOf(filterAll.toLowerCase()) >= 0) : false;
+        displayName: 'CustomizeCell',
+        render: function() {
+            var rowIndex = this.props.rowIndex,
+                data = this.props.data,
+                field = this.props.field,
+                filterAll = this.props.filterAll;
+            var flag =
+                data[rowIndex][field] && filterAll.length > 0
+                    ? data[rowIndex][field]
+                          .toLowerCase()
+                          .indexOf(filterAll.toLowerCase()) >= 0
+                    : false;
             var shortLabels = this.props.shortLabels;
-            return (
-                React.createElement(FixedDataTable.Cell, {columnKey: field},
-                    React.createElement("span", {style: flag ? {backgroundColor: 'yellow'} : {}},
-                        React.createElement(QtipWrapper, {
-                            label: data[rowIndex].row[field],
-                            shortLabel: shortLabels[data[rowIndex].index][field],
-                            attr: field
-                        })
-                    )
+            return React.createElement(
+                FixedDataTable.Cell,
+                { columnKey: field },
+                React.createElement(
+                    'span',
+                    { style: flag ? { backgroundColor: 'yellow' } : {} },
+                    React.createElement(QtipWrapper, {
+                        label: data[rowIndex].row[field],
+                        shortLabel: shortLabels[data[rowIndex].index][field],
+                        attr: field,
+                    })
                 )
             );
-        }
+        },
     });
 
-// Main part table component
-// Uses FixedDataTable library
+    // Main part table component
+    // Uses FixedDataTable library
     var TableMainPart = React.createClass({
-        displayName: "TableMainPart",
+        displayName: 'TableMainPart',
         // Creates Qtip
-        createQtip: function () {
+        createQtip: function() {
             return;
             /*
             $('.EFDT-table .hasQtip').one('mouseenter', function () {
@@ -519,26 +601,25 @@ var EnhancedFixedDataTable = (function () {
         },
 
         // Creates Qtip after first rendering
-        componentDidMount: function () {
+        componentDidMount: function() {
             this.createQtip();
         },
 
         // Creates Qtip after update rendering
-        componentDidUpdate: function () {
+        componentDidUpdate: function() {
             this.createQtip();
         },
 
         // Creates Qtip after page scrolling
-        onScrollEnd: function () {
-            $(".qtip").remove();
+        onScrollEnd: function() {
+            $('.qtip').remove();
             this.createQtip();
         },
 
         // Destroys Qtip before update rendering
-        componentWillUpdate: function () {
+        componentWillUpdate: function() {
             //console.log('number of elments which has "hasQtip" as class name: ', $('.hasQtip').size());
             //console.log('number of elments which has "hasQtip" as class name under class EFDT: ', $('.EFDT-table .hasQtip').size());
-
             // $('.EFDT-table .hasQtip')
             //     .each(function() {
             //         $(this).qtip('destroy', true);
@@ -546,137 +627,156 @@ var EnhancedFixedDataTable = (function () {
         },
 
         // FixedDataTable render function
-        render: function () {
-            var Table = FixedDataTable.Table, Column = FixedDataTable.Column,
-                ColumnGroup = FixedDataTable.ColumnGroup, props = this.props,
-                rows = this.props.filteredRows, columnWidths = this.props.columnWidths,
+        render: function() {
+            var Table = FixedDataTable.Table,
+                Column = FixedDataTable.Column,
+                ColumnGroup = FixedDataTable.ColumnGroup,
+                props = this.props,
+                rows = this.props.filteredRows,
+                columnWidths = this.props.columnWidths,
                 cellShortLabels = this.props.shortLabels.cell,
                 headerShortLabels = this.props.shortLabels.header;
 
-            return (
-                React.createElement("div", null,
-                    React.createElement(Table, {
-                            rowHeight: props.rowHeight ? props.rowHeight : 37,
-                            rowGetter: this.rowGetter,
-                            onScrollEnd: this.onScrollEnd,
-                            rowsCount: props.filteredRows.length,
-                            width: props.tableWidth ? props.tableWidth : 1230,
-                            maxHeight: props.maxHeight ? props.maxHeight : 500,
-                            headerHeight: props.headerHeight ? props.headerHeight : 37,
-                            groupHeaderHeight: props.groupHeaderHeight ? props.groupHeaderHeight : 50,
-                            scrollToColumn: props.goToColumn,
-                            isColumnResizing: false,
-                            onColumnResizeEndCallback: props.onColumnResizeEndCallback
-                        },
+            return React.createElement(
+                'div',
+                null,
+                React.createElement(
+                    Table,
+                    {
+                        rowHeight: props.rowHeight ? props.rowHeight : 37,
+                        rowGetter: this.rowGetter,
+                        onScrollEnd: this.onScrollEnd,
+                        rowsCount: props.filteredRows.length,
+                        width: props.tableWidth ? props.tableWidth : 1230,
+                        maxHeight: props.maxHeight ? props.maxHeight : 500,
+                        headerHeight: props.headerHeight
+                            ? props.headerHeight
+                            : 37,
+                        groupHeaderHeight: props.groupHeaderHeight
+                            ? props.groupHeaderHeight
+                            : 50,
+                        scrollToColumn: props.goToColumn,
+                        isColumnResizing: false,
+                        onColumnResizeEndCallback:
+                            props.onColumnResizeEndCallback,
+                    },
 
-                        props.cols.map(function (col, index) {
-                            var column;
-                            var width = col.show ? (col.width ? col.width :
-                                (columnWidths[col.name] ? columnWidths[col.name] : 200)) : 0;
-
-                            if (props.groupHeader) {
-                                column = React.createElement(ColumnGroup, {
-                                        header: React.createElement(Filter, {
-                                                type: props.filters[col.name].type, name: col.name,
-                                                max: col.max, min: col.min, filter: props.filters[col.name],
-                                                placeholder: "Filter column",
-                                                onFilterKeywordChange: props.onFilterKeywordChange,
-                                                title: "Filter column"
-                                            }
-                                        ),
-
-                                        key: col.name,
-                                        fixed: col.fixed,
-                                        align: "center"
-                                    },
-                                    React.createElement(Column, {
-                                            header: React.createElement(HeaderWrapper, {
-                                                    cellDataKey: col.name, columnData: {
-                                                        displayName: col.displayName,
-                                                        sortFlag: props.sortBy === col.name,
-                                                        sortDirArrow: props.sortDirArrow,
-                                                        filterAll: props.filterAll,
-                                                        type: props.filters[col.name].type
-                                                    },
-                                                    sortNSet: props.sortNSet, filter: props.filters[col.name],
-                                                    shortLabel: headerShortLabels[col.name]
-                                                }
-                                            ),
-
-                                            cell: React.createElement(CustomizeCell, {
-                                                    data: rows, field: col.name,
-                                                    filterAll: props.filterAll, shortLabels: cellShortLabels
-                                                }
-                                            ),
-                                            width: width,
-                                            fixed: col.fixed,
-                                            allowCellsRecycling: true,
-                                            isResizable: props.isResizable,
-                                            columnKey: col.name,
-                                            key: col.name
-                                        }
-                                    )
-                                )
-                            } else {
-                                column = React.createElement(Column, {
-                                        header: React.createElement(HeaderWrapper, {
-                                                cellDataKey: col.name, columnData: {
-                                                    displayName: col.displayName,
-                                                    sortFlag: props.sortBy === col.name,
-                                                    sortDirArrow: props.sortDirArrow,
-                                                    filterAll: props.filterAll,
-                                                    type: props.filters[col.name].type
-                                                },
-                                                sortNSet: props.sortNSet, filter: props.filters[col.name],
-                                                shortLabel: headerShortLabels[col.name]
-                                            }
-                                        ),
-
-                                        cell: React.createElement(CustomizeCell, {
-                                                data: rows, field: col.name,
-                                                filterAll: props.filterAll,
-                                                shortLabels: cellShortLabels
-                                            }
-                                        ),
-                                        width: width,
-                                        fixed: col.fixed,
-                                        allowCellsRecycling: true,
-                                        columnKey: col.name,
-                                        key: col.name,
-                                        isResizable: props.isResizable
-                                    }
-                                )
-                            }
-                            return (
-                                column
+                    props.cols.map(function(col, index) {
+                        var column;
+                        var width = col.show
+                            ? col.width
+                                ? col.width
+                                : columnWidths[col.name]
+                                ? columnWidths[col.name]
+                                : 200
+                            : 0;
+
+                        if (props.groupHeader) {
+                            column = React.createElement(
+                                ColumnGroup,
+                                {
+                                    header: React.createElement(Filter, {
+                                        type: props.filters[col.name].type,
+                                        name: col.name,
+                                        max: col.max,
+                                        min: col.min,
+                                        filter: props.filters[col.name],
+                                        placeholder: 'Filter column',
+                                        onFilterKeywordChange:
+                                            props.onFilterKeywordChange,
+                                        title: 'Filter column',
+                                    }),
+
+                                    key: col.name,
+                                    fixed: col.fixed,
+                                    align: 'center',
+                                },
+                                React.createElement(Column, {
+                                    header: React.createElement(HeaderWrapper, {
+                                        cellDataKey: col.name,
+                                        columnData: {
+                                            displayName: col.displayName,
+                                            sortFlag: props.sortBy === col.name,
+                                            sortDirArrow: props.sortDirArrow,
+                                            filterAll: props.filterAll,
+                                            type: props.filters[col.name].type,
+                                        },
+                                        sortNSet: props.sortNSet,
+                                        filter: props.filters[col.name],
+                                        shortLabel: headerShortLabels[col.name],
+                                    }),
+
+                                    cell: React.createElement(CustomizeCell, {
+                                        data: rows,
+                                        field: col.name,
+                                        filterAll: props.filterAll,
+                                        shortLabels: cellShortLabels,
+                                    }),
+                                    width: width,
+                                    fixed: col.fixed,
+                                    allowCellsRecycling: true,
+                                    isResizable: props.isResizable,
+                                    columnKey: col.name,
+                                    key: col.name,
+                                })
                             );
-                        })
-                    )
+                        } else {
+                            column = React.createElement(Column, {
+                                header: React.createElement(HeaderWrapper, {
+                                    cellDataKey: col.name,
+                                    columnData: {
+                                        displayName: col.displayName,
+                                        sortFlag: props.sortBy === col.name,
+                                        sortDirArrow: props.sortDirArrow,
+                                        filterAll: props.filterAll,
+                                        type: props.filters[col.name].type,
+                                    },
+                                    sortNSet: props.sortNSet,
+                                    filter: props.filters[col.name],
+                                    shortLabel: headerShortLabels[col.name],
+                                }),
+
+                                cell: React.createElement(CustomizeCell, {
+                                    data: rows,
+                                    field: col.name,
+                                    filterAll: props.filterAll,
+                                    shortLabels: cellShortLabels,
+                                }),
+                                width: width,
+                                fixed: col.fixed,
+                                allowCellsRecycling: true,
+                                columnKey: col.name,
+                                key: col.name,
+                                isResizable: props.isResizable,
+                            });
+                        }
+                        return column;
+                    })
                 )
             );
-        }
+        },
     });
 
-// Root component
+    // Root component
     var Main = React.createClass({
-        displayName: "Main",
+        displayName: 'Main',
         SortTypes: {
             ASC: 'ASC',
-            DESC: 'DESC'
+            DESC: 'DESC',
         },
 
         rows: null,
 
-        getColumnWidth: function (cols, rows, measureMethod, columnMinWidth) {
+        getColumnWidth: function(cols, rows, measureMethod, columnMinWidth) {
             var columnWidth = {};
             var self = this;
 
-            var $ruler = $('<span style="font-size:14px"/>').appendTo("body");
+            var $ruler = $('<span style="font-size:14px"/>').appendTo('body');
 
             if (self.props.autoColumnWidth) {
                 var rulerWidth = 0;
-                _.each(rows, function (row) {
-                    _.each(row, function (data, attr) {
+                _.each(rows, function(row) {
+                    _.each(row, function(data, attr) {
                         if (data) {
                             data = data.toString();
                             if (!columnWidth.hasOwnProperty(attr)) {
@@ -689,26 +789,41 @@ var EnhancedFixedDataTable = (function () {
                                     rulerWidth = $ruler.outerWidth();
                                     break;
                                 default:
-                                    var upperCaseLength = data.replace(/[^A-Z]/g, "").length;
+                                    var upperCaseLength = data.replace(
+                                        /[^A-Z]/g,
+                                        ''
+                                    ).length;
                                     var dataLength = data.length;
-                                    rulerWidth = upperCaseLength * 10 + (dataLength - upperCaseLength) * 8 + 15;
+                                    rulerWidth =
+                                        upperCaseLength * 10 +
+                                        (dataLength - upperCaseLength) * 8 +
+                                        15;
                                     break;
                             }
 
-                            columnWidth[attr] = columnWidth[attr] < rulerWidth ? rulerWidth : columnWidth[attr];
+                            columnWidth[attr] =
+                                columnWidth[attr] < rulerWidth
+                                    ? rulerWidth
+                                    : columnWidth[attr];
                         }
                     });
                 });
 
                 //20px is the padding.
-                columnWidth = _.object(_.map(columnWidth, function (length, attr) {
-                    return [attr, length > self.props.columnMaxWidth ?
-                        self.props.columnMaxWidth :
-                        ( (length + 20) < columnMinWidth ?
-                            columnMinWidth : (length + 20))];
-                }));
+                columnWidth = _.object(
+                    _.map(columnWidth, function(length, attr) {
+                        return [
+                            attr,
+                            length > self.props.columnMaxWidth
+                                ? self.props.columnMaxWidth
+                                : length + 20 < columnMinWidth
+                                ? columnMinWidth
+                                : length + 20,
+                        ];
+                    })
+                );
             } else {
-                _.each(cols, function (col, attr) {
+                _.each(cols, function(col, attr) {
                     columnWidth[col.name] = col.width ? col.width : 200;
                 });
             }
@@ -718,13 +833,13 @@ var EnhancedFixedDataTable = (function () {
             return columnWidth;
         },
 
-        getShortLabels: function (rows, cols, columnWidth, measureMethod) {
+        getShortLabels: function(rows, cols, columnWidth, measureMethod) {
             var cellShortLabels = [];
             var headerShortLabels = {};
 
-            _.each(rows, function (row) {
+            _.each(rows, function(row) {
                 var rowWidthObj = {};
-                _.each(row, function (content, attr) {
+                _.each(row, function(content, attr) {
                     var _label = content;
                     var _labelShort = _label;
                     var _labelWidth;
@@ -738,13 +853,23 @@ var EnhancedFixedDataTable = (function () {
                                 _labelWidth = ruler.outerWidth();
                                 break;
                             default:
-                                var upperCaseLength = _label.replace(/[^A-Z]/g, "").length;
+                                var upperCaseLength = _label.replace(
+                                    /[^A-Z]/g,
+                                    ''
+                                ).length;
                                 var dataLength = _label.length;
-                                _labelWidth = upperCaseLength * 10 + (dataLength - upperCaseLength) * 8 + 15;
+                                _labelWidth =
+                                    upperCaseLength * 10 +
+                                    (dataLength - upperCaseLength) * 8 +
+                                    15;
                                 break;
                         }
                         if (_labelWidth > columnWidth[attr]) {
-                            var end = Math.floor(_label.length * columnWidth[attr] / _labelWidth) - 3;
+                            var end =
+                                Math.floor(
+                                    (_label.length * columnWidth[attr]) /
+                                        _labelWidth
+                                ) - 3;
                             _labelShort = _label.substring(0, end) + '...';
                         } else {
                             _labelShort = _label;
@@ -755,7 +880,7 @@ var EnhancedFixedDataTable = (function () {
                 cellShortLabels.push(rowWidthObj);
             });
 
-            _.each(cols, function (col) {
+            _.each(cols, function(col) {
                 var _label = col.displayName;
                 var _shortLabel = '';
                 var _labelWidth;
@@ -771,13 +896,21 @@ var EnhancedFixedDataTable = (function () {
                             _labelWidth = ruler.outerWidth();
                             break;
                         default:
-                            var upperCaseLength = _label.replace(/[^A-Z]/g, "").length;
+                            var upperCaseLength = _label.replace(/[^A-Z]/g, '')
+                                .length;
                             var dataLength = _label.length;
-                            _labelWidth = upperCaseLength * 10 + (dataLength - upperCaseLength) * 8 + 40;
+                            _labelWidth =
+                                upperCaseLength * 10 +
+                                (dataLength - upperCaseLength) * 8 +
+                                40;
                             break;
                     }
                     if (_labelWidth > columnWidth[col.name]) {
-                        var end = Math.floor(_label.length * columnWidth[col.name] / _labelWidth) - 3;
+                        var end =
+                            Math.floor(
+                                (_label.length * columnWidth[col.name]) /
+                                    _labelWidth
+                            ) - 3;
                         _shortLabel = _label.substring(0, end) + '...';
                     } else {
                         _shortLabel = _label;
@@ -788,43 +921,74 @@ var EnhancedFixedDataTable = (function () {
 
             return {
                 cell: cellShortLabels,
-                header: headerShortLabels
+                header: headerShortLabels,
             };
         },
         // Filters rows by selected column
-        filterRowsBy: function (filterAll, filters) {
+        filterRowsBy: function(filterAll, filters) {
             var rows = this.rows.slice();
             var hasGroupHeader = this.props.groupHeader;
             var filterRowsStartIndex = [];
-            var filteredRows = _.filter(rows, function (row, index) {
+            var filteredRows = _.filter(rows, function(row, index) {
                 var allFlag = false; // Current row contains the global keyword
                 for (var col in filters) {
                     if (!filters[col].hide) {
-                        if (filters[col].type == "STRING") {
+                        if (filters[col].type == 'STRING') {
                             if (!row[col] && hasGroupHeader) {
                                 if (filters[col].key.length > 0) {
                                     return false;
                                 }
                             } else {
-                                if (hasGroupHeader && row[col].toLowerCase().indexOf(filters[col].key.toLowerCase()) < 0) {
+                                if (
+                                    hasGroupHeader &&
+                                    row[col]
+                                        .toLowerCase()
+                                        .indexOf(
+                                            filters[col].key.toLowerCase()
+                                        ) < 0
+                                ) {
                                     return false;
                                 }
-                                if (row[col] && row[col].toLowerCase().indexOf(filterAll.toLowerCase()) >= 0) {
+                                if (
+                                    row[col] &&
+                                    row[col]
+                                        .toLowerCase()
+                                        .indexOf(filterAll.toLowerCase()) >= 0
+                                ) {
                                     allFlag = true;
                                 }
                             }
-                        } else if (filters[col].type === "NUMBER" || filters[col].type == 'PERCENTAGE') {
-                            var cell = _.isUndefined(row[col]) ? row[col] : Number(row[col].toString().replace('%', ''));
+                        } else if (
+                            filters[col].type === 'NUMBER' ||
+                            filters[col].type == 'PERCENTAGE'
+                        ) {
+                            var cell = _.isUndefined(row[col])
+                                ? row[col]
+                                : Number(row[col].toString().replace('%', ''));
                             if (!isNaN(cell)) {
                                 if (hasGroupHeader) {
-                                    if (filters[col].min !== filters[col]._min && Number(cell) < filters[col].min) {
+                                    if (
+                                        filters[col].min !==
+                                            filters[col]._min &&
+                                        Number(cell) < filters[col].min
+                                    ) {
                                         return false;
                                     }
-                                    if (filters[col].max !== filters[col]._max && Number(cell) > filters[col].max) {
+                                    if (
+                                        filters[col].max !==
+                                            filters[col]._max &&
+                                        Number(cell) > filters[col].max
+                                    ) {
                                         return false;
                                     }
                                 }
-                                if (row[col] && row[col].toString().toLowerCase().indexOf(filterAll.toLowerCase()) >= 0) {
+                                if (
+                                    row[col] &&
+                                    row[col]
+                                        .toString()
+                                        .toLowerCase()
+                                        .indexOf(filterAll.toLowerCase()) >= 0
+                                ) {
                                     allFlag = true;
                                 }
                             }
@@ -837,38 +1001,49 @@ var EnhancedFixedDataTable = (function () {
                 return allFlag;
             });
 
-            filteredRows = filteredRows.map(function (item, index) {
+            filteredRows = filteredRows.map(function(item, index) {
                 return {
                     row: item,
-                    index: filterRowsStartIndex[index]
-                }
+                    index: filterRowsStartIndex[index],
+                };
             });
             return filteredRows;
         },
 
         // Sorts rows by selected column
-        sortRowsBy: function (filteredRows, sortBy, switchDir) {
-            var type = this.state.filters[sortBy].type, sortDir = this.state.sortDir,
+        sortRowsBy: function(filteredRows, sortBy, switchDir) {
+            var type = this.state.filters[sortBy].type,
+                sortDir = this.state.sortDir,
                 SortTypes = this.SortTypes;
             if (switchDir) {
                 if (sortBy === this.state.sortBy) {
-                    sortDir = this.state.sortDir === SortTypes.ASC ? SortTypes.DESC : SortTypes.ASC;
+                    sortDir =
+                        this.state.sortDir === SortTypes.ASC
+                            ? SortTypes.DESC
+                            : SortTypes.ASC;
                 } else {
                     sortDir = SortTypes.DESC;
                 }
             }
 
-            filteredRows.sort(function (a, b) {
-                var sortVal = 0, aVal = a.row[sortBy], bVal = b.row[sortBy];
-                if (type == "NUMBER") {
-                    aVal = (aVal && !isNaN(aVal)) ? Number(aVal) : aVal;
-                    bVal = (bVal && !isNaN(bVal)) ? Number(bVal) : bVal;
+            filteredRows.sort(function(a, b) {
+                var sortVal = 0,
+                    aVal = a.row[sortBy],
+                    bVal = b.row[sortBy];
+                if (type == 'NUMBER') {
+                    aVal = aVal && !isNaN(aVal) ? Number(aVal) : aVal;
+                    bVal = bVal && !isNaN(bVal) ? Number(bVal) : bVal;
                 }
                 if (type == 'PERCENTAGE') {
                     aVal = aVal ? Number(aVal.replace('%', '')) : aVal;
                     bVal = bVal ? Number(bVal.replace('%', '')) : bVal;
                 }
-                if (typeof aVal != "undefined" && !isNaN(aVal) && typeof bVal != "undefined" && !isNaN(bVal)) {
+                if (
+                    typeof aVal != 'undefined' &&
+                    !isNaN(aVal) &&
+                    typeof bVal != 'undefined' &&
+                    !isNaN(bVal)
+                ) {
                     if (aVal > bVal) {
                         sortVal = 1;
                     }
@@ -879,13 +1054,15 @@ var EnhancedFixedDataTable = (function () {
                     if (sortDir === SortTypes.ASC) {
                         sortVal = sortVal * -1;
                     }
-                } else if (typeof aVal != "undefined" && typeof bVal != "undefined") {
+                } else if (
+                    typeof aVal != 'undefined' &&
+                    typeof bVal != 'undefined'
+                ) {
                     if (!isNaN(aVal)) {
                         sortVal = -1;
                     } else if (!isNaN(bVal)) {
                         sortVal = 1;
-                    }
-                    else {
+                    } else {
                         if (aVal > bVal) {
                             sortVal = 1;
                         }
@@ -899,29 +1076,28 @@ var EnhancedFixedDataTable = (function () {
                     }
                 } else if (aVal) {
                     sortVal = -1;
-                }
-                else {
+                } else {
                     sortVal = 1;
                 }
 
                 return sortVal;
             });
 
-            return {filteredRows: filteredRows, sortDir: sortDir};
+            return { filteredRows: filteredRows, sortDir: sortDir };
         },
 
         // Sorts and sets state
-        sortNSet: function (sortBy) {
+        sortNSet: function(sortBy) {
             var result = this.sortRowsBy(this.state.filteredRows, sortBy, true);
             this.setState({
                 filteredRows: result.filteredRows,
                 sortBy: sortBy,
-                sortDir: result.sortDir
+                sortDir: result.sortDir,
             });
         },
 
         // Filters, sorts and sets state
-        filterSortNSet: function (filterAll, filters, sortBy) {
+        filterSortNSet: function(filterAll, filters, sortBy) {
             var filteredRows = this.filterRowsBy(filterAll, filters);
             var result = this.sortRowsBy(filteredRows, sortBy, false);
             this.setState({
@@ -929,24 +1105,26 @@ var EnhancedFixedDataTable = (function () {
                 sortBy: sortBy,
                 sortDir: result.sortDir,
                 filterAll: filterAll,
-                filters: filters
+                filters: filters,
             });
         },
 
         // Operations when filter keyword changes
-        onFilterKeywordChange: function (e) {
+        onFilterKeywordChange: function(e) {
             ++this.state.filterTimer;
 
             //Disable event pooling in react, see https://goo.gl/1mq6qI
             e.persist();
 
             var self = this;
-            var id = setTimeout(function () {
-                var filterAll = self.state.filterAll, filters = self.state.filters;
-                if (e.target.getAttribute("data-column") == "all") {
+            var id = setTimeout(function() {
+                var filterAll = self.state.filterAll,
+                    filters = self.state.filters;
+                if (e.target.getAttribute('data-column') == 'all') {
                     filterAll = e.target.value;
                 } else {
-                    filters[e.target.getAttribute("data-column")].key = e.target.value;
+                    filters[e.target.getAttribute('data-column')].key =
+                        e.target.value;
                 }
                 self.filterSortNSet(filterAll, filters, self.state.sortBy);
                 --self.state.filterTimer;
@@ -959,15 +1137,19 @@ var EnhancedFixedDataTable = (function () {
         },
 
         // Operations when filter range changes
-        onFilterRangeChange: function (column, min, max) {
+        onFilterRangeChange: function(column, min, max) {
             ++this.state.filterTimer;
 
             var self = this;
-            var id = setTimeout(function () {
+            var id = setTimeout(function() {
                 var filters = self.state.filters;
                 filters[column].min = min;
                 filters[column].max = max;
-                self.filterSortNSet(self.state.filterAll, filters, self.state.sortBy);
+                self.filterSortNSet(
+                    self.state.filterAll,
+                    filters,
+                    self.state.sortBy
+                );
                 --self.state.filterTimer;
             }, 500);
 
@@ -978,9 +1160,9 @@ var EnhancedFixedDataTable = (function () {
         },
 
         // Operations when reset all filters
-        onResetFilters: function () {
+        onResetFilters: function() {
             var filters = this.state.filters;
-            _.each(filters, function (filter) {
+            _.each(filters, function(filter) {
                 if (!_.isUndefined(filter._key)) {
                     filter.key = filter._key;
                 }
@@ -998,28 +1180,31 @@ var EnhancedFixedDataTable = (function () {
             this.filterSortNSet('', filters, this.state.sortBy);
         },
 
-        updateCols: function (cols, filters) {
+        updateCols: function(cols, filters) {
             var filteredRows = this.filterRowsBy(this.state.filterAll, filters);
-            var result = this.sortRowsBy(filteredRows, this.state.sortBy, false);
+            var result = this.sortRowsBy(
+                filteredRows,
+                this.state.sortBy,
+                false
+            );
             this.setState({
                 cols: cols,
                 filteredRows: result.filteredRows,
-                filters: filters
+                filters: filters,
             });
             if (this.props.groupHeader) {
                 this.registerSliders();
             }
         },
 
-        updateGoToColumn: function (val) {
+        updateGoToColumn: function(val) {
             this.setState({
-                goToColumn: val
+                goToColumn: val,
             });
         },
 
-        registerSliders: function () {
-
-            console.log("RESTORE registerSliders !!!!!!");
+        registerSliders: function() {
+            console.log('RESTORE registerSliders !!!!!!');
             return;
             /*
             var onFilterRangeChange = this.onFilterRangeChange;
@@ -1057,14 +1242,25 @@ var EnhancedFixedDataTable = (function () {
             */
         },
         // Processes input data, and initializes table states
-        getInitialState: function () {
-            var cols = [], rows = [], rowsDict = {}, attributes = this.props.input.attributes,
-                data = this.props.input.data, dataLength = data.length, col, cell, i, filters = {},
-                uniqueId = this.props.uniqueId || 'id', newCol,
-                measureMethod = (dataLength > 100000 || !this.props.autoColumnWidth) ? 'charNum' : 'jquery',
+        getInitialState: function() {
+            var cols = [],
+                rows = [],
+                rowsDict = {},
+                attributes = this.props.input.attributes,
+                data = this.props.input.data,
+                dataLength = data.length,
+                col,
+                cell,
+                i,
+                filters = {},
+                uniqueId = this.props.uniqueId || 'id',
+                newCol,
+                measureMethod =
+                    dataLength > 100000 || !this.props.autoColumnWidth
+                        ? 'charNum'
+                        : 'jquery',
                 columnMinWidth = this.props.groupHeader ? 130 : 50; //The minimum width to at least fit in number slider.
 
-
             // Gets column info from input
             var colsDict = {};
             for (i = 0; i < attributes.length; i++) {
@@ -1074,7 +1270,7 @@ var EnhancedFixedDataTable = (function () {
                     name: col.attr_id,
                     type: col.datatype,
                     fixed: false,
-                    show: true
+                    show: true,
                 };
 
                 if (col.hasOwnProperty('column_width')) {
@@ -1102,7 +1298,7 @@ var EnhancedFixedDataTable = (function () {
                 rowsDict[cell[uniqueId]][cell.attr_id] = cell.attr_val;
             }
 
-            _.each(rowsDict, function (item, i) {
+            _.each(rowsDict, function(item, i) {
                 rowsDict[i][uniqueId] = i;
                 rows.push(rowsDict[i]);
             });
@@ -1112,14 +1308,17 @@ var EnhancedFixedDataTable = (function () {
                 col = cols[i];
                 var _filter = {
                     type: col.type,
-                    hide: !col.show
+                    hide: !col.show,
                 };
 
-                if (col.type == "NUMBER" || col.type == "PERCENTAGE") {
-                    var min = Number.MAX_VALUE, max = -Number.MAX_VALUE;
+                if (col.type == 'NUMBER' || col.type == 'PERCENTAGE') {
+                    var min = Number.MAX_VALUE,
+                        max = -Number.MAX_VALUE;
                     for (var j = 0; j < rows.length; j++) {
-                        cell = _.isUndefined(rows[j][col.name]) ? rows[j][col.name] : rows[j][col.name].toString().replace('%');
-                        if (typeof cell != "undefined" && !isNaN(cell)) {
+                        cell = _.isUndefined(rows[j][col.name])
+                            ? rows[j][col.name]
+                            : rows[j][col.name].toString().replace('%');
+                        if (typeof cell != 'undefined' && !isNaN(cell)) {
                             cell = Number(cell);
                             max = cell > max ? cell : max;
                             min = cell < min ? cell : min;
@@ -1144,7 +1343,7 @@ var EnhancedFixedDataTable = (function () {
             }
 
             if (this.props.columnSorting) {
-                cols = _.sortBy(cols, function (obj) {
+                cols = _.sortBy(cols, function(obj) {
                     if (!_.isUndefined(obj.displayName)) {
                         return obj.displayName;
                     } else {
@@ -1155,14 +1354,24 @@ var EnhancedFixedDataTable = (function () {
 
             this.rows = rows;
 
-            var columnWidths = this.getColumnWidth(cols, rows, measureMethod, columnMinWidth);
-            var shortLabels = this.getShortLabels(rows, cols, columnWidths, measureMethod);
+            var columnWidths = this.getColumnWidth(
+                cols,
+                rows,
+                measureMethod,
+                columnMinWidth
+            );
+            var shortLabels = this.getShortLabels(
+                rows,
+                cols,
+                columnWidths,
+                measureMethod
+            );
 
             return {
                 cols: cols,
                 rowsSize: rows.length,
                 filteredRows: null,
-                filterAll: "",
+                filterAll: '',
                 filters: filters,
                 sortBy: uniqueId,
                 sortDir: this.SortTypes.DESC,
@@ -1171,21 +1380,25 @@ var EnhancedFixedDataTable = (function () {
                 shortLabels: shortLabels,
                 columnWidths: columnWidths,
                 columnMinWidth: columnMinWidth,
-                measureMethod: measureMethod
+                measureMethod: measureMethod,
             };
         },
 
         // Initializes filteredRows before first rendering
-        componentWillMount: function () {
-            this.filterSortNSet(this.state.filterAll, this.state.filters, this.state.sortBy);
+        componentWillMount: function() {
+            this.filterSortNSet(
+                this.state.filterAll,
+                this.state.filters,
+                this.state.sortBy
+            );
         },
 
         //Will be triggered if the column width has been changed
-        onColumnResizeEndCallback: function (width, key) {
+        onColumnResizeEndCallback: function(width, key) {
             var foundMatch = false;
             var cols = this.state.cols;
 
-            _.each(cols, function (col, attr) {
+            _.each(cols, function(col, attr) {
                 if (col.name === key) {
                     col.width = width;
                     foundMatch = true;
@@ -1194,27 +1407,32 @@ var EnhancedFixedDataTable = (function () {
             if (foundMatch) {
                 var columnWidths = this.state.columnWidths;
                 columnWidths[key] = width;
-                var shortLabels = this.getShortLabels(this.rows, cols, columnWidths, this.state.measureMethod);
+                var shortLabels = this.getShortLabels(
+                    this.rows,
+                    cols,
+                    columnWidths,
+                    this.state.measureMethod
+                );
                 this.setState({
                     columnWidths: columnWidths,
                     shortLabels: shortLabels,
-                    cols: cols
+                    cols: cols,
                 });
             }
         },
 
         // Activates range sliders after first rendering
-        componentDidMount: function () {
+        componentDidMount: function() {
             if (this.props.groupHeader) {
                 this.registerSliders();
             }
         },
 
         // Sets default properties
-        getDefaultProps: function () {
+        getDefaultProps: function() {
             return {
-                filter: "NONE",
-                download: "NONE",
+                filter: 'NONE',
+                download: 'NONE',
                 showHide: false,
                 hideFilter: true,
                 scroller: false,
@@ -1224,64 +1442,68 @@ var EnhancedFixedDataTable = (function () {
                 autoColumnWidth: true,
                 columnMaxWidth: 300,
                 columnSorting: true,
-                isResizable: false
+                isResizable: false,
             };
         },
 
-        render: function () {
-            var sortDirArrow = this.state.sortDir === this.SortTypes.DESC ? 'fa fa-sort-desc' : 'fa fa-sort-asc';
-
-            return (
-                React.createElement("div", {className: styles.table},
-
-                    React.createElement(TablePrefix, {
-                            cols: this.state.cols, rows: this.rows,
-                            onFilterKeywordChange: this.onFilterKeywordChange,
-                            onResetFilters: this.onResetFilters,
-                            filters: this.state.filters,
-                            updateCols: this.updateCols,
-                            updateGoToColumn: this.updateGoToColumn,
-                            scroller: this.props.scroller,
-                            filter: this.props.filter,
-                            hideFilter: this.props.hideFilter,
-                            getData: this.props.download,
-                            downloadFileName: this.props.downloadFileName,
-                            hider: this.props.showHide,
-                            fixedChoose: this.props.fixedChoose,
-                            resultInfo: this.props.resultInfo,
-                            rowsSize: this.state.rowsSize,
-                            filteredRowsSize: this.state.filteredRows.length
-                        }
-                    )
-                    ,
-                    React.createElement("div", {className: "EFDT-tableMain"},
-                        React.createElement(TableMainPart, {
-                                cols: this.state.cols,
-                                filteredRows: this.state.filteredRows,
-                                filters: this.state.filters,
-                                sortNSet: this.sortNSet,
-                                onFilterKeywordChange: this.onFilterKeywordChange,
-                                goToColumn: this.state.goToColumn,
-                                sortBy: this.state.sortBy,
-                                sortDirArrow: sortDirArrow,
-                                filterAll: this.state.filterAll,
-                                filter: this.props.filter,
-                                rowHeight: this.props.rowHeight,
-                                tableWidth: this.props.tableWidth,
-                                maxHeight: this.props.maxHeight,
-                                headerHeight: this.props.headerHeight,
-                                groupHeaderHeight: this.props.groupHeaderHeight,
-                                groupHeader: this.props.groupHeader,
-                                shortLabels: this.state.shortLabels,
-                                columnWidths: this.state.columnWidths,
-                                isResizable: this.props.isResizable,
-                                onColumnResizeEndCallback: this.onColumnResizeEndCallback
-                            }
-                        )
-                    )
+        render: function() {
+            var sortDirArrow =
+                this.state.sortDir === this.SortTypes.DESC
+                    ? 'fa fa-sort-desc'
+                    : 'fa fa-sort-asc';
+
+            return React.createElement(
+                'div',
+                { className: styles.table },
+
+                React.createElement(TablePrefix, {
+                    cols: this.state.cols,
+                    rows: this.rows,
+                    onFilterKeywordChange: this.onFilterKeywordChange,
+                    onResetFilters: this.onResetFilters,
+                    filters: this.state.filters,
+                    updateCols: this.updateCols,
+                    updateGoToColumn: this.updateGoToColumn,
+                    scroller: this.props.scroller,
+                    filter: this.props.filter,
+                    hideFilter: this.props.hideFilter,
+                    getData: this.props.download,
+                    downloadFileName: this.props.downloadFileName,
+                    hider: this.props.showHide,
+                    fixedChoose: this.props.fixedChoose,
+                    resultInfo: this.props.resultInfo,
+                    rowsSize: this.state.rowsSize,
+                    filteredRowsSize: this.state.filteredRows.length,
+                }),
+                React.createElement(
+                    'div',
+                    { className: 'EFDT-tableMain' },
+                    React.createElement(TableMainPart, {
+                        cols: this.state.cols,
+                        filteredRows: this.state.filteredRows,
+                        filters: this.state.filters,
+                        sortNSet: this.sortNSet,
+                        onFilterKeywordChange: this.onFilterKeywordChange,
+                        goToColumn: this.state.goToColumn,
+                        sortBy: this.state.sortBy,
+                        sortDirArrow: sortDirArrow,
+                        filterAll: this.state.filterAll,
+                        filter: this.props.filter,
+                        rowHeight: this.props.rowHeight,
+                        tableWidth: this.props.tableWidth,
+                        maxHeight: this.props.maxHeight,
+                        headerHeight: this.props.headerHeight,
+                        groupHeaderHeight: this.props.groupHeaderHeight,
+                        groupHeader: this.props.groupHeader,
+                        shortLabels: this.state.shortLabels,
+                        columnWidths: this.state.columnWidths,
+                        isResizable: this.props.isResizable,
+                        onColumnResizeEndCallback: this
+                            .onColumnResizeEndCallback,
+                    })
                 )
             );
-        }
+        },
     });
 
     return Main;
diff --git a/src/shared/components/enhancedFixedDataTable/styles.css b/src/shared/components/enhancedFixedDataTable/styles.css
index 1c32365af09..0a65f76b13c 100644
--- a/src/shared/components/enhancedFixedDataTable/styles.css
+++ b/src/shared/components/enhancedFixedDataTable/styles.css
@@ -1,20 +1,24 @@
 .public_fixedDataTableCell_main {
-    border-color:transparent;
+    border-color: transparent;
 }
 
-.public_fixedDataTableRow_highlighted, .public_fixedDataTableRow_highlighted .public_fixedDataTableCell_main {
-background-color:#f9f9f9;
+.public_fixedDataTableRow_highlighted,
+.public_fixedDataTableRow_highlighted .public_fixedDataTableCell_main {
+    background-color: #f9f9f9;
 }
 
-.public_fixedDataTable_main, .public_fixedDataTable_header, .public_fixedDataTable_hasBottomBorder {
-    border:none;
+.public_fixedDataTable_main,
+.public_fixedDataTable_header,
+.public_fixedDataTable_hasBottomBorder {
+    border: none;
 }
 
 .public_fixedDataTableRow_main {
-    border-bottom:1px solid #ddd;
+    border-bottom: 1px solid #ddd;
 }
 
-.public_fixedDataTable_header, .public_fixedDataTable_header .public_fixedDataTableCell_main {
-    background:none !important;
-    background-image:none !important;
-}
\ No newline at end of file
+.public_fixedDataTable_header,
+.public_fixedDataTable_header .public_fixedDataTableCell_main {
+    background: none !important;
+    background-image: none !important;
+}
diff --git a/src/shared/components/enhancedFixedDataTable/styles.module.scss b/src/shared/components/enhancedFixedDataTable/styles.module.scss
index fdb93db7aa2..bf18f3a1167 100644
--- a/src/shared/components/enhancedFixedDataTable/styles.module.scss
+++ b/src/shared/components/enhancedFixedDataTable/styles.module.scss
@@ -1,42 +1,35 @@
 .table {
-    display:inline-block;
-
+    display: inline-block;
 }
 
 .headerFilters {
-    width:200px;
+    width: 200px;
 }
 
 .tableControls {
-    margin-bottom:10px;
+    margin-bottom: 10px;
 }
 
 .resultInfo {
-    text-align:center;
-    padding:8px;
+    text-align: center;
+    padding: 8px;
 }
 
 .sortHeaderButton {
-    text-decoration:none !important;
-    cursor:pointer;
+    text-decoration: none !important;
+    cursor: pointer;
 }
 
 .searchWrapper {
-
-    position:relative;
+    position: relative;
 
     i {
-        position:absolute;
-        left:10px;
-        top:10px;
+        position: absolute;
+        left: 10px;
+        top: 10px;
     }
 
     > input {
-       padding-left:28px;
+        padding-left: 28px;
     }
-
 }
-
-
-
-
diff --git a/src/shared/components/enhancedReactTable/EnhancedReactTable.spec.tsx b/src/shared/components/enhancedReactTable/EnhancedReactTable.spec.tsx
index a868f7a1a85..44209361c87 100644
--- a/src/shared/components/enhancedReactTable/EnhancedReactTable.spec.tsx
+++ b/src/shared/components/enhancedReactTable/EnhancedReactTable.spec.tsx
@@ -5,17 +5,9 @@ import { shallow, mount } from 'enzyme';
 import sinon from 'sinon';
 
 describe('EnhancedReactTable', () => {
+    before(() => {});
 
-    before(()=>{
-
-    });
-
-    after(()=>{
-
-    });
-
-    it('what does it do?', ()=>{
-
-    });
+    after(() => {});
 
+    it('what does it do?', () => {});
 });
diff --git a/src/shared/components/enhancedReactTable/EnhancedReactTable.tsx b/src/shared/components/enhancedReactTable/EnhancedReactTable.tsx
index 56be5476d3a..491e9673b4d 100644
--- a/src/shared/components/enhancedReactTable/EnhancedReactTable.tsx
+++ b/src/shared/components/enhancedReactTable/EnhancedReactTable.tsx
@@ -1,23 +1,35 @@
 import * as React from 'react';
-import { createSelector } from "reselect";
-import {Table, Th, Tr, Td, Thead } from "reactable";
-import {DefaultTooltip} from 'cbioportal-frontend-commons';
+import { createSelector } from 'reselect';
+import { Table, Th, Tr, Td, Thead } from 'reactable';
+import { DefaultTooltip } from 'cbioportal-frontend-commons';
 import * as _ from 'lodash';
-import TableHeaderControls from "shared/components/tableHeaderControls/TableHeaderControls";
+import TableHeaderControls from 'shared/components/tableHeaderControls/TableHeaderControls';
 import {
-    IEnhancedReactTableProps, IColumnDefMap, IEnhancedReactTableColumnDef, IColumnVisibilityState,
-    IEnhancedReactTableState, IColumnVisibilityDef, IColumnSort, IColumnFilter
-} from "./IEnhancedReactTableProps";
+    IEnhancedReactTableProps,
+    IColumnDefMap,
+    IEnhancedReactTableColumnDef,
+    IColumnVisibilityState,
+    IEnhancedReactTableState,
+    IColumnVisibilityDef,
+    IColumnSort,
+    IColumnFilter,
+} from './IEnhancedReactTableProps';
 import {
-    IColumnFormatterData, IColumnSortFunction, IColumnFilterFunction, IColumnVisibilityFunction, ColumnVisibility
-} from "./IColumnFormatter";
+    IColumnFormatterData,
+    IColumnSortFunction,
+    IColumnFilterFunction,
+    IColumnVisibilityFunction,
+    ColumnVisibility,
+} from './IColumnFormatter';
 import './styles.css';
 
 /**
  * @author Selcuk Onur Sumer
  */
-export default class EnhancedReactTable<T> extends React.Component<IEnhancedReactTableProps<T>, IEnhancedReactTableState>
-{
+export default class EnhancedReactTable<T> extends React.Component<
+    IEnhancedReactTableProps<T>,
+    IEnhancedReactTableState
+> {
     /**
      * Resolves the visible columns and returns the state for the ones except "excluded".
      *
@@ -25,34 +37,36 @@ export default class EnhancedReactTable<T> extends React.Component<IEnhancedReac
      * @param tableData raw table data
      * @returns {IColumnVisibilityState} column visibility state for not excluded columns
      */
-    public static resolveVisibility<T>(columns:IColumnDefMap|undefined, tableData:Array<T>):IColumnVisibilityState
-    {
-        let visibilityState:IColumnVisibilityState = {};
+    public static resolveVisibility<T>(
+        columns: IColumnDefMap | undefined,
+        tableData: Array<T>
+    ): IColumnVisibilityState {
+        let visibilityState: IColumnVisibilityState = {};
 
         if (!columns) {
             return visibilityState;
         }
 
-        _.each(_.keys(columns), function(key:string) {
-            let column:IEnhancedReactTableColumnDef = columns[key];
+        _.each(_.keys(columns), function(key: string) {
+            let column: IEnhancedReactTableColumnDef = columns[key];
 
             // every column is visible by default unless otherwise marked as hidden or excluded
-            let visibility:ColumnVisibility = "visible";
+            let visibility: ColumnVisibility = 'visible';
 
-            if (column.visible)
-            {
+            if (column.visible) {
                 if (_.isFunction(column.visible)) {
-                    visibility = (column.visible as IColumnVisibilityFunction)(tableData, column.columnProps);
-                }
-                else {
+                    visibility = (column.visible as IColumnVisibilityFunction)(
+                        tableData,
+                        column.columnProps
+                    );
+                } else {
                     visibility = column.visible as ColumnVisibility;
                 }
             }
 
             // do not include "excluded" columns in the state, they will always remain hidden
             // ones set initially to "hidden" can be toggled visible later on.
-            if (visibility !== "excluded")
-            {
+            if (visibility !== 'excluded') {
                 visibilityState[key] = visibility;
             }
         });
@@ -60,82 +74,122 @@ export default class EnhancedReactTable<T> extends React.Component<IEnhancedReac
         return visibilityState;
     }
 
-    public static columnSort(a:IEnhancedReactTableColumnDef, b:IEnhancedReactTableColumnDef):number
-    {
+    public static columnSort(
+        a: IEnhancedReactTableColumnDef,
+        b: IEnhancedReactTableColumnDef
+    ): number {
         if (a.priority && b.priority) {
             return a.priority - b.priority;
-        }
-        else if (a.priority) {
+        } else if (a.priority) {
             return -1;
-        }
-        else if (b.priority) {
+        } else if (b.priority) {
             return 1;
         }
         // sort alphabetically in case of no priority
         else if (a.name > b.name) {
             return 1;
-        }
-        else {
+        } else {
             return -1;
         }
     }
 
     // mapping of column name to column id
-    private colNameToId:{[key:string]: string};
+    private colNameToId: { [key: string]: string };
 
-    private filteredDataLength:number;
+    private filteredDataLength: number;
 
-    private shouldSetState:boolean;
+    private shouldSetState: boolean;
 
-    private rawDataSelector = (state:IEnhancedReactTableState, props:IEnhancedReactTableProps<T>) => props.rawData;
+    private rawDataSelector = (
+        state: IEnhancedReactTableState,
+        props: IEnhancedReactTableProps<T>
+    ) => props.rawData;
 
-    private columnsSelector = (state:IEnhancedReactTableState, props:IEnhancedReactTableProps<T>) => props.columns;
+    private columnsSelector = (
+        state: IEnhancedReactTableState,
+        props: IEnhancedReactTableProps<T>
+    ) => props.columns;
 
-    private columnVisibilitySelector = (state:IEnhancedReactTableState) => state.columnVisibility;
+    private columnVisibilitySelector = (state: IEnhancedReactTableState) =>
+        state.columnVisibility;
 
     // visible columns depend on both column definitions and visibility
-    private visibleColsSelector = createSelector(this.columnsSelector, this.columnVisibilitySelector,
-        (columns:IColumnDefMap, columnVisibility:IColumnVisibilityState) => this.resolveVisible(columns, columnVisibility));
+    private visibleColsSelector = createSelector(
+        this.columnsSelector,
+        this.columnVisibilitySelector,
+        (columns: IColumnDefMap, columnVisibility: IColumnVisibilityState) =>
+            this.resolveVisible(columns, columnVisibility)
+    );
 
     // sorted list of visible columns are required to calculate table header
-    private sortedVisibleColsSelector = createSelector(this.visibleColsSelector,
-        (visibleCols:IColumnDefMap)=>this.resolveOrder(visibleCols));
+    private sortedVisibleColsSelector = createSelector(
+        this.visibleColsSelector,
+        (visibleCols: IColumnDefMap) => this.resolveOrder(visibleCols)
+    );
 
     // sorted columns depend on column definition, but not on the visibility
-    private sortedColsSelector = createSelector(this.columnsSelector,
-        (columns:IColumnDefMap)=>this.resolveOrder(columns));
-
-    private columnVisibilityArraySelector = createSelector(this.sortedColsSelector, this.columnVisibilitySelector,
-         (sortedColumns:Array<IEnhancedReactTableColumnDef>, columnVisibility:IColumnVisibilityState) =>
-             this.resolveColumnVisibility(this.colNameToId, sortedColumns, columnVisibility));
-
-    private downloadDataSelector = createSelector(this.sortedColsSelector, this.columnVisibilitySelector, this.rawDataSelector,
-        (sortedCols:Array<IEnhancedReactTableColumnDef>, visibility:IColumnVisibilityState, rawData:Array<T>) =>
-            this.generateDownloadData(sortedCols, visibility, rawData));
+    private sortedColsSelector = createSelector(
+        this.columnsSelector,
+        (columns: IColumnDefMap) => this.resolveOrder(columns)
+    );
+
+    private columnVisibilityArraySelector = createSelector(
+        this.sortedColsSelector,
+        this.columnVisibilitySelector,
+        (
+            sortedColumns: Array<IEnhancedReactTableColumnDef>,
+            columnVisibility: IColumnVisibilityState
+        ) =>
+            this.resolveColumnVisibility(
+                this.colNameToId,
+                sortedColumns,
+                columnVisibility
+            )
+    );
+
+    private downloadDataSelector = createSelector(
+        this.sortedColsSelector,
+        this.columnVisibilitySelector,
+        this.rawDataSelector,
+        (
+            sortedCols: Array<IEnhancedReactTableColumnDef>,
+            visibility: IColumnVisibilityState,
+            rawData: Array<T>
+        ) => this.generateDownloadData(sortedCols, visibility, rawData)
+    );
 
     // we need to calculate the header values every time the visibility or column definitions change
-    private headersSelector = createSelector(this.sortedVisibleColsSelector,
-        (sortedCols:Array<IEnhancedReactTableColumnDef>) => this.generateHeaders(sortedCols));
+    private headersSelector = createSelector(
+        this.sortedVisibleColsSelector,
+        (sortedCols: Array<IEnhancedReactTableColumnDef>) =>
+            this.generateHeaders(sortedCols)
+    );
 
     // no need to calculate column render values every time the visibility changes,
     // we only need to do it when the column definitions change
     // reactable is clever enough to not render the column if its header is missing
-    private rowsSelector = createSelector(this.sortedColsSelector, this.rawDataSelector,
-        (sortedCols:Array<IEnhancedReactTableColumnDef>, rawData:Array<T>) => this.generateRows(sortedCols, rawData));
-
-    constructor(props:IEnhancedReactTableProps<T>)
-    {
+    private rowsSelector = createSelector(
+        this.sortedColsSelector,
+        this.rawDataSelector,
+        (sortedCols: Array<IEnhancedReactTableColumnDef>, rawData: Array<T>) =>
+            this.generateRows(sortedCols, rawData)
+    );
+
+    constructor(props: IEnhancedReactTableProps<T>) {
         super(props);
 
         this.colNameToId = this.mapColNameToId(props.columns);
 
         this.state = {
-            columnVisibility: EnhancedReactTable.resolveVisibility(props.columns, props.rawData),
+            columnVisibility: EnhancedReactTable.resolveVisibility(
+                props.columns,
+                props.rawData
+            ),
             sortableColumns: this.resolveSortable(this.props.columns || {}),
             filterableColumns: this.resolveFilterable(this.props.columns || {}),
-            filter: "",
+            filter: '',
             itemsPerPage: this.props.initItemsPerPage || 25,
-            currentPage: this.props.initPage || 0
+            currentPage: this.props.initPage || 0,
         };
 
         // Begin code designed to get around the fact that data filtering happens inside Table
@@ -145,22 +199,26 @@ export default class EnhancedReactTable<T> extends React.Component<IEnhancedReac
         this.filteredDataLength = props.rawData.length;
         this.shouldSetState = false;
 
-        const setFilteredDataLength = (n:number) => {
+        const setFilteredDataLength = (n: number) => {
             if (n !== this.filteredDataLength) {
                 this.filteredDataLength = n;
                 this.shouldSetState = true;
             }
         };
 
-        const sendVisibleRows = (tableRenderResult:JSX.Element) => {
-            const tbodyElt = tableRenderResult.props.children.find((x:JSX.Element) => (x.type === "tbody"));
+        const sendVisibleRows = (tableRenderResult: JSX.Element) => {
+            const tbodyElt = tableRenderResult.props.children.find(
+                (x: JSX.Element) => x.type === 'tbody'
+            );
             const visibleRows = tbodyElt.props.children || [];
             if (this.props.onVisibleRowsChange)
-                this.props.onVisibleRowsChange(visibleRows.map((r:JSX.Element) => r.props.rowData));
+                this.props.onVisibleRowsChange(
+                    visibleRows.map((r: JSX.Element) => r.props.rowData)
+                );
         };
 
         const Table_applyFilter = Table.prototype.applyFilter;
-        Table.prototype.applyFilter = function(){
+        Table.prototype.applyFilter = function() {
             const result = Table_applyFilter.apply(this, arguments);
             setFilteredDataLength(result.length);
             return result;
@@ -177,21 +235,21 @@ export default class EnhancedReactTable<T> extends React.Component<IEnhancedReac
         this.handleDownload = this.handleDownload.bind(this);
         this.handleFilterInput = this.handleFilterInput.bind(this);
         this.handleVisibilityToggle = this.handleVisibilityToggle.bind(this);
-        this.handleChangeItemsPerPage = this.handleChangeItemsPerPage.bind(this);
+        this.handleChangeItemsPerPage = this.handleChangeItemsPerPage.bind(
+            this
+        );
         this.handlePreviousPageClick = this.handlePreviousPageClick.bind(this);
         this.handleNextPageClick = this.handleNextPageClick.bind(this);
     }
 
     public render() {
-        let {
-            className,
-            reactTableProps,
-            headerControlsProps
-        } = this.props;
+        let { className, reactTableProps, headerControlsProps } = this.props;
 
         // always use the initially sorted columns (this.sortedColumns),
         // otherwise already hidden columns will never appear in the dropdown menu!
-        let columnVisibility:Array<IColumnVisibilityDef> = this.columnVisibilityArraySelector(this.state, this.props);
+        let columnVisibility: Array<
+            IColumnVisibilityDef
+        > = this.columnVisibilityArraySelector(this.state, this.props);
 
         // column headers: an array of Th components
         const headers = this.headersSelector(this.state, this.props);
@@ -199,10 +257,9 @@ export default class EnhancedReactTable<T> extends React.Component<IEnhancedReac
         // table rows: an array of Tr components
         const rows = this.rowsSelector(this.state, this.props);
 
-        const {firstIndex, numIndexes} = this.rowIndexesOnPage();
-
+        const { firstIndex, numIndexes } = this.rowIndexesOnPage();
 
-        return(
+        return (
             <div className={className}>
                 <TableHeaderControls
                     showCopyAndDownload={true}
@@ -213,20 +270,25 @@ export default class EnhancedReactTable<T> extends React.Component<IEnhancedReac
                     downloadFilename="mutations.csv"
                     showSearch={true}
                     columnVisibilityProps={{
-                        className: "pull-right",
+                        className: 'pull-right',
                         /*columnVisibility,*/
-                        onColumnToggled: this.handleVisibilityToggle
+                        onColumnToggled: this.handleVisibilityToggle,
                     }}
                     paginationProps={{
-                        className: "pull-right",
-                        itemsPerPage:this.state.itemsPerPage,
+                        className: 'pull-right',
+                        itemsPerPage: this.state.itemsPerPage,
                         currentPage: this.state.currentPage,
                         onChangeItemsPerPage: this.handleChangeItemsPerPage,
                         onPreviousPageClick: this.handlePreviousPageClick,
                         onNextPageClick: this.handleNextPageClick,
-                        textBetweenButtons: `${this.filteredDataLength ? (firstIndex+1) : 0}-${firstIndex+numIndexes} of ${this.filteredDataLength}`,
-                        previousPageDisabled: (this.state.currentPage === 0),
-                        nextPageDisabled: (this.state.currentPage >= this.numPages()-1)
+                        textBetweenButtons: `${
+                            this.filteredDataLength ? firstIndex + 1 : 0
+                        }-${firstIndex + numIndexes} of ${
+                            this.filteredDataLength
+                        }`,
+                        previousPageDisabled: this.state.currentPage === 0,
+                        nextPageDisabled:
+                            this.state.currentPage >= this.numPages() - 1,
                     }}
                     {...headerControlsProps}
                 />
@@ -234,11 +296,14 @@ export default class EnhancedReactTable<T> extends React.Component<IEnhancedReac
                     sortable={this.state.sortableColumns}
                     filterable={this.state.filterableColumns}
                     filterBy={this.state.filter}
-                    itemsPerPage={this.state.itemsPerPage === -1 ? undefined : this.state.itemsPerPage}
+                    itemsPerPage={
+                        this.state.itemsPerPage === -1
+                            ? undefined
+                            : this.state.itemsPerPage
+                    }
                     currentPage={this.state.currentPage}
                     {...(reactTableProps as any)}
                 >
-
                     {headers}
 
                     {rows}
@@ -247,7 +312,10 @@ export default class EnhancedReactTable<T> extends React.Component<IEnhancedReac
         );
     }
 
-    componentWillUpdate(nextProps:IEnhancedReactTableProps<T>, nextState:IEnhancedReactTableState) {
+    componentWillUpdate(
+        nextProps: IEnhancedReactTableProps<T>,
+        nextState: IEnhancedReactTableState
+    ) {
         if (nextState.filter.length === 0) {
             // Normally, the way we update this.filteredDataLength is when Table.applyFilter is
             // called (see "monkey patching" of Table.prototype.applyFilter).
@@ -261,25 +329,31 @@ export default class EnhancedReactTable<T> extends React.Component<IEnhancedReac
         if (this.shouldSetState) {
             this.shouldSetState = false;
             this.setState({
-                currentPage: Math.max(0, Math.min(this.state.currentPage, this.numPages() - 1))
+                currentPage: Math.max(
+                    0,
+                    Math.min(this.state.currentPage, this.numPages() - 1)
+                ),
             } as IEnhancedReactTableState);
         }
     }
 
     private rowIndexesOnPage() {
-        let firstIndex:number;
-        let numIndexes:number;
+        let firstIndex: number;
+        let numIndexes: number;
         if (this.state.itemsPerPage === -1) {
             firstIndex = 0;
             numIndexes = this.filteredDataLength;
         } else {
             firstIndex = this.state.itemsPerPage * this.state.currentPage;
-            numIndexes = Math.min(this.filteredDataLength - firstIndex, this.state.itemsPerPage);
+            numIndexes = Math.min(
+                this.filteredDataLength - firstIndex,
+                this.state.itemsPerPage
+            );
         }
-        return {firstIndex, numIndexes};
+        return { firstIndex, numIndexes };
     }
 
-    private numPages(itemsPerPage?:number) {
+    private numPages(itemsPerPage?: number) {
         itemsPerPage = itemsPerPage || this.state.itemsPerPage;
         if (itemsPerPage === -1) {
             return 1;
@@ -288,13 +362,16 @@ export default class EnhancedReactTable<T> extends React.Component<IEnhancedReac
         }
     }
 
-    private mapColNameToId(columns:IColumnDefMap|undefined):{[key:string]: string}
-    {
-        let colNameToId:{[key:string]:string} = {};
+    private mapColNameToId(
+        columns: IColumnDefMap | undefined
+    ): { [key: string]: string } {
+        let colNameToId: { [key: string]: string } = {};
 
-        if (columns)
-        {
-            _.each(columns, function(value:IEnhancedReactTableColumnDef, key:string) {
+        if (columns) {
+            _.each(columns, function(
+                value: IEnhancedReactTableColumnDef,
+                key: string
+            ) {
                 if (value.name) {
                     if (colNameToId[value.name] != null) {
                         // TODO console.log("[EnhancedReactTable] Warning: Duplicate column name: " + value.name);
@@ -313,12 +390,12 @@ export default class EnhancedReactTable<T> extends React.Component<IEnhancedReac
      * @param columns
      * @returns {Array<IEnhancedReactTableColumnDef>}
      */
-    private resolveOrder(columns:IColumnDefMap|undefined):Array<IEnhancedReactTableColumnDef>
-    {
+    private resolveOrder(
+        columns: IColumnDefMap | undefined
+    ): Array<IEnhancedReactTableColumnDef> {
         if (columns) {
             return _.values(columns).sort(EnhancedReactTable.columnSort);
-        }
-        else {
+        } else {
             return [];
         }
     }
@@ -331,21 +408,21 @@ export default class EnhancedReactTable<T> extends React.Component<IEnhancedReac
      * @param columnVisibility
      * @returns {Array<IColumnVisibilityDef>}
      */
-    private resolveColumnVisibility(colNameToId:{[key:string]:string},
-                                    sortedCols:Array<IEnhancedReactTableColumnDef>,
-                                    columnVisibility: IColumnVisibilityState):Array<IColumnVisibilityDef>
-    {
-        let colVis:Array<IColumnVisibilityDef>  = [];
+    private resolveColumnVisibility(
+        colNameToId: { [key: string]: string },
+        sortedCols: Array<IEnhancedReactTableColumnDef>,
+        columnVisibility: IColumnVisibilityState
+    ): Array<IColumnVisibilityDef> {
+        let colVis: Array<IColumnVisibilityDef> = [];
 
-        _.each(sortedCols, function(col:IEnhancedReactTableColumnDef) {
-            let id:string = colNameToId[col.name];
+        _.each(sortedCols, function(col: IEnhancedReactTableColumnDef) {
+            let id: string = colNameToId[col.name];
 
-            if (columnVisibility[id])
-            {
+            if (columnVisibility[id]) {
                 colVis.push({
                     id,
                     name: col.name,
-                    visibility: columnVisibility[id]
+                    visibility: columnVisibility[id],
                 });
             }
         });
@@ -353,25 +430,25 @@ export default class EnhancedReactTable<T> extends React.Component<IEnhancedReac
         return colVis;
     }
 
-    private generateHeaders(columns:Array<IEnhancedReactTableColumnDef>)
-    {
-        let headers:Array<any> = [];
+    private generateHeaders(columns: Array<IEnhancedReactTableColumnDef>) {
+        let headers: Array<any> = [];
 
-        _.each(columns, function(columnDef:IEnhancedReactTableColumnDef) {
+        _.each(columns, function(columnDef: IEnhancedReactTableColumnDef) {
             // basic content (with no tooltip)
             let headerContent = columnDef.header || (
-                <span>
-                    {columnDef.name}
-                </span>
+                <span>{columnDef.name}</span>
             );
 
             // if description is provided, add a tooltip
-            if (columnDef.description)
-            {
-                const arrowContent = <div className="rc-tooltip-arrow-inner"/>;
+            if (columnDef.description) {
+                const arrowContent = <div className="rc-tooltip-arrow-inner" />;
 
                 headerContent = (
-                    <DefaultTooltip overlay={<span>{columnDef.description}</span>} placement="top" arrowContent={arrowContent}>
+                    <DefaultTooltip
+                        overlay={<span>{columnDef.description}</span>}
+                        placement="top"
+                        arrowContent={arrowContent}
+                    >
                         {headerContent}
                     </DefaultTooltip>
                 );
@@ -387,39 +464,50 @@ export default class EnhancedReactTable<T> extends React.Component<IEnhancedReac
         return headers;
     }
 
-    private generateDownloadData(columns:Array<IEnhancedReactTableColumnDef>,
-                                 visibility:IColumnVisibilityState,
-                                 tableData:Array<T>)
-    {
-        const tableDownloadData:string[][] = [];
+    private generateDownloadData(
+        columns: Array<IEnhancedReactTableColumnDef>,
+        visibility: IColumnVisibilityState,
+        tableData: Array<T>
+    ) {
+        const tableDownloadData: string[][] = [];
 
         // add header
         tableDownloadData[0] = [];
-        _.each(columns, (columnDef:IEnhancedReactTableColumnDef) => {
+        _.each(columns, (columnDef: IEnhancedReactTableColumnDef) => {
             const colId = this.colNameToId[columnDef.name];
 
             // don't include excluded columns
-            if (colId in visibility && visibility[colId] !== "excluded") {
+            if (colId in visibility && visibility[colId] !== 'excluded') {
                 tableDownloadData[0].push(columnDef.name);
             }
         });
 
         // add rows
-        _.each(tableData, (rowData:T, index:number) => {
-            const rowDownloadData:string[] = [];
+        _.each(tableData, (rowData: T, index: number) => {
+            const rowDownloadData: string[] = [];
 
-            _.each(columns, (columnDef:IEnhancedReactTableColumnDef) => {
+            _.each(columns, (columnDef: IEnhancedReactTableColumnDef) => {
                 const colId = this.colNameToId[columnDef.name];
 
                 // include both visible and hidden columns, but not the excluded ones
-                if (colId in visibility && visibility[colId] !== "excluded") {
-                    const columnData = this.getColumnData(columnDef, tableData, rowData);
+                if (colId in visibility && visibility[colId] !== 'excluded') {
+                    const columnData = this.getColumnData(
+                        columnDef,
+                        tableData,
+                        rowData
+                    );
 
                     if (columnDef.downloader) {
-                        rowDownloadData.push(columnDef.downloader(columnData, columnDef.columnProps));
-                    }
-                    else {
-                        rowDownloadData.push((columnData.columnData || "").toString());
+                        rowDownloadData.push(
+                            columnDef.downloader(
+                                columnData,
+                                columnDef.columnProps
+                            )
+                        );
+                    } else {
+                        rowDownloadData.push(
+                            (columnData.columnData || '').toString()
+                        );
                     }
                 }
             });
@@ -430,22 +518,23 @@ export default class EnhancedReactTable<T> extends React.Component<IEnhancedReac
         return tableDownloadData;
     }
 
-    private getColumnData(columnDef:IEnhancedReactTableColumnDef, tableData:Array<T>, rowData:T):IColumnFormatterData<T>
-    {
-        const data:IColumnFormatterData<T> = {
+    private getColumnData(
+        columnDef: IEnhancedReactTableColumnDef,
+        tableData: Array<T>,
+        rowData: T
+    ): IColumnFormatterData<T> {
+        const data: IColumnFormatterData<T> = {
             name: columnDef.name,
             tableData,
             rowData,
-            columnData: null
+            columnData: null,
         };
 
         // get column data (may end up being undefined)
         if (columnDef.columnDataFunction) {
             data.columnData = columnDef.columnDataFunction(data);
-        }
-        else if (columnDef.dataField)
-        {
-            let instance:any = null;
+        } else if (columnDef.dataField) {
+            let instance: any = null;
 
             // also taking into account that row data might be an array of instances
             if (_.isArray(data.rowData) && data.rowData.length > 0) {
@@ -453,8 +542,7 @@ export default class EnhancedReactTable<T> extends React.Component<IEnhancedReac
                 // element's data as the column data. For advanced combining of all elements' data,
                 // one needs to provide a custom columnData function.
                 instance = data.rowData[0];
-            }
-            else {
+            } else {
                 // assuming that rowData is a flat type instance
                 instance = data.rowData;
             }
@@ -467,11 +555,13 @@ export default class EnhancedReactTable<T> extends React.Component<IEnhancedReac
         return data;
     }
 
-    private generateRows(columns:Array<IEnhancedReactTableColumnDef>, tableData:Array<T>)
-    {
-        const rows:Array<any> = [];
+    private generateRows(
+        columns: Array<IEnhancedReactTableColumnDef>,
+        tableData: Array<T>
+    ) {
+        const rows: Array<any> = [];
 
-        _.each(tableData, (rowData:T, index:number) => {
+        _.each(tableData, (rowData: T, index: number) => {
             // columns for this row: an array of Td elements
             const cols = this.generateColumns(columns, tableData, rowData);
 
@@ -485,40 +575,52 @@ export default class EnhancedReactTable<T> extends React.Component<IEnhancedReac
         return rows;
     }
 
-    private generateColumns(columns:Array<IEnhancedReactTableColumnDef>, tableData:Array<T>, rowData:T)
-    {
-        const cols:Array<any> = [];
-
-        _.each(columns, (columnDef:IEnhancedReactTableColumnDef) => {
-            const columnData = this.getColumnData(columnDef, tableData, rowData);
+    private generateColumns(
+        columns: Array<IEnhancedReactTableColumnDef>,
+        tableData: Array<T>,
+        rowData: T
+    ) {
+        const cols: Array<any> = [];
+
+        _.each(columns, (columnDef: IEnhancedReactTableColumnDef) => {
+            const columnData = this.getColumnData(
+                columnDef,
+                tableData,
+                rowData
+            );
             cols.push(this.generateColumn(columnData, columnDef));
         });
 
         return cols;
     }
 
-    private generateColumn(data:IColumnFormatterData<T>, columnDef:IEnhancedReactTableColumnDef)
-    {
-        if (columnDef.formatter)
-        {
+    private generateColumn(
+        data: IColumnFormatterData<T>,
+        columnDef: IEnhancedReactTableColumnDef
+    ) {
+        if (columnDef.formatter) {
             return columnDef.formatter(data, columnDef.columnProps);
-        }
-        else
-        {
+        } else {
             return (
-                <Td key={columnDef.name} column={columnDef.name} value={data.columnData}>
+                <Td
+                    key={columnDef.name}
+                    column={columnDef.name}
+                    value={data.columnData}
+                >
                     {data.columnData}
                 </Td>
             );
         }
     }
 
-    private resolveVisible(columns:IColumnDefMap, visibility:IColumnVisibilityState):IColumnDefMap
-    {
-        let visibleCols:IColumnDefMap = {};
+    private resolveVisible(
+        columns: IColumnDefMap,
+        visibility: IColumnVisibilityState
+    ): IColumnDefMap {
+        let visibleCols: IColumnDefMap = {};
 
-        _.each(_.keys(visibility), function(key:string) {
-            if (visibility[key] === "visible") {
+        _.each(_.keys(visibility), function(key: string) {
+            if (visibility[key] === 'visible') {
                 visibleCols[key] = columns[key];
             }
         });
@@ -526,18 +628,18 @@ export default class EnhancedReactTable<T> extends React.Component<IEnhancedReac
         return visibleCols;
     }
 
-    private resolveSortable(columns:IColumnDefMap):Array<string|IColumnSort>
-    {
-        let sortable:Array<string|IColumnSort> = [];
+    private resolveSortable(
+        columns: IColumnDefMap
+    ): Array<string | IColumnSort> {
+        let sortable: Array<string | IColumnSort> = [];
 
-        _.each(columns, function(column:IEnhancedReactTableColumnDef) {
+        _.each(columns, function(column: IEnhancedReactTableColumnDef) {
             if (_.isFunction(column.sortable)) {
                 sortable.push({
                     column: column.name,
-                    sortFunction: column.sortable as IColumnSortFunction
+                    sortFunction: column.sortable as IColumnSortFunction,
                 });
-            }
-            else if (column.sortable) {
+            } else if (column.sortable) {
                 sortable.push(column.name);
             }
         });
@@ -545,18 +647,18 @@ export default class EnhancedReactTable<T> extends React.Component<IEnhancedReac
         return sortable;
     }
 
-    private resolveFilterable(columns:IColumnDefMap):Array<string|IColumnFilter>
-    {
-        let filterable:Array<string|IColumnFilter> = [];
+    private resolveFilterable(
+        columns: IColumnDefMap
+    ): Array<string | IColumnFilter> {
+        let filterable: Array<string | IColumnFilter> = [];
 
-        _.each(columns, function(column:IEnhancedReactTableColumnDef) {
+        _.each(columns, function(column: IEnhancedReactTableColumnDef) {
             if (_.isFunction(column.filterable)) {
                 filterable.push({
                     column: column.name,
-                    filterFunction: column.filterable as IColumnFilterFunction
+                    filterFunction: column.filterable as IColumnFilterFunction,
                 });
-            }
-            else if (column.filterable) {
+            } else if (column.filterable) {
                 filterable.push(column.name);
             }
         });
@@ -564,55 +666,59 @@ export default class EnhancedReactTable<T> extends React.Component<IEnhancedReac
         return filterable;
     }
 
-    private handleFilterInput(filter: string):void
-    {
+    private handleFilterInput(filter: string): void {
         this.setState({
-            filter
+            filter,
         } as IEnhancedReactTableState);
     }
 
-    private handleDownload():string[][]
-    {
+    private handleDownload(): string[][] {
         return this.downloadDataSelector(this.state, this.props);
     }
 
-    private handleVisibilityToggle(columnId: String):void
-    {
-        const key:string = columnId as string;
+    private handleVisibilityToggle(columnId: String): void {
+        const key: string = columnId as string;
 
-        let visibility:ColumnVisibility = this.state.columnVisibility[key];
-        const columnVisibility:IColumnVisibilityState = {...this.state.columnVisibility};
+        let visibility: ColumnVisibility = this.state.columnVisibility[key];
+        const columnVisibility: IColumnVisibilityState = {
+            ...this.state.columnVisibility,
+        };
 
-        if (visibility === "hidden") {
-            visibility = "visible";
-        }
-        else if (visibility === "visible") {
-            visibility = "hidden";
+        if (visibility === 'hidden') {
+            visibility = 'visible';
+        } else if (visibility === 'visible') {
+            visibility = 'hidden';
         }
 
         columnVisibility[key] = visibility;
 
         this.setState({
-            columnVisibility
+            columnVisibility,
         } as IEnhancedReactTableState);
     }
 
-    private handleChangeItemsPerPage(itemsPerPage:number) {
+    private handleChangeItemsPerPage(itemsPerPage: number) {
         this.setState({
             itemsPerPage,
-            currentPage: Math.min(this.state.currentPage, this.numPages(itemsPerPage)-1)
+            currentPage: Math.min(
+                this.state.currentPage,
+                this.numPages(itemsPerPage) - 1
+            ),
         } as IEnhancedReactTableState);
     }
 
     private handlePreviousPageClick() {
         this.setState({
-            currentPage: Math.max(0, this.state.currentPage - 1)
+            currentPage: Math.max(0, this.state.currentPage - 1),
         } as IEnhancedReactTableState);
     }
 
     private handleNextPageClick() {
         this.setState({
-            currentPage: Math.min(this.state.currentPage + 1, this.numPages() - 1)
+            currentPage: Math.min(
+                this.state.currentPage + 1,
+                this.numPages() - 1
+            ),
         } as IEnhancedReactTableState);
     }
-};
+}
diff --git a/src/shared/components/enhancedReactTable/IColumnFormatter.spec.tsx b/src/shared/components/enhancedReactTable/IColumnFormatter.spec.tsx
index 7e7c0ed4f4e..829737e7212 100644
--- a/src/shared/components/enhancedReactTable/IColumnFormatter.spec.tsx
+++ b/src/shared/components/enhancedReactTable/IColumnFormatter.spec.tsx
@@ -5,17 +5,9 @@ import { shallow, mount } from 'enzyme';
 import sinon from 'sinon';
 
 describe('IColumnFormatter', () => {
+    before(() => {});
 
-    before(()=>{
-
-    });
-
-    after(()=>{
-
-    });
-
-    it('what does it do?', ()=>{
-
-    });
+    after(() => {});
 
+    it('what does it do?', () => {});
 });
diff --git a/src/shared/components/enhancedReactTable/IColumnFormatter.ts b/src/shared/components/enhancedReactTable/IColumnFormatter.ts
index ce238762eae..958161d3b88 100644
--- a/src/shared/components/enhancedReactTable/IColumnFormatter.ts
+++ b/src/shared/components/enhancedReactTable/IColumnFormatter.ts
@@ -5,34 +5,34 @@ import * as React from 'react';
  */
 
 export interface IColumnFormatterData<T> {
-    name:string; // column name
-    tableData?:Array<any>; // entire table data (array of instances)
-    rowData?:any; // single instance representing the row data
-    columnData?:any; // column specific data
+    name: string; // column name
+    tableData?: Array<any>; // entire table data (array of instances)
+    rowData?: any; // single instance representing the row data
+    columnData?: any; // column specific data
 }
 
 export interface IColumnSortFunction {
-    (a:any, b:any):number;
+    (a: any, b: any): number;
 }
 
 export interface IColumnFilterFunction {
-    (contents:string, filter:string):boolean;
+    (contents: string, filter: string): boolean;
 }
 
 export interface IColumnRenderFunction {
-    <T>(data:IColumnFormatterData<T>, columnProps?:any):any; // TODO this should return Reactable.Td!
+    <T>(data: IColumnFormatterData<T>, columnProps?: any): any; // TODO this should return Reactable.Td!
 }
 
 export interface IColumnDownloadFunction {
-    <T>(data:IColumnFormatterData<T>, columnProps?:any):string;
+    <T>(data: IColumnFormatterData<T>, columnProps?: any): string;
 }
 
 export interface IColumnVisibilityFunction {
-    <T>(tableData:Array<T>, columnProps?:any):ColumnVisibility;
+    <T>(tableData: Array<T>, columnProps?: any): ColumnVisibility;
 }
 
 export interface IColumnDataFunction {
-    <T>(data:IColumnFormatterData<T>):any
+    <T>(data: IColumnFormatterData<T>): any;
 }
 
-export type ColumnVisibility = "visible" | "hidden" | "excluded";
+export type ColumnVisibility = 'visible' | 'hidden' | 'excluded';
diff --git a/src/shared/components/enhancedReactTable/IEnhancedReactTableProps.spec.tsx b/src/shared/components/enhancedReactTable/IEnhancedReactTableProps.spec.tsx
index 7f97aca39b7..e26bd79f589 100644
--- a/src/shared/components/enhancedReactTable/IEnhancedReactTableProps.spec.tsx
+++ b/src/shared/components/enhancedReactTable/IEnhancedReactTableProps.spec.tsx
@@ -5,17 +5,9 @@ import { shallow, mount } from 'enzyme';
 import sinon from 'sinon';
 
 describe('IEnhancedReactTableProps', () => {
+    before(() => {});
 
-    before(()=>{
-
-    });
-
-    after(()=>{
-
-    });
-
-    it('what does it do?', ()=>{
-
-    });
+    after(() => {});
 
+    it('what does it do?', () => {});
 });
diff --git a/src/shared/components/enhancedReactTable/IEnhancedReactTableProps.ts b/src/shared/components/enhancedReactTable/IEnhancedReactTableProps.ts
index 869f1f74d71..5322b01db5d 100644
--- a/src/shared/components/enhancedReactTable/IEnhancedReactTableProps.ts
+++ b/src/shared/components/enhancedReactTable/IEnhancedReactTableProps.ts
@@ -1,9 +1,14 @@
 import {
-    IColumnRenderFunction, IColumnSortFunction, IColumnFilterFunction, IColumnVisibilityFunction, ColumnVisibility,
-    IColumnDataFunction, IColumnDownloadFunction
-} from "./IColumnFormatter";
-import {ITableHeaderControlsProps} from "../tableHeaderControls/TableHeaderControls";
-import {TableProps} from "reactable";
+    IColumnRenderFunction,
+    IColumnSortFunction,
+    IColumnFilterFunction,
+    IColumnVisibilityFunction,
+    ColumnVisibility,
+    IColumnDataFunction,
+    IColumnDownloadFunction,
+} from './IColumnFormatter';
+import { ITableHeaderControlsProps } from '../tableHeaderControls/TableHeaderControls';
+import { TableProps } from 'reactable';
 
 /**
  * @author Selcuk Onur Sumer
@@ -15,18 +20,18 @@ export interface IEnhancedReactTableProps<T> {
     columns?: IColumnDefMap; // column definitions (including component renderers)
     rawData: Array<T>; // raw data
     initItemsPerPage?: number; // initial number of items per page
-    initPage?:number; // initial page
-    itemsName?:string; // name of items, e.g. "mutations"
-    onVisibleRowsChange?:(data:T[]) => void; // executed whenever the visible rows change (sorting or paginating), argument is the row data of visible rows, in order
+    initPage?: number; // initial page
+    itemsName?: string; // name of items, e.g. "mutations"
+    onVisibleRowsChange?: (data: T[]) => void; // executed whenever the visible rows change (sorting or paginating), argument is the row data of visible rows, in order
 }
 
 export interface IEnhancedReactTableState {
     columnVisibility: IColumnVisibilityState;
-    sortableColumns:Array<string|IColumnSort>;
-    filterableColumns:Array<string|IColumnFilter>;
+    sortableColumns: Array<string | IColumnSort>;
+    filterableColumns: Array<string | IColumnFilter>;
     filter: string;
-    itemsPerPage:number;
-    currentPage:number;
+    itemsPerPage: number;
+    currentPage: number;
 }
 
 export interface IColumnDefMap {
@@ -55,7 +60,7 @@ export interface IEnhancedReactTableColumnDef {
     priority?: number; // column priority (used for column ordering)
     columnProps?: any; // any additional column props (passed as argument to the formatter)
     dataField?: string; // data field to retrieve display data used for sorting (in case no formatter provided, otherwise ignored)
-    columnDataFunction?:IColumnDataFunction; // column data function to retrieve display data (in case no formatter provided)
+    columnDataFunction?: IColumnDataFunction; // column data function to retrieve display data (in case no formatter provided)
 }
 
 export type IColumnSort = {
diff --git a/src/shared/components/enhancedReactTable/styles.css b/src/shared/components/enhancedReactTable/styles.css
index a4032ee4bd3..2f6bb542294 100644
--- a/src/shared/components/enhancedReactTable/styles.css
+++ b/src/shared/components/enhancedReactTable/styles.css
@@ -1,3 +1,3 @@
 .reactable-pagination {
     display: none; /* hide the reactable library pagination interface, we have our own */
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/errorBox/ErrorBox.tsx b/src/shared/components/errorBox/ErrorBox.tsx
index bfd1c886157..b8fac4ceff8 100644
--- a/src/shared/components/errorBox/ErrorBox.tsx
+++ b/src/shared/components/errorBox/ErrorBox.tsx
@@ -1,33 +1,36 @@
 import * as React from 'react';
-import FontAwesome from "react-fontawesome";
+import FontAwesome from 'react-fontawesome';
 import * as styles_any from './styles.module.scss';
 import classNames from 'classnames';
 
-
 const styles = styles_any as {
-	error: string,
-	message: string,
-	icon: string,
+    error: string;
+    message: string;
+    icon: string;
 };
 
-interface ISectionHeaderProps extends React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>
-{
-	error: Error;
+interface ISectionHeaderProps
+    extends React.DetailedHTMLProps<
+        React.HTMLAttributes<HTMLDivElement>,
+        HTMLDivElement
+    > {
+    error: Error;
 }
 
-export default class ErrorBox extends React.Component<ISectionHeaderProps, {}>
-{
-	render()
-	{
-		let {error, children, className, ...divProps} = this.props;
-		return (
-			<div className={classNames(className, styles.error)} {...divProps}>
-				<span className={styles.message}>
-					<FontAwesome className={styles.icon} name='exclamation-circle'/>
-					{error.message + ''}
-				</span>
-				{children}
-			</div>
-		);
-	}
+export default class ErrorBox extends React.Component<ISectionHeaderProps, {}> {
+    render() {
+        let { error, children, className, ...divProps } = this.props;
+        return (
+            <div className={classNames(className, styles.error)} {...divProps}>
+                <span className={styles.message}>
+                    <FontAwesome
+                        className={styles.icon}
+                        name="exclamation-circle"
+                    />
+                    {error.message + ''}
+                </span>
+                {children}
+            </div>
+        );
+    }
 }
diff --git a/src/shared/components/errorBox/styles.module.scss b/src/shared/components/errorBox/styles.module.scss
index f21646f4a7c..98813d6f370 100644
--- a/src/shared/components/errorBox/styles.module.scss
+++ b/src/shared/components/errorBox/styles.module.scss
@@ -1,17 +1,17 @@
 .error {
-  color: #fff;
-  display: inline-block;
-  margin: 2px 2px 2px 0;
-  padding: 5px 10px;
-  border-radius: 2px;
-  background: $redError;
-
-  span.icon {
     color: #fff;
-    line-height: 17px;
-    margin: 0 5px 0 0;
-  }
+    display: inline-block;
+    margin: 2px 2px 2px 0;
+    padding: 5px 10px;
+    border-radius: 2px;
+    background: $redError;
+
+    span.icon {
+        color: #fff;
+        line-height: 17px;
+        margin: 0 5px 0 0;
+    }
 
-  .message {
-  }
+    .message {
+    }
 }
diff --git a/src/shared/components/errorScreen/ErrorScreen.tsx b/src/shared/components/errorScreen/ErrorScreen.tsx
index 2487e4af804..4e198a959ae 100644
--- a/src/shared/components/errorScreen/ErrorScreen.tsx
+++ b/src/shared/components/errorScreen/ErrorScreen.tsx
@@ -1,71 +1,82 @@
 import * as React from 'react';
-import {getBrowserWindow} from "cbioportal-frontend-commons";
-import {observer} from "mobx-react";
+import { getBrowserWindow } from 'cbioportal-frontend-commons';
+import { observer } from 'mobx-react';
 import './errorScreen.scss';
-import AppConfig from "appConfig";
-import {buildCBioPortalPageUrl} from "shared/api/urls";
+import AppConfig from 'appConfig';
+import { buildCBioPortalPageUrl } from 'shared/api/urls';
 import { If, Then, Else } from 'react-if';
 
 interface IErrorScreenProps {
-    errorLog?:string;
-    title?:string;
-    body?:string|JSX.Element;
-    errorMessages?:string[];
+    errorLog?: string;
+    title?: string;
+    body?: string | JSX.Element;
+    errorMessages?: string[];
 }
 
 @observer
-export default class ErrorScreen extends React.Component<IErrorScreenProps, {}> {
-
-    public render(){
-
+export default class ErrorScreen extends React.Component<
+    IErrorScreenProps,
+    {}
+> {
+    public render() {
         const location = getBrowserWindow().location.href;
-        const subject = "cBioPortal user reported error";
+        const subject = 'cBioPortal user reported error';
 
         return (
-            <div className={"errorScreen"}>
-
-                <a className={'errorLogo'} href={buildCBioPortalPageUrl("/")}><img src={require("../../../globalStyles/images/cbioportal_logo.png")} alt="cBioPortal Logo"/></a>
-
-                {
-                    this.props.title && <h4>{this.props.title}</h4>
-                }
-
-                {
-                    (this.props.errorMessages) && (
-                        <div style={{marginTop: 20}} className={"alert alert-danger"} role="alert">
-                            <ul style={{listStyleType: 'none'}}>
-                            {this.props.errorMessages.map((errorMessage: string, index) =>
-                                <li>{`${index + 1}: ${errorMessage}`}</li> )
-                            }
-                            </ul>
-                        </div>
-                    )
-                }
+            <div className={'errorScreen'}>
+                <a className={'errorLogo'} href={buildCBioPortalPageUrl('/')}>
+                    <img
+                        src={require('../../../globalStyles/images/cbioportal_logo.png')}
+                        alt="cBioPortal Logo"
+                    />
+                </a>
 
-                {
-                    (this.props.body) && (
-                        <div>{this.props.body}</div>
-                    )
-                }
+                {this.props.title && <h4>{this.props.title}</h4>}
 
-                {
-                    (AppConfig.serverConfig.skin_email_contact) && (
-                        <div style={{marginTop:20}}>
-                            If this error persists, please contact us at <a href={`mailto:${AppConfig.serverConfig.skin_email_contact}?subject=${encodeURIComponent(subject)}&body=${encodeURIComponent(this.props.errorLog||'')}`}>{AppConfig.serverConfig.skin_email_contact}</a>
-                        </div>
-                    )
-                }
+                {this.props.errorMessages && (
+                    <div
+                        style={{ marginTop: 20 }}
+                        className={'alert alert-danger'}
+                        role="alert"
+                    >
+                        <ul style={{ listStyleType: 'none' }}>
+                            {this.props.errorMessages.map(
+                                (errorMessage: string, index) => (
+                                    <li>{`${index + 1}: ${errorMessage}`}</li>
+                                )
+                            )}
+                        </ul>
+                    </div>
+                )}
 
-                {
-                    (this.props.errorLog) && (
-                        <div style={{marginTop:20}} className="form-group">
-                            <label>Error log:</label>
-                            <textarea value={this.props.errorLog} className={"form-control"}></textarea>
-                            </div>
-                    )
-                }
+                {this.props.body && <div>{this.props.body}</div>}
 
+                {AppConfig.serverConfig.skin_email_contact && (
+                    <div style={{ marginTop: 20 }}>
+                        If this error persists, please contact us at{' '}
+                        <a
+                            href={`mailto:${
+                                AppConfig.serverConfig.skin_email_contact
+                            }?subject=${encodeURIComponent(
+                                subject
+                            )}&body=${encodeURIComponent(
+                                this.props.errorLog || ''
+                            )}`}
+                        >
+                            {AppConfig.serverConfig.skin_email_contact}
+                        </a>
+                    </div>
+                )}
 
+                {this.props.errorLog && (
+                    <div style={{ marginTop: 20 }} className="form-group">
+                        <label>Error log:</label>
+                        <textarea
+                            value={this.props.errorLog}
+                            className={'form-control'}
+                        ></textarea>
+                    </div>
+                )}
             </div>
         );
     }
diff --git a/src/shared/components/errorScreen/errorScreen.scss b/src/shared/components/errorScreen/errorScreen.scss
index b209fcd4a65..e99e77c90e9 100644
--- a/src/shared/components/errorScreen/errorScreen.scss
+++ b/src/shared/components/errorScreen/errorScreen.scss
@@ -1,35 +1,34 @@
 .errorScreen {
-  position:absolute;
-  left:0;
-  right:0;
-  bottom:0;
-  top:0;
-  background:$body-bg;
-  min-height:300px;
-  padding:100px;
-  text-align:center;
-  z-index: 10;
+    position: absolute;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    top: 0;
+    background: $body-bg;
+    min-height: 300px;
+    padding: 100px;
+    text-align: center;
+    z-index: 10;
 
-  h4 {
-    margin:30px 0;
-    font-size:20px;
-  }
+    h4 {
+        margin: 30px 0;
+        font-size: 20px;
+    }
 
-  .errorLogo img {
-    height:50px;
-  }
+    .errorLogo img {
+        height: 50px;
+    }
 
-  p {
-    width:500px;
-    margin:auto;
-  }
-
-  textarea {
-    border:1px solid $borderColor;
-    width:500px !important;
-    padding:10px !important;
-    height:200px !important;
-    margin:0 auto;
-  }
+    p {
+        width: 500px;
+        margin: auto;
+    }
 
+    textarea {
+        border: 1px solid $borderColor;
+        width: 500px !important;
+        padding: 10px !important;
+        height: 200px !important;
+        margin: 0 auto;
+    }
 }
diff --git a/src/shared/components/featureTitle/FeatureTitle.spec.tsx b/src/shared/components/featureTitle/FeatureTitle.spec.tsx
index 91501570e15..a55bc7d4268 100644
--- a/src/shared/components/featureTitle/FeatureTitle.spec.tsx
+++ b/src/shared/components/featureTitle/FeatureTitle.spec.tsx
@@ -4,13 +4,7 @@ import { shallow, mount } from 'enzyme';
 import sinon from 'sinon';
 
 describe('', () => {
+    before(() => {});
 
-    before(()=>{
-
-    });
-
-    after(()=>{
-
-    });
-
+    after(() => {});
 });
diff --git a/src/shared/components/featureTitle/FeatureTitle.tsx b/src/shared/components/featureTitle/FeatureTitle.tsx
index e3b2741737e..ca430a47c6c 100644
--- a/src/shared/components/featureTitle/FeatureTitle.tsx
+++ b/src/shared/components/featureTitle/FeatureTitle.tsx
@@ -1,31 +1,40 @@
 import * as React from 'react';
-import {ThreeBounce} from 'better-react-spinkit';
+import { ThreeBounce } from 'better-react-spinkit';
 import { If, Else } from 'react-if';
-import {CSSProperties, DetailedHTMLProps} from "react";
-import LoadingIndicator from "../loadingIndicator/LoadingIndicator";
+import { CSSProperties, DetailedHTMLProps } from 'react';
+import LoadingIndicator from '../loadingIndicator/LoadingIndicator';
 
 export interface IFeatureTitleProps {
-    isLoading:boolean;
-    title:string;
-    className?:string;
-    style?:CSSProperties;
-    isHidden?:boolean;
+    isLoading: boolean;
+    title: string;
+    className?: string;
+    style?: CSSProperties;
+    isHidden?: boolean;
 }
 
-const style:CSSProperties = {
-  marginTop:0,
+const style: CSSProperties = {
+    marginTop: 0,
 };
 
-export default class FeatureTitle extends React.Component<IFeatureTitleProps, {}> {
-
+export default class FeatureTitle extends React.Component<
+    IFeatureTitleProps,
+    {}
+> {
     public render() {
-       return (
+        return (
             <If condition={this.props.isHidden}>
-
                 <Else>
-                    <h2 style={this.props.style || style} className={this.props.className || ''}>{this.props.title}
-                    <LoadingIndicator isLoading={this.props.isLoading} small={true}/>
-                </h2></Else>
+                    <h2
+                        style={this.props.style || style}
+                        className={this.props.className || ''}
+                    >
+                        {this.props.title}
+                        <LoadingIndicator
+                            isLoading={this.props.isLoading}
+                            small={true}
+                        />
+                    </h2>
+                </Else>
             </If>
         );
     }
diff --git a/src/shared/components/flexbox/FlexBox.tsx b/src/shared/components/flexbox/FlexBox.tsx
index ce54eae2f40..ce93173c3a5 100644
--- a/src/shared/components/flexbox/FlexBox.tsx
+++ b/src/shared/components/flexbox/FlexBox.tsx
@@ -7,43 +7,50 @@
 	one at https://mozilla.org/MPL/2.0/.
 */
 
-import * as React from "react";
+import * as React from 'react';
 import styles from './styles.module.scss';
 import classNames from 'classnames';
 
-export interface IFlexBoxProps <T> extends React.HTMLProps<T>
-{
-	flex?:number;
-	padded?:boolean;
-	overflow?:boolean;
+export interface IFlexBoxProps<T> extends React.HTMLProps<T> {
+    flex?: number;
+    padded?: boolean;
+    overflow?: boolean;
 }
 
-function renderBox<T>(props:IFlexBoxProps<T>, flexDirection:"row"|"column"):JSX.Element
-{
-	let {padded, overflow, flex, ...attributes} = props;
-	let style:React.CSSProperties = {
-		flex,
-		display: "flex",
-		overflow: overflow ? "visible" : "auto",
-		...props.style,
-		flexDirection
-	};
-	let className = classNames(props.className, styles[flexDirection], padded && styles.padded);
-	return <div {...attributes as React.HTMLAttributes<HTMLDivElement>} style={style} className={className}/>;
+function renderBox<T>(
+    props: IFlexBoxProps<T>,
+    flexDirection: 'row' | 'column'
+): JSX.Element {
+    let { padded, overflow, flex, ...attributes } = props;
+    let style: React.CSSProperties = {
+        flex,
+        display: 'flex',
+        overflow: overflow ? 'visible' : 'auto',
+        ...props.style,
+        flexDirection,
+    };
+    let className = classNames(
+        props.className,
+        styles[flexDirection],
+        padded && styles.padded
+    );
+    return (
+        <div
+            {...(attributes as React.HTMLAttributes<HTMLDivElement>)}
+            style={style}
+            className={className}
+        />
+    );
 }
 
-export class FlexRow extends React.Component<IFlexBoxProps<FlexRow>, {}>
-{
-	render():JSX.Element
-	{
-		return renderBox(this.props, "row");
-	}
+export class FlexRow extends React.Component<IFlexBoxProps<FlexRow>, {}> {
+    render(): JSX.Element {
+        return renderBox(this.props, 'row');
+    }
 }
 
-export class FlexCol extends React.Component<IFlexBoxProps<FlexCol>, {}>
-{
-	render():JSX.Element
-	{
-		return renderBox(this.props, "column");
-	}
+export class FlexCol extends React.Component<IFlexBoxProps<FlexCol>, {}> {
+    render(): JSX.Element {
+        return renderBox(this.props, 'column');
+    }
 }
diff --git a/src/shared/components/flexbox/styles.module.scss b/src/shared/components/flexbox/styles.module.scss
index 4d79c5e3b06..12413949e3d 100644
--- a/src/shared/components/flexbox/styles.module.scss
+++ b/src/shared/components/flexbox/styles.module.scss
@@ -1,16 +1,16 @@
 .padded.column {
-	> * {
-		margin-top: 8px;
-	}
-	> *:nth-child(1) {
-		margin-top: 0;
-	}
+    > * {
+        margin-top: 8px;
+    }
+    > *:nth-child(1) {
+        margin-top: 0;
+    }
 }
 .padded.row {
-	> * {
-		margin-left: 8px;
-	}
-	> *:nth-child(1) {
-		margin-left: 0;
-	}
+    > * {
+        margin-left: 8px;
+    }
+    > *:nth-child(1) {
+        margin-left: 0;
+    }
 }
diff --git a/src/shared/components/iframeLoader/IFrameLoader.tsx b/src/shared/components/iframeLoader/IFrameLoader.tsx
index 49c622a9eb6..7ca48162d05 100644
--- a/src/shared/components/iframeLoader/IFrameLoader.tsx
+++ b/src/shared/components/iframeLoader/IFrameLoader.tsx
@@ -1,13 +1,15 @@
 import * as React from 'react';
-import {ThreeBounce} from 'better-react-spinkit';
-import LoadingIndicator from "../loadingIndicator/LoadingIndicator";
-import {observer} from "mobx-react";
-import {observable} from "mobx";
-import autobind from "autobind-decorator";
+import { ThreeBounce } from 'better-react-spinkit';
+import LoadingIndicator from '../loadingIndicator/LoadingIndicator';
+import { observer } from 'mobx-react';
+import { observable } from 'mobx';
+import autobind from 'autobind-decorator';
 
 @observer
-export default class IFrameLoader extends React.Component<{ url:string; className?:string; iframeId?:string; height?:number }, {}> {
-
+export default class IFrameLoader extends React.Component<
+    { url: string; className?: string; iframeId?: string; height?: number },
+    {}
+> {
     @observable iframeLoaded = false;
 
     @autobind
@@ -16,19 +18,28 @@ export default class IFrameLoader extends React.Component<{ url:string; classNam
     }
 
     //NOTE: we need zindex to be higher than that of global loader
-    render(){
+    render() {
         return (
-            <div style={{position:'relative'}}>
-
-                <LoadingIndicator center={true} size={"big"} isLoading={!this.iframeLoaded}  />
-                <iframe id={this.props.iframeId||""}
-                        className={this.props.className||""}
-                        style={{ width:'100%', position:'relative', zIndex:100, height:this.props.height, border:'none'}}
-                        src={this.props.url}
-                        onLoad={this.onLoad}
-                >
-                </iframe>
+            <div style={{ position: 'relative' }}>
+                <LoadingIndicator
+                    center={true}
+                    size={'big'}
+                    isLoading={!this.iframeLoaded}
+                />
+                <iframe
+                    id={this.props.iframeId || ''}
+                    className={this.props.className || ''}
+                    style={{
+                        width: '100%',
+                        position: 'relative',
+                        zIndex: 100,
+                        height: this.props.height,
+                        border: 'none',
+                    }}
+                    src={this.props.url}
+                    onLoad={this.onLoad}
+                ></iframe>
             </div>
-        )
+        );
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/igv/IntegrativeGenomicsViewer.tsx b/src/shared/components/igv/IntegrativeGenomicsViewer.tsx
index 3b083e766db..7d1024208b5 100644
--- a/src/shared/components/igv/IntegrativeGenomicsViewer.tsx
+++ b/src/shared/components/igv/IntegrativeGenomicsViewer.tsx
@@ -1,37 +1,39 @@
-import * as _ from "lodash";
-import * as React from "react";
-import $ from "jquery";
+import * as _ from 'lodash';
+import * as React from 'react';
+import $ from 'jquery';
 import igv from 'igv/dist/igv.min.js';
-import autobind from "autobind-decorator";
+import autobind from 'autobind-decorator';
 
-import onNextRenderFrame from "shared/lib/onNextRenderFrame";
-import {getModifiedTrackNames, keyTracksByName} from "shared/lib/IGVUtils";
+import onNextRenderFrame from 'shared/lib/onNextRenderFrame';
+import { getModifiedTrackNames, keyTracksByName } from 'shared/lib/IGVUtils';
 
 export type TrackProps = any; // TODO add typedef for tracks
 
 type IGVProps = {
     genome?: string;
     tracks?: TrackProps[];
-    locus?: string|string[];
+    locus?: string | string[];
     disableSearch?: boolean;
     isVisible?: boolean;
-    onRenderingStart? : () => void;
+    onRenderingStart?: () => void;
     onRenderingComplete?: () => void;
 };
 
-export default class IntegrativeGenomicsViewer extends React.Component<IGVProps, {}> {
-
+export default class IntegrativeGenomicsViewer extends React.Component<
+    IGVProps,
+    {}
+> {
     public static defaultProps = {
-        genome: "hg19",
-        locus: "all",
-        disableSearch: false
+        genome: 'hg19',
+        locus: 'all',
+        disableSearch: false,
     };
 
-    private igvDiv: HTMLDivElement|undefined;
+    private igvDiv: HTMLDivElement | undefined;
     private igvBrowser: any;
 
-    private modifiedTrackNames: string[]|undefined;
-    private lastRenderedTracks: TrackProps[]|undefined;
+    private modifiedTrackNames: string[] | undefined;
+    private lastRenderedTracks: TrackProps[] | undefined;
 
     constructor(props: IGVProps) {
         super(props);
@@ -45,8 +47,7 @@ export default class IntegrativeGenomicsViewer extends React.Component<IGVProps,
         );
     }
 
-    public get tracksByName(): {[trackName: string]: TrackProps}
-    {
+    public get tracksByName(): { [trackName: string]: TrackProps } {
         return keyTracksByName(this.props.tracks);
     }
 
@@ -57,7 +58,7 @@ export default class IntegrativeGenomicsViewer extends React.Component<IGVProps,
 
         const browserProps = {
             genome: this.props.genome,
-            locus: this.props.locus
+            locus: this.props.locus,
         };
 
         igv.createBrowser(this.igvDiv, browserProps).then((browser: any) => {
@@ -86,13 +87,20 @@ export default class IntegrativeGenomicsViewer extends React.Component<IGVProps,
         if (nextProps.isVisible !== false) {
             // get a list of modified tracks, we are going to update only the modified ones
             const modifiedTrackNames = getModifiedTrackNames(
-                this.lastRenderedTracks || [], nextProps.tracks || []);
+                this.lastRenderedTracks || [],
+                nextProps.tracks || []
+            );
 
             const genomeChanged = this.props.genome !== nextProps.genome;
             const locusChanged = this.props.locus !== nextProps.locus;
-            const searchUpdated = this.props.disableSearch !== nextProps.disableSearch;
+            const searchUpdated =
+                this.props.disableSearch !== nextProps.disableSearch;
 
-            shouldUpdate = genomeChanged || modifiedTrackNames.length > 0 || locusChanged || searchUpdated;
+            shouldUpdate =
+                genomeChanged ||
+                modifiedTrackNames.length > 0 ||
+                locusChanged ||
+                searchUpdated;
 
             if (shouldUpdate) {
                 // update the class reference, since we need the modified tracks names in the componentDidUpdate method
@@ -110,9 +118,16 @@ export default class IntegrativeGenomicsViewer extends React.Component<IGVProps,
         }
 
         // update tracks
-        if (this.igvBrowser && this.modifiedTrackNames && this.modifiedTrackNames.length > 0)
-        {
-            this.updateTracks(this.igvBrowser, this.modifiedTrackNames, this.tracksByName);
+        if (
+            this.igvBrowser &&
+            this.modifiedTrackNames &&
+            this.modifiedTrackNames.length > 0
+        ) {
+            this.updateTracks(
+                this.igvBrowser,
+                this.modifiedTrackNames,
+                this.tracksByName
+            );
 
             this.modifiedTrackNames = undefined;
             // update the list of last rendered tracks after each update
@@ -125,23 +140,26 @@ export default class IntegrativeGenomicsViewer extends React.Component<IGVProps,
         }
     }
 
-    private loadTrackList(igvBrowser: any, tracks: TrackProps[] | undefined)
-    {
-        igvBrowser.loadTrackList(tracks).then(() => {
-            if (this.props.onRenderingComplete) {
-                this.props.onRenderingComplete();
-            }
-        }).catch(() => {
-            if (this.props.onRenderingComplete) {
-                this.props.onRenderingComplete();
-            }
-        });
+    private loadTrackList(igvBrowser: any, tracks: TrackProps[] | undefined) {
+        igvBrowser
+            .loadTrackList(tracks)
+            .then(() => {
+                if (this.props.onRenderingComplete) {
+                    this.props.onRenderingComplete();
+                }
+            })
+            .catch(() => {
+                if (this.props.onRenderingComplete) {
+                    this.props.onRenderingComplete();
+                }
+            });
     }
 
-    private updateTracks(igvBrowser: any,
-                         modifiedTrackNames: string[],
-                         tracksByName:  {[trackName: string]: TrackProps})
-    {
+    private updateTracks(
+        igvBrowser: any,
+        modifiedTrackNames: string[],
+        tracksByName: { [trackName: string]: TrackProps }
+    ) {
         // first, remove all tracks to update
         modifiedTrackNames.forEach(name => igvBrowser.removeTrackByName(name));
 
@@ -162,23 +180,23 @@ export default class IntegrativeGenomicsViewer extends React.Component<IGVProps,
         }
     }
 
-    private updateSearch(igvDiv: HTMLDivElement, disableSearch?: boolean)
-    {
-        const chrDropdown = $(igvDiv).find(".igv-chromosome-select-widget-container select");
-        const locusSearchBox = $(igvDiv).find(".igv-search-container input");
+    private updateSearch(igvDiv: HTMLDivElement, disableSearch?: boolean) {
+        const chrDropdown = $(igvDiv).find(
+            '.igv-chromosome-select-widget-container select'
+        );
+        const locusSearchBox = $(igvDiv).find('.igv-search-container input');
 
         if (disableSearch) {
-            locusSearchBox.attr("disabled", "true");
-            chrDropdown.attr("disabled", "true");
-        }
-        else {
-            locusSearchBox.attr("disabled", null);
-            chrDropdown.attr("disabled", null);
+            locusSearchBox.attr('disabled', 'true');
+            chrDropdown.attr('disabled', 'true');
+        } else {
+            locusSearchBox.attr('disabled', null);
+            chrDropdown.attr('disabled', null);
         }
     }
 
     @autobind
-    private igvDivRefHandler(div:HTMLDivElement) {
+    private igvDivRefHandler(div: HTMLDivElement) {
         this.igvDiv = div;
     }
 }
diff --git a/src/shared/components/infoBeacon/InfoBeacon.tsx b/src/shared/components/infoBeacon/InfoBeacon.tsx
index 412d7816b88..5e34804126d 100644
--- a/src/shared/components/infoBeacon/InfoBeacon.tsx
+++ b/src/shared/components/infoBeacon/InfoBeacon.tsx
@@ -1,58 +1,56 @@
-import * as React from "react";
+import * as React from 'react';
 import styles from './styles.module.scss';
-import {observable} from "mobx";
-import {observer} from "mobx-react";
-import autobind from "autobind-decorator";
+import { observable } from 'mobx';
+import { observer } from 'mobx-react';
+import autobind from 'autobind-decorator';
 import classnames from 'classnames';
 import ReactDOM from 'react-dom';
 
 interface IInfoBeaconProps {
-    top:number;
-    left?:number;
-    right?:number;
-    interaction: 'click'|'mouseover';
-    color?:string;
-    id:string;
+    top: number;
+    left?: number;
+    right?: number;
+    interaction: 'click' | 'mouseover';
+    color?: string;
+    id: string;
 }
 
 @observer
 export default class InfoBeacon extends React.Component<IInfoBeaconProps, {}> {
-
     @observable infoShown = false;
 
     @autobind
-    showInfo(){
+    showInfo() {
         if (!this.infoShown) {
             this.infoShown = true;
         }
         this.markAsShown();
     }
 
-    markAsShown(){
+    markAsShown() {
         // we do this so as not to prevent the initial show
-        setTimeout(()=>{
+        setTimeout(() => {
             localStorage.setItem(this.props.id, 'true');
-        },100);
+        }, 100);
     }
 
-    get alreadyShown(){
+    get alreadyShown() {
         return localStorage.getItem(this.props.id) === 'true';
     }
 
     @autobind
-    handleInteraction(){
-        switch(this.props.interaction) {
-            case "click":
+    handleInteraction() {
+        switch (this.props.interaction) {
+            case 'click':
                 this.showInfo();
                 break;
-            case "mouseover":
+            case 'mouseover':
                 this.showInfo();
                 break;
         }
     }
 
-    render(){
-
+    render() {
         if (this.alreadyShown) {
             return null;
         } else {
@@ -72,13 +70,20 @@ export default class InfoBeacon extends React.Component<IInfoBeaconProps, {}> {
                 style.right = this.props.right;
             }
 
-            return <div className={classnames({[styles.beacon]: !this.infoShown})} style={style}
-                        onClick={this.handleInteraction} onMouseOver={this.handleInteraction}>
-                {
-                    this.infoShown && ReactDOM.createPortal(this.props.children, document.body)
-                }
-            </div>;
+            return (
+                <div
+                    className={classnames({ [styles.beacon]: !this.infoShown })}
+                    style={style}
+                    onClick={this.handleInteraction}
+                    onMouseOver={this.handleInteraction}
+                >
+                    {this.infoShown &&
+                        ReactDOM.createPortal(
+                            this.props.children,
+                            document.body
+                        )}
+                </div>
+            );
         }
     }
-
 }
diff --git a/src/shared/components/infoBeacon/styles.module.scss b/src/shared/components/infoBeacon/styles.module.scss
index b6016e55245..e9aeba4a5eb 100644
--- a/src/shared/components/infoBeacon/styles.module.scss
+++ b/src/shared/components/infoBeacon/styles.module.scss
@@ -1,30 +1,30 @@
 $size: 30px;
 
-.beacon{
-    position:absolute;
-    top:10px;
-    right:10px;
-    background-color:orange;
-    opacity:1;
-    height:$size;
-    width:$size;
-    border-radius:50%;
-    -webkit-transform:translateX(-50%) translateY(-50%);
-    box-shadow: 5px 5px 5px 0px rgba(0,0,0,0.75);
-    animation:beaconActive 2s infinite ease;
+.beacon {
+    position: absolute;
+    top: 10px;
+    right: 10px;
+    background-color: orange;
+    opacity: 1;
+    height: $size;
+    width: $size;
+    border-radius: 50%;
+    -webkit-transform: translateX(-50%) translateY(-50%);
+    box-shadow: 5px 5px 5px 0px rgba(0, 0, 0, 0.75);
+    animation: beaconActive 2s infinite ease;
 }
 
-@keyframes beaconActive{
-    0%{
-        transform:scale(.5);
-        opacity:1;
-}
-    70%{
-        transform:scale(1);
-    opacity:.7;
-}
-    100%{
-        transform:scale(.5);
-        opacity:1;
+@keyframes beaconActive {
+    0% {
+        transform: scale(0.5);
+        opacity: 1;
+    }
+    70% {
+        transform: scale(1);
+        opacity: 0.7;
+    }
+    100% {
+        transform: scale(0.5);
+        opacity: 1;
     }
 }
diff --git a/src/shared/components/labeledCheckbox/LabeledCheckbox.tsx b/src/shared/components/labeledCheckbox/LabeledCheckbox.tsx
index 56d784d136a..0a5c10cace6 100644
--- a/src/shared/components/labeledCheckbox/LabeledCheckbox.tsx
+++ b/src/shared/components/labeledCheckbox/LabeledCheckbox.tsx
@@ -4,57 +4,58 @@ import classNames from 'classnames';
 import ChangeEventHandler = React.ChangeEventHandler;
 
 const styles = styles_any as {
-	labeledCheckbox: string;
+    labeledCheckbox: string;
 };
 
-export interface ILabeledCheckboxProps
-{
-	checked?: boolean;
-	indeterminate?: boolean;
-	disabled?: boolean;
-	onChange?: ChangeEventHandler<HTMLInputElement>;
-	labelProps?: React.HTMLProps<HTMLLabelElement>;
-	inputProps?: React.HTMLProps<HTMLInputElement> & { "data-test"?:string };
+export interface ILabeledCheckboxProps {
+    checked?: boolean;
+    indeterminate?: boolean;
+    disabled?: boolean;
+    onChange?: ChangeEventHandler<HTMLInputElement>;
+    labelProps?: React.HTMLProps<HTMLLabelElement>;
+    inputProps?: React.HTMLProps<HTMLInputElement> & { 'data-test'?: string };
 }
 
-export default class LabeledCheckbox extends React.Component<ILabeledCheckboxProps, {}>
-{
-	private input:HTMLInputElement;
-
-	handleInputRef = (input:HTMLInputElement) =>
-	{
-		this.input = input;
-
-		if (this.props.inputProps && typeof this.props.inputProps.ref === 'function')
-			this.props.inputProps.ref(input);
-	}
-
-	componentDidMount()
-	{
-		this.input.indeterminate = !!this.props.indeterminate;
-	}
-
-	componentDidUpdate()
-	{
-		this.input.indeterminate = !!this.props.indeterminate;
-	}
-
-	render()
-	{
-		let labelPropsClassName = this.props.labelProps && this.props.labelProps.className;
-		let className = classNames(styles.labeledCheckbox, labelPropsClassName);
-		return (
-			<label className={className} {...this.props.labelProps}>
-				<input
-					type="checkbox"
-					checked={this.props.checked}
-					onChange={this.props.onChange}
-					disabled={this.props.disabled}
-					{...this.props.inputProps}
-					ref={this.handleInputRef}
-				/>
-				{this.props.children}
-			</label>
-		);
-	}
+export default class LabeledCheckbox extends React.Component<
+    ILabeledCheckboxProps,
+    {}
+> {
+    private input: HTMLInputElement;
+
+    handleInputRef = (input: HTMLInputElement) => {
+        this.input = input;
+
+        if (
+            this.props.inputProps &&
+            typeof this.props.inputProps.ref === 'function'
+        )
+            this.props.inputProps.ref(input);
+    };
+
+    componentDidMount() {
+        this.input.indeterminate = !!this.props.indeterminate;
+    }
+
+    componentDidUpdate() {
+        this.input.indeterminate = !!this.props.indeterminate;
+    }
+
+    render() {
+        let labelPropsClassName =
+            this.props.labelProps && this.props.labelProps.className;
+        let className = classNames(styles.labeledCheckbox, labelPropsClassName);
+        return (
+            <label className={className} {...this.props.labelProps}>
+                <input
+                    type="checkbox"
+                    checked={this.props.checked}
+                    onChange={this.props.onChange}
+                    disabled={this.props.disabled}
+                    {...this.props.inputProps}
+                    ref={this.handleInputRef}
+                />
+                {this.props.children}
+            </label>
+        );
+    }
 }
diff --git a/src/shared/components/labeledCheckbox/styles.module.scss b/src/shared/components/labeledCheckbox/styles.module.scss
index 8771f37982a..0c6f1ac1bdc 100644
--- a/src/shared/components/labeledCheckbox/styles.module.scss
+++ b/src/shared/components/labeledCheckbox/styles.module.scss
@@ -1,15 +1,15 @@
 label.labeledCheckbox {
-  cursor: pointer;
-  display: flex;
-  flex-direction: row;
-  align-items: flex-start;
-  margin: 0px;
-  min-height: 1.2em;
-  font-weight: normal;
-
-  > input[type="checkbox"] {
     cursor: pointer;
-    margin: 1px 6px 0 0;
-    min-width: 1em;
-  }
+    display: flex;
+    flex-direction: row;
+    align-items: flex-start;
+    margin: 0px;
+    min-height: 1.2em;
+    font-weight: normal;
+
+    > input[type='checkbox'] {
+        cursor: pointer;
+        margin: 1px 6px 0 0;
+        min-width: 1em;
+    }
 }
diff --git a/src/shared/components/lazyMobXTable/LazyMobXTable.spec.tsx b/src/shared/components/lazyMobXTable/LazyMobXTable.spec.tsx
index 1dbf754559a..1fc205c2cb2 100644
--- a/src/shared/components/lazyMobXTable/LazyMobXTable.spec.tsx
+++ b/src/shared/components/lazyMobXTable/LazyMobXTable.spec.tsx
@@ -1,48 +1,62 @@
 import React from 'react';
-import {default as chai, assert} from 'chai';
+import { default as chai, assert } from 'chai';
 import chaiEnzyme from 'chai-enzyme';
-import {shallow, mount, ReactWrapper} from 'enzyme';
+import { shallow, mount, ReactWrapper } from 'enzyme';
 import sinon from 'sinon';
-import {lazyMobXTableSort, default as LazyMobXTable, Column} from "./LazyMobXTable";
-import SimpleTable from "../simpleTable/SimpleTable";
-import {DefaultTooltip} from "cbioportal-frontend-commons";
+import {
+    lazyMobXTableSort,
+    default as LazyMobXTable,
+    Column,
+} from './LazyMobXTable';
+import SimpleTable from '../simpleTable/SimpleTable';
+import { DefaultTooltip } from 'cbioportal-frontend-commons';
 import expect from 'expect';
 import expectJSX from 'expect-jsx';
-import lolex from "lolex";
-import {Clock} from "lolex";
-import {PaginationControls, SHOW_ALL_PAGE_SIZE} from "../paginationControls/PaginationControls";
-import {Button, FormControl, Checkbox} from 'react-bootstrap';
-import {ColumnVisibilityControls} from "../columnVisibilityControls/ColumnVisibilityControls";
-import {SimpleLazyMobXTableApplicationDataStore} from "../../lib/ILazyMobXTableApplicationDataStore";
-import cloneJSXWithoutKeyAndRef from "shared/lib/cloneJSXWithoutKeyAndRef";
-import {maxPage} from "./utils";
-import _ from "lodash";
+import lolex from 'lolex';
+import { Clock } from 'lolex';
+import {
+    PaginationControls,
+    SHOW_ALL_PAGE_SIZE,
+} from '../paginationControls/PaginationControls';
+import { Button, FormControl, Checkbox } from 'react-bootstrap';
+import { ColumnVisibilityControls } from '../columnVisibilityControls/ColumnVisibilityControls';
+import { SimpleLazyMobXTableApplicationDataStore } from '../../lib/ILazyMobXTableApplicationDataStore';
+import cloneJSXWithoutKeyAndRef from 'shared/lib/cloneJSXWithoutKeyAndRef';
+import { maxPage } from './utils';
+import _ from 'lodash';
 
 expect.extend(expectJSX);
 chai.use(chaiEnzyme());
 
-class Table extends LazyMobXTable<any> {
-}
+class Table extends LazyMobXTable<any> {}
 
-class HighlightingDataStore extends SimpleLazyMobXTableApplicationDataStore<any> {
-    constructor(data:any[]) {
+class HighlightingDataStore extends SimpleLazyMobXTableApplicationDataStore<
+    any
+> {
+    constructor(data: any[]) {
         super(data);
-        this.dataHighlighter = (d:any)=>(d.numList[1] === null);
+        this.dataHighlighter = (d: any) => d.numList[1] === null;
     }
 }
 
-function getVisibleColumnHeaders(tableWrapper:ReactWrapper<any, any>):string[] {
-    return tableWrapper.find('th span').map(span=>span.text());
+function getVisibleColumnHeaders(
+    tableWrapper: ReactWrapper<any, any>
+): string[] {
+    return tableWrapper.find('th span').map(span => span.text());
 }
 
-function simulateTableSearchInput(table:ReactWrapper<any, any>, str:string) {
+function simulateTableSearchInput(table: ReactWrapper<any, any>, str: string) {
     let input = table.find('input.tableSearchInput');
     (input as any).instance().value = str;
     input.simulate('input');
 }
 
-function clickPrevPage(table:ReactWrapper<any, any>):boolean {
-    let btn = table.find(PaginationControls).filterWhere(x=>x.hasClass("topPagination")).find(Button).filterWhere(x=>x.hasClass("prevPageBtn"));
+function clickPrevPage(table: ReactWrapper<any, any>): boolean {
+    let btn = table
+        .find(PaginationControls)
+        .filterWhere(x => x.hasClass('topPagination'))
+        .find(Button)
+        .filterWhere(x => x.hasClass('prevPageBtn'));
     if (btn.length === 0 || btn.props().disabled) {
         return false;
     } else {
@@ -51,8 +65,12 @@ function clickPrevPage(table:ReactWrapper<any, any>):boolean {
     }
 }
 
-function clickNextPage(table:ReactWrapper<any, any>):boolean {
-    let btn = table.find(PaginationControls).filterWhere(x=>x.hasClass("topPagination")).find(Button).filterWhere(x=>x.hasClass("nextPageBtn"));
+function clickNextPage(table: ReactWrapper<any, any>): boolean {
+    let btn = table
+        .find(PaginationControls)
+        .filterWhere(x => x.hasClass('topPagination'))
+        .find(Button)
+        .filterWhere(x => x.hasClass('nextPageBtn'));
     if (btn.length === 0 || btn.props().disabled) {
         return false;
     } else {
@@ -61,7 +79,7 @@ function clickNextPage(table:ReactWrapper<any, any>):boolean {
     }
 }
 
-function selectItemsPerPage(table:ReactWrapper<any, any>, opt:number) {
+function selectItemsPerPage(table: ReactWrapper<any, any>, opt: number) {
     /*let selector = table.find(PaginationControls).filterWhere(x=>x.hasClass("topPagination")).find(FormControl).filterWhere(x=>x.hasClass("itemsPerPageSelector")).find('select');
     if (selector.length === 0) {
         return false;
@@ -69,1254 +87,2658 @@ function selectItemsPerPage(table:ReactWrapper<any, any>, opt:number) {
         selector.simulate('change', {target: {value:opt+""}});
         return true;
     }*/
-    let onChangeItemsPerPage = table.find(PaginationControls).props().onChangeItemsPerPage;
+    let onChangeItemsPerPage = table.find(PaginationControls).props()
+        .onChangeItemsPerPage;
     onChangeItemsPerPage && onChangeItemsPerPage(opt);
     table.update();
 }
 
-function getItemsPerPage(table:ReactWrapper<any,any>):number|undefined {
-    return table.find(PaginationControls).filterWhere(x=>x.hasClass("topPagination")).props().itemsPerPage;
+function getItemsPerPage(table: ReactWrapper<any, any>): number | undefined {
+    return table
+        .find(PaginationControls)
+        .filterWhere(x => x.hasClass('topPagination'))
+        .props().itemsPerPage;
 }
 
-function getCurrentPage(table:ReactWrapper<any, any>):number|undefined {
-    return table.find(PaginationControls).filterWhere(x=>x.hasClass("topPagination")).props().currentPage;
+function getCurrentPage(table: ReactWrapper<any, any>): number | undefined {
+    return table
+        .find(PaginationControls)
+        .filterWhere(x => x.hasClass('topPagination'))
+        .props().currentPage;
 }
 
-function getVisibleRows(table:ReactWrapper<any, any>) {
-    return table.find(SimpleTable).props().rows.map(cloneJSXWithoutKeyAndRef);
+function getVisibleRows(table: ReactWrapper<any, any>) {
+    return table
+        .find(SimpleTable)
+        .props()
+        .rows.map(cloneJSXWithoutKeyAndRef);
 }
 
-function getSimpleTableRows(table:ReactWrapper<any, any>) {
-    return table.find(SimpleTable).find("tbody").find("tr");
+function getSimpleTableRows(table: ReactWrapper<any, any>) {
+    return table
+        .find(SimpleTable)
+        .find('tbody')
+        .find('tr');
 }
 
-function getNumVisibleRows(table:ReactWrapper<any, any>):number {
+function getNumVisibleRows(table: ReactWrapper<any, any>): number {
     return getVisibleRows(table).length;
 }
 
-function getTextBetweenButtons(table:ReactWrapper<any, any>):string | undefined {
-    return table.find(PaginationControls).filterWhere(x=>x.hasClass("topPagination")).props().textBetweenButtons;
+function getTextBetweenButtons(
+    table: ReactWrapper<any, any>
+): string | undefined {
+    return table
+        .find(PaginationControls)
+        .filterWhere(x => x.hasClass('topPagination'))
+        .props().textBetweenButtons;
 }
 
-function getTextBeforeButtons(table:ReactWrapper<any, any>):string | undefined {
-    return table.find(PaginationControls).filterWhere(x=>x.hasClass("topPagination")).props().textBeforeButtons;
+function getTextBeforeButtons(
+    table: ReactWrapper<any, any>
+): string | undefined {
+    return table
+        .find(PaginationControls)
+        .filterWhere(x => x.hasClass('topPagination'))
+        .props().textBeforeButtons;
 }
 
-function clickColumnVisibilityCheckbox(table:ReactWrapper<any, any>, columnName:string):boolean {
-    let checkbox: any = table.update().find(ColumnVisibilityControls).find(Checkbox)
-                    .find('input[type="checkbox"]')
-                    .filterWhere(x=>(((x.props() as any)['data-id'] as string) === columnName)).first();
+function clickColumnVisibilityCheckbox(
+    table: ReactWrapper<any, any>,
+    columnName: string
+): boolean {
+    let checkbox: any = table
+        .update()
+        .find(ColumnVisibilityControls)
+        .find(Checkbox)
+        .find('input[type="checkbox"]')
+        .filterWhere(
+            x => ((x.props() as any)['data-id'] as string) === columnName
+        )
+        .first();
 
     const isChecked = checkbox.instance().checked;
 
-    checkbox.simulate('change', {target: {checked:isChecked}});
+    checkbox.simulate('change', { target: { checked: isChecked } });
 
     return checkbox.instance().checked;
 }
 
-describe('LazyMobXTable', ()=>{
-    let simpleColumns:Column<{id:string}>[];
-    let simpleData:{id:string}[];
+describe('LazyMobXTable', () => {
+    let simpleColumns: Column<{ id: string }>[];
+    let simpleData: { id: string }[];
     let datum0 = {
-        name:"0",
-        num:0,
-        str:"asdfj",
-        numList:[0,1,null],
-        strList:["a",null,"b"],
-        invisibleString:"FILTER0"
+        name: '0',
+        num: 0,
+        str: 'asdfj',
+        numList: [0, 1, null],
+        strList: ['a', null, 'b'],
+        invisibleString: 'FILTER0',
     };
     let datum1 = {
-        name:"1",
-        num:6,
-        str:"kdfjpo",
-        numList:[77,null,null],
-        strList:["asdijf","ckjzp","b"],
-        invisibleString:"FILTER1"
+        name: '1',
+        num: 6,
+        str: 'kdfjpo',
+        numList: [77, null, null],
+        strList: ['asdijf', 'ckjzp', 'b'],
+        invisibleString: 'FILTER1',
     };
     let datum2 = {
-        name:"2",
-        num:null,
-        str:null,
-        numList:[-1,0,3],
-        strList:[null,null,null],
-        invisibleString:"FILTER2"
+        name: '2',
+        num: null,
+        str: null,
+        numList: [-1, 0, 3],
+        strList: [null, null, null],
+        invisibleString: 'FILTER2',
     };
     let datum3 = {
-        name:"3",
-        num:-1,
-        str:"zijxcpo",
-        numList:[null,null,78],
-        strList:["a","b","b"],
-        invisibleString:"FILTER3"
+        name: '3',
+        num: -1,
+        str: 'zijxcpo',
+        numList: [null, null, 78],
+        strList: ['a', 'b', 'b'],
+        invisibleString: 'FILTER3',
     };
     let datum4 = {
-        name:"4",
-        num:90,
-        str:"zkzxc",
-        numList:[null,null,-1],
-        strList:["asdijf","ca","zzxf"],
-        invisibleString:"FILTER4"
+        name: '4',
+        num: 90,
+        str: 'zkzxc',
+        numList: [null, null, -1],
+        strList: ['asdijf', 'ca', 'zzxf'],
+        invisibleString: 'FILTER4',
     };
     let data = [datum0, datum1, datum2, datum3, datum4];
     let multiData = [[datum0, datum1], [datum2, datum3], datum4];
-    let sortedList:any[];
-    function downloadName(data:{name:string, num:number, str:string, numList:number[], strList:string[],
-        invisibleString:string}|{name:string, num:number, str:string, numList:number[],
-        strList:string[], invisibleString:string}[]): string|string[] {
-            let result =[];
-            if (data instanceof Array) {
-                for (let datum of data) {
-                    result.push(datum.name);
-                }
-            } else {
-                return data.name;
+    let sortedList: any[];
+    function downloadName(
+        data:
+            | {
+                  name: string;
+                  num: number;
+                  str: string;
+                  numList: number[];
+                  strList: string[];
+                  invisibleString: string;
+              }
+            | {
+                  name: string;
+                  num: number;
+                  str: string;
+                  numList: number[];
+                  strList: string[];
+                  invisibleString: string;
+              }[]
+    ): string | string[] {
+        let result = [];
+        if (data instanceof Array) {
+            for (let datum of data) {
+                result.push(datum.name);
             }
-            return result;
+        } else {
+            return data.name;
         }
-    function downloadNumber(data:{name:string, num:number, str:string, numList:number[], strList:string[],
-        invisibleString:string}|{name:string, num:number, str:string, numList:number[],
-        strList:string[], invisibleString:string}[]): string|string[] {
-            let result =[];
-            if (data instanceof Array) {
-                for (let datum of data) {
-                    result.push(datum.num+'');
-                }
-            } else {
-                return data.num+'';
+        return result;
+    }
+    function downloadNumber(
+        data:
+            | {
+                  name: string;
+                  num: number;
+                  str: string;
+                  numList: number[];
+                  strList: string[];
+                  invisibleString: string;
+              }
+            | {
+                  name: string;
+                  num: number;
+                  str: string;
+                  numList: number[];
+                  strList: string[];
+                  invisibleString: string;
+              }[]
+    ): string | string[] {
+        let result = [];
+        if (data instanceof Array) {
+            for (let datum of data) {
+                result.push(datum.num + '');
             }
-            return result;
+        } else {
+            return data.num + '';
         }
-    function downloadString(data:{name:string, num:number, str:string, numList:number[], strList:string[],
-        invisibleString:string}|{name:string, num:number, str:string, numList:number[],
-        strList:string[], invisibleString:string}[]): string|string[] {
-            let result =[];
-            if (data instanceof Array) {
-                for (let datum of data) {
-                    result.push(datum.str+'');
-                }
-            } else {
-                return data.str+'';
+        return result;
+    }
+    function downloadString(
+        data:
+            | {
+                  name: string;
+                  num: number;
+                  str: string;
+                  numList: number[];
+                  strList: string[];
+                  invisibleString: string;
+              }
+            | {
+                  name: string;
+                  num: number;
+                  str: string;
+                  numList: number[];
+                  strList: string[];
+                  invisibleString: string;
+              }[]
+    ): string | string[] {
+        let result = [];
+        if (data instanceof Array) {
+            for (let datum of data) {
+                result.push(datum.str + '');
             }
-            return result;
+        } else {
+            return data.str + '';
         }
-    function downloadInvisible(data:{name:string, num:number, str:string, numList:number[], strList:string[],
-        invisibleString:string}|{name:string, num:number, str:string, numList:number[],
-        strList:string[], invisibleString:string}[]): string|string[] {
-            let result =[];
-            if (data instanceof Array) {
-                for (let datum of data) {
-                    result.push(datum.name+"HELLO123456");
-                }
-            } else {
-                return data.name+"HELLO123456";
+        return result;
+    }
+    function downloadInvisible(
+        data:
+            | {
+                  name: string;
+                  num: number;
+                  str: string;
+                  numList: number[];
+                  strList: string[];
+                  invisibleString: string;
+              }
+            | {
+                  name: string;
+                  num: number;
+                  str: string;
+                  numList: number[];
+                  strList: string[];
+                  invisibleString: string;
+              }[]
+    ): string | string[] {
+        let result = [];
+        if (data instanceof Array) {
+            for (let datum of data) {
+                result.push(datum.name + 'HELLO123456');
             }
-            return result;
+        } else {
+            return data.name + 'HELLO123456';
         }
-    let columns:any[] = [{
-        name: "Name",
-        filter: (d:any,s:string)=>(d.name.indexOf(s) > -1),
-        sortBy: (d:any)=>d.name,
-        render:(d:any)=>(<span>{d.name}</span>),
-        download:(d:any)=>downloadName(d),
-        tooltip:(<span>Name of the data.</span>),
-        align: "right"
-    },{
-        name: "Number",
-        sortBy: (d:any)=>d.num,
-        render:(d:any)=>(<span>{d.num}</span>),
-        download:(d:any)=>downloadNumber(d),
-        tooltip:(<span>Number of the data.</span>),
-        defaultSortDirection: "desc",
-        align: "left"
-    },{
-        name: "String",
-        filter: (d:any,s:string)=>(d.str && d.str.indexOf(s) > -1),
-        sortBy: (d:any)=>d.str,
-        render:(d:any)=>(<span>{d.str}</span>),
-        download:(d:any)=>downloadString(d),
-        tooltip:(<span>String of the data</span>),
-        defaultSortDirection: "desc",
-        align: "center"
-    },{
-        name: "Number List",
-        render:(d:any)=>(<span>BLAH</span>),
-    },{
-        name: "Initially invisible column",
-        filter: (d:any,s:string)=>(d.invisibleString.indexOf(s) > -1),
-        visible: false,
-        sortBy: (d:any)=>d.name,
-        render:(d:any)=>(<span>{d.name}</span>),
-        download:(d:any)=>downloadInvisible(d),
-    },{
-        name: "Initially invisible column with no download",
-        render:()=>(<span></span>),
-        visible: false,
-    },{
-        name: "String without filter function",
-        render:(d:any)=>(<span>{d.str}</span>),
-    }];
-
-    let clock:Clock;
-    before(()=>{
+        return result;
+    }
+    let columns: any[] = [
+        {
+            name: 'Name',
+            filter: (d: any, s: string) => d.name.indexOf(s) > -1,
+            sortBy: (d: any) => d.name,
+            render: (d: any) => <span>{d.name}</span>,
+            download: (d: any) => downloadName(d),
+            tooltip: <span>Name of the data.</span>,
+            align: 'right',
+        },
+        {
+            name: 'Number',
+            sortBy: (d: any) => d.num,
+            render: (d: any) => <span>{d.num}</span>,
+            download: (d: any) => downloadNumber(d),
+            tooltip: <span>Number of the data.</span>,
+            defaultSortDirection: 'desc',
+            align: 'left',
+        },
+        {
+            name: 'String',
+            filter: (d: any, s: string) => d.str && d.str.indexOf(s) > -1,
+            sortBy: (d: any) => d.str,
+            render: (d: any) => <span>{d.str}</span>,
+            download: (d: any) => downloadString(d),
+            tooltip: <span>String of the data</span>,
+            defaultSortDirection: 'desc',
+            align: 'center',
+        },
+        {
+            name: 'Number List',
+            render: (d: any) => <span>BLAH</span>,
+        },
+        {
+            name: 'Initially invisible column',
+            filter: (d: any, s: string) => d.invisibleString.indexOf(s) > -1,
+            visible: false,
+            sortBy: (d: any) => d.name,
+            render: (d: any) => <span>{d.name}</span>,
+            download: (d: any) => downloadInvisible(d),
+        },
+        {
+            name: 'Initially invisible column with no download',
+            render: () => <span></span>,
+            visible: false,
+        },
+        {
+            name: 'String without filter function',
+            render: (d: any) => <span>{d.str}</span>,
+        },
+    ];
+
+    let clock: Clock;
+    before(() => {
         clock = lolex.install();
         simpleColumns = [
             {
-                name: "ID",
-                render: (d:any)=>(<span>{d.id}</span>),
-                sortBy: (d:any)=>parseInt(d.id, 10)
-            }
+                name: 'ID',
+                render: (d: any) => <span>{d.id}</span>,
+                sortBy: (d: any) => parseInt(d.id, 10),
+            },
         ];
         simpleData = [];
-        for (let i=0; i<120; i++) {
-            simpleData.push({id:i+""});
+        for (let i = 0; i < 120; i++) {
+            simpleData.push({ id: i + '' });
         }
     });
 
-    after(()=>{
+    after(() => {
         clock.uninstall();
     });
 
-    describe('utils', ()=>{
-        describe('maxPage', ()=>{
-            it("gives the correct outputs in various cases", ()=>{
-                assert.equal(maxPage(0, SHOW_ALL_PAGE_SIZE), 0 , "maxPage is 0 when showing all");
-                assert.equal(maxPage(100, SHOW_ALL_PAGE_SIZE), 0 , "maxPage is 0 when showing all");
-                assert.equal(maxPage(1000, SHOW_ALL_PAGE_SIZE), 0 , "maxPage is 0 when showing all");
-
-                assert.equal(maxPage(0, 50), 0, "maxPage is 0 when no data");
-                assert.equal(maxPage(0, 25), 0, "maxPage is 0 when no data");
-                assert.equal(maxPage(0, 100), 0, "maxPage is 0 when no data");
-
-                assert.equal(maxPage(1, 50), 0, "maxPage is 0 when less than page size");
-                assert.equal(maxPage(5, 50), 0, "maxPage is 0 when less than page size");
-                assert.equal(maxPage(10, 50), 0, "maxPage is 0 when less than page size");
-                assert.equal(maxPage(3, 10), 0, "maxPage is 0 when less than page size");
-                assert.equal(maxPage(7, 10), 0, "maxPage is 0 when less than page size");
-                assert.equal(maxPage(9, 10), 0, "maxPage is 0 when less than page size");
-
-                assert.equal(maxPage(50, 50), 0, "maxPage is 0 when equal to page size");
-                assert.equal(maxPage(24, 24), 0, "maxPage is 0 when equal to page size");
-                assert.equal(maxPage(1, 1), 0, "maxPage is 0 when equal to page size");
-
-                assert.equal(maxPage(25,10), 2, "maxPage calculated correctly");
-                assert.equal(maxPage(50,10), 4, "maxPage calculated correctly");
-                assert.equal(maxPage(11,2), 5, "maxPage calculated correctly");
+    describe('utils', () => {
+        describe('maxPage', () => {
+            it('gives the correct outputs in various cases', () => {
+                assert.equal(
+                    maxPage(0, SHOW_ALL_PAGE_SIZE),
+                    0,
+                    'maxPage is 0 when showing all'
+                );
+                assert.equal(
+                    maxPage(100, SHOW_ALL_PAGE_SIZE),
+                    0,
+                    'maxPage is 0 when showing all'
+                );
+                assert.equal(
+                    maxPage(1000, SHOW_ALL_PAGE_SIZE),
+                    0,
+                    'maxPage is 0 when showing all'
+                );
+
+                assert.equal(maxPage(0, 50), 0, 'maxPage is 0 when no data');
+                assert.equal(maxPage(0, 25), 0, 'maxPage is 0 when no data');
+                assert.equal(maxPage(0, 100), 0, 'maxPage is 0 when no data');
+
+                assert.equal(
+                    maxPage(1, 50),
+                    0,
+                    'maxPage is 0 when less than page size'
+                );
+                assert.equal(
+                    maxPage(5, 50),
+                    0,
+                    'maxPage is 0 when less than page size'
+                );
+                assert.equal(
+                    maxPage(10, 50),
+                    0,
+                    'maxPage is 0 when less than page size'
+                );
+                assert.equal(
+                    maxPage(3, 10),
+                    0,
+                    'maxPage is 0 when less than page size'
+                );
+                assert.equal(
+                    maxPage(7, 10),
+                    0,
+                    'maxPage is 0 when less than page size'
+                );
+                assert.equal(
+                    maxPage(9, 10),
+                    0,
+                    'maxPage is 0 when less than page size'
+                );
+
+                assert.equal(
+                    maxPage(50, 50),
+                    0,
+                    'maxPage is 0 when equal to page size'
+                );
+                assert.equal(
+                    maxPage(24, 24),
+                    0,
+                    'maxPage is 0 when equal to page size'
+                );
+                assert.equal(
+                    maxPage(1, 1),
+                    0,
+                    'maxPage is 0 when equal to page size'
+                );
+
+                assert.equal(
+                    maxPage(25, 10),
+                    2,
+                    'maxPage calculated correctly'
+                );
+                assert.equal(
+                    maxPage(50, 10),
+                    4,
+                    'maxPage calculated correctly'
+                );
+                assert.equal(maxPage(11, 2), 5, 'maxPage calculated correctly');
             });
         });
     });
 
-    describe('lazyMobXTableSort', ()=>{
-        it("does not sort in place", ()=>{
-            sortedList = lazyMobXTableSort(data, d=>d.num, true);
-            assert.deepEqual(data.map(d=>d.name), ["0","1","2","3","4"], "original list is unchanged..");
-            assert.notDeepEqual(sortedList.map(d=>d.name), ["0","1","2","3","4"], "..even though sorted list is diff order");
-            sortedList = lazyMobXTableSort(data, d=>d.num, false);
-            assert.deepEqual(data.map(d=>d.name), ["0","1","2","3","4"], "original list is unchanged..");
-            assert.notDeepEqual(sortedList.map(d=>d.name), ["0","1","2","3","4"], "..even though sorted list is diff order");
+    describe('lazyMobXTableSort', () => {
+        it('does not sort in place', () => {
+            sortedList = lazyMobXTableSort(data, d => d.num, true);
+            assert.deepEqual(
+                data.map(d => d.name),
+                ['0', '1', '2', '3', '4'],
+                'original list is unchanged..'
+            );
+            assert.notDeepEqual(
+                sortedList.map(d => d.name),
+                ['0', '1', '2', '3', '4'],
+                '..even though sorted list is diff order'
+            );
+            sortedList = lazyMobXTableSort(data, d => d.num, false);
+            assert.deepEqual(
+                data.map(d => d.name),
+                ['0', '1', '2', '3', '4'],
+                'original list is unchanged..'
+            );
+            assert.notDeepEqual(
+                sortedList.map(d => d.name),
+                ['0', '1', '2', '3', '4'],
+                '..even though sorted list is diff order'
+            );
         });
-        it("sorts number|null values properly", ()=>{
-            sortedList = lazyMobXTableSort(data, d=>d.num, true);
-            assert.deepEqual(sortedList.map(d=>d.name), ["3","0","1","4","2"], "sorts ascending properly");
-            sortedList = lazyMobXTableSort(data, d=>d.num, false);
-            assert.deepEqual(sortedList.map(d=>d.name), ["4","1","0","3","2"], "sorts descending properly");
+        it('sorts number|null values properly', () => {
+            sortedList = lazyMobXTableSort(data, d => d.num, true);
+            assert.deepEqual(
+                sortedList.map(d => d.name),
+                ['3', '0', '1', '4', '2'],
+                'sorts ascending properly'
+            );
+            sortedList = lazyMobXTableSort(data, d => d.num, false);
+            assert.deepEqual(
+                sortedList.map(d => d.name),
+                ['4', '1', '0', '3', '2'],
+                'sorts descending properly'
+            );
         });
-        it("sorts (number|null)[] values properly", ()=>{
-            sortedList = lazyMobXTableSort(data, d=>d.numList, true);
-            assert.deepEqual(sortedList.map(d=>d.name), ["2","0","1","4","3"], "sorts ascending properly");
-            sortedList = lazyMobXTableSort(data, d=>d.numList, false);
-            assert.deepEqual(sortedList.map(d=>d.name), ["1","0","2","3","4"], "sorts descending properly");
+        it('sorts (number|null)[] values properly', () => {
+            sortedList = lazyMobXTableSort(data, d => d.numList, true);
+            assert.deepEqual(
+                sortedList.map(d => d.name),
+                ['2', '0', '1', '4', '3'],
+                'sorts ascending properly'
+            );
+            sortedList = lazyMobXTableSort(data, d => d.numList, false);
+            assert.deepEqual(
+                sortedList.map(d => d.name),
+                ['1', '0', '2', '3', '4'],
+                'sorts descending properly'
+            );
         });
-        it("sorts string|null values properly", ()=>{
-            sortedList = lazyMobXTableSort(data, d=>d.str, true);
-            assert.deepEqual(sortedList.map(d=>d.name), ["0","1","3","4","2"], "sorts ascending properly");
-            sortedList = lazyMobXTableSort(data, d=>d.str, false);
-            assert.deepEqual(sortedList.map(d=>d.name), ["4","3","1","0","2"], "sorts descending properly");
+        it('sorts string|null values properly', () => {
+            sortedList = lazyMobXTableSort(data, d => d.str, true);
+            assert.deepEqual(
+                sortedList.map(d => d.name),
+                ['0', '1', '3', '4', '2'],
+                'sorts ascending properly'
+            );
+            sortedList = lazyMobXTableSort(data, d => d.str, false);
+            assert.deepEqual(
+                sortedList.map(d => d.name),
+                ['4', '3', '1', '0', '2'],
+                'sorts descending properly'
+            );
         });
-        it("sorts (string|null)[] values properly", ()=>{
-            sortedList = lazyMobXTableSort(data, d=>d.strList, true);
-            assert.deepEqual(sortedList.map(d=>d.name), ["3","0","4","1","2"], "sorts ascending properly");
-            sortedList = lazyMobXTableSort(data, d=>d.strList, false);
-            assert.deepEqual(sortedList.map(d=>d.name), ["1","4","3","0","2"], "sorts descending properly");
+        it('sorts (string|null)[] values properly', () => {
+            sortedList = lazyMobXTableSort(data, d => d.strList, true);
+            assert.deepEqual(
+                sortedList.map(d => d.name),
+                ['3', '0', '4', '1', '2'],
+                'sorts ascending properly'
+            );
+            sortedList = lazyMobXTableSort(data, d => d.strList, false);
+            assert.deepEqual(
+                sortedList.map(d => d.name),
+                ['1', '4', '3', '0', '2'],
+                'sorts descending properly'
+            );
         });
-        it("sorts empty list properly", ()=>{
-            assert.deepEqual(lazyMobXTableSort([], d=>(d as any).name, true), [], "empty sort is empty");
-            assert.deepEqual(lazyMobXTableSort([], d=>(d as any).name, false), [], "empty sort is empty");
+        it('sorts empty list properly', () => {
+            assert.deepEqual(
+                lazyMobXTableSort([], d => (d as any).name, true),
+                [],
+                'empty sort is empty'
+            );
+            assert.deepEqual(
+                lazyMobXTableSort([], d => (d as any).name, false),
+                [],
+                'empty sort is empty'
+            );
         });
-        it("sorts singleton list properly", ()=>{
-            assert.deepEqual(lazyMobXTableSort([datum0], d=>(d as any).name, true), [datum0], "singleton sort is singleton");
-            assert.deepEqual(lazyMobXTableSort([datum1], d=>(d as any).name, false), [datum1], "singleton sort is singleton");
+        it('sorts singleton list properly', () => {
+            assert.deepEqual(
+                lazyMobXTableSort([datum0], d => (d as any).name, true),
+                [datum0],
+                'singleton sort is singleton'
+            );
+            assert.deepEqual(
+                lazyMobXTableSort([datum1], d => (d as any).name, false),
+                [datum1],
+                'singleton sort is singleton'
+            );
         });
-        it("is a stable sort", ()=>{
+        it('is a stable sort', () => {
             let d0 = {
-                stringVal: "A",
+                stringVal: 'A',
                 numVal: 0,
-                stringListVal: ["A"],
-                numListVal: [0]
+                stringListVal: ['A'],
+                numListVal: [0],
             };
             let d1 = {
-                stringVal: "B",
+                stringVal: 'B',
                 numVal: 1,
-                stringListVal: ["B"],
-                numListVal: [1]
+                stringListVal: ['B'],
+                numListVal: [1],
             };
             let d2 = {
-                stringVal: "B",
+                stringVal: 'B',
                 numVal: 1,
-                stringListVal: ["B"],
-                numListVal: [1]
+                stringListVal: ['B'],
+                numListVal: [1],
             };
             let d3 = {
-                stringVal: "C",
+                stringVal: 'C',
                 numVal: 2,
-                stringListVal: ["C"],
-                numListVal: [2]
+                stringListVal: ['C'],
+                numListVal: [2],
             };
-            assert.deepEqual(lazyMobXTableSort([d0, d1, d2, d3], d=>d.stringVal, true), [d0, d1, d2, d3], "string: same order, ascending");
-            assert.deepEqual(lazyMobXTableSort([d0, d1, d2, d3], d=>d.stringVal, false), [d3, d1, d2, d0], "string: same order, descending");
-            assert.deepEqual(lazyMobXTableSort([d0, d2, d1, d3], d=>d.stringVal, true), [d0, d2, d1, d3], "string: reversed order, ascending");
+            assert.deepEqual(
+                lazyMobXTableSort([d0, d1, d2, d3], d => d.stringVal, true),
+                [d0, d1, d2, d3],
+                'string: same order, ascending'
+            );
+            assert.deepEqual(
+                lazyMobXTableSort([d0, d1, d2, d3], d => d.stringVal, false),
+                [d3, d1, d2, d0],
+                'string: same order, descending'
+            );
+            assert.deepEqual(
+                lazyMobXTableSort([d0, d2, d1, d3], d => d.stringVal, true),
+                [d0, d2, d1, d3],
+                'string: reversed order, ascending'
+            );
 
-            assert.deepEqual(lazyMobXTableSort([d0, d1, d2, d3], d=>d.numVal, true), [d0, d1, d2, d3], "number: same order, ascending");
-            assert.deepEqual(lazyMobXTableSort([d0, d1, d2, d3], d=>d.numVal, false), [d3, d1, d2, d0], "number: same order, descending");
-            assert.deepEqual(lazyMobXTableSort([d0, d2, d1, d3], d=>d.numVal, true), [d0, d2, d1, d3], "number: reversed order, ascending");
+            assert.deepEqual(
+                lazyMobXTableSort([d0, d1, d2, d3], d => d.numVal, true),
+                [d0, d1, d2, d3],
+                'number: same order, ascending'
+            );
+            assert.deepEqual(
+                lazyMobXTableSort([d0, d1, d2, d3], d => d.numVal, false),
+                [d3, d1, d2, d0],
+                'number: same order, descending'
+            );
+            assert.deepEqual(
+                lazyMobXTableSort([d0, d2, d1, d3], d => d.numVal, true),
+                [d0, d2, d1, d3],
+                'number: reversed order, ascending'
+            );
 
-            assert.deepEqual(lazyMobXTableSort([d0, d1, d2, d3], d=>d.stringListVal, true), [d0, d1, d2, d3], "string list: same order, ascending");
-            assert.deepEqual(lazyMobXTableSort([d0, d1, d2, d3], d=>d.stringListVal, false), [d3, d1, d2, d0], "string list: same order, descending");
-            assert.deepEqual(lazyMobXTableSort([d0, d2, d1, d3], d=>d.stringListVal, true), [d0, d2, d1, d3], "string list: reversed order, ascending");
+            assert.deepEqual(
+                lazyMobXTableSort([d0, d1, d2, d3], d => d.stringListVal, true),
+                [d0, d1, d2, d3],
+                'string list: same order, ascending'
+            );
+            assert.deepEqual(
+                lazyMobXTableSort(
+                    [d0, d1, d2, d3],
+                    d => d.stringListVal,
+                    false
+                ),
+                [d3, d1, d2, d0],
+                'string list: same order, descending'
+            );
+            assert.deepEqual(
+                lazyMobXTableSort([d0, d2, d1, d3], d => d.stringListVal, true),
+                [d0, d2, d1, d3],
+                'string list: reversed order, ascending'
+            );
 
-            assert.deepEqual(lazyMobXTableSort([d0, d1, d2, d3], d=>d.numListVal, true), [d0, d1, d2, d3], "number list: same order, ascending");
-            assert.deepEqual(lazyMobXTableSort([d0, d1, d2, d3], d=>d.numListVal, false), [d3, d1, d2, d0], "number list: same order, descending");
-            assert.deepEqual(lazyMobXTableSort([d0, d2, d1, d3], d=>d.numListVal, true), [d0, d2, d1, d3], "number list: reversed order, ascending");
+            assert.deepEqual(
+                lazyMobXTableSort([d0, d1, d2, d3], d => d.numListVal, true),
+                [d0, d1, d2, d3],
+                'number list: same order, ascending'
+            );
+            assert.deepEqual(
+                lazyMobXTableSort([d0, d1, d2, d3], d => d.numListVal, false),
+                [d3, d1, d2, d0],
+                'number list: same order, descending'
+            );
+            assert.deepEqual(
+                lazyMobXTableSort([d0, d2, d1, d3], d => d.numListVal, true),
+                [d0, d2, d1, d3],
+                'number list: reversed order, ascending'
+            );
         });
     });
-    describe('headers', ()=>{
-        it("shows headers for all the given visible columns, including the cases of one and zero columns", ()=>{
-            let table = mount(<Table columns={columns} data={data}/>);
-            assert.deepEqual(table.find(SimpleTable).find("th").map(x=>x.text()), ["Name", "Number", "String", "Number List", "String without filter function"],
-                "5 visible columns showing the given header labels, in the given order, case: with data");
+    describe('headers', () => {
+        it('shows headers for all the given visible columns, including the cases of one and zero columns', () => {
+            let table = mount(<Table columns={columns} data={data} />);
+            assert.deepEqual(
+                table
+                    .find(SimpleTable)
+                    .find('th')
+                    .map(x => x.text()),
+                [
+                    'Name',
+                    'Number',
+                    'String',
+                    'Number List',
+                    'String without filter function',
+                ],
+                '5 visible columns showing the given header labels, in the given order, case: with data'
+            );
 
-            table = mount(<Table columns={[columns[0]]} data={data}/>);
-            assert.deepEqual(table.find(SimpleTable).find("th").map(x=>x.text()), ["Name"],
-                "case of only one column, shows the name correctly, case: with data");
+            table = mount(<Table columns={[columns[0]]} data={data} />);
+            assert.deepEqual(
+                table
+                    .find(SimpleTable)
+                    .find('th')
+                    .map(x => x.text()),
+                ['Name'],
+                'case of only one column, shows the name correctly, case: with data'
+            );
 
-            table = mount(<Table columns={columns} data={[]}/>);
-            assert.deepEqual(table.find(SimpleTable).find("th").map(x=>x.text()), ["Name", "Number", "String", "Number List", "String without filter function"],
-                "5 visible columns showing the given header labels, in the given order, case: no data");
+            table = mount(<Table columns={columns} data={[]} />);
+            assert.deepEqual(
+                table
+                    .find(SimpleTable)
+                    .find('th')
+                    .map(x => x.text()),
+                [
+                    'Name',
+                    'Number',
+                    'String',
+                    'Number List',
+                    'String without filter function',
+                ],
+                '5 visible columns showing the given header labels, in the given order, case: no data'
+            );
 
-            table = mount(<Table columns={[columns[0]]} data={[]}/>);
-            assert.deepEqual(table.find(SimpleTable).find("th").map(x=>x.text()), ["Name"],
-                "case of only one column, shows the name correctly, case: no data");
+            table = mount(<Table columns={[columns[0]]} data={[]} />);
+            assert.deepEqual(
+                table
+                    .find(SimpleTable)
+                    .find('th')
+                    .map(x => x.text()),
+                ['Name'],
+                'case of only one column, shows the name correctly, case: no data'
+            );
 
-            table = mount(<Table columns={[]} data={data}/>);
-            assert.deepEqual(table.find(SimpleTable).find("th").length, 0, "no columns given => no column headers rendered, case: with data");
+            table = mount(<Table columns={[]} data={data} />);
+            assert.deepEqual(
+                table.find(SimpleTable).find('th').length,
+                0,
+                'no columns given => no column headers rendered, case: with data'
+            );
 
-            table = mount(<Table columns={[]} data={[]}/>);
-            assert.deepEqual(table.find(SimpleTable).find("th").length, 0, "no columns given => no column headers rendered, case: no data");
+            table = mount(<Table columns={[]} data={[]} />);
+            assert.deepEqual(
+                table.find(SimpleTable).find('th').length,
+                0,
+                'no columns given => no column headers rendered, case: no data'
+            );
         });
 
-        it ("should have the column resizer next to the first column", () => {
+        it('should have the column resizer next to the first column', () => {
             columns[0].resizable = true;
-            let table = mount(<Table columns={columns} data={data}/>);
+            let table = mount(<Table columns={columns} data={data} />);
             const resizer = table.find('.columnResizer');
             assert.equal(resizer.length, 12);
             columns[0].resizable = undefined; // normalize
         });
 
-        it("adds the text-align property for a column header according to the specification", ()=>{
-            let table = mount(<Table columns={columns} data={data}/>);
-            const headers = table.find(SimpleTable).find("th");
+        it('adds the text-align property for a column header according to the specification', () => {
+            let table = mount(<Table columns={columns} data={data} />);
+            const headers = table.find(SimpleTable).find('th');
             const nameHeader = headers.at(0);
             const numberHeader = headers.at(1);
             const stringHeader = headers.at(2);
             const numberListHeader = headers.at(3);
 
-            chai.expect(nameHeader).to.have.style("textAlign", "right");
-            chai.expect(numberHeader).to.have.style("textAlign", "left");
-            chai.expect(stringHeader).to.have.style("textAlign", "center");
-            chai.expect(numberListHeader).not.to.have.style("textAlign");
+            chai.expect(nameHeader).to.have.style('textAlign', 'right');
+            chai.expect(numberHeader).to.have.style('textAlign', 'left');
+            chai.expect(stringHeader).to.have.style('textAlign', 'center');
+            chai.expect(numberListHeader).not.to.have.style('textAlign');
         });
 
-        it("has a tooltip element for columns with tooltips, and no tooltips for columns without tooltips", ()=>{
-            let table = mount(<Table columns={columns} data={[]}/>);
-            let tooltips = table.find(SimpleTable).find("th").find(DefaultTooltip);
-            assert(tooltips.length === 3, "should be three tooltips, for the columns where it is defined");
-            expect(tooltips.at(0).props().overlay).toEqualJSX(<span>Name of the data.</span>, "Name tooltip should look as specified");
-            expect(tooltips.at(1).props().overlay).toEqualJSX(<span>Number of the data.</span>, "Number tooltip should look as specified");
-            expect(tooltips.at(2).props().overlay).toEqualJSX(<span>String of the data</span>, "String tooltip should look as specified");
+        it('has a tooltip element for columns with tooltips, and no tooltips for columns without tooltips', () => {
+            let table = mount(<Table columns={columns} data={[]} />);
+            let tooltips = table
+                .find(SimpleTable)
+                .find('th')
+                .find(DefaultTooltip);
+            assert(
+                tooltips.length === 3,
+                'should be three tooltips, for the columns where it is defined'
+            );
+            expect(tooltips.at(0).props().overlay).toEqualJSX(
+                <span>Name of the data.</span>,
+                'Name tooltip should look as specified'
+            );
+            expect(tooltips.at(1).props().overlay).toEqualJSX(
+                <span>Number of the data.</span>,
+                'Number tooltip should look as specified'
+            );
+            expect(tooltips.at(2).props().overlay).toEqualJSX(
+                <span>String of the data</span>,
+                'String tooltip should look as specified'
+            );
         });
 
-        it("initially has no header with sort classes if no initial sort column specified", ()=>{
-            let table = mount(<Table columns={columns} data={[]}/>);
-            let headersHaveClasses = table.find(SimpleTable).find('th').map(x=>(x.hasClass("sort-asc") || x.hasClass("sort-des")));
-            assert.isFalse(headersHaveClasses.reduce((x,y)=>x||y, false), "none of them have any sort classes");
+        it('initially has no header with sort classes if no initial sort column specified', () => {
+            let table = mount(<Table columns={columns} data={[]} />);
+            let headersHaveClasses = table
+                .find(SimpleTable)
+                .find('th')
+                .map(x => x.hasClass('sort-asc') || x.hasClass('sort-des'));
+            assert.isFalse(
+                headersHaveClasses.reduce((x, y) => x || y, false),
+                'none of them have any sort classes'
+            );
         });
-        it("sets initial sort class correctly, and sets and toggles class correctly when clicking on columns", ()=>{
-            let table = mount(<Table initialSortColumn="Name" initialSortDirection="desc" columns={columns} data={[]}/>);
-            let nameHeader = table.find(SimpleTable).find('th').at(0);
-            assert.equal(nameHeader.text(), "Name", "we're dealing with the name header");
-            assert.isTrue(nameHeader.hasClass("sort-des"), "table starts with the initial sort specs given in the props");
+        it('sets initial sort class correctly, and sets and toggles class correctly when clicking on columns', () => {
+            let table = mount(
+                <Table
+                    initialSortColumn="Name"
+                    initialSortDirection="desc"
+                    columns={columns}
+                    data={[]}
+                />
+            );
+            let nameHeader = table
+                .find(SimpleTable)
+                .find('th')
+                .at(0);
+            assert.equal(
+                nameHeader.text(),
+                'Name',
+                "we're dealing with the name header"
+            );
+            assert.isTrue(
+                nameHeader.hasClass('sort-des'),
+                'table starts with the initial sort specs given in the props'
+            );
             nameHeader.simulate('click');
-            assert.isTrue(nameHeader.render().hasClass("sort-asc") && !nameHeader.render().hasClass("sort-des"), "toggles to ascending sort");
+            assert.isTrue(
+                nameHeader.render().hasClass('sort-asc') &&
+                    !nameHeader.render().hasClass('sort-des'),
+                'toggles to ascending sort'
+            );
             nameHeader.simulate('click');
 
-
-
-            assert.isTrue(nameHeader.render().hasClass("sort-des") && !nameHeader.render().hasClass("sort-asc"), "toggles to descending sort");
+            assert.isTrue(
+                nameHeader.render().hasClass('sort-des') &&
+                    !nameHeader.render().hasClass('sort-asc'),
+                'toggles to descending sort'
+            );
             nameHeader.simulate('click');
-            assert.isTrue(nameHeader.render().hasClass("sort-asc") && !nameHeader.render().hasClass("sort-des"), "goes back to ascending sort");
+            assert.isTrue(
+                nameHeader.render().hasClass('sort-asc') &&
+                    !nameHeader.render().hasClass('sort-des'),
+                'goes back to ascending sort'
+            );
             nameHeader.simulate('click');
-            assert.isTrue(nameHeader.render().hasClass("sort-des") && !nameHeader.render().hasClass("sort-asc"), "goes back to descending sort");
-
+            assert.isTrue(
+                nameHeader.render().hasClass('sort-des') &&
+                    !nameHeader.render().hasClass('sort-asc'),
+                'goes back to descending sort'
+            );
 
-            let stringHeader = table.find(SimpleTable).find('th').at(2);
-            assert.equal(stringHeader.text(), "String", "we're dealing with the string header");
-            assert.isFalse(stringHeader.hasClass("sort-asc") || stringHeader.hasClass("sort-des"), "string header doesnt have any sort classes to start");
+            let stringHeader = table
+                .find(SimpleTable)
+                .find('th')
+                .at(2);
+            assert.equal(
+                stringHeader.text(),
+                'String',
+                "we're dealing with the string header"
+            );
+            assert.isFalse(
+                stringHeader.hasClass('sort-asc') ||
+                    stringHeader.hasClass('sort-des'),
+                'string header doesnt have any sort classes to start'
+            );
             stringHeader.simulate('click');
 
-            assert.isTrue(stringHeader.render().hasClass("sort-des") && !stringHeader.render().hasClass("sort-asc"), "string header starts with descending sort, its defaultSortDirection");
-            assert.isFalse(nameHeader.render().hasClass("sort-asc") || nameHeader.render().hasClass("sort-des"), "name header no longer has any sort classes");
+            assert.isTrue(
+                stringHeader.render().hasClass('sort-des') &&
+                    !stringHeader.render().hasClass('sort-asc'),
+                'string header starts with descending sort, its defaultSortDirection'
+            );
+            assert.isFalse(
+                nameHeader.render().hasClass('sort-asc') ||
+                    nameHeader.render().hasClass('sort-des'),
+                'name header no longer has any sort classes'
+            );
 
             stringHeader.simulate('click');
-            assert.isTrue(stringHeader.render().hasClass("sort-asc") && !stringHeader.render().hasClass("sort-des"), "string header toggles to ascending sort");
-            assert.isFalse(nameHeader.render().hasClass("sort-asc") || nameHeader.render().hasClass("sort-des"), "name header no longer has any sort classes");
+            assert.isTrue(
+                stringHeader.render().hasClass('sort-asc') &&
+                    !stringHeader.render().hasClass('sort-des'),
+                'string header toggles to ascending sort'
+            );
+            assert.isFalse(
+                nameHeader.render().hasClass('sort-asc') ||
+                    nameHeader.render().hasClass('sort-des'),
+                'name header no longer has any sort classes'
+            );
 
             stringHeader.simulate('click');
-            assert.isTrue(stringHeader.render().hasClass("sort-des") && !stringHeader.render().hasClass("sort-asc"), "string header toggles to descending sort");
-            assert.isFalse(nameHeader.render().hasClass("sort-asc") || nameHeader.render().hasClass("sort-des"), "name header still has no sort classes");
+            assert.isTrue(
+                stringHeader.render().hasClass('sort-des') &&
+                    !stringHeader.render().hasClass('sort-asc'),
+                'string header toggles to descending sort'
+            );
+            assert.isFalse(
+                nameHeader.render().hasClass('sort-asc') ||
+                    nameHeader.render().hasClass('sort-des'),
+                'name header still has no sort classes'
+            );
             stringHeader.simulate('click');
-            assert.isTrue(stringHeader.render().hasClass("sort-asc") && !stringHeader.render().hasClass("sort-des"), "string header toggles back to ascending sort");
+            assert.isTrue(
+                stringHeader.render().hasClass('sort-asc') &&
+                    !stringHeader.render().hasClass('sort-des'),
+                'string header toggles back to ascending sort'
+            );
         });
 
-        it("does nothing on click of a header of an unsortable column", ()=>{
-            let table = mount(<Table columns={columns} data={[]}/>);
-            let numberListHeader = table.find(SimpleTable).find('th').at(3);
-            assert.equal(numberListHeader.text(), "Number List", "we're dealing with the number list header");
-            assert.isFalse(numberListHeader.hasClass("sort-asc") || numberListHeader.hasClass("sort-des"), "doesnt have any sort classes to start");
+        it('does nothing on click of a header of an unsortable column', () => {
+            let table = mount(<Table columns={columns} data={[]} />);
+            let numberListHeader = table
+                .find(SimpleTable)
+                .find('th')
+                .at(3);
+            assert.equal(
+                numberListHeader.text(),
+                'Number List',
+                "we're dealing with the number list header"
+            );
+            assert.isFalse(
+                numberListHeader.hasClass('sort-asc') ||
+                    numberListHeader.hasClass('sort-des'),
+                'doesnt have any sort classes to start'
+            );
             numberListHeader.simulate('click');
-            assert.isFalse(numberListHeader.hasClass("sort-asc") || numberListHeader.hasClass("sort-des"), "doesnt have any sort classes after a click");
+            assert.isFalse(
+                numberListHeader.hasClass('sort-asc') ||
+                    numberListHeader.hasClass('sort-des'),
+                'doesnt have any sort classes after a click'
+            );
             numberListHeader.simulate('click');
-            assert.isFalse(numberListHeader.hasClass("sort-asc") || numberListHeader.hasClass("sort-des"), "doesnt have any sort classes after two clicks");
+            assert.isFalse(
+                numberListHeader.hasClass('sort-asc') ||
+                    numberListHeader.hasClass('sort-des'),
+                'doesnt have any sort classes after two clicks'
+            );
         });
 
-        it("goes back to page 0 when clicking a sortable column, does nothing when clicking on unsortable column", ()=>{
-            let dupData = data.concat(data).concat(data).concat(data).concat(data).concat(data).concat(data)
-                            .concat(data).concat(data).concat(data).concat(data).concat(data);
-            assert.isTrue(dupData.length > 50, "we have at least two pages");
-            let table = mount(<Table columns={columns} data={dupData}/>);
+        it('goes back to page 0 when clicking a sortable column, does nothing when clicking on unsortable column', () => {
+            let dupData = data
+                .concat(data)
+                .concat(data)
+                .concat(data)
+                .concat(data)
+                .concat(data)
+                .concat(data)
+                .concat(data)
+                .concat(data)
+                .concat(data)
+                .concat(data)
+                .concat(data);
+            assert.isTrue(dupData.length > 50, 'we have at least two pages');
+            let table = mount(<Table columns={columns} data={dupData} />);
             clickNextPage(table);
-            assert.equal(getCurrentPage(table), 1, "now on page 1")
-
-            let numberListHeader = table.find(SimpleTable).find('th').at(3);
-            assert.equal(numberListHeader.text(), "Number List", "we're dealing with the number list header");
-            let nameHeader = table.find(SimpleTable).find('th').at(0);
-            assert.equal(nameHeader.text(), "Name", "we're dealing with the name header");
+            assert.equal(getCurrentPage(table), 1, 'now on page 1');
+
+            let numberListHeader = table
+                .find(SimpleTable)
+                .find('th')
+                .at(3);
+            assert.equal(
+                numberListHeader.text(),
+                'Number List',
+                "we're dealing with the number list header"
+            );
+            let nameHeader = table
+                .find(SimpleTable)
+                .find('th')
+                .at(0);
+            assert.equal(
+                nameHeader.text(),
+                'Name',
+                "we're dealing with the name header"
+            );
 
             numberListHeader.simulate('click');
-            assert.equal(getCurrentPage(table), 1, "still on page 1");
+            assert.equal(getCurrentPage(table), 1, 'still on page 1');
             nameHeader.simulate('click');
-            assert.equal(getCurrentPage(table), 0, "back to page 0");
+            assert.equal(getCurrentPage(table), 0, 'back to page 0');
         });
     });
-    describe('sorting', ()=>{
-        it("sorts rows according to initially selected sort column and direction", ()=>{
-            let table = mount(<Table columns={columns} data={data} initialSortColumn="Number" initialSortDirection="asc"/>);
+    describe('sorting', () => {
+        it('sorts rows according to initially selected sort column and direction', () => {
+            let table = mount(
+                <Table
+                    columns={columns}
+                    data={data}
+                    initialSortColumn="Number"
+                    initialSortDirection="asc"
+                />
+            );
             let rows = getVisibleRows(table);
 
             // starting initially sorting ascending by number
             expect(rows[0]).toEqualJSX(
                 <tr>
-                    <td><span>3</span></td>
-                    <td><span>-1</span></td>
-                    <td><span>zijxcpo</span></td>
-                    <td><span>BLAH</span></td>
-                    <td><span>zijxcpo</span></td>
+                    <td>
+                        <span>3</span>
+                    </td>
+                    <td>
+                        <span>-1</span>
+                    </td>
+                    <td>
+                        <span>zijxcpo</span>
+                    </td>
+                    <td>
+                        <span>BLAH</span>
+                    </td>
+                    <td>
+                        <span>zijxcpo</span>
+                    </td>
                 </tr>
             );
             expect(rows[1]).toEqualJSX(
                 <tr>
-                    <td><span>0</span></td>
-                    <td><span>0</span></td>
-                    <td><span>asdfj</span></td>
-                    <td><span>BLAH</span></td>
-                    <td><span>asdfj</span></td>
+                    <td>
+                        <span>0</span>
+                    </td>
+                    <td>
+                        <span>0</span>
+                    </td>
+                    <td>
+                        <span>asdfj</span>
+                    </td>
+                    <td>
+                        <span>BLAH</span>
+                    </td>
+                    <td>
+                        <span>asdfj</span>
+                    </td>
                 </tr>
             );
             expect(rows[2]).toEqualJSX(
                 <tr>
-                    <td><span>1</span></td>
-                    <td><span>6</span></td>
-                    <td><span>kdfjpo</span></td>
-                    <td><span>BLAH</span></td>
-                    <td><span>kdfjpo</span></td>
+                    <td>
+                        <span>1</span>
+                    </td>
+                    <td>
+                        <span>6</span>
+                    </td>
+                    <td>
+                        <span>kdfjpo</span>
+                    </td>
+                    <td>
+                        <span>BLAH</span>
+                    </td>
+                    <td>
+                        <span>kdfjpo</span>
+                    </td>
                 </tr>
             );
             expect(rows[3]).toEqualJSX(
                 <tr>
-                    <td><span>4</span></td>
-                    <td><span>90</span></td>
-                    <td><span>zkzxc</span></td>
-                    <td><span>BLAH</span></td>
-                    <td><span>zkzxc</span></td>
+                    <td>
+                        <span>4</span>
+                    </td>
+                    <td>
+                        <span>90</span>
+                    </td>
+                    <td>
+                        <span>zkzxc</span>
+                    </td>
+                    <td>
+                        <span>BLAH</span>
+                    </td>
+                    <td>
+                        <span>zkzxc</span>
+                    </td>
                 </tr>
             );
             expect(rows[4]).toEqualJSX(
                 <tr>
-                    <td><span>2</span></td>
-                    <td><span></span></td>
-                    <td><span></span></td>
-                    <td><span>BLAH</span></td>
-                    <td><span></span></td>
+                    <td>
+                        <span>2</span>
+                    </td>
+                    <td>
+                        <span></span>
+                    </td>
+                    <td>
+                        <span></span>
+                    </td>
+                    <td>
+                        <span>BLAH</span>
+                    </td>
+                    <td>
+                        <span></span>
+                    </td>
                 </tr>
             );
 
             // now try initially sorting descending by str
-            table = mount(<Table columns={columns} data={data} initialSortColumn="String" initialSortDirection="desc"/>);
+            table = mount(
+                <Table
+                    columns={columns}
+                    data={data}
+                    initialSortColumn="String"
+                    initialSortDirection="desc"
+                />
+            );
             rows = getVisibleRows(table);
 
             expect(rows[0]).toEqualJSX(
                 <tr>
-                    <td><span>4</span></td>
-                    <td><span>90</span></td>
-                    <td><span>zkzxc</span></td>
-                    <td><span>BLAH</span></td>
-                    <td><span>zkzxc</span></td>
+                    <td>
+                        <span>4</span>
+                    </td>
+                    <td>
+                        <span>90</span>
+                    </td>
+                    <td>
+                        <span>zkzxc</span>
+                    </td>
+                    <td>
+                        <span>BLAH</span>
+                    </td>
+                    <td>
+                        <span>zkzxc</span>
+                    </td>
                 </tr>
             );
             expect(rows[1]).toEqualJSX(
                 <tr>
-                    <td><span>3</span></td>
-                    <td><span>-1</span></td>
-                    <td><span>zijxcpo</span></td>
-                    <td><span>BLAH</span></td>
-                    <td><span>zijxcpo</span></td>
+                    <td>
+                        <span>3</span>
+                    </td>
+                    <td>
+                        <span>-1</span>
+                    </td>
+                    <td>
+                        <span>zijxcpo</span>
+                    </td>
+                    <td>
+                        <span>BLAH</span>
+                    </td>
+                    <td>
+                        <span>zijxcpo</span>
+                    </td>
                 </tr>
             );
             expect(rows[2]).toEqualJSX(
                 <tr>
-                    <td><span>1</span></td>
-                    <td><span>6</span></td>
-                    <td><span>kdfjpo</span></td>
-                    <td><span>BLAH</span></td>
-                    <td><span>kdfjpo</span></td>
+                    <td>
+                        <span>1</span>
+                    </td>
+                    <td>
+                        <span>6</span>
+                    </td>
+                    <td>
+                        <span>kdfjpo</span>
+                    </td>
+                    <td>
+                        <span>BLAH</span>
+                    </td>
+                    <td>
+                        <span>kdfjpo</span>
+                    </td>
                 </tr>
             );
             expect(rows[3]).toEqualJSX(
                 <tr>
-                    <td><span>0</span></td>
-                    <td><span>0</span></td>
-                    <td><span>asdfj</span></td>
-                    <td><span>BLAH</span></td>
-                    <td><span>asdfj</span></td>
+                    <td>
+                        <span>0</span>
+                    </td>
+                    <td>
+                        <span>0</span>
+                    </td>
+                    <td>
+                        <span>asdfj</span>
+                    </td>
+                    <td>
+                        <span>BLAH</span>
+                    </td>
+                    <td>
+                        <span>asdfj</span>
+                    </td>
                 </tr>
-
             );
             expect(rows[4]).toEqualJSX(
                 <tr>
-                    <td><span>2</span></td>
-                    <td><span></span></td>
-                    <td><span></span></td>
-                    <td><span>BLAH</span></td>
-                    <td><span></span></td>
+                    <td>
+                        <span>2</span>
+                    </td>
+                    <td>
+                        <span></span>
+                    </td>
+                    <td>
+                        <span></span>
+                    </td>
+                    <td>
+                        <span>BLAH</span>
+                    </td>
+                    <td>
+                        <span></span>
+                    </td>
                 </tr>
             );
         });
 
-        it("sorts rows according to the selected sort column and direction", ()=>{
-            let table = mount(<Table columns={columns} data={data}/>);
+        it('sorts rows according to the selected sort column and direction', () => {
+            let table = mount(<Table columns={columns} data={data} />);
             let rows = getVisibleRows(table);
             expect(rows[0]).toEqualJSX(
                 <tr>
-                    <td><span>0</span></td>
-                    <td><span>0</span></td>
-                    <td><span>asdfj</span></td>
-                    <td><span>BLAH</span></td>
-                    <td><span>asdfj</span></td>
-                </tr>);
+                    <td>
+                        <span>0</span>
+                    </td>
+                    <td>
+                        <span>0</span>
+                    </td>
+                    <td>
+                        <span>asdfj</span>
+                    </td>
+                    <td>
+                        <span>BLAH</span>
+                    </td>
+                    <td>
+                        <span>asdfj</span>
+                    </td>
+                </tr>
+            );
             expect(rows[1]).toEqualJSX(
                 <tr>
-                    <td><span>1</span></td>
-                    <td><span>6</span></td>
-                    <td><span>kdfjpo</span></td>
-                    <td><span>BLAH</span></td>
-                    <td><span>kdfjpo</span></td>
-                </tr>);
+                    <td>
+                        <span>1</span>
+                    </td>
+                    <td>
+                        <span>6</span>
+                    </td>
+                    <td>
+                        <span>kdfjpo</span>
+                    </td>
+                    <td>
+                        <span>BLAH</span>
+                    </td>
+                    <td>
+                        <span>kdfjpo</span>
+                    </td>
+                </tr>
+            );
             expect(rows[2]).toEqualJSX(
                 <tr>
-                    <td><span>2</span></td>
-                    <td><span></span></td>
-                    <td><span></span></td>
-                    <td><span>BLAH</span></td>
-                    <td><span></span></td>
-                </tr>);
+                    <td>
+                        <span>2</span>
+                    </td>
+                    <td>
+                        <span></span>
+                    </td>
+                    <td>
+                        <span></span>
+                    </td>
+                    <td>
+                        <span>BLAH</span>
+                    </td>
+                    <td>
+                        <span></span>
+                    </td>
+                </tr>
+            );
             expect(rows[3]).toEqualJSX(
                 <tr>
-                    <td><span>3</span></td>
-                    <td><span>-1</span></td>
-                    <td><span>zijxcpo</span></td>
-                    <td><span>BLAH</span></td>
-                    <td><span>zijxcpo</span></td>
-                </tr>);
+                    <td>
+                        <span>3</span>
+                    </td>
+                    <td>
+                        <span>-1</span>
+                    </td>
+                    <td>
+                        <span>zijxcpo</span>
+                    </td>
+                    <td>
+                        <span>BLAH</span>
+                    </td>
+                    <td>
+                        <span>zijxcpo</span>
+                    </td>
+                </tr>
+            );
             expect(rows[4]).toEqualJSX(
                 <tr>
-                    <td><span>4</span></td>
-                    <td><span>90</span></td>
-                    <td><span>zkzxc</span></td>
-                    <td><span>BLAH</span></td>
-                    <td><span>zkzxc</span></td>
-                </tr>);
-
-            let header = table.find(SimpleTable).find('th').at(1);
-            assert.equal(header.text(), "Number", "we're dealing with the number header");
+                    <td>
+                        <span>4</span>
+                    </td>
+                    <td>
+                        <span>90</span>
+                    </td>
+                    <td>
+                        <span>zkzxc</span>
+                    </td>
+                    <td>
+                        <span>BLAH</span>
+                    </td>
+                    <td>
+                        <span>zkzxc</span>
+                    </td>
+                </tr>
+            );
+
+            let header = table
+                .find(SimpleTable)
+                .find('th')
+                .at(1);
+            assert.equal(
+                header.text(),
+                'Number',
+                "we're dealing with the number header"
+            );
             header.simulate('click');
-            assert.isTrue(header.render().hasClass("sort-des"), "Number column starts with descending, its defaultSortDirection");
+            assert.isTrue(
+                header.render().hasClass('sort-des'),
+                'Number column starts with descending, its defaultSortDirection'
+            );
             header.simulate('click');
-            assert.isTrue(header.render().hasClass("sort-asc"), "we're dealing with ascending sort");
+            assert.isTrue(
+                header.render().hasClass('sort-asc'),
+                "we're dealing with ascending sort"
+            );
             rows = getVisibleRows(table);
 
             expect(rows[0]).toEqualJSX(
                 <tr>
-                    <td><span>3</span></td>
-                    <td><span>-1</span></td>
-                    <td><span>zijxcpo</span></td>
-                    <td><span>BLAH</span></td>
-                    <td><span>zijxcpo</span></td>
+                    <td>
+                        <span>3</span>
+                    </td>
+                    <td>
+                        <span>-1</span>
+                    </td>
+                    <td>
+                        <span>zijxcpo</span>
+                    </td>
+                    <td>
+                        <span>BLAH</span>
+                    </td>
+                    <td>
+                        <span>zijxcpo</span>
+                    </td>
                 </tr>
-                );
+            );
             expect(rows[1]).toEqualJSX(
                 <tr>
-                    <td><span>0</span></td>
-                    <td><span>0</span></td>
-                    <td><span>asdfj</span></td>
-                    <td><span>BLAH</span></td>
-                    <td><span>asdfj</span></td>
+                    <td>
+                        <span>0</span>
+                    </td>
+                    <td>
+                        <span>0</span>
+                    </td>
+                    <td>
+                        <span>asdfj</span>
+                    </td>
+                    <td>
+                        <span>BLAH</span>
+                    </td>
+                    <td>
+                        <span>asdfj</span>
+                    </td>
                 </tr>
-                );
+            );
             expect(rows[2]).toEqualJSX(
                 <tr>
-                    <td><span>1</span></td>
-                    <td><span>6</span></td>
-                    <td><span>kdfjpo</span></td>
-                    <td><span>BLAH</span></td>
-                    <td><span>kdfjpo</span></td>
+                    <td>
+                        <span>1</span>
+                    </td>
+                    <td>
+                        <span>6</span>
+                    </td>
+                    <td>
+                        <span>kdfjpo</span>
+                    </td>
+                    <td>
+                        <span>BLAH</span>
+                    </td>
+                    <td>
+                        <span>kdfjpo</span>
+                    </td>
                 </tr>
-                );
+            );
             expect(rows[3]).toEqualJSX(
                 <tr>
-                    <td><span>4</span></td>
-                    <td><span>90</span></td>
-                    <td><span>zkzxc</span></td>
-                    <td><span>BLAH</span></td>
-                    <td><span>zkzxc</span></td>
+                    <td>
+                        <span>4</span>
+                    </td>
+                    <td>
+                        <span>90</span>
+                    </td>
+                    <td>
+                        <span>zkzxc</span>
+                    </td>
+                    <td>
+                        <span>BLAH</span>
+                    </td>
+                    <td>
+                        <span>zkzxc</span>
+                    </td>
                 </tr>
-                );
+            );
             expect(rows[4]).toEqualJSX(
                 <tr>
-                    <td><span>2</span></td>
-                    <td><span></span></td>
-                    <td><span></span></td>
-                    <td><span>BLAH</span></td>
-                    <td><span></span></td>
+                    <td>
+                        <span>2</span>
+                    </td>
+                    <td>
+                        <span></span>
+                    </td>
+                    <td>
+                        <span></span>
+                    </td>
+                    <td>
+                        <span>BLAH</span>
+                    </td>
+                    <td>
+                        <span></span>
+                    </td>
                 </tr>
-                );
+            );
 
-            let numberListHeader = table.find(SimpleTable).find('th').at(3);
-            assert.equal(numberListHeader.text(), "Number List", "we're dealing with the number list header");
+            let numberListHeader = table
+                .find(SimpleTable)
+                .find('th')
+                .at(3);
+            assert.equal(
+                numberListHeader.text(),
+                'Number List',
+                "we're dealing with the number list header"
+            );
             numberListHeader.simulate('click');
             // nothing should happen because its not sortable, so same order as immediately above
             rows = getVisibleRows(table);
 
             expect(rows[0]).toEqualJSX(
                 <tr>
-                    <td><span>3</span></td>
-                    <td><span>-1</span></td>
-                    <td><span>zijxcpo</span></td>
-                    <td><span>BLAH</span></td>
-                    <td><span>zijxcpo</span></td>
+                    <td>
+                        <span>3</span>
+                    </td>
+                    <td>
+                        <span>-1</span>
+                    </td>
+                    <td>
+                        <span>zijxcpo</span>
+                    </td>
+                    <td>
+                        <span>BLAH</span>
+                    </td>
+                    <td>
+                        <span>zijxcpo</span>
+                    </td>
                 </tr>
             );
             expect(rows[1]).toEqualJSX(
                 <tr>
-                    <td><span>0</span></td>
-                    <td><span>0</span></td>
-                    <td><span>asdfj</span></td>
-                    <td><span>BLAH</span></td>
-                    <td><span>asdfj</span></td>
+                    <td>
+                        <span>0</span>
+                    </td>
+                    <td>
+                        <span>0</span>
+                    </td>
+                    <td>
+                        <span>asdfj</span>
+                    </td>
+                    <td>
+                        <span>BLAH</span>
+                    </td>
+                    <td>
+                        <span>asdfj</span>
+                    </td>
                 </tr>
             );
             expect(rows[2]).toEqualJSX(
                 <tr>
-                    <td><span>1</span></td>
-                    <td><span>6</span></td>
-                    <td><span>kdfjpo</span></td>
-                    <td><span>BLAH</span></td>
-                    <td><span>kdfjpo</span></td>
+                    <td>
+                        <span>1</span>
+                    </td>
+                    <td>
+                        <span>6</span>
+                    </td>
+                    <td>
+                        <span>kdfjpo</span>
+                    </td>
+                    <td>
+                        <span>BLAH</span>
+                    </td>
+                    <td>
+                        <span>kdfjpo</span>
+                    </td>
                 </tr>
             );
             expect(rows[3]).toEqualJSX(
                 <tr>
-                    <td><span>4</span></td>
-                    <td><span>90</span></td>
-                    <td><span>zkzxc</span></td>
-                    <td><span>BLAH</span></td>
-                    <td><span>zkzxc</span></td>
+                    <td>
+                        <span>4</span>
+                    </td>
+                    <td>
+                        <span>90</span>
+                    </td>
+                    <td>
+                        <span>zkzxc</span>
+                    </td>
+                    <td>
+                        <span>BLAH</span>
+                    </td>
+                    <td>
+                        <span>zkzxc</span>
+                    </td>
                 </tr>
             );
             expect(rows[4]).toEqualJSX(
                 <tr>
-                    <td><span>2</span></td>
-                    <td><span></span></td>
-                    <td><span></span></td>
-                    <td><span>BLAH</span></td>
-                    <td><span></span></td>
+                    <td>
+                        <span>2</span>
+                    </td>
+                    <td>
+                        <span></span>
+                    </td>
+                    <td>
+                        <span></span>
+                    </td>
+                    <td>
+                        <span>BLAH</span>
+                    </td>
+                    <td>
+                        <span></span>
+                    </td>
                 </tr>
             );
 
             header.simulate('click');
-            assert.isTrue(header.render().hasClass("sort-des"), "we're dealing with descending sort");
+            assert.isTrue(
+                header.render().hasClass('sort-des'),
+                "we're dealing with descending sort"
+            );
             rows = getVisibleRows(table);
 
             expect(rows[0]).toEqualJSX(
                 <tr>
-                    <td><span>4</span></td>
-                    <td><span>90</span></td>
-                    <td><span>zkzxc</span></td>
-                    <td><span>BLAH</span></td>
-                    <td><span>zkzxc</span></td>
-                </tr>);
+                    <td>
+                        <span>4</span>
+                    </td>
+                    <td>
+                        <span>90</span>
+                    </td>
+                    <td>
+                        <span>zkzxc</span>
+                    </td>
+                    <td>
+                        <span>BLAH</span>
+                    </td>
+                    <td>
+                        <span>zkzxc</span>
+                    </td>
+                </tr>
+            );
             expect(rows[1]).toEqualJSX(
                 <tr>
-                    <td><span>1</span></td>
-                    <td><span>6</span></td>
-                    <td><span>kdfjpo</span></td>
-                    <td><span>BLAH</span></td>
-                    <td><span>kdfjpo</span></td>
-                </tr>);
+                    <td>
+                        <span>1</span>
+                    </td>
+                    <td>
+                        <span>6</span>
+                    </td>
+                    <td>
+                        <span>kdfjpo</span>
+                    </td>
+                    <td>
+                        <span>BLAH</span>
+                    </td>
+                    <td>
+                        <span>kdfjpo</span>
+                    </td>
+                </tr>
+            );
             expect(rows[2]).toEqualJSX(
                 <tr>
-                    <td><span>0</span></td>
-                    <td><span>0</span></td>
-                    <td><span>asdfj</span></td>
-                    <td><span>BLAH</span></td>
-                    <td><span>asdfj</span></td>
-                </tr>);
+                    <td>
+                        <span>0</span>
+                    </td>
+                    <td>
+                        <span>0</span>
+                    </td>
+                    <td>
+                        <span>asdfj</span>
+                    </td>
+                    <td>
+                        <span>BLAH</span>
+                    </td>
+                    <td>
+                        <span>asdfj</span>
+                    </td>
+                </tr>
+            );
             expect(rows[3]).toEqualJSX(
                 <tr>
-                    <td><span>3</span></td>
-                    <td><span>-1</span></td>
-                    <td><span>zijxcpo</span></td>
-                    <td><span>BLAH</span></td>
-                    <td><span>zijxcpo</span></td>
-                </tr>);
+                    <td>
+                        <span>3</span>
+                    </td>
+                    <td>
+                        <span>-1</span>
+                    </td>
+                    <td>
+                        <span>zijxcpo</span>
+                    </td>
+                    <td>
+                        <span>BLAH</span>
+                    </td>
+                    <td>
+                        <span>zijxcpo</span>
+                    </td>
+                </tr>
+            );
             expect(rows[4]).toEqualJSX(
                 <tr>
-                    <td><span>2</span></td>
-                    <td><span></span></td>
-                    <td><span></span></td>
-                    <td><span>BLAH</span></td>
-                    <td><span></span></td>
-                </tr>);
-
-            header = table.find(SimpleTable).find('th').at(0);
-            assert.equal(header.text(), "Name", "we're dealing with the name header");
+                    <td>
+                        <span>2</span>
+                    </td>
+                    <td>
+                        <span></span>
+                    </td>
+                    <td>
+                        <span></span>
+                    </td>
+                    <td>
+                        <span>BLAH</span>
+                    </td>
+                    <td>
+                        <span></span>
+                    </td>
+                </tr>
+            );
+
+            header = table
+                .find(SimpleTable)
+                .find('th')
+                .at(0);
+            assert.equal(
+                header.text(),
+                'Name',
+                "we're dealing with the name header"
+            );
             header.simulate('click');
-            assert.isTrue(header.render().hasClass("sort-asc"), "we're dealing with ascending sort");
+            assert.isTrue(
+                header.render().hasClass('sort-asc'),
+                "we're dealing with ascending sort"
+            );
             rows = getVisibleRows(table);
             expect(rows[0]).toEqualJSX(
                 <tr>
-                    <td><span>0</span></td>
-                    <td><span>0</span></td>
-                    <td><span>asdfj</span></td>
-                    <td><span>BLAH</span></td>
-                    <td><span>asdfj</span></td>
-                </tr>);
+                    <td>
+                        <span>0</span>
+                    </td>
+                    <td>
+                        <span>0</span>
+                    </td>
+                    <td>
+                        <span>asdfj</span>
+                    </td>
+                    <td>
+                        <span>BLAH</span>
+                    </td>
+                    <td>
+                        <span>asdfj</span>
+                    </td>
+                </tr>
+            );
             expect(rows[1]).toEqualJSX(
                 <tr>
-                    <td><span>1</span></td>
-                    <td><span>6</span></td>
-                    <td><span>kdfjpo</span></td>
-                    <td><span>BLAH</span></td>
-                    <td><span>kdfjpo</span></td>
-                </tr>);
+                    <td>
+                        <span>1</span>
+                    </td>
+                    <td>
+                        <span>6</span>
+                    </td>
+                    <td>
+                        <span>kdfjpo</span>
+                    </td>
+                    <td>
+                        <span>BLAH</span>
+                    </td>
+                    <td>
+                        <span>kdfjpo</span>
+                    </td>
+                </tr>
+            );
             expect(rows[2]).toEqualJSX(
                 <tr>
-                    <td><span>2</span></td>
-                    <td><span></span></td>
-                    <td><span></span></td>
-                    <td><span>BLAH</span></td>
-                    <td><span></span></td>
-                </tr>);
+                    <td>
+                        <span>2</span>
+                    </td>
+                    <td>
+                        <span></span>
+                    </td>
+                    <td>
+                        <span></span>
+                    </td>
+                    <td>
+                        <span>BLAH</span>
+                    </td>
+                    <td>
+                        <span></span>
+                    </td>
+                </tr>
+            );
             expect(rows[3]).toEqualJSX(
                 <tr>
-                    <td><span>3</span></td>
-                    <td><span>-1</span></td>
-                    <td><span>zijxcpo</span></td>
-                    <td><span>BLAH</span></td>
-                    <td><span>zijxcpo</span></td>
-                </tr>);
+                    <td>
+                        <span>3</span>
+                    </td>
+                    <td>
+                        <span>-1</span>
+                    </td>
+                    <td>
+                        <span>zijxcpo</span>
+                    </td>
+                    <td>
+                        <span>BLAH</span>
+                    </td>
+                    <td>
+                        <span>zijxcpo</span>
+                    </td>
+                </tr>
+            );
             expect(rows[4]).toEqualJSX(
                 <tr>
-                    <td><span>4</span></td>
-                    <td><span>90</span></td>
-                    <td><span>zkzxc</span></td>
-                    <td><span>BLAH</span></td>
-                    <td><span>zkzxc</span></td>
-                </tr>);
+                    <td>
+                        <span>4</span>
+                    </td>
+                    <td>
+                        <span>90</span>
+                    </td>
+                    <td>
+                        <span>zkzxc</span>
+                    </td>
+                    <td>
+                        <span>BLAH</span>
+                    </td>
+                    <td>
+                        <span>zkzxc</span>
+                    </td>
+                </tr>
+            );
         });
-        it("paginates the data correctly according to the sorted order", ()=>{
-            let table = mount(<Table columns={simpleColumns} data={simpleData}/>);
-            let header = table.find(SimpleTable).find('th').at(0);
-            assert.equal(getItemsPerPage(table), 50, "for this test we're assuming 50 items per page");
-            assert.equal(simpleData.length, 120, "for this test we're assuming 120 rows total");
+        it('paginates the data correctly according to the sorted order', () => {
+            let table = mount(
+                <Table columns={simpleColumns} data={simpleData} />
+            );
+            let header = table
+                .find(SimpleTable)
+                .find('th')
+                .at(0);
+            assert.equal(
+                getItemsPerPage(table),
+                50,
+                "for this test we're assuming 50 items per page"
+            );
+            assert.equal(
+                simpleData.length,
+                120,
+                "for this test we're assuming 120 rows total"
+            );
             header.simulate('click');
-            assert.isTrue(header.render().hasClass("sort-asc"), "ascending sort");
+            assert.isTrue(
+                header.render().hasClass('sort-asc'),
+                'ascending sort'
+            );
             let rows = getVisibleRows(table);
-            for (let i=0; i<rows.length; i++) {
-                expect(rows[i]).toEqualJSX(<tr><td><span>{i}</span></td></tr>);
+            for (let i = 0; i < rows.length; i++) {
+                expect(rows[i]).toEqualJSX(
+                    <tr>
+                        <td>
+                            <span>{i}</span>
+                        </td>
+                    </tr>
+                );
             }
             clickNextPage(table);
-            assert.equal(getCurrentPage(table), 1, "now on page 1");
+            assert.equal(getCurrentPage(table), 1, 'now on page 1');
             rows = getVisibleRows(table);
-            for (let i=0; i<rows.length; i++) {
-                expect(rows[i]).toEqualJSX(<tr><td><span>{i+50}</span></td></tr>);
+            for (let i = 0; i < rows.length; i++) {
+                expect(rows[i]).toEqualJSX(
+                    <tr>
+                        <td>
+                            <span>{i + 50}</span>
+                        </td>
+                    </tr>
+                );
             }
             header.simulate('click');
-            assert.isTrue(header.render().hasClass("sort-des"), "descending sort");
-            assert.equal(getCurrentPage(table), 0, "back to page 0");
+            assert.isTrue(
+                header.render().hasClass('sort-des'),
+                'descending sort'
+            );
+            assert.equal(getCurrentPage(table), 0, 'back to page 0');
             rows = getVisibleRows(table);
-            for (let i=0; i<rows.length; i++) {
-                expect(rows[i]).toEqualJSX(<tr><td><span>{119-i}</span></td></tr>);
+            for (let i = 0; i < rows.length; i++) {
+                expect(rows[i]).toEqualJSX(
+                    <tr>
+                        <td>
+                            <span>{119 - i}</span>
+                        </td>
+                    </tr>
+                );
             }
             clickNextPage(table);
-            assert.equal(getCurrentPage(table), 1, "now on page 1");
+            assert.equal(getCurrentPage(table), 1, 'now on page 1');
             rows = getVisibleRows(table);
-            for (let i=0; i<rows.length; i++) {
-                expect(rows[i]).toEqualJSX(<tr><td><span>{119-50-i}</span></td></tr>);
+            for (let i = 0; i < rows.length; i++) {
+                expect(rows[i]).toEqualJSX(
+                    <tr>
+                        <td>
+                            <span>{119 - 50 - i}</span>
+                        </td>
+                    </tr>
+                );
             }
             clickNextPage(table);
-            assert.equal(getCurrentPage(table), 2, "now on page 2");
+            assert.equal(getCurrentPage(table), 2, 'now on page 2');
             rows = getVisibleRows(table);
-            for (let i=0; i<rows.length; i++) {
-                expect(rows[i]).toEqualJSX(<tr><td><span>{119-100-i}</span></td></tr>);
+            for (let i = 0; i < rows.length; i++) {
+                expect(rows[i]).toEqualJSX(
+                    <tr>
+                        <td>
+                            <span>{119 - 100 - i}</span>
+                        </td>
+                    </tr>
+                );
             }
         });
     });
-    describe('rows',()=>{
-        it("renders rows properly, according to specification", ()=>{
-            let table = mount(<Table columns={columns} data={data}/>);
+    describe('rows', () => {
+        it('renders rows properly, according to specification', () => {
+            let table = mount(<Table columns={columns} data={data} />);
             let rows = getVisibleRows(table);
-            for (let i=0; i<rows.length; i++) {
+            for (let i = 0; i < rows.length; i++) {
                 expect(rows[i]).toEqualJSX(
                     <tr>
-                        <td><span>{data[i].name}</span></td>
-                        <td><span>{data[i].num}</span></td>
-                        <td><span>{data[i].str}</span></td>
-                        <td><span>BLAH</span></td>
-                        <td><span>{data[i].str}</span></td>
+                        <td>
+                            <span>{data[i].name}</span>
+                        </td>
+                        <td>
+                            <span>{data[i].num}</span>
+                        </td>
+                        <td>
+                            <span>{data[i].str}</span>
+                        </td>
+                        <td>
+                            <span>BLAH</span>
+                        </td>
+                        <td>
+                            <span>{data[i].str}</span>
+                        </td>
                     </tr>
                 );
             }
-            table.setProps({data:[data[0]]});
+            table.setProps({ data: [data[0]] });
             rows = getVisibleRows(table);
             assert.equal(rows.length, 1);
             expect(rows[0]).toEqualJSX(
                 <tr>
-                    <td><span>{data[0].name}</span></td>
-                    <td><span>{data[0].num}</span></td>
-                    <td><span>{data[0].str}</span></td>
-                    <td><span>BLAH</span></td>
-                    <td><span>{data[0].str}</span></td>
+                    <td>
+                        <span>{data[0].name}</span>
+                    </td>
+                    <td>
+                        <span>{data[0].num}</span>
+                    </td>
+                    <td>
+                        <span>{data[0].str}</span>
+                    </td>
+                    <td>
+                        <span>BLAH</span>
+                    </td>
+                    <td>
+                        <span>{data[0].str}</span>
+                    </td>
                 </tr>
             );
-            table.setProps({data:[]});
+            table.setProps({ data: [] });
             rows = getVisibleRows(table);
             assert.equal(rows.length, 0);
         });
-        it("highlights rows properly, according to highlight function in data store", ()=>{
-            const store:HighlightingDataStore = new HighlightingDataStore(data);
-            let table = mount(<Table columns={columns} dataStore={store}/>);
+        it('highlights rows properly, according to highlight function in data store', () => {
+            const store: HighlightingDataStore = new HighlightingDataStore(
+                data
+            );
+            let table = mount(<Table columns={columns} dataStore={store} />);
             let rows = getSimpleTableRows(table);
-            assert.isFalse(rows.at(0).hasClass("highlighted"), "row 0 not highlighted");
-            assert.isTrue(rows.at(1).hasClass("highlighted"), "row 1 highlighted");
-            assert.isFalse(rows.at(2).hasClass("highlighted"), "row 2 not highlighted");
-            assert.isTrue(rows.at(3).hasClass("highlighted"), "row 3 highlighted");
-            assert.isTrue(rows.at(4).hasClass("highlighted"), "row 4 highlighted");
+            assert.isFalse(
+                rows.at(0).hasClass('highlighted'),
+                'row 0 not highlighted'
+            );
+            assert.isTrue(
+                rows.at(1).hasClass('highlighted'),
+                'row 1 highlighted'
+            );
+            assert.isFalse(
+                rows.at(2).hasClass('highlighted'),
+                'row 2 not highlighted'
+            );
+            assert.isTrue(
+                rows.at(3).hasClass('highlighted'),
+                'row 3 highlighted'
+            );
+            assert.isTrue(
+                rows.at(4).hasClass('highlighted'),
+                'row 4 highlighted'
+            );
         });
-        it("onRowClick prop fires w associated datum when the row is clicked", ()=>{
-            let onRowClick = sinon.spy((fd:any)=>{});
+        it('onRowClick prop fires w associated datum when the row is clicked', () => {
+            let onRowClick = sinon.spy((fd: any) => {});
             let tmpColumns = _.cloneDeep(columns);
-            tmpColumns[0].render = (d:any)=>(<span id={`name-cell-${d.name}`}>{d.name}</span>);
-            let table = mount(<Table columns={tmpColumns} data={data} onRowClick={onRowClick}/>);
-            table.find("#name-cell-3").simulate('click');
+            tmpColumns[0].render = (d: any) => (
+                <span id={`name-cell-${d.name}`}>{d.name}</span>
+            );
+            let table = mount(
+                <Table
+                    columns={tmpColumns}
+                    data={data}
+                    onRowClick={onRowClick}
+                />
+            );
+            table.find('#name-cell-3').simulate('click');
             assert.isTrue(onRowClick.calledOnce);
             assert.deepEqual(onRowClick.args[0][0], datum3);
         });
     });
-    describe('column visibility', ()=>{
+    describe('column visibility', () => {
         // test visibility of headers and correponding data cells in the rows
-        let table:ReactWrapper<any, any>;
-        before(()=>{
-            table = mount(<Table columns={columns} data={data}/>);
+        let table: ReactWrapper<any, any>;
+        before(() => {
+            table = mount(<Table columns={columns} data={data} />);
         });
-        it("shows initially visible columns at first, and does not show invisible ones", ()=>{
-            assert.deepEqual(getVisibleColumnHeaders(table), ["Name", "Number", "String", "Number List", "String without filter function"],
-                "initially visible columns are the ones specified without 'visible:false'");
+        it('shows initially visible columns at first, and does not show invisible ones', () => {
+            assert.deepEqual(
+                getVisibleColumnHeaders(table),
+                [
+                    'Name',
+                    'Number',
+                    'String',
+                    'Number List',
+                    'String without filter function',
+                ],
+                "initially visible columns are the ones specified without 'visible:false'"
+            );
         });
-        it("allows changing column visibility", ()=>{
+        it('allows changing column visibility', () => {
             let rows = getVisibleRows(table);
-            for (let i=0; i<rows.length; i++) {
+            for (let i = 0; i < rows.length; i++) {
                 expect(rows[i]).toEqualJSX(
                     <tr>
-                        <td><span>{data[i].name}</span></td>
-                        <td><span>{data[i].num}</span></td>
-                        <td><span>{data[i].str}</span></td>
-                        <td><span>BLAH</span></td>
-                        <td><span>{data[i].str}</span></td>
+                        <td>
+                            <span>{data[i].name}</span>
+                        </td>
+                        <td>
+                            <span>{data[i].num}</span>
+                        </td>
+                        <td>
+                            <span>{data[i].str}</span>
+                        </td>
+                        <td>
+                            <span>BLAH</span>
+                        </td>
+                        <td>
+                            <span>{data[i].str}</span>
+                        </td>
                     </tr>
                 );
             }
-            assert.isFalse(clickColumnVisibilityCheckbox(table, 'Name'), "Name checkbox is now unchecked");
-            assert.deepEqual(getVisibleColumnHeaders(table), ["Number", "String", "Number List", "String without filter function"],
-                "Name column no longer visible");
+            assert.isFalse(
+                clickColumnVisibilityCheckbox(table, 'Name'),
+                'Name checkbox is now unchecked'
+            );
+            assert.deepEqual(
+                getVisibleColumnHeaders(table),
+                [
+                    'Number',
+                    'String',
+                    'Number List',
+                    'String without filter function',
+                ],
+                'Name column no longer visible'
+            );
             rows = getVisibleRows(table);
-            for (let i=0; i<rows.length; i++) {
+            for (let i = 0; i < rows.length; i++) {
                 expect(rows[i]).toEqualJSX(
                     <tr>
-                        <td><span>{data[i].num}</span></td>
-                        <td><span>{data[i].str}</span></td>
-                        <td><span>BLAH</span></td>
-                        <td><span>{data[i].str}</span></td>
+                        <td>
+                            <span>{data[i].num}</span>
+                        </td>
+                        <td>
+                            <span>{data[i].str}</span>
+                        </td>
+                        <td>
+                            <span>BLAH</span>
+                        </td>
+                        <td>
+                            <span>{data[i].str}</span>
+                        </td>
                     </tr>
                 );
             }
-            assert.isTrue(clickColumnVisibilityCheckbox(table, "Initially invisible column"), "IIC column is now checked")
-            assert.deepEqual(getVisibleColumnHeaders(table), ["Number", "String", "Number List", "Initially invisible column", "String without filter function"],
-                "Initially invisible column is now visible, and in the specified order");
+            assert.isTrue(
+                clickColumnVisibilityCheckbox(
+                    table,
+                    'Initially invisible column'
+                ),
+                'IIC column is now checked'
+            );
+            assert.deepEqual(
+                getVisibleColumnHeaders(table),
+                [
+                    'Number',
+                    'String',
+                    'Number List',
+                    'Initially invisible column',
+                    'String without filter function',
+                ],
+                'Initially invisible column is now visible, and in the specified order'
+            );
             rows = getVisibleRows(table);
-            for (let i=0; i<rows.length; i++) {
+            for (let i = 0; i < rows.length; i++) {
                 expect(rows[i]).toEqualJSX(
                     <tr>
-                        <td><span>{data[i].num}</span></td>
-                        <td><span>{data[i].str}</span></td>
-                        <td><span>BLAH</span></td>
-                        <td><span>{data[i].name}</span></td>
-                        <td><span>{data[i].str}</span></td>
+                        <td>
+                            <span>{data[i].num}</span>
+                        </td>
+                        <td>
+                            <span>{data[i].str}</span>
+                        </td>
+                        <td>
+                            <span>BLAH</span>
+                        </td>
+                        <td>
+                            <span>{data[i].name}</span>
+                        </td>
+                        <td>
+                            <span>{data[i].str}</span>
+                        </td>
                     </tr>
                 );
             }
             // resetting
-            assert.isTrue(clickColumnVisibilityCheckbox(table, 'Name'), "Name checkbox is now checked");
-            assert.isFalse(clickColumnVisibilityCheckbox(table, "Initially invisible column"), "Iic column is now unchecked")
+            assert.isTrue(
+                clickColumnVisibilityCheckbox(table, 'Name'),
+                'Name checkbox is now checked'
+            );
+            assert.isFalse(
+                clickColumnVisibilityCheckbox(
+                    table,
+                    'Initially invisible column'
+                ),
+                'Iic column is now unchecked'
+            );
             rows = getVisibleRows(table);
-            for (let i=0; i<rows.length; i++) {
+            for (let i = 0; i < rows.length; i++) {
                 expect(rows[i]).toEqualJSX(
                     <tr>
-                        <td><span>{data[i].name}</span></td>
-                        <td><span>{data[i].num}</span></td>
-                        <td><span>{data[i].str}</span></td>
-                        <td><span>BLAH</span></td>
-                        <td><span>{data[i].str}</span></td>
+                        <td>
+                            <span>{data[i].name}</span>
+                        </td>
+                        <td>
+                            <span>{data[i].num}</span>
+                        </td>
+                        <td>
+                            <span>{data[i].str}</span>
+                        </td>
+                        <td>
+                            <span>BLAH</span>
+                        </td>
+                        <td>
+                            <span>{data[i].str}</span>
+                        </td>
                     </tr>
                 );
             }
         });
-        it("does not break if no columns are visible", ()=>{
-            assert.isFalse(clickColumnVisibilityCheckbox(table, "Name"), "unchecking Name");
-            assert.isFalse(clickColumnVisibilityCheckbox(table, "Number"), "unchecking Number");
-            assert.isFalse(clickColumnVisibilityCheckbox(table, "String"), "unchecking String");
-            assert.isFalse(clickColumnVisibilityCheckbox(table, "Number List"), "unchecking Number List");
-            assert.isFalse(clickColumnVisibilityCheckbox(table, "String without filter function"), "unchecking String without filter function");
-            assert.deepEqual(getVisibleColumnHeaders(table), [], "no headers visible");
+        it('does not break if no columns are visible', () => {
+            assert.isFalse(
+                clickColumnVisibilityCheckbox(table, 'Name'),
+                'unchecking Name'
+            );
+            assert.isFalse(
+                clickColumnVisibilityCheckbox(table, 'Number'),
+                'unchecking Number'
+            );
+            assert.isFalse(
+                clickColumnVisibilityCheckbox(table, 'String'),
+                'unchecking String'
+            );
+            assert.isFalse(
+                clickColumnVisibilityCheckbox(table, 'Number List'),
+                'unchecking Number List'
+            );
+            assert.isFalse(
+                clickColumnVisibilityCheckbox(
+                    table,
+                    'String without filter function'
+                ),
+                'unchecking String without filter function'
+            );
+            assert.deepEqual(
+                getVisibleColumnHeaders(table),
+                [],
+                'no headers visible'
+            );
             // Rows should be empty
             let rows = getVisibleRows(table);
-            for (let i=0; i<rows.length; i++) {
+            for (let i = 0; i < rows.length; i++) {
                 expect(rows[i]).toEqualJSX(<tr></tr>);
             }
-            assert.isTrue(clickColumnVisibilityCheckbox(table, "Name"), "checking Name");
-            assert.isTrue(clickColumnVisibilityCheckbox(table, "Number"), "checking Number");
-            assert.isTrue(clickColumnVisibilityCheckbox(table, "String"), "checking String");
-            assert.isTrue(clickColumnVisibilityCheckbox(table, "Number List"), "checking Number List");
-            assert.isTrue(clickColumnVisibilityCheckbox(table, "String without filter function"), "checking String without filter function");
+            assert.isTrue(
+                clickColumnVisibilityCheckbox(table, 'Name'),
+                'checking Name'
+            );
+            assert.isTrue(
+                clickColumnVisibilityCheckbox(table, 'Number'),
+                'checking Number'
+            );
+            assert.isTrue(
+                clickColumnVisibilityCheckbox(table, 'String'),
+                'checking String'
+            );
+            assert.isTrue(
+                clickColumnVisibilityCheckbox(table, 'Number List'),
+                'checking Number List'
+            );
+            assert.isTrue(
+                clickColumnVisibilityCheckbox(
+                    table,
+                    'String without filter function'
+                ),
+                'checking String without filter function'
+            );
             // rows should be back to normal
             rows = getVisibleRows(table);
-            for (let i=0; i<rows.length; i++) {
+            for (let i = 0; i < rows.length; i++) {
                 expect(rows[i]).toEqualJSX(
                     <tr>
-                        <td><span>{data[i].name}</span></td>
-                        <td><span>{data[i].num}</span></td>
-                        <td><span>{data[i].str}</span></td>
-                        <td><span>BLAH</span></td>
-                        <td><span>{data[i].str}</span></td>
+                        <td>
+                            <span>{data[i].name}</span>
+                        </td>
+                        <td>
+                            <span>{data[i].num}</span>
+                        </td>
+                        <td>
+                            <span>{data[i].str}</span>
+                        </td>
+                        <td>
+                            <span>BLAH</span>
+                        </td>
+                        <td>
+                            <span>{data[i].str}</span>
+                        </td>
                     </tr>
                 );
             }
         });
     });
-    describe('filtering (IMPORTANT: assuming delay of 400ms)', ()=>{
-        it("does not filter through invisible columns", ()=>{
-            let filterString = "FILTER0";
-            let table = mount(<Table columns={columns} data={data}/>);
+    describe('filtering (IMPORTANT: assuming delay of 400ms)', () => {
+        it('does not filter through invisible columns', () => {
+            let filterString = 'FILTER0';
+            let table = mount(<Table columns={columns} data={data} />);
             simulateTableSearchInput(table, filterString);
             clock.tick(1000);
-            assert.equal(table.update().find(SimpleTable).props().rows.length, 0);
+            assert.equal(
+                table
+                    .update()
+                    .find(SimpleTable)
+                    .props().rows.length,
+                0
+            );
         });
-        it("shows no rows if filtering is attempted when no columns have defined filter functions", ()=>{
+        it('shows no rows if filtering is attempted when no columns have defined filter functions', () => {
             let column = columns[6];
-            let filterString = "f"; // this string is contained in the 'str' field of two data, which is the field thats rendere by this column
-            assert.isFalse(!!column.filter, "this column has no filter function");
-            let table = mount(<Table columns={[column]} data={data}/>);
+            let filterString = 'f'; // this string is contained in the 'str' field of two data, which is the field thats rendere by this column
+            assert.isFalse(
+                !!column.filter,
+                'this column has no filter function'
+            );
+            let table = mount(<Table columns={[column]} data={data} />);
             simulateTableSearchInput(table, filterString);
             clock.tick(1000);
-            assert.equal(table.update().find(SimpleTable).props().rows.length, 0);
+            assert.equal(
+                table
+                    .update()
+                    .find(SimpleTable)
+                    .props().rows.length,
+                0
+            );
         });
-        it("filters columns with a defined filter function, and shows all rows when filtered with empty string", ()=>{
-            let filterString = "asdfj";
-            let table = mount(<Table columns={columns} data={data}/>);
+        it('filters columns with a defined filter function, and shows all rows when filtered with empty string', () => {
+            let filterString = 'asdfj';
+            let table = mount(<Table columns={columns} data={data} />);
             simulateTableSearchInput(table, filterString);
             clock.tick(1000);
-            assert.equal(table.update().find(SimpleTable).props().rows.length, 1);
+            assert.equal(
+                table
+                    .update()
+                    .find(SimpleTable)
+                    .props().rows.length,
+                1
+            );
 
-            filterString = "f";
+            filterString = 'f';
             simulateTableSearchInput(table, filterString);
             clock.tick(1000);
-            assert.equal(table.update().find(SimpleTable).props().rows.length, 2);
+            assert.equal(
+                table
+                    .update()
+                    .find(SimpleTable)
+                    .props().rows.length,
+                2
+            );
 
-            filterString = "0";
+            filterString = '0';
             simulateTableSearchInput(table, filterString);
             clock.tick(1000);
-            assert.equal(table.update().find(SimpleTable).props().rows.length, 1);
+            assert.equal(
+                table
+                    .update()
+                    .find(SimpleTable)
+                    .props().rows.length,
+                1
+            );
 
-            filterString = "";
+            filterString = '';
             simulateTableSearchInput(table, filterString);
             clock.tick(1000);
-            assert.equal(table.update().find(SimpleTable).props().rows.length, data.length);
+            assert.equal(
+                table
+                    .update()
+                    .find(SimpleTable)
+                    .props().rows.length,
+                data.length
+            );
         });
-        it("keeps filtering intact even after re-rendering", ()=>{
-            const filterString = "asdfj";
-            const table = mount(<Table columns={columns} data={data}/>);
+        it('keeps filtering intact even after re-rendering', () => {
+            const filterString = 'asdfj';
+            const table = mount(<Table columns={columns} data={data} />);
             simulateTableSearchInput(table, filterString);
             clock.tick(1000);
-            assert.equal(table.update().find(SimpleTable).props().rows.length, 1);
+            assert.equal(
+                table
+                    .update()
+                    .find(SimpleTable)
+                    .props().rows.length,
+                1
+            );
 
             // force re-render
             table.update();
-            assert.equal(table.update().find(SimpleTable).props().rows.length, 1);
+            assert.equal(
+                table
+                    .update()
+                    .find(SimpleTable)
+                    .props().rows.length,
+                1
+            );
         });
     });
-    describe('downloading data', ()=>{
-        it("gives just the column names when theres no data in the table", async ()=>{
-            let table = mount(<Table columns={columns} data={[]}/>);
-            assert.deepEqual((await (table.instance() as LazyMobXTable<any>).getDownloadDataPromise()).text,
-                "Name\tNumber\tString\tNumber List\tInitially invisible column\tInitially invisible column with no download\tString without filter function\r\n");
-        });
-        it("gives one row of data when theres one row. data given for every column, including hidden, and without download def'n. if no data, gives empty string for that cell.", async ()=>{
-            let table = mount(<Table columns={columns} data={[data[0]]}/>);
-            assert.deepEqual((await (table.instance() as LazyMobXTable<any>).getDownloadDataPromise()).text,
-                "Name\tNumber\tString\tNumber List\tInitially invisible column\tInitially invisible column with no download\tString without filter function\r\n"+
-                "0\t0\tasdfj\t\t0HELLO123456\t\t\r\n");
+    describe('downloading data', () => {
+        it('gives just the column names when theres no data in the table', async () => {
+            let table = mount(<Table columns={columns} data={[]} />);
+            assert.deepEqual(
+                (await (table.instance() as LazyMobXTable<
+                    any
+                >).getDownloadDataPromise()).text,
+                'Name\tNumber\tString\tNumber List\tInitially invisible column\tInitially invisible column with no download\tString without filter function\r\n'
+            );
         });
-        it("gives data for all rows. data given for every column, including hidden, and without download def'n. if no data, gives empty string for that cell", async ()=>{
-            let table = mount(<Table columns={columns} data={data}/>)
-            assert.deepEqual((await (table.instance() as LazyMobXTable<any>).getDownloadDataPromise()).text,
-                "Name\tNumber\tString\tNumber List\tInitially invisible column\tInitially invisible column with no download\tString without filter function\r\n"+
-                "0\t0\tasdfj\t\t0HELLO123456\t\t\r\n"+
-                "1\t6\tkdfjpo\t\t1HELLO123456\t\t\r\n"+
-                "2\tnull\tnull\t\t2HELLO123456\t\t\r\n"+
-                "3\t-1\tzijxcpo\t\t3HELLO123456\t\t\r\n"+
-                "4\t90\tzkzxc\t\t4HELLO123456\t\t\r\n");
+        it("gives one row of data when theres one row. data given for every column, including hidden, and without download def'n. if no data, gives empty string for that cell.", async () => {
+            let table = mount(<Table columns={columns} data={[data[0]]} />);
+            assert.deepEqual(
+                (await (table.instance() as LazyMobXTable<
+                    any
+                >).getDownloadDataPromise()).text,
+                'Name\tNumber\tString\tNumber List\tInitially invisible column\tInitially invisible column with no download\tString without filter function\r\n' +
+                    '0\t0\tasdfj\t\t0HELLO123456\t\t\r\n'
+            );
         });
-        it("gives data back in sorted order according to initially selected sort column and direction", async ()=>{
-            let table = mount(<Table columns={columns} data={data} initialSortColumn="Number" initialSortDirection="asc"/>);
-
-            assert.deepEqual((await (table.instance() as LazyMobXTable<any>).getDownloadDataPromise()).text,
-                "Name\tNumber\tString\tNumber List\tInitially invisible column\tInitially invisible column with no download\tString without filter function\r\n"+
-                "3\t-1\tzijxcpo\t\t3HELLO123456\t\t\r\n"+
-                "0\t0\tasdfj\t\t0HELLO123456\t\t\r\n"+
-                "1\t6\tkdfjpo\t\t1HELLO123456\t\t\r\n"+
-                "4\t90\tzkzxc\t\t4HELLO123456\t\t\r\n" +
-                "2\tnull\tnull\t\t2HELLO123456\t\t\r\n");
+        it("gives data for all rows. data given for every column, including hidden, and without download def'n. if no data, gives empty string for that cell", async () => {
+            let table = mount(<Table columns={columns} data={data} />);
+            assert.deepEqual(
+                (await (table.instance() as LazyMobXTable<
+                    any
+                >).getDownloadDataPromise()).text,
+                'Name\tNumber\tString\tNumber List\tInitially invisible column\tInitially invisible column with no download\tString without filter function\r\n' +
+                    '0\t0\tasdfj\t\t0HELLO123456\t\t\r\n' +
+                    '1\t6\tkdfjpo\t\t1HELLO123456\t\t\r\n' +
+                    '2\tnull\tnull\t\t2HELLO123456\t\t\r\n' +
+                    '3\t-1\tzijxcpo\t\t3HELLO123456\t\t\r\n' +
+                    '4\t90\tzkzxc\t\t4HELLO123456\t\t\r\n'
+            );
         });
+        it('gives data back in sorted order according to initially selected sort column and direction', async () => {
+            let table = mount(
+                <Table
+                    columns={columns}
+                    data={data}
+                    initialSortColumn="Number"
+                    initialSortDirection="asc"
+                />
+            );
 
-        it("gives data for data with multiple elements", async ()=>{
-            let table = mount(<Table columns={columns} data={multiData}/>)
-            assert.deepEqual((await (table.instance() as LazyMobXTable<any>).getDownloadDataPromise()).text,
-                "Name\tNumber\tString\tNumber List\tInitially invisible column\tInitially invisible column with no download\tString without filter function\r\n"+
-                "0\t0\tasdfj\t\t0HELLO123456\t\t\r\n"+
-                "1\t6\tkdfjpo\t\t1HELLO123456\t\t\r\n"+
-                "2\tnull\tnull\t\t2HELLO123456\t\t\r\n"+
-                "3\t-1\tzijxcpo\t\t3HELLO123456\t\t\r\n"+
-                "4\t90\tzkzxc\t\t4HELLO123456\t\t\r\n");
+            assert.deepEqual(
+                (await (table.instance() as LazyMobXTable<
+                    any
+                >).getDownloadDataPromise()).text,
+                'Name\tNumber\tString\tNumber List\tInitially invisible column\tInitially invisible column with no download\tString without filter function\r\n' +
+                    '3\t-1\tzijxcpo\t\t3HELLO123456\t\t\r\n' +
+                    '0\t0\tasdfj\t\t0HELLO123456\t\t\r\n' +
+                    '1\t6\tkdfjpo\t\t1HELLO123456\t\t\r\n' +
+                    '4\t90\tzkzxc\t\t4HELLO123456\t\t\r\n' +
+                    '2\tnull\tnull\t\t2HELLO123456\t\t\r\n'
+            );
         });
 
-        it("gives the correct column names when headerDownload is defined", async () => {
-            const cols = [{
-                name: "Myth",
-                render:(d:any)=><span/>
-            },{
-                name: "Science",
-                render:(d:any)=><span/>,
-                headerDownload:(name:string) => `${name}: Ruining everything since 1543`
-            }];
-
-            const table = mount(<Table columns={cols} data={[]}/>);
+        it('gives data for data with multiple elements', async () => {
+            let table = mount(<Table columns={columns} data={multiData} />);
+            assert.deepEqual(
+                (await (table.instance() as LazyMobXTable<
+                    any
+                >).getDownloadDataPromise()).text,
+                'Name\tNumber\tString\tNumber List\tInitially invisible column\tInitially invisible column with no download\tString without filter function\r\n' +
+                    '0\t0\tasdfj\t\t0HELLO123456\t\t\r\n' +
+                    '1\t6\tkdfjpo\t\t1HELLO123456\t\t\r\n' +
+                    '2\tnull\tnull\t\t2HELLO123456\t\t\r\n' +
+                    '3\t-1\tzijxcpo\t\t3HELLO123456\t\t\r\n' +
+                    '4\t90\tzkzxc\t\t4HELLO123456\t\t\r\n'
+            );
+        });
 
-            assert.deepEqual((await (table.instance() as LazyMobXTable<any>).getDownloadDataPromise()).text,
-                "Myth\tScience: Ruining everything since 1543\r\n");
+        it('gives the correct column names when headerDownload is defined', async () => {
+            const cols = [
+                {
+                    name: 'Myth',
+                    render: (d: any) => <span />,
+                },
+                {
+                    name: 'Science',
+                    render: (d: any) => <span />,
+                    headerDownload: (name: string) =>
+                        `${name}: Ruining everything since 1543`,
+                },
+            ];
+
+            const table = mount(<Table columns={cols} data={[]} />);
+
+            assert.deepEqual(
+                (await (table.instance() as LazyMobXTable<
+                    any
+                >).getDownloadDataPromise()).text,
+                'Myth\tScience: Ruining everything since 1543\r\n'
+            );
         });
     });
-    describe('pagination', ()=>{
-        it("starts with 50 items per page", ()=>{
-            let table = mount(<Table columns={simpleColumns} data={[]}/>);
-            assert.equal(getItemsPerPage(table), 50, "with no data");
-            table.setProps({columns:simpleColumns, data:data.slice(0,100)});
-            assert.equal(getItemsPerPage(table), 50, "with data");
+    describe('pagination', () => {
+        it('starts with 50 items per page', () => {
+            let table = mount(<Table columns={simpleColumns} data={[]} />);
+            assert.equal(getItemsPerPage(table), 50, 'with no data');
+            table.setProps({
+                columns: simpleColumns,
+                data: data.slice(0, 100),
+            });
+            assert.equal(getItemsPerPage(table), 50, 'with data');
         });
-        it("limits page accessing appropriately, depending on how many items total and how many per page, and changes page numbers correctly", ()=>{
-            let table = mount(<Table columns={simpleColumns} data={[]}/>);
-            assert.equal(getCurrentPage(table), 0, "starts on page 0");
-            assert.isFalse(clickPrevPage(table), "prev page button is disabled with no data");
-            assert.equal(getCurrentPage(table), 0, "still on page 0");
-            assert.isFalse(clickNextPage(table), "next page button is disabled with no data");
-            assert.equal(getCurrentPage(table), 0, "havent changed pages");
-
-            table.setProps({columns: simpleColumns, data:[simpleData[0]]});
-            assert.equal(getCurrentPage(table), 0, "starts on page 0");
-            assert.isFalse(clickPrevPage(table), "prev page button is disabled with 1 row");
-            assert.equal(getCurrentPage(table), 0, "still on page 0");
-            assert.isFalse(clickNextPage(table), "next page button is disabled with 1 row");
-            assert.equal(getCurrentPage(table), 0, "havent changed pages");
-
-            assert.equal(getItemsPerPage(table.update()), 50, "make sure setting is 50 items per page for these tests");
-            table.setProps({columns:simpleColumns, data:simpleData.slice(0,20)});
-            assert.equal(getCurrentPage(table), 0, "starts on page 0");
-            assert.isFalse(clickPrevPage(table), "prev page disabled on page 0");
-            assert.equal(getCurrentPage(table), 0, "still on page 0");
-            assert.isFalse(clickNextPage(table), "next page disabled when all data fits on page");
-            assert.equal(getCurrentPage(table), 0, "havent changed pages");
-
-            table.setProps({columns:simpleColumns, data:simpleData.slice(0,60)});
-            assert.equal(getCurrentPage(table), 0, "starts on page 0");
-            assert.isFalse(clickPrevPage(table), "prev page disabled on page 0");
-            assert.equal(getCurrentPage(table), 0, "still on page 0");
-            assert.isTrue(clickNextPage(table), "next page works to go to page 1");
-            assert.equal(getCurrentPage(table), 1, "now on page 1");
-            assert.isFalse(clickNextPage(table), "when on page 1, no more pages");
-            assert.equal(getCurrentPage(table), 1, "still on page 1");
-            assert.isTrue(clickPrevPage(table), "when on page 1, we can go prev page");
-            assert.equal(getCurrentPage(table), 0, "now on page 0");
-            assert.isFalse(clickPrevPage(table), "can't go back more than page 0");
-            assert.equal(getCurrentPage(table), 0, "still on page 0");
-            assert.isTrue(clickNextPage(table), "but we can go to the next page again");
-            assert.equal(getCurrentPage(table), 1, "back to page 1");
+        it('limits page accessing appropriately, depending on how many items total and how many per page, and changes page numbers correctly', () => {
+            let table = mount(<Table columns={simpleColumns} data={[]} />);
+            assert.equal(getCurrentPage(table), 0, 'starts on page 0');
+            assert.isFalse(
+                clickPrevPage(table),
+                'prev page button is disabled with no data'
+            );
+            assert.equal(getCurrentPage(table), 0, 'still on page 0');
+            assert.isFalse(
+                clickNextPage(table),
+                'next page button is disabled with no data'
+            );
+            assert.equal(getCurrentPage(table), 0, 'havent changed pages');
+
+            table.setProps({ columns: simpleColumns, data: [simpleData[0]] });
+            assert.equal(getCurrentPage(table), 0, 'starts on page 0');
+            assert.isFalse(
+                clickPrevPage(table),
+                'prev page button is disabled with 1 row'
+            );
+            assert.equal(getCurrentPage(table), 0, 'still on page 0');
+            assert.isFalse(
+                clickNextPage(table),
+                'next page button is disabled with 1 row'
+            );
+            assert.equal(getCurrentPage(table), 0, 'havent changed pages');
+
+            assert.equal(
+                getItemsPerPage(table.update()),
+                50,
+                'make sure setting is 50 items per page for these tests'
+            );
+            table.setProps({
+                columns: simpleColumns,
+                data: simpleData.slice(0, 20),
+            });
+            assert.equal(getCurrentPage(table), 0, 'starts on page 0');
+            assert.isFalse(
+                clickPrevPage(table),
+                'prev page disabled on page 0'
+            );
+            assert.equal(getCurrentPage(table), 0, 'still on page 0');
+            assert.isFalse(
+                clickNextPage(table),
+                'next page disabled when all data fits on page'
+            );
+            assert.equal(getCurrentPage(table), 0, 'havent changed pages');
+
+            table.setProps({
+                columns: simpleColumns,
+                data: simpleData.slice(0, 60),
+            });
+            assert.equal(getCurrentPage(table), 0, 'starts on page 0');
+            assert.isFalse(
+                clickPrevPage(table),
+                'prev page disabled on page 0'
+            );
+            assert.equal(getCurrentPage(table), 0, 'still on page 0');
+            assert.isTrue(
+                clickNextPage(table),
+                'next page works to go to page 1'
+            );
+            assert.equal(getCurrentPage(table), 1, 'now on page 1');
+            assert.isFalse(
+                clickNextPage(table),
+                'when on page 1, no more pages'
+            );
+            assert.equal(getCurrentPage(table), 1, 'still on page 1');
+            assert.isTrue(
+                clickPrevPage(table),
+                'when on page 1, we can go prev page'
+            );
+            assert.equal(getCurrentPage(table), 0, 'now on page 0');
+            assert.isFalse(
+                clickPrevPage(table),
+                "can't go back more than page 0"
+            );
+            assert.equal(getCurrentPage(table), 0, 'still on page 0');
+            assert.isTrue(
+                clickNextPage(table),
+                'but we can go to the next page again'
+            );
+            assert.equal(getCurrentPage(table), 1, 'back to page 1');
 
             selectItemsPerPage(table, -1);
-            assert.equal(getItemsPerPage(table), -1, "make sure setting is on show all");
-            assert.equal(getCurrentPage(table), 0, "goes back to page 0");
-            assert.isFalse(clickPrevPage(table), "prev page button is disabled when all data on one page");
-            assert.equal(getCurrentPage(table), 0, "still on page 0");
-            assert.isFalse(clickNextPage(table), "next page button is disabled when all data on one page");
-            assert.equal(getCurrentPage(table), 0, "havent changed pages");
+            assert.equal(
+                getItemsPerPage(table),
+                -1,
+                'make sure setting is on show all'
+            );
+            assert.equal(getCurrentPage(table), 0, 'goes back to page 0');
+            assert.isFalse(
+                clickPrevPage(table),
+                'prev page button is disabled when all data on one page'
+            );
+            assert.equal(getCurrentPage(table), 0, 'still on page 0');
+            assert.isFalse(
+                clickNextPage(table),
+                'next page button is disabled when all data on one page'
+            );
+            assert.equal(getCurrentPage(table), 0, 'havent changed pages');
         });
 
-        it("properly handles changing items per page", ()=>{
-            let table = mount(<Table columns={simpleColumns} data={[]}/>);
+        it('properly handles changing items per page', () => {
+            let table = mount(<Table columns={simpleColumns} data={[]} />);
             selectItemsPerPage(table, 25);
-            assert.equal(getItemsPerPage(table), 25, "case: no data; it successfully changes the items per page to 25");
-            assert.equal(getCurrentPage(table), 0, "case: no data; still on page 0");
-            assert.equal(getNumVisibleRows(table), 0, "case: no data; no rows visible with 25/page, because no data");
+            assert.equal(
+                getItemsPerPage(table),
+                25,
+                'case: no data; it successfully changes the items per page to 25'
+            );
+            assert.equal(
+                getCurrentPage(table),
+                0,
+                'case: no data; still on page 0'
+            );
+            assert.equal(
+                getNumVisibleRows(table),
+                0,
+                'case: no data; no rows visible with 25/page, because no data'
+            );
             selectItemsPerPage(table, -1);
-            assert.equal(getItemsPerPage(table), -1, "case: no data; it successfully changes the items per page to show all");
-            assert.equal(getCurrentPage(table), 0, "case: no data; still on page 0");
-            assert.equal(getNumVisibleRows(table), 0, "case: no data; no rows visible with show all, because no data");
+            assert.equal(
+                getItemsPerPage(table),
+                -1,
+                'case: no data; it successfully changes the items per page to show all'
+            );
+            assert.equal(
+                getCurrentPage(table),
+                0,
+                'case: no data; still on page 0'
+            );
+            assert.equal(
+                getNumVisibleRows(table),
+                0,
+                'case: no data; no rows visible with show all, because no data'
+            );
 
-            table.setProps({columns:columns, data:[simpleData[0]]});
+            table.setProps({ columns: columns, data: [simpleData[0]] });
             selectItemsPerPage(table, 25);
-            assert.equal(getItemsPerPage(table), 25, "case: 1 data; it successfully changes the items per page to 25");
-            assert.equal(getCurrentPage(table), 0, "case: 1 data; still on page 0");
-            assert.equal(getNumVisibleRows(table), 1, "case: 1 data; 1 row visible with 25/page");
+            assert.equal(
+                getItemsPerPage(table),
+                25,
+                'case: 1 data; it successfully changes the items per page to 25'
+            );
+            assert.equal(
+                getCurrentPage(table),
+                0,
+                'case: 1 data; still on page 0'
+            );
+            assert.equal(
+                getNumVisibleRows(table),
+                1,
+                'case: 1 data; 1 row visible with 25/page'
+            );
             selectItemsPerPage(table, -1);
-            assert.equal(getItemsPerPage(table), -1, "case: 1 data; it successfully changes the items per page to show all");
-            assert.equal(getCurrentPage(table), 0, "case: 1 data; still on page 0");
-            assert.equal(getNumVisibleRows(table), 1, "case: 1 data; 1 row visible with show all");
+            assert.equal(
+                getItemsPerPage(table),
+                -1,
+                'case: 1 data; it successfully changes the items per page to show all'
+            );
+            assert.equal(
+                getCurrentPage(table),
+                0,
+                'case: 1 data; still on page 0'
+            );
+            assert.equal(
+                getNumVisibleRows(table),
+                1,
+                'case: 1 data; 1 row visible with show all'
+            );
 
-            table.setProps({columns:columns, data:simpleData});
-            assert.equal(simpleData.length, 120, "for this test we're assuming 120 data");
+            table.setProps({ columns: columns, data: simpleData });
+            assert.equal(
+                simpleData.length,
+                120,
+                "for this test we're assuming 120 data"
+            );
             selectItemsPerPage(table, 25);
-            assert.equal(getItemsPerPage(table), 25, "case: 120 data; it successfully changes the items per page to 25");
-            assert.equal(getCurrentPage(table), 0, "case: 120 data; still on page 0");
-            assert.equal(getNumVisibleRows(table), 25, "case: 120 data; 25 rows visible with 25/page");
+            assert.equal(
+                getItemsPerPage(table),
+                25,
+                'case: 120 data; it successfully changes the items per page to 25'
+            );
+            assert.equal(
+                getCurrentPage(table),
+                0,
+                'case: 120 data; still on page 0'
+            );
+            assert.equal(
+                getNumVisibleRows(table),
+                25,
+                'case: 120 data; 25 rows visible with 25/page'
+            );
             clickNextPage(table);
             clickNextPage(table);
-            assert.equal(getCurrentPage(table), 2, "case: 120 data; moved to page 2");
-            assert.equal(getNumVisibleRows(table), 25, "case: 120 data; 25 rows visible with 25/page on page 2");
+            assert.equal(
+                getCurrentPage(table),
+                2,
+                'case: 120 data; moved to page 2'
+            );
+            assert.equal(
+                getNumVisibleRows(table),
+                25,
+                'case: 120 data; 25 rows visible with 25/page on page 2'
+            );
             selectItemsPerPage(table, 10);
-            assert.equal(getItemsPerPage(table), 10, "case: 120 data; it successfully changes the items per page to 10");
-            assert.equal(getCurrentPage(table), 2, "case: 120 data; still on page 2");
-            assert.equal(getNumVisibleRows(table), 10, "case: 120 data; 10 rows visible with 10/page on page 2");
+            assert.equal(
+                getItemsPerPage(table),
+                10,
+                'case: 120 data; it successfully changes the items per page to 10'
+            );
+            assert.equal(
+                getCurrentPage(table),
+                2,
+                'case: 120 data; still on page 2'
+            );
+            assert.equal(
+                getNumVisibleRows(table),
+                10,
+                'case: 120 data; 10 rows visible with 10/page on page 2'
+            );
             selectItemsPerPage(table, 50);
-            assert.equal(getItemsPerPage(table), 50, "case: 120 data; it successfully changes the items per page to 50");
-            assert.equal(getCurrentPage(table), 2, "case: 120 data; still on page 2");
-            assert.equal(getNumVisibleRows(table), 20, "case: 120 data; 20 rows visible with 50/page on page 2");
+            assert.equal(
+                getItemsPerPage(table),
+                50,
+                'case: 120 data; it successfully changes the items per page to 50'
+            );
+            assert.equal(
+                getCurrentPage(table),
+                2,
+                'case: 120 data; still on page 2'
+            );
+            assert.equal(
+                getNumVisibleRows(table),
+                20,
+                'case: 120 data; 20 rows visible with 50/page on page 2'
+            );
             selectItemsPerPage(table, 100);
-            assert.equal(getItemsPerPage(table), 100, "case: 120 data; it successfully changes the items per page to 100");
-            assert.equal(getCurrentPage(table), 1, "case: 120 data; now on page 1");
-            assert.equal(getNumVisibleRows(table), 20, "case: 120 data; 20 rows visible with 100/page on page 2");
+            assert.equal(
+                getItemsPerPage(table),
+                100,
+                'case: 120 data; it successfully changes the items per page to 100'
+            );
+            assert.equal(
+                getCurrentPage(table),
+                1,
+                'case: 120 data; now on page 1'
+            );
+            assert.equal(
+                getNumVisibleRows(table),
+                20,
+                'case: 120 data; 20 rows visible with 100/page on page 2'
+            );
             selectItemsPerPage(table, -1);
-            assert.equal(getItemsPerPage(table), -1, "case: 120 data; it successfully changes the items per page to show all");
-            assert.equal(getCurrentPage(table), 0, "case: 120 data; now we're on page 0");
-            assert.equal(getNumVisibleRows(table), 120, "case: 120 data; all 120 rows visible with show all");
+            assert.equal(
+                getItemsPerPage(table),
+                -1,
+                'case: 120 data; it successfully changes the items per page to show all'
+            );
+            assert.equal(
+                getCurrentPage(table),
+                0,
+                "case: 120 data; now we're on page 0"
+            );
+            assert.equal(
+                getNumVisibleRows(table),
+                120,
+                'case: 120 data; all 120 rows visible with show all'
+            );
         });
-        it("shows the correct data for given page", ()=>{
-            let table = mount(<Table columns={simpleColumns} data={simpleData.slice(0,40)}/>);
-            assert.equal(getItemsPerPage(table), 50, "case: 40 data; for this test we're assuming 50/page");
-            assert.equal(getCurrentPage(table), 0, "case: 40 data; on page 0");
+        it('shows the correct data for given page', () => {
+            let table = mount(
+                <Table columns={simpleColumns} data={simpleData.slice(0, 40)} />
+            );
+            assert.equal(
+                getItemsPerPage(table),
+                50,
+                "case: 40 data; for this test we're assuming 50/page"
+            );
+            assert.equal(getCurrentPage(table), 0, 'case: 40 data; on page 0');
             let rows = getVisibleRows(table);
-            for (let i=0; i<rows.length; i++) {
-                expect(rows[i]).toEqualJSX(<tr><td><span>{i}</span></td></tr>);
+            for (let i = 0; i < rows.length; i++) {
+                expect(rows[i]).toEqualJSX(
+                    <tr>
+                        <td>
+                            <span>{i}</span>
+                        </td>
+                    </tr>
+                );
             }
 
-            table.setProps({columns:simpleColumns, data:simpleData});
-            assert.equal(getItemsPerPage(table), 50, "case: 120 data; for this test we're assuming 50/page");
-            assert.equal(getCurrentPage(table), 0, "case: 120 data; on page 0");
-            assert.equal(simpleData.length, 120, "confirm we're working with 120 data");
+            table.setProps({ columns: simpleColumns, data: simpleData });
+            assert.equal(
+                getItemsPerPage(table),
+                50,
+                "case: 120 data; for this test we're assuming 50/page"
+            );
+            assert.equal(getCurrentPage(table), 0, 'case: 120 data; on page 0');
+            assert.equal(
+                simpleData.length,
+                120,
+                "confirm we're working with 120 data"
+            );
             rows = getVisibleRows(table);
-            for (let i=0; i<rows.length; i++) {
-                expect(rows[i]).toEqualJSX(<tr><td><span>{i}</span></td></tr>);
+            for (let i = 0; i < rows.length; i++) {
+                expect(rows[i]).toEqualJSX(
+                    <tr>
+                        <td>
+                            <span>{i}</span>
+                        </td>
+                    </tr>
+                );
             }
             clickNextPage(table);
-            assert.equal(getCurrentPage(table), 1, "case:120 data; on page 1");
+            assert.equal(getCurrentPage(table), 1, 'case:120 data; on page 1');
             rows = getVisibleRows(table);
-            for (let i=0; i<rows.length; i++) {
-                expect(rows[i]).toEqualJSX(<tr><td><span>{i+50}</span></td></tr>);
+            for (let i = 0; i < rows.length; i++) {
+                expect(rows[i]).toEqualJSX(
+                    <tr>
+                        <td>
+                            <span>{i + 50}</span>
+                        </td>
+                    </tr>
+                );
             }
             clickNextPage(table);
-            assert.equal(getCurrentPage(table), 2, "case:120 data; on page 2");
+            assert.equal(getCurrentPage(table), 2, 'case:120 data; on page 2');
             rows = getVisibleRows(table);
-            for (let i=0; i<rows.length; i++) {
-                expect(rows[i]).toEqualJSX(<tr><td><span>{i+100}</span></td></tr>);
+            for (let i = 0; i < rows.length; i++) {
+                expect(rows[i]).toEqualJSX(
+                    <tr>
+                        <td>
+                            <span>{i + 100}</span>
+                        </td>
+                    </tr>
+                );
             }
         });
-        it("shows the right text before the paging buttons", ()=>{
-            let table = mount(<Table columns={simpleColumns} data={[]}/>);
-            assert.equal(getItemsPerPage(table), 50, "confirm 50 items per page");
-            assert.equal(getTextBeforeButtons(table), "Showing 0-0 of 0");
+        it('shows the right text before the paging buttons', () => {
+            let table = mount(<Table columns={simpleColumns} data={[]} />);
+            assert.equal(
+                getItemsPerPage(table),
+                50,
+                'confirm 50 items per page'
+            );
+            assert.equal(getTextBeforeButtons(table), 'Showing 0-0 of 0');
 
-            table.setProps({columns:simpleColumns, data:[simpleData[0]]});
-            assert.equal(getTextBeforeButtons(table), "Showing 1-1 of 1");
+            table.setProps({ columns: simpleColumns, data: [simpleData[0]] });
+            assert.equal(getTextBeforeButtons(table), 'Showing 1-1 of 1');
 
-            table.setProps({columns:simpleColumns, data:simpleData.slice(0, 40)});
-            assert.equal(getTextBeforeButtons(table), "Showing 1-40 of 40");
+            table.setProps({
+                columns: simpleColumns,
+                data: simpleData.slice(0, 40),
+            });
+            assert.equal(getTextBeforeButtons(table), 'Showing 1-40 of 40');
 
-            table.setProps({columns:simpleColumns, data:simpleData});
-            assert.equal(simpleData.length, 120, "confirm we're working with 120 data");
-            assert.equal(getTextBeforeButtons(table), "Showing 1-50 of 120");
+            table.setProps({ columns: simpleColumns, data: simpleData });
+            assert.equal(
+                simpleData.length,
+                120,
+                "confirm we're working with 120 data"
+            );
+            assert.equal(getTextBeforeButtons(table), 'Showing 1-50 of 120');
             clickNextPage(table);
             assert.equal(getCurrentPage(table), 1);
-            assert.equal(getTextBeforeButtons(table), "Showing 51-100 of 120");
+            assert.equal(getTextBeforeButtons(table), 'Showing 51-100 of 120');
             clickNextPage(table);
             assert.equal(getCurrentPage(table), 2);
-            assert.equal(getTextBeforeButtons(table), "Showing 101-120 of 120");
+            assert.equal(getTextBeforeButtons(table), 'Showing 101-120 of 120');
 
             selectItemsPerPage(table, -1);
-            assert.equal(getTextBeforeButtons(table), "Showing 1-120 of 120");
+            assert.equal(getTextBeforeButtons(table), 'Showing 1-120 of 120');
         });
     });
 });
diff --git a/src/shared/components/lazyMobXTable/LazyMobXTable.tsx b/src/shared/components/lazyMobXTable/LazyMobXTable.tsx
index ce9b1da056d..1c6a411464f 100644
--- a/src/shared/components/lazyMobXTable/LazyMobXTable.tsx
+++ b/src/shared/components/lazyMobXTable/LazyMobXTable.tsx
@@ -1,89 +1,111 @@
-import SimpleTable from "../simpleTable/SimpleTable";
+import SimpleTable from '../simpleTable/SimpleTable';
 import * as React from 'react';
-import {action, computed, IReactionDisposer, observable, reaction} from "mobx";
-import {observer, Observer} from "mobx-react";
+import {
+    action,
+    computed,
+    IReactionDisposer,
+    observable,
+    reaction,
+} from 'mobx';
+import { observer, Observer } from 'mobx-react';
 import './styles.scss';
 import {
     IPaginationControlsProps,
     PaginationControls,
-    SHOW_ALL_PAGE_SIZE as PAGINATION_SHOW_ALL
-} from "../paginationControls/PaginationControls";
+    SHOW_ALL_PAGE_SIZE as PAGINATION_SHOW_ALL,
+} from '../paginationControls/PaginationControls';
 import {
     ColumnVisibilityControls,
     IColumnVisibilityControlsProps,
-    IColumnVisibilityDef
-} from "../columnVisibilityControls/ColumnVisibilityControls";
-import {CopyDownloadControls, ICopyDownloadData} from "../copyDownloadControls/CopyDownloadControls";
+    IColumnVisibilityDef,
+} from '../columnVisibilityControls/ColumnVisibilityControls';
+import {
+    CopyDownloadControls,
+    ICopyDownloadData,
+} from '../copyDownloadControls/CopyDownloadControls';
 import {
     DefaultTooltip,
     resolveColumnVisibility,
-    resolveColumnVisibilityByColumnDefinition
-} from "cbioportal-frontend-commons";
-import {ICopyDownloadControlsProps} from "../copyDownloadControls/ICopyDownloadControls";
-import {SimpleCopyDownloadControls} from "../copyDownloadControls/SimpleCopyDownloadControls";
-import {serializeData} from "shared/lib/Serializer";
-import {ButtonToolbar} from "react-bootstrap";
-import ColumnResizer from "react-column-resizer";
-import {SortMetric} from "../../lib/ISortMetric";
+    resolveColumnVisibilityByColumnDefinition,
+} from 'cbioportal-frontend-commons';
+import { ICopyDownloadControlsProps } from '../copyDownloadControls/ICopyDownloadControls';
+import { SimpleCopyDownloadControls } from '../copyDownloadControls/SimpleCopyDownloadControls';
+import { serializeData } from 'shared/lib/Serializer';
+import { ButtonToolbar } from 'react-bootstrap';
+import ColumnResizer from 'react-column-resizer';
+import { SortMetric } from '../../lib/ISortMetric';
 import {
     ILazyMobXTableApplicationDataStore,
-    SimpleLazyMobXTableApplicationDataStore
-} from "../../lib/ILazyMobXTableApplicationDataStore";
-import {ILazyMobXTableApplicationLazyDownloadDataFetcher} from "../../lib/ILazyMobXTableApplicationLazyDownloadDataFetcher";
-import {maxPage} from "./utils";
-import {inputBoxChangeTimeoutEvent} from "../../lib/EventUtils";
+    SimpleLazyMobXTableApplicationDataStore,
+} from '../../lib/ILazyMobXTableApplicationDataStore';
+import { ILazyMobXTableApplicationLazyDownloadDataFetcher } from '../../lib/ILazyMobXTableApplicationLazyDownloadDataFetcher';
+import { maxPage } from './utils';
+import { inputBoxChangeTimeoutEvent } from '../../lib/EventUtils';
 
 export type SortDirection = 'asc' | 'desc';
 
 export type Column<T> = {
     name: string;
-    headerRender?:(name:string)=>JSX.Element;
-    headerDownload?:(name:string)=>string;
-    width?:string|number;
-    align?:"left"|"center"|"right";
-    filter?:(data:T, filterString:string, filterStringUpper?:string, filterStringLower?:string)=>boolean;
-    visible?:boolean;
-    sortBy?:((data:T)=>(number|null)) | ((data:T)=>(string|null)) | ((data:T)=>(number|null)[]) | ((data:T)=>(string|null)[]);
-    render:(data:T)=>JSX.Element;
-    download?:(data:T)=>string|string[];
-    tooltip?:JSX.Element;
-    defaultSortDirection?:SortDirection;
-    togglable?:boolean;
-    resizable?:boolean;
+    headerRender?: (name: string) => JSX.Element;
+    headerDownload?: (name: string) => string;
+    width?: string | number;
+    align?: 'left' | 'center' | 'right';
+    filter?: (
+        data: T,
+        filterString: string,
+        filterStringUpper?: string,
+        filterStringLower?: string
+    ) => boolean;
+    visible?: boolean;
+    sortBy?:
+        | ((data: T) => number | null)
+        | ((data: T) => string | null)
+        | ((data: T) => (number | null)[])
+        | ((data: T) => (string | null)[]);
+    render: (data: T) => JSX.Element;
+    download?: (data: T) => string | string[];
+    tooltip?: JSX.Element;
+    defaultSortDirection?: SortDirection;
+    togglable?: boolean;
+    resizable?: boolean;
 };
 
 type LazyMobXTableProps<T> = {
-    className?:string;
-    columns:Column<T>[];
-    data?:T[];
-    dataStore?:ILazyMobXTableApplicationDataStore<T>;
-    downloadDataFetcher?:ILazyMobXTableApplicationLazyDownloadDataFetcher;
+    className?: string;
+    columns: Column<T>[];
+    data?: T[];
+    dataStore?: ILazyMobXTableApplicationDataStore<T>;
+    downloadDataFetcher?: ILazyMobXTableApplicationLazyDownloadDataFetcher;
     initialSortColumn?: string;
-    initialSortDirection?:SortDirection;
-    initialItemsPerPage?:number;
-    itemsLabel?:string;
-    itemsLabelPlural?:string;
-    showFilter?:boolean;
-    showCopyDownload?:boolean;
-    copyDownloadProps?:ICopyDownloadControlsProps;
-    showPagination?:boolean;
-	// used only when showPagination === true (show pagination at bottom otherwise)
-	showPaginationAtTop?:boolean;
-    paginationProps?:IPaginationControlsProps;
-    enableHorizontalScroll?:boolean;
-    showColumnVisibility?:boolean;
-    columnVisibilityProps?:IColumnVisibilityControlsProps;
-    columnVisibility?: {[columnId: string]: boolean};
-    pageToHighlight?:boolean;
-    showCountHeader?:boolean;
-    onRowClick?:(d:T)=>void;
-    onRowMouseEnter?:(d:T)=>void;
-    onRowMouseLeave?:(d:T)=>void;
-    filterPlaceholder?:string;
+    initialSortDirection?: SortDirection;
+    initialItemsPerPage?: number;
+    itemsLabel?: string;
+    itemsLabelPlural?: string;
+    showFilter?: boolean;
+    showCopyDownload?: boolean;
+    copyDownloadProps?: ICopyDownloadControlsProps;
+    showPagination?: boolean;
+    // used only when showPagination === true (show pagination at bottom otherwise)
+    showPaginationAtTop?: boolean;
+    paginationProps?: IPaginationControlsProps;
+    enableHorizontalScroll?: boolean;
+    showColumnVisibility?: boolean;
+    columnVisibilityProps?: IColumnVisibilityControlsProps;
+    columnVisibility?: { [columnId: string]: boolean };
+    pageToHighlight?: boolean;
+    showCountHeader?: boolean;
+    onRowClick?: (d: T) => void;
+    onRowMouseEnter?: (d: T) => void;
+    onRowMouseLeave?: (d: T) => void;
+    filterPlaceholder?: string;
 };
 
-function compareValues<U extends number|string>(a:U|null, b:U|null, asc:boolean):number {
-    let ret:number = 0;
+function compareValues<U extends number | string>(
+    a: U | null,
+    b: U | null,
+    asc: boolean
+): number {
+    let ret: number = 0;
     if (a !== b) {
         if (a === null) {
             // a sorted to end
@@ -93,26 +115,30 @@ function compareValues<U extends number|string>(a:U|null, b:U|null, asc:boolean)
             ret = -1;
         } else {
             // neither are null
-            if (typeof a === "number") {
+            if (typeof a === 'number') {
                 // sort numbers
                 if (a < b) {
-                    ret = (asc ? -1 : 1);
+                    ret = asc ? -1 : 1;
                 } else {
                     // we know a !== b here so this case is a > b
-                    ret = (asc ? 1 : -1);
+                    ret = asc ? 1 : -1;
                 }
-            } else if (typeof a === "string") {
+            } else if (typeof a === 'string') {
                 // sort strings
-                ret = (asc ? 1 : -1)*((a as string).localeCompare(b as string));
+                ret = (asc ? 1 : -1) * (a as string).localeCompare(b as string);
             }
         }
     }
     return ret;
 }
-function compareLists<U extends number|string>(a:(U|null)[], b:(U|null)[], asc:boolean):number {
+function compareLists<U extends number | string>(
+    a: (U | null)[],
+    b: (U | null)[],
+    asc: boolean
+): number {
     let ret = 0;
     const loopLength = Math.min(a.length, b.length);
-    for (let i=0; i<loopLength; i++) {
+    for (let i = 0; i < loopLength; i++) {
         ret = compareValues(a[i], b[i], asc);
         if (ret !== 0) {
             break;
@@ -120,74 +146,91 @@ function compareLists<U extends number|string>(a:(U|null)[], b:(U|null)[], asc:b
     }
     if (ret === 0) {
         if (a.length < b.length) {
-            ret = (asc ? -1 : 1);
+            ret = asc ? -1 : 1;
         } else if (a.length > b.length) {
-            ret = (asc ? 1 : -1);
+            ret = asc ? 1 : -1;
         }
     }
     return ret;
 }
 
-export function lazyMobXTableSort<T>(data:T[], metric:SortMetric<T>, ascending:boolean = true):T[] {
+export function lazyMobXTableSort<T>(
+    data: T[],
+    metric: SortMetric<T>,
+    ascending: boolean = true
+): T[] {
     // Separating this for testing, so that classes can test their comparators
     //  against how the table will sort.
-    const dataAndValue:{data:T, initialPosition:number, sortBy:any[]}[] = [];
+    const dataAndValue: {
+        data: T;
+        initialPosition: number;
+        sortBy: any[];
+    }[] = [];
 
-    for (let i=0; i<data.length; i++) {
+    for (let i = 0; i < data.length; i++) {
         // Have to do this loop instead of using data.map because we need dataAndValue to be mutable,
         //  and Immutable.js makes .map return another immutable structure;
         const d = data[i];
         dataAndValue.push({
-            data:d,
+            data: d,
             initialPosition: i, // for stable sorting
-            sortBy:([] as any[]).concat(metric(d)) // ensure it's wrapped in an array, even if metric is number or string
+            sortBy: ([] as any[]).concat(metric(d)), // ensure it's wrapped in an array, even if metric is number or string
         });
-    };
-    let cmp:number, initialPositionA:number, initialPositionB:number;
-    dataAndValue.sort((a,b)=>{
-         cmp = compareLists(a.sortBy, b.sortBy, ascending);
-         if (cmp === 0) {
-             // stable sort
-             initialPositionA = a.initialPosition;
-             initialPositionB = b.initialPosition;
-             if (initialPositionA < initialPositionB) {
-                 cmp = -1;
-             } else {
-                 cmp = 1;
-             }
-         }
-         return cmp;
+    }
+    let cmp: number, initialPositionA: number, initialPositionB: number;
+    dataAndValue.sort((a, b) => {
+        cmp = compareLists(a.sortBy, b.sortBy, ascending);
+        if (cmp === 0) {
+            // stable sort
+            initialPositionA = a.initialPosition;
+            initialPositionB = b.initialPosition;
+            if (initialPositionA < initialPositionB) {
+                cmp = -1;
+            } else {
+                cmp = 1;
+            }
+        }
+        return cmp;
     });
-    return dataAndValue.map(x=>x.data);
+    return dataAndValue.map(x => x.data);
 }
 
-function getListOfEmptyStrings<T>(maxColLength:number): string[] {
-     return Array(maxColLength).join(".").split(".");
+function getListOfEmptyStrings<T>(maxColLength: number): string[] {
+    return Array(maxColLength)
+        .join('.')
+        .split('.');
 }
 
-function getAsList<T>(data: Array<string|string[]>, maxColLength: number): string[][] {
+function getAsList<T>(
+    data: Array<string | string[]>,
+    maxColLength: number
+): string[][] {
     let returnList: string[][] = [];
-    data.forEach((datum: string|string[]) => {
+    data.forEach((datum: string | string[]) => {
         if (datum instanceof Array) {
             if (maxColLength != datum.length) {
-                throw new Error('Not all the arrays returned from the download functions are from the same length.');
+                throw new Error(
+                    'Not all the arrays returned from the download functions are from the same length.'
+                );
             }
             returnList.push(datum);
         } else {
             let arr: string[] = [];
-            for (var i=0; i<maxColLength; i++) {
+            for (var i = 0; i < maxColLength; i++) {
                 arr = arr.concat(datum);
-            };
+            }
             returnList.push(arr);
         }
-    })
+    });
     return returnList;
 }
 
-
 function getDownloadObject<T>(columns: Column<T>[], rowData: T) {
-    let downloadObject: {data: Array<string[]|string>; maxColLength: number} = {data: [], maxColLength: 1};
-    columns.forEach((column:Column<T>) => {
+    let downloadObject: {
+        data: Array<string[] | string>;
+        maxColLength: number;
+    } = { data: [], maxColLength: 1 };
+    columns.forEach((column: Column<T>) => {
         if (column.download) {
             let downloadData = column.download(rowData);
             if (downloadData instanceof Array) {
@@ -199,42 +242,48 @@ function getDownloadObject<T>(columns: Column<T>[], rowData: T) {
                 downloadObject.data.push(downloadData);
             }
         } else {
-            downloadObject.data.push("");
+            downloadObject.data.push('');
         }
     });
     return downloadObject;
 }
 
 export class LazyMobXTableStore<T> {
-    public filterString:string|undefined;
-    @observable private _itemsLabel:string|undefined;
-    @observable private _itemsLabelPlural:string|undefined;
-    @observable public sortColumn:string;
-    @observable public sortAscending:boolean;
-    @observable.ref public columns:Column<T>[];
-    @observable public dataStore:ILazyMobXTableApplicationDataStore<T>;
-    @observable public downloadDataFetcher:ILazyMobXTableApplicationLazyDownloadDataFetcher|undefined;
-    @observable private onRowClick:((d:T)=>void)|undefined;
-    @observable private onRowMouseEnter:((d:T)=>void)|undefined;
-    @observable private onRowMouseLeave:((d:T)=>void)|undefined;
+    public filterString: string | undefined;
+    @observable private _itemsLabel: string | undefined;
+    @observable private _itemsLabelPlural: string | undefined;
+    @observable public sortColumn: string;
+    @observable public sortAscending: boolean;
+    @observable.ref public columns: Column<T>[];
+    @observable public dataStore: ILazyMobXTableApplicationDataStore<T>;
+    @observable public downloadDataFetcher:
+        | ILazyMobXTableApplicationLazyDownloadDataFetcher
+        | undefined;
+    @observable private onRowClick: ((d: T) => void) | undefined;
+    @observable private onRowMouseEnter: ((d: T) => void) | undefined;
+    @observable private onRowMouseLeave: ((d: T) => void) | undefined;
 
     // this observable is intended to always refer to props.columnVisibility
-    @observable private _columnVisibility:{[columnId: string]: boolean}|undefined;
+    @observable private _columnVisibility:
+        | { [columnId: string]: boolean }
+        | undefined;
     // this one keeps the state of the latest action (latest user selection)
-    @observable private _columnVisibilityOverride:{[columnId: string]: boolean}|undefined;
+    @observable private _columnVisibilityOverride:
+        | { [columnId: string]: boolean }
+        | undefined;
 
     @computed public get itemsPerPage() {
         return this.dataStore.itemsPerPage;
     }
 
-    public set itemsPerPage(i:number) {
+    public set itemsPerPage(i: number) {
         this.dataStore.itemsPerPage = i;
         this.page = this.page; // trigger clamping in page setter
     }
 
     @computed get firstHighlightedRowIndex() {
         let index = -1;
-        for (let i=0; i<this.displayData.length; i++) {
+        for (let i = 0; i < this.displayData.length; i++) {
             if (this.dataStore.isHighlighted(this.displayData[i])) {
                 index = i;
                 break;
@@ -243,22 +292,25 @@ export class LazyMobXTableStore<T> {
         return index;
     }
 
-    @computed get displayData():T[] {
+    @computed get displayData(): T[] {
         return this.dataStore.tableData;
     }
 
     @computed get showingAllRows(): boolean {
-        return this.displayData.length <= this.itemsPerPage || this.itemsPerPage === -1
+        return (
+            this.displayData.length <= this.itemsPerPage ||
+            this.itemsPerPage === -1
+        );
     }
 
     @computed public get page() {
         return this.dataStore.page;
     }
-    public set page(p:number) {
+    public set page(p: number) {
         this.dataStore.page = this.clampPage(p);
     }
 
-    private clampPage(p:number) {
+    private clampPage(p: number) {
         p = Math.max(p, 0);
         p = Math.min(p, this.maxPage);
         return p;
@@ -269,76 +321,93 @@ export class LazyMobXTableStore<T> {
     }
 
     @computed public get columnVisibility() {
-        return resolveColumnVisibility(this.columnVisibilityByColumnDefinition,
+        return resolveColumnVisibility(
+            this.columnVisibilityByColumnDefinition,
             this._columnVisibility,
-            this._columnVisibilityOverride);
+            this._columnVisibilityOverride
+        );
     }
 
     @computed public get columnVisibilityByColumnDefinition() {
         return resolveColumnVisibilityByColumnDefinition(this.columns);
     }
 
-    @computed public get downloadData()
-    {
-        const tableDownloadData:string[][] = [];
+    @computed public get downloadData() {
+        const tableDownloadData: string[][] = [];
 
         // add header (including hidden columns)
         tableDownloadData[0] = [];
-        this.columns.forEach((column:Column<T>) => {
-            tableDownloadData[0].push(column.headerDownload ? column.headerDownload(column.name) : column.name);
+        this.columns.forEach((column: Column<T>) => {
+            tableDownloadData[0].push(
+                column.headerDownload
+                    ? column.headerDownload(column.name)
+                    : column.name
+            );
         });
 
         // add rows (including hidden columns). The purpose of this part is to ensure that
         // if any element of rowData contains a column with multiple values, rowData is written as
         // multiple rows in tableDownloadData
-        this.dataStore.sortedData.forEach((rowData:T) => {
+        this.dataStore.sortedData.forEach((rowData: T) => {
             // retrieve all the download information for each row and store it in an object,
             // and calculate the maxColLength (max number of elements found in a column).
             let downloadObject = getDownloadObject(this.columns, rowData);
             // normalize the length of all columns based on the maxColLength (so that every column contains the
             // same number of elements)
-            const rowDownloadData: string[][] = getAsList(downloadObject.data, downloadObject.maxColLength);
+            const rowDownloadData: string[][] = getAsList(
+                downloadObject.data,
+                downloadObject.maxColLength
+            );
 
             //rowDownloadData is list of lists, containing all the elements per column.
             //processedRowsDownloadData becomes the transposed of rowDownloadData.
-            let processedRowsDownloadData = rowDownloadData[0].map(function(row:string, i:number) {
-              return rowDownloadData.map(function(col) {
-                return col[i];
-              })
+            let processedRowsDownloadData = rowDownloadData[0].map(function(
+                row: string,
+                i: number
+            ) {
+                return rowDownloadData.map(function(col) {
+                    return col[i];
+                });
             });
-           //Writing the transposed list to tableDownloadData to build the final table.
-           processedRowsDownloadData.forEach((processedRowDownloadData: string[]) => {
-              tableDownloadData.push(processedRowDownloadData);
-           });
+            //Writing the transposed list to tableDownloadData to build the final table.
+            processedRowsDownloadData.forEach(
+                (processedRowDownloadData: string[]) => {
+                    tableDownloadData.push(processedRowDownloadData);
+                }
+            );
         });
         return tableDownloadData;
     }
 
-    @computed get sortColumnObject():Column<T>|undefined {
-        return this.columns.find((col:Column<T>)=>this.isVisible(col) && (col.name === this.sortColumn));
+    @computed get sortColumnObject(): Column<T> | undefined {
+        return this.columns.find(
+            (col: Column<T>) =>
+                this.isVisible(col) && col.name === this.sortColumn
+        );
     }
 
-    @computed get visibleData():T[] {
+    @computed get visibleData(): T[] {
         return this.dataStore.visibleData;
     }
 
-    private getNextSortAscending(clickedColumn:Column<T>) {
+    private getNextSortAscending(clickedColumn: Column<T>) {
         if (this.sortColumn === clickedColumn.name) {
             // if current sort column is clicked column, simply toggle
             return !this.sortAscending;
         } else {
             // otherwise, use columns initial sort direction, or default ascending
-            const sortDirection:SortDirection = clickedColumn.defaultSortDirection || "asc";
-            return (sortDirection === "asc");
+            const sortDirection: SortDirection =
+                clickedColumn.defaultSortDirection || 'asc';
+            return sortDirection === 'asc';
         }
     }
 
-    @computed get sortMetric():SortMetric<T> {
+    @computed get sortMetric(): SortMetric<T> {
         const sortColumnObject = this.sortColumnObject;
         if (sortColumnObject && sortColumnObject.sortBy) {
             return sortColumnObject.sortBy;
         } else {
-            return ()=>0;
+            return () => 0;
         }
     }
 
@@ -353,19 +422,21 @@ export class LazyMobXTableStore<T> {
     }
 
     @computed
-    get headers():JSX.Element[] {
-        return this.visibleColumns.map((column:Column<T>, index:number)=>{
-            const headerProps:{
-                role?:"button",
-                className?:"multilineHeader sort-asc"|"multilineHeader sort-des",
-                onClick?:(e:React.MouseEvent)=>void
+    get headers(): JSX.Element[] {
+        return this.visibleColumns.map((column: Column<T>, index: number) => {
+            const headerProps: {
+                role?: 'button';
+                className?:
+                    | 'multilineHeader sort-asc'
+                    | 'multilineHeader sort-des';
+                onClick?: (e: React.MouseEvent) => void;
             } = {};
             if (column.sortBy) {
-                headerProps.role = "button";
-                headerProps.onClick = (e:React.MouseEvent) => {
+                headerProps.role = 'button';
+                headerProps.onClick = (e: React.MouseEvent) => {
                     const target = e.target as HTMLElement;
                     // Click of rc-tooltip in the header element bubbles the
-                    // on-click event, even though it is not a child of the 
+                    // on-click event, even though it is not a child of the
                     // header cell in the DOM. The check below make sure the
                     // click event originated from a a true child in the DOM.
                     const parent = $(target).closest('.multilineHeader');
@@ -375,14 +446,16 @@ export class LazyMobXTableStore<T> {
                 };
             }
             if (this.sortColumn === column.name) {
-                headerProps.className = (this.sortAscending ? "multilineHeader sort-asc" : "multilineHeader sort-des");
+                headerProps.className = this.sortAscending
+                    ? 'multilineHeader sort-asc'
+                    : 'multilineHeader sort-des';
             }
 
             let label;
             if (column.headerRender) {
                 label = column.headerRender(column.name);
             } else {
-                label = (<span>{column.name}</span>);
+                label = <span>{column.name}</span>;
             }
             let thContents;
 
@@ -395,7 +468,7 @@ export class LazyMobXTableStore<T> {
             } else {
                 thContents = label;
             }
-            let style:any = {};
+            let style: any = {};
             if (column.align) {
                 style.textAlign = column.align;
             }
@@ -405,37 +478,46 @@ export class LazyMobXTableStore<T> {
 
             return (
                 <React.Fragment key={index}>
-                    <th className='multilineHeader' {...headerProps} style={style}>
+                    <th
+                        className="multilineHeader"
+                        {...headerProps}
+                        style={style}
+                    >
                         {thContents}
                     </th>
-                    {column.resizable && <ColumnResizer className="multilineHeader columnResizer" minWidth={0} />}
+                    {column.resizable && (
+                        <ColumnResizer
+                            className="multilineHeader columnResizer"
+                            minWidth={0}
+                        />
+                    )}
                 </React.Fragment>
             );
         });
     }
 
-    @computed get visibleColumns():Column<T>[] {
-        return this.columns.filter(column=>this.isVisible(column));
+    @computed get visibleColumns(): Column<T>[] {
+        return this.columns.filter(column => this.isVisible(column));
     }
 
-    @computed get colVisProp(): IColumnVisibilityDef[]
-    {
+    @computed get colVisProp(): IColumnVisibilityDef[] {
         const colVisProp: IColumnVisibilityDef[] = [];
 
-        this.columns.forEach((column:Column<T>) => {
+        this.columns.forEach((column: Column<T>) => {
             colVisProp.push({
                 id: column.name,
                 name: column.name,
                 visible: this.columnVisibility[column.name],
-                togglable:(column.hasOwnProperty(('togglable')) ? column.togglable : true)
+                togglable: column.hasOwnProperty('togglable')
+                    ? column.togglable
+                    : true,
             });
         });
 
         return colVisProp;
     }
 
-    @computed get paginationStatusText(): string
-    {
+    @computed get paginationStatusText(): string {
         let firstVisibleItemDisp;
         let lastVisibleItemDisp;
 
@@ -443,18 +525,18 @@ export class LazyMobXTableStore<T> {
             firstVisibleItemDisp = 0;
             lastVisibleItemDisp = 0;
         } else {
-            firstVisibleItemDisp = (
-                this.itemsPerPage === PAGINATION_SHOW_ALL ?
-                    1 : (this.page * this.itemsPerPage) + 1
-            );
-
-            lastVisibleItemDisp = (
-                this.itemsPerPage === PAGINATION_SHOW_ALL ?
-                    this.rows.length : firstVisibleItemDisp + this.rows.length - 1
-            );
+            firstVisibleItemDisp =
+                this.itemsPerPage === PAGINATION_SHOW_ALL
+                    ? 1
+                    : this.page * this.itemsPerPage + 1;
+
+            lastVisibleItemDisp =
+                this.itemsPerPage === PAGINATION_SHOW_ALL
+                    ? this.rows.length
+                    : firstVisibleItemDisp + this.rows.length - 1;
         }
 
-        let itemsLabel:string = this.itemsLabel;
+        let itemsLabel: string = this.itemsLabel;
         if (itemsLabel.length) {
             // we need to prepend the space here instead of within the actual return value
             // to avoid unnecessary white-space at the end of the string
@@ -464,57 +546,62 @@ export class LazyMobXTableStore<T> {
         return `Showing ${firstVisibleItemDisp}-${lastVisibleItemDisp} of ${this.displayData.length}${itemsLabel}`;
     }
 
-    @computed get tds():JSX.Element[][] {
-        return this.visibleData.map((datum:T)=>{
-            return this.visibleColumns.map((column:Column<T>)=>{
-                const result = (<td key={column.name}>
-                    {column.render(datum)}
-                </td>);
+    @computed get tds(): JSX.Element[][] {
+        return this.visibleData.map((datum: T) => {
+            return this.visibleColumns.map((column: Column<T>) => {
+                const result = (
+                    <td key={column.name}>{column.render(datum)}</td>
+                );
                 if (column.resizable) {
                     return (
                         <React.Fragment>
                             {result}
-                            <ColumnResizer className='columnResizer' minWidth={0}/>
+                            <ColumnResizer
+                                className="columnResizer"
+                                minWidth={0}
+                            />
                         </React.Fragment>
-                    )
+                    );
                 }
                 return result;
             });
         });
     }
 
-    @computed get rows():JSX.Element[] {
+    @computed get rows(): JSX.Element[] {
         // We separate this so that highlighting isn't such a costly operation
         const ret = [];
-        for (let i=0; i<this.visibleData.length; i++) {
-            const rowProps:any = {};
-            const rowIsHighlighted = this.dataStore.isHighlighted(this.visibleData[i]);
+        for (let i = 0; i < this.visibleData.length; i++) {
+            const rowProps: any = {};
+            const rowIsHighlighted = this.dataStore.isHighlighted(
+                this.visibleData[i]
+            );
             const classNames = [];
             if (rowIsHighlighted) {
-                 classNames.push("highlighted");
+                classNames.push('highlighted');
             }
             if (this.onRowClick) {
-                classNames.push("clickable");
+                classNames.push('clickable');
 
                 const onRowClick = this.onRowClick; // by the time its called this might be undefined again, so need to save ref
-                rowProps.onClick = ()=>{
+                rowProps.onClick = () => {
                     onRowClick(this.visibleData[i]);
                 };
             }
             if (this.onRowMouseEnter) {
                 const onRowMouseEnter = this.onRowMouseEnter; // by the time its called this might be undefined again, so need to save ref
-                rowProps.onMouseEnter = ()=>{
+                rowProps.onMouseEnter = () => {
                     onRowMouseEnter!(this.visibleData[i]);
-                }
+                };
             }
             if (this.onRowMouseLeave) {
                 const onRowMouseLeave = this.onRowMouseLeave; // by the time its called this might be undefined again, so need to save ref
-                rowProps.onMouseLeave = ()=>{
+                rowProps.onMouseLeave = () => {
                     onRowMouseLeave!(this.visibleData[i]);
-                }
+                };
             }
             if (classNames.length) {
-                rowProps.className = classNames.join(" ");
+                rowProps.className = classNames.join(' ');
             }
             ret.push(
                 <tr key={i} {...rowProps}>
@@ -525,29 +612,44 @@ export class LazyMobXTableStore<T> {
         return ret;
     }
 
-    @action pageToRowIndex(index:number) {
+    @action pageToRowIndex(index: number) {
         this.page = Math.floor(index / this.itemsPerPage);
     }
 
-    @action setFilterString(str:string) {
+    @action setFilterString(str: string) {
         // we need to keep the filter string value in this store as well as in the data store,
         // because data store gets reset each time the component receives props.
         this.filterString = str;
         this.dataStore.filterString = str;
         this.page = 0;
-        this.dataStore.setFilter((d:T, filterString:string, filterStringUpper:string, filterStringLower:string)=>{
-            if (!filterString) {
-                return true; // dont filter if no input
-            }
-            let match = false;
-            for (const column of this.visibleColumns) {
-                match = (column.filter && column.filter(d, filterString, filterStringUpper, filterStringLower)) || false;
-                if (match) {
-                    break;
+        this.dataStore.setFilter(
+            (
+                d: T,
+                filterString: string,
+                filterStringUpper: string,
+                filterStringLower: string
+            ) => {
+                if (!filterString) {
+                    return true; // dont filter if no input
+                }
+                let match = false;
+                for (const column of this.visibleColumns) {
+                    match =
+                        (column.filter &&
+                            column.filter(
+                                d,
+                                filterString,
+                                filterStringUpper,
+                                filterStringLower
+                            )) ||
+                        false;
+                    if (match) {
+                        break;
+                    }
                 }
+                return match;
             }
-            return match;
-        });
+        );
     }
 
     @computed get itemsLabel() {
@@ -555,16 +657,15 @@ export class LazyMobXTableStore<T> {
             // use itemsLabel for plural in case no itemsLabelPlural provided
             if (!this._itemsLabelPlural || this.displayData.length === 1) {
                 return this._itemsLabel;
-            }
-            else {
+            } else {
                 return this._itemsLabelPlural;
             }
         } else {
-            return "";
+            return '';
         }
     }
 
-    @action setProps(props:LazyMobXTableProps<T>) {
+    @action setProps(props: LazyMobXTableProps<T>) {
         this.columns = props.columns;
         this._itemsLabel = props.itemsLabel;
         this._itemsLabelPlural = props.itemsLabelPlural;
@@ -577,20 +678,21 @@ export class LazyMobXTableStore<T> {
         if (props.dataStore) {
             this.dataStore = props.dataStore;
         } else {
-            this.dataStore = new SimpleLazyMobXTableApplicationDataStore<T>(props.data || []);
+            this.dataStore = new SimpleLazyMobXTableApplicationDataStore<T>(
+                props.data || []
+            );
         }
-        if(this.dataStore.page === undefined) {
+        if (this.dataStore.page === undefined) {
             this.dataStore.page = 0;
         }
-        if(this.itemsPerPage === undefined) {
+        if (this.itemsPerPage === undefined) {
             this.itemsPerPage = props.initialItemsPerPage || 50;
         }
         // even if dataStore passed in, we need to initialize sort props if undefined
         // otherwise we lose the functionality of 'initialSortColumn' and 'initialSortDirection' props
         if (this.dataStore.sortAscending === undefined) {
             this.dataStore.sortAscending = this.sortAscending;
-        }
-        else {
+        } else {
             // inherit the current state if defined
             this.sortAscending = this.dataStore.sortAscending;
         }
@@ -609,12 +711,13 @@ export class LazyMobXTableStore<T> {
         }
     }
 
-    @action updateColumnVisibility(id:string, visible:boolean)
-    {
+    @action updateColumnVisibility(id: string, visible: boolean) {
         // no previous action, need to init
         if (this._columnVisibilityOverride === undefined) {
             this._columnVisibilityOverride = resolveColumnVisibility(
-                this.columnVisibilityByColumnDefinition, this._columnVisibility);
+                this.columnVisibilityByColumnDefinition,
+                this._columnVisibility
+            );
         }
 
         // update visibility
@@ -623,112 +726,124 @@ export class LazyMobXTableStore<T> {
         }
     }
 
-    public isVisible(column:Column<T>): boolean
-    {
+    public isVisible(column: Column<T>): boolean {
         return this.columnVisibility[column.name] || false;
     }
 
-    constructor(lazyMobXTableProps:LazyMobXTableProps<T>) {
-        this.sortColumn = lazyMobXTableProps.initialSortColumn || "";
-        this.sortAscending = (lazyMobXTableProps.initialSortDirection !== "desc"); // default ascending
+    constructor(lazyMobXTableProps: LazyMobXTableProps<T>) {
+        this.sortColumn = lazyMobXTableProps.initialSortColumn || '';
+        this.sortAscending = lazyMobXTableProps.initialSortDirection !== 'desc'; // default ascending
         this.setProps(lazyMobXTableProps);
-        reaction(()=>this.displayData.length, ()=>{ this.page = this.clampPage(this.page); /* update for possibly reduced maxPage */});
+        reaction(
+            () => this.displayData.length,
+            () => {
+                this.page = this.clampPage(
+                    this.page
+                ); /* update for possibly reduced maxPage */
+            }
+        );
     }
 }
 
 @observer
-export default class LazyMobXTable<T> extends React.Component<LazyMobXTableProps<T>, {}> {
-    private store:LazyMobXTableStore<T>;
-    private handlers:{[fnName:string]:(...args:any[])=>void};
-    private filterInput:HTMLInputElement;
-    private filterInputReaction:IReactionDisposer;
-    private pageToHighlightReaction:IReactionDisposer;
+export default class LazyMobXTable<T> extends React.Component<
+    LazyMobXTableProps<T>,
+    {}
+> {
+    private store: LazyMobXTableStore<T>;
+    private handlers: { [fnName: string]: (...args: any[]) => void };
+    private filterInput: HTMLInputElement;
+    private filterInputReaction: IReactionDisposer;
+    private pageToHighlightReaction: IReactionDisposer;
 
     public static defaultProps = {
         showFilter: true,
         showCopyDownload: true,
         showPagination: true,
         showColumnVisibility: true,
-		showPaginationAtTop: false,
-        showCountHeader: false
+        showPaginationAtTop: false,
+        showCountHeader: false,
     };
 
     public get dataStore() {
         return this.store.dataStore;
     }
 
-    public getDownloadData(): string
-    {
+    public getDownloadData(): string {
         return serializeData(this.store.downloadData);
     }
 
-    public getDownloadDataPromise(): Promise<ICopyDownloadData>
-    {
+    public getDownloadDataPromise(): Promise<ICopyDownloadData> {
         // returning a promise instead of a string allows us to prevent triggering fetchAndCacheAllLazyData
         // until the copy/download button is clicked.
-        return new Promise<ICopyDownloadData>((resolve) => {
+        return new Promise<ICopyDownloadData>(resolve => {
             // we need to download all the lazy data before initiating the download process.
             if (this.store.downloadDataFetcher) {
                 // populate the cache instances with all available data for the lazy loaded columns
-                this.store.downloadDataFetcher.fetchAndCacheAllLazyData().then(allLazyData => {
-                    // we don't use allData directly,
-                    // we rely on the data cached by the download data fetcher
-                    resolve({
-                        status: "complete",
-                        text: this.getDownloadData()
-                    });
-                }).catch(() => {
-                    // even if loading of all lazy data fails, resolve with partial data
-                    resolve({
-                        status: "incomplete",
-                        text: this.getDownloadData()
+                this.store.downloadDataFetcher
+                    .fetchAndCacheAllLazyData()
+                    .then(allLazyData => {
+                        // we don't use allData directly,
+                        // we rely on the data cached by the download data fetcher
+                        resolve({
+                            status: 'complete',
+                            text: this.getDownloadData(),
+                        });
+                    })
+                    .catch(() => {
+                        // even if loading of all lazy data fails, resolve with partial data
+                        resolve({
+                            status: 'incomplete',
+                            text: this.getDownloadData(),
+                        });
                     });
-                });
             }
             // no lazy data to preload, just return the current download data
             else {
                 resolve({
-                    status: "complete",
-                    text: this.getDownloadData()
+                    status: 'complete',
+                    text: this.getDownloadData(),
                 });
             }
         });
     }
 
-    protected updateColumnVisibility(id: string, visible: boolean)
-    {
+    protected updateColumnVisibility(id: string, visible: boolean) {
         // ignore undefined columns
         if (this.store.columnVisibility[id] !== undefined) {
             this.store.updateColumnVisibility(id, visible);
         }
     }
 
-    constructor(props:LazyMobXTableProps<T>) {
+    constructor(props: LazyMobXTableProps<T>) {
         super(props);
         this.store = new LazyMobXTableStore<T>(props);
 
         this.handlers = {
             onFilterTextChange: (() => {
-                return inputBoxChangeTimeoutEvent((filterValue) => {
+                return inputBoxChangeTimeoutEvent(filterValue => {
                     this.store.setFilterString(filterValue);
-                }, 400)
+                }, 400);
             })(),
-            visibilityToggle:(columnId: string):void => {
+            visibilityToggle: (columnId: string): void => {
                 // toggle visibility
-                this.updateColumnVisibility(columnId, !this.store.columnVisibility[columnId]);
+                this.updateColumnVisibility(
+                    columnId,
+                    !this.store.columnVisibility[columnId]
+                );
             },
-            changeItemsPerPage:(ipp:number)=>{
-                this.store.itemsPerPage=ipp;
+            changeItemsPerPage: (ipp: number) => {
+                this.store.itemsPerPage = ipp;
             },
-            incPage:()=>{
+            incPage: () => {
                 this.store.page += 1;
             },
-            decPage:()=>{
+            decPage: () => {
                 this.store.page -= 1;
             },
-            filterInputRef: (input:HTMLInputElement)=>{
+            filterInputRef: (input: HTMLInputElement) => {
                 this.filterInput = input;
-            }
+            },
         };
         this.getDownloadData = this.getDownloadData.bind(this);
         this.getDownloadDataPromise = this.getDownloadDataPromise.bind(this);
@@ -737,14 +852,18 @@ export default class LazyMobXTable<T> extends React.Component<LazyMobXTableProps
         this.getTable = this.getTable.bind(this);
         this.getPaginationControls = this.getPaginationControls.bind(this);
         this.filterInputReaction = reaction(
-            ()=>this.store.dataStore.filterString,
-            str=>{ this.filterInput && (this.filterInput.value = str); }
+            () => this.store.dataStore.filterString,
+            str => {
+                this.filterInput && (this.filterInput.value = str);
+            }
         );
         this.pageToHighlightReaction = reaction(
-            ()=>this.store.firstHighlightedRowIndex,
-            (index:number)=>{
+            () => this.store.firstHighlightedRowIndex,
+            (index: number) => {
                 if (this.props.pageToHighlight) {
-                    this.store.pageToRowIndex(this.store.firstHighlightedRowIndex);
+                    this.store.pageToRowIndex(
+                        this.store.firstHighlightedRowIndex
+                    );
                 }
             }
         );
@@ -755,42 +874,43 @@ export default class LazyMobXTable<T> extends React.Component<LazyMobXTableProps
         this.pageToHighlightReaction();
     }
 
-    @action componentWillReceiveProps(nextProps:LazyMobXTableProps<T>) {
+    @action componentWillReceiveProps(nextProps: LazyMobXTableProps<T>) {
         this.store.setProps(nextProps);
     }
 
     private getPaginationControls() {
         //if (this.props.showPagination) {
-			// default paginationProps
-			let paginationProps:IPaginationControlsProps = {
-				className:"text-center topPagination",
-				itemsPerPage:this.store.itemsPerPage,
-                totalItems:this.store.displayData.length,
-				currentPage:this.store.page,
-				onChangeItemsPerPage:this.handlers.changeItemsPerPage,
-                showItemsPerPageSelector: false,
-				onPreviousPageClick:this.handlers.decPage,
-				onNextPageClick:this.handlers.incPage,
-				previousPageDisabled:this.store.page === 0,
-				nextPageDisabled:this.store.page === this.store.maxPage,
-				textBeforeButtons:this.store.paginationStatusText,
-                groupButtons: false,
-                bsStyle:"primary"
-			};
-			// override with given paginationProps if they exist
-			if (this.props.paginationProps) {
-				// put status text between button if no show more button
-				if (this.props.paginationProps.showMoreButton === false) {
-					delete paginationProps['textBeforeButtons'];
-					paginationProps['textBetweenButtons'] = this.store.paginationStatusText;
-				}
-				paginationProps = Object.assign(paginationProps, this.props.paginationProps)
-			}
-            return (
-                <PaginationControls
-                    {...paginationProps}
-                />
+        // default paginationProps
+        let paginationProps: IPaginationControlsProps = {
+            className: 'text-center topPagination',
+            itemsPerPage: this.store.itemsPerPage,
+            totalItems: this.store.displayData.length,
+            currentPage: this.store.page,
+            onChangeItemsPerPage: this.handlers.changeItemsPerPage,
+            showItemsPerPageSelector: false,
+            onPreviousPageClick: this.handlers.decPage,
+            onNextPageClick: this.handlers.incPage,
+            previousPageDisabled: this.store.page === 0,
+            nextPageDisabled: this.store.page === this.store.maxPage,
+            textBeforeButtons: this.store.paginationStatusText,
+            groupButtons: false,
+            bsStyle: 'primary',
+        };
+        // override with given paginationProps if they exist
+        if (this.props.paginationProps) {
+            // put status text between button if no show more button
+            if (this.props.paginationProps.showMoreButton === false) {
+                delete paginationProps['textBeforeButtons'];
+                paginationProps[
+                    'textBetweenButtons'
+                ] = this.store.paginationStatusText;
+            }
+            paginationProps = Object.assign(
+                paginationProps,
+                this.props.paginationProps
             );
+        }
+        return <PaginationControls {...paginationProps} />;
         // } else {
         //     return null;
         // }
@@ -798,63 +918,98 @@ export default class LazyMobXTable<T> extends React.Component<LazyMobXTableProps
 
     private get countHeader() {
         return (
-            <span data-test="LazyMobXTable_CountHeader" style={{float:"left", color:"black", fontSize: "16px", fontWeight: "bold"}}>
-                {this.store.displayData.length} {this.store.itemsLabel} (page {this.store.page + 1} of {this.store.maxPage + 1})
+            <span
+                data-test="LazyMobXTable_CountHeader"
+                style={{
+                    float: 'left',
+                    color: 'black',
+                    fontSize: '16px',
+                    fontWeight: 'bold',
+                }}
+            >
+                {this.store.displayData.length} {this.store.itemsLabel} (page{' '}
+                {this.store.page + 1} of {this.store.maxPage + 1})
             </span>
         );
     }
 
     private getTopToolbar() {
-        return (<div>
-            { this.props.showCountHeader && this.countHeader }
-            <ButtonToolbar style={{marginLeft:0}} className="tableMainToolbar">
-                { this.props.showFilter ? (
-                    <div className={`pull-right form-group has-feedback input-group-sm tableFilter`} style={{ display:'inline-block', marginLeft: 5}}>
-                        <input ref={this.handlers.filterInputRef} placeholder={this.props.filterPlaceholder || ""} type="text" onInput={this.handlers.onFilterTextChange} className="form-control tableSearchInput" style={{ width:200 }}  />
-                        <span className="fa fa-search form-control-feedback" aria-hidden="true" style={{zIndex: 0}} />
-                    </div>
-                ) : ""}
-                {this.props.showColumnVisibility ? (
-					<ColumnVisibilityControls
-						className="pull-right"
-						columnVisibility={this.store.colVisProp}
-						onColumnToggled={this.handlers.visibilityToggle}
-						{...this.props.columnVisibilityProps}
-					/>) : ""}
-                {this.props.showCopyDownload ? (
-                    ( this.props.downloadDataFetcher ?
-                        <CopyDownloadControls
-                            className="pull-right"
-                            downloadData={this.getDownloadDataPromise}
-                            downloadFilename="table.tsv"
-                            {...this.props.copyDownloadProps}
-                        /> :
-                        <SimpleCopyDownloadControls
+        return (
+            <div>
+                {this.props.showCountHeader && this.countHeader}
+                <ButtonToolbar
+                    style={{ marginLeft: 0 }}
+                    className="tableMainToolbar"
+                >
+                    {this.props.showFilter ? (
+                        <div
+                            className={`pull-right form-group has-feedback input-group-sm tableFilter`}
+                            style={{ display: 'inline-block', marginLeft: 5 }}
+                        >
+                            <input
+                                ref={this.handlers.filterInputRef}
+                                placeholder={this.props.filterPlaceholder || ''}
+                                type="text"
+                                onInput={this.handlers.onFilterTextChange}
+                                className="form-control tableSearchInput"
+                                style={{ width: 200 }}
+                            />
+                            <span
+                                className="fa fa-search form-control-feedback"
+                                aria-hidden="true"
+                                style={{ zIndex: 0 }}
+                            />
+                        </div>
+                    ) : (
+                        ''
+                    )}
+                    {this.props.showColumnVisibility ? (
+                        <ColumnVisibilityControls
                             className="pull-right"
-                            downloadData={this.getDownloadData}
-                            downloadFilename="table.tsv"
-                            controlsStyle="BUTTON"
-                            {...this.props.copyDownloadProps}
+                            columnVisibility={this.store.colVisProp}
+                            onColumnToggled={this.handlers.visibilityToggle}
+                            {...this.props.columnVisibilityProps}
                         />
-                    )
-                ) : ""}
-                {this.props.showPagination && this.props.showPaginationAtTop ? (
-                    <Observer>
-                        { this.getPaginationControls }
-                    </Observer>
-                ) : null}
-            </ButtonToolbar>
+                    ) : (
+                        ''
+                    )}
+                    {this.props.showCopyDownload ? (
+                        this.props.downloadDataFetcher ? (
+                            <CopyDownloadControls
+                                className="pull-right"
+                                downloadData={this.getDownloadDataPromise}
+                                downloadFilename="table.tsv"
+                                {...this.props.copyDownloadProps}
+                            />
+                        ) : (
+                            <SimpleCopyDownloadControls
+                                className="pull-right"
+                                downloadData={this.getDownloadData}
+                                downloadFilename="table.tsv"
+                                controlsStyle="BUTTON"
+                                {...this.props.copyDownloadProps}
+                            />
+                        )
+                    ) : (
+                        ''
+                    )}
+                    {this.props.showPagination &&
+                    this.props.showPaginationAtTop ? (
+                        <Observer>{this.getPaginationControls}</Observer>
+                    ) : null}
+                </ButtonToolbar>
             </div>
         );
     }
 
     private getBottomToolbar() {
         return (
-            <ButtonToolbar style={{marginLeft:0, float:'none'}} className="tableMainToolbar center">
-                {(this.props.showPagination) && (
-                    <Observer>
-                        { this.getPaginationControls }
-                    </Observer>
+            <ButtonToolbar
+                style={{ marginLeft: 0, float: 'none' }}
+                className="tableMainToolbar center"
+            >
+                {this.props.showPagination && (
+                    <Observer>{this.getPaginationControls}</Observer>
                 )}
             </ButtonToolbar>
         );
@@ -862,7 +1017,13 @@ export default class LazyMobXTable<T> extends React.Component<LazyMobXTableProps
 
     private getTable() {
         return (
-            <div style={{overflowX: this.props.enableHorizontalScroll ? "auto" : "visible"}}>
+            <div
+                style={{
+                    overflowX: this.props.enableHorizontalScroll
+                        ? 'auto'
+                        : 'visible',
+                }}
+            >
                 <SimpleTable
                     headers={this.store.headers}
                     rows={this.store.rows}
@@ -875,19 +1036,11 @@ export default class LazyMobXTable<T> extends React.Component<LazyMobXTableProps
     render() {
         return (
             <div className="lazy-mobx-table" data-test="LazyMobXTable">
-                <Observer>
-                    {this.getTopToolbar}
-                </Observer>
-                <Observer>
-                    {this.getTable}
-                </Observer>
-                {
-                    (!this.props.showPaginationAtTop) && (
-                        <Observer>
-                            {this.getBottomToolbar}
-                        </Observer>
-                    )
-                }
+                <Observer>{this.getTopToolbar}</Observer>
+                <Observer>{this.getTable}</Observer>
+                {!this.props.showPaginationAtTop && (
+                    <Observer>{this.getBottomToolbar}</Observer>
+                )}
             </div>
         );
     }
diff --git a/src/shared/components/lazyMobXTable/styles.scss b/src/shared/components/lazyMobXTable/styles.scss
index 6d85682e53f..ed5b4b8c245 100644
--- a/src/shared/components/lazyMobXTable/styles.scss
+++ b/src/shared/components/lazyMobXTable/styles.scss
@@ -1,37 +1,37 @@
 th.sort-des:after {
-  content: ' \25BC';
+    content: ' \25BC';
 }
 
 th.sort-asc:after {
-  content: ' \25B2';
+    content: ' \25B2';
 }
 
 .cbioportal-frontend .table > thead > tr > th.multilineHeader {
-  vertical-align: top;
-  line-height: 1.1;
-  padding-bottom: 4px;
+    vertical-align: top;
+    line-height: 1.1;
+    padding-bottom: 4px;
 }
 
 .topPagination {
-  .textBetweenButtons {
-    opacity: 1.00 !important;
-  }
+    .textBetweenButtons {
+        opacity: 1 !important;
+    }
 
-  display:flex;
-  align-items:center;
-  justify-content:center;
+    display: flex;
+    align-items: center;
+    justify-content: center;
 }
 
 .tableMainToolbar {
-  .form-group {
-    margin-bottom: 5px;
-  }
+    .form-group {
+        margin-bottom: 5px;
+    }
 }
 
 .cbioportal-frontend .table > tbody > tr > td.columnResizer,
 .cbioportal-frontend .table > thead > tr > td.columnResizer {
-  width: 2px;
-  border-right: #CCC 1px solid;
-  border-left: #CCC 1px solid;
-  padding: 0 !important;
+    width: 2px;
+    border-right: #ccc 1px solid;
+    border-left: #ccc 1px solid;
+    padding: 0 !important;
 }
diff --git a/src/shared/components/lazyMobXTable/utils.ts b/src/shared/components/lazyMobXTable/utils.ts
index 7aae24c6ec6..12b2b2a36b7 100644
--- a/src/shared/components/lazyMobXTable/utils.ts
+++ b/src/shared/components/lazyMobXTable/utils.ts
@@ -1,8 +1,8 @@
-import {SHOW_ALL_PAGE_SIZE} from "../paginationControls/PaginationControls";
-export function maxPage(displayDataLength:number, itemsPerPage:number) {
+import { SHOW_ALL_PAGE_SIZE } from '../paginationControls/PaginationControls';
+export function maxPage(displayDataLength: number, itemsPerPage: number) {
     if (itemsPerPage === SHOW_ALL_PAGE_SIZE) {
         return 0;
     } else {
-        return Math.floor(Math.max(displayDataLength-1,0) / itemsPerPage);
+        return Math.floor(Math.max(displayDataLength - 1, 0) / itemsPerPage);
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/loadingIndicator/LoadingIndicator.spec.tsx b/src/shared/components/loadingIndicator/LoadingIndicator.spec.tsx
index 47053070143..b68439ea1c5 100644
--- a/src/shared/components/loadingIndicator/LoadingIndicator.spec.tsx
+++ b/src/shared/components/loadingIndicator/LoadingIndicator.spec.tsx
@@ -5,15 +5,7 @@ import { shallow, mount } from 'enzyme';
 import sinon from 'sinon';
 
 describe('LoadingIndicator', () => {
+    before(() => {});
 
-    before(()=>{
-
-    });
-
-    after(()=>{
-
-    });
-
-
-
+    after(() => {});
 });
diff --git a/src/shared/components/loadingIndicator/LoadingIndicator.tsx b/src/shared/components/loadingIndicator/LoadingIndicator.tsx
index bc02e7aeb36..e60534641c7 100644
--- a/src/shared/components/loadingIndicator/LoadingIndicator.tsx
+++ b/src/shared/components/loadingIndicator/LoadingIndicator.tsx
@@ -1,89 +1,102 @@
 import * as React from 'react';
-import {ThreeBounce} from 'better-react-spinkit';
-import {If, Else, Then} from 'react-if';
-import Spinner from "react-spinkit";
-import {Portal} from 'react-portal';
+import { ThreeBounce } from 'better-react-spinkit';
+import { If, Else, Then } from 'react-if';
+import Spinner from 'react-spinkit';
+import { Portal } from 'react-portal';
 import classNames from 'classnames';
 import styles from './styles.module.scss';
-import {computed} from "mobx";
-import {observer} from "mobx-react";
+import { computed } from 'mobx';
+import { observer } from 'mobx-react';
 
 export interface ILoader {
     isLoading: boolean;
     style?: any;
     inline?: boolean;
     center?: boolean;
-    centerRelativeToContainer?:boolean;
-    size?: "big" | "small"
-    small?:boolean;
-    big?:boolean;
-    className?:string;
+    centerRelativeToContainer?: boolean;
+    size?: 'big' | 'small';
+    small?: boolean;
+    big?: boolean;
+    className?: string;
 }
 
 @observer
 export default class LoadingIndicator extends React.Component<ILoader, {}> {
-
     public static defaultProps = {
         inline: true,
         center: false,
-        size: "small"
+        size: 'small',
     };
 
     @computed get size() {
         if (this.props.size) {
             return this.props.size;
         } else if (this.props.big) {
-            return "big";
+            return 'big';
         } else if (this.props.small) {
-            return "small";
+            return 'small';
         } else {
             return undefined;
         }
     }
 
     public render() {
-
         const spinnerStyles = {
-            [styles.small]: this.size === "small",
-            [styles.big]: this.size === "big",
-            inlineBlock: this.props.inline
-        }
+            [styles.small]: this.size === 'small',
+            [styles.big]: this.size === 'big',
+            inlineBlock: this.props.inline,
+        };
 
         const parentStyles = {
-            [styles.centered]:this.props.center,
-            [styles["centered-relative-to-container"]]:this.props.centerRelativeToContainer,
-            [styles["centered-with-children"]]:(this.props.center || this.props.centerRelativeToContainer) && (React.Children.count(this.props.children) > 0),
-            inlineBlock: this.props.inline
+            [styles.centered]: this.props.center,
+            [styles['centered-relative-to-container']]: this.props
+                .centerRelativeToContainer,
+            [styles['centered-with-children']]:
+                (this.props.center || this.props.centerRelativeToContainer) &&
+                React.Children.count(this.props.children) > 0,
+            inlineBlock: this.props.inline,
         };
 
         return (
             <If condition={this.props.isLoading}>
                 <Then>
-                    <div className={classNames(parentStyles, this.props.className)} style={this.props.style||{}}>
-                        <Spinner fadeIn="none"
-                                 className={classNames(styles.color, spinnerStyles)}
-                                 style={{display: 'inline-block'}}
-                                 name="line-scale-pulse-out"/>
+                    <div
+                        className={classNames(
+                            parentStyles,
+                            this.props.className
+                        )}
+                        style={this.props.style || {}}
+                    >
+                        <Spinner
+                            fadeIn="none"
+                            className={classNames(styles.color, spinnerStyles)}
+                            style={{ display: 'inline-block' }}
+                            name="line-scale-pulse-out"
+                        />
                         <div className={styles.progressUI}>
-                        {
-                            this.props.children
-                        }
+                            {this.props.children}
                         </div>
                     </div>
                 </Then>
             </If>
         );
-
     }
 }
 
-
 export class GlobalLoader extends React.Component<ILoader, {}> {
-
     public render() {
-        return <Portal isOpened={this.props.isLoading}>
-            <Spinner className={classNames(styles.color, styles.centered, styles.big)} fadeIn="none" name="line-scale-pulse-out" />
-        </Portal>
+        return (
+            <Portal isOpened={this.props.isLoading}>
+                <Spinner
+                    className={classNames(
+                        styles.color,
+                        styles.centered,
+                        styles.big
+                    )}
+                    fadeIn="none"
+                    name="line-scale-pulse-out"
+                />
+            </Portal>
+        );
     }
-
 }
diff --git a/src/shared/components/loadingIndicator/styles.module.scss b/src/shared/components/loadingIndicator/styles.module.scss
index 7dac8a8a086..1cf909c5ebc 100644
--- a/src/shared/components/loadingIndicator/styles.module.scss
+++ b/src/shared/components/loadingIndicator/styles.module.scss
@@ -1,33 +1,31 @@
 .centered {
-  position:fixed;
-  left:50%;
-  top:50%;
-  z-index:10000;
-  text-align:center;
-  transform: translate(-50%, -50%);
-  animation: fadein 1s;
+    position: fixed;
+    left: 50%;
+    top: 50%;
+    z-index: 10000;
+    text-align: center;
+    transform: translate(-50%, -50%);
+    animation: fadein 1s;
 
-  border-radius:10px;
+    border-radius: 10px;
 
-  :global(.hiddenByPosition) & {
-    display:none !important;
-  }
-
-  > :global(.sk-spinner) {
-    background:$brand-primary;
-    padding:15px;
-    border-radius: 50%;
-    height:115px;
-    width:115px;
-
-  }
+    :global(.hiddenByPosition) & {
+        display: none !important;
+    }
 
-  .color {
-    > div {
-      color:#fff !important;
+    > :global(.sk-spinner) {
+        background: $brand-primary;
+        padding: 15px;
+        border-radius: 50%;
+        height: 115px;
+        width: 115px;
     }
-  }
 
+    .color {
+        > div {
+            color: #fff !important;
+        }
+    }
 }
 
 //.centered-relative-to-container {
@@ -40,49 +38,53 @@
 //}
 
 @keyframes fadein {
-  from { opacity: 0; }
-  to   { opacity: 1; }
+    from {
+        opacity: 0;
+    }
+    to {
+        opacity: 1;
+    }
 }
 
 .centered-with-children {
-  // fixes blurry text bug to have an even # of pixels in width
-  width:600px;
+    // fixes blurry text bug to have an even # of pixels in width
+    width: 600px;
 }
 
 .color {
-  > div {
-    color:$brand-primary !important;
-  }
+    > div {
+        color: $brand-primary !important;
+    }
 }
 
 .small {
-  > div {
-    width:3px !important;
-    margin:0 2px !important;
-    height:12px !important;
-    width:3px !important;
-  }
-  margin-left:10px;
+    > div {
+        width: 3px !important;
+        margin: 0 2px !important;
+        height: 12px !important;
+        width: 3px !important;
+    }
+    margin-left: 10px;
 }
 
 .big {
-  > div {
-    height:75px !important;
-    width:6px !important;
-    margin:4px !important;
-  }
+    > div {
+        height: 75px !important;
+        width: 6px !important;
+        margin: 4px !important;
+    }
 }
 
 .progressUI {
-  position:absolute;
-  top:140px;
-  left:50%;
-  transform:translateX(-50%);
-  background:#fff;
-  border-radius:20px;
-  padding:15px;
+    position: absolute;
+    top: 140px;
+    left: 50%;
+    transform: translateX(-50%);
+    background: #fff;
+    border-radius: 20px;
+    padding: 15px;
 
-  &:empty {
-    display:none;
-  }
-}
\ No newline at end of file
+    &:empty {
+        display: none;
+    }
+}
diff --git a/src/shared/components/miniOncoprint/MiniOncoprint.tsx b/src/shared/components/miniOncoprint/MiniOncoprint.tsx
index b37b9da1278..fa8cddbccee 100644
--- a/src/shared/components/miniOncoprint/MiniOncoprint.tsx
+++ b/src/shared/components/miniOncoprint/MiniOncoprint.tsx
@@ -1,39 +1,79 @@
-import * as React from "react";
+import * as React from 'react';
 import styles from './styles.module.scss';
 
 interface IMiniOncoprint {
-    group1Width:number;
-    group2Width:number;
-    group1Unprofiled:number;
-    group2Unprofiled:number;
-    group1Unaltered:number;
-    group1Altered:number;
-    group2Altered:number;
-    group1Color?:string;
-    group2Color?:string;
-    alterationColor?:string;
-    height?:number;
-    width:number;
+    group1Width: number;
+    group2Width: number;
+    group1Unprofiled: number;
+    group2Unprofiled: number;
+    group1Unaltered: number;
+    group1Altered: number;
+    group2Altered: number;
+    group1Color?: string;
+    group2Color?: string;
+    alterationColor?: string;
+    height?: number;
+    width: number;
 }
 
-export const MiniOncoprint: React.SFC<IMiniOncoprint> = (props) => {
-     const height = props.height || 2;
+export const MiniOncoprint: React.SFC<IMiniOncoprint> = props => {
+    const height = props.height || 2;
 
-    return <div className={styles.wrapper} style={{width:props.width}}>
-        <div className={styles.groupRow}>
-            <div style={{ width:`${props.group1Width}%`, background: props.group1Color}}></div>
-            <div style={{ width:`${props.group2Width}%`, background: props.group2Color}}></div>
-        </div>
-        <div className={styles.alterationRow}>
-            <div style={{ width: `${props.group1Unprofiled}%`, background: 'white', position: 'relative' }}>
-                <div className={styles.strike}></div>
+    return (
+        <div className={styles.wrapper} style={{ width: props.width }}>
+            <div className={styles.groupRow}>
+                <div
+                    style={{
+                        width: `${props.group1Width}%`,
+                        background: props.group1Color,
+                    }}
+                ></div>
+                <div
+                    style={{
+                        width: `${props.group2Width}%`,
+                        background: props.group2Color,
+                    }}
+                ></div>
             </div>
-            <div style={{ width: `${props.group1Unaltered}%`, background: 'transparent' }}></div>
-            <div style={{ width: `${props.group1Altered}%`, background: '#3786C2' }}></div>
-            <div style={{ width: `${props.group2Altered}%`, background: '#3786C2' }}></div>
-            <div style={{ width: `${props.group2Unprofiled}%`, background: 'white', position: 'absolute', right: 0 }}>
-                <div className={styles.strike}></div>
+            <div className={styles.alterationRow}>
+                <div
+                    style={{
+                        width: `${props.group1Unprofiled}%`,
+                        background: 'white',
+                        position: 'relative',
+                    }}
+                >
+                    <div className={styles.strike}></div>
+                </div>
+                <div
+                    style={{
+                        width: `${props.group1Unaltered}%`,
+                        background: 'transparent',
+                    }}
+                ></div>
+                <div
+                    style={{
+                        width: `${props.group1Altered}%`,
+                        background: '#3786C2',
+                    }}
+                ></div>
+                <div
+                    style={{
+                        width: `${props.group2Altered}%`,
+                        background: '#3786C2',
+                    }}
+                ></div>
+                <div
+                    style={{
+                        width: `${props.group2Unprofiled}%`,
+                        background: 'white',
+                        position: 'absolute',
+                        right: 0,
+                    }}
+                >
+                    <div className={styles.strike}></div>
+                </div>
             </div>
         </div>
-    </div>;
-}
+    );
+};
diff --git a/src/shared/components/miniOncoprint/styles.module.scss b/src/shared/components/miniOncoprint/styles.module.scss
index 63f857c3543..dbd31f5a398 100644
--- a/src/shared/components/miniOncoprint/styles.module.scss
+++ b/src/shared/components/miniOncoprint/styles.module.scss
@@ -1,36 +1,31 @@
 .wrapper {
+    > div {
+        display: flex;
+        background: #bbb;
 
-  > div {
-    display:flex;
-    background:#bbb;
-
-    div {
-      height:2px;
+        div {
+            height: 2px;
+        }
     }
 
-  }
-
-  .groupRow {
-    div {
-      height:3px;
-    }
-  }
-  .alterationRow {
-    margin-top:3px;
-    position: relative;
-    div {
-      height:8px;
+    .groupRow {
+        div {
+            height: 3px;
+        }
     }
-    .strike {
-      position: absolute;
-      top: 50%;
-      transform: translateY(-50%);
-      height: 1px;
-      width: 100%;
-      background-color:#bbb;
+    .alterationRow {
+        margin-top: 3px;
+        position: relative;
+        div {
+            height: 8px;
+        }
+        .strike {
+            position: absolute;
+            top: 50%;
+            transform: translateY(-50%);
+            height: 1px;
+            width: 100%;
+            background-color: #bbb;
+        }
     }
-  }
-
 }
-
-
diff --git a/src/shared/components/mutationMapper/MutationMapper.tsx b/src/shared/components/mutationMapper/MutationMapper.tsx
index 439fa2f092a..5c374487f9a 100644
--- a/src/shared/components/mutationMapper/MutationMapper.tsx
+++ b/src/shared/components/mutationMapper/MutationMapper.tsx
@@ -1,9 +1,9 @@
 import * as React from 'react';
 import _ from 'lodash';
-import autobind from "autobind-decorator";
-import {observer} from "mobx-react";
-import {computed, action, observable} from "mobx";
-import classnames from "classnames";
+import autobind from 'autobind-decorator';
+import { observer } from 'mobx-react';
+import { computed, action, observable } from 'mobx';
+import classnames from 'classnames';
 import {
     LollipopMutationPlot,
     FilterResetPanel,
@@ -13,28 +13,34 @@ import {
     TrackVisibility,
     ProteinImpactTypeBadgeSelector,
     onFilterOptionSelect,
-    DataFilterType
-} from "react-mutation-mapper";
+    DataFilterType,
+} from 'react-mutation-mapper';
 
 import 'react-mutation-mapper/dist/styles.css';
 import 'cbioportal-frontend-commons/dist/styles.css';
 import 'react-table/react-table.css';
 
-import LoadingIndicator from "shared/components/loadingIndicator/LoadingIndicator";
-import StructureViewerPanel from "shared/components/structureViewer/StructureViewerPanel";
-import OncoKbEvidenceCache from "shared/cache/OncoKbEvidenceCache";
-import PubMedCache from "shared/cache/PubMedCache";
-import GenomeNexusCache from "shared/cache/GenomeNexusCache";
+import LoadingIndicator from 'shared/components/loadingIndicator/LoadingIndicator';
+import StructureViewerPanel from 'shared/components/structureViewer/StructureViewerPanel';
+import OncoKbEvidenceCache from 'shared/cache/OncoKbEvidenceCache';
+import PubMedCache from 'shared/cache/PubMedCache';
+import GenomeNexusCache from 'shared/cache/GenomeNexusCache';
 import GenomeNexusMyVariantInfoCache from 'shared/cache/GenomeNexusMyVariantInfoCache';
-import {IMyCancerGenomeData} from "shared/model/MyCancerGenome";
-import PdbHeaderCache from "shared/cache/PdbHeaderCache";
-import {DEFAULT_PROTEIN_IMPACT_TYPE_COLORS, getColorForProteinImpactType} from "shared/lib/MutationUtils";
-import ProteinChainPanel from "shared/components/proteinChainPanel/ProteinChainPanel";
-import MutationMapperStore from "./MutationMapperStore";
-import {findProteinImpactTypeFilter, PROTEIN_IMPACT_TYPE_FILTER_ID} from "./MutationMapperDataStore";
-import WindowStore from "../window/WindowStore";
+import { IMyCancerGenomeData } from 'shared/model/MyCancerGenome';
+import PdbHeaderCache from 'shared/cache/PdbHeaderCache';
+import {
+    DEFAULT_PROTEIN_IMPACT_TYPE_COLORS,
+    getColorForProteinImpactType,
+} from 'shared/lib/MutationUtils';
+import ProteinChainPanel from 'shared/components/proteinChainPanel/ProteinChainPanel';
+import MutationMapperStore from './MutationMapperStore';
+import {
+    findProteinImpactTypeFilter,
+    PROTEIN_IMPACT_TYPE_FILTER_ID,
+} from './MutationMapperDataStore';
+import WindowStore from '../window/WindowStore';
 
-import styles from "./mutationMapper.module.scss";
+import styles from './mutationMapper.module.scss';
 
 export interface IMutationMapperProps {
     store: MutationMapperStore;
@@ -52,9 +58,9 @@ export interface IMutationMapperProps {
     studyId?: string;
     myCancerGenomeData?: IMyCancerGenomeData;
     pdbHeaderCache?: PdbHeaderCache;
-    oncoKbEvidenceCache?:OncoKbEvidenceCache;
-    genomeNexusCache?:GenomeNexusCache;
-    genomeNexusMyVariantInfoCache?:GenomeNexusMyVariantInfoCache;
+    oncoKbEvidenceCache?: OncoKbEvidenceCache;
+    genomeNexusCache?: GenomeNexusCache;
+    genomeNexusMyVariantInfoCache?: GenomeNexusMyVariantInfoCache;
     // server config properties
     genomeNexusUrl?: string;
     oncoKbPublicApiUrl?: string;
@@ -70,32 +76,51 @@ export interface IMutationMapperProps {
 }
 
 @observer
-export default class MutationMapper<P extends IMutationMapperProps> extends DefaultMutationMapper<P>
-{
-    @computed get trackDataStatus(): TrackDataStatus
-    {
-        let oncoKbDataStatus: 'pending' | 'error' | 'complete' | 'empty' = this.props.store.oncoKbData.status;
-
-        if (oncoKbDataStatus === 'complete' && _.isEmpty(this.props.store.oncoKbDataByProteinPosStart)) {
+export default class MutationMapper<
+    P extends IMutationMapperProps
+> extends DefaultMutationMapper<P> {
+    @computed get trackDataStatus(): TrackDataStatus {
+        let oncoKbDataStatus: 'pending' | 'error' | 'complete' | 'empty' = this
+            .props.store.oncoKbData.status;
+
+        if (
+            oncoKbDataStatus === 'complete' &&
+            _.isEmpty(this.props.store.oncoKbDataByProteinPosStart)
+        ) {
             oncoKbDataStatus = 'empty';
         }
 
-        let hotspotDataStatus: 'pending' | 'error' | 'complete' | 'empty' = this.props.store.indexedHotspotData.status;
+        let hotspotDataStatus: 'pending' | 'error' | 'complete' | 'empty' = this
+            .props.store.indexedHotspotData.status;
 
-        if (hotspotDataStatus === 'complete' && _.isEmpty(this.props.store.hotspotsByPosition)) {
+        if (
+            hotspotDataStatus === 'complete' &&
+            _.isEmpty(this.props.store.hotspotsByPosition)
+        ) {
             hotspotDataStatus = 'empty';
         }
 
-        let alignmentDataStatus: 'pending' | 'error' | 'complete' | 'empty' = this.props.store.alignmentData.status;
+        let alignmentDataStatus:
+            | 'pending'
+            | 'error'
+            | 'complete'
+            | 'empty' = this.props.store.alignmentData.status;
 
-        if (alignmentDataStatus === 'complete' && this.props.store.pdbChainDataStore.allData.length === 0) {
+        if (
+            alignmentDataStatus === 'complete' &&
+            this.props.store.pdbChainDataStore.allData.length === 0
+        ) {
             alignmentDataStatus = 'empty';
         }
 
-        let ptmDataStatus: 'pending' | 'error' | 'complete' | 'empty' = this.props.store.ptmData.status;
+        let ptmDataStatus: 'pending' | 'error' | 'complete' | 'empty' = this
+            .props.store.ptmData.status;
 
-        if (ptmDataStatus === 'complete' &&
-            (!this.props.store.ptmData.result || this.props.store.ptmData.result.length === 0)) {
+        if (
+            ptmDataStatus === 'complete' &&
+            (!this.props.store.ptmData.result ||
+                this.props.store.ptmData.result.length === 0)
+        ) {
             ptmDataStatus = 'empty';
         }
 
@@ -103,7 +128,7 @@ export default class MutationMapper<P extends IMutationMapperProps> extends Defa
             [TrackName.OncoKB]: oncoKbDataStatus,
             [TrackName.CancerHotspots]: hotspotDataStatus,
             [TrackName.PTM]: ptmDataStatus,
-            [TrackName.PDB]: alignmentDataStatus
+            [TrackName.PDB]: alignmentDataStatus,
         };
     }
 
@@ -118,15 +143,18 @@ export default class MutationMapper<P extends IMutationMapperProps> extends Defa
 
     // No default implementation, child classes should override this
     // TODO provide a generic version of this? See ResultsViewMutationMapper.mutationRateSummary
-    protected get mutationRateSummary():JSX.Element|null {
+    protected get mutationRateSummary(): JSX.Element | null {
         return null;
     }
 
     @computed get multipleMutationInfo(): string {
-        const count = this.props.store.dataStore.duplicateMutationCountInMultipleSamples;
-        const mutationsLabel = count === 1 ? "mutation" : "mutations";
+        const count = this.props.store.dataStore
+            .duplicateMutationCountInMultipleSamples;
+        const mutationsLabel = count === 1 ? 'mutation' : 'mutations';
 
-        return count > 0 ? `: includes ${count} duplicate ${mutationsLabel} in patients with multiple samples` : "";
+        return count > 0
+            ? `: includes ${count} duplicate ${mutationsLabel} in patients with multiple samples`
+            : '';
     }
 
     @computed get itemsLabelPlural(): string {
@@ -141,11 +169,10 @@ export default class MutationMapper<P extends IMutationMapperProps> extends Defa
     /**
      * Overriding the parent method to have a customized filter panel.
      */
-    protected get mutationFilterPanel(): JSX.Element | null
-    {
+    protected get mutationFilterPanel(): JSX.Element | null {
         return (
             <div>
-                <div style={{paddingBottom: 15, paddingTop: 15}}>
+                <div style={{ paddingBottom: 15, paddingTop: 15 }}>
                     <ProteinImpactTypeBadgeSelector
                         filter={this.proteinImpactTypeFilter}
                         counts={this.store.mutationCountsByProteinImpactType}
@@ -156,8 +183,7 @@ export default class MutationMapper<P extends IMutationMapperProps> extends Defa
         );
     }
 
-    protected get structureViewerPanel(): JSX.Element | null
-    {
+    protected get structureViewerPanel(): JSX.Element | null {
         return this.is3dPanelOpen ? (
             <StructureViewerPanel
                 mutationDataStore={this.props.store.dataStore}
@@ -169,11 +195,10 @@ export default class MutationMapper<P extends IMutationMapperProps> extends Defa
                 onClose={this.close3dPanel}
                 {...DEFAULT_PROTEIN_IMPACT_TYPE_COLORS}
             />
-        ): null;
+        ) : null;
     }
 
-    protected get mutationPlot(): JSX.Element | null
-    {
+    protected get mutationPlot(): JSX.Element | null {
         return (
             <LollipopMutationPlot
                 store={this.props.store}
@@ -185,15 +210,16 @@ export default class MutationMapper<P extends IMutationMapperProps> extends Defa
                 onTrackVisibilityChange={this.onTrackVisibilityChange}
                 getLollipopColor={getColorForProteinImpactType}
                 filterResetPanel={
-                    !this.props.store.dataStore.showingAllData && this.filterResetPanel !== null ?
-                        this.filterResetPanel: undefined
+                    !this.props.store.dataStore.showingAllData &&
+                    this.filterResetPanel !== null
+                        ? this.filterResetPanel
+                        : undefined
                 }
             />
         );
     }
 
-    protected get proteinChainPanel(): JSX.Element | null
-    {
+    protected get proteinChainPanel(): JSX.Element | null {
         return this.is3dPanelOpen ? (
             <ProteinChainPanel
                 store={this.props.store}
@@ -202,15 +228,16 @@ export default class MutationMapper<P extends IMutationMapperProps> extends Defa
                 geneXOffset={this.lollipopPlotGeneX}
                 maxChainsHeight={200}
             />
-        ): null;
+        ) : null;
     }
 
-    protected get view3dButton(): JSX.Element | null
-    {
+    protected get view3dButton(): JSX.Element | null {
         return (
             <button
                 className="btn btn-default btn-sm"
-                disabled={this.props.store.pdbChainDataStore.allData.length === 0}
+                disabled={
+                    this.props.store.pdbChainDataStore.allData.length === 0
+                }
                 onClick={this.toggle3dPanel}
                 data-test="view3DStructure"
             >
@@ -219,15 +246,18 @@ export default class MutationMapper<P extends IMutationMapperProps> extends Defa
         );
     }
 
-    protected get filterResetPanel(): JSX.Element | null
-    {
+    protected get filterResetPanel(): JSX.Element | null {
         const dataStore = this.props.store.dataStore;
 
         return (
             <FilterResetPanel
                 resetFilters={() => dataStore.resetFilters()}
                 filterInfo={`Showing ${dataStore.tableData.length} of ${dataStore.allData.length} mutations.`}
-                className={classnames("alert" , "alert-success", styles.filterResetPanel)}
+                className={classnames(
+                    'alert',
+                    'alert-success',
+                    styles.filterResetPanel
+                )}
                 buttonClass="btn btn-default btn-xs"
             />
         );
@@ -238,24 +268,28 @@ export default class MutationMapper<P extends IMutationMapperProps> extends Defa
         return false;
     }
 
-    protected get mutationTableComponent(): JSX.Element|null
-    {
+    protected get mutationTableComponent(): JSX.Element | null {
         // Child classes should override this method to return an instance of MutationTable
         return null;
     }
 
-    public render()
-    {
+    public render() {
         return (
             <div>
                 {this.structureViewerPanel}
 
-                <LoadingIndicator center={true} size="big" isLoading={this.isLoading} />
-                {
-                    (!this.isLoading) && (
+                <LoadingIndicator
+                    center={true}
+                    size="big"
+                    isLoading={this.isLoading}
+                />
+                {!this.isLoading && (
                     <div>
-                        <div style={{ display:'flex' }}>
-                            <div className="borderedChart" style={{ marginRight:10 }}>
+                        <div style={{ display: 'flex' }}>
+                            <div
+                                className="borderedChart"
+                                style={{ marginRight: 10 }}
+                            >
                                 {this.mutationPlot}
                                 {this.proteinChainPanel}
                             </div>
@@ -267,11 +301,10 @@ export default class MutationMapper<P extends IMutationMapperProps> extends Defa
                                 {this.view3dButton}
                             </div>
                         </div>
-                        <hr style={{ marginTop:20 }} />
+                        <hr style={{ marginTop: 20 }} />
                         {this.mutationTable}
                     </div>
-                    )
-                }
+                )}
             </div>
         );
     }
@@ -299,32 +332,45 @@ export default class MutationMapper<P extends IMutationMapperProps> extends Defa
 
     @autobind
     @action
-    protected onTrackVisibilityChange(selectedTrackNames: string[])
-    {
+    protected onTrackVisibilityChange(selectedTrackNames: string[]) {
         // 3D panel is toggled to open
-        if (this.trackVisibility[TrackName.PDB] === 'hidden' && selectedTrackNames.includes(TrackName.PDB)) {
+        if (
+            this.trackVisibility[TrackName.PDB] === 'hidden' &&
+            selectedTrackNames.includes(TrackName.PDB)
+        ) {
             this.open3dPanel();
         }
         // 3D panel is toggled to close
-        else if (this.trackVisibility[TrackName.PDB] === 'visible' && !selectedTrackNames.includes(TrackName.PDB)) {
+        else if (
+            this.trackVisibility[TrackName.PDB] === 'visible' &&
+            !selectedTrackNames.includes(TrackName.PDB)
+        ) {
             this.close3dPanel();
         }
 
         // clear visibility
-        Object.keys(this.trackVisibility).forEach(trackName => this.trackVisibility[trackName] = 'hidden');
+        Object.keys(this.trackVisibility).forEach(
+            trackName => (this.trackVisibility[trackName] = 'hidden')
+        );
 
         // reset visibility values for the visible ones
-        selectedTrackNames.forEach(trackName => this.trackVisibility[trackName] = 'visible');
+        selectedTrackNames.forEach(
+            trackName => (this.trackVisibility[trackName] = 'visible')
+        );
     }
 
     @autobind
     @action
-    protected onProteinImpactTypeSelect(selectedMutationTypeIds: string[], allValuesSelected: boolean)
-    {
-        onFilterOptionSelect(selectedMutationTypeIds.map(v => v.toLowerCase()),
+    protected onProteinImpactTypeSelect(
+        selectedMutationTypeIds: string[],
+        allValuesSelected: boolean
+    ) {
+        onFilterOptionSelect(
+            selectedMutationTypeIds.map(v => v.toLowerCase()),
             allValuesSelected,
             this.store.dataStore,
             DataFilterType.PROTEIN_IMPACT_TYPE,
-            PROTEIN_IMPACT_TYPE_FILTER_ID);
+            PROTEIN_IMPACT_TYPE_FILTER_ID
+        );
     }
 }
diff --git a/src/shared/components/mutationMapper/MutationMapperConfig.ts b/src/shared/components/mutationMapper/MutationMapperConfig.ts
index d60854ac5f6..c194910dde9 100644
--- a/src/shared/components/mutationMapper/MutationMapperConfig.ts
+++ b/src/shared/components/mutationMapper/MutationMapperConfig.ts
@@ -1,4 +1,4 @@
-import {IMutationMapperProps} from "./MutationMapper";
+import { IMutationMapperProps } from './MutationMapper';
 
 // This is a subset of IServerConfig containing config values used only in Mutation Mapper
 export interface IMutationMapperConfig {
@@ -14,18 +14,20 @@ export interface IMutationMapperConfig {
     genomenexus_url: string | null;
 }
 
-export function convertToMutationMapperProps(config: IMutationMapperConfig): Partial<IMutationMapperProps>
-{
+export function convertToMutationMapperProps(
+    config: IMutationMapperConfig
+): Partial<IMutationMapperProps> {
     return {
         genomeNexusUrl: config.genomenexus_url || undefined,
         isoformOverrideSource: config.isoformOverrideSource,
         myGeneInfoUrlTemplate: config.mygene_info_url || undefined,
         uniprotIdUrlTemplate: config.uniprot_id_url || undefined,
-        transcriptSummaryUrlTemplate: config.ensembl_transcript_url || undefined,
+        transcriptSummaryUrlTemplate:
+            config.ensembl_transcript_url || undefined,
         enableOncoKb: config.show_oncokb,
         enableGenomeNexus: config.show_genomenexus,
         enableHotspot: config.show_hotspot,
         enableMyCancerGenome: config.mycancergenome_show,
-        enableCivic: config.show_civic
+        enableCivic: config.show_civic,
     };
 }
diff --git a/src/shared/components/mutationMapper/MutationMapperDataStore.spec.ts b/src/shared/components/mutationMapper/MutationMapperDataStore.spec.ts
index c622e3d3f05..1a8fc0afdef 100644
--- a/src/shared/components/mutationMapper/MutationMapperDataStore.spec.ts
+++ b/src/shared/components/mutationMapper/MutationMapperDataStore.spec.ts
@@ -1,106 +1,208 @@
 import { assert } from 'chai';
-import {DataFilterType} from "react-mutation-mapper";
+import { DataFilterType } from 'react-mutation-mapper';
 
-import {Mutation} from "../../api/generated/CBioPortalAPI";
-import MutationMapperDataStore from "./MutationMapperDataStore";
+import { Mutation } from '../../api/generated/CBioPortalAPI';
+import MutationMapperDataStore from './MutationMapperDataStore';
 
-describe("MutationMapperDataStore", ()=>{
-    let mutations:Mutation[];
-    let mergedMutations:Mutation[][];
-    let pos5Mutation:Mutation;
-    let pos10Mutation:Mutation;
-    let pos20Mutation:Mutation;
-    before(()=>{
+describe('MutationMapperDataStore', () => {
+    let mutations: Mutation[];
+    let mergedMutations: Mutation[][];
+    let pos5Mutation: Mutation;
+    let pos10Mutation: Mutation;
+    let pos20Mutation: Mutation;
+    before(() => {
         pos10Mutation = { proteinPosStart: 10 } as Mutation;
         pos5Mutation = { proteinPosStart: 5 } as Mutation;
         pos20Mutation = { proteinPosStart: 20 } as Mutation;
-        mutations = [
-            pos10Mutation,
-            pos5Mutation,
-            pos20Mutation
-        ];
-        mergedMutations = mutations.map(m=>[m]);
+        mutations = [pos10Mutation, pos5Mutation, pos20Mutation];
+        mergedMutations = mutations.map(m => [m]);
     });
 
-    it("initializes correctly", ()=>{
-        let store:MutationMapperDataStore = new MutationMapperDataStore(mergedMutations);
-        assert.deepEqual(store.allData, mergedMutations, "initializes data right");
-        assert.deepEqual(store.allData, store.sortedFilteredData, "initially no sorting or filtering");
-        assert.deepEqual(store.sortedFilteredSelectedData, [], "initially no positions selected");
+    it('initializes correctly', () => {
+        let store: MutationMapperDataStore = new MutationMapperDataStore(
+            mergedMutations
+        );
+        assert.deepEqual(
+            store.allData,
+            mergedMutations,
+            'initializes data right'
+        );
+        assert.deepEqual(
+            store.allData,
+            store.sortedFilteredData,
+            'initially no sorting or filtering'
+        );
+        assert.deepEqual(
+            store.sortedFilteredSelectedData,
+            [],
+            'initially no positions selected'
+        );
     });
 
-    it("toggles selections correctly, selects mutations by position, and gives them in sorted order", ()=>{
-        let store:MutationMapperDataStore = new MutationMapperDataStore(mergedMutations);
-        store.setSelectionFilters([{type: DataFilterType.POSITION, values: [5]}]);
-        assert.deepEqual(store.sortedFilteredData, [[pos10Mutation], [pos5Mutation], [pos20Mutation]], "no sorting or filtering");
-        assert.deepEqual(store.sortedFilteredSelectedData, [[pos5Mutation]], "position 5 selected");
-        store.setSelectionFilters([{type: DataFilterType.POSITION, values: [5, 10]}]);
-        assert.deepEqual(store.sortedFilteredData, [[pos10Mutation], [pos5Mutation], [pos20Mutation]], "still no sorting or filtering");
-        assert.deepEqual(store.sortedFilteredSelectedData, [[pos10Mutation], [pos5Mutation]], "positions 5 and 10 selected, in given order");
-        store.sortMetric = (d:Mutation[])=>d[0].proteinPosStart;
-        assert.deepEqual(store.sortedFilteredData, [[pos5Mutation], [pos10Mutation], [pos20Mutation]], "sorting, no filtering");
-        assert.deepEqual(store.sortedFilteredSelectedData, [[pos5Mutation], [pos10Mutation]], "positions 5 and 10 selected, in sorted order");
-        store.setFilter((d:Mutation[])=>(d[0].proteinPosStart > 5));
-        assert.deepEqual(store.sortedFilteredData, [[pos10Mutation], [pos20Mutation]], "sorting and filtering");
-        assert.deepEqual(store.sortedFilteredSelectedData, [[pos10Mutation]], "positions 5 and 10 selected, but 5 filtered out");
-        store.setSelectionFilters([{type: DataFilterType.POSITION, values: [5, 10, 20]}]);
-        assert.deepEqual(store.sortedFilteredData, [[pos10Mutation], [pos20Mutation]], "still sorting and filtering");
-        assert.deepEqual(store.sortedFilteredSelectedData, [[pos10Mutation], [pos20Mutation]], "positions 5, 10, 20 selected, but 5 filtered out");
-        store.setSelectionFilters([{type: DataFilterType.POSITION, values: [5, 10]}]);
-        assert.deepEqual(store.sortedFilteredSelectedData, [[pos10Mutation]], "positions 5 and 10 selected, but 5 filtered out");
-        assert.deepEqual(store.tableData, [[pos10Mutation]], "table data is selected data");
+    it('toggles selections correctly, selects mutations by position, and gives them in sorted order', () => {
+        let store: MutationMapperDataStore = new MutationMapperDataStore(
+            mergedMutations
+        );
+        store.setSelectionFilters([
+            { type: DataFilterType.POSITION, values: [5] },
+        ]);
+        assert.deepEqual(
+            store.sortedFilteredData,
+            [[pos10Mutation], [pos5Mutation], [pos20Mutation]],
+            'no sorting or filtering'
+        );
+        assert.deepEqual(
+            store.sortedFilteredSelectedData,
+            [[pos5Mutation]],
+            'position 5 selected'
+        );
+        store.setSelectionFilters([
+            { type: DataFilterType.POSITION, values: [5, 10] },
+        ]);
+        assert.deepEqual(
+            store.sortedFilteredData,
+            [[pos10Mutation], [pos5Mutation], [pos20Mutation]],
+            'still no sorting or filtering'
+        );
+        assert.deepEqual(
+            store.sortedFilteredSelectedData,
+            [[pos10Mutation], [pos5Mutation]],
+            'positions 5 and 10 selected, in given order'
+        );
+        store.sortMetric = (d: Mutation[]) => d[0].proteinPosStart;
+        assert.deepEqual(
+            store.sortedFilteredData,
+            [[pos5Mutation], [pos10Mutation], [pos20Mutation]],
+            'sorting, no filtering'
+        );
+        assert.deepEqual(
+            store.sortedFilteredSelectedData,
+            [[pos5Mutation], [pos10Mutation]],
+            'positions 5 and 10 selected, in sorted order'
+        );
+        store.setFilter((d: Mutation[]) => d[0].proteinPosStart > 5);
+        assert.deepEqual(
+            store.sortedFilteredData,
+            [[pos10Mutation], [pos20Mutation]],
+            'sorting and filtering'
+        );
+        assert.deepEqual(
+            store.sortedFilteredSelectedData,
+            [[pos10Mutation]],
+            'positions 5 and 10 selected, but 5 filtered out'
+        );
+        store.setSelectionFilters([
+            { type: DataFilterType.POSITION, values: [5, 10, 20] },
+        ]);
+        assert.deepEqual(
+            store.sortedFilteredData,
+            [[pos10Mutation], [pos20Mutation]],
+            'still sorting and filtering'
+        );
+        assert.deepEqual(
+            store.sortedFilteredSelectedData,
+            [[pos10Mutation], [pos20Mutation]],
+            'positions 5, 10, 20 selected, but 5 filtered out'
+        );
+        store.setSelectionFilters([
+            { type: DataFilterType.POSITION, values: [5, 10] },
+        ]);
+        assert.deepEqual(
+            store.sortedFilteredSelectedData,
+            [[pos10Mutation]],
+            'positions 5 and 10 selected, but 5 filtered out'
+        );
+        assert.deepEqual(
+            store.tableData,
+            [[pos10Mutation]],
+            'table data is selected data'
+        );
         store.clearSelectionFilters();
-        assert.deepEqual(store.sortedFilteredData, [[pos10Mutation], [pos20Mutation]], "still, still sorting and filtering");
-        assert.deepEqual(store.sortedFilteredSelectedData, [], "no positions selected");
-        store.setSelectionFilters([{type: DataFilterType.POSITION, values: [20]}]);
-        assert.deepEqual(store.sortedFilteredSelectedData, [[pos20Mutation]], "position 20 selected");
+        assert.deepEqual(
+            store.sortedFilteredData,
+            [[pos10Mutation], [pos20Mutation]],
+            'still, still sorting and filtering'
+        );
+        assert.deepEqual(
+            store.sortedFilteredSelectedData,
+            [],
+            'no positions selected'
+        );
+        store.setSelectionFilters([
+            { type: DataFilterType.POSITION, values: [20] },
+        ]);
+        assert.deepEqual(
+            store.sortedFilteredSelectedData,
+            [[pos20Mutation]],
+            'position 20 selected'
+        );
         store.resetFilters();
-        assert.deepEqual(store.sortedFilteredData, [[pos5Mutation], [pos10Mutation], [pos20Mutation]], "sorting, no filtering");
-        assert.deepEqual(store.sortedFilteredSelectedData, [], "finally, no positions selected");
+        assert.deepEqual(
+            store.sortedFilteredData,
+            [[pos5Mutation], [pos10Mutation], [pos20Mutation]],
+            'sorting, no filtering'
+        );
+        assert.deepEqual(
+            store.sortedFilteredSelectedData,
+            [],
+            'finally, no positions selected'
+        );
     });
 
-    it("implements isPositionSelected", ()=>{
-        let store:MutationMapperDataStore = new MutationMapperDataStore(mergedMutations);
-        assert.isFalse(store.isPositionSelected(1), "A: 1 not selected");
-        assert.isFalse(store.isPositionSelected(3), "A: 3 not selected");
-        assert.isFalse(store.isPositionSelected(5), "A: 5 not selected");
-        assert.isFalse(store.isPositionSelected(10), "A: 10 not selected");
-        assert.isFalse(store.isPositionSelected(20), "A: 20 not selected");
-        store.setSelectionFilters([{type: DataFilterType.POSITION, values: [1]}]);
-        assert.isTrue(store.isPositionSelected(1), "B: 1 selected");
-        assert.isFalse(store.isPositionSelected(3), "B: 3 not selected");
-        assert.isFalse(store.isPositionSelected(5), "B: 5 not selected");
-        assert.isFalse(store.isPositionSelected(10), "B: 10 not selected");
-        assert.isFalse(store.isPositionSelected(20), "B: 20 not selected");
-        store.setSelectionFilters([{type: DataFilterType.POSITION, values: [1, 3]}]);
-        assert.isTrue(store.isPositionSelected(1), "C: 1 selected");
-        assert.isTrue(store.isPositionSelected(3), "C: 3 selected");
-        assert.isFalse(store.isPositionSelected(5), "C: 5 not selected");
-        assert.isFalse(store.isPositionSelected(10), "C: 10 not selected");
-        assert.isFalse(store.isPositionSelected(20), "C: 20 not selected");
-        store.setSelectionFilters([{type: DataFilterType.POSITION, values: [1, 3, 5]}]);
-        assert.isTrue(store.isPositionSelected(1), "D: 1 selected");
-        assert.isTrue(store.isPositionSelected(3), "D: 3 selected");
-        assert.isTrue(store.isPositionSelected(5), "D: 5 selected");
-        assert.isFalse(store.isPositionSelected(10), "D: 10 not selected");
-        assert.isFalse(store.isPositionSelected(20), "D: 20 not selected");
-        store.setSelectionFilters([{type: DataFilterType.POSITION, values: [1, 3, 5, 20]}]);
-        assert.isTrue(store.isPositionSelected(1), "E: 1 selected");
-        assert.isTrue(store.isPositionSelected(3), "E: 3 selected");
-        assert.isTrue(store.isPositionSelected(5), "E: 5 selected");
-        assert.isFalse(store.isPositionSelected(10), "E: 10 not selected");
-        assert.isTrue(store.isPositionSelected(20), "E: 20 selected");
-        store.setSelectionFilters([{type: DataFilterType.POSITION, values: [1, 5, 20]}]);
-        assert.isTrue(store.isPositionSelected(1), "F: 1 selected");
-        assert.isFalse(store.isPositionSelected(3), "F: 3 not selected");
-        assert.isTrue(store.isPositionSelected(5), "F: 5 selected");
-        assert.isFalse(store.isPositionSelected(10), "F: 10 not selected");
-        assert.isTrue(store.isPositionSelected(20), "F: 20 selected");
+    it('implements isPositionSelected', () => {
+        let store: MutationMapperDataStore = new MutationMapperDataStore(
+            mergedMutations
+        );
+        assert.isFalse(store.isPositionSelected(1), 'A: 1 not selected');
+        assert.isFalse(store.isPositionSelected(3), 'A: 3 not selected');
+        assert.isFalse(store.isPositionSelected(5), 'A: 5 not selected');
+        assert.isFalse(store.isPositionSelected(10), 'A: 10 not selected');
+        assert.isFalse(store.isPositionSelected(20), 'A: 20 not selected');
+        store.setSelectionFilters([
+            { type: DataFilterType.POSITION, values: [1] },
+        ]);
+        assert.isTrue(store.isPositionSelected(1), 'B: 1 selected');
+        assert.isFalse(store.isPositionSelected(3), 'B: 3 not selected');
+        assert.isFalse(store.isPositionSelected(5), 'B: 5 not selected');
+        assert.isFalse(store.isPositionSelected(10), 'B: 10 not selected');
+        assert.isFalse(store.isPositionSelected(20), 'B: 20 not selected');
+        store.setSelectionFilters([
+            { type: DataFilterType.POSITION, values: [1, 3] },
+        ]);
+        assert.isTrue(store.isPositionSelected(1), 'C: 1 selected');
+        assert.isTrue(store.isPositionSelected(3), 'C: 3 selected');
+        assert.isFalse(store.isPositionSelected(5), 'C: 5 not selected');
+        assert.isFalse(store.isPositionSelected(10), 'C: 10 not selected');
+        assert.isFalse(store.isPositionSelected(20), 'C: 20 not selected');
+        store.setSelectionFilters([
+            { type: DataFilterType.POSITION, values: [1, 3, 5] },
+        ]);
+        assert.isTrue(store.isPositionSelected(1), 'D: 1 selected');
+        assert.isTrue(store.isPositionSelected(3), 'D: 3 selected');
+        assert.isTrue(store.isPositionSelected(5), 'D: 5 selected');
+        assert.isFalse(store.isPositionSelected(10), 'D: 10 not selected');
+        assert.isFalse(store.isPositionSelected(20), 'D: 20 not selected');
+        store.setSelectionFilters([
+            { type: DataFilterType.POSITION, values: [1, 3, 5, 20] },
+        ]);
+        assert.isTrue(store.isPositionSelected(1), 'E: 1 selected');
+        assert.isTrue(store.isPositionSelected(3), 'E: 3 selected');
+        assert.isTrue(store.isPositionSelected(5), 'E: 5 selected');
+        assert.isFalse(store.isPositionSelected(10), 'E: 10 not selected');
+        assert.isTrue(store.isPositionSelected(20), 'E: 20 selected');
+        store.setSelectionFilters([
+            { type: DataFilterType.POSITION, values: [1, 5, 20] },
+        ]);
+        assert.isTrue(store.isPositionSelected(1), 'F: 1 selected');
+        assert.isFalse(store.isPositionSelected(3), 'F: 3 not selected');
+        assert.isTrue(store.isPositionSelected(5), 'F: 5 selected');
+        assert.isFalse(store.isPositionSelected(10), 'F: 10 not selected');
+        assert.isTrue(store.isPositionSelected(20), 'F: 20 selected');
         store.clearSelectionFilters();
-        assert.isFalse(store.isPositionSelected(1), "G: 1 not selected");
-        assert.isFalse(store.isPositionSelected(3), "G: 3 not selected");
-        assert.isFalse(store.isPositionSelected(5), "G: 5 not selected");
-        assert.isFalse(store.isPositionSelected(10), "G: 10 not selected");
-        assert.isFalse(store.isPositionSelected(20), "G: 20 not selected");
+        assert.isFalse(store.isPositionSelected(1), 'G: 1 not selected');
+        assert.isFalse(store.isPositionSelected(3), 'G: 3 not selected');
+        assert.isFalse(store.isPositionSelected(5), 'G: 5 not selected');
+        assert.isFalse(store.isPositionSelected(10), 'G: 10 not selected');
+        assert.isFalse(store.isPositionSelected(20), 'G: 20 not selected');
     });
-});
\ No newline at end of file
+});
diff --git a/src/shared/components/mutationMapper/MutationMapperDataStore.ts b/src/shared/components/mutationMapper/MutationMapperDataStore.ts
index eb14fd319c2..a6042c5cae9 100644
--- a/src/shared/components/mutationMapper/MutationMapperDataStore.ts
+++ b/src/shared/components/mutationMapper/MutationMapperDataStore.ts
@@ -1,6 +1,6 @@
 import * as _ from 'lodash';
-import {action, computed, observable} from "mobx";
-import autobind from "autobind-decorator";
+import { action, computed, observable } from 'mobx';
+import autobind from 'autobind-decorator';
 import {
     applyDataFiltersOnDatum,
     DataFilter,
@@ -8,22 +8,22 @@ import {
     DataStore,
     FilterApplier,
     findAllUniquePositions,
-    groupDataByGroupFilters
-} from "react-mutation-mapper";
+    groupDataByGroupFilters,
+} from 'react-mutation-mapper';
+import { SimpleLazyMobXTableApplicationDataStore } from 'shared/lib/ILazyMobXTableApplicationDataStore';
+import { Mutation } from 'shared/api/generated/CBioPortalAPI';
 import {
-    SimpleLazyMobXTableApplicationDataStore
-} from "shared/lib/ILazyMobXTableApplicationDataStore";
-import {Mutation} from "shared/api/generated/CBioPortalAPI";
-import {countDuplicateMutations, groupMutationsByGeneAndPatientAndProteinChange} from "shared/lib/MutationUtils";
+    countDuplicateMutations,
+    groupMutationsByGeneAndPatientAndProteinChange,
+} from 'shared/lib/MutationUtils';
 
+type GroupedData = { group: string; data: Mutation[][] }[];
 
-type GroupedData = {group: string, data: Mutation[][]}[];
+export const PROTEIN_IMPACT_TYPE_FILTER_ID =
+    '_cBioPortalProteinImpactTypeFilter_';
+export const MUTATION_STATUS_FILTER_ID = '_cBioPortalMutationStatusFilter_';
 
-export const PROTEIN_IMPACT_TYPE_FILTER_ID = "_cBioPortalProteinImpactTypeFilter_";
-export const MUTATION_STATUS_FILTER_ID = "_cBioPortalMutationStatusFilter_";
-
-export function findProteinImpactTypeFilter(dataFilters: DataFilter[])
-{
+export function findProteinImpactTypeFilter(dataFilters: DataFilter[]) {
     return dataFilters.find(f => f.id === PROTEIN_IMPACT_TYPE_FILTER_ID);
 }
 
@@ -31,16 +31,20 @@ export function findProteinImpactTypeFilter(dataFilters: DataFilter[])
 //  we should reuse DefaultMutationMapperDataStore instead
 export default class MutationMapperDataStore
     extends SimpleLazyMobXTableApplicationDataStore<Mutation[]>
-    implements DataStore
-{
+    implements DataStore {
     @observable public dataFilters: DataFilter[] = [];
     @observable public selectionFilters: DataFilter[] = [];
     @observable public highlightFilters: DataFilter[] = [];
-    @observable public groupFilters: {group: string, filter: DataFilter}[];
+    @observable public groupFilters: { group: string; filter: DataFilter }[];
 
     private lazyMobXTableFilter:
-        ((d:Mutation[], filterString?:string, filterStringUpper?:string, filterStringLower?:string)=>boolean) |
-        undefined;
+        | ((
+              d: Mutation[],
+              filterString?: string,
+              filterStringUpper?: string,
+              filterStringLower?: string
+          ) => boolean)
+        | undefined;
 
     // this custom filter applier allows us to interpret selection and highlight filters in a customized way,
     // by default only position filters are taken into account
@@ -48,17 +52,31 @@ export default class MutationMapperDataStore
 
     @computed
     public get sortedFilteredGroupedData(): GroupedData {
-        return groupDataByGroupFilters(this.groupFilters, this.sortedFilteredData, this.applyFilter);
+        return groupDataByGroupFilters(
+            this.groupFilters,
+            this.sortedFilteredData,
+            this.applyFilter
+        );
     }
 
     @computed
     public get selectedPositions() {
-        return _.keyBy(findAllUniquePositions(this.selectionFilters).map(p => ({position: p})), 'position');
+        return _.keyBy(
+            findAllUniquePositions(this.selectionFilters).map(p => ({
+                position: p,
+            })),
+            'position'
+        );
     }
 
     @computed
     public get highlightedPositions() {
-        return _.keyBy(findAllUniquePositions(this.highlightFilters).map(p => ({position: p})), 'position');
+        return _.keyBy(
+            findAllUniquePositions(this.highlightFilters).map(p => ({
+                position: p,
+            })),
+            'position'
+        );
     }
 
     @action
@@ -89,28 +107,46 @@ export default class MutationMapperDataStore
     @action
     public setSelectionFilters(filters: DataFilter[]) {
         this.selectionFilters = filters;
-    };
+    }
 
     @action
-    public setGroupFilters(filters:  {group: string, filter: DataFilter}[]) {
+    public setGroupFilters(filters: { group: string; filter: DataFilter }[]) {
         this.groupFilters = filters;
-    };
+    }
 
     public isPositionSelected(position: number) {
-        return !!this.selectedPositions[position+""];
+        return !!this.selectedPositions[position + ''];
     }
 
     public isPositionHighlighted(position: number) {
-        return !!this.highlightedPositions[position+""];
+        return !!this.highlightedPositions[position + ''];
     }
 
     // override the parent method to always keep the default main filter (this allows multiple filtering)
     @action
-    public setFilter(fn?: (d:Mutation[], filterString?:string, filterStringUpper?:string, filterStringLower?:string)=>boolean)
-    {
-        super.setFilter((d:Mutation[], filterString?:string, filterStringUpper?:string, filterStringLower?:string) =>
-            (!fn || fn(d, filterString, filterStringUpper, filterStringLower)) &&
-            (this.dataFilters.length === 0 || this.dataMainFilter(d))
+    public setFilter(
+        fn?: (
+            d: Mutation[],
+            filterString?: string,
+            filterStringUpper?: string,
+            filterStringLower?: string
+        ) => boolean
+    ) {
+        super.setFilter(
+            (
+                d: Mutation[],
+                filterString?: string,
+                filterStringUpper?: string,
+                filterStringLower?: string
+            ) =>
+                (!fn ||
+                    fn(
+                        d,
+                        filterString,
+                        filterStringUpper,
+                        filterStringLower
+                    )) &&
+                (this.dataFilters.length === 0 || this.dataMainFilter(d))
         );
 
         // we also need to keep a reference to the original function to be able to apply it individually when necessary
@@ -121,7 +157,8 @@ export default class MutationMapperDataStore
     @action
     public resetFilter() {
         super.resetFilter();
-        this.dataFilter = (d:Mutation[]) => (this.dataFilters.length === 0 || this.dataMainFilter(d));
+        this.dataFilter = (d: Mutation[]) =>
+            this.dataFilters.length === 0 || this.dataMainFilter(d);
         this.lazyMobXTableFilter = undefined;
     }
 
@@ -140,7 +177,9 @@ export default class MutationMapperDataStore
 
     @computed
     get tableDataGroupedByPatients() {
-        return groupMutationsByGeneAndPatientAndProteinChange(_.flatten(this.tableData));
+        return groupMutationsByGeneAndPatientAndProteinChange(
+            _.flatten(this.tableData)
+        );
     }
 
     @computed
@@ -148,63 +187,76 @@ export default class MutationMapperDataStore
         return countDuplicateMutations(this.tableDataGroupedByPatients);
     }
 
-    constructor(data: Mutation[][],
-                customFilterApplier?: FilterApplier,
-                dataFilters: DataFilter[] = [],
-                selectionFilters: DataFilter[] = [],
-                highlightFilters: DataFilter[] = [],
-                groupFilters: {group: string, filter: DataFilter}[] = [])
-    {
+    constructor(
+        data: Mutation[][],
+        customFilterApplier?: FilterApplier,
+        dataFilters: DataFilter[] = [],
+        selectionFilters: DataFilter[] = [],
+        highlightFilters: DataFilter[] = [],
+        groupFilters: { group: string; filter: DataFilter }[] = []
+    ) {
         super(data);
 
         this.dataFilters = dataFilters;
         this.selectionFilters = selectionFilters;
-        this.highlightFilters= highlightFilters;
+        this.highlightFilters = highlightFilters;
         this.groupFilters = groupFilters;
 
         this.dataSelector = (d: Mutation[]) => this.dataSelectFilter(d);
-        this.dataHighlighter = (d:Mutation[]) => this.dataHighlightFilter(d);
+        this.dataHighlighter = (d: Mutation[]) => this.dataHighlightFilter(d);
         this.customFilterApplier = customFilterApplier;
         this.setFilter();
     }
 
     @autobind
-    public dataMainFilter(d: Mutation[]): boolean
-    {
+    public dataMainFilter(d: Mutation[]): boolean {
         return applyDataFiltersOnDatum(d, this.dataFilters, this.applyFilter);
     }
 
     @autobind
-    public dataSelectFilter(d: Mutation[]): boolean
-    {
-        return applyDataFiltersOnDatum(d, this.selectionFilters, this.applyFilter);
+    public dataSelectFilter(d: Mutation[]): boolean {
+        return applyDataFiltersOnDatum(
+            d,
+            this.selectionFilters,
+            this.applyFilter
+        );
     }
 
     @autobind
-    public dataHighlightFilter(d: Mutation[]): boolean
-    {
-        return applyDataFiltersOnDatum(d, this.highlightFilters, this.applyFilter);
+    public dataHighlightFilter(d: Mutation[]): boolean {
+        return applyDataFiltersOnDatum(
+            d,
+            this.highlightFilters,
+            this.applyFilter
+        );
     }
 
     @autobind
-    public applyFilter(filter: DataFilter, d: Mutation | Mutation[]): boolean
-    {
+    public applyFilter(filter: DataFilter, d: Mutation | Mutation[]): boolean {
         const mutation = _.flatten([d])[0];
 
         if (this.customFilterApplier) {
             // let the custom filter applier decide how to apply the given filter
             return this.customFilterApplier.applyFilter(filter, mutation);
-        }
-        else {
+        } else {
             // by default only filter by position
-            return filter.type !== DataFilterType.POSITION || filter.values.includes(mutation.proteinPosStart);
+            return (
+                filter.type !== DataFilterType.POSITION ||
+                filter.values.includes(mutation.proteinPosStart)
+            );
         }
     }
 
     @autobind
-    public applyLazyMobXTableFilter(d: Mutation | Mutation[]): boolean
-    {
-        return !this.filterString || !this.lazyMobXTableFilter || this.lazyMobXTableFilter(
-            [_.flatten([d])[0]], this.filterString.toLowerCase(), this.filterString.toUpperCase());
+    public applyLazyMobXTableFilter(d: Mutation | Mutation[]): boolean {
+        return (
+            !this.filterString ||
+            !this.lazyMobXTableFilter ||
+            this.lazyMobXTableFilter(
+                [_.flatten([d])[0]],
+                this.filterString.toLowerCase(),
+                this.filterString.toUpperCase()
+            )
+        );
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/mutationMapper/MutationMapperStore.ts b/src/shared/components/mutationMapper/MutationMapperStore.ts
index d077540d38f..af15e9bad97 100644
--- a/src/shared/components/mutationMapper/MutationMapperStore.ts
+++ b/src/shared/components/mutationMapper/MutationMapperStore.ts
@@ -1,6 +1,6 @@
-import * as _ from "lodash";
-import {computed} from "mobx";
-import MobxPromise, {cached, labelMobxPromises} from "mobxpromise";
+import * as _ from 'lodash';
+import { computed } from 'mobx';
+import MobxPromise, { cached, labelMobxPromises } from 'mobxpromise';
 
 import {
     applyDataFilters,
@@ -10,116 +10,141 @@ import {
     getMutationsToTranscriptId,
     groupDataByProteinImpactType,
     groupOncoKbIndicatorDataByMutations,
-    IHotspotIndex
-} from "react-mutation-mapper";
-
-import genomeNexusClient from "shared/api/genomeNexusClientInstance";
-import internalGenomeNexusClient from "shared/api/genomeNexusInternalClientInstance";
-import oncoKBClient from "shared/api/oncokbClientInstance";
-import {Gene, Mutation} from "shared/api/generated/CBioPortalAPI";
-import {IOncoKbData} from "shared/model/OncoKB";
-import ResidueMappingCache from "shared/cache/ResidueMappingCache";
+    IHotspotIndex,
+} from 'react-mutation-mapper';
+
+import genomeNexusClient from 'shared/api/genomeNexusClientInstance';
+import internalGenomeNexusClient from 'shared/api/genomeNexusInternalClientInstance';
+import oncoKBClient from 'shared/api/oncokbClientInstance';
+import { Gene, Mutation } from 'shared/api/generated/CBioPortalAPI';
+import { IOncoKbData } from 'shared/model/OncoKB';
+import ResidueMappingCache from 'shared/cache/ResidueMappingCache';
 import {
-    fetchPdbAlignmentData, indexPdbAlignmentData
-} from "shared/lib/StoreUtils";
+    fetchPdbAlignmentData,
+    indexPdbAlignmentData,
+} from 'shared/lib/StoreUtils';
 import {
     CancerGene,
     EnsemblTranscript,
     remoteData,
-    VariantAnnotation
-} from "cbioportal-frontend-commons";
-import {IPdbChain, PdbAlignmentIndex} from "shared/model/Pdb";
-import {calcPdbIdNumericalValue, mergeIndexedPdbAlignments, PDB_IGNORELIST} from "shared/lib/PdbUtils";
-import {lazyMobXTableSort} from "shared/components/lazyMobXTable/LazyMobXTable";
-import {MutationTableDownloadDataFetcher} from "shared/lib/MutationTableDownloadDataFetcher";
-
-import PdbChainDataStore from "./PdbChainDataStore";
-import MutationMapperDataStore from "./MutationMapperDataStore";
+    VariantAnnotation,
+} from 'cbioportal-frontend-commons';
+import { IPdbChain, PdbAlignmentIndex } from 'shared/model/Pdb';
+import {
+    calcPdbIdNumericalValue,
+    mergeIndexedPdbAlignments,
+    PDB_IGNORELIST,
+} from 'shared/lib/PdbUtils';
+import { lazyMobXTableSort } from 'shared/components/lazyMobXTable/LazyMobXTable';
+import { MutationTableDownloadDataFetcher } from 'shared/lib/MutationTableDownloadDataFetcher';
+
+import PdbChainDataStore from './PdbChainDataStore';
+import MutationMapperDataStore from './MutationMapperDataStore';
 import {
     groupMutationsByProteinStartPos,
-    countUniqueMutations
-} from "shared/lib/MutationUtils";
-import {defaultOncoKbIndicatorFilter} from "shared/lib/OncoKbUtils";
+    countUniqueMutations,
+} from 'shared/lib/MutationUtils';
+import { defaultOncoKbIndicatorFilter } from 'shared/lib/OncoKbUtils';
 
-import {IMutationMapperConfig} from "./MutationMapperConfig";
-import autobind from "autobind-decorator";
-import {normalizeMutation, normalizeMutations} from "./MutationMapperUtils";
-import {getOncoKbApiUrl} from "shared/api/urls";
+import { IMutationMapperConfig } from './MutationMapperConfig';
+import autobind from 'autobind-decorator';
+import { normalizeMutation, normalizeMutations } from './MutationMapperUtils';
+import { getOncoKbApiUrl } from 'shared/api/urls';
 
 export interface IMutationMapperStoreConfig {
-    filterMutationsBySelectedTranscript?:boolean
+    filterMutationsBySelectedTranscript?: boolean;
 }
 
-export default class MutationMapperStore extends DefaultMutationMapperStore
-{
+export default class MutationMapperStore extends DefaultMutationMapperStore {
     constructor(
         protected mutationMapperConfig: IMutationMapperConfig,
         protected mutationMapperStoreConfig: IMutationMapperStoreConfig,
         public gene: Gene,
         protected getMutations: () => Mutation[],
         // TODO: we could merge indexedVariantAnnotations and indexedHotspotData
-        public indexedHotspotData:MobxPromise<IHotspotIndex|undefined>,
-        public indexedVariantAnnotations:MobxPromise<{[genomicLocation: string]: VariantAnnotation}|undefined>,
-        public oncoKbCancerGenes:MobxPromise<CancerGene[] | Error>,
-        public oncoKbData:MobxPromise<IOncoKbData | Error>,
-        public uniqueSampleKeyToTumorType:{[uniqueSampleKey:string]:string},
-    )
-    {
+        public indexedHotspotData: MobxPromise<IHotspotIndex | undefined>,
+        public indexedVariantAnnotations: MobxPromise<
+            { [genomicLocation: string]: VariantAnnotation } | undefined
+        >,
+        public oncoKbCancerGenes: MobxPromise<CancerGene[] | Error>,
+        public oncoKbData: MobxPromise<IOncoKbData | Error>,
+        public uniqueSampleKeyToTumorType: { [uniqueSampleKey: string]: string }
+    ) {
         super(
             gene,
             {
-                isoformOverrideSource: mutationMapperConfig.isoformOverrideSource,
-                filterMutationsBySelectedTranscript: mutationMapperStoreConfig.filterMutationsBySelectedTranscript
+                isoformOverrideSource:
+                    mutationMapperConfig.isoformOverrideSource,
+                filterMutationsBySelectedTranscript:
+                    mutationMapperStoreConfig.filterMutationsBySelectedTranscript,
             },
-            getMutations);
+            getMutations
+        );
 
         const unnormalizedGetMutations = this.getMutations;
-        this.getMutations = ()=>normalizeMutations(unnormalizedGetMutations());
+        this.getMutations = () =>
+            normalizeMutations(unnormalizedGetMutations());
         labelMobxPromises(this);
     }
 
     @computed
     public get dataFetcher(): DefaultMutationMapperDataFetcher {
-        return new DefaultMutationMapperDataFetcher({
-            myGeneUrlTemplate: this.mutationMapperConfig.mygene_info_url || undefined,
-            uniprotIdUrlTemplate: this.mutationMapperConfig.uniprot_id_url || undefined,
-            genomeNexusUrl: this.mutationMapperConfig.genomenexus_url || undefined,
-            oncoKbUrl: getOncoKbApiUrl() || undefined
-        }, genomeNexusClient, internalGenomeNexusClient, oncoKBClient);
-    }
-
-    readonly mutationData = remoteData({
-        await: () => {
-            if (this.mutationMapperStoreConfig.filterMutationsBySelectedTranscript) {
-                return [this.canonicalTranscript, this.indexedVariantAnnotations];
-            } else {
-                return [this.canonicalTranscript];
-            }
+        return new DefaultMutationMapperDataFetcher(
+            {
+                myGeneUrlTemplate:
+                    this.mutationMapperConfig.mygene_info_url || undefined,
+                uniprotIdUrlTemplate:
+                    this.mutationMapperConfig.uniprot_id_url || undefined,
+                genomeNexusUrl:
+                    this.mutationMapperConfig.genomenexus_url || undefined,
+                oncoKbUrl: getOncoKbApiUrl() || undefined,
+            },
+            genomeNexusClient,
+            internalGenomeNexusClient,
+            oncoKBClient
+        );
+    }
+
+    readonly mutationData = remoteData(
+        {
+            await: () => {
+                if (
+                    this.mutationMapperStoreConfig
+                        .filterMutationsBySelectedTranscript
+                ) {
+                    return [
+                        this.canonicalTranscript,
+                        this.indexedVariantAnnotations,
+                    ];
+                } else {
+                    return [this.canonicalTranscript];
+                }
+            },
+            invoke: async () => {
+                return this.mutations as Mutation[];
+            },
         },
-        invoke: async () => {
-            return this.mutations as Mutation[];
-        }
-    }, []);
-
-    readonly alignmentData = remoteData({
-        await: () => [
-            this.mutationData
-        ],
-        invoke: async () => {
-            if (this.activeTranscript) {
-                return fetchPdbAlignmentData(this.activeTranscript);
-            }
-            else {
-                return [];
-            }
+        []
+    );
+
+    readonly alignmentData = remoteData(
+        {
+            await: () => [this.mutationData],
+            invoke: async () => {
+                if (this.activeTranscript) {
+                    return fetchPdbAlignmentData(this.activeTranscript);
+                } else {
+                    return [];
+                }
+            },
+            onError: (err: Error) => {
+                // fail silently
+            },
         },
-        onError: (err: Error) => {
-            // fail silently
-        }
-    }, []);
+        []
+    );
 
-    public countUniqueMutations(mutations: Mutation[]): number
-    {
+    public countUniqueMutations(mutations: Mutation[]): number {
         return countUniqueMutations(mutations);
     }
 
@@ -134,41 +159,48 @@ export default class MutationMapperStore extends DefaultMutationMapperStore
     }
 
     // TODO remove when done refactoring react-mutation-mapper
-    @computed get unfilteredMutationsByPosition(): {[pos: number]: Mutation[]} {
+    @computed get unfilteredMutationsByPosition(): {
+        [pos: number]: Mutation[];
+    } {
         return groupMutationsByProteinStartPos(this.dataStore.sortedData);
     }
 
     // TODO remove when done refactoring react-mutation-mapper
-    @computed get oncoKbDataByProteinPosStart()
-    {
-        if (this.oncoKbData.result &&
-            !(this.oncoKbData.result instanceof Error))
-        {
+    @computed get oncoKbDataByProteinPosStart() {
+        if (
+            this.oncoKbData.result &&
+            !(this.oncoKbData.result instanceof Error)
+        ) {
             return groupOncoKbIndicatorDataByMutations(
                 this.unfilteredMutationsByPosition,
                 this.oncoKbData.result,
                 this.getDefaultTumorType,
                 this.getDefaultEntrezGeneId,
-                defaultOncoKbIndicatorFilter);
-        }
-        else {
+                defaultOncoKbIndicatorFilter
+            );
+        } else {
             return {};
         }
     }
 
     @computed
-    protected get mutationsGroupedByProteinImpactType()
-    {
-        const filtersWithoutProteinImpactTypeFilter =
-            this.dataStore.dataFilters.filter(f => f.type !== DataFilterType.PROTEIN_IMPACT_TYPE);
+    protected get mutationsGroupedByProteinImpactType() {
+        const filtersWithoutProteinImpactTypeFilter = this.dataStore.dataFilters.filter(
+            f => f.type !== DataFilterType.PROTEIN_IMPACT_TYPE
+        );
 
         // apply filters excluding the protein impact type filters
         // this prevents number of unchecked protein impact types from being counted as zero
         let sortedFilteredData = applyDataFilters(
-            this.dataStore.allData, filtersWithoutProteinImpactTypeFilter, this.dataStore.applyFilter);
+            this.dataStore.allData,
+            filtersWithoutProteinImpactTypeFilter,
+            this.dataStore.applyFilter
+        );
 
         // also apply lazy mobx table search filter
-        sortedFilteredData = sortedFilteredData.filter(m => this.dataStore.applyLazyMobXTableFilter(m));
+        sortedFilteredData = sortedFilteredData.filter(m =>
+            this.dataStore.applyLazyMobXTableFilter(m)
+        );
 
         return groupDataByProteinImpactType(sortedFilteredData);
     }
@@ -188,31 +220,42 @@ export default class MutationMapperStore extends DefaultMutationMapperStore
 
     @computed get sortedMergedAlignmentData(): IPdbChain[] {
         const sortMetric = (pdbChain: IPdbChain) => [
-            pdbChain.identity,         // first, sort by identity
+            pdbChain.identity, // first, sort by identity
             pdbChain.alignment.length, // then by alignment length
-            pdbChain.identityPerc,     // then by identity percentage
+            pdbChain.identityPerc, // then by identity percentage
             // current sort metric cannot handle mixed values so generating numerical values for strings
             ...calcPdbIdNumericalValue(pdbChain.pdbId, true), // then by pdb id (A-Z): always returns an array of size 4
-            -1 * pdbChain.chain.charCodeAt(0)                 // then by chain id (A-Z): chain id is always one char
+            -1 * pdbChain.chain.charCodeAt(0), // then by chain id (A-Z): chain id is always one char
         ];
 
         return lazyMobXTableSort(this.mergedAlignmentData, sortMetric, false);
     }
 
-    @computed get transcriptsByTranscriptId(): {[transcriptId:string]: EnsemblTranscript} {
-        return _.keyBy(this.allTranscripts.result as EnsemblTranscript[], (transcript  => transcript.transcriptId));
+    @computed get transcriptsByTranscriptId(): {
+        [transcriptId: string]: EnsemblTranscript;
+    } {
+        return _.keyBy(
+            this.allTranscripts.result as EnsemblTranscript[],
+            transcript => transcript.transcriptId
+        );
     }
 
-    @computed get mutationsByTranscriptId(): {[transcriptId:string]: Mutation[]} {
-        if (this.indexedVariantAnnotations.result && this.transcriptsWithAnnotations.result) {
+    @computed get mutationsByTranscriptId(): {
+        [transcriptId: string]: Mutation[];
+    } {
+        if (
+            this.indexedVariantAnnotations.result &&
+            this.transcriptsWithAnnotations.result
+        ) {
             return _.fromPairs(
-                this.transcriptsWithAnnotations.result.map((t:string) => (
-                    [t,
-                    getMutationsToTranscriptId(this.getMutations(),
-                                               t,
-                                               this.indexedVariantAnnotations.result!!)
-                    ]
-                ))
+                this.transcriptsWithAnnotations.result.map((t: string) => [
+                    t,
+                    getMutationsToTranscriptId(
+                        this.getMutations(),
+                        t,
+                        this.indexedVariantAnnotations.result!!
+                    ),
+                ])
             );
         } else {
             return {};
@@ -241,13 +284,15 @@ export default class MutationMapperStore extends DefaultMutationMapperStore
 
     @cached get pdbChainDataStore(): PdbChainDataStore {
         // initialize with sorted merged alignment data
-        return new PdbChainDataStore(this.sortedMergedAlignmentData.filter(
-            // TODO temporary workaround for problematic pdb structures
-            chain => !PDB_IGNORELIST.includes(chain.pdbId.toLowerCase())));
+        return new PdbChainDataStore(
+            this.sortedMergedAlignmentData.filter(
+                // TODO temporary workaround for problematic pdb structures
+                chain => !PDB_IGNORELIST.includes(chain.pdbId.toLowerCase())
+            )
+        );
     }
 
-    @cached get residueMappingCache()
-    {
+    @cached get residueMappingCache() {
         return new ResidueMappingCache();
     }
 }
diff --git a/src/shared/components/mutationMapper/MutationMapperUserSelectionStore.ts b/src/shared/components/mutationMapper/MutationMapperUserSelectionStore.ts
index 03adbad9868..551ca4d6e90 100644
--- a/src/shared/components/mutationMapper/MutationMapperUserSelectionStore.ts
+++ b/src/shared/components/mutationMapper/MutationMapperUserSelectionStore.ts
@@ -1,8 +1,10 @@
-import {observable} from "mobx";
-import {initDefaultTrackVisibility, TrackVisibility} from "react-mutation-mapper";
+import { observable } from 'mobx';
+import {
+    initDefaultTrackVisibility,
+    TrackVisibility,
+} from 'react-mutation-mapper';
 
-export default class MutationMapperUserSelectionStore
-{
+export default class MutationMapperUserSelectionStore {
     @observable trackVisibility: TrackVisibility;
 
     constructor() {
diff --git a/src/shared/components/mutationMapper/MutationMapperUtils.ts b/src/shared/components/mutationMapper/MutationMapperUtils.ts
index a8461140cd6..b791be5ecbd 100644
--- a/src/shared/components/mutationMapper/MutationMapperUtils.ts
+++ b/src/shared/components/mutationMapper/MutationMapperUtils.ts
@@ -1,9 +1,13 @@
-import {Mutation} from "../../api/generated/CBioPortalAPI";
+import { Mutation } from '../../api/generated/CBioPortalAPI';
 
-export function normalizeMutation<T extends Pick<Mutation, "chr">>(mutation:T) {
+export function normalizeMutation<T extends Pick<Mutation, 'chr'>>(
+    mutation: T
+) {
     return Object.assign({ chromosome: mutation.chr }, mutation);
 }
 
-export function normalizeMutations<T extends Pick<Mutation, "chr">>(mutations:T[]) {
+export function normalizeMutations<T extends Pick<Mutation, 'chr'>>(
+    mutations: T[]
+) {
     return mutations.map(normalizeMutation);
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/mutationMapper/PdbChainDataStore.ts b/src/shared/components/mutationMapper/PdbChainDataStore.ts
index 918bddeb3dc..87be5505982 100644
--- a/src/shared/components/mutationMapper/PdbChainDataStore.ts
+++ b/src/shared/components/mutationMapper/PdbChainDataStore.ts
@@ -1,15 +1,17 @@
-import {SimpleLazyMobXTableApplicationDataStore} from "../../../shared/lib/ILazyMobXTableApplicationDataStore";
-import {IPdbChain} from "../../../shared/model/Pdb";
-import {action, computed, observable} from "mobx";
-export default class PdbChainDataStore extends SimpleLazyMobXTableApplicationDataStore<IPdbChain> {
-    @observable public selectedUid:string;
+import { SimpleLazyMobXTableApplicationDataStore } from '../../../shared/lib/ILazyMobXTableApplicationDataStore';
+import { IPdbChain } from '../../../shared/model/Pdb';
+import { action, computed, observable } from 'mobx';
+export default class PdbChainDataStore extends SimpleLazyMobXTableApplicationDataStore<
+    IPdbChain
+> {
+    @observable public selectedUid: string;
 
-    public getChainUid(chain:IPdbChain) {
+    public getChainUid(chain: IPdbChain) {
         return chain.pdbId + chain.chain;
     }
 
-    @action public selectUid(uid?:string) {
-        this.selectedUid = uid || "";
+    @action public selectUid(uid?: string) {
+        this.selectedUid = uid || '';
     }
 
     @computed public get selectedChain() {
@@ -20,22 +22,23 @@ export default class PdbChainDataStore extends SimpleLazyMobXTableApplicationDat
         if (this.allData.length > 0) {
             this.selectedUid = this.getChainUid(this.allData[0]);
         } else {
-            this.selectedUid = "";
+            this.selectedUid = '';
         }
     }
 
-    public getPdbChain(chainUid:string) {
-        return this.allData.find(c=>(this.getChainUid(c) === chainUid));
+    public getPdbChain(chainUid: string) {
+        return this.allData.find(c => this.getChainUid(c) === chainUid);
     }
 
     @computed public get tableData() {
         return this.sortedFilteredData;
     }
 
-    constructor(data:IPdbChain[]) {
+    constructor(data: IPdbChain[]) {
         super(data);
-        this.selectedUid = "";
-        this.dataSelector = (d:IPdbChain)=>(this.getChainUid(d) === this.selectedUid);
+        this.selectedUid = '';
+        this.dataSelector = (d: IPdbChain) =>
+            this.getChainUid(d) === this.selectedUid;
         this.dataHighlighter = this.dataSelector;
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/mutationMapper/mutationMapper.module.scss b/src/shared/components/mutationMapper/mutationMapper.module.scss
index fb2616641fb..0fcf8c68b64 100644
--- a/src/shared/components/mutationMapper/mutationMapper.module.scss
+++ b/src/shared/components/mutationMapper/mutationMapper.module.scss
@@ -1,6 +1,6 @@
 .filterResetPanel {
-  margin-bottom: 0 !important;
-  margin-left: auto;
-  padding-top: 2px !important;
-  padding-bottom: 2px !important;
-}
\ No newline at end of file
+    margin-bottom: 0 !important;
+    margin-left: auto;
+    padding-top: 2px !important;
+    padding-bottom: 2px !important;
+}
diff --git a/src/shared/components/mutationTable/MutationTable.tsx b/src/shared/components/mutationTable/MutationTable.tsx
index 7f573479d39..07697115396 100644
--- a/src/shared/components/mutationTable/MutationTable.tsx
+++ b/src/shared/components/mutationTable/MutationTable.tsx
@@ -1,74 +1,95 @@
-import * as React from "react";
-import {observer} from "mobx-react";
-import {observable, computed} from "mobx";
-import * as _ from "lodash";
-import {default as LazyMobXTable, Column, SortDirection} from "shared/components/lazyMobXTable/LazyMobXTable";
-import {CancerStudy, MolecularProfile, Mutation} from "shared/api/generated/CBioPortalAPI";
-import SampleColumnFormatter from "./column/SampleColumnFormatter";
-import TumorAlleleFreqColumnFormatter from "./column/TumorAlleleFreqColumnFormatter";
-import NormalAlleleFreqColumnFormatter from "./column/NormalAlleleFreqColumnFormatter";
-import MrnaExprColumnFormatter from "./column/MrnaExprColumnFormatter";
-import CohortColumnFormatter from "./column/CohortColumnFormatter";
-import DiscreteCNAColumnFormatter from "./column/DiscreteCNAColumnFormatter";
-import AlleleCountColumnFormatter from "./column/AlleleCountColumnFormatter";
-import GeneColumnFormatter from "./column/GeneColumnFormatter";
-import ChromosomeColumnFormatter from "./column/ChromosomeColumnFormatter";
-import ProteinChangeColumnFormatter from "./column/ProteinChangeColumnFormatter";
-import MutationTypeColumnFormatter from "./column/MutationTypeColumnFormatter";
-import FunctionalImpactColumnFormatter from "./column/FunctionalImpactColumnFormatter";
-import CosmicColumnFormatter from "./column/CosmicColumnFormatter";
-import MutationCountColumnFormatter from "./column/MutationCountColumnFormatter";
-import CancerTypeColumnFormatter from "./column/CancerTypeColumnFormatter";
-import MutationStatusColumnFormatter from "./column/MutationStatusColumnFormatter";
-import ValidationStatusColumnFormatter from "./column/ValidationStatusColumnFormatter";
-import StudyColumnFormatter from "./column/StudyColumnFormatter";
-import {ICosmicData} from "shared/model/Cosmic";
-import AnnotationColumnFormatter, {IAnnotation} from "./column/AnnotationColumnFormatter";
-import ExonColumnFormatter from "./column/ExonColumnFormatter";
-import {IMyCancerGenomeData} from "shared/model/MyCancerGenome";
-import {IHotspotDataWrapper} from "shared/model/CancerHotspots";
-import {IOncoKbCancerGenesWrapper, IOncoKbDataWrapper} from "shared/model/OncoKB";
-import {ICivicVariantDataWrapper, ICivicGeneDataWrapper} from "shared/model/Civic";
-import {IMutSigData} from "shared/model/MutSig";
-import DiscreteCNACache from "shared/cache/DiscreteCNACache";
-import OncoKbEvidenceCache from "shared/cache/OncoKbEvidenceCache";
-import MrnaExprRankCache from "shared/cache/MrnaExprRankCache";
-import VariantCountCache from "shared/cache/VariantCountCache";
-import PubMedCache from "shared/cache/PubMedCache";
-import MutationCountCache from "shared/cache/MutationCountCache";
-import GenomeNexusCache from "shared/cache/GenomeNexusCache";
-import GenomeNexusMyVariantInfoCache from "shared/cache/GenomeNexusMyVariantInfoCache";
-import {ILazyMobXTableApplicationDataStore} from "shared/lib/ILazyMobXTableApplicationDataStore";
-import {ILazyMobXTableApplicationLazyDownloadDataFetcher} from "shared/lib/ILazyMobXTableApplicationLazyDownloadDataFetcher";
-import generalStyles from "./column/styles.module.scss";
+import * as React from 'react';
+import { observer } from 'mobx-react';
+import { observable, computed } from 'mobx';
+import * as _ from 'lodash';
+import {
+    default as LazyMobXTable,
+    Column,
+    SortDirection,
+} from 'shared/components/lazyMobXTable/LazyMobXTable';
+import {
+    CancerStudy,
+    MolecularProfile,
+    Mutation,
+} from 'shared/api/generated/CBioPortalAPI';
+import SampleColumnFormatter from './column/SampleColumnFormatter';
+import TumorAlleleFreqColumnFormatter from './column/TumorAlleleFreqColumnFormatter';
+import NormalAlleleFreqColumnFormatter from './column/NormalAlleleFreqColumnFormatter';
+import MrnaExprColumnFormatter from './column/MrnaExprColumnFormatter';
+import CohortColumnFormatter from './column/CohortColumnFormatter';
+import DiscreteCNAColumnFormatter from './column/DiscreteCNAColumnFormatter';
+import AlleleCountColumnFormatter from './column/AlleleCountColumnFormatter';
+import GeneColumnFormatter from './column/GeneColumnFormatter';
+import ChromosomeColumnFormatter from './column/ChromosomeColumnFormatter';
+import ProteinChangeColumnFormatter from './column/ProteinChangeColumnFormatter';
+import MutationTypeColumnFormatter from './column/MutationTypeColumnFormatter';
+import FunctionalImpactColumnFormatter from './column/FunctionalImpactColumnFormatter';
+import CosmicColumnFormatter from './column/CosmicColumnFormatter';
+import MutationCountColumnFormatter from './column/MutationCountColumnFormatter';
+import CancerTypeColumnFormatter from './column/CancerTypeColumnFormatter';
+import MutationStatusColumnFormatter from './column/MutationStatusColumnFormatter';
+import ValidationStatusColumnFormatter from './column/ValidationStatusColumnFormatter';
+import StudyColumnFormatter from './column/StudyColumnFormatter';
+import { ICosmicData } from 'shared/model/Cosmic';
+import AnnotationColumnFormatter, {
+    IAnnotation,
+} from './column/AnnotationColumnFormatter';
+import ExonColumnFormatter from './column/ExonColumnFormatter';
+import { IMyCancerGenomeData } from 'shared/model/MyCancerGenome';
+import { IHotspotDataWrapper } from 'shared/model/CancerHotspots';
+import {
+    IOncoKbCancerGenesWrapper,
+    IOncoKbDataWrapper,
+} from 'shared/model/OncoKB';
+import {
+    ICivicVariantDataWrapper,
+    ICivicGeneDataWrapper,
+} from 'shared/model/Civic';
+import { IMutSigData } from 'shared/model/MutSig';
+import DiscreteCNACache from 'shared/cache/DiscreteCNACache';
+import OncoKbEvidenceCache from 'shared/cache/OncoKbEvidenceCache';
+import MrnaExprRankCache from 'shared/cache/MrnaExprRankCache';
+import VariantCountCache from 'shared/cache/VariantCountCache';
+import PubMedCache from 'shared/cache/PubMedCache';
+import MutationCountCache from 'shared/cache/MutationCountCache';
+import GenomeNexusCache from 'shared/cache/GenomeNexusCache';
+import GenomeNexusMyVariantInfoCache from 'shared/cache/GenomeNexusMyVariantInfoCache';
+import { ILazyMobXTableApplicationDataStore } from 'shared/lib/ILazyMobXTableApplicationDataStore';
+import { ILazyMobXTableApplicationLazyDownloadDataFetcher } from 'shared/lib/ILazyMobXTableApplicationLazyDownloadDataFetcher';
+import generalStyles from './column/styles.module.scss';
 import classnames from 'classnames';
-import {IPaginationControlsProps} from "../paginationControls/PaginationControls";
-import {IColumnVisibilityControlsProps} from "../columnVisibilityControls/ColumnVisibilityControls";
-import MobxPromise from "mobxpromise";
-import { CancerGene, VariantAnnotation, Query } from "cbioportal-frontend-commons";
-import HgvscColumnFormatter from "./column/HgvscColumnFormatter";
-import HgvsgColumnFormatter from "./column/HgvsgColumnFormatter";
-import GnomadColumnFormatter from "./column/GnomadColumnFormatter";
-import ClinVarColumnFormatter from "./column/ClinVarColumnFormatter";
-import autobind from "autobind-decorator";
-import DbsnpColumnFormatter from "./column/DbsnpColumnFormatter";
-import {getEvidenceQuery} from "../../lib/OncoKbUtils";
-
+import { IPaginationControlsProps } from '../paginationControls/PaginationControls';
+import { IColumnVisibilityControlsProps } from '../columnVisibilityControls/ColumnVisibilityControls';
+import MobxPromise from 'mobxpromise';
+import {
+    CancerGene,
+    VariantAnnotation,
+    Query,
+} from 'cbioportal-frontend-commons';
+import HgvscColumnFormatter from './column/HgvscColumnFormatter';
+import HgvsgColumnFormatter from './column/HgvsgColumnFormatter';
+import GnomadColumnFormatter from './column/GnomadColumnFormatter';
+import ClinVarColumnFormatter from './column/ClinVarColumnFormatter';
+import autobind from 'autobind-decorator';
+import DbsnpColumnFormatter from './column/DbsnpColumnFormatter';
+import { getEvidenceQuery } from '../../lib/OncoKbUtils';
 
 export interface IMutationTableProps {
-    studyIdToStudy?: {[studyId:string]:CancerStudy};
-    uniqueSampleKeyToTumorType?: {[uniqueSampleKey: string]: string};
-    molecularProfileIdToMolecularProfile?: {[molecularProfileId:string]:MolecularProfile};
-    discreteCNACache?:DiscreteCNACache;
-    oncoKbEvidenceCache?:OncoKbEvidenceCache;
-    oncoKbCancerGenes?:IOncoKbCancerGenesWrapper;
-    mrnaExprRankCache?:MrnaExprRankCache;
-    variantCountCache?:VariantCountCache;
-    pubMedCache?:PubMedCache;
-    mutationCountCache?:MutationCountCache;
-    genomeNexusCache?:GenomeNexusCache;
-    genomeNexusMyVariantInfoCache?:GenomeNexusMyVariantInfoCache
-    mutSigData?:IMutSigData;
+    studyIdToStudy?: { [studyId: string]: CancerStudy };
+    uniqueSampleKeyToTumorType?: { [uniqueSampleKey: string]: string };
+    molecularProfileIdToMolecularProfile?: {
+        [molecularProfileId: string]: MolecularProfile;
+    };
+    discreteCNACache?: DiscreteCNACache;
+    oncoKbEvidenceCache?: OncoKbEvidenceCache;
+    oncoKbCancerGenes?: IOncoKbCancerGenesWrapper;
+    mrnaExprRankCache?: MrnaExprRankCache;
+    variantCountCache?: VariantCountCache;
+    pubMedCache?: PubMedCache;
+    mutationCountCache?: MutationCountCache;
+    genomeNexusCache?: GenomeNexusCache;
+    genomeNexusMyVariantInfoCache?: GenomeNexusMyVariantInfoCache;
+    mutSigData?: IMutSigData;
     enableOncoKb?: boolean;
     enableMyCancerGenome?: boolean;
     enableHotspot?: boolean;
@@ -76,30 +97,32 @@ export interface IMutationTableProps {
     enableFunctionalImpact?: boolean;
     myCancerGenomeData?: IMyCancerGenomeData;
     hotspotData?: IHotspotDataWrapper;
-    indexedVariantAnnotations?: MobxPromise<{ [genomicLocation: string]: VariantAnnotation; } | undefined>;
-    cosmicData?:ICosmicData;
+    indexedVariantAnnotations?: MobxPromise<
+        { [genomicLocation: string]: VariantAnnotation } | undefined
+    >;
+    cosmicData?: ICosmicData;
     oncoKbData?: IOncoKbDataWrapper;
     civicGenes?: ICivicGeneDataWrapper;
     civicVariants?: ICivicVariantDataWrapper;
-    mrnaExprRankMolecularProfileId?:string;
-    discreteCNAMolecularProfileId?:string;
-    columns?:MutationTableColumnType[];
-    data?:Mutation[][];
-    dataStore?:ILazyMobXTableApplicationDataStore<Mutation[]>;
-    downloadDataFetcher?:ILazyMobXTableApplicationLazyDownloadDataFetcher;
-    initialItemsPerPage?:number;
-    itemsLabel?:string;
-    itemsLabelPlural?:string;
-    userEmailAddress?:string;
-    initialSortColumn?:string;
-    initialSortDirection?:SortDirection;
-    paginationProps?:IPaginationControlsProps;
-    showCountHeader?:boolean;
-    columnVisibility?: {[columnId: string]: boolean};
+    mrnaExprRankMolecularProfileId?: string;
+    discreteCNAMolecularProfileId?: string;
+    columns?: MutationTableColumnType[];
+    data?: Mutation[][];
+    dataStore?: ILazyMobXTableApplicationDataStore<Mutation[]>;
+    downloadDataFetcher?: ILazyMobXTableApplicationLazyDownloadDataFetcher;
+    initialItemsPerPage?: number;
+    itemsLabel?: string;
+    itemsLabelPlural?: string;
+    userEmailAddress?: string;
+    initialSortColumn?: string;
+    initialSortDirection?: SortDirection;
+    paginationProps?: IPaginationControlsProps;
+    showCountHeader?: boolean;
+    columnVisibility?: { [columnId: string]: boolean };
     columnVisibilityProps?: IColumnVisibilityControlsProps;
-    onRowClick?:(d:Mutation[])=>void;
-    onRowMouseEnter?:(d:Mutation[])=>void;
-    onRowMouseLeave?:(d:Mutation[])=>void;
+    onRowClick?: (d: Mutation[]) => void;
+    onRowMouseEnter?: (d: Mutation[]) => void;
+    onRowMouseLeave?: (d: Mutation[]) => void;
 }
 
 export enum MutationTableColumnType {
@@ -138,33 +161,53 @@ export enum MutationTableColumnType {
     CLINVAR,
     SELECTED,
     DBSNP,
-    GENE_PANEL
+    GENE_PANEL,
 }
 
-type MutationTableColumn = Column<Mutation[]>&{order?:number, shouldExclude?:()=>boolean};
+type MutationTableColumn = Column<Mutation[]> & {
+    order?: number;
+    shouldExclude?: () => boolean;
+};
 
-export class MutationTableComponent extends LazyMobXTable<Mutation[]> {
-}
+export class MutationTableComponent extends LazyMobXTable<Mutation[]> {}
 
-export function getDivForDataField(data:Mutation[], dataField:string, isInteger?:boolean) {
+export function getDivForDataField(
+    data: Mutation[],
+    dataField: string,
+    isInteger?: boolean
+) {
     let contents = getTextForDataField(data, dataField);
-    return (<div className={classnames(isInteger ? generalStyles["integer-data"] : undefined)}>{contents}</div>);
+    return (
+        <div
+            className={classnames(
+                isInteger ? generalStyles['integer-data'] : undefined
+            )}
+        >
+            {contents}
+        </div>
+    );
 }
 
-export function getTextForDataField(data:Mutation[], dataField:string) {
-    let text = "";
+export function getTextForDataField(data: Mutation[], dataField: string) {
+    let text = '';
     if (data.length > 0 && data[0].hasOwnProperty(dataField)) {
         text = (data[0] as any)[dataField];
     }
     return text;
 }
 
-export function defaultFilter(data:Mutation[], dataField:string, filterStringUpper:string):boolean {
+export function defaultFilter(
+    data: Mutation[],
+    dataField: string,
+    filterStringUpper: string
+): boolean {
     if (data.length > 0) {
-        return data.reduce((match:boolean, next:Mutation)=>{
+        return data.reduce((match: boolean, next: Mutation) => {
             const val = (next as any)[dataField];
             if (val) {
-                return match || ((val.toUpperCase().indexOf(filterStringUpper) > -1));
+                return (
+                    match || val.toUpperCase().indexOf(filterStringUpper) > -1
+                );
             } else {
                 return match;
             }
@@ -175,33 +218,36 @@ export function defaultFilter(data:Mutation[], dataField:string, filterStringUpp
 }
 
 @observer
-export default class MutationTable<P extends IMutationTableProps> extends React.Component<P, {}> {
-    @observable protected _columns:{[columnEnum:number]:MutationTableColumn};
-    @observable.ref public table:LazyMobXTable<Mutation[]>|null = null;
+export default class MutationTable<
+    P extends IMutationTableProps
+> extends React.Component<P, {}> {
+    @observable protected _columns: {
+        [columnEnum: number]: MutationTableColumn;
+    };
+    @observable.ref public table: LazyMobXTable<Mutation[]> | null = null;
 
     public static defaultProps = {
         initialItemsPerPage: 25,
         showCountHeader: true,
-        paginationProps:{ itemsPerPageOptions:[25,50,100] },
-        initialSortColumn: "Annotation",
-        initialSortDirection: "desc",
-        itemsLabel: "Mutation",
-        itemsLabelPlural: "Mutations",
+        paginationProps: { itemsPerPageOptions: [25, 50, 100] },
+        initialSortColumn: 'Annotation',
+        initialSortDirection: 'desc',
+        itemsLabel: 'Mutation',
+        itemsLabelPlural: 'Mutations',
         enableOncoKb: true,
         enableMyCancerGenome: true,
         enableHotspot: true,
         enableCivic: false,
     };
 
-    constructor(props:P)
-    {
+    constructor(props: P) {
         super(props);
         this._columns = {};
         this.generateColumns();
     }
 
     @autobind
-    private tableRef(t:LazyMobXTable<Mutation[]>|null) {
+    private tableRef(t: LazyMobXTable<Mutation[]> | null) {
         this.table = t;
     }
 
@@ -209,296 +255,477 @@ export default class MutationTable<P extends IMutationTableProps> extends React.
         this._columns = {};
 
         this._columns[MutationTableColumnType.STUDY] = {
-            name: "Study",
-            render: (d:Mutation[])=> StudyColumnFormatter.renderFunction(d, this.props.molecularProfileIdToMolecularProfile, this.props.studyIdToStudy),
-            download: (d:Mutation[])=>StudyColumnFormatter.getTextValue(d, this.props.molecularProfileIdToMolecularProfile, this.props.studyIdToStudy),
-            sortBy: (d:Mutation[])=>StudyColumnFormatter.getTextValue(d, this.props.molecularProfileIdToMolecularProfile, this.props.studyIdToStudy),
-            filter: (d:Mutation[], filterString:string, filterStringUpper:string)=>{
-                return StudyColumnFormatter.filter(d, filterStringUpper, this.props.molecularProfileIdToMolecularProfile, this.props.studyIdToStudy);
+            name: 'Study',
+            render: (d: Mutation[]) =>
+                StudyColumnFormatter.renderFunction(
+                    d,
+                    this.props.molecularProfileIdToMolecularProfile,
+                    this.props.studyIdToStudy
+                ),
+            download: (d: Mutation[]) =>
+                StudyColumnFormatter.getTextValue(
+                    d,
+                    this.props.molecularProfileIdToMolecularProfile,
+                    this.props.studyIdToStudy
+                ),
+            sortBy: (d: Mutation[]) =>
+                StudyColumnFormatter.getTextValue(
+                    d,
+                    this.props.molecularProfileIdToMolecularProfile,
+                    this.props.studyIdToStudy
+                ),
+            filter: (
+                d: Mutation[],
+                filterString: string,
+                filterStringUpper: string
+            ) => {
+                return StudyColumnFormatter.filter(
+                    d,
+                    filterStringUpper,
+                    this.props.molecularProfileIdToMolecularProfile,
+                    this.props.studyIdToStudy
+                );
             },
-            visible: false
+            visible: false,
         };
 
         this._columns[MutationTableColumnType.SAMPLE_ID] = {
-            name: "Sample ID",
-            render: (d:Mutation[]) => SampleColumnFormatter.renderFunction(d, this.props.molecularProfileIdToMolecularProfile),
+            name: 'Sample ID',
+            render: (d: Mutation[]) =>
+                SampleColumnFormatter.renderFunction(
+                    d,
+                    this.props.molecularProfileIdToMolecularProfile
+                ),
             download: SampleColumnFormatter.getTextValue,
             sortBy: SampleColumnFormatter.getTextValue,
-            filter: (d:Mutation[], filterString:string, filterStringUpper:string) =>
-                defaultFilter(d, "sampleId", filterStringUpper),
-            visible: true
+            filter: (
+                d: Mutation[],
+                filterString: string,
+                filterStringUpper: string
+            ) => defaultFilter(d, 'sampleId', filterStringUpper),
+            visible: true,
         };
 
         this._columns[MutationTableColumnType.TUMOR_ALLELE_FREQ] = {
-            name: "Allele Freq (T)",
+            name: 'Allele Freq (T)',
             render: TumorAlleleFreqColumnFormatter.renderFunction,
-            headerRender: (name: string) => <span style={{display:'inline-block', maxWidth:55}}>{name}</span>,
+            headerRender: (name: string) => (
+                <span style={{ display: 'inline-block', maxWidth: 55 }}>
+                    {name}
+                </span>
+            ),
             download: TumorAlleleFreqColumnFormatter.getTextValue,
             sortBy: TumorAlleleFreqColumnFormatter.getSortValue,
-            tooltip:(<span>Variant allele frequency in the tumor sample</span>),
-            visible: true
+            tooltip: <span>Variant allele frequency in the tumor sample</span>,
+            visible: true,
         };
 
         this._columns[MutationTableColumnType.NORMAL_ALLELE_FREQ] = {
-            name: "Allele Freq (N)",
+            name: 'Allele Freq (N)',
             render: NormalAlleleFreqColumnFormatter.renderFunction,
-            headerRender: (name: string) => <span style={{display:'inline-block', maxWidth:55}}>{name}</span>,
+            headerRender: (name: string) => (
+                <span style={{ display: 'inline-block', maxWidth: 55 }}>
+                    {name}
+                </span>
+            ),
             download: NormalAlleleFreqColumnFormatter.getTextValue,
             sortBy: NormalAlleleFreqColumnFormatter.getSortValue,
-            tooltip:(<span>Variant allele frequency in the normal sample</span>),
-            visible: false
+            tooltip: <span>Variant allele frequency in the normal sample</span>,
+            visible: false,
         };
 
         this._columns[MutationTableColumnType.MRNA_EXPR] = {
-            name:"mRNA Expr.",
-            render:(d:Mutation[])=>(this.props.mrnaExprRankCache
-                ? MrnaExprColumnFormatter.renderFunction(d, this.props.mrnaExprRankCache as MrnaExprRankCache)
-                : (<span></span>))
+            name: 'mRNA Expr.',
+            render: (d: Mutation[]) =>
+                this.props.mrnaExprRankCache ? (
+                    MrnaExprColumnFormatter.renderFunction(d, this.props
+                        .mrnaExprRankCache as MrnaExprRankCache)
+                ) : (
+                    <span></span>
+                ),
         };
 
         this._columns[MutationTableColumnType.COHORT] = {
-            name:"Cohort",
-            render:(d:Mutation[])=>(this.props.variantCountCache
-                ? CohortColumnFormatter.renderFunction(d, this.props.mutSigData, this.props.variantCountCache as VariantCountCache)
-                : (<span></span>)),
-            sortBy:(d:Mutation[])=>{
+            name: 'Cohort',
+            render: (d: Mutation[]) =>
+                this.props.variantCountCache ? (
+                    CohortColumnFormatter.renderFunction(
+                        d,
+                        this.props.mutSigData,
+                        this.props.variantCountCache as VariantCountCache
+                    )
+                ) : (
+                    <span></span>
+                ),
+            sortBy: (d: Mutation[]) => {
                 const cache = this.props.variantCountCache;
                 if (cache) {
-                    return CohortColumnFormatter.getSortValue(d, cache as VariantCountCache);
+                    return CohortColumnFormatter.getSortValue(
+                        d,
+                        cache as VariantCountCache
+                    );
                 } else {
                     return 0;
                 }
             },
-            tooltip: (<span>Mutation frequency in cohort</span>),
-            defaultSortDirection: "desc"
+            tooltip: <span>Mutation frequency in cohort</span>,
+            defaultSortDirection: 'desc',
         };
 
         this._columns[MutationTableColumnType.COPY_NUM] = {
-            name: "Copy #",
-            render:(d:Mutation[])=>{
-                if (this.props.discreteCNACache && this.props.molecularProfileIdToMolecularProfile) {
-                    return DiscreteCNAColumnFormatter.renderFunction(d,
-                        this.props.molecularProfileIdToMolecularProfile as {[molecularProfileId:string]:MolecularProfile},
-                        this.props.discreteCNACache as DiscreteCNACache);
+            name: 'Copy #',
+            render: (d: Mutation[]) => {
+                if (
+                    this.props.discreteCNACache &&
+                    this.props.molecularProfileIdToMolecularProfile
+                ) {
+                    return DiscreteCNAColumnFormatter.renderFunction(
+                        d,
+                        this.props.molecularProfileIdToMolecularProfile as {
+                            [molecularProfileId: string]: MolecularProfile;
+                        },
+                        this.props.discreteCNACache as DiscreteCNACache
+                    );
                 } else {
-                    return (<span></span>);
+                    return <span></span>;
                 }
             },
-            sortBy: (d:Mutation[]):number|null=>{
-                if (this.props.discreteCNACache && this.props.molecularProfileIdToMolecularProfile) {
-                    return DiscreteCNAColumnFormatter.getSortValue(d,
-                        this.props.molecularProfileIdToMolecularProfile as {[molecularProfileId:string]:MolecularProfile},
-                        this.props.discreteCNACache as DiscreteCNACache);
+            sortBy: (d: Mutation[]): number | null => {
+                if (
+                    this.props.discreteCNACache &&
+                    this.props.molecularProfileIdToMolecularProfile
+                ) {
+                    return DiscreteCNAColumnFormatter.getSortValue(
+                        d,
+                        this.props.molecularProfileIdToMolecularProfile as {
+                            [molecularProfileId: string]: MolecularProfile;
+                        },
+                        this.props.discreteCNACache as DiscreteCNACache
+                    );
                 } else {
                     return 0;
                 }
             },
-            download: (d:Mutation[]):string=>{
-                if (this.props.discreteCNACache && this.props.molecularProfileIdToMolecularProfile) {
-                    return DiscreteCNAColumnFormatter.getTextValue(d,
-                        this.props.molecularProfileIdToMolecularProfile as {[molecularProfileId:string]:MolecularProfile},
-                        this.props.discreteCNACache as DiscreteCNACache);
+            download: (d: Mutation[]): string => {
+                if (
+                    this.props.discreteCNACache &&
+                    this.props.molecularProfileIdToMolecularProfile
+                ) {
+                    return DiscreteCNAColumnFormatter.getTextValue(
+                        d,
+                        this.props.molecularProfileIdToMolecularProfile as {
+                            [molecularProfileId: string]: MolecularProfile;
+                        },
+                        this.props.discreteCNACache as DiscreteCNACache
+                    );
                 } else {
-                    return "";
+                    return '';
                 }
             },
-            filter:(d:Mutation[], filterString:string)=>{
-                if (this.props.discreteCNACache && this.props.molecularProfileIdToMolecularProfile) {
-                    return DiscreteCNAColumnFormatter.filter(d,
-                        this.props.molecularProfileIdToMolecularProfile as {[molecularProfileId:string]:MolecularProfile},
+            filter: (d: Mutation[], filterString: string) => {
+                if (
+                    this.props.discreteCNACache &&
+                    this.props.molecularProfileIdToMolecularProfile
+                ) {
+                    return DiscreteCNAColumnFormatter.filter(
+                        d,
+                        this.props.molecularProfileIdToMolecularProfile as {
+                            [molecularProfileId: string]: MolecularProfile;
+                        },
                         this.props.discreteCNACache as DiscreteCNACache,
-                        filterString);
+                        filterString
+                    );
                 } else {
                     return false;
                 }
             },
-            visible: DiscreteCNAColumnFormatter.isVisible(this.props.discreteCNACache as DiscreteCNACache)
+            visible: DiscreteCNAColumnFormatter.isVisible(this.props
+                .discreteCNACache as DiscreteCNACache),
         };
 
         this._columns[MutationTableColumnType.REF_READS_N] = {
-            name: "Ref Reads (Normal)",
-            render: (d:Mutation[])=>AlleleCountColumnFormatter.renderFunction(d, [d[0].sampleId], "normalRefCount"),
-            download: (d:Mutation[])=>AlleleCountColumnFormatter.getTextValue(d, [d[0].sampleId], "normalRefCount"),
-            sortBy:(d:Mutation[])=>d.map(m=>m.normalRefCount),
+            name: 'Ref Reads (Normal)',
+            render: (d: Mutation[]) =>
+                AlleleCountColumnFormatter.renderFunction(
+                    d,
+                    [d[0].sampleId],
+                    'normalRefCount'
+                ),
+            download: (d: Mutation[]) =>
+                AlleleCountColumnFormatter.getTextValue(
+                    d,
+                    [d[0].sampleId],
+                    'normalRefCount'
+                ),
+            sortBy: (d: Mutation[]) => d.map(m => m.normalRefCount),
             visible: false,
-            align: "right"
+            align: 'right',
         };
 
         this._columns[MutationTableColumnType.VAR_READS_N] = {
-            name: "Variant Reads (Normal)",
-            render: (d:Mutation[])=>AlleleCountColumnFormatter.renderFunction(d, [d[0].sampleId], "normalAltCount"),
-            download: (d:Mutation[])=>AlleleCountColumnFormatter.getTextValue(d, [d[0].sampleId], "normalAltCount"),
-            sortBy:(d:Mutation[])=>d.map(m=>m.normalAltCount),
+            name: 'Variant Reads (Normal)',
+            render: (d: Mutation[]) =>
+                AlleleCountColumnFormatter.renderFunction(
+                    d,
+                    [d[0].sampleId],
+                    'normalAltCount'
+                ),
+            download: (d: Mutation[]) =>
+                AlleleCountColumnFormatter.getTextValue(
+                    d,
+                    [d[0].sampleId],
+                    'normalAltCount'
+                ),
+            sortBy: (d: Mutation[]) => d.map(m => m.normalAltCount),
             visible: false,
-            align: "right"
+            align: 'right',
         };
 
         this._columns[MutationTableColumnType.REF_READS] = {
-            name: "Ref Reads",
-            render: (d:Mutation[])=>AlleleCountColumnFormatter.renderFunction(d, [d[0].sampleId], "tumorRefCount"),
-            download: (d:Mutation[])=>AlleleCountColumnFormatter.getTextValue(d, [d[0].sampleId], "tumorRefCount"),
-            sortBy:(d:Mutation[])=>d.map(m=>m.tumorRefCount),
+            name: 'Ref Reads',
+            render: (d: Mutation[]) =>
+                AlleleCountColumnFormatter.renderFunction(
+                    d,
+                    [d[0].sampleId],
+                    'tumorRefCount'
+                ),
+            download: (d: Mutation[]) =>
+                AlleleCountColumnFormatter.getTextValue(
+                    d,
+                    [d[0].sampleId],
+                    'tumorRefCount'
+                ),
+            sortBy: (d: Mutation[]) => d.map(m => m.tumorRefCount),
             visible: false,
-            align: "right"
+            align: 'right',
         };
 
         this._columns[MutationTableColumnType.VAR_READS] = {
-            name: "Variant Reads",
-            render: (d:Mutation[])=>AlleleCountColumnFormatter.renderFunction(d, [d[0].sampleId], "tumorAltCount"),
-            download: (d:Mutation[])=>AlleleCountColumnFormatter.getTextValue(d, [d[0].sampleId], "tumorAltCount"),
-            sortBy:(d:Mutation[])=>d.map(m=>m.tumorAltCount),
+            name: 'Variant Reads',
+            render: (d: Mutation[]) =>
+                AlleleCountColumnFormatter.renderFunction(
+                    d,
+                    [d[0].sampleId],
+                    'tumorAltCount'
+                ),
+            download: (d: Mutation[]) =>
+                AlleleCountColumnFormatter.getTextValue(
+                    d,
+                    [d[0].sampleId],
+                    'tumorAltCount'
+                ),
+            sortBy: (d: Mutation[]) => d.map(m => m.tumorAltCount),
             visible: false,
-            align: "right"
+            align: 'right',
         };
 
         this._columns[MutationTableColumnType.START_POS] = {
-            name: "Start Pos",
-            render: (d:Mutation[])=>getDivForDataField(d, "startPosition", true),
-            download: (d:Mutation[])=>getTextForDataField(d, "startPosition"),
-            sortBy:(d:Mutation[])=>d.map(m=>m.startPosition),
+            name: 'Start Pos',
+            render: (d: Mutation[]) =>
+                getDivForDataField(d, 'startPosition', true),
+            download: (d: Mutation[]) =>
+                getTextForDataField(d, 'startPosition'),
+            sortBy: (d: Mutation[]) => d.map(m => m.startPosition),
             visible: false,
-            align: "right"
+            align: 'right',
         };
 
         this._columns[MutationTableColumnType.END_POS] = {
-            name: "End Pos",
-            render: (d:Mutation[])=>getDivForDataField(d, "endPosition", true),
-            download: (d:Mutation[])=>getTextForDataField(d, "endPosition"),
-            sortBy:(d:Mutation[])=>d.map(m=>m.endPosition),
+            name: 'End Pos',
+            render: (d: Mutation[]) =>
+                getDivForDataField(d, 'endPosition', true),
+            download: (d: Mutation[]) => getTextForDataField(d, 'endPosition'),
+            sortBy: (d: Mutation[]) => d.map(m => m.endPosition),
             visible: false,
-            align: "right"
+            align: 'right',
         };
 
         this._columns[MutationTableColumnType.REF_ALLELE] = {
-            name: "Ref",
-            render: (d:Mutation[])=>getDivForDataField(d, "referenceAllele"),
-            download: (d:Mutation[])=>getTextForDataField(d, "referenceAllele"),
-            sortBy:(d:Mutation[])=>d.map(m=>m.referenceAllele),
-            visible: false
+            name: 'Ref',
+            render: (d: Mutation[]) => getDivForDataField(d, 'referenceAllele'),
+            download: (d: Mutation[]) =>
+                getTextForDataField(d, 'referenceAllele'),
+            sortBy: (d: Mutation[]) => d.map(m => m.referenceAllele),
+            visible: false,
         };
 
         this._columns[MutationTableColumnType.VAR_ALLELE] = {
-            name: "Var",
-            render: (d:Mutation[])=>getDivForDataField(d, "variantAllele"),
-            download: (d:Mutation[])=>getTextForDataField(d, "variantAllele"),
-            sortBy:(d:Mutation[])=>d.map(m=>m.variantAllele),
-            visible: false
+            name: 'Var',
+            render: (d: Mutation[]) => getDivForDataField(d, 'variantAllele'),
+            download: (d: Mutation[]) =>
+                getTextForDataField(d, 'variantAllele'),
+            sortBy: (d: Mutation[]) => d.map(m => m.variantAllele),
+            visible: false,
         };
 
         this._columns[MutationTableColumnType.MUTATION_STATUS] = {
-            name: "MS",
-            tooltip: (<span>Mutation Status</span>),
+            name: 'MS',
+            tooltip: <span>Mutation Status</span>,
             render: MutationStatusColumnFormatter.renderFunction,
             download: MutationStatusColumnFormatter.download,
             sortBy: MutationStatusColumnFormatter.sortValue,
-            filter: (d:Mutation[], filterString:string, filterStringUpper:string) =>
-                defaultFilter(d, "mutationStatus", filterStringUpper),
-            visible: false
+            filter: (
+                d: Mutation[],
+                filterString: string,
+                filterStringUpper: string
+            ) => defaultFilter(d, 'mutationStatus', filterStringUpper),
+            visible: false,
         };
 
         this._columns[MutationTableColumnType.VALIDATION_STATUS] = {
-            name: "VS",
-            tooltip: (<span>Validation Status</span>),
+            name: 'VS',
+            tooltip: <span>Validation Status</span>,
             render: ValidationStatusColumnFormatter.renderFunction,
             download: ValidationStatusColumnFormatter.download,
             sortBy: ValidationStatusColumnFormatter.sortValue,
-            filter: (d:Mutation[], filterString:string, filterStringUpper:string) =>
-                defaultFilter(d, "validationStatus", filterStringUpper),
-            visible: false
+            filter: (
+                d: Mutation[],
+                filterString: string,
+                filterStringUpper: string
+            ) => defaultFilter(d, 'validationStatus', filterStringUpper),
+            visible: false,
         };
 
         this._columns[MutationTableColumnType.CENTER] = {
-            name: "Center",
-            render: (d:Mutation[])=>getDivForDataField(d, "center"),
-            download: (d:Mutation[])=>getTextForDataField(d, "center"),
-            sortBy:(d:Mutation[])=>d.map(m=>m.center),
-            filter: (d:Mutation[], filterString:string, filterStringUpper:string) =>
-                defaultFilter(d, "center", filterStringUpper),
-            visible: false
+            name: 'Center',
+            render: (d: Mutation[]) => getDivForDataField(d, 'center'),
+            download: (d: Mutation[]) => getTextForDataField(d, 'center'),
+            sortBy: (d: Mutation[]) => d.map(m => m.center),
+            filter: (
+                d: Mutation[],
+                filterString: string,
+                filterStringUpper: string
+            ) => defaultFilter(d, 'center', filterStringUpper),
+            visible: false,
         };
 
         this._columns[MutationTableColumnType.GENE] = {
-            name: "Gene",
-            render: (d:Mutation[])=>GeneColumnFormatter.renderFunction(d),
-            download: (d:Mutation[])=>GeneColumnFormatter.getTextValue(d),
-            sortBy:(d:Mutation[])=>GeneColumnFormatter.getSortValue(d),
-            filter:(d:Mutation[], filterString:string, filterStringUpper:string) =>
-                GeneColumnFormatter.getTextValue(d).toUpperCase().indexOf(filterStringUpper) > -1
+            name: 'Gene',
+            render: (d: Mutation[]) => GeneColumnFormatter.renderFunction(d),
+            download: (d: Mutation[]) => GeneColumnFormatter.getTextValue(d),
+            sortBy: (d: Mutation[]) => GeneColumnFormatter.getSortValue(d),
+            filter: (
+                d: Mutation[],
+                filterString: string,
+                filterStringUpper: string
+            ) =>
+                GeneColumnFormatter.getTextValue(d)
+                    .toUpperCase()
+                    .indexOf(filterStringUpper) > -1,
         };
 
         this._columns[MutationTableColumnType.CHROMOSOME] = {
-            name: "Chromosome",
-            render: (d:Mutation[])=>(<div className={generalStyles["integer-data"]}>{ChromosomeColumnFormatter.getData(d)}</div>),
-            download: (d:Mutation[])=>(ChromosomeColumnFormatter.getData(d) || ""),
-            sortBy:(d:Mutation[])=>ChromosomeColumnFormatter.getSortValue(d),
-            filter:(d:Mutation[], filterString:string, filterStringUpper:string) =>
-                (ChromosomeColumnFormatter.getData(d)+'').toUpperCase().indexOf(filterStringUpper) > -1,
+            name: 'Chromosome',
+            render: (d: Mutation[]) => (
+                <div className={generalStyles['integer-data']}>
+                    {ChromosomeColumnFormatter.getData(d)}
+                </div>
+            ),
+            download: (d: Mutation[]) =>
+                ChromosomeColumnFormatter.getData(d) || '',
+            sortBy: (d: Mutation[]) =>
+                ChromosomeColumnFormatter.getSortValue(d),
+            filter: (
+                d: Mutation[],
+                filterString: string,
+                filterStringUpper: string
+            ) =>
+                (ChromosomeColumnFormatter.getData(d) + '')
+                    .toUpperCase()
+                    .indexOf(filterStringUpper) > -1,
             visible: false,
-            align: "right"
+            align: 'right',
         };
 
         this._columns[MutationTableColumnType.PROTEIN_CHANGE] = {
-            name: "Protein Change",
+            name: 'Protein Change',
             render: ProteinChangeColumnFormatter.renderWithMutationStatus,
             download: ProteinChangeColumnFormatter.getTextValue,
-            sortBy:(d:Mutation[])=>ProteinChangeColumnFormatter.getSortValue(d),
-            filter: ProteinChangeColumnFormatter.getFilterValue
+            sortBy: (d: Mutation[]) =>
+                ProteinChangeColumnFormatter.getSortValue(d),
+            filter: ProteinChangeColumnFormatter.getFilterValue,
         };
 
         this._columns[MutationTableColumnType.MUTATION_TYPE] = {
-            name: "Mutation Type",
-            render:MutationTypeColumnFormatter.renderFunction,
-            download:MutationTypeColumnFormatter.getTextValue,
-            sortBy:(d:Mutation[])=>MutationTypeColumnFormatter.getDisplayValue(d),
-            filter:(d:Mutation[], filterString:string, filterStringUpper:string) =>
-                MutationTypeColumnFormatter.getDisplayValue(d).toUpperCase().indexOf(filterStringUpper) > -1
+            name: 'Mutation Type',
+            render: MutationTypeColumnFormatter.renderFunction,
+            download: MutationTypeColumnFormatter.getTextValue,
+            sortBy: (d: Mutation[]) =>
+                MutationTypeColumnFormatter.getDisplayValue(d),
+            filter: (
+                d: Mutation[],
+                filterString: string,
+                filterStringUpper: string
+            ) =>
+                MutationTypeColumnFormatter.getDisplayValue(d)
+                    .toUpperCase()
+                    .indexOf(filterStringUpper) > -1,
         };
 
         this._columns[MutationTableColumnType.FUNCTIONAL_IMPACT] = {
-            name:"Functional Impact",
-            render:(d:Mutation[])=>(this.props.genomeNexusCache
-                ? FunctionalImpactColumnFormatter.renderFunction(d, this.props.genomeNexusCache)
-                : <span></span>),
-            download: (d:Mutation[]) => FunctionalImpactColumnFormatter.download(
-                d, this.props.genomeNexusCache as GenomeNexusCache),
+            name: 'Functional Impact',
+            render: (d: Mutation[]) =>
+                this.props.genomeNexusCache ? (
+                    FunctionalImpactColumnFormatter.renderFunction(
+                        d,
+                        this.props.genomeNexusCache
+                    )
+                ) : (
+                    <span></span>
+                ),
+            download: (d: Mutation[]) =>
+                FunctionalImpactColumnFormatter.download(d, this.props
+                    .genomeNexusCache as GenomeNexusCache),
             headerRender: FunctionalImpactColumnFormatter.headerRender,
             visible: false,
-            shouldExclude: () => !this.props.enableFunctionalImpact
+            shouldExclude: () => !this.props.enableFunctionalImpact,
         };
 
         this._columns[MutationTableColumnType.COSMIC] = {
-            name: "COSMIC",
-            render: (d:Mutation[])=>CosmicColumnFormatter.renderFunction(d, this.props.cosmicData),
-            sortBy: (d:Mutation[])=>CosmicColumnFormatter.getSortValue(d, this.props.cosmicData),
-            download: (d:Mutation[])=>CosmicColumnFormatter.getDownloadValue(d, this.props.cosmicData),
-            tooltip: (<span>COSMIC occurrences</span>),
-            defaultSortDirection: "desc",
-            align:"right"
+            name: 'COSMIC',
+            render: (d: Mutation[]) =>
+                CosmicColumnFormatter.renderFunction(d, this.props.cosmicData),
+            sortBy: (d: Mutation[]) =>
+                CosmicColumnFormatter.getSortValue(d, this.props.cosmicData),
+            download: (d: Mutation[]) =>
+                CosmicColumnFormatter.getDownloadValue(
+                    d,
+                    this.props.cosmicData
+                ),
+            tooltip: <span>COSMIC occurrences</span>,
+            defaultSortDirection: 'desc',
+            align: 'right',
         };
 
         this._columns[MutationTableColumnType.ANNOTATION] = {
-            name: "Annotation",
-            render: (d:Mutation[]) => (AnnotationColumnFormatter.renderFunction(d, {
-                hotspotData: this.props.hotspotData,
-                myCancerGenomeData: this.props.myCancerGenomeData,
-                oncoKbData: this.props.oncoKbData,
-                oncoKbEvidenceCache: this.props.oncoKbEvidenceCache,
-                oncoKbCancerGenes: this.props.oncoKbCancerGenes,
-                pubMedCache: this.props.pubMedCache,
-                civicGenes: this.props.civicGenes,
-                civicVariants: this.props.civicVariants,
-                enableCivic: this.props.enableCivic as boolean,
-                enableOncoKb: this.props.enableOncoKb as boolean,
-                enableMyCancerGenome: this.props.enableMyCancerGenome as boolean,
-                enableHotspot: this.props.enableHotspot as boolean,
-                userEmailAddress: this.props.userEmailAddress,
-                studyIdToStudy: this.props.studyIdToStudy
-            })),
-            filter: (d:Mutation[], filterString:string, filterStringUpper:string)=>{
+            name: 'Annotation',
+            render: (d: Mutation[]) =>
+                AnnotationColumnFormatter.renderFunction(d, {
+                    hotspotData: this.props.hotspotData,
+                    myCancerGenomeData: this.props.myCancerGenomeData,
+                    oncoKbData: this.props.oncoKbData,
+                    oncoKbEvidenceCache: this.props.oncoKbEvidenceCache,
+                    oncoKbCancerGenes: this.props.oncoKbCancerGenes,
+                    pubMedCache: this.props.pubMedCache,
+                    civicGenes: this.props.civicGenes,
+                    civicVariants: this.props.civicVariants,
+                    enableCivic: this.props.enableCivic as boolean,
+                    enableOncoKb: this.props.enableOncoKb as boolean,
+                    enableMyCancerGenome: this.props
+                        .enableMyCancerGenome as boolean,
+                    enableHotspot: this.props.enableHotspot as boolean,
+                    userEmailAddress: this.props.userEmailAddress,
+                    studyIdToStudy: this.props.studyIdToStudy,
+                }),
+            filter: (
+                d: Mutation[],
+                filterString: string,
+                filterStringUpper: string
+            ) => {
                 let ret = false;
                 switch (filterStringUpper) {
-                    case "HOTSPOT":
-                        const annotation:IAnnotation = AnnotationColumnFormatter.getData(
+                    case 'HOTSPOT':
+                        const annotation: IAnnotation = AnnotationColumnFormatter.getData(
                             d,
                             this.props.oncoKbCancerGenes,
                             this.props.hotspotData,
@@ -506,21 +733,30 @@ export default class MutationTable<P extends IMutationTableProps> extends React.
                             this.props.oncoKbData,
                             this.props.civicGenes,
                             this.props.civicVariants,
-                            this.props.studyIdToStudy);
+                            this.props.studyIdToStudy
+                        );
 
                         ret = annotation.isHotspot;
                         break;
-                    case "ONCOGENIC":
-                        if (this.props.oncoKbData &&
+                    case 'ONCOGENIC':
+                        if (
+                            this.props.oncoKbData &&
                             this.props.oncoKbData.result &&
                             !(this.props.oncoKbData.result instanceof Error) &&
-                            this.props.oncoKbData.result.indicatorMap) {
-
-                            const evidenceQuery = getEvidenceQuery(d[0], this.props.oncoKbData.result);
+                            this.props.oncoKbData.result.indicatorMap
+                        ) {
+                            const evidenceQuery = getEvidenceQuery(
+                                d[0],
+                                this.props.oncoKbData.result
+                            );
                             if (evidenceQuery) {
-                                const indicator = this.props.oncoKbData.result.indicatorMap[evidenceQuery.id];
+                                const indicator = this.props.oncoKbData.result
+                                    .indicatorMap[evidenceQuery.id];
                                 if (indicator) {
-                                    ret = indicator.oncogenic.toLowerCase().trim().includes("oncogenic");
+                                    ret = indicator.oncogenic
+                                        .toLowerCase()
+                                        .trim()
+                                        .includes('oncogenic');
                                 }
                             }
                         }
@@ -528,124 +764,230 @@ export default class MutationTable<P extends IMutationTableProps> extends React.
                 }
                 return ret;
             },
-            download:(d:Mutation[])=>{
-                return AnnotationColumnFormatter.download(d,
+            download: (d: Mutation[]) => {
+                return AnnotationColumnFormatter.download(
+                    d,
                     this.props.oncoKbCancerGenes,
                     this.props.hotspotData,
                     this.props.myCancerGenomeData,
                     this.props.oncoKbData,
                     this.props.civicGenes,
-                    this.props.civicVariants);
+                    this.props.civicVariants
+                );
             },
-            sortBy:(d:Mutation[])=>{
-                return AnnotationColumnFormatter.sortValue(d,
+            sortBy: (d: Mutation[]) => {
+                return AnnotationColumnFormatter.sortValue(
+                    d,
                     this.props.oncoKbCancerGenes,
                     this.props.hotspotData,
                     this.props.myCancerGenomeData,
                     this.props.oncoKbData,
                     this.props.civicGenes,
-                    this.props.civicVariants);
-            }
+                    this.props.civicVariants
+                );
+            },
         };
 
         this._columns[MutationTableColumnType.HGVSG] = {
-            name: "HGVSg",
-            render: (d:Mutation[]) => HgvsgColumnFormatter.renderFunction(d),
-            download: (d:Mutation[]) => HgvsgColumnFormatter.download(d),
-            sortBy: (d:Mutation[]) => HgvsgColumnFormatter.getSortValue(d),
+            name: 'HGVSg',
+            render: (d: Mutation[]) => HgvsgColumnFormatter.renderFunction(d),
+            download: (d: Mutation[]) => HgvsgColumnFormatter.download(d),
+            sortBy: (d: Mutation[]) => HgvsgColumnFormatter.getSortValue(d),
             visible: false,
-            align: "left"
+            align: 'left',
         };
 
         this._columns[MutationTableColumnType.CANCER_TYPE] = {
-            name: "Cancer Type",
-            render: (d:Mutation[]) => CancerTypeColumnFormatter.render(d, this.props.uniqueSampleKeyToTumorType),
-            download: (d:Mutation[]) => CancerTypeColumnFormatter.download(d, this.props.uniqueSampleKeyToTumorType),
-            sortBy: (d:Mutation[]) => CancerTypeColumnFormatter.sortBy(d, this.props.uniqueSampleKeyToTumorType),
-            filter: (d:Mutation[], filterString:string, filterStringUpper:string) =>
-                CancerTypeColumnFormatter.filter(d, filterStringUpper, this.props.uniqueSampleKeyToTumorType),
-            tooltip:(<span>Cancer Type</span>),
+            name: 'Cancer Type',
+            render: (d: Mutation[]) =>
+                CancerTypeColumnFormatter.render(
+                    d,
+                    this.props.uniqueSampleKeyToTumorType
+                ),
+            download: (d: Mutation[]) =>
+                CancerTypeColumnFormatter.download(
+                    d,
+                    this.props.uniqueSampleKeyToTumorType
+                ),
+            sortBy: (d: Mutation[]) =>
+                CancerTypeColumnFormatter.sortBy(
+                    d,
+                    this.props.uniqueSampleKeyToTumorType
+                ),
+            filter: (
+                d: Mutation[],
+                filterString: string,
+                filterStringUpper: string
+            ) =>
+                CancerTypeColumnFormatter.filter(
+                    d,
+                    filterStringUpper,
+                    this.props.uniqueSampleKeyToTumorType
+                ),
+            tooltip: <span>Cancer Type</span>,
         };
 
         this._columns[MutationTableColumnType.NUM_MUTATIONS] = {
-            name: "# Mut in Sample",
+            name: '# Mut in Sample',
             render: MutationCountColumnFormatter.makeRenderFunction(this),
-            headerRender: (name: string) => <span style={{display:'inline-block', maxWidth:55}}>{name}</span>,
-            sortBy: (d:Mutation[]) => MutationCountColumnFormatter.sortBy(d, this.props.mutationCountCache),
-            download: (d:Mutation[]) => MutationCountColumnFormatter.download(d, this.props.mutationCountCache),
-            tooltip:(<span>Total number of nonsynonymous mutations in the sample</span>),
-            align: "right"
+            headerRender: (name: string) => (
+                <span style={{ display: 'inline-block', maxWidth: 55 }}>
+                    {name}
+                </span>
+            ),
+            sortBy: (d: Mutation[]) =>
+                MutationCountColumnFormatter.sortBy(
+                    d,
+                    this.props.mutationCountCache
+                ),
+            download: (d: Mutation[]) =>
+                MutationCountColumnFormatter.download(
+                    d,
+                    this.props.mutationCountCache
+                ),
+            tooltip: (
+                <span>
+                    Total number of nonsynonymous mutations in the sample
+                </span>
+            ),
+            align: 'right',
         };
 
         this._columns[MutationTableColumnType.EXON] = {
-            name: "Exon",
-            render: (d:Mutation[]) => (this.props.genomeNexusCache
-                ? ExonColumnFormatter.renderFunction(d, this.props.genomeNexusCache)
-                : <span></span>),
-            download: (d:Mutation[]) => ExonColumnFormatter.download(d, this.props.genomeNexusCache as GenomeNexusCache),
-            sortBy: (d:Mutation[]) => ExonColumnFormatter.getSortValue(d, this.props.genomeNexusCache as GenomeNexusCache),
+            name: 'Exon',
+            render: (d: Mutation[]) =>
+                this.props.genomeNexusCache ? (
+                    ExonColumnFormatter.renderFunction(
+                        d,
+                        this.props.genomeNexusCache
+                    )
+                ) : (
+                    <span></span>
+                ),
+            download: (d: Mutation[]) =>
+                ExonColumnFormatter.download(d, this.props
+                    .genomeNexusCache as GenomeNexusCache),
+            sortBy: (d: Mutation[]) =>
+                ExonColumnFormatter.getSortValue(d, this.props
+                    .genomeNexusCache as GenomeNexusCache),
             visible: false,
-            align: "right"
+            align: 'right',
         };
 
         this._columns[MutationTableColumnType.HGVSC] = {
-            name: "HGVSc",
-            render: (d:Mutation[]) => (this.props.genomeNexusCache
-                ? HgvscColumnFormatter.renderFunction(d, this.props.genomeNexusCache)
-                : <span></span>),
-            download: (d:Mutation[]) => HgvscColumnFormatter.download(d, this.props.genomeNexusCache as GenomeNexusCache),
-            sortBy: (d:Mutation[]) => HgvscColumnFormatter.getSortValue(d, this.props.genomeNexusCache as GenomeNexusCache),
+            name: 'HGVSc',
+            render: (d: Mutation[]) =>
+                this.props.genomeNexusCache ? (
+                    HgvscColumnFormatter.renderFunction(
+                        d,
+                        this.props.genomeNexusCache
+                    )
+                ) : (
+                    <span></span>
+                ),
+            download: (d: Mutation[]) =>
+                HgvscColumnFormatter.download(d, this.props
+                    .genomeNexusCache as GenomeNexusCache),
+            sortBy: (d: Mutation[]) =>
+                HgvscColumnFormatter.getSortValue(d, this.props
+                    .genomeNexusCache as GenomeNexusCache),
             visible: false,
-            align: "right"
+            align: 'right',
         };
-        
+
         this._columns[MutationTableColumnType.GNOMAD] = {
-            name: "gnomAD",
-            render: (d:Mutation[]) => GnomadColumnFormatter.renderFunction(d, this.props.genomeNexusMyVariantInfoCache as GenomeNexusMyVariantInfoCache),
-            sortBy: (d:Mutation[]) => GnomadColumnFormatter.getSortValue(d, this.props.genomeNexusMyVariantInfoCache as GenomeNexusMyVariantInfoCache),
-            download: (d:Mutation[]) => GnomadColumnFormatter.download(d, this.props.genomeNexusMyVariantInfoCache as GenomeNexusMyVariantInfoCache),
-            tooltip: (<span><a href="https://gnomad.broadinstitute.org/">gnomAD</a> population allele frequencies. 
-            Overall population allele frequency is shown. Hover over a frequency to see the frequency for each specific population.</span>),
-            defaultSortDirection: "desc",
+            name: 'gnomAD',
+            render: (d: Mutation[]) =>
+                GnomadColumnFormatter.renderFunction(d, this.props
+                    .genomeNexusMyVariantInfoCache as GenomeNexusMyVariantInfoCache),
+            sortBy: (d: Mutation[]) =>
+                GnomadColumnFormatter.getSortValue(d, this.props
+                    .genomeNexusMyVariantInfoCache as GenomeNexusMyVariantInfoCache),
+            download: (d: Mutation[]) =>
+                GnomadColumnFormatter.download(d, this.props
+                    .genomeNexusMyVariantInfoCache as GenomeNexusMyVariantInfoCache),
+            tooltip: (
+                <span>
+                    <a href="https://gnomad.broadinstitute.org/">gnomAD</a>{' '}
+                    population allele frequencies. Overall population allele
+                    frequency is shown. Hover over a frequency to see the
+                    frequency for each specific population.
+                </span>
+            ),
+            defaultSortDirection: 'desc',
             visible: false,
-            align: "left"
+            align: 'left',
         };
 
         this._columns[MutationTableColumnType.CLINVAR] = {
-            name: "ClinVar ID",
-            render: (d:Mutation[]) => ClinVarColumnFormatter.renderFunction(d, this.props.genomeNexusMyVariantInfoCache as GenomeNexusMyVariantInfoCache),
-            sortBy: (d:Mutation[]) => ClinVarColumnFormatter.getSortValue(d, this.props.genomeNexusMyVariantInfoCache as GenomeNexusMyVariantInfoCache),
-            download: (d:Mutation[]) => ClinVarColumnFormatter.download(d, this.props.genomeNexusMyVariantInfoCache as GenomeNexusMyVariantInfoCache),
-            tooltip: (<span><a href="https://www.ncbi.nlm.nih.gov/clinvar/" target="_blank">ClinVar</a>
-            &nbsp;aggregates information about genomic variation and its relationship to human health.</span>),
-            defaultSortDirection: "desc",
+            name: 'ClinVar ID',
+            render: (d: Mutation[]) =>
+                ClinVarColumnFormatter.renderFunction(d, this.props
+                    .genomeNexusMyVariantInfoCache as GenomeNexusMyVariantInfoCache),
+            sortBy: (d: Mutation[]) =>
+                ClinVarColumnFormatter.getSortValue(d, this.props
+                    .genomeNexusMyVariantInfoCache as GenomeNexusMyVariantInfoCache),
+            download: (d: Mutation[]) =>
+                ClinVarColumnFormatter.download(d, this.props
+                    .genomeNexusMyVariantInfoCache as GenomeNexusMyVariantInfoCache),
+            tooltip: (
+                <span>
+                    <a
+                        href="https://www.ncbi.nlm.nih.gov/clinvar/"
+                        target="_blank"
+                    >
+                        ClinVar
+                    </a>
+                    &nbsp;aggregates information about genomic variation and its
+                    relationship to human health.
+                </span>
+            ),
+            defaultSortDirection: 'desc',
             visible: false,
-            align: "right"
+            align: 'right',
         };
 
         this._columns[MutationTableColumnType.DBSNP] = {
-            name: "dbSNP",
-            render: (d:Mutation[]) => DbsnpColumnFormatter.renderFunction(d, this.props.genomeNexusMyVariantInfoCache as GenomeNexusMyVariantInfoCache),
-            sortBy: (d:Mutation[]) => DbsnpColumnFormatter.getSortValue(d, this.props.genomeNexusMyVariantInfoCache as GenomeNexusMyVariantInfoCache),
-            download: (d:Mutation[]) => DbsnpColumnFormatter.download(d, this.props.genomeNexusMyVariantInfoCache as GenomeNexusMyVariantInfoCache),
+            name: 'dbSNP',
+            render: (d: Mutation[]) =>
+                DbsnpColumnFormatter.renderFunction(d, this.props
+                    .genomeNexusMyVariantInfoCache as GenomeNexusMyVariantInfoCache),
+            sortBy: (d: Mutation[]) =>
+                DbsnpColumnFormatter.getSortValue(d, this.props
+                    .genomeNexusMyVariantInfoCache as GenomeNexusMyVariantInfoCache),
+            download: (d: Mutation[]) =>
+                DbsnpColumnFormatter.download(d, this.props
+                    .genomeNexusMyVariantInfoCache as GenomeNexusMyVariantInfoCache),
             tooltip: (
-                <span style={{maxWidth:370, display:"block", textAlign:"left"}}>
-                    The Single Nucleotide Polymorphism Database (<a href="https://www.ncbi.nlm.nih.gov/snp/" target="_blank">dbSNP</a>)
-                    is a free public archive for genetic variation within and across different species.
-                    <br />NOTE: Currently only SNPs, single base deletions and insertions are supported.
+                <span
+                    style={{
+                        maxWidth: 370,
+                        display: 'block',
+                        textAlign: 'left',
+                    }}
+                >
+                    The Single Nucleotide Polymorphism Database (
+                    <a href="https://www.ncbi.nlm.nih.gov/snp/" target="_blank">
+                        dbSNP
+                    </a>
+                    ) is a free public archive for genetic variation within and
+                    across different species.
+                    <br />
+                    NOTE: Currently only SNPs, single base deletions and
+                    insertions are supported.
                 </span>
             ),
-            defaultSortDirection: "desc",
+            defaultSortDirection: 'desc',
             visible: false,
-            align: "right"
+            align: 'right',
         };
     }
 
     @computed protected get orderedColumns(): MutationTableColumnType[] {
         const columns = (this.props.columns || []) as MutationTableColumnType[];
 
-        return _.sortBy(columns, (c:MutationTableColumnType) => {
-            let order:number = -1;
+        return _.sortBy(columns, (c: MutationTableColumnType) => {
+            let order: number = -1;
 
             if (this._columns[c] && this._columns[c].order) {
                 order = this._columns[c].order as number;
@@ -655,22 +997,25 @@ export default class MutationTable<P extends IMutationTableProps> extends React.
         });
     }
 
-    @computed protected get columns():Column<Mutation[]>[] {
-        return this.orderedColumns.reduce((columns:Column<Mutation[]>[], next:MutationTableColumnType) => {
-            let column = this._columns[next];
-
+    @computed protected get columns(): Column<Mutation[]>[] {
+        return this.orderedColumns.reduce(
+            (columns: Column<Mutation[]>[], next: MutationTableColumnType) => {
+                let column = this._columns[next];
 
-            if (column && // actual column definition may be missing for a specific enum
-                (!column.shouldExclude || !column.shouldExclude())) {
-                columns.push(column);
-            }
+                if (
+                    column && // actual column definition may be missing for a specific enum
+                    (!column.shouldExclude || !column.shouldExclude())
+                ) {
+                    columns.push(column);
+                }
 
-            return columns;
-        }, []);
+                return columns;
+            },
+            []
+        );
     }
 
-    public render()
-    {
+    public render() {
         return (
             <MutationTableComponent
                 ref={this.tableRef}
diff --git a/src/shared/components/mutationTable/column/AlleleCountColumnFormatter.spec.tsx b/src/shared/components/mutationTable/column/AlleleCountColumnFormatter.spec.tsx
index 78cfaadc72d..d58a1548dfd 100644
--- a/src/shared/components/mutationTable/column/AlleleCountColumnFormatter.spec.tsx
+++ b/src/shared/components/mutationTable/column/AlleleCountColumnFormatter.spec.tsx
@@ -3,55 +3,66 @@ import React from 'react';
 import { assert } from 'chai';
 import { shallow, mount } from 'enzyme';
 import sinon from 'sinon';
-import {Mutation} from "shared/api/generated/CBioPortalAPI";
-import {initMutation} from "test/MutationMockUtils";
+import { Mutation } from 'shared/api/generated/CBioPortalAPI';
+import { initMutation } from 'test/MutationMockUtils';
 
 describe('AlleleCountColumnFormatter', () => {
+    before(() => {});
 
-    before(()=>{
+    after(() => {});
 
-    });
-
-    after(()=>{
-
-    });
-
-    it('ignores invalid allele count values', ()=> {
-        const samples = ["SAMPLE1", "SAMPLE2", "SAMPLE3", "SAMPLE4", "SAMPLE5", "SAMPLE6"];
+    it('ignores invalid allele count values', () => {
+        const samples = [
+            'SAMPLE1',
+            'SAMPLE2',
+            'SAMPLE3',
+            'SAMPLE4',
+            'SAMPLE5',
+            'SAMPLE6',
+        ];
 
         const mutations: Mutation[] = [
             initMutation({
-                sampleId: "SAMPLE1",
-                tumorAltCount: -1
+                sampleId: 'SAMPLE1',
+                tumorAltCount: -1,
             }),
             initMutation({
-                sampleId: "SAMPLE2",
+                sampleId: 'SAMPLE2',
             }),
             initMutation({
-                sampleId: "SAMPLE3",
-                tumorAltCount: 2
+                sampleId: 'SAMPLE3',
+                tumorAltCount: 2,
             }),
             initMutation({
-                sampleId: "SAMPLE4",
-                tumorAltCount: "N/A"
+                sampleId: 'SAMPLE4',
+                tumorAltCount: 'N/A',
             }),
             initMutation({
-                sampleId: "SAMPLE5",
-                tumorAltCount: 6
+                sampleId: 'SAMPLE5',
+                tumorAltCount: 6,
             }),
             initMutation({
-                sampleId: "SAMPLE6",
-                tumorAltCount: null
-            })
+                sampleId: 'SAMPLE6',
+                tumorAltCount: null,
+            }),
         ];
 
         assert.deepEqual(
-            AlleleCountColumnFormatter.getValues(mutations, samples, "tumorAltCount"),
-            ["SAMPLE3: 2", "SAMPLE5: 6"]);
+            AlleleCountColumnFormatter.getValues(
+                mutations,
+                samples,
+                'tumorAltCount'
+            ),
+            ['SAMPLE3: 2', 'SAMPLE5: 6']
+        );
 
         assert.deepEqual(
-            AlleleCountColumnFormatter.getValues(mutations.slice(0, 4), samples, "tumorAltCount"),
-            ["2"]);
+            AlleleCountColumnFormatter.getValues(
+                mutations.slice(0, 4),
+                samples,
+                'tumorAltCount'
+            ),
+            ['2']
+        );
     });
-
 });
diff --git a/src/shared/components/mutationTable/column/AlleleCountColumnFormatter.tsx b/src/shared/components/mutationTable/column/AlleleCountColumnFormatter.tsx
index b0c7d2e2bc3..9e9fd389174 100644
--- a/src/shared/components/mutationTable/column/AlleleCountColumnFormatter.tsx
+++ b/src/shared/components/mutationTable/column/AlleleCountColumnFormatter.tsx
@@ -1,27 +1,33 @@
 import * as React from 'react';
-import {Mutation} from "shared/api/generated/CBioPortalAPI";
-import generalStyles from "./styles.module.scss";
+import { Mutation } from 'shared/api/generated/CBioPortalAPI';
+import generalStyles from './styles.module.scss';
 
 /**
  * Designed to customize allele count column content for patient view page.
  *
  * @author Selcuk Onur Sumer
  */
-export default class AlleleCountColumnFormatter
-{
-    public static getValues(mutations:Mutation[], sampleOrder:string[], dataField:string)
-    {
-        let values:string[] = [];
+export default class AlleleCountColumnFormatter {
+    public static getValues(
+        mutations: Mutation[],
+        sampleOrder: string[],
+        dataField: string
+    ) {
+        let values: string[] = [];
 
-        const sampleToValue:{[key: string]: any} = {};
+        const sampleToValue: { [key: string]: any } = {};
 
         for (const rowDatum of mutations) {
             sampleToValue[rowDatum.sampleId] = (rowDatum as any)[dataField]; // TODO this is not type safe...
         }
 
         // exclude samples with invalid count value (undefined || emtpy || lte 0)
-        const samplesWithValue = sampleOrder.filter(sampleId =>
-            sampleToValue[sampleId] && sampleToValue[sampleId] > 0 && sampleToValue[sampleId].toString().length > 0);
+        const samplesWithValue = sampleOrder.filter(
+            sampleId =>
+                sampleToValue[sampleId] &&
+                sampleToValue[sampleId] > 0 &&
+                sampleToValue[sampleId].toString().length > 0
+        );
 
         // single value: just add the actual value only
         if (samplesWithValue.length === 1) {
@@ -29,33 +35,58 @@ export default class AlleleCountColumnFormatter
         }
         // multiple value: add sample id and value pairs
         else {
-            values = samplesWithValue.map((sampleId:string) => (`${sampleId}: ${sampleToValue[sampleId]}`));
+            values = samplesWithValue.map(
+                (sampleId: string) => `${sampleId}: ${sampleToValue[sampleId]}`
+            );
         }
 
         return values;
     }
 
-    public static getTextValue(data:Mutation[], sampleOrder:string[], dataField:string)
-    {
-        return AlleleCountColumnFormatter.getValues(data, sampleOrder, dataField).join(";");
+    public static getTextValue(
+        data: Mutation[],
+        sampleOrder: string[],
+        dataField: string
+    ) {
+        return AlleleCountColumnFormatter.getValues(
+            data,
+            sampleOrder,
+            dataField
+        ).join(';');
     }
 
-    public static getDisplayValue(data:Mutation[], sampleOrder:string[], dataField:string)
-    {
-        return AlleleCountColumnFormatter.getValues(data, sampleOrder, dataField).join("\n");
+    public static getDisplayValue(
+        data: Mutation[],
+        sampleOrder: string[],
+        dataField: string
+    ) {
+        return AlleleCountColumnFormatter.getValues(
+            data,
+            sampleOrder,
+            dataField
+        ).join('\n');
     }
 
-    public static renderFunction(data:Mutation[], sampleOrder:string[], dataField:string)
-    {
+    public static renderFunction(
+        data: Mutation[],
+        sampleOrder: string[],
+        dataField: string
+    ) {
         return (
-            <div className={generalStyles["integer-data"]}>
-                {AlleleCountColumnFormatter.getDisplayValue(data, sampleOrder, dataField)}
+            <div className={generalStyles['integer-data']}>
+                {AlleleCountColumnFormatter.getDisplayValue(
+                    data,
+                    sampleOrder,
+                    dataField
+                )}
             </div>
         );
     }
-    
-    public static getReads(mutations:Mutation[], dataField:string): string|string[]
-    {
+
+    public static getReads(
+        mutations: Mutation[],
+        dataField: string
+    ): string | string[] {
         let result = [];
         if (mutations) {
             for (let mutation of mutations) {
diff --git a/src/shared/components/mutationTable/column/AnnotationColumnFormatter.spec.tsx b/src/shared/components/mutationTable/column/AnnotationColumnFormatter.spec.tsx
index 6f4dd9d7996..941c1c8297f 100644
--- a/src/shared/components/mutationTable/column/AnnotationColumnFormatter.spec.tsx
+++ b/src/shared/components/mutationTable/column/AnnotationColumnFormatter.spec.tsx
@@ -3,34 +3,36 @@ import React from 'react';
 import { assert } from 'chai';
 import { shallow, mount } from 'enzyme';
 import sinon from 'sinon';
-import {getCivicGenes, getMutationCivicVariants, getMutationData, getExpectedCivicEntry} from "test/CivicMockUtils";
-import {ICivicEntry} from "shared/model/Civic";
+import {
+    getCivicGenes,
+    getMutationCivicVariants,
+    getMutationData,
+    getExpectedCivicEntry,
+} from 'test/CivicMockUtils';
+import { ICivicEntry } from 'shared/model/Civic';
 
 describe('AnnotationColumnFormatter', () => {
+    before(() => {});
 
-    before(() => {
-
-    });
-
-    after(() => {
-
-    });
+    after(() => {});
 
     it('properly creates a civic entry', () => {
-
         let civicGenes = getCivicGenes();
 
         let civicVariants = getMutationCivicVariants();
-        
+
         let mutation = getMutationData();
 
         let expectedCivicEntry = getExpectedCivicEntry();
 
         assert.deepEqual(
-            AnnotationColumnFormatter.getCivicEntry(mutation, civicGenes, civicVariants), expectedCivicEntry,
-            'Equal Civic Entry');
-
+            AnnotationColumnFormatter.getCivicEntry(
+                mutation,
+                civicGenes,
+                civicVariants
+            ),
+            expectedCivicEntry,
+            'Equal Civic Entry'
+        );
     });
-
-
 });
diff --git a/src/shared/components/mutationTable/column/AnnotationColumnFormatter.tsx b/src/shared/components/mutationTable/column/AnnotationColumnFormatter.tsx
index 32faf11c951..b53c6862cec 100644
--- a/src/shared/components/mutationTable/column/AnnotationColumnFormatter.tsx
+++ b/src/shared/components/mutationTable/column/AnnotationColumnFormatter.tsx
@@ -1,31 +1,46 @@
 import * as React from 'react';
-import {If} from 'react-if';
-import * as _ from "lodash";
+import { If } from 'react-if';
+import * as _ from 'lodash';
 import {
     HotspotAnnotation,
     hotspotAnnotationSortValue,
     OncoKB,
     oncoKbAnnotationDownload,
-    oncoKbAnnotationSortValue
-} from "react-mutation-mapper";
-import OncoKbEvidenceCache from "shared/cache/OncoKbEvidenceCache";
-import OncokbPubMedCache from "shared/cache/PubMedCache";
-import MyCancerGenome from "shared/components/annotation/MyCancerGenome";
-import Civic from "shared/components/annotation/Civic";
-import {IOncoKbCancerGenesWrapper, IOncoKbData, IOncoKbDataWrapper} from "shared/model/OncoKB";
-import {IMyCancerGenomeData, IMyCancerGenome} from "shared/model/MyCancerGenome";
-import {IHotspotDataWrapper} from "shared/model/CancerHotspots";
-import {CancerStudy, Mutation} from "shared/api/generated/CBioPortalAPI";
+    oncoKbAnnotationSortValue,
+} from 'react-mutation-mapper';
+import OncoKbEvidenceCache from 'shared/cache/OncoKbEvidenceCache';
+import OncokbPubMedCache from 'shared/cache/PubMedCache';
+import MyCancerGenome from 'shared/components/annotation/MyCancerGenome';
+import Civic from 'shared/components/annotation/Civic';
+import {
+    IOncoKbCancerGenesWrapper,
+    IOncoKbData,
+    IOncoKbDataWrapper,
+} from 'shared/model/OncoKB';
+import {
+    IMyCancerGenomeData,
+    IMyCancerGenome,
+} from 'shared/model/MyCancerGenome';
+import { IHotspotDataWrapper } from 'shared/model/CancerHotspots';
+import { CancerStudy, Mutation } from 'shared/api/generated/CBioPortalAPI';
 import {
     CancerGene,
     generateQueryVariantId,
     IndicatorQueryResp,
-    Query
-} from "cbioportal-frontend-commons";
-import {getEvidenceQuery} from "shared/lib/OncoKbUtils";
-import {is3dHotspot, isRecurrentHotspot} from "shared/lib/AnnotationUtils";
-import {ICivicVariant, ICivicGene, ICivicEntry, ICivicVariantData, ICivicGeneData, ICivicGeneDataWrapper, ICivicVariantDataWrapper} from "shared/model/Civic.ts";
-import {buildCivicEntry} from "shared/lib/CivicUtils";
+    Query,
+} from 'cbioportal-frontend-commons';
+import { getEvidenceQuery } from 'shared/lib/OncoKbUtils';
+import { is3dHotspot, isRecurrentHotspot } from 'shared/lib/AnnotationUtils';
+import {
+    ICivicVariant,
+    ICivicGene,
+    ICivicEntry,
+    ICivicVariantData,
+    ICivicGeneData,
+    ICivicGeneDataWrapper,
+    ICivicVariantDataWrapper,
+} from 'shared/model/Civic.ts';
+import { buildCivicEntry } from 'shared/lib/CivicUtils';
 
 export interface IAnnotationColumnProps {
     enableOncoKb: boolean;
@@ -36,125 +51,167 @@ export interface IAnnotationColumnProps {
     myCancerGenomeData?: IMyCancerGenomeData;
     oncoKbData?: IOncoKbDataWrapper;
     oncoKbEvidenceCache?: OncoKbEvidenceCache;
-    oncoKbCancerGenes? :IOncoKbCancerGenesWrapper;
+    oncoKbCancerGenes?: IOncoKbCancerGenesWrapper;
     pubMedCache?: OncokbPubMedCache;
-    userEmailAddress?:string;
+    userEmailAddress?: string;
     civicGenes?: ICivicGeneDataWrapper;
     civicVariants?: ICivicVariantDataWrapper;
-    studyIdToStudy?: {[studyId:string]:CancerStudy};
+    studyIdToStudy?: { [studyId: string]: CancerStudy };
 }
 
 export interface IAnnotation {
     isHotspot: boolean;
     is3dHotspot: boolean;
-    hotspotStatus: "pending" | "error" | "complete";
+    hotspotStatus: 'pending' | 'error' | 'complete';
     myCancerGenomeLinks: string[];
     oncoKbIndicator?: IndicatorQueryResp;
-    oncoKbStatus: "pending" | "error" | "complete";
-    oncoKbGeneExist:boolean;
-    isOncoKbCancerGene:boolean;
+    oncoKbStatus: 'pending' | 'error' | 'complete';
+    oncoKbGeneExist: boolean;
+    isOncoKbCancerGene: boolean;
     civicEntry?: ICivicEntry | null;
-    civicStatus: "pending" | "error" | "complete";
+    civicStatus: 'pending' | 'error' | 'complete';
     hasCivicVariants: boolean;
-    hugoGeneSymbol:string;
+    hugoGeneSymbol: string;
 }
 
 /**
  * @author Selcuk Onur Sumer
  */
-export default class AnnotationColumnFormatter
-{
-    public static get DEFAULT_ANNOTATION_DATA(): IAnnotation
-    {
+export default class AnnotationColumnFormatter {
+    public static get DEFAULT_ANNOTATION_DATA(): IAnnotation {
         return {
-            oncoKbStatus: "complete",
+            oncoKbStatus: 'complete',
             oncoKbGeneExist: false,
             isOncoKbCancerGene: false,
             myCancerGenomeLinks: [],
             isHotspot: false,
             is3dHotspot: false,
-            hotspotStatus: "complete",
+            hotspotStatus: 'complete',
             hasCivicVariants: true,
             hugoGeneSymbol: '',
-            civicStatus: "complete"
+            civicStatus: 'complete',
         };
     }
 
-    public static getData(rowData:Mutation[]|undefined,
-                          oncoKbCancerGenes?:IOncoKbCancerGenesWrapper,
-                          hotspotData?:IHotspotDataWrapper,
-                          myCancerGenomeData?:IMyCancerGenomeData,
-                          oncoKbData?:IOncoKbDataWrapper,
-                          civicGenes?:ICivicGeneDataWrapper,
-                          civicVariants?:ICivicVariantDataWrapper,
-                          studyIdToStudy?: {[studyId:string]:CancerStudy})
-    {
+    public static getData(
+        rowData: Mutation[] | undefined,
+        oncoKbCancerGenes?: IOncoKbCancerGenesWrapper,
+        hotspotData?: IHotspotDataWrapper,
+        myCancerGenomeData?: IMyCancerGenomeData,
+        oncoKbData?: IOncoKbDataWrapper,
+        civicGenes?: ICivicGeneDataWrapper,
+        civicVariants?: ICivicVariantDataWrapper,
+        studyIdToStudy?: { [studyId: string]: CancerStudy }
+    ) {
         let value: Partial<IAnnotation>;
 
         if (rowData) {
             const mutation = rowData[0];
 
-            let oncoKbIndicator: IndicatorQueryResp|undefined;
+            let oncoKbIndicator: IndicatorQueryResp | undefined;
             let hugoGeneSymbol = mutation.gene.hugoGeneSymbol;
 
             let oncoKbGeneExist = false;
             let isOncoKbCancerGene = false;
-            if( oncoKbCancerGenes && !(oncoKbCancerGenes instanceof Error)) {
-                oncoKbGeneExist = _.find(oncoKbCancerGenes.result, (gene: CancerGene) => gene.oncokbAnnotated && gene.entrezGeneId === mutation.entrezGeneId) !== undefined;
-                isOncoKbCancerGene = _.find(oncoKbCancerGenes.result, (gene: CancerGene) => gene.entrezGeneId === mutation.entrezGeneId) !== undefined;
+            if (oncoKbCancerGenes && !(oncoKbCancerGenes instanceof Error)) {
+                oncoKbGeneExist =
+                    _.find(
+                        oncoKbCancerGenes.result,
+                        (gene: CancerGene) =>
+                            gene.oncokbAnnotated &&
+                            gene.entrezGeneId === mutation.entrezGeneId
+                    ) !== undefined;
+                isOncoKbCancerGene =
+                    _.find(
+                        oncoKbCancerGenes.result,
+                        (gene: CancerGene) =>
+                            gene.entrezGeneId === mutation.entrezGeneId
+                    ) !== undefined;
             }
 
             value = {
                 hugoGeneSymbol,
                 oncoKbGeneExist,
                 isOncoKbCancerGene,
-                civicEntry: civicGenes && civicGenes.result && civicVariants && civicVariants.result ?
-                    AnnotationColumnFormatter.getCivicEntry(mutation, civicGenes.result, civicVariants.result) : undefined,
-                civicStatus: civicGenes && civicGenes.status && civicVariants && civicVariants.status ?
-                        AnnotationColumnFormatter.getCivicStatus(civicGenes.status, civicVariants.status) : "pending",
+                civicEntry:
+                    civicGenes &&
+                    civicGenes.result &&
+                    civicVariants &&
+                    civicVariants.result
+                        ? AnnotationColumnFormatter.getCivicEntry(
+                              mutation,
+                              civicGenes.result,
+                              civicVariants.result
+                          )
+                        : undefined,
+                civicStatus:
+                    civicGenes &&
+                    civicGenes.status &&
+                    civicVariants &&
+                    civicVariants.status
+                        ? AnnotationColumnFormatter.getCivicStatus(
+                              civicGenes.status,
+                              civicVariants.status
+                          )
+                        : 'pending',
                 hasCivicVariants: true,
-                myCancerGenomeLinks: myCancerGenomeData ?
-                    AnnotationColumnFormatter.getMyCancerGenomeLinks(mutation, myCancerGenomeData) : [],
-                isHotspot: hotspotData && hotspotData.result && hotspotData.status === "complete" ?
-                    isRecurrentHotspot(mutation, hotspotData.result) : false,
-                is3dHotspot: hotspotData && hotspotData.result && hotspotData.status === "complete" ?
-                    is3dHotspot(mutation, hotspotData.result) : false,
-                hotspotStatus: hotspotData ? hotspotData.status : "pending"
+                myCancerGenomeLinks: myCancerGenomeData
+                    ? AnnotationColumnFormatter.getMyCancerGenomeLinks(
+                          mutation,
+                          myCancerGenomeData
+                      )
+                    : [],
+                isHotspot:
+                    hotspotData &&
+                    hotspotData.result &&
+                    hotspotData.status === 'complete'
+                        ? isRecurrentHotspot(mutation, hotspotData.result)
+                        : false,
+                is3dHotspot:
+                    hotspotData &&
+                    hotspotData.result &&
+                    hotspotData.status === 'complete'
+                        ? is3dHotspot(mutation, hotspotData.result)
+                        : false,
+                hotspotStatus: hotspotData ? hotspotData.status : 'pending',
             };
 
             // oncoKbData may exist but it might be an instance of Error, in that case we flag the status as error
             if (oncoKbData && oncoKbData.result instanceof Error) {
                 value = {
                     ...value,
-                    oncoKbStatus: "error",
-                    oncoKbIndicator: undefined
+                    oncoKbStatus: 'error',
+                    oncoKbIndicator: undefined,
                 };
-            }
-            else if (oncoKbGeneExist) {
+            } else if (oncoKbGeneExist) {
                 // actually, oncoKbData.result shouldn't be an instance of Error in this case (we already check it above),
                 // but we need to check it again in order to avoid TS errors/warnings
-                if (oncoKbData &&
+                if (
+                    oncoKbData &&
                     oncoKbData.result &&
                     !(oncoKbData.result instanceof Error) &&
-                    oncoKbData.status === "complete")
-                {
-                    oncoKbIndicator = AnnotationColumnFormatter.getIndicatorData(mutation, oncoKbData.result, studyIdToStudy);
+                    oncoKbData.status === 'complete'
+                ) {
+                    oncoKbIndicator = AnnotationColumnFormatter.getIndicatorData(
+                        mutation,
+                        oncoKbData.result,
+                        studyIdToStudy
+                    );
                 }
 
                 value = {
                     ...value,
-                    oncoKbStatus: oncoKbData ? oncoKbData.status : "pending",
+                    oncoKbStatus: oncoKbData ? oncoKbData.status : 'pending',
                     oncoKbIndicator,
                 };
             } else {
                 value = {
                     ...value,
-                    oncoKbStatus: "complete",
-                    oncoKbIndicator: undefined
+                    oncoKbStatus: 'complete',
+                    oncoKbIndicator: undefined,
                 };
             }
-        }
-        else {
+        } else {
             value = AnnotationColumnFormatter.DEFAULT_ANNOTATION_DATA;
         }
 
@@ -164,39 +221,59 @@ export default class AnnotationColumnFormatter
     /**
      * Returns an ICivicEntry if the civicGenes and civicVariants have information about the gene and the mutation (variant) specified. Otherwise it returns null.
      */
-    public static getCivicEntry(mutation:Mutation, civicGenes:ICivicGene, civicVariants:ICivicVariant): ICivicEntry | null
-    {
+    public static getCivicEntry(
+        mutation: Mutation,
+        civicGenes: ICivicGene,
+        civicVariants: ICivicVariant
+    ): ICivicEntry | null {
         let geneSymbol: string = mutation.gene.hugoGeneSymbol;
         let civicEntry = null;
         //Only search for matching Civic variants if the gene mutation exists in the Civic API
-        if (civicGenes[geneSymbol] && civicVariants[geneSymbol] && civicVariants[geneSymbol][mutation.proteinChange]) {
-            let geneVariants: {[name: string]: ICivicVariantData} = {[mutation.proteinChange]: civicVariants[geneSymbol][mutation.proteinChange]};
+        if (
+            civicGenes[geneSymbol] &&
+            civicVariants[geneSymbol] &&
+            civicVariants[geneSymbol][mutation.proteinChange]
+        ) {
+            let geneVariants: { [name: string]: ICivicVariantData } = {
+                [mutation.proteinChange]:
+                    civicVariants[geneSymbol][mutation.proteinChange],
+            };
             let geneEntry: ICivicGeneData = civicGenes[geneSymbol];
             civicEntry = buildCivicEntry(geneEntry, geneVariants);
         }
 
         return civicEntry;
     }
-    
-    public static getCivicStatus(civicGenesStatus:"pending" | "error" | "complete",
-                                 civicVariantsStatus:"pending" | "error" | "complete"): "pending" | "error" | "complete"
-    {
-        if (civicGenesStatus === "error" || civicVariantsStatus === "error") {
-            return "error";
+
+    public static getCivicStatus(
+        civicGenesStatus: 'pending' | 'error' | 'complete',
+        civicVariantsStatus: 'pending' | 'error' | 'complete'
+    ): 'pending' | 'error' | 'complete' {
+        if (civicGenesStatus === 'error' || civicVariantsStatus === 'error') {
+            return 'error';
         }
-        if (civicGenesStatus === "complete" && civicVariantsStatus === "complete") {
-            return "complete";
+        if (
+            civicGenesStatus === 'complete' &&
+            civicVariantsStatus === 'complete'
+        ) {
+            return 'complete';
         }
 
-        return "pending";
+        return 'pending';
     }
 
-    public static getIndicatorData(mutation:Mutation, oncoKbData:IOncoKbData, studyIdToStudy?: {[studyId:string]:CancerStudy}): IndicatorQueryResp|undefined
-    {
-        if (oncoKbData.uniqueSampleKeyToTumorType === null || oncoKbData.indicatorMap === null) {
+    public static getIndicatorData(
+        mutation: Mutation,
+        oncoKbData: IOncoKbData,
+        studyIdToStudy?: { [studyId: string]: CancerStudy }
+    ): IndicatorQueryResp | undefined {
+        if (
+            oncoKbData.uniqueSampleKeyToTumorType === null ||
+            oncoKbData.indicatorMap === null
+        ) {
             return undefined;
         }
-        
+
         const id = generateQueryVariantId(
             mutation.gene.entrezGeneId,
             oncoKbData.uniqueSampleKeyToTumorType[mutation.uniqueSampleKey],
@@ -208,7 +285,7 @@ export default class AnnotationColumnFormatter
 
         if (indicator && indicator.query.tumorType === null && studyIdToStudy) {
             const studyMetaData = studyIdToStudy[mutation.studyId];
-            if (studyMetaData.cancerTypeId !== "mixed") {           
+            if (studyMetaData.cancerTypeId !== 'mixed') {
                 indicator.query.tumorType = studyMetaData.cancerType.name;
             }
         }
@@ -216,86 +293,132 @@ export default class AnnotationColumnFormatter
         return indicator;
     }
 
-    public static getEvidenceQuery(mutation:Mutation, oncoKbData:IOncoKbData): Query|undefined
-    {
+    public static getEvidenceQuery(
+        mutation: Mutation,
+        oncoKbData: IOncoKbData
+    ): Query | undefined {
         return getEvidenceQuery(mutation, oncoKbData);
     }
 
-    public static getMyCancerGenomeLinks(mutation:Mutation, myCancerGenomeData: IMyCancerGenomeData):string[] {
-        const myCancerGenomes:IMyCancerGenome[]|null = myCancerGenomeData[mutation.gene.hugoGeneSymbol];
-        let links:string[] = [];
+    public static getMyCancerGenomeLinks(
+        mutation: Mutation,
+        myCancerGenomeData: IMyCancerGenomeData
+    ): string[] {
+        const myCancerGenomes: IMyCancerGenome[] | null =
+            myCancerGenomeData[mutation.gene.hugoGeneSymbol];
+        let links: string[] = [];
 
         if (myCancerGenomes) {
             // further filtering required by alteration field
-            links = AnnotationColumnFormatter.filterByAlteration(mutation, myCancerGenomes).map(
-                (myCancerGenome:IMyCancerGenome) => myCancerGenome.linkHTML);
+            links = AnnotationColumnFormatter.filterByAlteration(
+                mutation,
+                myCancerGenomes
+            ).map((myCancerGenome: IMyCancerGenome) => myCancerGenome.linkHTML);
         }
 
         return links;
     }
 
     // TODO for now ignoring anything but protein change position, this needs to be improved!
-    public static filterByAlteration(mutation:Mutation, myCancerGenomes:IMyCancerGenome[]):IMyCancerGenome[]
-    {
-        return myCancerGenomes.filter((myCancerGenome:IMyCancerGenome) => {
-            const proteinChangeRegExp:RegExp = /^[A-Za-z][0-9]+[A-Za-z]/;
-            const numericalRegExp:RegExp = /[0-9]+/;
-
-            const matched = myCancerGenome.alteration.trim().match(proteinChangeRegExp);
-
-            if (matched && mutation.proteinChange)
-            {
-                const mutationPos = mutation.proteinChange.match(numericalRegExp);
-                const alterationPos = myCancerGenome.alteration.match(numericalRegExp);
-
-                return (mutationPos && alterationPos && mutationPos[0] === alterationPos[0]);
+    public static filterByAlteration(
+        mutation: Mutation,
+        myCancerGenomes: IMyCancerGenome[]
+    ): IMyCancerGenome[] {
+        return myCancerGenomes.filter((myCancerGenome: IMyCancerGenome) => {
+            const proteinChangeRegExp: RegExp = /^[A-Za-z][0-9]+[A-Za-z]/;
+            const numericalRegExp: RegExp = /[0-9]+/;
+
+            const matched = myCancerGenome.alteration
+                .trim()
+                .match(proteinChangeRegExp);
+
+            if (matched && mutation.proteinChange) {
+                const mutationPos = mutation.proteinChange.match(
+                    numericalRegExp
+                );
+                const alterationPos = myCancerGenome.alteration.match(
+                    numericalRegExp
+                );
+
+                return (
+                    mutationPos &&
+                    alterationPos &&
+                    mutationPos[0] === alterationPos[0]
+                );
             }
 
             return false;
         });
     }
 
-    public static sortValue(data:Mutation[],
-                            oncoKbCancerGenes?: IOncoKbCancerGenesWrapper,
-                            hotspotData?: IHotspotDataWrapper,
-                            myCancerGenomeData?:IMyCancerGenomeData,
-                            oncoKbData?: IOncoKbDataWrapper,
-                            civicGenes?: ICivicGeneDataWrapper,
-                            civicVariants?: ICivicVariantDataWrapper):number[] {
-        const annotationData:IAnnotation = AnnotationColumnFormatter.getData(
-            data, oncoKbCancerGenes, hotspotData, myCancerGenomeData, oncoKbData, civicGenes, civicVariants);
+    public static sortValue(
+        data: Mutation[],
+        oncoKbCancerGenes?: IOncoKbCancerGenesWrapper,
+        hotspotData?: IHotspotDataWrapper,
+        myCancerGenomeData?: IMyCancerGenomeData,
+        oncoKbData?: IOncoKbDataWrapper,
+        civicGenes?: ICivicGeneDataWrapper,
+        civicVariants?: ICivicVariantDataWrapper
+    ): number[] {
+        const annotationData: IAnnotation = AnnotationColumnFormatter.getData(
+            data,
+            oncoKbCancerGenes,
+            hotspotData,
+            myCancerGenomeData,
+            oncoKbData,
+            civicGenes,
+            civicVariants
+        );
 
         return _.flatten([
             oncoKbAnnotationSortValue(annotationData.oncoKbIndicator),
             Civic.sortValue(annotationData.civicEntry),
             MyCancerGenome.sortValue(annotationData.myCancerGenomeLinks),
-            hotspotAnnotationSortValue(annotationData.isHotspot, annotationData.is3dHotspot), annotationData.isOncoKbCancerGene ? 1 : 0
+            hotspotAnnotationSortValue(
+                annotationData.isHotspot,
+                annotationData.is3dHotspot
+            ),
+            annotationData.isOncoKbCancerGene ? 1 : 0,
         ]);
     }
 
-    public static download(data:Mutation[]|undefined,
-                           oncoKbCancerGenes?: IOncoKbCancerGenesWrapper,
-                           hotspotData?:IHotspotDataWrapper,
-                           myCancerGenomeData?:IMyCancerGenomeData,
-                           oncoKbData?:IOncoKbDataWrapper,
-                           civicGenes?:ICivicGeneDataWrapper,
-                           civicVariants?:ICivicVariantDataWrapper)
-    {
-        const annotationData:IAnnotation = AnnotationColumnFormatter.getData(
-            data, oncoKbCancerGenes, hotspotData, myCancerGenomeData, oncoKbData, civicGenes, civicVariants);
+    public static download(
+        data: Mutation[] | undefined,
+        oncoKbCancerGenes?: IOncoKbCancerGenesWrapper,
+        hotspotData?: IHotspotDataWrapper,
+        myCancerGenomeData?: IMyCancerGenomeData,
+        oncoKbData?: IOncoKbDataWrapper,
+        civicGenes?: ICivicGeneDataWrapper,
+        civicVariants?: ICivicVariantDataWrapper
+    ) {
+        const annotationData: IAnnotation = AnnotationColumnFormatter.getData(
+            data,
+            oncoKbCancerGenes,
+            hotspotData,
+            myCancerGenomeData,
+            oncoKbData,
+            civicGenes,
+            civicVariants
+        );
 
         return [
-            `OncoKB: ${oncoKbAnnotationDownload(annotationData.oncoKbIndicator)}`,
+            `OncoKB: ${oncoKbAnnotationDownload(
+                annotationData.oncoKbIndicator
+            )}`,
             `CIViC: ${Civic.download(annotationData.civicEntry)}`,
-            `MyCancerGenome: ${MyCancerGenome.download(annotationData.myCancerGenomeLinks)}`,
+            `MyCancerGenome: ${MyCancerGenome.download(
+                annotationData.myCancerGenomeLinks
+            )}`,
             `CancerHotspot: ${annotationData.isHotspot ? 'yes' : 'no'}`,
             `3DHotspot: ${annotationData.is3dHotspot ? 'yes' : 'no'}`,
-        ].join(";");
+        ].join(';');
     }
 
-    public static renderFunction(data:Mutation[], columnProps:IAnnotationColumnProps)
-    {
-        const annotation:IAnnotation = AnnotationColumnFormatter.getData(
+    public static renderFunction(
+        data: Mutation[],
+        columnProps: IAnnotationColumnProps
+    ) {
+        const annotation: IAnnotation = AnnotationColumnFormatter.getData(
             data,
             columnProps.oncoKbCancerGenes,
             columnProps.hotspotData,
@@ -303,32 +426,40 @@ export default class AnnotationColumnFormatter
             columnProps.oncoKbData,
             columnProps.civicGenes,
             columnProps.civicVariants,
-            columnProps.studyIdToStudy);
+            columnProps.studyIdToStudy
+        );
 
-        let evidenceQuery:Query|undefined;
+        let evidenceQuery: Query | undefined;
 
-        if (columnProps.oncoKbData &&
+        if (
+            columnProps.oncoKbData &&
             columnProps.oncoKbData.result &&
-            !(columnProps.oncoKbData.result instanceof Error))
-        {
-            evidenceQuery = this.getEvidenceQuery(data[0], columnProps.oncoKbData.result);
+            !(columnProps.oncoKbData.result instanceof Error)
+        ) {
+            evidenceQuery = this.getEvidenceQuery(
+                data[0],
+                columnProps.oncoKbData.result
+            );
         }
-        
-        return AnnotationColumnFormatter.mainContent(annotation,
+
+        return AnnotationColumnFormatter.mainContent(
+            annotation,
             columnProps,
             columnProps.oncoKbEvidenceCache,
             evidenceQuery,
-            columnProps.pubMedCache);
+            columnProps.pubMedCache
+        );
     }
 
-    public static mainContent(annotation:IAnnotation,
-                              columnProps:IAnnotationColumnProps,
-                              evidenceCache?: OncoKbEvidenceCache,
-                              evidenceQuery?: Query,
-                              pubMedCache?:OncokbPubMedCache)
-    {
+    public static mainContent(
+        annotation: IAnnotation,
+        columnProps: IAnnotationColumnProps,
+        evidenceCache?: OncoKbEvidenceCache,
+        evidenceQuery?: Query,
+        pubMedCache?: OncokbPubMedCache
+    ) {
         return (
-            <span style={{display:'flex', minWidth:100}}>
+            <span style={{ display: 'flex', minWidth: 100 }}>
                 <If condition={columnProps.enableOncoKb || false}>
                     <OncoKB
                         hugoGeneSymbol={annotation.hugoGeneSymbol}
diff --git a/src/shared/components/mutationTable/column/CancerTypeColumnFormatter.tsx b/src/shared/components/mutationTable/column/CancerTypeColumnFormatter.tsx
index fbdec65331b..7c5a068fc02 100644
--- a/src/shared/components/mutationTable/column/CancerTypeColumnFormatter.tsx
+++ b/src/shared/components/mutationTable/column/CancerTypeColumnFormatter.tsx
@@ -1,14 +1,18 @@
-import * as React from "react";
-import * as _ from "lodash";
-import {Mutation} from "shared/api/generated/CBioPortalAPI";
-import {TableCellStatusIndicator, TableCellStatus} from "cbioportal-frontend-commons";
-import TruncatedText from "shared/components/TruncatedText";
+import * as React from 'react';
+import * as _ from 'lodash';
+import { Mutation } from 'shared/api/generated/CBioPortalAPI';
+import {
+    TableCellStatusIndicator,
+    TableCellStatus,
+} from 'cbioportal-frontend-commons';
+import TruncatedText from 'shared/components/TruncatedText';
 
 export default class CancerTypeColumnFormatter {
-
-    public static getData(d: Mutation[], uniqueSampleKeyToTumorType?: {[uniqueSampleKey: string]: string}): string|null
-    {
-        let data: string|null = null;
+    public static getData(
+        d: Mutation[],
+        uniqueSampleKeyToTumorType?: { [uniqueSampleKey: string]: string }
+    ): string | null {
+        let data: string | null = null;
 
         if (uniqueSampleKeyToTumorType) {
             data = uniqueSampleKeyToTumorType[d[0].uniqueSampleKey] || null;
@@ -17,40 +21,52 @@ export default class CancerTypeColumnFormatter {
         return data;
     }
 
-    public static sortBy(d: Mutation[], uniqueSampleKeyToTumorType?: {[uniqueSampleKey: string]: string}): string|null
-    {
-        const data = CancerTypeColumnFormatter.getData(d, uniqueSampleKeyToTumorType);
+    public static sortBy(
+        d: Mutation[],
+        uniqueSampleKeyToTumorType?: { [uniqueSampleKey: string]: string }
+    ): string | null {
+        const data = CancerTypeColumnFormatter.getData(
+            d,
+            uniqueSampleKeyToTumorType
+        );
 
         if (data) {
             return data;
-        }
-        else {
+        } else {
             return null;
         }
     }
 
-    public static filter(d: Mutation[],
-                         filterStringUpper: string,
-                         uniqueSampleKeyToTumorType?: {[uniqueSampleKey: string]: string}): boolean
-    {
-        const data = CancerTypeColumnFormatter.getData(d, uniqueSampleKeyToTumorType);
+    public static filter(
+        d: Mutation[],
+        filterStringUpper: string,
+        uniqueSampleKeyToTumorType?: { [uniqueSampleKey: string]: string }
+    ): boolean {
+        const data = CancerTypeColumnFormatter.getData(
+            d,
+            uniqueSampleKeyToTumorType
+        );
 
         return (
-            data !== null &&
-            data.toUpperCase().indexOf(filterStringUpper) > -1
+            data !== null && data.toUpperCase().indexOf(filterStringUpper) > -1
         );
     }
 
-    public static isVisible(mutations?: Mutation[][], uniqueSampleKeyToTumorType?: {[uniqueSampleKey: string]: string}): boolean
-    {
+    public static isVisible(
+        mutations?: Mutation[][],
+        uniqueSampleKeyToTumorType?: { [uniqueSampleKey: string]: string }
+    ): boolean {
         if (!mutations || !uniqueSampleKeyToTumorType) {
             return false;
         }
 
-        const tumorTypeToSampleId: {[tumorType: string]: string} = {};
+        const tumorTypeToSampleId: { [tumorType: string]: string } = {};
 
         mutations.forEach((d: Mutation[]) => {
-            const tumorType = CancerTypeColumnFormatter.getData(d, uniqueSampleKeyToTumorType);
+            const tumorType = CancerTypeColumnFormatter.getData(
+                d,
+                uniqueSampleKeyToTumorType
+            );
 
             if (tumorType) {
                 tumorTypeToSampleId[tumorType] = d[0].sampleId;
@@ -61,25 +77,34 @@ export default class CancerTypeColumnFormatter {
         return _.keys(tumorTypeToSampleId).length > 1;
     }
 
-    public static download(d: Mutation[], uniqueSampleKeyToTumorType?: {[uniqueSampleKey: string]: string})
-    {
-        return CancerTypeColumnFormatter.getData(d, uniqueSampleKeyToTumorType) || "";
+    public static download(
+        d: Mutation[],
+        uniqueSampleKeyToTumorType?: { [uniqueSampleKey: string]: string }
+    ) {
+        return (
+            CancerTypeColumnFormatter.getData(d, uniqueSampleKeyToTumorType) ||
+            ''
+        );
     }
 
-    public static render(d: Mutation[], uniqueSampleKeyToTumorType?: {[uniqueSampleKey: string]: string})
-    {
-        const data = CancerTypeColumnFormatter.getData(d, uniqueSampleKeyToTumorType);
+    public static render(
+        d: Mutation[],
+        uniqueSampleKeyToTumorType?: { [uniqueSampleKey: string]: string }
+    ) {
+        const data = CancerTypeColumnFormatter.getData(
+            d,
+            uniqueSampleKeyToTumorType
+        );
 
         if (data) {
             return (
                 <TruncatedText
                     maxLength={30}
-                    text={data || ""}
-                    tooltip={<div style={{maxWidth: 300}}>{data}</div>}
+                    text={data || ''}
+                    tooltip={<div style={{ maxWidth: 300 }}>{data}</div>}
                 />
             );
-        }
-        else {
+        } else {
             return (
                 <TableCellStatusIndicator
                     status={TableCellStatus.NA}
diff --git a/src/shared/components/mutationTable/column/CancerTypeColumnFormatterLazyLoaded.tsx b/src/shared/components/mutationTable/column/CancerTypeColumnFormatterLazyLoaded.tsx
index b3e27fda360..c8a570a8c85 100644
--- a/src/shared/components/mutationTable/column/CancerTypeColumnFormatterLazyLoaded.tsx
+++ b/src/shared/components/mutationTable/column/CancerTypeColumnFormatterLazyLoaded.tsx
@@ -1,32 +1,38 @@
-import * as React from "react";
-import LazyLoadedTableCell from "shared/lib/LazyLoadedTableCell";
-import {Mutation} from "../../../api/generated/CBioPortalAPI";
-import CancerTypeCache from "../../../cache/CancerTypeCache";
-import {CacheData} from "../../../lib/LazyMobXCache";
+import * as React from 'react';
+import LazyLoadedTableCell from 'shared/lib/LazyLoadedTableCell';
+import { Mutation } from '../../../api/generated/CBioPortalAPI';
+import CancerTypeCache from '../../../cache/CancerTypeCache';
+import { CacheData } from '../../../lib/LazyMobXCache';
 
 export default class CancerTypeColumnFormatter {
-
-    public static getData(d: Mutation[],
-                          studyId?: string,
-                          cancerTypeCache?: CancerTypeCache,
-                          studyCancerTypeMap?: {[studyId:string]:string}): CacheData<{value:string}>|null
-    {
+    public static getData(
+        d: Mutation[],
+        studyId?: string,
+        cancerTypeCache?: CancerTypeCache,
+        studyCancerTypeMap?: { [studyId: string]: string }
+    ): CacheData<{ value: string }> | null {
         if (cancerTypeCache && studyId) {
-            let cacheDatum:CacheData<{value:string}>|null = cancerTypeCache.get({
+            let cacheDatum: CacheData<{
+                value: string;
+            }> | null = cancerTypeCache.get({
                 entityId: d[0].sampleId,
-                studyId
+                studyId,
             });
 
-            if (cacheDatum && cacheDatum.status === "complete" && cacheDatum.data === null) {
+            if (
+                cacheDatum &&
+                cacheDatum.status === 'complete' &&
+                cacheDatum.data === null
+            ) {
                 // If no clinical data, use study cancer type if we have it
                 if (studyCancerTypeMap) {
                     const cancerType = studyCancerTypeMap[studyId];
                     if (cancerType) {
                         cacheDatum = {
-                            status: "complete",
+                            status: 'complete',
                             data: {
-                                value: cancerType
-                            }
+                                value: cancerType,
+                            },
                         };
                     }
                 }
@@ -34,30 +40,41 @@ export default class CancerTypeColumnFormatter {
             return cacheDatum;
         } else {
             return {
-                status: "error",
-                data: null
+                status: 'error',
+                data: null,
             };
         }
     }
 
-    public static makeRenderFunction(studyId?: string,
-                                     cancerTypeCache?: CancerTypeCache,
-                                     studyCancerTypeMap?: {[studyId:string]:string}) {
-        return LazyLoadedTableCell<Mutation[], {value:string}>(
-            (d:Mutation[])=>{
-                return CancerTypeColumnFormatter.getData(d, studyId, cancerTypeCache, studyCancerTypeMap);
+    public static makeRenderFunction(
+        studyId?: string,
+        cancerTypeCache?: CancerTypeCache,
+        studyCancerTypeMap?: { [studyId: string]: string }
+    ) {
+        return LazyLoadedTableCell<Mutation[], { value: string }>(
+            (d: Mutation[]) => {
+                return CancerTypeColumnFormatter.getData(
+                    d,
+                    studyId,
+                    cancerTypeCache,
+                    studyCancerTypeMap
+                );
             },
-            (t:{value:string})=>(<span>{t.value}</span>),
-            "Cancer type not available for this sample."
+            (t: { value: string }) => <span>{t.value}</span>,
+            'Cancer type not available for this sample.'
         );
     }
 
-    public static sortBy(d:Mutation[], studyId?:string, cancerTypeCache?:CancerTypeCache) {
+    public static sortBy(
+        d: Mutation[],
+        studyId?: string,
+        cancerTypeCache?: CancerTypeCache
+    ) {
         let ret;
         if (cancerTypeCache && studyId) {
             const cacheDatum = cancerTypeCache.get({
-                entityId:d[0].sampleId,
-                studyId: studyId
+                entityId: d[0].sampleId,
+                studyId: studyId,
             });
             if (cacheDatum && cacheDatum.data) {
                 ret = cacheDatum.data.value;
@@ -70,13 +87,19 @@ export default class CancerTypeColumnFormatter {
         return ret;
     }
 
-    public static filter(d: Mutation[],
-                         filterStringUpper: string,
-                         studyId?: string,
-                         cancerTypeCache?: CancerTypeCache,
-                         studyCancerTypeMap?: {[studyId:string]:string}): boolean
-    {
-        const cacheDatum = CancerTypeColumnFormatter.getData(d, studyId, cancerTypeCache, studyCancerTypeMap);
+    public static filter(
+        d: Mutation[],
+        filterStringUpper: string,
+        studyId?: string,
+        cancerTypeCache?: CancerTypeCache,
+        studyCancerTypeMap?: { [studyId: string]: string }
+    ): boolean {
+        const cacheDatum = CancerTypeColumnFormatter.getData(
+            d,
+            studyId,
+            cancerTypeCache,
+            studyCancerTypeMap
+        );
 
         return (
             cacheDatum !== null &&
diff --git a/src/shared/components/mutationTable/column/ChromosomeColumnFormatter.spec.tsx b/src/shared/components/mutationTable/column/ChromosomeColumnFormatter.spec.tsx
index c66f8e3c3a3..cb2eee8a8f9 100644
--- a/src/shared/components/mutationTable/column/ChromosomeColumnFormatter.spec.tsx
+++ b/src/shared/components/mutationTable/column/ChromosomeColumnFormatter.spec.tsx
@@ -1,31 +1,41 @@
-import {assert} from "chai";
-import ChromosomeColumnFormatter from "./ChromosomeColumnFormatter";
+import { assert } from 'chai';
+import ChromosomeColumnFormatter from './ChromosomeColumnFormatter';
 
 /**
  * @author Selcuk Onur Sumer
  */
 describe('ChromosomeColumnFormatter', () => {
-    const a = "1";
-    const b = "chr2";
-    const c = "22";
-    const d = "chrX";
-    const e = "Y";
-    const f = "chrY";
+    const a = '1';
+    const b = 'chr2';
+    const c = '22';
+    const d = 'chrX';
+    const e = 'Y';
+    const f = 'chrY';
 
     it('properly extracts sort value from a chromosome string value', () => {
-        assert.isAbove(ChromosomeColumnFormatter.extractSortValue(b),
-            ChromosomeColumnFormatter.extractSortValue(a));
+        assert.isAbove(
+            ChromosomeColumnFormatter.extractSortValue(b),
+            ChromosomeColumnFormatter.extractSortValue(a)
+        );
 
-        assert.isAbove(ChromosomeColumnFormatter.extractSortValue(d),
-            ChromosomeColumnFormatter.extractSortValue(c));
+        assert.isAbove(
+            ChromosomeColumnFormatter.extractSortValue(d),
+            ChromosomeColumnFormatter.extractSortValue(c)
+        );
 
-        assert.isAbove(ChromosomeColumnFormatter.extractSortValue(e),
-            ChromosomeColumnFormatter.extractSortValue(d));
+        assert.isAbove(
+            ChromosomeColumnFormatter.extractSortValue(e),
+            ChromosomeColumnFormatter.extractSortValue(d)
+        );
 
-        assert.isAbove(ChromosomeColumnFormatter.extractSortValue(c),
-            ChromosomeColumnFormatter.extractSortValue(b));
+        assert.isAbove(
+            ChromosomeColumnFormatter.extractSortValue(c),
+            ChromosomeColumnFormatter.extractSortValue(b)
+        );
 
-        assert.equal(ChromosomeColumnFormatter.extractSortValue(e),
-            ChromosomeColumnFormatter.extractSortValue(f));
+        assert.equal(
+            ChromosomeColumnFormatter.extractSortValue(e),
+            ChromosomeColumnFormatter.extractSortValue(f)
+        );
     });
 });
diff --git a/src/shared/components/mutationTable/column/ChromosomeColumnFormatter.tsx b/src/shared/components/mutationTable/column/ChromosomeColumnFormatter.tsx
index 86bfdbe2fee..d814c3bc148 100644
--- a/src/shared/components/mutationTable/column/ChromosomeColumnFormatter.tsx
+++ b/src/shared/components/mutationTable/column/ChromosomeColumnFormatter.tsx
@@ -1,12 +1,10 @@
-import {Mutation} from "shared/api/generated/CBioPortalAPI";
+import { Mutation } from 'shared/api/generated/CBioPortalAPI';
 
 /**
  * @author Selcuk Onur Sumer
  */
-export default class ChromosomeColumnFormatter
-{
-    public static getSortValue(data:Mutation[]):number|null
-    {
+export default class ChromosomeColumnFormatter {
+    public static getSortValue(data: Mutation[]): number | null {
         const chromosome = ChromosomeColumnFormatter.getData(data);
         if (!chromosome) {
             return null;
@@ -15,33 +13,27 @@ export default class ChromosomeColumnFormatter
         }
     }
 
-    public static extractSortValue(chromosome:string):number {
-        const numerical:RegExp = /[0-9]+/g;
+    public static extractSortValue(chromosome: string): number {
+        const numerical: RegExp = /[0-9]+/g;
 
-        const matched:RegExpMatchArray|null = chromosome.match(numerical);
-        let value:number = -1;
+        const matched: RegExpMatchArray | null = chromosome.match(numerical);
+        let value: number = -1;
 
         // if no match, then search for X or Y
-        if (matched)
-        {
+        if (matched) {
             value = parseInt(matched[0]);
-        }
-        else if (chromosome.toLowerCase().indexOf("x") > -1)
-        {
+        } else if (chromosome.toLowerCase().indexOf('x') > -1) {
             value = 23;
-        }
-        else if (chromosome.toLowerCase().indexOf("y") > -1)
-        {
+        } else if (chromosome.toLowerCase().indexOf('y') > -1) {
             value = 24;
         }
 
         return value;
     }
 
-    public static getData(data:Mutation[]):string|null
-    {
+    public static getData(data: Mutation[]): string | null {
         if (data.length > 0) {
-            return data[0].chr
+            return data[0].chr;
         } else {
             return null;
         }
diff --git a/src/shared/components/mutationTable/column/ClinVarColumnFormatter.tsx b/src/shared/components/mutationTable/column/ClinVarColumnFormatter.tsx
index 85d74819330..6d604edd9a5 100644
--- a/src/shared/components/mutationTable/column/ClinVarColumnFormatter.tsx
+++ b/src/shared/components/mutationTable/column/ClinVarColumnFormatter.tsx
@@ -1,50 +1,72 @@
 import * as React from 'react';
-import {Circle} from "better-react-spinkit";
+import { Circle } from 'better-react-spinkit';
 import 'rc-tooltip/assets/bootstrap_white.css';
-import {Mutation} from "shared/api/generated/CBioPortalAPI";
+import { Mutation } from 'shared/api/generated/CBioPortalAPI';
 import {
     DefaultTooltip,
     MyVariantInfoAnnotation,
     TableCellStatusIndicator,
-    TableCellStatus
-} from "cbioportal-frontend-commons";
-import GenomeNexusMyVariantInfoCache, { GenomeNexusCacheDataType } from "shared/cache/GenomeNexusMyVariantInfoCache";
-import {ClinVarId, clinVarSortValue, getClinVarId} from "react-mutation-mapper";
-import generalStyles from "./styles.module.scss";
+    TableCellStatus,
+} from 'cbioportal-frontend-commons';
+import GenomeNexusMyVariantInfoCache, {
+    GenomeNexusCacheDataType,
+} from 'shared/cache/GenomeNexusMyVariantInfoCache';
+import {
+    ClinVarId,
+    clinVarSortValue,
+    getClinVarId,
+} from 'react-mutation-mapper';
+import generalStyles from './styles.module.scss';
 
 export default class ClinVarColumnFormatter {
-    
-    public static renderFunction(data:Mutation[],
-                                genomeNexusMyVariantInfoCache: GenomeNexusMyVariantInfoCache | undefined) {
-        const genomeNexusCacheData = ClinVarColumnFormatter.getGenomeNexusDataFromCache(data, genomeNexusMyVariantInfoCache);
+    public static renderFunction(
+        data: Mutation[],
+        genomeNexusMyVariantInfoCache: GenomeNexusMyVariantInfoCache | undefined
+    ) {
+        const genomeNexusCacheData = ClinVarColumnFormatter.getGenomeNexusDataFromCache(
+            data,
+            genomeNexusMyVariantInfoCache
+        );
         return (
-            <div data-test="clinvar-data" className={generalStyles["integer-data"]}>
+            <div
+                data-test="clinvar-data"
+                className={generalStyles['integer-data']}
+            >
                 {ClinVarColumnFormatter.getClinVarDataViz(genomeNexusCacheData)}
             </div>
         );
     }
 
-    private static getGenomeNexusDataFromCache(data:Mutation[], cache:GenomeNexusMyVariantInfoCache | undefined): GenomeNexusCacheDataType | null {
+    private static getGenomeNexusDataFromCache(
+        data: Mutation[],
+        cache: GenomeNexusMyVariantInfoCache | undefined
+    ): GenomeNexusCacheDataType | null {
         if (data.length === 0 || !cache) {
             return null;
         }
         return cache.get(data[0]);
     }
 
-    private static getClinVarDataViz(genomeNexusCacheData:GenomeNexusCacheDataType | null) {
-        let status:TableCellStatus | null = null;
+    private static getClinVarDataViz(
+        genomeNexusCacheData: GenomeNexusCacheDataType | null
+    ) {
+        let status: TableCellStatus | null = null;
 
         if (genomeNexusCacheData === null) {
             status = TableCellStatus.LOADING;
-        } else if (genomeNexusCacheData.status === "error") {
+        } else if (genomeNexusCacheData.status === 'error') {
             status = TableCellStatus.ERROR;
         } else if (genomeNexusCacheData.data === null) {
             status = TableCellStatus.NA;
         } else {
             return (
                 <ClinVarId
-                    myVariantInfo={genomeNexusCacheData.data.my_variant_info ?
-                        genomeNexusCacheData.data.my_variant_info.annotation: undefined}
+                    myVariantInfo={
+                        genomeNexusCacheData.data.my_variant_info
+                            ? genomeNexusCacheData.data.my_variant_info
+                                  .annotation
+                            : undefined
+                    }
                 />
             );
         }
@@ -52,39 +74,67 @@ export default class ClinVarColumnFormatter {
         if (status !== null) {
             // show loading circle
             if (status === TableCellStatus.LOADING) {
-                return <Circle size={18} scaleEnd={0.5} scaleStart={0.2} color="#aaa" className="pull-right"/>;
-            } 
-            else {
-                return <TableCellStatusIndicator status={status}/>;
+                return (
+                    <Circle
+                        size={18}
+                        scaleEnd={0.5}
+                        scaleStart={0.2}
+                        color="#aaa"
+                        className="pull-right"
+                    />
+                );
+            } else {
+                return <TableCellStatusIndicator status={status} />;
             }
         }
     }
 
-    public static getData(genomeNexusData:  MyVariantInfoAnnotation | null): string | null {
+    public static getData(
+        genomeNexusData: MyVariantInfoAnnotation | null
+    ): string | null {
         if (genomeNexusData) {
             return getClinVarId(genomeNexusData.annotation);
-        }
-        else {
+        } else {
             return null;
         }
     }
 
-    public static download(data: Mutation[], genomeNexusMyVariantInfoCache: GenomeNexusMyVariantInfoCache): string {
-        const genomeNexusCacheData = ClinVarColumnFormatter.getGenomeNexusDataFromCache(data, genomeNexusMyVariantInfoCache);
+    public static download(
+        data: Mutation[],
+        genomeNexusMyVariantInfoCache: GenomeNexusMyVariantInfoCache
+    ): string {
+        const genomeNexusCacheData = ClinVarColumnFormatter.getGenomeNexusDataFromCache(
+            data,
+            genomeNexusMyVariantInfoCache
+        );
         if (genomeNexusCacheData && genomeNexusCacheData.data) {
-            let clinVarId = ClinVarColumnFormatter.getData(genomeNexusCacheData.data.my_variant_info);   
+            let clinVarId = ClinVarColumnFormatter.getData(
+                genomeNexusCacheData.data.my_variant_info
+            );
             if (clinVarId) {
                 return clinVarId;
             }
         }
-        return "";
+        return '';
     }
 
-    public static getSortValue(data:Mutation[], genomeNexusCache:GenomeNexusMyVariantInfoCache): number | null {
-        const genomeNexusCacheData = ClinVarColumnFormatter.getGenomeNexusDataFromCache(data, genomeNexusCache);
-        if (genomeNexusCacheData && genomeNexusCacheData.data && genomeNexusCacheData.data.my_variant_info) {
-            return clinVarSortValue(genomeNexusCacheData.data.my_variant_info.annotation);
+    public static getSortValue(
+        data: Mutation[],
+        genomeNexusCache: GenomeNexusMyVariantInfoCache
+    ): number | null {
+        const genomeNexusCacheData = ClinVarColumnFormatter.getGenomeNexusDataFromCache(
+            data,
+            genomeNexusCache
+        );
+        if (
+            genomeNexusCacheData &&
+            genomeNexusCacheData.data &&
+            genomeNexusCacheData.data.my_variant_info
+        ) {
+            return clinVarSortValue(
+                genomeNexusCacheData.data.my_variant_info.annotation
+            );
         }
-        return null; 
+        return null;
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/mutationTable/column/CohortColumnFormatter.spec.tsx b/src/shared/components/mutationTable/column/CohortColumnFormatter.spec.tsx
index c7f7accce58..e57236275ae 100644
--- a/src/shared/components/mutationTable/column/CohortColumnFormatter.spec.tsx
+++ b/src/shared/components/mutationTable/column/CohortColumnFormatter.spec.tsx
@@ -5,17 +5,9 @@ import { shallow, mount } from 'enzyme';
 import sinon from 'sinon';
 
 describe('CohortColumnFormatter', () => {
+    before(() => {});
 
-    before(()=>{
-
-    });
-
-    after(()=>{
-
-    });
-
-    it('what does it do?', ()=>{
-
-    });
+    after(() => {});
 
+    it('what does it do?', () => {});
 });
diff --git a/src/shared/components/mutationTable/column/CohortColumnFormatter.tsx b/src/shared/components/mutationTable/column/CohortColumnFormatter.tsx
index 50a7cf1b287..99486d5b6bb 100644
--- a/src/shared/components/mutationTable/column/CohortColumnFormatter.tsx
+++ b/src/shared/components/mutationTable/column/CohortColumnFormatter.tsx
@@ -1,33 +1,55 @@
 import * as React from 'react';
 import 'rc-tooltip/assets/bootstrap_white.css';
-import {Mutation} from "shared/api/generated/CBioPortalAPI";
-import VariantCountCache from "shared/cache/VariantCountCache";
-import FrequencyBar from "shared/components/cohort/FrequencyBar";
-import Icon from "shared/components/cohort/LetterIcon";
-import {IMutSigData as MutSigData} from "shared/model/MutSig";
-import {VariantCount} from "shared/api/generated/CBioPortalAPIInternal";
-import {CacheData} from "shared/lib/LazyMobXCache";
-import {getPercentage} from "shared/lib/FormatUtils";
-import {TableCellStatusIndicator, TableCellStatus} from "cbioportal-frontend-commons";
-
-type AugVariantCountOutput = (CacheData<VariantCount> & {hugoGeneSymbol:string});
+import { Mutation } from 'shared/api/generated/CBioPortalAPI';
+import VariantCountCache from 'shared/cache/VariantCountCache';
+import FrequencyBar from 'shared/components/cohort/FrequencyBar';
+import Icon from 'shared/components/cohort/LetterIcon';
+import { IMutSigData as MutSigData } from 'shared/model/MutSig';
+import { VariantCount } from 'shared/api/generated/CBioPortalAPIInternal';
+import { CacheData } from 'shared/lib/LazyMobXCache';
+import { getPercentage } from 'shared/lib/FormatUtils';
+import {
+    TableCellStatusIndicator,
+    TableCellStatus,
+} from 'cbioportal-frontend-commons';
+
+type AugVariantCountOutput = CacheData<VariantCount> & {
+    hugoGeneSymbol: string;
+};
 
 export default class CohortColumnFormatter {
-
-    public static renderFunction(data:Mutation[], mutSigData:MutSigData | undefined, variantCountCache:VariantCountCache) {
-        const mutSigQValue:number|null = CohortColumnFormatter.getMutSigQValue(data, mutSigData);
-        const variantCountData = CohortColumnFormatter.getVariantCountData(data, variantCountCache);
-        const freqViz = CohortColumnFormatter.makeCohortFrequencyViz(variantCountData);
+    public static renderFunction(
+        data: Mutation[],
+        mutSigData: MutSigData | undefined,
+        variantCountCache: VariantCountCache
+    ) {
+        const mutSigQValue:
+            | number
+            | null = CohortColumnFormatter.getMutSigQValue(data, mutSigData);
+        const variantCountData = CohortColumnFormatter.getVariantCountData(
+            data,
+            variantCountCache
+        );
+        const freqViz = CohortColumnFormatter.makeCohortFrequencyViz(
+            variantCountData
+        );
         return (
-                <div>
-                    {(freqViz !== null) && freqViz}
-                    {(mutSigQValue !== null) && CohortColumnFormatter.makeMutSigIcon(mutSigQValue)}
-                </div>
+            <div>
+                {freqViz !== null && freqViz}
+                {mutSigQValue !== null &&
+                    CohortColumnFormatter.makeMutSigIcon(mutSigQValue)}
+            </div>
         );
-    };
+    }
 
-    public static getSortValue(data:Mutation[], variantCountCache:VariantCountCache):number|null {
-        const variantCountData = CohortColumnFormatter.getVariantCountData(data, variantCountCache);
+    public static getSortValue(
+        data: Mutation[],
+        variantCountCache: VariantCountCache
+    ): number | null {
+        const variantCountData = CohortColumnFormatter.getVariantCountData(
+            data,
+            variantCountCache
+        );
         if (variantCountData && variantCountData.data) {
             return variantCountData.data.numberOfSamplesWithMutationInGene;
         } else {
@@ -35,22 +57,31 @@ export default class CohortColumnFormatter {
         }
     }
 
-    private static getVariantCountData(data:Mutation[], cache:VariantCountCache):AugVariantCountOutput | null {
+    private static getVariantCountData(
+        data: Mutation[],
+        cache: VariantCountCache
+    ): AugVariantCountOutput | null {
         if (data.length === 0) {
             return null;
         }
         const entrezGeneId = data[0].entrezGeneId;
         const keyword = data[0].keyword;
 
-        let cacheDatum = cache.get({entrezGeneId, keyword});
+        let cacheDatum = cache.get({ entrezGeneId, keyword });
         if (cacheDatum) {
-            return {hugoGeneSymbol:data[0].gene.hugoGeneSymbol, ...cacheDatum};
+            return {
+                hugoGeneSymbol: data[0].gene.hugoGeneSymbol,
+                ...cacheDatum,
+            };
         } else {
             return null;
         }
     }
 
-    private static getMutSigQValue(data:Mutation[], mutSigData:MutSigData|undefined):number|null {
+    private static getMutSigQValue(
+        data: Mutation[],
+        mutSigData: MutSigData | undefined
+    ): number | null {
         if (!mutSigData || data.length === 0) {
             return null;
         }
@@ -61,17 +92,20 @@ export default class CohortColumnFormatter {
         return thisData.qValue;
     }
 
-    private static makeCohortFrequencyViz(variantCount:AugVariantCountOutput | null) {
-
-        let status:TableCellStatus | null = null;
+    private static makeCohortFrequencyViz(
+        variantCount: AugVariantCountOutput | null
+    ) {
+        let status: TableCellStatus | null = null;
         if (variantCount === null) {
             status = TableCellStatus.LOADING;
-        } else if (variantCount.status === "error") {
+        } else if (variantCount.status === 'error') {
             status = TableCellStatus.ERROR;
         } else if (variantCount.data === null) {
             status = TableCellStatus.NA;
         } else {
-            const counts = [variantCount.data.numberOfSamplesWithMutationInGene];
+            const counts = [
+                variantCount.data.numberOfSamplesWithMutationInGene,
+            ];
 
             if (variantCount.data.keyword) {
                 counts.push(variantCount.data.numberOfSamplesWithKeyword!);
@@ -81,65 +115,77 @@ export default class CohortColumnFormatter {
                 <FrequencyBar
                     counts={counts}
                     totalCount={variantCount.data.numberOfSamples}
-                    tooltip={CohortColumnFormatter.getCohortFrequencyTooltip(variantCount)}
+                    tooltip={CohortColumnFormatter.getCohortFrequencyTooltip(
+                        variantCount
+                    )}
                 />
             );
         }
         if (status !== null) {
-            return (
-                <TableCellStatusIndicator
-                    status={status}
-                />
-            );
+            return <TableCellStatusIndicator status={status} />;
         }
     }
 
-    private static makeMutSigIcon(qValue:number) {
-        const tooltipCallback = () => CohortColumnFormatter.getMutSigTooltip(qValue);
+    private static makeMutSigIcon(qValue: number) {
+        const tooltipCallback = () =>
+            CohortColumnFormatter.getMutSigTooltip(qValue);
 
-        return (
-            <Icon
-                text="M"
-                tooltip={tooltipCallback}
-            />
-        );
+        return <Icon text="M" tooltip={tooltipCallback} />;
     }
 
-    private static getBoldPercentage(proportion: number)
-    {
-        return (
-            <b>{getPercentage(proportion)}</b>
-        );
+    private static getBoldPercentage(proportion: number) {
+        return <b>{getPercentage(proportion)}</b>;
     }
 
-    private static getCohortFrequencyTooltip(variantCount:AugVariantCountOutput | null) {
-        let message:string;
+    private static getCohortFrequencyTooltip(
+        variantCount: AugVariantCountOutput | null
+    ) {
+        let message: string;
         if (variantCount === null) {
-            return (<span>Querying server for data.</span>);
-        } else if (variantCount.status === "error") {
-            return (<span>Error retrieving data.</span>);
+            return <span>Querying server for data.</span>;
+        } else if (variantCount.status === 'error') {
+            return <span>Error retrieving data.</span>;
         } else if (variantCount.data === null) {
-            return (<span>Count data is not available for this gene.</span>);
+            return <span>Count data is not available for this gene.</span>;
         } else {
-            return (<div>
-            <span>{variantCount.data.numberOfSamplesWithMutationInGene} samples
-            ({CohortColumnFormatter.getBoldPercentage(variantCount.data.numberOfSamplesWithMutationInGene / variantCount.data.numberOfSamples)})
-            in this study have mutated {variantCount.hugoGeneSymbol}
-                {(typeof variantCount.data.keyword !== "undefined") && (
+            return (
+                <div>
                     <span>
-                        , out of which {variantCount.data.numberOfSamplesWithKeyword} ({CohortColumnFormatter.getBoldPercentage(variantCount.data.numberOfSamplesWithKeyword! / variantCount.data.numberOfSamples)}) have {variantCount.data.keyword} mutations
+                        {variantCount.data.numberOfSamplesWithMutationInGene}{' '}
+                        samples (
+                        {CohortColumnFormatter.getBoldPercentage(
+                            variantCount.data
+                                .numberOfSamplesWithMutationInGene /
+                                variantCount.data.numberOfSamples
+                        )}
+                        ) in this study have mutated{' '}
+                        {variantCount.hugoGeneSymbol}
+                        {typeof variantCount.data.keyword !== 'undefined' && (
+                            <span>
+                                , out of which{' '}
+                                {variantCount.data.numberOfSamplesWithKeyword} (
+                                {CohortColumnFormatter.getBoldPercentage(
+                                    variantCount.data
+                                        .numberOfSamplesWithKeyword! /
+                                        variantCount.data.numberOfSamples
+                                )}
+                                ) have {variantCount.data.keyword} mutations
+                            </span>
+                        )}
+                        .
                     </span>
-                )}
-                .
-            </span>
-        </div>);
+                </div>
+            );
         }
     }
 
-    private static getMutSigTooltip(qValue:number) {
-        return (<div>
-            <b>MutSig</b><br/>
-            <span> Q-value: {(qValue || 0).toExponential(3)}</span>
-        </div>);
+    private static getMutSigTooltip(qValue: number) {
+        return (
+            <div>
+                <b>MutSig</b>
+                <br />
+                <span> Q-value: {(qValue || 0).toExponential(3)}</span>
+            </div>
+        );
     }
 }
diff --git a/src/shared/components/mutationTable/column/CosmicColumnFormatter.spec.tsx b/src/shared/components/mutationTable/column/CosmicColumnFormatter.spec.tsx
index 233925efb06..79e2758167a 100644
--- a/src/shared/components/mutationTable/column/CosmicColumnFormatter.spec.tsx
+++ b/src/shared/components/mutationTable/column/CosmicColumnFormatter.spec.tsx
@@ -1,76 +1,75 @@
 import CosmicColumnFormatter from './CosmicColumnFormatter';
-import {ICosmicData} from "shared/model/Cosmic";
-import {keywordToCosmic} from 'shared/lib/AnnotationUtils';
-import {initMutation} from "test/MutationMockUtils";
+import { ICosmicData } from 'shared/model/Cosmic';
+import { keywordToCosmic } from 'shared/lib/AnnotationUtils';
+import { initMutation } from 'test/MutationMockUtils';
 import React from 'react';
 import { assert } from 'chai';
-import {shallow, mount, ReactWrapper} from 'enzyme';
+import { shallow, mount, ReactWrapper } from 'enzyme';
 import sinon from 'sinon';
-import {DefaultTooltip} from "cbioportal-frontend-commons";
+import { DefaultTooltip } from 'cbioportal-frontend-commons';
 
 describe('CosmicColumnFormatter', () => {
-
     const cosmicMutations = [
         {
-            cosmicMutationId: "",
+            cosmicMutationId: '',
             count: 2,
-            keyword: "TP53 R273 missense",
-            proteinChange: "R273H"
+            keyword: 'TP53 R273 missense',
+            proteinChange: 'R273H',
         },
         {
-            cosmicMutationId: "",
+            cosmicMutationId: '',
             count: 3,
-            keyword: "TP53 R273 missense",
-            proteinChange: "R273C"
+            keyword: 'TP53 R273 missense',
+            proteinChange: 'R273C',
         },
         {
-            cosmicMutationId: "",
+            cosmicMutationId: '',
             count: 5,
-            keyword: "TP53 R273 missense",
-            proteinChange: "R273L"
+            keyword: 'TP53 R273 missense',
+            proteinChange: 'R273L',
         },
         {
-            cosmicMutationId: "",
+            cosmicMutationId: '',
             count: 7,
-            keyword: "PIK3CA R38 missense",
-            proteinChange: "R38H"
+            keyword: 'PIK3CA R38 missense',
+            proteinChange: 'R38H',
         },
         {
-            cosmicMutationId: "",
+            cosmicMutationId: '',
             count: 11,
-            keyword: "PIK3CA R38 missense",
-            proteinChange: "R38C"
+            keyword: 'PIK3CA R38 missense',
+            proteinChange: 'R38C',
         },
         {
-            cosmicMutationId: "",
+            cosmicMutationId: '',
             count: 13,
-            keyword: "PIK3CA R38 missense",
-            proteinChange: "R38S"
-        }
+            keyword: 'PIK3CA R38 missense',
+            proteinChange: 'R38S',
+        },
     ];
 
     const mutation273 = initMutation({
         gene: {
-            hugoGeneSymbol: "TP53"
+            hugoGeneSymbol: 'TP53',
         },
-        proteinChange: "R273S",
-        keyword: "TP53 R273 missense"
+        proteinChange: 'R273S',
+        keyword: 'TP53 R273 missense',
     });
 
     const mutation38 = initMutation({
         gene: {
-            hugoGeneSymbol: "PIK3CA"
+            hugoGeneSymbol: 'PIK3CA',
         },
-        proteinChange: "R38S",
-        keyword: "PIK3CA R38 missense"
+        proteinChange: 'R38S',
+        keyword: 'PIK3CA R38 missense',
     });
 
     const mutation666 = initMutation({
         gene: {
-            hugoGeneSymbol: "DIABLO"
+            hugoGeneSymbol: 'DIABLO',
         },
-        proteinChange: "V666E",
-        keyword: "DIABLO"
+        proteinChange: 'V666E',
+        keyword: 'DIABLO',
     });
 
     const tableData = [[mutation273], [mutation38], [mutation666]];
@@ -78,7 +77,7 @@ describe('CosmicColumnFormatter', () => {
     let component273: ReactWrapper<any, any>;
     let component38: ReactWrapper<any, any>;
     let component666: ReactWrapper<any, any>;
-    let cosmicData:ICosmicData;
+    let cosmicData: ICosmicData;
 
     before(() => {
         cosmicData = keywordToCosmic(cosmicMutations);
@@ -86,45 +85,74 @@ describe('CosmicColumnFormatter', () => {
         let data = [mutation273];
 
         // mount a single cell component (Td)
-        component273 = mount(CosmicColumnFormatter.renderFunction(data, cosmicData));
+        component273 = mount(
+            CosmicColumnFormatter.renderFunction(data, cosmicData)
+        );
 
         data = [mutation38];
 
         // mount a single cell component (Td)
-        component38 = mount(CosmicColumnFormatter.renderFunction(data, cosmicData));
+        component38 = mount(
+            CosmicColumnFormatter.renderFunction(data, cosmicData)
+        );
 
         data = [mutation666];
 
         // mount a single cell component (Td)
-        component666 = mount(CosmicColumnFormatter.renderFunction(data, cosmicData));
+        component666 = mount(
+            CosmicColumnFormatter.renderFunction(data, cosmicData)
+        );
     });
 
     it('generates component tooltip', () => {
-        assert.isTrue(component273.find(DefaultTooltip).exists(),
-            'Tooltip should exists for TP53 R273 missense mutation');
-        assert.isTrue(component38.find(DefaultTooltip).exists(),
-            'Tooltip should exists for PIK3CA R38 missense mutation');
-        assert.isFalse(component666.find(DefaultTooltip).exists(),
-            'Tooltip should not exist for DIABLO mutation');
+        assert.isTrue(
+            component273.find(DefaultTooltip).exists(),
+            'Tooltip should exists for TP53 R273 missense mutation'
+        );
+        assert.isTrue(
+            component38.find(DefaultTooltip).exists(),
+            'Tooltip should exists for PIK3CA R38 missense mutation'
+        );
+        assert.isFalse(
+            component666.find(DefaultTooltip).exists(),
+            'Tooltip should not exist for DIABLO mutation'
+        );
     });
 
     it('renders display value', () => {
-        assert.isTrue(component273.find(`div`).text().indexOf((2 + 3 + 5).toString()) > -1,
-            'Cosmic count total for TP53 R273 missense mutation is correct');
-        assert.isTrue(component38.find(`div`).text().indexOf((7 + 11 + 13).toString()) > -1,
-            'Cosmic count total for PIK3CA R38 missense mutation is correct');
+        assert.isTrue(
+            component273
+                .find(`div`)
+                .text()
+                .indexOf((2 + 3 + 5).toString()) > -1,
+            'Cosmic count total for TP53 R273 missense mutation is correct'
+        );
+        assert.isTrue(
+            component38
+                .find(`div`)
+                .text()
+                .indexOf((7 + 11 + 13).toString()) > -1,
+            'Cosmic count total for PIK3CA R38 missense mutation is correct'
+        );
     });
 
     it('sets component cell value property', () => {
-        assert.equal(CosmicColumnFormatter.getSortValue([mutation273], cosmicData), (2 + 3 + 5),
-            'Sort value for TP53 R273 missense mutation is correct');
-        assert.equal(CosmicColumnFormatter.getSortValue([mutation38], cosmicData), (7 + 11 + 13),
-            'Sort value value property for PIK3CA R38 missense mutation is correct');
-        assert.equal(CosmicColumnFormatter.getSortValue([mutation666], cosmicData), null,
-            'Sort value value property for DIABLO mutation should be null, no cosmic data');
+        assert.equal(
+            CosmicColumnFormatter.getSortValue([mutation273], cosmicData),
+            2 + 3 + 5,
+            'Sort value for TP53 R273 missense mutation is correct'
+        );
+        assert.equal(
+            CosmicColumnFormatter.getSortValue([mutation38], cosmicData),
+            7 + 11 + 13,
+            'Sort value value property for PIK3CA R38 missense mutation is correct'
+        );
+        assert.equal(
+            CosmicColumnFormatter.getSortValue([mutation666], cosmicData),
+            null,
+            'Sort value value property for DIABLO mutation should be null, no cosmic data'
+        );
     });
 
-    after(() => {
-
-    });
+    after(() => {});
 });
diff --git a/src/shared/components/mutationTable/column/CosmicColumnFormatter.tsx b/src/shared/components/mutationTable/column/CosmicColumnFormatter.tsx
index 1ed4940e7c0..aa20a2b552e 100644
--- a/src/shared/components/mutationTable/column/CosmicColumnFormatter.tsx
+++ b/src/shared/components/mutationTable/column/CosmicColumnFormatter.tsx
@@ -1,15 +1,15 @@
 import * as React from 'react';
 import {
     DefaultTooltip,
-    getProteinPositionFromProteinChange
+    getProteinPositionFromProteinChange,
 } from 'cbioportal-frontend-commons';
 import * as _ from 'lodash';
-import {Mutation} from "shared/api/generated/CBioPortalAPI";
-import {CosmicMutation} from "shared/api/generated/CBioPortalAPIInternal";
-import CosmicMutationTable from "shared/components/cosmic/CosmicMutationTable";
-import styles from "./cosmic.module.scss";
-import {ICosmicData} from "shared/model/Cosmic";
-import generalStyles from "./styles.module.scss";
+import { Mutation } from 'shared/api/generated/CBioPortalAPI';
+import { CosmicMutation } from 'shared/api/generated/CBioPortalAPIInternal';
+import CosmicMutationTable from 'shared/components/cosmic/CosmicMutationTable';
+import styles from './cosmic.module.scss';
+import { ICosmicData } from 'shared/model/Cosmic';
+import generalStyles from './styles.module.scss';
 
 export function placeArrow(tooltipEl: any) {
     const arrowEl = tooltipEl.querySelector('.rc-tooltip-arrow');
@@ -19,26 +19,30 @@ export function placeArrow(tooltipEl: any) {
 /**
  * @author Selcuk Onur Sumer
  */
-export default class CosmicColumnFormatter
-{
-    public static getData(rowData:Mutation[]|undefined, cosmicData?:ICosmicData)
-    {
+export default class CosmicColumnFormatter {
+    public static getData(
+        rowData: Mutation[] | undefined,
+        cosmicData?: ICosmicData
+    ) {
         let value: CosmicMutation[] | null = null;
 
-        if (rowData && cosmicData)
-        {
-            const mutation:Mutation = rowData[0];
-            const cosmicMutations: CosmicMutation[] | null = cosmicData[mutation.keyword];
+        if (rowData && cosmicData) {
+            const mutation: Mutation = rowData[0];
+            const cosmicMutations: CosmicMutation[] | null =
+                cosmicData[mutation.keyword];
 
             // further filtering by protein change
-            if (cosmicMutations)
-            {
-                const mutPos = CosmicColumnFormatter.extractPosition(mutation.proteinChange);
+            if (cosmicMutations) {
+                const mutPos = CosmicColumnFormatter.extractPosition(
+                    mutation.proteinChange
+                );
 
                 // not comparing the entire protein change value, only the position!
-                value = cosmicMutations.filter((cosmic:CosmicMutation) => {
-                    const cosmicPos = CosmicColumnFormatter.extractPosition(cosmic.proteinChange);
-                    return mutPos && cosmicPos && (mutPos === cosmicPos);
+                value = cosmicMutations.filter((cosmic: CosmicMutation) => {
+                    const cosmicPos = CosmicColumnFormatter.extractPosition(
+                        cosmic.proteinChange
+                    );
+                    return mutPos && cosmicPos && mutPos === cosmicPos;
                 });
             }
         }
@@ -46,8 +50,7 @@ export default class CosmicColumnFormatter
         return value;
     }
 
-    public static extractPosition(proteinChange:string)
-    {
+    public static extractPosition(proteinChange: string) {
         const pos = getProteinPositionFromProteinChange(proteinChange);
         if (pos) {
             return pos.start;
@@ -56,17 +59,26 @@ export default class CosmicColumnFormatter
         }
     }
 
-    public static getSortValue(data:Mutation[], cosmicData?:ICosmicData):number|null {
-        const cosmic:CosmicMutation[]|null = CosmicColumnFormatter.getData(data, cosmicData);
-        let value:number|null = null;
+    public static getSortValue(
+        data: Mutation[],
+        cosmicData?: ICosmicData
+    ): number | null {
+        const cosmic: CosmicMutation[] | null = CosmicColumnFormatter.getData(
+            data,
+            cosmicData
+        );
+        let value: number | null = null;
 
         // calculate sum of the all counts
-        if (cosmic)
-        {
+        if (cosmic) {
             if (cosmic.length > 0) {
-                value = _.reduce(_.map(cosmic, "count"), (sum:number, count:number) => {
-                    return sum + count;
-                }, 0);
+                value = _.reduce(
+                    _.map(cosmic, 'count'),
+                    (sum: number, count: number) => {
+                        return sum + count;
+                    },
+                    0
+                );
             } else {
                 value = 0;
             }
@@ -81,37 +93,45 @@ export default class CosmicColumnFormatter
         return value;
     }
 
-    public static getDownloadValue(data:Mutation[], cosmicData?:ICosmicData):string {
+    public static getDownloadValue(
+        data: Mutation[],
+        cosmicData?: ICosmicData
+    ): string {
         let value = CosmicColumnFormatter.getSortValue(data, cosmicData);
 
         if (value) {
             return `${value}`;
-        }
-        else {
-            return "";
+        } else {
+            return '';
         }
     }
 
-    public static renderFunction(data:Mutation[], cosmicData?:ICosmicData)
-    {
-        const cosmic:CosmicMutation[]|null = CosmicColumnFormatter.getData(data, cosmicData);
+    public static renderFunction(data: Mutation[], cosmicData?: ICosmicData) {
+        const cosmic: CosmicMutation[] | null = CosmicColumnFormatter.getData(
+            data,
+            cosmicData
+        );
 
-        let value:number = -1;
-        let display:string = "";
-        let overlay:(() => JSX.Element)|null = null;
-        let content:JSX.Element;
+        let value: number = -1;
+        let display: string = '';
+        let overlay: (() => JSX.Element) | null = null;
+        let content: JSX.Element;
 
         // calculate sum of the all counts
-        if (cosmic && cosmic.length > 0)
-        {
-            value = _.reduce(_.map(cosmic, "count"), (sum:number , count:number) => {
-                return sum + count;
-            }, 0);
+        if (cosmic && cosmic.length > 0) {
+            value = _.reduce(
+                _.map(cosmic, 'count'),
+                (sum: number, count: number) => {
+                    return sum + count;
+                },
+                0
+            );
 
             overlay = () => (
-                <span className={styles["cosmic-table"]}>
-                    <b>{value}</b> occurrences of <b>{cosmic[0].keyword}</b> mutations in COSMIC
-                    <CosmicMutationTable data={cosmic}/>
+                <span className={styles['cosmic-table']}>
+                    <b>{value}</b> occurrences of <b>{cosmic[0].keyword}</b>{' '}
+                    mutations in COSMIC
+                    <CosmicMutationTable data={cosmic} />
                 </span>
             );
 
@@ -120,14 +140,11 @@ export default class CosmicColumnFormatter
 
         // basic content is the value
         content = (
-            <div className={generalStyles["integer-data"]}>
-                {display}
-            </div>
+            <div className={generalStyles['integer-data']}>{display}</div>
         );
 
         // add a tooltip if the cosmic value is valid
-        if (overlay)
-        {
+        if (overlay) {
             content = (
                 <DefaultTooltip
                     overlay={overlay}
diff --git a/src/shared/components/mutationTable/column/DbsnpColumnFormatter.tsx b/src/shared/components/mutationTable/column/DbsnpColumnFormatter.tsx
index 3f47570dda3..50555a7ba08 100644
--- a/src/shared/components/mutationTable/column/DbsnpColumnFormatter.tsx
+++ b/src/shared/components/mutationTable/column/DbsnpColumnFormatter.tsx
@@ -1,20 +1,26 @@
 import * as React from 'react';
-import {Circle} from "better-react-spinkit";
+import { Circle } from 'better-react-spinkit';
 import 'rc-tooltip/assets/bootstrap_white.css';
-import {Mutation} from "shared/api/generated/CBioPortalAPI";
+import { Mutation } from 'shared/api/generated/CBioPortalAPI';
 import {
     DefaultTooltip,
     MyVariantInfoAnnotation,
     TableCellStatusIndicator,
-    TableCellStatus
+    TableCellStatus,
 } from 'cbioportal-frontend-commons';
-import GenomeNexusMyVariantInfoCache, { GenomeNexusCacheDataType } from "shared/cache/GenomeNexusMyVariantInfoCache";
+import GenomeNexusMyVariantInfoCache, {
+    GenomeNexusCacheDataType,
+} from 'shared/cache/GenomeNexusMyVariantInfoCache';
 
 export default class DbsnpColumnFormatter {
-
-    public static renderFunction(data: Mutation[],
-                                 genomeNexusCache: GenomeNexusMyVariantInfoCache | undefined) {
-        const genomeNexusCacheData = DbsnpColumnFormatter.getGenomeNexusDataFromCache(data, genomeNexusCache);
+    public static renderFunction(
+        data: Mutation[],
+        genomeNexusCache: GenomeNexusMyVariantInfoCache | undefined
+    ) {
+        const genomeNexusCacheData = DbsnpColumnFormatter.getGenomeNexusDataFromCache(
+            data,
+            genomeNexusCache
+        );
         return (
             <div data-test="dbsnp-data">
                 {DbsnpColumnFormatter.getDbsnpViz(genomeNexusCacheData)}
@@ -22,88 +28,142 @@ export default class DbsnpColumnFormatter {
         );
     }
 
-    private static getGenomeNexusDataFromCache(data:Mutation[], cache:GenomeNexusMyVariantInfoCache | undefined): GenomeNexusCacheDataType | null {
+    private static getGenomeNexusDataFromCache(
+        data: Mutation[],
+        cache: GenomeNexusMyVariantInfoCache | undefined
+    ): GenomeNexusCacheDataType | null {
         if (data.length === 0 || !cache) {
             return null;
         }
         return cache.get(data[0]);
     }
 
-    private static getDbsnpViz(genomeNexusCacheData: GenomeNexusCacheDataType | null) {
-        let status:TableCellStatus | null = null;
+    private static getDbsnpViz(
+        genomeNexusCacheData: GenomeNexusCacheDataType | null
+    ) {
+        let status: TableCellStatus | null = null;
 
         if (genomeNexusCacheData === null) {
             status = TableCellStatus.LOADING;
-        } else if (genomeNexusCacheData.status === "error") {
+        } else if (genomeNexusCacheData.status === 'error') {
             status = TableCellStatus.ERROR;
         } else if (genomeNexusCacheData.data === null) {
             status = TableCellStatus.NA;
         } else {
-            let rsId = DbsnpColumnFormatter.getData(genomeNexusCacheData.data.my_variant_info);
+            let rsId = DbsnpColumnFormatter.getData(
+                genomeNexusCacheData.data.my_variant_info
+            );
             if (rsId == null) {
                 return (
                     <DefaultTooltip
                         placement="topRight"
-                        overlay={(<span>Variant has no dbSNP data.</span>)}
+                        overlay={<span>Variant has no dbSNP data.</span>}
                     >
-                        <span style={{height: '100%', width: '100%', display: 'block', overflow: 'hidden'}}>&nbsp;</span>
+                        <span
+                            style={{
+                                height: '100%',
+                                width: '100%',
+                                display: 'block',
+                                overflow: 'hidden',
+                            }}
+                        >
+                            &nbsp;
+                        </span>
                     </DefaultTooltip>
                 );
-            }
-            else {
-                let dbsnpLink = "https://www.ncbi.nlm.nih.gov/snp/" + rsId;
+            } else {
+                let dbsnpLink = 'https://www.ncbi.nlm.nih.gov/snp/' + rsId;
                 return (
                     <DefaultTooltip
                         placement="top"
-                        overlay={(<span>Click to see variant on dbSNP website.</span>)}
+                        overlay={
+                            <span>Click to see variant on dbSNP website.</span>
+                        }
                     >
-                        <span style={{textAlign:"right", float:"right"}}>
-                            <a href={dbsnpLink} target="_blank">{rsId}</a>
+                        <span style={{ textAlign: 'right', float: 'right' }}>
+                            <a href={dbsnpLink} target="_blank">
+                                {rsId}
+                            </a>
                         </span>
                     </DefaultTooltip>
                 );
-            }        
+            }
         }
 
         if (status !== null) {
             // show loading circle
             if (status === TableCellStatus.LOADING) {
-                return <Circle size={18} scaleEnd={0.5} scaleStart={0.2} color="#aaa" className="pull-right"/>;
-            } 
-            else {
-                return <TableCellStatusIndicator status={status}/>;
+                return (
+                    <Circle
+                        size={18}
+                        scaleEnd={0.5}
+                        scaleStart={0.2}
+                        color="#aaa"
+                        className="pull-right"
+                    />
+                );
+            } else {
+                return <TableCellStatusIndicator status={status} />;
             }
         }
     }
 
-    public static getData(genomeNexusData: MyVariantInfoAnnotation | null): string | null {
-        if (genomeNexusData && genomeNexusData.annotation && genomeNexusData.annotation.dbsnp && genomeNexusData.annotation.dbsnp.rsid) {
+    public static getData(
+        genomeNexusData: MyVariantInfoAnnotation | null
+    ): string | null {
+        if (
+            genomeNexusData &&
+            genomeNexusData.annotation &&
+            genomeNexusData.annotation.dbsnp &&
+            genomeNexusData.annotation.dbsnp.rsid
+        ) {
             return genomeNexusData.annotation.dbsnp.rsid;
-        }
-        else {
+        } else {
             return null;
         }
     }
 
-    public static download(data: Mutation[], genomeNexusMyVariantInfoCache: GenomeNexusMyVariantInfoCache): string {
-        const genomeNexusCacheData = DbsnpColumnFormatter.getGenomeNexusDataFromCache(data, genomeNexusMyVariantInfoCache);
+    public static download(
+        data: Mutation[],
+        genomeNexusMyVariantInfoCache: GenomeNexusMyVariantInfoCache
+    ): string {
+        const genomeNexusCacheData = DbsnpColumnFormatter.getGenomeNexusDataFromCache(
+            data,
+            genomeNexusMyVariantInfoCache
+        );
         if (genomeNexusCacheData && genomeNexusCacheData.data) {
-            const dbsnpData = genomeNexusCacheData && DbsnpColumnFormatter.getData(genomeNexusCacheData.data.my_variant_info);
+            const dbsnpData =
+                genomeNexusCacheData &&
+                DbsnpColumnFormatter.getData(
+                    genomeNexusCacheData.data.my_variant_info
+                );
             if (dbsnpData) {
                 return dbsnpData;
             }
         }
-        return "";
+        return '';
     }
 
-    public static getSortValue(data: Mutation[], genomeNexusCache: GenomeNexusMyVariantInfoCache): string | null {
-        const genomeNexusCacheData = DbsnpColumnFormatter.getGenomeNexusDataFromCache(data, genomeNexusCache);
-        if (genomeNexusCacheData && genomeNexusCacheData.data && genomeNexusCacheData.data.my_variant_info) {
-            let dbsnpData = DbsnpColumnFormatter.getData(genomeNexusCacheData.data.my_variant_info);            
+    public static getSortValue(
+        data: Mutation[],
+        genomeNexusCache: GenomeNexusMyVariantInfoCache
+    ): string | null {
+        const genomeNexusCacheData = DbsnpColumnFormatter.getGenomeNexusDataFromCache(
+            data,
+            genomeNexusCache
+        );
+        if (
+            genomeNexusCacheData &&
+            genomeNexusCacheData.data &&
+            genomeNexusCacheData.data.my_variant_info
+        ) {
+            let dbsnpData = DbsnpColumnFormatter.getData(
+                genomeNexusCacheData.data.my_variant_info
+            );
             if (dbsnpData !== null) {
                 return dbsnpData;
             }
-        }    
+        }
         return null;
     }
-}  
\ No newline at end of file
+}
diff --git a/src/shared/components/mutationTable/column/DiscreteCNAColumnFormatter.tsx b/src/shared/components/mutationTable/column/DiscreteCNAColumnFormatter.tsx
index 099c5be2ae4..80dd2724c01 100644
--- a/src/shared/components/mutationTable/column/DiscreteCNAColumnFormatter.tsx
+++ b/src/shared/components/mutationTable/column/DiscreteCNAColumnFormatter.tsx
@@ -2,115 +2,231 @@ import * as React from 'react';
 import {
     DefaultTooltip,
     TableCellStatusIndicator,
-    TableCellStatus
-} from "cbioportal-frontend-commons";
+    TableCellStatus,
+} from 'cbioportal-frontend-commons';
 import 'rc-tooltip/assets/bootstrap_white.css';
 import {
     DiscreteCNACacheDataType,
-    default as DiscreteCNACache
-} from "shared/cache/DiscreteCNACache";
-import {MolecularProfile, Mutation} from "shared/api/generated/CBioPortalAPI";
+    default as DiscreteCNACache,
+} from 'shared/cache/DiscreteCNACache';
+import { MolecularProfile, Mutation } from 'shared/api/generated/CBioPortalAPI';
 
 export default class DiscreteCNAColumnFormatter {
-
-    private static altToFilterString:{[a:number]:string} = {
-        "2": "amp",
-        "1": "gain",
-        "0": "diploid",
-        "-1": "shallowdel",
-        "-2": "deepdel"
+    private static altToFilterString: { [a: number]: string } = {
+        '2': 'amp',
+        '1': 'gain',
+        '0': 'diploid',
+        '-1': 'shallowdel',
+        '-2': 'deepdel',
     };
 
-    public static renderFunction(data: Mutation[], molecularProfileIdToMolecularProfile: {[molecularProfileId:string]:MolecularProfile}, cache:DiscreteCNACache) {
-        const cnaData = DiscreteCNAColumnFormatter.getData(data, molecularProfileIdToMolecularProfile, cache);
-        return (<DefaultTooltip
+    public static renderFunction(
+        data: Mutation[],
+        molecularProfileIdToMolecularProfile: {
+            [molecularProfileId: string]: MolecularProfile;
+        },
+        cache: DiscreteCNACache
+    ) {
+        const cnaData = DiscreteCNAColumnFormatter.getData(
+            data,
+            molecularProfileIdToMolecularProfile,
+            cache
+        );
+        return (
+            <DefaultTooltip
                 placement="left"
                 overlay={DiscreteCNAColumnFormatter.getTooltipContents(cnaData)}
-                arrowContent={<div className="rc-tooltip-arrow-inner"/>}
+                arrowContent={<div className="rc-tooltip-arrow-inner" />}
             >
                 {DiscreteCNAColumnFormatter.getTdContents(cnaData)}
             </DefaultTooltip>
         );
     }
 
-    public static getTextValue(data:Mutation[], molecularProfileIdToMolecularProfile: {[molecularProfileId:string]:MolecularProfile}, cache:DiscreteCNACache) : string {
-        const tdValue = DiscreteCNAColumnFormatter.getTdValue(DiscreteCNAColumnFormatter.getData(data, molecularProfileIdToMolecularProfile, cache));
+    public static getTextValue(
+        data: Mutation[],
+        molecularProfileIdToMolecularProfile: {
+            [molecularProfileId: string]: MolecularProfile;
+        },
+        cache: DiscreteCNACache
+    ): string {
+        const tdValue = DiscreteCNAColumnFormatter.getTdValue(
+            DiscreteCNAColumnFormatter.getData(
+                data,
+                molecularProfileIdToMolecularProfile,
+                cache
+            )
+        );
         if (tdValue !== null) {
             return DiscreteCNAColumnFormatter.altToFilterString[tdValue];
         }
-        return "";
+        return '';
     }
 
-    public static getSortValue(data:Mutation[], molecularProfileIdToMolecularProfile: {[molecularProfileId:string]:MolecularProfile}, cache:DiscreteCNACache) {
-        return DiscreteCNAColumnFormatter.getTdValue(DiscreteCNAColumnFormatter.getData(data, molecularProfileIdToMolecularProfile, cache));
+    public static getSortValue(
+        data: Mutation[],
+        molecularProfileIdToMolecularProfile: {
+            [molecularProfileId: string]: MolecularProfile;
+        },
+        cache: DiscreteCNACache
+    ) {
+        return DiscreteCNAColumnFormatter.getTdValue(
+            DiscreteCNAColumnFormatter.getData(
+                data,
+                molecularProfileIdToMolecularProfile,
+                cache
+            )
+        );
     }
 
-    public static filter(data:Mutation[], molecularProfileIdToMolecularProfile: {[molecularProfileId:string]:MolecularProfile}, cache:DiscreteCNACache, filterString:string):boolean {
-        const cnaData = DiscreteCNAColumnFormatter.getData(data, molecularProfileIdToMolecularProfile, cache);
+    public static filter(
+        data: Mutation[],
+        molecularProfileIdToMolecularProfile: {
+            [molecularProfileId: string]: MolecularProfile;
+        },
+        cache: DiscreteCNACache,
+        filterString: string
+    ): boolean {
+        const cnaData = DiscreteCNAColumnFormatter.getData(
+            data,
+            molecularProfileIdToMolecularProfile,
+            cache
+        );
         if (cnaData && cnaData.data) {
-            return (!!DiscreteCNAColumnFormatter.altToFilterString[cnaData.data.alteration])
-                && (DiscreteCNAColumnFormatter.altToFilterString[cnaData.data.alteration]
-                    .indexOf(filterString.toLowerCase()) > -1);
+            return (
+                !!DiscreteCNAColumnFormatter.altToFilterString[
+                    cnaData.data.alteration
+                ] &&
+                DiscreteCNAColumnFormatter.altToFilterString[
+                    cnaData.data.alteration
+                ].indexOf(filterString.toLowerCase()) > -1
+            );
         } else {
             return false;
         }
     }
 
-    protected static getData(data:Mutation[] | undefined, molecularProfileIdToMolecularProfile: {[molecularProfileId:string]:MolecularProfile}, discreteCNACache:DiscreteCNACache):DiscreteCNACacheDataType | null {
+    protected static getData(
+        data: Mutation[] | undefined,
+        molecularProfileIdToMolecularProfile: {
+            [molecularProfileId: string]: MolecularProfile;
+        },
+        discreteCNACache: DiscreteCNACache
+    ): DiscreteCNACacheDataType | null {
         if (!data || data.length === 0 || !discreteCNACache.isActive) {
             return null;
         }
-        
-        
+
         const sampleId = data[0].sampleId;
         const entrezGeneId = data[0].entrezGeneId;
-        const molecularProfile = molecularProfileIdToMolecularProfile[data[0].molecularProfileId];
+        const molecularProfile =
+            molecularProfileIdToMolecularProfile[data[0].molecularProfileId];
         if (molecularProfile) {
-            return discreteCNACache.get({sampleId, entrezGeneId, studyId: molecularProfile.studyId});
+            return discreteCNACache.get({
+                sampleId,
+                entrezGeneId,
+                studyId: molecularProfile.studyId,
+            });
         } else {
             return null;
         }
     }
 
-    protected static getTdValue(cacheDatum:DiscreteCNACacheDataType | null):number|null {
-        if (cacheDatum !== null && cacheDatum.status === "complete" && cacheDatum.data !== null) {
+    protected static getTdValue(
+        cacheDatum: DiscreteCNACacheDataType | null
+    ): number | null {
+        if (
+            cacheDatum !== null &&
+            cacheDatum.status === 'complete' &&
+            cacheDatum.data !== null
+        ) {
             return cacheDatum.data.alteration;
         } else {
             return null;
         }
     }
 
-    protected static getTdContents(cacheDatum:DiscreteCNACacheDataType | null) {
-        let status:TableCellStatus | null = null;
-        if (cacheDatum !== null && cacheDatum.status === "complete" && cacheDatum.data !== null) {
+    protected static getTdContents(
+        cacheDatum: DiscreteCNACacheDataType | null
+    ) {
+        let status: TableCellStatus | null = null;
+        if (
+            cacheDatum !== null &&
+            cacheDatum.status === 'complete' &&
+            cacheDatum.data !== null
+        ) {
             const alteration = cacheDatum.data.alteration;
             if (alteration === 2) {
-                return (<span style={{color:"red", textAlign:"center", fontSize:"12px"}}>
-                    <b>Amp</b>
-                </span>);
+                return (
+                    <span
+                        style={{
+                            color: 'red',
+                            textAlign: 'center',
+                            fontSize: '12px',
+                        }}
+                    >
+                        <b>Amp</b>
+                    </span>
+                );
             } else if (alteration === 1) {
-                return (<span style={{color:"red", textAlign:"center", fontSize:"smaller"}}>
-                    <b>Gain</b>
-                </span>);
+                return (
+                    <span
+                        style={{
+                            color: 'red',
+                            textAlign: 'center',
+                            fontSize: 'smaller',
+                        }}
+                    >
+                        <b>Gain</b>
+                    </span>
+                );
             } else if (alteration === 0) {
-                return (<span style={{color:"black", textAlign:"center", fontSize:"xx-small"}}>
-                    Diploid
-                </span>);
+                return (
+                    <span
+                        style={{
+                            color: 'black',
+                            textAlign: 'center',
+                            fontSize: 'xx-small',
+                        }}
+                    >
+                        Diploid
+                    </span>
+                );
             } else if (alteration === -1) {
-                return (<span style={{color:"blue", textAlign:"center", fontSize:"smaller"}}>
-                    <b>ShallowDel</b>
-                </span>);
+                return (
+                    <span
+                        style={{
+                            color: 'blue',
+                            textAlign: 'center',
+                            fontSize: 'smaller',
+                        }}
+                    >
+                        <b>ShallowDel</b>
+                    </span>
+                );
             } else {
-                return (<span style={{color:"blue", textAlign:"center", fontSize:"12px"}}>
-                    <b>DeepDel</b>
-                </span>);
+                return (
+                    <span
+                        style={{
+                            color: 'blue',
+                            textAlign: 'center',
+                            fontSize: '12px',
+                        }}
+                    >
+                        <b>DeepDel</b>
+                    </span>
+                );
             }
-        } else if (cacheDatum && cacheDatum.status === "complete" && cacheDatum.data === null) {
-            status=TableCellStatus.NA;
-        } else if (cacheDatum && cacheDatum.status === "error") {
-            status=TableCellStatus.ERROR;
+        } else if (
+            cacheDatum &&
+            cacheDatum.status === 'complete' &&
+            cacheDatum.data === null
+        ) {
+            status = TableCellStatus.NA;
+        } else if (cacheDatum && cacheDatum.status === 'error') {
+            status = TableCellStatus.ERROR;
         } else {
-            status=TableCellStatus.NA;
+            status = TableCellStatus.NA;
         }
         if (status !== null) {
             return (
@@ -122,30 +238,40 @@ export default class DiscreteCNAColumnFormatter {
         }
     }
 
-    protected static getTooltipContents(cacheDatum:DiscreteCNACacheDataType | null) {
-        const altToText:{[a:number]:string} = {
-            '-2':"Deep deletion",
-            '-1':"Shallow deletion",
-            '0':"Diploid / normal",
-            '1':"Low-level gain",
-            '2':"High-level amplification"
+    protected static getTooltipContents(
+        cacheDatum: DiscreteCNACacheDataType | null
+    ) {
+        const altToText: { [a: number]: string } = {
+            '-2': 'Deep deletion',
+            '-1': 'Shallow deletion',
+            '0': 'Diploid / normal',
+            '1': 'Low-level gain',
+            '2': 'High-level amplification',
         };
-        if (cacheDatum && cacheDatum.status === "complete" && cacheDatum.data !== null) {
+        if (
+            cacheDatum &&
+            cacheDatum.status === 'complete' &&
+            cacheDatum.data !== null
+        ) {
             return (
                 <div>
                     <span>{altToText[cacheDatum.data.alteration]}</span>
                 </div>
             );
-        } else if (cacheDatum && cacheDatum.status === "complete" && cacheDatum.data === null) {
-            return (<span>CNA data is not available for this gene.</span>);
-        } else if (cacheDatum && cacheDatum.status === "error") {
-            return (<span>Error retrieving data.</span>);
+        } else if (
+            cacheDatum &&
+            cacheDatum.status === 'complete' &&
+            cacheDatum.data === null
+        ) {
+            return <span>CNA data is not available for this gene.</span>;
+        } else if (cacheDatum && cacheDatum.status === 'error') {
+            return <span>Error retrieving data.</span>;
         } else {
-            return (<span>Querying server for data.</span>);
+            return <span>Querying server for data.</span>;
         }
     }
 
-    public static isVisible(cache:DiscreteCNACache): boolean {
+    public static isVisible(cache: DiscreteCNACache): boolean {
         return cache && cache.isActive;
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/mutationTable/column/ExonColumnFormatter.tsx b/src/shared/components/mutationTable/column/ExonColumnFormatter.tsx
index c432e53f3d8..b17949f7ce1 100644
--- a/src/shared/components/mutationTable/column/ExonColumnFormatter.tsx
+++ b/src/shared/components/mutationTable/column/ExonColumnFormatter.tsx
@@ -1,55 +1,92 @@
 import * as React from 'react';
-import {Circle} from "better-react-spinkit";
+import { Circle } from 'better-react-spinkit';
 import 'rc-tooltip/assets/bootstrap_white.css';
-import {Mutation} from "shared/api/generated/CBioPortalAPI";
+import { Mutation } from 'shared/api/generated/CBioPortalAPI';
 import {
     TableCellStatusIndicator,
     TableCellStatus,
-    VariantAnnotation
-} from "cbioportal-frontend-commons";
-import GenomeNexusCache, { GenomeNexusCacheDataType } from "shared/cache/GenomeNexusCache";
-import styles from "./exon.module.scss";
+    VariantAnnotation,
+} from 'cbioportal-frontend-commons';
+import GenomeNexusCache, {
+    GenomeNexusCacheDataType,
+} from 'shared/cache/GenomeNexusCache';
+import styles from './exon.module.scss';
 
 export default class ExonColumnFormatter {
-    
-    public static renderFunction(data:Mutation[],
-                                 genomeNexusCache:GenomeNexusCache|undefined,
-                                 showTotalNumberOfExons?:boolean) {
-        const genomeNexusCacheData = ExonColumnFormatter.getGenomeNexusDataFromCache(data, genomeNexusCache);
+    public static renderFunction(
+        data: Mutation[],
+        genomeNexusCache: GenomeNexusCache | undefined,
+        showTotalNumberOfExons?: boolean
+    ) {
+        const genomeNexusCacheData = ExonColumnFormatter.getGenomeNexusDataFromCache(
+            data,
+            genomeNexusCache
+        );
         return (
-            <div className={styles["exon-table"]}>
-                <span>{ExonColumnFormatter.getExonDataViz(genomeNexusCacheData, showTotalNumberOfExons)}</span>
+            <div className={styles['exon-table']}>
+                <span>
+                    {ExonColumnFormatter.getExonDataViz(
+                        genomeNexusCacheData,
+                        showTotalNumberOfExons
+                    )}
+                </span>
             </div>
         );
     }
 
-    private static getGenomeNexusDataFromCache(data:Mutation[], cache:GenomeNexusCache|undefined):GenomeNexusCacheDataType | null {
+    private static getGenomeNexusDataFromCache(
+        data: Mutation[],
+        cache: GenomeNexusCache | undefined
+    ): GenomeNexusCacheDataType | null {
         if (data.length === 0 || !cache) {
             return null;
         }
         return cache.get(data[0]);
     }
 
-    private static getExonDataViz(genomeNexusCacheData:GenomeNexusCacheDataType|null, showTotalNumberOfExons?:boolean) {
-        let status:TableCellStatus | null = null;
+    private static getExonDataViz(
+        genomeNexusCacheData: GenomeNexusCacheDataType | null,
+        showTotalNumberOfExons?: boolean
+    ) {
+        let status: TableCellStatus | null = null;
 
         if (genomeNexusCacheData === null) {
             status = TableCellStatus.LOADING;
-        } else if (genomeNexusCacheData.status === "error") {
+        } else if (genomeNexusCacheData.status === 'error') {
             status = TableCellStatus.ERROR;
         } else if (genomeNexusCacheData.data === null) {
             status = TableCellStatus.NA;
         } else {
-            let exonData = ExonColumnFormatter.getData(genomeNexusCacheData.data);
+            let exonData = ExonColumnFormatter.getData(
+                genomeNexusCacheData.data
+            );
             if (exonData == null) {
                 return exonData;
-            }
-            else {
+            } else {
                 return (
-                    <span style = {{display:"inline-block", float:"right"}}>
-                        <span style = {{float:"left",width:"24px", textAlign:"right"}}> {exonData.split("/")[0]} </span>
+                    <span style={{ display: 'inline-block', float: 'right' }}>
+                        <span
+                            style={{
+                                float: 'left',
+                                width: '24px',
+                                textAlign: 'right',
+                            }}
+                        >
+                            {' '}
+                            {exonData.split('/')[0]}{' '}
+                        </span>
                         {showTotalNumberOfExons && (
-                            <span style = {{float:"left", width:"34px", textAlign:"left", marginLeft:"4px"}}> {`/ ${exonData.split("/")[1]}`} </span>
+                            <span
+                                style={{
+                                    float: 'left',
+                                    width: '34px',
+                                    textAlign: 'left',
+                                    marginLeft: '4px',
+                                }}
+                            >
+                                {' '}
+                                {`/ ${exonData.split('/')[1]}`}{' '}
+                            </span>
                         )}
                     </span>
                 );
@@ -59,28 +96,39 @@ export default class ExonColumnFormatter {
         if (status !== null) {
             // show loading circle
             if (status === TableCellStatus.LOADING) {
-                return <Circle size={18} scaleEnd={0.5} scaleStart={0.2} color="#aaa" className="pull-right"/>;
-            } 
-            else {
-                return <TableCellStatusIndicator status={status}/>;
+                return (
+                    <Circle
+                        size={18}
+                        scaleEnd={0.5}
+                        scaleStart={0.2}
+                        color="#aaa"
+                        className="pull-right"
+                    />
+                );
+            } else {
+                return <TableCellStatusIndicator status={status} />;
             }
         }
     }
 
-    public static getData(genomeNexusData: VariantAnnotation | null): string | null
-    {
-        if (!genomeNexusData)
-        {
+    public static getData(
+        genomeNexusData: VariantAnnotation | null
+    ): string | null {
+        if (!genomeNexusData) {
             return null;
         }
-        const exon = genomeNexusData.annotation_summary.transcriptConsequenceSummary.exon;
+        const exon =
+            genomeNexusData.annotation_summary.transcriptConsequenceSummary
+                .exon;
         if (exon) {
             return exon;
-        }
-        else {
+        } else {
             // find any other mutation affecting the exon on the same transcript
             const transcriptConsequence = genomeNexusData.transcript_consequences.filter(
-                x => ((x.transcript_id === genomeNexusData.annotation_summary.transcriptConsequenceSummary.transcriptId) && x.exon)
+                x =>
+                    x.transcript_id ===
+                        genomeNexusData.annotation_summary
+                            .transcriptConsequenceSummary.transcriptId && x.exon
             )[0];
             if (transcriptConsequence) {
                 return transcriptConsequence.exon;
@@ -90,31 +138,43 @@ export default class ExonColumnFormatter {
         }
     }
 
-    public static download(data:Mutation[], genomeNexusCache:GenomeNexusCache): string
-    {
-        const genomeNexusData = ExonColumnFormatter.getGenomeNexusDataFromCache(data, genomeNexusCache);
-        const exonData = genomeNexusData && ExonColumnFormatter.getData(genomeNexusData.data);
+    public static download(
+        data: Mutation[],
+        genomeNexusCache: GenomeNexusCache
+    ): string {
+        const genomeNexusData = ExonColumnFormatter.getGenomeNexusDataFromCache(
+            data,
+            genomeNexusCache
+        );
+        const exonData =
+            genomeNexusData &&
+            ExonColumnFormatter.getData(genomeNexusData.data);
 
         if (!exonData) {
-            return "";
-        }
-        else {
+            return '';
+        } else {
             return exonData;
         }
     }
 
-    public static getSortValue(data:Mutation[], genomeNexusCache:GenomeNexusCache): number|null {
-        const genomeNexusCacheData = ExonColumnFormatter.getGenomeNexusDataFromCache(data, genomeNexusCache);
+    public static getSortValue(
+        data: Mutation[],
+        genomeNexusCache: GenomeNexusCache
+    ): number | null {
+        const genomeNexusCacheData = ExonColumnFormatter.getGenomeNexusDataFromCache(
+            data,
+            genomeNexusCache
+        );
         if (genomeNexusCacheData) {
-            let exonData = ExonColumnFormatter.getData(genomeNexusCacheData.data);
+            let exonData = ExonColumnFormatter.getData(
+                genomeNexusCacheData.data
+            );
             if (exonData == null) {
                 return null;
+            } else {
+                return parseInt(exonData.split('/')[0]);
             }
-            else {
-                return parseInt(exonData.split("/")[0]);
-            }
-        }
-        else {
+        } else {
             return null;
         }
     }
diff --git a/src/shared/components/mutationTable/column/FunctionalImpactColumnFormatter.tsx b/src/shared/components/mutationTable/column/FunctionalImpactColumnFormatter.tsx
index f606fd604ed..a4ec157ce4a 100644
--- a/src/shared/components/mutationTable/column/FunctionalImpactColumnFormatter.tsx
+++ b/src/shared/components/mutationTable/column/FunctionalImpactColumnFormatter.tsx
@@ -1,28 +1,32 @@
 import * as React from 'react';
-import {Circle} from "better-react-spinkit";
+import { Circle } from 'better-react-spinkit';
 import classNames from 'classnames';
 import {
     DefaultTooltip,
     MutationAssessor as MutationAssessorData,
     TableCellStatusIndicator,
     TableCellStatus,
-    VariantAnnotation
+    VariantAnnotation,
 } from 'cbioportal-frontend-commons';
 import 'rc-tooltip/assets/bootstrap_white.css';
-import {Mutation, DiscreteCopyNumberData} from "shared/api/generated/CBioPortalAPI";
-import MutationAssessor from "shared/components/annotation/genomeNexus/MutationAssessor";
-import Sift from "shared/components/annotation/genomeNexus/Sift";
-import PolyPhen2 from "shared/components/annotation/genomeNexus/PolyPhen2";
-import siftStyles from "shared/components/annotation/genomeNexus/styles/siftTooltip.module.scss";
-import polyPhen2Styles from "shared/components/annotation/genomeNexus/styles/polyPhen2Tooltip.module.scss";
-import mutationAssessorStyles from "shared/components/annotation/genomeNexus/styles/mutationAssessorColumn.module.scss";
-import annotationStyles from "shared/components/annotation/styles/annotation.module.scss";
-import GenomeNexusCache, { GenomeNexusCacheDataType } from "shared/cache/GenomeNexusCache";
-
+import {
+    Mutation,
+    DiscreteCopyNumberData,
+} from 'shared/api/generated/CBioPortalAPI';
+import MutationAssessor from 'shared/components/annotation/genomeNexus/MutationAssessor';
+import Sift from 'shared/components/annotation/genomeNexus/Sift';
+import PolyPhen2 from 'shared/components/annotation/genomeNexus/PolyPhen2';
+import siftStyles from 'shared/components/annotation/genomeNexus/styles/siftTooltip.module.scss';
+import polyPhen2Styles from 'shared/components/annotation/genomeNexus/styles/polyPhen2Tooltip.module.scss';
+import mutationAssessorStyles from 'shared/components/annotation/genomeNexus/styles/mutationAssessorColumn.module.scss';
+import annotationStyles from 'shared/components/annotation/styles/annotation.module.scss';
+import GenomeNexusCache, {
+    GenomeNexusCacheDataType,
+} from 'shared/cache/GenomeNexusCache';
 
 type FunctionalImpactColumnTooltipProps = {
     active: 'mutationAssessor' | 'sift' | 'polyPhen2';
-}
+};
 
 interface IFunctionalImpactColumnTooltipState {
     active: 'mutationAssessor' | 'sift' | 'polyPhen2';
@@ -36,11 +40,14 @@ interface IFunctionalImpactData {
     polyPhenPrediction: string;
 }
 
-class FunctionalImpactColumnTooltip extends React.Component<FunctionalImpactColumnTooltipProps, IFunctionalImpactColumnTooltipState> {
-    constructor(props:FunctionalImpactColumnTooltipProps) {
+class FunctionalImpactColumnTooltip extends React.Component<
+    FunctionalImpactColumnTooltipProps,
+    IFunctionalImpactColumnTooltipState
+> {
+    constructor(props: FunctionalImpactColumnTooltipProps) {
         super(props);
         this.state = {
-            active: this.props.active
+            active: this.props.active,
         };
     }
 
@@ -68,27 +75,39 @@ class FunctionalImpactColumnTooltip extends React.Component<FunctionalImpactColu
                             </th> */}
                             <th>
                                 <span
-                                    style={{display:'inline-block',width:22}}
-                                    title='SIFT'
-                                    onMouseOver={() => this.setState({active:'sift'})}
+                                    style={{
+                                        display: 'inline-block',
+                                        width: 22,
+                                    }}
+                                    title="SIFT"
+                                    onMouseOver={() =>
+                                        this.setState({ active: 'sift' })
+                                    }
                                 >
                                     <img
-                                        height={14} width={14}
-                                        src={require("./siftFunnel.png")}
-                                        alt='SIFT'
+                                        height={14}
+                                        width={14}
+                                        src={require('./siftFunnel.png')}
+                                        alt="SIFT"
                                     />
                                 </span>
                             </th>
                             <th>
                                 <span
-                                    style={{display:'inline-block',width:22}}
-                                    title='PolyPhen-2'
-                                    onMouseOver={() => this.setState({active:'polyPhen2'})}
+                                    style={{
+                                        display: 'inline-block',
+                                        width: 22,
+                                    }}
+                                    title="PolyPhen-2"
+                                    onMouseOver={() =>
+                                        this.setState({ active: 'polyPhen2' })
+                                    }
                                 >
                                     <img
-                                        height={14} width={14}
-                                        src={require("./polyPhen-2.png")}
-                                        alt='PolyPhen-2'
+                                        height={14}
+                                        width={14}
+                                        src={require('./polyPhen-2.png')}
+                                        alt="PolyPhen-2"
                                     />
                                 </span>
                             </th>
@@ -97,13 +116,33 @@ class FunctionalImpactColumnTooltip extends React.Component<FunctionalImpactColu
                     <tbody>
                         <tr>
                             <td>
-                                <span className={classNames(annotationStyles["annotation-item-text"], mutationAssessorStyles[`ma-high`])}>
-                                    <i className='fa fa-circle' aria-hidden="true"></i>
+                                <span
+                                    className={classNames(
+                                        annotationStyles[
+                                            'annotation-item-text'
+                                        ],
+                                        mutationAssessorStyles[`ma-high`]
+                                    )}
+                                >
+                                    <i
+                                        className="fa fa-circle"
+                                        aria-hidden="true"
+                                    ></i>
                                 </span>
                             </td>
                             {/* <td className={mutationAssessorStyles['ma-high']}>high</td> */}
-                            <td className={siftStyles['sift-deleterious']}>deleterious</td>
-                            <td className={polyPhen2Styles['polyPhen2-probably_damaging']}>probably_damaging</td>
+                            <td className={siftStyles['sift-deleterious']}>
+                                deleterious
+                            </td>
+                            <td
+                                className={
+                                    polyPhen2Styles[
+                                        'polyPhen2-probably_damaging'
+                                    ]
+                                }
+                            >
+                                probably_damaging
+                            </td>
                         </tr>
                         {/* <tr>
                             <td>
@@ -117,78 +156,139 @@ class FunctionalImpactColumnTooltip extends React.Component<FunctionalImpactColu
                         </tr> */}
                         <tr>
                             <td>
-                                <span className={classNames(annotationStyles["annotation-item-text"], mutationAssessorStyles[`ma-low`])}>
-                                    <i className='fa fa-circle' aria-hidden="true"></i>
+                                <span
+                                    className={classNames(
+                                        annotationStyles[
+                                            'annotation-item-text'
+                                        ],
+                                        mutationAssessorStyles[`ma-low`]
+                                    )}
+                                >
+                                    <i
+                                        className="fa fa-circle"
+                                        aria-hidden="true"
+                                    ></i>
                                 </span>
                             </td>
                             {/* <td className={mutationAssessorStyles['ma-low']}>low</td> */}
-                            <td className={siftStyles['sift-deleterious_low_confidence']}>deleterious_low_confidence</td>
-                            <td className={polyPhen2Styles['polyPhen2-possibly_damaging']}>possibly_damaging</td>
+                            <td
+                                className={
+                                    siftStyles[
+                                        'sift-deleterious_low_confidence'
+                                    ]
+                                }
+                            >
+                                deleterious_low_confidence
+                            </td>
+                            <td
+                                className={
+                                    polyPhen2Styles[
+                                        'polyPhen2-possibly_damaging'
+                                    ]
+                                }
+                            >
+                                possibly_damaging
+                            </td>
                         </tr>
                         <tr>
                             <td>
-                                <span className={classNames(annotationStyles["annotation-item-text"], mutationAssessorStyles[`ma-neutral`])}>
-                                    <i className='fa fa-circle' aria-hidden="true"></i>
+                                <span
+                                    className={classNames(
+                                        annotationStyles[
+                                            'annotation-item-text'
+                                        ],
+                                        mutationAssessorStyles[`ma-neutral`]
+                                    )}
+                                >
+                                    <i
+                                        className="fa fa-circle"
+                                        aria-hidden="true"
+                                    ></i>
                                 </span>
                             </td>
                             {/* <td className={mutationAssessorStyles['ma-neutral']}>neutral</td> */}
-                            <td className={siftStyles['sift-tolerated_low_confidence']}>tolerated_low_confidence</td>
-                            <td className={polyPhen2Styles['polyPhen2-benign']}>benign</td>
+                            <td
+                                className={
+                                    siftStyles['sift-tolerated_low_confidence']
+                                }
+                            >
+                                tolerated_low_confidence
+                            </td>
+                            <td className={polyPhen2Styles['polyPhen2-benign']}>
+                                benign
+                            </td>
                         </tr>
                         <tr>
                             <td></td>
                             {/* <td>-</td> */}
-                            <td className={siftStyles['sift-tolerated']}>tolerated</td>
+                            <td className={siftStyles['sift-tolerated']}>
+                                tolerated
+                            </td>
                             <td>-</td>
                         </tr>
                     </tbody>
                 </table>
             </div>
         );
-
     }
 
     public static mutationAssessorText() {
-        return <div style={{width:450,height:100}}><a
-        href={MutationAssessor.MUTATION_ASSESSOR_URL} target="_blank">Mutation
-        Assessor</a> predicts the functional impact of amino-acid substitutions
-        in proteins, such as mutations discovered in cancer or missense
-        polymorphisms. The functional impact is assessed based on evolutionary
-        conservation of the affected amino acid in protein homologs. The method
-        has been validated on a large set (60k) of disease associated (OMIM)
-        and polymorphic variants.</div>;
+        return (
+            <div style={{ width: 450, height: 100 }}>
+                <a
+                    href={MutationAssessor.MUTATION_ASSESSOR_URL}
+                    target="_blank"
+                >
+                    Mutation Assessor
+                </a>{' '}
+                predicts the functional impact of amino-acid substitutions in
+                proteins, such as mutations discovered in cancer or missense
+                polymorphisms. The functional impact is assessed based on
+                evolutionary conservation of the affected amino acid in protein
+                homologs. The method has been validated on a large set (60k) of
+                disease associated (OMIM) and polymorphic variants.
+            </div>
+        );
     }
 
     public static siftText() {
-        return <div style={{width:450,height:100}}><a href={Sift.SIFT_URL}
-        target="_blank">SIFT</a> predicts whether an amino acid substitution
-        affects protein function based on sequence homology and the physical
-        properties of amino acids. SIFT can be applied to naturally occurring
-        nonsynonymous polymorphisms and laboratory-induced missense
-        mutations.</div>;
+        return (
+            <div style={{ width: 450, height: 100 }}>
+                <a href={Sift.SIFT_URL} target="_blank">
+                    SIFT
+                </a>{' '}
+                predicts whether an amino acid substitution affects protein
+                function based on sequence homology and the physical properties
+                of amino acids. SIFT can be applied to naturally occurring
+                nonsynonymous polymorphisms and laboratory-induced missense
+                mutations.
+            </div>
+        );
     }
 
     public static polyPhen2Text() {
-        return <div style={{width:450,height:100}}><a href={PolyPhen2.POLYPHEN2_URL}
-        target="_blank">PolyPhen-2</a> (Polymorphism Phenotyping v2) is a tool
-        which predicts possible impact of an amino acid substitution on the
-        structure and function of a human protein using straightforward
-        physical and comparative considerations.</div>;
+        return (
+            <div style={{ width: 450, height: 100 }}>
+                <a href={PolyPhen2.POLYPHEN2_URL} target="_blank">
+                    PolyPhen-2
+                </a>{' '}
+                (Polymorphism Phenotyping v2) is a tool which predicts possible
+                impact of an amino acid substitution on the structure and
+                function of a human protein using straightforward physical and
+                comparative considerations.
+            </div>
+        );
     }
 
     public render() {
-
         return (
             <div>
-                {(this.state.active === 'mutationAssessor') && (
-                    FunctionalImpactColumnTooltip.mutationAssessorText()
-                )}
-                {(this.state.active === 'sift') && (
-                    FunctionalImpactColumnTooltip.siftText()
-                )}
-                {(this.state.active === 'polyPhen2') && (
-                    FunctionalImpactColumnTooltip.polyPhen2Text()
-                )}
+                {this.state.active === 'mutationAssessor' &&
+                    FunctionalImpactColumnTooltip.mutationAssessorText()}
+                {this.state.active === 'sift' &&
+                    FunctionalImpactColumnTooltip.siftText()}
+                {this.state.active === 'polyPhen2' &&
+                    FunctionalImpactColumnTooltip.polyPhen2Text()}
                 {this.legend()}
             </div>
         );
@@ -201,61 +301,70 @@ export function placeArrow(tooltipEl: any) {
 }
 
 export default class FunctionalImpactColumnFormatter {
-    
     public static headerRender(name: string) {
-        const arrowContent = <div className="rc-tooltip-arrow-inner"  />;
+        const arrowContent = <div className="rc-tooltip-arrow-inner" />;
         return (
             <div>
-                {name}<br />
-                <div style={{height:14}}>
+                {name}
+                <br />
+                <div style={{ height: 14 }}>
                     <DefaultTooltip
-                        overlay={<FunctionalImpactColumnTooltip active='mutationAssessor' />}
+                        overlay={
+                            <FunctionalImpactColumnTooltip active="mutationAssessor" />
+                        }
                         placement="topLeft"
                         trigger={['hover', 'focus']}
                         arrowContent={arrowContent}
                         destroyTooltipOnHide={true}
                         onPopupAlign={placeArrow}
                     >
-                        <span style={{display:'inline-block',width:22}}>
+                        <span style={{ display: 'inline-block', width: 22 }}>
                             <img
-                                height={14} width={14}
-                                src={require("./mutationAssessor.png")}
+                                height={14}
+                                width={14}
+                                src={require('./mutationAssessor.png')}
                                 // className={tooltipStyles['mutation-assessor-main-img']}
-                                alt='Sift'
+                                alt="Sift"
                             />
                         </span>
                     </DefaultTooltip>
                     <DefaultTooltip
-                        overlay={<FunctionalImpactColumnTooltip active='sift' />}
+                        overlay={
+                            <FunctionalImpactColumnTooltip active="sift" />
+                        }
                         placement="topLeft"
                         trigger={['hover', 'focus']}
                         arrowContent={arrowContent}
                         destroyTooltipOnHide={true}
                         onPopupAlign={placeArrow}
                     >
-                        <span style={{display:'inline-block',width:22}}>
+                        <span style={{ display: 'inline-block', width: 22 }}>
                             <img
-                                height={14} width={14}
-                                src={require("./siftFunnel.png")}
+                                height={14}
+                                width={14}
+                                src={require('./siftFunnel.png')}
                                 // className={tooltipStyles['mutation-assessor-main-img']}
-                                alt='SIFT'
+                                alt="SIFT"
                             />
                         </span>
                     </DefaultTooltip>
                     <DefaultTooltip
-                        overlay={<FunctionalImpactColumnTooltip active='polyPhen2' />}
+                        overlay={
+                            <FunctionalImpactColumnTooltip active="polyPhen2" />
+                        }
                         placement="topLeft"
                         trigger={['hover', 'focus']}
                         arrowContent={arrowContent}
                         destroyTooltipOnHide={true}
                         onPopupAlign={placeArrow}
                     >
-                        <span style={{display:'inline-block',width:22}}>
+                        <span style={{ display: 'inline-block', width: 22 }}>
                             <img
-                                height={14} width={14}
-                                src={require("./polyPhen-2.png")}
+                                height={14}
+                                width={14}
+                                src={require('./polyPhen-2.png')}
                                 // className={tooltipStyles['mutation-assessor-main-img']}
-                                alt='PolyPhen-2'
+                                alt="PolyPhen-2"
                             />
                         </span>
                     </DefaultTooltip>
@@ -264,99 +373,145 @@ export default class FunctionalImpactColumnFormatter {
         );
     }
 
-    public static getData(genomeNexusData: VariantAnnotation | null): IFunctionalImpactData | null
-    {
-        if (!genomeNexusData)
-        {
+    public static getData(
+        genomeNexusData: VariantAnnotation | null
+    ): IFunctionalImpactData | null {
+        if (!genomeNexusData) {
             return null;
         }
 
         // TODO: handle multiple transcripts instead of just picking the first one
-        const mutationAssessor = genomeNexusData.mutation_assessor && genomeNexusData.mutation_assessor.annotation;
+        const mutationAssessor =
+            genomeNexusData.mutation_assessor &&
+            genomeNexusData.mutation_assessor.annotation;
         const siftScore = genomeNexusData.transcript_consequences[0].sift_score;
-        const siftPrediction = genomeNexusData.transcript_consequences[0].sift_prediction;
-        const polyPhenScore = genomeNexusData.transcript_consequences[0].polyphen_score;
-        const polyPhenPrediction = genomeNexusData.transcript_consequences[0].polyphen_prediction;
+        const siftPrediction =
+            genomeNexusData.transcript_consequences[0].sift_prediction;
+        const polyPhenScore =
+            genomeNexusData.transcript_consequences[0].polyphen_score;
+        const polyPhenPrediction =
+            genomeNexusData.transcript_consequences[0].polyphen_prediction;
 
         return {
             mutationAssessor,
             siftScore,
             siftPrediction,
             polyPhenScore,
-            polyPhenPrediction
+            polyPhenPrediction,
         };
     }
 
-    public static renderFunction(data:Mutation[],
-                                 genomeNexusCache:GenomeNexusCache|undefined) {
-        const genomeNexusCacheData = FunctionalImpactColumnFormatter.getGenomeNexusDataFromCache(data, genomeNexusCache);
+    public static renderFunction(
+        data: Mutation[],
+        genomeNexusCache: GenomeNexusCache | undefined
+    ) {
+        const genomeNexusCacheData = FunctionalImpactColumnFormatter.getGenomeNexusDataFromCache(
+            data,
+            genomeNexusCache
+        );
         return (
-                <div>
-                    {FunctionalImpactColumnFormatter.makeFunctionalImpactViz(genomeNexusCacheData)}
-                </div>
+            <div>
+                {FunctionalImpactColumnFormatter.makeFunctionalImpactViz(
+                    genomeNexusCacheData
+                )}
+            </div>
         );
     }
 
-    public static download(data:Mutation[], genomeNexusCache:GenomeNexusCache): string
-    {
-        const genomeNexusData = FunctionalImpactColumnFormatter.getGenomeNexusDataFromCache(data, genomeNexusCache);
-        const functionalImpactData = genomeNexusData && FunctionalImpactColumnFormatter.getData(genomeNexusData.data);
+    public static download(
+        data: Mutation[],
+        genomeNexusCache: GenomeNexusCache
+    ): string {
+        const genomeNexusData = FunctionalImpactColumnFormatter.getGenomeNexusDataFromCache(
+            data,
+            genomeNexusCache
+        );
+        const functionalImpactData =
+            genomeNexusData &&
+            FunctionalImpactColumnFormatter.getData(genomeNexusData.data);
 
         if (!functionalImpactData) {
-            return "";
+            return '';
         }
 
         return [
-            `MutationAssessor: ${MutationAssessor.download(functionalImpactData.mutationAssessor)}`,
-            `SIFT: ${Sift.download(functionalImpactData.siftScore, functionalImpactData.siftPrediction)}`,
-            `Polyphen-2: ${PolyPhen2.download(functionalImpactData.polyPhenScore, functionalImpactData.polyPhenPrediction)}`
-        ].join(";");
+            `MutationAssessor: ${MutationAssessor.download(
+                functionalImpactData.mutationAssessor
+            )}`,
+            `SIFT: ${Sift.download(
+                functionalImpactData.siftScore,
+                functionalImpactData.siftPrediction
+            )}`,
+            `Polyphen-2: ${PolyPhen2.download(
+                functionalImpactData.polyPhenScore,
+                functionalImpactData.polyPhenPrediction
+            )}`,
+        ].join(';');
     }
 
-    private static getGenomeNexusDataFromCache(data:Mutation[], cache:GenomeNexusCache|undefined):GenomeNexusCacheDataType | null {
+    private static getGenomeNexusDataFromCache(
+        data: Mutation[],
+        cache: GenomeNexusCache | undefined
+    ): GenomeNexusCacheDataType | null {
         if (data.length === 0 || !cache) {
             return null;
         }
         return cache.get(data[0]);
     }
 
-    private static makeFunctionalImpactViz(genomeNexusCacheData:GenomeNexusCacheDataType|null) {
-        let status:TableCellStatus | null = null;
+    private static makeFunctionalImpactViz(
+        genomeNexusCacheData: GenomeNexusCacheDataType | null
+    ) {
+        let status: TableCellStatus | null = null;
 
         if (genomeNexusCacheData === null) {
             status = TableCellStatus.LOADING;
-        } else if (genomeNexusCacheData.status === "error") {
+        } else if (genomeNexusCacheData.status === 'error') {
             status = TableCellStatus.ERROR;
         } else if (genomeNexusCacheData.data === null) {
             status = TableCellStatus.NA;
         } else {
-            const functionalImpactData = FunctionalImpactColumnFormatter.getData(genomeNexusCacheData.data);
+            const functionalImpactData = FunctionalImpactColumnFormatter.getData(
+                genomeNexusCacheData.data
+            );
 
-            return functionalImpactData && (
-                <div>
-                    <MutationAssessor
-                        mutationAssessor={functionalImpactData.mutationAssessor}
-                    />
-                    <Sift
-                        siftScore={functionalImpactData.siftScore}
-                        siftPrediction={functionalImpactData.siftPrediction}
-                    />
-                    <PolyPhen2
-                        polyPhenScore={functionalImpactData.polyPhenScore}
-                        polyPhenPrediction={functionalImpactData.polyPhenPrediction}
-                    />
-                </div>
+            return (
+                functionalImpactData && (
+                    <div>
+                        <MutationAssessor
+                            mutationAssessor={
+                                functionalImpactData.mutationAssessor
+                            }
+                        />
+                        <Sift
+                            siftScore={functionalImpactData.siftScore}
+                            siftPrediction={functionalImpactData.siftPrediction}
+                        />
+                        <PolyPhen2
+                            polyPhenScore={functionalImpactData.polyPhenScore}
+                            polyPhenPrediction={
+                                functionalImpactData.polyPhenPrediction
+                            }
+                        />
+                    </div>
+                )
             );
         }
 
         if (status !== null) {
             // show loading circle
             if (status === TableCellStatus.LOADING) {
-                return <Circle size={18} scaleEnd={0.5} scaleStart={0.2} color="#aaa" className="pull-left"/>;
+                return (
+                    <Circle
+                        size={18}
+                        scaleEnd={0.5}
+                        scaleStart={0.2}
+                        color="#aaa"
+                        className="pull-left"
+                    />
+                );
             } else {
-                return (<TableCellStatusIndicator
-                    status={status}
-                />);
+                return <TableCellStatusIndicator status={status} />;
             }
         }
     }
diff --git a/src/shared/components/mutationTable/column/GeneColumnFormatter.spec.tsx b/src/shared/components/mutationTable/column/GeneColumnFormatter.spec.tsx
index d652f56585a..b71778a8bda 100644
--- a/src/shared/components/mutationTable/column/GeneColumnFormatter.spec.tsx
+++ b/src/shared/components/mutationTable/column/GeneColumnFormatter.spec.tsx
@@ -1,16 +1,15 @@
 import GeneColumnFormatter from './GeneColumnFormatter';
 import React from 'react';
 import { assert } from 'chai';
-import {shallow, mount, ReactWrapper} from 'enzyme';
+import { shallow, mount, ReactWrapper } from 'enzyme';
 import sinon from 'sinon';
-import {initMutation} from "test/MutationMockUtils";
+import { initMutation } from 'test/MutationMockUtils';
 
 describe('GeneColumnFormatter', () => {
-
     const mutation = initMutation({
         gene: {
-            hugoGeneSymbol: "DIABLO"
-        }
+            hugoGeneSymbol: 'DIABLO',
+        },
     });
 
     const tableData = [[mutation]];
@@ -24,11 +23,14 @@ describe('GeneColumnFormatter', () => {
     });
 
     it('renders display value', () => {
-        assert.isTrue(component.find(`span`).text().indexOf("DIABLO") > -1,
-            'Gene symbol display value is correct');
+        assert.isTrue(
+            component
+                .find(`span`)
+                .text()
+                .indexOf('DIABLO') > -1,
+            'Gene symbol display value is correct'
+        );
     });
 
-    after(() => {
-
-    });
+    after(() => {});
 });
diff --git a/src/shared/components/mutationTable/column/GeneColumnFormatter.tsx b/src/shared/components/mutationTable/column/GeneColumnFormatter.tsx
index 731441edb3a..27033a97d9f 100644
--- a/src/shared/components/mutationTable/column/GeneColumnFormatter.tsx
+++ b/src/shared/components/mutationTable/column/GeneColumnFormatter.tsx
@@ -1,32 +1,28 @@
 import * as React from 'react';
-import {Mutation, Gene} from "shared/api/generated/CBioPortalAPI";
+import { Mutation, Gene } from 'shared/api/generated/CBioPortalAPI';
 
 /**
  * @author Selcuk Onur Sumer
  */
-export default class GeneColumnFormatter
-{
+export default class GeneColumnFormatter {
     /**
      * Default text value for a gene is its hugo gene symbol.
      *
      * @param data  column formatter data
      * @returns {string}    hugo gene symbol
      */
-    public static getTextValue(data:Mutation[]):string
-    {
+    public static getTextValue(data: Mutation[]): string {
         const hugo = GeneColumnFormatter.getData(data);
 
-        return hugo || "";
+        return hugo || '';
     }
 
-    public static getDisplayValue(data:Mutation[]):string
-    {
+    public static getDisplayValue(data: Mutation[]): string {
         // same as text value
         return GeneColumnFormatter.getTextValue(data);
     }
 
-    public static getData(data:Mutation[])
-    {
+    public static getData(data: Mutation[]) {
         if (data.length > 0) {
             return data[0].gene.hugoGeneSymbol;
         } else {
@@ -34,17 +30,14 @@ export default class GeneColumnFormatter
         }
     }
 
-    public static getSortValue(data:Mutation[]):string {
+    public static getSortValue(data: Mutation[]): string {
         return GeneColumnFormatter.getTextValue(data);
     }
 
-    public static renderFunction(data:Mutation[])
-    {
+    public static renderFunction(data: Mutation[]) {
         // use text as display value
         const text = GeneColumnFormatter.getDisplayValue(data);
 
-        return (
-                <span data-test="mutation-table-gene-column">{text}</span>
-        );
+        return <span data-test="mutation-table-gene-column">{text}</span>;
     }
 }
diff --git a/src/shared/components/mutationTable/column/GnomadColumnFormatter.tsx b/src/shared/components/mutationTable/column/GnomadColumnFormatter.tsx
index 594d165d8f6..ba29ae00e12 100644
--- a/src/shared/components/mutationTable/column/GnomadColumnFormatter.tsx
+++ b/src/shared/components/mutationTable/column/GnomadColumnFormatter.tsx
@@ -1,48 +1,75 @@
 import * as React from 'react';
-import {Circle} from "better-react-spinkit";
+import { Circle } from 'better-react-spinkit';
 import 'rc-tooltip/assets/bootstrap_white.css';
-import {Mutation} from "shared/api/generated/CBioPortalAPI";
+import { Mutation } from 'shared/api/generated/CBioPortalAPI';
 import {
     TableCellStatusIndicator,
     TableCellStatus,
     MyVariantInfo,
-    MyVariantInfoAnnotation
+    MyVariantInfoAnnotation,
 } from 'cbioportal-frontend-commons';
-import GenomeNexusMyVariantInfoCache, { GenomeNexusCacheDataType } from "shared/cache/GenomeNexusMyVariantInfoCache";
-import {calculateGnomadAllelFrequency, GnomadFrequency, gnomadSortValue} from "react-mutation-mapper";
+import GenomeNexusMyVariantInfoCache, {
+    GenomeNexusCacheDataType,
+} from 'shared/cache/GenomeNexusMyVariantInfoCache';
+import {
+    calculateGnomadAllelFrequency,
+    GnomadFrequency,
+    gnomadSortValue,
+} from 'react-mutation-mapper';
 
 export default class GnomadColumnFormatter {
-
-    public static renderFunction(data: Mutation[],
-                                 genomeNexusMyVariantInfoCache: GenomeNexusMyVariantInfoCache | undefined) {
-        const genomeNexusCacheData = GnomadColumnFormatter.getGenomeNexusDataFromCache(data, genomeNexusMyVariantInfoCache);
+    public static renderFunction(
+        data: Mutation[],
+        genomeNexusMyVariantInfoCache: GenomeNexusMyVariantInfoCache | undefined
+    ) {
+        const genomeNexusCacheData = GnomadColumnFormatter.getGenomeNexusDataFromCache(
+            data,
+            genomeNexusMyVariantInfoCache
+        );
         return (
-            <span data-test='gnomad-column' data-test2={data[0].sampleId}>{GnomadColumnFormatter.getGnomadDataViz(genomeNexusCacheData)}</span>
+            <span data-test="gnomad-column" data-test2={data[0].sampleId}>
+                {GnomadColumnFormatter.getGnomadDataViz(genomeNexusCacheData)}
+            </span>
         );
     }
 
-    private static getGenomeNexusDataFromCache(data: Mutation[], cache: GenomeNexusMyVariantInfoCache | undefined): GenomeNexusCacheDataType | null {    
+    private static getGenomeNexusDataFromCache(
+        data: Mutation[],
+        cache: GenomeNexusMyVariantInfoCache | undefined
+    ): GenomeNexusCacheDataType | null {
         if (data.length === 0 || !cache) {
             return null;
         }
         return cache.get(data[0]);
     }
 
-    private static getGnomadDataViz(genomeNexusCacheData: GenomeNexusCacheDataType | null) {
-        let status:TableCellStatus | null = null;
+    private static getGnomadDataViz(
+        genomeNexusCacheData: GenomeNexusCacheDataType | null
+    ) {
+        let status: TableCellStatus | null = null;
 
         if (genomeNexusCacheData == null) {
             status = TableCellStatus.LOADING;
-        } else if (genomeNexusCacheData.status === "error") {
+        } else if (genomeNexusCacheData.status === 'error') {
             status = TableCellStatus.ERROR;
         } else if (genomeNexusCacheData.data == null) {
             status = TableCellStatus.NA;
         } else {
             return (
                 <GnomadFrequency
-                    myVariantInfo={genomeNexusCacheData && genomeNexusCacheData.data && genomeNexusCacheData.data.my_variant_info ?
-                        genomeNexusCacheData.data.my_variant_info.annotation: undefined}
-                    annotation={genomeNexusCacheData && genomeNexusCacheData.data ? genomeNexusCacheData.data: undefined}
+                    myVariantInfo={
+                        genomeNexusCacheData &&
+                        genomeNexusCacheData.data &&
+                        genomeNexusCacheData.data.my_variant_info
+                            ? genomeNexusCacheData.data.my_variant_info
+                                  .annotation
+                            : undefined
+                    }
+                    annotation={
+                        genomeNexusCacheData && genomeNexusCacheData.data
+                            ? genomeNexusCacheData.data
+                            : undefined
+                    }
                 />
             );
         }
@@ -50,57 +77,96 @@ export default class GnomadColumnFormatter {
         if (status !== null) {
             // show loading circle
             if (status === TableCellStatus.LOADING) {
-                return <Circle size={18} scaleEnd={0.5} scaleStart={0.2} color="#aaa" className="pull-right"/>;
-            } 
-            else {
-                return <TableCellStatusIndicator status={status}/>;
+                return (
+                    <Circle
+                        size={18}
+                        scaleEnd={0.5}
+                        scaleStart={0.2}
+                        color="#aaa"
+                        className="pull-right"
+                    />
+                );
+            } else {
+                return <TableCellStatusIndicator status={status} />;
             }
         }
     }
 
-    public static getData(genomeNexusData: MyVariantInfoAnnotation | null): MyVariantInfo | null {
-        if (!genomeNexusData)
-        {
+    public static getData(
+        genomeNexusData: MyVariantInfoAnnotation | null
+    ): MyVariantInfo | null {
+        if (!genomeNexusData) {
             return null;
         }
         return genomeNexusData.annotation;
     }
 
-    public static getSortValue(data: Mutation[], genomeNexusMyVariantInfoCache: GenomeNexusMyVariantInfoCache): number | null {
-        const genomeNexusCacheData = GnomadColumnFormatter.getGenomeNexusDataFromCache(data, genomeNexusMyVariantInfoCache);
-        if (genomeNexusCacheData && genomeNexusCacheData.data && genomeNexusCacheData.data.my_variant_info) {
-            return gnomadSortValue(genomeNexusCacheData.data.my_variant_info.annotation);
+    public static getSortValue(
+        data: Mutation[],
+        genomeNexusMyVariantInfoCache: GenomeNexusMyVariantInfoCache
+    ): number | null {
+        const genomeNexusCacheData = GnomadColumnFormatter.getGenomeNexusDataFromCache(
+            data,
+            genomeNexusMyVariantInfoCache
+        );
+        if (
+            genomeNexusCacheData &&
+            genomeNexusCacheData.data &&
+            genomeNexusCacheData.data.my_variant_info
+        ) {
+            return gnomadSortValue(
+                genomeNexusCacheData.data.my_variant_info.annotation
+            );
         }
         // If genomeNexusCacheData is null or gnomadData is null, return null
         return null;
-
     }
 
-    public static download(data: Mutation[], genomeNexusMyVariantInfoCache: GenomeNexusMyVariantInfoCache): string
-    {
-        const genomeNexusCacheData = GnomadColumnFormatter.getGenomeNexusDataFromCache(data, genomeNexusMyVariantInfoCache);
+    public static download(
+        data: Mutation[],
+        genomeNexusMyVariantInfoCache: GenomeNexusMyVariantInfoCache
+    ): string {
+        const genomeNexusCacheData = GnomadColumnFormatter.getGenomeNexusDataFromCache(
+            data,
+            genomeNexusMyVariantInfoCache
+        );
 
         if (genomeNexusCacheData && genomeNexusCacheData.data) {
-            let gnomadData = GnomadColumnFormatter.getData(genomeNexusCacheData.data.my_variant_info);
+            let gnomadData = GnomadColumnFormatter.getData(
+                genomeNexusCacheData.data.my_variant_info
+            );
 
-            if (gnomadData && gnomadData.gnomadExome && gnomadData.gnomadGenome) {
-                return calculateGnomadAllelFrequency (
-                    gnomadData.gnomadExome.alleleCount.ac + gnomadData.gnomadGenome.alleleCount.ac, 
-                    gnomadData.gnomadExome.alleleNumber.an + gnomadData.gnomadGenome.alleleFrequency.af, null).toString();
+            if (
+                gnomadData &&
+                gnomadData.gnomadExome &&
+                gnomadData.gnomadGenome
+            ) {
+                return calculateGnomadAllelFrequency(
+                    gnomadData.gnomadExome.alleleCount.ac +
+                        gnomadData.gnomadGenome.alleleCount.ac,
+                    gnomadData.gnomadExome.alleleNumber.an +
+                        gnomadData.gnomadGenome.alleleFrequency.af,
+                    null
+                ).toString();
             }
 
             if (gnomadData && gnomadData.gnomadExome) {
-                return calculateGnomadAllelFrequency (
-                    gnomadData.gnomadExome.alleleCount.ac, gnomadData.gnomadExome.alleleNumber.an, gnomadData.gnomadExome.alleleFrequency.af).toString();
+                return calculateGnomadAllelFrequency(
+                    gnomadData.gnomadExome.alleleCount.ac,
+                    gnomadData.gnomadExome.alleleNumber.an,
+                    gnomadData.gnomadExome.alleleFrequency.af
+                ).toString();
             }
 
             if (gnomadData && gnomadData.gnomadGenome) {
-                return calculateGnomadAllelFrequency (
-                    gnomadData.gnomadGenome.alleleCount.ac, gnomadData.gnomadGenome.alleleNumber.an, gnomadData.gnomadGenome.alleleFrequency.af).toString();
+                return calculateGnomadAllelFrequency(
+                    gnomadData.gnomadGenome.alleleCount.ac,
+                    gnomadData.gnomadGenome.alleleNumber.an,
+                    gnomadData.gnomadGenome.alleleFrequency.af
+                ).toString();
             }
         }
-        
-        return "";
 
+        return '';
     }
-} 
\ No newline at end of file
+}
diff --git a/src/shared/components/mutationTable/column/HgvscColumnFormatter.tsx b/src/shared/components/mutationTable/column/HgvscColumnFormatter.tsx
index 6c3f12594d2..aa12a1bf1aa 100644
--- a/src/shared/components/mutationTable/column/HgvscColumnFormatter.tsx
+++ b/src/shared/components/mutationTable/column/HgvscColumnFormatter.tsx
@@ -1,100 +1,136 @@
 import * as React from 'react';
-import {Circle} from "better-react-spinkit";
+import { Circle } from 'better-react-spinkit';
 import 'rc-tooltip/assets/bootstrap_white.css';
-import {Mutation} from "shared/api/generated/CBioPortalAPI";
+import { Mutation } from 'shared/api/generated/CBioPortalAPI';
 import {
     TableCellStatusIndicator,
     TableCellStatus,
-    VariantAnnotation
-} from "cbioportal-frontend-commons";
-import GenomeNexusCache, { GenomeNexusCacheDataType } from "shared/cache/GenomeNexusCache";
+    VariantAnnotation,
+} from 'cbioportal-frontend-commons';
+import GenomeNexusCache, {
+    GenomeNexusCacheDataType,
+} from 'shared/cache/GenomeNexusCache';
 
 export default class HgvscColumnFormatter {
-    
-    public static renderFunction(data:Mutation[],
-                                 genomeNexusCache:GenomeNexusCache|undefined) {
-        const genomeNexusCacheData = HgvscColumnFormatter.getGenomeNexusDataFromCache(data, genomeNexusCache);
+    public static renderFunction(
+        data: Mutation[],
+        genomeNexusCache: GenomeNexusCache | undefined
+    ) {
+        const genomeNexusCacheData = HgvscColumnFormatter.getGenomeNexusDataFromCache(
+            data,
+            genomeNexusCache
+        );
         return (
             <div>
-                <span>{HgvscColumnFormatter.getHgvscDataViz(genomeNexusCacheData)}</span>
+                <span>
+                    {HgvscColumnFormatter.getHgvscDataViz(genomeNexusCacheData)}
+                </span>
             </div>
         );
     }
 
-    private static getGenomeNexusDataFromCache(data:Mutation[], cache:GenomeNexusCache|undefined):GenomeNexusCacheDataType | null {
+    private static getGenomeNexusDataFromCache(
+        data: Mutation[],
+        cache: GenomeNexusCache | undefined
+    ): GenomeNexusCacheDataType | null {
         if (data.length === 0 || !cache) {
             return null;
         }
         return cache.get(data[0]);
     }
 
-    private static getHgvscDataViz(genomeNexusCacheData:GenomeNexusCacheDataType|null) {
-        let status:TableCellStatus | null = null;
+    private static getHgvscDataViz(
+        genomeNexusCacheData: GenomeNexusCacheDataType | null
+    ) {
+        let status: TableCellStatus | null = null;
 
         if (genomeNexusCacheData === null) {
             status = TableCellStatus.LOADING;
-        } else if (genomeNexusCacheData.status === "error") {
+        } else if (genomeNexusCacheData.status === 'error') {
             status = TableCellStatus.ERROR;
         } else if (genomeNexusCacheData.data === null) {
             status = TableCellStatus.NA;
         } else {
-            let hgvscData = HgvscColumnFormatter.getData(genomeNexusCacheData.data);
+            let hgvscData = HgvscColumnFormatter.getData(
+                genomeNexusCacheData.data
+            );
             if (hgvscData == null) {
                 return hgvscData;
+            } else {
+                return (
+                    <span style={{ display: 'inline-block', float: 'right' }}>
+                        {hgvscData}
+                    </span>
+                );
             }
-            else {
-                return <span style={{display: "inline-block", float:"right"}}>            
-                    {hgvscData}     
-                </span>
-            }        
         }
 
         if (status !== null) {
             // show loading circle
             if (status === TableCellStatus.LOADING) {
-                return <Circle size={18} scaleEnd={0.5} scaleStart={0.2} color="#aaa" className="pull-right"/>;
-            } 
-            else {
-                return <TableCellStatusIndicator status={status}/>;
+                return (
+                    <Circle
+                        size={18}
+                        scaleEnd={0.5}
+                        scaleStart={0.2}
+                        color="#aaa"
+                        className="pull-right"
+                    />
+                );
+            } else {
+                return <TableCellStatusIndicator status={status} />;
             }
         }
     }
 
-    public static getData(genomeNexusData: VariantAnnotation | null): string | null
-    {
-        if (!genomeNexusData)
-        {
+    public static getData(
+        genomeNexusData: VariantAnnotation | null
+    ): string | null {
+        if (!genomeNexusData) {
             return null;
         }
-        return genomeNexusData.annotation_summary.transcriptConsequenceSummary.hgvsc; 
+        return genomeNexusData.annotation_summary.transcriptConsequenceSummary
+            .hgvsc;
     }
 
-    public static download(data:Mutation[], genomeNexusCache:GenomeNexusCache): string
-    {
-        const genomeNexusData = HgvscColumnFormatter.getGenomeNexusDataFromCache(data, genomeNexusCache);
-        const hgvscData = genomeNexusData && HgvscColumnFormatter.getData(genomeNexusData.data);
+    public static download(
+        data: Mutation[],
+        genomeNexusCache: GenomeNexusCache
+    ): string {
+        const genomeNexusData = HgvscColumnFormatter.getGenomeNexusDataFromCache(
+            data,
+            genomeNexusCache
+        );
+        const hgvscData =
+            genomeNexusData &&
+            HgvscColumnFormatter.getData(genomeNexusData.data);
 
         if (!hgvscData) {
-            return "";
-        }
-        else {
+            return '';
+        } else {
             return hgvscData;
         }
     }
 
-    public static getSortValue(data:Mutation[], genomeNexusCache:GenomeNexusCache): number|null {
-        const genomeNexusCacheData = HgvscColumnFormatter.getGenomeNexusDataFromCache(data, genomeNexusCache);
+    public static getSortValue(
+        data: Mutation[],
+        genomeNexusCache: GenomeNexusCache
+    ): number | null {
+        const genomeNexusCacheData = HgvscColumnFormatter.getGenomeNexusDataFromCache(
+            data,
+            genomeNexusCache
+        );
         if (genomeNexusCacheData) {
-            let hgvscData =  HgvscColumnFormatter.getData(genomeNexusCacheData.data);
+            let hgvscData = HgvscColumnFormatter.getData(
+                genomeNexusCacheData.data
+            );
             if (hgvscData == null) {
-                return null
+                return null;
+            } else {
+                return parseInt(hgvscData.split('c.')[1]);
             }
-            else {
-                return parseInt(hgvscData.split("c.")[1]);
-            }           
-        }    
-        else {
+        } else {
             return null;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/mutationTable/column/HgvsgColumnFormatter.tsx b/src/shared/components/mutationTable/column/HgvsgColumnFormatter.tsx
index b5664ac0caf..1b374fd083b 100644
--- a/src/shared/components/mutationTable/column/HgvsgColumnFormatter.tsx
+++ b/src/shared/components/mutationTable/column/HgvsgColumnFormatter.tsx
@@ -1,48 +1,51 @@
 import * as React from 'react';
-import { Mutation } from "shared/api/generated/CBioPortalAPI";
-import { DefaultTooltip } from "cbioportal-frontend-commons";
+import { Mutation } from 'shared/api/generated/CBioPortalAPI';
+import { DefaultTooltip } from 'cbioportal-frontend-commons';
 import { generateHgvsgByMutation } from 'shared/lib/MutationUtils';
 import { buildGenomeNexusHgvsgUrl } from 'shared/api/urls';
 
-import hgvsgStyles from "./hgvsg.module.scss";
+import hgvsgStyles from './hgvsg.module.scss';
 
 export default class HgvsgColumnFormatter {
-    
-    public static renderFunction(data:Mutation[]) {
+    public static renderFunction(data: Mutation[]) {
         return HgvsgColumnFormatter.getHgvsgDataViz(data[0]);
     }
 
-    private static getHgvsgDataViz(mutation:Mutation) {
+    private static getHgvsgDataViz(mutation: Mutation) {
         let hgvsg = HgvsgColumnFormatter.getData(mutation);
         if (!hgvsg) {
             return <span />;
-        }
-        else {
+        } else {
             let genomeNexusUrl = buildGenomeNexusHgvsgUrl(hgvsg);
             return (
                 <DefaultTooltip
                     placement="topLeft"
-                    overlay={(
-                    <div>
-                        {hgvsg}<br />
-                        Click to see this variant on &nbsp;
-                        <a 
-                            href={genomeNexusUrl}
-                            target="_blank"
-                            rel="noopener noreferrer"
-                        >
-                            Genome Nexus
-                            <div className={hgvsgStyles["genome-nexus-logo"]} />
-                        </a>
-                    </div>)}
+                    overlay={
+                        <div>
+                            {hgvsg}
+                            <br />
+                            Click to see this variant on &nbsp;
+                            <a
+                                href={genomeNexusUrl}
+                                target="_blank"
+                                rel="noopener noreferrer"
+                            >
+                                Genome Nexus
+                                <div
+                                    className={hgvsgStyles['genome-nexus-logo']}
+                                />
+                            </a>
+                        </div>
+                    }
                 >
-                    <span className={hgvsgStyles["hgvsg-data"]}>
+                    <span className={hgvsgStyles['hgvsg-data']}>
                         <a
                             href={genomeNexusUrl}
                             target="_blank"
                             rel="noopener noreferrer"
                         >
-                            {hgvsg}&nbsp;<i className="fa fa-external-link" />
+                            {hgvsg}&nbsp;
+                            <i className="fa fa-external-link" />
                         </a>
                     </span>
                 </DefaultTooltip>
@@ -50,18 +53,16 @@ export default class HgvsgColumnFormatter {
         }
     }
 
-    public static getData(mutation: Mutation): string | null
-    {
+    public static getData(mutation: Mutation): string | null {
         return generateHgvsgByMutation(mutation);
     }
 
-    public static download(data:Mutation[]): string
-    {
+    public static download(data: Mutation[]): string {
         const hgvsg = HgvsgColumnFormatter.getData(data[0]);
-        return hgvsg ? hgvsg : "";
+        return hgvsg ? hgvsg : '';
     }
 
-    public static getSortValue(data:Mutation[]): string | null {
+    public static getSortValue(data: Mutation[]): string | null {
         return HgvsgColumnFormatter.getData(data[0]);
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/mutationTable/column/MrnaExprColumnFormatter.spec.tsx b/src/shared/components/mutationTable/column/MrnaExprColumnFormatter.spec.tsx
index 2bd6aba2bda..908e336fc96 100644
--- a/src/shared/components/mutationTable/column/MrnaExprColumnFormatter.spec.tsx
+++ b/src/shared/components/mutationTable/column/MrnaExprColumnFormatter.spec.tsx
@@ -5,17 +5,9 @@ import { shallow, mount } from 'enzyme';
 import sinon from 'sinon';
 
 describe('MrnaExprColumnFormatter', () => {
+    before(() => {});
 
-    before(()=>{
-
-    });
-
-    after(()=>{
-
-    });
-
-    it('what does it do?', ()=>{
-
-    });
+    after(() => {});
 
+    it('what does it do?', () => {});
 });
diff --git a/src/shared/components/mutationTable/column/MrnaExprColumnFormatter.tsx b/src/shared/components/mutationTable/column/MrnaExprColumnFormatter.tsx
index 00e8ea1b445..b94f4013ebc 100644
--- a/src/shared/components/mutationTable/column/MrnaExprColumnFormatter.tsx
+++ b/src/shared/components/mutationTable/column/MrnaExprColumnFormatter.tsx
@@ -2,52 +2,77 @@ import * as React from 'react';
 import {
     DefaultTooltip,
     TableCellStatusIndicator,
-    TableCellStatus
-} from "cbioportal-frontend-commons";
+    TableCellStatus,
+} from 'cbioportal-frontend-commons';
 import 'rc-tooltip/assets/bootstrap_white.css';
 import {
     MrnaExprRankCacheDataType,
-    default as MrnaExprRankCache
-} from "shared/cache/MrnaExprRankCache";
-import {Mutation, DiscreteCopyNumberData} from "shared/api/generated/CBioPortalAPI";
+    default as MrnaExprRankCache,
+} from 'shared/cache/MrnaExprRankCache';
+import {
+    Mutation,
+    DiscreteCopyNumberData,
+} from 'shared/api/generated/CBioPortalAPI';
 
 export default class MrnaExprColumnFormatter {
-
-    protected static getCircleX(percentile:number, circleLeft: number, circleRight:number) {
-        const proportion = percentile/100;
-        return circleLeft*(1-proportion) + circleRight*proportion;
+    protected static getCircleX(
+        percentile: number,
+        circleLeft: number,
+        circleRight: number
+    ) {
+        const proportion = percentile / 100;
+        return circleLeft * (1 - proportion) + circleRight * proportion;
     }
 
-    protected static getCircleFill(percentile:number) {
+    protected static getCircleFill(percentile: number) {
         if (percentile < 25) {
-            return "blue";
+            return 'blue';
         } else if (percentile > 75) {
-            return "red";
+            return 'red';
         } else {
-            return "gray";
+            return 'gray';
         }
     }
 
-    protected static getTooltipContents(cacheDatum:MrnaExprRankCacheDataType | null) {
-        if (cacheDatum && cacheDatum.status === "complete" && cacheDatum.data !== null) {
+    protected static getTooltipContents(
+        cacheDatum: MrnaExprRankCacheDataType | null
+    ) {
+        if (
+            cacheDatum &&
+            cacheDatum.status === 'complete' &&
+            cacheDatum.data !== null
+        ) {
             return (
                 <div>
-                    <span>mRNA level of the gene in this tumor</span><br/>
-                    <span><b>mRNA z-score: </b>{cacheDatum.data.zScore}</span><br/>
-                    <span><b>Percentile: </b>{cacheDatum.data.percentile}</span><br/>
+                    <span>mRNA level of the gene in this tumor</span>
+                    <br />
+                    <span>
+                        <b>mRNA z-score: </b>
+                        {cacheDatum.data.zScore}
+                    </span>
+                    <br />
+                    <span>
+                        <b>Percentile: </b>
+                        {cacheDatum.data.percentile}
+                    </span>
+                    <br />
                 </div>
             );
-        } else if (cacheDatum && cacheDatum.status === "complete" && cacheDatum.data === null) {
-            return (<span>mRNA data is not available for this gene.</span>);
-        } else if (cacheDatum && cacheDatum.status === "error") {
-            return (<span>Error retrieving data.</span>);
+        } else if (
+            cacheDatum &&
+            cacheDatum.status === 'complete' &&
+            cacheDatum.data === null
+        ) {
+            return <span>mRNA data is not available for this gene.</span>;
+        } else if (cacheDatum && cacheDatum.status === 'error') {
+            return <span>Error retrieving data.</span>;
         } else {
-            return (<span>Querying server for data.</span>);
+            return <span>Querying server for data.</span>;
         }
     }
 
-    private static getTdContents(cacheDatum:MrnaExprRankCacheDataType | null) {
-        let status:TableCellStatus | null = null;
+    private static getTdContents(cacheDatum: MrnaExprRankCacheDataType | null) {
+        let status: TableCellStatus | null = null;
         const barWidth = 30;
         const circleRadius = 3;
         const barXLeft = 0;
@@ -57,41 +82,49 @@ export default class MrnaExprColumnFormatter {
         const textWidth = 30;
         const textXLeft = circleXRight + circleRadius + 3;
         const width = textXLeft + textWidth;
-        if (cacheDatum && cacheDatum.status === "complete" && cacheDatum.data !== null) {
-            return (<svg
-                width={width}
-                height={12}
-            >
-                <text
-                    x={textXLeft}
-                    y={11}
-                    textAnchor="start"
-                    fontSize={10}
-                >
-                    {Math.round(cacheDatum.data.percentile)+"%"}
-                </text>
-                <g>
-                    <line
-                        x1={barXLeft}
-                        y1={8}
-                        x2={barXRight}
-                        y2={8}
-                        style={{stroke:"gray", strokeWidth:2}}
-                    />
-                    <circle
-                        cx={MrnaExprColumnFormatter.getCircleX(cacheDatum.data.percentile, circleXLeft, circleXRight)}
-                        cy={8}
-                        r={circleRadius}
-                        fill={MrnaExprColumnFormatter.getCircleFill(cacheDatum.data.percentile)}
-                    />
-                </g>
-            </svg>);
-        } else if (cacheDatum && cacheDatum.status === "complete" && cacheDatum.data === null) {
-            status=TableCellStatus.NA;
-        } else if (cacheDatum && cacheDatum.status === "error") {
-            status=TableCellStatus.ERROR;
+        if (
+            cacheDatum &&
+            cacheDatum.status === 'complete' &&
+            cacheDatum.data !== null
+        ) {
+            return (
+                <svg width={width} height={12}>
+                    <text x={textXLeft} y={11} textAnchor="start" fontSize={10}>
+                        {Math.round(cacheDatum.data.percentile) + '%'}
+                    </text>
+                    <g>
+                        <line
+                            x1={barXLeft}
+                            y1={8}
+                            x2={barXRight}
+                            y2={8}
+                            style={{ stroke: 'gray', strokeWidth: 2 }}
+                        />
+                        <circle
+                            cx={MrnaExprColumnFormatter.getCircleX(
+                                cacheDatum.data.percentile,
+                                circleXLeft,
+                                circleXRight
+                            )}
+                            cy={8}
+                            r={circleRadius}
+                            fill={MrnaExprColumnFormatter.getCircleFill(
+                                cacheDatum.data.percentile
+                            )}
+                        />
+                    </g>
+                </svg>
+            );
+        } else if (
+            cacheDatum &&
+            cacheDatum.status === 'complete' &&
+            cacheDatum.data === null
+        ) {
+            status = TableCellStatus.NA;
+        } else if (cacheDatum && cacheDatum.status === 'error') {
+            status = TableCellStatus.ERROR;
         } else {
-            status=TableCellStatus.LOADING;
+            status = TableCellStatus.LOADING;
         }
         if (status !== null) {
             return (
@@ -103,35 +136,48 @@ export default class MrnaExprColumnFormatter {
         }
     }
 
-    protected static getData(data: Mutation[], cache:MrnaExprRankCache):MrnaExprRankCacheDataType | null {
+    protected static getData(
+        data: Mutation[],
+        cache: MrnaExprRankCache
+    ): MrnaExprRankCacheDataType | null {
         if (data.length === 0) {
             return null;
         }
         const sampleId = data[0].sampleId;
         const entrezGeneId = data[0].entrezGeneId;
-        return cache.get({sampleId, entrezGeneId});
+        return cache.get({ sampleId, entrezGeneId });
     }
-    protected static getDataFromCNA(data: DiscreteCopyNumberData[], cache:MrnaExprRankCache):MrnaExprRankCacheDataType | null {
+    protected static getDataFromCNA(
+        data: DiscreteCopyNumberData[],
+        cache: MrnaExprRankCache
+    ): MrnaExprRankCacheDataType | null {
         const sampleId = data[0].sampleId;
         const entrezGeneId = data[0].entrezGeneId;
-        return cache.get({sampleId, entrezGeneId});
+        return cache.get({ sampleId, entrezGeneId });
     }
 
-    private static renderFromCacheDatum(cacheDatum:MrnaExprRankCacheDataType|null) {
-        return (<DefaultTooltip
-            placement="left"
-            overlay={MrnaExprColumnFormatter.getTooltipContents(cacheDatum)}
-            arrowContent={<div className="rc-tooltip-arrow-inner"/>}
-        >
-            {MrnaExprColumnFormatter.getTdContents(cacheDatum)}
-        </DefaultTooltip>);
+    private static renderFromCacheDatum(
+        cacheDatum: MrnaExprRankCacheDataType | null
+    ) {
+        return (
+            <DefaultTooltip
+                placement="left"
+                overlay={MrnaExprColumnFormatter.getTooltipContents(cacheDatum)}
+                arrowContent={<div className="rc-tooltip-arrow-inner" />}
+            >
+                {MrnaExprColumnFormatter.getTdContents(cacheDatum)}
+            </DefaultTooltip>
+        );
     }
-    public static renderFunction(data: Mutation[], cache:MrnaExprRankCache) {
+    public static renderFunction(data: Mutation[], cache: MrnaExprRankCache) {
         const cacheDatum = MrnaExprColumnFormatter.getData(data, cache);
         return MrnaExprColumnFormatter.renderFromCacheDatum(cacheDatum);
     }
 
-    public static cnaRenderFunction(data: DiscreteCopyNumberData[], cache:MrnaExprRankCache) {
+    public static cnaRenderFunction(
+        data: DiscreteCopyNumberData[],
+        cache: MrnaExprRankCache
+    ) {
         const cacheDatum = MrnaExprColumnFormatter.getDataFromCNA(data, cache);
         return MrnaExprColumnFormatter.renderFromCacheDatum(cacheDatum);
     }
diff --git a/src/shared/components/mutationTable/column/MutationCountColumnFormatter.tsx b/src/shared/components/mutationTable/column/MutationCountColumnFormatter.tsx
index 1e315e65103..36ffd086105 100644
--- a/src/shared/components/mutationTable/column/MutationCountColumnFormatter.tsx
+++ b/src/shared/components/mutationTable/column/MutationCountColumnFormatter.tsx
@@ -1,33 +1,47 @@
-import * as React from "react";
-import LazyLoadedTableCell from "shared/lib/LazyLoadedTableCell";
-import {Mutation, ClinicalData} from "../../../api/generated/CBioPortalAPI";
-import MutationCountCache from "../../../cache/MutationCountCache";
-import MutationTable, {IMutationTableProps} from "../MutationTable";
-import generalStyles from "./styles.module.scss";
+import * as React from 'react';
+import LazyLoadedTableCell from 'shared/lib/LazyLoadedTableCell';
+import { Mutation, ClinicalData } from '../../../api/generated/CBioPortalAPI';
+import MutationCountCache from '../../../cache/MutationCountCache';
+import MutationTable, { IMutationTableProps } from '../MutationTable';
+import generalStyles from './styles.module.scss';
 
 export default class MutationCountColumnFormatter {
-    public static makeRenderFunction<P extends IMutationTableProps>(table:MutationTable<P>) {
+    public static makeRenderFunction<P extends IMutationTableProps>(
+        table: MutationTable<P>
+    ) {
         return LazyLoadedTableCell(
-            (d:Mutation[])=>{
-                const mutationCountCache:MutationCountCache|undefined = table.props.mutationCountCache;
+            (d: Mutation[]) => {
+                const mutationCountCache: MutationCountCache | undefined =
+                    table.props.mutationCountCache;
                 if (mutationCountCache) {
-                    return mutationCountCache.get({sampleId:d[0].sampleId, studyId:d[0].studyId});
+                    return mutationCountCache.get({
+                        sampleId: d[0].sampleId,
+                        studyId: d[0].studyId,
+                    });
                 } else {
                     return {
-                        status: "error",
-                        data: null
+                        status: 'error',
+                        data: null,
                     };
                 }
             },
-            (t:ClinicalData)=>(<div className={generalStyles["integer-data"]}>{t.value}</div>),
-            "Mutation count not available for this sample."
+            (t: ClinicalData) => (
+                <div className={generalStyles['integer-data']}>{t.value}</div>
+            ),
+            'Mutation count not available for this sample.'
         );
     }
 
-    public static sortBy(d:Mutation[], mutationCountCache?:MutationCountCache): number|null {
-        let ret:number|null = null;;
+    public static sortBy(
+        d: Mutation[],
+        mutationCountCache?: MutationCountCache
+    ): number | null {
+        let ret: number | null = null;
         if (mutationCountCache) {
-            const cacheDatum = mutationCountCache.get({sampleId:d[0].sampleId, studyId:d[0].studyId});
+            const cacheDatum = mutationCountCache.get({
+                sampleId: d[0].sampleId,
+                studyId: d[0].studyId,
+            });
             if (cacheDatum && cacheDatum.data) {
                 ret = parseInt(cacheDatum.data.value);
             } else {
@@ -39,9 +53,15 @@ export default class MutationCountColumnFormatter {
         return ret;
     }
 
-    public static download(d:Mutation[], mutationCountCache?:MutationCountCache) {
-        const sortValue = MutationCountColumnFormatter.sortBy(d, mutationCountCache);
+    public static download(
+        d: Mutation[],
+        mutationCountCache?: MutationCountCache
+    ) {
+        const sortValue = MutationCountColumnFormatter.sortBy(
+            d,
+            mutationCountCache
+        );
 
-        return sortValue ? `${sortValue}` : "";
+        return sortValue ? `${sortValue}` : '';
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/mutationTable/column/MutationStatusColumnFormatter.spec.tsx b/src/shared/components/mutationTable/column/MutationStatusColumnFormatter.spec.tsx
index 90e39bd0f78..2c29e72128f 100644
--- a/src/shared/components/mutationTable/column/MutationStatusColumnFormatter.spec.tsx
+++ b/src/shared/components/mutationTable/column/MutationStatusColumnFormatter.spec.tsx
@@ -1,22 +1,22 @@
-import {DefaultTooltip} from "cbioportal-frontend-commons";
+import { DefaultTooltip } from 'cbioportal-frontend-commons';
 import MutationStatusColumnFormatter from './MutationStatusColumnFormatter';
 import styles from './mutationStatus.module.scss';
-import {initMutation} from "test/MutationMockUtils";
+import { initMutation } from 'test/MutationMockUtils';
 import React from 'react';
 import { assert } from 'chai';
-import {shallow, mount, ReactWrapper} from 'enzyme';
+import { shallow, mount, ReactWrapper } from 'enzyme';
 
 describe('MutationStatusColumnFormatter', () => {
     const germlineMutation = initMutation({
-        mutationStatus: "Germline"
+        mutationStatus: 'Germline',
     });
 
     const somaticMutation = initMutation({
-        mutationStatus: "Somatic"
+        mutationStatus: 'Somatic',
     });
 
     const naMutation = initMutation({
-        mutationStatus: "na"
+        mutationStatus: 'na',
     });
 
     const germlineData = [germlineMutation];
@@ -28,45 +28,69 @@ describe('MutationStatusColumnFormatter', () => {
     let naComponent: ReactWrapper<any, any>;
 
     before(() => {
-        germlineComponent = mount(MutationStatusColumnFormatter.renderFunction(germlineData));
-        somaticComponent = mount(MutationStatusColumnFormatter.renderFunction(somaticData));
-        naComponent = mount(MutationStatusColumnFormatter.renderFunction(naData));
+        germlineComponent = mount(
+            MutationStatusColumnFormatter.renderFunction(germlineData)
+        );
+        somaticComponent = mount(
+            MutationStatusColumnFormatter.renderFunction(somaticData)
+        );
+        naComponent = mount(
+            MutationStatusColumnFormatter.renderFunction(naData)
+        );
     });
 
-    after(() => {
-
-    });
+    after(() => {});
 
     it('gets mutation status data properly', () => {
-        assert.equal(MutationStatusColumnFormatter.getData(germlineData), "Germline",
-            "Germline mutation status data is properly extracted");
+        assert.equal(
+            MutationStatusColumnFormatter.getData(germlineData),
+            'Germline',
+            'Germline mutation status data is properly extracted'
+        );
 
-        assert.equal(MutationStatusColumnFormatter.getData(somaticData), "Somatic",
-            "Somatic mutation status data is properly extracted");
+        assert.equal(
+            MutationStatusColumnFormatter.getData(somaticData),
+            'Somatic',
+            'Somatic mutation status data is properly extracted'
+        );
     });
 
-    function testRenderedValues(component: ReactWrapper<any, any>,
-                                className: string,
-                                value: string)
-    {
-        assert.isTrue(component.find(`span.${styles[className]}`).exists(),
-            `Span has the correct class name for ${value}`);
-        assert.isTrue(component.find(`span.${styles[className]}`).text().indexOf(value) > -1,
-            `Display value is correct for ${value}`);
+    function testRenderedValues(
+        component: ReactWrapper<any, any>,
+        className: string,
+        value: string
+    ) {
+        assert.isTrue(
+            component.find(`span.${styles[className]}`).exists(),
+            `Span has the correct class name for ${value}`
+        );
+        assert.isTrue(
+            component
+                .find(`span.${styles[className]}`)
+                .text()
+                .indexOf(value) > -1,
+            `Display value is correct for ${value}`
+        );
     }
 
     it('renders component display value, class name, and cell value property', () => {
-        testRenderedValues(germlineComponent, "germline", "G");
-        testRenderedValues(somaticComponent, "somatic", "S");
-        testRenderedValues(naComponent, "unknown", "na");
+        testRenderedValues(germlineComponent, 'germline', 'G');
+        testRenderedValues(somaticComponent, 'somatic', 'S');
+        testRenderedValues(naComponent, 'unknown', 'na');
     });
 
     it('adds tooltips only for germline and somatic mutation statuses', () => {
-        assert.isTrue(germlineComponent.find(DefaultTooltip).exists(),
-            'Tooltip should exist for germline mutations');
-        assert.isTrue(somaticComponent.find(DefaultTooltip).exists(),
-            'Tooltip should exist for somatic mutations');
-        assert.isFalse(naComponent.find(DefaultTooltip).exists(),
-            'Tooltip should not exist for unknown statuses');
+        assert.isTrue(
+            germlineComponent.find(DefaultTooltip).exists(),
+            'Tooltip should exist for germline mutations'
+        );
+        assert.isTrue(
+            somaticComponent.find(DefaultTooltip).exists(),
+            'Tooltip should exist for somatic mutations'
+        );
+        assert.isFalse(
+            naComponent.find(DefaultTooltip).exists(),
+            'Tooltip should not exist for unknown statuses'
+        );
     });
 });
diff --git a/src/shared/components/mutationTable/column/MutationStatusColumnFormatter.tsx b/src/shared/components/mutationTable/column/MutationStatusColumnFormatter.tsx
index e2744c87544..e053322c33f 100644
--- a/src/shared/components/mutationTable/column/MutationStatusColumnFormatter.tsx
+++ b/src/shared/components/mutationTable/column/MutationStatusColumnFormatter.tsx
@@ -1,16 +1,14 @@
-import * as React from "react";
-import {Mutation} from "shared/api/generated/CBioPortalAPI";
-import styles from "./mutationStatus.module.scss";
-import {DefaultTooltip} from "cbioportal-frontend-commons";
+import * as React from 'react';
+import { Mutation } from 'shared/api/generated/CBioPortalAPI';
+import styles from './mutationStatus.module.scss';
+import { DefaultTooltip } from 'cbioportal-frontend-commons';
 
 /**
  * @author Selcuk Onur Sumer
  */
-export default class MutationStatusColumnFormatter
-{
-    public static getData(data:Mutation[])
-    {
-        let value: string|null = null;
+export default class MutationStatusColumnFormatter {
+    public static getData(data: Mutation[]) {
+        let value: string | null = null;
 
         if (data.length > 0) {
             value = data[0].mutationStatus;
@@ -19,43 +17,39 @@ export default class MutationStatusColumnFormatter
         return value;
     }
 
-    public static sortValue(data:Mutation[])
-    {
+    public static sortValue(data: Mutation[]) {
         return MutationStatusColumnFormatter.getData(data);
     }
 
-    public static download(data:Mutation[])
-    {
-        return MutationStatusColumnFormatter.getData(data) || "";
+    public static download(data: Mutation[]) {
+        return MutationStatusColumnFormatter.getData(data) || '';
     }
 
-    public static renderFunction(data:Mutation[])
-    {
+    public static renderFunction(data: Mutation[]) {
         const value = MutationStatusColumnFormatter.getData(data);
         let content: JSX.Element;
         let needTooltip = false;
 
         if (value) {
-            if (value.toLowerCase().indexOf("somatic") > -1) {
+            if (value.toLowerCase().indexOf('somatic') > -1) {
                 content = <span className={styles.somatic}>S</span>;
                 needTooltip = true;
-            }
-            else if (value.toLowerCase().indexOf("germline") > -1) {
+            } else if (value.toLowerCase().indexOf('germline') > -1) {
                 content = <span className={styles.germline}>G</span>;
                 needTooltip = true;
-            }
-            else {
+            } else {
                 content = <span className={styles.unknown}>{value}</span>;
             }
-        }
-        else {
+        } else {
             content = <span />;
         }
 
-        if (needTooltip)
-        {
+        if (needTooltip) {
             content = (
-                <DefaultTooltip overlay={<span>{value}</span>} placement="right">
+                <DefaultTooltip
+                    overlay={<span>{value}</span>}
+                    placement="right"
+                >
                     {content}
                 </DefaultTooltip>
             );
diff --git a/src/shared/components/mutationTable/column/MutationTypeColumnFormatter.spec.tsx b/src/shared/components/mutationTable/column/MutationTypeColumnFormatter.spec.tsx
index f8838d7967b..2c01471b5b8 100644
--- a/src/shared/components/mutationTable/column/MutationTypeColumnFormatter.spec.tsx
+++ b/src/shared/components/mutationTable/column/MutationTypeColumnFormatter.spec.tsx
@@ -1,42 +1,42 @@
 import MutationTypeColumnFormatter from './MutationTypeColumnFormatter';
 import styles from './mutationType.module.scss';
-import {initMutation} from "test/MutationMockUtils";
+import { initMutation } from 'test/MutationMockUtils';
 import React from 'react';
 import { assert } from 'chai';
-import {shallow, mount, ReactWrapper} from 'enzyme';
+import { shallow, mount, ReactWrapper } from 'enzyme';
 import sinon from 'sinon';
 
 describe('MutationTypeColumnFormatter', () => {
     const missenseVariant = initMutation({
-        mutationType: "Missense_Variant"
+        mutationType: 'Missense_Variant',
     });
 
     const missenseMutation = initMutation({
-        mutationType: "Missense_mutation"
+        mutationType: 'Missense_mutation',
     });
 
     const stopgainSnv = initMutation({
-        mutationType: "stopgain_SNV"
+        mutationType: 'stopgain_SNV',
     });
 
     const nonFrameShiftDeletion = initMutation({
-        mutationType: "NonFrameShift_deletion"
+        mutationType: 'NonFrameShift_deletion',
     });
 
     const spliceSite = initMutation({
-        mutationType: "Splice Site"
+        mutationType: 'Splice Site',
     });
 
     const frameshiftDeletion = initMutation({
-        mutationType: "FrameShift_Deletion"
+        mutationType: 'FrameShift_Deletion',
     });
 
     const otherMutation = initMutation({
-        mutationType: "other"
+        mutationType: 'other',
     });
 
     const unknownMutation = initMutation({
-        mutationType: "a_strange_type_of_mutation"
+        mutationType: 'a_strange_type_of_mutation',
     });
 
     const tableData = [
@@ -47,7 +47,7 @@ describe('MutationTypeColumnFormatter', () => {
         [spliceSite],
         [frameshiftDeletion],
         [otherMutation],
-        [unknownMutation]
+        [unknownMutation],
     ];
 
     let msVarComponent: ReactWrapper<any, any>;
@@ -61,54 +61,115 @@ describe('MutationTypeColumnFormatter', () => {
 
     before(() => {
         let data = [missenseVariant];
-        msVarComponent = mount(MutationTypeColumnFormatter.renderFunction(data));
+        msVarComponent = mount(
+            MutationTypeColumnFormatter.renderFunction(data)
+        );
 
         data = [missenseMutation];
-        msMutComponent = mount(MutationTypeColumnFormatter.renderFunction(data));
+        msMutComponent = mount(
+            MutationTypeColumnFormatter.renderFunction(data)
+        );
 
         data = [stopgainSnv];
-        stopgainSnvComponent = mount(MutationTypeColumnFormatter.renderFunction(data));
+        stopgainSnvComponent = mount(
+            MutationTypeColumnFormatter.renderFunction(data)
+        );
 
         data = [nonFrameShiftDeletion];
-        nonFsDelComponent = mount(MutationTypeColumnFormatter.renderFunction(data));
+        nonFsDelComponent = mount(
+            MutationTypeColumnFormatter.renderFunction(data)
+        );
 
         data = [spliceSite];
-        spliceComponent = mount(MutationTypeColumnFormatter.renderFunction(data));
+        spliceComponent = mount(
+            MutationTypeColumnFormatter.renderFunction(data)
+        );
 
         data = [frameshiftDeletion];
-        fsDelComponent = mount(MutationTypeColumnFormatter.renderFunction(data));
+        fsDelComponent = mount(
+            MutationTypeColumnFormatter.renderFunction(data)
+        );
 
         data = [unknownMutation];
-        unknownMutComponent = mount(MutationTypeColumnFormatter.renderFunction(data));
+        unknownMutComponent = mount(
+            MutationTypeColumnFormatter.renderFunction(data)
+        );
 
         data = [otherMutation];
-        otherMutComponent = mount(MutationTypeColumnFormatter.renderFunction(data));
+        otherMutComponent = mount(
+            MutationTypeColumnFormatter.renderFunction(data)
+        );
     });
 
-    function testRenderedValues(component: ReactWrapper<any, any>,
-                                mutationType: string,
-                                className: string,
-                                value: string)
-    {
-        assert.isTrue(component.find(`span.${styles[className]}`).exists(),
-            `Span has the correct class name for ${mutationType}`);
-        assert.isTrue(component.find(`span.${styles[className]}`).text().indexOf(value) > -1,
-            `Display value is correct for ${mutationType}`);
+    function testRenderedValues(
+        component: ReactWrapper<any, any>,
+        mutationType: string,
+        className: string,
+        value: string
+    ) {
+        assert.isTrue(
+            component.find(`span.${styles[className]}`).exists(),
+            `Span has the correct class name for ${mutationType}`
+        );
+        assert.isTrue(
+            component
+                .find(`span.${styles[className]}`)
+                .text()
+                .indexOf(value) > -1,
+            `Display value is correct for ${mutationType}`
+        );
     }
 
     it('renders component display value, class name, and cell value property', () => {
-        testRenderedValues(msVarComponent, "Missense_Variant", "missense-mutation", "Missense");
-        testRenderedValues(msMutComponent, "Missense_mutation", "missense-mutation", "Missense");
-        testRenderedValues(stopgainSnvComponent, "stopgain_SNV", "trunc-mutation", "Nonsense");
-        testRenderedValues(nonFsDelComponent, "NonFrameShift_deletion", "inframe-mutation", "IF");
-        testRenderedValues(spliceComponent, "Splice Site", "trunc-mutation", "Splice");
-        testRenderedValues(fsDelComponent, "FrameShift_Deletion", "trunc-mutation", "FS del");
-        testRenderedValues(unknownMutComponent, "a_strange_type_of_mutation", "other-mutation", "Other");
-        testRenderedValues(otherMutComponent, "other", "other-mutation", "Other");
-    });
-
-    after(() => {
-
+        testRenderedValues(
+            msVarComponent,
+            'Missense_Variant',
+            'missense-mutation',
+            'Missense'
+        );
+        testRenderedValues(
+            msMutComponent,
+            'Missense_mutation',
+            'missense-mutation',
+            'Missense'
+        );
+        testRenderedValues(
+            stopgainSnvComponent,
+            'stopgain_SNV',
+            'trunc-mutation',
+            'Nonsense'
+        );
+        testRenderedValues(
+            nonFsDelComponent,
+            'NonFrameShift_deletion',
+            'inframe-mutation',
+            'IF'
+        );
+        testRenderedValues(
+            spliceComponent,
+            'Splice Site',
+            'trunc-mutation',
+            'Splice'
+        );
+        testRenderedValues(
+            fsDelComponent,
+            'FrameShift_Deletion',
+            'trunc-mutation',
+            'FS del'
+        );
+        testRenderedValues(
+            unknownMutComponent,
+            'a_strange_type_of_mutation',
+            'other-mutation',
+            'Other'
+        );
+        testRenderedValues(
+            otherMutComponent,
+            'other',
+            'other-mutation',
+            'Other'
+        );
     });
 
+    after(() => {});
 });
diff --git a/src/shared/components/mutationTable/column/MutationTypeColumnFormatter.tsx b/src/shared/components/mutationTable/column/MutationTypeColumnFormatter.tsx
index 53a00a36e5a..780a4e2caf0 100644
--- a/src/shared/components/mutationTable/column/MutationTypeColumnFormatter.tsx
+++ b/src/shared/components/mutationTable/column/MutationTypeColumnFormatter.tsx
@@ -1,7 +1,10 @@
 import * as React from 'react';
-import {DefaultTooltip, getCanonicalMutationType} from 'cbioportal-frontend-commons';
-import {Mutation} from "shared/api/generated/CBioPortalAPI";
-import styles from "./mutationType.module.scss";
+import {
+    DefaultTooltip,
+    getCanonicalMutationType,
+} from 'cbioportal-frontend-commons';
+import { Mutation } from 'shared/api/generated/CBioPortalAPI';
+import styles from './mutationType.module.scss';
 
 interface IMutationTypeFormat {
     label?: string;
@@ -14,86 +17,116 @@ interface IMutationTypeFormat {
 /**
  * @author Selcuk Onur Sumer
  */
-export default class MutationTypeColumnFormatter
-{
-    public static get MAIN_MUTATION_TYPE_MAP():{[key:string]: IMutationTypeFormat} {
+export default class MutationTypeColumnFormatter {
+    public static get MAIN_MUTATION_TYPE_MAP(): {
+        [key: string]: IMutationTypeFormat;
+    } {
         return {
-            missense: {label: "Missense",
-                longName: "Missense",
-                className: "missense-mutation",
-                mainType: "missense",
-                priority: 1},
-            inframe: {label: "IF",
-                longName: "In-frame",
-                className: "inframe-mutation",
-                mainType: "inframe",
-                priority: 2},
+            missense: {
+                label: 'Missense',
+                longName: 'Missense',
+                className: 'missense-mutation',
+                mainType: 'missense',
+                priority: 1,
+            },
+            inframe: {
+                label: 'IF',
+                longName: 'In-frame',
+                className: 'inframe-mutation',
+                mainType: 'inframe',
+                priority: 2,
+            },
             truncating: {
-                label: "Truncating",
-                longName: "Truncating",
-                className: "trunc-mutation",
-                mainType: "truncating",
-                priority: 4},
-            nonsense: {label: "Nonsense",
-                longName: "Nonsense",
-                className: "trunc-mutation",
-                mainType: "truncating",
-                priority: 6},
-            nonstop: {label: "Nonstop",
-                longName: "Nonstop",
-                className: "trunc-mutation",
-                mainType: "truncating",
-                priority: 7},
-            nonstart: {label: "Nonstart",
-                longName: "Nonstart",
-                className: "trunc-mutation",
-                mainType: "truncating",
-                priority: 8},
-            frameshift: {label: "FS",
-                longName: "Frame Shift",
-                className: "trunc-mutation",
-                mainType: "truncating",
-                priority: 4},
-            frame_shift_del: {label: "FS del",
-                longName: "Frame Shift Deletion",
-                className: "trunc-mutation",
-                mainType: "truncating",
-                priority: 4},
-            frame_shift_ins: {label: "FS ins",
-                longName: "Frame Shift Insertion",
-                className: "trunc-mutation",
-                mainType: "truncating",
-                priority: 5},
-            in_frame_ins: {label: "IF ins",
-                longName: "In-frame Insertion",
-                className: "inframe-mutation",
-                mainType: "inframe",
-                priority: 3},
-            in_frame_del: {label: "IF del",
-                longName: "In-frame Deletion",
-                className: "inframe-mutation",
-                mainType: "inframe",
-                priority: 2},
-            splice_site: {label: "Splice",
-                longName: "Splice site",
-                className: "trunc-mutation",
-                mainType: "truncating",
-                priority: 9},
-            fusion: {label: "Fusion",
-                longName: "Fusion",
-                className: "fusion",
-                mainType: "other",
-                priority: 10},
-            silent: {label: "Silent",
-                longName: "Silent",
-                className: "other-mutation",
-                mainType: "other",
-                priority: 11},
-            other: {label: "Other",
-                longName: "Other",
-                className: "other-mutation",
-                mainType: "other",
-                priority: 11},
+                label: 'Truncating',
+                longName: 'Truncating',
+                className: 'trunc-mutation',
+                mainType: 'truncating',
+                priority: 4,
+            },
+            nonsense: {
+                label: 'Nonsense',
+                longName: 'Nonsense',
+                className: 'trunc-mutation',
+                mainType: 'truncating',
+                priority: 6,
+            },
+            nonstop: {
+                label: 'Nonstop',
+                longName: 'Nonstop',
+                className: 'trunc-mutation',
+                mainType: 'truncating',
+                priority: 7,
+            },
+            nonstart: {
+                label: 'Nonstart',
+                longName: 'Nonstart',
+                className: 'trunc-mutation',
+                mainType: 'truncating',
+                priority: 8,
+            },
+            frameshift: {
+                label: 'FS',
+                longName: 'Frame Shift',
+                className: 'trunc-mutation',
+                mainType: 'truncating',
+                priority: 4,
+            },
+            frame_shift_del: {
+                label: 'FS del',
+                longName: 'Frame Shift Deletion',
+                className: 'trunc-mutation',
+                mainType: 'truncating',
+                priority: 4,
+            },
+            frame_shift_ins: {
+                label: 'FS ins',
+                longName: 'Frame Shift Insertion',
+                className: 'trunc-mutation',
+                mainType: 'truncating',
+                priority: 5,
+            },
+            in_frame_ins: {
+                label: 'IF ins',
+                longName: 'In-frame Insertion',
+                className: 'inframe-mutation',
+                mainType: 'inframe',
+                priority: 3,
+            },
+            in_frame_del: {
+                label: 'IF del',
+                longName: 'In-frame Deletion',
+                className: 'inframe-mutation',
+                mainType: 'inframe',
+                priority: 2,
+            },
+            splice_site: {
+                label: 'Splice',
+                longName: 'Splice site',
+                className: 'trunc-mutation',
+                mainType: 'truncating',
+                priority: 9,
+            },
+            fusion: {
+                label: 'Fusion',
+                longName: 'Fusion',
+                className: 'fusion',
+                mainType: 'other',
+                priority: 10,
+            },
+            silent: {
+                label: 'Silent',
+                longName: 'Silent',
+                className: 'other-mutation',
+                mainType: 'other',
+                priority: 11,
+            },
+            other: {
+                label: 'Other',
+                longName: 'Other',
+                className: 'other-mutation',
+                mainType: 'other',
+                priority: 11,
+            },
         };
     }
 
@@ -103,10 +136,10 @@ export default class MutationTypeColumnFormatter
      * @param data  column formatter data
      * @returns {string}    mutation assessor text value
      */
-    public static getDisplayValue(data:Mutation[]):string
-    {
-        const entry:IMutationTypeFormat|undefined =
-            MutationTypeColumnFormatter.getMapEntry(data);
+    public static getDisplayValue(data: Mutation[]): string {
+        const entry:
+            | IMutationTypeFormat
+            | undefined = MutationTypeColumnFormatter.getMapEntry(data);
 
         // first, try to find a mapped value
         if (entry && entry.label) {
@@ -118,9 +151,8 @@ export default class MutationTypeColumnFormatter
         }
     }
 
-    public static getTextValue(data:Mutation[]):string
-    {
-        let textValue:string = "";
+    public static getTextValue(data: Mutation[]): string {
+        let textValue: string = '';
         const dataValue = MutationTypeColumnFormatter.getData(data);
 
         if (dataValue) {
@@ -130,34 +162,34 @@ export default class MutationTypeColumnFormatter
         return textValue;
     }
 
-    public static getClassName(data:Mutation[]):string
-    {
-        const value:IMutationTypeFormat|undefined =
-            MutationTypeColumnFormatter.getMapEntry(data);
+    public static getClassName(data: Mutation[]): string {
+        const value:
+            | IMutationTypeFormat
+            | undefined = MutationTypeColumnFormatter.getMapEntry(data);
 
         if (value && value.className) {
             return value.className;
         }
         // for unmapped values, use the "other" style
         else {
-            return MutationTypeColumnFormatter.MAIN_MUTATION_TYPE_MAP["other"].className;
+            return MutationTypeColumnFormatter.MAIN_MUTATION_TYPE_MAP['other']
+                .className;
         }
     }
 
-    public static getMapEntry(data:Mutation[])
-    {
+    public static getMapEntry(data: Mutation[]) {
         const mutationType = MutationTypeColumnFormatter.getData(data);
 
         if (mutationType) {
-            return MutationTypeColumnFormatter.MAIN_MUTATION_TYPE_MAP[getCanonicalMutationType(mutationType)];
-        }
-        else {
+            return MutationTypeColumnFormatter.MAIN_MUTATION_TYPE_MAP[
+                getCanonicalMutationType(mutationType)
+            ];
+        } else {
             return undefined;
         }
     }
 
-    public static getData(data:Mutation[])
-    {
+    public static getData(data: Mutation[]) {
         if (data.length > 0) {
             return data[0].mutationType;
         } else {
@@ -165,24 +197,28 @@ export default class MutationTypeColumnFormatter
         }
     }
 
-    public static renderFunction(data:Mutation[])
-    {
+    public static renderFunction(data: Mutation[]) {
         // use text for all purposes (display, sort, filter)
-        const text:string = MutationTypeColumnFormatter.getDisplayValue(data);
-        const className:string = MutationTypeColumnFormatter.getClassName(data);
+        const text: string = MutationTypeColumnFormatter.getDisplayValue(data);
+        const className: string = MutationTypeColumnFormatter.getClassName(
+            data
+        );
 
         // use actual value for tooltip
-        const toolTip:string = MutationTypeColumnFormatter.getTextValue(data);
+        const toolTip: string = MutationTypeColumnFormatter.getTextValue(data);
 
         let content = <span className={styles[className]}>{text}</span>;
 
         // add tooltip only if the display value differs from the actual text value!
-        if (toolTip.toLowerCase() !== text.toLowerCase())
-        {
-            const arrowContent = <div className="rc-tooltip-arrow-inner"/>;
+        if (toolTip.toLowerCase() !== text.toLowerCase()) {
+            const arrowContent = <div className="rc-tooltip-arrow-inner" />;
 
             content = (
-                <DefaultTooltip overlay={<span>{toolTip}</span>} placement="left" arrowContent={arrowContent}>
+                <DefaultTooltip
+                    overlay={<span>{toolTip}</span>}
+                    placement="left"
+                    arrowContent={arrowContent}
+                >
                     {content}
                 </DefaultTooltip>
             );
@@ -191,4 +227,3 @@ export default class MutationTypeColumnFormatter
         return content;
     }
 }
-
diff --git a/src/shared/components/mutationTable/column/NormalAlleleFreqColumnFormatter.tsx b/src/shared/components/mutationTable/column/NormalAlleleFreqColumnFormatter.tsx
index f4a573a2126..b5ac19a26e1 100644
--- a/src/shared/components/mutationTable/column/NormalAlleleFreqColumnFormatter.tsx
+++ b/src/shared/components/mutationTable/column/NormalAlleleFreqColumnFormatter.tsx
@@ -1,38 +1,46 @@
 import * as React from 'react';
-import {Mutation} from "shared/api/generated/CBioPortalAPI";
-import {TableCellStatus, TableCellStatusIndicator} from "cbioportal-frontend-commons";
-import TumorAlleleFreqColumnFormatter, {getFormattedFrequencyValue} from "./TumorAlleleFreqColumnFormatter";
-
-export default class NormalAlleleFreqColumnFormatter
-{
-    public static renderFunction(mutations:Mutation[]) {
-        const frequency = NormalAlleleFreqColumnFormatter.getSortValue(mutations);
+import { Mutation } from 'shared/api/generated/CBioPortalAPI';
+import {
+    TableCellStatus,
+    TableCellStatusIndicator,
+} from 'cbioportal-frontend-commons';
+import TumorAlleleFreqColumnFormatter, {
+    getFormattedFrequencyValue,
+} from './TumorAlleleFreqColumnFormatter';
+
+export default class NormalAlleleFreqColumnFormatter {
+    public static renderFunction(mutations: Mutation[]) {
+        const frequency = NormalAlleleFreqColumnFormatter.getSortValue(
+            mutations
+        );
 
         if (frequency) {
             const altReads = mutations[0].normalAltCount;
             const refReads = mutations[0].normalRefCount;
 
-            return TumorAlleleFreqColumnFormatter.mainContent(frequency, altReads, refReads);
-        }
-        else {
-            return (
-                <TableCellStatusIndicator status={TableCellStatus.NA} />
+            return TumorAlleleFreqColumnFormatter.mainContent(
+                frequency,
+                altReads,
+                refReads
             );
+        } else {
+            return <TableCellStatusIndicator status={TableCellStatus.NA} />;
         }
     }
 
-    public static getTextValue(mutations:Mutation[]) : string {
-        const frequency = NormalAlleleFreqColumnFormatter.getSortValue(mutations);
+    public static getTextValue(mutations: Mutation[]): string {
+        const frequency = NormalAlleleFreqColumnFormatter.getSortValue(
+            mutations
+        );
 
         if (frequency) {
             return getFormattedFrequencyValue(frequency);
         }
 
-        return "";
+        return '';
     }
 
-    public static getSortValue(mutations:Mutation[])
-    {
+    public static getSortValue(mutations: Mutation[]) {
         const mutation = mutations[0];
 
         if (!mutation) {
@@ -42,10 +50,10 @@ export default class NormalAlleleFreqColumnFormatter
         const altReads = mutation.normalAltCount;
         const refReads = mutation.normalRefCount;
 
-        if ((altReads < 0) || (refReads < 0)) {
+        if (altReads < 0 || refReads < 0) {
             return null;
         }
 
-        return (altReads / (altReads + refReads));
+        return altReads / (altReads + refReads);
     }
 }
diff --git a/src/shared/components/mutationTable/column/PanelColumnFormatter.spec.tsx b/src/shared/components/mutationTable/column/PanelColumnFormatter.spec.tsx
index cf44dd874c8..3a9aacdd17b 100644
--- a/src/shared/components/mutationTable/column/PanelColumnFormatter.spec.tsx
+++ b/src/shared/components/mutationTable/column/PanelColumnFormatter.spec.tsx
@@ -5,64 +5,67 @@ import SampleManager from 'pages/patientView/SampleManager';
 import React from 'react';
 
 const mockData = [
-  {
-    alteration: 1,
-    entrezGeneId: 1,
-    gene: { 
-      entrezGeneId: 1, 
-      hugoGeneSymbol: 'test', 
-      geneticEntityId: 1, 
-      type: 'test'
+    {
+        alteration: 1,
+        entrezGeneId: 1,
+        gene: {
+            entrezGeneId: 1,
+            hugoGeneSymbol: 'test',
+            geneticEntityId: 1,
+            type: 'test',
+        },
+        molecularProfileId: 'test',
+        patientId: 'test',
+        sampleId: 'sampleId',
+        studyId: 'test',
+        uniquePatientKey: 'test',
+        uniqueSampleKey: 'test',
     },
-    molecularProfileId: 'test',
-    patientId: 'test',
-    sampleId: 'sampleId',
-    studyId: 'test',
-    uniquePatientKey: 'test',
-    uniqueSampleKey: 'test',
-  }
 ];
 
-const mockSamples = [
-  { id: 'sampleId', clinicalData: [] }
-]
+const mockSamples = [{ id: 'sampleId', clinicalData: [] }];
 
-const mockSampleToGenePanelId = { 'sampleId': 'genePanelId' };
-const mockGenePanelIdToGene = { 'genePanelId': [1] };
+const mockSampleToGenePanelId = { sampleId: 'genePanelId' };
+const mockGenePanelIdToGene = { genePanelId: [1] };
 const mockSampleManager = new SampleManager(mockSamples);
 
 const mock = {
-  data: mockData,
-  sampleToGenePanelId: mockSampleToGenePanelId,
-  sampleManager: mockSampleManager,
-  genePanelIdToGene: mockGenePanelIdToGene
-}
+    data: mockData,
+    sampleToGenePanelId: mockSampleToGenePanelId,
+    sampleManager: mockSampleManager,
+    genePanelIdToGene: mockGenePanelIdToGene,
+};
 
-describe('PanelColumnFormatter', () => {  
-  it('renders spinner icon if sampleToGenePanelId object is empty', () => {
-    const PanelColumn = shallow(PanelColumnFormatter.renderFunction({...mock, sampleToGenePanelId: {}}));
-    assert(PanelColumn.find('i.fa-spinner').exists());
-    PanelColumn.unmount();
-  });
-  
-  it('renders gene panel information', () => {
-    const PanelColumn = shallow(PanelColumnFormatter.renderFunction(mock));
-    assert(PanelColumn.find(GenePanelLinks).length > 0);
-    
-    const GenePanelLinksComponent = shallow(<GenePanelLinks {...mock}/>);
-    assert(GenePanelLinksComponent.text().includes('genePanelId'));
-    
-    PanelColumn.unmount();
-    GenePanelLinksComponent.unmount();
-  });
-  
-  it('returns a list of gene panel ids on download', () => {
-    const genePanelIds = PanelColumnFormatter.download(mock);
-    assert.deepEqual(genePanelIds, ['genePanelId']);
-  });
-  
-  it('returns a list of gene panel ids on getGenePanelIds', () => {
-    const genePanelIds = PanelColumnFormatter.getGenePanelIds(mock);
-    assert.deepEqual(genePanelIds, ['genePanelId'])
-  });
-})
+describe('PanelColumnFormatter', () => {
+    it('renders spinner icon if sampleToGenePanelId object is empty', () => {
+        const PanelColumn = shallow(
+            PanelColumnFormatter.renderFunction({
+                ...mock,
+                sampleToGenePanelId: {},
+            })
+        );
+        assert(PanelColumn.find('i.fa-spinner').exists());
+        PanelColumn.unmount();
+    });
+
+    it('renders gene panel information', () => {
+        const PanelColumn = shallow(PanelColumnFormatter.renderFunction(mock));
+        assert(PanelColumn.find(GenePanelLinks).length > 0);
+
+        const GenePanelLinksComponent = shallow(<GenePanelLinks {...mock} />);
+        assert(GenePanelLinksComponent.text().includes('genePanelId'));
+
+        PanelColumn.unmount();
+        GenePanelLinksComponent.unmount();
+    });
+
+    it('returns a list of gene panel ids on download', () => {
+        const genePanelIds = PanelColumnFormatter.download(mock);
+        assert.deepEqual(genePanelIds, ['genePanelId']);
+    });
+
+    it('returns a list of gene panel ids on getGenePanelIds', () => {
+        const genePanelIds = PanelColumnFormatter.getGenePanelIds(mock);
+        assert.deepEqual(genePanelIds, ['genePanelId']);
+    });
+});
diff --git a/src/shared/components/mutationTable/column/PanelColumnFormatter.tsx b/src/shared/components/mutationTable/column/PanelColumnFormatter.tsx
index eb56f06431b..405b98c8da1 100644
--- a/src/shared/components/mutationTable/column/PanelColumnFormatter.tsx
+++ b/src/shared/components/mutationTable/column/PanelColumnFormatter.tsx
@@ -1,104 +1,122 @@
 import * as React from 'react';
-import {map} from 'lodash';
-import {computed} from 'mobx';
+import { map } from 'lodash';
+import { computed } from 'mobx';
 import SampleManager from 'pages/patientView/SampleManager';
 import { ClinicalDataBySampleId } from 'shared/api/api-types-extended';
 import TumorColumnFormatter from 'pages/patientView/mutation/column/TumorColumnFormatter';
 import autobind from 'autobind-decorator';
 
 interface PanelColumnFormatterProps {
-	data: {sampleId:string, entrezGeneId:number}[];
-	sampleToGenePanelId: {[sampleId: string]: string|undefined};
-	sampleManager: SampleManager|null;
-	genePanelIdToGene: {[genePanelId: string]: number[]};
-	onSelectGenePanel?: (name:string)=>void;
+    data: { sampleId: string; entrezGeneId: number }[];
+    sampleToGenePanelId: { [sampleId: string]: string | undefined };
+    sampleManager: SampleManager | null;
+    genePanelIdToGene: { [genePanelId: string]: number[] };
+    onSelectGenePanel?: (name: string) => void;
 }
 
 export class GenePanelLinks extends React.Component<PanelColumnFormatterProps> {
-	@autobind handleClick(genePanelId:string|undefined) {
-		if (this.props.onSelectGenePanel && genePanelId) {
-				this.props.onSelectGenePanel(genePanelId);
-			}
-	}
-	
-	@computed get renderGenePanelLinks() {
-		const genePanelIds = getGenePanelIds(this.props);
-		const links: (string|JSX.Element)[] = [];
-		genePanelIds.forEach((genePanel, index) => {
-			if (genePanel && genePanel !== "N/A") {
-				links.push(<a onClick={() => this.handleClick(genePanel)}>{genePanel}</a>)
-			} else {
-				links.push(genePanel);
-			}
-			if (index < genePanelIds.length - 1) {
-				links.push(', ');
-			}
-		});
-		return links;
-	}
-	
-	render() {
-		return <React.Fragment>{this.renderGenePanelLinks}</React.Fragment>;
-	}
+    @autobind handleClick(genePanelId: string | undefined) {
+        if (this.props.onSelectGenePanel && genePanelId) {
+            this.props.onSelectGenePanel(genePanelId);
+        }
+    }
+
+    @computed get renderGenePanelLinks() {
+        const genePanelIds = getGenePanelIds(this.props);
+        const links: (string | JSX.Element)[] = [];
+        genePanelIds.forEach((genePanel, index) => {
+            if (genePanel && genePanel !== 'N/A') {
+                links.push(
+                    <a onClick={() => this.handleClick(genePanel)}>
+                        {genePanel}
+                    </a>
+                );
+            } else {
+                links.push(genePanel);
+            }
+            if (index < genePanelIds.length - 1) {
+                links.push(', ');
+            }
+        });
+        return links;
+    }
+
+    render() {
+        return <React.Fragment>{this.renderGenePanelLinks}</React.Fragment>;
+    }
 }
 
 class PanelColumn extends React.Component<PanelColumnFormatterProps, {}> {
-	constructor(props: PanelColumnFormatterProps) {
-		super(props);
-	}
+    constructor(props: PanelColumnFormatterProps) {
+        super(props);
+    }
 
-	render() {
-		const { sampleToGenePanelId, sampleManager } = this.props;
-    if (!sampleToGenePanelId || !sampleManager) return;
+    render() {
+        const { sampleToGenePanelId, sampleManager } = this.props;
+        if (!sampleToGenePanelId || !sampleManager) return;
 
-		if (sampleToGenePanelId && !Object.keys(sampleToGenePanelId).length) {
-			return <i className='fa fa-spinner fa-pulse' />;
-		}
+        if (sampleToGenePanelId && !Object.keys(sampleToGenePanelId).length) {
+            return <i className="fa fa-spinner fa-pulse" />;
+        }
 
-		return (
-			<div style={{ position: 'relative' }}>
-				<ul style={{ marginBottom: 0 }} className='list-inline list-unstyled'>
-					<GenePanelLinks {...this.props} />
-				</ul>
-			</div>
-		);
-	}
+        return (
+            <div style={{ position: 'relative' }}>
+                <ul
+                    style={{ marginBottom: 0 }}
+                    className="list-inline list-unstyled"
+                >
+                    <GenePanelLinks {...this.props} />
+                </ul>
+            </div>
+        );
+    }
 }
 
-const getGenePanelIds = (props:PanelColumnFormatterProps) => {
-	const { data, sampleToGenePanelId, sampleManager, genePanelIdToGene } = props;
-  if (sampleToGenePanelId && sampleManager) {
-		const samples =  sampleManager.samples;
-		const sampleIds = map(samples, (sample:ClinicalDataBySampleId) => sample.id)
-		const entrezGeneId = data[0].entrezGeneId;
-		const mutatedSamples = TumorColumnFormatter.getPresentSamples(data);
-		const profiledSamples = TumorColumnFormatter.getProfiledSamplesForGene(entrezGeneId, sampleIds, sampleToGenePanelId, genePanelIdToGene);
-		
-		const genePanelsIds = samples.map(sample => {
-			const isMutated = sample.id in mutatedSamples;
-			const isProfiled = sample.id in profiledSamples && profiledSamples[sample.id];
-			if (isProfiled && !isMutated) return "";
-			return sampleToGenePanelId[sample.id] || "N/A";
-		});
-		
-		return genePanelsIds.filter(id => id);
-  }
-  return [];
+const getGenePanelIds = (props: PanelColumnFormatterProps) => {
+    const {
+        data,
+        sampleToGenePanelId,
+        sampleManager,
+        genePanelIdToGene,
+    } = props;
+    if (sampleToGenePanelId && sampleManager) {
+        const samples = sampleManager.samples;
+        const sampleIds = map(
+            samples,
+            (sample: ClinicalDataBySampleId) => sample.id
+        );
+        const entrezGeneId = data[0].entrezGeneId;
+        const mutatedSamples = TumorColumnFormatter.getPresentSamples(data);
+        const profiledSamples = TumorColumnFormatter.getProfiledSamplesForGene(
+            entrezGeneId,
+            sampleIds,
+            sampleToGenePanelId,
+            genePanelIdToGene
+        );
+
+        const genePanelsIds = samples.map(sample => {
+            const isMutated = sample.id in mutatedSamples;
+            const isProfiled =
+                sample.id in profiledSamples && profiledSamples[sample.id];
+            if (isProfiled && !isMutated) return '';
+            return sampleToGenePanelId[sample.id] || 'N/A';
+        });
+
+        return genePanelsIds.filter(id => id);
+    }
+    return [];
 };
 
 export default {
-	renderFunction: (
-		props:PanelColumnFormatterProps
-	) => (
-		<PanelColumn
-			data={props.data}
-			sampleToGenePanelId={props.sampleToGenePanelId}
-			sampleManager={props.sampleManager}
-			genePanelIdToGene={props.genePanelIdToGene}
-			onSelectGenePanel={props.onSelectGenePanel}
-		/>
-	),
-	download: (
-		props:PanelColumnFormatterProps) => getGenePanelIds(props),
-	getGenePanelIds
+    renderFunction: (props: PanelColumnFormatterProps) => (
+        <PanelColumn
+            data={props.data}
+            sampleToGenePanelId={props.sampleToGenePanelId}
+            sampleManager={props.sampleManager}
+            genePanelIdToGene={props.genePanelIdToGene}
+            onSelectGenePanel={props.onSelectGenePanel}
+        />
+    ),
+    download: (props: PanelColumnFormatterProps) => getGenePanelIds(props),
+    getGenePanelIds,
 };
diff --git a/src/shared/components/mutationTable/column/ProteinChangeColumnFormatter.spec.tsx b/src/shared/components/mutationTable/column/ProteinChangeColumnFormatter.spec.tsx
index d89292c9d5b..6c23fb01e08 100644
--- a/src/shared/components/mutationTable/column/ProteinChangeColumnFormatter.spec.tsx
+++ b/src/shared/components/mutationTable/column/ProteinChangeColumnFormatter.spec.tsx
@@ -1,75 +1,114 @@
-import {assert} from "chai";
-import ProteinChangeColumnFormatter from "./ProteinChangeColumnFormatter";
-import {DefaultTooltip} from "cbioportal-frontend-commons";
+import { assert } from 'chai';
+import ProteinChangeColumnFormatter from './ProteinChangeColumnFormatter';
+import { DefaultTooltip } from 'cbioportal-frontend-commons';
 import styles from './proteinChange.module.scss';
-import {initMutation} from "test/MutationMockUtils";
-import {Mutation} from "shared/api/generated/CBioPortalAPI";
-import {mount, ReactWrapper} from 'enzyme';
+import { initMutation } from 'test/MutationMockUtils';
+import { Mutation } from 'shared/api/generated/CBioPortalAPI';
+import { mount, ReactWrapper } from 'enzyme';
 
 /**
  * @author Selcuk Onur Sumer
  */
 describe('ProteinChangeColumnFormatter', () => {
-    const germlineMutation:Mutation = initMutation({
-        proteinChange: "Q616K",
-        mutationStatus: "Germline"
+    const germlineMutation: Mutation = initMutation({
+        proteinChange: 'Q616K',
+        mutationStatus: 'Germline',
     });
 
-    const somaticMutation:Mutation = initMutation({
-        proteinChange: "Q616L",
-        mutationStatus: "Somatic"
+    const somaticMutation: Mutation = initMutation({
+        proteinChange: 'Q616L',
+        mutationStatus: 'Somatic',
     });
 
-    const mutationWithLongProteinChangeValue:Mutation = initMutation({
-        proteinChange: "this_is_a_protein_change_with_more_than_20_chars",
-        mutationStatus: "Somatic"
+    const mutationWithLongProteinChangeValue: Mutation = initMutation({
+        proteinChange: 'this_is_a_protein_change_with_more_than_20_chars',
+        mutationStatus: 'Somatic',
     });
 
     let germlineComponent: ReactWrapper<any, any>;
-    let somaticComponent:ReactWrapper<any, any>;
-    let longProteinChangeComponent:ReactWrapper<any, any>;
+    let somaticComponent: ReactWrapper<any, any>;
+    let longProteinChangeComponent: ReactWrapper<any, any>;
 
     before(() => {
         let data = [germlineMutation];
 
         // mount a single cell component (Td) for a germline mutation
-        germlineComponent = mount(ProteinChangeColumnFormatter.renderWithMutationStatus(data));
+        germlineComponent = mount(
+            ProteinChangeColumnFormatter.renderWithMutationStatus(data)
+        );
 
         data = [somaticMutation];
 
         // mount a single cell component (Td) for a somatic mutation
-        somaticComponent = mount(ProteinChangeColumnFormatter.renderWithMutationStatus(data));
+        somaticComponent = mount(
+            ProteinChangeColumnFormatter.renderWithMutationStatus(data)
+        );
 
         data = [mutationWithLongProteinChangeValue];
-        longProteinChangeComponent = mount(ProteinChangeColumnFormatter.renderWithMutationStatus(data));
+        longProteinChangeComponent = mount(
+            ProteinChangeColumnFormatter.renderWithMutationStatus(data)
+        );
     });
 
     it('renders protein change display value', () => {
-        assert.isTrue(germlineComponent.find(`.${styles.proteinChange}`).exists(),
-            'Germline mutation should have the protein change value');
-        assert.isTrue(germlineComponent.find(`.${styles.proteinChange}`).first().text().indexOf("Q616K") > -1,
-            'Protein change value for germline mutation is correct');
-        assert.isTrue(somaticComponent.find(`.${styles.proteinChange}`).exists(),
-            'Somatic mutation should have the protein change value');
-        assert.isTrue(somaticComponent.find(`.${styles.proteinChange}`).first().text().indexOf("Q616L") > -1,
-            'Protein change value for somatic mutation is correct');
-        assert.isTrue(longProteinChangeComponent.find(`.${styles.proteinChange}`).first().text().indexOf("this_is_a_protein_change_with_more_than_20_chars") === -1,
-            'Long protein change values should be truncated');
+        assert.isTrue(
+            germlineComponent.find(`.${styles.proteinChange}`).exists(),
+            'Germline mutation should have the protein change value'
+        );
+        assert.isTrue(
+            germlineComponent
+                .find(`.${styles.proteinChange}`)
+                .first()
+                .text()
+                .indexOf('Q616K') > -1,
+            'Protein change value for germline mutation is correct'
+        );
+        assert.isTrue(
+            somaticComponent.find(`.${styles.proteinChange}`).exists(),
+            'Somatic mutation should have the protein change value'
+        );
+        assert.isTrue(
+            somaticComponent
+                .find(`.${styles.proteinChange}`)
+                .first()
+                .text()
+                .indexOf('Q616L') > -1,
+            'Protein change value for somatic mutation is correct'
+        );
+        assert.isTrue(
+            longProteinChangeComponent
+                .find(`.${styles.proteinChange}`)
+                .first()
+                .text()
+                .indexOf('this_is_a_protein_change_with_more_than_20_chars') ===
+                -1,
+            'Long protein change values should be truncated'
+        );
     });
 
     it('adds tooltip for long protein change values', () => {
-        assert.isFalse(germlineComponent.find(DefaultTooltip).exists(),
-            'Tooltip should not exists for short values (Q616K)');
-        assert.isFalse(somaticComponent.find(DefaultTooltip).exists(),
-            'Tooltip should not exists for short values (Q616L)');
-        assert.isTrue(longProteinChangeComponent.find(DefaultTooltip).exists(),
-            'Tooltip should exist for long values');
+        assert.isFalse(
+            germlineComponent.find(DefaultTooltip).exists(),
+            'Tooltip should not exists for short values (Q616K)'
+        );
+        assert.isFalse(
+            somaticComponent.find(DefaultTooltip).exists(),
+            'Tooltip should not exists for short values (Q616L)'
+        );
+        assert.isTrue(
+            longProteinChangeComponent.find(DefaultTooltip).exists(),
+            'Tooltip should exist for long values'
+        );
     });
 
     it('renders germline indicator', () => {
-        assert.isTrue(germlineComponent.find(`.${styles.germline}`).exists(),
-            'Germline mutation should have the additional germline indicator');
-        assert.isFalse(somaticComponent.find(`.${styles.germline}`).exists(),
-            'Somatic mutation should not have the additional germline indicator');
+        assert.isTrue(
+            germlineComponent.find(`.${styles.germline}`).exists(),
+            'Germline mutation should have the additional germline indicator'
+        );
+        assert.isFalse(
+            somaticComponent.find(`.${styles.germline}`).exists(),
+            'Somatic mutation should not have the additional germline indicator'
+        );
     });
 });
diff --git a/src/shared/components/mutationTable/column/ProteinChangeColumnFormatter.tsx b/src/shared/components/mutationTable/column/ProteinChangeColumnFormatter.tsx
index 4c6675c44bb..612fe91d90c 100644
--- a/src/shared/components/mutationTable/column/ProteinChangeColumnFormatter.tsx
+++ b/src/shared/components/mutationTable/column/ProteinChangeColumnFormatter.tsx
@@ -1,22 +1,19 @@
 import * as React from 'react';
-import {calcProteinChangeSortValue} from "cbioportal-frontend-commons";
-import {Mutation} from "shared/api/generated/CBioPortalAPI";
-import TruncatedText from "shared/components/TruncatedText";
-import MutationStatusColumnFormatter from "./MutationStatusColumnFormatter";
+import { calcProteinChangeSortValue } from 'cbioportal-frontend-commons';
+import { Mutation } from 'shared/api/generated/CBioPortalAPI';
+import TruncatedText from 'shared/components/TruncatedText';
+import MutationStatusColumnFormatter from './MutationStatusColumnFormatter';
 import styles from './proteinChange.module.scss';
 
-
-export default class ProteinChangeColumnFormatter
-{
-    public static getSortValue(d:Mutation[]):number|null {
+export default class ProteinChangeColumnFormatter {
+    public static getSortValue(d: Mutation[]): number | null {
         return calcProteinChangeSortValue(
             ProteinChangeColumnFormatter.getTextValue(d)
         );
     }
 
-    public static getTextValue(data:Mutation[]):string
-    {
-        let textValue:string = "";
+    public static getTextValue(data: Mutation[]): string {
+        let textValue: string = '';
         const dataValue = ProteinChangeColumnFormatter.getData(data);
 
         if (dataValue) {
@@ -26,27 +23,32 @@ export default class ProteinChangeColumnFormatter
         return textValue;
     }
 
-    public static getFilterValue(data:Mutation[], filterString:string, filterStringUpper:string): boolean
-    {
+    public static getFilterValue(
+        data: Mutation[],
+        filterString: string,
+        filterStringUpper: string
+    ): boolean {
         let filterValue = ProteinChangeColumnFormatter.getDisplayValue(data);
-        const mutationStatus:string|null = MutationStatusColumnFormatter.getData(data);
-
-        if (mutationStatus && mutationStatus.toLowerCase().includes("germline")) {
+        const mutationStatus:
+            | string
+            | null = MutationStatusColumnFormatter.getData(data);
+
+        if (
+            mutationStatus &&
+            mutationStatus.toLowerCase().includes('germline')
+        ) {
             filterValue = `${filterValue}${mutationStatus}`;
         }
 
         return filterValue.toUpperCase().indexOf(filterStringUpper) > -1;
     }
 
-
-    public static getDisplayValue(data:Mutation[]):string
-    {
+    public static getDisplayValue(data: Mutation[]): string {
         // same as text value
         return ProteinChangeColumnFormatter.getTextValue(data);
     }
 
-    public static getData(data:Mutation[])
-    {
+    public static getData(data: Mutation[]) {
         if (data.length > 0) {
             return data[0].proteinChange;
         } else {
@@ -54,22 +56,20 @@ export default class ProteinChangeColumnFormatter
         }
     }
 
-    public static renderPlainText(data:Mutation[])
-    {
+    public static renderPlainText(data: Mutation[]) {
         // use text as display value
-        const text:string = ProteinChangeColumnFormatter.getDisplayValue(data);
+        const text: string = ProteinChangeColumnFormatter.getDisplayValue(data);
 
-        return (
-                <span>{text}</span>
-        );
+        return <span>{text}</span>;
     }
 
-    public static renderWithMutationStatus(data:Mutation[])
-    {
+    public static renderWithMutationStatus(data: Mutation[]) {
         // use text as display value
-        const text:string = ProteinChangeColumnFormatter.getDisplayValue(data);
+        const text: string = ProteinChangeColumnFormatter.getDisplayValue(data);
 
-        const mutationStatus:string|null = MutationStatusColumnFormatter.getData(data);
+        const mutationStatus:
+            | string
+            | null = MutationStatusColumnFormatter.getData(data);
 
         let content = (
             <TruncatedText
@@ -81,9 +81,10 @@ export default class ProteinChangeColumnFormatter
         );
 
         // add a germline indicator next to protein change if it is a germline mutation!
-        if (mutationStatus &&
-            mutationStatus.toLowerCase().indexOf("germline") > -1)
-        {
+        if (
+            mutationStatus &&
+            mutationStatus.toLowerCase().indexOf('germline') > -1
+        ) {
             content = (
                 <span>
                     {content}
diff --git a/src/shared/components/mutationTable/column/SampleColumnFormatter.spec.tsx b/src/shared/components/mutationTable/column/SampleColumnFormatter.spec.tsx
index 2a155f6e210..05749c99848 100644
--- a/src/shared/components/mutationTable/column/SampleColumnFormatter.spec.tsx
+++ b/src/shared/components/mutationTable/column/SampleColumnFormatter.spec.tsx
@@ -1,9 +1,9 @@
-import SampleColumnFormatter from "./SampleColumnFormatter";
-import {DefaultTooltip} from "cbioportal-frontend-commons";
-import {initMutation} from "test/MutationMockUtils";
+import SampleColumnFormatter from './SampleColumnFormatter';
+import { DefaultTooltip } from 'cbioportal-frontend-commons';
+import { initMutation } from 'test/MutationMockUtils';
 import React from 'react';
 import { assert } from 'chai';
-import {shallow, mount, ReactWrapper} from 'enzyme';
+import { shallow, mount, ReactWrapper } from 'enzyme';
 import sinon from 'sinon';
 
 /**
@@ -11,15 +11,15 @@ import sinon from 'sinon';
  */
 describe('SampleColumnFormatter', () => {
     const mutationShort = initMutation({
-        sampleId: "Short_Id"
+        sampleId: 'Short_Id',
     });
 
     const mutationLong = initMutation({
-        sampleId: "This_is_a_quite_long_Sample_Id_in_my_opinion!"
+        sampleId: 'This_is_a_quite_long_Sample_Id_in_my_opinion!',
     });
 
-    let componentShort:ReactWrapper<any, any>;
-    let componentLong:ReactWrapper<any, any>;
+    let componentShort: ReactWrapper<any, any>;
+    let componentLong: ReactWrapper<any, any>;
 
     before(() => {
         let data = [mutationShort];
@@ -34,20 +34,32 @@ describe('SampleColumnFormatter', () => {
     });
 
     it('renders sample display value', () => {
-        assert.isTrue(componentShort.find(`span`).text().indexOf("Short_Id") > -1,
-            'Display value is correct for short sample id');
-        assert.isFalse(componentLong.find(`span`).text().indexOf("This_is_a_quite_long_Sample_Id_in_my_opinion!") > -1,
-            'Display value for long sample id should not be equal to the actual value');
+        assert.isTrue(
+            componentShort
+                .find(`span`)
+                .text()
+                .indexOf('Short_Id') > -1,
+            'Display value is correct for short sample id'
+        );
+        assert.isFalse(
+            componentLong
+                .find(`span`)
+                .text()
+                .indexOf('This_is_a_quite_long_Sample_Id_in_my_opinion!') > -1,
+            'Display value for long sample id should not be equal to the actual value'
+        );
     });
 
     it('generates component tooltip', () => {
-        assert.isFalse(componentShort.find(DefaultTooltip).exists(),
-            'Tooltip should not exists for short sample id');
-        assert.isTrue(componentLong.find(DefaultTooltip).exists(),
-            'Tooltip should exists for long sample id');
+        assert.isFalse(
+            componentShort.find(DefaultTooltip).exists(),
+            'Tooltip should not exists for short sample id'
+        );
+        assert.isTrue(
+            componentLong.find(DefaultTooltip).exists(),
+            'Tooltip should exists for long sample id'
+        );
     });
 
-    after(() => {
-
-    });
+    after(() => {});
 });
diff --git a/src/shared/components/mutationTable/column/SampleColumnFormatter.tsx b/src/shared/components/mutationTable/column/SampleColumnFormatter.tsx
index 0403d4a989a..7df7dc75966 100644
--- a/src/shared/components/mutationTable/column/SampleColumnFormatter.tsx
+++ b/src/shared/components/mutationTable/column/SampleColumnFormatter.tsx
@@ -1,20 +1,17 @@
 import * as React from 'react';
-import {MolecularProfile, Mutation} from "shared/api/generated/CBioPortalAPI";
-import TruncatedText from "shared/components/TruncatedText";
-import {getPatientViewUrl, getSampleViewUrl} from "../../../api/urls";
+import { MolecularProfile, Mutation } from 'shared/api/generated/CBioPortalAPI';
+import TruncatedText from 'shared/components/TruncatedText';
+import { getPatientViewUrl, getSampleViewUrl } from '../../../api/urls';
 
 /**
  * @author Selcuk Onur Sumer
  */
-export default class SampleColumnFormatter
-{
-    public static getTextValue(data:Mutation[]):string
-    {
-        return SampleColumnFormatter.getData(data) || "";
+export default class SampleColumnFormatter {
+    public static getTextValue(data: Mutation[]): string {
+        return SampleColumnFormatter.getData(data) || '';
     }
 
-    public static getData(data:Mutation[])
-    {
+    public static getData(data: Mutation[]) {
         if (data.length > 0) {
             return data[0].sampleId;
         } else {
@@ -22,24 +19,33 @@ export default class SampleColumnFormatter
         }
     }
 
-    public static renderFunction(data:Mutation[], molecularProfileIdToMolecularProfile?: {[molecularProfileId:string]:MolecularProfile})
-    {
-        const sampleId:string = SampleColumnFormatter.getTextValue(data);
+    public static renderFunction(
+        data: Mutation[],
+        molecularProfileIdToMolecularProfile?: {
+            [molecularProfileId: string]: MolecularProfile;
+        }
+    ) {
+        const sampleId: string = SampleColumnFormatter.getTextValue(data);
         let content = (
             <TruncatedText
                 text={sampleId}
-                tooltip={<div style={{maxWidth: 300}}>{sampleId}</div>}
+                tooltip={<div style={{ maxWidth: 300 }}>{sampleId}</div>}
                 maxLength={16}
             />
         );
 
-        if (molecularProfileIdToMolecularProfile)
-        {
-            const profile = molecularProfileIdToMolecularProfile[data[0].molecularProfileId];
+        if (molecularProfileIdToMolecularProfile) {
+            const profile =
+                molecularProfileIdToMolecularProfile[
+                    data[0].molecularProfileId
+                ];
             const studyId = profile && profile.studyId;
             if (studyId) {
                 content = (
-                    <a href={getSampleViewUrl(studyId, sampleId)} target='_blank'>
+                    <a
+                        href={getSampleViewUrl(studyId, sampleId)}
+                        target="_blank"
+                    >
                         {content}
                     </a>
                 );
diff --git a/src/shared/components/mutationTable/column/StudyColumnFormatter.tsx b/src/shared/components/mutationTable/column/StudyColumnFormatter.tsx
index 84d0dfbed70..72996e88ed4 100644
--- a/src/shared/components/mutationTable/column/StudyColumnFormatter.tsx
+++ b/src/shared/components/mutationTable/column/StudyColumnFormatter.tsx
@@ -1,33 +1,57 @@
 import * as React from 'react';
-import {CancerStudy, MolecularProfile, Mutation} from "shared/api/generated/CBioPortalAPI";
-import TruncatedText from "../../TruncatedText";
-import {getStudySummaryUrl} from "../../../api/urls";
+import {
+    CancerStudy,
+    MolecularProfile,
+    Mutation,
+} from 'shared/api/generated/CBioPortalAPI';
+import TruncatedText from '../../TruncatedText';
+import { getStudySummaryUrl } from '../../../api/urls';
 
-export default class StudyColumnFormatter
-{
-    private static getStudy(d:Mutation[], molecularProfileIdToMolecularProfile?:{[molecularProfileId:string]:MolecularProfile}, studyIdToStudy?:{[studyId:string]:CancerStudy}):CancerStudy|null {
+export default class StudyColumnFormatter {
+    private static getStudy(
+        d: Mutation[],
+        molecularProfileIdToMolecularProfile?: {
+            [molecularProfileId: string]: MolecularProfile;
+        },
+        studyIdToStudy?: { [studyId: string]: CancerStudy }
+    ): CancerStudy | null {
         if (!molecularProfileIdToMolecularProfile || !studyIdToStudy)
             return null;
 
         const molecularProfileId = d[0].molecularProfileId;
-        const geneticProfile = molecularProfileIdToMolecularProfile[molecularProfileId];
-        if (!geneticProfile)
-            return null;
+        const geneticProfile =
+            molecularProfileIdToMolecularProfile[molecularProfileId];
+        if (!geneticProfile) return null;
         const study = studyIdToStudy[geneticProfile.studyId];
         return study || null;
     }
-    public static renderFunction(d:Mutation[], molecularProfileIdToMolecularProfile?:{[molecularProfileId:string]:MolecularProfile}, studyIdToStudy?:{[studyId:string]:CancerStudy}) {
-        const study = StudyColumnFormatter.getStudy(d, molecularProfileIdToMolecularProfile, studyIdToStudy);
+    public static renderFunction(
+        d: Mutation[],
+        molecularProfileIdToMolecularProfile?: {
+            [molecularProfileId: string]: MolecularProfile;
+        },
+        studyIdToStudy?: { [studyId: string]: CancerStudy }
+    ) {
+        const study = StudyColumnFormatter.getStudy(
+            d,
+            molecularProfileIdToMolecularProfile,
+            studyIdToStudy
+        );
         if (!study) {
-            return <span/>;
+            return <span />;
         } else {
             return (
                 <a href={getStudySummaryUrl(study.studyId)} target="_blank">
                     <TruncatedText
                         text={study.name}
-                        tooltip={<div style={{maxWidth: 300}} dangerouslySetInnerHTML={{
-                            __html: `${study.name}: ${study.description}`
-                        }}/>}
+                        tooltip={
+                            <div
+                                style={{ maxWidth: 300 }}
+                                dangerouslySetInnerHTML={{
+                                    __html: `${study.name}: ${study.description}`,
+                                }}
+                            />
+                        }
                         maxLength={16}
                     />
                 </a>
@@ -35,21 +59,42 @@ export default class StudyColumnFormatter
         }
     }
 
-    public static getTextValue(d:Mutation[], molecularProfileIdToMolecularProfile?:{[molecularProfileId:string]:MolecularProfile}, studyIdToStudy?:{[studyId:string]:CancerStudy}) {
-        const study = StudyColumnFormatter.getStudy(d, molecularProfileIdToMolecularProfile, studyIdToStudy);
+    public static getTextValue(
+        d: Mutation[],
+        molecularProfileIdToMolecularProfile?: {
+            [molecularProfileId: string]: MolecularProfile;
+        },
+        studyIdToStudy?: { [studyId: string]: CancerStudy }
+    ) {
+        const study = StudyColumnFormatter.getStudy(
+            d,
+            molecularProfileIdToMolecularProfile,
+            studyIdToStudy
+        );
         if (!study) {
-            return "";
+            return '';
         } else {
             return study.name;
         }
     }
 
-    public static filter(d:Mutation[], filterStringUpper:string, geneticProfileIdToGeneticProfile?:{[geneticProfileId:string]:MolecularProfile}, studyIdToStudy?:{[studyId:string]:CancerStudy}) {
-        const study = StudyColumnFormatter.getStudy(d, geneticProfileIdToGeneticProfile, studyIdToStudy);
+    public static filter(
+        d: Mutation[],
+        filterStringUpper: string,
+        geneticProfileIdToGeneticProfile?: {
+            [geneticProfileId: string]: MolecularProfile;
+        },
+        studyIdToStudy?: { [studyId: string]: CancerStudy }
+    ) {
+        const study = StudyColumnFormatter.getStudy(
+            d,
+            geneticProfileIdToGeneticProfile,
+            studyIdToStudy
+        );
         if (!study) {
             return false;
         } else {
             return study.name.toUpperCase().indexOf(filterStringUpper) > -1;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/mutationTable/column/TumorAlleleFreqColumnFormatter.tsx b/src/shared/components/mutationTable/column/TumorAlleleFreqColumnFormatter.tsx
index 8ceff290577..fb7c8276c9a 100644
--- a/src/shared/components/mutationTable/column/TumorAlleleFreqColumnFormatter.tsx
+++ b/src/shared/components/mutationTable/column/TumorAlleleFreqColumnFormatter.tsx
@@ -2,21 +2,24 @@ import * as React from 'react';
 import {
     DefaultTooltip,
     TableCellStatus,
-    TableCellStatusIndicator
-} from "cbioportal-frontend-commons";
-import {Mutation} from "shared/api/generated/CBioPortalAPI";
+    TableCellStatusIndicator,
+} from 'cbioportal-frontend-commons';
+import { Mutation } from 'shared/api/generated/CBioPortalAPI';
 
 export function getFormattedFrequencyValue(frequency: number) {
     return frequency < 0.01 ? frequency.toFixed(4) : frequency.toFixed(2);
 }
 
-export default class TumorAlleleFreqColumnFormatter
-{
-    public static mainContent(frequency:number, altReads:number, refReads:number)
-    {
+export default class TumorAlleleFreqColumnFormatter {
+    public static mainContent(
+        frequency: number,
+        altReads: number,
+        refReads: number
+    ) {
         const overlay = (
             <span>
-                <b>{altReads}</b> variant reads out of <b>{altReads + refReads}</b> total
+                <b>{altReads}</b> variant reads out of{' '}
+                <b>{altReads + refReads}</b> total
             </span>
         );
 
@@ -24,7 +27,7 @@ export default class TumorAlleleFreqColumnFormatter
             <DefaultTooltip
                 placement="left"
                 overlay={overlay}
-                arrowContent={<div className="rc-tooltip-arrow-inner"/>}
+                arrowContent={<div className="rc-tooltip-arrow-inner" />}
                 destroyTooltipOnHide={true}
             >
                 <span>{getFormattedFrequencyValue(frequency)}</span>
@@ -32,34 +35,38 @@ export default class TumorAlleleFreqColumnFormatter
         );
     }
 
-    public static renderFunction(mutations:Mutation[]) {
-        const frequency = TumorAlleleFreqColumnFormatter.getSortValue(mutations);
+    public static renderFunction(mutations: Mutation[]) {
+        const frequency = TumorAlleleFreqColumnFormatter.getSortValue(
+            mutations
+        );
 
         if (frequency) {
             const altReads = mutations[0].tumorAltCount;
             const refReads = mutations[0].tumorRefCount;
 
-            return TumorAlleleFreqColumnFormatter.mainContent(frequency, altReads, refReads);
-        }
-        else {
-            return (
-                <TableCellStatusIndicator status={TableCellStatus.NA} />
+            return TumorAlleleFreqColumnFormatter.mainContent(
+                frequency,
+                altReads,
+                refReads
             );
+        } else {
+            return <TableCellStatusIndicator status={TableCellStatus.NA} />;
         }
     }
 
-    public static getTextValue(mutations:Mutation[]) : string {
-        const frequency = TumorAlleleFreqColumnFormatter.getSortValue(mutations);
+    public static getTextValue(mutations: Mutation[]): string {
+        const frequency = TumorAlleleFreqColumnFormatter.getSortValue(
+            mutations
+        );
 
         if (frequency) {
             return getFormattedFrequencyValue(frequency);
         }
 
-        return "";
+        return '';
     }
 
-    public static getSortValue(mutations:Mutation[])
-    {
+    public static getSortValue(mutations: Mutation[]) {
         const mutation = mutations[0];
 
         if (!mutation) {
@@ -69,15 +76,14 @@ export default class TumorAlleleFreqColumnFormatter
         const altReads = mutation.tumorAltCount;
         const refReads = mutation.tumorRefCount;
 
-        if ((altReads < 0) || (refReads < 0)) {
+        if (altReads < 0 || refReads < 0) {
             return null;
         }
 
-        return (altReads / (altReads + refReads));
+        return altReads / (altReads + refReads);
     }
 
     public static isVisible(allMutations?: Mutation[][]): boolean {
-
         if (allMutations) {
             for (const rowMutations of allMutations) {
                 const frequency = this.getSortValue(rowMutations);
diff --git a/src/shared/components/mutationTable/column/ValidationStatusColumnFormatter.spec.tsx b/src/shared/components/mutationTable/column/ValidationStatusColumnFormatter.spec.tsx
index 3cff09fb7c0..c413bf3b20b 100644
--- a/src/shared/components/mutationTable/column/ValidationStatusColumnFormatter.spec.tsx
+++ b/src/shared/components/mutationTable/column/ValidationStatusColumnFormatter.spec.tsx
@@ -1,26 +1,26 @@
-import {DefaultTooltip} from "cbioportal-frontend-commons";
+import { DefaultTooltip } from 'cbioportal-frontend-commons';
 import ValidationStatusColumnFormatter from './ValidationStatusColumnFormatter';
 import styles from './validationStatus.module.scss';
-import {initMutation} from "test/MutationMockUtils";
+import { initMutation } from 'test/MutationMockUtils';
 import React from 'react';
 import { assert } from 'chai';
-import {shallow, mount, ReactWrapper} from 'enzyme';
+import { shallow, mount, ReactWrapper } from 'enzyme';
 
 describe('MutationStatusColumnFormatter', () => {
     const validMutation = initMutation({
-        validationStatus: "Validated"
+        validationStatus: 'Validated',
     });
 
     const wildtypeMutation = initMutation({
-        validationStatus: "Wildtype"
+        validationStatus: 'Wildtype',
     });
 
     const unknownMutation = initMutation({
-        validationStatus: "NA"
+        validationStatus: 'NA',
     });
 
     const otherMutation = initMutation({
-        validationStatus: "Other"
+        validationStatus: 'Other',
     });
 
     const validData = [validMutation];
@@ -34,54 +34,88 @@ describe('MutationStatusColumnFormatter', () => {
     let otherComponent: ReactWrapper<any, any>;
 
     before(() => {
-        validComponent = mount(ValidationStatusColumnFormatter.renderFunction(validData));
-        wildtypeComponent = mount(ValidationStatusColumnFormatter.renderFunction(wildtypeData));
-        unknownComponent = mount(ValidationStatusColumnFormatter.renderFunction(unknownData));
-        otherComponent = mount(ValidationStatusColumnFormatter.renderFunction(otherData));
+        validComponent = mount(
+            ValidationStatusColumnFormatter.renderFunction(validData)
+        );
+        wildtypeComponent = mount(
+            ValidationStatusColumnFormatter.renderFunction(wildtypeData)
+        );
+        unknownComponent = mount(
+            ValidationStatusColumnFormatter.renderFunction(unknownData)
+        );
+        otherComponent = mount(
+            ValidationStatusColumnFormatter.renderFunction(otherData)
+        );
     });
 
-    after(() => {
-
-    });
+    after(() => {});
 
     it('gets validation status data properly', () => {
-        assert.equal(ValidationStatusColumnFormatter.getData(validData), "Validated",
-            "Validated validation status data is properly extracted");
-
-        assert.equal(ValidationStatusColumnFormatter.getData(wildtypeData), "Wildtype",
-            "Wildtype validation status data is properly extracted");
-
-        assert.equal(ValidationStatusColumnFormatter.getData(unknownData), "NA",
-            "Unknown validation status data is properly extracted");
-
-        assert.equal(ValidationStatusColumnFormatter.getData(otherData), "Other",
-            "Other validation status data is properly extracted");
+        assert.equal(
+            ValidationStatusColumnFormatter.getData(validData),
+            'Validated',
+            'Validated validation status data is properly extracted'
+        );
+
+        assert.equal(
+            ValidationStatusColumnFormatter.getData(wildtypeData),
+            'Wildtype',
+            'Wildtype validation status data is properly extracted'
+        );
+
+        assert.equal(
+            ValidationStatusColumnFormatter.getData(unknownData),
+            'NA',
+            'Unknown validation status data is properly extracted'
+        );
+
+        assert.equal(
+            ValidationStatusColumnFormatter.getData(otherData),
+            'Other',
+            'Other validation status data is properly extracted'
+        );
     });
 
-    function testRenderedValues(component: ReactWrapper<any, any>,
-                                className: string,
-                                value: string)
-    {
-        assert.isTrue(component.find(`span.${styles[className]}`).exists(),
-            `Span has the correct class name for ${value}`);
-        assert.isTrue(component.find(`span.${styles[className]}`).text().indexOf(value) > -1,
-            `Display value is correct for ${value}`);
+    function testRenderedValues(
+        component: ReactWrapper<any, any>,
+        className: string,
+        value: string
+    ) {
+        assert.isTrue(
+            component.find(`span.${styles[className]}`).exists(),
+            `Span has the correct class name for ${value}`
+        );
+        assert.isTrue(
+            component
+                .find(`span.${styles[className]}`)
+                .text()
+                .indexOf(value) > -1,
+            `Display value is correct for ${value}`
+        );
     }
 
     it('renders component display value, class name, and cell value property', () => {
-        testRenderedValues(validComponent, "valid", "V");
-        testRenderedValues(wildtypeComponent, "wildtype", "W");
-        testRenderedValues(unknownComponent, "unknown", "U");
+        testRenderedValues(validComponent, 'valid', 'V');
+        testRenderedValues(wildtypeComponent, 'wildtype', 'W');
+        testRenderedValues(unknownComponent, 'unknown', 'U');
     });
 
     it('adds tooltips for valid, wildtype, and unknown validation statuses', () => {
-        assert.isTrue(validComponent.find(DefaultTooltip).exists(),
-            'Tooltip should exist for valid mutations');
-        assert.isTrue(wildtypeComponent.find(DefaultTooltip).exists(),
-            'Tooltip should exist for wildtype mutations');
-        assert.isTrue(unknownComponent.find(DefaultTooltip).exists(),
-            'Tooltip should exist for unknown mutations');
-        assert.isFalse(otherComponent.find(DefaultTooltip).exists(),
-            'Tooltip should not exist for other validation statuses');
+        assert.isTrue(
+            validComponent.find(DefaultTooltip).exists(),
+            'Tooltip should exist for valid mutations'
+        );
+        assert.isTrue(
+            wildtypeComponent.find(DefaultTooltip).exists(),
+            'Tooltip should exist for wildtype mutations'
+        );
+        assert.isTrue(
+            unknownComponent.find(DefaultTooltip).exists(),
+            'Tooltip should exist for unknown mutations'
+        );
+        assert.isFalse(
+            otherComponent.find(DefaultTooltip).exists(),
+            'Tooltip should not exist for other validation statuses'
+        );
     });
 });
diff --git a/src/shared/components/mutationTable/column/ValidationStatusColumnFormatter.tsx b/src/shared/components/mutationTable/column/ValidationStatusColumnFormatter.tsx
index 3bf1ad80f72..d8018a75efb 100644
--- a/src/shared/components/mutationTable/column/ValidationStatusColumnFormatter.tsx
+++ b/src/shared/components/mutationTable/column/ValidationStatusColumnFormatter.tsx
@@ -1,21 +1,25 @@
-import * as React from "react";
-import {Mutation} from "shared/api/generated/CBioPortalAPI";
-import styles from "./validationStatus.module.scss";
-import {DefaultTooltip} from "cbioportal-frontend-commons";
+import * as React from 'react';
+import { Mutation } from 'shared/api/generated/CBioPortalAPI';
+import styles from './validationStatus.module.scss';
+import { DefaultTooltip } from 'cbioportal-frontend-commons';
 
 /**
  * @author Selcuk Onur Sumer
  */
-export default class ValidationStatusColumnFormatter
-{
+export default class ValidationStatusColumnFormatter {
     /**
      * Mapping between the validation status (data) values and view values.
      */
-    public static get VALIDATION_STATUS_FORMAT(): {[status: string]: {text: string, className: string, tooltip: string}}
-    {
-        const UNKNOWN = {text: "U", className: "unknown", tooltip: "Unknown"};
-        const VALID = {text: "V", className: "valid", tooltip: "Valid"};
-        const WILDTYPE = {text: "W", className: "wildtype", tooltip: "Wildtype"};
+    public static get VALIDATION_STATUS_FORMAT(): {
+        [status: string]: { text: string; className: string; tooltip: string };
+    } {
+        const UNKNOWN = { text: 'U', className: 'unknown', tooltip: 'Unknown' };
+        const VALID = { text: 'V', className: 'valid', tooltip: 'Valid' };
+        const WILDTYPE = {
+            text: 'W',
+            className: 'wildtype',
+            tooltip: 'Wildtype',
+        };
 
         return {
             valid: VALID,
@@ -26,13 +30,12 @@ export default class ValidationStatusColumnFormatter
             'not tested': UNKNOWN,
             none: UNKNOWN,
             na: UNKNOWN,
-            'n/a': UNKNOWN
+            'n/a': UNKNOWN,
         };
     }
-    
-    public static getData(data:Mutation[])
-    {
-        let value: string|null = null;
+
+    public static getData(data: Mutation[]) {
+        let value: string | null = null;
 
         if (data.length > 0) {
             value = data[0].validationStatus;
@@ -41,41 +44,45 @@ export default class ValidationStatusColumnFormatter
         return value;
     }
 
-    public static sortValue(data:Mutation[])
-    {
+    public static sortValue(data: Mutation[]) {
         return ValidationStatusColumnFormatter.getData(data);
     }
 
-    public static download(data:Mutation[])
-    {
-        return ValidationStatusColumnFormatter.getData(data) || "";
+    public static download(data: Mutation[]) {
+        return ValidationStatusColumnFormatter.getData(data) || '';
     }
 
-    public static renderFunction(data:Mutation[])
-    {
+    public static renderFunction(data: Mutation[]) {
         const value = ValidationStatusColumnFormatter.getData(data);
         let content: JSX.Element;
         let needTooltip = false;
 
         if (value) {
-            const format = ValidationStatusColumnFormatter.VALIDATION_STATUS_FORMAT[value.toLowerCase()];
-            
+            const format =
+                ValidationStatusColumnFormatter.VALIDATION_STATUS_FORMAT[
+                    value.toLowerCase()
+                ];
+
             if (format) {
-                content = <span className={styles[format.className]}>{format.text}</span>;
+                content = (
+                    <span className={styles[format.className]}>
+                        {format.text}
+                    </span>
+                );
                 needTooltip = true;
-            }
-            else {
+            } else {
                 content = <span className={styles.other}>{value}</span>;
             }
-        }
-        else {
+        } else {
             content = <span />;
         }
 
-        if (needTooltip)
-        {
+        if (needTooltip) {
             content = (
-                <DefaultTooltip overlay={<span>{value}</span>} placement="right">
+                <DefaultTooltip
+                    overlay={<span>{value}</span>}
+                    placement="right"
+                >
                     {content}
                 </DefaultTooltip>
             );
diff --git a/src/shared/components/mutationTable/column/cosmic.module.scss b/src/shared/components/mutationTable/column/cosmic.module.scss
index 3cbd79421c7..753790846e5 100644
--- a/src/shared/components/mutationTable/column/cosmic.module.scss
+++ b/src/shared/components/mutationTable/column/cosmic.module.scss
@@ -1,4 +1,4 @@
 .cosmic-table {
-  max-width: 300px;
-  display: block;
-}
\ No newline at end of file
+    max-width: 300px;
+    display: block;
+}
diff --git a/src/shared/components/mutationTable/column/exon.module.scss b/src/shared/components/mutationTable/column/exon.module.scss
index c2191fe9afb..ecd14d103ce 100644
--- a/src/shared/components/mutationTable/column/exon.module.scss
+++ b/src/shared/components/mutationTable/column/exon.module.scss
@@ -1,3 +1,3 @@
 .exon-table {
     min-width: 62px;
-  }
\ No newline at end of file
+}
diff --git a/src/shared/components/mutationTable/column/hgvsg.module.scss b/src/shared/components/mutationTable/column/hgvsg.module.scss
index 5b7c33e3346..42187f5a2fd 100644
--- a/src/shared/components/mutationTable/column/hgvsg.module.scss
+++ b/src/shared/components/mutationTable/column/hgvsg.module.scss
@@ -3,21 +3,24 @@
     max-width: 300px;
     overflow: hidden;
     text-overflow: ellipsis;
-    display:block;
+    display: block;
 
-  a {
-    color: black;
+    a {
+        color: black;
 
-    &:hover, &:focus, &:active, &:visited {
-      color: black;
+        &:hover,
+        &:focus,
+        &:active,
+        &:visited {
+            color: black;
+        }
     }
-  }
 }
 
 .genome-nexus-logo {
-  background: url("./GenomeNexusLogo.png");
-  height: 16px;
-  width: 16px;
-  display: inline-block;
-  vertical-align: middle;
-}
\ No newline at end of file
+    background: url('./GenomeNexusLogo.png');
+    height: 16px;
+    width: 16px;
+    display: inline-block;
+    vertical-align: middle;
+}
diff --git a/src/shared/components/mutationTable/column/mutationAssessor.module.scss b/src/shared/components/mutationTable/column/mutationAssessor.module.scss
index 9e6af51cef3..e4a0898467c 100644
--- a/src/shared/components/mutationTable/column/mutationAssessor.module.scss
+++ b/src/shared/components/mutationTable/column/mutationAssessor.module.scss
@@ -1,56 +1,56 @@
 .oma-link {
-  font-weight:normal;
+    font-weight: normal;
 }
 
 .oma-high {
-  color: #f00;
-  font-weight:bold;
+    color: #f00;
+    font-weight: bold;
 }
 
 .oma-medium {
-  color: #ffd700;
-  font-weight:bold;
+    color: #ffd700;
+    font-weight: bold;
 }
 
 .oma-low {
-  color: #ffd700;
-  font-weight:bold;
+    color: #ffd700;
+    font-weight: bold;
 }
 
 .oma-neutral {
-  color: #c1c1c1;
-  font-weight:bold;
+    color: #c1c1c1;
+    font-weight: bold;
 }
 
 .oma-na {
-  color: #808080;
-  font-size: xx-small;
-  text-align: center;
+    color: #808080;
+    font-size: xx-small;
+    text-align: center;
 }
 
 .mutation-assessor-link {
-  margin-bottom: 1px;
+    margin-bottom: 1px;
 }
 
 .ma-icon {
-  background-color: #88C;
-  color: white;
-  font-size: 80%;
-  margin-right: 3px;
+    background-color: #88c;
+    color: white;
+    font-size: 80%;
+    margin-right: 3px;
 }
 
-.ma-msa-icon{
-  padding-left: 3px;
-  padding-right: 3px;
+.ma-msa-icon {
+    padding-left: 3px;
+    padding-right: 3px;
 }
 
 .ma-3d-icon {
-  padding-left: 6px;
-  padding-right: 6px;
+    padding-left: 6px;
+    padding-right: 6px;
 }
 
 .mutation-assessor-main-img {
-  padding-left: 3px;
-  padding-right: 3px;
-  margin-right: 5px;
+    padding-left: 3px;
+    padding-right: 3px;
+    margin-right: 5px;
 }
diff --git a/src/shared/components/mutationTable/column/mutationStatus.module.scss b/src/shared/components/mutationTable/column/mutationStatus.module.scss
index 3a1e27cd4d8..682e4d94a97 100644
--- a/src/shared/components/mutationTable/column/mutationStatus.module.scss
+++ b/src/shared/components/mutationTable/column/mutationStatus.module.scss
@@ -1,22 +1,22 @@
 .germline {
-  background: #FFFFCC;
-  color: #000000;
-  padding-left: 5px;
-  padding-right: 5px;
-  font-weight: bold;
-  font-size: small;
+    background: #ffffcc;
+    color: #000000;
+    padding-left: 5px;
+    padding-right: 5px;
+    font-weight: bold;
+    font-size: small;
 }
 
 .somatic {
-  background: #CCFFFF;
-  color: #000000;
-  padding-left: 5px;
-  padding-right: 5px;
-  font-weight: bold;
-  font-size: small;
+    background: #ccffff;
+    color: #000000;
+    padding-left: 5px;
+    padding-right: 5px;
+    font-weight: bold;
+    font-size: small;
 }
 
 .unknown {
-  color: #9D9D9D;
-  font-size: xx-small;
+    color: #9d9d9d;
+    font-size: xx-small;
 }
diff --git a/src/shared/components/mutationTable/column/mutationType.module.scss b/src/shared/components/mutationTable/column/mutationType.module.scss
index 2eab5297d8c..9532367e451 100644
--- a/src/shared/components/mutationTable/column/mutationType.module.scss
+++ b/src/shared/components/mutationTable/column/mutationType.module.scss
@@ -1,20 +1,20 @@
 .missense-mutation {
-  color: #008000;
-  font-weight: bold;
+    color: #008000;
+    font-weight: bold;
 }
 .trunc-mutation {
-  color: #000000;
-  font-weight: bold;
+    color: #000000;
+    font-weight: bold;
 }
 .inframe-mutation {
-  color: #8B4513;
-  font-weight: bold;
+    color: #8b4513;
+    font-weight: bold;
 }
 .other-mutation {
-  color: #8B00C9;
-  font-weight: bold;
+    color: #8b00c9;
+    font-weight: bold;
 }
 .default-mutation {
-  color: #BB0000;
-  font-weight: bold;
-}
\ No newline at end of file
+    color: #bb0000;
+    font-weight: bold;
+}
diff --git a/src/shared/components/mutationTable/column/proteinChange.module.scss b/src/shared/components/mutationTable/column/proteinChange.module.scss
index 72d960eb56b..1613acad322 100644
--- a/src/shared/components/mutationTable/column/proteinChange.module.scss
+++ b/src/shared/components/mutationTable/column/proteinChange.module.scss
@@ -1,10 +1,10 @@
 .proteinChange {
-  font-weight: bold;
-  font-style: italic;
+    font-weight: bold;
+    font-style: italic;
 }
 
 .germline {
-  color: red;
-  font-size: x-small;
-  margin-left: 5px;
-}
\ No newline at end of file
+    color: red;
+    font-size: x-small;
+    margin-left: 5px;
+}
diff --git a/src/shared/components/mutationTable/column/styles.module.scss b/src/shared/components/mutationTable/column/styles.module.scss
index 2ff1e95a956..bd88266d36b 100644
--- a/src/shared/components/mutationTable/column/styles.module.scss
+++ b/src/shared/components/mutationTable/column/styles.module.scss
@@ -1,5 +1,5 @@
 .integer-data {
-  text-align: right !important;
+    text-align: right !important;
 }
 
 /***
@@ -7,8 +7,8 @@
     TODO remove after switching to bootstrap 4
 */
 :global(.gnomad-frequency-table .text-wrap) {
-  white-space: normal;
+    white-space: normal;
 }
 :global(.gnomad-frequency-table .font-weight-bold) {
-  font-weight: bold;
-}
\ No newline at end of file
+    font-weight: bold;
+}
diff --git a/src/shared/components/mutationTable/column/validationStatus.module.scss b/src/shared/components/mutationTable/column/validationStatus.module.scss
index 57d53c75a13..f9214e2745e 100644
--- a/src/shared/components/mutationTable/column/validationStatus.module.scss
+++ b/src/shared/components/mutationTable/column/validationStatus.module.scss
@@ -1,26 +1,26 @@
 .unknown {
-  background: #E0E0E0;
-  color: #000000;
-  padding-left:5px;
-  padding-right:5px;
-  font-weight: bold;
-  font-size: small;
+    background: #e0e0e0;
+    color: #000000;
+    padding-left: 5px;
+    padding-right: 5px;
+    font-weight: bold;
+    font-size: small;
 }
 
 .valid {
-  background: #CCFFCC;
-  color: #000000;
-  padding-left: 5px;
-  padding-right: 5px;
-  font-weight: bold;
-  font-size: small;
+    background: #ccffcc;
+    color: #000000;
+    padding-left: 5px;
+    padding-right: 5px;
+    font-weight: bold;
+    font-size: small;
 }
 
 .wildtype {
-  font-weight: bold;
+    font-weight: bold;
 }
 
 .other {
-  color: #9D9D9D;
-  font-size: xx-small;
+    color: #9d9d9d;
+    font-size: xx-small;
 }
diff --git a/src/shared/components/oncoprint/DataUtils.spec.ts b/src/shared/components/oncoprint/DataUtils.spec.ts
index 12228c5d6ac..f4beeeba4c5 100644
--- a/src/shared/components/oncoprint/DataUtils.spec.ts
+++ b/src/shared/components/oncoprint/DataUtils.spec.ts
@@ -1,1601 +1,2034 @@
 import { assert } from 'chai';
 import {
-    fillClinicalTrackDatum, fillGeneticTrackDatum, fillHeatmapTrackDatum,
-    getOncoprintMutationType, makeGeneticTrackData, selectDisplayValue
-} from "./DataUtils";
+    fillClinicalTrackDatum,
+    fillGeneticTrackDatum,
+    fillHeatmapTrackDatum,
+    getOncoprintMutationType,
+    makeGeneticTrackData,
+    selectDisplayValue,
+} from './DataUtils';
 import {
     GeneticTrackDatum,
     IGeneHeatmapTrackDatum,
     IGenesetHeatmapTrackDatum,
-    ITreatmentHeatmapTrackDatum
-} from "shared/components/oncoprint/Oncoprint";
-import {AlterationTypeConstants, AnnotatedExtendedAlteration} from "../../../pages/resultsView/ResultsViewPageStore";
+    ITreatmentHeatmapTrackDatum,
+} from 'shared/components/oncoprint/Oncoprint';
+import {
+    AlterationTypeConstants,
+    AnnotatedExtendedAlteration,
+} from '../../../pages/resultsView/ResultsViewPageStore';
 import {
     ClinicalAttribute,
     GenePanelData,
     MolecularProfile,
     Mutation,
     Patient,
-    Sample
-} from "../../api/generated/CBioPortalAPI";
-import {MutationSpectrum} from "../../api/generated/CBioPortalAPIInternal";
-import {SpecialAttribute} from "../../cache/ClinicalDataCache";
+    Sample,
+} from '../../api/generated/CBioPortalAPI';
+import { MutationSpectrum } from '../../api/generated/CBioPortalAPIInternal';
+import { SpecialAttribute } from '../../cache/ClinicalDataCache';
 
 /* Type assertions are used throughout this file to force functions to accept
 /* mocked parameters known to be sufficient. */
 /* tslint:disable no-object-literal-type-assertion */
 
-describe("DataUtils", ()=>{
-   describe("getOncoprintMutationType", ()=>{
-       it("correctly gets `promoter` type based on mutation.proteinChange", ()=>{
-           assert.equal(getOncoprintMutationType({ proteinChange:"Promoter", mutationType:"asdjfpoai" } as Mutation), "promoter");
-           assert.equal(getOncoprintMutationType({ proteinChange:"PROMOTER", mutationType:"asdfjii"} as Mutation), "promoter");
-           assert.equal(getOncoprintMutationType({ proteinChange:"promoter", mutationType:"Asdfasl" } as Mutation), "promoter");
-           assert.equal(getOncoprintMutationType({ proteinChange:"Promoter" } as Mutation), "promoter");
-       });
-   });
-   describe("selectDisplayValue", ()=>{
-       it("returns undefined if no values", ()=>{
-           assert.equal(selectDisplayValue({}, {}), undefined);
-       });
-       it("returns the lone value if one value", ()=>{
-           assert.equal(selectDisplayValue({"a":0}, {"a":0}), "a");
-       });
-       it("returns the lowest priority value if two values", ()=>{
-           assert.equal(selectDisplayValue({"a":0, "b":0}, {"a":0, "b":1}), "a");
-           assert.equal(selectDisplayValue({"a":0, "b":0}, {"a":1, "b":0}), "b");
-       });
-       it("returns the lowest priority value if several values", ()=>{
-           assert.equal(selectDisplayValue({"a":0, "b":0, "c":5}, {"a":0, "b":1, "c":2}), "a");
-           assert.equal(selectDisplayValue({"a":20, "b":0, "c":10}, {"a":2, "b":1, "c":0}), "c");
-       });
-       it("returns the lowest priority, highest count value if two values w same priority", ()=>{
-           assert.equal(selectDisplayValue({"a":1, "b":0}, {"a":0, "b":0}), "a");
-           assert.equal(selectDisplayValue({"a":0, "b":1}, {"a":0, "b":0}), "b");
-       });
-       it("returns the lowest priority, highest count value if several values w same priority", ()=>{
-           assert.equal(selectDisplayValue({"a":1, "b":0, "c":5}, {"a":0, "b":0, "c":2}), "a");
-           assert.equal(selectDisplayValue({"a":20, "b":0, "c":10}, {"a":0, "b":1, "c":0}), "a");
-       });
-   });
-
-   describe("makeGeneticTrackData", () => {
-      const makeMinimalGenePanelData = (patientKey: string, profiled: boolean) => ({
-         molecularProfileId: 'PROFILE1',
-         uniquePatientKey: patientKey,
-         uniqueSampleKey: `${patientKey}-SAMPLE1`,
-         genePanelId: 'GENEPANEL1',
-         profiled
-      } as GenePanelData);
-      const makeMinimalDifferentGenePanelData = (patientKey: string, profiled: boolean) => ({
-         molecularProfileId: 'PROFILE1',
-         uniquePatientKey: patientKey,
-         uniqueSampleKey: `${patientKey}-SAMPLE1`,
-         genePanelId: "GENEPANEL2",
-         profiled
-      } as GenePanelData);
-      const makeMinimalWholeExomePanelData = (patientKey: string, profiled: boolean) => ({
-         molecularProfileId: 'PROFILE1',
-         uniquePatientKey: patientKey,
-         uniqueSampleKey: `${patientKey}-SAMPLE1`,
-         profiled
-      } as GenePanelData);
-      const makeMinimalPatient = (uniquePatientKey: string, patientId: string) => ({
-          uniquePatientKey, patientId, studyId: 'gbm_tcga'
-      } as Patient);
-      const makeMinimalProfilelArray = () => [{
-          molecularProfileId: 'PROFILE1',
-          studyId: 'STUDY1',
-          study: {groups: '', name: 'STUDY1', publicStudy: true, shortName: 'STUDY1', status: 1, studyId: 'STUDY1'},
-          name: 'PROFILE1',
-          description: '',
-          molecularAlterationType: 'COPY_NUMBER_ALTERATION',
-          datatype: 'DISCRETE',
-          showProfileInAnalysisTab: true
-      }] as MolecularProfile[];
-
-      it('returns one cell for each listed case', () => {
-         // given three patients and a whole-exome coverage panel
-         const patientArray = [
-            makeMinimalPatient('PATIENT1', 'TCGA-02-0001'),
-            makeMinimalPatient('PATIENT2', 'TCGA-02-0003'),
-            makeMinimalPatient('PATIENT3', 'TCGA-02-0006')
-         ];
-         const makeMinimalPatientGenePanel = (patientKey: string) => ({
-            allGenes: [makeMinimalWholeExomePanelData(patientKey, true)],
-            byGene: {},
-            notProfiledAllGenes: [],
-            notProfiledByGene: {}
-         });
-         const genePanelByCase = {
-            samples: {},
-            patients: {
-               'PATIENT1': makeMinimalPatientGenePanel('PATIENT1'),
-               'PATIENT2': makeMinimalPatientGenePanel('PATIENT2'),
-               'PATIENT3': makeMinimalPatientGenePanel('PATIENT3'),
-            }
-         };
-         // when called to make data for a gene that has zero alterations in
-         // these patients
-         const trackData = makeGeneticTrackData(
-            {'PATIENT1': [], 'PATIENT2': [], 'PATIENT3': []},
-            'PTEN',
-            patientArray,
-            genePanelByCase,
-            makeMinimalProfilelArray()
-        );
-         // then it returns three cells of data, corresponding to first, second
-         // and third patient respectively
-         assert.lengthOf(trackData, 3);
-         assert.equal(trackData[0].patient, 'TCGA-02-0001');
-         assert.equal(trackData[1].patient, 'TCGA-02-0003');
-         assert.equal(trackData[2].patient, 'TCGA-02-0006');
-      });
-
-      it('sets na if a single-gene cell is not covered by any panel', () => {
-         // given a patient and a gene panel that doesn't mark all genes as
-         // profiled in that patient
-         const patientArray = [makeMinimalPatient('PATIENT1', 'TCGA-02-0001')];
-         const genePanelByCase = {
-            samples: {},
-            patients: {'PATIENT1': {
-               allGenes: [],
-               byGene: {'PTEN': [makeMinimalGenePanelData('PATIENT1', true)]},
-               notProfiledAllGenes: [],
-               notProfiledByGene: {'TP53': [makeMinimalGenePanelData('PATIENT1', false)]}
-            }}
-         };
-         // when called to make a cell of data for a zero-alteration gene that
-         // isn't covered by the panel
-         const [trackDatum] = makeGeneticTrackData(
-            {'PATIENT1': []},
-            'TP53',
-            patientArray,
-            genePanelByCase,
-            makeMinimalProfilelArray()
-         );
-         // then it sets the na field of the cell to true
-         assert.isTrue(trackDatum.na);
-      });
+describe('DataUtils', () => {
+    describe('getOncoprintMutationType', () => {
+        it('correctly gets `promoter` type based on mutation.proteinChange', () => {
+            assert.equal(
+                getOncoprintMutationType({
+                    proteinChange: 'Promoter',
+                    mutationType: 'asdjfpoai',
+                } as Mutation),
+                'promoter'
+            );
+            assert.equal(
+                getOncoprintMutationType({
+                    proteinChange: 'PROMOTER',
+                    mutationType: 'asdfjii',
+                } as Mutation),
+                'promoter'
+            );
+            assert.equal(
+                getOncoprintMutationType({
+                    proteinChange: 'promoter',
+                    mutationType: 'Asdfasl',
+                } as Mutation),
+                'promoter'
+            );
+            assert.equal(
+                getOncoprintMutationType({
+                    proteinChange: 'Promoter',
+                } as Mutation),
+                'promoter'
+            );
+        });
+    });
+    describe('selectDisplayValue', () => {
+        it('returns undefined if no values', () => {
+            assert.equal(selectDisplayValue({}, {}), undefined);
+        });
+        it('returns the lone value if one value', () => {
+            assert.equal(selectDisplayValue({ a: 0 }, { a: 0 }), 'a');
+        });
+        it('returns the lowest priority value if two values', () => {
+            assert.equal(
+                selectDisplayValue({ a: 0, b: 0 }, { a: 0, b: 1 }),
+                'a'
+            );
+            assert.equal(
+                selectDisplayValue({ a: 0, b: 0 }, { a: 1, b: 0 }),
+                'b'
+            );
+        });
+        it('returns the lowest priority value if several values', () => {
+            assert.equal(
+                selectDisplayValue({ a: 0, b: 0, c: 5 }, { a: 0, b: 1, c: 2 }),
+                'a'
+            );
+            assert.equal(
+                selectDisplayValue(
+                    { a: 20, b: 0, c: 10 },
+                    { a: 2, b: 1, c: 0 }
+                ),
+                'c'
+            );
+        });
+        it('returns the lowest priority, highest count value if two values w same priority', () => {
+            assert.equal(
+                selectDisplayValue({ a: 1, b: 0 }, { a: 0, b: 0 }),
+                'a'
+            );
+            assert.equal(
+                selectDisplayValue({ a: 0, b: 1 }, { a: 0, b: 0 }),
+                'b'
+            );
+        });
+        it('returns the lowest priority, highest count value if several values w same priority', () => {
+            assert.equal(
+                selectDisplayValue({ a: 1, b: 0, c: 5 }, { a: 0, b: 0, c: 2 }),
+                'a'
+            );
+            assert.equal(
+                selectDisplayValue(
+                    { a: 20, b: 0, c: 10 },
+                    { a: 0, b: 1, c: 0 }
+                ),
+                'a'
+            );
+        });
+    });
 
-      it('sets na if none of the genes in a multi-gene cell is covered by a panel', () => {
-         // given a patient and a gene panel that doesn't mark all genes as
-         // profiled in that patient
-         const patientArray = [makeMinimalPatient('PATIENT1', 'TCGA-02-0001')];
-         const genePanelByCase = {
-            samples: {},
-            patients: {'PATIENT1': {
-               allGenes: [],
-               byGene: {'PTEN': [makeMinimalGenePanelData('PATIENT1', true)]},
-               notProfiledAllGenes: [],
-               notProfiledByGene: {
-                   'TP53': [makeMinimalGenePanelData('PATIENT1', false)],
-                   'BRCA1': [makeMinimalGenePanelData('PATIENT1', false)]
-               }
-            }}
-         };
-         // when called to make a cell of data for two zero-alteration genes
-         // that aren't covered by the panel
-         const [trackDatum] = makeGeneticTrackData(
-            {'PATIENT1': []},
-            ['TP53', 'BRCA1'],
-            patientArray,
-            genePanelByCase,
-            makeMinimalProfilelArray()
-         );
-         // then it sets the na field of the cell to true
-         assert.isTrue(trackDatum.na);
-      });
+    describe('makeGeneticTrackData', () => {
+        const makeMinimalGenePanelData = (
+            patientKey: string,
+            profiled: boolean
+        ) =>
+            ({
+                molecularProfileId: 'PROFILE1',
+                uniquePatientKey: patientKey,
+                uniqueSampleKey: `${patientKey}-SAMPLE1`,
+                genePanelId: 'GENEPANEL1',
+                profiled,
+            } as GenePanelData);
+        const makeMinimalDifferentGenePanelData = (
+            patientKey: string,
+            profiled: boolean
+        ) =>
+            ({
+                molecularProfileId: 'PROFILE1',
+                uniquePatientKey: patientKey,
+                uniqueSampleKey: `${patientKey}-SAMPLE1`,
+                genePanelId: 'GENEPANEL2',
+                profiled,
+            } as GenePanelData);
+        const makeMinimalWholeExomePanelData = (
+            patientKey: string,
+            profiled: boolean
+        ) =>
+            ({
+                molecularProfileId: 'PROFILE1',
+                uniquePatientKey: patientKey,
+                uniqueSampleKey: `${patientKey}-SAMPLE1`,
+                profiled,
+            } as GenePanelData);
+        const makeMinimalPatient = (
+            uniquePatientKey: string,
+            patientId: string
+        ) =>
+            ({
+                uniquePatientKey,
+                patientId,
+                studyId: 'gbm_tcga',
+            } as Patient);
+        const makeMinimalProfilelArray = () =>
+            [
+                {
+                    molecularProfileId: 'PROFILE1',
+                    studyId: 'STUDY1',
+                    study: {
+                        groups: '',
+                        name: 'STUDY1',
+                        publicStudy: true,
+                        shortName: 'STUDY1',
+                        status: 1,
+                        studyId: 'STUDY1',
+                    },
+                    name: 'PROFILE1',
+                    description: '',
+                    molecularAlterationType: 'COPY_NUMBER_ALTERATION',
+                    datatype: 'DISCRETE',
+                    showProfileInAnalysisTab: true,
+                },
+            ] as MolecularProfile[];
 
-      it('does not set na if a single-gene cell is covered by a panel', () => {
-         // given a patient and a gene panel that marks a gene as profiled in
-         // that patient
-         const patientArray = [makeMinimalPatient('PATIENT1', 'TCGA-02-0001')];
-         const genePanelByCase = {
-            samples: {},
-            patients: {'PATIENT1': {
-               allGenes: [],
-               byGene: {'PTEN': [makeMinimalGenePanelData('PATIENT1', true)]},
-               notProfiledAllGenes: [],
-               notProfiledByGene: {}
-            }}
-         };
-         // when called to make a cell of data for that (zero-alteration) gene
-         const [trackDatum] = makeGeneticTrackData(
-            {'PATIENT1': []},
-            'PTEN',
-            patientArray,
-            genePanelByCase,
-            makeMinimalProfilelArray()
-         );
-         // then it makes the na field of that track evaluate to a falsy value
-         assert.isNotOk(trackDatum.na);
-      });
+        it('returns one cell for each listed case', () => {
+            // given three patients and a whole-exome coverage panel
+            const patientArray = [
+                makeMinimalPatient('PATIENT1', 'TCGA-02-0001'),
+                makeMinimalPatient('PATIENT2', 'TCGA-02-0003'),
+                makeMinimalPatient('PATIENT3', 'TCGA-02-0006'),
+            ];
+            const makeMinimalPatientGenePanel = (patientKey: string) => ({
+                allGenes: [makeMinimalWholeExomePanelData(patientKey, true)],
+                byGene: {},
+                notProfiledAllGenes: [],
+                notProfiledByGene: {},
+            });
+            const genePanelByCase = {
+                samples: {},
+                patients: {
+                    PATIENT1: makeMinimalPatientGenePanel('PATIENT1'),
+                    PATIENT2: makeMinimalPatientGenePanel('PATIENT2'),
+                    PATIENT3: makeMinimalPatientGenePanel('PATIENT3'),
+                },
+            };
+            // when called to make data for a gene that has zero alterations in
+            // these patients
+            const trackData = makeGeneticTrackData(
+                { PATIENT1: [], PATIENT2: [], PATIENT3: [] },
+                'PTEN',
+                patientArray,
+                genePanelByCase,
+                makeMinimalProfilelArray()
+            );
+            // then it returns three cells of data, corresponding to first, second
+            // and third patient respectively
+            assert.lengthOf(trackData, 3);
+            assert.equal(trackData[0].patient, 'TCGA-02-0001');
+            assert.equal(trackData[1].patient, 'TCGA-02-0003');
+            assert.equal(trackData[2].patient, 'TCGA-02-0006');
+        });
 
-      it('does not set na if one of the genes in a multi-gene cell is covered by a panel', () => {
-         // given a patient and a gene panel that marks a gene as profiled in
-         // that patient
-         const patientArray = [makeMinimalPatient('PATIENT1', 'TCGA-02-0001')];
-         const genePanelByCase = {
-            samples: {},
-            patients: {'PATIENT1': {
-               allGenes: [],
-               byGene: {'PTEN': [makeMinimalGenePanelData('PATIENT1', true)]},
-               notProfiledAllGenes: [],
-               notProfiledByGene: {'BRCA2': [makeMinimalGenePanelData('PATIENT1', false)]}
-            }}
-         };
-         // when called to make a cell of data for that (zero-alteration) gene
-         // in addition to another one
-         const [trackDatum] = makeGeneticTrackData(
-            {'PATIENT1': []},
-            ['BRCA2', 'PTEN'],
-            patientArray,
-            genePanelByCase,
-            makeMinimalProfilelArray()
-         );
-         // then it makes the na field of that track evaluate to a falsy value
-         assert.isNotOk(trackDatum.na);
-      });
+        it('sets na if a single-gene cell is not covered by any panel', () => {
+            // given a patient and a gene panel that doesn't mark all genes as
+            // profiled in that patient
+            const patientArray = [
+                makeMinimalPatient('PATIENT1', 'TCGA-02-0001'),
+            ];
+            const genePanelByCase = {
+                samples: {},
+                patients: {
+                    PATIENT1: {
+                        allGenes: [],
+                        byGene: {
+                            PTEN: [makeMinimalGenePanelData('PATIENT1', true)],
+                        },
+                        notProfiledAllGenes: [],
+                        notProfiledByGene: {
+                            TP53: [makeMinimalGenePanelData('PATIENT1', false)],
+                        },
+                    },
+                },
+            };
+            // when called to make a cell of data for a zero-alteration gene that
+            // isn't covered by the panel
+            const [trackDatum] = makeGeneticTrackData(
+                { PATIENT1: [] },
+                'TP53',
+                patientArray,
+                genePanelByCase,
+                makeMinimalProfilelArray()
+            );
+            // then it sets the na field of the cell to true
+            assert.isTrue(trackDatum.na);
+        });
 
-      it('does not set na if a single-gene cell is covered by whole-exome profiling', () => {
-         // given a patient and a whole-exome gene panel that marks a gene as
-         // profiled in that patient
-         const patientArray = [makeMinimalPatient('PATIENT1', 'TCGA-02-0001')];
-         const genePanelByCase = {
-            samples: {},
-            patients: {'PATIENT1': {
-               allGenes: [makeMinimalWholeExomePanelData('PATIENT1', true)],
-               byGene: {},
-               notProfiledAllGenes: [],
-               notProfiledByGene: {}
-            }}
-         };
-         // when called to make a cell of data for that (zero-alteration) gene
-         const [trackDatum] = makeGeneticTrackData(
-            {'PATIENT1': []},
-            'PTEN',
-            patientArray,
-            genePanelByCase,
-            makeMinimalProfilelArray()
-         );
-         // then it makes the na field of that track evaluate to a falsy value
-         assert.isNotOk(trackDatum.na);
-      });
+        it('sets na if none of the genes in a multi-gene cell is covered by a panel', () => {
+            // given a patient and a gene panel that doesn't mark all genes as
+            // profiled in that patient
+            const patientArray = [
+                makeMinimalPatient('PATIENT1', 'TCGA-02-0001'),
+            ];
+            const genePanelByCase = {
+                samples: {},
+                patients: {
+                    PATIENT1: {
+                        allGenes: [],
+                        byGene: {
+                            PTEN: [makeMinimalGenePanelData('PATIENT1', true)],
+                        },
+                        notProfiledAllGenes: [],
+                        notProfiledByGene: {
+                            TP53: [makeMinimalGenePanelData('PATIENT1', false)],
+                            BRCA1: [
+                                makeMinimalGenePanelData('PATIENT1', false),
+                            ],
+                        },
+                    },
+                },
+            };
+            // when called to make a cell of data for two zero-alteration genes
+            // that aren't covered by the panel
+            const [trackDatum] = makeGeneticTrackData(
+                { PATIENT1: [] },
+                ['TP53', 'BRCA1'],
+                patientArray,
+                genePanelByCase,
+                makeMinimalProfilelArray()
+            );
+            // then it sets the na field of the cell to true
+            assert.isTrue(trackDatum.na);
+        });
 
-      it('sets na per cell if two single-gene cells have different coverage', () => {
-         // given two patients and a gene panel that marks a gene as profiled
-         // in only one of them
-         const patientArray = [
-            makeMinimalPatient('PATIENT1', 'TCGA-02-0001'),
-            makeMinimalPatient('PATIENT2', 'TCGA-02-0003')
-         ];
-         const genePanelByCase = {
-            samples: {},
-            patients: {
-               'PATIENT1': {
-                  allGenes: [],
-                  byGene: {'PTEN': [makeMinimalGenePanelData('PATIENT1', true)]},
-                  notProfiledAllGenes: [],
-                  notProfiledByGene: {}
-               },
-               'PATIENT2': {
-                  allGenes: [],
-                  byGene: {},
-                  notProfiledAllGenes: [],
-                  notProfiledByGene: {'PTEN': [makeMinimalGenePanelData('PATIENT2', false)]}
-               }
-            }
-         };
-         // when called to make data for that (zero-alteration) gene
-         const trackData = makeGeneticTrackData(
-            {'PATIENT1': [], 'PATIENT2': []},
-            'PTEN',
-            patientArray,
-            genePanelByCase,
-            makeMinimalProfilelArray()
-         );
-         // then it sets na only on the cell for the patient that wasn't covered
-         assert.isNotOk(trackData[0].na);
-         assert.isTrue(trackData[1].na);
-      });
+        it('does not set na if a single-gene cell is covered by a panel', () => {
+            // given a patient and a gene panel that marks a gene as profiled in
+            // that patient
+            const patientArray = [
+                makeMinimalPatient('PATIENT1', 'TCGA-02-0001'),
+            ];
+            const genePanelByCase = {
+                samples: {},
+                patients: {
+                    PATIENT1: {
+                        allGenes: [],
+                        byGene: {
+                            PTEN: [makeMinimalGenePanelData('PATIENT1', true)],
+                        },
+                        notProfiledAllGenes: [],
+                        notProfiledByGene: {},
+                    },
+                },
+            };
+            // when called to make a cell of data for that (zero-alteration) gene
+            const [trackDatum] = makeGeneticTrackData(
+                { PATIENT1: [] },
+                'PTEN',
+                patientArray,
+                genePanelByCase,
+                makeMinimalProfilelArray()
+            );
+            // then it makes the na field of that track evaluate to a falsy value
+            assert.isNotOk(trackDatum.na);
+        });
 
-      it('lists a profile in profiled_in if it covers a single-gene cell by whole-exome profiling', () => {
-         // given a patient and a whole-exome gene panel that marks a gene as
-         // profiled in that patient
-         const patientArray = [makeMinimalPatient('PATIENT1', 'TCGA-02-0001')];
-         const genePanelByCase = {
-            samples: {},
-            patients: {'PATIENT1': {
-               allGenes: [makeMinimalWholeExomePanelData('PATIENT1', true)],
-               byGene: {},
-               notProfiledAllGenes: [],
-               notProfiledByGene: {}
-            }}
-         };
-         // when called to make a cell of data for that (zero-alteration) gene
-         const [trackDatum] = makeGeneticTrackData(
-            {'PATIENT1': []},
-            'PTEN',
-            patientArray,
-            genePanelByCase,
-            makeMinimalProfilelArray()
-         );
-         // then it lists the profile in profiled_in and not in not_profiled_in
-         assert.deepEqual(
-             trackDatum.profiled_in,
-             [makeMinimalWholeExomePanelData('PATIENT1', true)]
-         );
-         assert.deepEqual(
-            trackDatum.not_profiled_in,
-            [],
-            'nothing should be listed in not_profiled_in in this case'
-        );
-      });
+        it('does not set na if one of the genes in a multi-gene cell is covered by a panel', () => {
+            // given a patient and a gene panel that marks a gene as profiled in
+            // that patient
+            const patientArray = [
+                makeMinimalPatient('PATIENT1', 'TCGA-02-0001'),
+            ];
+            const genePanelByCase = {
+                samples: {},
+                patients: {
+                    PATIENT1: {
+                        allGenes: [],
+                        byGene: {
+                            PTEN: [makeMinimalGenePanelData('PATIENT1', true)],
+                        },
+                        notProfiledAllGenes: [],
+                        notProfiledByGene: {
+                            BRCA2: [
+                                makeMinimalGenePanelData('PATIENT1', false),
+                            ],
+                        },
+                    },
+                },
+            };
+            // when called to make a cell of data for that (zero-alteration) gene
+            // in addition to another one
+            const [trackDatum] = makeGeneticTrackData(
+                { PATIENT1: [] },
+                ['BRCA2', 'PTEN'],
+                patientArray,
+                genePanelByCase,
+                makeMinimalProfilelArray()
+            );
+            // then it makes the na field of that track evaluate to a falsy value
+            assert.isNotOk(trackDatum.na);
+        });
 
-      it('lists a profile in profiled_in if it covers a single-gene cell by a non-whole-exome panel', () => {
-         // given a patient and a non-whole-exome gene panel that marks a gene
-         // as profiled in that patient
-         const patientArray = [makeMinimalPatient('PATIENT1', 'TCGA-02-0001')];
-         const genePanelByCase = {
-            samples: {},
-            patients: {'PATIENT1': {
-               allGenes: [],
-               byGene: {'PTEN': [makeMinimalGenePanelData('PATIENT1', true)]},
-               notProfiledAllGenes: [],
-               notProfiledByGene: {}
-            }}
-         };
-         // when called to make a cell of data for that (zero-alteration) gene
-         const [trackDatum] = makeGeneticTrackData(
-            {'PATIENT1': []},
-            'PTEN',
-            patientArray,
-            genePanelByCase,
-            makeMinimalProfilelArray()
-         );
-         // then it lists the profile in profiled_in and not in not_profiled_in
-         assert.deepEqual(
-            trackDatum.profiled_in,
-            [makeMinimalGenePanelData('PATIENT1', true)]
-         );
-         assert.deepEqual(
-            trackDatum.not_profiled_in,
-            [],
-            'nothing should be listed in not_profiled_in in this case'
-         );
-      });
+        it('does not set na if a single-gene cell is covered by whole-exome profiling', () => {
+            // given a patient and a whole-exome gene panel that marks a gene as
+            // profiled in that patient
+            const patientArray = [
+                makeMinimalPatient('PATIENT1', 'TCGA-02-0001'),
+            ];
+            const genePanelByCase = {
+                samples: {},
+                patients: {
+                    PATIENT1: {
+                        allGenes: [
+                            makeMinimalWholeExomePanelData('PATIENT1', true),
+                        ],
+                        byGene: {},
+                        notProfiledAllGenes: [],
+                        notProfiledByGene: {},
+                    },
+                },
+            };
+            // when called to make a cell of data for that (zero-alteration) gene
+            const [trackDatum] = makeGeneticTrackData(
+                { PATIENT1: [] },
+                'PTEN',
+                patientArray,
+                genePanelByCase,
+                makeMinimalProfilelArray()
+            );
+            // then it makes the na field of that track evaluate to a falsy value
+            assert.isNotOk(trackDatum.na);
+        });
 
-      it('lists a profile in not_profiled_in if it skips a single-gene cell in a non-whole-exome panel', () => {
-         // given a patient and a gene panel that doesn't mark all genes as
-         // profiled in that patient
-         const patientArray = [makeMinimalPatient('PATIENT1', 'TCGA-02-0001')];
-         const genePanelByCase = {
-            samples: {},
-            patients: {'PATIENT1': {
-               allGenes: [],
-               byGene: {'PTEN': [makeMinimalGenePanelData('PATIENT1', true)]},
-               notProfiledAllGenes: [],
-               notProfiledByGene: {'TP53': [makeMinimalGenePanelData('PATIENT1', false)]}
-            }}
-         };
-         // when called to make a cell of data for a zero-alteration gene that
-         // isn't covered by the panel
-         const [trackDatum] = makeGeneticTrackData(
-            {'PATIENT1': []},
-            'TP53',
-            patientArray,
-            genePanelByCase,
-            makeMinimalProfilelArray()
-         );
-         // then it lists the profile in not_profiled_in and not in profiled_in
-         assert.deepEqual(
-            trackDatum.not_profiled_in,
-            [makeMinimalGenePanelData('PATIENT1', false)]
-         );
-         assert.deepEqual(
-            trackDatum.profiled_in,
-            [],
-            'nothing should be listed in profiled_in in this case'
-         );
-      });
+        it('sets na per cell if two single-gene cells have different coverage', () => {
+            // given two patients and a gene panel that marks a gene as profiled
+            // in only one of them
+            const patientArray = [
+                makeMinimalPatient('PATIENT1', 'TCGA-02-0001'),
+                makeMinimalPatient('PATIENT2', 'TCGA-02-0003'),
+            ];
+            const genePanelByCase = {
+                samples: {},
+                patients: {
+                    PATIENT1: {
+                        allGenes: [],
+                        byGene: {
+                            PTEN: [makeMinimalGenePanelData('PATIENT1', true)],
+                        },
+                        notProfiledAllGenes: [],
+                        notProfiledByGene: {},
+                    },
+                    PATIENT2: {
+                        allGenes: [],
+                        byGene: {},
+                        notProfiledAllGenes: [],
+                        notProfiledByGene: {
+                            PTEN: [makeMinimalGenePanelData('PATIENT2', false)],
+                        },
+                    },
+                },
+            };
+            // when called to make data for that (zero-alteration) gene
+            const trackData = makeGeneticTrackData(
+                { PATIENT1: [], PATIENT2: [] },
+                'PTEN',
+                patientArray,
+                genePanelByCase,
+                makeMinimalProfilelArray()
+            );
+            // then it sets na only on the cell for the patient that wasn't covered
+            assert.isNotOk(trackData[0].na);
+            assert.isTrue(trackData[1].na);
+        });
 
-      it('lists a profile in not_profiled_in if it fails to cover a patient at all', () => {
-          // given a patient and a gene panel that marks that patient as
-          // unprofiled for all genes
-          const patientArray = [makeMinimalPatient('PATIENT1', 'TCGA-02-0001')];
-          const genePanelByCase = {
-             samples: {},
-             patients: {'PATIENT1': {
-                allGenes: [],
-                byGene: {},
-                notProfiledAllGenes: [makeMinimalWholeExomePanelData('PATIENT1', false)],
-                notProfiledByGene: {}
-             }}
-          };
-          // when called to make a cell of data for any (zero-alteration) gene
-          const [trackDatum] = makeGeneticTrackData(
-             {'PATIENT1': []},
-             'TP53',
-             patientArray,
-             genePanelByCase,
-             makeMinimalProfilelArray()
-          );
-          // then it lists the profile in not_profiled_in and not in profiled_in
-          assert.deepEqual(
-             trackDatum.not_profiled_in,
-             [makeMinimalWholeExomePanelData('PATIENT1', false)]
-          );
-          assert.deepEqual(
-             trackDatum.profiled_in,
-             [],
-             'nothing should be listed in profiled_in in this case'
-          );
-      });
+        it('lists a profile in profiled_in if it covers a single-gene cell by whole-exome profiling', () => {
+            // given a patient and a whole-exome gene panel that marks a gene as
+            // profiled in that patient
+            const patientArray = [
+                makeMinimalPatient('PATIENT1', 'TCGA-02-0001'),
+            ];
+            const genePanelByCase = {
+                samples: {},
+                patients: {
+                    PATIENT1: {
+                        allGenes: [
+                            makeMinimalWholeExomePanelData('PATIENT1', true),
+                        ],
+                        byGene: {},
+                        notProfiledAllGenes: [],
+                        notProfiledByGene: {},
+                    },
+                },
+            };
+            // when called to make a cell of data for that (zero-alteration) gene
+            const [trackDatum] = makeGeneticTrackData(
+                { PATIENT1: [] },
+                'PTEN',
+                patientArray,
+                genePanelByCase,
+                makeMinimalProfilelArray()
+            );
+            // then it lists the profile in profiled_in and not in not_profiled_in
+            assert.deepEqual(trackDatum.profiled_in, [
+                makeMinimalWholeExomePanelData('PATIENT1', true),
+            ]);
+            assert.deepEqual(
+                trackDatum.not_profiled_in,
+                [],
+                'nothing should be listed in not_profiled_in in this case'
+            );
+        });
 
-      it('lists panel coverage and non-coverage for all genes displayed in the cell', () => {
-         // given a patient, a gene panel that marks two genes as profiled in
-         // that patient, and a different gene panel that marks one
-         // of them as profiled in that patient
-         const patientArray = [makeMinimalPatient('PATIENT1', 'TCGA-02-0001')];
-         const genePanelByCase = {
-            samples: {},
-            patients: {'PATIENT1': {
-               allGenes: [],
-               byGene: {
-                  'PTEN': [
-                      makeMinimalGenePanelData('PATIENT1', true)
-                  ],
-                  'BRCA2': [
-                     makeMinimalGenePanelData('PATIENT1', true),
-                     makeMinimalDifferentGenePanelData('PATIENT1', true)
-                  ]
-              },
-              notProfiledAllGenes: [],
-              notProfiledByGene: {
-                  'PTEN': [
-                      makeMinimalDifferentGenePanelData('PATIENT1', false)
-                  ],
-                  'BRCA1': [
-                      makeMinimalGenePanelData('PATIENT1', false),
-                      makeMinimalDifferentGenePanelData('PATIENT1', false)
-                  ]
-               }
-            }},
-         };
-         // when called to make a cell of data for the two (zero-alteration)
-         // genes and another one that isn't covered
-         const [trackDatum] = makeGeneticTrackData(
-            {'PATIENT1': []},
-            ['BRCA2', 'PTEN', 'BRCA1'],
-            patientArray,
-            genePanelByCase,
-            makeMinimalProfilelArray()
-         );
-         // then the profiled_in attribute for the cell lists all the gene
-         // panel/profile combinations for the two covered genes in this
-         // patient, and the not_profiled_in attribute lists them for the
-         // un-covered genes
-         assert.deepEqual(
-            trackDatum.profiled_in,
-            [
-               makeMinimalGenePanelData('PATIENT1', true),   // BRCA2
-               makeMinimalDifferentGenePanelData('PATIENT1', true),   // BRCA2
-               makeMinimalGenePanelData('PATIENT1', true)   // PTEN
-           ],
-            'profiled_in should list the panels that cover genes'
-         );
-         assert.deepEqual(
-            trackDatum.not_profiled_in,
-            [
-                makeMinimalDifferentGenePanelData('PATIENT1', false),   // PTEN
-                makeMinimalGenePanelData('PATIENT1', false),   // BRCA1
-                makeMinimalDifferentGenePanelData('PATIENT1', false)   // BRCA1
-            ],
-            "not_profiled_in should list the panels that don't cover genes"
-         );
-      });
+        it('lists a profile in profiled_in if it covers a single-gene cell by a non-whole-exome panel', () => {
+            // given a patient and a non-whole-exome gene panel that marks a gene
+            // as profiled in that patient
+            const patientArray = [
+                makeMinimalPatient('PATIENT1', 'TCGA-02-0001'),
+            ];
+            const genePanelByCase = {
+                samples: {},
+                patients: {
+                    PATIENT1: {
+                        allGenes: [],
+                        byGene: {
+                            PTEN: [makeMinimalGenePanelData('PATIENT1', true)],
+                        },
+                        notProfiledAllGenes: [],
+                        notProfiledByGene: {},
+                    },
+                },
+            };
+            // when called to make a cell of data for that (zero-alteration) gene
+            const [trackDatum] = makeGeneticTrackData(
+                { PATIENT1: [] },
+                'PTEN',
+                patientArray,
+                genePanelByCase,
+                makeMinimalProfilelArray()
+            );
+            // then it lists the profile in profiled_in and not in not_profiled_in
+            assert.deepEqual(trackDatum.profiled_in, [
+                makeMinimalGenePanelData('PATIENT1', true),
+            ]);
+            assert.deepEqual(
+                trackDatum.not_profiled_in,
+                [],
+                'nothing should be listed in not_profiled_in in this case'
+            );
+        });
 
-   });
+        it('lists a profile in not_profiled_in if it skips a single-gene cell in a non-whole-exome panel', () => {
+            // given a patient and a gene panel that doesn't mark all genes as
+            // profiled in that patient
+            const patientArray = [
+                makeMinimalPatient('PATIENT1', 'TCGA-02-0001'),
+            ];
+            const genePanelByCase = {
+                samples: {},
+                patients: {
+                    PATIENT1: {
+                        allGenes: [],
+                        byGene: {
+                            PTEN: [makeMinimalGenePanelData('PATIENT1', true)],
+                        },
+                        notProfiledAllGenes: [],
+                        notProfiledByGene: {
+                            TP53: [makeMinimalGenePanelData('PATIENT1', false)],
+                        },
+                    },
+                },
+            };
+            // when called to make a cell of data for a zero-alteration gene that
+            // isn't covered by the panel
+            const [trackDatum] = makeGeneticTrackData(
+                { PATIENT1: [] },
+                'TP53',
+                patientArray,
+                genePanelByCase,
+                makeMinimalProfilelArray()
+            );
+            // then it lists the profile in not_profiled_in and not in profiled_in
+            assert.deepEqual(trackDatum.not_profiled_in, [
+                makeMinimalGenePanelData('PATIENT1', false),
+            ]);
+            assert.deepEqual(
+                trackDatum.profiled_in,
+                [],
+                'nothing should be listed in profiled_in in this case'
+            );
+        });
 
-   describe("fillGeneticTrackDatum", ()=>{
-       const makeMinimalUnfilledDatum = () => ({
-           study_id: 'study1',
-           uid: 'SAMPLE1==',
-           patient:"patient1"
-       });
-       it("fills a datum w no data correctly", ()=>{
-           assert.deepEqual(
-               fillGeneticTrackDatum(makeMinimalUnfilledDatum(), "gene", []),
-               {
-                   ...makeMinimalUnfilledDatum(),
-                   trackLabel: "gene",
-                   data: [],
-                   disp_cna: undefined,
-                   disp_mrna: undefined,
-                   disp_prot: undefined,
-                   disp_mut: undefined,
-                   disp_germ: undefined
-               });
-       });
-       it("fills a datum w one mutation data correctly", ()=>{
-           let data = [
-               {
-               mutationType: "missense",
-               putativeDriver: true,
-               molecularProfileAlterationType: AlterationTypeConstants.MUTATION_EXTENDED
-                } as AnnotatedExtendedAlteration];
-           assert.deepEqual(
-               fillGeneticTrackDatum(makeMinimalUnfilledDatum(), "gene", data),
-               {
-                   ...makeMinimalUnfilledDatum(),
-                   trackLabel: "gene",
-                   data: data,
-                   disp_cna: undefined,
-                   disp_mrna: undefined,
-                   disp_prot: undefined,
-                   disp_mut: "missense_rec",
-                   disp_germ: false
-               },
-               "missense driver with no germline");
+        it('lists a profile in not_profiled_in if it fails to cover a patient at all', () => {
+            // given a patient and a gene panel that marks that patient as
+            // unprofiled for all genes
+            const patientArray = [
+                makeMinimalPatient('PATIENT1', 'TCGA-02-0001'),
+            ];
+            const genePanelByCase = {
+                samples: {},
+                patients: {
+                    PATIENT1: {
+                        allGenes: [],
+                        byGene: {},
+                        notProfiledAllGenes: [
+                            makeMinimalWholeExomePanelData('PATIENT1', false),
+                        ],
+                        notProfiledByGene: {},
+                    },
+                },
+            };
+            // when called to make a cell of data for any (zero-alteration) gene
+            const [trackDatum] = makeGeneticTrackData(
+                { PATIENT1: [] },
+                'TP53',
+                patientArray,
+                genePanelByCase,
+                makeMinimalProfilelArray()
+            );
+            // then it lists the profile in not_profiled_in and not in profiled_in
+            assert.deepEqual(trackDatum.not_profiled_in, [
+                makeMinimalWholeExomePanelData('PATIENT1', false),
+            ]);
+            assert.deepEqual(
+                trackDatum.profiled_in,
+                [],
+                'nothing should be listed in profiled_in in this case'
+            );
+        });
 
-           data = [{
-               mutationType: "in_frame_del",
-               putativeDriver: false,
-               molecularProfileAlterationType: AlterationTypeConstants.MUTATION_EXTENDED
-           } as AnnotatedExtendedAlteration];
-           assert.deepEqual(
-               fillGeneticTrackDatum(makeMinimalUnfilledDatum(), "gene", data),
-               {
-                   ...makeMinimalUnfilledDatum(),
-                   trackLabel: "gene",
-                   data: data,
-                   disp_cna: undefined,
-                   disp_mrna: undefined,
-                   disp_prot: undefined,
-                   disp_mut: "inframe",
-                   disp_germ: false
-               },
-               "inframe non-driver");
+        it('lists panel coverage and non-coverage for all genes displayed in the cell', () => {
+            // given a patient, a gene panel that marks two genes as profiled in
+            // that patient, and a different gene panel that marks one
+            // of them as profiled in that patient
+            const patientArray = [
+                makeMinimalPatient('PATIENT1', 'TCGA-02-0001'),
+            ];
+            const genePanelByCase = {
+                samples: {},
+                patients: {
+                    PATIENT1: {
+                        allGenes: [],
+                        byGene: {
+                            PTEN: [makeMinimalGenePanelData('PATIENT1', true)],
+                            BRCA2: [
+                                makeMinimalGenePanelData('PATIENT1', true),
+                                makeMinimalDifferentGenePanelData(
+                                    'PATIENT1',
+                                    true
+                                ),
+                            ],
+                        },
+                        notProfiledAllGenes: [],
+                        notProfiledByGene: {
+                            PTEN: [
+                                makeMinimalDifferentGenePanelData(
+                                    'PATIENT1',
+                                    false
+                                ),
+                            ],
+                            BRCA1: [
+                                makeMinimalGenePanelData('PATIENT1', false),
+                                makeMinimalDifferentGenePanelData(
+                                    'PATIENT1',
+                                    false
+                                ),
+                            ],
+                        },
+                    },
+                },
+            };
+            // when called to make a cell of data for the two (zero-alteration)
+            // genes and another one that isn't covered
+            const [trackDatum] = makeGeneticTrackData(
+                { PATIENT1: [] },
+                ['BRCA2', 'PTEN', 'BRCA1'],
+                patientArray,
+                genePanelByCase,
+                makeMinimalProfilelArray()
+            );
+            // then the profiled_in attribute for the cell lists all the gene
+            // panel/profile combinations for the two covered genes in this
+            // patient, and the not_profiled_in attribute lists them for the
+            // un-covered genes
+            assert.deepEqual(
+                trackDatum.profiled_in,
+                [
+                    makeMinimalGenePanelData('PATIENT1', true), // BRCA2
+                    makeMinimalDifferentGenePanelData('PATIENT1', true), // BRCA2
+                    makeMinimalGenePanelData('PATIENT1', true), // PTEN
+                ],
+                'profiled_in should list the panels that cover genes'
+            );
+            assert.deepEqual(
+                trackDatum.not_profiled_in,
+                [
+                    makeMinimalDifferentGenePanelData('PATIENT1', false), // PTEN
+                    makeMinimalGenePanelData('PATIENT1', false), // BRCA1
+                    makeMinimalDifferentGenePanelData('PATIENT1', false), // BRCA1
+                ],
+                "not_profiled_in should list the panels that don't cover genes"
+            );
+        });
+    });
 
-           data = [{
-               mutationType: "start_codon_del",
-               putativeDriver: false,
-               molecularProfileAlterationType: AlterationTypeConstants.MUTATION_EXTENDED
-           } as AnnotatedExtendedAlteration];
-           assert.deepEqual(
-               fillGeneticTrackDatum(makeMinimalUnfilledDatum(), "gene", data),
-               {
-                   ...makeMinimalUnfilledDatum(),
-                   trackLabel: "gene",
-                   data: data,
-                   disp_cna: undefined,
-                   disp_mrna: undefined,
-                   disp_prot: undefined,
-                   disp_mut: "trunc",
-                   disp_germ: false
-               },
-               "truncating non-driver");
+    describe('fillGeneticTrackDatum', () => {
+        const makeMinimalUnfilledDatum = () => ({
+            study_id: 'study1',
+            uid: 'SAMPLE1==',
+            patient: 'patient1',
+        });
+        it('fills a datum w no data correctly', () => {
+            assert.deepEqual(
+                fillGeneticTrackDatum(makeMinimalUnfilledDatum(), 'gene', []),
+                {
+                    ...makeMinimalUnfilledDatum(),
+                    trackLabel: 'gene',
+                    data: [],
+                    disp_cna: undefined,
+                    disp_mrna: undefined,
+                    disp_prot: undefined,
+                    disp_mut: undefined,
+                    disp_germ: undefined,
+                }
+            );
+        });
+        it('fills a datum w one mutation data correctly', () => {
+            let data = [
+                {
+                    mutationType: 'missense',
+                    putativeDriver: true,
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.MUTATION_EXTENDED,
+                } as AnnotatedExtendedAlteration,
+            ];
+            assert.deepEqual(
+                fillGeneticTrackDatum(makeMinimalUnfilledDatum(), 'gene', data),
+                {
+                    ...makeMinimalUnfilledDatum(),
+                    trackLabel: 'gene',
+                    data: data,
+                    disp_cna: undefined,
+                    disp_mrna: undefined,
+                    disp_prot: undefined,
+                    disp_mut: 'missense_rec',
+                    disp_germ: false,
+                },
+                'missense driver with no germline'
+            );
 
-           data = [{
-               mutationType: "fusion",
-               putativeDriver: false,
-               molecularProfileAlterationType: AlterationTypeConstants.MUTATION_EXTENDED
-           } as AnnotatedExtendedAlteration];
-           assert.deepEqual(
-               fillGeneticTrackDatum(makeMinimalUnfilledDatum(), "gene", data),
-               {
-                   ...makeMinimalUnfilledDatum(),
-                   trackLabel: "gene",
-                   data: data,
-                   disp_cna: undefined,
-                   disp_mrna: undefined,
-                   disp_prot: undefined,
-                   disp_mut: undefined,
-                   disp_fusion: true,
-                   disp_germ: undefined
-               },
-               "fusion non-driver");
-       });
+            data = [
+                {
+                    mutationType: 'in_frame_del',
+                    putativeDriver: false,
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.MUTATION_EXTENDED,
+                } as AnnotatedExtendedAlteration,
+            ];
+            assert.deepEqual(
+                fillGeneticTrackDatum(makeMinimalUnfilledDatum(), 'gene', data),
+                {
+                    ...makeMinimalUnfilledDatum(),
+                    trackLabel: 'gene',
+                    data: data,
+                    disp_cna: undefined,
+                    disp_mrna: undefined,
+                    disp_prot: undefined,
+                    disp_mut: 'inframe',
+                    disp_germ: false,
+                },
+                'inframe non-driver'
+            );
 
+            data = [
+                {
+                    mutationType: 'start_codon_del',
+                    putativeDriver: false,
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.MUTATION_EXTENDED,
+                } as AnnotatedExtendedAlteration,
+            ];
+            assert.deepEqual(
+                fillGeneticTrackDatum(makeMinimalUnfilledDatum(), 'gene', data),
+                {
+                    ...makeMinimalUnfilledDatum(),
+                    trackLabel: 'gene',
+                    data: data,
+                    disp_cna: undefined,
+                    disp_mrna: undefined,
+                    disp_prot: undefined,
+                    disp_mut: 'trunc',
+                    disp_germ: false,
+                },
+                'truncating non-driver'
+            );
 
-       it("fills a datum w one cna data correctly", ()=>{
-           let data = [{
-               value: 2,
-               molecularProfileAlterationType: AlterationTypeConstants.COPY_NUMBER_ALTERATION
-           } as AnnotatedExtendedAlteration];
-           assert.deepEqual(
-               fillGeneticTrackDatum(makeMinimalUnfilledDatum(), "gene", data),
-               {
-                   ...makeMinimalUnfilledDatum(),
-                   trackLabel: "gene",
-                   data: data,
-                   disp_cna: "amp",
-                   disp_mrna: undefined,
-                   disp_prot: undefined,
-                   disp_mut: undefined,
-                   disp_germ: undefined
-               },
-               "amplification");
+            data = [
+                {
+                    mutationType: 'fusion',
+                    putativeDriver: false,
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.MUTATION_EXTENDED,
+                } as AnnotatedExtendedAlteration,
+            ];
+            assert.deepEqual(
+                fillGeneticTrackDatum(makeMinimalUnfilledDatum(), 'gene', data),
+                {
+                    ...makeMinimalUnfilledDatum(),
+                    trackLabel: 'gene',
+                    data: data,
+                    disp_cna: undefined,
+                    disp_mrna: undefined,
+                    disp_prot: undefined,
+                    disp_mut: undefined,
+                    disp_fusion: true,
+                    disp_germ: undefined,
+                },
+                'fusion non-driver'
+            );
+        });
 
-           data = [{
-               value: 1,
-               molecularProfileAlterationType: AlterationTypeConstants.COPY_NUMBER_ALTERATION
-           } as AnnotatedExtendedAlteration];
-           assert.deepEqual(
-               fillGeneticTrackDatum(makeMinimalUnfilledDatum(), "gene", data),
-               {
-                   ...makeMinimalUnfilledDatum(),
-                   trackLabel: "gene",
-                   data: data,
-                   disp_cna: "gain",
-                   disp_mrna: undefined,
-                   disp_prot: undefined,
-                   disp_mut: undefined,
-                   disp_germ: undefined
-               },
-               "gain");
+        it('fills a datum w one cna data correctly', () => {
+            let data = [
+                {
+                    value: 2,
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.COPY_NUMBER_ALTERATION,
+                } as AnnotatedExtendedAlteration,
+            ];
+            assert.deepEqual(
+                fillGeneticTrackDatum(makeMinimalUnfilledDatum(), 'gene', data),
+                {
+                    ...makeMinimalUnfilledDatum(),
+                    trackLabel: 'gene',
+                    data: data,
+                    disp_cna: 'amp',
+                    disp_mrna: undefined,
+                    disp_prot: undefined,
+                    disp_mut: undefined,
+                    disp_germ: undefined,
+                },
+                'amplification'
+            );
 
-           data = [{
-               value: -1,
-               alterationType: "",
-               molecularProfileAlterationType: AlterationTypeConstants.COPY_NUMBER_ALTERATION
-           } as AnnotatedExtendedAlteration];
-           assert.deepEqual(
-               fillGeneticTrackDatum(makeMinimalUnfilledDatum(), "gene", data),
-               {
-                   ...makeMinimalUnfilledDatum(),
-                   trackLabel: "gene",
-                   data: data,
-                   disp_cna: "hetloss",
-                   disp_mrna: undefined,
-                   disp_prot: undefined,
-                   disp_mut: undefined,
-                   disp_germ: undefined
-               },
-               "hetloss");
+            data = [
+                {
+                    value: 1,
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.COPY_NUMBER_ALTERATION,
+                } as AnnotatedExtendedAlteration,
+            ];
+            assert.deepEqual(
+                fillGeneticTrackDatum(makeMinimalUnfilledDatum(), 'gene', data),
+                {
+                    ...makeMinimalUnfilledDatum(),
+                    trackLabel: 'gene',
+                    data: data,
+                    disp_cna: 'gain',
+                    disp_mrna: undefined,
+                    disp_prot: undefined,
+                    disp_mut: undefined,
+                    disp_germ: undefined,
+                },
+                'gain'
+            );
 
-           data = [{
-               value: -2,
-               alterationType: "",
-               molecularProfileAlterationType: AlterationTypeConstants.COPY_NUMBER_ALTERATION
-           } as AnnotatedExtendedAlteration];
-           assert.deepEqual(
-               fillGeneticTrackDatum(makeMinimalUnfilledDatum(), "gene", data),
-               {
-                   ...makeMinimalUnfilledDatum(),
-                   trackLabel: "gene",
-                   data: data,
-                   disp_cna: "homdel",
-                   disp_mrna: undefined,
-                   disp_prot: undefined,
-                   disp_mut: undefined,
-                   disp_germ: undefined
-               },
-               "homdel");
+            data = [
+                {
+                    value: -1,
+                    alterationType: '',
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.COPY_NUMBER_ALTERATION,
+                } as AnnotatedExtendedAlteration,
+            ];
+            assert.deepEqual(
+                fillGeneticTrackDatum(makeMinimalUnfilledDatum(), 'gene', data),
+                {
+                    ...makeMinimalUnfilledDatum(),
+                    trackLabel: 'gene',
+                    data: data,
+                    disp_cna: 'hetloss',
+                    disp_mrna: undefined,
+                    disp_prot: undefined,
+                    disp_mut: undefined,
+                    disp_germ: undefined,
+                },
+                'hetloss'
+            );
 
-           data = [{
-               value: 0,
-               molecularProfileAlterationType: AlterationTypeConstants.COPY_NUMBER_ALTERATION
-           } as AnnotatedExtendedAlteration];
-           assert.deepEqual(
-               fillGeneticTrackDatum(makeMinimalUnfilledDatum(), "gene", data),
-               {
-                   ...makeMinimalUnfilledDatum(),
-                   trackLabel: "gene",
-                   data: data,
-                   disp_cna: undefined,
-                   disp_mrna: undefined,
-                   disp_prot: undefined,
-                   disp_mut: undefined,
-                   disp_germ: undefined
-               },
-               "diploid");
-       });
+            data = [
+                {
+                    value: -2,
+                    alterationType: '',
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.COPY_NUMBER_ALTERATION,
+                } as AnnotatedExtendedAlteration,
+            ];
+            assert.deepEqual(
+                fillGeneticTrackDatum(makeMinimalUnfilledDatum(), 'gene', data),
+                {
+                    ...makeMinimalUnfilledDatum(),
+                    trackLabel: 'gene',
+                    data: data,
+                    disp_cna: 'homdel',
+                    disp_mrna: undefined,
+                    disp_prot: undefined,
+                    disp_mut: undefined,
+                    disp_germ: undefined,
+                },
+                'homdel'
+            );
 
-       it("fills a datum w one germline data correctly", ()=>{
-           let data = [{
-               mutationType: "missense",
-               putativeDriver: true,
-               mutationStatus: 'Germline',
-               molecularProfileAlterationType: AlterationTypeConstants.MUTATION_EXTENDED
-           } as AnnotatedExtendedAlteration];
-           assert.deepEqual(
-               fillGeneticTrackDatum(makeMinimalUnfilledDatum(), "gene", data),
-               {
-                   ...makeMinimalUnfilledDatum(),
-                   trackLabel: "gene",
-                   data: data,
-                   disp_cna: undefined,
-                   disp_mrna: undefined,
-                   disp_prot: undefined,
-                   disp_mut: "missense_rec",
-                   disp_germ: true
-               },
-               "missense driver with germline");
+            data = [
+                {
+                    value: 0,
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.COPY_NUMBER_ALTERATION,
+                } as AnnotatedExtendedAlteration,
+            ];
+            assert.deepEqual(
+                fillGeneticTrackDatum(makeMinimalUnfilledDatum(), 'gene', data),
+                {
+                    ...makeMinimalUnfilledDatum(),
+                    trackLabel: 'gene',
+                    data: data,
+                    disp_cna: undefined,
+                    disp_mrna: undefined,
+                    disp_prot: undefined,
+                    disp_mut: undefined,
+                    disp_germ: undefined,
+                },
+                'diploid'
+            );
+        });
 
-            data = [{
-               mutationType: "missense",
-               putativeDriver: true,
-               molecularProfileAlterationType: AlterationTypeConstants.MUTATION_EXTENDED
-           } as AnnotatedExtendedAlteration];
-           assert.deepEqual(
-               fillGeneticTrackDatum(makeMinimalUnfilledDatum(), "gene", data),
-               {
-                   ...makeMinimalUnfilledDatum(),
-                   trackLabel: "gene",
-                   data: data,
-                   disp_cna: undefined,
-                   disp_mrna: undefined,
-                   disp_prot: undefined,
-                   disp_mut: "missense_rec",
-                   disp_germ: false
-               },
-               "missense driver without germline");
-       });
+        it('fills a datum w one germline data correctly', () => {
+            let data = [
+                {
+                    mutationType: 'missense',
+                    putativeDriver: true,
+                    mutationStatus: 'Germline',
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.MUTATION_EXTENDED,
+                } as AnnotatedExtendedAlteration,
+            ];
+            assert.deepEqual(
+                fillGeneticTrackDatum(makeMinimalUnfilledDatum(), 'gene', data),
+                {
+                    ...makeMinimalUnfilledDatum(),
+                    trackLabel: 'gene',
+                    data: data,
+                    disp_cna: undefined,
+                    disp_mrna: undefined,
+                    disp_prot: undefined,
+                    disp_mut: 'missense_rec',
+                    disp_germ: true,
+                },
+                'missense driver with germline'
+            );
 
-       it("fills a datum w one germline and one non-germline data correctly", ()=>{
-           let data = [{
-               mutationType: "missense",
-               putativeDriver: true,
-               mutationStatus: 'Germline',
-               molecularProfileAlterationType: AlterationTypeConstants.MUTATION_EXTENDED
-           } as AnnotatedExtendedAlteration, {
-               mutationType: "missense",
-               putativeDriver: false,
-               molecularProfileAlterationType: AlterationTypeConstants.MUTATION_EXTENDED
-           } as AnnotatedExtendedAlteration];
+            data = [
+                {
+                    mutationType: 'missense',
+                    putativeDriver: true,
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.MUTATION_EXTENDED,
+                } as AnnotatedExtendedAlteration,
+            ];
+            assert.deepEqual(
+                fillGeneticTrackDatum(makeMinimalUnfilledDatum(), 'gene', data),
+                {
+                    ...makeMinimalUnfilledDatum(),
+                    trackLabel: 'gene',
+                    data: data,
+                    disp_cna: undefined,
+                    disp_mrna: undefined,
+                    disp_prot: undefined,
+                    disp_mut: 'missense_rec',
+                    disp_germ: false,
+                },
+                'missense driver without germline'
+            );
+        });
 
-           assert.deepEqual(
-               fillGeneticTrackDatum(makeMinimalUnfilledDatum(), "gene", data),
-               {
-                   ...makeMinimalUnfilledDatum(),
-                   trackLabel: "gene",
-                   data: data,
-                   disp_cna: undefined,
-                   disp_mrna: undefined,
-                   disp_prot: undefined,
-                   disp_mut: "missense_rec",
-                   disp_germ: true
-               },
-               "missense driver with germline is stronger than missense passenger");
+        it('fills a datum w one germline and one non-germline data correctly', () => {
+            let data = [
+                {
+                    mutationType: 'missense',
+                    putativeDriver: true,
+                    mutationStatus: 'Germline',
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.MUTATION_EXTENDED,
+                } as AnnotatedExtendedAlteration,
+                {
+                    mutationType: 'missense',
+                    putativeDriver: false,
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.MUTATION_EXTENDED,
+                } as AnnotatedExtendedAlteration,
+            ];
 
-           data = [{
-               mutationType: "missense",
-               putativeDriver: false,
-               mutationStatus: 'Germline',
-               molecularProfileAlterationType: AlterationTypeConstants.MUTATION_EXTENDED
-           } as AnnotatedExtendedAlteration, {
-               mutationType: "start_codon_del",
-               putativeDriver: true,
-               molecularProfileAlterationType: AlterationTypeConstants.MUTATION_EXTENDED
-           } as AnnotatedExtendedAlteration];
+            assert.deepEqual(
+                fillGeneticTrackDatum(makeMinimalUnfilledDatum(), 'gene', data),
+                {
+                    ...makeMinimalUnfilledDatum(),
+                    trackLabel: 'gene',
+                    data: data,
+                    disp_cna: undefined,
+                    disp_mrna: undefined,
+                    disp_prot: undefined,
+                    disp_mut: 'missense_rec',
+                    disp_germ: true,
+                },
+                'missense driver with germline is stronger than missense passenger'
+            );
 
-           assert.deepEqual(
-               fillGeneticTrackDatum(makeMinimalUnfilledDatum(), "gene", data),
-               {
-                   ...makeMinimalUnfilledDatum(),
-                   trackLabel: "gene",
-                   data: data,
-                   disp_cna: undefined,
-                   disp_mrna: undefined,
-                   disp_prot: undefined,
-                   disp_mut: "trunc_rec",
-                   disp_germ: false
-               },
-               "trunc driver is stronger than missense passenger w germline");
-       });
+            data = [
+                {
+                    mutationType: 'missense',
+                    putativeDriver: false,
+                    mutationStatus: 'Germline',
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.MUTATION_EXTENDED,
+                } as AnnotatedExtendedAlteration,
+                {
+                    mutationType: 'start_codon_del',
+                    putativeDriver: true,
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.MUTATION_EXTENDED,
+                } as AnnotatedExtendedAlteration,
+            ];
 
-       it("fills a datum w one mrna data correctly", ()=>{
-           let data = [{
-               alterationSubType:"high",
-               molecularProfileAlterationType: AlterationTypeConstants.MRNA_EXPRESSION
-           } as AnnotatedExtendedAlteration];
-           assert.deepEqual(
-               fillGeneticTrackDatum(makeMinimalUnfilledDatum(), "gene", data),
-               {
-                   ...makeMinimalUnfilledDatum(),
-                   trackLabel: "gene",
-                   data: data,
-                   disp_cna: undefined,
-                   disp_mrna: "high",
-                   disp_prot: undefined,
-                   disp_mut: undefined,
-                   disp_germ: undefined
-               },
-               "high");
+            assert.deepEqual(
+                fillGeneticTrackDatum(makeMinimalUnfilledDatum(), 'gene', data),
+                {
+                    ...makeMinimalUnfilledDatum(),
+                    trackLabel: 'gene',
+                    data: data,
+                    disp_cna: undefined,
+                    disp_mrna: undefined,
+                    disp_prot: undefined,
+                    disp_mut: 'trunc_rec',
+                    disp_germ: false,
+                },
+                'trunc driver is stronger than missense passenger w germline'
+            );
+        });
 
-           data = [{
-               alterationSubType:"low",
-               molecularProfileAlterationType: AlterationTypeConstants.MRNA_EXPRESSION
-           } as AnnotatedExtendedAlteration];
-           assert.deepEqual(
-               fillGeneticTrackDatum(makeMinimalUnfilledDatum(), "gene", data),
-               {
-                   ...makeMinimalUnfilledDatum(),
-                   trackLabel: "gene",
-                   data: data,
-                   disp_cna: undefined,
-                   disp_mrna: "low",
-                   disp_prot: undefined,
-                   disp_mut: undefined,
-                   disp_germ: undefined
-               },
-               "low");
-       });
-       it("fills a datum w one protein data correctly", ()=>{
-           let data = [{
-               alterationSubType:"high",
-               molecularProfileAlterationType: AlterationTypeConstants.PROTEIN_LEVEL
-           } as AnnotatedExtendedAlteration];
-           assert.deepEqual(
-               fillGeneticTrackDatum(makeMinimalUnfilledDatum(), "gene", data),
-               {
-                   ...makeMinimalUnfilledDatum(),
-                   trackLabel: "gene",
-                   data: data,
-                   disp_cna: undefined,
-                   disp_mrna: undefined,
-                   disp_prot: "high",
-                   disp_mut: undefined,
-                   disp_germ: undefined
-               },
-               "high");
+        it('fills a datum w one mrna data correctly', () => {
+            let data = [
+                {
+                    alterationSubType: 'high',
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.MRNA_EXPRESSION,
+                } as AnnotatedExtendedAlteration,
+            ];
+            assert.deepEqual(
+                fillGeneticTrackDatum(makeMinimalUnfilledDatum(), 'gene', data),
+                {
+                    ...makeMinimalUnfilledDatum(),
+                    trackLabel: 'gene',
+                    data: data,
+                    disp_cna: undefined,
+                    disp_mrna: 'high',
+                    disp_prot: undefined,
+                    disp_mut: undefined,
+                    disp_germ: undefined,
+                },
+                'high'
+            );
 
-           data = [{
-               alterationSubType:"low",
-               molecularProfileAlterationType: AlterationTypeConstants.PROTEIN_LEVEL
-           } as AnnotatedExtendedAlteration];
-           assert.deepEqual(
-               fillGeneticTrackDatum(makeMinimalUnfilledDatum(), "gene", data),
-               {
-                   ...makeMinimalUnfilledDatum(),
-                   trackLabel: "gene",
-                   data: data,
-                   disp_cna: undefined,
-                   disp_mrna: undefined,
-                   disp_prot: "low",
-                   disp_mut: undefined,
-                   disp_germ: undefined
-               },
-               "low");
-       });
-       it("fills a datum w two mutation data w correct priority", ()=>{
-           let data = [{
-               mutationType: "missense",
-               putativeDriver: true,
-               molecularProfileAlterationType: AlterationTypeConstants.MUTATION_EXTENDED
-           } as AnnotatedExtendedAlteration,{
-               mutationType: "start_codon_del",
-               putativeDriver: true,
-               molecularProfileAlterationType: AlterationTypeConstants.MUTATION_EXTENDED
-           } as AnnotatedExtendedAlteration];
-           assert.deepEqual(
-               fillGeneticTrackDatum(makeMinimalUnfilledDatum(), "gene", data),
-               {
-                   ...makeMinimalUnfilledDatum(),
-                   trackLabel: "gene",
-                   data: data,
-                   disp_cna: undefined,
-                   disp_mrna: undefined,
-                   disp_prot: undefined,
-                   disp_mut: "trunc_rec",
-                   disp_germ: false
-               },
-               "truncating driver beats missense driver");
+            data = [
+                {
+                    alterationSubType: 'low',
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.MRNA_EXPRESSION,
+                } as AnnotatedExtendedAlteration,
+            ];
+            assert.deepEqual(
+                fillGeneticTrackDatum(makeMinimalUnfilledDatum(), 'gene', data),
+                {
+                    ...makeMinimalUnfilledDatum(),
+                    trackLabel: 'gene',
+                    data: data,
+                    disp_cna: undefined,
+                    disp_mrna: 'low',
+                    disp_prot: undefined,
+                    disp_mut: undefined,
+                    disp_germ: undefined,
+                },
+                'low'
+            );
+        });
+        it('fills a datum w one protein data correctly', () => {
+            let data = [
+                {
+                    alterationSubType: 'high',
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.PROTEIN_LEVEL,
+                } as AnnotatedExtendedAlteration,
+            ];
+            assert.deepEqual(
+                fillGeneticTrackDatum(makeMinimalUnfilledDatum(), 'gene', data),
+                {
+                    ...makeMinimalUnfilledDatum(),
+                    trackLabel: 'gene',
+                    data: data,
+                    disp_cna: undefined,
+                    disp_mrna: undefined,
+                    disp_prot: 'high',
+                    disp_mut: undefined,
+                    disp_germ: undefined,
+                },
+                'high'
+            );
 
-           data = [{
-               mutationType: "missense",
-               putativeDriver: true,
-               molecularProfileAlterationType: AlterationTypeConstants.MUTATION_EXTENDED
-           } as AnnotatedExtendedAlteration,{
-               mutationType: "start_codon_del",
-               putativeDriver: false,
-               molecularProfileAlterationType: AlterationTypeConstants.MUTATION_EXTENDED
-           } as AnnotatedExtendedAlteration];
-           assert.deepEqual(
-               fillGeneticTrackDatum(makeMinimalUnfilledDatum(), "gene", data),
-               {
-                   ...makeMinimalUnfilledDatum(),
-                   trackLabel: "gene",
-                   data: data,
-                   disp_cna: undefined,
-                   disp_mrna: undefined,
-                   disp_prot: undefined,
-                   disp_mut: "missense_rec",
-                   disp_germ: false
-               },
-               "missense driver beats truncating non-driver");
+            data = [
+                {
+                    alterationSubType: 'low',
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.PROTEIN_LEVEL,
+                } as AnnotatedExtendedAlteration,
+            ];
+            assert.deepEqual(
+                fillGeneticTrackDatum(makeMinimalUnfilledDatum(), 'gene', data),
+                {
+                    ...makeMinimalUnfilledDatum(),
+                    trackLabel: 'gene',
+                    data: data,
+                    disp_cna: undefined,
+                    disp_mrna: undefined,
+                    disp_prot: 'low',
+                    disp_mut: undefined,
+                    disp_germ: undefined,
+                },
+                'low'
+            );
+        });
+        it('fills a datum w two mutation data w correct priority', () => {
+            let data = [
+                {
+                    mutationType: 'missense',
+                    putativeDriver: true,
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.MUTATION_EXTENDED,
+                } as AnnotatedExtendedAlteration,
+                {
+                    mutationType: 'start_codon_del',
+                    putativeDriver: true,
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.MUTATION_EXTENDED,
+                } as AnnotatedExtendedAlteration,
+            ];
+            assert.deepEqual(
+                fillGeneticTrackDatum(makeMinimalUnfilledDatum(), 'gene', data),
+                {
+                    ...makeMinimalUnfilledDatum(),
+                    trackLabel: 'gene',
+                    data: data,
+                    disp_cna: undefined,
+                    disp_mrna: undefined,
+                    disp_prot: undefined,
+                    disp_mut: 'trunc_rec',
+                    disp_germ: false,
+                },
+                'truncating driver beats missense driver'
+            );
 
-           data = [{
-               mutationType: "missense",
-               putativeDriver: false,
-               molecularProfileAlterationType: AlterationTypeConstants.MUTATION_EXTENDED
-           } as AnnotatedExtendedAlteration,{
-               mutationType: "start_codon_del",
-               putativeDriver: false,
-               molecularProfileAlterationType: AlterationTypeConstants.MUTATION_EXTENDED
-           } as AnnotatedExtendedAlteration];
-           assert.deepEqual(
-               fillGeneticTrackDatum(makeMinimalUnfilledDatum(), "gene", data),
-               {
-                   ...makeMinimalUnfilledDatum(),
-                   trackLabel: "gene",
-                   data: data,
-                   disp_cna: undefined,
-                   disp_mrna: undefined,
-                   disp_prot: undefined,
-                   disp_mut: "trunc",
-                   disp_germ: false
-               },
-               "truncating non-driver beats missense non-driver");
-       });
-       it("fills a datum w multiple cna data w correct priority", ()=>{
-           let data = [{
-               value: 2,
-               molecularProfileAlterationType: AlterationTypeConstants.COPY_NUMBER_ALTERATION
-           } as AnnotatedExtendedAlteration,{
-               value: 1,
-               molecularProfileAlterationType: AlterationTypeConstants.COPY_NUMBER_ALTERATION
-           } as AnnotatedExtendedAlteration];
-           assert.deepEqual(
-               fillGeneticTrackDatum(makeMinimalUnfilledDatum(), "gene", data),
-               {
-                   ...makeMinimalUnfilledDatum(),
-                   trackLabel: "gene",
-                   data: data,
-                   disp_cna: "amp",
-                   disp_mrna: undefined,
-                   disp_prot: undefined,
-                   disp_mut: undefined,
-                   disp_germ: undefined
-               },
-               "amplification beats gain");
+            data = [
+                {
+                    mutationType: 'missense',
+                    putativeDriver: true,
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.MUTATION_EXTENDED,
+                } as AnnotatedExtendedAlteration,
+                {
+                    mutationType: 'start_codon_del',
+                    putativeDriver: false,
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.MUTATION_EXTENDED,
+                } as AnnotatedExtendedAlteration,
+            ];
+            assert.deepEqual(
+                fillGeneticTrackDatum(makeMinimalUnfilledDatum(), 'gene', data),
+                {
+                    ...makeMinimalUnfilledDatum(),
+                    trackLabel: 'gene',
+                    data: data,
+                    disp_cna: undefined,
+                    disp_mrna: undefined,
+                    disp_prot: undefined,
+                    disp_mut: 'missense_rec',
+                    disp_germ: false,
+                },
+                'missense driver beats truncating non-driver'
+            );
 
-           data = [{
-               value: -2,
-               molecularProfileAlterationType: AlterationTypeConstants.COPY_NUMBER_ALTERATION
-           } as AnnotatedExtendedAlteration,{
-               value: 0,
-               molecularProfileAlterationType: AlterationTypeConstants.COPY_NUMBER_ALTERATION
-           } as AnnotatedExtendedAlteration];
-           assert.deepEqual(
-               fillGeneticTrackDatum(makeMinimalUnfilledDatum(), "gene", data),
-               {
-                   ...makeMinimalUnfilledDatum(),
-                   trackLabel: "gene",
-                   data: data,
-                   disp_cna: "homdel",
-                   disp_mrna: undefined,
-                   disp_prot: undefined,
-                   disp_mut: undefined,
-                   disp_germ: undefined
-               },
-               "homdel beats diploid");
+            data = [
+                {
+                    mutationType: 'missense',
+                    putativeDriver: false,
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.MUTATION_EXTENDED,
+                } as AnnotatedExtendedAlteration,
+                {
+                    mutationType: 'start_codon_del',
+                    putativeDriver: false,
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.MUTATION_EXTENDED,
+                } as AnnotatedExtendedAlteration,
+            ];
+            assert.deepEqual(
+                fillGeneticTrackDatum(makeMinimalUnfilledDatum(), 'gene', data),
+                {
+                    ...makeMinimalUnfilledDatum(),
+                    trackLabel: 'gene',
+                    data: data,
+                    disp_cna: undefined,
+                    disp_mrna: undefined,
+                    disp_prot: undefined,
+                    disp_mut: 'trunc',
+                    disp_germ: false,
+                },
+                'truncating non-driver beats missense non-driver'
+            );
+        });
+        it('fills a datum w multiple cna data w correct priority', () => {
+            let data = [
+                {
+                    value: 2,
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.COPY_NUMBER_ALTERATION,
+                } as AnnotatedExtendedAlteration,
+                {
+                    value: 1,
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.COPY_NUMBER_ALTERATION,
+                } as AnnotatedExtendedAlteration,
+            ];
+            assert.deepEqual(
+                fillGeneticTrackDatum(makeMinimalUnfilledDatum(), 'gene', data),
+                {
+                    ...makeMinimalUnfilledDatum(),
+                    trackLabel: 'gene',
+                    data: data,
+                    disp_cna: 'amp',
+                    disp_mrna: undefined,
+                    disp_prot: undefined,
+                    disp_mut: undefined,
+                    disp_germ: undefined,
+                },
+                'amplification beats gain'
+            );
 
-           data = [{
-               value: -2,
-               molecularProfileAlterationType: AlterationTypeConstants.COPY_NUMBER_ALTERATION
-           } as AnnotatedExtendedAlteration,{
-               value: -2,
-               molecularProfileAlterationType: AlterationTypeConstants.COPY_NUMBER_ALTERATION
-           } as AnnotatedExtendedAlteration, {
-               value: 2,
-               molecularProfileAlterationType: AlterationTypeConstants.COPY_NUMBER_ALTERATION
-           } as AnnotatedExtendedAlteration];
-           assert.deepEqual(
-               fillGeneticTrackDatum(makeMinimalUnfilledDatum(), "gene", data),
-               {
-                   ...makeMinimalUnfilledDatum(),
-                   trackLabel: "gene",
-                   data: data,
-                   disp_cna: "homdel",
-                   disp_mrna: undefined,
-                   disp_prot: undefined,
-                   disp_mut: undefined,
-                   disp_germ: undefined
-               },
-               "two homdels beats one amp");
+            data = [
+                {
+                    value: -2,
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.COPY_NUMBER_ALTERATION,
+                } as AnnotatedExtendedAlteration,
+                {
+                    value: 0,
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.COPY_NUMBER_ALTERATION,
+                } as AnnotatedExtendedAlteration,
+            ];
+            assert.deepEqual(
+                fillGeneticTrackDatum(makeMinimalUnfilledDatum(), 'gene', data),
+                {
+                    ...makeMinimalUnfilledDatum(),
+                    trackLabel: 'gene',
+                    data: data,
+                    disp_cna: 'homdel',
+                    disp_mrna: undefined,
+                    disp_prot: undefined,
+                    disp_mut: undefined,
+                    disp_germ: undefined,
+                },
+                'homdel beats diploid'
+            );
 
-           data = [{
-               value: -2,
-               molecularProfileAlterationType: AlterationTypeConstants.COPY_NUMBER_ALTERATION
-           } as AnnotatedExtendedAlteration,{
-               value: 2,
-               molecularProfileAlterationType: AlterationTypeConstants.COPY_NUMBER_ALTERATION
-           } as AnnotatedExtendedAlteration, {
-               value: 2,
-               molecularProfileAlterationType: AlterationTypeConstants.COPY_NUMBER_ALTERATION
-           } as AnnotatedExtendedAlteration];
-           assert.deepEqual(
-               fillGeneticTrackDatum(makeMinimalUnfilledDatum(), "gene", data),
-               {
-                   ...makeMinimalUnfilledDatum(),
-                   trackLabel: "gene",
-                   data: data,
-                   disp_cna: "amp",
-                   disp_mrna: undefined,
-                   disp_prot: undefined,
-                   disp_mut: undefined,
-                   disp_germ: undefined
-               },
-               "two amps beats one homdel");
-       });
-       it("fills a datum w multiple mrna data w correct priority", ()=>{
-           let data = [{
-               alterationSubType:"high",
-               molecularProfileAlterationType: AlterationTypeConstants.MRNA_EXPRESSION
-           } as AnnotatedExtendedAlteration, {
-               alterationSubType:"low",
-               molecularProfileAlterationType: AlterationTypeConstants.MRNA_EXPRESSION
-           } as AnnotatedExtendedAlteration, {
-               alterationSubType:"low",
-               molecularProfileAlterationType: AlterationTypeConstants.MRNA_EXPRESSION
-           } as AnnotatedExtendedAlteration];
-           assert.deepEqual(
-               fillGeneticTrackDatum(makeMinimalUnfilledDatum(), "gene", data),
-               {
-                   ...makeMinimalUnfilledDatum(),
-                   trackLabel: "gene",
-                   data: data,
-                   disp_cna: undefined,
-                   disp_mrna: "low",
-                   disp_prot: undefined,
-                   disp_mut: undefined,
-                   disp_germ: undefined
-               },
-               "two downs beats one high");
+            data = [
+                {
+                    value: -2,
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.COPY_NUMBER_ALTERATION,
+                } as AnnotatedExtendedAlteration,
+                {
+                    value: -2,
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.COPY_NUMBER_ALTERATION,
+                } as AnnotatedExtendedAlteration,
+                {
+                    value: 2,
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.COPY_NUMBER_ALTERATION,
+                } as AnnotatedExtendedAlteration,
+            ];
+            assert.deepEqual(
+                fillGeneticTrackDatum(makeMinimalUnfilledDatum(), 'gene', data),
+                {
+                    ...makeMinimalUnfilledDatum(),
+                    trackLabel: 'gene',
+                    data: data,
+                    disp_cna: 'homdel',
+                    disp_mrna: undefined,
+                    disp_prot: undefined,
+                    disp_mut: undefined,
+                    disp_germ: undefined,
+                },
+                'two homdels beats one amp'
+            );
 
-           data = [{
-               alterationSubType:"high",
-               molecularProfileAlterationType: AlterationTypeConstants.MRNA_EXPRESSION
-           } as AnnotatedExtendedAlteration, {
-               alterationSubType:"high",
-               molecularProfileAlterationType: AlterationTypeConstants.MRNA_EXPRESSION
-           } as AnnotatedExtendedAlteration, {
-               alterationSubType:"low",
-               molecularProfileAlterationType: AlterationTypeConstants.MRNA_EXPRESSION
-           } as AnnotatedExtendedAlteration];
-           assert.deepEqual(
-               fillGeneticTrackDatum(makeMinimalUnfilledDatum(), "gene", data),
-               {
-                   ...makeMinimalUnfilledDatum(),
-                   trackLabel: "gene",
-                   data: data,
-                   disp_cna: undefined,
-                   disp_mrna: "high",
-                   disp_prot: undefined,
-                   disp_mut: undefined,
-                   disp_germ: undefined
-               },
-               "two ups beats one low");
-       });
-       it("fills a datum w multiple protein data w correct priority", ()=>{
-           let data = [{
-               alterationSubType:"high",
-               molecularProfileAlterationType: AlterationTypeConstants.PROTEIN_LEVEL
-           } as AnnotatedExtendedAlteration, {
-               alterationSubType:"low",
-               molecularProfileAlterationType: AlterationTypeConstants.PROTEIN_LEVEL
-           } as AnnotatedExtendedAlteration, {
-               alterationSubType:"low",
-               molecularProfileAlterationType: AlterationTypeConstants.PROTEIN_LEVEL
-           } as AnnotatedExtendedAlteration];
-           assert.deepEqual(
-               fillGeneticTrackDatum(makeMinimalUnfilledDatum(), "gene", data),
-               {
-                   ...makeMinimalUnfilledDatum(),
-                   trackLabel: "gene",
-                   data: data,
-                   disp_cna: undefined,
-                   disp_mrna: undefined,
-                   disp_prot: "low",
-                   disp_mut: undefined,
-                   disp_germ: undefined
-               },
-               "two downs beats one high");
+            data = [
+                {
+                    value: -2,
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.COPY_NUMBER_ALTERATION,
+                } as AnnotatedExtendedAlteration,
+                {
+                    value: 2,
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.COPY_NUMBER_ALTERATION,
+                } as AnnotatedExtendedAlteration,
+                {
+                    value: 2,
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.COPY_NUMBER_ALTERATION,
+                } as AnnotatedExtendedAlteration,
+            ];
+            assert.deepEqual(
+                fillGeneticTrackDatum(makeMinimalUnfilledDatum(), 'gene', data),
+                {
+                    ...makeMinimalUnfilledDatum(),
+                    trackLabel: 'gene',
+                    data: data,
+                    disp_cna: 'amp',
+                    disp_mrna: undefined,
+                    disp_prot: undefined,
+                    disp_mut: undefined,
+                    disp_germ: undefined,
+                },
+                'two amps beats one homdel'
+            );
+        });
+        it('fills a datum w multiple mrna data w correct priority', () => {
+            let data = [
+                {
+                    alterationSubType: 'high',
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.MRNA_EXPRESSION,
+                } as AnnotatedExtendedAlteration,
+                {
+                    alterationSubType: 'low',
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.MRNA_EXPRESSION,
+                } as AnnotatedExtendedAlteration,
+                {
+                    alterationSubType: 'low',
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.MRNA_EXPRESSION,
+                } as AnnotatedExtendedAlteration,
+            ];
+            assert.deepEqual(
+                fillGeneticTrackDatum(makeMinimalUnfilledDatum(), 'gene', data),
+                {
+                    ...makeMinimalUnfilledDatum(),
+                    trackLabel: 'gene',
+                    data: data,
+                    disp_cna: undefined,
+                    disp_mrna: 'low',
+                    disp_prot: undefined,
+                    disp_mut: undefined,
+                    disp_germ: undefined,
+                },
+                'two downs beats one high'
+            );
 
-           data = [{
-               alterationSubType:"high",
-               molecularProfileAlterationType: AlterationTypeConstants.PROTEIN_LEVEL
-           } as AnnotatedExtendedAlteration, {
-               alterationSubType:"high",
-               molecularProfileAlterationType: AlterationTypeConstants.PROTEIN_LEVEL
-           } as AnnotatedExtendedAlteration, {
-               alterationSubType:"low",
-               molecularProfileAlterationType: AlterationTypeConstants.PROTEIN_LEVEL
-           } as AnnotatedExtendedAlteration];
-           assert.deepEqual(
-               fillGeneticTrackDatum(makeMinimalUnfilledDatum(), "gene", data),
-               {
-                   ...makeMinimalUnfilledDatum(),
-                   trackLabel: "gene",
-                   data: data,
-                   disp_cna: undefined,
-                   disp_mrna: undefined,
-                   disp_prot: "high",
-                   disp_mut: undefined,
-                   disp_germ: undefined
-               },
-               "two ups beats one low");
-       });
-       it("fills a datum w several data of different types correctly", ()=>{
-           let data = [{
-               alterationSubType:"high",
-               molecularProfileAlterationType: AlterationTypeConstants.PROTEIN_LEVEL
-           } as AnnotatedExtendedAlteration, {
-               alterationSubType:"low",
-               molecularProfileAlterationType: AlterationTypeConstants.PROTEIN_LEVEL
-           } as AnnotatedExtendedAlteration, {
-               alterationSubType:"low",
-               molecularProfileAlterationType: AlterationTypeConstants.PROTEIN_LEVEL
-           } as AnnotatedExtendedAlteration, {
-               alterationSubType:"high",
-               molecularProfileAlterationType: AlterationTypeConstants.MRNA_EXPRESSION
-           } as AnnotatedExtendedAlteration, {
-               alterationSubType:"high",
-               molecularProfileAlterationType: AlterationTypeConstants.MRNA_EXPRESSION
-           } as AnnotatedExtendedAlteration, {
-               alterationSubType:"low",
-               molecularProfileAlterationType: AlterationTypeConstants.MRNA_EXPRESSION
-           } as AnnotatedExtendedAlteration, {
-               value: -2,
-               molecularProfileAlterationType: AlterationTypeConstants.COPY_NUMBER_ALTERATION
-           } as AnnotatedExtendedAlteration,{
-               value: -2,
-               molecularProfileAlterationType: AlterationTypeConstants.COPY_NUMBER_ALTERATION
-           } as AnnotatedExtendedAlteration, {
-               value: 2,
-               molecularProfileAlterationType: AlterationTypeConstants.COPY_NUMBER_ALTERATION
-           } as AnnotatedExtendedAlteration,{
-               mutationType: "missense",
-               putativeDriver: true,
-               molecularProfileAlterationType: AlterationTypeConstants.MUTATION_EXTENDED
-           } as AnnotatedExtendedAlteration,{
-               mutationType: "start_codon_del",
-               putativeDriver: true,
-               molecularProfileAlterationType: AlterationTypeConstants.MUTATION_EXTENDED
-           } as AnnotatedExtendedAlteration];
-           assert.deepEqual(
-               fillGeneticTrackDatum(makeMinimalUnfilledDatum(), "gene", data),
-               {
-                   ...makeMinimalUnfilledDatum(),
-                   trackLabel: "gene",
-                   data: data,
-                   disp_cna: "homdel",
-                   disp_mrna: "high",
-                   disp_prot: "low",
-                   disp_mut: "trunc_rec",
-                   disp_germ: false
-               });
-       });
-   });
+            data = [
+                {
+                    alterationSubType: 'high',
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.MRNA_EXPRESSION,
+                } as AnnotatedExtendedAlteration,
+                {
+                    alterationSubType: 'high',
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.MRNA_EXPRESSION,
+                } as AnnotatedExtendedAlteration,
+                {
+                    alterationSubType: 'low',
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.MRNA_EXPRESSION,
+                } as AnnotatedExtendedAlteration,
+            ];
+            assert.deepEqual(
+                fillGeneticTrackDatum(makeMinimalUnfilledDatum(), 'gene', data),
+                {
+                    ...makeMinimalUnfilledDatum(),
+                    trackLabel: 'gene',
+                    data: data,
+                    disp_cna: undefined,
+                    disp_mrna: 'high',
+                    disp_prot: undefined,
+                    disp_mut: undefined,
+                    disp_germ: undefined,
+                },
+                'two ups beats one low'
+            );
+        });
+        it('fills a datum w multiple protein data w correct priority', () => {
+            let data = [
+                {
+                    alterationSubType: 'high',
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.PROTEIN_LEVEL,
+                } as AnnotatedExtendedAlteration,
+                {
+                    alterationSubType: 'low',
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.PROTEIN_LEVEL,
+                } as AnnotatedExtendedAlteration,
+                {
+                    alterationSubType: 'low',
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.PROTEIN_LEVEL,
+                } as AnnotatedExtendedAlteration,
+            ];
+            assert.deepEqual(
+                fillGeneticTrackDatum(makeMinimalUnfilledDatum(), 'gene', data),
+                {
+                    ...makeMinimalUnfilledDatum(),
+                    trackLabel: 'gene',
+                    data: data,
+                    disp_cna: undefined,
+                    disp_mrna: undefined,
+                    disp_prot: 'low',
+                    disp_mut: undefined,
+                    disp_germ: undefined,
+                },
+                'two downs beats one high'
+            );
 
-   describe("fillHeatmapTrackDatum", ()=>{
-       it("sets na true if no data", ()=>{
-           assert.isTrue(
-               fillHeatmapTrackDatum<IGeneHeatmapTrackDatum, "hugo_gene_symbol">(
-                   {}, "hugo_gene_symbol", "", {} as Sample
-               ).na
-           );
-       });
-       it("sets data for sample", ()=>{
-           const data:any[] = [
-               {value:3}
-           ];
-           assert.deepEqual(
-               fillHeatmapTrackDatum<IGeneHeatmapTrackDatum, "hugo_gene_symbol">(
-                   {},
-                   "hugo_gene_symbol",
-                   "gene",
-                   {sampleId:"sample", studyId:"study"} as Sample,
-                   data
-               ),
-               {hugo_gene_symbol:"gene", study_id:"study", profile_data:3}
-           );
-       });
-       it("removes data points with NaN value", ()=>{
-            const data:any[] = [
-                {value:3},
-                {value:NaN},
+            data = [
+                {
+                    alterationSubType: 'high',
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.PROTEIN_LEVEL,
+                } as AnnotatedExtendedAlteration,
+                {
+                    alterationSubType: 'high',
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.PROTEIN_LEVEL,
+                } as AnnotatedExtendedAlteration,
+                {
+                    alterationSubType: 'low',
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.PROTEIN_LEVEL,
+                } as AnnotatedExtendedAlteration,
+            ];
+            assert.deepEqual(
+                fillGeneticTrackDatum(makeMinimalUnfilledDatum(), 'gene', data),
+                {
+                    ...makeMinimalUnfilledDatum(),
+                    trackLabel: 'gene',
+                    data: data,
+                    disp_cna: undefined,
+                    disp_mrna: undefined,
+                    disp_prot: 'high',
+                    disp_mut: undefined,
+                    disp_germ: undefined,
+                },
+                'two ups beats one low'
+            );
+        });
+        it('fills a datum w several data of different types correctly', () => {
+            let data = [
+                {
+                    alterationSubType: 'high',
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.PROTEIN_LEVEL,
+                } as AnnotatedExtendedAlteration,
+                {
+                    alterationSubType: 'low',
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.PROTEIN_LEVEL,
+                } as AnnotatedExtendedAlteration,
+                {
+                    alterationSubType: 'low',
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.PROTEIN_LEVEL,
+                } as AnnotatedExtendedAlteration,
+                {
+                    alterationSubType: 'high',
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.MRNA_EXPRESSION,
+                } as AnnotatedExtendedAlteration,
+                {
+                    alterationSubType: 'high',
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.MRNA_EXPRESSION,
+                } as AnnotatedExtendedAlteration,
+                {
+                    alterationSubType: 'low',
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.MRNA_EXPRESSION,
+                } as AnnotatedExtendedAlteration,
+                {
+                    value: -2,
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.COPY_NUMBER_ALTERATION,
+                } as AnnotatedExtendedAlteration,
+                {
+                    value: -2,
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.COPY_NUMBER_ALTERATION,
+                } as AnnotatedExtendedAlteration,
+                {
+                    value: 2,
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.COPY_NUMBER_ALTERATION,
+                } as AnnotatedExtendedAlteration,
+                {
+                    mutationType: 'missense',
+                    putativeDriver: true,
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.MUTATION_EXTENDED,
+                } as AnnotatedExtendedAlteration,
+                {
+                    mutationType: 'start_codon_del',
+                    putativeDriver: true,
+                    molecularProfileAlterationType:
+                        AlterationTypeConstants.MUTATION_EXTENDED,
+                } as AnnotatedExtendedAlteration,
             ];
             assert.deepEqual(
-                fillHeatmapTrackDatum<IGeneHeatmapTrackDatum, "hugo_gene_symbol">(
+                fillGeneticTrackDatum(makeMinimalUnfilledDatum(), 'gene', data),
+                {
+                    ...makeMinimalUnfilledDatum(),
+                    trackLabel: 'gene',
+                    data: data,
+                    disp_cna: 'homdel',
+                    disp_mrna: 'high',
+                    disp_prot: 'low',
+                    disp_mut: 'trunc_rec',
+                    disp_germ: false,
+                }
+            );
+        });
+    });
+
+    describe('fillHeatmapTrackDatum', () => {
+        it('sets na true if no data', () => {
+            assert.isTrue(
+                fillHeatmapTrackDatum<
+                    IGeneHeatmapTrackDatum,
+                    'hugo_gene_symbol'
+                >({}, 'hugo_gene_symbol', '', {} as Sample).na
+            );
+        });
+        it('sets data for sample', () => {
+            const data: any[] = [{ value: 3 }];
+            assert.deepEqual(
+                fillHeatmapTrackDatum<
+                    IGeneHeatmapTrackDatum,
+                    'hugo_gene_symbol'
+                >(
+                    {},
+                    'hugo_gene_symbol',
+                    'gene',
+                    { sampleId: 'sample', studyId: 'study' } as Sample,
+                    data
+                ),
+                { hugo_gene_symbol: 'gene', study_id: 'study', profile_data: 3 }
+            );
+        });
+        it('removes data points with NaN value', () => {
+            const data: any[] = [{ value: 3 }, { value: NaN }];
+            assert.deepEqual(
+                fillHeatmapTrackDatum<
+                    IGeneHeatmapTrackDatum,
+                    'hugo_gene_symbol'
+                >(
+                    {},
+                    'hugo_gene_symbol',
+                    'gene',
+                    { sampleId: 'sample', studyId: 'study' } as Sample,
+                    data
+                ),
+                { hugo_gene_symbol: 'gene', study_id: 'study', profile_data: 3 }
+            );
+        });
+        it('throws exception if more than one data given for sample', () => {
+            const data: any[] = [{ value: 3 }, { value: 2 }];
+            try {
+                fillHeatmapTrackDatum<
+                    IGeneHeatmapTrackDatum,
+                    'hugo_gene_symbol'
+                >(
+                    {},
+                    'hugo_gene_symbol',
+                    'gene',
+                    { sampleId: 'sample', studyId: 'study' } as Sample,
+                    data
+                );
+                assert(false);
+            } catch (e) {
+                // Succeed if an exception occurred before asserting false
+            }
+        });
+        it('sets data for patient, if multiple then maximum in abs value', () => {
+            let data: any[] = [{ value: 3 }, { value: 2 }];
+            assert.deepEqual(
+                fillHeatmapTrackDatum<
+                    IGeneHeatmapTrackDatum,
+                    'hugo_gene_symbol'
+                >(
                     {},
-                    "hugo_gene_symbol",
-                    "gene",
-                    {sampleId:"sample", studyId:"study"} as Sample,
+                    'hugo_gene_symbol',
+                    'gene',
+                    { patientId: 'patient', studyId: 'study' } as Sample,
                     data
                 ),
-                {hugo_gene_symbol:"gene", study_id:"study", profile_data:3}
-            );
-      });
-       it("throws exception if more than one data given for sample",()=>{
-           const data:any[] = [
-               {value:3},
-               {value:2}
-           ];
-           try {
-               fillHeatmapTrackDatum<IGeneHeatmapTrackDatum, "hugo_gene_symbol">(
-                   {},
-                   "hugo_gene_symbol",
-                   "gene",
-                   {sampleId:"sample", studyId:"study"} as Sample,
-                   data
-               );
-               assert(false);
-           } catch(e) {
-               // Succeed if an exception occurred before asserting false
-           }
-       });
-       it("sets data for patient, if multiple then maximum in abs value", ()=>{
-           let data:any[] = [
-               {value:3},
-               {value:2}
-           ];
-           assert.deepEqual(
-               fillHeatmapTrackDatum<IGeneHeatmapTrackDatum, "hugo_gene_symbol">(
-                   {},
-                   "hugo_gene_symbol",
-                   "gene",
-                   {patientId:"patient", studyId:"study"} as Sample,
-                   data
-               ),
-               {hugo_gene_symbol:"gene", study_id:"study", profile_data:3}
-           );
+                { hugo_gene_symbol: 'gene', study_id: 'study', profile_data: 3 }
+            );
 
-           data = [
-               {value:2}
-           ];
-           assert.deepEqual(
-               fillHeatmapTrackDatum<IGeneHeatmapTrackDatum, "hugo_gene_symbol">(
-                   {},
-                   "hugo_gene_symbol",
-                   "gene",
-                   {patientId:"patient", studyId:"study"} as Sample,
-                   data
-               ),
-               {hugo_gene_symbol:"gene", study_id:"study", profile_data:2}
-           );
+            data = [{ value: 2 }];
+            assert.deepEqual(
+                fillHeatmapTrackDatum<
+                    IGeneHeatmapTrackDatum,
+                    'hugo_gene_symbol'
+                >(
+                    {},
+                    'hugo_gene_symbol',
+                    'gene',
+                    { patientId: 'patient', studyId: 'study' } as Sample,
+                    data
+                ),
+                { hugo_gene_symbol: 'gene', study_id: 'study', profile_data: 2 }
+            );
 
-           data = [
-               {value:2},
-               {value:3},
-               {value:4}
-           ];
-           assert.deepEqual(
-               fillHeatmapTrackDatum<IGeneHeatmapTrackDatum, "hugo_gene_symbol">(
-                   {},
-                   "hugo_gene_symbol",
-                   "gene",
-                   {patientId:"patient", studyId:"study"} as Sample,
-                   data
-               ),
-               {hugo_gene_symbol:"gene", study_id:"study", profile_data:4}
-           );
+            data = [{ value: 2 }, { value: 3 }, { value: 4 }];
+            assert.deepEqual(
+                fillHeatmapTrackDatum<
+                    IGeneHeatmapTrackDatum,
+                    'hugo_gene_symbol'
+                >(
+                    {},
+                    'hugo_gene_symbol',
+                    'gene',
+                    { patientId: 'patient', studyId: 'study' } as Sample,
+                    data
+                ),
+                { hugo_gene_symbol: 'gene', study_id: 'study', profile_data: 4 }
+            );
 
-           data = [
-               {value:-10},
-               {value:3},
-               {value:4}
-           ];
-           assert.deepEqual(
-               fillHeatmapTrackDatum<IGeneHeatmapTrackDatum, "hugo_gene_symbol">(
-                   {},
-                   "hugo_gene_symbol",
-                   "gene",
-                   {patientId:"patient", studyId:"study"} as Sample,
-                   data
-               ),
-               {hugo_gene_symbol:"gene", study_id:"study", profile_data:-10}
-           );
-       });
-       it("fills data for a gene set if that's requested", ()=>{
-           const partialTrackDatum = {};
-           fillHeatmapTrackDatum<IGenesetHeatmapTrackDatum, "geneset_id">(
-               partialTrackDatum,
-               "geneset_id",
-               "MY_FAVORITE_GENE_SET-3",
-               {sampleId:"sample", studyId:"study"} as Sample,
-               [{value: 7}]
-           );
-           assert.deepEqual(
-               partialTrackDatum,
-               {geneset_id:"MY_FAVORITE_GENE_SET-3", study_id:"study", profile_data:7}
-           );
-       });
+            data = [{ value: -10 }, { value: 3 }, { value: 4 }];
+            assert.deepEqual(
+                fillHeatmapTrackDatum<
+                    IGeneHeatmapTrackDatum,
+                    'hugo_gene_symbol'
+                >(
+                    {},
+                    'hugo_gene_symbol',
+                    'gene',
+                    { patientId: 'patient', studyId: 'study' } as Sample,
+                    data
+                ),
+                {
+                    hugo_gene_symbol: 'gene',
+                    study_id: 'study',
+                    profile_data: -10,
+                }
+            );
+        });
+        it("fills data for a gene set if that's requested", () => {
+            const partialTrackDatum = {};
+            fillHeatmapTrackDatum<IGenesetHeatmapTrackDatum, 'geneset_id'>(
+                partialTrackDatum,
+                'geneset_id',
+                'MY_FAVORITE_GENE_SET-3',
+                { sampleId: 'sample', studyId: 'study' } as Sample,
+                [{ value: 7 }]
+            );
+            assert.deepEqual(partialTrackDatum, {
+                geneset_id: 'MY_FAVORITE_GENE_SET-3',
+                study_id: 'study',
+                profile_data: 7,
+            });
+        });
 
-       it('adds thresholdType and category to trackDatum', () => {
-           let data = [
-            {value:8, thresholdType: '>' as '>'},
-           ];
-           const partialTrackDatum = {};
-           fillHeatmapTrackDatum<ITreatmentHeatmapTrackDatum, "treatment_id">(
-            partialTrackDatum,
-            "treatment_id",
-            "TREATMENT_ID_1",
-            {patientId:"patient", studyId:"study"} as Sample,
-            data
-           )
-           assert.deepEqual(
-            partialTrackDatum,
-            {treatment_id: "TREATMENT_ID_1", study_id:"study", profile_data:8, thresholdType: '>', category: '>8.00'}
-           );
-       });
+        it('adds thresholdType and category to trackDatum', () => {
+            let data = [{ value: 8, thresholdType: '>' as '>' }];
+            const partialTrackDatum = {};
+            fillHeatmapTrackDatum<ITreatmentHeatmapTrackDatum, 'treatment_id'>(
+                partialTrackDatum,
+                'treatment_id',
+                'TREATMENT_ID_1',
+                { patientId: 'patient', studyId: 'study' } as Sample,
+                data
+            );
+            assert.deepEqual(partialTrackDatum, {
+                treatment_id: 'TREATMENT_ID_1',
+                study_id: 'study',
+                profile_data: 8,
+                thresholdType: '>',
+                category: '>8.00',
+            });
+        });
 
-       it('returns smallest value with ASC sort order', () => {
-           let data = [
-            {value:1},
-            {value:2},
-            {value:3}
-           ];
-           const partialTrackDatum = {};
-           fillHeatmapTrackDatum<ITreatmentHeatmapTrackDatum, "treatment_id">(
-            partialTrackDatum,
-            "treatment_id",
-            "TREATMENT_ID_1",
-            {patientId:"patient", studyId:"study"} as Sample,
-            data,
-            "ASC"
-           )
-           assert.deepEqual(
-            partialTrackDatum,
-            {treatment_id: "TREATMENT_ID_1", study_id:"study", profile_data:1}
-           );
-       });
+        it('returns smallest value with ASC sort order', () => {
+            let data = [{ value: 1 }, { value: 2 }, { value: 3 }];
+            const partialTrackDatum = {};
+            fillHeatmapTrackDatum<ITreatmentHeatmapTrackDatum, 'treatment_id'>(
+                partialTrackDatum,
+                'treatment_id',
+                'TREATMENT_ID_1',
+                { patientId: 'patient', studyId: 'study' } as Sample,
+                data,
+                'ASC'
+            );
+            assert.deepEqual(partialTrackDatum, {
+                treatment_id: 'TREATMENT_ID_1',
+                study_id: 'study',
+                profile_data: 1,
+            });
+        });
 
-       it('returns largest value with DESC sort order', () => {
-           let data = [
-            {value:1},
-            {value:2},
-            {value:3}
-           ];
-           const partialTrackDatum = {};
-           fillHeatmapTrackDatum<ITreatmentHeatmapTrackDatum, "treatment_id">(
-            partialTrackDatum,
-            "treatment_id",
-            "TREATMENT_ID_1",
-            {patientId:"patient", studyId:"study"} as Sample,
-            data,
-            "DESC"
-           )
-           assert.deepEqual(
-            partialTrackDatum,
-            {treatment_id: "TREATMENT_ID_1", study_id:"study", profile_data:3}
-           );
-       });
+        it('returns largest value with DESC sort order', () => {
+            let data = [{ value: 1 }, { value: 2 }, { value: 3 }];
+            const partialTrackDatum = {};
+            fillHeatmapTrackDatum<ITreatmentHeatmapTrackDatum, 'treatment_id'>(
+                partialTrackDatum,
+                'treatment_id',
+                'TREATMENT_ID_1',
+                { patientId: 'patient', studyId: 'study' } as Sample,
+                data,
+                'DESC'
+            );
+            assert.deepEqual(partialTrackDatum, {
+                treatment_id: 'TREATMENT_ID_1',
+                study_id: 'study',
+                profile_data: 3,
+            });
+        });
 
-       it('selects non-threshold over threshold data point when values are equal', () => {
-        let data = [
-         {value:1, thresholdType: '>' as '>'},
-         {value:1}
-        ];
-        const partialTrackDatum = {};
-        fillHeatmapTrackDatum<ITreatmentHeatmapTrackDatum, "treatment_id">(
-         partialTrackDatum,
-         "treatment_id",
-         "TREATMENT_ID_1",
-         {patientId:"patient", studyId:"study"} as Sample,
-         data
-        )
-        assert.deepEqual(
-         partialTrackDatum,
-         {treatment_id: "TREATMENT_ID_1", study_id:"study", profile_data:1}
-        );
-       });
+        it('selects non-threshold over threshold data point when values are equal', () => {
+            let data = [{ value: 1, thresholdType: '>' as '>' }, { value: 1 }];
+            const partialTrackDatum = {};
+            fillHeatmapTrackDatum<ITreatmentHeatmapTrackDatum, 'treatment_id'>(
+                partialTrackDatum,
+                'treatment_id',
+                'TREATMENT_ID_1',
+                { patientId: 'patient', studyId: 'study' } as Sample,
+                data
+            );
+            assert.deepEqual(partialTrackDatum, {
+                treatment_id: 'TREATMENT_ID_1',
+                study_id: 'study',
+                profile_data: 1,
+            });
+        });
 
-       it('handles all NaN-value data points', () => {
-           let data = [
-            {value:NaN},
-            {value:NaN}
-           ];
-           const partialTrackDatum = {} as ITreatmentHeatmapTrackDatum;
-           fillHeatmapTrackDatum<ITreatmentHeatmapTrackDatum, "treatment_id">(
-            partialTrackDatum,
-            "treatment_id",
-            "TREATMENT_ID_1",
-            {patientId:"patient", studyId:"study"} as Sample,
-            data,
-            "DESC"
-           );
-           assert.isTrue(partialTrackDatum.na);
-       });
+        it('handles all NaN-value data points', () => {
+            let data = [{ value: NaN }, { value: NaN }];
+            const partialTrackDatum = {} as ITreatmentHeatmapTrackDatum;
+            fillHeatmapTrackDatum<ITreatmentHeatmapTrackDatum, 'treatment_id'>(
+                partialTrackDatum,
+                'treatment_id',
+                'TREATMENT_ID_1',
+                { patientId: 'patient', studyId: 'study' } as Sample,
+                data,
+                'DESC'
+            );
+            assert.isTrue(partialTrackDatum.na);
+        });
 
-       it('Prefers largest non-threshold absolute value when no sort order provided', () => {
-           let data = [
-            {value:-10},
-            {value:10, thresholdType: '>' as '>'}
-           ];
-           const partialTrackDatum = {};
-           fillHeatmapTrackDatum<ITreatmentHeatmapTrackDatum, "treatment_id">(
-            partialTrackDatum,
-            "treatment_id",
-            "TREATMENT_ID_1",
-            {patientId:"patient", studyId:"study"} as Sample,
-            data
-           )
-           assert.deepEqual(
-            partialTrackDatum,
-            {treatment_id: "TREATMENT_ID_1", study_id:"study", profile_data:-10}
-           );
-       });
-   });
+        it('Prefers largest non-threshold absolute value when no sort order provided', () => {
+            let data = [
+                { value: -10 },
+                { value: 10, thresholdType: '>' as '>' },
+            ];
+            const partialTrackDatum = {};
+            fillHeatmapTrackDatum<ITreatmentHeatmapTrackDatum, 'treatment_id'>(
+                partialTrackDatum,
+                'treatment_id',
+                'TREATMENT_ID_1',
+                { patientId: 'patient', studyId: 'study' } as Sample,
+                data
+            );
+            assert.deepEqual(partialTrackDatum, {
+                treatment_id: 'TREATMENT_ID_1',
+                study_id: 'study',
+                profile_data: -10,
+            });
+        });
+    });
 
-   describe("fillClinicalTrackDatum", ()=>{
-        it("creates datum correctly when no data given", ()=>{
+    describe('fillClinicalTrackDatum', () => {
+        it('creates datum correctly when no data given', () => {
             assert.deepEqual(
                 fillClinicalTrackDatum(
                     {},
-                    {clinicalAttributeId:"clinicalAttribute"} as ClinicalAttribute,
-                    {sampleId:"sample", studyId:"study"} as Sample
+                    {
+                        clinicalAttributeId: 'clinicalAttribute',
+                    } as ClinicalAttribute,
+                    { sampleId: 'sample', studyId: 'study' } as Sample
                 ),
                 {
-                    attr_id: "clinicalAttribute",
-                    study_id:"study",
+                    attr_id: 'clinicalAttribute',
+                    study_id: 'study',
                     attr_val_counts: {},
-                    na: true
-                }, "NA in general"
+                    na: true,
+                },
+                'NA in general'
             );
         });
-        it("creates data correctly for number data",()=>{
+        it('creates data correctly for number data', () => {
             assert.deepEqual(
                 fillClinicalTrackDatum(
                     {},
-                    {clinicalAttributeId:"clinicalAttribute", datatype:"number"} as any,
-                    {sampleId:"sample", studyId:"study"} as Sample,
-                    [{value:3}] as any[]
+                    {
+                        clinicalAttributeId: 'clinicalAttribute',
+                        datatype: 'number',
+                    } as any,
+                    { sampleId: 'sample', studyId: 'study' } as Sample,
+                    [{ value: 3 }] as any[]
                 ),
                 {
-                    attr_id: "clinicalAttribute",
-                    study_id: "study",
-                    attr_val_counts:{3:1},
-                    attr_val: 3
+                    attr_id: 'clinicalAttribute',
+                    study_id: 'study',
+                    attr_val_counts: { 3: 1 },
+                    attr_val: 3,
                 },
-                "one input data"
+                'one input data'
             );
 
             assert.deepEqual(
                 fillClinicalTrackDatum(
                     {},
-                    {clinicalAttributeId:"clinicalAttribute", datatype:"number"} as any,
-                    {sampleId:"sample", studyId:"study"} as Sample,
-                    [{value:"abc"}] as any[]
+                    {
+                        clinicalAttributeId: 'clinicalAttribute',
+                        datatype: 'number',
+                    } as any,
+                    { sampleId: 'sample', studyId: 'study' } as Sample,
+                    [{ value: 'abc' }] as any[]
                 ),
                 {
-                    attr_id: "clinicalAttribute",
-                    study_id: "study",
-                    attr_val_counts:{},
-                    na: true
+                    attr_id: 'clinicalAttribute',
+                    study_id: 'study',
+                    attr_val_counts: {},
+                    na: true,
                 },
-                "doesnt accept string data in number clinical attribute"
+                'doesnt accept string data in number clinical attribute'
             );
 
             assert.deepEqual(
                 fillClinicalTrackDatum(
                     {},
-                    {clinicalAttributeId:"clinicalAttribute", datatype:"number"} as any,
-                    {sampleId:"sample", studyId:"study"} as Sample,
-                    [{value:3}, {value:2}] as any[]
+                    {
+                        clinicalAttributeId: 'clinicalAttribute',
+                        datatype: 'number',
+                    } as any,
+                    { sampleId: 'sample', studyId: 'study' } as Sample,
+                    [{ value: 3 }, { value: 2 }] as any[]
                 ),
                 {
-                    attr_id: "clinicalAttribute",
-                    study_id: "study",
-                    attr_val_counts:{2.5:1},
-                    attr_val: 2.5
+                    attr_id: 'clinicalAttribute',
+                    study_id: 'study',
+                    attr_val_counts: { 2.5: 1 },
+                    attr_val: 2.5,
                 },
-                "averages multiple values"
+                'averages multiple values'
             );
 
             assert.deepEqual(
                 fillClinicalTrackDatum(
                     {},
-                    {clinicalAttributeId:"MUTATION_COUNT", datatype:"number"} as any,
-                    {sampleId:"sample", studyId:"study"} as Sample,
-                    [{value:3}, {value:2}] as any[]
+                    {
+                        clinicalAttributeId: 'MUTATION_COUNT',
+                        datatype: 'number',
+                    } as any,
+                    { sampleId: 'sample', studyId: 'study' } as Sample,
+                    [{ value: 3 }, { value: 2 }] as any[]
                 ),
                 {
-                    attr_id: "MUTATION_COUNT",
-                    study_id: "study",
-                    attr_val_counts:{3:1},
-                    attr_val: 3
+                    attr_id: 'MUTATION_COUNT',
+                    study_id: 'study',
+                    attr_val_counts: { 3: 1 },
+                    attr_val: 3,
                 },
-                "takes max of multiple values for MUTATION_COUNT"
+                'takes max of multiple values for MUTATION_COUNT'
             );
         });
-        it("creates data correctly for string data",()=>{
+        it('creates data correctly for string data', () => {
             assert.deepEqual(
                 fillClinicalTrackDatum(
                     {},
-                    {clinicalAttributeId:"clinicalAttribute", datatype:"string"} as any,
-                    {sampleId:"sample", studyId:"study"} as Sample,
-                    [{value:"a"}, {value:"a"}] as any[]
+                    {
+                        clinicalAttributeId: 'clinicalAttribute',
+                        datatype: 'string',
+                    } as any,
+                    { sampleId: 'sample', studyId: 'study' } as Sample,
+                    [{ value: 'a' }, { value: 'a' }] as any[]
                 ),
                 {
-                    attr_id: "clinicalAttribute",
-                    study_id: "study",
-                    attr_val_counts:{"a":2},
-                    attr_val: "a"
+                    attr_id: 'clinicalAttribute',
+                    study_id: 'study',
+                    attr_val_counts: { a: 2 },
+                    attr_val: 'a',
                 }
             );
 
             assert.deepEqual(
                 fillClinicalTrackDatum(
                     {},
-                    {clinicalAttributeId:"clinicalAttribute", datatype:"string"} as any,
-                    {sampleId:"sample", studyId:"study"} as Sample,
-                    [{value:"a"}, {value:"b"}] as any[]
+                    {
+                        clinicalAttributeId: 'clinicalAttribute',
+                        datatype: 'string',
+                    } as any,
+                    { sampleId: 'sample', studyId: 'study' } as Sample,
+                    [{ value: 'a' }, { value: 'b' }] as any[]
                 ),
                 {
-                    attr_id: "clinicalAttribute",
-                    study_id: "study",
-                    attr_val_counts:{"a":1, "b":1},
-                    attr_val: "Mixed"
+                    attr_id: 'clinicalAttribute',
+                    study_id: 'study',
+                    attr_val_counts: { a: 1, b: 1 },
+                    attr_val: 'Mixed',
                 }
             );
 
             assert.deepEqual(
                 fillClinicalTrackDatum(
                     {},
-                    {clinicalAttributeId:"clinicalAttribute", datatype:"string"} as any,
-                    {sampleId:"sample", studyId:"study"} as Sample,
-                    [{value:"a"}, {value:"b"}, {value:"b"}] as any[]
+                    {
+                        clinicalAttributeId: 'clinicalAttribute',
+                        datatype: 'string',
+                    } as any,
+                    { sampleId: 'sample', studyId: 'study' } as Sample,
+                    [{ value: 'a' }, { value: 'b' }, { value: 'b' }] as any[]
                 ),
                 {
-                    attr_id: "clinicalAttribute",
-                    study_id: "study",
-                    attr_val_counts:{"a":1, "b":2},
-                    attr_val: "Mixed"
+                    attr_id: 'clinicalAttribute',
+                    study_id: 'study',
+                    attr_val_counts: { a: 1, b: 2 },
+                    attr_val: 'Mixed',
                 }
             );
         });
-        it("creates data correctly for mutation spectrum data",()=>{
+        it('creates data correctly for mutation spectrum data', () => {
             assert.deepEqual(
                 fillClinicalTrackDatum(
                     {},
-                    {clinicalAttributeId:SpecialAttribute.MutationSpectrum} as any,
-                    {sampleId:"sample", studyId:"study"} as Sample,
+                    {
+                        clinicalAttributeId: SpecialAttribute.MutationSpectrum,
+                    } as any,
+                    { sampleId: 'sample', studyId: 'study' } as Sample,
                     [] as MutationSpectrum[]
                 ),
                 {
                     attr_id: SpecialAttribute.MutationSpectrum,
-                    study_id: "study",
-                    attr_val_counts:{},
-                    na:true
+                    study_id: 'study',
+                    attr_val_counts: {},
+                    na: true,
                 },
-                "NA if no data given"
+                'NA if no data given'
             );
             assert.deepEqual(
                 fillClinicalTrackDatum(
                     {},
-                    {clinicalAttributeId:SpecialAttribute.MutationSpectrum, datatype:""} as any,
-                    {sampleId:"sample", studyId:"study"} as Sample,
-                    [{CtoA:0, CtoG:0, CtoT:0, TtoA:0, TtoC:0, TtoG:0}] as MutationSpectrum[]
+                    {
+                        clinicalAttributeId: SpecialAttribute.MutationSpectrum,
+                        datatype: '',
+                    } as any,
+                    { sampleId: 'sample', studyId: 'study' } as Sample,
+                    [
+                        {
+                            CtoA: 0,
+                            CtoG: 0,
+                            CtoT: 0,
+                            TtoA: 0,
+                            TtoC: 0,
+                            TtoG: 0,
+                        },
+                    ] as MutationSpectrum[]
                 ),
                 {
                     attr_id: SpecialAttribute.MutationSpectrum,
-                    study_id: "study",
-                    attr_val_counts:{"C>A":0, "C>G":0, "C>T":0, "T>A":0, "T>C":0,"T>G":0},
-                    attr_val: {"C>A":0, "C>G":0, "C>T":0, "T>A":0, "T>C":0,"T>G":0},
-                    na:true
-                }, "NA if no mutations"
+                    study_id: 'study',
+                    attr_val_counts: {
+                        'C>A': 0,
+                        'C>G': 0,
+                        'C>T': 0,
+                        'T>A': 0,
+                        'T>C': 0,
+                        'T>G': 0,
+                    },
+                    attr_val: {
+                        'C>A': 0,
+                        'C>G': 0,
+                        'C>T': 0,
+                        'T>A': 0,
+                        'T>C': 0,
+                        'T>G': 0,
+                    },
+                    na: true,
+                },
+                'NA if no mutations'
             );
             assert.deepEqual(
                 fillClinicalTrackDatum(
                     {},
-                    {clinicalAttributeId:SpecialAttribute.MutationSpectrum, datatype:""} as any,
-                    {sampleId:"sample", studyId:"study"} as Sample,
-                    [{CtoA:1, CtoG:0, CtoT:0, TtoA:0, TtoC:0, TtoG:0},
-                        {CtoA:0, CtoG:2, CtoT:0, TtoA:0, TtoC:0, TtoG:0},
-                        {CtoA:0, CtoG:0, CtoT:3, TtoA:0, TtoC:0, TtoG:0},
-                        {CtoA:0, CtoG:0, CtoT:0, TtoA:0, TtoC:6, TtoG:4}] as MutationSpectrum[]
+                    {
+                        clinicalAttributeId: SpecialAttribute.MutationSpectrum,
+                        datatype: '',
+                    } as any,
+                    { sampleId: 'sample', studyId: 'study' } as Sample,
+                    [
+                        {
+                            CtoA: 1,
+                            CtoG: 0,
+                            CtoT: 0,
+                            TtoA: 0,
+                            TtoC: 0,
+                            TtoG: 0,
+                        },
+                        {
+                            CtoA: 0,
+                            CtoG: 2,
+                            CtoT: 0,
+                            TtoA: 0,
+                            TtoC: 0,
+                            TtoG: 0,
+                        },
+                        {
+                            CtoA: 0,
+                            CtoG: 0,
+                            CtoT: 3,
+                            TtoA: 0,
+                            TtoC: 0,
+                            TtoG: 0,
+                        },
+                        {
+                            CtoA: 0,
+                            CtoG: 0,
+                            CtoT: 0,
+                            TtoA: 0,
+                            TtoC: 6,
+                            TtoG: 4,
+                        },
+                    ] as MutationSpectrum[]
                 ),
                 {
                     attr_id: SpecialAttribute.MutationSpectrum,
-                    study_id: "study",
-                    attr_val_counts:{"C>A":1,"C>G":2,"C>T":3,"T>A":0,"T>C":6,"T>G":4},
-                    attr_val: {"C>A":1,"C>G":2,"C>T":3,"T>A":0,"T>C":6,"T>G":4}
-                }, "sum"
+                    study_id: 'study',
+                    attr_val_counts: {
+                        'C>A': 1,
+                        'C>G': 2,
+                        'C>T': 3,
+                        'T>A': 0,
+                        'T>C': 6,
+                        'T>G': 4,
+                    },
+                    attr_val: {
+                        'C>A': 1,
+                        'C>G': 2,
+                        'C>T': 3,
+                        'T>A': 0,
+                        'T>C': 6,
+                        'T>G': 4,
+                    },
+                },
+                'sum'
             );
         });
-   });
+    });
 });
diff --git a/src/shared/components/oncoprint/DataUtils.ts b/src/shared/components/oncoprint/DataUtils.ts
index 9dfbfec1b8e..9806495063c 100644
--- a/src/shared/components/oncoprint/DataUtils.ts
+++ b/src/shared/components/oncoprint/DataUtils.ts
@@ -1,35 +1,47 @@
 import {
     AnnotatedExtendedAlteration,
     AnnotatedMutation,
-    CaseAggregatedData, ExtendedAlteration
-} from "../../../pages/resultsView/ResultsViewPageStore";
+    CaseAggregatedData,
+    ExtendedAlteration,
+} from '../../../pages/resultsView/ResultsViewPageStore';
 import {
     ClinicalAttribute,
     ClinicalData,
-    NumericGeneMolecularData, GenePanelData, MolecularProfile, Mutation, Patient,
-    Sample
-} from "../../api/generated/CBioPortalAPI";
+    NumericGeneMolecularData,
+    GenePanelData,
+    MolecularProfile,
+    Mutation,
+    Patient,
+    Sample,
+} from '../../api/generated/CBioPortalAPI';
 import {
     ClinicalTrackDatum,
-    GeneticTrackDatum, GeneticTrackDatum_Data,
+    GeneticTrackDatum,
+    GeneticTrackDatum_Data,
     IBaseHeatmapTrackDatum,
     IGeneHeatmapTrackDatum,
-} from "./Oncoprint";
-import {isSample, isSampleList} from "../../lib/CBioPortalAPIUtils";
-import {getSimplifiedMutationType, SimplifiedMutationType} from "../../lib/oql/AccessorsForOqlFilter";
-import _ from "lodash";
-import {MutationSpectrum} from "../../api/generated/CBioPortalAPIInternal";
-import {CoverageInformation, ExtendedClinicalAttribute} from "../../../pages/resultsView/ResultsViewPageStoreUtils";
-import { MUTATION_STATUS_GERMLINE } from "shared/constants";
-import {SpecialAttribute} from "../../cache/ClinicalDataCache";
-import {stringListToIndexSet} from "cbioportal-frontend-commons";
+} from './Oncoprint';
+import { isSample, isSampleList } from '../../lib/CBioPortalAPIUtils';
+import {
+    getSimplifiedMutationType,
+    SimplifiedMutationType,
+} from '../../lib/oql/AccessorsForOqlFilter';
+import _ from 'lodash';
+import { MutationSpectrum } from '../../api/generated/CBioPortalAPIInternal';
+import {
+    CoverageInformation,
+    ExtendedClinicalAttribute,
+} from '../../../pages/resultsView/ResultsViewPageStoreUtils';
+import { MUTATION_STATUS_GERMLINE } from 'shared/constants';
+import { SpecialAttribute } from '../../cache/ClinicalDataCache';
+import { stringListToIndexSet } from 'cbioportal-frontend-commons';
 
-const cnaDataToString:{[integerCNA:string]:string|undefined} = {
-    "-2": "homdel",
-    "-1": "hetloss",
-    "0": undefined,
-    "1": "gain",
-    "2": "amp"
+const cnaDataToString: { [integerCNA: string]: string | undefined } = {
+    '-2': 'homdel',
+    '-1': 'hetloss',
+    '0': undefined,
+    '1': 'gain',
+    '2': 'amp',
 };
 const mutRenderPriority = stringListToIndexSet([
     'trunc_rec',
@@ -41,53 +53,70 @@ const mutRenderPriority = stringListToIndexSet([
     'inframe',
     'promoter',
     'missense',
-    'other'
+    'other',
 ]);
 const cnaRenderPriority = {
-    'amp': 0,
-    'homdel': 0,
-    'gain': 1,
-    'hetloss': 1
+    amp: 0,
+    homdel: 0,
+    gain: 1,
+    hetloss: 1,
 };
 const mrnaRenderPriority = {
-    'high': 0,
-    'low': 0
+    high: 0,
+    low: 0,
 };
 const protRenderPriority = {
-    'high': 0,
-    'low': 0
+    high: 0,
+    low: 0,
 };
 
 type HeatmapCaseDatum = {
-    value:number;
-    thresholdType?: '<'|'>';
+    value: number;
+    thresholdType?: '<' | '>';
 };
 
-export type OncoprintMutationType = "missense" | "inframe" | "fusion" | "promoter" | "trunc" | "other";
+export type OncoprintMutationType =
+    | 'missense'
+    | 'inframe'
+    | 'fusion'
+    | 'promoter'
+    | 'trunc'
+    | 'other';
 
-export function getOncoprintMutationType(d:Pick<Mutation, "proteinChange"|"mutationType">):OncoprintMutationType {
-    if ((d.proteinChange || "").toLowerCase() === "promoter") {
+export function getOncoprintMutationType(
+    d: Pick<Mutation, 'proteinChange' | 'mutationType'>
+): OncoprintMutationType {
+    if ((d.proteinChange || '').toLowerCase() === 'promoter') {
         // promoter mutations aren't labeled as such in mutationType, but in proteinChange, so we must detect it there
-        return "promoter";
+        return 'promoter';
     } else {
-        const simplifiedMutationType = getSimplifiedMutationType(d.mutationType);
+        const simplifiedMutationType = getSimplifiedMutationType(
+            d.mutationType
+        );
         switch (simplifiedMutationType) {
-            case "missense":
-            case "inframe":
-            case "fusion":
-            case "other":
+            case 'missense':
+            case 'inframe':
+            case 'fusion':
+            case 'other':
                 return simplifiedMutationType;
             default:
-                return "trunc";
+                return 'trunc';
         }
     }
 }
 
-export function selectDisplayValue(counts:{[value:string]:number}, priority:{[value:string]:number}) {
-    const options = Object.keys(counts).map(k=>({key:k, value:counts[k]}));
+export function selectDisplayValue(
+    counts: { [value: string]: number },
+    priority: { [value: string]: number }
+) {
+    const options = Object.keys(counts).map(k => ({
+        key: k,
+        value: counts[k],
+    }));
     if (options.length > 0) {
-        options.sort(function (kv1, kv2) {
-            const rendering_priority_diff = priority[kv1.key] - priority[kv2.key];
+        options.sort(function(kv1, kv2) {
+            const rendering_priority_diff =
+                priority[kv1.key] - priority[kv2.key];
             if (rendering_priority_diff < 0) {
                 return -1;
             } else if (rendering_priority_diff > 0) {
@@ -110,56 +139,67 @@ export function selectDisplayValue(counts:{[value:string]:number}, priority:{[va
 
 export function fillGeneticTrackDatum(
     // must already have all non-disp* fields except trackLabel and data
-    newDatum:Partial<GeneticTrackDatum>,
-    trackLabel:string,
-    data:GeneticTrackDatum_Data[]
+    newDatum: Partial<GeneticTrackDatum>,
+    trackLabel: string,
+    data: GeneticTrackDatum_Data[]
 ): GeneticTrackDatum {
     newDatum.trackLabel = trackLabel;
     newDatum.data = data;
 
     let dispFusion = false;
-    const dispCnaCounts:{[cnaEvent:string]:number} = {};
-    const dispMrnaCounts:{[mrnaEvent:string]:number} = {};
-    const dispProtCounts:{[protEvent:string]:number} = {};
-    const dispMutCounts:{[mutType:string]:number} = {};
-    const dispGermline:{[mutType:string]:boolean} = {};
-    const caseInsensitiveGermlineMatch = new RegExp(MUTATION_STATUS_GERMLINE, "i");
+    const dispCnaCounts: { [cnaEvent: string]: number } = {};
+    const dispMrnaCounts: { [mrnaEvent: string]: number } = {};
+    const dispProtCounts: { [protEvent: string]: number } = {};
+    const dispMutCounts: { [mutType: string]: number } = {};
+    const dispGermline: { [mutType: string]: boolean } = {};
+    const caseInsensitiveGermlineMatch = new RegExp(
+        MUTATION_STATUS_GERMLINE,
+        'i'
+    );
 
     for (const event of data) {
         const molecularAlterationType = event.molecularProfileAlterationType;
         switch (molecularAlterationType) {
-            case "COPY_NUMBER_ALTERATION":
-                const cnaEvent = cnaDataToString[event.value as NumericGeneMolecularData["value"]];
+            case 'COPY_NUMBER_ALTERATION':
+                const cnaEvent =
+                    cnaDataToString[
+                        event.value as NumericGeneMolecularData['value']
+                    ];
                 if (cnaEvent) {
                     // not diploid
                     dispCnaCounts[cnaEvent] = dispCnaCounts[cnaEvent] || 0;
                     dispCnaCounts[cnaEvent] += 1;
                 }
                 break;
-            case "MRNA_EXPRESSION":
+            case 'MRNA_EXPRESSION':
                 if (event.alterationSubType) {
                     const mrnaEvent = event.alterationSubType;
                     dispMrnaCounts[mrnaEvent] = dispMrnaCounts[mrnaEvent] || 0;
                     dispMrnaCounts[mrnaEvent] += 1;
                 }
                 break;
-            case "PROTEIN_LEVEL":
+            case 'PROTEIN_LEVEL':
                 if (event.alterationSubType) {
                     const protEvent = event.alterationSubType;
                     dispProtCounts[protEvent] = dispProtCounts[protEvent] || 0;
                     dispProtCounts[protEvent] += 1;
                 }
                 break;
-            case "MUTATION_EXTENDED":
-                let oncoprintMutationType = getOncoprintMutationType(event as Pick<Mutation, "proteinChange"|"mutationType">);
-                if (oncoprintMutationType === "fusion") {
+            case 'MUTATION_EXTENDED':
+                let oncoprintMutationType = getOncoprintMutationType(
+                    event as Pick<Mutation, 'proteinChange' | 'mutationType'>
+                );
+                if (oncoprintMutationType === 'fusion') {
                     dispFusion = true;
                 } else {
                     if (event.putativeDriver) {
-                        oncoprintMutationType += "_rec";
+                        oncoprintMutationType += '_rec';
                     }
-                    dispGermline[oncoprintMutationType] = dispGermline[oncoprintMutationType] || (caseInsensitiveGermlineMatch.test(event.mutationStatus));
-                    dispMutCounts[oncoprintMutationType] = dispMutCounts[oncoprintMutationType] || 0;
+                    dispGermline[oncoprintMutationType] =
+                        dispGermline[oncoprintMutationType] ||
+                        caseInsensitiveGermlineMatch.test(event.mutationStatus);
+                    dispMutCounts[oncoprintMutationType] =
+                        dispMutCounts[oncoprintMutationType] || 0;
                     dispMutCounts[oncoprintMutationType] += 1;
                 }
                 break;
@@ -172,118 +212,162 @@ export function fillGeneticTrackDatum(
     newDatum.disp_mrna = selectDisplayValue(dispMrnaCounts, mrnaRenderPriority);
     newDatum.disp_prot = selectDisplayValue(dispProtCounts, protRenderPriority);
     newDatum.disp_mut = selectDisplayValue(dispMutCounts, mutRenderPriority);
-    newDatum.disp_germ = newDatum.disp_mut ? dispGermline[newDatum.disp_mut] : undefined;
+    newDatum.disp_germ = newDatum.disp_mut
+        ? dispGermline[newDatum.disp_mut]
+        : undefined;
 
     return newDatum as GeneticTrackDatum; // return for convenience, even though changes made in place
 }
 
 export function makeGeneticTrackData(
-    caseAggregatedAlterationData:CaseAggregatedData<AnnotatedExtendedAlteration>["samples"],
-    hugoGeneSymbols:string|string[],
-    samples:Sample[],
-    genePanelInformation:CoverageInformation,
-    selectedMolecularProfiles:MolecularProfile[],
-):GeneticTrackDatum[];
+    caseAggregatedAlterationData: CaseAggregatedData<
+        AnnotatedExtendedAlteration
+    >['samples'],
+    hugoGeneSymbols: string | string[],
+    samples: Sample[],
+    genePanelInformation: CoverageInformation,
+    selectedMolecularProfiles: MolecularProfile[]
+): GeneticTrackDatum[];
 
 export function makeGeneticTrackData(
-    caseAggregatedAlterationData:CaseAggregatedData<AnnotatedExtendedAlteration>["patients"],
-    hugoGeneSymbols:string|string[],
-    patients:Patient[],
-    genePanelInformation:CoverageInformation,
-    selectedMolecularProfiles:MolecularProfile[],
-):GeneticTrackDatum[];
+    caseAggregatedAlterationData: CaseAggregatedData<
+        AnnotatedExtendedAlteration
+    >['patients'],
+    hugoGeneSymbols: string | string[],
+    patients: Patient[],
+    genePanelInformation: CoverageInformation,
+    selectedMolecularProfiles: MolecularProfile[]
+): GeneticTrackDatum[];
 
 export function makeGeneticTrackData(
-    caseAggregatedAlterationData:CaseAggregatedData<AnnotatedExtendedAlteration>["samples"]|CaseAggregatedData<AnnotatedExtendedAlteration>["patients"],
-    hugoGeneSymbols:string|string[],
-    cases:Sample[]|Patient[],
-    genePanelInformation:CoverageInformation,
-    selectedMolecularProfiles:MolecularProfile[],
-):GeneticTrackDatum[] {
+    caseAggregatedAlterationData:
+        | CaseAggregatedData<AnnotatedExtendedAlteration>['samples']
+        | CaseAggregatedData<AnnotatedExtendedAlteration>['patients'],
+    hugoGeneSymbols: string | string[],
+    cases: Sample[] | Patient[],
+    genePanelInformation: CoverageInformation,
+    selectedMolecularProfiles: MolecularProfile[]
+): GeneticTrackDatum[] {
     if (!cases.length) {
         return [];
     }
-    const geneSymbolArray = hugoGeneSymbols instanceof Array ? hugoGeneSymbols : [hugoGeneSymbols];
-    const _selectedMolecularProfiles = _.keyBy(selectedMolecularProfiles, p=>p.molecularProfileId);
-    const ret:GeneticTrackDatum[] = [];
+    const geneSymbolArray =
+        hugoGeneSymbols instanceof Array ? hugoGeneSymbols : [hugoGeneSymbols];
+    const _selectedMolecularProfiles = _.keyBy(
+        selectedMolecularProfiles,
+        p => p.molecularProfileId
+    );
+    const ret: GeneticTrackDatum[] = [];
     if (isSampleList(cases)) {
         // case: Samples
         for (const sample of cases) {
-            const newDatum:Partial<GeneticTrackDatum> = {};
+            const newDatum: Partial<GeneticTrackDatum> = {};
             newDatum.sample = sample.sampleId;
             newDatum.patient = sample.patientId;
             newDatum.study_id = sample.studyId;
             newDatum.uid = sample.uniqueSampleKey;
 
-            const sampleSequencingInfo = genePanelInformation.samples[sample.uniqueSampleKey];
+            const sampleSequencingInfo =
+                genePanelInformation.samples[sample.uniqueSampleKey];
             newDatum.profiled_in = _.flatMap(
                 geneSymbolArray,
-                hugoGeneSymbol => sampleSequencingInfo.byGene[hugoGeneSymbol] || []
+                hugoGeneSymbol =>
+                    sampleSequencingInfo.byGene[hugoGeneSymbol] || []
             );
-            newDatum.profiled_in = newDatum.profiled_in.concat(sampleSequencingInfo.allGenes).filter(p=>!!_selectedMolecularProfiles[p.molecularProfileId]); // filter out coverage information about non-selected profiles
+            newDatum.profiled_in = newDatum.profiled_in
+                .concat(sampleSequencingInfo.allGenes)
+                .filter(
+                    p => !!_selectedMolecularProfiles[p.molecularProfileId]
+                ); // filter out coverage information about non-selected profiles
             if (!newDatum.profiled_in!.length) {
                 newDatum.na = true;
             }
             newDatum.not_profiled_in = _.flatMap(
                 geneSymbolArray,
-                hugoGeneSymbol => sampleSequencingInfo.notProfiledByGene[hugoGeneSymbol] || []
+                hugoGeneSymbol =>
+                    sampleSequencingInfo.notProfiledByGene[hugoGeneSymbol] || []
             );
-            newDatum.not_profiled_in = newDatum.not_profiled_in.concat(sampleSequencingInfo.notProfiledAllGenes).filter(p=>!!_selectedMolecularProfiles[p.molecularProfileId]); // filter out coverage information about non-selected profiles
+            newDatum.not_profiled_in = newDatum.not_profiled_in
+                .concat(sampleSequencingInfo.notProfiledAllGenes)
+                .filter(
+                    p => !!_selectedMolecularProfiles[p.molecularProfileId]
+                ); // filter out coverage information about non-selected profiles
 
-            let sampleData = caseAggregatedAlterationData[sample.uniqueSampleKey];
-            ret.push(fillGeneticTrackDatum(
-                newDatum,
-                geneSymbolArray.join(' / '),
-                sampleData
-            ));
+            let sampleData =
+                caseAggregatedAlterationData[sample.uniqueSampleKey];
+            ret.push(
+                fillGeneticTrackDatum(
+                    newDatum,
+                    geneSymbolArray.join(' / '),
+                    sampleData
+                )
+            );
         }
     } else {
         // case: Patients
         for (const patient of cases) {
-            const newDatum:Partial<GeneticTrackDatum> = {};
+            const newDatum: Partial<GeneticTrackDatum> = {};
             newDatum.patient = patient.patientId;
             newDatum.study_id = patient.studyId;
             newDatum.uid = patient.uniquePatientKey;
 
-            const patientSequencingInfo = genePanelInformation.patients[patient.uniquePatientKey];
+            const patientSequencingInfo =
+                genePanelInformation.patients[patient.uniquePatientKey];
             newDatum.profiled_in = _.flatMap(
                 geneSymbolArray,
-                hugoGeneSymbol => patientSequencingInfo.byGene[hugoGeneSymbol] || []
+                hugoGeneSymbol =>
+                    patientSequencingInfo.byGene[hugoGeneSymbol] || []
             );
-            newDatum.profiled_in = newDatum.profiled_in.concat(patientSequencingInfo.allGenes).filter(p=>!!_selectedMolecularProfiles[p.molecularProfileId]); // filter out coverage information about non-selected profiles
+            newDatum.profiled_in = newDatum.profiled_in
+                .concat(patientSequencingInfo.allGenes)
+                .filter(
+                    p => !!_selectedMolecularProfiles[p.molecularProfileId]
+                ); // filter out coverage information about non-selected profiles
             if (!newDatum.profiled_in!.length) {
                 newDatum.na = true;
             }
             newDatum.not_profiled_in = _.flatMap(
                 geneSymbolArray,
-                hugoGeneSymbol => patientSequencingInfo.notProfiledByGene[hugoGeneSymbol] || []
+                hugoGeneSymbol =>
+                    patientSequencingInfo.notProfiledByGene[hugoGeneSymbol] ||
+                    []
             );
-            newDatum.not_profiled_in = newDatum.not_profiled_in.concat(patientSequencingInfo.notProfiledAllGenes).filter(p=>!!_selectedMolecularProfiles[p.molecularProfileId]); // filter out coverage information about non-selected profiles
+            newDatum.not_profiled_in = newDatum.not_profiled_in
+                .concat(patientSequencingInfo.notProfiledAllGenes)
+                .filter(
+                    p => !!_selectedMolecularProfiles[p.molecularProfileId]
+                ); // filter out coverage information about non-selected profiles
 
-            let patientData = caseAggregatedAlterationData[patient.uniquePatientKey];
-            ret.push(fillGeneticTrackDatum(
-                newDatum,
-                geneSymbolArray.join(' / '),
-                patientData
-            ));
+            let patientData =
+                caseAggregatedAlterationData[patient.uniquePatientKey];
+            ret.push(
+                fillGeneticTrackDatum(
+                    newDatum,
+                    geneSymbolArray.join(' / '),
+                    patientData
+                )
+            );
         }
     }
     return ret;
 }
 
-export function fillHeatmapTrackDatum<T extends IBaseHeatmapTrackDatum, K extends keyof T>(
+export function fillHeatmapTrackDatum<
+    T extends IBaseHeatmapTrackDatum,
+    K extends keyof T
+>(
     trackDatum: Partial<T>,
     featureKey: K,
     featureId: T[K],
-    case_:Sample|Patient,
-    data?:HeatmapCaseDatum[],
+    case_: Sample | Patient,
+    data?: HeatmapCaseDatum[],
     sortOrder?: string
 ) {
     trackDatum[featureKey] = featureId;
     trackDatum.study_id = case_.studyId;
 
     // remove data points of which `value` is NaN
-    const dataWithValue =  _.filter(data, (d) => !isNaN(d.value));
+    const dataWithValue = _.filter(data, d => !isNaN(d.value));
 
     if (!dataWithValue || !dataWithValue.length) {
         trackDatum.profile_data = null;
@@ -292,33 +376,57 @@ export function fillHeatmapTrackDatum<T extends IBaseHeatmapTrackDatum, K extend
         trackDatum.profile_data = dataWithValue[0].value;
         if (dataWithValue[0].thresholdType) {
             trackDatum.thresholdType = dataWithValue[0].thresholdType;
-            trackDatum.category = trackDatum.profile_data && trackDatum.thresholdType? `${trackDatum.thresholdType}${trackDatum.profile_data.toFixed(2)}` : undefined;
+            trackDatum.category =
+                trackDatum.profile_data && trackDatum.thresholdType
+                    ? `${
+                          trackDatum.thresholdType
+                      }${trackDatum.profile_data.toFixed(2)}`
+                    : undefined;
         }
     } else {
         if (isSample(case_)) {
-            throw Error("Unexpectedly received multiple heatmap profile data for one sample");
+            throw Error(
+                'Unexpectedly received multiple heatmap profile data for one sample'
+            );
         } else {
-
             // aggregate samples for this patient by selecting the highest absolute (Z-)score
             // default: the most extreme value (pos. or neg.) is shown for data
             // sortOrder=ASC: the smallest value is shown for data
             // sortOrder=DESC: the largest value is shown for data
             let representingDatum;
             switch (sortOrder) {
-                case "ASC":
-                    let bestValue = _(dataWithValue).map((d:HeatmapCaseDatum)=>d.value).min();
-                    representingDatum = selectRepresentingDataPoint(bestValue!, dataWithValue, false);
+                case 'ASC':
+                    let bestValue = _(dataWithValue)
+                        .map((d: HeatmapCaseDatum) => d.value)
+                        .min();
+                    representingDatum = selectRepresentingDataPoint(
+                        bestValue!,
+                        dataWithValue,
+                        false
+                    );
                     break;
-                case "DESC":
-                    bestValue = _(dataWithValue).map((d:HeatmapCaseDatum)=>d.value).max();
-                    representingDatum = selectRepresentingDataPoint(bestValue!, dataWithValue, false);
+                case 'DESC':
+                    bestValue = _(dataWithValue)
+                        .map((d: HeatmapCaseDatum) => d.value)
+                        .max();
+                    representingDatum = selectRepresentingDataPoint(
+                        bestValue!,
+                        dataWithValue,
+                        false
+                    );
                     break;
                 default:
-                    bestValue = _.maxBy(dataWithValue,(d:HeatmapCaseDatum) => Math.abs(d.value))!.value;
-                    representingDatum = selectRepresentingDataPoint(bestValue, dataWithValue, true);
+                    bestValue = _.maxBy(dataWithValue, (d: HeatmapCaseDatum) =>
+                        Math.abs(d.value)
+                    )!.value;
+                    representingDatum = selectRepresentingDataPoint(
+                        bestValue,
+                        dataWithValue,
+                        true
+                    );
                     break;
             }
-            
+
             // `data` can contain data points with only NaN values
             // this is detected by `representingDatum` to be undefined
             // in that case select the first element as representing datum
@@ -329,19 +437,30 @@ export function fillHeatmapTrackDatum<T extends IBaseHeatmapTrackDatum, K extend
             trackDatum.profile_data = representingDatum!.value;
             if (representingDatum!.thresholdType) {
                 trackDatum.thresholdType = representingDatum!.thresholdType;
-                trackDatum.category = trackDatum.thresholdType? `${trackDatum.thresholdType}${trackDatum.profile_data.toFixed(2)}` : undefined;
+                trackDatum.category = trackDatum.thresholdType
+                    ? `${
+                          trackDatum.thresholdType
+                      }${trackDatum.profile_data.toFixed(2)}`
+                    : undefined;
             }
-
         }
     }
     return trackDatum;
 }
 
-function selectRepresentingDataPoint(bestValue:number, data:HeatmapCaseDatum[], useAbsolute:boolean):HeatmapCaseDatum {
-
-    const fFilter = useAbsolute? (d:HeatmapCaseDatum) => Math.abs(d.value) === bestValue : (d:HeatmapCaseDatum) => d.value === bestValue;
+function selectRepresentingDataPoint(
+    bestValue: number,
+    data: HeatmapCaseDatum[],
+    useAbsolute: boolean
+): HeatmapCaseDatum {
+    const fFilter = useAbsolute
+        ? (d: HeatmapCaseDatum) => Math.abs(d.value) === bestValue
+        : (d: HeatmapCaseDatum) => d.value === bestValue;
     const selData = _.filter(data, fFilter);
-    const selDataNoTreshold = _.filter(selData, (d:HeatmapCaseDatum) => !d.thresholdType);
+    const selDataNoTreshold = _.filter(
+        selData,
+        (d: HeatmapCaseDatum) => !d.thresholdType
+    );
     if (selDataNoTreshold.length > 0) {
         return selDataNoTreshold[0];
     } else {
@@ -349,37 +468,58 @@ function selectRepresentingDataPoint(bestValue:number, data:HeatmapCaseDatum[],
     }
 }
 
-export function makeHeatmapTrackData<T extends IBaseHeatmapTrackDatum, K extends keyof T>(
+export function makeHeatmapTrackData<
+    T extends IBaseHeatmapTrackDatum,
+    K extends keyof T
+>(
     featureKey: K,
     featureId: T[K],
-    cases:Sample[]|Patient[],
-    data: {value: number, uniquePatientKey: string, uniqueSampleKey: string, thresholdType?: ">"|"<"}[],
+    cases: Sample[] | Patient[],
+    data: {
+        value: number;
+        uniquePatientKey: string;
+        uniqueSampleKey: string;
+        thresholdType?: '>' | '<';
+    }[],
     sortOrder?: string
 ): T[] {
     if (!cases.length) {
         return [];
     }
     const sampleData = isSampleList(cases);
-    let keyToData:{[uniqueKey:string]:{value: number}[]};
+    let keyToData: { [uniqueKey: string]: { value: number }[] };
     let ret: T[];
     if (isSampleList(cases)) {
-        keyToData = _.groupBy(data, d=>d.uniqueSampleKey);
-        ret = cases.map(c=>{
+        keyToData = _.groupBy(data, d => d.uniqueSampleKey);
+        ret = cases.map(c => {
             const trackDatum: Partial<T> = {};
             trackDatum.sample = c.sampleId;
             trackDatum.uid = c.uniqueSampleKey;
             const caseData = keyToData[c.uniqueSampleKey];
-            fillHeatmapTrackDatum(trackDatum, featureKey, featureId, c, caseData);
+            fillHeatmapTrackDatum(
+                trackDatum,
+                featureKey,
+                featureId,
+                c,
+                caseData
+            );
             return trackDatum as T;
         });
     } else {
-        keyToData = _.groupBy(data, d=>d.uniquePatientKey);
-        ret = cases.map(c=>{
+        keyToData = _.groupBy(data, d => d.uniquePatientKey);
+        ret = cases.map(c => {
             const trackDatum: Partial<T> = {};
             trackDatum.patient = c.patientId;
             trackDatum.uid = c.uniquePatientKey;
             const caseData = keyToData[c.uniquePatientKey];
-            fillHeatmapTrackDatum(trackDatum, featureKey, featureId, c, caseData, sortOrder);
+            fillHeatmapTrackDatum(
+                trackDatum,
+                featureKey,
+                featureId,
+                c,
+                caseData,
+                sortOrder
+            );
             return trackDatum as T;
         });
     }
@@ -387,20 +527,20 @@ export function makeHeatmapTrackData<T extends IBaseHeatmapTrackDatum, K extends
 }
 
 function fillNoDataValue(
-    trackDatum:Partial<ClinicalTrackDatum>,
-    attribute:ExtendedClinicalAttribute,
+    trackDatum: Partial<ClinicalTrackDatum>,
+    attribute: ExtendedClinicalAttribute
 ) {
-    if (attribute.clinicalAttributeId === "MUTATION_COUNT") {
+    if (attribute.clinicalAttributeId === 'MUTATION_COUNT') {
         trackDatum.attr_val = 0;
     } else {
         trackDatum.na = true;
     }
 }
 export function fillClinicalTrackDatum(
-    trackDatum:Partial<ClinicalTrackDatum>,
-    attribute:ExtendedClinicalAttribute,
-    case_:Sample|Patient,
-    data?:(ClinicalData|MutationSpectrum)[],
+    trackDatum: Partial<ClinicalTrackDatum>,
+    attribute: ExtendedClinicalAttribute,
+    case_: Sample | Patient,
+    data?: (ClinicalData | MutationSpectrum)[]
 ) {
     trackDatum.attr_id = attribute.clinicalAttributeId;
     trackDatum.study_id = case_.studyId;
@@ -409,10 +549,10 @@ export function fillClinicalTrackDatum(
     if (!data || !data.length) {
         fillNoDataValue(trackDatum, attribute);
     } else {
-        if (attribute.datatype.toLowerCase() === "number") {
+        if (attribute.datatype.toLowerCase() === 'number') {
             let values = [];
             for (const x of data) {
-                const newVal = parseFloat((x as ClinicalData).value+"");
+                const newVal = parseFloat((x as ClinicalData).value + '');
                 if (!isNaN(newVal)) {
                     values.push(newVal);
                 }
@@ -421,54 +561,64 @@ export function fillClinicalTrackDatum(
                 fillNoDataValue(trackDatum, attribute);
             } else {
                 switch (attribute.clinicalAttributeId) {
-                    case "MUTATION_COUNT":
+                    case 'MUTATION_COUNT':
                         // max
-                        trackDatum.attr_val = values.reduce((max, nextVal)=>Math.max(max, nextVal), Number.NEGATIVE_INFINITY);
+                        trackDatum.attr_val = values.reduce(
+                            (max, nextVal) => Math.max(max, nextVal),
+                            Number.NEGATIVE_INFINITY
+                        );
                         break;
                     default:
                         // average
-                        trackDatum.attr_val = values.reduce((sum, nextVal)=>sum+nextVal, 0) / values.length;
+                        trackDatum.attr_val =
+                            values.reduce((sum, nextVal) => sum + nextVal, 0) /
+                            values.length;
                         break;
                 }
                 trackDatum.attr_val_counts[trackDatum.attr_val!] = 1;
             }
-        } else if (attribute.datatype.toLowerCase() === "string") {
+        } else if (attribute.datatype.toLowerCase() === 'string') {
             const attr_val_counts = trackDatum.attr_val_counts;
-            for (const datum of (data as ClinicalData[])) {
-                attr_val_counts[datum.value] = attr_val_counts[datum.value] || 0;
+            for (const datum of data as ClinicalData[]) {
+                attr_val_counts[datum.value] =
+                    attr_val_counts[datum.value] || 0;
                 attr_val_counts[datum.value] += 1;
             }
             const attr_vals = Object.keys(attr_val_counts);
             if (attr_vals.length > 1) {
-                trackDatum.attr_val = "Mixed";
+                trackDatum.attr_val = 'Mixed';
             } else {
                 trackDatum.attr_val = attr_vals[0];
             }
-        } else if (attribute.clinicalAttributeId === SpecialAttribute.MutationSpectrum) {
+        } else if (
+            attribute.clinicalAttributeId === SpecialAttribute.MutationSpectrum
+        ) {
             const spectrumData = data as MutationSpectrum[];
             // add up vectors
             const attr_val_counts = trackDatum.attr_val_counts;
-            attr_val_counts["C>A"] = 0;
-            attr_val_counts["C>G"] = 0;
-            attr_val_counts["C>T"] = 0;
-            attr_val_counts["T>A"] = 0;
-            attr_val_counts["T>C"] = 0;
-            attr_val_counts["T>G"] = 0;
+            attr_val_counts['C>A'] = 0;
+            attr_val_counts['C>G'] = 0;
+            attr_val_counts['C>T'] = 0;
+            attr_val_counts['T>A'] = 0;
+            attr_val_counts['T>C'] = 0;
+            attr_val_counts['T>G'] = 0;
             for (const datum of spectrumData) {
-                attr_val_counts["C>A"] += datum.CtoA;
-                attr_val_counts["C>G"] += datum.CtoG;
-                attr_val_counts["C>T"] += datum.CtoT;
-                attr_val_counts["T>A"] += datum.TtoA;
-                attr_val_counts["T>C"] += datum.TtoC;
-                attr_val_counts["T>G"] += datum.TtoG;
+                attr_val_counts['C>A'] += datum.CtoA;
+                attr_val_counts['C>G'] += datum.CtoG;
+                attr_val_counts['C>T'] += datum.CtoT;
+                attr_val_counts['T>A'] += datum.TtoA;
+                attr_val_counts['T>C'] += datum.TtoC;
+                attr_val_counts['T>G'] += datum.TtoG;
             }
             // if all 0, then NA
-            if (attr_val_counts["C>A"] === 0 &&
-                attr_val_counts["C>G"] === 0 &&
-                attr_val_counts["C>T"] === 0 &&
-                attr_val_counts["T>A"] === 0 &&
-                attr_val_counts["T>C"] === 0 &&
-                attr_val_counts["T>G"] === 0) {
+            if (
+                attr_val_counts['C>A'] === 0 &&
+                attr_val_counts['C>G'] === 0 &&
+                attr_val_counts['C>T'] === 0 &&
+                attr_val_counts['T>A'] === 0 &&
+                attr_val_counts['T>C'] === 0 &&
+                attr_val_counts['T>G'] === 0
+            ) {
                 fillNoDataValue(trackDatum, attribute);
             }
             trackDatum.attr_val = trackDatum.attr_val_counts;
@@ -479,46 +629,57 @@ export function fillClinicalTrackDatum(
 
 function makeGetDataForCase(
     attribute: ClinicalAttribute,
-    queryBy:"sample"|"patient",
-    data: (ClinicalData|MutationSpectrum)[]
-):(case_:Sample|Patient)=>(ClinicalData|MutationSpectrum)[] {
+    queryBy: 'sample' | 'patient',
+    data: (ClinicalData | MutationSpectrum)[]
+): (case_: Sample | Patient) => (ClinicalData | MutationSpectrum)[] {
     if (attribute.patientAttribute) {
-        const uniqueKeyToData = _.groupBy(data, datum=>datum.uniquePatientKey);
-        return function(case_:Sample|Patient) {
+        const uniqueKeyToData = _.groupBy(
+            data,
+            datum => datum.uniquePatientKey
+        );
+        return function(case_: Sample | Patient) {
             return uniqueKeyToData[case_.uniquePatientKey];
         };
     } else {
-        const getKey = queryBy === "sample" ?
-            (x:{uniqueSampleKey:string, uniquePatientKey:string})=>x.uniqueSampleKey :
-            (x:{uniqueSampleKey:string, uniquePatientKey:string})=>x.uniquePatientKey;
-        const uniqueKeyToData:any = _.groupBy(data, getKey);
-        return function (case_:Sample|Patient) {
+        const getKey =
+            queryBy === 'sample'
+                ? (x: { uniqueSampleKey: string; uniquePatientKey: string }) =>
+                      x.uniqueSampleKey
+                : (x: { uniqueSampleKey: string; uniquePatientKey: string }) =>
+                      x.uniquePatientKey;
+        const uniqueKeyToData: any = _.groupBy(data, getKey);
+        return function(case_: Sample | Patient) {
             return uniqueKeyToData[getKey(case_)];
-        }
+        };
     }
 }
 
 export function makeClinicalTrackData(
-    attribute:ClinicalAttribute,
-    cases:Sample[]|Patient[],
-    data: (ClinicalData|MutationSpectrum)[],
-):ClinicalTrackDatum[] {
+    attribute: ClinicalAttribute,
+    cases: Sample[] | Patient[],
+    data: (ClinicalData | MutationSpectrum)[]
+): ClinicalTrackDatum[] {
     // First collect all the data by id
-    const uniqueKeyToData:{[uniqueKey:string]:(ClinicalData|MutationSpectrum)[]}
-        = _.groupBy(data,
-        isSampleList(cases) ?
-            datum=>datum.uniqueSampleKey :
-            datum=>datum.uniquePatientKey);
+    const uniqueKeyToData: {
+        [uniqueKey: string]: (ClinicalData | MutationSpectrum)[];
+    } = _.groupBy(
+        data,
+        isSampleList(cases)
+            ? datum => datum.uniqueSampleKey
+            : datum => datum.uniquePatientKey
+    );
 
     // Create oncoprint data
     const getDataForCase = makeGetDataForCase(
-        attribute, ((isSampleList(cases)) ? "sample" : "patient"), data
+        attribute,
+        isSampleList(cases) ? 'sample' : 'patient',
+        data
     );
 
-    let ret:ClinicalTrackDatum[];
+    let ret: ClinicalTrackDatum[];
     if (isSampleList(cases)) {
-        ret = cases.map(sample=>{
-            const trackDatum:Partial<ClinicalTrackDatum> = {};
+        ret = cases.map(sample => {
+            const trackDatum: Partial<ClinicalTrackDatum> = {};
             trackDatum.uid = sample.uniqueSampleKey;
             trackDatum.sample = sample.sampleId;
             fillClinicalTrackDatum(
@@ -530,8 +691,8 @@ export function makeClinicalTrackData(
             return trackDatum as ClinicalTrackDatum;
         });
     } else {
-        ret = cases.map(patient=>{
-            const trackDatum:Partial<ClinicalTrackDatum> = {};
+        ret = cases.map(patient => {
+            const trackDatum: Partial<ClinicalTrackDatum> = {};
             trackDatum.uid = patient.uniquePatientKey;
             trackDatum.patient = patient.patientId;
             fillClinicalTrackDatum(
diff --git a/src/shared/components/oncoprint/DeltaUtils.spec.ts b/src/shared/components/oncoprint/DeltaUtils.spec.ts
index 56c67b3f685..b1598b0f285 100644
--- a/src/shared/components/oncoprint/DeltaUtils.spec.ts
+++ b/src/shared/components/oncoprint/DeltaUtils.spec.ts
@@ -1,50 +1,93 @@
-import {assert} from "chai";
+import { assert } from 'chai';
 import {
-    heatmapClusterValueFn, numTracksWhoseDataChanged, transitionSortConfig,
+    heatmapClusterValueFn,
+    numTracksWhoseDataChanged,
+    transitionSortConfig,
     transition,
     transitionTrackGroupSortPriority,
-    transitionHeatmapTrack
-} from "./DeltaUtils";
+    transitionHeatmapTrack,
+} from './DeltaUtils';
 
-import {spy, SinonStub, match, createStubInstance} from 'sinon';
+import { spy, SinonStub, match, createStubInstance } from 'sinon';
 
-import OncoprintJS from "oncoprintjs";
-import { MolecularProfile, CancerStudy } from 'shared/api/generated/CBioPortalAPI';
+import OncoprintJS from 'oncoprintjs';
+import {
+    MolecularProfile,
+    CancerStudy,
+} from 'shared/api/generated/CBioPortalAPI';
 import {
     CLINICAL_TRACK_GROUP_INDEX,
     GENETIC_TRACK_GROUP_INDEX,
     IHeatmapTrackSpec,
-    IOncoprintProps
-} from "./Oncoprint";
+    IOncoprintProps,
+} from './Oncoprint';
 
-describe("Oncoprint DeltaUtils", ()=>{
-    describe("numTracksWhoseDataChanged", ()=>{
-        it("should return 0 for empty inputs", ()=>{
+describe('Oncoprint DeltaUtils', () => {
+    describe('numTracksWhoseDataChanged', () => {
+        it('should return 0 for empty inputs', () => {
             assert.equal(numTracksWhoseDataChanged([], []), 0);
         });
-        it("should return 2 for one empty input and one with two (both added/deleted)", ()=>{
-            assert.equal(numTracksWhoseDataChanged([{key:"a", data:[]},{key:"b", data:[]}], []), 2, "tracks added");
-            assert.equal(numTracksWhoseDataChanged([], [{key:"a", data:[]},{key:"b", data:[]}]), 2, "tracks deleted");
-        });
-        it("should return 3 for one track deleted, one track added, one track changed", ()=>{
-            let state1 = [{key:"a", data:[]}, {key:"b", data:[]}];
-            let state2 = [{key:"b", data:[1]}, {key:"c", data:[]}];
-            assert.equal(numTracksWhoseDataChanged(state1, state2), 3, "test one direction");
-            assert.equal(numTracksWhoseDataChanged(state2, state1), 3, "test other direction");
-        });
-        it("should return X for X tracks changed", ()=>{
-            let state1 = [{key:"a", data:[1]}, {key:"b", data:[3,4]}, {key:"c", data:[6,1]}, {key:"d",data:[10]}];
-            let state2 = [{key:"a", data:[]}, {key:"b", data:[33,3,4]}, {key:"c", data:[10,20]}, {key:"d",data:[-6,-3,1,0]}];
-            for (let i=0; i<state1.length; i++) {
-                assert.equal(numTracksWhoseDataChanged(state1.slice(i), state2.slice(i)), state1.length - i);
-                assert.equal(numTracksWhoseDataChanged(state2.slice(i), state1.slice(i)), state1.length - i);
+        it('should return 2 for one empty input and one with two (both added/deleted)', () => {
+            assert.equal(
+                numTracksWhoseDataChanged(
+                    [{ key: 'a', data: [] }, { key: 'b', data: [] }],
+                    []
+                ),
+                2,
+                'tracks added'
+            );
+            assert.equal(
+                numTracksWhoseDataChanged(
+                    [],
+                    [{ key: 'a', data: [] }, { key: 'b', data: [] }]
+                ),
+                2,
+                'tracks deleted'
+            );
+        });
+        it('should return 3 for one track deleted, one track added, one track changed', () => {
+            let state1 = [{ key: 'a', data: [] }, { key: 'b', data: [] }];
+            let state2 = [{ key: 'b', data: [1] }, { key: 'c', data: [] }];
+            assert.equal(
+                numTracksWhoseDataChanged(state1, state2),
+                3,
+                'test one direction'
+            );
+            assert.equal(
+                numTracksWhoseDataChanged(state2, state1),
+                3,
+                'test other direction'
+            );
+        });
+        it('should return X for X tracks changed', () => {
+            let state1 = [
+                { key: 'a', data: [1] },
+                { key: 'b', data: [3, 4] },
+                { key: 'c', data: [6, 1] },
+                { key: 'd', data: [10] },
+            ];
+            let state2 = [
+                { key: 'a', data: [] },
+                { key: 'b', data: [33, 3, 4] },
+                { key: 'c', data: [10, 20] },
+                { key: 'd', data: [-6, -3, 1, 0] },
+            ];
+            for (let i = 0; i < state1.length; i++) {
+                assert.equal(
+                    numTracksWhoseDataChanged(state1.slice(i), state2.slice(i)),
+                    state1.length - i
+                );
+                assert.equal(
+                    numTracksWhoseDataChanged(state2.slice(i), state1.slice(i)),
+                    state1.length - i
+                );
             }
         });
     });
 
-    describe("transition", () => {
+    describe('transition', () => {
         const makeMinimalOncoprintProps = (): IOncoprintProps => ({
-            caseLinkOutInTooltips:false,
+            caseLinkOutInTooltips: false,
             clinicalTracks: [],
             geneticTracks: [],
             genesetHeatmapTracks: [],
@@ -54,19 +97,21 @@ describe("Oncoprint DeltaUtils", ()=>{
         });
         const makeMinimalProfileMap = () => undefined;
 
-        it("renders an expandable genetic track if an expansion callback is provided for it", () => {
+        it('renders an expandable genetic track if an expansion callback is provided for it', () => {
             // given a genetic track specification with an expandCallback
             const expansionCallback = spy();
             const newProps: IOncoprintProps = {
                 ...makeMinimalOncoprintProps(),
-                geneticTracks: [{
-                    key: 'GENETICTRACK_1',
-                    label: 'GENE1 / GENE2',
-                    oql: '[GENE1: AMP; GENE2: AMP;]',
-                    info: '10%',
-                    data: [],
-                    expansionCallback: expansionCallback
-                }]
+                geneticTracks: [
+                    {
+                        key: 'GENETICTRACK_1',
+                        label: 'GENE1 / GENE2',
+                        oql: '[GENE1: AMP; GENE2: AMP;]',
+                        info: '10%',
+                        data: [],
+                        expansionCallback: expansionCallback,
+                    },
+                ],
             };
             const oncoprint: OncoprintJS = createStubInstance(OncoprintJS);
             (oncoprint.addTracks as SinonStub).returns([1]);
@@ -82,20 +127,22 @@ describe("Oncoprint DeltaUtils", ()=>{
             // then it adds a track with an expandCallback track property that
             // calls the provided function
             assert.isTrue((oncoprint.addTracks as SinonStub).called);
-            (oncoprint.addTracks as SinonStub).args.forEach(([trackParamArray]) => {
-                trackParamArray.forEach((trackParams: any) => {
-                    if (trackParams.expandCallback !== undefined) {
-                        trackParams.expandCallback();
-                    }
-                });
-            });
+            (oncoprint.addTracks as SinonStub).args.forEach(
+                ([trackParamArray]) => {
+                    trackParamArray.forEach((trackParams: any) => {
+                        if (trackParams.expandCallback !== undefined) {
+                            trackParams.expandCallback();
+                        }
+                    });
+                }
+            );
             assert.isTrue(
                 expansionCallback.called,
                 'calling the expand callbacks of added tracks should invoke the one provided'
             );
         });
 
-        it("renders expansion tracks if they are added to an existing genetic track", () => {
+        it('renders expansion tracks if they are added to an existing genetic track', () => {
             // given a genetic track specification with three expansion tracks
             const expandableTrack = {
                 key: 'GENETICTRACK_0',
@@ -106,22 +153,42 @@ describe("Oncoprint DeltaUtils", ()=>{
             };
             const oldProps: IOncoprintProps = {
                 ...makeMinimalOncoprintProps(),
-                geneticTracks: [expandableTrack]
+                geneticTracks: [expandableTrack],
             };
             const newProps: IOncoprintProps = {
                 ...makeMinimalOncoprintProps(),
-                geneticTracks: [{
-                    ...expandableTrack,
-                    expansionTrackList: [
-                        {key: 'GENETICTRACK_0_EXPANSION_0', label: 'GENE5', oql: 'GENE5: HOMDEL', info: '30%', data: []},
-                        {key: 'GENETICTRACK_0_EXPANSION_1', label: 'GENE7', oql: 'GENE7: AMP HOMDEL', info: '40%', data: []},
-                        {key: 'GENETICTRACK_0_EXPANSION_2', label: 'GENE1', oql: 'GENE1: HOMDEL', info: '10%', data: []}
-                    ]
-                }]
+                geneticTracks: [
+                    {
+                        ...expandableTrack,
+                        expansionTrackList: [
+                            {
+                                key: 'GENETICTRACK_0_EXPANSION_0',
+                                label: 'GENE5',
+                                oql: 'GENE5: HOMDEL',
+                                info: '30%',
+                                data: [],
+                            },
+                            {
+                                key: 'GENETICTRACK_0_EXPANSION_1',
+                                label: 'GENE7',
+                                oql: 'GENE7: AMP HOMDEL',
+                                info: '40%',
+                                data: [],
+                            },
+                            {
+                                key: 'GENETICTRACK_0_EXPANSION_2',
+                                label: 'GENE1',
+                                oql: 'GENE1: HOMDEL',
+                                info: '10%',
+                                data: [],
+                            },
+                        ],
+                    },
+                ],
             };
             const oncoprint: OncoprintJS = createStubInstance(OncoprintJS);
             (oncoprint.addTracks as SinonStub).returns([1]);
-            const trackIdsByKey = {'GENETICTRACK_0': 5};
+            const trackIdsByKey = { GENETICTRACK_0: 5 };
             // when instructed to render the track from scratch
             transition(
                 newProps,
@@ -137,42 +204,50 @@ describe("Oncoprint DeltaUtils", ()=>{
                 'Adding three expansion tracks should involve adding three tracks'
             );
             assert.isTrue(
-                (oncoprint.addTracks as SinonStub).alwaysCalledWith(
-                    [match.has('expansion_of', trackIdsByKey['GENETICTRACK_0'])]
-                ),
+                (oncoprint.addTracks as SinonStub).alwaysCalledWith([
+                    match.has('expansion_of', trackIdsByKey['GENETICTRACK_0']),
+                ]),
                 'Expansion tracks should be marked as expansions of their parent'
             );
             assert.isTrue(
-                (oncoprint.addTracks as SinonStub).calledWith(
-                    [match({label: 'GENE7', track_info: '40%'})]
-                ),
+                (oncoprint.addTracks as SinonStub).calledWith([
+                    match({ label: 'GENE7', track_info: '40%' }),
+                ]),
                 'The expansion tracks added should correspond to those requested'
             );
         });
 
-        it("disables further expansion if expansions are added to a genetic track", () => {
+        it('disables further expansion if expansions are added to a genetic track', () => {
             // given
             const expandableTrack = {
                 key: 'GENETICTRACK_0',
                 label: 'MY_EXPANDABLE_TRACK',
                 oql: '["MY_EXPANDABLE_TRACK" GENE3;]',
                 info: '0%',
-                data: []
+                data: [],
             };
             const oldProps: IOncoprintProps = {
                 ...makeMinimalOncoprintProps(),
-                geneticTracks: [expandableTrack]
+                geneticTracks: [expandableTrack],
             };
             const newProps: IOncoprintProps = {
                 ...makeMinimalOncoprintProps(),
-                geneticTracks: [{
-                    ...expandableTrack,
-                    expansionTrackList: [
-                        {key: 'GENETICTRACK_0_EXPANSION_0', label: 'GENE3', oql: 'GENE3;', info: '0%', data: []}
-                    ]
-                }]
+                geneticTracks: [
+                    {
+                        ...expandableTrack,
+                        expansionTrackList: [
+                            {
+                                key: 'GENETICTRACK_0_EXPANSION_0',
+                                label: 'GENE3',
+                                oql: 'GENE3;',
+                                info: '0%',
+                                data: [],
+                            },
+                        ],
+                    },
+                ],
             };
-            const trackIdsByKey = {'GENETICTRACK_0': 8};
+            const trackIdsByKey = { GENETICTRACK_0: 8 };
             const oncoprint = createStubInstance(OncoprintJS);
             (oncoprint.addTracks as SinonStub).returns([1]);
             // when
@@ -184,10 +259,12 @@ describe("Oncoprint DeltaUtils", ()=>{
                 () => makeMinimalProfileMap()
             );
             // then
-            assert.isTrue((oncoprint.disableTrackExpansion as SinonStub).calledWith(8));
+            assert.isTrue(
+                (oncoprint.disableTrackExpansion as SinonStub).calledWith(8)
+            );
         });
 
-        it("re-enables expansion if an expandable genetic track no longer has expansions", () => {
+        it('re-enables expansion if an expandable genetic track no longer has expansions', () => {
             // given
             const expandableTrack = {
                 key: 'GENETICTRACK_0',
@@ -195,23 +272,39 @@ describe("Oncoprint DeltaUtils", ()=>{
                 oql: '[GENE3; GENE4]',
                 info: '0%',
                 data: [],
-                expansionCallback: () => { /* do nothing */ }
+                expansionCallback: () => {
+                    /* do nothing */
+                },
             };
             const oldProps: IOncoprintProps = {
                 ...makeMinimalOncoprintProps(),
-                geneticTracks: [{
-                    ...expandableTrack,
-                    expansionTrackList: [
-                        {key: 'GENETICTRACK_0_EXPANSION_0', label: 'GENE3', oql: 'GENE3;', info: '0%', data: []},
-                        {key: 'GENETICTRACK_0_EXPANSION_1', label: 'GENE4', oql: 'GENE4;', info: '0%', data: []}
-                    ]
-                }]
+                geneticTracks: [
+                    {
+                        ...expandableTrack,
+                        expansionTrackList: [
+                            {
+                                key: 'GENETICTRACK_0_EXPANSION_0',
+                                label: 'GENE3',
+                                oql: 'GENE3;',
+                                info: '0%',
+                                data: [],
+                            },
+                            {
+                                key: 'GENETICTRACK_0_EXPANSION_1',
+                                label: 'GENE4',
+                                oql: 'GENE4;',
+                                info: '0%',
+                                data: [],
+                            },
+                        ],
+                    },
+                ],
             };
             const newProps: IOncoprintProps = {
                 ...makeMinimalOncoprintProps(),
-                geneticTracks: [expandableTrack]
+                geneticTracks: [expandableTrack],
             };
-            const trackIdsByKey = {'GENETICTRACK_0': 2};
+            const trackIdsByKey = { GENETICTRACK_0: 2 };
             const oncoprint = createStubInstance(OncoprintJS);
             (oncoprint.addTracks as SinonStub).returns([1]);
             // when
@@ -223,10 +316,12 @@ describe("Oncoprint DeltaUtils", ()=>{
                 () => makeMinimalProfileMap()
             );
             // then
-            assert.isTrue((oncoprint.enableTrackExpansion as SinonStub).calledWith(2));
+            assert.isTrue(
+                (oncoprint.enableTrackExpansion as SinonStub).calledWith(2)
+            );
         });
 
-        it("supplies genetic expansions with callbacks that update track IDs when collapsing", () => {
+        it('supplies genetic expansions with callbacks that update track IDs when collapsing', () => {
             // given a track being expanded
             const expandableTrack = {
                 key: 'GENETICTRACK_0',
@@ -237,22 +332,36 @@ describe("Oncoprint DeltaUtils", ()=>{
             };
             const preExpandProps: IOncoprintProps = {
                 ...makeMinimalOncoprintProps(),
-                geneticTracks: [expandableTrack]
+                geneticTracks: [expandableTrack],
             };
             const postExpandProps: IOncoprintProps = {
                 ...makeMinimalOncoprintProps(),
-                geneticTracks: [{
-                    ...expandableTrack,
-                    expansionTrackList: [
-                        {key: 'GENETICTRACK_0_EXPANSION_0', label: 'GENE1', oql: 'GENE5: MUT', info: '0%', data: []},
-                        {key: 'GENETICTRACK_0_EXPANSION_1', label: 'GENE2', oql: 'GENE7: MUT', info: '6.28%', data: []},
-                    ]
-                }]
+                geneticTracks: [
+                    {
+                        ...expandableTrack,
+                        expansionTrackList: [
+                            {
+                                key: 'GENETICTRACK_0_EXPANSION_0',
+                                label: 'GENE1',
+                                oql: 'GENE5: MUT',
+                                info: '0%',
+                                data: [],
+                            },
+                            {
+                                key: 'GENETICTRACK_0_EXPANSION_1',
+                                label: 'GENE2',
+                                oql: 'GENE7: MUT',
+                                info: '6.28%',
+                                data: [],
+                            },
+                        ],
+                    },
+                ],
             };
             const oncoprint: OncoprintJS = createStubInstance(OncoprintJS);
             (oncoprint.addTracks as SinonStub).returns([27]);
-            const trackIdsByKey: {[trackKey: string]: number} = {
-                'GENETICTRACK_0': 5
+            const trackIdsByKey: { [trackKey: string]: number } = {
+                GENETICTRACK_0: 5,
             };
             // when rendering this transition
             transition(
@@ -267,35 +376,39 @@ describe("Oncoprint DeltaUtils", ()=>{
             assert.deepEqual(
                 trackIdsByKey,
                 {
-                    'GENETICTRACK_0': 5,
-                    'GENETICTRACK_0_EXPANSION_0': 27,
-                    'GENETICTRACK_0_EXPANSION_1': 27
+                    GENETICTRACK_0: 5,
+                    GENETICTRACK_0_EXPANSION_0: 27,
+                    GENETICTRACK_0_EXPANSION_1: 27,
                 },
                 "expansion tracks should have been listed before they're removed"
             );
             (oncoprint.addTracks as SinonStub).args.forEach(
                 // call the removeCallback with the track ID
-                ([[trackParams]]) => { trackParams.removeCallback(27); }
+                ([[trackParams]]) => {
+                    trackParams.removeCallback(27);
+                }
             );
             assert.deepEqual(
                 trackIdsByKey,
-                {'GENETICTRACK_0': 5},
+                { GENETICTRACK_0: 5 },
                 'expansion tracks should have disappeared from the list after removal'
             );
         });
 
-        it("renders a genetic track with a coloured label if so requested", () => {
+        it('renders a genetic track with a coloured label if so requested', () => {
             // given a genetic track specification with a label color
             const newProps: IOncoprintProps = {
                 ...makeMinimalOncoprintProps(),
-                geneticTracks: [{
-                    key: 'GENETICTRACK_14',
-                    label: 'GENE7',
-                    oql: 'GENE7: A316M;',
-                    info: '0%',
-                    data: [],
-                    labelColor: 'fuchsia'
-                }]
+                geneticTracks: [
+                    {
+                        key: 'GENETICTRACK_14',
+                        label: 'GENE7',
+                        oql: 'GENE7: A316M;',
+                        info: '0%',
+                        data: [],
+                        labelColor: 'fuchsia',
+                    },
+                ],
             };
             const oncoprint: OncoprintJS = createStubInstance(OncoprintJS);
             (oncoprint.addTracks as SinonStub).returns([1]);
@@ -310,27 +423,31 @@ describe("Oncoprint DeltaUtils", ()=>{
             );
             // then it adds a track with the specified track label color
             assert.isTrue(
-                (oncoprint.addTracks as SinonStub).calledWith(
-                    [match.has('track_label_color', 'fuchsia')]
-                )
+                (oncoprint.addTracks as SinonStub).calledWith([
+                    match.has('track_label_color', 'fuchsia'),
+                ])
             );
         });
 
-        it("renders a heatmap track with a coloured label if so requested", () => {
+        it('renders a heatmap track with a coloured label if so requested', () => {
             // given a single-gene heatmap track specification with a label color
             const newProps: IOncoprintProps = {
                 ...makeMinimalOncoprintProps(),
-                heatmapTracks: [{
-                    key: '"HEATMAPTRACK_mystudy_Zscores,GENE25"',
-                    label: '  GENE25',
-                    data: [],
-                    molecularProfileId: 'mystudy_Zscores',
-                    molecularAlterationType: 'MRNA_EXPRESSION',
-                    datatype: 'Z-SCORE',
-                    onRemove: () => { /* update external state */ },
-                    trackGroupIndex: 3,
-                    labelColor: 'olive'
-                }]
+                heatmapTracks: [
+                    {
+                        key: '"HEATMAPTRACK_mystudy_Zscores,GENE25"',
+                        label: '  GENE25',
+                        data: [],
+                        molecularProfileId: 'mystudy_Zscores',
+                        molecularAlterationType: 'MRNA_EXPRESSION',
+                        datatype: 'Z-SCORE',
+                        onRemove: () => {
+                            /* update external state */
+                        },
+                        trackGroupIndex: 3,
+                        labelColor: 'olive',
+                    },
+                ],
             };
             const oncoprint: OncoprintJS = createStubInstance(OncoprintJS);
             (oncoprint.addTracks as SinonStub).returns([1]);
@@ -345,344 +462,640 @@ describe("Oncoprint DeltaUtils", ()=>{
             );
             // then it adds a track with the specified track label color
             assert.isTrue(
-                (oncoprint.addTracks as SinonStub).calledWith(
-                    [match.has('track_label_color', 'olive')]
-                )
+                (oncoprint.addTracks as SinonStub).calledWith([
+                    match.has('track_label_color', 'olive'),
+                ])
             );
         });
     });
 
-    describe("transitionTrackGroupSortPriority", ()=>{
-        let oncoprint:any;
-        beforeEach(()=>{
-            oncoprint = {setTrackGroupSortPriority: spy()};
-        });
-        it("should not do anything if the heatmap tracks are both empty", ()=>{
-           transitionTrackGroupSortPriority(
-               {heatmapTracks:[], genesetHeatmapTracks:[]},
-               {heatmapTracks:[], genesetHeatmapTracks:[]},
-               oncoprint
-           );
-           assert.equal(oncoprint.setTrackGroupSortPriority.callCount, 0);
-        });
-        it("should not do anything on initialisation if no heatmap tracks are added", ()=>{
-           transitionTrackGroupSortPriority(
-               {heatmapTracks:[], genesetHeatmapTracks:[]},
-               {},
-               oncoprint
-           );
-           assert.equal(oncoprint.setTrackGroupSortPriority.callCount, 0);
-        });
-        it("should not do anything if the heatmap tracks are the same", ()=>{
+    describe('transitionTrackGroupSortPriority', () => {
+        let oncoprint: any;
+        beforeEach(() => {
+            oncoprint = { setTrackGroupSortPriority: spy() };
+        });
+        it('should not do anything if the heatmap tracks are both empty', () => {
             transitionTrackGroupSortPriority(
-                {heatmapTracks:[{trackGroupIndex: 2}, {trackGroupIndex: 3}], genesetHeatmapTracks: []},
-                {heatmapTracks:[{trackGroupIndex: 2}, {trackGroupIndex: 3}], genesetHeatmapTracks: []},
+                { heatmapTracks: [], genesetHeatmapTracks: [] },
+                { heatmapTracks: [], genesetHeatmapTracks: [] },
                 oncoprint
             );
             assert.equal(oncoprint.setTrackGroupSortPriority.callCount, 0);
         });
-        it("should not do anything if the gene set heatmap tracks are the same", ()=>{
+        it('should not do anything on initialisation if no heatmap tracks are added', () => {
             transitionTrackGroupSortPriority(
-                {heatmapTracks:[], genesetHeatmapTracks: [{trackGroupIndex: 2}]},
-                {heatmapTracks:[], genesetHeatmapTracks: [{trackGroupIndex: 2}]},
+                { heatmapTracks: [], genesetHeatmapTracks: [] },
+                {},
+                oncoprint
+            );
+            assert.equal(oncoprint.setTrackGroupSortPriority.callCount, 0);
+        });
+        it('should not do anything if the heatmap tracks are the same', () => {
+            transitionTrackGroupSortPriority(
+                {
+                    heatmapTracks: [
+                        { trackGroupIndex: 2 },
+                        { trackGroupIndex: 3 },
+                    ],
+                    genesetHeatmapTracks: [],
+                },
+                {
+                    heatmapTracks: [
+                        { trackGroupIndex: 2 },
+                        { trackGroupIndex: 3 },
+                    ],
+                    genesetHeatmapTracks: [],
+                },
                 oncoprint
             );
             assert.equal(oncoprint.setTrackGroupSortPriority.callCount, 0);
         });
-        it("should not do anything if the heatmap tracks are different but same groups", ()=>{
+        it('should not do anything if the gene set heatmap tracks are the same', () => {
             transitionTrackGroupSortPriority(
-                {heatmapTracks:[{trackGroupIndex: 2}, {trackGroupIndex: 3}, {trackGroupIndex: 3}, {trackGroupIndex: 3}], genesetHeatmapTracks: []},
-                {heatmapTracks:[{trackGroupIndex: 2}, {trackGroupIndex: 2}, {trackGroupIndex: 2}, {trackGroupIndex: 3}], genesetHeatmapTracks: []},
+                {
+                    heatmapTracks: [],
+                    genesetHeatmapTracks: [{ trackGroupIndex: 2 }],
+                },
+                {
+                    heatmapTracks: [],
+                    genesetHeatmapTracks: [{ trackGroupIndex: 2 }],
+                },
                 oncoprint
             );
             assert.equal(oncoprint.setTrackGroupSortPriority.callCount, 0);
         });
-        it("should set the track group sort priority if the heatmap track groups have changed and no gene set heatmap is present", ()=>{
+        it('should not do anything if the heatmap tracks are different but same groups', () => {
             transitionTrackGroupSortPriority(
-                {heatmapTracks:[{trackGroupIndex: 2}, {trackGroupIndex: 4}, {trackGroupIndex: 2}, {trackGroupIndex: 3}], genesetHeatmapTracks: []},
-                {heatmapTracks:[{trackGroupIndex: 2}, {trackGroupIndex: 3}, {trackGroupIndex: 3}, {trackGroupIndex: 3}], genesetHeatmapTracks: []},
+                {
+                    heatmapTracks: [
+                        { trackGroupIndex: 2 },
+                        { trackGroupIndex: 3 },
+                        { trackGroupIndex: 3 },
+                        { trackGroupIndex: 3 },
+                    ],
+                    genesetHeatmapTracks: [],
+                },
+                {
+                    heatmapTracks: [
+                        { trackGroupIndex: 2 },
+                        { trackGroupIndex: 2 },
+                        { trackGroupIndex: 2 },
+                        { trackGroupIndex: 3 },
+                    ],
+                    genesetHeatmapTracks: [],
+                },
                 oncoprint
             );
-            assert.equal(oncoprint.setTrackGroupSortPriority.callCount, 1, "called once");
+            assert.equal(oncoprint.setTrackGroupSortPriority.callCount, 0);
+        });
+        it('should set the track group sort priority if the heatmap track groups have changed and no gene set heatmap is present', () => {
+            transitionTrackGroupSortPriority(
+                {
+                    heatmapTracks: [
+                        { trackGroupIndex: 2 },
+                        { trackGroupIndex: 4 },
+                        { trackGroupIndex: 2 },
+                        { trackGroupIndex: 3 },
+                    ],
+                    genesetHeatmapTracks: [],
+                },
+                {
+                    heatmapTracks: [
+                        { trackGroupIndex: 2 },
+                        { trackGroupIndex: 3 },
+                        { trackGroupIndex: 3 },
+                        { trackGroupIndex: 3 },
+                    ],
+                    genesetHeatmapTracks: [],
+                },
+                oncoprint
+            );
+            assert.equal(
+                oncoprint.setTrackGroupSortPriority.callCount,
+                1,
+                'called once'
+            );
             assert.deepEqual(
                 oncoprint.setTrackGroupSortPriority.args[0][0],
-                [CLINICAL_TRACK_GROUP_INDEX, 2, 3, 4, GENETIC_TRACK_GROUP_INDEX],
-                "right priority order"
+                [
+                    CLINICAL_TRACK_GROUP_INDEX,
+                    2,
+                    3,
+                    4,
+                    GENETIC_TRACK_GROUP_INDEX,
+                ],
+                'right priority order'
             );
         });
-        it("should set the track group sort priority including gene set heatmaps if heatmap track groups have changed", ()=>{
+        it('should set the track group sort priority including gene set heatmaps if heatmap track groups have changed', () => {
             transitionTrackGroupSortPriority(
                 {
-                    heatmapTracks: [{trackGroupIndex: 2}, {trackGroupIndex: 4}, {trackGroupIndex: 2}, {trackGroupIndex: 3}],
-                    genesetHeatmapTracks: [{trackGroupIndex: 5}]
+                    heatmapTracks: [
+                        { trackGroupIndex: 2 },
+                        { trackGroupIndex: 4 },
+                        { trackGroupIndex: 2 },
+                        { trackGroupIndex: 3 },
+                    ],
+                    genesetHeatmapTracks: [{ trackGroupIndex: 5 }],
                 },
                 {
-                    heatmapTracks:[{trackGroupIndex: 2}, {trackGroupIndex: 3}, {trackGroupIndex: 3}, {trackGroupIndex: 3}],
-                    genesetHeatmapTracks: [{trackGroupIndex: 4}]
+                    heatmapTracks: [
+                        { trackGroupIndex: 2 },
+                        { trackGroupIndex: 3 },
+                        { trackGroupIndex: 3 },
+                        { trackGroupIndex: 3 },
+                    ],
+                    genesetHeatmapTracks: [{ trackGroupIndex: 4 }],
                 },
                 oncoprint
             );
-            assert.equal(oncoprint.setTrackGroupSortPriority.callCount, 1, "called once");
+            assert.equal(
+                oncoprint.setTrackGroupSortPriority.callCount,
+                1,
+                'called once'
+            );
             assert.deepEqual(
                 oncoprint.setTrackGroupSortPriority.args[0][0],
-                [CLINICAL_TRACK_GROUP_INDEX, 2, 3, 4, 5, GENETIC_TRACK_GROUP_INDEX],
-                "right priority order"
+                [
+                    CLINICAL_TRACK_GROUP_INDEX,
+                    2,
+                    3,
+                    4,
+                    5,
+                    GENETIC_TRACK_GROUP_INDEX,
+                ],
+                'right priority order'
             );
         });
-        it("should set the track group sort priority on initialisation if only a gene set heatmap is present", ()=>{
+        it('should set the track group sort priority on initialisation if only a gene set heatmap is present', () => {
             transitionTrackGroupSortPriority(
-                {heatmapTracks:[], genesetHeatmapTracks: [{trackGroupIndex: 2}, {trackGroupIndex: 2}]},
+                {
+                    heatmapTracks: [],
+                    genesetHeatmapTracks: [
+                        { trackGroupIndex: 2 },
+                        { trackGroupIndex: 2 },
+                    ],
+                },
                 {},
                 oncoprint
             );
-            assert.equal(oncoprint.setTrackGroupSortPriority.callCount, 1, "called once");
+            assert.equal(
+                oncoprint.setTrackGroupSortPriority.callCount,
+                1,
+                'called once'
+            );
             assert.deepEqual(
                 oncoprint.setTrackGroupSortPriority.args[0][0],
                 [CLINICAL_TRACK_GROUP_INDEX, 2, GENETIC_TRACK_GROUP_INDEX],
-                "right priority order"
+                'right priority order'
             );
         });
     });
 
-    describe("transitionSortConfig", ()=>{
-        let oncoprint:any;
-        beforeEach(()=>{
-            oncoprint = { setSortConfig:spy(()=>{}) };
+    describe('transitionSortConfig', () => {
+        let oncoprint: any;
+        beforeEach(() => {
+            oncoprint = { setSortConfig: spy(() => {}) };
         });
-        it("should not do anything if no sortConfig specified", ()=>{
+        it('should not do anything if no sortConfig specified', () => {
             transitionSortConfig({}, {}, oncoprint);
             assert.equal(oncoprint.setSortConfig.callCount, 0);
         });
-        it("should not do anything if the given sort configs have no order or cluster heatmap group specified, regardless of changes", ()=>{
-            transitionSortConfig({sortConfig:{}}, {sortConfig:{}}, oncoprint);
-            transitionSortConfig({sortConfig:{sortByMutationType:true}}, {sortConfig:{sortByMutationType:false}}, oncoprint);
-            transitionSortConfig({sortConfig:{sortByMutationType:true}}, {sortConfig:{sortByMutationType:true}}, oncoprint);
-            transitionSortConfig({sortConfig:{sortByDrivers:true}}, {sortConfig:{sortByMutationType:false, sortByDrivers: false}}, oncoprint);
-            transitionSortConfig({sortConfig:{}}, {sortConfig:{sortByMutationType:false}}, oncoprint);
-            transitionSortConfig({}, {sortConfig:{sortByMutationType:false}}, oncoprint);
-            transitionSortConfig({sortConfig:{sortByMutationType:false}}, {}, oncoprint);
+        it('should not do anything if the given sort configs have no order or cluster heatmap group specified, regardless of changes', () => {
+            transitionSortConfig(
+                { sortConfig: {} },
+                { sortConfig: {} },
+                oncoprint
+            );
+            transitionSortConfig(
+                { sortConfig: { sortByMutationType: true } },
+                { sortConfig: { sortByMutationType: false } },
+                oncoprint
+            );
+            transitionSortConfig(
+                { sortConfig: { sortByMutationType: true } },
+                { sortConfig: { sortByMutationType: true } },
+                oncoprint
+            );
+            transitionSortConfig(
+                { sortConfig: { sortByDrivers: true } },
+                {
+                    sortConfig: {
+                        sortByMutationType: false,
+                        sortByDrivers: false,
+                    },
+                },
+                oncoprint
+            );
+            transitionSortConfig(
+                { sortConfig: {} },
+                { sortConfig: { sortByMutationType: false } },
+                oncoprint
+            );
+            transitionSortConfig(
+                {},
+                { sortConfig: { sortByMutationType: false } },
+                oncoprint
+            );
+            transitionSortConfig(
+                { sortConfig: { sortByMutationType: false } },
+                {},
+                oncoprint
+            );
             assert.equal(oncoprint.setSortConfig.callCount, 0);
         });
-        it("should set the config to new order if order is specified, no sort config specified before", ()=>{
-            transitionSortConfig({sortConfig:{order:["5","3","2"]}},{}, oncoprint);
-            assert.equal(oncoprint.setSortConfig.callCount, 1, "called once");
-            assert.deepEqual(oncoprint.setSortConfig.args[0][0], {type:"order", order:["5","3","2"]}, "correct sort config used");
+        it('should set the config to new order if order is specified, no sort config specified before', () => {
+            transitionSortConfig(
+                { sortConfig: { order: ['5', '3', '2'] } },
+                {},
+                oncoprint
+            );
+            assert.equal(oncoprint.setSortConfig.callCount, 1, 'called once');
+            assert.deepEqual(
+                oncoprint.setSortConfig.args[0][0],
+                { type: 'order', order: ['5', '3', '2'] },
+                'correct sort config used'
+            );
         });
-        it("should set the config to new order if order is specified, no order specified before", ()=>{
-            transitionSortConfig({sortConfig:{order:["5","3","2"]}},{sortConfig:{}}, oncoprint);
-            assert.equal(oncoprint.setSortConfig.callCount, 1, "called once");
-            assert.deepEqual(oncoprint.setSortConfig.args[0][0], {type:"order", order:["5","3","2"]}, "correct sort config used");
+        it('should set the config to new order if order is specified, no order specified before', () => {
+            transitionSortConfig(
+                { sortConfig: { order: ['5', '3', '2'] } },
+                { sortConfig: {} },
+                oncoprint
+            );
+            assert.equal(oncoprint.setSortConfig.callCount, 1, 'called once');
+            assert.deepEqual(
+                oncoprint.setSortConfig.args[0][0],
+                { type: 'order', order: ['5', '3', '2'] },
+                'correct sort config used'
+            );
         });
-        it("should set the config to new order if order is specified, different order specified before", ()=>{
-            transitionSortConfig({sortConfig:{order:["6","4","0","2"]}},{sortConfig:{order:["1"]}}, oncoprint);
-            assert.equal(oncoprint.setSortConfig.callCount, 1, "called once");
-            assert.deepEqual(oncoprint.setSortConfig.args[0][0], {type:"order", order:["6","4","0","2"]}, "correct sort config used");
+        it('should set the config to new order if order is specified, different order specified before', () => {
+            transitionSortConfig(
+                { sortConfig: { order: ['6', '4', '0', '2'] } },
+                { sortConfig: { order: ['1'] } },
+                oncoprint
+            );
+            assert.equal(oncoprint.setSortConfig.callCount, 1, 'called once');
+            assert.deepEqual(
+                oncoprint.setSortConfig.args[0][0],
+                { type: 'order', order: ['6', '4', '0', '2'] },
+                'correct sort config used'
+            );
         });
-        it("should not do anything if same order given (same object, shallow equality)", ()=>{
-            const order = "0,1,2,3,4".split(",");
-            transitionSortConfig({sortConfig:{order}},{sortConfig:{order}}, oncoprint);
+        it('should not do anything if same order given (same object, shallow equality)', () => {
+            const order = '0,1,2,3,4'.split(',');
+            transitionSortConfig(
+                { sortConfig: { order } },
+                { sortConfig: { order } },
+                oncoprint
+            );
             assert.equal(oncoprint.setSortConfig.callCount, 0);
         });
-        it("should set the config to order, if order and cluster heatmap group specified", ()=>{
-            const order = "0,1,2,3,4".split(",");
-            transitionSortConfig({sortConfig:{order, clusterHeatmapTrackGroupIndex:1}},{sortConfig:{order}}, oncoprint);
-            assert.equal(oncoprint.setSortConfig.callCount, 0, "no change registered bc order overrides heatmap");
-
-            transitionSortConfig({sortConfig:{order, clusterHeatmapTrackGroupIndex:1}}, {}, oncoprint);
-            assert.equal(oncoprint.setSortConfig.callCount, 1, "called once");
-            assert.deepEqual(oncoprint.setSortConfig.args[0][0], { type: "order", order}, "correct sort config used");
-        });
-        it("should set the config to heatmap if heatmap index specified, no sort config specified before", ()=>{
-            transitionSortConfig({sortConfig:{clusterHeatmapTrackGroupIndex:1}}, {}, oncoprint);
-            assert.equal(oncoprint.setSortConfig.callCount, 1, "called once");
-            assert.deepEqual(oncoprint.setSortConfig.args[0][0], {type:"cluster", track_group_index:1, clusterValueFn: heatmapClusterValueFn}, "correct sort config used");
-        });
-        it("should set the config to heatmap if heatmap index specified, no heatmap index or order specified before", ()=>{
-            transitionSortConfig({sortConfig:{clusterHeatmapTrackGroupIndex:1}}, {sortConfig:{}}, oncoprint);
-            assert.equal(oncoprint.setSortConfig.callCount, 1, "called once");
-            assert.deepEqual(oncoprint.setSortConfig.args[0][0], {type:"cluster", track_group_index:1, clusterValueFn: heatmapClusterValueFn}, "correct sort config used");
-        });
-        it("should set the config to heatmap if heatmap index specified, no heatmap index specified before, order specified before", ()=>{
-            transitionSortConfig({sortConfig:{clusterHeatmapTrackGroupIndex:1}}, {sortConfig:{order:["1"]}}, oncoprint);
-            assert.equal(oncoprint.setSortConfig.callCount, 1, "called once");
-            assert.deepEqual(oncoprint.setSortConfig.args[0][0], {type:"cluster", track_group_index:1, clusterValueFn: heatmapClusterValueFn}, "correct sort config used");
-        });
-        it("should set the config to heatmap if heatmap index specified, different heatmap index specified before", ()=>{
-            transitionSortConfig({sortConfig:{clusterHeatmapTrackGroupIndex:5}}, {sortConfig:{clusterHeatmapTrackGroupIndex:2}}, oncoprint);
-            assert.equal(oncoprint.setSortConfig.callCount, 1, "called once");
-            assert.deepEqual(oncoprint.setSortConfig.args[0][0], {type:"cluster", track_group_index:5, clusterValueFn: heatmapClusterValueFn}, "correct sort config used");
-        });
-        it("should not do anything if heatmap index specified, same heatmap index specified before", ()=>{
-            transitionSortConfig({sortConfig:{clusterHeatmapTrackGroupIndex:2}}, {sortConfig:{clusterHeatmapTrackGroupIndex:2}}, oncoprint);
+        it('should set the config to order, if order and cluster heatmap group specified', () => {
+            const order = '0,1,2,3,4'.split(',');
+            transitionSortConfig(
+                { sortConfig: { order, clusterHeatmapTrackGroupIndex: 1 } },
+                { sortConfig: { order } },
+                oncoprint
+            );
+            assert.equal(
+                oncoprint.setSortConfig.callCount,
+                0,
+                'no change registered bc order overrides heatmap'
+            );
+
+            transitionSortConfig(
+                { sortConfig: { order, clusterHeatmapTrackGroupIndex: 1 } },
+                {},
+                oncoprint
+            );
+            assert.equal(oncoprint.setSortConfig.callCount, 1, 'called once');
+            assert.deepEqual(
+                oncoprint.setSortConfig.args[0][0],
+                { type: 'order', order },
+                'correct sort config used'
+            );
+        });
+        it('should set the config to heatmap if heatmap index specified, no sort config specified before', () => {
+            transitionSortConfig(
+                { sortConfig: { clusterHeatmapTrackGroupIndex: 1 } },
+                {},
+                oncoprint
+            );
+            assert.equal(oncoprint.setSortConfig.callCount, 1, 'called once');
+            assert.deepEqual(
+                oncoprint.setSortConfig.args[0][0],
+                {
+                    type: 'cluster',
+                    track_group_index: 1,
+                    clusterValueFn: heatmapClusterValueFn,
+                },
+                'correct sort config used'
+            );
+        });
+        it('should set the config to heatmap if heatmap index specified, no heatmap index or order specified before', () => {
+            transitionSortConfig(
+                { sortConfig: { clusterHeatmapTrackGroupIndex: 1 } },
+                { sortConfig: {} },
+                oncoprint
+            );
+            assert.equal(oncoprint.setSortConfig.callCount, 1, 'called once');
+            assert.deepEqual(
+                oncoprint.setSortConfig.args[0][0],
+                {
+                    type: 'cluster',
+                    track_group_index: 1,
+                    clusterValueFn: heatmapClusterValueFn,
+                },
+                'correct sort config used'
+            );
+        });
+        it('should set the config to heatmap if heatmap index specified, no heatmap index specified before, order specified before', () => {
+            transitionSortConfig(
+                { sortConfig: { clusterHeatmapTrackGroupIndex: 1 } },
+                { sortConfig: { order: ['1'] } },
+                oncoprint
+            );
+            assert.equal(oncoprint.setSortConfig.callCount, 1, 'called once');
+            assert.deepEqual(
+                oncoprint.setSortConfig.args[0][0],
+                {
+                    type: 'cluster',
+                    track_group_index: 1,
+                    clusterValueFn: heatmapClusterValueFn,
+                },
+                'correct sort config used'
+            );
+        });
+        it('should set the config to heatmap if heatmap index specified, different heatmap index specified before', () => {
+            transitionSortConfig(
+                { sortConfig: { clusterHeatmapTrackGroupIndex: 5 } },
+                { sortConfig: { clusterHeatmapTrackGroupIndex: 2 } },
+                oncoprint
+            );
+            assert.equal(oncoprint.setSortConfig.callCount, 1, 'called once');
+            assert.deepEqual(
+                oncoprint.setSortConfig.args[0][0],
+                {
+                    type: 'cluster',
+                    track_group_index: 5,
+                    clusterValueFn: heatmapClusterValueFn,
+                },
+                'correct sort config used'
+            );
+        });
+        it('should not do anything if heatmap index specified, same heatmap index specified before', () => {
+            transitionSortConfig(
+                { sortConfig: { clusterHeatmapTrackGroupIndex: 2 } },
+                { sortConfig: { clusterHeatmapTrackGroupIndex: 2 } },
+                oncoprint
+            );
             assert.equal(oncoprint.setSortConfig.callCount, 0);
         });
     });
 
     describe('transitionHeatmapTrack() for molecular profile', () => {
-
-        const molecularAlterationType = "MRNA_EXPRESSION"; 
+        const molecularAlterationType = 'MRNA_EXPRESSION';
 
         const makeMinimalOncoprintProps = (): IOncoprintProps => ({
-            caseLinkOutInTooltips:false,
+            caseLinkOutInTooltips: false,
             clinicalTracks: [],
             geneticTracks: [],
             genesetHeatmapTracks: [],
             heatmapTracks: [],
             divId: 'myDomId',
-            width: 1000
+            width: 1000,
         });
 
         const nextSpec: IHeatmapTrackSpec = {
             key: '',
             label: '',
-            molecularProfileId: "profile_1",
+            molecularProfileId: 'profile_1',
             molecularAlterationType: molecularAlterationType,
-            datatype: "",
+            datatype: '',
             trackGroupIndex: 1,
             onRemove: () => {},
             data: [
-                {profile_data: 1, study_id: "study1", uid: "uid", patient: "patient1"}, 
-                {profile_data: 2, study_id: "study1", uid: "uid", patient: "patient1"}, 
-                {profile_data: 3, study_id: "study1", uid: "uid", patient: "patient1"}
-            ]
+                {
+                    profile_data: 1,
+                    study_id: 'study1',
+                    uid: 'uid',
+                    patient: 'patient1',
+                },
+                {
+                    profile_data: 2,
+                    study_id: 'study1',
+                    uid: 'uid',
+                    patient: 'patient1',
+                },
+                {
+                    profile_data: 3,
+                    study_id: 'study1',
+                    uid: 'uid',
+                    patient: 'patient1',
+                },
+            ],
         };
 
         const prevSpec = undefined;
 
         const trackspec2trackId = () => {
             return {
-                'MOLECULARTRACK_1': 1,
-                'MOLECULARTRACK_2': 2
+                MOLECULARTRACK_1: 1,
+                MOLECULARTRACK_2: 2,
             };
         };
 
         const nextProps: IOncoprintProps = makeMinimalOncoprintProps();
         const prevProps: IOncoprintProps = makeMinimalOncoprintProps();
-        
+
         const oncoprint: OncoprintJS = createStubInstance(OncoprintJS);
 
-        beforeEach(function () {
+        beforeEach(function() {
             (oncoprint.shareRuleSet as SinonStub).resetHistory();
         });
-        
+
         it('when is new track and ruleSetId is undefined, the trackId is set as ruleSetId', () => {
-            
-            const trackIdForRuleSetSharing = {heatmap: undefined};
+            const trackIdForRuleSetSharing = { heatmap: undefined };
 
             (oncoprint.addTracks as SinonStub).returns([1]);
 
-            transitionHeatmapTrack(nextSpec, prevSpec, trackspec2trackId, ()=>undefined, oncoprint, nextProps, prevProps, trackIdForRuleSetSharing);
-            
+            transitionHeatmapTrack(
+                nextSpec,
+                prevSpec,
+                trackspec2trackId,
+                () => undefined,
+                oncoprint,
+                nextProps,
+                prevProps,
+                trackIdForRuleSetSharing
+            );
+
             assert.isFalse((oncoprint.shareRuleSet as SinonStub).called);
             assert.equal(trackIdForRuleSetSharing.heatmap, 1);
         });
 
         it('when is new track and ruleSetId is defined, the ruleSetId is shared', () => {
-            
-            const trackIdForRuleSetSharing = {heatmap: 1};
+            const trackIdForRuleSetSharing = { heatmap: 1 };
 
             (oncoprint.addTracks as SinonStub).returns([2]);
 
-            transitionHeatmapTrack(nextSpec, prevSpec, trackspec2trackId, ()=>undefined, oncoprint, nextProps, prevProps, trackIdForRuleSetSharing);
-            
+            transitionHeatmapTrack(
+                nextSpec,
+                prevSpec,
+                trackspec2trackId,
+                () => undefined,
+                oncoprint,
+                nextProps,
+                prevProps,
+                trackIdForRuleSetSharing
+            );
+
             assert.isTrue((oncoprint.shareRuleSet as SinonStub).called);
             assert.equal(trackIdForRuleSetSharing.heatmap, 2);
         });
 
         it('when is existing track, the ruleSetId is not shared (nothing happens)', () => {
-            
-            const trackIdForRuleSetSharing = {heatmap: 1};
+            const trackIdForRuleSetSharing = { heatmap: 1 };
             const prevSpec = nextSpec;
 
-            transitionHeatmapTrack(nextSpec, prevSpec, trackspec2trackId, ()=>undefined, oncoprint, nextProps, prevProps, trackIdForRuleSetSharing);
-            
+            transitionHeatmapTrack(
+                nextSpec,
+                prevSpec,
+                trackspec2trackId,
+                () => undefined,
+                oncoprint,
+                nextProps,
+                prevProps,
+                trackIdForRuleSetSharing
+            );
+
             assert.isFalse((oncoprint.shareRuleSet as SinonStub).called);
-            assert.equal(trackIdForRuleSetSharing.heatmap, 1); 
+            assert.equal(trackIdForRuleSetSharing.heatmap, 1);
         });
-
     });
 
     describe('transitionHeatmapTrack() for treatment response profile', () => {
-
-        const molecularAlterationType = "GENERIC_ASSAY";
+        const molecularAlterationType = 'GENERIC_ASSAY';
 
         const makeMinimalOncoprintProps = (): IOncoprintProps => ({
-            caseLinkOutInTooltips:false,
+            caseLinkOutInTooltips: false,
             clinicalTracks: [],
             geneticTracks: [],
             genesetHeatmapTracks: [],
             heatmapTracks: [],
             divId: 'myDomId',
-            width: 1000
+            width: 1000,
         });
 
         const nextSpec: IHeatmapTrackSpec = {
             key: '',
             label: '',
-            molecularProfileId: "profile_1",
+            molecularProfileId: 'profile_1',
             molecularAlterationType: molecularAlterationType,
-            datatype: "",
+            datatype: '',
             trackGroupIndex: 1,
             onRemove: () => {},
             data: [
-                {profile_data: 1, study_id: "study1", uid: "uid", patient: "patient1"}, 
-                {profile_data: 2, study_id: "study1", uid: "uid", patient: "patient1"}, 
-                {profile_data: 3, study_id: "study1", uid: "uid", patient: "patient1"}
-            ]
+                {
+                    profile_data: 1,
+                    study_id: 'study1',
+                    uid: 'uid',
+                    patient: 'patient1',
+                },
+                {
+                    profile_data: 2,
+                    study_id: 'study1',
+                    uid: 'uid',
+                    patient: 'patient1',
+                },
+                {
+                    profile_data: 3,
+                    study_id: 'study1',
+                    uid: 'uid',
+                    patient: 'patient1',
+                },
+            ],
         };
 
         const prevSpec = undefined;
 
         const trackspec2trackId = () => {
             return {
-                'TREATMENT_TRACK_1': 1,
-                'TREATMENT_TRACK_2': 2
+                TREATMENT_TRACK_1: 1,
+                TREATMENT_TRACK_2: 2,
             };
         };
 
         const nextProps: IOncoprintProps = makeMinimalOncoprintProps();
         const prevProps: IOncoprintProps = makeMinimalOncoprintProps();
-        
+
         const oncoprint: OncoprintJS = createStubInstance(OncoprintJS);
 
-        beforeEach(function () {
+        beforeEach(function() {
             (oncoprint.shareRuleSet as SinonStub).resetHistory();
         });
-        
+
         it('when is new track and ruleSetId is undefined, the new trackId is set as ruleSetId', () => {
-            
-            const trackIdForRuleSetSharing = {treatment: {} as {[m:string]:number}};
+            const trackIdForRuleSetSharing = {
+                treatment: {} as { [m: string]: number },
+            };
 
             (oncoprint.addTracks as SinonStub).returns([1]);
 
-            transitionHeatmapTrack(nextSpec, prevSpec, trackspec2trackId, ()=>undefined, oncoprint, nextProps, prevProps, trackIdForRuleSetSharing);
-            
+            transitionHeatmapTrack(
+                nextSpec,
+                prevSpec,
+                trackspec2trackId,
+                () => undefined,
+                oncoprint,
+                nextProps,
+                prevProps,
+                trackIdForRuleSetSharing
+            );
+
             assert.isFalse((oncoprint.shareRuleSet as SinonStub).called);
             assert.equal(trackIdForRuleSetSharing.treatment['profile_1'], 1);
         });
 
         it('when is new track and ruleSetId is defined, the new trackId is set as ruleSetId', () => {
-            
-            const trackIdForRuleSetSharing = {treatment: { profile_1: 1 }};
+            const trackIdForRuleSetSharing = { treatment: { profile_1: 1 } };
 
             (oncoprint.addTracks as SinonStub).returns([2]);
 
-            transitionHeatmapTrack(nextSpec, prevSpec, trackspec2trackId, ()=>undefined, oncoprint, nextProps, prevProps, trackIdForRuleSetSharing);
-            
+            transitionHeatmapTrack(
+                nextSpec,
+                prevSpec,
+                trackspec2trackId,
+                () => undefined,
+                oncoprint,
+                nextProps,
+                prevProps,
+                trackIdForRuleSetSharing
+            );
+
             assert.isFalse((oncoprint.shareRuleSet as SinonStub).called);
             assert.equal(trackIdForRuleSetSharing.treatment['profile_1'], 2);
         });
 
         it('when is existing track and ruleSetId is defined, the ruleset of existing track is updated to ruleSetId', () => {
-            
-            const trackIdForRuleSetSharing = {treatment: { profile_1: 2 }};
+            const trackIdForRuleSetSharing = { treatment: { profile_1: 2 } };
             const prevSpec = nextSpec;
 
-            transitionHeatmapTrack(nextSpec, prevSpec, trackspec2trackId, ()=>undefined, oncoprint, nextProps, prevProps, trackIdForRuleSetSharing);
-            
+            transitionHeatmapTrack(
+                nextSpec,
+                prevSpec,
+                trackspec2trackId,
+                () => undefined,
+                oncoprint,
+                nextProps,
+                prevProps,
+                trackIdForRuleSetSharing
+            );
+
             assert.isTrue((oncoprint.shareRuleSet as SinonStub).called);
             assert.equal(trackIdForRuleSetSharing.treatment['profile_1'], 2);
         });
-
     });
-});
\ No newline at end of file
+});
diff --git a/src/shared/components/oncoprint/DeltaUtils.ts b/src/shared/components/oncoprint/DeltaUtils.ts
index 6e45a11b30b..2be69b2574e 100644
--- a/src/shared/components/oncoprint/DeltaUtils.ts
+++ b/src/shared/components/oncoprint/DeltaUtils.ts
@@ -7,35 +7,47 @@ import {
     IGenesetHeatmapTrackSpec,
     IHeatmapTrackSpec,
     IOncoprintProps,
-} from "./Oncoprint";
-import OncoprintJS, {SortConfig, TrackId, UserTrackSpec} from "oncoprintjs";
-import _ from "lodash";
+} from './Oncoprint';
+import OncoprintJS, { SortConfig, TrackId, UserTrackSpec } from 'oncoprintjs';
+import _ from 'lodash';
 import {
     getClinicalTrackRuleSetParams,
     getGenesetHeatmapTrackRuleSetParams,
     getGeneticTrackRuleSetParams,
-    getHeatmapTrackRuleSetParams
-} from "./OncoprintUtils";
-import {getClinicalTrackSortComparator, getGeneticTrackSortComparator, heatmapTrackSortComparator} from "./SortUtils";
+    getHeatmapTrackRuleSetParams,
+} from './OncoprintUtils';
+import {
+    getClinicalTrackSortComparator,
+    getGeneticTrackSortComparator,
+    heatmapTrackSortComparator,
+} from './SortUtils';
 import {
     linebreakGenesetId,
     makeClinicalTrackTooltip,
     makeGeneticTrackTooltip,
-    makeHeatmapTrackTooltip
-} from "./TooltipUtils";
-import {MolecularProfile} from "../../api/generated/CBioPortalAPI";
-import {AlterationTypeConstants} from "pages/resultsView/ResultsViewPageStore";
-import ifNotDefined from "../../lib/ifNotDefined";
+    makeHeatmapTrackTooltip,
+} from './TooltipUtils';
+import { MolecularProfile } from '../../api/generated/CBioPortalAPI';
+import { AlterationTypeConstants } from 'pages/resultsView/ResultsViewPageStore';
+import ifNotDefined from '../../lib/ifNotDefined';
 
 export function transition(
-    nextProps:IOncoprintProps,
-    prevProps:Partial<IOncoprintProps>,
-    oncoprint:OncoprintJS,
-    getTrackSpecKeyToTrackId:()=>{[key:string]:TrackId},
-    getMolecularProfileMap:()=>({[molecularProfileId:string]:MolecularProfile}|undefined)
+    nextProps: IOncoprintProps,
+    prevProps: Partial<IOncoprintProps>,
+    oncoprint: OncoprintJS,
+    getTrackSpecKeyToTrackId: () => { [key: string]: TrackId },
+    getMolecularProfileMap: () =>
+        | { [molecularProfileId: string]: MolecularProfile }
+        | undefined
 ) {
-    const notKeepingSorted = shouldNotKeepSortedForTransition(nextProps, prevProps);
-    const suppressingRendering = shouldSuppressRenderingForTransition(nextProps, prevProps);
+    const notKeepingSorted = shouldNotKeepSortedForTransition(
+        nextProps,
+        prevProps
+    );
+    const suppressingRendering = shouldSuppressRenderingForTransition(
+        nextProps,
+        prevProps
+    );
     if (suppressingRendering) {
         doSuppressRendering(nextProps, oncoprint);
     }
@@ -51,14 +63,30 @@ export function transition(
     transitionShowTrackLabels(nextProps, prevProps, oncoprint);
     transitionShowSublabels(nextProps, prevProps, oncoprint);
     transitionTrackHeaders(nextProps, prevProps, oncoprint);
-    transitionTracks(nextProps, prevProps, oncoprint, getTrackSpecKeyToTrackId, getMolecularProfileMap);
+    transitionTracks(
+        nextProps,
+        prevProps,
+        oncoprint,
+        getTrackSpecKeyToTrackId,
+        getMolecularProfileMap
+    );
     transitionSortConfig(nextProps, prevProps, oncoprint);
     transitionTrackGroupSortPriority(nextProps, prevProps, oncoprint);
     transitionHiddenIds(nextProps, prevProps, oncoprint);
     transitionHorzZoomToFit(nextProps, prevProps, oncoprint);
-    transitionShowClinicalTrackLegends(nextProps, prevProps, oncoprint, getTrackSpecKeyToTrackId);
+    transitionShowClinicalTrackLegends(
+        nextProps,
+        prevProps,
+        oncoprint,
+        getTrackSpecKeyToTrackId
+    );
     transitionHighlightedIds(nextProps, prevProps, oncoprint);
-    transitionHighlightedTracks(nextProps, prevProps, oncoprint, getTrackSpecKeyToTrackId);
+    transitionHighlightedTracks(
+        nextProps,
+        prevProps,
+        oncoprint,
+        getTrackSpecKeyToTrackId
+    );
     tryReleaseRendering(nextProps, prevProps, oncoprint);
     if (notKeepingSorted) {
         oncoprint.keepSorted(true);
@@ -69,16 +97,18 @@ export function transition(
 }
 
 function transitionTrackHeaders(
-    nextProps:IOncoprintProps,
-    prevProps:Partial<IOncoprintProps>,
+    nextProps: IOncoprintProps,
+    prevProps: Partial<IOncoprintProps>,
     oncoprint: OncoprintJS
 ) {
-    if (!_.isEqual(nextProps.heatmapTrackHeaders, prevProps.heatmapTrackHeaders)) {
+    if (
+        !_.isEqual(nextProps.heatmapTrackHeaders, prevProps.heatmapTrackHeaders)
+    ) {
         const nextHeaders = nextProps.heatmapTrackHeaders || {};
         const prevHeaders = prevProps.heatmapTrackHeaders || {};
 
-        const nextIndexes = Object.keys(nextHeaders).map(x=>parseInt(x,10));
-        const prevIndexes = Object.keys(prevHeaders).map(x=>parseInt(x,10));
+        const nextIndexes = Object.keys(nextHeaders).map(x => parseInt(x, 10));
+        const prevIndexes = Object.keys(prevHeaders).map(x => parseInt(x, 10));
 
         for (const index of nextIndexes) {
             oncoprint.setTrackGroupHeader(index, nextHeaders[index]);
@@ -92,8 +122,8 @@ function transitionTrackHeaders(
 }
 
 function transitionWidth(
-    nextProps:IOncoprintProps,
-    prevProps:Partial<IOncoprintProps>,
+    nextProps: IOncoprintProps,
+    prevProps: Partial<IOncoprintProps>,
     oncoprint: OncoprintJS
 ) {
     if (nextProps.width !== prevProps.width) {
@@ -102,9 +132,9 @@ function transitionWidth(
 }
 
 export function transitionHighlightedIds(
-    nextProps:IOncoprintProps,
-    prevProps:Partial<IOncoprintProps>,
-    oncoprint:OncoprintJS
+    nextProps: IOncoprintProps,
+    prevProps: Partial<IOncoprintProps>,
+    oncoprint: OncoprintJS
 ) {
     if (nextProps.highlightedIds !== prevProps.highlightedIds) {
         oncoprint.setHighlightedIds(nextProps.highlightedIds || []);
@@ -112,21 +142,23 @@ export function transitionHighlightedIds(
 }
 
 export function transitionHighlightedTracks(
-    nextProps:IOncoprintProps,
-    prevProps:Partial<IOncoprintProps>,
-    oncoprint:OncoprintJS,
-    getTrackSpecKeyToTrackId:()=>{[key:string]:TrackId}
+    nextProps: IOncoprintProps,
+    prevProps: Partial<IOncoprintProps>,
+    oncoprint: OncoprintJS,
+    getTrackSpecKeyToTrackId: () => { [key: string]: TrackId }
 ) {
     if (nextProps.highlightedTracks !== prevProps.highlightedTracks) {
         const highlightedTrackKeys = nextProps.highlightedTracks || [];
         const trackSpecKeyToTrackId = getTrackSpecKeyToTrackId();
-        oncoprint.setHighlightedTracks(highlightedTrackKeys.map(key=>trackSpecKeyToTrackId[key]));
+        oncoprint.setHighlightedTracks(
+            highlightedTrackKeys.map(key => trackSpecKeyToTrackId[key])
+        );
     }
 }
 
 export function transitionShowTrackLabels(
-    nextProps:IOncoprintProps,
-    prevProps:Partial<IOncoprintProps>,
+    nextProps: IOncoprintProps,
+    prevProps: Partial<IOncoprintProps>,
     oncoprint: OncoprintJS
 ) {
     if (nextProps.showTrackLabels !== prevProps.showTrackLabels) {
@@ -134,10 +166,9 @@ export function transitionShowTrackLabels(
     }
 }
 
-
 export function transitionShowSublabels(
-    nextProps:IOncoprintProps,
-    prevProps:Partial<IOncoprintProps>,
+    nextProps: IOncoprintProps,
+    prevProps: Partial<IOncoprintProps>,
     oncoprint: OncoprintJS
 ) {
     if (nextProps.showSublabels !== prevProps.showSublabels) {
@@ -146,72 +177,82 @@ export function transitionShowSublabels(
 }
 
 type TrackSpecsWithDynamicGroups = {
-    heatmapTracks: {trackGroupIndex: number}[],
-    genesetHeatmapTracks: {trackGroupIndex: number}[]
+    heatmapTracks: { trackGroupIndex: number }[];
+    genesetHeatmapTracks: { trackGroupIndex: number }[];
 };
 
-type TreatmentProfileToTrackIdMap = {[molecularProfileId:string]: undefined|TrackId};
+type TreatmentProfileToTrackIdMap = {
+    [molecularProfileId: string]: undefined | TrackId;
+};
 
 export function transitionTrackGroupSortPriority(
     nextProps: TrackSpecsWithDynamicGroups,
     prevProps: Partial<TrackSpecsWithDynamicGroups>,
     oncoprint: OncoprintJS
 ) {
-    const prevHeatmapTrackGroups = _.sortBy(_.uniq(
-        (prevProps.heatmapTracks || [])
-        .concat(prevProps.genesetHeatmapTracks || [])
-        .map(x => x.trackGroupIndex)
-    ));
-    const nextHeatmapTrackGroups = _.sortBy(_.uniq(
-        nextProps.heatmapTracks
-        .concat(nextProps.genesetHeatmapTracks)
-        .map(x=>x.trackGroupIndex)
-    ));
+    const prevHeatmapTrackGroups = _.sortBy(
+        _.uniq(
+            (prevProps.heatmapTracks || [])
+                .concat(prevProps.genesetHeatmapTracks || [])
+                .map(x => x.trackGroupIndex)
+        )
+    );
+    const nextHeatmapTrackGroups = _.sortBy(
+        _.uniq(
+            nextProps.heatmapTracks
+                .concat(nextProps.genesetHeatmapTracks)
+                .map(x => x.trackGroupIndex)
+        )
+    );
     if (_.xor(nextHeatmapTrackGroups, prevHeatmapTrackGroups).length) {
         // if track groups have changed
-        oncoprint.setTrackGroupSortPriority([CLINICAL_TRACK_GROUP_INDEX].concat(nextHeatmapTrackGroups).concat(GENETIC_TRACK_GROUP_INDEX));
+        oncoprint.setTrackGroupSortPriority(
+            [CLINICAL_TRACK_GROUP_INDEX]
+                .concat(nextHeatmapTrackGroups)
+                .concat(GENETIC_TRACK_GROUP_INDEX)
+        );
     }
 }
 
 function doSuppressRendering(
-    nextProps:IOncoprintProps,
-    oncoprint:OncoprintJS
+    nextProps: IOncoprintProps,
+    oncoprint: OncoprintJS
 ) {
     oncoprint.suppressRendering();
     nextProps.onSuppressRendering && nextProps.onSuppressRendering();
 }
 
 function doReleaseRendering(
-    nextProps:IOncoprintProps,
-    oncoprint:OncoprintJS
+    nextProps: IOncoprintProps,
+    oncoprint: OncoprintJS
 ) {
     oncoprint.releaseRendering(nextProps.onReleaseRendering);
 }
 
 function trySuppressRendering(
-    nextProps:IOncoprintProps,
-    prevProps:Partial<IOncoprintProps>,
-    oncoprint:OncoprintJS
-){
+    nextProps: IOncoprintProps,
+    prevProps: Partial<IOncoprintProps>,
+    oncoprint: OncoprintJS
+) {
     if (nextProps.suppressRendering && !prevProps.suppressRendering) {
         doSuppressRendering(nextProps, oncoprint);
     }
 }
 
 function tryReleaseRendering(
-    nextProps:IOncoprintProps,
-    prevProps:Partial<IOncoprintProps>,
-    oncoprint:OncoprintJS
-){
+    nextProps: IOncoprintProps,
+    prevProps: Partial<IOncoprintProps>,
+    oncoprint: OncoprintJS
+) {
     if (!nextProps.suppressRendering && prevProps.suppressRendering) {
         doReleaseRendering(nextProps, oncoprint);
     }
 }
 
 function transitionColumnLabels(
-    nextProps:IOncoprintProps,
-    prevProps:Partial<IOncoprintProps>,
-    oncoprint:OncoprintJS
+    nextProps: IOncoprintProps,
+    prevProps: Partial<IOncoprintProps>,
+    oncoprint: OncoprintJS
 ) {
     if (!_.isEqual(nextProps.columnLabels, prevProps.columnLabels)) {
         oncoprint.setColumnLabels(nextProps.columnLabels || {});
@@ -219,19 +260,22 @@ function transitionColumnLabels(
 }
 
 function transitionHorzZoomToFit(
-    nextProps:IOncoprintProps,
-    prevProps:Partial<IOncoprintProps>,
-    oncoprint:OncoprintJS
+    nextProps: IOncoprintProps,
+    prevProps: Partial<IOncoprintProps>,
+    oncoprint: OncoprintJS
 ) {
     if (!_.isEqual(nextProps.horzZoomToFitIds, prevProps.horzZoomToFitIds)) {
         oncoprint.updateHorzZoomToFitIds(nextProps.horzZoomToFitIds || []);
     }
 }
 
-export function numTracksWhoseDataChanged(nextTracks:{key:string, data:any}[], prevTracks:{key:string, data:any}[]) {
+export function numTracksWhoseDataChanged(
+    nextTracks: { key: string; data: any }[],
+    prevTracks: { key: string; data: any }[]
+) {
     let ret = 0;
-    const prevTracksMap = _.keyBy(prevTracks, x=>x.key);
-    const tracksInBothPrevAndNext:{[key:string]:boolean} = {};
+    const prevTracksMap = _.keyBy(prevTracks, x => x.key);
+    const tracksInBothPrevAndNext: { [key: string]: boolean } = {};
     let numTracksAdded = 0;
     let numTracksInBothPrevAndNext = 0;
     let numTracksDataChanged = 0;
@@ -250,7 +294,10 @@ export function numTracksWhoseDataChanged(nextTracks:{key:string, data:any}[], p
     return numTracksAdded + numTracksDeleted + numTracksDataChanged;
 }
 
-function differentTracksOrChangedData(nextTracks:{key:string, data:any}[], prevTracks:{key:string, data:any}[]) {
+function differentTracksOrChangedData(
+    nextTracks: { key: string; data: any }[],
+    prevTracks: { key: string; data: any }[]
+) {
     // Check if
     // (1) A track added/removed
     // (2) Track data changed
@@ -258,111 +305,144 @@ function differentTracksOrChangedData(nextTracks:{key:string, data:any}[], prevT
     if (nextTracks.length !== prevTracks.length) {
         ret = true;
     } else {
-        ret = (numTracksWhoseDataChanged(nextTracks, prevTracks) > 0);
+        ret = numTracksWhoseDataChanged(nextTracks, prevTracks) > 0;
     }
     return ret;
 }
 
 function shouldNotKeepSorted_GeneticTracksHelper(
-    nextProps:IOncoprintProps,
-    prevProps:Partial<IOncoprintProps>
+    nextProps: IOncoprintProps,
+    prevProps: Partial<IOncoprintProps>
 ) {
     // Check if
     // (1) A track added/removed
     // (2) Track data changed
-    if (differentTracksOrChangedData(nextProps.geneticTracks || [], prevProps.geneticTracks || [])) {
+    if (
+        differentTracksOrChangedData(
+            nextProps.geneticTracks || [],
+            prevProps.geneticTracks || []
+        )
+    ) {
         return true;
     }
     // (3) Track sort comparator changed
-    return (sortByMutationType(nextProps) !== sortByMutationType(prevProps)) ||
-            (sortByDrivers(nextProps) !== sortByDrivers(prevProps));
+    return (
+        sortByMutationType(nextProps) !== sortByMutationType(prevProps) ||
+        sortByDrivers(nextProps) !== sortByDrivers(prevProps)
+    );
 }
 
 function shouldNotKeepSorted_ClinicalTracksHelper(
-    nextProps:IOncoprintProps,
-    prevProps:Partial<IOncoprintProps>
+    nextProps: IOncoprintProps,
+    prevProps: Partial<IOncoprintProps>
 ) {
     // Check if
     // (1) A track added/removed
     // (2) Track data changed
-    if (differentTracksOrChangedData(nextProps.clinicalTracks || [], prevProps.clinicalTracks || [])) {
+    if (
+        differentTracksOrChangedData(
+            nextProps.clinicalTracks || [],
+            prevProps.clinicalTracks || []
+        )
+    ) {
         return true;
     }
 }
 
 function shouldNotKeepSorted_HeatmapTracksHelper(
-    nextProps:IOncoprintProps,
-    prevProps:Partial<IOncoprintProps>
+    nextProps: IOncoprintProps,
+    prevProps: Partial<IOncoprintProps>
 ) {
     // Check if
     // (1) A track added/removed
     // (2) Track data changed
     if (
-        differentTracksOrChangedData(nextProps.heatmapTracks, prevProps.heatmapTracks || [] )
-        || differentTracksOrChangedData(nextProps.genesetHeatmapTracks, prevProps.genesetHeatmapTracks || [])
+        differentTracksOrChangedData(
+            nextProps.heatmapTracks,
+            prevProps.heatmapTracks || []
+        ) ||
+        differentTracksOrChangedData(
+            nextProps.genesetHeatmapTracks,
+            prevProps.genesetHeatmapTracks || []
+        )
     ) {
         return true;
     }
 }
 
-function shouldNotKeepSortedForTransition(nextProps: IOncoprintProps, prevProps: Partial<IOncoprintProps>) {
+function shouldNotKeepSortedForTransition(
+    nextProps: IOncoprintProps,
+    prevProps: Partial<IOncoprintProps>
+) {
     // Dont keep sorted during changes if changes will involve resorting. In that case,
     //  we might as well just wait until they're done to resort - that can only make it more efficient
     //  than potentially sorting multiple times.
 
-    return shouldNotKeepSorted_GeneticTracksHelper(nextProps, prevProps) ||
+    return (
+        shouldNotKeepSorted_GeneticTracksHelper(nextProps, prevProps) ||
         shouldNotKeepSorted_ClinicalTracksHelper(nextProps, prevProps) ||
-        shouldNotKeepSorted_HeatmapTracksHelper(nextProps, prevProps);
+        shouldNotKeepSorted_HeatmapTracksHelper(nextProps, prevProps)
+    );
 }
 
-function allTracks(props:Partial<IOncoprintProps>) {
-    return (((props.geneticTracks || []) as any[])
-            .concat(props.genesetHeatmapTracks || [])
-            .concat(props.clinicalTracks || [])
-            .concat(props.heatmapTracks || [])
-    );
+function allTracks(props: Partial<IOncoprintProps>) {
+    return ((props.geneticTracks || []) as any[])
+        .concat(props.genesetHeatmapTracks || [])
+        .concat(props.clinicalTracks || [])
+        .concat(props.heatmapTracks || []);
 }
 
 function shouldSuppressRenderingForTransition(
     nextProps: IOncoprintProps,
-    prevProps: Partial<IOncoprintProps>,
+    prevProps: Partial<IOncoprintProps>
 ) {
     // If cost of rerendering everything less than cost of all the rerenders that would happen in the process
     //  of incrementally changing the oncoprint state.
-    return !nextProps.suppressRendering && // dont add suppress if already suppressing
-        (hasGeneticTrackRuleSetChanged(nextProps, prevProps) // will need to rerender all genetic tracks if genetic rule set has changed
-        || (numTracksWhoseDataChanged(allTracks(nextProps), allTracks(prevProps)) > 1));
+    return (
+        !nextProps.suppressRendering && // dont add suppress if already suppressing
+        (hasGeneticTrackRuleSetChanged(nextProps, prevProps) || // will need to rerender all genetic tracks if genetic rule set has changed
+            numTracksWhoseDataChanged(
+                allTracks(nextProps),
+                allTracks(prevProps)
+            ) > 1)
+    );
 }
 
-function sortOrder(props:Partial<Pick<IOncoprintProps, "sortConfig">>):string[]|undefined {
+function sortOrder(
+    props: Partial<Pick<IOncoprintProps, 'sortConfig'>>
+): string[] | undefined {
     return props.sortConfig && props.sortConfig.order;
-};
+}
 
 export function heatmapClusterValueFn(d: IBaseHeatmapTrackDatum) {
     return d.profile_data;
 }
 
-function createSortConfig(props:Partial<Pick<IOncoprintProps, "sortConfig">>):SortConfig {
+function createSortConfig(
+    props: Partial<Pick<IOncoprintProps, 'sortConfig'>>
+): SortConfig {
     let config = {};
     const newSortOrder = sortOrder(props);
     if (newSortOrder) {
         config = {
-            type: "order",
-            order: newSortOrder
+            type: 'order',
+            order: newSortOrder,
         };
-    } else if (props.sortConfig &&
-        typeof props.sortConfig.clusterHeatmapTrackGroupIndex !== "undefined") {
+    } else if (
+        props.sortConfig &&
+        typeof props.sortConfig.clusterHeatmapTrackGroupIndex !== 'undefined'
+    ) {
         config = {
-            type: "cluster",
+            type: 'cluster',
             track_group_index: props.sortConfig.clusterHeatmapTrackGroupIndex,
-            clusterValueFn: heatmapClusterValueFn
+            clusterValueFn: heatmapClusterValueFn,
         };
     }
     return config;
 }
 export function transitionSortConfig(
-    nextProps: Pick<IOncoprintProps, "sortConfig">,
-    prevProps: Partial<Pick<IOncoprintProps, "sortConfig">>,
+    nextProps: Pick<IOncoprintProps, 'sortConfig'>,
+    prevProps: Partial<Pick<IOncoprintProps, 'sortConfig'>>,
     oncoprint: OncoprintJS
 ) {
     const prevSortConfig = createSortConfig(prevProps);
@@ -370,19 +450,20 @@ export function transitionSortConfig(
 
     // do shallow comparison on "order" types, otherwise deep comparison
     // this is because order could potentially be very long and so deep comparison would be too expensive
-    if ((prevSortConfig.type === "order" &&
-        nextSortConfig.type === "order" &&
-        (prevSortConfig.order !== nextSortConfig.order))
-        ||
-        !_.isEqual(prevSortConfig, nextSortConfig)) {
+    if (
+        (prevSortConfig.type === 'order' &&
+            nextSortConfig.type === 'order' &&
+            prevSortConfig.order !== nextSortConfig.order) ||
+        !_.isEqual(prevSortConfig, nextSortConfig)
+    ) {
         oncoprint.setSortConfig(nextSortConfig);
     }
 }
 
 function transitionHiddenIds(
-    nextProps:IOncoprintProps,
-    prevProps:Partial<IOncoprintProps>,
-    oncoprint:OncoprintJS
+    nextProps: IOncoprintProps,
+    prevProps: Partial<IOncoprintProps>,
+    oncoprint: OncoprintJS
 ) {
     if (nextProps.hiddenIds !== prevProps.hiddenIds) {
         // do it on shallow inequality
@@ -391,34 +472,45 @@ function transitionHiddenIds(
 }
 
 function transitionShowClinicalTrackLegends(
-    nextProps:IOncoprintProps,
-    prevProps:Partial<IOncoprintProps>,
-    oncoprint:OncoprintJS,
-    getTrackSpecKeyToTrackId:()=>{[key:string]:TrackId}
+    nextProps: IOncoprintProps,
+    prevProps: Partial<IOncoprintProps>,
+    oncoprint: OncoprintJS,
+    getTrackSpecKeyToTrackId: () => { [key: string]: TrackId }
 ) {
     const trackSpecKeyToTrackId = getTrackSpecKeyToTrackId();
-    const clinicalTrackIds = nextProps.clinicalTracks.map(track=>trackSpecKeyToTrackId[track.key]);
-    if (nextProps.showClinicalTrackLegends && !prevProps.showClinicalTrackLegends) {
+    const clinicalTrackIds = nextProps.clinicalTracks.map(
+        track => trackSpecKeyToTrackId[track.key]
+    );
+    if (
+        nextProps.showClinicalTrackLegends &&
+        !prevProps.showClinicalTrackLegends
+    ) {
         oncoprint.showTrackLegends(clinicalTrackIds);
-    } else if (!nextProps.showClinicalTrackLegends && prevProps.showClinicalTrackLegends) {
+    } else if (
+        !nextProps.showClinicalTrackLegends &&
+        prevProps.showClinicalTrackLegends
+    ) {
         oncoprint.hideTrackLegends(clinicalTrackIds);
     }
 }
 
 function transitionWhitespaceBetweenColumns(
-    nextProps:IOncoprintProps,
-    prevProps:Partial<IOncoprintProps>,
-    oncoprint:OncoprintJS
+    nextProps: IOncoprintProps,
+    prevProps: Partial<IOncoprintProps>,
+    oncoprint: OncoprintJS
 ) {
-    if (nextProps.showWhitespaceBetweenColumns !== prevProps.showWhitespaceBetweenColumns) {
+    if (
+        nextProps.showWhitespaceBetweenColumns !==
+        prevProps.showWhitespaceBetweenColumns
+    ) {
         oncoprint.setCellPaddingOn(!!nextProps.showWhitespaceBetweenColumns);
     }
 }
 
 function transitionShowMinimap(
-    nextProps:IOncoprintProps,
-    prevProps:Partial<IOncoprintProps>,
-    oncoprint:OncoprintJS
+    nextProps: IOncoprintProps,
+    prevProps: Partial<IOncoprintProps>,
+    oncoprint: OncoprintJS
 ) {
     if (nextProps.showMinimap !== prevProps.showMinimap) {
         oncoprint.setMinimapVisible(!!nextProps.showMinimap);
@@ -426,66 +518,94 @@ function transitionShowMinimap(
 }
 
 function transitionOnMinimapCloseCallback(
-    nextProps:IOncoprintProps,
-    prevProps:Partial<IOncoprintProps>,
-    oncoprint:OncoprintJS
+    nextProps: IOncoprintProps,
+    prevProps: Partial<IOncoprintProps>,
+    oncoprint: OncoprintJS
 ) {
-    if (nextProps.onMinimapClose && nextProps.onMinimapClose !== prevProps.onMinimapClose) {
+    if (
+        nextProps.onMinimapClose &&
+        nextProps.onMinimapClose !== prevProps.onMinimapClose
+    ) {
         oncoprint.onMinimapClose(nextProps.onMinimapClose);
     }
 }
 
 function hasGeneticTrackTooltipChanged(
-    nextProps:IOncoprintProps,
-    prevProps:Partial<IOncoprintProps>,
+    nextProps: IOncoprintProps,
+    prevProps: Partial<IOncoprintProps>
 ) {
-    return nextProps.caseLinkOutInTooltips !== prevProps.caseLinkOutInTooltips ||
-        nextProps.alterationTypesInQuery !== prevProps.alterationTypesInQuery;
+    return (
+        nextProps.caseLinkOutInTooltips !== prevProps.caseLinkOutInTooltips ||
+        nextProps.alterationTypesInQuery !== prevProps.alterationTypesInQuery
+    );
 }
 
 function hasGeneticTrackRuleSetChanged(
-    nextProps:IOncoprintProps,
-    prevProps:Partial<IOncoprintProps>,
+    nextProps: IOncoprintProps,
+    prevProps: Partial<IOncoprintProps>
 ) {
-    return ((nextProps.distinguishMutationType !== prevProps.distinguishMutationType) ||
-        (nextProps.distinguishDrivers !== prevProps.distinguishDrivers) ||
-        (nextProps.distinguishGermlineMutations !== prevProps.distinguishGermlineMutations));
+    return (
+        nextProps.distinguishMutationType !==
+            prevProps.distinguishMutationType ||
+        nextProps.distinguishDrivers !== prevProps.distinguishDrivers ||
+        nextProps.distinguishGermlineMutations !==
+            prevProps.distinguishGermlineMutations
+    );
 }
 
 function transitionTracks(
-    nextProps:IOncoprintProps,
-    prevProps:Partial<IOncoprintProps>,
-    oncoprint:OncoprintJS,
-    getTrackSpecKeyToTrackId:()=>{[key:string]:TrackId},
-    getMolecularProfileMap:()=>({[molecularProfileId:string]:MolecularProfile}|undefined)
+    nextProps: IOncoprintProps,
+    prevProps: Partial<IOncoprintProps>,
+    oncoprint: OncoprintJS,
+    getTrackSpecKeyToTrackId: () => { [key: string]: TrackId },
+    getMolecularProfileMap: () =>
+        | { [molecularProfileId: string]: MolecularProfile }
+        | undefined
 ) {
     // Initialize tracks for rule set sharing
     const trackIdForRuleSetSharing = {
-        genetic: undefined as undefined|TrackId,
-        genesetHeatmap: undefined as undefined|TrackId,
-        heatmap: undefined as undefined|TrackId,
-        heatmap01:undefined as undefined|TrackId,
-        treatment: {} as any as TreatmentProfileToTrackIdMap
+        genetic: undefined as undefined | TrackId,
+        genesetHeatmap: undefined as undefined | TrackId,
+        heatmap: undefined as undefined | TrackId,
+        heatmap01: undefined as undefined | TrackId,
+        treatment: ({} as any) as TreatmentProfileToTrackIdMap,
     };
     const trackSpecKeyToTrackId = getTrackSpecKeyToTrackId();
-    if (prevProps.geneticTracks && prevProps.geneticTracks.length && !hasGeneticTrackRuleSetChanged(nextProps, prevProps)) {
+    if (
+        prevProps.geneticTracks &&
+        prevProps.geneticTracks.length &&
+        !hasGeneticTrackRuleSetChanged(nextProps, prevProps)
+    ) {
         // set rule set to existing track if theres a track and rule set hasnt changed
-        trackIdForRuleSetSharing.genetic = trackSpecKeyToTrackId[prevProps.geneticTracks[0].key];
+        trackIdForRuleSetSharing.genetic =
+            trackSpecKeyToTrackId[prevProps.geneticTracks[0].key];
     }
-    if (prevProps.genesetHeatmapTracks && prevProps.genesetHeatmapTracks.length) {
+    if (
+        prevProps.genesetHeatmapTracks &&
+        prevProps.genesetHeatmapTracks.length
+    ) {
         // set rule set to existing track if there is one
-        trackIdForRuleSetSharing.genesetHeatmap = trackSpecKeyToTrackId[prevProps.genesetHeatmapTracks[0].key];
+        trackIdForRuleSetSharing.genesetHeatmap =
+            trackSpecKeyToTrackId[prevProps.genesetHeatmapTracks[0].key];
     }
     if (prevProps.heatmapTracks && prevProps.heatmapTracks.length) {
         // set rule set to existing track if theres a track
         let heatmap01;
         let heatmap;
         for (const spec of prevProps.heatmapTracks) {
-            if (heatmap01 === undefined && spec.molecularAlterationType === AlterationTypeConstants.METHYLATION) {
+            if (
+                heatmap01 === undefined &&
+                spec.molecularAlterationType ===
+                    AlterationTypeConstants.METHYLATION
+            ) {
                 heatmap01 = trackSpecKeyToTrackId[spec.key];
-            } else if (heatmap === undefined 
-                        && spec.molecularAlterationType !==  AlterationTypeConstants.METHYLATION 
-                        && spec.molecularAlterationType !==  AlterationTypeConstants.GENERIC_ASSAY) {
+            } else if (
+                heatmap === undefined &&
+                spec.molecularAlterationType !==
+                    AlterationTypeConstants.METHYLATION &&
+                spec.molecularAlterationType !==
+                    AlterationTypeConstants.GENERIC_ASSAY
+            ) {
                 heatmap = trackSpecKeyToTrackId[spec.key];
             }
             if (heatmap01 !== undefined && heatmap !== undefined) {
@@ -496,10 +616,12 @@ function transitionTracks(
         trackIdForRuleSetSharing.heatmap01 = heatmap01;
     } else if (prevProps.genesetHeatmapTracks) {
         for (const gsTrack of prevProps.genesetHeatmapTracks) {
-            if (gsTrack.expansionTrackList && gsTrack.expansionTrackList.length) {
-                trackIdForRuleSetSharing.heatmap = trackSpecKeyToTrackId[
-                    gsTrack.expansionTrackList[0].key
-                ];
+            if (
+                gsTrack.expansionTrackList &&
+                gsTrack.expansionTrackList.length
+            ) {
+                trackIdForRuleSetSharing.heatmap =
+                    trackSpecKeyToTrackId[gsTrack.expansionTrackList[0].key];
                 break;
             }
         }
@@ -509,150 +631,269 @@ function transitionTracks(
     // Note: the resolution of `trackIds for ruleset sharing` is different from
     // the section above because different formatting is applied to each treatment profile (molecularProfileId)
     trackIdForRuleSetSharing.treatment = _.chain(prevProps.heatmapTracks)
-                                    .filter((s:IHeatmapTrackSpec) => s.molecularAlterationType === AlterationTypeConstants.GENERIC_ASSAY)
-                                    .groupBy((track:IHeatmapTrackSpec) => track.molecularProfileId)
-                                    .mapValues( (o:IHeatmapTrackSpec[]) => _.last(o) )
-                                    .mapValues( (o:IHeatmapTrackSpec) => trackSpecKeyToTrackId[o.key] )
-                                    .value();
+        .filter(
+            (s: IHeatmapTrackSpec) =>
+                s.molecularAlterationType ===
+                AlterationTypeConstants.GENERIC_ASSAY
+        )
+        .groupBy((track: IHeatmapTrackSpec) => track.molecularProfileId)
+        .mapValues((o: IHeatmapTrackSpec[]) => _.last(o))
+        .mapValues((o: IHeatmapTrackSpec) => trackSpecKeyToTrackId[o.key])
+        .value();
 
     const treatmentProfilesMap = _.chain(nextProps.heatmapTracks)
-                                    .filter((s:IHeatmapTrackSpec) => s.molecularAlterationType === AlterationTypeConstants.GENERIC_ASSAY)
-                                    .groupBy((track:IHeatmapTrackSpec) => track.molecularProfileId)
-                                    .mapValues( (o:IHeatmapTrackSpec[]) => _(o).flatMap((d)=>d.data).filter((d:IBaseHeatmapTrackDatum) => ! d.category).map((d)=>d.profile_data).value() )
-                                    .value();
+        .filter(
+            (s: IHeatmapTrackSpec) =>
+                s.molecularAlterationType ===
+                AlterationTypeConstants.GENERIC_ASSAY
+        )
+        .groupBy((track: IHeatmapTrackSpec) => track.molecularProfileId)
+        .mapValues((o: IHeatmapTrackSpec[]) =>
+            _(o)
+                .flatMap(d => d.data)
+                .filter((d: IBaseHeatmapTrackDatum) => !d.category)
+                .map(d => d.profile_data)
+                .value()
+        )
+        .value();
 
     // find the max and min treatment profile value in the next heatmap track group
     // max and min value is used to create a custom legend for the track group
-    const treatmentProfileMaxValues = _.mapValues(treatmentProfilesMap, (profile_data:number[]) => { return _.max(profile_data) });
-    const treatmentProfileMinValues = _.mapValues(treatmentProfilesMap, (profile_data:number[]) => { return _.min(profile_data) });
+    const treatmentProfileMaxValues = _.mapValues(
+        treatmentProfilesMap,
+        (profile_data: number[]) => {
+            return _.max(profile_data);
+        }
+    );
+    const treatmentProfileMinValues = _.mapValues(
+        treatmentProfilesMap,
+        (profile_data: number[]) => {
+            return _.min(profile_data);
+        }
+    );
 
     // Transition genetic tracks
-    const prevGeneticTracks = _.keyBy(prevProps.geneticTracks || [], (track:GeneticTrackSpec)=>track.key);
+    const prevGeneticTracks = _.keyBy(
+        prevProps.geneticTracks || [],
+        (track: GeneticTrackSpec) => track.key
+    );
     for (const track of nextProps.geneticTracks) {
-        transitionGeneticTrack(track, prevGeneticTracks[track.key], getTrackSpecKeyToTrackId,
-                        getMolecularProfileMap, oncoprint, nextProps, prevProps, trackIdForRuleSetSharing);
+        transitionGeneticTrack(
+            track,
+            prevGeneticTracks[track.key],
+            getTrackSpecKeyToTrackId,
+            getMolecularProfileMap,
+            oncoprint,
+            nextProps,
+            prevProps,
+            trackIdForRuleSetSharing
+        );
         delete prevGeneticTracks[track.key];
     }
-    for (const track of (prevProps.geneticTracks || [])) {
+    for (const track of prevProps.geneticTracks || []) {
         if (prevGeneticTracks.hasOwnProperty(track.key)) {
             // if its still there, then this track no longer exists, we need to remove it
-            transitionGeneticTrack(undefined, prevGeneticTracks[track.key], getTrackSpecKeyToTrackId,
-                        getMolecularProfileMap, oncoprint, nextProps, prevProps, trackIdForRuleSetSharing);
+            transitionGeneticTrack(
+                undefined,
+                prevGeneticTracks[track.key],
+                getTrackSpecKeyToTrackId,
+                getMolecularProfileMap,
+                oncoprint,
+                nextProps,
+                prevProps,
+                trackIdForRuleSetSharing
+            );
         }
     }
     // Oncce tracks have been added and deleted, transition order
-    transitionGeneticTrackOrder(nextProps, prevProps, oncoprint, getTrackSpecKeyToTrackId);
+    transitionGeneticTrackOrder(
+        nextProps,
+        prevProps,
+        oncoprint,
+        getTrackSpecKeyToTrackId
+    );
 
     // Transition clinical tracks
-    const prevClinicalTracks = _.keyBy(prevProps.clinicalTracks || [], (track:ClinicalTrackSpec)=>track.key);
+    const prevClinicalTracks = _.keyBy(
+        prevProps.clinicalTracks || [],
+        (track: ClinicalTrackSpec) => track.key
+    );
     for (const track of nextProps.clinicalTracks) {
-        transitionClinicalTrack(track, prevClinicalTracks[track.key], getTrackSpecKeyToTrackId, oncoprint, nextProps);
+        transitionClinicalTrack(
+            track,
+            prevClinicalTracks[track.key],
+            getTrackSpecKeyToTrackId,
+            oncoprint,
+            nextProps
+        );
         delete prevClinicalTracks[track.key];
     }
-    for (const track of (prevProps.clinicalTracks || [])) {
+    for (const track of prevProps.clinicalTracks || []) {
         if (prevClinicalTracks.hasOwnProperty(track.key)) {
             // if its still there, then this track no longer exists
-            transitionClinicalTrack(undefined, prevClinicalTracks[track.key], getTrackSpecKeyToTrackId, oncoprint, nextProps);
+            transitionClinicalTrack(
+                undefined,
+                prevClinicalTracks[track.key],
+                getTrackSpecKeyToTrackId,
+                oncoprint,
+                nextProps
+            );
         }
     }
 
     // Transition gene set heatmap tracks
-    const prevGenesetHeatmapTracks = _.keyBy(prevProps.genesetHeatmapTracks || [], (track:IGenesetHeatmapTrackSpec)=>track.key);
+    const prevGenesetHeatmapTracks = _.keyBy(
+        prevProps.genesetHeatmapTracks || [],
+        (track: IGenesetHeatmapTrackSpec) => track.key
+    );
     for (const track of nextProps.genesetHeatmapTracks) {
-        transitionGenesetHeatmapTrack(track, prevGenesetHeatmapTracks[track.key], getTrackSpecKeyToTrackId,
-                                      oncoprint, nextProps, trackIdForRuleSetSharing);
+        transitionGenesetHeatmapTrack(
+            track,
+            prevGenesetHeatmapTracks[track.key],
+            getTrackSpecKeyToTrackId,
+            oncoprint,
+            nextProps,
+            trackIdForRuleSetSharing
+        );
         delete prevGenesetHeatmapTracks[track.key];
     }
-    for (const track of (prevProps.genesetHeatmapTracks || [])) {
+    for (const track of prevProps.genesetHeatmapTracks || []) {
         if (prevGenesetHeatmapTracks.hasOwnProperty(track.key)) {
             // if its still there, then this track no longer exists
-            transitionGenesetHeatmapTrack(undefined, prevGenesetHeatmapTracks[track.key], getTrackSpecKeyToTrackId,
-                                          oncoprint, nextProps, trackIdForRuleSetSharing);
+            transitionGenesetHeatmapTrack(
+                undefined,
+                prevGenesetHeatmapTracks[track.key],
+                getTrackSpecKeyToTrackId,
+                oncoprint,
+                nextProps,
+                trackIdForRuleSetSharing
+            );
         }
     }
 
     // Transition heatmap tracks
-    const prevHeatmapTracks = _.keyBy(prevProps.heatmapTracks || [], (track:IHeatmapTrackSpec)=>track.key);
+    const prevHeatmapTracks = _.keyBy(
+        prevProps.heatmapTracks || [],
+        (track: IHeatmapTrackSpec) => track.key
+    );
     for (let track of nextProps.heatmapTracks) {
-
         // add treatment layout/formatting information to the track specs
-        track.maxProfileValue = treatmentProfileMaxValues[track.molecularProfileId];
-        track.minProfileValue = treatmentProfileMinValues[track.molecularProfileId];
-
-        transitionHeatmapTrack(track, prevHeatmapTracks[track.key], getTrackSpecKeyToTrackId,
-            () => undefined, oncoprint, nextProps, {}, trackIdForRuleSetSharing,
-            undefined);
+        track.maxProfileValue =
+            treatmentProfileMaxValues[track.molecularProfileId];
+        track.minProfileValue =
+            treatmentProfileMinValues[track.molecularProfileId];
+
+        transitionHeatmapTrack(
+            track,
+            prevHeatmapTracks[track.key],
+            getTrackSpecKeyToTrackId,
+            () => undefined,
+            oncoprint,
+            nextProps,
+            {},
+            trackIdForRuleSetSharing,
+            undefined
+        );
         delete prevHeatmapTracks[track.key];
     }
 
-    for (const track of (prevProps.heatmapTracks || [])) {
+    for (const track of prevProps.heatmapTracks || []) {
         // if its still there, then this track no longer exists
         if (prevHeatmapTracks.hasOwnProperty(track.key)) {
-
             // add treatment layout/formatting information to the track specs
-            track.maxProfileValue = treatmentProfileMaxValues[track.molecularProfileId];
-            track.minProfileValue = treatmentProfileMinValues[track.molecularProfileId];
-
-            transitionHeatmapTrack(undefined, prevHeatmapTracks[track.key], getTrackSpecKeyToTrackId,
-                                () => undefined, oncoprint, nextProps, {}, trackIdForRuleSetSharing,
-                                undefined);
+            track.maxProfileValue =
+                treatmentProfileMaxValues[track.molecularProfileId];
+            track.minProfileValue =
+                treatmentProfileMinValues[track.molecularProfileId];
+
+            transitionHeatmapTrack(
+                undefined,
+                prevHeatmapTracks[track.key],
+                getTrackSpecKeyToTrackId,
+                () => undefined,
+                oncoprint,
+                nextProps,
+                {},
+                trackIdForRuleSetSharing,
+                undefined
+            );
         }
     }
     // Oncce tracks have been added and deleted, transition order
-    transitionHeatmapTrackOrder(nextProps, prevProps, oncoprint, getTrackSpecKeyToTrackId);
+    transitionHeatmapTrackOrder(
+        nextProps,
+        prevProps,
+        oncoprint,
+        getTrackSpecKeyToTrackId
+    );
 }
 
 function transitionGeneticTrackOrder(
-    nextProps:IOncoprintProps,
-    prevProps:Partial<IOncoprintProps>,
-    oncoprint:OncoprintJS,
-    getTrackSpecKeyToTrackId:()=>{[key:string]:TrackId}
+    nextProps: IOncoprintProps,
+    prevProps: Partial<IOncoprintProps>,
+    oncoprint: OncoprintJS,
+    getTrackSpecKeyToTrackId: () => { [key: string]: TrackId }
 ) {
-    const nextTracksMap = _.keyBy(nextProps.geneticTracks, "key");
-    const prevTracksMap = _.keyBy(prevProps.geneticTracks || [], "key");
-    const nextOrder = (nextProps.geneticTracksOrder || nextProps.geneticTracks.map(t=>t.key))
-                    .filter(key=>(key in nextTracksMap));
-    const prevOrder = (prevProps.geneticTracksOrder || (prevProps.geneticTracks || []).map(t=>t.key))
-                    .filter(key=>(key in prevTracksMap));
+    const nextTracksMap = _.keyBy(nextProps.geneticTracks, 'key');
+    const prevTracksMap = _.keyBy(prevProps.geneticTracks || [], 'key');
+    const nextOrder = (
+        nextProps.geneticTracksOrder || nextProps.geneticTracks.map(t => t.key)
+    ).filter(key => key in nextTracksMap);
+    const prevOrder = (
+        prevProps.geneticTracksOrder ||
+        (prevProps.geneticTracks || []).map(t => t.key)
+    ).filter(key => key in prevTracksMap);
 
     if (!_.isEqual(nextOrder, prevOrder)) {
         const trackSpecKeyToTrackId = getTrackSpecKeyToTrackId();
-        oncoprint.setTrackGroupOrder(GENETIC_TRACK_GROUP_INDEX, nextOrder.map(key=>trackSpecKeyToTrackId[key]));
+        oncoprint.setTrackGroupOrder(
+            GENETIC_TRACK_GROUP_INDEX,
+            nextOrder.map(key => trackSpecKeyToTrackId[key])
+        );
     }
 }
 
 function transitionHeatmapTrackOrder(
-    nextProps:IOncoprintProps,
-    prevProps:Partial<IOncoprintProps>,
-    oncoprint:OncoprintJS,
-    getTrackSpecKeyToTrackId:()=>{[key:string]:TrackId}
+    nextProps: IOncoprintProps,
+    prevProps: Partial<IOncoprintProps>,
+    oncoprint: OncoprintJS,
+    getTrackSpecKeyToTrackId: () => { [key: string]: TrackId }
 ) {
-    const nextTracksMap = _.keyBy(nextProps.heatmapTracks, "key");
-    const prevTracksMap = _.keyBy(prevProps.heatmapTracks || [], "key");
-
-    _.forEach(nextProps.heatmapTracksOrder || {}, (groupOrder:string[], trackGroupIndex:string)=>{
-        const nextOrder = groupOrder.filter(key=>(key in nextTracksMap));
-        const prevOrder = ((prevProps.heatmapTracksOrder || {})[trackGroupIndex as any] || []).filter(key=>(key in prevTracksMap));
-
-        if (!_.isEqual(nextOrder, prevOrder)) {
-            const trackSpecKeyToTrackId = getTrackSpecKeyToTrackId();
-           // debugger;
-            oncoprint.setTrackGroupOrder(parseInt(trackGroupIndex, 10), nextOrder.map(key=>trackSpecKeyToTrackId[key]));
+    const nextTracksMap = _.keyBy(nextProps.heatmapTracks, 'key');
+    const prevTracksMap = _.keyBy(prevProps.heatmapTracks || [], 'key');
+
+    _.forEach(
+        nextProps.heatmapTracksOrder || {},
+        (groupOrder: string[], trackGroupIndex: string) => {
+            const nextOrder = groupOrder.filter(key => key in nextTracksMap);
+            const prevOrder = (
+                (prevProps.heatmapTracksOrder || {})[trackGroupIndex as any] ||
+                []
+            ).filter(key => key in prevTracksMap);
+
+            if (!_.isEqual(nextOrder, prevOrder)) {
+                const trackSpecKeyToTrackId = getTrackSpecKeyToTrackId();
+                // debugger;
+                oncoprint.setTrackGroupOrder(
+                    parseInt(trackGroupIndex, 10),
+                    nextOrder.map(key => trackSpecKeyToTrackId[key])
+                );
+            }
         }
-    });
+    );
 }
 
 function tryRemoveTrack(
-    nextSpec: {key:string}|undefined,
-    prevSpec: {key:string}|undefined,
-    trackSpecKeyToTrackId:{[key:string]:TrackId},
-    oncoprint:OncoprintJS
+    nextSpec: { key: string } | undefined,
+    prevSpec: { key: string } | undefined,
+    trackSpecKeyToTrackId: { [key: string]: TrackId },
+    oncoprint: OncoprintJS
 ) {
     if (!nextSpec && prevSpec) {
         // remove track, if OncoprintJS hasn't already removed it and told a
         // removeCallback to forget its track ID
         const trackId = trackSpecKeyToTrackId[prevSpec.key];
-        if (typeof trackId !== "undefined") {
+        if (typeof trackId !== 'undefined') {
             if (oncoprint.getTracks().includes(trackId)) {
                 oncoprint.removeTrack(trackId);
             }
@@ -664,28 +905,36 @@ function tryRemoveTrack(
     }
 }
 
-function sortByMutationType(nextProps:Partial<IOncoprintProps>) {
-    return nextProps.distinguishMutationType &&
+function sortByMutationType(nextProps: Partial<IOncoprintProps>) {
+    return (
+        nextProps.distinguishMutationType &&
         nextProps.sortConfig &&
-        nextProps.sortConfig.sortByMutationType;
+        nextProps.sortConfig.sortByMutationType
+    );
 }
 
-function sortByDrivers(nextProps:Partial<IOncoprintProps>) {
-    return nextProps.distinguishDrivers &&
+function sortByDrivers(nextProps: Partial<IOncoprintProps>) {
+    return (
+        nextProps.distinguishDrivers &&
         nextProps.sortConfig &&
-        nextProps.sortConfig.sortByDrivers;
+        nextProps.sortConfig.sortByDrivers
+    );
 }
 
 function updateExpansionTracks<
-    TrackSpecType extends {key: string},
+    TrackSpecType extends { key: string },
     RuleSetRepMap
 >(
-    nextParentSpec: {key: string, expansionTrackList?: TrackSpecType[]} | undefined,
-    prevParentSpec: {key: string, expansionTrackList?: TrackSpecType[]} | undefined,
-    getTrackSpecKeyToTrackId: () => {[key: string]: TrackId},
-    getMolecularProfileMap: () => (
-        {[molecularProfileId: string]: MolecularProfile} | undefined
-    ),
+    nextParentSpec:
+        | { key: string; expansionTrackList?: TrackSpecType[] }
+        | undefined,
+    prevParentSpec:
+        | { key: string; expansionTrackList?: TrackSpecType[] }
+        | undefined,
+    getTrackSpecKeyToTrackId: () => { [key: string]: TrackId },
+    getMolecularProfileMap: () =>
+        | { [molecularProfileId: string]: MolecularProfile }
+        | undefined,
     oncoprint: OncoprintJS,
     nextProps: IOncoprintProps,
     prevProps: Partial<IOncoprintProps>,
@@ -693,10 +942,10 @@ function updateExpansionTracks<
     transitionFunction: (
         expansionTrackSpec: TrackSpecType | undefined,
         prevExpansionTrackSpec: TrackSpecType,
-        getTrackSpecKeyToTrackId: () => {[key: string]: TrackId},
-        getMolecularProfileMap: () => (
-            {[molecularProfileId: string]: MolecularProfile} | undefined
-        ),
+        getTrackSpecKeyToTrackId: () => { [key: string]: TrackId },
+        getMolecularProfileMap: () =>
+            | { [molecularProfileId: string]: MolecularProfile }
+            | undefined,
         oncoprint: OncoprintJS,
         nextProps: IOncoprintProps,
         prevProps: Partial<IOncoprintProps>,
@@ -704,22 +953,31 @@ function updateExpansionTracks<
         expansionParentKey?: string
     ) => void
 ) {
-    const expansionTrackList = (prevParentSpec && prevParentSpec.expansionTrackList
-        ? prevParentSpec.expansionTrackList
-        : []
-    );
-    const nextExpansionTracks = (nextParentSpec && nextParentSpec.expansionTrackList
-        ? nextParentSpec.expansionTrackList
-        : []
+    const expansionTrackList =
+        prevParentSpec && prevParentSpec.expansionTrackList
+            ? prevParentSpec.expansionTrackList
+            : [];
+    const nextExpansionTracks =
+        nextParentSpec && nextParentSpec.expansionTrackList
+            ? nextParentSpec.expansionTrackList
+            : [];
+    const prevExpansionTracks = _.keyBy(
+        expansionTrackList,
+        (track: TrackSpecType) => track.key
     );
-    const prevExpansionTracks = _.keyBy(expansionTrackList, (track:TrackSpecType) => track.key);
     for (const track of nextExpansionTracks) {
         // nextParentSpec cannot be undefined, or we wouldn't have entered
         // this loop
         transitionFunction(
-            track, prevExpansionTracks[track.key], getTrackSpecKeyToTrackId,
-            getMolecularProfileMap, oncoprint, nextProps, prevProps,
-            trackIdForRuleSetSharing, nextParentSpec!.key
+            track,
+            prevExpansionTracks[track.key],
+            getTrackSpecKeyToTrackId,
+            getMolecularProfileMap,
+            oncoprint,
+            nextProps,
+            prevProps,
+            trackIdForRuleSetSharing,
+            nextParentSpec!.key
         );
         delete prevExpansionTracks[track.key];
     }
@@ -727,8 +985,13 @@ function updateExpansionTracks<
         if (prevExpansionTracks.hasOwnProperty(track.key)) {
             // if its still there, then this track no longer exists
             transitionFunction(
-                undefined, prevExpansionTracks[track.key], getTrackSpecKeyToTrackId,
-                getMolecularProfileMap, oncoprint, nextProps, prevProps,
+                undefined,
+                prevExpansionTracks[track.key],
+                getTrackSpecKeyToTrackId,
+                getMolecularProfileMap,
+                oncoprint,
+                nextProps,
+                prevProps,
                 trackIdForRuleSetSharing
             );
         }
@@ -736,15 +999,17 @@ function updateExpansionTracks<
 }
 
 function transitionGeneticTrack(
-    nextSpec:GeneticTrackSpec|undefined,
-    prevSpec:GeneticTrackSpec|undefined,
-    getTrackSpecKeyToTrackId:()=>{[key:string]:TrackId},
-    getMolecularProfileMap:()=>({[molecularProfileId:string]:MolecularProfile}|undefined),
-    oncoprint:OncoprintJS,
-    nextProps:IOncoprintProps,
-    prevProps:Partial<IOncoprintProps>,
-    trackIdForRuleSetSharing:{genetic?:TrackId},
-    expansionParentKey?:string
+    nextSpec: GeneticTrackSpec | undefined,
+    prevSpec: GeneticTrackSpec | undefined,
+    getTrackSpecKeyToTrackId: () => { [key: string]: TrackId },
+    getMolecularProfileMap: () =>
+        | { [molecularProfileId: string]: MolecularProfile }
+        | undefined,
+    oncoprint: OncoprintJS,
+    nextProps: IOncoprintProps,
+    prevProps: Partial<IOncoprintProps>,
+    trackIdForRuleSetSharing: { genetic?: TrackId },
+    expansionParentKey?: string
 ) {
     const trackSpecKeyToTrackId = getTrackSpecKeyToTrackId();
     if (tryRemoveTrack(nextSpec, prevSpec, trackSpecKeyToTrackId, oncoprint)) {
@@ -752,37 +1017,51 @@ function transitionGeneticTrack(
         return;
     } else if (nextSpec && !prevSpec) {
         // Add track
-        const geneticTrackParams:UserTrackSpec<any> = {
-            rule_set_params: getGeneticTrackRuleSetParams(nextProps.distinguishMutationType, nextProps.distinguishDrivers, nextProps.distinguishGermlineMutations),
+        const geneticTrackParams: UserTrackSpec<any> = {
+            rule_set_params: getGeneticTrackRuleSetParams(
+                nextProps.distinguishMutationType,
+                nextProps.distinguishDrivers,
+                nextProps.distinguishGermlineMutations
+            ),
             label: nextSpec.label,
             sublabel: nextSpec.sublabel,
             track_label_color: nextSpec.labelColor || undefined,
             target_group: GENETIC_TRACK_GROUP_INDEX,
-            sortCmpFn: getGeneticTrackSortComparator(sortByMutationType(nextProps), sortByDrivers(nextProps)),
+            sortCmpFn: getGeneticTrackSortComparator(
+                sortByMutationType(nextProps),
+                sortByDrivers(nextProps)
+            ),
             description: nextSpec.oql,
-            data_id_key: "uid",
+            data_id_key: 'uid',
             data: nextSpec.data,
-            tooltipFn: makeGeneticTrackTooltip(nextProps.caseLinkOutInTooltips, getMolecularProfileMap, nextProps.alterationTypesInQuery),
+            tooltipFn: makeGeneticTrackTooltip(
+                nextProps.caseLinkOutInTooltips,
+                getMolecularProfileMap,
+                nextProps.alterationTypesInQuery
+            ),
             track_info: nextSpec.info,
-            $track_info_tooltip_elt: nextSpec.infoTooltip ? $('<div>'+nextSpec.infoTooltip+'</div>') : undefined,
+            $track_info_tooltip_elt: nextSpec.infoTooltip
+                ? $('<div>' + nextSpec.infoTooltip + '</div>')
+                : undefined,
             removeCallback: () => {
                 delete getTrackSpecKeyToTrackId()[nextSpec.key];
                 if (nextSpec.removeCallback) nextSpec.removeCallback();
             },
             expandCallback: nextSpec.expansionCallback || undefined,
             expandButtonTextGetter: () => 'Expand',
-            expansion_of: (
-                expansionParentKey
+            expansion_of: expansionParentKey
                 ? trackSpecKeyToTrackId[expansionParentKey]
-                : undefined
-            ),
-            custom_track_options:nextSpec.customOptions
+                : undefined,
+            custom_track_options: nextSpec.customOptions,
         };
         const newTrackId = oncoprint.addTracks([geneticTrackParams])[0];
         trackSpecKeyToTrackId[nextSpec.key] = newTrackId;
 
-        if (typeof trackIdForRuleSetSharing.genetic !== "undefined") {
-            oncoprint.shareRuleSet(trackIdForRuleSetSharing.genetic, newTrackId);
+        if (typeof trackIdForRuleSetSharing.genetic !== 'undefined') {
+            oncoprint.shareRuleSet(
+                trackIdForRuleSetSharing.genetic,
+                newTrackId
+            );
         }
         trackIdForRuleSetSharing.genetic = newTrackId;
     } else if (nextSpec && prevSpec) {
@@ -790,34 +1069,64 @@ function transitionGeneticTrack(
         const trackId = trackSpecKeyToTrackId[nextSpec.key];
         const nextSortByMutationType = sortByMutationType(nextProps);
         const nextSortByDrivers = sortByDrivers(nextProps);
-        if ((nextSortByMutationType !== sortByMutationType(prevProps)) ||
-            (nextSortByDrivers !== sortByDrivers(prevProps))) {
-            oncoprint.setTrackSortComparator(trackId, getGeneticTrackSortComparator(nextSortByMutationType, nextSortByDrivers));
+        if (
+            nextSortByMutationType !== sortByMutationType(prevProps) ||
+            nextSortByDrivers !== sortByDrivers(prevProps)
+        ) {
+            oncoprint.setTrackSortComparator(
+                trackId,
+                getGeneticTrackSortComparator(
+                    nextSortByMutationType,
+                    nextSortByDrivers
+                )
+            );
         }
         if (nextSpec.data !== prevSpec.data) {
             // shallow equality check
-            oncoprint.setTrackData(trackId, nextSpec.data, "uid");
+            oncoprint.setTrackData(trackId, nextSpec.data, 'uid');
         }
 
         if (hasGeneticTrackTooltipChanged(nextProps, prevProps)) {
-            oncoprint.setTrackTooltipFn(trackId, makeGeneticTrackTooltip(nextProps.caseLinkOutInTooltips, getMolecularProfileMap, nextProps.alterationTypesInQuery));
+            oncoprint.setTrackTooltipFn(
+                trackId,
+                makeGeneticTrackTooltip(
+                    nextProps.caseLinkOutInTooltips,
+                    getMolecularProfileMap,
+                    nextProps.alterationTypesInQuery
+                )
+            );
         }
 
         if (nextSpec.info !== prevSpec.info) {
             oncoprint.setTrackInfo(trackId, nextSpec.info);
         }
         if (nextSpec.infoTooltip !== prevSpec.infoTooltip) {
-            oncoprint.setTrackInfoTooltip(trackId, nextSpec.infoTooltip ? $('<div>'+nextSpec.infoTooltip+'</div>') : undefined);
+            oncoprint.setTrackInfoTooltip(
+                trackId,
+                nextSpec.infoTooltip
+                    ? $('<div>' + nextSpec.infoTooltip + '</div>')
+                    : undefined
+            );
         }
 
         // update ruleset if its changed
         if (hasGeneticTrackRuleSetChanged(nextProps, prevProps)) {
-            if (typeof trackIdForRuleSetSharing.genetic !== "undefined") {
+            if (typeof trackIdForRuleSetSharing.genetic !== 'undefined') {
                 // if theres a track to share, share its ruleset
-                oncoprint.shareRuleSet(trackIdForRuleSetSharing.genetic, trackId);
+                oncoprint.shareRuleSet(
+                    trackIdForRuleSetSharing.genetic,
+                    trackId
+                );
             } else {
                 // otherwise, update ruleset
-                oncoprint.setRuleSet(trackId, getGeneticTrackRuleSetParams(nextProps.distinguishMutationType, nextProps.distinguishDrivers, nextProps.distinguishGermlineMutations));
+                oncoprint.setRuleSet(
+                    trackId,
+                    getGeneticTrackRuleSetParams(
+                        nextProps.distinguishMutationType,
+                        nextProps.distinguishDrivers,
+                        nextProps.distinguishGermlineMutations
+                    )
+                );
             }
         }
         // either way, use this one now
@@ -825,13 +1134,17 @@ function transitionGeneticTrack(
 
         // keep the expansion option on or off as appropriate;
         // the menu re-renders if tracks are added or removed below
-        if (nextSpec.expansionTrackList && nextSpec.expansionTrackList.length > 0) {
+        if (
+            nextSpec.expansionTrackList &&
+            nextSpec.expansionTrackList.length > 0
+        ) {
             oncoprint.disableTrackExpansion(trackId);
         } else if (nextSpec.expansionCallback) {
             oncoprint.enableTrackExpansion(trackId);
         }
-        updateExpansionTracks<GeneticTrackSpec, {genetic?: number}>(
-            nextSpec, prevSpec,
+        updateExpansionTracks<GeneticTrackSpec, { genetic?: number }>(
+            nextSpec,
+            prevSpec,
             getTrackSpecKeyToTrackId,
             getMolecularProfileMap,
             oncoprint,
@@ -844,33 +1157,38 @@ function transitionGeneticTrack(
 }
 
 function transitionClinicalTrack(
-    nextSpec:ClinicalTrackSpec|undefined,
-    prevSpec:ClinicalTrackSpec|undefined,
-    getTrackSpecKeyToTrackId:()=>{[key:string]:TrackId},
-    oncoprint:OncoprintJS,
-    nextProps:IOncoprintProps
+    nextSpec: ClinicalTrackSpec | undefined,
+    prevSpec: ClinicalTrackSpec | undefined,
+    getTrackSpecKeyToTrackId: () => { [key: string]: TrackId },
+    oncoprint: OncoprintJS,
+    nextProps: IOncoprintProps
 ) {
     const trackSpecKeyToTrackId = getTrackSpecKeyToTrackId();
     if (tryRemoveTrack(nextSpec, prevSpec, trackSpecKeyToTrackId, oncoprint)) {
         return;
     } else if (nextSpec && !prevSpec) {
         // Add track
-        const rule_set_params:any = getClinicalTrackRuleSetParams(nextSpec);
+        const rule_set_params: any = getClinicalTrackRuleSetParams(nextSpec);
         rule_set_params.legend_label = nextSpec.label;
         rule_set_params.exclude_from_legend = !nextProps.showClinicalTrackLegends;
         rule_set_params.na_legend_label = nextSpec.na_legend_label;
         const clinicalTrackParams = {
             rule_set_params,
             data: nextSpec.data,
-            data_id_key: "uid",
+            data_id_key: 'uid',
             label: nextSpec.label,
-            description: ((nextSpec.label || "").trim() === (nextSpec.description || "").trim()) ? undefined : nextSpec.description,
+            description:
+                (nextSpec.label || '').trim() ===
+                (nextSpec.description || '').trim()
+                    ? undefined
+                    : nextSpec.description,
             removable: true,
             removeCallback: () => {
                 delete getTrackSpecKeyToTrackId()[nextSpec.key];
             },
-            onClickRemoveInTrackMenu: ()=>{
-                nextProps.onDeleteClinicalTrack && nextProps.onDeleteClinicalTrack(nextSpec.key);
+            onClickRemoveInTrackMenu: () => {
+                nextProps.onDeleteClinicalTrack &&
+                    nextProps.onDeleteClinicalTrack(nextSpec.key);
             },
             sort_direction_changeable: true,
             tooltipFn: makeClinicalTrackTooltip(nextSpec, true),
@@ -880,22 +1198,27 @@ function transitionClinicalTrack(
             init_sort_direction: 0 as 0,
             target_group: CLINICAL_TRACK_GROUP_INDEX,
             onSortDirectionChange: nextProps.onTrackSortDirectionChange,
-            custom_track_options: nextSpec.custom_options
+            custom_track_options: nextSpec.custom_options,
         };
-        trackSpecKeyToTrackId[nextSpec.key] = oncoprint.addTracks([clinicalTrackParams])[0];
+        trackSpecKeyToTrackId[nextSpec.key] = oncoprint.addTracks([
+            clinicalTrackParams,
+        ])[0];
     } else if (nextSpec && prevSpec) {
         // Transition track
         const trackId = trackSpecKeyToTrackId[nextSpec.key];
         if (nextSpec.data !== prevSpec.data) {
             // shallow equality check
-            oncoprint.setTrackData(trackId, nextSpec.data, "uid");
+            oncoprint.setTrackData(trackId, nextSpec.data, 'uid');
         }
         if (nextSpec.altered_uids !== prevSpec.altered_uids) {
             // shallow equality check
             oncoprint.setTrackImportantIds(trackId, nextSpec.altered_uids);
         }
         // set tooltip, its cheap
-        oncoprint.setTrackTooltipFn(trackId, makeClinicalTrackTooltip(nextSpec, true));
+        oncoprint.setTrackTooltipFn(
+            trackId,
+            makeClinicalTrackTooltip(nextSpec, true)
+        );
         // set custom track options if they've shallow changed - its cheap
         if (prevSpec.custom_options !== nextSpec.custom_options) {
             oncoprint.setTrackCustomOptions(trackId, nextSpec.custom_options);
@@ -903,18 +1226,18 @@ function transitionClinicalTrack(
     }
 }
 function transitionGenesetHeatmapTrack(
-    nextSpec:IGenesetHeatmapTrackSpec|undefined,
-    prevSpec:IGenesetHeatmapTrackSpec|undefined,
-    getTrackSpecKeyToTrackId:()=>{[key:string]:TrackId},
-    oncoprint:OncoprintJS,
-    nextProps:IOncoprintProps,
-    trackIdForRuleSetSharing:{genesetHeatmap?:TrackId, heatmap?:TrackId}
+    nextSpec: IGenesetHeatmapTrackSpec | undefined,
+    prevSpec: IGenesetHeatmapTrackSpec | undefined,
+    getTrackSpecKeyToTrackId: () => { [key: string]: TrackId },
+    oncoprint: OncoprintJS,
+    nextProps: IOncoprintProps,
+    trackIdForRuleSetSharing: { genesetHeatmap?: TrackId; heatmap?: TrackId }
 ) {
-
     const trackSpecKeyToTrackId = getTrackSpecKeyToTrackId();
     if (tryRemoveTrack(nextSpec, prevSpec, trackSpecKeyToTrackId, oncoprint)) {
-        updateExpansionTracks<IHeatmapTrackSpec, {heatmap?: TrackId}>(
-            undefined, prevSpec,
+        updateExpansionTracks<IHeatmapTrackSpec, { heatmap?: TrackId }>(
+            undefined,
+            prevSpec,
             getTrackSpecKeyToTrackId,
             () => undefined,
             oncoprint,
@@ -929,7 +1252,7 @@ function transitionGenesetHeatmapTrack(
         const heatmapTrackParams = {
             rule_set_params: getGenesetHeatmapTrackRuleSetParams(),
             data: nextSpec.data,
-            data_id_key: "uid",
+            data_id_key: 'uid',
             has_column_spacing: false,
             track_padding: 0,
             label: nextSpec.label,
@@ -940,21 +1263,28 @@ function transitionGenesetHeatmapTrack(
             init_sort_direction: 0 as 0,
             description: `Gene set scores from ${nextSpec.molecularProfileId}`,
             link_url: nextSpec.trackLinkUrl,
-            tooltipFn: makeHeatmapTrackTooltip(nextSpec.molecularAlterationType, true),
+            tooltipFn: makeHeatmapTrackTooltip(
+                nextSpec.molecularAlterationType,
+                true
+            ),
             onSortDirectionChange: nextProps.onTrackSortDirectionChange,
             expandCallback: nextSpec.expansionCallback,
             expandButtonTextGetter: (is_expanded: boolean) =>
-                `${is_expanded ? 'More' : 'Show'}  genes`
+                `${is_expanded ? 'More' : 'Show'}  genes`,
         };
         const newTrackId = oncoprint.addTracks([heatmapTrackParams])[0];
         trackSpecKeyToTrackId[nextSpec.key] = newTrackId;
 
-        if (typeof trackIdForRuleSetSharing.genesetHeatmap !== "undefined") {
-            oncoprint.shareRuleSet(trackIdForRuleSetSharing.genesetHeatmap, newTrackId);
+        if (typeof trackIdForRuleSetSharing.genesetHeatmap !== 'undefined') {
+            oncoprint.shareRuleSet(
+                trackIdForRuleSetSharing.genesetHeatmap,
+                newTrackId
+            );
         }
         trackIdForRuleSetSharing.genesetHeatmap = newTrackId;
-        updateExpansionTracks<IHeatmapTrackSpec, {heatmap?: TrackId}>(
-            nextSpec, undefined,
+        updateExpansionTracks<IHeatmapTrackSpec, { heatmap?: TrackId }>(
+            nextSpec,
+            undefined,
             getTrackSpecKeyToTrackId,
             () => undefined,
             oncoprint,
@@ -963,18 +1293,21 @@ function transitionGenesetHeatmapTrack(
             trackIdForRuleSetSharing,
             transitionHeatmapTrack
         );
-
     } else if (nextSpec && prevSpec) {
         // Transition track
         const trackId = trackSpecKeyToTrackId[nextSpec.key];
         if (nextSpec.data !== prevSpec.data) {
             // shallow equality check
-            oncoprint.setTrackData(trackId, nextSpec.data, "uid");
+            oncoprint.setTrackData(trackId, nextSpec.data, 'uid');
         }
         // set tooltip, its cheap
-        oncoprint.setTrackTooltipFn(trackId, makeHeatmapTrackTooltip(nextSpec.molecularAlterationType, true));
-        updateExpansionTracks<IHeatmapTrackSpec, {heatmap?: TrackId}>(
-            nextSpec, prevSpec,
+        oncoprint.setTrackTooltipFn(
+            trackId,
+            makeHeatmapTrackTooltip(nextSpec.molecularAlterationType, true)
+        );
+        updateExpansionTracks<IHeatmapTrackSpec, { heatmap?: TrackId }>(
+            nextSpec,
+            prevSpec,
             getTrackSpecKeyToTrackId,
             () => undefined,
             oncoprint,
@@ -987,15 +1320,19 @@ function transitionGenesetHeatmapTrack(
 }
 
 export function transitionHeatmapTrack(
-    nextSpec:IHeatmapTrackSpec|undefined,
-    prevSpec:IHeatmapTrackSpec|undefined,
-    getTrackSpecKeyToTrackId:()=>{[key:string]:TrackId},
-    getMolecularProfileMap: () => (object | undefined),
-    oncoprint:OncoprintJS,
-    nextProps:IOncoprintProps,
-    prevProps:object,
-    trackIdForRuleSetSharing:{heatmap?:TrackId, heatmap01?:TrackId, treatment?: TreatmentProfileToTrackIdMap},
-    expansionParentKey?:string
+    nextSpec: IHeatmapTrackSpec | undefined,
+    prevSpec: IHeatmapTrackSpec | undefined,
+    getTrackSpecKeyToTrackId: () => { [key: string]: TrackId },
+    getMolecularProfileMap: () => object | undefined,
+    oncoprint: OncoprintJS,
+    nextProps: IOncoprintProps,
+    prevProps: object,
+    trackIdForRuleSetSharing: {
+        heatmap?: TrackId;
+        heatmap01?: TrackId;
+        treatment?: TreatmentProfileToTrackIdMap;
+    },
+    expansionParentKey?: string
 ) {
     const trackSpecKeyToTrackId = getTrackSpecKeyToTrackId();
     if (tryRemoveTrack(nextSpec, prevSpec, trackSpecKeyToTrackId, oncoprint)) {
@@ -1005,7 +1342,7 @@ export function transitionHeatmapTrack(
         const heatmapTrackParams = {
             rule_set_params: getHeatmapTrackRuleSetParams(nextSpec),
             data: nextSpec.data,
-            data_id_key: "uid",
+            data_id_key: 'uid',
             has_column_spacing: ifNotDefined(nextSpec.hasColumnSpacing, false),
             track_padding: 0,
             label: nextSpec.label,
@@ -1014,50 +1351,72 @@ export function transitionHeatmapTrack(
             track_label_font_weight: nextSpec.labelFontWeight,
             track_label_left_padding: nextSpec.labelLeftPadding,
             target_group: nextSpec.trackGroupIndex,
-            removable: !!nextSpec.onRemove || !!nextSpec.onClickRemoveInTrackMenu,
+            removable:
+                !!nextSpec.onRemove || !!nextSpec.onClickRemoveInTrackMenu,
             movable: nextSpec.movable,
             na_legend_label: nextSpec.naLegendLabel,
-            removeCallback: ()=>{
+            removeCallback: () => {
                 delete getTrackSpecKeyToTrackId()[nextSpec.key];
                 nextSpec.onRemove && nextSpec.onRemove();
             },
-            onClickRemoveInTrackMenu:()=>{
-                nextSpec.onClickRemoveInTrackMenu && nextSpec.onClickRemoveInTrackMenu();
+            onClickRemoveInTrackMenu: () => {
+                nextSpec.onClickRemoveInTrackMenu &&
+                    nextSpec.onClickRemoveInTrackMenu();
             },
-            sort_direction_changeable: ifNotDefined(nextSpec.sortDirectionChangeable, true),
+            sort_direction_changeable: ifNotDefined(
+                nextSpec.sortDirectionChangeable,
+                true
+            ),
             sortCmpFn: heatmapTrackSortComparator,
-            init_sort_direction: ifNotDefined(nextSpec.initSortDirection, (0 as 0)),
+            init_sort_direction: ifNotDefined(
+                nextSpec.initSortDirection,
+                0 as 0
+            ),
             link_url: nextSpec.trackLinkUrl,
-            description: ifNotDefined(nextSpec.description, `${nextSpec.label} data from ${nextSpec.molecularProfileId}`),
-            tooltipFn: nextSpec.tooltip || makeHeatmapTrackTooltip(nextSpec.molecularAlterationType, true),
-            track_info: nextSpec.info || "",
+            description: ifNotDefined(
+                nextSpec.description,
+                `${nextSpec.label} data from ${nextSpec.molecularProfileId}`
+            ),
+            tooltipFn:
+                nextSpec.tooltip ||
+                makeHeatmapTrackTooltip(nextSpec.molecularAlterationType, true),
+            track_info: nextSpec.info || '',
             onSortDirectionChange: nextProps.onTrackSortDirectionChange,
-            expansion_of: (
-                expansionParentKey
+            expansion_of: expansionParentKey
                 ? trackSpecKeyToTrackId[expansionParentKey]
-                : undefined
-            )
+                : undefined,
         };
         // register new track in oncoprint
-        const newTrackId:number = oncoprint.addTracks([heatmapTrackParams])[0];
+        const newTrackId: number = oncoprint.addTracks([heatmapTrackParams])[0];
         // store relation between React heatmap track specs and OncoprintJS trackIds
         trackSpecKeyToTrackId[nextSpec.key] = newTrackId;
 
-        if (nextSpec.molecularAlterationType !== AlterationTypeConstants.GENERIC_ASSAY) {
-            let trackIdForRuleSetSharingKey:"heatmap"|"heatmap01" = "heatmap";
-            if (nextSpec.molecularAlterationType === "METHYLATION") {
-                trackIdForRuleSetSharingKey = "heatmap01";
+        if (
+            nextSpec.molecularAlterationType !==
+            AlterationTypeConstants.GENERIC_ASSAY
+        ) {
+            let trackIdForRuleSetSharingKey: 'heatmap' | 'heatmap01' =
+                'heatmap';
+            if (nextSpec.molecularAlterationType === 'METHYLATION') {
+                trackIdForRuleSetSharingKey = 'heatmap01';
             }
-            if (typeof trackIdForRuleSetSharing[trackIdForRuleSetSharingKey] !== "undefined") {
-                oncoprint.shareRuleSet(trackIdForRuleSetSharing[trackIdForRuleSetSharingKey]!, newTrackId);
+            if (
+                typeof trackIdForRuleSetSharing[trackIdForRuleSetSharingKey] !==
+                'undefined'
+            ) {
+                oncoprint.shareRuleSet(
+                    trackIdForRuleSetSharing[trackIdForRuleSetSharingKey]!,
+                    newTrackId
+                );
             }
             trackIdForRuleSetSharing[trackIdForRuleSetSharingKey] = newTrackId;
         } else {
             // if the track is a treatment profile, add to trackIdForRuleSetSharing under its `molecularProfileId`
             // this makes the trackId available for existing tracks of the same mol.profile for ruleset sharing
-            trackIdForRuleSetSharing.treatment![nextSpec.molecularProfileId] = newTrackId;
+            trackIdForRuleSetSharing.treatment![
+                nextSpec.molecularProfileId
+            ] = newTrackId;
         }
-
     } else if (nextSpec && prevSpec) {
         // Transition track
         const trackId = trackSpecKeyToTrackId[nextSpec.key];
@@ -1065,21 +1424,34 @@ export function transitionHeatmapTrack(
         // register the new data points in oncoprint
         if (nextSpec.data !== prevSpec.data) {
             // shallow equality check
-            oncoprint.setTrackData(trackId, nextSpec.data, "uid");
+            oncoprint.setTrackData(trackId, nextSpec.data, 'uid');
         }
         if (nextSpec.info !== prevSpec.info && nextSpec.info !== undefined) {
             oncoprint.setTrackInfo(trackId, nextSpec.info);
         }
-        if (nextSpec.movable !== prevSpec.movable && nextSpec.movable !== undefined) {
+        if (
+            nextSpec.movable !== prevSpec.movable &&
+            nextSpec.movable !== undefined
+        ) {
             oncoprint.setTrackMovable(trackId, nextSpec.movable);
         }
         // treatment profile tracks always are associated with the last added added track id
-        if (nextSpec.molecularAlterationType === AlterationTypeConstants.GENERIC_ASSAY
-             && trackIdForRuleSetSharing.treatment![nextSpec.molecularProfileId] !== undefined) {
-                 const rulesetTrackId = trackIdForRuleSetSharing.treatment![nextSpec.molecularProfileId];
-                 oncoprint.shareRuleSet(rulesetTrackId!, trackId);
+        if (
+            nextSpec.molecularAlterationType ===
+                AlterationTypeConstants.GENERIC_ASSAY &&
+            trackIdForRuleSetSharing.treatment![nextSpec.molecularProfileId] !==
+                undefined
+        ) {
+            const rulesetTrackId = trackIdForRuleSetSharing.treatment![
+                nextSpec.molecularProfileId
+            ];
+            oncoprint.shareRuleSet(rulesetTrackId!, trackId);
         }
         // set tooltip, its cheap
-        oncoprint.setTrackTooltipFn(trackId, nextSpec.tooltip || makeHeatmapTrackTooltip(nextSpec.molecularAlterationType, true));
+        oncoprint.setTrackTooltipFn(
+            trackId,
+            nextSpec.tooltip ||
+                makeHeatmapTrackTooltip(nextSpec.molecularAlterationType, true)
+        );
     }
 }
diff --git a/src/shared/components/oncoprint/Oncoprint.tsx b/src/shared/components/oncoprint/Oncoprint.tsx
index 56420b48cfe..543d7a4872f 100644
--- a/src/shared/components/oncoprint/Oncoprint.tsx
+++ b/src/shared/components/oncoprint/Oncoprint.tsx
@@ -1,26 +1,37 @@
-import * as React from "react";
-import OncoprintJS, {TrackId, CustomTrackOption, TrackGroupHeader, TrackSortDirection, InitParams, ColumnLabel} from "oncoprintjs";
-import {GenePanelData, MolecularProfile} from "../../api/generated/CBioPortalAPI";
-import {observer} from "mobx-react";
-import {computed} from "mobx";
-import {transition} from "./DeltaUtils";
-import _ from "lodash";
+import * as React from 'react';
+import OncoprintJS, {
+    TrackId,
+    CustomTrackOption,
+    TrackGroupHeader,
+    TrackSortDirection,
+    InitParams,
+    ColumnLabel,
+} from 'oncoprintjs';
 import {
-    AnnotatedMutation, AnnotatedNumericGeneMolecularData,
-    ExtendedAlteration
-} from "../../../pages/resultsView/ResultsViewPageStore";
-import "./styles.scss";
-import {ShapeParams} from "oncoprintjs/dist/js/oncoprintshape";
+    GenePanelData,
+    MolecularProfile,
+} from '../../api/generated/CBioPortalAPI';
+import { observer } from 'mobx-react';
+import { computed } from 'mobx';
+import { transition } from './DeltaUtils';
+import _ from 'lodash';
+import {
+    AnnotatedMutation,
+    AnnotatedNumericGeneMolecularData,
+    ExtendedAlteration,
+} from '../../../pages/resultsView/ResultsViewPageStore';
+import './styles.scss';
+import { ShapeParams } from 'oncoprintjs/dist/js/oncoprintshape';
 
 export type ClinicalTrackDatum = {
     attr_id: string;
     study_id?: string;
-    sample?:string;
-    patient?:string;
+    sample?: string;
+    patient?: string;
     uid: string;
-    attr_val_counts: {[val:string]:number};
-    attr_val?: string|number|ClinicalTrackDatum["attr_val_counts"];
-    na?:boolean;
+    attr_val_counts: { [val: string]: number };
+    attr_val?: string | number | ClinicalTrackDatum['attr_val_counts'];
+    na?: boolean;
 };
 
 export type ClinicalTrackSpec = {
@@ -28,32 +39,35 @@ export type ClinicalTrackSpec = {
     label: string;
     description: string;
     data: ClinicalTrackDatum[];
-    altered_uids?:string[];
-    na_legend_label?:string;
-    na_tooltip_value?:string; // If given, then show a tooltip over NA columns that has this value
-    custom_options?:CustomTrackOption[];
-} & ({
-    datatype: "counts";
-    countsCategoryLabels:string[];
-    countsCategoryFills:string[];
-} | {
-    datatype: "number";
-    numberRange:[number, number];
-    numberLogScale?:boolean;
-} | {
-    datatype: "string";
-    category_to_color?:{[category:string]:string}
-});
+    altered_uids?: string[];
+    na_legend_label?: string;
+    na_tooltip_value?: string; // If given, then show a tooltip over NA columns that has this value
+    custom_options?: CustomTrackOption[];
+} & (
+    | {
+          datatype: 'counts';
+          countsCategoryLabels: string[];
+          countsCategoryFills: string[];
+      }
+    | {
+          datatype: 'number';
+          numberRange: [number, number];
+          numberLogScale?: boolean;
+      }
+    | {
+          datatype: 'string';
+          category_to_color?: { [category: string]: string };
+      });
 
 export interface IBaseHeatmapTrackDatum {
-    profile_data: number|null;
+    profile_data: number | null;
     sample?: string;
     patient: string;
     study_id: string;
     uid: string;
-    na?:boolean;
-    category?:string;
-    thresholdType?:">"|"<";
+    na?: boolean;
+    category?: string;
+    thresholdType?: '>' | '<';
 }
 export interface IGeneHeatmapTrackDatum extends IBaseHeatmapTrackDatum {
     hugo_gene_symbol: string;
@@ -65,30 +79,46 @@ export interface ITreatmentHeatmapTrackDatum extends IBaseHeatmapTrackDatum {
     treatment_id: string;
 }
 
-export type GeneticTrackDatum_Data =
-    Pick<ExtendedAlteration&AnnotatedMutation&AnnotatedNumericGeneMolecularData,
-        "hugoGeneSymbol" | "molecularProfileAlterationType" | "proteinChange" | "driverFilter" |
-        "driverFilterAnnotation" | "driverTiersFilter" | "driverTiersFilterAnnotation" | "oncoKbOncogenic" |
-        "alterationSubType" | "value" | "mutationType" | "isHotspot" | "entrezGeneId" | "putativeDriver" | "mutationStatus">;
-
-export type GeneticTrackDatum_ProfiledIn = {genePanelId?:string, molecularProfileId:string};
+export type GeneticTrackDatum_Data = Pick<
+    ExtendedAlteration & AnnotatedMutation & AnnotatedNumericGeneMolecularData,
+    | 'hugoGeneSymbol'
+    | 'molecularProfileAlterationType'
+    | 'proteinChange'
+    | 'driverFilter'
+    | 'driverFilterAnnotation'
+    | 'driverTiersFilter'
+    | 'driverTiersFilterAnnotation'
+    | 'oncoKbOncogenic'
+    | 'alterationSubType'
+    | 'value'
+    | 'mutationType'
+    | 'isHotspot'
+    | 'entrezGeneId'
+    | 'putativeDriver'
+    | 'mutationStatus'
+>;
+
+export type GeneticTrackDatum_ProfiledIn = {
+    genePanelId?: string;
+    molecularProfileId: string;
+};
 
 export type GeneticTrackDatum = {
     trackLabel: string;
-    sample?:string;
-    patient:string;
-    study_id:string;
-    uid:string;
-    data:GeneticTrackDatum_Data[];
+    sample?: string;
+    patient: string;
+    study_id: string;
+    uid: string;
+    data: GeneticTrackDatum_Data[];
     profiled_in?: GeneticTrackDatum_ProfiledIn[];
-    not_profiled_in?:GeneticTrackDatum_ProfiledIn[];
+    not_profiled_in?: GeneticTrackDatum_ProfiledIn[];
     na?: boolean;
-    disp_mut?:string;
-    disp_cna?:string;
-    disp_mrna?:string;
-    disp_prot?:string;
-    disp_fusion?:boolean;
-    disp_germ?:boolean;
+    disp_mut?: string;
+    disp_cna?: string;
+    disp_mrna?: string;
+    disp_prot?: string;
+    disp_fusion?: boolean;
+    disp_germ?: boolean;
 };
 
 export type GeneticTrackSpec = {
@@ -97,47 +127,47 @@ export type GeneticTrackSpec = {
     sublabel?: string;
     oql?: string; // OQL corresponding to the track
     info: string;
-    infoTooltip?:string;
+    infoTooltip?: string;
     data: GeneticTrackDatum[];
     expansionCallback?: () => void;
     removeCallback?: () => void;
     expansionTrackList?: GeneticTrackSpec[];
     labelColor?: string;
-    customOptions?:CustomTrackOption[];
+    customOptions?: CustomTrackOption[];
 };
 
 export interface IBaseHeatmapTrackSpec {
     key: string; // for efficient diffing, just like in React. must be unique
     label: string;
     molecularProfileId: string; // source
-    molecularAlterationType: MolecularProfile["molecularAlterationType"];
-    datatype: MolecularProfile["datatype"];
+    molecularAlterationType: MolecularProfile['molecularAlterationType'];
+    datatype: MolecularProfile['datatype'];
     data: IBaseHeatmapTrackDatum[];
     description?: string;
     trackGroupIndex: number;
-    hasColumnSpacing?:boolean;
+    hasColumnSpacing?: boolean;
 }
 export interface IHeatmapTrackSpec extends IBaseHeatmapTrackSpec {
     data: IBaseHeatmapTrackDatum[]; // can be IGeneHeatmapTrackDatum or ITreatmentHeatmapTrackDatum
-    naLegendLabel?:string;
+    naLegendLabel?: string;
     info?: string;
     labelColor?: string;
     labelCircleColor?: string;
-    labelFontWeight?:string;
-    labelLeftPadding?:number;
-    tooltip?:(dataUnderMouse:IGeneHeatmapTrackDatum[])=>JQuery;
-    initSortDirection?:TrackSortDirection;
-    movable?:boolean;
-    sortDirectionChangeable?:boolean; // never updated
+    labelFontWeight?: string;
+    labelLeftPadding?: number;
+    tooltip?: (dataUnderMouse: IGeneHeatmapTrackDatum[]) => JQuery;
+    initSortDirection?: TrackSortDirection;
+    movable?: boolean;
+    sortDirectionChangeable?: boolean; // never updated
     trackLinkUrl?: string | undefined;
-    onRemove?:()=>void;
-    onClickRemoveInTrackMenu?: ()=>void;
+    onRemove?: () => void;
+    onClickRemoveInTrackMenu?: () => void;
     molecularProfileName?: string;
     pivotThreshold?: number;
     sortOrder?: string;
     maxProfileValue?: number;
     minProfileValue?: number;
-    customNaShapes?:ShapeParams[];
+    customNaShapes?: ShapeParams[];
 }
 export interface IGenesetHeatmapTrackSpec extends IBaseHeatmapTrackSpec {
     data: IGenesetHeatmapTrackDatum[];
@@ -150,124 +180,144 @@ export const GENETIC_TRACK_GROUP_INDEX = 1;
 export const CLINICAL_TRACK_GROUP_INDEX = 0;
 
 export interface IOncoprintProps {
-    oncoprintRef?:(oncoprint:OncoprintJS)=>void;
+    oncoprintRef?: (oncoprint: OncoprintJS) => void;
 
     clinicalTracks: ClinicalTrackSpec[];
     geneticTracks: GeneticTrackSpec[];
-    geneticTracksOrder?:string[]; // track keys
+    geneticTracksOrder?: string[]; // track keys
     genesetHeatmapTracks: IGenesetHeatmapTrackSpec[];
     heatmapTracks: IHeatmapTrackSpec[];
-    heatmapTracksOrder?:{[trackGroupIndex:number]:string[]}; // track keys
-    heatmapTrackHeaders?:{[trackGroupIndex:number]:TrackGroupHeader};
-    divId:string;
-    width:number;
-    initParams?:InitParams;
-    caseLinkOutInTooltips:boolean;
-
-    molecularProfileIdToMolecularProfile?:{[molecularProfileId:string]:MolecularProfile};
+    heatmapTracksOrder?: { [trackGroupIndex: number]: string[] }; // track keys
+    heatmapTrackHeaders?: { [trackGroupIndex: number]: TrackGroupHeader };
+    divId: string;
+    width: number;
+    initParams?: InitParams;
+    caseLinkOutInTooltips: boolean;
+
+    molecularProfileIdToMolecularProfile?: {
+        [molecularProfileId: string]: MolecularProfile;
+    };
 
-    horzZoomToFitIds?:string[];
+    horzZoomToFitIds?: string[];
 
-    hiddenIds?:string[];
-    columnLabels?:{[uid:string]:ColumnLabel};
-    highlightedIds?:string[];
-    highlightedTracks?:string[]; // track keys
+    hiddenIds?: string[];
+    columnLabels?: { [uid: string]: ColumnLabel };
+    highlightedIds?: string[];
+    highlightedTracks?: string[]; // track keys
 
-    alterationTypesInQuery?:string[];
+    alterationTypesInQuery?: string[];
 
-    distinguishMutationType?:boolean;
-    distinguishDrivers?:boolean;
-    distinguishGermlineMutations?:boolean;
+    distinguishMutationType?: boolean;
+    distinguishDrivers?: boolean;
+    distinguishGermlineMutations?: boolean;
 
-    showTrackLabels?:boolean;
-    showSublabels?:boolean;
+    showTrackLabels?: boolean;
+    showSublabels?: boolean;
 
-    sortConfig?:{
-        order?:string[]; // overrides below options if present
+    sortConfig?: {
+        order?: string[]; // overrides below options if present
 
         clusterHeatmapTrackGroupIndex?: number; // overrides below options if present
 
-        sortByMutationType?:boolean;
-        sortByDrivers?:boolean;
+        sortByMutationType?: boolean;
+        sortByDrivers?: boolean;
     };
-    showClinicalTrackLegends?:boolean;
-    showWhitespaceBetweenColumns?:boolean;
-    showMinimap?:boolean;
+    showClinicalTrackLegends?: boolean;
+    showWhitespaceBetweenColumns?: boolean;
+    showMinimap?: boolean;
 
-    onMinimapClose?:()=>void;
-    onDeleteClinicalTrack?:(key:string)=>void;
-    onTrackSortDirectionChange?: (trackId:TrackId, dir:number)=>void;
+    onMinimapClose?: () => void;
+    onDeleteClinicalTrack?: (key: string) => void;
+    onTrackSortDirectionChange?: (trackId: TrackId, dir: number) => void;
 
-    suppressRendering?:boolean;
-    onSuppressRendering?:()=>void;
-    onReleaseRendering?:()=>void;
+    suppressRendering?: boolean;
+    onSuppressRendering?: () => void;
+    onReleaseRendering?: () => void;
 }
 
 @observer
 export default class Oncoprint extends React.Component<IOncoprintProps, {}> {
-    private div:HTMLDivElement;
-    public oncoprint:OncoprintJS|undefined;
-    private trackSpecKeyToTrackId:{[key:string]:TrackId};
-    private lastTransitionProps:IOncoprintProps;
+    private div: HTMLDivElement;
+    public oncoprint: OncoprintJS | undefined;
+    private trackSpecKeyToTrackId: { [key: string]: TrackId };
+    private lastTransitionProps: IOncoprintProps;
 
-    constructor(props:IOncoprintProps) {
+    constructor(props: IOncoprintProps) {
         super(props);
-        
+
         this.trackSpecKeyToTrackId = {};
         this.divRefHandler = this.divRefHandler.bind(this);
-        this.refreshOncoprint = _.debounce(this.refreshOncoprint.bind(this),  0);
+        this.refreshOncoprint = _.debounce(this.refreshOncoprint.bind(this), 0);
     }
 
-    private divRefHandler(div:HTMLDivElement) {
+    private divRefHandler(div: HTMLDivElement) {
         this.div = div;
     }
 
-    public getTrackSpecKey(targetTrackId:TrackId) {
-        let ret:string|null = null;
+    public getTrackSpecKey(targetTrackId: TrackId) {
+        let ret: string | null = null;
 
-        _.forEach(this.trackSpecKeyToTrackId, (trackId:TrackId, key:string)=>{
-            if (trackId === targetTrackId) {
-                ret = key;
-                return false;
+        _.forEach(
+            this.trackSpecKeyToTrackId,
+            (trackId: TrackId, key: string) => {
+                if (trackId === targetTrackId) {
+                    ret = key;
+                    return false;
+                }
             }
-        });
+        );
 
         return ret;
     }
 
     @computed get sortByMutationType() {
-        return  this.props.distinguishMutationType &&
-                this.props.sortConfig &&
-                this.props.sortConfig.sortByMutationType;
+        return (
+            this.props.distinguishMutationType &&
+            this.props.sortConfig &&
+            this.props.sortConfig.sortByMutationType
+        );
     }
 
     @computed get sortByDrivers() {
-        return this.props.distinguishDrivers &&
-                this.props.sortConfig &&
-                this.props.sortConfig.sortByDrivers;
+        return (
+            this.props.distinguishDrivers &&
+            this.props.sortConfig &&
+            this.props.sortConfig.sortByDrivers
+        );
     }
 
-    private refreshOncoprint(props:IOncoprintProps) {
+    private refreshOncoprint(props: IOncoprintProps) {
         if (!this.oncoprint) {
             // instantiate new one
-            this.oncoprint = new OncoprintJS(`#${props.divId}`, props.width, props.initParams);
-            this.oncoprint.setTrackGroupLegendOrder([GENETIC_TRACK_GROUP_INDEX, CLINICAL_TRACK_GROUP_INDEX]);
+            this.oncoprint = new OncoprintJS(
+                `#${props.divId}`,
+                props.width,
+                props.initParams
+            );
+            this.oncoprint.setTrackGroupLegendOrder([
+                GENETIC_TRACK_GROUP_INDEX,
+                CLINICAL_TRACK_GROUP_INDEX,
+            ]);
             (window as any).frontendOnc = this.oncoprint;
             if (props.oncoprintRef) {
                 props.oncoprintRef(this.oncoprint);
             }
         }
         if (!this.oncoprint.webgl_unavailable) {
-            transition(props, this.lastTransitionProps || {}, this.oncoprint, ()=>this.trackSpecKeyToTrackId,
-                ()=> {
-                    return this.props.molecularProfileIdToMolecularProfile
+            transition(
+                props,
+                this.lastTransitionProps || {},
+                this.oncoprint,
+                () => this.trackSpecKeyToTrackId,
+                () => {
+                    return this.props.molecularProfileIdToMolecularProfile;
                 }
             );
             this.lastTransitionProps = _.clone(props);
         }
     }
 
-    componentWillReceiveProps(nextProps:IOncoprintProps) {
+    componentWillReceiveProps(nextProps: IOncoprintProps) {
         this.refreshOncoprint(nextProps);
     }
 
@@ -287,6 +337,6 @@ export default class Oncoprint extends React.Component<IOncoprintProps, {}> {
     }
 
     render() {
-        return (<div id={this.props.divId} ref={this.divRefHandler}/>);
+        return <div id={this.props.divId} ref={this.divRefHandler} />;
     }
 }
diff --git a/src/shared/components/oncoprint/OncoprintUtils.spec.ts b/src/shared/components/oncoprint/OncoprintUtils.spec.ts
index 3a7c395c3be..26292439765 100644
--- a/src/shared/components/oncoprint/OncoprintUtils.spec.ts
+++ b/src/shared/components/oncoprint/OncoprintUtils.spec.ts
@@ -3,31 +3,31 @@ import {
     makeGeneticTrackWith,
     percentAltered,
     extractTreatmentSelections,
-    getTreatmentTrackRuleSetParams
-} from "./OncoprintUtils";
-import {observable} from "mobx";
+    getTreatmentTrackRuleSetParams,
+} from './OncoprintUtils';
+import { observable } from 'mobx';
 import * as _ from 'lodash';
-import {assert} from 'chai';
-import {IQueriedMergedTrackCaseData} from "../../../pages/resultsView/ResultsViewPageStore";
+import { assert } from 'chai';
+import { IQueriedMergedTrackCaseData } from '../../../pages/resultsView/ResultsViewPageStore';
 import { splitHeatmapTextField } from 'shared/components/oncoprint/OncoprintUtils';
 import { ISelectOption } from 'shared/components/oncoprint/controls/OncoprintControls';
-import { IHeatmapTrackSpec, IBaseHeatmapTrackDatum } from "./Oncoprint";
-import { IGradientAndCategoricalRuleSetParams } from "oncoprintjs";
-import { isMutationProfile } from "shared/lib/StoreUtils";
+import { IHeatmapTrackSpec, IBaseHeatmapTrackDatum } from './Oncoprint';
+import { IGradientAndCategoricalRuleSetParams } from 'oncoprintjs';
+import { isMutationProfile } from 'shared/lib/StoreUtils';
 
 describe('OncoprintUtils', () => {
     describe('alterationInfoForCaseAggregatedDataByOQLLine', () => {
         it('counts two sequenced samples if the gene was sequenced in two out of three samples', () => {
             // given
             const dataByCase = {
-                samples: {'SAMPLE1': [], 'SAMPLE2': [], 'SAMPLE3': []},
-                patients: {}
+                samples: { SAMPLE1: [], SAMPLE2: [], SAMPLE3: [] },
+                patients: {},
             };
-            const sequencedSampleKeysByGene = {'TTN': ['SAMPLE2', 'SAMPLE3']};
+            const sequencedSampleKeysByGene = { TTN: ['SAMPLE2', 'SAMPLE3'] };
             // when
             const info = alterationInfoForCaseAggregatedDataByOQLLine(
                 true,
-                {cases: dataByCase, oql: {gene: 'TTN'}},
+                { cases: dataByCase, oql: { gene: 'TTN' } },
                 sequencedSampleKeysByGene,
                 {}
             );
@@ -39,13 +39,13 @@ describe('OncoprintUtils', () => {
             // given
             const dataByCase = {
                 samples: {},
-                patients: {'PATIENT1': [], 'PATIENT2': []}
+                patients: { PATIENT1: [], PATIENT2: [] },
             };
-            const sequencedPatientKeysByGene = {'ADH1A': []};
+            const sequencedPatientKeysByGene = { ADH1A: [] };
             // when
             const info = alterationInfoForCaseAggregatedDataByOQLLine(
                 false,
-                {cases: dataByCase, oql: {gene: 'ADH1A'}},
+                { cases: dataByCase, oql: { gene: 'ADH1A' } },
                 {},
                 sequencedPatientKeysByGene
             );
@@ -57,19 +57,19 @@ describe('OncoprintUtils', () => {
             // given
             const dataByCase = {
                 samples: {},
-                patients: {'PATIENT1': [], 'PATIENT2': [], 'PATIENT3': []}
+                patients: { PATIENT1: [], PATIENT2: [], PATIENT3: [] },
             };
             const sequencedPatientKeysByGene = {
-                'VEGFA': ['PATIENT1', 'PATIENT2'],
-                'VEGFB': ['PATIENT1', 'PATIENT3'],
-                'CXCL8': ['PATIENT1', 'PATIENT3']
+                VEGFA: ['PATIENT1', 'PATIENT2'],
+                VEGFB: ['PATIENT1', 'PATIENT3'],
+                CXCL8: ['PATIENT1', 'PATIENT3'],
             };
             // when
             const info = alterationInfoForCaseAggregatedDataByOQLLine(
                 false,
                 {
                     cases: dataByCase,
-                    oql: ['CXCL8', 'VEGFA', 'VEGFB']
+                    oql: ['CXCL8', 'VEGFA', 'VEGFB'],
                 },
                 {},
                 sequencedPatientKeysByGene
@@ -81,19 +81,19 @@ describe('OncoprintUtils', () => {
         it("counts one sequenced sample if the other one wasn't covered by either of the genes", () => {
             // given
             const dataByCase = {
-                samples: {'SAMPLE1': [], 'SAMPLE2': []},
-                patients: {}
+                samples: { SAMPLE1: [], SAMPLE2: [] },
+                patients: {},
             };
             const sequencedSampleKeysByGene = {
-                'MYC': ['SAMPLE2'],
-                'CDK8': []
+                MYC: ['SAMPLE2'],
+                CDK8: [],
             };
             // when
             const info = alterationInfoForCaseAggregatedDataByOQLLine(
                 true,
                 {
                     cases: dataByCase,
-                    oql: ['MYC', 'CDK8']
+                    oql: ['MYC', 'CDK8'],
                 },
                 sequencedSampleKeysByGene,
                 {}
@@ -105,38 +105,52 @@ describe('OncoprintUtils', () => {
 
     describe('makeGeneticTrackWith', () => {
         const makeMinimalCoverageRecord = () => ({
-            byGene: {}, allGenes: [],
-            notProfiledByGene: {}, notProfiledAllGenes: []
+            byGene: {},
+            allGenes: [],
+            notProfiledByGene: {},
+            notProfiledAllGenes: [],
         });
         const makeMinimal3Patient3GeneStoreProperties = () => ({
             samples: [],
             patients: [
-                { 'patientId': 'TCGA-02-0001', 'studyId': 'gbm_tcga', 'uniquePatientKey': 'VENHQS0wMi0wMDAxOmdibV90Y2dh' },
-                { 'patientId': 'TCGA-02-0003', 'studyId': 'gbm_tcga', 'uniquePatientKey': 'VENHQS0wMi0wMDAzOmdibV90Y2dh' },
-                { 'patientId': 'TCGA-02-0006', 'studyId': 'gbm_tcga', 'uniquePatientKey': 'VENHQS0wMi0wMDA2OmdibV90Y2dh' }
+                {
+                    patientId: 'TCGA-02-0001',
+                    studyId: 'gbm_tcga',
+                    uniquePatientKey: 'VENHQS0wMi0wMDAxOmdibV90Y2dh',
+                },
+                {
+                    patientId: 'TCGA-02-0003',
+                    studyId: 'gbm_tcga',
+                    uniquePatientKey: 'VENHQS0wMi0wMDAzOmdibV90Y2dh',
+                },
+                {
+                    patientId: 'TCGA-02-0006',
+                    studyId: 'gbm_tcga',
+                    uniquePatientKey: 'VENHQS0wMi0wMDA2OmdibV90Y2dh',
+                },
             ],
             coverageInformation: {
                 samples: {},
                 patients: {
-                    'VENHQS0wMi0wMDAxOmdibV90Y2dh': makeMinimalCoverageRecord(),
-                    'VENHQS0wMi0wMDAzOmdibV90Y2dh': makeMinimalCoverageRecord(),
-                    'VENHQS0wMi0wMDA2OmdibV90Y2dh': makeMinimalCoverageRecord()
-                }
+                    VENHQS0wMi0wMDAxOmdibV90Y2dh: makeMinimalCoverageRecord(),
+                    VENHQS0wMi0wMDAzOmdibV90Y2dh: makeMinimalCoverageRecord(),
+                    VENHQS0wMi0wMDA2OmdibV90Y2dh: makeMinimalCoverageRecord(),
+                },
             },
             sequencedSampleKeysByGene: {},
-            sequencedPatientKeysByGene: {'BRCA1': [], 'PTEN': [], 'TP53': []},
+            sequencedPatientKeysByGene: { BRCA1: [], PTEN: [], TP53: [] },
             selectedMolecularProfiles: [],
             expansionIndexMap: observable.map<number[]>(),
             hideGermlineMutations: false,
-            oncoprint: {} as any
+            oncoprint: {} as any,
         });
         const makeMinimal3Patient3GeneCaseData = () => ({
             samples: {},
             patients: {
-                'VENHQS0wMi0wMDAxOmdibV90Y2dh': [],
-                'VENHQS0wMi0wMDAzOmdibV90Y2dh': [],
-                'VENHQS0wMi0wMDA2OmdibV90Y2dh': []
-            }
+                VENHQS0wMi0wMDAxOmdibV90Y2dh: [],
+                VENHQS0wMi0wMDAzOmdibV90Y2dh: [],
+                VENHQS0wMi0wMDA2OmdibV90Y2dh: [],
+            },
         });
         const MINIMAL_TRACK_INDEX = 0;
 
@@ -149,14 +163,14 @@ describe('OncoprintUtils', () => {
                 oql: {
                     gene: 'TP53',
                     oql_line: 'TP53;',
-                    parsed_oql_line: {gene: 'TP53', alterations: []},
-                    data: []
-                }
+                    parsed_oql_line: { gene: 'TP53', alterations: [] },
+                    data: [],
+                },
             };
             // when the track formatting function is called with this query
             const trackFunction = makeGeneticTrackWith({
                 sampleMode: false,
-                ...storeProperties
+                ...storeProperties,
             });
             const track = trackFunction(queryData, MINIMAL_TRACK_INDEX);
             // then it returns a track with the same label and OQL
@@ -170,15 +184,27 @@ describe('OncoprintUtils', () => {
             const storeProperties = makeMinimal3Patient3GeneStoreProperties();
             const queryData = {
                 cases: makeMinimal3Patient3GeneCaseData(),
-                oql: {list: [
-                    {gene: 'BRCA1', oql_line: 'BRCA1;', parsed_oql_line: {gene: 'BRCA1', alterations: []}, data: []},
-                    {gene: 'PTEN', oql_line: 'PTEN;', parsed_oql_line: {gene: 'PTEN', alterations: []}, data: []}
-                ]}
+                oql: {
+                    list: [
+                        {
+                            gene: 'BRCA1',
+                            oql_line: 'BRCA1;',
+                            parsed_oql_line: { gene: 'BRCA1', alterations: [] },
+                            data: [],
+                        },
+                        {
+                            gene: 'PTEN',
+                            oql_line: 'PTEN;',
+                            parsed_oql_line: { gene: 'PTEN', alterations: [] },
+                            data: [],
+                        },
+                    ],
+                },
             };
             // when the track formatting function is called with this query
             const trackFunction = makeGeneticTrackWith({
                 sampleMode: false,
-                ...storeProperties
+                ...storeProperties,
             });
             const track = trackFunction(queryData, MINIMAL_TRACK_INDEX);
             // then it returns a track with the genes' OQL and labels
@@ -194,16 +220,26 @@ describe('OncoprintUtils', () => {
                 cases: makeMinimal3Patient3GeneCaseData(),
                 oql: {
                     list: [
-                        {gene: 'BRCA1', oql_line: 'BRCA1;', parsed_oql_line: {gene: 'BRCA1', alterations: []}, data: []},
-                        {gene: 'PTEN', oql_line: 'PTEN;', parsed_oql_line: {gene: 'PTEN', alterations: []}, data: []}
+                        {
+                            gene: 'BRCA1',
+                            oql_line: 'BRCA1;',
+                            parsed_oql_line: { gene: 'BRCA1', alterations: [] },
+                            data: [],
+                        },
+                        {
+                            gene: 'PTEN',
+                            oql_line: 'PTEN;',
+                            parsed_oql_line: { gene: 'PTEN', alterations: [] },
+                            data: [],
+                        },
                     ],
-                    label: 'HELLO'
-                }
+                    label: 'HELLO',
+                },
             };
             // when the track formatting function is called with this query
             const trackFunction = makeGeneticTrackWith({
                 sampleMode: false,
-                ...storeProperties
+                ...storeProperties,
             });
             const track = trackFunction(queryData, MINIMAL_TRACK_INDEX);
             // then it returns a track with that label and the genes' OQL
@@ -218,14 +254,19 @@ describe('OncoprintUtils', () => {
                 cases: makeMinimal3Patient3GeneCaseData(),
                 oql: {
                     list: [
-                        {gene: 'TTN', oql_line: 'TTN;', parsed_oql_line: {gene: 'TTN', alterations: []}, data: []}
-                    ]
-                }
+                        {
+                            gene: 'TTN',
+                            oql_line: 'TTN;',
+                            parsed_oql_line: { gene: 'TTN', alterations: [] },
+                            data: [],
+                        },
+                    ],
+                },
             };
             // when
             const trackFunction = makeGeneticTrackWith({
                 sampleMode: false,
-                ...storeProperties
+                ...storeProperties,
             });
             const track = trackFunction(queryData, MINIMAL_TRACK_INDEX);
             // then
@@ -239,25 +280,61 @@ describe('OncoprintUtils', () => {
                 cases: makeMinimal3Patient3GeneCaseData(),
                 oql: {
                     list: [
-                        {gene: 'FOLR1', oql_line: 'FOLR1;', parsed_oql_line: {gene: 'FOLR1', alterations: []}, data: []},
-                        {gene: 'FOLR2', oql_line: 'FOLR2;', parsed_oql_line: {gene: 'FOLR2', alterations: []}, data: []},
-                        {gene: 'IZUMO1R', oql_line: 'IZUMO1R;', parsed_oql_line: {gene: 'IZUMO1R', alterations: []}, data: []}
-                    ]
+                        {
+                            gene: 'FOLR1',
+                            oql_line: 'FOLR1;',
+                            parsed_oql_line: { gene: 'FOLR1', alterations: [] },
+                            data: [],
+                        },
+                        {
+                            gene: 'FOLR2',
+                            oql_line: 'FOLR2;',
+                            parsed_oql_line: { gene: 'FOLR2', alterations: [] },
+                            data: [],
+                        },
+                        {
+                            gene: 'IZUMO1R',
+                            oql_line: 'IZUMO1R;',
+                            parsed_oql_line: {
+                                gene: 'IZUMO1R',
+                                alterations: [],
+                            },
+                            data: [],
+                        },
+                    ],
                 },
                 list: [
                     {
                         cases: makeMinimal3Patient3GeneCaseData(),
-                        oql: {gene: 'FOLR1', oql_line: 'FOLR1;', parsed_oql_line: {gene: 'FOLR1', alterations: []}, data: []},
+                        oql: {
+                            gene: 'FOLR1',
+                            oql_line: 'FOLR1;',
+                            parsed_oql_line: { gene: 'FOLR1', alterations: [] },
+                            data: [],
+                        },
                     },
                     {
                         cases: makeMinimal3Patient3GeneCaseData(),
-                        oql: {gene: 'FOLR2', oql_line: 'FOLR2;', parsed_oql_line: {gene: 'FOLR2', alterations: []}, data: []},
+                        oql: {
+                            gene: 'FOLR2',
+                            oql_line: 'FOLR2;',
+                            parsed_oql_line: { gene: 'FOLR2', alterations: [] },
+                            data: [],
+                        },
                     },
                     {
                         cases: makeMinimal3Patient3GeneCaseData(),
-                        oql: {gene: 'IZUMO1R', oql_line: 'IZUMO1R;', parsed_oql_line: {gene: 'IZUMO1R', alterations: []}, data: []}
-                    }
-                ]
+                        oql: {
+                            gene: 'IZUMO1R',
+                            oql_line: 'IZUMO1R;',
+                            parsed_oql_line: {
+                                gene: 'IZUMO1R',
+                                alterations: [],
+                            },
+                            data: [],
+                        },
+                    },
+                ],
             };
             // when
             const trackFunction = makeGeneticTrackWith({
@@ -273,75 +350,101 @@ describe('OncoprintUtils', () => {
             );
         });
 
-        it("includes expansion tracks in the spec if the observable lists them", () => {
+        it('includes expansion tracks in the spec if the observable lists them', () => {
             // given
-            const queryData:IQueriedMergedTrackCaseData = {
+            const queryData: IQueriedMergedTrackCaseData = {
                 cases: makeMinimal3Patient3GeneCaseData(),
                 oql: {
                     list: [
-                        {gene: 'PIK3CA', oql_line: 'PIK3CA;', parsed_oql_line: {gene: 'PIK3CA', alterations: []}, data: []},
-                        {gene: 'MTOR', oql_line: 'MTOR;', parsed_oql_line: {gene: 'MTOR', alterations: []}, data: []},
-                    ]
+                        {
+                            gene: 'PIK3CA',
+                            oql_line: 'PIK3CA;',
+                            parsed_oql_line: {
+                                gene: 'PIK3CA',
+                                alterations: [],
+                            },
+                            data: [],
+                        },
+                        {
+                            gene: 'MTOR',
+                            oql_line: 'MTOR;',
+                            parsed_oql_line: { gene: 'MTOR', alterations: [] },
+                            data: [],
+                        },
+                    ],
                 },
                 mergedTrackOqlList: [
                     {
                         cases: makeMinimal3Patient3GeneCaseData(),
-                        oql: {gene: 'PIK3CA', oql_line: 'PIK3CA;', parsed_oql_line: {gene: 'PIK3CA', alterations: []}, data: []}
+                        oql: {
+                            gene: 'PIK3CA',
+                            oql_line: 'PIK3CA;',
+                            parsed_oql_line: {
+                                gene: 'PIK3CA',
+                                alterations: [],
+                            },
+                            data: [],
+                        },
                     },
                     {
                         cases: makeMinimal3Patient3GeneCaseData(),
-                        oql: {gene: 'MTOR', oql_line: 'MTOR;', parsed_oql_line: {gene: 'MTOR', alterations: []}, data: []}
-                    }
-                ]
+                        oql: {
+                            gene: 'MTOR',
+                            oql_line: 'MTOR;',
+                            parsed_oql_line: { gene: 'MTOR', alterations: [] },
+                            data: [],
+                        },
+                    },
+                ],
             };
             const trackIndex = MINIMAL_TRACK_INDEX + 7;
             // list expansions for the track key determined before expansion
             const preExpandStoreProperties = makeMinimal3Patient3GeneStoreProperties();
             const trackKey: string = makeGeneticTrackWith({
-                sampleMode: false, ...preExpandStoreProperties,
+                sampleMode: false,
+                ...preExpandStoreProperties,
             })(queryData, trackIndex).key;
             const postExpandStoreProperties = {
                 ...preExpandStoreProperties,
-                expansionIndexMap: observable.shallowMap({[trackKey]: [0, 1]})
+                expansionIndexMap: observable.shallowMap({
+                    [trackKey]: [0, 1],
+                }),
             };
             // when
             const trackFunction = makeGeneticTrackWith({
                 sampleMode: false,
                 ...postExpandStoreProperties,
             });
-            const track = trackFunction(
-                queryData,
-                trackIndex
-            );
+            const track = trackFunction(queryData, trackIndex);
             // then
             assert.equal(track.expansionTrackList![0].oql, 'PIK3CA;');
             assert.equal(track.expansionTrackList![1].oql, 'MTOR;');
         });
 
-        it("gives expansion tracks a remove callback that removes them from the observable", () => {
+        it('gives expansion tracks a remove callback that removes them from the observable', () => {
             // given
             const parentKey = 'SOME_MERGED_TRACK_14';
             const trackIndex = MINIMAL_TRACK_INDEX + 8;
             const storeProperties = {
                 ...makeMinimal3Patient3GeneStoreProperties(),
                 expansionIndexMap: observable.map<number[]>({
-                    'UNRELATED_TRACK_1': [8, 9, 10],
-                    [parentKey]: [3, trackIndex, 15]
-                })
+                    UNRELATED_TRACK_1: [8, 9, 10],
+                    [parentKey]: [3, trackIndex, 15],
+                }),
             };
             const queryData = {
                 cases: makeMinimal3Patient3GeneCaseData(),
                 oql: {
                     gene: 'ADH1',
                     oql_line: 'ADH1;',
-                    parsed_oql_line: {gene: 'ADH1', alterations: []},
-                    data: []
-                }
+                    parsed_oql_line: { gene: 'ADH1', alterations: [] },
+                    data: [],
+                },
             };
             // when
             const trackFunction = makeGeneticTrackWith({
                 sampleMode: false,
-                ...storeProperties
+                ...storeProperties,
             });
             const track = trackFunction(queryData, trackIndex, parentKey);
             // then
@@ -362,13 +465,13 @@ describe('OncoprintUtils', () => {
             // given
             const storeProperties = makeMinimal3Patient3GeneStoreProperties();
             const queryData = {
-                 cases: makeMinimal3Patient3GeneCaseData(),
-                 oql: {
+                cases: makeMinimal3Patient3GeneCaseData(),
+                oql: {
                     gene: 'KRAS',
                     oql_line: 'KRAS;',
-                    parsed_oql_line: {gene: 'KRAS', alterations: []},
-                    data: []
-                }
+                    parsed_oql_line: { gene: 'KRAS', alterations: [] },
+                    data: [],
+                },
             };
             // when
             const trackFunction = makeGeneticTrackWith({
@@ -387,210 +490,254 @@ describe('OncoprintUtils', () => {
     });
 
     describe('percentAltered', () => {
-        it("returns the percentage with no decimal digits, for percentages >= 3", ()=>{
-            assert.equal(percentAltered(3,100), "3%");
-            assert.equal(percentAltered(20,100), "20%");
-            assert.equal(percentAltered(3,3), "100%");
-            assert.equal(percentAltered(50,99), "51%");
-        })
-        it("returns the percentage with one decimal digit, for percentages < 3, unless its exact", ()=>{
-            assert.equal(percentAltered(22,1000), "2.2%");
-            assert.equal(percentAltered(156,10000), "1.6%");
-            assert.equal(percentAltered(0,3), "0%");
-            assert.equal(percentAltered(2,100), "2%");
-        })
+        it('returns the percentage with no decimal digits, for percentages >= 3', () => {
+            assert.equal(percentAltered(3, 100), '3%');
+            assert.equal(percentAltered(20, 100), '20%');
+            assert.equal(percentAltered(3, 3), '100%');
+            assert.equal(percentAltered(50, 99), '51%');
+        });
+        it('returns the percentage with one decimal digit, for percentages < 3, unless its exact', () => {
+            assert.equal(percentAltered(22, 1000), '2.2%');
+            assert.equal(percentAltered(156, 10000), '1.6%');
+            assert.equal(percentAltered(0, 3), '0%');
+            assert.equal(percentAltered(2, 100), '2%');
+        });
     });
 
     describe('Treatment ruleset params', () => {
-
         it('Is created from Track Spec param', () => {
             const treatmentTracSpec = {
                 key: 'TREATMENTTRACK_1',
                 label: '',
-                molecularProfileId: "profile1",
-                molecularAlterationType: "GENERIC_ASSAY",
+                molecularProfileId: 'profile1',
+                molecularAlterationType: 'GENERIC_ASSAY',
                 data: [
-                    {profile_data: 1, study: "study1", uid: "uid"}, 
-                    {profile_data: 2, study: "study1", uid: "uid"}, 
-                    {profile_data: 3, study: "study1", uid: "uid"}
+                    { profile_data: 1, study: 'study1', uid: 'uid' },
+                    { profile_data: 2, study: 'study1', uid: 'uid' },
+                    { profile_data: 3, study: 'study1', uid: 'uid' },
                 ],
-                datatype: "GENERIC_ASSAY",
+                datatype: 'GENERIC_ASSAY',
                 trackGroupIndex: 1,
-                onRemove: () => {}
+                onRemove: () => {},
             };
 
             // const ruleSetParams = getTreatmentTrackRuleSetParams(treatmentTracSpec);
-
         });
     });
-
 });
 
 describe('splitHeatmapTextField', () => {
     it('Splits around spaces', () => {
-        const elements = splitHeatmapTextField("A B C");
-        assert.deepEqual(elements, ["A", "B", "C"]);
+        const elements = splitHeatmapTextField('A B C');
+        assert.deepEqual(elements, ['A', 'B', 'C']);
     });
     it('Splits around tabs', () => {
-        const elements = splitHeatmapTextField("A   B   C");
-        assert.deepEqual(elements, ["A", "B", "C"]);
+        const elements = splitHeatmapTextField('A   B   C');
+        assert.deepEqual(elements, ['A', 'B', 'C']);
     });
     it("Splits around comma's", () => {
-        const elements = splitHeatmapTextField("A,B,C");
-        assert.deepEqual(elements, ["A", "B", "C"]);
+        const elements = splitHeatmapTextField('A,B,C');
+        assert.deepEqual(elements, ['A', 'B', 'C']);
     });
     it("Splits around comma's and spaces", () => {
-        const elements = splitHeatmapTextField("A, B, C");
-        assert.deepEqual(elements, ["A", "B", "C"]);
+        const elements = splitHeatmapTextField('A, B, C');
+        assert.deepEqual(elements, ['A', 'B', 'C']);
     });
     it("Splits around comma's and tabs", () => {
-        const elements = splitHeatmapTextField("A,  B,  C");
-        assert.deepEqual(elements, ["A", "B", "C"]);
+        const elements = splitHeatmapTextField('A,  B,  C');
+        assert.deepEqual(elements, ['A', 'B', 'C']);
     });
     it("Splits around EOL's", () => {
         const elements = splitHeatmapTextField(`
         A
         B
         C`);
-        assert.deepEqual(elements, ["A", "B", "C"]);
+        assert.deepEqual(elements, ['A', 'B', 'C']);
     });
-    it("Removes duplicate entries", () => {
-        const elements = splitHeatmapTextField("A B B");
-        assert.deepEqual(elements, ["A", "B"]);
+    it('Removes duplicate entries', () => {
+        const elements = splitHeatmapTextField('A B B');
+        assert.deepEqual(elements, ['A', 'B']);
     });
 });
 
 describe('getTreatmentTrackRuleSetParams', () => {
-    
-    const treatmentTracSpec = {
+    const treatmentTracSpec = ({
         key: 'TREATMENTTRACK_1',
         label: '',
-        molecularProfileId: "profile_1",
-        molecularAlterationType: "GENERIC_ASSAY",
-        data: [
-            {profile_data: 1, study: "study1", uid: "uid"},
-            {profile_data: 2, study: "study1", uid: "uid"},
-            {profile_data: 3, study: "study1", uid: "uid"}
-        ] as any as IBaseHeatmapTrackDatum[],
-        datatype: "GENERIC_ASSAY",
+        molecularProfileId: 'profile_1',
+        molecularAlterationType: 'GENERIC_ASSAY',
+        data: ([
+            { profile_data: 1, study: 'study1', uid: 'uid' },
+            { profile_data: 2, study: 'study1', uid: 'uid' },
+            { profile_data: 3, study: 'study1', uid: 'uid' },
+        ] as any) as IBaseHeatmapTrackDatum[],
+        datatype: 'GENERIC_ASSAY',
         trackGroupIndex: 1,
         maxProfileValue: 100,
         minProfileValue: -100,
-        onRemove: () => {}
-    } as any as IHeatmapTrackSpec;
-    
+        onRemove: () => {},
+    } as any) as IHeatmapTrackSpec;
+
     it('RuleSetParams are correct w/o sortOrder and pivotThreshold provided', () => {
+        const {
+            value_range,
+            colors,
+            value_stop_points,
+            category_to_color,
+        } = getTreatmentTrackRuleSetParams(
+            treatmentTracSpec
+        ) as IGradientAndCategoricalRuleSetParams;
 
-        const {value_range, colors, value_stop_points, category_to_color} = getTreatmentTrackRuleSetParams(treatmentTracSpec) as IGradientAndCategoricalRuleSetParams;
-        
         assert.equal(colors!.length, 2);
         assert.deepEqual(value_range, [-100, 100]);
         assert.deepEqual(value_stop_points, [-100, 100]);
         assert.deepEqual(category_to_color, undefined);
-
     });
 
     it('ASC SortOrder is default', () => {
-
         const spec = Object.assign({}, treatmentTracSpec);
-        spec.sortOrder = "ASC";
+        spec.sortOrder = 'ASC';
 
-        const {value_range, colors, value_stop_points, category_to_color} = getTreatmentTrackRuleSetParams(treatmentTracSpec) as IGradientAndCategoricalRuleSetParams;
-        
-        assert.deepEqual(value_range, [-100, 100]);
+        const {
+            value_range,
+            colors,
+            value_stop_points,
+            category_to_color,
+        } = getTreatmentTrackRuleSetParams(
+            treatmentTracSpec
+        ) as IGradientAndCategoricalRuleSetParams;
 
+        assert.deepEqual(value_range, [-100, 100]);
     });
 
     it('DESC SortOrder reverses value range', () => {
-
         const spec = Object.assign({}, treatmentTracSpec);
-        spec.sortOrder = "DESC";
+        spec.sortOrder = 'DESC';
 
-        const {value_range, colors, value_stop_points, category_to_color} = getTreatmentTrackRuleSetParams(spec) as IGradientAndCategoricalRuleSetParams;
-        
-        assert.deepEqual(value_range, [100, -100]);
+        const {
+            value_range,
+            colors,
+            value_stop_points,
+            category_to_color,
+        } = getTreatmentTrackRuleSetParams(
+            spec
+        ) as IGradientAndCategoricalRuleSetParams;
 
+        assert.deepEqual(value_range, [100, -100]);
     });
 
     it('DESC SortOrder reverses value_range and value_stop_points', () => {
-
         const spec = Object.assign({}, treatmentTracSpec);
-        spec.sortOrder = "DESC";
+        spec.sortOrder = 'DESC';
+
+        const {
+            value_range,
+            colors,
+            value_stop_points,
+            category_to_color,
+        } = getTreatmentTrackRuleSetParams(
+            spec
+        ) as IGradientAndCategoricalRuleSetParams;
 
-        const {value_range, colors, value_stop_points, category_to_color} = getTreatmentTrackRuleSetParams(spec) as IGradientAndCategoricalRuleSetParams;
-        
         assert.deepEqual(value_range, [100, -100]);
         assert.deepEqual(value_stop_points, [100, -100]);
-
     });
 
     it('PivotThreshold adds middle value and color param', () => {
-
         const spec = Object.assign({}, treatmentTracSpec);
         spec.pivotThreshold = 0;
 
-        const {value_range, colors, value_stop_points, category_to_color} = getTreatmentTrackRuleSetParams(spec) as IGradientAndCategoricalRuleSetParams;
-        
+        const {
+            value_range,
+            colors,
+            value_stop_points,
+            category_to_color,
+        } = getTreatmentTrackRuleSetParams(
+            spec
+        ) as IGradientAndCategoricalRuleSetParams;
+
         assert.equal(colors!.length, 4);
         assert.deepEqual(value_range, [-100, 100]);
         assert.deepEqual(value_stop_points, [-100, 0, 0, 100]);
-
     });
 
     it('PivotThreshold to the left of min and max profile values is correctly integrated', () => {
-
         const spec = Object.assign({}, treatmentTracSpec);
         spec.pivotThreshold = -200;
 
-        const {value_range, colors, value_stop_points, category_to_color} = getTreatmentTrackRuleSetParams(spec) as IGradientAndCategoricalRuleSetParams;
-        
+        const {
+            value_range,
+            colors,
+            value_stop_points,
+            category_to_color,
+        } = getTreatmentTrackRuleSetParams(
+            spec
+        ) as IGradientAndCategoricalRuleSetParams;
+
         assert.equal(colors!.length, 2);
         assert.deepEqual(value_range, [-200, 100]);
         assert.deepEqual(value_stop_points, [-200, 100]);
-
     });
 
     it('PivotThreshold to the right of min and max profile values is correctly integrated', () => {
-
         const spec = Object.assign({}, treatmentTracSpec);
         spec.pivotThreshold = 200;
 
-        const {value_range, colors, value_stop_points, category_to_color} = getTreatmentTrackRuleSetParams(spec) as IGradientAndCategoricalRuleSetParams;
-        
+        const {
+            value_range,
+            colors,
+            value_stop_points,
+            category_to_color,
+        } = getTreatmentTrackRuleSetParams(
+            spec
+        ) as IGradientAndCategoricalRuleSetParams;
+
         assert.equal(colors!.length, 2);
         assert.deepEqual(value_range, [-100, 200]);
         assert.deepEqual(value_stop_points, [-100, 200]);
-
     });
 
     it('Categories are added when present on data points', () => {
-
         const spec = Object.assign({}, treatmentTracSpec);
-        spec.data = [{profile_data: 3, study: "study1", uid: "uid", category: ">8.00"}] as any as IBaseHeatmapTrackDatum[];
+        spec.data = ([
+            { profile_data: 3, study: 'study1', uid: 'uid', category: '>8.00' },
+        ] as any) as IBaseHeatmapTrackDatum[];
+
+        const {
+            value_range,
+            colors,
+            value_stop_points,
+            category_to_color,
+        } = getTreatmentTrackRuleSetParams(
+            spec
+        ) as IGradientAndCategoricalRuleSetParams;
 
-        const {value_range, colors, value_stop_points, category_to_color} = getTreatmentTrackRuleSetParams(spec) as IGradientAndCategoricalRuleSetParams;
-        
         assert.isDefined(category_to_color);
         assert.isString(category_to_color!['>8.00']);
-
     });
 });
 
 describe('extractTreatmentSelections', () => {
-
-    const selectedTreatments:string[] = [];
+    const selectedTreatments: string[] = [];
     const treatmentMap = {
-        'treatmentA': {id: 'treatmentA', value: 'valueA', label: 'labelA'}
+        treatmentA: { id: 'treatmentA', value: 'valueA', label: 'labelA' },
     };
 
     it('Adds recognized treatments to selection', () => {
-        extractTreatmentSelections("treatmentA treatmentB", selectedTreatments, treatmentMap);
+        extractTreatmentSelections(
+            'treatmentA treatmentB',
+            selectedTreatments,
+            treatmentMap
+        );
         assert.deepEqual(selectedTreatments, ['treatmentA']);
     });
 
     it('Removed recognized treatments from text field', () => {
-        const text = extractTreatmentSelections('treatmentC treatmentA treatmentB', selectedTreatments, treatmentMap);
+        const text = extractTreatmentSelections(
+            'treatmentC treatmentA treatmentB',
+            selectedTreatments,
+            treatmentMap
+        );
         assert.equal(text, 'treatmentC  treatmentB');
     });
-
-});
\ No newline at end of file
+});
diff --git a/src/shared/components/oncoprint/OncoprintUtils.ts b/src/shared/components/oncoprint/OncoprintUtils.ts
index fb3d0aeacc4..2783d1d7e31 100644
--- a/src/shared/components/oncoprint/OncoprintUtils.ts
+++ b/src/shared/components/oncoprint/OncoprintUtils.ts
@@ -2,8 +2,8 @@ import OncoprintJS, {
     IGeneticAlterationRuleSetParams,
     IGradientRuleSetParams,
     RuleSetParams,
-    RuleSetType
-} from "oncoprintjs";
+    RuleSetType,
+} from 'oncoprintjs';
 import {
     ClinicalTrackSpec,
     GeneticTrackDatum,
@@ -12,67 +12,86 @@ import {
     IGenesetHeatmapTrackDatum,
     IGenesetHeatmapTrackSpec,
     IHeatmapTrackSpec,
-    ITreatmentHeatmapTrackDatum
-} from "./Oncoprint";
+    ITreatmentHeatmapTrackDatum,
+} from './Oncoprint';
 import {
     genetic_rule_set_different_colors_no_recurrence,
     genetic_rule_set_different_colors_recurrence,
     genetic_rule_set_same_color_for_all_no_recurrence,
     genetic_rule_set_same_color_for_all_recurrence,
-    germline_rule_params
-} from "./geneticrules";
+    germline_rule_params,
+} from './geneticrules';
 import {
     AlterationTypeConstants,
     AnnotatedExtendedAlteration,
     CaseAggregatedData,
     IQueriedCaseData,
-    IQueriedMergedTrackCaseData
-} from "../../../pages/resultsView/ResultsViewPageStore";
-import {CoverageInformation} from "../../../pages/resultsView/ResultsViewPageStoreUtils";
-import {remoteData} from "cbioportal-frontend-commons";
-import {makeClinicalTrackData, makeGeneticTrackData, makeHeatmapTrackData} from "./DataUtils";
-import ResultsViewOncoprint from "./ResultsViewOncoprint";
-import _ from "lodash";
-import {action, IObservableArray, ObservableMap, runInAction} from "mobx";
-import {MobxPromise} from "mobxpromise";
-import GenesetCorrelatedGeneCache from "shared/cache/GenesetCorrelatedGeneCache";
-import {isMergedTrackFilter, UnflattenedOQLLineFilterOutput} from "../../lib/oql/oqlfilter";
-import {ClinicalAttribute, MolecularProfile, Patient, Sample} from "../../api/generated/CBioPortalAPI";
-import {clinicalAttributeIsPROFILEDIN, SpecialAttribute} from "../../cache/ClinicalDataCache";
-import {RESERVED_CLINICAL_VALUE_COLORS} from "shared/lib/Colors";
-import {ISelectOption} from "./controls/OncoprintControls";
+    IQueriedMergedTrackCaseData,
+} from '../../../pages/resultsView/ResultsViewPageStore';
+import { CoverageInformation } from '../../../pages/resultsView/ResultsViewPageStoreUtils';
+import { remoteData } from 'cbioportal-frontend-commons';
+import {
+    makeClinicalTrackData,
+    makeGeneticTrackData,
+    makeHeatmapTrackData,
+} from './DataUtils';
+import ResultsViewOncoprint from './ResultsViewOncoprint';
+import _ from 'lodash';
+import { action, IObservableArray, ObservableMap, runInAction } from 'mobx';
+import { MobxPromise } from 'mobxpromise';
+import GenesetCorrelatedGeneCache from 'shared/cache/GenesetCorrelatedGeneCache';
+import {
+    isMergedTrackFilter,
+    UnflattenedOQLLineFilterOutput,
+} from '../../lib/oql/oqlfilter';
+import {
+    ClinicalAttribute,
+    MolecularProfile,
+    Patient,
+    Sample,
+} from '../../api/generated/CBioPortalAPI';
+import {
+    clinicalAttributeIsPROFILEDIN,
+    SpecialAttribute,
+} from '../../cache/ClinicalDataCache';
+import { RESERVED_CLINICAL_VALUE_COLORS } from 'shared/lib/Colors';
+import { ISelectOption } from './controls/OncoprintControls';
 
 interface IGenesetExpansionMap {
-        [genesetTrackKey: string]: IHeatmapTrackSpec[];
+    [genesetTrackKey: string]: IHeatmapTrackSpec[];
 }
 
 function makeGenesetHeatmapExpandHandler(
     oncoprint: ResultsViewOncoprint,
     track_key: string,
-    query: {molecularProfileId: string, genesetId: string},
-    cache: GenesetCorrelatedGeneCache,
+    query: { molecularProfileId: string; genesetId: string },
+    cache: GenesetCorrelatedGeneCache
 ) {
     cache.initIteration(track_key, query);
-    return (async () => {
+    return async () => {
         const new_genes = (await cache.next(track_key, 5)).map(
             ({
-                entrezGeneId, hugoGeneSymbol, correlationValue,
-                zScoreGeneticProfileId
+                entrezGeneId,
+                hugoGeneSymbol,
+                correlationValue,
+                zScoreGeneticProfileId,
             }) => ({
-                entrezGeneId, hugoGeneSymbol, correlationValue,
-                molecularProfileId: zScoreGeneticProfileId
+                entrezGeneId,
+                hugoGeneSymbol,
+                correlationValue,
+                molecularProfileId: zScoreGeneticProfileId,
             })
         );
         runInAction('genesetHeatmapExpansion', () => {
-            const list = (
-                oncoprint.expansionsByGenesetHeatmapTrackKey.get(track_key)
-                || []
-            );
+            const list =
+                oncoprint.expansionsByGenesetHeatmapTrackKey.get(track_key) ||
+                [];
             oncoprint.expansionsByGenesetHeatmapTrackKey.set(
-                track_key, list.concat(new_genes)
+                track_key,
+                list.concat(new_genes)
             );
         });
-    });
+    };
 }
 
 function makeGenesetHeatmapUnexpandHandler(
@@ -83,7 +102,9 @@ function makeGenesetHeatmapUnexpandHandler(
     onRemoveLast: () => void
 ) {
     return action('genesetHeatmapUnexpansion', () => {
-        const list = oncoprint.expansionsByGenesetHeatmapTrackKey.get(parentKey);
+        const list = oncoprint.expansionsByGenesetHeatmapTrackKey.get(
+            parentKey
+        );
         if (list) {
             // only remove if the expansion if it isn't needed in another track
             // group than the one this track is being removed from; keep the
@@ -93,7 +114,7 @@ function makeGenesetHeatmapUnexpandHandler(
                 // this is a MobX Observable Array, so it should have findIndex
                 // implemented even in IE
                 const indexToRemove = list.findIndex(
-                    ({entrezGeneId}) => entrezGeneId === expansionEntrezGeneId
+                    ({ entrezGeneId }) => entrezGeneId === expansionEntrezGeneId
                 );
                 if (indexToRemove !== -1) {
                     list.splice(indexToRemove, 1);
@@ -103,34 +124,46 @@ function makeGenesetHeatmapUnexpandHandler(
                 }
             }
         } else {
-            throw new Error(`Track '${parentKey}' has no expansions to remove.`);
+            throw new Error(
+                `Track '${parentKey}' has no expansions to remove.`
+            );
         }
     });
 }
 
-function formatGeneticTrackSublabel(oqlFilter: UnflattenedOQLLineFilterOutput<object>): string {
+function formatGeneticTrackSublabel(
+    oqlFilter: UnflattenedOQLLineFilterOutput<object>
+): string {
     if (isMergedTrackFilter(oqlFilter)) {
-        return ""; // no oql sublabel for merged tracks - too cluttered
+        return ''; // no oql sublabel for merged tracks - too cluttered
     } else {
-        return oqlFilter.oql_line.substring(oqlFilter.gene.length).replace(";",""); // get rid of gene in beginning of OQL line, and semicolon at end
+        return oqlFilter.oql_line
+            .substring(oqlFilter.gene.length)
+            .replace(';', ''); // get rid of gene in beginning of OQL line, and semicolon at end
     }
 }
 
-function formatGeneticTrackLabel(oqlFilter: UnflattenedOQLLineFilterOutput<object>): string {
-    return (isMergedTrackFilter(oqlFilter)
-        ? oqlFilter.label || oqlFilter.list.map(geneLine => geneLine.gene).join(' / ')
-        : oqlFilter.gene
-    );
+function formatGeneticTrackLabel(
+    oqlFilter: UnflattenedOQLLineFilterOutput<object>
+): string {
+    return isMergedTrackFilter(oqlFilter)
+        ? oqlFilter.label ||
+              oqlFilter.list.map(geneLine => geneLine.gene).join(' / ')
+        : oqlFilter.gene;
 }
 
-function formatGeneticTrackOql(oqlFilter: UnflattenedOQLLineFilterOutput<object>): string {
-    return (isMergedTrackFilter(oqlFilter)
+function formatGeneticTrackOql(
+    oqlFilter: UnflattenedOQLLineFilterOutput<object>
+): string {
+    return isMergedTrackFilter(oqlFilter)
         ? `[${oqlFilter.list.map(geneLine => geneLine.oql_line).join(' ')}]`
-        : oqlFilter.oql_line
-    );
+        : oqlFilter.oql_line;
 }
 
-export function doWithRenderingSuppressedAndSortingOff(oncoprint:OncoprintJS, task:()=>void) {
+export function doWithRenderingSuppressedAndSortingOff(
+    oncoprint: OncoprintJS,
+    task: () => void
+) {
     oncoprint.suppressRendering();
     oncoprint.keepSorted(false);
     task();
@@ -138,60 +171,63 @@ export function doWithRenderingSuppressedAndSortingOff(oncoprint:OncoprintJS, ta
     oncoprint.releaseRendering();
 }
 
-export function getHeatmapTrackRuleSetParams(trackSpec: IHeatmapTrackSpec):RuleSetParams {
-    let value_range:[number, number];
-    let legend_label:string;
-    let colors:[number, number, number, number][];
-    let value_stop_points:number[];
-    let null_legend_label = "";
-    let na_legend_label = "";
+export function getHeatmapTrackRuleSetParams(
+    trackSpec: IHeatmapTrackSpec
+): RuleSetParams {
+    let value_range: [number, number];
+    let legend_label: string;
+    let colors: [number, number, number, number][];
+    let value_stop_points: number[];
+    let null_legend_label = '';
+    let na_legend_label = '';
     switch (trackSpec.molecularAlterationType) {
         case AlterationTypeConstants.GENERIC_ASSAY:
             return getTreatmentTrackRuleSetParams(trackSpec);
             break;
         case AlterationTypeConstants.METHYLATION:
-            value_range = [0,1];
-            legend_label = "Methylation Heatmap";
-            value_stop_points = [0,0.35,1];
-            colors = [[0,0,255,1], [255,255,255,1], [255,0,0,1]];
+            value_range = [0, 1];
+            legend_label = 'Methylation Heatmap';
+            value_stop_points = [0, 0.35, 1];
+            colors = [[0, 0, 255, 1], [255, 255, 255, 1], [255, 0, 0, 1]];
             break;
         case AlterationTypeConstants.MUTATION_EXTENDED:
-            value_range = [0,1];
-            legend_label = "VAF Heatmap";
-            null_legend_label = "Not mutated/no VAF data";
-            na_legend_label = "Not sequenced";
+            value_range = [0, 1];
+            legend_label = 'VAF Heatmap';
+            null_legend_label = 'Not mutated/no VAF data';
+            na_legend_label = 'Not sequenced';
             value_stop_points = [0, 1];
-            colors = [[241,242,181,1],[19,80,88,1]];
+            colors = [[241, 242, 181, 1], [19, 80, 88, 1]];
             break;
         default:
-            value_range = [-3,3];
-            legend_label = "Expression Heatmap";
+            value_range = [-3, 3];
+            legend_label = 'Expression Heatmap';
             value_stop_points = [-3, 0, 3];
-            colors = [[0,0,255,1], [0,0,0,1], [255,0,0,1]];
+            colors = [[0, 0, 255, 1], [0, 0, 0, 1], [255, 0, 0, 1]];
             break;
     }
 
     return {
         type: RuleSetType.GRADIENT,
         legend_label,
-        value_key: "profile_data",
+        value_key: 'profile_data',
         value_range,
         colors,
         value_stop_points,
         null_color: 'rgba(224,224,224,1)',
         null_legend_label,
         na_legend_label,
-        na_shapes:trackSpec.customNaShapes
+        na_shapes: trackSpec.customNaShapes,
     };
 }
 
-export function getTreatmentTrackRuleSetParams(trackSpec: IHeatmapTrackSpec):RuleSetParams {
-
-    let value_range:[number, number];
-    let legend_label:string;
-    let colors:[number, number, number, number][];
-    let value_stop_points:number[];
-    let category_to_color:{[d:string]: string} | undefined;
+export function getTreatmentTrackRuleSetParams(
+    trackSpec: IHeatmapTrackSpec
+): RuleSetParams {
+    let value_range: [number, number];
+    let legend_label: string;
+    let colors: [number, number, number, number][];
+    let value_stop_points: number[];
+    let category_to_color: { [d: string]: string } | undefined;
 
     // - Legends for treatments can be configured in two ways:
     //      1. Larger values are `better` and appear at the right side of the legend (a.k.a. ASC sort order)
@@ -207,11 +243,31 @@ export function getTreatmentTrackRuleSetParams(trackSpec: IHeatmapTrackSpec):Rul
     const pivotThreshold = trackSpec.pivotThreshold;
     const sortOrder = trackSpec.sortOrder;
 
-    const colorBetterDark = [0,114,178,1] as [number, number, number, number];
-    const colorBetterLight = [204,236,255,1] as [number, number, number, number];
-    const colorWorseDark  = [213,94,0,1] as [number, number, number, number];
-    const colorWorseLight  = [255,226,204,1] as [number, number, number, number];
-    const categoryColorOptions = [ 'rgba(240,228,66,1)', 'rgba(0,158,115,1)', 'rgba(204,121,167,1)', 'rgba(0,0,0,1)' ];
+    const colorBetterDark = [0, 114, 178, 1] as [
+        number,
+        number,
+        number,
+        number
+    ];
+    const colorBetterLight = [204, 236, 255, 1] as [
+        number,
+        number,
+        number,
+        number
+    ];
+    const colorWorseDark = [213, 94, 0, 1] as [number, number, number, number];
+    const colorWorseLight = [255, 226, 204, 1] as [
+        number,
+        number,
+        number,
+        number
+    ];
+    const categoryColorOptions = [
+        'rgba(240,228,66,1)',
+        'rgba(0,158,115,1)',
+        'rgba(204,121,167,1)',
+        'rgba(0,0,0,1)',
+    ];
 
     let maxValue = trackSpec.maxProfileValue!;
     let minValue = trackSpec.minProfileValue!;
@@ -220,39 +276,66 @@ export function getTreatmentTrackRuleSetParams(trackSpec: IHeatmapTrackSpec):Rul
         minValue = Math.min(minValue, pivotThreshold);
     }
 
-    const pivotOutsideValueRange = pivotThreshold && (maxValue === pivotThreshold || minValue === pivotThreshold);
+    const pivotOutsideValueRange =
+        pivotThreshold &&
+        (maxValue === pivotThreshold || minValue === pivotThreshold);
 
     // when all observed values are negative or positive
     // assume that 0 should be used in the legend
     const rightBoundaryValue = Math.max(0, maxValue);
     const leftBoundaryValue = Math.min(0, minValue);
-    value_range = [leftBoundaryValue, rightBoundaryValue];                  // larger concentrations are `better` (ASC)
+    value_range = [leftBoundaryValue, rightBoundaryValue]; // larger concentrations are `better` (ASC)
 
     // only include the pivotValue in the legend when covered by the current value_range
     if (pivotThreshold === undefined || pivotOutsideValueRange) {
         colors = [colorBetterDark, colorBetterLight];
         value_stop_points = [leftBoundaryValue, rightBoundaryValue];
     } else {
-        colors = [colorBetterDark, colorBetterLight, colorWorseLight, colorWorseDark];
+        colors = [
+            colorBetterDark,
+            colorBetterLight,
+            colorWorseLight,
+            colorWorseDark,
+        ];
         if (pivotThreshold <= leftBoundaryValue) {
             // when data points do not bracket the pivotThreshold, make an artificial left boundary
-            value_stop_points = [pivotThreshold-(rightBoundaryValue-pivotThreshold), pivotThreshold, pivotThreshold, rightBoundaryValue];
+            value_stop_points = [
+                pivotThreshold - (rightBoundaryValue - pivotThreshold),
+                pivotThreshold,
+                pivotThreshold,
+                rightBoundaryValue,
+            ];
         } else if (pivotThreshold >= rightBoundaryValue) {
             // when data points do not bracket the pivotThreshold, make an artificial right boundary
-            value_stop_points = [leftBoundaryValue, pivotThreshold, pivotThreshold, pivotThreshold+(pivotThreshold-leftBoundaryValue)];
+            value_stop_points = [
+                leftBoundaryValue,
+                pivotThreshold,
+                pivotThreshold,
+                pivotThreshold + (pivotThreshold - leftBoundaryValue),
+            ];
         } else {
-            value_stop_points = [leftBoundaryValue, pivotThreshold, pivotThreshold, rightBoundaryValue];
+            value_stop_points = [
+                leftBoundaryValue,
+                pivotThreshold,
+                pivotThreshold,
+                rightBoundaryValue,
+            ];
         }
     }
 
-    if (sortOrder === "DESC") {                                             // smaller concentrations are `better` (DESC)
+    if (sortOrder === 'DESC') {
+        // smaller concentrations are `better` (DESC)
         value_range = _.reverse(value_range);
         value_stop_points = _.reverse(value_stop_points);
     }
 
     let counter = 0;
-    const categories = _(dataPoints as ITreatmentHeatmapTrackDatum[]).filter((d:ITreatmentHeatmapTrackDatum) => !!d.category).map((d)=>d.category).uniq().value();
-    categories.forEach( (d:string) => {
+    const categories = _(dataPoints as ITreatmentHeatmapTrackDatum[])
+        .filter((d: ITreatmentHeatmapTrackDatum) => !!d.category)
+        .map(d => d.category)
+        .uniq()
+        .value();
+    categories.forEach((d: string) => {
         if (category_to_color === undefined) {
             category_to_color = {};
         }
@@ -265,13 +348,13 @@ export function getTreatmentTrackRuleSetParams(trackSpec: IHeatmapTrackSpec):Rul
     return {
         type: RuleSetType.GRADIENT_AND_CATEGORICAL,
         legend_label,
-        value_key: "profile_data",
+        value_key: 'profile_data',
         value_range,
         colors,
         value_stop_points,
         null_color: 'rgba(224,224,224,1)',
-        category_key: "category",
-        category_to_color: category_to_color
+        category_key: 'category',
+        category_to_color: category_to_color,
     };
 }
 
@@ -280,7 +363,7 @@ export function getGenesetHeatmapTrackRuleSetParams() {
         type: RuleSetType.GRADIENT,
         legend_label: 'Gene Set Heatmap',
         value_key: 'profile_data',
-        value_range: [-1,1] as [number, number],
+        value_range: [-1, 1] as [number, number],
         /*
          * The PiYG colormap is based on color specifications and designs
          * developed by Cynthia Brewer (http://colorbrewer.org).
@@ -288,31 +371,40 @@ export function getGenesetHeatmapTrackRuleSetParams() {
          * of an Apache-style license.
          */
         colors: [
-            [ 39, 100,  25, 1],
-            [ 77, 146,  33, 1],
-            [127, 188,  65, 1],
+            [39, 100, 25, 1],
+            [77, 146, 33, 1],
+            [127, 188, 65, 1],
             [184, 225, 134, 1],
             [230, 245, 208, 1],
             [247, 247, 247, 1],
             [253, 224, 239, 1],
             [241, 182, 218, 1],
             [222, 119, 174, 1],
-            [197,  27, 125, 1],
-            [142,   1,  82, 1]
-        ] as [number,number,number,number][],
+            [197, 27, 125, 1],
+            [142, 1, 82, 1],
+        ] as [number, number, number, number][],
         value_stop_points: [
-            -1, -0.8, -0.6, -0.4, -0.2,
-            0, 0.2, 0.4, 0.6, 0.8, 1
+            -1,
+            -0.8,
+            -0.6,
+            -0.4,
+            -0.2,
+            0,
+            0.2,
+            0.4,
+            0.6,
+            0.8,
+            1,
         ],
-        null_color: 'rgba(224,224,224,1)'
+        null_color: 'rgba(224,224,224,1)',
     } as IGradientRuleSetParams;
 }
 
 export function getGeneticTrackRuleSetParams(
-    distinguishMutationType?:boolean,
-    distinguishDrivers?:boolean,
-    distinguishGermlineMutations?:boolean
-):IGeneticAlterationRuleSetParams {
+    distinguishMutationType?: boolean,
+    distinguishDrivers?: boolean,
+    distinguishGermlineMutations?: boolean
+): IGeneticAlterationRuleSetParams {
     let rule_set;
     if (!distinguishMutationType && !distinguishDrivers) {
         rule_set = genetic_rule_set_same_color_for_all_no_recurrence;
@@ -330,72 +422,78 @@ export function getGeneticTrackRuleSetParams(
     return rule_set;
 }
 
-export function getClinicalTrackRuleSetParams(track:ClinicalTrackSpec) {
-    let params:RuleSetParams;
+export function getClinicalTrackRuleSetParams(track: ClinicalTrackSpec) {
+    let params: RuleSetParams;
     switch (track.datatype) {
-        case "number":
+        case 'number':
             params = {
                 type: RuleSetType.BAR,
-                value_key: "attr_val",
+                value_key: 'attr_val',
                 value_range: track.numberRange,
-                log_scale: track.numberLogScale
+                log_scale: track.numberLogScale,
             };
             break;
-        case "counts":
+        case 'counts':
             params = {
                 type: RuleSetType.STACKED_BAR,
-                value_key: "attr_val",
+                value_key: 'attr_val',
                 categories: track.countsCategoryLabels,
-                fills: track.countsCategoryFills
+                fills: track.countsCategoryFills,
             };
             break;
-        case "string":
+        case 'string':
         default:
             params = {
                 type: RuleSetType.CATEGORICAL,
-                category_key: "attr_val",
-                category_to_color: RESERVED_CLINICAL_VALUE_COLORS
+                category_key: 'attr_val',
+                category_to_color: RESERVED_CLINICAL_VALUE_COLORS,
             };
             break;
     }
     return params;
 }
 
-export function percentAltered(altered:number, sequenced:number) {
+export function percentAltered(altered: number, sequenced: number) {
     if (sequenced === 0) {
-        return "N/P";
+        return 'N/P';
     }
 
-    const p = altered/sequenced;
-    const percent = 100*p;
-    let fixed:string;
+    const p = altered / sequenced;
+    const percent = 100 * p;
+    let fixed: string;
     if (p < 0.03) {
         // if less than 3%, use one decimal digit
         fixed = percent.toFixed(1);
         // if last digit is a 0, use no decimal digits
-        if (fixed[fixed.length-1] === "0") {
+        if (fixed[fixed.length - 1] === '0') {
             fixed = percent.toFixed();
         }
     } else {
         fixed = percent.toFixed();
     }
-    return fixed+"%";
+    return fixed + '%';
 }
 
 function getAlterationInfoSequenced(
     sampleMode: boolean,
-    oql: {gene: string} | string[],
-    sequencedSampleKeysByGene: {[hugoGeneSymbol:string]:string[]},
-    sequencedPatientKeysByGene: {[hugoGeneSymbol:string]:string[]}
+    oql: { gene: string } | string[],
+    sequencedSampleKeysByGene: { [hugoGeneSymbol: string]: string[] },
+    sequencedPatientKeysByGene: { [hugoGeneSymbol: string]: string[] }
 ) {
-    const geneSymbolArray = (oql instanceof Array
-            ? oql
-            : [oql.gene]
-    );
-    const sequenced = (sampleMode
-            ? _.uniq(_.flatMap(geneSymbolArray, symbol => sequencedSampleKeysByGene[symbol])).length
-            : _.uniq(_.flatMap(geneSymbolArray, symbol => sequencedPatientKeysByGene[symbol])).length
-    );
+    const geneSymbolArray = oql instanceof Array ? oql : [oql.gene];
+    const sequenced = sampleMode
+        ? _.uniq(
+              _.flatMap(
+                  geneSymbolArray,
+                  symbol => sequencedSampleKeysByGene[symbol]
+              )
+          ).length
+        : _.uniq(
+              _.flatMap(
+                  geneSymbolArray,
+                  symbol => sequencedPatientKeysByGene[symbol]
+              )
+          ).length;
 
     return sequenced;
 }
@@ -403,45 +501,62 @@ function getAlterationInfoSequenced(
 export function alterationInfoForOncoprintTrackData(
     sampleMode: boolean,
     data: {
-        trackData: GeneticTrackDatum[],
-        oql: {gene: string} | string[]
+        trackData: GeneticTrackDatum[];
+        oql: { gene: string } | string[];
     },
-    sequencedSampleKeysByGene: {[hugoGeneSymbol:string]:string[]},
-    sequencedPatientKeysByGene: {[hugoGeneSymbol:string]:string[]}
+    sequencedSampleKeysByGene: { [hugoGeneSymbol: string]: string[] },
+    sequencedPatientKeysByGene: { [hugoGeneSymbol: string]: string[] }
 ) {
-    const sequenced = getAlterationInfoSequenced(sampleMode, data.oql, sequencedSampleKeysByGene, sequencedPatientKeysByGene);
-    const altered = _.sumBy(data.trackData!, d=>(+isAltered(d)));
+    const sequenced = getAlterationInfoSequenced(
+        sampleMode,
+        data.oql,
+        sequencedSampleKeysByGene,
+        sequencedPatientKeysByGene
+    );
+    const altered = _.sumBy(data.trackData!, d => +isAltered(d));
     const percent = percentAltered(altered, sequenced);
     return {
-        sequenced, altered, percent
+        sequenced,
+        altered,
+        percent,
     };
 }
 
-
 export function alterationInfoForCaseAggregatedDataByOQLLine(
     sampleMode: boolean,
     data: {
-        cases: CaseAggregatedData<AnnotatedExtendedAlteration>, // one of `cases` or `trackData` must be present
-        oql: {gene: string} | string[]
+        cases: CaseAggregatedData<AnnotatedExtendedAlteration>; // one of `cases` or `trackData` must be present
+        oql: { gene: string } | string[];
     },
-    sequencedSampleKeysByGene: {[hugoGeneSymbol:string]:string[]},
-    sequencedPatientKeysByGene: {[hugoGeneSymbol:string]:string[]})
-{
-    const sequenced = getAlterationInfoSequenced(sampleMode, data.oql, sequencedSampleKeysByGene, sequencedPatientKeysByGene);
-    const altered = sampleMode ?
-        Object.keys(data.cases.samples).filter(k=>!!data.cases.samples[k].length).length :
-        Object.keys(data.cases.patients).filter(k=>!!data.cases.patients[k].length).length;
+    sequencedSampleKeysByGene: { [hugoGeneSymbol: string]: string[] },
+    sequencedPatientKeysByGene: { [hugoGeneSymbol: string]: string[] }
+) {
+    const sequenced = getAlterationInfoSequenced(
+        sampleMode,
+        data.oql,
+        sequencedSampleKeysByGene,
+        sequencedPatientKeysByGene
+    );
+    const altered = sampleMode
+        ? Object.keys(data.cases.samples).filter(
+              k => !!data.cases.samples[k].length
+          ).length
+        : Object.keys(data.cases.patients).filter(
+              k => !!data.cases.patients[k].length
+          ).length;
     const percent = percentAltered(altered, sequenced);
     return {
-        sequenced, altered, percent
+        sequenced,
+        altered,
+        percent,
     };
 }
 
 interface IGeneticTrackAppState {
     sampleMode: boolean;
-    oncoprint:ResultsViewOncoprint;
-    samples: Pick<Sample, 'sampleId'|'studyId'|'uniqueSampleKey'>[];
-    patients: Pick<Patient, 'patientId'|'studyId'|'uniquePatientKey'>[];
+    oncoprint: ResultsViewOncoprint;
+    samples: Pick<Sample, 'sampleId' | 'studyId' | 'uniqueSampleKey'>[];
+    patients: Pick<Patient, 'patientId' | 'studyId' | 'uniquePatientKey'>[];
     coverageInformation: CoverageInformation;
     sequencedSampleKeysByGene: any;
     sequencedPatientKeysByGene: any;
@@ -449,12 +564,12 @@ interface IGeneticTrackAppState {
     expansionIndexMap: ObservableMap<number[]>;
 }
 
-function isAltered(d:GeneticTrackDatum) {
+function isAltered(d: GeneticTrackDatum) {
     return d.data.length > 0;
 }
 
-export function getAlteredUids(tracks:GeneticTrackSpec[]) {
-    const isAlteredMap:{[uid:string]:boolean} = {};
+export function getAlteredUids(tracks: GeneticTrackSpec[]) {
+    const isAlteredMap: { [uid: string]: boolean } = {};
     for (const track of tracks) {
         for (const d of track.data) {
             if (isAltered(d)) {
@@ -465,8 +580,12 @@ export function getAlteredUids(tracks:GeneticTrackSpec[]) {
     return Object.keys(isAlteredMap);
 }
 
-export function getUnalteredUids(tracks:GeneticTrackSpec[]) {
-    const allUids:string[] = _.chain(tracks).map(spec=>spec.data.map(d=>d.uid)).flatten().uniq().value();
+export function getUnalteredUids(tracks: GeneticTrackSpec[]) {
+    const allUids: string[] = _.chain(tracks)
+        .map(spec => spec.data.map(d => d.uid))
+        .flatten()
+        .uniq()
+        .value();
     return _.difference(allUids, getAlteredUids(tracks));
 }
 
@@ -479,53 +598,70 @@ export function makeGeneticTrackWith({
     sequencedSampleKeysByGene,
     sequencedPatientKeysByGene,
     selectedMolecularProfiles,
-    expansionIndexMap
+    expansionIndexMap,
 }: IGeneticTrackAppState) {
     return function makeTrack(
-        caseData:IQueriedMergedTrackCaseData | (IQueriedCaseData<any> & { mergedTrackOqlList?:never }), // the & is to get around annoying TS error -- its never passed in, as the `never` type indicates
+        caseData:
+            | IQueriedMergedTrackCaseData
+            | (IQueriedCaseData<any> & { mergedTrackOqlList?: never }), // the & is to get around annoying TS error -- its never passed in, as the `never` type indicates
         index: number,
         parentKey?: string
     ): GeneticTrackSpec {
         const oql = caseData.oql;
-        const geneSymbolArray = (isMergedTrackFilter(oql)
-            ? oql.list.map(({gene}) => gene)
-            : [oql.gene]
-        );
+        const geneSymbolArray = isMergedTrackFilter(oql)
+            ? oql.list.map(({ gene }) => gene)
+            : [oql.gene];
         const dataByCase = caseData.cases;
-        const data = (sampleMode
-            ? makeGeneticTrackData(dataByCase.samples, geneSymbolArray, samples as Sample[], coverageInformation, selectedMolecularProfiles)
-            : makeGeneticTrackData(dataByCase.patients, geneSymbolArray, patients as Patient[], coverageInformation, selectedMolecularProfiles)
-        );
+        const data = sampleMode
+            ? makeGeneticTrackData(
+                  dataByCase.samples,
+                  geneSymbolArray,
+                  samples as Sample[],
+                  coverageInformation,
+                  selectedMolecularProfiles
+              )
+            : makeGeneticTrackData(
+                  dataByCase.patients,
+                  geneSymbolArray,
+                  patients as Patient[],
+                  coverageInformation,
+                  selectedMolecularProfiles
+              );
         const alterationInfo = alterationInfoForOncoprintTrackData(
             sampleMode,
-            {trackData: data, oql: geneSymbolArray},
+            { trackData: data, oql: geneSymbolArray },
             sequencedSampleKeysByGene,
             sequencedPatientKeysByGene
         );
-        const trackKey = (parentKey === undefined
-            ? `GENETICTRACK_${index}`
-            : `${parentKey}_EXPANSION_${index}`
-        );
-        const expansionCallback = (isMergedTrackFilter(oql)
-            ? () => { expansionIndexMap.set(trackKey, _.range(oql.list.length)); }
-            : undefined
-        );
-        const removeCallback = (parentKey !== undefined
+        const trackKey =
+            parentKey === undefined
+                ? `GENETICTRACK_${index}`
+                : `${parentKey}_EXPANSION_${index}`;
+        const expansionCallback = isMergedTrackFilter(oql)
             ? () => {
-                (expansionIndexMap.get(parentKey) as IObservableArray<number>
-                ).remove(index);
-            }
-            : undefined
-        );
+                  expansionIndexMap.set(trackKey, _.range(oql.list.length));
+              }
+            : undefined;
+        const removeCallback =
+            parentKey !== undefined
+                ? () => {
+                      (expansionIndexMap.get(parentKey) as IObservableArray<
+                          number
+                      >).remove(index);
+                  }
+                : undefined;
         let expansions: GeneticTrackSpec[] = [];
 
         if (caseData.mergedTrackOqlList) {
             const subTrackData = caseData.mergedTrackOqlList;
-            expansions = (
-                expansionIndexMap.get(trackKey) || []
-            ).map(expansionIndex => makeTrack(
-                subTrackData[expansionIndex], expansionIndex, trackKey
-            ));
+            expansions = (expansionIndexMap.get(trackKey) || []).map(
+                expansionIndex =>
+                    makeTrack(
+                        subTrackData[expansionIndex],
+                        expansionIndex,
+                        trackKey
+                    )
+            );
         }
 
         let info = alterationInfo.percent;
@@ -534,14 +670,19 @@ export function makeGeneticTrackWith({
             // show tooltip explaining percent calculation, as long as its not N/P
             infoTooltip = `altered / profiled = ${alterationInfo.altered} / ${alterationInfo.sequenced}`;
         }
-        if ((alterationInfo.sequenced > 0) && (alterationInfo.sequenced < (sampleMode ? samples : patients).length)) {
+        if (
+            alterationInfo.sequenced > 0 &&
+            alterationInfo.sequenced < (sampleMode ? samples : patients).length
+        ) {
             // add asterisk to percentage if not all samples/patients are profiled for this track
             // dont add asterisk if none are profiled
             info = `${info}*`;
         }
         return {
             key: trackKey,
-            label: (parentKey !== undefined ? '  ' : '') + formatGeneticTrackLabel(oql),
+            label:
+                (parentKey !== undefined ? '  ' : '') +
+                formatGeneticTrackLabel(oql),
             sublabel: formatGeneticTrackSublabel(oql),
             labelColor: parentKey !== undefined ? 'grey' : undefined,
             oql: formatGeneticTrackOql(oql),
@@ -551,23 +692,27 @@ export function makeGeneticTrackWith({
             expansionCallback,
             removeCallback,
             expansionTrackList: expansions.length ? expansions : undefined,
-            customOptions:[
-                {separator:true},
+            customOptions: [
+                { separator: true },
                 {
-                    label: "Sort by genes",
-                    onClick:oncoprint.clearSortDirectionsAndSortByData,
-                }
-            ]
+                    label: 'Sort by genes',
+                    onClick: oncoprint.clearSortDirectionsAndSortByData,
+                },
+            ],
         };
     };
 }
 
-export function makeGeneticTracksMobxPromise(oncoprint:ResultsViewOncoprint, sampleMode:boolean) {
+export function makeGeneticTracksMobxPromise(
+    oncoprint: ResultsViewOncoprint,
+    sampleMode: boolean
+) {
     return remoteData<GeneticTrackSpec[]>({
-        await:()=>[
+        await: () => [
             oncoprint.props.store.samples,
             oncoprint.props.store.patients,
-            oncoprint.props.store.oqlFilteredCaseAggregatedDataByUnflattenedOQLLine,
+            oncoprint.props.store
+                .oqlFilteredCaseAggregatedDataByUnflattenedOQLLine,
             oncoprint.props.store.coverageInformation,
             oncoprint.props.store.sequencedSampleKeysByGene,
             oncoprint.props.store.sequencedPatientKeysByGene,
@@ -579,203 +724,332 @@ export function makeGeneticTracksMobxPromise(oncoprint:ResultsViewOncoprint, sam
                 oncoprint,
                 samples: oncoprint.props.store.samples.result!,
                 patients: oncoprint.props.store.patients.result!,
-                coverageInformation: oncoprint.props.store.coverageInformation.result!,
-                sequencedSampleKeysByGene: oncoprint.props.store.sequencedSampleKeysByGene.result!,
-                sequencedPatientKeysByGene: oncoprint.props.store.sequencedPatientKeysByGene.result!,
-                selectedMolecularProfiles: oncoprint.props.store.selectedMolecularProfiles.result!,
+                coverageInformation: oncoprint.props.store.coverageInformation
+                    .result!,
+                sequencedSampleKeysByGene: oncoprint.props.store
+                    .sequencedSampleKeysByGene.result!,
+                sequencedPatientKeysByGene: oncoprint.props.store
+                    .sequencedPatientKeysByGene.result!,
+                selectedMolecularProfiles: oncoprint.props.store
+                    .selectedMolecularProfiles.result!,
                 expansionIndexMap: oncoprint.expansionsByGeneticTrackKey,
             });
             return oncoprint.props.store.oqlFilteredCaseAggregatedDataByUnflattenedOQLLine.result!.map(
-                (alterationData, trackIndex) => trackFunction(
-                    alterationData, trackIndex, undefined
-                )
+                (alterationData, trackIndex) =>
+                    trackFunction(alterationData, trackIndex, undefined)
             );
         },
         default: [],
     });
 }
 
-export function makeClinicalTracksMobxPromise(oncoprint:ResultsViewOncoprint, sampleMode:boolean) {
+export function makeClinicalTracksMobxPromise(
+    oncoprint: ResultsViewOncoprint,
+    sampleMode: boolean
+) {
     return remoteData<ClinicalTrackSpec[]>({
-        await:()=>{
-            let ret:MobxPromise<any>[] = [
+        await: () => {
+            let ret: MobxPromise<any>[] = [
                 oncoprint.props.store.samples,
                 oncoprint.props.store.patients,
                 oncoprint.props.store.clinicalAttributeIdToClinicalAttribute,
                 oncoprint.alteredKeys,
             ];
-            if (oncoprint.props.store.clinicalAttributeIdToClinicalAttribute.isComplete) {
-                const attributes = oncoprint.selectedClinicalAttributeIds.keys().map(attrId=>{
-                    return oncoprint.props.store.clinicalAttributeIdToClinicalAttribute.result![attrId];
-                }).filter(x=>!!x);
-                ret = ret.concat(oncoprint.props.store.clinicalDataCache.getAll(attributes));
+            if (
+                oncoprint.props.store.clinicalAttributeIdToClinicalAttribute
+                    .isComplete
+            ) {
+                const attributes = oncoprint.selectedClinicalAttributeIds
+                    .keys()
+                    .map(attrId => {
+                        return oncoprint.props.store
+                            .clinicalAttributeIdToClinicalAttribute.result![
+                            attrId
+                        ];
+                    })
+                    .filter(x => !!x);
+                ret = ret.concat(
+                    oncoprint.props.store.clinicalDataCache.getAll(attributes)
+                );
             }
             return ret;
         },
-        invoke: async()=>{
+        invoke: async () => {
             if (oncoprint.selectedClinicalAttributeIds.keys().length === 0) {
                 return [];
             }
-            const attributes = oncoprint.selectedClinicalAttributeIds.keys().map(attrId=>{
-                return oncoprint.props.store.clinicalAttributeIdToClinicalAttribute.result![attrId];
-            }).filter(x=>!!x);// filter out nonexistent attributes
-            return attributes.map((attribute:ClinicalAttribute)=>{
-                const data = oncoprint.props.store.clinicalDataCache.get(attribute).result!;
+            const attributes = oncoprint.selectedClinicalAttributeIds
+                .keys()
+                .map(attrId => {
+                    return oncoprint.props.store
+                        .clinicalAttributeIdToClinicalAttribute.result![attrId];
+                })
+                .filter(x => !!x); // filter out nonexistent attributes
+            return attributes.map((attribute: ClinicalAttribute) => {
+                const data = oncoprint.props.store.clinicalDataCache.get(
+                    attribute
+                ).result!;
                 let altered_uids = undefined;
                 if (oncoprint.onlyShowClinicalLegendForAlteredCases) {
                     altered_uids = oncoprint.alteredKeys.result!;
                 }
-                const ret:Partial<ClinicalTrackSpec> = {
-                    key: oncoprint.clinicalAttributeIdToTrackKey(attribute.clinicalAttributeId),
+                const ret: Partial<ClinicalTrackSpec> = {
+                    key: oncoprint.clinicalAttributeIdToTrackKey(
+                        attribute.clinicalAttributeId
+                    ),
                     label: attribute.displayName,
                     description: attribute.description,
-                    data:makeClinicalTrackData(
+                    data: makeClinicalTrackData(
                         attribute,
-                        sampleMode ? oncoprint.props.store.samples.result! : oncoprint.props.store.patients.result!,
+                        sampleMode
+                            ? oncoprint.props.store.samples.result!
+                            : oncoprint.props.store.patients.result!,
                         data
                     ),
-                    altered_uids
+                    altered_uids,
                 };
                 if (clinicalAttributeIsPROFILEDIN(attribute)) {
                     // For "Profiled-In" clinical attribute: show "No" on N/A items
-                    ret.na_tooltip_value = "No";
-                    ret.na_legend_label = "No";
+                    ret.na_tooltip_value = 'No';
+                    ret.na_legend_label = 'No';
                 }
-                if (attribute.datatype === "NUMBER") {
-                    ret.datatype = "number";
-                    if (attribute.clinicalAttributeId === "FRACTION_GENOME_ALTERED") {
-                        (ret as any).numberRange = [0,1];
-                    } else if (attribute.clinicalAttributeId === "MUTATION_COUNT") {
+                if (attribute.datatype === 'NUMBER') {
+                    ret.datatype = 'number';
+                    if (
+                        attribute.clinicalAttributeId ===
+                        'FRACTION_GENOME_ALTERED'
+                    ) {
+                        (ret as any).numberRange = [0, 1];
+                    } else if (
+                        attribute.clinicalAttributeId === 'MUTATION_COUNT'
+                    ) {
                         (ret as any).numberLogScale = true;
-                    } else if (attribute.clinicalAttributeId === SpecialAttribute.NumSamplesPerPatient) {
-                        (ret as any).numberRange = [0,undefined];
-                        ret.custom_options =
-                            sampleMode ?
-                                [{ label: "Show one column per patient.", onClick:()=>oncoprint.controlsHandlers.onSelectColumnType!("patient")}] :
-                                [{ label: "Show one column per sample.", onClick:()=>oncoprint.controlsHandlers.onSelectColumnType!("sample")}];
+                    } else if (
+                        attribute.clinicalAttributeId ===
+                        SpecialAttribute.NumSamplesPerPatient
+                    ) {
+                        (ret as any).numberRange = [0, undefined];
+                        ret.custom_options = sampleMode
+                            ? [
+                                  {
+                                      label: 'Show one column per patient.',
+                                      onClick: () =>
+                                          oncoprint.controlsHandlers
+                                              .onSelectColumnType!('patient'),
+                                  },
+                              ]
+                            : [
+                                  {
+                                      label: 'Show one column per sample.',
+                                      onClick: () =>
+                                          oncoprint.controlsHandlers
+                                              .onSelectColumnType!('sample'),
+                                  },
+                              ];
                     }
-                } else if (attribute.datatype === "STRING") {
-                    ret.datatype = "string";
-                } else if (attribute.clinicalAttributeId === SpecialAttribute.MutationSpectrum) {
-                    ret.datatype = "counts";
-                    (ret as any).countsCategoryLabels = ["C>A", "C>G", "C>T", "T>A", "T>C", "T>G"];
-                    (ret as any).countsCategoryFills = ['#3D6EB1', '#8EBFDC', '#DFF1F8', '#FCE08E', '#F78F5E', '#D62B23'];
+                } else if (attribute.datatype === 'STRING') {
+                    ret.datatype = 'string';
+                } else if (
+                    attribute.clinicalAttributeId ===
+                    SpecialAttribute.MutationSpectrum
+                ) {
+                    ret.datatype = 'counts';
+                    (ret as any).countsCategoryLabels = [
+                        'C>A',
+                        'C>G',
+                        'C>T',
+                        'T>A',
+                        'T>C',
+                        'T>G',
+                    ];
+                    (ret as any).countsCategoryFills = [
+                        '#3D6EB1',
+                        '#8EBFDC',
+                        '#DFF1F8',
+                        '#FCE08E',
+                        '#F78F5E',
+                        '#D62B23',
+                    ];
                 }
                 return ret as ClinicalTrackSpec;
             });
         },
-        default: []
+        default: [],
     });
 }
 
-export function makeHeatmapTracksMobxPromise(oncoprint:ResultsViewOncoprint, sampleMode:boolean) {
+export function makeHeatmapTracksMobxPromise(
+    oncoprint: ResultsViewOncoprint,
+    sampleMode: boolean
+) {
     return remoteData<IHeatmapTrackSpec[]>({
-        await:()=>[
+        await: () => [
             oncoprint.props.store.samples,
             oncoprint.props.store.patients,
             oncoprint.props.store.molecularProfileIdToMolecularProfile,
-            oncoprint.props.store.geneMolecularDataCache
+            oncoprint.props.store.geneMolecularDataCache,
         ],
-        invoke:async()=>{
-            const molecularProfileIdToMolecularProfile = oncoprint.props.store.molecularProfileIdToMolecularProfile.result!;
-            const molecularProfileIdToHeatmapTracks = oncoprint.molecularProfileIdToHeatmapTracks;
-
-            const geneProfiles = _.filter(_.values(molecularProfileIdToHeatmapTracks), d => d.molecularAlterationType !== AlterationTypeConstants.GENERIC_ASSAY);
-            const neededGenes = _.flatten(geneProfiles.map(v=>_.keys(v.entities)));
-            await oncoprint.props.store.geneCache.getPromise(neededGenes.map(g=>({hugoGeneSymbol:g})), true);
-
-            const cacheQueries = _.flatten(geneProfiles.map(entry=>(
-                _.keys(entry.entities).map(g=>({
-                    molecularProfileId: entry.molecularProfileId,
-                    entrezGeneId: oncoprint.props.store.geneCache.get({ hugoGeneSymbol:g })!.data!.entrezGeneId,
-                    hugoGeneSymbol: g.toUpperCase()
-                }))
-            )));
-            await oncoprint.props.store.geneMolecularDataCache.result!.getPromise(cacheQueries, true);
+        invoke: async () => {
+            const molecularProfileIdToMolecularProfile = oncoprint.props.store
+                .molecularProfileIdToMolecularProfile.result!;
+            const molecularProfileIdToHeatmapTracks =
+                oncoprint.molecularProfileIdToHeatmapTracks;
+
+            const geneProfiles = _.filter(
+                _.values(molecularProfileIdToHeatmapTracks),
+                d =>
+                    d.molecularAlterationType !==
+                    AlterationTypeConstants.GENERIC_ASSAY
+            );
+            const neededGenes = _.flatten(
+                geneProfiles.map(v => _.keys(v.entities))
+            );
+            await oncoprint.props.store.geneCache.getPromise(
+                neededGenes.map(g => ({ hugoGeneSymbol: g })),
+                true
+            );
+
+            const cacheQueries = _.flatten(
+                geneProfiles.map(entry =>
+                    _.keys(entry.entities).map(g => ({
+                        molecularProfileId: entry.molecularProfileId,
+                        entrezGeneId: oncoprint.props.store.geneCache.get({
+                            hugoGeneSymbol: g,
+                        })!.data!.entrezGeneId,
+                        hugoGeneSymbol: g.toUpperCase(),
+                    }))
+                )
+            );
+            await oncoprint.props.store.geneMolecularDataCache.result!.getPromise(
+                cacheQueries,
+                true
+            );
 
             const samples = oncoprint.props.store.samples.result!;
             const patients = oncoprint.props.store.patients.result!;
 
-            return cacheQueries.map(query=>{
+            return cacheQueries.map(query => {
                 const molecularProfileId = query.molecularProfileId;
                 const gene = query.hugoGeneSymbol;
-                const data = oncoprint.props.store.geneMolecularDataCache.result!.get(query)!.data!;
+                const data = oncoprint.props.store.geneMolecularDataCache.result!.get(
+                    query
+                )!.data!;
 
                 return {
                     key: `HEATMAPTRACK_${molecularProfileId},${gene}`,
                     label: gene,
                     molecularProfileId: molecularProfileId,
-                    molecularAlterationType: molecularProfileIdToMolecularProfile[molecularProfileId].molecularAlterationType,
-                    datatype: molecularProfileIdToMolecularProfile[molecularProfileId].datatype,
-                    data: makeHeatmapTrackData<IGeneHeatmapTrackDatum, 'hugo_gene_symbol'>(
+                    molecularAlterationType:
+                        molecularProfileIdToMolecularProfile[molecularProfileId]
+                            .molecularAlterationType,
+                    datatype:
+                        molecularProfileIdToMolecularProfile[molecularProfileId]
+                            .datatype,
+                    data: makeHeatmapTrackData<
+                        IGeneHeatmapTrackDatum,
+                        'hugo_gene_symbol'
+                    >(
                         'hugo_gene_symbol',
                         gene,
                         sampleMode ? samples : patients,
                         data
                     ),
-                    trackGroupIndex: molecularProfileIdToHeatmapTracks[molecularProfileId].trackGroupIndex,
-                    onClickRemoveInTrackMenu:action(()=>{
-                        const trackGroup = oncoprint.molecularProfileIdToHeatmapTracks[molecularProfileId];
+                    trackGroupIndex:
+                        molecularProfileIdToHeatmapTracks[molecularProfileId]
+                            .trackGroupIndex,
+                    onClickRemoveInTrackMenu: action(() => {
+                        const trackGroup =
+                            oncoprint.molecularProfileIdToHeatmapTracks[
+                                molecularProfileId
+                            ];
                         if (trackGroup) {
-                            const newEntities = _.keys(trackGroup.entities).filter((entity)=>entity!==gene);
+                            const newEntities = _.keys(
+                                trackGroup.entities
+                            ).filter(entity => entity !== gene);
                             if (newEntities.length === 0) {
-                                oncoprint.removeHeatmapByMolecularProfileId(molecularProfileId);
+                                oncoprint.removeHeatmapByMolecularProfileId(
+                                    molecularProfileId
+                                );
                             } else {
-                                oncoprint.addHeatmapTracks(molecularProfileId, newEntities);
+                                oncoprint.addHeatmapTracks(
+                                    molecularProfileId,
+                                    newEntities
+                                );
                             }
                         }
 
-                        if (trackGroup === undefined
-                            && oncoprint.sortMode.type === "heatmap"
-                            && oncoprint.sortMode.clusteredHeatmapProfile === molecularProfileId
+                        if (
+                            trackGroup === undefined &&
+                            oncoprint.sortMode.type === 'heatmap' &&
+                            oncoprint.sortMode.clusteredHeatmapProfile ===
+                                molecularProfileId
                         ) {
                             oncoprint.sortByData();
                         }
-                    })
+                    }),
                 };
             });
         },
-        default: []
+        default: [],
     });
 }
 
-export function makeTreatmentProfileHeatmapTracksMobxPromise(oncoprint:ResultsViewOncoprint, sampleMode:boolean) {
+export function makeTreatmentProfileHeatmapTracksMobxPromise(
+    oncoprint: ResultsViewOncoprint,
+    sampleMode: boolean
+) {
     return remoteData<IHeatmapTrackSpec[]>({
-        await:()=>[
+        await: () => [
             oncoprint.props.store.samples,
             oncoprint.props.store.patients,
             oncoprint.props.store.molecularProfileIdToMolecularProfile,
             oncoprint.props.store.treatmentMolecularDataCache,
             oncoprint.props.store.treatmentLinkMap,
-            oncoprint.props.store.treatmentsInStudies
+            oncoprint.props.store.treatmentsInStudies,
         ],
-        invoke:async()=>{
-
-            const molecularProfileIdToMolecularProfile = oncoprint.props.store.molecularProfileIdToMolecularProfile.result!;
-            const molecularProfileIdToHeatmapTracks = oncoprint.molecularProfileIdToHeatmapTracks;
-            const treatmentLinkMap = oncoprint.props.store.treatmentLinkMap.result!;
-
-            const treatmentsById = _.keyBy(oncoprint.props.store.treatmentsInStudies.result!, t=>t.treatmentId);
-            const treatmentProfiles = _.filter(molecularProfileIdToHeatmapTracks, d => d.molecularAlterationType === AlterationTypeConstants.GENERIC_ASSAY);
+        invoke: async () => {
+            const molecularProfileIdToMolecularProfile = oncoprint.props.store
+                .molecularProfileIdToMolecularProfile.result!;
+            const molecularProfileIdToHeatmapTracks =
+                oncoprint.molecularProfileIdToHeatmapTracks;
+            const treatmentLinkMap = oncoprint.props.store.treatmentLinkMap
+                .result!;
+
+            const treatmentsById = _.keyBy(
+                oncoprint.props.store.treatmentsInStudies.result!,
+                t => t.treatmentId
+            );
+            const treatmentProfiles = _.filter(
+                molecularProfileIdToHeatmapTracks,
+                d =>
+                    d.molecularAlterationType ===
+                    AlterationTypeConstants.GENERIC_ASSAY
+            );
 
-            const cacheQueries = _.flatten(treatmentProfiles.map(entry=>(
-                _.keys(entry.entities).map(treatmentId=>({
-                    molecularProfileId: entry.molecularProfileId,
-                    treatmentId,
-                    treatmentName: treatmentsById[treatmentId].name
-                }))
-            )));
+            const cacheQueries = _.flatten(
+                treatmentProfiles.map(entry =>
+                    _.keys(entry.entities).map(treatmentId => ({
+                        molecularProfileId: entry.molecularProfileId,
+                        treatmentId,
+                        treatmentName: treatmentsById[treatmentId].name,
+                    }))
+                )
+            );
 
-            await oncoprint.props.store.treatmentMolecularDataCache.result!.getPromise(cacheQueries, true);
+            await oncoprint.props.store.treatmentMolecularDataCache.result!.getPromise(
+                cacheQueries,
+                true
+            );
 
             const samples = oncoprint.props.store.samples.result!;
             const patients = oncoprint.props.store.patients.result!;
 
-            const tracks = cacheQueries.map(query=>{
-
+            const tracks = cacheQueries.map(query => {
                 const molecularProfileId = query.molecularProfileId;
-                const profile = molecularProfileIdToMolecularProfile[molecularProfileId];
-                const dataCache = oncoprint.props.store.treatmentMolecularDataCache.result!;
+                const profile =
+                    molecularProfileIdToMolecularProfile[molecularProfileId];
+                const dataCache = oncoprint.props.store
+                    .treatmentMolecularDataCache.result!;
 
                 const treatmentId = query.treatmentId;
                 const pivotThreshold = profile.pivotThreshold;
@@ -785,103 +1059,161 @@ export function makeTreatmentProfileHeatmapTracksMobxPromise(oncoprint:ResultsVi
                     key: `TREATMENTHEATMAPTRACK_${molecularProfileId},${treatmentId}`,
                     label: query.treatmentName,
                     molecularProfileId: query.molecularProfileId,
-                    molecularProfileName: molecularProfileIdToMolecularProfile[molecularProfileId].name,
-                    molecularAlterationType: molecularProfileIdToMolecularProfile[molecularProfileId].molecularAlterationType,
-                    datatype: molecularProfileIdToMolecularProfile[molecularProfileId].datatype,
-                    data: makeHeatmapTrackData<ITreatmentHeatmapTrackDatum, 'treatment_id'>(
+                    molecularProfileName:
+                        molecularProfileIdToMolecularProfile[molecularProfileId]
+                            .name,
+                    molecularAlterationType:
+                        molecularProfileIdToMolecularProfile[molecularProfileId]
+                            .molecularAlterationType,
+                    datatype:
+                        molecularProfileIdToMolecularProfile[molecularProfileId]
+                            .datatype,
+                    data: makeHeatmapTrackData<
+                        ITreatmentHeatmapTrackDatum,
+                        'treatment_id'
+                    >(
                         'treatment_id',
                         treatmentId,
                         sampleMode ? samples : patients,
-                        dataCache.get(query)!.data!.map(d => ({...d, value: parseFloat(d.value)})),
+                        dataCache.get(query)!.data!.map(d => ({
+                            ...d,
+                            value: parseFloat(d.value),
+                        })),
                         sortOrder
                     ),
                     pivotThreshold: pivotThreshold,
                     sortOrder: sortOrder,
                     trackLinkUrl: treatmentLinkMap[treatmentId],
-                    trackGroupIndex: molecularProfileIdToHeatmapTracks[molecularProfileId]!.trackGroupIndex,
-                    onClickRemoveInTrackMenu:action(()=>{
-                        const trackGroup = oncoprint.molecularProfileIdToHeatmapTracks[molecularProfileId]!;
-                        if (trackGroup){
-                            const newEntities = _.keys(trackGroup.entities).filter((entity)=>entity!==treatmentId);
-                            oncoprint.addHeatmapTracks(molecularProfileId, newEntities);
+                    trackGroupIndex: molecularProfileIdToHeatmapTracks[
+                        molecularProfileId
+                    ]!.trackGroupIndex,
+                    onClickRemoveInTrackMenu: action(() => {
+                        const trackGroup = oncoprint
+                            .molecularProfileIdToHeatmapTracks[
+                            molecularProfileId
+                        ]!;
+                        if (trackGroup) {
+                            const newEntities = _.keys(
+                                trackGroup.entities
+                            ).filter(entity => entity !== treatmentId);
+                            oncoprint.addHeatmapTracks(
+                                molecularProfileId,
+                                newEntities
+                            );
                         }
-                        if (trackGroup === undefined
-                            && oncoprint.sortMode.type === "heatmap"
-                            && oncoprint.sortMode.clusteredHeatmapProfile === molecularProfileId
+                        if (
+                            trackGroup === undefined &&
+                            oncoprint.sortMode.type === 'heatmap' &&
+                            oncoprint.sortMode.clusteredHeatmapProfile ===
+                                molecularProfileId
                         ) {
                             oncoprint.sortByData();
                         }
-                    })
+                    }),
                 };
             });
             return tracks;
         },
-        default: []
+        default: [],
     });
 }
 
-export function makeGenesetHeatmapExpansionsMobxPromise(oncoprint:ResultsViewOncoprint, sampleMode:boolean) {
+export function makeGenesetHeatmapExpansionsMobxPromise(
+    oncoprint: ResultsViewOncoprint,
+    sampleMode: boolean
+) {
     return remoteData<IGenesetExpansionMap>({
         await: () => [
             oncoprint.props.store.samples,
             oncoprint.props.store.patients,
             oncoprint.props.store.molecularProfileIdToMolecularProfile,
             oncoprint.props.store.geneMolecularDataCache,
-            oncoprint.props.store.genesetCorrelatedGeneCache
+            oncoprint.props.store.genesetCorrelatedGeneCache,
         ],
         invoke: async () => {
             const samples = oncoprint.props.store.samples.result!;
             const patients = oncoprint.props.store.patients.result!;
-            const molecularProfileIdToMolecularProfile = oncoprint.props.store.molecularProfileIdToMolecularProfile.result!;
-            const dataCache = oncoprint.props.store.geneMolecularDataCache.result!;
-            const genesetGeneCache = oncoprint.props.store.genesetCorrelatedGeneCache.result!;
+            const molecularProfileIdToMolecularProfile = oncoprint.props.store
+                .molecularProfileIdToMolecularProfile.result!;
+            const dataCache = oncoprint.props.store.geneMolecularDataCache
+                .result!;
+            const genesetGeneCache = oncoprint.props.store
+                .genesetCorrelatedGeneCache.result!;
 
             const trackGroup = oncoprint.genesetHeatmapTrackGroup;
-            const expansionsByGenesetTrack = oncoprint.expansionsByGenesetHeatmapTrackKey;
+            const expansionsByGenesetTrack =
+                oncoprint.expansionsByGenesetHeatmapTrackKey;
 
             // list all the genes in an array of plain, non-observable objects,
             // as observable arrays cannot be safely passed to external libs
-            const cacheQueries: ({entrezGeneId: number, molecularProfileId: string})[] =
-                _.flatten(expansionsByGenesetTrack.values().map(mobxArray => mobxArray.slice()))
-                .map(({entrezGeneId, molecularProfileId}) => ({entrezGeneId, molecularProfileId}));
+            const cacheQueries: ({
+                entrezGeneId: number;
+                molecularProfileId: string;
+            })[] = _.flatten(
+                expansionsByGenesetTrack
+                    .values()
+                    .map(mobxArray => mobxArray.slice())
+            ).map(({ entrezGeneId, molecularProfileId }) => ({
+                entrezGeneId,
+                molecularProfileId,
+            }));
             await dataCache.getPromise(cacheQueries, true);
 
-            const tracksByGenesetTrack: {[genesetTrackKey: string]: IHeatmapTrackSpec[]} = {};
-            expansionsByGenesetTrack.entries().forEach(
-                ([gsTrack, genes]) => {
-                    tracksByGenesetTrack[gsTrack] = genes.map(
-                        ({entrezGeneId, hugoGeneSymbol, molecularProfileId, correlationValue}) => {
-                            const data = dataCache.get({entrezGeneId, molecularProfileId})!.data!;
-                            const profile = molecularProfileIdToMolecularProfile[molecularProfileId];
-                            return {
-                                key: `EXPANSIONTRACK_${gsTrack},${hugoGeneSymbol},GROUP${trackGroup}`,
-                                label: '  ' + hugoGeneSymbol,
-                                labelColor: 'grey',
-                                info: correlationValue.toFixed(2),
-                                molecularProfileId: molecularProfileId,
-                                molecularAlterationType: profile.molecularAlterationType,
-                                datatype: profile.datatype,
-                                data: makeHeatmapTrackData<IGeneHeatmapTrackDatum, 'hugo_gene_symbol'>(
-                                    'hugo_gene_symbol',
-                                    hugoGeneSymbol,
-                                    sampleMode ? samples : patients,
-                                    data
-                                ),
-                                trackGroupIndex: trackGroup,
-                                onRemove: makeGenesetHeatmapUnexpandHandler(
-                                    oncoprint, gsTrack, entrezGeneId, trackGroup,
-                                    genesetGeneCache.reset.bind(
-                                        genesetGeneCache, gsTrack
-                                    )
+            const tracksByGenesetTrack: {
+                [genesetTrackKey: string]: IHeatmapTrackSpec[];
+            } = {};
+            expansionsByGenesetTrack.entries().forEach(([gsTrack, genes]) => {
+                tracksByGenesetTrack[gsTrack] = genes.map(
+                    ({
+                        entrezGeneId,
+                        hugoGeneSymbol,
+                        molecularProfileId,
+                        correlationValue,
+                    }) => {
+                        const data = dataCache.get({
+                            entrezGeneId,
+                            molecularProfileId,
+                        })!.data!;
+                        const profile =
+                            molecularProfileIdToMolecularProfile[
+                                molecularProfileId
+                            ];
+                        return {
+                            key: `EXPANSIONTRACK_${gsTrack},${hugoGeneSymbol},GROUP${trackGroup}`,
+                            label: '  ' + hugoGeneSymbol,
+                            labelColor: 'grey',
+                            info: correlationValue.toFixed(2),
+                            molecularProfileId: molecularProfileId,
+                            molecularAlterationType:
+                                profile.molecularAlterationType,
+                            datatype: profile.datatype,
+                            data: makeHeatmapTrackData<
+                                IGeneHeatmapTrackDatum,
+                                'hugo_gene_symbol'
+                            >(
+                                'hugo_gene_symbol',
+                                hugoGeneSymbol,
+                                sampleMode ? samples : patients,
+                                data
+                            ),
+                            trackGroupIndex: trackGroup,
+                            onRemove: makeGenesetHeatmapUnexpandHandler(
+                                oncoprint,
+                                gsTrack,
+                                entrezGeneId,
+                                trackGroup,
+                                genesetGeneCache.reset.bind(
+                                    genesetGeneCache,
+                                    gsTrack
                                 )
-                            };
-                        }
-                    );
-                }
-            );
+                            ),
+                        };
+                    }
+                );
+            });
             return tracksByGenesetTrack;
         },
-        default: {}
+        default: {},
     });
 }
 
@@ -898,15 +1230,18 @@ export function makeGenesetHeatmapTracksMobxPromise(
             oncoprint.props.store.genesetMolecularDataCache,
             oncoprint.props.store.genesetLinkMap,
             oncoprint.props.store.genesetCorrelatedGeneCache,
-            expansionMapPromise
+            expansionMapPromise,
         ],
         invoke: async () => {
             const samples = oncoprint.props.store.samples.result!;
             const patients = oncoprint.props.store.patients.result!;
-            const molecularProfile = oncoprint.props.store.genesetMolecularProfile.result!;
-            const dataCache = oncoprint.props.store.genesetMolecularDataCache.result!;
+            const molecularProfile = oncoprint.props.store
+                .genesetMolecularProfile.result!;
+            const dataCache = oncoprint.props.store.genesetMolecularDataCache
+                .result!;
             const genesetLinkMap = oncoprint.props.store.genesetLinkMap.result!;
-            const correlatedGeneCache = oncoprint.props.store.genesetCorrelatedGeneCache.result!;
+            const correlatedGeneCache = oncoprint.props.store
+                .genesetCorrelatedGeneCache.result!;
             const expansions = expansionMapPromise.result!;
 
             // observe computed property based on other tracks
@@ -915,55 +1250,71 @@ export function makeGenesetHeatmapTracksMobxPromise(
             if (!molecularProfile.isApplicable) {
                 return [];
             }
-            const molecularProfileId = molecularProfile.value.molecularProfileId;
+            const molecularProfileId =
+                molecularProfile.value.molecularProfileId;
             const genesetIds = oncoprint.props.store.genesetIds;
 
-            const cacheQueries = genesetIds.map((genesetId) => ({molecularProfileId, genesetId}));
+            const cacheQueries = genesetIds.map(genesetId => ({
+                molecularProfileId,
+                genesetId,
+            }));
             await dataCache.getPromise(cacheQueries, true);
 
-            return genesetIds.map((genesetId) => {
+            return genesetIds.map(genesetId => {
                 const expansionMapKey = `GENESETHEATMAPTRACK_${molecularProfileId},${genesetId}`;
                 return {
                     key: `GENESETHEATMAPTRACK_${molecularProfileId},${genesetId},GROUP${trackGroup}`,
                     label: genesetId,
                     molecularProfileId,
-                    molecularAlterationType: molecularProfile.value.molecularAlterationType,
+                    molecularAlterationType:
+                        molecularProfile.value.molecularAlterationType,
                     datatype: molecularProfile.value.datatype,
                     trackLinkUrl: genesetLinkMap[genesetId],
-                    data: makeHeatmapTrackData<IGenesetHeatmapTrackDatum, 'geneset_id'>(
+                    data: makeHeatmapTrackData<
+                        IGenesetHeatmapTrackDatum,
+                        'geneset_id'
+                    >(
                         'geneset_id',
                         genesetId,
                         sampleMode ? samples : patients,
                         // TODO: GenesetMolecularData still has type value of
                         // string, other NumericGeneMolecularData have number
-                        dataCache.get({molecularProfileId, genesetId})!.data!.map(d => ({...d!, value: parseFloat(d.value!)}))
+                        dataCache
+                            .get({ molecularProfileId, genesetId })!
+                            .data!.map(d => ({
+                                ...d!,
+                                value: parseFloat(d.value!),
+                            }))
                     ),
                     trackGroupIndex: trackGroup,
                     expansionCallback: makeGenesetHeatmapExpandHandler(
                         oncoprint,
                         expansionMapKey,
-                        {molecularProfileId, genesetId},
+                        { molecularProfileId, genesetId },
                         correlatedGeneCache
                     ),
-                    expansionTrackList: expansions[expansionMapKey]
+                    expansionTrackList: expansions[expansionMapKey],
                 };
             });
         },
-        default: []
+        default: [],
     });
 }
 
-export function extractTreatmentSelections(text:string, selectedTreatments:string[], treatmentsMap:{[treatmentId:string]:ISelectOption}):string {
-
+export function extractTreatmentSelections(
+    text: string,
+    selectedTreatments: string[],
+    treatmentsMap: { [treatmentId: string]: ISelectOption }
+): string {
     // get values from input string
     const elements = splitHeatmapTextField(text);
 
     // check values for valid treatment ids
-    const detectedTreatments:string[] = [];
-    _.each(elements, (d:string)=> {
+    const detectedTreatments: string[] = [];
+    _.each(elements, (d: string) => {
         if (d in treatmentsMap) {
             detectedTreatments.push(d);
-            if (! selectedTreatments.includes(d)) {
+            if (!selectedTreatments.includes(d)) {
                 selectedTreatments.push(d);
             }
         }
@@ -971,17 +1322,19 @@ export function extractTreatmentSelections(text:string, selectedTreatments:strin
 
     // remove valid treatment ids from the input string
     if (detectedTreatments.length > 0) {
-        _.each(detectedTreatments, (d:string) => {
-            text = text.replace(d, "");
+        _.each(detectedTreatments, (d: string) => {
+            text = text.replace(d, '');
         });
     }
 
     // return the input string
-    return text.trim().replace("\t+","\t").replace(" +"," ");
-
+    return text
+        .trim()
+        .replace('\t+', '\t')
+        .replace(' +', ' ');
 }
 
-export function splitHeatmapTextField(text:string):string[] {
-    text = text.replace(/[,\s\n]+/g," ").trim();
+export function splitHeatmapTextField(text: string): string[] {
+    text = text.replace(/[,\s\n]+/g, ' ').trim();
     return _.uniq(text.split(/[,\s\n]+/));
 }
diff --git a/src/shared/components/oncoprint/ResultsViewOncoprint.spec.tsx b/src/shared/components/oncoprint/ResultsViewOncoprint.spec.tsx
index a8bfdb75b49..c58e3395d13 100644
--- a/src/shared/components/oncoprint/ResultsViewOncoprint.spec.tsx
+++ b/src/shared/components/oncoprint/ResultsViewOncoprint.spec.tsx
@@ -1,101 +1,148 @@
-import {assert} from "chai";
-import ResultsViewOncoprint from "./ResultsViewOncoprint";
-import { ResultsViewPageStore } from "pages/resultsView/ResultsViewPageStore";
-import { Sample, Patient } from "shared/api/generated/CBioPortalAPI";
-import {getBrowserWindow} from "cbioportal-frontend-commons";
-import ExtendedRouterStore from "shared/lib/ExtendedRouterStore";
-import sinon from "sinon";
+import { assert } from 'chai';
+import ResultsViewOncoprint from './ResultsViewOncoprint';
+import { ResultsViewPageStore } from 'pages/resultsView/ResultsViewPageStore';
+import { Sample, Patient } from 'shared/api/generated/CBioPortalAPI';
+import { getBrowserWindow } from 'cbioportal-frontend-commons';
+import ExtendedRouterStore from 'shared/lib/ExtendedRouterStore';
+import sinon from 'sinon';
 import { SortByUrlParamValue } from 'shared/components/oncoprint/ResultsViewOncoprint';
-import {createMemoryHistory} from "react-router";
-import {syncHistoryWithStore} from "mobx-react-router";
-import ResultsViewURLWrapper from "pages/resultsView/ResultsViewURLWrapper";
+import { createMemoryHistory } from 'react-router';
+import { syncHistoryWithStore } from 'mobx-react-router';
+import ResultsViewURLWrapper from 'pages/resultsView/ResultsViewURLWrapper';
 
 describe('Oncoprint sortBy URL parameter', () => {
-
-    let wrapper:ResultsViewURLWrapper;
-    let routingStore:ExtendedRouterStore;
+    let wrapper: ResultsViewURLWrapper;
+    let routingStore: ExtendedRouterStore;
 
     beforeEach(() => {
         routingStore = new ExtendedRouterStore();
         const memoryHistory = createMemoryHistory();
         const history = syncHistoryWithStore(memoryHistory, routingStore);
         wrapper = new ResultsViewURLWrapper(routingStore);
-        routingStore.updateRoute({}, "/results");
+        routingStore.updateRoute({}, '/results');
     });
 
-
     const samples = [
-        {sampleId: "Sample1", uniqueSampleKey: "Sample1_key"},
-        {sampleId: "Sample2", uniqueSampleKey: "Sample2_key"},
-        {sampleId: "Sample3", uniqueSampleKey: "Sample3_key"}
+        { sampleId: 'Sample1', uniqueSampleKey: 'Sample1_key' },
+        { sampleId: 'Sample2', uniqueSampleKey: 'Sample2_key' },
+        { sampleId: 'Sample3', uniqueSampleKey: 'Sample3_key' },
     ] as Sample[];
 
     const patients = [
-        {patientId: "Patient1", uniquePatientKey: "Patient1_key"},
-        {patientId: "Patient2", uniquePatientKey: "Patient2_key"},
-        {patientId: "Patient3", uniquePatientKey: "Patient3_key"}
+        { patientId: 'Patient1', uniquePatientKey: 'Patient1_key' },
+        { patientId: 'Patient2', uniquePatientKey: 'Patient2_key' },
+        { patientId: 'Patient3', uniquePatientKey: 'Patient3_key' },
     ] as Patient[];
 
     const caseList = [
-        {sampleId: "Sample2", uniqueSampleKey: "Sample2_key", uniquePatientKey: "Patient2_key"},
-        {sampleId: "Sample3", uniqueSampleKey: "Sample3_key", uniquePatientKey: "Patient3_key"},
-        {sampleId: "Sample1", uniqueSampleKey: "Sample1_key", uniquePatientKey: "Patient1_key"}
+        {
+            sampleId: 'Sample2',
+            uniqueSampleKey: 'Sample2_key',
+            uniquePatientKey: 'Patient2_key',
+        },
+        {
+            sampleId: 'Sample3',
+            uniqueSampleKey: 'Sample3_key',
+            uniquePatientKey: 'Patient3_key',
+        },
+        {
+            sampleId: 'Sample1',
+            uniqueSampleKey: 'Sample1_key',
+            uniquePatientKey: 'Patient1_key',
+        },
     ] as Sample[];
 
-    const storeMock = {
-        samples: {isComplete: true, result: samples},
-        patients: {isComplete: true, result: patients},
-        givenSampleOrder: {isComplete: true, result: caseList},
-        molecularProfileIdToMolecularProfile: {isComplete: true}
-    } as any as ResultsViewPageStore;
+    const storeMock = ({
+        samples: { isComplete: true, result: samples },
+        patients: { isComplete: true, result: patients },
+        givenSampleOrder: { isComplete: true, result: caseList },
+        molecularProfileIdToMolecularProfile: { isComplete: true },
+    } as any) as ResultsViewPageStore;
 
     it('`case_id` provides sorted sample config to oncoprint', () => {
-        const oncoprintView = initResultsViewWithSortByParam({sortByParam:SortByUrlParamValue.CASE_ID, columnMode: 'sample'});
-        assert.deepEqual( oncoprintView.oncoprintLibrarySortConfig.order, ["Sample1_key","Sample2_key","Sample3_key"]);
+        const oncoprintView = initResultsViewWithSortByParam({
+            sortByParam: SortByUrlParamValue.CASE_ID,
+            columnMode: 'sample',
+        });
+        assert.deepEqual(oncoprintView.oncoprintLibrarySortConfig.order, [
+            'Sample1_key',
+            'Sample2_key',
+            'Sample3_key',
+        ]);
     });
 
     it('`case_id` provides sorted patient config to oncoprint', () => {
-        const oncoprintView = initResultsViewWithSortByParam({sortByParam:SortByUrlParamValue.CASE_ID, columnMode:'patient'});
-        assert.deepEqual( oncoprintView.oncoprintLibrarySortConfig.order, ["Patient1_key","Patient2_key","Patient3_key"]);
+        const oncoprintView = initResultsViewWithSortByParam({
+            sortByParam: SortByUrlParamValue.CASE_ID,
+            columnMode: 'patient',
+        });
+        assert.deepEqual(oncoprintView.oncoprintLibrarySortConfig.order, [
+            'Patient1_key',
+            'Patient2_key',
+            'Patient3_key',
+        ]);
     });
 
     it('`case_list` provides sorted sample config to oncoprint when case list is available', () => {
-        const oncoprintView = initResultsViewWithSortByParam({sortByParam:SortByUrlParamValue.CASE_LIST, columnMode: 'sample', caselistEnabled: true});
-        assert.deepEqual(oncoprintView.oncoprintLibrarySortConfig.order,  ["Sample2_key","Sample3_key","Sample1_key"]);
+        const oncoprintView = initResultsViewWithSortByParam({
+            sortByParam: SortByUrlParamValue.CASE_LIST,
+            columnMode: 'sample',
+            caselistEnabled: true,
+        });
+        assert.deepEqual(oncoprintView.oncoprintLibrarySortConfig.order, [
+            'Sample2_key',
+            'Sample3_key',
+            'Sample1_key',
+        ]);
     });
 
     it('`case_list` provides sorted patient config to oncoprint when case list is available', () => {
-        const oncoprintView = initResultsViewWithSortByParam({sortByParam:SortByUrlParamValue.CASE_LIST, columnMode: 'patient', caselistEnabled: true});
-        assert.deepEqual(oncoprintView.oncoprintLibrarySortConfig.order,  ["Patient2_key","Patient3_key","Patient1_key"]);
+        const oncoprintView = initResultsViewWithSortByParam({
+            sortByParam: SortByUrlParamValue.CASE_LIST,
+            columnMode: 'patient',
+            caselistEnabled: true,
+        });
+        assert.deepEqual(oncoprintView.oncoprintLibrarySortConfig.order, [
+            'Patient2_key',
+            'Patient3_key',
+            'Patient1_key',
+        ]);
     });
 
     it('`case_list` provides no sort config to oncoprint when case list is unavailable', () => {
-        const oncoprintView = initResultsViewWithSortByParam({sortByParam:SortByUrlParamValue.CASE_LIST, columnMode: 'patient', caselistEnabled: false});
+        const oncoprintView = initResultsViewWithSortByParam({
+            sortByParam: SortByUrlParamValue.CASE_LIST,
+            columnMode: 'patient',
+            caselistEnabled: false,
+        });
         assert.isUndefined(oncoprintView.oncoprintLibrarySortConfig.order);
     });
 
     interface IHelperFunction {
-        sortByParam:SortByUrlParamValue;
-        columnMode?:"sample"|"patient" ;
-        caselistEnabled?:boolean;
+        sortByParam: SortByUrlParamValue;
+        columnMode?: 'sample' | 'patient';
+        caselistEnabled?: boolean;
     }
 
-    const initResultsViewWithSortByParam = (params:IHelperFunction) => {
+    const initResultsViewWithSortByParam = (params: IHelperFunction) => {
         // mock the url params by mocking the ExtendedRouterStore class
         //const routingStub = sinon.createStubInstance(ExtendedRouterStore);
         //routingStub.location = { query: {oncoprint_sortby: params.sortByParam}};
-        wrapper.updateURL({oncoprint_sortby: params.sortByParam});
+        wrapper.updateURL({ oncoprint_sortby: params.sortByParam });
         //getBrowserWindow().globalStores = {routing: routingStub };
         if (params.caselistEnabled !== undefined) {
             storeMock.givenSampleOrder.isComplete = params.caselistEnabled;
         }
-        const oncoprintView = new ResultsViewOncoprint(
-            {divId: "", store: storeMock, urlWrapper:wrapper}
-        );
+        const oncoprintView = new ResultsViewOncoprint({
+            divId: '',
+            store: storeMock,
+            urlWrapper: wrapper,
+        });
         if (params.columnMode !== undefined) {
-            wrapper.updateURL({ show_samples: (params.columnMode === "sample").toString() })
+            wrapper.updateURL({
+                show_samples: (params.columnMode === 'sample').toString(),
+            });
         }
         return oncoprintView;
     };
-
 });
diff --git a/src/shared/components/oncoprint/ResultsViewOncoprint.tsx b/src/shared/components/oncoprint/ResultsViewOncoprint.tsx
index aa044269464..37327fd8ec2 100644
--- a/src/shared/components/oncoprint/ResultsViewOncoprint.tsx
+++ b/src/shared/components/oncoprint/ResultsViewOncoprint.tsx
@@ -1,5 +1,5 @@
-import * as React from "react";
-import {Observer, observer} from "mobx-react";
+import * as React from 'react';
+import { Observer, observer } from 'mobx-react';
 import {
     action,
     computed,
@@ -8,24 +8,34 @@ import {
     observable,
     ObservableMap,
     reaction,
-    runInAction
-} from "mobx";
+    runInAction,
+} from 'mobx';
 import {
     capitalize,
     FadeInteraction,
     getBrowserWindow,
     isWebdriver,
     remoteData,
-    svgToPdfDownload
-} from "cbioportal-frontend-commons";
-import Oncoprint, {GENETIC_TRACK_GROUP_INDEX, IHeatmapTrackSpec} from "./Oncoprint";
+    svgToPdfDownload,
+} from 'cbioportal-frontend-commons';
+import Oncoprint, {
+    GENETIC_TRACK_GROUP_INDEX,
+    IHeatmapTrackSpec,
+} from './Oncoprint';
 import OncoprintControls, {
     IOncoprintControlsHandlers,
     IOncoprintControlsState,
-    ISelectOption
-} from "shared/components/oncoprint/controls/OncoprintControls";
-import {Gene, MolecularProfile, Sample} from "../../api/generated/CBioPortalAPI";
-import {ResultsViewPageStore, AlterationTypeConstants} from "../../../pages/resultsView/ResultsViewPageStore";
+    ISelectOption,
+} from 'shared/components/oncoprint/controls/OncoprintControls';
+import {
+    Gene,
+    MolecularProfile,
+    Sample,
+} from '../../api/generated/CBioPortalAPI';
+import {
+    ResultsViewPageStore,
+    AlterationTypeConstants,
+} from '../../../pages/resultsView/ResultsViewPageStore';
 import {
     getAlteredUids,
     getUnalteredUids,
@@ -34,48 +44,61 @@ import {
     makeGenesetHeatmapTracksMobxPromise,
     makeGeneticTracksMobxPromise,
     makeHeatmapTracksMobxPromise,
-    makeTreatmentProfileHeatmapTracksMobxPromise
-} from "./OncoprintUtils";
-import _ from "lodash";
-import onMobxPromise from "shared/lib/onMobxPromise";
-import AppConfig from "appConfig";
-import LoadingIndicator from "shared/components/loadingIndicator/LoadingIndicator";
-import OncoprintJS, {TrackGroupHeader, TrackGroupIndex, TrackId} from "oncoprintjs";
+    makeTreatmentProfileHeatmapTracksMobxPromise,
+} from './OncoprintUtils';
+import _ from 'lodash';
+import onMobxPromise from 'shared/lib/onMobxPromise';
+import AppConfig from 'appConfig';
+import LoadingIndicator from 'shared/components/loadingIndicator/LoadingIndicator';
+import OncoprintJS, {
+    TrackGroupHeader,
+    TrackGroupIndex,
+    TrackId,
+} from 'oncoprintjs';
 import fileDownload from 'react-file-download';
-import tabularDownload from "./tabularDownload";
+import tabularDownload from './tabularDownload';
 import classNames from 'classnames';
-import {clinicalAttributeIsLocallyComputed, SpecialAttribute} from "../../cache/ClinicalDataCache";
-import OqlStatusBanner from "../banners/OqlStatusBanner";
-import {getAnnotatingProgressMessage, treatmentsToSelectOptions} from "./ResultsViewOncoprintUtils";
-import ProgressIndicator, {IProgressIndicatorItem} from "../progressIndicator/ProgressIndicator";
-import autobind from "autobind-decorator";
-import {parseOQLQuery} from "../../lib/oql/oqlfilter";
-import AlterationFilterWarning from "../banners/AlterationFilterWarning";
-import { selectDisplayValue } from "./DataUtils";
-import WindowStore from "../window/WindowStore";
-import {OncoprintAnalysisCaseType} from "../../../pages/resultsView/ResultsViewPageStoreUtils";
-import {MakeMobxView} from "../MobxView";
-import ResultsViewURLWrapper from "pages/resultsView/ResultsViewURLWrapper";
-import {getMobxPromiseGroupStatus} from "../../lib/getMobxPromiseGroupStatus";
+import {
+    clinicalAttributeIsLocallyComputed,
+    SpecialAttribute,
+} from '../../cache/ClinicalDataCache';
+import OqlStatusBanner from '../banners/OqlStatusBanner';
+import {
+    getAnnotatingProgressMessage,
+    treatmentsToSelectOptions,
+} from './ResultsViewOncoprintUtils';
+import ProgressIndicator, {
+    IProgressIndicatorItem,
+} from '../progressIndicator/ProgressIndicator';
+import autobind from 'autobind-decorator';
+import { parseOQLQuery } from '../../lib/oql/oqlfilter';
+import AlterationFilterWarning from '../banners/AlterationFilterWarning';
+import { selectDisplayValue } from './DataUtils';
+import WindowStore from '../window/WindowStore';
+import { OncoprintAnalysisCaseType } from '../../../pages/resultsView/ResultsViewPageStoreUtils';
+import { MakeMobxView } from '../MobxView';
+import ResultsViewURLWrapper from 'pages/resultsView/ResultsViewURLWrapper';
+import { getMobxPromiseGroupStatus } from '../../lib/getMobxPromiseGroupStatus';
 
 interface IResultsViewOncoprintProps {
     divId: string;
-    store:ResultsViewPageStore;
-    urlWrapper:ResultsViewURLWrapper;
-    addOnBecomeVisibleListener?:(callback:()=>void)=>void;
+    store: ResultsViewPageStore;
+    urlWrapper: ResultsViewURLWrapper;
+    addOnBecomeVisibleListener?: (callback: () => void) => void;
 }
 
 export enum SortByUrlParamValue {
-    CASE_ID = "case_id",
-    CASE_LIST = "case_list",
-    NONE = ""
+    CASE_ID = 'case_id',
+    CASE_LIST = 'case_list',
+    NONE = '',
 }
 
-export type SortMode = (
-    {type:"data"|"alphabetical"|"caseList", clusteredHeatmapProfile?:undefined} |
-    {type:"heatmap", clusteredHeatmapProfile:string}
-);
-
+export type SortMode =
+    | {
+          type: 'data' | 'alphabetical' | 'caseList';
+          clusteredHeatmapProfile?: undefined;
+      }
+    | { type: 'heatmap'; clusteredHeatmapProfile: string };
 
 export interface IGenesetExpansionRecord {
     entrezGeneId: number;
@@ -84,180 +107,228 @@ export interface IGenesetExpansionRecord {
     correlationValue: number;
 }
 
-const CLINICAL_TRACK_KEY_PREFIX = "CLINICALTRACK_";
+const CLINICAL_TRACK_KEY_PREFIX = 'CLINICALTRACK_';
 
 /*  Each heatmap track group can hold tracks of a single entity type.
     Implemented entity types are genes and treatments. In the
     HeatmapTrackGroupRecord type the `entities` member refers to
     hugo_gene_symbols (for genes) or to treatment_id's (for treatments). */
 export type HeatmapTrackGroupRecord = {
-    trackGroupIndex:number,
-    molecularAlterationType:string,
-    entities: { [entity:string]:boolean }, // map of hugo_gene_symbols or treatment_id's
-    molecularProfileId:string
-}
+    trackGroupIndex: number;
+    molecularAlterationType: string;
+    entities: { [entity: string]: boolean }; // map of hugo_gene_symbols or treatment_id's
+    molecularProfileId: string;
+};
 
 /* fields and methods in the class below are ordered based on roughly
 /* chronological setup concerns, rather than on encapsulation and public API */
 /* tslint:disable: member-ordering */
 @observer
-export default class ResultsViewOncoprint extends React.Component<IResultsViewOncoprintProps, {}> {
-
-    @computed get columnMode(){
+export default class ResultsViewOncoprint extends React.Component<
+    IResultsViewOncoprintProps,
+    {}
+> {
+    @computed get columnMode() {
         debugger;
-        return this.urlWrapper.query.show_samples === "true" ? "sample" : "patient";
+        return this.urlWrapper.query.show_samples === 'true'
+            ? 'sample'
+            : 'patient';
     }
 
     @computed get sortMode() {
-        let mode:SortMode;
+        let mode: SortMode;
         switch (this.urlWrapper.query.oncoprint_sortby) {
-            case "case_id":
-                mode = {type:"alphabetical"};
+            case 'case_id':
+                mode = { type: 'alphabetical' };
                 break;
-            case "case_list":
-                mode = {type:"caseList"};
+            case 'case_list':
+                mode = { type: 'caseList' };
                 break;
-            case "cluster":
-                mode = {type:"heatmap", clusteredHeatmapProfile:this.urlWrapper.query.oncoprint_cluster_profile};
+            case 'cluster':
+                mode = {
+                    type: 'heatmap',
+                    clusteredHeatmapProfile: this.urlWrapper.query
+                        .oncoprint_cluster_profile,
+                };
                 break;
-            case "":
+            case '':
             default:
-                mode = {type:"data"};
+                mode = { type: 'data' };
         }
 
         return mode;
     }
 
     @computed get sortByMutationType() {
-        return !this.urlWrapper.query.oncoprint_sort_by_mutation_type || // on by default
-            this.urlWrapper.query.oncoprint_sort_by_mutation_type === "true";
+        return (
+            !this.urlWrapper.query.oncoprint_sort_by_mutation_type || // on by default
+            this.urlWrapper.query.oncoprint_sort_by_mutation_type === 'true'
+        );
     }
 
     @computed get sortByDrivers() {
-        return !this.urlWrapper.query.oncoprint_sort_by_drivers || // on by default
-            this.urlWrapper.query.oncoprint_sort_by_drivers === "true";
+        return (
+            !this.urlWrapper.query.oncoprint_sort_by_drivers || // on by default
+            this.urlWrapper.query.oncoprint_sort_by_drivers === 'true'
+        );
     }
 
-    @computed get selectedTreatmentsFromUrl(){
-        return this.props.store.treatmentList
+    @computed get selectedTreatmentsFromUrl() {
+        return this.props.store.treatmentList;
     }
 
-    @observable distinguishGermlineMutations:boolean = true;
-    @observable distinguishMutationType:boolean = true;
-    @observable showUnalteredColumns:boolean = true;
-    @observable showWhitespaceBetweenColumns:boolean = true;
-    @observable showClinicalTrackLegends:boolean = true;
+    @observable distinguishGermlineMutations: boolean = true;
+    @observable distinguishMutationType: boolean = true;
+    @observable showUnalteredColumns: boolean = true;
+    @observable showWhitespaceBetweenColumns: boolean = true;
+    @observable showClinicalTrackLegends: boolean = true;
     @observable _onlyShowClinicalLegendForAlteredCases = false;
     @observable showOqlInLabels = false;
 
     //private selectedTreatmentsFromUrl:string[] = [];
 
     @computed get onlyShowClinicalLegendForAlteredCases() {
-        return this.showClinicalTrackLegends && this._onlyShowClinicalLegendForAlteredCases;
+        return (
+            this.showClinicalTrackLegends &&
+            this._onlyShowClinicalLegendForAlteredCases
+        );
     }
 
-    @observable showMinimap:boolean = false;
+    @observable showMinimap: boolean = false;
 
-    @observable selectedHeatmapProfile = "";
-    @observable heatmapGeneInputValue = "";
+    @observable selectedHeatmapProfile = '';
+    @observable heatmapGeneInputValue = '';
 
-    @observable horzZoom:number = 0.5;
+    @observable horzZoom: number = 0.5;
 
-    @observable mouseInsideBounds:boolean = false;
+    @observable mouseInsideBounds: boolean = false;
 
     @observable renderingComplete = false;
 
-    private heatmapGeneInputValueUpdater:IReactionDisposer;
+    private heatmapGeneInputValueUpdater: IReactionDisposer;
 
-    private molecularProfileIdToHeatmapTrackGroupIndex:{[molecularProfileId:string]:number} = {};
+    private molecularProfileIdToHeatmapTrackGroupIndex: {
+        [molecularProfileId: string]: number;
+    } = {};
 
     @computed get selectedClinicalAttributeIds() {
-
-        const list = this.urlWrapper.query.clinicallist ?
-            this.urlWrapper.query.clinicallist.split(',') : [];
+        const list = this.urlWrapper.query.clinicallist
+            ? this.urlWrapper.query.clinicallist.split(',')
+            : [];
 
         // when there is no user selection in ULR, we want to
         // have some default tracks based on certain conditions
         if (this.urlWrapper.query.clinicallist === undefined) {
-
-            if(this.props.store.studyIds.result && this.props.store.studyIds.result.length > 1) {
+            if (
+                this.props.store.studyIds.result &&
+                this.props.store.studyIds.result.length > 1
+            ) {
                 list.push(SpecialAttribute.StudyOfOrigin);
             }
 
             if (
-                this.props.store.samples.result && this.props.store.patients.result &&
-                (this.props.store.samples.result.length > this.props.store.patients.result.length)
+                this.props.store.samples.result &&
+                this.props.store.patients.result &&
+                this.props.store.samples.result.length >
+                    this.props.store.patients.result.length
             ) {
                 list.push(SpecialAttribute.NumSamplesPerPatient);
             }
 
-            _.forEach(this.props.store.clinicalAttributes_profiledIn.result,(attr)=>{
-                list.push(attr.clinicalAttributeId);
-            });
-
+            _.forEach(
+                this.props.store.clinicalAttributes_profiledIn.result,
+                attr => {
+                    list.push(attr.clinicalAttributeId);
+                }
+            );
         }
 
-        return list.reduce((acc, key)=>{
+        return list.reduce((acc, key) => {
             acc.set(key, true);
             return acc;
-        },observable.shallowMap<boolean>())
+        }, observable.shallowMap<boolean>());
     }
 
     public expansionsByGeneticTrackKey = observable.map<number[]>();
-    public expansionsByGenesetHeatmapTrackKey =
-        observable.map<IGenesetExpansionRecord[]>();
-
-    @computed get molecularProfileIdToHeatmapTracks(){
+    public expansionsByGenesetHeatmapTrackKey = observable.map<
+        IGenesetExpansionRecord[]
+    >();
 
+    @computed get molecularProfileIdToHeatmapTracks() {
         // empty if no heatmap tracks param
-        const groups = this.urlWrapper.query.heatmap_track_groups ?
-            this.urlWrapper.query.heatmap_track_groups.split(";").map((x:string)=>x.split(",")) : [];
-
-        const parsedGroups = groups.reduce((acc:{ [molecularProfileId:string]:string[]}, group)=>{
-            acc[group[0] as string] = group.slice(1);
-            return acc;
-        }, {});
+        const groups = this.urlWrapper.query.heatmap_track_groups
+            ? this.urlWrapper.query.heatmap_track_groups
+                  .split(';')
+                  .map((x: string) => x.split(','))
+            : [];
+
+        const parsedGroups = groups.reduce(
+            (acc: { [molecularProfileId: string]: string[] }, group) => {
+                acc[group[0] as string] = group.slice(1);
+                return acc;
+            },
+            {}
+        );
 
-        const map: { [molecularProfileId:string] : HeatmapTrackGroupRecord } = {};
+        const map: {
+            [molecularProfileId: string]: HeatmapTrackGroupRecord;
+        } = {};
 
-        let nextTrackGroupIndex:number;
+        let nextTrackGroupIndex: number;
         // start next track group index based on existing heatmap track groups
         if (_.isEmpty(this.molecularProfileIdToHeatmapTrackGroupIndex)) {
             nextTrackGroupIndex = 2;
         } else {
-            nextTrackGroupIndex = Math.max(..._.values(this.molecularProfileIdToHeatmapTrackGroupIndex))+1;
+            nextTrackGroupIndex =
+                Math.max(
+                    ..._.values(this.molecularProfileIdToHeatmapTrackGroupIndex)
+                ) + 1;
         }
-        _.forEach(parsedGroups, (entities:string[], molecularProfileId)=>{
-            const profile:MolecularProfile = this.props.store.molecularProfileIdToMolecularProfile.result[molecularProfileId];
+        _.forEach(parsedGroups, (entities: string[], molecularProfileId) => {
+            const profile: MolecularProfile = this.props.store
+                .molecularProfileIdToMolecularProfile.result[
+                molecularProfileId
+            ];
             if (profile && entities && entities.length) {
-                if (!(profile.molecularProfileId in this.molecularProfileIdToHeatmapTrackGroupIndex)) {
+                if (
+                    !(
+                        profile.molecularProfileId in
+                        this.molecularProfileIdToHeatmapTrackGroupIndex
+                    )
+                ) {
                     // set track group index if doesnt yet exist
-                    this.molecularProfileIdToHeatmapTrackGroupIndex[profile.molecularProfileId] = nextTrackGroupIndex;
+                    this.molecularProfileIdToHeatmapTrackGroupIndex[
+                        profile.molecularProfileId
+                    ] = nextTrackGroupIndex;
                     nextTrackGroupIndex += 1;
                 }
                 const trackGroup: HeatmapTrackGroupRecord = {
-                      trackGroupIndex: this.molecularProfileIdToHeatmapTrackGroupIndex[profile.molecularProfileId],
-                      molecularProfileId: profile.molecularProfileId,
-                      molecularAlterationType: profile.molecularAlterationType,
-                      entities: {}
+                    trackGroupIndex: this
+                        .molecularProfileIdToHeatmapTrackGroupIndex[
+                        profile.molecularProfileId
+                    ],
+                    molecularProfileId: profile.molecularProfileId,
+                    molecularAlterationType: profile.molecularAlterationType,
+                    entities: {},
                 };
-                entities.forEach((entity: string) => trackGroup.entities[entity] = true);
+                entities.forEach(
+                    (entity: string) => (trackGroup.entities[entity] = true)
+                );
                 map[molecularProfileId] = trackGroup;
             }
         });
 
         return map;
-
     }
 
-    public controlsHandlers:IOncoprintControlsHandlers;
-    private controlsState:IOncoprintControlsState & IObservableObject;
+    public controlsHandlers: IOncoprintControlsHandlers;
+    private controlsState: IOncoprintControlsState & IObservableObject;
 
-    @observable.ref private oncoprint:OncoprintJS;
+    @observable.ref private oncoprint: OncoprintJS;
 
-    private urlParamsReaction:IReactionDisposer;
+    private urlParamsReaction: IReactionDisposer;
 
-    constructor(props:IResultsViewOncoprintProps) {
+    constructor(props: IResultsViewOncoprintProps) {
         super(props);
 
         this.showOqlInLabels = props.store.queryContainsOql;
@@ -265,25 +336,39 @@ export default class ResultsViewOncoprint extends React.Component<IResultsViewOn
 
         const self = this;
 
-        this.onChangeSelectedClinicalTracks = this.onChangeSelectedClinicalTracks.bind(this);
+        this.onChangeSelectedClinicalTracks = this.onChangeSelectedClinicalTracks.bind(
+            this
+        );
         this.onDeleteClinicalTrack = this.onDeleteClinicalTrack.bind(this);
         this.onMinimapClose = this.onMinimapClose.bind(this);
         this.oncoprintRef = this.oncoprintRef.bind(this);
         this.toggleColumnMode = this.toggleColumnMode.bind(this);
-        this.onTrackSortDirectionChange = this.onTrackSortDirectionChange.bind(this);
+        this.onTrackSortDirectionChange = this.onTrackSortDirectionChange.bind(
+            this
+        );
         this.onSuppressRendering = this.onSuppressRendering.bind(this);
         this.onReleaseRendering = this.onReleaseRendering.bind(this);
 
-        onMobxPromise(this.props.store.heatmapMolecularProfiles, (profiles:MolecularProfile[])=>{
-            // select first initially
-            if (profiles.length) {
-                this.selectedHeatmapProfile = profiles[0].molecularProfileId;
+        onMobxPromise(
+            this.props.store.heatmapMolecularProfiles,
+            (profiles: MolecularProfile[]) => {
+                // select first initially
+                if (profiles.length) {
+                    this.selectedHeatmapProfile =
+                        profiles[0].molecularProfileId;
+                }
             }
-        });
+        );
 
-        this.heatmapGeneInputValueUpdater = onMobxPromise(this.props.store.genes, (genes:Gene[])=>{
-            this.heatmapGeneInputValue = genes.map(g=>g.hugoGeneSymbol).join(" ");
-        }, Number.POSITIVE_INFINITY);
+        this.heatmapGeneInputValueUpdater = onMobxPromise(
+            this.props.store.genes,
+            (genes: Gene[]) => {
+                this.heatmapGeneInputValue = genes
+                    .map(g => g.hugoGeneSymbol)
+                    .join(' ');
+            },
+            Number.POSITIVE_INFINITY
+        );
 
         this.onMouseEnter = this.onMouseEnter.bind(this);
         this.onMouseLeave = this.onMouseLeave.bind(this);
@@ -303,7 +388,7 @@ export default class ResultsViewOncoprint extends React.Component<IResultsViewOn
             get showWhitespaceBetweenColumns() {
                 return self.showWhitespaceBetweenColumns;
             },
-            get showClinicalTrackLegends(){
+            get showClinicalTrackLegends() {
                 return self.showClinicalTrackLegends;
             },
             get onlyShowClinicalLegendForAlteredCases() {
@@ -322,7 +407,7 @@ export default class ResultsViewOncoprint extends React.Component<IResultsViewOn
                 return self.sortByMutationType;
             },
             get sortByCaseListDisabled() {
-                return ! self.caseListSortPossible;
+                return !self.caseListSortPossible;
             },
             get distinguishMutationType() {
                 return self.distinguishMutationType;
@@ -352,7 +437,8 @@ export default class ResultsViewOncoprint extends React.Component<IResultsViewOn
                 return self.props.store.didHotspotFailInOncoprint;
             },
             get annotateDriversCBioPortal() {
-                return self.props.store.driverAnnotationSettings.cbioportalCount;
+                return self.props.store.driverAnnotationSettings
+                    .cbioportalCount;
             },
             get annotateDriversCOSMIC() {
                 return self.props.store.driverAnnotationSettings.cosmicCount;
@@ -364,10 +450,16 @@ export default class ResultsViewOncoprint extends React.Component<IResultsViewOn
                 return self.props.store.excludeGermlineMutations;
             },
             get annotateCBioPortalInputValue() {
-                return self.props.store.driverAnnotationSettings.cbioportalCountThreshold + "";
+                return (
+                    self.props.store.driverAnnotationSettings
+                        .cbioportalCountThreshold + ''
+                );
             },
             get annotateCOSMICInputValue() {
-                return self.props.store.driverAnnotationSettings.cosmicCountThreshold + "";
+                return (
+                    self.props.store.driverAnnotationSettings
+                        .cosmicCountThreshold + ''
+                );
             },
             get sortMode() {
                 return self.sortMode;
@@ -387,37 +479,54 @@ export default class ResultsViewOncoprint extends React.Component<IResultsViewOn
             get selectedHeatmapProfileAlterationType() {
                 return self.selectedHeatmapProfileAlterationType;
             },
-            get heatmapIsDynamicallyQueried () {
+            get heatmapIsDynamicallyQueried() {
                 return self.heatmapIsDynamicallyQueried;
             },
             get ngchmButtonActive() {
-                return (AppConfig.serverConfig.show_mdacc_heatmap &&
-                        (self.props.store.remoteNgchmUrl.result &&
-                        self.props.store.remoteNgchmUrl.result != '') ? true : false);
+                return AppConfig.serverConfig.show_mdacc_heatmap &&
+                    (self.props.store.remoteNgchmUrl.result &&
+                        self.props.store.remoteNgchmUrl.result != '')
+                    ? true
+                    : false;
             },
             get heatmapGeneInputValue() {
                 return self.heatmapGeneInputValue;
             },
             get customDriverAnnotationBinaryMenuLabel() {
-                const label = AppConfig.serverConfig.oncoprint_custom_driver_annotation_binary_menu_label;
-                const customDriverReport = self.props.store.customDriverAnnotationReport.result;
-                if (label && customDriverReport && customDriverReport.hasBinary) {
+                const label =
+                    AppConfig.serverConfig
+                        .oncoprint_custom_driver_annotation_binary_menu_label;
+                const customDriverReport =
+                    self.props.store.customDriverAnnotationReport.result;
+                if (
+                    label &&
+                    customDriverReport &&
+                    customDriverReport.hasBinary
+                ) {
                     return label;
                 } else {
                     return undefined;
                 }
             },
             get customDriverAnnotationTiersMenuLabel() {
-                const label = AppConfig.serverConfig.oncoprint_custom_driver_annotation_tiers_menu_label;
-                const customDriverReport = self.props.store.customDriverAnnotationReport.result;
-                if (label && customDriverReport && customDriverReport.tiers.length) {
+                const label =
+                    AppConfig.serverConfig
+                        .oncoprint_custom_driver_annotation_tiers_menu_label;
+                const customDriverReport =
+                    self.props.store.customDriverAnnotationReport.result;
+                if (
+                    label &&
+                    customDriverReport &&
+                    customDriverReport.tiers.length
+                ) {
                     return label;
                 } else {
                     return undefined;
                 }
             },
             get customDriverAnnotationTiers() {
-                const customDriverReport = self.props.store.customDriverAnnotationReport.result;
+                const customDriverReport =
+                    self.props.store.customDriverAnnotationReport.result;
                 if (customDriverReport && customDriverReport.tiers.length) {
                     return customDriverReport.tiers;
                 } else {
@@ -442,198 +551,292 @@ export default class ResultsViewOncoprint extends React.Component<IResultsViewOn
             },
             get selectedTreatmentsInit() {
                 return self.selectedTreatmentsFromUrl;
-            }
+            },
         });
     }
 
-    get urlWrapper(){
+    get urlWrapper() {
         return this.props.urlWrapper;
     }
 
-    @computed get caseListSortPossible():boolean {
-        return !!(this.props.store.givenSampleOrder.isComplete && this.props.store.givenSampleOrder.result.length);
+    @computed get caseListSortPossible(): boolean {
+        return !!(
+            this.props.store.givenSampleOrder.isComplete &&
+            this.props.store.givenSampleOrder.result.length
+        );
     }
 
     @computed get distinguishDrivers() {
         return this.props.store.driverAnnotationSettings.driversAnnotated;
     }
 
-    onMouseEnter(){
+    onMouseEnter() {
         this.mouseInsideBounds = true;
     }
 
-    onMouseLeave(){
+    onMouseLeave() {
         this.mouseInsideBounds = false;
     }
 
     @action
-    public selectHeatmapProfile(index:number) {
-        onMobxPromise(this.props.store.heatmapMolecularProfiles, (profiles:MolecularProfile[])=>{
-            this.selectedHeatmapProfile = this.props.store.heatmapMolecularProfiles.result![index].molecularProfileId;
-        });
+    public selectHeatmapProfile(index: number) {
+        onMobxPromise(
+            this.props.store.heatmapMolecularProfiles,
+            (profiles: MolecularProfile[]) => {
+                this.selectedHeatmapProfile = this.props.store.heatmapMolecularProfiles.result![
+                    index
+                ].molecularProfileId;
+            }
+        );
     }
 
     @action
-    public setAnnotateCBioPortalInputValue(value:string) {
-        this.controlsHandlers.onChangeAnnotateCBioPortalInputValue && this.controlsHandlers.onChangeAnnotateCBioPortalInputValue(value);
+    public setAnnotateCBioPortalInputValue(value: string) {
+        this.controlsHandlers.onChangeAnnotateCBioPortalInputValue &&
+            this.controlsHandlers.onChangeAnnotateCBioPortalInputValue(value);
     }
 
     @action
-    public setAnnotateCOSMICInputValue(value:string) {
-        this.controlsHandlers.onChangeAnnotateCOSMICInputValue && this.controlsHandlers.onChangeAnnotateCOSMICInputValue(value);
+    public setAnnotateCOSMICInputValue(value: string) {
+        this.controlsHandlers.onChangeAnnotateCOSMICInputValue &&
+            this.controlsHandlers.onChangeAnnotateCOSMICInputValue(value);
     }
 
     private buildControlsHandlers() {
         return {
-            onSelectColumnType:(type:OncoprintAnalysisCaseType)=>{this.props.store.setOncoprintAnalysisCaseType(type);},
-            onSelectShowUnalteredColumns:(show:boolean)=>{this.showUnalteredColumns = show;},
-            onSelectShowWhitespaceBetweenColumns:(show:boolean)=>{this.showWhitespaceBetweenColumns = show;},
-            onSelectShowClinicalTrackLegends:(show:boolean)=>{this.showClinicalTrackLegends = show; },
-            onSelectOnlyShowClinicalLegendForAlteredCases:(show:boolean)=>{
+            onSelectColumnType: (type: OncoprintAnalysisCaseType) => {
+                this.props.store.setOncoprintAnalysisCaseType(type);
+            },
+            onSelectShowUnalteredColumns: (show: boolean) => {
+                this.showUnalteredColumns = show;
+            },
+            onSelectShowWhitespaceBetweenColumns: (show: boolean) => {
+                this.showWhitespaceBetweenColumns = show;
+            },
+            onSelectShowClinicalTrackLegends: (show: boolean) => {
+                this.showClinicalTrackLegends = show;
+            },
+            onSelectOnlyShowClinicalLegendForAlteredCases: (show: boolean) => {
                 this._onlyShowClinicalLegendForAlteredCases = show;
             },
-            onSelectShowOqlInLabels:(show:boolean)=>{this.showOqlInLabels = show;},
-            onSelectShowMinimap:(show:boolean)=>{this.showMinimap = show;},
-            onSelectDistinguishMutationType:(s:boolean)=>{this.distinguishMutationType = s;},
-            onSelectDistinguishDrivers:action((s:boolean)=>{
+            onSelectShowOqlInLabels: (show: boolean) => {
+                this.showOqlInLabels = show;
+            },
+            onSelectShowMinimap: (show: boolean) => {
+                this.showMinimap = show;
+            },
+            onSelectDistinguishMutationType: (s: boolean) => {
+                this.distinguishMutationType = s;
+            },
+            onSelectDistinguishDrivers: action((s: boolean) => {
                 if (!s) {
                     this.props.store.driverAnnotationSettings.oncoKb = false;
                     this.props.store.driverAnnotationSettings.hotspots = false;
                     this.props.store.driverAnnotationSettings.cbioportalCount = false;
                     this.props.store.driverAnnotationSettings.cosmicCount = false;
                     this.props.store.driverAnnotationSettings.customBinary = false;
-                    this.props.store.driverAnnotationSettings.driverTiers.forEach((value, key)=>{
-                        this.props.store.driverAnnotationSettings.driverTiers.set(key, false);
-                    });
+                    this.props.store.driverAnnotationSettings.driverTiers.forEach(
+                        (value, key) => {
+                            this.props.store.driverAnnotationSettings.driverTiers.set(
+                                key,
+                                false
+                            );
+                        }
+                    );
                     this.props.store.driverAnnotationSettings.excludeVUS = false;
                 } else {
-                    if (!this.controlsState.annotateDriversOncoKbDisabled && !this.controlsState.annotateDriversOncoKbError)
+                    if (
+                        !this.controlsState.annotateDriversOncoKbDisabled &&
+                        !this.controlsState.annotateDriversOncoKbError
+                    )
                         this.props.store.driverAnnotationSettings.oncoKb = true;
 
-                    if (!this.controlsState.annotateDriversHotspotsDisabled && !this.controlsState.annotateDriversHotspotsError)
+                    if (
+                        !this.controlsState.annotateDriversHotspotsDisabled &&
+                        !this.controlsState.annotateDriversHotspotsError
+                    )
                         this.props.store.driverAnnotationSettings.hotspots = true;
 
                     this.props.store.driverAnnotationSettings.cbioportalCount = true;
                     this.props.store.driverAnnotationSettings.cosmicCount = true;
                     this.props.store.driverAnnotationSettings.customBinary = true;
-                    this.props.store.driverAnnotationSettings.driverTiers.forEach((value, key)=>{
-                        this.props.store.driverAnnotationSettings.driverTiers.set(key, true);
-                    });
+                    this.props.store.driverAnnotationSettings.driverTiers.forEach(
+                        (value, key) => {
+                            this.props.store.driverAnnotationSettings.driverTiers.set(
+                                key,
+                                true
+                            );
+                        }
+                    );
                 }
             }),
-            onSelectDistinguishGermlineMutations:(s:boolean)=>{this.distinguishGermlineMutations = s; },
-            onSelectAnnotateOncoKb:action((s:boolean)=>{
+            onSelectDistinguishGermlineMutations: (s: boolean) => {
+                this.distinguishGermlineMutations = s;
+            },
+            onSelectAnnotateOncoKb: action((s: boolean) => {
                 this.props.store.driverAnnotationSettings.oncoKb = s;
             }),
-            onSelectAnnotateHotspots:action((s:boolean)=>{
+            onSelectAnnotateHotspots: action((s: boolean) => {
                 this.props.store.driverAnnotationSettings.hotspots = s;
             }),
-            onSelectAnnotateCBioPortal:action((s:boolean)=>{
+            onSelectAnnotateCBioPortal: action((s: boolean) => {
                 this.props.store.driverAnnotationSettings.cbioportalCount = s;
             }),
-            onSelectAnnotateCOSMIC:action((s:boolean)=>{
+            onSelectAnnotateCOSMIC: action((s: boolean) => {
                 this.props.store.driverAnnotationSettings.cosmicCount = s;
             }),
-            onChangeAnnotateCBioPortalInputValue:action((s:string)=>{
-                this.props.store.driverAnnotationSettings.cbioportalCountThreshold = parseInt(s, 10);
-                this.controlsHandlers.onSelectAnnotateCBioPortal && this.controlsHandlers.onSelectAnnotateCBioPortal(true);
+            onChangeAnnotateCBioPortalInputValue: action((s: string) => {
+                this.props.store.driverAnnotationSettings.cbioportalCountThreshold = parseInt(
+                    s,
+                    10
+                );
+                this.controlsHandlers.onSelectAnnotateCBioPortal &&
+                    this.controlsHandlers.onSelectAnnotateCBioPortal(true);
             }),
-            onChangeAnnotateCOSMICInputValue:action((s:string)=>{
-                this.props.store.driverAnnotationSettings.cosmicCountThreshold = parseInt(s, 10);
-                this.controlsHandlers.onSelectAnnotateCOSMIC && this.controlsHandlers.onSelectAnnotateCOSMIC(true);
+            onChangeAnnotateCOSMICInputValue: action((s: string) => {
+                this.props.store.driverAnnotationSettings.cosmicCountThreshold = parseInt(
+                    s,
+                    10
+                );
+                this.controlsHandlers.onSelectAnnotateCOSMIC &&
+                    this.controlsHandlers.onSelectAnnotateCOSMIC(true);
             }),
-            onSelectCustomDriverAnnotationBinary:action((s:boolean)=>{
+            onSelectCustomDriverAnnotationBinary: action((s: boolean) => {
                 this.props.store.driverAnnotationSettings.customBinary = s;
             }),
-            onSelectCustomDriverAnnotationTier:action((value:string, checked:boolean)=>{
-                this.props.store.driverAnnotationSettings.driverTiers.set(value, checked);
-            }),
-            onSelectHidePutativePassengers:(s:boolean)=>{
+            onSelectCustomDriverAnnotationTier: action(
+                (value: string, checked: boolean) => {
+                    this.props.store.driverAnnotationSettings.driverTiers.set(
+                        value,
+                        checked
+                    );
+                }
+            ),
+            onSelectHidePutativePassengers: (s: boolean) => {
                 this.props.store.driverAnnotationSettings.excludeVUS = s;
             },
-            onSelectHideGermlineMutations:(s:boolean)=>{
+            onSelectHideGermlineMutations: (s: boolean) => {
                 this.props.store.setExcludeGermlineMutations(s);
             },
-            onSelectSortByMutationType:(s:boolean)=>{
-                this.urlWrapper.updateURL({ oncoprint_sort_by_mutation_type: s.toString() });
+            onSelectSortByMutationType: (s: boolean) => {
+                this.urlWrapper.updateURL({
+                    oncoprint_sort_by_mutation_type: s.toString(),
+                });
+            },
+            onClickSortAlphabetical: () => {
+                this.urlWrapper.updateURL({
+                    oncoprint_sortby: 'case_id',
+                    oncoprint_cluster_profile: '',
+                });
             },
-            onClickSortAlphabetical:()=>{
+            onClickSortCaseListOrder: () => {
                 this.urlWrapper.updateURL({
-                    oncoprint_sortby:"case_id",
-                    oncoprint_cluster_profile:""
+                    oncoprint_sortby: 'case_list',
+                    oncoprint_cluster_profile: '',
                 });
             },
-            onClickSortCaseListOrder:()=>{
+            onSelectSortByDrivers: (sort: boolean) => {
                 this.urlWrapper.updateURL({
-                    oncoprint_sortby:"case_list",
-                    oncoprint_cluster_profile:""
+                    oncoprint_sort_by_drivers: sort.toString(),
                 });
             },
-            onSelectSortByDrivers:(sort:boolean)=>{
-                this.urlWrapper.updateURL({ oncoprint_sort_by_drivers: sort.toString() });
+            onClickSortByData: () => {
+                this.urlWrapper.updateURL({
+                    oncoprint_sortby: '',
+                    oncoprint_cluster_profile: '',
+                });
             },
-            onClickSortByData:()=>{this.urlWrapper.updateURL({
-                oncoprint_sortby:"",
-                oncoprint_cluster_profile:""
-            });},
             onChangeSelectedClinicalTracks: this.onChangeSelectedClinicalTracks,
-            onChangeHeatmapGeneInputValue:action((s:string)=>{
+            onChangeHeatmapGeneInputValue: action((s: string) => {
                 this.heatmapGeneInputValue = s;
                 this.heatmapGeneInputValueUpdater(); // stop updating heatmap input if user has typed
             }),
-            onSelectHeatmapProfile:(id:string)=>{this.selectedHeatmapProfile = id;},
-            onClickAddGenesToHeatmap:()=>{
-                const genes = parseOQLQuery(this.heatmapGeneInputValue.toUpperCase().trim()).map(q=>q.gene);
+            onSelectHeatmapProfile: (id: string) => {
+                this.selectedHeatmapProfile = id;
+            },
+            onClickAddGenesToHeatmap: () => {
+                const genes = parseOQLQuery(
+                    this.heatmapGeneInputValue.toUpperCase().trim()
+                ).map(q => q.gene);
                 this.addHeatmapTracks(this.selectedHeatmapProfile, genes);
             },
-            onClickAddTreatmentsToHeatmap:(treatmentIds:string[])=>{
-                this.addHeatmapTracks(this.selectedHeatmapProfile, treatmentIds);
+            onClickAddTreatmentsToHeatmap: (treatmentIds: string[]) => {
+                this.addHeatmapTracks(
+                    this.selectedHeatmapProfile,
+                    treatmentIds
+                );
             },
-            onClickNGCHM:()=>{
-            	window.open(this.props.store.remoteNgchmUrl.result, '_blank');
+            onClickNGCHM: () => {
+                window.open(this.props.store.remoteNgchmUrl.result, '_blank');
             },
-            onClickDownload:(type:string)=>{
-                switch(type) {
-                    case "pdf":
-                        svgToPdfDownload("oncoprint.pdf", this.oncoprint.toSVG(false));
+            onClickDownload: (type: string) => {
+                switch (type) {
+                    case 'pdf':
+                        svgToPdfDownload(
+                            'oncoprint.pdf',
+                            this.oncoprint.toSVG(false)
+                        );
                         // if (!pdfDownload("oncoprint.pdf", this.oncoprint.toSVG(true))) {
                         //     alert("Oncoprint too big to download as PDF - please download as SVG.");
                         // }
                         break;
-                    case "png":
-                        const img = this.oncoprint.toCanvas((canvas, truncated)=>{
-                            canvas.toBlob(blob=>{
-                                if (truncated) {
-                                    alert(
-                                        `Oncoprint too large - PNG truncated to ${canvas.getAttribute("width")}x${canvas.getAttribute("height")}`
-                                    );
-                                }
-                                fileDownload(
-                                    blob,
-                                    "oncoprint.png"
-                                );
-                            });
-                        }, 2);
+                    case 'png':
+                        const img = this.oncoprint.toCanvas(
+                            (canvas, truncated) => {
+                                canvas.toBlob(blob => {
+                                    if (truncated) {
+                                        alert(
+                                            `Oncoprint too large - PNG truncated to ${canvas.getAttribute(
+                                                'width'
+                                            )}x${canvas.getAttribute('height')}`
+                                        );
+                                    }
+                                    fileDownload(blob, 'oncoprint.png');
+                                });
+                            },
+                            2
+                        );
                         break;
-                    case "svg":
+                    case 'svg':
                         fileDownload(
-                            (new XMLSerializer).serializeToString(this.oncoprint.toSVG(false)),
-                            "oncoprint.svg"
+                            new XMLSerializer().serializeToString(
+                                this.oncoprint.toSVG(false)
+                            ),
+                            'oncoprint.svg'
                         );
                         break;
-                    case "order":
-                        const capitalizedColumnMode = capitalize(this.oncoprintAnalysisCaseType);
+                    case 'order':
+                        const capitalizedColumnMode = capitalize(
+                            this.oncoprintAnalysisCaseType
+                        );
                         onMobxPromise(
-                            [this.props.store.sampleKeyToSample,
-                                this.props.store.patientKeyToPatient],
-                            (sampleKeyToSample:{[sampleKey:string]:Sample}, patientKeyToPatient: any)=>{
+                            [
+                                this.props.store.sampleKeyToSample,
+                                this.props.store.patientKeyToPatient,
+                            ],
+                            (
+                                sampleKeyToSample: {
+                                    [sampleKey: string]: Sample;
+                                },
+                                patientKeyToPatient: any
+                            ) => {
                                 let file = `${capitalizedColumnMode} order in the Oncoprint is:\n`;
-                                const keyToCase = (this.oncoprintAnalysisCaseType === OncoprintAnalysisCaseType.SAMPLE ? sampleKeyToSample : patientKeyToPatient);
-                                const caseIds = this.oncoprint.getIdOrder().map(
-                                    this.oncoprintAnalysisCaseType === OncoprintAnalysisCaseType.SAMPLE ?
-                                        ((id:string)=>(sampleKeyToSample[id].sampleId)) :
-                                        ((id:string)=>(patientKeyToPatient[id].patientId))
-                                );
+                                const keyToCase =
+                                    this.oncoprintAnalysisCaseType ===
+                                    OncoprintAnalysisCaseType.SAMPLE
+                                        ? sampleKeyToSample
+                                        : patientKeyToPatient;
+                                const caseIds = this.oncoprint
+                                    .getIdOrder()
+                                    .map(
+                                        this.oncoprintAnalysisCaseType ===
+                                            OncoprintAnalysisCaseType.SAMPLE
+                                            ? (id: string) =>
+                                                  sampleKeyToSample[id].sampleId
+                                            : (id: string) =>
+                                                  patientKeyToPatient[id]
+                                                      .patientId
+                                    );
                                 for (const caseId of caseIds) {
                                     file += `${caseId}\n`;
                                 }
@@ -644,11 +847,18 @@ export default class ResultsViewOncoprint extends React.Component<IResultsViewOn
                             }
                         );
                         break;
-                    case "tabular":
+                    case 'tabular':
                         onMobxPromise(
-                            [this.props.store.sampleKeyToSample,
-                                this.props.store.patientKeyToPatient],
-                            (sampleKeyToSample:{[sampleKey:string]:Sample}, patientKeyToPatient: any)=>{
+                            [
+                                this.props.store.sampleKeyToSample,
+                                this.props.store.patientKeyToPatient,
+                            ],
+                            (
+                                sampleKeyToSample: {
+                                    [sampleKey: string]: Sample;
+                                },
+                                patientKeyToPatient: any
+                            ) => {
                                 tabularDownload(
                                     this.geneticTracks.result,
                                     this.clinicalTracks.result,
@@ -656,26 +866,30 @@ export default class ResultsViewOncoprint extends React.Component<IResultsViewOn
                                     this.treatmentHeatmapTracks.result,
                                     this.genesetHeatmapTracks.result,
                                     this.oncoprint.getIdOrder(),
-                                    (this.oncoprintAnalysisCaseType === OncoprintAnalysisCaseType.SAMPLE ?
-                                        ((key:string)=>(sampleKeyToSample[key].sampleId)) :
-                                        ((key:string)=>(patientKeyToPatient[key].patientId))),
+                                    this.oncoprintAnalysisCaseType ===
+                                        OncoprintAnalysisCaseType.SAMPLE
+                                        ? (key: string) =>
+                                              sampleKeyToSample[key].sampleId
+                                        : (key: string) =>
+                                              patientKeyToPatient[key]
+                                                  .patientId,
                                     this.oncoprintAnalysisCaseType,
                                     this.distinguishDrivers
-                                )
+                                );
                             }
                         );
                         break;
                 }
             },
-            onSetHorzZoom:(z:number)=>{
+            onSetHorzZoom: (z: number) => {
                 this.oncoprint.setHorzZoom(z);
             },
-            onClickZoomIn:()=>{
-                this.oncoprint.setHorzZoom(this.oncoprint.getHorzZoom()/0.7);
+            onClickZoomIn: () => {
+                this.oncoprint.setHorzZoom(this.oncoprint.getHorzZoom() / 0.7);
+            },
+            onClickZoomOut: () => {
+                this.oncoprint.setHorzZoom(this.oncoprint.getHorzZoom() * 0.7);
             },
-            onClickZoomOut:()=>{
-                this.oncoprint.setHorzZoom(this.oncoprint.getHorzZoom()*0.7);
-            }
         };
     }
 
@@ -686,114 +900,154 @@ export default class ResultsViewOncoprint extends React.Component<IResultsViewOn
      * heatmaps are queried from the query page.
      */
     @computed get heatmapIsDynamicallyQueried(): boolean {
-        const profileMap = this.props.store.molecularProfileIdToMolecularProfile.result;
+        const profileMap = this.props.store.molecularProfileIdToMolecularProfile
+            .result;
         return (
             profileMap.hasOwnProperty(this.selectedHeatmapProfile) &&
-            profileMap[this.selectedHeatmapProfile].molecularAlterationType !== 'GENESET_SCORE'
+            profileMap[this.selectedHeatmapProfile].molecularAlterationType !==
+                'GENESET_SCORE'
         );
     }
 
     @action public sortByData() {
         this.urlWrapper.updateURL({
-            oncoprint_sortby:"",
-            oncoprint_cluster_profile:""
+            oncoprint_sortby: '',
+            oncoprint_cluster_profile: '',
         });
     }
 
     @computed get clinicalTracksUrlParam() {
-        return this.selectedClinicalAttributeIds.keys().join(",");
+        return this.selectedClinicalAttributeIds.keys().join(',');
     }
 
     private readonly unalteredKeys = remoteData({
-        await:()=>[this.geneticTracks],
-        invoke:async()=>getUnalteredUids(this.geneticTracks.result!)
+        await: () => [this.geneticTracks],
+        invoke: async () => getUnalteredUids(this.geneticTracks.result!),
     });
 
     readonly treatmentSelectOptions = remoteData<ISelectOption[]>({
-        await:() => [this.props.store.treatmentsInStudies],
-        invoke:async() => treatmentsToSelectOptions(this.props.store.treatmentsInStudies.result || [])
+        await: () => [this.props.store.treatmentsInStudies],
+        invoke: async () =>
+            treatmentsToSelectOptions(
+                this.props.store.treatmentsInStudies.result || []
+            ),
     });
 
-    @computed get selectedHeatmapProfileAlterationType():string {
-        let molecularProfile = this.props.store.molecularProfileIdToMolecularProfile.result[this.selectedHeatmapProfile];
+    @computed get selectedHeatmapProfileAlterationType(): string {
+        let molecularProfile = this.props.store
+            .molecularProfileIdToMolecularProfile.result[
+            this.selectedHeatmapProfile
+        ];
         return molecularProfile.molecularAlterationType;
     }
 
-    public addHeatmapTracks(molecularProfileId:string, entities:string[]) {
-
-        const tracksMap = _.cloneDeep(this.molecularProfileIdToHeatmapTracks) as {[molecularProfileId:string]:Pick<HeatmapTrackGroupRecord, "entities"|"molecularProfileId"|"molecularAlterationType">};
+    public addHeatmapTracks(molecularProfileId: string, entities: string[]) {
+        const tracksMap = _.cloneDeep(
+            this.molecularProfileIdToHeatmapTracks
+        ) as {
+            [molecularProfileId: string]: Pick<
+                HeatmapTrackGroupRecord,
+                'entities' | 'molecularProfileId' | 'molecularAlterationType'
+            >;
+        };
 
-        const entitiesMap = _.chain(entities).keyBy(entity=>entity).mapValues(()=>true).value();
+        const entitiesMap = _.chain(entities)
+            .keyBy(entity => entity)
+            .mapValues(() => true)
+            .value();
 
         // first delete any existing track for this profileId
         delete tracksMap[molecularProfileId];
 
-        const molecularAlterationType =
-            this.props.store.molecularProfileIdToMolecularProfile.result[molecularProfileId].molecularAlterationType!;
+        const molecularAlterationType = this.props.store
+            .molecularProfileIdToMolecularProfile.result[molecularProfileId]
+            .molecularAlterationType!;
 
         if (entities && entities.length) {
             tracksMap[molecularProfileId] = {
                 entities: entitiesMap,
                 molecularAlterationType,
-                molecularProfileId
+                molecularProfileId,
             };
         } else {
             delete tracksMap[molecularProfileId];
         }
 
-        const heatmap_track_groups = _.map(tracksMap, (track, molecularProfileId)=>{
-            return `${molecularProfileId},${_.keys(track.entities).join(",")}`;
-        }).join(";");
+        const heatmap_track_groups = _.map(
+            tracksMap,
+            (track, molecularProfileId) => {
+                return `${molecularProfileId},${_.keys(track.entities).join(
+                    ','
+                )}`;
+            }
+        ).join(';');
 
         // derive treaments from heatmap tracks since the only way to add treatments right now
         // is to use heatmap UI in oncoprint
-        const treatment_list = _.filter(tracksMap, (x:HeatmapTrackGroupRecord)=> x.molecularAlterationType === AlterationTypeConstants.GENERIC_ASSAY)
-            .map((x:HeatmapTrackGroupRecord)=>`${_.keys(x.entities).join(";")}`)
-            .join(";");
+        const treatment_list = _.filter(
+            tracksMap,
+            (x: HeatmapTrackGroupRecord) =>
+                x.molecularAlterationType ===
+                AlterationTypeConstants.GENERIC_ASSAY
+        )
+            .map(
+                (x: HeatmapTrackGroupRecord) =>
+                    `${_.keys(x.entities).join(';')}`
+            )
+            .join(';');
 
         this.urlWrapper.updateURL({ heatmap_track_groups, treatment_list });
     }
 
-    removeHeatmapTracksByProfileId(molecularProfileId:string){
-        this.addHeatmapTracks
+    removeHeatmapTracksByProfileId(molecularProfileId: string) {
+        this.addHeatmapTracks;
     }
 
     private toggleColumnMode() {
         switch (this.oncoprintAnalysisCaseType) {
             case OncoprintAnalysisCaseType.SAMPLE:
-                this.controlsHandlers.onSelectColumnType && this.controlsHandlers.onSelectColumnType(OncoprintAnalysisCaseType.PATIENT);
+                this.controlsHandlers.onSelectColumnType &&
+                    this.controlsHandlers.onSelectColumnType(
+                        OncoprintAnalysisCaseType.PATIENT
+                    );
                 break;
             case OncoprintAnalysisCaseType.PATIENT:
-                this.controlsHandlers.onSelectColumnType && this.controlsHandlers.onSelectColumnType(OncoprintAnalysisCaseType.SAMPLE);
+                this.controlsHandlers.onSelectColumnType &&
+                    this.controlsHandlers.onSelectColumnType(
+                        OncoprintAnalysisCaseType.SAMPLE
+                    );
                 break;
         }
     }
 
-    private oncoprintRef(oncoprint:OncoprintJS) {
+    private oncoprintRef(oncoprint: OncoprintJS) {
         this.oncoprint = oncoprint;
         if (this.props.addOnBecomeVisibleListener) {
-            this.props.addOnBecomeVisibleListener(
-                ()=>this.oncoprint.triggerPendingResizeAndOrganize(this.onReleaseRendering)
+            this.props.addOnBecomeVisibleListener(() =>
+                this.oncoprint.triggerPendingResizeAndOrganize(
+                    this.onReleaseRendering
+                )
             );
         }
 
-        this.oncoprint.onHorzZoom(z=>(this.horzZoom = z));
+        this.oncoprint.onHorzZoom(z => (this.horzZoom = z));
         this.horzZoom = this.oncoprint.getHorzZoom();
-        onMobxPromise(this.alteredKeys,
-            (alteredUids:string[])=>{
-                this.oncoprint.setHorzZoomToFit(alteredUids);
-            });
-
+        onMobxPromise(this.alteredKeys, (alteredUids: string[]) => {
+            this.oncoprint.setHorzZoomToFit(alteredUids);
+        });
     }
 
-    private setColumnMode(type:OncoprintAnalysisCaseType) {
-        this.urlWrapper.updateURL({ show_samples: type===OncoprintAnalysisCaseType.SAMPLE ? "true" : "false" })
+    private setColumnMode(type: OncoprintAnalysisCaseType) {
+        this.urlWrapper.updateURL({
+            show_samples:
+                type === OncoprintAnalysisCaseType.SAMPLE ? 'true' : 'false',
+        });
     }
 
     readonly alteredKeys = remoteData({
-        await:()=>[this.geneticTracks],
-        invoke:async()=>getAlteredUids(this.geneticTracks.result!),
-        default: []
+        await: () => [this.geneticTracks],
+        invoke: async () => getAlteredUids(this.geneticTracks.result!),
+        default: [],
     });
 
     @action private onMinimapClose() {
@@ -808,28 +1062,41 @@ export default class ResultsViewOncoprint extends React.Component<IResultsViewOn
         this.renderingComplete = true;
     }
 
-    public clinicalTrackKeyToAttributeId(clinicalTrackKey:string) {
+    public clinicalTrackKeyToAttributeId(clinicalTrackKey: string) {
         return clinicalTrackKey.substr(CLINICAL_TRACK_KEY_PREFIX.length);
     }
 
-    public clinicalAttributeIdToTrackKey(clinicalAttributeId:string|SpecialAttribute) {
+    public clinicalAttributeIdToTrackKey(
+        clinicalAttributeId: string | SpecialAttribute
+    ) {
         return `${CLINICAL_TRACK_KEY_PREFIX}${clinicalAttributeId}`;
     }
 
-    @action private onChangeSelectedClinicalTracks(clinicalAttributeIds:(string|SpecialAttribute)[]) {
-        this.urlWrapper.updateURL({ clinicallist: clinicalAttributeIds.join(",")  });
+    @action private onChangeSelectedClinicalTracks(
+        clinicalAttributeIds: (string | SpecialAttribute)[]
+    ) {
+        this.urlWrapper.updateURL({
+            clinicallist: clinicalAttributeIds.join(','),
+        });
     }
 
-    private onDeleteClinicalTrack(clinicalTrackKey:string) {
+    private onDeleteClinicalTrack(clinicalTrackKey: string) {
         // ignore tracks being deleted due to rendering process reasons
         if (!this.isHidden) {
             const ids = this.selectedClinicalAttributeIds.keys();
-            const withoutDeleted = _.filter(ids,(item)=>item!==this.clinicalTrackKeyToAttributeId(clinicalTrackKey));
-            this.urlWrapper.updateURL({ clinicallist: withoutDeleted.join(",")  });
+            const withoutDeleted = _.filter(
+                ids,
+                item =>
+                    item !==
+                    this.clinicalTrackKeyToAttributeId(clinicalTrackKey)
+            );
+            this.urlWrapper.updateURL({
+                clinicallist: withoutDeleted.join(','),
+            });
         }
     }
 
-    private onTrackSortDirectionChange(trackId:TrackId, dir:number) {
+    private onTrackSortDirectionChange(trackId: TrackId, dir: number) {
         // called when a clinical or heatmap track is sorted a-Z or Z-a, selected from within oncoprintjs UI
         if (dir === 1 || dir === -1) {
             this.sortByData();
@@ -851,21 +1118,36 @@ export default class ResultsViewOncoprint extends React.Component<IResultsViewOn
         //     (this.routing.location.query as CancerStudyQueryUrlParams)
         //         .show_samples === 'true'
         // ) ? OncoprintAnalysisCaseType.SAMPLE : OncoprintAnalysisCaseType.PATIENT;
-        return (
-            this.urlWrapper.query.show_samples === 'true'
-        ) ? OncoprintAnalysisCaseType.SAMPLE : OncoprintAnalysisCaseType.PATIENT;
+        return this.urlWrapper.query.show_samples === 'true'
+            ? OncoprintAnalysisCaseType.SAMPLE
+            : OncoprintAnalysisCaseType.PATIENT;
     }
 
-
     @computed get sortOrder() {
-
-        if (this.sortMode.type === "alphabetical") {
-            return this.oncoprintAnalysisCaseType === OncoprintAnalysisCaseType.SAMPLE ? this.alphabeticalSampleOrder : this.alphabeticalPatientOrder;
-        } else if (this.sortMode.type === "caseList") {
-            if (this.oncoprintAnalysisCaseType === OncoprintAnalysisCaseType.SAMPLE && this.props.store.givenSampleOrder.isComplete) {
-                return this.props.store.givenSampleOrder.result.map(x=>x.uniqueSampleKey);
-            } else if (this.oncoprintAnalysisCaseType === OncoprintAnalysisCaseType.PATIENT && this.props.store.givenSampleOrder.isComplete) {
-                return _.uniq(this.props.store.givenSampleOrder.result.map(x=>x.uniquePatientKey));
+        if (this.sortMode.type === 'alphabetical') {
+            return this.oncoprintAnalysisCaseType ===
+                OncoprintAnalysisCaseType.SAMPLE
+                ? this.alphabeticalSampleOrder
+                : this.alphabeticalPatientOrder;
+        } else if (this.sortMode.type === 'caseList') {
+            if (
+                this.oncoprintAnalysisCaseType ===
+                    OncoprintAnalysisCaseType.SAMPLE &&
+                this.props.store.givenSampleOrder.isComplete
+            ) {
+                return this.props.store.givenSampleOrder.result.map(
+                    x => x.uniqueSampleKey
+                );
+            } else if (
+                this.oncoprintAnalysisCaseType ===
+                    OncoprintAnalysisCaseType.PATIENT &&
+                this.props.store.givenSampleOrder.isComplete
+            ) {
+                return _.uniq(
+                    this.props.store.givenSampleOrder.result.map(
+                        x => x.uniquePatientKey
+                    )
+                );
             } else {
                 return undefined;
             }
@@ -876,79 +1158,118 @@ export default class ResultsViewOncoprint extends React.Component<IResultsViewOn
 
     @computed get alphabeticalSampleOrder() {
         if (this.props.store.samples.isComplete) {
-            return _.sortBy(this.props.store.samples.result!, sample=>sample.sampleId).map(sample=>sample.uniqueSampleKey);
+            return _.sortBy(
+                this.props.store.samples.result!,
+                sample => sample.sampleId
+            ).map(sample => sample.uniqueSampleKey);
         } else {
             return undefined;
         }
-    };
+    }
 
     @computed get alphabeticalPatientOrder() {
         if (this.props.store.patients.isComplete) {
-            return _.sortBy(this.props.store.patients.result!, patient=>patient.patientId).map(patient=>patient.uniquePatientKey);
+            return _.sortBy(
+                this.props.store.patients.result!,
+                patient => patient.patientId
+            ).map(patient => patient.uniquePatientKey);
         } else {
             return undefined;
         }
-    };
+    }
 
     readonly sampleGeneticTracks = makeGeneticTracksMobxPromise(this, true);
     readonly patientGeneticTracks = makeGeneticTracksMobxPromise(this, false);
     @computed get geneticTracks() {
-        return (this.oncoprintAnalysisCaseType === OncoprintAnalysisCaseType.SAMPLE ? this.sampleGeneticTracks : this.patientGeneticTracks);
+        return this.oncoprintAnalysisCaseType ===
+            OncoprintAnalysisCaseType.SAMPLE
+            ? this.sampleGeneticTracks
+            : this.patientGeneticTracks;
     }
 
     readonly sampleClinicalTracks = makeClinicalTracksMobxPromise(this, true);
     readonly patientClinicalTracks = makeClinicalTracksMobxPromise(this, false);
 
     @computed get clinicalTracks() {
-        return (this.oncoprintAnalysisCaseType === OncoprintAnalysisCaseType.SAMPLE ? this.sampleClinicalTracks : this.patientClinicalTracks);
+        return this.oncoprintAnalysisCaseType ===
+            OncoprintAnalysisCaseType.SAMPLE
+            ? this.sampleClinicalTracks
+            : this.patientClinicalTracks;
     }
 
     readonly sampleHeatmapTracks = makeHeatmapTracksMobxPromise(this, true);
     readonly patientHeatmapTracks = makeHeatmapTracksMobxPromise(this, false);
     @computed get heatmapTracks() {
-        return (this.oncoprintAnalysisCaseType === OncoprintAnalysisCaseType.SAMPLE ? this.sampleHeatmapTracks : this.patientHeatmapTracks);
+        return this.oncoprintAnalysisCaseType ===
+            OncoprintAnalysisCaseType.SAMPLE
+            ? this.sampleHeatmapTracks
+            : this.patientHeatmapTracks;
     }
 
-    readonly sampleTreatmentHeatmapTracks = makeTreatmentProfileHeatmapTracksMobxPromise(this, true);
-    readonly patientTreatmentHeatmapTracks = makeTreatmentProfileHeatmapTracksMobxPromise(this, false);
+    readonly sampleTreatmentHeatmapTracks = makeTreatmentProfileHeatmapTracksMobxPromise(
+        this,
+        true
+    );
+    readonly patientTreatmentHeatmapTracks = makeTreatmentProfileHeatmapTracksMobxPromise(
+        this,
+        false
+    );
     @computed get treatmentHeatmapTracks() {
-        return (this.oncoprintAnalysisCaseType === OncoprintAnalysisCaseType.SAMPLE ? this.sampleTreatmentHeatmapTracks : this.patientTreatmentHeatmapTracks);
+        return this.oncoprintAnalysisCaseType ===
+            OncoprintAnalysisCaseType.SAMPLE
+            ? this.sampleTreatmentHeatmapTracks
+            : this.patientTreatmentHeatmapTracks;
     }
 
     @computed get genesetHeatmapTrackGroup(): number {
-        return 1 + Math.max(
-            GENETIC_TRACK_GROUP_INDEX,
-            // observe the heatmap tracks to render in the very next group
-            ...(this.heatmapTracks.result.map(hmTrack => hmTrack.trackGroupIndex)),
-            ...(this.treatmentHeatmapTracks.result.map(hmTrack => hmTrack.trackGroupIndex))
+        return (
+            1 +
+            Math.max(
+                GENETIC_TRACK_GROUP_INDEX,
+                // observe the heatmap tracks to render in the very next group
+                ...this.heatmapTracks.result.map(
+                    hmTrack => hmTrack.trackGroupIndex
+                ),
+                ...this.treatmentHeatmapTracks.result.map(
+                    hmTrack => hmTrack.trackGroupIndex
+                )
+            )
         );
     }
 
     readonly sampleGenesetHeatmapTracks = makeGenesetHeatmapTracksMobxPromise(
-            this, true,
-            makeGenesetHeatmapExpansionsMobxPromise(this, true)
+        this,
+        true,
+        makeGenesetHeatmapExpansionsMobxPromise(this, true)
     );
     readonly patientGenesetHeatmapTracks = makeGenesetHeatmapTracksMobxPromise(
-            this, false,
-            makeGenesetHeatmapExpansionsMobxPromise(this, false)
+        this,
+        false,
+        makeGenesetHeatmapExpansionsMobxPromise(this, false)
     );
     @computed get genesetHeatmapTracks() {
-        return (this.oncoprintAnalysisCaseType === OncoprintAnalysisCaseType.SAMPLE ? this.sampleGenesetHeatmapTracks : this.patientGenesetHeatmapTracks);
+        return this.oncoprintAnalysisCaseType ===
+            OncoprintAnalysisCaseType.SAMPLE
+            ? this.sampleGenesetHeatmapTracks
+            : this.patientGenesetHeatmapTracks;
     }
 
     @computed get clusteredHeatmapTrackGroupIndex() {
-        if (this.sortMode.type === "heatmap") {
-            const clusteredHeatmapProfile: string = this.sortMode.clusteredHeatmapProfile;
-            const genesetHeatmapProfile: string | undefined = (
+        if (this.sortMode.type === 'heatmap') {
+            const clusteredHeatmapProfile: string = this.sortMode
+                .clusteredHeatmapProfile;
+            const genesetHeatmapProfile: string | undefined =
                 this.props.store.genesetMolecularProfile.result &&
                 this.props.store.genesetMolecularProfile.result.value &&
-                this.props.store.genesetMolecularProfile.result.value.molecularProfileId
-            );
+                this.props.store.genesetMolecularProfile.result.value
+                    .molecularProfileId;
             if (clusteredHeatmapProfile === genesetHeatmapProfile) {
                 return this.genesetHeatmapTrackGroup;
             } else {
-                const heatmapGroup = this.molecularProfileIdToHeatmapTracks[clusteredHeatmapProfile];
-                return (heatmapGroup && heatmapGroup.trackGroupIndex);
+                const heatmapGroup = this.molecularProfileIdToHeatmapTracks[
+                    clusteredHeatmapProfile
+                ];
+                return heatmapGroup && heatmapGroup.trackGroupIndex;
             }
         }
         return undefined;
@@ -956,97 +1277,124 @@ export default class ResultsViewOncoprint extends React.Component<IResultsViewOn
 
     @computed get oncoprintLibrarySortConfig() {
         return {
-            sortByMutationType:this.sortByMutationType,
-            sortByDrivers:this.sortByDrivers,
+            sortByMutationType: this.sortByMutationType,
+            sortByDrivers: this.sortByDrivers,
             order: this.sortOrder,
-            clusterHeatmapTrackGroupIndex: this.clusteredHeatmapTrackGroupIndex
+            clusterHeatmapTrackGroupIndex: this.clusteredHeatmapTrackGroupIndex,
         };
     }
 
     @autobind
     @action
-    private clusterHeatmapByIndex(index:TrackGroupIndex) {
-
+    private clusterHeatmapByIndex(index: TrackGroupIndex) {
         if (this.oncoprint) {
             this.oncoprint.resetSortableTracksSortDirection();
         }
 
-        const groupEntry = _.values(this.molecularProfileIdToHeatmapTracks).find(
-            trackGroup=>trackGroup.trackGroupIndex === index
-        );
+        const groupEntry = _.values(
+            this.molecularProfileIdToHeatmapTracks
+        ).find(trackGroup => trackGroup.trackGroupIndex === index);
 
         if (groupEntry) {
             this.urlWrapper.updateURL({
-                                                      oncoprint_sortby: "cluster",
-                                                      oncoprint_cluster_profile: groupEntry.molecularProfileId
-                                                  });
+                oncoprint_sortby: 'cluster',
+                oncoprint_cluster_profile: groupEntry.molecularProfileId,
+            });
         }
     }
 
     @autobind
     @action
-    private removeHeatmapByIndex(index:TrackGroupIndex) {
-        const groupEntry = _.values(this.molecularProfileIdToHeatmapTracks).find(
-            group=>group.trackGroupIndex === index
-        );
+    private removeHeatmapByIndex(index: TrackGroupIndex) {
+        const groupEntry = _.values(
+            this.molecularProfileIdToHeatmapTracks
+        ).find(group => group.trackGroupIndex === index);
         if (groupEntry) {
-            this.removeHeatmapByMolecularProfileId(groupEntry.molecularProfileId);
+            this.removeHeatmapByMolecularProfileId(
+                groupEntry.molecularProfileId
+            );
         }
     }
 
     @autobind
     @action
-    public removeHeatmapByMolecularProfileId(molecularProfileId:string) {
-        delete this.molecularProfileIdToHeatmapTrackGroupIndex[molecularProfileId];
-        this.addHeatmapTracks(molecularProfileId,[]);
+    public removeHeatmapByMolecularProfileId(molecularProfileId: string) {
+        delete this.molecularProfileIdToHeatmapTrackGroupIndex[
+            molecularProfileId
+        ];
+        this.addHeatmapTracks(molecularProfileId, []);
     }
 
     readonly heatmapTrackHeaders = remoteData({
-        await:()=>[this.props.store.molecularProfileIdToMolecularProfile],
-        invoke:()=>{
-            const profileMap = this.props.store.molecularProfileIdToMolecularProfile.result!;
+        await: () => [this.props.store.molecularProfileIdToMolecularProfile],
+        invoke: () => {
+            const profileMap = this.props.store
+                .molecularProfileIdToMolecularProfile.result!;
             return Promise.resolve(
-                _.reduce(this.molecularProfileIdToHeatmapTracks, (headerMap, nextEntry)=>{
-                    headerMap[nextEntry.trackGroupIndex] = {
-                        label:{
-                            text: profileMap[nextEntry.molecularProfileId].name
-                        },
-                        options:[{
-                            label: "Cluster",
-                            onClick: this.clusterHeatmapByIndex,
-                            weight:()=>{
-                                if (this.clusteredHeatmapTrackGroupIndex === nextEntry.trackGroupIndex) {
-                                    return "bold";
-                                } else {
-                                    return "normal";
-                                }
-                            }
-                        },{
-                            label:"Don't cluster",
-                            onClick:()=>{
-                                if (this.clusteredHeatmapTrackGroupIndex === nextEntry.trackGroupIndex) {
-                                    this.sortByData();
-                                }
+                _.reduce(
+                    this.molecularProfileIdToHeatmapTracks,
+                    (headerMap, nextEntry) => {
+                        headerMap[nextEntry.trackGroupIndex] = {
+                            label: {
+                                text:
+                                    profileMap[nextEntry.molecularProfileId]
+                                        .name,
                             },
-                            weight:()=>{
-                                if (this.clusteredHeatmapTrackGroupIndex === nextEntry.trackGroupIndex) {
-                                    return "normal";
-                                } else {
-                                    return "bold";
-                                }
-                            }
-                        }, {
-                            separator:true
-                        },{
-                            label: "Delete",
-                            onClick: this.removeHeatmapByIndex
-                        }]
-                    };
-                    return headerMap;
-                }, {} as {[trackGroupIndex:number]:TrackGroupHeader})
+                            options: [
+                                {
+                                    label: 'Cluster',
+                                    onClick: this.clusterHeatmapByIndex,
+                                    weight: () => {
+                                        if (
+                                            this
+                                                .clusteredHeatmapTrackGroupIndex ===
+                                            nextEntry.trackGroupIndex
+                                        ) {
+                                            return 'bold';
+                                        } else {
+                                            return 'normal';
+                                        }
+                                    },
+                                },
+                                {
+                                    label: "Don't cluster",
+                                    onClick: () => {
+                                        if (
+                                            this
+                                                .clusteredHeatmapTrackGroupIndex ===
+                                            nextEntry.trackGroupIndex
+                                        ) {
+                                            this.sortByData();
+                                        }
+                                    },
+                                    weight: () => {
+                                        if (
+                                            this
+                                                .clusteredHeatmapTrackGroupIndex ===
+                                            nextEntry.trackGroupIndex
+                                        ) {
+                                            return 'normal';
+                                        } else {
+                                            return 'bold';
+                                        }
+                                    },
+                                },
+                                {
+                                    separator: true,
+                                },
+                                {
+                                    label: 'Delete',
+                                    onClick: this.removeHeatmapByIndex,
+                                },
+                            ],
+                        };
+                        return headerMap;
+                    },
+                    {} as { [trackGroupIndex: number]: TrackGroupHeader }
+                )
             );
         },
-        default:{}
+        default: {},
     });
 
     /* commenting this out because I predict it could make a comeback
@@ -1086,17 +1434,19 @@ export default class ResultsViewOncoprint extends React.Component<IResultsViewOn
     }*/
 
     @computed get isLoading() {
-        return getMobxPromiseGroupStatus(
-            this.clinicalTracks,
-            this.geneticTracks,
-            this.genesetHeatmapTracks,
-            this.treatmentHeatmapTracks,
-            this.heatmapTracks,
-            this.props.store.molecularProfileIdToMolecularProfile,
-            this.alterationTypesInQuery,
-            this.alteredKeys,
-            this.heatmapTrackHeaders
-        ) === "pending";
+        return (
+            getMobxPromiseGroupStatus(
+                this.clinicalTracks,
+                this.geneticTracks,
+                this.genesetHeatmapTracks,
+                this.treatmentHeatmapTracks,
+                this.heatmapTracks,
+                this.props.store.molecularProfileIdToMolecularProfile,
+                this.alterationTypesInQuery,
+                this.alteredKeys,
+                this.heatmapTrackHeaders
+            ) === 'pending'
+        );
     }
 
     @computed get isHidden() {
@@ -1108,103 +1458,134 @@ export default class ResultsViewOncoprint extends React.Component<IResultsViewOn
     }
 
     @computed get loadingIndicatorMessage() {
-        if (this.isLoading)
-            return "Downloading Oncoprint data...";
+        if (this.isLoading) return 'Downloading Oncoprint data...';
         else if (!this.renderingComplete)
-            return "Data downloaded. Rendering Oncoprint..";
+            return 'Data downloaded. Rendering Oncoprint..';
         // Otherwise, isHidden is false, so no message shown at all..
         // Putting this here just for Typescript
-        return "";
+        return '';
     }
 
     readonly alterationTypesInQuery = remoteData({
-        await:()=>[this.props.store.selectedMolecularProfiles],
-        invoke:()=>Promise.resolve(_.uniq(this.props.store.selectedMolecularProfiles.result!.map(x=>x.molecularAlterationType)))
+        await: () => [this.props.store.selectedMolecularProfiles],
+        invoke: () =>
+            Promise.resolve(
+                _.uniq(
+                    this.props.store.selectedMolecularProfiles.result!.map(
+                        x => x.molecularAlterationType
+                    )
+                )
+            ),
     });
 
     @autobind
     private getControls() {
-        if (this.oncoprint && !this.oncoprint.webgl_unavailable && (this.treatmentSelectOptions.isComplete || this.treatmentSelectOptions.isError))  {
-            return (<FadeInteraction showByDefault={true} show={true}>
-                <OncoprintControls
-                    handlers={this.controlsHandlers}
-                    state={this.controlsState}
-                    store={this.props.store}
-                    treatmentSelectOptions={this.treatmentSelectOptions.result}
-                    selectedTreatmentIds={this.selectedTreatmentsFromUrl}
-                />
-            </FadeInteraction>);
+        if (
+            this.oncoprint &&
+            !this.oncoprint.webgl_unavailable &&
+            (this.treatmentSelectOptions.isComplete ||
+                this.treatmentSelectOptions.isError)
+        ) {
+            return (
+                <FadeInteraction showByDefault={true} show={true}>
+                    <OncoprintControls
+                        handlers={this.controlsHandlers}
+                        state={this.controlsState}
+                        store={this.props.store}
+                        treatmentSelectOptions={
+                            this.treatmentSelectOptions.result
+                        }
+                        selectedTreatmentIds={this.selectedTreatmentsFromUrl}
+                    />
+                </FadeInteraction>
+            );
         } else {
-            return <span/>;
+            return <span />;
         }
     }
 
     private loadingGeneticDataDuringCurrentLoad = false;
     private loadingClinicalDataDuringCurrentLoad = false;
     @autobind
-    private getProgressItems(elapsedSecs:number):IProgressIndicatorItem[] {
+    private getProgressItems(elapsedSecs: number): IProgressIndicatorItem[] {
         if (elapsedSecs === 0) {
             this.loadingGeneticDataDuringCurrentLoad = false;
             this.loadingClinicalDataDuringCurrentLoad = false;
         }
 
-        const areNonLocalClinicalAttributesSelected =
-            _.some(this.selectedClinicalAttributeIds.keys(),
-                clinicalAttributeId=>!clinicalAttributeIsLocallyComputed({clinicalAttributeId})
-            );
+        const areNonLocalClinicalAttributesSelected = _.some(
+            this.selectedClinicalAttributeIds.keys(),
+            clinicalAttributeId =>
+                !clinicalAttributeIsLocallyComputed({ clinicalAttributeId })
+        );
 
         if (this.geneticTracks.isPending) {
             this.loadingGeneticDataDuringCurrentLoad = true;
         }
-        if (areNonLocalClinicalAttributesSelected && this.clinicalTracks.isPending) {
+        if (
+            areNonLocalClinicalAttributesSelected &&
+            this.clinicalTracks.isPending
+        ) {
             this.loadingClinicalDataDuringCurrentLoad = true;
         }
 
-        const ret:IProgressIndicatorItem[] = [];
+        const ret: IProgressIndicatorItem[] = [];
 
-        let queryingLabel:string;
-        if (this.props.store.genes.isComplete && this.props.store.samples.isComplete) {
+        let queryingLabel: string;
+        if (
+            this.props.store.genes.isComplete &&
+            this.props.store.samples.isComplete
+        ) {
             const numGenes = this.props.store.genes.result!.length;
             const numSamples = this.props.store.samples.result!.length;
             queryingLabel = `Querying ${numGenes} genes in ${numSamples} samples`;
         } else {
-            queryingLabel = "Querying ... genes in ... samples";
+            queryingLabel = 'Querying ... genes in ... samples';
         }
 
-        let waitingLabel:string = "";
+        let waitingLabel: string = '';
         if (elapsedSecs > 2) {
-            waitingLabel = " - this can take several seconds";
+            waitingLabel = ' - this can take several seconds';
         }
 
         ret.push({
             label: `${queryingLabel}${waitingLabel}`,
             promises: [], // empty promises means insta-complete
             hideIcon: true, // dont show any icon, this is just a message
-            style:{ fontWeight:"bold" }
+            style: { fontWeight: 'bold' },
         });
 
         const dataLoadingNames = [];
         if (this.loadingGeneticDataDuringCurrentLoad) {
-            dataLoadingNames.push("genetic");
+            dataLoadingNames.push('genetic');
         }
         if (this.loadingClinicalDataDuringCurrentLoad) {
-            dataLoadingNames.push("clinical");
+            dataLoadingNames.push('clinical');
         }
 
         ret.push({
-            label: `Loading ${dataLoadingNames.join(" and ")} data`,
-            promises: [this.props.store.molecularData, this.props.store.mutations, ...(areNonLocalClinicalAttributesSelected ? [this.clinicalTracks] : [])]
+            label: `Loading ${dataLoadingNames.join(' and ')} data`,
+            promises: [
+                this.props.store.molecularData,
+                this.props.store.mutations,
+                ...(areNonLocalClinicalAttributesSelected
+                    ? [this.clinicalTracks]
+                    : []),
+            ],
         });
 
         const usingOncokb = this.props.store.driverAnnotationSettings.oncoKb;
         const usingHotspot = this.props.store.driverAnnotationSettings.hotspots;
         ret.push({
             label: getAnnotatingProgressMessage(usingOncokb, usingHotspot),
-            promises:[this.props.store.filteredAndAnnotatedMolecularData, this.props.store.filteredAndAnnotatedMutations]
+            promises: [
+                this.props.store.filteredAndAnnotatedMolecularData,
+                this.props.store.filteredAndAnnotatedMutations,
+            ],
         });
 
         ret.push({
-            label: "Rendering"
+            label: 'Rendering',
         });
 
         return ret as IProgressIndicatorItem[];
@@ -1216,60 +1597,102 @@ export default class ResultsViewOncoprint extends React.Component<IResultsViewOn
 
     public render() {
         return (
-            <div style={{ position:"relative" }}>
-
-                <LoadingIndicator isLoading={this.isHidden} size={"big"}  centerRelativeToContainer={false} center={true} className="oncoprintLoadingIndicator">
+            <div style={{ position: 'relative' }}>
+                <LoadingIndicator
+                    isLoading={this.isHidden}
+                    size={'big'}
+                    centerRelativeToContainer={false}
+                    center={true}
+                    className="oncoprintLoadingIndicator"
+                >
                     <div>
-                        <ProgressIndicator getItems={this.getProgressItems} show={this.isHidden} sequential={true}/>
+                        <ProgressIndicator
+                            getItems={this.getProgressItems}
+                            show={this.isHidden}
+                            sequential={true}
+                        />
                     </div>
                 </LoadingIndicator>
 
-                <div className={"tabMessageContainer"}>
-                    <OqlStatusBanner className="oncoprint-oql-status-banner" store={this.props.store} tabReflectsOql={true} />
-                    <AlterationFilterWarning store={this.props.store}/>
+                <div className={'tabMessageContainer'}>
+                    <OqlStatusBanner
+                        className="oncoprint-oql-status-banner"
+                        store={this.props.store}
+                        tabReflectsOql={true}
+                    />
+                    <AlterationFilterWarning store={this.props.store} />
                 </div>
 
-                <div className={classNames('oncoprintContainer', { fadeIn: !this.isHidden })}
-                     onMouseEnter={this.onMouseEnter}
-                     onMouseLeave={this.onMouseLeave}
+                <div
+                    className={classNames('oncoprintContainer', {
+                        fadeIn: !this.isHidden,
+                    })}
+                    onMouseEnter={this.onMouseEnter}
+                    onMouseLeave={this.onMouseLeave}
                 >
-                    <Observer>
-                        {this.getControls}
-                    </Observer>
+                    <Observer>{this.getControls}</Observer>
 
-                    <div style={{position:"relative", marginTop:15}} >
+                    <div style={{ position: 'relative', marginTop: 15 }}>
                         <div>
                             <Oncoprint
                                 oncoprintRef={this.oncoprintRef}
                                 clinicalTracks={this.clinicalTracks.result}
                                 geneticTracks={this.geneticTracks.result}
-                                genesetHeatmapTracks={this.genesetHeatmapTracks.result}
-                                heatmapTracks={([] as IHeatmapTrackSpec[]).concat(this.treatmentHeatmapTracks.result).concat(this.heatmapTracks.result)}
+                                genesetHeatmapTracks={
+                                    this.genesetHeatmapTracks.result
+                                }
+                                heatmapTracks={([] as IHeatmapTrackSpec[])
+                                    .concat(this.treatmentHeatmapTracks.result)
+                                    .concat(this.heatmapTracks.result)}
                                 divId={this.props.divId}
                                 width={this.width}
                                 caseLinkOutInTooltips={true}
                                 suppressRendering={this.isLoading}
                                 onSuppressRendering={this.onSuppressRendering}
                                 onReleaseRendering={this.onReleaseRendering}
-                                hiddenIds={!this.showUnalteredColumns ? this.unalteredKeys.result : undefined}
-                                molecularProfileIdToMolecularProfile={this.props.store.molecularProfileIdToMolecularProfile.result}
-                                alterationTypesInQuery={this.alterationTypesInQuery.result}
+                                hiddenIds={
+                                    !this.showUnalteredColumns
+                                        ? this.unalteredKeys.result
+                                        : undefined
+                                }
+                                molecularProfileIdToMolecularProfile={
+                                    this.props.store
+                                        .molecularProfileIdToMolecularProfile
+                                        .result
+                                }
+                                alterationTypesInQuery={
+                                    this.alterationTypesInQuery.result
+                                }
                                 showSublabels={this.showOqlInLabels}
-                                heatmapTrackHeaders={this.heatmapTrackHeaders.result!}
+                                heatmapTrackHeaders={
+                                    this.heatmapTrackHeaders.result!
+                                }
                                 horzZoomToFitIds={this.alteredKeys.result}
-                                distinguishMutationType={this.distinguishMutationType}
+                                distinguishMutationType={
+                                    this.distinguishMutationType
+                                }
                                 distinguishDrivers={this.distinguishDrivers}
-                                distinguishGermlineMutations={this.distinguishGermlineMutations}
+                                distinguishGermlineMutations={
+                                    this.distinguishGermlineMutations
+                                }
                                 sortConfig={this.oncoprintLibrarySortConfig}
-                                showClinicalTrackLegends={this.showClinicalTrackLegends}
-                                showWhitespaceBetweenColumns={this.showWhitespaceBetweenColumns}
+                                showClinicalTrackLegends={
+                                    this.showClinicalTrackLegends
+                                }
+                                showWhitespaceBetweenColumns={
+                                    this.showWhitespaceBetweenColumns
+                                }
                                 showMinimap={this.showMinimap}
-
                                 onMinimapClose={this.onMinimapClose}
-                                onDeleteClinicalTrack={this.onDeleteClinicalTrack}
-                                onTrackSortDirectionChange={this.onTrackSortDirectionChange}
-
-                                initParams={{ max_height: Number.POSITIVE_INFINITY }}
+                                onDeleteClinicalTrack={
+                                    this.onDeleteClinicalTrack
+                                }
+                                onTrackSortDirectionChange={
+                                    this.onTrackSortDirectionChange
+                                }
+                                initParams={{
+                                    max_height: Number.POSITIVE_INFINITY,
+                                }}
                             />
                         </div>
                     </div>
diff --git a/src/shared/components/oncoprint/ResultsViewOncoprintUtils.spec.ts b/src/shared/components/oncoprint/ResultsViewOncoprintUtils.spec.ts
index 019053532bb..3a23d7b8e61 100644
--- a/src/shared/components/oncoprint/ResultsViewOncoprintUtils.spec.ts
+++ b/src/shared/components/oncoprint/ResultsViewOncoprintUtils.spec.ts
@@ -1,289 +1,464 @@
-import {assert} from "chai";
-import {GenePanelData, MolecularProfile} from "../../api/generated/CBioPortalAPI";
-import {AlterationTypeConstants} from "../../../pages/resultsView/ResultsViewPageStore";
-import {alterationTypeToProfiledForText, makeProfiledInClinicalAttributes, treatmentsToSelectOptions} from "./ResultsViewOncoprintUtils";
-import {SpecialAttribute} from "../../cache/ClinicalDataCache";
-import { Treatment } from "shared/lib/GenericAssayUtils/TreatmentUtils";
+import { assert } from 'chai';
+import {
+    GenePanelData,
+    MolecularProfile,
+} from '../../api/generated/CBioPortalAPI';
+import { AlterationTypeConstants } from '../../../pages/resultsView/ResultsViewPageStore';
+import {
+    alterationTypeToProfiledForText,
+    makeProfiledInClinicalAttributes,
+    treatmentsToSelectOptions,
+} from './ResultsViewOncoprintUtils';
+import { SpecialAttribute } from '../../cache/ClinicalDataCache';
+import { Treatment } from 'shared/lib/GenericAssayUtils/TreatmentUtils';
 
-describe("ResultsViewOncoprintUtils",()=>{
-    describe("makeProfiledInClinicalAttributes", ()=>{
+describe('ResultsViewOncoprintUtils', () => {
+    describe('makeProfiledInClinicalAttributes', () => {
         const molecularProfileIdToMolecularProfile = {
-            mutations: { molecularProfileId: "mutations", name:"mutations", description:"mutations profile", molecularAlterationType: AlterationTypeConstants.MUTATION_EXTENDED } as MolecularProfile,
-            discreteCna: { molecularProfileId: "discreteCna", name:"discrete cna", description:"discrete cna profile", molecularAlterationType: AlterationTypeConstants.COPY_NUMBER_ALTERATION } as MolecularProfile,
-            linearCna: { molecularProfileId: "linearCna", name:"linear cna", description:"linear cna profile", molecularAlterationType: AlterationTypeConstants.COPY_NUMBER_ALTERATION } as MolecularProfile,
-            mrna: { molecularProfileId: "mrna", name:"mrna", description:"mrna profile", molecularAlterationType: AlterationTypeConstants.MRNA_EXPRESSION } as MolecularProfile
+            mutations: {
+                molecularProfileId: 'mutations',
+                name: 'mutations',
+                description: 'mutations profile',
+                molecularAlterationType:
+                    AlterationTypeConstants.MUTATION_EXTENDED,
+            } as MolecularProfile,
+            discreteCna: {
+                molecularProfileId: 'discreteCna',
+                name: 'discrete cna',
+                description: 'discrete cna profile',
+                molecularAlterationType:
+                    AlterationTypeConstants.COPY_NUMBER_ALTERATION,
+            } as MolecularProfile,
+            linearCna: {
+                molecularProfileId: 'linearCna',
+                name: 'linear cna',
+                description: 'linear cna profile',
+                molecularAlterationType:
+                    AlterationTypeConstants.COPY_NUMBER_ALTERATION,
+            } as MolecularProfile,
+            mrna: {
+                molecularProfileId: 'mrna',
+                name: 'mrna',
+                description: 'mrna profile',
+                molecularAlterationType:
+                    AlterationTypeConstants.MRNA_EXPRESSION,
+            } as MolecularProfile,
         };
 
-        it("does not create any if all samples profiled in every selected alteration type", ()=>{
+        it('does not create any if all samples profiled in every selected alteration type', () => {
             const coverageInformation = {
-                "sample1":{
-                    byGene:{},
-                    allGenes: [{ molecularProfileId: "mutations" } as GenePanelData],
+                sample1: {
+                    byGene: {},
+                    allGenes: [
+                        { molecularProfileId: 'mutations' } as GenePanelData,
+                    ],
                     notProfiledByGene: {},
-                    notProfiledAllGenes:[]
-                }
+                    notProfiledAllGenes: [],
+                },
             };
-            const selectedMolecularProfiles = [molecularProfileIdToMolecularProfile.mutations];
+            const selectedMolecularProfiles = [
+                molecularProfileIdToMolecularProfile.mutations,
+            ];
             assert.deepEqual(
-                makeProfiledInClinicalAttributes(coverageInformation, molecularProfileIdToMolecularProfile, selectedMolecularProfiles, true),
+                makeProfiledInClinicalAttributes(
+                    coverageInformation,
+                    molecularProfileIdToMolecularProfile,
+                    selectedMolecularProfiles,
+                    true
+                ),
                 [],
-                "single study"
+                'single study'
             );
             assert.deepEqual(
-                makeProfiledInClinicalAttributes(coverageInformation, molecularProfileIdToMolecularProfile, selectedMolecularProfiles, false),
+                makeProfiledInClinicalAttributes(
+                    coverageInformation,
+                    molecularProfileIdToMolecularProfile,
+                    selectedMolecularProfiles,
+                    false
+                ),
                 [],
-                "multiple study"
+                'multiple study'
             );
         });
-        it("does not create any if all samples profiled in every selected alteration type, special case sample is not profiled for one gene but profiled for another", ()=>{
+        it('does not create any if all samples profiled in every selected alteration type, special case sample is not profiled for one gene but profiled for another', () => {
             const coverageInformation = {
-                "sample1":{
-                    byGene:{"BRCA1":[{ molecularProfileId: "mutations" } as GenePanelData]},
+                sample1: {
+                    byGene: {
+                        BRCA1: [
+                            {
+                                molecularProfileId: 'mutations',
+                            } as GenePanelData,
+                        ],
+                    },
                     allGenes: [],
-                    notProfiledByGene: {"KRAS":[{ molecularProfileId: "mutations" } as GenePanelData]},
-                    notProfiledAllGenes:[]
-                }
+                    notProfiledByGene: {
+                        KRAS: [
+                            {
+                                molecularProfileId: 'mutations',
+                            } as GenePanelData,
+                        ],
+                    },
+                    notProfiledAllGenes: [],
+                },
             };
-            const selectedMolecularProfiles = [molecularProfileIdToMolecularProfile.mutations];
+            const selectedMolecularProfiles = [
+                molecularProfileIdToMolecularProfile.mutations,
+            ];
             assert.deepEqual(
-                makeProfiledInClinicalAttributes(coverageInformation, molecularProfileIdToMolecularProfile, selectedMolecularProfiles, true),
+                makeProfiledInClinicalAttributes(
+                    coverageInformation,
+                    molecularProfileIdToMolecularProfile,
+                    selectedMolecularProfiles,
+                    true
+                ),
                 [],
-                "single study"
+                'single study'
             );
             assert.deepEqual(
-                makeProfiledInClinicalAttributes(coverageInformation, molecularProfileIdToMolecularProfile, selectedMolecularProfiles, false),
+                makeProfiledInClinicalAttributes(
+                    coverageInformation,
+                    molecularProfileIdToMolecularProfile,
+                    selectedMolecularProfiles,
+                    false
+                ),
                 [],
-                "multiple study"
+                'multiple study'
             );
         });
-        it("creates an attribute for one selected alteration type in which not all samples profiled", ()=>{
+        it('creates an attribute for one selected alteration type in which not all samples profiled', () => {
             const coverageInformation = {
-                "sample1":{
-                    byGene:{},
-                    allGenes: [{ molecularProfileId: "mutations" } as GenePanelData],
+                sample1: {
+                    byGene: {},
+                    allGenes: [
+                        { molecularProfileId: 'mutations' } as GenePanelData,
+                    ],
                     notProfiledByGene: {},
-                    notProfiledAllGenes:[]
+                    notProfiledAllGenes: [],
                 },
-                "sample2":{
-                    byGene:{},
+                sample2: {
+                    byGene: {},
                     allGenes: [],
                     notProfiledByGene: {},
-                    notProfiledAllGenes:[{ molecularProfileId: "mutations" } as GenePanelData]
-                }
+                    notProfiledAllGenes: [
+                        { molecularProfileId: 'mutations' } as GenePanelData,
+                    ],
+                },
             };
-            const selectedMolecularProfiles = [molecularProfileIdToMolecularProfile.mutations];
+            const selectedMolecularProfiles = [
+                molecularProfileIdToMolecularProfile.mutations,
+            ];
             assert.deepEqual(
-                makeProfiledInClinicalAttributes(coverageInformation, molecularProfileIdToMolecularProfile, selectedMolecularProfiles, true),
-                [{
-                    clinicalAttributeId: `${SpecialAttribute.ProfiledInPrefix}_mutations`,
-                    datatype: "STRING",
-                    description: `Profiled in ${molecularProfileIdToMolecularProfile.mutations.name}: ${molecularProfileIdToMolecularProfile.mutations.description}`,
-                    displayName: `Profiled in ${molecularProfileIdToMolecularProfile.mutations.name}`,
-                    molecularProfileIds: ["mutations"],
-                    patientAttribute: false
-                }] as any,
-                "single study"
+                makeProfiledInClinicalAttributes(
+                    coverageInformation,
+                    molecularProfileIdToMolecularProfile,
+                    selectedMolecularProfiles,
+                    true
+                ),
+                [
+                    {
+                        clinicalAttributeId: `${SpecialAttribute.ProfiledInPrefix}_mutations`,
+                        datatype: 'STRING',
+                        description: `Profiled in ${molecularProfileIdToMolecularProfile.mutations.name}: ${molecularProfileIdToMolecularProfile.mutations.description}`,
+                        displayName: `Profiled in ${molecularProfileIdToMolecularProfile.mutations.name}`,
+                        molecularProfileIds: ['mutations'],
+                        patientAttribute: false,
+                    },
+                ] as any,
+                'single study'
             );
             assert.deepEqual(
-                makeProfiledInClinicalAttributes(coverageInformation, molecularProfileIdToMolecularProfile, selectedMolecularProfiles, false),
-                [{
-                    clinicalAttributeId: `${SpecialAttribute.ProfiledInPrefix}_${AlterationTypeConstants.MUTATION_EXTENDED}`,
-                    datatype: "STRING",
-                    description: "",
-                    displayName: `Profiled for ${alterationTypeToProfiledForText[AlterationTypeConstants.MUTATION_EXTENDED]}`,
-                    molecularProfileIds: ["mutations"],
-                    patientAttribute: false
-                }] as any,
-                "multiple study"
+                makeProfiledInClinicalAttributes(
+                    coverageInformation,
+                    molecularProfileIdToMolecularProfile,
+                    selectedMolecularProfiles,
+                    false
+                ),
+                [
+                    {
+                        clinicalAttributeId: `${SpecialAttribute.ProfiledInPrefix}_${AlterationTypeConstants.MUTATION_EXTENDED}`,
+                        datatype: 'STRING',
+                        description: '',
+                        displayName: `Profiled for ${
+                            alterationTypeToProfiledForText[
+                                AlterationTypeConstants.MUTATION_EXTENDED
+                            ]
+                        }`,
+                        molecularProfileIds: ['mutations'],
+                        patientAttribute: false,
+                    },
+                ] as any,
+                'multiple study'
             );
         });
-        it("does not create attributes for unselected alteration types", ()=>{
+        it('does not create attributes for unselected alteration types', () => {
             const coverageInformation = {
-                "sample1":{
-                    byGene:{},
-                    allGenes: [{ molecularProfileId: "mutations" } as GenePanelData],
+                sample1: {
+                    byGene: {},
+                    allGenes: [
+                        { molecularProfileId: 'mutations' } as GenePanelData,
+                    ],
                     notProfiledByGene: {},
-                    notProfiledAllGenes:[]
+                    notProfiledAllGenes: [],
                 },
-                "sample2":{
-                    byGene:{},
+                sample2: {
+                    byGene: {},
                     allGenes: [],
                     notProfiledByGene: {},
-                    notProfiledAllGenes:[{ molecularProfileId: "mutations" } as GenePanelData]
-                }
+                    notProfiledAllGenes: [
+                        { molecularProfileId: 'mutations' } as GenePanelData,
+                    ],
+                },
             };
-            const selectedMolecularProfiles = [molecularProfileIdToMolecularProfile.linearCna];
+            const selectedMolecularProfiles = [
+                molecularProfileIdToMolecularProfile.linearCna,
+            ];
             assert.deepEqual(
-                makeProfiledInClinicalAttributes(coverageInformation, molecularProfileIdToMolecularProfile, selectedMolecularProfiles, true),
-                [{
-                    clinicalAttributeId: `${SpecialAttribute.ProfiledInPrefix}_linearCna`,
-                    datatype: "STRING",
-                    description: `Profiled in ${molecularProfileIdToMolecularProfile.linearCna.name}: ${molecularProfileIdToMolecularProfile.linearCna.description}`,
-                    displayName: `Profiled in ${molecularProfileIdToMolecularProfile.linearCna.name}`,
-                    molecularProfileIds: ["linearCna"],
-                    patientAttribute: false
-                }] as any,
-                "single study"
+                makeProfiledInClinicalAttributes(
+                    coverageInformation,
+                    molecularProfileIdToMolecularProfile,
+                    selectedMolecularProfiles,
+                    true
+                ),
+                [
+                    {
+                        clinicalAttributeId: `${SpecialAttribute.ProfiledInPrefix}_linearCna`,
+                        datatype: 'STRING',
+                        description: `Profiled in ${molecularProfileIdToMolecularProfile.linearCna.name}: ${molecularProfileIdToMolecularProfile.linearCna.description}`,
+                        displayName: `Profiled in ${molecularProfileIdToMolecularProfile.linearCna.name}`,
+                        molecularProfileIds: ['linearCna'],
+                        patientAttribute: false,
+                    },
+                ] as any,
+                'single study'
             );
             assert.deepEqual(
-                makeProfiledInClinicalAttributes(coverageInformation, molecularProfileIdToMolecularProfile, selectedMolecularProfiles, false),
-                [{
-                    clinicalAttributeId: `${SpecialAttribute.ProfiledInPrefix}_${AlterationTypeConstants.COPY_NUMBER_ALTERATION}`,
-                    datatype: "STRING",
-                    description: "",
-                    displayName: `Profiled for ${alterationTypeToProfiledForText[AlterationTypeConstants.COPY_NUMBER_ALTERATION]}`,
-                    molecularProfileIds: ["linearCna"],
-                    patientAttribute: false
-                }] as any,
-                "multiple study"
+                makeProfiledInClinicalAttributes(
+                    coverageInformation,
+                    molecularProfileIdToMolecularProfile,
+                    selectedMolecularProfiles,
+                    false
+                ),
+                [
+                    {
+                        clinicalAttributeId: `${SpecialAttribute.ProfiledInPrefix}_${AlterationTypeConstants.COPY_NUMBER_ALTERATION}`,
+                        datatype: 'STRING',
+                        description: '',
+                        displayName: `Profiled for ${
+                            alterationTypeToProfiledForText[
+                                AlterationTypeConstants.COPY_NUMBER_ALTERATION
+                            ]
+                        }`,
+                        molecularProfileIds: ['linearCna'],
+                        patientAttribute: false,
+                    },
+                ] as any,
+                'multiple study'
             );
         });
-        it("creates multiple attributes for each selected alteration type in which not all samples profiled", ()=>{
+        it('creates multiple attributes for each selected alteration type in which not all samples profiled', () => {
             const coverageInformation = {
-                "sample1":{
-                    byGene:{},
-                    allGenes: [{ molecularProfileId: "mutations" } as GenePanelData],
-                    notProfiledByGene: {TP53: [{ molecularProfileId: "mrna" } as GenePanelData]},
-                    notProfiledAllGenes:[]
+                sample1: {
+                    byGene: {},
+                    allGenes: [
+                        { molecularProfileId: 'mutations' } as GenePanelData,
+                    ],
+                    notProfiledByGene: {
+                        TP53: [{ molecularProfileId: 'mrna' } as GenePanelData],
+                    },
+                    notProfiledAllGenes: [],
                 },
-                "sample2":{
-                    byGene:{TP53: [{ molecularProfileId: "mrna" } as GenePanelData]},
+                sample2: {
+                    byGene: {
+                        TP53: [{ molecularProfileId: 'mrna' } as GenePanelData],
+                    },
                     allGenes: [],
                     notProfiledByGene: {},
-                    notProfiledAllGenes:[{ molecularProfileId: "mutations" } as GenePanelData]
-                }
+                    notProfiledAllGenes: [
+                        { molecularProfileId: 'mutations' } as GenePanelData,
+                    ],
+                },
             };
-            const selectedMolecularProfiles = [molecularProfileIdToMolecularProfile.mutations, molecularProfileIdToMolecularProfile.mrna];
-            const singleStudyAttributes =
-                makeProfiledInClinicalAttributes(coverageInformation, molecularProfileIdToMolecularProfile, selectedMolecularProfiles, true);
-            assert.deepEqual(singleStudyAttributes.find(x=>x.clinicalAttributeId.indexOf("mutations") > -1), {
+            const selectedMolecularProfiles = [
+                molecularProfileIdToMolecularProfile.mutations,
+                molecularProfileIdToMolecularProfile.mrna,
+            ];
+            const singleStudyAttributes = makeProfiledInClinicalAttributes(
+                coverageInformation,
+                molecularProfileIdToMolecularProfile,
+                selectedMolecularProfiles,
+                true
+            );
+            assert.deepEqual(
+                singleStudyAttributes.find(
+                    x => x.clinicalAttributeId.indexOf('mutations') > -1
+                ),
+                {
                     clinicalAttributeId: `${SpecialAttribute.ProfiledInPrefix}_mutations`,
-                    datatype: "STRING",
+                    datatype: 'STRING',
                     description: `Profiled in ${molecularProfileIdToMolecularProfile.mutations.name}: ${molecularProfileIdToMolecularProfile.mutations.description}`,
                     displayName: `Profiled in ${molecularProfileIdToMolecularProfile.mutations.name}`,
-                    molecularProfileIds: ["mutations"],
-                    patientAttribute: false
-                } as any, "single study, mutations attribute");
-            assert.deepEqual(singleStudyAttributes.find(x=>x.clinicalAttributeId.indexOf("mrna") > -1), {
+                    molecularProfileIds: ['mutations'],
+                    patientAttribute: false,
+                } as any,
+                'single study, mutations attribute'
+            );
+            assert.deepEqual(
+                singleStudyAttributes.find(
+                    x => x.clinicalAttributeId.indexOf('mrna') > -1
+                ),
+                {
                     clinicalAttributeId: `${SpecialAttribute.ProfiledInPrefix}_mrna`,
-                    datatype: "STRING",
+                    datatype: 'STRING',
                     description: `Profiled in ${molecularProfileIdToMolecularProfile.mrna.name}: ${molecularProfileIdToMolecularProfile.mrna.description}`,
                     displayName: `Profiled in ${molecularProfileIdToMolecularProfile.mrna.name}`,
-                    molecularProfileIds: ["mrna"],
-                    patientAttribute: false
-                } as any, "single study, mrna attribute");
+                    molecularProfileIds: ['mrna'],
+                    patientAttribute: false,
+                } as any,
+                'single study, mrna attribute'
+            );
 
-            const multipleStudyAttributes =
-                makeProfiledInClinicalAttributes(coverageInformation, molecularProfileIdToMolecularProfile, selectedMolecularProfiles, false);
-            assert.deepEqual(multipleStudyAttributes.find(x=>x.clinicalAttributeId.indexOf(AlterationTypeConstants.MUTATION_EXTENDED) > -1), {
+            const multipleStudyAttributes = makeProfiledInClinicalAttributes(
+                coverageInformation,
+                molecularProfileIdToMolecularProfile,
+                selectedMolecularProfiles,
+                false
+            );
+            assert.deepEqual(
+                multipleStudyAttributes.find(
+                    x =>
+                        x.clinicalAttributeId.indexOf(
+                            AlterationTypeConstants.MUTATION_EXTENDED
+                        ) > -1
+                ),
+                {
                     clinicalAttributeId: `${SpecialAttribute.ProfiledInPrefix}_${AlterationTypeConstants.MUTATION_EXTENDED}`,
-                    datatype: "STRING",
-                    description: "",
-                    displayName: `Profiled for ${alterationTypeToProfiledForText[AlterationTypeConstants.MUTATION_EXTENDED]}`,
-                    molecularProfileIds: ["mutations"],
-                    patientAttribute: false
-                } as any, "multiple study, mutations attribute");
-            assert.deepEqual(multipleStudyAttributes.find(x=>x.clinicalAttributeId.indexOf(AlterationTypeConstants.MRNA_EXPRESSION) > -1), {
+                    datatype: 'STRING',
+                    description: '',
+                    displayName: `Profiled for ${
+                        alterationTypeToProfiledForText[
+                            AlterationTypeConstants.MUTATION_EXTENDED
+                        ]
+                    }`,
+                    molecularProfileIds: ['mutations'],
+                    patientAttribute: false,
+                } as any,
+                'multiple study, mutations attribute'
+            );
+            assert.deepEqual(
+                multipleStudyAttributes.find(
+                    x =>
+                        x.clinicalAttributeId.indexOf(
+                            AlterationTypeConstants.MRNA_EXPRESSION
+                        ) > -1
+                ),
+                {
                     clinicalAttributeId: `${SpecialAttribute.ProfiledInPrefix}_${AlterationTypeConstants.MRNA_EXPRESSION}`,
-                    datatype: "STRING",
-                    description: "",
-                    displayName: `Profiled for ${alterationTypeToProfiledForText[AlterationTypeConstants.MRNA_EXPRESSION]}`,
-                    molecularProfileIds: ["mrna"],
-                    patientAttribute: false
-                } as any, "multiple study, mrna attribute");
+                    datatype: 'STRING',
+                    description: '',
+                    displayName: `Profiled for ${
+                        alterationTypeToProfiledForText[
+                            AlterationTypeConstants.MRNA_EXPRESSION
+                        ]
+                    }`,
+                    molecularProfileIds: ['mrna'],
+                    patientAttribute: false,
+                } as any,
+                'multiple study, mrna attribute'
+            );
         });
     });
 
     describe('treatmentSelectOptions()', () => {
-        
         it('Includes entity_stable_id and description when present and unique', () => {
-            
             const treatments = [
                 {
                     treatmentId: 'id_1',
                     name: 'name_1',
-                    description: 'desc_1'
+                    description: 'desc_1',
                 },
                 {
                     treatmentId: 'id_2',
                     name: 'name_2',
-                    description: 'desc_2'
-                }
+                    description: 'desc_2',
+                },
             ] as Treatment[];
-            
+
             const expect = [
-                {id: 'id_1', value: 'name_1 (id_1): desc_1', label: 'name_1 (id_1): desc_1'},
-                {id: 'id_2', value: 'name_2 (id_2): desc_2', label: 'name_2 (id_2): desc_2'}
+                {
+                    id: 'id_1',
+                    value: 'name_1 (id_1): desc_1',
+                    label: 'name_1 (id_1): desc_1',
+                },
+                {
+                    id: 'id_2',
+                    value: 'name_2 (id_2): desc_2',
+                    label: 'name_2 (id_2): desc_2',
+                },
             ];
             assert.deepEqual(treatmentsToSelectOptions(treatments), expect);
         });
 
         it('Hides description when same as entity_stable_id', () => {
-        
             const treatments = [
                 {
                     treatmentId: 'id_1',
                     name: 'name_1',
-                    description: 'id_1'
+                    description: 'id_1',
                 },
                 {
                     treatmentId: 'id_2',
                     name: 'name_2',
-                    description: 'id_2'
-                }
+                    description: 'id_2',
+                },
             ] as Treatment[];
-            
+
             const expect = [
-                {id: 'id_1', value: 'name_1 (id_1)', label: 'name_1 (id_1)'},
-                {id: 'id_2', value: 'name_2 (id_2)', label: 'name_2 (id_2)'}
+                { id: 'id_1', value: 'name_1 (id_1)', label: 'name_1 (id_1)' },
+                { id: 'id_2', value: 'name_2 (id_2)', label: 'name_2 (id_2)' },
             ];
             assert.deepEqual(treatmentsToSelectOptions(treatments), expect);
         });
-    
+
         it('Hides entity_stable_id when same as name', () => {
-            
             const treatments = [
                 {
                     treatmentId: 'id_1',
                     name: 'name_1',
-                    description: 'id_1'
+                    description: 'id_1',
                 },
                 {
                     treatmentId: 'id_2',
                     name: 'name_2',
-                    description: 'id_2'
-                }
+                    description: 'id_2',
+                },
             ] as Treatment[];
-            
+
             const expect = [
-                {id: 'id_1', value: 'name_1 (id_1)', label: 'name_1 (id_1)'},
-                {id: 'id_2', value: 'name_2 (id_2)', label: 'name_2 (id_2)'}
+                { id: 'id_1', value: 'name_1 (id_1)', label: 'name_1 (id_1)' },
+                { id: 'id_2', value: 'name_2 (id_2)', label: 'name_2 (id_2)' },
             ];
             assert.deepEqual(treatmentsToSelectOptions(treatments), expect);
         });
-        
+
         it('Hides name and description when same as entity_stable_id', () => {
-            
             const treatments = [
                 {
                     treatmentId: 'id_1',
                     name: 'id_1',
-                    description: 'id_1'
+                    description: 'id_1',
                 },
                 {
                     treatmentId: 'id_2',
                     name: 'id_2',
-                    description: 'id_2'
-                }
+                    description: 'id_2',
+                },
             ] as Treatment[];
-            
+
             const expect = [
-                {id: 'id_1', value: 'id_1', label: 'id_1'},
-                {id: 'id_2', value: 'id_2', label: 'id_2'}
+                { id: 'id_1', value: 'id_1', label: 'id_1' },
+                { id: 'id_2', value: 'id_2', label: 'id_2' },
             ];
             assert.deepEqual(treatmentsToSelectOptions(treatments), expect);
         });
-        
     });
-
-});
\ No newline at end of file
+});
diff --git a/src/shared/components/oncoprint/ResultsViewOncoprintUtils.tsx b/src/shared/components/oncoprint/ResultsViewOncoprintUtils.tsx
index 319c3494d8b..c2286d5d53c 100644
--- a/src/shared/components/oncoprint/ResultsViewOncoprintUtils.tsx
+++ b/src/shared/components/oncoprint/ResultsViewOncoprintUtils.tsx
@@ -1,65 +1,82 @@
-import {CoverageInformation} from "../../../pages/resultsView/ResultsViewPageStoreUtils";
-import {ClinicalAttribute, MolecularProfile, Sample} from "../../api/generated/CBioPortalAPI";
-import {SpecialAttribute} from "../../cache/ClinicalDataCache";
-import _ from "lodash";
-import naturalSort from "javascript-natural-sort";
-import {AlterationTypeConstants} from "../../../pages/resultsView/ResultsViewPageStore";
-import {Group} from "../../api/ComparisonGroupClient";
-import * as React from "react";
-import { ISelectOption } from "./controls/OncoprintControls";
-import { Treatment } from "shared/lib/GenericAssayUtils/TreatmentUtils";
-
-export const alterationTypeToProfiledForText:{[alterationType:string]:string} = {
-    "MUTATION_EXTENDED": "mutations",
-    "COPY_NUMBER_ALTERATION": "copy number alterations",
-    "MRNA_EXPRESSION": "mRNA expression",
-    "PROTEIN_LEVEL": "protein expression"
+import { CoverageInformation } from '../../../pages/resultsView/ResultsViewPageStoreUtils';
+import {
+    ClinicalAttribute,
+    MolecularProfile,
+    Sample,
+} from '../../api/generated/CBioPortalAPI';
+import { SpecialAttribute } from '../../cache/ClinicalDataCache';
+import _ from 'lodash';
+import naturalSort from 'javascript-natural-sort';
+import { AlterationTypeConstants } from '../../../pages/resultsView/ResultsViewPageStore';
+import { Group } from '../../api/ComparisonGroupClient';
+import * as React from 'react';
+import { ISelectOption } from './controls/OncoprintControls';
+import { Treatment } from 'shared/lib/GenericAssayUtils/TreatmentUtils';
+
+export const alterationTypeToProfiledForText: {
+    [alterationType: string]: string;
+} = {
+    MUTATION_EXTENDED: 'mutations',
+    COPY_NUMBER_ALTERATION: 'copy number alterations',
+    MRNA_EXPRESSION: 'mRNA expression',
+    PROTEIN_LEVEL: 'protein expression',
 };
 
-export function getAnnotatingProgressMessage(usingOncokb:boolean, usingHotspot:boolean) {
+export function getAnnotatingProgressMessage(
+    usingOncokb: boolean,
+    usingHotspot: boolean
+) {
     let message;
     if (usingOncokb && usingHotspot) {
-        message = "Annotating with OncoKB and Cancer Hotspots";
+        message = 'Annotating with OncoKB and Cancer Hotspots';
     } else if (usingOncokb) {
-        message = "Annotating with OncoKB";
+        message = 'Annotating with OncoKB';
     } else if (usingHotspot) {
-        message = "Annotating with Cancer Hotspots";
+        message = 'Annotating with Cancer Hotspots';
     } else {
-        message = "Processing data";
+        message = 'Processing data';
     }
-    return <span style={{whiteSpace:"nowrap"}}>{message}</span>;
+    return <span style={{ whiteSpace: 'nowrap' }}>{message}</span>;
 }
 
 export function convertComparisonGroupClinicalAttribute(
-    id:string,
-    groupIdToAttributeId:boolean
+    id: string,
+    groupIdToAttributeId: boolean
 ) {
     if (groupIdToAttributeId) {
         return `${SpecialAttribute.ComparisonGroupPrefix}_${id}`;
     } else {
-        return id.substring(SpecialAttribute.ComparisonGroupPrefix.length + 1) // +1 for the underscore
+        return id.substring(SpecialAttribute.ComparisonGroupPrefix.length + 1); // +1 for the underscore
     }
 }
 
 export function makeComparisonGroupClinicalAttributes(
-    comparisonGroups:Group[]
-):(ClinicalAttribute & {comparisonGroup:Group})[] {
-    return comparisonGroups.map(group=>({
-        clinicalAttributeId: convertComparisonGroupClinicalAttribute(group.id, true),
-        datatype: "STRING",
-        description: `Membership in ${group.data.name}`,
-        displayName: `In group: ${group.data.name}`,
-        comparisonGroup:group,
-        patientAttribute: false
-    } as (ClinicalAttribute & {comparisonGroup:Group})));
+    comparisonGroups: Group[]
+): (ClinicalAttribute & { comparisonGroup: Group })[] {
+    return comparisonGroups.map(
+        group =>
+            ({
+                clinicalAttributeId: convertComparisonGroupClinicalAttribute(
+                    group.id,
+                    true
+                ),
+                datatype: 'STRING',
+                description: `Membership in ${group.data.name}`,
+                displayName: `In group: ${group.data.name}`,
+                comparisonGroup: group,
+                patientAttribute: false,
+            } as (ClinicalAttribute & { comparisonGroup: Group }))
+    );
 }
 
 export function makeProfiledInClinicalAttributes(
-    coverageInformation: CoverageInformation["samples"],
-    molecularProfileIdToMolecularProfile: {[molecularProfileId:string]:MolecularProfile},
+    coverageInformation: CoverageInformation['samples'],
+    molecularProfileIdToMolecularProfile: {
+        [molecularProfileId: string]: MolecularProfile;
+    },
     selectedMolecularProfiles: MolecularProfile[],
     isSingleStudyQuery: boolean
-):(ClinicalAttribute & {molecularProfileIds:string[]})[] {
+): (ClinicalAttribute & { molecularProfileIds: string[] })[] {
     // determine which Profiled In clinical attributes will exist in this query.
     // A Profiled In <alteration type> attribute only exists if theres a sample in the query
     //  which is not profiled in any selected profiles for that type.
@@ -68,9 +85,13 @@ export function makeProfiledInClinicalAttributes(
     //  in the study, then an attribute will be generated specifically for that profile. Otherwise, the attribute
     //  will represent an entire alteration type.
 
-    const groupedSelectedMolecularProfiles:{[alterationType:string]:MolecularProfile[]} =
-        _.groupBy(selectedMolecularProfiles, "molecularAlterationType");
-    const selectedMolecularProfilesMap = _.keyBy(selectedMolecularProfiles, p=>p.molecularProfileId);
+    const groupedSelectedMolecularProfiles: {
+        [alterationType: string]: MolecularProfile[];
+    } = _.groupBy(selectedMolecularProfiles, 'molecularAlterationType');
+    const selectedMolecularProfilesMap = _.keyBy(
+        selectedMolecularProfiles,
+        p => p.molecularProfileId
+    );
 
     // Start each computation by assuming unprofiled for every queried alteration type.
     // This is because of the following example: suppose we have a multiple study query, and
@@ -80,111 +101,147 @@ export function makeProfiledInClinicalAttributes(
     //  we keep track of the fact that there is a queried copy number profile for SOME
     //  study, then we'll never see that there are unprofiled samples for copy number,
     //  and thus we should show a "Profiled In Copy Number" track.
-    const initIsUnprofiled = _.mapValues(groupedSelectedMolecularProfiles, p=>true);
-
-    const existsUnprofiledCount:{[alterationType:string]:number} = _.reduce(coverageInformation, (map, sampleCoverage)=>{
-        const isUnprofiled:{[alterationType:string]:boolean} = _.clone(initIsUnprofiled);
-
-        // if a sample is not profiled in all genes, its certainly unprofiled for this profile
-        for (const gpData of sampleCoverage.notProfiledAllGenes) {
-            if (gpData.molecularProfileId in selectedMolecularProfilesMap) {
-                // mark isUnprofiled for this type because this is a selected profile
-                isUnprofiled[
-                    molecularProfileIdToMolecularProfile[gpData.molecularProfileId].molecularAlterationType
-                ] = true;
-            }
-        }
+    const initIsUnprofiled = _.mapValues(
+        groupedSelectedMolecularProfiles,
+        p => true
+    );
+
+    const existsUnprofiledCount: {
+        [alterationType: string]: number;
+    } = _.reduce(
+        coverageInformation,
+        (map, sampleCoverage) => {
+            const isUnprofiled: { [alterationType: string]: boolean } = _.clone(
+                initIsUnprofiled
+            );
 
-        // if a sample is not profiled in some gene, then it is maybe unprofiled
-        _.forEach(sampleCoverage.notProfiledByGene, (geneInfo)=>{
-            for (const gpData of geneInfo) {
+            // if a sample is not profiled in all genes, its certainly unprofiled for this profile
+            for (const gpData of sampleCoverage.notProfiledAllGenes) {
                 if (gpData.molecularProfileId in selectedMolecularProfilesMap) {
                     // mark isUnprofiled for this type because this is a selected profile
                     isUnprofiled[
-                        molecularProfileIdToMolecularProfile[gpData.molecularProfileId].molecularAlterationType
+                        molecularProfileIdToMolecularProfile[
+                            gpData.molecularProfileId
+                        ].molecularAlterationType
                     ] = true;
                 }
             }
-        });
-
-        // if a sample is profiled for all genes, then it is not unprofiled
-        for (const gpData of sampleCoverage.allGenes) {
-            if (gpData.molecularProfileId in selectedMolecularProfilesMap) {
-                // unmark isUnprofiled
-                isUnprofiled[
-                    molecularProfileIdToMolecularProfile[gpData.molecularProfileId].molecularAlterationType
-                ] = false;
-            }
-        };
 
-        // if a sample is profiled in some gene, then it is not unprofiled
-        _.forEach(sampleCoverage.byGene, geneInfo=>{
-            for (const gpData of geneInfo) {
+            // if a sample is not profiled in some gene, then it is maybe unprofiled
+            _.forEach(sampleCoverage.notProfiledByGene, geneInfo => {
+                for (const gpData of geneInfo) {
+                    if (
+                        gpData.molecularProfileId in
+                        selectedMolecularProfilesMap
+                    ) {
+                        // mark isUnprofiled for this type because this is a selected profile
+                        isUnprofiled[
+                            molecularProfileIdToMolecularProfile[
+                                gpData.molecularProfileId
+                            ].molecularAlterationType
+                        ] = true;
+                    }
+                }
+            });
+
+            // if a sample is profiled for all genes, then it is not unprofiled
+            for (const gpData of sampleCoverage.allGenes) {
                 if (gpData.molecularProfileId in selectedMolecularProfilesMap) {
                     // unmark isUnprofiled
                     isUnprofiled[
-                        molecularProfileIdToMolecularProfile[gpData.molecularProfileId].molecularAlterationType
+                        molecularProfileIdToMolecularProfile[
+                            gpData.molecularProfileId
+                        ].molecularAlterationType
                     ] = false;
                 }
             }
-        });
 
-        // increment counts
-        _.forEach(isUnprofiled, (_isUnprofiled, alterationType)=>{
-            if (_isUnprofiled) {
-                map[alterationType] = map[alterationType] || 0;
-                map[alterationType] += 1;
-            }
-        });
-        return map;
-    }, {} as {[alterationType:string]:number});
-    
+            // if a sample is profiled in some gene, then it is not unprofiled
+            _.forEach(sampleCoverage.byGene, geneInfo => {
+                for (const gpData of geneInfo) {
+                    if (
+                        gpData.molecularProfileId in
+                        selectedMolecularProfilesMap
+                    ) {
+                        // unmark isUnprofiled
+                        isUnprofiled[
+                            molecularProfileIdToMolecularProfile[
+                                gpData.molecularProfileId
+                            ].molecularAlterationType
+                        ] = false;
+                    }
+                }
+            });
+
+            // increment counts
+            _.forEach(isUnprofiled, (_isUnprofiled, alterationType) => {
+                if (_isUnprofiled) {
+                    map[alterationType] = map[alterationType] || 0;
+                    map[alterationType] += 1;
+                }
+            });
+            return map;
+        },
+        {} as { [alterationType: string]: number }
+    );
+
     // make a clinical attribute for each profile type which not every sample is profiled in
-    const existsUnprofiled = Object.keys(existsUnprofiledCount).filter(alterationType=>{
-        return existsUnprofiledCount[alterationType] > 0;
-    });
-    const attributes:(ClinicalAttribute & {molecularProfileIds:string[]})[] = (existsUnprofiled.map(alterationType=>{
-        const group = groupedSelectedMolecularProfiles[alterationType];
-        if (!group) {
-            // No selected profiles of that type, skip it
-            return null;
-        } else if (group.length === 1 && isSingleStudyQuery) {
-            // If only one profile of type, and its a single study query, then it gets its own attribute
-            const profile = group[0];
-            return {
-                clinicalAttributeId: `${SpecialAttribute.ProfiledInPrefix}_${profile.molecularProfileId}`,
-                datatype: "STRING",
-                description: `Profiled in ${profile.name}: ${profile.description}`,
-                displayName: `Profiled in ${profile.name}`,
-                molecularProfileIds: [profile.molecularProfileId],
-                patientAttribute: false
-            } as (ClinicalAttribute & {molecularProfileIds:string[]});
-        } else {
-            // If more than one, or its multiple study query, make one attribute for the entire alteration type
-            return {
-                clinicalAttributeId: `${SpecialAttribute.ProfiledInPrefix}_${alterationType}`,
-                datatype: "STRING",
-                description: "",
-                displayName: `Profiled for ${alterationTypeToProfiledForText[alterationType]}`,
-                molecularProfileIds: group.map(p=>p.molecularProfileId),
-                patientAttribute: false
-            } as (ClinicalAttribute & {molecularProfileIds:string[]});
+    const existsUnprofiled = Object.keys(existsUnprofiledCount).filter(
+        alterationType => {
+            return existsUnprofiledCount[alterationType] > 0;
         }
-    })).filter(x=>!!x) as (ClinicalAttribute & {molecularProfileIds:string[]})[];// filter out null
-    
-    attributes.sort((a,b)=>naturalSort(a.displayName, b.displayName));
+    );
+    const attributes: (ClinicalAttribute & {
+        molecularProfileIds: string[];
+    })[] = existsUnprofiled
+        .map(alterationType => {
+            const group = groupedSelectedMolecularProfiles[alterationType];
+            if (!group) {
+                // No selected profiles of that type, skip it
+                return null;
+            } else if (group.length === 1 && isSingleStudyQuery) {
+                // If only one profile of type, and its a single study query, then it gets its own attribute
+                const profile = group[0];
+                return {
+                    clinicalAttributeId: `${SpecialAttribute.ProfiledInPrefix}_${profile.molecularProfileId}`,
+                    datatype: 'STRING',
+                    description: `Profiled in ${profile.name}: ${profile.description}`,
+                    displayName: `Profiled in ${profile.name}`,
+                    molecularProfileIds: [profile.molecularProfileId],
+                    patientAttribute: false,
+                } as (ClinicalAttribute & { molecularProfileIds: string[] });
+            } else {
+                // If more than one, or its multiple study query, make one attribute for the entire alteration type
+                return {
+                    clinicalAttributeId: `${SpecialAttribute.ProfiledInPrefix}_${alterationType}`,
+                    datatype: 'STRING',
+                    description: '',
+                    displayName: `Profiled for ${alterationTypeToProfiledForText[alterationType]}`,
+                    molecularProfileIds: group.map(p => p.molecularProfileId),
+                    patientAttribute: false,
+                } as (ClinicalAttribute & { molecularProfileIds: string[] });
+            }
+        })
+        .filter(x => !!x) as (ClinicalAttribute & {
+        molecularProfileIds: string[];
+    })[]; // filter out null
+
+    attributes.sort((a, b) => naturalSort(a.displayName, b.displayName));
     return attributes;
-};
+}
 
-export function treatmentsToSelectOptions(treatments:Treatment[]):ISelectOption[] {
+export function treatmentsToSelectOptions(
+    treatments: Treatment[]
+): ISelectOption[] {
     // Note: name and desc are optional fields for treatment entities
     // When not provided in the data file, these fields are assigned the
     // value of the entity_stable_id. The code below hides fields when
     // indentical to the entity_stable_id.
-    return _.map(treatments, (d:Treatment) => {
+    return _.map(treatments, (d: Treatment) => {
         const uniqueName = d.name !== d.treatmentId;
-        const uniqueDesc = d.description !== d.treatmentId && d.description !== d.name;
-        let label = "";
+        const uniqueDesc =
+            d.description !== d.treatmentId && d.description !== d.name;
+        let label = '';
         if (!uniqueName && !uniqueDesc) {
             label = d.treatmentId;
         } else if (!uniqueName) {
@@ -202,7 +259,7 @@ export function treatmentsToSelectOptions(treatments:Treatment[]):ISelectOption[
         return {
             id: d.treatmentId,
             value: label,
-            label: label
+            label: label,
         };
     });
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/oncoprint/SortUtils.spec.ts b/src/shared/components/oncoprint/SortUtils.spec.ts
index e293182a251..a167dbc1f17 100644
--- a/src/shared/components/oncoprint/SortUtils.spec.ts
+++ b/src/shared/components/oncoprint/SortUtils.spec.ts
@@ -1,12 +1,12 @@
-import {assert} from "chai";
-import {alphabeticalDefault, stringClinicalComparator} from "./SortUtils";
+import { assert } from 'chai';
+import { alphabeticalDefault, stringClinicalComparator } from './SortUtils';
 
-describe("SortUtils", ()=>{
-    describe("alphabeticalDefault", ()=>{
-        let cmp:(d1:any, d2:any)=>number;
-        before(()=>{
-            cmp = alphabeticalDefault((d1:any, d2:any)=>{
-                const res = (d1.val - d2.val);
+describe('SortUtils', () => {
+    describe('alphabeticalDefault', () => {
+        let cmp: (d1: any, d2: any) => number;
+        before(() => {
+            cmp = alphabeticalDefault((d1: any, d2: any) => {
+                const res = d1.val - d2.val;
                 if (res < 0) {
                     return -1;
                 } else if (res > 0) {
@@ -16,98 +16,374 @@ describe("SortUtils", ()=>{
                 }
             });
         });
-        it("should return -1 when the input comparator returns -1 (d1.val < d2.val)", ()=>{
-            assert.equal(cmp({val:0, sample:"a"}, {val:1, sample:"b"}), -1);
-            assert.equal(cmp({val:-1, sample:"a"}, {val:1, sample:"b"}), -1);
-            assert.equal(cmp({val:-2, sample:"a"}, {val:-1, sample:"b"}), -1);
-            assert.equal(cmp({val:4, sample:"a"}, {val:5, sample:"b"}), -1);
+        it('should return -1 when the input comparator returns -1 (d1.val < d2.val)', () => {
+            assert.equal(
+                cmp({ val: 0, sample: 'a' }, { val: 1, sample: 'b' }),
+                -1
+            );
+            assert.equal(
+                cmp({ val: -1, sample: 'a' }, { val: 1, sample: 'b' }),
+                -1
+            );
+            assert.equal(
+                cmp({ val: -2, sample: 'a' }, { val: -1, sample: 'b' }),
+                -1
+            );
+            assert.equal(
+                cmp({ val: 4, sample: 'a' }, { val: 5, sample: 'b' }),
+                -1
+            );
         });
-        it("should return 1 when the input comparator returns 1 (d1.val > d2.val)", ()=>{
-            assert.equal(cmp({val:1, sample:"b"}, {val:0, sample:"a"}), 1);
-            assert.equal(cmp({val:1, sample:"b"}, {val:-1, sample:"a"}), 1);
-            assert.equal(cmp({val:-1, sample:"b"},{val:-2, sample:"a"}), 1);
-            assert.equal(cmp({val:5, sample:"b"}, {val:4, sample:"a"}), 1);
+        it('should return 1 when the input comparator returns 1 (d1.val > d2.val)', () => {
+            assert.equal(
+                cmp({ val: 1, sample: 'b' }, { val: 0, sample: 'a' }),
+                1
+            );
+            assert.equal(
+                cmp({ val: 1, sample: 'b' }, { val: -1, sample: 'a' }),
+                1
+            );
+            assert.equal(
+                cmp({ val: -1, sample: 'b' }, { val: -2, sample: 'a' }),
+                1
+            );
+            assert.equal(
+                cmp({ val: 5, sample: 'b' }, { val: 4, sample: 'a' }),
+                1
+            );
         });
-        it("should return -1 when the input comparator returns 0 (d1.val = d2.val) and d1.sample alphabetically before d2.sample", ()=>{
-            assert.equal(cmp({val:1, sample:"a"}, {val:1, sample:"b"}), -1);
-            assert.equal(cmp({val:3, sample:"A"}, {val:3, sample:"B"}), -1);
-            assert.equal(cmp({val:4, sample:"sample3"}, {val:4, sample:"sample15"}), -1);
-            assert.equal(cmp({val:-1, sample:"123"}, {val:-1, sample:"223"}), -1);
-            assert.equal(cmp({val:0, sample:"tA"}, {val:0, sample:"tB"}), -1);
+        it('should return -1 when the input comparator returns 0 (d1.val = d2.val) and d1.sample alphabetically before d2.sample', () => {
+            assert.equal(
+                cmp({ val: 1, sample: 'a' }, { val: 1, sample: 'b' }),
+                -1
+            );
+            assert.equal(
+                cmp({ val: 3, sample: 'A' }, { val: 3, sample: 'B' }),
+                -1
+            );
+            assert.equal(
+                cmp(
+                    { val: 4, sample: 'sample3' },
+                    { val: 4, sample: 'sample15' }
+                ),
+                -1
+            );
+            assert.equal(
+                cmp({ val: -1, sample: '123' }, { val: -1, sample: '223' }),
+                -1
+            );
+            assert.equal(
+                cmp({ val: 0, sample: 'tA' }, { val: 0, sample: 'tB' }),
+                -1
+            );
         });
-        it("should return 1 when the input comparator returns 0 (d1.val = d2.val) and d1.sample alphabetically after d2.sample", ()=>{
-            assert.equal(cmp({val:1, sample:"b"}, {val:1, sample:"a"}), 1);
-            assert.equal(cmp({val:3, sample:"B"}, {val:3, sample:"A"}), 1);
-            assert.equal(cmp({val:4, sample:"sample15"}, {val:4, sample:"sample3"}), 1);
-            assert.equal(cmp({val:-1, sample:"223"}, {val:-1, sample:"123"}), 1);
-            assert.equal(cmp({val:0, sample:"tB"}, {val:0, sample:"tA"}), 1);
+        it('should return 1 when the input comparator returns 0 (d1.val = d2.val) and d1.sample alphabetically after d2.sample', () => {
+            assert.equal(
+                cmp({ val: 1, sample: 'b' }, { val: 1, sample: 'a' }),
+                1
+            );
+            assert.equal(
+                cmp({ val: 3, sample: 'B' }, { val: 3, sample: 'A' }),
+                1
+            );
+            assert.equal(
+                cmp(
+                    { val: 4, sample: 'sample15' },
+                    { val: 4, sample: 'sample3' }
+                ),
+                1
+            );
+            assert.equal(
+                cmp({ val: -1, sample: '223' }, { val: -1, sample: '123' }),
+                1
+            );
+            assert.equal(
+                cmp({ val: 0, sample: 'tB' }, { val: 0, sample: 'tA' }),
+                1
+            );
         });
-        it("should return 0 when the input comparator returns 0 (d1.val = d2.val) and d1.sample = d2.sample", ()=>{
-            assert.equal(cmp({val:1, sample:"a"}, {val:1, sample:"a"}), 0);
-            assert.equal(cmp({val:3, sample:"A"}, {val:3, sample:"A"}), 0);
-            assert.equal(cmp({val:4, sample:"sampleA"}, {val:4, sample:"sampleA"}), 0);
-            assert.equal(cmp({val:-1, sample:"123"}, {val:-1, sample:"123"}), 0);
-            assert.equal(cmp({val:0, sample:"tA"}, {val:0, sample:"tA"}), 0);
+        it('should return 0 when the input comparator returns 0 (d1.val = d2.val) and d1.sample = d2.sample', () => {
+            assert.equal(
+                cmp({ val: 1, sample: 'a' }, { val: 1, sample: 'a' }),
+                0
+            );
+            assert.equal(
+                cmp({ val: 3, sample: 'A' }, { val: 3, sample: 'A' }),
+                0
+            );
+            assert.equal(
+                cmp(
+                    { val: 4, sample: 'sampleA' },
+                    { val: 4, sample: 'sampleA' }
+                ),
+                0
+            );
+            assert.equal(
+                cmp({ val: -1, sample: '123' }, { val: -1, sample: '123' }),
+                0
+            );
+            assert.equal(
+                cmp({ val: 0, sample: 'tA' }, { val: 0, sample: 'tA' }),
+                0
+            );
         });
-        it("should return -1 when the input comparator returns 0 (d1.val = d2.val) and d1.patient alphabetically before d2.patient", ()=>{
-            assert.equal(cmp({val:1, patient:"a"}, {val:1, patient:"b"}), -1);
-            assert.equal(cmp({val:3, patient:"A"}, {val:3, patient:"B"}), -1);
-            assert.equal(cmp({val:4, patient:"patient2"}, {val:4, patient:"patient12"}), -1);
-            assert.equal(cmp({val:-1, patient:"123"}, {val:-1, patient:"223"}), -1);
-            assert.equal(cmp({val:0, patient:"tA"}, {val:0, patient:"tB"}), -1);
+        it('should return -1 when the input comparator returns 0 (d1.val = d2.val) and d1.patient alphabetically before d2.patient', () => {
+            assert.equal(
+                cmp({ val: 1, patient: 'a' }, { val: 1, patient: 'b' }),
+                -1
+            );
+            assert.equal(
+                cmp({ val: 3, patient: 'A' }, { val: 3, patient: 'B' }),
+                -1
+            );
+            assert.equal(
+                cmp(
+                    { val: 4, patient: 'patient2' },
+                    { val: 4, patient: 'patient12' }
+                ),
+                -1
+            );
+            assert.equal(
+                cmp({ val: -1, patient: '123' }, { val: -1, patient: '223' }),
+                -1
+            );
+            assert.equal(
+                cmp({ val: 0, patient: 'tA' }, { val: 0, patient: 'tB' }),
+                -1
+            );
         });
-        it("should return 1 when the input comparator returns 0 (d1.val = d2.val) and d1.patient alphabetically after d2.patient", ()=>{
-            assert.equal(cmp({val:1, patient:"b"}, {val:1, patient:"a"}), 1);
-            assert.equal(cmp({val:3, patient:"B"}, {val:3, patient:"A"}), 1);
-            assert.equal(cmp({val:4, patient:"patient12"}, {val:4, patient:"patient2"}), 1);
-            assert.equal(cmp({val:-1, patient:"223"}, {val:-1, patient:"123"}), 1);
-            assert.equal(cmp({val:0, patient:"tB"}, {val:0, patient:"tA"}), 1);
+        it('should return 1 when the input comparator returns 0 (d1.val = d2.val) and d1.patient alphabetically after d2.patient', () => {
+            assert.equal(
+                cmp({ val: 1, patient: 'b' }, { val: 1, patient: 'a' }),
+                1
+            );
+            assert.equal(
+                cmp({ val: 3, patient: 'B' }, { val: 3, patient: 'A' }),
+                1
+            );
+            assert.equal(
+                cmp(
+                    { val: 4, patient: 'patient12' },
+                    { val: 4, patient: 'patient2' }
+                ),
+                1
+            );
+            assert.equal(
+                cmp({ val: -1, patient: '223' }, { val: -1, patient: '123' }),
+                1
+            );
+            assert.equal(
+                cmp({ val: 0, patient: 'tB' }, { val: 0, patient: 'tA' }),
+                1
+            );
         });
-        it("should return 0 when the input comparator returns 0 (d1.val = d2.val) and d1.patient = d2.patient", ()=>{
-            assert.equal(cmp({val:1, patient:"a"}, {val:1, patient:"a"}), 0);
-            assert.equal(cmp({val:3, patient:"A"}, {val:3, patient:"A"}), 0);
-            assert.equal(cmp({val:4, patient:"patientA"}, {val:4, patient:"patientA"}), 0);
-            assert.equal(cmp({val:-1, patient:"123"}, {val:-1, patient:"123"}), 0);
-            assert.equal(cmp({val:0, patient:"tA"}, {val:0, patient:"tA"}), 0);
+        it('should return 0 when the input comparator returns 0 (d1.val = d2.val) and d1.patient = d2.patient', () => {
+            assert.equal(
+                cmp({ val: 1, patient: 'a' }, { val: 1, patient: 'a' }),
+                0
+            );
+            assert.equal(
+                cmp({ val: 3, patient: 'A' }, { val: 3, patient: 'A' }),
+                0
+            );
+            assert.equal(
+                cmp(
+                    { val: 4, patient: 'patientA' },
+                    { val: 4, patient: 'patientA' }
+                ),
+                0
+            );
+            assert.equal(
+                cmp({ val: -1, patient: '123' }, { val: -1, patient: '123' }),
+                0
+            );
+            assert.equal(
+                cmp({ val: 0, patient: 'tA' }, { val: 0, patient: 'tA' }),
+                0
+            );
         });
     });
 
-    describe("stringClinicalComparator", ()=>{
-        it("should return -1 when neither have na and first attr_val comes before second", ()=>{
-            assert.equal(stringClinicalComparator({na:false, attr_val:"a"}, {na:false, attr_val:"b"}), -1);
-            assert.equal(stringClinicalComparator({na:false, attr_val:"cancerA"}, {na:false, attr_val:"cancerB"}), -1);
-            assert.equal(stringClinicalComparator({na:false, attr_val:"cancer2"}, {na:false, attr_val:"cancer12"}), -1);
+    describe('stringClinicalComparator', () => {
+        it('should return -1 when neither have na and first attr_val comes before second', () => {
+            assert.equal(
+                stringClinicalComparator(
+                    { na: false, attr_val: 'a' },
+                    { na: false, attr_val: 'b' }
+                ),
+                -1
+            );
+            assert.equal(
+                stringClinicalComparator(
+                    { na: false, attr_val: 'cancerA' },
+                    { na: false, attr_val: 'cancerB' }
+                ),
+                -1
+            );
+            assert.equal(
+                stringClinicalComparator(
+                    { na: false, attr_val: 'cancer2' },
+                    { na: false, attr_val: 'cancer12' }
+                ),
+                -1
+            );
         });
-        it("should return 1 when neither have na and first attr_val comes after second", ()=>{
-            assert.equal(stringClinicalComparator({na:false, attr_val:"b"}, {na:false, attr_val:"a"}), 1);
-            assert.equal(stringClinicalComparator({na:false, attr_val:"cancerB"}, {na:false, attr_val:"cancerA"}), 1);
-            assert.equal(stringClinicalComparator({na:false, attr_val:"cancer12"}, {na:false, attr_val:"cancer2"}), 1);
+        it('should return 1 when neither have na and first attr_val comes after second', () => {
+            assert.equal(
+                stringClinicalComparator(
+                    { na: false, attr_val: 'b' },
+                    { na: false, attr_val: 'a' }
+                ),
+                1
+            );
+            assert.equal(
+                stringClinicalComparator(
+                    { na: false, attr_val: 'cancerB' },
+                    { na: false, attr_val: 'cancerA' }
+                ),
+                1
+            );
+            assert.equal(
+                stringClinicalComparator(
+                    { na: false, attr_val: 'cancer12' },
+                    { na: false, attr_val: 'cancer2' }
+                ),
+                1
+            );
         });
-        it("should return 0 when neither have na and first attr_val equals second", ()=>{
-            assert.equal(stringClinicalComparator({na:false, attr_val:"a"}, {na:false, attr_val:"a"}), 0);
-            assert.equal(stringClinicalComparator({na:false, attr_val:"cancerA"}, {na:false, attr_val:"cancerA"}), 0);
-            assert.equal(stringClinicalComparator({na:false, attr_val:"cancer2"}, {na:false, attr_val:"cancer2"}), 0);
+        it('should return 0 when neither have na and first attr_val equals second', () => {
+            assert.equal(
+                stringClinicalComparator(
+                    { na: false, attr_val: 'a' },
+                    { na: false, attr_val: 'a' }
+                ),
+                0
+            );
+            assert.equal(
+                stringClinicalComparator(
+                    { na: false, attr_val: 'cancerA' },
+                    { na: false, attr_val: 'cancerA' }
+                ),
+                0
+            );
+            assert.equal(
+                stringClinicalComparator(
+                    { na: false, attr_val: 'cancer2' },
+                    { na: false, attr_val: 'cancer2' }
+                ),
+                0
+            );
         });
-        it("should return 0 when both have na", ()=>{
-            assert.equal(stringClinicalComparator({na:true, attr_val:"a"}, {na:true, attr_val:"b"}), 0);
-            assert.equal(stringClinicalComparator({na:true, attr_val:"cancerA"}, {na:true, attr_val:"cancerB"}), 0);
-            assert.equal(stringClinicalComparator({na:true, attr_val:"cancer2"}, {na:true, attr_val:"cancer12"}), 0);
+        it('should return 0 when both have na', () => {
+            assert.equal(
+                stringClinicalComparator(
+                    { na: true, attr_val: 'a' },
+                    { na: true, attr_val: 'b' }
+                ),
+                0
+            );
+            assert.equal(
+                stringClinicalComparator(
+                    { na: true, attr_val: 'cancerA' },
+                    { na: true, attr_val: 'cancerB' }
+                ),
+                0
+            );
+            assert.equal(
+                stringClinicalComparator(
+                    { na: true, attr_val: 'cancer2' },
+                    { na: true, attr_val: 'cancer12' }
+                ),
+                0
+            );
         });
-        it("should return 2 when first has na and second doesnt", ()=>{
-            assert.equal(stringClinicalComparator({na:true, attr_val:"a"}, {na:false, attr_val:"b"}), 2);
-            assert.equal(stringClinicalComparator({na:true, attr_val:"cancerA"}, {na:false, attr_val:"cancerB"}), 2);
-            assert.equal(stringClinicalComparator({na:true, attr_val:"cancer2"}, {na:false, attr_val:"cancer12"}), 2);
-            assert.equal(stringClinicalComparator({na:true, attr_val:"b"}, {na:false, attr_val:"a"}), 2);
-            assert.equal(stringClinicalComparator({na:true, attr_val:"cancerB"}, {na:false, attr_val:"cancerA"}), 2);
-            assert.equal(stringClinicalComparator({na:true, attr_val:"cancer12"}, {na:false, attr_val:"cancer2"}), 2);
+        it('should return 2 when first has na and second doesnt', () => {
+            assert.equal(
+                stringClinicalComparator(
+                    { na: true, attr_val: 'a' },
+                    { na: false, attr_val: 'b' }
+                ),
+                2
+            );
+            assert.equal(
+                stringClinicalComparator(
+                    { na: true, attr_val: 'cancerA' },
+                    { na: false, attr_val: 'cancerB' }
+                ),
+                2
+            );
+            assert.equal(
+                stringClinicalComparator(
+                    { na: true, attr_val: 'cancer2' },
+                    { na: false, attr_val: 'cancer12' }
+                ),
+                2
+            );
+            assert.equal(
+                stringClinicalComparator(
+                    { na: true, attr_val: 'b' },
+                    { na: false, attr_val: 'a' }
+                ),
+                2
+            );
+            assert.equal(
+                stringClinicalComparator(
+                    { na: true, attr_val: 'cancerB' },
+                    { na: false, attr_val: 'cancerA' }
+                ),
+                2
+            );
+            assert.equal(
+                stringClinicalComparator(
+                    { na: true, attr_val: 'cancer12' },
+                    { na: false, attr_val: 'cancer2' }
+                ),
+                2
+            );
         });
-        it("should return -2 when first doesnt have na and second does", ()=>{
-            assert.equal(stringClinicalComparator({na:false, attr_val:"a"}, {na:true, attr_val:"b"}), -2);
-            assert.equal(stringClinicalComparator({na:false, attr_val:"cancerA"}, {na:true, attr_val:"cancerB"}), -2);
-            assert.equal(stringClinicalComparator({na:false, attr_val:"cancer2"}, {na:true, attr_val:"cancer12"}), -2);
-            assert.equal(stringClinicalComparator({na:false, attr_val:"b"}, {na:true, attr_val:"a"}), -2);
-            assert.equal(stringClinicalComparator({na:false, attr_val:"cancerB"}, {na:true, attr_val:"cancerA"}), -2);
-            assert.equal(stringClinicalComparator({na:false, attr_val:"cancer12"}, {na:true, attr_val:"cancer2"}), -2);
+        it('should return -2 when first doesnt have na and second does', () => {
+            assert.equal(
+                stringClinicalComparator(
+                    { na: false, attr_val: 'a' },
+                    { na: true, attr_val: 'b' }
+                ),
+                -2
+            );
+            assert.equal(
+                stringClinicalComparator(
+                    { na: false, attr_val: 'cancerA' },
+                    { na: true, attr_val: 'cancerB' }
+                ),
+                -2
+            );
+            assert.equal(
+                stringClinicalComparator(
+                    { na: false, attr_val: 'cancer2' },
+                    { na: true, attr_val: 'cancer12' }
+                ),
+                -2
+            );
+            assert.equal(
+                stringClinicalComparator(
+                    { na: false, attr_val: 'b' },
+                    { na: true, attr_val: 'a' }
+                ),
+                -2
+            );
+            assert.equal(
+                stringClinicalComparator(
+                    { na: false, attr_val: 'cancerB' },
+                    { na: true, attr_val: 'cancerA' }
+                ),
+                -2
+            );
+            assert.equal(
+                stringClinicalComparator(
+                    { na: false, attr_val: 'cancer12' },
+                    { na: true, attr_val: 'cancer2' }
+                ),
+                -2
+            );
         });
     });
-});
\ No newline at end of file
+});
diff --git a/src/shared/components/oncoprint/SortUtils.ts b/src/shared/components/oncoprint/SortUtils.ts
index 2ffa281d2a3..00751e5af48 100644
--- a/src/shared/components/oncoprint/SortUtils.ts
+++ b/src/shared/components/oncoprint/SortUtils.ts
@@ -1,5 +1,5 @@
-import {TrackSortComparator,TrackSortVector} from "oncoprintjs";
-import {ClinicalTrackSpec, GeneticTrackDatum} from "./Oncoprint";
+import { TrackSortComparator, TrackSortVector } from 'oncoprintjs';
+import { ClinicalTrackSpec, GeneticTrackDatum } from './Oncoprint';
 import naturalSort from 'javascript-natural-sort';
 
 /**
@@ -7,7 +7,9 @@ import naturalSort from 'javascript-natural-sort';
  * @param {(string | string[] | boolean)[]} array_spec
  * @returns {{[p: string]: number}}
  */
-function makeComparatorMetric(array_spec: (string | string[] | undefined | boolean)[]) {
+function makeComparatorMetric(
+    array_spec: (string | string[] | undefined | boolean)[]
+) {
     let metric: { [s: string]: number } = {};
     for (let i = 0; i < array_spec.length; i++) {
         const equiv_values = ([] as any[]).concat(array_spec[i]);
@@ -16,7 +18,7 @@ function makeComparatorMetric(array_spec: (string | string[] | undefined | boole
         }
     }
     return metric;
-};
+}
 
 /**
  * Get sign of a number
@@ -31,35 +33,80 @@ function sign(x: number): 0 | -1 | 1 {
     } else {
         return 0;
     }
-};
+}
 
-export function getGeneticTrackSortComparator(sortByMutationType?: boolean, sortByDrivers?: boolean): {
-    preferred:TrackSortVector<GeneticTrackDatum>,
-    mandatory:TrackSortVector<GeneticTrackDatum>,
-    isVector: true
+export function getGeneticTrackSortComparator(
+    sortByMutationType?: boolean,
+    sortByDrivers?: boolean
+): {
+    preferred: TrackSortVector<GeneticTrackDatum>;
+    mandatory: TrackSortVector<GeneticTrackDatum>;
+    isVector: true;
 } {
-    const cna_order = makeComparatorMetric(['amp', 'homdel', 'gain', 'hetloss', 'diploid', undefined]);
-    const mut_order = (function () {
+    const cna_order = makeComparatorMetric([
+        'amp',
+        'homdel',
+        'gain',
+        'hetloss',
+        'diploid',
+        undefined,
+    ]);
+    const mut_order = (function() {
         let _order: { [s: string]: number };
         if (!sortByMutationType && !sortByDrivers) {
-            return function (m: any) {
-                return (({'true': 1, 'false': 2}) as { [bool: string]: number })[(!!m) + ""];
-            }
+            return function(m: any) {
+                return ({ true: 1, false: 2 } as { [bool: string]: number })[
+                    !!m + ''
+                ];
+            };
         } else if (!sortByMutationType && sortByDrivers) {
-            _order = makeComparatorMetric([['inframe_rec', 'missense_rec', 'promoter_rec', 'trunc_rec', 'other_rec'], ['inframe', 'missense', 'promoter', 'trunc', 'other'], undefined]);
+            _order = makeComparatorMetric([
+                [
+                    'inframe_rec',
+                    'missense_rec',
+                    'promoter_rec',
+                    'trunc_rec',
+                    'other_rec',
+                ],
+                ['inframe', 'missense', 'promoter', 'trunc', 'other'],
+                undefined,
+            ]);
         } else if (sortByMutationType && !sortByDrivers) {
-            _order = makeComparatorMetric([['trunc', 'trunc_rec'], ['inframe', 'inframe_rec'], ['promoter', 'promoter_rec'], ['missense', 'missense_rec'], ['other', 'other_rec'], undefined, true, false]);
+            _order = makeComparatorMetric([
+                ['trunc', 'trunc_rec'],
+                ['inframe', 'inframe_rec'],
+                ['promoter', 'promoter_rec'],
+                ['missense', 'missense_rec'],
+                ['other', 'other_rec'],
+                undefined,
+                true,
+                false,
+            ]);
         } else if (sortByMutationType && sortByDrivers) {
-            _order = makeComparatorMetric(['trunc_rec', 'inframe_rec', 'promoter_rec', 'missense_rec', 'other_rec', 'trunc', 'inframe', 'promoter', 'missense', 'other', undefined, true, false]);
+            _order = makeComparatorMetric([
+                'trunc_rec',
+                'inframe_rec',
+                'promoter_rec',
+                'missense_rec',
+                'other_rec',
+                'trunc',
+                'inframe',
+                'promoter',
+                'missense',
+                'other',
+                undefined,
+                true,
+                false,
+            ]);
         }
-        return function (m: any) {
+        return function(m: any) {
             return _order[m];
-        }
+        };
     })();
     const regulation_order = makeComparatorMetric(['high', 'low', undefined]);
     const germline_order = makeComparatorMetric([true, false, undefined]); // germline mutation is prioritized
 
-    function mandatoryHelper(d:GeneticTrackDatum):number[] {
+    function mandatoryHelper(d: GeneticTrackDatum): number[] {
         const vector = [];
 
         // Test fusion
@@ -70,42 +117,42 @@ export function getGeneticTrackSortComparator(sortByMutationType?: boolean, sort
         }
 
         // Next, CNA
-        vector.push(cna_order[d.disp_cna+""]);
+        vector.push(cna_order[d.disp_cna + '']);
 
         // Next, mutation
         // Mutation type
         vector.push(mut_order(d.disp_mut));
         // Germline status
-        vector.push(germline_order[d.disp_germ + ""]);
+        vector.push(germline_order[d.disp_germ + '']);
 
         // Next, mrna expression
-        vector.push(regulation_order[d.disp_mrna+""]);
+        vector.push(regulation_order[d.disp_mrna + '']);
 
         // Next, protein expression
-        vector.push(regulation_order[d.disp_prot+""]);
+        vector.push(regulation_order[d.disp_prot + '']);
 
         return vector;
     }
 
-    function mandatory(d:GeneticTrackDatum):number[] {
+    function mandatory(d: GeneticTrackDatum): number[] {
         return mandatoryHelper(d);
     }
-    function preferred(d:GeneticTrackDatum):(number|string)[] {
+    function preferred(d: GeneticTrackDatum): (number | string)[] {
         // First, test if not sequenced
         // Last, use sample/patient id
-        return [+(!!d.na)].concat(mandatoryHelper(d)).concat(
-            [d.sample ? d.sample : d.patient!] as any
-        );
-    };
+        return [+!!d.na]
+            .concat(mandatoryHelper(d))
+            .concat([d.sample ? d.sample : d.patient!] as any);
+    }
     return {
         preferred,
         mandatory,
-        isVector: true
+        isVector: true,
     };
 }
 
-function makeNumericalComparator(value_key:string) {
-    return function (d1:any, d2:any) {
+function makeNumericalComparator(value_key: string) {
+    return function(d1: any, d2: any) {
         if (d1.na && d2.na) {
             return 0;
         } else if (d1.na && !d2.na) {
@@ -113,11 +160,15 @@ function makeNumericalComparator(value_key:string) {
         } else if (!d1.na && d2.na) {
             return -2;
         } else {
-            return (d1[value_key] < d2[value_key] ? -1 : (d1[value_key] === d2[value_key] ? 0 : 1));
+            return d1[value_key] < d2[value_key]
+                ? -1
+                : d1[value_key] === d2[value_key]
+                ? 0
+                : 1;
         }
     };
 }
-export function stringClinicalComparator(d1:any, d2:any) {
+export function stringClinicalComparator(d1: any, d2: any) {
     if (d1.na && d2.na) {
         return 0;
     } else if (d1.na && !d2.na) {
@@ -128,8 +179,8 @@ export function stringClinicalComparator(d1:any, d2:any) {
         return naturalSort(d1.attr_val, d2.attr_val);
     }
 }
-function makeCountsMapClinicalComparator(categories:string[]) {
-    return function (d1:any, d2:any) {
+function makeCountsMapClinicalComparator(categories: string[]) {
+    return function(d1: any, d2: any) {
         if (d1.na && d2.na) {
             return 0;
         } else if (d1.na && !d2.na) {
@@ -140,8 +191,8 @@ function makeCountsMapClinicalComparator(categories:string[]) {
             var d1_total = 0;
             var d2_total = 0;
             for (var i = 0; i < categories.length; i++) {
-                d1_total += (d1.attr_val[categories[i]] || 0);
-                d2_total += (d2.attr_val[categories[i]] || 0);
+                d1_total += d1.attr_val[categories[i]] || 0;
+                d2_total += d2.attr_val[categories[i]] || 0;
             }
             if (d1_total === 0 && d2_total === 0) {
                 return 0;
@@ -152,11 +203,17 @@ function makeCountsMapClinicalComparator(categories:string[]) {
             } else {
                 var d1_max_category = 0;
                 var d2_max_category = 0;
-                for (var i=0; i<categories.length; i++) {
-                    if (d1.attr_val[categories[i]] > d1.attr_val[categories[d1_max_category]]) {
+                for (var i = 0; i < categories.length; i++) {
+                    if (
+                        d1.attr_val[categories[i]] >
+                        d1.attr_val[categories[d1_max_category]]
+                    ) {
                         d1_max_category = i;
                     }
-                    if (d2.attr_val[categories[i]] > d2.attr_val[categories[d2_max_category]]) {
+                    if (
+                        d2.attr_val[categories[i]] >
+                        d2.attr_val[categories[d2_max_category]]
+                    ) {
                         d2_max_category = i;
                     }
                 }
@@ -166,17 +223,17 @@ function makeCountsMapClinicalComparator(categories:string[]) {
                     return 1;
                 } else {
                     var cmp_category = categories[d1_max_category];
-                    var d1_prop = d1.attr_val[cmp_category]/d1_total;
-                    var d2_prop = d2.attr_val[cmp_category]/d2_total;
+                    var d1_prop = d1.attr_val[cmp_category] / d1_total;
+                    var d2_prop = d2.attr_val[cmp_category] / d2_total;
                     return sign(d1_prop - d2_prop);
                 }
             }
         }
-    }
+    };
 }
 
-export function alphabeticalDefault(comparator:(d1:any, d2:any)=>number) {
-    return function(d1:any, d2:any) {
+export function alphabeticalDefault(comparator: (d1: any, d2: any) => number) {
+    return function(d1: any, d2: any) {
         const cmp = comparator(d1, d2);
         if (cmp === 0) {
             if (d1.sample) {
@@ -190,31 +247,32 @@ export function alphabeticalDefault(comparator:(d1:any, d2:any)=>number) {
     };
 }
 
-export function getClinicalTrackSortComparator(track:ClinicalTrackSpec) {
+export function getClinicalTrackSortComparator(track: ClinicalTrackSpec) {
     let comparator;
     switch (track.datatype) {
-        case "number":
-            comparator = makeNumericalComparator("attr_val");
+        case 'number':
+            comparator = makeNumericalComparator('attr_val');
             break;
-        case "counts":
-            comparator = makeCountsMapClinicalComparator(track.countsCategoryLabels);
+        case 'counts':
+            comparator = makeCountsMapClinicalComparator(
+                track.countsCategoryLabels
+            );
             break;
-        case "string":
+        case 'string':
         default:
             comparator = stringClinicalComparator;
             break;
     }
     return {
         preferred: alphabeticalDefault(comparator),
-        mandatory: comparator
+        mandatory: comparator,
     };
 }
 
-export const heatmapTrackSortComparator = (()=>{
-    const comparator = makeNumericalComparator("profile_data");
+export const heatmapTrackSortComparator = (() => {
+    const comparator = makeNumericalComparator('profile_data');
     return {
         preferred: alphabeticalDefault(comparator),
-        mandatory: comparator
+        mandatory: comparator,
     };
-
 })();
diff --git a/src/shared/components/oncoprint/TooltipUtils.spec.ts b/src/shared/components/oncoprint/TooltipUtils.spec.ts
index 46e438ec890..2cf61c03cc9 100644
--- a/src/shared/components/oncoprint/TooltipUtils.spec.ts
+++ b/src/shared/components/oncoprint/TooltipUtils.spec.ts
@@ -1,519 +1,1280 @@
-import { assert } from "chai";
+import { assert } from 'chai';
 import {
     getCaseViewElt,
-    makeClinicalTrackTooltip, makeGeneticTrackTooltip, makeGeneticTrackTooltip_getCoverageInformation,
-    makeHeatmapTrackTooltip
-} from "./TooltipUtils";
-import { GeneticTrackDatum } from "./Oncoprint";
+    makeClinicalTrackTooltip,
+    makeGeneticTrackTooltip,
+    makeGeneticTrackTooltip_getCoverageInformation,
+    makeHeatmapTrackTooltip,
+} from './TooltipUtils';
+import { GeneticTrackDatum } from './Oncoprint';
 import {
     AlterationTypeConstants,
     AnnotatedExtendedAlteration,
-    AnnotatedMutation
-} from "../../../pages/resultsView/ResultsViewPageStore";
-import $ from "jquery";
-import { MolecularProfile, Mutation } from "../../api/generated/CBioPortalAPI";
-import { getPatientViewUrl, getSampleViewUrl } from "../../api/urls";
-
-describe("Oncoprint TooltipUtils", () => {
-    describe("getCaseViewElt", () => {
-        it("gives empty result for no input", () => {
-            assert.equal(getCaseViewElt([], false), "");
+    AnnotatedMutation,
+} from '../../../pages/resultsView/ResultsViewPageStore';
+import $ from 'jquery';
+import { MolecularProfile, Mutation } from '../../api/generated/CBioPortalAPI';
+import { getPatientViewUrl, getSampleViewUrl } from '../../api/urls';
+
+describe('Oncoprint TooltipUtils', () => {
+    describe('getCaseViewElt', () => {
+        it('gives empty result for no input', () => {
+            assert.equal(getCaseViewElt([], false), '');
         });
-        it("shows case id if single input and no linkout", () => {
+        it('shows case id if single input and no linkout', () => {
             assert.equal(
-                getCaseViewElt([{ sample: "sampleID", patient: "patientID", study_id: "studyID" }], false),
-                "<span>sampleID</span>"
+                getCaseViewElt(
+                    [
+                        {
+                            sample: 'sampleID',
+                            patient: 'patientID',
+                            study_id: 'studyID',
+                        },
+                    ],
+                    false
+                ),
+                '<span>sampleID</span>'
             );
             assert.equal(
-                getCaseViewElt([{ patient: "patientID", study_id: "studyID" }], false),
-                "<span>patientID</span>"
+                getCaseViewElt(
+                    [{ patient: 'patientID', study_id: 'studyID' }],
+                    false
+                ),
+                '<span>patientID</span>'
             );
         });
-        it("shows link if single input and linkout", () => {
-            let elt = $(getCaseViewElt([{ sample: "sampleID", patient: "patientID", study_id: "studyID" }], true));
-            assert.equal(elt.attr("href"), getSampleViewUrl("studyID", "sampleID"));
-            assert.equal(elt.text(), "sampleID");
-            elt = $(getCaseViewElt([{ patient: "patientID", study_id: "studyID" }], true));
-            assert.equal(elt.attr("href"), getPatientViewUrl("studyID", "patientID"));
-            assert.equal(elt.text(), "patientID");
+        it('shows link if single input and linkout', () => {
+            let elt = $(
+                getCaseViewElt(
+                    [
+                        {
+                            sample: 'sampleID',
+                            patient: 'patientID',
+                            study_id: 'studyID',
+                        },
+                    ],
+                    true
+                )
+            );
+            assert.equal(
+                elt.attr('href'),
+                getSampleViewUrl('studyID', 'sampleID')
+            );
+            assert.equal(elt.text(), 'sampleID');
+            elt = $(
+                getCaseViewElt(
+                    [{ patient: 'patientID', study_id: 'studyID' }],
+                    true
+                )
+            );
+            assert.equal(
+                elt.attr('href'),
+                getPatientViewUrl('studyID', 'patientID')
+            );
+            assert.equal(elt.text(), 'patientID');
         });
-        it("shows number if multiple input and no linkout", () => {
+        it('shows number if multiple input and no linkout', () => {
             assert.equal(
-                getCaseViewElt([{ sample: "sampleID", patient: "patientID", study_id: "studyID" }, { sample: "sampleID2", patient: "patientID2", study_id: "studyID" }, { sample: "sampleID3", patient: "patientID3", study_id: "studyID" }], false),
-                "<span>3 samples</span>"
+                getCaseViewElt(
+                    [
+                        {
+                            sample: 'sampleID',
+                            patient: 'patientID',
+                            study_id: 'studyID',
+                        },
+                        {
+                            sample: 'sampleID2',
+                            patient: 'patientID2',
+                            study_id: 'studyID',
+                        },
+                        {
+                            sample: 'sampleID3',
+                            patient: 'patientID3',
+                            study_id: 'studyID',
+                        },
+                    ],
+                    false
+                ),
+                '<span>3 samples</span>'
             );
             assert.equal(
-                getCaseViewElt([{ patient: "patientID", study_id: "studyID" }, { patient: "patientID2", study_id: "studyID" }, { patient: "patientID3", study_id: "studyID" }], false),
-                "<span>3 patients</span>"
+                getCaseViewElt(
+                    [
+                        { patient: 'patientID', study_id: 'studyID' },
+                        { patient: 'patientID2', study_id: 'studyID' },
+                        { patient: 'patientID3', study_id: 'studyID' },
+                    ],
+                    false
+                ),
+                '<span>3 patients</span>'
             );
         });
-        it("shows link if multiple input and linkout", () => {
-            let elt = $(getCaseViewElt([{ sample: "sampleID", patient: "patientID", study_id: "studyID" }, { sample: "sampleID2", patient: "patientID2", study_id: "studyID" }, { sample: "sampleID3", patient: "patientID3", study_id: "studyID" }], true));
-            assert.equal(elt.attr("href"), getSampleViewUrl("studyID", "sampleID", [{ patientId: "patientID", studyId: "studyID" }, { patientId: "patientID2", studyId: "studyID" }, { patientId: "patientID3", studyId: "studyID" }]));
-            assert.equal(elt.text(), "View these 3 samples");
-            elt = $(getCaseViewElt([{ patient: "patientID", study_id: "studyID" }, { patient: "patientID2", study_id: "studyID" }, { patient: "patientID3", study_id: "studyID" }], true));
-            assert.equal(elt.attr("href"), getPatientViewUrl("studyID", "patientID", [{ patientId: "patientID", studyId: "studyID" }, { patientId: "patientID2", studyId: "studyID" }, { patientId: "patientID3", studyId: "studyID" }]));
-            assert.equal(elt.text(), "View these 3 patients");
-
+        it('shows link if multiple input and linkout', () => {
+            let elt = $(
+                getCaseViewElt(
+                    [
+                        {
+                            sample: 'sampleID',
+                            patient: 'patientID',
+                            study_id: 'studyID',
+                        },
+                        {
+                            sample: 'sampleID2',
+                            patient: 'patientID2',
+                            study_id: 'studyID',
+                        },
+                        {
+                            sample: 'sampleID3',
+                            patient: 'patientID3',
+                            study_id: 'studyID',
+                        },
+                    ],
+                    true
+                )
+            );
+            assert.equal(
+                elt.attr('href'),
+                getSampleViewUrl('studyID', 'sampleID', [
+                    { patientId: 'patientID', studyId: 'studyID' },
+                    { patientId: 'patientID2', studyId: 'studyID' },
+                    { patientId: 'patientID3', studyId: 'studyID' },
+                ])
+            );
+            assert.equal(elt.text(), 'View these 3 samples');
+            elt = $(
+                getCaseViewElt(
+                    [
+                        { patient: 'patientID', study_id: 'studyID' },
+                        { patient: 'patientID2', study_id: 'studyID' },
+                        { patient: 'patientID3', study_id: 'studyID' },
+                    ],
+                    true
+                )
+            );
+            assert.equal(
+                elt.attr('href'),
+                getPatientViewUrl('studyID', 'patientID', [
+                    { patientId: 'patientID', studyId: 'studyID' },
+                    { patientId: 'patientID2', studyId: 'studyID' },
+                    { patientId: 'patientID3', studyId: 'studyID' },
+                ])
+            );
+            assert.equal(elt.text(), 'View these 3 patients');
         });
     });
-    describe("makeGeneticTrackTooltip", () => {
+    describe('makeGeneticTrackTooltip', () => {
         let tooltip: (d: any) => JQuery;
         before(() => {
             tooltip = makeGeneticTrackTooltip(false, () => ({
-                profile: { molecularProfileId: "profile", name: "Profile" } as any as MolecularProfile,
-                profile2: { molecularProfileId: "profile2", name: "Profile2" } as any as MolecularProfile,
-                profile3: { molecularProfileId: "profile3", name: "Profile3" } as any as MolecularProfile,
+                profile: ({
+                    molecularProfileId: 'profile',
+                    name: 'Profile',
+                } as any) as MolecularProfile,
+                profile2: ({
+                    molecularProfileId: 'profile2',
+                    name: 'Profile2',
+                } as any) as MolecularProfile,
+                profile3: ({
+                    molecularProfileId: 'profile3',
+                    name: 'Profile3',
+                } as any) as MolecularProfile,
             }));
         });
 
-        function makeMutation(props: Partial<AnnotatedExtendedAlteration>): AnnotatedExtendedAlteration {
+        function makeMutation(
+            props: Partial<AnnotatedExtendedAlteration>
+        ): AnnotatedExtendedAlteration {
             return {
-                hugoGeneSymbol: "GENE",
-                proteinChange: "proteinchange",
-                molecularProfileAlterationType: AlterationTypeConstants.MUTATION_EXTENDED,
-                ...props
+                hugoGeneSymbol: 'GENE',
+                proteinChange: 'proteinchange',
+                molecularProfileAlterationType:
+                    AlterationTypeConstants.MUTATION_EXTENDED,
+                ...props,
             } as AnnotatedExtendedAlteration;
         }
-        function makeFusion(props: Partial<AnnotatedExtendedAlteration>): AnnotatedExtendedAlteration {
-            return makeMutation({ alterationSubType: "fusion", ...props });
+        function makeFusion(
+            props: Partial<AnnotatedExtendedAlteration>
+        ): AnnotatedExtendedAlteration {
+            return makeMutation({ alterationSubType: 'fusion', ...props });
         }
-        function makeCna(props: Partial<AnnotatedExtendedAlteration>): AnnotatedExtendedAlteration {
+        function makeCna(
+            props: Partial<AnnotatedExtendedAlteration>
+        ): AnnotatedExtendedAlteration {
             return {
-                hugoGeneSymbol: "GENE",
-                molecularProfileAlterationType: AlterationTypeConstants.COPY_NUMBER_ALTERATION,
-                ...props
+                hugoGeneSymbol: 'GENE',
+                molecularProfileAlterationType:
+                    AlterationTypeConstants.COPY_NUMBER_ALTERATION,
+                ...props,
             } as AnnotatedExtendedAlteration;
         }
 
-        function makeMrna(props: Partial<AnnotatedExtendedAlteration>): AnnotatedExtendedAlteration {
+        function makeMrna(
+            props: Partial<AnnotatedExtendedAlteration>
+        ): AnnotatedExtendedAlteration {
             return {
-                hugoGeneSymbol: "GENE",
-                molecularProfileAlterationType: AlterationTypeConstants.MRNA_EXPRESSION,
-                ...props
+                hugoGeneSymbol: 'GENE',
+                molecularProfileAlterationType:
+                    AlterationTypeConstants.MRNA_EXPRESSION,
+                ...props,
             } as AnnotatedExtendedAlteration;
         }
 
-        function makeProt(props: Partial<AnnotatedExtendedAlteration>): AnnotatedExtendedAlteration {
+        function makeProt(
+            props: Partial<AnnotatedExtendedAlteration>
+        ): AnnotatedExtendedAlteration {
             return {
-                hugoGeneSymbol: "GENE",
-                molecularProfileAlterationType: AlterationTypeConstants.PROTEIN_LEVEL,
-                ...props
+                hugoGeneSymbol: 'GENE',
+                molecularProfileAlterationType:
+                    AlterationTypeConstants.PROTEIN_LEVEL,
+                ...props,
             } as AnnotatedExtendedAlteration;
         }
 
-        describe("custom driver annotations", () => {
-            it("should show a binary custom driver icon with descriptive title, if theres a binary custom driver annotation", () => {
+        describe('custom driver annotations', () => {
+            it('should show a binary custom driver icon with descriptive title, if theres a binary custom driver annotation', () => {
                 const datum = {
-                    sample: "sample", study_id: "",
-                    data: [makeMutation({
-                        driverFilter: "Putative_Driver",
-                        driverFilterAnnotation: "annotation here"
-                    })],
+                    sample: 'sample',
+                    study_id: '',
+                    data: [
+                        makeMutation({
+                            driverFilter: 'Putative_Driver',
+                            driverFilterAnnotation: 'annotation here',
+                        }),
+                    ],
                 };
                 const datum2 = {
-                    sample: "sample", study_id: "",
-                    data: [makeMutation({
-                        driverFilter: "Putative_Driver",
-                        driverFilterAnnotation: "annotation here"
-                    })],
+                    sample: 'sample',
+                    study_id: '',
+                    data: [
+                        makeMutation({
+                            driverFilter: 'Putative_Driver',
+                            driverFilterAnnotation: 'annotation here',
+                        }),
+                    ],
                 };
                 const datum3 = {
-                    sample: "sample", study_id: "",
+                    sample: 'sample',
+                    study_id: '',
                     data: [],
                 };
                 let tooltipOutput = tooltip([datum]);
-                assert.equal(tooltipOutput.find("img[title='Putative_Driver: annotation here']").length, 1);
-                assert.equal(tooltipOutput.find("img[alt='driver filter']").length, 1, "should only be one icon");
-                assert.isFalse(tooltipOutput.html().indexOf("(1)") > -1, "theres no (1) because theres only one datum to the tooltip");
+                assert.equal(
+                    tooltipOutput.find(
+                        "img[title='Putative_Driver: annotation here']"
+                    ).length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.find("img[alt='driver filter']").length,
+                    1,
+                    'should only be one icon'
+                );
+                assert.isFalse(
+                    tooltipOutput.html().indexOf('(1)') > -1,
+                    'theres no (1) because theres only one datum to the tooltip'
+                );
 
                 tooltipOutput = tooltip([datum, datum2]);
-                assert.equal(tooltipOutput.find("img[title='Putative_Driver: annotation here']").length, 1, "mutation appears once");
-                assert.equal(tooltipOutput.find("img[alt='driver filter']").length, 1, "should only be one icon, because mutation appears once in tooltip");
-                assert.isTrue(tooltipOutput.html().indexOf("(2)") > -1, "theres a (2) indicating 2 samples have that mutation");
+                assert.equal(
+                    tooltipOutput.find(
+                        "img[title='Putative_Driver: annotation here']"
+                    ).length,
+                    1,
+                    'mutation appears once'
+                );
+                assert.equal(
+                    tooltipOutput.find("img[alt='driver filter']").length,
+                    1,
+                    'should only be one icon, because mutation appears once in tooltip'
+                );
+                assert.isTrue(
+                    tooltipOutput.html().indexOf('(2)') > -1,
+                    'theres a (2) indicating 2 samples have that mutation'
+                );
 
                 tooltipOutput = tooltip([datum, datum3]);
-                assert.equal(tooltipOutput.find("img[title='Putative_Driver: annotation here']").length, 1);
-                assert.equal(tooltipOutput.find("img[alt='driver filter']").length, 1, "should only be one icon");
-                assert.isTrue(tooltipOutput.html().indexOf("(1)") > -1, "theres a (1) indicating 1 sample has that mutation");
+                assert.equal(
+                    tooltipOutput.find(
+                        "img[title='Putative_Driver: annotation here']"
+                    ).length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.find("img[alt='driver filter']").length,
+                    1,
+                    'should only be one icon'
+                );
+                assert.isTrue(
+                    tooltipOutput.html().indexOf('(1)') > -1,
+                    'theres a (1) indicating 1 sample has that mutation'
+                );
             });
 
-            it("should show multiple binary custom driver icons with corresponding titles, if there are multiple annotated mutations", () => {
+            it('should show multiple binary custom driver icons with corresponding titles, if there are multiple annotated mutations', () => {
                 const datum = {
-                    sample: "sample", study_id: "",
-                    data: [makeMutation({
-                        driverFilter: "Putative_Driver",
-                        driverFilterAnnotation: "annotation 1"
-                    }), makeMutation({
-                        driverFilter: "Putative_Driver",
-                        driverFilterAnnotation: "annotation 2"
-                    }), makeMutation({
-                        driverFilter: "Putative_Driver",
-                        driverFilterAnnotation: "3 annotation"
-                    })],
+                    sample: 'sample',
+                    study_id: '',
+                    data: [
+                        makeMutation({
+                            driverFilter: 'Putative_Driver',
+                            driverFilterAnnotation: 'annotation 1',
+                        }),
+                        makeMutation({
+                            driverFilter: 'Putative_Driver',
+                            driverFilterAnnotation: 'annotation 2',
+                        }),
+                        makeMutation({
+                            driverFilter: 'Putative_Driver',
+                            driverFilterAnnotation: '3 annotation',
+                        }),
+                    ],
                 };
                 const datum2 = {
-                    sample: "sample", study_id: "",
-                    data: [makeMutation({
-                        driverFilter: "Putative_Driver",
-                        driverFilterAnnotation: "annotation 1"
-                    }), makeMutation({
-                        driverFilter: "Putative_Driver",
-                        driverFilterAnnotation: "annotation 2"
-                    }), makeMutation({
-                        driverFilter: "Putative_Driver",
-                        driverFilterAnnotation: "3 annotation"
-                    })],
+                    sample: 'sample',
+                    study_id: '',
+                    data: [
+                        makeMutation({
+                            driverFilter: 'Putative_Driver',
+                            driverFilterAnnotation: 'annotation 1',
+                        }),
+                        makeMutation({
+                            driverFilter: 'Putative_Driver',
+                            driverFilterAnnotation: 'annotation 2',
+                        }),
+                        makeMutation({
+                            driverFilter: 'Putative_Driver',
+                            driverFilterAnnotation: '3 annotation',
+                        }),
+                    ],
                 };
                 const datum3 = {
-                    sample: "sample", study_id: "",
+                    sample: 'sample',
+                    study_id: '',
                     data: [],
                 };
                 let tooltipOutput = tooltip([datum]);
-                assert.equal(tooltipOutput.find("img[title='Putative_Driver: annotation 1']").length, 1);
-                assert.equal(tooltipOutput.find("img[title='Putative_Driver: annotation 2']").length, 1);
-                assert.equal(tooltipOutput.find("img[title='Putative_Driver: 3 annotation']").length, 1);
-                assert.equal(tooltipOutput.find("img[alt='driver filter']").length, 3, "should be three icons");
-                assert.isFalse(tooltipOutput.html().indexOf("(1)") > -1, "theres no (1) because theres only one datum to the tooltip");
+                assert.equal(
+                    tooltipOutput.find(
+                        "img[title='Putative_Driver: annotation 1']"
+                    ).length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.find(
+                        "img[title='Putative_Driver: annotation 2']"
+                    ).length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.find(
+                        "img[title='Putative_Driver: 3 annotation']"
+                    ).length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.find("img[alt='driver filter']").length,
+                    3,
+                    'should be three icons'
+                );
+                assert.isFalse(
+                    tooltipOutput.html().indexOf('(1)') > -1,
+                    'theres no (1) because theres only one datum to the tooltip'
+                );
 
                 tooltipOutput = tooltip([datum, datum2]);
-                assert.equal(tooltipOutput.find("img[title='Putative_Driver: annotation 1']").length, 1, "mutation 1 appears once");
-                assert.equal(tooltipOutput.find("img[title='Putative_Driver: annotation 2']").length, 1, "mutation 2 appears once");
-                assert.equal(tooltipOutput.find("img[title='Putative_Driver: 3 annotation']").length, 1, "mutation 3 appears once");
-                assert.equal(tooltipOutput.find("img[alt='driver filter']").length, 3, "should be three icons");
-                assert.equal(tooltipOutput.html().match(/\(2\)/g)!.length, 3, "the string (2) appears thrice, one for each mutation which occurs in 2 data");
+                assert.equal(
+                    tooltipOutput.find(
+                        "img[title='Putative_Driver: annotation 1']"
+                    ).length,
+                    1,
+                    'mutation 1 appears once'
+                );
+                assert.equal(
+                    tooltipOutput.find(
+                        "img[title='Putative_Driver: annotation 2']"
+                    ).length,
+                    1,
+                    'mutation 2 appears once'
+                );
+                assert.equal(
+                    tooltipOutput.find(
+                        "img[title='Putative_Driver: 3 annotation']"
+                    ).length,
+                    1,
+                    'mutation 3 appears once'
+                );
+                assert.equal(
+                    tooltipOutput.find("img[alt='driver filter']").length,
+                    3,
+                    'should be three icons'
+                );
+                assert.equal(
+                    tooltipOutput.html().match(/\(2\)/g)!.length,
+                    3,
+                    'the string (2) appears thrice, one for each mutation which occurs in 2 data'
+                );
 
                 tooltipOutput = tooltip([datum, datum3]);
-                assert.equal(tooltipOutput.find("img[title='Putative_Driver: annotation 1']").length, 1, "mutation 1 appears once");
-                assert.equal(tooltipOutput.find("img[title='Putative_Driver: annotation 2']").length, 1, "mutation 2 appears once");
-                assert.equal(tooltipOutput.find("img[title='Putative_Driver: 3 annotation']").length, 1, "mutation 3 appears once");
-                assert.equal(tooltipOutput.find("img[alt='driver filter']").length, 3, "should be three icons");
-                assert.equal(tooltipOutput.html().match(/\(1\)/g)!.length, 3, "the string (1) appears thrice, one for each mutation which occurs in 1 data");
+                assert.equal(
+                    tooltipOutput.find(
+                        "img[title='Putative_Driver: annotation 1']"
+                    ).length,
+                    1,
+                    'mutation 1 appears once'
+                );
+                assert.equal(
+                    tooltipOutput.find(
+                        "img[title='Putative_Driver: annotation 2']"
+                    ).length,
+                    1,
+                    'mutation 2 appears once'
+                );
+                assert.equal(
+                    tooltipOutput.find(
+                        "img[title='Putative_Driver: 3 annotation']"
+                    ).length,
+                    1,
+                    'mutation 3 appears once'
+                );
+                assert.equal(
+                    tooltipOutput.find("img[alt='driver filter']").length,
+                    3,
+                    'should be three icons'
+                );
+                assert.equal(
+                    tooltipOutput.html().match(/\(1\)/g)!.length,
+                    3,
+                    'the string (1) appears thrice, one for each mutation which occurs in 1 data'
+                );
             });
 
-            it("should not show a binary custom driver icon with descriptive title, if theres a binary annotation of non-driver", () => {
+            it('should not show a binary custom driver icon with descriptive title, if theres a binary annotation of non-driver', () => {
                 const datum = {
-                    sample: "sample", study_id: "",
-                    data: [makeMutation({
-                        driverFilter: "Putative_Passenger",
-                        driverFilterAnnotation: "paosidjp"
-                    }), makeMutation({
-                        driverFilter: "Unknown",
-                        driverFilterAnnotation: "asdfas"
-                    })],
+                    sample: 'sample',
+                    study_id: '',
+                    data: [
+                        makeMutation({
+                            driverFilter: 'Putative_Passenger',
+                            driverFilterAnnotation: 'paosidjp',
+                        }),
+                        makeMutation({
+                            driverFilter: 'Unknown',
+                            driverFilterAnnotation: 'asdfas',
+                        }),
+                    ],
                 };
                 const tooltipOutput = tooltip([datum]);
-                assert.equal(tooltipOutput.find("img[alt='driver filter']").length, 0);
+                assert.equal(
+                    tooltipOutput.find("img[alt='driver filter']").length,
+                    0
+                );
             });
 
-            it("should show a tiers custom driver icon with descriptive title, if theres a tiers custom driver annotation", () => {
+            it('should show a tiers custom driver icon with descriptive title, if theres a tiers custom driver annotation', () => {
                 const datum = {
-                    sample: "sample", study_id: "",
-                    data: [makeMutation({
-                        driverTiersFilter: "tier1",
-                        driverTiersFilterAnnotation: "tier1 mutation"
-                    })],
+                    sample: 'sample',
+                    study_id: '',
+                    data: [
+                        makeMutation({
+                            driverTiersFilter: 'tier1',
+                            driverTiersFilterAnnotation: 'tier1 mutation',
+                        }),
+                    ],
                 };
                 const datum2 = {
-                    sample: "sample", study_id: "",
-                    data: [makeMutation({
-                        driverTiersFilter: "tier1",
-                        driverTiersFilterAnnotation: "tier1 mutation"
-                    })],
+                    sample: 'sample',
+                    study_id: '',
+                    data: [
+                        makeMutation({
+                            driverTiersFilter: 'tier1',
+                            driverTiersFilterAnnotation: 'tier1 mutation',
+                        }),
+                    ],
                 };
                 const datum3 = {
-                    sample: "sample", study_id: "",
+                    sample: 'sample',
+                    study_id: '',
                     data: [],
                 };
                 let tooltipOutput = tooltip([datum]);
-                assert.equal(tooltipOutput.find("img[title='tier1: tier1 mutation']").length, 1);
-                assert.equal(tooltipOutput.find("img[alt='driver tiers filter']").length, 1, "should only be one icon");
-                assert.isFalse(tooltipOutput.html().indexOf("(1)") > -1, "theres no (1) because theres only one datum to the tooltip");
+                assert.equal(
+                    tooltipOutput.find("img[title='tier1: tier1 mutation']")
+                        .length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.find("img[alt='driver tiers filter']").length,
+                    1,
+                    'should only be one icon'
+                );
+                assert.isFalse(
+                    tooltipOutput.html().indexOf('(1)') > -1,
+                    'theres no (1) because theres only one datum to the tooltip'
+                );
 
                 tooltipOutput = tooltip([datum, datum2]);
-                assert.equal(tooltipOutput.find("img[title='tier1: tier1 mutation']").length, 1);
-                assert.equal(tooltipOutput.find("img[alt='driver tiers filter']").length, 1, "should only be one icon, one entry for the mutation");
-                assert.isTrue(tooltipOutput.html().indexOf("(2)") > -1, "theres a (2) indicating 2 samples have that mutation");
+                assert.equal(
+                    tooltipOutput.find("img[title='tier1: tier1 mutation']")
+                        .length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.find("img[alt='driver tiers filter']").length,
+                    1,
+                    'should only be one icon, one entry for the mutation'
+                );
+                assert.isTrue(
+                    tooltipOutput.html().indexOf('(2)') > -1,
+                    'theres a (2) indicating 2 samples have that mutation'
+                );
 
                 tooltipOutput = tooltip([datum, datum3]);
-                assert.equal(tooltipOutput.find("img[title='tier1: tier1 mutation']").length, 1);
-                assert.equal(tooltipOutput.find("img[alt='driver tiers filter']").length, 1, "should only be one icon");
-                assert.isTrue(tooltipOutput.html().indexOf("(1)") > -1, "theres a (1) indicating 1 sample has that mutation");
+                assert.equal(
+                    tooltipOutput.find("img[title='tier1: tier1 mutation']")
+                        .length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.find("img[alt='driver tiers filter']").length,
+                    1,
+                    'should only be one icon'
+                );
+                assert.isTrue(
+                    tooltipOutput.html().indexOf('(1)') > -1,
+                    'theres a (1) indicating 1 sample has that mutation'
+                );
             });
 
-            it("should show multiple tiers icons with corresponding titles, if there are multiple annotated mutations", () => {
+            it('should show multiple tiers icons with corresponding titles, if there are multiple annotated mutations', () => {
                 const datum = {
-                    sample: "sample", study_id: "",
-                    data: [makeMutation({
-                        driverTiersFilter: "tier2",
-                        driverTiersFilterAnnotation: "tier2 mutation"
-                    }), makeMutation({
-                        driverTiersFilter: "tier1",
-                        driverTiersFilterAnnotation: "tier1 mutation"
-                    }), makeMutation({
-                        driverTiersFilter: "tier4",
-                        driverTiersFilterAnnotation: "mutation tier4"
-                    })],
+                    sample: 'sample',
+                    study_id: '',
+                    data: [
+                        makeMutation({
+                            driverTiersFilter: 'tier2',
+                            driverTiersFilterAnnotation: 'tier2 mutation',
+                        }),
+                        makeMutation({
+                            driverTiersFilter: 'tier1',
+                            driverTiersFilterAnnotation: 'tier1 mutation',
+                        }),
+                        makeMutation({
+                            driverTiersFilter: 'tier4',
+                            driverTiersFilterAnnotation: 'mutation tier4',
+                        }),
+                    ],
                 };
                 const datum2 = {
-                    sample: "sample", study_id: "",
-                    data: [makeMutation({
-                        driverTiersFilter: "tier2",
-                        driverTiersFilterAnnotation: "tier2 mutation"
-                    }), makeMutation({
-                        driverTiersFilter: "tier1",
-                        driverTiersFilterAnnotation: "tier1 mutation"
-                    }), makeMutation({
-                        driverTiersFilter: "tier4",
-                        driverTiersFilterAnnotation: "mutation tier4"
-                    })]
+                    sample: 'sample',
+                    study_id: '',
+                    data: [
+                        makeMutation({
+                            driverTiersFilter: 'tier2',
+                            driverTiersFilterAnnotation: 'tier2 mutation',
+                        }),
+                        makeMutation({
+                            driverTiersFilter: 'tier1',
+                            driverTiersFilterAnnotation: 'tier1 mutation',
+                        }),
+                        makeMutation({
+                            driverTiersFilter: 'tier4',
+                            driverTiersFilterAnnotation: 'mutation tier4',
+                        }),
+                    ],
                 };
                 const datum3 = {
-                    sample: "sample", study_id: "",
-                    data: []
+                    sample: 'sample',
+                    study_id: '',
+                    data: [],
                 };
                 let tooltipOutput = tooltip([datum]);
-                assert.equal(tooltipOutput.find("img[title='tier1: tier1 mutation']").length, 1);
-                assert.equal(tooltipOutput.find("img[title='tier2: tier2 mutation']").length, 1);
-                assert.equal(tooltipOutput.find("img[title='tier4: mutation tier4']").length, 1);
-                assert.equal(tooltipOutput.find("img[alt='driver tiers filter']").length, 3, "should be three icons");
-                assert.isFalse(tooltipOutput.html().indexOf("(1)") > -1, "theres no (1) because theres only one datum to the tooltip");
+                assert.equal(
+                    tooltipOutput.find("img[title='tier1: tier1 mutation']")
+                        .length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.find("img[title='tier2: tier2 mutation']")
+                        .length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.find("img[title='tier4: mutation tier4']")
+                        .length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.find("img[alt='driver tiers filter']").length,
+                    3,
+                    'should be three icons'
+                );
+                assert.isFalse(
+                    tooltipOutput.html().indexOf('(1)') > -1,
+                    'theres no (1) because theres only one datum to the tooltip'
+                );
 
                 tooltipOutput = tooltip([datum, datum2]);
-                assert.equal(tooltipOutput.find("img[title='tier1: tier1 mutation']").length, 1, "mutation 1 appears once");
-                assert.equal(tooltipOutput.find("img[title='tier2: tier2 mutation']").length, 1, "mutation 2 appears once");
-                assert.equal(tooltipOutput.find("img[title='tier4: mutation tier4']").length, 1, "mutation 3 appears once");
-                assert.equal(tooltipOutput.find("img[alt='driver tiers filter']").length, 3, "should be three icons");
-                assert.equal(tooltipOutput.html().match(/\(2\)/g)!.length, 3, "the string (2) appears thrice, one for each mutation which occurs in 2 data");
+                assert.equal(
+                    tooltipOutput.find("img[title='tier1: tier1 mutation']")
+                        .length,
+                    1,
+                    'mutation 1 appears once'
+                );
+                assert.equal(
+                    tooltipOutput.find("img[title='tier2: tier2 mutation']")
+                        .length,
+                    1,
+                    'mutation 2 appears once'
+                );
+                assert.equal(
+                    tooltipOutput.find("img[title='tier4: mutation tier4']")
+                        .length,
+                    1,
+                    'mutation 3 appears once'
+                );
+                assert.equal(
+                    tooltipOutput.find("img[alt='driver tiers filter']").length,
+                    3,
+                    'should be three icons'
+                );
+                assert.equal(
+                    tooltipOutput.html().match(/\(2\)/g)!.length,
+                    3,
+                    'the string (2) appears thrice, one for each mutation which occurs in 2 data'
+                );
 
                 tooltipOutput = tooltip([datum3, datum]);
-                assert.equal(tooltipOutput.find("img[title='tier1: tier1 mutation']").length, 1, "mutation 1 appears once");
-                assert.equal(tooltipOutput.find("img[title='tier2: tier2 mutation']").length, 1, "mutation 2 appears once");
-                assert.equal(tooltipOutput.find("img[title='tier4: mutation tier4']").length, 1, "mutation 3 appears once");
-                assert.equal(tooltipOutput.find("img[alt='driver tiers filter']").length, 3, "should be three icons");
-                assert.equal(tooltipOutput.html().match(/\(1\)/g)!.length, 3, "the string (1) appears thrice, one for each mutation which occurs in 1 data");
+                assert.equal(
+                    tooltipOutput.find("img[title='tier1: tier1 mutation']")
+                        .length,
+                    1,
+                    'mutation 1 appears once'
+                );
+                assert.equal(
+                    tooltipOutput.find("img[title='tier2: tier2 mutation']")
+                        .length,
+                    1,
+                    'mutation 2 appears once'
+                );
+                assert.equal(
+                    tooltipOutput.find("img[title='tier4: mutation tier4']")
+                        .length,
+                    1,
+                    'mutation 3 appears once'
+                );
+                assert.equal(
+                    tooltipOutput.find("img[alt='driver tiers filter']").length,
+                    3,
+                    'should be three icons'
+                );
+                assert.equal(
+                    tooltipOutput.html().match(/\(1\)/g)!.length,
+                    3,
+                    'the string (1) appears thrice, one for each mutation which occurs in 1 data'
+                );
             });
 
-            it("should show both binary and tiers custom driver icons, with descriptive titles, if there are both annotations", () => {
+            it('should show both binary and tiers custom driver icons, with descriptive titles, if there are both annotations', () => {
                 const datum = {
-                    sample: "sample", study_id: "",
-                    data: [makeMutation({
-                        driverFilter: "Putative_Driver",
-                        driverFilterAnnotation: "annotation 1"
-                    }), makeMutation({
-                        driverFilter: "Putative_Driver",
-                        driverFilterAnnotation: "annotation 2"
-                    }), makeMutation({
-                        driverFilter: "Putative_Driver",
-                        driverFilterAnnotation: "3 annotation"
-                    }), makeMutation({
-                        driverFilter: "Putative_Passenger",
-                        driverFilterAnnotation: "paosidjp"
-                    }), makeMutation({
-                        driverFilter: "Unknown",
-                        driverFilterAnnotation: "asdfas"
-                    }), makeMutation({
-                        driverTiersFilter: "tier2",
-                        driverTiersFilterAnnotation: "tier2 mutation"
-                    }), makeMutation({
-                        driverTiersFilter: "tier1",
-                        driverTiersFilterAnnotation: "tier1 mutation"
-                    }), makeMutation({
-                        driverTiersFilter: "tier4",
-                        driverTiersFilterAnnotation: "mutation tier4"
-                    })]
+                    sample: 'sample',
+                    study_id: '',
+                    data: [
+                        makeMutation({
+                            driverFilter: 'Putative_Driver',
+                            driverFilterAnnotation: 'annotation 1',
+                        }),
+                        makeMutation({
+                            driverFilter: 'Putative_Driver',
+                            driverFilterAnnotation: 'annotation 2',
+                        }),
+                        makeMutation({
+                            driverFilter: 'Putative_Driver',
+                            driverFilterAnnotation: '3 annotation',
+                        }),
+                        makeMutation({
+                            driverFilter: 'Putative_Passenger',
+                            driverFilterAnnotation: 'paosidjp',
+                        }),
+                        makeMutation({
+                            driverFilter: 'Unknown',
+                            driverFilterAnnotation: 'asdfas',
+                        }),
+                        makeMutation({
+                            driverTiersFilter: 'tier2',
+                            driverTiersFilterAnnotation: 'tier2 mutation',
+                        }),
+                        makeMutation({
+                            driverTiersFilter: 'tier1',
+                            driverTiersFilterAnnotation: 'tier1 mutation',
+                        }),
+                        makeMutation({
+                            driverTiersFilter: 'tier4',
+                            driverTiersFilterAnnotation: 'mutation tier4',
+                        }),
+                    ],
                 };
                 const tooltipOutput = tooltip([datum]);
-                assert.equal(tooltipOutput.find("img[title='tier1: tier1 mutation']").length, 1);
-                assert.equal(tooltipOutput.find("img[title='tier2: tier2 mutation']").length, 1);
-                assert.equal(tooltipOutput.find("img[title='tier4: mutation tier4']").length, 1);
-                assert.equal(tooltipOutput.find("img[alt='driver tiers filter']").length, 3, "should be three tiers icons");
-                assert.equal(tooltipOutput.find("img[title='Putative_Driver: annotation 1']").length, 1);
-                assert.equal(tooltipOutput.find("img[title='Putative_Driver: annotation 2']").length, 1);
-                assert.equal(tooltipOutput.find("img[title='Putative_Driver: 3 annotation']").length, 1);
-                assert.equal(tooltipOutput.find("img[alt='driver filter']").length, 3, "should be three binary icons");
+                assert.equal(
+                    tooltipOutput.find("img[title='tier1: tier1 mutation']")
+                        .length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.find("img[title='tier2: tier2 mutation']")
+                        .length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.find("img[title='tier4: mutation tier4']")
+                        .length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.find("img[alt='driver tiers filter']").length,
+                    3,
+                    'should be three tiers icons'
+                );
+                assert.equal(
+                    tooltipOutput.find(
+                        "img[title='Putative_Driver: annotation 1']"
+                    ).length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.find(
+                        "img[title='Putative_Driver: annotation 2']"
+                    ).length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.find(
+                        "img[title='Putative_Driver: 3 annotation']"
+                    ).length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.find("img[alt='driver filter']").length,
+                    3,
+                    'should be three binary icons'
+                );
             });
 
-            it("should show neither icon if theres no custom driver annotations", () => {
+            it('should show neither icon if theres no custom driver annotations', () => {
                 const datum = {
-                    sample: "sample", study_id: "",
-                    data: [makeMutation({
-                        driverFilter: "Putative_Passenger",
-                        driverFilterAnnotation: "paosidjp"
-                    }), makeMutation({
-                        driverFilter: "Unknown",
-                        driverFilterAnnotation: "asdfas"
-                    }), makeMutation({}), makeMutation({})]
+                    sample: 'sample',
+                    study_id: '',
+                    data: [
+                        makeMutation({
+                            driverFilter: 'Putative_Passenger',
+                            driverFilterAnnotation: 'paosidjp',
+                        }),
+                        makeMutation({
+                            driverFilter: 'Unknown',
+                            driverFilterAnnotation: 'asdfas',
+                        }),
+                        makeMutation({}),
+                        makeMutation({}),
+                    ],
                 };
                 const tooltipOutput = tooltip([datum]);
-                assert.equal(tooltipOutput.find("img[alt='driver filter']").length, 0, "should be no binary icons");
-                assert.equal(tooltipOutput.find("img[alt='driver tiers filter']").length, 0, "should be no tiers icons");
+                assert.equal(
+                    tooltipOutput.find("img[alt='driver filter']").length,
+                    0,
+                    'should be no binary icons'
+                );
+                assert.equal(
+                    tooltipOutput.find("img[alt='driver tiers filter']").length,
+                    0,
+                    'should be no tiers icons'
+                );
             });
         });
-        describe("germline mutations", () => {
-            it("should show Germline next to every germline mutation, not next to others", () => {
+        describe('germline mutations', () => {
+            it('should show Germline next to every germline mutation, not next to others', () => {
                 const datum = {
-                    sample: "sample", study_id: "",
-                    data: [makeMutation({ mutationStatus: "germline", proteinChange: "mutation1" }), makeMutation({ mutationStatus: "germline", proteinChange: "mutation2" }), makeMutation({})],
+                    sample: 'sample',
+                    study_id: '',
+                    data: [
+                        makeMutation({
+                            mutationStatus: 'germline',
+                            proteinChange: 'mutation1',
+                        }),
+                        makeMutation({
+                            mutationStatus: 'germline',
+                            proteinChange: 'mutation2',
+                        }),
+                        makeMutation({}),
+                    ],
                 };
                 const datum2 = {
-                    sample: "sample", study_id: "",
-                    data: [makeMutation({ mutationStatus: "germline", proteinChange: "mutation1" }), makeMutation({ proteinChange: "mutation2" })]
+                    sample: 'sample',
+                    study_id: '',
+                    data: [
+                        makeMutation({
+                            mutationStatus: 'germline',
+                            proteinChange: 'mutation1',
+                        }),
+                        makeMutation({ proteinChange: 'mutation2' }),
+                    ],
                 };
                 const datum3 = {
-                    sample: "sample", study_id: "",
-                    data: [makeMutation({ proteinChange: "mutation1" }), makeMutation({ mutationStatus: "germline", proteinChange: "mutation2" })]
+                    sample: 'sample',
+                    study_id: '',
+                    data: [
+                        makeMutation({ proteinChange: 'mutation1' }),
+                        makeMutation({
+                            mutationStatus: 'germline',
+                            proteinChange: 'mutation2',
+                        }),
+                    ],
                 };
                 let tooltipOutput = tooltip([datum]);
-                assert.equal(tooltipOutput.html().match(/Germline/g)!.length, 2);
-                assert.isFalse(tooltipOutput.html().indexOf("(1)") > -1, "theres no (1) because theres only one datum to the tooltip");
+                assert.equal(
+                    tooltipOutput.html().match(/Germline/g)!.length,
+                    2
+                );
+                assert.isFalse(
+                    tooltipOutput.html().indexOf('(1)') > -1,
+                    'theres no (1) because theres only one datum to the tooltip'
+                );
 
                 tooltipOutput = tooltip([datum, datum2]);
-                assert.equal(tooltipOutput.html().match(/Germline/g)!.length, 2, "mutation1 germline, mutation2 germline");
-                assert.equal(tooltipOutput.html().match(/\(2\)/g)!.length, 1, "mutation 1 germline occurs in both data")
-                assert.equal(tooltipOutput.html().match(/\(1\)/g)!.length, 3, "empty mutation, mutation 2 germline, mutation 2 each occur once");
-                assert.equal(tooltipOutput.html().match(/mutation2/g)!.length, 2, "since one is germline and one is not, should appear twice in tooltip");
+                assert.equal(
+                    tooltipOutput.html().match(/Germline/g)!.length,
+                    2,
+                    'mutation1 germline, mutation2 germline'
+                );
+                assert.equal(
+                    tooltipOutput.html().match(/\(2\)/g)!.length,
+                    1,
+                    'mutation 1 germline occurs in both data'
+                );
+                assert.equal(
+                    tooltipOutput.html().match(/\(1\)/g)!.length,
+                    3,
+                    'empty mutation, mutation 2 germline, mutation 2 each occur once'
+                );
+                assert.equal(
+                    tooltipOutput.html().match(/mutation2/g)!.length,
+                    2,
+                    'since one is germline and one is not, should appear twice in tooltip'
+                );
 
                 tooltipOutput = tooltip([datum, datum3]);
-                assert.equal(tooltipOutput.html().match(/Germline/g)!.length, 2, "mutation1 germline, mutation2 germline");
-                assert.equal(tooltipOutput.html().match(/\(2\)/g)!.length, 1, "mutation 2 germline occurs in both data")
-                assert.equal(tooltipOutput.html().match(/\(1\)/g)!.length, 3, "empty mutation, mutation 1 germline, mutation 1 each occur once");
-                assert.equal(tooltipOutput.html().match(/mutation1/g)!.length, 2, "since one is germline and one is not, should appear twice in tooltip");
+                assert.equal(
+                    tooltipOutput.html().match(/Germline/g)!.length,
+                    2,
+                    'mutation1 germline, mutation2 germline'
+                );
+                assert.equal(
+                    tooltipOutput.html().match(/\(2\)/g)!.length,
+                    1,
+                    'mutation 2 germline occurs in both data'
+                );
+                assert.equal(
+                    tooltipOutput.html().match(/\(1\)/g)!.length,
+                    3,
+                    'empty mutation, mutation 1 germline, mutation 1 each occur once'
+                );
+                assert.equal(
+                    tooltipOutput.html().match(/mutation1/g)!.length,
+                    2,
+                    'since one is germline and one is not, should appear twice in tooltip'
+                );
 
                 tooltipOutput = tooltip([datum2, datum3]);
-                assert.equal(tooltipOutput.html().match(/Germline/g)!.length, 2, "mutation1 germline, mutation2 germline");
-                assert.equal(tooltipOutput.html().match(/\(2\)/g), null, "nothing occurs in both")
-                assert.equal(tooltipOutput.html().match(/\(1\)/g)!.length, 4, "mutation 1 germline, mutation 1, mutation 2 germline, mutation 2 each occur once");
-                assert.equal(tooltipOutput.html().match(/mutation1/g)!.length, 2, "since one is germline and one is not, should appear twice in tooltip");
-                assert.equal(tooltipOutput.html().match(/mutation2/g)!.length, 2, "since one is germline and one is not, should appear twice in tooltip");
+                assert.equal(
+                    tooltipOutput.html().match(/Germline/g)!.length,
+                    2,
+                    'mutation1 germline, mutation2 germline'
+                );
+                assert.equal(
+                    tooltipOutput.html().match(/\(2\)/g),
+                    null,
+                    'nothing occurs in both'
+                );
+                assert.equal(
+                    tooltipOutput.html().match(/\(1\)/g)!.length,
+                    4,
+                    'mutation 1 germline, mutation 1, mutation 2 germline, mutation 2 each occur once'
+                );
+                assert.equal(
+                    tooltipOutput.html().match(/mutation1/g)!.length,
+                    2,
+                    'since one is germline and one is not, should appear twice in tooltip'
+                );
+                assert.equal(
+                    tooltipOutput.html().match(/mutation2/g)!.length,
+                    2,
+                    'since one is germline and one is not, should appear twice in tooltip'
+                );
             });
         });
-        describe("profiled and not profiled", () => {
+        describe('profiled and not profiled', () => {
             it("should say 'Not profiled' if 'profiled_in' is empty and 'not_profiled_in' is not", () => {
                 const datum = {
-                    sample: "sample", study_id: "",
+                    sample: 'sample',
+                    study_id: '',
                     data: [] as AnnotatedExtendedAlteration[],
                     na: true,
                     profiled_in: [],
-                    not_profiled_in: [{ molecularProfileId: "profile" }]
+                    not_profiled_in: [{ molecularProfileId: 'profile' }],
                 };
                 let tooltipOutput = tooltip([datum]);
-                assert.isTrue(tooltipOutput.html().indexOf("Not profiled in selected molecular profiles.") > -1);
-                assert.equal(tooltipOutput.html().match(/\(1\)/g), null, "doesnt show (1) indicator for only one sample");
+                assert.isTrue(
+                    tooltipOutput
+                        .html()
+                        .indexOf(
+                            'Not profiled in selected molecular profiles.'
+                        ) > -1
+                );
+                assert.equal(
+                    tooltipOutput.html().match(/\(1\)/g),
+                    null,
+                    'doesnt show (1) indicator for only one sample'
+                );
 
                 tooltipOutput = tooltip([datum, datum]);
-                assert.isTrue(tooltipOutput.html().indexOf("Not profiled in selected molecular profiles. (2)") > -1);
+                assert.isTrue(
+                    tooltipOutput
+                        .html()
+                        .indexOf(
+                            'Not profiled in selected molecular profiles. (2)'
+                        ) > -1
+                );
 
                 tooltipOutput = tooltip([datum, datum, datum]);
-                assert.isTrue(tooltipOutput.html().indexOf("Not profiled in selected molecular profiles. (3)") > -1);
+                assert.isTrue(
+                    tooltipOutput
+                        .html()
+                        .indexOf(
+                            'Not profiled in selected molecular profiles. (3)'
+                        ) > -1
+                );
             });
             it("should say 'profiled' if 'not_profiled_in' is empty and 'profiled_in' is not", () => {
                 const datum = {
-                    sample: "sample", study_id: "",
+                    sample: 'sample',
+                    study_id: '',
                     data: [] as AnnotatedExtendedAlteration[],
                     na: true,
-                    profiled_in: [{ molecularProfileId: "profile", genePanelId: "panel" }],
-                    not_profiled_in: []
+                    profiled_in: [
+                        { molecularProfileId: 'profile', genePanelId: 'panel' },
+                    ],
+                    not_profiled_in: [],
                 };
                 let tooltipOutput = tooltip([datum]);
-                assert.isTrue(tooltipOutput.html().indexOf("Profiled in all selected molecular profiles.") > -1);
-                assert.equal(tooltipOutput.html().match(/\(1\)/g), null, "doesnt show (1) indicator for only one sample");
+                assert.isTrue(
+                    tooltipOutput
+                        .html()
+                        .indexOf(
+                            'Profiled in all selected molecular profiles.'
+                        ) > -1
+                );
+                assert.equal(
+                    tooltipOutput.html().match(/\(1\)/g),
+                    null,
+                    'doesnt show (1) indicator for only one sample'
+                );
 
                 tooltipOutput = tooltip([datum, datum]);
-                assert.isTrue(tooltipOutput.html().indexOf("Profiled in all selected molecular profiles. (2)") > -1);
+                assert.isTrue(
+                    tooltipOutput
+                        .html()
+                        .indexOf(
+                            'Profiled in all selected molecular profiles. (2)'
+                        ) > -1
+                );
 
                 tooltipOutput = tooltip([datum, datum, datum]);
-                assert.isTrue(tooltipOutput.html().indexOf("Profiled in all selected molecular profiles. (3)") > -1);
+                assert.isTrue(
+                    tooltipOutput
+                        .html()
+                        .indexOf(
+                            'Profiled in all selected molecular profiles. (3)'
+                        ) > -1
+                );
             });
             it("should give the correct spread of 'Not profiled' and 'Profiled' over multiple data", () => {
                 const notProfiled = {
-                    sample: "sample", study_id: "",
+                    sample: 'sample',
+                    study_id: '',
                     data: [] as AnnotatedExtendedAlteration[],
                     na: true,
                     profiled_in: [],
-                    not_profiled_in: [{ molecularProfileId: "profile" }, { molecularProfileId: "profile2" }, { molecularProfileId: "profile3" }]
+                    not_profiled_in: [
+                        { molecularProfileId: 'profile' },
+                        { molecularProfileId: 'profile2' },
+                        { molecularProfileId: 'profile3' },
+                    ],
                 };
                 const profiled = {
-                    sample: "sample", study_id: "",
+                    sample: 'sample',
+                    study_id: '',
                     data: [] as AnnotatedExtendedAlteration[],
                     na: true,
-                    profiled_in: [{ molecularProfileId: "profile" }, { molecularProfileId: "profile2" }, { molecularProfileId: "profile3" }],
-                    not_profiled_in: []
+                    profiled_in: [
+                        { molecularProfileId: 'profile' },
+                        { molecularProfileId: 'profile2' },
+                        { molecularProfileId: 'profile3' },
+                    ],
+                    not_profiled_in: [],
                 };
                 const datum1 = {
-                    sample: "sample", study_id: "",
+                    sample: 'sample',
+                    study_id: '',
                     data: [] as AnnotatedExtendedAlteration[],
                     na: true,
-                    profiled_in: [{ molecularProfileId: "profile" }],
-                    not_profiled_in: [{ molecularProfileId: "profile2" }, { molecularProfileId: "profile3" }]
+                    profiled_in: [{ molecularProfileId: 'profile' }],
+                    not_profiled_in: [
+                        { molecularProfileId: 'profile2' },
+                        { molecularProfileId: 'profile3' },
+                    ],
                 };
                 const datum2 = {
-                    sample: "sample", study_id: "",
+                    sample: 'sample',
+                    study_id: '',
                     data: [] as AnnotatedExtendedAlteration[],
                     na: true,
-                    profiled_in: [{ molecularProfileId: "profile" }, { molecularProfileId: "profile2" }],
-                    not_profiled_in: [{ molecularProfileId: "profile3" }]
+                    profiled_in: [
+                        { molecularProfileId: 'profile' },
+                        { molecularProfileId: 'profile2' },
+                    ],
+                    not_profiled_in: [{ molecularProfileId: 'profile3' }],
                 };
                 const datum3 = {
-                    sample: "sample", study_id: "",
+                    sample: 'sample',
+                    study_id: '',
                     data: [] as AnnotatedExtendedAlteration[],
                     na: true,
-                    profiled_in: [{ molecularProfileId: "profile2" }, { molecularProfileId: "profile3" }],
-                    not_profiled_in: [{ molecularProfileId: "profile" }]
+                    profiled_in: [
+                        { molecularProfileId: 'profile2' },
+                        { molecularProfileId: 'profile3' },
+                    ],
+                    not_profiled_in: [{ molecularProfileId: 'profile' }],
                 };
 
-                let tooltipOutput = tooltip([notProfiled, profiled, notProfiled]);
-                assert.isTrue(tooltipOutput.html().indexOf("Not profiled in selected molecular profiles. (2)") > -1);
-                assert.isTrue(tooltipOutput.html().indexOf("Profiled in all selected molecular profiles. (1)") > -1);
-
-                tooltipOutput = tooltip([notProfiled, profiled, profiled, profiled]);
-                assert.isTrue(tooltipOutput.html().indexOf("Not profiled in selected molecular profiles. (1)") > -1);
-                assert.isTrue(tooltipOutput.html().indexOf("Profiled in all selected molecular profiles. (3)") > -1);
+                let tooltipOutput = tooltip([
+                    notProfiled,
+                    profiled,
+                    notProfiled,
+                ]);
+                assert.isTrue(
+                    tooltipOutput
+                        .html()
+                        .indexOf(
+                            'Not profiled in selected molecular profiles. (2)'
+                        ) > -1
+                );
+                assert.isTrue(
+                    tooltipOutput
+                        .html()
+                        .indexOf(
+                            'Profiled in all selected molecular profiles. (1)'
+                        ) > -1
+                );
+
+                tooltipOutput = tooltip([
+                    notProfiled,
+                    profiled,
+                    profiled,
+                    profiled,
+                ]);
+                assert.isTrue(
+                    tooltipOutput
+                        .html()
+                        .indexOf(
+                            'Not profiled in selected molecular profiles. (1)'
+                        ) > -1
+                );
+                assert.isTrue(
+                    tooltipOutput
+                        .html()
+                        .indexOf(
+                            'Profiled in all selected molecular profiles. (3)'
+                        ) > -1
+                );
 
                 tooltipOutput = tooltip([notProfiled, profiled]);
-                assert.isTrue(tooltipOutput.html().indexOf("Not profiled in selected molecular profiles. (1)") > -1);
-                assert.isTrue(tooltipOutput.html().indexOf("Profiled in all selected molecular profiles. (1)") > -1);
-
-                tooltipOutput = tooltip([notProfiled, profiled, notProfiled, profiled, profiled, profiled, notProfiled]);
-                assert.isTrue(tooltipOutput.html().indexOf("Not profiled in selected molecular profiles. (3)") > -1);
-                assert.isTrue(tooltipOutput.html().indexOf("Profiled in all selected molecular profiles. (4)") > -1);
+                assert.isTrue(
+                    tooltipOutput
+                        .html()
+                        .indexOf(
+                            'Not profiled in selected molecular profiles. (1)'
+                        ) > -1
+                );
+                assert.isTrue(
+                    tooltipOutput
+                        .html()
+                        .indexOf(
+                            'Profiled in all selected molecular profiles. (1)'
+                        ) > -1
+                );
+
+                tooltipOutput = tooltip([
+                    notProfiled,
+                    profiled,
+                    notProfiled,
+                    profiled,
+                    profiled,
+                    profiled,
+                    notProfiled,
+                ]);
+                assert.isTrue(
+                    tooltipOutput
+                        .html()
+                        .indexOf(
+                            'Not profiled in selected molecular profiles. (3)'
+                        ) > -1
+                );
+                assert.isTrue(
+                    tooltipOutput
+                        .html()
+                        .indexOf(
+                            'Profiled in all selected molecular profiles. (4)'
+                        ) > -1
+                );
 
                 tooltipOutput = tooltip([datum1, datum2, datum3]);
-                assert.isTrue(tooltipOutput.html().indexOf("Not profiled in selected molecular profiles.") === -1, "None are profiled in none");
-                assert.isTrue(tooltipOutput.html().indexOf("Profiled in all selected molecular profiles.") === -1, "None are profiled in all");
-                assert.isTrue(tooltipOutput.html().indexOf("Profiled in: Profile (2), Profile2 (2), Profile3 (1)") > -1, "all the counts are correct (order is arbitrary)");
-                assert.isTrue(tooltipOutput.html().indexOf("Not profiled in: Profile2 (1), Profile3 (2), Profile (1)") > -1, "all the counts are correct (order is arbitrary)");
-
-                tooltipOutput = tooltip([datum1, datum2, datum3, profiled, notProfiled, profiled]);
+                assert.isTrue(
+                    tooltipOutput
+                        .html()
+                        .indexOf(
+                            'Not profiled in selected molecular profiles.'
+                        ) === -1,
+                    'None are profiled in none'
+                );
+                assert.isTrue(
+                    tooltipOutput
+                        .html()
+                        .indexOf(
+                            'Profiled in all selected molecular profiles.'
+                        ) === -1,
+                    'None are profiled in all'
+                );
+                assert.isTrue(
+                    tooltipOutput
+                        .html()
+                        .indexOf(
+                            'Profiled in: Profile (2), Profile2 (2), Profile3 (1)'
+                        ) > -1,
+                    'all the counts are correct (order is arbitrary)'
+                );
+                assert.isTrue(
+                    tooltipOutput
+                        .html()
+                        .indexOf(
+                            'Not profiled in: Profile2 (1), Profile3 (2), Profile (1)'
+                        ) > -1,
+                    'all the counts are correct (order is arbitrary)'
+                );
+
+                tooltipOutput = tooltip([
+                    datum1,
+                    datum2,
+                    datum3,
+                    profiled,
+                    notProfiled,
+                    profiled,
+                ]);
                 // it shows the right number of "not profiled in any" and "profiled in all", and also adds those counts to the specific profile counts
-                assert.isTrue(tooltipOutput.html().indexOf("Not profiled in selected molecular profiles. (1)") > -1);
-                assert.isTrue(tooltipOutput.html().indexOf("Profiled in all selected molecular profiles. (2)") > -1);
-                assert.isTrue(tooltipOutput.html().indexOf("Profiled in: Profile (4), Profile2 (4), Profile3 (3)") > -1, "all the counts are correct (order is arbitrary)");
-                assert.isTrue(tooltipOutput.html().indexOf("Not profiled in: Profile2 (2), Profile3 (3), Profile (2)") > -1, "all the counts are correct (order is arbitrary)");
+                assert.isTrue(
+                    tooltipOutput
+                        .html()
+                        .indexOf(
+                            'Not profiled in selected molecular profiles. (1)'
+                        ) > -1
+                );
+                assert.isTrue(
+                    tooltipOutput
+                        .html()
+                        .indexOf(
+                            'Profiled in all selected molecular profiles. (2)'
+                        ) > -1
+                );
+                assert.isTrue(
+                    tooltipOutput
+                        .html()
+                        .indexOf(
+                            'Profiled in: Profile (4), Profile2 (4), Profile3 (3)'
+                        ) > -1,
+                    'all the counts are correct (order is arbitrary)'
+                );
+                assert.isTrue(
+                    tooltipOutput
+                        .html()
+                        .indexOf(
+                            'Not profiled in: Profile2 (2), Profile3 (3), Profile (2)'
+                        ) > -1,
+                    'all the counts are correct (order is arbitrary)'
+                );
             });
         });
-        describe("gene panel information", () => {
-            it("should show the correct gene panel entries in the tooltip, single and multiple data", () => {
+        describe('gene panel information', () => {
+            it('should show the correct gene panel entries in the tooltip, single and multiple data', () => {
                 const datum1 = {
-                    sample: "sample", study_id: "",
+                    sample: 'sample',
+                    study_id: '',
                     data: [] as AnnotatedExtendedAlteration[],
                     na: true,
-                    profiled_in: [{ molecularProfileId: "profile", genePanelId: "panel1" }, { molecularProfileId: "profile", genePanelId: "panel2" }, { molecularProfileId: "profile2", genePanelId: "panel3" }],
-                    not_profiled_in: []
+                    profiled_in: [
+                        {
+                            molecularProfileId: 'profile',
+                            genePanelId: 'panel1',
+                        },
+                        {
+                            molecularProfileId: 'profile',
+                            genePanelId: 'panel2',
+                        },
+                        {
+                            molecularProfileId: 'profile2',
+                            genePanelId: 'panel3',
+                        },
+                    ],
+                    not_profiled_in: [],
                 };
                 const datum2 = {
-                    sample: "sample", study_id: "",
+                    sample: 'sample',
+                    study_id: '',
                     data: [] as AnnotatedExtendedAlteration[],
                     na: true,
                     profiled_in: [],
-                    not_profiled_in: [{ molecularProfileId: "profile", genePanelId: "panel1" }, { molecularProfileId: "profile", genePanelId: "panel2" }, { molecularProfileId: "profile2", genePanelId: "panel3" }]
+                    not_profiled_in: [
+                        {
+                            molecularProfileId: 'profile',
+                            genePanelId: 'panel1',
+                        },
+                        {
+                            molecularProfileId: 'profile',
+                            genePanelId: 'panel2',
+                        },
+                        {
+                            molecularProfileId: 'profile2',
+                            genePanelId: 'panel3',
+                        },
+                    ],
                 };
                 const datum3 = {
-                    sample: "sample", study_id: "",
+                    sample: 'sample',
+                    study_id: '',
                     data: [] as AnnotatedExtendedAlteration[],
                     na: true,
-                    profiled_in: [{ molecularProfileId: "profile", genePanelId: "panel1" }, { molecularProfileId: "profile", genePanelId: "panel2" }],
-                    not_profiled_in: [{ molecularProfileId: "profile2", genePanelId: "panel3" }]
+                    profiled_in: [
+                        {
+                            molecularProfileId: 'profile',
+                            genePanelId: 'panel1',
+                        },
+                        {
+                            molecularProfileId: 'profile',
+                            genePanelId: 'panel2',
+                        },
+                    ],
+                    not_profiled_in: [
+                        {
+                            molecularProfileId: 'profile2',
+                            genePanelId: 'panel3',
+                        },
+                    ],
                 };
 
                 let tooltipOutput = tooltip([datum1]);
@@ -526,106 +1287,286 @@ describe("Oncoprint TooltipUtils", () => {
                 assert.equal(tooltipOutput.text().match(/panel1/g)!.length, 1);
                 assert.equal(tooltipOutput.text().match(/panel2/g)!.length, 1);
                 assert.equal(tooltipOutput.text().match(/panel3/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/panel1 \(1\)/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/panel2 \(1\)/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/panel3 \(1\)/g)!.length, 1);
-                assert.notEqual(tooltipOutput.find('a:contains("panel1")').first().css("color"), "red");
-                assert.notEqual(tooltipOutput.find('a:contains("panel2")').first().css("color"), "red");
-                assert.notEqual(tooltipOutput.find('a:contains("panel3")').first().css("color"), "red");
+                assert.equal(
+                    tooltipOutput.text().match(/panel1 \(1\)/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/panel2 \(1\)/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/panel3 \(1\)/g)!.length,
+                    1
+                );
+                assert.notEqual(
+                    tooltipOutput
+                        .find('a:contains("panel1")')
+                        .first()
+                        .css('color'),
+                    'red'
+                );
+                assert.notEqual(
+                    tooltipOutput
+                        .find('a:contains("panel2")')
+                        .first()
+                        .css('color'),
+                    'red'
+                );
+                assert.notEqual(
+                    tooltipOutput
+                        .find('a:contains("panel3")')
+                        .first()
+                        .css('color'),
+                    'red'
+                );
 
                 tooltipOutput = tooltip([datum1, datum3]);
                 assert.equal(tooltipOutput.text().match(/panel1/g)!.length, 1);
                 assert.equal(tooltipOutput.text().match(/panel2/g)!.length, 1);
                 assert.equal(tooltipOutput.text().match(/panel3/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/panel1 \(2\)/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/panel2 \(2\)/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/panel3 \(1\)/g)!.length, 1);
-                assert.notEqual(tooltipOutput.find('a:contains("panel1")').first().css("color"), "red");
-                assert.notEqual(tooltipOutput.find('a:contains("panel2")').first().css("color"), "red");
-                assert.notEqual(tooltipOutput.find('a:contains("panel3")').first().css("color"), "red");
+                assert.equal(
+                    tooltipOutput.text().match(/panel1 \(2\)/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/panel2 \(2\)/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/panel3 \(1\)/g)!.length,
+                    1
+                );
+                assert.notEqual(
+                    tooltipOutput
+                        .find('a:contains("panel1")')
+                        .first()
+                        .css('color'),
+                    'red'
+                );
+                assert.notEqual(
+                    tooltipOutput
+                        .find('a:contains("panel2")')
+                        .first()
+                        .css('color'),
+                    'red'
+                );
+                assert.notEqual(
+                    tooltipOutput
+                        .find('a:contains("panel3")')
+                        .first()
+                        .css('color'),
+                    'red'
+                );
 
                 tooltipOutput = tooltip([datum3, datum2]);
                 assert.equal(tooltipOutput.text().match(/panel1/g)!.length, 1);
                 assert.equal(tooltipOutput.text().match(/panel2/g)!.length, 1);
                 assert.equal(tooltipOutput.text().match(/panel3/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/panel1 \(1\)/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/panel2 \(1\)/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/panel3 \(2\)/g)!.length, 1);
-                assert.notEqual(tooltipOutput.find('a:contains("panel1")').first().css("color"), "red");
-                assert.notEqual(tooltipOutput.find('a:contains("panel2")').first().css("color"), "red");
-                assert.equal(tooltipOutput.find('a:contains("panel3")').first().css("color"), "red", "red because Not profiled in that gene panel");
+                assert.equal(
+                    tooltipOutput.text().match(/panel1 \(1\)/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/panel2 \(1\)/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/panel3 \(2\)/g)!.length,
+                    1
+                );
+                assert.notEqual(
+                    tooltipOutput
+                        .find('a:contains("panel1")')
+                        .first()
+                        .css('color'),
+                    'red'
+                );
+                assert.notEqual(
+                    tooltipOutput
+                        .find('a:contains("panel2")')
+                        .first()
+                        .css('color'),
+                    'red'
+                );
+                assert.equal(
+                    tooltipOutput
+                        .find('a:contains("panel3")')
+                        .first()
+                        .css('color'),
+                    'red',
+                    'red because Not profiled in that gene panel'
+                );
 
                 tooltipOutput = tooltip([datum3, datum1, datum2]);
                 assert.equal(tooltipOutput.text().match(/panel1/g)!.length, 1);
                 assert.equal(tooltipOutput.text().match(/panel2/g)!.length, 1);
                 assert.equal(tooltipOutput.text().match(/panel3/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/panel1 \(2\)/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/panel2 \(2\)/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/panel3 \(1\)/g)!.length, 1);
-                assert.notEqual(tooltipOutput.find('a:contains("panel1")').first().css("color"), "red");
-                assert.notEqual(tooltipOutput.find('a:contains("panel2")').first().css("color"), "red");
-                assert.notEqual(tooltipOutput.find('a:contains("panel3")').first().css("color"), "red");
+                assert.equal(
+                    tooltipOutput.text().match(/panel1 \(2\)/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/panel2 \(2\)/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/panel3 \(1\)/g)!.length,
+                    1
+                );
+                assert.notEqual(
+                    tooltipOutput
+                        .find('a:contains("panel1")')
+                        .first()
+                        .css('color'),
+                    'red'
+                );
+                assert.notEqual(
+                    tooltipOutput
+                        .find('a:contains("panel2")')
+                        .first()
+                        .css('color'),
+                    'red'
+                );
+                assert.notEqual(
+                    tooltipOutput
+                        .find('a:contains("panel3")')
+                        .first()
+                        .css('color'),
+                    'red'
+                );
             });
         });
-        describe("genetic alterations", () => {
+        describe('genetic alterations', () => {
             let datum: any;
             let emptyDatum: any;
             let tooltipOutput: JQuery;
             beforeEach(() => {
                 datum = {
-                    sample: "sample", study_id: "",
+                    sample: 'sample',
+                    study_id: '',
                     data: [] as AnnotatedExtendedAlteration[],
                     na: false,
                     profiled_in: [],
-                    not_profiled_in: []
+                    not_profiled_in: [],
                 };
                 emptyDatum = {
-                    sample: "sample", study_id: "",
+                    sample: 'sample',
+                    study_id: '',
                     data: [] as AnnotatedExtendedAlteration[],
                     na: false,
                     profiled_in: [],
-                    not_profiled_in: []
+                    not_profiled_in: [],
                 };
             });
-            it("single genetic alteration in single case - mutation", () => {
-                datum.data = [makeMutation({ proteinChange: "PC1" })];
+            it('single genetic alteration in single case - mutation', () => {
+                datum.data = [makeMutation({ proteinChange: 'PC1' })];
                 tooltipOutput = tooltip([datum]);
-                assert.equal(tooltipOutput.text().match(/Mutation:/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE PC1/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/\(\d+\)/g), null, "no number indicator for single case");
+                assert.equal(
+                    tooltipOutput.text().match(/Mutation:/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/GENE PC1/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/\(\d+\)/g),
+                    null,
+                    'no number indicator for single case'
+                );
 
-                datum.data = [makeMutation({ proteinChange: "PC1" }), makeMutation({ proteinChange: "PC1" })];
+                datum.data = [
+                    makeMutation({ proteinChange: 'PC1' }),
+                    makeMutation({ proteinChange: 'PC1' }),
+                ];
                 tooltipOutput = tooltip([datum]);
-                assert.equal(tooltipOutput.text().match(/Mutation:/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE PC1/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/\(\d+\)/g), null, "no number indicator for single case");
+                assert.equal(
+                    tooltipOutput.text().match(/Mutation:/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/GENE PC1/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/\(\d+\)/g),
+                    null,
+                    'no number indicator for single case'
+                );
             });
-            it("single genetic alteration in single case - fusion", () => {
-                datum.data = [makeFusion({ proteinChange: "PC1" })];
+            it('single genetic alteration in single case - fusion', () => {
+                datum.data = [makeFusion({ proteinChange: 'PC1' })];
                 tooltipOutput = tooltip([datum]);
                 assert.equal(tooltipOutput.text().match(/Fusion:/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE PC1/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/\(\d+\)/g), null, "no number indicator for single case");
+                assert.equal(
+                    tooltipOutput.text().match(/GENE PC1/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/\(\d+\)/g),
+                    null,
+                    'no number indicator for single case'
+                );
 
-                datum.data = [makeFusion({ proteinChange: "PC1" }), makeFusion({ proteinChange: "PC1" })];
+                datum.data = [
+                    makeFusion({ proteinChange: 'PC1' }),
+                    makeFusion({ proteinChange: 'PC1' }),
+                ];
                 tooltipOutput = tooltip([datum]);
                 assert.equal(tooltipOutput.text().match(/Fusion:/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE PC1/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/\(\d+\)/g), null, "no number indicator for single case");
+                assert.equal(
+                    tooltipOutput.text().match(/GENE PC1/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/\(\d+\)/g),
+                    null,
+                    'no number indicator for single case'
+                );
             });
-            it("single genetic alteration in single case - cna", () => {
-                const disp_cna: { [integerCN: string]: string } = { '-2': 'HOMODELETED', '-1': 'HETLOSS', '1': 'GAIN', '2': 'AMPLIFIED' };
+            it('single genetic alteration in single case - cna', () => {
+                const disp_cna: { [integerCN: string]: string } = {
+                    '-2': 'HOMODELETED',
+                    '-1': 'HETLOSS',
+                    '1': 'GAIN',
+                    '2': 'AMPLIFIED',
+                };
                 for (let i = -2; i <= 2; i++) {
                     datum.data = [makeCna({ value: i })];
                     tooltipOutput = tooltip([datum]);
 
                     if (i === 0) {
                         // nothing in tooltip for diploid
-                        assert.equal(tooltipOutput.text().match(/Copy Number Alteration:/g), null);
+                        assert.equal(
+                            tooltipOutput
+                                .text()
+                                .match(/Copy Number Alteration:/g),
+                            null
+                        );
                     } else {
-                        assert.equal(tooltipOutput.text().match(/Copy Number Alteration:/g)!.length, 1);
-                        assert.equal(tooltipOutput.text().match(new RegExp(`GENE ${disp_cna[i.toString()]}`, "g"))!.length, 1);
-                        assert.equal(tooltipOutput.text().match(/\(\d+\)/g), null, "no number indicator for single case");
+                        assert.equal(
+                            tooltipOutput
+                                .text()
+                                .match(/Copy Number Alteration:/g)!.length,
+                            1
+                        );
+                        assert.equal(
+                            tooltipOutput
+                                .text()
+                                .match(
+                                    new RegExp(
+                                        `GENE ${disp_cna[i.toString()]}`,
+                                        'g'
+                                    )
+                                )!.length,
+                            1
+                        );
+                        assert.equal(
+                            tooltipOutput.text().match(/\(\d+\)/g),
+                            null,
+                            'no number indicator for single case'
+                        );
                     }
 
                     datum.data = [makeCna({ value: i }), makeCna({ value: i })];
@@ -633,463 +1574,1190 @@ describe("Oncoprint TooltipUtils", () => {
 
                     if (i === 0) {
                         // nothing in tooltip for diploid
-                        assert.equal(tooltipOutput.text().match(/Copy Number Alteration:/g), null);
+                        assert.equal(
+                            tooltipOutput
+                                .text()
+                                .match(/Copy Number Alteration:/g),
+                            null
+                        );
                     } else {
-                        assert.equal(tooltipOutput.text().match(/Copy Number Alteration:/g)!.length, 1);
-                        assert.equal(tooltipOutput.text().match(new RegExp(`GENE ${disp_cna[i.toString()]}`, "g"))!.length, 1);
-                        assert.equal(tooltipOutput.text().match(/\(\d+\)/g), null, "no number indicator for single case");
+                        assert.equal(
+                            tooltipOutput
+                                .text()
+                                .match(/Copy Number Alteration:/g)!.length,
+                            1
+                        );
+                        assert.equal(
+                            tooltipOutput
+                                .text()
+                                .match(
+                                    new RegExp(
+                                        `GENE ${disp_cna[i.toString()]}`,
+                                        'g'
+                                    )
+                                )!.length,
+                            1
+                        );
+                        assert.equal(
+                            tooltipOutput.text().match(/\(\d+\)/g),
+                            null,
+                            'no number indicator for single case'
+                        );
                     }
                 }
             });
-            it("single genetic alteration in single case - mrna", ()=>{
-                datum.data = [makeMrna({ alterationSubType:"high"})];
+            it('single genetic alteration in single case - mrna', () => {
+                datum.data = [makeMrna({ alterationSubType: 'high' })];
                 tooltipOutput = tooltip([datum]);
                 assert.equal(tooltipOutput.text().match(/MRNA:/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE HIGH/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/\(\d+\)/g), null, "no number indicator for single case");
+                assert.equal(
+                    tooltipOutput.text().match(/GENE HIGH/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/\(\d+\)/g),
+                    null,
+                    'no number indicator for single case'
+                );
 
-                datum.data = [makeMrna({ alterationSubType:"high"}), makeMrna({ alterationSubType:"high"})];
+                datum.data = [
+                    makeMrna({ alterationSubType: 'high' }),
+                    makeMrna({ alterationSubType: 'high' }),
+                ];
                 tooltipOutput = tooltip([datum]);
                 assert.equal(tooltipOutput.text().match(/MRNA:/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE HIGH/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/\(\d+\)/g), null, "no number indicator for single case");
-
-                datum.data = [makeMrna({ alterationSubType:"low"})];
+                assert.equal(
+                    tooltipOutput.text().match(/GENE HIGH/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/\(\d+\)/g),
+                    null,
+                    'no number indicator for single case'
+                );
+
+                datum.data = [makeMrna({ alterationSubType: 'low' })];
                 tooltipOutput = tooltip([datum]);
                 assert.equal(tooltipOutput.text().match(/MRNA:/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE LOW/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/\(\d+\)/g), null, "no number indicator for single case");
+                assert.equal(
+                    tooltipOutput.text().match(/GENE LOW/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/\(\d+\)/g),
+                    null,
+                    'no number indicator for single case'
+                );
 
-                datum.data = [makeMrna({ alterationSubType:"low"}), makeMrna({ alterationSubType:"low"})];
+                datum.data = [
+                    makeMrna({ alterationSubType: 'low' }),
+                    makeMrna({ alterationSubType: 'low' }),
+                ];
                 tooltipOutput = tooltip([datum]);
                 assert.equal(tooltipOutput.text().match(/MRNA:/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE LOW/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/\(\d+\)/g), null, "no number indicator for single case");
+                assert.equal(
+                    tooltipOutput.text().match(/GENE LOW/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/\(\d+\)/g),
+                    null,
+                    'no number indicator for single case'
+                );
             });
-            it("single genetic alteration in single case - prot", ()=>{
-                datum.data = [makeProt({ alterationSubType:"high"})];
+            it('single genetic alteration in single case - prot', () => {
+                datum.data = [makeProt({ alterationSubType: 'high' })];
                 tooltipOutput = tooltip([datum]);
                 assert.equal(tooltipOutput.text().match(/PROT:/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE HIGH/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/\(\d+\)/g), null, "no number indicator for single case");
+                assert.equal(
+                    tooltipOutput.text().match(/GENE HIGH/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/\(\d+\)/g),
+                    null,
+                    'no number indicator for single case'
+                );
 
-                datum.data = [makeProt({ alterationSubType:"high"}), makeProt({ alterationSubType:"high"})];
+                datum.data = [
+                    makeProt({ alterationSubType: 'high' }),
+                    makeProt({ alterationSubType: 'high' }),
+                ];
                 tooltipOutput = tooltip([datum]);
                 assert.equal(tooltipOutput.text().match(/PROT:/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE HIGH/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/\(\d+\)/g), null, "no number indicator for single case");
-
-                datum.data = [makeProt({ alterationSubType:"low"})];
+                assert.equal(
+                    tooltipOutput.text().match(/GENE HIGH/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/\(\d+\)/g),
+                    null,
+                    'no number indicator for single case'
+                );
+
+                datum.data = [makeProt({ alterationSubType: 'low' })];
                 tooltipOutput = tooltip([datum]);
                 assert.equal(tooltipOutput.text().match(/PROT:/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE LOW/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/\(\d+\)/g), null, "no number indicator for single case");
+                assert.equal(
+                    tooltipOutput.text().match(/GENE LOW/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/\(\d+\)/g),
+                    null,
+                    'no number indicator for single case'
+                );
 
-                datum.data = [makeProt({ alterationSubType:"low"}), makeProt({ alterationSubType:"low"})];
+                datum.data = [
+                    makeProt({ alterationSubType: 'low' }),
+                    makeProt({ alterationSubType: 'low' }),
+                ];
                 tooltipOutput = tooltip([datum]);
                 assert.equal(tooltipOutput.text().match(/PROT:/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE LOW/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/\(\d+\)/g), null, "no number indicator for single case");
+                assert.equal(
+                    tooltipOutput.text().match(/GENE LOW/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/\(\d+\)/g),
+                    null,
+                    'no number indicator for single case'
+                );
             });
-            it("single genetic alteration across multiple cases - mutation", () => {
-                datum.data = [makeMutation({ proteinChange: "PC1" })];
+            it('single genetic alteration across multiple cases - mutation', () => {
+                datum.data = [makeMutation({ proteinChange: 'PC1' })];
                 tooltipOutput = tooltip([datum, datum, datum]);
-                assert.equal(tooltipOutput.text().match(/Mutation:/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE PC1\xa0\(3\)/g)!.length, 1);
+                assert.equal(
+                    tooltipOutput.text().match(/Mutation:/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/GENE PC1\xa0\(3\)/g)!.length,
+                    1
+                );
 
                 tooltipOutput = tooltip([datum, emptyDatum]);
-                assert.equal(tooltipOutput.text().match(/Mutation:/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE PC1\xa0\(1\)/g)!.length, 1);
+                assert.equal(
+                    tooltipOutput.text().match(/Mutation:/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/GENE PC1\xa0\(1\)/g)!.length,
+                    1
+                );
             });
-            it("single genetic alteration across multiple cases - fusion", () => {
-                datum.data = [makeFusion({ proteinChange: "PC1" })];
+            it('single genetic alteration across multiple cases - fusion', () => {
+                datum.data = [makeFusion({ proteinChange: 'PC1' })];
                 tooltipOutput = tooltip([datum, datum, datum]);
                 assert.equal(tooltipOutput.text().match(/Fusion:/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE PC1\xa0\(3\)/g)!.length, 1);
+                assert.equal(
+                    tooltipOutput.text().match(/GENE PC1\xa0\(3\)/g)!.length,
+                    1
+                );
 
                 tooltipOutput = tooltip([datum, emptyDatum]);
                 assert.equal(tooltipOutput.text().match(/Fusion:/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE PC1\xa0\(1\)/g)!.length, 1);
+                assert.equal(
+                    tooltipOutput.text().match(/GENE PC1\xa0\(1\)/g)!.length,
+                    1
+                );
             });
-            it("single genetic alteration across multiple cases - cna", () => {
-                const disp_cna: { [integerCN: string]: string } = { '-2': 'HOMODELETED', '-1': 'HETLOSS', '1': 'GAIN', '2': 'AMPLIFIED' };
+            it('single genetic alteration across multiple cases - cna', () => {
+                const disp_cna: { [integerCN: string]: string } = {
+                    '-2': 'HOMODELETED',
+                    '-1': 'HETLOSS',
+                    '1': 'GAIN',
+                    '2': 'AMPLIFIED',
+                };
                 for (let i = -2; i <= 2; i++) {
                     datum.data = [makeCna({ value: i })];
-                    tooltipOutput = tooltip([emptyDatum, datum, datum, datum, datum]);
+                    tooltipOutput = tooltip([
+                        emptyDatum,
+                        datum,
+                        datum,
+                        datum,
+                        datum,
+                    ]);
 
                     if (i === 0) {
                         // nothing in tooltip for diploid
-                        assert.equal(tooltipOutput.text().match(/Copy Number Alteration:/g), null);
+                        assert.equal(
+                            tooltipOutput
+                                .text()
+                                .match(/Copy Number Alteration:/g),
+                            null
+                        );
                     } else {
-                        assert.equal(tooltipOutput.text().match(/Copy Number Alteration:/g)!.length, 1);
-                        assert.equal(tooltipOutput.text().match(new RegExp(`GENE ${disp_cna[i.toString()]}\\xa0\\(4\\)`, "g"))!.length, 1);
+                        assert.equal(
+                            tooltipOutput
+                                .text()
+                                .match(/Copy Number Alteration:/g)!.length,
+                            1
+                        );
+                        assert.equal(
+                            tooltipOutput
+                                .text()
+                                .match(
+                                    new RegExp(
+                                        `GENE ${
+                                            disp_cna[i.toString()]
+                                        }\\xa0\\(4\\)`,
+                                        'g'
+                                    )
+                                )!.length,
+                            1
+                        );
                     }
                 }
             });
-            it("single genetic alteration across multiple cases - mrna", ()=>{
-                datum.data = [makeMrna({ alterationSubType:"high"})];
+            it('single genetic alteration across multiple cases - mrna', () => {
+                datum.data = [makeMrna({ alterationSubType: 'high' })];
                 tooltipOutput = tooltip([datum, datum]);
                 assert.equal(tooltipOutput.text().match(/MRNA:/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE HIGH\xa0\(2\)/g)!.length, 1);
+                assert.equal(
+                    tooltipOutput.text().match(/GENE HIGH\xa0\(2\)/g)!.length,
+                    1
+                );
 
-                datum.data = [makeMrna({ alterationSubType:"low"})];
+                datum.data = [makeMrna({ alterationSubType: 'low' })];
                 tooltipOutput = tooltip([datum, datum]);
                 assert.equal(tooltipOutput.text().match(/MRNA:/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE LOW\xa0\(2\)/g)!.length, 1);
+                assert.equal(
+                    tooltipOutput.text().match(/GENE LOW\xa0\(2\)/g)!.length,
+                    1
+                );
 
                 tooltipOutput = tooltip([emptyDatum, datum]);
                 assert.equal(tooltipOutput.text().match(/MRNA:/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE LOW\xa0\(1\)/g)!.length, 1);
+                assert.equal(
+                    tooltipOutput.text().match(/GENE LOW\xa0\(1\)/g)!.length,
+                    1
+                );
             });
-            it("single genetic alteration across multiple cases - prot", ()=>{
-                datum.data = [makeProt({ alterationSubType:"high"})];
+            it('single genetic alteration across multiple cases - prot', () => {
+                datum.data = [makeProt({ alterationSubType: 'high' })];
                 tooltipOutput = tooltip([datum, datum, datum, datum, datum]);
                 assert.equal(tooltipOutput.text().match(/PROT:/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE HIGH\xa0\(5\)/g)!.length, 1);
+                assert.equal(
+                    tooltipOutput.text().match(/GENE HIGH\xa0\(5\)/g)!.length,
+                    1
+                );
 
-                datum.data = [makeProt({ alterationSubType:"low"})];
+                datum.data = [makeProt({ alterationSubType: 'low' })];
                 tooltipOutput = tooltip([datum, datum, datum, datum, datum]);
                 assert.equal(tooltipOutput.text().match(/PROT:/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE LOW\xa0\(5\)/g)!.length, 1);
+                assert.equal(
+                    tooltipOutput.text().match(/GENE LOW\xa0\(5\)/g)!.length,
+                    1
+                );
             });
-            it("multiple alterations of same type in single case - mutation", () => {
-                datum.data = [makeMutation({ proteinChange: "PC1" }), makeMutation({ proteinChange: "PC2" })];
+            it('multiple alterations of same type in single case - mutation', () => {
+                datum.data = [
+                    makeMutation({ proteinChange: 'PC1' }),
+                    makeMutation({ proteinChange: 'PC2' }),
+                ];
                 tooltipOutput = tooltip([datum]);
-                assert.equal(tooltipOutput.text().match(/Mutation:/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE PC1/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE PC2/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/\(\d+\)/g), null, "no number indicator for single case");
+                assert.equal(
+                    tooltipOutput.text().match(/Mutation:/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/GENE PC1/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/GENE PC2/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/\(\d+\)/g),
+                    null,
+                    'no number indicator for single case'
+                );
             });
-            it("multiple alterations of same type in single case - fusion", () => {
-                datum.data = [makeFusion({ proteinChange: "PC1" }), makeFusion({ proteinChange: "PC2" })];
+            it('multiple alterations of same type in single case - fusion', () => {
+                datum.data = [
+                    makeFusion({ proteinChange: 'PC1' }),
+                    makeFusion({ proteinChange: 'PC2' }),
+                ];
                 tooltipOutput = tooltip([datum]);
                 assert.equal(tooltipOutput.text().match(/Fusion:/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE PC1/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE PC2/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/\(\d+\)/g), null, "no number indicator for single case");
+                assert.equal(
+                    tooltipOutput.text().match(/GENE PC1/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/GENE PC2/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/\(\d+\)/g),
+                    null,
+                    'no number indicator for single case'
+                );
             });
-            it("multiple alterations of same type in single case - cna", () => {
-                datum.data = [makeCna({ value: -2 }), makeCna({ value: -1 }), makeCna({ value: 1 })];
+            it('multiple alterations of same type in single case - cna', () => {
+                datum.data = [
+                    makeCna({ value: -2 }),
+                    makeCna({ value: -1 }),
+                    makeCna({ value: 1 }),
+                ];
                 tooltipOutput = tooltip([datum]);
-                assert.equal(tooltipOutput.text().match(/Copy Number Alteration:/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE HOMODELETED/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE HETLOSS/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE GAIN/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/\(\d+\)/g), null, "no number indicator for single case");
+                assert.equal(
+                    tooltipOutput.text().match(/Copy Number Alteration:/g)!
+                        .length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/GENE HOMODELETED/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/GENE HETLOSS/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/GENE GAIN/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/\(\d+\)/g),
+                    null,
+                    'no number indicator for single case'
+                );
             });
-            it("multiple alterations of same type in single case - mrna", ()=>{
-                datum.data = [makeMrna({ alterationSubType:"high"}), makeMrna({ alterationSubType:"low"}), makeMrna({ alterationSubType:"high"})];
+            it('multiple alterations of same type in single case - mrna', () => {
+                datum.data = [
+                    makeMrna({ alterationSubType: 'high' }),
+                    makeMrna({ alterationSubType: 'low' }),
+                    makeMrna({ alterationSubType: 'high' }),
+                ];
                 tooltipOutput = tooltip([datum]);
                 assert.equal(tooltipOutput.text().match(/MRNA:/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE HIGH/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE LOW/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/\(\d+\)/g), null, "no number indicator for single case");
+                assert.equal(
+                    tooltipOutput.text().match(/GENE HIGH/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/GENE LOW/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/\(\d+\)/g),
+                    null,
+                    'no number indicator for single case'
+                );
             });
-            it("multiple alterations of same type in single case - protein", ()=>{
-                datum.data = [makeProt({ alterationSubType:"low"}), makeProt({ alterationSubType:"low"}), makeProt({ alterationSubType:"high"})];
+            it('multiple alterations of same type in single case - protein', () => {
+                datum.data = [
+                    makeProt({ alterationSubType: 'low' }),
+                    makeProt({ alterationSubType: 'low' }),
+                    makeProt({ alterationSubType: 'high' }),
+                ];
                 tooltipOutput = tooltip([datum]);
                 assert.equal(tooltipOutput.text().match(/PROT:/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE HIGH/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE LOW/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/\(\d+\)/g), null, "no number indicator for single case");
+                assert.equal(
+                    tooltipOutput.text().match(/GENE HIGH/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/GENE LOW/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/\(\d+\)/g),
+                    null,
+                    'no number indicator for single case'
+                );
             });
-            it("multiple alterations of same type across multiple cases - mutation", () => {
-                datum.data = [makeMutation({ proteinChange: "PC1" }), makeMutation({ proteinChange: "PC2" })];
+            it('multiple alterations of same type across multiple cases - mutation', () => {
+                datum.data = [
+                    makeMutation({ proteinChange: 'PC1' }),
+                    makeMutation({ proteinChange: 'PC2' }),
+                ];
                 tooltipOutput = tooltip([datum, datum, datum]);
-                assert.equal(tooltipOutput.text().match(/Mutation:/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE PC1\xa0\(3\)/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE PC2\xa0\(3\)/g)!.length, 1);
+                assert.equal(
+                    tooltipOutput.text().match(/Mutation:/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/GENE PC1\xa0\(3\)/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/GENE PC2\xa0\(3\)/g)!.length,
+                    1
+                );
 
                 tooltipOutput = tooltip([datum, emptyDatum]);
-                assert.equal(tooltipOutput.text().match(/Mutation:/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE PC1\xa0\(1\)/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE PC2\xa0\(1\)/g)!.length, 1);
+                assert.equal(
+                    tooltipOutput.text().match(/Mutation:/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/GENE PC1\xa0\(1\)/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/GENE PC2\xa0\(1\)/g)!.length,
+                    1
+                );
             });
-            it("multiple alterations of same type across multiple cases - fusion", () => {
-                datum.data = [makeFusion({ proteinChange: "PC1" }), makeFusion({ proteinChange: "PC2" })];
+            it('multiple alterations of same type across multiple cases - fusion', () => {
+                datum.data = [
+                    makeFusion({ proteinChange: 'PC1' }),
+                    makeFusion({ proteinChange: 'PC2' }),
+                ];
                 tooltipOutput = tooltip([datum, datum, datum, datum]);
                 assert.equal(tooltipOutput.text().match(/Fusion:/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE PC1\xa0\(4\)/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE PC2\xa0\(4\)/g)!.length, 1);
+                assert.equal(
+                    tooltipOutput.text().match(/GENE PC1\xa0\(4\)/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/GENE PC2\xa0\(4\)/g)!.length,
+                    1
+                );
 
                 tooltipOutput = tooltip([datum, datum, emptyDatum, emptyDatum]);
                 assert.equal(tooltipOutput.text().match(/Fusion:/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE PC1\xa0\(2\)/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE PC2\xa0\(2\)/g)!.length, 1);
+                assert.equal(
+                    tooltipOutput.text().match(/GENE PC1\xa0\(2\)/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/GENE PC2\xa0\(2\)/g)!.length,
+                    1
+                );
             });
-            it("multiple alterations of same type across multiple cases - cna", () => {
-                datum.data = [makeCna({ value: -2 }), makeCna({ value: -1 }), makeCna({ value: 1 })];
+            it('multiple alterations of same type across multiple cases - cna', () => {
+                datum.data = [
+                    makeCna({ value: -2 }),
+                    makeCna({ value: -1 }),
+                    makeCna({ value: 1 }),
+                ];
                 tooltipOutput = tooltip([datum, datum, datum]);
-                assert.equal(tooltipOutput.text().match(/Copy Number Alteration:/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE HOMODELETED\xa0\(3\)/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE HETLOSS\xa0\(3\)/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE GAIN\xa0\(3\)/g)!.length, 1);
+                assert.equal(
+                    tooltipOutput.text().match(/Copy Number Alteration:/g)!
+                        .length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/GENE HOMODELETED\xa0\(3\)/g)!
+                        .length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/GENE HETLOSS\xa0\(3\)/g)!
+                        .length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/GENE GAIN\xa0\(3\)/g)!.length,
+                    1
+                );
 
                 tooltipOutput = tooltip([emptyDatum, emptyDatum, datum]);
-                assert.equal(tooltipOutput.text().match(/Copy Number Alteration:/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE HOMODELETED\xa0\(1\)/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE HETLOSS\xa0\(1\)/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE GAIN\xa0\(1\)/g)!.length, 1);
+                assert.equal(
+                    tooltipOutput.text().match(/Copy Number Alteration:/g)!
+                        .length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/GENE HOMODELETED\xa0\(1\)/g)!
+                        .length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/GENE HETLOSS\xa0\(1\)/g)!
+                        .length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/GENE GAIN\xa0\(1\)/g)!.length,
+                    1
+                );
             });
-            it("multiple alterations of same type across multiple cases - mrna", ()=>{
-                datum.data = [makeMrna({ alterationSubType:"high"}), makeMrna({ alterationSubType:"low"}), makeMrna({ alterationSubType:"high"})];
+            it('multiple alterations of same type across multiple cases - mrna', () => {
+                datum.data = [
+                    makeMrna({ alterationSubType: 'high' }),
+                    makeMrna({ alterationSubType: 'low' }),
+                    makeMrna({ alterationSubType: 'high' }),
+                ];
                 tooltipOutput = tooltip([datum, datum]);
                 assert.equal(tooltipOutput.text().match(/MRNA:/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE HIGH\xa0\(4\)/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE LOW\xa0\(2\)/g)!.length, 1);
-
-                tooltipOutput = tooltip([datum, datum, emptyDatum, emptyDatum, datum]);
+                assert.equal(
+                    tooltipOutput.text().match(/GENE HIGH\xa0\(4\)/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/GENE LOW\xa0\(2\)/g)!.length,
+                    1
+                );
+
+                tooltipOutput = tooltip([
+                    datum,
+                    datum,
+                    emptyDatum,
+                    emptyDatum,
+                    datum,
+                ]);
                 assert.equal(tooltipOutput.text().match(/MRNA:/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE HIGH\xa0\(6\)/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE LOW\xa0\(3\)/g)!.length, 1);
+                assert.equal(
+                    tooltipOutput.text().match(/GENE HIGH\xa0\(6\)/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/GENE LOW\xa0\(3\)/g)!.length,
+                    1
+                );
             });
-            it("multiple alterations of same type across multiple cases - protein", ()=>{
-                datum.data = [makeProt({ alterationSubType:"low"}), makeProt({ alterationSubType:"low"}), makeProt({ alterationSubType:"high"})];
+            it('multiple alterations of same type across multiple cases - protein', () => {
+                datum.data = [
+                    makeProt({ alterationSubType: 'low' }),
+                    makeProt({ alterationSubType: 'low' }),
+                    makeProt({ alterationSubType: 'high' }),
+                ];
                 tooltipOutput = tooltip([datum, datum, datum]);
                 assert.equal(tooltipOutput.text().match(/PROT:/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE HIGH\xa0\(3\)/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE LOW\xa0\(6\)/g)!.length, 1);
+                assert.equal(
+                    tooltipOutput.text().match(/GENE HIGH\xa0\(3\)/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/GENE LOW\xa0\(6\)/g)!.length,
+                    1
+                );
 
                 tooltipOutput = tooltip([datum, emptyDatum]);
                 assert.equal(tooltipOutput.text().match(/PROT:/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE HIGH\xa0\(1\)/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE LOW\xa0\(2\)/g)!.length, 1);
+                assert.equal(
+                    tooltipOutput.text().match(/GENE HIGH\xa0\(1\)/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/GENE LOW\xa0\(2\)/g)!.length,
+                    1
+                );
             });
-            it("multiple alterations of different types in single case", () => {
+            it('multiple alterations of different types in single case', () => {
                 datum.data = [
-                    makeMutation({proteinChange:"PC1"}), makeMutation({proteinChange:"PC2"}),
-                    makeFusion({proteinChange:"fusion1"}), makeFusion({proteinChange:"fusion2"}),
-                    makeCna({value:2}),makeCna({value:-2}),
-                    makeMrna({ alterationSubType:"high"}), makeMrna({ alterationSubType:"low"}),
-                    makeProt({ alterationSubType:"low"})
+                    makeMutation({ proteinChange: 'PC1' }),
+                    makeMutation({ proteinChange: 'PC2' }),
+                    makeFusion({ proteinChange: 'fusion1' }),
+                    makeFusion({ proteinChange: 'fusion2' }),
+                    makeCna({ value: 2 }),
+                    makeCna({ value: -2 }),
+                    makeMrna({ alterationSubType: 'high' }),
+                    makeMrna({ alterationSubType: 'low' }),
+                    makeProt({ alterationSubType: 'low' }),
                 ];
                 tooltipOutput = tooltip([datum]);
-                assert.equal(tooltipOutput.text().match(/Mutation:/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE PC1/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE PC2/g)!.length, 1);
+                assert.equal(
+                    tooltipOutput.text().match(/Mutation:/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/GENE PC1/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/GENE PC2/g)!.length,
+                    1
+                );
 
                 assert.equal(tooltipOutput.text().match(/Fusion:/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE fusion1/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE fusion2/g)!.length, 1);
-
-                assert.equal(tooltipOutput.text().match(/Copy Number Alteration:/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE AMPLIFIED/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE HOMODELETED/g)!.length, 1);
+                assert.equal(
+                    tooltipOutput.text().match(/GENE fusion1/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/GENE fusion2/g)!.length,
+                    1
+                );
+
+                assert.equal(
+                    tooltipOutput.text().match(/Copy Number Alteration:/g)!
+                        .length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/GENE AMPLIFIED/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/GENE HOMODELETED/g)!.length,
+                    1
+                );
 
                 assert.equal(tooltipOutput.text().match(/MRNA:/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE HIGH/g)!.length, 1);
+                assert.equal(
+                    tooltipOutput.text().match(/GENE HIGH/g)!.length,
+                    1
+                );
                 assert.equal(tooltipOutput.text().match(/PROT:/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE LOW/g)!.length, 2); // (2 for mrna and protein)
-
-                assert.equal(tooltipOutput.text().match(/\(\d+\)/g), null, "no number indicator for single case");
+                assert.equal(
+                    tooltipOutput.text().match(/GENE LOW/g)!.length,
+                    2
+                ); // (2 for mrna and protein)
+
+                assert.equal(
+                    tooltipOutput.text().match(/\(\d+\)/g),
+                    null,
+                    'no number indicator for single case'
+                );
             });
-            it("multiple alterations of different types across multiple cases", () => {
+            it('multiple alterations of different types across multiple cases', () => {
                 datum.data = [
-                    makeMutation({proteinChange:"PC1"}), makeMutation({proteinChange:"PC2"}),
-                    makeFusion({proteinChange:"fusion1"}), makeFusion({proteinChange:"fusion2"}),
-                    makeCna({value:2}),makeCna({value:-2}),
-                    makeMrna({ alterationSubType:"high"}), makeMrna({ alterationSubType:"low"}),
-                    makeProt({ alterationSubType:"low"})
+                    makeMutation({ proteinChange: 'PC1' }),
+                    makeMutation({ proteinChange: 'PC2' }),
+                    makeFusion({ proteinChange: 'fusion1' }),
+                    makeFusion({ proteinChange: 'fusion2' }),
+                    makeCna({ value: 2 }),
+                    makeCna({ value: -2 }),
+                    makeMrna({ alterationSubType: 'high' }),
+                    makeMrna({ alterationSubType: 'low' }),
+                    makeProt({ alterationSubType: 'low' }),
                 ];
-                const datum2 = Object.assign({}, emptyDatum, { data:[
-                    makeMutation({proteinChange:"PC1"}),
-                    makeFusion({proteinChange:"fusion2"}),
-                    makeCna({value:1}),
-                    makeMrna({ alterationSubType:"low"}),
-                    makeProt({ alterationSubType:"high"}), makeProt({ alterationSubType:"low"})
-                ]});
-                tooltipOutput = tooltip([datum, datum, emptyDatum, datum, datum2]);
-                assert.equal(tooltipOutput.text().match(/Mutation:/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE PC1\xa0\(4\)/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE PC2\xa0\(3\)/g)!.length, 1);
+                const datum2 = Object.assign({}, emptyDatum, {
+                    data: [
+                        makeMutation({ proteinChange: 'PC1' }),
+                        makeFusion({ proteinChange: 'fusion2' }),
+                        makeCna({ value: 1 }),
+                        makeMrna({ alterationSubType: 'low' }),
+                        makeProt({ alterationSubType: 'high' }),
+                        makeProt({ alterationSubType: 'low' }),
+                    ],
+                });
+                tooltipOutput = tooltip([
+                    datum,
+                    datum,
+                    emptyDatum,
+                    datum,
+                    datum2,
+                ]);
+                assert.equal(
+                    tooltipOutput.text().match(/Mutation:/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/GENE PC1\xa0\(4\)/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/GENE PC2\xa0\(3\)/g)!.length,
+                    1
+                );
 
                 assert.equal(tooltipOutput.text().match(/Fusion:/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE fusion1\xa0\(3\)/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE fusion2\xa0\(4\)/g)!.length, 1);
-
-                assert.equal(tooltipOutput.text().match(/Copy Number Alteration:/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE AMPLIFIED\xa0\(3\)/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE GAIN\xa0\(1\)/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE HOMODELETED\xa0\(3\)/g)!.length, 1);
+                assert.equal(
+                    tooltipOutput.text().match(/GENE fusion1\xa0\(3\)/g)!
+                        .length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/GENE fusion2\xa0\(4\)/g)!
+                        .length,
+                    1
+                );
+
+                assert.equal(
+                    tooltipOutput.text().match(/Copy Number Alteration:/g)!
+                        .length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/GENE AMPLIFIED\xa0\(3\)/g)!
+                        .length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/GENE GAIN\xa0\(1\)/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/GENE HOMODELETED\xa0\(3\)/g)!
+                        .length,
+                    1
+                );
 
                 assert.equal(tooltipOutput.text().match(/MRNA:/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE HIGH\xa0\(3\)/g)!.length, 1);
+                assert.equal(
+                    tooltipOutput.text().match(/GENE HIGH\xa0\(3\)/g)!.length,
+                    1
+                );
                 assert.equal(tooltipOutput.text().match(/PROT:/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE HIGH\xa0\(1\)/g)!.length, 1);
-                assert.equal(tooltipOutput.text().match(/GENE LOW\xa0\(4\)/g)!.length, 2); // (2 for mrna and protein)
+                assert.equal(
+                    tooltipOutput.text().match(/GENE HIGH\xa0\(1\)/g)!.length,
+                    1
+                );
+                assert.equal(
+                    tooltipOutput.text().match(/GENE LOW\xa0\(4\)/g)!.length,
+                    2
+                ); // (2 for mrna and protein)
             });
         });
     });
-    describe("makeClinicalTrackTooltip", () => {
-        describe("category track tooltip", () => {
+    describe('makeClinicalTrackTooltip', () => {
+        describe('category track tooltip', () => {
             let trackLabel: string;
             let trackSpec: any;
             let tooltip: (dataUnderMouse: any[]) => JQuery;
             before(() => {
-                trackLabel = "label1234";
+                trackLabel = 'label1234';
                 trackSpec = {
-                    key: "",
+                    key: '',
                     label: trackLabel,
-                    description: "",
+                    description: '',
                     data: [],
-                    datatype: "string" as "string"
+                    datatype: 'string' as 'string',
                 };
                 tooltip = makeClinicalTrackTooltip(trackSpec, false);
             });
 
-            it("should show the given sample id", () => {
-                const sampleTooltipResult = tooltip([{ attr_val_counts: { "a": 1 }, attr_val: "a", sample: "sampleID" }]);
-                assert.isTrue(sampleTooltipResult.html().indexOf("<span>sampleID</span>") > -1);
+            it('should show the given sample id', () => {
+                const sampleTooltipResult = tooltip([
+                    {
+                        attr_val_counts: { a: 1 },
+                        attr_val: 'a',
+                        sample: 'sampleID',
+                    },
+                ]);
+                assert.isTrue(
+                    sampleTooltipResult
+                        .html()
+                        .indexOf('<span>sampleID</span>') > -1
+                );
             });
-            it("should show the given patient id", () => {
-                const patientTooltipResult = tooltip([{ attr_val_counts: { "a": 1 }, attr_val: "a", patient: "patientID" }]);
-                assert.isTrue(patientTooltipResult.html().indexOf("<span>patientID</span>") > -1);
+            it('should show the given patient id', () => {
+                const patientTooltipResult = tooltip([
+                    {
+                        attr_val_counts: { a: 1 },
+                        attr_val: 'a',
+                        patient: 'patientID',
+                    },
+                ]);
+                assert.isTrue(
+                    patientTooltipResult
+                        .html()
+                        .indexOf('<span>patientID</span>') > -1
+                );
             });
-            it("should show the correct output for a single value", () => {
-                const tooltipResult = tooltip([{ attr_val_counts: { "a": 1 }, attr_val: "a", sample: "sampleID" }]);
-                assert.isTrue(tooltipResult.html().indexOf(`label1234: <span style="white-space:nowrap; display:inline-block;"><b>a</b></span>`) > -1);
+            it('should show the correct output for a single value', () => {
+                const tooltipResult = tooltip([
+                    {
+                        attr_val_counts: { a: 1 },
+                        attr_val: 'a',
+                        sample: 'sampleID',
+                    },
+                ]);
+                assert.isTrue(
+                    tooltipResult
+                        .html()
+                        .indexOf(
+                            `label1234: <span style="white-space:nowrap; display:inline-block;"><b>a</b></span>`
+                        ) > -1
+                );
             });
-            it("should show the correct output for multiple values", () => {
-                const tooltipResult = tooltip([{ attr_val_counts: { "a": 1, "b": 3 }, attr_val: "a", sample: "sampleID" }]);
-                assert.isTrue(tooltipResult.html().indexOf(`label1234:<br><span style="white-space:nowrap; display:inline-block;"><b>a</b>: 1 sample</span><br><span style="white-space:nowrap; display:inline-block;"><b>b</b>: 3 samples</span>`) > -1);
+            it('should show the correct output for multiple values', () => {
+                const tooltipResult = tooltip([
+                    {
+                        attr_val_counts: { a: 1, b: 3 },
+                        attr_val: 'a',
+                        sample: 'sampleID',
+                    },
+                ]);
+                assert.isTrue(
+                    tooltipResult
+                        .html()
+                        .indexOf(
+                            `label1234:<br><span style="white-space:nowrap; display:inline-block;"><b>a</b>: 1 sample</span><br><span style="white-space:nowrap; display:inline-block;"><b>b</b>: 3 samples</span>`
+                        ) > -1
+                );
             });
-            it("should show the correct output for multiple data, single value", () => {
+            it('should show the correct output for multiple data, single value', () => {
                 const tooltipResult = tooltip([
-                    { attr_val_counts: { "a": 1 }, attr_val: "a", patient: "patientID" },
-                    { attr_val_counts: { "a": 1 }, attr_val: "a", patient: "patientID" },
-                    { attr_val_counts: { "a": 2 }, attr_val: "a", patient: "patientID" }
+                    {
+                        attr_val_counts: { a: 1 },
+                        attr_val: 'a',
+                        patient: 'patientID',
+                    },
+                    {
+                        attr_val_counts: { a: 1 },
+                        attr_val: 'a',
+                        patient: 'patientID',
+                    },
+                    {
+                        attr_val_counts: { a: 2 },
+                        attr_val: 'a',
+                        patient: 'patientID',
+                    },
                 ]);
-                assert.isTrue(tooltipResult.html().indexOf(`label1234: <span style="white-space:nowrap; display:inline-block;"><b>a</b> (4 samples)</span><br>`) > -1);
+                assert.isTrue(
+                    tooltipResult
+                        .html()
+                        .indexOf(
+                            `label1234: <span style="white-space:nowrap; display:inline-block;"><b>a</b> (4 samples)</span><br>`
+                        ) > -1
+                );
             });
-            it("should show the correct output for multiple data, multiple values", () => {
+            it('should show the correct output for multiple data, multiple values', () => {
                 const tooltip = makeClinicalTrackTooltip(trackSpec, false);
                 const tooltipResult = tooltip([
-                    { attr_val_counts: { "a": 1, "b": 5 }, attr_val: "a", patient: "patientID" },
-                    { attr_val_counts: { "a": 1 }, attr_val: "a", patient: "patientID" },
-                    { attr_val_counts: { "a": 2, "b": 1, "c": 1 }, attr_val: "a", patient: "patientID" }
+                    {
+                        attr_val_counts: { a: 1, b: 5 },
+                        attr_val: 'a',
+                        patient: 'patientID',
+                    },
+                    {
+                        attr_val_counts: { a: 1 },
+                        attr_val: 'a',
+                        patient: 'patientID',
+                    },
+                    {
+                        attr_val_counts: { a: 2, b: 1, c: 1 },
+                        attr_val: 'a',
+                        patient: 'patientID',
+                    },
                 ]);
-                assert.isTrue(tooltipResult.html().indexOf(
-                    `label1234:<br><span style="white-space:nowrap; display:inline-block;"><b>a</b>: 4 samples</span><br><span style="white-space:nowrap; display:inline-block;"><b>b</b>: 6 samples</span><br><span style="white-space:nowrap; display:inline-block;"><b>c</b>: 1 sample</span>`
-                ) > -1);
+                assert.isTrue(
+                    tooltipResult
+                        .html()
+                        .indexOf(
+                            `label1234:<br><span style="white-space:nowrap; display:inline-block;"><b>a</b>: 4 samples</span><br><span style="white-space:nowrap; display:inline-block;"><b>b</b>: 6 samples</span><br><span style="white-space:nowrap; display:inline-block;"><b>c</b>: 1 sample</span>`
+                        ) > -1
+                );
             });
         });
-        describe("number track tooltip", () => {
+        describe('number track tooltip', () => {
             let trackSpec: any;
             let tooltip: (dataUnderMouse: any[]) => JQuery;
             before(() => {
                 trackSpec = {
-                    key: "",
-                    label: "",
-                    description: "",
+                    key: '',
+                    label: '',
+                    description: '',
                     data: [],
-                    datatype: "number" as "number",
+                    datatype: 'number' as 'number',
                     numberRange: [0, 0] as [number, number],
-                    numberLogScale: false
+                    numberLogScale: false,
                 };
                 tooltip = makeClinicalTrackTooltip(trackSpec, false);
             });
-            it("should show numerical data rounded to 2 decimal digits", () => {
+            it('should show numerical data rounded to 2 decimal digits', () => {
                 // one data
-                let tooltipResult = tooltip([{ attr_val_counts: { "0.13500013531": 1 }, attr_val: "0.13500013531", sample: "sampleID" }]);
-                assert.isTrue(tooltipResult.html().indexOf("<b>0.14</b>") > -1, "correct result with no integer part");
-                tooltipResult = tooltip([{ attr_val_counts: { "6.100032": 1 }, attr_val: "6.100032", sample: "sampleID" }]);
-                assert.isTrue(tooltipResult.html().indexOf("<b>6.10</b>") > -1, "correct result with integer part");
-                tooltipResult = tooltip([{ attr_val_counts: { "0": 1 }, attr_val: "0", sample: "sampleID" }]);
-                assert.isTrue(tooltipResult.html().indexOf("<b>0</b>") > -1, "correct result for zero")
-                tooltipResult = tooltip([{ attr_val_counts: { "-0.13500013531": 1 }, attr_val: "-0.13500013531", sample: "sampleID" }]);
-                assert.isTrue(tooltipResult.html().indexOf("<b>-0.14</b>") > -1, "correct result with no integer part, negative");
-                tooltipResult = tooltip([{ attr_val_counts: { "-6.100032": 1 }, attr_val: "-6.100032", sample: "sampleID" }]);
-                assert.isTrue(tooltipResult.html().indexOf("<b>-6.10</b>") > -1, "correct result with integer part, negative");
+                let tooltipResult = tooltip([
+                    {
+                        attr_val_counts: { '0.13500013531': 1 },
+                        attr_val: '0.13500013531',
+                        sample: 'sampleID',
+                    },
+                ]);
+                assert.isTrue(
+                    tooltipResult.html().indexOf('<b>0.14</b>') > -1,
+                    'correct result with no integer part'
+                );
+                tooltipResult = tooltip([
+                    {
+                        attr_val_counts: { '6.100032': 1 },
+                        attr_val: '6.100032',
+                        sample: 'sampleID',
+                    },
+                ]);
+                assert.isTrue(
+                    tooltipResult.html().indexOf('<b>6.10</b>') > -1,
+                    'correct result with integer part'
+                );
+                tooltipResult = tooltip([
+                    {
+                        attr_val_counts: { '0': 1 },
+                        attr_val: '0',
+                        sample: 'sampleID',
+                    },
+                ]);
+                assert.isTrue(
+                    tooltipResult.html().indexOf('<b>0</b>') > -1,
+                    'correct result for zero'
+                );
+                tooltipResult = tooltip([
+                    {
+                        attr_val_counts: { '-0.13500013531': 1 },
+                        attr_val: '-0.13500013531',
+                        sample: 'sampleID',
+                    },
+                ]);
+                assert.isTrue(
+                    tooltipResult.html().indexOf('<b>-0.14</b>') > -1,
+                    'correct result with no integer part, negative'
+                );
+                tooltipResult = tooltip([
+                    {
+                        attr_val_counts: { '-6.100032': 1 },
+                        attr_val: '-6.100032',
+                        sample: 'sampleID',
+                    },
+                ]);
+                assert.isTrue(
+                    tooltipResult.html().indexOf('<b>-6.10</b>') > -1,
+                    'correct result with integer part, negative'
+                );
 
                 // multiple data
                 // more than one data
-                tooltipResult = tooltip([{ attr_val_counts: { "0.13500013531": 1 }, sample: "sampleID" }, { attr_val_counts: { "0.23500013531": 1 }, sample: "sampleID" }, { attr_val_counts: { "0.33500013531": 1 }, sample: "sampleID" }]);
-                assert.isTrue(tooltipResult.html().indexOf("<b>0.24 (average of 3 values)</b>") > -1, "multiple - correct result with no integer part");
-                tooltipResult = tooltip([{ attr_val_counts: { "6.100032": 1 }, sample: "sampleID" }, { attr_val_counts: { "8.100032": 1 }, sample: "sampleID" }]);
-                assert.isTrue(tooltipResult.html().indexOf("<b>7.10 (average of 2 values)</b>") > -1, "multiple - correct result with integer part");
-                tooltipResult = tooltip([{ attr_val_counts: { "0": 1 }, sample: "sampleID" }, { attr_val_counts: { "0": 1 }, sample: "sampleID" }, { attr_val_counts: { "0": 1 }, sample: "sampleID" }, { attr_val_counts: { "0": 1 }, sample: "sampleID" }]);
-                assert.isTrue(tooltipResult.html().indexOf("<b>0 (average of 4 values)</b>") > -1, "multiple - correct result for zero")
-                tooltipResult = tooltip([{ attr_val_counts: { "-0.03500013531": 2, "-0.23500013531": 2 }, sample: "sampleID" }]);
-                assert.isTrue(tooltipResult.html().indexOf("<b>-0.14 (average of 4 values)</b>") > -1, "correct result with no integer part, negative");
-                tooltipResult = tooltip([{ attr_val_counts: { "-5.100032": 1 }, sample: "sampleID" }, { attr_val_counts: { "-2.100032": 2 }, sample: "sampleID" }]);
-                assert.isTrue(tooltipResult.html().indexOf("<b>-3.10 (average of 3 values)</b>") > -1, "correct result with integer part, negative");
+                tooltipResult = tooltip([
+                    {
+                        attr_val_counts: { '0.13500013531': 1 },
+                        sample: 'sampleID',
+                    },
+                    {
+                        attr_val_counts: { '0.23500013531': 1 },
+                        sample: 'sampleID',
+                    },
+                    {
+                        attr_val_counts: { '0.33500013531': 1 },
+                        sample: 'sampleID',
+                    },
+                ]);
+                assert.isTrue(
+                    tooltipResult
+                        .html()
+                        .indexOf('<b>0.24 (average of 3 values)</b>') > -1,
+                    'multiple - correct result with no integer part'
+                );
+                tooltipResult = tooltip([
+                    { attr_val_counts: { '6.100032': 1 }, sample: 'sampleID' },
+                    { attr_val_counts: { '8.100032': 1 }, sample: 'sampleID' },
+                ]);
+                assert.isTrue(
+                    tooltipResult
+                        .html()
+                        .indexOf('<b>7.10 (average of 2 values)</b>') > -1,
+                    'multiple - correct result with integer part'
+                );
+                tooltipResult = tooltip([
+                    { attr_val_counts: { '0': 1 }, sample: 'sampleID' },
+                    { attr_val_counts: { '0': 1 }, sample: 'sampleID' },
+                    { attr_val_counts: { '0': 1 }, sample: 'sampleID' },
+                    { attr_val_counts: { '0': 1 }, sample: 'sampleID' },
+                ]);
+                assert.isTrue(
+                    tooltipResult
+                        .html()
+                        .indexOf('<b>0 (average of 4 values)</b>') > -1,
+                    'multiple - correct result for zero'
+                );
+                tooltipResult = tooltip([
+                    {
+                        attr_val_counts: {
+                            '-0.03500013531': 2,
+                            '-0.23500013531': 2,
+                        },
+                        sample: 'sampleID',
+                    },
+                ]);
+                assert.isTrue(
+                    tooltipResult
+                        .html()
+                        .indexOf('<b>-0.14 (average of 4 values)</b>') > -1,
+                    'correct result with no integer part, negative'
+                );
+                tooltipResult = tooltip([
+                    { attr_val_counts: { '-5.100032': 1 }, sample: 'sampleID' },
+                    { attr_val_counts: { '-2.100032': 2 }, sample: 'sampleID' },
+                ]);
+                assert.isTrue(
+                    tooltipResult
+                        .html()
+                        .indexOf('<b>-3.10 (average of 3 values)</b>') > -1,
+                    'correct result with integer part, negative'
+                );
             });
         });
     });
-    describe("makeHeatmapTrackTooltip", () => {
+    describe('makeHeatmapTrackTooltip', () => {
+        const tooltip = makeHeatmapTrackTooltip('MRNA_EXPRESSION', false);
 
-        const tooltip = makeHeatmapTrackTooltip("MRNA_EXPRESSION", false);
-
-        it("should show data rounded to 2 decimal digits", () => {
+        it('should show data rounded to 2 decimal digits', () => {
             // one data
-            let tooltipResult = tooltip([{ profile_data: 0.13500013531, sample: "sampleID" }]);
-            assert.isTrue(tooltipResult.html().indexOf("<b>0.14</b>") > -1, "correct result with no integer part");
-            tooltipResult = tooltip([{ profile_data: 6.100032, sample: "sampleID" }]);
-            assert.isTrue(tooltipResult.html().indexOf("<b>6.10</b>") > -1, "correct result with integer part");
-            tooltipResult = tooltip([{ profile_data: 0, sample: "sampleID" }]);
-            assert.isTrue(tooltipResult.html().indexOf("<b>0.00</b>") > -1, "correct result for zero")
-            tooltipResult = tooltip([{ profile_data: -0.13500013531, sample: "sampleID" }]);
-            assert.isTrue(tooltipResult.html().indexOf("<b>-0.14</b>") > -1, "correct result with no integer part, negative");
-            tooltipResult = tooltip([{ profile_data: -6.100032, sample: "sampleID" }]);
-            assert.isTrue(tooltipResult.html().indexOf("<b>-6.10</b>") > -1, "correct result with integer part, negative");
+            let tooltipResult = tooltip([
+                { profile_data: 0.13500013531, sample: 'sampleID' },
+            ]);
+            assert.isTrue(
+                tooltipResult.html().indexOf('<b>0.14</b>') > -1,
+                'correct result with no integer part'
+            );
+            tooltipResult = tooltip([
+                { profile_data: 6.100032, sample: 'sampleID' },
+            ]);
+            assert.isTrue(
+                tooltipResult.html().indexOf('<b>6.10</b>') > -1,
+                'correct result with integer part'
+            );
+            tooltipResult = tooltip([{ profile_data: 0, sample: 'sampleID' }]);
+            assert.isTrue(
+                tooltipResult.html().indexOf('<b>0.00</b>') > -1,
+                'correct result for zero'
+            );
+            tooltipResult = tooltip([
+                { profile_data: -0.13500013531, sample: 'sampleID' },
+            ]);
+            assert.isTrue(
+                tooltipResult.html().indexOf('<b>-0.14</b>') > -1,
+                'correct result with no integer part, negative'
+            );
+            tooltipResult = tooltip([
+                { profile_data: -6.100032, sample: 'sampleID' },
+            ]);
+            assert.isTrue(
+                tooltipResult.html().indexOf('<b>-6.10</b>') > -1,
+                'correct result with integer part, negative'
+            );
 
             // more than one data
-            tooltipResult = tooltip([{ profile_data: 0.13500013531, sample: "sampleID" }, { profile_data: 0.23500013531, sample: "sampleID" }, { profile_data: 0.33500013531, sample: "sampleID" }]);
-            assert.isTrue(tooltipResult.html().indexOf("<b>0.24 (average of 3 values)</b>") > -1, "multiple - correct result with no integer part");
-            tooltipResult = tooltip([{ profile_data: 6.100032, sample: "sampleID" }, { profile_data: 8.100032, sample: "sampleID" }]);
-            assert.isTrue(tooltipResult.html().indexOf("<b>7.10 (average of 2 values)</b>") > -1, "multiple - correct result with integer part");
-            tooltipResult = tooltip([{ profile_data: 0, sample: "sampleID" }, { profile_data: 0, sample: "sampleID" }, { profile_data: 0, sample: "sampleID" }, { profile_data: 0, sample: "sampleID" }]);
-            assert.isTrue(tooltipResult.html().indexOf("<b>0.00 (average of 4 values)</b>") > -1, "multiple - correct result for zero")
-            tooltipResult = tooltip([{ profile_data: -0.03500013531, sample: "sampleID" }, { profile_data: -0.03500013531, sample: "sampleID" }, { profile_data: -0.23500013531, sample: "sampleID" }, { profile_data: -0.23500013531, sample: "sampleID" }]);
-            assert.isTrue(tooltipResult.html().indexOf("<b>-0.14 (average of 4 values)</b>") > -1, "correct result with no integer part, negative");
-            tooltipResult = tooltip([{ profile_data: -6.100032, sample: "sampleID" }, { profile_data: -2.100032, sample: "sampleID" }]);
-            assert.isTrue(tooltipResult.html().indexOf("<b>-4.10 (average of 2 values)</b>") > -1, "correct result with integer part, negative");
-
+            tooltipResult = tooltip([
+                { profile_data: 0.13500013531, sample: 'sampleID' },
+                { profile_data: 0.23500013531, sample: 'sampleID' },
+                { profile_data: 0.33500013531, sample: 'sampleID' },
+            ]);
+            assert.isTrue(
+                tooltipResult
+                    .html()
+                    .indexOf('<b>0.24 (average of 3 values)</b>') > -1,
+                'multiple - correct result with no integer part'
+            );
+            tooltipResult = tooltip([
+                { profile_data: 6.100032, sample: 'sampleID' },
+                { profile_data: 8.100032, sample: 'sampleID' },
+            ]);
+            assert.isTrue(
+                tooltipResult
+                    .html()
+                    .indexOf('<b>7.10 (average of 2 values)</b>') > -1,
+                'multiple - correct result with integer part'
+            );
+            tooltipResult = tooltip([
+                { profile_data: 0, sample: 'sampleID' },
+                { profile_data: 0, sample: 'sampleID' },
+                { profile_data: 0, sample: 'sampleID' },
+                { profile_data: 0, sample: 'sampleID' },
+            ]);
+            assert.isTrue(
+                tooltipResult
+                    .html()
+                    .indexOf('<b>0.00 (average of 4 values)</b>') > -1,
+                'multiple - correct result for zero'
+            );
+            tooltipResult = tooltip([
+                { profile_data: -0.03500013531, sample: 'sampleID' },
+                { profile_data: -0.03500013531, sample: 'sampleID' },
+                { profile_data: -0.23500013531, sample: 'sampleID' },
+                { profile_data: -0.23500013531, sample: 'sampleID' },
+            ]);
+            assert.isTrue(
+                tooltipResult
+                    .html()
+                    .indexOf('<b>-0.14 (average of 4 values)</b>') > -1,
+                'correct result with no integer part, negative'
+            );
+            tooltipResult = tooltip([
+                { profile_data: -6.100032, sample: 'sampleID' },
+                { profile_data: -2.100032, sample: 'sampleID' },
+            ]);
+            assert.isTrue(
+                tooltipResult
+                    .html()
+                    .indexOf('<b>-4.10 (average of 2 values)</b>') > -1,
+                'correct result with integer part, negative'
+            );
         });
 
         it('Should not handle categories for molecular genetic alterations', () => {
-            const tooltipResult = tooltip([{ profile_data: 8, sample: "sampleID", category: ">8.00" }]);
-            assert.isTrue(tooltipResult.html().indexOf("<b>8.00</b>") > -1, "molecular track - category is ignored when available");
+            const tooltipResult = tooltip([
+                { profile_data: 8, sample: 'sampleID', category: '>8.00' },
+            ]);
+            assert.isTrue(
+                tooltipResult.html().indexOf('<b>8.00</b>') > -1,
+                'molecular track - category is ignored when available'
+            );
         });
 
-        const fTreamentTooltip = makeHeatmapTrackTooltip("GENERIC_ASSAY", false);
+        const fTreamentTooltip = makeHeatmapTrackTooltip(
+            'GENERIC_ASSAY',
+            false
+        );
 
         it('Should handle categories for treatment genetic alterations', () => {
-            const tooltipResult = fTreamentTooltip([{ profile_data: 8, sample: "sampleID", category: ">8.00" }]);
-            assert.isTrue(tooltipResult.html().indexOf("<b>&gt;8.00</b>") > -1, "treatment - category is displayed when available");
+            const tooltipResult = fTreamentTooltip([
+                { profile_data: 8, sample: 'sampleID', category: '>8.00' },
+            ]);
+            assert.isTrue(
+                tooltipResult.html().indexOf('<b>&gt;8.00</b>') > -1,
+                'treatment - category is displayed when available'
+            );
         });
 
         it('Should handle categories for multiple treatment genetic alterations', () => {
-            const tooltipResult = fTreamentTooltip([{ profile_data: 8, sample: "sampleID", category: ">8.00" }, { profile_data: 7, sample: "sampleID", category: ">7.00" }]);
-            assert.isTrue(tooltipResult.html().indexOf("<b>&gt;8.00, &gt;7.00 (2 data points)</b>") > -1, "treatment - multiple categories are displayed when under mouse");
+            const tooltipResult = fTreamentTooltip([
+                { profile_data: 8, sample: 'sampleID', category: '>8.00' },
+                { profile_data: 7, sample: 'sampleID', category: '>7.00' },
+            ]);
+            assert.isTrue(
+                tooltipResult
+                    .html()
+                    .indexOf('<b>&gt;8.00, &gt;7.00 (2 data points)</b>') > -1,
+                'treatment - multiple categories are displayed when under mouse'
+            );
         });
 
         it('Should handle single values and single category for multiple treatment genetic alterations', () => {
-            const tooltipResult = fTreamentTooltip([{ profile_data: 8, sample: "sampleID", category: "" }, { profile_data: 7, sample: "sampleID", category: ">7.00" }]);
-            assert.isTrue(tooltipResult.html().indexOf("<b>8.00</b> and <b>&gt;7.00</b>") > -1, "treatment - multiple categories are displayed when under mouse");
+            const tooltipResult = fTreamentTooltip([
+                { profile_data: 8, sample: 'sampleID', category: '' },
+                { profile_data: 7, sample: 'sampleID', category: '>7.00' },
+            ]);
+            assert.isTrue(
+                tooltipResult
+                    .html()
+                    .indexOf('<b>8.00</b> and <b>&gt;7.00</b>') > -1,
+                'treatment - multiple categories are displayed when under mouse'
+            );
         });
 
         it('Should handle multiple values and multiple categories for multiple treatment genetic alterations', () => {
-            const tooltipResult = fTreamentTooltip([{ profile_data: 6, sample: "sampleID", category: "" }, { profile_data: 8, sample: "sampleID", category: "" }, { profile_data: 7, sample: "sampleID", category: ">7.00" }, { profile_data: 7, sample: "sampleID", category: ">7.00" }, { profile_data: 9, sample: "sampleID", category: ">9.00" }]);
-            assert.isTrue(tooltipResult.html().indexOf("<b>7.00 (average of 2 values)</b> and <b>&gt;7.00, &gt;9.00 (3 data points)</b>") > -1, "treatment - multiple values and categories (unique) are displayed when under mouse");
+            const tooltipResult = fTreamentTooltip([
+                { profile_data: 6, sample: 'sampleID', category: '' },
+                { profile_data: 8, sample: 'sampleID', category: '' },
+                { profile_data: 7, sample: 'sampleID', category: '>7.00' },
+                { profile_data: 7, sample: 'sampleID', category: '>7.00' },
+                { profile_data: 9, sample: 'sampleID', category: '>9.00' },
+            ]);
+            assert.isTrue(
+                tooltipResult
+                    .html()
+                    .indexOf(
+                        '<b>7.00 (average of 2 values)</b> and <b>&gt;7.00, &gt;9.00 (3 data points)</b>'
+                    ) > -1,
+                'treatment - multiple values and categories (unique) are displayed when under mouse'
+            );
         });
-
     });
-    describe("makeGeneticTrackTooltip_getCoverageInformation", () => {
-        it("gives correct results on undefined input", () => {
+    describe('makeGeneticTrackTooltip_getCoverageInformation', () => {
+        it('gives correct results on undefined input', () => {
             assert.deepEqual(
-                makeGeneticTrackTooltip_getCoverageInformation(undefined, undefined),
+                makeGeneticTrackTooltip_getCoverageInformation(
+                    undefined,
+                    undefined
+                ),
                 {
                     dispProfiledGenePanelIds: [],
                     dispNotProfiledGenePanelIds: [],
                     dispProfiledIn: undefined,
                     dispNotProfiledIn: undefined,
                     dispAllProfiled: false,
-                    dispNotProfiled: false
+                    dispNotProfiled: false,
                 }
             );
         });
-        it("gives correct results on empty input", () => {
+        it('gives correct results on empty input', () => {
             assert.deepEqual(
                 makeGeneticTrackTooltip_getCoverageInformation([], []),
                 {
@@ -1098,11 +2766,11 @@ describe("Oncoprint TooltipUtils", () => {
                     dispProfiledIn: [],
                     dispNotProfiledIn: [],
                     dispAllProfiled: false,
-                    dispNotProfiled: false
+                    dispNotProfiled: false,
                 }
             );
         });
-        it("gives correct results with empty profiled_in but no not_profiled_in", () => {
+        it('gives correct results with empty profiled_in but no not_profiled_in', () => {
             assert.deepEqual(
                 makeGeneticTrackTooltip_getCoverageInformation([], undefined),
                 {
@@ -1111,11 +2779,11 @@ describe("Oncoprint TooltipUtils", () => {
                     dispProfiledIn: [],
                     dispNotProfiledIn: undefined,
                     dispAllProfiled: false,
-                    dispNotProfiled: false
+                    dispNotProfiled: false,
                 }
             );
         });
-        it("gives correct results with empty not_profiled_in but no profiled_in", () => {
+        it('gives correct results with empty not_profiled_in but no profiled_in', () => {
             assert.deepEqual(
                 makeGeneticTrackTooltip_getCoverageInformation(undefined, []),
                 {
@@ -1124,87 +2792,104 @@ describe("Oncoprint TooltipUtils", () => {
                     dispProfiledIn: undefined,
                     dispNotProfiledIn: [],
                     dispAllProfiled: false,
-                    dispNotProfiled: false
+                    dispNotProfiled: false,
                 }
             );
         });
-        it("gives correct results with nonempty profiled_in but no not_profiled_in", () => {
+        it('gives correct results with nonempty profiled_in but no not_profiled_in', () => {
             assert.deepEqual(
-                makeGeneticTrackTooltip_getCoverageInformation([{ genePanelId: "panel", molecularProfileId: "profile" }], undefined),
+                makeGeneticTrackTooltip_getCoverageInformation(
+                    [{ genePanelId: 'panel', molecularProfileId: 'profile' }],
+                    undefined
+                ),
                 {
-                    dispProfiledGenePanelIds: ["panel"],
+                    dispProfiledGenePanelIds: ['panel'],
                     dispNotProfiledGenePanelIds: [],
-                    dispProfiledIn: ["profile"],
+                    dispProfiledIn: ['profile'],
                     dispNotProfiledIn: undefined,
                     dispAllProfiled: false,
-                    dispNotProfiled: false
+                    dispNotProfiled: false,
                 }
             );
         });
-        it("gives correct results with nonempty not_profiled_in but no profiled_in", () => {
+        it('gives correct results with nonempty not_profiled_in but no profiled_in', () => {
             assert.deepEqual(
-                makeGeneticTrackTooltip_getCoverageInformation(undefined, [{ molecularProfileId: "profile" }]),
+                makeGeneticTrackTooltip_getCoverageInformation(undefined, [
+                    { molecularProfileId: 'profile' },
+                ]),
                 {
                     dispProfiledGenePanelIds: [],
                     dispNotProfiledGenePanelIds: [],
                     dispProfiledIn: undefined,
-                    dispNotProfiledIn: ["profile"],
+                    dispNotProfiledIn: ['profile'],
                     dispAllProfiled: false,
-                    dispNotProfiled: false
+                    dispNotProfiled: false,
                 }
             );
         });
-        it("gives correct results with nonempty profiled_in and empty not_profiled_in", () => {
+        it('gives correct results with nonempty profiled_in and empty not_profiled_in', () => {
             assert.deepEqual(
-                makeGeneticTrackTooltip_getCoverageInformation([{ molecularProfileId: "profile" }], []),
+                makeGeneticTrackTooltip_getCoverageInformation(
+                    [{ molecularProfileId: 'profile' }],
+                    []
+                ),
                 {
                     dispProfiledGenePanelIds: [],
                     dispNotProfiledGenePanelIds: [],
-                    dispProfiledIn: ["profile"],
+                    dispProfiledIn: ['profile'],
                     dispNotProfiledIn: [],
                     dispAllProfiled: true,
-                    dispNotProfiled: false
+                    dispNotProfiled: false,
                 }
             );
         });
-        it("gives correct results with nonempty not_profiled_in and empty profiled_in", () => {
+        it('gives correct results with nonempty not_profiled_in and empty profiled_in', () => {
             assert.deepEqual(
-                makeGeneticTrackTooltip_getCoverageInformation([], [{ molecularProfileId: "profile" }]),
+                makeGeneticTrackTooltip_getCoverageInformation(
+                    [],
+                    [{ molecularProfileId: 'profile' }]
+                ),
                 {
                     dispProfiledGenePanelIds: [],
                     dispNotProfiledGenePanelIds: [],
                     dispProfiledIn: [],
-                    dispNotProfiledIn: ["profile"],
+                    dispNotProfiledIn: ['profile'],
                     dispAllProfiled: false,
-                    dispNotProfiled: true
+                    dispNotProfiled: true,
                 }
             );
         });
-        it("gives correct results with nonoverlapping profiled_in and not_profiled_in", () => {
+        it('gives correct results with nonoverlapping profiled_in and not_profiled_in', () => {
             assert.deepEqual(
-                makeGeneticTrackTooltip_getCoverageInformation([{ genePanelId: "panel", molecularProfileId: "profile1" }], [{ molecularProfileId: "profile" }]),
+                makeGeneticTrackTooltip_getCoverageInformation(
+                    [{ genePanelId: 'panel', molecularProfileId: 'profile1' }],
+                    [{ molecularProfileId: 'profile' }]
+                ),
                 {
-                    dispProfiledGenePanelIds: ["panel"],
+                    dispProfiledGenePanelIds: ['panel'],
                     dispNotProfiledGenePanelIds: [],
-                    dispProfiledIn: ["profile1"],
-                    dispNotProfiledIn: ["profile"],
+                    dispProfiledIn: ['profile1'],
+                    dispNotProfiledIn: ['profile'],
                     dispAllProfiled: false,
-                    dispNotProfiled: false
+                    dispNotProfiled: false,
                 }
             );
         });
-        it("gives correct results with overlapping profiled_in and not_profiled_in", () => {
+        it('gives correct results with overlapping profiled_in and not_profiled_in', () => {
             assert.deepEqual(
-                makeGeneticTrackTooltip_getCoverageInformation([{ genePanelId: "panel", molecularProfileId: "profile" }], [{ genePanelId: "panel2", molecularProfileId: "profile" }]),
+                makeGeneticTrackTooltip_getCoverageInformation(
+                    [{ genePanelId: 'panel', molecularProfileId: 'profile' }],
+                    [{ genePanelId: 'panel2', molecularProfileId: 'profile' }]
+                ),
                 {
-                    dispProfiledGenePanelIds: ["panel"],
-                    dispNotProfiledGenePanelIds: ["panel2"],
-                    dispProfiledIn: ["profile"],
+                    dispProfiledGenePanelIds: ['panel'],
+                    dispNotProfiledGenePanelIds: ['panel2'],
+                    dispProfiledIn: ['profile'],
                     dispNotProfiledIn: [],
                     dispAllProfiled: true,
-                    dispNotProfiled: false
+                    dispNotProfiled: false,
                 }
             );
         });
     });
-});
\ No newline at end of file
+});
diff --git a/src/shared/components/oncoprint/TooltipUtils.ts b/src/shared/components/oncoprint/TooltipUtils.ts
index 346bfa8f3e2..81e3d05d396 100644
--- a/src/shared/components/oncoprint/TooltipUtils.ts
+++ b/src/shared/components/oncoprint/TooltipUtils.ts
@@ -1,81 +1,121 @@
-import {getPatientViewUrl, getSampleViewUrl} from "../../api/urls";
-import $ from "jquery";
+import { getPatientViewUrl, getSampleViewUrl } from '../../api/urls';
+import $ from 'jquery';
 import {
-    NumericGeneMolecularData, GenePanel, GenePanelData, MolecularProfile,
-    Mutation
-} from "../../api/generated/CBioPortalAPI";
-import client from "shared/api/cbioportalClientInstance";
-import {ClinicalTrackSpec, GeneticTrackDatum} from "./Oncoprint";
+    NumericGeneMolecularData,
+    GenePanel,
+    GenePanelData,
+    MolecularProfile,
+    Mutation,
+} from '../../api/generated/CBioPortalAPI';
+import client from 'shared/api/cbioportalClientInstance';
+import { ClinicalTrackSpec, GeneticTrackDatum } from './Oncoprint';
 import {
-    AnnotatedExtendedAlteration, AnnotatedMutation, AnnotatedNumericGeneMolecularData,
+    AnnotatedExtendedAlteration,
+    AnnotatedMutation,
+    AnnotatedNumericGeneMolecularData,
     ExtendedAlteration,
-    AlterationTypeConstants
-} from "../../../pages/resultsView/ResultsViewPageStore";
-import _ from "lodash";
-import {alterationTypeToProfiledForText} from "./ResultsViewOncoprintUtils";
-import {isNotGermlineMutation} from "../../lib/MutationUtils";
-import ListIndexedMap, {ListIndexedMapOfCounts} from "../../lib/ListIndexedMap";
+    AlterationTypeConstants,
+} from '../../../pages/resultsView/ResultsViewPageStore';
+import _ from 'lodash';
+import { alterationTypeToProfiledForText } from './ResultsViewOncoprintUtils';
+import { isNotGermlineMutation } from '../../lib/MutationUtils';
+import ListIndexedMap, {
+    ListIndexedMapOfCounts,
+} from '../../lib/ListIndexedMap';
 
-const hotspotsImg = require("../../../rootImages/cancer-hotspots.svg");
-const oncokbImg = require("../../../rootImages/oncokb-oncogenic-1.svg");
-const customDriverImg = require("../../../rootImages/driver.png");
-const customDriverTiersImg = require("../../../rootImages/driver_tiers.png");
+const hotspotsImg = require('../../../rootImages/cancer-hotspots.svg');
+const oncokbImg = require('../../../rootImages/oncokb-oncogenic-1.svg');
+const customDriverImg = require('../../../rootImages/driver.png');
+const customDriverTiersImg = require('../../../rootImages/driver_tiers.png');
 
-
-export const TOOLTIP_DIV_CLASS = "oncoprint__tooltip";
+export const TOOLTIP_DIV_CLASS = 'oncoprint__tooltip';
 
 const tooltipTextElementNaN = 'N/A';
 
-function sampleViewAnchorTag(study_id:string, sample_id:string) {
-    return `<a href="${getSampleViewUrl(study_id, sample_id)}" target="_blank">${sample_id}</a>`;
+function sampleViewAnchorTag(study_id: string, sample_id: string) {
+    return `<a href="${getSampleViewUrl(
+        study_id,
+        sample_id
+    )}" target="_blank">${sample_id}</a>`;
+}
+function patientViewAnchorTag(study_id: string, patient_id: string) {
+    return `<a href="${getPatientViewUrl(
+        study_id,
+        patient_id
+    )}" target="_blank">${patient_id}</a>`;
 }
-function patientViewAnchorTag(study_id:string, patient_id:string) {
-    return `<a href="${getPatientViewUrl(study_id, patient_id)}" target="_blank">${patient_id}</a>`;
-};
 
-function makeGenePanelPopupLink(gene_panel_id:string, profiled:boolean, numSamples?:number) {
-    let anchor = $(`<span style="white-space:nowrap; display:inline-block;"><a href="#" ${!profiled ? 'style="color:red;"': ""} oncontextmenu="return false;">${gene_panel_id}</a>${numSamples ? ` (${numSamples})` : ""}</span>`);
-    anchor.ready(()=>{
+function makeGenePanelPopupLink(
+    gene_panel_id: string,
+    profiled: boolean,
+    numSamples?: number
+) {
+    let anchor = $(
+        `<span style="white-space:nowrap; display:inline-block;"><a href="#" ${
+            !profiled ? 'style="color:red;"' : ''
+        } oncontextmenu="return false;">${gene_panel_id}</a>${
+            numSamples ? ` (${numSamples})` : ''
+        }</span>`
+    );
+    anchor.ready(() => {
         anchor.click(function() {
-            client.getGenePanelUsingGET({ genePanelId: gene_panel_id }).then((panel:GenePanel)=>{
-                const genes = panel.genes.map(function(g) { return g.hugoGeneSymbol; }).sort();
-                const popup = open("", "_blank", "width=500,height=500");
-                if (popup) {
-                    const div = popup.document.createElement("div");
-                    popup.document.body.appendChild(div);
+            client
+                .getGenePanelUsingGET({ genePanelId: gene_panel_id })
+                .then((panel: GenePanel) => {
+                    const genes = panel.genes
+                        .map(function(g) {
+                            return g.hugoGeneSymbol;
+                        })
+                        .sort();
+                    const popup = open('', '_blank', 'width=500,height=500');
+                    if (popup) {
+                        const div = popup.document.createElement('div');
+                        popup.document.body.appendChild(div);
 
-                    $(`<h3 style="text-align:center;">${gene_panel_id}</h3><br>`).appendTo(div);
-                    $(`<span>${genes.join("<br>")}</span>`).appendTo(div);
-                }
-            });
+                        $(
+                            `<h3 style="text-align:center;">${gene_panel_id}</h3><br>`
+                        ).appendTo(div);
+                        $(`<span>${genes.join('<br>')}</span>`).appendTo(div);
+                    }
+                });
         });
     });
     return anchor;
 }
 
-export function linebreakGenesetId(
-    genesetId: string
-): string {
+export function linebreakGenesetId(genesetId: string): string {
     return (
         // encode the string as the textual contents of an HTML element
-        $('<div>').text(genesetId).html()
-        // Include zero-width spaces to allow line breaks after punctuation in
-        // (typically long) gs names
-        .replace(/_/g, '_&#8203;')
-        .replace(/\./g, '.&#8203;')
+        $('<div>')
+            .text(genesetId)
+            .html()
+            // Include zero-width spaces to allow line breaks after punctuation in
+            // (typically long) gs names
+            .replace(/_/g, '_&#8203;')
+            .replace(/\./g, '.&#8203;')
     );
 }
 
-export function makeClinicalTrackTooltip(track:ClinicalTrackSpec, link_id?:boolean) {
-    return function(dataUnderMouse:any[]) {
+export function makeClinicalTrackTooltip(
+    track: ClinicalTrackSpec,
+    link_id?: boolean
+) {
+    return function(dataUnderMouse: any[]) {
         let ret = '';
-        if (track.datatype === "counts") {
+        if (track.datatype === 'counts') {
             const d = dataUnderMouse[0];
-            for (let i=0; i<track.countsCategoryLabels.length; i++) {
-                ret += '<span style="color:' + track.countsCategoryFills[i] + ';font-weight:bold;">'+track.countsCategoryLabels[i]+'</span>: '+d.attr_val_counts[track.countsCategoryLabels[i]]+'<br>';
+            for (let i = 0; i < track.countsCategoryLabels.length; i++) {
+                ret +=
+                    '<span style="color:' +
+                    track.countsCategoryFills[i] +
+                    ';font-weight:bold;">' +
+                    track.countsCategoryLabels[i] +
+                    '</span>: ' +
+                    d.attr_val_counts[track.countsCategoryLabels[i]] +
+                    '<br>';
             }
         } else {
-            let attr_val_counts:{[attr_val:string]:number} = {};
+            let attr_val_counts: { [attr_val: string]: number } = {};
             for (const d of dataUnderMouse) {
                 if (d.attr_val_counts) {
                     for (const key of Object.keys(d.attr_val_counts)) {
@@ -85,30 +125,51 @@ export function makeClinicalTrackTooltip(track:ClinicalTrackSpec, link_id?:boole
                 }
             }
             const attr_vals = Object.keys(attr_val_counts);
-            if (track.datatype === "number") {
+            if (track.datatype === 'number') {
                 // average
                 let sum = 0;
                 let count = 0;
                 for (const attr_val of attr_vals) {
                     const numSamplesWithVal = attr_val_counts[attr_val];
-                    sum += numSamplesWithVal*parseFloat(attr_val);
+                    sum += numSamplesWithVal * parseFloat(attr_val);
                     count += numSamplesWithVal;
                 }
-                let displayVal = (sum/count).toFixed(2);
-                if (displayVal.substring(displayVal.length-3) === ".00") {
-                    displayVal = displayVal.substring(0, displayVal.length-3);
+                let displayVal = (sum / count).toFixed(2);
+                if (displayVal.substring(displayVal.length - 3) === '.00') {
+                    displayVal = displayVal.substring(0, displayVal.length - 3);
                 }
-                ret += track.label+': <span style="white-space:nowrap; display:inline-block;"><b>' + displayVal + `${count > 1 ? ` (average of ${count} values)`:""}</b></span><br>`;
+                ret +=
+                    track.label +
+                    ': <span style="white-space:nowrap; display:inline-block;"><b>' +
+                    displayVal +
+                    `${
+                        count > 1 ? ` (average of ${count} values)` : ''
+                    }</b></span><br>`;
             } else {
                 if (attr_vals.length > 1) {
-                    ret += track.label+':<br>';
+                    ret += track.label + ':<br>';
                     for (let i = 0; i < attr_vals.length; i++) {
                         const val = attr_vals[i];
-                        ret += '<span style="white-space:nowrap; display:inline-block;"><b>' + val + '</b>: ' + attr_val_counts[val] + ` sample${attr_val_counts[val] === 1 ? "" : "s"}</span><br>`;
+                        ret +=
+                            '<span style="white-space:nowrap; display:inline-block;"><b>' +
+                            val +
+                            '</b>: ' +
+                            attr_val_counts[val] +
+                            ` sample${
+                                attr_val_counts[val] === 1 ? '' : 's'
+                            }</span><br>`;
                     }
                 } else if (attr_vals.length === 1) {
                     let displayVal = attr_vals[0];
-                    ret += track.label+': <span style="white-space:nowrap; display:inline-block;"><b>' + displayVal + `</b>${dataUnderMouse.length > 1 ? ` (${attr_val_counts[attr_vals[0]]} samples)` : ""}</span><br>`;
+                    ret +=
+                        track.label +
+                        ': <span style="white-space:nowrap; display:inline-block;"><b>' +
+                        displayVal +
+                        `</b>${
+                            dataUnderMouse.length > 1
+                                ? ` (${attr_val_counts[attr_vals[0]]} samples)`
+                                : ''
+                        }</span><br>`;
                 }
             }
         }
@@ -119,19 +180,27 @@ export function makeClinicalTrackTooltip(track:ClinicalTrackSpec, link_id?:boole
             }
         }
         if (naCount > 0 && track.na_tooltip_value) {
-            ret += `${track.label}: <b>${track.na_tooltip_value}</b>${dataUnderMouse.length > 1 ? ` (${naCount} samples)` : ""}<br/>`;
+            ret += `${track.label}: <b>${track.na_tooltip_value}</b>${
+                dataUnderMouse.length > 1 ? ` (${naCount} samples)` : ''
+            }<br/>`;
         }
-        return $('<div>').addClass(TOOLTIP_DIV_CLASS).append(getCaseViewElt(dataUnderMouse, !!link_id)).append("<br/>").append(ret);
+        return $('<div>')
+            .addClass(TOOLTIP_DIV_CLASS)
+            .append(getCaseViewElt(dataUnderMouse, !!link_id))
+            .append('<br/>')
+            .append(ret);
     };
 }
-export function makeHeatmapTrackTooltip(genetic_alteration_type:MolecularProfile["molecularAlterationType"], link_id?:boolean) {
-    return function (dataUnderMouse:any[]) {
-        
+export function makeHeatmapTrackTooltip(
+    genetic_alteration_type: MolecularProfile['molecularAlterationType'],
+    link_id?: boolean
+) {
+    return function(dataUnderMouse: any[]) {
         let data_header = '';
         let valueTextElement = tooltipTextElementNaN;
         let categoryTextElement = '';
 
-        switch(genetic_alteration_type) {
+        switch (genetic_alteration_type) {
             case AlterationTypeConstants.MRNA_EXPRESSION:
                 data_header = 'MRNA: ';
                 break;
@@ -147,12 +216,19 @@ export function makeHeatmapTrackTooltip(genetic_alteration_type:MolecularProfile
         }
 
         let profileDataSum = 0;
-        const profileCategories:string[] = [];
+        const profileCategories: string[] = [];
         let profileDataCount = 0;
         let categoryCount = 0;
         for (const d of dataUnderMouse) {
-            if ((d.profile_data !== null) && (typeof d.profile_data !== "undefined")) {
-                if (genetic_alteration_type === AlterationTypeConstants.GENERIC_ASSAY && d.category) {
+            if (
+                d.profile_data !== null &&
+                typeof d.profile_data !== 'undefined'
+            ) {
+                if (
+                    genetic_alteration_type ===
+                        AlterationTypeConstants.GENERIC_ASSAY &&
+                    d.category
+                ) {
                     profileCategories.push(d.category);
                     categoryCount += 1;
                 } else {
@@ -161,23 +237,27 @@ export function makeHeatmapTrackTooltip(genetic_alteration_type:MolecularProfile
                 }
             }
         }
-        
+
         if (profileDataCount > 0) {
-            const profileDisplayValue = (profileDataSum/profileDataCount).toFixed(2);
+            const profileDisplayValue = (
+                profileDataSum / profileDataCount
+            ).toFixed(2);
             if (profileDataCount === 1) {
                 valueTextElement = profileDisplayValue;
             } else {
                 valueTextElement = `${profileDisplayValue} (average of ${profileDataCount} values)`;
             }
         }
-        
+
         if (categoryCount > 0) {
             if (profileDataCount === 0 && categoryCount === 1) {
                 categoryTextElement = profileCategories[0];
             } else if (profileDataCount > 0 && categoryCount === 1) {
                 categoryTextElement = `${profileCategories[0]}`;
             } else {
-                categoryTextElement = `${_.uniq(profileCategories).join(", ")} (${categoryCount} data points)`;
+                categoryTextElement = `${_.uniq(profileCategories).join(
+                    ', '
+                )} (${categoryCount} data points)`;
             }
         }
 
@@ -192,190 +272,301 @@ export function makeHeatmapTrackTooltip(genetic_alteration_type:MolecularProfile
             ret += '<b>' + categoryTextElement + '</b>';
         }
         ret += '<br />';
-        return $('<div>').addClass(TOOLTIP_DIV_CLASS).append(getCaseViewElt(dataUnderMouse, !!link_id)).append("<br/>").append(ret);
+        return $('<div>')
+            .addClass(TOOLTIP_DIV_CLASS)
+            .append(getCaseViewElt(dataUnderMouse, !!link_id))
+            .append('<br/>')
+            .append(ret);
     };
-};
+}
 
 export function makeGeneticTrackTooltip_getCoverageInformation(
-    profiled_in: {genePanelId?:string, molecularProfileId:string}[]|undefined,
-    not_profiled_in: {genePanelId?:string, molecularProfileId:string}[]|undefined,
+    profiled_in:
+        | { genePanelId?: string; molecularProfileId: string }[]
+        | undefined,
+    not_profiled_in:
+        | { genePanelId?: string; molecularProfileId: string }[]
+        | undefined,
     alterationTypesInQuery?: string[],
-    molecularProfileIdToMolecularProfile?: {[molecularProfileId:string]:MolecularProfile}
-):{
+    molecularProfileIdToMolecularProfile?: {
+        [molecularProfileId: string]: MolecularProfile;
+    }
+): {
     dispProfiledGenePanelIds: string[];
     dispNotProfiledGenePanelIds: string[];
-    dispProfiledIn: string[]|undefined;
-    dispNotProfiledIn: string[]|undefined;
-    dispAllProfiled:boolean;
-    dispNotProfiled:boolean;
+    dispProfiledIn: string[] | undefined;
+    dispNotProfiledIn: string[] | undefined;
+    dispAllProfiled: boolean;
+    dispNotProfiled: boolean;
 } {
-    let dispProfiledGenePanelIds:string[] = [];
-    let dispProfiledGenePanelIdsMap:{[genePanelId:string]:string} = {};
-    let dispProfiledIn:string[]|undefined = undefined;
-    let dispProfiledInMap:{[molecularProfileId:string]:string} = {};
-    let dispNotProfiledIn:string[]|undefined = undefined;
-    let dispNotProfiledGenePanelIds:string[] = [];
-    let profiledInTypes:{[type:string]:string}|undefined = undefined;
+    let dispProfiledGenePanelIds: string[] = [];
+    let dispProfiledGenePanelIdsMap: { [genePanelId: string]: string } = {};
+    let dispProfiledIn: string[] | undefined = undefined;
+    let dispProfiledInMap: { [molecularProfileId: string]: string } = {};
+    let dispNotProfiledIn: string[] | undefined = undefined;
+    let dispNotProfiledGenePanelIds: string[] = [];
+    let profiledInTypes: { [type: string]: string } | undefined = undefined;
     if (profiled_in) {
-        dispProfiledGenePanelIds = _.uniq((profiled_in.map(x=>x.genePanelId) as (string|undefined)[]).filter(x=>!!x) as string[]);
-        dispProfiledIn = _.uniq(profiled_in.map(x=>x.molecularProfileId));
+        dispProfiledGenePanelIds = _.uniq((profiled_in.map(
+            x => x.genePanelId
+        ) as (string | undefined)[]).filter(x => !!x) as string[]);
+        dispProfiledIn = _.uniq(profiled_in.map(x => x.molecularProfileId));
         if (molecularProfileIdToMolecularProfile) {
-            profiledInTypes = _.keyBy(dispProfiledIn, molecularProfileId=>molecularProfileIdToMolecularProfile[molecularProfileId].molecularAlterationType);
+            profiledInTypes = _.keyBy(
+                dispProfiledIn,
+                molecularProfileId =>
+                    molecularProfileIdToMolecularProfile[molecularProfileId]
+                        .molecularAlterationType
+            );
         }
         dispProfiledInMap = _.keyBy(dispProfiledIn);
         dispProfiledGenePanelIdsMap = _.keyBy(dispProfiledGenePanelIds);
     }
     if (not_profiled_in) {
-        dispNotProfiledIn = _.uniq(not_profiled_in.map(x=>x.molecularProfileId)).filter(x=>!dispProfiledInMap[x]); // filter out profiles in profiled_in to avoid confusing tooltip (this occurs e.g. w multiple samples, one profiled one not)
-        if (profiledInTypes && alterationTypesInQuery && molecularProfileIdToMolecularProfile) {
-            let notProfiledInTypes = _.keyBy(dispNotProfiledIn, molecularProfileId=>molecularProfileIdToMolecularProfile[molecularProfileId].molecularAlterationType);
+        dispNotProfiledIn = _.uniq(
+            not_profiled_in.map(x => x.molecularProfileId)
+        ).filter(x => !dispProfiledInMap[x]); // filter out profiles in profiled_in to avoid confusing tooltip (this occurs e.g. w multiple samples, one profiled one not)
+        if (
+            profiledInTypes &&
+            alterationTypesInQuery &&
+            molecularProfileIdToMolecularProfile
+        ) {
+            let notProfiledInTypes = _.keyBy(
+                dispNotProfiledIn,
+                molecularProfileId =>
+                    molecularProfileIdToMolecularProfile[molecularProfileId]
+                        .molecularAlterationType
+            );
             // add an entry to 'not profiled in' for each alteration type in the query iff the sample is not profiled in a profile of that type, and that type is not already accounted for.
             // This is for the case of multiple study query - eg one study has CNA profile, the other doesnt, and we want to show in a tooltip from the other study that
             //      the sample is not profiled for CNA. If the study actually has a CNA profile, then we wont show "not profiled for copy number alterations" because
             //      that will be filtered out below because its in profiledInTypes or notProfiledInTypes. Otherwise, CNA will be in alterationTypesInQuery,
             //      and it wont be covered in profiledInTypes or notProfiledInTypes, so it will make sense to say "copy number alterations" in that generality.
-            dispNotProfiledIn = dispNotProfiledIn.concat(alterationTypesInQuery.filter(t=>(!profiledInTypes![t] && !notProfiledInTypes[t])).map(t=>alterationTypeToProfiledForText[t]));
+            dispNotProfiledIn = dispNotProfiledIn.concat(
+                alterationTypesInQuery
+                    .filter(t => !profiledInTypes![t] && !notProfiledInTypes[t])
+                    .map(t => alterationTypeToProfiledForText[t])
+            );
         }
-        dispNotProfiledGenePanelIds = _.uniq(not_profiled_in.map(x=>x.genePanelId)).filter(x=>(!!x && !dispProfiledGenePanelIdsMap[x])) as string[] ;
+        dispNotProfiledGenePanelIds = _.uniq(
+            not_profiled_in.map(x => x.genePanelId)
+        ).filter(x => !!x && !dispProfiledGenePanelIdsMap[x]) as string[];
     }
-    const dispAllProfiled = !!(dispProfiledIn && dispProfiledIn.length && dispNotProfiledIn && !dispNotProfiledIn.length);
-    const dispNotProfiled = !!(dispNotProfiledIn && dispNotProfiledIn.length && dispProfiledIn && !dispProfiledIn.length);
+    const dispAllProfiled = !!(
+        dispProfiledIn &&
+        dispProfiledIn.length &&
+        dispNotProfiledIn &&
+        !dispNotProfiledIn.length
+    );
+    const dispNotProfiled = !!(
+        dispNotProfiledIn &&
+        dispNotProfiledIn.length &&
+        dispProfiledIn &&
+        !dispProfiledIn.length
+    );
     return {
-        dispProfiledGenePanelIds, dispNotProfiledGenePanelIds, dispProfiledIn, dispNotProfiledIn, dispAllProfiled, dispNotProfiled
+        dispProfiledGenePanelIds,
+        dispNotProfiledGenePanelIds,
+        dispProfiledIn,
+        dispNotProfiledIn,
+        dispAllProfiled,
+        dispNotProfiled,
     };
 }
 
 export function getCaseViewElt(
-    dataUnderMouse:Pick<GeneticTrackDatum, "sample"|"patient"|"study_id">[],
-    caseViewLinkout:boolean
+    dataUnderMouse: Pick<
+        GeneticTrackDatum,
+        'sample' | 'patient' | 'study_id'
+    >[],
+    caseViewLinkout: boolean
 ) {
     if (!dataUnderMouse.length) {
-        return "";
+        return '';
     }
 
     let caseIdElt;
     if (dataUnderMouse[0].sample) {
         if (dataUnderMouse.length > 1) {
-            caseIdElt = (
-                caseViewLinkout ?
-                    `<a href=${
-                        getSampleViewUrl(dataUnderMouse[0].study_id, dataUnderMouse[0].sample, dataUnderMouse.map(d=>({studyId:d.study_id, patientId:d.patient})))
-                        } target="_blank">View these ${dataUnderMouse.length} samples<a/>` :
-                    `<span>${dataUnderMouse.length} samples</span>`
-            );
+            caseIdElt = caseViewLinkout
+                ? `<a href=${getSampleViewUrl(
+                      dataUnderMouse[0].study_id,
+                      dataUnderMouse[0].sample,
+                      dataUnderMouse.map(d => ({
+                          studyId: d.study_id,
+                          patientId: d.patient,
+                      }))
+                  )} target="_blank">View these ${
+                      dataUnderMouse.length
+                  } samples<a/>`
+                : `<span>${dataUnderMouse.length} samples</span>`;
         } else {
-            caseIdElt = (caseViewLinkout ? sampleViewAnchorTag(dataUnderMouse[0].study_id, dataUnderMouse[0].sample) : `<span>${dataUnderMouse[0].sample}</span>`);
+            caseIdElt = caseViewLinkout
+                ? sampleViewAnchorTag(
+                      dataUnderMouse[0].study_id,
+                      dataUnderMouse[0].sample
+                  )
+                : `<span>${dataUnderMouse[0].sample}</span>`;
         }
     } else if (dataUnderMouse[0].patient) {
         if (dataUnderMouse.length > 1) {
-            caseIdElt = (
-                caseViewLinkout ?
-                    `<a href=${
-                        getPatientViewUrl(dataUnderMouse[0].study_id, dataUnderMouse[0].patient, dataUnderMouse.map(d=>({studyId:d.study_id, patientId:d.patient!})))
-                        } target="_blank">View these ${dataUnderMouse.length} patients<a/>` :
-                    `<span>${dataUnderMouse.length} patients</span>`
-            );
+            caseIdElt = caseViewLinkout
+                ? `<a href=${getPatientViewUrl(
+                      dataUnderMouse[0].study_id,
+                      dataUnderMouse[0].patient,
+                      dataUnderMouse.map(d => ({
+                          studyId: d.study_id,
+                          patientId: d.patient!,
+                      }))
+                  )} target="_blank">View these ${
+                      dataUnderMouse.length
+                  } patients<a/>`
+                : `<span>${dataUnderMouse.length} patients</span>`;
         } else {
-            caseIdElt = (caseViewLinkout ? patientViewAnchorTag(dataUnderMouse[0].study_id, dataUnderMouse[0].patient) : `<span>${dataUnderMouse[0].patient}</span>`);
+            caseIdElt = caseViewLinkout
+                ? patientViewAnchorTag(
+                      dataUnderMouse[0].study_id,
+                      dataUnderMouse[0].patient
+                  )
+                : `<span>${dataUnderMouse[0].patient}</span>`;
         }
     } else {
-        caseIdElt = "";
+        caseIdElt = '';
     }
     return caseIdElt;
 }
 
 export function makeGeneticTrackTooltip(
-    caseViewLinkout:boolean,
-    getMolecularProfileMap?:()=>{[molecularProfileId:string]:MolecularProfile}|undefined,
-    alterationTypesInQuery?:string[],
+    caseViewLinkout: boolean,
+    getMolecularProfileMap?: () =>
+        | { [molecularProfileId: string]: MolecularProfile }
+        | undefined,
+    alterationTypesInQuery?: string[]
 ) {
     // TODO: all the data here is old API data
-    function listOfMutationOrFusionDataToHTML(data:any[], multipleSamplesUnderMouse:boolean) {
+    function listOfMutationOrFusionDataToHTML(
+        data: any[],
+        multipleSamplesUnderMouse: boolean
+    ) {
         const countsMap = new ListIndexedMapOfCounts();
         for (const d of data) {
             countsMap.increment(
-                d.hugo_gene_symbol, d.amino_acid_change, d.cancer_hotspots_hotspot,
-                d.oncokb_oncogenic, d.driver_filter, d.driver_filter_annotation,
-                d.driver_tiers_filter, d.driver_tiers_filter_annotation, d.germline
+                d.hugo_gene_symbol,
+                d.amino_acid_change,
+                d.cancer_hotspots_hotspot,
+                d.oncokb_oncogenic,
+                d.driver_filter,
+                d.driver_filter_annotation,
+                d.driver_tiers_filter,
+                d.driver_tiers_filter_annotation,
+                d.germline
             );
         }
-        return countsMap.entries().map((
-            {key:[hugo_gene_symbol, amino_acid_change, cancer_hotspots_hotspot,
-            oncokb_oncogenic, driver_filter, driver_filter_annotation,
-                driver_tiers_filter, driver_tiers_filter_annotation, germline],
-            value:count})=>{
-            var ret = $('<span>').css({
-                "white-space":"nowrap",
-                "display":"inline-block"
-            });
-            ret.append(`<b>${hugo_gene_symbol} ${amino_acid_change}</b>`);
-            if (cancer_hotspots_hotspot) {
-                ret.append(`<img src="${hotspotsImg}" title="Hotspot" style="height:11px; width:11px; margin-left:3px"/>`);
-            }
-            if (oncokb_oncogenic) {
-                ret.append(`<img src="${oncokbImg}" title="${oncokb_oncogenic}" style="height:11px; width:11px;margin-left:3px"/>`);
-            }
-            //If we have data for the binary custom driver annotations, append an icon to the tooltip with the annotation information
-            if (driver_filter && driver_filter === "Putative_Driver") {
-                ret.append(`<img src="${customDriverImg}" title="${driver_filter}: ${driver_filter_annotation}" alt="driver filter" style="height:11px; width:11px;margin-left:3px"/>`);
-            }
-            //If we have data for the class custom driver annotations, append an icon to the tooltip with the annotation information
-            if (driver_tiers_filter) {
-                ret.append(`<img src="${customDriverTiersImg}" title="${driver_tiers_filter}: ${driver_tiers_filter_annotation}" alt="driver tiers filter" style="height:11px; width:11px;margin-left:3px"/>`);
-            }
-
+        return countsMap
+            .entries()
+            .map(
+                ({
+                    key: [
+                        hugo_gene_symbol,
+                        amino_acid_change,
+                        cancer_hotspots_hotspot,
+                        oncokb_oncogenic,
+                        driver_filter,
+                        driver_filter_annotation,
+                        driver_tiers_filter,
+                        driver_tiers_filter_annotation,
+                        germline,
+                    ],
+                    value: count,
+                }) => {
+                    var ret = $('<span>').css({
+                        'white-space': 'nowrap',
+                        display: 'inline-block',
+                    });
+                    ret.append(
+                        `<b>${hugo_gene_symbol} ${amino_acid_change}</b>`
+                    );
+                    if (cancer_hotspots_hotspot) {
+                        ret.append(
+                            `<img src="${hotspotsImg}" title="Hotspot" style="height:11px; width:11px; margin-left:3px"/>`
+                        );
+                    }
+                    if (oncokb_oncogenic) {
+                        ret.append(
+                            `<img src="${oncokbImg}" title="${oncokb_oncogenic}" style="height:11px; width:11px;margin-left:3px"/>`
+                        );
+                    }
+                    //If we have data for the binary custom driver annotations, append an icon to the tooltip with the annotation information
+                    if (driver_filter && driver_filter === 'Putative_Driver') {
+                        ret.append(
+                            `<img src="${customDriverImg}" title="${driver_filter}: ${driver_filter_annotation}" alt="driver filter" style="height:11px; width:11px;margin-left:3px"/>`
+                        );
+                    }
+                    //If we have data for the class custom driver annotations, append an icon to the tooltip with the annotation information
+                    if (driver_tiers_filter) {
+                        ret.append(
+                            `<img src="${customDriverTiersImg}" title="${driver_tiers_filter}: ${driver_tiers_filter_annotation}" alt="driver tiers filter" style="height:11px; width:11px;margin-left:3px"/>`
+                        );
+                    }
 
-            // AT THE END, append germline symbol if necessary
-            if (germline) {
-                ret.append(generateGermlineLabel());
-            }
-            // finally, add the number of samples with this, if multipleSamplesUnderMouse
-            if (multipleSamplesUnderMouse) {
-                ret.append(`&nbsp;(${count})`);
-            }
-            return ret;
-        });
+                    // AT THE END, append germline symbol if necessary
+                    if (germline) {
+                        ret.append(generateGermlineLabel());
+                    }
+                    // finally, add the number of samples with this, if multipleSamplesUnderMouse
+                    if (multipleSamplesUnderMouse) {
+                        ret.append(`&nbsp;(${count})`);
+                    }
+                    return ret;
+                }
+            );
     }
-    function listOfCNAToHTML(data:any[], multipleSamplesUnderMouse:boolean) {
+    function listOfCNAToHTML(data: any[], multipleSamplesUnderMouse: boolean) {
         const countsMap = new ListIndexedMapOfCounts();
         for (const d of data) {
-            countsMap.increment(
-                d.hugo_gene_symbol, d.cna, d.oncokb_oncogenic
-            );
+            countsMap.increment(d.hugo_gene_symbol, d.cna, d.oncokb_oncogenic);
         }
-        return countsMap.entries().map((
-            {key:[hugo_gene_symbol, cna, oncokb_oncogenic],
-            value:count})=>{
-            var ret = $('<span>');
-            ret.append(`<b>${hugo_gene_symbol} ${cna}</b>`);
-            if (oncokb_oncogenic) {
-                ret.append(`<img src=${oncokbImg} title="${oncokb_oncogenic}" style="height:11px; width:11px;margin-left:3px"/>`);
-            }
-            // finally, add the number of samples with this, if multipleSamplesUnderMouse
-            if (multipleSamplesUnderMouse) {
-                ret.append(`&nbsp;(${count})`);
-            }
-            return ret;
-        });
+        return countsMap
+            .entries()
+            .map(
+                ({
+                    key: [hugo_gene_symbol, cna, oncokb_oncogenic],
+                    value: count,
+                }) => {
+                    var ret = $('<span>');
+                    ret.append(`<b>${hugo_gene_symbol} ${cna}</b>`);
+                    if (oncokb_oncogenic) {
+                        ret.append(
+                            `<img src=${oncokbImg} title="${oncokb_oncogenic}" style="height:11px; width:11px;margin-left:3px"/>`
+                        );
+                    }
+                    // finally, add the number of samples with this, if multipleSamplesUnderMouse
+                    if (multipleSamplesUnderMouse) {
+                        ret.append(`&nbsp;(${count})`);
+                    }
+                    return ret;
+                }
+            );
     }
-    function listOfMRNAOrPROTToHTML(data:any[], multipleSamplesUnderMouse:boolean) {
+    function listOfMRNAOrPROTToHTML(
+        data: any[],
+        multipleSamplesUnderMouse: boolean
+    ) {
         const countsMap = new ListIndexedMapOfCounts();
         for (const d of data) {
-            countsMap.increment(
-                d.hugo_gene_symbol, d.direction
-            );
+            countsMap.increment(d.hugo_gene_symbol, d.direction);
         }
-        return countsMap.entries().map((
-            {key:[hugo_gene_symbol, direction],
-                value:count})=>{
-            var ret = $('<span>');
-            ret.append(`<b>${hugo_gene_symbol} ${direction}</b>`);
-            // finally, add the number of samples with this, if multipleSamplesUnderMouse
-            if (multipleSamplesUnderMouse) {
-                ret.append(`&nbsp;(${count})`);
-            }
-            return ret;
-        });
+        return countsMap
+            .entries()
+            .map(({ key: [hugo_gene_symbol, direction], value: count }) => {
+                var ret = $('<span>');
+                ret.append(`<b>${hugo_gene_symbol} ${direction}</b>`);
+                // finally, add the number of samples with this, if multipleSamplesUnderMouse
+                if (multipleSamplesUnderMouse) {
+                    ret.append(`&nbsp;(${count})`);
+                }
+                return ret;
+            });
     }
 
     function generateGermlineLabel() {
@@ -384,30 +575,53 @@ export function makeGeneticTrackTooltip(
         return ret;
     }
 
-    const disp_cna:{[integerCN:string]:string} = {'-2': 'HOMODELETED', '-1': 'HETLOSS', '1': 'GAIN', '2': 'AMPLIFIED'};
-    return function (dataUnderMouse:Pick<GeneticTrackDatum, "data"|"profiled_in"|"sample"|"patient"|"study_id"|"na"|"not_profiled_in"|"disp_germ">[]) {
+    const disp_cna: { [integerCN: string]: string } = {
+        '-2': 'HOMODELETED',
+        '-1': 'HETLOSS',
+        '1': 'GAIN',
+        '2': 'AMPLIFIED',
+    };
+    return function(
+        dataUnderMouse: Pick<
+            GeneticTrackDatum,
+            | 'data'
+            | 'profiled_in'
+            | 'sample'
+            | 'patient'
+            | 'study_id'
+            | 'na'
+            | 'not_profiled_in'
+            | 'disp_germ'
+        >[]
+    ) {
         const ret = $('<div>').addClass(TOOLTIP_DIV_CLASS);
-        ret.append(getCaseViewElt(dataUnderMouse, caseViewLinkout)).append("<br/>");
-        let mutations:any[] = [];
-        let cna:any[] = [];
-        let mrna:any[] = [];
-        let prot:any[] = [];
-        let fusions:any[] = [];
+        ret.append(getCaseViewElt(dataUnderMouse, caseViewLinkout)).append(
+            '<br/>'
+        );
+        let mutations: any[] = [];
+        let cna: any[] = [];
+        let mrna: any[] = [];
+        let prot: any[] = [];
+        let fusions: any[] = [];
         // collect all data under mouse
         for (const d of dataUnderMouse) {
             for (let i = 0; i < d.data.length; i++) {
                 const datum = d.data[i];
-                const molecularAlterationType = datum.molecularProfileAlterationType;
+                const molecularAlterationType =
+                    datum.molecularProfileAlterationType;
                 const hugoGeneSymbol = datum.hugoGeneSymbol;
                 switch (molecularAlterationType) {
-                    case "MUTATION_EXTENDED":
-                        const tooltip_datum:any = {};
+                    case 'MUTATION_EXTENDED':
+                        const tooltip_datum: any = {};
                         tooltip_datum.hugo_gene_symbol = hugoGeneSymbol;
                         tooltip_datum.amino_acid_change = datum.proteinChange;
                         tooltip_datum.driver_filter = datum.driverFilter;
-                        tooltip_datum.driver_filter_annotation = datum.driverFilterAnnotation;
-                        tooltip_datum.driver_tiers_filter = datum.driverTiersFilter;
-                        tooltip_datum.driver_tiers_filter_annotation = datum.driverTiersFilterAnnotation;
+                        tooltip_datum.driver_filter_annotation =
+                            datum.driverFilterAnnotation;
+                        tooltip_datum.driver_tiers_filter =
+                            datum.driverTiersFilter;
+                        tooltip_datum.driver_tiers_filter_annotation =
+                            datum.driverTiersFilterAnnotation;
                         if (datum.isHotspot) {
                             tooltip_datum.cancer_hotspots_hotspot = true;
                         }
@@ -418,13 +632,23 @@ export function makeGeneticTrackTooltip(
                         if (oncokb_oncogenic) {
                             tooltip_datum.oncokb_oncogenic = oncokb_oncogenic;
                         }
-                        (datum.alterationSubType === "fusion" ? fusions : mutations).push(tooltip_datum);
+                        (datum.alterationSubType === 'fusion'
+                            ? fusions
+                            : mutations
+                        ).push(tooltip_datum);
                         break;
-                    case "COPY_NUMBER_ALTERATION":
-                        if (disp_cna.hasOwnProperty(datum.value as AnnotatedNumericGeneMolecularData["value"])) {
-                            const tooltip_datum:any = {
-                                cna: disp_cna[datum.value as AnnotatedNumericGeneMolecularData["value"]],
-                                hugo_gene_symbol: hugoGeneSymbol
+                    case 'COPY_NUMBER_ALTERATION':
+                        if (
+                            disp_cna.hasOwnProperty(
+                                datum.value as AnnotatedNumericGeneMolecularData['value']
+                            )
+                        ) {
+                            const tooltip_datum: any = {
+                                cna:
+                                    disp_cna[
+                                        datum.value as AnnotatedNumericGeneMolecularData['value']
+                                    ],
+                                hugo_gene_symbol: hugoGeneSymbol,
                             };
                             const oncokb_oncogenic = datum.oncoKbOncogenic;
                             if (oncokb_oncogenic) {
@@ -433,14 +657,23 @@ export function makeGeneticTrackTooltip(
                             cna.push(tooltip_datum);
                         }
                         break;
-                    case "MRNA_EXPRESSION":
-                    case "PROTEIN_LEVEL":
+                    case 'MRNA_EXPRESSION':
+                    case 'PROTEIN_LEVEL':
                         let direction = datum.alterationSubType;
-                        let array = (molecularAlterationType === "MRNA_EXPRESSION" ? mrna : prot);
-                        if (direction === "high") {
-                            array.push({hugo_gene_symbol: hugoGeneSymbol, direction: "HIGH"});
-                        } else if (direction === "low") {
-                            array.push({hugo_gene_symbol: hugoGeneSymbol, direction: "LOW"});
+                        let array =
+                            molecularAlterationType === 'MRNA_EXPRESSION'
+                                ? mrna
+                                : prot;
+                        if (direction === 'high') {
+                            array.push({
+                                hugo_gene_symbol: hugoGeneSymbol,
+                                direction: 'HIGH',
+                            });
+                        } else if (direction === 'low') {
+                            array.push({
+                                hugo_gene_symbol: hugoGeneSymbol,
+                                direction: 'LOW',
+                            });
                         }
                         break;
                 }
@@ -448,10 +681,13 @@ export function makeGeneticTrackTooltip(
         }
         if (fusions.length > 0) {
             ret.append('Fusion: ');
-            fusions = listOfMutationOrFusionDataToHTML(fusions, dataUnderMouse.length > 1);
+            fusions = listOfMutationOrFusionDataToHTML(
+                fusions,
+                dataUnderMouse.length > 1
+            );
             for (var i = 0; i < fusions.length; i++) {
                 if (i > 0) {
-                    ret.append(",");
+                    ret.append(',');
                 }
                 ret.append(fusions[i]);
             }
@@ -459,10 +695,13 @@ export function makeGeneticTrackTooltip(
         }
         if (mutations.length > 0) {
             ret.append('Mutation: ');
-            mutations = listOfMutationOrFusionDataToHTML(mutations, dataUnderMouse.length > 1);
+            mutations = listOfMutationOrFusionDataToHTML(
+                mutations,
+                dataUnderMouse.length > 1
+            );
             for (var i = 0; i < mutations.length; i++) {
                 if (i > 0) {
-                    ret.append(", ");
+                    ret.append(', ');
                 }
                 ret.append(mutations[i]);
             }
@@ -473,7 +712,7 @@ export function makeGeneticTrackTooltip(
             cna = listOfCNAToHTML(cna, dataUnderMouse.length > 1);
             for (var i = 0; i < cna.length; i++) {
                 if (i > 0) {
-                    ret.append(", ");
+                    ret.append(', ');
                 }
                 ret.append(cna[i]);
             }
@@ -484,7 +723,7 @@ export function makeGeneticTrackTooltip(
             mrna = listOfMRNAOrPROTToHTML(mrna, dataUnderMouse.length > 1);
             for (var i = 0; i < mrna.length; i++) {
                 if (i > 0) {
-                    ret.append(", ");
+                    ret.append(', ');
                 }
                 ret.append(mrna[i]);
             }
@@ -495,23 +734,33 @@ export function makeGeneticTrackTooltip(
             prot = listOfMRNAOrPROTToHTML(prot, dataUnderMouse.length > 1);
             for (var i = 0; i < prot.length; i++) {
                 if (i > 0) {
-                    ret.append(", ");
+                    ret.append(', ');
                 }
                 ret.append(prot[i]);
             }
             ret.append('<br>');
         }
         // Gene panel coverage
-        const molecularProfileMap = getMolecularProfileMap && getMolecularProfileMap();
+        const molecularProfileMap =
+            getMolecularProfileMap && getMolecularProfileMap();
         const profiledGenePanelCounts = new ListIndexedMapOfCounts<string>();
         const notProfiledGenePanelCounts = new ListIndexedMapOfCounts<string>();
-        const profiledMolecularProfileCounts = new ListIndexedMapOfCounts<string>();
-        const notProfiledMolecularProfileCounts = new ListIndexedMapOfCounts<string>();
+        const profiledMolecularProfileCounts = new ListIndexedMapOfCounts<
+            string
+        >();
+        const notProfiledMolecularProfileCounts = new ListIndexedMapOfCounts<
+            string
+        >();
         let allProfiledCount = 0;
         let noneProfiledCount = 0;
 
         for (const d of dataUnderMouse) {
-            const coverageInformation = makeGeneticTrackTooltip_getCoverageInformation(d.profiled_in, d.not_profiled_in, alterationTypesInQuery, molecularProfileMap);
+            const coverageInformation = makeGeneticTrackTooltip_getCoverageInformation(
+                d.profiled_in,
+                d.not_profiled_in,
+                alterationTypesInQuery,
+                molecularProfileMap
+            );
             for (const genePanelId of coverageInformation.dispProfiledGenePanelIds) {
                 profiledGenePanelCounts.increment(genePanelId);
             }
@@ -520,12 +769,16 @@ export function makeGeneticTrackTooltip(
             }
             if (coverageInformation.dispProfiledIn) {
                 for (const molecularProfileId of coverageInformation.dispProfiledIn) {
-                    profiledMolecularProfileCounts.increment(molecularProfileId);
+                    profiledMolecularProfileCounts.increment(
+                        molecularProfileId
+                    );
                 }
             }
             if (coverageInformation.dispNotProfiledIn) {
                 for (const molecularProfileId of coverageInformation.dispNotProfiledIn) {
-                    notProfiledMolecularProfileCounts.increment(molecularProfileId);
+                    notProfiledMolecularProfileCounts.increment(
+                        molecularProfileId
+                    );
                 }
             }
             if (coverageInformation.dispAllProfiled) {
@@ -537,19 +790,24 @@ export function makeGeneticTrackTooltip(
         const profiledGenePanelEntries = profiledGenePanelCounts.entries();
         const notProfiledGenePanelEntries = notProfiledGenePanelCounts.entries();
 
-        if (profiledGenePanelEntries.length || notProfiledGenePanelEntries.length) {
-            ret.append("Gene Panels: ");
+        if (
+            profiledGenePanelEntries.length ||
+            notProfiledGenePanelEntries.length
+        ) {
+            ret.append('Gene Panels: ');
             let needsCommaFirst = false;
             for (const entry of profiledGenePanelEntries) {
                 if (needsCommaFirst) {
-                    ret.append(",&nbsp;");
+                    ret.append(',&nbsp;');
                 }
                 needsCommaFirst = true;
-                ret.append(makeGenePanelPopupLink(
-                    entry.key[0],
-            true,
-                    (dataUnderMouse.length > 1 ? entry.value : undefined)
-                ));
+                ret.append(
+                    makeGenePanelPopupLink(
+                        entry.key[0],
+                        true,
+                        dataUnderMouse.length > 1 ? entry.value : undefined
+                    )
+                );
             }
             for (const entry of notProfiledGenePanelEntries) {
                 if (profiledGenePanelCounts.has(...entry.key)) {
@@ -557,16 +815,18 @@ export function makeGeneticTrackTooltip(
                     continue;
                 }
                 if (needsCommaFirst) {
-                    ret.append(",&nbsp;");
+                    ret.append(',&nbsp;');
                 }
                 needsCommaFirst = true;
-                ret.append(makeGenePanelPopupLink(
-                    entry.key[0],
-                    false,
-                    (dataUnderMouse.length > 1 ? entry.value : undefined)
-                ));
+                ret.append(
+                    makeGenePanelPopupLink(
+                        entry.key[0],
+                        false,
+                        dataUnderMouse.length > 1 ? entry.value : undefined
+                    )
+                );
             }
-            ret.append("<br>");
+            ret.append('<br>');
         }
 
         // Molecular profile coverage
@@ -575,45 +835,86 @@ export function makeGeneticTrackTooltip(
 
         // only show specifics if not all profiled or all unprofiled
         if (allProfiledCount === dataUnderMouse.length) {
-            ret.append("Profiled in all selected molecular profiles." + (dataUnderMouse.length > 1 ? ` (${allProfiledCount})` : ""));
-            ret.append("<br>");
+            ret.append(
+                'Profiled in all selected molecular profiles.' +
+                    (dataUnderMouse.length > 1 ? ` (${allProfiledCount})` : '')
+            );
+            ret.append('<br>');
         } else if (noneProfiledCount === dataUnderMouse.length) {
-            ret.append("Not profiled in selected molecular profiles." + (dataUnderMouse.length > 1 ? ` (${noneProfiledCount})` : ""));
-            ret.append("<br>");
+            ret.append(
+                'Not profiled in selected molecular profiles.' +
+                    (dataUnderMouse.length > 1 ? ` (${noneProfiledCount})` : '')
+            );
+            ret.append('<br>');
         } else {
             if (profiledInEntries.length) {
-                ret.append("Profiled in: "+profiledInEntries.map(
-                e=>{
-                        const molecularProfileId = e.key[0];
-                        let displayName = molecularProfileId;
-                        if (molecularProfileMap && (molecularProfileId in molecularProfileMap)) {
-                            displayName = molecularProfileMap[molecularProfileId].name;
-                        }
-                        return `${displayName}${dataUnderMouse.length > 1 ? ` (${e.value})` : ""}`;
-                    }
-                ).join(", "));
-                ret.append("<br>");
+                ret.append(
+                    'Profiled in: ' +
+                        profiledInEntries
+                            .map(e => {
+                                const molecularProfileId = e.key[0];
+                                let displayName = molecularProfileId;
+                                if (
+                                    molecularProfileMap &&
+                                    molecularProfileId in molecularProfileMap
+                                ) {
+                                    displayName =
+                                        molecularProfileMap[molecularProfileId]
+                                            .name;
+                                }
+                                return `${displayName}${
+                                    dataUnderMouse.length > 1
+                                        ? ` (${e.value})`
+                                        : ''
+                                }`;
+                            })
+                            .join(', ')
+                );
+                ret.append('<br>');
             }
             if (notProfiledInEntries.length) {
-                ret.append("<span style='color:red; font-weight:bold'>Not profiled in: "+notProfiledInEntries.map(
-                    e=>{
-                        const molecularProfileId = e.key[0];
-                        let displayName = molecularProfileId;
-                        if (molecularProfileMap && (molecularProfileId in molecularProfileMap)) {
-                            displayName = molecularProfileMap[molecularProfileId].name;
-                        }
-                        return `${displayName}${dataUnderMouse.length > 1 ? ` (${e.value})` : ""}`;
-                    }
-                ).join(", ")+"</span>");
-                ret.append("<br>");
+                ret.append(
+                    "<span style='color:red; font-weight:bold'>Not profiled in: " +
+                        notProfiledInEntries
+                            .map(e => {
+                                const molecularProfileId = e.key[0];
+                                let displayName = molecularProfileId;
+                                if (
+                                    molecularProfileMap &&
+                                    molecularProfileId in molecularProfileMap
+                                ) {
+                                    displayName =
+                                        molecularProfileMap[molecularProfileId]
+                                            .name;
+                                }
+                                return `${displayName}${
+                                    dataUnderMouse.length > 1
+                                        ? ` (${e.value})`
+                                        : ''
+                                }`;
+                            })
+                            .join(', ') +
+                        '</span>'
+                );
+                ret.append('<br>');
             }
             if (allProfiledCount > 0) {
-                ret.append("Profiled in all selected molecular profiles." + (dataUnderMouse.length > 1 ? ` (${allProfiledCount})` : ""));
-                ret.append("<br>");
+                ret.append(
+                    'Profiled in all selected molecular profiles.' +
+                        (dataUnderMouse.length > 1
+                            ? ` (${allProfiledCount})`
+                            : '')
+                );
+                ret.append('<br>');
             }
             if (noneProfiledCount > 0) {
-                ret.append("Not profiled in selected molecular profiles." + (dataUnderMouse.length > 1 ? ` (${noneProfiledCount})` : ""));
-                ret.append("<br>");
+                ret.append(
+                    'Not profiled in selected molecular profiles.' +
+                        (dataUnderMouse.length > 1
+                            ? ` (${noneProfiledCount})`
+                            : '')
+                );
+                ret.append('<br>');
             }
         }
         return ret;
diff --git a/src/shared/components/oncoprint/controls/ConfirmNgchmModal.tsx b/src/shared/components/oncoprint/controls/ConfirmNgchmModal.tsx
index 5412ebd7297..73f6bba6d2e 100644
--- a/src/shared/components/oncoprint/controls/ConfirmNgchmModal.tsx
+++ b/src/shared/components/oncoprint/controls/ConfirmNgchmModal.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { Button, Modal } from 'react-bootstrap';
-import {observer} from "mobx-react";
-import {observable} from "mobx";
+import { observer } from 'mobx-react';
+import { observable } from 'mobx';
 
 //
 // NG-CHM are "Next-Generation Clustered Heat Maps", a highly interactive viewer of
@@ -12,27 +12,48 @@ import {observable} from "mobx";
 //
 
 @observer
-export default class ConfirmNgchmModal extends React.Component<{ show:boolean, onHide:()=>void, openNgchmWindow:()=>void }, {}> {
-
+export default class ConfirmNgchmModal extends React.Component<
+    { show: boolean; onHide: () => void; openNgchmWindow: () => void },
+    {}
+> {
     render() {
         return (
-            <Modal show={this.props.show} onHide={this.props.onHide} animation={false}>
+            <Modal
+                show={this.props.show}
+                onHide={this.props.onHide}
+                animation={false}
+            >
                 <Modal.Header closeButton>
-                    <Modal.Title>Open new tab to MD Anderson NG-CHM?</Modal.Title>
+                    <Modal.Title>
+                        Open new tab to MD Anderson NG-CHM?
+                    </Modal.Title>
                 </Modal.Header>
                 <Modal.Body>
-                	<div className="oncoprint__controls__heatmap_menu mdacc-modal">
-                    <p>Continue will open a tab or window to a different site (not cBioPortal).</p>
-                    <p>
-                    You will be able to view this study as Next Generation Clustered 
-                    Heatmaps (NG-CHM) developed by The University of Texas 
-                    MD Anderson Cancer Center.
-                    </p>
-                    <em>Note: NG-CHM will not be limited to your selected samples and genes.</em>
+                    <div className="oncoprint__controls__heatmap_menu mdacc-modal">
+                        <p>
+                            Continue will open a tab or window to a different
+                            site (not cBioPortal).
+                        </p>
+                        <p>
+                            You will be able to view this study as Next
+                            Generation Clustered Heatmaps (NG-CHM) developed by
+                            The University of Texas MD Anderson Cancer Center.
+                        </p>
+                        <em>
+                            Note: NG-CHM will not be limited to your selected
+                            samples and genes.
+                        </em>
                     </div>
                 </Modal.Body>
                 <Modal.Footer>
-                    <Button onClick={()=>{this.props.openNgchmWindow(); this.props.onHide();}}>Continue</Button>
+                    <Button
+                        onClick={() => {
+                            this.props.openNgchmWindow();
+                            this.props.onHide();
+                        }}
+                    >
+                        Continue
+                    </Button>
                     <Button onClick={this.props.onHide}>Cancel</Button>
                 </Modal.Footer>
             </Modal>
diff --git a/src/shared/components/oncoprint/controls/CustomDropdown.tsx b/src/shared/components/oncoprint/controls/CustomDropdown.tsx
index 39dadf9027b..ffa018458ba 100644
--- a/src/shared/components/oncoprint/controls/CustomDropdown.tsx
+++ b/src/shared/components/oncoprint/controls/CustomDropdown.tsx
@@ -1,32 +1,35 @@
-import * as React from "react";
-import {Button, Dropdown, ButtonProps} from "react-bootstrap";
-import {RootCloseWrapper} from "react-overlays";
-import classNames from "classnames";
-import {observer} from "mobx-react";
-import {observable} from "mobx";
+import * as React from 'react';
+import { Button, Dropdown, ButtonProps } from 'react-bootstrap';
+import { RootCloseWrapper } from 'react-overlays';
+import classNames from 'classnames';
+import { observer } from 'mobx-react';
+import { observable } from 'mobx';
 
 export interface ICustomDropdownProps extends ButtonProps {
     title: string;
     className?: string;
 }
 
-class CustomButton extends React.Component<any,{}> { // cant type this more specifically because of some typing issues w ES6 classes not having component.replaceState
+class CustomButton extends React.Component<any, {}> {
+    // cant type this more specifically because of some typing issues w ES6 classes not having component.replaceState
     render() {
-        const {bsRole, title, ...props} = this.props;
+        const { bsRole, title, ...props } = this.props;
         return (
             <Button className="btn btn-default" {...props}>
-                {title} {this.props.titleElement} <span className="caret"/>
+                {title} {this.props.titleElement} <span className="caret" />
             </Button>
         );
     }
 }
-class CustomMenu extends React.Component<any,{}> {
-
+class CustomMenu extends React.Component<any, {}> {
     render() {
         const { className, children } = this.props;
 
         return (
-            <div className={classNames("dropdown-menu", className)} style={{ padding: '6px' }}>
+            <div
+                className={classNames('dropdown-menu', className)}
+                style={{ padding: '6px' }}
+            >
                 {children}
             </div>
         );
@@ -34,24 +37,37 @@ class CustomMenu extends React.Component<any,{}> {
 }
 
 @observer
-export default class CustomDropdown extends React.Component<ButtonProps & {titleElement?: JSX.Element}, {}> {
-    @observable private open:boolean = false;
+export default class CustomDropdown extends React.Component<
+    ButtonProps & { titleElement?: JSX.Element },
+    {}
+> {
+    @observable private open: boolean = false;
 
-    private toggle:()=>void;
-    private hide:()=>void;
+    private toggle: () => void;
+    private hide: () => void;
 
-    constructor(props:ButtonProps) {
+    constructor(props: ButtonProps) {
         super(props);
-        this.toggle = ()=>{this.open = !this.open;};
-        this.hide = ()=>{this.open = false;};
+        this.toggle = () => {
+            this.open = !this.open;
+        };
+        this.hide = () => {
+            this.open = false;
+        };
     }
 
     render() {
-        const {children, id, className, ref, ...props} = this.props;
+        const { children, id, className, ref, ...props } = this.props;
         return (
             <RootCloseWrapper onRootClose={this.hide}>
-                <Dropdown id={id+""} open={this.open}>
-                    <CustomButton bsStyle="default" bsRole="toggle" title="Custom Toggle" onClick={this.toggle} {...props}/>
+                <Dropdown id={id + ''} open={this.open}>
+                    <CustomButton
+                        bsStyle="default"
+                        bsRole="toggle"
+                        title="Custom Toggle"
+                        onClick={this.toggle}
+                        {...props}
+                    />
                     <CustomMenu bsRole="menu" className={classNames(className)}>
                         {children}
                     </CustomMenu>
@@ -60,4 +76,3 @@ export default class CustomDropdown extends React.Component<ButtonProps & {title
         );
     }
 }
-
diff --git a/src/shared/components/oncoprint/controls/NonClosingDropdown.tsx b/src/shared/components/oncoprint/controls/NonClosingDropdown.tsx
index 62450bc72f2..f3ae1160011 100644
--- a/src/shared/components/oncoprint/controls/NonClosingDropdown.tsx
+++ b/src/shared/components/oncoprint/controls/NonClosingDropdown.tsx
@@ -1,41 +1,47 @@
-import * as React from "react";
-import {DropdownButtonProps, DropdownButton} from "react-bootstrap";
-import {observer} from "mobx-react";
-import {computed, observable} from "mobx";
+import * as React from 'react';
+import { DropdownButtonProps, DropdownButton } from 'react-bootstrap';
+import { observer } from 'mobx-react';
+import { computed, observable } from 'mobx';
 
 @observer
-export default class NonClosingDropdown extends React.Component<DropdownButtonProps, {}> {
-    private _forceOpen:boolean = false;
-    @observable private open:boolean = false;
+export default class NonClosingDropdown extends React.Component<
+    DropdownButtonProps,
+    {}
+> {
+    private _forceOpen: boolean = false;
+    @observable private open: boolean = false;
 
     @computed private get onToggle() {
-        return (newVal:boolean)=>{
+        return (newVal: boolean) => {
             if (this._forceOpen) {
                 this._forceOpen = false;
             } else {
                 this.open = newVal;
             }
             this.props.onToggle && this.props.onToggle(newVal);
-        }
+        };
     }
 
     render() {
-        const {children, open, onToggle, ...props} = this.props;
+        const { children, open, onToggle, ...props } = this.props;
         return (
-            <DropdownButton open={this.open} onToggle={this.onToggle} {...props}>
-                {React.Children.toArray(children).map((x:React.ReactElement<{onClick?:()=>void}>)=>{
-                    const onClick = x.props.onClick || (()=>{});
-                    return React.cloneElement(
-                        x,
-                        {
-                            onClick: ()=>{
+            <DropdownButton
+                open={this.open}
+                onToggle={this.onToggle}
+                {...props}
+            >
+                {React.Children.toArray(children).map(
+                    (x: React.ReactElement<{ onClick?: () => void }>) => {
+                        const onClick = x.props.onClick || (() => {});
+                        return React.cloneElement(x, {
+                            onClick: () => {
                                 this._forceOpen = true;
                                 onClick();
-                            }
-                        } as {onClick?:()=>void}
-                    );
-                })}
+                            },
+                        } as { onClick?: () => void });
+                    }
+                )}
             </DropdownButton>
         );
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/oncoprint/controls/OncoprintControls.tsx b/src/shared/components/oncoprint/controls/OncoprintControls.tsx
index 05720b81027..043af9077cf 100644
--- a/src/shared/components/oncoprint/controls/OncoprintControls.tsx
+++ b/src/shared/components/oncoprint/controls/OncoprintControls.tsx
@@ -1,32 +1,49 @@
 import * as React from 'react';
-import {observer, Observer} from 'mobx-react';
-import {Button, ButtonGroup, Modal} from 'react-bootstrap';
+import { observer, Observer } from 'mobx-react';
+import { Button, ButtonGroup, Modal } from 'react-bootstrap';
 import CustomDropdown from './CustomDropdown';
 import ConfirmNgchmModal from './ConfirmNgchmModal';
 import ReactSelect from 'react-select1';
-import {MobxPromise} from 'mobxpromise';
-import {action, computed, IObservableObject, observable, ObservableMap, reaction, toJS,} from 'mobx';
+import { MobxPromise } from 'mobxpromise';
+import {
+    action,
+    computed,
+    IObservableObject,
+    observable,
+    ObservableMap,
+    reaction,
+    toJS,
+} from 'mobx';
 import _ from 'lodash';
-import {SortMode} from '../ResultsViewOncoprint';
-import {Gene, MolecularProfile} from 'shared/api/generated/CBioPortalAPI';
+import { SortMode } from '../ResultsViewOncoprint';
+import { Gene, MolecularProfile } from 'shared/api/generated/CBioPortalAPI';
 import LoadingIndicator from 'shared/components/loadingIndicator/LoadingIndicator';
 import {
     DefaultTooltip,
     EditableSpan,
-    CheckedSelect
+    CheckedSelect,
 } from 'cbioportal-frontend-commons';
 import Slider from 'react-rangeslider';
 import 'react-rangeslider/lib/index.css';
 import './styles.scss';
 import classNames from 'classnames';
-import {SpecialAttribute} from '../../../cache/ClinicalDataCache';
-import {AlterationTypeConstants, ResultsViewPageStore, GenericAssayTypeConstants,} from '../../../../pages/resultsView/ResultsViewPageStore';
-import {OncoprintAnalysisCaseType, ExtendedClinicalAttribute} from '../../../../pages/resultsView/ResultsViewPageStoreUtils';
-import OQLTextArea, {GeneBoxType} from '../../GeneSelectionBox/OQLTextArea';
+import { SpecialAttribute } from '../../../cache/ClinicalDataCache';
+import {
+    AlterationTypeConstants,
+    ResultsViewPageStore,
+    GenericAssayTypeConstants,
+} from '../../../../pages/resultsView/ResultsViewPageStore';
+import {
+    OncoprintAnalysisCaseType,
+    ExtendedClinicalAttribute,
+} from '../../../../pages/resultsView/ResultsViewPageStoreUtils';
+import OQLTextArea, { GeneBoxType } from '../../GeneSelectionBox/OQLTextArea';
 import autobind from 'autobind-decorator';
-import {SingleGeneQuery} from '../../../lib/oql/oql-parser';
+import { SingleGeneQuery } from '../../../lib/oql/oql-parser';
 import AddClinicalTracks from '../../../../pages/resultsView/oncoprint/AddClinicalTracks';
-import DriverAnnotationControls, {IDriverAnnotationControlsHandlers} from "../../../../pages/resultsView/settings/DriverAnnotationControls";
+import DriverAnnotationControls, {
+    IDriverAnnotationControlsHandlers,
+} from '../../../../pages/resultsView/settings/DriverAnnotationControls';
 import OncoprintDropdownCount from 'pages/resultsView/oncoprint/OncoprintDropdownCount';
 import TextIconArea, {
     ITextIconAreaItemProps,
@@ -126,7 +143,7 @@ export interface IOncoprintControlsState {
     selectedCustomDriverAnnotationTiers?: ObservableMap<boolean>;
     annotateCustomDriverBinary?: boolean;
 
-    columnMode?: OncoprintAnalysisCaseType
+    columnMode?: OncoprintAnalysisCaseType;
 
     horzZoom: number;
 }
@@ -193,7 +210,7 @@ export default class OncoprintControls extends React.Component<
     @observable private _selectedTreatmentIds: string[] = [];
     private textareaTreatmentText = '';
     @observable treatmentFilter = '';
-    @observable showConfirmNgchmModal:boolean = false;
+    @observable showConfirmNgchmModal: boolean = false;
 
     constructor(props: IOncoprintControlsProps) {
         super(props);
@@ -448,9 +465,12 @@ export default class OncoprintControls extends React.Component<
                     this.props.handlers.onClickDownload('tabular');
                 break;
             case EVENT_KEY.viewNGCHM:
-            	if (this.props.state.ngchmButtonActive && this.props.handlers.onClickNGCHM) {
+                if (
+                    this.props.state.ngchmButtonActive &&
+                    this.props.handlers.onClickNGCHM
+                ) {
                     this.showConfirmNgchmModal = true;
-            	}
+                }
                 break;
         }
     }
@@ -502,9 +522,19 @@ export default class OncoprintControls extends React.Component<
         _.remove(this._selectedTreatmentIds, v => v === treatmentId);
     }
 
-    private filterHeatmapProfilesByGenericAssayType(profiles: MolecularProfile[]) {
-        return _.filter(profiles, (profile) => profile.molecularAlterationType !== AlterationTypeConstants.GENERIC_ASSAY ||
-                                                                              profile.molecularAlterationType === AlterationTypeConstants.GENERIC_ASSAY && profile.genericAssayType === GenericAssayTypeConstants.TREATMENT_RESPONSE)
+    private filterHeatmapProfilesByGenericAssayType(
+        profiles: MolecularProfile[]
+    ) {
+        return _.filter(
+            profiles,
+            profile =>
+                profile.molecularAlterationType !==
+                    AlterationTypeConstants.GENERIC_ASSAY ||
+                (profile.molecularAlterationType ===
+                    AlterationTypeConstants.GENERIC_ASSAY &&
+                    profile.genericAssayType ===
+                        GenericAssayTypeConstants.TREATMENT_RESPONSE)
+        );
     }
 
     @computed get heatmapProfileOptions() {
@@ -514,15 +544,14 @@ export default class OncoprintControls extends React.Component<
         ) {
             // only add GENERIC_ASSAY when generic_assay_type is TREATMENT_RESPONSE
             // TODO: apply to all generic assay profiles when front-end implementation finish
-            const filteredHeatmapProfiles = this.filterHeatmapProfilesByGenericAssayType(this.props.state.heatmapProfilesPromise.result);
-            return _.map(
-                filteredHeatmapProfiles,
-                profile => ({
-                    label: profile.name,
-                    value: profile.molecularProfileId,
-                    type: profile.molecularAlterationType,
-                })
+            const filteredHeatmapProfiles = this.filterHeatmapProfilesByGenericAssayType(
+                this.props.state.heatmapProfilesPromise.result
             );
+            return _.map(filteredHeatmapProfiles, profile => ({
+                label: profile.name,
+                value: profile.molecularProfileId,
+                type: profile.molecularAlterationType,
+            }));
         } else {
             return [];
         }
@@ -714,13 +743,31 @@ export default class OncoprintControls extends React.Component<
 
                         {this.props.state.ngchmButtonActive && [
                             <hr />,
-                            (<DefaultTooltip overlay={<span>Open a new tab to visualize this study as Next Generation Clustered Heatmaps from MD Anderson Cancer Center.</span>}>
-                             <button
-                                 className={classNames("btn", "btn-sm", "btn-default")}
-                                 name={EVENT_KEY.viewNGCHM}
-                                 onClick={this.onButtonClick}
-                             >Whole Study Heatmap (NG-CHM) <i className="fa fa-external-link" aria-hidden="true"></i></button>
-                             </DefaultTooltip>)
+                            <DefaultTooltip
+                                overlay={
+                                    <span>
+                                        Open a new tab to visualize this study
+                                        as Next Generation Clustered Heatmaps
+                                        from MD Anderson Cancer Center.
+                                    </span>
+                                }
+                            >
+                                <button
+                                    className={classNames(
+                                        'btn',
+                                        'btn-sm',
+                                        'btn-default'
+                                    )}
+                                    name={EVENT_KEY.viewNGCHM}
+                                    onClick={this.onButtonClick}
+                                >
+                                    Whole Study Heatmap (NG-CHM){' '}
+                                    <i
+                                        className="fa fa-external-link"
+                                        aria-hidden="true"
+                                    ></i>
+                                </button>
+                            </DefaultTooltip>,
                         ]}
                     </div>
                 );
@@ -734,15 +781,22 @@ export default class OncoprintControls extends React.Component<
                 title="Add Heatmap Tracks"
                 id="heatmapDropdown"
                 className="heatmap"
-                titleElement={<OncoprintDropdownCount
-                    // only add GENERIC_ASSAY when generic_assay_type is TREATMENT_RESPONSE
-                    // TODO: apply to all generic assay profiles when front-end implementation finish
-                    count={
-                        this.props.state.heatmapProfilesPromise.isComplete && this.props.state.heatmapProfilesPromise!.result ?
-                            this.filterHeatmapProfilesByGenericAssayType(this.props.state.heatmapProfilesPromise!.result!).length :
-                            undefined
-                    }
-                />}
+                titleElement={
+                    <OncoprintDropdownCount
+                        // only add GENERIC_ASSAY when generic_assay_type is TREATMENT_RESPONSE
+                        // TODO: apply to all generic assay profiles when front-end implementation finish
+                        count={
+                            this.props.state.heatmapProfilesPromise
+                                .isComplete &&
+                            this.props.state.heatmapProfilesPromise!.result
+                                ? this.filterHeatmapProfilesByGenericAssayType(
+                                      this.props.state.heatmapProfilesPromise!
+                                          .result!
+                                  ).length
+                                : undefined
+                        }
+                    />
+                }
             >
                 {menu}
             </CustomDropdown>
@@ -916,9 +970,13 @@ export default class OncoprintControls extends React.Component<
                     <div style={{ marginLeft: 10 }}>
                         <DriverAnnotationControls
                             state={this.props.state}
-                            handlers={Object.assign({
-                                onCustomDriverTierCheckboxClick: this.onCustomDriverTierCheckboxClick
-                            } as Partial<IDriverAnnotationControlsHandlers>, this.props.handlers)}
+                            handlers={Object.assign(
+                                {
+                                    onCustomDriverTierCheckboxClick: this
+                                        .onCustomDriverTierCheckboxClick,
+                                } as Partial<IDriverAnnotationControlsHandlers>,
+                                this.props.handlers
+                            )}
                         />
                     </div>
 
@@ -953,7 +1011,8 @@ export default class OncoprintControls extends React.Component<
                                     }
                                     onClick={this.onInputClick}
                                     disabled={
-                                        !this.props.state.distinguishGermlineMutations
+                                        !this.props.state
+                                            .distinguishGermlineMutations
                                     }
                                 />{' '}
                                 Hide germline mutations
@@ -967,25 +1026,34 @@ export default class OncoprintControls extends React.Component<
             return (
                 <>
                     <h5>Annotate and Filter</h5>
-                    <div style={{display:"flex", flexDirection:"row", alignItems:"center", marginLeft:10}}>
+                    <div
+                        style={{
+                            display: 'flex',
+                            flexDirection: 'row',
+                            alignItems: 'center',
+                            marginLeft: 10,
+                        }}
+                    >
                         Please see the
                         <button
                             style={{
-                                marginLeft:5,
-                                marginRight:5,
-                                marginBottom:0,
-                                width:"auto",
-                                padding:"1px 5px 1px 5px"
+                                marginLeft: 5,
+                                marginRight: 5,
+                                marginBottom: 0,
+                                width: 'auto',
+                                padding: '1px 5px 1px 5px',
                             }}
                             className="btn btn-primary"
-                            onClick={()=>{ store.resultsPageSettingsVisible = !store.resultsPageSettingsVisible }}
+                            onClick={() => {
+                                store.resultsPageSettingsVisible = !store.resultsPageSettingsVisible;
+                            }}
                         >
-                            <i className="fa fa-sliders"/>
+                            <i className="fa fa-sliders" />
                         </button>
                         menu.
                     </div>
                 </>
-            )
+            );
         }
     }
 
@@ -1105,7 +1173,8 @@ export default class OncoprintControls extends React.Component<
                             name="columnType"
                             value={EVENT_KEY.columnTypeSample}
                             checked={
-                                this.props.state.columnMode === OncoprintAnalysisCaseType.SAMPLE
+                                this.props.state.columnMode ===
+                                OncoprintAnalysisCaseType.SAMPLE
                             }
                             onClick={this.onInputClick}
                         />{' '}
@@ -1119,7 +1188,8 @@ export default class OncoprintControls extends React.Component<
                             name="columnType"
                             value={EVENT_KEY.columnTypePatient}
                             checked={
-                                this.props.state.columnMode === OncoprintAnalysisCaseType.PATIENT
+                                this.props.state.columnMode ===
+                                OncoprintAnalysisCaseType.PATIENT
                             }
                             onClick={this.onInputClick}
                         />{' '}
@@ -1184,7 +1254,8 @@ export default class OncoprintControls extends React.Component<
                             }
                         />{' '}
                         Only show clinical track legends for altered{' '}
-                        {this.props.state.columnMode === OncoprintAnalysisCaseType.PATIENT
+                        {this.props.state.columnMode ===
+                        OncoprintAnalysisCaseType.PATIENT
                             ? 'patients'
                             : 'samples'}
                         .
@@ -1264,9 +1335,7 @@ export default class OncoprintControls extends React.Component<
                     overlay={<span>Zoom out of oncoprint.</span>}
                     placement="top"
                 >
-                    <div
-                        onClick={this.onZoomOutClick}
-                    >
+                    <div onClick={this.onZoomOutClick}>
                         <i className="fa fa-search-minus"></i>
                     </div>
                 </DefaultTooltip>
@@ -1311,10 +1380,8 @@ export default class OncoprintControls extends React.Component<
                     overlay={<span>Zoom in to oncoprint.</span>}
                     placement="top"
                 >
-                    <div
-                        onClick={this.onZoomInClick}
-                    >
-                          <i className="fa fa-search-plus"></i>
+                    <div onClick={this.onZoomInClick}>
+                        <i className="fa fa-search-plus"></i>
                     </div>
                 </DefaultTooltip>
             </div>
@@ -1364,11 +1431,11 @@ export default class OncoprintControls extends React.Component<
                     <Observer>{this.getDownloadMenu}</Observer>
                     <Observer>{this.getHorzZoomControls}</Observer>
                     {this.minimapButton}
-                    <ConfirmNgchmModal 
+                    <ConfirmNgchmModal
                         show={this.showConfirmNgchmModal}
-                        onHide={()=>this.showConfirmNgchmModal=false}
+                        onHide={() => (this.showConfirmNgchmModal = false)}
                         openNgchmWindow={this.props.handlers.onClickNGCHM}
-                        />
+                    />
                 </ButtonGroup>
             </div>
         );
diff --git a/src/shared/components/oncoprint/controls/styles.scss b/src/shared/components/oncoprint/controls/styles.scss
index a7ddb115f63..1379e45bbe0 100644
--- a/src/shared/components/oncoprint/controls/styles.scss
+++ b/src/shared/components/oncoprint/controls/styles.scss
@@ -1,176 +1,167 @@
-
-
 .oncoprint__controls {
+    display: flex;
 
-  display:flex;
-  
-  .rangeslider {
-    margin:0;
-    .rangeslider__labels {
-      display:none;
-    }
-    .rangeslider__handle {
-      height:10px;
-      width:10px;
-      &:after {
-        display:none;
-      }
-    }
-  }
-  
-  .checkbox, .radio {
-    &:first-child {
-      margin-top:0px;
-    }
-  }
-  .dropdown-menu {
-    width:270px;
-    padding:12px !important;
-    > *, button {
-      margin-bottom:10px;
-      width:100%;
-    }
-    > :last-child {
-      margin-bottom:0 !important;
-    }
-    &.heatmap {
-      width:450px;
-    }
-  }
-  
-  .oncoprint__controls__heatmap_menu {
-    textarea {
-      width:100%;
-      min-height:50px;
-      border:1px solid $borderColor;
-      resize: vertical;
-      
-      &.treatment-textarea {
-        border-radius: 2px;
-      }
+    .rangeslider {
+        margin: 0;
+        .rangeslider__labels {
+            display: none;
+        }
+        .rangeslider__handle {
+            height: 10px;
+            width: 10px;
+            &:after {
+                display: none;
+            }
+        }
     }
-    > *, button {
-      margin-bottom:10px;
-      width:100%;
+
+    .checkbox,
+    .radio {
+        &:first-child {
+            margin-top: 0px;
+        }
     }
-    > :last-child {
-      margin-bottom:0 !important;
+    .dropdown-menu {
+        width: 270px;
+        padding: 12px !important;
+        > *,
+        button {
+            margin-bottom: 10px;
+            width: 100%;
+        }
+        > :last-child {
+            margin-bottom: 0 !important;
+        }
+        &.heatmap {
+            width: 450px;
+        }
     }
 
-    .treatment-selector {
-      
-      button {
-        width: auto;
-        margin: 0;
-        padding: 5px 10px;
-        vertical-align: middle;
-      }
-      
-    }
-        
-    .text-icon-area {
-      width:100%;
-      min-height:50px;
-      overflow: hidden;
-      margin-bottom: 5px;
-
-      $iconMargin: 2px;
-      $iconPadding: 1px;
-
-      .icon-area {
-        min-height:0px;
-        overflow: hidden;
-        padding: 1px;
-        padding-bottom: 2px;
-
-        .icon {
-          padding: $iconPadding;
-          padding-left: $iconPadding+6;
-          padding-right: $iconPadding+6;
-          margin: $iconMargin;
-          margin-bottom: $iconMargin+1;
-          background: $brand-primary;
-          color: white;
-          border-radius: 4px;
-          float: left;
-        }
-
-      }
-      
-      .text-area {
-        width:100%;
-        min-height: 50px;
-        resize: vertical;
-        overflow: hidden;
-        border:1px solid $borderColor;
-      }
+    .oncoprint__controls__heatmap_menu {
+        textarea {
+            width: 100%;
+            min-height: 50px;
+            border: 1px solid $borderColor;
+            resize: vertical;
 
-    }
+            &.treatment-textarea {
+                border-radius: 2px;
+            }
+        }
+        > *,
+        button {
+            margin-bottom: 10px;
+            width: 100%;
+        }
+        > :last-child {
+            margin-bottom: 0 !important;
+        }
 
-  }
-    
-  .oncoprint__zoom-controls {
-    display:flex !important;
-    align-items:center;
-    
-    > * {
-      margin-right:10px;
-    }
-    
-    > :last-child {
-      margin-right:0;
-    }
-    
-  }
-  
-  .Select {
-    
-    margin-right:10px;
-    
-    .Select-control {
-      height:32px;
-    }
-    
-    .Select-input {
-      height:32px;
+        .treatment-selector {
+            button {
+                width: auto;
+                margin: 0;
+                padding: 5px 10px;
+                vertical-align: middle;
+            }
+        }
+
+        .text-icon-area {
+            width: 100%;
+            min-height: 50px;
+            overflow: hidden;
+            margin-bottom: 5px;
+
+            $iconMargin: 2px;
+            $iconPadding: 1px;
+
+            .icon-area {
+                min-height: 0px;
+                overflow: hidden;
+                padding: 1px;
+                padding-bottom: 2px;
+
+                .icon {
+                    padding: $iconPadding;
+                    padding-left: $iconPadding + 6;
+                    padding-right: $iconPadding + 6;
+                    margin: $iconMargin;
+                    margin-bottom: $iconMargin + 1;
+                    background: $brand-primary;
+                    color: white;
+                    border-radius: 4px;
+                    float: left;
+                }
+            }
+
+            .text-area {
+                width: 100%;
+                min-height: 50px;
+                resize: vertical;
+                overflow: hidden;
+                border: 1px solid $borderColor;
+            }
+        }
     }
-    
-  }
 
-  .clinical-track-selector {
-    .Select-control {
-      height:33px;
+    .oncoprint__zoom-controls {
+        display: flex !important;
+        align-items: center;
+
+        > * {
+            margin-right: 10px;
+        }
+
+        > :last-child {
+            margin-right: 0;
+        }
     }
 
     .Select {
+        margin-right: 10px;
 
-      .Select-placeholder {
-        color: #000;
-      }
-
-      .Select-arrow {
-        border-color: #000 transparent transparent;
-      }
+        .Select-control {
+            height: 32px;
+        }
 
-      .Select-menu-outer {
-        max-height: 400px;
-      }
+        .Select-input {
+            height: 32px;
+        }
+    }
 
-      .Select-menu {
-        max-height: 398px; // needs to be 2 less than Select-menu-outer height to not hide border. Irrelevant
-                          //    as long as & > div > div:nth-child(2) max-height is less
-        overflow:hidden;
+    .clinical-track-selector {
+        .Select-control {
+            height: 33px;
+        }
 
-        & > div > div:nth-child(2){
-          max-height:350px !important;
-          overflow-x:hidden !important;
-          overflow-y:scroll !important;
+        .Select {
+            .Select-placeholder {
+                color: #000;
+            }
+
+            .Select-arrow {
+                border-color: #000 transparent transparent;
+            }
+
+            .Select-menu-outer {
+                max-height: 400px;
+            }
+
+            .Select-menu {
+                max-height: 398px; // needs to be 2 less than Select-menu-outer height to not hide border. Irrelevant
+                //    as long as & > div > div:nth-child(2) max-height is less
+                overflow: hidden;
+
+                & > div > div:nth-child(2) {
+                    max-height: 350px !important;
+                    overflow-x: hidden !important;
+                    overflow-y: scroll !important;
+                }
+            }
         }
-      }
     }
-  }
 
-  .clinical-track-selector .is-open .Select-control .Select-arrow {
-    border-color: transparent transparent #000;
-  }
+    .clinical-track-selector .is-open .Select-control .Select-arrow {
+        border-color: transparent transparent #000;
+    }
 }
diff --git a/src/shared/components/oncoprint/geneticrules.ts b/src/shared/components/oncoprint/geneticrules.ts
index c1880f887d8..8420d7c9ed1 100644
--- a/src/shared/components/oncoprint/geneticrules.ts
+++ b/src/shared/components/oncoprint/geneticrules.ts
@@ -1,26 +1,32 @@
-import * as $ from "jquery";
-import {GeneticAlterationRuleParams, IGeneticAlterationRuleSetParams, RuleSetParams, RuleSetType} from "oncoprintjs";
+import * as $ from 'jquery';
 import {
-	CNA_COLOR_AMP,
-	CNA_COLOR_GAIN,
-	CNA_COLOR_HETLOSS,
-	CNA_COLOR_HOMDEL,
-	DEFAULT_GREY,
-	MRNA_COLOR_HIGH,
-	MRNA_COLOR_LOW,
-	MUT_COLOR_FUSION,
-	MUT_COLOR_GERMLINE,
-	MUT_COLOR_INFRAME, MUT_COLOR_INFRAME_PASSENGER,
-	MUT_COLOR_MISSENSE,
-	MUT_COLOR_MISSENSE_PASSENGER,
-	MUT_COLOR_OTHER,
-	MUT_COLOR_PROMOTER,
-	MUT_COLOR_TRUNC,
-	MUT_COLOR_TRUNC_PASSENGER,
-	PROT_COLOR_HIGH,
-	PROT_COLOR_LOW
-} from "shared/lib/Colors";
-import _ from "lodash";
+    GeneticAlterationRuleParams,
+    IGeneticAlterationRuleSetParams,
+    RuleSetParams,
+    RuleSetType,
+} from 'oncoprintjs';
+import {
+    CNA_COLOR_AMP,
+    CNA_COLOR_GAIN,
+    CNA_COLOR_HETLOSS,
+    CNA_COLOR_HOMDEL,
+    DEFAULT_GREY,
+    MRNA_COLOR_HIGH,
+    MRNA_COLOR_LOW,
+    MUT_COLOR_FUSION,
+    MUT_COLOR_GERMLINE,
+    MUT_COLOR_INFRAME,
+    MUT_COLOR_INFRAME_PASSENGER,
+    MUT_COLOR_MISSENSE,
+    MUT_COLOR_MISSENSE_PASSENGER,
+    MUT_COLOR_OTHER,
+    MUT_COLOR_PROMOTER,
+    MUT_COLOR_TRUNC,
+    MUT_COLOR_TRUNC_PASSENGER,
+    PROT_COLOR_HIGH,
+    PROT_COLOR_LOW,
+} from 'shared/lib/Colors';
+import _ from 'lodash';
 // Feed this in as
 
 const MUTATION_LEGEND_ORDER = 0;
@@ -36,431 +42,475 @@ const PROT_HIGH_LEGEND_ORDER = 31;
 const PROT_LOW_LEGEND_ORDER = 32;
 
 enum ShapeId {
-    defaultGrayRectangle="defaultGrayRectangle",
+    defaultGrayRectangle = 'defaultGrayRectangle',
 
-    ampRectangle="ampRectangle",
-    gainRectangle="gainRectangle",
-    homdelRectangle="homdelRectangle",
-    hetlossRectangle="hetlossRectangle",
+    ampRectangle = 'ampRectangle',
+    gainRectangle = 'gainRectangle',
+    homdelRectangle = 'homdelRectangle',
+    hetlossRectangle = 'hetlossRectangle',
 
-    mrnaHighRectangle="mrnaHighRectangle",
-    mrnaLowRectangle="mrnaLowRectangle",
+    mrnaHighRectangle = 'mrnaHighRectangle',
+    mrnaLowRectangle = 'mrnaLowRectangle',
 
-    protHighRectangle="protHighRectangle",
-    protLowRectangle="protLowRectangle",
+    protHighRectangle = 'protHighRectangle',
+    protLowRectangle = 'protLowRectangle',
 
-    fusionRectangle="fusionRectangle",
+    fusionRectangle = 'fusionRectangle',
 
-    germlineRectangle="germlineRectangle",
+    germlineRectangle = 'germlineRectangle',
 
-    missenseMutationDriverRectangle="missenseMutationDriverRectangle",
-    missenseMutationVUSRectangle="missenseMutationVUSRectangle",
-    otherMutationRectangle="otherMutationRectangle",
-    promoterMutationRectangle="promoterMutationRectangle",
-    truncatingMutationDriverRectangle="truncatingMutationDriverRectangle",
-    truncatingMutationVUSRectangle="truncatingMutationVUSRectangle",
-    inframeMutationDriverRectangle="inframeMutationDriverRectangle",
-    inframeMutationVUSRectangle="inframeMutationVUSRectangle",
+    missenseMutationDriverRectangle = 'missenseMutationDriverRectangle',
+    missenseMutationVUSRectangle = 'missenseMutationVUSRectangle',
+    otherMutationRectangle = 'otherMutationRectangle',
+    promoterMutationRectangle = 'promoterMutationRectangle',
+    truncatingMutationDriverRectangle = 'truncatingMutationDriverRectangle',
+    truncatingMutationVUSRectangle = 'truncatingMutationVUSRectangle',
+    inframeMutationDriverRectangle = 'inframeMutationDriverRectangle',
+    inframeMutationVUSRectangle = 'inframeMutationVUSRectangle',
 }
 
 const shapeBank = {
     [ShapeId.defaultGrayRectangle]: {
-        'type': 'rectangle',
-        'fill': DEFAULT_GREY,
-        'z': 1
+        type: 'rectangle',
+        fill: DEFAULT_GREY,
+        z: 1,
     },
     [ShapeId.ampRectangle]: {
-        'type': 'rectangle',
-        'fill': CNA_COLOR_AMP,
-        'x': 0,
-        'y': 0,
-        'width': 100,
-        'height': 100,
-        'z': 2,
+        type: 'rectangle',
+        fill: CNA_COLOR_AMP,
+        x: 0,
+        y: 0,
+        width: 100,
+        height: 100,
+        z: 2,
     },
     [ShapeId.gainRectangle]: {
-        'type': 'rectangle',
-        'fill': CNA_COLOR_GAIN,
-        'x': 0,
-        'y': 0,
-        'width': 100,
-        'height': 100,
-        'z': 2,
+        type: 'rectangle',
+        fill: CNA_COLOR_GAIN,
+        x: 0,
+        y: 0,
+        width: 100,
+        height: 100,
+        z: 2,
     },
-    [ShapeId.homdelRectangle]:{
-        'type': 'rectangle',
-        'fill': CNA_COLOR_HOMDEL,
-        'x': 0,
-        'y': 0,
-        'width': 100,
-        'height': 100,
-        'z': 2,
+    [ShapeId.homdelRectangle]: {
+        type: 'rectangle',
+        fill: CNA_COLOR_HOMDEL,
+        x: 0,
+        y: 0,
+        width: 100,
+        height: 100,
+        z: 2,
     },
-    [ShapeId.hetlossRectangle]:{
-        'type': 'rectangle',
-        'fill': CNA_COLOR_HETLOSS,
-        'x': 0,
-        'y': 0,
-        'width': 100,
-        'height': 100,
-        'z': 2,
+    [ShapeId.hetlossRectangle]: {
+        type: 'rectangle',
+        fill: CNA_COLOR_HETLOSS,
+        x: 0,
+        y: 0,
+        width: 100,
+        height: 100,
+        z: 2,
     },
-    [ShapeId.mrnaHighRectangle]:{
-        'type': 'rectangle',
-        'fill': 'rgba(0, 0, 0, 0)',
-        'stroke': MRNA_COLOR_HIGH,
+    [ShapeId.mrnaHighRectangle]: {
+        type: 'rectangle',
+        fill: 'rgba(0, 0, 0, 0)',
+        stroke: MRNA_COLOR_HIGH,
         'stroke-width': 2,
-        'x': 0,
-        'y': 0,
-        'width': 100,
-        'height': 100,
-        'z': 3,
+        x: 0,
+        y: 0,
+        width: 100,
+        height: 100,
+        z: 3,
     },
-    [ShapeId.mrnaLowRectangle]:{
-        'type': 'rectangle',
-        'fill': 'rgba(0, 0, 0, 0)',
-        'stroke': MRNA_COLOR_LOW,
+    [ShapeId.mrnaLowRectangle]: {
+        type: 'rectangle',
+        fill: 'rgba(0, 0, 0, 0)',
+        stroke: MRNA_COLOR_LOW,
         'stroke-width': 2,
-        'x': 0,
-        'y': 0,
-        'width': 100,
-        'height': 100,
-        'z': 3,
+        x: 0,
+        y: 0,
+        width: 100,
+        height: 100,
+        z: 3,
     },
-    [ShapeId.protHighRectangle]:{
-        'type': 'rectangle',
-        'fill': PROT_COLOR_HIGH,
-        'x':0,
-        'y':0,
-        'width':100,
-        'height':20,
-        'z': 4,
+    [ShapeId.protHighRectangle]: {
+        type: 'rectangle',
+        fill: PROT_COLOR_HIGH,
+        x: 0,
+        y: 0,
+        width: 100,
+        height: 20,
+        z: 4,
     },
-    [ShapeId.protLowRectangle]:{
-        'type': 'rectangle',
-        'fill': PROT_COLOR_LOW,
-        'x':0,
-        'y':80,
-        'width':100,
-        'height':20,
-        'z': 4,
+    [ShapeId.protLowRectangle]: {
+        type: 'rectangle',
+        fill: PROT_COLOR_LOW,
+        x: 0,
+        y: 80,
+        width: 100,
+        height: 20,
+        z: 4,
     },
-    [ShapeId.fusionRectangle]:{
-        'type': 'rectangle',
-        'fill': MUT_COLOR_FUSION,
-        'x': 0,
-        'y': 20,
-        'width': 100,
-        'height': 60,
-        'z': 5
+    [ShapeId.fusionRectangle]: {
+        type: 'rectangle',
+        fill: MUT_COLOR_FUSION,
+        x: 0,
+        y: 20,
+        width: 100,
+        height: 60,
+        z: 5,
     },
-    [ShapeId.germlineRectangle]:{
-        'type': 'rectangle',
-        'fill': MUT_COLOR_GERMLINE,
-        'x': 0,
-        'y': 46,
-        'width': 100,
-        'height': 8,
-        'z': 7
+    [ShapeId.germlineRectangle]: {
+        type: 'rectangle',
+        fill: MUT_COLOR_GERMLINE,
+        x: 0,
+        y: 46,
+        width: 100,
+        height: 8,
+        z: 7,
     },
-    [ShapeId.missenseMutationDriverRectangle]:{
-        'type': 'rectangle',
-        'fill': MUT_COLOR_MISSENSE,
-        'x': 0,
-        'y': 33.33,
-        'width': 100,
-        'height': 33.33,
-        'z': 6
+    [ShapeId.missenseMutationDriverRectangle]: {
+        type: 'rectangle',
+        fill: MUT_COLOR_MISSENSE,
+        x: 0,
+        y: 33.33,
+        width: 100,
+        height: 33.33,
+        z: 6,
     },
-    [ShapeId.missenseMutationVUSRectangle]:{
-        'type': 'rectangle',
-        'fill': MUT_COLOR_MISSENSE_PASSENGER,
-        'x': 0,
-        'y': 33.33,
-        'width': 100,
-        'height': 33.33,
-        'z': 6
+    [ShapeId.missenseMutationVUSRectangle]: {
+        type: 'rectangle',
+        fill: MUT_COLOR_MISSENSE_PASSENGER,
+        x: 0,
+        y: 33.33,
+        width: 100,
+        height: 33.33,
+        z: 6,
     },
-    [ShapeId.otherMutationRectangle]:{
-        'type': 'rectangle',
-        'fill': MUT_COLOR_OTHER,
-        'x': 0,
-        'y': 33.33,
-        'width': 100,
-        'height': 33.33,
-        'z': 6,
+    [ShapeId.otherMutationRectangle]: {
+        type: 'rectangle',
+        fill: MUT_COLOR_OTHER,
+        x: 0,
+        y: 33.33,
+        width: 100,
+        height: 33.33,
+        z: 6,
     },
-    [ShapeId.promoterMutationRectangle]:{
-        'type': 'rectangle',
-        'fill': MUT_COLOR_PROMOTER,
-        'x': 0,
-        'y': 33.33,
-        'width': 100,
-        'height': 33.33,
-        'z': 6,
+    [ShapeId.promoterMutationRectangle]: {
+        type: 'rectangle',
+        fill: MUT_COLOR_PROMOTER,
+        x: 0,
+        y: 33.33,
+        width: 100,
+        height: 33.33,
+        z: 6,
     },
-    [ShapeId.truncatingMutationDriverRectangle]:{
-        'type': 'rectangle',
-        'fill': MUT_COLOR_TRUNC,
-        'x': 0,
-        'y': 33.33,
-        'width': 100,
-        'height': 33.33,
-        'z': 6,
+    [ShapeId.truncatingMutationDriverRectangle]: {
+        type: 'rectangle',
+        fill: MUT_COLOR_TRUNC,
+        x: 0,
+        y: 33.33,
+        width: 100,
+        height: 33.33,
+        z: 6,
     },
-    [ShapeId.truncatingMutationVUSRectangle]:{
-        'type': 'rectangle',
-        'fill': MUT_COLOR_TRUNC_PASSENGER,
-        'x': 0,
-        'y': 33.33,
-        'width': 100,
-        'height': 33.33,
-        'z': 6,
+    [ShapeId.truncatingMutationVUSRectangle]: {
+        type: 'rectangle',
+        fill: MUT_COLOR_TRUNC_PASSENGER,
+        x: 0,
+        y: 33.33,
+        width: 100,
+        height: 33.33,
+        z: 6,
     },
-    [ShapeId.inframeMutationDriverRectangle]:{
-        'type': 'rectangle',
-        'fill': MUT_COLOR_INFRAME,
-        'x': 0,
-        'y': 33.33,
-        'width': 100,
-        'height': 33.33,
-        'z': 6,
+    [ShapeId.inframeMutationDriverRectangle]: {
+        type: 'rectangle',
+        fill: MUT_COLOR_INFRAME,
+        x: 0,
+        y: 33.33,
+        width: 100,
+        height: 33.33,
+        z: 6,
+    },
+    [ShapeId.inframeMutationVUSRectangle]: {
+        type: 'rectangle',
+        fill: MUT_COLOR_INFRAME_PASSENGER,
+        x: 0,
+        y: 33.33,
+        width: 100,
+        height: 33.33,
+        z: 6,
     },
-    [ShapeId.inframeMutationVUSRectangle]:{
-        'type': 'rectangle',
-        'fill': MUT_COLOR_INFRAME_PASSENGER,
-        'x': 0,
-        'y': 33.33,
-        'width': 100,
-        'height': 33.33,
-        'z': 6,
-    }
 };
 
-const non_mutation_rule_params:GeneticAlterationRuleParams = {
+const non_mutation_rule_params: GeneticAlterationRuleParams = {
     // Default: gray rectangle
     always: {
         shapes: [shapeBank[ShapeId.defaultGrayRectangle]],
-        legend_label: "No alterations",
-        legend_order: Number.POSITIVE_INFINITY // put at the end always
+        legend_label: 'No alterations',
+        legend_order: Number.POSITIVE_INFINITY, // put at the end always
     },
-    conditional:{
+    conditional: {
         // Copy number alteration
-        'disp_cna': {
+        disp_cna: {
             // Red rectangle for amplification
-            'amp': {
+            amp: {
                 shapes: [shapeBank[ShapeId.ampRectangle]],
                 legend_label: 'Amplification',
-                legend_order: AMP_LEGEND_ORDER
+                legend_order: AMP_LEGEND_ORDER,
             },
             // Light red rectangle for gain
-            'gain': {
+            gain: {
                 shapes: [shapeBank[ShapeId.gainRectangle]],
                 legend_label: 'Gain',
-                legend_order: GAIN_LEGEND_ORDER
+                legend_order: GAIN_LEGEND_ORDER,
             },
             // Blue rectangle for deep deletion
-            'homdel': {
+            homdel: {
                 shapes: [shapeBank[ShapeId.homdelRectangle]],
                 legend_label: 'Deep Deletion',
-                legend_order: HOMDEL_LEGEND_ORDER
+                legend_order: HOMDEL_LEGEND_ORDER,
             },
             // Light blue rectangle for shallow deletion
-            'hetloss': {
+            hetloss: {
                 shapes: [shapeBank[ShapeId.hetlossRectangle]],
                 legend_label: 'Shallow Deletion',
-                legend_order: HETLOSS_LEGEND_ORDER
-            }
+                legend_order: HETLOSS_LEGEND_ORDER,
+            },
         },
         // mRNA regulation
-        'disp_mrna': {
+        disp_mrna: {
             // Light red outline for High
-            'high': {
+            high: {
                 shapes: [shapeBank[ShapeId.mrnaHighRectangle]],
                 legend_label: 'mRNA High',
-                legend_order: MRNA_HIGH_LEGEND_ORDER
+                legend_order: MRNA_HIGH_LEGEND_ORDER,
             },
             // Light blue outline for downregulation
-            'low': {
+            low: {
                 shapes: [shapeBank[ShapeId.mrnaLowRectangle]],
                 legend_label: 'mRNA Low',
-                legend_order: MRNA_LOW_LEGEND_ORDER
+                legend_order: MRNA_LOW_LEGEND_ORDER,
             },
         },
         // protein expression regulation
-        'disp_prot': {
+        disp_prot: {
             // small up arrow for upregulated
-            'high': {
+            high: {
                 shapes: [shapeBank[ShapeId.protHighRectangle]],
                 legend_label: 'Protein High',
-                legend_order: PROT_HIGH_LEGEND_ORDER
+                legend_order: PROT_HIGH_LEGEND_ORDER,
             },
             // small down arrow for upregulated
-            'low': {
+            low: {
                 shapes: [shapeBank[ShapeId.protLowRectangle]],
                 legend_label: 'Protein Low',
-                legend_order: PROT_LOW_LEGEND_ORDER
-            }
+                legend_order: PROT_LOW_LEGEND_ORDER,
+            },
         },
         // fusion
-        'disp_fusion': {
+        disp_fusion: {
             // tall inset purple rectangle for fusion
-            'true': {
+            true: {
                 shapes: [shapeBank[ShapeId.fusionRectangle]],
                 legend_label: 'Fusion',
-                legend_order: FUSION_LEGEND_ORDER
-            }
-        }
-    }
+                legend_order: FUSION_LEGEND_ORDER,
+            },
+        },
+    },
 };
 
 export const germline_rule_params = {
     // germline
-    'disp_germ': {
+    disp_germ: {
         // white stripe in the middle
-        'true': {
-            shapes: [{
-                'type': 'rectangle',
-                'fill': MUT_COLOR_GERMLINE,
-                'x': 0,
-                'y': 46,
-                'width': 100,
-                'height': 8,
-                'z': 7
-            }],
+        true: {
+            shapes: [
+                {
+                    type: 'rectangle',
+                    fill: MUT_COLOR_GERMLINE,
+                    x: 0,
+                    y: 46,
+                    width: 100,
+                    height: 8,
+                    z: 7,
+                },
+            ],
             legend_label: 'Germline Mutation',
-            legend_order: GERMLINE_LEGEND_ORDER
-        }
-    }
+            legend_order: GERMLINE_LEGEND_ORDER,
+        },
+    },
 };
 
-const base_genetic_rule_set_params:Partial<IGeneticAlterationRuleSetParams> = {
+const base_genetic_rule_set_params: Partial<IGeneticAlterationRuleSetParams> = {
     type: RuleSetType.GENE,
     legend_label: 'Genetic Alteration',
     na_legend_label: 'Not profiled',
-    legend_base_color: DEFAULT_GREY
+    legend_base_color: DEFAULT_GREY,
 };
 
-export const genetic_rule_set_same_color_for_all_no_recurrence:IGeneticAlterationRuleSetParams =
-    _.assign({}, base_genetic_rule_set_params, {
-        'rule_params': {
-            always:non_mutation_rule_params.always,
+export const genetic_rule_set_same_color_for_all_no_recurrence: IGeneticAlterationRuleSetParams = _.assign(
+    {},
+    base_genetic_rule_set_params,
+    {
+        rule_params: {
+            always: non_mutation_rule_params.always,
             conditional: _.assign({}, non_mutation_rule_params.conditional, {
-                'disp_mut': {
+                disp_mut: {
                     'trunc,inframe,missense,promoter,other,trunc_rec,inframe_rec,missense_rec,promoter_rec,other_rec': {
-                        shapes: [shapeBank[ShapeId.missenseMutationDriverRectangle]],
+                        shapes: [
+                            shapeBank[ShapeId.missenseMutationDriverRectangle],
+                        ],
                         legend_label: 'Mutation',
-                        legend_order: MUTATION_LEGEND_ORDER
-                    }
-                }
-            } as GeneticAlterationRuleParams["conditional"])
-        }
-    }) as IGeneticAlterationRuleSetParams;
+                        legend_order: MUTATION_LEGEND_ORDER,
+                    },
+                },
+            } as GeneticAlterationRuleParams['conditional']),
+        },
+    }
+) as IGeneticAlterationRuleSetParams;
 
-export const genetic_rule_set_same_color_for_all_recurrence:IGeneticAlterationRuleSetParams =
-    _.assign({}, base_genetic_rule_set_params, {
-        'rule_params': {
-            always:non_mutation_rule_params.always,
+export const genetic_rule_set_same_color_for_all_recurrence: IGeneticAlterationRuleSetParams = _.assign(
+    {},
+    base_genetic_rule_set_params,
+    {
+        rule_params: {
+            always: non_mutation_rule_params.always,
             conditional: _.assign({}, non_mutation_rule_params.conditional, {
-                'disp_mut': {
+                disp_mut: {
                     'missense_rec,inframe_rec,trunc_rec,promoter_rec,other_rec': {
-                        shapes: [shapeBank[ShapeId.missenseMutationDriverRectangle]],
+                        shapes: [
+                            shapeBank[ShapeId.missenseMutationDriverRectangle],
+                        ],
                         legend_label: 'Mutation (putative driver)',
-                        legend_order: MUTATION_LEGEND_ORDER
+                        legend_order: MUTATION_LEGEND_ORDER,
                     },
                     'missense,inframe,trunc,promoter,other': {
-                        shapes: [shapeBank[ShapeId.missenseMutationVUSRectangle]],
+                        shapes: [
+                            shapeBank[ShapeId.missenseMutationVUSRectangle],
+                        ],
                         legend_label: 'Mutation (unknown significance)',
-                        legend_order: MUTATION_LEGEND_ORDER
+                        legend_order: MUTATION_LEGEND_ORDER,
                     },
                 },
-            } as GeneticAlterationRuleParams["conditional"])
-        }
-    }) as IGeneticAlterationRuleSetParams;
+            } as GeneticAlterationRuleParams['conditional']),
+        },
+    }
+) as IGeneticAlterationRuleSetParams;
 
-export const genetic_rule_set_different_colors_no_recurrence:IGeneticAlterationRuleSetParams =
-    _.assign({}, base_genetic_rule_set_params, {
-        'rule_params': {
-            always:non_mutation_rule_params.always,
-            conditional:_.assign({}, non_mutation_rule_params.conditional, {
-                'disp_mut': {
-                    'other,other_rec':{
+export const genetic_rule_set_different_colors_no_recurrence: IGeneticAlterationRuleSetParams = _.assign(
+    {},
+    base_genetic_rule_set_params,
+    {
+        rule_params: {
+            always: non_mutation_rule_params.always,
+            conditional: _.assign({}, non_mutation_rule_params.conditional, {
+                disp_mut: {
+                    'other,other_rec': {
                         shapes: [shapeBank[ShapeId.otherMutationRectangle]],
                         legend_label: 'Other Mutation',
-                        legend_order: MUTATION_LEGEND_ORDER
+                        legend_order: MUTATION_LEGEND_ORDER,
                     },
                     'promoter,promoter_rec': {
                         shapes: [shapeBank[ShapeId.promoterMutationRectangle]],
                         legend_label: 'Promoter Mutation',
-                        legend_order: MUTATION_LEGEND_ORDER
+                        legend_order: MUTATION_LEGEND_ORDER,
                     },
                     'trunc,trunc_rec': {
-                        shapes: [shapeBank[ShapeId.truncatingMutationDriverRectangle]],
+                        shapes: [
+                            shapeBank[
+                                ShapeId.truncatingMutationDriverRectangle
+                            ],
+                        ],
                         legend_label: 'Truncating Mutation',
-                        legend_order: MUTATION_LEGEND_ORDER
+                        legend_order: MUTATION_LEGEND_ORDER,
                     },
                     'inframe,inframe_rec': {
-                        shapes: [shapeBank[ShapeId.inframeMutationDriverRectangle]],
+                        shapes: [
+                            shapeBank[ShapeId.inframeMutationDriverRectangle],
+                        ],
                         legend_label: 'Inframe Mutation',
-                        legend_order: MUTATION_LEGEND_ORDER
+                        legend_order: MUTATION_LEGEND_ORDER,
                     },
                     'missense,missense_rec': {
-                        shapes: [shapeBank[ShapeId.missenseMutationDriverRectangle]],
+                        shapes: [
+                            shapeBank[ShapeId.missenseMutationDriverRectangle],
+                        ],
                         legend_label: 'Missense Mutation',
-                        legend_order: MUTATION_LEGEND_ORDER
+                        legend_order: MUTATION_LEGEND_ORDER,
                     },
-                }
-            } as GeneticAlterationRuleParams["conditional"])
-        }
-    }) as IGeneticAlterationRuleSetParams;
+                },
+            } as GeneticAlterationRuleParams['conditional']),
+        },
+    }
+) as IGeneticAlterationRuleSetParams;
 
-export const genetic_rule_set_different_colors_recurrence:IGeneticAlterationRuleSetParams =
-    _.assign({}, base_genetic_rule_set_params, {
-        'rule_params': {
-            always:non_mutation_rule_params.always,
+export const genetic_rule_set_different_colors_recurrence: IGeneticAlterationRuleSetParams = _.assign(
+    {},
+    base_genetic_rule_set_params,
+    {
+        rule_params: {
+            always: non_mutation_rule_params.always,
             conditional: _.assign({}, non_mutation_rule_params.conditional, {
-                'disp_mut': {
-                    'other,other_rec':{
+                disp_mut: {
+                    'other,other_rec': {
                         shapes: [shapeBank[ShapeId.otherMutationRectangle]],
                         legend_label: 'Other Mutation',
-                        legend_order: MUTATION_LEGEND_ORDER
+                        legend_order: MUTATION_LEGEND_ORDER,
                     },
                     'promoter,promoter_rec': {
                         shapes: [shapeBank[ShapeId.promoterMutationRectangle]],
                         legend_label: 'Promoter Mutation',
-                        legend_order: MUTATION_LEGEND_ORDER
+                        legend_order: MUTATION_LEGEND_ORDER,
                     },
-                    'trunc_rec': {
-                        shapes: [shapeBank[ShapeId.truncatingMutationDriverRectangle]],
+                    trunc_rec: {
+                        shapes: [
+                            shapeBank[
+                                ShapeId.truncatingMutationDriverRectangle
+                            ],
+                        ],
                         legend_label: 'Truncating Mutation (putative driver)',
-                        legend_order: MUTATION_LEGEND_ORDER
+                        legend_order: MUTATION_LEGEND_ORDER,
                     },
-                    'trunc': {
-                        shapes: [shapeBank[ShapeId.truncatingMutationVUSRectangle]],
-                        legend_label: 'Truncating Mutation (unknown significance)',
-                        legend_order: MUTATION_LEGEND_ORDER
+                    trunc: {
+                        shapes: [
+                            shapeBank[ShapeId.truncatingMutationVUSRectangle],
+                        ],
+                        legend_label:
+                            'Truncating Mutation (unknown significance)',
+                        legend_order: MUTATION_LEGEND_ORDER,
                     },
-                    'inframe_rec': {
-                        shapes: [shapeBank[ShapeId.inframeMutationDriverRectangle]],
+                    inframe_rec: {
+                        shapes: [
+                            shapeBank[ShapeId.inframeMutationDriverRectangle],
+                        ],
                         legend_label: 'Inframe Mutation (putative driver)',
-                        legend_order: MUTATION_LEGEND_ORDER
+                        legend_order: MUTATION_LEGEND_ORDER,
                     },
-                    'inframe': {
-                        shapes: [shapeBank[ShapeId.inframeMutationVUSRectangle]],
+                    inframe: {
+                        shapes: [
+                            shapeBank[ShapeId.inframeMutationVUSRectangle],
+                        ],
                         legend_label: 'Inframe Mutation (unknown significance)',
-                        legend_order: MUTATION_LEGEND_ORDER
+                        legend_order: MUTATION_LEGEND_ORDER,
                     },
-                    'missense_rec': {
-                        shapes: [shapeBank[ShapeId.missenseMutationDriverRectangle]],
+                    missense_rec: {
+                        shapes: [
+                            shapeBank[ShapeId.missenseMutationDriverRectangle],
+                        ],
                         legend_label: 'Missense Mutation (putative driver)',
-                        legend_order: MUTATION_LEGEND_ORDER
+                        legend_order: MUTATION_LEGEND_ORDER,
                     },
-                    'missense': {
-                        shapes: [shapeBank[ShapeId.missenseMutationVUSRectangle]],
-                        legend_label: 'Missense Mutation (unknown significance)',
-                        legend_order: MUTATION_LEGEND_ORDER
+                    missense: {
+                        shapes: [
+                            shapeBank[ShapeId.missenseMutationVUSRectangle],
+                        ],
+                        legend_label:
+                            'Missense Mutation (unknown significance)',
+                        legend_order: MUTATION_LEGEND_ORDER,
                     },
-                }
-            } as GeneticAlterationRuleParams["conditional"])
-        }
-    }) as IGeneticAlterationRuleSetParams;
\ No newline at end of file
+                },
+            } as GeneticAlterationRuleParams['conditional']),
+        },
+    }
+) as IGeneticAlterationRuleSetParams;
diff --git a/src/shared/components/oncoprint/styles.scss b/src/shared/components/oncoprint/styles.scss
index be9200c63e0..1b48847ef6c 100644
--- a/src/shared/components/oncoprint/styles.scss
+++ b/src/shared/components/oncoprint/styles.scss
@@ -1,41 +1,41 @@
 .oncoprintjs__tooltip {
-  padding: 5px;
-  margin-top: -10px; // to compensate position for padding, since tooltip is positioned above (if positioned at center, wouldnt be problem)
-  width: 250px;
-  word-break: break-all;
+    padding: 5px;
+    margin-top: -10px; // to compensate position for padding, since tooltip is positioned above (if positioned at center, wouldnt be problem)
+    width: 250px;
+    word-break: break-all;
 }
 
 .oncoprint-hidden {
-  opacity: 0;
+    opacity: 0;
 }
 
 .oncoprintjs__scroll_div {
-  // force scrollbar visible, to indicate when theres more oncoprint offscreen to scroll to
-  // source: https://gist.github.com/devinrhode2/2573411#gistcomment-2243001
-  &::-webkit-scrollbar {
-    width: 8px;
-    height: 8px;
-    background-color: rgba(0,0,0,0);
-    -webkit-border-radius: 100px;
-  }
+    // force scrollbar visible, to indicate when theres more oncoprint offscreen to scroll to
+    // source: https://gist.github.com/devinrhode2/2573411#gistcomment-2243001
+    &::-webkit-scrollbar {
+        width: 8px;
+        height: 8px;
+        background-color: rgba(0, 0, 0, 0);
+        -webkit-border-radius: 100px;
+    }
 
-  &::-webkit-scrollbar:hover {
-    //background-color: rgba(0, 0, 0, 0.09);
-  }
+    &::-webkit-scrollbar:hover {
+        //background-color: rgba(0, 0, 0, 0.09);
+    }
 
-  &::-webkit-scrollbar-thumb {
-    background: rgba(0, 0, 0, 0.21);
-    -webkit-border-radius: 100px;
-    width: 8px;
-    height: 8px;
-  }
+    &::-webkit-scrollbar-thumb {
+        background: rgba(0, 0, 0, 0.21);
+        -webkit-border-radius: 100px;
+        width: 8px;
+        height: 8px;
+    }
 
-  &::-webkit-scrollbar-thumb:hover {
-    background: rgba(0, 0, 0, 0.30);
-  }
+    &::-webkit-scrollbar-thumb:hover {
+        background: rgba(0, 0, 0, 0.3);
+    }
 
-  &::-webkit-scrollbar-thumb:active {
-    background: rgba(0, 0, 0, 0.42);
-    -webkit-border-radius: 100px;
-  }
-}
\ No newline at end of file
+    &::-webkit-scrollbar-thumb:active {
+        background: rgba(0, 0, 0, 0.42);
+        -webkit-border-radius: 100px;
+    }
+}
diff --git a/src/shared/components/oncoprint/tabularDownload.ts b/src/shared/components/oncoprint/tabularDownload.ts
index 4dad9ebca95..9f70ccfbaec 100644
--- a/src/shared/components/oncoprint/tabularDownload.ts
+++ b/src/shared/components/oncoprint/tabularDownload.ts
@@ -1,77 +1,84 @@
-import Oncoprint, {ClinicalTrackSpec, GeneticTrackSpec, IHeatmapTrackSpec, IGenesetHeatmapTrackSpec, IBaseHeatmapTrackSpec} from "./Oncoprint";
-import fileDownload from "react-file-download";
+import Oncoprint, {
+    ClinicalTrackSpec,
+    GeneticTrackSpec,
+    IHeatmapTrackSpec,
+    IGenesetHeatmapTrackSpec,
+    IBaseHeatmapTrackSpec,
+} from './Oncoprint';
+import fileDownload from 'react-file-download';
 
 export default function tabularDownload(
-    geneticTracks:GeneticTrackSpec[],
-    clinicalTracks:ClinicalTrackSpec[],
+    geneticTracks: GeneticTrackSpec[],
+    clinicalTracks: ClinicalTrackSpec[],
     heatmapTracks: IHeatmapTrackSpec[],
     treatmentHeatmapTracks: IHeatmapTrackSpec[],
     genesetTracks: IGenesetHeatmapTrackSpec[],
-    uidOrder:string[],
-    getCaseId:(uid:string)=>string,
-    columnMode:"sample"|"patient",
-    distinguishDrivers:boolean
+    uidOrder: string[],
+    getCaseId: (uid: string) => string,
+    columnMode: 'sample' | 'patient',
+    distinguishDrivers: boolean
 ) {
     const caseNames = uidOrder.map(getCaseId);
-    const prefixName = (columnMode === "sample" ? "SAMPLE_DATA_" : "PATIENT_DATA_"); //Name depending on the type of case
+    const prefixName =
+        columnMode === 'sample' ? 'SAMPLE_DATA_' : 'PATIENT_DATA_'; //Name depending on the type of case
 
     //Gather all the Oncoprint data
-    const oncoprintData:any = {
-        'CLINICAL': {},
-        'CNA': {},
-        'MUTATIONS': {},
-        'MRNA': {},
-        'PROTEIN': {},
-        'FUSION': {},
+    const oncoprintData: any = {
+        CLINICAL: {},
+        CNA: {},
+        MUTATIONS: {},
+        MRNA: {},
+        PROTEIN: {},
+        FUSION: {},
     };
 
     //Create maps for genetic data
-    const cnaMap:any = {
-        'amp': 'Amplification',
-        'gain': 'Gain',
-        'hetloss': 'Shallow Deletion',
-        'homdel': 'Deep Deletion'
+    const cnaMap: any = {
+        amp: 'Amplification',
+        gain: 'Gain',
+        hetloss: 'Shallow Deletion',
+        homdel: 'Deep Deletion',
     };
-    let mutationMap:any = {};
+    let mutationMap: any = {};
     if (distinguishDrivers) {
         mutationMap = {
-            'inframe': 'Inframe Mutation (putative passenger)',
-            'inframe_rec': 'Inframe Mutation (putative driver)',
-            'missense': 'Missense Mutation (putative passenger)',
-            'missense_rec': 'Missense Mutation (putative driver)',
-            'promoter': 'Promoter Mutation',
-            'promoter_rec': 'Promoter Mutation',
-            'trunc': 'Truncating mutation (putative passenger)',
-            'trunc_rec': 'Truncating mutation (putative driver)'
+            inframe: 'Inframe Mutation (putative passenger)',
+            inframe_rec: 'Inframe Mutation (putative driver)',
+            missense: 'Missense Mutation (putative passenger)',
+            missense_rec: 'Missense Mutation (putative driver)',
+            promoter: 'Promoter Mutation',
+            promoter_rec: 'Promoter Mutation',
+            trunc: 'Truncating mutation (putative passenger)',
+            trunc_rec: 'Truncating mutation (putative driver)',
         };
     } else {
         mutationMap = {
-            'inframe': 'Inframe Mutation',
-            'inframe_rec': 'Inframe Mutation',
-            'missense': 'Missense Mutation',
-            'missense_rec': 'Missense Mutation',
-            'promoter': 'Promoter Mutation',
-            'promoter_rec': 'Promoter Mutation',
-            'trunc': 'Truncating mutation',
-            'trunc_rec': 'Truncating mutation'
+            inframe: 'Inframe Mutation',
+            inframe_rec: 'Inframe Mutation',
+            missense: 'Missense Mutation',
+            missense_rec: 'Missense Mutation',
+            promoter: 'Promoter Mutation',
+            promoter_rec: 'Promoter Mutation',
+            trunc: 'Truncating mutation',
+            trunc_rec: 'Truncating mutation',
         };
     }
-    const mrnaMap:any = {
-        'high': 'mRNA High',
-        'low': 'mRNA Low'
+    const mrnaMap: any = {
+        high: 'mRNA High',
+        low: 'mRNA Low',
     };
-    const proteinMap:any = {
-        'low': 'Protein Low',
-        'high': 'Protein High'
+    const proteinMap: any = {
+        low: 'Protein Low',
+        high: 'Protein High',
     };
-    const fusionMap:any = {
-        'true': 'Fusion'
+    const fusionMap: any = {
+        true: 'Fusion',
     };
 
     //Add genetic data
     for (const geneticTrack of geneticTracks) {
         const currentTrackData = geneticTrack.data;
-        const currentGeneName = currentTrackData[0].trackLabel;   // the label is the same for all entries of the track
+        const currentGeneName = currentTrackData[0].trackLabel; // the label is the same for all entries of the track
         //Add the currentGeneName to the oncoprintData if it does not exist
         if (oncoprintData.CNA[currentGeneName] === undefined) {
             oncoprintData.CNA[currentGeneName] = {};
@@ -90,26 +97,49 @@ export default function tabularDownload(
         }
         //Iterate over all patients/samples of the track and add them to oncoprintData
         for (const geneticTrackDatum of currentTrackData) {
-            let id:string = (columnMode === "sample" ? geneticTrackDatum.sample! : geneticTrackDatum.patient!);
-            oncoprintData.CNA[currentGeneName][id] = "";
-            oncoprintData.MUTATIONS[currentGeneName][id] = "";
-            oncoprintData.MRNA[currentGeneName][id] = "";
-            oncoprintData.PROTEIN[currentGeneName][id] = "";
-            oncoprintData.FUSION[currentGeneName][id] = "";
+            let id: string =
+                columnMode === 'sample'
+                    ? geneticTrackDatum.sample!
+                    : geneticTrackDatum.patient!;
+            oncoprintData.CNA[currentGeneName][id] = '';
+            oncoprintData.MUTATIONS[currentGeneName][id] = '';
+            oncoprintData.MRNA[currentGeneName][id] = '';
+            oncoprintData.PROTEIN[currentGeneName][id] = '';
+            oncoprintData.FUSION[currentGeneName][id] = '';
             if (geneticTrackDatum.disp_cna !== undefined) {
-                oncoprintData.CNA[currentGeneName][id] = cnaMap[geneticTrackDatum.disp_cna] ? cnaMap[geneticTrackDatum.disp_cna] : geneticTrackDatum.disp_cna;
+                oncoprintData.CNA[currentGeneName][id] = cnaMap[
+                    geneticTrackDatum.disp_cna
+                ]
+                    ? cnaMap[geneticTrackDatum.disp_cna]
+                    : geneticTrackDatum.disp_cna;
             }
             if (geneticTrackDatum.disp_fusion !== undefined) {
-                oncoprintData.FUSION[currentGeneName][id] = fusionMap[geneticTrackDatum.disp_fusion+""] ? fusionMap[geneticTrackDatum.disp_fusion+""] : geneticTrackDatum.disp_fusion;
+                oncoprintData.FUSION[currentGeneName][id] = fusionMap[
+                    geneticTrackDatum.disp_fusion + ''
+                ]
+                    ? fusionMap[geneticTrackDatum.disp_fusion + '']
+                    : geneticTrackDatum.disp_fusion;
             }
             if (geneticTrackDatum.disp_mrna !== undefined) {
-                oncoprintData.MRNA[currentGeneName][id] = mrnaMap[geneticTrackDatum.disp_mrna] ? mrnaMap[geneticTrackDatum.disp_mrna] : geneticTrackDatum.disp_mrna;
+                oncoprintData.MRNA[currentGeneName][id] = mrnaMap[
+                    geneticTrackDatum.disp_mrna
+                ]
+                    ? mrnaMap[geneticTrackDatum.disp_mrna]
+                    : geneticTrackDatum.disp_mrna;
             }
             if (geneticTrackDatum.disp_prot !== undefined) {
-                oncoprintData.PROTEIN[currentGeneName][id] = proteinMap[geneticTrackDatum.disp_prot] ? proteinMap[geneticTrackDatum.disp_prot] : geneticTrackDatum.disp_prot;
+                oncoprintData.PROTEIN[currentGeneName][id] = proteinMap[
+                    geneticTrackDatum.disp_prot
+                ]
+                    ? proteinMap[geneticTrackDatum.disp_prot]
+                    : geneticTrackDatum.disp_prot;
             }
             if (geneticTrackDatum.disp_mut !== undefined) {
-                oncoprintData.MUTATIONS[currentGeneName][id] = mutationMap[geneticTrackDatum.disp_mut] ? mutationMap[geneticTrackDatum.disp_mut] : geneticTrackDatum.disp_mut;
+                oncoprintData.MUTATIONS[currentGeneName][id] = mutationMap[
+                    geneticTrackDatum.disp_mut
+                ]
+                    ? mutationMap[geneticTrackDatum.disp_mut]
+                    : geneticTrackDatum.disp_mut;
             }
         }
     }
@@ -124,54 +154,70 @@ export default function tabularDownload(
         }
         //Iterate over all patients/samples of the track and add them to oncoprintData
         for (const clinicalTrackDatum of currentClinicalTrackData) {
-            let id:string = (columnMode === "sample" ? clinicalTrackDatum.sample! : clinicalTrackDatum.patient!);
-            oncoprintData.CLINICAL[currentAttributeName][id] = "";
+            let id: string =
+                columnMode === 'sample'
+                    ? clinicalTrackDatum.sample!
+                    : clinicalTrackDatum.patient!;
+            oncoprintData.CLINICAL[currentAttributeName][id] = '';
             if (clinicalTrackDatum.attr_val !== undefined) {
-                oncoprintData.CLINICAL[currentAttributeName][id] = clinicalTrackDatum.attr_val;
+                oncoprintData.CLINICAL[currentAttributeName][id] =
+                    clinicalTrackDatum.attr_val;
             }
         }
     }
 
     //Add heatmap data
-    const exportedHeatmapTracks = (heatmapTracks as IBaseHeatmapTrackSpec[]).concat(treatmentHeatmapTracks as IBaseHeatmapTrackSpec[]).concat(genesetTracks as IBaseHeatmapTrackSpec[]);
+    const exportedHeatmapTracks = (heatmapTracks as IBaseHeatmapTrackSpec[])
+        .concat(treatmentHeatmapTracks as IBaseHeatmapTrackSpec[])
+        .concat(genesetTracks as IBaseHeatmapTrackSpec[]);
     for (const heatmapTrack of exportedHeatmapTracks) {
         const currentHeatmapGene = heatmapTrack.label;
-        const currentHeatmapType = "HEATMAP "+heatmapTrack.molecularAlterationType+' '+ heatmapTrack.datatype;
+        const currentHeatmapType =
+            'HEATMAP ' +
+            heatmapTrack.molecularAlterationType +
+            ' ' +
+            heatmapTrack.datatype;
         const currentHeatmapTrackData = heatmapTrack.data;
         for (const heatmapTrackDatum of currentHeatmapTrackData) {
             if (oncoprintData[currentHeatmapType] === undefined) {
                 oncoprintData[currentHeatmapType] = {};
             }
-            if (oncoprintData[currentHeatmapType][currentHeatmapGene] === undefined) {
+            if (
+                oncoprintData[currentHeatmapType][currentHeatmapGene] ===
+                undefined
+            ) {
                 oncoprintData[currentHeatmapType][currentHeatmapGene] = {};
             }
-            let id:string = (columnMode === "sample" ? heatmapTrackDatum.sample! : heatmapTrackDatum.patient!);
-            oncoprintData[currentHeatmapType][currentHeatmapGene][id] = heatmapTrackDatum.profile_data === null ? "" : heatmapTrackDatum.profile_data;
+            let id: string =
+                columnMode === 'sample'
+                    ? heatmapTrackDatum.sample!
+                    : heatmapTrackDatum.patient!;
+            oncoprintData[currentHeatmapType][currentHeatmapGene][id] =
+                heatmapTrackDatum.profile_data === null
+                    ? ''
+                    : heatmapTrackDatum.profile_data;
         }
     }
 
     //Put all the information of the oncoprintData in a variable with tabular form
     let content = 'track_name\ttrack_type';
     //Add the cases to the content
-    for (let i=0; i<caseNames.length; i++) {
-        content += '\t'+caseNames[i];
+    for (let i = 0; i < caseNames.length; i++) {
+        content += '\t' + caseNames[i];
     }
     //Add final header line
     content += '\n';
 
     //Iterate over oncoprintData and write it to content
-    Object.keys(oncoprintData).forEach(function (j) {
+    Object.keys(oncoprintData).forEach(function(j) {
         Object.keys(oncoprintData[j]).forEach(function(k) {
-            content += k+'\t'+j;
-            for (let l=0; l<caseNames.length; l++) {
-                content += '\t'+oncoprintData[j][k][caseNames[l]];
+            content += k + '\t' + j;
+            for (let l = 0; l < caseNames.length; l++) {
+                content += '\t' + oncoprintData[j][k][caseNames[l]];
             }
             content += '\n';
         });
     });
 
-    fileDownload(
-        content,
-        prefixName + 'oncoprint.tsv'
-    );
-}
\ No newline at end of file
+    fileDownload(content, prefixName + 'oncoprint.tsv');
+}
diff --git a/src/shared/components/overlappingStudiesWarning/OverlappingStudiesWarning.tsx b/src/shared/components/overlappingStudiesWarning/OverlappingStudiesWarning.tsx
index cb3f47ff163..4958496773d 100644
--- a/src/shared/components/overlappingStudiesWarning/OverlappingStudiesWarning.tsx
+++ b/src/shared/components/overlappingStudiesWarning/OverlappingStudiesWarning.tsx
@@ -1,18 +1,24 @@
 import * as React from 'react';
-import getOverlappingStudies from "../../lib/getOverlappingStudies";
-import {CancerStudy} from "../../api/generated/CBioPortalAPI";
+import getOverlappingStudies from '../../lib/getOverlappingStudies';
+import { CancerStudy } from '../../api/generated/CBioPortalAPI';
 
-export default class OverlappingStudiesWarning extends React.Component<{ studies:CancerStudy[] }, {}>{
-    render(){
+export default class OverlappingStudiesWarning extends React.Component<
+    { studies: CancerStudy[] },
+    {}
+> {
+    render() {
         const overlapping = getOverlappingStudies(this.props.studies);
         if (overlapping.length > 0) {
             return (
-                <div className="alert alert-danger" style={{marginBottom: 0}}>
-                    <i className="fa fa-exclamation-triangle"></i> You have selected multiple TCGA studies with overlapping samples, highlighted in red below. Please limit your selection to one TCGA study per cancer type.
+                <div className="alert alert-danger" style={{ marginBottom: 0 }}>
+                    <i className="fa fa-exclamation-triangle"></i> You have
+                    selected multiple TCGA studies with overlapping samples,
+                    highlighted in red below. Please limit your selection to one
+                    TCGA study per cancer type.
                 </div>
             );
         } else {
             return null;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/pageNotFound/PageNotFound.tsx b/src/shared/components/pageNotFound/PageNotFound.tsx
index fa6c9d13fd8..269fca82a91 100644
--- a/src/shared/components/pageNotFound/PageNotFound.tsx
+++ b/src/shared/components/pageNotFound/PageNotFound.tsx
@@ -7,10 +7,12 @@ const PageNotFound = () => (
         <div className="contentWrapper">
             <ErrorScreen
                 title={"Sorry, this page doesn't exist."}
-                body={<a href={buildCBioPortalPageUrl("/")}>Return to homepage</a>}
+                body={
+                    <a href={buildCBioPortalPageUrl('/')}>Return to homepage</a>
+                }
             />
         </div>
     </div>
 );
 
-export default PageNotFound;
\ No newline at end of file
+export default PageNotFound;
diff --git a/src/shared/components/paginationControls/PaginationControls.spec.tsx b/src/shared/components/paginationControls/PaginationControls.spec.tsx
index 6eed549093b..fa830e624ef 100644
--- a/src/shared/components/paginationControls/PaginationControls.spec.tsx
+++ b/src/shared/components/paginationControls/PaginationControls.spec.tsx
@@ -1,113 +1,121 @@
 import PaginationControls from './PaginationControls';
 import React from 'react';
-import {default as chai, assert, expect } from 'chai';
+import { default as chai, assert, expect } from 'chai';
 import { shallow, mount } from 'enzyme';
-import chaiEnzyme from "chai-enzyme";
+import chaiEnzyme from 'chai-enzyme';
 import sinon from 'sinon';
-import styles from "./paginationControls.module.scss";
-import {Button} from "react-bootstrap";
+import styles from './paginationControls.module.scss';
+import { Button } from 'react-bootstrap';
 
 chai.use(chaiEnzyme());
 
 describe('PaginationControls', () => {
-    describe.skip("'Show more' button", ()=>{
-        it("on click, increases the itemsPerPage until everything is shown, in proper increments, then disables", ()=>{
+    describe.skip("'Show more' button", () => {
+        it('on click, increases the itemsPerPage until everything is shown, in proper increments, then disables', () => {
             let itemsPerPage = 1;
             let paginationControls = mount(
                 <PaginationControls
                     showMoreButton={true}
                     totalItems={100}
                     itemsPerPage={itemsPerPage}
-                    itemsPerPageOptions={[1,2,3,4,40]}
-                    onChangeItemsPerPage={(x:number)=>{itemsPerPage= x;}}
+                    itemsPerPageOptions={[1, 2, 3, 4, 40]}
+                    onChangeItemsPerPage={(x: number) => {
+                        itemsPerPage = x;
+                    }}
                 />
             );
-            let button = paginationControls.find("#showMoreButton");
-            expect(button).not.to.have.attr("disabled");
+            let button = paginationControls.find('#showMoreButton');
+            expect(button).not.to.have.attr('disabled');
             button.simulate('click');
             assert.equal(itemsPerPage, 2);
             paginationControls.setProps({ itemsPerPage });
-            expect(button).not.to.have.attr("disabled");
+            expect(button).not.to.have.attr('disabled');
             button.simulate('click');
             assert.equal(itemsPerPage, 3);
             paginationControls.setProps({ itemsPerPage });
-            expect(button).not.to.have.attr("disabled");
+            expect(button).not.to.have.attr('disabled');
             button.simulate('click');
             assert.equal(itemsPerPage, 4);
             paginationControls.setProps({ itemsPerPage });
-            expect(button).not.to.have.attr("disabled");
+            expect(button).not.to.have.attr('disabled');
             button.simulate('click');
             assert.equal(itemsPerPage, 40);
             paginationControls.setProps({ itemsPerPage });
-            expect(button).not.to.have.attr("disabled");
+            expect(button).not.to.have.attr('disabled');
             button.simulate('click');
             assert.equal(itemsPerPage, 80);
             paginationControls.setProps({ itemsPerPage });
-            expect(button).not.to.have.attr("disabled");
+            expect(button).not.to.have.attr('disabled');
             button.simulate('click');
             assert.equal(itemsPerPage, 120);
             paginationControls.setProps({ itemsPerPage });
-            expect(button).to.have.attr("disabled");
+            expect(button).to.have.attr('disabled');
         });
 
-        it("is hidden if everything is shown initially",()=>{
+        it('is hidden if everything is shown initially', () => {
             let paginationControls = mount(
                 <PaginationControls
                     showMoreButton={true}
                     totalItems={1}
                     itemsPerPage={2}
-                    itemsPerPageOptions={[1,2,3,4]}
+                    itemsPerPageOptions={[1, 2, 3, 4]}
                 />
             );
-            expect(paginationControls.find(Button), "no buttons exist").to.not.exist;
+            expect(paginationControls.find(Button), 'no buttons exist').to.not
+                .exist;
 
             paginationControls = mount(
                 <PaginationControls
                     showMoreButton={true}
                     totalItems={3}
                     itemsPerPage={2}
-                    itemsPerPageOptions={[1,2,3,4]}
+                    itemsPerPageOptions={[1, 2, 3, 4]}
                 />
             );
-            expect(paginationControls.find(Button), "buttons should exist if theres more than one page").to.exist;
+            expect(
+                paginationControls.find(Button),
+                'buttons should exist if theres more than one page'
+            ).to.exist;
         });
 
-        it("shows functional reset button if its showing more than minimum per page", ()=>{
+        it('shows functional reset button if its showing more than minimum per page', () => {
             let itemsPerPage = 1;
             let paginationControls = mount(
                 <PaginationControls
                     showMoreButton={true}
                     totalItems={100}
                     itemsPerPage={itemsPerPage}
-                    itemsPerPageOptions={[1,2,3,4,40]}
-                    onChangeItemsPerPage={(x:number)=>{itemsPerPage= x;}}
+                    itemsPerPageOptions={[1, 2, 3, 4, 40]}
+                    onChangeItemsPerPage={(x: number) => {
+                        itemsPerPage = x;
+                    }}
                 />
             );
-            let showMore = paginationControls.find("#showMoreButton");
-            let reset = paginationControls.find("#resetItemsPerPageButton");
-            expect(showMore).not.to.have.attr("disabled");
-            expect(reset).to.have.className(styles["hidden-button"]);
-
+            let showMore = paginationControls.find('#showMoreButton');
+            let reset = paginationControls.find('#resetItemsPerPageButton');
+            expect(showMore).not.to.have.attr('disabled');
+            expect(reset).to.have.className(styles['hidden-button']);
 
             showMore.simulate('click');
-            assert.equal(itemsPerPage, 2, "show more worked");
+            assert.equal(itemsPerPage, 2, 'show more worked');
             paginationControls.setProps({ itemsPerPage });
-            reset = paginationControls.find("#resetItemsPerPageButton");
-            assert.equal(reset.length, 1, "reset button shown now");
+            reset = paginationControls.find('#resetItemsPerPageButton');
+            assert.equal(reset.length, 1, 'reset button shown now');
             reset.simulate('click');
-            assert.equal(itemsPerPage, 1, "reset button worked");
+            assert.equal(itemsPerPage, 1, 'reset button worked');
 
             paginationControls = mount(
                 <PaginationControls
                     showMoreButton={true}
                     totalItems={100}
                     itemsPerPage={3}
-                    itemsPerPageOptions={[1,2,3,4,40]}
-                    onChangeItemsPerPage={(x:number)=>{itemsPerPage= x;}}
+                    itemsPerPageOptions={[1, 2, 3, 4, 40]}
+                    onChangeItemsPerPage={(x: number) => {
+                        itemsPerPage = x;
+                    }}
                 />
             );
-            expect(reset).not.to.have.className(styles["hidden-button"]);
+            expect(reset).not.to.have.className(styles['hidden-button']);
         });
     });
-
 });
diff --git a/src/shared/components/paginationControls/PaginationControls.tsx b/src/shared/components/paginationControls/PaginationControls.tsx
index 12dff792360..f967d89a0e8 100644
--- a/src/shared/components/paginationControls/PaginationControls.tsx
+++ b/src/shared/components/paginationControls/PaginationControls.tsx
@@ -1,182 +1,237 @@
 import * as React from 'react';
-import {Button, ButtonGroup, FormGroup, FormControl} from 'react-bootstrap';
-import styles from "./paginationControls.module.scss";
+import { Button, ButtonGroup, FormGroup, FormControl } from 'react-bootstrap';
+import styles from './paginationControls.module.scss';
 import { If, Then, Else } from 'react-if';
-import {observer} from "mobx-react";
+import { observer } from 'mobx-react';
 import classNames from 'classnames';
-import {EditableSpan} from "cbioportal-frontend-commons";
+import { EditableSpan } from 'cbioportal-frontend-commons';
 
 export const SHOW_ALL_PAGE_SIZE = -1;
 
 export const MAX_DIGITS = 6;
 
 export interface IPaginationControlsProps {
-    currentPage?:number;
-    totalItems?:number;
-    itemsPerPage?:number;
-    itemsPerPageOptions?:number[]; // sorted ascending
-    showAllOption?:boolean;
-    showMoreButton?:boolean;
-    textBeforeButtons?:string;
-    textBetweenButtons?:string;
+    currentPage?: number;
+    totalItems?: number;
+    itemsPerPage?: number;
+    itemsPerPageOptions?: number[]; // sorted ascending
+    showAllOption?: boolean;
+    showMoreButton?: boolean;
+    textBeforeButtons?: string;
+    textBetweenButtons?: string;
     firstButtonContent?: string | JSX.Element;
     previousButtonContent?: string | JSX.Element;
     nextButtonContent?: string | JSX.Element;
     lastButtonContent?: string | JSX.Element;
-    showFirstPage?:boolean;
-    showLastPage?:boolean;
-    showItemsPerPageSelector?:boolean;
-    onChangeItemsPerPage?:(itemsPerPage:number)=>void;
-    onFirstPageClick?:()=>void;
-    onPreviousPageClick?:()=>void;
-    onNextPageClick?:()=>void;
-    onLastPageClick?:()=>void;
-    onChangeCurrentPage?:(newPage:number)=>void;
-    className?:string;
-    style?:{ [k: string]: string | number },
-    firstPageDisabled?:boolean;
-    previousPageDisabled?:boolean;
-    nextPageDisabled?:boolean;
-    lastPageDisabled?:boolean;
-    pageNumberEditable?:boolean;
-    groupButtons?:boolean;
-    hidePaginationIfOnePage?:boolean;
-    bsStyle?:"default"|"primary"|"success"|"info"|"warning";
+    showFirstPage?: boolean;
+    showLastPage?: boolean;
+    showItemsPerPageSelector?: boolean;
+    onChangeItemsPerPage?: (itemsPerPage: number) => void;
+    onFirstPageClick?: () => void;
+    onPreviousPageClick?: () => void;
+    onNextPageClick?: () => void;
+    onLastPageClick?: () => void;
+    onChangeCurrentPage?: (newPage: number) => void;
+    className?: string;
+    style?: { [k: string]: string | number };
+    firstPageDisabled?: boolean;
+    previousPageDisabled?: boolean;
+    nextPageDisabled?: boolean;
+    lastPageDisabled?: boolean;
+    pageNumberEditable?: boolean;
+    groupButtons?: boolean;
+    hidePaginationIfOnePage?: boolean;
+    bsStyle?: 'default' | 'primary' | 'success' | 'info' | 'warning';
 }
 
 @observer
-export class PaginationControls extends React.Component<IPaginationControlsProps, {}> {
+export class PaginationControls extends React.Component<
+    IPaginationControlsProps,
+    {}
+> {
     public static defaultProps = {
         itemsPerPage: SHOW_ALL_PAGE_SIZE,
         itemsPerPageOptions: [10, 25, 50, 100],
         showAllOption: true,
-        textBeforeButtons:"",
-        textBetweenButtons: "text btwn buttons",
-        firstButtonContent: (<i className='fa fa-angle-double-left'/>),
-        previousButtonContent: (<i className='fa fa-angle-left'/>),
-        nextButtonContent: (<i className='fa fa-angle-right'/>),
-        lastButtonContent: (<i className='fa fa-angle-double-right'/>),
-        showItemsPerPageSelector:true,
-        showFirstPage:false,
-        showLastPage:false,
-        className: "",
-        style:{},
-        previousPageDisabled:false,
-        nextPageDisabled:false,
+        textBeforeButtons: '',
+        textBetweenButtons: 'text btwn buttons',
+        firstButtonContent: <i className="fa fa-angle-double-left" />,
+        previousButtonContent: <i className="fa fa-angle-left" />,
+        nextButtonContent: <i className="fa fa-angle-right" />,
+        lastButtonContent: <i className="fa fa-angle-double-right" />,
+        showItemsPerPageSelector: true,
+        showFirstPage: false,
+        showLastPage: false,
+        className: '',
+        style: {},
+        previousPageDisabled: false,
+        nextPageDisabled: false,
         pageNumberEditable: false,
         showMoreButton: true,
         groupButtons: true,
-        hidePaginationIfOnePage:true,
-        bsStyle: "default"
+        hidePaginationIfOnePage: true,
+        bsStyle: 'default',
     };
 
-    constructor(props:IPaginationControlsProps) {
+    constructor(props: IPaginationControlsProps) {
         super(props);
-        this.handleChangeItemsPerPage = this.handleChangeItemsPerPage.bind(this);
+        this.handleChangeItemsPerPage = this.handleChangeItemsPerPage.bind(
+            this
+        );
         this.resetItemsPerPage = this.resetItemsPerPage.bind(this);
         this.jumpToPage = this.jumpToPage.bind(this);
         this.handleShowMore = this.handleShowMore.bind(this);
-        this.getSectionBetweenPaginationButtons = this.getSectionBetweenPaginationButtons.bind(this);
+        this.getSectionBetweenPaginationButtons = this.getSectionBetweenPaginationButtons.bind(
+            this
+        );
     }
 
-    private jumpToPage(p:string) {
-
+    private jumpToPage(p: string) {
         if (this.props.onChangeCurrentPage) {
             this.props.onChangeCurrentPage(parseInt(p, 10));
         }
     }
 
-    handleChangeItemsPerPage(evt:React.FormEvent<HTMLSelectElement>) {
-
+    handleChangeItemsPerPage(evt: React.FormEvent<HTMLSelectElement>) {
         if (this.props.onChangeItemsPerPage) {
-            this.props.onChangeItemsPerPage(parseInt((evt.target as HTMLSelectElement).value,10));
+            this.props.onChangeItemsPerPage(
+                parseInt((evt.target as HTMLSelectElement).value, 10)
+            );
         }
     }
 
     handleShowMore() {
-        if (this.props.itemsPerPageOptions && this.props.itemsPerPageOptions.length > 0 &&
-            this.props.itemsPerPage && this.props.onChangeItemsPerPage) {
-
-            const index = this.props.itemsPerPageOptions.indexOf(this.props.itemsPerPage);
-            if (index > -1 && index < this.props.itemsPerPageOptions.length - 1) {
-                this.props.onChangeItemsPerPage(this.props.itemsPerPageOptions[index + 1]);
+        if (
+            this.props.itemsPerPageOptions &&
+            this.props.itemsPerPageOptions.length > 0 &&
+            this.props.itemsPerPage &&
+            this.props.onChangeItemsPerPage
+        ) {
+            const index = this.props.itemsPerPageOptions.indexOf(
+                this.props.itemsPerPage
+            );
+            if (
+                index > -1 &&
+                index < this.props.itemsPerPageOptions.length - 1
+            ) {
+                this.props.onChangeItemsPerPage(
+                    this.props.itemsPerPageOptions[index + 1]
+                );
             } else {
-                this.props.onChangeItemsPerPage(this.props.itemsPerPage + this.props.itemsPerPageOptions[this.props.itemsPerPageOptions.length - 1]);
+                this.props.onChangeItemsPerPage(
+                    this.props.itemsPerPage +
+                        this.props.itemsPerPageOptions[
+                            this.props.itemsPerPageOptions.length - 1
+                        ]
+                );
             }
         }
     }
 
     resetItemsPerPage() {
         this.props.onChangeItemsPerPage &&
-        this.props.itemsPerPageOptions && this.props.itemsPerPageOptions.length > 0 &&
-        this.props.onChangeItemsPerPage(this.props.itemsPerPageOptions[0]);
+            this.props.itemsPerPageOptions &&
+            this.props.itemsPerPageOptions.length > 0 &&
+            this.props.onChangeItemsPerPage(this.props.itemsPerPageOptions[0]);
     }
 
     private getSectionBetweenPaginationButtons() {
         if (this.props.showMoreButton) {
             return (
-                    <Button id="showMoreButton"
-                            bsSize="sm"
-                            disabled={!this.props.itemsPerPageOptions || !this.props.itemsPerPage || !this.props.totalItems || (this.props.itemsPerPage >= this.props.totalItems)}
-                            onClick={this.handleShowMore}
-                            style={{width:200}}
-                            bsStyle={this.props.bsStyle}
-                    >
-                        Show more
-                    </Button>
+                <Button
+                    id="showMoreButton"
+                    bsSize="sm"
+                    disabled={
+                        !this.props.itemsPerPageOptions ||
+                        !this.props.itemsPerPage ||
+                        !this.props.totalItems ||
+                        this.props.itemsPerPage >= this.props.totalItems
+                    }
+                    onClick={this.handleShowMore}
+                    style={{ width: 200 }}
+                    bsStyle={this.props.bsStyle}
+                >
+                    Show more
+                </Button>
             );
         } else {
-            return (<span
-                        key="textBetweenButtons"
-                        className={classNames('btn',
-                                              'btn-sm',
-                                              'btn-default',
-                                              'textBetweenButtons',
-                                              'disabled',
-                                              styles["default-cursor"])}
-                        style={{cursor:'default',color:'black'}} // HACK for parent project
-                    >
-                        <If condition={this.props.pageNumberEditable}>
-                            <EditableSpan
-                                className={styles["page-number-input"]}
-                                value={this.props.currentPage + ""}
-                                setValue={this.jumpToPage}
-                                maxChars={MAX_DIGITS}
-                                numericOnly={true}
-                            />
-                        </If>
-                        {this.props.textBetweenButtons}
-                    </span>
+            return (
+                <span
+                    key="textBetweenButtons"
+                    className={classNames(
+                        'btn',
+                        'btn-sm',
+                        'btn-default',
+                        'textBetweenButtons',
+                        'disabled',
+                        styles['default-cursor']
+                    )}
+                    style={{ cursor: 'default', color: 'black' }} // HACK for parent project
+                >
+                    <If condition={this.props.pageNumberEditable}>
+                        <EditableSpan
+                            className={styles['page-number-input']}
+                            value={this.props.currentPage + ''}
+                            setValue={this.jumpToPage}
+                            maxChars={MAX_DIGITS}
+                            numericOnly={true}
+                        />
+                    </If>
+                    {this.props.textBetweenButtons}
+                </span>
             );
         }
     }
 
     private get shouldHidePaginationControls() {
-        return (this.props.hidePaginationIfOnePage
-            && this.props.itemsPerPageOptions
-            && typeof this.props.totalItems!=="undefined"
-            && this.props.itemsPerPageOptions[0] >= this.props.totalItems);
+        return (
+            this.props.hidePaginationIfOnePage &&
+            this.props.itemsPerPageOptions &&
+            typeof this.props.totalItems !== 'undefined' &&
+            this.props.itemsPerPageOptions[0] >= this.props.totalItems
+        );
     }
 
     render() {
-        const pageSizeOptionElts = (this.props.itemsPerPageOptions || []).map((opt:number) => (<option key={opt} value={opt+""}>{opt}</option>));
+        const pageSizeOptionElts = (this.props.itemsPerPageOptions || []).map(
+            (opt: number) => (
+                <option key={opt} value={opt + ''}>
+                    {opt}
+                </option>
+            )
+        );
         if (this.props.showAllOption) {
-            pageSizeOptionElts.push(<option key="all" value={SHOW_ALL_PAGE_SIZE+""}>all</option>);
+            pageSizeOptionElts.push(
+                <option key="all" value={SHOW_ALL_PAGE_SIZE + ''}>
+                    all
+                </option>
+            );
         }
 
-        let buttons:any = [
+        let buttons: any = [
             <If condition={!!this.props.showFirstPage}>
-                <Button key="firstPageBtn"
-                        bsSize="sm"
-                        disabled={!!this.props.firstPageDisabled}
-                        onClick={this.props.onFirstPageClick}
-                        className={classNames(this.props.groupButtons ? undefined : styles['margin-right-button'])}
-                        bsStyle={this.props.bsStyle}
+                <Button
+                    key="firstPageBtn"
+                    bsSize="sm"
+                    disabled={!!this.props.firstPageDisabled}
+                    onClick={this.props.onFirstPageClick}
+                    className={classNames(
+                        this.props.groupButtons
+                            ? undefined
+                            : styles['margin-right-button']
+                    )}
+                    bsStyle={this.props.bsStyle}
                 >
                     {this.props.firstButtonContent}
                 </Button>
             </If>,
-            <Button className={classNames("prevPageBtn", this.props.groupButtons ? undefined : styles['margin-right-button'])}
+            <Button
+                className={classNames(
+                    'prevPageBtn',
+                    this.props.groupButtons
+                        ? undefined
+                        : styles['margin-right-button']
+                )}
                 key="prevPageBtn"
                 bsSize="sm"
                 disabled={!!this.props.previousPageDisabled}
@@ -186,22 +241,33 @@ export class PaginationControls extends React.Component<IPaginationControlsProps
                 {this.props.previousButtonContent}
             </Button>,
             this.getSectionBetweenPaginationButtons(),
-            <Button className={classNames("nextPageBtn", this.props.groupButtons ? undefined : styles['margin-left-button'])}
-                    key="nextPageBtn"
-                    bsSize="sm"
-                    disabled={!!this.props.nextPageDisabled}
-                    onClick={this.props.onNextPageClick}
-                    bsStyle={this.props.bsStyle}
+            <Button
+                className={classNames(
+                    'nextPageBtn',
+                    this.props.groupButtons
+                        ? undefined
+                        : styles['margin-left-button']
+                )}
+                key="nextPageBtn"
+                bsSize="sm"
+                disabled={!!this.props.nextPageDisabled}
+                onClick={this.props.onNextPageClick}
+                bsStyle={this.props.bsStyle}
             >
                 {this.props.nextButtonContent}
             </Button>,
             <If condition={!!this.props.showLastPage}>
-                <Button key="lastPageBtn"
-                        bsSize="sm"
-                        disabled={!!this.props.lastPageDisabled}
-                        onClick={this.props.onLastPageClick}
-                        className={classNames(this.props.groupButtons ? undefined : styles['margin-left-button'])}
-                        bsStyle={this.props.bsStyle}
+                <Button
+                    key="lastPageBtn"
+                    bsSize="sm"
+                    disabled={!!this.props.lastPageDisabled}
+                    onClick={this.props.onLastPageClick}
+                    className={classNames(
+                        this.props.groupButtons
+                            ? undefined
+                            : styles['margin-left-button']
+                    )}
+                    bsStyle={this.props.bsStyle}
                 >
                     {this.props.lastButtonContent}
                 </Button>
@@ -211,25 +277,28 @@ export class PaginationControls extends React.Component<IPaginationControlsProps
                     id="resetItemsPerPageButton"
                     bsStyle="link"
                     bsSize="sm"
-                    className={this.props.itemsPerPage &&
+                    className={
+                        this.props.itemsPerPage &&
                         this.props.itemsPerPageOptions &&
-                        (this.props.itemsPerPageOptions.length > 0) &&
-                        (this.props.itemsPerPage > this.props.itemsPerPageOptions[0]) ? undefined : styles["hidden-button"]}
+                        this.props.itemsPerPageOptions.length > 0 &&
+                        this.props.itemsPerPage >
+                            this.props.itemsPerPageOptions[0]
+                            ? undefined
+                            : styles['hidden-button']
+                    }
                     onClick={this.resetItemsPerPage}
                 >
                     Reset
                 </Button>
-            </If>
+            </If>,
         ];
 
         if (this.props.groupButtons) {
-            buttons = (<ButtonGroup style={{float:'none'}}>
-                {buttons}
-            </ButtonGroup>);
+            buttons = (
+                <ButtonGroup style={{ float: 'none' }}>{buttons}</ButtonGroup>
+            );
         } else {
-            buttons = (<div style={{float:'none'}}>
-                {buttons}
-            </div>);
+            buttons = <div style={{ float: 'none' }}>{buttons}</div>;
         }
 
         if (this.shouldHidePaginationControls) {
@@ -237,16 +306,34 @@ export class PaginationControls extends React.Component<IPaginationControlsProps
         }
 
         return (
-            <div className={classNames(styles.paginationControls, this.props.className)} style={this.props.style}>
-                <span style={{fontSize:12, marginRight:10}}>{this.props.textBeforeButtons}</span>
+            <div
+                className={classNames(
+                    styles.paginationControls,
+                    this.props.className
+                )}
+                style={this.props.style}
+            >
+                <span style={{ fontSize: 12, marginRight: 10 }}>
+                    {this.props.textBeforeButtons}
+                </span>
                 {buttons}
-                <If condition={!!this.props.showItemsPerPageSelector && !this.shouldHidePaginationControls}>
-                    <FormGroup bsSize="sm" className={styles["form-select"]}>
+                <If
+                    condition={
+                        !!this.props.showItemsPerPageSelector &&
+                        !this.shouldHidePaginationControls
+                    }
+                >
+                    <FormGroup bsSize="sm" className={styles['form-select']}>
                         <FormControl
                             className="itemsPerPageSelector"
                             componentClass="select"
                             value={this.props.itemsPerPage}
-                            onChange={this.handleChangeItemsPerPage as React.FormEventHandler<any>}
+                            onChange={
+                                this
+                                    .handleChangeItemsPerPage as React.FormEventHandler<
+                                    any
+                                >
+                            }
                         >
                             {pageSizeOptionElts}
                         </FormControl>
diff --git a/src/shared/components/paginationControls/paginationControls.module.scss b/src/shared/components/paginationControls/paginationControls.module.scss
index 9ed80f28048..b049dbd99a7 100644
--- a/src/shared/components/paginationControls/paginationControls.module.scss
+++ b/src/shared/components/paginationControls/paginationControls.module.scss
@@ -17,7 +17,7 @@
 }
 
 :global(.legacy) .paginationControls button i {
-    line-height:1.5;
+    line-height: 1.5;
 }
 
 .margin-right-button {
@@ -30,4 +30,4 @@
 
 .hidden-button {
     display: none !important;
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/plots/BoxScatterPlot.tsx b/src/shared/components/plots/BoxScatterPlot.tsx
index a291b1ffe86..9449b363cbc 100644
--- a/src/shared/components/plots/BoxScatterPlot.tsx
+++ b/src/shared/components/plots/BoxScatterPlot.tsx
@@ -1,79 +1,99 @@
-import * as React from "react";
-import {observer, Observer} from "mobx-react";
-import {computed, observable, action} from "mobx";
-import {bind} from "bind-decorator";
-import CBIOPORTAL_VICTORY_THEME, {axisTickLabelStyles} from "../../theme/cBioPoralTheme";
-import ifNotDefined from "../../lib/ifNotDefined";
-import {BoxPlotModel, calculateBoxPlotModel} from "../../lib/boxPlotUtils";
-import ScatterPlotTooltip from "./ScatterPlotTooltip";
+import * as React from 'react';
+import { observer, Observer } from 'mobx-react';
+import { computed, observable, action } from 'mobx';
+import { bind } from 'bind-decorator';
+import CBIOPORTAL_VICTORY_THEME, {
+    axisTickLabelStyles,
+} from '../../theme/cBioPoralTheme';
+import ifNotDefined from '../../lib/ifNotDefined';
+import { BoxPlotModel, calculateBoxPlotModel } from '../../lib/boxPlotUtils';
+import ScatterPlotTooltip from './ScatterPlotTooltip';
 import Timer = NodeJS.Timer;
-import {VictoryBoxPlot, VictoryChart, VictoryAxis, VictoryScatter, VictoryLegend, VictoryLabel} from "victory";
-import {IBaseScatterPlotData} from "./ScatterPlot";
-import {getDeterministicRandomNumber, separateScatterDataByAppearance} from "./PlotUtils";
-import {logicalAnd} from "../../lib/LogicUtils";
-import {tickFormatNumeral, wrapTick} from "./TickUtils";
-import {makeScatterPlotSizeFunction} from "./PlotUtils";
-import {getTextWidth, truncateWithEllipsis} from "cbioportal-frontend-commons";
-import autobind from "autobind-decorator";
+import {
+    VictoryBoxPlot,
+    VictoryChart,
+    VictoryAxis,
+    VictoryScatter,
+    VictoryLegend,
+    VictoryLabel,
+} from 'victory';
+import { IBaseScatterPlotData } from './ScatterPlot';
+import {
+    getDeterministicRandomNumber,
+    separateScatterDataByAppearance,
+} from './PlotUtils';
+import { logicalAnd } from '../../lib/LogicUtils';
+import { tickFormatNumeral, wrapTick } from './TickUtils';
+import { makeScatterPlotSizeFunction } from './PlotUtils';
+import {
+    getTextWidth,
+    truncateWithEllipsis,
+} from 'cbioportal-frontend-commons';
+import autobind from 'autobind-decorator';
 import { dataPointIsLimited } from 'shared/components/plots/PlotUtils';
-import _ from "lodash";
-import { IAxisLogScaleParams, IBoxScatterPlotPoint } from "pages/resultsView/plots/PlotsTabUtils";
-import { Popover } from "react-bootstrap";
-import * as ReactDOM from "react-dom";
-import classnames from "classnames";
-import WindowStore from "../window/WindowStore";
-import { textTruncationUtils } from "cbioportal-frontend-commons";
+import _ from 'lodash';
+import {
+    IAxisLogScaleParams,
+    IBoxScatterPlotPoint,
+} from 'pages/resultsView/plots/PlotsTabUtils';
+import { Popover } from 'react-bootstrap';
+import * as ReactDOM from 'react-dom';
+import classnames from 'classnames';
+import WindowStore from '../window/WindowStore';
+import { textTruncationUtils } from 'cbioportal-frontend-commons';
 
 export interface IBaseBoxScatterPlotPoint {
-    value:number;
-    jitter?:number; // between -1 and 1
+    value: number;
+    jitter?: number; // between -1 and 1
 }
 
 export interface IBoxScatterPlotData<D extends IBaseBoxScatterPlotPoint> {
-    label:string;
-    data:D[];
+    label: string;
+    data: D[];
 }
 
 export interface IBoxScatterPlotProps<D extends IBaseBoxScatterPlotPoint> {
-    svgId?:string;
-    title?:string;
+    svgId?: string;
+    title?: string;
     data: IBoxScatterPlotData<D>[];
-    chartBase:number;
-    startDataAxisAtZero?:boolean;
-    domainPadding?:number; // see https://formidable.com/open-source/victory/docs/victory-chart/#domainpadding
-    highlight?:(d:D)=>boolean;
-    size?:number | ((d:D, active:boolean, isHighlighted?:boolean)=>number);
-    fill?:string | ((d:D)=>string);
-    stroke?:string | ((d:D)=>string);
-    fillOpacity?:number | ((d:D)=>number);
-    strokeOpacity?:number | ((d:D)=>number);
-    strokeWidth?:number | ((d:D)=>number);
-    zIndexSortBy?:((d:D)=>any)[]; // second argument to _.sortBy
-    symbol?: string | ((d:D)=>string); // see http://formidable.com/open-source/victory/docs/victory-scatter/#symbol for options
-    scatterPlotTooltip?:(d:D)=>JSX.Element;
-    boxPlotTooltip?:(d:BoxModel)=>JSX.Element;
-    legendData?:{name:string|string[], symbol:any}[]; // see http://formidable.com/open-source/victory/docs/victory-legend/#data
-    logScale?:IAxisLogScaleParams|undefined; // log scale along the point data axis
-    excludeLimitValuesFromBoxPlot?:boolean;
-    axisLabelX?:string;
-    axisLabelY?:string;
-    horizontal?:boolean; // whether the box plot is horizontal
-    useLogSpaceTicks?:boolean; // if log scale for an axis, then this prop determines whether the ticks are shown in post-log coordinate, or original data coordinate space
-    boxWidth?:number;
-    legendLocationWidthThreshold?:number; // chart width after which we start putting the legend at the bottom of the plot
-    boxCalculationFilter?:(d:D)=>boolean; // determines which points are used for calculating the box
-    containerRef?:(svgContainer:SVGElement|null)=>void;
-    compressXAxis?:boolean
+    chartBase: number;
+    startDataAxisAtZero?: boolean;
+    domainPadding?: number; // see https://formidable.com/open-source/victory/docs/victory-chart/#domainpadding
+    highlight?: (d: D) => boolean;
+    size?:
+        | number
+        | ((d: D, active: boolean, isHighlighted?: boolean) => number);
+    fill?: string | ((d: D) => string);
+    stroke?: string | ((d: D) => string);
+    fillOpacity?: number | ((d: D) => number);
+    strokeOpacity?: number | ((d: D) => number);
+    strokeWidth?: number | ((d: D) => number);
+    zIndexSortBy?: ((d: D) => any)[]; // second argument to _.sortBy
+    symbol?: string | ((d: D) => string); // see http://formidable.com/open-source/victory/docs/victory-scatter/#symbol for options
+    scatterPlotTooltip?: (d: D) => JSX.Element;
+    boxPlotTooltip?: (d: BoxModel) => JSX.Element;
+    legendData?: { name: string | string[]; symbol: any }[]; // see http://formidable.com/open-source/victory/docs/victory-legend/#data
+    logScale?: IAxisLogScaleParams | undefined; // log scale along the point data axis
+    excludeLimitValuesFromBoxPlot?: boolean;
+    axisLabelX?: string;
+    axisLabelY?: string;
+    horizontal?: boolean; // whether the box plot is horizontal
+    useLogSpaceTicks?: boolean; // if log scale for an axis, then this prop determines whether the ticks are shown in post-log coordinate, or original data coordinate space
+    boxWidth?: number;
+    legendLocationWidthThreshold?: number; // chart width after which we start putting the legend at the bottom of the plot
+    boxCalculationFilter?: (d: D) => boolean; // determines which points are used for calculating the box
+    containerRef?: (svgContainer: SVGElement | null) => void;
+    compressXAxis?: boolean;
 }
 
 type BoxModel = {
-    min:number,
-    max:number,
-    median:number,
-    q1:number,
-    q3:number,
-    x?:number,
-    y?:number
+    min: number;
+    max: number;
+    median: number;
+    q1: number;
+    q3: number;
+    x?: number;
+    y?: number;
 };
 
 const RIGHT_GUTTER = 120; // room for legend
@@ -89,102 +109,107 @@ const HORIZONTAL_OFFSET = 8;
 const VERTICAL_OFFSET = 17;
 const UTILITIES_MENU_HEIGHT = 20;
 
-
 const BOX_STYLES = {
-    min: {stroke: "#999999"},
-    max: {stroke: "#999999"},
-    q1: {fill: "#eeeeee"},
-    q3: {fill: "#eeeeee"},
-    median: {stroke: "#999999", strokeWidth: 1},
+    min: { stroke: '#999999' },
+    max: { stroke: '#999999' },
+    q1: { fill: '#eeeeee' },
+    q3: { fill: '#eeeeee' },
+    median: { stroke: '#999999', strokeWidth: 1 },
 };
 
 @observer
-export default class BoxScatterPlot<D extends IBaseBoxScatterPlotPoint> extends React.Component<IBoxScatterPlotProps<D>, {}> {
-    @observable.ref private scatterPlotTooltipModel:any|null = null;
-    @observable private pointHovered:boolean = false;
-    private mouseEvents:any = this.makeMouseEvents();
-    @observable.ref private container:HTMLDivElement;
+export default class BoxScatterPlot<
+    D extends IBaseBoxScatterPlotPoint
+> extends React.Component<IBoxScatterPlotProps<D>, {}> {
+    @observable.ref private scatterPlotTooltipModel: any | null = null;
+    @observable private pointHovered: boolean = false;
+    private mouseEvents: any = this.makeMouseEvents();
+    @observable.ref private container: HTMLDivElement;
     @observable.ref private boxPlotTooltipModel: any | null;
-    @observable private mousePosition = { x:0, y:0 };
+    @observable private mousePosition = { x: 0, y: 0 };
 
     @bind
-    private containerRef(container:HTMLDivElement) {
+    private containerRef(container: HTMLDivElement) {
         this.container = container;
     }
 
     private makeMouseEvents() {
-        let disappearTimeout:Timer | null = null;
+        let disappearTimeout: Timer | null = null;
         const disappearDelayMs = 250;
 
-        return [{
-            target: "data",
-            eventHandlers: {
-                onMouseOver: () => {
-                    return [
-                        {
-                            target: "data",
-                            mutation: (props: any) => {
-                                this.scatterPlotTooltipModel = props;
-                                this.pointHovered = true;
-
-                                if (disappearTimeout !== null) {
-                                    clearTimeout(disappearTimeout);
-                                    disappearTimeout = null;
-                                }
-
-                                return { active: true };
-                            }
-                        }
-                    ];
-                },
-                onMouseOut: () => {
-                    return [
-                        {
-                            target: "data",
-                            mutation: () => {
-                                if (disappearTimeout !== null) {
-                                    clearTimeout(disappearTimeout);
-                                }
-
-                                disappearTimeout = setTimeout(()=>{
-                                    this.pointHovered = false;
-                                }, disappearDelayMs);
-
-                                return { active: false };
-                            }
-                        }
-                    ];
-                }
-            }
-        }];
-    }
-
-    private get boxPlotEvents() {
-        if (this.props.boxPlotTooltip) {
-            const self = this;
-            return [{
-                target: ["min", "max", "media", "q1", "q3"],
+        return [
+            {
+                target: 'data',
                 eventHandlers: {
-                    onMouseEnter: () => {
+                    onMouseOver: () => {
                         return [
                             {
+                                target: 'data',
                                 mutation: (props: any) => {
-                                    self.boxPlotTooltipModel = props;
-                                }
-                            }
+                                    this.scatterPlotTooltipModel = props;
+                                    this.pointHovered = true;
+
+                                    if (disappearTimeout !== null) {
+                                        clearTimeout(disappearTimeout);
+                                        disappearTimeout = null;
+                                    }
+
+                                    return { active: true };
+                                },
+                            },
                         ];
                     },
-                    onMouseLeave: () => {
+                    onMouseOut: () => {
                         return [
                             {
+                                target: 'data',
                                 mutation: () => {
-                                    self.boxPlotTooltipModel = null;
-                                }
-                            }
+                                    if (disappearTimeout !== null) {
+                                        clearTimeout(disappearTimeout);
+                                    }
+
+                                    disappearTimeout = setTimeout(() => {
+                                        this.pointHovered = false;
+                                    }, disappearDelayMs);
+
+                                    return { active: false };
+                                },
+                            },
                         ];
-                    }
-                }
-            }];
+                    },
+                },
+            },
+        ];
+    }
+
+    private get boxPlotEvents() {
+        if (this.props.boxPlotTooltip) {
+            const self = this;
+            return [
+                {
+                    target: ['min', 'max', 'media', 'q1', 'q3'],
+                    eventHandlers: {
+                        onMouseEnter: () => {
+                            return [
+                                {
+                                    mutation: (props: any) => {
+                                        self.boxPlotTooltipModel = props;
+                                    },
+                                },
+                            ];
+                        },
+                        onMouseLeave: () => {
+                            return [
+                                {
+                                    mutation: () => {
+                                        self.boxPlotTooltipModel = null;
+                                    },
+                                },
+                            ];
+                        },
+                    },
+                },
+            ];
         }
         return [];
     }
@@ -194,11 +219,11 @@ export default class BoxScatterPlot<D extends IBaseBoxScatterPlotPoint> extends
             return (
                 <VictoryLabel
                     style={{
-                        fontWeight:"bold",
+                        fontWeight: 'bold',
                         fontFamily: axisTickLabelStyles.fontFamily,
-                        textAnchor: "middle"
+                        textAnchor: 'middle',
                     }}
-                    x={this.svgWidth/2}
+                    x={this.svgWidth / 2}
                     y="1.2em"
                     text={this.props.title}
                 />
@@ -229,11 +254,13 @@ export default class BoxScatterPlot<D extends IBaseBoxScatterPlotPoint> extends
     }
 
     @computed get legendLocation() {
-        if (this.props.legendLocationWidthThreshold !== undefined &&
-            this.chartWidth > this.props.legendLocationWidthThreshold) {
-            return "bottom";
+        if (
+            this.props.legendLocationWidthThreshold !== undefined &&
+            this.chartWidth > this.props.legendLocationWidthThreshold
+        ) {
+            return 'bottom';
         } else {
-            return "right";
+            return 'right';
         }
     }
 
@@ -242,34 +269,49 @@ export default class BoxScatterPlot<D extends IBaseBoxScatterPlotPoint> extends
         if (!this.props.legendData) {
             return 0;
         } else {
-            const numRows = Math.ceil(this.props.legendData.length / LEGEND_ITEMS_PER_ROW);
-            return 23.7*numRows;
+            const numRows = Math.ceil(
+                this.props.legendData.length / LEGEND_ITEMS_PER_ROW
+            );
+            return 23.7 * numRows;
         }
     }
 
     private get legend() {
         if (this.props.legendData && this.props.legendData.length) {
             let legendData = this.props.legendData;
-            if (this.legendLocation === "bottom") {
+            if (this.legendLocation === 'bottom') {
                 // if legend is at bottom then flatten labels
-                legendData = legendData.map(x=>{
+                legendData = legendData.map(x => {
                     let name = x.name;
                     if (Array.isArray(x.name)) {
-                        name = (name as string[]).join(" "); // flatten labels by joining with space
+                        name = (name as string[]).join(' '); // flatten labels by joining with space
                     }
                     return {
-                        name, symbol: x.symbol
+                        name,
+                        symbol: x.symbol,
                     };
                 });
             }
             return (
                 <VictoryLegend
-                    orientation={this.legendLocation === "right" ? "vertical" : "horizontal"}
-                    itemsPerRow={this.legendLocation === "right" ? undefined : LEGEND_ITEMS_PER_ROW}
-                    rowGutter={this.legendLocation === "right" ? undefined : -5}
+                    orientation={
+                        this.legendLocation === 'right'
+                            ? 'vertical'
+                            : 'horizontal'
+                    }
+                    itemsPerRow={
+                        this.legendLocation === 'right'
+                            ? undefined
+                            : LEGEND_ITEMS_PER_ROW
+                    }
+                    rowGutter={this.legendLocation === 'right' ? undefined : -5}
                     data={legendData}
-                    x={this.legendLocation === "right" ? this.sideLegendX : 0}
-                    y={this.legendLocation === "right" ? 100 : this.svgHeight-this.bottomLegendHeight}
+                    x={this.legendLocation === 'right' ? this.sideLegendX : 0}
+                    y={
+                        this.legendLocation === 'right'
+                            ? 100
+                            : this.svgHeight - this.bottomLegendHeight
+                    }
                 />
             );
         } else {
@@ -295,9 +337,12 @@ export default class BoxScatterPlot<D extends IBaseBoxScatterPlotPoint> extends
         if (this.props.startDataAxisAtZero) {
             min = Math.min(0, min);
         }
-        let x:number[], y:number[];
+        let x: number[], y: number[];
         const dataDomain = [min, max];
-        const categoryDomain = [this.categoryCoord(0), this.categoryCoord(Math.max(1, this.props.data.length - 1))];
+        const categoryDomain = [
+            this.categoryCoord(0),
+            this.categoryCoord(Math.max(1, this.props.data.length - 1)),
+        ];
         if (this.props.horizontal) {
             x = dataDomain;
             y = categoryDomain;
@@ -310,7 +355,7 @@ export default class BoxScatterPlot<D extends IBaseBoxScatterPlotPoint> extends
 
     @computed get categoryAxisDomainPadding() {
         // padding needs to be at least half a box width plus a bit
-        return Math.max(this.boxWidth/2 + 30, this.domainPadding);
+        return Math.max(this.boxWidth / 2 + 30, this.domainPadding);
     }
 
     @computed get dataAxisDomainPadding() {
@@ -325,33 +370,37 @@ export default class BoxScatterPlot<D extends IBaseBoxScatterPlotPoint> extends
         }
     }
 
-    @computed get dataAxis():"x"|"y" {
+    @computed get dataAxis(): 'x' | 'y' {
         if (this.props.horizontal) {
-            return "x";
+            return 'x';
         } else {
-            return "y";
+            return 'y';
         }
     }
 
-    @computed get categoryAxis():"x"|"y" {
+    @computed get categoryAxis(): 'x' | 'y' {
         if (this.props.horizontal) {
-            return "y";
+            return 'y';
         } else {
-            return "x";
+            return 'x';
         }
     }
 
     @computed get chartDomainPadding() {
         return {
-            [this.dataAxis]:this.dataAxisDomainPadding,
-            [this.categoryAxis]:this.categoryAxisDomainPadding
+            [this.dataAxis]: this.dataAxisDomainPadding,
+            [this.categoryAxis]: this.categoryAxisDomainPadding,
         };
     }
 
     @computed get chartExtent() {
         const miscPadding = 100; // specifying chart width in victory doesnt translate directly to the actual graph size
         const numBoxes = this.props.data.length;
-        return this.categoryCoord(numBoxes - 1) + 2*this.categoryAxisDomainPadding + miscPadding;
+        return (
+            this.categoryCoord(numBoxes - 1) +
+            2 * this.categoryAxisDomainPadding +
+            miscPadding
+        );
         //return 2*this.domainPadding + numBoxes*this.boxWidth + (numBoxes-1)*this.boxSeparation;
         //const ret = Math.max(computedExtent, this.props.chartBase);
         //return ret;
@@ -366,7 +415,7 @@ export default class BoxScatterPlot<D extends IBaseBoxScatterPlotPoint> extends
     }
 
     @computed get boxSeparation() {
-        return 0.5*this.boxWidth;
+        return 0.5 * this.boxWidth;
     }
 
     @computed get boxWidth() {
@@ -379,7 +428,7 @@ export default class BoxScatterPlot<D extends IBaseBoxScatterPlotPoint> extends
     }
 
     @bind
-    private scatterPlotX(d:IBaseScatterPlotData & D) {
+    private scatterPlotX(d: IBaseScatterPlotData & D) {
         if (this.props.logScale && this.props.horizontal) {
             return this.props.logScale.fLogScale(d.x, 0);
         } else {
@@ -387,7 +436,10 @@ export default class BoxScatterPlot<D extends IBaseBoxScatterPlotPoint> extends
             if (!this.props.horizontal) {
                 let jitterRandomNumber = d.jitter;
                 if (jitterRandomNumber === undefined) {
-                    jitterRandomNumber = getDeterministicRandomNumber(d.y, [-1,1]);
+                    jitterRandomNumber = getDeterministicRandomNumber(d.y, [
+                        -1,
+                        1,
+                    ]);
                 }
                 jitter = this.jitter(d, jitterRandomNumber);
             }
@@ -396,7 +448,7 @@ export default class BoxScatterPlot<D extends IBaseBoxScatterPlotPoint> extends
     }
 
     @bind
-    private scatterPlotY(d:IBaseScatterPlotData & D) {
+    private scatterPlotY(d: IBaseScatterPlotData & D) {
         if (this.props.logScale && !this.props.horizontal) {
             return this.props.logScale.fLogScale(d.y, 0);
         } else {
@@ -404,7 +456,10 @@ export default class BoxScatterPlot<D extends IBaseBoxScatterPlotPoint> extends
             if (this.props.horizontal) {
                 let jitterRandomNumber = d.jitter;
                 if (jitterRandomNumber === undefined) {
-                    jitterRandomNumber = getDeterministicRandomNumber(d.x, [-1,1]);
+                    jitterRandomNumber = getDeterministicRandomNumber(d.x, [
+                        -1,
+                        1,
+                    ]);
                 }
                 jitter = this.jitter(d, jitterRandomNumber);
             }
@@ -422,21 +477,32 @@ export default class BoxScatterPlot<D extends IBaseBoxScatterPlotPoint> extends
     @computed get labels() {
         return this.props.data.map(d => {
             if (!!this.props.compressXAxis) {
-                return truncateWithEllipsis(d.label, 50, axisTickLabelStyles.fontFamily, axisTickLabelStyles.fontSize + 'px');
+                return truncateWithEllipsis(
+                    d.label,
+                    50,
+                    axisTickLabelStyles.fontFamily,
+                    axisTickLabelStyles.fontSize + 'px'
+                );
             }
             return d.label;
         });
     }
 
     @bind
-    private formatCategoryTick(t:number, index:number) {
+    private formatCategoryTick(t: number, index: number) {
         //return wrapTick(this.labels[index], MAXIMUM_CATEGORY_LABEL_SIZE);
         return this.labels[index];
     }
 
     @bind
-    private formatNumericalTick(t:number, i:number, ticks:number[]) {
-        return tickFormatNumeral(t, ticks, (this.props.logScale && !this.props.useLogSpaceTicks) ? this.props.logScale.fInvLogScale : undefined);
+    private formatNumericalTick(t: number, i: number, ticks: number[]) {
+        return tickFormatNumeral(
+            t,
+            ticks,
+            this.props.logScale && !this.props.useLogSpaceTicks
+                ? this.props.logScale.fInvLogScale
+                : undefined
+        );
     }
 
     @computed get horzAxis() {
@@ -445,26 +511,54 @@ export default class BoxScatterPlot<D extends IBaseBoxScatterPlotPoint> extends
         return (
             <VictoryAxis
                 style={{
-                    grid: {strokeOpacity: 1}
+                    grid: { strokeOpacity: 1 },
                 }}
                 orientation="bottom"
                 offsetY={50}
                 crossAxis={false}
                 label={this.props.axisLabelX}
-
-                tickValues={this.props.horizontal ? undefined: this.categoryTickValues}
-                tickCount={this.props.horizontal ? NUM_AXIS_TICKS: undefined }
-                tickFormat={this.props.horizontal ? this.formatNumericalTick : this.formatCategoryTick}
-                tickLabelComponent={<VictoryLabel angle={!!this.props.compressXAxis || this.props.horizontal ? undefined : CATEGORY_LABEL_HORZ_ANGLE}
-                                                  verticalAnchor={!!this.props.compressXAxis || this.props.horizontal ? undefined : "start"}
-                                                  textAnchor={!!this.props.compressXAxis ||this.props.horizontal ? undefined : "start"}
-                                  />}
-                axisLabelComponent={<VictoryLabel dy={!!this.props.compressXAxis || this.props.horizontal ? 35 : this.biggestCategoryLabelSize + 24}/>}
+                tickValues={
+                    this.props.horizontal ? undefined : this.categoryTickValues
+                }
+                tickCount={this.props.horizontal ? NUM_AXIS_TICKS : undefined}
+                tickFormat={
+                    this.props.horizontal
+                        ? this.formatNumericalTick
+                        : this.formatCategoryTick
+                }
+                tickLabelComponent={
+                    <VictoryLabel
+                        angle={
+                            !!this.props.compressXAxis || this.props.horizontal
+                                ? undefined
+                                : CATEGORY_LABEL_HORZ_ANGLE
+                        }
+                        verticalAnchor={
+                            !!this.props.compressXAxis || this.props.horizontal
+                                ? undefined
+                                : 'start'
+                        }
+                        textAnchor={
+                            !!this.props.compressXAxis || this.props.horizontal
+                                ? undefined
+                                : 'start'
+                        }
+                    />
+                }
+                axisLabelComponent={
+                    <VictoryLabel
+                        dy={
+                            !!this.props.compressXAxis || this.props.horizontal
+                                ? 35
+                                : this.biggestCategoryLabelSize + 24
+                        }
+                    />
+                }
             />
         );
     }
-    
-    @computed get yAxisLabel():string[] {
+
+    @computed get yAxisLabel(): string[] {
         if (this.props.axisLabelY) {
             return textTruncationUtils(
                 this.props.axisLabelY,
@@ -475,10 +569,10 @@ export default class BoxScatterPlot<D extends IBaseBoxScatterPlotPoint> extends
         }
         return [];
     }
-    
-    @computed get yAxisLabelVertOffset():number {
+
+    @computed get yAxisLabelVertOffset(): number {
         if (this.props.horizontal) {
-            return -1*this.biggestCategoryLabelSize - 24;
+            return -1 * this.biggestCategoryLabelSize - 24;
         } else if (this.yAxisLabel.length > 1) {
             return -30;
         }
@@ -493,35 +587,45 @@ export default class BoxScatterPlot<D extends IBaseBoxScatterPlotPoint> extends
                 crossAxis={false}
                 label={this.yAxisLabel}
                 dependentAxis={true}
-                tickValues={this.props.horizontal ? this.categoryTickValues : undefined}
+                tickValues={
+                    this.props.horizontal ? this.categoryTickValues : undefined
+                }
                 tickCount={this.props.horizontal ? undefined : NUM_AXIS_TICKS}
-                tickFormat={this.props.horizontal ? this.formatCategoryTick : this.formatNumericalTick}
-                axisLabelComponent={<VictoryLabel dy={this.yAxisLabelVertOffset}/>}
+                tickFormat={
+                    this.props.horizontal
+                        ? this.formatCategoryTick
+                        : this.formatNumericalTick
+                }
+                axisLabelComponent={
+                    <VictoryLabel dy={this.yAxisLabelVertOffset} />
+                }
             />
         );
     }
 
     @computed get scatterPlotData() {
-        let dataAxis:"x"|"y" = this.props.horizontal ? "x" : "y";
-        let categoryAxis:"x"|"y" = this.props.horizontal ? "y" : "x";
-        const data:(D&{x:number, y:number})[] = [];
-        for (let i=0; i<this.props.data.length; i++) {
+        let dataAxis: 'x' | 'y' = this.props.horizontal ? 'x' : 'y';
+        let categoryAxis: 'x' | 'y' = this.props.horizontal ? 'y' : 'x';
+        const data: (D & { x: number; y: number })[] = [];
+        for (let i = 0; i < this.props.data.length; i++) {
             const categoryCoord = this.categoryCoord(i);
             for (const d of this.props.data[i].data) {
-                data.push(Object.assign({}, d, {
-                    [dataAxis]:d.value,
-                    [categoryAxis]:categoryCoord,
-                } as {x:number, y:number} & IBaseBoxScatterPlotPoint));
+                data.push(
+                    Object.assign({}, d, {
+                        [dataAxis]: d.value,
+                        [categoryAxis]: categoryCoord,
+                    } as { x: number; y: number } & IBaseBoxScatterPlotPoint)
+                );
             }
         }
         return separateScatterDataByAppearance<D>(
             data,
-            ifNotDefined(this.props.fill, "0x000000"),
-            ifNotDefined(this.props.stroke, "0x000000"),
+            ifNotDefined(this.props.fill, '0x000000'),
+            ifNotDefined(this.props.stroke, '0x000000'),
             ifNotDefined(this.props.strokeWidth, 0),
             ifNotDefined(this.props.strokeOpacity, 1),
             ifNotDefined(this.props.fillOpacity, 1),
-            ifNotDefined(this.props.symbol, "circle"),
+            ifNotDefined(this.props.symbol, 'circle'),
             this.props.zIndexSortBy
         );
     }
@@ -540,7 +644,11 @@ export default class BoxScatterPlot<D extends IBaseBoxScatterPlotPoint> extends
     }
 
     @computed get rightPadding() {
-        if (this.props.legendData && this.props.legendData.length > 0 && this.legendLocation === "right") {
+        if (
+            this.props.legendData &&
+            this.props.legendData.length > 0 &&
+            this.legendLocation === 'right'
+        ) {
             // make room for legend
             return Math.max(RIGHT_GUTTER, RIGHT_PADDING_FOR_LONG_LABELS);
         } else {
@@ -555,9 +663,11 @@ export default class BoxScatterPlot<D extends IBaseBoxScatterPlotPoint> extends
         if (!this.props.horizontal) {
             // more padding if vertical, because category labels extend to bottom
             // more padding if axis is not compressed
-            paddingForLabels = !!this.props.compressXAxis ? 20 : this.biggestCategoryLabelSize;
+            paddingForLabels = !!this.props.compressXAxis
+                ? 20
+                : this.biggestCategoryLabelSize;
         }
-        if (this.legendLocation === "bottom") {
+        if (this.legendLocation === 'bottom') {
             // more padding if legend location is "bottom", to make room for legend
             paddingForLegend = this.bottomLegendHeight + BOTTOM_LEGEND_PADDING;
         }
@@ -567,72 +677,103 @@ export default class BoxScatterPlot<D extends IBaseBoxScatterPlotPoint> extends
 
     @computed get biggestCategoryLabelSize() {
         const maxSize = Math.max(
-            ...this.labels.map(x=>getTextWidth(x, axisTickLabelStyles.fontFamily, axisTickLabelStyles.fontSize+"px"))
+            ...this.labels.map(x =>
+                getTextWidth(
+                    x,
+                    axisTickLabelStyles.fontFamily,
+                    axisTickLabelStyles.fontSize + 'px'
+                )
+            )
         );
         if (!!this.props.compressXAxis || this.props.horizontal) {
             // if horizontal mode or if axis is compressed( i.e, tick labels are horizontal), its label width
             return maxSize;
         } else {
             // if vertical mode, its label height when rotated
-            return maxSize*Math.abs(Math.sin((Math.PI/180) * CATEGORY_LABEL_HORZ_ANGLE));
+            return (
+                maxSize *
+                Math.abs(Math.sin((Math.PI / 180) * CATEGORY_LABEL_HORZ_ANGLE))
+            );
         }
     }
 
-    private categoryCoord(index:number) {
+    private categoryCoord(index: number) {
         return index * (this.boxWidth + this.boxSeparation); // half box + separation + half box
     }
 
     @computed get categoryTickValues() {
-        return this.props.data.map((x, i)=>this.categoryCoord(i));
+        return this.props.data.map((x, i) => this.categoryCoord(i));
     }
 
-    @computed get boxPlotData():BoxModel[] {
+    @computed get boxPlotData(): BoxModel[] {
         const boxCalculationFilter = this.props.boxCalculationFilter;
 
         // when limit values are shown in the legend, exclude
         // these points from influencing the shape of the box plots
         let boxData = _.cloneDeep(this.props.data);
         if (this.props.excludeLimitValuesFromBoxPlot) {
-            _.each(boxData, (o:IBoxScatterPlotData<D>) => {
-                 o.data = _.filter(o.data, (p:IBoxScatterPlotPoint) => ! dataPointIsLimited(p) );
-            })
+            _.each(boxData, (o: IBoxScatterPlotData<D>) => {
+                o.data = _.filter(
+                    o.data,
+                    (p: IBoxScatterPlotPoint) => !dataPointIsLimited(p)
+                );
+            });
         }
 
-        return boxData.map(d=>calculateBoxPlotModel(d.data.reduce((data, next)=>{
-            if (!boxCalculationFilter || (boxCalculationFilter && boxCalculationFilter(next))) {
-                // filter out values in calculating boxes, if a filter is specified ^^
-                if (this.props.logScale) {
-                    data.push(this.props.logScale.fLogScale(next.value, 0));
+        return boxData
+            .map(d =>
+                calculateBoxPlotModel(
+                    d.data.reduce(
+                        (data, next) => {
+                            if (
+                                !boxCalculationFilter ||
+                                (boxCalculationFilter &&
+                                    boxCalculationFilter(next))
+                            ) {
+                                // filter out values in calculating boxes, if a filter is specified ^^
+                                if (this.props.logScale) {
+                                    data.push(
+                                        this.props.logScale.fLogScale(
+                                            next.value,
+                                            0
+                                        )
+                                    );
+                                } else {
+                                    data.push(next.value);
+                                }
+                            }
+                            return data;
+                        },
+                        [] as number[]
+                    )
+                )
+            )
+            .map((model, i) => {
+                // create boxes, importantly we dont filter at this step because
+                //  we need the indexes to be intact and correpond to the index in the input data,
+                //  in order to properly determine the x/y coordinates
+                const box: BoxModel = {
+                    min: model.whiskerLower,
+                    max: model.whiskerUpper,
+                    median: model.median,
+                    q1: model.q1,
+                    q3: model.q3,
+                };
+                if (this.props.horizontal) {
+                    box.y = this.categoryCoord(i);
                 } else {
-                    data.push(next.value);
+                    box.x = this.categoryCoord(i);
                 }
-            }
-            return data;
-        }, [] as number[]))).map((model, i)=>{
-            // create boxes, importantly we dont filter at this step because
-            //  we need the indexes to be intact and correpond to the index in the input data,
-            //  in order to properly determine the x/y coordinates
-            const box:BoxModel = {
-                min: model.whiskerLower,
-                max: model.whiskerUpper,
-                median: model.median,
-                q1: model.q1,
-                q3: model.q3,
-            };
-            if (this.props.horizontal) {
-                box.y = this.categoryCoord(i)
-            } else {
-                box.x = this.categoryCoord(i)
-            }
-            return box;
-        }).filter(box=>{
-            // filter out not well-defined boxes
-            return logicalAnd(
-                ["min", "max", "median", "q1", "q3"].map(key=>{
-                    return !isNaN((box as any)[key]);
-                })
-            );
-        });
+                return box;
+            })
+            .filter(box => {
+                // filter out not well-defined boxes
+                return logicalAnd(
+                    ['min', 'max', 'median', 'q1', 'q3'].map(key => {
+                        return !isNaN((box as any)[key]);
+                    })
+                );
+            });
     }
 
     @autobind
@@ -649,21 +790,21 @@ export default class BoxScatterPlot<D extends IBaseBoxScatterPlotPoint> extends
         return (
             <div
                 ref={this.containerRef}
-                style={{width: this.svgWidth, height: this.svgHeight}}
+                style={{ width: this.svgWidth, height: this.svgHeight }}
             >
                 <svg
-                    id={this.props.svgId || ""}
+                    id={this.props.svgId || ''}
                     style={{
                         width: this.svgWidth,
                         height: this.svgHeight,
-                        pointerEvents: "all"
+                        pointerEvents: 'all',
                     }}
                     height={this.svgHeight}
                     width={this.svgWidth}
                     role="img"
                     viewBox={`0 0 ${this.svgWidth} ${this.svgHeight}`}
                     onMouseMove={this.onMouseMove}
-                    ref={(ref) => {
+                    ref={ref => {
                         if (this.props.containerRef) {
                             this.props.containerRef(ref);
                         }
@@ -680,8 +821,9 @@ export default class BoxScatterPlot<D extends IBaseBoxScatterPlotPoint> extends
                             domainPadding={this.chartDomainPadding}
                             domain={this.plotDomain}
                             singleQuadrantDomainPadding={{
-                                [this.dataAxis]:!!this.props.startDataAxisAtZero,
-                                [this.categoryAxis]:false
+                                [this.dataAxis]: !!this.props
+                                    .startDataAxisAtZero,
+                                [this.categoryAxis]: false,
                             }}
                         >
                             {this.title}
@@ -695,17 +837,20 @@ export default class BoxScatterPlot<D extends IBaseBoxScatterPlotPoint> extends
                                 horizontal={this.props.horizontal}
                                 events={this.boxPlotEvents}
                             />
-                            {this.scatterPlotData.map(dataWithAppearance=>(
+                            {this.scatterPlotData.map(dataWithAppearance => (
                                 <VictoryScatter
                                     key={`${dataWithAppearance.fill},${dataWithAppearance.stroke},${dataWithAppearance.strokeWidth},${dataWithAppearance.strokeOpacity},${dataWithAppearance.fillOpacity},${dataWithAppearance.symbol}`}
                                     style={{
                                         data: {
                                             fill: dataWithAppearance.fill,
                                             stroke: dataWithAppearance.stroke,
-                                            strokeWidth: dataWithAppearance.strokeWidth,
-                                            strokeOpacity: dataWithAppearance.strokeOpacity,
-                                            fillOpacity: dataWithAppearance.fillOpacity
-                                        }
+                                            strokeWidth:
+                                                dataWithAppearance.strokeWidth,
+                                            strokeOpacity:
+                                                dataWithAppearance.strokeOpacity,
+                                            fillOpacity:
+                                                dataWithAppearance.fillOpacity,
+                                        },
                                     }}
                                     size={this.scatterPlotSize}
                                     symbol={dataWithAppearance.symbol}
@@ -724,14 +869,23 @@ export default class BoxScatterPlot<D extends IBaseBoxScatterPlotPoint> extends
 
     @autobind
     private getScatterPlotTooltip() {
-        if (this.container && this.scatterPlotTooltipModel && this.props.scatterPlotTooltip) {
+        if (
+            this.container &&
+            this.scatterPlotTooltipModel &&
+            this.props.scatterPlotTooltip
+        ) {
             return (
                 <ScatterPlotTooltip
-                    placement={this.props.horizontal ? "bottom" : "right"}
+                    placement={this.props.horizontal ? 'bottom' : 'right'}
                     container={this.container}
                     targetHovered={this.pointHovered}
-                    targetCoords={{x: this.scatterPlotTooltipModel.x + this.leftPadding, y: this.scatterPlotTooltipModel.y + this.topPadding}}
-                    overlay={this.props.scatterPlotTooltip(this.scatterPlotTooltipModel.datum)}
+                    targetCoords={{
+                        x: this.scatterPlotTooltipModel.x + this.leftPadding,
+                        y: this.scatterPlotTooltipModel.y + this.topPadding,
+                    }}
+                    overlay={this.props.scatterPlotTooltip(
+                        this.scatterPlotTooltipModel.datum
+                    )}
                 />
             );
         } else {
@@ -741,23 +895,40 @@ export default class BoxScatterPlot<D extends IBaseBoxScatterPlotPoint> extends
 
     @autobind
     private getBoxPlotTooltipComponent() {
-        if (this.container && this.boxPlotTooltipModel && this.props.boxPlotTooltip) {
+        if (
+            this.container &&
+            this.boxPlotTooltipModel &&
+            this.props.boxPlotTooltip
+        ) {
             const maxWidth = 400;
-            let tooltipPlacement = (this.mousePosition.x > WindowStore.size.width - maxWidth ? "left" : "right");
+            let tooltipPlacement =
+                this.mousePosition.x > WindowStore.size.width - maxWidth
+                    ? 'left'
+                    : 'right';
             return (ReactDOM as any).createPortal(
                 <Popover
                     arrowOffsetTop={VERTICAL_OFFSET}
-                    className={classnames("cbioportal-frontend", "cbioTooltip")}
-                    positionLeft={this.mousePosition.x + (tooltipPlacement === "left" ? -HORIZONTAL_OFFSET : HORIZONTAL_OFFSET)}
+                    className={classnames('cbioportal-frontend', 'cbioTooltip')}
+                    positionLeft={
+                        this.mousePosition.x +
+                        (tooltipPlacement === 'left'
+                            ? -HORIZONTAL_OFFSET
+                            : HORIZONTAL_OFFSET)
+                    }
                     positionTop={this.mousePosition.y - VERTICAL_OFFSET}
                     style={{
-                        transform: (tooltipPlacement === "left" ? "translate(-100%,0%)" : undefined),
-                        maxWidth
+                        transform:
+                            tooltipPlacement === 'left'
+                                ? 'translate(-100%,0%)'
+                                : undefined,
+                        maxWidth,
                     }}
                     placement={tooltipPlacement}
                 >
                     <div>
-                        {this.props.boxPlotTooltip(this.boxPlotTooltipModel.datum)}
+                        {this.props.boxPlotTooltip(
+                            this.boxPlotTooltipModel.datum
+                        )}
                     </div>
                 </Popover>,
                 document.body
@@ -773,15 +944,9 @@ export default class BoxScatterPlot<D extends IBaseBoxScatterPlotPoint> extends
         }
         return (
             <div>
-                <Observer>
-                    {this.getChart}
-                </Observer>
-                <Observer>
-                    {this.getScatterPlotTooltip}
-                </Observer>
-                <Observer>
-                    {this.getBoxPlotTooltipComponent}
-                </Observer>
+                <Observer>{this.getChart}</Observer>
+                <Observer>{this.getScatterPlotTooltip}</Observer>
+                <Observer>{this.getBoxPlotTooltipComponent}</Observer>
             </div>
         );
     }
diff --git a/src/shared/components/plots/MultipleCategoryBarPlot.tsx b/src/shared/components/plots/MultipleCategoryBarPlot.tsx
index cacf0025b4e..1aed0af1cea 100644
--- a/src/shared/components/plots/MultipleCategoryBarPlot.tsx
+++ b/src/shared/components/plots/MultipleCategoryBarPlot.tsx
@@ -1,47 +1,65 @@
-import * as React from "react";
-import {Observer, observer} from "mobx-react";
-import {IStringAxisData} from "../../../pages/resultsView/plots/PlotsTabUtils";
-import {computed, observable} from "mobx";
-import {bind} from "bind-decorator";
-import CBIOPORTAL_VICTORY_THEME, {axisTickLabelStyles, baseLabelStyles} from "../../theme/cBioPoralTheme";
-import {getTextWidth, stringListToIndexSet} from "cbioportal-frontend-commons";
-import autobind from "autobind-decorator";
-import _ from "lodash";
-import {VictoryAxis, VictoryBar, VictoryChart, VictoryLabel, VictoryStack, VictoryLegend, VictoryGroup} from "victory";
-import {tickFormatNumeral} from "./TickUtils";
-import {makeUniqueColorGetter} from "./PlotUtils";
-import { makePlotData, makeBarSpecs, sortDataByCategory } from "./MultipleCategoryBarPlotUtils";
-import * as ReactDOM from "react-dom";
-import { Popover } from "react-bootstrap";
-import classnames from "classnames";
-import WindowStore from "../window/WindowStore";
+import * as React from 'react';
+import { Observer, observer } from 'mobx-react';
+import { IStringAxisData } from '../../../pages/resultsView/plots/PlotsTabUtils';
+import { computed, observable } from 'mobx';
+import { bind } from 'bind-decorator';
+import CBIOPORTAL_VICTORY_THEME, {
+    axisTickLabelStyles,
+    baseLabelStyles,
+} from '../../theme/cBioPoralTheme';
+import {
+    getTextWidth,
+    stringListToIndexSet,
+} from 'cbioportal-frontend-commons';
+import autobind from 'autobind-decorator';
+import _ from 'lodash';
+import {
+    VictoryAxis,
+    VictoryBar,
+    VictoryChart,
+    VictoryLabel,
+    VictoryStack,
+    VictoryLegend,
+    VictoryGroup,
+} from 'victory';
+import { tickFormatNumeral } from './TickUtils';
+import { makeUniqueColorGetter } from './PlotUtils';
+import {
+    makePlotData,
+    makeBarSpecs,
+    sortDataByCategory,
+} from './MultipleCategoryBarPlotUtils';
+import * as ReactDOM from 'react-dom';
+import { Popover } from 'react-bootstrap';
+import classnames from 'classnames';
+import WindowStore from '../window/WindowStore';
 
 export interface IMultipleCategoryBarPlotProps {
-    svgId?:string;
-    domainPadding?:number;
-    horzData?:IStringAxisData["data"];
-    vertData?:IStringAxisData["data"];
-    plotData?: IMultipleCategoryBarPlotData[]
-    categoryToColor?:{[cat:string]:string};
-    barWidth:number;
-    chartBase:number;
-    horizontalBars?:boolean;
-    horzCategoryOrder?:string[];
-    vertCategoryOrder?:string[];
+    svgId?: string;
+    domainPadding?: number;
+    horzData?: IStringAxisData['data'];
+    vertData?: IStringAxisData['data'];
+    plotData?: IMultipleCategoryBarPlotData[];
+    categoryToColor?: { [cat: string]: string };
+    barWidth: number;
+    chartBase: number;
+    horizontalBars?: boolean;
+    horzCategoryOrder?: string[];
+    vertCategoryOrder?: string[];
     axisLabelX?: string;
     axisLabelY?: string;
     legendLocationWidthThreshold?: number;
-    percentage?:boolean;
-    stacked?:boolean;
-    ticksCount?:number;
-    axisStyle?:any;
+    percentage?: boolean;
+    stacked?: boolean;
+    ticksCount?: number;
+    axisStyle?: any;
     countAxisLabel?: string;
-    tooltip?:(datum:any)=> JSX.Element;
+    tooltip?: (datum: any) => JSX.Element;
 }
 
 export interface IMultipleCategoryBarPlotData {
-    minorCategory:string, 
-    counts:{majorCategory:string, count:number, percentage:number}[]
+    minorCategory: string;
+    counts: { majorCategory: string; count: number; percentage: number }[];
 }
 
 const RIGHT_GUTTER = 120; // room for legend
@@ -55,33 +73,37 @@ const BOTTOM_LEGEND_PADDING = 15;
 const RIGHT_PADDING_FOR_LONG_LABELS = 50;
 
 @observer
-export default class MultipleCategoryBarPlot extends React.Component<IMultipleCategoryBarPlotProps, {}> {
-
-    static defaultProps:Partial<IMultipleCategoryBarPlotProps> = {
-        countAxisLabel: "# samples"
+export default class MultipleCategoryBarPlot extends React.Component<
+    IMultipleCategoryBarPlotProps,
+    {}
+> {
+    static defaultProps: Partial<IMultipleCategoryBarPlotProps> = {
+        countAxisLabel: '# samples',
     };
 
-    @observable.ref tooltipModel:any|null = null;
-    private mouseEvents:any = this.makeMouseEvents();
-    private legendClassName:string = `stacked-bar-plot-legend-${Math.random()}`;
+    @observable.ref tooltipModel: any | null = null;
+    private mouseEvents: any = this.makeMouseEvents();
+    private legendClassName: string = `stacked-bar-plot-legend-${Math.random()}`;
     @observable computedLegendWidth = 0;
-    @observable mousePosition = { x:0, y:0 };
+    @observable mousePosition = { x: 0, y: 0 };
 
-    @observable.ref private container:HTMLDivElement;
+    @observable.ref private container: HTMLDivElement;
 
     @bind
-    private containerRef(container:HTMLDivElement) {
+    private containerRef(container: HTMLDivElement) {
         this.container = container;
         this.updateLegendWidth();
     }
 
     @computed get getColor() {
-        const uniqueColorGetter = makeUniqueColorGetter(_.values(this.props.categoryToColor));
-        const categoryToColor:{[category:string]:string} = {};
-        _.forEach(this.props.categoryToColor, (color, category)=>{
+        const uniqueColorGetter = makeUniqueColorGetter(
+            _.values(this.props.categoryToColor)
+        );
+        const categoryToColor: { [category: string]: string } = {};
+        _.forEach(this.props.categoryToColor, (color, category) => {
             categoryToColor[category.toLowerCase()] = color;
         });
-        return function(category:string) {
+        return function(category: string) {
             category = category.toLowerCase();
             if (!(category in categoryToColor)) {
                 categoryToColor[category] = uniqueColorGetter();
@@ -91,37 +113,39 @@ export default class MultipleCategoryBarPlot extends React.Component<IMultipleCa
     }
 
     private makeMouseEvents() {
-        return [{
-            target: "data",
-            eventHandlers: {
-                onMouseOver: () => {
-                    return [
-                        {
-                            target: "data",
-                            mutation: (props: any) => {
-                                this.tooltipModel = props;
-                                return null;
-                            }
-                        }
-                    ];
+        return [
+            {
+                target: 'data',
+                eventHandlers: {
+                    onMouseOver: () => {
+                        return [
+                            {
+                                target: 'data',
+                                mutation: (props: any) => {
+                                    this.tooltipModel = props;
+                                    return null;
+                                },
+                            },
+                        ];
+                    },
+                    onMouseOut: () => {
+                        return [
+                            {
+                                target: 'data',
+                                mutation: () => {
+                                    this.tooltipModel = null;
+                                    return null;
+                                },
+                            },
+                        ];
+                    },
                 },
-                onMouseOut: () => {
-                    return [
-                        {
-                            target: "data",
-                            mutation: () => {
-                                this.tooltipModel = null;
-                                return null;
-                            }
-                        }
-                    ];
-                }
-            }
-        }];
+            },
+        ];
     }
 
     @computed get chartWidth() {
-        let specifiedWidth:number;
+        let specifiedWidth: number;
         if (this.props.horizontalBars) {
             specifiedWidth = this.props.chartBase;
         } else {
@@ -130,12 +154,16 @@ export default class MultipleCategoryBarPlot extends React.Component<IMultipleCa
 
         return Math.max(
             specifiedWidth,
-            getTextWidth(this.props.axisLabelX || "", baseLabelStyles.fontFamily, baseLabelStyles.fontSize+"px")
+            getTextWidth(
+                this.props.axisLabelX || '',
+                baseLabelStyles.fontFamily,
+                baseLabelStyles.fontSize + 'px'
+            )
         ); // make sure theres enough room for the x-axis label
     }
 
     @computed get chartHeight() {
-        let specifiedWidth:number;
+        let specifiedWidth: number;
         if (this.props.horizontalBars) {
             specifiedWidth = this.chartExtent;
         } else {
@@ -144,7 +172,11 @@ export default class MultipleCategoryBarPlot extends React.Component<IMultipleCa
 
         return Math.max(
             specifiedWidth,
-            getTextWidth(this.props.axisLabelY || "", baseLabelStyles.fontFamily, baseLabelStyles.fontSize+"px")
+            getTextWidth(
+                this.props.axisLabelY || '',
+                baseLabelStyles.fontFamily,
+                baseLabelStyles.fontSize + 'px'
+            )
         ); // make sure theres enough room for the y-axis label
     }
 
@@ -153,13 +185,14 @@ export default class MultipleCategoryBarPlot extends React.Component<IMultipleCa
     }
 
     @computed get legendLocation() {
-        if ((this.props.legendLocationWidthThreshold !== undefined &&
-            this.chartWidth > this.props.legendLocationWidthThreshold) // move to bottom if chart width is too large, leaving no room for legend on the side
-            || (this.legendData.length > 15) // move to bottom if legend is too long, making it run off the screen
+        if (
+            (this.props.legendLocationWidthThreshold !== undefined &&
+                this.chartWidth > this.props.legendLocationWidthThreshold) || // move to bottom if chart width is too large, leaving no room for legend on the side
+            this.legendData.length > 15 // move to bottom if legend is too long, making it run off the screen
         ) {
-            return "bottom";
+            return 'bottom';
         } else {
-            return "right";
+            return 'right';
         }
     }
 
@@ -168,22 +201,26 @@ export default class MultipleCategoryBarPlot extends React.Component<IMultipleCa
         if (this.legendData.length === 0) {
             return 0;
         } else {
-            const numRows = Math.ceil(this.legendData.length / LEGEND_ITEMS_PER_ROW);
-            return 23.7*numRows;
+            const numRows = Math.ceil(
+                this.legendData.length / LEGEND_ITEMS_PER_ROW
+            );
+            return 23.7 * numRows;
         }
     }
 
     @computed get legendData() {
         return sortDataByCategory(
-            this.data, d=>d.minorCategory, this.minorCategoryOrder
-        ).map(obj=>({
+            this.data,
+            d => d.minorCategory,
+            this.minorCategoryOrder
+        ).map(obj => ({
             name: obj.minorCategory,
-            symbol:{
-                type: "square",
+            symbol: {
+                type: 'square',
                 fill: this.getColor(obj.minorCategory),
                 strokeOpacity: 0,
-                size: 5
-            }
+                size: 5,
+            },
         }));
     }
 
@@ -191,14 +228,26 @@ export default class MultipleCategoryBarPlot extends React.Component<IMultipleCa
         if (this.legendData.length > 0) {
             return (
                 <VictoryLegend
-                    orientation={this.legendLocation === "right" ? "vertical" : "horizontal"}
-                    itemsPerRow={this.legendLocation === "right" ? undefined : LEGEND_ITEMS_PER_ROW}
-                    rowGutter={this.legendLocation === "right" ? undefined : -5}
+                    orientation={
+                        this.legendLocation === 'right'
+                            ? 'vertical'
+                            : 'horizontal'
+                    }
+                    itemsPerRow={
+                        this.legendLocation === 'right'
+                            ? undefined
+                            : LEGEND_ITEMS_PER_ROW
+                    }
+                    rowGutter={this.legendLocation === 'right' ? undefined : -5}
                     gutter={30}
                     data={this.legendData}
-                    x={this.legendLocation === "right" ? this.sideLegendX : 0}
-                    y={this.legendLocation === "right" ? 100 : this.svgHeight-this.bottomLegendHeight}
-                    groupComponent={<g className={this.legendClassName}/>}
+                    x={this.legendLocation === 'right' ? this.sideLegendX : 0}
+                    y={
+                        this.legendLocation === 'right'
+                            ? 100
+                            : this.svgHeight - this.bottomLegendHeight
+                    }
+                    groupComponent={<g className={this.legendClassName} />}
                 />
             );
         } else {
@@ -206,10 +255,14 @@ export default class MultipleCategoryBarPlot extends React.Component<IMultipleCa
         }
     }
 
-    @computed get data():IMultipleCategoryBarPlotData[] {
+    @computed get data(): IMultipleCategoryBarPlotData[] {
         let data: IMultipleCategoryBarPlotData[] = [];
         if (this.props.horzData && this.props.vertData) {
-            data = makePlotData(this.props.horzData, this.props.vertData, !!this.props.horizontalBars);
+            data = makePlotData(
+                this.props.horzData,
+                this.props.vertData,
+                !!this.props.horizontalBars
+            );
         } else if (this.props.plotData) {
             data = this.props.plotData;
         }
@@ -217,32 +270,42 @@ export default class MultipleCategoryBarPlot extends React.Component<IMultipleCa
     }
 
     @computed get maxMajorCount() {
-        if(this.props.percentage){
+        if (this.props.percentage) {
             return 100;
         }
-        const majorCategoryCounts:{[major:string]:number} = {};
+        const majorCategoryCounts: { [major: string]: number } = {};
         for (const d of this.data) {
             for (const c of d.counts) {
-                majorCategoryCounts[c.majorCategory] = majorCategoryCounts[c.majorCategory] || 0;
+                majorCategoryCounts[c.majorCategory] =
+                    majorCategoryCounts[c.majorCategory] || 0;
                 if (this.props.stacked) {
                     majorCategoryCounts[c.majorCategory] += c.count;
                 } else {
-                    majorCategoryCounts[c.majorCategory] = Math.max(c.count, majorCategoryCounts[c.majorCategory]);
+                    majorCategoryCounts[c.majorCategory] = Math.max(
+                        c.count,
+                        majorCategoryCounts[c.majorCategory]
+                    );
                 }
             }
         }
-        return _.chain(majorCategoryCounts).values().max().value() as number;
+        return _.chain(majorCategoryCounts)
+            .values()
+            .max()
+            .value() as number;
     }
 
     @computed get plotDomain() {
         // data domain is 0 to max num samples
-        let x:number[], y:number[];
-        const countDomain:number[] = [0, this.maxMajorCount];
-        let categoryDomain:number[];
+        let x: number[], y: number[];
+        const countDomain: number[] = [0, this.maxMajorCount];
+        let categoryDomain: number[];
         if (this.data.length > 0) {
-            categoryDomain = [this.categoryCoord(0), this.categoryCoord(Math.max(1, this.data[0].counts.length - 1))];
+            categoryDomain = [
+                this.categoryCoord(0),
+                this.categoryCoord(Math.max(1, this.data[0].counts.length - 1)),
+            ];
         } else {
-            categoryDomain = [0,0];
+            categoryDomain = [0, 0];
         }
         if (this.props.horizontalBars) {
             x = countDomain;
@@ -274,33 +337,38 @@ export default class MultipleCategoryBarPlot extends React.Component<IMultipleCa
         }
     }
 
-    @computed get countAxis():"x"|"y" {
+    @computed get countAxis(): 'x' | 'y' {
         if (this.props.horizontalBars) {
-            return "x";
+            return 'x';
         } else {
-            return "y";
+            return 'y';
         }
     }
 
-    @computed get categoryAxis():"x"|"y" {
+    @computed get categoryAxis(): 'x' | 'y' {
         if (this.props.horizontalBars) {
-            return "y";
+            return 'y';
         } else {
-            return "x";
+            return 'x';
         }
     }
 
     @computed get chartDomainPadding() {
         return {
-            [this.countAxis]: this.props.percentage ? 0 : this.countAxisDomainPadding,
-            [this.categoryAxis]:this.categoryAxisDomainPadding + this.additionalPadding
+            [this.countAxis]: this.props.percentage
+                ? 0
+                : this.countAxisDomainPadding,
+            [this.categoryAxis]:
+                this.categoryAxisDomainPadding + this.additionalPadding,
         };
     }
 
     @computed get additionalPadding() {
         //if not stacked add padding to move the bars right
         //and add minorCategories count to fix padding issue when there are lot of categories
-        return this.props.stacked ? 0 : this.categoryCoord(this.data.length / 2) + this.data.length;
+        return this.props.stacked
+            ? 0
+            : this.categoryCoord(this.data.length / 2) + this.data.length;
     }
 
     @computed get chartExtent() {
@@ -315,7 +383,11 @@ export default class MultipleCategoryBarPlot extends React.Component<IMultipleCa
                 //add space between majorCategories
                 miscPadding += this.categoryCoord(this.data[0].counts.length);
             }
-            return this.categoryCoord(numBars - 1) + 2 * (this.categoryAxisDomainPadding) + miscPadding;
+            return (
+                this.categoryCoord(numBars - 1) +
+                2 * this.categoryAxisDomainPadding +
+                miscPadding
+            );
         } else {
             return miscPadding;
         }
@@ -339,14 +411,16 @@ export default class MultipleCategoryBarPlot extends React.Component<IMultipleCa
         if (this.props.stacked || this.data.length <= 10) {
             return barWidth;
         } else {
-            return barWidth / 2
+            return barWidth / 2;
         }
     }
 
     @computed get labels() {
         if (this.data.length > 0) {
             return sortDataByCategory(
-                this.data[0].counts.map(c=>c.majorCategory), x=>x, this.majorCategoryOrder
+                this.data[0].counts.map(c => c.majorCategory),
+                x => x,
+                this.majorCategoryOrder
             );
         } else {
             return [];
@@ -354,18 +428,20 @@ export default class MultipleCategoryBarPlot extends React.Component<IMultipleCa
     }
 
     @bind
-    private formatCategoryTick(t:number, index:number) {
+    private formatCategoryTick(t: number, index: number) {
         //return wrapTick(this.labels[index], MAXIMUM_CATEGORY_LABEL_SIZE);
         return this.labels[index];
     }
 
     @bind
-    private formatNumericalTick(t:number, i:number, ticks:number[]) {
+    private formatNumericalTick(t: number, i: number, ticks: number[]) {
         return tickFormatNumeral(t, ticks);
     }
 
-    @computed get numberOfTicks(){
-        return this.props.ticksCount !== undefined ? this.props.ticksCount : NUM_AXIS_TICKS;
+    @computed get numberOfTicks() {
+        return this.props.ticksCount !== undefined
+            ? this.props.ticksCount
+            : NUM_AXIS_TICKS;
     }
 
     @computed get zeroCountOffset() {
@@ -383,22 +459,36 @@ export default class MultipleCategoryBarPlot extends React.Component<IMultipleCa
         if (this.props.stacked) {
             return 0;
         } else {
-            return addOffset ? (0.01 * (this.maxMajorCount / this.numberOfTicks)) : 0;
+            return addOffset
+                ? 0.01 * (this.maxMajorCount / this.numberOfTicks)
+                : 0;
         }
     }
 
     @computed get axisStyle() {
-        return this.props.stacked ? this.props.axisStyle || {} : { axis: { stroke: "#b3b3b3" } };
+        return this.props.stacked
+            ? this.props.axisStyle || {}
+            : { axis: { stroke: '#b3b3b3' } };
     }
 
     @computed get categoryAxisStyle() {
-        let style = this.axisStyle
+        let style = this.axisStyle;
         if (!this.props.stacked) {
-            let width = this.categoryCoord(this.data.length) - (this.data.length * this.barSeparation);
+            let width =
+                this.categoryCoord(this.data.length) -
+                this.data.length * this.barSeparation;
             style = {
                 ...this.axisStyle,
                 ...{ axis: { strokeWidth: 0 } },
-                ...{ ticks: { stroke: "black", size: 1, strokeLinecap: "butt", strokeLinejoin: "butt", strokeWidth: width } }
+                ...{
+                    ticks: {
+                        stroke: 'black',
+                        size: 1,
+                        strokeLinecap: 'butt',
+                        strokeLinejoin: 'butt',
+                        strokeWidth: width,
+                    },
+                },
             };
         }
         return style;
@@ -409,38 +499,78 @@ export default class MultipleCategoryBarPlot extends React.Component<IMultipleCa
         //  this axis is for numbers, not categories
         const label = [this.props.axisLabelX];
         if (this.props.horizontalBars) {
-            label.unshift(`${this.props.countAxisLabel}${this.props.percentage ? " (%)": ""}`);
+            label.unshift(
+                `${this.props.countAxisLabel}${
+                    this.props.percentage ? ' (%)' : ''
+                }`
+            );
         }
-        const style = this.props.horizontalBars ? this.axisStyle : this.categoryAxisStyle;
+        const style = this.props.horizontalBars
+            ? this.axisStyle
+            : this.categoryAxisStyle;
         return (
             <VictoryAxis
                 orientation="bottom"
                 offsetY={50}
                 crossAxis={false}
                 label={label}
-
-                tickValues={this.props.horizontalBars ? undefined: this.categoryTickValues}
-                tickCount={this.props.horizontalBars ? this.numberOfTicks: undefined }
-                tickFormat={this.props.horizontalBars ? this.formatNumericalTick : this.formatCategoryTick}
-                tickLabelComponent={<VictoryLabel angle={this.props.horizontalBars ? undefined : CATEGORY_LABEL_HORZ_ANGLE}
-                                                  verticalAnchor={this.props.horizontalBars ? undefined : "start"}
-                                                  textAnchor={this.props.horizontalBars ? undefined : "start"}
-                />}
-                axisLabelComponent={<VictoryLabel dy={this.props.horizontalBars ? 35 : this.biggestCategoryLabelSize + 24}/>}
+                tickValues={
+                    this.props.horizontalBars
+                        ? undefined
+                        : this.categoryTickValues
+                }
+                tickCount={
+                    this.props.horizontalBars ? this.numberOfTicks : undefined
+                }
+                tickFormat={
+                    this.props.horizontalBars
+                        ? this.formatNumericalTick
+                        : this.formatCategoryTick
+                }
+                tickLabelComponent={
+                    <VictoryLabel
+                        angle={
+                            this.props.horizontalBars
+                                ? undefined
+                                : CATEGORY_LABEL_HORZ_ANGLE
+                        }
+                        verticalAnchor={
+                            this.props.horizontalBars ? undefined : 'start'
+                        }
+                        textAnchor={
+                            this.props.horizontalBars ? undefined : 'start'
+                        }
+                    />
+                }
+                axisLabelComponent={
+                    <VictoryLabel
+                        dy={
+                            this.props.horizontalBars
+                                ? 35
+                                : this.biggestCategoryLabelSize + 24
+                        }
+                    />
+                }
                 style={style}
             />
         );
     }
 
     @computed get vertAxis() {
-        const label:string[] = [];
-        if(this.props.axisLabelY) {
-            label.push(this.props.axisLabelY)
+        const label: string[] = [];
+        if (this.props.axisLabelY) {
+            label.push(this.props.axisLabelY);
         }
         if (!this.props.horizontalBars) {
-            label.push(`${this.props.countAxisLabel}${this.props.percentage ? " (%)": ""}`);
+            label.push(
+                `${this.props.countAxisLabel}${
+                    this.props.percentage ? ' (%)' : ''
+                }`
+            );
         }
-        const style = !this.props.horizontalBars ? this.axisStyle : this.categoryAxisStyle;
+        const style = !this.props.horizontalBars
+            ? this.axisStyle
+            : this.categoryAxisStyle;
         return (
             <VictoryAxis
                 orientation="left"
@@ -448,10 +578,28 @@ export default class MultipleCategoryBarPlot extends React.Component<IMultipleCa
                 crossAxis={false}
                 label={label}
                 dependentAxis={true}
-                tickValues={this.props.horizontalBars ? this.categoryTickValues : undefined}
-                tickCount={this.props.horizontalBars ? undefined : this.numberOfTicks}
-                tickFormat={this.props.horizontalBars ? this.formatCategoryTick : this.formatNumericalTick}
-                axisLabelComponent={<VictoryLabel dy={this.props.horizontalBars ? -1*this.biggestCategoryLabelSize - 24 : -40}/>}
+                tickValues={
+                    this.props.horizontalBars
+                        ? this.categoryTickValues
+                        : undefined
+                }
+                tickCount={
+                    this.props.horizontalBars ? undefined : this.numberOfTicks
+                }
+                tickFormat={
+                    this.props.horizontalBars
+                        ? this.formatCategoryTick
+                        : this.formatNumericalTick
+                }
+                axisLabelComponent={
+                    <VictoryLabel
+                        dy={
+                            this.props.horizontalBars
+                                ? -1 * this.biggestCategoryLabelSize - 24
+                                : -40
+                        }
+                    />
+                }
                 style={style}
             />
         );
@@ -471,12 +619,15 @@ export default class MultipleCategoryBarPlot extends React.Component<IMultipleCa
     }
 
     @computed get rightPadding() {
-        if (this.legendData.length > 0 && this.legendLocation === "right") {
+        if (this.legendData.length > 0 && this.legendLocation === 'right') {
             // make room for legend
             return this.biggestLegendLabelWidth + 20;
         } else {
             // make room for legend at bottom
-            return Math.max(RIGHT_PADDING_FOR_LONG_LABELS, this.computedLegendWidth - this.chartWidth);
+            return Math.max(
+                RIGHT_PADDING_FOR_LONG_LABELS,
+                this.computedLegendWidth - this.chartWidth
+            );
         }
     }
 
@@ -488,7 +639,7 @@ export default class MultipleCategoryBarPlot extends React.Component<IMultipleCa
             // more padding if vertical, because category labels extend to bottom
             paddingForLabels = this.biggestCategoryLabelSize;
         }
-        if (this.legendLocation === "bottom") {
+        if (this.legendLocation === 'bottom') {
             // more padding if legend location is "bottom", to make room for legend
             paddingForLegend = this.bottomLegendHeight + BOTTOM_LEGEND_PADDING;
         }
@@ -498,20 +649,35 @@ export default class MultipleCategoryBarPlot extends React.Component<IMultipleCa
 
     @computed get biggestLegendLabelWidth() {
         return Math.max(
-            ...this.legendData.map(x=>getTextWidth(x.name, baseLabelStyles.fontFamily, baseLabelStyles.fontSize+"px"))
+            ...this.legendData.map(x =>
+                getTextWidth(
+                    x.name,
+                    baseLabelStyles.fontFamily,
+                    baseLabelStyles.fontSize + 'px'
+                )
+            )
         );
     }
 
     @computed get biggestCategoryLabelSize() {
         const maxSize = Math.max(
-            ...this.labels.map(x=>getTextWidth(x, axisTickLabelStyles.fontFamily, axisTickLabelStyles.fontSize+"px"))
+            ...this.labels.map(x =>
+                getTextWidth(
+                    x,
+                    axisTickLabelStyles.fontFamily,
+                    axisTickLabelStyles.fontSize + 'px'
+                )
+            )
         );
         if (this.props.horizontalBars) {
             // if horizontal mode, its label width
             return maxSize;
         } else {
             // if vertical mode, its label height when rotated
-            return maxSize*Math.abs(Math.sin((Math.PI/180) * CATEGORY_LABEL_HORZ_ANGLE));
+            return (
+                maxSize *
+                Math.abs(Math.sin((Math.PI / 180) * CATEGORY_LABEL_HORZ_ANGLE))
+            );
         }
     }
 
@@ -542,15 +708,15 @@ export default class MultipleCategoryBarPlot extends React.Component<IMultipleCa
             return undefined;
         }
     }
-    
+
     @autobind
-    private categoryCoord(index:number) {
+    private categoryCoord(index: number) {
         return index * (this.barWidth + this.barSeparation); // half box + separation + half box
     }
 
     @computed get categoryTickValues() {
-        if (this.data.length > 0 ) {
-            return this.data[0].counts.map((x, i)=>this.categoryCoord(i));
+        if (this.data.length > 0) {
+            return this.data[0].counts.map((x, i) => this.categoryCoord(i));
         } else {
             return [];
         }
@@ -566,29 +732,31 @@ export default class MultipleCategoryBarPlot extends React.Component<IMultipleCa
             !!this.props.horizontalBars,
             !!this.props.stacked,
             !!this.props.percentage
-        )
-        return barSpecs.map(spec=>(
+        );
+        return barSpecs.map(spec => (
             <VictoryBar
-                style={{ data: { fill: spec.fill, width:this.barWidth } }}
-                data={
-                    _.map(spec.data, datum => ({
-                        ...datum,
-                        y: datum.y + this.zeroCountOffset
-                    }))
-                }
+                style={{ data: { fill: spec.fill, width: this.barWidth } }}
+                data={_.map(spec.data, datum => ({
+                    ...datum,
+                    y: datum.y + this.zeroCountOffset,
+                }))}
                 events={this.mouseEvents}
             />
         ));
     }
 
-    private tooltipFunction(datum:any) {
-        if(this.props.tooltip) {
+    private tooltipFunction(datum: any) {
+        if (this.props.tooltip) {
             return this.props.tooltip(datum);
         }
         return (
             <div>
-                <span>{datum.majorCategory}</span><br/>
-                <strong>{datum.minorCategory}:&nbsp;{datum.count}&nbsp;sample{datum.count === 1 ? "" : "s"}&nbsp;({datum.percentage}%)</strong>
+                <span>{datum.majorCategory}</span>
+                <br />
+                <strong>
+                    {datum.minorCategory}:&nbsp;{datum.count}&nbsp;sample
+                    {datum.count === 1 ? '' : 's'}&nbsp;({datum.percentage}%)
+                </strong>
             </div>
         );
     }
@@ -598,23 +766,23 @@ export default class MultipleCategoryBarPlot extends React.Component<IMultipleCa
             return null;
         } else {
             const maxWidth = 400;
-            let tooltipPlacement = "";
+            let tooltipPlacement = '';
             let dx = 0;
             let dy = 0;
-            let transform = "";
+            let transform = '';
             if (this.props.horizontalBars) {
-                tooltipPlacement = "bottom";
+                tooltipPlacement = 'bottom';
                 dy = 10;
-                transform = "translate(-50%,0%)";
+                transform = 'translate(-50%,0%)';
             } else {
                 dy = -17;
 
-                if (this.mousePosition.x > WindowStore.size.width-maxWidth) {
-                    tooltipPlacement = "left";
+                if (this.mousePosition.x > WindowStore.size.width - maxWidth) {
+                    tooltipPlacement = 'left';
                     dx = -8;
-                    transform = "translate(-100%,0%)";
+                    transform = 'translate(-100%,0%)';
                 } else {
-                    tooltipPlacement = "right";
+                    tooltipPlacement = 'right';
                     dx = 8;
                 }
             }
@@ -622,16 +790,18 @@ export default class MultipleCategoryBarPlot extends React.Component<IMultipleCa
             return (ReactDOM as any).createPortal(
                 <Popover
                     arrowOffsetTop={-dy}
-                    className={classnames("cbioportal-frontend", "cbioTooltip")}
+                    className={classnames('cbioportal-frontend', 'cbioTooltip')}
                     positionLeft={this.mousePosition.x + dx}
                     positionTop={this.mousePosition.y + dy}
                     style={{
                         transform,
-                        maxWidth
+                        maxWidth,
                     }}
                     placement={tooltipPlacement}
                 >
-                    {this.tooltipFunction(this.tooltipModel.datum || this.tooltipModel.data[0])}
+                    {this.tooltipFunction(
+                        this.tooltipModel.datum || this.tooltipModel.data[0]
+                    )}
                 </Popover>,
                 document.body
             );
@@ -640,13 +810,20 @@ export default class MultipleCategoryBarPlot extends React.Component<IMultipleCa
 
     @computed get chartEtl() {
         if (this.props.stacked) {
-            return (<VictoryStack horizontal={this.props.horizontalBars}>
-                {this.bars}
-            </VictoryStack>)
+            return (
+                <VictoryStack horizontal={this.props.horizontalBars}>
+                    {this.bars}
+                </VictoryStack>
+            );
         }
-        return (<VictoryGroup offset={this.offset} horizontal={this.props.horizontalBars}>
-            {this.bars}
-        </VictoryGroup>)
+        return (
+            <VictoryGroup
+                offset={this.offset}
+                horizontal={this.props.horizontalBars}
+            >
+                {this.bars}
+            </VictoryGroup>
+        );
     }
 
     @autobind
@@ -655,14 +832,14 @@ export default class MultipleCategoryBarPlot extends React.Component<IMultipleCa
             return (
                 <div
                     ref={this.containerRef}
-                    style={{width: this.svgWidth, height: this.svgHeight}}
+                    style={{ width: this.svgWidth, height: this.svgHeight }}
                 >
                     <svg
-                        id={this.props.svgId || ""}
+                        id={this.props.svgId || ''}
                         style={{
                             width: this.svgWidth,
                             height: this.svgHeight,
-                            pointerEvents: "all"
+                            pointerEvents: 'all',
                         }}
                         height={this.svgHeight}
                         width={this.svgWidth}
@@ -681,8 +858,8 @@ export default class MultipleCategoryBarPlot extends React.Component<IMultipleCa
                                 domainPadding={this.chartDomainPadding}
                                 domain={this.plotDomain}
                                 singleQuadrantDomainPadding={{
-                                    [this.countAxis]:true,
-                                    [this.categoryAxis]:false
+                                    [this.countAxis]: true,
+                                    [this.categoryAxis]: false,
                                 }}
                             >
                                 {this.legend}
@@ -695,25 +872,27 @@ export default class MultipleCategoryBarPlot extends React.Component<IMultipleCa
                 </div>
             );
         } else {
-            return <span>No data to plot.</span>
+            return <span>No data to plot.</span>;
         }
     }
 
-    @autobind private onMouseMove(e:React.MouseEvent<any>) {
+    @autobind private onMouseMove(e: React.MouseEvent<any>) {
         this.mousePosition.x = e.pageX;
         this.mousePosition.y = e.pageY;
     }
 
     private updateLegendWidth() {
-        if(this.container) {
-            const legend = this.container.getElementsByClassName(this.legendClassName).item(0);
+        if (this.container) {
+            const legend = this.container
+                .getElementsByClassName(this.legendClassName)
+                .item(0);
             if (legend) {
                 this.computedLegendWidth = legend.getBoundingClientRect().width;
             }
         }
     }
 
-    componentDidUpdate(){
+    componentDidUpdate() {
         this.updateLegendWidth();
     }
 
@@ -723,11 +902,9 @@ export default class MultipleCategoryBarPlot extends React.Component<IMultipleCa
         }
         return (
             <div>
-                <Observer>
-                    {this.getChart}
-                </Observer>
+                <Observer>{this.getChart}</Observer>
                 {this.tooltipComponent}
             </div>
         );
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/plots/MultipleCategoryBarPlotUtils.spec.ts b/src/shared/components/plots/MultipleCategoryBarPlotUtils.spec.ts
index 3acaf4e5e32..a5389d8d5cf 100644
--- a/src/shared/components/plots/MultipleCategoryBarPlotUtils.spec.ts
+++ b/src/shared/components/plots/MultipleCategoryBarPlotUtils.spec.ts
@@ -1,1137 +1,2715 @@
-import chai, {assert, expect} from "chai";
-import { makePlotData, makeBarSpecs } from "./MultipleCategoryBarPlotUtils";
-import _ from "lodash";
-import deepEqualInAnyOrder from "deep-equal-in-any-order";
+import chai, { assert, expect } from 'chai';
+import { makePlotData, makeBarSpecs } from './MultipleCategoryBarPlotUtils';
+import _ from 'lodash';
+import deepEqualInAnyOrder from 'deep-equal-in-any-order';
 chai.use(deepEqualInAnyOrder);
 
-describe("MultipleCategoryBarPlotUtils", ()=>{
-    let singleValueHorzBarsData:any[];
-    let singleValueVertBarsData:any[];
-    let multipleValueHorzBarsData:any[];
-    let multipleValueVertBarsData:any[];
-    beforeEach(()=>{
+describe('MultipleCategoryBarPlotUtils', () => {
+    let singleValueHorzBarsData: any[];
+    let singleValueVertBarsData: any[];
+    let multipleValueHorzBarsData: any[];
+    let multipleValueVertBarsData: any[];
+    beforeEach(() => {
         singleValueVertBarsData = [
-            { minorCategory: "categoryC", counts:[
-                { majorCategory: "categoryA", count:2, percentage:66.67},
-                { majorCategory: "categoryB", count:1, percentage:100},
-                { majorCategory: "categoryE", count:0, percentage:0},
-            ]},
-            { minorCategory: "categoryD", counts:[
-                { majorCategory: "categoryA", count:1, percentage:33.33},
-                { majorCategory: "categoryB", count:0, percentage:0},
-                { majorCategory: "categoryE", count:1, percentage:100}
-            ]}
+            {
+                minorCategory: 'categoryC',
+                counts: [
+                    { majorCategory: 'categoryA', count: 2, percentage: 66.67 },
+                    { majorCategory: 'categoryB', count: 1, percentage: 100 },
+                    { majorCategory: 'categoryE', count: 0, percentage: 0 },
+                ],
+            },
+            {
+                minorCategory: 'categoryD',
+                counts: [
+                    { majorCategory: 'categoryA', count: 1, percentage: 33.33 },
+                    { majorCategory: 'categoryB', count: 0, percentage: 0 },
+                    { majorCategory: 'categoryE', count: 1, percentage: 100 },
+                ],
+            },
         ];
 
         singleValueHorzBarsData = [
-            { minorCategory: "categoryA", counts:[
-                { majorCategory: "categoryC", count:2, percentage:66.67},
-                { majorCategory: "categoryD", count:1, percentage:50},
-            ]},
-            { minorCategory: "categoryB", counts:[
-                { majorCategory: "categoryC", count:1, percentage:33.33},
-                { majorCategory: "categoryD", count:0, percentage:0},
-            ]},
-            { minorCategory: "categoryE", counts:[
-                { majorCategory: "categoryC", count:0, percentage:0},
-                { majorCategory: "categoryD", count:1, percentage:50},
-            ]},
+            {
+                minorCategory: 'categoryA',
+                counts: [
+                    { majorCategory: 'categoryC', count: 2, percentage: 66.67 },
+                    { majorCategory: 'categoryD', count: 1, percentage: 50 },
+                ],
+            },
+            {
+                minorCategory: 'categoryB',
+                counts: [
+                    { majorCategory: 'categoryC', count: 1, percentage: 33.33 },
+                    { majorCategory: 'categoryD', count: 0, percentage: 0 },
+                ],
+            },
+            {
+                minorCategory: 'categoryE',
+                counts: [
+                    { majorCategory: 'categoryC', count: 0, percentage: 0 },
+                    { majorCategory: 'categoryD', count: 1, percentage: 50 },
+                ],
+            },
         ];
 
         multipleValueVertBarsData = [
-            { minorCategory: "categoryC", counts:[
-                { majorCategory: "categoryA", count:2, percentage:50},
-                { majorCategory: "categoryB", count:3, percentage:60},
-                { majorCategory: "categoryE", count:2, percentage:50},
-            ]},
-            { minorCategory: "categoryD", counts:[
-                { majorCategory: "categoryA", count:2, percentage:50},
-                { majorCategory: "categoryB", count:2, percentage:40},
-                { majorCategory: "categoryE", count:2, percentage:50}
-            ]}
+            {
+                minorCategory: 'categoryC',
+                counts: [
+                    { majorCategory: 'categoryA', count: 2, percentage: 50 },
+                    { majorCategory: 'categoryB', count: 3, percentage: 60 },
+                    { majorCategory: 'categoryE', count: 2, percentage: 50 },
+                ],
+            },
+            {
+                minorCategory: 'categoryD',
+                counts: [
+                    { majorCategory: 'categoryA', count: 2, percentage: 50 },
+                    { majorCategory: 'categoryB', count: 2, percentage: 40 },
+                    { majorCategory: 'categoryE', count: 2, percentage: 50 },
+                ],
+            },
         ];
 
         multipleValueHorzBarsData = [
-            { minorCategory: "categoryA", counts:[
-                { majorCategory: "categoryC", count:2, percentage:28.57},
-                { majorCategory: "categoryD", count:2, percentage:33.33},
-            ]},
-            { minorCategory: "categoryB", counts:[
-                { majorCategory: "categoryC", count:3, percentage:42.86},
-                { majorCategory: "categoryD", count:2, percentage:33.33},
-            ]},
-            { minorCategory: "categoryE", counts:[
-                { majorCategory: "categoryC", count:2, percentage:28.57},
-                { majorCategory: "categoryD", count:2, percentage:33.33},
-            ]},
+            {
+                minorCategory: 'categoryA',
+                counts: [
+                    { majorCategory: 'categoryC', count: 2, percentage: 28.57 },
+                    { majorCategory: 'categoryD', count: 2, percentage: 33.33 },
+                ],
+            },
+            {
+                minorCategory: 'categoryB',
+                counts: [
+                    { majorCategory: 'categoryC', count: 3, percentage: 42.86 },
+                    { majorCategory: 'categoryD', count: 2, percentage: 33.33 },
+                ],
+            },
+            {
+                minorCategory: 'categoryE',
+                counts: [
+                    { majorCategory: 'categoryC', count: 2, percentage: 28.57 },
+                    { majorCategory: 'categoryD', count: 2, percentage: 33.33 },
+                ],
+            },
         ];
     });
 
-    describe("makePlotData", ()=>{
-        let singleValueHorzData:any[];
-        let singleValueVertData:any[];
-        let multipleValueHorzData:any[];
-        let multipleValueVertData:any[];
-        beforeEach(()=>{
-            singleValueHorzData = [{
-                uniqueSampleKey: "sampleA",
-                value: "categoryA"
-            }, {
-                uniqueSampleKey: "sampleB",
-                value: "categoryA"
-            }, {
-                uniqueSampleKey: "sampleC",
-                value: "categoryB"
-            }, {
-                uniqueSampleKey: "sampleD",
-                value: "categoryE"
-            },{
-                uniqueSampleKey: "sampleE",
-                value:"categoryA"
-            }];
-            singleValueVertData = [{
-                uniqueSampleKey: "sampleA",
-                value: "categoryC"
-            }, {
-                uniqueSampleKey: "sampleB",
-                value: "categoryD"
-            }, {
-                uniqueSampleKey: "sampleC",
-                value: "categoryC"
-            }, {
-                uniqueSampleKey: "sampleD",
-                value: "categoryD"
-            }, {
-                uniqueSampleKey: "sampleE",
-                value: "categoryC"
-            }];
+    describe('makePlotData', () => {
+        let singleValueHorzData: any[];
+        let singleValueVertData: any[];
+        let multipleValueHorzData: any[];
+        let multipleValueVertData: any[];
+        beforeEach(() => {
+            singleValueHorzData = [
+                {
+                    uniqueSampleKey: 'sampleA',
+                    value: 'categoryA',
+                },
+                {
+                    uniqueSampleKey: 'sampleB',
+                    value: 'categoryA',
+                },
+                {
+                    uniqueSampleKey: 'sampleC',
+                    value: 'categoryB',
+                },
+                {
+                    uniqueSampleKey: 'sampleD',
+                    value: 'categoryE',
+                },
+                {
+                    uniqueSampleKey: 'sampleE',
+                    value: 'categoryA',
+                },
+            ];
+            singleValueVertData = [
+                {
+                    uniqueSampleKey: 'sampleA',
+                    value: 'categoryC',
+                },
+                {
+                    uniqueSampleKey: 'sampleB',
+                    value: 'categoryD',
+                },
+                {
+                    uniqueSampleKey: 'sampleC',
+                    value: 'categoryC',
+                },
+                {
+                    uniqueSampleKey: 'sampleD',
+                    value: 'categoryD',
+                },
+                {
+                    uniqueSampleKey: 'sampleE',
+                    value: 'categoryC',
+                },
+            ];
 
-            multipleValueHorzData = [{
-                uniqueSampleKey: "sampleA",
-                value: ["categoryA", "categoryB", "categoryE"]
-            }, {
-                uniqueSampleKey: "sampleB",
-                value: "categoryA"
-            }, {
-                uniqueSampleKey: "sampleC",
-                value: "categoryB"
-            }, {
-                uniqueSampleKey: "sampleD",
-                value: ["categoryB", "categoryE"]
-            },{
-                uniqueSampleKey: "sampleE",
-                value:"categoryA"
-            }];
-            multipleValueVertData = [{
-                uniqueSampleKey: "sampleA",
-                value: ["categoryC", "categoryD"]
-            }, {
-                uniqueSampleKey: "sampleB",
-                value: "categoryD"
-            }, {
-                uniqueSampleKey: "sampleC",
-                value: "categoryC"
-            }, {
-                uniqueSampleKey: "sampleD",
-                value: ["categoryD", "categoryC"]
-            }, {
-                uniqueSampleKey: "sampleE",
-                value: "categoryC"
-            }];
+            multipleValueHorzData = [
+                {
+                    uniqueSampleKey: 'sampleA',
+                    value: ['categoryA', 'categoryB', 'categoryE'],
+                },
+                {
+                    uniqueSampleKey: 'sampleB',
+                    value: 'categoryA',
+                },
+                {
+                    uniqueSampleKey: 'sampleC',
+                    value: 'categoryB',
+                },
+                {
+                    uniqueSampleKey: 'sampleD',
+                    value: ['categoryB', 'categoryE'],
+                },
+                {
+                    uniqueSampleKey: 'sampleE',
+                    value: 'categoryA',
+                },
+            ];
+            multipleValueVertData = [
+                {
+                    uniqueSampleKey: 'sampleA',
+                    value: ['categoryC', 'categoryD'],
+                },
+                {
+                    uniqueSampleKey: 'sampleB',
+                    value: 'categoryD',
+                },
+                {
+                    uniqueSampleKey: 'sampleC',
+                    value: 'categoryC',
+                },
+                {
+                    uniqueSampleKey: 'sampleD',
+                    value: ['categoryD', 'categoryC'],
+                },
+                {
+                    uniqueSampleKey: 'sampleE',
+                    value: 'categoryC',
+                },
+            ];
         });
-        it("returns correct result for empty input", ()=>{
-            assert.deepEqual(makePlotData([] ,[], true), [])
+        it('returns correct result for empty input', () => {
+            assert.deepEqual(makePlotData([], [], true), []);
         });
-        it("returns correct result for nonempty input, single values, vertical bars", ()=>{
-            (expect(makePlotData(singleValueHorzData, singleValueVertData, false))
-            .to.deep as any).equalInAnyOrder(singleValueVertBarsData);
+        it('returns correct result for nonempty input, single values, vertical bars', () => {
+            (expect(
+                makePlotData(singleValueHorzData, singleValueVertData, false)
+            ).to.deep as any).equalInAnyOrder(singleValueVertBarsData);
         });
-        it("returns correct result for nonempty input, single values, horizontal bars", ()=>{
-            (expect(makePlotData(singleValueHorzData, singleValueVertData, true))
-            .to.deep as any).equalInAnyOrder(singleValueHorzBarsData);
+        it('returns correct result for nonempty input, single values, horizontal bars', () => {
+            (expect(
+                makePlotData(singleValueHorzData, singleValueVertData, true)
+            ).to.deep as any).equalInAnyOrder(singleValueHorzBarsData);
         });
-        it("returns correct result for nonempty input, multiple values, vertical bars", ()=>{
-            (expect(makePlotData(multipleValueHorzData, multipleValueVertData, false))
-            .to.deep as any).equalInAnyOrder(multipleValueVertBarsData);
+        it('returns correct result for nonempty input, multiple values, vertical bars', () => {
+            (expect(
+                makePlotData(
+                    multipleValueHorzData,
+                    multipleValueVertData,
+                    false
+                )
+            ).to.deep as any).equalInAnyOrder(multipleValueVertBarsData);
         });
-        it("returns correct result for nonempty input, multiple values, horizontal bars", ()=>{
-            (expect(makePlotData(multipleValueHorzData, multipleValueVertData, true))
-            .to.deep as any).equalInAnyOrder(multipleValueHorzBarsData);
+        it('returns correct result for nonempty input, multiple values, horizontal bars', () => {
+            (expect(
+                makePlotData(multipleValueHorzData, multipleValueVertData, true)
+            ).to.deep as any).equalInAnyOrder(multipleValueHorzBarsData);
         });
     });
 
-    describe("makeBarSpecs", ()=>{
+    describe('makeBarSpecs', () => {
         let categoryOrder = {
             categoryA: 1,
             categoryB: 0,
             categoryE: 2,
 
             categoryC: 4,
-            categoryD: 3
-        }
+            categoryD: 3,
+        };
         let colors = {
-            "categoryA": "colorA",
-            "categoryB": "colorB",
-            "categoryC": "colorC",
-            "categoryD": "colorD",
-            "categoryE": "colorE",
+            categoryA: 'colorA',
+            categoryB: 'colorB',
+            categoryC: 'colorC',
+            categoryD: 'colorD',
+            categoryE: 'colorE',
         };
-        let getColor = (category:string)=>{
+        let getColor = (category: string) => {
             return (colors as any)[category];
         };
-        let categoryCoord = (categoryIndex:number)=>25*categoryIndex;
-        it("returns correct result for empty input", ()=>{
-            assert.deepEqual(makeBarSpecs([], undefined, undefined, getColor, categoryCoord, false, false, false), []);
+        let categoryCoord = (categoryIndex: number) => 25 * categoryIndex;
+        it('returns correct result for empty input', () => {
+            assert.deepEqual(
+                makeBarSpecs(
+                    [],
+                    undefined,
+                    undefined,
+                    getColor,
+                    categoryCoord,
+                    false,
+                    false,
+                    false
+                ),
+                []
+            );
         });
-        it("returns correct results for singleValueVertBarsData", ()=>{
-            assert.deepEqual(makeBarSpecs(
-                singleValueVertBarsData, undefined, undefined, getColor, categoryCoord, false, false, false
-            ), [{
-                fill: "colorC",
-                data:[{
-                    majorCategory: "categoryA", minorCategory:"categoryC",
-                    count: 2, x: 0, y:2, percentage: 66.67
-                },{
-                    majorCategory: "categoryB", minorCategory:"categoryC",
-                    count: 1, x: 25, y:1, percentage: 100
-                },{
-                    majorCategory: "categoryE", minorCategory:"categoryC",
-                    count: 0, x: 50, y:0, percentage: 0
-                }]
-            },{
-                fill: "colorD",
-                data: [{
-                    majorCategory: "categoryA", minorCategory:"categoryD",
-                    count: 1, x: 0, y:1, percentage: 33.33
-                },{
-                    majorCategory: "categoryB", minorCategory:"categoryD",
-                    count: 0, x: 25, y:0, percentage: 0
-                },{
-                    majorCategory: "categoryE", minorCategory:"categoryD",
-                    count: 1, x: 50, y:1, percentage: 100
-                }]
-            }], "no given order (alphabetical both)");
+        it('returns correct results for singleValueVertBarsData', () => {
+            assert.deepEqual(
+                makeBarSpecs(
+                    singleValueVertBarsData,
+                    undefined,
+                    undefined,
+                    getColor,
+                    categoryCoord,
+                    false,
+                    false,
+                    false
+                ),
+                [
+                    {
+                        fill: 'colorC',
+                        data: [
+                            {
+                                majorCategory: 'categoryA',
+                                minorCategory: 'categoryC',
+                                count: 2,
+                                x: 0,
+                                y: 2,
+                                percentage: 66.67,
+                            },
+                            {
+                                majorCategory: 'categoryB',
+                                minorCategory: 'categoryC',
+                                count: 1,
+                                x: 25,
+                                y: 1,
+                                percentage: 100,
+                            },
+                            {
+                                majorCategory: 'categoryE',
+                                minorCategory: 'categoryC',
+                                count: 0,
+                                x: 50,
+                                y: 0,
+                                percentage: 0,
+                            },
+                        ],
+                    },
+                    {
+                        fill: 'colorD',
+                        data: [
+                            {
+                                majorCategory: 'categoryA',
+                                minorCategory: 'categoryD',
+                                count: 1,
+                                x: 0,
+                                y: 1,
+                                percentage: 33.33,
+                            },
+                            {
+                                majorCategory: 'categoryB',
+                                minorCategory: 'categoryD',
+                                count: 0,
+                                x: 25,
+                                y: 0,
+                                percentage: 0,
+                            },
+                            {
+                                majorCategory: 'categoryE',
+                                minorCategory: 'categoryD',
+                                count: 1,
+                                x: 50,
+                                y: 1,
+                                percentage: 100,
+                            },
+                        ],
+                    },
+                ],
+                'no given order (alphabetical both)'
+            );
+
+            assert.deepEqual(
+                makeBarSpecs(
+                    singleValueVertBarsData,
+                    undefined,
+                    undefined,
+                    getColor,
+                    categoryCoord,
+                    false,
+                    false,
+                    true
+                ),
+                [
+                    {
+                        fill: 'colorC',
+                        data: [
+                            {
+                                majorCategory: 'categoryA',
+                                minorCategory: 'categoryC',
+                                count: 2,
+                                x: 0,
+                                y: 66.67,
+                                percentage: 66.67,
+                            },
+                            {
+                                majorCategory: 'categoryB',
+                                minorCategory: 'categoryC',
+                                count: 1,
+                                x: 25,
+                                y: 100,
+                                percentage: 100,
+                            },
+                            {
+                                majorCategory: 'categoryE',
+                                minorCategory: 'categoryC',
+                                count: 0,
+                                x: 50,
+                                y: 0,
+                                percentage: 0,
+                            },
+                        ],
+                    },
+                    {
+                        fill: 'colorD',
+                        data: [
+                            {
+                                majorCategory: 'categoryA',
+                                minorCategory: 'categoryD',
+                                count: 1,
+                                x: 0,
+                                y: 33.33,
+                                percentage: 33.33,
+                            },
+                            {
+                                majorCategory: 'categoryB',
+                                minorCategory: 'categoryD',
+                                count: 0,
+                                x: 25,
+                                y: 0,
+                                percentage: 0,
+                            },
+                            {
+                                majorCategory: 'categoryE',
+                                minorCategory: 'categoryD',
+                                count: 1,
+                                x: 50,
+                                y: 100,
+                                percentage: 100,
+                            },
+                        ],
+                    },
+                ],
+                'no given order (alphabetical both), percentages'
+            );
 
-            assert.deepEqual(makeBarSpecs(
-                singleValueVertBarsData, undefined, undefined, getColor, categoryCoord, false, false, true
-            ), [{
-                fill: "colorC",
-                data:[{
-                    majorCategory: "categoryA", minorCategory:"categoryC",
-                    count: 2, x: 0, y:66.67, percentage: 66.67
-                },{
-                    majorCategory: "categoryB", minorCategory:"categoryC",
-                    count: 1, x: 25, y:100, percentage: 100
-                },{
-                    majorCategory: "categoryE", minorCategory:"categoryC",
-                    count: 0, x: 50, y:0, percentage: 0
-                }]
-            },{
-                fill: "colorD",
-                data: [{
-                    majorCategory: "categoryA", minorCategory:"categoryD",
-                    count: 1, x: 0, y:33.33, percentage: 33.33
-                },{
-                    majorCategory: "categoryB", minorCategory:"categoryD",
-                    count: 0, x: 25, y:0, percentage: 0
-                },{
-                    majorCategory: "categoryE", minorCategory:"categoryD",
-                    count: 1, x: 50, y:100, percentage: 100
-                }]
-            }], "no given order (alphabetical both), percentages");
- 
-            assert.deepEqual(makeBarSpecs(
-                singleValueVertBarsData, categoryOrder, undefined, getColor, categoryCoord, false, false, false
-            ), [{
-                fill: "colorD",
-                data: [{
-                    majorCategory: "categoryA", minorCategory:"categoryD",
-                    count: 1, x: 0, y:1, percentage: 33.33
-                },{
-                    majorCategory: "categoryB", minorCategory:"categoryD",
-                    count: 0, x: 25, y:0, percentage: 0
-                },{
-                    majorCategory: "categoryE", minorCategory:"categoryD",
-                    count: 1, x: 50, y:1, percentage: 100
-                }]
-            }, {
-                fill: "colorC",
-                data:[{
-                    majorCategory: "categoryA", minorCategory:"categoryC",
-                    count: 2, x: 0, y:2, percentage: 66.67
-                },{
-                    majorCategory: "categoryB", minorCategory:"categoryC",
-                    count: 1, x: 25, y:1, percentage: 100
-                },{
-                    majorCategory: "categoryE", minorCategory:"categoryC",
-                    count: 0, x: 50, y:0, percentage: 0
-                }]
-            }], "given minor order (alphabetical major)");
+            assert.deepEqual(
+                makeBarSpecs(
+                    singleValueVertBarsData,
+                    categoryOrder,
+                    undefined,
+                    getColor,
+                    categoryCoord,
+                    false,
+                    false,
+                    false
+                ),
+                [
+                    {
+                        fill: 'colorD',
+                        data: [
+                            {
+                                majorCategory: 'categoryA',
+                                minorCategory: 'categoryD',
+                                count: 1,
+                                x: 0,
+                                y: 1,
+                                percentage: 33.33,
+                            },
+                            {
+                                majorCategory: 'categoryB',
+                                minorCategory: 'categoryD',
+                                count: 0,
+                                x: 25,
+                                y: 0,
+                                percentage: 0,
+                            },
+                            {
+                                majorCategory: 'categoryE',
+                                minorCategory: 'categoryD',
+                                count: 1,
+                                x: 50,
+                                y: 1,
+                                percentage: 100,
+                            },
+                        ],
+                    },
+                    {
+                        fill: 'colorC',
+                        data: [
+                            {
+                                majorCategory: 'categoryA',
+                                minorCategory: 'categoryC',
+                                count: 2,
+                                x: 0,
+                                y: 2,
+                                percentage: 66.67,
+                            },
+                            {
+                                majorCategory: 'categoryB',
+                                minorCategory: 'categoryC',
+                                count: 1,
+                                x: 25,
+                                y: 1,
+                                percentage: 100,
+                            },
+                            {
+                                majorCategory: 'categoryE',
+                                minorCategory: 'categoryC',
+                                count: 0,
+                                x: 50,
+                                y: 0,
+                                percentage: 0,
+                            },
+                        ],
+                    },
+                ],
+                'given minor order (alphabetical major)'
+            );
 
-            assert.deepEqual(makeBarSpecs(
-                singleValueVertBarsData, categoryOrder, undefined, getColor, categoryCoord, false, false, true
-            ), [{
-                fill: "colorD",
-                data: [{
-                    majorCategory: "categoryA", minorCategory:"categoryD",
-                    count: 1, x: 0, y:33.33, percentage: 33.33
-                },{
-                    majorCategory: "categoryB", minorCategory:"categoryD",
-                    count: 0, x: 25, y:0, percentage: 0
-                },{
-                    majorCategory: "categoryE", minorCategory:"categoryD",
-                    count: 1, x: 50, y:100, percentage: 100
-                }]
-            },{
-                fill: "colorC",
-                data:[{
-                    majorCategory: "categoryA", minorCategory:"categoryC",
-                    count: 2, x: 0, y:66.67, percentage: 66.67
-                },{
-                    majorCategory: "categoryB", minorCategory:"categoryC",
-                    count: 1, x: 25, y:100, percentage: 100
-                },{
-                    majorCategory: "categoryE", minorCategory:"categoryC",
-                    count: 0, x: 50, y:0, percentage: 0
-                }]
-            }], "given minor order (alphabetical major), percentages");
+            assert.deepEqual(
+                makeBarSpecs(
+                    singleValueVertBarsData,
+                    categoryOrder,
+                    undefined,
+                    getColor,
+                    categoryCoord,
+                    false,
+                    false,
+                    true
+                ),
+                [
+                    {
+                        fill: 'colorD',
+                        data: [
+                            {
+                                majorCategory: 'categoryA',
+                                minorCategory: 'categoryD',
+                                count: 1,
+                                x: 0,
+                                y: 33.33,
+                                percentage: 33.33,
+                            },
+                            {
+                                majorCategory: 'categoryB',
+                                minorCategory: 'categoryD',
+                                count: 0,
+                                x: 25,
+                                y: 0,
+                                percentage: 0,
+                            },
+                            {
+                                majorCategory: 'categoryE',
+                                minorCategory: 'categoryD',
+                                count: 1,
+                                x: 50,
+                                y: 100,
+                                percentage: 100,
+                            },
+                        ],
+                    },
+                    {
+                        fill: 'colorC',
+                        data: [
+                            {
+                                majorCategory: 'categoryA',
+                                minorCategory: 'categoryC',
+                                count: 2,
+                                x: 0,
+                                y: 66.67,
+                                percentage: 66.67,
+                            },
+                            {
+                                majorCategory: 'categoryB',
+                                minorCategory: 'categoryC',
+                                count: 1,
+                                x: 25,
+                                y: 100,
+                                percentage: 100,
+                            },
+                            {
+                                majorCategory: 'categoryE',
+                                minorCategory: 'categoryC',
+                                count: 0,
+                                x: 50,
+                                y: 0,
+                                percentage: 0,
+                            },
+                        ],
+                    },
+                ],
+                'given minor order (alphabetical major), percentages'
+            );
 
-            assert.deepEqual(makeBarSpecs(
-                singleValueVertBarsData, undefined, categoryOrder, getColor, categoryCoord, false, false, false
-            ), [{
-                fill: "colorC",
-                data:[{
-                    majorCategory: "categoryB", minorCategory:"categoryC",
-                    count: 1, x: 0, y:1, percentage: 100
-                },{
-                    majorCategory: "categoryA", minorCategory:"categoryC",
-                    count: 2, x: 25, y:2, percentage: 66.67
-                },{
-                    majorCategory: "categoryE", minorCategory:"categoryC",
-                    count: 0, x: 50, y:0, percentage: 0
-                }]
-            },{
-                fill: "colorD",
-                data: [{
-                    majorCategory: "categoryB", minorCategory:"categoryD",
-                    count: 0, x: 0, y:0, percentage: 0
-                },{
-                    majorCategory: "categoryA", minorCategory:"categoryD",
-                    count: 1, x: 25, y:1, percentage: 33.33
-                },{
-                    majorCategory: "categoryE", minorCategory:"categoryD",
-                    count: 1, x: 50, y:1, percentage: 100
-                }]
-            },], "given major order (alphabetical minor)");
+            assert.deepEqual(
+                makeBarSpecs(
+                    singleValueVertBarsData,
+                    undefined,
+                    categoryOrder,
+                    getColor,
+                    categoryCoord,
+                    false,
+                    false,
+                    false
+                ),
+                [
+                    {
+                        fill: 'colorC',
+                        data: [
+                            {
+                                majorCategory: 'categoryB',
+                                minorCategory: 'categoryC',
+                                count: 1,
+                                x: 0,
+                                y: 1,
+                                percentage: 100,
+                            },
+                            {
+                                majorCategory: 'categoryA',
+                                minorCategory: 'categoryC',
+                                count: 2,
+                                x: 25,
+                                y: 2,
+                                percentage: 66.67,
+                            },
+                            {
+                                majorCategory: 'categoryE',
+                                minorCategory: 'categoryC',
+                                count: 0,
+                                x: 50,
+                                y: 0,
+                                percentage: 0,
+                            },
+                        ],
+                    },
+                    {
+                        fill: 'colorD',
+                        data: [
+                            {
+                                majorCategory: 'categoryB',
+                                minorCategory: 'categoryD',
+                                count: 0,
+                                x: 0,
+                                y: 0,
+                                percentage: 0,
+                            },
+                            {
+                                majorCategory: 'categoryA',
+                                minorCategory: 'categoryD',
+                                count: 1,
+                                x: 25,
+                                y: 1,
+                                percentage: 33.33,
+                            },
+                            {
+                                majorCategory: 'categoryE',
+                                minorCategory: 'categoryD',
+                                count: 1,
+                                x: 50,
+                                y: 1,
+                                percentage: 100,
+                            },
+                        ],
+                    },
+                ],
+                'given major order (alphabetical minor)'
+            );
 
-            assert.deepEqual(makeBarSpecs(
-                singleValueVertBarsData, undefined, categoryOrder, getColor, categoryCoord, false, false, true
-            ), [{
-                fill: "colorC",
-                data:[{
-                    majorCategory: "categoryB", minorCategory:"categoryC",
-                    count: 1, x: 0, y:100, percentage: 100
-                },{
-                    majorCategory: "categoryA", minorCategory:"categoryC",
-                    count: 2, x: 25, y:66.67, percentage: 66.67
-                },{
-                    majorCategory: "categoryE", minorCategory:"categoryC",
-                    count: 0, x: 50, y:0, percentage: 0
-                }]
-            },{
-                fill: "colorD",
-                data: [{
-                    majorCategory: "categoryB", minorCategory:"categoryD",
-                    count: 0, x: 0, y:0, percentage: 0
-                },{
-                    majorCategory: "categoryA", minorCategory:"categoryD",
-                    count: 1, x: 25, y:33.33, percentage: 33.33
-                },{
-                    majorCategory: "categoryE", minorCategory:"categoryD",
-                    count: 1, x: 50, y:100, percentage: 100
-                }]
-            }], "given major order (alphabetical minor), percentages");
+            assert.deepEqual(
+                makeBarSpecs(
+                    singleValueVertBarsData,
+                    undefined,
+                    categoryOrder,
+                    getColor,
+                    categoryCoord,
+                    false,
+                    false,
+                    true
+                ),
+                [
+                    {
+                        fill: 'colorC',
+                        data: [
+                            {
+                                majorCategory: 'categoryB',
+                                minorCategory: 'categoryC',
+                                count: 1,
+                                x: 0,
+                                y: 100,
+                                percentage: 100,
+                            },
+                            {
+                                majorCategory: 'categoryA',
+                                minorCategory: 'categoryC',
+                                count: 2,
+                                x: 25,
+                                y: 66.67,
+                                percentage: 66.67,
+                            },
+                            {
+                                majorCategory: 'categoryE',
+                                minorCategory: 'categoryC',
+                                count: 0,
+                                x: 50,
+                                y: 0,
+                                percentage: 0,
+                            },
+                        ],
+                    },
+                    {
+                        fill: 'colorD',
+                        data: [
+                            {
+                                majorCategory: 'categoryB',
+                                minorCategory: 'categoryD',
+                                count: 0,
+                                x: 0,
+                                y: 0,
+                                percentage: 0,
+                            },
+                            {
+                                majorCategory: 'categoryA',
+                                minorCategory: 'categoryD',
+                                count: 1,
+                                x: 25,
+                                y: 33.33,
+                                percentage: 33.33,
+                            },
+                            {
+                                majorCategory: 'categoryE',
+                                minorCategory: 'categoryD',
+                                count: 1,
+                                x: 50,
+                                y: 100,
+                                percentage: 100,
+                            },
+                        ],
+                    },
+                ],
+                'given major order (alphabetical minor), percentages'
+            );
 
-            assert.deepEqual(makeBarSpecs(
-                singleValueVertBarsData, categoryOrder, categoryOrder, getColor, categoryCoord, false, false, false
-            ), [{
-                fill: "colorD",
-                data: [{
-                    majorCategory: "categoryB", minorCategory:"categoryD",
-                    count: 0, x: 0, y:0, percentage: 0
-                },{
-                    majorCategory: "categoryA", minorCategory:"categoryD",
-                    count: 1, x: 25, y:1, percentage: 33.33
-                },{
-                    majorCategory: "categoryE", minorCategory:"categoryD",
-                    count: 1, x: 50, y:1, percentage: 100
-                }]
-            },{
-                fill: "colorC",
-                data:[{
-                    majorCategory: "categoryB", minorCategory:"categoryC",
-                    count: 1, x: 0, y:1, percentage: 100
-                },{
-                    majorCategory: "categoryA", minorCategory:"categoryC",
-                    count: 2, x: 25, y:2, percentage: 66.67
-                },{
-                    majorCategory: "categoryE", minorCategory:"categoryC",
-                    count: 0, x: 50, y:0, percentage: 0
-                }]
-            }], "given minor and major order");
+            assert.deepEqual(
+                makeBarSpecs(
+                    singleValueVertBarsData,
+                    categoryOrder,
+                    categoryOrder,
+                    getColor,
+                    categoryCoord,
+                    false,
+                    false,
+                    false
+                ),
+                [
+                    {
+                        fill: 'colorD',
+                        data: [
+                            {
+                                majorCategory: 'categoryB',
+                                minorCategory: 'categoryD',
+                                count: 0,
+                                x: 0,
+                                y: 0,
+                                percentage: 0,
+                            },
+                            {
+                                majorCategory: 'categoryA',
+                                minorCategory: 'categoryD',
+                                count: 1,
+                                x: 25,
+                                y: 1,
+                                percentage: 33.33,
+                            },
+                            {
+                                majorCategory: 'categoryE',
+                                minorCategory: 'categoryD',
+                                count: 1,
+                                x: 50,
+                                y: 1,
+                                percentage: 100,
+                            },
+                        ],
+                    },
+                    {
+                        fill: 'colorC',
+                        data: [
+                            {
+                                majorCategory: 'categoryB',
+                                minorCategory: 'categoryC',
+                                count: 1,
+                                x: 0,
+                                y: 1,
+                                percentage: 100,
+                            },
+                            {
+                                majorCategory: 'categoryA',
+                                minorCategory: 'categoryC',
+                                count: 2,
+                                x: 25,
+                                y: 2,
+                                percentage: 66.67,
+                            },
+                            {
+                                majorCategory: 'categoryE',
+                                minorCategory: 'categoryC',
+                                count: 0,
+                                x: 50,
+                                y: 0,
+                                percentage: 0,
+                            },
+                        ],
+                    },
+                ],
+                'given minor and major order'
+            );
 
-            assert.deepEqual(makeBarSpecs(
-                singleValueVertBarsData, categoryOrder, categoryOrder, getColor, categoryCoord, false, false, true
-            ), [{
-                fill: "colorD",
-                data: [{
-                    majorCategory: "categoryB", minorCategory:"categoryD",
-                    count: 0, x: 0, y:0, percentage: 0
-                },{
-                    majorCategory: "categoryA", minorCategory:"categoryD",
-                    count: 1, x: 25, y:33.33, percentage: 33.33
-                },{
-                    majorCategory: "categoryE", minorCategory:"categoryD",
-                    count: 1, x: 50, y:100, percentage: 100
-                }]
-            },{
-                fill: "colorC",
-                data:[{
-                    majorCategory: "categoryB", minorCategory:"categoryC",
-                    count: 1, x: 0, y:100, percentage: 100
-                },{
-                    majorCategory: "categoryA", minorCategory:"categoryC",
-                    count: 2, x: 25, y:66.67, percentage: 66.67
-                },{
-                    majorCategory: "categoryE", minorCategory:"categoryC",
-                    count: 0, x: 50, y:0, percentage: 0
-                }]
-            }], "given minor and major order, percentages");
+            assert.deepEqual(
+                makeBarSpecs(
+                    singleValueVertBarsData,
+                    categoryOrder,
+                    categoryOrder,
+                    getColor,
+                    categoryCoord,
+                    false,
+                    false,
+                    true
+                ),
+                [
+                    {
+                        fill: 'colorD',
+                        data: [
+                            {
+                                majorCategory: 'categoryB',
+                                minorCategory: 'categoryD',
+                                count: 0,
+                                x: 0,
+                                y: 0,
+                                percentage: 0,
+                            },
+                            {
+                                majorCategory: 'categoryA',
+                                minorCategory: 'categoryD',
+                                count: 1,
+                                x: 25,
+                                y: 33.33,
+                                percentage: 33.33,
+                            },
+                            {
+                                majorCategory: 'categoryE',
+                                minorCategory: 'categoryD',
+                                count: 1,
+                                x: 50,
+                                y: 100,
+                                percentage: 100,
+                            },
+                        ],
+                    },
+                    {
+                        fill: 'colorC',
+                        data: [
+                            {
+                                majorCategory: 'categoryB',
+                                minorCategory: 'categoryC',
+                                count: 1,
+                                x: 0,
+                                y: 100,
+                                percentage: 100,
+                            },
+                            {
+                                majorCategory: 'categoryA',
+                                minorCategory: 'categoryC',
+                                count: 2,
+                                x: 25,
+                                y: 66.67,
+                                percentage: 66.67,
+                            },
+                            {
+                                majorCategory: 'categoryE',
+                                minorCategory: 'categoryC',
+                                count: 0,
+                                x: 50,
+                                y: 0,
+                                percentage: 0,
+                            },
+                        ],
+                    },
+                ],
+                'given minor and major order, percentages'
+            );
         });
         //
-        it("returns correct results for singleValueHorzBarsData", ()=>{
-            assert.deepEqual(makeBarSpecs(
-                singleValueHorzBarsData, undefined, undefined, getColor, categoryCoord, true, false, false
-            ), [{
-                fill: "colorE",
-                data:[{
-                    majorCategory: "categoryC", minorCategory:"categoryE",
-                    count: 0, x: 0, y:0, percentage: 0
-                },{
-                    majorCategory: "categoryD", minorCategory:"categoryE",
-                    count: 1, x: 25, y:1, percentage: 50
-                }]
-            },{
-                fill: "colorB",
-                data:[{
-                    majorCategory: "categoryC", minorCategory:"categoryB",
-                    count: 1, x: 0, y:1, percentage: 33.33
-                },{
-                    majorCategory: "categoryD", minorCategory:"categoryB",
-                    count: 0, x: 25, y:0, percentage: 0
-                }]
-            },{
-                fill: "colorA",
-                data: [{
-                    majorCategory: "categoryC", minorCategory:"categoryA",
-                    count: 2, x: 0, y:2, percentage: 66.67
-                },{
-                    majorCategory: "categoryD", minorCategory:"categoryA",
-                    count: 1, x: 25, y:1, percentage: 50
-                }]
-            }], "no given order (alphabetical both)");
+        it('returns correct results for singleValueHorzBarsData', () => {
+            assert.deepEqual(
+                makeBarSpecs(
+                    singleValueHorzBarsData,
+                    undefined,
+                    undefined,
+                    getColor,
+                    categoryCoord,
+                    true,
+                    false,
+                    false
+                ),
+                [
+                    {
+                        fill: 'colorE',
+                        data: [
+                            {
+                                majorCategory: 'categoryC',
+                                minorCategory: 'categoryE',
+                                count: 0,
+                                x: 0,
+                                y: 0,
+                                percentage: 0,
+                            },
+                            {
+                                majorCategory: 'categoryD',
+                                minorCategory: 'categoryE',
+                                count: 1,
+                                x: 25,
+                                y: 1,
+                                percentage: 50,
+                            },
+                        ],
+                    },
+                    {
+                        fill: 'colorB',
+                        data: [
+                            {
+                                majorCategory: 'categoryC',
+                                minorCategory: 'categoryB',
+                                count: 1,
+                                x: 0,
+                                y: 1,
+                                percentage: 33.33,
+                            },
+                            {
+                                majorCategory: 'categoryD',
+                                minorCategory: 'categoryB',
+                                count: 0,
+                                x: 25,
+                                y: 0,
+                                percentage: 0,
+                            },
+                        ],
+                    },
+                    {
+                        fill: 'colorA',
+                        data: [
+                            {
+                                majorCategory: 'categoryC',
+                                minorCategory: 'categoryA',
+                                count: 2,
+                                x: 0,
+                                y: 2,
+                                percentage: 66.67,
+                            },
+                            {
+                                majorCategory: 'categoryD',
+                                minorCategory: 'categoryA',
+                                count: 1,
+                                x: 25,
+                                y: 1,
+                                percentage: 50,
+                            },
+                        ],
+                    },
+                ],
+                'no given order (alphabetical both)'
+            );
 
-            assert.deepEqual(makeBarSpecs(
-                singleValueHorzBarsData, undefined, undefined, getColor, categoryCoord, true, false, true
-            ), [{
-                fill: "colorE",
-                data:[{
-                    majorCategory: "categoryC", minorCategory:"categoryE",
-                    count: 0, x: 0, y:0, percentage: 0
-                },{
-                    majorCategory: "categoryD", minorCategory:"categoryE",
-                    count: 1, x: 25, y:50, percentage: 50
-                }]
-            },{
-                fill: "colorB",
-                data:[{
-                    majorCategory: "categoryC", minorCategory:"categoryB",
-                    count: 1, x: 0, y:33.33, percentage: 33.33
-                },{
-                    majorCategory: "categoryD", minorCategory:"categoryB",
-                    count: 0, x: 25, y:0, percentage: 0
-                }]
-            },{
-                fill: "colorA",
-                data: [{
-                    majorCategory: "categoryC", minorCategory:"categoryA",
-                    count: 2, x: 0, y:66.67, percentage: 66.67
-                },{
-                    majorCategory: "categoryD", minorCategory:"categoryA",
-                    count: 1, x: 25, y:50, percentage: 50
-                }]
-            }], "no given order (alphabetical both), percentages");
+            assert.deepEqual(
+                makeBarSpecs(
+                    singleValueHorzBarsData,
+                    undefined,
+                    undefined,
+                    getColor,
+                    categoryCoord,
+                    true,
+                    false,
+                    true
+                ),
+                [
+                    {
+                        fill: 'colorE',
+                        data: [
+                            {
+                                majorCategory: 'categoryC',
+                                minorCategory: 'categoryE',
+                                count: 0,
+                                x: 0,
+                                y: 0,
+                                percentage: 0,
+                            },
+                            {
+                                majorCategory: 'categoryD',
+                                minorCategory: 'categoryE',
+                                count: 1,
+                                x: 25,
+                                y: 50,
+                                percentage: 50,
+                            },
+                        ],
+                    },
+                    {
+                        fill: 'colorB',
+                        data: [
+                            {
+                                majorCategory: 'categoryC',
+                                minorCategory: 'categoryB',
+                                count: 1,
+                                x: 0,
+                                y: 33.33,
+                                percentage: 33.33,
+                            },
+                            {
+                                majorCategory: 'categoryD',
+                                minorCategory: 'categoryB',
+                                count: 0,
+                                x: 25,
+                                y: 0,
+                                percentage: 0,
+                            },
+                        ],
+                    },
+                    {
+                        fill: 'colorA',
+                        data: [
+                            {
+                                majorCategory: 'categoryC',
+                                minorCategory: 'categoryA',
+                                count: 2,
+                                x: 0,
+                                y: 66.67,
+                                percentage: 66.67,
+                            },
+                            {
+                                majorCategory: 'categoryD',
+                                minorCategory: 'categoryA',
+                                count: 1,
+                                x: 25,
+                                y: 50,
+                                percentage: 50,
+                            },
+                        ],
+                    },
+                ],
+                'no given order (alphabetical both), percentages'
+            );
 
-            assert.deepEqual(makeBarSpecs(
-                singleValueHorzBarsData, categoryOrder, undefined, getColor, categoryCoord, true, false, false
-            ), [{
-                fill: "colorE",
-                data:[{
-                    majorCategory: "categoryC", minorCategory:"categoryE",
-                    count: 0, x: 0, y:0, percentage: 0
-                },{
-                    majorCategory: "categoryD", minorCategory:"categoryE",
-                    count: 1, x: 25, y:1, percentage: 50
-                }]
-            },{
-                fill: "colorA",
-                data: [{
-                    majorCategory: "categoryC", minorCategory:"categoryA",
-                    count: 2, x: 0, y:2, percentage: 66.67
-                },{
-                    majorCategory: "categoryD", minorCategory:"categoryA",
-                    count: 1, x: 25, y:1, percentage: 50
-                }]
-            },{
-                fill: "colorB",
-                data:[{
-                    majorCategory: "categoryC", minorCategory:"categoryB",
-                    count: 1, x: 0, y:1, percentage: 33.33
-                },{
-                    majorCategory: "categoryD", minorCategory:"categoryB",
-                    count: 0, x: 25, y:0, percentage: 0
-                }]
-            }], "given minor order (alphabetical major)");
+            assert.deepEqual(
+                makeBarSpecs(
+                    singleValueHorzBarsData,
+                    categoryOrder,
+                    undefined,
+                    getColor,
+                    categoryCoord,
+                    true,
+                    false,
+                    false
+                ),
+                [
+                    {
+                        fill: 'colorE',
+                        data: [
+                            {
+                                majorCategory: 'categoryC',
+                                minorCategory: 'categoryE',
+                                count: 0,
+                                x: 0,
+                                y: 0,
+                                percentage: 0,
+                            },
+                            {
+                                majorCategory: 'categoryD',
+                                minorCategory: 'categoryE',
+                                count: 1,
+                                x: 25,
+                                y: 1,
+                                percentage: 50,
+                            },
+                        ],
+                    },
+                    {
+                        fill: 'colorA',
+                        data: [
+                            {
+                                majorCategory: 'categoryC',
+                                minorCategory: 'categoryA',
+                                count: 2,
+                                x: 0,
+                                y: 2,
+                                percentage: 66.67,
+                            },
+                            {
+                                majorCategory: 'categoryD',
+                                minorCategory: 'categoryA',
+                                count: 1,
+                                x: 25,
+                                y: 1,
+                                percentage: 50,
+                            },
+                        ],
+                    },
+                    {
+                        fill: 'colorB',
+                        data: [
+                            {
+                                majorCategory: 'categoryC',
+                                minorCategory: 'categoryB',
+                                count: 1,
+                                x: 0,
+                                y: 1,
+                                percentage: 33.33,
+                            },
+                            {
+                                majorCategory: 'categoryD',
+                                minorCategory: 'categoryB',
+                                count: 0,
+                                x: 25,
+                                y: 0,
+                                percentage: 0,
+                            },
+                        ],
+                    },
+                ],
+                'given minor order (alphabetical major)'
+            );
 
-            assert.deepEqual(makeBarSpecs(
-                singleValueHorzBarsData, categoryOrder, undefined, getColor, categoryCoord, true, false, true
-            ), [{
-                fill: "colorE",
-                data:[{
-                    majorCategory: "categoryC", minorCategory:"categoryE",
-                    count: 0, x: 0, y:0, percentage: 0
-                },{
-                    majorCategory: "categoryD", minorCategory:"categoryE",
-                    count: 1, x: 25, y:50, percentage: 50
-                }]
-            },{
-                fill: "colorA",
-                data: [{
-                    majorCategory: "categoryC", minorCategory:"categoryA",
-                    count: 2, x: 0, y:66.67, percentage: 66.67
-                },{
-                    majorCategory: "categoryD", minorCategory:"categoryA",
-                    count: 1, x: 25, y:50, percentage: 50
-                }]
-            },{
-                fill: "colorB",
-                data:[{
-                    majorCategory: "categoryC", minorCategory:"categoryB",
-                    count: 1, x: 0, y:33.33, percentage: 33.33
-                },{
-                    majorCategory: "categoryD", minorCategory:"categoryB",
-                    count: 0, x: 25, y:0, percentage: 0
-                }]
-            }], "given minor order (alphabetical major), percentages");
+            assert.deepEqual(
+                makeBarSpecs(
+                    singleValueHorzBarsData,
+                    categoryOrder,
+                    undefined,
+                    getColor,
+                    categoryCoord,
+                    true,
+                    false,
+                    true
+                ),
+                [
+                    {
+                        fill: 'colorE',
+                        data: [
+                            {
+                                majorCategory: 'categoryC',
+                                minorCategory: 'categoryE',
+                                count: 0,
+                                x: 0,
+                                y: 0,
+                                percentage: 0,
+                            },
+                            {
+                                majorCategory: 'categoryD',
+                                minorCategory: 'categoryE',
+                                count: 1,
+                                x: 25,
+                                y: 50,
+                                percentage: 50,
+                            },
+                        ],
+                    },
+                    {
+                        fill: 'colorA',
+                        data: [
+                            {
+                                majorCategory: 'categoryC',
+                                minorCategory: 'categoryA',
+                                count: 2,
+                                x: 0,
+                                y: 66.67,
+                                percentage: 66.67,
+                            },
+                            {
+                                majorCategory: 'categoryD',
+                                minorCategory: 'categoryA',
+                                count: 1,
+                                x: 25,
+                                y: 50,
+                                percentage: 50,
+                            },
+                        ],
+                    },
+                    {
+                        fill: 'colorB',
+                        data: [
+                            {
+                                majorCategory: 'categoryC',
+                                minorCategory: 'categoryB',
+                                count: 1,
+                                x: 0,
+                                y: 33.33,
+                                percentage: 33.33,
+                            },
+                            {
+                                majorCategory: 'categoryD',
+                                minorCategory: 'categoryB',
+                                count: 0,
+                                x: 25,
+                                y: 0,
+                                percentage: 0,
+                            },
+                        ],
+                    },
+                ],
+                'given minor order (alphabetical major), percentages'
+            );
 
-            assert.deepEqual(makeBarSpecs(
-                singleValueHorzBarsData, undefined, categoryOrder, getColor, categoryCoord, true, false, false
-            ), [{
-                fill: "colorE",
-                data:[{
-                    majorCategory: "categoryD", minorCategory:"categoryE",
-                    count: 1, x: 0, y:1, percentage: 50
-                },{
-                    majorCategory: "categoryC", minorCategory:"categoryE",
-                    count: 0, x: 25, y:0, percentage: 0
-                }]
-            },{
-                fill: "colorB",
-                data:[{
-                    majorCategory: "categoryD", minorCategory:"categoryB",
-                    count: 0, x: 0, y:0, percentage: 0
-                },{
-                    majorCategory: "categoryC", minorCategory:"categoryB",
-                    count: 1, x: 25, y:1, percentage: 33.33
-                }]
-            },{
-                fill: "colorA",
-                data: [{
-                    majorCategory: "categoryD", minorCategory:"categoryA",
-                    count: 1, x: 0, y:1, percentage: 50
-                },{
-                    majorCategory: "categoryC", minorCategory:"categoryA",
-                    count: 2, x: 25, y:2, percentage: 66.67
-                }]
-            }], "given major order (alphabetical minor)");
+            assert.deepEqual(
+                makeBarSpecs(
+                    singleValueHorzBarsData,
+                    undefined,
+                    categoryOrder,
+                    getColor,
+                    categoryCoord,
+                    true,
+                    false,
+                    false
+                ),
+                [
+                    {
+                        fill: 'colorE',
+                        data: [
+                            {
+                                majorCategory: 'categoryD',
+                                minorCategory: 'categoryE',
+                                count: 1,
+                                x: 0,
+                                y: 1,
+                                percentage: 50,
+                            },
+                            {
+                                majorCategory: 'categoryC',
+                                minorCategory: 'categoryE',
+                                count: 0,
+                                x: 25,
+                                y: 0,
+                                percentage: 0,
+                            },
+                        ],
+                    },
+                    {
+                        fill: 'colorB',
+                        data: [
+                            {
+                                majorCategory: 'categoryD',
+                                minorCategory: 'categoryB',
+                                count: 0,
+                                x: 0,
+                                y: 0,
+                                percentage: 0,
+                            },
+                            {
+                                majorCategory: 'categoryC',
+                                minorCategory: 'categoryB',
+                                count: 1,
+                                x: 25,
+                                y: 1,
+                                percentage: 33.33,
+                            },
+                        ],
+                    },
+                    {
+                        fill: 'colorA',
+                        data: [
+                            {
+                                majorCategory: 'categoryD',
+                                minorCategory: 'categoryA',
+                                count: 1,
+                                x: 0,
+                                y: 1,
+                                percentage: 50,
+                            },
+                            {
+                                majorCategory: 'categoryC',
+                                minorCategory: 'categoryA',
+                                count: 2,
+                                x: 25,
+                                y: 2,
+                                percentage: 66.67,
+                            },
+                        ],
+                    },
+                ],
+                'given major order (alphabetical minor)'
+            );
 
-            assert.deepEqual(makeBarSpecs(
-                singleValueHorzBarsData, undefined, categoryOrder, getColor, categoryCoord, true, false, true
-            ), [{
-                fill: "colorE",
-                data:[{
-                    majorCategory: "categoryD", minorCategory:"categoryE",
-                    count: 1, x: 0, y:50, percentage: 50
-                },{
-                    majorCategory: "categoryC", minorCategory:"categoryE",
-                    count: 0, x: 25, y:0, percentage: 0
-                }]
-            },{
-                fill: "colorB",
-                data:[{
-                    majorCategory: "categoryD", minorCategory:"categoryB",
-                    count: 0, x: 0, y:0, percentage: 0
-                },{
-                    majorCategory: "categoryC", minorCategory:"categoryB",
-                    count: 1, x: 25, y:33.33, percentage: 33.33
-                }]
-            },{
-                fill: "colorA",
-                data: [{
-                    majorCategory: "categoryD", minorCategory:"categoryA",
-                    count: 1, x: 0, y:50, percentage: 50
-                },{
-                    majorCategory: "categoryC", minorCategory:"categoryA",
-                    count: 2, x: 25, y:66.67, percentage: 66.67
-                }]
-            }], "given major order (alphabetical minor), percentages");
+            assert.deepEqual(
+                makeBarSpecs(
+                    singleValueHorzBarsData,
+                    undefined,
+                    categoryOrder,
+                    getColor,
+                    categoryCoord,
+                    true,
+                    false,
+                    true
+                ),
+                [
+                    {
+                        fill: 'colorE',
+                        data: [
+                            {
+                                majorCategory: 'categoryD',
+                                minorCategory: 'categoryE',
+                                count: 1,
+                                x: 0,
+                                y: 50,
+                                percentage: 50,
+                            },
+                            {
+                                majorCategory: 'categoryC',
+                                minorCategory: 'categoryE',
+                                count: 0,
+                                x: 25,
+                                y: 0,
+                                percentage: 0,
+                            },
+                        ],
+                    },
+                    {
+                        fill: 'colorB',
+                        data: [
+                            {
+                                majorCategory: 'categoryD',
+                                minorCategory: 'categoryB',
+                                count: 0,
+                                x: 0,
+                                y: 0,
+                                percentage: 0,
+                            },
+                            {
+                                majorCategory: 'categoryC',
+                                minorCategory: 'categoryB',
+                                count: 1,
+                                x: 25,
+                                y: 33.33,
+                                percentage: 33.33,
+                            },
+                        ],
+                    },
+                    {
+                        fill: 'colorA',
+                        data: [
+                            {
+                                majorCategory: 'categoryD',
+                                minorCategory: 'categoryA',
+                                count: 1,
+                                x: 0,
+                                y: 50,
+                                percentage: 50,
+                            },
+                            {
+                                majorCategory: 'categoryC',
+                                minorCategory: 'categoryA',
+                                count: 2,
+                                x: 25,
+                                y: 66.67,
+                                percentage: 66.67,
+                            },
+                        ],
+                    },
+                ],
+                'given major order (alphabetical minor), percentages'
+            );
 
-            assert.deepEqual(makeBarSpecs(
-                singleValueHorzBarsData, categoryOrder, categoryOrder, getColor, categoryCoord, true, false, false
-            ), [{
-                fill: "colorE",
-                data:[{
-                    majorCategory: "categoryD", minorCategory:"categoryE",
-                    count: 1, x: 0, y:1, percentage: 50
-                },{
-                    majorCategory: "categoryC", minorCategory:"categoryE",
-                    count: 0, x: 25, y:0, percentage: 0
-                }]
-            },{
-                fill: "colorA",
-                data: [{
-                    majorCategory: "categoryD", minorCategory:"categoryA",
-                    count: 1, x: 0, y:1, percentage: 50
-                },{
-                    majorCategory: "categoryC", minorCategory:"categoryA",
-                    count: 2, x: 25, y:2, percentage: 66.67
-                }]
-            },{
-                fill: "colorB",
-                data:[{
-                    majorCategory: "categoryD", minorCategory:"categoryB",
-                    count: 0, x: 0, y:0, percentage: 0
-                },{
-                    majorCategory: "categoryC", minorCategory:"categoryB",
-                    count: 1, x: 25, y:1, percentage: 33.33
-                }]
-            }], "given minor and major order");
+            assert.deepEqual(
+                makeBarSpecs(
+                    singleValueHorzBarsData,
+                    categoryOrder,
+                    categoryOrder,
+                    getColor,
+                    categoryCoord,
+                    true,
+                    false,
+                    false
+                ),
+                [
+                    {
+                        fill: 'colorE',
+                        data: [
+                            {
+                                majorCategory: 'categoryD',
+                                minorCategory: 'categoryE',
+                                count: 1,
+                                x: 0,
+                                y: 1,
+                                percentage: 50,
+                            },
+                            {
+                                majorCategory: 'categoryC',
+                                minorCategory: 'categoryE',
+                                count: 0,
+                                x: 25,
+                                y: 0,
+                                percentage: 0,
+                            },
+                        ],
+                    },
+                    {
+                        fill: 'colorA',
+                        data: [
+                            {
+                                majorCategory: 'categoryD',
+                                minorCategory: 'categoryA',
+                                count: 1,
+                                x: 0,
+                                y: 1,
+                                percentage: 50,
+                            },
+                            {
+                                majorCategory: 'categoryC',
+                                minorCategory: 'categoryA',
+                                count: 2,
+                                x: 25,
+                                y: 2,
+                                percentage: 66.67,
+                            },
+                        ],
+                    },
+                    {
+                        fill: 'colorB',
+                        data: [
+                            {
+                                majorCategory: 'categoryD',
+                                minorCategory: 'categoryB',
+                                count: 0,
+                                x: 0,
+                                y: 0,
+                                percentage: 0,
+                            },
+                            {
+                                majorCategory: 'categoryC',
+                                minorCategory: 'categoryB',
+                                count: 1,
+                                x: 25,
+                                y: 1,
+                                percentage: 33.33,
+                            },
+                        ],
+                    },
+                ],
+                'given minor and major order'
+            );
 
-            assert.deepEqual(makeBarSpecs(
-                singleValueHorzBarsData, categoryOrder, categoryOrder, getColor, categoryCoord, true, false, true
-            ), [{
-                fill: "colorE",
-                data:[{
-                    majorCategory: "categoryD", minorCategory:"categoryE",
-                    count: 1, x: 0, y:50, percentage: 50
-                },{
-                    majorCategory: "categoryC", minorCategory:"categoryE",
-                    count: 0, x: 25, y:0, percentage: 0
-                }]
-            },{
-                fill: "colorA",
-                data: [{
-                    majorCategory: "categoryD", minorCategory:"categoryA",
-                    count: 1, x: 0, y:50, percentage: 50
-                },{
-                    majorCategory: "categoryC", minorCategory:"categoryA",
-                    count: 2, x: 25, y:66.67, percentage: 66.67
-                }]
-            },{
-                fill: "colorB",
-                data:[{
-                    majorCategory: "categoryD", minorCategory:"categoryB",
-                    count: 0, x: 0, y:0, percentage: 0
-                },{
-                    majorCategory: "categoryC", minorCategory:"categoryB",
-                    count: 1, x: 25, y:33.33, percentage: 33.33
-                }]
-            }], "given minor and major order, percentages");
+            assert.deepEqual(
+                makeBarSpecs(
+                    singleValueHorzBarsData,
+                    categoryOrder,
+                    categoryOrder,
+                    getColor,
+                    categoryCoord,
+                    true,
+                    false,
+                    true
+                ),
+                [
+                    {
+                        fill: 'colorE',
+                        data: [
+                            {
+                                majorCategory: 'categoryD',
+                                minorCategory: 'categoryE',
+                                count: 1,
+                                x: 0,
+                                y: 50,
+                                percentage: 50,
+                            },
+                            {
+                                majorCategory: 'categoryC',
+                                minorCategory: 'categoryE',
+                                count: 0,
+                                x: 25,
+                                y: 0,
+                                percentage: 0,
+                            },
+                        ],
+                    },
+                    {
+                        fill: 'colorA',
+                        data: [
+                            {
+                                majorCategory: 'categoryD',
+                                minorCategory: 'categoryA',
+                                count: 1,
+                                x: 0,
+                                y: 50,
+                                percentage: 50,
+                            },
+                            {
+                                majorCategory: 'categoryC',
+                                minorCategory: 'categoryA',
+                                count: 2,
+                                x: 25,
+                                y: 66.67,
+                                percentage: 66.67,
+                            },
+                        ],
+                    },
+                    {
+                        fill: 'colorB',
+                        data: [
+                            {
+                                majorCategory: 'categoryD',
+                                minorCategory: 'categoryB',
+                                count: 0,
+                                x: 0,
+                                y: 0,
+                                percentage: 0,
+                            },
+                            {
+                                majorCategory: 'categoryC',
+                                minorCategory: 'categoryB',
+                                count: 1,
+                                x: 25,
+                                y: 33.33,
+                                percentage: 33.33,
+                            },
+                        ],
+                    },
+                ],
+                'given minor and major order, percentages'
+            );
         });
-        it("returns correct results for multipleValueVertBarsData", ()=>{
-            assert.deepEqual(makeBarSpecs(
-                multipleValueVertBarsData, undefined, undefined, getColor, categoryCoord, false, false, false
-            ), [{
-                fill: "colorC",
-                data:[{
-                    majorCategory: "categoryA", minorCategory:"categoryC",
-                    count: 2, x: 0, y:2, percentage: 50
-                },{
-                    majorCategory: "categoryB", minorCategory:"categoryC",
-                    count: 3, x: 25, y:3, percentage: 60
-                },{
-                    majorCategory: "categoryE", minorCategory:"categoryC",
-                    count: 2, x: 50, y:2, percentage: 50
-                }]
-            },{
-                fill: "colorD",
-                data: [{
-                    majorCategory: "categoryA", minorCategory:"categoryD",
-                    count: 2, x: 0, y:2, percentage: 50
-                },{
-                    majorCategory: "categoryB", minorCategory:"categoryD",
-                    count: 2, x: 25, y:2, percentage: 40
-                },{
-                    majorCategory: "categoryE", minorCategory:"categoryD",
-                    count: 2, x: 50, y:2, percentage: 50
-                }]
-            }], "no given order (alphabetical both)");
+        it('returns correct results for multipleValueVertBarsData', () => {
+            assert.deepEqual(
+                makeBarSpecs(
+                    multipleValueVertBarsData,
+                    undefined,
+                    undefined,
+                    getColor,
+                    categoryCoord,
+                    false,
+                    false,
+                    false
+                ),
+                [
+                    {
+                        fill: 'colorC',
+                        data: [
+                            {
+                                majorCategory: 'categoryA',
+                                minorCategory: 'categoryC',
+                                count: 2,
+                                x: 0,
+                                y: 2,
+                                percentage: 50,
+                            },
+                            {
+                                majorCategory: 'categoryB',
+                                minorCategory: 'categoryC',
+                                count: 3,
+                                x: 25,
+                                y: 3,
+                                percentage: 60,
+                            },
+                            {
+                                majorCategory: 'categoryE',
+                                minorCategory: 'categoryC',
+                                count: 2,
+                                x: 50,
+                                y: 2,
+                                percentage: 50,
+                            },
+                        ],
+                    },
+                    {
+                        fill: 'colorD',
+                        data: [
+                            {
+                                majorCategory: 'categoryA',
+                                minorCategory: 'categoryD',
+                                count: 2,
+                                x: 0,
+                                y: 2,
+                                percentage: 50,
+                            },
+                            {
+                                majorCategory: 'categoryB',
+                                minorCategory: 'categoryD',
+                                count: 2,
+                                x: 25,
+                                y: 2,
+                                percentage: 40,
+                            },
+                            {
+                                majorCategory: 'categoryE',
+                                minorCategory: 'categoryD',
+                                count: 2,
+                                x: 50,
+                                y: 2,
+                                percentage: 50,
+                            },
+                        ],
+                    },
+                ],
+                'no given order (alphabetical both)'
+            );
 
-            assert.deepEqual(makeBarSpecs(
-                multipleValueVertBarsData, undefined, undefined, getColor, categoryCoord, false, false, true
-            ), [{
-                fill: "colorC",
-                data:[{
-                    majorCategory: "categoryA", minorCategory:"categoryC",
-                    count: 2, x: 0, y:50, percentage: 50
-                },{
-                    majorCategory: "categoryB", minorCategory:"categoryC",
-                    count: 3, x: 25, y:60, percentage: 60
-                },{
-                    majorCategory: "categoryE", minorCategory:"categoryC",
-                    count: 2, x: 50, y:50, percentage: 50
-                }]
-            },{
-                fill: "colorD",
-                data: [{
-                    majorCategory: "categoryA", minorCategory:"categoryD",
-                    count: 2, x: 0, y:50, percentage: 50
-                },{
-                    majorCategory: "categoryB", minorCategory:"categoryD",
-                    count: 2, x: 25, y:40, percentage: 40
-                },{
-                    majorCategory: "categoryE", minorCategory:"categoryD",
-                    count: 2, x: 50, y:50, percentage: 50
-                }]
-            }], "no given order (alphabetical both), percentages");
+            assert.deepEqual(
+                makeBarSpecs(
+                    multipleValueVertBarsData,
+                    undefined,
+                    undefined,
+                    getColor,
+                    categoryCoord,
+                    false,
+                    false,
+                    true
+                ),
+                [
+                    {
+                        fill: 'colorC',
+                        data: [
+                            {
+                                majorCategory: 'categoryA',
+                                minorCategory: 'categoryC',
+                                count: 2,
+                                x: 0,
+                                y: 50,
+                                percentage: 50,
+                            },
+                            {
+                                majorCategory: 'categoryB',
+                                minorCategory: 'categoryC',
+                                count: 3,
+                                x: 25,
+                                y: 60,
+                                percentage: 60,
+                            },
+                            {
+                                majorCategory: 'categoryE',
+                                minorCategory: 'categoryC',
+                                count: 2,
+                                x: 50,
+                                y: 50,
+                                percentage: 50,
+                            },
+                        ],
+                    },
+                    {
+                        fill: 'colorD',
+                        data: [
+                            {
+                                majorCategory: 'categoryA',
+                                minorCategory: 'categoryD',
+                                count: 2,
+                                x: 0,
+                                y: 50,
+                                percentage: 50,
+                            },
+                            {
+                                majorCategory: 'categoryB',
+                                minorCategory: 'categoryD',
+                                count: 2,
+                                x: 25,
+                                y: 40,
+                                percentage: 40,
+                            },
+                            {
+                                majorCategory: 'categoryE',
+                                minorCategory: 'categoryD',
+                                count: 2,
+                                x: 50,
+                                y: 50,
+                                percentage: 50,
+                            },
+                        ],
+                    },
+                ],
+                'no given order (alphabetical both), percentages'
+            );
 
-            assert.deepEqual(makeBarSpecs(
-                multipleValueVertBarsData, categoryOrder, undefined, getColor, categoryCoord, false, false, false
-            ), [{
-                fill: "colorD",
-                data: [{
-                    majorCategory: "categoryA", minorCategory:"categoryD",
-                    count: 2, x: 0, y:2, percentage: 50
-                },{
-                    majorCategory: "categoryB", minorCategory:"categoryD",
-                    count: 2, x: 25, y:2, percentage: 40
-                },{
-                    majorCategory: "categoryE", minorCategory:"categoryD",
-                    count: 2, x: 50, y:2, percentage: 50
-                }]
-            },{
-                fill: "colorC",
-                data:[{
-                    majorCategory: "categoryA", minorCategory:"categoryC",
-                    count: 2, x: 0, y:2, percentage: 50
-                },{
-                    majorCategory: "categoryB", minorCategory:"categoryC",
-                    count: 3, x: 25, y:3, percentage: 60
-                },{
-                    majorCategory: "categoryE", minorCategory:"categoryC",
-                    count: 2, x: 50, y:2, percentage: 50
-                }]
-            }], "given minor order (alphabetical major)");
+            assert.deepEqual(
+                makeBarSpecs(
+                    multipleValueVertBarsData,
+                    categoryOrder,
+                    undefined,
+                    getColor,
+                    categoryCoord,
+                    false,
+                    false,
+                    false
+                ),
+                [
+                    {
+                        fill: 'colorD',
+                        data: [
+                            {
+                                majorCategory: 'categoryA',
+                                minorCategory: 'categoryD',
+                                count: 2,
+                                x: 0,
+                                y: 2,
+                                percentage: 50,
+                            },
+                            {
+                                majorCategory: 'categoryB',
+                                minorCategory: 'categoryD',
+                                count: 2,
+                                x: 25,
+                                y: 2,
+                                percentage: 40,
+                            },
+                            {
+                                majorCategory: 'categoryE',
+                                minorCategory: 'categoryD',
+                                count: 2,
+                                x: 50,
+                                y: 2,
+                                percentage: 50,
+                            },
+                        ],
+                    },
+                    {
+                        fill: 'colorC',
+                        data: [
+                            {
+                                majorCategory: 'categoryA',
+                                minorCategory: 'categoryC',
+                                count: 2,
+                                x: 0,
+                                y: 2,
+                                percentage: 50,
+                            },
+                            {
+                                majorCategory: 'categoryB',
+                                minorCategory: 'categoryC',
+                                count: 3,
+                                x: 25,
+                                y: 3,
+                                percentage: 60,
+                            },
+                            {
+                                majorCategory: 'categoryE',
+                                minorCategory: 'categoryC',
+                                count: 2,
+                                x: 50,
+                                y: 2,
+                                percentage: 50,
+                            },
+                        ],
+                    },
+                ],
+                'given minor order (alphabetical major)'
+            );
 
-            assert.deepEqual(makeBarSpecs(
-                multipleValueVertBarsData, categoryOrder, undefined, getColor, categoryCoord, false, false, true
-            ), [{
-                fill: "colorD",
-                data: [{
-                    majorCategory: "categoryA", minorCategory:"categoryD",
-                    count: 2, x: 0, y:50, percentage: 50
-                },{
-                    majorCategory: "categoryB", minorCategory:"categoryD",
-                    count: 2, x: 25, y:40, percentage: 40
-                },{
-                    majorCategory: "categoryE", minorCategory:"categoryD",
-                    count: 2, x: 50, y:50, percentage: 50
-                }]
-            },{
-                fill: "colorC",
-                data:[{
-                    majorCategory: "categoryA", minorCategory:"categoryC",
-                    count: 2, x: 0, y:50, percentage: 50
-                },{
-                    majorCategory: "categoryB", minorCategory:"categoryC",
-                    count: 3, x: 25, y:60, percentage: 60
-                },{
-                    majorCategory: "categoryE", minorCategory:"categoryC",
-                    count: 2, x: 50, y:50, percentage: 50
-                }]
-            }], "given minor order (alphabetical major), percentages");
+            assert.deepEqual(
+                makeBarSpecs(
+                    multipleValueVertBarsData,
+                    categoryOrder,
+                    undefined,
+                    getColor,
+                    categoryCoord,
+                    false,
+                    false,
+                    true
+                ),
+                [
+                    {
+                        fill: 'colorD',
+                        data: [
+                            {
+                                majorCategory: 'categoryA',
+                                minorCategory: 'categoryD',
+                                count: 2,
+                                x: 0,
+                                y: 50,
+                                percentage: 50,
+                            },
+                            {
+                                majorCategory: 'categoryB',
+                                minorCategory: 'categoryD',
+                                count: 2,
+                                x: 25,
+                                y: 40,
+                                percentage: 40,
+                            },
+                            {
+                                majorCategory: 'categoryE',
+                                minorCategory: 'categoryD',
+                                count: 2,
+                                x: 50,
+                                y: 50,
+                                percentage: 50,
+                            },
+                        ],
+                    },
+                    {
+                        fill: 'colorC',
+                        data: [
+                            {
+                                majorCategory: 'categoryA',
+                                minorCategory: 'categoryC',
+                                count: 2,
+                                x: 0,
+                                y: 50,
+                                percentage: 50,
+                            },
+                            {
+                                majorCategory: 'categoryB',
+                                minorCategory: 'categoryC',
+                                count: 3,
+                                x: 25,
+                                y: 60,
+                                percentage: 60,
+                            },
+                            {
+                                majorCategory: 'categoryE',
+                                minorCategory: 'categoryC',
+                                count: 2,
+                                x: 50,
+                                y: 50,
+                                percentage: 50,
+                            },
+                        ],
+                    },
+                ],
+                'given minor order (alphabetical major), percentages'
+            );
 
-            assert.deepEqual(makeBarSpecs(
-                multipleValueVertBarsData, undefined, categoryOrder, getColor, categoryCoord, false, false, false
-            ), [{
-                fill: "colorC",
-                data:[{
-                    majorCategory: "categoryB", minorCategory:"categoryC",
-                    count: 3, x: 0, y:3, percentage: 60
-                },{
-                    majorCategory: "categoryA", minorCategory:"categoryC",
-                    count: 2, x: 25, y:2, percentage: 50
-                },{
-                    majorCategory: "categoryE", minorCategory:"categoryC",
-                    count: 2, x: 50, y:2, percentage: 50
-                }]
-            },{
-                fill: "colorD",
-                data: [{
-                    majorCategory: "categoryB", minorCategory:"categoryD",
-                    count: 2, x: 0, y:2, percentage: 40
-                },{
-                    majorCategory: "categoryA", minorCategory:"categoryD",
-                    count: 2, x: 25, y:2, percentage: 50
-                },{
-                    majorCategory: "categoryE", minorCategory:"categoryD",
-                    count: 2, x: 50, y:2, percentage: 50
-                }]
-            }], "given major order (alphabetical minor)");
+            assert.deepEqual(
+                makeBarSpecs(
+                    multipleValueVertBarsData,
+                    undefined,
+                    categoryOrder,
+                    getColor,
+                    categoryCoord,
+                    false,
+                    false,
+                    false
+                ),
+                [
+                    {
+                        fill: 'colorC',
+                        data: [
+                            {
+                                majorCategory: 'categoryB',
+                                minorCategory: 'categoryC',
+                                count: 3,
+                                x: 0,
+                                y: 3,
+                                percentage: 60,
+                            },
+                            {
+                                majorCategory: 'categoryA',
+                                minorCategory: 'categoryC',
+                                count: 2,
+                                x: 25,
+                                y: 2,
+                                percentage: 50,
+                            },
+                            {
+                                majorCategory: 'categoryE',
+                                minorCategory: 'categoryC',
+                                count: 2,
+                                x: 50,
+                                y: 2,
+                                percentage: 50,
+                            },
+                        ],
+                    },
+                    {
+                        fill: 'colorD',
+                        data: [
+                            {
+                                majorCategory: 'categoryB',
+                                minorCategory: 'categoryD',
+                                count: 2,
+                                x: 0,
+                                y: 2,
+                                percentage: 40,
+                            },
+                            {
+                                majorCategory: 'categoryA',
+                                minorCategory: 'categoryD',
+                                count: 2,
+                                x: 25,
+                                y: 2,
+                                percentage: 50,
+                            },
+                            {
+                                majorCategory: 'categoryE',
+                                minorCategory: 'categoryD',
+                                count: 2,
+                                x: 50,
+                                y: 2,
+                                percentage: 50,
+                            },
+                        ],
+                    },
+                ],
+                'given major order (alphabetical minor)'
+            );
 
-            assert.deepEqual(makeBarSpecs(
-                multipleValueVertBarsData, undefined, categoryOrder, getColor, categoryCoord, false, false, true
-            ), [{
-                fill: "colorC",
-                data:[{
-                    majorCategory: "categoryB", minorCategory:"categoryC",
-                    count: 3, x: 0, y:60, percentage: 60
-                },{
-                    majorCategory: "categoryA", minorCategory:"categoryC",
-                    count: 2, x: 25, y:50, percentage: 50
-                },{
-                    majorCategory: "categoryE", minorCategory:"categoryC",
-                    count: 2, x: 50, y:50, percentage: 50
-                }]
-            },{
-                fill: "colorD",
-                data: [{
-                    majorCategory: "categoryB", minorCategory:"categoryD",
-                    count: 2, x: 0, y:40, percentage: 40
-                },{
-                    majorCategory: "categoryA", minorCategory:"categoryD",
-                    count: 2, x: 25, y:50, percentage: 50
-                },{
-                    majorCategory: "categoryE", minorCategory:"categoryD",
-                    count: 2, x: 50, y:50, percentage: 50
-                }]
-            }], "given major order (alphabetical minor), perccentages");
+            assert.deepEqual(
+                makeBarSpecs(
+                    multipleValueVertBarsData,
+                    undefined,
+                    categoryOrder,
+                    getColor,
+                    categoryCoord,
+                    false,
+                    false,
+                    true
+                ),
+                [
+                    {
+                        fill: 'colorC',
+                        data: [
+                            {
+                                majorCategory: 'categoryB',
+                                minorCategory: 'categoryC',
+                                count: 3,
+                                x: 0,
+                                y: 60,
+                                percentage: 60,
+                            },
+                            {
+                                majorCategory: 'categoryA',
+                                minorCategory: 'categoryC',
+                                count: 2,
+                                x: 25,
+                                y: 50,
+                                percentage: 50,
+                            },
+                            {
+                                majorCategory: 'categoryE',
+                                minorCategory: 'categoryC',
+                                count: 2,
+                                x: 50,
+                                y: 50,
+                                percentage: 50,
+                            },
+                        ],
+                    },
+                    {
+                        fill: 'colorD',
+                        data: [
+                            {
+                                majorCategory: 'categoryB',
+                                minorCategory: 'categoryD',
+                                count: 2,
+                                x: 0,
+                                y: 40,
+                                percentage: 40,
+                            },
+                            {
+                                majorCategory: 'categoryA',
+                                minorCategory: 'categoryD',
+                                count: 2,
+                                x: 25,
+                                y: 50,
+                                percentage: 50,
+                            },
+                            {
+                                majorCategory: 'categoryE',
+                                minorCategory: 'categoryD',
+                                count: 2,
+                                x: 50,
+                                y: 50,
+                                percentage: 50,
+                            },
+                        ],
+                    },
+                ],
+                'given major order (alphabetical minor), perccentages'
+            );
 
-            assert.deepEqual(makeBarSpecs(
-                multipleValueVertBarsData, categoryOrder, categoryOrder, getColor, categoryCoord, false, false, false
-            ), [{
-                fill: "colorD",
-                data: [{
-                    majorCategory: "categoryB", minorCategory:"categoryD",
-                    count: 2, x: 0, y:2, percentage: 40
-                },{
-                    majorCategory: "categoryA", minorCategory:"categoryD",
-                    count: 2, x: 25, y:2, percentage: 50
-                },{
-                    majorCategory: "categoryE", minorCategory:"categoryD",
-                    count: 2, x: 50, y:2, percentage: 50
-                }]
-            },{
-                fill: "colorC",
-                data:[{
-                    majorCategory: "categoryB", minorCategory:"categoryC",
-                    count: 3, x: 0, y:3, percentage: 60
-                },{
-                    majorCategory: "categoryA", minorCategory:"categoryC",
-                    count: 2, x: 25, y:2, percentage: 50
-                },{
-                    majorCategory: "categoryE", minorCategory:"categoryC",
-                    count: 2, x: 50, y:2, percentage: 50
-                }]
-            }], "given minor and major order");
+            assert.deepEqual(
+                makeBarSpecs(
+                    multipleValueVertBarsData,
+                    categoryOrder,
+                    categoryOrder,
+                    getColor,
+                    categoryCoord,
+                    false,
+                    false,
+                    false
+                ),
+                [
+                    {
+                        fill: 'colorD',
+                        data: [
+                            {
+                                majorCategory: 'categoryB',
+                                minorCategory: 'categoryD',
+                                count: 2,
+                                x: 0,
+                                y: 2,
+                                percentage: 40,
+                            },
+                            {
+                                majorCategory: 'categoryA',
+                                minorCategory: 'categoryD',
+                                count: 2,
+                                x: 25,
+                                y: 2,
+                                percentage: 50,
+                            },
+                            {
+                                majorCategory: 'categoryE',
+                                minorCategory: 'categoryD',
+                                count: 2,
+                                x: 50,
+                                y: 2,
+                                percentage: 50,
+                            },
+                        ],
+                    },
+                    {
+                        fill: 'colorC',
+                        data: [
+                            {
+                                majorCategory: 'categoryB',
+                                minorCategory: 'categoryC',
+                                count: 3,
+                                x: 0,
+                                y: 3,
+                                percentage: 60,
+                            },
+                            {
+                                majorCategory: 'categoryA',
+                                minorCategory: 'categoryC',
+                                count: 2,
+                                x: 25,
+                                y: 2,
+                                percentage: 50,
+                            },
+                            {
+                                majorCategory: 'categoryE',
+                                minorCategory: 'categoryC',
+                                count: 2,
+                                x: 50,
+                                y: 2,
+                                percentage: 50,
+                            },
+                        ],
+                    },
+                ],
+                'given minor and major order'
+            );
 
-            assert.deepEqual(makeBarSpecs(
-                multipleValueVertBarsData, categoryOrder, categoryOrder, getColor, categoryCoord, false, false, true
-            ), [{
-                fill: "colorD",
-                data: [{
-                    majorCategory: "categoryB", minorCategory:"categoryD",
-                    count: 2, x: 0, y:40, percentage: 40
-                },{
-                    majorCategory: "categoryA", minorCategory:"categoryD",
-                    count: 2, x: 25, y:50, percentage: 50
-                },{
-                    majorCategory: "categoryE", minorCategory:"categoryD",
-                    count: 2, x: 50, y:50, percentage: 50
-                }]
-            },{
-                fill: "colorC",
-                data:[{
-                    majorCategory: "categoryB", minorCategory:"categoryC",
-                    count: 3, x: 0, y:60, percentage: 60
-                },{
-                    majorCategory: "categoryA", minorCategory:"categoryC",
-                    count: 2, x: 25, y:50, percentage: 50
-                },{
-                    majorCategory: "categoryE", minorCategory:"categoryC",
-                    count: 2, x: 50, y:50, percentage: 50
-                }]
-            }], "given minor and major order, percentages");
+            assert.deepEqual(
+                makeBarSpecs(
+                    multipleValueVertBarsData,
+                    categoryOrder,
+                    categoryOrder,
+                    getColor,
+                    categoryCoord,
+                    false,
+                    false,
+                    true
+                ),
+                [
+                    {
+                        fill: 'colorD',
+                        data: [
+                            {
+                                majorCategory: 'categoryB',
+                                minorCategory: 'categoryD',
+                                count: 2,
+                                x: 0,
+                                y: 40,
+                                percentage: 40,
+                            },
+                            {
+                                majorCategory: 'categoryA',
+                                minorCategory: 'categoryD',
+                                count: 2,
+                                x: 25,
+                                y: 50,
+                                percentage: 50,
+                            },
+                            {
+                                majorCategory: 'categoryE',
+                                minorCategory: 'categoryD',
+                                count: 2,
+                                x: 50,
+                                y: 50,
+                                percentage: 50,
+                            },
+                        ],
+                    },
+                    {
+                        fill: 'colorC',
+                        data: [
+                            {
+                                majorCategory: 'categoryB',
+                                minorCategory: 'categoryC',
+                                count: 3,
+                                x: 0,
+                                y: 60,
+                                percentage: 60,
+                            },
+                            {
+                                majorCategory: 'categoryA',
+                                minorCategory: 'categoryC',
+                                count: 2,
+                                x: 25,
+                                y: 50,
+                                percentage: 50,
+                            },
+                            {
+                                majorCategory: 'categoryE',
+                                minorCategory: 'categoryC',
+                                count: 2,
+                                x: 50,
+                                y: 50,
+                                percentage: 50,
+                            },
+                        ],
+                    },
+                ],
+                'given minor and major order, percentages'
+            );
         });
         //
-        it("returns correct results for multipleValueHorzBarsData", ()=>{
-            assert.deepEqual(makeBarSpecs(
-                multipleValueHorzBarsData, undefined, undefined, getColor, categoryCoord, true, false, false
-            ), [{
-                fill: "colorE",
-                data:[{
-                    majorCategory: "categoryC", minorCategory:"categoryE",
-                    count: 2, x: 0, y:2, percentage: 28.57
-                },{
-                    majorCategory: "categoryD", minorCategory:"categoryE",
-                    count: 2, x: 25, y:2, percentage: 33.33
-                }]
-            },{
-                fill: "colorB",
-                data:[{
-                    majorCategory: "categoryC", minorCategory:"categoryB",
-                    count: 3, x: 0, y:3, percentage: 42.86
-                },{
-                    majorCategory: "categoryD", minorCategory:"categoryB",
-                    count: 2, x: 25, y:2, percentage: 33.33
-                }]
-            },{
-                fill: "colorA",
-                data: [{
-                    majorCategory: "categoryC", minorCategory:"categoryA",
-                    count: 2, x: 0, y:2, percentage: 28.57
-                },{
-                    majorCategory: "categoryD", minorCategory:"categoryA",
-                    count: 2, x: 25, y:2, percentage: 33.33
-                }]
-            }], "no given order (alphabetical both)");
+        it('returns correct results for multipleValueHorzBarsData', () => {
+            assert.deepEqual(
+                makeBarSpecs(
+                    multipleValueHorzBarsData,
+                    undefined,
+                    undefined,
+                    getColor,
+                    categoryCoord,
+                    true,
+                    false,
+                    false
+                ),
+                [
+                    {
+                        fill: 'colorE',
+                        data: [
+                            {
+                                majorCategory: 'categoryC',
+                                minorCategory: 'categoryE',
+                                count: 2,
+                                x: 0,
+                                y: 2,
+                                percentage: 28.57,
+                            },
+                            {
+                                majorCategory: 'categoryD',
+                                minorCategory: 'categoryE',
+                                count: 2,
+                                x: 25,
+                                y: 2,
+                                percentage: 33.33,
+                            },
+                        ],
+                    },
+                    {
+                        fill: 'colorB',
+                        data: [
+                            {
+                                majorCategory: 'categoryC',
+                                minorCategory: 'categoryB',
+                                count: 3,
+                                x: 0,
+                                y: 3,
+                                percentage: 42.86,
+                            },
+                            {
+                                majorCategory: 'categoryD',
+                                minorCategory: 'categoryB',
+                                count: 2,
+                                x: 25,
+                                y: 2,
+                                percentage: 33.33,
+                            },
+                        ],
+                    },
+                    {
+                        fill: 'colorA',
+                        data: [
+                            {
+                                majorCategory: 'categoryC',
+                                minorCategory: 'categoryA',
+                                count: 2,
+                                x: 0,
+                                y: 2,
+                                percentage: 28.57,
+                            },
+                            {
+                                majorCategory: 'categoryD',
+                                minorCategory: 'categoryA',
+                                count: 2,
+                                x: 25,
+                                y: 2,
+                                percentage: 33.33,
+                            },
+                        ],
+                    },
+                ],
+                'no given order (alphabetical both)'
+            );
 
-            assert.deepEqual(makeBarSpecs(
-                multipleValueHorzBarsData, undefined, undefined, getColor, categoryCoord, true, true, true
-            ), [{
-                fill: "colorA",
-                data: [{
-                    majorCategory: "categoryC", minorCategory:"categoryA",
-                    count: 2, x: 0, y:28.57, percentage: 28.57
-                },{
-                    majorCategory: "categoryD", minorCategory:"categoryA",
-                    count: 2, x: 25, y:33.33, percentage: 33.33
-                }]
-            },{
-                fill: "colorB",
-                data:[{
-                    majorCategory: "categoryC", minorCategory:"categoryB",
-                    count: 3, x: 0, y:42.86, percentage: 42.86
-                },{
-                    majorCategory: "categoryD", minorCategory:"categoryB",
-                    count: 2, x: 25, y:33.33, percentage: 33.33
-                }]
-            },{
-                fill: "colorE",
-                data:[{
-                    majorCategory: "categoryC", minorCategory:"categoryE",
-                    count: 2, x: 0, y:28.57, percentage: 28.57
-                },{
-                    majorCategory: "categoryD", minorCategory:"categoryE",
-                    count: 2, x: 25, y:33.33, percentage: 33.33
-                }]
-            }], "no given order (alphabetical both), percentages");
+            assert.deepEqual(
+                makeBarSpecs(
+                    multipleValueHorzBarsData,
+                    undefined,
+                    undefined,
+                    getColor,
+                    categoryCoord,
+                    true,
+                    true,
+                    true
+                ),
+                [
+                    {
+                        fill: 'colorA',
+                        data: [
+                            {
+                                majorCategory: 'categoryC',
+                                minorCategory: 'categoryA',
+                                count: 2,
+                                x: 0,
+                                y: 28.57,
+                                percentage: 28.57,
+                            },
+                            {
+                                majorCategory: 'categoryD',
+                                minorCategory: 'categoryA',
+                                count: 2,
+                                x: 25,
+                                y: 33.33,
+                                percentage: 33.33,
+                            },
+                        ],
+                    },
+                    {
+                        fill: 'colorB',
+                        data: [
+                            {
+                                majorCategory: 'categoryC',
+                                minorCategory: 'categoryB',
+                                count: 3,
+                                x: 0,
+                                y: 42.86,
+                                percentage: 42.86,
+                            },
+                            {
+                                majorCategory: 'categoryD',
+                                minorCategory: 'categoryB',
+                                count: 2,
+                                x: 25,
+                                y: 33.33,
+                                percentage: 33.33,
+                            },
+                        ],
+                    },
+                    {
+                        fill: 'colorE',
+                        data: [
+                            {
+                                majorCategory: 'categoryC',
+                                minorCategory: 'categoryE',
+                                count: 2,
+                                x: 0,
+                                y: 28.57,
+                                percentage: 28.57,
+                            },
+                            {
+                                majorCategory: 'categoryD',
+                                minorCategory: 'categoryE',
+                                count: 2,
+                                x: 25,
+                                y: 33.33,
+                                percentage: 33.33,
+                            },
+                        ],
+                    },
+                ],
+                'no given order (alphabetical both), percentages'
+            );
 
-            assert.deepEqual(makeBarSpecs(
-                multipleValueHorzBarsData, categoryOrder, undefined, getColor, categoryCoord, true, false, false
-            ), [{
-                fill: "colorE",
-                data:[{
-                    majorCategory: "categoryC", minorCategory:"categoryE",
-                    count: 2, x: 0, y:2, percentage: 28.57
-                },{
-                    majorCategory: "categoryD", minorCategory:"categoryE",
-                    count: 2, x: 25, y:2, percentage: 33.33
-                }]
-            },{
-                fill: "colorA",
-                data: [{
-                    majorCategory: "categoryC", minorCategory:"categoryA",
-                    count: 2, x: 0, y:2, percentage: 28.57
-                },{
-                    majorCategory: "categoryD", minorCategory:"categoryA",
-                    count: 2, x: 25, y:2, percentage: 33.33
-                }]
-            },{
-                fill: "colorB",
-                data:[{
-                    majorCategory: "categoryC", minorCategory:"categoryB",
-                    count: 3, x: 0, y:3, percentage: 42.86
-                },{
-                    majorCategory: "categoryD", minorCategory:"categoryB",
-                    count: 2, x: 25, y:2, percentage: 33.33
-                }]
-            }], "given minor order (alphabetical major)");
+            assert.deepEqual(
+                makeBarSpecs(
+                    multipleValueHorzBarsData,
+                    categoryOrder,
+                    undefined,
+                    getColor,
+                    categoryCoord,
+                    true,
+                    false,
+                    false
+                ),
+                [
+                    {
+                        fill: 'colorE',
+                        data: [
+                            {
+                                majorCategory: 'categoryC',
+                                minorCategory: 'categoryE',
+                                count: 2,
+                                x: 0,
+                                y: 2,
+                                percentage: 28.57,
+                            },
+                            {
+                                majorCategory: 'categoryD',
+                                minorCategory: 'categoryE',
+                                count: 2,
+                                x: 25,
+                                y: 2,
+                                percentage: 33.33,
+                            },
+                        ],
+                    },
+                    {
+                        fill: 'colorA',
+                        data: [
+                            {
+                                majorCategory: 'categoryC',
+                                minorCategory: 'categoryA',
+                                count: 2,
+                                x: 0,
+                                y: 2,
+                                percentage: 28.57,
+                            },
+                            {
+                                majorCategory: 'categoryD',
+                                minorCategory: 'categoryA',
+                                count: 2,
+                                x: 25,
+                                y: 2,
+                                percentage: 33.33,
+                            },
+                        ],
+                    },
+                    {
+                        fill: 'colorB',
+                        data: [
+                            {
+                                majorCategory: 'categoryC',
+                                minorCategory: 'categoryB',
+                                count: 3,
+                                x: 0,
+                                y: 3,
+                                percentage: 42.86,
+                            },
+                            {
+                                majorCategory: 'categoryD',
+                                minorCategory: 'categoryB',
+                                count: 2,
+                                x: 25,
+                                y: 2,
+                                percentage: 33.33,
+                            },
+                        ],
+                    },
+                ],
+                'given minor order (alphabetical major)'
+            );
 
-            assert.deepEqual(makeBarSpecs(
-                multipleValueHorzBarsData, categoryOrder, undefined, getColor, categoryCoord, true, true, true
-            ), [{
-                fill: "colorB",
-                data:[{
-                    majorCategory: "categoryC", minorCategory:"categoryB",
-                    count: 3, x: 0, y:42.86, percentage: 42.86
-                },{
-                    majorCategory: "categoryD", minorCategory:"categoryB",
-                    count: 2, x: 25, y:33.33, percentage: 33.33
-                }]
-            },{
-                fill: "colorA",
-                data: [{
-                    majorCategory: "categoryC", minorCategory:"categoryA",
-                    count: 2, x: 0, y:28.57, percentage: 28.57
-                },{
-                    majorCategory: "categoryD", minorCategory:"categoryA",
-                    count: 2, x: 25, y:33.33, percentage: 33.33
-                }]
-            },{
-                fill: "colorE",
-                data:[{
-                    majorCategory: "categoryC", minorCategory:"categoryE",
-                    count: 2, x: 0, y:28.57, percentage: 28.57
-                },{
-                    majorCategory: "categoryD", minorCategory:"categoryE",
-                    count: 2, x: 25, y:33.33, percentage: 33.33
-                }]
-            }], "given minor order (alphabetical major), percentages");
+            assert.deepEqual(
+                makeBarSpecs(
+                    multipleValueHorzBarsData,
+                    categoryOrder,
+                    undefined,
+                    getColor,
+                    categoryCoord,
+                    true,
+                    true,
+                    true
+                ),
+                [
+                    {
+                        fill: 'colorB',
+                        data: [
+                            {
+                                majorCategory: 'categoryC',
+                                minorCategory: 'categoryB',
+                                count: 3,
+                                x: 0,
+                                y: 42.86,
+                                percentage: 42.86,
+                            },
+                            {
+                                majorCategory: 'categoryD',
+                                minorCategory: 'categoryB',
+                                count: 2,
+                                x: 25,
+                                y: 33.33,
+                                percentage: 33.33,
+                            },
+                        ],
+                    },
+                    {
+                        fill: 'colorA',
+                        data: [
+                            {
+                                majorCategory: 'categoryC',
+                                minorCategory: 'categoryA',
+                                count: 2,
+                                x: 0,
+                                y: 28.57,
+                                percentage: 28.57,
+                            },
+                            {
+                                majorCategory: 'categoryD',
+                                minorCategory: 'categoryA',
+                                count: 2,
+                                x: 25,
+                                y: 33.33,
+                                percentage: 33.33,
+                            },
+                        ],
+                    },
+                    {
+                        fill: 'colorE',
+                        data: [
+                            {
+                                majorCategory: 'categoryC',
+                                minorCategory: 'categoryE',
+                                count: 2,
+                                x: 0,
+                                y: 28.57,
+                                percentage: 28.57,
+                            },
+                            {
+                                majorCategory: 'categoryD',
+                                minorCategory: 'categoryE',
+                                count: 2,
+                                x: 25,
+                                y: 33.33,
+                                percentage: 33.33,
+                            },
+                        ],
+                    },
+                ],
+                'given minor order (alphabetical major), percentages'
+            );
 
-            assert.deepEqual(makeBarSpecs(
-                multipleValueHorzBarsData, undefined, categoryOrder, getColor, categoryCoord, true, false, false
-            ), [{
-                fill: "colorE",
-                data:[{
-                    majorCategory: "categoryD", minorCategory:"categoryE",
-                    count: 2, x: 0, y:2, percentage: 33.33
-                },{
-                    majorCategory: "categoryC", minorCategory:"categoryE",
-                    count: 2, x: 25, y:2, percentage: 28.57
-                }]
-            },{
-                fill: "colorB",
-                data:[{
-                    majorCategory: "categoryD", minorCategory:"categoryB",
-                    count: 2, x: 0, y:2, percentage: 33.33
-                },{
-                    majorCategory: "categoryC", minorCategory:"categoryB",
-                    count: 3, x: 25, y:3, percentage: 42.86
-                }]
-            },{
-                fill: "colorA",
-                data: [{
-                    majorCategory: "categoryD", minorCategory:"categoryA",
-                    count: 2, x: 0, y:2, percentage: 33.33
-                },{
-                    majorCategory: "categoryC", minorCategory:"categoryA",
-                    count: 2, x: 25, y:2, percentage: 28.57
-                }]
-            }], "given major order (alphabetical minor)");
+            assert.deepEqual(
+                makeBarSpecs(
+                    multipleValueHorzBarsData,
+                    undefined,
+                    categoryOrder,
+                    getColor,
+                    categoryCoord,
+                    true,
+                    false,
+                    false
+                ),
+                [
+                    {
+                        fill: 'colorE',
+                        data: [
+                            {
+                                majorCategory: 'categoryD',
+                                minorCategory: 'categoryE',
+                                count: 2,
+                                x: 0,
+                                y: 2,
+                                percentage: 33.33,
+                            },
+                            {
+                                majorCategory: 'categoryC',
+                                minorCategory: 'categoryE',
+                                count: 2,
+                                x: 25,
+                                y: 2,
+                                percentage: 28.57,
+                            },
+                        ],
+                    },
+                    {
+                        fill: 'colorB',
+                        data: [
+                            {
+                                majorCategory: 'categoryD',
+                                minorCategory: 'categoryB',
+                                count: 2,
+                                x: 0,
+                                y: 2,
+                                percentage: 33.33,
+                            },
+                            {
+                                majorCategory: 'categoryC',
+                                minorCategory: 'categoryB',
+                                count: 3,
+                                x: 25,
+                                y: 3,
+                                percentage: 42.86,
+                            },
+                        ],
+                    },
+                    {
+                        fill: 'colorA',
+                        data: [
+                            {
+                                majorCategory: 'categoryD',
+                                minorCategory: 'categoryA',
+                                count: 2,
+                                x: 0,
+                                y: 2,
+                                percentage: 33.33,
+                            },
+                            {
+                                majorCategory: 'categoryC',
+                                minorCategory: 'categoryA',
+                                count: 2,
+                                x: 25,
+                                y: 2,
+                                percentage: 28.57,
+                            },
+                        ],
+                    },
+                ],
+                'given major order (alphabetical minor)'
+            );
 
-            assert.deepEqual(makeBarSpecs(
-                multipleValueHorzBarsData, undefined, categoryOrder, getColor, categoryCoord, true, true, true
-            ), [{
-                fill: "colorA",
-                data: [{
-                    majorCategory: "categoryD", minorCategory:"categoryA",
-                    count: 2, x: 0, y:33.33, percentage: 33.33
-                },{
-                    majorCategory: "categoryC", minorCategory:"categoryA",
-                    count: 2, x: 25, y:28.57, percentage: 28.57
-                }]
-            },{
-                fill: "colorB",
-                data:[{
-                    majorCategory: "categoryD", minorCategory:"categoryB",
-                    count: 2, x: 0, y:33.33, percentage: 33.33
-                },{
-                    majorCategory: "categoryC", minorCategory:"categoryB",
-                    count: 3, x: 25, y:42.86, percentage: 42.86
-                }]
-            },{
-                fill: "colorE",
-                data:[{
-                    majorCategory: "categoryD", minorCategory:"categoryE",
-                    count: 2, x: 0, y:33.33, percentage: 33.33
-                },{
-                    majorCategory: "categoryC", minorCategory:"categoryE",
-                    count: 2, x: 25, y:28.57, percentage: 28.57
-                }]
-            }], "given major order (alphabetical minor), percentages");
+            assert.deepEqual(
+                makeBarSpecs(
+                    multipleValueHorzBarsData,
+                    undefined,
+                    categoryOrder,
+                    getColor,
+                    categoryCoord,
+                    true,
+                    true,
+                    true
+                ),
+                [
+                    {
+                        fill: 'colorA',
+                        data: [
+                            {
+                                majorCategory: 'categoryD',
+                                minorCategory: 'categoryA',
+                                count: 2,
+                                x: 0,
+                                y: 33.33,
+                                percentage: 33.33,
+                            },
+                            {
+                                majorCategory: 'categoryC',
+                                minorCategory: 'categoryA',
+                                count: 2,
+                                x: 25,
+                                y: 28.57,
+                                percentage: 28.57,
+                            },
+                        ],
+                    },
+                    {
+                        fill: 'colorB',
+                        data: [
+                            {
+                                majorCategory: 'categoryD',
+                                minorCategory: 'categoryB',
+                                count: 2,
+                                x: 0,
+                                y: 33.33,
+                                percentage: 33.33,
+                            },
+                            {
+                                majorCategory: 'categoryC',
+                                minorCategory: 'categoryB',
+                                count: 3,
+                                x: 25,
+                                y: 42.86,
+                                percentage: 42.86,
+                            },
+                        ],
+                    },
+                    {
+                        fill: 'colorE',
+                        data: [
+                            {
+                                majorCategory: 'categoryD',
+                                minorCategory: 'categoryE',
+                                count: 2,
+                                x: 0,
+                                y: 33.33,
+                                percentage: 33.33,
+                            },
+                            {
+                                majorCategory: 'categoryC',
+                                minorCategory: 'categoryE',
+                                count: 2,
+                                x: 25,
+                                y: 28.57,
+                                percentage: 28.57,
+                            },
+                        ],
+                    },
+                ],
+                'given major order (alphabetical minor), percentages'
+            );
 
-           assert.deepEqual(makeBarSpecs(
-                multipleValueHorzBarsData, categoryOrder, categoryOrder, getColor, categoryCoord, true, false, false
-            ), [{
-                fill: "colorE",
-                data:[{
-                    majorCategory: "categoryD", minorCategory:"categoryE",
-                    count: 2, x: 0, y:2, percentage: 33.33
-                },{
-                    majorCategory: "categoryC", minorCategory:"categoryE",
-                    count: 2, x: 25, y:2, percentage: 28.57
-                }]
-            },{
-                fill: "colorA",
-                data: [{
-                    majorCategory: "categoryD", minorCategory:"categoryA",
-                    count: 2, x: 0, y:2, percentage: 33.33
-                },{
-                    majorCategory: "categoryC", minorCategory:"categoryA",
-                    count: 2, x: 25, y:2, percentage: 28.57
-                }]
-            },{
-                fill: "colorB",
-                data:[{
-                    majorCategory: "categoryD", minorCategory:"categoryB",
-                    count: 2, x: 0, y:2, percentage: 33.33
-                },{
-                    majorCategory: "categoryC", minorCategory:"categoryB",
-                    count: 3, x: 25, y:3, percentage: 42.86
-                }]
-            }], "given minor and major order");
+            assert.deepEqual(
+                makeBarSpecs(
+                    multipleValueHorzBarsData,
+                    categoryOrder,
+                    categoryOrder,
+                    getColor,
+                    categoryCoord,
+                    true,
+                    false,
+                    false
+                ),
+                [
+                    {
+                        fill: 'colorE',
+                        data: [
+                            {
+                                majorCategory: 'categoryD',
+                                minorCategory: 'categoryE',
+                                count: 2,
+                                x: 0,
+                                y: 2,
+                                percentage: 33.33,
+                            },
+                            {
+                                majorCategory: 'categoryC',
+                                minorCategory: 'categoryE',
+                                count: 2,
+                                x: 25,
+                                y: 2,
+                                percentage: 28.57,
+                            },
+                        ],
+                    },
+                    {
+                        fill: 'colorA',
+                        data: [
+                            {
+                                majorCategory: 'categoryD',
+                                minorCategory: 'categoryA',
+                                count: 2,
+                                x: 0,
+                                y: 2,
+                                percentage: 33.33,
+                            },
+                            {
+                                majorCategory: 'categoryC',
+                                minorCategory: 'categoryA',
+                                count: 2,
+                                x: 25,
+                                y: 2,
+                                percentage: 28.57,
+                            },
+                        ],
+                    },
+                    {
+                        fill: 'colorB',
+                        data: [
+                            {
+                                majorCategory: 'categoryD',
+                                minorCategory: 'categoryB',
+                                count: 2,
+                                x: 0,
+                                y: 2,
+                                percentage: 33.33,
+                            },
+                            {
+                                majorCategory: 'categoryC',
+                                minorCategory: 'categoryB',
+                                count: 3,
+                                x: 25,
+                                y: 3,
+                                percentage: 42.86,
+                            },
+                        ],
+                    },
+                ],
+                'given minor and major order'
+            );
 
-            assert.deepEqual(makeBarSpecs(
-                multipleValueHorzBarsData, categoryOrder, categoryOrder, getColor, categoryCoord, true, true, true
-            ), [{
-                fill: "colorB",
-                data:[{
-                    majorCategory: "categoryD", minorCategory:"categoryB",
-                    count: 2, x: 0, y:33.33, percentage: 33.33
-                },{
-                    majorCategory: "categoryC", minorCategory:"categoryB",
-                    count: 3, x: 25, y:42.86, percentage: 42.86
-                }]
-            },{
-                fill: "colorA",
-                data: [{
-                    majorCategory: "categoryD", minorCategory:"categoryA",
-                    count: 2, x: 0, y:33.33, percentage: 33.33
-                },{
-                    majorCategory: "categoryC", minorCategory:"categoryA",
-                    count: 2, x: 25, y:28.57, percentage: 28.57
-                }]
-            },{
-                fill: "colorE",
-                data:[{
-                    majorCategory: "categoryD", minorCategory:"categoryE",
-                    count: 2, x: 0, y:33.33, percentage: 33.33
-                },{
-                    majorCategory: "categoryC", minorCategory:"categoryE",
-                    count: 2, x: 25, y:28.57, percentage: 28.57
-                }]
-            }], "given minor and major order, percentages");
+            assert.deepEqual(
+                makeBarSpecs(
+                    multipleValueHorzBarsData,
+                    categoryOrder,
+                    categoryOrder,
+                    getColor,
+                    categoryCoord,
+                    true,
+                    true,
+                    true
+                ),
+                [
+                    {
+                        fill: 'colorB',
+                        data: [
+                            {
+                                majorCategory: 'categoryD',
+                                minorCategory: 'categoryB',
+                                count: 2,
+                                x: 0,
+                                y: 33.33,
+                                percentage: 33.33,
+                            },
+                            {
+                                majorCategory: 'categoryC',
+                                minorCategory: 'categoryB',
+                                count: 3,
+                                x: 25,
+                                y: 42.86,
+                                percentage: 42.86,
+                            },
+                        ],
+                    },
+                    {
+                        fill: 'colorA',
+                        data: [
+                            {
+                                majorCategory: 'categoryD',
+                                minorCategory: 'categoryA',
+                                count: 2,
+                                x: 0,
+                                y: 33.33,
+                                percentage: 33.33,
+                            },
+                            {
+                                majorCategory: 'categoryC',
+                                minorCategory: 'categoryA',
+                                count: 2,
+                                x: 25,
+                                y: 28.57,
+                                percentage: 28.57,
+                            },
+                        ],
+                    },
+                    {
+                        fill: 'colorE',
+                        data: [
+                            {
+                                majorCategory: 'categoryD',
+                                minorCategory: 'categoryE',
+                                count: 2,
+                                x: 0,
+                                y: 33.33,
+                                percentage: 33.33,
+                            },
+                            {
+                                majorCategory: 'categoryC',
+                                minorCategory: 'categoryE',
+                                count: 2,
+                                x: 25,
+                                y: 28.57,
+                                percentage: 28.57,
+                            },
+                        ],
+                    },
+                ],
+                'given minor and major order, percentages'
+            );
         });
     });
-});
\ No newline at end of file
+});
diff --git a/src/shared/components/plots/MultipleCategoryBarPlotUtils.ts b/src/shared/components/plots/MultipleCategoryBarPlotUtils.ts
index 961c3ffd343..1b6edecf883 100644
--- a/src/shared/components/plots/MultipleCategoryBarPlotUtils.ts
+++ b/src/shared/components/plots/MultipleCategoryBarPlotUtils.ts
@@ -1,79 +1,91 @@
 import { IStringAxisData } from '../../../pages/resultsView/plots/PlotsTabUtils';
-import _ from "lodash";
+import _ from 'lodash';
 import { IMultipleCategoryBarPlotData } from './MultipleCategoryBarPlot';
 
 export function makePlotData(
-    horzData:IStringAxisData["data"],
-    vertData:IStringAxisData["data"],
-    horizontalBars:boolean
+    horzData: IStringAxisData['data'],
+    vertData: IStringAxisData['data'],
+    horizontalBars: boolean
 ) {
-    let majorCategoryData:IStringAxisData["data"];
-        let minorCategoryData:IStringAxisData["data"];
-        if (horizontalBars) {
-            majorCategoryData = vertData;
-            minorCategoryData = horzData;
-        } else {
-            majorCategoryData = horzData;
-            minorCategoryData = vertData;
-        }
-        const sampleToMinorCategories:{[sampleKey:string]:string[]} = _.chain(minorCategoryData)
-            .keyBy("uniqueSampleKey")
-            .mapValues(d=>([] as any).concat(d.value))
-            .value();
+    let majorCategoryData: IStringAxisData['data'];
+    let minorCategoryData: IStringAxisData['data'];
+    if (horizontalBars) {
+        majorCategoryData = vertData;
+        minorCategoryData = horzData;
+    } else {
+        majorCategoryData = horzData;
+        minorCategoryData = vertData;
+    }
+    const sampleToMinorCategories: { [sampleKey: string]: string[] } = _.chain(
+        minorCategoryData
+    )
+        .keyBy('uniqueSampleKey')
+        .mapValues(d => ([] as any).concat(d.value))
+        .value();
 
-        const usedMajorCategories:any = {};
-        const categoryToCounts:{[minor:string]:{[major:string]:number}} = {};
-        for (const d of majorCategoryData) {
-            const minorCategories = sampleToMinorCategories[d.uniqueSampleKey];
-            if (!minorCategories) {
-                continue;
-            }
-            const majorCategories = ([] as any).concat(d.value);
-            for (const cat of minorCategories) {
-                categoryToCounts[cat] = categoryToCounts[cat] || {};
-                for (const countCat of majorCategories) {
-                    usedMajorCategories[countCat] = true;
-                    categoryToCounts[cat][countCat] = categoryToCounts[cat][countCat] || 0;
-                    categoryToCounts[cat][countCat] += 1;
-                }
+    const usedMajorCategories: any = {};
+    const categoryToCounts: {
+        [minor: string]: { [major: string]: number };
+    } = {};
+    for (const d of majorCategoryData) {
+        const minorCategories = sampleToMinorCategories[d.uniqueSampleKey];
+        if (!minorCategories) {
+            continue;
+        }
+        const majorCategories = ([] as any).concat(d.value);
+        for (const cat of minorCategories) {
+            categoryToCounts[cat] = categoryToCounts[cat] || {};
+            for (const countCat of majorCategories) {
+                usedMajorCategories[countCat] = true;
+                categoryToCounts[cat][countCat] =
+                    categoryToCounts[cat][countCat] || 0;
+                categoryToCounts[cat][countCat] += 1;
             }
         }
+    }
 
-        const majorCategoryTotalCounts:{[id:string]:number} = {}
-        // ensure entries for all used minor categories - we need 0 entries for those major/minor combos we didnt see
-        _.forEach(usedMajorCategories, (z, major)=>{
-            let totalCount = 0;
-            _.forEach(categoryToCounts, majorCounts=>{
-                majorCounts[major] = majorCounts[major] || 0;
-                totalCount += majorCounts[major];
-            });
-            majorCategoryTotalCounts[major] = totalCount;
+    const majorCategoryTotalCounts: { [id: string]: number } = {};
+    // ensure entries for all used minor categories - we need 0 entries for those major/minor combos we didnt see
+    _.forEach(usedMajorCategories, (z, major) => {
+        let totalCount = 0;
+        _.forEach(categoryToCounts, majorCounts => {
+            majorCounts[major] = majorCounts[major] || 0;
+            totalCount += majorCounts[major];
         });
+        majorCategoryTotalCounts[major] = totalCount;
+    });
 
-        // turn counts into data
-        let data = _.map(categoryToCounts, (countsMap:{[majorCategory:string]:number}, minorCategory:string)=>{
+    // turn counts into data
+    let data = _.map(
+        categoryToCounts,
+        (
+            countsMap: { [majorCategory: string]: number },
+            minorCategory: string
+        ) => {
             let counts = _.map(countsMap, (count, majorCategory) => {
-                const percentage = (count / majorCategoryTotalCounts[majorCategory]) * 100;
+                const percentage =
+                    (count / majorCategoryTotalCounts[majorCategory]) * 100;
                 return {
                     majorCategory,
                     count,
-                    percentage:parseFloat(percentage.toFixed(2))
-                }
+                    percentage: parseFloat(percentage.toFixed(2)),
+                };
             });
             return {
                 minorCategory,
-                counts
+                counts,
             };
-        });
-        return data;
+        }
+    );
+    return data;
 }
 
 export function sortDataByCategory<D>(
-    data:D[],
-    getCategory:(d:D)=>string,
-    categoryOrder:{[cat:string]:number} | undefined
+    data: D[],
+    getCategory: (d: D) => string,
+    categoryOrder: { [cat: string]: number } | undefined
 ) {
-    return _.sortBy(data, d=>{
+    return _.sortBy(data, d => {
         const category = getCategory(d);
         if (categoryOrder) {
             if (category in categoryOrder) {
@@ -84,31 +96,42 @@ export function sortDataByCategory<D>(
         } else {
             return category;
         }
-    })
+    });
 }
 
 export function makeBarSpecs(
     data: IMultipleCategoryBarPlotData[],
-    minorCategoryOrder:{[cat:string]:number} | undefined,
-    majorCategoryOrder:{[cat:string]:number} | undefined,
-    getColor:(minorCategory:string)=>string,
-    categoryCoord:(categoryIndex:number)=>number,
-    horizontalBars:boolean,
-    stacked:boolean,
-    percentage:boolean
-):{
-    fill: string,
-    data:{ x:number, y: number, majorCategory: string, minorCategory:string, count:number, percentage:number}[] // one data per major category, in correct order - either specified, or alphabetical
-}[] // one bar spec per minor category, in correct order - either specified, or alphabetical 
-{
-    data = sortDataByCategory(data, d=>d.minorCategory, minorCategoryOrder);
+    minorCategoryOrder: { [cat: string]: number } | undefined,
+    majorCategoryOrder: { [cat: string]: number } | undefined,
+    getColor: (minorCategory: string) => string,
+    categoryCoord: (categoryIndex: number) => number,
+    horizontalBars: boolean,
+    stacked: boolean,
+    percentage: boolean
+): {
+    fill: string;
+    data: {
+        x: number;
+        y: number;
+        majorCategory: string;
+        minorCategory: string;
+        count: number;
+        percentage: number;
+    }[]; // one data per major category, in correct order - either specified, or alphabetical
+}[] {
+    // one bar spec per minor category, in correct order - either specified, or alphabetical
+    data = sortDataByCategory(data, d => d.minorCategory, minorCategoryOrder);
     // reverse the order of stacked or horizontal bars
     if ((!horizontalBars && stacked) || (horizontalBars && !stacked)) {
         data = _.reverse(data);
     }
-    return data.map(({ minorCategory, counts })=>{
+    return data.map(({ minorCategory, counts }) => {
         const fill = getColor(minorCategory);
-        const sortedCounts = sortDataByCategory(counts, d=>d.majorCategory, majorCategoryOrder);
+        const sortedCounts = sortDataByCategory(
+            counts,
+            d => d.majorCategory,
+            majorCategoryOrder
+        );
         return {
             fill,
             data: sortedCounts.map((obj, index) => ({
@@ -117,8 +140,8 @@ export function makeBarSpecs(
                 majorCategory: obj.majorCategory,
                 minorCategory: minorCategory,
                 count: obj.count,
-                percentage: obj.percentage
-            }))
+                percentage: obj.percentage,
+            })),
         };
     });
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/plots/PlotUtils.spec.ts b/src/shared/components/plots/PlotUtils.spec.ts
index 7de7e998a94..b5fb17b9c1c 100644
--- a/src/shared/components/plots/PlotUtils.spec.ts
+++ b/src/shared/components/plots/PlotUtils.spec.ts
@@ -1,10 +1,13 @@
-import {assert} from "chai";
-import {computeCorrelationPValue, getDeterministicRandomNumber} from "./PlotUtils";
+import { assert } from 'chai';
+import {
+    computeCorrelationPValue,
+    getDeterministicRandomNumber,
+} from './PlotUtils';
 
-describe("PlotUtils", ()=>{
-    describe("getDeterministicRandomNumber", ()=>{
-        it("returns numbers between specified range", ()=>{
-            for (let i=0; i<100; i++) {
+describe('PlotUtils', () => {
+    describe('getDeterministicRandomNumber', () => {
+        it('returns numbers between specified range', () => {
+            for (let i = 0; i < 100; i++) {
                 const r1 = getDeterministicRandomNumber(i);
                 assert.isTrue(r1 >= 0 && r1 <= 1);
                 const r2 = getDeterministicRandomNumber(i, [-1, 6]);
@@ -13,17 +16,26 @@ describe("PlotUtils", ()=>{
                 assert.isTrue(r3 >= 0.5 && r3 <= 0.8);
             }
         });
-        it("returns same result for same seed (deterministic)", ()=>{
-            for (let i=0; i<100; i++) {
-                assert.equal(getDeterministicRandomNumber(i), getDeterministicRandomNumber(i));
-                assert.equal(getDeterministicRandomNumber(i), getDeterministicRandomNumber(i));
-                assert.equal(getDeterministicRandomNumber(i), getDeterministicRandomNumber(i));
+        it('returns same result for same seed (deterministic)', () => {
+            for (let i = 0; i < 100; i++) {
+                assert.equal(
+                    getDeterministicRandomNumber(i),
+                    getDeterministicRandomNumber(i)
+                );
+                assert.equal(
+                    getDeterministicRandomNumber(i),
+                    getDeterministicRandomNumber(i)
+                );
+                assert.equal(
+                    getDeterministicRandomNumber(i),
+                    getDeterministicRandomNumber(i)
+                );
             }
         });
     });
 
-    describe("computeCorrelationPValue", ()=>{
-        it("gives the correct result on sample data", ()=>{
+    describe('computeCorrelationPValue', () => {
+        it('gives the correct result on sample data', () => {
             // source: https://www.wessa.net/rwasp_spearman.wasp
             assert.approximately(
                 computeCorrelationPValue(-0.423285542595266, 23),
@@ -32,4 +44,4 @@ describe("PlotUtils", ()=>{
             );
         });
     });
-});
\ No newline at end of file
+});
diff --git a/src/shared/components/plots/PlotUtils.ts b/src/shared/components/plots/PlotUtils.ts
index 1fadd428390..4e5a995a49e 100644
--- a/src/shared/components/plots/PlotUtils.ts
+++ b/src/shared/components/plots/PlotUtils.ts
@@ -1,105 +1,123 @@
-import _ from "lodash";
+import _ from 'lodash';
 
 import Timer = NodeJS.Timer;
-import jStat from "jStat";
-import { IPlotSampleData, IThreshold1D, IWaterfallPlotData, IScatterPlotData, IBoxScatterPlotPoint, IThreshold2D, IValue1D, IValue2D } from 'pages/resultsView/plots/PlotsTabUtils';
-import { IBoxScatterPlotData } from "./BoxScatterPlot";
-export function getDeterministicRandomNumber(seed:number, range?:[number, number]) {
+import jStat from 'jStat';
+import {
+    IPlotSampleData,
+    IThreshold1D,
+    IWaterfallPlotData,
+    IScatterPlotData,
+    IBoxScatterPlotPoint,
+    IThreshold2D,
+    IValue1D,
+    IValue2D,
+} from 'pages/resultsView/plots/PlotsTabUtils';
+import { IBoxScatterPlotData } from './BoxScatterPlot';
+export function getDeterministicRandomNumber(
+    seed: number,
+    range?: [number, number]
+) {
     // source: https://stackoverflow.com/a/23304189
-    seed = Math.sin(seed)*10000;
+    seed = Math.sin(seed) * 10000;
     let r = seed - Math.floor(seed); // between 0 and 1
     if (range) {
-        r = r*(range[1] - range[0]) + range[0];
+        r = r * (range[1] - range[0]) + range[0];
     }
     return r;
 }
 
-function getSeedFromUniqueKey(uniqueKey:string) {
-    let hash = 0, i, chr;
+function getSeedFromUniqueKey(uniqueKey: string) {
+    let hash = 0,
+        i,
+        chr;
     if (uniqueKey.length === 0) return hash;
     for (i = 0; i < uniqueKey.length; i++) {
-        chr   = uniqueKey.charCodeAt(i);
-        hash  = ((hash << 5) - hash) + chr;
+        chr = uniqueKey.charCodeAt(i);
+        hash = (hash << 5) - hash + chr;
         hash |= 0; // Convert to 32bit integer
     }
     return hash;
 }
 
-export function getJitterForCase(uniqueKey:string) {
+export function getJitterForCase(uniqueKey: string) {
     const seed = getSeedFromUniqueKey(uniqueKey);
-    return getDeterministicRandomNumber(seed, [-1,1]);
+    return getDeterministicRandomNumber(seed, [-1, 1]);
 }
 
-
-export function makeMouseEvents(self:{ tooltipModel: any, pointHovered: boolean}) {
-    let disappearTimeout:Timer | null = null;
+export function makeMouseEvents(self: {
+    tooltipModel: any;
+    pointHovered: boolean;
+}) {
+    let disappearTimeout: Timer | null = null;
     const disappearDelayMs = 250;
 
-    return [{
-        target: "data",
-        eventHandlers: {
-            onMouseOver: () => {
-                return [
-                    {
-                        target: "data",
-                        mutation: (props: any) => {
-                            self.tooltipModel = props;
-                            self.pointHovered = true;
+    return [
+        {
+            target: 'data',
+            eventHandlers: {
+                onMouseOver: () => {
+                    return [
+                        {
+                            target: 'data',
+                            mutation: (props: any) => {
+                                self.tooltipModel = props;
+                                self.pointHovered = true;
 
-                            if (disappearTimeout !== null) {
-                                clearTimeout(disappearTimeout);
-                                disappearTimeout = null;
-                            }
+                                if (disappearTimeout !== null) {
+                                    clearTimeout(disappearTimeout);
+                                    disappearTimeout = null;
+                                }
 
-                            return { active: true };
-                        }
-                    }
-                ];
-            },
-            onMouseOut: () => {
-                return [
-                    {
-                        target: "data",
-                        mutation: () => {
-                            if (disappearTimeout !== null) {
-                                clearTimeout(disappearTimeout);
-                            }
+                                return { active: true };
+                            },
+                        },
+                    ];
+                },
+                onMouseOut: () => {
+                    return [
+                        {
+                            target: 'data',
+                            mutation: () => {
+                                if (disappearTimeout !== null) {
+                                    clearTimeout(disappearTimeout);
+                                }
 
-                            disappearTimeout = setTimeout(()=>{
-                                self.pointHovered = false;
-                            }, disappearDelayMs);
+                                disappearTimeout = setTimeout(() => {
+                                    self.pointHovered = false;
+                                }, disappearDelayMs);
 
-                            return { active: false };
-                        }
-                    }
-                ];
-            }
-        }
-    }];
+                                return { active: false };
+                            },
+                        },
+                    ];
+                },
+            },
+        },
+    ];
 }
 
 export function makeScatterPlotSizeFunction<D>(
-    highlight?:(d:D)=>boolean,
-    size?:number | ((d:D, active:Boolean, isHighlighted?:boolean)=>number)
+    highlight?: (d: D) => boolean,
+    size?: number | ((d: D, active: Boolean, isHighlighted?: boolean) => number)
 ) {
     // need to regenerate this function whenever highlight changes in order to trigger immediate Victory rerender
     if (size) {
-        if (highlight && typeof size === "function") {
-            return (d:D, active:boolean)=>size(d, active, highlight(d));
+        if (highlight && typeof size === 'function') {
+            return (d: D, active: boolean) => size(d, active, highlight(d));
         } else {
             return size;
         }
     } else {
-        return (d:D, active:boolean)=>{
-            return (active || !!(highlight && highlight(d)) ? 6 : 3);
+        return (d: D, active: boolean) => {
+            return active || !!(highlight && highlight(d)) ? 6 : 3;
         };
     }
 }
 
 export function scatterPlotSize(
-    d:any,
-    active:boolean,
-    isHighlighted:boolean
+    d: any,
+    active: boolean,
+    isHighlighted: boolean
 ) {
     if (isHighlighted) {
         return 8;
@@ -110,7 +128,7 @@ export function scatterPlotSize(
     }
 }
 
-function darkenHexChannel(c:string) {
+function darkenHexChannel(c: string) {
     let cNum = parseInt(c, 16);
     cNum *= 0.95;
     cNum = Math.round(cNum);
@@ -119,8 +137,8 @@ function darkenHexChannel(c:string) {
         c = '0' + c;
     }
     return c;
-};
-function darkenHexColor(str:string) {
+}
+function darkenHexColor(str: string) {
     let r = str[1] + str[2];
     let g = str[3] + str[4];
     let b = str[5] + str[6];
@@ -128,20 +146,45 @@ function darkenHexColor(str:string) {
     g = darkenHexChannel(g);
     b = darkenHexChannel(b);
     return '#' + r + g + b;
-};
+}
 
-export function makeUniqueColorGetter(init_used_colors?:string[]) {
+export function makeUniqueColorGetter(init_used_colors?: string[]) {
     init_used_colors = init_used_colors || [];
-    const colors = ["#3366cc", "#dc3912", "#ff9900", "#109618",
-        "#990099", "#0099c6", "#dd4477", "#66aa00",
-        "#b82e2e", "#316395", "#994499", "#22aa99",
-        "#aaaa11", "#6633cc", "#e67300", "#8b0707",
-        "#651067", "#329262", "#5574a6", "#3b3eac",
-        "#b77322", "#16d620", "#b91383", "#f4359e",
-        "#9c5935", "#a9c413", "#2a778d", "#668d1c",
-        "#bea413", "#0c5922", "#743411"]; // Source: D3
+    const colors = [
+        '#3366cc',
+        '#dc3912',
+        '#ff9900',
+        '#109618',
+        '#990099',
+        '#0099c6',
+        '#dd4477',
+        '#66aa00',
+        '#b82e2e',
+        '#316395',
+        '#994499',
+        '#22aa99',
+        '#aaaa11',
+        '#6633cc',
+        '#e67300',
+        '#8b0707',
+        '#651067',
+        '#329262',
+        '#5574a6',
+        '#3b3eac',
+        '#b77322',
+        '#16d620',
+        '#b91383',
+        '#f4359e',
+        '#9c5935',
+        '#a9c413',
+        '#2a778d',
+        '#668d1c',
+        '#bea413',
+        '#0c5922',
+        '#743411',
+    ]; // Source: D3
     let index = 0;
-    const used_colors:{[color:string]:boolean} = {};
+    const used_colors: { [color: string]: boolean } = {};
     for (const color of init_used_colors) {
         used_colors[color] = true;
     }
@@ -160,56 +203,77 @@ export function makeUniqueColorGetter(init_used_colors?:string[]) {
 
         return next_color;
     };
-};
+}
 
 export function separateScatterDataByAppearance<D>(
-    data:D[],
-    fill:string | ((d:D)=>string),
-    stroke:string | ((d:D)=>string),
-    strokeWidth:number | ((d:D)=>number),
-    strokeOpacity:number | ((d:D)=>number),
-    fillOpacity:number | ((d:D)=>number),
-    symbol:string | ((d:D)=>string),
-    zIndexSortBy?:((d:D)=>any)[] // second argument to _.sortBy
-):{
-    data:D[],
-    fill:string,
-    stroke:string,
-    strokeWidth:number,
-    strokeOpacity:number,
-    fillOpacity:number,
-    symbol:string
+    data: D[],
+    fill: string | ((d: D) => string),
+    stroke: string | ((d: D) => string),
+    strokeWidth: number | ((d: D) => number),
+    strokeOpacity: number | ((d: D) => number),
+    fillOpacity: number | ((d: D) => number),
+    symbol: string | ((d: D) => string),
+    zIndexSortBy?: ((d: D) => any)[] // second argument to _.sortBy
+): {
+    data: D[];
+    fill: string;
+    stroke: string;
+    strokeWidth: number;
+    strokeOpacity: number;
+    fillOpacity: number;
+    symbol: string;
 }[] {
-    let buckets:{
-        data:D[],
-        fill:string,
-        stroke:string,
-        strokeWidth:number,
-        strokeOpacity:number,
-        fillOpacity:number,
-        symbol:string,
-        sortBy:any[]
+    let buckets: {
+        data: D[];
+        fill: string;
+        stroke: string;
+        strokeWidth: number;
+        strokeOpacity: number;
+        fillOpacity: number;
+        symbol: string;
+        sortBy: any[];
     }[] = [];
 
-    let d_fill:string, d_stroke:string, d_strokeWidth:number, d_strokeOpacity:number, d_fillOpacity:number,
-        d_symbol:string, d_sortBy:any[], bucketFound:boolean;
+    let d_fill: string,
+        d_stroke: string,
+        d_strokeWidth: number,
+        d_strokeOpacity: number,
+        d_fillOpacity: number,
+        d_symbol: string,
+        d_sortBy: any[],
+        bucketFound: boolean;
 
     for (const datum of data) {
         // compute appearance for datum
-        d_fill = (typeof fill === "function" ? fill(datum) : fill);
-        d_stroke = (typeof stroke === "function" ? stroke(datum) : stroke);
-        d_strokeWidth = (typeof strokeWidth === "function" ? strokeWidth(datum) : strokeWidth);
-        d_strokeOpacity = (typeof strokeOpacity === "function" ? strokeOpacity(datum) : strokeOpacity);
-        d_fillOpacity = (typeof fillOpacity === "function" ? fillOpacity(datum) : fillOpacity);
-        d_symbol = (typeof symbol === "function" ? symbol(datum) : symbol);
-        d_sortBy = (zIndexSortBy ? zIndexSortBy.map(f=>f(datum)) : [1]);
+        d_fill = typeof fill === 'function' ? fill(datum) : fill;
+        d_stroke = typeof stroke === 'function' ? stroke(datum) : stroke;
+        d_strokeWidth =
+            typeof strokeWidth === 'function'
+                ? strokeWidth(datum)
+                : strokeWidth;
+        d_strokeOpacity =
+            typeof strokeOpacity === 'function'
+                ? strokeOpacity(datum)
+                : strokeOpacity;
+        d_fillOpacity =
+            typeof fillOpacity === 'function'
+                ? fillOpacity(datum)
+                : fillOpacity;
+        d_symbol = typeof symbol === 'function' ? symbol(datum) : symbol;
+        d_sortBy = zIndexSortBy ? zIndexSortBy.map(f => f(datum)) : [1];
 
         // look for existing bucket to put datum
         bucketFound = false;
         for (const bucket of buckets) {
-            if (bucket.fill === d_fill && bucket.stroke === d_stroke && bucket.strokeWidth === d_strokeWidth &&
-                    bucket.strokeOpacity === d_strokeOpacity && bucket.fillOpacity === d_fillOpacity &&
-                    bucket.symbol === d_symbol && _.isEqual(bucket.sortBy, d_sortBy)) {
+            if (
+                bucket.fill === d_fill &&
+                bucket.stroke === d_stroke &&
+                bucket.strokeWidth === d_strokeWidth &&
+                bucket.strokeOpacity === d_strokeOpacity &&
+                bucket.fillOpacity === d_fillOpacity &&
+                bucket.symbol === d_symbol &&
+                _.isEqual(bucket.sortBy, d_sortBy)
+            ) {
                 // if bucket with matching appearance exists, add to bucket
                 bucket.data.push(datum);
                 // mark bucket has been found so we dont need to add a bucket
@@ -221,22 +285,31 @@ export function separateScatterDataByAppearance<D>(
             // if no bucket found, add bucket, and put datum in it
             buckets.push({
                 data: [datum],
-                fill: d_fill, stroke: d_stroke, strokeWidth: d_strokeWidth,
-                strokeOpacity: d_strokeOpacity, fillOpacity: d_fillOpacity,
-                symbol: d_symbol, sortBy: d_sortBy
+                fill: d_fill,
+                stroke: d_stroke,
+                strokeWidth: d_strokeWidth,
+                strokeOpacity: d_strokeOpacity,
+                fillOpacity: d_fillOpacity,
+                symbol: d_symbol,
+                sortBy: d_sortBy,
             });
         }
     }
 
     if (zIndexSortBy) {
         // sort by sortBy
-        const sortBy = zIndexSortBy.map((f, index)=>((bucket:typeof buckets[0])=>bucket.sortBy[index]));
+        const sortBy = zIndexSortBy.map(
+            (f, index) => (bucket: typeof buckets[0]) => bucket.sortBy[index]
+        );
         buckets = _.sortBy<typeof buckets[0]>(buckets, sortBy);
     }
     return buckets;
 }
 
-export function computeCorrelationPValue(correlation:number, numSamples:number) {
+export function computeCorrelationPValue(
+    correlation: number,
+    numSamples: number
+) {
     const R = correlation;
     if (Math.abs(R) === 1) {
         return 0;
@@ -245,29 +318,36 @@ export function computeCorrelationPValue(correlation:number, numSamples:number)
     const n = numSamples;
     if (n > 2) {
         // degrees of freedom has to be > 0
-        const tStatistic = Math.abs(R)*Math.sqrt((n - 2) / (1 - R*R)); // we know |R| < 1 so no divide by zero risk
+        const tStatistic = Math.abs(R) * Math.sqrt((n - 2) / (1 - R * R)); // we know |R| < 1 so no divide by zero risk
 
         // 2-sided t-test
         // have to pass in n-1 as # samples argument, to get jStat to internally use a t distribution with (n-2) DOF
-        return jStat.ttest(tStatistic, n-1, 2);
+        return jStat.ttest(tStatistic, n - 1, 2);
     } else {
         return null;
     }
 }
 
-export function dataPointIsLimited(point:IPlotSampleData):boolean {
+export function dataPointIsLimited(point: IPlotSampleData): boolean {
     if (instanceOf1DThresholdDataPoint(point)) {
-        return (!!(point as IThreshold1D).thresholdType);
+        return !!(point as IThreshold1D).thresholdType;
     } else if (instanceOf2DThresholdDataPoint(point)) {
-        return (!!(point as IThreshold2D).xThresholdType || !!(point as IThreshold2D).yThresholdType);
+        return (
+            !!(point as IThreshold2D).xThresholdType ||
+            !!(point as IThreshold2D).yThresholdType
+        );
     }
     return false;
 }
 
-export function instanceOf1DThresholdDataPoint(point: any): point is IThreshold1D {
+export function instanceOf1DThresholdDataPoint(
+    point: any
+): point is IThreshold1D {
     return 'thresholdType' in point;
-} 
+}
 
-export function instanceOf2DThresholdDataPoint(point: any): point is IThreshold2D {
+export function instanceOf2DThresholdDataPoint(
+    point: any
+): point is IThreshold2D {
     return 'xThresholdType' in point || 'yThresholdType' in point;
 }
diff --git a/src/shared/components/plots/ScatterPlot.tsx b/src/shared/components/plots/ScatterPlot.tsx
index 9e7309dbc99..5e6f1b3572e 100644
--- a/src/shared/components/plots/ScatterPlot.tsx
+++ b/src/shared/components/plots/ScatterPlot.tsx
@@ -1,127 +1,153 @@
-import _ from "lodash";
-import * as React from "react";
-import {observer, Observer} from "mobx-react";
-import bind from "bind-decorator";
-import {computed, observable} from "mobx";
-import CBIOPORTAL_VICTORY_THEME, {baseLabelStyles} from "../../theme/cBioPoralTheme";
+import _ from 'lodash';
+import * as React from 'react';
+import { observer, Observer } from 'mobx-react';
+import bind from 'bind-decorator';
+import { computed, observable } from 'mobx';
+import CBIOPORTAL_VICTORY_THEME, {
+    baseLabelStyles,
+} from '../../theme/cBioPoralTheme';
 import Timer = NodeJS.Timer;
-import {VictoryChart, VictoryAxis, VictoryScatter, VictoryLegend, VictoryLabel, VictoryLine} from "victory";
-import jStat from "jStat";
-import ScatterPlotTooltip from "./ScatterPlotTooltip";
-import {tickFormatNumeral} from "./TickUtils";
-import {computeCorrelationPValue, makeScatterPlotSizeFunction, separateScatterDataByAppearance, dataPointIsLimited as dataPointIsLimited} from "./PlotUtils";
-import {toConditionalPrecision} from "../../lib/NumberUtils";
-import {getRegressionComputations} from "./ScatterPlotUtils";
-import { IAxisLogScaleParams, IPlotSampleData } from 'pages/resultsView/plots/PlotsTabUtils';
-import ifNotDefined from "../../lib/ifNotDefined";
+import {
+    VictoryChart,
+    VictoryAxis,
+    VictoryScatter,
+    VictoryLegend,
+    VictoryLabel,
+    VictoryLine,
+} from 'victory';
+import jStat from 'jStat';
+import ScatterPlotTooltip from './ScatterPlotTooltip';
+import { tickFormatNumeral } from './TickUtils';
+import {
+    computeCorrelationPValue,
+    makeScatterPlotSizeFunction,
+    separateScatterDataByAppearance,
+    dataPointIsLimited,
+} from './PlotUtils';
+import { toConditionalPrecision } from '../../lib/NumberUtils';
+import { getRegressionComputations } from './ScatterPlotUtils';
+import {
+    IAxisLogScaleParams,
+    IPlotSampleData,
+} from 'pages/resultsView/plots/PlotsTabUtils';
+import ifNotDefined from '../../lib/ifNotDefined';
 
 export interface IBaseScatterPlotData {
-    x:number;
-    y:number;
+    x: number;
+    y: number;
 }
 
 export interface IScatterPlotProps<D extends IBaseScatterPlotData> {
-    svgId?:string;
-    title?:string;
+    svgId?: string;
+    title?: string;
     data: D[];
-    chartWidth:number;
-    chartHeight:number;
-    highlight?:(d:D)=>boolean;
-    fill?:string | ((d:D)=>string);
-    stroke?:string | ((d:D)=>string);
-    size?:number | ((d:D, active:boolean, isHighlighted?:boolean)=>number);
-    fillOpacity?:number | ((d:D)=>number);
-    strokeOpacity?:number | ((d:D)=>number);
-    strokeWidth?:number | ((d:D)=>number);
-    zIndexSortBy?:((d:D)=>any)[]; // second argument to _.sortBy
-    symbol?: string | ((d:D)=>string); // see http://formidable.com/open-source/victory/docs/victory-scatter/#symbol for options
-    tooltip?:(d:D)=>JSX.Element;
-    legendData?:{name:string|string[], symbol:any}[]; // see http://formidable.com/open-source/victory/docs/victory-legend/#data
+    chartWidth: number;
+    chartHeight: number;
+    highlight?: (d: D) => boolean;
+    fill?: string | ((d: D) => string);
+    stroke?: string | ((d: D) => string);
+    size?:
+        | number
+        | ((d: D, active: boolean, isHighlighted?: boolean) => number);
+    fillOpacity?: number | ((d: D) => number);
+    strokeOpacity?: number | ((d: D) => number);
+    strokeWidth?: number | ((d: D) => number);
+    zIndexSortBy?: ((d: D) => any)[]; // second argument to _.sortBy
+    symbol?: string | ((d: D) => string); // see http://formidable.com/open-source/victory/docs/victory-scatter/#symbol for options
+    tooltip?: (d: D) => JSX.Element;
+    legendData?: { name: string | string[]; symbol: any }[]; // see http://formidable.com/open-source/victory/docs/victory-legend/#data
     correlation?: {
         pearson: number;
         spearman: number;
     };
-    showRegressionLine?:boolean;
-    logX?:IAxisLogScaleParams|undefined;
-    logY?:IAxisLogScaleParams|undefined;
-    excludeLimitValuesFromCorrelation?:boolean; // if true, data points that are beyond threshold (e.g., '>8', have a `xThresholdType` or `yThresholdType` attribute) are not included in caluculation of the corr. efficient
-    useLogSpaceTicks?:boolean; // if log scale for an axis, then this prop determines whether the ticks are shown in post-log coordinate, or original data coordinate space
-    axisLabelX?:string;
-    axisLabelY?:string;
-    fontFamily?:string;
+    showRegressionLine?: boolean;
+    logX?: IAxisLogScaleParams | undefined;
+    logY?: IAxisLogScaleParams | undefined;
+    excludeLimitValuesFromCorrelation?: boolean; // if true, data points that are beyond threshold (e.g., '>8', have a `xThresholdType` or `yThresholdType` attribute) are not included in caluculation of the corr. efficient
+    useLogSpaceTicks?: boolean; // if log scale for an axis, then this prop determines whether the ticks are shown in post-log coordinate, or original data coordinate space
+    axisLabelX?: string;
+    axisLabelY?: string;
+    fontFamily?: string;
 }
 // constants related to the gutter
-const GUTTER_TEXT_STYLE = {fontFamily: baseLabelStyles.fontFamily, fontSize: baseLabelStyles.fontSize};
+const GUTTER_TEXT_STYLE = {
+    fontFamily: baseLabelStyles.fontFamily,
+    fontSize: baseLabelStyles.fontSize,
+};
 const CORRELATION_INFO_Y = 100; // experimentally determined
-const REGRESSION_STROKE = "#c43a31";
+const REGRESSION_STROKE = '#c43a31';
 const REGRESSION_STROKE_WIDTH = 2;
 const REGRESSION_EQUATION_Y = CORRELATION_INFO_Y + 95; // 95 ~= correlation height
 const LEGEND_TEXT_WIDTH = 107; // experimentally determined
 
-const DEFAULT_FONT_FAMILY = "Verdana,Arial,sans-serif";
+const DEFAULT_FONT_FAMILY = 'Verdana,Arial,sans-serif';
 const RIGHT_PADDING = 120; // room for correlation info and legend
 const NUM_AXIS_TICKS = 8;
 const PLOT_DATA_PADDING_PIXELS = 50;
 const LEFT_PADDING = 25;
 
 @observer
-export default class ScatterPlot<D extends IBaseScatterPlotData> extends React.Component<IScatterPlotProps<D>, {}> {
-    @observable.ref tooltipModel:any|null = null;
-    @observable pointHovered:boolean = false;
-    private mouseEvents:any = this.makeMouseEvents();
+export default class ScatterPlot<
+    D extends IBaseScatterPlotData
+> extends React.Component<IScatterPlotProps<D>, {}> {
+    @observable.ref tooltipModel: any | null = null;
+    @observable pointHovered: boolean = false;
+    private mouseEvents: any = this.makeMouseEvents();
 
-    @observable.ref private container:HTMLDivElement;
+    @observable.ref private container: HTMLDivElement;
 
     @bind
-    private containerRef(container:HTMLDivElement) {
+    private containerRef(container: HTMLDivElement) {
         this.container = container;
     }
 
     private makeMouseEvents() {
-        let disappearTimeout:Timer | null = null;
+        let disappearTimeout: Timer | null = null;
         const disappearDelayMs = 250;
 
-        return [{
-            target: "data",
-            eventHandlers: {
-                onMouseOver: () => {
-                    return [
-                        {
-                            target: "data",
-                            mutation: (props: any) => {
-                                this.tooltipModel = props;
-                                this.pointHovered = true;
-
-                                if (disappearTimeout !== null) {
-                                    clearTimeout(disappearTimeout);
-                                    disappearTimeout = null;
-                                }
-
-                                return { active: true };
-                            }
-                        }
-                    ];
+        return [
+            {
+                target: 'data',
+                eventHandlers: {
+                    onMouseOver: () => {
+                        return [
+                            {
+                                target: 'data',
+                                mutation: (props: any) => {
+                                    this.tooltipModel = props;
+                                    this.pointHovered = true;
+
+                                    if (disappearTimeout !== null) {
+                                        clearTimeout(disappearTimeout);
+                                        disappearTimeout = null;
+                                    }
+
+                                    return { active: true };
+                                },
+                            },
+                        ];
+                    },
+                    onMouseOut: () => {
+                        return [
+                            {
+                                target: 'data',
+                                mutation: () => {
+                                    if (disappearTimeout !== null) {
+                                        clearTimeout(disappearTimeout);
+                                    }
+
+                                    disappearTimeout = setTimeout(() => {
+                                        this.pointHovered = false;
+                                    }, disappearDelayMs);
+
+                                    return { active: false };
+                                },
+                            },
+                        ];
+                    },
                 },
-                onMouseOut: () => {
-                    return [
-                        {
-                            target: "data",
-                            mutation: () => {
-                                if (disappearTimeout !== null) {
-                                    clearTimeout(disappearTimeout);
-                                }
-
-                                disappearTimeout = setTimeout(()=>{
-                                    this.pointHovered = false;
-                                }, disappearDelayMs);
-
-                                return { active: false };
-                            }
-                        }
-                    ];
-                }
-            }
-        }];
+            },
+        ];
     }
 
     @computed get fontFamily() {
@@ -133,11 +159,11 @@ export default class ScatterPlot<D extends IBaseScatterPlotData> extends React.C
             return (
                 <VictoryLabel
                     style={{
-                        fontWeight:"bold",
+                        fontWeight: 'bold',
                         fontFamily: this.fontFamily,
-                        textAnchor: "middle"
+                        textAnchor: 'middle',
                     }}
-                    x={this.svgWidth/2}
+                    x={this.svgWidth / 2}
                     y="1.2em"
                     text={this.props.title}
                 />
@@ -183,33 +209,49 @@ export default class ScatterPlot<D extends IBaseScatterPlotData> extends React.C
         const x = this.legendX;
         return (
             <g>
-                <VictoryLabel  x={x + LEGEND_TEXT_WIDTH}
-                               y={CORRELATION_INFO_Y}
-                               textAnchor="end"
-                               text={`Spearman: ${this.spearmanCorr.toFixed(2)}`}
-                               style={GUTTER_TEXT_STYLE}
+                <VictoryLabel
+                    x={x + LEGEND_TEXT_WIDTH}
+                    y={CORRELATION_INFO_Y}
+                    textAnchor="end"
+                    text={`Spearman: ${this.spearmanCorr.toFixed(2)}`}
+                    style={GUTTER_TEXT_STYLE}
                 />
-                { (this.spearmanPval !== null) && <VictoryLabel  x={x + LEGEND_TEXT_WIDTH}
-                                                                 y={CORRELATION_INFO_Y}
-                                                                 textAnchor="end"
-                                                                 dy="2"
-                                                                 text={`(p = ${toConditionalPrecision(this.spearmanPval, 3, 0.01)})`}
-                                                                 style={GUTTER_TEXT_STYLE}
-                />}
-                <VictoryLabel  x={x + LEGEND_TEXT_WIDTH}
-                               y={CORRELATION_INFO_Y}
-                               textAnchor="end"
-                               dy="5"
-                               text={`Pearson: ${this.pearsonCorr.toFixed(2)}`}
-                               style={GUTTER_TEXT_STYLE}
+                {this.spearmanPval !== null && (
+                    <VictoryLabel
+                        x={x + LEGEND_TEXT_WIDTH}
+                        y={CORRELATION_INFO_Y}
+                        textAnchor="end"
+                        dy="2"
+                        text={`(p = ${toConditionalPrecision(
+                            this.spearmanPval,
+                            3,
+                            0.01
+                        )})`}
+                        style={GUTTER_TEXT_STYLE}
+                    />
+                )}
+                <VictoryLabel
+                    x={x + LEGEND_TEXT_WIDTH}
+                    y={CORRELATION_INFO_Y}
+                    textAnchor="end"
+                    dy="5"
+                    text={`Pearson: ${this.pearsonCorr.toFixed(2)}`}
+                    style={GUTTER_TEXT_STYLE}
                 />
-                { (this.pearsonPval !== null) && <VictoryLabel  x={x + LEGEND_TEXT_WIDTH}
-                                                                 y={CORRELATION_INFO_Y}
-                                                                 textAnchor="end"
-                                                                 dy="7"
-                                                                 text={`(p = ${toConditionalPrecision(this.pearsonPval, 3, 0.01)})`}
-                                                                 style={GUTTER_TEXT_STYLE}
-                />}
+                {this.pearsonPval !== null && (
+                    <VictoryLabel
+                        x={x + LEGEND_TEXT_WIDTH}
+                        y={CORRELATION_INFO_Y}
+                        textAnchor="end"
+                        dy="7"
+                        text={`(p = ${toConditionalPrecision(
+                            this.pearsonPval,
+                            3,
+                            0.01
+                        )})`}
+                        style={GUTTER_TEXT_STYLE}
+                    />
+                )}
             </g>
         );
     }
@@ -217,7 +259,7 @@ export default class ScatterPlot<D extends IBaseScatterPlotData> extends React.C
     private get regressionLineEquation(): JSX.Element | null {
         if (!this.props.showRegressionLine) {
             return null;
-        }        
+        }
 
         const equation = this.regressionLineComputations.string;
         const r2 = `R² = ${this.regressionLineComputations.r2}`;
@@ -254,15 +296,17 @@ export default class ScatterPlot<D extends IBaseScatterPlotData> extends React.C
                 />
             </g>
         );
-    } 
+    }
 
     @computed get splitData() {
-
         // when limit values are shown in the legend, exclude
         // these points from calculations of correlation coefficients
-        const data = this.props.excludeLimitValuesFromCorrelation?
-            _.filter(this.props.data, (d:IPlotSampleData)=>!dataPointIsLimited(d)):
-            this.props.data;
+        const data = this.props.excludeLimitValuesFromCorrelation
+            ? _.filter(
+                  this.props.data,
+                  (d: IPlotSampleData) => !dataPointIsLimited(d)
+              )
+            : this.props.data;
 
         const x = [];
         const y = [];
@@ -275,8 +319,14 @@ export default class ScatterPlot<D extends IBaseScatterPlotData> extends React.C
 
     @computed get plotDomain() {
         // data extremes
-        const max = {x:Number.NEGATIVE_INFINITY, y:Number.NEGATIVE_INFINITY};
-        const min = {x:Number.POSITIVE_INFINITY, y:Number.POSITIVE_INFINITY};
+        const max = {
+            x: Number.NEGATIVE_INFINITY,
+            y: Number.NEGATIVE_INFINITY,
+        };
+        const min = {
+            x: Number.POSITIVE_INFINITY,
+            y: Number.POSITIVE_INFINITY,
+        };
         for (const d of this.props.data) {
             max.x = Math.max(d.x, max.x);
             max.y = Math.max(d.y, max.y);
@@ -293,7 +343,7 @@ export default class ScatterPlot<D extends IBaseScatterPlotData> extends React.C
         }
         return {
             x: [min.x, max.x],
-            y: [min.y, max.y]
+            y: [min.y, max.y],
         };
     }
 
@@ -304,10 +354,10 @@ export default class ScatterPlot<D extends IBaseScatterPlotData> extends React.C
             let x = this.splitData.x;
             let y = this.splitData.y;
             if (this.props.logX) {
-                x = x.map(d=>this.props.logX!.fLogScale(d, 0));
+                x = x.map(d => this.props.logX!.fLogScale(d, 0));
             }
             if (this.props.logY) {
-                y = y.map(d=>this.props.logY!.fLogScale(d, 0));
+                y = y.map(d => this.props.logY!.fLogScale(d, 0));
             }
             return jStat.corrcoeff(x, y);
         }
@@ -323,11 +373,17 @@ export default class ScatterPlot<D extends IBaseScatterPlotData> extends React.C
     }
 
     @computed get spearmanPval() {
-        return computeCorrelationPValue(this.spearmanCorr, this.splitData.x.length);
+        return computeCorrelationPValue(
+            this.spearmanCorr,
+            this.splitData.x.length
+        );
     }
 
     @computed get pearsonPval() {
-        return computeCorrelationPValue(this.pearsonCorr, this.splitData.x.length);
+        return computeCorrelationPValue(
+            this.pearsonCorr,
+            this.splitData.x.length
+        );
     }
 
     @computed get rightPadding() {
@@ -343,7 +399,7 @@ export default class ScatterPlot<D extends IBaseScatterPlotData> extends React.C
     }
 
     @bind
-    private x(d:D) {
+    private x(d: D) {
         if (this.props.logX) {
             return this.props.logX!.fLogScale(d.x, 0);
         } else {
@@ -352,7 +408,7 @@ export default class ScatterPlot<D extends IBaseScatterPlotData> extends React.C
     }
 
     @bind
-    private y(d:D) {
+    private y(d: D) {
         if (this.props.logY) {
             return this.props.logY!.fLogScale(d.y, 0);
         } else {
@@ -367,73 +423,88 @@ export default class ScatterPlot<D extends IBaseScatterPlotData> extends React.C
         return makeScatterPlotSizeFunction(highlight, size);
     }
 
-    private tickFormat(t:number, ticks:number[], logScaleFunc:IAxisLogScaleParams|undefined) {
+    private tickFormat(
+        t: number,
+        ticks: number[],
+        logScaleFunc: IAxisLogScaleParams | undefined
+    ) {
         if (logScaleFunc && !this.props.useLogSpaceTicks) {
             t = logScaleFunc.fInvLogScale(t);
-            ticks = ticks.map(x=>logScaleFunc.fInvLogScale(x));
+            ticks = ticks.map(x => logScaleFunc.fInvLogScale(x));
         }
         return tickFormatNumeral(t, ticks);
     }
 
     @bind
-    private tickFormatX(t:number, i:number, ticks:number[]) {
+    private tickFormatX(t: number, i: number, ticks: number[]) {
         return this.tickFormat(t, ticks, this.props.logX);
     }
 
     @bind
-    private tickFormatY(t:number, i:number, ticks:number[]) {
+    private tickFormatY(t: number, i: number, ticks: number[]) {
         return this.tickFormat(t, ticks, this.props.logY);
     }
 
     @computed get data() {
         return separateScatterDataByAppearance(
             this.props.data,
-            ifNotDefined(this.props.fill, "0x000000"),
-            ifNotDefined(this.props.stroke, "0x000000"),
+            ifNotDefined(this.props.fill, '0x000000'),
+            ifNotDefined(this.props.stroke, '0x000000'),
             ifNotDefined(this.props.strokeWidth, 0),
             ifNotDefined(this.props.strokeOpacity, 1),
             ifNotDefined(this.props.fillOpacity, 1),
-            ifNotDefined(this.props.symbol, "circle"),
+            ifNotDefined(this.props.symbol, 'circle'),
             this.props.zIndexSortBy
         );
     }
 
     @computed private get regressionLineComputations() {
-        const data = this.props.data.map(d=>([this.x(d), this.y(d)] as [number, number]));
+        const data = this.props.data.map(
+            d => [this.x(d), this.y(d)] as [number, number]
+        );
         return getRegressionComputations(data);
     }
 
     private get regressionLine() {
         // when limit values are shown in the legend, exclude
         // these points from calculation of regression line
-        const regressionData:D[] = this.props.excludeLimitValuesFromCorrelation?
-        _.filter(this.props.data, (d:IPlotSampleData)=>!dataPointIsLimited(d)):
-        this.props.data;
+        const regressionData: D[] = this.props.excludeLimitValuesFromCorrelation
+            ? _.filter(
+                  this.props.data,
+                  (d: IPlotSampleData) => !dataPointIsLimited(d)
+              )
+            : this.props.data;
 
         if (this.props.showRegressionLine && regressionData.length >= 2) {
             const regressionLineComputations = this.regressionLineComputations;
-            const y = (x:number)=>regressionLineComputations.predict(x)[1];
+            const y = (x: number) => regressionLineComputations.predict(x)[1];
             const labelX = 0.7;
-            const xPoints = [this.plotDomain.x[0], this.plotDomain.x[0]*(1-labelX) + this.plotDomain.x[1]*labelX, this.plotDomain.x[1]];
-            const data:any[] = xPoints.map(x=>({ x, y:y(x), label:""}));
+            const xPoints = [
+                this.plotDomain.x[0],
+                this.plotDomain.x[0] * (1 - labelX) +
+                    this.plotDomain.x[1] * labelX,
+                this.plotDomain.x[1],
+            ];
+            const data: any[] = xPoints.map(x => ({ x, y: y(x), label: '' }));
             return [
                 <VictoryLine
                     style={{
                         data: {
-                            stroke: REGRESSION_STROKE, strokeWidth: REGRESSION_STROKE_WIDTH
+                            stroke: REGRESSION_STROKE,
+                            strokeWidth: REGRESSION_STROKE_WIDTH,
                         },
                         labels: {
                             fontSize: 15,
-                            fill: "#000000",
-                            stroke: "#ffffff",
-                            strokeWidth:6,
-                            fontWeight:"bold",
-                            paintOrder:"stroke"
-                        }
+                            fill: '#000000',
+                            stroke: '#ffffff',
+                            strokeWidth: 6,
+                            fontWeight: 'bold',
+                            paintOrder: 'stroke',
+                        },
                     }}
                     data={data}
-                    labelComponent={<VictoryLabel lineHeight={1.3}/>}
-                />
+                    labelComponent={<VictoryLabel lineHeight={1.3} />}
+                />,
             ];
         } else {
             return null;
@@ -445,23 +516,21 @@ export default class ScatterPlot<D extends IBaseScatterPlotData> extends React.C
         return (
             <div
                 ref={this.containerRef}
-                style={{width: this.svgWidth, height: this.svgHeight}}
+                style={{ width: this.svgWidth, height: this.svgHeight }}
             >
                 <svg
-                    id={this.props.svgId || ""}
+                    id={this.props.svgId || ''}
                     style={{
                         width: this.svgWidth,
                         height: this.svgHeight,
-                        pointerEvents: "all"
+                        pointerEvents: 'all',
                     }}
                     height={this.svgHeight}
                     width={this.svgWidth}
                     role="img"
                     viewBox={`0 0 ${this.svgWidth} ${this.svgHeight}`}
                 >
-                    <g
-                        transform={`translate(${LEFT_PADDING},0)`}
-                    >
+                    <g transform={`translate(${LEFT_PADDING},0)`}>
                         <VictoryChart
                             theme={CBIOPORTAL_VICTORY_THEME}
                             width={this.props.chartWidth}
@@ -479,7 +548,7 @@ export default class ScatterPlot<D extends IBaseScatterPlotData> extends React.C
                                 crossAxis={false}
                                 tickCount={NUM_AXIS_TICKS}
                                 tickFormat={this.tickFormatX}
-                                axisLabelComponent={<VictoryLabel dy={25}/>}
+                                axisLabelComponent={<VictoryLabel dy={25} />}
                                 label={this.props.axisLabelX}
                             />
                             <VictoryAxis
@@ -490,20 +559,23 @@ export default class ScatterPlot<D extends IBaseScatterPlotData> extends React.C
                                 tickCount={NUM_AXIS_TICKS}
                                 tickFormat={this.tickFormatY}
                                 dependentAxis={true}
-                                axisLabelComponent={<VictoryLabel dy={-35}/>}
+                                axisLabelComponent={<VictoryLabel dy={-35} />}
                                 label={this.props.axisLabelY}
                             />
-                            { this.data.map(dataWithAppearance=>(
+                            {this.data.map(dataWithAppearance => (
                                 <VictoryScatter
                                     key={`${dataWithAppearance.fill},${dataWithAppearance.stroke},${dataWithAppearance.strokeWidth},${dataWithAppearance.strokeOpacity},${dataWithAppearance.fillOpacity},${dataWithAppearance.symbol}`}
                                     style={{
                                         data: {
                                             fill: dataWithAppearance.fill,
                                             stroke: dataWithAppearance.stroke,
-                                            strokeWidth: dataWithAppearance.strokeWidth,
-                                            strokeOpacity: dataWithAppearance.strokeOpacity,
-                                            fillOpacity: dataWithAppearance.fillOpacity
-                                        }
+                                            strokeWidth:
+                                                dataWithAppearance.strokeWidth,
+                                            strokeOpacity:
+                                                dataWithAppearance.strokeOpacity,
+                                            fillOpacity:
+                                                dataWithAppearance.fillOpacity,
+                                        },
                                     }}
                                     size={this.size}
                                     symbol={dataWithAppearance.symbol}
@@ -529,14 +601,15 @@ export default class ScatterPlot<D extends IBaseScatterPlotData> extends React.C
         }
         return (
             <div>
-                <Observer>
-                    {this.getChart}
-                </Observer>
+                <Observer>{this.getChart}</Observer>
                 {this.container && this.tooltipModel && this.props.tooltip && (
                     <ScatterPlotTooltip
                         container={this.container}
                         targetHovered={this.pointHovered}
-                        targetCoords={{x: this.tooltipModel.x + LEFT_PADDING, y: this.tooltipModel.y}}
+                        targetCoords={{
+                            x: this.tooltipModel.x + LEFT_PADDING,
+                            y: this.tooltipModel.y,
+                        }}
                         overlay={this.props.tooltip(this.tooltipModel.datum)}
                     />
                 )}
diff --git a/src/shared/components/plots/ScatterPlotTooltip.tsx b/src/shared/components/plots/ScatterPlotTooltip.tsx
index 9d228701e29..d95a6bd863e 100644
--- a/src/shared/components/plots/ScatterPlotTooltip.tsx
+++ b/src/shared/components/plots/ScatterPlotTooltip.tsx
@@ -1,22 +1,25 @@
-import {observer} from "mobx-react";
-import * as React from "react";
-import {observable} from "mobx";
-import {Popover} from "react-bootstrap";
-import bind from "bind-decorator";
-import classnames from "classnames";
+import { observer } from 'mobx-react';
+import * as React from 'react';
+import { observable } from 'mobx';
+import { Popover } from 'react-bootstrap';
+import bind from 'bind-decorator';
+import classnames from 'classnames';
 
 export interface IScatterPlotTooltipProps {
-    container:HTMLDivElement;
-    overlay:JSX.Element;
-    targetCoords:{x:number, y:number};
-    targetHovered?:boolean;
-    className?:string;
-    placement?:string;
-    arrowOffsetTop?:number;
+    container: HTMLDivElement;
+    overlay: JSX.Element;
+    targetCoords: { x: number; y: number };
+    targetHovered?: boolean;
+    className?: string;
+    placement?: string;
+    arrowOffsetTop?: number;
 }
 
 @observer
-export default class ScatterPlotTooltip extends React.Component<IScatterPlotTooltipProps, {}> {
+export default class ScatterPlotTooltip extends React.Component<
+    IScatterPlotTooltipProps,
+    {}
+> {
     @observable isHovered = false; // allows persistence when mouse rolls over tooltip
 
     @bind
@@ -30,16 +33,35 @@ export default class ScatterPlotTooltip extends React.Component<IScatterPlotTool
     }
 
     render() {
-        const arrowOffsetTop = (this.props.arrowOffsetTop === undefined ? 30 : this.props.arrowOffsetTop);
+        const arrowOffsetTop =
+            this.props.arrowOffsetTop === undefined
+                ? 30
+                : this.props.arrowOffsetTop;
         const arrowOffsetLeft = 24;
         const leftPadding = 5;
-        const horizontal = !this.props.placement || this.props.placement === "left" || this.props.placement === "right";
+        const horizontal =
+            !this.props.placement ||
+            this.props.placement === 'left' ||
+            this.props.placement === 'right';
         if (this.props.targetHovered || this.isHovered) {
             return (
                 <Popover
-                    className={classnames("cbioportal-frontend", "cbioTooltip", this.props.className)}
-                    positionLeft={this.props.targetCoords.x + this.props.container.offsetLeft + leftPadding - (!horizontal ? arrowOffsetLeft + 6 : 0)}
-                    positionTop={this.props.targetCoords.y + this.props.container.offsetTop - (horizontal ? arrowOffsetTop : -5)}
+                    className={classnames(
+                        'cbioportal-frontend',
+                        'cbioTooltip',
+                        this.props.className
+                    )}
+                    positionLeft={
+                        this.props.targetCoords.x +
+                        this.props.container.offsetLeft +
+                        leftPadding -
+                        (!horizontal ? arrowOffsetLeft + 6 : 0)
+                    }
+                    positionTop={
+                        this.props.targetCoords.y +
+                        this.props.container.offsetTop -
+                        (horizontal ? arrowOffsetTop : -5)
+                    }
                     onMouseEnter={this.onMouseEnter}
                     onMouseLeave={this.onMouseLeave}
                     arrowOffsetTop={horizontal ? arrowOffsetTop : undefined}
@@ -53,4 +75,4 @@ export default class ScatterPlotTooltip extends React.Component<IScatterPlotTool
             return null;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/plots/ScatterPlotUtils.spec.ts b/src/shared/components/plots/ScatterPlotUtils.spec.ts
index 1fae160c41d..854c796ace8 100644
--- a/src/shared/components/plots/ScatterPlotUtils.spec.ts
+++ b/src/shared/components/plots/ScatterPlotUtils.spec.ts
@@ -1,10 +1,10 @@
-import {assert} from "chai";
-import {getRegressionComputations} from "./ScatterPlotUtils";
+import { assert } from 'chai';
+import { getRegressionComputations } from './ScatterPlotUtils';
 
-describe("ScatterPlotUtils", () => {
-    describe("getRegressionComputations", ()=>{
-        it("gives the correct regression equation, R^2, and function for a sample input with no correlation", ()=>{
-            const data:[number,number][] = [
+describe('ScatterPlotUtils', () => {
+    describe('getRegressionComputations', () => {
+        it('gives the correct regression equation, R^2, and function for a sample input with no correlation', () => {
+            const data: [number, number][] = [
                 [0.10198768, 0.10165061],
                 [0.10150876, 0.47896164],
                 [0.30063469, 0.43840858],
@@ -14,7 +14,7 @@ describe("ScatterPlotUtils", () => {
                 [0.02858332, 0.79155903],
                 [0.49389574, 0.54855519],
                 [0.77610317, 0.9879552],
-                [0.00350206, 0.73565457]
+                [0.00350206, 0.73565457],
             ];
 
             const computations = getRegressionComputations(data);
@@ -23,41 +23,47 @@ describe("ScatterPlotUtils", () => {
             const b = 0.59449349756220937;
             const r2 = 0.010257434869772463;
             // test regression equation to make sure its approximately the same as what python gives
-            const match = computations.string.match(/y = ([\d.]+)x \+ ([\d.]+)/);
-            assert.isNotNull(match, "equation has correct form");
+            const match = computations.string.match(
+                /y = ([\d.]+)x \+ ([\d.]+)/
+            );
+            assert.isNotNull(match, 'equation has correct form');
             const M = parseFloat(match![1]);
             const B = parseFloat(match![2]);
             assert.approximately(M, m, 0.05);
             assert.approximately(B, b, 0.05);
             // make sure `predict` gives the same result as the equation
-            for (let i=0; i<100; i+=1) {
-                assert.approximately(computations.predict(i)[1], M*i + B, 0.0000005, `value for ${i}`);
+            for (let i = 0; i < 100; i += 1) {
+                assert.approximately(
+                    computations.predict(i)[1],
+                    M * i + B,
+                    0.0000005,
+                    `value for ${i}`
+                );
             }
             // test R^2
-            assert.approximately(computations.r2,  r2, 0.05, "R^2");
-
+            assert.approximately(computations.r2, r2, 0.05, 'R^2');
         });
-        it("gives the correct regression equation, R^2, and function for a sample input with strong correlation", ()=>{
-            const data:[number,number][] = [
-                [0,0.33517481],
-                [1,3.00712561],
-                [2,6.73118302],
-                [3,9.25128682],
-                [4,12.0432596],
-                [5,15.9087018],
-                [6,18.71122156],
-                [7,21.69213527],
-                [8,24.57708193],
-                [9,27.98002031],
-                [10,30.67017471],
-                [11,33.55231386],
-                [12,36.20724938],
-                [13,39.21414698],
-                [14,42.74163248],
-                [15,45.95986539],
-                [16,48.28399276],
-                [17,51.52361803],
-                [18,54.62495359]
+        it('gives the correct regression equation, R^2, and function for a sample input with strong correlation', () => {
+            const data: [number, number][] = [
+                [0, 0.33517481],
+                [1, 3.00712561],
+                [2, 6.73118302],
+                [3, 9.25128682],
+                [4, 12.0432596],
+                [5, 15.9087018],
+                [6, 18.71122156],
+                [7, 21.69213527],
+                [8, 24.57708193],
+                [9, 27.98002031],
+                [10, 30.67017471],
+                [11, 33.55231386],
+                [12, 36.20724938],
+                [13, 39.21414698],
+                [14, 42.74163248],
+                [15, 45.95986539],
+                [16, 48.28399276],
+                [17, 51.52361803],
+                [18, 54.62495359],
             ];
 
             const computations = getRegressionComputations(data);
@@ -66,18 +72,25 @@ describe("ScatterPlotUtils", () => {
             const b = 0.41853989070105158;
             const r2 = 0.99970735279778178;
             // test regression equation to make sure its approximately the same as what python gives
-            const match = computations.string.match(/y = ([\d.]+)x \+ ([\d.]+)/);
-            assert.isNotNull(match, "equation has correct form");
+            const match = computations.string.match(
+                /y = ([\d.]+)x \+ ([\d.]+)/
+            );
+            assert.isNotNull(match, 'equation has correct form');
             const M = parseFloat(match![1]);
             const B = parseFloat(match![2]);
             assert.approximately(M, m, 0.05);
             assert.approximately(B, b, 0.05);
             // make sure `predict` gives the same result as the equation
-            for (let i=0; i<100; i+=1) {
-                assert.approximately(computations.predict(i)[1], M*i + B, 0.0000005, `value for ${i}`);
+            for (let i = 0; i < 100; i += 1) {
+                assert.approximately(
+                    computations.predict(i)[1],
+                    M * i + B,
+                    0.0000005,
+                    `value for ${i}`
+                );
             }
             // test R^2
-            assert.approximately(computations.r2,  r2, 0.05, "R^2");
+            assert.approximately(computations.r2, r2, 0.05, 'R^2');
         });
     });
-});
\ No newline at end of file
+});
diff --git a/src/shared/components/plots/ScatterPlotUtils.ts b/src/shared/components/plots/ScatterPlotUtils.ts
index c789c0781d5..386cd7f076c 100644
--- a/src/shared/components/plots/ScatterPlotUtils.ts
+++ b/src/shared/components/plots/ScatterPlotUtils.ts
@@ -1,11 +1,11 @@
-import regression from "regression";
+import regression from 'regression';
 
 export function getRegressionComputations(
-    data:[number,number][] //x,y
-):{
-    predict:(x:number)=>[number, number], // x => [x,y]
-    string:string, // "y = mx + b"
-    r2:number // R^2 value
+    data: [number, number][] //x,y
+): {
+    predict: (x: number) => [number, number]; // x => [x,y]
+    string: string; // "y = mx + b"
+    r2: number; // R^2 value
 } {
     return regression.linear(data);
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/plots/TablePlot.tsx b/src/shared/components/plots/TablePlot.tsx
index 8fca8954841..0667799f978 100644
--- a/src/shared/components/plots/TablePlot.tsx
+++ b/src/shared/components/plots/TablePlot.tsx
@@ -1,46 +1,59 @@
-import * as React from "react";
-import {observer} from "mobx-react";
-import {computed, observable} from "mobx";
-import {bind} from "bind-decorator";
-import CBIOPORTAL_VICTORY_THEME from "../../theme/cBioPoralTheme";
-import {VictoryAxis, VictoryBoxPlot, VictoryChart, VictoryLabel, VictoryLegend, VictoryScatter} from "victory";
-import {IStringAxisData, tableCellTextColor} from "../../../pages/resultsView/plots/PlotsTabUtils";
-import {StringListIndexedMap} from "../../lib/ListIndexedMap";
-import naturalSort from "javascript-natural-sort";
-import * as d3Scale from "d3-scale";
-import measureText from "measure-text";
-import {stringListToIndexSet, stringListToMap} from "cbioportal-frontend-commons";
-import {wrapTick} from "./TickUtils";
-import {iterateOverEntries} from "./TablePlotUtils";
+import * as React from 'react';
+import { observer } from 'mobx-react';
+import { computed, observable } from 'mobx';
+import { bind } from 'bind-decorator';
+import CBIOPORTAL_VICTORY_THEME from '../../theme/cBioPoralTheme';
+import {
+    VictoryAxis,
+    VictoryBoxPlot,
+    VictoryChart,
+    VictoryLabel,
+    VictoryLegend,
+    VictoryScatter,
+} from 'victory';
+import {
+    IStringAxisData,
+    tableCellTextColor,
+} from '../../../pages/resultsView/plots/PlotsTabUtils';
+import { StringListIndexedMap } from '../../lib/ListIndexedMap';
+import naturalSort from 'javascript-natural-sort';
+import * as d3Scale from 'd3-scale';
+import measureText from 'measure-text';
+import {
+    stringListToIndexSet,
+    stringListToMap,
+} from 'cbioportal-frontend-commons';
+import { wrapTick } from './TickUtils';
+import { iterateOverEntries } from './TablePlotUtils';
 
 export interface ITablePlotProps {
-    svgId?:string;
-    horzData:IStringAxisData["data"];
-    vertData:IStringAxisData["data"];
-    horzCategoryOrder?:string[];
-    vertCategoryOrder?:string[];
-    minCellWidth:number;
-    minCellHeight:number;
-    minChartWidth:number;
-    minChartHeight:number;
+    svgId?: string;
+    horzData: IStringAxisData['data'];
+    vertData: IStringAxisData['data'];
+    horzCategoryOrder?: string[];
+    vertCategoryOrder?: string[];
+    minCellWidth: number;
+    minCellHeight: number;
+    minChartWidth: number;
+    minChartHeight: number;
     axisLabelX?: string;
     axisLabelY?: string;
 }
 
 interface ITableData {
-    horzCategories:string[];
-    vertCategories:string[];
-    data:{
-        horzCategory:string;
-        vertCategory:string;
-        count:number;
+    horzCategories: string[];
+    vertCategories: string[];
+    data: {
+        horzCategory: string;
+        vertCategory: string;
+        count: number;
     }[];
 }
 
 interface IVictoryTableCellProps {
     x: number;
     y: number;
-    label:string;
+    label: string;
     scale?: any; // see Victory scale prop
     rectWidth: number; // cant be named width because VictoryChart passes down width prop
     rectHeight: number; // cant be named height because VictoryChart passes down height prop
@@ -51,32 +64,26 @@ interface IVictoryTableCellProps {
     textColor: string;
 }
 
-const HOT_COLOR = "rgb(0, 102, 204)";
-const COLD_COLOR = "rgb(255,255,255)";
+const HOT_COLOR = 'rgb(0, 102, 204)';
+const COLD_COLOR = 'rgb(255,255,255)';
 const CATEGORY_LABEL_HORZ_ANGLE = -70;
 const LABEL_GUTTER = 150; // room for axis label
 const BOTTOM_GUTTER = LABEL_GUTTER;
 const LEFT_PADDING = LABEL_GUTTER;
 
 const CELL_LABEL_PROPS = {
-    textAnchor: "middle",
-    fontFamily: "Verdana, Arial, sans-serif",
-    fontSize: 12
+    textAnchor: 'middle',
+    fontFamily: 'Verdana, Arial, sans-serif',
+    fontSize: 12,
 };
 
 class VictoryWrappingTick extends React.Component<any, {}> {
     // props are same as VictoryLabel props, plus "maxWidth"
     render() {
-        const {maxWidth, style, text, ...props} = this.props;
+        const { maxWidth, style, text, ...props } = this.props;
         const wrapped = wrapTick(text, maxWidth);
-        style.fontSize = 12 - 0.5*(wrapped.length - 1); // deduct half font point for each additional line
-        return (
-            <VictoryLabel
-                text={wrapped}
-                style={style}
-                {...props}
-            />
-        );
+        style.fontSize = 12 - 0.5 * (wrapped.length - 1); // deduct half font point for each additional line
+        return <VictoryLabel text={wrapped} style={style} {...props} />;
     }
 }
 
@@ -87,8 +94,8 @@ class VictoryTableCell extends React.Component<IVictoryTableCellProps, {}> {
         }
         const width = this.props.rectWidth;
         const height = this.props.rectHeight;
-        const y = this.props.scale.y(this.props.y) - height/2;
-        const x = this.props.scale.x(this.props.x) - width/2;
+        const y = this.props.scale.y(this.props.y) - height / 2;
+        const x = this.props.scale.x(this.props.x) - width / 2;
         return (
             <g>
                 <rect
@@ -98,12 +105,12 @@ class VictoryTableCell extends React.Component<IVictoryTableCellProps, {}> {
                     y={y}
                     style={{
                         fill: this.props.cellFill,
-                        stroke: "rgb(208,208,208)"
+                        stroke: 'rgb(208,208,208)',
                     }}
                 />
                 <text
-                    x={x + width/2}
-                    y={y + height/2}
+                    x={x + width / 2}
+                    y={y + height / 2}
                     dy="0.3em"
                     textAnchor={this.props.textAnchor}
                     fill={this.props.textColor}
@@ -119,29 +126,35 @@ class VictoryTableCell extends React.Component<IVictoryTableCellProps, {}> {
 
 @observer
 export default class TablePlot extends React.Component<ITablePlotProps, {}> {
-    @observable.ref private container:HTMLDivElement;
+    @observable.ref private container: HTMLDivElement;
 
     @bind
-    private containerRef(container:HTMLDivElement) {
+    private containerRef(container: HTMLDivElement) {
         this.container = container;
     }
-    
-    @computed get tableData():ITableData {
+
+    @computed get tableData(): ITableData {
         // count by categories
-        const tableCounts:StringListIndexedMap<number> = new StringListIndexedMap();
-        for (const entry of iterateOverEntries(this.props.horzData, this.props.vertData)) {
+        const tableCounts: StringListIndexedMap<
+            number
+        > = new StringListIndexedMap();
+        for (const entry of iterateOverEntries(
+            this.props.horzData,
+            this.props.vertData
+        )) {
             if (entry.horz !== undefined && entry.vert !== undefined) {
                 tableCounts.set(
-                    (tableCounts.get(entry.horz, entry.vert) || 0)+1,
-                    entry.horz, entry.vert
+                    (tableCounts.get(entry.horz, entry.vert) || 0) + 1,
+                    entry.horz,
+                    entry.vert
                 );
             }
         }
 
         // produce data and collect categories
-        const horzCategoriesMap:{[cat:string]:boolean} = {};
-        const vertCategoriesMap:{[cat:string]:boolean} = {};
-        const data = tableCounts.entries().map(entry=>{
+        const horzCategoriesMap: { [cat: string]: boolean } = {};
+        const vertCategoriesMap: { [cat: string]: boolean } = {};
+        const data = tableCounts.entries().map(entry => {
             const horzCategory = entry.key[0];
             const vertCategory = entry.key[1];
             horzCategoriesMap[horzCategory] = true;
@@ -149,24 +162,28 @@ export default class TablePlot extends React.Component<ITablePlotProps, {}> {
             return {
                 horzCategory,
                 vertCategory,
-                count: entry.value
+                count: entry.value,
             };
         });
 
         // sort categories
-        let horzCategories:string[];
+        let horzCategories: string[];
         if (this.props.horzCategoryOrder) {
-            horzCategories = this.props.horzCategoryOrder.filter(c=>!!horzCategoriesMap[c]);
+            horzCategories = this.props.horzCategoryOrder.filter(
+                c => !!horzCategoriesMap[c]
+            );
         } else {
-            horzCategories = Object.keys(horzCategoriesMap);;
+            horzCategories = Object.keys(horzCategoriesMap);
             horzCategories.sort(naturalSort);
         }
 
-        let vertCategories:string[];
+        let vertCategories: string[];
         if (this.props.vertCategoryOrder) {
-            vertCategories = this.props.vertCategoryOrder.filter(c=>!!vertCategoriesMap[c]);
+            vertCategories = this.props.vertCategoryOrder.filter(
+                c => !!vertCategoriesMap[c]
+            );
         } else {
-            vertCategories = Object.keys(vertCategoriesMap);;
+            vertCategories = Object.keys(vertCategoriesMap);
             vertCategories.sort(naturalSort);
         }
 
@@ -175,7 +192,9 @@ export default class TablePlot extends React.Component<ITablePlotProps, {}> {
             for (const vertCategory of vertCategories) {
                 if (!tableCounts.has(horzCategory, vertCategory)) {
                     data.push({
-                        horzCategory, vertCategory, count:0
+                        horzCategory,
+                        vertCategory,
+                        count: 0,
                     });
                 }
             }
@@ -184,11 +203,11 @@ export default class TablePlot extends React.Component<ITablePlotProps, {}> {
         return {
             horzCategories,
             vertCategories: vertCategories.reverse(), // reverse vert category order for inverted svg y axis
-            data
+            data,
         };
     }
 
-    @computed get dataRange():{min:number, max:number} {
+    @computed get dataRange(): { min: number; max: number } {
         let min = Number.POSITIVE_INFINITY;
         let max = Number.NEGATIVE_INFINITY;
         for (const d of this.tableData.data) {
@@ -196,37 +215,51 @@ export default class TablePlot extends React.Component<ITablePlotProps, {}> {
             max = Math.max(max, d.count);
         }
 
-        return {min, max};
+        return { min, max };
     }
 
-    @computed get getCellColor():(val:number)=>string {
+    @computed get getCellColor(): (val: number) => string {
         if (!this.tableData.data.length) {
-            return ()=>COLD_COLOR;
+            return () => COLD_COLOR;
         }
-        return d3Scale.scaleLinear<string>().domain([this.dataRange.min, this.dataRange.max]).range([COLD_COLOR, HOT_COLOR]);
+        return d3Scale
+            .scaleLinear<string>()
+            .domain([this.dataRange.min, this.dataRange.max])
+            .range([COLD_COLOR, HOT_COLOR]);
     }
 
-    @computed get getTextColor():(val:number)=>string {
+    @computed get getTextColor(): (val: number) => string {
         if (!this.tableData.data.length) {
-            return ()=>"rgb(0,0,0)";
+            return () => 'rgb(0,0,0)';
         }
         const dataRange = this.dataRange;
-        return (val:number)=>tableCellTextColor(val, dataRange.min, dataRange.max);
+        return (val: number) =>
+            tableCellTextColor(val, dataRange.min, dataRange.max);
     }
 
-    private getCellCoordinates(horzCategory:string, vertCategory:string) {
+    private getCellCoordinates(horzCategory: string, vertCategory: string) {
         return {
             x: this.horzTickValueMap[horzCategory],
-            y: this.vertTickValueMap[vertCategory]
+            y: this.vertTickValueMap[vertCategory],
         };
     }
 
     @computed get chartWidth() {
-        return Math.max(this.tableData.horzCategories.length * this.cellWidth + LEFT_PADDING + 2*this.cellWidth, this.props.minChartWidth);
+        return Math.max(
+            this.tableData.horzCategories.length * this.cellWidth +
+                LEFT_PADDING +
+                2 * this.cellWidth,
+            this.props.minChartWidth
+        );
     }
 
     @computed get chartHeight() {
-        return Math.max(this.tableData.vertCategories.length * this.cellHeight + BOTTOM_GUTTER + 2*this.cellHeight, this.props.minChartHeight);
+        return Math.max(
+            this.tableData.vertCategories.length * this.cellHeight +
+                BOTTOM_GUTTER +
+                2 * this.cellHeight,
+            this.props.minChartHeight
+        );
     }
 
     @computed get svgWidth() {
@@ -238,17 +271,19 @@ export default class TablePlot extends React.Component<ITablePlotProps, {}> {
     }
 
     @bind
-    private formatTickHorz(t:number, index:number) {
+    private formatTickHorz(t: number, index: number) {
         return this.formatTickHelper(true, index);
     }
 
     @bind
-    private formatTickVert(t:number, index:number) {
+    private formatTickVert(t: number, index: number) {
         return this.formatTickHelper(false, index);
     }
 
-    private formatTickHelper(horzAxis:boolean, index:number) {
-        const labels = horzAxis ? this.tableData.horzCategories : this.tableData.vertCategories;
+    private formatTickHelper(horzAxis: boolean, index: number) {
+        const labels = horzAxis
+            ? this.tableData.horzCategories
+            : this.tableData.vertCategories;
         return labels[index];
     }
 
@@ -261,12 +296,19 @@ export default class TablePlot extends React.Component<ITablePlotProps, {}> {
                 label={this.props.axisLabelX}
                 tickValues={this.horzTickValues}
                 tickFormat={this.formatTickHorz}
-                tickLabelComponent={<VictoryWrappingTick angle={CATEGORY_LABEL_HORZ_ANGLE}
-                                                  verticalAnchor={"middle"}
-                                                  textAnchor={"end"}
-                                                 maxWidth={LABEL_GUTTER - 30}
-                />}
-                axisLabelComponent={<VictoryLabel dy={BOTTOM_GUTTER-20 /* leave more room for labels */}/>}
+                tickLabelComponent={
+                    <VictoryWrappingTick
+                        angle={CATEGORY_LABEL_HORZ_ANGLE}
+                        verticalAnchor={'middle'}
+                        textAnchor={'end'}
+                        maxWidth={LABEL_GUTTER - 30}
+                    />
+                }
+                axisLabelComponent={
+                    <VictoryLabel
+                        dy={BOTTOM_GUTTER - 20 /* leave more room for labels */}
+                    />
+                }
             />
         );
     }
@@ -281,23 +323,29 @@ export default class TablePlot extends React.Component<ITablePlotProps, {}> {
                 dependentAxis={true}
                 tickValues={this.vertTickValues}
                 tickFormat={this.formatTickVert}
-                tickLabelComponent={<VictoryWrappingTick maxWidth={LABEL_GUTTER - 30} />}
-                axisLabelComponent={<VictoryLabel dy={-1*LEFT_PADDING /* leave more room for labels */}/>}
+                tickLabelComponent={
+                    <VictoryWrappingTick maxWidth={LABEL_GUTTER - 30} />
+                }
+                axisLabelComponent={
+                    <VictoryLabel
+                        dy={-1 * LEFT_PADDING /* leave more room for labels */}
+                    />
+                }
             />
         );
     }
 
     @computed get horzTickValueMap() {
-        return stringListToMap(this.tableData.horzCategories, (c, i)=>i+1);
+        return stringListToMap(this.tableData.horzCategories, (c, i) => i + 1);
     }
     @computed get vertTickValueMap() {
-        return stringListToMap(this.tableData.vertCategories, (c, i)=>i+1);
+        return stringListToMap(this.tableData.vertCategories, (c, i) => i + 1);
     }
     @computed get horzTickValues() {
-        return this.tableData.horzCategories.map(x=>this.horzTickValueMap[x]);
+        return this.tableData.horzCategories.map(x => this.horzTickValueMap[x]);
     }
     @computed get vertTickValues() {
-        return this.tableData.vertCategories.map(x=>this.vertTickValueMap[x]);
+        return this.tableData.vertCategories.map(x => this.vertTickValueMap[x]);
     }
 
     @computed get cellHeight() {
@@ -306,72 +354,76 @@ export default class TablePlot extends React.Component<ITablePlotProps, {}> {
 
     @computed get cellWidth() {
         const padding = 10;
-        const computedWidth = measureText({
-            text: this.dataRange.max + "",
-            fontFamily: CELL_LABEL_PROPS.fontFamily,
-            fontSize: CELL_LABEL_PROPS.fontSize,
-            lineHeight: 1
-        }).width.value + 2*padding;
+        const computedWidth =
+            measureText({
+                text: this.dataRange.max + '',
+                fontFamily: CELL_LABEL_PROPS.fontFamily,
+                fontSize: CELL_LABEL_PROPS.fontSize,
+                lineHeight: 1,
+            }).width.value +
+            2 * padding;
         return Math.max(computedWidth, this.props.minCellWidth);
     }
 
     @computed get domain() {
         return {
-            x: [0, this.tableData.horzCategories.length+1],
-            y: [0, this.tableData.vertCategories.length+1]
+            x: [0, this.tableData.horzCategories.length + 1],
+            y: [0, this.tableData.vertCategories.length + 1],
         };
     }
 
-
     render() {
         if (!this.tableData.data.length) {
             return <div className={'alert alert-info'}>No data to plot.</div>;
         }
-        const cellElements = this.tableData.data.map(d=>{
-            const {horzCategory, vertCategory, count} = d;
+        const cellElements = this.tableData.data.map(d => {
+            const { horzCategory, vertCategory, count } = d;
             const coords = this.getCellCoordinates(horzCategory, vertCategory);
-            return (<VictoryTableCell
-                key={`${horzCategory},${vertCategory},rect`}
-                rectWidth={this.cellWidth}
-                rectHeight={this.cellHeight}
-                x={coords.x}
-                y={coords.y}
-                label={`${count}`}
-                cellFill={this.getCellColor(count)}
-                textColor={this.getTextColor(count)}
-                textAnchor={CELL_LABEL_PROPS.textAnchor}
-                fontFamily={CELL_LABEL_PROPS.fontFamily}
-                fontSize={CELL_LABEL_PROPS.fontSize}
-            />);
+            return (
+                <VictoryTableCell
+                    key={`${horzCategory},${vertCategory},rect`}
+                    rectWidth={this.cellWidth}
+                    rectHeight={this.cellHeight}
+                    x={coords.x}
+                    y={coords.y}
+                    label={`${count}`}
+                    cellFill={this.getCellColor(count)}
+                    textColor={this.getTextColor(count)}
+                    textAnchor={CELL_LABEL_PROPS.textAnchor}
+                    fontFamily={CELL_LABEL_PROPS.fontFamily}
+                    fontSize={CELL_LABEL_PROPS.fontSize}
+                />
+            );
         });
         return (
             <div>
                 <div
                     ref={this.containerRef}
-                    style={{width: this.svgWidth, height: this.svgHeight}}
+                    style={{ width: this.svgWidth, height: this.svgHeight }}
                 >
                     <svg
-                        id={this.props.svgId || ""}
+                        id={this.props.svgId || ''}
                         style={{
                             width: this.svgWidth,
                             height: this.svgHeight,
-                            pointerEvents: "all"
+                            pointerEvents: 'all',
                         }}
                         height={this.svgHeight}
                         width={this.svgWidth}
                         role="img"
                         viewBox={`0 0 ${this.svgWidth} ${this.svgHeight}`}
                     >
-                        <g
-                            transform={`translate(${LEFT_PADDING}, 0)`}
-                        >
+                        <g transform={`translate(${LEFT_PADDING}, 0)`}>
                             <VictoryChart
                                 theme={CBIOPORTAL_VICTORY_THEME}
                                 width={this.chartWidth}
                                 height={this.chartHeight}
                                 standalone={false}
                                 domain={this.domain}
-                                domainPadding={{x:this.cellWidth, y:this.cellHeight}}
+                                domainPadding={{
+                                    x: this.cellWidth,
+                                    y: this.cellHeight,
+                                }}
                             >
                                 {this.horzAxis}
                                 {this.vertAxis}
@@ -383,4 +435,4 @@ export default class TablePlot extends React.Component<ITablePlotProps, {}> {
             </div>
         );
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/plots/TablePlotUtils.ts b/src/shared/components/plots/TablePlotUtils.ts
index b7d4769f0e3..9e104d6eff2 100644
--- a/src/shared/components/plots/TablePlotUtils.ts
+++ b/src/shared/components/plots/TablePlotUtils.ts
@@ -1,10 +1,15 @@
-import {IStringAxisData} from "../../../pages/resultsView/plots/PlotsTabUtils";
-import {Sample} from "../../api/generated/CBioPortalAPI";
+import { IStringAxisData } from '../../../pages/resultsView/plots/PlotsTabUtils';
+import { Sample } from '../../api/generated/CBioPortalAPI';
 function getUniqueSampleKeyToCategories(
-    horzData: IStringAxisData["data"],
-    vertData: IStringAxisData["data"]
+    horzData: IStringAxisData['data'],
+    vertData: IStringAxisData['data']
 ) {
-    const ret:{[sampleKey:string]:{ horz?:string | (string[]), vert?:string | (string[])}} = {};
+    const ret: {
+        [sampleKey: string]: {
+            horz?: string | (string[]);
+            vert?: string | (string[]);
+        };
+    } = {};
     for (const d of horzData) {
         ret[d.uniqueSampleKey] = ret[d.uniqueSampleKey] || {};
         ret[d.uniqueSampleKey].horz = d.value;
@@ -17,22 +22,26 @@ function getUniqueSampleKeyToCategories(
 }
 
 export function* iterateOverEntries(
-    horzData: IStringAxisData["data"],
-    vertData: IStringAxisData["data"]
-):IterableIterator<{uniqueSampleKey:string, horz?:string, vert?:string}> {
+    horzData: IStringAxisData['data'],
+    vertData: IStringAxisData['data']
+): IterableIterator<{ uniqueSampleKey: string; horz?: string; vert?: string }> {
     const caseToCategories = getUniqueSampleKeyToCategories(horzData, vertData);
     for (const caseKey of Object.keys(caseToCategories)) {
         const caseCategories = caseToCategories[caseKey];
         if (caseCategories.horz && caseCategories.vert) {
             // yield entry for each value combination
-            const horz = Array.isArray(caseCategories.horz) ? caseCategories.horz : [caseCategories.horz];
-            const vert = Array.isArray(caseCategories.vert) ? caseCategories.vert : [caseCategories.vert];
+            const horz = Array.isArray(caseCategories.horz)
+                ? caseCategories.horz
+                : [caseCategories.horz];
+            const vert = Array.isArray(caseCategories.vert)
+                ? caseCategories.vert
+                : [caseCategories.vert];
             for (const horzValue of horz) {
                 for (const vertValue of vert) {
                     yield {
                         uniqueSampleKey: caseKey,
-                        horz:horzValue,
-                        vert:vertValue
+                        horz: horzValue,
+                        vert: vertValue,
                     };
                 }
             }
@@ -41,20 +50,20 @@ export function* iterateOverEntries(
 }
 
 export function getTablePlotDownloadData(
-    horzData:IStringAxisData["data"],
-    vertData:IStringAxisData["data"],
-    uniqueSampleKeyToSample:{[uniqueSampleKey:string]:Sample},
-    horzLabel:string,
-    vertLabel:string
+    horzData: IStringAxisData['data'],
+    vertData: IStringAxisData['data'],
+    uniqueSampleKeyToSample: { [uniqueSampleKey: string]: Sample },
+    horzLabel: string,
+    vertLabel: string
 ) {
-    const dataRows:string[] = [];
+    const dataRows: string[] = [];
     for (const entry of iterateOverEntries(horzData, vertData)) {
-        const row:string[] = [];
+        const row: string[] = [];
         row.push(uniqueSampleKeyToSample[entry.uniqueSampleKey].sampleId);
-        row.push(entry.horz || "n/a");
-        row.push(entry.vert || "n/a");
-        dataRows.push(row.join("\t"));
+        row.push(entry.horz || 'n/a');
+        row.push(entry.vert || 'n/a');
+        dataRows.push(row.join('\t'));
     }
-    const header = ["Sample Id", horzLabel, vertLabel];
-    return header.join("\t")+"\n"+dataRows.join("\n");
-}
\ No newline at end of file
+    const header = ['Sample Id', horzLabel, vertLabel];
+    return header.join('\t') + '\n' + dataRows.join('\n');
+}
diff --git a/src/shared/components/plots/TickUtils.ts b/src/shared/components/plots/TickUtils.ts
index 0354dee7179..5c6a5d086db 100644
--- a/src/shared/components/plots/TickUtils.ts
+++ b/src/shared/components/plots/TickUtils.ts
@@ -1,26 +1,34 @@
-import _ from "lodash";
-import numeral from "numeral";
-import {textTruncationUtils} from "cbioportal-frontend-commons";
-import {axisTickLabelStyles} from "../../theme/cBioPoralTheme";
+import _ from 'lodash';
+import numeral from 'numeral';
+import { textTruncationUtils } from 'cbioportal-frontend-commons';
+import { axisTickLabelStyles } from '../../theme/cBioPoralTheme';
 
-export function wrapTick(label:string, maxWidth:number):string[] {
-    return textTruncationUtils(label, maxWidth, axisTickLabelStyles.fontFamily, axisTickLabelStyles.fontSize+"px");
+export function wrapTick(label: string, maxWidth: number): string[] {
+    return textTruncationUtils(
+        label,
+        maxWidth,
+        axisTickLabelStyles.fontFamily,
+        axisTickLabelStyles.fontSize + 'px'
+    );
 }
 
-function zeroes(times:number) {
-    let ret = "";
-    for (let i=0; i<times; i++) {
-        ret += "0";
+function zeroes(times: number) {
+    let ret = '';
+    for (let i = 0; i < times; i++) {
+        ret += '0';
     }
     return ret;
 }
 
-function getUniqueFormat(values:number[], formatFn:(precision:number)=>string) {
+function getUniqueFormat(
+    values: number[],
+    formatFn: (precision: number) => string
+) {
     let precision = 0;
-    let format = "";
+    let format = '';
     while (precision < 3) {
         format = formatFn(precision);
-        const uniqueValues = _.uniq(values.map(v=>numeral(v).format(format)));
+        const uniqueValues = _.uniq(values.map(v => numeral(v).format(format)));
         if (uniqueValues.length === values.length) {
             //unique!
             break;
@@ -30,17 +38,21 @@ function getUniqueFormat(values:number[], formatFn:(precision:number)=>string) {
     return format;
 }
 
-export function getUniqueFormatThousands(values:number[]) {
-    values = values.filter(v=>Math.abs(v) >= 1000);
-    return getUniqueFormat(values, precision=>`0.[${zeroes(precision)}]a`);
+export function getUniqueFormatThousands(values: number[]) {
+    values = values.filter(v => Math.abs(v) >= 1000);
+    return getUniqueFormat(values, precision => `0.[${zeroes(precision)}]a`);
 }
 
-export function getUniqueFormatLessThanThousands(values:number[]) {
-    values = values.filter(v=>Math.abs(v) < 1000);
-    return getUniqueFormat(values, precision=>`0.[${zeroes(precision)}]`);
+export function getUniqueFormatLessThanThousands(values: number[]) {
+    values = values.filter(v => Math.abs(v) < 1000);
+    return getUniqueFormat(values, precision => `0.[${zeroes(precision)}]`);
 }
 
-export function tickFormatNumeral(val:number, values:number[], transform?:(t:number)=>number) {
+export function tickFormatNumeral(
+    val: number,
+    values: number[],
+    transform?: (t: number) => number
+) {
     // transform is, e.g., log
     if (transform) {
         val = transform(val);
@@ -51,4 +63,4 @@ export function tickFormatNumeral(val:number, values:number[], transform?:(t:num
     } else {
         return numeral(val).format(getUniqueFormatLessThanThousands(values));
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/plots/WaterfallPlot.spec.tsx b/src/shared/components/plots/WaterfallPlot.spec.tsx
index a6f17217069..2b41920ec5f 100644
--- a/src/shared/components/plots/WaterfallPlot.spec.tsx
+++ b/src/shared/components/plots/WaterfallPlot.spec.tsx
@@ -6,50 +6,39 @@ import { shallow } from 'enzyme';
 import labelMobxPromises from 'mobxpromise';
 
 describe('WaterfallPlot', () => {
-
-    let testData:IBaseWaterfallPlotData[] = [
-        {value: 2},
-        {value: 4}
-    ];
-    let testProps:IWaterfallPlotProps<IBaseWaterfallPlotData> = {
+    let testData: IBaseWaterfallPlotData[] = [{ value: 2 }, { value: 4 }];
+    let testProps: IWaterfallPlotProps<IBaseWaterfallPlotData> = {
         data: testData,
         chartWidth: 600,
         chartHeight: 400,
         horizontal: true,
-        sortOrder: "ASC"
+        sortOrder: 'ASC',
     };
-    let plot:WaterfallPlot<IBaseWaterfallPlotData> = new WaterfallPlot<IBaseWaterfallPlotData>(testProps);
-    
+    let plot: WaterfallPlot<IBaseWaterfallPlotData> = new WaterfallPlot<
+        IBaseWaterfallPlotData
+    >(testProps);
+
     beforeEach(() => {
-        
         testProps = {
             data: testData,
             chartWidth: 600,
             chartHeight: 400,
             horizontal: true,
-            sortOrder: "ASC"
+            sortOrder: 'ASC',
         };
-        
-        testData = [
-            {value: 2},
-            {value: 4}
-        ];
-        
-        plot = new WaterfallPlot<IBaseWaterfallPlotData>(testProps);
 
+        testData = [{ value: 2 }, { value: 4 }];
+
+        plot = new WaterfallPlot<IBaseWaterfallPlotData>(testProps);
     });
 
     describe('#waterfallPlotData', () => {
-
         it('Datum has internally computed field', () => {
-
             const datum = plot.waterfallPlotData[0];
             assert.isDefined(datum.order);
-
         });
 
         it('Sort order parameter controls ordering of data', () => {
-            
             // test "ASC" and horizontal is false
             testProps.horizontal = false;
             let datum1 = plot.waterfallPlotData[0];
@@ -58,34 +47,34 @@ describe('WaterfallPlot', () => {
             assert.equal(datum1.value, 2);
             assert.equal(datum2.order, 2);
             assert.equal(datum2.value, 4);
-            
+
             // test "DESC" and horizontal is false
-            testProps.sortOrder = "DESC";
+            testProps.sortOrder = 'DESC';
             plot = new WaterfallPlot<IBaseWaterfallPlotData>(testProps);
-            
+
             datum1 = plot.waterfallPlotData[0];
             datum2 = plot.waterfallPlotData[1];
             assert.equal(datum1.order, 1);
             assert.equal(datum1.value, 4);
             assert.equal(datum2.order, 2);
             assert.equal(datum2.value, 2);
-            
+
             // test "ASC" and horizontal is true
             testProps.horizontal = true;
-            testProps.sortOrder = "ASC";
+            testProps.sortOrder = 'ASC';
             plot = new WaterfallPlot<IBaseWaterfallPlotData>(testProps);
-            
+
             datum1 = plot.waterfallPlotData[0];
             datum2 = plot.waterfallPlotData[1];
             assert.equal(datum1.order, 1);
             assert.equal(datum1.value, 4);
             assert.equal(datum2.order, 2);
             assert.equal(datum2.value, 2);
-            
+
             // test "DESC" and horizontal is true
-            testProps.sortOrder = "DESC";
+            testProps.sortOrder = 'DESC';
             plot = new WaterfallPlot<IBaseWaterfallPlotData>(testProps);
-            
+
             datum1 = plot.waterfallPlotData[0];
             datum2 = plot.waterfallPlotData[1];
             assert.equal(datum1.order, 1);
@@ -93,32 +82,27 @@ describe('WaterfallPlot', () => {
             assert.equal(datum2.order, 2);
             assert.equal(datum2.value, 4);
         });
-
     });
 
     describe('#styledWaterfallPlotData', () => {
-        
         it('Datum has styling info when passed to component', () => {
-    
-            testProps.fill = "test";
-            testProps.stroke = "test";
+            testProps.fill = 'test';
+            testProps.stroke = 'test';
             testProps.strokeOpacity = 1;
             testProps.strokeWidth = 1;
-            testProps.symbol = "test";
-    
+            testProps.symbol = 'test';
+
             plot = new WaterfallPlot<IBaseWaterfallPlotData>(testProps);
             const datum = plot.styledWaterfallPlotData[0];
-    
+
             assert.isDefined(datum.fill);
             assert.isDefined(datum.stroke);
             assert.isDefined(datum.strokeOpacity);
             assert.isDefined(datum.strokeWidth);
             assert.isDefined(datum.symbol);
-            
         });
-
     });
-    
+
     describe('#plotDomain', () => {
         it('Has correct x dimensions', () => {
             const domain = plot.plotDomain;
@@ -133,37 +117,34 @@ describe('WaterfallPlot', () => {
     });
 
     describe('Search indicators', () => {
-
         it('Absent when no highlight param passed', () => {
             testProps.highlight = undefined;
             assert.equal(plot.searchLabels.length, 0);
         });
-        
+
         it('Absent when no samples match', () => {
-            testProps.highlight = (d) => false;
+            testProps.highlight = d => false;
             assert.equal(plot.searchLabels.length, 0);
         });
-        
+
         it('Present when search function is passed', () => {
-            testProps.highlight = (d) => true;
+            testProps.highlight = d => true;
             assert.equal(plot.searchLabels.length, 2);
         });
 
         it('Present when search function is passed', () => {
-            testProps.highlight = (d) => true;
+            testProps.highlight = d => true;
             assert.equal(plot.searchLabels.length, 2);
         });
 
         it('Search label data points have x/y coordinates', () => {
-            testProps.highlight = (d) => true;
+            testProps.highlight = d => true;
             assert.isDefined(plot.searchLabels[0].searchindicatorx);
             assert.isDefined(plot.searchLabels[0].searchindicatory);
         });
-
     });
 
     describe('Limit value indicators', () => {
-
         it('Absent when labelVisibility param not passed', () => {
             testProps.labelVisibility = undefined;
             plot = new WaterfallPlot<IBaseWaterfallPlotData>(testProps);
@@ -171,9 +152,9 @@ describe('WaterfallPlot', () => {
         });
 
         it('Absent when no datapoints are limited', () => {
-           testProps.labelVisibility = () => false;
-           plot = new WaterfallPlot<IBaseWaterfallPlotData>(testProps);
-           assert.equal(plot.limitLabels.length, 0);
+            testProps.labelVisibility = () => false;
+            plot = new WaterfallPlot<IBaseWaterfallPlotData>(testProps);
+            assert.equal(plot.limitLabels.length, 0);
         });
 
         it('Present when datapoints are limited', () => {
@@ -188,7 +169,5 @@ describe('WaterfallPlot', () => {
             assert.isDefined(plot.limitLabels[0].labelx);
             assert.isDefined(plot.limitLabels[0].labely);
         });
-        
     });
-
 });
diff --git a/src/shared/components/plots/WaterfallPlot.tsx b/src/shared/components/plots/WaterfallPlot.tsx
index c7191372fa2..239e5c6dcf4 100644
--- a/src/shared/components/plots/WaterfallPlot.tsx
+++ b/src/shared/components/plots/WaterfallPlot.tsx
@@ -1,153 +1,172 @@
-import _ from "lodash";
-import * as React from "react";
-import {observer, Observer} from "mobx-react";
-import bind from "bind-decorator";
-import {computed, observable} from "mobx";
-import CBIOPORTAL_VICTORY_THEME from "../../theme/cBioPoralTheme";
+import _ from 'lodash';
+import * as React from 'react';
+import { observer, Observer } from 'mobx-react';
+import bind from 'bind-decorator';
+import { computed, observable } from 'mobx';
+import CBIOPORTAL_VICTORY_THEME from '../../theme/cBioPoralTheme';
 import Timer = NodeJS.Timer;
-import {VictoryChart, VictoryAxis, VictoryBar, VictoryScatter, VictoryLegend, VictoryLabel} from "victory";
-import { makeScatterPlotSizeFunction as makePlotSizeFunction } from "./PlotUtils";
-import WaterfallPlotTooltip from "./WaterfallPlotTooltip";
-import { tickFormatNumeral } from "./TickUtils";
-import { IAxisLogScaleParams, waterfallSearchIndicatorAppearance, limitValueAppearance, IValue1D } from 'pages/resultsView/plots/PlotsTabUtils';
-import { textTruncationUtils } from "cbioportal-frontend-commons";
+import {
+    VictoryChart,
+    VictoryAxis,
+    VictoryBar,
+    VictoryScatter,
+    VictoryLegend,
+    VictoryLabel,
+} from 'victory';
+import { makeScatterPlotSizeFunction as makePlotSizeFunction } from './PlotUtils';
+import WaterfallPlotTooltip from './WaterfallPlotTooltip';
+import { tickFormatNumeral } from './TickUtils';
+import {
+    IAxisLogScaleParams,
+    waterfallSearchIndicatorAppearance,
+    limitValueAppearance,
+    IValue1D,
+} from 'pages/resultsView/plots/PlotsTabUtils';
+import { textTruncationUtils } from 'cbioportal-frontend-commons';
 
 // TODO make distinction between public and internal interface for waterfall plot data
 export interface IBaseWaterfallPlotData extends IValue1D {
-    order?:number|undefined;
-    offset?:number;
-    fill?:string;
-    fillOpacity?:number;
-    stroke?:string;
-    strokeOpacity?:number;
-    strokeWidth?:number;
-    symbol?:string;
-    labelx?:number;
-    labely?:number;
-    limitValueLabelVisibility?:boolean;
-    searchindicatorx?:number;
-    searchindicatory?:number;
+    order?: number | undefined;
+    offset?: number;
+    fill?: string;
+    fillOpacity?: number;
+    stroke?: string;
+    strokeOpacity?: number;
+    strokeWidth?: number;
+    symbol?: string;
+    labelx?: number;
+    labely?: number;
+    limitValueLabelVisibility?: boolean;
+    searchindicatorx?: number;
+    searchindicatory?: number;
 }
 
 export interface IWaterfallPlotProps<D extends IBaseWaterfallPlotData> {
-    svgId?:string;
-    title?:string;
+    svgId?: string;
+    title?: string;
     data: D[];
-    chartWidth:number;
-    chartHeight:number;
-    highlight?:(d:D)=>boolean;
-    size?:number | ((d:D, active:boolean, isHighlighted?:boolean)=>number);
-    fill?:string|((d:D)=>string);
-    stroke?:string|((d:D)=>string);
-    fillOpacity?:number|((d:D)=>number);
-    strokeOpacity?:number|((d:D)=>number);
-    strokeWidth?:number|((d:D)=>number);
-    symbol?:string|((d:D)=>string);
-    labelVisibility?:boolean|((d:D)=>boolean);
-    zIndexSortBy?:((d:D)=>any)[]; // second argument to _.sortBy
-    tooltip?:(d:D)=>JSX.Element;
-    horizontal:boolean;
-    legendData?:{name:string|string[], symbol:any}[]; // see http://formidable.com/open-source/victory/docs/victory-legend/#data
-    legendLocationWidthThreshold?:number;
-    log?:IAxisLogScaleParams|undefined;
-    useLogSpaceTicks?:boolean; // if log scale for an axis, then this prop determines whether the ticks are shown in post-log coordinate, or original data coordinate space
-    axisLabel?:string;
-    fontFamily?:string;
-    sortOrder:string|undefined;
-    pivotThreshold?:number;
+    chartWidth: number;
+    chartHeight: number;
+    highlight?: (d: D) => boolean;
+    size?:
+        | number
+        | ((d: D, active: boolean, isHighlighted?: boolean) => number);
+    fill?: string | ((d: D) => string);
+    stroke?: string | ((d: D) => string);
+    fillOpacity?: number | ((d: D) => number);
+    strokeOpacity?: number | ((d: D) => number);
+    strokeWidth?: number | ((d: D) => number);
+    symbol?: string | ((d: D) => string);
+    labelVisibility?: boolean | ((d: D) => boolean);
+    zIndexSortBy?: ((d: D) => any)[]; // second argument to _.sortBy
+    tooltip?: (d: D) => JSX.Element;
+    horizontal: boolean;
+    legendData?: { name: string | string[]; symbol: any }[]; // see http://formidable.com/open-source/victory/docs/victory-legend/#data
+    legendLocationWidthThreshold?: number;
+    log?: IAxisLogScaleParams | undefined;
+    useLogSpaceTicks?: boolean; // if log scale for an axis, then this prop determines whether the ticks are shown in post-log coordinate, or original data coordinate space
+    axisLabel?: string;
+    fontFamily?: string;
+    sortOrder: string | undefined;
+    pivotThreshold?: number;
 }
 
-const DEFAULT_FONT_FAMILY = "Verdana,Arial,sans-serif";
-export const LEGEND_Y = 30
+const DEFAULT_FONT_FAMILY = 'Verdana,Arial,sans-serif';
+export const LEGEND_Y = 30;
 const RIGHT_PADDING = 120; // room for correlation info and legend
 const NUM_AXIS_TICKS = 8;
 const LEFT_PADDING = 25;
 const LEGEND_ITEMS_PER_ROW = 4;
-const LABEL_OFFSET_FRACTION = .02;
+const LABEL_OFFSET_FRACTION = 0.02;
 const SEARCH_LABEL_SIZE_MULTIPLIER = 1.5;
 const TOOLTIP_OFFSET_Y = 28.5;
 const TOOLTIP_OFFSET_X = -5;
 const CHART_OFFSET_Y = 30;
 const limitValueAppearanceSupplement = {
-    fill: "#ffffff",
-    stroke: "#000000",
+    fill: '#ffffff',
+    stroke: '#000000',
     strokeWidth: 1,
     strokeOpacity: 1,
-    size: 3
+    size: 3,
 };
 
 @observer
-export default class WaterfallPlot<D extends IBaseWaterfallPlotData> extends React.Component<IWaterfallPlotProps<D>, {}> {
+export default class WaterfallPlot<
+    D extends IBaseWaterfallPlotData
+> extends React.Component<IWaterfallPlotProps<D>, {}> {
+    @observable.ref tooltipModel: any | null = null;
+    @observable pointHovered: boolean = false;
 
-    @observable.ref tooltipModel:any|null = null;
-    @observable pointHovered:boolean = false;
+    private mouseEvents: any = this.makeMouseEvents();
 
-    private mouseEvents:any = this.makeMouseEvents();
-
-    @observable.ref private container:HTMLDivElement;
+    @observable.ref private container: HTMLDivElement;
 
     @bind
-    private containerRef(container:HTMLDivElement) {
+    private containerRef(container: HTMLDivElement) {
         this.container = container;
     }
 
     private makeMouseEvents() {
-        let disappearTimeout:Timer | null = null;
+        let disappearTimeout: Timer | null = null;
         const disappearDelayMs = 250;
 
-        return [{
-            target: "data",
-            eventHandlers: {
-                onMouseOver: () => {
-                    return [
-                        {
-                            target: "data",
-                            mutation: (props: any) => {
-
-                                // swap x and y label pos when in horizontal mode
-                                if (this.props.horizontal && !props.datum.searchLabel) {
-                                    const x = props.x;
-                                    // to position the tooltip more correctly
-                                    props.x = props.y + TOOLTIP_OFFSET_X;
-                                    props.y = x + TOOLTIP_OFFSET_Y;
-                                } else if (!this.props.horizontal) {
-                                    // to position the tooltip more correctly
-                                    props.x += TOOLTIP_OFFSET_X;
-                                }
+        return [
+            {
+                target: 'data',
+                eventHandlers: {
+                    onMouseOver: () => {
+                        return [
+                            {
+                                target: 'data',
+                                mutation: (props: any) => {
+                                    // swap x and y label pos when in horizontal mode
+                                    if (
+                                        this.props.horizontal &&
+                                        !props.datum.searchLabel
+                                    ) {
+                                        const x = props.x;
+                                        // to position the tooltip more correctly
+                                        props.x = props.y + TOOLTIP_OFFSET_X;
+                                        props.y = x + TOOLTIP_OFFSET_Y;
+                                    } else if (!this.props.horizontal) {
+                                        // to position the tooltip more correctly
+                                        props.x += TOOLTIP_OFFSET_X;
+                                    }
 
-                                this.tooltipModel = props;
-                                this.pointHovered = true;
+                                    this.tooltipModel = props;
+                                    this.pointHovered = true;
 
-                                if (disappearTimeout !== null) {
-                                    clearTimeout(disappearTimeout);
-                                    disappearTimeout = null;
-                                }
+                                    if (disappearTimeout !== null) {
+                                        clearTimeout(disappearTimeout);
+                                        disappearTimeout = null;
+                                    }
 
-                                return { active: true };
-                            }
-                        }
-                    ];
-                },
-                onMouseOut: () => {
-                    return [
-                        {
-                            target: "data",
-                            mutation: () => {
-                                if (disappearTimeout !== null) {
-                                    clearTimeout(disappearTimeout);
-                                }
+                                    return { active: true };
+                                },
+                            },
+                        ];
+                    },
+                    onMouseOut: () => {
+                        return [
+                            {
+                                target: 'data',
+                                mutation: () => {
+                                    if (disappearTimeout !== null) {
+                                        clearTimeout(disappearTimeout);
+                                    }
 
-                                disappearTimeout = setTimeout(()=>{
-                                    this.pointHovered = false;
-                                }, disappearDelayMs);
+                                    disappearTimeout = setTimeout(() => {
+                                        this.pointHovered = false;
+                                    }, disappearDelayMs);
 
-                                return { active: false };
-                            }
-                        }
-                    ];
-                }
-            }
-        }];
+                                    return { active: false };
+                                },
+                            },
+                        ];
+                    },
+                },
+            },
+        ];
     }
 
     @computed get fontFamily() {
@@ -156,15 +175,20 @@ export default class WaterfallPlot<D extends IBaseWaterfallPlotData> extends Rea
 
     @computed get title() {
         if (this.props.title) {
-            const text = textTruncationUtils(this.props.title, this.props.chartWidth, this.fontFamily, "13px");
+            const text = textTruncationUtils(
+                this.props.title,
+                this.props.chartWidth,
+                this.fontFamily,
+                '13px'
+            );
             return (
                 <VictoryLabel
                     style={{
-                        fontWeight:"bold",
+                        fontWeight: 'bold',
                         fontFamily: this.fontFamily,
-                        textAnchor: "middle"
+                        textAnchor: 'middle',
                     }}
-                    x={this.svgWidth/2}
+                    x={this.svgWidth / 2}
                     y="1.2em"
                     text={text}
                 />
@@ -176,10 +200,17 @@ export default class WaterfallPlot<D extends IBaseWaterfallPlotData> extends Rea
 
     @computed get axisLabel() {
         if (this.props.axisLabel) {
-            const maxDimension = this.props.horizontal? this.props.chartWidth : this.props.chartHeight;
-            return textTruncationUtils(this.props.axisLabel, maxDimension, this.fontFamily, "13px");
+            const maxDimension = this.props.horizontal
+                ? this.props.chartWidth
+                : this.props.chartHeight;
+            return textTruncationUtils(
+                this.props.axisLabel,
+                maxDimension,
+                this.fontFamily,
+                '13px'
+            );
         }
-        return "";
+        return '';
     }
 
     @computed get legendX() {
@@ -191,34 +222,49 @@ export default class WaterfallPlot<D extends IBaseWaterfallPlotData> extends Rea
         if (!this.props.legendData) {
             return 0;
         } else {
-            const numRows = Math.ceil(this.props.legendData.length / LEGEND_ITEMS_PER_ROW);
-            return 23.7*numRows;
+            const numRows = Math.ceil(
+                this.props.legendData.length / LEGEND_ITEMS_PER_ROW
+            );
+            return 23.7 * numRows;
         }
     }
 
     private get legend() {
         if (this.props.legendData && this.props.legendData.length) {
             let legendData = this.props.legendData;
-            if (this.legendLocation === "bottom") {
+            if (this.legendLocation === 'bottom') {
                 // if legend is at bottom then flatten labels
-                legendData = legendData.map(x=>{
+                legendData = legendData.map(x => {
                     let name = x.name;
                     if (Array.isArray(x.name)) {
-                        name = (name as string[]).join(" "); // flatten labels by joining with space
+                        name = (name as string[]).join(' '); // flatten labels by joining with space
                     }
                     return {
-                        name, symbol: x.symbol
+                        name,
+                        symbol: x.symbol,
                     };
                 });
             }
             return (
                 <VictoryLegend
-                    orientation={this.legendLocation === "right" ? "vertical" : "horizontal"}
-                    itemsPerRow={this.legendLocation === "right" ? undefined : LEGEND_ITEMS_PER_ROW}
-                    rowGutter={this.legendLocation === "right" ? undefined : -5}
+                    orientation={
+                        this.legendLocation === 'right'
+                            ? 'vertical'
+                            : 'horizontal'
+                    }
+                    itemsPerRow={
+                        this.legendLocation === 'right'
+                            ? undefined
+                            : LEGEND_ITEMS_PER_ROW
+                    }
+                    rowGutter={this.legendLocation === 'right' ? undefined : -5}
                     data={legendData}
-                    x={this.legendLocation === "right" ? this.legendX : 50}
-                    y={this.legendLocation === "right" ? 100 : this.svgHeight-this.bottomLegendHeight+3}
+                    x={this.legendLocation === 'right' ? this.legendX : 50}
+                    y={
+                        this.legendLocation === 'right'
+                            ? 100
+                            : this.svgHeight - this.bottomLegendHeight + 3
+                    }
                 />
             );
         } else {
@@ -226,14 +272,20 @@ export default class WaterfallPlot<D extends IBaseWaterfallPlotData> extends Rea
         }
     }
 
-    @computed get plotDomain():{value:number[], order:number[]} {
+    @computed get plotDomain(): { value: number[]; order: number[] } {
         // data extremes
-        let max = _(this.waterfallPlotData).map('value').max() || 0;
-        let min = _(this.waterfallPlotData).map('value').min() || 0;
+        let max =
+            _(this.waterfallPlotData)
+                .map('value')
+                .max() || 0;
+        let min =
+            _(this.waterfallPlotData)
+                .map('value')
+                .min() || 0;
 
         return {
             value: [min!, max!],
-            order: [1, this.waterfallPlotData.length] // return range defined by the number of samples for the x-axis
+            order: [1, this.waterfallPlotData.length], // return range defined by the number of samples for the x-axis
         };
     }
 
@@ -256,53 +308,55 @@ export default class WaterfallPlot<D extends IBaseWaterfallPlotData> extends Rea
     }
 
     @computed get svgHeight() {
-        if (this.props.horizontal)  {
-            return this.props.chartHeight+this.bottomLegendHeight;
+        if (this.props.horizontal) {
+            return this.props.chartHeight + this.bottomLegendHeight;
         }
         return this.props.chartHeight;
     }
 
     @computed get legendLocation() {
-        if (this.props.legendLocationWidthThreshold !== undefined &&
-            this.props.chartWidth > this.props.legendLocationWidthThreshold) {
-            return "bottom";
+        if (
+            this.props.legendLocationWidthThreshold !== undefined &&
+            this.props.chartWidth > this.props.legendLocationWidthThreshold
+        ) {
+            return 'bottom';
         } else {
-            return "right";
+            return 'right';
         }
     }
 
     @bind
-    private datumAccessorY(d:IBaseWaterfallPlotData) {
+    private datumAccessorY(d: IBaseWaterfallPlotData) {
         return d.value;
     }
 
     @bind
-    private datumAccessorBaseLine(d:IBaseWaterfallPlotData) {
+    private datumAccessorBaseLine(d: IBaseWaterfallPlotData) {
         return d.offset;
     }
 
     @bind
-    private datumAccessorX(d:IBaseWaterfallPlotData) {
+    private datumAccessorX(d: IBaseWaterfallPlotData) {
         return d.order;
     }
 
     @bind
-    private datumAccessorLabelY(d:IBaseWaterfallPlotData) {
+    private datumAccessorLabelY(d: IBaseWaterfallPlotData) {
         return d.labely;
     }
 
     @bind
-    private datumAccessorLabelX(d:IBaseWaterfallPlotData) {
+    private datumAccessorLabelX(d: IBaseWaterfallPlotData) {
         return d.labelx;
     }
 
     @bind
-    private datumAccessorSearchIndicatorY(d:IBaseWaterfallPlotData) {
+    private datumAccessorSearchIndicatorY(d: IBaseWaterfallPlotData) {
         return d.searchindicatory;
     }
 
     @bind
-    private datumAccessorSearchIndicatorX(d:IBaseWaterfallPlotData) {
+    private datumAccessorSearchIndicatorX(d: IBaseWaterfallPlotData) {
         return d.searchindicatorx;
     }
 
@@ -313,16 +367,20 @@ export default class WaterfallPlot<D extends IBaseWaterfallPlotData> extends Rea
         return makePlotSizeFunction(highlight, size);
     }
 
-    private tickFormat(t:number, ticks:number[], logScaleFunc:IAxisLogScaleParams|undefined) {
+    private tickFormat(
+        t: number,
+        ticks: number[],
+        logScaleFunc: IAxisLogScaleParams | undefined
+    ) {
         if (logScaleFunc && !this.props.useLogSpaceTicks) {
             t = logScaleFunc.fInvLogScale(t);
-            ticks = ticks.map(x=>logScaleFunc.fInvLogScale(x));
+            ticks = ticks.map(x => logScaleFunc.fInvLogScale(x));
         }
         return tickFormatNumeral(t, ticks);
     }
 
     @bind
-    private tickFormatX(t:number, i:number, ticks:number[]) {
+    private tickFormatX(t: number, i: number, ticks: number[]) {
         if (this.props.horizontal) {
             return this.tickFormat(t, ticks, this.props.log);
         }
@@ -330,7 +388,7 @@ export default class WaterfallPlot<D extends IBaseWaterfallPlotData> extends Rea
     }
 
     @bind
-    private tickFormatY(t:number, i:number, ticks:number[]) {
+    private tickFormatY(t: number, i: number, ticks: number[]) {
         if (this.props.horizontal) {
             return undefined;
         }
@@ -344,51 +402,75 @@ export default class WaterfallPlot<D extends IBaseWaterfallPlotData> extends Rea
 
         // sort datapoints according to value
         // default sort order for sortBy is ascending (a.k.a 'ASC') order
-        dataPoints = _.sortBy(dataPoints, (d:D) => d.value);
+        dataPoints = _.sortBy(dataPoints, (d: D) => d.value);
         if (
-                (this.props.horizontal && this.props.sortOrder === 'ASC') ||
-                (!this.props.horizontal && this.props.sortOrder === 'DESC')
+            (this.props.horizontal && this.props.sortOrder === 'ASC') ||
+            (!this.props.horizontal && this.props.sortOrder === 'DESC')
         ) {
             dataPoints = _.reverse(dataPoints);
         }
         // assign a x value (equivalent to position in array)
-        _.each(dataPoints, (d:IBaseWaterfallPlotData, index:number) => d.order = index + 1 );
+        _.each(
+            dataPoints,
+            (d: IBaseWaterfallPlotData, index: number) => (d.order = index + 1)
+        );
         const offset = this.props.pivotThreshold || 0;
-        
+
         // for log transformation one should handle negative numbers
         // this is done by transposing all data so that negative numbers no
         // longer occur. Als include the pivotThreshold.
-        const values =  _.map(dataPoints, 'value').concat([offset]);
+        const values = _.map(dataPoints, 'value').concat([offset]);
         const minValue = _.min(values) || 0;
-        const logOffset = minValue < 0? Math.abs(minValue)+0.0001 : 0;
+        const logOffset = minValue < 0 ? Math.abs(minValue) + 0.0001 : 0;
 
         // add offset to data points and log-transform when applicable
-        _.each(dataPoints, (d:IBaseWaterfallPlotData) => {
-            d.offset = logTransFormFunc? logTransFormFunc.fLogScale(offset, logOffset):offset;
-            d.value = logTransFormFunc?  logTransFormFunc.fLogScale(d.value, logOffset):d.value;
+        _.each(dataPoints, (d: IBaseWaterfallPlotData) => {
+            d.offset = logTransFormFunc
+                ? logTransFormFunc.fLogScale(offset, logOffset)
+                : offset;
+            d.value = logTransFormFunc
+                ? logTransFormFunc.fLogScale(d.value, logOffset)
+                : d.value;
         });
 
         return dataPoints;
     }
 
     @computed get styledWaterfallPlotData() {
-
         const dataPoints = _.cloneDeep(this.waterfallPlotData);
 
-       // add style information to each point
-        _.each(dataPoints, (d:IBaseWaterfallPlotData) => {
+        // add style information to each point
+        _.each(dataPoints, (d: IBaseWaterfallPlotData) => {
             d.fill = this.resolveStyleOptionType<string>(d, this.props.fill);
-            d.fillOpacity = this.resolveStyleOptionType<number>(d, this.props.fillOpacity);
-            d.stroke = this.resolveStyleOptionType<string>(d, this.props.stroke);
-            d.strokeOpacity = this.resolveStyleOptionType<number>(d, this.props.strokeOpacity);
-            d.strokeWidth = this.resolveStyleOptionType<number>(d, this.props.strokeWidth);
-            d.symbol = this.resolveStyleOptionType<string>(d, this.props.symbol);
+            d.fillOpacity = this.resolveStyleOptionType<number>(
+                d,
+                this.props.fillOpacity
+            );
+            d.stroke = this.resolveStyleOptionType<string>(
+                d,
+                this.props.stroke
+            );
+            d.strokeOpacity = this.resolveStyleOptionType<number>(
+                d,
+                this.props.strokeOpacity
+            );
+            d.strokeWidth = this.resolveStyleOptionType<number>(
+                d,
+                this.props.strokeWidth
+            );
+            d.symbol = this.resolveStyleOptionType<string>(
+                d,
+                this.props.symbol
+            );
         });
 
         return dataPoints;
     }
 
-    resolveStyleOptionType<T>(datum:IBaseWaterfallPlotData, styleOption:any):T {
+    resolveStyleOptionType<T>(
+        datum: IBaseWaterfallPlotData,
+        styleOption: any
+    ): T {
         if (typeof styleOption === 'function') {
             return styleOption(datum);
         }
@@ -396,29 +478,32 @@ export default class WaterfallPlot<D extends IBaseWaterfallPlotData> extends Rea
     }
 
     @computed get limitLabels() {
-
         // filter out data points that are limitted
         // these will get a symbol above the resp. bar
-        const dataPoints = _.filter(this.waterfallPlotData, (d) => this.resolveStyleOptionType<boolean>(d, this.props.labelVisibility));
+        const dataPoints = _.filter(this.waterfallPlotData, d =>
+            this.resolveStyleOptionType<boolean>(d, this.props.labelVisibility)
+        );
 
         const limitLabels = _.cloneDeep(dataPoints);
 
-        const range = this.props.horizontal ? this.plotDomainX : this.plotDomainY;
+        const range = this.props.horizontal
+            ? this.plotDomainX
+            : this.plotDomainY;
         const min_value = range[0];
         const max_value = range[1];
         const pivotThreshold = this.props.pivotThreshold || 0;
-        const offset:number = (max_value - min_value) * LABEL_OFFSET_FRACTION; // determine magnitude of offset for symbols
+        const offset: number = (max_value - min_value) * LABEL_OFFSET_FRACTION; // determine magnitude of offset for symbols
 
         // add offset information for possible labels above the bars
-        _.each(limitLabels, (d:IBaseWaterfallPlotData) => {
-
+        _.each(limitLabels, (d: IBaseWaterfallPlotData) => {
             const offsetLocal = d.value! >= pivotThreshold ? offset : -offset; // determine direction of offset for symbols (above or below)
             const labelPos = d.value! + offsetLocal;
 
             if (this.props.horizontal) {
                 d.labelx = labelPos;
                 d.labely = d.order;
-            } else { // ! this.props.horizontal
+            } else {
+                // ! this.props.horizontal
                 d.labelx = d.order;
                 d.labely = labelPos;
             }
@@ -428,27 +513,29 @@ export default class WaterfallPlot<D extends IBaseWaterfallPlotData> extends Rea
     }
 
     @computed get searchLabels() {
-
-        if (! this.props.highlight) {
+        if (!this.props.highlight) {
             return [];
         }
 
-        const dataPoints = _.filter(this.waterfallPlotData, (d:any) => this.props.highlight!(d) );
+        const dataPoints = _.filter(this.waterfallPlotData, (d: any) =>
+            this.props.highlight!(d)
+        );
 
         const searchLabels = _.cloneDeep(dataPoints);
         // add marker field to search label
-        _.each(searchLabels, (o) => o.searchLabel = true);
+        _.each(searchLabels, o => (o.searchLabel = true));
 
-        const range = this.props.horizontal ? this.plotDomainX : this.plotDomainY;
+        const range = this.props.horizontal
+            ? this.plotDomainX
+            : this.plotDomainY;
         const min_value = range[0];
         const max_value = range[1];
 
         // determine magnitude of offset for symbols
-        const offset:number = (max_value - min_value) * LABEL_OFFSET_FRACTION;
+        const offset: number = (max_value - min_value) * LABEL_OFFSET_FRACTION;
 
         // add offset information for search labels to datapoints
-        _.each(searchLabels, (d:IBaseWaterfallPlotData) => {
-
+        _.each(searchLabels, (d: IBaseWaterfallPlotData) => {
             // determine direction of offset for symbols (above or below line y=0)
             const localOffset = d.value! <= d.offset! ? offset : -offset;
             const labelPos = d.offset! + localOffset;
@@ -458,46 +545,48 @@ export default class WaterfallPlot<D extends IBaseWaterfallPlotData> extends Rea
             if (this.props.horizontal) {
                 d.searchindicatorx = labelPos;
                 d.searchindicatory = d.order;
-            } else { // ! this.props.horizontal
+            } else {
+                // ! this.props.horizontal
                 d.searchindicatorx = d.order;
                 d.searchindicatory = labelPos;
             }
-
         });
 
         return searchLabels;
     }
-    
+
     @computed get plotPaddingInPixels() {
         if (this.props.horizontal) {
-            return {y:30, x:3};
+            return { y: 30, x: 3 };
         }
-        return {y:3, x:30};
+        return { y: 3, x: 30 };
     }
-    
+
     @bind
     private getChart() {
         return (
             <div
                 ref={this.containerRef}
-                style={{width: this.svgWidth, height: this.svgHeight}}
+                style={{ width: this.svgWidth, height: this.svgHeight }}
             >
                 <svg
-                    id={this.props.svgId || ""}
+                    id={this.props.svgId || ''}
                     style={{
                         width: this.svgWidth,
                         height: this.svgHeight,
-                        pointerEvents: "all"
+                        pointerEvents: 'all',
                     }}
                     height={this.svgHeight}
                     width={this.svgWidth}
                     role="img"
                     viewBox={`0 0 ${this.svgWidth} ${this.svgHeight}`}
-                    >
+                >
                     <g>{this.title}</g>
                     <g
-                        transform={`translate(${LEFT_PADDING},${this.props.horizontal ? CHART_OFFSET_Y : 0})`}
-                        >
+                        transform={`translate(${LEFT_PADDING},${
+                            this.props.horizontal ? CHART_OFFSET_Y : 0
+                        })`}
+                    >
                         <VictoryChart
                             theme={CBIOPORTAL_VICTORY_THEME}
                             width={this.props.chartWidth}
@@ -507,42 +596,57 @@ export default class WaterfallPlot<D extends IBaseWaterfallPlotData> extends Rea
                             singleQuadrantDomainPadding={this.props.horizontal}
                         >
                             {this.legend}
-                            {this.props.horizontal && <VictoryAxis
-                                domain={this.plotDomainX}
-                                orientation="top"
-                                crossAxis={false}
-                                tickCount={NUM_AXIS_TICKS}
-                                tickFormat={this.tickFormatX}
-                                axisLabelComponent={<VictoryLabel dy={-20}/>}
-                                label={this.axisLabel}
-                            />}
-                           {this.props.horizontal && <VictoryAxis
-                                orientation="left"
-                                dependentAxis={true}
-                                tickFormat={() => ''}
-                                style={{ axis: {stroke: "none"}, ticks: {stroke: "none"}, tickLabels: {stroke: "none"} }}
-                           />}
-                           {!this.props.horizontal && <VictoryAxis
-                                domain={this.plotDomainY}
-                                offsetX={50}
-                                orientation="left"
-                                crossAxis={false}
-                                tickCount={NUM_AXIS_TICKS}
-                                tickFormat={this.tickFormatY}
-                                dependentAxis={true}
-                                axisLabelComponent={<VictoryLabel dy={-35}/>}
-                                label={this.axisLabel}
-                            />}
+                            {this.props.horizontal && (
+                                <VictoryAxis
+                                    domain={this.plotDomainX}
+                                    orientation="top"
+                                    crossAxis={false}
+                                    tickCount={NUM_AXIS_TICKS}
+                                    tickFormat={this.tickFormatX}
+                                    axisLabelComponent={
+                                        <VictoryLabel dy={-20} />
+                                    }
+                                    label={this.axisLabel}
+                                />
+                            )}
+                            {this.props.horizontal && (
+                                <VictoryAxis
+                                    orientation="left"
+                                    dependentAxis={true}
+                                    tickFormat={() => ''}
+                                    style={{
+                                        axis: { stroke: 'none' },
+                                        ticks: { stroke: 'none' },
+                                        tickLabels: { stroke: 'none' },
+                                    }}
+                                />
+                            )}
+                            {!this.props.horizontal && (
+                                <VictoryAxis
+                                    domain={this.plotDomainY}
+                                    offsetX={50}
+                                    orientation="left"
+                                    crossAxis={false}
+                                    tickCount={NUM_AXIS_TICKS}
+                                    tickFormat={this.tickFormatY}
+                                    dependentAxis={true}
+                                    axisLabelComponent={
+                                        <VictoryLabel dy={-35} />
+                                    }
+                                    label={this.axisLabel}
+                                />
+                            )}
                             <VictoryBar
                                 // barRatio={1} // removes spaces between bars
                                 style={{
                                     data: {
-                                        fill: (d:D) => d.fill,
-                                        stroke: (d:D) => d.stroke,
-                                        strokeWidth: (d:D) => d.strokeWidth,
-                                        strokeOpacity: (d:D) => d.strokeOpacity,
-                                        fillOpacity: (d:D) => d.fillOpacity
-                                    }
+                                        fill: (d: D) => d.fill,
+                                        stroke: (d: D) => d.stroke,
+                                        strokeWidth: (d: D) => d.strokeWidth,
+                                        strokeOpacity: (d: D) =>
+                                            d.strokeOpacity,
+                                        fillOpacity: (d: D) => d.fillOpacity,
+                                    },
                                 }}
                                 horizontal={this.props.horizontal}
                                 data={this.styledWaterfallPlotData}
@@ -555,29 +659,43 @@ export default class WaterfallPlot<D extends IBaseWaterfallPlotData> extends Rea
                             <VictoryScatter
                                 style={{
                                     data: {
-                                        fill: limitValueAppearanceSupplement.fill,
-                                        stroke: limitValueAppearanceSupplement.stroke,
-                                        strokeWidth: limitValueAppearanceSupplement.strokeWidth,
-                                        strokeOpacity: limitValueAppearanceSupplement.strokeOpacity,
-                                    }
+                                        fill:
+                                            limitValueAppearanceSupplement.fill,
+                                        stroke:
+                                            limitValueAppearanceSupplement.stroke,
+                                        strokeWidth:
+                                            limitValueAppearanceSupplement.strokeWidth,
+                                        strokeOpacity:
+                                            limitValueAppearanceSupplement.strokeOpacity,
+                                    },
                                 }}
                                 symbol={limitValueAppearance.symbol}
                                 size={limitValueAppearanceSupplement.size}
                                 data={this.limitLabels}
                                 x={this.datumAccessorLabelX}
                                 y={this.datumAccessorLabelY}
-                                />
+                            />
                             <VictoryScatter
                                 style={{
                                     data: {
-                                        fill: waterfallSearchIndicatorAppearance.fill,
-                                        stroke: waterfallSearchIndicatorAppearance.stroke,
-                                        strokeWidth: waterfallSearchIndicatorAppearance.strokeWidth * SEARCH_LABEL_SIZE_MULTIPLIER,
-                                        strokeOpacity: waterfallSearchIndicatorAppearance.strokeOpacity
-                                    }
+                                        fill:
+                                            waterfallSearchIndicatorAppearance.fill,
+                                        stroke:
+                                            waterfallSearchIndicatorAppearance.stroke,
+                                        strokeWidth:
+                                            waterfallSearchIndicatorAppearance.strokeWidth *
+                                            SEARCH_LABEL_SIZE_MULTIPLIER,
+                                        strokeOpacity:
+                                            waterfallSearchIndicatorAppearance.strokeOpacity,
+                                    },
                                 }}
-                                symbol={waterfallSearchIndicatorAppearance.symbol}
-                                size={waterfallSearchIndicatorAppearance.size * SEARCH_LABEL_SIZE_MULTIPLIER}
+                                symbol={
+                                    waterfallSearchIndicatorAppearance.symbol
+                                }
+                                size={
+                                    waterfallSearchIndicatorAppearance.size *
+                                    SEARCH_LABEL_SIZE_MULTIPLIER
+                                }
                                 data={this.searchLabels}
                                 events={this.mouseEvents}
                                 x={this.datumAccessorSearchIndicatorX}
@@ -596,14 +714,15 @@ export default class WaterfallPlot<D extends IBaseWaterfallPlotData> extends Rea
         }
         return (
             <div>
-                <Observer>
-                    {this.getChart}
-                </Observer>
+                <Observer>{this.getChart}</Observer>
                 {this.container && this.tooltipModel && this.props.tooltip && (
                     <WaterfallPlotTooltip
                         container={this.container}
                         targetHovered={this.pointHovered}
-                        targetCoords={{x: this.tooltipModel.x + LEFT_PADDING, y: this.tooltipModel.y}}
+                        targetCoords={{
+                            x: this.tooltipModel.x + LEFT_PADDING,
+                            y: this.tooltipModel.y,
+                        }}
                         overlay={this.props.tooltip(this.tooltipModel.datum)}
                     />
                 )}
diff --git a/src/shared/components/plots/WaterfallPlotTooltip.tsx b/src/shared/components/plots/WaterfallPlotTooltip.tsx
index 739591a794b..8fe4f5bc4ed 100644
--- a/src/shared/components/plots/WaterfallPlotTooltip.tsx
+++ b/src/shared/components/plots/WaterfallPlotTooltip.tsx
@@ -1,21 +1,24 @@
-import {observer} from "mobx-react";
-import * as React from "react";
-import {observable} from "mobx";
-import {Popover} from "react-bootstrap";
-import bind from "bind-decorator";
-import classnames from "classnames";
+import { observer } from 'mobx-react';
+import * as React from 'react';
+import { observable } from 'mobx';
+import { Popover } from 'react-bootstrap';
+import bind from 'bind-decorator';
+import classnames from 'classnames';
 
 export interface IWaterfallPlotTooltipProps {
-    container:HTMLDivElement;
-    overlay:JSX.Element;
-    targetCoords:{x:number, y:number};
-    targetHovered?:boolean;
-    className?:string;
-    placement?:string;
+    container: HTMLDivElement;
+    overlay: JSX.Element;
+    targetCoords: { x: number; y: number };
+    targetHovered?: boolean;
+    className?: string;
+    placement?: string;
 }
 
 @observer
-export default class WaterfallPlotTooltip extends React.Component<IWaterfallPlotTooltipProps, {}> {
+export default class WaterfallPlotTooltip extends React.Component<
+    IWaterfallPlotTooltipProps,
+    {}
+> {
     @observable isHovered = false; // allows persistence when mouse rolls over tooltip
 
     @bind
@@ -32,13 +35,29 @@ export default class WaterfallPlotTooltip extends React.Component<IWaterfallPlot
         const arrowOffsetTop = 30; // experimentally determined
         const arrowOffsetLeft = 24; // experimentally determined
         const leftPadding = 5;
-        const horizontal = !this.props.placement || this.props.placement === "left" || this.props.placement === "right";
+        const horizontal =
+            !this.props.placement ||
+            this.props.placement === 'left' ||
+            this.props.placement === 'right';
         if (this.props.targetHovered || this.isHovered) {
             return (
                 <Popover
-                    className={classnames("cbioportal-frontend", "cbioTooltip", this.props.className)}
-                    positionLeft={this.props.targetCoords.x + this.props.container.offsetLeft + leftPadding - (!horizontal ? arrowOffsetLeft + 6 : 0)}
-                    positionTop={this.props.targetCoords.y + this.props.container.offsetTop - (horizontal ? arrowOffsetTop : -5)}
+                    className={classnames(
+                        'cbioportal-frontend',
+                        'cbioTooltip',
+                        this.props.className
+                    )}
+                    positionLeft={
+                        this.props.targetCoords.x +
+                        this.props.container.offsetLeft +
+                        leftPadding -
+                        (!horizontal ? arrowOffsetLeft + 6 : 0)
+                    }
+                    positionTop={
+                        this.props.targetCoords.y +
+                        this.props.container.offsetTop -
+                        (horizontal ? arrowOffsetTop : -5)
+                    }
                     onMouseEnter={this.onMouseEnter}
                     onMouseLeave={this.onMouseLeave}
                     arrowOffsetTop={horizontal ? arrowOffsetTop : undefined}
@@ -52,4 +71,4 @@ export default class WaterfallPlotTooltip extends React.Component<IWaterfallPlot
             return null;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/plots/downsampleByGrouping.spec.ts b/src/shared/components/plots/downsampleByGrouping.spec.ts
index 0ec8450e3ae..d4be5c9faf2 100644
--- a/src/shared/components/plots/downsampleByGrouping.spec.ts
+++ b/src/shared/components/plots/downsampleByGrouping.spec.ts
@@ -1,59 +1,131 @@
-import {assert} from "chai";
-import {downsampleByGrouping} from "./downsampleByGrouping";
-import _ from "lodash";
+import { assert } from 'chai';
+import { downsampleByGrouping } from './downsampleByGrouping';
+import _ from 'lodash';
 
-const data:{x:number, y:number, blah:string}[] = [
-    {x:0, y:0, blah:"A"},{x:1, y:0, blah:"B"},{x:2, y:0, blah:"C"},{x:0, y:3, blah:"D"},{x:0, y:4, blah:"E"},{x:1, y:5, blah:"F"}
+const data: { x: number; y: number; blah: string }[] = [
+    { x: 0, y: 0, blah: 'A' },
+    { x: 1, y: 0, blah: 'B' },
+    { x: 2, y: 0, blah: 'C' },
+    { x: 0, y: 3, blah: 'D' },
+    { x: 0, y: 4, blah: 'E' },
+    { x: 1, y: 5, blah: 'F' },
 ];
 
-const sortBy = [(d:any)=>d.x, (d:any)=>d.y];
-describe("downsampleByGrouping", ()=>{
-    it("returns correct result for empty input", ()=>{
+const sortBy = [(d: any) => d.x, (d: any) => d.y];
+describe('downsampleByGrouping', () => {
+    it('returns correct result for empty input', () => {
         assert.deepEqual(downsampleByGrouping([], 1), []);
     });
-    it("returns original array with zero distance threshold", ()=>{
-        assert.deepEqual(_.sortBy<any>(downsampleByGrouping(data, 0), sortBy),
-            _.sortBy<any>(data, sortBy).map(
-                d=>({ x: d.x, y: d.y, data:[d] })
-            )
+    it('returns original array with zero distance threshold', () => {
+        assert.deepEqual(
+            _.sortBy<any>(downsampleByGrouping(data, 0), sortBy),
+            _.sortBy<any>(data, sortBy).map(d => ({
+                x: d.x,
+                y: d.y,
+                data: [d],
+            }))
         );
     });
-    it("downsamples by grouping correctly with threshold 1", ()=>{
+    it('downsamples by grouping correctly with threshold 1', () => {
         assert.deepEqual(_.sortBy<any>(downsampleByGrouping(data, 1), sortBy), [
-            {x:0, y:0, data:[{x:0, y:0, blah:"A"}, {x:1, y:0, blah:"B"}]},
-            {x:0, y:3, data:[{x:0, y:3, blah:"D"}, {x:0, y:4, blah:"E"}]},
-            {x:1, y:5, data:[{x:1, y:5, blah:"F"}]},
-            {x:2, y:0, data:[{x:2, y:0, blah:"C"}]},
+            {
+                x: 0,
+                y: 0,
+                data: [{ x: 0, y: 0, blah: 'A' }, { x: 1, y: 0, blah: 'B' }],
+            },
+            {
+                x: 0,
+                y: 3,
+                data: [{ x: 0, y: 3, blah: 'D' }, { x: 0, y: 4, blah: 'E' }],
+            },
+            { x: 1, y: 5, data: [{ x: 1, y: 5, blah: 'F' }] },
+            { x: 2, y: 0, data: [{ x: 2, y: 0, blah: 'C' }] },
         ]);
     });
-    it("downsamples by grouping correctly with threshold 2", ()=>{
+    it('downsamples by grouping correctly with threshold 2', () => {
         assert.deepEqual(_.sortBy<any>(downsampleByGrouping(data, 2), sortBy), [
-            {x:0, y:0, data:[{x:0, y:0, blah:"A"}, {x:1, y:0, blah:"B"}, {x:2, y:0, blah:"C"}]},
-            {x:0, y:3, data:[{x:0, y:3, blah:"D"}, {x:0, y:4, blah:"E"}]},
-            {x:1, y:5, data:[{x:1, y:5, blah:"F"}]},
+            {
+                x: 0,
+                y: 0,
+                data: [
+                    { x: 0, y: 0, blah: 'A' },
+                    { x: 1, y: 0, blah: 'B' },
+                    { x: 2, y: 0, blah: 'C' },
+                ],
+            },
+            {
+                x: 0,
+                y: 3,
+                data: [{ x: 0, y: 3, blah: 'D' }, { x: 0, y: 4, blah: 'E' }],
+            },
+            { x: 1, y: 5, data: [{ x: 1, y: 5, blah: 'F' }] },
         ]);
     });
-    it("downsamples by grouping correctly with threshold 3", ()=>{
+    it('downsamples by grouping correctly with threshold 3', () => {
         assert.deepEqual(_.sortBy<any>(downsampleByGrouping(data, 3), sortBy), [
-            {x:0, y:0, data:[{x:0, y:0, blah:"A"}, {x:1, y:0, blah:"B"}, {x:2, y:0, blah:"C"}, {x:0, y:3, blah:"D"}]},
-            {x:0, y:4, data:[{x:0, y:4, blah:"E"}, {x:1, y:5, blah:"F"}]}
+            {
+                x: 0,
+                y: 0,
+                data: [
+                    { x: 0, y: 0, blah: 'A' },
+                    { x: 1, y: 0, blah: 'B' },
+                    { x: 2, y: 0, blah: 'C' },
+                    { x: 0, y: 3, blah: 'D' },
+                ],
+            },
+            {
+                x: 0,
+                y: 4,
+                data: [{ x: 0, y: 4, blah: 'E' }, { x: 1, y: 5, blah: 'F' }],
+            },
         ]);
     });
-    it("downsamples by grouping correctly with threshold 4", ()=>{
+    it('downsamples by grouping correctly with threshold 4', () => {
         assert.deepEqual(_.sortBy<any>(downsampleByGrouping(data, 4), sortBy), [
-            {x:0, y:0, data:[{x:0, y:0, blah:"A"}, {x:1, y:0, blah:"B"}, {x:2, y:0, blah:"C"}, {x:0, y:3, blah:"D"}, {x:0, y:4, blah:"E"}]},
-            {x:1, y:5, data:[{x:1, y:5, blah:"F"}]}
+            {
+                x: 0,
+                y: 0,
+                data: [
+                    { x: 0, y: 0, blah: 'A' },
+                    { x: 1, y: 0, blah: 'B' },
+                    { x: 2, y: 0, blah: 'C' },
+                    { x: 0, y: 3, blah: 'D' },
+                    { x: 0, y: 4, blah: 'E' },
+                ],
+            },
+            { x: 1, y: 5, data: [{ x: 1, y: 5, blah: 'F' }] },
         ]);
     });
-    it("downsamples by grouping correctly with threshold 5", ()=>{
+    it('downsamples by grouping correctly with threshold 5', () => {
         assert.deepEqual(_.sortBy<any>(downsampleByGrouping(data, 5), sortBy), [
-            {x:0, y:0, data:[{x:0, y:0, blah:"A"}, {x:1, y:0, blah:"B"}, {x:2, y:0, blah:"C"}, {x:0, y:3, blah:"D"}, {x:0, y:4, blah:"E"}]},
-            {x:1, y:5, data:[{x:1, y:5, blah:"F"}]}
+            {
+                x: 0,
+                y: 0,
+                data: [
+                    { x: 0, y: 0, blah: 'A' },
+                    { x: 1, y: 0, blah: 'B' },
+                    { x: 2, y: 0, blah: 'C' },
+                    { x: 0, y: 3, blah: 'D' },
+                    { x: 0, y: 4, blah: 'E' },
+                ],
+            },
+            { x: 1, y: 5, data: [{ x: 1, y: 5, blah: 'F' }] },
         ]);
     });
-    it("downsamples by grouping correctly with threshold 6", ()=>{
+    it('downsamples by grouping correctly with threshold 6', () => {
         assert.deepEqual(_.sortBy<any>(downsampleByGrouping(data, 6), sortBy), [
-            {x:0, y:0, data:[{x:0, y:0, blah:"A"}, {x:1, y:0, blah:"B"}, {x:2, y:0, blah:"C"}, {x:0, y:3, blah:"D"}, {x:0, y:4, blah:"E"}, {x:1, y:5, blah:"F"}]}
+            {
+                x: 0,
+                y: 0,
+                data: [
+                    { x: 0, y: 0, blah: 'A' },
+                    { x: 1, y: 0, blah: 'B' },
+                    { x: 2, y: 0, blah: 'C' },
+                    { x: 0, y: 3, blah: 'D' },
+                    { x: 0, y: 4, blah: 'E' },
+                    { x: 1, y: 5, blah: 'F' },
+                ],
+            },
         ]);
     });
-});
\ No newline at end of file
+});
diff --git a/src/shared/components/plots/downsampleByGrouping.ts b/src/shared/components/plots/downsampleByGrouping.ts
index b557ced878a..6f30166cf51 100644
--- a/src/shared/components/plots/downsampleByGrouping.ts
+++ b/src/shared/components/plots/downsampleByGrouping.ts
@@ -1,70 +1,74 @@
-type DownsamplingTree<D extends {x:number, y:number}> = {
-    summaryPoint:{
-        data:D[];
-        x:number;
-        y:number;
-    },
-    upLeft?:DownsamplingTree<D>;
-    downLeft?:DownsamplingTree<D>;
-    upRight?:DownsamplingTree<D>;
-    downRight?:DownsamplingTree<D>;
-}
+type DownsamplingTree<D extends { x: number; y: number }> = {
+    summaryPoint: {
+        data: D[];
+        x: number;
+        y: number;
+    };
+    upLeft?: DownsamplingTree<D>;
+    downLeft?: DownsamplingTree<D>;
+    upRight?: DownsamplingTree<D>;
+    downRight?: DownsamplingTree<D>;
+};
 
-function makeTree(basePoint:{x:number, y:number}):DownsamplingTree<any> {
+function makeTree(basePoint: { x: number; y: number }): DownsamplingTree<any> {
     return {
         summaryPoint: {
             data: [],
-            x:basePoint.x,
-            y:basePoint.y,
-        }
+            x: basePoint.x,
+            y: basePoint.y,
+        },
     };
 }
 
 function distanceSquared(
-    a:{x:number, y:number},
-    b:{x:number, y:number},
-    transform?:{
-        x:(X:number)=>number,
-        y:(Y:number)=>number
+    a: { x: number; y: number },
+    b: { x: number; y: number },
+    transform?: {
+        x: (X: number) => number;
+        y: (Y: number) => number;
     }
-):number {
+): number {
     const dx = transform ? transform.x(a.x) - transform.x(b.x) : a.x - b.x;
     const dy = transform ? transform.y(a.y) - transform.y(b.y) : a.y - b.y;
-    return dx*dx + dy*dy;
+    return dx * dx + dy * dy;
 }
 
 export type DSData<D> = {
-    x: number,
-    y: number,
-    data: D[]
-}
+    x: number;
+    y: number;
+    data: D[];
+};
 
-export function downsampleByGrouping<D extends {x:number, y:number}>(
-    data:D[],
-    distanceThreshold:number,
-    transform?:{
-        x:(X:number)=>number,
-        y:(Y:number)=>number
+export function downsampleByGrouping<D extends { x: number; y: number }>(
+    data: D[],
+    distanceThreshold: number,
+    transform?: {
+        x: (X: number) => number;
+        y: (Y: number) => number;
     }
-):DSData<D>[] {
+): DSData<D>[] {
     if (!data.length) {
         return [];
     }
 
     // build tree
-    const tree:DownsamplingTree<D> = makeTree(data[0]);
+    const tree: DownsamplingTree<D> = makeTree(data[0]);
     const squaredDistanceThreshold = distanceThreshold * distanceThreshold;
 
     for (const datum of data) {
         let currentNode = tree;
-        while (distanceSquared(currentNode.summaryPoint, datum, transform) > squaredDistanceThreshold) {
+        while (
+            distanceSquared(currentNode.summaryPoint, datum, transform) >
+            squaredDistanceThreshold
+        ) {
             const gtX = datum.x >= currentNode.summaryPoint.x;
             const gtY = datum.y >= currentNode.summaryPoint.y;
             if (gtX && gtY) {
                 currentNode.upRight = currentNode.upRight || makeTree(datum);
                 currentNode = currentNode.upRight!;
             } else if (gtX && !gtY) {
-                currentNode.downRight = currentNode.downRight || makeTree(datum);
+                currentNode.downRight =
+                    currentNode.downRight || makeTree(datum);
                 currentNode = currentNode.downRight!;
             } else if (!gtX && gtY) {
                 currentNode.upLeft = currentNode.upLeft || makeTree(datum);
@@ -84,18 +88,14 @@ export function downsampleByGrouping<D extends {x:number, y:number}>(
     while (queue.length > 0) {
         const currentNode = queue.pop()!;
         ret.push(currentNode.summaryPoint);
-        if (currentNode.upRight)
-            queue.push(currentNode.upRight);
+        if (currentNode.upRight) queue.push(currentNode.upRight);
 
-        if (currentNode.downRight)
-            queue.push(currentNode.downRight);
+        if (currentNode.downRight) queue.push(currentNode.downRight);
 
-        if (currentNode.upLeft)
-            queue.push(currentNode.upLeft);
+        if (currentNode.upLeft) queue.push(currentNode.upLeft);
 
-        if (currentNode.downLeft)
-            queue.push(currentNode.downLeft);
+        if (currentNode.downLeft) queue.push(currentNode.downLeft);
     }
 
     return ret;
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/progressIndicator/ProgressIndicator.tsx b/src/shared/components/progressIndicator/ProgressIndicator.tsx
index 892d679b632..1dd204618e1 100644
--- a/src/shared/components/progressIndicator/ProgressIndicator.tsx
+++ b/src/shared/components/progressIndicator/ProgressIndicator.tsx
@@ -1,49 +1,53 @@
-import * as React from "react";
-import {observer} from "mobx-react";
-import styles from "./styles.module.scss";
-import classnames from "classnames";
-import {computed, observable} from "mobx";
-import _ from "lodash";
-import ErrorMessage from "../ErrorMessage";
-import Spinner from "react-spinkit";
-import {MobxPromise} from "mobxpromise";
-import {getMobxPromiseGroupStatus} from "../../lib/getMobxPromiseGroupStatus";
-import autobind from "autobind-decorator";
+import * as React from 'react';
+import { observer } from 'mobx-react';
+import styles from './styles.module.scss';
+import classnames from 'classnames';
+import { computed, observable } from 'mobx';
+import _ from 'lodash';
+import ErrorMessage from '../ErrorMessage';
+import Spinner from 'react-spinkit';
+import { MobxPromise } from 'mobxpromise';
+import { getMobxPromiseGroupStatus } from '../../lib/getMobxPromiseGroupStatus';
+import autobind from 'autobind-decorator';
 import Timer = NodeJS.Timer;
 
 export interface IProgressIndicatorItem {
     label: any;
-    style?:any;
-    promises?:MobxPromise<any>[]; // if `promises` is not defined, then just show pending
-    hideIcon?:boolean; // dont show any icon for this item if `hideIcon` is true
-};
+    style?: any;
+    promises?: MobxPromise<any>[]; // if `promises` is not defined, then just show pending
+    hideIcon?: boolean; // dont show any icon for this item if `hideIcon` is true
+}
 
 export interface IProgressIndicatorProps {
-    getItems:(elapsedSecs:number)=>IProgressIndicatorItem[];
-    show:boolean;
-    sequential?:boolean; // if true, things further in list are not showed as loading until previous in list are completed
+    getItems: (elapsedSecs: number) => IProgressIndicatorItem[];
+    show: boolean;
+    sequential?: boolean; // if true, things further in list are not showed as loading until previous in list are completed
 }
 
-function getItemStatus(item:IProgressIndicatorItem):"complete"|"pending"|"error" {
+function getItemStatus(
+    item: IProgressIndicatorItem
+): 'complete' | 'pending' | 'error' {
     if (item.promises) {
         if (item.promises.length === 0) {
-            return "complete";
+            return 'complete';
         } else {
-            return getMobxPromiseGroupStatus(...(item.promises));
+            return getMobxPromiseGroupStatus(...item.promises);
         }
     } else {
-        return "pending";
+        return 'pending';
     }
 }
 
 @observer
-export default class ProgressIndicator extends React.Component<IProgressIndicatorProps, {}> {
-
+export default class ProgressIndicator extends React.Component<
+    IProgressIndicatorProps,
+    {}
+> {
     @observable timeShown = 0;
-    private timeShownInterval:Timer;
+    private timeShownInterval: Timer;
 
     componentWillMount() {
-        this.timeShownInterval = setInterval(()=>{
+        this.timeShownInterval = setInterval(() => {
             if (this.props.show) {
                 this.timeShown += 1;
             } else {
@@ -63,36 +67,59 @@ export default class ProgressIndicator extends React.Component<IProgressIndicato
     }
 
     @computed get firstIncompleteIndex() {
-        return this.items.findIndex(item=>(getItemStatus(item) !== "complete"));
+        return this.items.findIndex(item => getItemStatus(item) !== 'complete');
     }
 
     @autobind
-    private makeItem(item:IProgressIndicatorItem, index:number) {
-        let icon:any = null;
+    private makeItem(item: IProgressIndicatorItem, index: number) {
+        let icon: any = null;
         // if sequential option is true, then only show any icon if all previous items are complete
-        const notInvoked = this.props.sequential && (index > this.firstIncompleteIndex);
+        const notInvoked =
+            this.props.sequential && index > this.firstIncompleteIndex;
         // also don't show any icon if user specifies it
         const showIcon = !notInvoked && !item.hideIcon;
         if (showIcon) {
             switch (getItemStatus(item)) {
-                case "complete":
-                    icon = <i className={classnames("fa fa-sm fa-check", styles["fa-check"])}/>;
+                case 'complete':
+                    icon = (
+                        <i
+                            className={classnames(
+                                'fa fa-sm fa-check',
+                                styles['fa-check']
+                            )}
+                        />
+                    );
                     break;
-                case "pending":
-                    icon = <Spinner name="double-bounce" fadeIn={false} className={styles["pulse-spinner"]} />
+                case 'pending':
+                    icon = (
+                        <Spinner
+                            name="double-bounce"
+                            fadeIn={false}
+                            className={styles['pulse-spinner']}
+                        />
+                    );
                     break;
-                case "error":
-                    icon = <i className={classnames("fa fa-sm fa-exclamation-triangle", styles["fa-exclamation-triangle"])}/>;
+                case 'error':
+                    icon = (
+                        <i
+                            className={classnames(
+                                'fa fa-sm fa-exclamation-triangle',
+                                styles['fa-exclamation-triangle']
+                            )}
+                        />
+                    );
                     break;
             }
         }
         return (
             <span
-                className={classnames(styles["item-row"], {[styles["not-invoked-item"]]:notInvoked})}
+                className={classnames(styles['item-row'], {
+                    [styles['not-invoked-item']]: notInvoked,
+                })}
                 style={item.style}
             >
                 {item.label}
-                <span style={{marginLeft:7}}>{icon}</span>
+                <span style={{ marginLeft: 7 }}>{icon}</span>
             </span>
         );
     }
@@ -101,15 +128,16 @@ export default class ProgressIndicator extends React.Component<IProgressIndicato
         if (this.props.show) {
             return (
                 <div className={styles.container}>
-                        <div className={styles["items-container"]}>
-                            {this.items.map(this.makeItem)}
-                        </div>
-                    { _.some(this.items, i=>(getItemStatus(i)==="error")) &&
-                        <ErrorMessage/>}
+                    <div className={styles['items-container']}>
+                        {this.items.map(this.makeItem)}
+                    </div>
+                    {_.some(this.items, i => getItemStatus(i) === 'error') && (
+                        <ErrorMessage />
+                    )}
                 </div>
             );
         } else {
             return null;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/progressIndicator/styles.module.scss b/src/shared/components/progressIndicator/styles.module.scss
index 45785e27562..36e4e52a203 100644
--- a/src/shared/components/progressIndicator/styles.module.scss
+++ b/src/shared/components/progressIndicator/styles.module.scss
@@ -1,57 +1,57 @@
 .container {
-  display:flex;
-  flex-direction:column;
-  align-items:center;
-  justify-content:center;
-  width:100%;
-  height:100%;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    width: 100%;
+    height: 100%;
 }
 
 .items-container {
-  display:flex;
-  flex-direction:column;
-  justify-content:left;
-  padding:9px;
-  border-radius:10px;
+    display: flex;
+    flex-direction: column;
+    justify-content: left;
+    padding: 9px;
+    border-radius: 10px;
 }
 
 .fa-check {
-  position:absolute;
-  color: $brand-success;
-  top:2px;
+    position: absolute;
+    color: $brand-success;
+    top: 2px;
 }
 
 .fa-exclamation-triangle {
-  position:absolute;
-  color: $brand-danger;
-  top:2px;
+    position: absolute;
+    color: $brand-danger;
+    top: 2px;
 }
 
 .not-invoked-item {
-  color: #aaaaaa;
+    color: #aaaaaa;
 }
 
 .item-row {
-  position:relative;
-  display:flex;
-  flex-direction:row;
-  align-items:center;
-  justify-content: center;
-  margin-top:4px;
+    position: relative;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: center;
+    margin-top: 4px;
 
-  &:nth-child(1) {
-    margin-top: 0px !important;
-  }
+    &:nth-child(1) {
+        margin-top: 0px !important;
+    }
 }
 
 .pulse-spinner {
-  color:$brand-primary;
-  position:absolute;
-  top:2px;
-  div {
-    height:14px;
-    width:14px;
-    opacity:0.7;
-    animation-duration:2.0s !important;
-  }
-}
\ No newline at end of file
+    color: $brand-primary;
+    position: absolute;
+    top: 2px;
+    div {
+        height: 14px;
+        width: 14px;
+        opacity: 0.7;
+        animation-duration: 2s !important;
+    }
+}
diff --git a/src/shared/components/proteinChainPanel/PdbChainTable.tsx b/src/shared/components/proteinChainPanel/PdbChainTable.tsx
index fd302bf939d..b77d6678c3b 100644
--- a/src/shared/components/proteinChainPanel/PdbChainTable.tsx
+++ b/src/shared/components/proteinChainPanel/PdbChainTable.tsx
@@ -1,108 +1,154 @@
-import * as React from "react";
-import LazyMobXTable, {Column} from "../lazyMobXTable/LazyMobXTable";
-import {observer} from "mobx-react";
-import {IPdbChain} from "../../model/Pdb";
-import PdbChainDataStore from "../mutationMapper/PdbChainDataStore";
-import PdbChainInfo from "../PdbChainInfo";
-import PdbHeaderCache from "../../cache/PdbHeaderCache";
-import {computed} from "mobx";
-import {PdbHeader} from "cbioportal-frontend-commons";
-import OrganismColumnFormatter from "./column/OrganismColumnFormatter";
-import LazyLoadedTableCell from "shared/lib/LazyLoadedTableCell";
-import {generatePdbInfoSummary} from "../../lib/PdbUtils";
+import * as React from 'react';
+import LazyMobXTable, { Column } from '../lazyMobXTable/LazyMobXTable';
+import { observer } from 'mobx-react';
+import { IPdbChain } from '../../model/Pdb';
+import PdbChainDataStore from '../mutationMapper/PdbChainDataStore';
+import PdbChainInfo from '../PdbChainInfo';
+import PdbHeaderCache from '../../cache/PdbHeaderCache';
+import { computed } from 'mobx';
+import { PdbHeader } from 'cbioportal-frontend-commons';
+import OrganismColumnFormatter from './column/OrganismColumnFormatter';
+import LazyLoadedTableCell from 'shared/lib/LazyLoadedTableCell';
+import { generatePdbInfoSummary } from '../../lib/PdbUtils';
 
 class PdbChainTableComponent extends LazyMobXTable<IPdbChain> {}
 
 export interface IPdbChainTableProps {
-    dataStore:PdbChainDataStore;
-    cache?:PdbHeaderCache;
+    dataStore: PdbChainDataStore;
+    cache?: PdbHeaderCache;
 }
 
 @observer
-export default class PdbChainTable extends React.Component<IPdbChainTableProps, {}> {
-    @computed private get columns():Column<IPdbChain>[] {
-        const ret:Column<IPdbChain>[] = [];
+export default class PdbChainTable extends React.Component<
+    IPdbChainTableProps,
+    {}
+> {
+    @computed private get columns(): Column<IPdbChain>[] {
+        const ret: Column<IPdbChain>[] = [];
 
         ret.push({
-            name: "PDB Id",
-            render:(d:IPdbChain)=>{
+            name: 'PDB Id',
+            render: (d: IPdbChain) => {
                 return (
-                    <a href={`http://www.rcsb.org/pdb/explore/explore.do?structureId=${d.pdbId}`}
-                       target="_blank"
+                    <a
+                        href={`http://www.rcsb.org/pdb/explore/explore.do?structureId=${d.pdbId}`}
+                        target="_blank"
                     >
                         {d.pdbId}
                     </a>
                 );
             },
-            sortBy:(d:IPdbChain)=>{
+            sortBy: (d: IPdbChain) => {
                 return d.pdbId;
             },
-            filter:(d:IPdbChain, filterString:string, filterStringUpper:string)=>{
-                return (d.pdbId.toUpperCase().indexOf(filterStringUpper) > -1);
-            }
+            filter: (
+                d: IPdbChain,
+                filterString: string,
+                filterStringUpper: string
+            ) => {
+                return d.pdbId.toUpperCase().indexOf(filterStringUpper) > -1;
+            },
         });
 
         ret.push({
-            name: "Chain",
-            render:(d:IPdbChain)=>{
+            name: 'Chain',
+            render: (d: IPdbChain) => {
                 return (
                     <span>
-                        <span style={{float:"left", fontWeight:"bold", fontStyle:"italic"}}>
+                        <span
+                            style={{
+                                float: 'left',
+                                fontWeight: 'bold',
+                                fontStyle: 'italic',
+                            }}
+                        >
                             {d.chain}
                         </span>
-                        <a style={{float:"right", fontWeight:"bold", cursor:"pointer"}}
-                           onClick={()=>{ this.props.dataStore.selectUid(this.props.dataStore.getChainUid(d)); }}
+                        <a
+                            style={{
+                                float: 'right',
+                                fontWeight: 'bold',
+                                cursor: 'pointer',
+                            }}
+                            onClick={() => {
+                                this.props.dataStore.selectUid(
+                                    this.props.dataStore.getChainUid(d)
+                                );
+                            }}
                         >
                             3D
                         </a>
                     </span>
                 );
             },
-            sortBy:(d:IPdbChain)=>{
+            sortBy: (d: IPdbChain) => {
                 return d.chain;
             },
-            filter:(d:IPdbChain, filterString:string, filterStringUpper:string)=>{
-                return (d.chain.toUpperCase().indexOf(filterStringUpper) > -1);
-            }
+            filter: (
+                d: IPdbChain,
+                filterString: string,
+                filterStringUpper: string
+            ) => {
+                return d.chain.toUpperCase().indexOf(filterStringUpper) > -1;
+            },
         });
 
         ret.push({
-            name: "Uniprot Positions",
-            render:(d:IPdbChain)=>{
-                return (<span>{`${d.uniprotStart}-${d.uniprotEnd}`}</span>);
+            name: 'Uniprot Positions',
+            render: (d: IPdbChain) => {
+                return <span>{`${d.uniprotStart}-${d.uniprotEnd}`}</span>;
             },
-            sortBy:(d:IPdbChain)=>{
+            sortBy: (d: IPdbChain) => {
                 return [d.uniprotStart, d.uniprotEnd];
             },
-            filter:(d:IPdbChain, filterString:string)=>{
-                return (((d.uniprotStart + "").indexOf(filterString) > -1) ||
-                    ((d.uniprotEnd + "").indexOf(filterString) > -1));
-            }
+            filter: (d: IPdbChain, filterString: string) => {
+                return (
+                    (d.uniprotStart + '').indexOf(filterString) > -1 ||
+                    (d.uniprotEnd + '').indexOf(filterString) > -1
+                );
+            },
         });
 
         ret.push({
-            name: "Organism",
-            render:LazyLoadedTableCell(
-                (d:IPdbChain)=>{
-                    return (this.props.cache ? this.props.cache.get(d.pdbId) : null);
+            name: 'Organism',
+            render: LazyLoadedTableCell(
+                (d: IPdbChain) => {
+                    return this.props.cache
+                        ? this.props.cache.get(d.pdbId)
+                        : null;
                 },
-                (h:PdbHeader, d:IPdbChain)=>{
-                    return (<span>{OrganismColumnFormatter.getOrganism(h, d.chain)}</span>);
+                (h: PdbHeader, d: IPdbChain) => {
+                    return (
+                        <span>
+                            {OrganismColumnFormatter.getOrganism(h, d.chain)}
+                        </span>
+                    );
                 }
             ),
-            sortBy:(d:IPdbChain)=>{
-                return OrganismColumnFormatter.getOrganismFromCache(this.props.cache, d);
+            sortBy: (d: IPdbChain) => {
+                return OrganismColumnFormatter.getOrganismFromCache(
+                    this.props.cache,
+                    d
+                );
             },
-            filter:(d:IPdbChain, filterString:string, filterStringUpper:string)=>{
-                const organism = OrganismColumnFormatter.getOrganismFromCache(this.props.cache, d) || "";
-                return (organism.toUpperCase().indexOf(filterStringUpper) > -1);
+            filter: (
+                d: IPdbChain,
+                filterString: string,
+                filterStringUpper: string
+            ) => {
+                const organism =
+                    OrganismColumnFormatter.getOrganismFromCache(
+                        this.props.cache,
+                        d
+                    ) || '';
+                return organism.toUpperCase().indexOf(filterStringUpper) > -1;
             },
             visible: !!this.props.cache,
         });
 
         ret.push({
-            name: "Summary",
-            render:(d:IPdbChain)=>{
+            name: 'Summary',
+            render: (d: IPdbChain) => {
                 return (
                     <PdbChainInfo
                         pdbId={d.pdbId}
@@ -113,20 +159,33 @@ export default class PdbChainTable extends React.Component<IPdbChainTableProps,
                     />
                 );
             },
-            filter:(d:IPdbChain, filterString:string, filterStringUpper:string)=>{
+            filter: (
+                d: IPdbChain,
+                filterString: string,
+                filterStringUpper: string
+            ) => {
                 if (!this.props.cache) {
                     return false;
                 }
                 const cacheData = this.props.cache.get(d.pdbId);
                 if (cacheData && cacheData.data) {
-                    const infoSummary = generatePdbInfoSummary(cacheData.data, d.chain);
-                    return ((infoSummary.pdbInfo.toUpperCase().indexOf(filterStringUpper) > -1) ||
-                        ((infoSummary.moleculeInfo || "").toUpperCase().indexOf(filterStringUpper) > -1));
+                    const infoSummary = generatePdbInfoSummary(
+                        cacheData.data,
+                        d.chain
+                    );
+                    return (
+                        infoSummary.pdbInfo
+                            .toUpperCase()
+                            .indexOf(filterStringUpper) > -1 ||
+                        (infoSummary.moleculeInfo || '')
+                            .toUpperCase()
+                            .indexOf(filterStringUpper) > -1
+                    );
                 } else {
                     return false;
                 }
             },
-            visible: !!this.props.cache
+            visible: !!this.props.cache,
         });
 
         return ret;
@@ -140,8 +199,8 @@ export default class PdbChainTable extends React.Component<IPdbChainTableProps,
                 itemsLabel="PDB chain"
                 itemsLabelPlural="PDB chains"
                 paginationProps={{
-                    showItemsPerPageSelector:false,
-                    showMoreButton:false
+                    showItemsPerPageSelector: false,
+                    showMoreButton: false,
                 }}
                 initialItemsPerPage={6}
                 columns={this.columns}
diff --git a/src/shared/components/proteinChainPanel/ProteinChain.tsx b/src/shared/components/proteinChainPanel/ProteinChain.tsx
index 2b742c47f09..e7e0497d850 100644
--- a/src/shared/components/proteinChainPanel/ProteinChain.tsx
+++ b/src/shared/components/proteinChainPanel/ProteinChain.tsx
@@ -1,52 +1,58 @@
-import * as React from "react";
-import {ProteinChainSpec} from "./ProteinChainView";
-import {observer} from "mobx-react";
-import {observable, computed} from "mobx";
-import * as _ from "lodash";
+import * as React from 'react';
+import { ProteinChainSpec } from './ProteinChainView';
+import { observer } from 'mobx-react';
+import { observable, computed } from 'mobx';
+import * as _ from 'lodash';
 
 type ProteinChainProps = ProteinChainSpec & {
-    positionToX:(pos:number)=>number;
-    y:number;
-    height:number;
-    uniqueHitZoneClassName:string;
-    highlighted?:boolean;
+    positionToX: (pos: number) => number;
+    y: number;
+    height: number;
+    uniqueHitZoneClassName: string;
+    highlighted?: boolean;
 };
 
 @observer
-export default class ProteinChain extends React.Component<ProteinChainProps, {}> {
-
-    @computed get segmentsAndGaps():{gap:boolean, start:number, end:number}[] {
+export default class ProteinChain extends React.Component<
+    ProteinChainProps,
+    {}
+> {
+    @computed get segmentsAndGaps(): {
+        gap: boolean;
+        start: number;
+        end: number;
+    }[] {
         const ret = [];
-        const sortedGaps = _.sortBy(this.props.gaps, gap=>gap.start);
+        const sortedGaps = _.sortBy(this.props.gaps, gap => gap.start);
         if (sortedGaps.length === 0) {
             ret.push({
-                gap:false,
+                gap: false,
                 start: this.props.start,
-                end: this.props.end
+                end: this.props.end,
             });
         } else {
             if (sortedGaps[0].start > this.props.start) {
                 ret.push({
                     gap: false,
                     start: this.props.start,
-                    end: sortedGaps[0].start
+                    end: sortedGaps[0].start,
                 });
             }
             ret.push({
-                gap:true,
+                gap: true,
                 start: sortedGaps[0].start,
-                end: sortedGaps[0].end
+                end: sortedGaps[0].end,
             });
-            for (let i=1; i<sortedGaps.length; i++) {
+            for (let i = 1; i < sortedGaps.length; i++) {
                 ret.push({
                     gap: false,
-                    start: sortedGaps[i-1].end,
-                    end: sortedGaps[i].start
+                    start: sortedGaps[i - 1].end,
+                    end: sortedGaps[i].start,
                 });
                 ret.push({
                     gap: true,
                     start: sortedGaps[i].start,
-                    end: sortedGaps[i].end
+                    end: sortedGaps[i].end,
                 });
             }
             const lastGap = sortedGaps[sortedGaps.length - 1];
@@ -54,7 +60,7 @@ export default class ProteinChain extends React.Component<ProteinChainProps, {}>
                 ret.push({
                     gap: false,
                     start: lastGap.end,
-                    end: this.props.end
+                    end: this.props.end,
                 });
             }
         }
@@ -64,7 +70,7 @@ export default class ProteinChain extends React.Component<ProteinChainProps, {}>
     render() {
         return (
             <g key={this.props.uniqueHitZoneClassName}>
-                {this.segmentsAndGaps.map(obj=>{
+                {this.segmentsAndGaps.map(obj => {
                     if (obj.gap) {
                         return (
                             <line
@@ -72,8 +78,8 @@ export default class ProteinChain extends React.Component<ProteinChainProps, {}>
                                 strokeWidth="0.5"
                                 x1={this.props.positionToX(obj.start)}
                                 x2={this.props.positionToX(obj.end)}
-                                y1={this.props.y + this.props.height/2}
-                                y2={this.props.y + this.props.height/2}
+                                y1={this.props.y + this.props.height / 2}
+                                y2={this.props.y + this.props.height / 2}
                             />
                         );
                     } else {
@@ -85,7 +91,10 @@ export default class ProteinChain extends React.Component<ProteinChainProps, {}>
                                 strokeWidth="0.5"
                                 x={this.props.positionToX(obj.start)}
                                 y={this.props.y}
-                                width={this.props.positionToX(obj.end)-this.props.positionToX(obj.start)}
+                                width={
+                                    this.props.positionToX(obj.end) -
+                                    this.props.positionToX(obj.start)
+                                }
                                 height={this.props.height}
                             />
                         );
@@ -95,9 +104,12 @@ export default class ProteinChain extends React.Component<ProteinChainProps, {}>
                     stroke="#FF9900"
                     strokeWidth="2"
                     fillOpacity="0"
-                    strokeOpacity={+(!!this.props.highlighted)}
+                    strokeOpacity={+!!this.props.highlighted}
                     height={this.props.height}
-                    width={this.props.positionToX(this.props.end) - this.props.positionToX(this.props.start)}
+                    width={
+                        this.props.positionToX(this.props.end) -
+                        this.props.positionToX(this.props.start)
+                    }
                     x={this.props.positionToX(this.props.start)}
                     y={this.props.y}
                     className={this.props.uniqueHitZoneClassName}
@@ -105,4 +117,4 @@ export default class ProteinChain extends React.Component<ProteinChainProps, {}>
             </g>
         );
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/proteinChainPanel/ProteinChainPanel.tsx b/src/shared/components/proteinChainPanel/ProteinChainPanel.tsx
index 6af9cd8c87f..151c9bce70b 100644
--- a/src/shared/components/proteinChainPanel/ProteinChainPanel.tsx
+++ b/src/shared/components/proteinChainPanel/ProteinChainPanel.tsx
@@ -1,58 +1,66 @@
-import * as React from "react";
-import ProteinChainView from "./ProteinChainView";
-import PdbChainTable from "./PdbChainTable"
-import {observer} from "mobx-react";
-import {computed, observable, action, IReactionDisposer, reaction} from "mobx";
-import {ProteinChainSpec} from "./ProteinChainView";
-import {Collapse} from "react-collapse";
-import {HitZone, DefaultTooltip} from "cbioportal-frontend-commons";
-import MutationMapperStore from "shared/components/mutationMapper/MutationMapperStore";
-import {ALIGNMENT_GAP, IPdbChain} from "../../model/Pdb";
-import PdbHeaderCache from "../../cache/PdbHeaderCache";
-import PdbChainInfo from "../PdbChainInfo";
-import onNextRenderFrame from "shared/lib/onNextRenderFrame";
+import * as React from 'react';
+import ProteinChainView from './ProteinChainView';
+import PdbChainTable from './PdbChainTable';
+import { observer } from 'mobx-react';
+import {
+    computed,
+    observable,
+    action,
+    IReactionDisposer,
+    reaction,
+} from 'mobx';
+import { ProteinChainSpec } from './ProteinChainView';
+import { Collapse } from 'react-collapse';
+import { HitZone, DefaultTooltip } from 'cbioportal-frontend-commons';
+import MutationMapperStore from 'shared/components/mutationMapper/MutationMapperStore';
+import { ALIGNMENT_GAP, IPdbChain } from '../../model/Pdb';
+import PdbHeaderCache from '../../cache/PdbHeaderCache';
+import PdbChainInfo from '../PdbChainInfo';
+import onNextRenderFrame from 'shared/lib/onNextRenderFrame';
 
 type ProteinChainPanelProps = {
-    store:MutationMapperStore;
-    geneWidth:number;
-    geneXOffset?:number;
+    store: MutationMapperStore;
+    geneWidth: number;
+    geneXOffset?: number;
     maxChainsHeight: number;
-    pdbHeaderCache?:PdbHeaderCache;
+    pdbHeaderCache?: PdbHeaderCache;
 };
 
 @observer
-export default class ProteinChainPanel extends React.Component<ProteinChainPanelProps, {}> {
-
-    @observable private isExpanded:boolean = false;
-    @observable private pdbChainTableShown:boolean = false;
-    @observable private hoveredChain:IPdbChain|undefined;
-    @observable hitZoneConfig:any = {
+export default class ProteinChainPanel extends React.Component<
+    ProteinChainPanelProps,
+    {}
+> {
+    @observable private isExpanded: boolean = false;
+    @observable private pdbChainTableShown: boolean = false;
+    @observable private hoveredChain: IPdbChain | undefined;
+    @observable hitZoneConfig: any = {
         x: 0,
         y: 0,
         width: 0,
         height: 0,
-        onClick: ()=>{}
+        onClick: () => {},
     };
 
-    private chainDiv:HTMLDivElement;
-    private _chainScrollY:number = 0;
+    private chainDiv: HTMLDivElement;
+    private _chainScrollY: number = 0;
 
-    private collapseTimeout:number|null = null;
-    private expandTimeout:number|null = null;
-    private chainUidToY:{[uid:string]:number} = {};
-    private onChainSelectReaction:IReactionDisposer;
+    private collapseTimeout: number | null = null;
+    private expandTimeout: number | null = null;
+    private chainUidToY: { [uid: string]: number } = {};
+    private onChainSelectReaction: IReactionDisposer;
 
     private expandDelayMs = 750;
     private collapseDelayMs = 3000;
 
-    private handlers:any;
+    private handlers: any;
 
-    constructor(props:ProteinChainPanelProps) {
+    constructor(props: ProteinChainPanelProps) {
         super(props);
 
         this.handlers = {
-            onMouseEnter:action(()=>{
-                this.expandTimeout = window.setTimeout(()=>{
+            onMouseEnter: action(() => {
+                this.expandTimeout = window.setTimeout(() => {
                     this.isExpanded = true;
                 }, this.expandDelayMs);
 
@@ -60,8 +68,8 @@ export default class ProteinChainPanel extends React.Component<ProteinChainPanel
                     window.clearTimeout(this.collapseTimeout);
                 }
             }),
-            onMouseLeave:action(()=>{
-                this.collapseTimeout = window.setTimeout(()=>{
+            onMouseLeave: action(() => {
+                this.collapseTimeout = window.setTimeout(() => {
                     this.isExpanded = false;
                 }, this.collapseDelayMs);
 
@@ -69,16 +77,18 @@ export default class ProteinChainPanel extends React.Component<ProteinChainPanel
                     window.clearTimeout(this.expandTimeout);
                 }
             }),
-            chainDivRef:(div:HTMLDivElement)=>{this.chainDiv = div;},
-            onChainScroll:()=>{
+            chainDivRef: (div: HTMLDivElement) => {
+                this.chainDiv = div;
+            },
+            onChainScroll: () => {
                 if (this.chainDiv && this.isExpanded) {
                     this._chainScrollY = this.chainDiv.scrollTop;
                 }
             },
-            togglePDBTable:action(()=>{
+            togglePDBTable: action(() => {
                 this.pdbChainTableShown = !this.pdbChainTableShown;
             }),
-            getTooltipContent:()=>{
+            getTooltipContent: () => {
                 if (this.hoveredChain) {
                     return (
                         <PdbChainInfo
@@ -91,33 +101,45 @@ export default class ProteinChainPanel extends React.Component<ProteinChainPanel
                     return null;
                 }
             },
-            setHitZone:(hitRect:{x:number, y:number, width:number, height:number},
-                        chainUid:string)=>{
+            setHitZone: (
+                hitRect: {
+                    x: number;
+                    y: number;
+                    width: number;
+                    height: number;
+                },
+                chainUid: string
+            ) => {
                 this.hitZoneConfig.x = hitRect.x;
                 this.hitZoneConfig.y = hitRect.y;
                 this.hitZoneConfig.width = hitRect.width;
                 this.hitZoneConfig.height = hitRect.height;
-                this.hitZoneConfig.onClick = ()=>{
+                this.hitZoneConfig.onClick = () => {
                     this.selectChain(chainUid);
                 };
-                this.hoveredChain = this.props.store.pdbChainDataStore.getPdbChain(chainUid);
+                this.hoveredChain = this.props.store.pdbChainDataStore.getPdbChain(
+                    chainUid
+                );
             },
-            setChainUidToY:(chainUidToY:{[uid:string]:number})=>{
+            setChainUidToY: (chainUidToY: { [uid: string]: number }) => {
                 this.chainUidToY = chainUidToY;
-            }
+            },
         };
         this.onChainSelectReaction = reaction(
-            ()=>this.props.store.pdbChainDataStore.selectedUid,
-            (selectedUid:string)=>{
+            () => this.props.store.pdbChainDataStore.selectedUid,
+            (selectedUid: string) => {
                 const chainY = this.chainUidToY[selectedUid];
-                if (typeof chainY !== "undefined" &&
+                if (
+                    typeof chainY !== 'undefined' &&
                     (chainY < this.chainDiv.scrollTop ||
-                    chainY > (this.chainDiv.scrollTop + this.props.maxChainsHeight))) {
-                    const halfChainsHeight = this.props.maxChainsHeight/2;
+                        chainY >
+                            this.chainDiv.scrollTop +
+                                this.props.maxChainsHeight)
+                ) {
+                    const halfChainsHeight = this.props.maxChainsHeight / 2;
                     this.chainDiv.scrollTop = chainY - halfChainsHeight;
                 }
-            },
-
+            }
         );
     }
 
@@ -133,7 +155,7 @@ export default class ProteinChainPanel extends React.Component<ProteinChainPanel
         }
     }
 
-    @action private selectChain(chainUid:string) {
+    @action private selectChain(chainUid: string) {
         this.props.store.pdbChainDataStore.selectUid(chainUid);
     }
 
@@ -141,7 +163,7 @@ export default class ProteinChainPanel extends React.Component<ProteinChainPanel
         return !!this.props.store.pdbChainDataStore.selectedChain;
     }
 
-    @computed private get displayChains():IPdbChain[] {
+    @computed private get displayChains(): IPdbChain[] {
         if (!this.props.store.pdbChainDataStore.selectedChain) {
             return [];
         } else if (!this.isExpanded) {
@@ -151,12 +173,12 @@ export default class ProteinChainPanel extends React.Component<ProteinChainPanel
         }
     }
 
-    @computed get chains():ProteinChainSpec[] {
-        return this.displayChains.map((pdbChain:IPdbChain)=>{
+    @computed get chains(): ProteinChainSpec[] {
+        return this.displayChains.map((pdbChain: IPdbChain) => {
             const gaps = [];
             let gapStart = -1;
             const alignment = pdbChain.alignment;
-            for (let i=0; i<alignment.length; i++) {
+            for (let i = 0; i < alignment.length; i++) {
                 if (alignment[i] === ALIGNMENT_GAP) {
                     if (gapStart === -1) {
                         gapStart = i;
@@ -165,24 +187,27 @@ export default class ProteinChainPanel extends React.Component<ProteinChainPanel
                     if (gapStart !== -1) {
                         gaps.push({
                             start: pdbChain.uniprotStart + gapStart,
-                            end: pdbChain.uniprotStart + i
+                            end: pdbChain.uniprotStart + i,
                         });
                         gapStart = -1;
                     }
                 }
             }
             return {
-                start:pdbChain.uniprotStart,
-                end:pdbChain.uniprotEnd+1,
+                start: pdbChain.uniprotStart,
+                end: pdbChain.uniprotEnd + 1,
                 gaps,
-                opacity:pdbChain.identityPerc,
-                uid:this.props.store.pdbChainDataStore.getChainUid(pdbChain)
+                opacity: pdbChain.identityPerc,
+                uid: this.props.store.pdbChainDataStore.getChainUid(pdbChain),
             };
         });
     }
 
     @computed get proteinLength() {
-        const proteinLength = (this.props.store.canonicalTranscript.result && this.props.store.canonicalTranscript.result.proteinLength) || 0;
+        const proteinLength =
+            (this.props.store.canonicalTranscript.result &&
+                this.props.store.canonicalTranscript.result.proteinLength) ||
+            0;
         return Math.max(proteinLength, 1);
     }
 
@@ -204,71 +229,85 @@ export default class ProteinChainPanel extends React.Component<ProteinChainPanel
     }
 
     componentDidMount() {
-        onNextRenderFrame(() => this.props.store.pdbChainDataStore.selectFirstChain());
+        onNextRenderFrame(() =>
+            this.props.store.pdbChainDataStore.selectFirstChain()
+        );
     }
 
     componentDidUpdate() {
-        onNextRenderFrame(()=>{
-          if (this.chainDiv) {
-              this.chainDiv.scrollTop = this.chainScrollY;
-          }
+        onNextRenderFrame(() => {
+            if (this.chainDiv) {
+                this.chainDiv.scrollTop = this.chainScrollY;
+            }
         });
     }
 
-    public helpTooltipContent()
-    {
+    public helpTooltipContent() {
         return (
-            <div style={{maxWidth: 400}}>
-                This panel displays a list of PDB chains for the corresponding uniprot ID.
-                PDB chains are ranked with respect to their sequence similarity ratio,
-                and aligned to the y-axis of the mutation diagram.
-                Highly ranked chains have darker color than the lowly ranked ones.<br/>
-                <br/>
-                Each chain is represented by a single rectangle.
-                Gaps within the chains are represented by a thin line connecting the segments of the chain.<br/>
-                <br/>
-                By default, only a first few rows are displayed.
-                To see more chains, use the scroll bar next to the panel.
-                To see the detailed list of all available PDB chains in a table
-                click on the link below the panel.<br/>
-                <br/>
-                To select a chain, simply click on it.
-                Selected chain is highlighted with a different frame color.
-                You can also select a chain by clicking on a row in the table.
-                Selecting a chain reloads the PDB data for the 3D structure visualizer.
+            <div style={{ maxWidth: 400 }}>
+                This panel displays a list of PDB chains for the corresponding
+                uniprot ID. PDB chains are ranked with respect to their sequence
+                similarity ratio, and aligned to the y-axis of the mutation
+                diagram. Highly ranked chains have darker color than the lowly
+                ranked ones.
+                <br />
+                <br />
+                Each chain is represented by a single rectangle. Gaps within the
+                chains are represented by a thin line connecting the segments of
+                the chain.
+                <br />
+                <br />
+                By default, only a first few rows are displayed. To see more
+                chains, use the scroll bar next to the panel. To see the
+                detailed list of all available PDB chains in a table click on
+                the link below the panel.
+                <br />
+                <br />
+                To select a chain, simply click on it. Selected chain is
+                highlighted with a different frame color. You can also select a
+                chain by clicking on a row in the table. Selecting a chain
+                reloads the PDB data for the 3D structure visualizer.
             </div>
         );
     }
 
     render() {
-        const tooltipVisibleProps:any = {};
+        const tooltipVisibleProps: any = {};
         if (!this.tooltipVisible) {
             tooltipVisibleProps.visible = false;
         }
         return (
-            <div onMouseEnter={this.handlers.onMouseEnter} onMouseLeave={this.handlers.onMouseLeave}>
+            <div
+                onMouseEnter={this.handlers.onMouseEnter}
+                onMouseLeave={this.handlers.onMouseLeave}
+            >
                 <Collapse isOpened={this.isOpen}>
-                    <div style={{
-                        position:'relative',
-                    }}>
-                        <div className="small" style={{position: "absolute"}}>
+                    <div
+                        style={{
+                            position: 'relative',
+                        }}
+                    >
+                        <div className="small" style={{ position: 'absolute' }}>
                             {/* Place holder for a possible PDB icon, for now manually aligning with a margin */}
-                            <span style={{marginLeft: 16}} >PDB Chains</span>
+                            <span style={{ marginLeft: 16 }}>PDB Chains</span>
                             <DefaultTooltip
                                 placement="left"
                                 overlay={this.helpTooltipContent}
                                 destroyTooltipOnHide={true}
                             >
-                                <i className="fa fa-info-circle" style={{paddingLeft: 3}} />
+                                <i
+                                    className="fa fa-info-circle"
+                                    style={{ paddingLeft: 3 }}
+                                />
                             </DefaultTooltip>
                         </div>
                         <div
                             ref={this.handlers.chainDivRef}
                             style={{
-                                overflowY:"scroll",
-                                maxHeight:this.props.maxChainsHeight,
-                                marginLeft:this.props.geneXOffset,
-                                position:"relative"
+                                overflowY: 'scroll',
+                                maxHeight: this.props.maxChainsHeight,
+                                marginLeft: this.props.geneXOffset,
+                                position: 'relative',
                             }}
                             onScroll={this.handlers.onChainScroll}
                         >
@@ -277,7 +316,10 @@ export default class ProteinChainPanel extends React.Component<ProteinChainPanel
                                 chains={this.chains}
                                 proteinLength={this.proteinLength}
                                 setHitZone={this.handlers.setHitZone}
-                                selectedChainUid={this.props.store.pdbChainDataStore.selectedUid}
+                                selectedChainUid={
+                                    this.props.store.pdbChainDataStore
+                                        .selectedUid
+                                }
                                 setChainUidToY={this.handlers.setChainUidToY}
                             />
                             <DefaultTooltip
@@ -288,25 +330,40 @@ export default class ProteinChainPanel extends React.Component<ProteinChainPanel
                                 {this.hitZone}
                             </DefaultTooltip>
                         </div>
-                        <br/>
-                        <div style={{display: this.isExpanded ? "inherit" : "none"}}>
-                            <button onClick={this.handlers.togglePDBTable} className="btn btn-default">
-                                { (this.pdbChainTableShown) ? 'Hide PDB Chain Table' : 'Show PDB Chain Table'  }
+                        <br />
+                        <div
+                            style={{
+                                display: this.isExpanded ? 'inherit' : 'none',
+                            }}
+                        >
+                            <button
+                                onClick={this.handlers.togglePDBTable}
+                                className="btn btn-default"
+                            >
+                                {this.pdbChainTableShown
+                                    ? 'Hide PDB Chain Table'
+                                    : 'Show PDB Chain Table'}
                             </button>
-                            <div style={{
-                                display: this.pdbChainTableShown ? "inherit" : "none",
-                                maxWidth: this.props.geneWidth
-                            }}>
+                            <div
+                                style={{
+                                    display: this.pdbChainTableShown
+                                        ? 'inherit'
+                                        : 'none',
+                                    maxWidth: this.props.geneWidth,
+                                }}
+                            >
                                 <PdbChainTable
-                                    dataStore={this.props.store.pdbChainDataStore}
+                                    dataStore={
+                                        this.props.store.pdbChainDataStore
+                                    }
                                     cache={this.props.pdbHeaderCache}
                                 />
                             </div>
                         </div>
-                        <br/>
+                        <br />
                     </div>
                 </Collapse>
             </div>
         );
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/proteinChainPanel/ProteinChainView.tsx b/src/shared/components/proteinChainPanel/ProteinChainView.tsx
index 5efdcd18ccc..feb545a40ca 100644
--- a/src/shared/components/proteinChainPanel/ProteinChainView.tsx
+++ b/src/shared/components/proteinChainPanel/ProteinChainView.tsx
@@ -1,44 +1,50 @@
-import * as React from "react";
-import {observer} from "mobx-react";
-import {computed, observable, action} from "mobx";
-import HotspotSet from "../../lib/HotspotSet";
-import * as _ from "lodash";
-import {SyntheticEvent} from "react";
-import ProteinChain from "./ProteinChain";
+import * as React from 'react';
+import { observer } from 'mobx-react';
+import { computed, observable, action } from 'mobx';
+import HotspotSet from '../../lib/HotspotSet';
+import * as _ from 'lodash';
+import { SyntheticEvent } from 'react';
+import ProteinChain from './ProteinChain';
 
 export type ProteinChainSpec = {
-    start:number;
-    end:number;
-    gaps:{start:number, end:number}[];
-    opacity:number;
-    uid:string;
+    start: number;
+    end: number;
+    gaps: { start: number; end: number }[];
+    opacity: number;
+    uid: string;
 };
 
 type ProteinChainViewProps = {
-    selectedChainUid:string;
+    selectedChainUid: string;
     chains: ProteinChainSpec[];
-    width:number;
-    proteinLength:number;
-    setHitZone?:(
-        hitRect:{x:number, y:number, width:number, height:number},
-        chainUid:string
-    )=>void;
-    setChainUidToY?:(map:{[uid:string]:number})=>void;
+    width: number;
+    proteinLength: number;
+    setHitZone?: (
+        hitRect: { x: number; y: number; width: number; height: number },
+        chainUid: string
+    ) => void;
+    setChainUidToY?: (map: { [uid: string]: number }) => void;
 };
 
-const CHAIN_ID_PREFIX = "chain-";
+const CHAIN_ID_PREFIX = 'chain-';
 @observer
-export default class ProteinChainView extends React.Component<ProteinChainViewProps, {}> {
+export default class ProteinChainView extends React.Component<
+    ProteinChainViewProps,
+    {}
+> {
     @observable private rowHeight = 6;
     @observable private rowPadding = 3;
-    private chainComponents:{[id:string]:ProteinChain} = {};
+    private chainComponents: { [id: string]: ProteinChain } = {};
 
-    @computed get rowSpecs():ProteinChainSpec[][] {
+    @computed get rowSpecs(): ProteinChainSpec[][] {
         // Greedily add chains to rows, checking overlap using HotspotSet - if overlap, bump to next row
-        const ret:ProteinChainSpec[][] = [[]];
-        const overlapSets:HotspotSet[] = [new HotspotSet()];
+        const ret: ProteinChainSpec[][] = [[]];
+        const overlapSets: HotspotSet[] = [new HotspotSet()];
         for (const chain of this.props.chains) {
-            let chosenRow = _.findIndex(overlapSets, set=>!set.check(chain.start, chain.end)); // first row that can accomodate it
+            let chosenRow = _.findIndex(
+                overlapSets,
+                set => !set.check(chain.start, chain.end)
+            ); // first row that can accomodate it
             if (chosenRow === -1) {
                 chosenRow = ret.length;
                 ret.push([]);
@@ -50,45 +56,53 @@ export default class ProteinChainView extends React.Component<ProteinChainViewPr
         return ret;
     }
 
-    constructor(props:ProteinChainViewProps) {
+    constructor(props: ProteinChainViewProps) {
         super(props);
         this.onMouseOver = this.onMouseOver.bind(this);
         this.positionToX = this.positionToX.bind(this);
     }
 
-    private positionToX(position:number) {
-        return position*this.props.width/this.props.proteinLength;
+    private positionToX(position: number) {
+        return (position * this.props.width) / this.props.proteinLength;
     }
 
-    private makeChainIdClass(counter:number) {
+    private makeChainIdClass(counter: number) {
         return `${CHAIN_ID_PREFIX}${counter}`;
     }
-    private getChainId(classes:string):string|null {
-        const match = classes.split(/[\s]+/g).map(c=>c.match(new RegExp(`^(${CHAIN_ID_PREFIX}.*)$`)))
-            .find(x=>(x !== null));
+    private getChainId(classes: string): string | null {
+        const match = classes
+            .split(/[\s]+/g)
+            .map(c => c.match(new RegExp(`^(${CHAIN_ID_PREFIX}.*)$`)))
+            .find(x => x !== null);
         return (match && match[1]) || null;
     }
 
-    private chainY(rowIndex:number) {
-        return rowIndex*(this.rowHeight + this.rowPadding);
+    private chainY(rowIndex: number) {
+        return rowIndex * (this.rowHeight + this.rowPadding);
     }
 
     @computed get rows() {
         let chainCounter = 0;
         this.chainComponents = {};
-        const chainUidToY:{[uid:string]:number} = {};
+        const chainUidToY: { [uid: string]: number } = {};
 
-        const ret = this.rowSpecs.map((rowSpec, rowIndex)=>{
+        const ret = this.rowSpecs.map((rowSpec, rowIndex) => {
             return (
                 <g key={rowIndex}>
-                    {rowSpec.map(chain=>{
+                    {rowSpec.map(chain => {
                         const className = this.makeChainIdClass(chainCounter++);
                         const uid = chain.uid;
                         const y = this.chainY(rowIndex);
                         chainUidToY[uid] = y;
                         return (
                             <ProteinChain
-                                ref={(proteinChain)=>{if (proteinChain !== null) { this.chainComponents[className] = proteinChain; }}}
+                                ref={proteinChain => {
+                                    if (proteinChain !== null) {
+                                        this.chainComponents[
+                                            className
+                                        ] = proteinChain;
+                                    }
+                                }}
                                 positionToX={this.positionToX}
                                 y={y}
                                 height={this.rowHeight}
@@ -98,7 +112,9 @@ export default class ProteinChainView extends React.Component<ProteinChainViewPr
                                 gaps={chain.gaps}
                                 opacity={chain.opacity}
                                 uid={uid}
-                                highlighted={this.props.selectedChainUid === chain.uid}
+                                highlighted={
+                                    this.props.selectedChainUid === chain.uid
+                                }
                             />
                         );
                     })}
@@ -109,23 +125,32 @@ export default class ProteinChainView extends React.Component<ProteinChainViewPr
         return ret;
     }
 
-    @computed get svgHeight():number {
-        return this.rows.length*(this.rowHeight) + (this.rows.length-1)*(this.rowPadding);
+    @computed get svgHeight(): number {
+        return (
+            this.rows.length * this.rowHeight +
+            (this.rows.length - 1) * this.rowPadding
+        );
     }
 
     private onMouseOver(e: SyntheticEvent<any>) {
         const target = e.target as SVGElement;
-        const className = target.getAttribute("class") || "";
+        const className = target.getAttribute('class') || '';
         const chainId = this.getChainId(className);
         if (chainId !== null) {
             const chainComponent = this.chainComponents[chainId];
             if (chainComponent && this.props.setHitZone) {
                 this.props.setHitZone(
                     {
-                        x: parseInt(target.getAttribute("x") || "0", 10),
-                        y: parseInt(target.getAttribute("y") || "0", 10),
-                        width: parseInt(target.getAttribute("width") || "0", 10),
-                        height: parseInt(target.getAttribute("height") || "0", 10)
+                        x: parseInt(target.getAttribute('x') || '0', 10),
+                        y: parseInt(target.getAttribute('y') || '0', 10),
+                        width: parseInt(
+                            target.getAttribute('width') || '0',
+                            10
+                        ),
+                        height: parseInt(
+                            target.getAttribute('height') || '0',
+                            10
+                        ),
                     },
                     chainComponent.props.uid
                 );
@@ -144,4 +169,4 @@ export default class ProteinChainView extends React.Component<ProteinChainViewPr
             </div>
         );
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/proteinChainPanel/column/OrganismColumnFormatter.tsx b/src/shared/components/proteinChainPanel/column/OrganismColumnFormatter.tsx
index 0bc99580341..eb3d2b55c73 100644
--- a/src/shared/components/proteinChainPanel/column/OrganismColumnFormatter.tsx
+++ b/src/shared/components/proteinChainPanel/column/OrganismColumnFormatter.tsx
@@ -1,22 +1,25 @@
-import * as React from "react";
-import * as _ from "lodash";
-import {PdbHeader} from "cbioportal-frontend-commons";
-import PdbHeaderCache from "shared/cache/PdbHeaderCache";
-import {IPdbChain} from "shared/model/Pdb";
+import * as React from 'react';
+import * as _ from 'lodash';
+import { PdbHeader } from 'cbioportal-frontend-commons';
+import PdbHeaderCache from 'shared/cache/PdbHeaderCache';
+import { IPdbChain } from 'shared/model/Pdb';
 
 export default class OrganismColumnFormatter {
-    public static getOrganism(pdbHeader:PdbHeader, chainId:string):string {
+    public static getOrganism(pdbHeader: PdbHeader, chainId: string): string {
         // source: https://github.com/cBioPortal/mutation-mapper/blob/1475afb5a42c18a3859f45741c68908b34d08692/src/js/util/PdbDataUtil.js#L206
 
-        let organism = "NA";
+        let organism = 'NA';
 
-        _.find(pdbHeader.compound, (mol:any)=>{
-            if (_.indexOf(mol.chain, chainId.toLowerCase()) != -1 &&
-                (pdbHeader.source as any)[mol.mol_id] != null)
-            {
+        _.find(pdbHeader.compound, (mol: any) => {
+            if (
+                _.indexOf(mol.chain, chainId.toLowerCase()) != -1 &&
+                (pdbHeader.source as any)[mol.mol_id] != null
+            ) {
                 // chain is associated with this mol,
                 // get the organism info from the source
-                organism = (pdbHeader.source as any)[mol.mol_id].organism_scientific || organism;
+                organism =
+                    (pdbHeader.source as any)[mol.mol_id].organism_scientific ||
+                    organism;
 
                 return mol;
             }
@@ -25,15 +28,21 @@ export default class OrganismColumnFormatter {
         return organism;
     }
 
-    public static getOrganismFromCache(cache:PdbHeaderCache|undefined, chain:IPdbChain):string {
+    public static getOrganismFromCache(
+        cache: PdbHeaderCache | undefined,
+        chain: IPdbChain
+    ): string {
         if (!cache) {
-            return "";
+            return '';
         }
         const cacheData = cache.get(chain.pdbId);
         if (cacheData && cacheData.data) {
-            return OrganismColumnFormatter.getOrganism(cacheData.data, chain.chain);
+            return OrganismColumnFormatter.getOrganism(
+                cacheData.data,
+                chain.chain
+            );
         } else {
-            return "";
+            return '';
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/query/CancerStudySelector.tsx b/src/shared/components/query/CancerStudySelector.tsx
index c6a5f83810b..c16663f0ebd 100644
--- a/src/shared/components/query/CancerStudySelector.tsx
+++ b/src/shared/components/query/CancerStudySelector.tsx
@@ -1,64 +1,64 @@
-import * as _ from "lodash";
-import * as React from "react";
+import * as _ from 'lodash';
+import * as React from 'react';
 import ReactDOM from 'react-dom';
-import {TypeOfCancer as CancerType} from "../../api/generated/CBioPortalAPI";
-import {FlexCol, FlexRow} from "../flexbox/FlexBox";
+import { TypeOfCancer as CancerType } from '../../api/generated/CBioPortalAPI';
+import { FlexCol, FlexRow } from '../flexbox/FlexBox';
 import * as styles_any from './styles/styles.module.scss';
 import classNames from 'classnames';
-import StudyList from "./studyList/StudyList";
-import {observer, Observer} from "mobx-react";
-import {action, computed, expr, IReactionDisposer, reaction} from 'mobx';
-import memoize from "memoize-weak-decorator";
-import {If, Then, Else} from 'react-if';
-import {QueryStore} from "./QueryStore";
-import SectionHeader from "../sectionHeader/SectionHeader";
-import {Modal} from 'react-bootstrap';
+import StudyList from './studyList/StudyList';
+import { observer, Observer } from 'mobx-react';
+import { action, computed, expr, IReactionDisposer, reaction } from 'mobx';
+import memoize from 'memoize-weak-decorator';
+import { If, Then, Else } from 'react-if';
+import { QueryStore } from './QueryStore';
+import SectionHeader from '../sectionHeader/SectionHeader';
+import { Modal } from 'react-bootstrap';
 import Autosuggest from 'react-bootstrap-autosuggest';
-import AppConfig from "appConfig";
-import {ServerConfigHelpers} from "../../../config/config";
-import autobind from "autobind-decorator";
-import {PAN_CAN_SIGNATURE} from "./StudyListLogic";
-import QuickSelectButtons from "./QuickSelectButtons";
-import {StudySelectorStats} from "shared/components/query/StudySelectorStats";
-import WindowStore from "shared/components/window/WindowStore";
+import AppConfig from 'appConfig';
+import { ServerConfigHelpers } from '../../../config/config';
+import autobind from 'autobind-decorator';
+import { PAN_CAN_SIGNATURE } from './StudyListLogic';
+import QuickSelectButtons from './QuickSelectButtons';
+import { StudySelectorStats } from 'shared/components/query/StudySelectorStats';
+import WindowStore from 'shared/components/window/WindowStore';
 import Timeout = NodeJS.Timeout;
-import LoadingIndicator from "../loadingIndicator/LoadingIndicator";
+import LoadingIndicator from '../loadingIndicator/LoadingIndicator';
 
 const MIN_LIST_HEIGHT = 200;
 
 const styles = styles_any as {
-    SelectedStudiesWindow: string,
-    CancerStudySelector: string,
-    CancerStudySelectorHeader: string,
-    selectable: string,
-    selected: string,
-    selectedCount: string,
-    selectAll: string,
-    noData: string,
-    selectionsExist: string,
-    cancerStudyName: string,
-    cancerStudySamples: string,
-    matchingNodeText: string,
-    nonMatchingNodeText: string,
-    containsSelectedStudies: string,
-    selectCancerStudyHeader: string,
-    selectCancerStudyRow: string,
-    searchTextInput: string,
-
-    cancerStudySelectorBody: string,
-    cancerTypeListContainer: string,
-    cancerTypeList: string,
-    cancerTypeListItem: string,
-    cancerTypeListItemLabel: string,
-    cancerTypeListItemCount: string,
-    cancerStudyListContainer: string,
-    submit: string,
-
-    summaryButtonClass: string,
-    summaryButtonIconClass: string,
-    summaryButtonTextClass: string,
-
-    quickSelect: string,
+    SelectedStudiesWindow: string;
+    CancerStudySelector: string;
+    CancerStudySelectorHeader: string;
+    selectable: string;
+    selected: string;
+    selectedCount: string;
+    selectAll: string;
+    noData: string;
+    selectionsExist: string;
+    cancerStudyName: string;
+    cancerStudySamples: string;
+    matchingNodeText: string;
+    nonMatchingNodeText: string;
+    containsSelectedStudies: string;
+    selectCancerStudyHeader: string;
+    selectCancerStudyRow: string;
+    searchTextInput: string;
+
+    cancerStudySelectorBody: string;
+    cancerTypeListContainer: string;
+    cancerTypeList: string;
+    cancerTypeListItem: string;
+    cancerTypeListItemLabel: string;
+    cancerTypeListItemCount: string;
+    cancerStudyListContainer: string;
+    submit: string;
+
+    summaryButtonClass: string;
+    summaryButtonIconClass: string;
+    summaryButtonTextClass: string;
+
+    quickSelect: string;
 };
 
 export interface ICancerStudySelectorProps {
@@ -68,11 +68,16 @@ export interface ICancerStudySelectorProps {
 }
 
 @observer
-export default class CancerStudySelector extends React.Component<ICancerStudySelectorProps, {}> {
+export default class CancerStudySelector extends React.Component<
+    ICancerStudySelectorProps,
+    {}
+> {
     @computed get studiesDataComplete(): boolean {
-        return this.store.cancerTypes.isComplete &&
+        return (
+            this.store.cancerTypes.isComplete &&
             this.store.cancerStudies.isComplete &&
-            this.store.userVirtualStudies.isComplete;
+            this.store.userVirtualStudies.isComplete
+        );
     }
 
     private handlers = {
@@ -84,7 +89,7 @@ export default class CancerStudySelector extends React.Component<ICancerStudySel
         },
         onClearFilter: () => {
             this.store.setSearchText('');
-        }
+        },
     };
 
     public store: QueryStore;
@@ -100,47 +105,67 @@ export default class CancerStudySelector extends React.Component<ICancerStudySel
 
     @memoize
     getCancerTypeListClickHandler<T>(node: CancerType) {
-        return (event: React.MouseEvent<T>) => this.store.selectCancerType(node as CancerType, event.ctrlKey);
+        return (event: React.MouseEvent<T>) =>
+            this.store.selectCancerType(node as CancerType, event.ctrlKey);
     }
 
     CancerTypeList = observer(() => {
-        let cancerTypes = this.logic.cancerTypeListView.getChildCancerTypes(this.store.treeData.rootCancerType);
+        let cancerTypes = this.logic.cancerTypeListView.getChildCancerTypes(
+            this.store.treeData.rootCancerType
+        );
         return (
             <ul className={styles.cancerTypeList}>
                 {cancerTypes.map((cancerType, arrayIndex) => (
-                    <this.CancerTypeListItem key={arrayIndex} cancerType={cancerType}/>
+                    <this.CancerTypeListItem
+                        key={arrayIndex}
+                        cancerType={cancerType}
+                    />
                 ))}
             </ul>
         );
     });
 
-    CancerTypeListItem = observer(({cancerType}: { cancerType: CancerType }) => {
-        let numStudies = expr(() => this.logic.cancerTypeListView.getDescendantCancerStudies(cancerType).length);
-        let selected = _.includes(this.store.selectedCancerTypeIds, cancerType.cancerTypeId);
-        let highlighted = this.logic.isHighlighted(cancerType);
-        let liClassName = classNames({
-            [styles.cancerTypeListItem]: true,
-            [styles.selectable]: true,
-            [styles.selected]: selected,
-            [styles.matchingNodeText]: !!this.store.searchText && highlighted,
-            [styles.nonMatchingNodeText]: !!this.store.searchText && !highlighted,
-            [styles.containsSelectedStudies]: expr(() => this.logic.cancerTypeContainsSelectedStudies(cancerType)),
-        });
-
-        return (
-            <li
-                className={liClassName}
-                onMouseDown={this.getCancerTypeListClickHandler(cancerType)}
-            >
-				<span className={styles.cancerTypeListItemLabel}>
-					{cancerType.name}
-				</span>
-                <span className={styles.cancerTypeListItemCount}>
-					{numStudies}
-				</span>
-            </li>
-        );
-    });
+    CancerTypeListItem = observer(
+        ({ cancerType }: { cancerType: CancerType }) => {
+            let numStudies = expr(
+                () =>
+                    this.logic.cancerTypeListView.getDescendantCancerStudies(
+                        cancerType
+                    ).length
+            );
+            let selected = _.includes(
+                this.store.selectedCancerTypeIds,
+                cancerType.cancerTypeId
+            );
+            let highlighted = this.logic.isHighlighted(cancerType);
+            let liClassName = classNames({
+                [styles.cancerTypeListItem]: true,
+                [styles.selectable]: true,
+                [styles.selected]: selected,
+                [styles.matchingNodeText]:
+                    !!this.store.searchText && highlighted,
+                [styles.nonMatchingNodeText]:
+                    !!this.store.searchText && !highlighted,
+                [styles.containsSelectedStudies]: expr(() =>
+                    this.logic.cancerTypeContainsSelectedStudies(cancerType)
+                ),
+            });
+
+            return (
+                <li
+                    className={liClassName}
+                    onMouseDown={this.getCancerTypeListClickHandler(cancerType)}
+                >
+                    <span className={styles.cancerTypeListItemLabel}>
+                        {cancerType.name}
+                    </span>
+                    <span className={styles.cancerTypeListItemCount}>
+                        {numStudies}
+                    </span>
+                </li>
+            );
+        }
+    );
 
     private autosuggest: React.Component<any, any>;
 
@@ -152,13 +177,15 @@ export default class CancerStudySelector extends React.Component<ICancerStudySel
 
     @autobind
     @action
-    selectMatchingStudies(matches: string[]){
+    selectMatchingStudies(matches: string[]) {
         if (matches) {
             // if there is only one item and it has wildcard markers (*) then pass single string
             // otherwise pass array of exactly matching studyIds
             if (matches.length === 1 && /^\*.*\*$/.test(matches[0])) {
                 // match wildcard of one
-                this.logic.mainView.selectAllMatchingStudies(matches[0].replace(/\*/g,""));
+                this.logic.mainView.selectAllMatchingStudies(
+                    matches[0].replace(/\*/g, '')
+                );
             } else {
                 this.logic.mainView.selectAllMatchingStudies(matches);
             }
@@ -168,19 +195,18 @@ export default class CancerStudySelector extends React.Component<ICancerStudySel
     private windowSizeDisposer: IReactionDisposer;
 
     componentDidMount(): void {
-
         let resizeTimeout: Timeout;
         this.windowSizeDisposer = reaction(
-            ()=>{
+            () => {
                 return WindowStore.size;
             },
-            ()=>{
+            () => {
                 if (this.props.forkedMode) {
                     clearTimeout(resizeTimeout);
                     resizeTimeout = setTimeout(() => this.setListHeight(), 200);
                 }
             },
-            { fireImmediately:true }
+            { fireImmediately: true }
         );
     }
 
@@ -188,96 +214,134 @@ export default class CancerStudySelector extends React.Component<ICancerStudySel
         this.windowSizeDisposer();
     }
 
-    setListHeight(){
+    setListHeight() {
         const $el = $(ReactDOM.findDOMNode(this) as HTMLDivElement);
         var h = WindowStore.size.height - $el.offset()!.top;
-        h = (h < MIN_LIST_HEIGHT) ? MIN_LIST_HEIGHT : h; // impose limit
-        $el.css("height",h-75);
+        h = h < MIN_LIST_HEIGHT ? MIN_LIST_HEIGHT : h; // impose limit
+        $el.css('height', h - 75);
     }
 
     render() {
+        const {
+            shownStudies,
+            shownAndSelectedStudies,
+        } = this.logic.mainView.getSelectionReport();
 
-        const {shownStudies, shownAndSelectedStudies} =
-            this.logic.mainView.getSelectionReport();
-
-        const quickSetButtons = this.logic.mainView.quickSelectButtons(AppConfig.serverConfig.skin_quick_select_buttons);
+        const quickSetButtons = this.logic.mainView.quickSelectButtons(
+            AppConfig.serverConfig.skin_quick_select_buttons
+        );
 
         return (
-            <FlexCol overflow data-test="studyList" className={styles.CancerStudySelector}>
+            <FlexCol
+                overflow
+                data-test="studyList"
+                className={styles.CancerStudySelector}
+            >
                 <FlexRow overflow className={styles.CancerStudySelectorHeader}>
-
-                    <SectionHeader promises={[this.store.cancerTypes, this.store.cancerStudies]}>
+                    <SectionHeader
+                        promises={[
+                            this.store.cancerTypes,
+                            this.store.cancerStudies,
+                        ]}
+                    >
                         Select Studies for Visualization & Analysis:
                     </SectionHeader>
 
                     {this.store.selectableStudiesSet.isComplete && (
                         <div>
-                            <StudySelectorStats store={this.store}/>
+                            <StudySelectorStats store={this.store} />
                         </div>
                     )}
 
                     <Observer>
                         {() => {
-                            let searchTextOptions = ServerConfigHelpers.skin_example_study_queries(AppConfig.serverConfig!.skin_example_study_queries || "");
-                            if (this.store.searchText && searchTextOptions.indexOf(this.store.searchText) < 0)
-                                searchTextOptions = [this.store.searchText].concat(searchTextOptions as string[]);
+                            let searchTextOptions = ServerConfigHelpers.skin_example_study_queries(
+                                AppConfig.serverConfig!
+                                    .skin_example_study_queries || ''
+                            );
+                            if (
+                                this.store.searchText &&
+                                searchTextOptions.indexOf(
+                                    this.store.searchText
+                                ) < 0
+                            )
+                                searchTextOptions = [
+                                    this.store.searchText,
+                                ].concat(searchTextOptions as string[]);
                             let searchTimeout: number | null = null;
 
-                            const optionsWithSortKeys = searchTextOptions.map((name, i) => {
-                                return {value: name, sortKey: i};
-                            });
+                            const optionsWithSortKeys = searchTextOptions.map(
+                                (name, i) => {
+                                    return { value: name, sortKey: i };
+                                }
+                            );
 
                             return (
-                                <div style={{display: 'flex', alignItems: 'center'}}>
-                                    {
-                                        (this.store.searchText) && (
-                                            <span data-test="clearStudyFilter"
-                                                  onClick={(e) => {
-                                                      this.autosuggest.setState({inputValue: ""});
-                                                      this.handlers.onClearFilter();
-                                                  }
-                                                  }
-                                                  style={{
-                                                      fontSize: 18,
-                                                      cursor: 'pointer',
-                                                      color: '#999999',
-                                                      position: 'relative',
-                                                      left: 164,
-                                                      zIndex: 10
-                                                  }}>x</span>
-                                        )
-                                    }
+                                <div
+                                    style={{
+                                        display: 'flex',
+                                        alignItems: 'center',
+                                    }}
+                                >
+                                    {this.store.searchText && (
+                                        <span
+                                            data-test="clearStudyFilter"
+                                            onClick={e => {
+                                                this.autosuggest.setState({
+                                                    inputValue: '',
+                                                });
+                                                this.handlers.onClearFilter();
+                                            }}
+                                            style={{
+                                                fontSize: 18,
+                                                cursor: 'pointer',
+                                                color: '#999999',
+                                                position: 'relative',
+                                                left: 164,
+                                                zIndex: 10,
+                                            }}
+                                        >
+                                            x
+                                        </span>
+                                    )}
                                     <Autosuggest
                                         datalist={optionsWithSortKeys}
-                                        ref={(el: React.Component<any, any>) => this.autosuggest = el}
+                                        ref={(el: React.Component<any, any>) =>
+                                            (this.autosuggest = el)
+                                        }
                                         placeholder="Search..."
                                         bsSize="small"
                                         onChange={(currentVal: string) => {
                                             if (searchTimeout !== null) {
-                                                window.clearTimeout(searchTimeout);
+                                                window.clearTimeout(
+                                                    searchTimeout
+                                                );
                                                 searchTimeout = null;
                                             }
 
-                                            searchTimeout = window.setTimeout(() => {
-                                                this.store.setSearchText(currentVal);
-                                            }, 400);
+                                            searchTimeout = window.setTimeout(
+                                                () => {
+                                                    this.store.setSearchText(
+                                                        currentVal
+                                                    );
+                                                },
+                                                400
+                                            );
                                         }}
                                         onFocus={(value: string) => {
                                             if (value.length === 0) {
                                                 setTimeout(() => {
-                                                    this.autosuggest.setState({open: true});
+                                                    this.autosuggest.setState({
+                                                        open: true,
+                                                    });
                                                 }, 400);
                                             }
                                         }}
                                     />
-
                                 </div>
                             );
-
                         }}
                     </Observer>
-
-
                 </FlexRow>
 
                 <If condition={this.studiesDataComplete}>
@@ -285,64 +349,116 @@ export default class CancerStudySelector extends React.Component<ICancerStudySel
                         <If condition={this.store.maxTreeDepth > 0}>
                             <Then>
                                 <div className={styles.cancerTypeListContainer}>
-                                    <this.CancerTypeList/>
+                                    <this.CancerTypeList />
                                 </div>
                             </Then>
                         </If>
-                        <div className={styles.cancerStudyListContainer} data-test='cancerTypeListContainer'>
-
-                            <div className="checkbox" style={{marginLeft: 19}}>
+                        <div
+                            className={styles.cancerStudyListContainer}
+                            data-test="cancerTypeListContainer"
+                        >
+                            <div
+                                className="checkbox"
+                                style={{ marginLeft: 19 }}
+                            >
                                 <If condition={shownStudies.length > 0}>
-                                    <If condition={!this.logic.mainView.isFiltered && !_.isEmpty(quickSetButtons)}>
+                                    <If
+                                        condition={
+                                            !this.logic.mainView.isFiltered &&
+                                            !_.isEmpty(quickSetButtons)
+                                        }
+                                    >
                                         <Then>
                                             <div className={styles.quickSelect}>
-                                                <QuickSelectButtons onSelect={this.selectMatchingStudies}
-                                                                    buttonsConfig={quickSetButtons}/>
+                                                <QuickSelectButtons
+                                                    onSelect={
+                                                        this
+                                                            .selectMatchingStudies
+                                                    }
+                                                    buttonsConfig={
+                                                        quickSetButtons
+                                                    }
+                                                />
                                             </div>
                                         </Then>
                                         <Else>
                                             <label>
-                                                <input type="checkbox"
+                                                <input
+                                                    type="checkbox"
                                                     data-test="selectAllStudies"
-                                                    style={{top: -2}}
-                                                    onClick={this.handlers.onCheckAllFiltered}
-                                                    checked={shownAndSelectedStudies.length === shownStudies.length}
+                                                    style={{ top: -2 }}
+                                                    onClick={
+                                                        this.handlers
+                                                            .onCheckAllFiltered
+                                                    }
+                                                    checked={
+                                                        shownAndSelectedStudies.length ===
+                                                        shownStudies.length
+                                                    }
                                                 />
-                                                <strong>{(shownAndSelectedStudies.length === shownStudies.length) ?
-                                                    `Deselect all listed studies ${(shownStudies.length < this.store.cancerStudies.result.length) ? "matching filter" : ""} (${shownStudies.length})` :
-                                                    `Select all listed studies ${(shownStudies.length < this.store.cancerStudies.result.length) ? "matching filter" : ""}  (${shownStudies.length})`}
+                                                <strong>
+                                                    {shownAndSelectedStudies.length ===
+                                                    shownStudies.length
+                                                        ? `Deselect all listed studies ${
+                                                              shownStudies.length <
+                                                              this.store
+                                                                  .cancerStudies
+                                                                  .result.length
+                                                                  ? 'matching filter'
+                                                                  : ''
+                                                          } (${
+                                                              shownStudies.length
+                                                          })`
+                                                        : `Select all listed studies ${
+                                                              shownStudies.length <
+                                                              this.store
+                                                                  .cancerStudies
+                                                                  .result.length
+                                                                  ? 'matching filter'
+                                                                  : ''
+                                                          }  (${
+                                                              shownStudies.length
+                                                          })`}
                                                 </strong>
                                             </label>
-
                                         </Else>
                                     </If>
                                 </If>
-                                <If condition={this.store.cancerStudies.isComplete && this.store.cancerTypes.isComplete && shownStudies.length === 0}>
-                                    <p>There are no studies matching your filter.</p>
+                                <If
+                                    condition={
+                                        this.store.cancerStudies.isComplete &&
+                                        this.store.cancerTypes.isComplete &&
+                                        shownStudies.length === 0
+                                    }
+                                >
+                                    <p>
+                                        There are no studies matching your
+                                        filter.
+                                    </p>
                                 </If>
                             </div>
 
-                            <StudyList/>
+                            <StudyList />
                         </div>
                     </FlexRow>
                 </If>
 
                 <Modal
-                    className={classNames(styles.SelectedStudiesWindow, 'cbioportal-frontend')}
+                    className={classNames(
+                        styles.SelectedStudiesWindow,
+                        'cbioportal-frontend'
+                    )}
                     show={this.store.showSelectedStudiesOnly}
-                    onHide={() => this.store.showSelectedStudiesOnly = false}
+                    onHide={() => (this.store.showSelectedStudiesOnly = false)}
                 >
                     <Modal.Header closeButton>
                         <Modal.Title>Selected Studies</Modal.Title>
                     </Modal.Header>
                     <Modal.Body>
-                        <StudyList showSelectedStudiesOnly/>
+                        <StudyList showSelectedStudiesOnly />
                     </Modal.Body>
                 </Modal>
             </FlexCol>
         );
     }
 }
-
-
-
diff --git a/src/shared/components/query/CancerStudyTreeData.ts b/src/shared/components/query/CancerStudyTreeData.ts
index 464e5b77c8b..f0bf28d95e3 100644
--- a/src/shared/components/query/CancerStudyTreeData.ts
+++ b/src/shared/components/query/CancerStudyTreeData.ts
@@ -1,222 +1,258 @@
-import {CancerStudy, TypeOfCancer as CancerType} from "../../api/generated/CBioPortalAPI";
+import {
+    CancerStudy,
+    TypeOfCancer as CancerType,
+} from '../../api/generated/CBioPortalAPI';
 import * as _ from 'lodash';
-import {CategorizedConfigItems} from "config/IAppConfig";
-import {VirtualStudy} from "shared/model/VirtualStudy";
+import { CategorizedConfigItems } from 'config/IAppConfig';
+import { VirtualStudy } from 'shared/model/VirtualStudy';
 
 export const CANCER_TYPE_ROOT = 'tissue';
-export const VIRTUAL_STUDY_NAME= 'My Virtual Studies';
-export const PHYSICAL_STUDY_NAME= 'Studies';
+export const VIRTUAL_STUDY_NAME = 'My Virtual Studies';
+export const PHYSICAL_STUDY_NAME = 'Studies';
 
-export type CancerTypeWithVisibility = CancerType & { alwaysVisible?:boolean };
+export type CancerTypeWithVisibility = CancerType & { alwaysVisible?: boolean };
 
-export type CancerTreeNode = CancerTypeWithVisibility|CancerStudy;
+export type CancerTreeNode = CancerTypeWithVisibility | CancerStudy;
 
 export type NodeMetadata = {
-	isCancerType:boolean,
-	isPriorityCategory:boolean,
-	priorityCategories:CancerTypeWithVisibility[],
-	childCancerTypes:CancerTypeWithVisibility[],
-	childStudies:CancerStudy[],
-	descendantStudies:CancerStudy[],
-	descendantCancerTypes:CancerTypeWithVisibility[],
-	ancestors:CancerTypeWithVisibility[], // in order of ascending distance from node, ending in root node
-	siblings:CancerStudy[], // descendants of highest level non-root ancestor
-	searchTerms:string, // all related text in a single string for easy searching
+    isCancerType: boolean;
+    isPriorityCategory: boolean;
+    priorityCategories: CancerTypeWithVisibility[];
+    childCancerTypes: CancerTypeWithVisibility[];
+    childStudies: CancerStudy[];
+    descendantStudies: CancerStudy[];
+    descendantCancerTypes: CancerTypeWithVisibility[];
+    ancestors: CancerTypeWithVisibility[]; // in order of ascending distance from node, ending in root node
+    siblings: CancerStudy[]; // descendants of highest level non-root ancestor
+    searchTerms: string; // all related text in a single string for easy searching
 };
 
-export default class CancerStudyTreeData
-{
-	static sortNodes<T extends CancerTreeNode[]>(nodes:T):T
-	{
-		return _.sortBy(nodes, node => node.name) as T;
-	}
-
-	rootCancerType:CancerTypeWithVisibility = {
-		clinicalTrialKeywords: '',
-		dedicatedColor: '',
-		name: 'All',
-		parent: '',
-		shortName: 'All',
-		cancerTypeId: CANCER_TYPE_ROOT
-	};
-
-	virtualStudyCategory:CancerTypeWithVisibility = {
-		clinicalTrialKeywords: '',
-		dedicatedColor       : '',
-		name                 : VIRTUAL_STUDY_NAME,
-		parent               : CANCER_TYPE_ROOT,
-		shortName            : VIRTUAL_STUDY_NAME,
-		cancerTypeId         : VIRTUAL_STUDY_NAME,
-		alwaysVisible        : true
-	};
-
-	physicalStudyCategory:CancerTypeWithVisibility = {
-		clinicalTrialKeywords: '',
-		dedicatedColor       : '',
-		name                 : PHYSICAL_STUDY_NAME,
-		parent               : CANCER_TYPE_ROOT,
-		shortName            : PHYSICAL_STUDY_NAME,
-		cancerTypeId         : PHYSICAL_STUDY_NAME,
-		alwaysVisible        : true
-	};
-
-	priorityCategories:CancerTypeWithVisibility[] = [];
-	map_node_meta = new Map<CancerTreeNode, NodeMetadata>();
-	map_cancerTypeId_cancerType = new Map<string, CancerTypeWithVisibility>();
-	map_studyId_cancerStudy = new Map<string, CancerStudy>();
-
-	constructor({cancerTypes = [], studies = [], priorityStudies = {}, virtualStudies=[], maxTreeDepth = 0}: {cancerTypes: CancerTypeWithVisibility[], studies: CancerStudy[], priorityStudies?:CategorizedConfigItems, virtualStudies?:VirtualStudy[], maxTreeDepth: number})
-	{
-		let nodes:CancerTreeNode[];
-		let node:CancerTreeNode;
-		let meta:NodeMetadata;
-
-		// sort by name
-		cancerTypes = CancerStudyTreeData.sortNodes(cancerTypes);
-
-		//map virtual study to cancer study
-		const _virtualStudies = virtualStudies.map(virtualstudy => {
-			// TODO: temp fix for when virtual study data is not of expeceted format
-			// (e.g. old format) Might need some better sanity checking of
-			// virtual/session data
-			if (virtualstudy.data) {
-				return {
-					allSampleCount: _.sumBy(virtualstudy.data.studies, study=>study.samples.length),
-					studyId       : virtualstudy.id,
-					name          : virtualstudy.data.name,
-					description   : virtualstudy.data.description,
-					cancerTypeId  : VIRTUAL_STUDY_NAME
-				} as CancerStudy;
-			}
-		}).filter(virtualstudy => virtualstudy) as CancerStudy[];
-
-		// add priority categories
-		for (let name in priorityStudies)
-		{
-			this.priorityCategories.push({
-				clinicalTrialKeywords: '',
-				dedicatedColor: '',
-				name,
-				parent: CANCER_TYPE_ROOT,
-				shortName: name,
-				cancerTypeId: name
-			});
-		}
-
-		//map all physical studies to physicalStudy cancer type if maxTreeDepth is zero and when virtual studie are present
-		if (maxTreeDepth === 0 && virtualStudies.length > 0) {
-			studies = _.map(studies, study => {
-				study.cancerTypeId = this.physicalStudyCategory.cancerTypeId;
-				return study;
-			});
-		}
-		// add virtual study category, and studies
-		cancerTypes = [this.virtualStudyCategory, this.physicalStudyCategory, ...this.priorityCategories, this.rootCancerType, ...cancerTypes];
-		studies     = CancerStudyTreeData.sortNodes([..._virtualStudies, ...studies]);
-
-		// initialize lookups and metadata entries
-		for (nodes of [cancerTypes, studies])
-		{
-			for (node of nodes)
-			{
-				let isCancerType = nodes == cancerTypes;
-				if (isCancerType)
-				{
-					this.map_cancerTypeId_cancerType.set(node.cancerTypeId, node as CancerTypeWithVisibility);
-				}
-				else
-				{
-					this.map_studyId_cancerStudy.set((node as CancerStudy).studyId, node as CancerStudy);
-				}
-
-				let searchTerms = isCancerType ? node.name : [node.name, (node as CancerStudy).description].join('\n');
-				this.map_node_meta.set(node, {
-					isCancerType,
-					isPriorityCategory: false,
-					priorityCategories: [],
-					childCancerTypes: [],
-					childStudies: [],
-					descendantStudies: [],
-					descendantCancerTypes: [],
-					ancestors: [],
-					siblings: [],
-					searchTerms,
-				});
-			}
-		}
-
-		// fill in childStudies for priorityCategories using existing CancerStudy objects
-		for (let category of this.priorityCategories)
-		{
-			meta = this.map_node_meta.get(category) as NodeMetadata;
-			meta.isPriorityCategory = true;
-			for (let studyId of priorityStudies[category.cancerTypeId])
-			{
-				let study = this.map_studyId_cancerStudy.get(studyId);
-				if (study)
-				{
-					meta.childStudies.push(study);
-					meta.descendantStudies.push(study);
-					let studyMeta = this.map_node_meta.get(study) as NodeMetadata;
-					studyMeta.priorityCategories.push(category);
-				}
-			}
-		}
-
-		// fill in metadata values
-		for (nodes of [cancerTypes, studies])
-		{
-			for (node of nodes)
-			{
-				meta = this.map_node_meta.get(node) as NodeMetadata;
-				let parent;
-				if (meta.isCancerType){
-					const alwaysVisible = (node as CancerTypeWithVisibility).alwaysVisible
-					parent = this.map_cancerTypeId_cancerType.get((node as CancerTypeWithVisibility).parent);
-					if(alwaysVisible && parent) {
-						(parent as CancerTypeWithVisibility).alwaysVisible = alwaysVisible;
-					}
-				}
-				else
-					parent = this.map_cancerTypeId_cancerType.get(node.cancerTypeId);
-
-				let parentMeta = parent && this.map_node_meta.get(parent);
-				if (parentMeta)
-				{
-					if (meta.isCancerType)
-						parentMeta.childCancerTypes.push(node as CancerTypeWithVisibility);
-					else
-						parentMeta.childStudies.push(node as CancerStudy);
-				}
-
-				while (parent && parentMeta)
-				{
-					meta.ancestors.push(parent);
-					if (meta.isCancerType)
-						parentMeta.descendantCancerTypes.push(node as CancerTypeWithVisibility);
-					else
-						parentMeta.descendantStudies.push(node as CancerStudy);
-
-					parent = this.map_cancerTypeId_cancerType.get(parent.parent);
-					parentMeta = parent && this.map_node_meta.get(parent);
-				}
-
-				let moreSearchTerms = [...meta.ancestors, ...meta.priorityCategories].map(cancerType => cancerType.name);
-				meta.searchTerms = [meta.searchTerms, ...moreSearchTerms].join('\n');
-			}
-		}
-
-		// get sibling studies
-		for (node of studies)
-		{
-			meta = this.map_node_meta.get(node) as NodeMetadata;
-			// firstLevelAncestor is the ancestor below the rootCancerType
-			let firstLevelAncestor = meta.ancestors[meta.ancestors.length - 2];
-			if (firstLevelAncestor)
-			{
-				let ancestorMeta = this.map_node_meta.get(firstLevelAncestor) as NodeMetadata;
-				meta.siblings = ancestorMeta.descendantStudies;
-			}
-		}
-	}
+export default class CancerStudyTreeData {
+    static sortNodes<T extends CancerTreeNode[]>(nodes: T): T {
+        return _.sortBy(nodes, node => node.name) as T;
+    }
+
+    rootCancerType: CancerTypeWithVisibility = {
+        clinicalTrialKeywords: '',
+        dedicatedColor: '',
+        name: 'All',
+        parent: '',
+        shortName: 'All',
+        cancerTypeId: CANCER_TYPE_ROOT,
+    };
+
+    virtualStudyCategory: CancerTypeWithVisibility = {
+        clinicalTrialKeywords: '',
+        dedicatedColor: '',
+        name: VIRTUAL_STUDY_NAME,
+        parent: CANCER_TYPE_ROOT,
+        shortName: VIRTUAL_STUDY_NAME,
+        cancerTypeId: VIRTUAL_STUDY_NAME,
+        alwaysVisible: true,
+    };
+
+    physicalStudyCategory: CancerTypeWithVisibility = {
+        clinicalTrialKeywords: '',
+        dedicatedColor: '',
+        name: PHYSICAL_STUDY_NAME,
+        parent: CANCER_TYPE_ROOT,
+        shortName: PHYSICAL_STUDY_NAME,
+        cancerTypeId: PHYSICAL_STUDY_NAME,
+        alwaysVisible: true,
+    };
+
+    priorityCategories: CancerTypeWithVisibility[] = [];
+    map_node_meta = new Map<CancerTreeNode, NodeMetadata>();
+    map_cancerTypeId_cancerType = new Map<string, CancerTypeWithVisibility>();
+    map_studyId_cancerStudy = new Map<string, CancerStudy>();
+
+    constructor({
+        cancerTypes = [],
+        studies = [],
+        priorityStudies = {},
+        virtualStudies = [],
+        maxTreeDepth = 0,
+    }: {
+        cancerTypes: CancerTypeWithVisibility[];
+        studies: CancerStudy[];
+        priorityStudies?: CategorizedConfigItems;
+        virtualStudies?: VirtualStudy[];
+        maxTreeDepth: number;
+    }) {
+        let nodes: CancerTreeNode[];
+        let node: CancerTreeNode;
+        let meta: NodeMetadata;
+
+        // sort by name
+        cancerTypes = CancerStudyTreeData.sortNodes(cancerTypes);
+
+        //map virtual study to cancer study
+        const _virtualStudies = virtualStudies
+            .map(virtualstudy => {
+                // TODO: temp fix for when virtual study data is not of expeceted format
+                // (e.g. old format) Might need some better sanity checking of
+                // virtual/session data
+                if (virtualstudy.data) {
+                    return {
+                        allSampleCount: _.sumBy(
+                            virtualstudy.data.studies,
+                            study => study.samples.length
+                        ),
+                        studyId: virtualstudy.id,
+                        name: virtualstudy.data.name,
+                        description: virtualstudy.data.description,
+                        cancerTypeId: VIRTUAL_STUDY_NAME,
+                    } as CancerStudy;
+                }
+            })
+            .filter(virtualstudy => virtualstudy) as CancerStudy[];
+
+        // add priority categories
+        for (let name in priorityStudies) {
+            this.priorityCategories.push({
+                clinicalTrialKeywords: '',
+                dedicatedColor: '',
+                name,
+                parent: CANCER_TYPE_ROOT,
+                shortName: name,
+                cancerTypeId: name,
+            });
+        }
+
+        //map all physical studies to physicalStudy cancer type if maxTreeDepth is zero and when virtual studie are present
+        if (maxTreeDepth === 0 && virtualStudies.length > 0) {
+            studies = _.map(studies, study => {
+                study.cancerTypeId = this.physicalStudyCategory.cancerTypeId;
+                return study;
+            });
+        }
+        // add virtual study category, and studies
+        cancerTypes = [
+            this.virtualStudyCategory,
+            this.physicalStudyCategory,
+            ...this.priorityCategories,
+            this.rootCancerType,
+            ...cancerTypes,
+        ];
+        studies = CancerStudyTreeData.sortNodes([
+            ..._virtualStudies,
+            ...studies,
+        ]);
+
+        // initialize lookups and metadata entries
+        for (nodes of [cancerTypes, studies]) {
+            for (node of nodes) {
+                let isCancerType = nodes == cancerTypes;
+                if (isCancerType) {
+                    this.map_cancerTypeId_cancerType.set(
+                        node.cancerTypeId,
+                        node as CancerTypeWithVisibility
+                    );
+                } else {
+                    this.map_studyId_cancerStudy.set(
+                        (node as CancerStudy).studyId,
+                        node as CancerStudy
+                    );
+                }
+
+                let searchTerms = isCancerType
+                    ? node.name
+                    : [node.name, (node as CancerStudy).description].join('\n');
+                this.map_node_meta.set(node, {
+                    isCancerType,
+                    isPriorityCategory: false,
+                    priorityCategories: [],
+                    childCancerTypes: [],
+                    childStudies: [],
+                    descendantStudies: [],
+                    descendantCancerTypes: [],
+                    ancestors: [],
+                    siblings: [],
+                    searchTerms,
+                });
+            }
+        }
+
+        // fill in childStudies for priorityCategories using existing CancerStudy objects
+        for (let category of this.priorityCategories) {
+            meta = this.map_node_meta.get(category) as NodeMetadata;
+            meta.isPriorityCategory = true;
+            for (let studyId of priorityStudies[category.cancerTypeId]) {
+                let study = this.map_studyId_cancerStudy.get(studyId);
+                if (study) {
+                    meta.childStudies.push(study);
+                    meta.descendantStudies.push(study);
+                    let studyMeta = this.map_node_meta.get(
+                        study
+                    ) as NodeMetadata;
+                    studyMeta.priorityCategories.push(category);
+                }
+            }
+        }
+
+        // fill in metadata values
+        for (nodes of [cancerTypes, studies]) {
+            for (node of nodes) {
+                meta = this.map_node_meta.get(node) as NodeMetadata;
+                let parent;
+                if (meta.isCancerType) {
+                    const alwaysVisible = (node as CancerTypeWithVisibility)
+                        .alwaysVisible;
+                    parent = this.map_cancerTypeId_cancerType.get(
+                        (node as CancerTypeWithVisibility).parent
+                    );
+                    if (alwaysVisible && parent) {
+                        (parent as CancerTypeWithVisibility).alwaysVisible = alwaysVisible;
+                    }
+                } else
+                    parent = this.map_cancerTypeId_cancerType.get(
+                        node.cancerTypeId
+                    );
+
+                let parentMeta = parent && this.map_node_meta.get(parent);
+                if (parentMeta) {
+                    if (meta.isCancerType)
+                        parentMeta.childCancerTypes.push(
+                            node as CancerTypeWithVisibility
+                        );
+                    else parentMeta.childStudies.push(node as CancerStudy);
+                }
+
+                while (parent && parentMeta) {
+                    meta.ancestors.push(parent);
+                    if (meta.isCancerType)
+                        parentMeta.descendantCancerTypes.push(
+                            node as CancerTypeWithVisibility
+                        );
+                    else parentMeta.descendantStudies.push(node as CancerStudy);
+
+                    parent = this.map_cancerTypeId_cancerType.get(
+                        parent.parent
+                    );
+                    parentMeta = parent && this.map_node_meta.get(parent);
+                }
+
+                let moreSearchTerms = [
+                    ...meta.ancestors,
+                    ...meta.priorityCategories,
+                ].map(cancerType => cancerType.name);
+                meta.searchTerms = [meta.searchTerms, ...moreSearchTerms].join(
+                    '\n'
+                );
+            }
+        }
+
+        // get sibling studies
+        for (node of studies) {
+            meta = this.map_node_meta.get(node) as NodeMetadata;
+            // firstLevelAncestor is the ancestor below the rootCancerType
+            let firstLevelAncestor = meta.ancestors[meta.ancestors.length - 2];
+            if (firstLevelAncestor) {
+                let ancestorMeta = this.map_node_meta.get(
+                    firstLevelAncestor
+                ) as NodeMetadata;
+                meta.siblings = ancestorMeta.descendantStudies;
+            }
+        }
+    }
 }
diff --git a/src/shared/components/query/CaseSetSelector.spec.tsx b/src/shared/components/query/CaseSetSelector.spec.tsx
index b8c77119677..235e032d395 100644
--- a/src/shared/components/query/CaseSetSelector.spec.tsx
+++ b/src/shared/components/query/CaseSetSelector.spec.tsx
@@ -1,24 +1,22 @@
-import {filterCaseSetOptions, ReactSelectOptionWithName} from './CaseSetSelector';
+import {
+    filterCaseSetOptions,
+    ReactSelectOptionWithName,
+} from './CaseSetSelector';
 import React from 'react';
 import { assert } from 'chai';
 import { shallow, mount } from 'enzyme';
 import sinon from 'sinon';
 
 describe('CaseSetSelector', () => {
-
-    describe('filterCaseSetOptions', ()=>{
-
-        it('lambda filters without case sensitivity', ()=>{
-
-            let opt = ({ textLabel:'this is the Haystack' } as ReactSelectOptionWithName);
-
-            assert.isTrue( filterCaseSetOptions(opt, 'haystack') );
-            assert.isTrue( filterCaseSetOptions(opt, 'Haystack') );
-            assert.isFalse( filterCaseSetOptions(opt, 'Maystack') );
-
+    describe('filterCaseSetOptions', () => {
+        it('lambda filters without case sensitivity', () => {
+            let opt = {
+                textLabel: 'this is the Haystack',
+            } as ReactSelectOptionWithName;
+
+            assert.isTrue(filterCaseSetOptions(opt, 'haystack'));
+            assert.isTrue(filterCaseSetOptions(opt, 'Haystack'));
+            assert.isFalse(filterCaseSetOptions(opt, 'Maystack'));
         });
-
-
     });
-
 });
diff --git a/src/shared/components/query/CaseSetSelector.tsx b/src/shared/components/query/CaseSetSelector.tsx
index f8b9e3347c4..e11529d4c9e 100644
--- a/src/shared/components/query/CaseSetSelector.tsx
+++ b/src/shared/components/query/CaseSetSelector.tsx
@@ -2,151 +2,205 @@ import * as React from 'react';
 import * as styles_any from './styles/styles.module.scss';
 import * as _ from 'lodash';
 import ReactSelect from 'react-select1';
-import {observer} from "mobx-react";
-import {computed, action} from 'mobx';
-import {FlexCol, FlexRow} from "../flexbox/FlexBox";
-import {QueryStore, QueryStoreComponent, CUSTOM_CASE_LIST_ID, ALL_CASES_LIST_ID} from './QueryStore';
-import {getStudySummaryUrl} from '../../api/urls';
-import {DefaultTooltip} from "cbioportal-frontend-commons";
-import SectionHeader from "../sectionHeader/SectionHeader";
+import { observer } from 'mobx-react';
+import { computed, action } from 'mobx';
+import { FlexCol, FlexRow } from '../flexbox/FlexBox';
+import {
+    QueryStore,
+    QueryStoreComponent,
+    CUSTOM_CASE_LIST_ID,
+    ALL_CASES_LIST_ID,
+} from './QueryStore';
+import { getStudySummaryUrl } from '../../api/urls';
+import { DefaultTooltip } from 'cbioportal-frontend-commons';
+import SectionHeader from '../sectionHeader/SectionHeader';
 import { getFilteredCustomCaseSets } from 'shared/components/query/CaseSetSelectorUtils';
 import { ModifyQueryParams } from 'pages/resultsView/ResultsViewPageStore';
 
 const styles = styles_any as {
-	CaseSetSelector: string,
-	tooltip: string,
-	radioRow: string,
+    CaseSetSelector: string;
+    tooltip: string;
+    radioRow: string;
 };
 
-export type ReactSelectOption<T> = {label: React.ReactChild, value: T};
+export type ReactSelectOption<T> = { label: React.ReactChild; value: T };
 
 export interface ReactSelectOptionWithName extends ReactSelectOption<any> {
-	textLabel:string;
+    textLabel: string;
 }
 
-export function filterCaseSetOptions(opt: ReactSelectOptionWithName, filter: string) {
-	return _.includes(opt.textLabel.toLowerCase(), filter.toLowerCase());
+export function filterCaseSetOptions(
+    opt: ReactSelectOptionWithName,
+    filter: string
+) {
+    return _.includes(opt.textLabel.toLowerCase(), filter.toLowerCase());
 }
 
 @observer
-export default class CaseSetSelector extends QueryStoreComponent<{modifyQueryParams: ModifyQueryParams | undefined}, {}>
-{
-	private isQueryModified = false;
+export default class CaseSetSelector extends QueryStoreComponent<
+    { modifyQueryParams: ModifyQueryParams | undefined },
+    {}
+> {
+    private isQueryModified = false;
 
-	@computed get caseSetOptions() : ReactSelectOptionWithName[]
-	{
-		let ret = this.store.sampleLists.result.map(sampleList => {
-			return {
-				label: (
-					<DefaultTooltip
-						placement="right"
-						mouseEnterDelay={0}
-						overlay={<div className={styles.tooltip}>{sampleList.description}</div>}
-					>
-						<span>{`${sampleList.name} (${sampleList.sampleCount})`}</span>
-					</DefaultTooltip>
-				),
-				value: sampleList.sampleListId,
-				textLabel:sampleList.name
-			};
-		});
-		
-		let filteredcustomCaseSets = getFilteredCustomCaseSets(
-			this.store.isVirtualStudySelected,
-			this.store.isMultipleNonVirtualStudiesSelected,
-			this.store.profiledSamplesCount.result);
+    @computed get caseSetOptions(): ReactSelectOptionWithName[] {
+        let ret = this.store.sampleLists.result.map(sampleList => {
+            return {
+                label: (
+                    <DefaultTooltip
+                        placement="right"
+                        mouseEnterDelay={0}
+                        overlay={
+                            <div className={styles.tooltip}>
+                                {sampleList.description}
+                            </div>
+                        }
+                    >
+                        <span>{`${sampleList.name} (${sampleList.sampleCount})`}</span>
+                    </DefaultTooltip>
+                ),
+                value: sampleList.sampleListId,
+                textLabel: sampleList.name,
+            };
+        });
 
-		let customCaseSets = filteredcustomCaseSets.map(s => {
-			return {
-				value: s.value,
-				label: (
-					<DefaultTooltip
-						placement="right"
-						mouseEnterDelay={0}
-						overlay={<div className={styles.tooltip}>{s.description}</div>}
-					>
-						<span>{s.name}</span>
-					</DefaultTooltip>
-				),
-				textLabel: s.name
-			}
-		});
+        let filteredcustomCaseSets = getFilteredCustomCaseSets(
+            this.store.isVirtualStudySelected,
+            this.store.isMultipleNonVirtualStudiesSelected,
+            this.store.profiledSamplesCount.result
+        );
 
-		return ret.concat(customCaseSets);
-	}
+        let customCaseSets = filteredcustomCaseSets.map(s => {
+            return {
+                value: s.value,
+                label: (
+                    <DefaultTooltip
+                        placement="right"
+                        mouseEnterDelay={0}
+                        overlay={
+                            <div className={styles.tooltip}>
+                                {s.description}
+                            </div>
+                        }
+                    >
+                        <span>{s.name}</span>
+                    </DefaultTooltip>
+                ),
+                textLabel: s.name,
+            };
+        });
 
-	render()
-	{
-		if (!this.isQueryModified && this.props.modifyQueryParams) {
-			this.modifyQuery();
-		}
-		if (!this.store.selectableSelectedStudyIds.length)
-			return null;
-		return (
-			<FlexRow padded overflow className={styles.CaseSetSelector} data-test='CaseSetSelector'>
-				<div>
-				<SectionHeader className="sectionLabel"
-							   secondaryComponent={<a href={getStudySummaryUrl(this.store.selectableSelectedStudyIds)} target="_blank">To build your own case set,<br />try out our enhanced Study View.</a>}
-							   promises={[this.store.sampleLists, this.store.asyncCustomCaseSet, this.store.profiledSamplesCount]}>
-					Select Patient/Case Set:
-				</SectionHeader>
-				</div>
-				<div>
-				<ReactSelect
-					value={this.store.selectedSampleListId}
-					options={this.caseSetOptions}
-					filterOption={filterCaseSetOptions}
-					onChange={(option:any) => this.store.selectedSampleListId = option ? option.value : undefined}
-					data-test='caseSetSelector'
-				/>
+        return ret.concat(customCaseSets);
+    }
 
-				{!!(this.store.selectedSampleListId === CUSTOM_CASE_LIST_ID) && (
-					<FlexCol padded>
+    render() {
+        if (!this.isQueryModified && this.props.modifyQueryParams) {
+            this.modifyQuery();
+        }
+        if (!this.store.selectableSelectedStudyIds.length) return null;
+        return (
+            <FlexRow
+                padded
+                overflow
+                className={styles.CaseSetSelector}
+                data-test="CaseSetSelector"
+            >
+                <div>
+                    <SectionHeader
+                        className="sectionLabel"
+                        secondaryComponent={
+                            <a
+                                href={getStudySummaryUrl(
+                                    this.store.selectableSelectedStudyIds
+                                )}
+                                target="_blank"
+                            >
+                                To build your own case set,
+                                <br />
+                                try out our enhanced Study View.
+                            </a>
+                        }
+                        promises={[
+                            this.store.sampleLists,
+                            this.store.asyncCustomCaseSet,
+                            this.store.profiledSamplesCount,
+                        ]}
+                    >
+                        Select Patient/Case Set:
+                    </SectionHeader>
+                </div>
+                <div>
+                    <ReactSelect
+                        value={this.store.selectedSampleListId}
+                        options={this.caseSetOptions}
+                        filterOption={filterCaseSetOptions}
+                        onChange={(option: any) =>
+                            (this.store.selectedSampleListId = option
+                                ? option.value
+                                : undefined)
+                        }
+                        data-test="caseSetSelector"
+                    />
 
-						<div className={styles.radioRow}>
-							<FlexRow padded>
-								<this.CaseIdsModeRadio label='By sample ID' state='sample'/>
-								<this.CaseIdsModeRadio label='By patient ID' state='patient'/>
-							</FlexRow>
-						</div>
+                    {!!(
+                        this.store.selectedSampleListId === CUSTOM_CASE_LIST_ID
+                    ) && (
+                        <FlexCol padded>
+                            <div className={styles.radioRow}>
+                                <FlexRow padded>
+                                    <this.CaseIdsModeRadio
+                                        label="By sample ID"
+                                        state="sample"
+                                    />
+                                    <this.CaseIdsModeRadio
+                                        label="By patient ID"
+                                        state="patient"
+                                    />
+                                </FlexRow>
+                            </div>
 
-						<span>Enter case IDs below:</span>
-						<textarea
-							title="Enter case IDs"
-							rows={6}
-							cols={80}
-							value={this.store.caseIds}
-							onChange={event => this.store.caseIds = event.currentTarget.value}
-							data-test='CustomCaseSetInput'
-						/>
-					</FlexCol>
-				)}
-				</div>
-			</FlexRow>
-		);
-	}
+                            <span>Enter case IDs below:</span>
+                            <textarea
+                                title="Enter case IDs"
+                                rows={6}
+                                cols={80}
+                                value={this.store.caseIds}
+                                onChange={event =>
+                                    (this.store.caseIds =
+                                        event.currentTarget.value)
+                                }
+                                data-test="CustomCaseSetInput"
+                            />
+                        </FlexCol>
+                    )}
+                </div>
+            </FlexRow>
+        );
+    }
 
-	@action 
-	private modifyQuery() {
-		this.store.selectedSampleListId = this.props.modifyQueryParams!.selectedSampleListId;
-		this.store.caseIds = this.props.modifyQueryParams!.selectedSampleIds.join("\n");
-		this.store.caseIdsMode = this.props.modifyQueryParams!.caseIdsMode;
-		this.isQueryModified = true;
-	}
+    @action
+    private modifyQuery() {
+        this.store.selectedSampleListId = this.props.modifyQueryParams!.selectedSampleListId;
+        this.store.caseIds = this.props.modifyQueryParams!.selectedSampleIds.join(
+            '\n'
+        );
+        this.store.caseIdsMode = this.props.modifyQueryParams!.caseIdsMode;
+        this.isQueryModified = true;
+    }
 
-	CaseIdsModeRadio = observer(
-		(props: {label: string, state:QueryStore['caseIdsMode']}) => (
-			<label>
-				<input
-					type="radio"
-					checked={this.store.caseIdsMode == props.state}
-					onChange={event => {
-						if (event.currentTarget.checked)
-							this.store.caseIdsMode = props.state;
-					}}
-				/>
-				{props.label}
-			</label>
-		)
-	);
+    CaseIdsModeRadio = observer(
+        (props: { label: string; state: QueryStore['caseIdsMode'] }) => (
+            <label>
+                <input
+                    type="radio"
+                    checked={this.store.caseIdsMode == props.state}
+                    onChange={event => {
+                        if (event.currentTarget.checked)
+                            this.store.caseIdsMode = props.state;
+                    }}
+                />
+                {props.label}
+            </label>
+        )
+    );
 }
diff --git a/src/shared/components/query/CaseSetSelectorUtils.spec.ts b/src/shared/components/query/CaseSetSelectorUtils.spec.ts
index a86f8510c17..a1fcde1f026 100644
--- a/src/shared/components/query/CaseSetSelectorUtils.spec.ts
+++ b/src/shared/components/query/CaseSetSelectorUtils.spec.ts
@@ -1,37 +1,156 @@
 import { assert } from 'chai';
 import Sinon from 'sinon';
-import { getFilteredCustomCaseSets, CustomCaseSets } from 'shared/components/query/CaseSetSelectorUtils';
+import {
+    getFilteredCustomCaseSets,
+    CustomCaseSets,
+} from 'shared/components/query/CaseSetSelectorUtils';
 
 describe('CaseSetSelectorUtils', () => {
     describe('filterCustomCaseSets', () => {
-
-
-        it("returns only custom case set if profiledSamplesCount is empty", () => {
-            assert.deepEqual(getFilteredCustomCaseSets(true, false, {} as any), [CustomCaseSets[4]]);
-            assert.deepEqual(getFilteredCustomCaseSets(true, true, {} as any), [CustomCaseSets[4]]);
-            assert.deepEqual(getFilteredCustomCaseSets(false, false, {} as any), [CustomCaseSets[4]]);
-            assert.deepEqual(getFilteredCustomCaseSets(false, true, {} as any), [CustomCaseSets[4]]);
+        it('returns only custom case set if profiledSamplesCount is empty', () => {
+            assert.deepEqual(
+                getFilteredCustomCaseSets(true, false, {} as any),
+                [CustomCaseSets[4]]
+            );
+            assert.deepEqual(getFilteredCustomCaseSets(true, true, {} as any), [
+                CustomCaseSets[4],
+            ]);
+            assert.deepEqual(
+                getFilteredCustomCaseSets(false, false, {} as any),
+                [CustomCaseSets[4]]
+            );
+            assert.deepEqual(
+                getFilteredCustomCaseSets(false, true, {} as any),
+                [CustomCaseSets[4]]
+            );
         });
 
-        it("returns all case set and custom case set if there is at least one virtual study selected", () => {
-            assert.deepEqual(getFilteredCustomCaseSets(true, false, { w_mut: 100, w_cna: 100, w_mut_cna: 100, all:100 }).map(obj => obj.value).sort(), ['-1', 'all']);
-            assert.deepEqual(getFilteredCustomCaseSets(true, true, { w_mut: 100, w_cna: 100, w_mut_cna: 100, all:100 }).map(obj => obj.value).sort(), ['-1', 'all']);
+        it('returns all case set and custom case set if there is at least one virtual study selected', () => {
+            assert.deepEqual(
+                getFilteredCustomCaseSets(true, false, {
+                    w_mut: 100,
+                    w_cna: 100,
+                    w_mut_cna: 100,
+                    all: 100,
+                })
+                    .map(obj => obj.value)
+                    .sort(),
+                ['-1', 'all']
+            );
+            assert.deepEqual(
+                getFilteredCustomCaseSets(true, true, {
+                    w_mut: 100,
+                    w_cna: 100,
+                    w_mut_cna: 100,
+                    all: 100,
+                })
+                    .map(obj => obj.value)
+                    .sort(),
+                ['-1', 'all']
+            );
         });
 
-        it("returns only custom case set if there is one physical study selected", () => {
-            assert.deepEqual(getFilteredCustomCaseSets(false, false, { w_mut: 100, w_cna: 100, w_mut_cna: 100, all:100 }), [CustomCaseSets[4]]);
+        it('returns only custom case set if there is one physical study selected', () => {
+            assert.deepEqual(
+                getFilteredCustomCaseSets(false, false, {
+                    w_mut: 100,
+                    w_cna: 100,
+                    w_mut_cna: 100,
+                    all: 100,
+                }),
+                [CustomCaseSets[4]]
+            );
         });
 
-        it("returns correct filtered case sets depending on the samples when mutliple studies selected", () => {
-            assert.deepEqual(getFilteredCustomCaseSets(false, true, { w_mut: 50, w_cna: 50, w_mut_cna: 50, all:100 }).map(obj => obj.value).sort(), ['-1', 'all', 'w_cna', 'w_mut', 'w_mut_cna']);
-            assert.deepEqual(getFilteredCustomCaseSets(false, true, { w_mut: 0, w_cna: 50, w_mut_cna: 50, all:100 }).map(obj => obj.value).sort(), ['-1', 'all', 'w_cna', 'w_mut_cna']);
-            assert.deepEqual(getFilteredCustomCaseSets(false, true, { w_mut: 50, w_cna: 0, w_mut_cna: 50, all:100 }).map(obj => obj.value).sort(), ['-1', 'all', 'w_mut', 'w_mut_cna']);
-            assert.deepEqual(getFilteredCustomCaseSets(false, true, { w_mut: 50, w_cna: 50, w_mut_cna: 0, all:100 }).map(obj => obj.value).sort(), ['-1', 'all', 'w_cna', 'w_mut']);
-            assert.deepEqual(getFilteredCustomCaseSets(false, true, { w_mut: 50, w_cna: 0, w_mut_cna: 0, all:100 }).map(obj => obj.value).sort(), ['-1', 'all', 'w_mut']);
-            assert.deepEqual(getFilteredCustomCaseSets(false, true, { w_mut: 0, w_cna: 50, w_mut_cna: 0, all:100 }).map(obj => obj.value).sort(), ['-1', 'all', 'w_cna']);
-            assert.deepEqual(getFilteredCustomCaseSets(false, true, { w_mut: 0, w_cna: 0, w_mut_cna: 50, all:100 }).map(obj => obj.value).sort(), ['-1', 'all', 'w_mut_cna']);
-            assert.deepEqual(getFilteredCustomCaseSets(false, true, { w_mut: 0, w_cna: 0, w_mut_cna: 0, all:100 }).map(obj => obj.value).sort(), ['-1', 'all']);
+        it('returns correct filtered case sets depending on the samples when mutliple studies selected', () => {
+            assert.deepEqual(
+                getFilteredCustomCaseSets(false, true, {
+                    w_mut: 50,
+                    w_cna: 50,
+                    w_mut_cna: 50,
+                    all: 100,
+                })
+                    .map(obj => obj.value)
+                    .sort(),
+                ['-1', 'all', 'w_cna', 'w_mut', 'w_mut_cna']
+            );
+            assert.deepEqual(
+                getFilteredCustomCaseSets(false, true, {
+                    w_mut: 0,
+                    w_cna: 50,
+                    w_mut_cna: 50,
+                    all: 100,
+                })
+                    .map(obj => obj.value)
+                    .sort(),
+                ['-1', 'all', 'w_cna', 'w_mut_cna']
+            );
+            assert.deepEqual(
+                getFilteredCustomCaseSets(false, true, {
+                    w_mut: 50,
+                    w_cna: 0,
+                    w_mut_cna: 50,
+                    all: 100,
+                })
+                    .map(obj => obj.value)
+                    .sort(),
+                ['-1', 'all', 'w_mut', 'w_mut_cna']
+            );
+            assert.deepEqual(
+                getFilteredCustomCaseSets(false, true, {
+                    w_mut: 50,
+                    w_cna: 50,
+                    w_mut_cna: 0,
+                    all: 100,
+                })
+                    .map(obj => obj.value)
+                    .sort(),
+                ['-1', 'all', 'w_cna', 'w_mut']
+            );
+            assert.deepEqual(
+                getFilteredCustomCaseSets(false, true, {
+                    w_mut: 50,
+                    w_cna: 0,
+                    w_mut_cna: 0,
+                    all: 100,
+                })
+                    .map(obj => obj.value)
+                    .sort(),
+                ['-1', 'all', 'w_mut']
+            );
+            assert.deepEqual(
+                getFilteredCustomCaseSets(false, true, {
+                    w_mut: 0,
+                    w_cna: 50,
+                    w_mut_cna: 0,
+                    all: 100,
+                })
+                    .map(obj => obj.value)
+                    .sort(),
+                ['-1', 'all', 'w_cna']
+            );
+            assert.deepEqual(
+                getFilteredCustomCaseSets(false, true, {
+                    w_mut: 0,
+                    w_cna: 0,
+                    w_mut_cna: 50,
+                    all: 100,
+                })
+                    .map(obj => obj.value)
+                    .sort(),
+                ['-1', 'all', 'w_mut_cna']
+            );
+            assert.deepEqual(
+                getFilteredCustomCaseSets(false, true, {
+                    w_mut: 0,
+                    w_cna: 0,
+                    w_mut_cna: 0,
+                    all: 100,
+                })
+                    .map(obj => obj.value)
+                    .sort(),
+                ['-1', 'all']
+            );
         });
-
-    })
-})
\ No newline at end of file
+    });
+});
diff --git a/src/shared/components/query/CaseSetSelectorUtils.ts b/src/shared/components/query/CaseSetSelectorUtils.ts
index f370ca77ed6..fdc7d663ffa 100644
--- a/src/shared/components/query/CaseSetSelectorUtils.ts
+++ b/src/shared/components/query/CaseSetSelectorUtils.ts
@@ -1,47 +1,100 @@
-import * as _ from "lodash";
+import * as _ from 'lodash';
 
 export enum CaseSetId {
-	"custom"       = '-1',
-	"mutation_cna" = 'w_mut_cna',
-	"mutation"     = 'w_mut',
-	'cna'          = 'w_cna',
-	'all'          = 'all'
+    'custom' = '-1',
+    'mutation_cna' = 'w_mut_cna',
+    'mutation' = 'w_mut',
+    'cna' = 'w_cna',
+    'all' = 'all',
 }
 
 export type CustomCaseSet = {
-	name: string,
-	description:string,
-	value: CaseSetId,
-	isdefault: boolean
+    name: string;
+    description: string;
+    value: CaseSetId;
+    isdefault: boolean;
 };
 
-export const CustomCaseSets: CustomCaseSet[] = [ 
-	{name: 'All', description: 'All cases in the selected cohorts', value: CaseSetId.all, isdefault : false} ,
-	{name: 'Cases with mutations data', description: 'All cases with mutations data', value: CaseSetId.mutation, isdefault : false},
-	{name: 'Cases with copy number alterations data', description: 'All cases with copy number alterations data', value: CaseSetId.cna, isdefault : false},
-	{name: 'Cases with both mutations and copy number alterations data', description: 'All cases with both mutations and copy number alterations data', value: CaseSetId.mutation_cna, isdefault : false},
-	{name: 'User-defined Case List', description: 'Specify your own case list', value: CaseSetId.custom, isdefault : true}
-]
+export const CustomCaseSets: CustomCaseSet[] = [
+    {
+        name: 'All',
+        description: 'All cases in the selected cohorts',
+        value: CaseSetId.all,
+        isdefault: false,
+    },
+    {
+        name: 'Cases with mutations data',
+        description: 'All cases with mutations data',
+        value: CaseSetId.mutation,
+        isdefault: false,
+    },
+    {
+        name: 'Cases with copy number alterations data',
+        description: 'All cases with copy number alterations data',
+        value: CaseSetId.cna,
+        isdefault: false,
+    },
+    {
+        name: 'Cases with both mutations and copy number alterations data',
+        description:
+            'All cases with both mutations and copy number alterations data',
+        value: CaseSetId.mutation_cna,
+        isdefault: false,
+    },
+    {
+        name: 'User-defined Case List',
+        description: 'Specify your own case list',
+        value: CaseSetId.custom,
+        isdefault: true,
+    },
+];
 
-export function getFilteredCustomCaseSets(isVirtualStudy:boolean, isMultipleNonVirtualStudies: boolean, profiledSamplesCount: { w_mut: number; w_cna: number; w_mut_cna: number; all: number}) {
-	return _.reduce(CustomCaseSets, (acc: CustomCaseSet[], next) => {
-		if (next.isdefault) {
-			acc.push(next)
-		} else if (isMultipleNonVirtualStudies && !isVirtualStudy) {
-			// add all non-zero CustomCaseSets options for multiple studies without virtual study
-			let count =  profiledSamplesCount[next.value as 'w_mut_cna'|'w_mut'|'w_cna'|'all'];
-			//add profile only if it has samples
-			if (count > 0) {
-				acc.push(Object.assign({}, next, { name: `${next.name} (${count})` }))
-			}
-		} else if (isVirtualStudy && next.value === CaseSetId.all) {
-			// only add 'all' option for virtual study
-			let count =  profiledSamplesCount[next.value as 'w_mut_cna'|'w_mut'|'w_cna'|'all'];
-			//add profile only if it has samples
-			if (count > 0) {
-				acc.push(Object.assign({}, next, { name: `${next.name} (${count})` }))
-			}
-		}
-		return acc;
-	}, []);
-}
\ No newline at end of file
+export function getFilteredCustomCaseSets(
+    isVirtualStudy: boolean,
+    isMultipleNonVirtualStudies: boolean,
+    profiledSamplesCount: {
+        w_mut: number;
+        w_cna: number;
+        w_mut_cna: number;
+        all: number;
+    }
+) {
+    return _.reduce(
+        CustomCaseSets,
+        (acc: CustomCaseSet[], next) => {
+            if (next.isdefault) {
+                acc.push(next);
+            } else if (isMultipleNonVirtualStudies && !isVirtualStudy) {
+                // add all non-zero CustomCaseSets options for multiple studies without virtual study
+                let count =
+                    profiledSamplesCount[
+                        next.value as 'w_mut_cna' | 'w_mut' | 'w_cna' | 'all'
+                    ];
+                //add profile only if it has samples
+                if (count > 0) {
+                    acc.push(
+                        Object.assign({}, next, {
+                            name: `${next.name} (${count})`,
+                        })
+                    );
+                }
+            } else if (isVirtualStudy && next.value === CaseSetId.all) {
+                // only add 'all' option for virtual study
+                let count =
+                    profiledSamplesCount[
+                        next.value as 'w_mut_cna' | 'w_mut' | 'w_cna' | 'all'
+                    ];
+                //add profile only if it has samples
+                if (count > 0) {
+                    acc.push(
+                        Object.assign({}, next, {
+                            name: `${next.name} (${count})`,
+                        })
+                    );
+                }
+            }
+            return acc;
+        },
+        []
+    );
+}
diff --git a/src/shared/components/query/DataTypePrioritySelector.spec.tsx b/src/shared/components/query/DataTypePrioritySelector.spec.tsx
index c8be0b6b806..c9942f16a14 100644
--- a/src/shared/components/query/DataTypePrioritySelector.spec.tsx
+++ b/src/shared/components/query/DataTypePrioritySelector.spec.tsx
@@ -1,26 +1,46 @@
-import {assert} from 'chai';
+import { assert } from 'chai';
 import React from 'react';
 import expect from 'expect';
 import expectJSX from 'expect-jsx';
-import {checkBoxes} from "./DataTypePrioritySelector";
-import {stringListToSet} from "cbioportal-frontend-commons";
-import {QueryStore} from "./QueryStore";
+import { checkBoxes } from './DataTypePrioritySelector';
+import { stringListToSet } from 'cbioportal-frontend-commons';
+import { QueryStore } from './QueryStore';
 
 expect.extend(expectJSX);
 
-describe("DataTypePrioritySelector", ()=>{
-    describe("checkBoxes",()=>{
-        it("shows the right buttons when theres mutation and cna profiles available",()=>{
-            const buttonLabels = stringListToSet(checkBoxes({mutation:true, cna:true}, {} as QueryStore).map(x=>x.props.label));
-            assert.deepEqual(buttonLabels, stringListToSet(["Mutation", "Copy number alterations"]));
+describe('DataTypePrioritySelector', () => {
+    describe('checkBoxes', () => {
+        it('shows the right buttons when theres mutation and cna profiles available', () => {
+            const buttonLabels = stringListToSet(
+                checkBoxes({ mutation: true, cna: true }, {} as QueryStore).map(
+                    x => x.props.label
+                )
+            );
+            assert.deepEqual(
+                buttonLabels,
+                stringListToSet(['Mutation', 'Copy number alterations'])
+            );
         });
-        it("shows the right buttons when theres just mutation profiles available",()=>{
-            const buttonLabels = stringListToSet(checkBoxes({mutation:true, cna:false}, {} as QueryStore).map(x=>x.props.label));
-            assert.deepEqual(buttonLabels, stringListToSet(["Mutation"]));
+        it('shows the right buttons when theres just mutation profiles available', () => {
+            const buttonLabels = stringListToSet(
+                checkBoxes(
+                    { mutation: true, cna: false },
+                    {} as QueryStore
+                ).map(x => x.props.label)
+            );
+            assert.deepEqual(buttonLabels, stringListToSet(['Mutation']));
         });
-        it("shows the right buttons when theres just cna profiles available",()=>{
-            const buttonLabels = stringListToSet(checkBoxes({mutation:false, cna:true}, {} as QueryStore).map(x=>x.props.label));
-            assert.deepEqual(buttonLabels, stringListToSet(["Copy number alterations"]));
+        it('shows the right buttons when theres just cna profiles available', () => {
+            const buttonLabels = stringListToSet(
+                checkBoxes(
+                    { mutation: false, cna: true },
+                    {} as QueryStore
+                ).map(x => x.props.label)
+            );
+            assert.deepEqual(
+                buttonLabels,
+                stringListToSet(['Copy number alterations'])
+            );
         });
-    })
-});
\ No newline at end of file
+    });
+});
diff --git a/src/shared/components/query/DataTypePrioritySelector.tsx b/src/shared/components/query/DataTypePrioritySelector.tsx
index 5909b2e7e58..83a711d0dfd 100644
--- a/src/shared/components/query/DataTypePrioritySelector.tsx
+++ b/src/shared/components/query/DataTypePrioritySelector.tsx
@@ -1,89 +1,109 @@
 import * as _ from 'lodash';
 import * as React from 'react';
 import * as styles_any from './styles/styles.module.scss';
-import {QueryStore, QueryStoreComponent} from "./QueryStore";
-import {toJS} from "mobx";
-import {observer} from "mobx-react";
-import {FlexRow, FlexCol} from "../flexbox/FlexBox";
-import SectionHeader from "../sectionHeader/SectionHeader";
-import {AlterationTypeConstants} from "../../../pages/resultsView/ResultsViewPageStore";
-import LoadingIndicator from "shared/components/loadingIndicator/LoadingIndicator";
-import {MolecularProfile} from "../../api/generated/CBioPortalAPI";
+import { QueryStore, QueryStoreComponent } from './QueryStore';
+import { toJS } from 'mobx';
+import { observer } from 'mobx-react';
+import { FlexRow, FlexCol } from '../flexbox/FlexBox';
+import SectionHeader from '../sectionHeader/SectionHeader';
+import { AlterationTypeConstants } from '../../../pages/resultsView/ResultsViewPageStore';
+import LoadingIndicator from 'shared/components/loadingIndicator/LoadingIndicator';
+import { MolecularProfile } from '../../api/generated/CBioPortalAPI';
 
 const styles = styles_any as {
-	DataTypePrioritySelector: string,
-	DataTypePriorityLabel: string,
+    DataTypePrioritySelector: string;
+    DataTypePriorityLabel: string;
 };
 
 @observer
-export default class DataTypePrioritySelector extends QueryStoreComponent<{}, {}>
-{
-	render()
-	{
-		if (!this.store.isVirtualStudyQuery)
-			return null;
-
-		let flexRowContents:JSX.Element[] = [];
-		flexRowContents.push(<LoadingIndicator key="loading" isLoading={this.store.profileAvailability.isPending}/>);
-		if (this.store.profileAvailability.isError) {
-			flexRowContents.push(<span key="error">Error loading profiles for selected studies.</span>);
-		} else if (this.store.profileAvailability.isComplete) {
-			flexRowContents = flexRowContents.concat(checkBoxes(this.store.profileAvailability.result, this.store));
-		}
-		return (
-			<FlexRow padded className={styles.DataTypePrioritySelector} data-test="dataTypePrioritySelector">
-				<SectionHeader className="sectionLabel">Select Molecular Profiles:</SectionHeader>
-				<FlexRow>
-					{flexRowContents}
-				</FlexRow>
-			</FlexRow>
-		);
-	}
-
+export default class DataTypePrioritySelector extends QueryStoreComponent<
+    {},
+    {}
+> {
+    render() {
+        if (!this.store.isVirtualStudyQuery) return null;
 
+        let flexRowContents: JSX.Element[] = [];
+        flexRowContents.push(
+            <LoadingIndicator
+                key="loading"
+                isLoading={this.store.profileAvailability.isPending}
+            />
+        );
+        if (this.store.profileAvailability.isError) {
+            flexRowContents.push(
+                <span key="error">
+                    Error loading profiles for selected studies.
+                </span>
+            );
+        } else if (this.store.profileAvailability.isComplete) {
+            flexRowContents = flexRowContents.concat(
+                checkBoxes(this.store.profileAvailability.result, this.store)
+            );
+        }
+        return (
+            <FlexRow
+                padded
+                className={styles.DataTypePrioritySelector}
+                data-test="dataTypePrioritySelector"
+            >
+                <SectionHeader className="sectionLabel">
+                    Select Molecular Profiles:
+                </SectionHeader>
+                <FlexRow>{flexRowContents}</FlexRow>
+            </FlexRow>
+        );
+    }
 }
 
 export const DataTypePriorityCheckBox = observer(
-	(props: {label: string, state:'mutation' | 'cna', store:QueryStore, dataTest:string}) => (
-		<label className={styles.DataTypePriorityLabel}>
-			<input
-				type="checkbox"
-				checked={props.store.dataTypePriority[props.state] || false}
-				onChange={event => {
-					props.store.dataTypePriority[props.state] = event.currentTarget.checked;
-				}}
-				data-test={props.dataTest}
-			/>
-			{props.label}
-		</label>
-	)
+    (props: {
+        label: string;
+        state: 'mutation' | 'cna';
+        store: QueryStore;
+        dataTest: string;
+    }) => (
+        <label className={styles.DataTypePriorityLabel}>
+            <input
+                type="checkbox"
+                checked={props.store.dataTypePriority[props.state] || false}
+                onChange={event => {
+                    props.store.dataTypePriority[props.state] =
+                        event.currentTarget.checked;
+                }}
+                data-test={props.dataTest}
+            />
+            {props.label}
+        </label>
+    )
 );
 
-export function checkBoxes(availability:{mutation:boolean, cna:boolean}, store:QueryStore):JSX.Element[] {
-	let buttons = [];
-	if (availability.mutation) {
-		buttons.push(
-			<DataTypePriorityCheckBox
-				key="M"
-				label={"Mutation"}
-				state={"mutation"}
-				store={store}
-				dataTest="M"
-			/>
-		);
-	}
-	if (availability.cna) {
-		buttons.push(
-			<DataTypePriorityCheckBox
-				key="C"
-				label={"Copy number alterations"}
-				state={"cna"}
-				store={store}
-				dataTest="C"
-			/>
-		);
-	}
-	return buttons;
+export function checkBoxes(
+    availability: { mutation: boolean; cna: boolean },
+    store: QueryStore
+): JSX.Element[] {
+    let buttons = [];
+    if (availability.mutation) {
+        buttons.push(
+            <DataTypePriorityCheckBox
+                key="M"
+                label={'Mutation'}
+                state={'mutation'}
+                store={store}
+                dataTest="M"
+            />
+        );
+    }
+    if (availability.cna) {
+        buttons.push(
+            <DataTypePriorityCheckBox
+                key="C"
+                label={'Copy number alterations'}
+                state={'cna'}
+                store={store}
+                dataTest="C"
+            />
+        );
+    }
+    return buttons;
 }
-
-
diff --git a/src/shared/components/query/GeneSetSelector.tsx b/src/shared/components/query/GeneSetSelector.tsx
index 0410af3bb55..3c69c47b7e1 100644
--- a/src/shared/components/query/GeneSetSelector.tsx
+++ b/src/shared/components/query/GeneSetSelector.tsx
@@ -99,9 +99,7 @@ export default class GeneSetSelector extends QueryStoreComponent<{}, {}> {
                             name="exclamation-circle"
                         />
                         <GeneSymbolValidationError
-                            sampleCount={
-                                this.store.approxSampleCount
-                            }
+                            sampleCount={this.store.approxSampleCount}
                             queryProductLimit={
                                 AppConfig.serverConfig.query_product_limit
                             }
diff --git a/src/shared/components/query/GenesetsHierarchyFilterForm.tsx b/src/shared/components/query/GenesetsHierarchyFilterForm.tsx
index 4a7e08e9c88..eab7945a2d9 100644
--- a/src/shared/components/query/GenesetsHierarchyFilterForm.tsx
+++ b/src/shared/components/query/GenesetsHierarchyFilterForm.tsx
@@ -1,65 +1,107 @@
 import * as React from 'react';
-import {observable} from "mobx";
-import {observer} from "mobx-react";
+import { observable } from 'mobx';
+import { observer } from 'mobx-react';
 import ReactSelect from 'react-select1';
 
-export type validPercentile = 50|75|100;
+export type validPercentile = 50 | 75 | 100;
 
-interface GenesetsHierarchyFilterFormProps
-{
+interface GenesetsHierarchyFilterFormProps {
     percentile: validPercentile;
     pvalueThreshold: number;
     scoreThreshold: number;
-    onApply: (percentile: validPercentile, pvalueThreshold: number, scoreThreshold: number) => void;
+    onApply: (
+        percentile: validPercentile,
+        pvalueThreshold: number,
+        scoreThreshold: number
+    ) => void;
 }
 
 @observer
-export default class GenesetsHierarchyFilterForm extends React.Component<GenesetsHierarchyFilterFormProps, {}>
-{
+export default class GenesetsHierarchyFilterForm extends React.Component<
+    GenesetsHierarchyFilterFormProps,
+    {}
+> {
     @observable percentile = this.props.percentile;
     @observable pvalueThreshold = String(this.props.pvalueThreshold);
     @observable scoreThreshold = String(this.props.scoreThreshold);
-    readonly percentileOptions = [{label: '50%', value: 50}, {label: '75%', value: 75}, {label: '100%', value: 100}];
-    constructor(props:GenesetsHierarchyFilterFormProps)
-    {
+    readonly percentileOptions = [
+        { label: '50%', value: 50 },
+        { label: '75%', value: 75 },
+        { label: '100%', value: 100 },
+    ];
+    constructor(props: GenesetsHierarchyFilterFormProps) {
         super(props);
         this.percentileChange = this.percentileChange.bind(this);
         this.applyFilter = this.applyFilter.bind(this);
     }
-    
-    percentileChange(val: {label: string, value: validPercentile} | null)
-    {
+
+    percentileChange(val: { label: string; value: validPercentile } | null) {
         this.percentile = val ? val.value : 75;
     }
-    
+
     applyFilter() {
-        const pvalueThreshold = this.pvalueThreshold ? Number(this.pvalueThreshold) : NaN;
-        const scoreThreshold = this.scoreThreshold ? Number(this.scoreThreshold) : NaN;
+        const pvalueThreshold = this.pvalueThreshold
+            ? Number(this.pvalueThreshold)
+            : NaN;
+        const scoreThreshold = this.scoreThreshold
+            ? Number(this.scoreThreshold)
+            : NaN;
         if (!Number.isNaN(pvalueThreshold) && !Number.isNaN(scoreThreshold)) {
-            this.props.onApply(this.percentile, pvalueThreshold, scoreThreshold);
+            this.props.onApply(
+                this.percentile,
+                pvalueThreshold,
+                scoreThreshold
+            );
         }
     }
-    
-    render()
-    {
+
+    render() {
         return (
-            <div style={{display: "flex", flexDirection: "row", justifyContent: "space-evenly", alignItems: "center",
-                width:"100%", background:"#eee", padding:"10px 10px"}}>
-                <div style={{display: "flex", flexDirection: "column"}}>
+            <div
+                style={{
+                    display: 'flex',
+                    flexDirection: 'row',
+                    justifyContent: 'space-evenly',
+                    alignItems: 'center',
+                    width: '100%',
+                    background: '#eee',
+                    padding: '10px 10px',
+                }}
+            >
+                <div style={{ display: 'flex', flexDirection: 'column' }}>
                     <label htmlFor="GSVAScore">GSVA score</label>
-                    <input id="GSVAScore" type="string" value={this.scoreThreshold} style={{width:160, height:36, padding:10}}
-                        onChange={event => this.scoreThreshold = event.target.value} step="0.1"/>
+                    <input
+                        id="GSVAScore"
+                        type="string"
+                        value={this.scoreThreshold}
+                        style={{ width: 160, height: 36, padding: 10 }}
+                        onChange={event =>
+                            (this.scoreThreshold = event.target.value)
+                        }
+                        step="0.1"
+                    />
                 </div>
-                <div style={{display: "flex", flexDirection: "column"}}>
+                <div style={{ display: 'flex', flexDirection: 'column' }}>
                     <label htmlFor="Pvalue">P-value</label>
-                    <input id="Pvalue" type="string" value={this.pvalueThreshold} style={{width:160, height:36, padding:10}}
-                        onChange={event => this.pvalueThreshold = event.target.value} step="0.01" min="0"/>
+                    <input
+                        id="Pvalue"
+                        type="string"
+                        value={this.pvalueThreshold}
+                        style={{ width: 160, height: 36, padding: 10 }}
+                        onChange={event =>
+                            (this.pvalueThreshold = event.target.value)
+                        }
+                        step="0.01"
+                        min="0"
+                    />
                 </div>
                 <div>
-                    <label htmlFor="PercentileScoreCalculation">Percentile for score calculation</label>
+                    <label htmlFor="PercentileScoreCalculation">
+                        Percentile for score calculation
+                    </label>
                     <ReactSelect
                         addLabelText="Percentile for score calculation"
-                        style={{width:160, borderRadius: "2px"}}
+                        style={{ width: 160, borderRadius: '2px' }}
                         clearable={false}
                         name="PercentileScoreCalculation"
                         value={this.percentile}
@@ -71,7 +113,7 @@ export default class GenesetsHierarchyFilterForm extends React.Component<Geneset
                     <button
                         id="filterButton"
                         className="btn btn-primary btn-sm"
-                        style={{padding: "20px 18px"}}
+                        style={{ padding: '20px 18px' }}
                         onClick={this.applyFilter}
                     >
                         Apply Filter
diff --git a/src/shared/components/query/GenesetsHierarchySelector.tsx b/src/shared/components/query/GenesetsHierarchySelector.tsx
index e486fd6b126..e1c95d369ac 100644
--- a/src/shared/components/query/GenesetsHierarchySelector.tsx
+++ b/src/shared/components/query/GenesetsHierarchySelector.tsx
@@ -1,70 +1,85 @@
 import * as React from 'react';
-import {ObservableMap, observable} from "mobx";
-import {observer} from "mobx-react";
-import GenesetsJsTree from "./GenesetsJsTree";
-import GenesetsHierarchyFilterForm, {validPercentile} from "./GenesetsHierarchyFilterForm";
+import { ObservableMap, observable } from 'mobx';
+import { observer } from 'mobx-react';
+import GenesetsJsTree from './GenesetsJsTree';
+import GenesetsHierarchyFilterForm, {
+    validPercentile,
+} from './GenesetsHierarchyFilterForm';
 
-export interface GenesetsHierarchySelectorProps
-{
+export interface GenesetsHierarchySelectorProps {
     initialSelection: string[];
     gsvaProfile: string;
-    sampleListId: string|undefined;
-    onSelect: (map_geneSet_selected:ObservableMap<boolean>) => void;
+    sampleListId: string | undefined;
+    onSelect: (map_geneSet_selected: ObservableMap<boolean>) => void;
 }
 
 @observer
-export default class GenesetsHierarchySelector extends React.Component<GenesetsHierarchySelectorProps, {}>
-{
+export default class GenesetsHierarchySelector extends React.Component<
+    GenesetsHierarchySelectorProps,
+    {}
+> {
     @observable percentile: validPercentile = 75;
     @observable pvalueThreshold = 0.05;
     @observable scoreThreshold = 0.5;
-    @observable searchValue = "";
-    
-    constructor(props:GenesetsHierarchySelectorProps)
-    {
+    @observable searchValue = '';
+
+    constructor(props: GenesetsHierarchySelectorProps) {
         super(props);
-        this.updateSelectionParameters = this.updateSelectionParameters.bind(this);
+        this.updateSelectionParameters = this.updateSelectionParameters.bind(
+            this
+        );
     }
-    
-    updateSelectionParameters(percentile: validPercentile, pvalueThreshold: number, scoreThreshold: number) {
+
+    updateSelectionParameters(
+        percentile: validPercentile,
+        pvalueThreshold: number,
+        scoreThreshold: number
+    ) {
         this.percentile = percentile;
         this.pvalueThreshold = pvalueThreshold;
         this.scoreThreshold = scoreThreshold;
     }
-    
-    render()
-    {
+
+    render() {
         return (
-                <div>
-                    <text>Search hierarchy</text>
-                    <div className={`form-group has-feedback input-group-sm`} style={{ display:'inline-block'}}>
-                        <input
-                            type="text"
-                            id="geneset-hierarchy-search"
-                            className="form-control tableSearchInput"
-                            style={{ width:768 }}
-                            value={this.searchValue}
-                            onChange={event => this.searchValue = event.target.value}
-                        />
-                        <span className="fa fa-search form-control-feedback" aria-hidden="true"></span>
-                    </div>
-                    <GenesetsHierarchyFilterForm
-                        percentile = {this.percentile}
-                        pvalueThreshold = {this.pvalueThreshold}
-                        scoreThreshold = {this.scoreThreshold}
-                        onApply={this.updateSelectionParameters}
-                    />
-                    <GenesetsJsTree
-                        initialSelection={this.props.initialSelection}
-                        scoreThreshold={this.scoreThreshold}
-                        pvalueThreshold={this.pvalueThreshold}
-                        percentile={this.percentile}
-                        gsvaProfile={this.props.gsvaProfile}
-                        sampleListId={this.props.sampleListId}
-                        searchValue={this.searchValue}
-                        onSelect={this.props.onSelect}
+            <div>
+                <text>Search hierarchy</text>
+                <div
+                    className={`form-group has-feedback input-group-sm`}
+                    style={{ display: 'inline-block' }}
+                >
+                    <input
+                        type="text"
+                        id="geneset-hierarchy-search"
+                        className="form-control tableSearchInput"
+                        style={{ width: 768 }}
+                        value={this.searchValue}
+                        onChange={event =>
+                            (this.searchValue = event.target.value)
+                        }
                     />
+                    <span
+                        className="fa fa-search form-control-feedback"
+                        aria-hidden="true"
+                    ></span>
                 </div>
+                <GenesetsHierarchyFilterForm
+                    percentile={this.percentile}
+                    pvalueThreshold={this.pvalueThreshold}
+                    scoreThreshold={this.scoreThreshold}
+                    onApply={this.updateSelectionParameters}
+                />
+                <GenesetsJsTree
+                    initialSelection={this.props.initialSelection}
+                    scoreThreshold={this.scoreThreshold}
+                    pvalueThreshold={this.pvalueThreshold}
+                    percentile={this.percentile}
+                    gsvaProfile={this.props.gsvaProfile}
+                    sampleListId={this.props.sampleListId}
+                    searchValue={this.searchValue}
+                    onSelect={this.props.onSelect}
+                />
+            </div>
         );
     }
 }
diff --git a/src/shared/components/query/GenesetsJsTree.tsx b/src/shared/components/query/GenesetsJsTree.tsx
index 52e40f15a9d..2c9df46e113 100644
--- a/src/shared/components/query/GenesetsJsTree.tsx
+++ b/src/shared/components/query/GenesetsJsTree.tsx
@@ -1,214 +1,254 @@
 import React from 'react';
 import $ from 'jquery';
-import {getHierarchyData} from "shared/lib/StoreUtils";
+import { getHierarchyData } from 'shared/lib/StoreUtils';
 //Import jstree.min and style for jstree to work
 import 'jstree/dist/jstree.min'; // tslint:disable-line
 import 'shared/components/query/styles/jstree/style.css'; // tslint:disable-line
-import * as _ from "lodash";
-import { remoteData } from "cbioportal-frontend-commons";
-import CBioPortalAPIInternal, { GenesetHierarchyInfo } from "shared/api/generated/CBioPortalAPIInternal";
-import { observer } from "mobx-react";
-import { observable, ObservableMap } from "mobx";
-import LoadingIndicator from "shared/components/loadingIndicator/LoadingIndicator";
-
-export interface GenesetsJsTreeProps
-{
+import * as _ from 'lodash';
+import { remoteData } from 'cbioportal-frontend-commons';
+import CBioPortalAPIInternal, {
+    GenesetHierarchyInfo,
+} from 'shared/api/generated/CBioPortalAPIInternal';
+import { observer } from 'mobx-react';
+import { observable, ObservableMap } from 'mobx';
+import LoadingIndicator from 'shared/components/loadingIndicator/LoadingIndicator';
+
+export interface GenesetsJsTreeProps {
     initialSelection: string[];
     scoreThreshold: number;
     pvalueThreshold: number;
     percentile: number;
     gsvaProfile: string;
-    sampleListId: string|undefined;
+    sampleListId: string | undefined;
     searchValue: string;
-    onSelect: (map_geneSet_selected:ObservableMap<boolean>) => void;
+    onSelect: (map_geneSet_selected: ObservableMap<boolean>) => void;
 }
 
 type JSNode = {
-    original: {description: string, geneset: boolean};
+    original: { description: string; geneset: boolean };
 };
 
 @observer
-export default class GenesetsJsTree extends React.Component<GenesetsJsTreeProps, {}>
-{
-    tree: Element|null;
+export default class GenesetsJsTree extends React.Component<
+    GenesetsJsTreeProps,
+    {}
+> {
+    tree: Element | null;
     @observable isLoading = true;
     promisedTree: Promise<Element>;
     private readonly map_geneSets_selected = new ObservableMap<boolean>();
 
-    constructor(props: GenesetsJsTreeProps)
-    {
+    constructor(props: GenesetsJsTreeProps) {
         super(props);
-        this.map_geneSets_selected.replace(props.initialSelection.map(geneSet => [geneSet, true]));
+        this.map_geneSets_selected.replace(
+            props.initialSelection.map(geneSet => [geneSet, true])
+        );
     }
-    
-    componentDidMount(){
+
+    componentDidMount() {
         this.promisedTree = this.initTree(this.tree as Element); //React only sets the div to null when the component unmounts
-        this.promisedTree.then(tree => (this.isLoading = false, tree));
+        this.promisedTree.then(tree => ((this.isLoading = false), tree));
     }
-    
-    componentDidUpdate(prevProps: GenesetsJsTreeProps){
-        if (this.props.scoreThreshold !== prevProps.scoreThreshold ||
+
+    componentDidUpdate(prevProps: GenesetsJsTreeProps) {
+        if (
+            this.props.scoreThreshold !== prevProps.scoreThreshold ||
             this.props.pvalueThreshold !== prevProps.pvalueThreshold ||
-            this.props.percentile !== prevProps.percentile) {
+            this.props.percentile !== prevProps.percentile
+        ) {
             this.promisedTree = this.promisedTree
-                .then(tree => (this.isLoading = true, this.replaceTree(tree)))
-                .then(tree => (this.isLoading = false, tree));
+                .then(tree => ((this.isLoading = true), this.replaceTree(tree)))
+                .then(tree => ((this.isLoading = false), tree));
         }
         if (this.props.searchValue !== prevProps.searchValue) {
-            this.promisedTree = this.promisedTree
-                .then(tree => this.searchTree(tree, this.props.searchValue));
+            this.promisedTree = this.promisedTree.then(tree =>
+                this.searchTree(tree, this.props.searchValue)
+            );
         }
     }
-    
+
     transformHierarchyData(result_data: GenesetHierarchyInfo[]) {
-          const data = result_data;
-          const flatData = [];
-          
-          // Leafs can be non-unique, therefore a unique ID is necessary,
-          // because selecting a duplicate leaf results in a visualization issue.
-          let leafId = 0;
-        
-          for (const node of data) {
-              const nodeName = node.nodeName;
-              const nodeParent = node.parentNodeName ? node.parentNodeName : "#";
-              
-              flatData.push({
-                  id : nodeName,
-                  parent : nodeParent,
-                  text: nodeName,
-                  li_attr: {
-                      name: nodeName,
-                  },
-                  geneset : false,
-                  state : {
-                      opened : true,
-                      selected : false,
-                  }
-              });
-              
-              // Check if node has any gene sets, and if so, iterate over them
-              if (_.has(node, 'genesets')) {
-                  for (const geneSet of node.genesets) {
-                      const genesetId = leafId ++;
-                      const genesetName = geneSet.genesetId;
-                      const genesetDescription = geneSet.description;
-                      const genesetRepresentativeScore = geneSet.representativeScore;
-                      let genesetRepresentativePvalue: number|string = geneSet.representativePvalue;
-                      const genesetRefLink = geneSet.refLink;
-                      let genesetInfo = '';
-        
-                      // Add score to leaf
-                      genesetInfo = genesetInfo + 'score = ' +  genesetRepresentativeScore.toFixed(2);
-                      
-                      // Round pvalue if necessary
-                      // 0.005 is rounded to 0.01 and 0.0049 to 0.00, so below 0.005 should be exponential (5e-3)
-                      if (genesetRepresentativePvalue < 0.005) {
-                          genesetRepresentativePvalue = genesetRepresentativePvalue.toExponential(0);
-                      } else {
-                          genesetRepresentativePvalue = genesetRepresentativePvalue.toFixed(2);
-                      }
-                      
-                      // Add pvalue to leaf 
-                      genesetInfo = genesetInfo + ', p-value = ' +  genesetRepresentativePvalue;
-          
-                      // Build label and add styling
-                      const genesetNameText = genesetName + '<span style="font-weight:normal;font-style:italic;"> ' + genesetInfo + '</span>';
-                      
-                      flatData.push({
-                          // Add compulsory information
-                          id : genesetId.toString(),
-                          parent : nodeName,
-                          text: genesetNameText, 
-                          state : {
-                              selected : false
-                          },
-                          li_attr : {
-                              name: genesetName,
-                          },
-                      
-                          // Also add additional data which might be useful later
-                          description : genesetDescription,
-                          representativeScore : genesetRepresentativeScore,
-                          representativePvalue : genesetRepresentativePvalue,
-                          refLink : genesetRefLink,
-                          geneset : true,
-                          
-                      });
-                  }
-              }
-          }
-          return flatData;
-      }
-    
-    async initTree(tree: Element): Promise<Element>{
+        const data = result_data;
+        const flatData = [];
+
+        // Leafs can be non-unique, therefore a unique ID is necessary,
+        // because selecting a duplicate leaf results in a visualization issue.
+        let leafId = 0;
+
+        for (const node of data) {
+            const nodeName = node.nodeName;
+            const nodeParent = node.parentNodeName ? node.parentNodeName : '#';
+
+            flatData.push({
+                id: nodeName,
+                parent: nodeParent,
+                text: nodeName,
+                li_attr: {
+                    name: nodeName,
+                },
+                geneset: false,
+                state: {
+                    opened: true,
+                    selected: false,
+                },
+            });
+
+            // Check if node has any gene sets, and if so, iterate over them
+            if (_.has(node, 'genesets')) {
+                for (const geneSet of node.genesets) {
+                    const genesetId = leafId++;
+                    const genesetName = geneSet.genesetId;
+                    const genesetDescription = geneSet.description;
+                    const genesetRepresentativeScore =
+                        geneSet.representativeScore;
+                    let genesetRepresentativePvalue: number | string =
+                        geneSet.representativePvalue;
+                    const genesetRefLink = geneSet.refLink;
+                    let genesetInfo = '';
+
+                    // Add score to leaf
+                    genesetInfo =
+                        genesetInfo +
+                        'score = ' +
+                        genesetRepresentativeScore.toFixed(2);
+
+                    // Round pvalue if necessary
+                    // 0.005 is rounded to 0.01 and 0.0049 to 0.00, so below 0.005 should be exponential (5e-3)
+                    if (genesetRepresentativePvalue < 0.005) {
+                        genesetRepresentativePvalue = genesetRepresentativePvalue.toExponential(
+                            0
+                        );
+                    } else {
+                        genesetRepresentativePvalue = genesetRepresentativePvalue.toFixed(
+                            2
+                        );
+                    }
+
+                    // Add pvalue to leaf
+                    genesetInfo =
+                        genesetInfo +
+                        ', p-value = ' +
+                        genesetRepresentativePvalue;
+
+                    // Build label and add styling
+                    const genesetNameText =
+                        genesetName +
+                        '<span style="font-weight:normal;font-style:italic;"> ' +
+                        genesetInfo +
+                        '</span>';
+
+                    flatData.push({
+                        // Add compulsory information
+                        id: genesetId.toString(),
+                        parent: nodeName,
+                        text: genesetNameText,
+                        state: {
+                            selected: false,
+                        },
+                        li_attr: {
+                            name: genesetName,
+                        },
+
+                        // Also add additional data which might be useful later
+                        description: genesetDescription,
+                        representativeScore: genesetRepresentativeScore,
+                        representativePvalue: genesetRepresentativePvalue,
+                        refLink: genesetRefLink,
+                        geneset: true,
+                    });
+                }
+            }
+        }
+        return flatData;
+    }
+
+    async initTree(tree: Element): Promise<Element> {
         const hierarchyData = await getHierarchyData(
-                this.props.gsvaProfile, this.props.percentile, this.props.scoreThreshold, 
-                this.props.pvalueThreshold, this.props.sampleListId);
+            this.props.gsvaProfile,
+            this.props.percentile,
+            this.props.scoreThreshold,
+            this.props.pvalueThreshold,
+            this.props.sampleListId
+        );
         $(tree).jstree({
-            "search": {
-                'show_only_matches': true,
-                'show_only_matches_children': true
+            search: {
+                show_only_matches: true,
+                show_only_matches_children: true,
             },
-            'checkbox': {
-                'cascade_to_disabled': false,
-                'cascade_to_hidden': false
+            checkbox: {
+                cascade_to_disabled: false,
+                cascade_to_hidden: false,
             },
-            'core' : {
-                'themes': {
-                    'icons': false
+            core: {
+                themes: {
+                    icons: false,
                 },
-                'check_callback' : true,
-                'data' : this.transformHierarchyData(hierarchyData)
+                check_callback: true,
+                data: this.transformHierarchyData(hierarchyData),
             },
-            "plugins" : ["checkbox", "search"]
+            plugins: ['checkbox', 'search'],
         });
         return tree;
     }
-    
-    destroyTree(tree: Element){
-        $(tree).jstree(true).destroy();
+
+    destroyTree(tree: Element) {
+        $(tree)
+            .jstree(true)
+            .destroy();
     }
-    
-    async replaceTree(tree:Element): Promise<Element> {
+
+    async replaceTree(tree: Element): Promise<Element> {
         this.destroyTree(tree);
         return await this.initTree(tree);
     }
-    
-    submitGeneSets(tree:Element|null) {
+
+    submitGeneSets(tree: Element | null) {
         if (tree) {
-            const selectedNodes = $(tree).jstree("get_selected", true);
+            const selectedNodes = $(tree).jstree('get_selected', true);
             for (const geneSet of selectedNodes) {
-                if (geneSet.original.geneset) 
-                {
-                    this.map_geneSets_selected.set(geneSet.original.description, true);
+                if (geneSet.original.geneset) {
+                    this.map_geneSets_selected.set(
+                        geneSet.original.description,
+                        true
+                    );
                 }
             }
         }
         return this.map_geneSets_selected;
     }
-    
-    searchTree(tree:Element, searchValue: string) {
-        $(tree).jstree(true).search(searchValue);
+
+    searchTree(tree: Element, searchValue: string) {
+        $(tree)
+            .jstree(true)
+            .search(searchValue);
         return tree;
     }
-    
-    render(){
+
+    render() {
         return (
-                <div>
+            <div>
                 <LoadingIndicator isLoading={this.isLoading} />
-                <div ref={tree => this.tree = tree} style={{maxHeight: "380px", overflowY: "scroll"}} data-test="gsva-tree-container" ></div>
-                <div style={{padding: "30px 0px"}}>
-                <button className="btn btn-primary btn-sm pull-right"
-                    style={{margin: "2px"}}
-                    disabled={this.isLoading}
-                    onClick={() => {const geneSetsselected = this.submitGeneSets(this.tree);
-                                    this.props.onSelect(geneSetsselected);}
-                    }>
-                Select
-                </button>
-            </div>
+                <div
+                    ref={tree => (this.tree = tree)}
+                    style={{ maxHeight: '380px', overflowY: 'scroll' }}
+                    data-test="gsva-tree-container"
+                ></div>
+                <div style={{ padding: '30px 0px' }}>
+                    <button
+                        className="btn btn-primary btn-sm pull-right"
+                        style={{ margin: '2px' }}
+                        disabled={this.isLoading}
+                        onClick={() => {
+                            const geneSetsselected = this.submitGeneSets(
+                                this.tree
+                            );
+                            this.props.onSelect(geneSetsselected);
+                        }}
+                    >
+                        Select
+                    </button>
                 </div>
+            </div>
         );
     }
 }
-
diff --git a/src/shared/components/query/GenesetsSelectorStore.spec.ts b/src/shared/components/query/GenesetsSelectorStore.spec.ts
index ba1a3b2e5ec..b748c38305f 100644
--- a/src/shared/components/query/GenesetsSelectorStore.spec.ts
+++ b/src/shared/components/query/GenesetsSelectorStore.spec.ts
@@ -1,97 +1,124 @@
-import {assert, expect} from "chai";
-import { Geneset, GenesetHierarchyInfo } from "shared/api/generated/CBioPortalAPIInternal";
-import {ObservableMap} from "mobx";
-import { getGenesetsFromHierarchy, getVolcanoPlotMinYValue, getVolcanoPlotData } from "shared/components/query/GenesetsSelectorStore";
+import { assert, expect } from 'chai';
+import {
+    Geneset,
+    GenesetHierarchyInfo,
+} from 'shared/api/generated/CBioPortalAPIInternal';
+import { ObservableMap } from 'mobx';
+import {
+    getGenesetsFromHierarchy,
+    getVolcanoPlotMinYValue,
+    getVolcanoPlotData,
+} from 'shared/components/query/GenesetsSelectorStore';
 
-describe("GenesetsSelectorStore", ()=>{
-    describe("Volcano Plot Popup related functions", ()=>{
-        const genesets: Geneset[] = [{
-            description: "AKT_UP.V1_DN",
-            genesetId: "AKT_UP.V1_DN",
-            name: "AKT_UP.V1_DN",
-            refLink: "http://www.example.com",
-            representativePvalue: 0.0736,
-            representativeScore: 0.1986
-        },
-        {
-            description: "AKT_UP.V1_UP",
-            genesetId: "AKT_UP.V1_UP",
-            name: "AKT_UP.V1_UP",
-            refLink: "http://www.example.com",
-            representativePvalue: 0.0862,
-            representativeScore: 0.3945
-        }];
-        const hierarchyData: GenesetHierarchyInfo[] = [{
-            nodeId: 2, 
-            nodeName: "C6 Oncogenic Signatures",
-            parentId: 1,
-            parentNodeName: "Molecular Signatures Database v6.0",
-            genesets: genesets
-        }];
-        const hierarchyDataNoGenesets: GenesetHierarchyInfo[] = [{
-            nodeId: 2, 
-            nodeName: "C6 Oncogenic Signatures",
-            parentId: 1,
-            parentNodeName: "Molecular Signatures Database v6.0",
-            genesets: []
-        }];
-        it("builds the data for the volcano plot table with the correct values", ()=>{
-            const volcanoPlotTableData = getGenesetsFromHierarchy(hierarchyData);
-            assert.deepEqual(
-                volcanoPlotTableData,
-                [{
-                    description: "AKT_UP.V1_DN",
-                    genesetId: "AKT_UP.V1_DN",
-                    name: "AKT_UP.V1_DN",
-                    refLink: "http://www.example.com",
+describe('GenesetsSelectorStore', () => {
+    describe('Volcano Plot Popup related functions', () => {
+        const genesets: Geneset[] = [
+            {
+                description: 'AKT_UP.V1_DN',
+                genesetId: 'AKT_UP.V1_DN',
+                name: 'AKT_UP.V1_DN',
+                refLink: 'http://www.example.com',
+                representativePvalue: 0.0736,
+                representativeScore: 0.1986,
+            },
+            {
+                description: 'AKT_UP.V1_UP',
+                genesetId: 'AKT_UP.V1_UP',
+                name: 'AKT_UP.V1_UP',
+                refLink: 'http://www.example.com',
+                representativePvalue: 0.0862,
+                representativeScore: 0.3945,
+            },
+        ];
+        const hierarchyData: GenesetHierarchyInfo[] = [
+            {
+                nodeId: 2,
+                nodeName: 'C6 Oncogenic Signatures',
+                parentId: 1,
+                parentNodeName: 'Molecular Signatures Database v6.0',
+                genesets: genesets,
+            },
+        ];
+        const hierarchyDataNoGenesets: GenesetHierarchyInfo[] = [
+            {
+                nodeId: 2,
+                nodeName: 'C6 Oncogenic Signatures',
+                parentId: 1,
+                parentNodeName: 'Molecular Signatures Database v6.0',
+                genesets: [],
+            },
+        ];
+        it('builds the data for the volcano plot table with the correct values', () => {
+            const volcanoPlotTableData = getGenesetsFromHierarchy(
+                hierarchyData
+            );
+            assert.deepEqual(volcanoPlotTableData, [
+                {
+                    description: 'AKT_UP.V1_DN',
+                    genesetId: 'AKT_UP.V1_DN',
+                    name: 'AKT_UP.V1_DN',
+                    refLink: 'http://www.example.com',
                     representativePvalue: 0.0736,
-                    representativeScore: 0.1986
+                    representativeScore: 0.1986,
                 },
                 {
-                    description: "AKT_UP.V1_UP",
-                    genesetId: "AKT_UP.V1_UP",
-                    name: "AKT_UP.V1_UP",
-                    refLink: "http://www.example.com",
+                    description: 'AKT_UP.V1_UP',
+                    genesetId: 'AKT_UP.V1_UP',
+                    name: 'AKT_UP.V1_UP',
+                    refLink: 'http://www.example.com',
                     representativePvalue: 0.0862,
-                    representativeScore: 0.3945
-                }]
-            );
+                    representativeScore: 0.3945,
+                },
+            ]);
         });
-        it("calculates the correct min Y value for the volcano plot", ()=>{
+        it('calculates the correct min Y value for the volcano plot', () => {
             const minYValue = getVolcanoPlotMinYValue(genesets);
             assert.equal(minYValue, 0.0736);
         });
-        it("builds the data for the volcano plot graph with the correct values", ()=>{
+        it('builds the data for the volcano plot graph with the correct values', () => {
             const map_genesets_selected_volcano = new ObservableMap<boolean>();
-            map_genesets_selected_volcano.set("AKT_UP.V1_DN", true);
-            const graphData = getVolcanoPlotData(genesets, map_genesets_selected_volcano);
-            assert.deepEqual(
-                graphData, 
-                [{
+            map_genesets_selected_volcano.set('AKT_UP.V1_DN', true);
+            const graphData = getVolcanoPlotData(
+                genesets,
+                map_genesets_selected_volcano
+            );
+            assert.deepEqual(graphData, [
+                {
                     x: 0.1986,
-                    y: -(Math.log(genesets[0].representativePvalue)/Math.log(10)),
-                    fill: "tomato"
+                    y: -(
+                        Math.log(genesets[0].representativePvalue) /
+                        Math.log(10)
+                    ),
+                    fill: 'tomato',
                 },
                 {
                     x: 0.3945,
-                    y: -(Math.log(genesets[1].representativePvalue)/Math.log(10)),
-                    fill: "3786C2"
-                }]
-            );
+                    y: -(
+                        Math.log(genesets[1].representativePvalue) /
+                        Math.log(10)
+                    ),
+                    fill: '3786C2',
+                },
+            ]);
         });
-        it("returns an empty array if the hierarchy has no genesets", ()=>{
-            const volcanoPlotTableDataNoGenesets = getGenesetsFromHierarchy(hierarchyDataNoGenesets);
+        it('returns an empty array if the hierarchy has no genesets', () => {
+            const volcanoPlotTableDataNoGenesets = getGenesetsFromHierarchy(
+                hierarchyDataNoGenesets
+            );
             assert.deepEqual(volcanoPlotTableDataNoGenesets, []);
         });
-        it("returns undefined for min Y value if the array given is empty", ()=>{
+        it('returns undefined for min Y value if the array given is empty', () => {
             const minYValue = getVolcanoPlotMinYValue([]);
             assert.equal(minYValue, undefined);
         });
-        it("returns undefined for volcano plot data graph if the table data is an empty array", ()=>{
+        it('returns undefined for volcano plot data graph if the table data is an empty array', () => {
             const map_genesets_selected_volcano = new ObservableMap<boolean>();
-            map_genesets_selected_volcano.set("AKT_UP.V1_DN", true);
-            const graphDataUndefined = getVolcanoPlotData([], map_genesets_selected_volcano);
+            map_genesets_selected_volcano.set('AKT_UP.V1_DN', true);
+            const graphDataUndefined = getVolcanoPlotData(
+                [],
+                map_genesets_selected_volcano
+            );
             assert.equal(graphDataUndefined, undefined);
         });
-        });
+    });
 });
diff --git a/src/shared/components/query/GenesetsSelectorStore.tsx b/src/shared/components/query/GenesetsSelectorStore.tsx
index 87b535d50b7..2b4b8bab383 100644
--- a/src/shared/components/query/GenesetsSelectorStore.tsx
+++ b/src/shared/components/query/GenesetsSelectorStore.tsx
@@ -1,10 +1,14 @@
 import * as React from 'react';
-import { Geneset, GenesetHierarchyInfo } from "shared/api/generated/CBioPortalAPIInternal";
-import * as _ from "lodash";
-import { ObservableMap } from "mobx/lib/mobx";
+import {
+    Geneset,
+    GenesetHierarchyInfo,
+} from 'shared/api/generated/CBioPortalAPIInternal';
+import * as _ from 'lodash';
+import { ObservableMap } from 'mobx/lib/mobx';
 
-export function getGenesetsFromHierarchy(hierarchyData: GenesetHierarchyInfo[]): Geneset[]
-{
+export function getGenesetsFromHierarchy(
+    hierarchyData: GenesetHierarchyInfo[]
+): Geneset[] {
     const array: Geneset[] = [];
     for (const node of hierarchyData) {
         if (_.has(node, 'genesets')) {
@@ -14,29 +18,36 @@ export function getGenesetsFromHierarchy(hierarchyData: GenesetHierarchyInfo[]):
     return array;
 }
 
-export function getVolcanoPlotMinYValue(genesetsData: Geneset[]): number|undefined
-{
+export function getVolcanoPlotMinYValue(
+    genesetsData: Geneset[]
+): number | undefined {
     if (genesetsData.length > 0) {
-        const genesetWithMinYValue = _.minBy(genesetsData, function(o) { 
+        const genesetWithMinYValue = _.minBy(genesetsData, function(o) {
             return o.representativePvalue;
-            });
+        });
         return genesetWithMinYValue!.representativePvalue;
     } else {
         return undefined;
     }
 }
 
-export function getVolcanoPlotData(genesetsData: Geneset[], map_genesets_selected_volcano:ObservableMap<boolean>): {x: number, y: number, fill: string}[]|undefined
-{
+export function getVolcanoPlotData(
+    genesetsData: Geneset[],
+    map_genesets_selected_volcano: ObservableMap<boolean>
+): { x: number; y: number; fill: string }[] | undefined {
     if (genesetsData.length > 0) {
-        const volcanoPlotData = genesetsData.map(({representativeScore, representativePvalue, name}) => {
-            const xValue = representativeScore;
-            const yValue = -(Math.log(representativePvalue)/Math.log(10));
-            const fillColor = map_genesets_selected_volcano.get(name) ? "tomato" : "3786C2";
-            return {x: xValue, y: yValue, fill: fillColor};
-        });
+        const volcanoPlotData = genesetsData.map(
+            ({ representativeScore, representativePvalue, name }) => {
+                const xValue = representativeScore;
+                const yValue = -(Math.log(representativePvalue) / Math.log(10));
+                const fillColor = map_genesets_selected_volcano.get(name)
+                    ? 'tomato'
+                    : '3786C2';
+                return { x: xValue, y: yValue, fill: fillColor };
+            }
+        );
         return volcanoPlotData;
     } else {
         return undefined;
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/query/GenesetsVolcanoSelector.tsx b/src/shared/components/query/GenesetsVolcanoSelector.tsx
index 07615933d60..72da3f637b9 100644
--- a/src/shared/components/query/GenesetsVolcanoSelector.tsx
+++ b/src/shared/components/query/GenesetsVolcanoSelector.tsx
@@ -1,220 +1,357 @@
 import * as _ from 'lodash';
 import * as React from 'react';
-import LabeledCheckbox from "../labeledCheckbox/LabeledCheckbox";
+import LabeledCheckbox from '../labeledCheckbox/LabeledCheckbox';
 import * as styles_any from './styles/styles.module.scss';
-import {action, ObservableMap, expr, toJS, computed, observable, autorun} from "mobx";
-import {observer, Observer} from "mobx-react";
-import LazyMobXTable from "shared/components/lazyMobXTable/LazyMobXTable";
-import {Geneset} from "../../api/generated/CBioPortalAPIInternal";
-import {IColumnFormatterData} from "../enhancedReactTable/IColumnFormatter";
-import {IColumnDefMap} from "../enhancedReactTable/IEnhancedReactTableProps";
-import {Td} from 'reactable';
-import {toPrecision} from "../../lib/FormatUtils";
-import { getHierarchyData } from "shared/lib/StoreUtils";
-import ReactSelect from "react-select1";
-import LoadingIndicator from "shared/components/loadingIndicator/LoadingIndicator";
-import { VictoryChart, VictoryScatter, VictoryTheme, VictorySelectionContainer,
-    VictoryAxis, VictoryLabel, VictoryLine } from 'victory';
-import {QueryStoreComponent} from "./QueryStore";
-import CBIOPORTAL_VICTORY_THEME from "../../theme/cBioPoralTheme";
+import {
+    action,
+    ObservableMap,
+    expr,
+    toJS,
+    computed,
+    observable,
+    autorun,
+} from 'mobx';
+import { observer, Observer } from 'mobx-react';
+import LazyMobXTable from 'shared/components/lazyMobXTable/LazyMobXTable';
+import { Geneset } from '../../api/generated/CBioPortalAPIInternal';
+import { IColumnFormatterData } from '../enhancedReactTable/IColumnFormatter';
+import { IColumnDefMap } from '../enhancedReactTable/IEnhancedReactTableProps';
+import { Td } from 'reactable';
+import { toPrecision } from '../../lib/FormatUtils';
+import { getHierarchyData } from 'shared/lib/StoreUtils';
+import ReactSelect from 'react-select1';
+import LoadingIndicator from 'shared/components/loadingIndicator/LoadingIndicator';
+import {
+    VictoryChart,
+    VictoryScatter,
+    VictoryTheme,
+    VictorySelectionContainer,
+    VictoryAxis,
+    VictoryLabel,
+    VictoryLine,
+} from 'victory';
+import { QueryStoreComponent } from './QueryStore';
+import CBIOPORTAL_VICTORY_THEME from '../../theme/cBioPoralTheme';
 
 const styles = styles_any as {
-    GenesetsVolcanoSelectorWindow: string,
-    selectButton: string,
-    selectionColumnHeader: string,
-    selectionColumnCell: string,
+    GenesetsVolcanoSelectorWindow: string;
+    selectButton: string;
+    selectionColumnHeader: string;
+    selectionColumnCell: string;
 };
 
 class GenesetsVolcanoTable extends LazyMobXTable<Geneset> {}
 
-export interface GenesetsVolcanoSelectorProps
-{
+export interface GenesetsVolcanoSelectorProps {
     initialSelection: string[];
-    data: Geneset[]|undefined;
-    plotData: {x: number, y: number, fill: string}[]|undefined;
-    maxY: number|undefined;
-    onSelect: (map_genesets_selected:ObservableMap<boolean>) => void;
+    data: Geneset[] | undefined;
+    plotData: { x: number; y: number; fill: string }[] | undefined;
+    maxY: number | undefined;
+    onSelect: (map_genesets_selected: ObservableMap<boolean>) => void;
 }
 
 @observer
-export default class GenesetsVolcanoSelector extends QueryStoreComponent<GenesetsVolcanoSelectorProps, {plotData:{x: number, y: number, fill: string}[]}>
-{
-    readonly percentileOptions = [{label: '50%', value: '50'}, {label: '75%', value: '75'}, {label: '100%', value: '100'}];
-    constructor(props:GenesetsVolcanoSelectorProps)
-    {
+export default class GenesetsVolcanoSelector extends QueryStoreComponent<
+    GenesetsVolcanoSelectorProps,
+    { plotData: { x: number; y: number; fill: string }[] }
+> {
+    readonly percentileOptions = [
+        { label: '50%', value: '50' },
+        { label: '75%', value: '75' },
+        { label: '100%', value: '100' },
+    ];
+    constructor(props: GenesetsVolcanoSelectorProps) {
         super(props);
         this.percentileChange = this.percentileChange.bind(this);
         this.updateSelectionFromPlot = this.updateSelectionFromPlot.bind(this);
     }
-    
-    percentileChange(val: {label: string, value: string} | null)
-    {
-        this.store.volcanoPlotSelectedPercentile = val || {label: '75%', value: '75'};
+
+    percentileChange(val: { label: string; value: string } | null) {
+        this.store.volcanoPlotSelectedPercentile = val || {
+            label: '75%',
+            value: '75',
+        };
     }
-    
+
     @action updateSelectionFromPlot(points: any, bounds: any) {
         const selectedPoints = points && points[0].data ? points[0].data : [];
-        this.store.volcanoPlotTableData.result!.map(({representativeScore, representativePvalue, name}) => {
-            const xValue = representativeScore;
-            const yValue = -(Math.log(representativePvalue)/Math.log(10));
-            for (const selectedPoint of selectedPoints) {
-                if (selectedPoint.x === xValue && selectedPoint.y === yValue) {
-                    this.store.map_genesets_selected_volcano.set(name, true);
+        this.store.volcanoPlotTableData.result!.map(
+            ({ representativeScore, representativePvalue, name }) => {
+                const xValue = representativeScore;
+                const yValue = -(Math.log(representativePvalue) / Math.log(10));
+                for (const selectedPoint of selectedPoints) {
+                    if (
+                        selectedPoint.x === xValue &&
+                        selectedPoint.y === yValue
+                    ) {
+                        this.store.map_genesets_selected_volcano.set(
+                            name,
+                            true
+                        );
+                    }
                 }
             }
-        });
+        );
     }
-    
-    render()
-    {
+
+    render() {
         return (
-                <div className={styles.GenesetsVolcanoSelectorWindow} style={ {height:"400px"} }>
-                <div style={{float: "left"}} className="form-inline">
-                <label htmlFor="PercentileScoreCalculation">Percentile for score calculation:</label>
-                <span style={{display: "inline-block", verticalAlign: "middle", marginLeft: "1em"}}>
-                <ReactSelect
-                    addLabelText="Percentile for score calculation"
-                    style={{width:160, borderRadius: "2px"}}
-                    clearable={false}
-                    name="PercentileScoreCalculation"
-                    value={this.store.volcanoPlotSelectedPercentile}
-                    options={this.percentileOptions}
-                    onChange={this.percentileChange}
-                />
-                </span>
-                    <LoadingIndicator isLoading={!(this.props.plotData && this.props.maxY
-                        && this.store.volcanoPlotTableData.isComplete && this.props.data)} />
-                {  (this.store.volcanoPlotGraphData) && (this.store.minYVolcanoPlot)
-                    && (this.props.plotData) && (this.props.maxY)
-                    && (this.store.volcanoPlotTableData.isComplete) && (this.props.data) && (
-                <VictoryChart
-                    theme={CBIOPORTAL_VICTORY_THEME}
-                    width={510}
-                    height={350}
-                    containerComponent={
-                        <VictorySelectionContainer
-                            onSelection={this.updateSelectionFromPlot}
-                            selectionStyle={{
-                                fill: "tomato", fillOpacity: 0.5,
-                                stroke: "tomato", strokeWidth: 2
-                              }}
-                            />
+            <div
+                className={styles.GenesetsVolcanoSelectorWindow}
+                style={{ height: '400px' }}
+            >
+                <div style={{ float: 'left' }} className="form-inline">
+                    <label htmlFor="PercentileScoreCalculation">
+                        Percentile for score calculation:
+                    </label>
+                    <span
+                        style={{
+                            display: 'inline-block',
+                            verticalAlign: 'middle',
+                            marginLeft: '1em',
+                        }}
+                    >
+                        <ReactSelect
+                            addLabelText="Percentile for score calculation"
+                            style={{ width: 160, borderRadius: '2px' }}
+                            clearable={false}
+                            name="PercentileScoreCalculation"
+                            value={this.store.volcanoPlotSelectedPercentile}
+                            options={this.percentileOptions}
+                            onChange={this.percentileChange}
+                        />
+                    </span>
+                    <LoadingIndicator
+                        isLoading={
+                            !(
+                                this.props.plotData &&
+                                this.props.maxY &&
+                                this.store.volcanoPlotTableData.isComplete &&
+                                this.props.data
+                            )
                         }
-                >
-                <VictoryAxis crossAxis
-                    domain={[-1, 1.25]}
-                    tickValues={[-1, -0.5, 0, 0.5, 1]}
-                    style={{axisLabel: {padding: 35}}}
-                    label={"GSVA score"}
-                    offsetY={50}
-                    standalone={false}
-                />
-                <VictoryAxis dependentAxis crossAxis
-                    domain={[0, this.props.maxY]}
-                    style={{axisLabel: {padding: 35}, stroke: "none"}}
-                    label={"-log10 p-value"}
-                    offsetX={50}
-                    standalone={false}
-                />
-                <VictoryLabel
-                    text="significance"
-                    datum={{ x:1, y: 1.3}}
-                    textAnchor="start"
-                />
-                <VictoryLine
-                    style={{
-                      data: { stroke: "black", strokeDasharray:5 },
-                      parent: { border: "dotted 1px #f00"}
-                    }}
-                    data={[
-                      { x: -1.2, y: 1.3 },
-                      { x: 1, y: 1.3 }
-                    ]}
-                />
-                <VictoryLine
+                    />
+                    {this.store.volcanoPlotGraphData &&
+                        this.store.minYVolcanoPlot &&
+                        this.props.plotData &&
+                        this.props.maxY &&
+                        this.store.volcanoPlotTableData.isComplete &&
+                        this.props.data && (
+                            <VictoryChart
+                                theme={CBIOPORTAL_VICTORY_THEME}
+                                width={510}
+                                height={350}
+                                containerComponent={
+                                    <VictorySelectionContainer
+                                        onSelection={
+                                            this.updateSelectionFromPlot
+                                        }
+                                        selectionStyle={{
+                                            fill: 'tomato',
+                                            fillOpacity: 0.5,
+                                            stroke: 'tomato',
+                                            strokeWidth: 2,
+                                        }}
+                                    />
+                                }
+                            >
+                                <VictoryAxis
+                                    crossAxis
+                                    domain={[-1, 1.25]}
+                                    tickValues={[-1, -0.5, 0, 0.5, 1]}
+                                    style={{ axisLabel: { padding: 35 } }}
+                                    label={'GSVA score'}
+                                    offsetY={50}
+                                    standalone={false}
+                                />
+                                <VictoryAxis
+                                    dependentAxis
+                                    crossAxis
+                                    domain={[0, this.props.maxY]}
+                                    style={{
+                                        axisLabel: { padding: 35 },
+                                        stroke: 'none',
+                                    }}
+                                    label={'-log10 p-value'}
+                                    offsetX={50}
+                                    standalone={false}
+                                />
+                                <VictoryLabel
+                                    text="significance"
+                                    datum={{ x: 1, y: 1.3 }}
+                                    textAnchor="start"
+                                />
+                                <VictoryLine
+                                    style={{
+                                        data: {
+                                            stroke: 'black',
+                                            strokeDasharray: 5,
+                                        },
+                                        parent: { border: 'dotted 1px #f00' },
+                                    }}
+                                    data={[
+                                        { x: -1.2, y: 1.3 },
+                                        { x: 1, y: 1.3 },
+                                    ]}
+                                />
+                                <VictoryLine
+                                    style={{
+                                        data: { stroke: 'rgb(144, 164, 174)' },
+                                        parent: { border: '1px dashed solid' },
+                                    }}
+                                    data={[
+                                        { x: 0, y: 0 },
+                                        { x: 0, y: this.props.maxY },
+                                    ]}
+                                />
+                                <VictoryScatter
+                                    style={{
+                                        data: {
+                                            fill: (
+                                                d: GenesetsVolcanoSelectorProps['plotData']
+                                            ) => (d ? d.fill : ''),
+                                            fillOpacity: 0.3,
+                                        },
+                                    }}
+                                    size={3}
+                                    data={this.props.plotData}
+                                />
+                            </VictoryChart>
+                        )}
+                </div>
+                <div
                     style={{
-                      data: { stroke: "rgb(144, 164, 174)" },
-                      parent: { border: "1px dashed solid"}
+                        float: 'right',
+                        height: '356.5px',
+                        overflowY: 'scroll',
+                        width: '650px',
                     }}
-                    data={[
-                      { x: 0, y: 0 },
-                      { x: 0, y: this.props.maxY }
-                    ]}
-                />
-                <VictoryScatter
-                    style={{data: {  fill: (d: GenesetsVolcanoSelectorProps["plotData"]) => (d) ? d.fill : "", fillOpacity: 0.3}}}
-                    size={3}
-                    data={this.props.plotData}
-                />
-                </VictoryChart>
-                      )
-                  }
-                </div>
-                <div style={{float: "right", height: "356.5px", overflowY: "scroll", width: "650px"}}>
-                <LoadingIndicator isLoading={!(this.store.volcanoPlotTableData.isComplete && this.props.data)} />
-                {  (this.store.volcanoPlotTableData.isComplete) && (this.props.data) && (
-                <GenesetsVolcanoTable
-                    data={this.props.data}
-                    columns={
-                        [
-                            {
-                                name: 'Gene Sets',
-                                render: (data: Geneset) => <span>{data.name}</span>,
-                                sortBy: (data: Geneset) => data.name,
-                                filter: (data: Geneset, filterString: string, filterStringUpper: string) => {
-                                   return data.name.toUpperCase().indexOf(filterStringUpper) > -1;
-                                }
-                            },
-                            {
-                                name: 'GSVA Score',
-                                render: (data: Geneset) => <span>{data.representativeScore.toFixed(2)}</span>,
-                                sortBy: (data: Geneset) => data.representativeScore
-                            },
-                            {
-                                name: 'P Value',
-                                render: (data: Geneset) => <span>{toPrecision(data.representativePvalue, 2, 0.1)}</span>,
-                                sortBy: (data: Geneset) => data.representativePvalue
-                            },
-                            {
-                                name: 'Selected',
-                                render: (data:Geneset) => 
-                                     (
+                >
+                    <LoadingIndicator
+                        isLoading={
+                            !(
+                                this.store.volcanoPlotTableData.isComplete &&
+                                this.props.data
+                            )
+                        }
+                    />
+                    {this.store.volcanoPlotTableData.isComplete &&
+                        this.props.data && (
+                            <GenesetsVolcanoTable
+                                data={this.props.data}
+                                columns={[
+                                    {
+                                        name: 'Gene Sets',
+                                        render: (data: Geneset) => (
+                                            <span>{data.name}</span>
+                                        ),
+                                        sortBy: (data: Geneset) => data.name,
+                                        filter: (
+                                            data: Geneset,
+                                            filterString: string,
+                                            filterStringUpper: string
+                                        ) => {
+                                            return (
+                                                data.name
+                                                    .toUpperCase()
+                                                    .indexOf(
+                                                        filterStringUpper
+                                                    ) > -1
+                                            );
+                                        },
+                                    },
+                                    {
+                                        name: 'GSVA Score',
+                                        render: (data: Geneset) => (
+                                            <span>
+                                                {data.representativeScore.toFixed(
+                                                    2
+                                                )}
+                                            </span>
+                                        ),
+                                        sortBy: (data: Geneset) =>
+                                            data.representativeScore,
+                                    },
+                                    {
+                                        name: 'P Value',
+                                        render: (data: Geneset) => (
+                                            <span>
+                                                {toPrecision(
+                                                    data.representativePvalue,
+                                                    2,
+                                                    0.1
+                                                )}
+                                            </span>
+                                        ),
+                                        sortBy: (data: Geneset) =>
+                                            data.representativePvalue,
+                                    },
+                                    {
+                                        name: 'Selected',
+                                        render: (data: Geneset) => (
                                             <LabeledCheckbox
-                                                checked={!!this.store.map_genesets_selected_volcano.get(data.name)}
-                                                onChange={event => (this.store.map_genesets_selected_volcano.set(data.name, event.target.checked)) }
+                                                checked={
+                                                    !!this.store.map_genesets_selected_volcano.get(
+                                                        data.name
+                                                    )
+                                                }
+                                                onChange={event =>
+                                                    this.store.map_genesets_selected_volcano.set(
+                                                        data.name,
+                                                        event.target.checked
+                                                    )
+                                                }
                                             />
-                                     )
-                            }
-                        ]
-                    }
-                    initialSortColumn="P Value"
-                    initialSortDirection={'asc'}
-                    showPagination={true}
-                    initialItemsPerPage={100}
-                    showColumnVisibility={false}
-                    showFilter={true}
-                    showCopyDownload={false}
-                /> )
-                }
-                </div>
-                <div style={{float: "right"}}>
-                {  (this.store.volcanoPlotTableData.isComplete) && (this.props.data) && (
-                       <button style={{marginTop:15, float: "right"}}
-                className="btn btn-primary btn-sm pull-right"
-                onClick={() => this.props.onSelect(this.store.map_genesets_selected_volcano)}
-                >
-                    Add selection to the query
-                </button>) }
-                {  (this.store.volcanoPlotTableData.isComplete) && (this.props.data) && (
-                        <button style={{marginRight:15, marginTop:15, float: "right"}} 
-                    className="btn btn-primary btn-sm pull-right"
-                    onClick={() => (this.store.map_genesets_selected_volcano.replace(this.props.initialSelection.map(geneset => [geneset, true])))}
-                    >
-                        Clear selection
-                    </button>
+                                        ),
+                                    },
+                                ]}
+                                initialSortColumn="P Value"
+                                initialSortDirection={'asc'}
+                                showPagination={true}
+                                initialItemsPerPage={100}
+                                showColumnVisibility={false}
+                                showFilter={true}
+                                showCopyDownload={false}
+                            />
                         )}
                 </div>
+                <div style={{ float: 'right' }}>
+                    {this.store.volcanoPlotTableData.isComplete &&
+                        this.props.data && (
+                            <button
+                                style={{ marginTop: 15, float: 'right' }}
+                                className="btn btn-primary btn-sm pull-right"
+                                onClick={() =>
+                                    this.props.onSelect(
+                                        this.store.map_genesets_selected_volcano
+                                    )
+                                }
+                            >
+                                Add selection to the query
+                            </button>
+                        )}
+                    {this.store.volcanoPlotTableData.isComplete &&
+                        this.props.data && (
+                            <button
+                                style={{
+                                    marginRight: 15,
+                                    marginTop: 15,
+                                    float: 'right',
+                                }}
+                                className="btn btn-primary btn-sm pull-right"
+                                onClick={() =>
+                                    this.store.map_genesets_selected_volcano.replace(
+                                        this.props.initialSelection.map(
+                                            geneset => [geneset, true]
+                                        )
+                                    )
+                                }
+                            >
+                                Clear selection
+                            </button>
+                        )}
                 </div>
+            </div>
         );
     }
 }
diff --git a/src/shared/components/query/GisticGeneSelector.tsx b/src/shared/components/query/GisticGeneSelector.tsx
index 1fa5a24c876..dad18eba44a 100644
--- a/src/shared/components/query/GisticGeneSelector.tsx
+++ b/src/shared/components/query/GisticGeneSelector.tsx
@@ -1,217 +1,269 @@
 import * as React from 'react';
 import * as styles_any from './styles/styles.module.scss';
-import {ObservableMap, expr, toJS, computed, observable} from "mobx";
-import {observer, Observer} from "mobx-react";
-import {Gistic} from "../../api/generated/CBioPortalAPIInternal";
-import EnhancedReactTable from "../enhancedReactTable/EnhancedReactTable";
-import {IColumnFormatterData} from "../enhancedReactTable/IColumnFormatter";
-import {Td} from "reactable";
+import { ObservableMap, expr, toJS, computed, observable } from 'mobx';
+import { observer, Observer } from 'mobx-react';
+import { Gistic } from '../../api/generated/CBioPortalAPIInternal';
+import EnhancedReactTable from '../enhancedReactTable/EnhancedReactTable';
+import { IColumnFormatterData } from '../enhancedReactTable/IColumnFormatter';
+import { Td } from 'reactable';
 import classNames from 'classnames';
-import {IColumnDefMap} from "../enhancedReactTable/IEnhancedReactTableProps";
-import {toPrecision} from "../../lib/FormatUtils";
-import {getGeneSymbols, sortByCytoband} from "../../lib/GisticUtils";
+import { IColumnDefMap } from '../enhancedReactTable/IEnhancedReactTableProps';
+import { toPrecision } from '../../lib/FormatUtils';
+import { getGeneSymbols, sortByCytoband } from '../../lib/GisticUtils';
 
 const styles = styles_any as {
-	GisticGeneSelector: string,
-	gisticTable: string,
-	GisticGeneToggles: string,
-	geneToggle: string,
-	selected: string,
-	notSelected: string,
-	simulateHovered: string,
-	someGenes: string,
-	showMoreLess: string,
-	moreGenes: string,
-	selectButton: string,
-	header: string,
-	amp: string,
-	del: string,
+    GisticGeneSelector: string;
+    gisticTable: string;
+    GisticGeneToggles: string;
+    geneToggle: string;
+    selected: string;
+    notSelected: string;
+    simulateHovered: string;
+    someGenes: string;
+    showMoreLess: string;
+    moreGenes: string;
+    selectButton: string;
+    header: string;
+    amp: string;
+    del: string;
 };
 
 const DEFAULT_NUM_GENES_SHOWN = 5;
 
-class GisticTable extends EnhancedReactTable<Gistic> { }
+class GisticTable extends EnhancedReactTable<Gistic> {}
 
-export interface GisticGeneSelectorProps
-{
-	initialSelection: string[];
-	data: Gistic[];
-	onSelect: (map_geneSymbol_selected: ObservableMap<boolean>) => void;
+export interface GisticGeneSelectorProps {
+    initialSelection: string[];
+    data: Gistic[];
+    onSelect: (map_geneSymbol_selected: ObservableMap<boolean>) => void;
 }
 
 @observer
-export default class GisticGeneSelector extends React.Component<GisticGeneSelectorProps, {}>
-{
-	constructor(props: GisticGeneSelectorProps)
-	{
-		super(props);
-		this.map_geneSymbol_selected.replace(props.initialSelection.map(geneSymbol => [geneSymbol, true]));
-	}
+export default class GisticGeneSelector extends React.Component<
+    GisticGeneSelectorProps,
+    {}
+> {
+    constructor(props: GisticGeneSelectorProps) {
+        super(props);
+        this.map_geneSymbol_selected.replace(
+            props.initialSelection.map(geneSymbol => [geneSymbol, true])
+        );
+    }
 
-	map_geneSymbol_selected = observable.map<boolean>();
+    map_geneSymbol_selected = observable.map<boolean>();
 
-	private columns:IColumnDefMap = {
-		'amp': {
-			priority: 1,
-			columnDataFunction: ({rowData: gistic}: IColumnFormatterData<Gistic>) => gistic && (gistic.amp ? 'Amp' : 'Del'),
-			name: "Amp Del",
-			sortable: true,
-			filterable: true,
-			header: (
-				<div className={classNames(styles.header, styles.amp, styles.del)}>
-					<span className={styles.amp}>Amp</span>
-					<span className={styles.del}>Del</span>
-				</div>
-			),
-			formatter: ({name, rowData: gistic, columnData: value}: IColumnFormatterData<Gistic>) => (
-				<Td key={name} column={name} value={value}>
-					{!!(gistic) && (
-						<div className={gistic.amp ? styles.amp : styles.del}/>
-					)}
-				</Td>
-			)
-		},
-		'chromosome': {
-			priority: 2,
-			dataField: 'chromosome',
-			name: "Chr",
-			sortable: true,
-			filterable: true
-		},
-		'cytoband': {
-			priority: 3,
-			dataField: 'cytoband',
-			name: "Cytoband",
-			sortable: sortByCytoband,
-			filterable: true,
-		},
-		'#': {
-			priority: 4,
-			columnDataFunction: ({rowData: gistic}: IColumnFormatterData<Gistic>) => getGeneSymbols(gistic).length,
-			name: "#",
-			sortable: true,
-			filterable: true,
-		},
-		'genes': {
-			priority: 5,
-			// this columnDataFunction allows quick searching by gene symbol
-			columnDataFunction: ({rowData: gistic}: IColumnFormatterData<Gistic>) => getGeneSymbols(gistic).join(' '),
-			name: "Genes",
-			sortable: (genes1:string, genes2:string) => {
-				// sort by length, then alphabetically
-				return genes1.length - genes2.length
-					|| +(genes1 > genes2) - +(genes1 < genes2);
-			},
-			filterable: true,
-			formatter: ({name, rowData: gistic, columnData: value}: IColumnFormatterData<Gistic>) => (
-				<Td key={name} column={name} value={value}>
-					<GisticGeneToggles
-						gistic={gistic}
-						map_geneSymbol_selected={this.map_geneSymbol_selected}
-					/>
-				</Td>
-			),
-		},
-		'qValue': {
-			priority: 6,
-			dataField: 'qValue',
-			name: "Q-Value",
-			sortable: true,
-			filterable: true,
-			formatter: ({name, rowData: gistic, columnData: value}: IColumnFormatterData<Gistic>) => (
-				<Td key={name} column={name} value={value}>
-					{toPrecision(value, 2, 0.1)}
-				</Td>
-			),
-		},
-	};
+    private columns: IColumnDefMap = {
+        amp: {
+            priority: 1,
+            columnDataFunction: ({
+                rowData: gistic,
+            }: IColumnFormatterData<Gistic>) =>
+                gistic && (gistic.amp ? 'Amp' : 'Del'),
+            name: 'Amp Del',
+            sortable: true,
+            filterable: true,
+            header: (
+                <div
+                    className={classNames(
+                        styles.header,
+                        styles.amp,
+                        styles.del
+                    )}
+                >
+                    <span className={styles.amp}>Amp</span>
+                    <span className={styles.del}>Del</span>
+                </div>
+            ),
+            formatter: ({
+                name,
+                rowData: gistic,
+                columnData: value,
+            }: IColumnFormatterData<Gistic>) => (
+                <Td key={name} column={name} value={value}>
+                    {!!gistic && (
+                        <div className={gistic.amp ? styles.amp : styles.del} />
+                    )}
+                </Td>
+            ),
+        },
+        chromosome: {
+            priority: 2,
+            dataField: 'chromosome',
+            name: 'Chr',
+            sortable: true,
+            filterable: true,
+        },
+        cytoband: {
+            priority: 3,
+            dataField: 'cytoband',
+            name: 'Cytoband',
+            sortable: sortByCytoband,
+            filterable: true,
+        },
+        '#': {
+            priority: 4,
+            columnDataFunction: ({
+                rowData: gistic,
+            }: IColumnFormatterData<Gistic>) => getGeneSymbols(gistic).length,
+            name: '#',
+            sortable: true,
+            filterable: true,
+        },
+        genes: {
+            priority: 5,
+            // this columnDataFunction allows quick searching by gene symbol
+            columnDataFunction: ({
+                rowData: gistic,
+            }: IColumnFormatterData<Gistic>) =>
+                getGeneSymbols(gistic).join(' '),
+            name: 'Genes',
+            sortable: (genes1: string, genes2: string) => {
+                // sort by length, then alphabetically
+                return (
+                    genes1.length - genes2.length ||
+                    +(genes1 > genes2) - +(genes1 < genes2)
+                );
+            },
+            filterable: true,
+            formatter: ({
+                name,
+                rowData: gistic,
+                columnData: value,
+            }: IColumnFormatterData<Gistic>) => (
+                <Td key={name} column={name} value={value}>
+                    <GisticGeneToggles
+                        gistic={gistic}
+                        map_geneSymbol_selected={this.map_geneSymbol_selected}
+                    />
+                </Td>
+            ),
+        },
+        qValue: {
+            priority: 6,
+            dataField: 'qValue',
+            name: 'Q-Value',
+            sortable: true,
+            filterable: true,
+            formatter: ({
+                name,
+                rowData: gistic,
+                columnData: value,
+            }: IColumnFormatterData<Gistic>) => (
+                <Td key={name} column={name} value={value}>
+                    {toPrecision(value, 2, 0.1)}
+                </Td>
+            ),
+        },
+    };
 
-	render()
-	{
-		return (
-			<div className={styles.GisticGeneSelector}>
-				<span>
-					{'Click on a gene to '}
-					<span className={classNames(styles.geneToggle, styles.selected, styles.simulateHovered)}>
-						{'select'}
-					</span>
-					{' it.'}
-				</span>
-				<GisticTable
-					className={styles.gisticTable}
-					itemsName="genes"
-					initItemsPerPage={10}
-					columns={this.columns}
-					rawData={this.props.data}
-					headerControlsProps={{
-						showCopyAndDownload: false,
-						showHideShowColumnButton: false,
-						showPagination: true,
-					}}
-					reactTableProps={{
-						className: "table table-striped table-border-top",
-						hideFilterInput: true,
-						defaultSort: this.columns.qValue.name,
-					}}
-				/>
-				<div>
-				<button
-					style={{marginTop:20}} className="btn btn-primary btn-sm pull-right"
-					onClick={() => this.props.onSelect(this.map_geneSymbol_selected)}
-				>
-					Select
-				</button>
-				</div>
-
-			</div>
-		);
-	}
+    render() {
+        return (
+            <div className={styles.GisticGeneSelector}>
+                <span>
+                    {'Click on a gene to '}
+                    <span
+                        className={classNames(
+                            styles.geneToggle,
+                            styles.selected,
+                            styles.simulateHovered
+                        )}
+                    >
+                        {'select'}
+                    </span>
+                    {' it.'}
+                </span>
+                <GisticTable
+                    className={styles.gisticTable}
+                    itemsName="genes"
+                    initItemsPerPage={10}
+                    columns={this.columns}
+                    rawData={this.props.data}
+                    headerControlsProps={{
+                        showCopyAndDownload: false,
+                        showHideShowColumnButton: false,
+                        showPagination: true,
+                    }}
+                    reactTableProps={{
+                        className: 'table table-striped table-border-top',
+                        hideFilterInput: true,
+                        defaultSort: this.columns.qValue.name,
+                    }}
+                />
+                <div>
+                    <button
+                        style={{ marginTop: 20 }}
+                        className="btn btn-primary btn-sm pull-right"
+                        onClick={() =>
+                            this.props.onSelect(this.map_geneSymbol_selected)
+                        }
+                    >
+                        Select
+                    </button>
+                </div>
+            </div>
+        );
+    }
 }
 
 @observer
-class GisticGeneToggles extends React.Component<{gistic?: Gistic, map_geneSymbol_selected: ObservableMap<boolean>}, {}>
-{
-	@observable showAll = false;
+class GisticGeneToggles extends React.Component<
+    { gistic?: Gistic; map_geneSymbol_selected: ObservableMap<boolean> },
+    {}
+> {
+    @observable showAll = false;
 
-	renderGeneToggles(genes: string[])
-	{
-		return genes.map(gene => (
-			<Observer>
-				{() => {
-					let selected = !!this.props.map_geneSymbol_selected.get(gene);
-					return (
-						<span
-							key={gene}
-							className={classNames(styles.geneToggle, selected ? styles.selected : styles.notSelected)}
-							onClick={event => this.props.map_geneSymbol_selected.set(gene, !selected)}
-						>
-							{gene}
-						</span>
-					);
-				}}
-			</Observer>
-		));
-	}
+    renderGeneToggles(genes: string[]) {
+        return genes.map(gene => (
+            <Observer>
+                {() => {
+                    let selected = !!this.props.map_geneSymbol_selected.get(
+                        gene
+                    );
+                    return (
+                        <span
+                            key={gene}
+                            className={classNames(
+                                styles.geneToggle,
+                                selected ? styles.selected : styles.notSelected
+                            )}
+                            onClick={event =>
+                                this.props.map_geneSymbol_selected.set(
+                                    gene,
+                                    !selected
+                                )
+                            }
+                        >
+                            {gene}
+                        </span>
+                    );
+                }}
+            </Observer>
+        ));
+    }
 
-	render()
-	{
-		let allGenes = getGeneSymbols(this.props.gistic);
-		let someGenes = allGenes.slice(0, DEFAULT_NUM_GENES_SHOWN);
-		let moreGenes = allGenes.slice(DEFAULT_NUM_GENES_SHOWN);
-		return (
-			<div className={styles.GisticGeneToggles}>
-				<div className={styles.someGenes}>
-					{this.renderGeneToggles(someGenes)}
-					{!!(moreGenes.length) && (
-						<a className={styles.showMoreLess} onClick={() => this.showAll = !this.showAll}>
-							{this.showAll ? 'less' : `+${moreGenes.length} more`}
-						</a>
-					)}
-				</div>
-				<div className={styles.moreGenes}>
-					{this.showAll && this.renderGeneToggles(moreGenes)}
-				</div>
-			</div>
-		);
-	}
+    render() {
+        let allGenes = getGeneSymbols(this.props.gistic);
+        let someGenes = allGenes.slice(0, DEFAULT_NUM_GENES_SHOWN);
+        let moreGenes = allGenes.slice(DEFAULT_NUM_GENES_SHOWN);
+        return (
+            <div className={styles.GisticGeneToggles}>
+                <div className={styles.someGenes}>
+                    {this.renderGeneToggles(someGenes)}
+                    {!!moreGenes.length && (
+                        <a
+                            className={styles.showMoreLess}
+                            onClick={() => (this.showAll = !this.showAll)}
+                        >
+                            {this.showAll
+                                ? 'less'
+                                : `+${moreGenes.length} more`}
+                        </a>
+                    )}
+                </div>
+                <div className={styles.moreGenes}>
+                    {this.showAll && this.renderGeneToggles(moreGenes)}
+                </div>
+            </div>
+        );
+    }
 }
diff --git a/src/shared/components/query/MolecularProfileSelector.tsx b/src/shared/components/query/MolecularProfileSelector.tsx
index 34016c7310d..a2c81807f41 100644
--- a/src/shared/components/query/MolecularProfileSelector.tsx
+++ b/src/shared/components/query/MolecularProfileSelector.tsx
@@ -1,174 +1,233 @@
 import * as _ from 'lodash';
 import * as React from 'react';
-import {MolecularProfile} from "../../api/generated/CBioPortalAPI";
-import FontAwesome from "react-fontawesome";
+import { MolecularProfile } from '../../api/generated/CBioPortalAPI';
+import FontAwesome from 'react-fontawesome';
 import * as styles_any from './styles/styles.module.scss';
-import {observer} from "mobx-react";
+import { observer } from 'mobx-react';
 import classNames from 'classnames';
-import { FlexRow } from "../flexbox/FlexBox";
-import {QueryStoreComponent} from "./QueryStore";
-import {DefaultTooltip} from "cbioportal-frontend-commons";
-import SectionHeader from "../sectionHeader/SectionHeader";
-import AppConfig from "appConfig";
+import { FlexRow } from '../flexbox/FlexBox';
+import { QueryStoreComponent } from './QueryStore';
+import { DefaultTooltip } from 'cbioportal-frontend-commons';
+import SectionHeader from '../sectionHeader/SectionHeader';
+import AppConfig from 'appConfig';
 
 const styles = styles_any as {
-	MolecularProfileSelector: string,
-	group: string,
-	altType: string,
-	radio: string,
-	checkbox: string,
-	infoIcon: string,
-	zScore: string,
-	groupName: string,
-	profileName: string,
-	tooltip: string,
+    MolecularProfileSelector: string;
+    group: string;
+    altType: string;
+    radio: string;
+    checkbox: string;
+    infoIcon: string;
+    zScore: string;
+    groupName: string;
+    profileName: string;
+    tooltip: string;
 };
 
 @observer
-export default class MolecularProfileSelector extends QueryStoreComponent<{}, {}>
-{
-	private get showGSVA() {
-		return AppConfig.serverConfig.skin_show_gsva;
-	}
-	
-	render()
-	{
-		if (this.store.selectableSelectedStudyIds.length !== 1)
-			return null;
-		
-		return (
-			<FlexRow padded className={styles.MolecularProfileSelector}>
-				<SectionHeader className="sectionLabel" promises={[this.store.molecularProfiles]}>
-					Select Genomic Profiles:
-				</SectionHeader>
-				<div className={styles.group} data-test="molecularProfileSelector">
-					{this.renderGroup("MUTATION_EXTENDED", "Mutation")}
-					{this.renderGroup("COPY_NUMBER_ALTERATION", "Copy Number")}
-					{this.showGSVA && this.renderGroup("GENESET_SCORE", "GSVA scores")}
-					{this.renderGroup("MRNA_EXPRESSION", "mRNA Expression")}
-					{this.renderGroup("METHYLATION", "DNA Methylation")}
-					{this.renderGroup("METHYLATION_BINARY", "DNA Methylation")}
-					{this.renderGroup("PROTEIN_LEVEL", "Protein/phosphoprotein level")}
-					{!!(this.store.molecularProfiles.isComplete && !this.store.molecularProfiles.result.length) && (
-						<strong>No Genomic Profiles available for this Cancer Study</strong>
-					)}
-				</div>
-			</FlexRow>
-		);
-	}
+export default class MolecularProfileSelector extends QueryStoreComponent<
+    {},
+    {}
+> {
+    private get showGSVA() {
+        return AppConfig.serverConfig.skin_show_gsva;
+    }
 
-	ProfileToggle = ({profile, type, label, checked, isGroupToggle}: {
-		profile:MolecularProfile,
-		type:'radio' | 'checkbox',
-		label:string,
-		checked:boolean,
-		isGroupToggle:boolean
-	}) => (
-		<label
-			className={classNames({
-				[styles.altType]: isGroupToggle,
-				[styles.radio]: type === 'radio',
-				[styles.checkbox]: type === 'checkbox',
-			})}
-		>
-			<input
-				type={type}
-				checked={checked}
-				onChange={event => this.store.selectMolecularProfile(profile, (event.target as HTMLInputElement).checked)}
-				data-test={profile.molecularAlterationType}
-			/>
-			<span className={isGroupToggle ? styles.groupName : styles.profileName}>
-				{label}
-			</span>
-			{!isGroupToggle && (
-				<DefaultTooltip
-					mouseEnterDelay={0}
-					placement="right"
-					overlay={<div className={styles.tooltip}>{profile.description}</div>}
-				>
-					<FontAwesome className={styles.infoIcon} name='question-circle'/>
-				</DefaultTooltip>
-			)}
-		</label>
-	)
+    render() {
+        if (this.store.selectableSelectedStudyIds.length !== 1) return null;
 
-	renderGroup(molecularAlterationType:MolecularProfile['molecularAlterationType'], groupLabel:string)
-	{
-		let profiles = this.store.getFilteredProfiles(molecularAlterationType);
-		if (!profiles.length)
-			return null;
+        return (
+            <FlexRow padded className={styles.MolecularProfileSelector}>
+                <SectionHeader
+                    className="sectionLabel"
+                    promises={[this.store.molecularProfiles]}
+                >
+                    Select Genomic Profiles:
+                </SectionHeader>
+                <div
+                    className={styles.group}
+                    data-test="molecularProfileSelector"
+                >
+                    {this.renderGroup('MUTATION_EXTENDED', 'Mutation')}
+                    {this.renderGroup('COPY_NUMBER_ALTERATION', 'Copy Number')}
+                    {this.showGSVA &&
+                        this.renderGroup('GENESET_SCORE', 'GSVA scores')}
+                    {this.renderGroup('MRNA_EXPRESSION', 'mRNA Expression')}
+                    {this.renderGroup('METHYLATION', 'DNA Methylation')}
+                    {this.renderGroup('METHYLATION_BINARY', 'DNA Methylation')}
+                    {this.renderGroup(
+                        'PROTEIN_LEVEL',
+                        'Protein/phosphoprotein level'
+                    )}
+                    {!!(
+                        this.store.molecularProfiles.isComplete &&
+                        !this.store.molecularProfiles.result.length
+                    ) && (
+                        <strong>
+                            No Genomic Profiles available for this Cancer Study
+                        </strong>
+                    )}
+                </div>
+            </FlexRow>
+        );
+    }
 
-		let groupProfileIds = profiles.map(profile => profile.molecularProfileId);
-		let groupIsSelected = _.intersection(this.store.selectedProfileIds, groupProfileIds).length > 0;
-		let output:JSX.Element[] = [];
+    ProfileToggle = ({
+        profile,
+        type,
+        label,
+        checked,
+        isGroupToggle,
+    }: {
+        profile: MolecularProfile;
+        type: 'radio' | 'checkbox';
+        label: string;
+        checked: boolean;
+        isGroupToggle: boolean;
+    }) => (
+        <label
+            className={classNames({
+                [styles.altType]: isGroupToggle,
+                [styles.radio]: type === 'radio',
+                [styles.checkbox]: type === 'checkbox',
+            })}
+        >
+            <input
+                type={type}
+                checked={checked}
+                onChange={event =>
+                    this.store.selectMolecularProfile(
+                        profile,
+                        (event.target as HTMLInputElement).checked
+                    )
+                }
+                data-test={profile.molecularAlterationType}
+            />
+            <span
+                className={
+                    isGroupToggle ? styles.groupName : styles.profileName
+                }
+            >
+                {label}
+            </span>
+            {!isGroupToggle && (
+                <DefaultTooltip
+                    mouseEnterDelay={0}
+                    placement="right"
+                    overlay={
+                        <div className={styles.tooltip}>
+                            {profile.description}
+                        </div>
+                    }
+                >
+                    <FontAwesome
+                        className={styles.infoIcon}
+                        name="question-circle"
+                    />
+                </DefaultTooltip>
+            )}
+        </label>
+    );
 
-		if (profiles.length > 1 && !this.store.forDownloadTab)
-			output.push(
-				<this.ProfileToggle
-					key={'altTypeCheckbox:' + molecularAlterationType}
-					profile={profiles[0]}
-					type='checkbox'
-					label={`${groupLabel}. Select one of the profiles below:`}
-					checked={groupIsSelected}
-					isGroupToggle={true}
-				/>
-			);
+    renderGroup(
+        molecularAlterationType: MolecularProfile['molecularAlterationType'],
+        groupLabel: string
+    ) {
+        let profiles = this.store.getFilteredProfiles(molecularAlterationType);
+        if (!profiles.length) return null;
 
-		let profileToggles = profiles.map(profile => (
-			<this.ProfileToggle
-				key={'profile:' + profile.molecularProfileId}
-				profile={profile}
-				type={this.store.forDownloadTab || profiles.length > 1 ? 'radio' : 'checkbox'}
-				label={profile.name}
-				checked={_.includes(this.store.selectedProfileIds, profile.molecularProfileId)}
-				isGroupToggle={false}
-			/>
-		));
+        let groupProfileIds = profiles.map(
+            profile => profile.molecularProfileId
+        );
+        let groupIsSelected =
+            _.intersection(this.store.selectedProfileIds, groupProfileIds)
+                .length > 0;
+        let output: JSX.Element[] = [];
 
-		if (this.store.forDownloadTab || profiles.length == 1)
-			output.push(...profileToggles);
-		else
-			output.push(
-				<div key={'group:' + molecularAlterationType} className={styles.group}>
-					{profileToggles}
-				</div>
-			);
+        if (profiles.length > 1 && !this.store.forDownloadTab)
+            output.push(
+                <this.ProfileToggle
+                    key={'altTypeCheckbox:' + molecularAlterationType}
+                    profile={profiles[0]}
+                    type="checkbox"
+                    label={`${groupLabel}. Select one of the profiles below:`}
+                    checked={groupIsSelected}
+                    isGroupToggle={true}
+                />
+            );
 
-		if (this.store.forDownloadTab)
-			return output;
+        let profileToggles = profiles.map(profile => (
+            <this.ProfileToggle
+                key={'profile:' + profile.molecularProfileId}
+                profile={profile}
+                type={
+                    this.store.forDownloadTab || profiles.length > 1
+                        ? 'radio'
+                        : 'checkbox'
+                }
+                label={profile.name}
+                checked={_.includes(
+                    this.store.selectedProfileIds,
+                    profile.molecularProfileId
+                )}
+                isGroupToggle={false}
+            />
+        ));
 
-		if (groupIsSelected && molecularAlterationType == 'MRNA_EXPRESSION')
-		{
-			output.push(
-				<div key={output.length} className={styles.zScore}>
-					Enter a z-score threshold <span dangerouslySetInnerHTML={{ __html:['&','plusmn;'].join('') }} />
-					<input
-						type="text"
-						value={this.store.zScoreThreshold}
-						onChange={event => {
-							this.store.zScoreThreshold = (event.target as HTMLInputElement).value;
-						}}
-					/>
-				</div>
-			);
-		}
+        if (this.store.forDownloadTab || profiles.length == 1)
+            output.push(...profileToggles);
+        else
+            output.push(
+                <div
+                    key={'group:' + molecularAlterationType}
+                    className={styles.group}
+                >
+                    {profileToggles}
+                </div>
+            );
 
-		if (groupIsSelected && molecularAlterationType == 'PROTEIN_LEVEL')
-		{
-			output.push(
-				<div key={output.length} className={styles.zScore}>
-					Enter a z-score threshold <span dangerouslySetInnerHTML={{ __html:['&','plusmn;'].join('') }} />
-					<input
-						type="text"
-						value={this.store.rppaScoreThreshold}
-						onChange={event => {
-							this.store.rppaScoreThreshold = (event.target as HTMLInputElement).value;
-						}}
-					/>
-				</div>
-			);
-		}
+        if (this.store.forDownloadTab) return output;
 
-		return output;
-	}
+        if (groupIsSelected && molecularAlterationType == 'MRNA_EXPRESSION') {
+            output.push(
+                <div key={output.length} className={styles.zScore}>
+                    Enter a z-score threshold{' '}
+                    <span
+                        dangerouslySetInnerHTML={{
+                            __html: ['&', 'plusmn;'].join(''),
+                        }}
+                    />
+                    <input
+                        type="text"
+                        value={this.store.zScoreThreshold}
+                        onChange={event => {
+                            this.store.zScoreThreshold = (event.target as HTMLInputElement).value;
+                        }}
+                    />
+                </div>
+            );
+        }
+
+        if (groupIsSelected && molecularAlterationType == 'PROTEIN_LEVEL') {
+            output.push(
+                <div key={output.length} className={styles.zScore}>
+                    Enter a z-score threshold{' '}
+                    <span
+                        dangerouslySetInnerHTML={{
+                            __html: ['&', 'plusmn;'].join(''),
+                        }}
+                    />
+                    <input
+                        type="text"
+                        value={this.store.rppaScoreThreshold}
+                        onChange={event => {
+                            this.store.rppaScoreThreshold = (event.target as HTMLInputElement).value;
+                        }}
+                    />
+                </div>
+            );
+        }
+
+        return output;
+    }
 }
diff --git a/src/shared/components/query/MutSigGeneSelector.tsx b/src/shared/components/query/MutSigGeneSelector.tsx
index e56365a21f1..e07266f9be2 100644
--- a/src/shared/components/query/MutSigGeneSelector.tsx
+++ b/src/shared/components/query/MutSigGeneSelector.tsx
@@ -1,150 +1,177 @@
 import * as _ from 'lodash';
 import * as React from 'react';
-import LabeledCheckbox from "../labeledCheckbox/LabeledCheckbox";
+import LabeledCheckbox from '../labeledCheckbox/LabeledCheckbox';
 import * as styles_any from './styles/styles.module.scss';
-import {action, ObservableMap, expr, toJS, computed, observable} from "mobx";
-import {observer, Observer} from "mobx-react";
-import EnhancedReactTable from "../enhancedReactTable/EnhancedReactTable";
-import {MutSig} from "../../api/generated/CBioPortalAPIInternal";
-import {IColumnFormatterData} from "../enhancedReactTable/IColumnFormatter";
-import {IColumnDefMap} from "../enhancedReactTable/IEnhancedReactTableProps";
-import {Td} from 'reactable';
-import {toPrecision} from "../../lib/FormatUtils";
+import { action, ObservableMap, expr, toJS, computed, observable } from 'mobx';
+import { observer, Observer } from 'mobx-react';
+import EnhancedReactTable from '../enhancedReactTable/EnhancedReactTable';
+import { MutSig } from '../../api/generated/CBioPortalAPIInternal';
+import { IColumnFormatterData } from '../enhancedReactTable/IColumnFormatter';
+import { IColumnDefMap } from '../enhancedReactTable/IEnhancedReactTableProps';
+import { Td } from 'reactable';
+import { toPrecision } from '../../lib/FormatUtils';
 
 const styles = styles_any as {
-	MutSigGeneSelector: string,
-	selectButton: string,
-	selectionColumnHeader: string,
-	selectionColumnCell: string,
+    MutSigGeneSelector: string;
+    selectButton: string;
+    selectionColumnHeader: string;
+    selectionColumnCell: string;
 };
 
 class MutSigTable extends EnhancedReactTable<MutSig> {}
 
-export interface MutSigGeneSelectorProps
-{
-	initialSelection: string[];
-	data: MutSig[];
-	onSelect: (map_geneSymbol_selected:ObservableMap<boolean>) => void;
+export interface MutSigGeneSelectorProps {
+    initialSelection: string[];
+    data: MutSig[];
+    onSelect: (map_geneSymbol_selected: ObservableMap<boolean>) => void;
 }
 
 @observer
-export default class MutSigGeneSelector extends React.Component<MutSigGeneSelectorProps, {}>
-{
-	constructor(props:MutSigGeneSelectorProps)
-	{
-		super(props);
-		this.map_geneSymbol_selected.replace(props.initialSelection.map(geneSymbol => [geneSymbol, true]));
-	}
+export default class MutSigGeneSelector extends React.Component<
+    MutSigGeneSelectorProps,
+    {}
+> {
+    constructor(props: MutSigGeneSelectorProps) {
+        super(props);
+        this.map_geneSymbol_selected.replace(
+            props.initialSelection.map(geneSymbol => [geneSymbol, true])
+        );
+    }
 
-	private readonly map_geneSymbol_selected = observable.map<boolean>();
+    private readonly map_geneSymbol_selected = observable.map<boolean>();
 
-	@computed get allGenes()
-	{
-		return _.uniq(this.props.data.map(mutSig => mutSig.hugoGeneSymbol));
-	}
+    @computed get allGenes() {
+        return _.uniq(this.props.data.map(mutSig => mutSig.hugoGeneSymbol));
+    }
 
-	@computed get selectedGenes()
-	{
-		return this.allGenes.filter(symbol => this.map_geneSymbol_selected.get(symbol));
-	}
+    @computed get selectedGenes() {
+        return this.allGenes.filter(symbol =>
+            this.map_geneSymbol_selected.get(symbol)
+        );
+    }
 
-	@action selectAll(selected:boolean)
-	{
-		for (let gene of this.allGenes)
-			this.map_geneSymbol_selected.set(gene, selected);
-	}
+    @action selectAll(selected: boolean) {
+        for (let gene of this.allGenes)
+            this.map_geneSymbol_selected.set(gene, selected);
+    }
 
-	private columns:IColumnDefMap = {
-		'hugoGeneSymbol': {
-			priority: 1,
-			dataField: 'hugoGeneSymbol',
-			name: "Gene Symbol",
-			sortable: true,
-			filterable: true,
-		},
-		'numberOfMutations': {
-			priority: 2,
-			dataField: 'numberOfMutations',
-			name: "Num Mutations",
-			sortable: true,
-			filterable: true,
-		},
-		'qValue': {
-			priority: 3,
-			dataField: 'qValue',
-			name: "Q-Value",
-			sortable: true,
-			filterable: true,
-			formatter: ({name, columnData: value}: IColumnFormatterData<MutSig>) => (
-				<Td key={name} column={name} value={value}>
-					{toPrecision(value, 2, 0.1)}
-				</Td>
-			),
-		},
-		'selected': {
-			name: "Selected",
-			priority: 4,
-			sortable: false,
-			filterable: false,
-			header: (
-				<div className={styles.selectionColumnHeader}>
-					<span>All</span>
-					<Observer>
-						{() => (
-							<LabeledCheckbox
-								checked={this.selectedGenes.length > 0}
-								indeterminate={this.selectedGenes.length > 0 && this.selectedGenes.length < this.allGenes.length}
-								onChange={event => this.selectAll(event.target.checked)}
-							/>
-						)}
-					</Observer>
-				</div>
-			),
-			formatter: ({name, rowData: mutSig}:IColumnFormatterData<MutSig>) => (
-				<Td key={name} column={name}>
-					{!!(mutSig) && (
-						<div className={styles.selectionColumnCell}>
-							<Observer>
-								{() => (
-									<LabeledCheckbox
-										checked={!!this.map_geneSymbol_selected.get(mutSig.hugoGeneSymbol)}
-										onChange={event => this.map_geneSymbol_selected.set(mutSig.hugoGeneSymbol, event.target.checked)}
-									/>
-								)}
-							</Observer>
-						</div>
-					)}
-				</Td>
-			),
-		},
-	};
+    private columns: IColumnDefMap = {
+        hugoGeneSymbol: {
+            priority: 1,
+            dataField: 'hugoGeneSymbol',
+            name: 'Gene Symbol',
+            sortable: true,
+            filterable: true,
+        },
+        numberOfMutations: {
+            priority: 2,
+            dataField: 'numberOfMutations',
+            name: 'Num Mutations',
+            sortable: true,
+            filterable: true,
+        },
+        qValue: {
+            priority: 3,
+            dataField: 'qValue',
+            name: 'Q-Value',
+            sortable: true,
+            filterable: true,
+            formatter: ({
+                name,
+                columnData: value,
+            }: IColumnFormatterData<MutSig>) => (
+                <Td key={name} column={name} value={value}>
+                    {toPrecision(value, 2, 0.1)}
+                </Td>
+            ),
+        },
+        selected: {
+            name: 'Selected',
+            priority: 4,
+            sortable: false,
+            filterable: false,
+            header: (
+                <div className={styles.selectionColumnHeader}>
+                    <span>All</span>
+                    <Observer>
+                        {() => (
+                            <LabeledCheckbox
+                                checked={this.selectedGenes.length > 0}
+                                indeterminate={
+                                    this.selectedGenes.length > 0 &&
+                                    this.selectedGenes.length <
+                                        this.allGenes.length
+                                }
+                                onChange={event =>
+                                    this.selectAll(event.target.checked)
+                                }
+                            />
+                        )}
+                    </Observer>
+                </div>
+            ),
+            formatter: ({
+                name,
+                rowData: mutSig,
+            }: IColumnFormatterData<MutSig>) => (
+                <Td key={name} column={name}>
+                    {!!mutSig && (
+                        <div className={styles.selectionColumnCell}>
+                            <Observer>
+                                {() => (
+                                    <LabeledCheckbox
+                                        checked={
+                                            !!this.map_geneSymbol_selected.get(
+                                                mutSig.hugoGeneSymbol
+                                            )
+                                        }
+                                        onChange={event =>
+                                            this.map_geneSymbol_selected.set(
+                                                mutSig.hugoGeneSymbol,
+                                                event.target.checked
+                                            )
+                                        }
+                                    />
+                                )}
+                            </Observer>
+                        </div>
+                    )}
+                </Td>
+            ),
+        },
+    };
 
-	render()
-	{
-		return (
-			<div className={styles.MutSigGeneSelector}>
-				<MutSigTable
-					itemsName="genes"
-					initItemsPerPage={10}
-					columns={this.columns}
-					rawData={this.props.data}
-					headerControlsProps={{
-						showCopyAndDownload: false,
-						showHideShowColumnButton: false,
-						showPagination: true,
-					}}
-					reactTableProps={{
-						className: "table table-striped table-border-top",
-						hideFilterInput:true,
-						defaultSort: this.columns.qValue.name,
-					}}
-				/>
+    render() {
+        return (
+            <div className={styles.MutSigGeneSelector}>
+                <MutSigTable
+                    itemsName="genes"
+                    initItemsPerPage={10}
+                    columns={this.columns}
+                    rawData={this.props.data}
+                    headerControlsProps={{
+                        showCopyAndDownload: false,
+                        showHideShowColumnButton: false,
+                        showPagination: true,
+                    }}
+                    reactTableProps={{
+                        className: 'table table-striped table-border-top',
+                        hideFilterInput: true,
+                        defaultSort: this.columns.qValue.name,
+                    }}
+                />
                 <div>
-				<button style={{marginTop:20}} className="btn btn-primary btn-sm pull-right" onClick={() => this.props.onSelect(this.map_geneSymbol_selected)}>
-					Select
-				</button>
+                    <button
+                        style={{ marginTop: 20 }}
+                        className="btn btn-primary btn-sm pull-right"
+                        onClick={() =>
+                            this.props.onSelect(this.map_geneSymbol_selected)
+                        }
+                    >
+                        Select
+                    </button>
                 </div>
-			</div>
-		);
-	}
+            </div>
+        );
+    }
 }
diff --git a/src/shared/components/query/QueryAndDownloadTab.spec.tsx b/src/shared/components/query/QueryAndDownloadTab.spec.tsx
index 2899b78c7bc..d2eae354283 100644
--- a/src/shared/components/query/QueryAndDownloadTab.spec.tsx
+++ b/src/shared/components/query/QueryAndDownloadTab.spec.tsx
@@ -4,15 +4,19 @@ import { assert } from 'chai';
 import { shallow, mount } from 'enzyme';
 import sinon from 'sinon';
 import { Tab } from 'react-bootstrap';
-import {QueryStore} from "./QueryStore";
+import { QueryStore } from './QueryStore';
 
 describe('QueryAndDownloadTabs', () => {
-
-    it.skip('only show query tab if prop showQuickSearchTab and showDownloadTab are false', ()=>{
-        const comp = shallow(<QueryAndDownloadTabs getQueryStore={()=>({} as QueryStore)} showQuickSearchTab={true} showDownloadTab={true}/>);
+    it.skip('only show query tab if prop showQuickSearchTab and showDownloadTab are false', () => {
+        const comp = shallow(
+            <QueryAndDownloadTabs
+                getQueryStore={() => ({} as QueryStore)}
+                showQuickSearchTab={true}
+                showDownloadTab={true}
+            />
+        );
         assert.equal(comp.find(Tab).length, 3);
-        comp.setProps({ showQuickSearchTab: false, showDownloadTab:false });
+        comp.setProps({ showQuickSearchTab: false, showDownloadTab: false });
         assert.equal(comp.find(Tab).length, 1);
     });
-
-});
\ No newline at end of file
+});
diff --git a/src/shared/components/query/QueryAndDownloadTabs.tsx b/src/shared/components/query/QueryAndDownloadTabs.tsx
index 07f8a481114..8e5ebdebc56 100644
--- a/src/shared/components/query/QueryAndDownloadTabs.tsx
+++ b/src/shared/components/query/QueryAndDownloadTabs.tsx
@@ -1,20 +1,20 @@
 import * as React from 'react';
 import * as styles_any from './styles/styles.module.scss';
-import {observer} from 'mobx-react';
-import QueryContainer from "./QueryContainer";
-import {QueryStore} from "./QueryStore";
-import {observable, action} from "mobx";
-import {MSKTab, MSKTabs} from "../MSKTabs/MSKTabs";
-import QuickSearch from "./quickSearch/QuickSearch";
-import {getBrowserWindow} from "cbioportal-frontend-commons";
-import autobind from "autobind-decorator";
-import {trackEvent} from 'shared/lib/tracking';
-import {If} from "react-if";
-import AppConfig from "appConfig";
+import { observer } from 'mobx-react';
+import QueryContainer from './QueryContainer';
+import { QueryStore } from './QueryStore';
+import { observable, action } from 'mobx';
+import { MSKTab, MSKTabs } from '../MSKTabs/MSKTabs';
+import QuickSearch from './quickSearch/QuickSearch';
+import { getBrowserWindow } from 'cbioportal-frontend-commons';
+import autobind from 'autobind-decorator';
+import { trackEvent } from 'shared/lib/tracking';
+import { If } from 'react-if';
+import AppConfig from 'appConfig';
 import { ModifyQueryParams } from 'pages/resultsView/ResultsViewPageStore';
 
 const styles = styles_any as {
-    QueryAndDownloadTabs: string,
+    QueryAndDownloadTabs: string;
 };
 
 const DOWNLOAD = 'download';
@@ -32,15 +32,22 @@ interface IQueryAndDownloadTabsProps {
     modifyQueryParams?: ModifyQueryParams | undefined;
 }
 
-
 @observer
-export default class QueryAndDownloadTabs extends React.Component<IQueryAndDownloadTabsProps, {}> {
-
+export default class QueryAndDownloadTabs extends React.Component<
+    IQueryAndDownloadTabsProps,
+    {}
+> {
     constructor(props: IQueryAndDownloadTabsProps) {
         super(props);
 
-        if (props.showQuickSearchTab && getBrowserWindow().localStorage.getItem(QUICK_SEARCH_LS_KEY) === QUICK_SEARCH_TAB_ID) {
-            this.activeTabId = getBrowserWindow().localStorage.getItem(QUICK_SEARCH_LS_KEY);
+        if (
+            props.showQuickSearchTab &&
+            getBrowserWindow().localStorage.getItem(QUICK_SEARCH_LS_KEY) ===
+                QUICK_SEARCH_TAB_ID
+        ) {
+            this.activeTabId = getBrowserWindow().localStorage.getItem(
+                QUICK_SEARCH_LS_KEY
+            );
         }
 
         // the query store models a single use of the query component and therefor a new one should
@@ -51,7 +58,7 @@ export default class QueryAndDownloadTabs extends React.Component<IQueryAndDownl
     }
 
     static defaultProps = {
-        forkedMode: true
+        forkedMode: true,
     };
 
     @observable.ref store: QueryStore;
@@ -59,7 +66,10 @@ export default class QueryAndDownloadTabs extends React.Component<IQueryAndDownl
     @observable activeTabId: string;
 
     public get quickSearchDefaulted() {
-        return getBrowserWindow().localStorage.getItem(QUICK_SEARCH_LS_KEY) === QUICK_SEARCH_TAB_ID;
+        return (
+            getBrowserWindow().localStorage.getItem(QUICK_SEARCH_LS_KEY) ===
+            QUICK_SEARCH_TAB_ID
+        );
     }
 
     @autobind
@@ -67,13 +77,13 @@ export default class QueryAndDownloadTabs extends React.Component<IQueryAndDownl
         // right now we only care if quick search or NOT
         if (this.props.showQuickSearchTab) {
             getBrowserWindow().localStorage.defaultHomePageTab =
-                (tabId === QUICK_SEARCH_TAB_ID) ? QUICK_SEARCH_TAB_ID : undefined;
+                tabId === QUICK_SEARCH_TAB_ID ? QUICK_SEARCH_TAB_ID : undefined;
         }
     }
 
     trackQuickSearch() {
         // track how many users are using this feature
-        trackEvent({category: "quickSearch", action: "quickSearchLoad"});
+        trackEvent({ category: 'quickSearch', action: 'quickSearchLoad' });
     }
 
     @autobind
@@ -88,30 +98,64 @@ export default class QueryAndDownloadTabs extends React.Component<IQueryAndDownl
         return (
             <div className={styles.QueryAndDownloadTabs}>
                 <If condition={AppConfig.serverConfig.skin_citation_rule_text}>
-                    <div className="citationRule"
-                         dangerouslySetInnerHTML={{__html: AppConfig.serverConfig.skin_citation_rule_text!}}></div>
+                    <div
+                        className="citationRule"
+                        dangerouslySetInnerHTML={{
+                            __html: AppConfig.serverConfig
+                                .skin_citation_rule_text!,
+                        }}
+                    ></div>
                 </If>
 
-
-                <MSKTabs activeTabId={this.activeTabId} onTabClick={this.onSelectTab} className={"mainTabs"}>
-                    <MSKTab id={"advanced"} linkText={"Query"} onTabDidMount={() => this.setDefaultTab(undefined)}>
-                        <QueryContainer forkedMode={this.props.forkedMode} onSubmit={this.props.onSubmit}
-                                        store={this.store} modifyQueryParams={this.props.modifyQueryParams} showAlerts={this.props.showAlerts}/>
+                <MSKTabs
+                    activeTabId={this.activeTabId}
+                    onTabClick={this.onSelectTab}
+                    className={'mainTabs'}
+                >
+                    <MSKTab
+                        id={'advanced'}
+                        linkText={'Query'}
+                        onTabDidMount={() => this.setDefaultTab(undefined)}
+                    >
+                        <QueryContainer
+                            forkedMode={this.props.forkedMode}
+                            onSubmit={this.props.onSubmit}
+                            store={this.store}
+                            modifyQueryParams={this.props.modifyQueryParams}
+                            showAlerts={this.props.showAlerts}
+                        />
                     </MSKTab>
-                    <MSKTab id={QUICK_SEARCH_TAB_ID}
-                            linkText={<span>Quick Search <strong className={"beta-text"}>Beta!</strong></span>}
-                            hide={!this.props.showQuickSearchTab} onTabDidMount={() => {
-                        this.setDefaultTab(QUICK_SEARCH_TAB_ID);
-                        this.trackQuickSearch();
-                    }}>
+                    <MSKTab
+                        id={QUICK_SEARCH_TAB_ID}
+                        linkText={
+                            <span>
+                                Quick Search{' '}
+                                <strong className={'beta-text'}>Beta!</strong>
+                            </span>
+                        }
+                        hide={!this.props.showQuickSearchTab}
+                        onTabDidMount={() => {
+                            this.setDefaultTab(QUICK_SEARCH_TAB_ID);
+                            this.trackQuickSearch();
+                        }}
+                    >
                         <div>
-                            <QuickSearch/>
+                            <QuickSearch />
                         </div>
                     </MSKTab>
-                    <MSKTab id={DOWNLOAD} linkText={"Download"} hide={!this.props.showDownloadTab}
-                            onTabDidMount={() => this.setDefaultTab(undefined)}>
+                    <MSKTab
+                        id={DOWNLOAD}
+                        linkText={'Download'}
+                        hide={!this.props.showDownloadTab}
+                        onTabDidMount={() => this.setDefaultTab(undefined)}
+                    >
                         {/*forked experience is always false for download tab*/}
-                        <QueryContainer forkedMode={false} onSubmit={this.props.onSubmit} store={this.store} showAlerts={this.props.showAlerts}/>
+                        <QueryContainer
+                            forkedMode={false}
+                            onSubmit={this.props.onSubmit}
+                            store={this.store}
+                            showAlerts={this.props.showAlerts}
+                        />
                     </MSKTab>
                 </MSKTabs>
             </div>
diff --git a/src/shared/components/query/QueryContainer.tsx b/src/shared/components/query/QueryContainer.tsx
index 746b8cc4664..1b94d62d0f5 100644
--- a/src/shared/components/query/QueryContainer.tsx
+++ b/src/shared/components/query/QueryContainer.tsx
@@ -1,74 +1,78 @@
-import * as React from "react";
-import CancerStudySelector from "./CancerStudySelector";
-import {FlexCol, FlexRow} from "../flexbox/FlexBox";
-import * as styles_any from "./styles/styles.module.scss";
-import MolecularProfileSelector from "./MolecularProfileSelector";
-import {observer} from "mobx-react";
-import DataTypePrioritySelector from "./DataTypePrioritySelector";
-import GenesetsSelector from "./GenesetsSelector";
-import GeneSetSelector from "./GeneSetSelector";
-import LabeledCheckbox from "../labeledCheckbox/LabeledCheckbox";
-import {QueryStore} from "./QueryStore";
-import {providesStoreContext} from "../../lib/ContextUtils";
-import CaseSetSelector from "./CaseSetSelector";
-import UnknownStudiesWarning from "../unknownStudies/UnknownStudiesWarning";
+import * as React from 'react';
+import CancerStudySelector from './CancerStudySelector';
+import { FlexCol, FlexRow } from '../flexbox/FlexBox';
+import * as styles_any from './styles/styles.module.scss';
+import MolecularProfileSelector from './MolecularProfileSelector';
+import { observer } from 'mobx-react';
+import DataTypePrioritySelector from './DataTypePrioritySelector';
+import GenesetsSelector from './GenesetsSelector';
+import GeneSetSelector from './GeneSetSelector';
+import LabeledCheckbox from '../labeledCheckbox/LabeledCheckbox';
+import { QueryStore } from './QueryStore';
+import { providesStoreContext } from '../../lib/ContextUtils';
+import CaseSetSelector from './CaseSetSelector';
+import UnknownStudiesWarning from '../unknownStudies/UnknownStudiesWarning';
 import classNames from 'classnames';
-import LoadingIndicator from "../loadingIndicator/LoadingIndicator";
-import {computed, observable} from "mobx";
-import {Else, If, Then} from "react-if";
-import autobind from "autobind-decorator";
-import SectionHeader from "shared/components/sectionHeader/SectionHeader";
-import {Fade} from 'react-reveal';
-import {DefaultTooltip} from "cbioportal-frontend-commons";
-import {StudySelectorStats} from "shared/components/query/StudySelectorStats";
-import $ from "jquery";
-import {serializeEvent} from "shared/lib/tracking";
-import { ModifyQueryParams } from "pages/resultsView/ResultsViewPageStore";
+import LoadingIndicator from '../loadingIndicator/LoadingIndicator';
+import { computed, observable } from 'mobx';
+import { Else, If, Then } from 'react-if';
+import autobind from 'autobind-decorator';
+import SectionHeader from 'shared/components/sectionHeader/SectionHeader';
+import { Fade } from 'react-reveal';
+import { DefaultTooltip } from 'cbioportal-frontend-commons';
+import { StudySelectorStats } from 'shared/components/query/StudySelectorStats';
+import $ from 'jquery';
+import { serializeEvent } from 'shared/lib/tracking';
+import { ModifyQueryParams } from 'pages/resultsView/ResultsViewPageStore';
 
 const styles = styles_any as {
-    QueryContainer: string,
-    StudySelection:string,
-    queryContainerContent: string,
-    errorMessage: string,
-    oqlMessage: string,
-    downloadSubmitExplanation: string,
-    transposeDataMatrix: string,
-    submitRow: string,
-    submit: string,
-    genomeSpace: string,
-    forkedButtons: string,
+    QueryContainer: string;
+    StudySelection: string;
+    queryContainerContent: string;
+    errorMessage: string;
+    oqlMessage: string;
+    downloadSubmitExplanation: string;
+    transposeDataMatrix: string;
+    submitRow: string;
+    submit: string;
+    genomeSpace: string;
+    forkedButtons: string;
     studyName: string;
 };
 
 interface QueryContainerProps {
     store: QueryStore;
     onSubmit?: () => void;
-    forkedMode?:boolean;
+    forkedMode?: boolean;
     modifyQueryParams?: ModifyQueryParams | undefined;
     showAlerts?: boolean;
 }
 
 @providesStoreContext(QueryStore)
 @observer
-export default class QueryContainer extends React.Component<QueryContainerProps, {}> {
-
+export default class QueryContainer extends React.Component<
+    QueryContainerProps,
+    {}
+> {
     get store() {
         return this.props.store;
     }
 
     // indicates we have loaded the study data necessary to show default selected studies (e.g. modify query scenario), studiesHaveChangedSinceInitialization indicates all data is ready and we don't need to consider other conditions anymore.
     @computed get studiesDataReady(): boolean {
-        return this.store.studiesHaveChangedSinceInitialization ||
-            this.store.selectableStudiesSet.isComplete &&
-            this.store.initiallySelected.profileIds &&
-            this.store.cancerTypes.isComplete &&
-            this.store.cancerStudies.isComplete &&
-            this.store.profiledSamplesCount.isComplete;
+        return (
+            this.store.studiesHaveChangedSinceInitialization ||
+            (this.store.selectableStudiesSet.isComplete &&
+                this.store.initiallySelected.profileIds &&
+                this.store.cancerTypes.isComplete &&
+                this.store.cancerStudies.isComplete &&
+                this.store.profiledSamplesCount.isComplete)
+        );
     }
 
     @observable _showQueryControls = false;
 
-    @computed get showQueryControls(){
+    @computed get showQueryControls() {
         return this.props.forkedMode === false || this._showQueryControls;
     }
 
@@ -77,43 +81,76 @@ export default class QueryContainer extends React.Component<QueryContainerProps,
         this.handleSubmit = this.handleSubmit.bind(this);
     }
 
-    @computed get selectedStudySummary(){
-
+    @computed get selectedStudySummary() {
         const LIMIT = 4;
         let overflow: JSX.Element | null = null;
 
         if (this.store.selectableSelectedStudies.length > LIMIT) {
-            const overlay = ()=>this.store.selectableSelectedStudies.slice(LIMIT).map((study)=><div>{study.name}</div>);
-            overflow = <span className={'inlineBlock'}><DefaultTooltip overlay={overlay}><a>and {this.store.selectableSelectedStudies.length - LIMIT} more</a></DefaultTooltip></span>;
+            const overlay = () =>
+                this.store.selectableSelectedStudies
+                    .slice(LIMIT)
+                    .map(study => <div>{study.name}</div>);
+            overflow = (
+                <span className={'inlineBlock'}>
+                    <DefaultTooltip overlay={overlay}>
+                        <a>
+                            and{' '}
+                            {this.store.selectableSelectedStudies.length -
+                                LIMIT}{' '}
+                            more
+                        </a>
+                    </DefaultTooltip>
+                </span>
+            );
         }
 
-        return <span className={'inlineBlock'}>
-            { this.store.selectableSelectedStudies.slice(0,LIMIT).reduce(
-                (acc:(string|JSX.Element)[], study, i, arr)=>{
-                    acc.push(<span className={styles.studyName}>{study.name}</span>);
-                    return acc;
-                }
-                ,[])
-            }
-            {overflow}
-            { overflow && (<span>&nbsp;</span>)}
-            (<b>{this.store.profiledSamplesCount.result.all}</b> {this.store.profiledSamplesCount.result.all === 1 ? 'sample' : 'total samples'})
-
-        </span>;
-
+        return (
+            <span className={'inlineBlock'}>
+                {this.store.selectableSelectedStudies
+                    .slice(0, LIMIT)
+                    .reduce((acc: (string | JSX.Element)[], study, i, arr) => {
+                        acc.push(
+                            <span className={styles.studyName}>
+                                {study.name}
+                            </span>
+                        );
+                        return acc;
+                    }, [])}
+                {overflow}
+                {overflow && <span>&nbsp;</span>}(
+                <b>{this.store.profiledSamplesCount.result.all}</b>{' '}
+                {this.store.profiledSamplesCount.result.all === 1
+                    ? 'sample'
+                    : 'total samples'}
+                )
+            </span>
+        );
     }
 
-    @computed get getWrappedCancerStudySelector(){
-        const control =  <CancerStudySelector queryStore={this.store} forkedMode={this.props.forkedMode!}  />;
+    @computed get getWrappedCancerStudySelector() {
+        const control = (
+            <CancerStudySelector
+                queryStore={this.store}
+                forkedMode={this.props.forkedMode!}
+            />
+        );
         //NOTE: we have to wrap with div in order to deal with margin applied by css selector
         //react-reveal does not allow us to add inline-css to it's wrapper
-        return this.props.forkedMode ? <div style={{ marginTop:0 }}><Fade duration={500}
-                                                   collapse={false}
-                                                   className={"monkeys"}
-                                                   unmountOnExit={true}
-                                                   when={!this.showQueryControls}>
+        return this.props.forkedMode ? (
+            <div style={{ marginTop: 0 }}>
+                <Fade
+                    duration={500}
+                    collapse={false}
+                    className={'monkeys'}
+                    unmountOnExit={true}
+                    when={!this.showQueryControls}
+                >
                     {control}
-        </Fade></div> : control;
+                </Fade>
+            </div>
+        ) : (
+            control
+        );
     }
 
     handleSubmit() {
@@ -130,123 +167,207 @@ export default class QueryContainer extends React.Component<QueryContainerProps,
         this._showQueryControls = !this._showQueryControls;
     }
 
-    @computed get studyLimitedReached(){
+    @computed get studyLimitedReached() {
         return this.store.selectableSelectedStudyIds.length > 50;
     }
 
-    @computed get exploreCohortsButtonDisabled(){
+    @computed get exploreCohortsButtonDisabled() {
         return this.studyLimitedReached || !this.store.hasSelectedStudies;
     }
 
-    @computed get exploreCohortsButtonTooltipMessage(){
+    @computed get exploreCohortsButtonTooltipMessage() {
         if (this.store.selectableSelectedStudyIds.length === 0) {
-            return "Please select at least one study above";
+            return 'Please select at least one study above';
         } else if (this.studyLimitedReached) {
-            return "Too many studies selected for study summary (limit: 50)";
+            return 'Too many studies selected for study summary (limit: 50)';
         } else {
-           return "Open summary of selected studies";
+            return 'Open summary of selected studies';
         }
     }
 
-    @computed get queryByGeneTooltipMessage(){
+    @computed get queryByGeneTooltipMessage() {
         if (this.store.selectableSelectedStudies.length === 0) {
-            return "Please select at least one study above";
+            return 'Please select at least one study above';
         } else {
-            return "Continue to query configuration";
+            return 'Continue to query configuration';
         }
     }
 
     render(): JSX.Element {
-
         return (
-            <FlexCol padded overflow className={
-                classNames('small', styles.QueryContainer, { forkedMode:this.props.forkedMode })
-            }>
-                {
-                    (this.props.showAlerts && this.store.genes.isComplete && this.store.genes.result.suggestions.length > 0) && (
-                        <div className="alert alert-danger" data-test='invalidQueryAlert' style={{marginBottom: 0}}><i className={"fa fa-exclamation-triangle"}/> Your query has
-                            invalid or out-dated gene symbols. Please correct below.</div>
-                    )
-                }
-
-                {
-                    this.store.unknownStudyIds.isComplete &&
-                    <UnknownStudiesWarning ids={this.store.unknownStudyIds.result}/>
-                }
-
-                {
-                    this.store.forDownloadTab && 
-                    <div className={"alert alert-danger"} role="alert">The Download interface has been removed. Enhanced download functionality is now available through the Query interface. Run a query with your gene(s) of interest and use the Download tab to download all available data types.</div>
-                }
-
-                {   !this.store.forDownloadTab &&
-                    <If condition={this.store.defaultSelectedIds.size === 0 || this.studiesDataReady}>
+            <FlexCol
+                padded
+                overflow
+                className={classNames('small', styles.QueryContainer, {
+                    forkedMode: this.props.forkedMode,
+                })}
+            >
+                {this.props.showAlerts &&
+                    this.store.genes.isComplete &&
+                    this.store.genes.result.suggestions.length > 0 && (
+                        <div
+                            className="alert alert-danger"
+                            data-test="invalidQueryAlert"
+                            style={{ marginBottom: 0 }}
+                        >
+                            <i className={'fa fa-exclamation-triangle'} /> Your
+                            query has invalid or out-dated gene symbols. Please
+                            correct below.
+                        </div>
+                    )}
+
+                {this.store.unknownStudyIds.isComplete && (
+                    <UnknownStudiesWarning
+                        ids={this.store.unknownStudyIds.result}
+                    />
+                )}
+
+                {this.store.forDownloadTab && (
+                    <div className={'alert alert-danger'} role="alert">
+                        The Download interface has been removed. Enhanced
+                        download functionality is now available through the
+                        Query interface. Run a query with your gene(s) of
+                        interest and use the Download tab to download all
+                        available data types.
+                    </div>
+                )}
+
+                {!this.store.forDownloadTab && (
+                    <If
+                        condition={
+                            this.store.defaultSelectedIds.size === 0 ||
+                            this.studiesDataReady
+                        }
+                    >
                         <Then>
-                            <If condition={this.props.forkedMode && this.showQueryControls}>
-                                    <FlexRow className={styles.StudySelection}>
-                                        <SectionHeader className={'sectionLabel'}>
-                                            Selected Studies: <button data-test="modifyStudySelectionButton" className={'btn btn-default btn-xs'} onClick={this.toggleQueryControls}>Modify</button>
-                                        </SectionHeader>
-                                        <div style={{marginLeft:8}}>
-                                            {this.selectedStudySummary}
-                                        </div>
-                                    </FlexRow>
+                            <If
+                                condition={
+                                    this.props.forkedMode &&
+                                    this.showQueryControls
+                                }
+                            >
+                                <FlexRow className={styles.StudySelection}>
+                                    <SectionHeader className={'sectionLabel'}>
+                                        Selected Studies:{' '}
+                                        <button
+                                            data-test="modifyStudySelectionButton"
+                                            className={'btn btn-default btn-xs'}
+                                            onClick={this.toggleQueryControls}
+                                        >
+                                            Modify
+                                        </button>
+                                    </SectionHeader>
+                                    <div style={{ marginLeft: 8 }}>
+                                        {this.selectedStudySummary}
+                                    </div>
+                                </FlexRow>
                             </If>
 
-                            { this.getWrappedCancerStudySelector }
+                            {this.getWrappedCancerStudySelector}
 
                             <If condition={this.showQueryControls}>
                                 <>
-                                    {this.store.physicalStudyIdsInSelection.length > 1 ?
-                                        (<DataTypePrioritySelector/>) :
-                                        (<MolecularProfileSelector/>)
-                                    }
+                                    {this.store.physicalStudyIdsInSelection
+                                        .length > 1 ? (
+                                        <DataTypePrioritySelector />
+                                    ) : (
+                                        <MolecularProfileSelector />
+                                    )}
 
-                                    {(this.store.selectableSelectedStudyIds.length > 0) && (
-                                        <CaseSetSelector modifyQueryParams={this.props.modifyQueryParams}/>
+                                    {this.store.selectableSelectedStudyIds
+                                        .length > 0 && (
+                                        <CaseSetSelector
+                                            modifyQueryParams={
+                                                this.props.modifyQueryParams
+                                            }
+                                        />
                                     )}
 
-                                    <GeneSetSelector/>
+                                    <GeneSetSelector />
 
-                                    {!!(this.store.isGenesetProfileSelected) && (
-                                        <GenesetsSelector/>
+                                    {!!this.store.isGenesetProfileSelected && (
+                                        <GenesetsSelector />
                                     )}
 
-                                    {!!(this.store.forDownloadTab) && (
-                                        <span className={styles.downloadSubmitExplanation}>
-									        Clicking submit will generate a tab-delimited file containing your requested data.
-								        </span>
+                                    {!!this.store.forDownloadTab && (
+                                        <span
+                                            className={
+                                                styles.downloadSubmitExplanation
+                                            }
+                                        >
+                                            Clicking submit will generate a
+                                            tab-delimited file containing your
+                                            requested data.
+                                        </span>
                                     )}
 
-                                    {!!(this.store.forDownloadTab) && (
+                                    {!!this.store.forDownloadTab && (
                                         <LabeledCheckbox
-                                            labelProps={{className: styles.transposeDataMatrix}}
-                                            checked={this.store.transposeDataMatrix}
-                                            onChange={event => this.store.transposeDataMatrix = event.currentTarget.checked}
+                                            labelProps={{
+                                                className:
+                                                    styles.transposeDataMatrix,
+                                            }}
+                                            checked={
+                                                this.store.transposeDataMatrix
+                                            }
+                                            onChange={event =>
+                                                (this.store.transposeDataMatrix =
+                                                    event.currentTarget.checked)
+                                            }
                                         >
                                             Transpose data matrix
                                         </LabeledCheckbox>
                                     )}
-                                    <FlexRow overflow={true} padded
-                                             className={classNames(styles.submitRow, 'posRelative')}>
-                                        <button style={{paddingLeft: 50, paddingRight: 50, marginRight: 50}}
-                                                disabled={!this.store.submitEnabled} className="btn btn-primary btn-lg"
-                                                onClick={() => this.handleSubmit()} data-test='queryButton'>
-                                            {!this.store.forDownloadTab ? "Submit Query" : "Download"}
+                                    <FlexRow
+                                        overflow={true}
+                                        padded
+                                        className={classNames(
+                                            styles.submitRow,
+                                            'posRelative'
+                                        )}
+                                    >
+                                        <button
+                                            style={{
+                                                paddingLeft: 50,
+                                                paddingRight: 50,
+                                                marginRight: 50,
+                                            }}
+                                            disabled={!this.store.submitEnabled}
+                                            className="btn btn-primary btn-lg"
+                                            onClick={() => this.handleSubmit()}
+                                            data-test="queryButton"
+                                        >
+                                            {!this.store.forDownloadTab
+                                                ? 'Submit Query'
+                                                : 'Download'}
                                         </button>
                                         <FlexCol>
-                                            {!!(this.store.submitError) && (
-                                                <span className={styles.errorMessage} data-test="oqlErrorMessage">
-										            {this.store.submitError}
-									            </span>
+                                            {!!this.store.submitError && (
+                                                <span
+                                                    className={
+                                                        styles.errorMessage
+                                                    }
+                                                    data-test="oqlErrorMessage"
+                                                >
+                                                    {this.store.submitError}
+                                                </span>
                                             )}
 
                                             {this.store.oqlMessages.map(msg => {
                                                 return (
-                                                    <span className={styles.oqlMessage}>
-												        <i className='fa fa-info-circle' style={{marginRight: 5}}/>
+                                                    <span
+                                                        className={
+                                                            styles.oqlMessage
+                                                        }
+                                                    >
+                                                        <i
+                                                            className="fa fa-info-circle"
+                                                            style={{
+                                                                marginRight: 5,
+                                                            }}
+                                                        />
                                                         {msg}
-											        </span>
+                                                    </span>
                                                 );
                                             })}
                                         </FlexCol>
@@ -255,48 +376,107 @@ export default class QueryContainer extends React.Component<QueryContainerProps,
                             </If>
                             <If condition={!this.showQueryControls}>
                                 <FlexRow className={styles.forkedButtons}>
-                                    <div style={{width:330,textAlign:'right', marginRight:20}}>
-                                        <StudySelectorStats store={this.store}/>
+                                    <div
+                                        style={{
+                                            width: 330,
+                                            textAlign: 'right',
+                                            marginRight: 20,
+                                        }}
+                                    >
+                                        <StudySelectorStats
+                                            store={this.store}
+                                        />
                                     </div>
-
-                                    <DefaultTooltip placement={"top"}
-                                                    trigger={["hover"]}
-                                                    destroyTooltipOnHide={true}
-                                                    mouseEnterDelay={0}
-                                                    mouseLeaveDelay={0}
-                                                    disabled={this.store.selectableSelectedStudies.length > 0}
-                                                    overlay={this.queryByGeneTooltipMessage}>
-                                        <a data-test="queryByGeneButton"
-                                           onClick={()=>this.store.hasSelectedStudies && this.toggleQueryControls()}
-                                           data-event={serializeEvent({action:'clickQueryByGeneButton',label:'', category:'homePage' })}
-                                                className={classNames('btn btn-primary btn-lg', { disabled: !this.store.hasSelectedStudies } )}>
+                                    <DefaultTooltip
+                                        placement={'top'}
+                                        trigger={['hover']}
+                                        destroyTooltipOnHide={true}
+                                        mouseEnterDelay={0}
+                                        mouseLeaveDelay={0}
+                                        disabled={
+                                            this.store.selectableSelectedStudies
+                                                .length > 0
+                                        }
+                                        overlay={this.queryByGeneTooltipMessage}
+                                    >
+                                        <a
+                                            data-test="queryByGeneButton"
+                                            onClick={() =>
+                                                this.store.hasSelectedStudies &&
+                                                this.toggleQueryControls()
+                                            }
+                                            data-event={serializeEvent({
+                                                action:
+                                                    'clickQueryByGeneButton',
+                                                label: '',
+                                                category: 'homePage',
+                                            })}
+                                            className={classNames(
+                                                'btn btn-primary btn-lg',
+                                                {
+                                                    disabled: !this.store
+                                                        .hasSelectedStudies,
+                                                }
+                                            )}
+                                        >
                                             Query By Gene
                                         </a>
                                     </DefaultTooltip>
                                     OR
-                                    <DefaultTooltip placement={"top"}
-                                                    trigger={["hover"]}
-                                                    destroyTooltipOnHide={true}
-                                                    mouseEnterDelay={0}
-                                                    mouseLeaveDelay={0}
-                                                    disabled={!this.exploreCohortsButtonDisabled}
-                                                    overlay={this.exploreCohortsButtonTooltipMessage}>
-                                            <a onClick={()=>!this.exploreCohortsButtonDisabled && this.store.openSummary()}
-                                                data-event={serializeEvent({action:'clickExploreStudiesButton',label:'', category:'homePage' })}
-                                                className={classNames('btn btn-primary btn-lg', { disabled: this.exploreCohortsButtonDisabled } )}>
-                                                    <i style={{marginTop:5}} className='ci ci-pie-chart'></i> Explore Selected Studies
-                                            </a>
+                                    <DefaultTooltip
+                                        placement={'top'}
+                                        trigger={['hover']}
+                                        destroyTooltipOnHide={true}
+                                        mouseEnterDelay={0}
+                                        mouseLeaveDelay={0}
+                                        disabled={
+                                            !this.exploreCohortsButtonDisabled
+                                        }
+                                        overlay={
+                                            this
+                                                .exploreCohortsButtonTooltipMessage
+                                        }
+                                    >
+                                        <a
+                                            onClick={() =>
+                                                !this
+                                                    .exploreCohortsButtonDisabled &&
+                                                this.store.openSummary()
+                                            }
+                                            data-event={serializeEvent({
+                                                action:
+                                                    'clickExploreStudiesButton',
+                                                label: '',
+                                                category: 'homePage',
+                                            })}
+                                            className={classNames(
+                                                'btn btn-primary btn-lg',
+                                                {
+                                                    disabled: this
+                                                        .exploreCohortsButtonDisabled,
+                                                }
+                                            )}
+                                        >
+                                            <i
+                                                style={{ marginTop: 5 }}
+                                                className="ci ci-pie-chart"
+                                            ></i>{' '}
+                                            Explore Selected Studies
+                                        </a>
                                     </DefaultTooltip>
                                 </FlexRow>
                             </If>
                         </Then>
                         <Else>
-                            <LoadingIndicator isLoading={true} center={true} size={"big"}/>
+                            <LoadingIndicator
+                                isLoading={true}
+                                center={true}
+                                size={'big'}
+                            />
                         </Else>
                     </If>
-                }
+                )}
             </FlexCol>
         );
     }
 }
-
diff --git a/src/shared/components/query/QueryStore.spec.ts b/src/shared/components/query/QueryStore.spec.ts
index c99c8f3418d..e96bdb92114 100644
--- a/src/shared/components/query/QueryStore.spec.ts
+++ b/src/shared/components/query/QueryStore.spec.ts
@@ -1,110 +1,115 @@
-import {assert, expect} from "chai";
-import {QueryStore, CUSTOM_CASE_LIST_ID, CancerStudyQueryUrlParams} from "./QueryStore";
-import { VirtualStudy, VirtualStudyData } from "shared/model/VirtualStudy";
+import { assert, expect } from 'chai';
+import {
+    QueryStore,
+    CUSTOM_CASE_LIST_ID,
+    CancerStudyQueryUrlParams,
+} from './QueryStore';
+import { VirtualStudy, VirtualStudyData } from 'shared/model/VirtualStudy';
 import Sinon from 'sinon';
-import sessionServiceClient from "shared/api//sessionServiceInstance";
-import client from "../../api/cbioportalClientInstance";
+import sessionServiceClient from 'shared/api//sessionServiceInstance';
+import client from '../../api/cbioportalClientInstance';
 import * as _ from 'lodash';
 
-describe("QueryStore", ()=>{
-
-    describe('#setParamsFromLocalStorage',()=>{
-        let store:QueryStore;
+describe('QueryStore', () => {
+    describe('#setParamsFromLocalStorage', () => {
+        let store: QueryStore;
         let getUserVirtualStudiesStub: sinon.SinonStub;
         let deleteVirtualStudyStub: sinon.SinonStub;
         let addVirtualStudyStub: sinon.SinonStub;
         let initializeStub: sinon.SinonStub;
 
-        beforeEach(()=>{
-
-            initializeStub = Sinon.stub(QueryStore.prototype,"initialize").callsFake(function(){});
+        beforeEach(() => {
+            initializeStub = Sinon.stub(
+                QueryStore.prototype,
+                'initialize'
+            ).callsFake(function() {});
 
             store = new QueryStore();
         });
 
-        it("given custom case list, sets store and flags appropriately",()=>{
+        it('given custom case list, sets store and flags appropriately', () => {
             assert.isFalse(store.initiallySelected.profileIds);
             assert.isFalse(store.initiallySelected.sampleListId);
-            store.setParamsFromLocalStorage({ case_set_id:"-1", case_ids:"sample1:study+sample2:study" } as Partial<CancerStudyQueryUrlParams>);
-            assert.equal(store.caseIds,"sample1:study\nsample2:study");
+            store.setParamsFromLocalStorage({
+                case_set_id: '-1',
+                case_ids: 'sample1:study+sample2:study',
+            } as Partial<CancerStudyQueryUrlParams>);
+            assert.equal(store.caseIds, 'sample1:study\nsample2:study');
             assert.isTrue(store.initiallySelected.sampleListId);
-            assert.equal(store.selectedSampleListId,"-1");
+            assert.equal(store.selectedSampleListId, '-1');
         });
     });
 
-
     describe.skip('Virtual Studies section on query page', () => {
-        let store_vs:QueryStore;
+        let store_vs: QueryStore;
         const virtualStudies: VirtualStudy[] = [
             {
-            "id": "study1",
-            "data": {
-                "name": "Test Study",
-                "description": "Test Study",
-                "studies": [
-                {
-                    "id": "test_study",
-                    "samples": [
-                    "sample-01",
-                    "sample-02",
-                    "sample-03"
-                    ]
-                }
-                ],
-                "studyViewFilter":{},
-                "origin": [
-                "test_study"
-                ]
-            } as VirtualStudyData
-            }
+                id: 'study1',
+                data: {
+                    name: 'Test Study',
+                    description: 'Test Study',
+                    studies: [
+                        {
+                            id: 'test_study',
+                            samples: ['sample-01', 'sample-02', 'sample-03'],
+                        },
+                    ],
+                    studyViewFilter: {},
+                    origin: ['test_study'],
+                } as VirtualStudyData,
+            },
         ];
-        let getUserVirtualStudiesStub: sinon.SinonStub
-        let deleteVirtualStudyStub: sinon.SinonStub
-        let addVirtualStudyStub: sinon.SinonStub
+        let getUserVirtualStudiesStub: sinon.SinonStub;
+        let deleteVirtualStudyStub: sinon.SinonStub;
+        let addVirtualStudyStub: sinon.SinonStub;
 
-        before(()=>{
-            getUserVirtualStudiesStub = Sinon.stub(sessionServiceClient, "getUserVirtualStudies").callsFake(function fakeFn() {
+        before(() => {
+            getUserVirtualStudiesStub = Sinon.stub(
+                sessionServiceClient,
+                'getUserVirtualStudies'
+            ).callsFake(function fakeFn() {
                 return new Promise((resolve, reject) => {
                     resolve(virtualStudies);
                 });
             });
-            deleteVirtualStudyStub = Sinon.stub(sessionServiceClient, "deleteVirtualStudy").callsFake(function fakeFn(id:string) {
+            deleteVirtualStudyStub = Sinon.stub(
+                sessionServiceClient,
+                'deleteVirtualStudy'
+            ).callsFake(function fakeFn(id: string) {
                 return new Promise((resolve, reject) => {
                     resolve();
                 });
             });
-            addVirtualStudyStub = Sinon.stub(sessionServiceClient, "addVirtualStudy").callsFake(function fakeFn(id:string) {
+            addVirtualStudyStub = Sinon.stub(
+                sessionServiceClient,
+                'addVirtualStudy'
+            ).callsFake(function fakeFn(id: string) {
                 return new Promise((resolve, reject) => {
                     resolve();
                 });
             });
 
             store_vs = new QueryStore();
-
         });
 
-        after(()=>{
+        after(() => {
             getUserVirtualStudiesStub.restore();
             deleteVirtualStudyStub.restore();
             addVirtualStudyStub.restore();
         });
 
-        it('should show all user virtual studies', ()=>{
-            assert.isTrue(getUserVirtualStudiesStub.calledOnce)
+        it('should show all user virtual studies', () => {
+            assert.isTrue(getUserVirtualStudiesStub.calledOnce);
         });
 
-        it('should be able to delete a virtual study', ()=>{
-            store_vs.deleteVirtualStudy("study1")
-            assert.isTrue(deleteVirtualStudyStub.calledOnce)
+        it('should be able to delete a virtual study', () => {
+            store_vs.deleteVirtualStudy('study1');
+            assert.isTrue(deleteVirtualStudyStub.calledOnce);
         });
 
-        it('should be able to restore back deleted virtual study', ()=>{
-            store_vs.restoreVirtualStudy("study1");
-            assert.isTrue(addVirtualStudyStub.calledOnce)
+        it('should be able to restore back deleted virtual study', () => {
+            store_vs.restoreVirtualStudy('study1');
+            assert.isTrue(addVirtualStudyStub.calledOnce);
         });
-
-
-
-
     });
 });
diff --git a/src/shared/components/query/QueryStore.ts b/src/shared/components/query/QueryStore.ts
index 08dffe7bd8e..d5a40e99192 100644
--- a/src/shared/components/query/QueryStore.ts
+++ b/src/shared/components/query/QueryStore.ts
@@ -24,7 +24,7 @@ import {
     getBrowserWindow,
     remoteData,
     stringListToIndexSet,
-    stringListToSet
+    stringListToSet,
 } from 'cbioportal-frontend-commons';
 import { labelMobxPromises, cached, debounceAsync } from 'mobxpromise';
 import internalClient from '../../api/cbioportalInternalClientInstance';
@@ -63,7 +63,10 @@ import SampleListsInStudyCache from 'shared/cache/SampleListsInStudyCache';
 import formSubmit from '../../lib/formSubmit';
 import { ServerConfigHelpers } from '../../../config/config';
 import { AlterationTypeConstants } from '../../../pages/resultsView/ResultsViewPageStore';
-import {ResultsViewURLQuery, ResultsViewURLQueryEnum} from "pages/resultsView/ResultsViewURLWrapper";
+import {
+    ResultsViewURLQuery,
+    ResultsViewURLQueryEnum,
+} from 'pages/resultsView/ResultsViewURLWrapper';
 import { getFilteredCustomCaseSets } from './CaseSetSelectorUtils';
 
 // interface for communicating
@@ -90,8 +93,8 @@ export type CancerStudyQueryUrlParams = {
     transpose_matrix?: 'on';
     Action: 'Submit';
     patient_enrichments?: string;
-    show_samples?:string;
-    exclude_germline_mutations?:string;
+    show_samples?: string;
+    exclude_germline_mutations?: string;
 };
 
 export type GeneReplacement = { alias: string; genes: Gene[] };
@@ -1801,10 +1804,14 @@ export class QueryStore {
         }
 
         if (sampleListId === CUSTOM_CASE_LIST_ID) {
-            return this.caseIds ? Math.max(this.caseIds.trim().split(/\s+/g).length, 1) : 1;
+            return this.caseIds
+                ? Math.max(this.caseIds.trim().split(/\s+/g).length, 1)
+                : 1;
         }
 
-        const sampleList = this.sampleLists.result.find((l) => l.sampleListId === sampleListId);
+        const sampleList = this.sampleLists.result.find(
+            l => l.sampleListId === sampleListId
+        );
         if (sampleList) {
             return sampleList.sampleCount;
         }
@@ -1824,7 +1831,9 @@ export class QueryStore {
     }
 
     @computed get geneLimit(): number {
-        return Math.floor(AppConfig.serverConfig.query_product_limit / this.approxSampleCount);
+        return Math.floor(
+            AppConfig.serverConfig.query_product_limit / this.approxSampleCount
+        );
     }
 
     @computed get submitError() {
@@ -1943,12 +1952,17 @@ export class QueryStore {
             return 'Please edit the gene symbols.';
 
         // TDOD: remove this condition once multiple entrez gene ids is supported
-        const hugoGeneSymbolSet = _.groupBy(this.genes.result.found, gene => gene.hugoGeneSymbol);
-        const hasGenesWithMultipleEntrezGeneIds = _.some(hugoGeneSymbolSet, genes => genes.length > 1);
+        const hugoGeneSymbolSet = _.groupBy(
+            this.genes.result.found,
+            gene => gene.hugoGeneSymbol
+        );
+        const hasGenesWithMultipleEntrezGeneIds = _.some(
+            hugoGeneSymbolSet,
+            genes => genes.length > 1
+        );
         if (hasGenesWithMultipleEntrezGeneIds) {
             return 'Please edit the gene symbols.';
         }
-
     }
 
     private readonly dict_molecularAlterationType_filenameSuffix: {
@@ -2039,7 +2053,8 @@ export class QueryStore {
             : (profileIds.filter(_.identity) as string[]);
         this.zScoreThreshold = params.Z_SCORE_THRESHOLD || '2.0';
         this.rppaScoreThreshold = params.RPPA_SCORE_THRESHOLD || '2.0';
-        this.dataTypePriorityCode = params.data_priority || params.profileFilter ||  '0';
+        this.dataTypePriorityCode =
+            params.data_priority || params.profileFilter || '0';
         this.selectedSampleListId = params.case_set_id
             ? params.case_set_id.toString()
             : ''; // must be a string even though it's integer
@@ -2049,7 +2064,9 @@ export class QueryStore {
             decodeURIComponent(params.gene_list || '')
         );
         this.genesetQuery = normalizeQuery(
-            decodeURIComponent(params[ResultsViewURLQueryEnum.geneset_list] || '')
+            decodeURIComponent(
+                params[ResultsViewURLQueryEnum.geneset_list] || ''
+            )
         );
         this.forDownloadTab = params.tab_index === 'tab_download';
         this.initiallySelected.profileIds = true;
diff --git a/src/shared/components/query/QueryStoreUtils.spec.ts b/src/shared/components/query/QueryStoreUtils.spec.ts
index ff04afe48ed..548af16a8dc 100644
--- a/src/shared/components/query/QueryStoreUtils.spec.ts
+++ b/src/shared/components/query/QueryStoreUtils.spec.ts
@@ -1,204 +1,356 @@
 import { assert } from 'chai';
-import {QueryStore, normalizeQuery} from "./QueryStore";
-import {nonMolecularProfileParams, profileAvailability, categorizedSamplesCount} from "./QueryStoreUtils";
-import {AlterationTypeConstants} from "../../../pages/resultsView/ResultsViewPageStore";
-import {MolecularProfile, SampleList} from "../../api/generated/CBioPortalAPI";
+import { QueryStore, normalizeQuery } from './QueryStore';
+import {
+    nonMolecularProfileParams,
+    profileAvailability,
+    categorizedSamplesCount,
+} from './QueryStoreUtils';
+import { AlterationTypeConstants } from '../../../pages/resultsView/ResultsViewPageStore';
+import {
+    MolecularProfile,
+    SampleList,
+} from '../../api/generated/CBioPortalAPI';
 import Sinon from 'sinon';
 import { VirtualStudy } from 'shared/model/VirtualStudy';
 
-describe('QueryStoreUtils', ()=>{
-    describe('nonMolecularProfileParams', ()=>{
+describe('QueryStoreUtils', () => {
+    describe('nonMolecularProfileParams', () => {
+        let selectableStudiesSetStub: any;
 
-        let selectableStudiesSetStub:any;
+        before(() => {});
 
-        before(()=>{
-
-        });
-
-        after(()=>{
+        after(() => {
             if (selectableStudiesSetStub) {
                 selectableStudiesSetStub.restore();
             }
         });
 
-        it.skip("returns url-encoded, normalized query for gene_list parameter", ()=>{
-
-
+        it.skip('returns url-encoded, normalized query for gene_list parameter', () => {
             let store = new QueryStore();
 
             let queries = [
-                "TP53:MUT",
-                "tp53:mut",
-                "TP53:mut",
-                "TP53:exp>0",
-                "PIM2: exp > 0",
-                "TP53: EXP<=0",
-                "TP53: MUT; PTEN:amp"
+                'TP53:MUT',
+                'tp53:mut',
+                'TP53:mut',
+                'TP53:exp>0',
+                'PIM2: exp > 0',
+                'TP53: EXP<=0',
+                'TP53: MUT; PTEN:amp',
             ];
             for (let query of queries) {
                 store.geneQuery = query;
-                assert.equal(nonMolecularProfileParams(store).gene_list, encodeURIComponent(normalizeQuery(query)), `got encoded, normalized query for query ${query}`);
+                assert.equal(
+                    nonMolecularProfileParams(store).gene_list,
+                    encodeURIComponent(normalizeQuery(query)),
+                    `got encoded, normalized query for query ${query}`
+                );
             }
         });
     });
-    describe("profileAvailability", ()=>{
-        it("returns correct profile availability result in case of zero profiles", ()=>{
-            assert.deepEqual(profileAvailability([]), {mutation:false, cna:false});
+    describe('profileAvailability', () => {
+        it('returns correct profile availability result in case of zero profiles', () => {
+            assert.deepEqual(profileAvailability([]), {
+                mutation: false,
+                cna: false,
+            });
         });
-        it("returns correct profile availability result in case of one profile", ()=>{
-            let profiles = [{
-                molecularAlterationType: AlterationTypeConstants.MUTATION_EXTENDED,
-                showProfileInAnalysisTab: true
-            }] as MolecularProfile[];
-            assert.deepEqual(profileAvailability(profiles), {mutation:true, cna:false});
+        it('returns correct profile availability result in case of one profile', () => {
+            let profiles = [
+                {
+                    molecularAlterationType:
+                        AlterationTypeConstants.MUTATION_EXTENDED,
+                    showProfileInAnalysisTab: true,
+                },
+            ] as MolecularProfile[];
+            assert.deepEqual(profileAvailability(profiles), {
+                mutation: true,
+                cna: false,
+            });
 
-            profiles = [{
-                molecularAlterationType: AlterationTypeConstants.MUTATION_EXTENDED,
-                showProfileInAnalysisTab: false
-            }] as MolecularProfile[];
-            assert.deepEqual(profileAvailability(profiles), {mutation:false, cna:false});
+            profiles = [
+                {
+                    molecularAlterationType:
+                        AlterationTypeConstants.MUTATION_EXTENDED,
+                    showProfileInAnalysisTab: false,
+                },
+            ] as MolecularProfile[];
+            assert.deepEqual(profileAvailability(profiles), {
+                mutation: false,
+                cna: false,
+            });
 
-            profiles = [{
-                molecularAlterationType: AlterationTypeConstants.COPY_NUMBER_ALTERATION,
-                showProfileInAnalysisTab: true
-            }] as MolecularProfile[];
-            assert.deepEqual(profileAvailability(profiles), {mutation:false, cna:true});
+            profiles = [
+                {
+                    molecularAlterationType:
+                        AlterationTypeConstants.COPY_NUMBER_ALTERATION,
+                    showProfileInAnalysisTab: true,
+                },
+            ] as MolecularProfile[];
+            assert.deepEqual(profileAvailability(profiles), {
+                mutation: false,
+                cna: true,
+            });
 
-            profiles = [{
-                molecularAlterationType: AlterationTypeConstants.COPY_NUMBER_ALTERATION,
-                showProfileInAnalysisTab: false
-            }] as MolecularProfile[];
-            assert.deepEqual(profileAvailability(profiles), {mutation:false, cna:false});
+            profiles = [
+                {
+                    molecularAlterationType:
+                        AlterationTypeConstants.COPY_NUMBER_ALTERATION,
+                    showProfileInAnalysisTab: false,
+                },
+            ] as MolecularProfile[];
+            assert.deepEqual(profileAvailability(profiles), {
+                mutation: false,
+                cna: false,
+            });
         });
-        it("returns correct profile availability result in case of two profiles", ()=>{
-            let profiles = [{
-                molecularAlterationType: AlterationTypeConstants.MUTATION_EXTENDED,
-                showProfileInAnalysisTab: true
-            },{
-                molecularAlterationType: AlterationTypeConstants.COPY_NUMBER_ALTERATION,
-                showProfileInAnalysisTab: true
-            }] as MolecularProfile[];
-            assert.deepEqual(profileAvailability(profiles), {mutation:true, cna:true});
+        it('returns correct profile availability result in case of two profiles', () => {
+            let profiles = [
+                {
+                    molecularAlterationType:
+                        AlterationTypeConstants.MUTATION_EXTENDED,
+                    showProfileInAnalysisTab: true,
+                },
+                {
+                    molecularAlterationType:
+                        AlterationTypeConstants.COPY_NUMBER_ALTERATION,
+                    showProfileInAnalysisTab: true,
+                },
+            ] as MolecularProfile[];
+            assert.deepEqual(profileAvailability(profiles), {
+                mutation: true,
+                cna: true,
+            });
 
-            profiles = [{
-                molecularAlterationType: AlterationTypeConstants.MUTATION_EXTENDED,
-                showProfileInAnalysisTab: false
-            },{
-                molecularAlterationType: AlterationTypeConstants.COPY_NUMBER_ALTERATION,
-                showProfileInAnalysisTab: true
-            }] as MolecularProfile[];
-            assert.deepEqual(profileAvailability(profiles), {mutation:false, cna:true});
+            profiles = [
+                {
+                    molecularAlterationType:
+                        AlterationTypeConstants.MUTATION_EXTENDED,
+                    showProfileInAnalysisTab: false,
+                },
+                {
+                    molecularAlterationType:
+                        AlterationTypeConstants.COPY_NUMBER_ALTERATION,
+                    showProfileInAnalysisTab: true,
+                },
+            ] as MolecularProfile[];
+            assert.deepEqual(profileAvailability(profiles), {
+                mutation: false,
+                cna: true,
+            });
 
-            profiles = [{
-                molecularAlterationType: AlterationTypeConstants.MUTATION_EXTENDED,
-                showProfileInAnalysisTab: true
-            },{
-                molecularAlterationType: AlterationTypeConstants.COPY_NUMBER_ALTERATION,
-                showProfileInAnalysisTab: false
-            }] as MolecularProfile[];
-            assert.deepEqual(profileAvailability(profiles), {mutation:true, cna:false});
+            profiles = [
+                {
+                    molecularAlterationType:
+                        AlterationTypeConstants.MUTATION_EXTENDED,
+                    showProfileInAnalysisTab: true,
+                },
+                {
+                    molecularAlterationType:
+                        AlterationTypeConstants.COPY_NUMBER_ALTERATION,
+                    showProfileInAnalysisTab: false,
+                },
+            ] as MolecularProfile[];
+            assert.deepEqual(profileAvailability(profiles), {
+                mutation: true,
+                cna: false,
+            });
 
-            profiles = [{
-                molecularAlterationType: AlterationTypeConstants.MUTATION_EXTENDED,
-                showProfileInAnalysisTab: false
-            },{
-                molecularAlterationType: AlterationTypeConstants.COPY_NUMBER_ALTERATION,
-                showProfileInAnalysisTab: false
-            }] as MolecularProfile[];
-            assert.deepEqual(profileAvailability(profiles), {mutation:false, cna:false});
+            profiles = [
+                {
+                    molecularAlterationType:
+                        AlterationTypeConstants.MUTATION_EXTENDED,
+                    showProfileInAnalysisTab: false,
+                },
+                {
+                    molecularAlterationType:
+                        AlterationTypeConstants.COPY_NUMBER_ALTERATION,
+                    showProfileInAnalysisTab: false,
+                },
+            ] as MolecularProfile[];
+            assert.deepEqual(profileAvailability(profiles), {
+                mutation: false,
+                cna: false,
+            });
         });
-        it("returns correct profile availability result in case of several profiles", ()=>{
-            let profiles = [{
-                molecularAlterationType: AlterationTypeConstants.MUTATION_EXTENDED,
-                showProfileInAnalysisTab: true
-            },{
-                molecularAlterationType: AlterationTypeConstants.MUTATION_EXTENDED,
-                showProfileInAnalysisTab: false
-            },{
-                molecularAlterationType: AlterationTypeConstants.COPY_NUMBER_ALTERATION,
-                showProfileInAnalysisTab: false
-            }] as MolecularProfile[];
-            assert.deepEqual(profileAvailability(profiles), {mutation:true, cna:false});
+        it('returns correct profile availability result in case of several profiles', () => {
+            let profiles = [
+                {
+                    molecularAlterationType:
+                        AlterationTypeConstants.MUTATION_EXTENDED,
+                    showProfileInAnalysisTab: true,
+                },
+                {
+                    molecularAlterationType:
+                        AlterationTypeConstants.MUTATION_EXTENDED,
+                    showProfileInAnalysisTab: false,
+                },
+                {
+                    molecularAlterationType:
+                        AlterationTypeConstants.COPY_NUMBER_ALTERATION,
+                    showProfileInAnalysisTab: false,
+                },
+            ] as MolecularProfile[];
+            assert.deepEqual(profileAvailability(profiles), {
+                mutation: true,
+                cna: false,
+            });
         });
     });
 
-    describe("categorizedSamples", ()=>{
+    describe('categorizedSamples', () => {
         let allSampleLists = [
             {
-                "category": "all_cases_in_study",
-                "sampleIds": ["sample1"],
-                "studyId": "study1"
+                category: 'all_cases_in_study',
+                sampleIds: ['sample1'],
+                studyId: 'study1',
             },
             {
-                "category": "all_cases_in_study",
-                "sampleIds": ["sample1"],
-                "studyId": "study2"
-            }
-        ]
+                category: 'all_cases_in_study',
+                sampleIds: ['sample1'],
+                studyId: 'study2',
+            },
+        ];
         let mutationSampleLists = [
             {
-                "category": "all_cases_with_mutation_data",
-                "sampleIds": ["sample1"],
-                "studyId": "study1"
+                category: 'all_cases_with_mutation_data',
+                sampleIds: ['sample1'],
+                studyId: 'study1',
             },
             {
-                "category": "all_cases_with_mutation_data",
-                "sampleIds": ["sample1"],
-                "studyId": "study2"
-            }
-        ]
+                category: 'all_cases_with_mutation_data',
+                sampleIds: ['sample1'],
+                studyId: 'study2',
+            },
+        ];
         let mutationCnaSampleLists = [
             {
-                "category": "all_cases_with_mutation_and_cna_data",
-                "sampleIds": ["sample1"],
-                "studyId": "study1"
-            }
-        ]
+                category: 'all_cases_with_mutation_and_cna_data',
+                sampleIds: ['sample1'],
+                studyId: 'study1',
+            },
+        ];
         let cnaSampleLists = [
             {
-                "category": "all_cases_with_cna_data",
-                "sampleIds": ["sample1"],
-                "studyId": "study1"
-            }
-        ]
+                category: 'all_cases_with_cna_data',
+                sampleIds: ['sample1'],
+                studyId: 'study1',
+            },
+        ];
 
         const virtualStudy = {
-            "id": "vs1",
-            "data": {
-                "studies": [
+            id: 'vs1',
+            data: {
+                studies: [
                     {
-                        "id": "study2",
-                        "samples": [
-                            "sample1",
-                        ]
-                    }
-                ]
-            }
-        }
+                        id: 'study2',
+                        samples: ['sample1'],
+                    },
+                ],
+            },
+        };
 
-        it("returns correct categoried samples count when everything is empty", () => {
-            assert.deepEqual(categorizedSamplesCount([], [], []), { w_mut: 0, w_cna: 0, w_mut_cna: 0, all: 0 });
+        it('returns correct categoried samples count when everything is empty', () => {
+            assert.deepEqual(categorizedSamplesCount([], [], []), {
+                w_mut: 0,
+                w_cna: 0,
+                w_mut_cna: 0,
+                all: 0,
+            });
         });
-        it("returns correct categoried samples count when only `all_cases_with_mutation_data` sets are present", () => {
-            assert.deepEqual(categorizedSamplesCount([...allSampleLists, ...mutationSampleLists] as SampleList[], ['study1', 'study2'], []), { w_mut: 2, w_cna: 0, w_mut_cna: 0, all: 2 });
+        it('returns correct categoried samples count when only `all_cases_with_mutation_data` sets are present', () => {
+            assert.deepEqual(
+                categorizedSamplesCount(
+                    [...allSampleLists, ...mutationSampleLists] as SampleList[],
+                    ['study1', 'study2'],
+                    []
+                ),
+                { w_mut: 2, w_cna: 0, w_mut_cna: 0, all: 2 }
+            );
         });
-        it("returns correct categoried samples count when only `all_cases_with_cna_data` sets are present", () => {
-            assert.deepEqual(categorizedSamplesCount(cnaSampleLists as SampleList[], ['study1', 'study2'], []), { w_mut: 0, w_cna: 1, w_mut_cna: 0, all: 0 });
+        it('returns correct categoried samples count when only `all_cases_with_cna_data` sets are present', () => {
+            assert.deepEqual(
+                categorizedSamplesCount(
+                    cnaSampleLists as SampleList[],
+                    ['study1', 'study2'],
+                    []
+                ),
+                { w_mut: 0, w_cna: 1, w_mut_cna: 0, all: 0 }
+            );
         });
-        it("returns correct categoried samples count when only `all_cases_with_mutation_and_cna_data` sets are present", () => {
-            assert.deepEqual(categorizedSamplesCount(mutationCnaSampleLists as SampleList[], ['study1', 'study2'], []), { w_mut: 0, w_cna: 0, w_mut_cna: 1, all: 0 });
+        it('returns correct categoried samples count when only `all_cases_with_mutation_and_cna_data` sets are present', () => {
+            assert.deepEqual(
+                categorizedSamplesCount(
+                    mutationCnaSampleLists as SampleList[],
+                    ['study1', 'study2'],
+                    []
+                ),
+                { w_mut: 0, w_cna: 0, w_mut_cna: 1, all: 0 }
+            );
         });
-        it("returns correct categoried samples count when only sets are present", () => {
-            assert.deepEqual(categorizedSamplesCount([...mutationSampleLists, ...cnaSampleLists, ...mutationCnaSampleLists] as SampleList[], ['study1', 'study2'], []), { w_mut: 2, w_cna: 1, w_mut_cna: 1, all: 0 });
+        it('returns correct categoried samples count when only sets are present', () => {
+            assert.deepEqual(
+                categorizedSamplesCount(
+                    [
+                        ...mutationSampleLists,
+                        ...cnaSampleLists,
+                        ...mutationCnaSampleLists,
+                    ] as SampleList[],
+                    ['study1', 'study2'],
+                    []
+                ),
+                { w_mut: 2, w_cna: 1, w_mut_cna: 1, all: 0 }
+            );
         });
 
-        it("returns correct categoried samples count when virtual study is in selected studies", () => {
-            assert.deepEqual(categorizedSamplesCount(mutationSampleLists as SampleList[], ['vs1'], [virtualStudy] as VirtualStudy[]), { w_mut: 1, w_cna: 0, w_mut_cna: 0, all: 0 });
-            assert.deepEqual(categorizedSamplesCount(cnaSampleLists as SampleList[], ['vs1'], [virtualStudy] as VirtualStudy[]), { w_mut: 0, w_cna: 0, w_mut_cna: 0, all: 0 });
-            assert.deepEqual(categorizedSamplesCount(mutationCnaSampleLists as SampleList[], ['vs1'], [virtualStudy] as VirtualStudy[]), { w_mut: 0, w_cna: 0, w_mut_cna: 0, all: 0 });
-            assert.deepEqual(categorizedSamplesCount([...mutationSampleLists, ...cnaSampleLists, ...mutationCnaSampleLists] as SampleList[], ['vs1'], [virtualStudy] as VirtualStudy[]), { w_mut: 1, w_cna: 0, w_mut_cna: 0, all: 0 });
-            assert.deepEqual(categorizedSamplesCount([...mutationSampleLists, ...cnaSampleLists, ...mutationCnaSampleLists] as SampleList[], ['study1', 'vs1'], [virtualStudy] as VirtualStudy[]), { w_mut: 2, w_cna: 1, w_mut_cna: 1, all: 0 });
+        it('returns correct categoried samples count when virtual study is in selected studies', () => {
+            assert.deepEqual(
+                categorizedSamplesCount(
+                    mutationSampleLists as SampleList[],
+                    ['vs1'],
+                    [virtualStudy] as VirtualStudy[]
+                ),
+                { w_mut: 1, w_cna: 0, w_mut_cna: 0, all: 0 }
+            );
+            assert.deepEqual(
+                categorizedSamplesCount(
+                    cnaSampleLists as SampleList[],
+                    ['vs1'],
+                    [virtualStudy] as VirtualStudy[]
+                ),
+                { w_mut: 0, w_cna: 0, w_mut_cna: 0, all: 0 }
+            );
+            assert.deepEqual(
+                categorizedSamplesCount(
+                    mutationCnaSampleLists as SampleList[],
+                    ['vs1'],
+                    [virtualStudy] as VirtualStudy[]
+                ),
+                { w_mut: 0, w_cna: 0, w_mut_cna: 0, all: 0 }
+            );
+            assert.deepEqual(
+                categorizedSamplesCount(
+                    [
+                        ...mutationSampleLists,
+                        ...cnaSampleLists,
+                        ...mutationCnaSampleLists,
+                    ] as SampleList[],
+                    ['vs1'],
+                    [virtualStudy] as VirtualStudy[]
+                ),
+                { w_mut: 1, w_cna: 0, w_mut_cna: 0, all: 0 }
+            );
+            assert.deepEqual(
+                categorizedSamplesCount(
+                    [
+                        ...mutationSampleLists,
+                        ...cnaSampleLists,
+                        ...mutationCnaSampleLists,
+                    ] as SampleList[],
+                    ['study1', 'vs1'],
+                    [virtualStudy] as VirtualStudy[]
+                ),
+                { w_mut: 2, w_cna: 1, w_mut_cna: 1, all: 0 }
+            );
         });
-
-    })
+    });
 });
diff --git a/src/shared/components/query/QueryStoreUtils.ts b/src/shared/components/query/QueryStoreUtils.ts
index 79de374a271..1e5f00b971d 100644
--- a/src/shared/components/query/QueryStoreUtils.ts
+++ b/src/shared/components/query/QueryStoreUtils.ts
@@ -1,43 +1,81 @@
-import {CancerStudyQueryUrlParams, normalizeQuery, QueryStore} from "./QueryStore";
-import { MolecularProfile, SampleList } from "shared/api/generated/CBioPortalAPI";
-import { AlterationTypeConstants } from "pages/resultsView/ResultsViewPageStore";
-import * as _ from "lodash";
-import { VirtualStudy } from "shared/model/VirtualStudy";
+import {
+    CancerStudyQueryUrlParams,
+    normalizeQuery,
+    QueryStore,
+} from './QueryStore';
+import {
+    MolecularProfile,
+    SampleList,
+} from 'shared/api/generated/CBioPortalAPI';
+import { AlterationTypeConstants } from 'pages/resultsView/ResultsViewPageStore';
+import * as _ from 'lodash';
+import { VirtualStudy } from 'shared/model/VirtualStudy';
 
-export type NonMolecularProfileQueryParams = Pick<CancerStudyQueryUrlParams,
-    'cancer_study_id' | 'cancer_study_list' | 'Z_SCORE_THRESHOLD' | 'RPPA_SCORE_THRESHOLD' | 'data_priority' |
-    'case_set_id' | 'case_ids' | 'gene_list' | 'geneset_list' | 'tab_index' | 'transpose_matrix' | 'Action' | 'profileFilter'>;
+export type NonMolecularProfileQueryParams = Pick<
+    CancerStudyQueryUrlParams,
+    | 'cancer_study_id'
+    | 'cancer_study_list'
+    | 'Z_SCORE_THRESHOLD'
+    | 'RPPA_SCORE_THRESHOLD'
+    | 'data_priority'
+    | 'case_set_id'
+    | 'case_ids'
+    | 'gene_list'
+    | 'geneset_list'
+    | 'tab_index'
+    | 'transpose_matrix'
+    | 'Action'
+    | 'profileFilter'
+>;
 
-export type MolecularProfileQueryParams = Pick<CancerStudyQueryUrlParams,
-    'genetic_profile_ids_PROFILE_MUTATION_EXTENDED' | 'genetic_profile_ids_PROFILE_COPY_NUMBER_ALTERATION' |
-    'genetic_profile_ids_PROFILE_MRNA_EXPRESSION' | 'genetic_profile_ids_PROFILE_METHYLATION' |
-    'genetic_profile_ids_PROFILE_PROTEIN_EXPRESSION' | 'genetic_profile_ids_PROFILE_GENESET_SCORE' |
-    'genetic_profile_ids_PROFILE_GENERIC_ASSAY' >;
+export type MolecularProfileQueryParams = Pick<
+    CancerStudyQueryUrlParams,
+    | 'genetic_profile_ids_PROFILE_MUTATION_EXTENDED'
+    | 'genetic_profile_ids_PROFILE_COPY_NUMBER_ALTERATION'
+    | 'genetic_profile_ids_PROFILE_MRNA_EXPRESSION'
+    | 'genetic_profile_ids_PROFILE_METHYLATION'
+    | 'genetic_profile_ids_PROFILE_PROTEIN_EXPRESSION'
+    | 'genetic_profile_ids_PROFILE_GENESET_SCORE'
+    | 'genetic_profile_ids_PROFILE_GENERIC_ASSAY'
+>;
 
-
-export function currentQueryParams(store:QueryStore) {
+export function currentQueryParams(store: QueryStore) {
     let nonProfileParams = nonMolecularProfileParams(store);
     let profileParams = molecularProfileParams(store);
     return queryParams(nonProfileParams, profileParams);
 }
 
-export function queryParams(nonMolecularProfileParams:NonMolecularProfileQueryParams,
-                            molecularProfileParams:MolecularProfileQueryParams) {
-    let params:CancerStudyQueryUrlParams = Object.assign({}, nonMolecularProfileParams, molecularProfileParams);
+export function queryParams(
+    nonMolecularProfileParams: NonMolecularProfileQueryParams,
+    molecularProfileParams: MolecularProfileQueryParams
+) {
+    let params: CancerStudyQueryUrlParams = Object.assign(
+        {},
+        nonMolecularProfileParams,
+        molecularProfileParams
+    );
 
-    return {query:params};
+    return { query: params };
 }
 
-export function nonMolecularProfileParams(store:QueryStore, whitespace_separated_case_ids?:string):NonMolecularProfileQueryParams {
+export function nonMolecularProfileParams(
+    store: QueryStore,
+    whitespace_separated_case_ids?: string
+): NonMolecularProfileQueryParams {
     const selectableSelectedStudyIds = store.selectableSelectedStudyIds;
 
     // case ids is of format study1:sample1+study2:sample2+...
-    const case_ids = whitespace_separated_case_ids ?
-                    whitespace_separated_case_ids.replace(/\s+/g, '+') :
-                    store.asyncCustomCaseSet.result.map(caseRow => (caseRow.studyId + ':' + caseRow.sampleId)).join('+');
+    const case_ids = whitespace_separated_case_ids
+        ? whitespace_separated_case_ids.replace(/\s+/g, '+')
+        : store.asyncCustomCaseSet.result
+              .map(caseRow => caseRow.studyId + ':' + caseRow.sampleId)
+              .join('+');
 
-    let ret:NonMolecularProfileQueryParams = {
-        cancer_study_id: selectableSelectedStudyIds.length === 1 ? selectableSelectedStudyIds[0] : 'all',
+    let ret: NonMolecularProfileQueryParams = {
+        cancer_study_id:
+            selectableSelectedStudyIds.length === 1
+                ? selectableSelectedStudyIds[0]
+                : 'all',
         Z_SCORE_THRESHOLD: store.zScoreThreshold,
         RPPA_SCORE_THRESHOLD: store.rppaScoreThreshold,
         data_priority: store.dataTypePriorityCode,
@@ -46,92 +84,147 @@ export function nonMolecularProfileParams(store:QueryStore, whitespace_separated
         case_ids,
         gene_list: encodeURIComponent(normalizeQuery(store.geneQuery) || ' '), // empty string won't work
         geneset_list: normalizeQuery(store.genesetQuery) || ' ', //empty string won't work
-        tab_index: store.forDownloadTab ? 'tab_download' : 'tab_visualize' as any,
+        tab_index: store.forDownloadTab
+            ? 'tab_download'
+            : ('tab_visualize' as any),
         transpose_matrix: store.transposeDataMatrix ? 'on' : undefined,
         Action: 'Submit',
     };
 
     if (selectableSelectedStudyIds.length !== 1) {
-        ret.cancer_study_list = selectableSelectedStudyIds.join(",");
+        ret.cancer_study_list = selectableSelectedStudyIds.join(',');
     }
 
     return ret;
 }
 
-export function molecularProfileParams(store:QueryStore, molecularProfileIds?:ReadonlyArray<string>) {
+export function molecularProfileParams(
+    store: QueryStore,
+    molecularProfileIds?: ReadonlyArray<string>
+) {
     return {
-        genetic_profile_ids_PROFILE_MUTATION_EXTENDED: store.getSelectedProfileIdFromMolecularAlterationType("MUTATION_EXTENDED", molecularProfileIds),
-        genetic_profile_ids_PROFILE_COPY_NUMBER_ALTERATION: store.getSelectedProfileIdFromMolecularAlterationType("COPY_NUMBER_ALTERATION", molecularProfileIds),
-        genetic_profile_ids_PROFILE_MRNA_EXPRESSION: store.getSelectedProfileIdFromMolecularAlterationType("MRNA_EXPRESSION", molecularProfileIds),
-        genetic_profile_ids_PROFILE_METHYLATION: store.getSelectedProfileIdFromMolecularAlterationType("METHYLATION", molecularProfileIds) || store.getSelectedProfileIdFromMolecularAlterationType("METHYLATION_BINARY", molecularProfileIds),
-        genetic_profile_ids_PROFILE_PROTEIN_EXPRESSION: store.getSelectedProfileIdFromMolecularAlterationType("PROTEIN_LEVEL", molecularProfileIds),
-        genetic_profile_ids_PROFILE_GENESET_SCORE: store.getSelectedProfileIdFromMolecularAlterationType("GENESET_SCORE", molecularProfileIds),
-        genetic_profile_ids_PROFILE_GENERIC_ASSAY: store.getSelectedProfileIdFromMolecularAlterationType("GENERIC_ASSAY", molecularProfileIds)
+        genetic_profile_ids_PROFILE_MUTATION_EXTENDED: store.getSelectedProfileIdFromMolecularAlterationType(
+            'MUTATION_EXTENDED',
+            molecularProfileIds
+        ),
+        genetic_profile_ids_PROFILE_COPY_NUMBER_ALTERATION: store.getSelectedProfileIdFromMolecularAlterationType(
+            'COPY_NUMBER_ALTERATION',
+            molecularProfileIds
+        ),
+        genetic_profile_ids_PROFILE_MRNA_EXPRESSION: store.getSelectedProfileIdFromMolecularAlterationType(
+            'MRNA_EXPRESSION',
+            molecularProfileIds
+        ),
+        genetic_profile_ids_PROFILE_METHYLATION:
+            store.getSelectedProfileIdFromMolecularAlterationType(
+                'METHYLATION',
+                molecularProfileIds
+            ) ||
+            store.getSelectedProfileIdFromMolecularAlterationType(
+                'METHYLATION_BINARY',
+                molecularProfileIds
+            ),
+        genetic_profile_ids_PROFILE_PROTEIN_EXPRESSION: store.getSelectedProfileIdFromMolecularAlterationType(
+            'PROTEIN_LEVEL',
+            molecularProfileIds
+        ),
+        genetic_profile_ids_PROFILE_GENESET_SCORE: store.getSelectedProfileIdFromMolecularAlterationType(
+            'GENESET_SCORE',
+            molecularProfileIds
+        ),
+        genetic_profile_ids_PROFILE_GENERIC_ASSAY: store.getSelectedProfileIdFromMolecularAlterationType(
+            'GENERIC_ASSAY',
+            molecularProfileIds
+        ),
     };
 }
 
+export function profileAvailability(molecularProfiles: MolecularProfile[]) {
+    let hasMutationProfile = false;
+    let hasCNAProfile = false;
+    for (const profile of molecularProfiles) {
+        if (!profile.showProfileInAnalysisTab) continue;
+
+        switch (profile.molecularAlterationType) {
+            case AlterationTypeConstants.MUTATION_EXTENDED:
+                hasMutationProfile = true;
+                break;
+            case AlterationTypeConstants.COPY_NUMBER_ALTERATION:
+                hasCNAProfile = true;
+                break;
+        }
 
-export function profileAvailability(molecularProfiles:MolecularProfile[]) {
-	let hasMutationProfile = false;
-	let hasCNAProfile = false;
-	for (const profile of molecularProfiles) {
-		if (!profile.showProfileInAnalysisTab)
-			continue;
-
-		switch (profile.molecularAlterationType) {
-			case AlterationTypeConstants.MUTATION_EXTENDED:
-				hasMutationProfile = true;
-				break;
-			case AlterationTypeConstants.COPY_NUMBER_ALTERATION:
-				hasCNAProfile = true;
-				break;
-		}
-
-		if (hasMutationProfile && hasCNAProfile)
-			break;
-	}
-	return {
-		mutation: hasMutationProfile,
-		cna: hasCNAProfile
-	};
+        if (hasMutationProfile && hasCNAProfile) break;
+    }
+    return {
+        mutation: hasMutationProfile,
+        cna: hasCNAProfile,
+    };
 }
 
-export function categorizedSamplesCount(sampleLists: SampleList[], selectedStudies: string[], selectedVirtualStudies: VirtualStudy[]) {
-    let mutationSamples: { [studyId: string]: { [sampleId: string]: string } } = {};
+export function categorizedSamplesCount(
+    sampleLists: SampleList[],
+    selectedStudies: string[],
+    selectedVirtualStudies: VirtualStudy[]
+) {
+    let mutationSamples: {
+        [studyId: string]: { [sampleId: string]: string };
+    } = {};
     let cnaSamples: { [studyId: string]: { [sampleId: string]: string } } = {};
-    let mutationCnaSamples: { [studyId: string]: { [sampleId: string]: string } } = {};
+    let mutationCnaSamples: {
+        [studyId: string]: { [sampleId: string]: string };
+    } = {};
     let allSamples: { [studyId: string]: { [sampleId: string]: string } } = {};
 
-    let filteredMutationSamples: { [studyId: string]: { [sampleId: string]: string } } = {};
-    let filteredCnaSamples: { [studyId: string]: { [sampleId: string]: string } } = {};
-    let filteredMutationCnaSamples: { [studyId: string]: { [sampleId: string]: string } } = {};
-    let filteredallSamples: { [studyId: string]: { [sampleId: string]: string } } = {};
+    let filteredMutationSamples: {
+        [studyId: string]: { [sampleId: string]: string };
+    } = {};
+    let filteredCnaSamples: {
+        [studyId: string]: { [sampleId: string]: string };
+    } = {};
+    let filteredMutationCnaSamples: {
+        [studyId: string]: { [sampleId: string]: string };
+    } = {};
+    let filteredallSamples: {
+        [studyId: string]: { [sampleId: string]: string };
+    } = {};
 
     _.each(sampleLists, sampleList => {
         switch (sampleList.category) {
-            case "all_cases_with_mutation_and_cna_data":
-                mutationCnaSamples[sampleList.studyId] = _.keyBy(sampleList.sampleIds);
+            case 'all_cases_with_mutation_and_cna_data':
+                mutationCnaSamples[sampleList.studyId] = _.keyBy(
+                    sampleList.sampleIds
+                );
                 break;
-            case "all_cases_with_mutation_data":
-                mutationSamples[sampleList.studyId] = _.keyBy(sampleList.sampleIds);
+            case 'all_cases_with_mutation_data':
+                mutationSamples[sampleList.studyId] = _.keyBy(
+                    sampleList.sampleIds
+                );
                 break;
-            case "all_cases_with_cna_data":
+            case 'all_cases_with_cna_data':
                 cnaSamples[sampleList.studyId] = _.keyBy(sampleList.sampleIds);
                 break;
-            case "all_cases_in_study":
+            case 'all_cases_in_study':
                 allSamples[sampleList.studyId] = _.keyBy(sampleList.sampleIds);
                 break;
             default: {
                 // this in case if the all cases list is tagged under other category
                 if (sampleList.sampleListId === sampleList.studyId + '_all') {
-                    allSamples[sampleList.studyId] = _.keyBy(sampleList.sampleIds);
+                    allSamples[sampleList.studyId] = _.keyBy(
+                        sampleList.sampleIds
+                    );
                 }
             }
         }
     });
 
-    const selectedVirtualStudyIds = _.map(selectedVirtualStudies, virtualStudy => virtualStudy.id);
-    const selectedPhysicalStudyIds = selectedStudies.filter(id => !_.includes(selectedVirtualStudyIds, id));
+    const selectedVirtualStudyIds = _.map(
+        selectedVirtualStudies,
+        virtualStudy => virtualStudy.id
+    );
+    const selectedPhysicalStudyIds = selectedStudies.filter(
+        id => !_.includes(selectedVirtualStudyIds, id)
+    );
 
     //add all samples from selected physical studies
     _.forEach(selectedPhysicalStudyIds, studyId => {
@@ -143,26 +236,43 @@ export function categorizedSamplesCount(sampleLists: SampleList[], selectedStudi
 
     _.forEach(selectedVirtualStudies, virtualStudy => {
         _.forEach(virtualStudy.data.studies, study => {
-
             // check if the study in this virtual study is already in the selected studies list
             // and only add the samples if its not already present
             if (!_.includes(selectedPhysicalStudyIds, study.id)) {
-                filteredMutationSamples[study.id] = filteredMutationSamples[study.id] || {};
-                filteredCnaSamples[study.id] = filteredCnaSamples[study.id] || {};
-                filteredMutationCnaSamples[study.id] = filteredMutationCnaSamples[study.id] || {};
-                filteredallSamples[study.id] = filteredallSamples[study.id] || {};
+                filteredMutationSamples[study.id] =
+                    filteredMutationSamples[study.id] || {};
+                filteredCnaSamples[study.id] =
+                    filteredCnaSamples[study.id] || {};
+                filteredMutationCnaSamples[study.id] =
+                    filteredMutationCnaSamples[study.id] || {};
+                filteredallSamples[study.id] =
+                    filteredallSamples[study.id] || {};
 
                 _.forEach(study.samples, sampleId => {
-                    if (mutationSamples[study.id] && mutationSamples[study.id][sampleId]) {
+                    if (
+                        mutationSamples[study.id] &&
+                        mutationSamples[study.id][sampleId]
+                    ) {
                         filteredMutationSamples[study.id][sampleId] = sampleId;
                     }
-                    if (cnaSamples[study.id] && cnaSamples[study.id][sampleId]) {
+                    if (
+                        cnaSamples[study.id] &&
+                        cnaSamples[study.id][sampleId]
+                    ) {
                         filteredCnaSamples[study.id][sampleId] = sampleId;
                     }
-                    if (mutationCnaSamples[study.id] && mutationCnaSamples[study.id][sampleId]) {
-                        filteredMutationCnaSamples[study.id][sampleId] = sampleId;
+                    if (
+                        mutationCnaSamples[study.id] &&
+                        mutationCnaSamples[study.id][sampleId]
+                    ) {
+                        filteredMutationCnaSamples[study.id][
+                            sampleId
+                        ] = sampleId;
                     }
-                    if (allSamples[study.id] && allSamples[study.id][sampleId]) {
+                    if (
+                        allSamples[study.id] &&
+                        allSamples[study.id][sampleId]
+                    ) {
                         filteredallSamples[study.id][sampleId] = sampleId;
                     }
                 });
@@ -171,9 +281,25 @@ export function categorizedSamplesCount(sampleLists: SampleList[], selectedStudi
     });
 
     return {
-        w_mut: _.reduce(filteredMutationSamples, (acc: number, next) => acc + Object.keys(next).length, 0),
-        w_cna: _.reduce(filteredCnaSamples, (acc: number, next) => acc + Object.keys(next).length, 0),
-        w_mut_cna: _.reduce(filteredMutationCnaSamples, (acc: number, next) => acc + Object.keys(next).length, 0),
-        all: _.reduce(filteredallSamples, (acc: number, next) => acc + Object.keys(next).length, 0)
-    }
+        w_mut: _.reduce(
+            filteredMutationSamples,
+            (acc: number, next) => acc + Object.keys(next).length,
+            0
+        ),
+        w_cna: _.reduce(
+            filteredCnaSamples,
+            (acc: number, next) => acc + Object.keys(next).length,
+            0
+        ),
+        w_mut_cna: _.reduce(
+            filteredMutationCnaSamples,
+            (acc: number, next) => acc + Object.keys(next).length,
+            0
+        ),
+        all: _.reduce(
+            filteredallSamples,
+            (acc: number, next) => acc + Object.keys(next).length,
+            0
+        ),
+    };
 }
diff --git a/src/shared/components/query/QuickSelectButtons.tsx b/src/shared/components/query/QuickSelectButtons.tsx
index bc7aad21514..a620c5cd479 100644
--- a/src/shared/components/query/QuickSelectButtons.tsx
+++ b/src/shared/components/query/QuickSelectButtons.tsx
@@ -1,38 +1,51 @@
-import * as React from "react";
-import * as _ from "lodash";
-import {observer} from "mobx-react";
-import {CategorizedConfigItems} from "../../../config/IAppConfig";
-import {DefaultTooltip} from "cbioportal-frontend-commons";
-
+import * as React from 'react';
+import * as _ from 'lodash';
+import { observer } from 'mobx-react';
+import { CategorizedConfigItems } from '../../../config/IAppConfig';
+import { DefaultTooltip } from 'cbioportal-frontend-commons';
 
 @observer
-export default class QuickSelectButtons extends React.Component<{ buttonsConfig:CategorizedConfigItems, onSelect:(studyIds:string[])=>void }, {}> {
-
-    render(){
-
-        return (<div>Quick select:&nbsp;
-            {
-            _.map(this.props.buttonsConfig,(values, name)=>{
-
-                const [buttonText,tooltipText] = name.split("|");
-
-                const buttonEl = <button data-test="selectPanCan"
-                                         className={"btn btn-default btn-xs"}
-                                         onClick={()=>this.props.onSelect(values)}>
-                    {buttonText}
-                </button>;
-
-                const tooltipEl = <span style = {{display: "inline-block", width: "300px"}}>{tooltipText||""}</span>
-
-                return (tooltipText) ?
-                    <DefaultTooltip overlay={tooltipEl}>{buttonEl}</DefaultTooltip> : buttonEl;
-            })
-        }
-        </div>
+export default class QuickSelectButtons extends React.Component<
+    {
+        buttonsConfig: CategorizedConfigItems;
+        onSelect: (studyIds: string[]) => void;
+    },
+    {}
+> {
+    render() {
+        return (
+            <div>
+                Quick select:&nbsp;
+                {_.map(this.props.buttonsConfig, (values, name) => {
+                    const [buttonText, tooltipText] = name.split('|');
+
+                    const buttonEl = (
+                        <button
+                            data-test="selectPanCan"
+                            className={'btn btn-default btn-xs'}
+                            onClick={() => this.props.onSelect(values)}
+                        >
+                            {buttonText}
+                        </button>
+                    );
+
+                    const tooltipEl = (
+                        <span
+                            style={{ display: 'inline-block', width: '300px' }}
+                        >
+                            {tooltipText || ''}
+                        </span>
+                    );
+
+                    return tooltipText ? (
+                        <DefaultTooltip overlay={tooltipEl}>
+                            {buttonEl}
+                        </DefaultTooltip>
+                    ) : (
+                        buttonEl
+                    );
+                })}
+            </div>
         );
-
-
     }
-
-
-}
\ No newline at end of file
+}
diff --git a/src/shared/components/query/StudyListLogic.ts b/src/shared/components/query/StudyListLogic.ts
index a21f52dba5e..3594cc7421c 100644
--- a/src/shared/components/query/StudyListLogic.ts
+++ b/src/shared/components/query/StudyListLogic.ts
@@ -1,19 +1,28 @@
 import * as _ from 'lodash';
-import {CancerTreeNode, CancerTypeWithVisibility} from "./CancerStudyTreeData";
-import {NodeMetadata} from "./CancerStudyTreeData";
-import {TypeOfCancer as CancerType, CancerStudy} from "../../api/generated/CBioPortalAPI";
-import {QueryStore} from "./QueryStore";
-import {computed, action} from "mobx";
-import {parse_search_query, perform_search_single, SearchResult} from "../../lib/textQueryUtils";
-import {cached} from 'mobxpromise';
-import {ServerConfigHelpers} from "../../../config/config";
-import memoize from "memoize-weak-decorator";
-
-export const PAN_CAN_SIGNATURE = "pan_can_atlas";
+import {
+    CancerTreeNode,
+    CancerTypeWithVisibility,
+} from './CancerStudyTreeData';
+import { NodeMetadata } from './CancerStudyTreeData';
+import {
+    TypeOfCancer as CancerType,
+    CancerStudy,
+} from '../../api/generated/CBioPortalAPI';
+import { QueryStore } from './QueryStore';
+import { computed, action } from 'mobx';
+import {
+    parse_search_query,
+    perform_search_single,
+    SearchResult,
+} from '../../lib/textQueryUtils';
+import { cached } from 'mobxpromise';
+import { ServerConfigHelpers } from '../../../config/config';
+import memoize from 'memoize-weak-decorator';
+
+export const PAN_CAN_SIGNATURE = 'pan_can_atlas';
 
 export default class StudyListLogic {
-    constructor(private readonly store: QueryStore) {
-    }
+    constructor(private readonly store: QueryStore) {}
 
     @cached get map_node_filterByDepth() {
         let map_node_filter = new Map<CancerTreeNode, boolean>();
@@ -21,7 +30,11 @@ export default class StudyListLogic {
             let filter = true;
             if (meta.isCancerType) {
                 // exclude cancer types with no descendant studies or cancer types beyond max depth and not always visible
-                if (!meta.descendantStudies.length || (meta.ancestors.length > this.store.maxTreeDepth && !(node as CancerTypeWithVisibility).alwaysVisible)) {
+                if (
+                    !meta.descendantStudies.length ||
+                    (meta.ancestors.length > this.store.maxTreeDepth &&
+                        !(node as CancerTypeWithVisibility).alwaysVisible)
+                ) {
                     filter = false;
                 }
             }
@@ -38,18 +51,26 @@ export default class StudyListLogic {
         for (let [node, meta] of this.store.treeData.map_node_meta.entries()) {
             let searchTerms = meta.searchTerms;
             if (node.hasOwnProperty('studyId')) {
-                searchTerms += (node as CancerStudy).studyId ? (node as CancerStudy).studyId : "";
+                searchTerms += (node as CancerStudy).studyId
+                    ? (node as CancerStudy).studyId
+                    : '';
             }
-            map_node_searchResult.set(node, perform_search_single(parsedQuery, searchTerms));
+            map_node_searchResult.set(
+                node,
+                perform_search_single(parsedQuery, searchTerms)
+            );
         }
 
         let map_node_filter = new Map<CancerTreeNode, boolean>();
         for (let [node, meta] of this.store.treeData.map_node_meta.entries()) {
-            if (map_node_filter.has(node))
-                continue;
+            if (map_node_filter.has(node)) continue;
 
             let filter = false;
-            for (let item of [node, ...meta.ancestors, ...meta.priorityCategories]) {
+            for (let item of [
+                node,
+                ...meta.ancestors,
+                ...meta.priorityCategories,
+            ]) {
                 let result = map_node_searchResult.get(item) as SearchResult;
                 if (!result.match && result.forced) {
                     filter = false;
@@ -61,7 +82,10 @@ export default class StudyListLogic {
 
             // include ancestors of matching studies
             if (filter && !meta.isCancerType)
-                for (let cancerTypes of [meta.ancestors, meta.priorityCategories])
+                for (let cancerTypes of [
+                    meta.ancestors,
+                    meta.priorityCategories,
+                ])
                     for (let cancerType of cancerTypes)
                         map_node_filter.set(cancerType, true);
         }
@@ -76,12 +100,14 @@ export default class StudyListLogic {
 
                 // include selected cancerType and related nodes
                 map_node_filter.set(cancerType, true);
-                for (let nodes of [meta.ancestors, meta.descendantCancerTypes, meta.descendantStudies])
-                    for (let node of nodes)
-                        map_node_filter.set(node, true);
+                for (let nodes of [
+                    meta.ancestors,
+                    meta.descendantCancerTypes,
+                    meta.descendantStudies,
+                ])
+                    for (let node of nodes) map_node_filter.set(node, true);
             }
-        }
-        else {
+        } else {
             // include everything if no cancer types are selected
             for (let node of this.store.treeData.map_node_meta.keys())
                 map_node_filter.set(node, true);
@@ -93,13 +119,18 @@ export default class StudyListLogic {
         let map_node_filter = new Map<CancerTreeNode, boolean>();
         if (this.store.selectableSelectedStudies.length) {
             for (let study of this.store.selectableSelectedStudies) {
-                let meta = this.store.treeData.map_node_meta.get(study) as NodeMetadata;
+                let meta = this.store.treeData.map_node_meta.get(
+                    study
+                ) as NodeMetadata;
 
                 // include selected study and related nodes
                 map_node_filter.set(study, true);
-                for (let nodes of [meta.descendantStudies, meta.ancestors, meta.priorityCategories])
-                    for (let node of nodes)
-                        map_node_filter.set(node, true);
+                for (let nodes of [
+                    meta.descendantStudies,
+                    meta.ancestors,
+                    meta.priorityCategories,
+                ])
+                    for (let node of nodes) map_node_filter.set(node, true);
             }
         }
         return map_node_filter;
@@ -110,40 +141,39 @@ export default class StudyListLogic {
     }
 
     @computed get mainView() {
-        return new FilteredCancerTreeView(
-            this.store,
-            [
-                this.map_node_filterByDepth,
-                this.map_node_filterBySearchText,
-                this.map_node_filterBySelectedCancerTypes
-            ]
-        );
+        return new FilteredCancerTreeView(this.store, [
+            this.map_node_filterByDepth,
+            this.map_node_filterBySearchText,
+            this.map_node_filterBySelectedCancerTypes,
+        ]);
     }
 
     @computed get cancerTypeListView() {
-        return new FilteredCancerTreeView(
-            this.store,
-            [
-                this.map_node_filterByDepth,
-                this.map_node_filterBySearchText
-            ]
-        );
+        return new FilteredCancerTreeView(this.store, [
+            this.map_node_filterByDepth,
+            this.map_node_filterBySearchText,
+        ]);
     }
 
     @computed get selectedStudiesView() {
-        return new FilteredCancerTreeView(
-            this.store,
-            [
-                this.map_node_filterByDepth,
-                this.map_node_filterBySelectedStudies,
-                {get: (node: CancerTreeNode) => !this.getMetadata(node).isPriorityCategory}
-            ]
-        );
+        return new FilteredCancerTreeView(this.store, [
+            this.map_node_filterByDepth,
+            this.map_node_filterBySelectedStudies,
+            {
+                get: (node: CancerTreeNode) =>
+                    !this.getMetadata(node).isPriorityCategory,
+            },
+        ]);
     }
 
     cancerTypeContainsSelectedStudies(cancerType: CancerType): boolean {
         let descendantStudies = this.getMetadata(cancerType).descendantStudies;
-        return _.intersection(this.store.selectableSelectedStudies, descendantStudies).length > 0;
+        return (
+            _.intersection(
+                this.store.selectableSelectedStudies,
+                descendantStudies
+            ).length > 0
+        );
     }
 
     getDepth(node: CancerType): number {
@@ -152,7 +182,10 @@ export default class StudyListLogic {
     }
 
     isHighlighted(node: CancerTreeNode): boolean {
-        return !!this.store.searchText && !!this.map_node_filterBySearchText.get(node);
+        return (
+            !!this.store.searchText &&
+            !!this.map_node_filterBySearchText.get(node)
+        );
     }
 }
 
@@ -160,8 +193,7 @@ export class FilteredCancerTreeView {
     constructor(
         private store: QueryStore,
         private filters: Pick<Map<CancerTreeNode, boolean>, 'get'>[]
-    ) {
-    }
+    ) {}
 
     nodeFilter = (node: CancerTreeNode): boolean => {
         return this.filters.every(map => !!map.get(node));
@@ -171,9 +203,16 @@ export class FilteredCancerTreeView {
         return this.store.treeData.map_node_meta.get(node) as NodeMetadata;
     }
 
-    getChildCancerTypes(cancerType: CancerTypeWithVisibility, ignoreAlwaysVisible?:boolean): CancerTypeWithVisibility[] {
+    getChildCancerTypes(
+        cancerType: CancerTypeWithVisibility,
+        ignoreAlwaysVisible?: boolean
+    ): CancerTypeWithVisibility[] {
         let meta = this.getMetadata(cancerType);
-        const childTypes = (meta.ancestors.length < this.store.maxTreeDepth) || !ignoreAlwaysVisible && cancerType.alwaysVisible ? meta.childCancerTypes : [];
+        const childTypes =
+            meta.ancestors.length < this.store.maxTreeDepth ||
+            (!ignoreAlwaysVisible && cancerType.alwaysVisible)
+                ? meta.childCancerTypes
+                : [];
         return childTypes.filter(this.nodeFilter);
     }
 
@@ -186,11 +225,23 @@ export class FilteredCancerTreeView {
             studies = meta.descendantStudies;
             //filter studies that are already shown under cancer type group
             if (cancerType.alwaysVisible) {
-                let hideStudiesWithCancerTypes = _.chain(meta.descendantCancerTypes)
-                    .filter(descendantCancerType => descendantCancerType.alwaysVisible)
-                    .map(descendantCancerType => descendantCancerType.cancerTypeId)
+                let hideStudiesWithCancerTypes = _.chain(
+                    meta.descendantCancerTypes
+                )
+                    .filter(
+                        descendantCancerType =>
+                            descendantCancerType.alwaysVisible
+                    )
+                    .map(
+                        descendantCancerType =>
+                            descendantCancerType.cancerTypeId
+                    )
                     .value();
-                studies = _.filter(studies, study => !hideStudiesWithCancerTypes.includes(study.cancerTypeId));
+                studies = _.filter(
+                    studies,
+                    study =>
+                        !hideStudiesWithCancerTypes.includes(study.cancerTypeId)
+                );
             }
         }
         return studies.filter(this.nodeFilter);
@@ -201,23 +252,37 @@ export class FilteredCancerTreeView {
         return meta.descendantStudies.filter(this.nodeFilter);
     }
 
-    getCheckboxProps(node: CancerTreeNode): { checked: boolean, indeterminate?: boolean, disabled?: boolean } {
+    getCheckboxProps(
+        node: CancerTreeNode
+    ): { checked: boolean; indeterminate?: boolean; disabled?: boolean } {
         let meta = this.getMetadata(node);
         if (meta.isCancerType) {
-            let selectableSelectedStudyIds = this.store.selectableSelectedStudyIds || [];
-            let selectedStudies = selectableSelectedStudyIds.map(studyId => this.store.treeData.map_studyId_cancerStudy.get(studyId) as CancerStudy);
+            let selectableSelectedStudyIds =
+                this.store.selectableSelectedStudyIds || [];
+            let selectedStudies = selectableSelectedStudyIds.map(
+                studyId =>
+                    this.store.treeData.map_studyId_cancerStudy.get(
+                        studyId
+                    ) as CancerStudy
+            );
             let shownStudies = this.getDescendantCancerStudies(node);
-            let shownAndSelectedStudies = _.intersection(shownStudies, selectedStudies);
+            let shownAndSelectedStudies = _.intersection(
+                shownStudies,
+                selectedStudies
+            );
             let checked = shownAndSelectedStudies.length > 0;
-            let indeterminate = checked && shownAndSelectedStudies.length != shownStudies.length;
+            let indeterminate =
+                checked &&
+                shownAndSelectedStudies.length != shownStudies.length;
 
-            return {checked, indeterminate};
-        }
-        else {
+            return { checked, indeterminate };
+        } else {
             let study = node as CancerStudy;
-            let checked = !!this.store.selectableSelectedStudyIds.find(id => id == study.studyId);
+            let checked = !!this.store.selectableSelectedStudyIds.find(
+                id => id == study.studyId
+            );
             let disabled = this.store.isDeletedVirtualStudy(study.studyId);
-            return {checked, disabled};
+            return { checked, disabled };
         }
     }
 
@@ -225,31 +290,29 @@ export class FilteredCancerTreeView {
         let meta = this.getMetadata(node);
         if (meta.isCancerType) {
             return false;
-        }
-        else {
+        } else {
             let study = node as CancerStudy;
             if (this.store.isDeletedVirtualStudy(study.studyId)) {
                 return true;
             }
             return false;
         }
-
     }
 
     @action clearAllSelection(): void {
         this.store.selectableSelectedStudyIds = [];
     }
 
-
     @action onCheck(node: CancerTreeNode, checked: boolean): void {
         let clickedStudyIds;
         let meta = this.getMetadata(node);
 
         if (meta.isCancerType) {
             if (!this.store.forDownloadTab)
-                clickedStudyIds = this.getDescendantCancerStudies(node).map(study => study.studyId);
-        }
-        else {
+                clickedStudyIds = this.getDescendantCancerStudies(node).map(
+                    study => study.studyId
+                );
+        } else {
             clickedStudyIds = [(node as CancerStudy).studyId];
         }
 
@@ -258,31 +321,45 @@ export class FilteredCancerTreeView {
     }
 
     getSelectionReport() {
-
-        let selectableSelectedStudyIds = this.store.selectableSelectedStudyIds || [];
-        let selectableSelectedStudies = selectableSelectedStudyIds.map(studyId => this.store.treeData.map_studyId_cancerStudy.get(studyId) as CancerStudy);
-        let shownStudies = this.getDescendantCancerStudies(this.store.treeData.rootCancerType);
-        let shownAndSelectedStudies = _.intersection(shownStudies, selectableSelectedStudies) as CancerStudy[];
+        let selectableSelectedStudyIds =
+            this.store.selectableSelectedStudyIds || [];
+        let selectableSelectedStudies = selectableSelectedStudyIds.map(
+            studyId =>
+                this.store.treeData.map_studyId_cancerStudy.get(
+                    studyId
+                ) as CancerStudy
+        );
+        let shownStudies = this.getDescendantCancerStudies(
+            this.store.treeData.rootCancerType
+        );
+        let shownAndSelectedStudies = _.intersection(
+            shownStudies,
+            selectableSelectedStudies
+        ) as CancerStudy[];
 
         return {
             selectableSelectedStudyIds,
             selectableSelectedStudies,
             shownStudies,
-            shownAndSelectedStudies
+            shownAndSelectedStudies,
         };
-
     }
 
     @computed get isFiltered() {
-        return this.store.selectedCancerTypeIds.length > 0 || this.store.searchText.length > 0;
+        return (
+            this.store.selectedCancerTypeIds.length > 0 ||
+            this.store.searchText.length > 0
+        );
     }
 
     // this is temporary until we can better configure quick selection
     // if there are pan can studies and there is no filtering, we want to show quick select button
-    @memoize quickSelectButtons(quick_select_buttons:string|null) {
+    @memoize quickSelectButtons(quick_select_buttons: string | null) {
         if (quick_select_buttons) {
             try {
-                return ServerConfigHelpers.parseConfigFormat(quick_select_buttons);
+                return ServerConfigHelpers.parseConfigFormat(
+                    quick_select_buttons
+                );
             } catch (ex) {
                 return {};
             }
@@ -292,26 +369,42 @@ export class FilteredCancerTreeView {
     }
 
     @action toggleAllFiltered() {
-
-        const {selectableSelectedStudyIds, selectableSelectedStudies, shownStudies, shownAndSelectedStudies} = this.getSelectionReport();
+        const {
+            selectableSelectedStudyIds,
+            selectableSelectedStudies,
+            shownStudies,
+            shownAndSelectedStudies,
+        } = this.getSelectionReport();
 
         let updatedSelectableSelectedStudyIds: string[] = [];
-        if (shownStudies.length === shownAndSelectedStudies.length) { // deselect
-            updatedSelectableSelectedStudyIds = _.without(this.store.selectableSelectedStudyIds, ... shownStudies.map((study: CancerStudy) => study.studyId));
+        if (shownStudies.length === shownAndSelectedStudies.length) {
+            // deselect
+            updatedSelectableSelectedStudyIds = _.without(
+                this.store.selectableSelectedStudyIds,
+                ...shownStudies.map((study: CancerStudy) => study.studyId)
+            );
         } else {
-            updatedSelectableSelectedStudyIds = _.union(this.store.selectableSelectedStudyIds, shownStudies.map((study: CancerStudy) => study.studyId));
+            updatedSelectableSelectedStudyIds = _.union(
+                this.store.selectableSelectedStudyIds,
+                shownStudies.map((study: CancerStudy) => study.studyId)
+            );
         }
 
-        this.store.selectableSelectedStudyIds = updatedSelectableSelectedStudyIds.filter(id => !_.includes(this.store.deletedVirtualStudies, id));
-
+        this.store.selectableSelectedStudyIds = updatedSelectableSelectedStudyIds.filter(
+            id => !_.includes(this.store.deletedVirtualStudies, id)
+        );
     }
 
-    @action selectAllMatchingStudies(match: string|string[]) {
-
-        const {selectableSelectedStudyIds, selectableSelectedStudies, shownStudies, shownAndSelectedStudies} = this.getSelectionReport();
+    @action selectAllMatchingStudies(match: string | string[]) {
+        const {
+            selectableSelectedStudyIds,
+            selectableSelectedStudies,
+            shownStudies,
+            shownAndSelectedStudies,
+        } = this.getSelectionReport();
         this.store.selectableSelectedStudyIds = shownStudies
-            .map((study) => study.studyId)
-            .filter((studyId) => {
+            .map(study => study.studyId)
+            .filter(studyId => {
                 if (_.isArray(match)) {
                     return match.includes(studyId);
                 } else {
@@ -320,13 +413,24 @@ export class FilteredCancerTreeView {
             });
     }
 
-    private handleCheckboxStudyIds(clickedStudyIds: string[], checked: boolean) {
+    private handleCheckboxStudyIds(
+        clickedStudyIds: string[],
+        checked: boolean
+    ) {
         let selectableSelectedStudyIds = this.store.selectableSelectedStudyIds;
         if (checked)
-            selectableSelectedStudyIds = _.union(selectableSelectedStudyIds, clickedStudyIds);
+            selectableSelectedStudyIds = _.union(
+                selectableSelectedStudyIds,
+                clickedStudyIds
+            );
         else
-            selectableSelectedStudyIds = _.difference(selectableSelectedStudyIds, clickedStudyIds);
+            selectableSelectedStudyIds = _.difference(
+                selectableSelectedStudyIds,
+                clickedStudyIds
+            );
 
-        this.store.selectableSelectedStudyIds = selectableSelectedStudyIds.filter(id => !_.includes(this.store.deletedVirtualStudies, id));
+        this.store.selectableSelectedStudyIds = selectableSelectedStudyIds.filter(
+            id => !_.includes(this.store.deletedVirtualStudies, id)
+        );
     }
 }
diff --git a/src/shared/components/query/StudySelectorStats.tsx b/src/shared/components/query/StudySelectorStats.tsx
index 48f07c473ad..49ed0fe2e1e 100644
--- a/src/shared/components/query/StudySelectorStats.tsx
+++ b/src/shared/components/query/StudySelectorStats.tsx
@@ -1,40 +1,63 @@
-import * as React from "react";
-import {QueryStore} from "shared/components/query/QueryStore";
-import {Observer, observer} from "mobx-react";
-import {expr} from "mobx";
-import LoadingIndicator from "shared/components/loadingIndicator/LoadingIndicator";
+import * as React from 'react';
+import { QueryStore } from 'shared/components/query/QueryStore';
+import { Observer, observer } from 'mobx-react';
+import { expr } from 'mobx';
+import LoadingIndicator from 'shared/components/loadingIndicator/LoadingIndicator';
 
-export const StudySelectorStats: React.FunctionComponent<{ store:QueryStore }> = observer((props) => {
-    if (!props.store.cancerTypes.isPending && !props.store.cancerStudies.isPending && !props.store.profiledSamplesCount.isPending) {
-        return (<Observer>
-            {() => {
-                let numSelectedStudies = expr(() => props.store.selectableSelectedStudyIds.length);
-                return (
-                    <>
-                        <a
-                            onClick={() => {
-                                if (numSelectedStudies)
-                                    props.store.showSelectedStudiesOnly = !props.store.showSelectedStudiesOnly;
-                            }}
-                        >
-                            <b>{numSelectedStudies}</b> {numSelectedStudies === 1 ? 'study' : 'studies'} selected
-                            (<b>{props.store.profiledSamplesCount.result.all}</b> samples)
-                        </a>
-                        {
-
-                            (props.store.selectableSelectedStudies.length > 0) && (
-                                <a data-test='globalDeselectAllStudiesButton' style={{marginLeft: 10}}
-                                   onClick={()=>props.store.studyListLogic.mainView.clearAllSelection()}>
+export const StudySelectorStats: React.FunctionComponent<{
+    store: QueryStore;
+}> = observer(props => {
+    if (
+        !props.store.cancerTypes.isPending &&
+        !props.store.cancerStudies.isPending &&
+        !props.store.profiledSamplesCount.isPending
+    ) {
+        return (
+            <Observer>
+                {() => {
+                    let numSelectedStudies = expr(
+                        () => props.store.selectableSelectedStudyIds.length
+                    );
+                    return (
+                        <>
+                            <a
+                                onClick={() => {
+                                    if (numSelectedStudies)
+                                        props.store.showSelectedStudiesOnly = !props
+                                            .store.showSelectedStudiesOnly;
+                                }}
+                            >
+                                <b>{numSelectedStudies}</b>{' '}
+                                {numSelectedStudies === 1 ? 'study' : 'studies'}{' '}
+                                selected (
+                                <b>
+                                    {
+                                        props.store.profiledSamplesCount.result
+                                            .all
+                                    }
+                                </b>{' '}
+                                samples)
+                            </a>
+                            {props.store.selectableSelectedStudies.length >
+                                0 && (
+                                <a
+                                    data-test="globalDeselectAllStudiesButton"
+                                    style={{ marginLeft: 10 }}
+                                    onClick={() =>
+                                        props.store.studyListLogic.mainView.clearAllSelection()
+                                    }
+                                >
                                     Deselect all
                                 </a>
-                            )
-                        }
-                    </>
-                );
-            }}
-        </Observer>);
+                            )}
+                        </>
+                    );
+                }}
+            </Observer>
+        );
     } else {
-        return <LoadingIndicator isLoading={true} size={"small"} center={false} />;
+        return (
+            <LoadingIndicator isLoading={true} size={'small'} center={false} />
+        );
     }
-
 });
diff --git a/src/shared/components/query/gene_lists.ts b/src/shared/components/query/gene_lists.ts
index d0f537a456e..4b994ed3fdb 100644
--- a/src/shared/components/query/gene_lists.ts
+++ b/src/shared/components/query/gene_lists.ts
@@ -1,77 +1,513 @@
-const gene_lists = [{
-	"id": "Prostate Cancer: AR Signaling",
-	"genes": ["SOX9", "RAN", "TNK2", "EP300", "PXN", "NCOA2", "AR", "NRIP1", "NCOR1", "NCOR2"]
-}, {
-	"id": "Prostate Cancer: AR and steroid synthesis enzymes",
-	"genes": ["AKR1C3", "AR", "CYB5A", "CYP11A1", "CYP11B1", "CYP11B2", "CYP17A1", "CYP19A1", "CYP21A2", "HSD17B1", "HSD17B10", "HSD17B11", "HSD17B12", "HSD17B13", "HSD17B14", "HSD17B2", "HSD17B3", "HSD17B4", "HSD17B6", "HSD17B7", "HSD17B8", "HSD3B1", "HSD3B2", "HSD3B7", "RDH5", "SHBG", "SRD5A1", "SRD5A2", "SRD5A3", "STAR"]
-}, {
-	"id": "Prostate Cancer: Steroid inactivating genes",
-	"genes": ["AKR1C1", "AKR1C2", "AKR1C4", "CYP3A4", "CYP3A43", "CYP3A5", "CYP3A7", "UGT2B15", "UGT2B17", "UGT2B7"]
-}, {
-	"id": "Prostate Cancer: Down-regulated by androgen",
-	"genes": ["BCHE", "CDK8", "CTBP1", "ACKR3", "DDC", "DPH1", "FN1", "HES6", "MMP16", "MYC", "PEG3", "PIK3R3", "PRKD1", "SCNN1A", "SDC4", "SERPINI1", "SLC29A1", "ST7", "TULP4"]
-}, {
-	"id": "Glioblastoma: TP53 Pathway",
-	"genes": ["CDKN2A", "MDM2", "MDM4", "TP53"]
-}, {
-	"id": "Glioblastoma: RTK/Ras/PI3K/AKT Signaling",
-	"genes": ["EGFR", "ERBB2", "PDGFRA", "MET", "KRAS", "NRAS", "HRAS", "NF1", "SPRY2", "FOXO1", "FOXO3", "AKT1", "AKT2", "AKT3", "PIK3R1", "PIK3CA", "PTEN"]
-}, {
-	"id": "Glioblastoma: RB Pathway",
-	"genes": ["CDKN2A", "CDKN2B", "CDKN2C", "CDK4", "CDK6", "CCND2", "RB1"]
-}, {
-	"id": "Ovarian Cancer: Oncogenes associated with epithelial ovarian cancer",
-	"genes": ["RAB25", "MECOM", "EIF5A2", "PRKCI", "PIK3CA", "KIT", "FGF1", "MYC", "EGFR", "NOTCH3", "KRAS", "AKT1", "ERBB2", "PIK3R1", "CCNE1", "AKT2", "AURKA"]
-}, {
-	"id": "Ovarian Cancer: Putative tumor-suppressor genes in epithelial ovarian cancer",
-	"genes": ["DIRAS3", "RASSF1", "DLEC1", "SPARC", "DAB2", "PLAGL1", "RPS6KA2", "PTEN", "OPCML", "BRCA2", "ARL11", "WWOX", "TP53", "DPH1", "BRCA1", "PEG3"]
-}, {
-	"id": "General: Cell Cycle Control",
-	"genes": ["RB1", "RBL1", "RBL2", "CCNA1", "CCNB1", "CDK1", "CCNE1", "CDK2", "CDC25A", "CCND1", "CDK4", "CDK6", "CCND2", "CDKN2A", "CDKN2B", "MYC", "CDKN1A", "CDKN1B", "E2F1", "E2F2", "E2F3", "E2F4", "E2F5", "E2F6", "E2F7", "E2F8", "SRC", "JAK1", "JAK2", "STAT1", "STAT2", "STAT3", "STAT5A", "STAT5B"]
-}, {
-	"id": "General: p53 signaling",
-	"genes": ["TP53", "MDM2", "MDM4", "CDKN2A", "CDKN2B", "TP53BP1"]
-}, {
-	"id": "General: Notch signaling",
-	"genes": ["ADAM10", "ADAM17", "APH1A", "APH1B", "ARRDC1", "CIR1", "CTBP1", "CTBP2", "CUL1", "DLL1", "DLL3", "DLL4", "DTX1", "DTX2", "DTX3", "DTX3L", "DTX4", "EP300", "FBXW7", "HDAC1", "HDAC2", "HES1", "HES5", "HEYL", "ITCH", "JAG1", "JAG2", "KDM5A", "LFNG", "MAML1", "MAML2", "MAML3", "MFNG", "NCOR2", "NCSTN", "NOTCH1", "NOTCH2", "NOTCH3", "NOTCH4", "NRARP", "NUMB", "NUMBL", "PSEN1", "PSEN2", "PSENEN", "RBPJ", "RBPJL", "RFNG", "SNW1", "SPEN", "HES2", "HES4", "HES7", "HEY1", "HEY2"]
-}, {
-	"id": "General: DNA Damage Response",
-	"genes": ["CHEK1", "CHEK2", "RAD51", "BRCA1", "BRCA2", "MLH1", "MSH2", "ATM", "ATR", "MDC1", "PARP1", "FANCF"]
-}, {
-	"id": "General: Other growth / proliferation signaling",
-	"genes": ["CSF1", "CSF1R", "IGF1", "IGF1R", "FGF1", "FGFR1", "AURKA", "DLEC1", "PLAGL1", "OPCML", "DPH1"]
-}, {
-	"id": "General: Survival / cell death regulation signaling",
-	"genes": ["NFKB1", "NFKB2", "CHUK", "DIRAS3", "FAS", "HLA-G", "BAD", "BCL2", "BCL2L1", "APAF1", "CASP9", "CASP8", "CASP10", "CASP3", "CASP6", "CASP7", "GSK3B", "ARL11", "WWOX", "PEG3", "TGFB1", "TGFBR1", "TGFBR2"]
-}, {
-	"id": "General: Telomere maintenance",
-	"genes": ["TERC", "TERT"]
-}, {
-	"id": "General: RTK signaling family",
-	"genes": ["EGFR", "ERBB2", "ERBB3", "ERBB4", "PDGFA", "PDGFB", "PDGFRA", "PDGFRB", "KIT", "FGF1", "FGFR1", "IGF1", "IGF1R", "VEGFA", "VEGFB", "KDR"]
-}, {
-	"id": "General: PI3K-AKT-mTOR signaling",
-	"genes": ["PIK3CA", "PIK3R1", "PIK3R2", "PTEN", "PDPK1", "AKT1", "AKT2", "FOXO1", "FOXO3", "MTOR", "RICTOR", "TSC1", "TSC2", "RHEB", "AKT1S1", "RPTOR", "MLST8"]
-}, {
-	"id": "General: Ras-Raf-MEK-Erk/JNK signaling",
-	"genes": ["KRAS", "HRAS", "BRAF", "RAF1", "MAP3K1", "MAP3K2", "MAP3K3", "MAP3K4", "MAP3K5", "MAP2K1", "MAP2K2", "MAP2K3", "MAP2K4", "MAP2K5", "MAPK1", "MAPK3", "MAPK4", "MAPK6", "MAPK7", "MAPK8", "MAPK9", "MAPK12", "MAPK14", "DAB2", "RASSF1", "RAB25"]
-}, {
-	"id": "General: Regulation of ribosomal protein synthesis and cell growth",
-	"genes": ["RPS6KA1", "RPS6KA2", "RPS6KB1", "RPS6KB2", "EIF5A2", "EIF4E", "EIF4EBP1", "RPS6", "HIF1A"]
-}, {
-	"id": "General: Angiogenesis",
-	"genes": ["VEGFA", "VEGFB", "KDR", "CXCL8", "CXCR1", "CXCR2"]
-}, {
-	"id": "General: Folate transport",
-	"genes": ["SLC19A1", "FOLR1", "FOLR2", "FOLR3", "IZUMO1R"]
-}, {
-	"id": "General: Invasion and metastasis",
-	"genes": ["MMP1", "MMP2", "MMP3", "MMP7", "MMP9", "MMP10", "MMP11", "MMP12", "MMP13", "MMP14", "MMP15", "MMP16", "MMP17", "MMP19", "MMP21", "MMP23B", "MMP24", "MMP25", "MMP26", "MMP27", "MMP28", "ITGB3", "ITGAV", "PTK2", "CDH1", "SPARC", "WFDC2"]
-}, {
-	"id":"General: TGF-β Pathway",
-    "genes":["TGFB1","TGFB2","TGFB3","TGFBR1","TGFBR2","TGFBR3","BMP2","BMP3","BMP4","BMP5","BMP6","BMP7","GDF2","BMP10","BMP15","BMPR1A","BMPR1B","BMPR2","ACVR1","ACVR1B","ACVR1C","ACVR2A","ACVR2B","ACVRL1","Nodal","GDF1","GDF11","INHA","INHBA","INHBB","INHBC","INHBE","SMAD2","SMAD3","SMAD1","SMAD5","SMAD4","SMAD9","SMAD6","SMAD7","SPTBN1","TGFBRAP1","ZFYVE9"]
-}
-
+const gene_lists = [
+    {
+        id: 'Prostate Cancer: AR Signaling',
+        genes: [
+            'SOX9',
+            'RAN',
+            'TNK2',
+            'EP300',
+            'PXN',
+            'NCOA2',
+            'AR',
+            'NRIP1',
+            'NCOR1',
+            'NCOR2',
+        ],
+    },
+    {
+        id: 'Prostate Cancer: AR and steroid synthesis enzymes',
+        genes: [
+            'AKR1C3',
+            'AR',
+            'CYB5A',
+            'CYP11A1',
+            'CYP11B1',
+            'CYP11B2',
+            'CYP17A1',
+            'CYP19A1',
+            'CYP21A2',
+            'HSD17B1',
+            'HSD17B10',
+            'HSD17B11',
+            'HSD17B12',
+            'HSD17B13',
+            'HSD17B14',
+            'HSD17B2',
+            'HSD17B3',
+            'HSD17B4',
+            'HSD17B6',
+            'HSD17B7',
+            'HSD17B8',
+            'HSD3B1',
+            'HSD3B2',
+            'HSD3B7',
+            'RDH5',
+            'SHBG',
+            'SRD5A1',
+            'SRD5A2',
+            'SRD5A3',
+            'STAR',
+        ],
+    },
+    {
+        id: 'Prostate Cancer: Steroid inactivating genes',
+        genes: [
+            'AKR1C1',
+            'AKR1C2',
+            'AKR1C4',
+            'CYP3A4',
+            'CYP3A43',
+            'CYP3A5',
+            'CYP3A7',
+            'UGT2B15',
+            'UGT2B17',
+            'UGT2B7',
+        ],
+    },
+    {
+        id: 'Prostate Cancer: Down-regulated by androgen',
+        genes: [
+            'BCHE',
+            'CDK8',
+            'CTBP1',
+            'ACKR3',
+            'DDC',
+            'DPH1',
+            'FN1',
+            'HES6',
+            'MMP16',
+            'MYC',
+            'PEG3',
+            'PIK3R3',
+            'PRKD1',
+            'SCNN1A',
+            'SDC4',
+            'SERPINI1',
+            'SLC29A1',
+            'ST7',
+            'TULP4',
+        ],
+    },
+    {
+        id: 'Glioblastoma: TP53 Pathway',
+        genes: ['CDKN2A', 'MDM2', 'MDM4', 'TP53'],
+    },
+    {
+        id: 'Glioblastoma: RTK/Ras/PI3K/AKT Signaling',
+        genes: [
+            'EGFR',
+            'ERBB2',
+            'PDGFRA',
+            'MET',
+            'KRAS',
+            'NRAS',
+            'HRAS',
+            'NF1',
+            'SPRY2',
+            'FOXO1',
+            'FOXO3',
+            'AKT1',
+            'AKT2',
+            'AKT3',
+            'PIK3R1',
+            'PIK3CA',
+            'PTEN',
+        ],
+    },
+    {
+        id: 'Glioblastoma: RB Pathway',
+        genes: ['CDKN2A', 'CDKN2B', 'CDKN2C', 'CDK4', 'CDK6', 'CCND2', 'RB1'],
+    },
+    {
+        id:
+            'Ovarian Cancer: Oncogenes associated with epithelial ovarian cancer',
+        genes: [
+            'RAB25',
+            'MECOM',
+            'EIF5A2',
+            'PRKCI',
+            'PIK3CA',
+            'KIT',
+            'FGF1',
+            'MYC',
+            'EGFR',
+            'NOTCH3',
+            'KRAS',
+            'AKT1',
+            'ERBB2',
+            'PIK3R1',
+            'CCNE1',
+            'AKT2',
+            'AURKA',
+        ],
+    },
+    {
+        id:
+            'Ovarian Cancer: Putative tumor-suppressor genes in epithelial ovarian cancer',
+        genes: [
+            'DIRAS3',
+            'RASSF1',
+            'DLEC1',
+            'SPARC',
+            'DAB2',
+            'PLAGL1',
+            'RPS6KA2',
+            'PTEN',
+            'OPCML',
+            'BRCA2',
+            'ARL11',
+            'WWOX',
+            'TP53',
+            'DPH1',
+            'BRCA1',
+            'PEG3',
+        ],
+    },
+    {
+        id: 'General: Cell Cycle Control',
+        genes: [
+            'RB1',
+            'RBL1',
+            'RBL2',
+            'CCNA1',
+            'CCNB1',
+            'CDK1',
+            'CCNE1',
+            'CDK2',
+            'CDC25A',
+            'CCND1',
+            'CDK4',
+            'CDK6',
+            'CCND2',
+            'CDKN2A',
+            'CDKN2B',
+            'MYC',
+            'CDKN1A',
+            'CDKN1B',
+            'E2F1',
+            'E2F2',
+            'E2F3',
+            'E2F4',
+            'E2F5',
+            'E2F6',
+            'E2F7',
+            'E2F8',
+            'SRC',
+            'JAK1',
+            'JAK2',
+            'STAT1',
+            'STAT2',
+            'STAT3',
+            'STAT5A',
+            'STAT5B',
+        ],
+    },
+    {
+        id: 'General: p53 signaling',
+        genes: ['TP53', 'MDM2', 'MDM4', 'CDKN2A', 'CDKN2B', 'TP53BP1'],
+    },
+    {
+        id: 'General: Notch signaling',
+        genes: [
+            'ADAM10',
+            'ADAM17',
+            'APH1A',
+            'APH1B',
+            'ARRDC1',
+            'CIR1',
+            'CTBP1',
+            'CTBP2',
+            'CUL1',
+            'DLL1',
+            'DLL3',
+            'DLL4',
+            'DTX1',
+            'DTX2',
+            'DTX3',
+            'DTX3L',
+            'DTX4',
+            'EP300',
+            'FBXW7',
+            'HDAC1',
+            'HDAC2',
+            'HES1',
+            'HES5',
+            'HEYL',
+            'ITCH',
+            'JAG1',
+            'JAG2',
+            'KDM5A',
+            'LFNG',
+            'MAML1',
+            'MAML2',
+            'MAML3',
+            'MFNG',
+            'NCOR2',
+            'NCSTN',
+            'NOTCH1',
+            'NOTCH2',
+            'NOTCH3',
+            'NOTCH4',
+            'NRARP',
+            'NUMB',
+            'NUMBL',
+            'PSEN1',
+            'PSEN2',
+            'PSENEN',
+            'RBPJ',
+            'RBPJL',
+            'RFNG',
+            'SNW1',
+            'SPEN',
+            'HES2',
+            'HES4',
+            'HES7',
+            'HEY1',
+            'HEY2',
+        ],
+    },
+    {
+        id: 'General: DNA Damage Response',
+        genes: [
+            'CHEK1',
+            'CHEK2',
+            'RAD51',
+            'BRCA1',
+            'BRCA2',
+            'MLH1',
+            'MSH2',
+            'ATM',
+            'ATR',
+            'MDC1',
+            'PARP1',
+            'FANCF',
+        ],
+    },
+    {
+        id: 'General: Other growth / proliferation signaling',
+        genes: [
+            'CSF1',
+            'CSF1R',
+            'IGF1',
+            'IGF1R',
+            'FGF1',
+            'FGFR1',
+            'AURKA',
+            'DLEC1',
+            'PLAGL1',
+            'OPCML',
+            'DPH1',
+        ],
+    },
+    {
+        id: 'General: Survival / cell death regulation signaling',
+        genes: [
+            'NFKB1',
+            'NFKB2',
+            'CHUK',
+            'DIRAS3',
+            'FAS',
+            'HLA-G',
+            'BAD',
+            'BCL2',
+            'BCL2L1',
+            'APAF1',
+            'CASP9',
+            'CASP8',
+            'CASP10',
+            'CASP3',
+            'CASP6',
+            'CASP7',
+            'GSK3B',
+            'ARL11',
+            'WWOX',
+            'PEG3',
+            'TGFB1',
+            'TGFBR1',
+            'TGFBR2',
+        ],
+    },
+    {
+        id: 'General: Telomere maintenance',
+        genes: ['TERC', 'TERT'],
+    },
+    {
+        id: 'General: RTK signaling family',
+        genes: [
+            'EGFR',
+            'ERBB2',
+            'ERBB3',
+            'ERBB4',
+            'PDGFA',
+            'PDGFB',
+            'PDGFRA',
+            'PDGFRB',
+            'KIT',
+            'FGF1',
+            'FGFR1',
+            'IGF1',
+            'IGF1R',
+            'VEGFA',
+            'VEGFB',
+            'KDR',
+        ],
+    },
+    {
+        id: 'General: PI3K-AKT-mTOR signaling',
+        genes: [
+            'PIK3CA',
+            'PIK3R1',
+            'PIK3R2',
+            'PTEN',
+            'PDPK1',
+            'AKT1',
+            'AKT2',
+            'FOXO1',
+            'FOXO3',
+            'MTOR',
+            'RICTOR',
+            'TSC1',
+            'TSC2',
+            'RHEB',
+            'AKT1S1',
+            'RPTOR',
+            'MLST8',
+        ],
+    },
+    {
+        id: 'General: Ras-Raf-MEK-Erk/JNK signaling',
+        genes: [
+            'KRAS',
+            'HRAS',
+            'BRAF',
+            'RAF1',
+            'MAP3K1',
+            'MAP3K2',
+            'MAP3K3',
+            'MAP3K4',
+            'MAP3K5',
+            'MAP2K1',
+            'MAP2K2',
+            'MAP2K3',
+            'MAP2K4',
+            'MAP2K5',
+            'MAPK1',
+            'MAPK3',
+            'MAPK4',
+            'MAPK6',
+            'MAPK7',
+            'MAPK8',
+            'MAPK9',
+            'MAPK12',
+            'MAPK14',
+            'DAB2',
+            'RASSF1',
+            'RAB25',
+        ],
+    },
+    {
+        id:
+            'General: Regulation of ribosomal protein synthesis and cell growth',
+        genes: [
+            'RPS6KA1',
+            'RPS6KA2',
+            'RPS6KB1',
+            'RPS6KB2',
+            'EIF5A2',
+            'EIF4E',
+            'EIF4EBP1',
+            'RPS6',
+            'HIF1A',
+        ],
+    },
+    {
+        id: 'General: Angiogenesis',
+        genes: ['VEGFA', 'VEGFB', 'KDR', 'CXCL8', 'CXCR1', 'CXCR2'],
+    },
+    {
+        id: 'General: Folate transport',
+        genes: ['SLC19A1', 'FOLR1', 'FOLR2', 'FOLR3', 'IZUMO1R'],
+    },
+    {
+        id: 'General: Invasion and metastasis',
+        genes: [
+            'MMP1',
+            'MMP2',
+            'MMP3',
+            'MMP7',
+            'MMP9',
+            'MMP10',
+            'MMP11',
+            'MMP12',
+            'MMP13',
+            'MMP14',
+            'MMP15',
+            'MMP16',
+            'MMP17',
+            'MMP19',
+            'MMP21',
+            'MMP23B',
+            'MMP24',
+            'MMP25',
+            'MMP26',
+            'MMP27',
+            'MMP28',
+            'ITGB3',
+            'ITGAV',
+            'PTK2',
+            'CDH1',
+            'SPARC',
+            'WFDC2',
+        ],
+    },
+    {
+        id: 'General: TGF-β Pathway',
+        genes: [
+            'TGFB1',
+            'TGFB2',
+            'TGFB3',
+            'TGFBR1',
+            'TGFBR2',
+            'TGFBR3',
+            'BMP2',
+            'BMP3',
+            'BMP4',
+            'BMP5',
+            'BMP6',
+            'BMP7',
+            'GDF2',
+            'BMP10',
+            'BMP15',
+            'BMPR1A',
+            'BMPR1B',
+            'BMPR2',
+            'ACVR1',
+            'ACVR1B',
+            'ACVR1C',
+            'ACVR2A',
+            'ACVR2B',
+            'ACVRL1',
+            'Nodal',
+            'GDF1',
+            'GDF11',
+            'INHA',
+            'INHBA',
+            'INHBB',
+            'INHBC',
+            'INHBE',
+            'SMAD2',
+            'SMAD3',
+            'SMAD1',
+            'SMAD5',
+            'SMAD4',
+            'SMAD9',
+            'SMAD6',
+            'SMAD7',
+            'SPTBN1',
+            'TGFBRAP1',
+            'ZFYVE9',
+        ],
+    },
 ];
 
 export default gene_lists;
diff --git a/src/shared/components/query/quickSearch/HomePageSummary.tsx b/src/shared/components/query/quickSearch/HomePageSummary.tsx
index 2f8f87ef229..899020c16f4 100644
--- a/src/shared/components/query/quickSearch/HomePageSummary.tsx
+++ b/src/shared/components/query/quickSearch/HomePageSummary.tsx
@@ -1,22 +1,23 @@
 import * as React from 'react';
-import { observer } from "mobx-react";
+import { observer } from 'mobx-react';
 
-export interface IHomePageSummaryProps {
-    
-}
+export interface IHomePageSummaryProps {}
 
 @observer
-export default class HomePageSummary extends React.Component<IHomePageSummaryProps, {}> {
-
+export default class HomePageSummary extends React.Component<
+    IHomePageSummaryProps,
+    {}
+> {
     public render() {
-
         return (
             <div>
-                Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et 
-                dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip 
-                ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu 
-                fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt 
-                mollit anim id est laborum.
+                Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+                eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut
+                enim ad minim veniam, quis nostrud exercitation ullamco laboris
+                nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor
+                in reprehenderit in voluptate velit esse cillum dolore eu fugiat
+                nulla pariatur. Excepteur sint occaecat cupidatat non proident,
+                sunt in culpa qui officia deserunt mollit anim id est laborum.
             </div>
         );
     }
diff --git a/src/shared/components/query/quickSearch/QuickSearch.tsx b/src/shared/components/query/quickSearch/QuickSearch.tsx
index 64e8f1304e6..8627682f70d 100644
--- a/src/shared/components/query/quickSearch/QuickSearch.tsx
+++ b/src/shared/components/query/quickSearch/QuickSearch.tsx
@@ -8,14 +8,14 @@ import './styles.scss';
 import { sleep } from 'shared/lib/TimeUtils';
 import { Label } from 'react-bootstrap';
 import * as moduleStyles from './styles.module.scss';
-import { action, computed, observable, } from 'mobx';
+import { action, computed, observable } from 'mobx';
 import { getBrowserWindow, remoteData } from 'cbioportal-frontend-commons';
 import Pluralize from 'pluralize';
 import AppConfig from 'appConfig';
 import { ServerConfigHelpers } from 'config/config';
 import sessionServiceClient from 'shared/api/sessionServiceInstance';
 import { trackEvent } from 'shared/lib/tracking';
-import { PagePath } from "shared/enums/PagePaths";
+import { PagePath } from 'shared/enums/PagePaths';
 
 export const SHOW_MORE_SIZE: number = 20;
 const DEFAULT_PAGE_SIZE: number = 3;
diff --git a/src/shared/components/query/quickSearch/styles.module.scss b/src/shared/components/query/quickSearch/styles.module.scss
index 8f4c04b1c78..326854f5b83 100644
--- a/src/shared/components/query/quickSearch/styles.module.scss
+++ b/src/shared/components/query/quickSearch/styles.module.scss
@@ -1,39 +1,39 @@
 .optionGroup {
-  border-bottom:1px dashed $borderColor;
-  position:relative;
-  line-height:1;
+    border-bottom: 1px dashed $borderColor;
+    position: relative;
+    line-height: 1;
 
-  &:first-child {
-    margin-top:5px;
-  }
+    &:first-child {
+        margin-top: 5px;
+    }
 
-  &:last-child {
-    border-bottom:none;
-  }
+    &:last-child {
+        border-bottom: none;
+    }
 
-  &:nth-child(n+2) {
-    .groupHeader {
-      top:-8px;
-      background-color:#fff;
+    &:nth-child(n + 2) {
+        .groupHeader {
+            top: -8px;
+            background-color: #fff;
+        }
     }
-  }
 }
 
 .groupHeader {
-  position:absolute;
-  padding:0 20px;
-  left:50%;
-  top:-5px;
-  transform: translateX(-50%);
-  color:#ccc;
-  font-size: 11.5px;
+    position: absolute;
+    padding: 0 20px;
+    left: 50%;
+    top: -5px;
+    transform: translateX(-50%);
+    color: #ccc;
+    font-size: 11.5px;
 }
 
 .optionWrapper {
-  display:flex;
-  align-items:center;
+    display: flex;
+    align-items: center;
 }
 
 .optionLabelWrapper {
-  margin-right:10px;
-}
\ No newline at end of file
+    margin-right: 10px;
+}
diff --git a/src/shared/components/query/quickSearch/styles.scss b/src/shared/components/query/quickSearch/styles.scss
index 0d4734e12fe..89fcae14549 100644
--- a/src/shared/components/query/quickSearch/styles.scss
+++ b/src/shared/components/query/quickSearch/styles.scss
@@ -1,6 +1,6 @@
 .quick-search .Select-control {
     font-size: 18px;
-    border: 2px solid #3786C2 !important;
+    border: 2px solid #3786c2 !important;
     border-radius: 0px;
     box-shadow: none !important;
 }
@@ -12,7 +12,7 @@
 .quick-search .Select-menu-outer {
     max-height: 506px;
 }
-    
+
 .quick-search .Select-menu {
     max-height: 504px;
 }
@@ -22,10 +22,9 @@
 }
 
 .quick-search-link .Select-option.is-focused {
-    color: #3786C2;
+    color: #3786c2;
 }
 
 .quick-search .Select-control:hover {
     cursor: text;
 }
-
diff --git a/src/shared/components/query/studyList/StudyList.tsx b/src/shared/components/query/studyList/StudyList.tsx
index 334e95049b8..2927bfb5dc1 100644
--- a/src/shared/components/query/studyList/StudyList.tsx
+++ b/src/shared/components/query/studyList/StudyList.tsx
@@ -1,52 +1,62 @@
-import * as React from "react";
-import {TypeOfCancer as CancerType, CancerStudy} from "../../../api/generated/CBioPortalAPI";
-import * as styles_any from "./styles.module.scss";
-import classNames from "classnames";
-import FontAwesome from "react-fontawesome";
-import LabeledCheckbox from "../../labeledCheckbox/LabeledCheckbox";
-import {observer, Observer} from "mobx-react";
-import {computed} from "mobx";
-import _ from "lodash";
-import {getPubMedUrl, getStudySummaryUrl, redirectToStudyView} from "../../../api/urls";
-import {QueryStoreComponent} from "../QueryStore";
-import {DefaultTooltip} from "cbioportal-frontend-commons";
-import {FilteredCancerTreeView} from "../StudyListLogic";
-import {CancerTreeNode, CancerTypeWithVisibility} from "../CancerStudyTreeData";
-import {StudyLink} from "../../StudyLink/StudyLink";
+import * as React from 'react';
+import {
+    TypeOfCancer as CancerType,
+    CancerStudy,
+} from '../../../api/generated/CBioPortalAPI';
+import * as styles_any from './styles.module.scss';
+import classNames from 'classnames';
+import FontAwesome from 'react-fontawesome';
+import LabeledCheckbox from '../../labeledCheckbox/LabeledCheckbox';
+import { observer, Observer } from 'mobx-react';
+import { computed } from 'mobx';
+import _ from 'lodash';
+import {
+    getPubMedUrl,
+    getStudySummaryUrl,
+    redirectToStudyView,
+} from '../../../api/urls';
+import { QueryStoreComponent } from '../QueryStore';
+import { DefaultTooltip } from 'cbioportal-frontend-commons';
+import { FilteredCancerTreeView } from '../StudyListLogic';
+import {
+    CancerTreeNode,
+    CancerTypeWithVisibility,
+} from '../CancerStudyTreeData';
+import { StudyLink } from '../../StudyLink/StudyLink';
 import StudyTagsTooltip from '../../studyTagsTooltip/StudyTagsTooltip';
 
 const styles = {
-    ...styles_any as {
-        StudyList: string,
-        SelectedStudyList: string,
-
-        CancerType: string,
-        CancerTypeName: string,
-        SelectAll: string,
-
-        Study: string,
-        StudyName: string,
-        DeletedStudy: string,
-        StudyMeta: string,
-        StudySamples: string,
-        StudyLinks: string,
-
-        icon: string,
-        iconWithTooltip: string,
-        trashIcon: string,
-        summaryIcon: string,
-        infoCircleIcon: string,
-        tooltip: string,
-
-        disabled: string,
-        enabled: string,
-        indentArrow: string,
-
-        closeSelected: string,
-        deselectAll: string,
-        highlighted: string,
-    },
-    Level: (level: number) => styles_any[`Level${level}`]
+    ...(styles_any as {
+        StudyList: string;
+        SelectedStudyList: string;
+
+        CancerType: string;
+        CancerTypeName: string;
+        SelectAll: string;
+
+        Study: string;
+        StudyName: string;
+        DeletedStudy: string;
+        StudyMeta: string;
+        StudySamples: string;
+        StudyLinks: string;
+
+        icon: string;
+        iconWithTooltip: string;
+        trashIcon: string;
+        summaryIcon: string;
+        infoCircleIcon: string;
+        tooltip: string;
+
+        disabled: string;
+        enabled: string;
+        indentArrow: string;
+
+        closeSelected: string;
+        deselectAll: string;
+        highlighted: string;
+    }),
+    Level: (level: number) => styles_any[`Level${level}`],
 };
 
 export interface IStudyListProps {
@@ -54,14 +64,18 @@ export interface IStudyListProps {
 }
 
 @observer
-export default class StudyList extends QueryStoreComponent<IStudyListProps, {}> {
+export default class StudyList extends QueryStoreComponent<
+    IStudyListProps,
+    {}
+> {
     private _view: FilteredCancerTreeView;
 
     get view() {
-        return this._view || (
-            this.props.showSelectedStudiesOnly
+        return (
+            this._view ||
+            (this.props.showSelectedStudiesOnly
                 ? this.logic.selectedStudiesView
-                : this.logic.mainView
+                : this.logic.mainView)
         );
     }
 
@@ -76,8 +90,7 @@ export default class StudyList extends QueryStoreComponent<IStudyListProps, {}>
     componentDidMount() {
         // when rendering selected studies view,
         // cache the view object so studies do not disappear immediately when deselected.
-        if (this.props.showSelectedStudiesOnly)
-            this._view = this.view;
+        if (this.props.showSelectedStudiesOnly) this._view = this.view;
     }
 
     render() {
@@ -86,15 +99,18 @@ export default class StudyList extends QueryStoreComponent<IStudyListProps, {}>
         if (this.props.showSelectedStudiesOnly) {
             return (
                 <div className={styles.SelectedStudyList}>
-					<span
+                    <span
                         className={styles.deselectAll}
                         onClick={() => {
-                            this.view.onCheck(this.store.treeData.rootCancerType, false);
+                            this.view.onCheck(
+                                this.store.treeData.rootCancerType,
+                                false
+                            );
                             this.store.showSelectedStudiesOnly = false;
                         }}
                     >
-						Deselect all
-					</span>
+                        Deselect all
+                    </span>
                     {studyList}
                 </div>
             );
@@ -103,11 +119,16 @@ export default class StudyList extends QueryStoreComponent<IStudyListProps, {}>
         return studyList;
     }
 
-    renderCancerType = (cancerType: CancerTypeWithVisibility, arrayIndex: number = 0): JSX.Element | null => {
+    renderCancerType = (
+        cancerType: CancerTypeWithVisibility,
+        arrayIndex: number = 0
+    ): JSX.Element | null => {
         let currentLevel = this.logic.getDepth(cancerType);
         let childCancerTypes = this.view.getChildCancerTypes(cancerType);
         let childStudies = this.view.getChildCancerStudies(cancerType);
-        let childStudyIds = this.logic.cancerTypeListView.getDescendantCancerStudies(cancerType).map(study => study.studyId);
+        let childStudyIds = this.logic.cancerTypeListView
+            .getDescendantCancerStudies(cancerType)
+            .map(study => study.studyId);
 
         let heading: JSX.Element | undefined;
         let indentArrow: JSX.Element | undefined;
@@ -116,12 +137,15 @@ export default class StudyList extends QueryStoreComponent<IStudyListProps, {}>
             let liClassName = classNames(
                 styles.CancerType,
                 styles.Level(currentLevel),
-                this.logic.isHighlighted(cancerType) && styles.highlighted,
+                this.logic.isHighlighted(cancerType) && styles.highlighted
             );
 
             if (currentLevel === 3)
                 indentArrow = (
-                    <FontAwesome className={styles.indentArrow} name="long-arrow-right"/>
+                    <FontAwesome
+                        className={styles.indentArrow}
+                        name="long-arrow-right"
+                    />
                 );
 
             heading = (
@@ -129,13 +153,17 @@ export default class StudyList extends QueryStoreComponent<IStudyListProps, {}>
                     <CancerTreeCheckbox view={this.view} node={cancerType}>
                         {indentArrow}
                         <span className={styles.CancerTypeName}>
-							{cancerType.name}
-						</span>
-                        {!!(!this.store.forDownloadTab) && (
+                            {cancerType.name}
+                        </span>
+                        {!!!this.store.forDownloadTab && (
                             <span className={styles.SelectAll}>
-                                    {_.intersection(childStudyIds, this.store.selectableSelectedStudyIds).length ?
-                                        'Deselect All' : 'Select All'}
-                                </span>
+                                {_.intersection(
+                                    childStudyIds,
+                                    this.store.selectableSelectedStudyIds
+                                ).length
+                                    ? 'Deselect All'
+                                    : 'Select All'}
+                            </span>
                         )}
                     </CancerTreeCheckbox>
                 </li>
@@ -144,7 +172,7 @@ export default class StudyList extends QueryStoreComponent<IStudyListProps, {}>
 
         let ulClassName = classNames(
             styles.StudyList,
-            styles.Level(currentLevel),
+            styles.Level(currentLevel)
         );
         return (
             <ul key={arrayIndex} className={ulClassName}>
@@ -158,37 +186,50 @@ export default class StudyList extends QueryStoreComponent<IStudyListProps, {}>
     renderCancerStudy = (study: CancerStudy, arrayIndex: number) => {
         let liClassName = classNames(
             styles.Study,
-            this.logic.isHighlighted(study) && styles.highlighted,
+            this.logic.isHighlighted(study) && styles.highlighted
         );
 
         const isOverlap = study.studyId in this.store.getOverlappingStudiesMap;
-        const overlapWarning = isOverlap ?
+        const overlapWarning = isOverlap ? (
             <DefaultTooltip
                 mouseEnterDelay={0}
                 placement="top"
-                overlay={<div>This study has overlapping data with another selected study.</div>}
+                overlay={
+                    <div>
+                        This study has overlapping data with another selected
+                        study.
+                    </div>
+                }
             >
                 <i className="fa fa-exclamation-triangle"></i>
             </DefaultTooltip>
-            : null;
+        ) : null;
 
         return (
-            <li key={arrayIndex}
+            <li
+                key={arrayIndex}
                 className={liClassName}
-                data-test={this.store.isVirtualStudy(study.studyId) ? 'VirtualStudySelect' : 'StudySelect'}>
+                data-test={
+                    this.store.isVirtualStudy(study.studyId)
+                        ? 'VirtualStudySelect'
+                        : 'StudySelect'
+                }
+            >
                 <Observer>
                     {() => {
                         const classes = classNames({
-                                                       [styles.StudyName]: true,
-                                                       'overlappingStudy': isOverlap,
-                                                       [styles.DeletedStudy]: this.store.isDeletedVirtualStudy(study.studyId)
-                                                   });
+                            [styles.StudyName]: true,
+                            overlappingStudy: isOverlap,
+                            [styles.DeletedStudy]: this.store.isDeletedVirtualStudy(
+                                study.studyId
+                            ),
+                        });
                         return (
                             <CancerTreeCheckbox view={this.view} node={study}>
-                            <span className={classes}>
-                                {study.name}
-                                {overlapWarning}
-                            </span>
+                                <span className={classes}>
+                                    {study.name}
+                                    {overlapWarning}
+                                </span>
                             </CancerTreeCheckbox>
                         );
                     }}
@@ -198,7 +239,9 @@ export default class StudyList extends QueryStoreComponent<IStudyListProps, {}>
                     {() => {
                         return (
                             <div className={styles.StudyMeta}>
-                                {!this.store.isDeletedVirtualStudy(study.studyId) && this.renderSamples(study)}
+                                {!this.store.isDeletedVirtualStudy(
+                                    study.studyId
+                                ) && this.renderSamples(study)}
                                 {this.renderStudyLinks(study)}
                             </div>
                         );
@@ -222,8 +265,8 @@ export default class StudyList extends QueryStoreComponent<IStudyListProps, {}>
     renderSamples = (study: CancerStudy) => {
         return (
             <span className={styles.StudySamples}>
-				{`${study.allSampleCount} samples`}
-			</span>
+                {`${study.allSampleCount} samples`}
+            </span>
         );
     };
 
@@ -234,42 +277,48 @@ export default class StudyList extends QueryStoreComponent<IStudyListProps, {}>
                     mouseEnterDelay={0}
                     placement="top"
                     overlay={
-                        <div className={styles.tooltip}
-                        >Restore study</div>
+                        <div className={styles.tooltip}>Restore study</div>
                     }
                     children={
                         <button
                             className={`btn btn-default btn-xs`}
-                            onClick={() => this.store.restoreVirtualStudy(study.studyId)}
+                            onClick={() =>
+                                this.store.restoreVirtualStudy(study.studyId)
+                            }
                             style={{
                                 lineHeight: '80%',
                             }}
-                            data-test='virtualStudyRestore'>
+                            data-test="virtualStudyRestore"
+                        >
                             Restore
                         </button>
                     }
                 />
             );
         } else {
-            const links: { icon: string, onClick?: string | (() => void), tooltip?: string }[] = [
+            const links: {
+                icon: string;
+                onClick?: string | (() => void);
+                tooltip?: string;
+            }[] = [
                 {
                     icon: 'info-circle',
-                    tooltip: ''
-                }
+                    tooltip: '',
+                },
             ];
 
             if (this.store.isVirtualStudy(study.studyId)) {
                 links.push({
-                               icon: 'trash',
-                               tooltip: "Delete this virtual study.",
-                               onClick: () => this.store.deleteVirtualStudy(study.studyId),
-                           });
+                    icon: 'trash',
+                    tooltip: 'Delete this virtual study.',
+                    onClick: () => this.store.deleteVirtualStudy(study.studyId),
+                });
             } else {
                 links.push({
-                               icon: 'book',
-                               onClick: study.pmid && getPubMedUrl(study.pmid),
-                               tooltip: study.pmid && "PubMed",
-                           });
+                    icon: 'book',
+                    onClick: study.pmid && getPubMedUrl(study.pmid),
+                    tooltip: study.pmid && 'PubMed',
+                });
             }
 
             return (
@@ -280,34 +329,36 @@ export default class StudyList extends QueryStoreComponent<IStudyListProps, {}>
                                 key={i}
                                 name={link.icon}
                                 className={classNames({
-                                                          [styles.icon]: true,
-                                                          [styles.iconWithTooltip]: !!link.tooltip,
-                                                          [styles.trashIcon]: (link.icon === "trash"),
-                                                          [styles.infoCircleIcon]: (link.icon === "info-circle")
-                                                      })}
+                                    [styles.icon]: true,
+                                    [styles.iconWithTooltip]: !!link.tooltip,
+                                    [styles.trashIcon]: link.icon === 'trash',
+                                    [styles.infoCircleIcon]:
+                                        link.icon === 'info-circle',
+                                })}
                             />
                         );
 
                         if (link.onClick) {
                             let anchorProps: any = {
-                                key: i
+                                key: i,
                             };
-                            if (typeof link.onClick === "string") {
+                            if (typeof link.onClick === 'string') {
                                 anchorProps.href = link.onClick;
-                                anchorProps.target = "_blank";
+                                anchorProps.target = '_blank';
                             } else {
                                 anchorProps.onClick = link.onClick;
                             }
-                            content = (
-                                <a {...anchorProps}>
-                                    {content}
-                                </a>
-                            );
+                            content = <a {...anchorProps}>{content}</a>;
                         }
 
                         if (link.tooltip) {
                             let overlay = (
-                                <div className={styles.tooltip} dangerouslySetInnerHTML={{__html: link.tooltip}}/>
+                                <div
+                                    className={styles.tooltip}
+                                    dangerouslySetInnerHTML={{
+                                        __html: link.tooltip,
+                                    }}
+                                />
                             );
                             content = (
                                 <DefaultTooltip
@@ -323,9 +374,18 @@ export default class StudyList extends QueryStoreComponent<IStudyListProps, {}>
                             content = (
                                 <StudyTagsTooltip
                                     key={i}
-                                    studyDescription={this.store.isVirtualStudy(study.studyId) ? study.description.replace(/\r?\n/g, '<br />') : study.description}
+                                    studyDescription={
+                                        this.store.isVirtualStudy(study.studyId)
+                                            ? study.description.replace(
+                                                  /\r?\n/g,
+                                                  '<br />'
+                                              )
+                                            : study.description
+                                    }
                                     studyId={study.studyId}
-                                    isVirtualStudy={this.store.isVirtualStudy(study.studyId)}
+                                    isVirtualStudy={this.store.isVirtualStudy(
+                                        study.studyId
+                                    )}
                                     mouseEnterDelay={0}
                                     placement="top"
                                 >
@@ -341,14 +401,20 @@ export default class StudyList extends QueryStoreComponent<IStudyListProps, {}>
                             mouseEnterDelay={0}
                             placement="top"
                             overlay={
-                                <div className={styles.tooltip}
-                                >View clinical and genomic data of this study</div>
+                                <div className={styles.tooltip}>
+                                    View clinical and genomic data of this study
+                                </div>
                             }
                         >
-							<span>
-								<StudyLink studyId={study.studyId}
-                                           className={classNames(styles.summaryIcon, 'ci ci-pie-chart')}/>
-							</span>
+                            <span>
+                                <StudyLink
+                                    studyId={study.studyId}
+                                    className={classNames(
+                                        styles.summaryIcon,
+                                        'ci ci-pie-chart'
+                                    )}
+                                />
+                            </span>
                         </DefaultTooltip>
                     )}
                 </span>
@@ -363,7 +429,10 @@ export interface ICancerTreeCheckboxProps {
 }
 
 @observer
-export class CancerTreeCheckbox extends QueryStoreComponent<ICancerTreeCheckboxProps, {}> {
+export class CancerTreeCheckbox extends QueryStoreComponent<
+    ICancerTreeCheckboxProps,
+    {}
+> {
     @computed.struct get checkboxProps() {
         return this.props.view.getCheckboxProps(this.props.node);
     }
@@ -373,7 +442,10 @@ export class CancerTreeCheckbox extends QueryStoreComponent<ICancerTreeCheckboxP
             <LabeledCheckbox
                 {...this.checkboxProps}
                 onChange={event => {
-                    this.props.view.onCheck(this.props.node, (event.target as HTMLInputElement).checked);
+                    this.props.view.onCheck(
+                        this.props.node,
+                        (event.target as HTMLInputElement).checked
+                    );
                 }}
             >
                 {this.props.children}
diff --git a/src/shared/components/query/studyList/styles.module.scss b/src/shared/components/query/studyList/styles.module.scss
index bf9aeb62e70..8b50727de41 100644
--- a/src/shared/components/query/studyList/styles.module.scss
+++ b/src/shared/components/query/studyList/styles.module.scss
@@ -1,253 +1,281 @@
 .selectAllStudies {
-  color: #1982b8;
-  font: normal normal 600 10px/18px 'Helvetica Neue', Helvetica, Arial, sans-serif;
-  margin: 0 0 0 10px;
-  text-transform: uppercase;
+    color: #1982b8;
+    font: normal normal 600 10px/18px 'Helvetica Neue', Helvetica, Arial,
+        sans-serif;
+    margin: 0 0 0 10px;
+    text-transform: uppercase;
 }
 
 @keyframes fadein {
-    from { opacity: 0; }
-    to   { opacity: 1; }
+    from {
+        opacity: 0;
+    }
+    to {
+        opacity: 1;
+    }
 }
 
 /* Firefox < 16 */
 @-moz-keyframes fadein {
-    from { opacity: 0; }
-    to   { opacity: 1; }
+    from {
+        opacity: 0;
+    }
+    to {
+        opacity: 1;
+    }
 }
 
 /* Safari, Chrome and Opera > 12.1 */
 @-webkit-keyframes fadein {
-    from { opacity: 0; }
-    to   { opacity: 1; }
+    from {
+        opacity: 0;
+    }
+    to {
+        opacity: 1;
+    }
 }
 
 /* Internet Explorer */
 @-ms-keyframes fadein {
-    from { opacity: 0; }
-    to   { opacity: 1; }
+    from {
+        opacity: 0;
+    }
+    to {
+        opacity: 1;
+    }
 }
 
 /* Opera < 12.1 */
 @-o-keyframes fadein {
-    from { opacity: 0; }
-    to   { opacity: 1; }
+    from {
+        opacity: 0;
+    }
+    to {
+        opacity: 1;
+    }
 }
 
-
 .SelectedStudyList {
-  ul.StudyList {
-    margin: 0;
-    padding: 0 15px;
-  }
-
-  .deselectAll {
-    float: right;
-    margin-right: 20px;
-    font-size: 12px;
-    line-height: 30px;
-    text-align: right;
-    color: #337ab7;
-    text-decoration: underline;
-    &:hover {
-      cursor: pointer;
+    ul.StudyList {
+        margin: 0;
+        padding: 0 15px;
+    }
+
+    .deselectAll {
+        float: right;
+        margin-right: 20px;
+        font-size: 12px;
+        line-height: 30px;
+        text-align: right;
+        color: #337ab7;
+        text-decoration: underline;
+        &:hover {
+            cursor: pointer;
+        }
     }
-  }
 }
 
 ul.StudyList {
-  padding: 0 0 0 15px;
-
-  &.Level0, &.Level1, &.Level3, &.Level4 {
-    padding-left: 0px;
-  }
-
-  &.Level1 li:last-of-type, &.Level2 li:last-of-type, &.Level3 li:last-of-type {
-    margin-bottom: 10px;
-  }
+    padding: 0 0 0 15px;
 
-  &.Level0 {
-    padding: 0 10px 5px 5px;
-
-    > li.CancerType, > li.Study {
-      margin-left: 0px;
+    &.Level0,
+    &.Level1,
+    &.Level3,
+    &.Level4 {
+        padding-left: 0px;
     }
-  }
 
-  &.Level1 {
-    > li.Study {
-      margin-left: 15px;
+    &.Level1 li:last-of-type,
+    &.Level2 li:last-of-type,
+    &.Level3 li:last-of-type {
+        margin-bottom: 10px;
     }
-  }
 
-  li.CancerType {
-    list-style-type: none;
-    margin-bottom: 0px !important;
+    &.Level0 {
+        padding: 0 10px 5px 5px;
 
-    input {
-      display: none;
+        > li.CancerType,
+        > li.Study {
+            margin-left: 0px;
+        }
     }
 
-    .indentArrow {
-      color: #999;
-      line-height: 18px;
-      margin-right: 5px;
+    &.Level1 {
+        > li.Study {
+            margin-left: 15px;
+        }
     }
 
-    .SelectAll {
-      opacity: 0;
-      font: normal normal 500 10px/18px 'Helvetica Neue', Helvetica, Arial, sans-serif;
-      color: #999;
-      text-transform: uppercase;
-      margin: 0 10px;
-      transition: opacity .1s ease-in-out;
-      -moz-transition: opacity .1s ease-in-out;
-      -webkit-transition: opacity .1s ease-in-out;
+    li.CancerType {
+        list-style-type: none;
+        margin-bottom: 0px !important;
+
+        input {
+            display: none;
+        }
+
+        .indentArrow {
+            color: #999;
+            line-height: 18px;
+            margin-right: 5px;
+        }
+
+        .SelectAll {
+            opacity: 0;
+            font: normal normal 500 10px/18px 'Helvetica Neue', Helvetica, Arial,
+                sans-serif;
+            color: #999;
+            text-transform: uppercase;
+            margin: 0 10px;
+            transition: opacity 0.1s ease-in-out;
+            -moz-transition: opacity 0.1s ease-in-out;
+            -webkit-transition: opacity 0.1s ease-in-out;
+        }
+
+        &:hover {
+            .SelectAll {
+                opacity: 1;
+            }
+        }
+
+        &.Level1 {
+            label {
+                border-bottom: 1px solid rgb(232, 241, 248);
+                color: #333;
+                display: block;
+                font: normal normal 500 15px/15px 'Helvetica Neue', Helvetica,
+                    Arial, sans-serif;
+                padding: 10px 5px 3px 5px;
+                margin: 5px 10px 5px 10px;
+            }
+        }
+
+        &.Level2 {
+            padding-top: 0px;
+
+            label {
+                font: normal normal 400 14px/18px 'Helvetica Neue', Helvetica,
+                    Arial, sans-serif;
+                color: #1982b8;
+                margin: 0;
+                padding: 5px 15px 5px 0;
+            }
+        }
+
+        &.Level3 {
+            label {
+                font: normal normal 600 11px/18px 'Helvetica Neue', Helvetica,
+                    Arial, sans-serif;
+                color: #444;
+                margin: 0;
+                padding: 0px 15px 0px 0;
+                text-transform: uppercase;
+                white-space: nowrap;
+            }
+        }
     }
+}
+
+li.Study {
+    list-style-type: none;
+    padding: 2px 0;
+    display: flex;
+    justify-content: space-between;
+    font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif !important;
+    align-items: flex-start;
 
     &:hover {
-      .SelectAll {
-        opacity: 1;
-      }
+        background-color: #f8f8f8;
     }
 
-    &.Level1 {
-      label {
-        border-bottom: 1px solid rgb(232, 241, 248);
-        color: #333;
-        display: block;
-        font: normal normal 500 15px/15px 'Helvetica Neue', Helvetica, Arial, sans-serif;
-        padding: 10px 5px 3px 5px;
-        margin: 5px 10px 5px 10px;
-      }
-    }
-
-    &.Level2 {
-      padding-top: 0px;
-
-      label {
-        font: normal normal 400 14px/18px 'Helvetica Neue', Helvetica, Arial, sans-serif;
-        color: #1982b8;
-        margin: 0;
-        padding: 5px 15px 5px 0;
-      }
+    :global(.overlappingStudy) {
+        color: $state-danger-text !important;
+        i {
+            margin-left: 5px;
+        }
     }
 
-    &.Level3 {
-      label {
-        font: normal normal 600 11px/18px 'Helvetica Neue', Helvetica, Arial, sans-serif;
-        color: #444;
+    label {
+        font-weight: 400;
         margin: 0;
-        padding: 0px 15px 0px 0;
-        text-transform: uppercase;
-        white-space: nowrap;
-      }
+        display: flex;
     }
-  }
-}
-
-li.Study {
-  list-style-type: none;
-  padding: 2px 0;
-  display: flex;
-  justify-content: space-between;
-  font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif !important;
-  align-items: flex-start;
 
-  &:hover {
-    background-color:#F8F8F8;
-  }
+    input[type='checkbox'] {
+        margin: 1px 6px 0 0;
+    }
 
-  :global(.overlappingStudy) {
+    .StudyName {
+        color: #444;
+        max-width: 390px;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        overflow: hidden;
+    }
 
-    color:$state-danger-text !important;
-    i {
-      margin-left:5px;
+    .DeletedStudy {
+        text-decoration: line-through;
+        color: rgb(198, 203, 209);
     }
-  }
 
-  label {
-    font-weight: 400;
-    margin: 0;
-    display: flex;
-  }
-
-  input[type="checkbox"] {
-    margin: 1px 6px 0 0;
-  }
-
-  .StudyName {
-    color: #444;
-    max-width: 390px;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    overflow: hidden;
-  }
-
-  .DeletedStudy {
-    text-decoration: line-through;
-    color: rgb(198, 203, 209);
-  }
-
-  @media (min-width: 1450px) {
-    .StudyName {
-      max-width:500px;
+    @media (min-width: 1450px) {
+        .StudyName {
+            max-width: 500px;
+        }
     }
-  }
 
-  @media (min-width: 1600px) {
-    .StudyName {
-      max-width:650px;
+    @media (min-width: 1600px) {
+        .StudyName {
+            max-width: 650px;
+        }
     }
-  }
 
-  @media (min-width: 1800px) {
-    .StudyName {
-      max-width:800px;
+    @media (min-width: 1800px) {
+        .StudyName {
+            max-width: 800px;
+        }
     }
-  }
 
-  .StudySamples {
-    text-align: right;
-    display: inline-block;
-  }
+    .StudySamples {
+        text-align: right;
+        display: inline-block;
+    }
 
-  .StudyMeta {
-    color: #999;
-    font-size: 12px;
+    .StudyMeta {
+        color: #999;
+        font-size: 12px;
 
-    .StudyLinks {
-      display: inline-block;
-      min-width: 57px;
+        .StudyLinks {
+            display: inline-block;
+            min-width: 57px;
 
-      > * {
-        margin-left:3px;
-      }
+            > * {
+                margin-left: 3px;
+            }
 
-      span.summaryIcon {
-        cursor: pointer;
-      }
+            span.summaryIcon {
+                cursor: pointer;
+            }
 
-      span.iconWithTooltip {
-        color: #555;
-      }
+            span.iconWithTooltip {
+                color: #555;
+            }
 
-      a > span.icon {
-        color: #1982b8;
-      }
+            a > span.icon {
+                color: #1982b8;
+            }
 
-      a > span.trashIcon {
-        color: #808080;
-      }
+            a > span.trashIcon {
+                color: #808080;
+            }
 
-      a > span.infoCircleIcon {
-        color: #555;
-      }
+            a > span.infoCircleIcon {
+                color: #555;
+            }
+        }
     }
-
-  }
 }
 
 .tooltip {
-  max-width: 300px;
+    max-width: 300px;
 }
diff --git a/src/shared/components/query/styles/jstree/style.css b/src/shared/components/query/styles/jstree/style.css
index 02aba8eb266..506c2c50f42 100644
--- a/src/shared/components/query/styles/jstree/style.css
+++ b/src/shared/components/query/styles/jstree/style.css
@@ -1,14 +1,14 @@
 /* jsTree default theme */
-li.jstree-node>a {
+li.jstree-node > a {
     font-style: italic;
     color: grey !important;
 }
-li.jstree-node.jstree-leaf>a {
+li.jstree-node.jstree-leaf > a {
     color: black !important;
     font-style: normal;
     font-weight: bold;
 }
-li.jstree-node.jstree-leaf>a.jstree-clicked {
+li.jstree-node.jstree-leaf > a.jstree-clicked {
     color: black !important;
     font-style: normal;
     font-weight: bold;
@@ -16,1056 +16,1093 @@ li.jstree-node.jstree-leaf>a.jstree-clicked {
 .jstree-node,
 .jstree-children,
 .jstree-container-ul {
-  display: block;
-  margin: 0;
-  padding: 0;
-  list-style-type: none;
-  list-style-image: none;
+    display: block;
+    margin: 0;
+    padding: 0;
+    list-style-type: none;
+    list-style-image: none;
 }
 .jstree-node {
-  white-space: nowrap;
+    white-space: nowrap;
 }
 .jstree-anchor {
-  display: inline-block;
-  color: black;
-  white-space: nowrap;
-  padding: 0 4px 0 1px;
-  margin: 0;
-  vertical-align: top;
+    display: inline-block;
+    color: black;
+    white-space: nowrap;
+    padding: 0 4px 0 1px;
+    margin: 0;
+    vertical-align: top;
 }
 .jstree-anchor:focus {
-  outline: 0;
+    outline: 0;
 }
 .jstree-anchor,
 .jstree-anchor:link,
 .jstree-anchor:visited,
 .jstree-anchor:hover,
 .jstree-anchor:active {
-  text-decoration: none;
-  color: inherit;
+    text-decoration: none;
+    color: inherit;
 }
 .jstree-icon {
-  display: inline-block;
-  text-decoration: none;
-  margin: 0;
-  padding: 0;
-  vertical-align: top;
-  text-align: center;
+    display: inline-block;
+    text-decoration: none;
+    margin: 0;
+    padding: 0;
+    vertical-align: top;
+    text-align: center;
 }
 .jstree-icon:empty {
-  display: inline-block;
-  text-decoration: none;
-  margin: 0;
-  padding: 0;
-  vertical-align: top;
-  text-align: center;
+    display: inline-block;
+    text-decoration: none;
+    margin: 0;
+    padding: 0;
+    vertical-align: top;
+    text-align: center;
 }
 .jstree-ocl {
-  cursor: pointer;
+    cursor: pointer;
 }
 .jstree-leaf > .jstree-ocl {
-  cursor: default;
+    cursor: default;
 }
 .jstree .jstree-open > .jstree-children {
-  display: block;
+    display: block;
 }
 .jstree .jstree-closed > .jstree-children,
 .jstree .jstree-leaf > .jstree-children {
-  display: none;
+    display: none;
 }
 .jstree-anchor > .jstree-themeicon {
-  margin-right: 2px;
+    margin-right: 2px;
 }
 .jstree-no-icons .jstree-themeicon,
 .jstree-anchor > .jstree-themeicon-hidden {
-  display: none;
+    display: none;
 }
 .jstree-hidden,
 .jstree-node.jstree-hidden {
-  display: none;
+    display: none;
 }
 .jstree-rtl .jstree-anchor {
-  padding: 0 1px 0 4px;
+    padding: 0 1px 0 4px;
 }
 .jstree-rtl .jstree-anchor > .jstree-themeicon {
-  margin-left: 2px;
-  margin-right: 0;
+    margin-left: 2px;
+    margin-right: 0;
 }
 .jstree-rtl .jstree-node {
-  margin-left: 0;
+    margin-left: 0;
 }
 .jstree-rtl .jstree-container-ul > .jstree-node {
-  margin-right: 0;
+    margin-right: 0;
 }
 .jstree-wholerow-ul {
-  position: relative;
-  display: inline-block;
-  min-width: 100%;
+    position: relative;
+    display: inline-block;
+    min-width: 100%;
 }
 .jstree-wholerow-ul .jstree-leaf > .jstree-ocl {
-  cursor: pointer;
+    cursor: pointer;
 }
 .jstree-wholerow-ul .jstree-anchor,
 .jstree-wholerow-ul .jstree-icon {
-  position: relative;
+    position: relative;
 }
 .jstree-wholerow-ul .jstree-wholerow {
-  width: 100%;
-  cursor: pointer;
-  position: absolute;
-  left: 0;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
+    width: 100%;
+    cursor: pointer;
+    position: absolute;
+    left: 0;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
 }
 .vakata-context {
-  display: none;
+    display: none;
 }
 .vakata-context,
 .vakata-context ul {
-  margin: 0;
-  padding: 2px;
-  position: absolute;
-  background: #f5f5f5;
-  border: 1px solid #979797;
-  -moz-box-shadow: 5px 5px 4px -4px #666666;
-  -webkit-box-shadow: 2px 2px 2px #999999;
-  box-shadow: 2px 2px 2px #999999;
+    margin: 0;
+    padding: 2px;
+    position: absolute;
+    background: #f5f5f5;
+    border: 1px solid #979797;
+    -moz-box-shadow: 5px 5px 4px -4px #666666;
+    -webkit-box-shadow: 2px 2px 2px #999999;
+    box-shadow: 2px 2px 2px #999999;
 }
 .vakata-context ul {
-  list-style: none;
-  left: 100%;
-  margin-top: -2.7em;
-  margin-left: -4px;
+    list-style: none;
+    left: 100%;
+    margin-top: -2.7em;
+    margin-left: -4px;
 }
 .vakata-context .vakata-context-right ul {
-  left: auto;
-  right: 100%;
-  margin-left: auto;
-  margin-right: -4px;
+    left: auto;
+    right: 100%;
+    margin-left: auto;
+    margin-right: -4px;
 }
 .vakata-context li {
-  list-style: none;
-  display: inline;
+    list-style: none;
+    display: inline;
 }
 .vakata-context li > a {
-  display: block;
-  padding: 0 2em 0 2em;
-  text-decoration: none;
-  width: auto;
-  color: black;
-  white-space: nowrap;
-  line-height: 2.4em;
-  -moz-text-shadow: 1px 1px 0 white;
-  -webkit-text-shadow: 1px 1px 0 white;
-  text-shadow: 1px 1px 0 white;
-  -moz-border-radius: 1px;
-  -webkit-border-radius: 1px;
-  border-radius: 1px;
+    display: block;
+    padding: 0 2em 0 2em;
+    text-decoration: none;
+    width: auto;
+    color: black;
+    white-space: nowrap;
+    line-height: 2.4em;
+    -moz-text-shadow: 1px 1px 0 white;
+    -webkit-text-shadow: 1px 1px 0 white;
+    text-shadow: 1px 1px 0 white;
+    -moz-border-radius: 1px;
+    -webkit-border-radius: 1px;
+    border-radius: 1px;
 }
 .vakata-context li > a:hover {
-  position: relative;
-  background-color: #e8eff7;
-  -moz-box-shadow: 0 0 2px #0a6aa1;
-  -webkit-box-shadow: 0 0 2px #0a6aa1;
-  box-shadow: 0 0 2px #0a6aa1;
+    position: relative;
+    background-color: #e8eff7;
+    -moz-box-shadow: 0 0 2px #0a6aa1;
+    -webkit-box-shadow: 0 0 2px #0a6aa1;
+    box-shadow: 0 0 2px #0a6aa1;
 }
 .vakata-context li > a.vakata-context-parent {
-  background-image: url("data:image/gif;base64,R0lGODlhCwAHAIAAACgoKP///yH5BAEAAAEALAAAAAALAAcAAAIORI4JlrqN1oMSnmmZDQUAOw==");
-  background-position: right center;
-  background-repeat: no-repeat;
+    background-image: url('data:image/gif;base64,R0lGODlhCwAHAIAAACgoKP///yH5BAEAAAEALAAAAAALAAcAAAIORI4JlrqN1oMSnmmZDQUAOw==');
+    background-position: right center;
+    background-repeat: no-repeat;
 }
 .vakata-context li > a:focus {
-  outline: 0;
+    outline: 0;
 }
 .vakata-context .vakata-context-hover > a {
-  position: relative;
-  background-color: #e8eff7;
-  -moz-box-shadow: 0 0 2px #0a6aa1;
-  -webkit-box-shadow: 0 0 2px #0a6aa1;
-  box-shadow: 0 0 2px #0a6aa1;
+    position: relative;
+    background-color: #e8eff7;
+    -moz-box-shadow: 0 0 2px #0a6aa1;
+    -webkit-box-shadow: 0 0 2px #0a6aa1;
+    box-shadow: 0 0 2px #0a6aa1;
 }
 .vakata-context .vakata-context-separator > a,
 .vakata-context .vakata-context-separator > a:hover {
-  background: white;
-  border: 0;
-  border-top: 1px solid #e2e3e3;
-  height: 1px;
-  min-height: 1px;
-  max-height: 1px;
-  padding: 0;
-  margin: 0 0 0 2.4em;
-  border-left: 1px solid #e0e0e0;
-  -moz-text-shadow: 0 0 0 transparent;
-  -webkit-text-shadow: 0 0 0 transparent;
-  text-shadow: 0 0 0 transparent;
-  -moz-box-shadow: 0 0 0 transparent;
-  -webkit-box-shadow: 0 0 0 transparent;
-  box-shadow: 0 0 0 transparent;
-  -moz-border-radius: 0;
-  -webkit-border-radius: 0;
-  border-radius: 0;
+    background: white;
+    border: 0;
+    border-top: 1px solid #e2e3e3;
+    height: 1px;
+    min-height: 1px;
+    max-height: 1px;
+    padding: 0;
+    margin: 0 0 0 2.4em;
+    border-left: 1px solid #e0e0e0;
+    -moz-text-shadow: 0 0 0 transparent;
+    -webkit-text-shadow: 0 0 0 transparent;
+    text-shadow: 0 0 0 transparent;
+    -moz-box-shadow: 0 0 0 transparent;
+    -webkit-box-shadow: 0 0 0 transparent;
+    box-shadow: 0 0 0 transparent;
+    -moz-border-radius: 0;
+    -webkit-border-radius: 0;
+    border-radius: 0;
 }
 .vakata-context .vakata-contextmenu-disabled a,
 .vakata-context .vakata-contextmenu-disabled a:hover {
-  color: silver;
-  background-color: transparent;
-  border: 0;
-  box-shadow: 0 0 0;
+    color: silver;
+    background-color: transparent;
+    border: 0;
+    box-shadow: 0 0 0;
 }
 .vakata-context li > a > i {
-  text-decoration: none;
-  display: inline-block;
-  width: 2.4em;
-  height: 2.4em;
-  background: transparent;
-  margin: 0 0 0 -2em;
-  vertical-align: top;
-  text-align: center;
-  line-height: 2.4em;
+    text-decoration: none;
+    display: inline-block;
+    width: 2.4em;
+    height: 2.4em;
+    background: transparent;
+    margin: 0 0 0 -2em;
+    vertical-align: top;
+    text-align: center;
+    line-height: 2.4em;
 }
 .vakata-context li > a > i:empty {
-  width: 2.4em;
-  line-height: 2.4em;
+    width: 2.4em;
+    line-height: 2.4em;
 }
 .vakata-context li > a .vakata-contextmenu-sep {
-  display: inline-block;
-  width: 1px;
-  height: 2.4em;
-  background: white;
-  margin: 0 0.5em 0 0;
-  border-left: 1px solid #e2e3e3;
+    display: inline-block;
+    width: 1px;
+    height: 2.4em;
+    background: white;
+    margin: 0 0.5em 0 0;
+    border-left: 1px solid #e2e3e3;
 }
 .vakata-context .vakata-contextmenu-shortcut {
-  font-size: 0.8em;
-  color: silver;
-  opacity: 0.5;
-  display: none;
+    font-size: 0.8em;
+    color: silver;
+    opacity: 0.5;
+    display: none;
 }
 .vakata-context-rtl ul {
-  left: auto;
-  right: 100%;
-  margin-left: auto;
-  margin-right: -4px;
+    left: auto;
+    right: 100%;
+    margin-left: auto;
+    margin-right: -4px;
 }
 .vakata-context-rtl li > a.vakata-context-parent {
-  background-image: url("data:image/gif;base64,R0lGODlhCwAHAIAAACgoKP///yH5BAEAAAEALAAAAAALAAcAAAINjI+AC7rWHIsPtmoxLAA7");
-  background-position: left center;
-  background-repeat: no-repeat;
+    background-image: url('data:image/gif;base64,R0lGODlhCwAHAIAAACgoKP///yH5BAEAAAEALAAAAAALAAcAAAINjI+AC7rWHIsPtmoxLAA7');
+    background-position: left center;
+    background-repeat: no-repeat;
 }
 .vakata-context-rtl .vakata-context-separator > a {
-  margin: 0 2.4em 0 0;
-  border-left: 0;
-  border-right: 1px solid #e2e3e3;
+    margin: 0 2.4em 0 0;
+    border-left: 0;
+    border-right: 1px solid #e2e3e3;
 }
 .vakata-context-rtl .vakata-context-left ul {
-  right: auto;
-  left: 100%;
-  margin-left: -4px;
-  margin-right: auto;
+    right: auto;
+    left: 100%;
+    margin-left: -4px;
+    margin-right: auto;
 }
 .vakata-context-rtl li > a > i {
-  margin: 0 -2em 0 0;
+    margin: 0 -2em 0 0;
 }
 .vakata-context-rtl li > a .vakata-contextmenu-sep {
-  margin: 0 0 0 0.5em;
-  border-left-color: white;
-  background: #e2e3e3;
+    margin: 0 0 0 0.5em;
+    border-left-color: white;
+    background: #e2e3e3;
 }
 #jstree-marker {
-  position: absolute;
-  top: 0;
-  left: 0;
-  margin: -5px 0 0 0;
-  padding: 0;
-  border-right: 0;
-  border-top: 5px solid transparent;
-  border-bottom: 5px solid transparent;
-  border-left: 5px solid;
-  width: 0;
-  height: 0;
-  font-size: 0;
-  line-height: 0;
+    position: absolute;
+    top: 0;
+    left: 0;
+    margin: -5px 0 0 0;
+    padding: 0;
+    border-right: 0;
+    border-top: 5px solid transparent;
+    border-bottom: 5px solid transparent;
+    border-left: 5px solid;
+    width: 0;
+    height: 0;
+    font-size: 0;
+    line-height: 0;
 }
 #jstree-dnd {
-  line-height: 16px;
-  margin: 0;
-  padding: 4px;
+    line-height: 16px;
+    margin: 0;
+    padding: 4px;
 }
 #jstree-dnd .jstree-icon,
 #jstree-dnd .jstree-copy {
-  display: inline-block;
-  text-decoration: none;
-  margin: 0 2px 0 0;
-  padding: 0;
-  width: 16px;
-  height: 16px;
+    display: inline-block;
+    text-decoration: none;
+    margin: 0 2px 0 0;
+    padding: 0;
+    width: 16px;
+    height: 16px;
 }
 #jstree-dnd .jstree-ok {
-  background: green;
+    background: green;
 }
 #jstree-dnd .jstree-er {
-  background: red;
+    background: red;
 }
 #jstree-dnd .jstree-copy {
-  margin: 0 2px 0 2px;
+    margin: 0 2px 0 2px;
 }
 .jstree-default .jstree-node,
 .jstree-default .jstree-icon {
-  background-repeat: no-repeat;
-  background-color: transparent;
+    background-repeat: no-repeat;
+    background-color: transparent;
 }
 .jstree-default .jstree-anchor,
 .jstree-default .jstree-wholerow {
-  transition: background-color 0.15s, box-shadow 0.15s;
+    transition: background-color 0.15s, box-shadow 0.15s;
 }
 .jstree-default .jstree-hovered {
-  background: #e7f4f9;
-  border-radius: 2px;
-  box-shadow: inset 0 0 1px #cccccc;
+    background: #e7f4f9;
+    border-radius: 2px;
+    box-shadow: inset 0 0 1px #cccccc;
 }
 .jstree-default .jstree-clicked {
-  background: transparent;
+    background: transparent;
+}
+.jstree-default .jstree-clicked.jstree-hovered {
+    background: #e7f4f9;
 }
-.jstree-default .jstree-clicked.jstree-hovered{
-  background: #e7f4f9;
- }
 .jstree-default .jstree-no-icons .jstree-anchor > .jstree-themeicon {
-  display: none;
+    display: none;
 }
 .jstree-default .jstree-disabled {
-  background: transparent;
-  color: #666666;
+    background: transparent;
+    color: #666666;
 }
 .jstree-default .jstree-disabled.jstree-hovered {
-  background: transparent;
-  box-shadow: none;
+    background: transparent;
+    box-shadow: none;
 }
 .jstree-default .jstree-disabled.jstree-clicked {
-  background: #efefef;
+    background: #efefef;
 }
 .jstree-default .jstree-disabled > .jstree-icon {
-  opacity: 0.8;
-  filter: url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'jstree-grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#jstree-grayscale");
-  /* Firefox 10+ */
-  filter: gray;
-  /* IE6-9 */
-  -webkit-filter: grayscale(100%);
-  /* Chrome 19+ & Safari 6+ */
+    opacity: 0.8;
+    filter: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg'><filter id='jstree-grayscale'><feColorMatrix type='matrix' values='0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0'/></filter></svg>#jstree-grayscale");
+    /* Firefox 10+ */
+    filter: gray;
+    /* IE6-9 */
+    -webkit-filter: grayscale(100%);
+    /* Chrome 19+ & Safari 6+ */
 }
 .jstree-default .jstree-search {
-  font-style: italic !important;
-  color: #3786C2 !important;
-  font-weight: bold;
+    font-style: italic !important;
+    color: #3786c2 !important;
+    font-weight: bold;
 }
 .jstree-default .jstree-no-checkboxes .jstree-checkbox {
-  display: none !important;
+    display: none !important;
 }
 .jstree-default.jstree-checkbox-no-clicked .jstree-clicked {
-  background: transparent;
-  box-shadow: none;
+    background: transparent;
+    box-shadow: none;
 }
 .jstree-default.jstree-checkbox-no-clicked .jstree-clicked.jstree-hovered {
-  background: #e7f4f9;
+    background: #e7f4f9;
 }
-.jstree-default.jstree-checkbox-no-clicked > .jstree-wholerow-ul .jstree-wholerow-clicked {
-  background: transparent;
+.jstree-default.jstree-checkbox-no-clicked
+    > .jstree-wholerow-ul
+    .jstree-wholerow-clicked {
+    background: transparent;
 }
-.jstree-default.jstree-checkbox-no-clicked > .jstree-wholerow-ul .jstree-wholerow-clicked.jstree-wholerow-hovered {
-  background: #e7f4f9;
+.jstree-default.jstree-checkbox-no-clicked
+    > .jstree-wholerow-ul
+    .jstree-wholerow-clicked.jstree-wholerow-hovered {
+    background: #e7f4f9;
 }
 .jstree-default > .jstree-striped {
-  min-width: 100%;
-  display: inline-block;
-  background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAkCAMAAAB/qqA+AAAABlBMVEUAAAAAAAClZ7nPAAAAAnRSTlMNAMM9s3UAAAAXSURBVHjajcEBAQAAAIKg/H/aCQZ70AUBjAATb6YPDgAAAABJRU5ErkJggg==") left top repeat;
+    min-width: 100%;
+    display: inline-block;
+    background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAkCAMAAAB/qqA+AAAABlBMVEUAAAAAAAClZ7nPAAAAAnRSTlMNAMM9s3UAAAAXSURBVHjajcEBAQAAAIKg/H/aCQZ70AUBjAATb6YPDgAAAABJRU5ErkJggg==')
+        left top repeat;
 }
 .jstree-default > .jstree-wholerow-ul .jstree-hovered,
 .jstree-default > .jstree-wholerow-ul .jstree-clicked {
-  background: transparent;
-  box-shadow: none;
-  border-radius: 0;
+    background: transparent;
+    box-shadow: none;
+    border-radius: 0;
 }
 .jstree-default .jstree-wholerow {
-  -moz-box-sizing: border-box;
-  -webkit-box-sizing: border-box;
-  box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
 }
 .jstree-default .jstree-wholerow-hovered {
-  background: #e7f4f9;
+    background: #e7f4f9;
 }
 .jstree-default .jstree-wholerow-clicked {
-  background: #beebff;
-  background: -moz-linear-gradient(top, #beebff 0%, #a8e4ff 100%);
-  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #beebff), color-stop(100%, #a8e4ff));
-  background: -webkit-linear-gradient(top, #beebff 0%, #a8e4ff 100%);
-  background: -o-linear-gradient(top, #beebff 0%, #a8e4ff 100%);
-  background: -ms-linear-gradient(top, #beebff 0%, #a8e4ff 100%);
-  background: linear-gradient(to bottom, #beebff 0%, #a8e4ff 100%);
-  /*filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='@color1', endColorstr='@color2',GradientType=0 );*/
+    background: #beebff;
+    background: -moz-linear-gradient(top, #beebff 0%, #a8e4ff 100%);
+    background: -webkit-gradient(
+        linear,
+        left top,
+        left bottom,
+        color-stop(0%, #beebff),
+        color-stop(100%, #a8e4ff)
+    );
+    background: -webkit-linear-gradient(top, #beebff 0%, #a8e4ff 100%);
+    background: -o-linear-gradient(top, #beebff 0%, #a8e4ff 100%);
+    background: -ms-linear-gradient(top, #beebff 0%, #a8e4ff 100%);
+    background: linear-gradient(to bottom, #beebff 0%, #a8e4ff 100%);
+    /*filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='@color1', endColorstr='@color2',GradientType=0 );*/
 }
 .jstree-default .jstree-node {
-  min-height: 24px;
-  line-height: 24px;
-  margin-left: 24px;
-  min-width: 24px;
+    min-height: 24px;
+    line-height: 24px;
+    margin-left: 24px;
+    min-width: 24px;
 }
 .jstree-default .jstree-anchor {
-  line-height: 24px;
-  height: 24px;
+    line-height: 24px;
+    height: 24px;
 }
 .jstree-default .jstree-icon {
-  width: 24px;
-  height: 24px;
-  line-height: 24px;
+    width: 24px;
+    height: 24px;
+    line-height: 24px;
 }
 .jstree-default .jstree-icon:empty {
-  width: 24px;
-  height: 24px;
-  line-height: 24px;
+    width: 24px;
+    height: 24px;
+    line-height: 24px;
 }
 .jstree-default.jstree-rtl .jstree-node {
-  margin-right: 24px;
+    margin-right: 24px;
 }
 .jstree-default .jstree-wholerow {
-  height: 24px;
+    height: 24px;
 }
 .jstree-default .jstree-node,
 .jstree-default .jstree-icon {
-  background-image: url("32px.png");
+    background-image: url('32px.png');
 }
 .jstree-default .jstree-node {
-  background-position: -292px -4px;
-  background-repeat: repeat-y;
+    background-position: -292px -4px;
+    background-repeat: repeat-y;
 }
 .jstree-default .jstree-last {
-  background: transparent;
+    background: transparent;
 }
 .jstree-default .jstree-open > .jstree-ocl {
-  background-position: -132px -4px;
+    background-position: -132px -4px;
 }
 .jstree-default .jstree-closed > .jstree-ocl {
-  background-position: -100px -4px;
+    background-position: -100px -4px;
 }
 .jstree-default .jstree-leaf > .jstree-ocl {
-  background-position: -68px -4px;
+    background-position: -68px -4px;
 }
 .jstree-default .jstree-themeicon {
-  background-position: -260px -4px;
+    background-position: -260px -4px;
 }
 .jstree-default > .jstree-no-dots .jstree-node,
 .jstree-default > .jstree-no-dots .jstree-leaf > .jstree-ocl {
-  background: transparent;
+    background: transparent;
 }
 .jstree-default > .jstree-no-dots .jstree-open > .jstree-ocl {
-  background-position: -36px -4px;
+    background-position: -36px -4px;
 }
 .jstree-default > .jstree-no-dots .jstree-closed > .jstree-ocl {
-  background-position: -4px -4px;
+    background-position: -4px -4px;
 }
 .jstree-default .jstree-disabled {
-  background: transparent;
+    background: transparent;
 }
 .jstree-default .jstree-disabled.jstree-hovered {
-  background: transparent;
+    background: transparent;
 }
 .jstree-default .jstree-disabled.jstree-clicked {
-  background: #efefef;
+    background: #efefef;
 }
 .jstree-default .jstree-checkbox {
-  background-position: -164px -4px;
+    background-position: -164px -4px;
 }
 .jstree-default .jstree-checkbox:hover {
-  background-position: -164px -36px;
+    background-position: -164px -36px;
 }
 .jstree-default.jstree-checkbox-selection .jstree-clicked > .jstree-checkbox,
 .jstree-default .jstree-checked > .jstree-checkbox {
-  background-position: -228px -4px;
+    background-position: -228px -4px;
 }
-.jstree-default.jstree-checkbox-selection .jstree-clicked > .jstree-checkbox:hover,
+.jstree-default.jstree-checkbox-selection
+    .jstree-clicked
+    > .jstree-checkbox:hover,
 .jstree-default .jstree-checked > .jstree-checkbox:hover {
-  background-position: -228px -36px;
+    background-position: -228px -36px;
 }
 .jstree-default .jstree-anchor > .jstree-undetermined {
-  background-position: -196px -4px;
+    background-position: -196px -4px;
 }
 .jstree-default .jstree-anchor > .jstree-undetermined:hover {
-  background-position: -196px -36px;
+    background-position: -196px -36px;
 }
 .jstree-default > .jstree-striped {
-  background-size: auto 48px;
+    background-size: auto 48px;
 }
 .jstree-default.jstree-rtl .jstree-node {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==");
-  background-position: 100% 1px;
-  background-repeat: repeat-y;
+    background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==');
+    background-position: 100% 1px;
+    background-repeat: repeat-y;
 }
 .jstree-default.jstree-rtl .jstree-last {
-  background: transparent;
+    background: transparent;
 }
 .jstree-default.jstree-rtl .jstree-open > .jstree-ocl {
-  background-position: -132px -36px;
+    background-position: -132px -36px;
 }
 .jstree-default.jstree-rtl .jstree-closed > .jstree-ocl {
-  background-position: -100px -36px;
+    background-position: -100px -36px;
 }
 .jstree-default.jstree-rtl .jstree-leaf > .jstree-ocl {
-  background-position: -68px -36px;
+    background-position: -68px -36px;
 }
 .jstree-default.jstree-rtl > .jstree-no-dots .jstree-node,
 .jstree-default.jstree-rtl > .jstree-no-dots .jstree-leaf > .jstree-ocl {
-  background: transparent;
+    background: transparent;
 }
 .jstree-default.jstree-rtl > .jstree-no-dots .jstree-open > .jstree-ocl {
-  background-position: -36px -36px;
+    background-position: -36px -36px;
 }
 .jstree-default.jstree-rtl > .jstree-no-dots .jstree-closed > .jstree-ocl {
-  background-position: -4px -36px;
+    background-position: -4px -36px;
 }
 .jstree-default .jstree-themeicon-custom {
-  background-color: transparent;
-  background-image: none;
-  background-position: 0 0;
+    background-color: transparent;
+    background-image: none;
+    background-position: 0 0;
 }
 .jstree-default > .jstree-container-ul .jstree-loading > .jstree-ocl {
-  background: url("throbber.gif") center center no-repeat;
+    background: url('throbber.gif') center center no-repeat;
 }
 .jstree-default .jstree-file {
-  background: url("32px.png") -100px -68px no-repeat;
+    background: url('32px.png') -100px -68px no-repeat;
 }
 .jstree-default .jstree-folder {
-  background: url("32px.png") -260px -4px no-repeat;
+    background: url('32px.png') -260px -4px no-repeat;
 }
 .jstree-default > .jstree-container-ul > .jstree-node {
-  margin-left: 0;
-  margin-right: 0;
+    margin-left: 0;
+    margin-right: 0;
 }
 #jstree-dnd.jstree-default {
-  line-height: 24px;
-  padding: 0 4px;
+    line-height: 24px;
+    padding: 0 4px;
 }
 #jstree-dnd.jstree-default .jstree-ok,
 #jstree-dnd.jstree-default .jstree-er {
-  background-image: url("32px.png");
-  background-repeat: no-repeat;
-  background-color: transparent;
+    background-image: url('32px.png');
+    background-repeat: no-repeat;
+    background-color: transparent;
 }
 #jstree-dnd.jstree-default i {
-  background: transparent;
-  width: 24px;
-  height: 24px;
-  line-height: 24px;
+    background: transparent;
+    width: 24px;
+    height: 24px;
+    line-height: 24px;
 }
 #jstree-dnd.jstree-default .jstree-ok {
-  background-position: -4px -68px;
+    background-position: -4px -68px;
 }
 #jstree-dnd.jstree-default .jstree-er {
-  background-position: -36px -68px;
+    background-position: -36px -68px;
 }
 .jstree-default.jstree-rtl .jstree-node {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==");
+    background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==');
 }
 .jstree-default.jstree-rtl .jstree-last {
-  background: transparent;
+    background: transparent;
 }
 .jstree-default-small .jstree-node {
-  min-height: 18px;
-  line-height: 18px;
-  margin-left: 18px;
-  min-width: 18px;
+    min-height: 18px;
+    line-height: 18px;
+    margin-left: 18px;
+    min-width: 18px;
 }
 .jstree-default-small .jstree-anchor {
-  line-height: 18px;
-  height: 18px;
+    line-height: 18px;
+    height: 18px;
 }
 .jstree-default-small .jstree-icon {
-  width: 18px;
-  height: 18px;
-  line-height: 18px;
+    width: 18px;
+    height: 18px;
+    line-height: 18px;
 }
 .jstree-default-small .jstree-icon:empty {
-  width: 18px;
-  height: 18px;
-  line-height: 18px;
+    width: 18px;
+    height: 18px;
+    line-height: 18px;
 }
 .jstree-default-small.jstree-rtl .jstree-node {
-  margin-right: 18px;
+    margin-right: 18px;
 }
 .jstree-default-small .jstree-wholerow {
-  height: 18px;
+    height: 18px;
 }
 .jstree-default-small .jstree-node,
 .jstree-default-small .jstree-icon {
-  background-image: url("32px.png");
+    background-image: url('32px.png');
 }
 .jstree-default-small .jstree-node {
-  background-position: -295px -7px;
-  background-repeat: repeat-y;
+    background-position: -295px -7px;
+    background-repeat: repeat-y;
 }
 .jstree-default-small .jstree-last {
-  background: transparent;
+    background: transparent;
 }
 .jstree-default-small .jstree-open > .jstree-ocl {
-  background-position: -135px -7px;
+    background-position: -135px -7px;
 }
 .jstree-default-small .jstree-closed > .jstree-ocl {
-  background-position: -103px -7px;
+    background-position: -103px -7px;
 }
 .jstree-default-small .jstree-leaf > .jstree-ocl {
-  background-position: -71px -7px;
+    background-position: -71px -7px;
 }
 .jstree-default-small .jstree-themeicon {
-  background-position: -263px -7px;
+    background-position: -263px -7px;
 }
 .jstree-default-small > .jstree-no-dots .jstree-node,
 .jstree-default-small > .jstree-no-dots .jstree-leaf > .jstree-ocl {
-  background: transparent;
+    background: transparent;
 }
 .jstree-default-small > .jstree-no-dots .jstree-open > .jstree-ocl {
-  background-position: -39px -7px;
+    background-position: -39px -7px;
 }
 .jstree-default-small > .jstree-no-dots .jstree-closed > .jstree-ocl {
-  background-position: -7px -7px;
+    background-position: -7px -7px;
 }
 .jstree-default-small .jstree-disabled {
-  background: transparent;
+    background: transparent;
 }
 .jstree-default-small .jstree-disabled.jstree-hovered {
-  background: transparent;
+    background: transparent;
 }
 .jstree-default-small .jstree-disabled.jstree-clicked {
-  background: #efefef;
+    background: #efefef;
 }
 .jstree-default-small .jstree-checkbox {
-  background-position: -167px -7px;
+    background-position: -167px -7px;
 }
 .jstree-default-small .jstree-checkbox:hover {
-  background-position: -167px -39px;
+    background-position: -167px -39px;
 }
-.jstree-default-small.jstree-checkbox-selection .jstree-clicked > .jstree-checkbox,
+.jstree-default-small.jstree-checkbox-selection
+    .jstree-clicked
+    > .jstree-checkbox,
 .jstree-default-small .jstree-checked > .jstree-checkbox {
-  background-position: -231px -7px;
+    background-position: -231px -7px;
 }
-.jstree-default-small.jstree-checkbox-selection .jstree-clicked > .jstree-checkbox:hover,
+.jstree-default-small.jstree-checkbox-selection
+    .jstree-clicked
+    > .jstree-checkbox:hover,
 .jstree-default-small .jstree-checked > .jstree-checkbox:hover {
-  background-position: -231px -39px;
+    background-position: -231px -39px;
 }
 .jstree-default-small .jstree-anchor > .jstree-undetermined {
-  background-position: -199px -7px;
+    background-position: -199px -7px;
 }
 .jstree-default-small .jstree-anchor > .jstree-undetermined:hover {
-  background-position: -199px -39px;
+    background-position: -199px -39px;
 }
 .jstree-default-small > .jstree-striped {
-  background-size: auto 36px;
+    background-size: auto 36px;
 }
 .jstree-default-small.jstree-rtl .jstree-node {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==");
-  background-position: 100% 1px;
-  background-repeat: repeat-y;
+    background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==');
+    background-position: 100% 1px;
+    background-repeat: repeat-y;
 }
 .jstree-default-small.jstree-rtl .jstree-last {
-  background: transparent;
+    background: transparent;
 }
 .jstree-default-small.jstree-rtl .jstree-open > .jstree-ocl {
-  background-position: -135px -39px;
+    background-position: -135px -39px;
 }
 .jstree-default-small.jstree-rtl .jstree-closed > .jstree-ocl {
-  background-position: -103px -39px;
+    background-position: -103px -39px;
 }
 .jstree-default-small.jstree-rtl .jstree-leaf > .jstree-ocl {
-  background-position: -71px -39px;
+    background-position: -71px -39px;
 }
 .jstree-default-small.jstree-rtl > .jstree-no-dots .jstree-node,
 .jstree-default-small.jstree-rtl > .jstree-no-dots .jstree-leaf > .jstree-ocl {
-  background: transparent;
+    background: transparent;
 }
 .jstree-default-small.jstree-rtl > .jstree-no-dots .jstree-open > .jstree-ocl {
-  background-position: -39px -39px;
+    background-position: -39px -39px;
 }
-.jstree-default-small.jstree-rtl > .jstree-no-dots .jstree-closed > .jstree-ocl {
-  background-position: -7px -39px;
+.jstree-default-small.jstree-rtl
+    > .jstree-no-dots
+    .jstree-closed
+    > .jstree-ocl {
+    background-position: -7px -39px;
 }
 .jstree-default-small .jstree-themeicon-custom {
-  background-color: transparent;
-  background-image: none;
-  background-position: 0 0;
+    background-color: transparent;
+    background-image: none;
+    background-position: 0 0;
 }
 .jstree-default-small > .jstree-container-ul .jstree-loading > .jstree-ocl {
-  background: url("throbber.gif") center center no-repeat;
+    background: url('throbber.gif') center center no-repeat;
 }
 .jstree-default-small .jstree-file {
-  background: url("32px.png") -103px -71px no-repeat;
+    background: url('32px.png') -103px -71px no-repeat;
 }
 .jstree-default-small .jstree-folder {
-  background: url("32px.png") -263px -7px no-repeat;
+    background: url('32px.png') -263px -7px no-repeat;
 }
 .jstree-default-small > .jstree-container-ul > .jstree-node {
-  margin-left: 0;
-  margin-right: 0;
+    margin-left: 0;
+    margin-right: 0;
 }
 #jstree-dnd.jstree-default-small {
-  line-height: 18px;
-  padding: 0 4px;
+    line-height: 18px;
+    padding: 0 4px;
 }
 #jstree-dnd.jstree-default-small .jstree-ok,
 #jstree-dnd.jstree-default-small .jstree-er {
-  background-image: url("32px.png");
-  background-repeat: no-repeat;
-  background-color: transparent;
+    background-image: url('32px.png');
+    background-repeat: no-repeat;
+    background-color: transparent;
 }
 #jstree-dnd.jstree-default-small i {
-  background: transparent;
-  width: 18px;
-  height: 18px;
-  line-height: 18px;
+    background: transparent;
+    width: 18px;
+    height: 18px;
+    line-height: 18px;
 }
 #jstree-dnd.jstree-default-small .jstree-ok {
-  background-position: -7px -71px;
+    background-position: -7px -71px;
 }
 #jstree-dnd.jstree-default-small .jstree-er {
-  background-position: -39px -71px;
+    background-position: -39px -71px;
 }
 .jstree-default-small.jstree-rtl .jstree-node {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAACAQMAAABv1h6PAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMHBgAAiABBI4gz9AAAAABJRU5ErkJggg==");
+    background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAACAQMAAABv1h6PAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMHBgAAiABBI4gz9AAAAABJRU5ErkJggg==');
 }
 .jstree-default-small.jstree-rtl .jstree-last {
-  background: transparent;
+    background: transparent;
 }
 .jstree-default-large .jstree-node {
-  min-height: 32px;
-  line-height: 32px;
-  margin-left: 32px;
-  min-width: 32px;
+    min-height: 32px;
+    line-height: 32px;
+    margin-left: 32px;
+    min-width: 32px;
 }
 .jstree-default-large .jstree-anchor {
-  line-height: 32px;
-  height: 32px;
+    line-height: 32px;
+    height: 32px;
 }
 .jstree-default-large .jstree-icon {
-  width: 32px;
-  height: 32px;
-  line-height: 32px;
+    width: 32px;
+    height: 32px;
+    line-height: 32px;
 }
 .jstree-default-large .jstree-icon:empty {
-  width: 32px;
-  height: 32px;
-  line-height: 32px;
+    width: 32px;
+    height: 32px;
+    line-height: 32px;
 }
 .jstree-default-large.jstree-rtl .jstree-node {
-  margin-right: 32px;
+    margin-right: 32px;
 }
 .jstree-default-large .jstree-wholerow {
-  height: 32px;
+    height: 32px;
 }
 .jstree-default-large .jstree-node,
 .jstree-default-large .jstree-icon {
-  background-image: url("32px.png");
+    background-image: url('32px.png');
 }
 .jstree-default-large .jstree-node {
-  background-position: -288px 0px;
-  background-repeat: repeat-y;
+    background-position: -288px 0px;
+    background-repeat: repeat-y;
 }
 .jstree-default-large .jstree-last {
-  background: transparent;
+    background: transparent;
 }
 .jstree-default-large .jstree-open > .jstree-ocl {
-  background-position: -128px 0px;
+    background-position: -128px 0px;
 }
 .jstree-default-large .jstree-closed > .jstree-ocl {
-  background-position: -96px 0px;
+    background-position: -96px 0px;
 }
 .jstree-default-large .jstree-leaf > .jstree-ocl {
-  background-position: -64px 0px;
+    background-position: -64px 0px;
 }
 .jstree-default-large .jstree-themeicon {
-  background-position: -256px 0px;
+    background-position: -256px 0px;
 }
 .jstree-default-large > .jstree-no-dots .jstree-node,
 .jstree-default-large > .jstree-no-dots .jstree-leaf > .jstree-ocl {
-  background: transparent;
+    background: transparent;
 }
 .jstree-default-large > .jstree-no-dots .jstree-open > .jstree-ocl {
-  background-position: -32px 0px;
+    background-position: -32px 0px;
 }
 .jstree-default-large > .jstree-no-dots .jstree-closed > .jstree-ocl {
-  background-position: 0px 0px;
+    background-position: 0px 0px;
 }
 .jstree-default-large .jstree-disabled {
-  background: transparent;
+    background: transparent;
 }
 .jstree-default-large .jstree-disabled.jstree-hovered {
-  background: transparent;
+    background: transparent;
 }
 .jstree-default-large .jstree-disabled.jstree-clicked {
-  background: #efefef;
+    background: #efefef;
 }
 .jstree-default-large .jstree-checkbox {
-  background-position: -160px 0px;
+    background-position: -160px 0px;
 }
 .jstree-default-large .jstree-checkbox:hover {
-  background-position: -160px -32px;
+    background-position: -160px -32px;
 }
-.jstree-default-large.jstree-checkbox-selection .jstree-clicked > .jstree-checkbox,
+.jstree-default-large.jstree-checkbox-selection
+    .jstree-clicked
+    > .jstree-checkbox,
 .jstree-default-large .jstree-checked > .jstree-checkbox {
-  background-position: -224px 0px;
+    background-position: -224px 0px;
 }
-.jstree-default-large.jstree-checkbox-selection .jstree-clicked > .jstree-checkbox:hover,
+.jstree-default-large.jstree-checkbox-selection
+    .jstree-clicked
+    > .jstree-checkbox:hover,
 .jstree-default-large .jstree-checked > .jstree-checkbox:hover {
-  background-position: -224px -32px;
+    background-position: -224px -32px;
 }
 .jstree-default-large .jstree-anchor > .jstree-undetermined {
-  background-position: -192px 0px;
+    background-position: -192px 0px;
 }
 .jstree-default-large .jstree-anchor > .jstree-undetermined:hover {
-  background-position: -192px -32px;
+    background-position: -192px -32px;
 }
 .jstree-default-large > .jstree-striped {
-  background-size: auto 64px;
+    background-size: auto 64px;
 }
 .jstree-default-large.jstree-rtl .jstree-node {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==");
-  background-position: 100% 1px;
-  background-repeat: repeat-y;
+    background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==');
+    background-position: 100% 1px;
+    background-repeat: repeat-y;
 }
 .jstree-default-large.jstree-rtl .jstree-last {
-  background: transparent;
+    background: transparent;
 }
 .jstree-default-large.jstree-rtl .jstree-open > .jstree-ocl {
-  background-position: -128px -32px;
+    background-position: -128px -32px;
 }
 .jstree-default-large.jstree-rtl .jstree-closed > .jstree-ocl {
-  background-position: -96px -32px;
+    background-position: -96px -32px;
 }
 .jstree-default-large.jstree-rtl .jstree-leaf > .jstree-ocl {
-  background-position: -64px -32px;
+    background-position: -64px -32px;
 }
 .jstree-default-large.jstree-rtl > .jstree-no-dots .jstree-node,
 .jstree-default-large.jstree-rtl > .jstree-no-dots .jstree-leaf > .jstree-ocl {
-  background: transparent;
+    background: transparent;
 }
 .jstree-default-large.jstree-rtl > .jstree-no-dots .jstree-open > .jstree-ocl {
-  background-position: -32px -32px;
+    background-position: -32px -32px;
 }
-.jstree-default-large.jstree-rtl > .jstree-no-dots .jstree-closed > .jstree-ocl {
-  background-position: 0px -32px;
+.jstree-default-large.jstree-rtl
+    > .jstree-no-dots
+    .jstree-closed
+    > .jstree-ocl {
+    background-position: 0px -32px;
 }
 .jstree-default-large .jstree-themeicon-custom {
-  background-color: transparent;
-  background-image: none;
-  background-position: 0 0;
+    background-color: transparent;
+    background-image: none;
+    background-position: 0 0;
 }
 .jstree-default-large > .jstree-container-ul .jstree-loading > .jstree-ocl {
-  background: url("throbber.gif") center center no-repeat;
+    background: url('throbber.gif') center center no-repeat;
 }
 .jstree-default-large .jstree-file {
-  background: url("32px.png") -96px -64px no-repeat;
+    background: url('32px.png') -96px -64px no-repeat;
 }
 .jstree-default-large .jstree-folder {
-  background: url("32px.png") -256px 0px no-repeat;
+    background: url('32px.png') -256px 0px no-repeat;
 }
 .jstree-default-large > .jstree-container-ul > .jstree-node {
-  margin-left: 0;
-  margin-right: 0;
+    margin-left: 0;
+    margin-right: 0;
 }
 #jstree-dnd.jstree-default-large {
-  line-height: 32px;
-  padding: 0 4px;
+    line-height: 32px;
+    padding: 0 4px;
 }
 #jstree-dnd.jstree-default-large .jstree-ok,
 #jstree-dnd.jstree-default-large .jstree-er {
-  background-image: url("32px.png");
-  background-repeat: no-repeat;
-  background-color: transparent;
+    background-image: url('32px.png');
+    background-repeat: no-repeat;
+    background-color: transparent;
 }
 #jstree-dnd.jstree-default-large i {
-  background: transparent;
-  width: 32px;
-  height: 32px;
-  line-height: 32px;
+    background: transparent;
+    width: 32px;
+    height: 32px;
+    line-height: 32px;
 }
 #jstree-dnd.jstree-default-large .jstree-ok {
-  background-position: 0px -64px;
+    background-position: 0px -64px;
 }
 #jstree-dnd.jstree-default-large .jstree-er {
-  background-position: -32px -64px;
+    background-position: -32px -64px;
 }
 .jstree-default-large.jstree-rtl .jstree-node {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAACAQMAAAAD0EyKAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjgIIGBgABCgCBvVLXcAAAAABJRU5ErkJggg==");
+    background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAACAQMAAAAD0EyKAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjgIIGBgABCgCBvVLXcAAAAABJRU5ErkJggg==');
 }
 .jstree-default-large.jstree-rtl .jstree-last {
-  background: transparent;
+    background: transparent;
 }
 @media (max-width: 768px) {
-  #jstree-dnd.jstree-dnd-responsive {
-    line-height: 40px;
-    font-weight: bold;
-    font-size: 1.1em;
-    text-shadow: 1px 1px white;
-  }
-  #jstree-dnd.jstree-dnd-responsive > i {
-    background: transparent;
-    width: 40px;
-    height: 40px;
-  }
-  #jstree-dnd.jstree-dnd-responsive > .jstree-ok {
-    background-image: url("40px.png");
-    background-position: 0 -200px;
-    background-size: 120px 240px;
-  }
-  #jstree-dnd.jstree-dnd-responsive > .jstree-er {
-    background-image: url("40px.png");
-    background-position: -40px -200px;
-    background-size: 120px 240px;
-  }
-  #jstree-marker.jstree-dnd-responsive {
-    border-left-width: 10px;
-    border-top-width: 10px;
-    border-bottom-width: 10px;
-    margin-top: -10px;
-  }
+    #jstree-dnd.jstree-dnd-responsive {
+        line-height: 40px;
+        font-weight: bold;
+        font-size: 1.1em;
+        text-shadow: 1px 1px white;
+    }
+    #jstree-dnd.jstree-dnd-responsive > i {
+        background: transparent;
+        width: 40px;
+        height: 40px;
+    }
+    #jstree-dnd.jstree-dnd-responsive > .jstree-ok {
+        background-image: url('40px.png');
+        background-position: 0 -200px;
+        background-size: 120px 240px;
+    }
+    #jstree-dnd.jstree-dnd-responsive > .jstree-er {
+        background-image: url('40px.png');
+        background-position: -40px -200px;
+        background-size: 120px 240px;
+    }
+    #jstree-marker.jstree-dnd-responsive {
+        border-left-width: 10px;
+        border-top-width: 10px;
+        border-bottom-width: 10px;
+        margin-top: -10px;
+    }
 }
 @media (max-width: 768px) {
-  .jstree-default-responsive {
-    /*
+    .jstree-default-responsive {
+        /*
 	.jstree-open > .jstree-ocl,
 	.jstree-closed > .jstree-ocl { border-radius:20px; background-color:white; }
 	*/
-  }
-  .jstree-default-responsive .jstree-icon {
-    background-image: url("40px.png");
-  }
-  .jstree-default-responsive .jstree-node,
-  .jstree-default-responsive .jstree-leaf > .jstree-ocl {
-    background: transparent;
-  }
-  .jstree-default-responsive .jstree-node {
-    min-height: 40px;
-    line-height: 40px;
-    margin-left: 40px;
-    min-width: 40px;
-    white-space: nowrap;
-  }
-  .jstree-default-responsive .jstree-anchor {
-    line-height: 40px;
-    height: 40px;
-  }
-  .jstree-default-responsive .jstree-icon,
-  .jstree-default-responsive .jstree-icon:empty {
-    width: 40px;
-    height: 40px;
-    line-height: 40px;
-  }
-  .jstree-default-responsive > .jstree-container-ul > .jstree-node {
-    margin-left: 0;
-  }
-  .jstree-default-responsive.jstree-rtl .jstree-node {
-    margin-left: 0;
-    margin-right: 40px;
-  }
-  .jstree-default-responsive.jstree-rtl .jstree-container-ul > .jstree-node {
-    margin-right: 0;
-  }
-  .jstree-default-responsive .jstree-ocl,
-  .jstree-default-responsive .jstree-themeicon,
-  .jstree-default-responsive .jstree-checkbox {
-    background-size: 120px 240px;
-  }
-  .jstree-default-responsive .jstree-leaf > .jstree-ocl {
-    background: transparent;
-  }
-  .jstree-default-responsive .jstree-open > .jstree-ocl {
-    background-position: 0 0px !important;
-  }
-  .jstree-default-responsive .jstree-closed > .jstree-ocl {
-    background-position: 0 -40px !important;
-  }
-  .jstree-default-responsive.jstree-rtl .jstree-closed > .jstree-ocl {
-    background-position: -40px 0px !important;
-  }
-  .jstree-default-responsive .jstree-themeicon {
-    background-position: -40px -40px;
-  }
-  .jstree-default-responsive .jstree-checkbox,
-  .jstree-default-responsive .jstree-checkbox:hover {
-    background-position: -40px -80px;
-  }
-  .jstree-default-responsive.jstree-checkbox-selection .jstree-clicked > .jstree-checkbox,
-  .jstree-default-responsive.jstree-checkbox-selection .jstree-clicked > .jstree-checkbox:hover,
-  .jstree-default-responsive .jstree-checked > .jstree-checkbox,
-  .jstree-default-responsive .jstree-checked > .jstree-checkbox:hover {
-    background-position: 0 -80px;
-  }
-  .jstree-default-responsive .jstree-anchor > .jstree-undetermined,
-  .jstree-default-responsive .jstree-anchor > .jstree-undetermined:hover {
-    background-position: 0 -120px;
-  }
-  .jstree-default-responsive .jstree-anchor {
-    font-weight: bold;
-    font-size: 1.1em;
-    text-shadow: 1px 1px white;
-  }
-  .jstree-default-responsive > .jstree-striped {
-    background: transparent;
-  }
-  .jstree-default-responsive .jstree-wholerow {
-    border-top: 1px solid rgba(255, 255, 255, 0.7);
-    border-bottom: 1px solid rgba(64, 64, 64, 0.2);
-    background: #ebebeb;
-    height: 40px;
-  }
-  .jstree-default-responsive .jstree-wholerow-hovered {
-    background: #e7f4f9;
-  }
-  .jstree-default-responsive .jstree-wholerow-clicked {
-    background: #beebff;
-  }
-  .jstree-default-responsive .jstree-children .jstree-last > .jstree-wholerow {
-    box-shadow: inset 0 -6px 3px -5px #666666;
-  }
-  .jstree-default-responsive .jstree-children .jstree-open > .jstree-wholerow {
-    box-shadow: inset 0 6px 3px -5px #666666;
-    border-top: 0;
-  }
-  .jstree-default-responsive .jstree-children .jstree-open + .jstree-open {
-    box-shadow: none;
-  }
-  .jstree-default-responsive .jstree-node,
-  .jstree-default-responsive .jstree-icon,
-  .jstree-default-responsive .jstree-node > .jstree-ocl,
-  .jstree-default-responsive .jstree-themeicon,
-  .jstree-default-responsive .jstree-checkbox {
-    background-image: url("40px.png");
-    background-size: 120px 240px;
-  }
-  .jstree-default-responsive .jstree-node {
-    background-position: -80px 0;
-    background-repeat: repeat-y;
-  }
-  .jstree-default-responsive .jstree-last {
-    background: transparent;
-  }
-  .jstree-default-responsive .jstree-leaf > .jstree-ocl {
-    background-position: -40px -120px;
-  }
-  .jstree-default-responsive .jstree-last > .jstree-ocl {
-    background-position: -40px -160px;
-  }
-  .jstree-default-responsive .jstree-themeicon-custom {
-    background-color: transparent;
-    background-image: none;
-    background-position: 0 0;
-  }
-  .jstree-default-responsive .jstree-file {
-    background: url("40px.png") 0 -160px no-repeat;
-    background-size: 120px 240px;
-  }
-  .jstree-default-responsive .jstree-folder {
-    background: url("40px.png") -40px -40px no-repeat;
-    background-size: 120px 240px;
-  }
-  .jstree-default-responsive > .jstree-container-ul > .jstree-node {
-    margin-left: 0;
-    margin-right: 0;
-  }
-}
\ No newline at end of file
+    }
+    .jstree-default-responsive .jstree-icon {
+        background-image: url('40px.png');
+    }
+    .jstree-default-responsive .jstree-node,
+    .jstree-default-responsive .jstree-leaf > .jstree-ocl {
+        background: transparent;
+    }
+    .jstree-default-responsive .jstree-node {
+        min-height: 40px;
+        line-height: 40px;
+        margin-left: 40px;
+        min-width: 40px;
+        white-space: nowrap;
+    }
+    .jstree-default-responsive .jstree-anchor {
+        line-height: 40px;
+        height: 40px;
+    }
+    .jstree-default-responsive .jstree-icon,
+    .jstree-default-responsive .jstree-icon:empty {
+        width: 40px;
+        height: 40px;
+        line-height: 40px;
+    }
+    .jstree-default-responsive > .jstree-container-ul > .jstree-node {
+        margin-left: 0;
+    }
+    .jstree-default-responsive.jstree-rtl .jstree-node {
+        margin-left: 0;
+        margin-right: 40px;
+    }
+    .jstree-default-responsive.jstree-rtl .jstree-container-ul > .jstree-node {
+        margin-right: 0;
+    }
+    .jstree-default-responsive .jstree-ocl,
+    .jstree-default-responsive .jstree-themeicon,
+    .jstree-default-responsive .jstree-checkbox {
+        background-size: 120px 240px;
+    }
+    .jstree-default-responsive .jstree-leaf > .jstree-ocl {
+        background: transparent;
+    }
+    .jstree-default-responsive .jstree-open > .jstree-ocl {
+        background-position: 0 0px !important;
+    }
+    .jstree-default-responsive .jstree-closed > .jstree-ocl {
+        background-position: 0 -40px !important;
+    }
+    .jstree-default-responsive.jstree-rtl .jstree-closed > .jstree-ocl {
+        background-position: -40px 0px !important;
+    }
+    .jstree-default-responsive .jstree-themeicon {
+        background-position: -40px -40px;
+    }
+    .jstree-default-responsive .jstree-checkbox,
+    .jstree-default-responsive .jstree-checkbox:hover {
+        background-position: -40px -80px;
+    }
+    .jstree-default-responsive.jstree-checkbox-selection
+        .jstree-clicked
+        > .jstree-checkbox,
+    .jstree-default-responsive.jstree-checkbox-selection
+        .jstree-clicked
+        > .jstree-checkbox:hover,
+    .jstree-default-responsive .jstree-checked > .jstree-checkbox,
+    .jstree-default-responsive .jstree-checked > .jstree-checkbox:hover {
+        background-position: 0 -80px;
+    }
+    .jstree-default-responsive .jstree-anchor > .jstree-undetermined,
+    .jstree-default-responsive .jstree-anchor > .jstree-undetermined:hover {
+        background-position: 0 -120px;
+    }
+    .jstree-default-responsive .jstree-anchor {
+        font-weight: bold;
+        font-size: 1.1em;
+        text-shadow: 1px 1px white;
+    }
+    .jstree-default-responsive > .jstree-striped {
+        background: transparent;
+    }
+    .jstree-default-responsive .jstree-wholerow {
+        border-top: 1px solid rgba(255, 255, 255, 0.7);
+        border-bottom: 1px solid rgba(64, 64, 64, 0.2);
+        background: #ebebeb;
+        height: 40px;
+    }
+    .jstree-default-responsive .jstree-wholerow-hovered {
+        background: #e7f4f9;
+    }
+    .jstree-default-responsive .jstree-wholerow-clicked {
+        background: #beebff;
+    }
+    .jstree-default-responsive
+        .jstree-children
+        .jstree-last
+        > .jstree-wholerow {
+        box-shadow: inset 0 -6px 3px -5px #666666;
+    }
+    .jstree-default-responsive
+        .jstree-children
+        .jstree-open
+        > .jstree-wholerow {
+        box-shadow: inset 0 6px 3px -5px #666666;
+        border-top: 0;
+    }
+    .jstree-default-responsive .jstree-children .jstree-open + .jstree-open {
+        box-shadow: none;
+    }
+    .jstree-default-responsive .jstree-node,
+    .jstree-default-responsive .jstree-icon,
+    .jstree-default-responsive .jstree-node > .jstree-ocl,
+    .jstree-default-responsive .jstree-themeicon,
+    .jstree-default-responsive .jstree-checkbox {
+        background-image: url('40px.png');
+        background-size: 120px 240px;
+    }
+    .jstree-default-responsive .jstree-node {
+        background-position: -80px 0;
+        background-repeat: repeat-y;
+    }
+    .jstree-default-responsive .jstree-last {
+        background: transparent;
+    }
+    .jstree-default-responsive .jstree-leaf > .jstree-ocl {
+        background-position: -40px -120px;
+    }
+    .jstree-default-responsive .jstree-last > .jstree-ocl {
+        background-position: -40px -160px;
+    }
+    .jstree-default-responsive .jstree-themeicon-custom {
+        background-color: transparent;
+        background-image: none;
+        background-position: 0 0;
+    }
+    .jstree-default-responsive .jstree-file {
+        background: url('40px.png') 0 -160px no-repeat;
+        background-size: 120px 240px;
+    }
+    .jstree-default-responsive .jstree-folder {
+        background: url('40px.png') -40px -40px no-repeat;
+        background-size: 120px 240px;
+    }
+    .jstree-default-responsive > .jstree-container-ul > .jstree-node {
+        margin-left: 0;
+        margin-right: 0;
+    }
+}
diff --git a/src/shared/components/query/styles/queryModal.scss b/src/shared/components/query/styles/queryModal.scss
index 1066dd43185..9cc45c039ee 100644
--- a/src/shared/components/query/styles/queryModal.scss
+++ b/src/shared/components/query/styles/queryModal.scss
@@ -1,3 +1,3 @@
 .queryModal {
-  width:95%;
-}
\ No newline at end of file
+    width: 95%;
+}
diff --git a/src/shared/components/query/styles/styles.module.scss b/src/shared/components/query/styles/styles.module.scss
index 1d3f88389ad..dfec0777cc3 100644
--- a/src/shared/components/query/styles/styles.module.scss
+++ b/src/shared/components/query/styles/styles.module.scss
@@ -369,7 +369,7 @@ div.SelectedStudiesWindow {
     }
 
     :global(.oqlValidationContainer) {
-        min-height:27px;
+        min-height: 27px;
     }
 
     .buttonRow {
diff --git a/src/shared/components/rightbar/RightBar.tsx b/src/shared/components/rightbar/RightBar.tsx
index 48c9c959762..b69d0606158 100644
--- a/src/shared/components/rightbar/RightBar.tsx
+++ b/src/shared/components/rightbar/RightBar.tsx
@@ -1,104 +1,153 @@
 import * as React from 'react';
 import * as _ from 'lodash';
-import BarGraph from "../barGraph/BarGraph";
-import { observer} from "mobx-react";
-import {TypeOfCancer as CancerType} from "../../api/generated/CBioPortalAPI";
-import Testimonials from "../testimonials/Testimonials";
-import AppConfig from "appConfig";
-import {QueryStore} from "shared/components/query/QueryStore";
+import BarGraph from '../barGraph/BarGraph';
+import { observer } from 'mobx-react';
+import { TypeOfCancer as CancerType } from '../../api/generated/CBioPortalAPI';
+import Testimonials from '../testimonials/Testimonials';
+import AppConfig from 'appConfig';
+import { QueryStore } from 'shared/components/query/QueryStore';
 import { Link } from 'react-router';
-import LoadingIndicator from "../loadingIndicator/LoadingIndicator";
-import {redirectToStudyView} from "../../api/urls";
-import {ResultsViewTab} from "../../../pages/resultsView/ResultsViewPageHelpers";
+import LoadingIndicator from '../loadingIndicator/LoadingIndicator';
+import { redirectToStudyView } from '../../api/urls';
+import { ResultsViewTab } from '../../../pages/resultsView/ResultsViewPageHelpers';
 
-
-interface IRightBarProps
-{
-    queryStore:QueryStore;
+interface IRightBarProps {
+    queryStore: QueryStore;
 }
-interface IRightBarState
-{
+interface IRightBarState {
     twitterLoading: boolean;
 }
 
 @observer
-export default class RightBar extends React.Component<IRightBarProps, IRightBarState> {
-    constructor(props:IRightBarProps) {
+export default class RightBar extends React.Component<
+    IRightBarProps,
+    IRightBarState
+> {
+    constructor(props: IRightBarProps) {
         super(props);
         this.state = {
-            twitterLoading: true // only used for default what's new
+            twitterLoading: true, // only used for default what's new
         };
     }
 
-
     get studyStore() {
-      return this.props.queryStore;
+        return this.props.queryStore;
     }
 
-    get logic() { return this.studyStore.studyListLogic; }
+    get logic() {
+        return this.studyStore.studyListLogic;
+    }
 
     private CancerTypeList() {
-        return this.logic.cancerTypeListView.getChildCancerTypes(this.studyStore.treeData.rootCancerType, true);
-    };
+        return this.logic.cancerTypeListView.getChildCancerTypes(
+            this.studyStore.treeData.rootCancerType,
+            true
+        );
+    }
 
-    private CancerTypeDescendantStudy({cancerType}: {cancerType:CancerType}) {
-        return this.logic.cancerTypeListView.getDescendantCancerStudies(cancerType);
-    };
+    private CancerTypeDescendantStudy({
+        cancerType,
+    }: {
+        cancerType: CancerType;
+    }) {
+        return this.logic.cancerTypeListView.getDescendantCancerStudies(
+            cancerType
+        );
+    }
 
-    private CancerTypeDescendantStudies(cancerList:CancerType[]) {
-        return cancerList.filter(cancer => (cancer.cancerTypeId !== "other" &&  cancer.cancerTypeId !== "mixed"))
-                         .map((filteredCancer:CancerType) => (
-            {
+    private CancerTypeDescendantStudies(cancerList: CancerType[]) {
+        return cancerList
+            .filter(
+                cancer =>
+                    cancer.cancerTypeId !== 'other' &&
+                    cancer.cancerTypeId !== 'mixed'
+            )
+            .map((filteredCancer: CancerType) => ({
                 shortName: filteredCancer.name,
                 color: filteredCancer.dedicatedColor,
-                studies:this.CancerTypeDescendantStudy({cancerType: filteredCancer})
-            }
-        ));
+                studies: this.CancerTypeDescendantStudy({
+                    cancerType: filteredCancer,
+                }),
+            }));
     }
 
     private getWhatsNew() {
         if (AppConfig.serverConfig.skin_right_nav_show_whats_new) {
-            if (!_.isEmpty(AppConfig.serverConfig.skin_right_nav_whats_new_blurb)) {
+            if (
+                !_.isEmpty(
+                    AppConfig.serverConfig.skin_right_nav_whats_new_blurb
+                )
+            ) {
                 return (
                     <div className="rightBarSection">
                         <h3>What's New</h3>
-                        <div dangerouslySetInnerHTML={{__html:AppConfig.serverConfig.skin_right_nav_whats_new_blurb!}}></div>
+                        <div
+                            dangerouslySetInnerHTML={{
+                                __html: AppConfig.serverConfig
+                                    .skin_right_nav_whats_new_blurb!,
+                            }}
+                        ></div>
                     </div>
                 );
             } else {
                 let Timeline = require('react-twitter-widgets').Timeline;
                 return (
-                    <div className="rightBarSection" style={{paddingBottom:20}}>
-                        <h3 style={{borderBottom:0}}>
+                    <div
+                        className="rightBarSection"
+                        style={{ paddingBottom: 20 }}
+                    >
+                        <h3 style={{ borderBottom: 0 }}>
                             What's New
-                            <a href="http://www.twitter.com/cbioportal" className="pull-right">
-                                @cbioportal <i className="fa fa-twitter" aria-hidden="true"></i>
+                            <a
+                                href="http://www.twitter.com/cbioportal"
+                                className="pull-right"
+                            >
+                                @cbioportal{' '}
+                                <i
+                                    className="fa fa-twitter"
+                                    aria-hidden="true"
+                                ></i>
                             </a>
                         </h3>
-                        <div style={{marginTop:3}}>
+                        <div style={{ marginTop: 3 }}>
                             <Timeline
                                 dataSource={{
                                     sourceType: 'profile',
-                                    screenName: 'cbioportal'
+                                    screenName: 'cbioportal',
                                 }}
                                 options={{
                                     username: 'cbioportal',
                                     height: '200',
                                     chrome: 'noheader%20nofooter',
                                 }}
-                                onLoad={() => this.setState({twitterLoading:false})}
+                                onLoad={() =>
+                                    this.setState({ twitterLoading: false })
+                                }
                             />
                         </div>
                         <div>
-                            {this.state.twitterLoading &&
-                                 (<span style={{textAlign:"center"}}><LoadingIndicator isLoading={true} small={true}/></span>) ||
-                                 (
-                                    <div style={{paddingTop:5}}>
-                                        <p style={{textAlign:'center'}}>Sign up for low-volume email news alerts</p>
-                                        <a target="_blank" className="btn btn-default btn-sm" href="http://groups.google.com/group/cbioportal-news/boxsubscribe" style={{width: "100%"}}>Subscribe</a>
-                                     </div>
-                                 )
-                            }
+                            {(this.state.twitterLoading && (
+                                <span style={{ textAlign: 'center' }}>
+                                    <LoadingIndicator
+                                        isLoading={true}
+                                        small={true}
+                                    />
+                                </span>
+                            )) || (
+                                <div style={{ paddingTop: 5 }}>
+                                    <p style={{ textAlign: 'center' }}>
+                                        Sign up for low-volume email news alerts
+                                    </p>
+                                    <a
+                                        target="_blank"
+                                        className="btn btn-default btn-sm"
+                                        href="http://groups.google.com/group/cbioportal-news/boxsubscribe"
+                                        style={{ width: '100%' }}
+                                    >
+                                        Subscribe
+                                    </a>
+                                </div>
+                            )}
                         </div>
                     </div>
                 );
@@ -110,11 +159,21 @@ export default class RightBar extends React.Component<IRightBarProps, IRightBarS
 
     public getExampleSection() {
         if (AppConfig.serverConfig.skin_right_nav_show_examples) {
-            if (!_.isEmpty(AppConfig.serverConfig.skin_examples_right_column_html)) {
+            if (
+                !_.isEmpty(
+                    AppConfig.serverConfig.skin_examples_right_column_html
+                )
+            ) {
                 return (
-                    <div className="rightBarSection exampleQueries"
-                            dangerouslySetInnerHTML={{__html:'<h3>Example Queries</h3>' + AppConfig.serverConfig.skin_examples_right_column_html}}>
-                    </div>
+                    <div
+                        className="rightBarSection exampleQueries"
+                        dangerouslySetInnerHTML={{
+                            __html:
+                                '<h3>Example Queries</h3>' +
+                                AppConfig.serverConfig
+                                    .skin_examples_right_column_html,
+                        }}
+                    ></div>
                 );
             } else {
                 return (
@@ -122,34 +181,59 @@ export default class RightBar extends React.Component<IRightBarProps, IRightBarS
                         <h3>Example Queries</h3>
                         <ul>
                             <li>
-                                <Link to="/comparison/mutations?sessionId=5cf89323e4b0ab413787436c">Primary vs. metastatic prostate cancer</Link>
+                                <Link to="/comparison/mutations?sessionId=5cf89323e4b0ab413787436c">
+                                    Primary vs. metastatic prostate cancer
+                                </Link>
                             </li>
                             <li>
-                                <Link to="/results?cancer_study_list=coadread_tcga_pub&cancer_study_id=coadread_tcga_pub&genetic_profile_ids_PROFILE_MUTATION_EXTENDED=coadread_tcga_pub_mutations&genetic_profile_ids_PROFILE_COPY_NUMBER_ALTERATION=coadread_tcga_pub_gistic&Z_SCORE_THRESHOLD=2.0&case_set_id=coadread_tcga_pub_nonhypermut&case_ids=&gene_list=KRAS+NRAS+BRAF&gene_set_choice=user-defined-list">RAS/RAF alterations in colorectal cancer</Link>
+                                <Link to="/results?cancer_study_list=coadread_tcga_pub&cancer_study_id=coadread_tcga_pub&genetic_profile_ids_PROFILE_MUTATION_EXTENDED=coadread_tcga_pub_mutations&genetic_profile_ids_PROFILE_COPY_NUMBER_ALTERATION=coadread_tcga_pub_gistic&Z_SCORE_THRESHOLD=2.0&case_set_id=coadread_tcga_pub_nonhypermut&case_ids=&gene_list=KRAS+NRAS+BRAF&gene_set_choice=user-defined-list">
+                                    RAS/RAF alterations in colorectal cancer
+                                </Link>
                             </li>
                             <li>
-                                <Link to={`/results/${ResultsViewTab.MUTATIONS}?cancer_study_list=ov_tcga_pub&cancer_study_id=ov_tcga_pub&genetic_profile_ids_PROFILE_MUTATION_EXTENDED=ov_tcga_pub_mutations&Z_SCORE_THRESHOLD=2.0&case_set_id=ov_tcga_pub_3way_complete&case_ids=&gene_list=BRCA1+BRCA2&gene_set_choice=user-defined-list`}>BRCA1 and BRCA2 mutations in ovarian cancer</Link>
+                                <Link
+                                    to={`/results/${ResultsViewTab.MUTATIONS}?cancer_study_list=ov_tcga_pub&cancer_study_id=ov_tcga_pub&genetic_profile_ids_PROFILE_MUTATION_EXTENDED=ov_tcga_pub_mutations&Z_SCORE_THRESHOLD=2.0&case_set_id=ov_tcga_pub_3way_complete&case_ids=&gene_list=BRCA1+BRCA2&gene_set_choice=user-defined-list`}
+                                >
+                                    BRCA1 and BRCA2 mutations in ovarian cancer
+                                </Link>
                             </li>
                             <li>
-                                <Link to="/results?cancer_study_list=ucec_tcga_pub&cancer_study_id=ucec_tcga_pub&genetic_profile_ids_PROFILE_MUTATION_EXTENDED=ucec_tcga_pub_mutations&Z_SCORE_THRESHOLD=2.0&RPPA_SCORE_THRESHOLD=2.0&data_priority=0&case_set_id=ucec_tcga_pub_sequenced&case_ids=&gene_set_choice=user-defined-list&gene_list=POLE%3A+MUT+%3D+P286+MUT+%3D+V411+MUT+%3D+L424+MUT+%3D+S297F&clinical_param_selection=null">POLE hotspot mutations in endometrial cancer</Link>
+                                <Link to="/results?cancer_study_list=ucec_tcga_pub&cancer_study_id=ucec_tcga_pub&genetic_profile_ids_PROFILE_MUTATION_EXTENDED=ucec_tcga_pub_mutations&Z_SCORE_THRESHOLD=2.0&RPPA_SCORE_THRESHOLD=2.0&data_priority=0&case_set_id=ucec_tcga_pub_sequenced&case_ids=&gene_set_choice=user-defined-list&gene_list=POLE%3A+MUT+%3D+P286+MUT+%3D+V411+MUT+%3D+L424+MUT+%3D+S297F&clinical_param_selection=null">
+                                    POLE hotspot mutations in endometrial cancer
+                                </Link>
                             </li>
                             <li>
-                                <Link to="/results?case_set_id=gbm_tcga_pub_sequenced&Action=Submit&genetic_profile_ids_PROFILE_MUTATION_EXTENDED=gbm_tcga_pub_mutations&genetic_profile_ids_PROFILE_COPY_NUMBER_ALTERATION=gbm_tcga_pub_cna_rae&case_ids=&Z_SCORE_THRESHOLD=1.0&cancer_study_list=gbm_tcga_pub&cancer_study_id=gbm_tcga_pub&gene_list=TP53+MDM2+MDM4&gene_set_choice=user-defined_list">TP53 and MDM2/4 alterations in GBM</Link>
+                                <Link to="/results?case_set_id=gbm_tcga_pub_sequenced&Action=Submit&genetic_profile_ids_PROFILE_MUTATION_EXTENDED=gbm_tcga_pub_mutations&genetic_profile_ids_PROFILE_COPY_NUMBER_ALTERATION=gbm_tcga_pub_cna_rae&case_ids=&Z_SCORE_THRESHOLD=1.0&cancer_study_list=gbm_tcga_pub&cancer_study_id=gbm_tcga_pub&gene_list=TP53+MDM2+MDM4&gene_set_choice=user-defined_list">
+                                    TP53 and MDM2/4 alterations in GBM
+                                </Link>
                             </li>
                             <li>
-                                <Link to={`/results/${ResultsViewTab.DOWNLOAD}?case_set_id=gbm_tcga_pub_sequenced&Action=Submit&genetic_profile_ids_PROFILE_MUTATION_EXTENDED=gbm_tcga_pub_mutations&cancer_study_list=gbm_tcga_pub&cancer_study_id=gbm_tcga_pub&gene_list=PTEN&gene_set_choice=user-defined_list&transpose_matrix=on`}>PTEN mutations in GBM in text format</Link>
+                                <Link
+                                    to={`/results/${ResultsViewTab.DOWNLOAD}?case_set_id=gbm_tcga_pub_sequenced&Action=Submit&genetic_profile_ids_PROFILE_MUTATION_EXTENDED=gbm_tcga_pub_mutations&cancer_study_list=gbm_tcga_pub&cancer_study_id=gbm_tcga_pub&gene_list=PTEN&gene_set_choice=user-defined_list&transpose_matrix=on`}
+                                >
+                                    PTEN mutations in GBM in text format
+                                </Link>
                             </li>
                             <li>
-                                <Link to="/patient?studyId=ucec_tcga_pub&caseId=TCGA-BK-A0CC">Patient view of an endometrial cancer case</Link>
+                                <Link to="/patient?studyId=ucec_tcga_pub&caseId=TCGA-BK-A0CC">
+                                    Patient view of an endometrial cancer case
+                                </Link>
                             </li>
                             <li>
-                                <Link to="/study?id=laml_tcga_pan_can_atlas_2018,acc_tcga_pan_can_atlas_2018,blca_tcga_pan_can_atlas_2018,lgg_tcga_pan_can_atlas_2018,brca_tcga_pan_can_atlas_2018,cesc_tcga_pan_can_atlas_2018,chol_tcga_pan_can_atlas_2018,coadread_tcga_pan_can_atlas_2018,dlbc_tcga_pan_can_atlas_2018,esca_tcga_pan_can_atlas_2018,gbm_tcga_pan_can_atlas_2018,hnsc_tcga_pan_can_atlas_2018,kich_tcga_pan_can_atlas_2018,kirc_tcga_pan_can_atlas_2018,kirp_tcga_pan_can_atlas_2018,lihc_tcga_pan_can_atlas_2018,luad_tcga_pan_can_atlas_2018,lusc_tcga_pan_can_atlas_2018,meso_tcga_pan_can_atlas_2018,ov_tcga_pan_can_atlas_2018,paad_tcga_pan_can_atlas_2018,pcpg_tcga_pan_can_atlas_2018,prad_tcga_pan_can_atlas_2018,sarc_tcga_pan_can_atlas_2018,skcm_tcga_pan_can_atlas_2018,stad_tcga_pan_can_atlas_2018,tgct_tcga_pan_can_atlas_2018,thym_tcga_pan_can_atlas_2018,thca_tcga_pan_can_atlas_2018,ucs_tcga_pan_can_atlas_2018,ucec_tcga_pan_can_atlas_2018,uvm_tcga_pan_can_atlas_2018">All TCGA Pan-Cancer</Link>
+                                <Link to="/study?id=laml_tcga_pan_can_atlas_2018,acc_tcga_pan_can_atlas_2018,blca_tcga_pan_can_atlas_2018,lgg_tcga_pan_can_atlas_2018,brca_tcga_pan_can_atlas_2018,cesc_tcga_pan_can_atlas_2018,chol_tcga_pan_can_atlas_2018,coadread_tcga_pan_can_atlas_2018,dlbc_tcga_pan_can_atlas_2018,esca_tcga_pan_can_atlas_2018,gbm_tcga_pan_can_atlas_2018,hnsc_tcga_pan_can_atlas_2018,kich_tcga_pan_can_atlas_2018,kirc_tcga_pan_can_atlas_2018,kirp_tcga_pan_can_atlas_2018,lihc_tcga_pan_can_atlas_2018,luad_tcga_pan_can_atlas_2018,lusc_tcga_pan_can_atlas_2018,meso_tcga_pan_can_atlas_2018,ov_tcga_pan_can_atlas_2018,paad_tcga_pan_can_atlas_2018,pcpg_tcga_pan_can_atlas_2018,prad_tcga_pan_can_atlas_2018,sarc_tcga_pan_can_atlas_2018,skcm_tcga_pan_can_atlas_2018,stad_tcga_pan_can_atlas_2018,tgct_tcga_pan_can_atlas_2018,thym_tcga_pan_can_atlas_2018,thca_tcga_pan_can_atlas_2018,ucs_tcga_pan_can_atlas_2018,ucec_tcga_pan_can_atlas_2018,uvm_tcga_pan_can_atlas_2018">
+                                    All TCGA Pan-Cancer
+                                </Link>
                             </li>
                             <li>
-                                <Link to="/study?id=msk_impact_2017">MSK-IMPACT clinical cohort, Zehir et al. 2017</Link>
+                                <Link to="/study?id=msk_impact_2017">
+                                    MSK-IMPACT clinical cohort, Zehir et al.
+                                    2017
+                                </Link>
                             </li>
                             <li>
-                                <Link to="/study?id=5c26a970e4b05228701f9fa9">Histone mutations across cancer types</Link>
+                                <Link to="/study?id=5c26a970e4b05228701f9fa9">
+                                    Histone mutations across cancer types
+                                </Link>
                             </li>
                         </ul>
                     </div>
@@ -160,57 +244,55 @@ export default class RightBar extends React.Component<IRightBarProps, IRightBarS
     }
 
     public getTestimonialsSection() {
-        return AppConfig.serverConfig.skin_right_nav_show_testimonials ?
-            (
-                <div className="rightBarSection" style={{minHeight: '300px'}}>
-                    <h3>Testimonials</h3>
-                    <Testimonials/>
-                </div>
-
-            ) : null;
+        return AppConfig.serverConfig.skin_right_nav_show_testimonials ? (
+            <div className="rightBarSection" style={{ minHeight: '300px' }}>
+                <h3>Testimonials</h3>
+                <Testimonials />
+            </div>
+        ) : null;
     }
 
-    public getDataSetsSection(){
-
-        return AppConfig.serverConfig.skin_right_nav_show_data_sets ?
-            (
-                <div className="rightBarSection">
-                    <h3>Cancer Studies</h3>
-                    {
-                        (this.studyStore.cancerStudies.isComplete && this.studyStore.cancerTypes.isComplete) && (
-
-                            <div>
-
-                                <p>The portal contains {this.studyStore.cancerStudies.result.length} cancer studies <Link to={"/datasets"}>(details)</Link></p>
-
-                                <BarGraph data={this.CancerTypeDescendantStudies(this.CancerTypeList())}
-                                          openStudy={(studyId)=>{
-                                              redirectToStudyView(studyId);
-                                          }}
-                                />
-
-                            </div>
-                        )
-                    }
-                    {
-                        (this.studyStore.cancerStudies.isPending) && (
-                            <span style={{textAlign:"center"}}><LoadingIndicator isLoading={true} small={true}/></span>
-                        )
-                    }
-                </div>
-            ) : null;
+    public getDataSetsSection() {
+        return AppConfig.serverConfig.skin_right_nav_show_data_sets ? (
+            <div className="rightBarSection">
+                <h3>Cancer Studies</h3>
+                {this.studyStore.cancerStudies.isComplete &&
+                    this.studyStore.cancerTypes.isComplete && (
+                        <div>
+                            <p>
+                                The portal contains{' '}
+                                {this.studyStore.cancerStudies.result.length}{' '}
+                                cancer studies{' '}
+                                <Link to={'/datasets'}>(details)</Link>
+                            </p>
 
+                            <BarGraph
+                                data={this.CancerTypeDescendantStudies(
+                                    this.CancerTypeList()
+                                )}
+                                openStudy={studyId => {
+                                    redirectToStudyView(studyId);
+                                }}
+                            />
+                        </div>
+                    )}
+                {this.studyStore.cancerStudies.isPending && (
+                    <span style={{ textAlign: 'center' }}>
+                        <LoadingIndicator isLoading={true} small={true} />
+                    </span>
+                )}
+            </div>
+        ) : null;
     }
 
     render() {
         return (
             <div>
-                { this.getWhatsNew() }
-                { this.getDataSetsSection() }
-                { this.getExampleSection() }
-                { this.getTestimonialsSection() }
+                {this.getWhatsNew()}
+                {this.getDataSetsSection()}
+                {this.getExampleSection()}
+                {this.getTestimonialsSection()}
             </div>
         );
     }
-
 }
diff --git a/src/shared/components/sampleLabel/SampleLabel.spec.tsx b/src/shared/components/sampleLabel/SampleLabel.spec.tsx
index db7d11685ac..539d9352ff7 100644
--- a/src/shared/components/sampleLabel/SampleLabel.spec.tsx
+++ b/src/shared/components/sampleLabel/SampleLabel.spec.tsx
@@ -5,17 +5,9 @@ import { shallow, mount } from 'enzyme';
 import sinon from 'sinon';
 
 describe('SampleLabel', () => {
+    before(() => {});
 
-    before(()=>{
-
-    });
-
-    after(()=>{
-
-    });
-
-    it('what does it do?', ()=>{
-
-    });
+    after(() => {});
 
+    it('what does it do?', () => {});
 });
diff --git a/src/shared/components/sampleLabel/SampleLabel.tsx b/src/shared/components/sampleLabel/SampleLabel.tsx
index 51df21c5f85..eab5dae9557 100644
--- a/src/shared/components/sampleLabel/SampleLabel.tsx
+++ b/src/shared/components/sampleLabel/SampleLabel.tsx
@@ -1,8 +1,11 @@
 import * as React from 'react';
 
-export default class SampleLabelSVG extends React.Component<ISampleLabelSVGProps, {}> {
+export default class SampleLabelSVG extends React.Component<
+    ISampleLabelSVGProps,
+    {}
+> {
     static defaultProps = {
-        r: 10
+        r: 10,
     };
 
     constructor(props: ISampleLabelSVGProps) {
@@ -15,7 +18,16 @@ export default class SampleLabelSVG extends React.Component<ISampleLabelSVGProps
         return (
             <g>
                 <circle cx={x} cy={y} fill={color} r={this.props.r!} />
-                <text x={x} y={y + 5} dy={this.props.textDy} fill={'white'} fontSize={10} textAnchor={'middle'}>{label}</text>
+                <text
+                    x={x}
+                    y={y + 5}
+                    dy={this.props.textDy}
+                    fill={'white'}
+                    fontSize={10}
+                    textAnchor={'middle'}
+                >
+                    {label}
+                </text>
             </g>
         );
     }
@@ -27,10 +39,13 @@ export interface ISampleLabelSVGProps {
     x: number;
     y: number;
     r?: number;
-    textDy?:number;
+    textDy?: number;
 }
 
-export class SampleLabelHTML extends React.Component<ISampleLabelHTMLProps, {}> {
+export class SampleLabelHTML extends React.Component<
+    ISampleLabelHTMLProps,
+    {}
+> {
     constructor(props: ISampleLabelHTMLProps) {
         super(props);
         this.render = this.render.bind(this);
@@ -39,12 +54,25 @@ export class SampleLabelHTML extends React.Component<ISampleLabelHTMLProps, {}>
     public render() {
         const { label, color, fillOpacity } = this.props;
         return (
-            <svg width='12' height='12' className='case-label-header' data-test="sample-icon">
-                <g transform='translate(6,6)'>
-                    <circle r='6' fill={color} fillOpacity={fillOpacity} />
+            <svg
+                width="12"
+                height="12"
+                className="case-label-header"
+                data-test="sample-icon"
+            >
+                <g transform="translate(6,6)">
+                    <circle r="6" fill={color} fillOpacity={fillOpacity} />
                 </g>
-                <g transform='translate(6,5.5)'>
-                    <text y='4' textAnchor='middle' fontSize='10' fill='white' style={{cursor:"default"}} >{label}</text>
+                <g transform="translate(6,5.5)">
+                    <text
+                        y="4"
+                        textAnchor="middle"
+                        fontSize="10"
+                        fill="white"
+                        style={{ cursor: 'default' }}
+                    >
+                        {label}
+                    </text>
                 </g>
             </svg>
         );
diff --git a/src/shared/components/sampleLabel/SampleLabelNotProfiled.tsx b/src/shared/components/sampleLabel/SampleLabelNotProfiled.tsx
index 70ac8e10c75..a0f74000893 100644
--- a/src/shared/components/sampleLabel/SampleLabelNotProfiled.tsx
+++ b/src/shared/components/sampleLabel/SampleLabelNotProfiled.tsx
@@ -1,32 +1,43 @@
-import React from "react";
-import { ClinicalDataBySampleId } from "shared/api/api-types-extended";
-import SampleInline from "pages/patientView/patientHeader/SampleInline";
+import React from 'react';
+import { ClinicalDataBySampleId } from 'shared/api/api-types-extended';
+import SampleInline from 'pages/patientView/patientHeader/SampleInline';
 
 const color = '#cccccc';
 const fillOpacity = 1;
 
 export interface ISampleLabelNotProfiledProps {
     sample: ClinicalDataBySampleId;
-    onSelectGenePanel?:(name:string)=>void;
-    disableTooltip?:boolean;
+    onSelectGenePanel?: (name: string) => void;
+    disableTooltip?: boolean;
 }
 
-export default class SampleLabelNotProfiled extends React.Component<ISampleLabelNotProfiledProps, {}>{
-
+export default class SampleLabelNotProfiled extends React.Component<
+    ISampleLabelNotProfiledProps,
+    {}
+> {
     public render() {
         return (
             <SampleInline
                 sample={this.props.sample}
-                extraTooltipText={'This gene was not profiled for this sample (absent from gene panel). It is unknown whether it is mutated.'}
+                extraTooltipText={
+                    'This gene was not profiled for this sample (absent from gene panel). It is unknown whether it is mutated.'
+                }
                 onSelectGenePanel={this.props.onSelectGenePanel}
-                disableTooltip={this.props.disableTooltip} >
+                disableTooltip={this.props.disableTooltip}
+            >
                 <svg width="12" height="12" data-test="not-profiled-icon">
-                    <g transform='translate(0,5)'>
-                        <rect width="12" height="2.5" rx="1.25" ry="1.25" fill={color} fillOpacity={fillOpacity} />
+                    <g transform="translate(0,5)">
+                        <rect
+                            width="12"
+                            height="2.5"
+                            rx="1.25"
+                            ry="1.25"
+                            fill={color}
+                            fillOpacity={fillOpacity}
+                        />
                     </g>
                 </svg>
-            </SampleInline>)
-        ;
+            </SampleInline>
+        );
     }
-
 }
diff --git a/src/shared/components/sectionHeader/SectionHeader.tsx b/src/shared/components/sectionHeader/SectionHeader.tsx
index 9dc07f07de8..6ff65a5fcc0 100644
--- a/src/shared/components/sectionHeader/SectionHeader.tsx
+++ b/src/shared/components/sectionHeader/SectionHeader.tsx
@@ -1,53 +1,67 @@
 import * as React from 'react';
-import MobxPromise from "mobxpromise";
-import {observer} from "mobx-react";
+import MobxPromise from 'mobxpromise';
+import { observer } from 'mobx-react';
 import * as styles_any from './styles.module.scss';
 import classNames from 'classnames';
-import ErrorBox from "../errorBox/ErrorBox";
+import ErrorBox from '../errorBox/ErrorBox';
 import ReactElement = React.ReactElement;
-import {ThreeBounce} from "better-react-spinkit";
-import LoadingIndicator from "../loadingIndicator/LoadingIndicator";
+import { ThreeBounce } from 'better-react-spinkit';
+import LoadingIndicator from '../loadingIndicator/LoadingIndicator';
 
 const styles = styles_any as {
-	SectionHeader: string,
-	error: string,
-	message: string,
-	icon: string,
+    SectionHeader: string;
+    error: string;
+    message: string;
+    icon: string;
 };
 
-interface ISectionHeaderProps extends React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>
-{
-	promises?: MobxPromise<any>[];
-	secondaryComponent?:ReactElement<any>;
+interface ISectionHeaderProps
+    extends React.DetailedHTMLProps<
+        React.HTMLAttributes<HTMLDivElement>,
+        HTMLDivElement
+    > {
+    promises?: MobxPromise<any>[];
+    secondaryComponent?: ReactElement<any>;
 }
 
 @observer
-export default class SectionHeader extends React.Component<ISectionHeaderProps, {}>
-{
-	render()
-	{
-		let {promises, children, className, secondaryComponent, ...divProps} = this.props;
-		return (
-			<div className={classNames(className, styles.SectionHeader)} {...divProps}>
-				<h2>
-					{children}
-					{!!(promises && promises.some(promise => promise.isPending)) && (
-						<LoadingIndicator isLoading={true} size={"small"} />
-					)}
-				</h2>
+export default class SectionHeader extends React.Component<
+    ISectionHeaderProps,
+    {}
+> {
+    render() {
+        let {
+            promises,
+            children,
+            className,
+            secondaryComponent,
+            ...divProps
+        } = this.props;
+        return (
+            <div
+                className={classNames(className, styles.SectionHeader)}
+                {...divProps}
+            >
+                <h2>
+                    {children}
+                    {!!(
+                        promises && promises.some(promise => promise.isPending)
+                    ) && <LoadingIndicator isLoading={true} size={'small'} />}
+                </h2>
 
-				{
-					(!!secondaryComponent) && (
-						secondaryComponent
-					)
-				}
+                {!!secondaryComponent && secondaryComponent}
 
-				{promises && promises.map(promise => (
-					!!(promise.error) && (
-						<ErrorBox className={styles.error} error={promise.error}/>
-					)
-				))}
-			</div>
-		);
-	}
+                {promises &&
+                    promises.map(
+                        promise =>
+                            !!promise.error && (
+                                <ErrorBox
+                                    className={styles.error}
+                                    error={promise.error}
+                                />
+                            )
+                    )}
+            </div>
+        );
+    }
 }
diff --git a/src/shared/components/sectionHeader/styles.module.scss b/src/shared/components/sectionHeader/styles.module.scss
index bd4e66c8299..ca38ade52e3 100644
--- a/src/shared/components/sectionHeader/styles.module.scss
+++ b/src/shared/components/sectionHeader/styles.module.scss
@@ -1,18 +1,18 @@
 div.SectionHeader {
-  :global(.spinner) {
-    float: right;
-    height: 0;
-    overflow: visible;
-  }
+    :global(.spinner) {
+        float: right;
+        height: 0;
+        overflow: visible;
+    }
 
-  h2 {
-    color:#333 !important;
-    flex-grow: 2;
-    margin: 0 !important;
-    font-size:15px;
-  }
+    h2 {
+        color: #333 !important;
+        flex-grow: 2;
+        margin: 0 !important;
+        font-size: 15px;
+    }
 
-  .error {
-    margin-top: 8px;
-  }
+    .error {
+        margin-top: 8px;
+    }
 }
diff --git a/src/shared/components/simpleTable/SimpleTable.spec.tsx b/src/shared/components/simpleTable/SimpleTable.spec.tsx
index c1647ad5f6c..963295b8cad 100644
--- a/src/shared/components/simpleTable/SimpleTable.spec.tsx
+++ b/src/shared/components/simpleTable/SimpleTable.spec.tsx
@@ -2,46 +2,68 @@ import React from 'react';
 import { assert } from 'chai';
 import { shallow } from 'enzyme';
 import sinon from 'sinon';
-import SimpleTable from "./SimpleTable";
+import SimpleTable from './SimpleTable';
 
 describe('SimpleTable', () => {
+    let table: any;
 
-    let table:any;
-
-    const headers:any = [<th>one</th>];
-    const rows:any = [<tr><td>data</td></tr>, <tr><td>data</td></tr>];
-    const classNameTrue:string = 'test-class';
-    const classNameFalse:undefined = undefined;
-
-    before(()=> {
+    const headers: any = [<th>one</th>];
+    const rows: any = [
+        <tr>
+            <td>data</td>
+        </tr>,
+        <tr>
+            <td>data</td>
+        </tr>,
+    ];
+    const classNameTrue: string = 'test-class';
+    const classNameFalse: undefined = undefined;
 
+    before(() => {
         table = shallow(<SimpleTable headers={headers} rows={rows} />);
-
     });
 
-    after(()=> {
+    after(() => {});
 
+    it('renders 3 rows if passed headers and two rows', () => {
+        assert.equal(table.find('tr').length, 3);
     });
 
-    it('renders 3 rows if passed headers and two rows', ()=> {
-        assert.equal( table.find('tr').length, 3);
-    });
+    it('renders no result message when rows is empty array', () => {
+        table.setProps({ rows: [] });
+        assert.isTrue(
+            table.containsMatchingElement(
+                <td colSpan={1}>There are no results.</td>
+            )
+        );
 
-    it('renders no result message when rows is empty array', ()=> {
-        table.setProps({rows:[]})
-        assert.isTrue( table.containsMatchingElement(<td colSpan={1}>There are no results.</td>));
-
-        table.setProps({rows:[], noRowsText:"Hello there!!!!"})
-        assert.isTrue( table.containsMatchingElement(<td colSpan={1}>Hello there!!!!</td>));
+        table.setProps({ rows: [], noRowsText: 'Hello there!!!!' });
+        assert.isTrue(
+            table.containsMatchingElement(<td colSpan={1}>Hello there!!!!</td>)
+        );
     });
 
-    it('has class name of className prop if provided', ()=> {
-        assert.isTrue(shallow(<SimpleTable className={classNameTrue} headers={headers} rows={rows}/>).hasClass('test-class'));
+    it('has class name of className prop if provided', () => {
+        assert.isTrue(
+            shallow(
+                <SimpleTable
+                    className={classNameTrue}
+                    headers={headers}
+                    rows={rows}
+                />
+            ).hasClass('test-class')
+        );
     });
 
-    it('does not have class name of \'undefined\' if className prop is undefined', ()=> {
-        assert.isFalse(shallow(<SimpleTable className={classNameFalse} headers={headers} rows={rows}/>).hasClass('undefined'));
+    it("does not have class name of 'undefined' if className prop is undefined", () => {
+        assert.isFalse(
+            shallow(
+                <SimpleTable
+                    className={classNameFalse}
+                    headers={headers}
+                    rows={rows}
+                />
+            ).hasClass('undefined')
+        );
     });
-
-
 });
diff --git a/src/shared/components/simpleTable/SimpleTable.tsx b/src/shared/components/simpleTable/SimpleTable.tsx
index 2f5dc0ebd4e..dc244f27605 100644
--- a/src/shared/components/simpleTable/SimpleTable.tsx
+++ b/src/shared/components/simpleTable/SimpleTable.tsx
@@ -1,37 +1,49 @@
 import * as React from 'react';
 import './styles.scss';
-import { If, Then,  Else } from 'react-if';
+import { If, Then, Else } from 'react-if';
 import classNames from 'classnames';
-import {observer} from "mobx-react";
+import { observer } from 'mobx-react';
 
 interface ISimpleTableProps {
-    headers:JSX.Element[];
-    rows:JSX.Element[];
-    noRowsText?:string;
-    className?:string;
-};
+    headers: JSX.Element[];
+    rows: JSX.Element[];
+    noRowsText?: string;
+    className?: string;
+}
 
 @observer
-export default class SimpleTable extends React.Component<ISimpleTableProps, {}> {
-
+export default class SimpleTable extends React.Component<
+    ISimpleTableProps,
+    {}
+> {
     public render() {
-        const {headers, rows, className, noRowsText} = this.props;
-        const tableRows = rows.length > 0 ? rows :
-            [<tr key="0">
-                <td style={{textAlign:'center'}} colSpan={headers.length}>
-                    {noRowsText || "There are no results."}
-                </td>
-            </tr>];
+        const { headers, rows, className, noRowsText } = this.props;
+        const tableRows =
+            rows.length > 0
+                ? rows
+                : [
+                      <tr key="0">
+                          <td
+                              style={{ textAlign: 'center' }}
+                              colSpan={headers.length}
+                          >
+                              {noRowsText || 'There are no results.'}
+                          </td>
+                      </tr>,
+                  ];
 
         return (
-            <table className={classNames('simple-table table table-striped table-border-top', className)}>
+            <table
+                className={classNames(
+                    'simple-table table table-striped table-border-top',
+                    className
+                )}
+            >
                 <thead>
                     <tr>{headers}</tr>
                 </thead>
-                <tbody>
-                    {tableRows}
-                </tbody>
+                <tbody>{tableRows}</tbody>
             </table>
         );
     }
-};
\ No newline at end of file
+}
diff --git a/src/shared/components/simpleTable/styles.scss b/src/shared/components/simpleTable/styles.scss
index f2136acdaba..3980d0d8b66 100644
--- a/src/shared/components/simpleTable/styles.scss
+++ b/src/shared/components/simpleTable/styles.scss
@@ -1,41 +1,41 @@
 .simple-table {
-  th {
-    padding-left: 10px;
-    padding-bottom: 5px;
-    background-color: rgb(255,255,255); // solid background
-  }
-
-  tbody>tr:nth-of-type(odd).highlighted {
-    background-color: #9FAFD1 !important;
-  }
-
-  tbody>tr:nth-of-type(even) { // solid background - hard coded hack, react-bootstrap .table-striped makes ODD # rows grey
-    background-color: rgb(255,255,255);
-  }
-
-  tbody>tr:nth-of-type(even).highlighted {
-    background-color: #B0BED9;
-  }
-
-  tbody>tr.clickable {
-    cursor: pointer;
-  }
-
-  tbody>tr:nth-of-type(even).clickable:hover {
-    background-color: #b6c4df !important;
-  }
-
-  tbody>tr:nth-of-type(odd).clickable:hover {
-    background-color: #a7b6d8 !important;
-  }
-
-  td.columnResizer {
-    border-color:transparent !important;
-  }
-
-  thead td.columnResizer {
-    border-color:transparent !important;
-    background-color:$borderColor;
-  }
-
+    th {
+        padding-left: 10px;
+        padding-bottom: 5px;
+        background-color: rgb(255, 255, 255); // solid background
+    }
+
+    tbody > tr:nth-of-type(odd).highlighted {
+        background-color: #9fafd1 !important;
+    }
+
+    tbody > tr:nth-of-type(even) {
+        // solid background - hard coded hack, react-bootstrap .table-striped makes ODD # rows grey
+        background-color: rgb(255, 255, 255);
+    }
+
+    tbody > tr:nth-of-type(even).highlighted {
+        background-color: #b0bed9;
+    }
+
+    tbody > tr.clickable {
+        cursor: pointer;
+    }
+
+    tbody > tr:nth-of-type(even).clickable:hover {
+        background-color: #b6c4df !important;
+    }
+
+    tbody > tr:nth-of-type(odd).clickable:hover {
+        background-color: #a7b6d8 !important;
+    }
+
+    td.columnResizer {
+        border-color: transparent !important;
+    }
+
+    thead td.columnResizer {
+        border-color: transparent !important;
+        background-color: $borderColor;
+    }
 }
diff --git a/src/shared/components/staticContent/StaticContent.tsx b/src/shared/components/staticContent/StaticContent.tsx
index 23a4e32f135..8490b92dcb7 100644
--- a/src/shared/components/staticContent/StaticContent.tsx
+++ b/src/shared/components/staticContent/StaticContent.tsx
@@ -1,56 +1,69 @@
 import * as React from 'react';
 import $ from 'jquery';
-import {observer} from 'mobx-react';
+import { observer } from 'mobx-react';
 import ReactMarkdown from 'react-markdown';
-import AppConfig from "appConfig";
-import {remoteData} from "cbioportal-frontend-commons";
-import LoadingIndicator from "../loadingIndicator/LoadingIndicator";
-import {getDocsUrl} from "../../api/urls";
+import AppConfig from 'appConfig';
+import { remoteData } from 'cbioportal-frontend-commons';
+import LoadingIndicator from '../loadingIndicator/LoadingIndicator';
+import { getDocsUrl } from '../../api/urls';
 import './gfm.css';
 
-function isMarkDown(url:string){
-    return (!AppConfig.serverConfig.skin_documentation_markdown === false) && /\.md$/.test(url);
+function isMarkDown(url: string) {
+    return (
+        !AppConfig.serverConfig.skin_documentation_markdown === false &&
+        /\.md$/.test(url)
+    );
 }
 
-function setImageRoot(path:string){
-    return `${AppConfig.serverConfig.skin_documentation_baseurl}/${path}`
+function setImageRoot(path: string) {
+    return `${AppConfig.serverConfig.skin_documentation_baseurl}/${path}`;
 }
 
 @observer
-export default class StaticContent extends React.Component<{ sourceUrl:string, title?:string, renderers?:{ [k:string]:any } }, {}> {
-
-    private get url(){
-        return getDocsUrl(this.props.sourceUrl!, AppConfig.serverConfig.skin_documentation_baseurl!);
+export default class StaticContent extends React.Component<
+    { sourceUrl: string; title?: string; renderers?: { [k: string]: any } },
+    {}
+> {
+    private get url() {
+        return getDocsUrl(
+            this.props.sourceUrl!,
+            AppConfig.serverConfig.skin_documentation_baseurl!
+        );
     }
 
-    readonly source = remoteData<string>(async ()=>{
+    readonly source = remoteData<string>(async () => {
         return await $.get(this.url);
     });
 
-    private content(content:string, url:string){
+    private content(content: string, url: string) {
         if (isMarkDown(url)) {
-            return <ReactMarkdown renderers={this.props.renderers || {}} className={'markdown-body'} escapeHtml={false} source={this.source.result!} />;
+            return (
+                <ReactMarkdown
+                    renderers={this.props.renderers || {}}
+                    className={'markdown-body'}
+                    escapeHtml={false}
+                    source={this.source.result!}
+                />
+            );
         } else {
-            return <div dangerouslySetInnerHTML={{__html: content}} />
+            return <div dangerouslySetInnerHTML={{ __html: content }} />;
         }
     }
 
     public render() {
+        return (
+            <div>
+                {this.props.title && <h1>{this.props.title}</h1>}
 
-        return <div>
-            {
-                (this.props.title) && (<h1>{this.props.title}</h1>)
-            }
-
-            <LoadingIndicator isLoading={this.source.isPending} size={"big"} center={true} />
+                <LoadingIndicator
+                    isLoading={this.source.isPending}
+                    size={'big'}
+                    center={true}
+                />
 
-            {
-                (this.source.isComplete) && this.content(this.source.result!,this.url)
-            }
-        </div>
+                {this.source.isComplete &&
+                    this.content(this.source.result!, this.url)}
+            </div>
+        );
     }
-
 }
-
-
-
diff --git a/src/shared/components/staticContent/gfm.css b/src/shared/components/staticContent/gfm.css
index 4e4cc1d0112..db67b7e226d 100644
--- a/src/shared/components/staticContent/gfm.css
+++ b/src/shared/components/staticContent/gfm.css
@@ -1,2 +1,275 @@
 /* gfm.css v1.1.0 - 07/10/15 - http://ngoldman.github.io/gfm.css/ */
-.markdown-body{-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%;color:#333;overflow:hidden;font-family:'Helvetica Neue',Helvetica,'Segoe UI',Arial,freesans,sans-serif;font-size:16px;line-height:1.6;word-wrap:break-word}.markdown-body *{-moz-box-sizing:border-box;box-sizing:border-box}.markdown-body>:first-child{margin-top:0!important}.markdown-body>:last-child{margin-bottom:0!important}.markdown-body a{background:0 0;color:#4183c4;text-decoration:none}.markdown-body a:active,.markdown-body a:hover{outline:0}.markdown-body a:active,.markdown-body a:focus,.markdown-body a:hover{text-decoration:underline}.markdown-body strong{font-weight:700}.markdown-body em{font-style:italic}.markdown-body blockquote,.markdown-body dl,.markdown-body ol,.markdown-body p,.markdown-body pre,.markdown-body table,.markdown-body ul{margin-top:0;margin-bottom:16px}.markdown-body h1,.markdown-body h2,.markdown-body h3,.markdown-body h4,.markdown-body h5,.markdown-body h6{font-family:'Helvetica Neue',Helvetica,'Segoe UI',Arial,freesans,sans-serif;position:relative;margin-top:1em;margin-bottom:16px;font-weight:700;line-height:1.4}.markdown-body h1,.markdown-body h2{padding-bottom:.3em;border-bottom:1px solid #eee}.markdown-body h1{font-size:2.25em;line-height:1.2}.markdown-body h2{font-size:1.75em;line-height:1.225}.markdown-body h3{font-size:1.5em}.markdown-body h4{font-size:1.25em}.markdown-body h5{font-size:1em}.markdown-body h6{font-size:1em;color:#777}.markdown-body code,.markdown-body kbd,.markdown-body pre{font-family:Consolas,'Liberation Mono',Menlo,Courier,monospace}.markdown-body code{padding:.2em 0;margin:0;font-size:85%;background-color:rgba(0,0,0,.04);border-radius:3px}.markdown-body code:after,.markdown-body code:before{letter-spacing:-.2em;content:'\00a0'}.markdown-body pre{word-wrap:normal;padding:16px;overflow:auto;font-size:85%;line-height:1.45;background-color:#f7f7f7;border-radius:3px}.markdown-body pre code{display:inline;max-width:initial;padding:0;margin:0;overflow:initial;line-height:inherit;word-wrap:normal;background:0 0}.markdown-body pre code:after,.markdown-body pre code:before{content:normal}.markdown-body pre>code{font-size:1em;word-break:normal;white-space:pre;border:0}.markdown-body kbd{background-color:#e7e7e7;background-image:-webkit-linear-gradient(#fefefe,#e7e7e7);background-image:linear-gradient(#fefefe,#e7e7e7);background-repeat:repeat-x;display:inline-block;padding:5px 5px 1px;margin:0 1px;font-size:11px;line-height:10px;color:#000;border:1px solid #cfcfcf;border-radius:2px;box-shadow:0 1px 0 #ccc}.markdown-body hr:after,.markdown-body hr:before{display:table;content:''}.markdown-body input{color:inherit;font:inherit;margin:0;font-size:13px;line-height:1.4;font-family:Helvetica,Arial,freesans,clean,sans-serif,'Segoe UI Emoji','Segoe UI Symbol'}.markdown-body input[disabled]{cursor:default}.markdown-body input[type=checkbox]{-moz-box-sizing:border-box;box-sizing:border-box;padding:0}.markdown-body blockquote{margin:0 0 16px;padding:0 15px;color:#777;border-left:4px solid #ddd}.markdown-body blockquote>:first-child{margin-top:0}.markdown-body blockquote>:last-child{margin-bottom:0}.markdown-body img{border:0;max-width:100%;-moz-box-sizing:border-box;box-sizing:border-box}.markdown-body hr{-moz-box-sizing:content-box;box-sizing:content-box;overflow:hidden;background:#e7e7e7;height:4px;padding:0;margin:16px 0;border:0}.markdown-body hr:after{clear:both}.markdown-body td,.markdown-body th{padding:0}.markdown-body table{border-collapse:collapse;border-spacing:0;display:block;width:100%;overflow:auto;word-break:normal;word-break:keep-all}.markdown-body table td,.markdown-body table th{padding:6px 13px;border:1px solid #ddd}.markdown-body table th{font-weight:700}.markdown-body table tr{background-color:#fff;border-top:1px solid #ccc}.markdown-body table tr:nth-child(2n){background-color:#f8f8f8}.markdown-body ol,.markdown-body ul{padding:0 0 0 2em}.markdown-body ol ol,.markdown-body ul ol{list-style-type:lower-roman}.markdown-body ol ol,.markdown-body ol ul,.markdown-body ul ol,.markdown-body ul ul{margin-top:0;margin-bottom:0}.markdown-body ol ol ol,.markdown-body ol ul ol,.markdown-body ul ol ol,.markdown-body ul ul ol{list-style-type:lower-alpha}.markdown-body li>p{margin-top:16px}.markdown-body dd{margin-left:0}.markdown-body dl{padding:0}.markdown-body dl dt{padding:0;margin-top:16px;font-size:1em;font-style:italic;font-weight:700}.markdown-body dl dd{padding:0 16px;margin-bottom:16px}
\ No newline at end of file
+.markdown-body {
+    -ms-text-size-adjust: 100%;
+    -webkit-text-size-adjust: 100%;
+    color: #333;
+    overflow: hidden;
+    font-family: 'Helvetica Neue', Helvetica, 'Segoe UI', Arial, freesans,
+        sans-serif;
+    font-size: 16px;
+    line-height: 1.6;
+    word-wrap: break-word;
+}
+.markdown-body * {
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+}
+.markdown-body > :first-child {
+    margin-top: 0 !important;
+}
+.markdown-body > :last-child {
+    margin-bottom: 0 !important;
+}
+.markdown-body a {
+    background: 0 0;
+    color: #4183c4;
+    text-decoration: none;
+}
+.markdown-body a:active,
+.markdown-body a:hover {
+    outline: 0;
+}
+.markdown-body a:active,
+.markdown-body a:focus,
+.markdown-body a:hover {
+    text-decoration: underline;
+}
+.markdown-body strong {
+    font-weight: 700;
+}
+.markdown-body em {
+    font-style: italic;
+}
+.markdown-body blockquote,
+.markdown-body dl,
+.markdown-body ol,
+.markdown-body p,
+.markdown-body pre,
+.markdown-body table,
+.markdown-body ul {
+    margin-top: 0;
+    margin-bottom: 16px;
+}
+.markdown-body h1,
+.markdown-body h2,
+.markdown-body h3,
+.markdown-body h4,
+.markdown-body h5,
+.markdown-body h6 {
+    font-family: 'Helvetica Neue', Helvetica, 'Segoe UI', Arial, freesans,
+        sans-serif;
+    position: relative;
+    margin-top: 1em;
+    margin-bottom: 16px;
+    font-weight: 700;
+    line-height: 1.4;
+}
+.markdown-body h1,
+.markdown-body h2 {
+    padding-bottom: 0.3em;
+    border-bottom: 1px solid #eee;
+}
+.markdown-body h1 {
+    font-size: 2.25em;
+    line-height: 1.2;
+}
+.markdown-body h2 {
+    font-size: 1.75em;
+    line-height: 1.225;
+}
+.markdown-body h3 {
+    font-size: 1.5em;
+}
+.markdown-body h4 {
+    font-size: 1.25em;
+}
+.markdown-body h5 {
+    font-size: 1em;
+}
+.markdown-body h6 {
+    font-size: 1em;
+    color: #777;
+}
+.markdown-body code,
+.markdown-body kbd,
+.markdown-body pre {
+    font-family: Consolas, 'Liberation Mono', Menlo, Courier, monospace;
+}
+.markdown-body code {
+    padding: 0.2em 0;
+    margin: 0;
+    font-size: 85%;
+    background-color: rgba(0, 0, 0, 0.04);
+    border-radius: 3px;
+}
+.markdown-body code:after,
+.markdown-body code:before {
+    letter-spacing: -0.2em;
+    content: '\00a0';
+}
+.markdown-body pre {
+    word-wrap: normal;
+    padding: 16px;
+    overflow: auto;
+    font-size: 85%;
+    line-height: 1.45;
+    background-color: #f7f7f7;
+    border-radius: 3px;
+}
+.markdown-body pre code {
+    display: inline;
+    max-width: initial;
+    padding: 0;
+    margin: 0;
+    overflow: initial;
+    line-height: inherit;
+    word-wrap: normal;
+    background: 0 0;
+}
+.markdown-body pre code:after,
+.markdown-body pre code:before {
+    content: normal;
+}
+.markdown-body pre > code {
+    font-size: 1em;
+    word-break: normal;
+    white-space: pre;
+    border: 0;
+}
+.markdown-body kbd {
+    background-color: #e7e7e7;
+    background-image: -webkit-linear-gradient(#fefefe, #e7e7e7);
+    background-image: linear-gradient(#fefefe, #e7e7e7);
+    background-repeat: repeat-x;
+    display: inline-block;
+    padding: 5px 5px 1px;
+    margin: 0 1px;
+    font-size: 11px;
+    line-height: 10px;
+    color: #000;
+    border: 1px solid #cfcfcf;
+    border-radius: 2px;
+    box-shadow: 0 1px 0 #ccc;
+}
+.markdown-body hr:after,
+.markdown-body hr:before {
+    display: table;
+    content: '';
+}
+.markdown-body input {
+    color: inherit;
+    font: inherit;
+    margin: 0;
+    font-size: 13px;
+    line-height: 1.4;
+    font-family: Helvetica, Arial, freesans, clean, sans-serif, 'Segoe UI Emoji',
+        'Segoe UI Symbol';
+}
+.markdown-body input[disabled] {
+    cursor: default;
+}
+.markdown-body input[type='checkbox'] {
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+    padding: 0;
+}
+.markdown-body blockquote {
+    margin: 0 0 16px;
+    padding: 0 15px;
+    color: #777;
+    border-left: 4px solid #ddd;
+}
+.markdown-body blockquote > :first-child {
+    margin-top: 0;
+}
+.markdown-body blockquote > :last-child {
+    margin-bottom: 0;
+}
+.markdown-body img {
+    border: 0;
+    max-width: 100%;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+}
+.markdown-body hr {
+    -moz-box-sizing: content-box;
+    box-sizing: content-box;
+    overflow: hidden;
+    background: #e7e7e7;
+    height: 4px;
+    padding: 0;
+    margin: 16px 0;
+    border: 0;
+}
+.markdown-body hr:after {
+    clear: both;
+}
+.markdown-body td,
+.markdown-body th {
+    padding: 0;
+}
+.markdown-body table {
+    border-collapse: collapse;
+    border-spacing: 0;
+    display: block;
+    width: 100%;
+    overflow: auto;
+    word-break: normal;
+    word-break: keep-all;
+}
+.markdown-body table td,
+.markdown-body table th {
+    padding: 6px 13px;
+    border: 1px solid #ddd;
+}
+.markdown-body table th {
+    font-weight: 700;
+}
+.markdown-body table tr {
+    background-color: #fff;
+    border-top: 1px solid #ccc;
+}
+.markdown-body table tr:nth-child(2n) {
+    background-color: #f8f8f8;
+}
+.markdown-body ol,
+.markdown-body ul {
+    padding: 0 0 0 2em;
+}
+.markdown-body ol ol,
+.markdown-body ul ol {
+    list-style-type: lower-roman;
+}
+.markdown-body ol ol,
+.markdown-body ol ul,
+.markdown-body ul ol,
+.markdown-body ul ul {
+    margin-top: 0;
+    margin-bottom: 0;
+}
+.markdown-body ol ol ol,
+.markdown-body ol ul ol,
+.markdown-body ul ol ol,
+.markdown-body ul ul ol {
+    list-style-type: lower-alpha;
+}
+.markdown-body li > p {
+    margin-top: 16px;
+}
+.markdown-body dd {
+    margin-left: 0;
+}
+.markdown-body dl {
+    padding: 0;
+}
+.markdown-body dl dt {
+    padding: 0;
+    margin-top: 16px;
+    font-size: 1em;
+    font-style: italic;
+    font-weight: 700;
+}
+.markdown-body dl dd {
+    padding: 0 16px;
+    margin-bottom: 16px;
+}
diff --git a/src/shared/components/structureViewer/PdbResidueUtils.spec.ts b/src/shared/components/structureViewer/PdbResidueUtils.spec.ts
index bb96c9f135c..9f289b19f26 100644
--- a/src/shared/components/structureViewer/PdbResidueUtils.spec.ts
+++ b/src/shared/components/structureViewer/PdbResidueUtils.spec.ts
@@ -1,38 +1,40 @@
 import { assert } from 'chai';
-import {IPdbPositionRange} from "shared/model/Pdb";
+import { IPdbPositionRange } from 'shared/model/Pdb';
 import {
-    convertPdbPosToResCode, convertPdbPosToResAndInsCode, generateResiduePosToSelectorMap,
-    findUpdatedResidues, IResidueHelper
-} from "./PdbResidueUtils";
-import {IResidueSpec} from "./StructureVisualizer";
-
-function initMockMap(): {[residue: number]: IResidueHelper[]}
-{
+    convertPdbPosToResCode,
+    convertPdbPosToResAndInsCode,
+    generateResiduePosToSelectorMap,
+    findUpdatedResidues,
+    IResidueHelper,
+} from './PdbResidueUtils';
+import { IResidueSpec } from './StructureVisualizer';
+
+function initMockMap(): { [residue: number]: IResidueHelper[] } {
     return {
         666: [
             {
                 selector: {
-                    resi: 666
+                    resi: 666,
                 },
-                residue: residueSpec(666, "#8B4513")
-            }
+                residue: residueSpec(666, '#8B4513'),
+            },
         ],
         1961: [
             {
                 selector: {
-                    resi: 1961
+                    resi: 1961,
                 },
-                residue: residueSpec(1961, "#ACDC99")
-            }
+                residue: residueSpec(1961, '#ACDC99'),
+            },
         ],
         765: [
             {
                 selector: {
-                    resi: 765
+                    resi: 765,
                 },
-                residue: residueSpec(765, "#244281")
-            }
-        ]
+                residue: residueSpec(765, '#244281'),
+            },
+        ],
     };
 }
 
@@ -40,89 +42,117 @@ function residueSpec(resi: number, color: string) {
     return {
         positionRange: {
             start: {
-                position: resi
+                position: resi,
             },
             end: {
-                position: resi
-            }
+                position: resi,
+            },
         },
         color,
-        highlighted: false
+        highlighted: false,
     };
 }
 
 describe('PdbResidueUtils', () => {
-
     let pointPositionRange: IPdbPositionRange;
     let pointPositionRangeWithInsertion: IPdbPositionRange;
     let multiPositionRange: IPdbPositionRange;
     let multiPositionRangeWithInsertion: IPdbPositionRange;
 
-    const residueSpec666: IResidueSpec = residueSpec(666, "#8B4513");
-    const residueSpec1961: IResidueSpec = residueSpec(1961, "#ACDC99");
-    const residueSpec765: IResidueSpec = residueSpec(765, "#244281");
+    const residueSpec666: IResidueSpec = residueSpec(666, '#8B4513');
+    const residueSpec1961: IResidueSpec = residueSpec(1961, '#ACDC99');
+    const residueSpec765: IResidueSpec = residueSpec(765, '#244281');
 
     before(() => {
         pointPositionRange = {
             start: {
-                position: 666
+                position: 666,
             },
             end: {
-                position: 666
-            }
+                position: 666,
+            },
         };
 
         multiPositionRange = {
             start: {
-                position: 666
+                position: 666,
             },
             end: {
-                position: 668
-            }
+                position: 668,
+            },
         };
 
         pointPositionRangeWithInsertion = {
             start: {
                 position: 666,
-                insertionCode: "D"
+                insertionCode: 'D',
             },
             end: {
-                position: 666
-            }
+                position: 666,
+            },
         };
 
         multiPositionRangeWithInsertion = {
             start: {
                 position: 666,
-                insertionCode: "D"
+                insertionCode: 'D',
             },
             end: {
                 position: 668,
-                insertionCode: "D"
-            }
+                insertionCode: 'D',
+            },
         };
     });
 
     it('converts pdb positions to residue codes', () => {
-        assert.deepEqual(convertPdbPosToResCode(pointPositionRange), ["666"]);
-        assert.deepEqual(convertPdbPosToResCode(multiPositionRange), ["666", "667", "668"]);
-        assert.deepEqual(convertPdbPosToResCode(pointPositionRangeWithInsertion), ["666^D"]);
-        assert.deepEqual(convertPdbPosToResCode(multiPositionRangeWithInsertion), ["666^D", "667", "668^D"]);
+        assert.deepEqual(convertPdbPosToResCode(pointPositionRange), ['666']);
+        assert.deepEqual(convertPdbPosToResCode(multiPositionRange), [
+            '666',
+            '667',
+            '668',
+        ]);
+        assert.deepEqual(
+            convertPdbPosToResCode(pointPositionRangeWithInsertion),
+            ['666^D']
+        );
+        assert.deepEqual(
+            convertPdbPosToResCode(multiPositionRangeWithInsertion),
+            ['666^D', '667', '668^D']
+        );
     });
 
     it('converts pdb positions to residue and insertion code pairs', () => {
-        assert.deepEqual(convertPdbPosToResAndInsCode(pointPositionRange),
-            [{resi: 666}]);
-        assert.deepEqual(convertPdbPosToResAndInsCode(multiPositionRange),
-            [{resi: 666}, {resi: 667}, {resi: 668}]);
-        assert.deepEqual(convertPdbPosToResAndInsCode(pointPositionRangeWithInsertion),
-            [{resi: 666, icode: "D"}]);
-        assert.deepEqual(convertPdbPosToResAndInsCode(multiPositionRangeWithInsertion),
-            [{resi: 666, icode: "D"}, {resi: 667}, {resi: 668, icode: "D"}]);
+        assert.deepEqual(convertPdbPosToResAndInsCode(pointPositionRange), [
+            { resi: 666 },
+        ]);
+        assert.deepEqual(convertPdbPosToResAndInsCode(multiPositionRange), [
+            { resi: 666 },
+            { resi: 667 },
+            { resi: 668 },
+        ]);
+        assert.deepEqual(
+            convertPdbPosToResAndInsCode(pointPositionRangeWithInsertion),
+            [{ resi: 666, icode: 'D' }]
+        );
+        assert.deepEqual(
+            convertPdbPosToResAndInsCode(multiPositionRangeWithInsertion),
+            [
+                { resi: 666, icode: 'D' },
+                { resi: 667 },
+                { resi: 668, icode: 'D' },
+            ]
+        );
     });
 
     it('converts pdb residue specs to residue helper map', () => {
-        assert.deepEqual(generateResiduePosToSelectorMap([residueSpec666, residueSpec765, residueSpec1961]), initMockMap());
+        assert.deepEqual(
+            generateResiduePosToSelectorMap([
+                residueSpec666,
+                residueSpec765,
+                residueSpec1961,
+            ]),
+            initMockMap()
+        );
     });
 
     it('finds the updated residues', () => {
@@ -131,27 +161,34 @@ describe('PdbResidueUtils', () => {
 
         modifiedMap[666][0].residue.highlighted = true;
 
-        assert.deepEqual(findUpdatedResidues(modifiedMap, originalMap), modifiedMap[666],
-            "Only residue 666 should be classified as updated");
-
+        assert.deepEqual(
+            findUpdatedResidues(modifiedMap, originalMap),
+            modifiedMap[666],
+            'Only residue 666 should be classified as updated'
+        );
 
         originalMap = initMockMap();
         modifiedMap = initMockMap();
 
-        modifiedMap[765][0].residue.color = "#453412";
+        modifiedMap[765][0].residue.color = '#453412';
         modifiedMap[666][0].residue.highlighted = true;
 
-        assert.deepEqual(findUpdatedResidues(modifiedMap, originalMap), [modifiedMap[666][0], modifiedMap[765][0]],
-            "Residues 666 and 765 should be classified as updated");
-
+        assert.deepEqual(
+            findUpdatedResidues(modifiedMap, originalMap),
+            [modifiedMap[666][0], modifiedMap[765][0]],
+            'Residues 666 and 765 should be classified as updated'
+        );
 
         originalMap = initMockMap();
         modifiedMap = initMockMap();
 
-        modifiedMap[666][0].residue = residueSpec(666, "#8B4513"); // same specs as before
-        modifiedMap[1961][0].selector = {resi: 1961}; // same as before
+        modifiedMap[666][0].residue = residueSpec(666, '#8B4513'); // same specs as before
+        modifiedMap[1961][0].selector = { resi: 1961 }; // same as before
 
-        assert.equal(findUpdatedResidues(modifiedMap, originalMap).length, 0,
-            "None of the residues should be classified as updated");
+        assert.equal(
+            findUpdatedResidues(modifiedMap, originalMap).length,
+            0,
+            'None of the residues should be classified as updated'
+        );
     });
 });
diff --git a/src/shared/components/structureViewer/PdbResidueUtils.ts b/src/shared/components/structureViewer/PdbResidueUtils.ts
index eefb5c0b805..060a5899cd1 100644
--- a/src/shared/components/structureViewer/PdbResidueUtils.ts
+++ b/src/shared/components/structureViewer/PdbResidueUtils.ts
@@ -1,6 +1,6 @@
 import * as _ from 'lodash';
-import {IPdbPositionRange} from "shared/model/Pdb";
-import {IResidueSpec} from "./StructureVisualizer";
+import { IPdbPositionRange } from 'shared/model/Pdb';
+import { IResidueSpec } from './StructureVisualizer';
 
 export interface IResidueSelector {
     resi: number;
@@ -15,27 +15,23 @@ export interface IResidueHelper {
 /**
  * Converts the given PDB position to residue code(s)
  */
-export function convertPdbPosToResCode(position: IPdbPositionRange): string[]
-{
+export function convertPdbPosToResCode(position: IPdbPositionRange): string[] {
     const residues: string[] = [];
     const start = position.start.position;
     const end = position.end.position;
 
-    for (let i=start; i <= end; i++) {
+    for (let i = start; i <= end; i++) {
         residues.push(`${i}`);
     }
 
     // TODO insertion code may not be accurate if residues.length > 2
 
-    if (position.start.insertionCode)
-    {
-        residues[0] += "^" + position.start.insertionCode;
+    if (position.start.insertionCode) {
+        residues[0] += '^' + position.start.insertionCode;
     }
 
-    if (residues.length > 1 &&
-        position.end.insertionCode)
-    {
-        residues[residues.length - 1] += "^" + position.end.insertionCode;
+    if (residues.length > 1 && position.end.insertionCode) {
+        residues[residues.length - 1] += '^' + position.end.insertionCode;
     }
 
     return residues;
@@ -44,15 +40,16 @@ export function convertPdbPosToResCode(position: IPdbPositionRange): string[]
 /**
  * Converts the given PDB position to residue and icode pairs
  */
-export function convertPdbPosToResAndInsCode(position: IPdbPositionRange): IResidueSelector[]
-{
+export function convertPdbPosToResAndInsCode(
+    position: IPdbPositionRange
+): IResidueSelector[] {
     const residues: IResidueSelector[] = [];
     const start = position.start.position;
     const end = position.end.position;
 
-    for (let i=start; i <= end; i++) {
+    for (let i = start; i <= end; i++) {
         residues.push({
-            resi: i
+            resi: i,
         });
     }
 
@@ -69,16 +66,19 @@ export function convertPdbPosToResAndInsCode(position: IPdbPositionRange): IResi
     return residues;
 }
 
-export function generateResiduePosToSelectorMap(residues: IResidueSpec[]): {[residue: number]: IResidueHelper[]}
-{
-    const map: {[residue: number]: IResidueHelper[]} = {};
+export function generateResiduePosToSelectorMap(
+    residues: IResidueSpec[]
+): { [residue: number]: IResidueHelper[] } {
+    const map: { [residue: number]: IResidueHelper[] } = {};
 
-    residues.forEach((residue:IResidueSpec) => {
+    residues.forEach((residue: IResidueSpec) => {
         // TODO "rescode" selector does not work anymore for some reason (3Dmol.js bug?)
         //const resCodes = convertPositionsToResCode([residue.positionRange]);
 
-        const residueSelectors = convertPdbPosToResAndInsCode(residue.positionRange);
-        const grouped = _.groupBy(residueSelectors, "resi");
+        const residueSelectors = convertPdbPosToResAndInsCode(
+            residue.positionRange
+        );
+        const grouped = _.groupBy(residueSelectors, 'resi');
 
         _.each(_.keys(grouped), (resi: number) => {
             if (!map[resi]) {
@@ -86,7 +86,7 @@ export function generateResiduePosToSelectorMap(residues: IResidueSpec[]): {[res
             }
 
             _.each(grouped[resi], (selector: IResidueSelector) => {
-                map[resi].push({selector, residue});
+                map[resi].push({ selector, residue });
             });
         });
     });
@@ -94,14 +94,20 @@ export function generateResiduePosToSelectorMap(residues: IResidueSpec[]): {[res
     return map;
 }
 
-export function findUpdatedResidues(currentResidueToPositionMap: {[residue: number]: IResidueHelper[]},
-                                    prevResidueToPositionMap: {[residue: number]: IResidueHelper[]}): IResidueHelper[]
-{
+export function findUpdatedResidues(
+    currentResidueToPositionMap: { [residue: number]: IResidueHelper[] },
+    prevResidueToPositionMap: { [residue: number]: IResidueHelper[] }
+): IResidueHelper[] {
     let residues: IResidueHelper[] = [];
 
     // compare current to prev and find the updated residues
     _.each(_.keys(currentResidueToPositionMap), (resi: number) => {
-        if (!_.isEqual(currentResidueToPositionMap[resi], prevResidueToPositionMap[resi])) {
+        if (
+            !_.isEqual(
+                currentResidueToPositionMap[resi],
+                prevResidueToPositionMap[resi]
+            )
+        ) {
             residues = residues.concat(currentResidueToPositionMap[resi]);
         }
     });
diff --git a/src/shared/components/structureViewer/PyMolScriptGenerator.spec.ts b/src/shared/components/structureViewer/PyMolScriptGenerator.spec.ts
index 672a25a3593..817831591b8 100644
--- a/src/shared/components/structureViewer/PyMolScriptGenerator.spec.ts
+++ b/src/shared/components/structureViewer/PyMolScriptGenerator.spec.ts
@@ -1,10 +1,14 @@
-import PyMolScriptGenerator from "./PyMolScriptGenerator";
+import PyMolScriptGenerator from './PyMolScriptGenerator';
 import { assert } from 'chai';
 import sinon from 'sinon';
 import {
-    IStructureVisualizerProps, IResidueSpec, ProteinScheme, ProteinColor,
-    MutationColor, SideChain
-} from "./StructureVisualizer";
+    IStructureVisualizerProps,
+    IResidueSpec,
+    ProteinScheme,
+    ProteinColor,
+    MutationColor,
+    SideChain,
+} from './StructureVisualizer';
 
 describe('PyMolScriptGenerator', () => {
     let props: IStructureVisualizerProps;
@@ -13,274 +17,349 @@ describe('PyMolScriptGenerator', () => {
     beforeEach(() => {
         // reset to defaults
         props = {
-            pdbUri: "https://files.rcsb.org/view/",
+            pdbUri: 'https://files.rcsb.org/view/',
             proteinScheme: ProteinScheme.CARTOON,
             displayBoundMolecules: true,
-            backgroundColor: "#EFEFEF",
-            baseColor: "#DDDDDD",
+            backgroundColor: '#EFEFEF',
+            baseColor: '#DDDDDD',
             structureColors: {
-                alphaHelix: "#FFA500",
-                betaSheet: "#0000FF",
-                loop: "#EEEEEE"
+                alphaHelix: '#FFA500',
+                betaSheet: '#0000FF',
+                loop: '#EEEEEE',
             },
             baseTranslucency: 5,
-            chainColor: "#888888",
+            chainColor: '#888888',
             chainTranslucency: 0,
             proteinColor: ProteinColor.UNIFORM,
             mutationColor: MutationColor.MUTATION_TYPE,
-            uniformMutationColor: "#8A2BE2",
-            highlightColor: "#FFDD00",
-            sideChain: SideChain.SELECTED
+            uniformMutationColor: '#8A2BE2',
+            highlightColor: '#FFDD00',
+            sideChain: SideChain.SELECTED,
         };
 
         residues = [
             {
                 positionRange: {
                     start: {
-                        position: 122
+                        position: 122,
                     },
                     end: {
-                        position: 122
-                    }
+                        position: 122,
+                    },
                 },
-                color: "#AAA666",
-                highlighted: true
+                color: '#AAA666',
+                highlighted: true,
             },
             {
                 positionRange: {
                     start: {
-                        position: 1710
+                        position: 1710,
                     },
                     end: {
-                        position: 1710
-                    }
+                        position: 1710,
+                    },
                 },
-                color: "#FF0000"
+                color: '#FF0000',
             },
             {
                 positionRange: {
                     start: {
-                        position: 1835
+                        position: 1835,
                     },
                     end: {
-                        position: 1835
-                    }
+                        position: 1835,
+                    },
                 },
-                color: "#00FFFF"
+                color: '#00FFFF',
             },
             {
                 positionRange: {
                     start: {
-                        position: 1815
+                        position: 1815,
                     },
                     end: {
-                        position: 1815
-                    }
+                        position: 1815,
+                    },
                 },
-                color: "#00FF00",
-                highlighted: true
-            }
+                color: '#00FF00',
+                highlighted: true,
+            },
         ];
     });
 
-    it("properly generates the initializer script", () => {
+    it('properly generates the initializer script', () => {
         const scriptGenerator = new PyMolScriptGenerator();
 
         // can't stub private methods so need to cast to any
-        const reinitStub = sinon.stub((scriptGenerator as any), "reinitialize");
-        const bgColorStub = sinon.stub((scriptGenerator as any), "bgColor");
-        const loadPdbStub = sinon.stub((scriptGenerator as any), "loadPdb");
-
-        scriptGenerator.generateScript("3pxe", "B", residues, props);
-
-        assert.isTrue(reinitStub.calledOnce,
-            "Reinitialize should be called only once");
-
-        assert.isTrue(bgColorStub.calledWithExactly("#EFEFEF"),
-            "background color should be set to #EFEFEF");
-
-        assert.isTrue(loadPdbStub.calledWithExactly("3pxe"),
-            "PDB structure for 3pxe should be loaded");
+        const reinitStub = sinon.stub(scriptGenerator as any, 'reinitialize');
+        const bgColorStub = sinon.stub(scriptGenerator as any, 'bgColor');
+        const loadPdbStub = sinon.stub(scriptGenerator as any, 'loadPdb');
+
+        scriptGenerator.generateScript('3pxe', 'B', residues, props);
+
+        assert.isTrue(
+            reinitStub.calledOnce,
+            'Reinitialize should be called only once'
+        );
+
+        assert.isTrue(
+            bgColorStub.calledWithExactly('#EFEFEF'),
+            'background color should be set to #EFEFEF'
+        );
+
+        assert.isTrue(
+            loadPdbStub.calledWithExactly('3pxe'),
+            'PDB structure for 3pxe should be loaded'
+        );
     });
 
-    it("sets color and the opacity properly for the base structure and the chain", () => {
+    it('sets color and the opacity properly for the base structure and the chain', () => {
         const scriptGenerator = new PyMolScriptGenerator();
 
-        const setTransparencyStub = sinon.stub((scriptGenerator as any), "setTransparency");
-        const setColorStub = sinon.stub((scriptGenerator as any), "setColor");
-
-        scriptGenerator.generateScript("3pxe", "B", residues, props);
-
-        assert.isTrue(setColorStub.withArgs("#888888").calledOnce,
-            "chain color should be to set #888888 only once");
-
-        assert.isTrue(setTransparencyStub.withArgs(0).calledOnce,
-            "chain transparency should be to set to 0");
-
-        assert.isTrue(setColorStub.withArgs("#DDDDDD").calledOnce,
-            "base color should be to set #DDDDDD only once");
-
-        assert.isTrue(setTransparencyStub.withArgs(5).calledOnce,
-            "base transparency should be to set to 5/10");
+        const setTransparencyStub = sinon.stub(
+            scriptGenerator as any,
+            'setTransparency'
+        );
+        const setColorStub = sinon.stub(scriptGenerator as any, 'setColor');
+
+        scriptGenerator.generateScript('3pxe', 'B', residues, props);
+
+        assert.isTrue(
+            setColorStub.withArgs('#888888').calledOnce,
+            'chain color should be to set #888888 only once'
+        );
+
+        assert.isTrue(
+            setTransparencyStub.withArgs(0).calledOnce,
+            'chain transparency should be to set to 0'
+        );
+
+        assert.isTrue(
+            setColorStub.withArgs('#DDDDDD').calledOnce,
+            'base color should be to set #DDDDDD only once'
+        );
+
+        assert.isTrue(
+            setTransparencyStub.withArgs(5).calledOnce,
+            'base transparency should be to set to 5/10'
+        );
     });
 
-    it("applies correct protein style wrt the corresponding prop", () => {
+    it('applies correct protein style wrt the corresponding prop', () => {
         const scriptGenerator = new PyMolScriptGenerator();
-        let script: string = "";
+        let script: string = '';
 
         props.proteinScheme = ProteinScheme.TRACE;
-        script = scriptGenerator.generateScript("3pxe", "B", residues, props);
-        assert.notEqual(script.indexOf("hide everything; show ribbon;"), -1);
+        script = scriptGenerator.generateScript('3pxe', 'B', residues, props);
+        assert.notEqual(script.indexOf('hide everything; show ribbon;'), -1);
 
         props.proteinScheme = ProteinScheme.SPACE_FILLING;
-        script = scriptGenerator.generateScript("3pxe", "B", residues, props);
-        assert.notEqual(script.indexOf("hide everything; show spheres;"), -1);
+        script = scriptGenerator.generateScript('3pxe', 'B', residues, props);
+        assert.notEqual(script.indexOf('hide everything; show spheres;'), -1);
 
         props.proteinScheme = ProteinScheme.CARTOON;
-        script = scriptGenerator.generateScript("3pxe", "B", residues, props);
-        assert.notEqual(script.indexOf("hide everything; show cartoon;"), -1);
+        script = scriptGenerator.generateScript('3pxe', 'B', residues, props);
+        assert.notEqual(script.indexOf('hide everything; show cartoon;'), -1);
     });
 
-    it("does not display bound molecules when the corresponding prop is set to false", () => {
+    it('does not display bound molecules when the corresponding prop is set to false', () => {
         const scriptGenerator = new PyMolScriptGenerator();
 
         props.displayBoundMolecules = false;
-        const script = scriptGenerator.generateScript("3pxe", "B", residues, props);
-
-        assert.notEqual(script.indexOf(
-            "hide everything, not resn asp+glu+arg+lys+his+asn+thr+cys+gln+tyr+ser+gly+ala+leu+val+ile+met+trp+phe+pro;"), -1);
+        const script = scriptGenerator.generateScript(
+            '3pxe',
+            'B',
+            residues,
+            props
+        );
+
+        assert.notEqual(
+            script.indexOf(
+                'hide everything, not resn asp+glu+arg+lys+his+asn+thr+cys+gln+tyr+ser+gly+ala+leu+val+ile+met+trp+phe+pro;'
+            ),
+            -1
+        );
     });
 
-    it("applies correct protein colors wrt the corresponding prop", () => {
+    it('applies correct protein colors wrt the corresponding prop', () => {
         const scriptGenerator = new PyMolScriptGenerator();
-        const setColorStub = sinon.stub((scriptGenerator as any), "setColor");
-        let script: string = "";
-
+        const setColorStub = sinon.stub(scriptGenerator as any, 'setColor');
+        let script: string = '';
 
         props.proteinScheme = ProteinScheme.TRACE;
         props.proteinColor = ProteinColor.SECONDARY_STRUCTURE;
-        script = scriptGenerator.generateScript("3pxe", "B", residues, props);
-
-        assert.notEqual(script.indexOf("select (chain B) and (ss h);"), -1);
-        assert.isTrue(setColorStub.withArgs("#FFA500").calledOnce,
-            "Alpha helices should be colored with 0xFFA500 when SECONDARY_STRUCTURE is selected");
-        assert.notEqual(script.indexOf("select (chain B) and (ss s);"), -1);
-        assert.isTrue(setColorStub.withArgs("#0000FF").calledOnce,
-            "Beta sheets should be colored with 0x0000FF when SECONDARY_STRUCTURE is selected");
-
+        script = scriptGenerator.generateScript('3pxe', 'B', residues, props);
+
+        assert.notEqual(script.indexOf('select (chain B) and (ss h);'), -1);
+        assert.isTrue(
+            setColorStub.withArgs('#FFA500').calledOnce,
+            'Alpha helices should be colored with 0xFFA500 when SECONDARY_STRUCTURE is selected'
+        );
+        assert.notEqual(script.indexOf('select (chain B) and (ss s);'), -1);
+        assert.isTrue(
+            setColorStub.withArgs('#0000FF').calledOnce,
+            'Beta sheets should be colored with 0x0000FF when SECONDARY_STRUCTURE is selected'
+        );
 
         props.proteinScheme = ProteinScheme.CARTOON;
         props.proteinColor = ProteinColor.NC_RAINBOW;
-        script = scriptGenerator.generateScript("3pxe", "B", residues, props);
-
-        assert.notEqual(script.indexOf("spectrum count, rainbow_rev, sele;"), -1,
-            "Chain should be colored with rainbow spectrum when NC_RAINBOW is selected");
+        script = scriptGenerator.generateScript('3pxe', 'B', residues, props);
 
+        assert.notEqual(
+            script.indexOf('spectrum count, rainbow_rev, sele;'),
+            -1,
+            'Chain should be colored with rainbow spectrum when NC_RAINBOW is selected'
+        );
 
         props.proteinScheme = ProteinScheme.SPACE_FILLING;
         props.proteinColor = ProteinColor.ATOM_TYPE;
-        script = scriptGenerator.generateScript("3pxe", "B", residues, props);
+        script = scriptGenerator.generateScript('3pxe', 'B', residues, props);
 
-        assert.notEqual(script.indexOf("util.cbaw sele;"), -1,
-            "Chain should be colored with default element colors when ATOM_TYPE is selected");
+        assert.notEqual(
+            script.indexOf('util.cbaw sele;'),
+            -1,
+            'Chain should be colored with default element colors when ATOM_TYPE is selected'
+        );
     });
 
-    it("colors residues with correct colors", () => {
+    it('colors residues with correct colors', () => {
         const scriptGenerator = new PyMolScriptGenerator();
 
-        const setColorStub = sinon.stub((scriptGenerator as any), "setColor");
-        const selectResiduesStub = sinon.stub((scriptGenerator as any), "selectResidues");
-        scriptGenerator.generateScript("3pxe", "B", residues, props);
-
-        assert.isTrue(selectResiduesStub.calledWith(["122", "1815"], "B"));
-        assert.isTrue(setColorStub.calledWith("#FFDD00"),
-            "Residues 122 and 1815 should be colored with highlight color (0xFFDD00) when MUTATION_TYPE selected");
-
-        assert.isTrue(selectResiduesStub.calledWith(["1710"], "B"));
-        assert.isTrue(setColorStub.withArgs("#FF0000").calledOnce,
-            "Residue 1710 should be colored with 0xFF0000 when MUTATION_TYPE selected");
-
-        assert.isTrue(selectResiduesStub.calledWith(["1835"], "B"));
-        assert.isTrue(setColorStub.withArgs("#00FFFF").calledOnce,
-            "Residue 1835 should be colored with 0x00FFFF when MUTATION_TYPE selected");
+        const setColorStub = sinon.stub(scriptGenerator as any, 'setColor');
+        const selectResiduesStub = sinon.stub(
+            scriptGenerator as any,
+            'selectResidues'
+        );
+        scriptGenerator.generateScript('3pxe', 'B', residues, props);
+
+        assert.isTrue(selectResiduesStub.calledWith(['122', '1815'], 'B'));
+        assert.isTrue(
+            setColorStub.calledWith('#FFDD00'),
+            'Residues 122 and 1815 should be colored with highlight color (0xFFDD00) when MUTATION_TYPE selected'
+        );
+
+        assert.isTrue(selectResiduesStub.calledWith(['1710'], 'B'));
+        assert.isTrue(
+            setColorStub.withArgs('#FF0000').calledOnce,
+            'Residue 1710 should be colored with 0xFF0000 when MUTATION_TYPE selected'
+        );
+
+        assert.isTrue(selectResiduesStub.calledWith(['1835'], 'B'));
+        assert.isTrue(
+            setColorStub.withArgs('#00FFFF').calledOnce,
+            'Residue 1835 should be colored with 0x00FFFF when MUTATION_TYPE selected'
+        );
 
         setColorStub.reset();
         selectResiduesStub.reset();
         props.mutationColor = MutationColor.UNIFORM;
-        scriptGenerator.generateScript("3pxe", "B", residues, props);
+        scriptGenerator.generateScript('3pxe', 'B', residues, props);
 
-        assert.isTrue(selectResiduesStub.calledWith(["122", "1815"], "B"));
-        assert.isTrue(setColorStub.calledWith("#FFDD00"),
-            "Residues 122 and 1815 should be colored with highlight color (0xFFDD00) when UNIFORM selected");
+        assert.isTrue(selectResiduesStub.calledWith(['122', '1815'], 'B'));
+        assert.isTrue(
+            setColorStub.calledWith('#FFDD00'),
+            'Residues 122 and 1815 should be colored with highlight color (0xFFDD00) when UNIFORM selected'
+        );
 
-        assert.isTrue(selectResiduesStub.calledWith(["1710"], "B"));
-        assert.isTrue(selectResiduesStub.calledWith(["1835"], "B"));
-        assert.isTrue(setColorStub.calledWith("#8A2BE2"),
-            "Residues 1710 and 1835 should be colored uniform color (0x8A2BE2) when UNIFORM selected");
+        assert.isTrue(selectResiduesStub.calledWith(['1710'], 'B'));
+        assert.isTrue(selectResiduesStub.calledWith(['1835'], 'B'));
+        assert.isTrue(
+            setColorStub.calledWith('#8A2BE2'),
+            'Residues 1710 and 1835 should be colored uniform color (0x8A2BE2) when UNIFORM selected'
+        );
 
         setColorStub.reset();
         selectResiduesStub.reset();
         props.mutationColor = MutationColor.NONE;
-        scriptGenerator.generateScript("3pxe", "B", residues, props);
-
-        assert.isTrue(selectResiduesStub.calledWith(["122", "1815"], "B"));
-        assert.isTrue(setColorStub.calledWith("#FFDD00"),
-            "Residues 122 and 1815 should be colored with highlight color (0xFFDD00) when NONE selected");
-
-        assert.isTrue(selectResiduesStub.withArgs(["1710"], "B").notCalled);
-        assert.isTrue(selectResiduesStub.withArgs(["1835"], "B").notCalled);
-        assert.isTrue(setColorStub.withArgs("#8A2BE2").notCalled,
-            "Residues 1710 and 1835 should NOT be colored uniform color (0x8A2BE2) when NONE selected");
-        assert.isTrue(setColorStub.withArgs("#FF0000").notCalled,
-            "Residue 1710 should NOT be colored with 0xFF0000 when NONE selected");
-        assert.isTrue(setColorStub.withArgs("#00FFFF").notCalled,
-            "Residue 1835 should NOT be colored with 0x00FFFF when NONE selected");
+        scriptGenerator.generateScript('3pxe', 'B', residues, props);
+
+        assert.isTrue(selectResiduesStub.calledWith(['122', '1815'], 'B'));
+        assert.isTrue(
+            setColorStub.calledWith('#FFDD00'),
+            'Residues 122 and 1815 should be colored with highlight color (0xFFDD00) when NONE selected'
+        );
+
+        assert.isTrue(selectResiduesStub.withArgs(['1710'], 'B').notCalled);
+        assert.isTrue(selectResiduesStub.withArgs(['1835'], 'B').notCalled);
+        assert.isTrue(
+            setColorStub.withArgs('#8A2BE2').notCalled,
+            'Residues 1710 and 1835 should NOT be colored uniform color (0x8A2BE2) when NONE selected'
+        );
+        assert.isTrue(
+            setColorStub.withArgs('#FF0000').notCalled,
+            'Residue 1710 should NOT be colored with 0xFF0000 when NONE selected'
+        );
+        assert.isTrue(
+            setColorStub.withArgs('#00FFFF').notCalled,
+            'Residue 1835 should NOT be colored with 0x00FFFF when NONE selected'
+        );
     });
 
-    it("displays side chain atoms wrt the corresponding props", () => {
+    it('displays side chain atoms wrt the corresponding props', () => {
         const scriptGenerator = new PyMolScriptGenerator();
 
-        const selectSideChainsStub = sinon.stub((scriptGenerator as any), "selectSideChains");
+        const selectSideChainsStub = sinon.stub(
+            scriptGenerator as any,
+            'selectSideChains'
+        );
 
         // only selected residues should have visible side chains if sideChain is set to SELECTED
 
         props.sideChain = SideChain.SELECTED;
         props.mutationColor = MutationColor.MUTATION_TYPE;
-        scriptGenerator.generateScript("3pxe", "B", residues, props);
-
-        assert.isTrue(selectSideChainsStub.withArgs(["122", "1815"], "B").calledOnce,
-            "Side chains for residues 122 and 1815 should be displayed when SELECTED active");
-        assert.isTrue(selectSideChainsStub.withArgs(["1710"]).notCalled,
-            "Side chain for residue 1710 should NOT be displayed when SELECTED active");
-        assert.isTrue(selectSideChainsStub.withArgs(["1835"]).notCalled,
-            "Side chain for residue 1815 should NOT be displayed when SELECTED active");
+        scriptGenerator.generateScript('3pxe', 'B', residues, props);
+
+        assert.isTrue(
+            selectSideChainsStub.withArgs(['122', '1815'], 'B').calledOnce,
+            'Side chains for residues 122 and 1815 should be displayed when SELECTED active'
+        );
+        assert.isTrue(
+            selectSideChainsStub.withArgs(['1710']).notCalled,
+            'Side chain for residue 1710 should NOT be displayed when SELECTED active'
+        );
+        assert.isTrue(
+            selectSideChainsStub.withArgs(['1835']).notCalled,
+            'Side chain for residue 1815 should NOT be displayed when SELECTED active'
+        );
 
         // all residues should have visible side chains if sideChain is set to ALL
 
         selectSideChainsStub.reset();
         props.sideChain = SideChain.ALL;
         props.mutationColor = MutationColor.UNIFORM;
-        scriptGenerator.generateScript("3pxe", "B", residues, props);
-
-        assert.isTrue(selectSideChainsStub.withArgs(["122", "1815"], "B").calledOnce,
-            "Side chains for residues 122 and 1815 should be displayed when ALL & UNIFORM active");
-        assert.isTrue(selectSideChainsStub.withArgs(["1710"], "B").calledOnce,
-            "Side chain for residue 1710 should be displayed when ALL & UNIFORM active");
-        assert.isTrue(selectSideChainsStub.withArgs(["1835"], "B").calledOnce,
-            "Side chain for residue 1815 should be displayed when ALL & UNIFORM active");
+        scriptGenerator.generateScript('3pxe', 'B', residues, props);
+
+        assert.isTrue(
+            selectSideChainsStub.withArgs(['122', '1815'], 'B').calledOnce,
+            'Side chains for residues 122 and 1815 should be displayed when ALL & UNIFORM active'
+        );
+        assert.isTrue(
+            selectSideChainsStub.withArgs(['1710'], 'B').calledOnce,
+            'Side chain for residue 1710 should be displayed when ALL & UNIFORM active'
+        );
+        assert.isTrue(
+            selectSideChainsStub.withArgs(['1835'], 'B').calledOnce,
+            'Side chain for residue 1815 should be displayed when ALL & UNIFORM active'
+        );
 
         // none of the residues should have visible side chains if sideChain is set to NONE
 
         selectSideChainsStub.reset();
         props.sideChain = SideChain.NONE;
         props.mutationColor = MutationColor.MUTATION_TYPE;
-        scriptGenerator.generateScript("3pxe", "B", residues, props);
-
-        assert.isTrue(selectSideChainsStub.withArgs(["122", "1815"]).notCalled,
-            "Side chains for residues 122 and 1815 should NOT be displayed when NONE active");
-        assert.isTrue(selectSideChainsStub.withArgs(["1710"]).notCalled,
-            "Side chain for residue 1710 should NOT be displayed when NONE active");
-        assert.isTrue(selectSideChainsStub.withArgs(["1835"]).notCalled,
-            "Side chain for residue 1815 should NOT be displayed when NONE active");
+        scriptGenerator.generateScript('3pxe', 'B', residues, props);
+
+        assert.isTrue(
+            selectSideChainsStub.withArgs(['122', '1815']).notCalled,
+            'Side chains for residues 122 and 1815 should NOT be displayed when NONE active'
+        );
+        assert.isTrue(
+            selectSideChainsStub.withArgs(['1710']).notCalled,
+            'Side chain for residue 1710 should NOT be displayed when NONE active'
+        );
+        assert.isTrue(
+            selectSideChainsStub.withArgs(['1835']).notCalled,
+            'Side chain for residue 1815 should NOT be displayed when NONE active'
+        );
     });
 });
diff --git a/src/shared/components/structureViewer/PyMolScriptGenerator.ts b/src/shared/components/structureViewer/PyMolScriptGenerator.ts
index f8a4e29463a..47568bfda7c 100644
--- a/src/shared/components/structureViewer/PyMolScriptGenerator.ts
+++ b/src/shared/components/structureViewer/PyMolScriptGenerator.ts
@@ -1,170 +1,175 @@
 import * as _ from 'lodash';
 import {
-    default as StructureVisualizer, ProteinScheme, IResidueSpec,
-    IStructureVisualizerProps, MutationColor, SideChain
-} from "./StructureVisualizer";
-
-export default class PyMolScriptGenerator extends StructureVisualizer
-{
+    default as StructureVisualizer,
+    ProteinScheme,
+    IResidueSpec,
+    IStructureVisualizerProps,
+    MutationColor,
+    SideChain,
+} from './StructureVisualizer';
+
+export default class PyMolScriptGenerator extends StructureVisualizer {
     protected _script: string[] = [];
 
-    public static get PROTEIN_SCHEME_PRESETS(): {[scheme:number]: string}
-    {
-        const presets:{[scheme:number]: string} = {};
+    public static get PROTEIN_SCHEME_PRESETS(): { [scheme: number]: string } {
+        const presets: { [scheme: number]: string } = {};
 
-        presets[ProteinScheme.CARTOON] = "hide everything; show cartoon;";
-        presets[ProteinScheme.SPACE_FILLING] = "hide everything; show spheres;";
-        presets[ProteinScheme.BALL_AND_STICK] = "hide everything; show spheres; show sticks; alter all, vdw=0.50";
-        presets[ProteinScheme.RIBBON] = "hide everything; show ribbon;";
+        presets[ProteinScheme.CARTOON] = 'hide everything; show cartoon;';
+        presets[ProteinScheme.SPACE_FILLING] = 'hide everything; show spheres;';
+        presets[ProteinScheme.BALL_AND_STICK] =
+            'hide everything; show spheres; show sticks; alter all, vdw=0.50';
+        presets[ProteinScheme.RIBBON] = 'hide everything; show ribbon;';
         // there is no "trace" in PyMOL, ribbon is the most similar one
         presets[ProteinScheme.TRACE] = presets[ProteinScheme.RIBBON];
 
         return presets;
     }
 
-    public generateScript(pdbId: string,
-                          chainId: string,
-                          residues: IResidueSpec[],
-                          props: IStructureVisualizerProps): string
-    {
+    public generateScript(
+        pdbId: string,
+        chainId: string,
+        residues: IResidueSpec[],
+        props: IStructureVisualizerProps
+    ): string {
         this._script = [];
 
         this.reinitialize();
-        this.bgColor(props.backgroundColor || StructureVisualizer.defaultProps.backgroundColor);
+        this.bgColor(
+            props.backgroundColor ||
+                StructureVisualizer.defaultProps.backgroundColor
+        );
         this.loadPdb(pdbId);
         this.updateVisualStyle(residues, chainId, props);
         this.selectNone();
 
-        return this._script.join("\n");
+        return this._script.join('\n');
     }
 
-    protected reinitialize()
-    {
-        this._script.push("reinitialize;");
+    protected reinitialize() {
+        this._script.push('reinitialize;');
     }
 
-    protected bgColor(color: string)
-    {
+    protected bgColor(color: string) {
         this._script.push(`bg_color ${this.formatColor(color)};`);
     }
 
-    protected loadPdb(pdbId: string)
-    {
+    protected loadPdb(pdbId: string) {
         this._script.push(`fetch ${pdbId}, async=0;`);
     }
 
-    protected setScheme(scheme: ProteinScheme)
-    {
+    protected setScheme(scheme: ProteinScheme) {
         this._script.push(PyMolScriptGenerator.PROTEIN_SCHEME_PRESETS[scheme]);
     }
 
-    protected setColor(color: string)
-    {
+    protected setColor(color: string) {
         this._script.push(`color ${this.formatColor(color)}, sele;`);
     }
 
-    protected selectChain(chainId: string)
-    {
+    protected selectChain(chainId: string) {
         this._script.push(`select chain ${chainId};`);
     }
 
-    protected selectAlphaHelix(chainId: string)
-    {
+    protected selectAlphaHelix(chainId: string) {
         this._script.push(`select (chain ${chainId}) and (ss h);`);
     }
 
-    protected selectBetaSheet(chainId: string)
-    {
+    protected selectBetaSheet(chainId: string) {
         this._script.push(`select (chain ${chainId}) and (ss s);`);
     }
 
-    protected selectResidues(residueCodes: string[], chainId: string)
-    {
-        this._script.push(`select (resi ${residueCodes.join(",")}) and (chain ${chainId});`);
+    protected selectResidues(residueCodes: string[], chainId: string) {
+        this._script.push(
+            `select (resi ${residueCodes.join(',')}) and (chain ${chainId});`
+        );
     }
 
-    protected selectSideChains(residueCodes: string[], chainId: string)
-    {
-        this._script.push(`select ((resi ${residueCodes.join(",")}) and (chain ${chainId}) and (not name c+n+o));`);
+    protected selectSideChains(residueCodes: string[], chainId: string) {
+        this._script.push(
+            `select ((resi ${residueCodes.join(
+                ','
+            )}) and (chain ${chainId}) and (not name c+n+o));`
+        );
     }
 
-    protected setTransparency(transparency: number)
-    {
+    protected setTransparency(transparency: number) {
         // TODO cartoon_transparency doesn't work for chain or residue selections
         // see issue:  http://sourceforge.net/p/pymol/bugs/129/
         this._script.push(`set transparency, ${transparency / 10}, sele;`);
-        this._script.push(`set cartoon_transparency, ${transparency / 10}, sele;`);
-        this._script.push(`set sphere_transparency, ${transparency / 10}, sele;`);
-        this._script.push(`set stick_transparency, ${transparency / 10}, sele;`);
-
+        this._script.push(
+            `set cartoon_transparency, ${transparency / 10}, sele;`
+        );
+        this._script.push(
+            `set sphere_transparency, ${transparency / 10}, sele;`
+        );
+        this._script.push(
+            `set stick_transparency, ${transparency / 10}, sele;`
+        );
     }
 
-    protected enableBallAndStick()
-    {
-        this._script.push("show spheres, sele; show sticks, sele; alter sele, vdw=0.50;");
+    protected enableBallAndStick() {
+        this._script.push(
+            'show spheres, sele; show sticks, sele; alter sele, vdw=0.50;'
+        );
     }
 
-    protected disableBallAndStick()
-    {
-        this._script.push("hide spheres, sele; hide sticks, sele;");
+    protected disableBallAndStick() {
+        this._script.push('hide spheres, sele; hide sticks, sele;');
     }
 
-    protected rainbowColor()
-    {
-        return this._script.push("spectrum count, rainbow_rev, sele;");
+    protected rainbowColor() {
+        return this._script.push('spectrum count, rainbow_rev, sele;');
     }
 
-    protected cpkColor()
-    {
-        this._script.push("util.cbaw sele;");
+    protected cpkColor() {
+        this._script.push('util.cbaw sele;');
     }
 
-    protected hideBoundMolecules()
-    {
-        const proteins = "asp+glu+arg+lys+his+asn+thr+cys+gln+tyr+ser+gly+ala+leu+val+ile+met+trp+phe+pro";
+    protected hideBoundMolecules() {
+        const proteins =
+            'asp+glu+arg+lys+his+asn+thr+cys+gln+tyr+ser+gly+ala+leu+val+ile+met+trp+phe+pro';
 
         // restrict to protein only
         this._script.push(`hide everything, not resn ${proteins};`);
     }
 
-    protected formatColor(color: string)
-    {
+    protected formatColor(color: string) {
         // this is for PyMol compatibility
         // (colors should start with an "0x" instead of "#")
-        return color.replace("#", "0x");
+        return color.replace('#', '0x');
     }
 
-    protected selectAll()
-    {
-        this._script.push("select all;");
+    protected selectAll() {
+        this._script.push('select all;');
     }
 
-    protected selectNone()
-    {
-        this._script.push("select none;");
+    protected selectNone() {
+        this._script.push('select none;');
     }
 
-    protected updateResidueStyle(residues: IResidueSpec[],
-                                 chainId: string,
-                                 props: IStructureVisualizerProps)
-    {
+    protected updateResidueStyle(
+        residues: IResidueSpec[],
+        chainId: string,
+        props: IStructureVisualizerProps
+    ) {
         const defaultProps = StructureVisualizer.defaultProps;
-        const highlightColor = props.highlightColor || defaultProps.highlightColor;
+        const highlightColor =
+            props.highlightColor || defaultProps.highlightColor;
 
         // group residues by color
-        const grouped:{[color:string]: IResidueSpec[]} = _.groupBy(residues, (residue: IResidueSpec) => {
-            if (residue.highlighted) {
-                return highlightColor;
-            }
-            else {
-                return residue.color;
+        const grouped: { [color: string]: IResidueSpec[] } = _.groupBy(
+            residues,
+            (residue: IResidueSpec) => {
+                if (residue.highlighted) {
+                    return highlightColor;
+                } else {
+                    return residue.color;
+                }
             }
-        });
+        );
 
         // process residues
-        _.each(_.keys(grouped), (color:string) => {
-
-            const positions = grouped[color].map((residue:IResidueSpec) => {
+        _.each(_.keys(grouped), (color: string) => {
+            const positions = grouped[color].map((residue: IResidueSpec) => {
                 return residue.positionRange;
             });
 
@@ -173,7 +178,9 @@ export default class PyMolScriptGenerator extends StructureVisualizer
             // use the highlight color if highlighted (always color highlighted residues)
             if (grouped[color][0].highlighted) {
                 this.selectResidues(resCodes, chainId);
-                this.setColor(props.highlightColor || defaultProps.highlightColor);
+                this.setColor(
+                    props.highlightColor || defaultProps.highlightColor
+                );
             }
             // use the provided color
             else if (props.mutationColor === MutationColor.MUTATION_TYPE) {
@@ -183,35 +190,39 @@ export default class PyMolScriptGenerator extends StructureVisualizer
             // use a uniform color
             else if (props.mutationColor === MutationColor.UNIFORM) {
                 this.selectResidues(resCodes, chainId);
-                this.setColor(props.uniformMutationColor || defaultProps.uniformMutationColor);
+                this.setColor(
+                    props.uniformMutationColor ||
+                        defaultProps.uniformMutationColor
+                );
             }
             // else: NONE (no need to color)
 
-            const displaySideChain = props.sideChain === SideChain.ALL ||
-                (grouped[color][0].highlighted === true && props.sideChain === SideChain.SELECTED);
+            const displaySideChain =
+                props.sideChain === SideChain.ALL ||
+                (grouped[color][0].highlighted === true &&
+                    props.sideChain === SideChain.SELECTED);
 
             // show/hide side chains
-            this.updateSideChains(chainId,
-                resCodes,
-                displaySideChain,
-                props);
+            this.updateSideChains(chainId, resCodes, displaySideChain, props);
         });
     }
 
-    public updateSideChains(chainId: string,
-                            rescodes: string[],
-                            displaySideChain: boolean,
-                            props: IStructureVisualizerProps)
-    {
+    public updateSideChains(
+        chainId: string,
+        rescodes: string[],
+        displaySideChain: boolean,
+        props: IStructureVisualizerProps
+    ) {
         // display side chain (no effect for space-filling)
-        if (displaySideChain &&
-            !(props.proteinScheme === ProteinScheme.SPACE_FILLING))
-        {
+        if (
+            displaySideChain &&
+            !(props.proteinScheme === ProteinScheme.SPACE_FILLING)
+        ) {
             // select the corresponding side chain and also the CA atom on the backbone
             this.selectSideChains(rescodes, chainId);
 
             // display the side chain with ball&stick style
             this.enableBallAndStick();
         }
-    };
+    }
 }
diff --git a/src/shared/components/structureViewer/StructureViewer.tsx b/src/shared/components/structureViewer/StructureViewer.tsx
index 4df769d379a..cfd11b7846f 100644
--- a/src/shared/components/structureViewer/StructureViewer.tsx
+++ b/src/shared/components/structureViewer/StructureViewer.tsx
@@ -1,41 +1,40 @@
 import * as React from 'react';
 import * as _ from 'lodash';
-import {observer} from "mobx-react";
-import {
-    IStructureVisualizerProps, IResidueSpec
-} from "./StructureVisualizer";
-import StructureVisualizer3D from "./StructureVisualizer3D";
+import { observer } from 'mobx-react';
+import { IStructureVisualizerProps, IResidueSpec } from './StructureVisualizer';
+import StructureVisualizer3D from './StructureVisualizer3D';
 
 export interface IStructureViewerProps extends IStructureVisualizerProps {
     pdbId: string;
     chainId: string;
-    bounds: {width: number|string, height: number|string};
+    bounds: { width: number | string; height: number | string };
     residues?: IResidueSpec[];
     containerRef?: (div: HTMLDivElement) => void;
 }
 
 @observer
-export default class StructureViewer extends React.Component<IStructureViewerProps, {}>
-{
-    private _3dMolDiv: HTMLDivElement|undefined;
+export default class StructureViewer extends React.Component<
+    IStructureViewerProps,
+    {}
+> {
+    private _3dMolDiv: HTMLDivElement | undefined;
     private _pdbId: string;
     private wrapper: StructureVisualizer3D;
 
-    public constructor(props:IStructureViewerProps) {
+    public constructor(props: IStructureViewerProps) {
         super(props);
 
         this.divHandler = this.divHandler.bind(this);
     }
 
-    public render()
-    {
+    public render() {
         return (
             <div
                 ref={this.divHandler}
                 style={{
                     height: this.props.bounds.height,
                     width: this.props.bounds.width,
-                    padding: 0
+                    padding: 0,
                 }}
                 className="borderedChart"
             />
@@ -44,8 +43,15 @@ export default class StructureViewer extends React.Component<IStructureViewerPro
 
     public componentDidMount() {
         if (this._3dMolDiv) {
-            this.wrapper = new StructureVisualizer3D(this._3dMolDiv, this.props);
-            this.wrapper.init(this.props.pdbId, this.props.chainId, this.props.residues);
+            this.wrapper = new StructureVisualizer3D(
+                this._3dMolDiv,
+                this.props
+            );
+            this.wrapper.init(
+                this.props.pdbId,
+                this.props.chainId,
+                this.props.residues
+            );
             this._pdbId = this.props.pdbId;
         }
     }
@@ -55,11 +61,20 @@ export default class StructureViewer extends React.Component<IStructureViewerPro
             // if pdbId is updated we need to reload the structure
             if (this.props.pdbId !== this._pdbId) {
                 this._pdbId = this.props.pdbId;
-                this.wrapper.loadPdb(this._pdbId, this.props.chainId, this.props.residues, this.props);
+                this.wrapper.loadPdb(
+                    this._pdbId,
+                    this.props.chainId,
+                    this.props.residues,
+                    this.props
+                );
             }
             // other updates just require selection/style updates without reloading the structure
             else {
-                this.wrapper.updateViewer(this.props.chainId, this.props.residues, this.props);
+                this.wrapper.updateViewer(
+                    this.props.chainId,
+                    this.props.residues,
+                    this.props
+                );
             }
 
             if (!_.isEqual(this.props.bounds, prevProps.bounds)) {
@@ -68,11 +83,11 @@ export default class StructureViewer extends React.Component<IStructureViewerPro
         }
     }
 
-    private divHandler(div:HTMLDivElement) {
-         this._3dMolDiv = div;
+    private divHandler(div: HTMLDivElement) {
+        this._3dMolDiv = div;
 
-         if (this.props.containerRef) {
-             this.props.containerRef(div);
-         }
+        if (this.props.containerRef) {
+            this.props.containerRef(div);
+        }
     }
 }
diff --git a/src/shared/components/structureViewer/StructureViewerPanel.tsx b/src/shared/components/structureViewer/StructureViewerPanel.tsx
index bf91ef98b0c..35598f097a0 100644
--- a/src/shared/components/structureViewer/StructureViewerPanel.tsx
+++ b/src/shared/components/structureViewer/StructureViewerPanel.tsx
@@ -1,36 +1,41 @@
 import * as React from 'react';
 import * as _ from 'lodash';
-import {FormControl, Checkbox, Button, ButtonGroup} from 'react-bootstrap';
-import {If, Else, Then} from 'react-if';
-import {ThreeBounce} from 'better-react-spinkit';
-import {observable, computed} from "mobx";
-import {observer} from "mobx-react";
+import { FormControl, Checkbox, Button, ButtonGroup } from 'react-bootstrap';
+import { If, Else, Then } from 'react-if';
+import { ThreeBounce } from 'better-react-spinkit';
+import { observable, computed } from 'mobx';
+import { observer } from 'mobx-react';
 import Draggable from 'react-draggable';
 import fileDownload from 'react-file-download';
 import classnames from 'classnames';
-import {IProteinImpactTypeColors} from "react-mutation-mapper";
-import PdbHeaderCache from "shared/cache/PdbHeaderCache";
-import ResidueMappingCache from "shared/cache/ResidueMappingCache";
-import {DefaultTooltip, ResidueMapping} from "cbioportal-frontend-commons";
-import {CacheData} from "shared/lib/LazyMobXCache";
-import {ILazyMobXTableApplicationDataStore} from "shared/lib/ILazyMobXTableApplicationDataStore";
-import MutationMapperDataStore from "shared/components/mutationMapper/MutationMapperDataStore";
-import {Mutation} from "shared/api/generated/CBioPortalAPI";
-import {IPdbChain, PdbAlignmentIndex} from "shared/model/Pdb";
+import { IProteinImpactTypeColors } from 'react-mutation-mapper';
+import PdbHeaderCache from 'shared/cache/PdbHeaderCache';
+import ResidueMappingCache from 'shared/cache/ResidueMappingCache';
+import { DefaultTooltip, ResidueMapping } from 'cbioportal-frontend-commons';
+import { CacheData } from 'shared/lib/LazyMobXCache';
+import { ILazyMobXTableApplicationDataStore } from 'shared/lib/ILazyMobXTableApplicationDataStore';
+import MutationMapperDataStore from 'shared/components/mutationMapper/MutationMapperDataStore';
+import { Mutation } from 'shared/api/generated/CBioPortalAPI';
+import { IPdbChain, PdbAlignmentIndex } from 'shared/model/Pdb';
 import {
     groupMutationsByProteinStartPos,
     getColorForProteinImpactType,
-    getProteinStartPositionsByRange
-} from "shared/lib/MutationUtils";
-import StructureViewer from "./StructureViewer";
-import PdbChainInfo from "../PdbChainInfo";
-import {ProteinScheme, ProteinColor, SideChain, MutationColor, IResidueSpec} from "./StructureVisualizer";
-import PyMolScriptGenerator from "./PyMolScriptGenerator";
+    getProteinStartPositionsByRange,
+} from 'shared/lib/MutationUtils';
+import StructureViewer from './StructureViewer';
+import PdbChainInfo from '../PdbChainInfo';
+import {
+    ProteinScheme,
+    ProteinColor,
+    SideChain,
+    MutationColor,
+    IResidueSpec,
+} from './StructureVisualizer';
+import PyMolScriptGenerator from './PyMolScriptGenerator';
 
-import styles from "./structureViewer.module.scss";
+import styles from './structureViewer.module.scss';
 
-export interface IStructureViewerPanelProps extends IProteinImpactTypeColors
-{
+export interface IStructureViewerPanelProps extends IProteinImpactTypeColors {
     pdbChainDataStore: ILazyMobXTableApplicationDataStore<IPdbChain>;
     pdbAlignmentIndex?: PdbAlignmentIndex;
     mutationDataStore?: MutationMapperDataStore;
@@ -41,38 +46,51 @@ export interface IStructureViewerPanelProps extends IProteinImpactTypeColors
 }
 
 @observer
-export default class StructureViewerPanel extends React.Component<IStructureViewerPanelProps, {}> {
-
-    @observable protected isCollapsed:boolean = false;
-    @observable protected isIncreasedSize:boolean = false;
-    @observable protected proteinScheme:ProteinScheme = ProteinScheme.CARTOON;
-    @observable protected proteinColor:ProteinColor = ProteinColor.UNIFORM;
-    @observable protected sideChain:SideChain = SideChain.SELECTED;
-    @observable protected mutationColor:MutationColor = MutationColor.MUTATION_TYPE;
-    @observable protected displayBoundMolecules:boolean = true;
-
-    protected _3dMolDiv: HTMLDivElement|undefined;
-
-    constructor(props:IStructureViewerPanelProps) {
+export default class StructureViewerPanel extends React.Component<
+    IStructureViewerPanelProps,
+    {}
+> {
+    @observable protected isCollapsed: boolean = false;
+    @observable protected isIncreasedSize: boolean = false;
+    @observable protected proteinScheme: ProteinScheme = ProteinScheme.CARTOON;
+    @observable protected proteinColor: ProteinColor = ProteinColor.UNIFORM;
+    @observable protected sideChain: SideChain = SideChain.SELECTED;
+    @observable protected mutationColor: MutationColor =
+        MutationColor.MUTATION_TYPE;
+    @observable protected displayBoundMolecules: boolean = true;
+
+    protected _3dMolDiv: HTMLDivElement | undefined;
+
+    constructor(props: IStructureViewerPanelProps) {
         super(props);
 
         this.containerRefHandler = this.containerRefHandler.bind(this);
         this.toggleCollapse = this.toggleCollapse.bind(this);
         this.toggleDoubleSize = this.toggleDoubleSize.bind(this);
-        this.handleProteinSchemeChange = this.handleProteinSchemeChange.bind(this);
-        this.handleProteinColorChange = this.handleProteinColorChange.bind(this);
+        this.handleProteinSchemeChange = this.handleProteinSchemeChange.bind(
+            this
+        );
+        this.handleProteinColorChange = this.handleProteinColorChange.bind(
+            this
+        );
         this.handleSideChainChange = this.handleSideChainChange.bind(this);
-        this.handleMutationColorChange = this.handleMutationColorChange.bind(this);
-        this.handleBoundMoleculeChange = this.handleBoundMoleculeChange.bind(this);
+        this.handleMutationColorChange = this.handleMutationColorChange.bind(
+            this
+        );
+        this.handleBoundMoleculeChange = this.handleBoundMoleculeChange.bind(
+            this
+        );
         this.handlePyMolDownload = this.handlePyMolDownload.bind(this);
     }
 
-    public selectionTitle(text: string, tooltip?: JSX.Element, placement:string = "top")
-    {
-        let content:JSX.Element|null = null;
+    public selectionTitle(
+        text: string,
+        tooltip?: JSX.Element,
+        placement: string = 'top'
+    ) {
+        let content: JSX.Element | null = null;
 
-        if (tooltip)
-        {
+        if (tooltip) {
             content = this.defaultInfoTooltip(tooltip, placement);
         }
 
@@ -83,15 +101,14 @@ export default class StructureViewerPanel extends React.Component<IStructureView
         );
     }
 
-    public defaultInfoTooltip(tooltip: JSX.Element, placement:string = "top")
-    {
+    public defaultInfoTooltip(tooltip: JSX.Element, placement: string = 'top') {
         const tooltipCallback = () => tooltip;
 
         return (
             <DefaultTooltip
                 placement={placement}
                 overlay={tooltipCallback}
-                arrowContent={<div className="rc-tooltip-arrow-inner"/>}
+                arrowContent={<div className="rc-tooltip-arrow-inner" />}
                 destroyTooltipOnHide={true}
             >
                 <i className="fa fa-info-circle" />
@@ -99,39 +116,42 @@ export default class StructureViewerPanel extends React.Component<IStructureView
         );
     }
 
-    public proteinColorTooltipContent()
-    {
+    public proteinColorTooltipContent() {
         return (
-            <div style={{maxWidth: 400, maxHeight: 200, overflowY: "auto"}}>
+            <div style={{ maxWidth: 400, maxHeight: 200, overflowY: 'auto' }}>
                 Color options for the protein structure. <br />
                 <br />
                 <b>Uniform:</b> Colors the entire protein structure with a
                 <span className={styles['loop']}> single color</span>. <br />
-                <b>Secondary structure:</b> Colors the protein by secondary structure.
-                Assigns different colors for <span className={styles['alpha-helix']}>alpha helices</span>,
+                <b>Secondary structure:</b> Colors the protein by secondary
+                structure. Assigns different colors for{' '}
+                <span className={styles['alpha-helix']}>alpha helices</span>,
                 <span className={styles['beta-sheet']}> beta sheets</span>, and
-                <span className={styles['loop']}> loops</span>.
-                This color option is not available for the space-filling protein scheme. <br />
+                <span className={styles['loop']}> loops</span>. This color
+                option is not available for the space-filling protein scheme.{' '}
+                <br />
                 <b>N-C rainbow:</b> Colors the protein with a rainbow gradient
                 from red (N-terminus) to blue (C-terminus). <br />
-                <b>Atom Type:</b> Colors the structure with respect to the atom type (CPK color scheme).
-                This color option is only available for the space-filling protein scheme. <br />
+                <b>Atom Type:</b> Colors the structure with respect to the atom
+                type (CPK color scheme). This color option is only available for
+                the space-filling protein scheme. <br />
                 <br />
-                The selected chain is always displayed with full opacity while the rest of the structure
-                has some transparency to help better focusing on the selected chain.
+                The selected chain is always displayed with full opacity while
+                the rest of the structure has some transparency to help better
+                focusing on the selected chain.
             </div>
         );
     }
 
-
-    public sideChainTooltipContent()
-    {
+    public sideChainTooltipContent() {
         return (
-            <div style={{maxWidth: 400, maxHeight: 200, overflowY: "auto"}}>
+            <div style={{ maxWidth: 400, maxHeight: 200, overflowY: 'auto' }}>
                 Display options for the side chain atoms. <br />
                 <br />
-                <b>All:</b> Displays the side chain atoms for every mapped residue. <br />
-                <b>Selected:</b> Displays the side chain atoms only for the selected mutations. <br />
+                <b>All:</b> Displays the side chain atoms for every mapped
+                residue. <br />
+                <b>Selected:</b> Displays the side chain atoms only for the
+                selected mutations. <br />
                 <b>None:</b> Hides the side chain atoms. <br />
                 <br />
                 This option has no effect for the space-filling protein scheme.
@@ -139,89 +159,117 @@ export default class StructureViewerPanel extends React.Component<IStructureView
         );
     }
 
-    public mutationColorTooltipContent()
-    {
+    public mutationColorTooltipContent() {
         return (
-            <div style={{maxWidth: 400, maxHeight: 200, overflowY: "auto"}}>
+            <div style={{ maxWidth: 400, maxHeight: 200, overflowY: 'auto' }}>
                 Color options for the mapped mutations. <br />
                 <br />
                 <b>Uniform:</b> Colors all mutated residues with a
-                <span className={styles['uniform-mutation']}> single color</span>. <br />
+                <span className={styles['uniform-mutation']}>
+                    {' '}
+                    single color
+                </span>
+                . <br />
                 <b>Mutation type:</b> Enables residue coloring by mutation type.
                 Mutation types and corresponding color codes are as follows:
                 <ul>
                     <li>
-                        <span className={styles['missense-mutation']}>Missense Mutations</span>
+                        <span className={styles['missense-mutation']}>
+                            Missense Mutations
+                        </span>
                     </li>
                     <li>
-                        <span className={styles['trunc-mutation']}>Truncating Mutations</span>
+                        <span className={styles['trunc-mutation']}>
+                            Truncating Mutations
+                        </span>
                         <span> (Nonsense, Nonstop, FS del, FS ins)</span>
                     </li>
                     <li>
-                        <span className={styles['inframe-mutation']}>Inframe Mutations</span>
+                        <span className={styles['inframe-mutation']}>
+                            Inframe Mutations
+                        </span>
                         <span> (IF del, IF ins)</span>
                     </li>
                 </ul>
-                <b>None:</b> Disables coloring of the mutated residues
-                except for manually selected (highlighted) residues. <br />
+                <b>None:</b> Disables coloring of the mutated residues except
+                for manually selected (highlighted) residues. <br />
                 <br />
-                Highlighted residues are colored with <span className={styles['highlighted']}>yellow</span>.
+                Highlighted residues are colored with{' '}
+                <span className={styles['highlighted']}>yellow</span>.
             </div>
         );
     }
 
-    public boundMoleculesTooltipContent()
-    {
+    public boundMoleculesTooltipContent() {
         return (
-            <div style={{maxWidth: 400, maxHeight: 200, overflowY: "auto"}}>
-                Displays co-crystalized molecules.
-                This option has no effect if the current structure does not contain any co-crystalized bound molecules.
+            <div style={{ maxWidth: 400, maxHeight: 200, overflowY: 'auto' }}>
+                Displays co-crystalized molecules. This option has no effect if
+                the current structure does not contain any co-crystalized bound
+                molecules.
             </div>
         );
     }
 
-    public helpTooltipContent()
-    {
+    public helpTooltipContent() {
         return (
-            <div style={{maxWidth: 400, maxHeight: 200, overflowY: "auto"}}>
-                <b>Zoom in/out:</b> Press and hold the SHIFT key and the left mouse button, and then move the mouse backward/forward.<br />
-                <b>Pan:</b> Press and hold the CTRL key, click and hold the left mouse button, and then move the mouse in the desired direction.<br />
-                <b>Rotate:</b> Press and hold the left mouse button, and then move the mouse in the desired direction to rotate along the x and y axes.<br />
+            <div style={{ maxWidth: 400, maxHeight: 200, overflowY: 'auto' }}>
+                <b>Zoom in/out:</b> Press and hold the SHIFT key and the left
+                mouse button, and then move the mouse backward/forward.
+                <br />
+                <b>Pan:</b> Press and hold the CTRL key, click and hold the left
+                mouse button, and then move the mouse in the desired direction.
+                <br />
+                <b>Rotate:</b> Press and hold the left mouse button, and then
+                move the mouse in the desired direction to rotate along the x
+                and y axes.
+                <br />
             </div>
         );
     }
 
-    public proteinStyleMenu()
-    {
+    public proteinStyleMenu() {
         return (
             <span>
-                <div className='row text-center'>
+                <div className="row text-center">
                     <span>Protein Style</span>
                 </div>
-                <div className='row'>
-                    <div className='col col-sm-10 col-sm-offset-1'>
+                <div className="row">
+                    <div className="col col-sm-10 col-sm-offset-1">
                         <hr />
                     </div>
                 </div>
-                <div className='row'>
+                <div className="row">
                     <Checkbox
                         checked={this.displayBoundMolecules}
-                        onChange={this.handleBoundMoleculeChange as React.FormEventHandler<any>}
+                        onChange={
+                            this
+                                .handleBoundMoleculeChange as React.FormEventHandler<
+                                any
+                            >
+                        }
                     >
-                        Display bound molecules {this.defaultInfoTooltip(this.boundMoleculesTooltipContent())}
+                        Display bound molecules{' '}
+                        {this.defaultInfoTooltip(
+                            this.boundMoleculesTooltipContent()
+                        )}
                     </Checkbox>
                 </div>
                 <div className="row">
                     <div className="col col-sm-6">
                         <div className="row">
-                            {this.selectionTitle("Scheme")}
+                            {this.selectionTitle('Scheme')}
                         </div>
                         <div className="row">
                             <FormControl
-                                className={styles["default-option-select"]}
+                                className={styles['default-option-select']}
                                 componentClass="select"
                                 value={`${this.proteinScheme}`}
-                                onChange={this.handleProteinSchemeChange as React.FormEventHandler<any>}
+                                onChange={
+                                    this
+                                        .handleProteinSchemeChange as React.FormEventHandler<
+                                        any
+                                    >
+                                }
                             >
                                 <option value={ProteinScheme.CARTOON}>
                                     cartoon
@@ -237,21 +285,31 @@ export default class StructureViewerPanel extends React.Component<IStructureView
                     </div>
                     <div className="col col-sm-6">
                         <div className="row">
-                            {this.selectionTitle("Color", this.proteinColorTooltipContent())}
+                            {this.selectionTitle(
+                                'Color',
+                                this.proteinColorTooltipContent()
+                            )}
                         </div>
                         <div className="row">
                             <FormControl
-                                className={styles["default-option-select"]}
+                                className={styles['default-option-select']}
                                 componentClass="select"
                                 value={`${this.proteinColor}`}
-                                onChange={this.handleProteinColorChange as React.FormEventHandler<any>}
+                                onChange={
+                                    this
+                                        .handleProteinColorChange as React.FormEventHandler<
+                                        any
+                                    >
+                                }
                             >
                                 <option value={ProteinColor.UNIFORM}>
                                     uniform
                                 </option>
                                 <option
                                     value={ProteinColor.SECONDARY_STRUCTURE}
-                                    disabled={this.colorBySecondaryStructureDisabled}
+                                    disabled={
+                                        this.colorBySecondaryStructureDisabled
+                                    }
                                 >
                                     secondary structure
                                 </option>
@@ -275,52 +333,64 @@ export default class StructureViewerPanel extends React.Component<IStructureView
         );
     }
 
-    public mutationStyleMenu()
-    {
+    public mutationStyleMenu() {
         return (
             <span>
-                <div className='row text-center'>
+                <div className="row text-center">
                     <span>Mutation Style</span>
                 </div>
-                <div className='row'>
-                    <div className='col col-sm-10 col-sm-offset-1'>
+                <div className="row">
+                    <div className="col col-sm-10 col-sm-offset-1">
                         <hr />
                     </div>
                 </div>
                 <div className="row">
                     <div className="col col-sm-6">
                         <div className="row">
-                            {this.selectionTitle("Side Chain", this.sideChainTooltipContent())}
+                            {this.selectionTitle(
+                                'Side Chain',
+                                this.sideChainTooltipContent()
+                            )}
                         </div>
                         <div className="row">
                             <FormControl
-                                className={styles["default-option-select"]}
+                                className={styles['default-option-select']}
                                 componentClass="select"
                                 value={`${this.sideChain}`}
-                                onChange={this.handleSideChainChange as React.FormEventHandler<any>}
+                                onChange={
+                                    this
+                                        .handleSideChainChange as React.FormEventHandler<
+                                        any
+                                    >
+                                }
                             >
-                                <option value={SideChain.ALL}>
-                                    all
-                                </option>
+                                <option value={SideChain.ALL}>all</option>
                                 <option value={SideChain.SELECTED}>
                                     selected
                                 </option>
-                                <option value={SideChain.NONE}>
-                                    none
-                                </option>
+                                <option value={SideChain.NONE}>none</option>
                             </FormControl>
                         </div>
                     </div>
                     <div className="col col-sm-6">
                         <div className="row">
-                            {this.selectionTitle("Color", this.mutationColorTooltipContent(), "left")}
+                            {this.selectionTitle(
+                                'Color',
+                                this.mutationColorTooltipContent(),
+                                'left'
+                            )}
                         </div>
                         <div className="row">
                             <FormControl
-                                className={styles["default-option-select"]}
+                                className={styles['default-option-select']}
                                 componentClass="select"
                                 value={`${this.mutationColor}`}
-                                onChange={this.handleMutationColorChange as React.FormEventHandler<any>}
+                                onChange={
+                                    this
+                                        .handleMutationColorChange as React.FormEventHandler<
+                                        any
+                                    >
+                                }
                             >
                                 <option value={MutationColor.UNIFORM}>
                                     uniform
@@ -328,9 +398,7 @@ export default class StructureViewerPanel extends React.Component<IStructureView
                                 <option value={MutationColor.MUTATION_TYPE}>
                                     mutation type
                                 </option>
-                                <option value={MutationColor.NONE}>
-                                    none
-                                </option>
+                                <option value={MutationColor.NONE}>none</option>
                             </FormControl>
                         </div>
                     </div>
@@ -339,51 +407,62 @@ export default class StructureViewerPanel extends React.Component<IStructureView
         );
     }
 
-    public topToolbar()
-    {
+    public topToolbar() {
         return (
-            <div className='row'>
+            <div className="row">
                 <div className="col col-sm-6">
                     <ButtonGroup>
-                        <DefaultTooltip overlay={<span>Download PyMol script</span>} placement="top">
-                            <Button className="btn-sm" onClick={this.handlePyMolDownload}>
-                                <i className='fa fa-cloud-download'/> PyMol
+                        <DefaultTooltip
+                            overlay={<span>Download PyMol script</span>}
+                            placement="top"
+                        >
+                            <Button
+                                className="btn-sm"
+                                onClick={this.handlePyMolDownload}
+                            >
+                                <i className="fa fa-cloud-download" /> PyMol
                             </Button>
                         </DefaultTooltip>
                     </ButtonGroup>
                 </div>
                 <div className="col col-sm-6">
                     <span className="pull-right">
-                        how to pan/zoom/rotate? {this.defaultInfoTooltip(this.helpTooltipContent(), "left")}
+                        how to pan/zoom/rotate?{' '}
+                        {this.defaultInfoTooltip(
+                            this.helpTooltipContent(),
+                            'left'
+                        )}
                     </span>
                 </div>
             </div>
         );
     }
 
-    public header()
-    {
+    public header() {
         return (
-            <div className={classnames('row', styles["header"])}>
-                <div className='col col-sm-10'>
+            <div className={classnames('row', styles['header'])}>
+                <div className="col col-sm-10">
                     <span>3D Structure</span>
                 </div>
                 <div className="col col-sm-2">
                     <span className="pull-right">
                         <i
-                            className={classnames("fa", {"fa-compress": this.isIncreasedSize, "fa-expand": !this.isIncreasedSize})}
+                            className={classnames('fa', {
+                                'fa-compress': this.isIncreasedSize,
+                                'fa-expand': !this.isIncreasedSize,
+                            })}
                             onClick={this.toggleDoubleSize}
-                            style={{marginRight: 5, cursor: "pointer"}}
+                            style={{ marginRight: 5, cursor: 'pointer' }}
                         />
                         <i
                             className="fa fa-minus-circle"
                             onClick={this.toggleCollapse}
-                            style={{marginRight: 5, cursor: "pointer"}}
+                            style={{ marginRight: 5, cursor: 'pointer' }}
                         />
                         <i
                             className="fa fa-times-circle"
                             onClick={this.props.onClose}
-                            style={{cursor: "pointer"}}
+                            style={{ cursor: 'pointer' }}
                         />
                     </span>
                 </div>
@@ -391,10 +470,8 @@ export default class StructureViewerPanel extends React.Component<IStructureView
         );
     }
 
-    public mainContent()
-    {
-        if (this.pdbId && this.chainId && this.residues)
-        {
+    public mainContent() {
+        if (this.pdbId && this.chainId && this.residues) {
             // load pdb info & 3D visualizer
             return (
                 <span>
@@ -415,7 +492,10 @@ export default class StructureViewerPanel extends React.Component<IStructureView
                             </div>
                         </div>
                     </If>
-                    <div className="row" style={{paddingTop: 5, paddingBottom: 5}}>
+                    <div
+                        className="row"
+                        style={{ paddingTop: 5, paddingBottom: 5 }}
+                    >
                         <StructureViewer
                             displayBoundMolecules={this.displayBoundMolecules}
                             proteinScheme={this.proteinScheme}
@@ -431,16 +511,15 @@ export default class StructureViewerPanel extends React.Component<IStructureView
                     </div>
                 </span>
             );
-        }
-        else {
+        } else {
             // show loader
             return (
-                <div style={{textAlign: "center"}}>
+                <div style={{ textAlign: 'center' }}>
                     <ThreeBounce
                         size={25}
                         style={{
                             display: 'inline-block',
-                            padding: 25
+                            padding: 25,
                         }}
                     />
                 </div>
@@ -450,37 +529,31 @@ export default class StructureViewerPanel extends React.Component<IStructureView
 
     public render() {
         return (
-            <Draggable
-                handle=".structure-viewer-header"
-            >
+            <Draggable handle=".structure-viewer-header">
                 <div
-                    className={
-                        classnames(styles["main-3d-panel"], {
-                            [styles["increased-size-panel"]]: this.isIncreasedSize
-                        })
-                    }
+                    className={classnames(styles['main-3d-panel'], {
+                        [styles['increased-size-panel']]: this.isIncreasedSize,
+                    })}
                 >
                     <div className="structure-viewer-header row">
                         {this.header()}
-                        <hr style={{borderTopColor: "#BBBBBB"}} />
+                        <hr style={{ borderTopColor: '#BBBBBB' }} />
                     </div>
                     <div
-                        className={
-                            classnames(styles["body"], {
-                                [styles["collapsed-panel"]]: this.isCollapsed
-                            })
-                        }
+                        className={classnames(styles['body'], {
+                            [styles['collapsed-panel']]: this.isCollapsed,
+                        })}
                     >
                         {this.mainContent()}
-                        <div className='row'>
+                        <div className="row">
                             {this.topToolbar()}
                             <hr />
                         </div>
                         <div className="row">
-                            <div className='col col-sm-6'>
+                            <div className="col col-sm-6">
                                 {this.proteinStyleMenu()}
                             </div>
-                            <div className='col col-sm-6'>
+                            <div className="col col-sm-6">
                                 {this.mutationStyleMenu()}
                             </div>
                         </div>
@@ -502,33 +575,46 @@ export default class StructureViewerPanel extends React.Component<IStructureView
         this.isIncreasedSize = !this.isIncreasedSize;
     }
 
-    private handleProteinSchemeChange(evt:React.FormEvent<HTMLSelectElement>) {
-        this.proteinScheme = parseInt((evt.target as HTMLSelectElement).value, 10);
+    private handleProteinSchemeChange(evt: React.FormEvent<HTMLSelectElement>) {
+        this.proteinScheme = parseInt(
+            (evt.target as HTMLSelectElement).value,
+            10
+        );
 
         // when the protein scheme is SPACE_FILLING, NC_RAINBOW and SECONDARY_STRUCTURE are not allowed
-        if (this.proteinScheme === ProteinScheme.SPACE_FILLING &&
-            (this.proteinColor === ProteinColor.NC_RAINBOW || this.proteinColor === ProteinColor.SECONDARY_STRUCTURE))
-        {
+        if (
+            this.proteinScheme === ProteinScheme.SPACE_FILLING &&
+            (this.proteinColor === ProteinColor.NC_RAINBOW ||
+                this.proteinColor === ProteinColor.SECONDARY_STRUCTURE)
+        ) {
             this.proteinColor = ProteinColor.UNIFORM;
         }
         // when the protein scheme is CARTOON or TRACE, ATOM_TYPE is not allowed
-        else if ((this.proteinScheme === ProteinScheme.TRACE || this.proteinScheme === ProteinScheme.CARTOON) &&
-            this.proteinColor === ProteinColor.ATOM_TYPE)
-        {
+        else if (
+            (this.proteinScheme === ProteinScheme.TRACE ||
+                this.proteinScheme === ProteinScheme.CARTOON) &&
+            this.proteinColor === ProteinColor.ATOM_TYPE
+        ) {
             this.proteinColor = ProteinColor.UNIFORM;
         }
     }
 
-    private handleProteinColorChange(evt:React.FormEvent<HTMLSelectElement>) {
-        this.proteinColor = parseInt((evt.target as HTMLSelectElement).value, 10);
+    private handleProteinColorChange(evt: React.FormEvent<HTMLSelectElement>) {
+        this.proteinColor = parseInt(
+            (evt.target as HTMLSelectElement).value,
+            10
+        );
     }
 
-    private handleSideChainChange(evt:React.FormEvent<HTMLSelectElement>) {
+    private handleSideChainChange(evt: React.FormEvent<HTMLSelectElement>) {
         this.sideChain = parseInt((evt.target as HTMLSelectElement).value, 10);
     }
 
-    private handleMutationColorChange(evt:React.FormEvent<HTMLSelectElement>) {
-        this.mutationColor = parseInt((evt.target as HTMLSelectElement).value, 10);
+    private handleMutationColorChange(evt: React.FormEvent<HTMLSelectElement>) {
+        this.mutationColor = parseInt(
+            (evt.target as HTMLSelectElement).value,
+            10
+        );
     }
 
     private handleBoundMoleculeChange() {
@@ -542,48 +628,49 @@ export default class StructureViewerPanel extends React.Component<IStructureView
         }
     }
 
-    @computed get structureViewerBounds(): {width: number|string, height: number|string} {
-        let width: number|string;
-        let height: number|string;
+    @computed get structureViewerBounds(): {
+        width: number | string;
+        height: number | string;
+    } {
+        let width: number | string;
+        let height: number | string;
 
         // if 3Dmol container div is not initialized yet, just set to a default value: width=auto; height=350
         // otherwise toggle the size
         if (this.isIncreasedSize) {
             // TODO: hardocded default value to fix cBioPortal/cbioportal#4561
-            width = this._3dMolDiv ? Math.floor(this._3dMolDiv.offsetWidth * (5/3)) : 698;
+            width = this._3dMolDiv
+                ? Math.floor(this._3dMolDiv.offsetWidth * (5 / 3))
+                : 698;
             height = this._3dMolDiv ? this._3dMolDiv.offsetHeight * 2 : 350;
-        }
-        else {
+        } else {
             // TODO: hardcoded default value to fix cBioPortal/cbioportal#4561
-            width = this._3dMolDiv ? Math.floor(this._3dMolDiv.offsetWidth / (5/3)) : 450;
+            width = this._3dMolDiv
+                ? Math.floor(this._3dMolDiv.offsetWidth / (5 / 3))
+                : 450;
             height = this._3dMolDiv ? this._3dMolDiv.offsetHeight / 2 : 350;
         }
 
-        return {width, height};
-    };
+        return { width, height };
+    }
 
-    @computed get pdbId()
-    {
+    @computed get pdbId() {
         if (this.pdbChain) {
             return this.pdbChain.pdbId;
-        }
-        else {
+        } else {
             return undefined;
         }
     }
 
-    @computed get chainId()
-    {
+    @computed get chainId() {
         if (this.pdbChain) {
             return this.pdbChain.chain;
-        }
-        else {
+        } else {
             return undefined;
         }
     }
 
-    @computed get pdbChain()
-    {
+    @computed get pdbChain() {
         let data = this.props.pdbChainDataStore.sortedFilteredSelectedData;
 
         if (data.length === 0) {
@@ -594,34 +681,38 @@ export default class StructureViewerPanel extends React.Component<IStructureView
 
         if (data.length === 0) {
             return undefined;
-        }
-        else {
+        } else {
             return data[0];
         }
     }
 
-    @computed get residueWarning(): string
-    {
-        let warning = "";
+    @computed get residueWarning(): string {
+        let warning = '';
 
         // None of the mutations (selected or not) can be mapped onto the current PDB chain.
-        if (this.proteinPositions.length === 0 ||
+        if (
+            this.proteinPositions.length === 0 ||
             (this.residueMappingData &&
-            this.residueMappingData.filter((cacheData) => cacheData === null || cacheData.data !== null).length === 0))
-        {
-            warning = "None of the mutations can be mapped onto this structure";
-        }
-        else {
+                this.residueMappingData.filter(
+                    cacheData => cacheData === null || cacheData.data !== null
+                ).length === 0)
+        ) {
+            warning = 'None of the mutations can be mapped onto this structure';
+        } else {
             // find the difference between number of selected position and
             // the number of mapped positions among the selected ones.
             // if the difference is not zero, then it means there is at least one unmapped position
             // among the selected positions.
-            const selectedPositionCount = _.keys(this.selectedMutationsByPosition).length;
-            const diff = selectedPositionCount - this.mappedSelectedPositions.length;
+            const selectedPositionCount = _.keys(
+                this.selectedMutationsByPosition
+            ).length;
+            const diff =
+                selectedPositionCount - this.mappedSelectedPositions.length;
 
             // there is only one position selected, and it cannot be mapped
             if (selectedPositionCount === 1 && diff === 1) {
-                warning = "Selected mutation cannot be mapped onto this structure";
+                warning =
+                    'Selected mutation cannot be mapped onto this structure';
             }
             // more than one position selected, at least one of them cannot be mapped
             else if (diff > 0) {
@@ -632,40 +723,45 @@ export default class StructureViewerPanel extends React.Component<IStructureView
         return warning;
     }
 
-    @computed get residues(): IResidueSpec[]|undefined
-    {
+    @computed get residues(): IResidueSpec[] | undefined {
         if (!this.residueMappingData) {
             return undefined;
         }
 
         const residues: IResidueSpec[] = [];
 
-        this.residueMappingData.forEach((cacheData) => {
+        this.residueMappingData.forEach(cacheData => {
             if (cacheData && cacheData.data) {
-                const mutations = this.mutationsByPosition[cacheData.data.queryPosition];
-
-                const highlighted: boolean = (
-                    this.props.mutationDataStore && (
-                        this.props.mutationDataStore.isPositionSelected(cacheData.data.queryPosition) ||
-                        this.props.mutationDataStore.isPositionHighlighted(cacheData.data.queryPosition)
-                    )
-                ) || false;
+                const mutations = this.mutationsByPosition[
+                    cacheData.data.queryPosition
+                ];
+
+                const highlighted: boolean =
+                    (this.props.mutationDataStore &&
+                        (this.props.mutationDataStore.isPositionSelected(
+                            cacheData.data.queryPosition
+                        ) ||
+                            this.props.mutationDataStore.isPositionHighlighted(
+                                cacheData.data.queryPosition
+                            ))) ||
+                    false;
 
                 if (mutations && mutations.length > 0) {
-                    residues.push(
-                        {
-                            positionRange: {
-                                start: {
-                                    position: cacheData.data.pdbPosition
-                                },
-                                end: {
-                                    position: cacheData.data.pdbPosition
-                                }
+                    residues.push({
+                        positionRange: {
+                            start: {
+                                position: cacheData.data.pdbPosition,
                             },
-                            color: getColorForProteinImpactType(mutations, this.props),
-                            highlighted
-                        }
-                    );
+                            end: {
+                                position: cacheData.data.pdbPosition,
+                            },
+                        },
+                        color: getColorForProteinImpactType(
+                            mutations,
+                            this.props
+                        ),
+                        highlighted,
+                    });
                 }
             }
         });
@@ -673,20 +769,22 @@ export default class StructureViewerPanel extends React.Component<IStructureView
         return _.uniq(residues);
     }
 
-    @computed get residueMappingData(): Array<CacheData<ResidueMapping>|null>|undefined
-    {
+    @computed get residueMappingData():
+        | Array<CacheData<ResidueMapping> | null>
+        | undefined {
         if (this.alignmentIds.length === 0) {
             return undefined;
         }
 
-        let residueMappingData: Array<CacheData<ResidueMapping>|null> = [];
+        let residueMappingData: Array<CacheData<ResidueMapping> | null> = [];
 
-        if (this.props.residueMappingCache &&
+        if (
+            this.props.residueMappingCache &&
             this.props.uniprotId &&
             this.pdbId &&
             this.chainId &&
-            this.proteinPositions.length > 0)
-        {
+            this.proteinPositions.length > 0
+        ) {
             // TODO remove this after implementing the cache!
             // create query parameters
             // this.proteinPositions.forEach((uniprotPosition: number) => {
@@ -705,7 +803,7 @@ export default class StructureViewerPanel extends React.Component<IStructureView
                 uniprotId: this.props.uniprotId,
                 pdbId: this.pdbId,
                 chainId: this.chainId,
-                uniprotPositions: this.proteinPositions
+                uniprotPositions: this.proteinPositions,
             });
 
             if (remoteData.result) {
@@ -716,20 +814,22 @@ export default class StructureViewerPanel extends React.Component<IStructureView
         return residueMappingData;
     }
 
-    @computed get mappedSelectedPositions(): number[]
-    {
+    @computed get mappedSelectedPositions(): number[] {
         if (!this.residueMappingData) {
             return [];
         }
 
         const positions: number[] = [];
 
-        this.residueMappingData.forEach((cacheData) => {
-            if (cacheData &&
+        this.residueMappingData.forEach(cacheData => {
+            if (
+                cacheData &&
                 cacheData.data &&
                 this.props.mutationDataStore &&
-                this.props.mutationDataStore.isPositionSelected(cacheData.data.queryPosition))
-            {
+                this.props.mutationDataStore.isPositionSelected(
+                    cacheData.data.queryPosition
+                )
+            ) {
                 positions.push(cacheData.data.queryPosition);
             }
         });
@@ -737,38 +837,40 @@ export default class StructureViewerPanel extends React.Component<IStructureView
         return _.uniq(positions);
     }
 
-    @computed get alignmentIds(): number[]
-    {
+    @computed get alignmentIds(): number[] {
         let alignmentIds: number[] = [];
 
-        if (this.pdbChain &&
-            this.props.pdbAlignmentIndex)
-        {
-            const alignments = this.props.pdbAlignmentIndex[this.pdbChain.pdbId][this.pdbChain.chain];
-            alignmentIds = alignments === undefined ? [] :
-                this.props.pdbAlignmentIndex[this.pdbChain.pdbId][this.pdbChain.chain].map(
-                    (alignment) => alignment.alignmentId);
+        if (this.pdbChain && this.props.pdbAlignmentIndex) {
+            const alignments = this.props.pdbAlignmentIndex[
+                this.pdbChain.pdbId
+            ][this.pdbChain.chain];
+            alignmentIds =
+                alignments === undefined
+                    ? []
+                    : this.props.pdbAlignmentIndex[this.pdbChain.pdbId][
+                          this.pdbChain.chain
+                      ].map(alignment => alignment.alignmentId);
         }
 
         return _.uniq(alignmentIds);
     }
 
-    @computed get mutationsByPosition(): {[pos: number]: Mutation[]}
-    {
+    @computed get mutationsByPosition(): { [pos: number]: Mutation[] } {
         if (this.props.mutationDataStore) {
-            return groupMutationsByProteinStartPos(this.props.mutationDataStore.sortedFilteredData);
-        }
-        else {
+            return groupMutationsByProteinStartPos(
+                this.props.mutationDataStore.sortedFilteredData
+            );
+        } else {
             return {};
         }
     }
 
-    @computed get selectedMutationsByPosition(): {[pos: number]: Mutation[]}
-    {
+    @computed get selectedMutationsByPosition(): { [pos: number]: Mutation[] } {
         if (this.props.mutationDataStore) {
-            return groupMutationsByProteinStartPos(this.props.mutationDataStore.sortedFilteredSelectedData);
-        }
-        else {
+            return groupMutationsByProteinStartPos(
+                this.props.mutationDataStore.sortedFilteredSelectedData
+            );
+        } else {
             return {};
         }
     }
@@ -777,22 +879,21 @@ export default class StructureViewerPanel extends React.Component<IStructureView
      * Protein start positions for the mutations falling between the current chain's
      * start and end. This value is computed for the filtered mutations only.
      */
-    @computed get proteinPositions(): number[]
-    {
+    @computed get proteinPositions(): number[] {
         let positions: number[] = [];
 
-        if (this.props.mutationDataStore && this.pdbChain)
-        {
-            positions = getProteinStartPositionsByRange(this.props.mutationDataStore.sortedFilteredData,
+        if (this.props.mutationDataStore && this.pdbChain) {
+            positions = getProteinStartPositionsByRange(
+                this.props.mutationDataStore.sortedFilteredData,
                 this.pdbChain.uniprotStart,
-                this.pdbChain.uniprotEnd);
+                this.pdbChain.uniprotEnd
+            );
         }
 
         return positions;
     }
 
-    @computed get pyMolScript()
-    {
+    @computed get pyMolScript() {
         const scriptGenerator = new PyMolScriptGenerator();
 
         const visualizerProps = {
@@ -800,33 +901,30 @@ export default class StructureViewerPanel extends React.Component<IStructureView
             proteinScheme: this.proteinScheme,
             proteinColor: this.proteinColor,
             sideChain: this.sideChain,
-            mutationColor: this.mutationColor
+            mutationColor: this.mutationColor,
         };
 
-        if (this.pdbId && this.chainId)
-        {
-            return scriptGenerator.generateScript(this.pdbId,
+        if (this.pdbId && this.chainId) {
+            return scriptGenerator.generateScript(
+                this.pdbId,
                 this.chainId,
                 this.residues || [],
-                visualizerProps);
-        }
-        else {
-            return "";
+                visualizerProps
+            );
+        } else {
+            return '';
         }
     }
 
-    @computed get colorBySecondaryStructureDisabled()
-    {
+    @computed get colorBySecondaryStructureDisabled() {
         return this.proteinScheme === ProteinScheme.SPACE_FILLING;
     }
 
-    @computed get colorByNCRainbowDisabled()
-    {
+    @computed get colorByNCRainbowDisabled() {
         return this.proteinScheme === ProteinScheme.SPACE_FILLING;
     }
 
-    @computed get colorByAtomTypeDisabled()
-    {
+    @computed get colorByAtomTypeDisabled() {
         return this.proteinScheme !== ProteinScheme.SPACE_FILLING;
     }
 }
diff --git a/src/shared/components/structureViewer/StructureVisualizer.ts b/src/shared/components/structureViewer/StructureVisualizer.ts
index bda7491ee79..e698c5f7da4 100644
--- a/src/shared/components/structureViewer/StructureVisualizer.ts
+++ b/src/shared/components/structureViewer/StructureVisualizer.ts
@@ -1,5 +1,5 @@
-import {IPdbPositionRange} from "shared/model/Pdb";
-import {convertPdbPosToResCode} from "./PdbResidueUtils";
+import { IPdbPositionRange } from 'shared/model/Pdb';
+import { convertPdbPosToResCode } from './PdbResidueUtils';
 
 export interface IResidueSpec {
     positionRange: IPdbPositionRange;
@@ -8,7 +8,11 @@ export interface IResidueSpec {
 }
 
 export enum ProteinScheme {
-    CARTOON, SPACE_FILLING, TRACE, BALL_AND_STICK, RIBBON
+    CARTOON,
+    SPACE_FILLING,
+    TRACE,
+    BALL_AND_STICK,
+    RIBBON,
 }
 
 // UNIFORM: single color, effective for all schemes
@@ -16,21 +20,28 @@ export enum ProteinScheme {
 // ATOM_TYPE: effective only for space-filling scheme
 // NC_RAINBOW: not effective for space-filling scheme
 export enum ProteinColor {
-    UNIFORM, SECONDARY_STRUCTURE, NC_RAINBOW, ATOM_TYPE
+    UNIFORM,
+    SECONDARY_STRUCTURE,
+    NC_RAINBOW,
+    ATOM_TYPE,
 }
 
 // SELECTED: display side chain for only selected mutations
 // ALL: display side chain for all mapped mutations
 // NONE: do not display side chain atoms
 export enum SideChain {
-    ALL, SELECTED, NONE
+    ALL,
+    SELECTED,
+    NONE,
 }
 
 // MUTATION_TYPE: use mutation colors for type
 // UNIFORM: use a single color
 // NONE: do not color (use default atom colors)
 export enum MutationColor {
-    UNIFORM, MUTATION_TYPE, NONE
+    UNIFORM,
+    MUTATION_TYPE,
+    NONE,
 }
 
 export interface IStructureVisualizerProps {
@@ -65,52 +76,62 @@ export interface IStructureVisualizerProps {
     highlightColor?: string;
 }
 
-abstract class StructureVisualizer
-{
+abstract class StructureVisualizer {
     public static defaultProps = {
-        pdbUri: "https://files.rcsb.org/view/",
+        pdbUri: 'https://files.rcsb.org/view/',
         proteinScheme: ProteinScheme.CARTOON,
         displayBoundMolecules: true,
-        backgroundColor: "#FFFFFF",
-        baseColor: "#DDDDDD",
+        backgroundColor: '#FFFFFF',
+        baseColor: '#DDDDDD',
         structureColors: {
-            alphaHelix: "#FFA500",
-            betaSheet: "#0000FF",
-            loop: "#DDDDDD"
+            alphaHelix: '#FFA500',
+            betaSheet: '#0000FF',
+            loop: '#DDDDDD',
         },
         baseTranslucency: 5,
-        chainColor: "#888888",
+        chainColor: '#888888',
         chainTranslucency: 0,
         proteinColor: ProteinColor.UNIFORM,
         mutationColor: MutationColor.MUTATION_TYPE,
-        uniformMutationColor: "#8A2BE2",
-        highlightColor: "#FFDD00",
-        sideChain: SideChain.SELECTED
+        uniformMutationColor: '#8A2BE2',
+        highlightColor: '#FFDD00',
+        sideChain: SideChain.SELECTED,
     };
 
     // abstract methods
     protected abstract selectAll(): any;
     protected abstract setScheme(scheme: ProteinScheme, selector?: any): any;
-    protected abstract setColor(color: string, selector?: any, style?: any): any;
-    protected abstract setTransparency(transparency: number, selector?: any, style?: any): any;
+    protected abstract setColor(
+        color: string,
+        selector?: any,
+        style?: any
+    ): any;
+    protected abstract setTransparency(
+        transparency: number,
+        selector?: any,
+        style?: any
+    ): any;
     protected abstract selectChain(chainId: string): any;
     protected abstract cpkColor(selector?: any, style?: any): any;
     protected abstract selectAlphaHelix(chainId: string): any;
     protected abstract selectBetaSheet(chainId: string): any;
     protected abstract rainbowColor(selector?: any, style?: any): any;
     protected abstract hideBoundMolecules(): any;
-    protected abstract updateResidueStyle(residues: IResidueSpec[],
-                                          chainId: string,
-                                          props: IStructureVisualizerProps,
-                                          style?: any): any;
+    protected abstract updateResidueStyle(
+        residues: IResidueSpec[],
+        chainId: string,
+        props: IStructureVisualizerProps,
+        style?: any
+    ): any;
 
     /**
      * Updates the visual style (scheme, coloring, selection, etc.)
      */
-    public updateVisualStyle(residues: IResidueSpec[],
-                             chainId: string,
-                             props: IStructureVisualizerProps)
-    {
+    public updateVisualStyle(
+        residues: IResidueSpec[],
+        chainId: string,
+        props: IStructureVisualizerProps
+    ) {
         let style = this.updateScheme(props);
         this.updateBaseVisualStyle(style, props);
         this.updateChainVisualStyle(chainId, style, props);
@@ -118,8 +139,7 @@ abstract class StructureVisualizer
         this.updateBoundMolecules(props);
     }
 
-    protected updateScheme(props: IStructureVisualizerProps)
-    {
+    protected updateScheme(props: IStructureVisualizerProps) {
         // select everything
         let selector = this.selectAll();
 
@@ -127,9 +147,10 @@ abstract class StructureVisualizer
         return this.setScheme(props.proteinScheme, selector);
     }
 
-    protected updateBaseVisualStyle(style: any,
-                                    props: IStructureVisualizerProps)
-    {
+    protected updateBaseVisualStyle(
+        style: any,
+        props: IStructureVisualizerProps
+    ) {
         const defaultProps = StructureVisualizer.defaultProps;
 
         // do the initial (uniform) coloring
@@ -137,55 +158,75 @@ abstract class StructureVisualizer
         let selector = this.selectAll();
 
         // set base structure color
-        this.setColor(props.baseColor || defaultProps.baseColor, selector, style);
+        this.setColor(
+            props.baseColor || defaultProps.baseColor,
+            selector,
+            style
+        );
 
         // set base color
-        this.setTransparency(props.baseTranslucency || defaultProps.baseTranslucency, selector, style);
+        this.setTransparency(
+            props.baseTranslucency || defaultProps.baseTranslucency,
+            selector,
+            style
+        );
     }
 
-    protected updateChainVisualStyle(chainId: string,
-                                     style: any,
-                                     props: IStructureVisualizerProps)
-    {
+    protected updateChainVisualStyle(
+        chainId: string,
+        style: any,
+        props: IStructureVisualizerProps
+    ) {
         const defaultProps = StructureVisualizer.defaultProps;
 
         let selector = this.selectChain(chainId);
 
-        this.setColor(props.chainColor || defaultProps.chainColor, selector, style); // set chain color
-        this.setTransparency(props.chainTranslucency || defaultProps.chainTranslucency, selector, style);
+        this.setColor(
+            props.chainColor || defaultProps.chainColor,
+            selector,
+            style
+        ); // set chain color
+        this.setTransparency(
+            props.chainTranslucency || defaultProps.chainTranslucency,
+            selector,
+            style
+        );
 
         // additional coloring for the selected chain
 
-        if (props.proteinColor === ProteinColor.ATOM_TYPE)
-        {
+        if (props.proteinColor === ProteinColor.ATOM_TYPE) {
             selector = this.selectChain(chainId);
             this.cpkColor(selector, style);
-        }
-        else if (props.proteinColor === ProteinColor.SECONDARY_STRUCTURE)
-        {
+        } else if (props.proteinColor === ProteinColor.SECONDARY_STRUCTURE) {
             // color secondary structure (for the selected chain)
             selector = this.selectAlphaHelix(chainId); // select alpha helices
-            this.setColor((props.structureColors || defaultProps.structureColors).alphaHelix, selector, style);
+            this.setColor(
+                (props.structureColors || defaultProps.structureColors)
+                    .alphaHelix,
+                selector,
+                style
+            );
             selector = this.selectBetaSheet(chainId); // select beta sheets
-            this.setColor((props.structureColors || defaultProps.structureColors).betaSheet, selector, style);
-        }
-        else if (props.proteinColor === ProteinColor.NC_RAINBOW)
-        {
+            this.setColor(
+                (props.structureColors || defaultProps.structureColors)
+                    .betaSheet,
+                selector,
+                style
+            );
+        } else if (props.proteinColor === ProteinColor.NC_RAINBOW) {
             // color the chain by rainbow coloring scheme (gradient coloring)
             selector = this.selectChain(chainId);
             this.rainbowColor(selector, style);
         }
     }
 
-    protected updateBoundMolecules(props: IStructureVisualizerProps)
-    {
+    protected updateBoundMolecules(props: IStructureVisualizerProps) {
         if (!props.displayBoundMolecules) {
             this.hideBoundMolecules();
         }
     }
 
-    protected convertPositionsToResCode(positions: IPdbPositionRange[])
-    {
+    protected convertPositionsToResCode(positions: IPdbPositionRange[]) {
         let residueCodes: string[] = [];
 
         // convert positions to script positions
@@ -194,8 +235,7 @@ abstract class StructureVisualizer
         });
 
         return residueCodes;
-    };
+    }
 }
 
 export default StructureVisualizer;
-
diff --git a/src/shared/components/structureViewer/StructureVisualizer3D.spec.ts b/src/shared/components/structureViewer/StructureVisualizer3D.spec.ts
index 93555280c38..d30d461e123 100644
--- a/src/shared/components/structureViewer/StructureVisualizer3D.spec.ts
+++ b/src/shared/components/structureViewer/StructureVisualizer3D.spec.ts
@@ -2,9 +2,18 @@ import { assert } from 'chai';
 import sinon from 'sinon';
 import * as _ from 'lodash';
 import {
-    ProteinScheme, ProteinColor, MutationColor, SideChain, IStructureVisualizerProps, IResidueSpec
-} from "./StructureVisualizer";
-import {default as StructureVisualizer3D, AtomSelectionSpec, AtomStyleSpec} from "./StructureVisualizer3D";
+    ProteinScheme,
+    ProteinColor,
+    MutationColor,
+    SideChain,
+    IStructureVisualizerProps,
+    IResidueSpec,
+} from './StructureVisualizer';
+import {
+    default as StructureVisualizer3D,
+    AtomSelectionSpec,
+    AtomStyleSpec,
+} from './StructureVisualizer3D';
 
 describe('StructureVisualizer3D', () => {
     const fakeDiv = {} as HTMLDivElement;
@@ -18,25 +27,22 @@ describe('StructureVisualizer3D', () => {
         const visualizer = new StructureVisualizer3D(fakeDiv, props, $3Dmol);
 
         // pdb id does not really matter, we don't load any structure during test
-        visualizer.init("3pxe",
-            "B",
-            residues,
-            viewer);
+        visualizer.init('3pxe', 'B', residues, viewer);
 
         return visualizer;
     }
 
     function updateVis(visualizer: StructureVisualizer3D) {
-        visualizer.updateViewer("B", residues, props);
+        visualizer.updateViewer('B', residues, props);
     }
 
     beforeEach(() => {
         $3Dmol = {
             download: sinon.stub().yields(), // download has a callback...
             elementColors: {
-                defaultColors: ["R", "G", "B"],
-                rasmol: ["R", "A", "S"]
-            }
+                defaultColors: ['R', 'G', 'B'],
+                rasmol: ['R', 'A', 'S'],
+            },
         };
 
         // stub the functions of the viewer
@@ -44,284 +50,414 @@ describe('StructureVisualizer3D', () => {
             setBackgroundColor: sinon.stub(),
             setStyle: () => {},
             clear: sinon.stub(),
-            render: sinon.stub()
+            render: sinon.stub(),
         };
 
         // reset to defaults
         props = {
-            pdbUri: "https://files.rcsb.org/view/",
+            pdbUri: 'https://files.rcsb.org/view/',
             proteinScheme: ProteinScheme.CARTOON,
             displayBoundMolecules: true,
-            backgroundColor: "#FFFFFF",
-            baseColor: "#DDDDDD",
+            backgroundColor: '#FFFFFF',
+            baseColor: '#DDDDDD',
             structureColors: {
-                alphaHelix: "#FFA500",
-                betaSheet: "#0000FF",
-                loop: "#EEEEEE"
+                alphaHelix: '#FFA500',
+                betaSheet: '#0000FF',
+                loop: '#EEEEEE',
             },
             baseTranslucency: 5,
-            chainColor: "#888888",
+            chainColor: '#888888',
             chainTranslucency: 0,
             proteinColor: ProteinColor.UNIFORM,
             mutationColor: MutationColor.MUTATION_TYPE,
-            uniformMutationColor: "#8A2BE2",
-            highlightColor: "#FFDD00",
-            sideChain: SideChain.SELECTED
+            uniformMutationColor: '#8A2BE2',
+            highlightColor: '#FFDD00',
+            sideChain: SideChain.SELECTED,
         };
 
         residues = [
             {
                 positionRange: {
                     start: {
-                        position: 122
+                        position: 122,
                     },
                     end: {
-                        position: 122
-                    }
+                        position: 122,
+                    },
                 },
-                color: "#AAA666",
-                highlighted: true
+                color: '#AAA666',
+                highlighted: true,
             },
             {
                 positionRange: {
                     start: {
-                        position: 1710
+                        position: 1710,
                     },
                     end: {
-                        position: 1710
-                    }
+                        position: 1710,
+                    },
                 },
-                color: "#FF0000"
+                color: '#FF0000',
             },
             {
                 positionRange: {
                     start: {
-                        position: 1835
+                        position: 1835,
                     },
                     end: {
-                        position: 1835
-                    }
+                        position: 1835,
+                    },
                 },
-                color: "#00FFFF"
+                color: '#00FFFF',
             },
             {
                 positionRange: {
                     start: {
-                        position: 1815
+                        position: 1815,
                     },
                     end: {
-                        position: 1815
-                    }
+                        position: 1815,
+                    },
                 },
-                color: "#00FF00",
-                highlighted: true
-            }
+                color: '#00FF00',
+                highlighted: true,
+            },
         ];
     });
 
-    it("properly initializes the 3D visualizer", () => {
+    it('properly initializes the 3D visualizer', () => {
         initVis();
-        assert.isTrue(viewer.setBackgroundColor.calledWith("0xFFFFFF"),
-            "Background color should be set to 0xFFFFFF");
+        assert.isTrue(
+            viewer.setBackgroundColor.calledWith('0xFFFFFF'),
+            'Background color should be set to 0xFFFFFF'
+        );
 
-        assert.isTrue($3Dmol.download.calledWith("pdb:3PXE", viewer, sinon.match({pdbUri: props.pdbUri})),
-            "Structure download should be requested for pdb:3PXE from https://files.rcsb.org/view/");
+        assert.isTrue(
+            $3Dmol.download.calledWith(
+                'pdb:3PXE',
+                viewer,
+                sinon.match({ pdbUri: props.pdbUri })
+            ),
+            'Structure download should be requested for pdb:3PXE from https://files.rcsb.org/view/'
+        );
 
-        assert.isTrue(viewer.clear.calledOnce,
-            "Clear should only be called once per init");
+        assert.isTrue(
+            viewer.clear.calledOnce,
+            'Clear should only be called once per init'
+        );
 
-        assert.isTrue(viewer.render.calledOnce,
-            "Render should only be called once per init");
+        assert.isTrue(
+            viewer.render.calledOnce,
+            'Render should only be called once per init'
+        );
     });
 
-    it("sets chain color and the opacity properly", () => {
-        let chainColor = "N/A";
+    it('sets chain color and the opacity properly', () => {
+        let chainColor = 'N/A';
         let chainOpacity = -1;
 
-        sinon.stub(viewer, "setStyle").callsFake((selector: AtomSelectionSpec, style: AtomStyleSpec) => {
-            if (selector && _.isEqual(selector, {chain: "B"}))
-            {
-                if(style.cartoon && style.cartoon.color) {
-                    chainColor = style.cartoon.color;
-                }
+        sinon
+            .stub(viewer, 'setStyle')
+            .callsFake((selector: AtomSelectionSpec, style: AtomStyleSpec) => {
+                if (selector && _.isEqual(selector, { chain: 'B' })) {
+                    if (style.cartoon && style.cartoon.color) {
+                        chainColor = style.cartoon.color;
+                    }
 
-                if (style.cartoon && style.cartoon.opacity) {
-                    chainOpacity = style.cartoon.opacity;
+                    if (style.cartoon && style.cartoon.opacity) {
+                        chainOpacity = style.cartoon.opacity;
+                    }
                 }
-            }
-        });
+            });
 
         initVis();
-        assert.equal(chainColor, "0x888888",
-            "Chain color should be set to 0x888888");
-        assert.equal(chainOpacity, 1,
-            "Chain opacity should be set to 1");
+        assert.equal(
+            chainColor,
+            '0x888888',
+            'Chain color should be set to 0x888888'
+        );
+        assert.equal(chainOpacity, 1, 'Chain opacity should be set to 1');
     });
 
-    it("sets the base structure color and the opacity properly", () => {
-        let baseColor = "N/A";
+    it('sets the base structure color and the opacity properly', () => {
+        let baseColor = 'N/A';
         let baseOpacity = -1;
 
-        sinon.stub(viewer, "setStyle").callsFake((selector: AtomSelectionSpec, style: AtomStyleSpec) => {
-            if (selector && _.isEqual(selector, {}))
-            {
-                if(style.cartoon && style.cartoon.color) {
-                    baseColor = style.cartoon.color;
-                }
+        sinon
+            .stub(viewer, 'setStyle')
+            .callsFake((selector: AtomSelectionSpec, style: AtomStyleSpec) => {
+                if (selector && _.isEqual(selector, {})) {
+                    if (style.cartoon && style.cartoon.color) {
+                        baseColor = style.cartoon.color;
+                    }
 
-                if (style.cartoon && style.cartoon.opacity) {
-                    baseOpacity = style.cartoon.opacity;
+                    if (style.cartoon && style.cartoon.opacity) {
+                        baseOpacity = style.cartoon.opacity;
+                    }
                 }
-            }
-        });
+            });
 
         initVis();
-        assert.equal(baseColor, "0xDDDDDD",
-            "Base color should be set to 0xDDDDDD");
-        assert.equal(baseOpacity, 5/10,
-            "Base opacity should be set to 0.5");
+        assert.equal(
+            baseColor,
+            '0xDDDDDD',
+            'Base color should be set to 0xDDDDDD'
+        );
+        assert.equal(baseOpacity, 5 / 10, 'Base opacity should be set to 0.5');
     });
 
-    it("applies correct protein style wrt the corresponding prop", () => {
+    it('applies correct protein style wrt the corresponding prop', () => {
         viewer.setStyle = sinon.stub();
 
         props.proteinScheme = ProteinScheme.TRACE;
         const visualizer = initVis();
-        assert.isTrue(viewer.setStyle.calledWithMatch({}, {cartoon: {style: "trace"}}));
+        assert.isTrue(
+            viewer.setStyle.calledWithMatch({}, { cartoon: { style: 'trace' } })
+        );
 
         props.proteinScheme = ProteinScheme.SPACE_FILLING;
         updateVis(visualizer);
-        assert.isTrue(viewer.setStyle.calledWithMatch({}, {sphere: {scale: 0.6}}));
+        assert.isTrue(
+            viewer.setStyle.calledWithMatch({}, { sphere: { scale: 0.6 } })
+        );
 
         props.proteinScheme = ProteinScheme.CARTOON;
         updateVis(visualizer);
-        assert.isTrue(viewer.setStyle.calledWithMatch({}, {cartoon: {}}));
+        assert.isTrue(viewer.setStyle.calledWithMatch({}, { cartoon: {} }));
     });
 
-    it("does not display bound molecules when the corresponding prop is set to false", () => {
+    it('does not display bound molecules when the corresponding prop is set to false', () => {
         viewer.setStyle = sinon.stub();
 
         props.displayBoundMolecules = false;
         initVis();
 
-        assert.isTrue(viewer.setStyle.calledWithMatch({
+        assert.isTrue(
+            viewer.setStyle.calledWithMatch({
                 resn: [
-                    "asp", "glu", "arg", "lys", "his", "asn", "thr", "cys", "gln", "tyr", "ser",
-                    "gly", "ala", "leu", "val", "ile", "met", "trp", "phe", "pro",
-                    "ASP", "GLU", "ARG", "LYS", "HIS", "ASN", "THR", "CYS", "GLN", "TYR", "SER",
-                    "GLY", "ALA", "LEU", "VAL", "ILE", "MET", "TRP", "PHE", "PRO"
+                    'asp',
+                    'glu',
+                    'arg',
+                    'lys',
+                    'his',
+                    'asn',
+                    'thr',
+                    'cys',
+                    'gln',
+                    'tyr',
+                    'ser',
+                    'gly',
+                    'ala',
+                    'leu',
+                    'val',
+                    'ile',
+                    'met',
+                    'trp',
+                    'phe',
+                    'pro',
+                    'ASP',
+                    'GLU',
+                    'ARG',
+                    'LYS',
+                    'HIS',
+                    'ASN',
+                    'THR',
+                    'CYS',
+                    'GLN',
+                    'TYR',
+                    'SER',
+                    'GLY',
+                    'ALA',
+                    'LEU',
+                    'VAL',
+                    'ILE',
+                    'MET',
+                    'TRP',
+                    'PHE',
+                    'PRO',
                 ],
-                invert: true
+                invert: true,
             })
         );
     });
 
-    it("applies correct protein colors wrt the corresponding prop", () => {
-        let structureToColor: {[selector:string]: string};
+    it('applies correct protein colors wrt the corresponding prop', () => {
+        let structureToColor: { [selector: string]: string };
         let defaultColors: string[] = [];
         let isColoredWithSpectrum = false;
 
-        sinon.stub(viewer, "setStyle").callsFake((selector: AtomSelectionSpec, style: AtomStyleSpec) => {
-            if (selector.ss && style.cartoon && style.cartoon.color) {
-                structureToColor[selector.ss] = style.cartoon.color;
-            }
+        sinon
+            .stub(viewer, 'setStyle')
+            .callsFake((selector: AtomSelectionSpec, style: AtomStyleSpec) => {
+                if (selector.ss && style.cartoon && style.cartoon.color) {
+                    structureToColor[selector.ss] = style.cartoon.color;
+                }
 
-            if (_.isEqual(selector, {chain: "B"}) && style.sphere && style.sphere.colors) {
-                defaultColors = style.sphere.colors;
-            }
+                if (
+                    _.isEqual(selector, { chain: 'B' }) &&
+                    style.sphere &&
+                    style.sphere.colors
+                ) {
+                    defaultColors = style.sphere.colors;
+                }
 
-            if (selector.chain && selector.chain === "B" &&
-                style.cartoon && style.cartoon.color && style.cartoon.color === "spectrum")
-            {
-                isColoredWithSpectrum = true;
-            }
-        });
+                if (
+                    selector.chain &&
+                    selector.chain === 'B' &&
+                    style.cartoon &&
+                    style.cartoon.color &&
+                    style.cartoon.color === 'spectrum'
+                ) {
+                    isColoredWithSpectrum = true;
+                }
+            });
 
         structureToColor = {};
         props.proteinScheme = ProteinScheme.TRACE;
         props.proteinColor = ProteinColor.SECONDARY_STRUCTURE;
         const visualizer = initVis();
 
-        assert.equal(structureToColor["h"], "0xFFA500",
-            "Alpha helices should be colored with 0xFFA500 when SECONDARY_STRUCTURE is selected");
-        assert.equal(structureToColor["s"], "0x0000FF",
-            "Beta sheets should be colored with 0x0000FF when SECONDARY_STRUCTURE is selected");
+        assert.equal(
+            structureToColor['h'],
+            '0xFFA500',
+            'Alpha helices should be colored with 0xFFA500 when SECONDARY_STRUCTURE is selected'
+        );
+        assert.equal(
+            structureToColor['s'],
+            '0x0000FF',
+            'Beta sheets should be colored with 0x0000FF when SECONDARY_STRUCTURE is selected'
+        );
 
         structureToColor = {};
         props.proteinScheme = ProteinScheme.CARTOON;
         props.proteinColor = ProteinColor.NC_RAINBOW;
         updateVis(visualizer);
 
-        assert.isTrue(isColoredWithSpectrum,
-            "Chain B should be colored with rainbow spectrum when NC_RAINBOW is selected");
+        assert.isTrue(
+            isColoredWithSpectrum,
+            'Chain B should be colored with rainbow spectrum when NC_RAINBOW is selected'
+        );
 
         structureToColor = {};
         props.proteinScheme = ProteinScheme.SPACE_FILLING;
         props.proteinColor = ProteinColor.ATOM_TYPE;
         updateVis(visualizer);
 
-        assert.deepEqual(defaultColors, ["R", "G", "B"],
-            "Chain B should be colored with default element colors when ATOM_TYPE is selected");
+        assert.deepEqual(
+            defaultColors,
+            ['R', 'G', 'B'],
+            'Chain B should be colored with default element colors when ATOM_TYPE is selected'
+        );
     });
 
-    it.skip("colors residues with correct colors", () => {
-        let residueToColor: {[residue:number]: string} = {};
+    it.skip('colors residues with correct colors', () => {
+        let residueToColor: { [residue: number]: string } = {};
 
-        sinon.stub(viewer, "setStyle", (selector: AtomSelectionSpec, style: AtomStyleSpec) => {
-            if (selector.resi && style.cartoon && style.cartoon.color) {
-                residueToColor[selector.resi] = style.cartoon.color;
+        sinon.stub(
+            viewer,
+            'setStyle',
+            (selector: AtomSelectionSpec, style: AtomStyleSpec) => {
+                if (selector.resi && style.cartoon && style.cartoon.color) {
+                    residueToColor[selector.resi] = style.cartoon.color;
+                }
             }
-        });
+        );
 
         props.mutationColor = MutationColor.MUTATION_TYPE;
         const visualizer = initVis();
 
-        assert.equal(residueToColor[122], "0xFFDD00",
-            "Residue 122 should be colored with highlight color (0xFFDD00) when MUTATION_TYPE selected");
-        assert.equal(residueToColor[1710], "0xFF0000",
-            "Residue 1710 should be colored with 0xFF0000 when MUTATION_TYPE selected");
-        assert.equal(residueToColor[1815], "0xFFDD00",
-            "Residue 1815 should be colored with highlight color (0xFFDD00) when MUTATION_TYPE selected");
-        assert.equal(residueToColor[1835], "0x00FFFF",
-            "Residue 1835 should be colored with 0x00FFFF when MUTATION_TYPE selected");
+        assert.equal(
+            residueToColor[122],
+            '0xFFDD00',
+            'Residue 122 should be colored with highlight color (0xFFDD00) when MUTATION_TYPE selected'
+        );
+        assert.equal(
+            residueToColor[1710],
+            '0xFF0000',
+            'Residue 1710 should be colored with 0xFF0000 when MUTATION_TYPE selected'
+        );
+        assert.equal(
+            residueToColor[1815],
+            '0xFFDD00',
+            'Residue 1815 should be colored with highlight color (0xFFDD00) when MUTATION_TYPE selected'
+        );
+        assert.equal(
+            residueToColor[1835],
+            '0x00FFFF',
+            'Residue 1835 should be colored with 0x00FFFF when MUTATION_TYPE selected'
+        );
 
         residueToColor = {};
         props.mutationColor = MutationColor.UNIFORM;
         updateVis(visualizer);
 
-        assert.equal(residueToColor[122], "0xFFDD00",
-            "Residue 122 should be colored with highlight color (0xFFDD00) when UNIFORM selected");
-        assert.equal(residueToColor[1710], "0x8A2BE2",
-            "Residue 1710 should be colored with uniform color (0x8A2BE2) when UNIFORM selected");
-        assert.equal(residueToColor[1815], "0xFFDD00",
-            "Residue 1815 should be colored with highlight color (0xFFDD00) when UNIFORM selected");
-        assert.equal(residueToColor[1835], "0x8A2BE2",
-            "Residue 1835 should be colored with uniform color (0x8A2BE2) when UNIFORM selected");
+        assert.equal(
+            residueToColor[122],
+            '0xFFDD00',
+            'Residue 122 should be colored with highlight color (0xFFDD00) when UNIFORM selected'
+        );
+        assert.equal(
+            residueToColor[1710],
+            '0x8A2BE2',
+            'Residue 1710 should be colored with uniform color (0x8A2BE2) when UNIFORM selected'
+        );
+        assert.equal(
+            residueToColor[1815],
+            '0xFFDD00',
+            'Residue 1815 should be colored with highlight color (0xFFDD00) when UNIFORM selected'
+        );
+        assert.equal(
+            residueToColor[1835],
+            '0x8A2BE2',
+            'Residue 1835 should be colored with uniform color (0x8A2BE2) when UNIFORM selected'
+        );
 
         residueToColor = {};
         props.mutationColor = MutationColor.NONE;
         updateVis(visualizer);
 
-        assert.equal(residueToColor[122], "0xFFDD00",
-            "Residue 122 should be colored with highlight color (0xFFDD00) when NONE selected");
-        assert.equal(residueToColor[1710], "0x888888",
-            "Residue 1710 should be colored with chain color when NONE selected");
-        assert.equal(residueToColor[1815], "0xFFDD00",
-            "Residue 1815 should be colored with highlight color (0xFFDD00) when NONE selected");
-        assert.equal(residueToColor[1835], "0x888888",
-            "Residue 1835 should be colored with chain color when NONE selected");
+        assert.equal(
+            residueToColor[122],
+            '0xFFDD00',
+            'Residue 122 should be colored with highlight color (0xFFDD00) when NONE selected'
+        );
+        assert.equal(
+            residueToColor[1710],
+            '0x888888',
+            'Residue 1710 should be colored with chain color when NONE selected'
+        );
+        assert.equal(
+            residueToColor[1815],
+            '0xFFDD00',
+            'Residue 1815 should be colored with highlight color (0xFFDD00) when NONE selected'
+        );
+        assert.equal(
+            residueToColor[1835],
+            '0x888888',
+            'Residue 1835 should be colored with chain color when NONE selected'
+        );
     });
 
-    it.skip("styles and colors side chain atoms wrt the corresponding props", () => {
-        let residueToStickColor: {[residue:number]: string};
-        let residueToSphereColor: {[residue:number]: string};
-
-        sinon.stub(viewer, "setStyle", (selector: AtomSelectionSpec, style: AtomStyleSpec) => {
-            if (selector.resi && style.sphere && style.sphere.color && style.stick && style.stick.color) {
-                residueToStickColor[selector.resi] = style.stick.color;
-                residueToSphereColor[selector.resi] = style.sphere.color;
+    it.skip('styles and colors side chain atoms wrt the corresponding props', () => {
+        let residueToStickColor: { [residue: number]: string };
+        let residueToSphereColor: { [residue: number]: string };
+
+        sinon.stub(
+            viewer,
+            'setStyle',
+            (selector: AtomSelectionSpec, style: AtomStyleSpec) => {
+                if (
+                    selector.resi &&
+                    style.sphere &&
+                    style.sphere.color &&
+                    style.stick &&
+                    style.stick.color
+                ) {
+                    residueToStickColor[selector.resi] = style.stick.color;
+                    residueToSphereColor[selector.resi] = style.sphere.color;
+                }
             }
-        });
+        );
 
         // only selected residues should have side chain style with selection color if sideChain is set to SELECTED
 
@@ -331,25 +467,49 @@ describe('StructureVisualizer3D', () => {
         props.mutationColor = MutationColor.MUTATION_TYPE;
         const visualizer = initVis();
 
-        assert.equal(residueToStickColor[122], "0xFFDD00",
-            "Residue 122 side chain sticks should be colored with highlight color (0xFFDD00) when SELECTED active");
-        assert.equal(residueToSphereColor[122], "0xFFDD00",
-            "Residue 122 side chain spheres should be colored with highlight color (0xFFDD00) when SELECTED active");
+        assert.equal(
+            residueToStickColor[122],
+            '0xFFDD00',
+            'Residue 122 side chain sticks should be colored with highlight color (0xFFDD00) when SELECTED active'
+        );
+        assert.equal(
+            residueToSphereColor[122],
+            '0xFFDD00',
+            'Residue 122 side chain spheres should be colored with highlight color (0xFFDD00) when SELECTED active'
+        );
 
-        assert.equal(residueToStickColor[1710], undefined,
-            "Residue 1710 side chain sticks should not be selected or colored when SELECTED active");
-        assert.equal(residueToSphereColor[1710], undefined,
-            "Residue 1710 side chain spheres should not be selected or colored when SELECTED active");
+        assert.equal(
+            residueToStickColor[1710],
+            undefined,
+            'Residue 1710 side chain sticks should not be selected or colored when SELECTED active'
+        );
+        assert.equal(
+            residueToSphereColor[1710],
+            undefined,
+            'Residue 1710 side chain spheres should not be selected or colored when SELECTED active'
+        );
 
-        assert.equal(residueToStickColor[1815], "0xFFDD00",
-            "Residue 1815 side chain sticks should be colored with highlight color (0xFFDD00) when SELECTED active");
-        assert.equal(residueToSphereColor[1815], "0xFFDD00",
-            "Residue 1815 side chain spheres should be colored with highlight color (0xFFDD00) when SELECTED active");
+        assert.equal(
+            residueToStickColor[1815],
+            '0xFFDD00',
+            'Residue 1815 side chain sticks should be colored with highlight color (0xFFDD00) when SELECTED active'
+        );
+        assert.equal(
+            residueToSphereColor[1815],
+            '0xFFDD00',
+            'Residue 1815 side chain spheres should be colored with highlight color (0xFFDD00) when SELECTED active'
+        );
 
-        assert.equal(residueToStickColor[1835], undefined,
-            "Residue 1835 side chain sticks should not be selected or colored when SELECTED active");
-        assert.equal(residueToSphereColor[1835], undefined,
-            "Residue 1835 side chain spheres should not be selected or colored when SELECTED active");
+        assert.equal(
+            residueToStickColor[1835],
+            undefined,
+            'Residue 1835 side chain sticks should not be selected or colored when SELECTED active'
+        );
+        assert.equal(
+            residueToSphereColor[1835],
+            undefined,
+            'Residue 1835 side chain spheres should not be selected or colored when SELECTED active'
+        );
 
         // all residues should have side chain style with corresponding color if sideChain is set to ALL
 
@@ -359,25 +519,49 @@ describe('StructureVisualizer3D', () => {
         props.mutationColor = MutationColor.MUTATION_TYPE;
         updateVis(visualizer);
 
-        assert.equal(residueToStickColor[122], "0xFFDD00",
-            "Residue 122 side chain sticks should be colored with highlight color (0xFFDD00) when ALL active");
-        assert.equal(residueToSphereColor[122], "0xFFDD00",
-            "Residue 122 side chain spheres should be colored with highlight color (0xFFDD00) when ALL active");
+        assert.equal(
+            residueToStickColor[122],
+            '0xFFDD00',
+            'Residue 122 side chain sticks should be colored with highlight color (0xFFDD00) when ALL active'
+        );
+        assert.equal(
+            residueToSphereColor[122],
+            '0xFFDD00',
+            'Residue 122 side chain spheres should be colored with highlight color (0xFFDD00) when ALL active'
+        );
 
-        assert.equal(residueToStickColor[1710], "0xFF0000",
-            "Residue 1710 side chain sticks should should be colored with 0xFF0000 when ALL active");
-        assert.equal(residueToSphereColor[1710], "0xFF0000",
-            "Residue 1710 side chain spheres should be colored with 0xFF0000 when ALL active");
+        assert.equal(
+            residueToStickColor[1710],
+            '0xFF0000',
+            'Residue 1710 side chain sticks should should be colored with 0xFF0000 when ALL active'
+        );
+        assert.equal(
+            residueToSphereColor[1710],
+            '0xFF0000',
+            'Residue 1710 side chain spheres should be colored with 0xFF0000 when ALL active'
+        );
 
-        assert.equal(residueToStickColor[1815], "0xFFDD00",
-            "Residue 1815 side chain sticks should be colored with highlight color (0xFFDD00) when ALL active");
-        assert.equal(residueToSphereColor[1815], "0xFFDD00",
-            "Residue 1815 side chain spheres should be colored with highlight color (0xFFDD00) when ALL active");
+        assert.equal(
+            residueToStickColor[1815],
+            '0xFFDD00',
+            'Residue 1815 side chain sticks should be colored with highlight color (0xFFDD00) when ALL active'
+        );
+        assert.equal(
+            residueToSphereColor[1815],
+            '0xFFDD00',
+            'Residue 1815 side chain spheres should be colored with highlight color (0xFFDD00) when ALL active'
+        );
 
-        assert.equal(residueToStickColor[1835], "0x00FFFF",
-            "Residue 1835 side chain sticks should be colored with 0x00FFFF when ALL active");
-        assert.equal(residueToSphereColor[1835], "0x00FFFF",
-            "Residue 1835 side chain spheres should be colored with 0x00FFFF when ALL active");
+        assert.equal(
+            residueToStickColor[1835],
+            '0x00FFFF',
+            'Residue 1835 side chain sticks should be colored with 0x00FFFF when ALL active'
+        );
+        assert.equal(
+            residueToSphereColor[1835],
+            '0x00FFFF',
+            'Residue 1835 side chain spheres should be colored with 0x00FFFF when ALL active'
+        );
 
         residueToStickColor = {};
         residueToSphereColor = {};
@@ -385,15 +569,27 @@ describe('StructureVisualizer3D', () => {
         props.mutationColor = MutationColor.UNIFORM;
         updateVis(visualizer);
 
-        assert.equal(residueToStickColor[1710], "0x8A2BE2",
-            "Residue 1710 side chain sticks should be colored with uniform color (0x8A2BE2) when ALL & UNIFORM active");
-        assert.equal(residueToSphereColor[1710], "0x8A2BE2",
-            "Residue 1710 side chain spheres should be colored with uniform color (0x8A2BE2) when ALL & UNIFORM active");
+        assert.equal(
+            residueToStickColor[1710],
+            '0x8A2BE2',
+            'Residue 1710 side chain sticks should be colored with uniform color (0x8A2BE2) when ALL & UNIFORM active'
+        );
+        assert.equal(
+            residueToSphereColor[1710],
+            '0x8A2BE2',
+            'Residue 1710 side chain spheres should be colored with uniform color (0x8A2BE2) when ALL & UNIFORM active'
+        );
 
-        assert.equal(residueToStickColor[1835], "0x8A2BE2",
-            "Residue 1835 side chain sticks should be colored with uniform color (0x8A2BE2) when ALL & UNIFORM active");
-        assert.equal(residueToSphereColor[1835], "0x8A2BE2",
-            "Residue 1835 side chain spheres should be colored with uniform color (0x8A2BE2) when ALL & UNIFORM active");
+        assert.equal(
+            residueToStickColor[1835],
+            '0x8A2BE2',
+            'Residue 1835 side chain sticks should be colored with uniform color (0x8A2BE2) when ALL & UNIFORM active'
+        );
+        assert.equal(
+            residueToSphereColor[1835],
+            '0x8A2BE2',
+            'Residue 1835 side chain spheres should be colored with uniform color (0x8A2BE2) when ALL & UNIFORM active'
+        );
 
         // none of the residues should have side chain style or color if sideChain is set to NONE
 
@@ -403,24 +599,48 @@ describe('StructureVisualizer3D', () => {
         props.mutationColor = MutationColor.MUTATION_TYPE;
         updateVis(visualizer);
 
-        assert.equal(residueToStickColor[122], undefined,
-            "Residue 122 side chain sticks should not be selected or colored when NONE active");
-        assert.equal(residueToSphereColor[122], undefined,
-            "Residue 122 side chain spheres should not be selected or colored when NONE active");
-
-        assert.equal(residueToStickColor[1710], undefined,
-            "Residue 1710 side chain sticks should not be selected or colored when NONE active");
-        assert.equal(residueToSphereColor[1710], undefined,
-            "Residue 1710 side chain spheres should not be selected or colored when NONE active");
-
-        assert.equal(residueToStickColor[1815], undefined,
-            "Residue 1815 side chain sticks should not be selected or colored when NONE active");
-        assert.equal(residueToSphereColor[1815], undefined,
-            "Residue 1815 side chain spheres should not be selected or colored when NONE active");
-
-        assert.equal(residueToStickColor[1835], undefined,
-            "Residue 1835 side chain sticks should not be selected or colored when NONE active");
-        assert.equal(residueToSphereColor[1835], undefined,
-            "Residue 1835 side chain spheres should not be selected or colored when NONE active");
+        assert.equal(
+            residueToStickColor[122],
+            undefined,
+            'Residue 122 side chain sticks should not be selected or colored when NONE active'
+        );
+        assert.equal(
+            residueToSphereColor[122],
+            undefined,
+            'Residue 122 side chain spheres should not be selected or colored when NONE active'
+        );
+
+        assert.equal(
+            residueToStickColor[1710],
+            undefined,
+            'Residue 1710 side chain sticks should not be selected or colored when NONE active'
+        );
+        assert.equal(
+            residueToSphereColor[1710],
+            undefined,
+            'Residue 1710 side chain spheres should not be selected or colored when NONE active'
+        );
+
+        assert.equal(
+            residueToStickColor[1815],
+            undefined,
+            'Residue 1815 side chain sticks should not be selected or colored when NONE active'
+        );
+        assert.equal(
+            residueToSphereColor[1815],
+            undefined,
+            'Residue 1815 side chain spheres should not be selected or colored when NONE active'
+        );
+
+        assert.equal(
+            residueToStickColor[1835],
+            undefined,
+            'Residue 1835 side chain sticks should not be selected or colored when NONE active'
+        );
+        assert.equal(
+            residueToSphereColor[1835],
+            undefined,
+            'Residue 1835 side chain spheres should not be selected or colored when NONE active'
+        );
     });
 });
diff --git a/src/shared/components/structureViewer/StructureVisualizer3D.ts b/src/shared/components/structureViewer/StructureVisualizer3D.ts
index 013dab55448..30addc80581 100644
--- a/src/shared/components/structureViewer/StructureVisualizer3D.ts
+++ b/src/shared/components/structureViewer/StructureVisualizer3D.ts
@@ -1,13 +1,20 @@
 import * as _ from 'lodash';
 import $ from 'jquery';
-import {observable, computed, reaction, action} from "mobx";
+import { observable, computed, reaction, action } from 'mobx';
 import {
-    default as StructureVisualizer, ProteinScheme, MutationColor, SideChain,
-    IStructureVisualizerProps, IResidueSpec
-} from "./StructureVisualizer";
+    default as StructureVisualizer,
+    ProteinScheme,
+    MutationColor,
+    SideChain,
+    IStructureVisualizerProps,
+    IResidueSpec,
+} from './StructureVisualizer';
 import {
-    IResidueHelper, IResidueSelector, generateResiduePosToSelectorMap, findUpdatedResidues
-} from "./PdbResidueUtils";
+    IResidueHelper,
+    IResidueSelector,
+    generateResiduePosToSelectorMap,
+    findUpdatedResidues,
+} from './PdbResidueUtils';
 
 import $3Dmol from '3dmol';
 
@@ -36,16 +43,14 @@ export type AtomStyleSpec = {
     cartoon?: CartoonStyleSpec;
 };
 
-interface IStructureVisualizerState
-{
+interface IStructureVisualizerState {
     pdbId: string;
     chainId: string;
     residues: IResidueSpec[];
 }
 
-export default class StructureVisualizer3D extends StructureVisualizer
-{
-    private _3dMolDiv: HTMLDivElement|undefined;
+export default class StructureVisualizer3D extends StructureVisualizer {
+    private _3dMolDiv: HTMLDivElement | undefined;
     private _3dMolViewer: any;
     private _3dMol: any;
 
@@ -57,32 +62,59 @@ export default class StructureVisualizer3D extends StructureVisualizer
 
     private _loadingPdb: boolean = false;
 
-    public static get PROTEIN_SCHEME_PRESETS(): {[scheme:number]: AtomStyleSpec}
-    {
-        const presets:{[scheme:number]: any} = {};
-
-        presets[ProteinScheme.CARTOON] = {cartoon: {}};
-        presets[ProteinScheme.TRACE] = {cartoon: {style: "trace"}};
-        presets[ProteinScheme.SPACE_FILLING] = {sphere: {scale: 0.6}};
-        presets[ProteinScheme.BALL_AND_STICK] = {stick: {}, sphere: {scale: 0.25}};
-        presets[ProteinScheme.RIBBON] = {cartoon: {style: "ribbon"}};
+    public static get PROTEIN_SCHEME_PRESETS(): {
+        [scheme: number]: AtomStyleSpec;
+    } {
+        const presets: { [scheme: number]: any } = {};
+
+        presets[ProteinScheme.CARTOON] = { cartoon: {} };
+        presets[ProteinScheme.TRACE] = { cartoon: { style: 'trace' } };
+        presets[ProteinScheme.SPACE_FILLING] = { sphere: { scale: 0.6 } };
+        presets[ProteinScheme.BALL_AND_STICK] = {
+            stick: {},
+            sphere: { scale: 0.25 },
+        };
+        presets[ProteinScheme.RIBBON] = { cartoon: { style: 'ribbon' } };
 
         return presets;
     }
 
     public static get ALL_PROTEINS(): string[] {
         const proteins = [
-            "asp", "glu", "arg", "lys", "his", "asn", "thr", "cys", "gln", "tyr", "ser",
-            "gly", "ala", "leu", "val", "ile", "met", "trp", "phe", "pro"
+            'asp',
+            'glu',
+            'arg',
+            'lys',
+            'his',
+            'asn',
+            'thr',
+            'cys',
+            'gln',
+            'tyr',
+            'ser',
+            'gly',
+            'ala',
+            'leu',
+            'val',
+            'ile',
+            'met',
+            'trp',
+            'phe',
+            'pro',
         ];
 
-        const upperCaseProteins = proteins.map((protein: string) => protein.toUpperCase());
+        const upperCaseProteins = proteins.map((protein: string) =>
+            protein.toUpperCase()
+        );
 
         return proteins.concat(upperCaseProteins);
     }
 
-    constructor(div:HTMLDivElement, props?:IStructureVisualizerProps, _3dMol?:any)
-    {
+    constructor(
+        div: HTMLDivElement,
+        props?: IStructureVisualizerProps,
+        _3dMol?: any
+    ) {
         super();
 
         this._3dMol = _3dMol || $3Dmol;
@@ -91,29 +123,28 @@ export default class StructureVisualizer3D extends StructureVisualizer
         // init props
         this.props = {
             ...StructureVisualizer.defaultProps,
-            ...props
+            ...props,
         };
 
         // init state
         this.state = {
-            pdbId: "",
-            chainId: "",
-            residues: []
+            pdbId: '',
+            chainId: '',
+            residues: [],
         };
 
         this._prevState = {
-            pdbId: "",
-            chainId: "",
-            residues: []
+            pdbId: '',
+            chainId: '',
+            residues: [],
         };
 
         this.updateViewer = this.updateViewer.bind(this);
     }
 
-    @action setState(newState: IStructureVisualizerState)
-    {
-        this._prevState = {...this.state};
-        this.state = {...this.state, ...newState};
+    @action setState(newState: IStructureVisualizerState) {
+        this._prevState = { ...this.state };
+        this.state = { ...this.state, ...newState };
     }
 
     // we need to update the view for each state change action
@@ -124,8 +155,7 @@ export default class StructureVisualizer3D extends StructureVisualizer
         }
     );
 
-    private onStateChange(state: IStructureVisualizerState)
-    {
+    private onStateChange(state: IStructureVisualizerState) {
         // do not update or render if pdb is still loading,
         // pdb load callback will take care of the update once the load ends
         if (this._prevState && !this._loadingPdb) {
@@ -134,44 +164,44 @@ export default class StructureVisualizer3D extends StructureVisualizer
         }
     }
 
-    protected setProps(newProps: IStructureVisualizerProps)
-    {
+    protected setProps(newProps: IStructureVisualizerProps) {
         this._prevProps = this.props;
         this.props = newProps;
     }
 
-    public init(pdbId: string,
-                chainId: string,
-                residues: IResidueSpec[] = this.state.residues,
-                viewer?: any)
-    {
+    public init(
+        pdbId: string,
+        chainId: string,
+        residues: IResidueSpec[] = this.state.residues,
+        viewer?: any
+    ) {
         if (viewer) {
             this._3dMolViewer = viewer;
-        }
-        else if (this._3dMolDiv) {
-            this._3dMolViewer = this._3dMol.createViewer(
-                $(this._3dMolDiv),
-                {defaultcolors: this._3dMol.elementColors.rasmol}
-            );
+        } else if (this._3dMolDiv) {
+            this._3dMolViewer = this._3dMol.createViewer($(this._3dMolDiv), {
+                defaultcolors: this._3dMol.elementColors.rasmol,
+            });
         }
 
-        if (this._3dMolViewer)
-        {
+        if (this._3dMolViewer) {
             const backgroundColor = this.formatColor(
-                this.props.backgroundColor || StructureVisualizer.defaultProps.backgroundColor);
+                this.props.backgroundColor ||
+                    StructureVisualizer.defaultProps.backgroundColor
+            );
             this._3dMolViewer.setBackgroundColor(backgroundColor);
             this.loadPdb(pdbId, chainId, residues);
         }
     }
 
-    public loadPdb(pdbId: string,
-                   chainId: string,
-                   residues: IResidueSpec[] = this.state.residues,
-                   props:IStructureVisualizerProps = this.props)
-    {
+    public loadPdb(
+        pdbId: string,
+        chainId: string,
+        residues: IResidueSpec[] = this.state.residues,
+        props: IStructureVisualizerProps = this.props
+    ) {
         const options = {
             doAssembly: true,
-            pdbUri: props.pdbUri
+            pdbUri: props.pdbUri,
             // multiMode: true,
             // frames: true
         };
@@ -181,7 +211,9 @@ export default class StructureVisualizer3D extends StructureVisualizer
 
         // update state
         this.setState({
-            pdbId, chainId, residues
+            pdbId,
+            chainId,
+            residues,
         } as IStructureVisualizerState);
 
         if (this._3dMolViewer) {
@@ -190,58 +222,63 @@ export default class StructureVisualizer3D extends StructureVisualizer
 
             // TODO handle download error
             // init download
-            this._3dMol.download(`pdb:${pdbId.toUpperCase()}`, this._3dMolViewer, options, () => {
-                // update load state (mark as finished)
-                this._loadingPdb = false;
-                // use the global state instead of the local variables,
-                // since the state might be updated before the pdb download ends
-                this.onStateChange(this.state);
-            });
-        }
-        else {
+            this._3dMol.download(
+                `pdb:${pdbId.toUpperCase()}`,
+                this._3dMolViewer,
+                options,
+                () => {
+                    // update load state (mark as finished)
+                    this._loadingPdb = false;
+                    // use the global state instead of the local variables,
+                    // since the state might be updated before the pdb download ends
+                    this.onStateChange(this.state);
+                }
+            );
+        } else {
             // update load state (mark as finished)
             this._loadingPdb = false;
         }
     }
 
-    public updateViewer(chainId: string,
-                        residues: IResidueSpec[] = this.state.residues,
-                        props:IStructureVisualizerProps = this.props)
-    {
+    public updateViewer(
+        chainId: string,
+        residues: IResidueSpec[] = this.state.residues,
+        props: IStructureVisualizerProps = this.props
+    ) {
         // update global references
         this.setProps(props);
         this.setState({
-            chainId, residues
+            chainId,
+            residues,
         } as IStructureVisualizerState);
     }
 
-    public resize()
-    {
+    public resize() {
         if (this._3dMolViewer) {
             this._3dMolViewer.resize();
         }
     }
 
-    protected selectAll()
-    {
+    protected selectAll() {
         return {};
     }
 
-    protected selectChain(chainId: string)
-    {
-        return {chain: chainId};
+    protected selectChain(chainId: string) {
+        return { chain: chainId };
     }
 
-    protected setScheme(scheme: ProteinScheme, selector?: AtomSelectionSpec)
-    {
+    protected setScheme(scheme: ProteinScheme, selector?: AtomSelectionSpec) {
         const style = StructureVisualizer3D.PROTEIN_SCHEME_PRESETS[scheme];
         this.applyStyleForSelector(selector, style);
 
         return style;
     }
 
-    protected setColor(color: string, selector?: AtomSelectionSpec, style?: AtomStyleSpec)
-    {
+    protected setColor(
+        color: string,
+        selector?: AtomSelectionSpec,
+        style?: AtomStyleSpec
+    ) {
         const visColor = this.formatColor(color);
 
         if (style) {
@@ -254,39 +291,40 @@ export default class StructureVisualizer3D extends StructureVisualizer
         }
     }
 
-    protected formatColor(color: string)
-    {
+    protected formatColor(color: string) {
         // this is for 3Dmol.js compatibility
         // (colors should start with an "0x" instead of "#")
-        return color.replace("#", "0x");
+        return color.replace('#', '0x');
     }
 
-
-    protected setTransparency(transparency: number, selector?: AtomSelectionSpec, style?: AtomStyleSpec)
-    {
+    protected setTransparency(
+        transparency: number,
+        selector?: AtomSelectionSpec,
+        style?: AtomStyleSpec
+    ) {
         if (style) {
             this.addTransparencyToStyle(transparency, style);
             this.applyStyleForSelector(selector, style);
         }
     }
 
-    protected addTransparencyToStyle(transparency: number, style: any)
-    {
+    protected addTransparencyToStyle(transparency: number, style: any) {
         _.each(style, (spec: StyleSpec, key: string) => {
             // TODO sphere opacity is not supported by 3Dmol.js so excluding sphere style for now
-            if (key !== "sphere") {
+            if (key !== 'sphere') {
                 spec.opacity = (10 - transparency) / 10;
             }
         });
     }
 
-    protected rainbowColor(selector?: AtomSelectionSpec, style?: AtomStyleSpec)
-    {
-        this.setColor("spectrum", selector, style);
+    protected rainbowColor(
+        selector?: AtomSelectionSpec,
+        style?: AtomStyleSpec
+    ) {
+        this.setColor('spectrum', selector, style);
     }
 
-    protected cpkColor(selector?: AtomSelectionSpec, style?: AtomStyleSpec)
-    {
+    protected cpkColor(selector?: AtomSelectionSpec, style?: AtomStyleSpec) {
         if (style) {
             _.each(style, (spec: StyleSpec) => {
                 // remove previous single color (if any)
@@ -300,34 +338,39 @@ export default class StructureVisualizer3D extends StructureVisualizer
         }
     }
 
-    protected selectAlphaHelix(chainId: string)
-    {
-        return {chain: chainId, ss: "h"};
+    protected selectAlphaHelix(chainId: string) {
+        return { chain: chainId, ss: 'h' };
     }
 
-    protected selectBetaSheet(chainId: string)
-    {
-        return {chain: chainId, ss: "s"};
+    protected selectBetaSheet(chainId: string) {
+        return { chain: chainId, ss: 's' };
     }
 
-    protected hideBoundMolecules()
-    {
+    protected hideBoundMolecules() {
         // since there is no built-in "restrict protein" command,
         // we need to select all non-protein structure...
         const selector = {
             resn: StructureVisualizer3D.ALL_PROTEINS,
-            invert: true
+            invert: true,
         };
 
-        const style = {sphere: {hidden: true}};
+        const style = { sphere: { hidden: true } };
 
         this._3dMolViewer.setStyle(selector, style);
     }
 
-    protected enableBallAndStick(color?: string, selector?: AtomSelectionSpec, style?: AtomStyleSpec)
-    {
+    protected enableBallAndStick(
+        color?: string,
+        selector?: AtomSelectionSpec,
+        style?: AtomStyleSpec
+    ) {
         // extend current style with ball and stick
-        const bnsStyle = {...style, ...StructureVisualizer3D.PROTEIN_SCHEME_PRESETS[ProteinScheme.BALL_AND_STICK]};
+        const bnsStyle = {
+            ...style,
+            ...StructureVisualizer3D.PROTEIN_SCHEME_PRESETS[
+                ProteinScheme.BALL_AND_STICK
+            ],
+        };
 
         // use the color if provided
         if (color) {
@@ -350,17 +393,24 @@ export default class StructureVisualizer3D extends StructureVisualizer
         this._3dMolViewer.setStyle(selector, bnsStyle);
     }
 
-    protected updateResidueStyle(residues: IResidueSpec[],
-                                 chainId: string,
-                                 props: IStructureVisualizerProps = this.props,
-                                 style?: AtomStyleSpec)
-    {
+    protected updateResidueStyle(
+        residues: IResidueSpec[],
+        chainId: string,
+        props: IStructureVisualizerProps = this.props,
+        style?: AtomStyleSpec
+    ) {
         const defaultProps = StructureVisualizer.defaultProps;
 
         if (!style) {
-            style = StructureVisualizer3D.PROTEIN_SCHEME_PRESETS[props.proteinScheme];
+            style =
+                StructureVisualizer3D.PROTEIN_SCHEME_PRESETS[
+                    props.proteinScheme
+                ];
             // need to add transparency to the style, otherwise we got weird visualization
-            this.addTransparencyToStyle(props.chainTranslucency || defaultProps.chainTranslucency, style);
+            this.addTransparencyToStyle(
+                props.chainTranslucency || defaultProps.chainTranslucency,
+                style
+            );
         }
 
         let residueHelpers: IResidueHelper[] = this.residuesToUpdate;
@@ -368,11 +418,12 @@ export default class StructureVisualizer3D extends StructureVisualizer
         residueHelpers.forEach((residueHelper: IResidueHelper) => {
             let residue = residueHelper.residue;
             let selector = this.selectResidue(residueHelper.selector, chainId);
-            let color: string|undefined;
+            let color: string | undefined;
 
             // use the highlight color if highlighted (always color highlighted residues)
             if (residue.highlighted) {
-                color = this.props.highlightColor || defaultProps.highlightColor;
+                color =
+                    this.props.highlightColor || defaultProps.highlightColor;
             }
             // use the provided color
             else if (props.mutationColor === MutationColor.MUTATION_TYPE) {
@@ -381,7 +432,9 @@ export default class StructureVisualizer3D extends StructureVisualizer
             // use a uniform color
             else if (props.mutationColor === MutationColor.UNIFORM) {
                 // color with a uniform mutation color
-                color = props.uniformMutationColor || defaultProps.uniformMutationColor;
+                color =
+                    props.uniformMutationColor ||
+                    defaultProps.uniformMutationColor;
             }
             // NONE: color with chain color
             else {
@@ -390,53 +443,58 @@ export default class StructureVisualizer3D extends StructureVisualizer
 
             this.setColor(color, selector, style);
 
-            const displaySideChain = props.sideChain === SideChain.ALL ||
-                (residue.highlighted === true && props.sideChain === SideChain.SELECTED);
+            const displaySideChain =
+                props.sideChain === SideChain.ALL ||
+                (residue.highlighted === true &&
+                    props.sideChain === SideChain.SELECTED);
 
             // show side chains
             if (displaySideChain) {
-                this.updateSideChain(chainId,
+                this.updateSideChain(
+                    chainId,
                     residueHelper.selector,
                     props.proteinScheme,
                     color,
-                    style);
+                    style
+                );
             }
         });
     }
 
-    protected updateScheme(props: IStructureVisualizerProps)
-    {
+    protected updateScheme(props: IStructureVisualizerProps) {
         if (!this.needToUpdateResiduesOnly) {
             return super.updateScheme(props);
-        }
-        else {
+        } else {
             return undefined;
         }
     }
 
-    protected updateBaseVisualStyle(style: any,
-                                    props: IStructureVisualizerProps)
-    {
+    protected updateBaseVisualStyle(
+        style: any,
+        props: IStructureVisualizerProps
+    ) {
         if (!this.needToUpdateResiduesOnly) {
             super.updateBaseVisualStyle(style, props);
         }
     }
 
-    protected updateChainVisualStyle(chainId: string,
-                                     style: any,
-                                     props: IStructureVisualizerProps)
-    {
+    protected updateChainVisualStyle(
+        chainId: string,
+        style: any,
+        props: IStructureVisualizerProps
+    ) {
         if (!this.needToUpdateResiduesOnly) {
             super.updateChainVisualStyle(chainId, style, props);
         }
     }
 
-    @computed get residuesToUpdate(): IResidueHelper[]
-    {
+    @computed get residuesToUpdate(): IResidueHelper[] {
         if (this.needToUpdateResiduesOnly) {
-            return findUpdatedResidues(this.currentResidueToPositionMap, this.prevResidueToPositionMap);
-        }
-        else {
+            return findUpdatedResidues(
+                this.currentResidueToPositionMap,
+                this.prevResidueToPositionMap
+            );
+        } else {
             // update all the residues
             return _.flatten(_.values(this.currentResidueToPositionMap));
         }
@@ -449,8 +507,7 @@ export default class StructureVisualizer3D extends StructureVisualizer
      *    - Visual properties not updated
      *    - Number of residues and residue positions remain the same
      */
-    @computed get needToUpdateResiduesOnly(): boolean
-    {
+    @computed get needToUpdateResiduesOnly(): boolean {
         return (
             this._prevState.pdbId === this.state.pdbId &&
             this._prevState.chainId === this.state.chainId &&
@@ -459,56 +516,64 @@ export default class StructureVisualizer3D extends StructureVisualizer
         );
     }
 
-    @computed get residuePositionsUnchanged(): boolean
-    {
-        return _.isEqual(_.keys(this.currentResidueToPositionMap).sort(),
-            _.keys(this.prevResidueToPositionMap).sort());
+    @computed get residuePositionsUnchanged(): boolean {
+        return _.isEqual(
+            _.keys(this.currentResidueToPositionMap).sort(),
+            _.keys(this.prevResidueToPositionMap).sort()
+        );
     }
 
-    @computed get currentResidueToPositionMap(): {[residue: number]: IResidueHelper[]}
-    {
+    @computed get currentResidueToPositionMap(): {
+        [residue: number]: IResidueHelper[];
+    } {
         return generateResiduePosToSelectorMap(this.state.residues);
     }
 
-    @computed get prevResidueToPositionMap(): {[residue: number]: IResidueHelper[]}
-    {
+    @computed get prevResidueToPositionMap(): {
+        [residue: number]: IResidueHelper[];
+    } {
         return generateResiduePosToSelectorMap(this._prevState.residues);
     }
 
-    @computed get visualPropsUnchanged(): boolean
-    {
-        return _.isEqual(_.omit(this.props, ["pdbId", "chainId", "residues"]),
-            _.omit(this._prevProps, ["pdbId", "chainId", "residues"]));
+    @computed get visualPropsUnchanged(): boolean {
+        return _.isEqual(
+            _.omit(this.props, ['pdbId', 'chainId', 'residues']),
+            _.omit(this._prevProps, ['pdbId', 'chainId', 'residues'])
+        );
     }
 
     /**
      * Updates the visual style (scheme, coloring, selection, etc.)
      */
-    public updateVisualStyle(residues: IResidueSpec[],
-                             chainId: string,
-                             props: IStructureVisualizerProps = this.props)
-    {
+    public updateVisualStyle(
+        residues: IResidueSpec[],
+        chainId: string,
+        props: IStructureVisualizerProps = this.props
+    ) {
         super.updateVisualStyle(residues, chainId, props);
     }
 
-    protected selectResidues(residueCodes: string[], chainId: string)
-    {
+    protected selectResidues(residueCodes: string[], chainId: string) {
         return {
             rescode: residueCodes,
-            chain: chainId
+            chain: chainId,
         };
     }
 
-    protected selectResidue(residueSelector: IResidueSelector, chainId: string)
-    {
+    protected selectResidue(
+        residueSelector: IResidueSelector,
+        chainId: string
+    ) {
         return {
             chain: chainId,
-            ...residueSelector
+            ...residueSelector,
         };
     }
 
-    protected selectSideChains(residueSelector: IResidueSelector, chainId: string)
-    {
+    protected selectSideChains(
+        residueSelector: IResidueSelector,
+        chainId: string
+    ) {
         // we are not able to select side chain atoms...
         // return {
         //     ...,
@@ -523,25 +588,27 @@ export default class StructureVisualizer3D extends StructureVisualizer
      * Show/hide the side chain for the given residues.
      * Residue codes can be in the form of "666" or "666:C", both are fine.
      */
-    protected updateSideChain(chainId: string,
-                              residueSelector: IResidueSelector,
-                              proteinScheme: ProteinScheme,
-                              color?: string,
-                              style?: AtomStyleSpec)
-    {
+    protected updateSideChain(
+        chainId: string,
+        residueSelector: IResidueSelector,
+        proteinScheme: ProteinScheme,
+        color?: string,
+        style?: AtomStyleSpec
+    ) {
         // display side chain (no effect for space-filling)
-        if (!(proteinScheme === ProteinScheme.SPACE_FILLING))
-        {
+        if (!(proteinScheme === ProteinScheme.SPACE_FILLING)) {
             // select the corresponding side chain and also the CA atom on the backbone
             const selector = this.selectSideChains(residueSelector, chainId);
 
             // display the side chain with ball&stick style
             this.enableBallAndStick(color, selector, style);
         }
-    };
+    }
 
-    protected applyStyleForSelector(selector: AtomSelectionSpec, style: AtomStyleSpec)
-    {
+    protected applyStyleForSelector(
+        selector: AtomSelectionSpec,
+        style: AtomStyleSpec
+    ) {
         this._3dMolViewer.setStyle(selector, style);
     }
 }
diff --git a/src/shared/components/structureViewer/structureViewer.module.scss b/src/shared/components/structureViewer/structureViewer.module.scss
index 5eb3476da90..dd98f8345f3 100644
--- a/src/shared/components/structureViewer/structureViewer.module.scss
+++ b/src/shared/components/structureViewer/structureViewer.module.scss
@@ -1,88 +1,88 @@
 .main-3d-panel {
-  width: 480px;
-  position: absolute;
-  float: right;
-  overflow: hidden;
-  right: 0;
-  top: 0;
-  z-index: 100;
-  border:1px solid $borderColor;
-  border-radius: $cornerBorderRadius;
-  background-color: #FFFFFF;
-  /* fix for bootstrap 3 */
-  box-sizing: content-box;
+    width: 480px;
+    position: absolute;
+    float: right;
+    overflow: hidden;
+    right: 0;
+    top: 0;
+    z-index: 100;
+    border: 1px solid $borderColor;
+    border-radius: $cornerBorderRadius;
+    background-color: #ffffff;
+    /* fix for bootstrap 3 */
+    box-sizing: content-box;
 }
 
 .header {
-  padding: 5px 30px 0;
+    padding: 5px 30px 0;
 }
 
 .body {
-  padding: 5px 30px 15px;
+    padding: 5px 30px 15px;
 }
 
 .collapsed-panel {
-  height: 0;
-  padding: 0 30px;
-  overflow: hidden;
+    height: 0;
+    padding: 0 30px;
+    overflow: hidden;
 }
 
 .increased-size-panel {
-  width: auto;
+    width: auto;
 }
 
 .main-3d-panel canvas {
-  position: relative !important;
+    position: relative !important;
 }
 
 .default-option-select {
-  height: 28px !important;
-  padding: 3px 6px !important;
-  font-size: 13px !important;
-  width: 98% !important;
+    height: 28px !important;
+    padding: 3px 6px !important;
+    font-size: 13px !important;
+    width: 98% !important;
 }
 
 .main-3d-panel hr {
-  margin-top: 5px !important;
-  margin-bottom: 5px !important;
+    margin-top: 5px !important;
+    margin-bottom: 5px !important;
 }
 
 .alpha-helix {
-  font-weight: bold;
-  color: #FFA500;
+    font-weight: bold;
+    color: #ffa500;
 }
 
 .beta-sheet {
-  font-weight: bold;
-  color: #0000FF;
+    font-weight: bold;
+    color: #0000ff;
 }
 
 .loop {
-  font-weight: bold;
-  color: #888888;
+    font-weight: bold;
+    color: #888888;
 }
 
 .highlighted {
-  color: #FFDD00;
-  font-weight: bold;
+    color: #ffdd00;
+    font-weight: bold;
 }
 
 .uniform-mutation {
-  color: #8A2BE2;
-  font-weight: bold;
+    color: #8a2be2;
+    font-weight: bold;
 }
 
 .missense-mutation {
-  color: #008000;
-  font-weight: bold;
+    color: #008000;
+    font-weight: bold;
 }
 
 .trunc-mutation {
-  color: #000000;
-  font-weight: bold;
+    color: #000000;
+    font-weight: bold;
 }
 
 .inframe-mutation {
-  color: #8B4513;
-  font-weight: bold;
+    color: #8b4513;
+    font-weight: bold;
 }
diff --git a/src/shared/components/studyTagsTooltip/StudyTagsTooltip.scss b/src/shared/components/studyTagsTooltip/StudyTagsTooltip.scss
index efb0973fd0f..93388efdc7b 100644
--- a/src/shared/components/studyTagsTooltip/StudyTagsTooltip.scss
+++ b/src/shared/components/studyTagsTooltip/StudyTagsTooltip.scss
@@ -14,43 +14,42 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  **/
 
- .studyTagsTooltip{
+.studyTagsTooltip {
     max-height: 45vh;
-    overflow: auto; 
-  
+    overflow: auto;
+
     .json-to-table table {
         width: 100%;
         border-collapse: collapse;
         font-family: sans-serif;
         font-size: 0.7rem;
         background-color: #fff;
-      }
-      
-      .json-to-table td,
-      .json-to-table th {
+    }
+
+    .json-to-table td,
+    .json-to-table th {
         padding: 5px;
-        border: 1px solid #E2E2E2;
-      }
-      
-      .json-to-table td {
+        border: 1px solid #e2e2e2;
+    }
+
+    .json-to-table td {
         text-align: left;
-      }
-      
-      .json-to-table tr:nth-child(even) {
+    }
+
+    .json-to-table tr:nth-child(even) {
         background-color: #fff;
-      }
-      
-      .json-to-table th[scope="col"] {
+    }
+
+    .json-to-table th[scope='col'] {
         background-color: #fff;
         color: #fff;
-      }
-      
-      .json-to-table th[scope="row"] {
+    }
+
+    .json-to-table th[scope='row'] {
         background-color: #d7d9f2;
-      }
-      
-      .json-to-table caption {
+    }
+
+    .json-to-table caption {
         caption-side: bottom;
-      }
- }
- 
+    }
+}
diff --git a/src/shared/components/studyTagsTooltip/StudyTagsTooltip.tsx b/src/shared/components/studyTagsTooltip/StudyTagsTooltip.tsx
index 4e5691f2c98..43ed516460e 100644
--- a/src/shared/components/studyTagsTooltip/StudyTagsTooltip.tsx
+++ b/src/shared/components/studyTagsTooltip/StudyTagsTooltip.tsx
@@ -23,11 +23,11 @@
 
 import * as React from 'react';
 import { observer } from 'mobx-react';
-import { observable } from "mobx";
+import { observable } from 'mobx';
 import { JsonToTable } from 'react-json-to-table';
 import './StudyTagsTooltip.scss';
 import { DefaultTooltip, remoteData } from 'cbioportal-frontend-commons';
-import client from "shared/api/cbioportalClientInstance";
+import client from 'shared/api/cbioportalClientInstance';
 import Loader from '../loadingIndicator/LoadingIndicator';
 
 export type StudyTagsTooltipProps = {
@@ -47,57 +47,89 @@ export type StudyInfoOverlayTooltipProps = {
 };
 
 @observer
-default class StudyInfoOverlay extends React.Component<StudyInfoOverlayTooltipProps, {}> {
+class StudyInfoOverlay extends React.Component<
+    StudyInfoOverlayTooltipProps,
+    {}
+> {
     @observable readonly studyMetadata = remoteData({
         invoke: async () => {
-            return client.getTagsUsingGET({studyId: this.props.studyId});
+            return client.getTagsUsingGET({ studyId: this.props.studyId });
+        },
+        onError: error => {
+            console.error('Error on getting study tags.', error);
         },
-        onError: (error) => {
-            console.error("Error on getting study tags.", error);
-        }
     });
 
-    addHTMLDescription(description:string) {
-        return {__html: description};
+    addHTMLDescription(description: string) {
+        return { __html: description };
     }
 
     render() {
-        let overlay:any = '';
+        let overlay: any = '';
         if (this.props.isVirtualStudy) {
-            overlay = <div dangerouslySetInnerHTML={this.addHTMLDescription(this.props.studyDescription)}/>;
+            overlay = (
+                <div
+                    dangerouslySetInnerHTML={this.addHTMLDescription(
+                        this.props.studyDescription
+                    )}
+                />
+            );
         } else {
             if (this.studyMetadata.isPending) {
-                overlay = <Loader isLoading={true}/>;
-            }
-            else if (this.studyMetadata.isComplete) {
-                const resultKeyLength = Object.keys(this.studyMetadata.result).length;
-                const description = <div dangerouslySetInnerHTML={this.addHTMLDescription(this.props.studyDescription)}/>;
-                overlay = resultKeyLength > 0 ? ([description, <br/>, <div className="studyTagsTooltip"> <JsonToTable json={this.studyMetadata.result}/></div>]) : description;
-            }
-            else if (this.studyMetadata.isError) {
+                overlay = <Loader isLoading={true} />;
+            } else if (this.studyMetadata.isComplete) {
+                const resultKeyLength = Object.keys(this.studyMetadata.result)
+                    .length;
+                const description = (
+                    <div
+                        dangerouslySetInnerHTML={this.addHTMLDescription(
+                            this.props.studyDescription
+                        )}
+                    />
+                );
+                overlay =
+                    resultKeyLength > 0
+                        ? [
+                              description,
+                              <br />,
+                              <div className="studyTagsTooltip">
+                                  {' '}
+                                  <JsonToTable
+                                      json={this.studyMetadata.result}
+                                  />
+                              </div>,
+                          ]
+                        : description;
+            } else if (this.studyMetadata.isError) {
                 overlay = 'error';
             }
         }
-        
+
         return overlay;
     }
 }
 
 @observer
-export default class StudyTagsTooltip extends React.Component<StudyTagsTooltipProps, {}> {
-
+export default class StudyTagsTooltip extends React.Component<
+    StudyTagsTooltipProps,
+    {}
+> {
     renderTooltip() {
-        return (<DefaultTooltip
-            key={this.props.key}
-            mouseEnterDelay={this.props.mouseEnterDelay}
-            placement={this.props.placement}
-            overlay={<StudyInfoOverlay
+        return (
+            <DefaultTooltip
+                key={this.props.key}
+                mouseEnterDelay={this.props.mouseEnterDelay}
+                placement={this.props.placement}
+                overlay={
+                    <StudyInfoOverlay
                         studyDescription={this.props.studyDescription}
                         studyId={this.props.studyId}
                         isVirtualStudy={this.props.isVirtualStudy}
-                    />}
-            children={this.props.children}
-        />);
+                    />
+                }
+                children={this.props.children}
+            />
+        );
     }
 
     render() {
diff --git a/src/shared/components/tableHeaderControls/TableHeaderControls.spec.tsx b/src/shared/components/tableHeaderControls/TableHeaderControls.spec.tsx
index b8d43d1a76c..09760368f4c 100644
--- a/src/shared/components/tableHeaderControls/TableHeaderControls.spec.tsx
+++ b/src/shared/components/tableHeaderControls/TableHeaderControls.spec.tsx
@@ -1,34 +1,36 @@
 import * as React from 'react';
-import {assert} from "chai";
-import TableHeaderControls from "./TableHeaderControls";
+import { assert } from 'chai';
+import TableHeaderControls from './TableHeaderControls';
 import sinon from 'sinon';
-import {mount, shallow, ReactWrapper} from 'enzyme';
-import {ColumnVisibilityControls} from "../columnVisibilityControls/ColumnVisibilityControls";
-import {PaginationControls} from "../paginationControls/PaginationControls";
-import {ITableHeaderControlsProps} from "./TableHeaderControls";
-
+import { mount, shallow, ReactWrapper } from 'enzyme';
+import { ColumnVisibilityControls } from '../columnVisibilityControls/ColumnVisibilityControls';
+import { PaginationControls } from '../paginationControls/PaginationControls';
+import { ITableHeaderControlsProps } from './TableHeaderControls';
 
 describe('TableHeaderControls', () => {
-
-    let wrapper: ReactWrapper<ITableHeaderControlsProps,{}>;
+    let wrapper: ReactWrapper<ITableHeaderControlsProps, {}>;
     let inputStub: sinon.SinonStub;
 
-    before(()=> {
-        inputStub = sinon.stub(TableHeaderControls.prototype, "handleInput");
+    before(() => {
+        inputStub = sinon.stub(TableHeaderControls.prototype, 'handleInput');
 
-        wrapper = mount(<TableHeaderControls searchClassName={searchClassName} copyDownloadClassName={copyClassName}  />);
+        wrapper = mount(
+            <TableHeaderControls
+                searchClassName={searchClassName}
+                copyDownloadClassName={copyClassName}
+            />
+        );
     });
 
-    after(()=>{
+    after(() => {
         inputStub.restore();
     });
 
-    it('bindCopyButton is called only when there is a copy button and props flag is true', ()=>{
-
+    it('bindCopyButton is called only when there is a copy button and props flag is true', () => {
         let mockInstance = {
             bindCopyButton: sinon.stub(),
             props: { showCopyAndDownload: true },
-            _copyButton: {}
+            _copyButton: {},
         };
 
         TableHeaderControls.prototype.componentDidMount.apply(mockInstance);
@@ -38,7 +40,7 @@ describe('TableHeaderControls', () => {
         mockInstance = {
             bindCopyButton: sinon.stub(),
             props: { showCopyAndDownload: false },
-            _copyButton: {}
+            _copyButton: {},
         };
 
         TableHeaderControls.prototype.componentDidMount.apply(mockInstance);
@@ -46,50 +48,55 @@ describe('TableHeaderControls', () => {
         assert.isFalse(mockInstance.bindCopyButton.called);
     });
 
-    const copyClassName = "copyClassName";
-    const searchClassName = "searchClassName";
-
-
-    it('Renders child controls according to prop flags', ()=>{
-
+    const copyClassName = 'copyClassName';
+    const searchClassName = 'searchClassName';
 
+    it('Renders child controls according to prop flags', () => {
         wrapper.setProps({
-            showHideShowColumnButton:false,
+            showHideShowColumnButton: false,
             showPagination: false,
             showCopyAndDownload: false,
-            showSearch:false
+            showSearch: false,
         });
-        assert.equal( wrapper.find(ColumnVisibilityControls).length,  0 );
-        assert.equal( wrapper.find(PaginationControls).length, 0 );
-        assert.equal( wrapper.find(`.${copyClassName}`).length, 0 );
-        assert.equal( wrapper.find(`.${searchClassName}`).length, 0 );
+        assert.equal(wrapper.find(ColumnVisibilityControls).length, 0);
+        assert.equal(wrapper.find(PaginationControls).length, 0);
+        assert.equal(wrapper.find(`.${copyClassName}`).length, 0);
+        assert.equal(wrapper.find(`.${searchClassName}`).length, 0);
 
         wrapper.setProps({
-            showHideShowColumnButton:true,
+            showHideShowColumnButton: true,
             showPagination: true,
             showCopyAndDownload: true,
-            showSearch:true
+            showSearch: true,
         });
 
-        assert.equal( wrapper.find(ColumnVisibilityControls).length,  1, "ColumnVisibilityControls rendered once" );
-        assert.equal( wrapper.find(PaginationControls).length, 1 , "pagination controls rendered once");
-        assert.equal( wrapper.find(`div.${copyClassName}`).length, 1, "copy button rendered once");
-        assert.equal( wrapper.find(`.${searchClassName}`).length, 1, "search rendered once");
-
-
-
+        assert.equal(
+            wrapper.find(ColumnVisibilityControls).length,
+            1,
+            'ColumnVisibilityControls rendered once'
+        );
+        assert.equal(
+            wrapper.find(PaginationControls).length,
+            1,
+            'pagination controls rendered once'
+        );
+        assert.equal(
+            wrapper.find(`div.${copyClassName}`).length,
+            1,
+            'copy button rendered once'
+        );
+        assert.equal(
+            wrapper.find(`.${searchClassName}`).length,
+            1,
+            'search rendered once'
+        );
     });
 
-    it('input to search box causes handleInput to be called', ()=>{
-
-
+    it('input to search box causes handleInput to be called', () => {
         var input = wrapper.find('input.tableSearchInput');
 
-        input.simulate('input', {key: 'Enter'})
+        input.simulate('input', { key: 'Enter' });
 
         assert.isTrue(inputStub.called);
-
-
     });
-
-});
\ No newline at end of file
+});
diff --git a/src/shared/components/tableHeaderControls/TableHeaderControls.tsx b/src/shared/components/tableHeaderControls/TableHeaderControls.tsx
index 3501fbc1cc7..a6dee9ae1d4 100644
--- a/src/shared/components/tableHeaderControls/TableHeaderControls.tsx
+++ b/src/shared/components/tableHeaderControls/TableHeaderControls.tsx
@@ -1,16 +1,26 @@
-import * as React  from 'react';
-import {DefaultTooltip} from 'cbioportal-frontend-commons';
-import {Button, ButtonGroup, ButtonToolbar, Form, FormGroup, MenuItem} from 'react-bootstrap';
+import * as React from 'react';
+import { DefaultTooltip } from 'cbioportal-frontend-commons';
+import {
+    Button,
+    ButtonGroup,
+    ButtonToolbar,
+    Form,
+    FormGroup,
+    MenuItem,
+} from 'react-bootstrap';
 var ClipboardButton = require('react-clipboard.js');
 var Clipboard = require('clipboard');
 import fileDownload from 'react-file-download';
 import * as _ from 'lodash';
-import {PaginationControls, IPaginationControlsProps} from "../paginationControls/PaginationControls";
+import {
+    PaginationControls,
+    IPaginationControlsProps,
+} from '../paginationControls/PaginationControls';
 import { If } from 'react-if';
 import {
     IColumnVisibilityControlsProps,
-    ColumnVisibilityControls
-} from "../columnVisibilityControls/ColumnVisibilityControls";
+    ColumnVisibilityControls,
+} from '../columnVisibilityControls/ColumnVisibilityControls';
 
 export interface ITableHeaderControlsProps {
     tableData?: Array<any>;
@@ -20,97 +30,88 @@ export interface ITableHeaderControlsProps {
     showCopyAndDownload?: boolean;
     copyDownloadClassName?: string;
     showHideShowColumnButton?: boolean;
-    showPagination?:boolean;
+    showPagination?: boolean;
     handleInput?: Function;
     downloadDataGenerator?: Function;
     downloadDataContainsHeader?: boolean;
     downloadFilename?: string;
     paginationProps?: IPaginationControlsProps;
     columnVisibilityProps?: IColumnVisibilityControlsProps;
-    searchDelayMs?:number;
+    searchDelayMs?: number;
 }
 
-function serializeTableData(tableData: Array<any>, containsHeader?:boolean) {
-
+function serializeTableData(tableData: Array<any>, containsHeader?: boolean) {
     let content: Array<string> = [];
     let delim = ',';
 
     if (!containsHeader) {
         // try to get the header from object keys in case no header provided
         // if contains header, assuming that the first element represents the header values
-        Object.keys(tableData[0]).forEach((col: any)=>content.push(col,delim));
+        Object.keys(tableData[0]).forEach((col: any) =>
+            content.push(col, delim)
+        );
 
         content.pop();
         content.push('\r\n');
     }
 
     tableData.forEach((row: any) => {
-
-        _.each(row,(cell: string) => {
+        _.each(row, (cell: string) => {
             content.push(cell, delim);
         });
 
         content.pop();
         content.push('\r\n');
-
     });
 
     return content.join('');
 }
 
-export default class TableHeaderControls extends React.Component<ITableHeaderControlsProps, {}> {
-
-
-    private searchTimeout:number | null;
+export default class TableHeaderControls extends React.Component<
+    ITableHeaderControlsProps,
+    {}
+> {
+    private searchTimeout: number | null;
 
     private _copyButton: HTMLElement;
 
-    constructor(props:ITableHeaderControlsProps){
-
+    constructor(props: ITableHeaderControlsProps) {
         super(props);
 
-
         this.handleInput = this.handleInput.bind(this);
         this.getText = this.getText.bind(this);
-
     }
 
-    componentDidMount(){
-
+    componentDidMount() {
         // this is necessary because the clipboard wrapper library
         // doesn't work with tooltips :(
         if (this.props.showCopyAndDownload && this._copyButton) {
             this.bindCopyButton();
         }
-
     }
 
-    public bindCopyButton(){
-
+    public bindCopyButton() {
         new Clipboard(this._copyButton, {
             text: function() {
                 return this.getText();
-            }.bind(this)
+            }.bind(this),
         });
-
     }
 
     public static defaultProps: ITableHeaderControlsProps = {
-        showSearch:false,
-        showCopyAndDownload:true,
-        showPagination:false,
+        showSearch: false,
+        showCopyAndDownload: true,
+        showPagination: false,
         searchClassName: '',
         copyDownloadClassName: '',
         downloadFilename: 'patient-clinical-attributes.tsv',
         downloadDataContainsHeader: false,
-        paginationProps:{},
-        columnVisibilityProps:{},
-        searchDelayMs: 400
+        paginationProps: {},
+        columnVisibilityProps: {},
+        searchDelayMs: 400,
     };
 
-
-    public handleInput(evt: any){
-
+    public handleInput(evt: any) {
         if (this.searchTimeout !== null) {
             clearTimeout(this.searchTimeout);
             this.searchTimeout = null;
@@ -123,78 +124,120 @@ export default class TableHeaderControls extends React.Component<ITableHeaderCon
                 this.props.handleInput(filterValue);
             }
         }, this.props.searchDelayMs);
-
     }
 
     public render() {
-
-        const arrowContent = <div className="rc-tooltip-arrow-inner"/>;
+        const arrowContent = <div className="rc-tooltip-arrow-inner" />;
 
         return (
-            <div className={ (this.props.className || '') + '' }>
-
+            <div className={(this.props.className || '') + ''}>
                 <ButtonToolbar>
                     <If condition={this.props.showPagination}>
-                        <PaginationControls className="pull-left" {...this.props.paginationProps}/>
+                        <PaginationControls
+                            className="pull-left"
+                            {...this.props.paginationProps}
+                        />
                     </If>
 
                     <If condition={this.props.showHideShowColumnButton}>
-                        <ColumnVisibilityControls {...this.props.columnVisibilityProps}/>
+                        <ColumnVisibilityControls
+                            {...this.props.columnVisibilityProps}
+                        />
                     </If>
 
                     <If condition={this.props.showCopyAndDownload}>
-                        <ButtonGroup className={this.props.copyDownloadClassName} style={{ marginLeft:10 }}>
-
-                            <DefaultTooltip overlay={<span>Copy</span>} placement="top" mouseLeaveDelay={0} mouseEnterDelay={0.5}  arrowContent={arrowContent}>
-                                    <button ref={(el: HTMLButtonElement)=>{ this._copyButton = el }} className="btn btn-sm btn-default" option-text={ this.getText }>
-                                            <i className='fa fa-clipboard'/>
-                                    </button>
-                                </DefaultTooltip>
-
+                        <ButtonGroup
+                            className={this.props.copyDownloadClassName}
+                            style={{ marginLeft: 10 }}
+                        >
+                            <DefaultTooltip
+                                overlay={<span>Copy</span>}
+                                placement="top"
+                                mouseLeaveDelay={0}
+                                mouseEnterDelay={0.5}
+                                arrowContent={arrowContent}
+                            >
+                                <button
+                                    ref={(el: HTMLButtonElement) => {
+                                        this._copyButton = el;
+                                    }}
+                                    className="btn btn-sm btn-default"
+                                    option-text={this.getText}
+                                >
+                                    <i className="fa fa-clipboard" />
+                                </button>
+                            </DefaultTooltip>
 
-                            <DefaultTooltip overlay={<span>Download CSV</span>} mouseLeaveDelay={0} mouseEnterDelay={0.5} placement="top" arrowContent={arrowContent}>
-                                <Button className="btn-sm" onClick={this.downloadData}>
-                                    <i className='fa fa-cloud-download'/>
+                            <DefaultTooltip
+                                overlay={<span>Download CSV</span>}
+                                mouseLeaveDelay={0}
+                                mouseEnterDelay={0.5}
+                                placement="top"
+                                arrowContent={arrowContent}
+                            >
+                                <Button
+                                    className="btn-sm"
+                                    onClick={this.downloadData}
+                                >
+                                    <i className="fa fa-cloud-download" />
                                 </Button>
                             </DefaultTooltip>
                         </ButtonGroup>
                     </If>
 
                     <If condition={this.props.showSearch}>
-                        <div className={`${this.props.searchClassName} form-group has-feedback input-group-sm`} style={{ display:'inline-block', marginLeft:10  }}>
-                            <input type="text" onInput={this.handleInput} className="form-control tableSearchInput" style={{ width:200 }}  />
-                            <span className="fa fa-search form-control-feedback" aria-hidden="true"></span>
+                        <div
+                            className={`${this.props.searchClassName} form-group has-feedback input-group-sm`}
+                            style={{ display: 'inline-block', marginLeft: 10 }}
+                        >
+                            <input
+                                type="text"
+                                onInput={this.handleInput}
+                                className="form-control tableSearchInput"
+                                style={{ width: 200 }}
+                            />
+                            <span
+                                className="fa fa-search form-control-feedback"
+                                aria-hidden="true"
+                            ></span>
                         </div>
                     </If>
-
                 </ButtonToolbar>
-
             </div>
         );
     }
 
     public getText() {
         if (this.props.downloadDataGenerator) {
-            return serializeTableData(this.props.downloadDataGenerator() || [], this.props.downloadDataContainsHeader);
-        }
-        else {
-            return serializeTableData(this.props.tableData || [], this.props.downloadDataContainsHeader);
+            return serializeTableData(
+                this.props.downloadDataGenerator() || [],
+                this.props.downloadDataContainsHeader
+            );
+        } else {
+            return serializeTableData(
+                this.props.tableData || [],
+                this.props.downloadDataContainsHeader
+            );
         }
     }
 
     private downloadData = () => {
         if (this.props.downloadDataGenerator) {
             fileDownload(
-                serializeTableData(this.props.downloadDataGenerator() || [], this.props.downloadDataContainsHeader),
+                serializeTableData(
+                    this.props.downloadDataGenerator() || [],
+                    this.props.downloadDataContainsHeader
+                ),
                 this.props.downloadFilename
             );
-        }
-        else {
+        } else {
             fileDownload(
-                serializeTableData(this.props.tableData || [], this.props.downloadDataContainsHeader),
+                serializeTableData(
+                    this.props.tableData || [],
+                    this.props.downloadDataContainsHeader
+                ),
                 this.props.downloadFilename
             );
         }
-
     };
 }
diff --git a/src/shared/components/testimonials/Testimonials.tsx b/src/shared/components/testimonials/Testimonials.tsx
index 4734529c77c..296f9101acd 100644
--- a/src/shared/components/testimonials/Testimonials.tsx
+++ b/src/shared/components/testimonials/Testimonials.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
-import {observable, action} from "mobx";
-import {observer} from "mobx-react";
+import { observable, action } from 'mobx';
+import { observer } from 'mobx-react';
 import { Link } from 'react-router';
 
 import styles from './testimonials.module.scss';
@@ -11,12 +11,12 @@ export interface ITestimonial {
 }
 
 export class TestimonialStore {
-
     @observable public testimonialIndex: number;
     @observable public testimonials: ITestimonial[];
 
     @action incrementIndex() {
-        this.testimonialIndex = (this.testimonialIndex + 1) % this.testimonials.length;
+        this.testimonialIndex =
+            (this.testimonialIndex + 1) % this.testimonials.length;
     }
 
     constructor() {
@@ -24,7 +24,7 @@ export class TestimonialStore {
         this.testimonials = [
             {
                 cite: 'Clinical pathologist, Karolinska University Hospital',
-                quote: `You did a great service to the cancer research community and by that to the patients that donated the samples!.`
+                quote: `You did a great service to the cancer research community and by that to the patients that donated the samples!.`,
             },
             {
                 cite: 'Postdoctoral Fellow, Oregon Health & Science University',
@@ -32,43 +32,45 @@ export class TestimonialStore {
                         had a good answer for them. Now I do. The cBio Portal meets a critical need--it is the
                         interface that the cancer research community needs to access the wealth of TCGA. Even as a
                         computational biologist, I use it to follow-up on genes of interest. It makes querying
-                        the data much less painful.`
+                        the data much less painful.`,
             },
             {
                 cite: `Postdoctoral Fellow, Johns Hopkins University School of Medicine,
                        Dept Radiation Oncology and Molecular Radiation Sciences`,
                 quote: `Thank you for your incredible resource that has helped greatly in accessing the TCGA
-                        genomics data.`
+                        genomics data.`,
             },
             {
                 cite: 'Sr. Research Associate at Knight Cancer Institute/OHSU',
                 quote: `As a bench biologist with primary aim of determining gene aberrations in GBM, I found
                         your site absolutely fantastic! Thank you! I have to reiterate how awesome and user-friendly
                         your group has made this site - finally accomplishing the goal of having data easily accessible
-                        and meaningful.`
+                        and meaningful.`,
             },
             {
                 cite: 'Research Fellow at Massachusetts General Hospital',
                 quote: `I would like to congratulate you and the team of the cBio portal.
-                        It's just an amazing tool to work with, and we at Mass General really appreciate it.`
+                        It's just an amazing tool to work with, and we at Mass General really appreciate it.`,
             },
             {
                 cite: 'Sr. Software Engineer, Institute for Systems Biology',
                 quote: `I have been enjoying the ease with which TCGA data can be extracted in R using your CGDS package.
-                        Very nice work!`
+                        Very nice work!`,
             },
             {
                 cite: 'Research Fellow, Memorial Sloan-Kettering Cancer Center',
-                quote: `Thank you for generating such an excellent software. It is very useful for our research.`
+                quote: `Thank you for generating such an excellent software. It is very useful for our research.`,
             },
             {
-                cite: 'Scientist, Discovery Bioinformatics, Biotechnology Company',
-                quote: `Thank you very much for providing and maintaining this great resource.`
+                cite:
+                    'Scientist, Discovery Bioinformatics, Biotechnology Company',
+                quote: `Thank you very much for providing and maintaining this great resource.`,
             },
             {
-                cite: 'Postdoctoral Fellow, Harvard Medical School, Children\'s Hospital Boston',
+                cite:
+                    "Postdoctoral Fellow, Harvard Medical School, Children's Hospital Boston",
                 quote: `I want to thank you for the nice, useful and user-friendly interface you have generated
-                        and shared with the community.`
+                        and shared with the community.`,
             },
             {
                 cite: 'Associate Professor, University of Virginia',
@@ -76,32 +78,29 @@ export class TestimonialStore {
                         not only in glioblastoma, my primary focus, but in other cancers as well -- it's all so easy
                         with this fantastic tool. And I am enjoying showing it to my colleagues, whose jaws also drop.
                         Thank you a thousand times over for this beautiful public resource. I am looking forward to
-                        citing this soon in an upcoming paper...`
+                        citing this soon in an upcoming paper...`,
             },
         ];
         setInterval(() => this.incrementIndex(), 15000);
     }
-
 }
 
 @observer
-export default class Testimonials extends React.Component <{}, {}> {
+export default class Testimonials extends React.Component<{}, {}> {
+    private store: TestimonialStore;
 
-    private store:TestimonialStore;
-
-    constructor(props:any) {
+    constructor(props: any) {
         super(props);
 
         this.store = new TestimonialStore();
     }
 
-
     public render() {
         const { testimonials, testimonialIndex } = this.store;
         const activeTestimonial = testimonials[testimonialIndex];
         return (
             <div className={styles.testimonial}>
-                <div className='testimonial-blockquote' key={testimonialIndex}>
+                <div className="testimonial-blockquote" key={testimonialIndex}>
                     <p>"{activeTestimonial.quote}"</p>
                     <cite>--{activeTestimonial.cite}</cite>
                     <div className="testimonial-links">
diff --git a/src/shared/components/testimonials/testimonials.module.scss b/src/shared/components/testimonials/testimonials.module.scss
index 2406c796dd1..8250a9c2438 100644
--- a/src/shared/components/testimonials/testimonials.module.scss
+++ b/src/shared/components/testimonials/testimonials.module.scss
@@ -2,7 +2,6 @@
     position: relative;
 
     :global {
-
         .testimonial-blockquote {
             opacity: 1;
             position: absolute;
@@ -15,10 +14,9 @@
                 opacity: 0.01;
 
                 &.test-trans-enter-active {
-                   opacity: 1;
-                   transition: opacity 2000ms ease-in;
-                 }
-
+                    opacity: 1;
+                    transition: opacity 2000ms ease-in;
+                }
             }
 
             &.test-trans-leave {
@@ -28,25 +26,19 @@
                     opacity: 0.01;
                     transition: opacity 2000ms ease-in;
                 }
-
             }
-
         }
 
         .testimonial-links {
             margin-top: 10px;
 
-            a:first-child{
+            a:first-child {
                 float: left;
             }
 
             a:last-child {
                 float: right;
             }
-
         }
-
     }
-
 }
-
diff --git a/src/shared/components/textIconArea/TextIconArea.tsx b/src/shared/components/textIconArea/TextIconArea.tsx
index caa3f4ca1df..5cbf3214c00 100644
--- a/src/shared/components/textIconArea/TextIconArea.tsx
+++ b/src/shared/components/textIconArea/TextIconArea.tsx
@@ -4,15 +4,15 @@ import classNames from 'classnames';
 import _ from 'lodash';
 import ReactDOM from 'react-dom';
 import { observable } from 'mobx';
-import autobind from "autobind-decorator";
+import autobind from 'autobind-decorator';
 
 export interface ITextIconAreaProps {
     elements: ITextIconAreaItemProps[];
-    text:string;
+    text: string;
     placeholder?: string;
     classNames?: string[];
-    onIconClicked?: (itemValue:string) => void;
-    onChangeTextArea?: (textAreaContents:string) => string;
+    onIconClicked?: (itemValue: string) => void;
+    onChangeTextArea?: (textAreaContents: string) => string;
 }
 
 export interface ITextIconAreaItemProps {
@@ -29,42 +29,48 @@ export interface ITextIconAreaItemProps {
 // from the icon area.
 
 @observer
-class TextIconArea extends React.Component<ITextIconAreaProps, {text:string}> {
-
+class TextIconArea extends React.Component<
+    ITextIconAreaProps,
+    { text: string }
+> {
     // Shomehow the textare is not able to listen to updates of this field
     // from the parent with MobX. Instead, the parent callback 'onChangeTextArea'
     // returns a string that is used to update the textarea.
-    @observable textAreaContent:string = "";
-    timeout:NodeJS.Timer|undefined = undefined;
+    @observable textAreaContent: string = '';
+    timeout: NodeJS.Timer | undefined = undefined;
     TIMEOUT_DELAY = 750; // milliseconds
 
-    constructor(props:ITextIconAreaProps) {
+    constructor(props: ITextIconAreaProps) {
         super(props);
-        this.textUpdatedByUser = this.textUpdatedByUser.bind(this); 
+        this.textUpdatedByUser = this.textUpdatedByUser.bind(this);
         this.itemRemovedByUser = this.itemRemovedByUser.bind(this);
     }
 
-    private itemRemovedByUser = (event:any) => {
+    private itemRemovedByUser = (event: any) => {
         if (this.props.onIconClicked && event.target) {
             this.props.onIconClicked(event.target.id);
         }
-    }
-    
-    private textUpdatedByUser = (event:any) => {
+    };
+
+    private textUpdatedByUser = (event: any) => {
         this.textAreaContent = event.currentTarget.value;
         if (this.props.onChangeTextArea) {
             this.startTimedSubmit();
         }
-    }
+    };
 
     private startTimedSubmit() {
         this.stopTimedSubmit();
 
-        this.timeout = setTimeout(function() {
-            this.textAreaContent = this.props.onChangeTextArea(this.textAreaContent);
-            this.stopTimedSubmit();
-        }.bind(this), this.TIMEOUT_DELAY)
-
+        this.timeout = setTimeout(
+            function() {
+                this.textAreaContent = this.props.onChangeTextArea(
+                    this.textAreaContent
+                );
+                this.stopTimedSubmit();
+            }.bind(this),
+            this.TIMEOUT_DELAY
+        );
     }
 
     private stopTimedSubmit() {
@@ -73,40 +79,53 @@ class TextIconArea extends React.Component<ITextIconAreaProps, {text:string}> {
         }
     }
 
-    private onAreaClicked = (event:any) => {
-        const textArea:any = ReactDOM.findDOMNode(this.refs.textarea);
+    private onAreaClicked = (event: any) => {
+        const textArea: any = ReactDOM.findDOMNode(this.refs.textarea);
         textArea.focus();
-    }
+    };
 
     render() {
         return (
-            <div className={classNames("text-icon-area",this.props.classNames)}
-                onClick={this.onAreaClicked}>
-                <div className={classNames("icon-area",this.props.classNames)}>
-                    {this.props.elements.map((element:ITextIconAreaItemProps) => {
-                        return (
-                            <div className={classNames(element.classNames, "icon")}>
-                                {element.label}
-                                &nbsp;
-                                <div 
-                                    className={classNames("fa", "fa-times-circle", "icon-button")}
-                                    onClick={this.itemRemovedByUser}
-                                    id={element.value}
-                                />
-                            </div>
-                        )
-                    })}
+            <div
+                className={classNames('text-icon-area', this.props.classNames)}
+                onClick={this.onAreaClicked}
+            >
+                <div className={classNames('icon-area', this.props.classNames)}>
+                    {this.props.elements.map(
+                        (element: ITextIconAreaItemProps) => {
+                            return (
+                                <div
+                                    className={classNames(
+                                        element.classNames,
+                                        'icon'
+                                    )}
+                                >
+                                    {element.label}
+                                    &nbsp;
+                                    <div
+                                        className={classNames(
+                                            'fa',
+                                            'fa-times-circle',
+                                            'icon-button'
+                                        )}
+                                        onClick={this.itemRemovedByUser}
+                                        id={element.value}
+                                    />
+                                </div>
+                            );
+                        }
+                    )}
                 </div>
                 <textarea
-                    ref={"textarea"}
+                    ref={'textarea'}
                     placeholder={this.props.placeholder}
                     value={this.textAreaContent}
                     onInput={this.textUpdatedByUser}
-                    className={classNames("text-area",this.props.classNames)}
+                    className={classNames('text-area', this.props.classNames)}
                 ></textarea>
             </div>
-        )
+        );
     }
 }
 
-export default TextIconArea;
\ No newline at end of file
+export default TextIconArea;
diff --git a/src/shared/components/unknownStudies/UnknownStudiesWarning.tsx b/src/shared/components/unknownStudies/UnknownStudiesWarning.tsx
index 24ac3578536..babb75fb54c 100644
--- a/src/shared/components/unknownStudies/UnknownStudiesWarning.tsx
+++ b/src/shared/components/unknownStudies/UnknownStudiesWarning.tsx
@@ -1,17 +1,25 @@
 import * as React from 'react';
-import {observer} from "mobx-react";
+import { observer } from 'mobx-react';
 
 @observer
-export default class UnknownStudiesWarning extends React.Component<{ ids:String[] }, {}>{
-    render(){
+export default class UnknownStudiesWarning extends React.Component<
+    { ids: String[] },
+    {}
+> {
+    render() {
         if (this.props.ids.length > 0) {
             return (
-                <div className="alert alert-danger" data-test="unkown-study-warning" style={{marginBottom: 0}}>
-                    <i className="fa fa-exclamation-triangle"></i> The following studies do not exist or you do not have access to them:
-                    <ul style={{margin:"10px 0"}}>
-                    {
-                        this.props.ids.map((id)=><li>{id}</li>)
-                    }
+                <div
+                    className="alert alert-danger"
+                    data-test="unkown-study-warning"
+                    style={{ marginBottom: 0 }}
+                >
+                    <i className="fa fa-exclamation-triangle"></i> The following
+                    studies do not exist or you do not have access to them:
+                    <ul style={{ margin: '10px 0' }}>
+                        {this.props.ids.map(id => (
+                            <li>{id}</li>
+                        ))}
                     </ul>
                     Please resubmit your query below.
                 </div>
diff --git a/src/shared/components/unsupportedBrowserModal/UnsupportedBrowserModal.spec.tsx b/src/shared/components/unsupportedBrowserModal/UnsupportedBrowserModal.spec.tsx
index 8a817538185..48caadc5077 100644
--- a/src/shared/components/unsupportedBrowserModal/UnsupportedBrowserModal.spec.tsx
+++ b/src/shared/components/unsupportedBrowserModal/UnsupportedBrowserModal.spec.tsx
@@ -1,14 +1,13 @@
 import * as React from 'react';
 import { expect } from 'chai';
 import { shallow } from 'enzyme';
-import UnsupportedBrowserModal from "./UnsupportedBrowserModal";
+import UnsupportedBrowserModal from './UnsupportedBrowserModal';
 
 describe('UnsupportedBrowserModal', () => {
-
     let wrapper: any;
 
-    before(()=> {
-        wrapper = shallow(<UnsupportedBrowserModal/>);
+    before(() => {
+        wrapper = shallow(<UnsupportedBrowserModal />);
     });
 
     it('does not show modal when Chrome is being used', () => {
@@ -22,7 +21,7 @@ describe('UnsupportedBrowserModal', () => {
     });
 
     it('does not show when state is manually set to false', () => {
-        wrapper.instance().setState({show: false});
+        wrapper.instance().setState({ show: false });
         expect(wrapper.state('show')).to.equal(false);
     });
 
@@ -50,5 +49,4 @@ describe('UnsupportedBrowserModal', () => {
         wrapper.instance().handleUnsupportedBrowsers('msie', '11.0.0', false);
         expect(wrapper.state('show')).to.equal(false);
     });
-
 });
diff --git a/src/shared/components/unsupportedBrowserModal/UnsupportedBrowserModal.tsx b/src/shared/components/unsupportedBrowserModal/UnsupportedBrowserModal.tsx
index df5d283f10d..58edacea2fc 100644
--- a/src/shared/components/unsupportedBrowserModal/UnsupportedBrowserModal.tsx
+++ b/src/shared/components/unsupportedBrowserModal/UnsupportedBrowserModal.tsx
@@ -9,16 +9,18 @@ interface IBrowserState {
     noShowModal: boolean;
 }
 
-export default class UnsupportedBrowserModal extends React.Component<{}, IBrowserState> {
-
-    constructor(props:any) {
+export default class UnsupportedBrowserModal extends React.Component<
+    {},
+    IBrowserState
+> {
+    constructor(props: any) {
         super(props);
 
         this.state = {
             name: browser.name,
             show: false,
             version: browser.version.toString(),
-            noShowModal : window.localStorage.noShowModal || false
+            noShowModal: window.localStorage.noShowModal || false,
         };
 
         this.handleCheckboxChange = this.handleCheckboxChange.bind(this);
@@ -26,59 +28,95 @@ export default class UnsupportedBrowserModal extends React.Component<{}, IBrowse
     }
 
     componentDidMount() {
-        this.handleUnsupportedBrowsers(this.state.name, this.state.version, this.state.noShowModal);
+        this.handleUnsupportedBrowsers(
+            this.state.name,
+            this.state.version,
+            this.state.noShowModal
+        );
     }
 
-    handleCheckboxChange(e:any) {
-        this.setState({noShowModal: e.target.checked});
+    handleCheckboxChange(e: any) {
+        this.setState({ noShowModal: e.target.checked });
     }
 
     componentWillUnmount() {
         window.localStorage.noShowModal = this.state.noShowModal;
     }
 
-    handleUnsupportedBrowsers(name:string, version: string, localStorage: boolean) {
+    handleUnsupportedBrowsers(
+        name: string,
+        version: string,
+        localStorage: boolean
+    ) {
         if (localStorage) {
-            this.setState({show: false});
+            this.setState({ show: false });
             return;
         }
         const sessionStorage = window.sessionStorage.browserError || false;
         if (sessionStorage === true) {
-            this.setState({show: false});
+            this.setState({ show: false });
         } else {
             name = name.toLowerCase();
-            const isIE11 = (name === "internet explorer" || name === "msie") && Number(version.slice(0,2)) === 11;
+            const isIE11 =
+                (name === 'internet explorer' || name === 'msie') &&
+                Number(version.slice(0, 2)) === 11;
 
-            if (!(name === "chrome" || name === "firefox" || name === "microsoft edge" || name === "msedge" || name === "safari" || isIE11))  {
+            if (
+                !(
+                    name === 'chrome' ||
+                    name === 'firefox' ||
+                    name === 'microsoft edge' ||
+                    name === 'msedge' ||
+                    name === 'safari' ||
+                    isIE11
+                )
+            ) {
                 window.sessionStorage.browserError = true;
-                this.setState({show: true});
+                this.setState({ show: true });
             } else {
-                this.setState({show: false})
+                this.setState({ show: false });
                 window.sessionStorage.browserError = true;
             }
         }
     }
 
     handleHideClick() {
-        this.setState({show: false});
+        this.setState({ show: false });
         window.localStorage.noShowModal = this.state.noShowModal;
     }
 
     public render() {
-        const {show, name} = this.state;
+        const { show, name } = this.state;
         return (
             <Modal show={show} onHide={this.handleHideClick}>
                 <Modal.Header closeButton>
-                    <Modal.Title>Sorry, we do not support your browser version!</Modal.Title>
+                    <Modal.Title>
+                        Sorry, we do not support your browser version!
+                    </Modal.Title>
                 </Modal.Header>
                 <Modal.Body>
                     <ul>
-                        <li>It looks like your using an {name === 'msie' || name === 'internet explorer' ? 'old version of Internet Explorer' : 'unsupported browser'}.</li>
-                        <li>Please consider using the latest version of Chrome, Safari, Firefox or Microsoft Edge.</li>
+                        <li>
+                            It looks like your using an{' '}
+                            {name === 'msie' || name === 'internet explorer'
+                                ? 'old version of Internet Explorer'
+                                : 'unsupported browser'}
+                            .
+                        </li>
+                        <li>
+                            Please consider using the latest version of Chrome,
+                            Safari, Firefox or Microsoft Edge.
+                        </li>
                     </ul>
-                    <div style={{paddingLeft: 22}}>
-                        <input type="checkbox" onChange={this.handleCheckboxChange} checked={this.state.noShowModal}/>
-                        <span style={{paddingLeft: 10}}>Do not show me this pop-up again.</span>
+                    <div style={{ paddingLeft: 22 }}>
+                        <input
+                            type="checkbox"
+                            onChange={this.handleCheckboxChange}
+                            checked={this.state.noShowModal}
+                        />
+                        <span style={{ paddingLeft: 10 }}>
+                            Do not show me this pop-up again.
+                        </span>
                     </div>
                 </Modal.Body>
             </Modal>
diff --git a/src/shared/components/userMessager/UserMessage.tsx b/src/shared/components/userMessager/UserMessage.tsx
index 605565c9f2d..bbb1ed3e3d1 100644
--- a/src/shared/components/userMessager/UserMessage.tsx
+++ b/src/shared/components/userMessager/UserMessage.tsx
@@ -1,20 +1,20 @@
-import * as React from "react";
-import {observer} from "mobx-react";
-import {remoteData, isWebdriver} from "cbioportal-frontend-commons";
-import {action, computed, observable} from "mobx";
-import autobind from "autobind-decorator";
+import * as React from 'react';
+import { observer } from 'mobx-react';
+import { remoteData, isWebdriver } from 'cbioportal-frontend-commons';
+import { action, computed, observable } from 'mobx';
+import autobind from 'autobind-decorator';
 import * as _ from 'lodash';
 import styles from './styles.module.scss';
 import classNames from 'classnames';
 
 export interface IUserMessage {
-    dateStart?:number;
-    dateEnd:number;
-    content:string;
-    id:string;
-};
+    dateStart?: number;
+    dateEnd: number;
+    content: string;
+    id: string;
+}
 
-function makeMessageKey(id:string){
+function makeMessageKey(id: string) {
     return `portalMessageKey-${id}`;
 }
 
@@ -30,17 +30,21 @@ const MESSAGE_DATA: IUserMessage[] = [
 ];
 
 @observer
-export default class UserMessager extends React.Component<{ dataUrl?:string }, {}> {
-
-    messageData = remoteData<IUserMessage[]>(async ()=>{
+export default class UserMessager extends React.Component<
+    { dataUrl?: string },
+    {}
+> {
+    messageData = remoteData<IUserMessage[]>(async () => {
         return Promise.resolve(MESSAGE_DATA);
     });
 
     @observable dismissed = false;
 
-    get shownMessage(){
-        const messageToShow =  _.find(this.messageData.result,(message)=>{
-            const notYetShown = !localStorage.getItem(makeMessageKey(message.id));
+    get shownMessage() {
+        const messageToShow = _.find(this.messageData.result, message => {
+            const notYetShown = !localStorage.getItem(
+                makeMessageKey(message.id)
+            );
             const expired = Date.now() > message.dateEnd;
             return notYetShown && !expired;
         });
@@ -49,29 +53,37 @@ export default class UserMessager extends React.Component<{ dataUrl?:string }, {
     }
 
     @autobind
-    close(){
+    close() {
         this.markMessageDismissed(this.shownMessage!);
     }
 
     @action
-    markMessageDismissed(message:IUserMessage){
-        localStorage.setItem(makeMessageKey(message.id),"shown");
+    markMessageDismissed(message: IUserMessage) {
+        localStorage.setItem(makeMessageKey(message.id), 'shown');
         this.dismissed = true;
     }
 
-
-    render(){
-
-        if (!isWebdriver() && !this.dismissed && (this.messageData.isComplete && this.shownMessage)) {
-            return (<div className={styles.messager}>
-                        <i className={classNames(styles.close,'fa', 'fa-close')} onClick={this.close} />
-                        <div dangerouslySetInnerHTML={{__html:this.shownMessage!.content}}></div>
-                     </div>);
+    render() {
+        if (
+            !isWebdriver() &&
+            !this.dismissed &&
+            (this.messageData.isComplete && this.shownMessage)
+        ) {
+            return (
+                <div className={styles.messager}>
+                    <i
+                        className={classNames(styles.close, 'fa', 'fa-close')}
+                        onClick={this.close}
+                    />
+                    <div
+                        dangerouslySetInnerHTML={{
+                            __html: this.shownMessage!.content,
+                        }}
+                    ></div>
+                </div>
+            );
         } else {
             return null;
         }
-
-
-
     }
 }
diff --git a/src/shared/components/userMessager/styles.module.scss b/src/shared/components/userMessager/styles.module.scss
index c7c943ecdf7..6307fb37662 100644
--- a/src/shared/components/userMessager/styles.module.scss
+++ b/src/shared/components/userMessager/styles.module.scss
@@ -1,15 +1,14 @@
 .messager {
-  padding:10px;
-  background:green;
-  color:#fff;
-  font-size:14px;
-  position:relative;
+    padding: 10px;
+    background: green;
+    color: #fff;
+    font-size: 14px;
+    position: relative;
 
-
-  i.close {
-    position:absolute;
-    right:10px;
-    top:10px;
-    cursor:pointer;
-  }
+    i.close {
+        position: absolute;
+        right: 10px;
+        top: 10px;
+        cursor: pointer;
+    }
 }
diff --git a/src/shared/components/window/WindowStore.ts b/src/shared/components/window/WindowStore.ts
index b41612da82b..4319c07e547 100644
--- a/src/shared/components/window/WindowStore.ts
+++ b/src/shared/components/window/WindowStore.ts
@@ -1,3 +1,3 @@
-import {WindowWrapper} from "cbioportal-frontend-commons";
+import { WindowWrapper } from 'cbioportal-frontend-commons';
 
-export default new WindowWrapper();
\ No newline at end of file
+export default new WindowWrapper();
diff --git a/src/shared/components/wrappedTour/WrappedTour.tsx b/src/shared/components/wrappedTour/WrappedTour.tsx
index eae4c087e45..9d6cff67052 100644
--- a/src/shared/components/wrappedTour/WrappedTour.tsx
+++ b/src/shared/components/wrappedTour/WrappedTour.tsx
@@ -1,5 +1,5 @@
 import { useState } from 'react';
-import ReactTour from "reactour";
+import ReactTour from 'reactour';
 import * as React from 'react';
 
 export function WrappedTour() {
@@ -7,19 +7,37 @@ export function WrappedTour() {
     const [show, setShow] = useState(true);
 
     if (show) {
-        return <ReactTour
-            steps={[{ selector:'#groupManagementButton', content:()=><><h3>Group Comparison is here!</h3><a href={"/tutorials#group-comparison"} target={"_blank"}>Click here</a> to learn how to create custom groups of samples and open comparison sessions.</> }]}
-            isOpen={true}
-            showButtons={false}
-            showNavigation={false}
-            showNavigationNumber={false}
-            showNumber={false}
-            disableInteraction={true}
-            onRequestClose={()=>setShow(false)}
-            rounded={5}
-        />;
+        return (
+            <ReactTour
+                steps={[
+                    {
+                        selector: '#groupManagementButton',
+                        content: () => (
+                            <>
+                                <h3>Group Comparison is here!</h3>
+                                <a
+                                    href={'/tutorials#group-comparison'}
+                                    target={'_blank'}
+                                >
+                                    Click here
+                                </a>{' '}
+                                to learn how to create custom groups of samples
+                                and open comparison sessions.
+                            </>
+                        ),
+                    },
+                ]}
+                isOpen={true}
+                showButtons={false}
+                showNavigation={false}
+                showNavigationNumber={false}
+                showNumber={false}
+                disableInteraction={true}
+                onRequestClose={() => setShow(false)}
+                rounded={5}
+            />
+        );
     } else {
         return null;
     }
-
 }
diff --git a/src/shared/enums/ErrorEnums.ts b/src/shared/enums/ErrorEnums.ts
index 99db145578f..33a3c410ffe 100644
--- a/src/shared/enums/ErrorEnums.ts
+++ b/src/shared/enums/ErrorEnums.ts
@@ -1,5 +1,3 @@
 export enum ErrorMessages {
-
-    InvalidGenes = "INVALID GENE SYMBOLS"
-
-}
\ No newline at end of file
+    InvalidGenes = 'INVALID GENE SYMBOLS',
+}
diff --git a/src/shared/lib/AnnotationUtils.spec.tsx b/src/shared/lib/AnnotationUtils.spec.tsx
index df4953760ff..d49dafc3d72 100644
--- a/src/shared/lib/AnnotationUtils.spec.tsx
+++ b/src/shared/lib/AnnotationUtils.spec.tsx
@@ -1,193 +1,192 @@
 import { assert } from 'chai';
-import {IHotspotIndex, indexHotspots} from "react-mutation-mapper";
-import {isRecurrentHotspot, is3dHotspot} from './AnnotationUtils';
-import {initMutation} from "test/MutationMockUtils";
+import { IHotspotIndex, indexHotspots } from 'react-mutation-mapper';
+import { isRecurrentHotspot, is3dHotspot } from './AnnotationUtils';
+import { initMutation } from 'test/MutationMockUtils';
 
 describe('AnnotationUtils', () => {
-
     const hotspotMutation1 = initMutation({
         gene: {
-            hugoGeneSymbol: "TP53",
-            chromosome: "17",
+            hugoGeneSymbol: 'TP53',
+            chromosome: '17',
         },
         startPosition: 66,
         endPosition: 66,
-        referenceAllele: "A",
-        variantAllele: "T",
+        referenceAllele: 'A',
+        variantAllele: 'T',
         proteinPosStart: 273,
         proteinPosEnd: 273,
-        proteinChange: "R273C",
-        mutationType: "missense"
+        proteinChange: 'R273C',
+        mutationType: 'missense',
     });
 
     const hotspotMutation2 = initMutation({
         gene: {
-            hugoGeneSymbol: "TP53",
-            chromosome: "17"
+            hugoGeneSymbol: 'TP53',
+            chromosome: '17',
         },
         startPosition: 66,
         endPosition: 66,
-        referenceAllele: "A",
-        variantAllele: "T",
+        referenceAllele: 'A',
+        variantAllele: 'T',
         proteinPosStart: 273,
-        proteinChange: "R273A",
-        mutationType: "missense"
+        proteinChange: 'R273A',
+        mutationType: 'missense',
     });
 
     const hotspotMutation3 = initMutation({
         gene: {
-            hugoGeneSymbol: "PIK3CA",
-            chromosome: "3"
+            hugoGeneSymbol: 'PIK3CA',
+            chromosome: '3',
         },
         startPosition: 666,
         endPosition: 668,
-        referenceAllele: "G",
-        variantAllele: "CAT",
+        referenceAllele: 'G',
+        variantAllele: 'CAT',
         proteinPosStart: 38,
         proteinPosEnd: 40,
-        proteinChange: "R38H",
-        mutationType: "in_frame_del"
+        proteinChange: 'R38H',
+        mutationType: 'in_frame_del',
     });
 
     const hotspot3dMutation = initMutation({
         gene: {
-            hugoGeneSymbol: "SMURF1",
-            chromosome: "4"
+            hugoGeneSymbol: 'SMURF1',
+            chromosome: '4',
         },
         startPosition: 111,
         endPosition: 111,
-        referenceAllele: "T",
-        variantAllele: "C",
+        referenceAllele: 'T',
+        variantAllele: 'C',
         proteinPosStart: 101,
         proteinPosEnd: 101,
-        proteinChange: "R101N",
-        mutationType: "missense"
+        proteinChange: 'R101N',
+        mutationType: 'missense',
     });
 
     const notHotspotMutation = initMutation({
         gene: {
-            hugoGeneSymbol: "SMURF1",
-            chromosome: "4"
+            hugoGeneSymbol: 'SMURF1',
+            chromosome: '4',
         },
         startPosition: 222,
         endPosition: 222,
-        referenceAllele: "T",
-        variantAllele: "C",
+        referenceAllele: 'T',
+        variantAllele: 'C',
         proteinPosStart: 202,
         proteinPosEnd: 202,
-        proteinChange: "R101F",
-        mutationType: "non_sense"
+        proteinChange: 'R101F',
+        mutationType: 'non_sense',
     });
 
     const hotspots = [
         {
             genomicLocation: {
-                chromosome: "17",
+                chromosome: '17',
                 start: 66,
                 end: 66,
-                referenceAllele: "A",
-                variantAllele: "T"
+                referenceAllele: 'A',
+                variantAllele: 'T',
             },
             transcriptId: '',
             proteinLocation: {
                 transcriptId: '',
                 start: 0,
                 end: 0,
-                mutationType: ''
+                mutationType: '',
             },
-            variant: "17:g.66A>T",
+            variant: '17:g.66A>T',
             hotspots: [
                 {
-                    type: "single residue",
-                    transcriptId: "ENST00002",
+                    type: 'single residue',
+                    transcriptId: 'ENST00002',
                     tumorCount: 1,
                     tumorTypeCount: 1,
                     inframeCount: 0,
                     missenseCount: 1,
                     spliceCount: 0,
                     truncatingCount: 0,
-                    hugoSymbol: "TP53",
-                    residue: "R273",
+                    hugoSymbol: 'TP53',
+                    residue: 'R273',
                     aminoAcidPosition: {
                         start: 273,
-                        end: 273
-                    }
-                }
-            ]
+                        end: 273,
+                    },
+                },
+            ],
         },
         {
             genomicLocation: {
-                chromosome: "3",
+                chromosome: '3',
                 start: 666,
                 end: 668,
-                referenceAllele: "G",
-                variantAllele: "CAT"
+                referenceAllele: 'G',
+                variantAllele: 'CAT',
             },
             transcriptId: '',
             proteinLocation: {
                 transcriptId: '',
                 start: 0,
                 end: 0,
-                mutationType: ''
+                mutationType: '',
             },
-            variant: "3:g.666G>CAT",
+            variant: '3:g.666G>CAT',
             hotspots: [
                 {
-                    type: "in-frame indel",
+                    type: 'in-frame indel',
                     tumorCount: 1,
                     tumorTypeCount: 1,
                     inframeCount: 1,
                     missenseCount: 0,
                     spliceCount: 0,
                     truncatingCount: 0,
-                    transcriptId: "ENST00003",
-                    hugoSymbol: "PIK3CA",
-                    residue: "38-40",
+                    transcriptId: 'ENST00003',
+                    hugoSymbol: 'PIK3CA',
+                    residue: '38-40',
                     aminoAcidPosition: {
                         start: 38,
-                        end: 40
-                    }
-                }
-            ]
-        }
+                        end: 40,
+                    },
+                },
+            ],
+        },
     ];
 
     const hotspots3d = [
         {
             genomicLocation: {
-                chromosome: "4",
+                chromosome: '4',
                 start: 111,
                 end: 111,
-                referenceAllele: "T",
-                variantAllele: "C"
+                referenceAllele: 'T',
+                variantAllele: 'C',
             },
             transcriptId: '',
             proteinLocation: {
                 transcriptId: '',
                 start: 0,
                 end: 0,
-                mutationType: ''
+                mutationType: '',
             },
-            variant: "4:g.111T>C",
+            variant: '4:g.111T>C',
             hotspots: [
                 {
-                    type: "3d",
+                    type: '3d',
                     tumorCount: 1,
                     tumorTypeCount: 1,
                     inframeCount: 0,
                     missenseCount: 1,
                     spliceCount: 0,
                     truncatingCount: 0,
-                    transcriptId: "ENST00005",
-                    hugoSymbol: "SMURF1",
-                    residue: "R101",
+                    transcriptId: 'ENST00005',
+                    hugoSymbol: 'SMURF1',
+                    residue: 'R101',
                     aminoAcidPosition: {
                         start: 101,
-                        end: 101
-                    }
-                }
-            ]
-        }
+                        end: 101,
+                    },
+                },
+            ],
+        },
     ];
 
     let hotspotIndex: IHotspotIndex;
@@ -199,30 +198,41 @@ describe('AnnotationUtils', () => {
     });
 
     it('checks if a mutation is a hotspot mutation', () => {
-        assert.isTrue(isRecurrentHotspot(hotspotMutation1, hotspotIndex),
-            "TP53 R273C should be a recurrent hotspot mutation.");
-
-        assert.isTrue(isRecurrentHotspot(hotspotMutation2, hotspotIndex),
-            "TP53 R273A should be a recurrent hotspot mutation.");
-
-        assert.isTrue(isRecurrentHotspot(hotspotMutation3, hotspotIndex),
-            "PIK3CA R38H should be a recurrent hotspot mutation.");
-
-        assert.isFalse(isRecurrentHotspot(notHotspotMutation, hotspotIndex),
-            "SMURF1 R101F should not be a recurrent hotspot mutation.");
-
-        assert.isFalse(isRecurrentHotspot(hotspot3dMutation, hotspotIndex),
-            "SMURF1 R101N should not be a recurrent hotspot mutation.");
-
-        assert.isFalse(is3dHotspot(notHotspotMutation, hotspot3dIndex),
-            "SMURF1 R101F should not be a 3d hotspot mutation.");
-
-        assert.isTrue(is3dHotspot(hotspot3dMutation, hotspot3dIndex),
-            "SMURF1 R101N should be a 3d hotspot mutation.");
-    });
-
-    after(() => {
-
+        assert.isTrue(
+            isRecurrentHotspot(hotspotMutation1, hotspotIndex),
+            'TP53 R273C should be a recurrent hotspot mutation.'
+        );
+
+        assert.isTrue(
+            isRecurrentHotspot(hotspotMutation2, hotspotIndex),
+            'TP53 R273A should be a recurrent hotspot mutation.'
+        );
+
+        assert.isTrue(
+            isRecurrentHotspot(hotspotMutation3, hotspotIndex),
+            'PIK3CA R38H should be a recurrent hotspot mutation.'
+        );
+
+        assert.isFalse(
+            isRecurrentHotspot(notHotspotMutation, hotspotIndex),
+            'SMURF1 R101F should not be a recurrent hotspot mutation.'
+        );
+
+        assert.isFalse(
+            isRecurrentHotspot(hotspot3dMutation, hotspotIndex),
+            'SMURF1 R101N should not be a recurrent hotspot mutation.'
+        );
+
+        assert.isFalse(
+            is3dHotspot(notHotspotMutation, hotspot3dIndex),
+            'SMURF1 R101F should not be a 3d hotspot mutation.'
+        );
+
+        assert.isTrue(
+            is3dHotspot(hotspot3dMutation, hotspot3dIndex),
+            'SMURF1 R101N should be a 3d hotspot mutation.'
+        );
     });
 
+    after(() => {});
 });
diff --git a/src/shared/lib/AnnotationUtils.ts b/src/shared/lib/AnnotationUtils.ts
index 4c4bc1371e7..4f915d84b58 100644
--- a/src/shared/lib/AnnotationUtils.ts
+++ b/src/shared/lib/AnnotationUtils.ts
@@ -1,11 +1,14 @@
-import {IHotspotIndex, isHotspot} from "react-mutation-mapper/";
+import { IHotspotIndex, isHotspot } from 'react-mutation-mapper/';
 
-import {CosmicMutation} from "shared/api/generated/CBioPortalAPIInternal";
-import {ICosmicData} from "shared/model/Cosmic";
-import {IMyCancerGenome, IMyCancerGenomeData} from "shared/model/MyCancerGenome";
-import {Mutation} from "shared/api/generated/CBioPortalAPI";
-import {normalizeMutation} from "../components/mutationMapper/MutationMapperUtils";
-import {Hotspot} from "cbioportal-frontend-commons";
+import { CosmicMutation } from 'shared/api/generated/CBioPortalAPIInternal';
+import { ICosmicData } from 'shared/model/Cosmic';
+import {
+    IMyCancerGenome,
+    IMyCancerGenomeData,
+} from 'shared/model/MyCancerGenome';
+import { Mutation } from 'shared/api/generated/CBioPortalAPI';
+import { normalizeMutation } from '../components/mutationMapper/MutationMapperUtils';
+import { Hotspot } from 'cbioportal-frontend-commons';
 
 /**
  * Utility functions related to annotation data.
@@ -13,15 +16,15 @@ import {Hotspot} from "cbioportal-frontend-commons";
  * @author Selcuk Onur Sumer
  */
 
-
-export function keywordToCosmic(cosmicMutations:CosmicMutation[]):ICosmicData
-{
+export function keywordToCosmic(
+    cosmicMutations: CosmicMutation[]
+): ICosmicData {
     // key: keyword
     // value: CosmicMutation[]
     const map: ICosmicData = {};
 
     // create a map for a faster lookup
-    cosmicMutations.forEach((cosmic:CosmicMutation) => {
+    cosmicMutations.forEach((cosmic: CosmicMutation) => {
         if (!(cosmic.keyword in map)) {
             map[cosmic.keyword] = [];
         }
@@ -32,13 +35,14 @@ export function keywordToCosmic(cosmicMutations:CosmicMutation[]):ICosmicData
     return map;
 }
 
-export function geneToMyCancerGenome(myCancerGenomes:IMyCancerGenome[]):IMyCancerGenomeData
-{
+export function geneToMyCancerGenome(
+    myCancerGenomes: IMyCancerGenome[]
+): IMyCancerGenomeData {
     // key: hugo gene symbol
     // value: IMyCancerGenome[]
-    const map:IMyCancerGenomeData = {};
+    const map: IMyCancerGenomeData = {};
 
-    myCancerGenomes.forEach((myCancerGenome:IMyCancerGenome) => {
+    myCancerGenomes.forEach((myCancerGenome: IMyCancerGenome) => {
         if (!(myCancerGenome.hugoGeneSymbol in map)) {
             map[myCancerGenome.hugoGeneSymbol] = [];
         }
@@ -49,18 +53,27 @@ export function geneToMyCancerGenome(myCancerGenomes:IMyCancerGenome[]):IMyCance
     return map;
 }
 
-export function recurrentHotspotFilter(hotspot:Hotspot) {
+export function recurrentHotspotFilter(hotspot: Hotspot) {
     // only single and indel mutations are regular hotspots
-    return (hotspot.type.toLowerCase().includes("single") ||
-        hotspot.type.toLowerCase().includes("indel"));
+    return (
+        hotspot.type.toLowerCase().includes('single') ||
+        hotspot.type.toLowerCase().includes('indel')
+    );
 }
 
-export function isRecurrentHotspot(mutation:Mutation, index:IHotspotIndex): boolean
-{
-    return isHotspot(normalizeMutation(mutation), index, recurrentHotspotFilter);
+export function isRecurrentHotspot(
+    mutation: Mutation,
+    index: IHotspotIndex
+): boolean {
+    return isHotspot(
+        normalizeMutation(mutation),
+        index,
+        recurrentHotspotFilter
+    );
 }
 
-export function is3dHotspot(mutation:Mutation, index:IHotspotIndex): boolean
-{
-    return isHotspot(normalizeMutation(mutation), index, hotspot => hotspot.type.toLowerCase().includes("3d"));
+export function is3dHotspot(mutation: Mutation, index: IHotspotIndex): boolean {
+    return isHotspot(normalizeMutation(mutation), index, hotspot =>
+        hotspot.type.toLowerCase().includes('3d')
+    );
 }
diff --git a/src/shared/lib/ArrayUtils.spec.ts b/src/shared/lib/ArrayUtils.spec.ts
index 54a760f0fb6..6989b938d53 100644
--- a/src/shared/lib/ArrayUtils.spec.ts
+++ b/src/shared/lib/ArrayUtils.spec.ts
@@ -1,19 +1,19 @@
-import {assert} from "chai";
-import {toggleIncluded} from "./ArrayUtils";
+import { assert } from 'chai';
+import { toggleIncluded } from './ArrayUtils';
 
-describe("ArrayUtils", () => {
-    describe("toggleIncluded", ()=>{
-        it ("toggles empty and singleton", ()=>{
-            assert.deepEqual(toggleIncluded("a", []), ["a"]);
-            assert.deepEqual(toggleIncluded("a", ["a"]), []);
+describe('ArrayUtils', () => {
+    describe('toggleIncluded', () => {
+        it('toggles empty and singleton', () => {
+            assert.deepEqual(toggleIncluded('a', []), ['a']);
+            assert.deepEqual(toggleIncluded('a', ['a']), []);
         });
-        it("toggles element from singleton", ()=>{
-            assert.deepEqual(toggleIncluded("a", ["b"]), ["b","a"]);
-            assert.deepEqual(toggleIncluded("a", ["a", "b"]), ["b"]);
+        it('toggles element from singleton', () => {
+            assert.deepEqual(toggleIncluded('a', ['b']), ['b', 'a']);
+            assert.deepEqual(toggleIncluded('a', ['a', 'b']), ['b']);
         });
-        it("toggles element from multiple", ()=>{
-            assert.deepEqual(toggleIncluded("a", ["b","c"]), ["b","c","a"]);
-            assert.deepEqual(toggleIncluded("a", ["a", "b","c"]), ["b","c"]);
+        it('toggles element from multiple', () => {
+            assert.deepEqual(toggleIncluded('a', ['b', 'c']), ['b', 'c', 'a']);
+            assert.deepEqual(toggleIncluded('a', ['a', 'b', 'c']), ['b', 'c']);
         });
     });
-});
\ No newline at end of file
+});
diff --git a/src/shared/lib/ArrayUtils.ts b/src/shared/lib/ArrayUtils.ts
index fc98f74d196..10333b66444 100644
--- a/src/shared/lib/ArrayUtils.ts
+++ b/src/shared/lib/ArrayUtils.ts
@@ -1,4 +1,4 @@
-export function toggleIncluded<T>(elt:T, included:T[]):T[] {
+export function toggleIncluded<T>(elt: T, included: T[]): T[] {
     const index = included.indexOf(elt);
     if (index === -1) {
         return included.concat([elt]);
@@ -9,13 +9,13 @@ export function toggleIncluded<T>(elt:T, included:T[]):T[] {
     }
 }
 
-export function insertBetween<T>(elt:T, array:T[]):T[] {
+export function insertBetween<T>(elt: T, array: T[]): T[] {
     const newArray = [];
-    for (let i=0; i<array.length; i++) {
+    for (let i = 0; i < array.length; i++) {
         newArray.push(array[i]);
         if (i < array.length - 1) {
             newArray.push(elt);
         }
     }
     return newArray;
-}
\ No newline at end of file
+}
diff --git a/src/shared/lib/CBioPortalAPIUtils.ts b/src/shared/lib/CBioPortalAPIUtils.ts
index c3415360976..57bc81441d5 100644
--- a/src/shared/lib/CBioPortalAPIUtils.ts
+++ b/src/shared/lib/CBioPortalAPIUtils.ts
@@ -1,16 +1,20 @@
 import {
-    NumericGeneMolecularData, Mutation, Patient,
-    Sample
-} from "../api/generated/CBioPortalAPI";
+    NumericGeneMolecularData,
+    Mutation,
+    Patient,
+    Sample,
+} from '../api/generated/CBioPortalAPI';
 
-export function isMutation(datum:Mutation|NumericGeneMolecularData): datum is Mutation {
-    return datum.hasOwnProperty("mutationType");
+export function isMutation(
+    datum: Mutation | NumericGeneMolecularData
+): datum is Mutation {
+    return datum.hasOwnProperty('mutationType');
 }
 
-export function isSample(datum:Sample|Patient): datum is Sample {
-    return datum.hasOwnProperty("sampleId");
+export function isSample(datum: Sample | Patient): datum is Sample {
+    return datum.hasOwnProperty('sampleId');
 }
 
-export function isSampleList(data:Sample[]|Patient[]):data is Sample[] {
+export function isSampleList(data: Sample[] | Patient[]): data is Sample[] {
     return !data.length || isSample(data[0]);
-}
\ No newline at end of file
+}
diff --git a/src/shared/lib/CancerHotspotsUtils.spec.ts b/src/shared/lib/CancerHotspotsUtils.spec.ts
index 907bc5b1ce9..bc28d1f785f 100644
--- a/src/shared/lib/CancerHotspotsUtils.spec.ts
+++ b/src/shared/lib/CancerHotspotsUtils.spec.ts
@@ -1,25 +1,22 @@
 import { assert } from 'chai';
 
-import {Mutation} from "shared/api/generated/CBioPortalAPI";
-import {
-    filterMutationsOnNonHotspotGenes,
-} from "./CancerHotspotsUtils";
+import { Mutation } from 'shared/api/generated/CBioPortalAPI';
+import { filterMutationsOnNonHotspotGenes } from './CancerHotspotsUtils';
 
 describe('CancerHotspotsUtils', () => {
-
-    before(() => {
-
-    });
+    before(() => {});
 
     describe('filterMutationsOnNonHotspotGenes', () => {
         it('filters mutations on non hotspot genes', () => {
-            const mutations = [{gene: {hugoGeneSymbol: "TP53"}}, {gene: {hugoGeneSymbol: "CLEC9A"}}] as Mutation[];
-            assert.isTrue(filterMutationsOnNonHotspotGenes(mutations).length === 1);
+            const mutations = [
+                { gene: { hugoGeneSymbol: 'TP53' } },
+                { gene: { hugoGeneSymbol: 'CLEC9A' } },
+            ] as Mutation[];
+            assert.isTrue(
+                filterMutationsOnNonHotspotGenes(mutations).length === 1
+            );
         });
     });
 
-    after(() => {
-
-    });
-
+    after(() => {});
 });
diff --git a/src/shared/lib/CancerHotspotsUtils.ts b/src/shared/lib/CancerHotspotsUtils.ts
index 57406640f8c..b07d1e53609 100644
--- a/src/shared/lib/CancerHotspotsUtils.ts
+++ b/src/shared/lib/CancerHotspotsUtils.ts
@@ -1,31 +1,40 @@
-import MobxPromise from "mobxpromise";
-import {Mutation} from "shared/api/generated/CBioPortalAPI";
+import MobxPromise from 'mobxpromise';
+import { Mutation } from 'shared/api/generated/CBioPortalAPI';
 import {
     GenomeNexusAPIInternal,
-    GenomicLocation
-} from "cbioportal-frontend-commons";
-import genomeNexusInternalClient from "shared/api/genomeNexusInternalClientInstance";
-import {concatMutationData} from "./StoreUtils";
-import {uniqueGenomicLocations} from "./MutationUtils";
+    GenomicLocation,
+} from 'cbioportal-frontend-commons';
+import genomeNexusInternalClient from 'shared/api/genomeNexusInternalClientInstance';
+import { concatMutationData } from './StoreUtils';
+import { uniqueGenomicLocations } from './MutationUtils';
 
-export async function fetchHotspotsData(mutationData: MobxPromise<Mutation[]>,
-                                        uncalledMutationData?: MobxPromise<Mutation[]>,
-                                        client: GenomeNexusAPIInternal = genomeNexusInternalClient)
-{
-    const mutationDataResult = filterMutationsOnNonHotspotGenes(concatMutationData(mutationData, uncalledMutationData));
+export async function fetchHotspotsData(
+    mutationData: MobxPromise<Mutation[]>,
+    uncalledMutationData?: MobxPromise<Mutation[]>,
+    client: GenomeNexusAPIInternal = genomeNexusInternalClient
+) {
+    const mutationDataResult = filterMutationsOnNonHotspotGenes(
+        concatMutationData(mutationData, uncalledMutationData)
+    );
 
     if (mutationDataResult.length === 0) {
         return [];
     }
 
-    const genomicLocations: GenomicLocation[] = uniqueGenomicLocations(mutationDataResult);
+    const genomicLocations: GenomicLocation[] = uniqueGenomicLocations(
+        mutationDataResult
+    );
 
-    return await client.fetchHotspotAnnotationByGenomicLocationPOST({genomicLocations: genomicLocations});
+    return await client.fetchHotspotAnnotationByGenomicLocationPOST({
+        genomicLocations: genomicLocations,
+    });
 }
 
 export function filterMutationsOnNonHotspotGenes(mutationData: Mutation[]) {
-    const hotspotGenes = require("shared/static-data/hotspotGenes.json");
+    const hotspotGenes = require('shared/static-data/hotspotGenes.json');
     return mutationData.filter(
-        (m:Mutation) => !m.gene.hugoGeneSymbol || hotspotGenes.includes(m.gene.hugoGeneSymbol)
+        (m: Mutation) =>
+            !m.gene.hugoGeneSymbol ||
+            hotspotGenes.includes(m.gene.hugoGeneSymbol)
     );
 }
diff --git a/src/shared/lib/CivicUtils.ts b/src/shared/lib/CivicUtils.ts
index a43772cd04b..ee870021a82 100644
--- a/src/shared/lib/CivicUtils.ts
+++ b/src/shared/lib/CivicUtils.ts
@@ -1,30 +1,43 @@
 import * as _ from 'lodash';
-import {ICivicGene, ICivicGeneData, ICivicVariant, ICivicVariantData} from "shared/model/Civic.ts";
-import civicClient from "shared/api/civicClientInstance";
-import { DiscreteCopyNumberData } from "shared/api/generated/CBioPortalAPI";
+import {
+    ICivicGene,
+    ICivicGeneData,
+    ICivicVariant,
+    ICivicVariantData,
+} from 'shared/model/Civic.ts';
+import civicClient from 'shared/api/civicClientInstance';
+import { DiscreteCopyNumberData } from 'shared/api/generated/CBioPortalAPI';
 
-type MutationSpec = {gene:{hugoGeneSymbol: string}, proteinChange: string};
+type MutationSpec = { gene: { hugoGeneSymbol: string }; proteinChange: string };
 
 /**
  * Asynchronously adds the given variant from a gene to the variant map specified.
  */
-function addCivicVariant(variantMap: ICivicVariant, variantId: number, variantName: string, geneSymbol: string, geneId: number): Promise<void> {
-    return civicClient.getVariant(variantId, variantName, geneId)
-    .then(function(result: ICivicVariantData) {
-        if (result) {
-            if (!variantMap[geneSymbol]) {
-                variantMap[geneSymbol] = {};
+function addCivicVariant(
+    variantMap: ICivicVariant,
+    variantId: number,
+    variantName: string,
+    geneSymbol: string,
+    geneId: number
+): Promise<void> {
+    return civicClient
+        .getVariant(variantId, variantName, geneId)
+        .then(function(result: ICivicVariantData) {
+            if (result) {
+                if (!variantMap[geneSymbol]) {
+                    variantMap[geneSymbol] = {};
+                }
+                variantMap[geneSymbol][variantName] = result;
             }
-            variantMap[geneSymbol][variantName] = result;
-        }
-    });
+        });
 }
 
 /**
  * Asynchronously return a map with Civic information from the genes given.
  */
-export function getCivicGenes(entrezGeneIds: Array<number>): Promise<ICivicGene> {
-    
+export function getCivicGenes(
+    entrezGeneIds: Array<number>
+): Promise<ICivicGene> {
     let civicGenes: ICivicGene = {};
 
     // Assemble a list of promises, each of which will retrieve a batch of genes
@@ -55,27 +68,31 @@ export function getCivicGenes(entrezGeneIds: Array<number>): Promise<ICivicGene>
     }
 
     // We're waiting for all promises to finish, then return civicGenes
-    return Promise.all(promises).then(function(responses) {
-        for (let res in responses) {
-            let arrayCivicGenes: Array<ICivicGeneData> = responses[res];
-            arrayCivicGenes.forEach((civicGene) => {
-                civicGenes[civicGene.name] = civicGene;
-            });
-        }
-    }).then(function() {
-        return civicGenes;
-    });
+    return Promise.all(promises)
+        .then(function(responses) {
+            for (let res in responses) {
+                let arrayCivicGenes: Array<ICivicGeneData> = responses[res];
+                arrayCivicGenes.forEach(civicGene => {
+                    civicGenes[civicGene.name] = civicGene;
+                });
+            }
+        })
+        .then(function() {
+            return civicGenes;
+        });
 }
-    
+
 /**
  * Asynchronously retrieve a map with Civic information from the mutationSpecs given for all genes in civicGenes.
  * If no mutationSpecs are given, then return the Civic information of all the CNA variants of the genes in civicGenes.
  */
-export function getCivicVariants(civicGenes: ICivicGene, mutationSpecs?: Array<MutationSpec>): Promise<ICivicVariant> {
-
+export function getCivicVariants(
+    civicGenes: ICivicGene,
+    mutationSpecs?: Array<MutationSpec>
+): Promise<ICivicVariant> {
     let civicVariants: ICivicVariant = {};
     let promises: Array<Promise<void>> = [];
-    
+
     if (mutationSpecs) {
         let calledVariants: Set<number> = new Set([]);
         for (let mutation of mutationSpecs) {
@@ -87,13 +104,20 @@ export function getCivicVariants(civicGenes: ICivicGene, mutationSpecs?: Array<M
             proteinChanges.push(split[0]);
             for (let proteinChange of proteinChanges) {
                 if (geneEntry && geneEntry.variants[proteinChange]) {
-                    if (!calledVariants.has(geneEntry.variants[proteinChange])) { //Avoid calling the same variant
+                    if (
+                        !calledVariants.has(geneEntry.variants[proteinChange])
+                    ) {
+                        //Avoid calling the same variant
                         calledVariants.add(geneEntry.variants[proteinChange]);
-                        promises.push(addCivicVariant(civicVariants,
-                                                      geneEntry.variants[proteinChange],
-                                                      proteinChange,
-                                                      geneSymbol,
-                                                      geneEntry.id));
+                        promises.push(
+                            addCivicVariant(
+                                civicVariants,
+                                geneEntry.variants[proteinChange],
+                                proteinChange,
+                                geneSymbol,
+                                geneEntry.id
+                            )
+                        );
                     }
                 }
             }
@@ -105,12 +129,19 @@ export function getCivicVariants(civicGenes: ICivicGene, mutationSpecs?: Array<M
             if (!_.isEmpty(geneVariants)) {
                 for (let variantName in geneVariants) {
                     // Only retrieve CNA variants
-                    if (variantName == 'AMPLIFICATION' || variantName == 'DELETION') {
-                        promises.push(addCivicVariant(civicVariants,
-                                                      geneVariants[variantName],
-                                                      variantName,
-                                                      geneName,
-                                                      geneEntry.id));
+                    if (
+                        variantName == 'AMPLIFICATION' ||
+                        variantName == 'DELETION'
+                    ) {
+                        promises.push(
+                            addCivicVariant(
+                                civicVariants,
+                                geneVariants[variantName],
+                                variantName,
+                                geneName,
+                                geneEntry.id
+                            )
+                        );
                     }
                 }
             }
@@ -118,7 +149,7 @@ export function getCivicVariants(civicGenes: ICivicGene, mutationSpecs?: Array<M
     }
 
     // We're explicitly waiting for all promises to finish (done or fail).
-    // We are wrapping them in another promise separately, to make sure we also 
+    // We are wrapping them in another promise separately, to make sure we also
     // wait in case one of the promises fails and the other is still busy.
     return Promise.all(promises).then(function() {
         return civicVariants;
@@ -128,27 +159,38 @@ export function getCivicVariants(civicGenes: ICivicGene, mutationSpecs?: Array<M
 /**
  * Build a Civic Entry with the data given.
  */
-export function buildCivicEntry(geneEntry: ICivicGeneData, geneVariants: {[name: string]: ICivicVariantData}) {
+export function buildCivicEntry(
+    geneEntry: ICivicGeneData,
+    geneVariants: { [name: string]: ICivicVariantData }
+) {
     return {
         name: geneEntry.name,
         description: geneEntry.description,
         url: geneEntry.url,
-        variants: geneVariants
+        variants: geneVariants,
     };
 }
 
-export function getCivicCNAVariants(copyNumberData:DiscreteCopyNumberData[], geneSymbol: string, civicVariants:ICivicVariant): {[name: string]: ICivicVariantData} {
-    let geneVariants: {[name: string]: ICivicVariantData} = {};
+export function getCivicCNAVariants(
+    copyNumberData: DiscreteCopyNumberData[],
+    geneSymbol: string,
+    civicVariants: ICivicVariant
+): { [name: string]: ICivicVariantData } {
+    let geneVariants: { [name: string]: ICivicVariantData } = {};
     if (copyNumberData[0].alteration === 2) {
         for (let alteration in civicVariants[geneSymbol]) {
-            if (alteration === "AMPLIFICATION") {
-                geneVariants = {[geneSymbol]: civicVariants[geneSymbol][alteration]};
+            if (alteration === 'AMPLIFICATION') {
+                geneVariants = {
+                    [geneSymbol]: civicVariants[geneSymbol][alteration],
+                };
             }
         }
     } else if (copyNumberData[0].alteration === -2) {
         for (let alteration in civicVariants[geneSymbol]) {
-            if (alteration === "DELETION") {
-                geneVariants = {[geneSymbol]: civicVariants[geneSymbol][alteration]};
+            if (alteration === 'DELETION') {
+                geneVariants = {
+                    [geneSymbol]: civicVariants[geneSymbol][alteration],
+                };
             }
         }
     }
diff --git a/src/shared/lib/Colors.ts b/src/shared/lib/Colors.ts
index 07290edc6dc..b48fef30160 100644
--- a/src/shared/lib/Colors.ts
+++ b/src/shared/lib/Colors.ts
@@ -3,7 +3,7 @@ import * as _ from 'lodash';
 // Default grey
 export const BLACK = '#000000';
 export const LIGHT_GREY = '#D3D3D3';
-export const DEFAULT_GREY = "#BEBEBE";
+export const DEFAULT_GREY = '#BEBEBE';
 export const DARK_GREY = '#A9A9A9';
 
 // icon colors
@@ -19,19 +19,19 @@ export const MUT_COLOR_TRUNC = BLACK;
 export const MUT_COLOR_TRUNC_PASSENGER = '#708090';
 export const MUT_COLOR_FUSION = '#8B00C9';
 export const MUT_COLOR_PROMOTER = '#00B7CE';
-export const MUT_COLOR_OTHER = '#cf58bc';//'#cfb537';
+export const MUT_COLOR_OTHER = '#cf58bc'; //'#cfb537';
 
-export const MRNA_COLOR_HIGH = "#ff9999";
-export const MRNA_COLOR_LOW = "#6699cc";
+export const MRNA_COLOR_HIGH = '#ff9999';
+export const MRNA_COLOR_LOW = '#6699cc';
 export const MUT_COLOR_GERMLINE = '#FFFFFF';
 
-export const PROT_COLOR_HIGH = "#ff3df8";
-export const PROT_COLOR_LOW = "#00E1FF";
+export const PROT_COLOR_HIGH = '#ff3df8';
+export const PROT_COLOR_LOW = '#00E1FF';
 
-export const CNA_COLOR_AMP = "#ff0000";
-export const CNA_COLOR_GAIN = "#ffb6c1";
-export const CNA_COLOR_HETLOSS = "#8fd8d8";
-export const CNA_COLOR_HOMDEL = "#0000ff";
+export const CNA_COLOR_AMP = '#ff0000';
+export const CNA_COLOR_GAIN = '#ffb6c1';
+export const CNA_COLOR_HETLOSS = '#8fd8d8';
+export const CNA_COLOR_HOMDEL = '#0000ff';
 
 export const DEFAULT_NA_COLOR = LIGHT_GREY;
 export const DEFAULT_UNKNOWN_COLOR = DARK_GREY;
@@ -42,8 +42,8 @@ export const DEFAULT_UNKNOWN_COLOR = DARK_GREY;
 // const CLI_NO_COLOR = "#DC3912";
 
 // Colorblind safe version. http://colorbrewer2.org/#type=qualitative&scheme=Dark2&n=3
-export const CLI_YES_COLOR = "#1b9e77";
-export const CLI_NO_COLOR = "#d95f02";
+export const CLI_YES_COLOR = '#1b9e77';
+export const CLI_NO_COLOR = '#d95f02';
 
 export const CLI_FEMALE_COLOR = '#E0699E';
 export const CLI_MALE_COLOR = '#2986E2';
@@ -88,11 +88,11 @@ export let RESERVED_CLINICAL_VALUE_COLORS: { [value: string]: string } = {
     amplification: CNA_COLOR_AMP,
     gain: CNA_COLOR_GAIN,
     diploid: DEFAULT_GREY,
-    "shallow deletion": CNA_COLOR_HETLOSS,
-    "deep deletion": CNA_COLOR_HOMDEL,
+    'shallow deletion': CNA_COLOR_HETLOSS,
+    'deep deletion': CNA_COLOR_HOMDEL,
 };
 
-_.forEach(RESERVED_CLINICAL_VALUE_COLORS, (color, key)=>{
+_.forEach(RESERVED_CLINICAL_VALUE_COLORS, (color, key) => {
     // expand reservedValue entries to handle other case possibilities. eg expand TRUE to True and true
     RESERVED_CLINICAL_VALUE_COLORS[key.toLowerCase()] = color;
     RESERVED_CLINICAL_VALUE_COLORS[key.toUpperCase()] = color;
@@ -102,10 +102,19 @@ _.forEach(RESERVED_CLINICAL_VALUE_COLORS, (color, key)=>{
     RESERVED_CLINICAL_VALUE_COLORS[withoutSpace.toLowerCase()] = color;
     RESERVED_CLINICAL_VALUE_COLORS[withoutSpace.toUpperCase()] = color;
 
-    RESERVED_CLINICAL_VALUE_COLORS[key[0].toUpperCase() + key.slice(1).toLowerCase()] = color;
-    RESERVED_CLINICAL_VALUE_COLORS[key.split(" ").map(word=>word[0].toUpperCase() + word.slice(1).toLowerCase()).join(" ")] = color;
+    RESERVED_CLINICAL_VALUE_COLORS[
+        key[0].toUpperCase() + key.slice(1).toLowerCase()
+    ] = color;
+    RESERVED_CLINICAL_VALUE_COLORS[
+        key
+            .split(' ')
+            .map(word => word[0].toUpperCase() + word.slice(1).toLowerCase())
+            .join(' ')
+    ] = color;
 });
 
 export function getClinicalValueColor(value: string): string | undefined {
-    return RESERVED_CLINICAL_VALUE_COLORS[value.replace(/\s/g, '').toLowerCase()];
-}
\ No newline at end of file
+    return RESERVED_CLINICAL_VALUE_COLORS[
+        value.replace(/\s/g, '').toLowerCase()
+    ];
+}
diff --git a/src/shared/lib/ContextUtils.ts b/src/shared/lib/ContextUtils.ts
index c3310ae483f..112bb3b76ff 100644
--- a/src/shared/lib/ContextUtils.ts
+++ b/src/shared/lib/ContextUtils.ts
@@ -5,13 +5,22 @@ import withContext from 'recompose/withContext';
  * Creates a function which validates that a property of an object is an instance of a specific class.
  * For use with <code>React.Component.contextTypes</code>.
  */
-function createValidator<O>(classDef:new(...args:any[])=>any):React.Validator<O>
-{
-	return function validator<T>(object: T, key: string, componentName: string):Error|null {
-		if ((key in object) && object[key as keyof T] instanceof classDef)
-			return null;
-		return new Error(`Expecting ${componentName} to receive {${JSON.stringify(key)}: ${classDef.name}} from context`);
-	};
+function createValidator<O>(
+    classDef: new (...args: any[]) => any
+): React.Validator<O> {
+    return function validator<T>(
+        object: T,
+        key: string,
+        componentName: string
+    ): Error | null {
+        if (key in object && object[key as keyof T] instanceof classDef)
+            return null;
+        return new Error(
+            `Expecting ${componentName} to receive {${JSON.stringify(key)}: ${
+                classDef.name
+            }} from context`
+        );
+    };
 }
 
 /**
@@ -22,26 +31,29 @@ function createValidator<O>(classDef:new(...args:any[])=>any):React.Validator<O>
  *   export class MyClass extends React.Component&lt;P, S&gt; { }
  *   </code>
  */
-export function providesStoreContext<Store>(storeClass:new(..._:any[])=>Store)
-{
-	return withContext({store: createValidator(storeClass)}, ({store}:{store:Store}) => ({store}));
+export function providesStoreContext<Store>(
+    storeClass: new (..._: any[]) => Store
+) {
+    return withContext(
+        { store: createValidator(storeClass) },
+        ({ store }: { store: Store }) => ({ store })
+    );
 }
 
 /**
  * Extends React.Component by adding a <code>store</code> getter which reads the <code>store</code> context property.
  * Usage: <code>class MyComponent extends ComponentGetsStoreContext(MyStore)<P, S> { }</code>
  */
-export function ComponentGetsStoreContext<Store>(storeClass:new(..._:any[])=>Store)
-{
-	return class ComponentGetsStoreContext<P, S> extends React.Component<P, S>
-	{
-		static contextTypes = {
-			store: createValidator(storeClass)
-		};
+export function ComponentGetsStoreContext<Store>(
+    storeClass: new (..._: any[]) => Store
+) {
+    return class ComponentGetsStoreContext<P, S> extends React.Component<P, S> {
+        static contextTypes = {
+            store: createValidator(storeClass),
+        };
 
-		get store():Store
-		{
-			return this.context.store;
-		}
-	};
+        get store(): Store {
+            return this.context.store;
+        }
+    };
 }
diff --git a/src/shared/lib/CopyNumberUtils.ts b/src/shared/lib/CopyNumberUtils.ts
index c8977ebec09..0845f8b3726 100644
--- a/src/shared/lib/CopyNumberUtils.ts
+++ b/src/shared/lib/CopyNumberUtils.ts
@@ -1,9 +1,8 @@
 export enum Alterations {
     Deletion = -2,
-    Amplification = 2
+    Amplification = 2,
 }
 
-export function getAlterationString(alteration: number): string
-{
+export function getAlterationString(alteration: number): string {
     return Alterations[alteration] || '';
 }
diff --git a/src/shared/lib/EventUtils.ts b/src/shared/lib/EventUtils.ts
index a6b30f79a7a..43f7db6854c 100644
--- a/src/shared/lib/EventUtils.ts
+++ b/src/shared/lib/EventUtils.ts
@@ -1,4 +1,7 @@
-export function inputBoxChangeTimeoutEvent(callback: (value: string) => void, timeout: number): (evt: any) => void {
+export function inputBoxChangeTimeoutEvent(
+    callback: (value: string) => void,
+    timeout: number
+): (evt: any) => void {
     let searchTimeout: number | null = null;
     return (evt: any) => {
         if (searchTimeout !== null) {
@@ -11,4 +14,4 @@ export function inputBoxChangeTimeoutEvent(callback: (value: string) => void, ti
             callback(filterValue);
         }, timeout || 400);
     };
-};
\ No newline at end of file
+}
diff --git a/src/shared/lib/ExtendedRouterStore.spec.ts b/src/shared/lib/ExtendedRouterStore.spec.ts
index 8a3705a46df..4f88612a131 100644
--- a/src/shared/lib/ExtendedRouterStore.spec.ts
+++ b/src/shared/lib/ExtendedRouterStore.spec.ts
@@ -1,82 +1,101 @@
-import ExtendedRouterStore, {PortalSession} from './ExtendedRouterStore';
-import {assert} from 'chai';
+import ExtendedRouterStore, { PortalSession } from './ExtendedRouterStore';
+import { assert } from 'chai';
 import * as React from 'react';
 import * as _ from 'lodash';
 import * as $ from 'jquery';
 import * as sinon from 'sinon';
 import * as mobx from 'mobx';
-import {syncHistoryWithStore, SynchronizedHistory} from "mobx-react-router";
-import createMemoryHistory from "react-router/lib/createMemoryHistory";
-import {MemoryHistory} from "history";
-import {SinonStub} from "sinon";
-import {sleep} from "./TimeUtils";
-import {computed} from "mobx";
-import AppConfig from "appConfig";
-import {setServerConfig} from "../../config/config";
-
-
-
+import { syncHistoryWithStore, SynchronizedHistory } from 'mobx-react-router';
+import createMemoryHistory from 'react-router/lib/createMemoryHistory';
+import { MemoryHistory } from 'history';
+import { SinonStub } from 'sinon';
+import { sleep } from './TimeUtils';
+import { computed } from 'mobx';
+import AppConfig from 'appConfig';
+import { setServerConfig } from '../../config/config';
 
 describe('ExtendedRouterStore', () => {
-
     let history: SynchronizedHistory;
     let routingStore: ExtendedRouterStore;
     let saveRemoteSessionStub: SinonStub;
     let getRemoteSessionStub: SinonStub;
 
-
-    beforeEach(()=>{
+    beforeEach(() => {
         routingStore = new ExtendedRouterStore();
         history = syncHistoryWithStore(createMemoryHistory(), routingStore);
         setServerConfig({ sessionServiceEnabled: true });
         routingStore.location.pathname = '/results';
-        routingStore.location.query = {param1: 1, param2: 2, param3: 3};
-
+        routingStore.location.query = { param1: 1, param2: 2, param3: 3 };
     });
 
-    afterEach(()=>{
-        history.unsubscribe!()
+    afterEach(() => {
+        history.unsubscribe!();
     });
 
     it('Updating route with clear=true will clear all params and except new ones', () => {
-
-        routingStore.updateRoute({
-            param3: 'cleared'
-        }, undefined, true);
-
-
-        assert.deepEqual(routingStore.location.query, {param3: 'cleared'},'removes param1');
-        assert.deepEqual(routingStore.location.pathname,'/results');
-
+        routingStore.updateRoute(
+            {
+                param3: 'cleared',
+            },
+            undefined,
+            true
+        );
+
+        assert.deepEqual(
+            routingStore.location.query,
+            { param3: 'cleared' },
+            'removes param1'
+        );
+        assert.deepEqual(routingStore.location.pathname, '/results');
     });
 
-
     it('Properties that are undefined will be removed from URL', () => {
-
-        routingStore.updateRoute({
-                                     param1: 'something1',
-                                     param2: 'something2',
-                                     param3: 'something3'
-                                 }, undefined, false);
-
-
-        assert.deepEqual(routingStore.location.query, {  param1: 'something1', param2: 'something2', param3: 'something3'},'sets params');
-
-        routingStore.updateRoute({
-                                     param3: undefined
-                                 }, undefined, false);
-
-        assert.deepEqual(routingStore.location.query, { param1: 'something1', param2: 'something2'},'removes undefined param');
-
-        routingStore.updateRoute({
-                                     param2: ''
-                                 }, undefined, false);
-
-        assert.deepEqual(routingStore.location.query, { param1: 'something1'},'removes empty string prop');
-
-
+        routingStore.updateRoute(
+            {
+                param1: 'something1',
+                param2: 'something2',
+                param3: 'something3',
+            },
+            undefined,
+            false
+        );
+
+        assert.deepEqual(
+            routingStore.location.query,
+            {
+                param1: 'something1',
+                param2: 'something2',
+                param3: 'something3',
+            },
+            'sets params'
+        );
+
+        routingStore.updateRoute(
+            {
+                param3: undefined,
+            },
+            undefined,
+            false
+        );
+
+        assert.deepEqual(
+            routingStore.location.query,
+            { param1: 'something1', param2: 'something2' },
+            'removes undefined param'
+        );
+
+        routingStore.updateRoute(
+            {
+                param2: '',
+            },
+            undefined,
+            false
+        );
+
+        assert.deepEqual(
+            routingStore.location.query,
+            { param1: 'something1' },
+            'removes empty string prop'
+        );
     });
-
 });
-
-
diff --git a/src/shared/lib/ExtendedRouterStore.ts b/src/shared/lib/ExtendedRouterStore.ts
index e89479a2e85..c3aa9139996 100644
--- a/src/shared/lib/ExtendedRouterStore.ts
+++ b/src/shared/lib/ExtendedRouterStore.ts
@@ -1,36 +1,36 @@
 import { RouterStore } from 'mobx-react-router';
-import {action, computed, observable, runInAction} from 'mobx';
+import { action, computed, observable, runInAction } from 'mobx';
 import * as _ from 'lodash';
-import URL, {QueryParams} from 'url';
-import {remoteData} from "cbioportal-frontend-commons";
-import sessionClient from "../api/sessionServiceInstance";
-import AppConfig from "appConfig";
-import {ServerConfigHelpers} from "../../config/config";
-import hashString from "./hashString";
-
-export function getSessionKey(hash:string){
-    return `session_${hash}`
+import URL, { QueryParams } from 'url';
+import { remoteData } from 'cbioportal-frontend-commons';
+import sessionClient from '../api/sessionServiceInstance';
+import AppConfig from 'appConfig';
+import { ServerConfigHelpers } from '../../config/config';
+import hashString from './hashString';
+
+export function getSessionKey(hash: string) {
+    return `session_${hash}`;
 }
 
 export interface PortalSession {
-    id:string;
-    query:{ [key:string] : any };
-    path:string;
-    version:number;
-    timeStamp?:number;
+    id: string;
+    query: { [key: string]: any };
+    path: string;
+    version: number;
+    timeStamp?: number;
 }
 
-export function saveRemoteSession(data:any){
+export function saveRemoteSession(data: any) {
     const dataCopy = Object.assign({}, data);
-    delete dataCopy[""]; // artifact of mobx RouterStore URL serialization, when theres & at end of URL, which breaks session service
+    delete dataCopy['']; // artifact of mobx RouterStore URL serialization, when theres & at end of URL, which breaks session service
     return sessionClient.saveSession(dataCopy);
 }
 
-export function getRemoteSession(sessionId:string){
-    return sessionClient.getSession(sessionId)
+export function getRemoteSession(sessionId: string) {
+    return sessionClient.getSession(sessionId);
 }
 
-export function normalizeLegacySession(sessionData:any){
+export function normalizeLegacySession(sessionData: any) {
     // legacy sessions were stored with values as first item in arrays, so undo this
     sessionData.data = _.mapValues(sessionData.data, (value: any) => {
         if (_.isArray(value)) {
@@ -41,7 +41,10 @@ export function normalizeLegacySession(sessionData:any){
     });
 
     // convert cancer_study_id to cancer_study_list and get rid of cancer_study_id
-    if (sessionData.data.cancer_study_id && !sessionData.data.cancer_study_list) {
+    if (
+        sessionData.data.cancer_study_id &&
+        !sessionData.data.cancer_study_list
+    ) {
         sessionData.data.cancer_study_list = sessionData.data.cancer_study_id;
     }
     delete sessionData.data.cancer_study_id;
@@ -50,15 +53,18 @@ export function normalizeLegacySession(sessionData:any){
 }
 
 export default class ExtendedRouterStore extends RouterStore {
-
-
-    @action updateRoute(newParams: QueryParams, path:string | undefined = undefined, clear = false, replace = false) {
+    @action updateRoute(
+        newParams: QueryParams,
+        path: string | undefined = undefined,
+        clear = false,
+        replace = false
+    ) {
         // default to current path
-        path = (path !== undefined) ? path : this.location.pathname;
+        path = path !== undefined ? path : this.location.pathname;
 
         // if we're not clearing, we want to merge newParams onto existing query
         // but if we're clearing, we want to use newParams ONLY and wipe out existing query;
-        let newQuery:any;
+        let newQuery: any;
         if (!clear) {
             newQuery = _.clone(this.location.query);
             _.each(newParams, (v, k: string) => {
@@ -74,7 +80,7 @@ export default class ExtendedRouterStore extends RouterStore {
 
         // clear out any undefined props
         _.each(newQuery, (v, k: string) => {
-            if (v === undefined || v === "") {
+            if (v === undefined || v === '') {
                 delete newQuery[k];
             }
         });
@@ -82,8 +88,12 @@ export default class ExtendedRouterStore extends RouterStore {
         // put a leading slash if there isn't one
         path = URL.resolve('/', path);
 
-        this[replace ? "replace" : "push"]( URL.format({pathname: path, query: newQuery, hash:this.location.hash}) );
-
+        this[replace ? 'replace' : 'push'](
+            URL.format({
+                pathname: path,
+                query: newQuery,
+                hash: this.location.hash,
+            })
+        );
     }
-
 }
diff --git a/src/shared/lib/FilenameUtils.spec.ts b/src/shared/lib/FilenameUtils.spec.ts
index 5e2c393d5b3..4d87b197cd5 100644
--- a/src/shared/lib/FilenameUtils.spec.ts
+++ b/src/shared/lib/FilenameUtils.spec.ts
@@ -1,48 +1,66 @@
-import {assert} from 'chai';
+import { assert } from 'chai';
 
-import {generateDownloadFilenamePrefixByStudies, generateDownloadFilenamePrefixByStudyIds} from "./FilenameUtils";
-import {CancerStudy} from "shared/api/generated/CBioPortalAPI";
+import {
+    generateDownloadFilenamePrefixByStudies,
+    generateDownloadFilenamePrefixByStudyIds,
+} from './FilenameUtils';
+import { CancerStudy } from 'shared/api/generated/CBioPortalAPI';
 
 describe('FilenameUtils', () => {
-    describe("generateDownloadFilenamePrefixByStudyIds", () => {
+    describe('generateDownloadFilenamePrefixByStudyIds', () => {
         it('Generates empty string for undefined or empty input', () => {
-            assert.equal(generateDownloadFilenamePrefixByStudyIds(), "");
-            assert.equal(generateDownloadFilenamePrefixByStudyIds([]), "");
+            assert.equal(generateDownloadFilenamePrefixByStudyIds(), '');
+            assert.equal(generateDownloadFilenamePrefixByStudyIds([]), '');
         });
 
         it('Generates a prefix with actual study name for a single study input', () => {
-            assert.equal(generateDownloadFilenamePrefixByStudyIds(["singleStudy"]), "singleStudy_");
+            assert.equal(
+                generateDownloadFilenamePrefixByStudyIds(['singleStudy']),
+                'singleStudy_'
+            );
         });
 
         it('Generates a fixed prefix for with actual study name for multiple studies input', () => {
-            assert.equal(generateDownloadFilenamePrefixByStudyIds(["study1", "study2"]), "combined_study_");
+            assert.equal(
+                generateDownloadFilenamePrefixByStudyIds(['study1', 'study2']),
+                'combined_study_'
+            );
         });
     });
 
-    describe("generateDownloadFilenamePrefixByStudies", () => {
+    describe('generateDownloadFilenamePrefixByStudies', () => {
         it('Generates empty string for undefined or empty input', () => {
-            assert.equal(generateDownloadFilenamePrefixByStudies(), "");
-            assert.equal(generateDownloadFilenamePrefixByStudies([]), "");
+            assert.equal(generateDownloadFilenamePrefixByStudies(), '');
+            assert.equal(generateDownloadFilenamePrefixByStudies([]), '');
         });
 
         it('Generates a prefix with actual study name for a single study input', () => {
-            const singleStudy: CancerStudy[] = [{
-                studyId: "singleStudy"
-            }] as CancerStudy[];
+            const singleStudy: CancerStudy[] = [
+                {
+                    studyId: 'singleStudy',
+                },
+            ] as CancerStudy[];
 
-            assert.equal(generateDownloadFilenamePrefixByStudies(singleStudy), "singleStudy_");
+            assert.equal(
+                generateDownloadFilenamePrefixByStudies(singleStudy),
+                'singleStudy_'
+            );
         });
 
         it('Generates a fixed prefix for with actual study name for multiple studies input', () => {
-            const multipleStudies: CancerStudy[] = [{
-                studyId: "study1"
-            }, {
-                studyId: "study2"
-            }] as CancerStudy[];
+            const multipleStudies: CancerStudy[] = [
+                {
+                    studyId: 'study1',
+                },
+                {
+                    studyId: 'study2',
+                },
+            ] as CancerStudy[];
 
-            assert.equal(generateDownloadFilenamePrefixByStudies(multipleStudies), "combined_study_");
+            assert.equal(
+                generateDownloadFilenamePrefixByStudies(multipleStudies),
+                'combined_study_'
+            );
         });
     });
 });
-
-
diff --git a/src/shared/lib/FilenameUtils.ts b/src/shared/lib/FilenameUtils.ts
index 6aa65ef0994..3115c1bb590 100644
--- a/src/shared/lib/FilenameUtils.ts
+++ b/src/shared/lib/FilenameUtils.ts
@@ -1,18 +1,20 @@
-import {CancerStudy} from "shared/api/generated/CBioPortalAPI";
+import { CancerStudy } from 'shared/api/generated/CBioPortalAPI';
 
-export function generateDownloadFilenamePrefixByStudies(studies?: CancerStudy[]) {
+export function generateDownloadFilenamePrefixByStudies(
+    studies?: CancerStudy[]
+) {
     return generateDownloadFilenamePrefixByStudyIds(
-        studies ? studies.map(s => s.studyId) : undefined);
+        studies ? studies.map(s => s.studyId) : undefined
+    );
 }
 
 export function generateDownloadFilenamePrefixByStudyIds(studyIds?: string[]) {
-    let prefix = "";
+    let prefix = '';
 
     if (studyIds) {
         if (studyIds.length > 1) {
-            prefix = "combined_study_";
-        }
-        else if (studyIds.length === 1) {
+            prefix = 'combined_study_';
+        } else if (studyIds.length === 1) {
             prefix = `${studyIds[0]}_`;
         }
     }
diff --git a/src/shared/lib/FisherExactTestCalculator.ts b/src/shared/lib/FisherExactTestCalculator.ts
index 7692a1cdc1c..c12d84a5bd4 100644
--- a/src/shared/lib/FisherExactTestCalculator.ts
+++ b/src/shared/lib/FisherExactTestCalculator.ts
@@ -1,13 +1,30 @@
-function getProbability(a: number, b: number, c: number, d: number, logFactorial: number[]): number {
-
+function getProbability(
+    a: number,
+    b: number,
+    c: number,
+    d: number,
+    logFactorial: number[]
+): number {
     const n: number = a + b + c + d;
-    const p: number = (logFactorial[a + b] + logFactorial[c + d] + logFactorial[a + c] + logFactorial[b + d]) -
-        (logFactorial[a] + logFactorial[b] + logFactorial[c] + logFactorial[d] + logFactorial[n]);
+    const p: number =
+        logFactorial[a + b] +
+        logFactorial[c + d] +
+        logFactorial[a + c] +
+        logFactorial[b + d] -
+        (logFactorial[a] +
+            logFactorial[b] +
+            logFactorial[c] +
+            logFactorial[d] +
+            logFactorial[n]);
     return Math.exp(p);
 }
 
-export function getCumulativePValue(a: number, b: number, c: number, d: number): number {
-
+export function getCumulativePValue(
+    a: number,
+    b: number,
+    c: number,
+    d: number
+): number {
     let min: number, i: number;
     const n: number = a + b + c + d;
     let p: number = 0;
@@ -19,15 +36,15 @@ export function getCumulativePValue(a: number, b: number, c: number, d: number):
     }
 
     p += getProbability(a, b, c, d, logFactorial);
-    if ((a * d) >= (b * c)) {
-        min = (c < b) ? c : b;
+    if (a * d >= b * c) {
+        min = c < b ? c : b;
         for (i = 0; i < min; i++) {
             p += getProbability(++a, --b, --c, ++d, logFactorial);
         }
     }
 
-    if ((a * d) < (b * c)) {
-        min = (a < d) ? a : d;
+    if (a * d < b * c) {
+        min = a < d ? a : d;
         for (i = 0; i < min; i++) {
             p += getProbability(--a, ++b, ++c, --d, logFactorial);
         }
diff --git a/src/shared/lib/FormatUtils.spec.tsx b/src/shared/lib/FormatUtils.spec.tsx
index 8d0d1bd1f82..d2220215091 100644
--- a/src/shared/lib/FormatUtils.spec.tsx
+++ b/src/shared/lib/FormatUtils.spec.tsx
@@ -5,109 +5,115 @@ import {
     formatLogOddsRatio,
     formatSignificanceValueWithStyle,
     roundLogRatio,
-    toFixedWithoutTrailingZeros
-} from "shared/lib/FormatUtils";
+    toFixedWithoutTrailingZeros,
+} from 'shared/lib/FormatUtils';
 import expect from 'expect';
-import expectJSX from "expect-jsx";
+import expectJSX from 'expect-jsx';
 expect.extend(expectJSX);
 
-describe('toFixedWithThreshold', ()=>{
-    it("has the same behavior with regular toFixed function when the result is not expected to be a zero value", () => {
-        assert.equal(toFixedWithThreshold(0.324, 2), "0.32");
-        assert.equal(toFixedWithThreshold(0.0032, 3), "0.003");
-        assert.equal(toFixedWithThreshold(0.006, 2), "0.01");
+describe('toFixedWithThreshold', () => {
+    it('has the same behavior with regular toFixed function when the result is not expected to be a zero value', () => {
+        assert.equal(toFixedWithThreshold(0.324, 2), '0.32');
+        assert.equal(toFixedWithThreshold(0.0032, 3), '0.003');
+        assert.equal(toFixedWithThreshold(0.006, 2), '0.01');
     });
 
-    it("returns zero value string only if the actual value is zero", () => {
-        assert.equal(toFixedWithThreshold(0, 1), "0.0");
-        assert.equal(toFixedWithThreshold(0, 2), "0.00");
-        assert.equal(toFixedWithThreshold(0, 3), "0.000");
+    it('returns zero value string only if the actual value is zero', () => {
+        assert.equal(toFixedWithThreshold(0, 1), '0.0');
+        assert.equal(toFixedWithThreshold(0, 2), '0.00');
+        assert.equal(toFixedWithThreshold(0, 3), '0.000');
     });
 
-    it("converts zero value results into an inequality if the actual value is not zero", () => {
-        assert.equal(toFixedWithThreshold(0.000333, 3), "<0.001");
-        assert.equal(toFixedWithThreshold(0.000666, 2), "<0.01");
-        assert.equal(toFixedWithThreshold(0.00666, 1), "<0.1");
-        assert.equal(toFixedWithThreshold(0.0333, 1), "<0.1");
+    it('converts zero value results into an inequality if the actual value is not zero', () => {
+        assert.equal(toFixedWithThreshold(0.000333, 3), '<0.001');
+        assert.equal(toFixedWithThreshold(0.000666, 2), '<0.01');
+        assert.equal(toFixedWithThreshold(0.00666, 1), '<0.1');
+        assert.equal(toFixedWithThreshold(0.0333, 1), '<0.1');
     });
 
-    it("works for negative numbers too", () => {
-        assert.equal(toFixedWithThreshold(-0.324, 2), "-0.32");
-        assert.equal(toFixedWithThreshold(-0.0032, 3), "-0.003");
-        assert.equal(toFixedWithThreshold(-0.006, 2), "-0.01");
-        assert.equal(toFixedWithThreshold(-0.000333, 3), ">-0.001");
-        assert.equal(toFixedWithThreshold(-0.000666, 2), ">-0.01");
-        assert.equal(toFixedWithThreshold(-0.00666, 1), ">-0.1");
-        assert.equal(toFixedWithThreshold(-0.0333, 1), ">-0.1");
+    it('works for negative numbers too', () => {
+        assert.equal(toFixedWithThreshold(-0.324, 2), '-0.32');
+        assert.equal(toFixedWithThreshold(-0.0032, 3), '-0.003');
+        assert.equal(toFixedWithThreshold(-0.006, 2), '-0.01');
+        assert.equal(toFixedWithThreshold(-0.000333, 3), '>-0.001');
+        assert.equal(toFixedWithThreshold(-0.000666, 2), '>-0.01');
+        assert.equal(toFixedWithThreshold(-0.00666, 1), '>-0.1');
+        assert.equal(toFixedWithThreshold(-0.0333, 1), '>-0.1');
     });
 });
 
-describe("#formatLogOddsRatio()", () => {
-    it("returns <-10 for -11", () => {
-        assert.equal(formatLogOddsRatio(-11), "<-10");
+describe('#formatLogOddsRatio()', () => {
+    it('returns <-10 for -11', () => {
+        assert.equal(formatLogOddsRatio(-11), '<-10');
     });
 
-    it("returns >10 for 11", () => {
-        assert.equal(formatLogOddsRatio(11), ">10");
+    it('returns >10 for 11', () => {
+        assert.equal(formatLogOddsRatio(11), '>10');
     });
 
-    it("returns 10 for 10", () => {
-        assert.equal(formatLogOddsRatio(10), "10.00");
+    it('returns 10 for 10', () => {
+        assert.equal(formatLogOddsRatio(10), '10.00');
     });
 
-    it("returns 1.23 for 1.234", () => {
-        assert.equal(formatLogOddsRatio(1.234), "1.23");
+    it('returns 1.23 for 1.234', () => {
+        assert.equal(formatLogOddsRatio(1.234), '1.23');
     });
 });
 
-describe("#formatSignificanceValueWithStyle()", () => {
-    it("returns <span>0.300</span> for 0.3", () => {
-        expect(formatSignificanceValueWithStyle(0.3)).toEqualJSX(<span>0.300</span>);
+describe('#formatSignificanceValueWithStyle()', () => {
+    it('returns <span>0.300</span> for 0.3', () => {
+        expect(formatSignificanceValueWithStyle(0.3)).toEqualJSX(
+            <span>0.300</span>
+        );
     });
 
-    it("returns <b><span>0.030</span></b> for 0.03", () => {
-        expect(formatSignificanceValueWithStyle(0.03)).toEqualJSX(<b><span>0.0300</span></b>);
+    it('returns <b><span>0.030</span></b> for 0.03', () => {
+        expect(formatSignificanceValueWithStyle(0.03)).toEqualJSX(
+            <b>
+                <span>0.0300</span>
+            </b>
+        );
     });
 });
 
-describe("#roundLogRatio()", () => {
-    it("returns 5 for 8 and 5", () => {
+describe('#roundLogRatio()', () => {
+    it('returns 5 for 8 and 5', () => {
         assert.equal(roundLogRatio(8, 5), 5);
     });
 
-    it("returns -3 for -4 and 3", () => {
+    it('returns -3 for -4 and 3', () => {
         assert.equal(roundLogRatio(-4, 3), -3);
     });
 
-    it("returns 3.21 for 3.2123 and 10", () => {
+    it('returns 3.21 for 3.2123 and 10', () => {
         assert.equal(roundLogRatio(3.2123, 10), 3.21);
     });
 });
 
-describe("toFixedWithoutTrailingZeros", ()=>{
-    it("removes trailing zeros right after decimal point", ()=>{
-        assert.equal(toFixedWithoutTrailingZeros(2, 5), "2");
-        assert.equal(toFixedWithoutTrailingZeros(5, 5), "5");
-    });
-    it("removes trailing zeros not right after decimal point", ()=>{
-        assert.equal(toFixedWithoutTrailingZeros(2.25, 5), "2.25");
-        assert.equal(toFixedWithoutTrailingZeros(2.5, 100), "2.5");
-    });
-    it("doesnt remove non-trailing zeros", ()=>{
-        assert.equal(toFixedWithoutTrailingZeros(12.025, 3), "12.025");
-        assert.equal(toFixedWithoutTrailingZeros(51.05, 2), "51.05");
-        assert.equal(toFixedWithoutTrailingZeros(5100.05, 2), "5100.05");
-        assert.equal(toFixedWithoutTrailingZeros(5100.5, 1), "5100.5");
-        assert.equal(toFixedWithoutTrailingZeros(.025, 3), "0.025");
-        assert.equal(toFixedWithoutTrailingZeros(.05, 2), "0.05");
-        assert.equal(toFixedWithoutTrailingZeros(.5, 1), "0.5");
-        assert.equal(toFixedWithoutTrailingZeros(80, 1), "80");
-        assert.equal(toFixedWithoutTrailingZeros(8020, 1), "8020");
-        assert.equal(toFixedWithoutTrailingZeros(80, 0), "80");
-        assert.equal(toFixedWithoutTrailingZeros(8020, 0), "8020");
-    });
-    it("removes trailing zeros not right after decimal point", ()=>{
-        assert.equal(toFixedWithoutTrailingZeros(2.25, 5), "2.25");
-        assert.equal(toFixedWithoutTrailingZeros(2.5, 100), "2.5");
-    });
-});
\ No newline at end of file
+describe('toFixedWithoutTrailingZeros', () => {
+    it('removes trailing zeros right after decimal point', () => {
+        assert.equal(toFixedWithoutTrailingZeros(2, 5), '2');
+        assert.equal(toFixedWithoutTrailingZeros(5, 5), '5');
+    });
+    it('removes trailing zeros not right after decimal point', () => {
+        assert.equal(toFixedWithoutTrailingZeros(2.25, 5), '2.25');
+        assert.equal(toFixedWithoutTrailingZeros(2.5, 100), '2.5');
+    });
+    it('doesnt remove non-trailing zeros', () => {
+        assert.equal(toFixedWithoutTrailingZeros(12.025, 3), '12.025');
+        assert.equal(toFixedWithoutTrailingZeros(51.05, 2), '51.05');
+        assert.equal(toFixedWithoutTrailingZeros(5100.05, 2), '5100.05');
+        assert.equal(toFixedWithoutTrailingZeros(5100.5, 1), '5100.5');
+        assert.equal(toFixedWithoutTrailingZeros(0.025, 3), '0.025');
+        assert.equal(toFixedWithoutTrailingZeros(0.05, 2), '0.05');
+        assert.equal(toFixedWithoutTrailingZeros(0.5, 1), '0.5');
+        assert.equal(toFixedWithoutTrailingZeros(80, 1), '80');
+        assert.equal(toFixedWithoutTrailingZeros(8020, 1), '8020');
+        assert.equal(toFixedWithoutTrailingZeros(80, 0), '80');
+        assert.equal(toFixedWithoutTrailingZeros(8020, 0), '8020');
+    });
+    it('removes trailing zeros not right after decimal point', () => {
+        assert.equal(toFixedWithoutTrailingZeros(2.25, 5), '2.25');
+        assert.equal(toFixedWithoutTrailingZeros(2.5, 100), '2.5');
+    });
+});
diff --git a/src/shared/lib/FormatUtils.tsx b/src/shared/lib/FormatUtils.tsx
index cce08a9a67c..d4886819956 100644
--- a/src/shared/lib/FormatUtils.tsx
+++ b/src/shared/lib/FormatUtils.tsx
@@ -1,11 +1,14 @@
 import * as React from 'react';
 import * as _ from 'lodash';
 
-import { toConditionalPrecision } from "shared/lib/NumberUtils";
-import numeral from "numeral";
-
-export function toPrecision(value:number, precision:number, threshold:number)
-{
+import { toConditionalPrecision } from 'shared/lib/NumberUtils';
+import numeral from 'numeral';
+
+export function toPrecision(
+    value: number,
+    precision: number,
+    threshold: number
+) {
     // round to precision significant figures
     // with threshold being the upper bound on the numbers that are
     // rewritten in exponential notation
@@ -20,11 +23,14 @@ export function toPrecision(value:number, precision:number, threshold:number)
     return ret;
 }
 
-export function toFixedWithoutTrailingZeros(value:number, digits:number):string {
+export function toFixedWithoutTrailingZeros(
+    value: number,
+    digits: number
+): string {
     let fixed = value.toFixed(digits);
-    let zeros = "";
-    for (let i=0; i<digits; i++) {
-        zeros += "0";
+    let zeros = '';
+    for (let i = 0; i < digits; i++) {
+        zeros += '0';
     }
 
     return numeral(value).format(`0[.][${zeros}]`);
@@ -37,18 +43,17 @@ export function toFixedWithoutTrailingZeros(value:number, digits:number):string
  * If the default toFixed() function returns a zero value, then converts it to an inequality such as
  * <0.1, <0.01, <0.001, etc.
  */
-export function toFixedWithThreshold(value: number, digits: number): string
-{
+export function toFixedWithThreshold(value: number, digits: number): string {
     let fixed = value.toFixed(digits);
 
     // if we end up with 0.0...0, returns <0.0...1 instead
     if (value !== 0 && parseFloat(fixed) === 0) {
-        const floatingZeros = digits > 1 ? _.fill(Array(digits - 1), "0") : [];
+        const floatingZeros = digits > 1 ? _.fill(Array(digits - 1), '0') : [];
 
         // in case the value is negative, direction of the inequality changes
         // (because, for example, 0.02 < 0.1 but, -0.02 > -0.1)
         // we need to add the minus sign as well...
-        const prefix = value > 0 ? "<" : ">-";
+        const prefix = value > 0 ? '<' : '>-';
 
         fixed = `${prefix}0.${floatingZeros.join('')}1`;
     }
@@ -61,7 +66,6 @@ export function getPercentage(proportion: number, digits: number = 1) {
 }
 
 export function formatSignificanceValueWithStyle(value: number): JSX.Element {
-
     let formattedValue = <span>{toConditionalPrecision(value, 3, 0.01)}</span>;
     if (value < 0.05) {
         formattedValue = <b>{formattedValue}</b>;
@@ -70,17 +74,15 @@ export function formatSignificanceValueWithStyle(value: number): JSX.Element {
 }
 
 export function formatLogOddsRatio(logOddsRatio: number): string {
-
     if (logOddsRatio < -10) {
-        return "<-10";
+        return '<-10';
     } else if (logOddsRatio > 10) {
-        return ">10";
+        return '>10';
     }
     return logOddsRatio.toFixed(2);
 }
 
 export function roundLogRatio(logRatio: number, threshold: number): number {
-
     if (logRatio > threshold) {
         return threshold;
     } else if (logRatio < -threshold) {
@@ -91,26 +93,38 @@ export function roundLogRatio(logRatio: number, threshold: number): number {
 }
 
 export function toConditionalPrecisionWithMinimum(
-    positiveNumber:number,
-    precision:number,
-    precisionThreshold:number,
-    minimumExponent:number
-){
+    positiveNumber: number,
+    precision: number,
+    precisionThreshold: number,
+    minimumExponent: number
+) {
     if (positiveNumber === 0 || Math.log10(positiveNumber) < minimumExponent) {
-        return <span>&lt; 10<sup>{minimumExponent}</sup></span>;
+        return (
+            <span>
+                &lt; 10<sup>{minimumExponent}</sup>
+            </span>
+        );
     } else {
-        return toConditionalPrecision(positiveNumber, precision, precisionThreshold);
+        return toConditionalPrecision(
+            positiveNumber,
+            precision,
+            precisionThreshold
+        );
     }
 }
 
 /* difference between this function and the previous one is it will display
 percentages less than 1% as <1%
 */
-export function getMutationalSignaturePercentage(proportion: number, digits: number = 0) {//0.003 -> 0.3
-
-    if (100 * proportion  < 1){
-        return "<1%";
+export function getMutationalSignaturePercentage(
+    proportion: number,
+    digits: number = 0
+) {
+    //0.003 -> 0.3
+
+    if (100 * proportion < 1) {
+        return '<1%';
     }
 
     return `${toFixedWithThreshold(100 * proportion, digits)}%`;
-}
\ No newline at end of file
+}
diff --git a/src/shared/lib/GenericAssayUtils/GenericAssayCommonUtils.ts b/src/shared/lib/GenericAssayUtils/GenericAssayCommonUtils.ts
index 9f7041eab2b..76a59dc2206 100644
--- a/src/shared/lib/GenericAssayUtils/GenericAssayCommonUtils.ts
+++ b/src/shared/lib/GenericAssayUtils/GenericAssayCommonUtils.ts
@@ -1 +1 @@
-export const NOT_APPLICABLE_VALUE = "NA";
\ No newline at end of file
+export const NOT_APPLICABLE_VALUE = 'NA';
diff --git a/src/shared/lib/GenericAssayUtils/TreatmentUtils.ts b/src/shared/lib/GenericAssayUtils/TreatmentUtils.ts
index 3590331bdca..40eac379467 100644
--- a/src/shared/lib/GenericAssayUtils/TreatmentUtils.ts
+++ b/src/shared/lib/GenericAssayUtils/TreatmentUtils.ts
@@ -1,6 +1,10 @@
 import client from 'shared/api/cbioportalClientInstance';
 import { GenericAssayTypeConstants } from 'pages/resultsView/ResultsViewPageStore';
-import { GenericAssayMetaFilter, GenericAssayDataFilter, GenericAssayData } from 'shared/api/generated/CBioPortalAPI';
+import {
+    GenericAssayMetaFilter,
+    GenericAssayDataFilter,
+    GenericAssayData,
+} from 'shared/api/generated/CBioPortalAPI';
 import { MolecularProfile } from 'shared/api/generated/CBioPortalAPI';
 import _ from 'lodash';
 import { IDataQueryFilter } from '../StoreUtils';
@@ -8,49 +12,63 @@ import { NOT_APPLICABLE_VALUE } from './GenericAssayCommonUtils';
 
 // Define Treatment and TreatmentMolecularData type
 export type Treatment = {
-    'description': string;
-    'name': string;
-    'refLink': string;
-    'treatmentId': string;
-}
+    description: string;
+    name: string;
+    refLink: string;
+    treatmentId: string;
+};
 
 export type TreatmentMolecularData = {
-    'geneticProfileId': string;
-    'patientId': string;
-    'sampleId': string;
-    'stableId': string;
-    'studyId': string;
-    'treatmentId': string;
-    'uniquePatientKey': string;
-    'uniqueSampleKey': string;
-    'value': string;
-}
+    geneticProfileId: string;
+    patientId: string;
+    sampleId: string;
+    stableId: string;
+    studyId: string;
+    treatmentId: string;
+    uniquePatientKey: string;
+    uniqueSampleKey: string;
+    value: string;
+};
 
-export async function fetchTreatmentByMolecularProfileIds(molecularProfiles: MolecularProfile[]) {
-    const treatmentResponseProfiles = molecularProfiles.filter((profile) => {
-        return profile.genericAssayType === GenericAssayTypeConstants.TREATMENT_RESPONSE;
-    })
+export async function fetchTreatmentByMolecularProfileIds(
+    molecularProfiles: MolecularProfile[]
+) {
+    const treatmentResponseProfiles = molecularProfiles.filter(profile => {
+        return (
+            profile.genericAssayType ===
+            GenericAssayTypeConstants.TREATMENT_RESPONSE
+        );
+    });
     let treatments: Treatment[] = [];
     if (treatmentResponseProfiles.length > 0) {
-        const treatmentResponseProfileIds = treatmentResponseProfiles.map(profile => profile.molecularProfileId);
-        const treatmentsMeta = await client.fetchGenericAssayMetaDataUsingPOST(
-            {
-                genericAssayMetaFilter: {
-                    molecularProfileIds: treatmentResponseProfileIds
-                    // the Swagger-generated type expected by the client method below
-                    // incorrectly requires both molecularProfileIds and genericAssayStableIds;
-                    // use 'as' to tell TypeScript that this object really does fit.
-                } as GenericAssayMetaFilter
-            }
-        )
-        treatments = _.map(treatmentsMeta, (meta) => {
+        const treatmentResponseProfileIds = treatmentResponseProfiles.map(
+            profile => profile.molecularProfileId
+        );
+        const treatmentsMeta = await client.fetchGenericAssayMetaDataUsingPOST({
+            genericAssayMetaFilter: {
+                molecularProfileIds: treatmentResponseProfileIds,
+                // the Swagger-generated type expected by the client method below
+                // incorrectly requires both molecularProfileIds and genericAssayStableIds;
+                // use 'as' to tell TypeScript that this object really does fit.
+            } as GenericAssayMetaFilter,
+        });
+        treatments = _.map(treatmentsMeta, meta => {
             return {
                 treatmentId: meta.stableId,
-                name: "NAME" in meta.genericEntityMetaProperties ? meta.genericEntityMetaProperties["NAME"] : NOT_APPLICABLE_VALUE,
-                description: "DESCRIPTION" in meta.genericEntityMetaProperties ? meta.genericEntityMetaProperties["DESCRIPTION"] : NOT_APPLICABLE_VALUE,
-                refLink: "URL" in meta.genericEntityMetaProperties ? meta.genericEntityMetaProperties["URL"] : NOT_APPLICABLE_VALUE
-            }
-        })
+                name:
+                    'NAME' in meta.genericEntityMetaProperties
+                        ? meta.genericEntityMetaProperties['NAME']
+                        : NOT_APPLICABLE_VALUE,
+                description:
+                    'DESCRIPTION' in meta.genericEntityMetaProperties
+                        ? meta.genericEntityMetaProperties['DESCRIPTION']
+                        : NOT_APPLICABLE_VALUE,
+                refLink:
+                    'URL' in meta.genericEntityMetaProperties
+                        ? meta.genericEntityMetaProperties['URL']
+                        : NOT_APPLICABLE_VALUE,
+            };
+        });
     }
     return treatments;
 }
@@ -58,57 +76,70 @@ export async function fetchTreatmentByMolecularProfileIds(molecularProfiles: Mol
 export async function fetchTreatmentByTreatmentIds(treatmentIds: string[]) {
     let treatments: Treatment[] = [];
     if (treatmentIds.length > 0) {
-        const treatmentsMeta = await client.fetchGenericAssayMetaDataUsingPOST(
-            {
-                genericAssayMetaFilter: {
-                    genericAssayStableIds: treatmentIds
-                    // the Swagger-generated type expected by the client method below
-                    // incorrectly requires both molecularProfileIds and genericAssayStableIds;
-                    // use 'as' to tell TypeScript that this object really does fit.
-                } as GenericAssayMetaFilter
-            }
-        )
-        treatments = _.map(treatmentsMeta, (meta) => {
+        const treatmentsMeta = await client.fetchGenericAssayMetaDataUsingPOST({
+            genericAssayMetaFilter: {
+                genericAssayStableIds: treatmentIds,
+                // the Swagger-generated type expected by the client method below
+                // incorrectly requires both molecularProfileIds and genericAssayStableIds;
+                // use 'as' to tell TypeScript that this object really does fit.
+            } as GenericAssayMetaFilter,
+        });
+        treatments = _.map(treatmentsMeta, meta => {
             return {
                 treatmentId: meta.stableId,
-                name: "NAME" in meta.genericEntityMetaProperties ? meta.genericEntityMetaProperties["NAME"] : NOT_APPLICABLE_VALUE,
-                description: "DESCRIPTION" in meta.genericEntityMetaProperties ? meta.genericEntityMetaProperties["DESCRIPTION"] : NOT_APPLICABLE_VALUE,
-                refLink: "URL" in meta.genericEntityMetaProperties ? meta.genericEntityMetaProperties["URL"] : NOT_APPLICABLE_VALUE,
-            }
-        })
+                name:
+                    'NAME' in meta.genericEntityMetaProperties
+                        ? meta.genericEntityMetaProperties['NAME']
+                        : NOT_APPLICABLE_VALUE,
+                description:
+                    'DESCRIPTION' in meta.genericEntityMetaProperties
+                        ? meta.genericEntityMetaProperties['DESCRIPTION']
+                        : NOT_APPLICABLE_VALUE,
+                refLink:
+                    'URL' in meta.genericEntityMetaProperties
+                        ? meta.genericEntityMetaProperties['URL']
+                        : NOT_APPLICABLE_VALUE,
+            };
+        });
     }
     return treatments;
 }
 
-export async function fetchTreatmentData(treatmentIdsByProfile: {[molecularProfileId: string]: string[]}, sampleFilterByProfile: {[molecularProfileId: string]: IDataQueryFilter}) {
-    const params = Object.keys(treatmentIdsByProfile)
-        .map(profileId => ({
-            molecularProfileId: profileId,
-            genericAssayDataFilter: {
-                genericAssayStableIds: treatmentIdsByProfile[profileId],
-                ...sampleFilterByProfile[profileId]
-                // the Swagger-generated type expected by the client method below
-                // incorrectly requires both samples and a sample list;
-                // use 'as' to tell TypeScript that this object really does fit.
-            } as GenericAssayDataFilter
-        }
-    ));
-    const dataPromises = params.map(param => client.fetchGenericAssayDataInMolecularProfileUsingPOST(param));
+export async function fetchTreatmentData(
+    treatmentIdsByProfile: { [molecularProfileId: string]: string[] },
+    sampleFilterByProfile: { [molecularProfileId: string]: IDataQueryFilter }
+) {
+    const params = Object.keys(treatmentIdsByProfile).map(profileId => ({
+        molecularProfileId: profileId,
+        genericAssayDataFilter: {
+            genericAssayStableIds: treatmentIdsByProfile[profileId],
+            ...sampleFilterByProfile[profileId],
+            // the Swagger-generated type expected by the client method below
+            // incorrectly requires both samples and a sample list;
+            // use 'as' to tell TypeScript that this object really does fit.
+        } as GenericAssayDataFilter,
+    }));
+    const dataPromises = params.map(param =>
+        client.fetchGenericAssayDataInMolecularProfileUsingPOST(param)
+    );
     const results = await Promise.all(dataPromises);
-    const treatmentDataResult: TreatmentMolecularData[][] = _.map(results, (result: GenericAssayData[]) => {
-        return _.map(result, (item: GenericAssayData) => {
-            return {
-                geneticProfileId: item.molecularProfileId,
-                patientId: item.patientId,
-                sampleId: item.sampleId,
-                stableId: item.stableId,
-                studyId: item.studyId,
-                treatmentId: item.genericAssayStableId,
-                uniquePatientKey: item.uniquePatientKey,
-                uniqueSampleKey: item.uniqueSampleKey,
-                value: item.value
-            }
-        })
-    })
+    const treatmentDataResult: TreatmentMolecularData[][] = _.map(
+        results,
+        (result: GenericAssayData[]) => {
+            return _.map(result, (item: GenericAssayData) => {
+                return {
+                    geneticProfileId: item.molecularProfileId,
+                    patientId: item.patientId,
+                    sampleId: item.sampleId,
+                    stableId: item.stableId,
+                    studyId: item.studyId,
+                    treatmentId: item.genericAssayStableId,
+                    uniquePatientKey: item.uniquePatientKey,
+                    uniqueSampleKey: item.uniqueSampleKey,
+                    value: item.value,
+                };
+            });
+        }
+    );
     return treatmentDataResult;
-}
\ No newline at end of file
+}
diff --git a/src/shared/lib/GisticUtils.ts b/src/shared/lib/GisticUtils.ts
index 656da7fe1b9..8b521a8807e 100644
--- a/src/shared/lib/GisticUtils.ts
+++ b/src/shared/lib/GisticUtils.ts
@@ -1,41 +1,34 @@
-import {Gistic} from "../api/generated/CBioPortalAPIInternal";
+import { Gistic } from '../api/generated/CBioPortalAPIInternal';
 
-export function getGeneSymbols(gistic?: Gistic)
-{
-	if (gistic)
-		return gistic.genes.map(gene => gene.hugoGeneSymbol);
-	return [];
+export function getGeneSymbols(gistic?: Gistic) {
+    if (gistic) return gistic.genes.map(gene => gene.hugoGeneSymbol);
+    return [];
 }
 
 // Regular expression for parsing a cytoband string, eg. 17p12.1
 const cytobandRegExp = new RegExp(
-	"^" +
-	"([0-9]{1,2})" + // match the chr
-	"([pq])" +       // match the arm
-	"([0-9]{1,2})" + // match the first coordinate
-	"(?:\.?)" +      // noncapturing, optional, match the decimal point
-	"([0-9]{0,2})" + // optional, match the 2nd coordinate
-	"$"
+    '^' +
+    '([0-9]{1,2})' + // match the chr
+    '([pq])' + // match the arm
+    '([0-9]{1,2})' + // match the first coordinate
+    '(?:.?)' + // noncapturing, optional, match the decimal point
+    '([0-9]{0,2})' + // optional, match the 2nd coordinate
+        '$'
 );
 
-export function sortByCytoband(cyto1: string, cyto2: string)
-{
-	let x = cyto1.match(cytobandRegExp);
-	let y = cyto2.match(cytobandRegExp);
+export function sortByCytoband(cyto1: string, cyto2: string) {
+    let x = cyto1.match(cytobandRegExp);
+    let y = cyto2.match(cytobandRegExp);
 
-	if (!x || !y)
-		return +!!x - +!!y;
+    if (!x || !y) return +!!x - +!!y;
 
-	// sorts two cytobands,
-	// where a cytoband in an array of strings, e.g. [12, p, 11, 5] ~ 12p11.5
-	if (parseInt(x[1], 10) - parseInt(y[1], 10) !== 0)
-		return parseInt(x[1], 10) - parseInt(y[1], 10);
-	else if (x[2] === 'p' && y[2] === 'q')
-		return -1;
-	else if (x[2] === 'q' && y[2] === 'p')
-		return 1;
-	else if (x[2] === y[2])
-		return parseInt(x[3], 10) - parseInt(y[3], 10);
+    // sorts two cytobands,
+    // where a cytoband in an array of strings, e.g. [12, p, 11, 5] ~ 12p11.5
+    if (parseInt(x[1], 10) - parseInt(y[1], 10) !== 0)
+        return parseInt(x[1], 10) - parseInt(y[1], 10);
+    else if (x[2] === 'p' && y[2] === 'q') return -1;
+    else if (x[2] === 'q' && y[2] === 'p') return 1;
+    else if (x[2] === y[2]) return parseInt(x[3], 10) - parseInt(y[3], 10);
 
-	return 0;
+    return 0;
 }
diff --git a/src/shared/lib/HotspotSet.spec.ts b/src/shared/lib/HotspotSet.spec.ts
index 7a6088e825b..460c3ace77d 100644
--- a/src/shared/lib/HotspotSet.spec.ts
+++ b/src/shared/lib/HotspotSet.spec.ts
@@ -1,189 +1,206 @@
-import HotspotSet from "./HotspotSet";
-import { assert } from "chai";
+import HotspotSet from './HotspotSet';
+import { assert } from 'chai';
 
-describe("HotspotSet", ()=>{
-    it("works with empty input", ()=>{
+describe('HotspotSet', () => {
+    it('works with empty input', () => {
         const hss = new HotspotSet([]);
         assert.deepEqual(hss._getHotspotRegions(), []);
         assert(!hss.check(0));
         assert(!hss.check(3951));
         assert(!hss.check(-1395813));
         assert(!hss.check(0.351));
-        assert(!hss.check(0,10));
+        assert(!hss.check(0, 10));
     });
 
-    it("works with one input region", ()=>{
-        const hss = new HotspotSet([[0,5]]);
-        assert.deepEqual(hss._getHotspotRegions(), [[0,5]]);
+    it('works with one input region', () => {
+        const hss = new HotspotSet([[0, 5]]);
+        assert.deepEqual(hss._getHotspotRegions(), [[0, 5]]);
         assert(hss.check(3));
-        assert(hss.check(0,5));
-        assert(hss.check(-1,0));
+        assert(hss.check(0, 5));
+        assert(hss.check(-1, 0));
         assert(!hss.check(-1));
         assert(hss.check(0));
         assert(hss.check(5));
-        assert(hss.check(5,6));
-        assert(hss.check(5,10));
-        assert(hss.check(4,6));
-        assert(hss.check(2,4));
-        assert(!hss.check(6,6));
-        assert(!hss.check(6,10));
-        assert(!hss.check(-5,-1));
+        assert(hss.check(5, 6));
+        assert(hss.check(5, 10));
+        assert(hss.check(4, 6));
+        assert(hss.check(2, 4));
+        assert(!hss.check(6, 6));
+        assert(!hss.check(6, 10));
+        assert(!hss.check(-5, -1));
     });
 
-    it("works with one singleton region (i.e. single residue)", ()=>{
-        const hss = new HotspotSet([[-3,-3]]);
-        assert.deepEqual(hss._getHotspotRegions(), [[-3,-3]]);
-        assert(!hss.check(6,6));
-        assert(!hss.check(6,10));
-        assert(hss.check(-5,-1));
+    it('works with one singleton region (i.e. single residue)', () => {
+        const hss = new HotspotSet([[-3, -3]]);
+        assert.deepEqual(hss._getHotspotRegions(), [[-3, -3]]);
+        assert(!hss.check(6, 6));
+        assert(!hss.check(6, 10));
+        assert(hss.check(-5, -1));
         assert(hss.check(-3));
-        assert(hss.check(-3,-1));
-        assert(hss.check(-6,-1));
-        assert(!hss.check(-4,-3.5));
-        assert(!hss.check(-4,-4));
+        assert(hss.check(-3, -1));
+        assert(hss.check(-6, -1));
+        assert(!hss.check(-4, -3.5));
+        assert(!hss.check(-4, -4));
     });
 
-    it("works with one singleton region and one interval region", ()=>{
-        const hss = new HotspotSet([[-3,-3], [0,5]]);
-        assert.deepEqual(hss._getHotspotRegions(), [[-3,-3],[0,5]]);
+    it('works with one singleton region and one interval region', () => {
+        const hss = new HotspotSet([[-3, -3], [0, 5]]);
+        assert.deepEqual(hss._getHotspotRegions(), [[-3, -3], [0, 5]]);
         assert(hss.check(3));
-        assert(hss.check(0,5));
-        assert(hss.check(-1,0));
+        assert(hss.check(0, 5));
+        assert(hss.check(-1, 0));
         assert(!hss.check(-1));
         assert(hss.check(0));
         assert(hss.check(5));
-        assert(hss.check(5,6));
-        assert(hss.check(5,10));
-        assert(hss.check(4,6));
-        assert(hss.check(2,4));
-        assert(!hss.check(6,6));
-        assert(!hss.check(6,10));
-        assert(hss.check(-5,-1));
+        assert(hss.check(5, 6));
+        assert(hss.check(5, 10));
+        assert(hss.check(4, 6));
+        assert(hss.check(2, 4));
+        assert(!hss.check(6, 6));
+        assert(!hss.check(6, 10));
+        assert(hss.check(-5, -1));
         assert(hss.check(-3));
-        assert(hss.check(-3,-1));
-        assert(hss.check(-6,-1));
-        assert(!hss.check(-4,-3.5));
-        assert(!hss.check(-4,-4));
+        assert(hss.check(-3, -1));
+        assert(hss.check(-6, -1));
+        assert(!hss.check(-4, -3.5));
+        assert(!hss.check(-4, -4));
     });
 
-    it("works with one region, consolidated from a few input regions", ()=>{
-        const hss = new HotspotSet([[4,20], [0,5], [2,6], [-5,0], [3,3]]);
-        assert.deepEqual(hss._getHotspotRegions(), [[-5,20]]);
+    it('works with one region, consolidated from a few input regions', () => {
+        const hss = new HotspotSet([[4, 20], [0, 5], [2, 6], [-5, 0], [3, 3]]);
+        assert.deepEqual(hss._getHotspotRegions(), [[-5, 20]]);
         assert(hss.check(3));
-        assert(hss.check(0,5));
-        assert(hss.check(-1,0));
+        assert(hss.check(0, 5));
+        assert(hss.check(-1, 0));
         assert(hss.check(-1));
         assert(hss.check(0));
         assert(hss.check(5));
-        assert(hss.check(5,6));
-        assert(hss.check(5,10));
-        assert(hss.check(4,6));
-        assert(hss.check(2,4));
-        assert(!hss.check(21,21));
-        assert(!hss.check(25,30));
-        assert(!hss.check(-6,-6));
+        assert(hss.check(5, 6));
+        assert(hss.check(5, 10));
+        assert(hss.check(4, 6));
+        assert(hss.check(2, 4));
+        assert(!hss.check(21, 21));
+        assert(!hss.check(25, 30));
+        assert(!hss.check(-6, -6));
     });
 
-    it("works with two regions, consolidated from several input regions", ()=>{
-
-// two regions, consolidated from several
-        const hss = new HotspotSet([[4,20], [0,5], [30,60], [24,70], [2,6], [-5,0]]);
-        assert.deepEqual(hss._getHotspotRegions(), [[-5,20], [24,70]]);
+    it('works with two regions, consolidated from several input regions', () => {
+        // two regions, consolidated from several
+        const hss = new HotspotSet([
+            [4, 20],
+            [0, 5],
+            [30, 60],
+            [24, 70],
+            [2, 6],
+            [-5, 0],
+        ]);
+        assert.deepEqual(hss._getHotspotRegions(), [[-5, 20], [24, 70]]);
         assert(hss.check(3));
-        assert(hss.check(0,5));
-        assert(hss.check(-1,0));
+        assert(hss.check(0, 5));
+        assert(hss.check(-1, 0));
         assert(hss.check(-1));
         assert(hss.check(0));
         assert(hss.check(5));
-        assert(hss.check(5,6));
-        assert(hss.check(5,10));
-        assert(hss.check(4,6));
-        assert(hss.check(2,4));
-        assert(!hss.check(21,21));
-        assert(hss.check(25,30));
-        assert(!hss.check(-6,-6));
-        assert(hss.check(25,71));
+        assert(hss.check(5, 6));
+        assert(hss.check(5, 10));
+        assert(hss.check(4, 6));
+        assert(hss.check(2, 4));
+        assert(!hss.check(21, 21));
+        assert(hss.check(25, 30));
+        assert(!hss.check(-6, -6));
+        assert(hss.check(25, 71));
         assert(hss.check(24));
         assert(hss.check(70));
         assert(!hss.check(79));
-        assert(hss.check(69,72));
+        assert(hss.check(69, 72));
     });
 
-    it("works with three regions, consolidated from several input regions", ()=>{
+    it('works with three regions, consolidated from several input regions', () => {
         // three regions, consolidated from several
-        const hss = new HotspotSet([[-50, -30],  [-4, 3], [-4,9], [-4,1], [-30, -10], [100,200]]);
-        assert.deepEqual(hss._getHotspotRegions(), [[-50,-10], [-4,9], [100,200]]);
+        const hss = new HotspotSet([
+            [-50, -30],
+            [-4, 3],
+            [-4, 9],
+            [-4, 1],
+            [-30, -10],
+            [100, 200],
+        ]);
+        assert.deepEqual(hss._getHotspotRegions(), [
+            [-50, -10],
+            [-4, 9],
+            [100, 200],
+        ]);
         assert(hss.check(3));
-        assert(hss.check(0,5));
-        assert(hss.check(-1,0));
+        assert(hss.check(0, 5));
+        assert(hss.check(-1, 0));
         assert(hss.check(-1));
         assert(hss.check(0));
         assert(hss.check(5));
-        assert(hss.check(5,6));
-        assert(hss.check(5,10));
-        assert(hss.check(4,6));
-        assert(hss.check(2,4));
-        assert(!hss.check(21,21));
-        assert(!hss.check(25,30));
-        assert(!hss.check(-6,-6));
-        assert(!hss.check(25,71));
+        assert(hss.check(5, 6));
+        assert(hss.check(5, 10));
+        assert(hss.check(4, 6));
+        assert(hss.check(2, 4));
+        assert(!hss.check(21, 21));
+        assert(!hss.check(25, 30));
+        assert(!hss.check(-6, -6));
+        assert(!hss.check(25, 71));
         assert(!hss.check(24));
         assert(!hss.check(70));
         assert(!hss.check(79));
-        assert(!hss.check(69,72));
-        assert(hss.check(100,200));
+        assert(!hss.check(69, 72));
+        assert(hss.check(100, 200));
         assert(hss.check(200));
         assert(hss.check(100));
-        assert(hss.check(80,200));
-        assert(hss.check(80,220));
-        assert(hss.check(80,140));
-        assert(hss.check(120,180));
-        assert(hss.check(180,299));
+        assert(hss.check(80, 200));
+        assert(hss.check(80, 220));
+        assert(hss.check(80, 140));
+        assert(hss.check(120, 180));
+        assert(hss.check(180, 299));
         assert(!hss.check(99));
-        assert(!hss.check(95,99));
+        assert(!hss.check(95, 99));
     });
 
-    it("works with three regions, consolidated from several input regions, using `add` instead of constructor", ()=>{
+    it('works with three regions, consolidated from several input regions, using `add` instead of constructor', () => {
         const hss = new HotspotSet();
         assert.isFalse(hss.check(3));
-        hss.add(-4,3);
+        hss.add(-4, 3);
         assert(hss.check(3));
-        assert(hss.check(0,5));
-        assert(hss.check(-1,0));
+        assert(hss.check(0, 5));
+        assert(hss.check(-1, 0));
         assert(hss.check(-1));
         assert(hss.check(0));
         assert.isFalse(hss.check(5));
-        hss.add(-4,1);
-        hss.add(-4,9);
+        hss.add(-4, 1);
+        hss.add(-4, 9);
         hss.add(-50, -30);
         hss.add(-30, -10);
-        hss.add(100,200);
+        hss.add(100, 200);
         assert(hss.check(5));
-        assert(hss.check(5,6));
-        assert(hss.check(5,10));
-        assert(hss.check(4,6));
-        assert(hss.check(2,4));
-        assert(!hss.check(21,21));
-        assert(!hss.check(25,30));
-        assert(!hss.check(-6,-6));
-        assert(!hss.check(25,71));
+        assert(hss.check(5, 6));
+        assert(hss.check(5, 10));
+        assert(hss.check(4, 6));
+        assert(hss.check(2, 4));
+        assert(!hss.check(21, 21));
+        assert(!hss.check(25, 30));
+        assert(!hss.check(-6, -6));
+        assert(!hss.check(25, 71));
         assert(!hss.check(24));
         assert(!hss.check(70));
         assert(!hss.check(79));
-        assert(!hss.check(69,72));
-        assert(hss.check(100,200));
+        assert(!hss.check(69, 72));
+        assert(hss.check(100, 200));
         assert(hss.check(200));
         assert(hss.check(100));
-        assert(hss.check(80,200));
-        assert(hss.check(80,220));
-        assert(hss.check(80,140));
-        assert(hss.check(120,180));
-        assert(hss.check(180,299));
+        assert(hss.check(80, 200));
+        assert(hss.check(80, 220));
+        assert(hss.check(80, 140));
+        assert(hss.check(120, 180));
+        assert(hss.check(180, 299));
         assert(!hss.check(99));
-        assert(!hss.check(95,99));
+        assert(!hss.check(95, 99));
     });
 
     // TODO:
     /*it("survives a barrage of random tests",()=>{
     });*/
-});
\ No newline at end of file
+});
diff --git a/src/shared/lib/HotspotSet.ts b/src/shared/lib/HotspotSet.ts
index b146d64e512..e0a277492ac 100644
--- a/src/shared/lib/HotspotSet.ts
+++ b/src/shared/lib/HotspotSet.ts
@@ -10,27 +10,27 @@
  *  that is overlapped-with.
  */
 export default class HotspotSet {
-    private regions:[number,number][];
-    constructor(intervals?:[number,number][]) {
+    private regions: [number, number][];
+    constructor(intervals?: [number, number][]) {
         // intervals: [L:number, U:number][] where L <= U
         this.regions = intervals ? createHotspotRegions(intervals) : [];
     }
 
-    public check(x:number, y?:number):boolean {
+    public check(x: number, y?: number): boolean {
         //	if only x given, check if x lies in a hotspot
         //	if x and y given, check if [x,y] overlaps with a hotspot,
         //	    meaning is there a region [A,B] with (A<=y && B>=x)
 
-        if (typeof y === "undefined") {
+        if (typeof y === 'undefined') {
             y = x;
         }
 
         const regions = this.regions;
         let lowerIndexIncl = 0;
         let upperIndexExcl = regions.length;
-        let testRegionIndex:number;
-        let testRegion:[number, number];
-        let success:boolean = false;
+        let testRegionIndex: number;
+        let testRegion: [number, number];
+        let success: boolean = false;
         while (lowerIndexIncl < upperIndexExcl) {
             testRegionIndex = Math.floor((lowerIndexIncl + upperIndexExcl) / 2);
             testRegion = regions[testRegionIndex];
@@ -49,8 +49,8 @@ export default class HotspotSet {
         return success;
     }
 
-    public add(x:number, y:number):void {
-        this.regions.push([x,y]);
+    public add(x: number, y: number): void {
+        this.regions.push([x, y]);
         this.regions = createHotspotRegions(this.regions);
     }
 
@@ -60,7 +60,9 @@ export default class HotspotSet {
     }
 }
 
-function createHotspotRegions(intervals:[number,number][]):[number,number][] {
+function createHotspotRegions(
+    intervals: [number, number][]
+): [number, number][] {
     // in: intervals:[L:number, U:number][] where L <= U
     // out: a list of intervals (type [L:number, U:number][] where L <= U) such that
     //	every interval is disjoint and the list is in sorted order
@@ -69,15 +71,18 @@ function createHotspotRegions(intervals:[number,number][]):[number,number][] {
     }
 
     // First, sort the intervals by lower bound
-    intervals.sort(function(a,b) {
-        return ((a[0] < b[0]) ? -1 : 1);
+    intervals.sort(function(a, b) {
+        return a[0] < b[0] ? -1 : 1;
     });
     // Then, consolidate them
-    const ret:[number,number][] = [];
-    let currentCombinedInterval:[number,number] = [intervals[0][0], intervals[0][1]];
-    let currentInterval:[number,number];
+    const ret: [number, number][] = [];
+    let currentCombinedInterval: [number, number] = [
+        intervals[0][0],
+        intervals[0][1],
+    ];
+    let currentInterval: [number, number];
     let i = 1;
-    while (i<=intervals.length) {
+    while (i <= intervals.length) {
         if (i === intervals.length) {
             ret.push(currentCombinedInterval);
         } else {
@@ -90,11 +95,14 @@ function createHotspotRegions(intervals:[number,number][]):[number,number][] {
                 // overlaps, should combine
                 // by the sort order, we know that currentCombinedInterval[0] <= currentInterval[0],
                 //	so to combine we just need to take the max upper bound value
-                currentCombinedInterval[1] = Math.max(currentCombinedInterval[1], currentInterval[1]);
+                currentCombinedInterval[1] = Math.max(
+                    currentCombinedInterval[1],
+                    currentInterval[1]
+                );
             }
         }
         i++;
     }
 
     return ret;
-}
\ No newline at end of file
+}
diff --git a/src/shared/lib/IGVUtils.spec.ts b/src/shared/lib/IGVUtils.spec.ts
index 9e003983c31..c1b7a4215a6 100644
--- a/src/shared/lib/IGVUtils.spec.ts
+++ b/src/shared/lib/IGVUtils.spec.ts
@@ -1,357 +1,378 @@
 import { assert } from 'chai';
 
-import {CopyNumberSeg} from "shared/api/generated/CBioPortalAPI";
+import { CopyNumberSeg } from 'shared/api/generated/CBioPortalAPI';
 import {
     calcSegmentTrackHeight,
     generateSegmentFeatures,
     generateSegmentFileContent,
-    getModifiedTrackNames
-} from "./IGVUtils";
+    getModifiedTrackNames,
+} from './IGVUtils';
 
-describe("IGVUtils", () => {
+describe('IGVUtils', () => {
     let segments: CopyNumberSeg[];
 
     before(() => {
         segments = [
             {
-                "uniqueSampleKey": "VENHQS0xMy0xNTEwLTAxOm92X3RjZ2FfcHVi",
-                "uniquePatientKey": "VENHQS0xMy0xNTEwOm92X3RjZ2FfcHVi",
-                "patientId": "TCGA-13-1510",
-                "start": 3218610,
-                "end": 4734076,
-                "segmentMean": -0.6819,
-                "studyId": "ov_tcga_pub",
-                "sampleId": "TCGA-13-1510-01",
-                "chromosome": "1",
-                "numberOfProbes": 941
+                uniqueSampleKey: 'VENHQS0xMy0xNTEwLTAxOm92X3RjZ2FfcHVi',
+                uniquePatientKey: 'VENHQS0xMy0xNTEwOm92X3RjZ2FfcHVi',
+                patientId: 'TCGA-13-1510',
+                start: 3218610,
+                end: 4734076,
+                segmentMean: -0.6819,
+                studyId: 'ov_tcga_pub',
+                sampleId: 'TCGA-13-1510-01',
+                chromosome: '1',
+                numberOfProbes: 941,
             },
             {
-                "uniqueSampleKey": "VENHQS0xMy0xNTEwLTAxOm92X3RjZ2FfcHVi",
-                "uniquePatientKey": "VENHQS0xMy0xNTEwOm92X3RjZ2FfcHVi",
-                "patientId": "TCGA-13-1510",
-                "start": 4734514,
-                "end": 4735056,
-                "segmentMean": -2.742,
-                "studyId": "ov_tcga_pub",
-                "sampleId": "TCGA-13-1510-01",
-                "chromosome": "1",
-                "numberOfProbes": 2
+                uniqueSampleKey: 'VENHQS0xMy0xNTEwLTAxOm92X3RjZ2FfcHVi',
+                uniquePatientKey: 'VENHQS0xMy0xNTEwOm92X3RjZ2FfcHVi',
+                patientId: 'TCGA-13-1510',
+                start: 4734514,
+                end: 4735056,
+                segmentMean: -2.742,
+                studyId: 'ov_tcga_pub',
+                sampleId: 'TCGA-13-1510-01',
+                chromosome: '1',
+                numberOfProbes: 2,
             },
             {
-                "uniqueSampleKey": "VENHQS0xMy0xNTEwLTAxOm92X3RjZ2FfcHVi",
-                "uniquePatientKey": "VENHQS0xMy0xNTEwOm92X3RjZ2FfcHVi",
-                "patientId": "TCGA-13-1510",
-                "start": 4735908,
-                "end": 12155936,
-                "segmentMean": -0.6566,
-                "studyId": "ov_tcga_pub",
-                "sampleId": "TCGA-13-1510-01",
-                "chromosome": "1",
-                "numberOfProbes": 3984
+                uniqueSampleKey: 'VENHQS0xMy0xNTEwLTAxOm92X3RjZ2FfcHVi',
+                uniquePatientKey: 'VENHQS0xMy0xNTEwOm92X3RjZ2FfcHVi',
+                patientId: 'TCGA-13-1510',
+                start: 4735908,
+                end: 12155936,
+                segmentMean: -0.6566,
+                studyId: 'ov_tcga_pub',
+                sampleId: 'TCGA-13-1510-01',
+                chromosome: '1',
+                numberOfProbes: 3984,
             },
             {
-                "uniqueSampleKey": "VENHQS0xMy0xNTEwLTAxOm92X3RjZ2FfcHVi",
-                "uniquePatientKey": "VENHQS0xMy0xNTEwOm92X3RjZ2FfcHVi",
-                "patientId": "TCGA-13-1510",
-                "start": 12156236,
-                "end": 12262792,
-                "segmentMean": 0.1393,
-                "studyId": "ov_tcga_pub",
-                "sampleId": "TCGA-13-1510-01",
-                "chromosome": "1",
-                "numberOfProbes": 77
+                uniqueSampleKey: 'VENHQS0xMy0xNTEwLTAxOm92X3RjZ2FfcHVi',
+                uniquePatientKey: 'VENHQS0xMy0xNTEwOm92X3RjZ2FfcHVi',
+                patientId: 'TCGA-13-1510',
+                start: 12156236,
+                end: 12262792,
+                segmentMean: 0.1393,
+                studyId: 'ov_tcga_pub',
+                sampleId: 'TCGA-13-1510-01',
+                chromosome: '1',
+                numberOfProbes: 77,
             },
             {
-                "uniqueSampleKey": "VENHQS0xMy0xNTEwLTAxOm92X3RjZ2FfcHVi",
-                "uniquePatientKey": "VENHQS0xMy0xNTEwOm92X3RjZ2FfcHVi",
-                "patientId": "TCGA-13-1510",
-                "start": 12264355,
-                "end": 26281561,
-                "segmentMean": -0.6842,
-                "studyId": "ov_tcga_pub",
-                "sampleId": "TCGA-13-1510-01",
-                "chromosome": "1",
-                "numberOfProbes": 7347
+                uniqueSampleKey: 'VENHQS0xMy0xNTEwLTAxOm92X3RjZ2FfcHVi',
+                uniquePatientKey: 'VENHQS0xMy0xNTEwOm92X3RjZ2FfcHVi',
+                patientId: 'TCGA-13-1510',
+                start: 12264355,
+                end: 26281561,
+                segmentMean: -0.6842,
+                studyId: 'ov_tcga_pub',
+                sampleId: 'TCGA-13-1510-01',
+                chromosome: '1',
+                numberOfProbes: 7347,
             },
             {
-                "uniqueSampleKey": "VENHQS0xMy0xNTEwLTAxOm92X3RjZ2FfcHVi",
-                "uniquePatientKey": "VENHQS0xMy0xNTEwOm92X3RjZ2FfcHVi",
-                "patientId": "TCGA-13-1510",
-                "start": 26282396,
-                "end": 26355640,
-                "segmentMean": 0.1718,
-                "studyId": "ov_tcga_pub",
-                "sampleId": "TCGA-13-1510-01",
-                "chromosome": "1",
-                "numberOfProbes": 41
+                uniqueSampleKey: 'VENHQS0xMy0xNTEwLTAxOm92X3RjZ2FfcHVi',
+                uniquePatientKey: 'VENHQS0xMy0xNTEwOm92X3RjZ2FfcHVi',
+                patientId: 'TCGA-13-1510',
+                start: 26282396,
+                end: 26355640,
+                segmentMean: 0.1718,
+                studyId: 'ov_tcga_pub',
+                sampleId: 'TCGA-13-1510-01',
+                chromosome: '1',
+                numberOfProbes: 41,
             },
             {
-                "uniqueSampleKey": "VENHQS0xMy0xNTEwLTAxOm92X3RjZ2FfcHVi",
-                "uniquePatientKey": "VENHQS0xMy0xNTEwOm92X3RjZ2FfcHVi",
-                "patientId": "TCGA-13-1510",
-                "start": 26361404,
-                "end": 30593096,
-                "segmentMean": -0.6302,
-                "studyId": "ov_tcga_pub",
-                "sampleId": "TCGA-13-1510-01",
-                "chromosome": "23",
-                "numberOfProbes": 1833
+                uniqueSampleKey: 'VENHQS0xMy0xNTEwLTAxOm92X3RjZ2FfcHVi',
+                uniquePatientKey: 'VENHQS0xMy0xNTEwOm92X3RjZ2FfcHVi',
+                patientId: 'TCGA-13-1510',
+                start: 26361404,
+                end: 30593096,
+                segmentMean: -0.6302,
+                studyId: 'ov_tcga_pub',
+                sampleId: 'TCGA-13-1510-01',
+                chromosome: '23',
+                numberOfProbes: 1833,
             },
             {
-                "uniqueSampleKey": "VENHQS0xMy0xNTEwLTAxOm92X3RjZ2FfcHVi",
-                "uniquePatientKey": "VENHQS0xMy0xNTEwOm92X3RjZ2FfcHVi",
-                "patientId": "TCGA-13-1510",
-                "start": 30593355,
-                "end": 35255680,
-                "segmentMean": 0.103,
-                "studyId": "ov_tcga_pub",
-                "sampleId": "TCGA-13-1510-01",
-                "chromosome": "24",
-                "numberOfProbes": 2587
-            }
+                uniqueSampleKey: 'VENHQS0xMy0xNTEwLTAxOm92X3RjZ2FfcHVi',
+                uniquePatientKey: 'VENHQS0xMy0xNTEwOm92X3RjZ2FfcHVi',
+                patientId: 'TCGA-13-1510',
+                start: 30593355,
+                end: 35255680,
+                segmentMean: 0.103,
+                studyId: 'ov_tcga_pub',
+                sampleId: 'TCGA-13-1510-01',
+                chromosome: '24',
+                numberOfProbes: 2587,
+            },
         ];
     });
 
-    describe("generateSegmentFileContent", () => {
-        it("generates only the header for empty input", () => {
+    describe('generateSegmentFileContent', () => {
+        it('generates only the header for empty input', () => {
             assert.equal(
                 generateSegmentFileContent([]),
-                "ID\tchrom\tloc.start\tloc.end\tnum.mark\tseg.mean");
+                'ID\tchrom\tloc.start\tloc.end\tnum.mark\tseg.mean'
+            );
         });
 
-        it("generates proper row data for non-empty input", () => {
+        it('generates proper row data for non-empty input', () => {
             assert.equal(
                 generateSegmentFileContent(segments),
-                "ID\tchrom\tloc.start\tloc.end\tnum.mark\tseg.mean\n" +
-                "TCGA-13-1510-01\t1\t3218610\t4734076\t941\t-0.6819\n" +
-                "TCGA-13-1510-01\t1\t4734514\t4735056\t2\t-2.742\n" +
-                "TCGA-13-1510-01\t1\t4735908\t12155936\t3984\t-0.6566\n" +
-                "TCGA-13-1510-01\t1\t12156236\t12262792\t77\t0.1393\n" +
-                "TCGA-13-1510-01\t1\t12264355\t26281561\t7347\t-0.6842\n" +
-                "TCGA-13-1510-01\t1\t26282396\t26355640\t41\t0.1718\n" +
-                "TCGA-13-1510-01\t23\t26361404\t30593096\t1833\t-0.6302\n" +
-                "TCGA-13-1510-01\t24\t30593355\t35255680\t2587\t0.103");
+                'ID\tchrom\tloc.start\tloc.end\tnum.mark\tseg.mean\n' +
+                    'TCGA-13-1510-01\t1\t3218610\t4734076\t941\t-0.6819\n' +
+                    'TCGA-13-1510-01\t1\t4734514\t4735056\t2\t-2.742\n' +
+                    'TCGA-13-1510-01\t1\t4735908\t12155936\t3984\t-0.6566\n' +
+                    'TCGA-13-1510-01\t1\t12156236\t12262792\t77\t0.1393\n' +
+                    'TCGA-13-1510-01\t1\t12264355\t26281561\t7347\t-0.6842\n' +
+                    'TCGA-13-1510-01\t1\t26282396\t26355640\t41\t0.1718\n' +
+                    'TCGA-13-1510-01\t23\t26361404\t30593096\t1833\t-0.6302\n' +
+                    'TCGA-13-1510-01\t24\t30593355\t35255680\t2587\t0.103'
+            );
         });
     });
 
-    describe("generateSegmentFeatures", () => {
-        it("generates an empty array for empty input", () => {
+    describe('generateSegmentFeatures', () => {
+        it('generates an empty array for empty input', () => {
             assert.equal(generateSegmentFeatures([]).length, 0);
         });
 
-        it("generates proper segment features for non-empty input", () => {
-            assert.deepEqual(
-                generateSegmentFeatures(segments), [
-                    {
-                        "sampleKey": "VENHQS0xMy0xNTEwLTAxOm92X3RjZ2FfcHVi",
-                        "patient": "TCGA-13-1510",
-                        "start": 3218610,
-                        "end": 4734076,
-                        "value": -0.6819,
-                        "study": "ov_tcga_pub",
-                        "sample": "TCGA-13-1510-01",
-                        "chr": "1",
-                        "numberOfProbes": 941
-                    },
-                    {
-                        "sampleKey": "VENHQS0xMy0xNTEwLTAxOm92X3RjZ2FfcHVi",
-                        "patient": "TCGA-13-1510",
-                        "start": 4734514,
-                        "end": 4735056,
-                        "value": -2.742,
-                        "study": "ov_tcga_pub",
-                        "sample": "TCGA-13-1510-01",
-                        "chr": "1",
-                        "numberOfProbes": 2
-                    },
-                    {
-                        "sampleKey": "VENHQS0xMy0xNTEwLTAxOm92X3RjZ2FfcHVi",
-                        "patient": "TCGA-13-1510",
-                        "start": 4735908,
-                        "end": 12155936,
-                        "value": -0.6566,
-                        "study": "ov_tcga_pub",
-                        "sample": "TCGA-13-1510-01",
-                        "chr": "1",
-                        "numberOfProbes": 3984
-                    },
-                    {
-                        "sampleKey": "VENHQS0xMy0xNTEwLTAxOm92X3RjZ2FfcHVi",
-                        "patient": "TCGA-13-1510",
-                        "start": 12156236,
-                        "end": 12262792,
-                        "value": 0.1393,
-                        "study": "ov_tcga_pub",
-                        "sample": "TCGA-13-1510-01",
-                        "chr": "1",
-                        "numberOfProbes": 77
-                    },
-                    {
-                        "sampleKey": "VENHQS0xMy0xNTEwLTAxOm92X3RjZ2FfcHVi",
-                        "patient": "TCGA-13-1510",
-                        "start": 12264355,
-                        "end": 26281561,
-                        "value": -0.6842,
-                        "study": "ov_tcga_pub",
-                        "sample": "TCGA-13-1510-01",
-                        "chr": "1",
-                        "numberOfProbes": 7347
-                    },
-                    {
-                        "sampleKey": "VENHQS0xMy0xNTEwLTAxOm92X3RjZ2FfcHVi",
-                        "patient": "TCGA-13-1510",
-                        "start": 26282396,
-                        "end": 26355640,
-                        "value": 0.1718,
-                        "study": "ov_tcga_pub",
-                        "sample": "TCGA-13-1510-01",
-                        "chr": "1",
-                        "numberOfProbes": 41
-                    },
-                    {
-                        "sampleKey": "VENHQS0xMy0xNTEwLTAxOm92X3RjZ2FfcHVi",
-                        "patient": "TCGA-13-1510",
-                        "start": 26361404,
-                        "end": 30593096,
-                        "value": -0.6302,
-                        "study": "ov_tcga_pub",
-                        "sample": "TCGA-13-1510-01",
-                        "chr": "X",
-                        "numberOfProbes": 1833
-                    },
-                    {
-                        "sampleKey": "VENHQS0xMy0xNTEwLTAxOm92X3RjZ2FfcHVi",
-                        "patient": "TCGA-13-1510",
-                        "start": 30593355,
-                        "end": 35255680,
-                        "value": 0.103,
-                        "study": "ov_tcga_pub",
-                        "sample": "TCGA-13-1510-01",
-                        "chr": "Y",
-                        "numberOfProbes": 2587
-                    }
-                ]
-            );
+        it('generates proper segment features for non-empty input', () => {
+            assert.deepEqual(generateSegmentFeatures(segments), [
+                {
+                    sampleKey: 'VENHQS0xMy0xNTEwLTAxOm92X3RjZ2FfcHVi',
+                    patient: 'TCGA-13-1510',
+                    start: 3218610,
+                    end: 4734076,
+                    value: -0.6819,
+                    study: 'ov_tcga_pub',
+                    sample: 'TCGA-13-1510-01',
+                    chr: '1',
+                    numberOfProbes: 941,
+                },
+                {
+                    sampleKey: 'VENHQS0xMy0xNTEwLTAxOm92X3RjZ2FfcHVi',
+                    patient: 'TCGA-13-1510',
+                    start: 4734514,
+                    end: 4735056,
+                    value: -2.742,
+                    study: 'ov_tcga_pub',
+                    sample: 'TCGA-13-1510-01',
+                    chr: '1',
+                    numberOfProbes: 2,
+                },
+                {
+                    sampleKey: 'VENHQS0xMy0xNTEwLTAxOm92X3RjZ2FfcHVi',
+                    patient: 'TCGA-13-1510',
+                    start: 4735908,
+                    end: 12155936,
+                    value: -0.6566,
+                    study: 'ov_tcga_pub',
+                    sample: 'TCGA-13-1510-01',
+                    chr: '1',
+                    numberOfProbes: 3984,
+                },
+                {
+                    sampleKey: 'VENHQS0xMy0xNTEwLTAxOm92X3RjZ2FfcHVi',
+                    patient: 'TCGA-13-1510',
+                    start: 12156236,
+                    end: 12262792,
+                    value: 0.1393,
+                    study: 'ov_tcga_pub',
+                    sample: 'TCGA-13-1510-01',
+                    chr: '1',
+                    numberOfProbes: 77,
+                },
+                {
+                    sampleKey: 'VENHQS0xMy0xNTEwLTAxOm92X3RjZ2FfcHVi',
+                    patient: 'TCGA-13-1510',
+                    start: 12264355,
+                    end: 26281561,
+                    value: -0.6842,
+                    study: 'ov_tcga_pub',
+                    sample: 'TCGA-13-1510-01',
+                    chr: '1',
+                    numberOfProbes: 7347,
+                },
+                {
+                    sampleKey: 'VENHQS0xMy0xNTEwLTAxOm92X3RjZ2FfcHVi',
+                    patient: 'TCGA-13-1510',
+                    start: 26282396,
+                    end: 26355640,
+                    value: 0.1718,
+                    study: 'ov_tcga_pub',
+                    sample: 'TCGA-13-1510-01',
+                    chr: '1',
+                    numberOfProbes: 41,
+                },
+                {
+                    sampleKey: 'VENHQS0xMy0xNTEwLTAxOm92X3RjZ2FfcHVi',
+                    patient: 'TCGA-13-1510',
+                    start: 26361404,
+                    end: 30593096,
+                    value: -0.6302,
+                    study: 'ov_tcga_pub',
+                    sample: 'TCGA-13-1510-01',
+                    chr: 'X',
+                    numberOfProbes: 1833,
+                },
+                {
+                    sampleKey: 'VENHQS0xMy0xNTEwLTAxOm92X3RjZ2FfcHVi',
+                    patient: 'TCGA-13-1510',
+                    start: 30593355,
+                    end: 35255680,
+                    value: 0.103,
+                    study: 'ov_tcga_pub',
+                    sample: 'TCGA-13-1510-01',
+                    chr: 'Y',
+                    numberOfProbes: 2587,
+                },
+            ]);
         });
     });
 
-    describe("calcSegmentTrackHeight", () => {
-        it("returns the default min height for the empty input", () => {
+    describe('calcSegmentTrackHeight', () => {
+        it('returns the default min height for the empty input', () => {
             assert.equal(calcSegmentTrackHeight([]), 25);
         });
 
-        it("returns the default min height for an input with too few samples", () => {
-            const features: any[] = [{sampleKey: "sample1"}, {sampleKey: "sample2"}];
+        it('returns the default min height for an input with too few samples', () => {
+            const features: any[] = [
+                { sampleKey: 'sample1' },
+                { sampleKey: 'sample2' },
+            ];
 
             assert.equal(calcSegmentTrackHeight(features), 25);
         });
 
-        it("returns a value between min and max for moderate number of samples", () => {
+        it('returns a value between min and max for moderate number of samples', () => {
             // generate a dummy list of features with 20 samples
-            const features: any[] = [...Array(20).keys()].map(key => ({sampleKey: `sample${key}`}));
+            const features: any[] = [...Array(20).keys()].map(key => ({
+                sampleKey: `sample${key}`,
+            }));
 
             assert.equal(calcSegmentTrackHeight(features), 200);
         });
 
-        it("returns the default max height for large number of samples", () => {
+        it('returns the default max height for large number of samples', () => {
             // generate a dummy list of features with 100 samples
-            const features: any[] = [...Array(100).keys()].map(key => ({sampleKey: `sample${key}`}));
+            const features: any[] = [...Array(100).keys()].map(key => ({
+                sampleKey: `sample${key}`,
+            }));
 
             assert.equal(calcSegmentTrackHeight(features), 600);
         });
     });
 
-    describe("getModifiedTrackNames", () => {
-        it("returns an empty array for empty input", () => {
+    describe('getModifiedTrackNames', () => {
+        it('returns an empty array for empty input', () => {
             assert.equal(getModifiedTrackNames([], []).length, 0);
         });
 
-        it("returns newly added track names", () => {
+        it('returns newly added track names', () => {
             const currentTracks = [
                 {
-                    name: "MUT",
-                    type: "variant",
+                    name: 'MUT',
+                    type: 'variant',
                 },
             ];
 
             const nextTracks = [
                 {
-                    name: "CNA",
-                    type: "seg",
-                    displayMode: "FILL",
-                    features: []
+                    name: 'CNA',
+                    type: 'seg',
+                    displayMode: 'FILL',
+                    features: [],
                 },
                 {
-                    name: "MUT",
-                    type: "variant",
-                }
+                    name: 'MUT',
+                    type: 'variant',
+                },
             ];
 
-            assert.equal(getModifiedTrackNames(currentTracks, nextTracks)[0], "CNA");
+            assert.equal(
+                getModifiedTrackNames(currentTracks, nextTracks)[0],
+                'CNA'
+            );
         });
 
-        it("returns an empty array if no track has been changed", () => {
+        it('returns an empty array if no track has been changed', () => {
             const currentTracks = [
                 {
-                    name: "MUT",
-                    type: "variant",
+                    name: 'MUT',
+                    type: 'variant',
                 },
                 {
-                    name: "CNA",
-                    type: "seg",
-                    displayMode: "FILL",
-                    features: []
-                }
+                    name: 'CNA',
+                    type: 'seg',
+                    displayMode: 'FILL',
+                    features: [],
+                },
             ];
 
             const nextTracks = [
                 {
-                    name: "CNA",
-                    type: "seg",
-                    displayMode: "FILL",
-                    features: []
+                    name: 'CNA',
+                    type: 'seg',
+                    displayMode: 'FILL',
+                    features: [],
                 },
                 {
-                    name: "MUT",
-                    type: "variant",
-                }
+                    name: 'MUT',
+                    type: 'variant',
+                },
             ];
 
-            assert.equal(getModifiedTrackNames(currentTracks, nextTracks).length, 0);
+            assert.equal(
+                getModifiedTrackNames(currentTracks, nextTracks).length,
+                0
+            );
         });
 
-        it("returns only modified tracks names", () => {
+        it('returns only modified tracks names', () => {
             const currentTracks = [
                 {
-                    name: "CNA",
-                    type: "seg",
-                    displayMode: "FILL",
-                    features: []
+                    name: 'CNA',
+                    type: 'seg',
+                    displayMode: 'FILL',
+                    features: [],
                 },
                 {
-                    name: "MUT",
-                    type: "variant",
-                }
+                    name: 'MUT',
+                    type: 'variant',
+                },
             ];
 
             const nextTracks = [
                 {
-                    name: "MUT",
-                    type: "variant",
+                    name: 'MUT',
+                    type: 'variant',
                 },
                 {
-                    name: "CNA",
-                    type: "seg",
-                    displayMode: "FILL",
-                    features: [{
-                        patient: "p1",
-                        sample: "s1"
-                    }]
-                }
+                    name: 'CNA',
+                    type: 'seg',
+                    displayMode: 'FILL',
+                    features: [
+                        {
+                            patient: 'p1',
+                            sample: 's1',
+                        },
+                    ],
+                },
             ];
 
-            assert.equal(getModifiedTrackNames(currentTracks, nextTracks).length, 1);
-            assert.equal(getModifiedTrackNames(currentTracks, nextTracks)[0], "CNA");
+            assert.equal(
+                getModifiedTrackNames(currentTracks, nextTracks).length,
+                1
+            );
+            assert.equal(
+                getModifiedTrackNames(currentTracks, nextTracks)[0],
+                'CNA'
+            );
         });
     });
-});
\ No newline at end of file
+});
diff --git a/src/shared/lib/IGVUtils.ts b/src/shared/lib/IGVUtils.ts
index 69f1064b48a..d7b96ee81cb 100644
--- a/src/shared/lib/IGVUtils.ts
+++ b/src/shared/lib/IGVUtils.ts
@@ -1,8 +1,8 @@
-import * as _ from "lodash";
-import {CopyNumberSeg} from "shared/api/generated/CBioPortalAPI";
-import {TrackProps} from "shared/components/igv/IntegrativeGenomicsViewer";
+import * as _ from 'lodash';
+import { CopyNumberSeg } from 'shared/api/generated/CBioPortalAPI';
+import { TrackProps } from 'shared/components/igv/IntegrativeGenomicsViewer';
 
-export const WHOLE_GENOME = "all";
+export const WHOLE_GENOME = 'all';
 
 export type SegmentTrackFeatures = {
     chr: string;
@@ -16,49 +16,68 @@ export type SegmentTrackFeatures = {
     sampleKey: string;
 };
 
-export function defaultSegmentTrackProps()
-{
+export function defaultSegmentTrackProps() {
     return {
-        name: "CNA",
-        type: "seg",
-        displayMode: "FILL",
-        features: []
+        name: 'CNA',
+        type: 'seg',
+        displayMode: 'FILL',
+        features: [],
     };
 }
 
 export function keyTracksByName(tracks?: TrackProps) {
-    return _.keyBy(tracks || [], "name");
+    return _.keyBy(tracks || [], 'name');
 }
 
-export function getModifiedTrackNames(currentTracks: TrackProps[], nextTracks: TrackProps[])
-{
+export function getModifiedTrackNames(
+    currentTracks: TrackProps[],
+    nextTracks: TrackProps[]
+) {
     const currentByName = keyTracksByName(currentTracks);
     const nextByName = keyTracksByName(nextTracks);
 
     const tracksToUpdate = nextTracks
-        .filter(track => !_.isEqual(nextByName[track.name], currentByName[track.name]))
+        .filter(
+            track =>
+                !_.isEqual(nextByName[track.name], currentByName[track.name])
+        )
         .map(track => track.name);
 
     const tracksToRemove = _.difference(
         currentTracks.map(track => track.name),
-        nextTracks.map(track => track.name));
+        nextTracks.map(track => track.name)
+    );
 
     return [...tracksToUpdate, ...tracksToRemove];
 }
 
-export function generateSegmentFileContent(segments: CopyNumberSeg[]): string
-{
-    const header = ["ID", "chrom", "loc.start", "loc.end", "num.mark", "seg.mean"];
+export function generateSegmentFileContent(segments: CopyNumberSeg[]): string {
+    const header = [
+        'ID',
+        'chrom',
+        'loc.start',
+        'loc.end',
+        'num.mark',
+        'seg.mean',
+    ];
 
-    const rows = segments.map(segment =>
-        [segment.sampleId, segment.chromosome, segment.start, segment.end, segment.numberOfProbes, segment.segmentMean]);
+    const rows = segments.map(segment => [
+        segment.sampleId,
+        segment.chromosome,
+        segment.start,
+        segment.end,
+        segment.numberOfProbes,
+        segment.segmentMean,
+    ]);
 
     // combine header and data rows, join row data with tabs, and then join rows with new lines
-    return [header, ...rows].map(row => row.join("\t")).join("\n");
+    return [header, ...rows].map(row => row.join('\t')).join('\n');
 }
 
-export function generateSegmentFeatures(segments: CopyNumberSeg[]): SegmentTrackFeatures[] {
-    return (segments).map(segment => ({
+export function generateSegmentFeatures(
+    segments: CopyNumberSeg[]
+): SegmentTrackFeatures[] {
+    return segments.map(segment => ({
         chr: normalizeChromosome(segment.chromosome),
         start: segment.start,
         end: segment.end,
@@ -67,19 +86,17 @@ export function generateSegmentFeatures(segments: CopyNumberSeg[]): SegmentTrack
         patient: segment.patientId,
         study: segment.studyId,
         numberOfProbes: segment.numberOfProbes,
-        sampleKey: segment.uniqueSampleKey
+        sampleKey: segment.uniqueSampleKey,
     }));
 }
 
-export function normalizeChromosome(chromosome: string)
-{
-    switch (chromosome)
-    {
-        case "23": {
-            return "X";
+export function normalizeChromosome(chromosome: string) {
+    switch (chromosome) {
+        case '23': {
+            return 'X';
         }
-        case "24": {
-            return "Y";
+        case '24': {
+            return 'Y';
         }
         default: {
             return chromosome;
@@ -87,10 +104,17 @@ export function normalizeChromosome(chromosome: string)
     }
 }
 
-export function calcSegmentTrackHeight(features: SegmentTrackFeatures[],
-                                       maxHeight: number = 600,
-                                       minHeight: number = 25,
-                                       rowHeight: number = 10)
-{
-    return Math.max(Math.min(maxHeight, _.uniq(features.map(f => f.sampleKey)).length * rowHeight), minHeight);
+export function calcSegmentTrackHeight(
+    features: SegmentTrackFeatures[],
+    maxHeight: number = 600,
+    minHeight: number = 25,
+    rowHeight: number = 10
+) {
+    return Math.max(
+        Math.min(
+            maxHeight,
+            _.uniq(features.map(f => f.sampleKey)).length * rowHeight
+        ),
+        minHeight
+    );
 }
diff --git a/src/shared/lib/ILazyMobXTableApplicationDataStore.spec.ts b/src/shared/lib/ILazyMobXTableApplicationDataStore.spec.ts
index a98d3b85911..9d7e563a138 100644
--- a/src/shared/lib/ILazyMobXTableApplicationDataStore.spec.ts
+++ b/src/shared/lib/ILazyMobXTableApplicationDataStore.spec.ts
@@ -1,67 +1,134 @@
 import { assert } from 'chai';
-import {SimpleLazyMobXTableApplicationDataStore} from "./ILazyMobXTableApplicationDataStore";
+import { SimpleLazyMobXTableApplicationDataStore } from './ILazyMobXTableApplicationDataStore';
 
-describe('SimpleLazyMobXTableApplicationDataStore', ()=>{
-    let data:number[];
-    let metric:{[x:number]:number};
-    before(()=>{
-        data = [1,2,3,4,5,6,7,8];
+describe('SimpleLazyMobXTableApplicationDataStore', () => {
+    let data: number[];
+    let metric: { [x: number]: number };
+    before(() => {
+        data = [1, 2, 3, 4, 5, 6, 7, 8];
         metric = {
-            5:0,
-            6:1,
-            3:2,
-            4:3,
-            2:4,
-            7:5,
-            1:6,
-            8:7
+            5: 0,
+            6: 1,
+            3: 2,
+            4: 3,
+            2: 4,
+            7: 5,
+            1: 6,
+            8: 7,
         };
     });
-    it ("initializes with given data, and returns proper defaults", ()=>{
+    it('initializes with given data, and returns proper defaults', () => {
         let store = new SimpleLazyMobXTableApplicationDataStore<number>(data);
-        assert.deepEqual(store.allData, data, "all data set to constructor param");
-        assert.deepEqual(store.sortedData, data, "data is unchanged by sort with no given metric");
-        assert.deepEqual(store.sortedFilteredData, data, "data is unchanged by filter with no given filter");
-        assert.deepEqual(store.sortedFilteredSelectedData, [], "initially no data is selected");
-        assert.deepEqual(store.tableData, store.sortedFilteredData, "with no selected data, sortedFilteredData is the tableData");
+        assert.deepEqual(
+            store.allData,
+            data,
+            'all data set to constructor param'
+        );
+        assert.deepEqual(
+            store.sortedData,
+            data,
+            'data is unchanged by sort with no given metric'
+        );
+        assert.deepEqual(
+            store.sortedFilteredData,
+            data,
+            'data is unchanged by filter with no given filter'
+        );
+        assert.deepEqual(
+            store.sortedFilteredSelectedData,
+            [],
+            'initially no data is selected'
+        );
+        assert.deepEqual(
+            store.tableData,
+            store.sortedFilteredData,
+            'with no selected data, sortedFilteredData is the tableData'
+        );
 
-        assert.equal(store.filterString, "", "initial filter string is empty");
-        assert.isUndefined(store.sortAscending, "initially sort ascending if undefined");
-        assert.equal(store.allData.filter((d:number)=>store.isHighlighted(d)).length, 0, "initially nothing is highlighted");
+        assert.equal(store.filterString, '', 'initial filter string is empty');
+        assert.isUndefined(
+            store.sortAscending,
+            'initially sort ascending if undefined'
+        );
+        assert.equal(
+            store.allData.filter((d: number) => store.isHighlighted(d)).length,
+            0,
+            'initially nothing is highlighted'
+        );
     });
 
-    it("sorts according to given metric and direction", ()=>{
+    it('sorts according to given metric and direction', () => {
         let store = new SimpleLazyMobXTableApplicationDataStore<number>(data);
-        store.sortMetric = (d:number)=>metric[d];
-        assert.deepEqual(store.sortedData, [5,6,3,4,2,7,1,8], "sort correctly ascending");
+        store.sortMetric = (d: number) => metric[d];
+        assert.deepEqual(
+            store.sortedData,
+            [5, 6, 3, 4, 2, 7, 1, 8],
+            'sort correctly ascending'
+        );
         store.sortAscending = false;
-        assert.deepEqual(store.sortedData, [8,1,7,2,4,3,6,5], "sort correctly descending");
+        assert.deepEqual(
+            store.sortedData,
+            [8, 1, 7, 2, 4, 3, 6, 5],
+            'sort correctly descending'
+        );
     });
-    it("filters according to given filter, case: filter that takes filter string into account", ()=>{
+    it('filters according to given filter, case: filter that takes filter string into account', () => {
         let store = new SimpleLazyMobXTableApplicationDataStore<number>(data);
-        store.sortMetric = (d:number)=>metric[d];
-        assert.deepEqual(store.sortedFilteredData, [5,6,3,4,2,7,1,8], "no filter means just data in sorted order");
-        store.setFilter((d:number, str:string)=>(str.indexOf(d+"")>-1));
-        assert.deepEqual(store.sortedFilteredData, [], "empty filter string means no matches");
-        store.filterString = "516";
-        assert.deepEqual(store.sortedFilteredData, [5,6,1], "matches, in sorted order");
+        store.sortMetric = (d: number) => metric[d];
+        assert.deepEqual(
+            store.sortedFilteredData,
+            [5, 6, 3, 4, 2, 7, 1, 8],
+            'no filter means just data in sorted order'
+        );
+        store.setFilter((d: number, str: string) => str.indexOf(d + '') > -1);
+        assert.deepEqual(
+            store.sortedFilteredData,
+            [],
+            'empty filter string means no matches'
+        );
+        store.filterString = '516';
+        assert.deepEqual(
+            store.sortedFilteredData,
+            [5, 6, 1],
+            'matches, in sorted order'
+        );
     });
-    it("filters according to given filter, case: filter that does not take filter string into account", ()=>{
+    it('filters according to given filter, case: filter that does not take filter string into account', () => {
         let store = new SimpleLazyMobXTableApplicationDataStore<number>(data);
-        store.sortMetric = (d:number)=>metric[d];
-        assert.deepEqual(store.sortedFilteredData, [5,6,3,4,2,7,1,8], "no filter means just data in sorted order");
-        store.setFilter((d:number)=>(d>=4));
-        assert.deepEqual(store.sortedFilteredData, [5,6,4,7,8], "matches in sorted order");
+        store.sortMetric = (d: number) => metric[d];
+        assert.deepEqual(
+            store.sortedFilteredData,
+            [5, 6, 3, 4, 2, 7, 1, 8],
+            'no filter means just data in sorted order'
+        );
+        store.setFilter((d: number) => d >= 4);
+        assert.deepEqual(
+            store.sortedFilteredData,
+            [5, 6, 4, 7, 8],
+            'matches in sorted order'
+        );
     });
-    it("gives correct tableData, and resetFilter works properly", ()=>{
+    it('gives correct tableData, and resetFilter works properly', () => {
         let store = new SimpleLazyMobXTableApplicationDataStore<number>(data);
-        store.sortMetric = (d:number)=>metric[d];
-        store.setFilter((d:number)=>(d>=4));
-        assert.deepEqual(store.sortedFilteredData, [5,6,4,7,8], "matches in sorted order");
-        assert.deepEqual(store.tableData, store.sortedFilteredData, "no selection means tableData is sortedFilteredData");
-        store.filterString = "515";
+        store.sortMetric = (d: number) => metric[d];
+        store.setFilter((d: number) => d >= 4);
+        assert.deepEqual(
+            store.sortedFilteredData,
+            [5, 6, 4, 7, 8],
+            'matches in sorted order'
+        );
+        assert.deepEqual(
+            store.tableData,
+            store.sortedFilteredData,
+            'no selection means tableData is sortedFilteredData'
+        );
+        store.filterString = '515';
         store.resetFilter();
-        assert.deepEqual(store.sortedFilteredData, [5,6,3,4,2,7,1,8], "all data, in same sorted order");
-        assert.equal(store.filterString.length, 0, "filter string reset");
+        assert.deepEqual(
+            store.sortedFilteredData,
+            [5, 6, 3, 4, 2, 7, 1, 8],
+            'all data, in same sorted order'
+        );
+        assert.equal(store.filterString.length, 0, 'filter string reset');
     });
-});
\ No newline at end of file
+});
diff --git a/src/shared/lib/ILazyMobXTableApplicationDataStore.ts b/src/shared/lib/ILazyMobXTableApplicationDataStore.ts
index 889d5d85738..b4a426dce0d 100644
--- a/src/shared/lib/ILazyMobXTableApplicationDataStore.ts
+++ b/src/shared/lib/ILazyMobXTableApplicationDataStore.ts
@@ -1,40 +1,53 @@
-import {SortMetric} from "./ISortMetric";
-import {observable, computed, action} from "mobx";
-import {lazyMobXTableSort} from "../components/lazyMobXTable/LazyMobXTable";
-import { SHOW_ALL_PAGE_SIZE as PAGINATION_SHOW_ALL} from "shared/components/paginationControls/PaginationControls";
+import { SortMetric } from './ISortMetric';
+import { observable, computed, action } from 'mobx';
+import { lazyMobXTableSort } from '../components/lazyMobXTable/LazyMobXTable';
+import { SHOW_ALL_PAGE_SIZE as PAGINATION_SHOW_ALL } from 'shared/components/paginationControls/PaginationControls';
 export interface ILazyMobXTableApplicationDataStore<T> {
     // setter
-    setFilter:(fn:(d:T, filterString?:string, filterStringUpper?:string, filterStringLower?:string)=>boolean)=>void;
+    setFilter: (
+        fn: (
+            d: T,
+            filterString?: string,
+            filterStringUpper?: string,
+            filterStringLower?: string
+        ) => boolean
+    ) => void;
 
     // mobX computed getters
-    allData:T[];
-    sortedData:T[];
-    sortedFilteredData:T[];
-    sortedFilteredSelectedData:T[];
-    tableData:T[];
-    visibleData:T[];
+    allData: T[];
+    sortedData: T[];
+    sortedFilteredData: T[];
+    sortedFilteredSelectedData: T[];
+    tableData: T[];
+    visibleData: T[];
 
     // exposed methods for interacting with data
-    isHighlighted:(d:T)=>boolean;
+    isHighlighted: (d: T) => boolean;
 
     // mobX observable public properties (note you can still implement with getter and setter)
-    filterString:string;
-    sortAscending:boolean|undefined;
-    sortMetric:SortMetric<T>|undefined;
-    itemsPerPage:number;
-    page:number;
-};
-
-export class SimpleGetterLazyMobXTableApplicationDataStore<T> implements ILazyMobXTableApplicationDataStore<T> {
-    @observable protected dataFilter:(d:T, filterString?:string, filterStringUpper?:string, filterStringLower?:string)=>boolean;
-    @observable protected dataSelector:(d:T)=>boolean;
-    @observable public dataHighlighter:(d:T)=>boolean;
-
-    @observable public filterString:string;
-    @observable public sortMetric:SortMetric<T>|undefined;
-    @observable public sortAscending:boolean|undefined;
-    @observable public page:number;
-    @observable public itemsPerPage:number;
+    filterString: string;
+    sortAscending: boolean | undefined;
+    sortMetric: SortMetric<T> | undefined;
+    itemsPerPage: number;
+    page: number;
+}
+
+export class SimpleGetterLazyMobXTableApplicationDataStore<T>
+    implements ILazyMobXTableApplicationDataStore<T> {
+    @observable protected dataFilter: (
+        d: T,
+        filterString?: string,
+        filterStringUpper?: string,
+        filterStringLower?: string
+    ) => boolean;
+    @observable protected dataSelector: (d: T) => boolean;
+    @observable public dataHighlighter: (d: T) => boolean;
+
+    @observable public filterString: string;
+    @observable public sortMetric: SortMetric<T> | undefined;
+    @observable public sortAscending: boolean | undefined;
+    @observable public page: number;
+    @observable public itemsPerPage: number;
 
     @computed get allData() {
         return this.getData();
@@ -42,7 +55,8 @@ export class SimpleGetterLazyMobXTableApplicationDataStore<T> implements ILazyMo
     @computed get sortedData() {
         // if not defined, use default values for sortMetric and sortAscending
         const sortMetric = this.sortMetric || (() => 0);
-        const sortAscending = this.sortAscending !== undefined ? this.sortAscending : true;
+        const sortAscending =
+            this.sortAscending !== undefined ? this.sortAscending : true;
 
         return lazyMobXTableSort(this.allData, sortMetric, sortAscending);
     }
@@ -50,7 +64,14 @@ export class SimpleGetterLazyMobXTableApplicationDataStore<T> implements ILazyMo
     @computed get sortedFilteredData() {
         const filterStringUpper = this.filterString.toUpperCase();
         const filterStringLower = this.filterString.toLowerCase();
-        return this.sortedData.filter((d:T)=>this.dataFilter(d, this.filterString, filterStringUpper, filterStringLower));
+        return this.sortedData.filter((d: T) =>
+            this.dataFilter(
+                d,
+                this.filterString,
+                filterStringUpper,
+                filterStringLower
+            )
+        );
     }
 
     @computed get sortedFilteredSelectedData() {
@@ -69,7 +90,10 @@ export class SimpleGetterLazyMobXTableApplicationDataStore<T> implements ILazyMo
         if (this.itemsPerPage === PAGINATION_SHOW_ALL) {
             return this.tableData;
         } else {
-            return this.tableData.slice(this.page * this.itemsPerPage, (this.page + 1) * this.itemsPerPage);
+            return this.tableData.slice(
+                this.page * this.itemsPerPage,
+                (this.page + 1) * this.itemsPerPage
+            );
         }
     }
 
@@ -77,30 +101,38 @@ export class SimpleGetterLazyMobXTableApplicationDataStore<T> implements ILazyMo
         return this.tableData.length === this.allData.length;
     }
 
-    @action public setFilter(fn:(d:T, filterString?:string, filterStringUpper?:string, filterStringLower?:string)=>boolean) {
+    @action public setFilter(
+        fn: (
+            d: T,
+            filterString?: string,
+            filterStringUpper?: string,
+            filterStringLower?: string
+        ) => boolean
+    ) {
         this.dataFilter = fn;
     }
 
     @action public resetFilter() {
-        this.dataFilter = ()=>true;
-        this.filterString = "";
+        this.dataFilter = () => true;
+        this.filterString = '';
     }
 
-    public isHighlighted(d:T) {
+    public isHighlighted(d: T) {
         return this.dataHighlighter(d);
     }
 
-
-    constructor(private getData:()=>T[]) {
-        this.filterString = "";
-        this.dataHighlighter = ()=>false;
-        this.dataSelector = ()=>false;
-        this.dataFilter = ()=>true;
+    constructor(private getData: () => T[]) {
+        this.filterString = '';
+        this.dataHighlighter = () => false;
+        this.dataSelector = () => false;
+        this.dataFilter = () => true;
     }
 }
 
-export class SimpleLazyMobXTableApplicationDataStore<T> extends SimpleGetterLazyMobXTableApplicationDataStore<T> {
-    constructor(data:T[]) {
-        super(()=>data);
+export class SimpleLazyMobXTableApplicationDataStore<
+    T
+> extends SimpleGetterLazyMobXTableApplicationDataStore<T> {
+    constructor(data: T[]) {
+        super(() => data);
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/lib/ILazyMobXTableApplicationLazyDownloadDataFetcher.ts b/src/shared/lib/ILazyMobXTableApplicationLazyDownloadDataFetcher.ts
index 742e77f703a..b8426b2a9f7 100644
--- a/src/shared/lib/ILazyMobXTableApplicationLazyDownloadDataFetcher.ts
+++ b/src/shared/lib/ILazyMobXTableApplicationLazyDownloadDataFetcher.ts
@@ -1,4 +1,4 @@
 export interface ILazyMobXTableApplicationLazyDownloadDataFetcher {
     // fetch and cache all lazy the data (from API) required for download
     fetchAndCacheAllLazyData: () => Promise<any[]>;
-}
\ No newline at end of file
+}
diff --git a/src/shared/lib/ISortMetric.ts b/src/shared/lib/ISortMetric.ts
index 900d6c47770..e4ddeca56b4 100644
--- a/src/shared/lib/ISortMetric.ts
+++ b/src/shared/lib/ISortMetric.ts
@@ -1 +1,5 @@
-export type SortMetric<T> = ((d:T)=>number|null) | ((d:T)=>(number|null)[]) | ((d:T)=>string|null) | ((d:T)=>(string|null)[]);
\ No newline at end of file
+export type SortMetric<T> =
+    | ((d: T) => number | null)
+    | ((d: T) => (number | null)[])
+    | ((d: T) => string | null)
+    | ((d: T) => (string | null)[]);
diff --git a/src/shared/lib/LazyLoadedTableCell.tsx b/src/shared/lib/LazyLoadedTableCell.tsx
index f229843b858..0ffad8357f6 100644
--- a/src/shared/lib/LazyLoadedTableCell.tsx
+++ b/src/shared/lib/LazyLoadedTableCell.tsx
@@ -1,25 +1,22 @@
-import * as React from "react";
-import {CacheData} from "./LazyMobXCache";
-import {TableCellStatus, TableCellStatusIndicator} from "cbioportal-frontend-commons";
-export default function LazyLoadedTableCell<D,T,M=any>(
-    getCacheData:(d:D)=>CacheData<T,M>|null,
-    render:(t:T, d?:D)=>JSX.Element,
-    naAlt?:string
-):(d:D)=>JSX.Element {
-    return (d:D)=>{
-        const cacheData:CacheData<T,M>|null = getCacheData(d);
+import * as React from 'react';
+import { CacheData } from './LazyMobXCache';
+import {
+    TableCellStatus,
+    TableCellStatusIndicator,
+} from 'cbioportal-frontend-commons';
+export default function LazyLoadedTableCell<D, T, M = any>(
+    getCacheData: (d: D) => CacheData<T, M> | null,
+    render: (t: T, d?: D) => JSX.Element,
+    naAlt?: string
+): (d: D) => JSX.Element {
+    return (d: D) => {
+        const cacheData: CacheData<T, M> | null = getCacheData(d);
         if (cacheData === null) {
             return (
-                <TableCellStatusIndicator
-                    status={TableCellStatus.LOADING}
-                />
-            );
-        } else if (cacheData.status === "error") {
-            return (
-                <TableCellStatusIndicator
-                    status={TableCellStatus.ERROR}
-                />
+                <TableCellStatusIndicator status={TableCellStatus.LOADING} />
             );
+        } else if (cacheData.status === 'error') {
+            return <TableCellStatusIndicator status={TableCellStatus.ERROR} />;
         } else if (cacheData.data === null) {
             return (
                 <TableCellStatusIndicator
@@ -31,4 +28,4 @@ export default function LazyLoadedTableCell<D,T,M=any>(
             return render(cacheData.data, d);
         }
     };
-}
\ No newline at end of file
+}
diff --git a/src/shared/lib/LazyMemo.spec.ts b/src/shared/lib/LazyMemo.spec.ts
index 4f6a6d17f51..6d8b2a88d98 100644
--- a/src/shared/lib/LazyMemo.spec.ts
+++ b/src/shared/lib/LazyMemo.spec.ts
@@ -1,50 +1,121 @@
-import {assert} from "chai";
-import LazyMemo from "./LazyMemo";
+import { assert } from 'chai';
+import LazyMemo from './LazyMemo';
 
-describe("LazyMemo", () => {
-    it("correct lifecycle of two elements", ()=>{
+describe('LazyMemo', () => {
+    it('correct lifecycle of two elements', () => {
         // set up
-        const computationCount:{[eltId:string]:number} = {};
-        const memo = new LazyMemo((elt:{ id:string})=>elt.id, (elt:{ id:string})=>{
-            computationCount[elt.id] = computationCount[elt.id] || 0;
-            computationCount[elt.id] += 1;
-            return elt.id+elt.id;
-        });
+        const computationCount: { [eltId: string]: number } = {};
+        const memo = new LazyMemo(
+            (elt: { id: string }) => elt.id,
+            (elt: { id: string }) => {
+                computationCount[elt.id] = computationCount[elt.id] || 0;
+                computationCount[elt.id] += 1;
+                return elt.id + elt.id;
+            }
+        );
 
-        const elt = {id:"yo"};
-        assert.isFalse(memo.has(elt), "element doesnt exist before its requested");
-        assert.equal(computationCount[elt.id], undefined, "no computation when `has` is called")
-        assert.equal(memo.get(elt), "yoyo", "computation works correctly");
-        assert.equal(computationCount[elt.id], 1, "computation happened once because it was requested");
-        assert.isTrue(memo.has(elt), "element now exists because it was requested");
-        assert.equal(computationCount[elt.id], 1, "`has` still doesnt trigger computation");
-        assert.equal(memo.get(elt), "yoyo", "element is still the same");
-        assert.equal(computationCount[elt.id], 1, "computation didnt happen again");
-        assert.isTrue(memo.has(elt), "element still exists");
-        assert.equal(computationCount[elt.id], 1, "`has` still doesnt trigger computation");
+        const elt = { id: 'yo' };
+        assert.isFalse(
+            memo.has(elt),
+            'element doesnt exist before its requested'
+        );
+        assert.equal(
+            computationCount[elt.id],
+            undefined,
+            'no computation when `has` is called'
+        );
+        assert.equal(memo.get(elt), 'yoyo', 'computation works correctly');
+        assert.equal(
+            computationCount[elt.id],
+            1,
+            'computation happened once because it was requested'
+        );
+        assert.isTrue(
+            memo.has(elt),
+            'element now exists because it was requested'
+        );
+        assert.equal(
+            computationCount[elt.id],
+            1,
+            '`has` still doesnt trigger computation'
+        );
+        assert.equal(memo.get(elt), 'yoyo', 'element is still the same');
+        assert.equal(
+            computationCount[elt.id],
+            1,
+            'computation didnt happen again'
+        );
+        assert.isTrue(memo.has(elt), 'element still exists');
+        assert.equal(
+            computationCount[elt.id],
+            1,
+            '`has` still doesnt trigger computation'
+        );
 
-        const elt2 = {id:"hi"};
-        assert.isFalse(memo.has(elt2), "element doesnt exist before its requested");
-        assert.equal(computationCount[elt2.id], undefined, "no computation when `has` is called")
-        assert.equal(memo.get(elt2), "hihi", "computation works correctly");
-        assert.equal(computationCount[elt2.id], 1, "computation happened once because it was requested");
-        assert.isTrue(memo.has(elt2), "element now exists because it was requested");
-        assert.equal(computationCount[elt2.id], 1, "`has` still doesnt trigger computation");
-        assert.equal(memo.get(elt2), "hihi", "element is still the same");
-        assert.equal(computationCount[elt2.id], 1, "computation didnt happen again");
-        assert.isTrue(memo.has(elt2), "element still exists");
-        assert.equal(computationCount[elt2.id], 1, "`has` still doesnt trigger computation");
+        const elt2 = { id: 'hi' };
+        assert.isFalse(
+            memo.has(elt2),
+            'element doesnt exist before its requested'
+        );
+        assert.equal(
+            computationCount[elt2.id],
+            undefined,
+            'no computation when `has` is called'
+        );
+        assert.equal(memo.get(elt2), 'hihi', 'computation works correctly');
+        assert.equal(
+            computationCount[elt2.id],
+            1,
+            'computation happened once because it was requested'
+        );
+        assert.isTrue(
+            memo.has(elt2),
+            'element now exists because it was requested'
+        );
+        assert.equal(
+            computationCount[elt2.id],
+            1,
+            '`has` still doesnt trigger computation'
+        );
+        assert.equal(memo.get(elt2), 'hihi', 'element is still the same');
+        assert.equal(
+            computationCount[elt2.id],
+            1,
+            'computation didnt happen again'
+        );
+        assert.isTrue(memo.has(elt2), 'element still exists');
+        assert.equal(
+            computationCount[elt2.id],
+            1,
+            '`has` still doesnt trigger computation'
+        );
 
         // check that `elt` is still there
-        assert.equal(memo.get(elt), "yoyo", "element is still the same");
-        assert.equal(computationCount[elt.id], 1, "computation didnt happen again");
-        assert.isTrue(memo.has(elt), "element still exists");
-        assert.equal(computationCount[elt.id], 1, "`has` still doesnt trigger computation");
+        assert.equal(memo.get(elt), 'yoyo', 'element is still the same');
+        assert.equal(
+            computationCount[elt.id],
+            1,
+            'computation didnt happen again'
+        );
+        assert.isTrue(memo.has(elt), 'element still exists');
+        assert.equal(
+            computationCount[elt.id],
+            1,
+            '`has` still doesnt trigger computation'
+        );
 
         // check that `elt2` is still there
-        assert.equal(memo.get(elt2), "hihi", "element is still the same");
-        assert.equal(computationCount[elt2.id], 1, "computation didnt happen again");
-        assert.isTrue(memo.has(elt2), "element still exists");
-        assert.equal(computationCount[elt2.id], 1, "`has` still doesnt trigger computation");
+        assert.equal(memo.get(elt2), 'hihi', 'element is still the same');
+        assert.equal(
+            computationCount[elt2.id],
+            1,
+            'computation didnt happen again'
+        );
+        assert.isTrue(memo.has(elt2), 'element still exists');
+        assert.equal(
+            computationCount[elt2.id],
+            1,
+            '`has` still doesnt trigger computation'
+        );
     });
-});
\ No newline at end of file
+});
diff --git a/src/shared/lib/LazyMemo.ts b/src/shared/lib/LazyMemo.ts
index 55b4a820170..4819edaba5d 100644
--- a/src/shared/lib/LazyMemo.ts
+++ b/src/shared/lib/LazyMemo.ts
@@ -1,18 +1,18 @@
-export default class LazyMemo<I,O> {
-    private memo:{[key:string]:O} = {};
+export default class LazyMemo<I, O> {
+    private memo: { [key: string]: O } = {};
 
     constructor(
-        private inputToKey:(input:I)=>string,
-        private inputToOutput:(input:I)=>O
+        private inputToKey: (input: I) => string,
+        private inputToOutput: (input: I) => O
     ) {}
 
-    public get(i:I) {
+    public get(i: I) {
         const key = this.inputToKey(i);
         this.memo[key] = this.memo[key] || this.inputToOutput(i);
         return this.memo[key];
     }
 
-    public has(i:I) {
+    public has(i: I) {
         return this.inputToKey(i) in this.memo;
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/lib/LazyMobXCache.spec.ts b/src/shared/lib/LazyMobXCache.spec.ts
index f24728d5a39..bb07d6e9c08 100644
--- a/src/shared/lib/LazyMobXCache.spec.ts
+++ b/src/shared/lib/LazyMobXCache.spec.ts
@@ -1,411 +1,624 @@
 import { assert } from 'chai';
-import {default as sinon, SinonSpy} from 'sinon';
-import lolex from "lolex";
-import {Clock} from "lolex";
-import {default as LazyMobXCache, CacheData} from "./LazyMobXCache";
-import mobx from "mobx";
-import {whyRun} from "mobx";
+import { default as sinon, SinonSpy } from 'sinon';
+import lolex from 'lolex';
+import { Clock } from 'lolex';
+import { default as LazyMobXCache, CacheData } from './LazyMobXCache';
+import mobx from 'mobx';
+import { whyRun } from 'mobx';
 
 // We have to use 'done' rather than fake clock because for some reason fake clock isn't working with async/await
 //  in LazyMobXCache.populate
-type Query = {numAsString:string, shouldFail?:boolean, shouldDelay?: boolean, shouldNotExist?:boolean, meta?:string};
+type Query = {
+    numAsString: string;
+    shouldFail?: boolean;
+    shouldDelay?: boolean;
+    shouldNotExist?: boolean;
+    meta?: string;
+};
 
-function useFakeClock(callback:(clock:Clock)=>void) {
+function useFakeClock(callback: (clock: Clock) => void) {
     let clock = lolex.install();
     callback(clock);
     clock.uninstall();
 }
-describe("LazyMobXCache", ()=>{
-    let cache:LazyMobXCache<number, Query, string>;
+describe('LazyMobXCache', () => {
+    let cache: LazyMobXCache<number, Query, string>;
 
-    let fetch:SinonSpy;
-    beforeEach(()=>{
-        fetch = sinon.spy((queries:Query[],
-                           multiplier:number, translator:number)=>{
-            let data:number[] | null = [];
-            for (let i=0; i<queries.length; i++) {
-                if (queries[i].shouldFail) {
-                    data = null;
-                    break;
-                } else if (!queries[i].shouldNotExist) {
-                    data.push((parseInt(queries[i].numAsString, 10)*multiplier) + translator);
+    let fetch: SinonSpy;
+    beforeEach(() => {
+        fetch = sinon.spy(
+            (queries: Query[], multiplier: number, translator: number) => {
+                let data: number[] | null = [];
+                for (let i = 0; i < queries.length; i++) {
+                    if (queries[i].shouldFail) {
+                        data = null;
+                        break;
+                    } else if (!queries[i].shouldNotExist) {
+                        data.push(
+                            parseInt(queries[i].numAsString, 10) * multiplier +
+                                translator
+                        );
+                    }
                 }
-            }
-            if (data) {
-                if (queries.find((query:Query)=>!!query.shouldDelay)) {
-                    return new Promise((resolve, reject)=>{
-                        setTimeout(()=>{
-                            resolve(data as number[]);
-                        }, 1000);
-                    });
-                } else {
-                    let meta:string | undefined = (queries.find(q=>!!q.meta) || {meta:undefined}).meta;
-                    if (meta) {
-                        return Promise.resolve([{data, meta}]);
+                if (data) {
+                    if (queries.find((query: Query) => !!query.shouldDelay)) {
+                        return new Promise((resolve, reject) => {
+                            setTimeout(() => {
+                                resolve(data as number[]);
+                            }, 1000);
+                        });
                     } else {
-                        return Promise.resolve(data);
+                        let meta: string | undefined = (
+                            queries.find(q => !!q.meta) || { meta: undefined }
+                        ).meta;
+                        if (meta) {
+                            return Promise.resolve([{ data, meta }]);
+                        } else {
+                            return Promise.resolve(data);
+                        }
                     }
+                } else {
+                    return Promise.reject('fail!');
                 }
-            } else {
-                return Promise.reject("fail!");
             }
-        });
+        );
 
         cache = new LazyMobXCache<number, Query, string>(
-            q=>q.numAsString+(q.meta || ""),
-            (n:number, m?:string)=>{
-                return Math.round((n - 3)/25)+(m || "");
+            q => q.numAsString + (q.meta || ''),
+            (n: number, m?: string) => {
+                return Math.round((n - 3) / 25) + (m || '');
             },
             fetch,
-            25, 3
+            25,
+            3
         );
     });
-    describe("#addData", ()=>{
-        it("adds data properly, and returns data using #peek if it exists in the cache", (done)=>{
+    describe('#addData', () => {
+        it('adds data properly, and returns data using #peek if it exists in the cache', done => {
             let timesRun = 0;
-            let reaction = mobx.autorun(()=>{
+            let reaction = mobx.autorun(() => {
                 timesRun += 1;
                 if (timesRun === 1) {
                     // Initially, no data
-                    assert.deepEqual(cache.peek({
-                        numAsString: "5"
-                    }), null);
-                    assert.deepEqual(cache.peek({
-                        numAsString: "10"
-                    }), null);
-                    assert.deepEqual(cache.peek({
-                        numAsString: "15"
-                    }), null);
+                    assert.deepEqual(
+                        cache.peek({
+                            numAsString: '5',
+                        }),
+                        null
+                    );
+                    assert.deepEqual(
+                        cache.peek({
+                            numAsString: '10',
+                        }),
+                        null
+                    );
+                    assert.deepEqual(
+                        cache.peek({
+                            numAsString: '15',
+                        }),
+                        null
+                    );
 
-                    setTimeout(()=>cache.addData([253, 128, 378]), 0); // gotta schedule it so itll trigger another autorun
+                    setTimeout(() => cache.addData([253, 128, 378]), 0); // gotta schedule it so itll trigger another autorun
                 } else if (timesRun === 2) {
-                    assert.isFalse(fetch.called, "fetch should never have been called");
-                    assert.deepEqual(cache.peek({
-                        numAsString: "5"
-                    }), {
-                        status: "complete",
-                        data: 128
-                    } as CacheData<number, string>);
-                    assert.deepEqual(cache.peek({
-                        numAsString: "10"
-                    }), {
-                        status: "complete",
-                        data: 253
-                    } as CacheData<number, string>);
-                    assert.deepEqual(cache.peek({
-                        numAsString: "15"
-                    }), {
-                        status: "complete",
-                        data: 378
-                    } as CacheData<number, string>);
-                    assert.deepEqual(cache.peek({
-                        numAsString: "20"
-                    }), null);
+                    assert.isFalse(
+                        fetch.called,
+                        'fetch should never have been called'
+                    );
+                    assert.deepEqual(
+                        cache.peek({
+                            numAsString: '5',
+                        }),
+                        {
+                            status: 'complete',
+                            data: 128,
+                        } as CacheData<number, string>
+                    );
+                    assert.deepEqual(
+                        cache.peek({
+                            numAsString: '10',
+                        }),
+                        {
+                            status: 'complete',
+                            data: 253,
+                        } as CacheData<number, string>
+                    );
+                    assert.deepEqual(
+                        cache.peek({
+                            numAsString: '15',
+                        }),
+                        {
+                            status: 'complete',
+                            data: 378,
+                        } as CacheData<number, string>
+                    );
+                    assert.deepEqual(
+                        cache.peek({
+                            numAsString: '20',
+                        }),
+                        null
+                    );
                     done();
                 }
             });
         });
     });
 
-    describe("#get",()=>{
-        it("passes static dependencies into fetch correctly", ()=>{
-            useFakeClock(clock=>{
+    describe('#get', () => {
+        it('passes static dependencies into fetch correctly', () => {
+            useFakeClock(clock => {
                 cache.get({
-                    numAsString:"5"
+                    numAsString: '5',
                 });
                 clock.tick(100);
-                assert.equal(fetch.getCall(0).args[1], 25, "first static dependency passed in correctly");
-                assert.equal(fetch.getCall(0).args[2], 3, "second static dependency passed in correctly");
+                assert.equal(
+                    fetch.getCall(0).args[1],
+                    25,
+                    'first static dependency passed in correctly'
+                );
+                assert.equal(
+                    fetch.getCall(0).args[2],
+                    3,
+                    'second static dependency passed in correctly'
+                );
             });
         });
-        it("returns data if it exists", (done)=>{
+        it('returns data if it exists', done => {
             let timesRun = 0;
-            let reaction = mobx.autorun(()=>{
+            let reaction = mobx.autorun(() => {
                 timesRun += 1;
                 let datum = cache.get({
-                    numAsString:"5"
+                    numAsString: '5',
                 });
                 if (timesRun === 1) {
-                    assert.isNull(datum, "no data when first checking for it");
+                    assert.isNull(datum, 'no data when first checking for it');
                 } else if (timesRun === 2) {
-                    assert.isTrue(fetch.calledOnce, "fetch has been called once");
+                    assert.isTrue(
+                        fetch.calledOnce,
+                        'fetch has been called once'
+                    );
                     assert.deepEqual(datum, {
-                        status: "complete",
-                        data: 128
+                        status: 'complete',
+                        data: 128,
                     } as CacheData<number, string>);
                     reaction();
                     done();
                 }
             });
         });
-        it("doesnt try to fetch already resolved data", ()=>{
-            useFakeClock(clock=>{
+        it('doesnt try to fetch already resolved data', () => {
+            useFakeClock(clock => {
                 cache.addData([253, 128, 378]);
-                assert.deepEqual(cache.get({numAsString:"5"}), { status:"complete", data:128} as CacheData<number, string>, "returns existing data");
+                assert.deepEqual(
+                    cache.get({ numAsString: '5' }),
+                    { status: 'complete', data: 128 } as CacheData<
+                        number,
+                        string
+                    >,
+                    'returns existing data'
+                );
                 clock.tick(100);
-                assert.isFalse(fetch.called, "fetch shouldnt be called at all for existing queries");
-                cache.get({numAsString:"15"});
-                cache.get({numAsString:"10"});
-                cache.get({numAsString:"20"});
+                assert.isFalse(
+                    fetch.called,
+                    'fetch shouldnt be called at all for existing queries'
+                );
+                cache.get({ numAsString: '15' });
+                cache.get({ numAsString: '10' });
+                cache.get({ numAsString: '20' });
                 clock.tick(100);
-                assert.isTrue(fetch.calledOnce, "fetch should only have been called once");
-                assert.deepEqual(fetch.getCall(0).args[0], [{numAsString:"20"}],
-                    "should only have fetched the missing data");
+                assert.isTrue(
+                    fetch.calledOnce,
+                    'fetch should only have been called once'
+                );
+                assert.deepEqual(
+                    fetch.getCall(0).args[0],
+                    [{ numAsString: '20' }],
+                    'should only have fetched the missing data'
+                );
             });
         });
-        it("doesnt try to double-fetch data that has already been requested and is pending", ()=>{
-            useFakeClock(clock=>{
-                cache.get({numAsString:"5", shouldDelay:true});
+        it('doesnt try to double-fetch data that has already been requested and is pending', () => {
+            useFakeClock(clock => {
+                cache.get({ numAsString: '5', shouldDelay: true });
                 clock.tick(500);
-                assert.isTrue(fetch.calledOnce, "fetch was called once");
-                assert.isNull(cache.peek({numAsString:"5"}), "this data is still pending, not resolved");
-                cache.get({numAsString:"5"});
+                assert.isTrue(fetch.calledOnce, 'fetch was called once');
+                assert.isNull(
+                    cache.peek({ numAsString: '5' }),
+                    'this data is still pending, not resolved'
+                );
+                cache.get({ numAsString: '5' });
                 clock.tick(4000);
-                assert.isTrue(fetch.calledOnce, "fetch should not have been called again because the only data requested was already pending");
+                assert.isTrue(
+                    fetch.calledOnce,
+                    'fetch should not have been called again because the only data requested was already pending'
+                );
             });
         });
-        it("returns no data if no data exists", (done)=>{
+        it('returns no data if no data exists', done => {
             let timesRun = 0;
-            let reaction = mobx.autorun(()=>{
+            let reaction = mobx.autorun(() => {
                 timesRun += 1;
                 if (timesRun === 1) {
-                    let firstTry = cache.get({numAsString:"6", shouldNotExist:true});
-                    assert.isNull(firstTry, "returns null if data pending");
+                    let firstTry = cache.get({
+                        numAsString: '6',
+                        shouldNotExist: true,
+                    });
+                    assert.isNull(firstTry, 'returns null if data pending');
                 } else if (timesRun === 2) {
-                    let secondTry = cache.get({numAsString:"6"});
-                    assert.deepEqual(secondTry, {status:"complete", data:null} as CacheData<number, string>, "no data available for this query");
+                    let secondTry = cache.get({ numAsString: '6' });
+                    assert.deepEqual(
+                        secondTry,
+                        { status: 'complete', data: null } as CacheData<
+                            number,
+                            string
+                        >,
+                        'no data available for this query'
+                    );
                     reaction();
                     done();
                 }
             });
         });
-        it("returns an error if fetching failed, and doesnt try to fetch data that has errored", (done)=>{
+        it('returns an error if fetching failed, and doesnt try to fetch data that has errored', done => {
             let timesRun = 0;
-            let reaction = mobx.autorun(()=>{
+            let reaction = mobx.autorun(() => {
                 timesRun += 1;
                 if (timesRun === 1) {
-                    let firstTry = cache.get({numAsString:"6", shouldFail:true});
-                    assert.isNull(firstTry, "returns null if data pending");
+                    let firstTry = cache.get({
+                        numAsString: '6',
+                        shouldFail: true,
+                    });
+                    assert.isNull(firstTry, 'returns null if data pending');
                 } else if (timesRun === 2) {
-                    let secondTry = cache.get({numAsString:"6"});
-                    assert.deepEqual(secondTry, {status:"error", data:null} as CacheData<number, string>, "an error occurred during fetch");
+                    let secondTry = cache.get({ numAsString: '6' });
+                    assert.deepEqual(
+                        secondTry,
+                        { status: 'error', data: null } as CacheData<
+                            number,
+                            string
+                        >,
+                        'an error occurred during fetch'
+                    );
 
-                    cache.get({numAsString:"6"});
-                    cache.get({numAsString:"7"});
-                    cache.get({numAsString:"8"});
+                    cache.get({ numAsString: '6' });
+                    cache.get({ numAsString: '7' });
+                    cache.get({ numAsString: '8' });
                 } else if (timesRun === 3) {
-                    assert.isTrue(!!fetch.lastCall.args[0].find((x:Query)=>x.numAsString==="7"), "7 should have been queried");
-                    assert.isTrue(!!fetch.lastCall.args[0].find((x:Query)=>x.numAsString==="8"), "8 should have been queried");
-                    assert.isFalse(!!fetch.lastCall.args[0].find((x:Query)=>x.numAsString==="6"), "6 should have been queried, it already failed");
+                    assert.isTrue(
+                        !!fetch.lastCall.args[0].find(
+                            (x: Query) => x.numAsString === '7'
+                        ),
+                        '7 should have been queried'
+                    );
+                    assert.isTrue(
+                        !!fetch.lastCall.args[0].find(
+                            (x: Query) => x.numAsString === '8'
+                        ),
+                        '8 should have been queried'
+                    );
+                    assert.isFalse(
+                        !!fetch.lastCall.args[0].find(
+                            (x: Query) => x.numAsString === '6'
+                        ),
+                        '6 should have been queried, it already failed'
+                    );
 
-                    assert.deepEqual(cache.peek({numAsString:"7"}), {status:"complete", data:178} as CacheData<number, string>, "data 1 fetched successfully");
-                    assert.deepEqual(cache.peek({numAsString:"8"}), {status:"complete", data:203} as CacheData<number, string>, "data 2 fetched successfully");
-                    assert.deepEqual(cache.peek({numAsString:"6"}), {status:"error", data:null} as CacheData<number, string>, "error data still marked as error");
+                    assert.deepEqual(
+                        cache.peek({ numAsString: '7' }),
+                        { status: 'complete', data: 178 } as CacheData<
+                            number,
+                            string
+                        >,
+                        'data 1 fetched successfully'
+                    );
+                    assert.deepEqual(
+                        cache.peek({ numAsString: '8' }),
+                        { status: 'complete', data: 203 } as CacheData<
+                            number,
+                            string
+                        >,
+                        'data 2 fetched successfully'
+                    );
+                    assert.deepEqual(
+                        cache.peek({ numAsString: '6' }),
+                        { status: 'error', data: null } as CacheData<
+                            number,
+                            string
+                        >,
+                        'error data still marked as error'
+                    );
 
-                    cache.get({numAsString:"7"});
-                    cache.get({numAsString:"9"});
-                    cache.get({numAsString:"10"});
-                    cache.get({numAsString:"11", shouldFail:true});
+                    cache.get({ numAsString: '7' });
+                    cache.get({ numAsString: '9' });
+                    cache.get({ numAsString: '10' });
+                    cache.get({ numAsString: '11', shouldFail: true });
                 } else if (timesRun === 4) {
-                    assert.isFalse(!!fetch.lastCall.args[0].find((x:Query)=>x.numAsString==="7"), "7 should not have been queried, it already succeeded");
-                    assert.isTrue(!!fetch.lastCall.args[0].find((x:Query)=>x.numAsString==="9"), "9 should have been queried");
-                    assert.isTrue(!!fetch.lastCall.args[0].find((x:Query)=>x.numAsString==="10"), "10 should have been queried");
-                    assert.isTrue(!!fetch.lastCall.args[0].find((x:Query)=>x.numAsString==="11"), "11 should have been queried");
+                    assert.isFalse(
+                        !!fetch.lastCall.args[0].find(
+                            (x: Query) => x.numAsString === '7'
+                        ),
+                        '7 should not have been queried, it already succeeded'
+                    );
+                    assert.isTrue(
+                        !!fetch.lastCall.args[0].find(
+                            (x: Query) => x.numAsString === '9'
+                        ),
+                        '9 should have been queried'
+                    );
+                    assert.isTrue(
+                        !!fetch.lastCall.args[0].find(
+                            (x: Query) => x.numAsString === '10'
+                        ),
+                        '10 should have been queried'
+                    );
+                    assert.isTrue(
+                        !!fetch.lastCall.args[0].find(
+                            (x: Query) => x.numAsString === '11'
+                        ),
+                        '11 should have been queried'
+                    );
 
-                    assert.deepEqual(cache.peek({numAsString:"7"}), {status:"complete", data:178} as CacheData<number, string>, "7 still there successfully from before");
-                    assert.deepEqual(cache.peek({numAsString:"9"}), {status:"error", data:null} as CacheData<number, string>, "there was an error during fetching 9");
-                    assert.deepEqual(cache.peek({numAsString:"10"}), {status:"error", data:null} as CacheData<number, string>, "there was an error during fetching 10");
-                    assert.deepEqual(cache.peek({numAsString:"11"}), {status:"error", data:null} as CacheData<number, string>, "there was an error during fetching 11");
+                    assert.deepEqual(
+                        cache.peek({ numAsString: '7' }),
+                        { status: 'complete', data: 178 } as CacheData<
+                            number,
+                            string
+                        >,
+                        '7 still there successfully from before'
+                    );
+                    assert.deepEqual(
+                        cache.peek({ numAsString: '9' }),
+                        { status: 'error', data: null } as CacheData<
+                            number,
+                            string
+                        >,
+                        'there was an error during fetching 9'
+                    );
+                    assert.deepEqual(
+                        cache.peek({ numAsString: '10' }),
+                        { status: 'error', data: null } as CacheData<
+                            number,
+                            string
+                        >,
+                        'there was an error during fetching 10'
+                    );
+                    assert.deepEqual(
+                        cache.peek({ numAsString: '11' }),
+                        { status: 'error', data: null } as CacheData<
+                            number,
+                            string
+                        >,
+                        'there was an error during fetching 11'
+                    );
                     reaction();
                     done();
                 }
             });
         });
-        it("adds data using metadata given by fetch", (done)=>{
+        it('adds data using metadata given by fetch', done => {
             let timesRun = 0;
-            let reaction = mobx.autorun(()=>{
+            let reaction = mobx.autorun(() => {
                 timesRun += 1;
                 let datum = cache.get({
-                    numAsString:"5",
-                    meta:"Q"
+                    numAsString: '5',
+                    meta: 'Q',
                 });
                 if (timesRun === 1) {
-                    assert.isNull(datum, "no data when first checking for it");
+                    assert.isNull(datum, 'no data when first checking for it');
                 } else if (timesRun === 2) {
-                    assert.isTrue(fetch.calledOnce, "fetch has been called once");
-                    assert.deepEqual(datum, {
-                        status: "complete",
-                        data: 128,
-                        meta: "Q"
-                    } as CacheData<number, string>, "data found using key with metadata");
-                    assert.equal(cache.peek({ numAsString: "5"}), null, "no data found when querying without metadata");
+                    assert.isTrue(
+                        fetch.calledOnce,
+                        'fetch has been called once'
+                    );
+                    assert.deepEqual(
+                        datum,
+                        {
+                            status: 'complete',
+                            data: 128,
+                            meta: 'Q',
+                        } as CacheData<number, string>,
+                        'data found using key with metadata'
+                    );
+                    assert.equal(
+                        cache.peek({ numAsString: '5' }),
+                        null,
+                        'no data found when querying without metadata'
+                    );
                     reaction();
                     done();
                 }
             });
         });
 
-        it("returns null if fetch pending", ()=>{
-            assert.isNull(cache.get({numAsString:"6"}));
+        it('returns null if fetch pending', () => {
+            assert.isNull(cache.get({ numAsString: '6' }));
         });
-        it("debounces calls to get", ()=>{
-            useFakeClock(clock=>{
-                cache.get({numAsString:"1"});
+        it('debounces calls to get', () => {
+            useFakeClock(clock => {
+                cache.get({ numAsString: '1' });
                 clock.tick(1000);
                 assert.equal(fetch.callCount, 1);
-                cache.get({numAsString:"2"});
-                cache.get({numAsString:"3"});
-                cache.get({numAsString:"4"});
+                cache.get({ numAsString: '2' });
+                cache.get({ numAsString: '3' });
+                cache.get({ numAsString: '4' });
                 clock.tick(1000);
                 assert.equal(fetch.callCount, 2);
-                cache.get({numAsString:"5"});
-                cache.get({numAsString:"6"});
-                cache.get({numAsString:"7"});
-                cache.get({numAsString:"8"});
-                cache.get({numAsString:"9"});
-                cache.get({numAsString:"10"});
-                cache.get({numAsString:"11"});
-                cache.get({numAsString:"12"});
-                cache.get({numAsString:"13"});
+                cache.get({ numAsString: '5' });
+                cache.get({ numAsString: '6' });
+                cache.get({ numAsString: '7' });
+                cache.get({ numAsString: '8' });
+                cache.get({ numAsString: '9' });
+                cache.get({ numAsString: '10' });
+                cache.get({ numAsString: '11' });
+                cache.get({ numAsString: '12' });
+                cache.get({ numAsString: '13' });
                 clock.tick(1000);
                 assert.equal(fetch.callCount, 3);
-                cache.get({numAsString:"14"});
+                cache.get({ numAsString: '14' });
                 clock.tick(1000);
                 assert.equal(fetch.callCount, 4);
                 clock.tick(1000);
                 assert.equal(fetch.callCount, 4);
             });
         });
-        it("triggers any mobx reaction that touches the cache when its updated", (done)=>{
-                let peekFn = sinon.spy(()=>{
-                    cache.peek({numAsString:"2"});
-                    if (peekFn.callCount === 2 && cacheFn.callCount === 2 && getFn.callCount === 2) {
-                        peekReaction();
-                        cacheReaction();
-                        getReaction();
-                        done();
-                    }
-                });
-                let cacheFn = sinon.spy(()=>{
-                    cache.cache;
-                    if (peekFn.callCount === 2 && cacheFn.callCount === 2 && getFn.callCount === 2) {
-                        peekReaction();
-                        cacheReaction();
-                        getReaction();
-                        done();
-                    }
-                });
-                let getFn = sinon.spy(()=>{
-                    cache.get({numAsString:"2"});
-                    if (peekFn.callCount === 2 && cacheFn.callCount === 2 && getFn.callCount === 2) {
-                        peekReaction();
-                        cacheReaction();
-                        getReaction();
-                        done();
-                    }
-                });
-                assert.equal(peekFn.callCount, 0);
-                assert.equal(cacheFn.callCount, 0);
-                assert.equal(getFn.callCount, 0);
-                let peekReaction = mobx.autorun(peekFn);
-                let cacheReaction = mobx.autorun(cacheFn);
-                let getReaction = mobx.autorun(getFn);
-                assert.equal(peekFn.callCount, 1);
-                assert.equal(cacheFn.callCount, 1);
-                assert.equal(getFn.callCount, 1);
+        it('triggers any mobx reaction that touches the cache when its updated', done => {
+            let peekFn = sinon.spy(() => {
+                cache.peek({ numAsString: '2' });
+                if (
+                    peekFn.callCount === 2 &&
+                    cacheFn.callCount === 2 &&
+                    getFn.callCount === 2
+                ) {
+                    peekReaction();
+                    cacheReaction();
+                    getReaction();
+                    done();
+                }
+            });
+            let cacheFn = sinon.spy(() => {
+                cache.cache;
+                if (
+                    peekFn.callCount === 2 &&
+                    cacheFn.callCount === 2 &&
+                    getFn.callCount === 2
+                ) {
+                    peekReaction();
+                    cacheReaction();
+                    getReaction();
+                    done();
+                }
+            });
+            let getFn = sinon.spy(() => {
+                cache.get({ numAsString: '2' });
+                if (
+                    peekFn.callCount === 2 &&
+                    cacheFn.callCount === 2 &&
+                    getFn.callCount === 2
+                ) {
+                    peekReaction();
+                    cacheReaction();
+                    getReaction();
+                    done();
+                }
+            });
+            assert.equal(peekFn.callCount, 0);
+            assert.equal(cacheFn.callCount, 0);
+            assert.equal(getFn.callCount, 0);
+            let peekReaction = mobx.autorun(peekFn);
+            let cacheReaction = mobx.autorun(cacheFn);
+            let getReaction = mobx.autorun(getFn);
+            assert.equal(peekFn.callCount, 1);
+            assert.equal(cacheFn.callCount, 1);
+            assert.equal(getFn.callCount, 1);
         });
     });
-    describe("#getPromise", ()=>{
-        it("resolves immediately if the selected queries are already there", async()=>{
-            let callback = sinon.spy((data:number[])=>{});
+    describe('#getPromise', () => {
+        it('resolves immediately if the selected queries are already there', async () => {
+            let callback = sinon.spy((data: number[]) => {});
             await cache.getPromise([]).then(callback);
             assert.equal(callback.callCount, 1); // immediately called
             assert.equal(cache.activePromisesCount, 0);
             assert.deepEqual(callback.args[0], [[]]);
-            cache.get({ numAsString:"3" });
-            await cache.getPromise([{numAsString:"3"}]).then(callback);
+            cache.get({ numAsString: '3' });
+            await cache.getPromise([{ numAsString: '3' }]).then(callback);
             assert.equal(callback.callCount, 2); // immediately called
             assert.equal(cache.activePromisesCount, 0);
-            assert.deepEqual(callback.args[1][0].map((x:any)=>x.data), [78]);
-            cache.get({ numAsString:"2" });
-            cache.get({ numAsString:"1" });
-            await cache.getPromise([{numAsString:"3"}, {numAsString:"2"},{numAsString:"1"}]).then(callback);
+            assert.deepEqual(callback.args[1][0].map((x: any) => x.data), [78]);
+            cache.get({ numAsString: '2' });
+            cache.get({ numAsString: '1' });
+            await cache
+                .getPromise([
+                    { numAsString: '3' },
+                    { numAsString: '2' },
+                    { numAsString: '1' },
+                ])
+                .then(callback);
             assert.equal(callback.callCount, 3);
             assert.equal(cache.activePromisesCount, 0);
-            assert.deepEqual(callback.args[2][0].map((x:any)=>x.data), [78, 53, 28]);
+            assert.deepEqual(callback.args[2][0].map((x: any) => x.data), [
+                78,
+                53,
+                28,
+            ]);
             return true;
         });
-        it("resolves when the selected queries become available: request made", (done)=>{
-            let callback = sinon.spy((data:CacheData<number, string>[])=>{
+        it('resolves when the selected queries become available: request made', done => {
+            let callback = sinon.spy((data: CacheData<number, string>[]) => {
                 assert.equal(callback.callCount, 1);
-                assert.deepEqual(data.map(x=>x.data), [28, 103]);
+                assert.deepEqual(data.map(x => x.data), [28, 103]);
                 done();
             });
-            cache.getPromise([{numAsString:"1"}, {numAsString:"4"}], true).then(callback);
+            cache
+                .getPromise([{ numAsString: '1' }, { numAsString: '4' }], true)
+                .then(callback);
         });
-        it("resolves when the selected queries become available: request not made", (done)=>{
-            let callback = sinon.spy((data:CacheData<number, string>[])=>{
+        it('resolves when the selected queries become available: request not made', done => {
+            let callback = sinon.spy((data: CacheData<number, string>[]) => {
                 assert.equal(callback.callCount, 1);
-                assert.deepEqual(data.map(x=>x.data), [28, 103]);
+                assert.deepEqual(data.map(x => x.data), [28, 103]);
                 done();
             });
-            cache.getPromise([{numAsString:"1"}, {numAsString:"4"}]).then(callback);
+            cache
+                .getPromise([{ numAsString: '1' }, { numAsString: '4' }])
+                .then(callback);
             assert.equal(callback.callCount, 0);
-            cache.get({numAsString:"1"});
+            cache.get({ numAsString: '1' });
             assert.equal(callback.callCount, 0);
-            cache.get({numAsString:"4"});
+            cache.get({ numAsString: '4' });
             assert.equal(callback.callCount, 0);
         });
-        it("errors if there is an error", (done)=>{
-            let callback = sinon.spy(()=>{
+        it('errors if there is an error', done => {
+            let callback = sinon.spy(() => {
                 assert.equal(callback.callCount, 1);
                 done();
             });
-            cache.getPromise([{numAsString:"1"}, {numAsString:"4"}]).catch(callback);
+            cache
+                .getPromise([{ numAsString: '1' }, { numAsString: '4' }])
+                .catch(callback);
             assert.equal(callback.callCount, 0);
-            cache.get({numAsString:"1"});
+            cache.get({ numAsString: '1' });
             assert.equal(callback.callCount, 0);
-            cache.get({numAsString:"4", shouldFail: true});
+            cache.get({ numAsString: '4', shouldFail: true });
             assert.equal(callback.callCount, 0);
         });
-        it("can handle multiple pending listeners", (done)=>{
+        it('can handle multiple pending listeners', done => {
             let callbackCount = 0;
             assert.equal(cache.activePromisesCount, 0);
-            cache.getPromise([{numAsString:"1"}]).then(()=>{
+            cache.getPromise([{ numAsString: '1' }]).then(() => {
                 callbackCount += 1;
                 assert.equal(callbackCount, 1);
             });
             assert.equal(cache.activePromisesCount, 1);
-            cache.getPromise({numAsString:"2"}).then(()=>{
+            cache.getPromise({ numAsString: '2' }).then(() => {
                 callbackCount += 1;
                 assert.equal(callbackCount, 2);
             });
             assert.equal(cache.activePromisesCount, 2);
-            cache.getPromise({numAsString:"3"}).then(()=>{
+            cache.getPromise({ numAsString: '3' }).then(() => {
                 callbackCount += 1;
                 assert.equal(callbackCount, 3);
                 done();
             });
             assert.equal(cache.activePromisesCount, 3);
-            cache.get({numAsString:"1"});
-            cache.get({numAsString:"2"});
-            cache.get({numAsString:"3"});
+            cache.get({ numAsString: '1' });
+            cache.get({ numAsString: '2' });
+            cache.get({ numAsString: '3' });
         });
-        it("unregisters the listener once it has been triggered: resolve", (done)=>{
-            cache.getPromise([{numAsString:"1"}]).then(()=>{
+        it('unregisters the listener once it has been triggered: resolve', done => {
+            cache.getPromise([{ numAsString: '1' }]).then(() => {
                 assert.equal(cache.activePromisesCount, 0);
                 done();
             });
             assert.equal(cache.activePromisesCount, 1);
-            cache.get({numAsString:"1"});
+            cache.get({ numAsString: '1' });
         });
-        it("unregisters the listener once it has been triggered: error", (done)=>{
-            cache.getPromise([{numAsString:"1"}]).catch(()=>{
+        it('unregisters the listener once it has been triggered: error', done => {
+            cache.getPromise([{ numAsString: '1' }]).catch(() => {
                 assert.equal(cache.activePromisesCount, 0);
                 done();
             });
             assert.equal(cache.activePromisesCount, 1);
-            cache.get({numAsString:"1", shouldFail: true});
+            cache.get({ numAsString: '1', shouldFail: true });
         });
     });
 });
diff --git a/src/shared/lib/LazyMobXCache.ts b/src/shared/lib/LazyMobXCache.ts
index af4e5e2cc97..77ae3dd7322 100644
--- a/src/shared/lib/LazyMobXCache.ts
+++ b/src/shared/lib/LazyMobXCache.ts
@@ -1,80 +1,99 @@
-import Immutable from "seamless-immutable"; // need to use immutables so mobX can observe the cache shallowly
-import accumulatingDebounce from "./accumulatingDebounce";
-import {observable, action, reaction} from "mobx";
-import {AccumulatingDebouncedFunction} from "./accumulatingDebounce";
-
-export type CacheData<D, M = any> = {
-    status: "complete" | "error";
-    data: null;
-    meta?:M;
-} | {
-    status: "complete";
-    data: D;
-    meta?:M;
-};
-
-export type Cache<D,M = any> = {
-    [key:string]:CacheData<D,M>;
+import Immutable from 'seamless-immutable'; // need to use immutables so mobX can observe the cache shallowly
+import accumulatingDebounce from './accumulatingDebounce';
+import { observable, action, reaction } from 'mobx';
+import { AccumulatingDebouncedFunction } from './accumulatingDebounce';
+
+export type CacheData<D, M = any> =
+    | {
+          status: 'complete' | 'error';
+          data: null;
+          meta?: M;
+      }
+    | {
+          status: 'complete';
+          data: D;
+          meta?: M;
+      };
+
+export type Cache<D, M = any> = {
+    [key: string]: CacheData<D, M>;
 };
 
 type Pending = {
-    [key:string]:boolean;
+    [key: string]: boolean;
 };
 
-type ImmutableCache<D,M> = Cache<D,M> & Immutable.ImmutableObject<Cache<D,M>>;
+type ImmutableCache<D, M> = Cache<D, M> &
+    Immutable.ImmutableObject<Cache<D, M>>;
 
-type QueryKeyToQuery<Q> = { [queryKey:string]:Q };
+type QueryKeyToQuery<Q> = { [queryKey: string]: Q };
 
-export type AugmentedData<D,M> = {
-    data:D[];
-    meta:M;
+export type AugmentedData<D, M> = {
+    data: D[];
+    meta: M;
 };
 
-type FetchResult<D,M> = AugmentedData<D, M>[] | D[];
+type FetchResult<D, M> = AugmentedData<D, M>[] | D[];
 
-type CachePromise<D,M> = {
-    keys: string[],
-    callback:(data:CacheData<D, M>[])=>void,
-    error: ()=>void;
+type CachePromise<D, M> = {
+    keys: string[];
+    callback: (data: CacheData<D, M>[]) => void;
+    error: () => void;
 };
 
-function isAugmentedData<D,M>(data:D | AugmentedData<D,M>): data is AugmentedData<D,M> {
-    return data.hasOwnProperty("meta");
+function isAugmentedData<D, M>(
+    data: D | AugmentedData<D, M>
+): data is AugmentedData<D, M> {
+    return data.hasOwnProperty('meta');
 }
 
 export default class LazyMobXCache<Data, Query, Metadata = any> {
-    @observable.ref private _cache:ImmutableCache<Data,Metadata>;
+    @observable.ref private _cache: ImmutableCache<Data, Metadata>;
     private pending: Pending;
 
-    private staticDependencies:any[];
-    private debouncedPopulate:AccumulatingDebouncedFunction<Query>;
+    private staticDependencies: any[];
+    private debouncedPopulate: AccumulatingDebouncedFunction<Query>;
 
-    private promises:CachePromise<Data,Metadata>[];
+    private promises: CachePromise<Data, Metadata>[];
 
-    constructor(private queryToKey:(q:Query)=>string, // query maps to the key of the datum it will fill
-                private dataToKey:(d:Data, m?:Metadata)=>string, // should uniquely identify the data - for indexing in cache
-                private fetch:(queries:Query[], ...staticDependencies:any[])=>Promise<FetchResult<Data, Metadata>>,
-                ...staticDependencies:any[]) {
+    constructor(
+        private queryToKey: (q: Query) => string, // query maps to the key of the datum it will fill
+        private dataToKey: (d: Data, m?: Metadata) => string, // should uniquely identify the data - for indexing in cache
+        private fetch: (
+            queries: Query[],
+            ...staticDependencies: any[]
+        ) => Promise<FetchResult<Data, Metadata>>,
+        ...staticDependencies: any[]
+    ) {
         this.init();
         this.staticDependencies = staticDependencies;
-        this.debouncedPopulate = accumulatingDebounce<QueryKeyToQuery<Query>, Query>(
-            (queryMap:QueryKeyToQuery<Query>)=>{
-                const queries:Query[] = Object.keys(queryMap).map(k=>queryMap[k]);
+        this.debouncedPopulate = accumulatingDebounce<
+            QueryKeyToQuery<Query>,
+            Query
+        >(
+            (queryMap: QueryKeyToQuery<Query>) => {
+                const queries: Query[] = Object.keys(queryMap).map(
+                    k => queryMap[k]
+                );
                 this.populate(queries);
             },
-            (queryMap:QueryKeyToQuery<Query>, newQuery:Query)=>{
+            (queryMap: QueryKeyToQuery<Query>, newQuery: Query) => {
                 queryMap[this.queryToKey(newQuery)] = newQuery;
                 return queryMap;
             },
-            ()=>{return {};},
+            () => {
+                return {};
+            },
             0
         );
 
         reaction(
-            ()=>this._cache,
-            (cache:Cache<Data, Metadata>)=>{
+            () => this._cache,
+            (cache: Cache<Data, Metadata>) => {
                 // filter out completed promises, we dont listen on them anymore
-                this.promises = this.promises.filter(promise=>!this.tryTrigger(promise));
+                this.promises = this.promises.filter(
+                    promise => !this.tryTrigger(promise)
+                );
             }
         );
     }
@@ -92,18 +111,21 @@ export default class LazyMobXCache<Data, Query, Metadata = any> {
         return this.promises.length;
     }
 
-    public getPromise(queries:Query|Query[], makeRequest?:boolean):Promise<CacheData<Data, Metadata>[]> {
-        return new Promise((resolve, reject)=>{
-            let queriesArray:Query[];
+    public getPromise(
+        queries: Query | Query[],
+        makeRequest?: boolean
+    ): Promise<CacheData<Data, Metadata>[]> {
+        return new Promise((resolve, reject) => {
+            let queriesArray: Query[];
             if (Array.isArray(queries)) {
                 queriesArray = queries;
             } else {
                 queriesArray = [queries];
             }
             const newPromise = {
-                keys:queriesArray.map(query=>this.queryToKey(query)),
+                keys: queriesArray.map(query => this.queryToKey(query)),
                 callback: resolve,
-                error: reject
+                error: reject,
             };
             if (!this.tryTrigger(newPromise)) {
                 // try to trigger it immediately
@@ -111,20 +133,20 @@ export default class LazyMobXCache<Data, Query, Metadata = any> {
                 this.promises.push(newPromise);
                 // request if desired
                 if (makeRequest) {
-                    queriesArray.map(query=>this.debouncedPopulate(query));
+                    queriesArray.map(query => this.debouncedPopulate(query));
                 }
             }
         });
     }
 
-    private tryTrigger(promise:CachePromise<Data, Metadata>) {
+    private tryTrigger(promise: CachePromise<Data, Metadata>) {
         let allDefined = true;
         let error = false;
-        const data = promise.keys.map(key=>{
+        const data = promise.keys.map(key => {
             const datum = this._cache[key];
             if (!datum) {
                 allDefined = false;
-            } else if (datum.status === "error") {
+            } else if (datum.status === 'error') {
                 allDefined = false;
                 error = true;
             }
@@ -143,43 +165,47 @@ export default class LazyMobXCache<Data, Query, Metadata = any> {
         }
     }
 
-    public peek(query:Query):CacheData<Data, Metadata> | null {
+    public peek(query: Query): CacheData<Data, Metadata> | null {
         const key = this.queryToKey(query);
-        const cacheData:CacheData<Data, Metadata> | undefined = this._cache[key];
+        const cacheData: CacheData<Data, Metadata> | undefined = this._cache[
+            key
+        ];
         return cacheData || null;
     }
 
-    public get(query:Query):CacheData<Data, Metadata> | null {
+    public get(query: Query): CacheData<Data, Metadata> | null {
         this.debouncedPopulate(query);
 
         return this.peek(query);
     }
 
-    public async getImmediately(query:Query) {
+    public async getImmediately(query: Query) {
         await this.populate([query]);
         return this.peek(query);
     }
 
-
-    public addData(data:Data[]):void {
-        const toMerge:Cache<Data, Metadata> = {};
+    public addData(data: Data[]): void {
+        const toMerge: Cache<Data, Metadata> = {};
         for (const datum of data) {
             toMerge[this.dataToKey(datum)] = {
-                status: "complete",
-                data: datum
+                status: 'complete',
+                data: datum,
             };
         }
         this.updateCache(toMerge);
     }
 
-    private async populate(queries:Query[]) {
-        const missing:Query[] = this.getMissing(queries);
+    private async populate(queries: Query[]) {
+        const missing: Query[] = this.getMissing(queries);
         if (missing.length === 0) {
             return;
         }
         this.markPending(missing);
         try {
-            const data:FetchResult<Data, Metadata> = await this.fetch(missing, ...this.staticDependencies);
+            const data: FetchResult<Data, Metadata> = await this.fetch(
+                missing,
+                ...this.staticDependencies
+            );
             this.putData(missing, data);
             return true;
         } catch (err) {
@@ -190,35 +216,35 @@ export default class LazyMobXCache<Data, Query, Metadata = any> {
         }
     }
 
-    private getMissing(queries:Query[]):Query[] {
+    private getMissing(queries: Query[]): Query[] {
         const cache = this._cache;
         const pending = this.pending;
 
-        return queries.filter(q=>{
+        return queries.filter(q => {
             const key = this.queryToKey(q);
-            return (!cache[key] && !pending[key]);
+            return !cache[key] && !pending[key];
         });
     }
 
-    private markPending(queries:Query[]):void {
+    private markPending(queries: Query[]): void {
         const pending = this.pending;
         for (const query of queries) {
             pending[this.queryToKey(query)] = true;
         }
     }
 
-    private unmarkPending(queries:Query[]):void {
+    private unmarkPending(queries: Query[]): void {
         const pending = this.pending;
         for (const query of queries) {
             pending[this.queryToKey(query)] = false;
         }
     }
 
-    private markError(queries:Query[]) {
-        const toMerge:Cache<Data, Metadata> = {};
-        const error:CacheData<Data, Metadata> = {
-            status: "error",
-            data:null
+    private markError(queries: Query[]) {
+        const toMerge: Cache<Data, Metadata> = {};
+        const error: CacheData<Data, Metadata> = {
+            status: 'error',
+            data: null,
         };
         for (const query of queries) {
             toMerge[this.queryToKey(query)] = error;
@@ -226,9 +252,9 @@ export default class LazyMobXCache<Data, Query, Metadata = any> {
         this.updateCache(toMerge);
     }
 
-    private putData(queries:Query[], data:FetchResult<Data, Metadata>) {
-        const toMerge:Cache<Data, Metadata> = {};
-        const keyHasData:{[key:string]:boolean} = {};
+    private putData(queries: Query[], data: FetchResult<Data, Metadata>) {
+        const toMerge: Cache<Data, Metadata> = {};
+        const keyHasData: { [key: string]: boolean } = {};
 
         for (const dataElt of data) {
             if (isAugmentedData(dataElt)) {
@@ -237,9 +263,9 @@ export default class LazyMobXCache<Data, Query, Metadata = any> {
                 for (const datum of dataElt.data) {
                     const datumKey = this.dataToKey(datum, meta);
                     toMerge[datumKey] = {
-                        status: "complete",
+                        status: 'complete',
                         data: datum,
-                        meta
+                        meta,
                     };
                     keyHasData[datumKey] = true;
                 }
@@ -247,8 +273,8 @@ export default class LazyMobXCache<Data, Query, Metadata = any> {
                 // if not augmented data (no metadata), then we just add it using the information in the datum
                 const datumKey = this.dataToKey(dataElt);
                 toMerge[datumKey] = {
-                    status: "complete",
-                    data: dataElt
+                    status: 'complete',
+                    data: dataElt,
                 };
                 keyHasData[datumKey] = true;
             }
@@ -260,17 +286,19 @@ export default class LazyMobXCache<Data, Query, Metadata = any> {
                 // if a query was made, but no corresponding data is given, it's assumed there is
                 //  no data for this query, so we put the following object corresponding to that knowledge.
                 toMerge[queryKey] = {
-                    status: "complete",
-                    data: null
+                    status: 'complete',
+                    data: null,
                 };
             }
         }
         this.updateCache(toMerge);
     }
 
-    @action private updateCache(toMerge:Cache<Data, Metadata>) {
+    @action private updateCache(toMerge: Cache<Data, Metadata>) {
         if (Object.keys(toMerge).length > 0) {
-            this._cache = this._cache.merge(toMerge, {deep:true}) as ImmutableCache<Data, Metadata>;
+            this._cache = this._cache.merge(toMerge, {
+                deep: true,
+            }) as ImmutableCache<Data, Metadata>;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/lib/ListIndexedMap.spec.ts b/src/shared/lib/ListIndexedMap.spec.ts
index 0d2407359e4..28e7c7e2fa1 100644
--- a/src/shared/lib/ListIndexedMap.spec.ts
+++ b/src/shared/lib/ListIndexedMap.spec.ts
@@ -1,144 +1,146 @@
-import {assert} from "chai";
-import ListIndexedMap, {ListIndexedMapOfCounts} from "./ListIndexedMap";
+import { assert } from 'chai';
+import ListIndexedMap, { ListIndexedMapOfCounts } from './ListIndexedMap';
 
-describe("ListIndexedMap", ()=>{
-    it ("`get` returns `undefined` if theres no entry", () => {
+describe('ListIndexedMap', () => {
+    it('`get` returns `undefined` if theres no entry', () => {
         const map = new ListIndexedMap<string, string>();
         assert.equal(map.get(), undefined);
-        assert.equal(map.get("yo"), undefined);
-        assert.equal(map.get("whatsup","yo"), undefined);
-        assert.equal(map.get("hello","there","hi"), undefined);
+        assert.equal(map.get('yo'), undefined);
+        assert.equal(map.get('whatsup', 'yo'), undefined);
+        assert.equal(map.get('hello', 'there', 'hi'), undefined);
     });
-    it ("`get` returns the value if there is an entry", () => {
-        const map = new ListIndexedMap<string|number|boolean, any>();
+    it('`get` returns the value if there is an entry', () => {
+        const map = new ListIndexedMap<string | number | boolean, any>();
         assert.equal(map.get(), undefined);
         map.set(3);
         assert.equal(map.get(), 3);
-        assert.equal(map.get("asdf"), undefined);
-        map.set("blah", "asdf");
-        assert.equal(map.get("asdf"), "blah");
-        assert.equal(map.get("yo","whatsup"), undefined);
-        map.set("apsoidjfa", "yo","whatsup");
-        assert.equal(map.get("yo","whatsup"), "apsoidjfa");
-        assert.equal(map.get("whatsup",true), undefined);
-        map.set("foobar", "whatsup",true);
-        assert.equal(map.get("whatsup",true), "foobar");
-        assert.equal(map.get(-3,false,"bye"), undefined);
-        map.set("fubar", -3,false,"bye");
-        assert.equal(map.get(-3,false,"bye"), "fubar");
+        assert.equal(map.get('asdf'), undefined);
+        map.set('blah', 'asdf');
+        assert.equal(map.get('asdf'), 'blah');
+        assert.equal(map.get('yo', 'whatsup'), undefined);
+        map.set('apsoidjfa', 'yo', 'whatsup');
+        assert.equal(map.get('yo', 'whatsup'), 'apsoidjfa');
+        assert.equal(map.get('whatsup', true), undefined);
+        map.set('foobar', 'whatsup', true);
+        assert.equal(map.get('whatsup', true), 'foobar');
+        assert.equal(map.get(-3, false, 'bye'), undefined);
+        map.set('fubar', -3, false, 'bye');
+        assert.equal(map.get(-3, false, 'bye'), 'fubar');
     });
-    it("`get` returns the most recently-set value for a key", () => {
+    it('`get` returns the most recently-set value for a key', () => {
         const map = new ListIndexedMap<string, string>();
         assert.equal(map.get(), undefined);
-        map.set("test");
-        assert.equal(map.get(), "test");
-        map.set("test2");
-        assert.equal(map.get(), "test2");
+        map.set('test');
+        assert.equal(map.get(), 'test');
+        map.set('test2');
+        assert.equal(map.get(), 'test2');
 
-        assert.equal(map.get("yo"), undefined);
-        map.set("test", "yo");
-        assert.equal(map.get("yo"), "test");
-        map.set("test2", "yo");
-        assert.equal(map.get("yo"), "test2");
+        assert.equal(map.get('yo'), undefined);
+        map.set('test', 'yo');
+        assert.equal(map.get('yo'), 'test');
+        map.set('test2', 'yo');
+        assert.equal(map.get('yo'), 'test2');
 
-        assert.equal(map.get("yo","whatsup"), undefined);
-        map.set("test", "yo","whatsup");
-        assert.equal(map.get("yo","whatsup"), "test");
-        map.set("test2", "yo","whatsup");
-        assert.equal(map.get("yo","whatsup"), "test2");
+        assert.equal(map.get('yo', 'whatsup'), undefined);
+        map.set('test', 'yo', 'whatsup');
+        assert.equal(map.get('yo', 'whatsup'), 'test');
+        map.set('test2', 'yo', 'whatsup');
+        assert.equal(map.get('yo', 'whatsup'), 'test2');
 
-        assert.equal(map.get("whatsup","yo","bye"), undefined);
-        map.set("test", "whatsup","yo","bye");
-        assert.equal(map.get("whatsup","yo","bye"), "test");
-        map.set("test2", "whatsup","yo","bye");
-        assert.equal(map.get("whatsup","yo","bye"), "test2");
+        assert.equal(map.get('whatsup', 'yo', 'bye'), undefined);
+        map.set('test', 'whatsup', 'yo', 'bye');
+        assert.equal(map.get('whatsup', 'yo', 'bye'), 'test');
+        map.set('test2', 'whatsup', 'yo', 'bye');
+        assert.equal(map.get('whatsup', 'yo', 'bye'), 'test2');
     });
-    it("`entries` returns the entries in insertion order", ()=>{
+    it('`entries` returns the entries in insertion order', () => {
         const map = new ListIndexedMap<string, string>();
-        map.set("test");
-        map.set("blah", "asdf");
-        map.set("apsoidjfa", "yo","whatsup");
-        map.set("foobar", "whatsup","yo");
-        map.set("fubar", "whatsup","yo","bye");
+        map.set('test');
+        map.set('blah', 'asdf');
+        map.set('apsoidjfa', 'yo', 'whatsup');
+        map.set('foobar', 'whatsup', 'yo');
+        map.set('fubar', 'whatsup', 'yo', 'bye');
         assert.deepEqual(map.entries(), [
             {
                 key: [],
-                value: "test"
+                value: 'test',
             },
             {
-                key:["asdf"],
-                value:"blah"
+                key: ['asdf'],
+                value: 'blah',
             },
             {
-                key: ["yo", "whatsup"],
-                value: "apsoidjfa"
+                key: ['yo', 'whatsup'],
+                value: 'apsoidjfa',
             },
             {
-                key: ["whatsup", "yo"],
-                value: "foobar"
+                key: ['whatsup', 'yo'],
+                value: 'foobar',
             },
             {
-                key: ["whatsup", "yo", "bye"],
-                value: "fubar"
-            }
+                key: ['whatsup', 'yo', 'bye'],
+                value: 'fubar',
+            },
         ]);
     });
-    it("`has` returns true iff there is a corresponding entry", ()=>{
+    it('`has` returns true iff there is a corresponding entry', () => {
         const map = new ListIndexedMap<string, string>();
         assert.isFalse(map.has());
-        map.set("test");
+        map.set('test');
         assert.isTrue(map.has());
-        map.set("test2");
+        map.set('test2');
         assert.isTrue(map.has());
 
-        assert.isFalse(map.has("yo"));
-        map.set("test", "yo");
-        assert.isTrue(map.has("yo"));
-        map.set("test2", "yo");
-        assert.isTrue(map.has("yo"));
+        assert.isFalse(map.has('yo'));
+        map.set('test', 'yo');
+        assert.isTrue(map.has('yo'));
+        map.set('test2', 'yo');
+        assert.isTrue(map.has('yo'));
 
-        assert.isFalse(map.has("yo", "whatsup"));
-        map.set("test", "yo","whatsup");
-        assert.isTrue(map.has("yo", "whatsup"));
-        map.set("test2", "yo","whatsup");
-        assert.isTrue(map.has("yo", "whatsup"));
+        assert.isFalse(map.has('yo', 'whatsup'));
+        map.set('test', 'yo', 'whatsup');
+        assert.isTrue(map.has('yo', 'whatsup'));
+        map.set('test2', 'yo', 'whatsup');
+        assert.isTrue(map.has('yo', 'whatsup'));
 
-        assert.isFalse(map.has("whatsup","yo","bye"));
-        map.set("test", "whatsup","yo","bye");
-        assert.isTrue(map.has("whatsup","yo","bye"));
-        map.set("test2", "whatsup","yo","bye");
-        assert.isTrue(map.has("whatsup","yo","bye"));
+        assert.isFalse(map.has('whatsup', 'yo', 'bye'));
+        map.set('test', 'whatsup', 'yo', 'bye');
+        assert.isTrue(map.has('whatsup', 'yo', 'bye'));
+        map.set('test2', 'whatsup', 'yo', 'bye');
+        assert.isTrue(map.has('whatsup', 'yo', 'bye'));
     });
-    it("`from` creates a ListIndexedMap from a given list", ()=>{
-        const map = ListIndexedMap.from([
-            { id:"obj1"}, { id:"obj2"}, {id:"obj3"}
-        ], o=>[o.id]);
-        assert.deepEqual(map.get("obj1"), { id:"obj1"});
-        assert.deepEqual(map.get("obj2"), { id:"obj2"});
-        assert.deepEqual(map.get("obj3"), { id:"obj3"});
+    it('`from` creates a ListIndexedMap from a given list', () => {
+        const map = ListIndexedMap.from(
+            [{ id: 'obj1' }, { id: 'obj2' }, { id: 'obj3' }],
+            o => [o.id]
+        );
+        assert.deepEqual(map.get('obj1'), { id: 'obj1' });
+        assert.deepEqual(map.get('obj2'), { id: 'obj2' });
+        assert.deepEqual(map.get('obj3'), { id: 'obj3' });
 
-        const map2 = ListIndexedMap.from([
-            { id:"obj1"}, { id:"obj2"}, {id:"obj3"}
-        ], o=>[o.id, "yo"]);
-        assert.deepEqual(map2.get("obj1", "yo"), { id:"obj1"});
-        assert.deepEqual(map2.get("obj2", "yo"), { id:"obj2"});
-        assert.deepEqual(map2.get("obj3", "yo"), { id:"obj3"});
+        const map2 = ListIndexedMap.from(
+            [{ id: 'obj1' }, { id: 'obj2' }, { id: 'obj3' }],
+            o => [o.id, 'yo']
+        );
+        assert.deepEqual(map2.get('obj1', 'yo'), { id: 'obj1' });
+        assert.deepEqual(map2.get('obj2', 'yo'), { id: 'obj2' });
+        assert.deepEqual(map2.get('obj3', 'yo'), { id: 'obj3' });
     });
 });
 
-describe("IntegerListIndexedMap",()=>{
-    it("adds 1 correctly in case that key doesnt exist, and in case key does exist", ()=>{
+describe('IntegerListIndexedMap', () => {
+    it('adds 1 correctly in case that key doesnt exist, and in case key does exist', () => {
         const map = new ListIndexedMapOfCounts();
-        assert.isFalse(map.has("yo"));
-        map.increment("yo");
-        assert.isTrue(map.has("yo"));
-        assert.equal(map.get("yo"), 1);
-        map.increment("yo");
-        assert.isTrue(map.has("yo"));
-        assert.equal(map.get("yo"), 2);
+        assert.isFalse(map.has('yo'));
+        map.increment('yo');
+        assert.isTrue(map.has('yo'));
+        assert.equal(map.get('yo'), 1);
+        map.increment('yo');
+        assert.isTrue(map.has('yo'));
+        assert.equal(map.get('yo'), 2);
 
-        map.set(1.25, "hi");
-        map.increment("hi");
-        assert.equal(map.get("hi"), 2.25);
+        map.set(1.25, 'hi');
+        map.increment('hi');
+        assert.equal(map.get('hi'), 2.25);
     });
-});
\ No newline at end of file
+});
diff --git a/src/shared/lib/ListIndexedMap.ts b/src/shared/lib/ListIndexedMap.ts
index c688a28677e..378346a57c2 100644
--- a/src/shared/lib/ListIndexedMap.ts
+++ b/src/shared/lib/ListIndexedMap.ts
@@ -1,16 +1,16 @@
-import _ from "lodash";
+import _ from 'lodash';
 
-function getFolderKey<KE extends KeyElementType>(key:KeyElementType[]) {
-    return key.join(",");
+function getFolderKey<KE extends KeyElementType>(key: KeyElementType[]) {
+    return key.join(',');
 }
 
-type KeyElementType = string|number|boolean|undefined|null;
-type Entry<KE, R> = { key:KE[], value: R };
+type KeyElementType = string | number | boolean | undefined | null;
+type Entry<KE, R> = { key: KE[]; value: R };
 
 export default class ListIndexedMap<KE extends KeyElementType, R> {
-    private map:{[folderKey:string]:Entry<KE, R>[]} = {};
+    private map: { [folderKey: string]: Entry<KE, R>[] } = {};
 
-    public entries():Entry<KE, R>[] {
+    public entries(): Entry<KE, R>[] {
         const ret = [];
         for (const folderKey of Object.keys(this.map)) {
             for (const entry of this.map[folderKey]) {
@@ -20,7 +20,7 @@ export default class ListIndexedMap<KE extends KeyElementType, R> {
         return ret;
     }
 
-    public set(value:R, ...key:KE[]):boolean {
+    public set(value: R, ...key: KE[]): boolean {
         // returns true if an entry was added, false if entry already present and modified
         const entry = this.getEntry(key);
         if (!entry) {
@@ -32,7 +32,7 @@ export default class ListIndexedMap<KE extends KeyElementType, R> {
         }
     }
 
-    public get(...key:KE[]):R|undefined {
+    public get(...key: KE[]): R | undefined {
         const entry = this.getEntry(key);
         if (!entry) {
             return undefined;
@@ -41,11 +41,14 @@ export default class ListIndexedMap<KE extends KeyElementType, R> {
         }
     }
 
-    public has(...key:KE[]):boolean {
+    public has(...key: KE[]): boolean {
         return !!this.getEntry(key);
     }
 
-    public static from<T>(objs:T[], key:(t:T)=>string[]):ListIndexedMap<string, T> {
+    public static from<T>(
+        objs: T[],
+        key: (t: T) => string[]
+    ): ListIndexedMap<string, T> {
         const map = new ListIndexedMap<string, T>();
         for (const o of objs) {
             map.set(o, ...key(o));
@@ -53,11 +56,11 @@ export default class ListIndexedMap<KE extends KeyElementType, R> {
         return map;
     }
 
-    private getEntry(key:KE[]):Entry<KE, R>|undefined {
+    private getEntry(key: KE[]): Entry<KE, R> | undefined {
         return this.getFolder(key).find(entry => _.isEqual(entry.key, key));
     }
 
-    private getFolder(key:KE[]):Entry<KE, R>[] {
+    private getFolder(key: KE[]): Entry<KE, R>[] {
         const folderKey = getFolderKey(key);
         this.map[folderKey] = this.map[folderKey] || [];
         return this.map[folderKey];
@@ -65,9 +68,12 @@ export default class ListIndexedMap<KE extends KeyElementType, R> {
 }
 
 export class ListIndexedSet {
-    private map:ListIndexedMap<string, boolean> = new ListIndexedMap<string, boolean>();
+    private map: ListIndexedMap<string, boolean> = new ListIndexedMap<
+        string,
+        boolean
+    >();
 
-    public static from<T>(objs:T[], key:(t:T)=>string[]):ListIndexedSet {
+    public static from<T>(objs: T[], key: (t: T) => string[]): ListIndexedSet {
         const set = new ListIndexedSet();
         for (const o of objs) {
             set.add(...key(o));
@@ -75,15 +81,15 @@ export class ListIndexedSet {
         return set;
     }
 
-    public add(...key:string[]) {
+    public add(...key: string[]) {
         this.map.set(true, ...key);
     }
 
-    public delete(...key:string[]) {
+    public delete(...key: string[]) {
         this.map.set(false, ...key);
     }
 
-    public has(...key:string[]) {
+    public has(...key: string[]) {
         return !!this.map.get(...key);
     }
 
@@ -92,17 +98,16 @@ export class ListIndexedSet {
     }
 }
 
-export class StringListIndexedMap<R> extends ListIndexedMap<string, R>{}
+export class StringListIndexedMap<R> extends ListIndexedMap<string, R> {}
 
-export class ListIndexedMapOfCounts<KE extends KeyElementType> extends ListIndexedMap<KE, number> {
-    public increment(...key:KE[]) {
+export class ListIndexedMapOfCounts<
+    KE extends KeyElementType
+> extends ListIndexedMap<KE, number> {
+    public increment(...key: KE[]) {
         if (this.has(...key)) {
-            this.set(
-                this.get(...key)!+1,
-                ...key
-            );
+            this.set(this.get(...key)! + 1, ...key);
         } else {
             this.set(1, ...key);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/lib/LogicUtils.spec.ts b/src/shared/lib/LogicUtils.spec.ts
index 9f1c7b50507..a9a7d81fdc5 100644
--- a/src/shared/lib/LogicUtils.spec.ts
+++ b/src/shared/lib/LogicUtils.spec.ts
@@ -1,14 +1,17 @@
-import {assert} from "chai";
-import {logicalAnd} from "./LogicUtils";
+import { assert } from 'chai';
+import { logicalAnd } from './LogicUtils';
 
-describe("LogicUtils", ()=>{
-    describe("logicalAnd", ()=>{
-        it("returns correct output on several inputs", ()=>{
-            assert.isTrue(logicalAnd([]), "empty input");
-            assert.isTrue(logicalAnd([true]), "true input");
-            assert.isTrue(logicalAnd([true, true]), "true two args");
-            assert.isTrue(logicalAnd([true, true, true, true, true]), "five args");
-            assert.isFalse(logicalAnd([true, false, false]), "false args");
+describe('LogicUtils', () => {
+    describe('logicalAnd', () => {
+        it('returns correct output on several inputs', () => {
+            assert.isTrue(logicalAnd([]), 'empty input');
+            assert.isTrue(logicalAnd([true]), 'true input');
+            assert.isTrue(logicalAnd([true, true]), 'true two args');
+            assert.isTrue(
+                logicalAnd([true, true, true, true, true]),
+                'five args'
+            );
+            assert.isFalse(logicalAnd([true, false, false]), 'false args');
         });
     });
-});
\ No newline at end of file
+});
diff --git a/src/shared/lib/LogicUtils.ts b/src/shared/lib/LogicUtils.ts
index 5f12000411b..c59442b6116 100644
--- a/src/shared/lib/LogicUtils.ts
+++ b/src/shared/lib/LogicUtils.ts
@@ -1,6 +1,13 @@
-import _ from "lodash";
+import _ from 'lodash';
 
-export function logicalAnd<T>(array:T[], _iterator?:(t:T)=>boolean):boolean {
-    const iterator = _iterator ? _iterator : ((x:T)=>!!x);
-    return _.reduce(array, (acc:boolean, nextElt:T)=>acc&&iterator(nextElt), true);
-}
\ No newline at end of file
+export function logicalAnd<T>(
+    array: T[],
+    _iterator?: (t: T) => boolean
+): boolean {
+    const iterator = _iterator ? _iterator : (x: T) => !!x;
+    return _.reduce(
+        array,
+        (acc: boolean, nextElt: T) => acc && iterator(nextElt),
+        true
+    );
+}
diff --git a/src/shared/lib/MDACCUtils.spec.ts b/src/shared/lib/MDACCUtils.spec.ts
index b588cc63650..fe8b0f7f51d 100644
--- a/src/shared/lib/MDACCUtils.spec.ts
+++ b/src/shared/lib/MDACCUtils.spec.ts
@@ -1,8 +1,8 @@
-import {assert} from "chai";
-import {getHeatmapMeta} from "./MDACCUtils";
+import { assert } from 'chai';
+import { getHeatmapMeta } from './MDACCUtils';
 
-describe("MDACCUtils", () => {
-    describe("getHeatmapMeta", () => {
+describe('MDACCUtils', () => {
+    describe('getHeatmapMeta', () => {
         // These tests will be transferred to e2e tests once the interface is finalized
         // it("return empty array for other non heatmap services", (done) => {
         //     getHeatmapMeta("")
@@ -31,4 +31,4 @@ describe("MDACCUtils", () => {
         //         .catch(done);
         // }).timeout(5000);
     });
-});
\ No newline at end of file
+});
diff --git a/src/shared/lib/MDACCUtils.ts b/src/shared/lib/MDACCUtils.ts
index 586f36d560d..3f093ae9272 100644
--- a/src/shared/lib/MDACCUtils.ts
+++ b/src/shared/lib/MDACCUtils.ts
@@ -23,8 +23,8 @@ export async function getHeatmapMeta(url: string): Promise<string[]> {
         return [];
     }
     if (result === undefined) {
-        return []
+        return [];
     } else {
         return result;
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/lib/MemoizedHandlerFactory.ts b/src/shared/lib/MemoizedHandlerFactory.ts
index 61f23b14f64..115205ccc76 100644
--- a/src/shared/lib/MemoizedHandlerFactory.ts
+++ b/src/shared/lib/MemoizedHandlerFactory.ts
@@ -1,20 +1,20 @@
-import LazyMemo from "./LazyMemo";
-import {SyntheticEvent} from "react";
+import LazyMemo from './LazyMemo';
+import { SyntheticEvent } from 'react';
 
-function shallowAlphabeticalStringify(obj:any) {
+function shallowAlphabeticalStringify(obj: any) {
     return JSON.stringify(obj, Object.keys(obj).sort());
 }
 
 export default function MemoizedHandlerFactory<Params, Target>(
-    handler:(e:React.MouseEvent<Target>, params:Params)=>void,
-    key:(params:Params)=>string = shallowAlphabeticalStringify
+    handler: (e: React.MouseEvent<Target>, params: Params) => void,
+    key: (params: Params) => string = shallowAlphabeticalStringify
 ) {
-    const memo = new LazyMemo<Params, (e:React.MouseEvent<Target>)=>void>(
+    const memo = new LazyMemo<Params, (e: React.MouseEvent<Target>) => void>(
         key,
-        (params:Params)=>{
-            return (e:React.MouseEvent<Target>)=>handler(e, params);
+        (params: Params) => {
+            return (e: React.MouseEvent<Target>) => handler(e, params);
         }
     );
 
-    return (params:Params)=>memo.get(params);
-}
\ No newline at end of file
+    return (params: Params) => memo.get(params);
+}
diff --git a/src/shared/lib/MobxPromiseCache.ts b/src/shared/lib/MobxPromiseCache.ts
index 2304f3bde29..f5a512bec56 100644
--- a/src/shared/lib/MobxPromiseCache.ts
+++ b/src/shared/lib/MobxPromiseCache.ts
@@ -1,44 +1,57 @@
-import {MobxPromise, MobxPromiseInputParams} from "mobxpromise";
-import {logicalAnd} from "./LogicUtils";
+import { MobxPromise, MobxPromiseInputParams } from 'mobxpromise';
+import { logicalAnd } from './LogicUtils';
 
-export function stringifyObjectUnique(obj:{[k:string]:any}) {
+export function stringifyObjectUnique(obj: { [k: string]: any }) {
     const keys = Object.keys(obj);
     keys.sort();
-    return `{${keys.map(k=>{
-        const val = obj[k];
-        if (typeof val === typeof {})
-            throw new Error("Warning: keys in cache may not be unique because query contains nested objects. Specify queryToKey init. param. to be safe.");
-        return `"${k}":"${val}"`
-    }).join(",")}}`;
+    return `{${keys
+        .map(k => {
+            const val = obj[k];
+            if (typeof val === typeof {})
+                throw new Error(
+                    'Warning: keys in cache may not be unique because query contains nested objects. Specify queryToKey init. param. to be safe.'
+                );
+            return `"${k}":"${val}"`;
+        })
+        .join(',')}}`;
 }
 
 export default class MobxPromiseCache<Query, Result> {
-    private cache:{[key:string]:MobxPromise<Result>};
+    private cache: { [key: string]: MobxPromise<Result> };
 
     constructor(
-        private queryToMobxPromiseInput:(q:Query)=>MobxPromiseInputParams<Result>,
-        private queryToKey:(q:Query)=>string = stringifyObjectUnique
+        private queryToMobxPromiseInput: (
+            q: Query
+        ) => MobxPromiseInputParams<Result>,
+        private queryToKey: (q: Query) => string = stringifyObjectUnique
     ) {
         this.cache = {};
     }
 
-    public get(q:Query):MobxPromise<Result> {
+    public get(q: Query): MobxPromise<Result> {
         const key = this.queryToKey(q);
         if (!this.cache[key]) {
-            this.cache[key] = new MobxPromise<Result>(this.queryToMobxPromiseInput(q));
+            this.cache[key] = new MobxPromise<Result>(
+                this.queryToMobxPromiseInput(q)
+            );
         }
         return this.cache[key];
     }
 
-    public getAll(queries:Query[]):MobxPromise<Result>[] {
-        return queries.map(q=>this.get(q));
+    public getAll(queries: Query[]): MobxPromise<Result>[] {
+        return queries.map(q => this.get(q));
     }
 
-    public await(promises:MobxPromise<any>[], getQueries:(...promiseResults:any[])=>Query[]) {
+    public await(
+        promises: MobxPromise<any>[],
+        getQueries: (...promiseResults: any[]) => Query[]
+    ) {
         let ret = promises;
-        if (logicalAnd(promises.map(p=>p.isComplete))) {
-            ret = ret.concat(this.getAll(getQueries.apply(null, promises.map(p=>p.result))));
+        if (logicalAnd(promises.map(p => p.isComplete))) {
+            ret = ret.concat(
+                this.getAll(getQueries.apply(null, promises.map(p => p.result)))
+            );
         }
         return ret;
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/lib/MutationInputParser.spec.ts b/src/shared/lib/MutationInputParser.spec.ts
index b824a6f8fca..355b15808c8 100644
--- a/src/shared/lib/MutationInputParser.spec.ts
+++ b/src/shared/lib/MutationInputParser.spec.ts
@@ -1,331 +1,481 @@
-import {assert} from "chai";
-import {buildIndexMap, getClinicalData, getGeneList, parseInput} from "./MutationInputParser";
-
-describe("MutationInputParser", () => {
+import { assert } from 'chai';
+import {
+    buildIndexMap,
+    getClinicalData,
+    getGeneList,
+    parseInput,
+} from './MutationInputParser';
+
+describe('MutationInputParser', () => {
     const partiallyAnnotatedMutationInput =
-        "Hugo_Symbol\tSample_ID\tProtein_Change\tMutation_Type\tChromosome\tStart_Position\tEnd_Position\tReference_Allele\tVariant_Allele\n" +
-        "AR\tTCGA-13-0760\tL729I\tMissense_Mutation\t23\t66937331\t66937331\tT\tA\n" +
-        "AR\tTCGA-BS-A0UF\tR832*\tNonsense_Mutation\t23\t66942713\t66942713\tC\tT\n" +
-        "AR\tTCGA-D1-A17M\tL185P\tMissense_Mutation\t23\t66765542\t66765542\tT\tC\n" +
-        "AR\tTCGA-B5-A0JY\tK222N\tMissense_Mutation\t23\t66765654\t66765654\tG\tT\n" +
-        "BRCA1\tTCGA-24-2298\tQ1395fs\tFrame_Shift_Ins\t17\t41242962\t41242963\t-\tGA\n" +
-        "BRCA1\tTCGA-09-1669\tE1345fs\tFrame_Shift_Del\t17\t41243513\t41243513\tT\t-\n" +
-        "BRCA1\tTCGA-25-1625\tE116*\tNonsense_Mutation\t17\t41256234\t41256234\tC\tA\n" +
-        "BRCA1\tTCGA-13-0804\tC47W\tMissense_Mutation\t17\t41258544\t41258544\tG\tC\n" +
-        "BRCA1\tTCGA-23-1027\tE23fs\tFrame_Shift_Del\t17\t41276045\t41276046\tCT\t-\n" +
-        "BRCA1\tTCGA-23-1118\tE23fs\tFrame_Shift_Del\t17\t41276045\t41276046\tCT\t-\n" +
-        "BRCA1\tTCGA-AP-A051\tL49M\tMissense_Mutation\t17\t41258540\t41258540\tG\tT\n" +
-        "BRCA1\tTCGA-B5-A11E\tA942V\tMissense_Mutation\t17\t41244723\t41244723\tG\tA\n" +
-        "BRCA1\tTCGA-BS-A0UF\tD1778_splice\tSplice_Site\t17\t41201212\t41201212\tC\tA\n" +
-        "BRCA2\tTCGA-13-0793\tT3085fs\tFrame_Shift_Del\t13\t32954281\t32954282\tAG\t-\n" +
-        "BRCA2\tTCGA-24-1103\tK1638E\tMissense_Mutation\t13\t32913404\t32913404\tA\tG\n" +
-        "BRCA2\tTCGA-24-2024\tY1710fs\tFrame_Shift_Del\t13\t32913620\t32913623\tTATG\t-\n" +
-        "BRCA2\tTCGA-04-1367\tE294*\tNonsense_Mutation\t13\t32906495\t32906495\tG\tT\n" +
-        "BRCA2\tTCGA-23-1030\tT1354M\tMissense_Mutation\t13\t32912553\t32912553\tC\tT\n" +
-        "BRCA2\tTCGA-13-0792\tE1143D\tMissense_Mutation\t13\t32911921\t32911921\tA\tT\n" +
-        "BRCA2\tTCGA-24-1555\tE2878_splice\tSplice_Site\t13\t32950806\t32950806\tG\tC\n" +
-        "BRCA2\tTCGA-B5-A11E\tR2842C\tMissense_Mutation\t13\t32945129\t32945129\tC\tT\n" +
-        "BRCA2\tTCGA-B5-A0JY\tR2842C\tMissense_Mutation\t13\t32945129\t32945129\tC\tT\n" +
-        "BRCA2\tTCGA-AP-A059\tS3239Y\tMissense_Mutation\t13\t32972366\t32972366\tC\tA\n" +
-        "BRCA2\tTCGA-BS-A0UV\tE1441*\tNonsense_Mutation\t13\t32912813\t32912813\tG\tT\n" +
-        "BRCA2\tTCGA-AX-A05Z\tE897*\tNonsense_Mutation\t13\t32911181\t32911181\tG\tT\n" +
-        "POLE\tTCGA-57-1582\tN1869K\tMissense_Mutation\t12\t133214671\t133214671\tG\tC\n" +
-        "POLE\tTCGA-24-1104\tT2245N\tMissense_Mutation\t12\t133201504\t133201504\tG\tT\n" +
-        "POLE\tTCGA-AX-A05Z\tS1930*\tNonsense_Mutation\t12\t133212500\t133212500\tG\tT\n" +
-        "POLE\tTCGA-AP-A059\tL2112M\tMissense_Mutation\t12\t133202900\t133202900\tG\tT\n" +
-        "POLE\tTCGA-AP-A059\tA25T\tMissense_Mutation\t12\t133257855\t133257855\tC\tT\n" +
-        "TP53\tTCGA-FI-A2EX\tR248W\tMissense_Mutation\t17\t7577539\t7577539\tG\tA\n" +
-        "TP53\tTCGA-B5-A11N\tT256fs\tFrame_Shift_Ins\t17\t7577514\t7577515\t-\tT\n" +
-        "TP53\tTCGA-DI-A1NN\tQ144*\tNonsense_Mutation\t17\t7578500\t7578500\tG\tA\n" +
-        "TP53\tTCGA-AX-A0IU\tP278fs\tFrame_Shift_Ins\t17\t7577105\t7577106\t-\tGA\n" +
-        "TP53\tTCGA-AP-A1DQ\tR175H\tMissense_Mutation\t17\t7578406\t7578406\tC\tT\n" +
-        "TP53\tTCGA-AJ-A23M\t277_277C>CC\tIn_Frame_Ins\t17\t7577107\t7577108\t-\tCAG\n" +
-        "TP53\tTCGA-EY-A212\tV173L\tMissense_Mutation\t17\t7578413\t7578413\tC\tG\n" +
-        "TP53\tTCGA-D1-A16I\tI332_splice\tSplice_Site\t17\t7574034\t7574034\tC\tG";
+        'Hugo_Symbol\tSample_ID\tProtein_Change\tMutation_Type\tChromosome\tStart_Position\tEnd_Position\tReference_Allele\tVariant_Allele\n' +
+        'AR\tTCGA-13-0760\tL729I\tMissense_Mutation\t23\t66937331\t66937331\tT\tA\n' +
+        'AR\tTCGA-BS-A0UF\tR832*\tNonsense_Mutation\t23\t66942713\t66942713\tC\tT\n' +
+        'AR\tTCGA-D1-A17M\tL185P\tMissense_Mutation\t23\t66765542\t66765542\tT\tC\n' +
+        'AR\tTCGA-B5-A0JY\tK222N\tMissense_Mutation\t23\t66765654\t66765654\tG\tT\n' +
+        'BRCA1\tTCGA-24-2298\tQ1395fs\tFrame_Shift_Ins\t17\t41242962\t41242963\t-\tGA\n' +
+        'BRCA1\tTCGA-09-1669\tE1345fs\tFrame_Shift_Del\t17\t41243513\t41243513\tT\t-\n' +
+        'BRCA1\tTCGA-25-1625\tE116*\tNonsense_Mutation\t17\t41256234\t41256234\tC\tA\n' +
+        'BRCA1\tTCGA-13-0804\tC47W\tMissense_Mutation\t17\t41258544\t41258544\tG\tC\n' +
+        'BRCA1\tTCGA-23-1027\tE23fs\tFrame_Shift_Del\t17\t41276045\t41276046\tCT\t-\n' +
+        'BRCA1\tTCGA-23-1118\tE23fs\tFrame_Shift_Del\t17\t41276045\t41276046\tCT\t-\n' +
+        'BRCA1\tTCGA-AP-A051\tL49M\tMissense_Mutation\t17\t41258540\t41258540\tG\tT\n' +
+        'BRCA1\tTCGA-B5-A11E\tA942V\tMissense_Mutation\t17\t41244723\t41244723\tG\tA\n' +
+        'BRCA1\tTCGA-BS-A0UF\tD1778_splice\tSplice_Site\t17\t41201212\t41201212\tC\tA\n' +
+        'BRCA2\tTCGA-13-0793\tT3085fs\tFrame_Shift_Del\t13\t32954281\t32954282\tAG\t-\n' +
+        'BRCA2\tTCGA-24-1103\tK1638E\tMissense_Mutation\t13\t32913404\t32913404\tA\tG\n' +
+        'BRCA2\tTCGA-24-2024\tY1710fs\tFrame_Shift_Del\t13\t32913620\t32913623\tTATG\t-\n' +
+        'BRCA2\tTCGA-04-1367\tE294*\tNonsense_Mutation\t13\t32906495\t32906495\tG\tT\n' +
+        'BRCA2\tTCGA-23-1030\tT1354M\tMissense_Mutation\t13\t32912553\t32912553\tC\tT\n' +
+        'BRCA2\tTCGA-13-0792\tE1143D\tMissense_Mutation\t13\t32911921\t32911921\tA\tT\n' +
+        'BRCA2\tTCGA-24-1555\tE2878_splice\tSplice_Site\t13\t32950806\t32950806\tG\tC\n' +
+        'BRCA2\tTCGA-B5-A11E\tR2842C\tMissense_Mutation\t13\t32945129\t32945129\tC\tT\n' +
+        'BRCA2\tTCGA-B5-A0JY\tR2842C\tMissense_Mutation\t13\t32945129\t32945129\tC\tT\n' +
+        'BRCA2\tTCGA-AP-A059\tS3239Y\tMissense_Mutation\t13\t32972366\t32972366\tC\tA\n' +
+        'BRCA2\tTCGA-BS-A0UV\tE1441*\tNonsense_Mutation\t13\t32912813\t32912813\tG\tT\n' +
+        'BRCA2\tTCGA-AX-A05Z\tE897*\tNonsense_Mutation\t13\t32911181\t32911181\tG\tT\n' +
+        'POLE\tTCGA-57-1582\tN1869K\tMissense_Mutation\t12\t133214671\t133214671\tG\tC\n' +
+        'POLE\tTCGA-24-1104\tT2245N\tMissense_Mutation\t12\t133201504\t133201504\tG\tT\n' +
+        'POLE\tTCGA-AX-A05Z\tS1930*\tNonsense_Mutation\t12\t133212500\t133212500\tG\tT\n' +
+        'POLE\tTCGA-AP-A059\tL2112M\tMissense_Mutation\t12\t133202900\t133202900\tG\tT\n' +
+        'POLE\tTCGA-AP-A059\tA25T\tMissense_Mutation\t12\t133257855\t133257855\tC\tT\n' +
+        'TP53\tTCGA-FI-A2EX\tR248W\tMissense_Mutation\t17\t7577539\t7577539\tG\tA\n' +
+        'TP53\tTCGA-B5-A11N\tT256fs\tFrame_Shift_Ins\t17\t7577514\t7577515\t-\tT\n' +
+        'TP53\tTCGA-DI-A1NN\tQ144*\tNonsense_Mutation\t17\t7578500\t7578500\tG\tA\n' +
+        'TP53\tTCGA-AX-A0IU\tP278fs\tFrame_Shift_Ins\t17\t7577105\t7577106\t-\tGA\n' +
+        'TP53\tTCGA-AP-A1DQ\tR175H\tMissense_Mutation\t17\t7578406\t7578406\tC\tT\n' +
+        'TP53\tTCGA-AJ-A23M\t277_277C>CC\tIn_Frame_Ins\t17\t7577107\t7577108\t-\tCAG\n' +
+        'TP53\tTCGA-EY-A212\tV173L\tMissense_Mutation\t17\t7578413\t7578413\tC\tG\n' +
+        'TP53\tTCGA-D1-A16I\tI332_splice\tSplice_Site\t17\t7574034\t7574034\tC\tG';
 
     const basicMutationInput =
-        "Sample_ID\tChromosome\tStart_Position\tEnd_Position\tReference_Allele\tVariant_Allele\n" +
-        "TCGA-13-0760\tX\t66937331\t66937331\tT\tA\n" +
-        "TCGA-BS-A0UF\tX\t66942713\t66942713\tC\tT\n" +
-        "TCGA-D1-A17M\tX\t66765542\t66765542\tT\tC\n" +
-        "TCGA-B5-A0JY\tX\t66765654\t66765654\tG\tT\n" +
-        "TCGA-24-2298\t17\t41242962\t41242963\t-\tGA\n" +
-        "TCGA-09-1669\t17\t41243513\t41243513\tT\t-\n" +
-        "TCGA-25-1625\t17\t41256234\t41256234\tC\tA\n" +
-        "TCGA-13-0804\t17\t41258544\t41258544\tG\tC\n" +
-        "TCGA-23-1027\t17\t41276045\t41276046\tCT\t-\n" +
-        "TCGA-23-1118\t17\t41276045\t41276046\tCT\t-\n" +
-        "TCGA-AP-A051\t17\t41258540\t41258540\tG\tT\n" +
-        "TCGA-B5-A11E\t17\t41244723\t41244723\tG\tA\n" +
-        "TCGA-BS-A0UF\t17\t41201212\t41201212\tC\tA\n" +
-        "TCGA-13-0793\t13\t32954281\t32954282\tAG\t-\n" +
-        "TCGA-24-1103\t13\t32913404\t32913404\tA\tG\n" +
-        "TCGA-24-2024\t13\t32913620\t32913623\tTATG\t-\n" +
-        "TCGA-04-1367\t13\t32906495\t32906495\tG\tT\n" +
-        "TCGA-23-1030\t13\t32912553\t32912553\tC\tT\n" +
-        "TCGA-13-0792\t13\t32911921\t32911921\tA\tT\n" +
-        "TCGA-24-1555\t13\t32950806\t32950806\tG\tC\n" +
-        "TCGA-B5-A11E\t13\t32945129\t32945129\tC\tT\n" +
-        "TCGA-B5-A0JY\t13\t32945129\t32945129\tC\tT\n" +
-        "TCGA-AP-A059\t13\t32972366\t32972366\tC\tA\n" +
-        "TCGA-BS-A0UV\t13\t32912813\t32912813\tG\tT\n" +
-        "TCGA-AX-A05Z\t13\t32911181\t32911181\tG\tT\n" +
-        "TCGA-57-1582\t12\t133214671\t133214671\tG\tC\n" +
-        "TCGA-24-1104\t12\t133201504\t133201504\tG\tT\n" +
-        "TCGA-AX-A05Z\t12\t133212500\t133212500\tG\tT\n" +
-        "TCGA-AP-A059\t12\t133202900\t133202900\tG\tT\n" +
-        "TCGA-AP-A059\t12\t133257855\t133257855\tC\tT\n" +
-        "TCGA-FI-A2EX\t17\t7577539\t7577539\tG\tA\n" +
-        "TCGA-B5-A11N\t17\t7577514\t7577515\t-\tT\n" +
-        "TCGA-DI-A1NN\t17\t7578500\t7578500\tG\tA\n" +
-        "TCGA-AX-A0IU\t17\t7577105\t7577106\t-\tGA\n" +
-        "TCGA-AP-A1DQ\t17\t7578406\t7578406\tC\tT\n" +
-        "TCGA-AJ-A23M\t17\t7577107\t7577108\t-\tCAG\n" +
-        "TCGA-EY-A212\t17\t7578413\t7578413\tC\tG\n" +
-        "TCGA-D1-A16I\t17\t7574034\t7574034\tC\tG\n" +
-        "Unknown\t10\t89692905\t89692905\tG\tA";
+        'Sample_ID\tChromosome\tStart_Position\tEnd_Position\tReference_Allele\tVariant_Allele\n' +
+        'TCGA-13-0760\tX\t66937331\t66937331\tT\tA\n' +
+        'TCGA-BS-A0UF\tX\t66942713\t66942713\tC\tT\n' +
+        'TCGA-D1-A17M\tX\t66765542\t66765542\tT\tC\n' +
+        'TCGA-B5-A0JY\tX\t66765654\t66765654\tG\tT\n' +
+        'TCGA-24-2298\t17\t41242962\t41242963\t-\tGA\n' +
+        'TCGA-09-1669\t17\t41243513\t41243513\tT\t-\n' +
+        'TCGA-25-1625\t17\t41256234\t41256234\tC\tA\n' +
+        'TCGA-13-0804\t17\t41258544\t41258544\tG\tC\n' +
+        'TCGA-23-1027\t17\t41276045\t41276046\tCT\t-\n' +
+        'TCGA-23-1118\t17\t41276045\t41276046\tCT\t-\n' +
+        'TCGA-AP-A051\t17\t41258540\t41258540\tG\tT\n' +
+        'TCGA-B5-A11E\t17\t41244723\t41244723\tG\tA\n' +
+        'TCGA-BS-A0UF\t17\t41201212\t41201212\tC\tA\n' +
+        'TCGA-13-0793\t13\t32954281\t32954282\tAG\t-\n' +
+        'TCGA-24-1103\t13\t32913404\t32913404\tA\tG\n' +
+        'TCGA-24-2024\t13\t32913620\t32913623\tTATG\t-\n' +
+        'TCGA-04-1367\t13\t32906495\t32906495\tG\tT\n' +
+        'TCGA-23-1030\t13\t32912553\t32912553\tC\tT\n' +
+        'TCGA-13-0792\t13\t32911921\t32911921\tA\tT\n' +
+        'TCGA-24-1555\t13\t32950806\t32950806\tG\tC\n' +
+        'TCGA-B5-A11E\t13\t32945129\t32945129\tC\tT\n' +
+        'TCGA-B5-A0JY\t13\t32945129\t32945129\tC\tT\n' +
+        'TCGA-AP-A059\t13\t32972366\t32972366\tC\tA\n' +
+        'TCGA-BS-A0UV\t13\t32912813\t32912813\tG\tT\n' +
+        'TCGA-AX-A05Z\t13\t32911181\t32911181\tG\tT\n' +
+        'TCGA-57-1582\t12\t133214671\t133214671\tG\tC\n' +
+        'TCGA-24-1104\t12\t133201504\t133201504\tG\tT\n' +
+        'TCGA-AX-A05Z\t12\t133212500\t133212500\tG\tT\n' +
+        'TCGA-AP-A059\t12\t133202900\t133202900\tG\tT\n' +
+        'TCGA-AP-A059\t12\t133257855\t133257855\tC\tT\n' +
+        'TCGA-FI-A2EX\t17\t7577539\t7577539\tG\tA\n' +
+        'TCGA-B5-A11N\t17\t7577514\t7577515\t-\tT\n' +
+        'TCGA-DI-A1NN\t17\t7578500\t7578500\tG\tA\n' +
+        'TCGA-AX-A0IU\t17\t7577105\t7577106\t-\tGA\n' +
+        'TCGA-AP-A1DQ\t17\t7578406\t7578406\tC\tT\n' +
+        'TCGA-AJ-A23M\t17\t7577107\t7577108\t-\tCAG\n' +
+        'TCGA-EY-A212\t17\t7578413\t7578413\tC\tG\n' +
+        'TCGA-D1-A16I\t17\t7574034\t7574034\tC\tG\n' +
+        'Unknown\t10\t89692905\t89692905\tG\tA';
 
     const minimalMutationInput =
-        "Hugo_Symbol\tProtein_Change\n" +
-        "AR\tL729I\n" +
-        "AR\tR832*\n" +
-        "AR\tL185P\n" +
-        "AR\tK222N\n" +
-        "BRCA1\tQ1395fs\n" +
-        "BRCA1\tE1345fs\n" +
-        "BRCA1\tE116*\n" +
-        "BRCA1\tC47W\n" +
-        "BRCA1\tE23fs\n" +
-        "BRCA1\tE23fs\n" +
-        "BRCA1\tL49M\n" +
-        "BRCA1\tA942V\n" +
-        "BRCA1\tD1778_splice\n" +
-        "BRCA2\tT3085fs\n" +
-        "BRCA2\tK1638E\n" +
-        "BRCA2\tY1710fs\n" +
-        "BRCA2\tE294*\n" +
-        "BRCA2\tT1354M\n" +
-        "BRCA2\tE1143D\n" +
-        "BRCA2\tE2878_splice\n" +
-        "BRCA2\tR2842C\n" +
-        "BRCA2\tR2842C\n" +
-        "BRCA2\tS3239Y\n" +
-        "BRCA2\tE1441*\n" +
-        "BRCA2\tE897*\n" +
-        "POLE\tN1869K\n" +
-        "POLE\tT2245N\n" +
-        "POLE\tS1930*\n" +
-        "POLE\tL2112M\n" +
-        "POLE\tA25T\n" +
-        "TP53\tR248W\n" +
-        "TP53\tT256fs\n" +
-        "TP53\tQ144*\n" +
-        "TP53\tP278fs\n" +
-        "TP53\tR175H\n" +
-        "TP53\t277_277C>CC\n" +
-        "TP53\tV173L\n" +
-        "TP53\tI332_splice\n" +
-        "PTEN\tR130Q";
+        'Hugo_Symbol\tProtein_Change\n' +
+        'AR\tL729I\n' +
+        'AR\tR832*\n' +
+        'AR\tL185P\n' +
+        'AR\tK222N\n' +
+        'BRCA1\tQ1395fs\n' +
+        'BRCA1\tE1345fs\n' +
+        'BRCA1\tE116*\n' +
+        'BRCA1\tC47W\n' +
+        'BRCA1\tE23fs\n' +
+        'BRCA1\tE23fs\n' +
+        'BRCA1\tL49M\n' +
+        'BRCA1\tA942V\n' +
+        'BRCA1\tD1778_splice\n' +
+        'BRCA2\tT3085fs\n' +
+        'BRCA2\tK1638E\n' +
+        'BRCA2\tY1710fs\n' +
+        'BRCA2\tE294*\n' +
+        'BRCA2\tT1354M\n' +
+        'BRCA2\tE1143D\n' +
+        'BRCA2\tE2878_splice\n' +
+        'BRCA2\tR2842C\n' +
+        'BRCA2\tR2842C\n' +
+        'BRCA2\tS3239Y\n' +
+        'BRCA2\tE1441*\n' +
+        'BRCA2\tE897*\n' +
+        'POLE\tN1869K\n' +
+        'POLE\tT2245N\n' +
+        'POLE\tS1930*\n' +
+        'POLE\tL2112M\n' +
+        'POLE\tA25T\n' +
+        'TP53\tR248W\n' +
+        'TP53\tT256fs\n' +
+        'TP53\tQ144*\n' +
+        'TP53\tP278fs\n' +
+        'TP53\tR175H\n' +
+        'TP53\t277_277C>CC\n' +
+        'TP53\tV173L\n' +
+        'TP53\tI332_splice\n' +
+        'PTEN\tR130Q';
 
     const mutationInputWithClinicalData =
-        "Sample_ID\tCancer_Type\n" +
-        "TCGA-13-0760\tCancerType1\n" +
-        "TCGA-BS-A0UF\tCancerType1\n" +
-        "TCGA-AP-A051\tCancerType2\n" +
-        "TCGA-B5-A11E\tCancerType2\n" +
-        "TCGA-BS-A0UF\tCancerType3\n" +
-        "TCGA-13-0792\tCancerType3\n" +
-        "TCGA-24-1104\tCancerType3\n" +
-        "Unknown\tCancerType4";
-
-    before(() => {
-
-    });
-
-    it("extracts mutation input headers", () => {
-        const separator = "\t";
-        const richInputIndexMap = buildIndexMap(partiallyAnnotatedMutationInput.split("\n")[0], separator);
-        assert.equal(richInputIndexMap["hugo_symbol"], 0);
-        assert.equal(richInputIndexMap["sample_id"], 1);
-        assert.equal(richInputIndexMap["protein_change"], 2);
-        assert.equal(richInputIndexMap["mutation_type"], 3);
-        assert.equal(richInputIndexMap["chromosome"], 4);
-        assert.equal(richInputIndexMap["start_position"], 5);
-        assert.equal(richInputIndexMap["end_position"], 6);
-        assert.equal(richInputIndexMap["reference_allele"], 7);
-        assert.equal(richInputIndexMap["variant_allele"], 8);
-
-        const basicInputIndexMap = buildIndexMap(basicMutationInput.split("\n")[0], separator);
-        assert.equal(basicInputIndexMap["sample_id"], 0);
-        assert.equal(basicInputIndexMap["chromosome"], 1);
-        assert.equal(basicInputIndexMap["start_position"], 2);
-        assert.equal(basicInputIndexMap["end_position"], 3);
-        assert.equal(basicInputIndexMap["reference_allele"], 4);
-        assert.equal(basicInputIndexMap["variant_allele"], 5);
-
-        const minimalInputIndexMap = buildIndexMap(minimalMutationInput.split("\n")[0], separator);
-        assert.equal(minimalInputIndexMap["hugo_symbol"], 0);
-        assert.equal(minimalInputIndexMap["protein_change"], 1);
-
-        const clinicalInputIndexMap = buildIndexMap(mutationInputWithClinicalData.split("\n")[0], separator);
-        assert.equal(clinicalInputIndexMap["sample_id"], 0);
-        assert.equal(clinicalInputIndexMap["cancer_type"], 1);
+        'Sample_ID\tCancer_Type\n' +
+        'TCGA-13-0760\tCancerType1\n' +
+        'TCGA-BS-A0UF\tCancerType1\n' +
+        'TCGA-AP-A051\tCancerType2\n' +
+        'TCGA-B5-A11E\tCancerType2\n' +
+        'TCGA-BS-A0UF\tCancerType3\n' +
+        'TCGA-13-0792\tCancerType3\n' +
+        'TCGA-24-1104\tCancerType3\n' +
+        'Unknown\tCancerType4';
+
+    before(() => {});
+
+    it('extracts mutation input headers', () => {
+        const separator = '\t';
+        const richInputIndexMap = buildIndexMap(
+            partiallyAnnotatedMutationInput.split('\n')[0],
+            separator
+        );
+        assert.equal(richInputIndexMap['hugo_symbol'], 0);
+        assert.equal(richInputIndexMap['sample_id'], 1);
+        assert.equal(richInputIndexMap['protein_change'], 2);
+        assert.equal(richInputIndexMap['mutation_type'], 3);
+        assert.equal(richInputIndexMap['chromosome'], 4);
+        assert.equal(richInputIndexMap['start_position'], 5);
+        assert.equal(richInputIndexMap['end_position'], 6);
+        assert.equal(richInputIndexMap['reference_allele'], 7);
+        assert.equal(richInputIndexMap['variant_allele'], 8);
+
+        const basicInputIndexMap = buildIndexMap(
+            basicMutationInput.split('\n')[0],
+            separator
+        );
+        assert.equal(basicInputIndexMap['sample_id'], 0);
+        assert.equal(basicInputIndexMap['chromosome'], 1);
+        assert.equal(basicInputIndexMap['start_position'], 2);
+        assert.equal(basicInputIndexMap['end_position'], 3);
+        assert.equal(basicInputIndexMap['reference_allele'], 4);
+        assert.equal(basicInputIndexMap['variant_allele'], 5);
+
+        const minimalInputIndexMap = buildIndexMap(
+            minimalMutationInput.split('\n')[0],
+            separator
+        );
+        assert.equal(minimalInputIndexMap['hugo_symbol'], 0);
+        assert.equal(minimalInputIndexMap['protein_change'], 1);
+
+        const clinicalInputIndexMap = buildIndexMap(
+            mutationInputWithClinicalData.split('\n')[0],
+            separator
+        );
+        assert.equal(clinicalInputIndexMap['sample_id'], 0);
+        assert.equal(clinicalInputIndexMap['cancer_type'], 1);
     });
 
-    it("parses minimal mutation input", () => {
+    it('parses minimal mutation input', () => {
         const mutations = parseInput(minimalMutationInput);
 
-        assert.equal(mutations.length, 39,
-            "number of parsed mutations should be equal to number of data lines");
-
-        assert.equal(mutations[0].proteinChange, "L729I",
-            "input order of mutations should be preserved");
-        assert.equal(mutations[mutations.length - 1].proteinChange, "R130Q",
-            "input order of mutations should be preserved");
-
-        assert.equal(mutations[0].gene!.hugoGeneSymbol, "AR",
-            "gene instance should have hugo symbol");
-
-        assert.equal(mutations[1].sampleId, undefined,
-            "mutation should NOT have sample id");
-        assert.equal(mutations[1].proteinChange, "R832*",
-            "mutation should have protein change");
-        assert.equal(mutations[1].mutationType, undefined,
-            "mutation should NOT have mutation type");
-
-        assert.equal(mutations[1].chr, undefined,
-            "mutation should NOT have chromosome");
-        assert.equal(mutations[1].startPosition, undefined,
-            "mutation should NOT have start position");
-        assert.equal(mutations[1].endPosition, undefined,
-            "mutation should NOT have end position");
-        assert.equal(mutations[1].referenceAllele, undefined,
-            "mutation should NOT have reference allele");
-        assert.equal(mutations[1].variantAllele, undefined,
-            "mutation should NOT have variant allele");
+        assert.equal(
+            mutations.length,
+            39,
+            'number of parsed mutations should be equal to number of data lines'
+        );
+
+        assert.equal(
+            mutations[0].proteinChange,
+            'L729I',
+            'input order of mutations should be preserved'
+        );
+        assert.equal(
+            mutations[mutations.length - 1].proteinChange,
+            'R130Q',
+            'input order of mutations should be preserved'
+        );
+
+        assert.equal(
+            mutations[0].gene!.hugoGeneSymbol,
+            'AR',
+            'gene instance should have hugo symbol'
+        );
+
+        assert.equal(
+            mutations[1].sampleId,
+            undefined,
+            'mutation should NOT have sample id'
+        );
+        assert.equal(
+            mutations[1].proteinChange,
+            'R832*',
+            'mutation should have protein change'
+        );
+        assert.equal(
+            mutations[1].mutationType,
+            undefined,
+            'mutation should NOT have mutation type'
+        );
+
+        assert.equal(
+            mutations[1].chr,
+            undefined,
+            'mutation should NOT have chromosome'
+        );
+        assert.equal(
+            mutations[1].startPosition,
+            undefined,
+            'mutation should NOT have start position'
+        );
+        assert.equal(
+            mutations[1].endPosition,
+            undefined,
+            'mutation should NOT have end position'
+        );
+        assert.equal(
+            mutations[1].referenceAllele,
+            undefined,
+            'mutation should NOT have reference allele'
+        );
+        assert.equal(
+            mutations[1].variantAllele,
+            undefined,
+            'mutation should NOT have variant allele'
+        );
     });
 
-    it("parses basic mutation input", () => {
+    it('parses basic mutation input', () => {
         const mutations = parseInput(basicMutationInput);
 
-        assert.equal(mutations.length, 39,
-            "number of parsed mutations should be equal to number of data lines");
-
-        assert.equal(mutations[0].sampleId, "TCGA-13-0760",
-            "input order of mutations should be preserved");
-        assert.equal(mutations[mutations.length - 1].sampleId, "Unknown",
-            "input order of mutations should be preserved");
-
-        assert.equal(mutations[0].gene, undefined,
-            "gene instance should NOT have hugo symbol");
-
-        assert.equal(mutations[1].sampleId, "TCGA-BS-A0UF",
-            "mutation should have sample id");
-        assert.equal(mutations[1].proteinChange, undefined,
-            "mutation should NOT have protein change");
-        assert.equal(mutations[1].mutationType, undefined,
-            "mutation should NOT have mutation type");
-
-        assert.equal(mutations[1].chr, "X",
-            "mutation should have chromosome");
-        assert.equal(mutations[1].startPosition, 66942713,
-            "mutation should have start position");
-        assert.equal(mutations[1].endPosition, 66942713,
-            "mutation should have end position");
-        assert.equal(mutations[1].referenceAllele, "C",
-            "mutation should have reference allele");
-        assert.equal(mutations[1].variantAllele, "T",
-            "mutation should have variant allele");
+        assert.equal(
+            mutations.length,
+            39,
+            'number of parsed mutations should be equal to number of data lines'
+        );
+
+        assert.equal(
+            mutations[0].sampleId,
+            'TCGA-13-0760',
+            'input order of mutations should be preserved'
+        );
+        assert.equal(
+            mutations[mutations.length - 1].sampleId,
+            'Unknown',
+            'input order of mutations should be preserved'
+        );
+
+        assert.equal(
+            mutations[0].gene,
+            undefined,
+            'gene instance should NOT have hugo symbol'
+        );
+
+        assert.equal(
+            mutations[1].sampleId,
+            'TCGA-BS-A0UF',
+            'mutation should have sample id'
+        );
+        assert.equal(
+            mutations[1].proteinChange,
+            undefined,
+            'mutation should NOT have protein change'
+        );
+        assert.equal(
+            mutations[1].mutationType,
+            undefined,
+            'mutation should NOT have mutation type'
+        );
+
+        assert.equal(mutations[1].chr, 'X', 'mutation should have chromosome');
+        assert.equal(
+            mutations[1].startPosition,
+            66942713,
+            'mutation should have start position'
+        );
+        assert.equal(
+            mutations[1].endPosition,
+            66942713,
+            'mutation should have end position'
+        );
+        assert.equal(
+            mutations[1].referenceAllele,
+            'C',
+            'mutation should have reference allele'
+        );
+        assert.equal(
+            mutations[1].variantAllele,
+            'T',
+            'mutation should have variant allele'
+        );
     });
 
-    it("parses partially annotated mutation input", () => {
+    it('parses partially annotated mutation input', () => {
         const mutations = parseInput(partiallyAnnotatedMutationInput);
 
-        assert.equal(mutations.length, 38,
-            "number of parsed mutations should be equal to number of data lines");
-
-        assert.equal(mutations[0].proteinChange, "L729I",
-            "input order of mutations should be preserved");
-        assert.equal(mutations[mutations.length - 1].sampleId, "TCGA-D1-A16I",
-            "input order of mutations should be preserved");
-
-        assert.equal(mutations[0].gene!.hugoGeneSymbol, "AR",
-            "gene instance should have hugo symbol");
-        assert.equal(mutations[1].sampleId, "TCGA-BS-A0UF",
-            "mutation should have sample id");
-        assert.equal(mutations[2].proteinChange, "L185P",
-            "mutation should have protein change");
-        assert.equal(mutations[3].mutationType, "Missense_Mutation",
-            "mutation should have mutation type");
-
-        assert.equal(mutations[4].chr, "17",
-            "mutation should have chromosome");
-        assert.equal(mutations[4].startPosition, 41242962,
-            "mutation should have start position");
-        assert.equal(mutations[4].endPosition, 41242963,
-            "mutation should have end position");
-        assert.equal(mutations[4].referenceAllele, "-",
-            "mutation should have reference allele");
-        assert.equal(mutations[4].variantAllele, "GA",
-            "mutation should have variant allele");
+        assert.equal(
+            mutations.length,
+            38,
+            'number of parsed mutations should be equal to number of data lines'
+        );
+
+        assert.equal(
+            mutations[0].proteinChange,
+            'L729I',
+            'input order of mutations should be preserved'
+        );
+        assert.equal(
+            mutations[mutations.length - 1].sampleId,
+            'TCGA-D1-A16I',
+            'input order of mutations should be preserved'
+        );
+
+        assert.equal(
+            mutations[0].gene!.hugoGeneSymbol,
+            'AR',
+            'gene instance should have hugo symbol'
+        );
+        assert.equal(
+            mutations[1].sampleId,
+            'TCGA-BS-A0UF',
+            'mutation should have sample id'
+        );
+        assert.equal(
+            mutations[2].proteinChange,
+            'L185P',
+            'mutation should have protein change'
+        );
+        assert.equal(
+            mutations[3].mutationType,
+            'Missense_Mutation',
+            'mutation should have mutation type'
+        );
+
+        assert.equal(mutations[4].chr, '17', 'mutation should have chromosome');
+        assert.equal(
+            mutations[4].startPosition,
+            41242962,
+            'mutation should have start position'
+        );
+        assert.equal(
+            mutations[4].endPosition,
+            41242963,
+            'mutation should have end position'
+        );
+        assert.equal(
+            mutations[4].referenceAllele,
+            '-',
+            'mutation should have reference allele'
+        );
+        assert.equal(
+            mutations[4].variantAllele,
+            'GA',
+            'mutation should have variant allele'
+        );
     });
 
-    it("parses mutation input with clinical data", () => {
+    it('parses mutation input with clinical data', () => {
         const mutations = parseInput(mutationInputWithClinicalData);
 
-        assert.equal(mutations.length, 8,
-            "number of parsed mutations should be equal to number of data lines");
-
-        assert.equal(mutations[0].sampleId, "TCGA-13-0760",
-            "mutation should have sample id");
-        assert.equal(mutations[0].cancerType, "CancerType1",
-            "mutation should have cancer type");
-
-        assert.equal(mutations[7].sampleId, "Unknown",
-            "mutation should have sample id");
-        assert.equal(mutations[7].cancerType, "CancerType4",
-            "mutation should have cancer type");
+        assert.equal(
+            mutations.length,
+            8,
+            'number of parsed mutations should be equal to number of data lines'
+        );
+
+        assert.equal(
+            mutations[0].sampleId,
+            'TCGA-13-0760',
+            'mutation should have sample id'
+        );
+        assert.equal(
+            mutations[0].cancerType,
+            'CancerType1',
+            'mutation should have cancer type'
+        );
+
+        assert.equal(
+            mutations[7].sampleId,
+            'Unknown',
+            'mutation should have sample id'
+        );
+        assert.equal(
+            mutations[7].cancerType,
+            'CancerType4',
+            'mutation should have cancer type'
+        );
     });
 
-    it("extracts list of hugo gene symbols from parsed input", () => {
-
-        assert.deepEqual(getGeneList(parseInput(partiallyAnnotatedMutationInput)),
-            ["AR", "BRCA1", "BRCA2", "POLE", "TP53"]);
-
-        assert.deepEqual(getGeneList(parseInput(minimalMutationInput)),
-            ["AR", "BRCA1", "BRCA2", "POLE", "TP53", "PTEN"]);
+    it('extracts list of hugo gene symbols from parsed input', () => {
+        assert.deepEqual(
+            getGeneList(parseInput(partiallyAnnotatedMutationInput)),
+            ['AR', 'BRCA1', 'BRCA2', 'POLE', 'TP53']
+        );
+
+        assert.deepEqual(getGeneList(parseInput(minimalMutationInput)), [
+            'AR',
+            'BRCA1',
+            'BRCA2',
+            'POLE',
+            'TP53',
+            'PTEN',
+        ]);
 
         assert.deepEqual(getGeneList(parseInput(basicMutationInput)), []);
     });
 
-    it("extracts clinical data from parsed input", () => {
-
-        assert.deepEqual(getClinicalData(parseInput(partiallyAnnotatedMutationInput)), [],
-            "partially annotation mutation input should NOT have any clinical data");
-        assert.deepEqual(getClinicalData(parseInput(minimalMutationInput)), [],
-            "minimal mutation input should NOT have any clinical data");
-        assert.deepEqual(getClinicalData(parseInput(basicMutationInput)), [],
-            "basic mutation input should NOT have any clinical data");
-
-        const clinicalData = getClinicalData(parseInput(mutationInputWithClinicalData));
-
-        assert.isAbove(clinicalData.length, 0,
-            "mutation input with clinical data should have clinical data");
-
-        assert.equal(clinicalData[0].clinicalAttributeId, "CANCER_TYPE");
-        assert.equal(clinicalData[0].value, "CancerType1");
-        assert.equal(clinicalData[0].sampleId, "TCGA-13-0760");
-
-        assert.equal(clinicalData[2].clinicalAttributeId, "CANCER_TYPE");
-        assert.equal(clinicalData[2].value, "CancerType2");
-        assert.equal(clinicalData[2].sampleId, "TCGA-AP-A051");
-
-        assert.equal(clinicalData[4].clinicalAttributeId, "CANCER_TYPE");
-        assert.equal(clinicalData[4].value, "CancerType3");
-        assert.equal(clinicalData[4].sampleId, "TCGA-BS-A0UF");
-
-        assert.equal(clinicalData[7].clinicalAttributeId, "CANCER_TYPE");
-        assert.equal(clinicalData[7].value, "CancerType4");
-        assert.equal(clinicalData[7].sampleId, "Unknown");
+    it('extracts clinical data from parsed input', () => {
+        assert.deepEqual(
+            getClinicalData(parseInput(partiallyAnnotatedMutationInput)),
+            [],
+            'partially annotation mutation input should NOT have any clinical data'
+        );
+        assert.deepEqual(
+            getClinicalData(parseInput(minimalMutationInput)),
+            [],
+            'minimal mutation input should NOT have any clinical data'
+        );
+        assert.deepEqual(
+            getClinicalData(parseInput(basicMutationInput)),
+            [],
+            'basic mutation input should NOT have any clinical data'
+        );
+
+        const clinicalData = getClinicalData(
+            parseInput(mutationInputWithClinicalData)
+        );
+
+        assert.isAbove(
+            clinicalData.length,
+            0,
+            'mutation input with clinical data should have clinical data'
+        );
+
+        assert.equal(clinicalData[0].clinicalAttributeId, 'CANCER_TYPE');
+        assert.equal(clinicalData[0].value, 'CancerType1');
+        assert.equal(clinicalData[0].sampleId, 'TCGA-13-0760');
+
+        assert.equal(clinicalData[2].clinicalAttributeId, 'CANCER_TYPE');
+        assert.equal(clinicalData[2].value, 'CancerType2');
+        assert.equal(clinicalData[2].sampleId, 'TCGA-AP-A051');
+
+        assert.equal(clinicalData[4].clinicalAttributeId, 'CANCER_TYPE');
+        assert.equal(clinicalData[4].value, 'CancerType3');
+        assert.equal(clinicalData[4].sampleId, 'TCGA-BS-A0UF');
+
+        assert.equal(clinicalData[7].clinicalAttributeId, 'CANCER_TYPE');
+        assert.equal(clinicalData[7].value, 'CancerType4');
+        assert.equal(clinicalData[7].sampleId, 'Unknown');
     });
 });
diff --git a/src/shared/lib/MutationInputParser.ts b/src/shared/lib/MutationInputParser.ts
index 364c1407fb7..690b0164596 100644
--- a/src/shared/lib/MutationInputParser.ts
+++ b/src/shared/lib/MutationInputParser.ts
@@ -1,59 +1,63 @@
-import * as _ from "lodash";
-import {ClinicalData, Gene, Mutation} from "shared/api/generated/CBioPortalAPI";
-
-const LITERAL_TO_HEADER: {[attrName: string]: string} = {
-    aminoAcidChange: "amino_acid_change",
-    center: "center",
-    driverFilter: "driver_filter",
-    driverFilterAnnotation: "driver_filter_annotation",
-    driverTiersFilter: "driver_tiers_filter",
-    driverTiersFilterAnnotation: "driver_tiers_filter_annotation",
-    entrezGeneId: "entrez_gene_id",
-    chr: "chromosome",
-    hugoGeneSymbol: "hugo_symbol",
-    molecularProfileId: "molecular_profile_id",
-    mutationStatus: "mutation_status",
-    mutationType: "mutation_type",
-    ncbiBuild: "ncbi_build",
-    patientId: "patient_id",
-    proteinChange: "protein_change",
-    referenceAllele: "reference_allele",
-    refseqMrnaId: "refseq_mrna_id",
-    sampleId: "sample_id",
-    studyId: "study_id",
-    uniquePatientKey: "unique_patient_key",
-    uniqueSampleKey: "unique_sample_key",
-    validationStatus: "validation_status",
-    variantAllele: "variant_allele",
-    variantType: "variant_type",
-    cancerType: "cancer_type"
+import * as _ from 'lodash';
+import {
+    ClinicalData,
+    Gene,
+    Mutation,
+} from 'shared/api/generated/CBioPortalAPI';
+
+const LITERAL_TO_HEADER: { [attrName: string]: string } = {
+    aminoAcidChange: 'amino_acid_change',
+    center: 'center',
+    driverFilter: 'driver_filter',
+    driverFilterAnnotation: 'driver_filter_annotation',
+    driverTiersFilter: 'driver_tiers_filter',
+    driverTiersFilterAnnotation: 'driver_tiers_filter_annotation',
+    entrezGeneId: 'entrez_gene_id',
+    chr: 'chromosome',
+    hugoGeneSymbol: 'hugo_symbol',
+    molecularProfileId: 'molecular_profile_id',
+    mutationStatus: 'mutation_status',
+    mutationType: 'mutation_type',
+    ncbiBuild: 'ncbi_build',
+    patientId: 'patient_id',
+    proteinChange: 'protein_change',
+    referenceAllele: 'reference_allele',
+    refseqMrnaId: 'refseq_mrna_id',
+    sampleId: 'sample_id',
+    studyId: 'study_id',
+    uniquePatientKey: 'unique_patient_key',
+    uniqueSampleKey: 'unique_sample_key',
+    validationStatus: 'validation_status',
+    variantAllele: 'variant_allele',
+    variantType: 'variant_type',
+    cancerType: 'cancer_type',
 };
 
-const NUMERICAL_TO_HEADER: {[attrName: string]: string} = {
-    startPosition: "start_position",
-    endPosition: "end_position",
-    proteinPosEnd: "protein_position_end",
-    proteinPosStart: "protein_position_start",
-    tumorAltCount: "tumor_alt_count",
-    tumorRefCount: "tumor_ref_count",
-    normalAltCount: "normal_alt_count",
-    normalRefCount: "normal_ref_count",
+const NUMERICAL_TO_HEADER: { [attrName: string]: string } = {
+    startPosition: 'start_position',
+    endPosition: 'end_position',
+    proteinPosEnd: 'protein_position_end',
+    proteinPosStart: 'protein_position_start',
+    tumorAltCount: 'tumor_alt_count',
+    tumorRefCount: 'tumor_ref_count',
+    normalAltCount: 'normal_alt_count',
+    normalRefCount: 'normal_ref_count',
 };
 
 // TODO add column name aliases?
 // map of <mutation input model field name, input header name> pairs
-export const MODEL_TO_HEADER: {[attrName: string]: string} = {
-    ...LITERAL_TO_HEADER, ...NUMERICAL_TO_HEADER
+export const MODEL_TO_HEADER: { [attrName: string]: string } = {
+    ...LITERAL_TO_HEADER,
+    ...NUMERICAL_TO_HEADER,
 };
 
 // map of <mutation input model field name, clinical attr id> pairs
-export const CLINICAL_ATTR_ID_MAP: {[attrName: string]: string} = {
-    cancerType: "CANCER_TYPE"
+export const CLINICAL_ATTR_ID_MAP: { [attrName: string]: string } = {
+    cancerType: 'CANCER_TYPE',
 };
 
-type ClinicalInput =
-{
-    cancerType: string
+type ClinicalInput = {
+    cancerType: string;
 };
 
 export type MutationInput = Mutation & ClinicalInput;
@@ -65,10 +69,12 @@ export type MutationInput = Mutation & ClinicalInput;
  * @param header    header line (first line) of the input
  * @returns {object} map of <header name, index> pairs
  */
-export function buildIndexMap(header: string, separator: string): {[columnName:string]: number}
-{
+export function buildIndexMap(
+    header: string,
+    separator: string
+): { [columnName: string]: number } {
     const columns = header.split(separator);
-    const map:{[columnName:string]: number}  = {};
+    const map: { [columnName: string]: number } = {};
 
     columns.forEach((columnName: string, index: number) => {
         map[columnName.trim().toLowerCase()] = index;
@@ -86,11 +92,12 @@ export function buildIndexMap(header: string, separator: string): {[columnName:s
  *
  * @returns             a partial Mutation instance
  */
-export function parseLine(line: string,
-                          indexMap: {[columnName:string]: number},
-                          separator: string,
-                          headerMap: {[attrName:string]: string} = MODEL_TO_HEADER): Partial<MutationInput>
-{
+export function parseLine(
+    line: string,
+    indexMap: { [columnName: string]: number },
+    separator: string,
+    headerMap: { [attrName: string]: string } = MODEL_TO_HEADER
+): Partial<MutationInput> {
     const mutation: Partial<MutationInput> = {};
 
     const values = line.split(separator);
@@ -100,11 +107,10 @@ export function parseLine(line: string,
         const value = parseValue(key, values, indexMap);
 
         if (value) {
-            if (key === "hugoGeneSymbol") {
+            if (key === 'hugoGeneSymbol') {
                 mutation.gene = (mutation.gene || {}) as Gene;
                 mutation.gene[key] = value;
-            }
-            else {
+            } else {
                 mutation[key as keyof MutationInput] = value;
             }
         }
@@ -123,15 +129,16 @@ export function parseLine(line: string,
  *
  * @returns         data value for the given field name.
  */
-export function parseValue(field: string,
-                           values: string[],
-                           indexMap: {[columnName:string]: number},
-                           headerMap: {[attrName:string]: string} = MODEL_TO_HEADER): string|undefined
-{
+export function parseValue(
+    field: string,
+    values: string[],
+    indexMap: { [columnName: string]: number },
+    headerMap: { [attrName: string]: string } = MODEL_TO_HEADER
+): string | undefined {
     // get the column name for the given field name
     const column = headerMap[field];
     const index = indexMap[column];
-    let value: string|undefined;
+    let value: string | undefined;
 
     if (index >= 0 && values[index]) {
         value = values[index].trim();
@@ -146,17 +153,15 @@ export function parseValue(field: string,
  * @param input     tab delimited input string with a header line.
  * @returns         an array of partial Mutation instances.
  */
-export function parseInput(input: string): Partial<MutationInput>[]
-{
+export function parseInput(input: string): Partial<MutationInput>[] {
     const mutationData: Partial<MutationInput>[] = [];
 
     // use tab as column separator unless there are no tabs, then use space
-    const separator = (input.indexOf("\t") > 0)? "\t" : " ";
+    const separator = input.indexOf('\t') > 0 ? '\t' : ' ';
 
-    const lines = input.split("\n");
+    const lines = input.split('\n');
 
-    if (lines.length > 0)
-    {
+    if (lines.length > 0) {
         // assuming first line is a header
         // TODO allow comments?
         const indexMap = buildIndexMap(lines[0], separator);
@@ -173,8 +178,7 @@ export function parseInput(input: string): Partial<MutationInput>[]
     return generateMissingIds(mutationData);
 }
 
-export function generateMissingIds(mutations: Partial<MutationInput>[])
-{
+export function generateMissingIds(mutations: Partial<MutationInput>[]) {
     // generate unique sample keys
     // this is needed to construct tumor type map (which is used by OncoKB)
     generateUniqueSampleKeys(mutations);
@@ -186,28 +190,27 @@ export function generateMissingIds(mutations: Partial<MutationInput>[])
     return mutations;
 }
 
-export function generatePatientIds(mutations: Partial<Mutation>[])
-{
+export function generatePatientIds(mutations: Partial<Mutation>[]) {
     let idCounter = 0;
 
     mutations.forEach(mutation => {
         // if provided use patient id, else auto-generate
-        mutation.patientId = mutation.patientId || mutation.sampleId || `patient_${idCounter++}`;
+        mutation.patientId =
+            mutation.patientId || mutation.sampleId || `patient_${idCounter++}`;
     });
 }
 
-export function generateUniqueSampleKeys(mutations: Partial<Mutation>[])
-{
+export function generateUniqueSampleKeys(mutations: Partial<Mutation>[]) {
     let idCounter = 0;
 
     mutations.forEach(mutation => {
         // if provided use unique sample key, else auto-generate
-        mutation.uniqueSampleKey = mutation.uniqueSampleKey || `uniqueSampleKey_${idCounter++}`;
+        mutation.uniqueSampleKey =
+            mutation.uniqueSampleKey || `uniqueSampleKey_${idCounter++}`;
     });
 }
 
-export function getGeneList(data?: Partial<Mutation>[]): string[]
-{
+export function getGeneList(data?: Partial<Mutation>[]): string[] {
     if (data === undefined) {
         return [];
     }
@@ -215,8 +218,7 @@ export function getGeneList(data?: Partial<Mutation>[]): string[]
     const geneList = data.map(mutation => {
         if (mutation.gene && mutation.gene.hugoGeneSymbol) {
             return mutation.gene.hugoGeneSymbol;
-        }
-        else {
+        } else {
             return undefined;
         }
     });
@@ -225,37 +227,40 @@ export function getGeneList(data?: Partial<Mutation>[]): string[]
     return _.uniq(_.compact(geneList));
 }
 
-
-export function getClinicalData(mutationInputData?: Partial<MutationInput>[],
-                                clinicalAttrIdMap: {[attrName: string]: string} = CLINICAL_ATTR_ID_MAP): ClinicalData[]
-{
+export function getClinicalData(
+    mutationInputData?: Partial<MutationInput>[],
+    clinicalAttrIdMap: { [attrName: string]: string } = CLINICAL_ATTR_ID_MAP
+): ClinicalData[] {
     const clinicalData: Partial<ClinicalData>[] = [];
 
     if (mutationInputData) {
         mutationInputData.forEach(mutationInput => {
-            Object.keys(clinicalAttrIdMap).forEach((key: keyof ClinicalInput) => {
-                const value = mutationInput[key];
-
-                if (value) {
-                    clinicalData.push({
-                        uniqueSampleKey: mutationInput.uniqueSampleKey,
-                        uniquePatientKey: mutationInput.uniquePatientKey,
-                        sampleId: mutationInput.sampleId,
-                        patientId: mutationInput.patientId,
-                        clinicalAttributeId: clinicalAttrIdMap[key],
-                        value
-                    });
+            Object.keys(clinicalAttrIdMap).forEach(
+                (key: keyof ClinicalInput) => {
+                    const value = mutationInput[key];
+
+                    if (value) {
+                        clinicalData.push({
+                            uniqueSampleKey: mutationInput.uniqueSampleKey,
+                            uniquePatientKey: mutationInput.uniquePatientKey,
+                            sampleId: mutationInput.sampleId,
+                            patientId: mutationInput.patientId,
+                            clinicalAttributeId: clinicalAttrIdMap[key],
+                            value,
+                        });
+                    }
                 }
-            });
+            );
         });
     }
 
     return clinicalData as ClinicalData[];
 }
 
-export function mutationInputToMutation(mutationInputData?: Partial<MutationInput>[],
-                                        clinicalAttrIdMap: {[attrName: string]: string} = CLINICAL_ATTR_ID_MAP): Partial<Mutation>[]|undefined
-{
+export function mutationInputToMutation(
+    mutationInputData?: Partial<MutationInput>[],
+    clinicalAttrIdMap: { [attrName: string]: string } = CLINICAL_ATTR_ID_MAP
+): Partial<Mutation>[] | undefined {
     if (!mutationInputData) {
         return undefined;
     }
@@ -270,7 +275,10 @@ export function mutationInputToMutation(mutationInputData?: Partial<MutationInpu
         Object.keys(mutationInput).forEach((key: keyof MutationInput) => {
             // do NOT include ClinicalInput fields
             if (!clinicalAttrIdMap[key]) {
-                mutation[key as keyof Mutation] = parseField(mutationInput, key);
+                mutation[key as keyof Mutation] = parseField(
+                    mutationInput,
+                    key
+                );
             }
         });
 
@@ -280,8 +288,10 @@ export function mutationInputToMutation(mutationInputData?: Partial<MutationInpu
     return mutations;
 }
 
-function parseField(mutationInput: Partial<MutationInput>, key: keyof MutationInput)
-{
+function parseField(
+    mutationInput: Partial<MutationInput>,
+    key: keyof MutationInput
+) {
     let value = mutationInput[key];
 
     if (value && NUMERICAL_TO_HEADER[key]) {
diff --git a/src/shared/lib/MutationTableDownloadDataFetcher.ts b/src/shared/lib/MutationTableDownloadDataFetcher.ts
index 9bcaf09ee00..cb8d3826e96 100644
--- a/src/shared/lib/MutationTableDownloadDataFetcher.ts
+++ b/src/shared/lib/MutationTableDownloadDataFetcher.ts
@@ -1,28 +1,43 @@
-import MobxPromise from "mobxpromise";
-import {ILazyMobXTableApplicationLazyDownloadDataFetcher} from "shared/lib/ILazyMobXTableApplicationLazyDownloadDataFetcher";
-import LazyMobXCache from "shared/lib/LazyMobXCache";
-import {default as MutationCountCache, fetch as fetchMutationCountData} from "shared/cache/MutationCountCache";
-import {default as GenomeNexusCache, fetch as fetchGenomeNexusData } from "shared/cache/GenomeNexusCache";
-import {default as DiscreteCNACache, fetch as fetchDiscreteCNAData} from "shared/cache/DiscreteCNACache";
-import {Mutation, MolecularProfile} from "shared/api/generated/CBioPortalAPI";
+import MobxPromise from 'mobxpromise';
+import { ILazyMobXTableApplicationLazyDownloadDataFetcher } from 'shared/lib/ILazyMobXTableApplicationLazyDownloadDataFetcher';
+import LazyMobXCache from 'shared/lib/LazyMobXCache';
+import {
+    default as MutationCountCache,
+    fetch as fetchMutationCountData,
+} from 'shared/cache/MutationCountCache';
+import {
+    default as GenomeNexusCache,
+    fetch as fetchGenomeNexusData,
+} from 'shared/cache/GenomeNexusCache';
+import {
+    default as DiscreteCNACache,
+    fetch as fetchDiscreteCNAData,
+} from 'shared/cache/DiscreteCNACache';
+import { Mutation, MolecularProfile } from 'shared/api/generated/CBioPortalAPI';
 import _ from 'lodash';
-import {default as GenomeNexusMyVariantInfoCache, fetch as fetchGenomeNexusMyVariantInfoData } from "shared/cache/GenomeNexusMyVariantInfoCache";
-
-export class MutationTableDownloadDataFetcher implements ILazyMobXTableApplicationLazyDownloadDataFetcher
-{
-    private allData:any[]|undefined = undefined;
-
-    constructor(private mutationData: MobxPromise<Mutation[]>,
-                private studyToMolecularProfileDiscrete?: {[studyId:string]:MolecularProfile},
-                private genomeNexusCache?: () => GenomeNexusCache,
-                private genomeNexusMyVariantInfoCache?: () => GenomeNexusMyVariantInfoCache,
-                private mutationCountCache?: () => MutationCountCache,
-                private discreteCNACache?: () => DiscreteCNACache) {
+import {
+    default as GenomeNexusMyVariantInfoCache,
+    fetch as fetchGenomeNexusMyVariantInfoData,
+} from 'shared/cache/GenomeNexusMyVariantInfoCache';
+
+export class MutationTableDownloadDataFetcher
+    implements ILazyMobXTableApplicationLazyDownloadDataFetcher {
+    private allData: any[] | undefined = undefined;
+
+    constructor(
+        private mutationData: MobxPromise<Mutation[]>,
+        private studyToMolecularProfileDiscrete?: {
+            [studyId: string]: MolecularProfile;
+        },
+        private genomeNexusCache?: () => GenomeNexusCache,
+        private genomeNexusMyVariantInfoCache?: () => GenomeNexusMyVariantInfoCache,
+        private mutationCountCache?: () => MutationCountCache,
+        private discreteCNACache?: () => DiscreteCNACache
+    ) {
         // TODO labelMobxPromises(this); ?
     }
 
-    public fetchAndCacheAllLazyData(): Promise<any[]>
-    {
+    public fetchAndCacheAllLazyData(): Promise<any[]> {
         if (this.allData) {
             return Promise.resolve(this.allData);
         }
@@ -30,104 +45,107 @@ export class MutationTableDownloadDataFetcher implements ILazyMobXTableApplicati
         return new Promise<any[]>((resolve, reject) => {
             const promiseCachePairs = this.availablePromiseCachePairs();
 
-            Promise.all(promiseCachePairs.promises).then((allData: any[]) => {
-                this.allData = allData;
+            Promise.all(promiseCachePairs.promises)
+                .then((allData: any[]) => {
+                    this.allData = allData;
 
-                // add data to cache for future use
-                for (let i = 0; i < allData.length; i++) {
-                    promiseCachePairs.caches[i].addData(allData[i]);
-                }
+                    // add data to cache for future use
+                    for (let i = 0; i < allData.length; i++) {
+                        promiseCachePairs.caches[i].addData(allData[i]);
+                    }
 
-                resolve(allData);
-            }).catch(reject);
+                    resolve(allData);
+                })
+                .catch(reject);
         });
     }
 
-    private availablePromiseCachePairs(): {promises: Promise<any>[], caches: LazyMobXCache<any, any>[]}
-    {
-        const promises:Promise<any>[] = [];
-        const caches:LazyMobXCache<any, any>[] = [];
+    private availablePromiseCachePairs(): {
+        promises: Promise<any>[];
+        caches: LazyMobXCache<any, any>[];
+    } {
+        const promises: Promise<any>[] = [];
+        const caches: LazyMobXCache<any, any>[] = [];
 
-        if (this.genomeNexusCache)
-        {
+        if (this.genomeNexusCache) {
             promises.push(this.fetchAllGenomeNexusData());
             caches.push(this.genomeNexusCache());
         }
 
-        if (this.genomeNexusMyVariantInfoCache)
-        {
+        if (this.genomeNexusMyVariantInfoCache) {
             promises.push(this.fetchAllGenomeNexusMyVariantInfoData());
             caches.push(this.genomeNexusMyVariantInfoCache());
         }
 
-        if (this.mutationCountCache)
-        {
+        if (this.mutationCountCache) {
             promises.push(this.fetchAllMutationCountData());
             caches.push(this.mutationCountCache());
         }
 
-        if (this.discreteCNACache)
-        {
+        if (this.discreteCNACache) {
             promises.push(this.fetchAllDiscreteCNAData());
-            caches.push(this.discreteCNACache());           
+            caches.push(this.discreteCNACache());
         }
 
-        return {promises, caches};
+        return { promises, caches };
     }
 
-    private async fetchAllGenomeNexusData()
-    {
-        if (this.mutationData.result)
-        {
+    private async fetchAllGenomeNexusData() {
+        if (this.mutationData.result) {
             return await fetchGenomeNexusData(this.mutationData.result);
-        }
-        else {
+        } else {
             return undefined;
         }
     }
 
-    private async fetchAllGenomeNexusMyVariantInfoData()
-    {
-        if (this.mutationData.result)
-        {
-            return await fetchGenomeNexusMyVariantInfoData(this.mutationData.result);
-        }
-        else {
+    private async fetchAllGenomeNexusMyVariantInfoData() {
+        if (this.mutationData.result) {
+            return await fetchGenomeNexusMyVariantInfoData(
+                this.mutationData.result
+            );
+        } else {
             return undefined;
         }
     }
 
-    private async fetchAllMutationCountData()
-    {
-        if (this.mutationData.result)
-        {
-            const queries = this.mutationData.result.map(
-                mutation => ({sampleId: mutation.sampleId, studyId: mutation.studyId}));
+    private async fetchAllMutationCountData() {
+        if (this.mutationData.result) {
+            const queries = this.mutationData.result.map(mutation => ({
+                sampleId: mutation.sampleId,
+                studyId: mutation.studyId,
+            }));
 
             return await fetchMutationCountData(queries);
-        }
-        else {
+        } else {
             return undefined;
         }
     }
 
-    private async fetchAllDiscreteCNAData()
-    {
-        if (this.mutationData.result)
-        {
-            const queries = this.mutationData.result.map(
-                mutation => ({sampleId: mutation.sampleId, studyId: mutation.studyId, entrezGeneId: mutation.entrezGeneId}));
-            const cnaData = await fetchDiscreteCNAData(queries, this.studyToMolecularProfileDiscrete!);
-            const modifiedCNAData = _.flatten(_.map(cnaData, (rawData) => {
-                const mappedArray = _.map(_.flatten(rawData.data), (props) => {
-                    return {...props, studyId: rawData.meta}
-                })
-                return mappedArray;
+    private async fetchAllDiscreteCNAData() {
+        if (this.mutationData.result) {
+            const queries = this.mutationData.result.map(mutation => ({
+                sampleId: mutation.sampleId,
+                studyId: mutation.studyId,
+                entrezGeneId: mutation.entrezGeneId,
             }));
+            const cnaData = await fetchDiscreteCNAData(
+                queries,
+                this.studyToMolecularProfileDiscrete!
+            );
+            const modifiedCNAData = _.flatten(
+                _.map(cnaData, rawData => {
+                    const mappedArray = _.map(
+                        _.flatten(rawData.data),
+                        props => {
+                            return { ...props, studyId: rawData.meta };
+                        }
+                    );
+                    return mappedArray;
+                })
+            );
             return modifiedCNAData;
-        }
-        else {
+        } else {
             return undefined;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/lib/MutationUtils.spec.ts b/src/shared/lib/MutationUtils.spec.ts
index 4a4d199d737..635f8dd44a9 100644
--- a/src/shared/lib/MutationUtils.spec.ts
+++ b/src/shared/lib/MutationUtils.spec.ts
@@ -1,283 +1,346 @@
 import {
-    somaticMutationRate, germlineMutationRate, countUniqueMutations, groupMutationsByGeneAndPatientAndProteinChange,
-    countDuplicateMutations, uniqueGenomicLocations, updateMissingGeneInfo, isValidGenomicLocation, genomicLocationString, generateHgvsgByMutation
-} from "./MutationUtils";
+    somaticMutationRate,
+    germlineMutationRate,
+    countUniqueMutations,
+    groupMutationsByGeneAndPatientAndProteinChange,
+    countDuplicateMutations,
+    uniqueGenomicLocations,
+    updateMissingGeneInfo,
+    isValidGenomicLocation,
+    genomicLocationString,
+    generateHgvsgByMutation,
+} from './MutationUtils';
 import { assert } from 'chai';
-import {Gene, MolecularProfile, Mutation} from "../api/generated/CBioPortalAPI";
-import {initMutation} from "test/MutationMockUtils";
-import { MUTATION_STATUS_GERMLINE } from "shared/constants";
-import { GenomicLocation } from "cbioportal-frontend-commons";
+import {
+    Gene,
+    MolecularProfile,
+    Mutation,
+} from '../api/generated/CBioPortalAPI';
+import { initMutation } from 'test/MutationMockUtils';
+import { MUTATION_STATUS_GERMLINE } from 'shared/constants';
+import { GenomicLocation } from 'cbioportal-frontend-commons';
 
 describe('MutationUtils', () => {
     let somaticMutations: Mutation[];
     let germlineMutations: Mutation[];
-    let molecularProfileIdToMolecularProfile:{[molecularProfileId:string]:MolecularProfile};
+    let molecularProfileIdToMolecularProfile: {
+        [molecularProfileId: string]: MolecularProfile;
+    };
     let mutationsToCount: Mutation[];
 
-    before(()=>{
+    before(() => {
         molecularProfileIdToMolecularProfile = {
-            'GP1':{
-                studyId: 'STUDY1'
-            } as MolecularProfile
+            GP1: {
+                studyId: 'STUDY1',
+            } as MolecularProfile,
         };
         somaticMutations = [
-            initMutation({ // mutation
-                sampleId: "PATIENT1",
+            initMutation({
+                // mutation
+                sampleId: 'PATIENT1',
                 gene: {
-                    hugoGeneSymbol: "TP53",
+                    hugoGeneSymbol: 'TP53',
                 },
-                molecularProfileId:"GP1"
-             }),
-            initMutation({ // mutation in same gene, same patient
-                sampleId: "PATIENT1",
+                molecularProfileId: 'GP1',
+            }),
+            initMutation({
+                // mutation in same gene, same patient
+                sampleId: 'PATIENT1',
                 gene: {
-                    hugoGeneSymbol: "TP53",
+                    hugoGeneSymbol: 'TP53',
                 },
-                molecularProfileId:"GP1"
-             }),
-            initMutation({ // mutation in same patient different gene
-                sampleId: "PATIENT2",
+                molecularProfileId: 'GP1',
+            }),
+            initMutation({
+                // mutation in same patient different gene
+                sampleId: 'PATIENT2',
                 gene: {
-                    hugoGeneSymbol: "PIK3CA",
+                    hugoGeneSymbol: 'PIK3CA',
                 },
-                molecularProfileId:"GP1"
-             })
+                molecularProfileId: 'GP1',
+            }),
         ];
         germlineMutations = [
-            initMutation({ // mutation
-                sampleId: "PATIENT1",
+            initMutation({
+                // mutation
+                sampleId: 'PATIENT1',
                 gene: {
-                    hugoGeneSymbol: "TP53",
+                    hugoGeneSymbol: 'TP53',
                 },
                 mutationStatus: MUTATION_STATUS_GERMLINE,
-                molecularProfileId:"GP1"
-             }),
-            initMutation({ // mutation in same gene, same patient
-                sampleId: "PATIENT1",
+                molecularProfileId: 'GP1',
+            }),
+            initMutation({
+                // mutation in same gene, same patient
+                sampleId: 'PATIENT1',
                 gene: {
-                    hugoGeneSymbol: "BRCA1",
+                    hugoGeneSymbol: 'BRCA1',
                 },
                 mutationStatus: MUTATION_STATUS_GERMLINE,
-                molecularProfileId:"GP1"
-             }),
-            initMutation({ // mutation in same patient different gene
-                sampleId: "PATIENT2",
+                molecularProfileId: 'GP1',
+            }),
+            initMutation({
+                // mutation in same patient different gene
+                sampleId: 'PATIENT2',
                 gene: {
-                    hugoGeneSymbol: "BRCA2",
+                    hugoGeneSymbol: 'BRCA2',
                 },
                 mutationStatus: MUTATION_STATUS_GERMLINE,
-                molecularProfileId:"GP1"
-             })
+                molecularProfileId: 'GP1',
+            }),
         ];
         mutationsToCount = [
-            initMutation({ // mutation
-                sampleId: "P1_sample1",
-                patientId: "P1",
+            initMutation({
+                // mutation
+                sampleId: 'P1_sample1',
+                patientId: 'P1',
                 gene: {
-                    hugoGeneSymbol: "TP53",
+                    hugoGeneSymbol: 'TP53',
                 },
                 proteinPosStart: 66,
-                proteinChange: "D66B"
-
+                proteinChange: 'D66B',
             }),
-            initMutation({ // mutation
-                sampleId: "P1_sample2",
-                patientId: "P1",
+            initMutation({
+                // mutation
+                sampleId: 'P1_sample2',
+                patientId: 'P1',
                 gene: {
-                    hugoGeneSymbol: "TP53",
+                    hugoGeneSymbol: 'TP53',
                 },
                 proteinPosStart: 66,
-                proteinChange: "D66B"
+                proteinChange: 'D66B',
             }),
-            initMutation({ // mutation
-                sampleId: "P2_sample1",
-                patientId: "P2",
+            initMutation({
+                // mutation
+                sampleId: 'P2_sample1',
+                patientId: 'P2',
                 gene: {
-                    hugoGeneSymbol: "TP53",
+                    hugoGeneSymbol: 'TP53',
                 },
                 proteinPosStart: 66,
-                proteinChange: "D66B"
+                proteinChange: 'D66B',
             }),
-            initMutation({ // mutation
-                sampleId: "P2_sample2",
-                patientId: "P2",
+            initMutation({
+                // mutation
+                sampleId: 'P2_sample2',
+                patientId: 'P2',
                 gene: {
-                    hugoGeneSymbol: "TP53",
+                    hugoGeneSymbol: 'TP53',
                 },
                 proteinPosStart: 66,
-                proteinChange: "D66B"
+                proteinChange: 'D66B',
             }),
-            initMutation({ // mutation
-                sampleId: "P3_sample1",
-                patientId: "P3",
+            initMutation({
+                // mutation
+                sampleId: 'P3_sample1',
+                patientId: 'P3',
                 gene: {
-                    hugoGeneSymbol: "TP53",
+                    hugoGeneSymbol: 'TP53',
                 },
                 proteinPosStart: 66,
-                proteinChange: "D66B"
+                proteinChange: 'D66B',
             }),
-            initMutation({ // mutation
-                sampleId: "P4_sample1",
-                patientId: "P4",
+            initMutation({
+                // mutation
+                sampleId: 'P4_sample1',
+                patientId: 'P4',
                 gene: {
-                    hugoGeneSymbol: "TP53",
+                    hugoGeneSymbol: 'TP53',
                 },
                 proteinPosStart: 666,
-                proteinChange: "D666C"
+                proteinChange: 'D666C',
             }),
-            initMutation({ // mutation
-                sampleId: "P4_sample2",
-                patientId: "P4",
+            initMutation({
+                // mutation
+                sampleId: 'P4_sample2',
+                patientId: 'P4',
                 gene: {
-                    hugoGeneSymbol: "TP53",
+                    hugoGeneSymbol: 'TP53',
                 },
                 proteinPosStart: 666,
-                proteinChange: "D666F"
+                proteinChange: 'D666F',
             }),
         ];
     });
 
     describe('groupMutationsByGeneAndPatientAndProteinChange', () => {
-        it("groups mutations correctly by gene, patient, and protein change", () => {
-            const grouped = groupMutationsByGeneAndPatientAndProteinChange(mutationsToCount);
-
-            assert.equal(grouped["TP53_P1_D66B"].length, 2,
-                "There should be 2 mutations for TP53_P1_D66B");
-            assert.equal(grouped["TP53_P2_D66B"].length, 2,
-                "There should be 2 mutations for TP53_P2_D66B");
-            assert.equal(grouped["TP53_P3_D66B"].length, 1,
-                "There should be 1 mutation for TP53_P3_D66B");
-            assert.equal(grouped["TP53_P4_D666C"].length, 1,
-                "There should be 1 mutation for TP53_P4_D666C");
-            assert.equal(grouped["TP53_P4_D666F"].length, 1,
-                "There should be 1 mutation for TP53_P4_D666F");
+        it('groups mutations correctly by gene, patient, and protein change', () => {
+            const grouped = groupMutationsByGeneAndPatientAndProteinChange(
+                mutationsToCount
+            );
+
+            assert.equal(
+                grouped['TP53_P1_D66B'].length,
+                2,
+                'There should be 2 mutations for TP53_P1_D66B'
+            );
+            assert.equal(
+                grouped['TP53_P2_D66B'].length,
+                2,
+                'There should be 2 mutations for TP53_P2_D66B'
+            );
+            assert.equal(
+                grouped['TP53_P3_D66B'].length,
+                1,
+                'There should be 1 mutation for TP53_P3_D66B'
+            );
+            assert.equal(
+                grouped['TP53_P4_D666C'].length,
+                1,
+                'There should be 1 mutation for TP53_P4_D666C'
+            );
+            assert.equal(
+                grouped['TP53_P4_D666F'].length,
+                1,
+                'There should be 1 mutation for TP53_P4_D666F'
+            );
         });
     });
 
     describe('countUniqueMutations', () => {
-        it("counts unique mutations as zero when there are no mutations", () => {
-            assert.equal(countUniqueMutations([]), 0,
-                "total number of unique mutations should be 0");
+        it('counts unique mutations as zero when there are no mutations', () => {
+            assert.equal(
+                countUniqueMutations([]),
+                0,
+                'total number of unique mutations should be 0'
+            );
         });
 
-        it("counts unique mutations correctly", () => {
+        it('counts unique mutations correctly', () => {
             const count = countUniqueMutations(mutationsToCount);
 
-            assert.equal(count, 5,
-                "total number of unique mutations should be 5");
+            assert.equal(
+                count,
+                5,
+                'total number of unique mutations should be 5'
+            );
         });
     });
 
     describe('countDuplicateMutations', () => {
-        it("counts duplicate mutations as zero when there are no mutations", () => {
-            assert.equal(countDuplicateMutations({}), 0,
-                "total number of duplicate mutations should be 0");
+        it('counts duplicate mutations as zero when there are no mutations', () => {
+            assert.equal(
+                countDuplicateMutations({}),
+                0,
+                'total number of duplicate mutations should be 0'
+            );
         });
 
-        it("counts duplicates correctly for mutations grouped by patients", () => {
-            const grouped = groupMutationsByGeneAndPatientAndProteinChange(mutationsToCount);
+        it('counts duplicates correctly for mutations grouped by patients', () => {
+            const grouped = groupMutationsByGeneAndPatientAndProteinChange(
+                mutationsToCount
+            );
             const count = countDuplicateMutations(grouped);
 
-            assert.equal(count, 2,
-                "total number of duplicate mutations should be 2");
+            assert.equal(
+                count,
+                2,
+                'total number of duplicate mutations should be 2'
+            );
         });
     });
 
     describe('somaticMutationRate', () => {
-        it("calculates rate correctly", () => {
+        it('calculates rate correctly', () => {
             // only one of the patients has a TP53 mutation
-            let result:number =
-                somaticMutationRate(
-                    "TP53",
-                    somaticMutations,
-                    molecularProfileIdToMolecularProfile,
-                    [{studyId:'STUDY1', sampleId:'PATIENT1'}, {studyId:'STUDY1', sampleId:'PATIENT2'}]
-                );
+            let result: number = somaticMutationRate(
+                'TP53',
+                somaticMutations,
+                molecularProfileIdToMolecularProfile,
+                [
+                    { studyId: 'STUDY1', sampleId: 'PATIENT1' },
+                    { studyId: 'STUDY1', sampleId: 'PATIENT2' },
+                ]
+            );
             assert.equal(result, 50);
 
             // No non-existing gene mutations
-            result =
-                somaticMutationRate(
-                    "NASDASFASG",
-                    somaticMutations,
-                    molecularProfileIdToMolecularProfile,
-                    [{studyId:'STUDY1', sampleId:'PATIENT1'}, {studyId:'STUDY1', sampleId:'PATIENT2'}]
-                );
+            result = somaticMutationRate(
+                'NASDASFASG',
+                somaticMutations,
+                molecularProfileIdToMolecularProfile,
+                [
+                    { studyId: 'STUDY1', sampleId: 'PATIENT1' },
+                    { studyId: 'STUDY1', sampleId: 'PATIENT2' },
+                ]
+            );
             assert.equal(result, 0);
 
             // when nr of given patientIds is 1 it should give 100% (not sure if
             // this should be an error instead)
-            result =
-                somaticMutationRate(
-                    "PIK3CA",
-                    somaticMutations,
-                    molecularProfileIdToMolecularProfile,
-                    [{studyId:'STUDY1', sampleId:'PATIENT2'}]
-                );
+            result = somaticMutationRate(
+                'PIK3CA',
+                somaticMutations,
+                molecularProfileIdToMolecularProfile,
+                [{ studyId: 'STUDY1', sampleId: 'PATIENT2' }]
+            );
             assert.equal(result, 100);
 
             // germline mutations should be ignored
-            result =
-                somaticMutationRate(
-                    "BRCA1",
-                    somaticMutations.concat(germlineMutations),
-                    molecularProfileIdToMolecularProfile,
-                    [{studyId:'STUDY1', sampleId:'PATIENT2'}]
-                );
+            result = somaticMutationRate(
+                'BRCA1',
+                somaticMutations.concat(germlineMutations),
+                molecularProfileIdToMolecularProfile,
+                [{ studyId: 'STUDY1', sampleId: 'PATIENT2' }]
+            );
             assert.equal(result, 0);
 
             // ignore all mutations for non existent patient id
-            result =
-                somaticMutationRate(
-                    "PIK3CA",
-                    somaticMutations,
-                    molecularProfileIdToMolecularProfile,
-                    [{studyId:'STUDY1', sampleId:'XXXX'}]
-                );
+            result = somaticMutationRate(
+                'PIK3CA',
+                somaticMutations,
+                molecularProfileIdToMolecularProfile,
+                [{ studyId: 'STUDY1', sampleId: 'XXXX' }]
+            );
             assert.equal(result, 0);
         });
     });
 
     describe('germlineMutationRate', () => {
-        it("calculates rate correctly", () => {
+        it('calculates rate correctly', () => {
             // only half of patients have BRCA1 mutation
-            let result:number =
-                germlineMutationRate(
-                    "BRCA1",
-                    germlineMutations,
-                    molecularProfileIdToMolecularProfile,
-                    [{studyId:'STUDY1', sampleId:'PATIENT1'}, {studyId:'STUDY1', sampleId:'PATIENT2'}]
-                );
+            let result: number = germlineMutationRate(
+                'BRCA1',
+                germlineMutations,
+                molecularProfileIdToMolecularProfile,
+                [
+                    { studyId: 'STUDY1', sampleId: 'PATIENT1' },
+                    { studyId: 'STUDY1', sampleId: 'PATIENT2' },
+                ]
+            );
             assert.equal(result, 50);
 
             // somatic mutations should be ignored
-            result =
-                germlineMutationRate(
-                    "PIK3CA",
-                    germlineMutations.concat(somaticMutations),
-                    molecularProfileIdToMolecularProfile,
-                    [{studyId:'STUDY1', sampleId:'PATIENT1'}, {studyId:'STUDY1', sampleId:'PATIENT2'}]
-                );
+            result = germlineMutationRate(
+                'PIK3CA',
+                germlineMutations.concat(somaticMutations),
+                molecularProfileIdToMolecularProfile,
+                [
+                    { studyId: 'STUDY1', sampleId: 'PATIENT1' },
+                    { studyId: 'STUDY1', sampleId: 'PATIENT2' },
+                ]
+            );
             assert.equal(result, 0);
 
             // ignore all mutations for non existent patient id
-            result =
-                germlineMutationRate(
-                    "BRCA2",
-                    germlineMutations,
-                    molecularProfileIdToMolecularProfile,
-                    [{studyId:'STUDY1', sampleId:'XXXX'}]
-                );
+            result = germlineMutationRate(
+                'BRCA2',
+                germlineMutations,
+                molecularProfileIdToMolecularProfile,
+                [{ studyId: 'STUDY1', sampleId: 'XXXX' }]
+            );
             assert.equal(result, 0);
 
             // No non-existing gene mutations
-            result =
-                germlineMutationRate(
-                    "NASDASFASG",
-                    germlineMutations,
-                    molecularProfileIdToMolecularProfile,
-                    [{studyId:'STUDY1', sampleId:'PATIENT1'}, {studyId:'STUDY1', sampleId:'PATIENT2'}]
-                );
+            result = germlineMutationRate(
+                'NASDASFASG',
+                germlineMutations,
+                molecularProfileIdToMolecularProfile,
+                [
+                    { studyId: 'STUDY1', sampleId: 'PATIENT1' },
+                    { studyId: 'STUDY1', sampleId: 'PATIENT2' },
+                ]
+            );
             assert.equal(result, 0);
         });
     });
@@ -286,325 +349,404 @@ describe('MutationUtils', () => {
         it('extracts unique genomic locations', () => {
             const mutations = [
                 initMutation({
-                    chr:"7",
+                    chr: '7',
                     startPosition: 111,
                     endPosition: 111,
-                    referenceAllele: "T",
-                    variantAllele: "C",
+                    referenceAllele: 'T',
+                    variantAllele: 'C',
                 }),
                 initMutation({
-                    chr:"7",
+                    chr: '7',
                     startPosition: 111,
                     endPosition: 111,
-                    referenceAllele: "T",
-                    variantAllele: "C",
+                    referenceAllele: 'T',
+                    variantAllele: 'C',
                 }),
                 initMutation({
-                    chr:"17",
+                    chr: '17',
                     startPosition: 66,
                     endPosition: 66,
-                    referenceAllele: "T",
-                    variantAllele: "A",
+                    referenceAllele: 'T',
+                    variantAllele: 'A',
                 }),
                 initMutation({
-                    chr:"17",
+                    chr: '17',
                     startPosition: 66,
                     endPosition: 66,
-                    referenceAllele: "T",
-                    variantAllele: "A",
+                    referenceAllele: 'T',
+                    variantAllele: 'A',
                 }),
                 initMutation({
-                    chr:"4",
+                    chr: '4',
                     startPosition: 11,
                     endPosition: 11,
-                    referenceAllele: "-",
-                    variantAllele: "G",
+                    referenceAllele: '-',
+                    variantAllele: 'G',
                 }),
             ];
 
             const genomicLocations = uniqueGenomicLocations(mutations);
 
-            assert.equal(genomicLocations.length, 3,
-                "Duplicate genomic locations should be removed (5 - 2 = 3)");
+            assert.equal(
+                genomicLocations.length,
+                3,
+                'Duplicate genomic locations should be removed (5 - 2 = 3)'
+            );
         });
     });
 
     describe('updateMissingGeneInfo', () => {
-
-        const genesByHugoSymbol: {[hugoGeneSymbol:string]: Gene} = {
+        const genesByHugoSymbol: { [hugoGeneSymbol: string]: Gene } = {
             AR: {
-                geneticEntityId:310,
+                geneticEntityId: 310,
                 entrezGeneId: 367,
-                hugoGeneSymbol: "AR",
-                type: "protein-coding"
+                hugoGeneSymbol: 'AR',
+                type: 'protein-coding',
             },
             BRCA1: {
                 geneticEntityId: 553,
                 entrezGeneId: 672,
-                hugoGeneSymbol: "BRCA1",
-                type: "protein-coding"
+                hugoGeneSymbol: 'BRCA1',
+                type: 'protein-coding',
             },
             BRCA2: {
                 geneticEntityId: 555,
                 entrezGeneId: 675,
-                hugoGeneSymbol: "BRCA2",
-                type: "protein-coding"
-            }
+                hugoGeneSymbol: 'BRCA2',
+                type: 'protein-coding',
+            },
         };
 
         it('adds missing gene information for the mutations', () => {
             const mutations = [
                 {
                     gene: {
-                        hugoGeneSymbol: "AR",
+                        hugoGeneSymbol: 'AR',
                     },
-                    proteinChange: "L729I",
+                    proteinChange: 'L729I',
                 },
                 {
                     gene: {
-                        hugoGeneSymbol: "BRCA1",
+                        hugoGeneSymbol: 'BRCA1',
                     },
-                    proteinChange: "C47W"
+                    proteinChange: 'C47W',
                 },
                 {
                     gene: {
-                        hugoGeneSymbol: "BRCA2",
+                        hugoGeneSymbol: 'BRCA2',
                     },
                     entrezGeneId: undefined,
-                    aminoAcidChange: "R2842C"
-                }
+                    aminoAcidChange: 'R2842C',
+                },
             ];
 
-            updateMissingGeneInfo(mutations as Partial<Mutation>[], genesByHugoSymbol);
-
-            assert.deepEqual(mutations[0].gene, genesByHugoSymbol["AR"]);
-            assert.equal(mutations[0].entrezGeneId, genesByHugoSymbol["AR"].entrezGeneId);
-            assert.deepEqual(mutations[1].gene, genesByHugoSymbol["BRCA1"]);
-            assert.equal(mutations[1].entrezGeneId, genesByHugoSymbol["BRCA1"].entrezGeneId);
-            assert.deepEqual(mutations[2].gene, genesByHugoSymbol["BRCA2"]);
-            assert.equal(mutations[2].entrezGeneId, genesByHugoSymbol["BRCA2"].entrezGeneId);
+            updateMissingGeneInfo(
+                mutations as Partial<Mutation>[],
+                genesByHugoSymbol
+            );
+
+            assert.deepEqual(mutations[0].gene, genesByHugoSymbol['AR']);
+            assert.equal(
+                mutations[0].entrezGeneId,
+                genesByHugoSymbol['AR'].entrezGeneId
+            );
+            assert.deepEqual(mutations[1].gene, genesByHugoSymbol['BRCA1']);
+            assert.equal(
+                mutations[1].entrezGeneId,
+                genesByHugoSymbol['BRCA1'].entrezGeneId
+            );
+            assert.deepEqual(mutations[2].gene, genesByHugoSymbol['BRCA2']);
+            assert.equal(
+                mutations[2].entrezGeneId,
+                genesByHugoSymbol['BRCA2'].entrezGeneId
+            );
         });
 
         it('should not overwrite existing gene information', () => {
             const mutations = [
                 {
                     gene: {
-                        hugoGeneSymbol: "AR",
-                        entrezGeneId: -1
+                        hugoGeneSymbol: 'AR',
+                        entrezGeneId: -1,
                     },
-                    entrezGeneId: -1
-                }
+                    entrezGeneId: -1,
+                },
             ];
 
-            updateMissingGeneInfo(mutations as Partial<Mutation>[], genesByHugoSymbol);
-
-            assert.notEqual(mutations[0].entrezGeneId, genesByHugoSymbol["AR"].entrezGeneId);
-            assert.notEqual(mutations[0].gene.entrezGeneId, genesByHugoSymbol["AR"].entrezGeneId);
+            updateMissingGeneInfo(
+                mutations as Partial<Mutation>[],
+                genesByHugoSymbol
+            );
+
+            assert.notEqual(
+                mutations[0].entrezGeneId,
+                genesByHugoSymbol['AR'].entrezGeneId
+            );
+            assert.notEqual(
+                mutations[0].gene.entrezGeneId,
+                genesByHugoSymbol['AR'].entrezGeneId
+            );
         });
     });
 
     describe('generate genomic location string', () => {
-        const genomicLocation:GenomicLocation[] = [
+        const genomicLocation: GenomicLocation[] = [
             {
                 // chromosome is X
-                chromosome: "X",
+                chromosome: 'X',
                 start: 47836189,
                 end: 47836189,
-                referenceAllele: "C",
-                variantAllele: "G"
+                referenceAllele: 'C',
+                variantAllele: 'G',
             },
             {
                 // chromosome is Y
-                chromosome: "Y",
+                chromosome: 'Y',
                 start: 24089764,
                 end: 24089764,
-                referenceAllele: "T",
-                variantAllele: "G"
+                referenceAllele: 'T',
+                variantAllele: 'G',
             },
             {
                 // chromosome is x
-                chromosome: "x",
+                chromosome: 'x',
                 start: 153694368,
                 end: 153694368,
-                referenceAllele: "C",
-                variantAllele: "T"
+                referenceAllele: 'C',
+                variantAllele: 'T',
             },
             {
                 // chromosome is y
-                chromosome: "y",
+                chromosome: 'y',
                 start: 152057792,
                 end: 152057792,
-                referenceAllele: "C",
-                variantAllele: "G"
-            }
+                referenceAllele: 'C',
+                variantAllele: 'G',
+            },
         ];
 
         it('match chorosome X and Y to 23 and 24', () => {
-            assert.equal("23,47836189,47836189,C,G", genomicLocationString(genomicLocation[0]), "should ocnver X to 23");
-            assert.equal("24,24089764,24089764,T,G", genomicLocationString(genomicLocation[1]), "should ocnver Y to 24");
-            assert.equal("23,153694368,153694368,C,T", genomicLocationString(genomicLocation[2]), "should ocnver x to 23");
-            assert.equal("24,152057792,152057792,C,G", genomicLocationString(genomicLocation[3]), "should ocnver y to 24");
+            assert.equal(
+                '23,47836189,47836189,C,G',
+                genomicLocationString(genomicLocation[0]),
+                'should ocnver X to 23'
+            );
+            assert.equal(
+                '24,24089764,24089764,T,G',
+                genomicLocationString(genomicLocation[1]),
+                'should ocnver Y to 24'
+            );
+            assert.equal(
+                '23,153694368,153694368,C,T',
+                genomicLocationString(genomicLocation[2]),
+                'should ocnver x to 23'
+            );
+            assert.equal(
+                '24,152057792,152057792,C,G',
+                genomicLocationString(genomicLocation[3]),
+                'should ocnver y to 24'
+            );
         });
     });
 
     describe('generate Hgvsg by mutation', () => {
-
         it('has valid genomic location', () => {
             const validateMutations: Partial<Mutation>[] = [
                 {
                     // valid
-                    chr: "X",
+                    chr: 'X',
                     startPosition: 47836189,
                     endPosition: 47836189,
-                    referenceAllele: "C",
-                    variantAllele: "G"
+                    referenceAllele: 'C',
+                    variantAllele: 'G',
                 },
                 {
                     // invalid allele, referenceAllele = "NA"
-                    chr: "17",
+                    chr: '17',
                     startPosition: 7574030,
                     endPosition: 7574030,
-                    referenceAllele: "NA",
-                    variantAllele: "G"
+                    referenceAllele: 'NA',
+                    variantAllele: 'G',
                 },
                 {
                     // invalid allele, both referenceAllele and variantAllele are "-"
-                    chr: "17",
+                    chr: '17',
                     startPosition: 7577498,
                     endPosition: 7577498,
-                    referenceAllele: "-",
-                    variantAllele: "-"
+                    referenceAllele: '-',
+                    variantAllele: '-',
                 },
                 {
                     // invalid allele, referenceAllele is empty
-                    chr: "17",
+                    chr: '17',
                     startPosition: 7577498,
                     endPosition: 7577498,
-                    referenceAllele: "",
-                    variantAllele: "-"
+                    referenceAllele: '',
+                    variantAllele: '-',
                 },
                 {
                     // invalid position, startPosition is -1
-                    chr: "17",
+                    chr: '17',
                     startPosition: -1,
                     endPosition: 7664673,
-                    referenceAllele: "G",
-                    variantAllele: "C"
+                    referenceAllele: 'G',
+                    variantAllele: 'C',
                 },
                 {
                     // invalid, missing chr
-                    chr: "",
+                    chr: '',
                     startPosition: 7577594,
                     endPosition: 7577595,
-                    referenceAllele: "AC",
-                    variantAllele: "-"
-                }
+                    referenceAllele: 'AC',
+                    variantAllele: '-',
+                },
             ];
 
-            assert.equal(true, isValidGenomicLocation(validateMutations[0]),
-                            "should be valid genomic location");
-            assert.equal(false, isValidGenomicLocation(validateMutations[1]),
-                            "should be invalid allele, referenceAllele = NA");
-            assert.equal(false, isValidGenomicLocation(validateMutations[2]),
-                            "should be invalid allele, both referenceAllele and variantAllele are -");
-            assert.equal(false, isValidGenomicLocation(validateMutations[3]),
-                            "should be invalid allele, referenceAllele is empty");
-            assert.equal(false, isValidGenomicLocation(validateMutations[4]),
-                            "should be invalid position, startPosition is -1");
-            assert.equal(false, isValidGenomicLocation(validateMutations[5]),
-                            "should be invalid, missing chr");
-
+            assert.equal(
+                true,
+                isValidGenomicLocation(validateMutations[0]),
+                'should be valid genomic location'
+            );
+            assert.equal(
+                false,
+                isValidGenomicLocation(validateMutations[1]),
+                'should be invalid allele, referenceAllele = NA'
+            );
+            assert.equal(
+                false,
+                isValidGenomicLocation(validateMutations[2]),
+                'should be invalid allele, both referenceAllele and variantAllele are -'
+            );
+            assert.equal(
+                false,
+                isValidGenomicLocation(validateMutations[3]),
+                'should be invalid allele, referenceAllele is empty'
+            );
+            assert.equal(
+                false,
+                isValidGenomicLocation(validateMutations[4]),
+                'should be invalid position, startPosition is -1'
+            );
+            assert.equal(
+                false,
+                isValidGenomicLocation(validateMutations[5]),
+                'should be invalid, missing chr'
+            );
         });
 
         it('generate substitution hgvsg', () => {
             const substitutionMutation: Partial<Mutation>[] = [
                 {
                     // substitution
-                    chr: "17",
+                    chr: '17',
                     startPosition: 7577121,
                     endPosition: 7577121,
-                    referenceAllele: "G",
-                    variantAllele: "A"
-                }
+                    referenceAllele: 'G',
+                    variantAllele: 'A',
+                },
             ];
 
-            assert.equal("17:g.7577121G>A", generateHgvsgByMutation(substitutionMutation[0]), "the hgvsg should be 17:g.7577121G>A");
+            assert.equal(
+                '17:g.7577121G>A',
+                generateHgvsgByMutation(substitutionMutation[0]),
+                'the hgvsg should be 17:g.7577121G>A'
+            );
         });
 
         it('generate insertion hgvsg', () => {
             const insertionMutations: Partial<Mutation>[] = [
                 {
                     // ins, length of variantAllele > 1
-                    chr: "17",
+                    chr: '17',
                     startPosition: 7579590,
                     endPosition: 7579591,
-                    referenceAllele: "-",
-                    variantAllele: "CT"
+                    referenceAllele: '-',
+                    variantAllele: 'CT',
                 },
                 {
                     // ins, length of variantAllele = 1
-                    chr: "17",
+                    chr: '17',
                     startPosition: 3637855,
                     endPosition: 3637856,
-                    referenceAllele: "-",
-                    variantAllele: "C"
-                }];
-
-            assert.equal("17:g.7579590_7579591insCT", generateHgvsgByMutation(insertionMutations[0]),
-                            "should be insertion 17:g.7579590_7579591insCT: (chr):g.(start)_(end)ins(var)");
-            assert.equal("17:g.3637855_3637856insC", generateHgvsgByMutation(insertionMutations[1]),
-                            "should be insertion 17:g.3637855_3637856insC: (chr):g.(start)_(end)ins(var)");
+                    referenceAllele: '-',
+                    variantAllele: 'C',
+                },
+            ];
 
+            assert.equal(
+                '17:g.7579590_7579591insCT',
+                generateHgvsgByMutation(insertionMutations[0]),
+                'should be insertion 17:g.7579590_7579591insCT: (chr):g.(start)_(end)ins(var)'
+            );
+            assert.equal(
+                '17:g.3637855_3637856insC',
+                generateHgvsgByMutation(insertionMutations[1]),
+                'should be insertion 17:g.3637855_3637856insC: (chr):g.(start)_(end)ins(var)'
+            );
         });
-        
+
         it('generate deletion hgvsg', () => {
             const deletionMutations: Partial<Mutation>[] = [
                 {
                     // del, length of referenceAllele = 1
-                    chr: "17",
+                    chr: '17',
                     startPosition: 7574030,
                     endPosition: 7574030,
-                    referenceAllele: "G",
-                    variantAllele: "-"
+                    referenceAllele: 'G',
+                    variantAllele: '-',
                 },
                 {
                     // del, length of referenceAllele > 1
-                    chr: "17",
+                    chr: '17',
                     startPosition: 7577594,
                     endPosition: 7577595,
-                    referenceAllele: "AC",
-                    variantAllele: "-"
-                }];
-
-            assert.equal("17:g.7574030del", generateHgvsgByMutation(deletionMutations[0]),
-                            "should be deletion 17:g.7574030del: (chr):g.(start)del");
-            assert.equal("17:g.7577594_7577595del", generateHgvsgByMutation(deletionMutations[1]),
-                            "should be deletion 17:g.7577594_7577595del: (chr):g.(start)_(end)del");
+                    referenceAllele: 'AC',
+                    variantAllele: '-',
+                },
+            ];
+
+            assert.equal(
+                '17:g.7574030del',
+                generateHgvsgByMutation(deletionMutations[0]),
+                'should be deletion 17:g.7574030del: (chr):g.(start)del'
+            );
+            assert.equal(
+                '17:g.7577594_7577595del',
+                generateHgvsgByMutation(deletionMutations[1]),
+                'should be deletion 17:g.7577594_7577595del: (chr):g.(start)_(end)del'
+            );
         });
 
         it('generate delins hgvsg', () => {
             const delinsMutations: Partial<Mutation>[] = [
                 {
                     // delins, length of variantAllele = 1
-                    chr: "17",
+                    chr: '17',
                     startPosition: 7573443,
                     endPosition: 7573443,
-                    referenceAllele: "C",
-                    variantAllele: "TGG"
+                    referenceAllele: 'C',
+                    variantAllele: 'TGG',
                 },
                 {
                     // delins, length of variantAllele > 1
-                    chr: "17",
+                    chr: '17',
                     startPosition: 7578205,
                     endPosition: 7578207,
-                    referenceAllele: "CTA",
-                    variantAllele: "TTT"
-                }];
-
-            assert.equal("17:g.7573443delinsTGG", generateHgvsgByMutation(delinsMutations[0]),
-                            "should be delins 17:g.7573443delinsTGG: (chr):g.(start)delins(var)");
-            assert.equal("17:g.7578205_7578207delinsTTT", generateHgvsgByMutation(delinsMutations[1]),
-                            "should be delins 17:g.7578205_7578207delinsTTT: (chr):g.(start)_(end)delins(var)");
+                    referenceAllele: 'CTA',
+                    variantAllele: 'TTT',
+                },
+            ];
+
+            assert.equal(
+                '17:g.7573443delinsTGG',
+                generateHgvsgByMutation(delinsMutations[0]),
+                'should be delins 17:g.7573443delinsTGG: (chr):g.(start)delins(var)'
+            );
+            assert.equal(
+                '17:g.7578205_7578207delinsTTT',
+                generateHgvsgByMutation(delinsMutations[1]),
+                'should be delins 17:g.7578205_7578207delinsTTT: (chr):g.(start)_(end)delins(var)'
+            );
         });
     });
 });
diff --git a/src/shared/lib/MutationUtils.ts b/src/shared/lib/MutationUtils.ts
index a7aab9c3f98..68301050bcd 100644
--- a/src/shared/lib/MutationUtils.ts
+++ b/src/shared/lib/MutationUtils.ts
@@ -1,45 +1,59 @@
 import * as _ from 'lodash';
 import {
     getColorForProteinImpactType as getDefaultColorForProteinImpactType,
-    IProteinImpactTypeColors
-} from "react-mutation-mapper";
-import {Gene, MolecularProfile, Mutation, SampleIdentifier} from "shared/api/generated/CBioPortalAPI";
-import {GenomicLocation, stringListToSet} from "cbioportal-frontend-commons";
-import {MUTATION_STATUS_GERMLINE, MOLECULAR_PROFILE_UNCALLED_MUTATIONS_SUFFIX} from "shared/constants";
-import {toSampleUuid} from "./UuidUtils";
+    IProteinImpactTypeColors,
+} from 'react-mutation-mapper';
 import {
-    MUT_COLOR_INFRAME, MUT_COLOR_MISSENSE, MUT_COLOR_OTHER,
-    MUT_COLOR_TRUNC
-} from "shared/lib/Colors";
-import {normalizeMutations} from "../components/mutationMapper/MutationMapperUtils";
-import {getSimplifiedMutationType} from "./oql/AccessorsForOqlFilter";
-
+    Gene,
+    MolecularProfile,
+    Mutation,
+    SampleIdentifier,
+} from 'shared/api/generated/CBioPortalAPI';
+import { GenomicLocation, stringListToSet } from 'cbioportal-frontend-commons';
+import {
+    MUTATION_STATUS_GERMLINE,
+    MOLECULAR_PROFILE_UNCALLED_MUTATIONS_SUFFIX,
+} from 'shared/constants';
+import { toSampleUuid } from './UuidUtils';
+import {
+    MUT_COLOR_INFRAME,
+    MUT_COLOR_MISSENSE,
+    MUT_COLOR_OTHER,
+    MUT_COLOR_TRUNC,
+} from 'shared/lib/Colors';
+import { normalizeMutations } from '../components/mutationMapper/MutationMapperUtils';
+import { getSimplifiedMutationType } from './oql/AccessorsForOqlFilter';
 
 export const DEFAULT_PROTEIN_IMPACT_TYPE_COLORS: IProteinImpactTypeColors = {
     missenseColor: MUT_COLOR_MISSENSE,
     inframeColor: MUT_COLOR_INFRAME,
     truncatingColor: MUT_COLOR_TRUNC,
-    otherColor: MUT_COLOR_OTHER
+    otherColor: MUT_COLOR_OTHER,
 };
 
-export function isFusion(mutation:Mutation) {
-    return getSimplifiedMutationType(mutation.mutationType) === "fusion";
+export function isFusion(mutation: Mutation) {
+    return getSimplifiedMutationType(mutation.mutationType) === 'fusion';
 }
 
-export function isUncalled(molecularProfileId:string) {
-    const r = new RegExp(MOLECULAR_PROFILE_UNCALLED_MUTATIONS_SUFFIX + "$");
+export function isUncalled(molecularProfileId: string) {
+    const r = new RegExp(MOLECULAR_PROFILE_UNCALLED_MUTATIONS_SUFFIX + '$');
     return r.test(molecularProfileId);
 }
 
-export function getColorForProteinImpactType(mutations: Mutation[],
-    colors: IProteinImpactTypeColors = DEFAULT_PROTEIN_IMPACT_TYPE_COLORS): string
-{
-    return getDefaultColorForProteinImpactType(normalizeMutations(mutations), colors);
+export function getColorForProteinImpactType(
+    mutations: Mutation[],
+    colors: IProteinImpactTypeColors = DEFAULT_PROTEIN_IMPACT_TYPE_COLORS
+): string {
+    return getDefaultColorForProteinImpactType(
+        normalizeMutations(mutations),
+        colors
+    );
 }
 
 // TODO remove when done refactoring mutation mapper
-export function groupMutationsByProteinStartPos(mutationData: Mutation[][]): {[pos: number]: Mutation[]}
-{
+export function groupMutationsByProteinStartPos(
+    mutationData: Mutation[][]
+): { [pos: number]: Mutation[] } {
     const map: { [pos: number]: Mutation[] } = {};
 
     for (const mutations of mutationData) {
@@ -56,13 +70,13 @@ export function groupMutationsByProteinStartPos(mutationData: Mutation[][]): {[p
     return map;
 }
 
-export function groupMutationsByGeneAndPatientAndProteinChange(mutations: Mutation[]): {[key: string]: Mutation[]}
-{
+export function groupMutationsByGeneAndPatientAndProteinChange(
+    mutations: Mutation[]
+): { [key: string]: Mutation[] } {
     // key = <gene>_<patient>_<proteinChange>
-    const map: {[key: string]: Mutation[]} = {};
+    const map: { [key: string]: Mutation[] } = {};
 
-    for (const mutation of mutations)
-    {
+    for (const mutation of mutations) {
         const key = `${mutation.gene.hugoGeneSymbol}_${mutation.patientId}_${mutation.proteinChange}`;
         map[key] = map[key] || [];
         map[key].push(mutation);
@@ -71,44 +85,54 @@ export function groupMutationsByGeneAndPatientAndProteinChange(mutations: Mutati
     return map;
 }
 
-export function countDuplicateMutations(groupedMutations: {[key: string]: Mutation[]}): number
-{
+export function countDuplicateMutations(groupedMutations: {
+    [key: string]: Mutation[];
+}): number {
     // helper to count duplicate mutations
-    const countMapper = (mutations: Mutation[]) => mutations.length > 0 ? mutations.length - 1 : 0;
+    const countMapper = (mutations: Mutation[]) =>
+        mutations.length > 0 ? mutations.length - 1 : 0;
 
     // helper to get the total sum
     const sumReducer = (acc: number, current: number) => acc + current;
 
-    return _.values(groupedMutations).map(countMapper).reduce(sumReducer, 0);
+    return _.values(groupedMutations)
+        .map(countMapper)
+        .reduce(sumReducer, 0);
 }
 
-export function countUniqueMutations(mutations: Mutation[]): number
-{
-    return Object.keys(groupMutationsByGeneAndPatientAndProteinChange(mutations)).length;
+export function countUniqueMutations(mutations: Mutation[]): number {
+    return Object.keys(
+        groupMutationsByGeneAndPatientAndProteinChange(mutations)
+    ).length;
 }
 
 /**
  * Protein start positions for the mutations falling between a specific start and end position range
  */
-export function getProteinStartPositionsByRange(data: Mutation[][], start: number, end: number)
-{
+export function getProteinStartPositionsByRange(
+    data: Mutation[][],
+    start: number,
+    end: number
+) {
     const positions: number[] = [];
 
     data.forEach((mutations: Mutation[]) => {
         const mutation = mutations[0];
 
         // only add positions which fall between start & end positions
-        if (mutation.proteinPosStart > -1 &&
+        if (
+            mutation.proteinPosStart > -1 &&
             mutation.proteinPosStart >= start &&
-            mutation.proteinPosStart <= end)
-        {
+            mutation.proteinPosStart <= end
+        ) {
             positions.push(mutation.proteinPosStart);
         }
 
-        if (mutation.proteinPosEnd > mutation.proteinPosStart &&
+        if (
+            mutation.proteinPosEnd > mutation.proteinPosStart &&
             mutation.proteinPosEnd >= start &&
-            mutation.proteinPosEnd <= end)
-        {
+            mutation.proteinPosEnd <= end
+        ) {
             positions.push(mutation.proteinPosEnd);
         }
     });
@@ -116,23 +140,26 @@ export function getProteinStartPositionsByRange(data: Mutation[][], start: numbe
     return _.uniq(positions);
 }
 
-export const GERMLINE_REGEXP = new RegExp(MUTATION_STATUS_GERMLINE, "i");
+export const GERMLINE_REGEXP = new RegExp(MUTATION_STATUS_GERMLINE, 'i');
 /**
  * Percentage of cases/samples with a germline mutation in given gene.
  * Assumes all given sample ids in the study had germline screening for all
  * genes (TODO: use gene panel).
  */
-export function germlineMutationRate(hugoGeneSymbol:string,
-                                     mutations: Mutation[],
-                                     molecularProfileIdToMolecularProfile:{[molecularProfileId:string]:MolecularProfile},
-                                     samples: SampleIdentifier[])
-{
+export function germlineMutationRate(
+    hugoGeneSymbol: string,
+    mutations: Mutation[],
+    molecularProfileIdToMolecularProfile: {
+        [molecularProfileId: string]: MolecularProfile;
+    },
+    samples: SampleIdentifier[]
+) {
     if (mutations.length > 0 && samples.length > 0) {
         const sampleIds = stringListToSet(samples.map(toSampleUuid));
-        const nrCasesGermlineMutation:number =
-            _.chain(mutations)
-            .filter((m:Mutation) => {
-                const profile = molecularProfileIdToMolecularProfile[m.molecularProfileId];
+        const nrCasesGermlineMutation: number = _.chain(mutations)
+            .filter((m: Mutation) => {
+                const profile =
+                    molecularProfileIdToMolecularProfile[m.molecularProfileId];
                 if (profile) {
                     return (
                         m.gene.hugoGeneSymbol === hugoGeneSymbol &&
@@ -146,9 +173,8 @@ export function germlineMutationRate(hugoGeneSymbol:string,
             })
             .map(toSampleUuid)
             .uniq()
-            .value()
-            .length;
-        return nrCasesGermlineMutation * 100.0 / samples.length;
+            .value().length;
+        return (nrCasesGermlineMutation * 100.0) / samples.length;
     } else {
         return 0;
     }
@@ -157,21 +183,31 @@ export function germlineMutationRate(hugoGeneSymbol:string,
 /**
  * Percentage of cases/samples with a somatic mutation in given gene.
  */
-export function somaticMutationRate(hugoGeneSymbol: string, mutations: Mutation[],
-                                    molecularProfileIdToMolecularProfile:{[molecularProfileId:string]:MolecularProfile},
-                                    samples: SampleIdentifier[]) {
+export function somaticMutationRate(
+    hugoGeneSymbol: string,
+    mutations: Mutation[],
+    molecularProfileIdToMolecularProfile: {
+        [molecularProfileId: string]: MolecularProfile;
+    },
+    samples: SampleIdentifier[]
+) {
     if (mutations.length > 0 && samples.length > 0) {
         const sampleIds = stringListToSet(samples.map(toSampleUuid));
         return (
-            _.chain(mutations)
-                .filter((m:Mutation) => {
-                    const profile = molecularProfileIdToMolecularProfile[m.molecularProfileId];
+            (_.chain(mutations)
+                .filter((m: Mutation) => {
+                    const profile =
+                        molecularProfileIdToMolecularProfile[
+                            m.molecularProfileId
+                        ];
                     if (profile) {
                         return (
                             m.gene.hugoGeneSymbol === hugoGeneSymbol &&
-                            !(GERMLINE_REGEXP.test(m.mutationStatus)) &&
+                            !GERMLINE_REGEXP.test(m.mutationStatus) &&
                             // filter for given sample IDs
-                            !!sampleIds[toSampleUuid(profile.studyId, m.sampleId)]
+                            !!sampleIds[
+                                toSampleUuid(profile.studyId, m.sampleId)
+                            ]
                         );
                     } else {
                         return false;
@@ -179,98 +215,103 @@ export function somaticMutationRate(hugoGeneSymbol: string, mutations: Mutation[
                 })
                 .map(toSampleUuid)
                 .uniq()
-                .value()
-                .length * 100.0 /
-                samples.length
+                .value().length *
+                100.0) /
+            samples.length
         );
     } else {
         return 0;
     }
 }
 
-export function isNotGermlineMutation(
-    m:{ mutationStatus?:string }
-) {
-    return !m.mutationStatus || !(GERMLINE_REGEXP.test(m.mutationStatus));
+export function isNotGermlineMutation(m: { mutationStatus?: string }) {
+    return !m.mutationStatus || !GERMLINE_REGEXP.test(m.mutationStatus);
 }
 
-export function updateMissingGeneInfo(mutations: Partial<Mutation>[],
-                                      genesByHugoSymbol: {[hugoGeneSymbol:string]: Gene})
-{
+export function updateMissingGeneInfo(
+    mutations: Partial<Mutation>[],
+    genesByHugoSymbol: { [hugoGeneSymbol: string]: Gene }
+) {
     mutations.forEach(mutation => {
-        if (mutation.gene && mutation.gene.hugoGeneSymbol)
-        {
+        if (mutation.gene && mutation.gene.hugoGeneSymbol) {
             const gene = genesByHugoSymbol[mutation.gene.hugoGeneSymbol];
 
             if (gene) {
                 // keep the existing "mutation.gene" values: only overwrite missing (undefined) values
                 mutation.gene = _.merge({}, gene, mutation.gene);
                 // also update entrezGeneId for the mutation itself
-                mutation.entrezGeneId = mutation.entrezGeneId || gene.entrezGeneId;
+                mutation.entrezGeneId =
+                    mutation.entrezGeneId || gene.entrezGeneId;
             }
         }
     });
 }
 
 // TODO remove when done refactoring mutation mapper
-export function extractGenomicLocation(mutation: Mutation)
-{
-    if (mutation.gene && mutation.chr &&
+export function extractGenomicLocation(mutation: Mutation) {
+    if (
+        mutation.gene &&
+        mutation.chr &&
         mutation.startPosition &&
         mutation.endPosition &&
         mutation.referenceAllele &&
-        mutation.variantAllele)
-    {
+        mutation.variantAllele
+    ) {
         return {
-            chromosome: mutation.chr.replace("chr", ""),
+            chromosome: mutation.chr.replace('chr', ''),
             start: mutation.startPosition,
             end: mutation.endPosition,
             referenceAllele: mutation.referenceAllele,
-            variantAllele: mutation.variantAllele
+            variantAllele: mutation.variantAllele,
         };
-    }
-    else {
+    } else {
         return undefined;
     }
 }
 
 // TODO remove when done refactoring mutation mapper
-export function genomicLocationString(genomicLocation: GenomicLocation)
-{
+export function genomicLocationString(genomicLocation: GenomicLocation) {
     // mapping chromosome X with 23
     let chromosome = genomicLocation.chromosome;
-    switch(genomicLocation.chromosome.toUpperCase()) {
-        case "X":
-            chromosome = "23";
+    switch (genomicLocation.chromosome.toUpperCase()) {
+        case 'X':
+            chromosome = '23';
             break;
-        case "Y":
-            chromosome = "24";
+        case 'Y':
+            chromosome = '24';
             break;
         default:
     }
-    
+
     return `${chromosome},${genomicLocation.start},${genomicLocation.end},${genomicLocation.referenceAllele},${genomicLocation.variantAllele}`;
 }
 
 // TODO remove when done refactoring mutation mapper
-export function uniqueGenomicLocations(mutations: Mutation[]): GenomicLocation[]
-{
-    const genomicLocationMap: {[key: string]: GenomicLocation} = {};
+export function uniqueGenomicLocations(
+    mutations: Mutation[]
+): GenomicLocation[] {
+    const genomicLocationMap: { [key: string]: GenomicLocation } = {};
 
     mutations.map((mutation: Mutation) => {
-        const genomicLocation: GenomicLocation|undefined = extractGenomicLocation(mutation);
+        const genomicLocation:
+            | GenomicLocation
+            | undefined = extractGenomicLocation(mutation);
 
         if (genomicLocation) {
-            genomicLocationMap[genomicLocationString(genomicLocation)] = genomicLocation;
+            genomicLocationMap[
+                genomicLocationString(genomicLocation)
+            ] = genomicLocation;
         }
     });
 
     return _.values(genomicLocationMap);
 }
 
-
-export function getVariantAlleleFrequency(m:Mutation) {
-    if (Number.isInteger(m.tumorRefCount) && Number.isInteger(m.tumorAltCount)) {
+export function getVariantAlleleFrequency(m: Mutation) {
+    if (
+        Number.isInteger(m.tumorRefCount) &&
+        Number.isInteger(m.tumorAltCount)
+    ) {
         const vaf = m.tumorAltCount / (m.tumorAltCount + m.tumorRefCount);
         if (isNaN(vaf)) {
             return null;
@@ -282,25 +323,33 @@ export function getVariantAlleleFrequency(m:Mutation) {
     }
 }
 
-export function generateHgvsgByMutation(mutation: Partial<Mutation>): string | null {
+export function generateHgvsgByMutation(
+    mutation: Partial<Mutation>
+): string | null {
     if (isValidGenomicLocation(mutation)) {
         // ins
-        if (mutation.referenceAllele === "-") {
+        if (mutation.referenceAllele === '-') {
             return `${mutation.chr}:g.${mutation.startPosition}_${mutation.endPosition}ins${mutation.variantAllele}`;
         }
         // del (in new format that no ref after del, may differ with genome nexus hgvsg response)
-        else if (mutation.variantAllele === "-") {
+        else if (mutation.variantAllele === '-') {
             if (mutation.startPosition === mutation.endPosition) {
                 return `${mutation.chr}:g.${mutation.startPosition}del`;
             }
             return `${mutation.chr}:g.${mutation.startPosition}_${mutation.endPosition}del`;
         }
         // substitution
-        else if (mutation.referenceAllele!.length === 1 && mutation.variantAllele!.length === 1) {
+        else if (
+            mutation.referenceAllele!.length === 1 &&
+            mutation.variantAllele!.length === 1
+        ) {
             return `${mutation.chr}:g.${mutation.startPosition}${mutation.referenceAllele}>${mutation.variantAllele}`;
         }
         // delins (in new format that no ref after del, may differ with genome nexus hgvsg response)
-        else if (mutation.referenceAllele!.length === 1 && mutation.variantAllele!.length > 1) {
+        else if (
+            mutation.referenceAllele!.length === 1 &&
+            mutation.variantAllele!.length > 1
+        ) {
             return `${mutation.chr}:g.${mutation.startPosition}delins${mutation.variantAllele}`;
         }
         // delins (in new format that no ref after del, may differ with genome nexus hgvsg response)
@@ -314,17 +363,25 @@ export function generateHgvsgByMutation(mutation: Partial<Mutation>): string | n
 }
 
 export function isValidGenomicLocation(mutation: Partial<Mutation>): boolean {
-    if (mutation.chr
-        && mutation.startPosition && mutation.startPosition !== -1
-        && mutation.endPosition && mutation.endPosition !== -1
-        && mutation.referenceAllele && mutation.referenceAllele !== "NA"
-        && mutation.variantAllele && mutation.variantAllele !== "NA") {
-            if (mutation.referenceAllele === "-" && mutation.variantAllele === "-") {
-                return false;
-            }
-            return true;
+    if (
+        mutation.chr &&
+        mutation.startPosition &&
+        mutation.startPosition !== -1 &&
+        mutation.endPosition &&
+        mutation.endPosition !== -1 &&
+        mutation.referenceAllele &&
+        mutation.referenceAllele !== 'NA' &&
+        mutation.variantAllele &&
+        mutation.variantAllele !== 'NA'
+    ) {
+        if (
+            mutation.referenceAllele === '-' &&
+            mutation.variantAllele === '-'
+        ) {
+            return false;
+        }
+        return true;
     }
-    
+
     return false;
-    
-}
\ No newline at end of file
+}
diff --git a/src/shared/lib/MutationalSignaturesUtils.tsx b/src/shared/lib/MutationalSignaturesUtils.tsx
index 4ee8ccb7252..a88102d2945 100644
--- a/src/shared/lib/MutationalSignaturesUtils.tsx
+++ b/src/shared/lib/MutationalSignaturesUtils.tsx
@@ -1,78 +1,123 @@
-import * as React from "react";
+import * as React from 'react';
 import _ from 'lodash';
-import {IMutationalSignature, IMutationalSignatureMeta, ISignificantMutationalSignaturesForSample} from "../model/MutationalSignature";
+import {
+    IMutationalSignature,
+    IMutationalSignatureMeta,
+    ISignificantMutationalSignaturesForSample,
+} from '../model/MutationalSignature';
 
 const MIN_NUMBER_OF_MUTATIONS_THRESHOLD = 5;
-const MIN_NUMBER_OF_MUTATIONS_STATEMENT = "There are not enough mutations to call mutational signatures for this case.";
+const MIN_NUMBER_OF_MUTATIONS_STATEMENT =
+    'There are not enough mutations to call mutational signatures for this case.';
 const DUBIOUS_NUMBER_OF_MUTATIONS_THRESHOLD = 15;
-const DUBIOUS_NUMBER_OF_MUTATIONS_STATEMENT = "This case has a low number of mutations, signatures are highly uncertain.";
+const DUBIOUS_NUMBER_OF_MUTATIONS_STATEMENT =
+    'This case has a low number of mutations, signatures are highly uncertain.';
 
-
-export function progressBar(confidence:string, determineColor:boolean) {
+export function progressBar(confidence: string, determineColor: boolean) {
     let confidencePerc = Math.round(parseFloat(confidence) * 100);
 
-    let progressBarClassName:string = "progress-bar-info";
-    let progressBarStyle:{ [s:string]:string; } = {"backgroundColor":"darkgray"};
+    let progressBarClassName: string = 'progress-bar-info';
+    let progressBarStyle: { [s: string]: string } = {
+        backgroundColor: 'darkgray',
+    };
 
     return (
-        <div className="progress" style={{position:"relative",width:100,marginBottom:0}}>
-    <div data-test="progress-bar" className={`progress-bar ${progressBarClassName}`}
-    role="progressbar" aria-valuenow={confidencePerc}
-    aria-valuemin={0} aria-valuemax={100}
-    style={Object.assign(progressBarStyle, {width:`${confidencePerc}%`})} />
-    <div style={{position:"absolute",
-        textShadow:"-1px 0 white, 0 1px white, 1px 0 white, 0 -1px white",
-        width:100,
-        marginTop:2,
-        textAlign:"center"}}
-    >{confidencePerc}%</div>
-    </div>
+        <div
+            className="progress"
+            style={{ position: 'relative', width: 100, marginBottom: 0 }}
+        >
+            <div
+                data-test="progress-bar"
+                className={`progress-bar ${progressBarClassName}`}
+                role="progressbar"
+                aria-valuenow={confidencePerc}
+                aria-valuemin={0}
+                aria-valuemax={100}
+                style={Object.assign(progressBarStyle, {
+                    width: `${confidencePerc}%`,
+                })}
+            />
+            <div
+                style={{
+                    position: 'absolute',
+                    textShadow:
+                        '-1px 0 white, 0 1px white, 1px 0 white, 0 -1px white',
+                    width: 100,
+                    marginTop: 2,
+                    textAlign: 'center',
+                }}
+            >
+                {confidencePerc}%
+            </div>
+        </div>
     );
 }
 
-export function prepareMutationalSignaturesForHeader(mutationalSignatureData: IMutationalSignature[], mutationalSignatureMetaData: IMutationalSignatureMeta[],
-                                                     uniqueSampleKey: string): ISignificantMutationalSignaturesForSample{
+export function prepareMutationalSignaturesForHeader(
+    mutationalSignatureData: IMutationalSignature[],
+    mutationalSignatureMetaData: IMutationalSignatureMeta[],
+    uniqueSampleKey: string
+): ISignificantMutationalSignaturesForSample {
     //group data by uniquesamples for now -> this processing will need to be done in patientpageviewstore in the future
-    let mutationalSignatureDataForUniqueSample: Array<any> = _(mutationalSignatureData)
-        .filter(["uniqueSampleKey", uniqueSampleKey])
+    let mutationalSignatureDataForUniqueSample: Array<any> = _(
+        mutationalSignatureData
+    )
+        .filter(['uniqueSampleKey', uniqueSampleKey])
         .value();
 
     let significantMutationalSignatureForSample: ISignificantMutationalSignaturesForSample = {
-        numberOfMutationsForSample:0,
-        confidenceStatement:"",
-        significantSignatures:{}
+        numberOfMutationsForSample: 0,
+        confidenceStatement: '',
+        significantSignatures: {},
     };
 
-    for (const mutationalSignatureSample of mutationalSignatureDataForUniqueSample){
-
+    for (const mutationalSignatureSample of mutationalSignatureDataForUniqueSample) {
         //for each uniquesample, build significant mutational signature data structure
-        significantMutationalSignatureForSample.numberOfMutationsForSample = mutationalSignatureSample.numberOfMutationsForSample;
+        significantMutationalSignatureForSample.numberOfMutationsForSample =
+            mutationalSignatureSample.numberOfMutationsForSample;
 
-        if(mutationalSignatureSample.confidence > 0.85){ //make a variable called confidence threshold
+        if (mutationalSignatureSample.confidence > 0.85) {
+            //make a variable called confidence threshold
             // add significant mutational signatures
-            significantMutationalSignatureForSample.significantSignatures[mutationalSignatureSample.mutationalSignatureId] = mutationalSignatureSample.value;
+            significantMutationalSignatureForSample.significantSignatures[
+                mutationalSignatureSample.mutationalSignatureId
+            ] = mutationalSignatureSample.value;
 
             //build confidence statement
-            if(significantMutationalSignatureForSample.numberOfMutationsForSample <= MIN_NUMBER_OF_MUTATIONS_THRESHOLD){//account for low number of mutations
+            if (
+                significantMutationalSignatureForSample.numberOfMutationsForSample <=
+                MIN_NUMBER_OF_MUTATIONS_THRESHOLD
+            ) {
+                //account for low number of mutations
                 significantMutationalSignatureForSample.confidenceStatement += MIN_NUMBER_OF_MUTATIONS_STATEMENT;
-            }
-            else if(significantMutationalSignatureForSample.numberOfMutationsForSample <= DUBIOUS_NUMBER_OF_MUTATIONS_THRESHOLD){
+            } else if (
+                significantMutationalSignatureForSample.numberOfMutationsForSample <=
+                DUBIOUS_NUMBER_OF_MUTATIONS_THRESHOLD
+            ) {
                 significantMutationalSignatureForSample.confidenceStatement += DUBIOUS_NUMBER_OF_MUTATIONS_STATEMENT;
             }
 
-            for (const mutationalSignature of mutationalSignatureMetaData){ //generate confidence statement depending on the mutational signature
-                if(mutationalSignatureSample.mutationalSignatureId === mutationalSignature.mutationalSignatureId){
-                    significantMutationalSignatureForSample.confidenceStatement += (" " + mutationalSignature.confidenceStatement);
+            for (const mutationalSignature of mutationalSignatureMetaData) {
+                //generate confidence statement depending on the mutational signature
+                if (
+                    mutationalSignatureSample.mutationalSignatureId ===
+                    mutationalSignature.mutationalSignatureId
+                ) {
+                    significantMutationalSignatureForSample.confidenceStatement +=
+                        ' ' + mutationalSignature.confidenceStatement;
                 }
             }
         }
     }
 
     //check if any significant signatures were added using lodash
-    if(_.isEmpty(significantMutationalSignatureForSample.significantSignatures)){
-        significantMutationalSignatureForSample.confidenceStatement += "No signatures confidently detected.";
+    if (
+        _.isEmpty(significantMutationalSignatureForSample.significantSignatures)
+    ) {
+        significantMutationalSignatureForSample.confidenceStatement +=
+            'No signatures confidently detected.';
     }
 
     significantMutationalSignatureForSample.confidenceStatement = significantMutationalSignatureForSample.confidenceStatement.trim();
     return significantMutationalSignatureForSample;
-}
\ No newline at end of file
+}
diff --git a/src/shared/lib/NumberUtils.ts b/src/shared/lib/NumberUtils.ts
index 753670b2dc8..39e1ffac9b9 100644
--- a/src/shared/lib/NumberUtils.ts
+++ b/src/shared/lib/NumberUtils.ts
@@ -1,8 +1,11 @@
-export function toConditionalPrecision(number: number, precision: number, threshold: number): string {
-
+export function toConditionalPrecision(
+    number: number,
+    precision: number,
+    threshold: number
+): string {
     if (0.000001 <= number && number < threshold) {
         return number.toExponential(precision);
     }
 
     return number.toPrecision(precision);
-};
\ No newline at end of file
+}
diff --git a/src/shared/lib/ObjectManipulation.spec.ts b/src/shared/lib/ObjectManipulation.spec.ts
index 492c2611573..697b28e6d3d 100644
--- a/src/shared/lib/ObjectManipulation.spec.ts
+++ b/src/shared/lib/ObjectManipulation.spec.ts
@@ -1,17 +1,16 @@
 import { assert } from 'chai';
-import React from 'react'
-import { renameKeys, dropKeys } from './ObjectManipulation'
-
+import React from 'react';
+import { renameKeys, dropKeys } from './ObjectManipulation';
 
 describe('ObjectManipulation functions', () => {
     it('should rename keys in a flat object', () => {
         let dict = {
-            "a": 0,
-            "b": 1,
-            "c": 2
+            a: 0,
+            b: 1,
+            c: 2,
         };
         let keyMap = {
-            "a": "A"
+            a: 'A',
         };
         let rv = renameKeys(dict, keyMap);
         assert.equal(rv.A, 0);
@@ -19,29 +18,29 @@ describe('ObjectManipulation functions', () => {
         assert.equal(rv.b, 1);
         assert.equal(rv.c, 2);
         // old dict stays the same
-        assert.equal(dict.a, 0)
-        assert.equal(dict.b, 1)
-        assert.equal(dict.c, 2)
+        assert.equal(dict.a, 0);
+        assert.equal(dict.b, 1);
+        assert.equal(dict.c, 2);
     });
 });
 
 describe('ObjectManipulation functions', () => {
     it('should remove keys in a flat object', () => {
         let dict = {
-            "a": 0,
-            "b": 1,
-            "c": 2
+            a: 0,
+            b: 1,
+            c: 2,
         };
         let keyMap = {
-            "a": "A"
+            a: 'A',
         };
-        let rv = dropKeys(dict, ["b", "c"]);
+        let rv = dropKeys(dict, ['b', 'c']);
         assert.equal(rv.a, 0);
         assert.equal(rv.b, undefined);
         assert.equal(rv.c, undefined);
         // old dict stays the same
-        assert.equal(dict.a, 0)
-        assert.equal(dict.b, 1)
-        assert.equal(dict.c, 2)
+        assert.equal(dict.a, 0);
+        assert.equal(dict.b, 1);
+        assert.equal(dict.c, 2);
     });
 });
diff --git a/src/shared/lib/ObjectManipulation.ts b/src/shared/lib/ObjectManipulation.ts
index 8b67ac17bd8..76e245d6db9 100644
--- a/src/shared/lib/ObjectManipulation.ts
+++ b/src/shared/lib/ObjectManipulation.ts
@@ -4,26 +4,34 @@ import { reduce } from 'lodash';
 /*
  * Rename keys in flat dictionary. Keep old keys if not in keyMap.
  */
-export function renameKeys(dict:any, keyMap:{[key:string]:string}) {
-    return reduce(dict, (newDict:any, val:any, oldKey:string) => {
-        const newKey = keyMap[oldKey];
-        if (newKey) {
-            newDict[newKey] = val;
-        } else {
-            newDict[oldKey] = val;
-        }
-        return newDict;
-    }, {});
+export function renameKeys(dict: any, keyMap: { [key: string]: string }) {
+    return reduce(
+        dict,
+        (newDict: any, val: any, oldKey: string) => {
+            const newKey = keyMap[oldKey];
+            if (newKey) {
+                newDict[newKey] = val;
+            } else {
+                newDict[oldKey] = val;
+            }
+            return newDict;
+        },
+        {}
+    );
 }
 
 /*
  * Return new dict w/o given keys (only works on flat dicts)
  */
-export function dropKeys<T>(dict:T, keys:(keyof T)[]):T {
-    return reduce(dict, (newDict:any, val:any, key:any) => {
-        if (keys.indexOf(key) === -1) {
-            newDict[key] = val;
-        }
-        return newDict;
-    }, {});
-}
\ No newline at end of file
+export function dropKeys<T>(dict: T, keys: (keyof T)[]): T {
+    return reduce(
+        dict,
+        (newDict: any, val: any, key: any) => {
+            if (keys.indexOf(key) === -1) {
+                newDict[key] = val;
+            }
+            return newDict;
+        },
+        {}
+    );
+}
diff --git a/src/shared/lib/OncoKbUtils.ts b/src/shared/lib/OncoKbUtils.ts
index d189a0c27a6..0625d4e27ad 100644
--- a/src/shared/lib/OncoKbUtils.ts
+++ b/src/shared/lib/OncoKbUtils.ts
@@ -10,14 +10,15 @@ import {
     generateQueryVariant as generateGenericQueryVariant,
     generatePartialEvidenceQuery,
     LevelOfEvidence,
-    LEVELS
-} from "cbioportal-frontend-commons";
-import {Mutation} from "shared/api/generated/CBioPortalAPI";
-import {IOncoKbData} from "shared/model/OncoKB";
+    LEVELS,
+} from 'cbioportal-frontend-commons';
+import { Mutation } from 'shared/api/generated/CBioPortalAPI';
+import { IOncoKbData } from 'shared/model/OncoKB';
 
-export function generateIdToIndicatorMap(data:IndicatorQueryResp[]): {[queryId:string]: IndicatorQueryResp}
-{
-    const map:{[queryId:string]: IndicatorQueryResp} = {};
+export function generateIdToIndicatorMap(
+    data: IndicatorQueryResp[]
+): { [queryId: string]: IndicatorQueryResp } {
+    const map: { [queryId: string]: IndicatorQueryResp } = {};
 
     _.each(data, function(indicator) {
         map[indicator.query.id] = indicator;
@@ -26,29 +27,37 @@ export function generateIdToIndicatorMap(data:IndicatorQueryResp[]): {[queryId:s
     return map;
 }
 
-export function generateEvidenceQuery(queryVariants:Query[], evidenceTypes?:string): EvidenceQueries
-{
+export function generateEvidenceQuery(
+    queryVariants: Query[],
+    evidenceTypes?: string
+): EvidenceQueries {
     return {
         ...generatePartialEvidenceQuery(evidenceTypes),
-        queries: queryVariants
+        queries: queryVariants,
     } as EvidenceQueries;
 }
 
-export function generateQueryVariant(entrezGeneId:number,
-                                     tumorType:string | null,
-                                     alteration?:string,
-                                     mutationType?:string,
-                                     proteinPosStart?:number,
-                                     proteinPosEnd?:number,
-                                     alterationType?:string): Query
-{
+export function generateQueryVariant(
+    entrezGeneId: number,
+    tumorType: string | null,
+    alteration?: string,
+    mutationType?: string,
+    proteinPosStart?: number,
+    proteinPosEnd?: number,
+    alterationType?: string
+): Query {
     return generateGenericQueryVariant(
-        entrezGeneId, tumorType, alteration, mutationType, proteinPosStart, proteinPosEnd, alterationType
+        entrezGeneId,
+        tumorType,
+        alteration,
+        mutationType,
+        proteinPosStart,
+        proteinPosEnd,
+        alterationType
     ) as Query;
 }
 
-export function initEvidence()
-{
+export function initEvidence() {
     return {
         id: '',
         gene: {},
@@ -57,46 +66,54 @@ export function initEvidence()
         progImp: [],
         treatments: {
             sensitivity: [],
-            resistance: []
+            resistance: [],
         }, //separated by level type
         trials: [],
         oncogenic: '',
         oncogenicRefs: [],
         mutationEffect: {},
         mutationEffectRefs: [],
-        summary: ''
+        summary: '',
     };
 }
 
-export function getEvidenceQuery(mutation: Mutation, oncoKbData: IOncoKbData): Query|undefined
-{
+export function getEvidenceQuery(
+    mutation: Mutation,
+    oncoKbData: IOncoKbData
+): Query | undefined {
     // return null in case sampleToTumorMap is null
-    return oncoKbData.uniqueSampleKeyToTumorType ? generateQueryVariant(mutation.gene.entrezGeneId,
-        oncoKbData.uniqueSampleKeyToTumorType[mutation.uniqueSampleKey],
-        mutation.proteinChange,
-        mutation.mutationType,
-        mutation.proteinPosStart,
-        mutation.proteinPosEnd
-    ) : undefined;
+    return oncoKbData.uniqueSampleKeyToTumorType
+        ? generateQueryVariant(
+              mutation.gene.entrezGeneId,
+              oncoKbData.uniqueSampleKeyToTumorType[mutation.uniqueSampleKey],
+              mutation.proteinChange,
+              mutation.mutationType,
+              mutation.proteinPosStart,
+              mutation.proteinPosEnd
+          )
+        : undefined;
 }
 
 export function defaultOncoKbIndicatorFilter(indicator: IndicatorQueryResp) {
-    return indicator.oncogenic.toLowerCase().trim().includes("oncogenic");
+    return indicator.oncogenic
+        .toLowerCase()
+        .trim()
+        .includes('oncogenic');
 }
 
-export function processEvidence(evidences:EvidenceQueryRes[]) {
-    var result:any = {}; //id based.
+export function processEvidence(evidences: EvidenceQueryRes[]) {
+    var result: any = {}; //id based.
     if (evidences && evidences.length > 0) {
         evidences.forEach(function(record) {
             var id = record.query.id;
-            let datum:any = initEvidence(); // TODO define an extended evidence model?
-            var sensitivityTreatments:any = [];
-            var resistanceTreatments:any = [];
+            let datum: any = initEvidence(); // TODO define an extended evidence model?
+            var sensitivityTreatments: any = [];
+            var resistanceTreatments: any = [];
 
             let evidenceArr: Evidence[] = [];
             evidenceArr = evidenceArr.concat(record.evidences);
 
-            evidenceArr.forEach(function(evidence:any) {
+            evidenceArr.forEach(function(evidence: any) {
                 var description = '';
                 if (evidence.shortDescription) {
                     description = evidence.shortDescription;
@@ -112,7 +129,7 @@ export function processEvidence(evidences:EvidenceQueryRes[]) {
                         datum.oncogenicRefs = evidence.articles;
                     }
                 } else if (evidence.evidenceType === 'MUTATION_EFFECT') {
-                    let _datum:any = {};
+                    let _datum: any = {};
                     if (evidence.knownEffect) {
                         _datum.knownEffect = evidence.knownEffect;
                     }
@@ -125,16 +142,26 @@ export function processEvidence(evidences:EvidenceQueryRes[]) {
                     datum.alteration.push(_datum);
                 } else if (evidence.levelOfEvidence) {
                     //if evidence has level information, that means this is treatment evidence.
-                    if ([LevelOfEvidence.LEVEL_0].indexOf(evidence.levelOfEvidence) === -1) {
-                        var _treatment:any = {};
+                    if (
+                        [LevelOfEvidence.LEVEL_0].indexOf(
+                            evidence.levelOfEvidence
+                        ) === -1
+                    ) {
+                        var _treatment: any = {};
                         _treatment.alterations = evidence.alterations;
                         _treatment.articles = evidence.articles;
-                        _treatment.tumorType = getTumorTypeFromEvidence(evidence);
+                        _treatment.tumorType = getTumorTypeFromEvidence(
+                            evidence
+                        );
                         _treatment.level = evidence.levelOfEvidence;
                         _treatment.content = evidence.treatments;
                         _treatment.description = description || '';
 
-                        if (LEVELS.sensitivity.indexOf(getLevel(evidence.levelOfEvidence)) !== -1) {
+                        if (
+                            LEVELS.sensitivity.indexOf(
+                                getLevel(evidence.levelOfEvidence)
+                            ) !== -1
+                        ) {
                             sensitivityTreatments.push(_treatment);
                         } else {
                             resistanceTreatments.push(_treatment);
@@ -159,23 +186,28 @@ export function processEvidence(evidences:EvidenceQueryRes[]) {
     return result;
 }
 
-export function getTumorTypeFromEvidence(evidence:any) {
-    var tumorType = _.isObject(evidence.tumorType) ? evidence.tumorType.name : (evidence.subtype || evidence.cancerType);
+export function getTumorTypeFromEvidence(evidence: any) {
+    var tumorType = _.isObject(evidence.tumorType)
+        ? evidence.tumorType.name
+        : evidence.subtype || evidence.cancerType;
     var oncoTreeTumorType = '';
 
     if (_.isObject(evidence.oncoTreeType)) {
-        oncoTreeTumorType = evidence.oncoTreeType.name ? evidence.oncoTreeType.name :
-            (evidence.oncoTreeType.mainType ? evidence.oncoTreeType.mainType.name : '');
+        oncoTreeTumorType = evidence.oncoTreeType.name
+            ? evidence.oncoTreeType.name
+            : evidence.oncoTreeType.mainType
+            ? evidence.oncoTreeType.mainType.name
+            : '';
     }
 
-    if(oncoTreeTumorType) {
+    if (oncoTreeTumorType) {
         tumorType = oncoTreeTumorType;
     }
 
     return tumorType;
 }
 
-function getLevel(level:string) {
+function getLevel(level: string) {
     if (level) {
         var _level = level.match(/LEVEL_(R?\d[AB]?)/);
         if (_level instanceof Array && _level.length >= 2) {
@@ -184,6 +216,6 @@ function getLevel(level:string) {
             return level;
         }
     } else {
-        return "";
+        return '';
     }
 }
diff --git a/src/shared/lib/PdbUtils.spec.ts b/src/shared/lib/PdbUtils.spec.ts
index 32da90496c4..590de130b44 100644
--- a/src/shared/lib/PdbUtils.spec.ts
+++ b/src/shared/lib/PdbUtils.spec.ts
@@ -1,69 +1,72 @@
 import { assert } from 'chai';
-import {mergeAlignments} from './PdbUtils';
-import {initPdbAlignment} from "test/PdbMockUtils";
-import {IPdbChain} from "shared/model/Pdb";
-import {Alignment} from "cbioportal-frontend-commons";
+import { mergeAlignments } from './PdbUtils';
+import { initPdbAlignment } from 'test/PdbMockUtils';
+import { IPdbChain } from 'shared/model/Pdb';
+import { Alignment } from 'cbioportal-frontend-commons';
 
 describe('PdbUtils', () => {
     it('merges alignments properly', () => {
         let alignments: Alignment[];
-        let chain: IPdbChain|undefined;
+        let chain: IPdbChain | undefined;
 
         // overlapping, ordered
         alignments = [
-            initPdbAlignment("ABCDEFG", 6),
-            initPdbAlignment("EFGXYZ", 10),
+            initPdbAlignment('ABCDEFG', 6),
+            initPdbAlignment('EFGXYZ', 10),
         ];
 
         chain = mergeAlignments(alignments);
-        assert.equal(chain && chain.alignment, "ABCDEFGXYZ");
+        assert.equal(chain && chain.alignment, 'ABCDEFGXYZ');
         assert.equal(chain && chain.uniprotStart, 6);
         assert.equal(chain && chain.uniprotEnd, 15);
 
         // overlapping, reverse ordered
         alignments = [
-            initPdbAlignment("EFGXYZ", 10),
-            initPdbAlignment("ABCDEFG", 6)
+            initPdbAlignment('EFGXYZ', 10),
+            initPdbAlignment('ABCDEFG', 6),
         ];
 
         chain = mergeAlignments(alignments);
-        assert.equal(chain && chain.alignment, "ABCDEFGXYZ");
+        assert.equal(chain && chain.alignment, 'ABCDEFGXYZ');
         assert.equal(chain && chain.uniprotStart, 6);
         assert.equal(chain && chain.uniprotEnd, 15);
 
         // gap, ordered
         alignments = [
-            initPdbAlignment("Portal", 2),
-            initPdbAlignment("Rocks", 11)
+            initPdbAlignment('Portal', 2),
+            initPdbAlignment('Rocks', 11),
         ];
 
         chain = mergeAlignments(alignments);
-        assert.equal(chain && chain.alignment, "Portal***Rocks");
+        assert.equal(chain && chain.alignment, 'Portal***Rocks');
         assert.equal(chain && chain.uniprotStart, 2);
         assert.equal(chain && chain.uniprotEnd, 15);
 
         // gap, reverse ordered
         alignments = [
-            initPdbAlignment("Rocks", 11),
-            initPdbAlignment("Portal", 2)
+            initPdbAlignment('Rocks', 11),
+            initPdbAlignment('Portal', 2),
         ];
 
         chain = mergeAlignments(alignments);
-        assert.equal(chain && chain.alignment, "Portal***Rocks");
+        assert.equal(chain && chain.alignment, 'Portal***Rocks');
         assert.equal(chain && chain.uniprotStart, 2);
         assert.equal(chain && chain.uniprotEnd, 15);
 
         // gap, reverse ordered
         alignments = [
-            initPdbAlignment("ThisIsTheEnd", 33),
-            initPdbAlignment("Random", 2),
-            initPdbAlignment("StarryNight", 22),
-            initPdbAlignment("RockStar", 18),
-            initPdbAlignment("WhatTheRock", 11)
+            initPdbAlignment('ThisIsTheEnd', 33),
+            initPdbAlignment('Random', 2),
+            initPdbAlignment('StarryNight', 22),
+            initPdbAlignment('RockStar', 18),
+            initPdbAlignment('WhatTheRock', 11),
         ];
 
         chain = mergeAlignments(alignments);
-        assert.equal(chain && chain.alignment, "Random***WhatTheRockStarryNightThisIsTheEnd");
+        assert.equal(
+            chain && chain.alignment,
+            'Random***WhatTheRockStarryNightThisIsTheEnd'
+        );
         assert.equal(chain && chain.uniprotStart, 2);
         assert.equal(chain && chain.uniprotEnd, 44);
     });
diff --git a/src/shared/lib/PdbUtils.ts b/src/shared/lib/PdbUtils.ts
index c7e3f8c1831..78511bb7e74 100644
--- a/src/shared/lib/PdbUtils.ts
+++ b/src/shared/lib/PdbUtils.ts
@@ -1,32 +1,35 @@
 import * as _ from 'lodash';
-import {Alignment, PdbHeader} from "cbioportal-frontend-commons";
+import { Alignment, PdbHeader } from 'cbioportal-frontend-commons';
 import {
-    IPdbPositionRange, IPdbChain, PdbAlignmentIndex,
-    ALIGNMENT_GAP, ALIGNMENT_MINUS, ALIGNMENT_PLUS, ALIGNMENT_SPACE,
-} from "shared/model/Pdb";
+    IPdbPositionRange,
+    IPdbChain,
+    PdbAlignmentIndex,
+    ALIGNMENT_GAP,
+    ALIGNMENT_MINUS,
+    ALIGNMENT_PLUS,
+    ALIGNMENT_SPACE,
+} from 'shared/model/Pdb';
 
 // TODO temporary workaround for pdb structures not well supported by 3Dmol.js
-export const PDB_IGNORELIST = [
-    '5xzc'
-];
+export const PDB_IGNORELIST = ['5xzc'];
 
 /**
  * Generates a pdb info summary for the given pdb header and the chain id.
  */
-export function generatePdbInfoSummary(pdbHeader:PdbHeader, chainId: string)
-{
+export function generatePdbInfoSummary(pdbHeader: PdbHeader, chainId: string) {
     const summary: {
-        pdbInfo: string,
-        moleculeInfo?: string
+        pdbInfo: string;
+        moleculeInfo?: string;
     } = {
-        pdbInfo: pdbHeader.title
+        pdbInfo: pdbHeader.title,
     };
 
     // get chain specific molecule info
-    _.find(pdbHeader.compound, (mol:any) => {
-        if (mol.molecule &&
-            _.indexOf(mol.chain, chainId.toLowerCase()) !== -1)
-        {
+    _.find(pdbHeader.compound, (mol: any) => {
+        if (
+            mol.molecule &&
+            _.indexOf(mol.chain, chainId.toLowerCase()) !== -1
+        ) {
             // chain is associated with this mol,
             // get the organism info from the source
             summary.moleculeInfo = mol.molecule;
@@ -37,17 +40,17 @@ export function generatePdbInfoSummary(pdbHeader:PdbHeader, chainId: string)
     return summary;
 }
 
-export function indexPdbAlignments(alignments: Alignment[]): PdbAlignmentIndex
-{
+export function indexPdbAlignments(alignments: Alignment[]): PdbAlignmentIndex {
     return groupAlignmentsByPdbIdAndChain(alignments);
 }
 
-export function mergeIndexedPdbAlignments(indexedPdbData: PdbAlignmentIndex): IPdbChain[]
-{
+export function mergeIndexedPdbAlignments(
+    indexedPdbData: PdbAlignmentIndex
+): IPdbChain[] {
     const chains: IPdbChain[] = [];
 
     // generate chains
-    _.each(indexedPdbData, (map: {[chainId: string]: Alignment[]}) => {
+    _.each(indexedPdbData, (map: { [chainId: string]: Alignment[] }) => {
         _.each(map, (chainAlignments: Alignment[]) => {
             const chain = mergeAlignments(chainAlignments);
 
@@ -60,8 +63,7 @@ export function mergeIndexedPdbAlignments(indexedPdbData: PdbAlignmentIndex): IP
     return chains;
 }
 
-function groupAlignmentsByPdbIdAndChain(alignments: Alignment[])
-{
+function groupAlignmentsByPdbIdAndChain(alignments: Alignment[]) {
     const groupedAlignments: PdbAlignmentIndex = {};
 
     alignments.forEach((alignment: Alignment) => {
@@ -83,21 +85,21 @@ function groupAlignmentsByPdbIdAndChain(alignments: Alignment[])
  * Assuming that all the provided alignments have the same pdb id and chain,
  * merges multiple alignments into one.
  */
-export function mergeAlignments(alignments: Alignment[]): IPdbChain|undefined
-{
-    let mergedAlignment = "";
+export function mergeAlignments(
+    alignments: Alignment[]
+): IPdbChain | undefined {
+    let mergedAlignment = '';
     let start: number;
 
     if (alignments.length > 0) {
         // start with the first alignment
         start = alignments[0].seqFrom;
-    }
-    else {
+    } else {
         return undefined;
     }
 
     alignments.forEach((alignment: Alignment) => {
-        const alignmentStr = generateAlignmentString(alignment) || "";
+        const alignmentStr = generateAlignmentString(alignment) || '';
         const diff = Math.abs(alignment.seqFrom - start);
 
         if (alignment.seqFrom < start) {
@@ -105,24 +107,35 @@ export function mergeAlignments(alignments: Alignment[]): IPdbChain|undefined
 
             // overlap: we need to append non-overlapping segment of mergedAlignment to the current alignment
             if (alignmentStr.length >= diff) {
-                mergedAlignment = alignmentStr + mergedAlignment.substr(gapOrOverlap);
+                mergedAlignment =
+                    alignmentStr + mergedAlignment.substr(gapOrOverlap);
             }
             // gap: we need to add some gap before appending mergedAlignment
             else {
-                mergedAlignment = alignmentStr + alignmentGap(gapOrOverlap) + mergedAlignment;
+                mergedAlignment =
+                    alignmentStr + alignmentGap(gapOrOverlap) + mergedAlignment;
             }
-        }
-        else if (alignment.seqFrom >= start) {
+        } else if (alignment.seqFrom >= start) {
             const gapOrOverlap = Math.abs(mergedAlignment.length - diff);
 
             // overlap: we need to "insert" current alignment into merged alignment
             if (mergedAlignment.length >= diff) {
-                mergedAlignment = mergedAlignment.substr(0, mergedAlignment.length - gapOrOverlap) + alignmentStr +
-                    mergedAlignment.substr(mergedAlignment.length - gapOrOverlap + alignmentStr.length);
+                mergedAlignment =
+                    mergedAlignment.substr(
+                        0,
+                        mergedAlignment.length - gapOrOverlap
+                    ) +
+                    alignmentStr +
+                    mergedAlignment.substr(
+                        mergedAlignment.length -
+                            gapOrOverlap +
+                            alignmentStr.length
+                    );
             }
             // gap: we need to add some gap before appending current alignment
             else {
-                mergedAlignment = mergedAlignment + alignmentGap(gapOrOverlap) + alignmentStr;
+                mergedAlignment =
+                    mergedAlignment + alignmentGap(gapOrOverlap) + alignmentStr;
             }
         }
 
@@ -137,12 +150,11 @@ export function mergeAlignments(alignments: Alignment[]): IPdbChain|undefined
         uniprotEnd: start + mergedAlignment.length - 1,
         alignment: mergedAlignment,
         identityPerc: calcIdentityPerc(mergedAlignment),
-        identity: calcIdentity(mergedAlignment)
+        identity: calcIdentity(mergedAlignment),
     };
 }
 
-function alignmentGap(length: number)
-{
+function alignmentGap(length: number) {
     const gap: string[] = [];
 
     // add gap characters (character count = distance)
@@ -150,38 +162,34 @@ function alignmentGap(length: number)
         gap.push(ALIGNMENT_GAP);
     }
 
-    return gap.join("");
+    return gap.join('');
 }
 
-export function generateAlignmentString(alignment: Alignment): string|undefined
-{
-    let alignmentStr: string|undefined;
+export function generateAlignmentString(
+    alignment: Alignment
+): string | undefined {
+    let alignmentStr: string | undefined;
 
     // process 3 alignment strings and create a visualization string
     const midline = alignment.midlineAlign;
     const uniprot = alignment.seqAlign;
     const pdb = alignment.pdbAlign;
 
-    if (midline.length === uniprot.length &&
-        midline.length === pdb.length)
-    {
+    if (midline.length === uniprot.length && midline.length === pdb.length) {
         const stringBuilder = [];
 
-        for (let i = 0; i < midline.length; i++)
-        {
+        for (let i = 0; i < midline.length; i++) {
             // do not append anything if there is a gap in uniprot alignment
-            if (uniprot[i] !== '-')
-            {
+            if (uniprot[i] !== '-') {
                 if (pdb[i] === '-') {
                     stringBuilder.push('-');
-                }
-                else {
+                } else {
                     stringBuilder.push(midline[i]);
                 }
             }
         }
 
-        alignmentStr = stringBuilder.join("");
+        alignmentStr = stringBuilder.join('');
     }
 
     return alignmentStr;
@@ -191,30 +199,28 @@ export function generateAlignmentString(alignment: Alignment): string|undefined
  * Calculates the identity percentage of the given alignment string
  * based on mismatch ratio.
  */
-function calcIdentityPerc(alignment: string): number
-{
+function calcIdentityPerc(alignment: string): number {
     let gap = 0;
     let mismatch = 0;
 
-    for (let i = 0; i < alignment.length; i++)
-    {
+    for (let i = 0; i < alignment.length; i++) {
         const symbol = alignment[i];
 
         if (symbol === ALIGNMENT_GAP) {
             // increment gap count (gaps excluded from ratio calculation)
             gap++;
-        }
-        else if (symbol === ALIGNMENT_MINUS ||
+        } else if (
+            symbol === ALIGNMENT_MINUS ||
             symbol === ALIGNMENT_PLUS ||
-            symbol === ALIGNMENT_SPACE)
-        {
+            symbol === ALIGNMENT_SPACE
+        ) {
             // any special symbol other than a gap is considered as a mismatch
             // TODO is it better to assign a different weight for each symbol?
             mismatch++;
         }
     }
 
-    return 1.0 - (mismatch / (alignment.length - gap));
+    return 1.0 - mismatch / (alignment.length - gap);
 }
 
 /**
@@ -222,14 +228,12 @@ function calcIdentityPerc(alignment: string): number
  * the given alignment string.
  *
  */
-function calcIdentity(alignment: string)
-{
+function calcIdentity(alignment: string) {
     alignment = alignment.toLowerCase();
 
     let match = 0;
 
-    for (let i = 0; i < alignment.length; i++)
-    {
+    for (let i = 0; i < alignment.length; i++) {
         if (alignment[i].match(/[a-z]/)) {
             match++;
         }
@@ -243,10 +247,12 @@ function calcIdentity(alignment: string)
  * This is for sorting purposes, and always returns an array of size 4.
  * If invert is true, then A will have a greater value than Z.
  */
-export function calcPdbIdNumericalValue(pdbId: string, invert?: boolean): number[]
-{
+export function calcPdbIdNumericalValue(
+    pdbId: string,
+    invert?: boolean
+): number[] {
     const values = [0, 0, 0, 0];
-    const coeff = invert ? -1: 1;
+    const coeff = invert ? -1 : 1;
 
     // assuming pdb id is no longer than 4 characters
     for (let i = 0; i < pdbId.length || i < 5; i++) {
diff --git a/src/shared/lib/PromisePlus.ts b/src/shared/lib/PromisePlus.ts
index acbe7ad04a0..753babcd7b4 100644
--- a/src/shared/lib/PromisePlus.ts
+++ b/src/shared/lib/PromisePlus.ts
@@ -1,42 +1,42 @@
-import {action, computed, observable, runInAction} from "mobx";
+import { action, computed, observable, runInAction } from 'mobx';
 
-type PromisePlusStatus = "complete" | "pending" | "error"
+type PromisePlusStatus = 'complete' | 'pending' | 'error';
 
 export default class PromisePlus<T> {
-    @observable private _status:PromisePlusStatus;
-    @observable private _result:T|undefined;
-    @observable private _error:any;
+    @observable private _status: PromisePlusStatus;
+    @observable private _result: T | undefined;
+    @observable private _error: any;
 
-    @computed public get status():PromisePlusStatus {
+    @computed public get status(): PromisePlusStatus {
         return this._status;
     }
 
-    @computed public get result():T|undefined {
+    @computed public get result(): T | undefined {
         return this._result;
     }
 
-    @computed public get error():any {
+    @computed public get error(): any {
         return this._error;
     }
 
-    @computed public get promise():Promise<T> {
+    @computed public get promise(): Promise<T> {
         return this._promise;
     }
 
-    constructor(private _promise:Promise<T>) {
-        runInAction(()=>{
-            this._status = "pending";
+    constructor(private _promise: Promise<T>) {
+        runInAction(() => {
+            this._status = 'pending';
 
             _promise.then(
-                action((result:T)=>{
-                    this._status = "complete";
+                action((result: T) => {
+                    this._status = 'complete';
                     this._result = result;
                 }),
-                action((reason:any)=>{
-                    this._status = "error";
+                action((reason: any) => {
+                    this._status = 'error';
                     this._error = reason;
                 })
             );
         });
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/lib/QuerySession.ts b/src/shared/lib/QuerySession.ts
index 42ddd3e71a5..d34d0f1d70d 100644
--- a/src/shared/lib/QuerySession.ts
+++ b/src/shared/lib/QuerySession.ts
@@ -1,5 +1,8 @@
-import {GeneticTrackDatum, IGeneHeatmapTrackDatum} from "../components/oncoprint/Oncoprint";
-import {SingleGeneQuery} from "./oql/oql-parser";
+import {
+    GeneticTrackDatum,
+    IGeneHeatmapTrackDatum,
+} from '../components/oncoprint/Oncoprint';
+import { SingleGeneQuery } from './oql/oql-parser';
 export type OncoprintSampleGeneticTrackData = {
     altered_sample_uids: string[];
     altered_samples: string[];
@@ -25,18 +28,18 @@ export type OncoprintPatientGeneticTrackData = {
     unaltered_patients: string[];
 };
 type OncoprintClinicalDatum = {
-    attr_id:string;
-    attr_val:string|{[attr_val:string]:number};
-    attr_val_counts:{[attr_val:string]:number};
-    sample:string;
-    study_id:string;
-    uid:string;
+    attr_id: string;
+    attr_val: string | { [attr_val: string]: number };
+    attr_val_counts: { [attr_val: string]: number };
+    sample: string;
+    study_id: string;
+    uid: string;
 };
 export type OncoprintSampleClinicalDatum = OncoprintClinicalDatum & {
-    sample:string;
+    sample: string;
 };
 export type OncoprintPatientClinicalDatum = OncoprintClinicalDatum & {
-    patient:string;
+    patient: string;
 };
 
 export type OncoprintHeatmapTrackData = {
@@ -56,35 +59,49 @@ export type KnownMutationSettings = {
     recognize_hotspot: boolean;
     recognize_oncokb_oncogenic: boolean;
     recognize_driver_filter: boolean;
-    recognize_driver_tiers: {[driver_tier:string]:boolean};
+    recognize_driver_tiers: { [driver_tier: string]: boolean };
 };
 
 export type QuerySession = {
-    getCancerStudyIds:()=>string[];
-    getGeneticProfileIds:()=>string[];
-    getZScoreThreshold:()=>number;
-    getRppaScoreThreshold:()=>number;
-    getCaseSetId:()=>string;
-    getSampleIds:()=>string[];
-    getOQLQuery:()=>string;
-    getGenesetQuery:()=>string;
-    getOncoprintSampleGenomicEventData:(use_session_filters?:boolean)=>Promise<OncoprintSampleGeneticTrackData[]>;
-    getOncoprintPatientGenomicEventData:(use_session_filters?:boolean)=>Promise<OncoprintPatientGeneticTrackData[]>;
-    getSampleClinicalData:(attribute_ids:string[])=>Promise<OncoprintSampleClinicalDatum[]>;
-    getPatientClinicalData:(attribute_ids:string[])=>Promise<OncoprintPatientClinicalDatum[]>;
-    getSampleHeatmapData:(genetic_profile_id:string, genes:string[])=>Promise<OncoprintHeatmapTrackData[]>;
-    getPatientHeatmapData:(genetic_profile_id:string, genes:string[])=>Promise<OncoprintHeatmapTrackData[]>;
-    getAlteredSampleUIDs:()=>Promise<string[]>,
-    getAlteredPatientUIDs:()=>Promise<string[]>,
-    getUnalteredSampleUIDs:()=>Promise<string[]>,
-    getUnalteredPatientUIDs:()=>Promise<string[]>,
-    getKnownMutationSettings:()=>KnownMutationSettings,
-    setKnownMutationSettings:(settings:KnownMutationSettings)=>void,
-    getUIDToCaseMap:()=>Promise<{[uid:string]:string}>,
-    getSampleUIDs:()=>Promise<string[]>,
-    getPatientUIDs:()=>Promise<string[]>,
-    getSampleSetName:()=>string;
-    getSequencedSamples:()=>Promise<string[]>;
-    getSequencedPatients:()=>Promise<string[]>;
-    getStudySampleMap:()=>Object;
-};
\ No newline at end of file
+    getCancerStudyIds: () => string[];
+    getGeneticProfileIds: () => string[];
+    getZScoreThreshold: () => number;
+    getRppaScoreThreshold: () => number;
+    getCaseSetId: () => string;
+    getSampleIds: () => string[];
+    getOQLQuery: () => string;
+    getGenesetQuery: () => string;
+    getOncoprintSampleGenomicEventData: (
+        use_session_filters?: boolean
+    ) => Promise<OncoprintSampleGeneticTrackData[]>;
+    getOncoprintPatientGenomicEventData: (
+        use_session_filters?: boolean
+    ) => Promise<OncoprintPatientGeneticTrackData[]>;
+    getSampleClinicalData: (
+        attribute_ids: string[]
+    ) => Promise<OncoprintSampleClinicalDatum[]>;
+    getPatientClinicalData: (
+        attribute_ids: string[]
+    ) => Promise<OncoprintPatientClinicalDatum[]>;
+    getSampleHeatmapData: (
+        genetic_profile_id: string,
+        genes: string[]
+    ) => Promise<OncoprintHeatmapTrackData[]>;
+    getPatientHeatmapData: (
+        genetic_profile_id: string,
+        genes: string[]
+    ) => Promise<OncoprintHeatmapTrackData[]>;
+    getAlteredSampleUIDs: () => Promise<string[]>;
+    getAlteredPatientUIDs: () => Promise<string[]>;
+    getUnalteredSampleUIDs: () => Promise<string[]>;
+    getUnalteredPatientUIDs: () => Promise<string[]>;
+    getKnownMutationSettings: () => KnownMutationSettings;
+    setKnownMutationSettings: (settings: KnownMutationSettings) => void;
+    getUIDToCaseMap: () => Promise<{ [uid: string]: string }>;
+    getSampleUIDs: () => Promise<string[]>;
+    getPatientUIDs: () => Promise<string[]>;
+    getSampleSetName: () => string;
+    getSequencedSamples: () => Promise<string[]>;
+    getSequencedPatients: () => Promise<string[]>;
+    getStudySampleMap: () => Object;
+};
diff --git a/src/shared/lib/SampleGeneCache.ts b/src/shared/lib/SampleGeneCache.ts
index 94f16029ade..cd9a7ad08cf 100644
--- a/src/shared/lib/SampleGeneCache.ts
+++ b/src/shared/lib/SampleGeneCache.ts
@@ -1,12 +1,21 @@
-import LazyMobXCache from "./LazyMobXCache";
-export type SampleAndGene = {sampleId:string, entrezGeneId:number};
+import LazyMobXCache from './LazyMobXCache';
+export type SampleAndGene = { sampleId: string; entrezGeneId: number };
 
-export default class SampleGeneCache<T extends SampleAndGene> extends LazyMobXCache<T,SampleAndGene> {
-    constructor(fetch:(queries:SampleAndGene[], ...staticDependencies:any[])=>Promise<T[]>,
-                ...staticDependencies:any[]) {
-        super(q=>q.sampleId+","+q.entrezGeneId,
-            d=>d.sampleId+","+d.entrezGeneId,
+export default class SampleGeneCache<
+    T extends SampleAndGene
+> extends LazyMobXCache<T, SampleAndGene> {
+    constructor(
+        fetch: (
+            queries: SampleAndGene[],
+            ...staticDependencies: any[]
+        ) => Promise<T[]>,
+        ...staticDependencies: any[]
+    ) {
+        super(
+            q => q.sampleId + ',' + q.entrezGeneId,
+            d => d.sampleId + ',' + d.entrezGeneId,
             fetch,
-            ...staticDependencies);
+            ...staticDependencies
+        );
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/lib/Serializer.tsx b/src/shared/lib/Serializer.tsx
index dd964319c66..e56f16cda43 100644
--- a/src/shared/lib/Serializer.tsx
+++ b/src/shared/lib/Serializer.tsx
@@ -1,13 +1,16 @@
 import * as _ from 'lodash';
 
-export function serializeData(data: any[], autoGenerateHeader = false, delim = '\t')
-{
+export function serializeData(
+    data: any[],
+    autoGenerateHeader = false,
+    delim = '\t'
+) {
     const content: string[] = [];
 
     if (autoGenerateHeader) {
         // try to get the header from object keys in case no header provided
         // if contains header, assuming that the first element represents the header values
-        Object.keys(data[0]).forEach((col: any)=>content.push(col,delim));
+        Object.keys(data[0]).forEach((col: any) => content.push(col, delim));
 
         content.pop();
         content.push('\r\n');
diff --git a/src/shared/lib/SortUtils.spec.ts b/src/shared/lib/SortUtils.spec.ts
index 3d92eb3e893..fbd5acddca2 100644
--- a/src/shared/lib/SortUtils.spec.ts
+++ b/src/shared/lib/SortUtils.spec.ts
@@ -1,45 +1,44 @@
-import {assert} from 'chai';
-import {ClinicalAttribute} from "../api/generated/CBioPortalAPI";
-import {sortByClinicalAttributePriorityThenName} from "./SortUtils";
+import { assert } from 'chai';
+import { ClinicalAttribute } from '../api/generated/CBioPortalAPI';
+import { sortByClinicalAttributePriorityThenName } from './SortUtils';
 
 describe('SortUtils functions', () => {
     it('sortByClinicalAttributePriorityThenName', () => {
         const c1 = {
-            'clinicalAttributeId': 'test1',
-            'count': 1,
-            'datatype': 'NUMBER',
-            'description': '',
-            'displayName': 'name1',
-            'patientAttribute': true,
-            'priority': '1',
-            'studyId': 's1'
+            clinicalAttributeId: 'test1',
+            count: 1,
+            datatype: 'NUMBER',
+            description: '',
+            displayName: 'name1',
+            patientAttribute: true,
+            priority: '1',
+            studyId: 's1',
         } as ClinicalAttribute;
 
         const c2 = {
-            'clinicalAttributeId': 'test2',
-            'count': 21,
-            'datatype': 'NUMBER',
-            'description': '',
-            'displayName': 'name2',
-            'patientAttribute': true,
-            'priority': '2',
-            'studyId': 's1'
+            clinicalAttributeId: 'test2',
+            count: 21,
+            datatype: 'NUMBER',
+            description: '',
+            displayName: 'name2',
+            patientAttribute: true,
+            priority: '2',
+            studyId: 's1',
         } as ClinicalAttribute;
 
         const c3 = {
-            'clinicalAttributeId': 'test3',
-            'count': 21,
-            'datatype': 'NUMBER',
-            'description': '',
-            'displayName': 'name3',
-            'patientAttribute': true,
-            'priority': '2',
-            'studyId': 's1'
+            clinicalAttributeId: 'test3',
+            count: 21,
+            datatype: 'NUMBER',
+            description: '',
+            displayName: 'name3',
+            patientAttribute: true,
+            priority: '2',
+            studyId: 's1',
         } as ClinicalAttribute;
 
         assert.isTrue(sortByClinicalAttributePriorityThenName(c1, c2) > 0);
         assert.isTrue(sortByClinicalAttributePriorityThenName(c2, c3) < 0);
         assert.isTrue(sortByClinicalAttributePriorityThenName(c3, c3) === 0);
     });
-
 });
diff --git a/src/shared/lib/SortUtils.ts b/src/shared/lib/SortUtils.ts
index 68277b3a1a7..ef78012501a 100644
--- a/src/shared/lib/SortUtils.ts
+++ b/src/shared/lib/SortUtils.ts
@@ -1,11 +1,16 @@
-import {ClinicalAttribute} from "../api/generated/CBioPortalAPI";
+import { ClinicalAttribute } from '../api/generated/CBioPortalAPI';
 
-export function sortByClinicalAttributePriorityThenName(a: ClinicalAttribute, b: ClinicalAttribute): number {
+export function sortByClinicalAttributePriorityThenName(
+    a: ClinicalAttribute,
+    b: ClinicalAttribute
+): number {
     const _a = Number(a.priority) || 0;
     const _b = Number(b.priority) || 0;
     const priorityDiff = _b - _a;
     if (priorityDiff === 0) {
-        return (a.displayName === undefined ? "" : a.displayName).localeCompare(b.displayName);
+        return (a.displayName === undefined ? '' : a.displayName).localeCompare(
+            b.displayName
+        );
     }
     return priorityDiff;
-}
\ No newline at end of file
+}
diff --git a/src/shared/lib/SpecUtils.ts b/src/shared/lib/SpecUtils.ts
index a25e5bbb9d7..9adc8fb1ab6 100644
--- a/src/shared/lib/SpecUtils.ts
+++ b/src/shared/lib/SpecUtils.ts
@@ -1,12 +1,16 @@
-import {default as chai, expect} from "chai";
-import deepEqualInAnyOrder from "deep-equal-in-any-order";
+import { default as chai, expect } from 'chai';
+import deepEqualInAnyOrder from 'deep-equal-in-any-order';
 chai.use(deepEqualInAnyOrder);
 
-export function assertDeepEqualInAnyOrder(actual:any, expected:any, message?:string) {
+export function assertDeepEqualInAnyOrder(
+    actual: any,
+    expected: any,
+    message?: string
+) {
     try {
         (expect(actual).to.deep as any).equalInAnyOrder(expected);
     } catch (e) {
         e.message = `${message}: ${e.message}`;
         throw e;
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/lib/StoreUtils.spec.ts b/src/shared/lib/StoreUtils.spec.ts
index 4846b2c4fa1..9190786e909 100644
--- a/src/shared/lib/StoreUtils.spec.ts
+++ b/src/shared/lib/StoreUtils.spec.ts
@@ -1,20 +1,32 @@
 import {
-    fetchCosmicData, fetchOncoKbData, makeStudyToCancerTypeMap,
-    mergeMutationsIncludingUncalled, generateMutationIdByEvent, generateMutationIdByGeneAndProteinChangeAndEvent,
-    fetchCivicGenes, fetchCnaCivicGenes, fetchCivicVariants, findSamplesWithoutCancerTypeClinicalData,
-    fetchSamplesWithoutCancerTypeClinicalData, fetchStudiesForSamplesWithoutCancerTypeClinicalData,
+    fetchCosmicData,
+    fetchOncoKbData,
+    makeStudyToCancerTypeMap,
+    mergeMutationsIncludingUncalled,
+    generateMutationIdByEvent,
+    generateMutationIdByGeneAndProteinChangeAndEvent,
+    fetchCivicGenes,
+    fetchCnaCivicGenes,
+    fetchCivicVariants,
+    findSamplesWithoutCancerTypeClinicalData,
+    fetchSamplesWithoutCancerTypeClinicalData,
+    fetchStudiesForSamplesWithoutCancerTypeClinicalData,
     fetchGermlineConsentedSamples,
-    noGenePanelUsed
-} from "./StoreUtils";
+    noGenePanelUsed,
+} from './StoreUtils';
 import * as _ from 'lodash';
 import { assert } from 'chai';
 import sinon from 'sinon';
-import {MobxPromise} from "mobxpromise";
-import {CancerStudy, Mutation, ClinicalData, Sample} from "../api/generated/CBioPortalAPI";
-import {initMutation} from "test/MutationMockUtils";
+import { MobxPromise } from 'mobxpromise';
+import {
+    CancerStudy,
+    Mutation,
+    ClinicalData,
+    Sample,
+} from '../api/generated/CBioPortalAPI';
+import { initMutation } from 'test/MutationMockUtils';
 
 describe('StoreUtils', () => {
-
     let emptyMutationData: MobxPromise<Mutation[]>;
     let emptyUncalledMutationData: MobxPromise<Mutation[]>;
     let mutationDataWithNoKeyword: MobxPromise<Mutation[]>;
@@ -25,138 +37,150 @@ describe('StoreUtils', () => {
     let mutationDataWithBothMutationsAndFusions: MobxPromise<Mutation[]>;
 
     before(() => {
-        emptyMutationData =  {
+        emptyMutationData = {
             result: [],
             status: 'complete' as 'complete',
             peekStatus: 'complete',
             isPending: false,
             isError: false,
             isComplete: true,
-            error: undefined
+            error: undefined,
         };
 
-        mutationDataWithNoKeyword =  {
+        mutationDataWithNoKeyword = {
             result: [{}, {}] as Mutation[],
             status: 'complete' as 'complete',
             peekStatus: 'complete',
             isPending: false,
             isError: false,
             isComplete: true,
-            error: undefined
+            error: undefined,
         };
 
-        mutationDataWithKeywords =  {
-            result: [{keyword:"one"}] as Mutation[],
+        mutationDataWithKeywords = {
+            result: [{ keyword: 'one' }] as Mutation[],
             status: 'complete' as 'complete',
             peekStatus: 'complete',
             isPending: false,
             isError: false,
             isComplete: true,
-            error: undefined
+            error: undefined,
         };
 
-        emptyUncalledMutationData =  {
+        emptyUncalledMutationData = {
             result: [],
             status: 'complete' as 'complete',
             peekStatus: 'complete',
             isPending: false,
             isError: false,
             isComplete: true,
-            error: undefined
+            error: undefined,
         };
 
-
         const fusions: Mutation[] = [
-            initMutation({gene: { // fusion for ERG
-                hugoGeneSymbol: "ERG",
-                proteinChange: "TMPRSS2-ERG fusion"
-            }}),
-            initMutation({gene: { // same fusion for TMPRSS2
-                hugoGeneSymbol: "TMPRSS2",
-                proteinChange: "TMPRSS2-ERG fusion"
-            }}),
-            initMutation({gene: { // different fusion
-                hugoGeneSymbol: "FOXP1",
-                proteinChange: "FOXP1-intragenic"
-            }}),
+            initMutation({
+                gene: {
+                    // fusion for ERG
+                    hugoGeneSymbol: 'ERG',
+                    proteinChange: 'TMPRSS2-ERG fusion',
+                },
+            }),
+            initMutation({
+                gene: {
+                    // same fusion for TMPRSS2
+                    hugoGeneSymbol: 'TMPRSS2',
+                    proteinChange: 'TMPRSS2-ERG fusion',
+                },
+            }),
+            initMutation({
+                gene: {
+                    // different fusion
+                    hugoGeneSymbol: 'FOXP1',
+                    proteinChange: 'FOXP1-intragenic',
+                },
+            }),
         ];
 
         const mutations: Mutation[] = [
-            initMutation({ // mutation
+            initMutation({
+                // mutation
                 gene: {
-                    chromosome: "X",
-                    hugoGeneSymbol: "TP53",
+                    chromosome: 'X',
+                    hugoGeneSymbol: 'TP53',
                 },
-                proteinChange: "mutated",
+                proteinChange: 'mutated',
                 startPosition: 100,
                 endPosition: 100,
-                referenceAllele: "A",
-                variantAllele: "T"
+                referenceAllele: 'A',
+                variantAllele: 'T',
             }),
-            initMutation({ // another mutation with the same mutation event
+            initMutation({
+                // another mutation with the same mutation event
                 gene: {
-                    chromosome: "X",
-                    hugoGeneSymbol: "TP53"
+                    chromosome: 'X',
+                    hugoGeneSymbol: 'TP53',
                 },
-                proteinChange: "mutated",
+                proteinChange: 'mutated',
                 startPosition: 100,
                 endPosition: 100,
-                referenceAllele: "A",
-                variantAllele: "T"
+                referenceAllele: 'A',
+                variantAllele: 'T',
             }),
-            initMutation({ // mutation with different mutation event
+            initMutation({
+                // mutation with different mutation event
                 gene: {
-                    chromosome: "Y",
-                    hugoGeneSymbol: "PTEN"
+                    chromosome: 'Y',
+                    hugoGeneSymbol: 'PTEN',
                 },
-                proteinChange: "mutated",
+                proteinChange: 'mutated',
                 startPosition: 111,
                 endPosition: 112,
-                referenceAllele: "T",
-                variantAllele: "A"
+                referenceAllele: 'T',
+                variantAllele: 'A',
             }),
         ];
 
-        uncalledMutationDataWithNewEvent =  {
+        uncalledMutationDataWithNewEvent = {
             result: [
-                initMutation({ // mutation with different mutation event
+                initMutation({
+                    // mutation with different mutation event
                     gene: {
-                        chromosome: "17",
-                        hugoGeneSymbol: "BRCA1"
+                        chromosome: '17',
+                        hugoGeneSymbol: 'BRCA1',
                     },
-                    proteinChange: "mutated",
+                    proteinChange: 'mutated',
                     startPosition: 111,
                     endPosition: 112,
-                    referenceAllele: "T",
-                    variantAllele: "A"
-                })
+                    referenceAllele: 'T',
+                    variantAllele: 'A',
+                }),
             ],
             status: 'complete' as 'complete',
             peekStatus: 'complete',
             isPending: false,
             isError: false,
             isComplete: true,
-            error: undefined
+            error: undefined,
         };
 
-        mutationDataWithFusionsOnly =  {
+        mutationDataWithFusionsOnly = {
             result: fusions,
             status: 'complete' as 'complete',
             peekStatus: 'complete',
             isPending: false,
             isError: false,
             isComplete: true,
-            error: undefined
+            error: undefined,
         };
 
-        mutationDataWithMutationsOnly =  {
+        mutationDataWithMutationsOnly = {
             result: mutations,
             status: 'complete' as 'complete',
             peekStatus: 'complete',
             isPending: false,
             isError: false,
             isComplete: true,
-            error: undefined
+            error: undefined,
         };
 
         mutationDataWithBothMutationsAndFusions = {
@@ -166,51 +190,60 @@ describe('StoreUtils', () => {
             isPending: false,
             isError: false,
             isComplete: true,
-            error: undefined
+            error: undefined,
         };
     });
 
-    after(() => {
-
-    });
+    after(() => {});
 
     describe('fetchCosmicCount', () => {
-
-        it("won't fetch cosmic data if there are no mutations", (done) => {
+        it("won't fetch cosmic data if there are no mutations", done => {
             const fetchStub = sinon.stub();
             const internalClient = {
-                fetchCosmicCountsUsingPOST: fetchStub
+                fetchCosmicCountsUsingPOST: fetchStub,
             };
 
-            fetchCosmicData(emptyMutationData, emptyUncalledMutationData, internalClient as any).then((data: any) => {
+            fetchCosmicData(
+                emptyMutationData,
+                emptyUncalledMutationData,
+                internalClient as any
+            ).then((data: any) => {
                 assert.isUndefined(data);
                 assert.isFalse(fetchStub.called);
                 done();
             });
         });
 
-        it("won't fetch cosmic data if there ARE mutations, but none with keywords", (done) => {
+        it("won't fetch cosmic data if there ARE mutations, but none with keywords", done => {
             const fetchStub = sinon.stub();
             const internalClient = {
-                fetchCosmicCountsUsingPOST: fetchStub
+                fetchCosmicCountsUsingPOST: fetchStub,
             };
 
-            fetchCosmicData(mutationDataWithNoKeyword, emptyUncalledMutationData, internalClient as any).then((data: any) => {
+            fetchCosmicData(
+                mutationDataWithNoKeyword,
+                emptyUncalledMutationData,
+                internalClient as any
+            ).then((data: any) => {
                 assert.isUndefined(data);
                 assert.isFalse(fetchStub.called);
                 done();
             });
         });
 
-        it('will fetch cosmic data if there are mutations with keywords', (done) => {
+        it('will fetch cosmic data if there are mutations with keywords', done => {
             const fetchStub = sinon.stub();
             fetchStub.returns(Promise.resolve([]));
 
             const internalClient = {
-                fetchCosmicCountsUsingPOST: fetchStub
+                fetchCosmicCountsUsingPOST: fetchStub,
             };
 
-            fetchCosmicData(mutationDataWithKeywords, emptyUncalledMutationData, internalClient as any).then((data: any) => {
+            fetchCosmicData(
+                mutationDataWithKeywords,
+                emptyUncalledMutationData,
+                internalClient as any
+            ).then((data: any) => {
                 //assert.isUndefined(data);
                 assert.isTrue(fetchStub.called);
                 done();
@@ -218,92 +251,128 @@ describe('StoreUtils', () => {
         });
     });
 
-    describe('makeStudyToCancerTypeMap', ()=>{
-        let studies:CancerStudy[];
-        before(()=>{
+    describe('makeStudyToCancerTypeMap', () => {
+        let studies: CancerStudy[];
+        before(() => {
             studies = [];
             studies.push({
-                studyId: "0",
+                studyId: '0',
                 cancerType: {
-                    name: "ZERO"
-                }
+                    name: 'ZERO',
+                },
             } as CancerStudy);
             studies.push({
-                studyId: "1",
+                studyId: '1',
                 cancerType: {
-                    name: "ONE"
-                }
+                    name: 'ONE',
+                },
             } as CancerStudy);
             studies.push({
-                studyId: "2",
+                studyId: '2',
                 cancerType: {
-                    name: "TWO"
-                }
+                    name: 'TWO',
+                },
             } as CancerStudy);
             studies.push({
-                studyId: "3",
+                studyId: '3',
                 cancerType: {
-                    name: "three"
-                }
+                    name: 'three',
+                },
             } as CancerStudy);
         });
 
-        it('gives empty map if no studies', ()=>{
+        it('gives empty map if no studies', () => {
             assert.deepEqual(makeStudyToCancerTypeMap([]), {});
         });
-        it('handles one study properly', ()=>{
-            assert.deepEqual(makeStudyToCancerTypeMap([studies[0]]), { 0: "ZERO" });
+        it('handles one study properly', () => {
+            assert.deepEqual(makeStudyToCancerTypeMap([studies[0]]), {
+                0: 'ZERO',
+            });
         });
-        it('handles more than one study properly', ()=>{
-            assert.deepEqual(makeStudyToCancerTypeMap([studies[1], studies[2]]), { 1: "ONE", 2:"TWO" });
-            assert.deepEqual(makeStudyToCancerTypeMap([studies[2], studies[1], studies[3]]), { 1:"ONE", 2:"TWO", 3:"three" });
-            assert.deepEqual(makeStudyToCancerTypeMap(studies), { 0: "ZERO", 1:"ONE", 2:"TWO", 3:"three" });
+        it('handles more than one study properly', () => {
+            assert.deepEqual(
+                makeStudyToCancerTypeMap([studies[1], studies[2]]),
+                { 1: 'ONE', 2: 'TWO' }
+            );
+            assert.deepEqual(
+                makeStudyToCancerTypeMap([studies[2], studies[1], studies[3]]),
+                { 1: 'ONE', 2: 'TWO', 3: 'three' }
+            );
+            assert.deepEqual(makeStudyToCancerTypeMap(studies), {
+                0: 'ZERO',
+                1: 'ONE',
+                2: 'TWO',
+                3: 'three',
+            });
         });
     });
 
     describe('mergeMutationsIncludingUncalled', () => {
-        it("merges mutations properly when there is only fusion data", () => {
-            const mergedFusions = mergeMutationsIncludingUncalled(mutationDataWithFusionsOnly, emptyMutationData);
+        it('merges mutations properly when there is only fusion data', () => {
+            const mergedFusions = mergeMutationsIncludingUncalled(
+                mutationDataWithFusionsOnly,
+                emptyMutationData
+            );
 
             assert.equal(mergedFusions.length, 3);
         });
 
-        it("merges mutations properly when there is only mutation data", () => {
-            const mergedMutations = mergeMutationsIncludingUncalled(mutationDataWithMutationsOnly, emptyMutationData);
+        it('merges mutations properly when there is only mutation data', () => {
+            const mergedMutations = mergeMutationsIncludingUncalled(
+                mutationDataWithMutationsOnly,
+                emptyMutationData
+            );
 
             assert.equal(mergedMutations.length, 2);
 
-            const sortedMutations = _.sortBy(mergedMutations, "length");
+            const sortedMutations = _.sortBy(mergedMutations, 'length');
 
             assert.equal(sortedMutations[0].length, 1);
             assert.equal(sortedMutations[1].length, 2);
 
-            assert.equal(generateMutationIdByGeneAndProteinChangeAndEvent(sortedMutations[1][0]),
-                generateMutationIdByGeneAndProteinChangeAndEvent(sortedMutations[1][1]),
-                "mutation ids of merged mutations should be same");
-
-            assert.equal(generateMutationIdByEvent(sortedMutations[1][0]),
+            assert.equal(
+                generateMutationIdByGeneAndProteinChangeAndEvent(
+                    sortedMutations[1][0]
+                ),
+                generateMutationIdByGeneAndProteinChangeAndEvent(
+                    sortedMutations[1][1]
+                ),
+                'mutation ids of merged mutations should be same'
+            );
+
+            assert.equal(
+                generateMutationIdByEvent(sortedMutations[1][0]),
                 generateMutationIdByEvent(sortedMutations[1][1]),
-                "event based mutation ids of merged mutations should be same, too");
+                'event based mutation ids of merged mutations should be same, too'
+            );
         });
 
-        it("merges mutations properly when there are both mutation and fusion data ", () => {
-            const mergedMutations = mergeMutationsIncludingUncalled(mutationDataWithBothMutationsAndFusions, emptyMutationData);
+        it('merges mutations properly when there are both mutation and fusion data ', () => {
+            const mergedMutations = mergeMutationsIncludingUncalled(
+                mutationDataWithBothMutationsAndFusions,
+                emptyMutationData
+            );
 
             assert.equal(mergedMutations.length, 5);
         });
 
-        it("does not include new mutation events from the uncalled mutations, only mutation events already called in >=1 sample should be added", () => {
-            const mergedMutations = mergeMutationsIncludingUncalled(mutationDataWithBothMutationsAndFusions, uncalledMutationDataWithNewEvent);
+        it('does not include new mutation events from the uncalled mutations, only mutation events already called in >=1 sample should be added', () => {
+            const mergedMutations = mergeMutationsIncludingUncalled(
+                mutationDataWithBothMutationsAndFusions,
+                uncalledMutationDataWithNewEvent
+            );
 
             assert.equal(mergedMutations.length, 5);
         });
     });
 
     describe('fetchOncoKbData', () => {
-        it("won't fetch onkokb data if there are no mutations", (done) => {
+        it("won't fetch onkokb data if there are no mutations", done => {
             fetchOncoKbData({}, [], emptyMutationData).then((data: any) => {
-                assert.deepEqual(data, {uniqueSampleKeyToTumorType: {}, indicatorMap: {}});
+                assert.deepEqual(data, {
+                    uniqueSampleKeyToTumorType: {},
+                    indicatorMap: {},
+                });
                 done();
             });
         });
@@ -311,95 +380,120 @@ describe('StoreUtils', () => {
 
     describe('fetchGermlineConsentedSamples', () => {
         const studyIdsWithoutGermlineData: MobxPromise<string[]> = {
-            result: [
-                "study_with_no_germline_data"
-            ],
+            result: ['study_with_no_germline_data'],
             status: 'complete' as 'complete',
             peekStatus: 'complete',
             isPending: false,
             isError: false,
             isComplete: true,
-            error: undefined
+            error: undefined,
         };
 
         const studyIdsWithSomeGermlineData: MobxPromise<string[]> = {
-            result: [
-                "study_with_no_germline_data",
-                "mskimpact"
-            ],
+            result: ['study_with_no_germline_data', 'mskimpact'],
             status: 'complete' as 'complete',
             peekStatus: 'complete',
             isPending: false,
             isError: false,
             isComplete: true,
-            error: undefined
+            error: undefined,
         };
 
-        const studiesWithGermlineConsentedSamples = ["mskimpact"];
+        const studiesWithGermlineConsentedSamples = ['mskimpact'];
 
-
-        it("won't fetch germline consented samples for studies with no germline data", (done) => {
+        it("won't fetch germline consented samples for studies with no germline data", done => {
             const getAllSampleIdsInSampleListStub = sinon.stub();
             const client = {
                 getAllSampleIdsInSampleListUsingGET: getAllSampleIdsInSampleListStub,
             };
 
-            fetchGermlineConsentedSamples(studyIdsWithoutGermlineData, studiesWithGermlineConsentedSamples, client as any)
+            fetchGermlineConsentedSamples(
+                studyIdsWithoutGermlineData,
+                studiesWithGermlineConsentedSamples,
+                client as any
+            )
                 .then((data: any) => {
                     assert.deepEqual(data, []);
-                    assert.isTrue(getAllSampleIdsInSampleListStub.notCalled, "getAllSampleIdsInSample should NOT be called");
+                    assert.isTrue(
+                        getAllSampleIdsInSampleListStub.notCalled,
+                        'getAllSampleIdsInSample should NOT be called'
+                    );
                     done();
-                }).catch(done);
+                })
+                .catch(done);
         });
 
-        it("will fetch germline consented samples for only the studies with germline data", (done) => {
+        it('will fetch germline consented samples for only the studies with germline data', done => {
             const getAllSampleIdsInSampleListStub = sinon.stub();
-            getAllSampleIdsInSampleListStub.returns(Promise.resolve([
-                {
-                    sampleId: "mskimpact_sample_0",
-                    studyId: "mskimpact"
-                },
-                {
-                    sampleId: "mskimpact_sample_1",
-                    studyId: "mskimpact"
-                },
-                {
-                    sampleId: "mskimpact_sample_2",
-                    studyId: "mskimpact"
-                }
-            ]));
+            getAllSampleIdsInSampleListStub.returns(
+                Promise.resolve([
+                    {
+                        sampleId: 'mskimpact_sample_0',
+                        studyId: 'mskimpact',
+                    },
+                    {
+                        sampleId: 'mskimpact_sample_1',
+                        studyId: 'mskimpact',
+                    },
+                    {
+                        sampleId: 'mskimpact_sample_2',
+                        studyId: 'mskimpact',
+                    },
+                ])
+            );
 
             const client = {
                 getAllSampleIdsInSampleListUsingGET: getAllSampleIdsInSampleListStub,
             };
 
-            fetchGermlineConsentedSamples(studyIdsWithSomeGermlineData, studiesWithGermlineConsentedSamples, client as any)
+            fetchGermlineConsentedSamples(
+                studyIdsWithSomeGermlineData,
+                studiesWithGermlineConsentedSamples,
+                client as any
+            )
                 .then((data: any) => {
-                    assert.isTrue(getAllSampleIdsInSampleListStub.calledOnce,
-                        "getAllSampleIdsInSample should be called only once");
-                    assert.isTrue(getAllSampleIdsInSampleListStub.calledWith({sampleListId: "mskimpact_germline"}),
-                        "getAllSampleIdsInSample should be called with the correct sample list id (mskimpact_germline)");
-                    assert.equal(data.length, 3, "getAllSampleIdsInSample should return an array of size 3");
+                    assert.isTrue(
+                        getAllSampleIdsInSampleListStub.calledOnce,
+                        'getAllSampleIdsInSample should be called only once'
+                    );
+                    assert.isTrue(
+                        getAllSampleIdsInSampleListStub.calledWith({
+                            sampleListId: 'mskimpact_germline',
+                        }),
+                        'getAllSampleIdsInSample should be called with the correct sample list id (mskimpact_germline)'
+                    );
+                    assert.equal(
+                        data.length,
+                        3,
+                        'getAllSampleIdsInSample should return an array of size 3'
+                    );
                     done();
-                }).catch(done);
+                })
+                .catch(done);
         });
     });
 
     describe('fetchCivicData', () => {
-        it("won't fetch civic genes if there are no mutations", (done) => {
-            fetchCivicGenes(emptyMutationData, emptyUncalledMutationData).then((data: any) => {
-                assert.deepEqual(data, {});
-                done();
-            });
+        it("won't fetch civic genes if there are no mutations", done => {
+            fetchCivicGenes(emptyMutationData, emptyUncalledMutationData).then(
+                (data: any) => {
+                    assert.deepEqual(data, {});
+                    done();
+                }
+            );
         });
 
-        it("won't fetch civic variants if there are no mutations", (done) => {
-            fetchCivicVariants({}, emptyMutationData, emptyUncalledMutationData).then((data: any) => {
+        it("won't fetch civic variants if there are no mutations", done => {
+            fetchCivicVariants(
+                {},
+                emptyMutationData,
+                emptyUncalledMutationData
+            ).then((data: any) => {
                 assert.deepEqual(data, {});
                 done();
             });
         });
-        it("won't fetch civic variants if there are no civic genes", (done) => {
+        it("won't fetch civic variants if there are no civic genes", done => {
             fetchCivicVariants({}).then((data: any) => {
                 assert.deepEqual(data, {});
                 done();
@@ -408,95 +502,145 @@ describe('StoreUtils', () => {
     });
 
     describe('samples without cancer type clinical data', () => {
-        const studyId: string = "study";
+        const studyId: string = 'study';
         let samples: MobxPromise<Sample[]> = {
             result: [
-                {sampleId: "Sample1", uniqueSampleKey: "Sample1"},
-                {sampleId: "Sample2", uniqueSampleKey: "Sample2"},
-                {sampleId: "Sample3", uniqueSampleKey: "Sample3"},
-                {sampleId: "Sample4", uniqueSampleKey: "Sample4"}
+                { sampleId: 'Sample1', uniqueSampleKey: 'Sample1' },
+                { sampleId: 'Sample2', uniqueSampleKey: 'Sample2' },
+                { sampleId: 'Sample3', uniqueSampleKey: 'Sample3' },
+                { sampleId: 'Sample4', uniqueSampleKey: 'Sample4' },
             ] as Sample[],
             status: 'complete' as 'complete',
             peekStatus: 'complete',
             isPending: false,
             isError: false,
             isComplete: true,
-            error: undefined
+            error: undefined,
         };
 
         let samplesWithoutCancerTypeClinicalData: MobxPromise<Sample[]> = {
             result: [
-                {sampleId: "Sample4", studyId: "study4", uniqueSampleKey: "Sample4"}
+                {
+                    sampleId: 'Sample4',
+                    studyId: 'study4',
+                    uniqueSampleKey: 'Sample4',
+                },
             ] as Sample[],
             status: 'complete' as 'complete',
             peekStatus: 'complete',
             isPending: false,
             isError: false,
             isComplete: true,
-            error: undefined
+            error: undefined,
         };
 
         let sampleIds: MobxPromise<string[]> = {
-            result: ["Sample1", "Sample2", "Sample3", "Sample4"] as string[],
+            result: ['Sample1', 'Sample2', 'Sample3', 'Sample4'] as string[],
             status: 'complete' as 'complete',
             peekStatus: 'complete',
             isPending: false,
             isError: false,
             isComplete: true,
-            error: undefined
+            error: undefined,
         };
 
         let clinicalDataForSamples: MobxPromise<ClinicalData[]> = {
             result: [
-                {clinicalAttributeId: 'CANCER_TYPE_DETAILED', sampleId: 'Sample1', value: "Invasive Breast Carcinoma", uniqueSampleKey: "Sample1"},
-                {clinicalAttributeId: 'CANCER_TYPE', sampleId: 'Sample1', value: "Breast", uniqueSampleKey: "Sample1"},
-                {clinicalAttributeId: 'CANCER_TYPE_DETAILED', sampleId: 'Sample2', value: "Prostate Adenocarcinoma", uniqueSampleKey: "Sample2"},
-                {clinicalAttributeId: 'CANCER_TYPE', sampleId: 'Sample3', value: "Skin", uniqueSampleKey: "Sample3"}
+                {
+                    clinicalAttributeId: 'CANCER_TYPE_DETAILED',
+                    sampleId: 'Sample1',
+                    value: 'Invasive Breast Carcinoma',
+                    uniqueSampleKey: 'Sample1',
+                },
+                {
+                    clinicalAttributeId: 'CANCER_TYPE',
+                    sampleId: 'Sample1',
+                    value: 'Breast',
+                    uniqueSampleKey: 'Sample1',
+                },
+                {
+                    clinicalAttributeId: 'CANCER_TYPE_DETAILED',
+                    sampleId: 'Sample2',
+                    value: 'Prostate Adenocarcinoma',
+                    uniqueSampleKey: 'Sample2',
+                },
+                {
+                    clinicalAttributeId: 'CANCER_TYPE',
+                    sampleId: 'Sample3',
+                    value: 'Skin',
+                    uniqueSampleKey: 'Sample3',
+                },
             ] as ClinicalData[],
             status: 'complete' as 'complete',
             peekStatus: 'complete',
             isPending: false,
             isError: false,
             isComplete: true,
-            error: undefined
+            error: undefined,
         };
 
         it('finds samples without cancer type clinical data', () => {
-            const samplesWithoutCancerType = findSamplesWithoutCancerTypeClinicalData(samples, clinicalDataForSamples);
-
-            assert.deepEqual(samplesWithoutCancerType, [{sampleId: "Sample4", uniqueSampleKey: "Sample4"} as Partial<Sample>]);
+            const samplesWithoutCancerType = findSamplesWithoutCancerTypeClinicalData(
+                samples,
+                clinicalDataForSamples
+            );
+
+            assert.deepEqual(samplesWithoutCancerType, [
+                { sampleId: 'Sample4', uniqueSampleKey: 'Sample4' } as Partial<
+                    Sample
+                >,
+            ]);
         });
 
         const fetchSamplesStub = sinon.stub();
         const fetchStudiesStub = sinon.stub();
 
-
         const client = {
             fetchSamplesUsingPOST: fetchSamplesStub,
-            fetchStudiesUsingPOST: fetchStudiesStub
+            fetchStudiesUsingPOST: fetchStudiesStub,
         };
 
         it('fetches samples without cancer type clinical data', () => {
             const samplesWithoutCancerTypeClinicalData = fetchSamplesWithoutCancerTypeClinicalData(
-                sampleIds, studyId, clinicalDataForSamples, client as any);
-
-            assert.isTrue(fetchSamplesStub.called, "fetchSamples should be called");
-            assert.isTrue(fetchSamplesStub.calledWith(
-                {
+                sampleIds,
+                studyId,
+                clinicalDataForSamples,
+                client as any
+            );
+
+            assert.isTrue(
+                fetchSamplesStub.called,
+                'fetchSamples should be called'
+            );
+            assert.isTrue(
+                fetchSamplesStub.calledWith({
                     sampleFilter: {
-                        sampleIdentifiers: [{sampleId: "Sample4", studyId: "study"}]
-                    }
-                }
-            ), "fetchSamples should be called with the correct sample id (Sample4)");
+                        sampleIdentifiers: [
+                            { sampleId: 'Sample4', studyId: 'study' },
+                        ],
+                    },
+                }),
+                'fetchSamples should be called with the correct sample id (Sample4)'
+            );
         });
 
         it('fetches studies for samples without cancer type clinical data', () => {
             const studies = fetchStudiesForSamplesWithoutCancerTypeClinicalData(
-                samplesWithoutCancerTypeClinicalData, client as any);
-
-            assert.isTrue(fetchStudiesStub.calledOnce, "fetchStudies should be called only once");
-            assert.isTrue(fetchStudiesStub.calledWith({studyIds: ["study4"], projection: "DETAILED"}),
-                "fetchStudy should be called with the correct study id (study4)");
+                samplesWithoutCancerTypeClinicalData,
+                client as any
+            );
+
+            assert.isTrue(
+                fetchStudiesStub.calledOnce,
+                'fetchStudies should be called only once'
+            );
+            assert.isTrue(
+                fetchStudiesStub.calledWith({
+                    studyIds: ['study4'],
+                    projection: 'DETAILED',
+                }),
+                'fetchStudy should be called with the correct study id (study4)'
+            );
         });
     });
 
@@ -514,5 +658,4 @@ describe('StoreUtils', () => {
             assert.isFalse(noGenePanelUsed('dummy_gene_panel_id'));
         });
     });
-
 });
diff --git a/src/shared/lib/StoreUtils.ts b/src/shared/lib/StoreUtils.ts
index a1379c2581c..507b7ffbdb5 100644
--- a/src/shared/lib/StoreUtils.ts
+++ b/src/shared/lib/StoreUtils.ts
@@ -3,7 +3,7 @@ import $ from 'jquery';
 import {
     fetchVariantAnnotationsByMutation as fetchDefaultVariantAnnotationsByMutation,
     fetchVariantAnnotationsIndexedByGenomicLocation as fetchDefaultVariantAnnotationsIndexedByGenomicLocation,
-} from "react-mutation-mapper";
+} from 'react-mutation-mapper';
 import {
     default as CBioPortalAPI,
     MolecularProfile,
@@ -25,208 +25,264 @@ import {
     GenePanelDataFilter,
     GenePanelToGene,
     GenePanelData,
-    GenePanel
-} from "shared/api/generated/CBioPortalAPI";
-import defaultClient from "shared/api/cbioportalClientInstance";
-import internalClient from "shared/api/cbioportalInternalClientInstance";
-import g2sClient from "shared/api/g2sClientInstance";
+    GenePanel,
+} from 'shared/api/generated/CBioPortalAPI';
+import defaultClient from 'shared/api/cbioportalClientInstance';
+import internalClient from 'shared/api/cbioportalInternalClientInstance';
+import g2sClient from 'shared/api/g2sClientInstance';
 import {
     Alignment,
     Genome2StructureAPI,
     Query,
     OncoKbAPI,
     OncoKbGene,
-    CancerGene
-} from "cbioportal-frontend-commons";
+    CancerGene,
+} from 'cbioportal-frontend-commons';
 import {
-    CosmicMutation, default as CBioPortalAPIInternal,
-    GisticToGene, Gistic, MutSig
-} from "shared/api/generated/CBioPortalAPIInternal";
-import oncokbClient from "shared/api/oncokbClientInstance";
-import genomeNexusClient from "shared/api/genomeNexusClientInstance";
+    CosmicMutation,
+    default as CBioPortalAPIInternal,
+    GisticToGene,
+    Gistic,
+    MutSig,
+} from 'shared/api/generated/CBioPortalAPIInternal';
+import oncokbClient from 'shared/api/oncokbClientInstance';
+import genomeNexusClient from 'shared/api/genomeNexusClientInstance';
 import {
-    generateIdToIndicatorMap, generateQueryVariant, generateEvidenceQuery
-} from "shared/lib/OncoKbUtils";
+    generateIdToIndicatorMap,
+    generateQueryVariant,
+    generateEvidenceQuery,
+} from 'shared/lib/OncoKbUtils';
+import { getCivicVariants, getCivicGenes } from 'shared/lib/CivicUtils';
+import { getAlterationString } from 'shared/lib/CopyNumberUtils';
+import { MobxPromise, MobxPromiseInputUnion } from 'mobxpromise';
 import {
-    getCivicVariants, getCivicGenes
-} from "shared/lib/CivicUtils";
-import {getAlterationString} from "shared/lib/CopyNumberUtils";
-import {MobxPromise, MobxPromiseInputUnion} from "mobxpromise";
-import {keywordToCosmic, geneToMyCancerGenome} from "shared/lib/AnnotationUtils";
-import {indexPdbAlignments} from "shared/lib/PdbUtils";
-import {IOncoKbData} from "shared/model/OncoKB";
-import {IGisticData} from "shared/model/Gistic";
-import {IMutSigData} from "shared/model/MutSig";
-import {IMyCancerGenomeData, IMyCancerGenome} from "shared/model/MyCancerGenome";
-import {IMutationalSignature, IMutationalSignatureMeta} from "shared/model/MutationalSignature";
-import { ICivicVariant, ICivicGene } from "shared/model/Civic.ts";
-import {MOLECULAR_PROFILE_MUTATIONS_SUFFIX, MOLECULAR_PROFILE_UNCALLED_MUTATIONS_SUFFIX} from "shared/constants";
-import {GenomeNexusAPI, stringListToIndexSet} from "cbioportal-frontend-commons";
-import {AlterationTypeConstants} from "../../pages/resultsView/ResultsViewPageStore";
-import {normalizeMutations} from "../components/mutationMapper/MutationMapperUtils";
-import AppConfig from "appConfig";
-import { getFrontendAssetUrl } from "shared/api/urls";
+    keywordToCosmic,
+    geneToMyCancerGenome,
+} from 'shared/lib/AnnotationUtils';
+import { indexPdbAlignments } from 'shared/lib/PdbUtils';
+import { IOncoKbData } from 'shared/model/OncoKB';
+import { IGisticData } from 'shared/model/Gistic';
+import { IMutSigData } from 'shared/model/MutSig';
+import {
+    IMyCancerGenomeData,
+    IMyCancerGenome,
+} from 'shared/model/MyCancerGenome';
+import {
+    IMutationalSignature,
+    IMutationalSignatureMeta,
+} from 'shared/model/MutationalSignature';
+import { ICivicVariant, ICivicGene } from 'shared/model/Civic.ts';
+import {
+    MOLECULAR_PROFILE_MUTATIONS_SUFFIX,
+    MOLECULAR_PROFILE_UNCALLED_MUTATIONS_SUFFIX,
+} from 'shared/constants';
+import {
+    GenomeNexusAPI,
+    stringListToIndexSet,
+} from 'cbioportal-frontend-commons';
+import { AlterationTypeConstants } from '../../pages/resultsView/ResultsViewPageStore';
+import { normalizeMutations } from '../components/mutationMapper/MutationMapperUtils';
+import AppConfig from 'appConfig';
+import { getFrontendAssetUrl } from 'shared/api/urls';
 import client from 'shared/api/cbioportalClientInstance';
 
 export const ONCOKB_DEFAULT: IOncoKbData = {
-    uniqueSampleKeyToTumorType : {},
-    indicatorMap : {}
+    uniqueSampleKeyToTumorType: {},
+    indicatorMap: {},
 };
 
 export const GenePanelIdSpecialValue = {
     UNKNOWN: undefined,
     WHOLE_EXOME_SEQ: 'WES',
-    WHOLE_GENOME_SEQ: 'WGS'
+    WHOLE_GENOME_SEQ: 'WGS',
 };
 
-export function noGenePanelUsed(genePanelId:string|undefined):boolean {
-    return genePanelId === GenePanelIdSpecialValue.UNKNOWN
-        || genePanelId === GenePanelIdSpecialValue.WHOLE_EXOME_SEQ
-        || genePanelId === GenePanelIdSpecialValue.WHOLE_GENOME_SEQ;
+export function noGenePanelUsed(genePanelId: string | undefined): boolean {
+    return (
+        genePanelId === GenePanelIdSpecialValue.UNKNOWN ||
+        genePanelId === GenePanelIdSpecialValue.WHOLE_EXOME_SEQ ||
+        genePanelId === GenePanelIdSpecialValue.WHOLE_GENOME_SEQ
+    );
 }
 
-export type MutationIdGenerator = (mutation:Mutation) => string;
+export type MutationIdGenerator = (mutation: Mutation) => string;
 
 export interface IDataQueryFilter {
     sampleIds?: string[];
     sampleListId?: string;
 }
 
-export async function fetchMutationData(mutationFilter:MutationFilter,
-                                        molecularProfileId?:string,
-                                        client:CBioPortalAPI = defaultClient)
-{
+export async function fetchMutationData(
+    mutationFilter: MutationFilter,
+    molecularProfileId?: string,
+    client: CBioPortalAPI = defaultClient
+) {
     if (molecularProfileId) {
         return await client.fetchMutationsInMolecularProfileUsingPOST({
             molecularProfileId,
             mutationFilter,
-            projection: "DETAILED"
+            projection: 'DETAILED',
         });
     } else {
         return [];
     }
 }
 
-export async function fetchVariantAnnotationsByMutation(mutations: Mutation[],
-                                                        fields: string[] = ["annotation_summary"],
-                                                        isoformOverrideSource: string = "uniprot",
-                                                        client: GenomeNexusAPI = genomeNexusClient)
-{
-    return fetchDefaultVariantAnnotationsByMutation(normalizeMutations(mutations), fields, isoformOverrideSource, client);
+export async function fetchVariantAnnotationsByMutation(
+    mutations: Mutation[],
+    fields: string[] = ['annotation_summary'],
+    isoformOverrideSource: string = 'uniprot',
+    client: GenomeNexusAPI = genomeNexusClient
+) {
+    return fetchDefaultVariantAnnotationsByMutation(
+        normalizeMutations(mutations),
+        fields,
+        isoformOverrideSource,
+        client
+    );
 }
 
-export async function fetchVariantAnnotationsIndexedByGenomicLocation(mutations: Mutation[],
-                                                                      fields: string[] = ["annotation_summary"],
-                                                                      isoformOverrideSource: string = "uniprot",
-                                                                      client: GenomeNexusAPI = genomeNexusClient)
-{
-    return fetchDefaultVariantAnnotationsIndexedByGenomicLocation(normalizeMutations(mutations), fields, isoformOverrideSource, client);
+export async function fetchVariantAnnotationsIndexedByGenomicLocation(
+    mutations: Mutation[],
+    fields: string[] = ['annotation_summary'],
+    isoformOverrideSource: string = 'uniprot',
+    client: GenomeNexusAPI = genomeNexusClient
+) {
+    return fetchDefaultVariantAnnotationsIndexedByGenomicLocation(
+        normalizeMutations(mutations),
+        fields,
+        isoformOverrideSource,
+        client
+    );
 }
 
-export async function fetchGenes(hugoGeneSymbols?: string[],
-                                 client: CBioPortalAPI = defaultClient)
-{
+export async function fetchGenes(
+    hugoGeneSymbols?: string[],
+    client: CBioPortalAPI = defaultClient
+) {
     if (hugoGeneSymbols && hugoGeneSymbols.length) {
         const order = stringListToIndexSet(hugoGeneSymbols);
-        return _.sortBy(await client.fetchGenesUsingPOST({
-            geneIdType: "HUGO_GENE_SYMBOL",
-            geneIds: hugoGeneSymbols.slice(),
-            projection: "SUMMARY"
-        }), (gene: Gene) => order[gene.hugoGeneSymbol]);
+        return _.sortBy(
+            await client.fetchGenesUsingPOST({
+                geneIdType: 'HUGO_GENE_SYMBOL',
+                geneIds: hugoGeneSymbols.slice(),
+                projection: 'SUMMARY',
+            }),
+            (gene: Gene) => order[gene.hugoGeneSymbol]
+        );
     } else {
         return [];
     }
 }
 
-export async function fetchReferenceGenomeGenes(genomeName:string, hugoGeneSymbols?: string[],
-                                 client: CBioPortalAPI = defaultClient)
-{
+export async function fetchReferenceGenomeGenes(
+    genomeName: string,
+    hugoGeneSymbols?: string[],
+    client: CBioPortalAPI = defaultClient
+) {
     if (hugoGeneSymbols && hugoGeneSymbols.length) {
         const order = stringListToIndexSet(hugoGeneSymbols);
-        return _.sortBy(await client.fetchReferenceGenomeGenesUsingPOST({
-            genomeName: genomeName,
-            geneIds: hugoGeneSymbols.slice()
-        }), (gene:ReferenceGenomeGene) => order[gene.hugoGeneSymbol]);
+        return _.sortBy(
+            await client.fetchReferenceGenomeGenesUsingPOST({
+                genomeName: genomeName,
+                geneIds: hugoGeneSymbols.slice(),
+            }),
+            (gene: ReferenceGenomeGene) => order[gene.hugoGeneSymbol]
+        );
     } else {
         return [];
     }
 }
 
-export async function fetchAllReferenceGenomeGenes(genomeName:string,
-                                                   client: CBioPortalAPI = defaultClient)
-{
-    if (AppConfig.serverConfig.app_name === "public-portal") {
+export async function fetchAllReferenceGenomeGenes(
+    genomeName: string,
+    client: CBioPortalAPI = defaultClient
+) {
+    if (AppConfig.serverConfig.app_name === 'public-portal') {
         // this is temporary
-        return $.get(getFrontendAssetUrl("reactapp/reference_genome_hg19.json"));
+        return $.get(
+            getFrontendAssetUrl('reactapp/reference_genome_hg19.json')
+        );
     }
     if (genomeName) {
-        return await client.getAllReferenceGenomeGenesUsingGET(
-            {genomeName:genomeName});
+        return await client.getAllReferenceGenomeGenesUsingGET({
+            genomeName: genomeName,
+        });
     } else {
         return [];
     }
 }
 
-export async function fetchPdbAlignmentData(ensemblId: string,
-                                            client:Genome2StructureAPI = g2sClient)
-{
+export async function fetchPdbAlignmentData(
+    ensemblId: string,
+    client: Genome2StructureAPI = g2sClient
+) {
     if (ensemblId) {
         return await client.getAlignmentUsingGET({
-            idType: "ensembl",
-            id: ensemblId
+            idType: 'ensembl',
+            id: ensemblId,
         });
     } else {
         return [];
     }
 }
 
-export async function fetchCanonicalTranscripts(hugoSymbols: string[],
-                                                isoformOverrideSource: string,
-                                                client:GenomeNexusAPI = genomeNexusClient)
-{
+export async function fetchCanonicalTranscripts(
+    hugoSymbols: string[],
+    isoformOverrideSource: string,
+    client: GenomeNexusAPI = genomeNexusClient
+) {
     return await client.fetchCanonicalEnsemblTranscriptsByHugoSymbolsPOST({
-        hugoSymbols, isoformOverrideSource
+        hugoSymbols,
+        isoformOverrideSource,
     });
 }
 
-export async function getCanonicalTranscriptsByHugoSymbol(hugoSymbols: string[],
-                                                          isoformOverrideSource: string,
-                                                          client:GenomeNexusAPI = genomeNexusClient)
-{
-    const transcripts = await fetchCanonicalTranscripts(hugoSymbols, isoformOverrideSource, client);
-    return transcripts? _.zipObject(hugoSymbols, transcripts) : undefined;
+export async function getCanonicalTranscriptsByHugoSymbol(
+    hugoSymbols: string[],
+    isoformOverrideSource: string,
+    client: GenomeNexusAPI = genomeNexusClient
+) {
+    const transcripts = await fetchCanonicalTranscripts(
+        hugoSymbols,
+        isoformOverrideSource,
+        client
+    );
+    return transcripts ? _.zipObject(hugoSymbols, transcripts) : undefined;
 }
 
-export async function fetchCanonicalEnsemblGeneIds(hugoSymbols: string[],
-                                                   isoformOverrideSource: string,
-                                                   client:GenomeNexusAPI = genomeNexusClient)
-{
+export async function fetchCanonicalEnsemblGeneIds(
+    hugoSymbols: string[],
+    isoformOverrideSource: string,
+    client: GenomeNexusAPI = genomeNexusClient
+) {
     // TODO: this endpoint should accept isoformOverrideSource
     return await client.fetchCanonicalEnsemblGeneIdByHugoSymbolsPOST({
-        hugoSymbols});
+        hugoSymbols,
+    });
 }
 
-export async function fetchClinicalData(clinicalDataMultiStudyFilter:ClinicalDataMultiStudyFilter,
-                                        client:CBioPortalAPI = defaultClient)
-{
-    if (clinicalDataMultiStudyFilter)
-    {
+export async function fetchClinicalData(
+    clinicalDataMultiStudyFilter: ClinicalDataMultiStudyFilter,
+    client: CBioPortalAPI = defaultClient
+) {
+    if (clinicalDataMultiStudyFilter) {
         return await client.fetchClinicalDataUsingPOST({
             clinicalDataType: 'SAMPLE',
             clinicalDataMultiStudyFilter: clinicalDataMultiStudyFilter,
             projection: 'DETAILED',
         });
-    }
-    else {
+    } else {
         return [];
     }
 }
 
-export async function fetchClinicalDataInStudy(studyId:string,
-                                               clinicalDataSingleStudyFilter:ClinicalDataSingleStudyFilter,
-                                               clinicalDataType: 'SAMPLE' | 'PATIENT',
-                                               client:CBioPortalAPI = defaultClient)
-{
+export async function fetchClinicalDataInStudy(
+    studyId: string,
+    clinicalDataSingleStudyFilter: ClinicalDataSingleStudyFilter,
+    clinicalDataType: 'SAMPLE' | 'PATIENT',
+    client: CBioPortalAPI = defaultClient
+) {
     if (clinicalDataSingleStudyFilter) {
         return await client.fetchAllClinicalDataInStudyUsingPOST({
             studyId: studyId,
@@ -234,120 +290,114 @@ export async function fetchClinicalDataInStudy(studyId:string,
             clinicalDataSingleStudyFilter: clinicalDataSingleStudyFilter,
             projection: 'SUMMARY',
         });
-    }
-    else {
+    } else {
         return [];
     }
 }
 
-export async function fetchClinicalDataForPatient(studyId:string,
-                                                  patientId:string,
-                                                  client:CBioPortalAPI = defaultClient)
-{
-    if (studyId && patientId)
-    {
+export async function fetchClinicalDataForPatient(
+    studyId: string,
+    patientId: string,
+    client: CBioPortalAPI = defaultClient
+) {
+    if (studyId && patientId) {
         return await client.getAllClinicalDataOfPatientInStudyUsingGET({
             projection: 'DETAILED',
             studyId,
-            patientId
+            patientId,
         });
-    }
-    else {
+    } else {
         return [];
     }
 }
 
-export async function fetchCopyNumberSegments(studyId:string,
-                                              sampleIds:string[],
-                                              client:CBioPortalAPI = defaultClient)
-{
-    if (studyId && sampleIds.length > 0)
-    {
+export async function fetchCopyNumberSegments(
+    studyId: string,
+    sampleIds: string[],
+    client: CBioPortalAPI = defaultClient
+) {
+    if (studyId && sampleIds.length > 0) {
         return await client.fetchCopyNumberSegmentsUsingPOST({
             sampleIdentifiers: sampleIds.map((sampleId: string) => ({
                 sampleId,
-                studyId
+                studyId,
             })),
             projection: 'DETAILED',
         });
-    }
-    else {
+    } else {
         return [];
     }
 }
 
-export function fetchCopyNumberSegmentsForSamples(samples: Sample[],
-                                                  chromosome?: string,
-                                                  client:CBioPortalAPI = defaultClient): Promise<CopyNumberSeg[]>
-{
-    if (samples.length > 0)
-    {
+export function fetchCopyNumberSegmentsForSamples(
+    samples: Sample[],
+    chromosome?: string,
+    client: CBioPortalAPI = defaultClient
+): Promise<CopyNumberSeg[]> {
+    if (samples.length > 0) {
         return client.fetchCopyNumberSegmentsUsingPOST({
             sampleIdentifiers: samples.map(sample => ({
                 sampleId: sample.sampleId,
-                studyId: sample.studyId
+                studyId: sample.studyId,
             })),
             chromosome,
             projection: 'DETAILED',
         });
-    }
-    else {
+    } else {
         return Promise.resolve([]);
     }
 }
 
-export async function fetchSamplesForPatient(studyId:string,
-                                             patientId?:string,
-                                             sampleId?:string,
-                                             client:CBioPortalAPI = defaultClient)
-{
-    if (studyId && patientId)
-    {
+export async function fetchSamplesForPatient(
+    studyId: string,
+    patientId?: string,
+    sampleId?: string,
+    client: CBioPortalAPI = defaultClient
+) {
+    if (studyId && patientId) {
         return await client.getAllSamplesOfPatientInStudyUsingGET({
             studyId,
             patientId,
-            projection: 'DETAILED'
+            projection: 'DETAILED',
         });
-    }
-    else if (studyId && sampleId)
-    {
-        return await client.getSampleInStudyUsingGET({
-            studyId,
-            sampleId
-        }).then((data:Sample) => [data]);
-    }
-    else {
+    } else if (studyId && sampleId) {
+        return await client
+            .getSampleInStudyUsingGET({
+                studyId,
+                sampleId,
+            })
+            .then((data: Sample) => [data]);
+    } else {
         return [];
     }
 }
 
-export async function fetchSamples(sampleIds:MobxPromise<string[]>,
-                                   studyId:string,
-                                   client:CBioPortalAPI = defaultClient)
-{
-    if (sampleIds.result &&
-        sampleIds.result.length > 0 &&
-        studyId)
-    {
-        const sampleIdentifiers = sampleIds.result.map(
-            (sampleId: string) => ({sampleId, studyId})
-        );
+export async function fetchSamples(
+    sampleIds: MobxPromise<string[]>,
+    studyId: string,
+    client: CBioPortalAPI = defaultClient
+) {
+    if (sampleIds.result && sampleIds.result.length > 0 && studyId) {
+        const sampleIdentifiers = sampleIds.result.map((sampleId: string) => ({
+            sampleId,
+            studyId,
+        }));
 
         return await client.fetchSamplesUsingPOST({
             sampleFilter: {
-                sampleIdentifiers
-            } as SampleFilter
+                sampleIdentifiers,
+            } as SampleFilter,
         });
-    }
-    else {
+    } else {
         return [];
     }
 }
 
-export async function fetchGermlineConsentedSamples(studyIds: MobxPromise<string[]>,
-                                                    studiesWithGermlineConsentedSamples?: string[],
-                                                    client: CBioPortalAPI = defaultClient)
-{
+export async function fetchGermlineConsentedSamples(
+    studyIds: MobxPromise<string[]>,
+    studiesWithGermlineConsentedSamples?: string[],
+    client: CBioPortalAPI = defaultClient
+) {
     // no valid config param => feature disabled
     if (!studiesWithGermlineConsentedSamples || !studyIds.result) {
         return [];
@@ -355,41 +405,48 @@ export async function fetchGermlineConsentedSamples(studyIds: MobxPromise<string
 
     // query API only for the studies provided with the config param
 
-    const studies: string[] = studyIds.result.filter(
-        studyId => _.find(studiesWithGermlineConsentedSamples, (element) => element === studyId));
+    const studies: string[] = studyIds.result.filter(studyId =>
+        _.find(
+            studiesWithGermlineConsentedSamples,
+            element => element === studyId
+        )
+    );
 
-    if (studies.length > 0)
-    {
-        const ids: string[][] = await Promise.all(studies.map(studyId => {
-            return client.getAllSampleIdsInSampleListUsingGET({
-                sampleListId: getGermlineSampleListId(studyId)
-            });
-        }));
+    if (studies.length > 0) {
+        const ids: string[][] = await Promise.all(
+            studies.map(studyId => {
+                return client.getAllSampleIdsInSampleListUsingGET({
+                    sampleListId: getGermlineSampleListId(studyId),
+                });
+            })
+        );
 
-        return _.flatten(ids.map((sampleIds: string[], index: number) => {
-            const studyId = studies[index];
-            return sampleIds.map(sampleId => ({sampleId, studyId}));
-        }));
-    }
-    else {
+        return _.flatten(
+            ids.map((sampleIds: string[], index: number) => {
+                const studyId = studies[index];
+                return sampleIds.map(sampleId => ({ sampleId, studyId }));
+            })
+        );
+    } else {
         return [];
     }
 }
 
-export function getGermlineSampleListId(studyId:string): string
-{
+export function getGermlineSampleListId(studyId: string): string {
     return `${studyId}_germline`;
 }
 
-export function findSampleIdsWithCancerTypeClinicalData(clinicalDataForSamples:MobxPromise<ClinicalData[]>): {[uniqueSampleKey: string]: boolean}
-{
-    const samplesWithClinicalData: {[sampleId: string]: boolean} = {};
+export function findSampleIdsWithCancerTypeClinicalData(
+    clinicalDataForSamples: MobxPromise<ClinicalData[]>
+): { [uniqueSampleKey: string]: boolean } {
+    const samplesWithClinicalData: { [sampleId: string]: boolean } = {};
 
-    if (clinicalDataForSamples.result)
-    {
+    if (clinicalDataForSamples.result) {
         _.each(clinicalDataForSamples.result, (clinicalData: ClinicalData) => {
-            if (clinicalData.clinicalAttributeId === "CANCER_TYPE_DETAILED" ||
-                clinicalData.clinicalAttributeId === "CANCER_TYPE") {
+            if (
+                clinicalData.clinicalAttributeId === 'CANCER_TYPE_DETAILED' ||
+                clinicalData.clinicalAttributeId === 'CANCER_TYPE'
+            ) {
                 samplesWithClinicalData[clinicalData.uniqueSampleKey] = true;
             }
         });
@@ -398,49 +455,60 @@ export function findSampleIdsWithCancerTypeClinicalData(clinicalDataForSamples:M
     return samplesWithClinicalData;
 }
 
-export function findSamplesWithoutCancerTypeClinicalData(samples:MobxPromise<Sample[]>,
-                                                         clinicalDataForSamples:MobxPromise<ClinicalData[]>): Sample[]
-{
-    if (samples.result &&
+export function findSamplesWithoutCancerTypeClinicalData(
+    samples: MobxPromise<Sample[]>,
+    clinicalDataForSamples: MobxPromise<ClinicalData[]>
+): Sample[] {
+    if (
+        samples.result &&
         samples.result.length > 0 &&
-        clinicalDataForSamples.result)
-    {
-        const samplesWithClinicalData = findSampleIdsWithCancerTypeClinicalData(clinicalDataForSamples);
+        clinicalDataForSamples.result
+    ) {
+        const samplesWithClinicalData = findSampleIdsWithCancerTypeClinicalData(
+            clinicalDataForSamples
+        );
 
         return _.filter(samples.result, (sample: Sample) => {
             return samplesWithClinicalData[sample.uniqueSampleKey] !== true;
         });
-    }
-    else {
+    } else {
         return [];
     }
 }
 
-export async function fetchSamplesWithoutCancerTypeClinicalData(sampleIds:MobxPromise<string[]>,
-                                                                studyId:string,
-                                                                clinicalDataForSamples:MobxPromise<ClinicalData[]>,
-                                                                client:CBioPortalAPI = defaultClient)
-{
+export async function fetchSamplesWithoutCancerTypeClinicalData(
+    sampleIds: MobxPromise<string[]>,
+    studyId: string,
+    clinicalDataForSamples: MobxPromise<ClinicalData[]>,
+    client: CBioPortalAPI = defaultClient
+) {
     let samples: Sample[] = [];
 
-    if (sampleIds.result &&
+    if (
+        sampleIds.result &&
         sampleIds.result.length > 0 &&
-        clinicalDataForSamples.result)
-    {
-        const samplesWithClinicalData = findSampleIdsWithCancerTypeClinicalData(clinicalDataForSamples);
+        clinicalDataForSamples.result
+    ) {
+        const samplesWithClinicalData = findSampleIdsWithCancerTypeClinicalData(
+            clinicalDataForSamples
+        );
 
-        const sampleIdsWithoutClinicalData = _.filter(sampleIds.result, (sampleId: string) => {
-            return samplesWithClinicalData[sampleId] !== true;
-        });
+        const sampleIdsWithoutClinicalData = _.filter(
+            sampleIds.result,
+            (sampleId: string) => {
+                return samplesWithClinicalData[sampleId] !== true;
+            }
+        );
 
         const sampleIdentifierForSamplesWithoutClinicalData = sampleIdsWithoutClinicalData.map(
-            sampleId => ({sampleId, studyId}));
+            sampleId => ({ sampleId, studyId })
+        );
 
         if (sampleIdentifierForSamplesWithoutClinicalData.length > 0) {
             samples = await client.fetchSamplesUsingPOST({
                 sampleFilter: {
-                    sampleIdentifiers: sampleIdentifierForSamplesWithoutClinicalData
-                } as SampleFilter
+                    sampleIdentifiers: sampleIdentifierForSamplesWithoutClinicalData,
+                } as SampleFilter,
             });
         }
     }
@@ -448,26 +516,40 @@ export async function fetchSamplesWithoutCancerTypeClinicalData(sampleIds:MobxPr
     return samples;
 }
 
-export async function fetchStudiesForSamplesWithoutCancerTypeClinicalData(samplesWithoutClinicalData: MobxPromise<Sample[]>,
-                                                                          client:CBioPortalAPI = defaultClient)
-{
+export async function fetchStudiesForSamplesWithoutCancerTypeClinicalData(
+    samplesWithoutClinicalData: MobxPromise<Sample[]>,
+    client: CBioPortalAPI = defaultClient
+) {
     let studies: CancerStudy[] = [];
 
-    if (samplesWithoutClinicalData.result && samplesWithoutClinicalData.result.length > 0) {
-        const studyIdsForSamplesWithoutClinicalData = _.uniq(samplesWithoutClinicalData.result.map(
-            (sample: Sample) => sample.studyId));
+    if (
+        samplesWithoutClinicalData.result &&
+        samplesWithoutClinicalData.result.length > 0
+    ) {
+        const studyIdsForSamplesWithoutClinicalData = _.uniq(
+            samplesWithoutClinicalData.result.map(
+                (sample: Sample) => sample.studyId
+            )
+        );
 
-        studies = await client.fetchStudiesUsingPOST({studyIds:studyIdsForSamplesWithoutClinicalData, projection:"DETAILED"});
+        studies = await client.fetchStudiesUsingPOST({
+            studyIds: studyIdsForSamplesWithoutClinicalData,
+            projection: 'DETAILED',
+        });
     }
 
     return studies;
 }
 
-export async function fetchCosmicData(mutationData:MobxPromise<Mutation[]>,
-                                      uncalledMutationData?:MobxPromise<Mutation[]>,
-                                      client:CBioPortalAPIInternal = internalClient)
-{
-    const mutationDataResult = concatMutationData(mutationData, uncalledMutationData);
+export async function fetchCosmicData(
+    mutationData: MobxPromise<Mutation[]>,
+    uncalledMutationData?: MobxPromise<Mutation[]>,
+    client: CBioPortalAPIInternal = internalClient
+) {
+    const mutationDataResult = concatMutationData(
+        mutationData,
+        uncalledMutationData
+    );
 
     if (mutationDataResult.length === 0) {
         return undefined;
@@ -475,41 +557,55 @@ export async function fetchCosmicData(mutationData:MobxPromise<Mutation[]>,
 
     // we have to check and see if keyword property is present
     // it is NOT present sometimes
-    const queryKeywords: string[] =
-        _.chain(mutationDataResult)
-            .filter((mutation: Mutation) => mutation.hasOwnProperty('keyword'))
-            .map((mutation: Mutation) => mutation.keyword)
-            .uniq().value();
-
-    if (queryKeywords.length > 0)
-    {
-        const cosmicData: CosmicMutation[] = await client.fetchCosmicCountsUsingPOST({
-            keywords: _.filter(queryKeywords, (query: string) => query != null)
-        });
+    const queryKeywords: string[] = _.chain(mutationDataResult)
+        .filter((mutation: Mutation) => mutation.hasOwnProperty('keyword'))
+        .map((mutation: Mutation) => mutation.keyword)
+        .uniq()
+        .value();
+
+    if (queryKeywords.length > 0) {
+        const cosmicData: CosmicMutation[] = await client.fetchCosmicCountsUsingPOST(
+            {
+                keywords: _.filter(
+                    queryKeywords,
+                    (query: string) => query != null
+                ),
+            }
+        );
 
         return keywordToCosmic(cosmicData);
-    }
-    else {
+    } else {
         return undefined;
     }
 }
 
-export async function fetchMutSigData(studyId: string, client:CBioPortalAPIInternal = internalClient)
-{
-    const mutSigdata = await client.getSignificantlyMutatedGenesUsingGET({studyId});
+export async function fetchMutSigData(
+    studyId: string,
+    client: CBioPortalAPIInternal = internalClient
+) {
+    const mutSigdata = await client.getSignificantlyMutatedGenesUsingGET({
+        studyId,
+    });
 
-    const byEntrezGeneId: IMutSigData = mutSigdata.reduce((map:IMutSigData, next:MutSig) => {
-        map[next.entrezGeneId] = { qValue: next.qValue };
-        return map;
-    }, {});
+    const byEntrezGeneId: IMutSigData = mutSigdata.reduce(
+        (map: IMutSigData, next: MutSig) => {
+            map[next.entrezGeneId] = { qValue: next.qValue };
+            return map;
+        },
+        {}
+    );
 
     return byEntrezGeneId;
 }
 
-export async function fetchGisticData(studyId: string, client:CBioPortalAPIInternal = internalClient)
-{
+export async function fetchGisticData(
+    studyId: string,
+    client: CBioPortalAPIInternal = internalClient
+) {
     if (studyId) {
-        const gisticData = await client.getSignificantCopyNumberRegionsUsingGET({studyId});
+        const gisticData = await client.getSignificantCopyNumberRegionsUsingGET(
+            { studyId }
+        );
 
         // generate a map of <entrezGeneId, IGisticSummary[]> pairs
         return gisticData.reduce((map: IGisticData, gistic: Gistic) => {
@@ -522,180 +618,264 @@ export async function fetchGisticData(studyId: string, client:CBioPortalAPIInter
                 map[gene.entrezGeneId].push({
                     amp: gistic.amp,
                     qValue: gistic.qValue,
-                    peakGeneCount: gistic.genes.length
+                    peakGeneCount: gistic.genes.length,
                 });
             });
 
             return map;
         }, {});
-    }
-    else {
+    } else {
         return {};
     }
 }
 
-export async function fetchCopyNumberData(discreteCNAData:MobxPromise<DiscreteCopyNumberData[]>,
-                                          molecularProfileIdDiscrete:MobxPromise<string>,
-                                          client:CBioPortalAPI = defaultClient)
-{
-    const copyNumberCountIdentifiers: CopyNumberCountIdentifier[] = discreteCNAData.result ?
-        discreteCNAData.result.map((cnData: DiscreteCopyNumberData) => {
-            return {
-                alteration: cnData.alteration,
-                entrezGeneId: cnData.entrezGeneId
-            };
-        }) : [];
-
-    if (molecularProfileIdDiscrete.result && copyNumberCountIdentifiers.length > 0) {
+export async function fetchCopyNumberData(
+    discreteCNAData: MobxPromise<DiscreteCopyNumberData[]>,
+    molecularProfileIdDiscrete: MobxPromise<string>,
+    client: CBioPortalAPI = defaultClient
+) {
+    const copyNumberCountIdentifiers: CopyNumberCountIdentifier[] = discreteCNAData.result
+        ? discreteCNAData.result.map((cnData: DiscreteCopyNumberData) => {
+              return {
+                  alteration: cnData.alteration,
+                  entrezGeneId: cnData.entrezGeneId,
+              };
+          })
+        : [];
+
+    if (
+        molecularProfileIdDiscrete.result &&
+        copyNumberCountIdentifiers.length > 0
+    ) {
         return await client.fetchCopyNumberCountsUsingPOST({
             molecularProfileId: molecularProfileIdDiscrete.result,
-            copyNumberCountIdentifiers
+            copyNumberCountIdentifiers,
         });
     } else {
         return [];
     }
 }
 
-export async function fetchGenePanelData(molecularProfileId:string, sampleIds:string[] = [], sampleListId:string = ""):Promise<{[sampleId: string]: GenePanelData}> {
-    const filter:any = {};
+export async function fetchGenePanelData(
+    molecularProfileId: string,
+    sampleIds: string[] = [],
+    sampleListId: string = ''
+): Promise<{ [sampleId: string]: GenePanelData }> {
+    const filter: any = {};
     if (sampleIds.length > 0) {
         filter.sampleIds = sampleIds;
-    };
+    }
     if (sampleListId.length > 0) {
         filter.sampleListId = sampleListId;
-    };
-    const remoteData = await client.getGenePanelDataUsingPOST({molecularProfileId, genePanelDataFilter: filter as GenePanelDataFilter});
-    return _.keyBy(remoteData, (genePanelData) => genePanelData.sampleId);
+    }
+    const remoteData = await client.getGenePanelDataUsingPOST({
+        molecularProfileId,
+        genePanelDataFilter: filter as GenePanelDataFilter,
+    });
+    return _.keyBy(remoteData, genePanelData => genePanelData.sampleId);
 }
 
-export async function fetchGenePanel(genePanelIds:string[]):Promise<{[genePanelId:string]: GenePanel}> {
-    const genePanels:{[genePanelId:string]: GenePanel} = {};
+export async function fetchGenePanel(
+    genePanelIds: string[]
+): Promise<{ [genePanelId: string]: GenePanel }> {
+    const genePanels: { [genePanelId: string]: GenePanel } = {};
     const uniquePanelIds = _.uniq(genePanelIds);
-    const remoteData = await Promise.all( _.map(uniquePanelIds, async(genePanelId) => await client.getGenePanelUsingGET({genePanelId}) ));
-    return _.keyBy(remoteData, (genePanel) => genePanel.genePanelId);
+    const remoteData = await Promise.all(
+        _.map(
+            uniquePanelIds,
+            async genePanelId =>
+                await client.getGenePanelUsingGET({ genePanelId })
+        )
+    );
+    return _.keyBy(remoteData, genePanel => genePanel.genePanelId);
 }
 
-export function fetchMyCancerGenomeData(): IMyCancerGenomeData
-{
-    const data:IMyCancerGenome[] = require('../../../resources/mycancergenome.json');
+export function fetchMyCancerGenomeData(): IMyCancerGenomeData {
+    const data: IMyCancerGenome[] = require('../../../resources/mycancergenome.json');
     return geneToMyCancerGenome(data);
 }
 
-export function fetchMutationalSignatureData(): IMutationalSignature[]
-{
+export function fetchMutationalSignatureData(): IMutationalSignature[] {
     return require('../../../resources/samplemutsigdata.json');
 }
 
-export function fetchMutationalSignatureMetaData(): IMutationalSignatureMeta[]{
+export function fetchMutationalSignatureMetaData(): IMutationalSignatureMeta[] {
     return require('../../../resources/mutsigmetadata.json');
 }
 
-export async function fetchOncoKbCancerGenes(client: OncoKbAPI = oncokbClient): Promise<CancerGene[]>
-{
+export async function fetchOncoKbCancerGenes(
+    client: OncoKbAPI = oncokbClient
+): Promise<CancerGene[]> {
     return await client.utilsCancerGeneListGetUsingGET_1({});
 }
 
-export async function fetchOncoKbData(uniqueSampleKeyToTumorType:{[uniqueSampleKey: string]: string},
-                                      annotatedGenes:{[entrezGeneId:number]:boolean}|Error,
-                                      mutationData:MobxPromise<Mutation[]>,
-                                      evidenceTypes?: string,
-                                      uncalledMutationData?:MobxPromise<Mutation[]>,
-                                      client: OncoKbAPI = oncokbClient)
-{
-    const mutationDataResult = concatMutationData(mutationData, uncalledMutationData);
+export async function fetchOncoKbData(
+    uniqueSampleKeyToTumorType: { [uniqueSampleKey: string]: string },
+    annotatedGenes: { [entrezGeneId: number]: boolean } | Error,
+    mutationData: MobxPromise<Mutation[]>,
+    evidenceTypes?: string,
+    uncalledMutationData?: MobxPromise<Mutation[]>,
+    client: OncoKbAPI = oncokbClient
+) {
+    const mutationDataResult = concatMutationData(
+        mutationData,
+        uncalledMutationData
+    );
 
     if (annotatedGenes instanceof Error) {
         return new Error();
-    }
-    else if (mutationDataResult.length === 0) {
+    } else if (mutationDataResult.length === 0) {
         return ONCOKB_DEFAULT;
     }
 
-    const mutationsToQuery = _.filter(mutationDataResult, m=>!!annotatedGenes[m.entrezGeneId]);
-    const queryVariants = _.uniqBy(_.map(mutationsToQuery, (mutation: Mutation) => {
-        return generateQueryVariant(mutation.gene.entrezGeneId,
-            cancerTypeForOncoKb(mutation.uniqueSampleKey, uniqueSampleKeyToTumorType),
-            mutation.proteinChange,
-            mutation.mutationType,
-            mutation.proteinPosStart,
-            mutation.proteinPosEnd);
-    }), "id");
-    return queryOncoKbData(queryVariants, uniqueSampleKeyToTumorType, client, evidenceTypes);
+    const mutationsToQuery = _.filter(
+        mutationDataResult,
+        m => !!annotatedGenes[m.entrezGeneId]
+    );
+    const queryVariants = _.uniqBy(
+        _.map(mutationsToQuery, (mutation: Mutation) => {
+            return generateQueryVariant(
+                mutation.gene.entrezGeneId,
+                cancerTypeForOncoKb(
+                    mutation.uniqueSampleKey,
+                    uniqueSampleKeyToTumorType
+                ),
+                mutation.proteinChange,
+                mutation.mutationType,
+                mutation.proteinPosStart,
+                mutation.proteinPosEnd
+            );
+        }),
+        'id'
+    );
+    return queryOncoKbData(
+        queryVariants,
+        uniqueSampleKeyToTumorType,
+        client,
+        evidenceTypes
+    );
 }
 
-export async function fetchCnaOncoKbData(uniqueSampleKeyToTumorType:{[uniqueSampleKey: string]: string},
-                                         annotatedGenes:{[entrezGeneId:number]:boolean},
-                                         discreteCNAData:MobxPromise<DiscreteCopyNumberData[]>,
-                                         client: OncoKbAPI = oncokbClient)
-{
+export async function fetchCnaOncoKbData(
+    uniqueSampleKeyToTumorType: { [uniqueSampleKey: string]: string },
+    annotatedGenes: { [entrezGeneId: number]: boolean },
+    discreteCNAData: MobxPromise<DiscreteCopyNumberData[]>,
+    client: OncoKbAPI = oncokbClient
+) {
     if (!discreteCNAData.result || discreteCNAData.result.length === 0) {
         return ONCOKB_DEFAULT;
+    } else {
+        const alterationsToQuery = _.filter(
+            discreteCNAData.result,
+            d => !!annotatedGenes[d.gene.entrezGeneId]
+        );
+        const queryVariants = _.uniqBy(
+            _.map(
+                alterationsToQuery,
+                (copyNumberData: DiscreteCopyNumberData) => {
+                    return generateQueryVariant(
+                        copyNumberData.gene.entrezGeneId,
+                        cancerTypeForOncoKb(
+                            copyNumberData.uniqueSampleKey,
+                            uniqueSampleKeyToTumorType
+                        ),
+                        getAlterationString(copyNumberData.alteration)
+                    );
+                }
+            ),
+            'id'
+        );
+        return queryOncoKbData(
+            queryVariants,
+            uniqueSampleKeyToTumorType,
+            client,
+            undefined
+        );
     }
-    else
-    {
-        const alterationsToQuery = _.filter(discreteCNAData.result, d=>!!annotatedGenes[d.gene.entrezGeneId]);
-        const queryVariants = _.uniqBy(_.map(alterationsToQuery, (copyNumberData: DiscreteCopyNumberData) => {
-            return generateQueryVariant(copyNumberData.gene.entrezGeneId,
-                cancerTypeForOncoKb(copyNumberData.uniqueSampleKey, uniqueSampleKeyToTumorType),
-                getAlterationString(copyNumberData.alteration));
-        }), "id");
-        return queryOncoKbData(queryVariants, uniqueSampleKeyToTumorType, client, undefined);
-    }
-}
-
-export async function fetchCnaOncoKbDataWithNumericGeneMolecularData(uniqueSampleKeyToTumorType:{[uniqueSampleKey: string]: string},
-                                         annotatedGenes:{[entrezGeneId:number]:boolean},
-                                         geneMolecularData:MobxPromise<NumericGeneMolecularData[]>,
-                                          molecularProfileIdToMolecularProfile:{[molecularProfileId:string]:MolecularProfile},
-                                         evidenceTypes?: string,
-                                         client: OncoKbAPI = oncokbClient)
-{
+}
+
+export async function fetchCnaOncoKbDataWithNumericGeneMolecularData(
+    uniqueSampleKeyToTumorType: { [uniqueSampleKey: string]: string },
+    annotatedGenes: { [entrezGeneId: number]: boolean },
+    geneMolecularData: MobxPromise<NumericGeneMolecularData[]>,
+    molecularProfileIdToMolecularProfile: {
+        [molecularProfileId: string]: MolecularProfile;
+    },
+    evidenceTypes?: string,
+    client: OncoKbAPI = oncokbClient
+) {
     if (!geneMolecularData.result || geneMolecularData.result.length === 0) {
         return ONCOKB_DEFAULT;
-    }
-    else
-    {
-        const alterationsToQuery = _.filter(geneMolecularData.result, molecularDatum=>{
-            return molecularProfileIdToMolecularProfile[molecularDatum.molecularProfileId].molecularAlterationType === AlterationTypeConstants.COPY_NUMBER_ALTERATION &&
-                !!annotatedGenes[molecularDatum.entrezGeneId];
-        });
-        const queryVariants = _.uniqBy(_.map(alterationsToQuery, (datum: NumericGeneMolecularData) => {
-            return generateQueryVariant(datum.entrezGeneId,
-                cancerTypeForOncoKb(datum.uniqueSampleKey, uniqueSampleKeyToTumorType),
-                getAlterationString(datum.value));
-        }), (query:Query)=>query.id);
-        return queryOncoKbData(queryVariants, uniqueSampleKeyToTumorType, client, evidenceTypes);
+    } else {
+        const alterationsToQuery = _.filter(
+            geneMolecularData.result,
+            molecularDatum => {
+                return (
+                    molecularProfileIdToMolecularProfile[
+                        molecularDatum.molecularProfileId
+                    ].molecularAlterationType ===
+                        AlterationTypeConstants.COPY_NUMBER_ALTERATION &&
+                    !!annotatedGenes[molecularDatum.entrezGeneId]
+                );
+            }
+        );
+        const queryVariants = _.uniqBy(
+            _.map(alterationsToQuery, (datum: NumericGeneMolecularData) => {
+                return generateQueryVariant(
+                    datum.entrezGeneId,
+                    cancerTypeForOncoKb(
+                        datum.uniqueSampleKey,
+                        uniqueSampleKeyToTumorType
+                    ),
+                    getAlterationString(datum.value)
+                );
+            }),
+            (query: Query) => query.id
+        );
+        return queryOncoKbData(
+            queryVariants,
+            uniqueSampleKeyToTumorType,
+            client,
+            evidenceTypes
+        );
     }
 }
 
-export function cancerTypeForOncoKb(uniqueSampleKey: string,
-                             uniqueSampleKeyToTumorType:{[uniqueSampleKey: string]: string}): string | null
-{
+export function cancerTypeForOncoKb(
+    uniqueSampleKey: string,
+    uniqueSampleKeyToTumorType: { [uniqueSampleKey: string]: string }
+): string | null {
     // first priority is sampleIdToTumorType map (derived either from the clinical data or from the study cancer type).
     // if it is not valid, then we return an empty string and let OncoKB API figure out what to do
     return uniqueSampleKeyToTumorType[uniqueSampleKey] || null;
 }
 
-export async function queryOncoKbData(queryVariants: Query[],
-                                      uniqueSampleKeyToTumorType: {[sampleId: string]: string},
-                                      client: OncoKbAPI = oncokbClient,
-                                      evidenceTypes?:string)
-{
-    const oncokbSearch = await client.searchPostUsingPOST(
-        {body: generateEvidenceQuery(queryVariants, evidenceTypes)});
+export async function queryOncoKbData(
+    queryVariants: Query[],
+    uniqueSampleKeyToTumorType: { [sampleId: string]: string },
+    client: OncoKbAPI = oncokbClient,
+    evidenceTypes?: string
+) {
+    const oncokbSearch = await client.searchPostUsingPOST({
+        body: generateEvidenceQuery(queryVariants, evidenceTypes),
+    });
 
     const oncoKbData: IOncoKbData = {
         uniqueSampleKeyToTumorType: uniqueSampleKeyToTumorType,
-        indicatorMap: generateIdToIndicatorMap(oncokbSearch)
+        indicatorMap: generateIdToIndicatorMap(oncokbSearch),
     };
 
     return oncoKbData;
 }
 
-export async function fetchCivicGenes(mutationData?:MobxPromise<Mutation[]>,
-                                      uncalledMutationData?:MobxPromise<Mutation[]>)
-{
-    const mutationDataResult = concatMutationData(mutationData, uncalledMutationData);
+export async function fetchCivicGenes(
+    mutationData?: MobxPromise<Mutation[]>,
+    uncalledMutationData?: MobxPromise<Mutation[]>
+) {
+    const mutationDataResult = concatMutationData(
+        mutationData,
+        uncalledMutationData
+    );
 
     if (mutationDataResult.length === 0) {
         return {};
@@ -707,13 +887,16 @@ export async function fetchCivicGenes(mutationData?:MobxPromise<Mutation[]>,
         entrezGeneSymbols.add(mutation.gene.entrezGeneId);
     });
 
-    let civicGenes: ICivicGene = await getCivicGenes(Array.from(entrezGeneSymbols));
+    let civicGenes: ICivicGene = await getCivicGenes(
+        Array.from(entrezGeneSymbols)
+    );
 
     return civicGenes;
 }
 
-export async function fetchCnaCivicGenes(discreteCNAData:MobxPromise<DiscreteCopyNumberData[]>)
-{
+export async function fetchCnaCivicGenes(
+    discreteCNAData: MobxPromise<DiscreteCopyNumberData[]>
+) {
     if (discreteCNAData.result && discreteCNAData.result.length > 0) {
         let entrezGeneSymbols: Set<number> = new Set([]);
 
@@ -723,7 +906,7 @@ export async function fetchCnaCivicGenes(discreteCNAData:MobxPromise<DiscreteCop
 
         let querySymbols: Array<number> = Array.from(entrezGeneSymbols);
 
-        let civicGenes: ICivicGene = (await getCivicGenes(querySymbols));
+        let civicGenes: ICivicGene = await getCivicGenes(querySymbols);
 
         return civicGenes;
     } else {
@@ -731,75 +914,95 @@ export async function fetchCnaCivicGenes(discreteCNAData:MobxPromise<DiscreteCop
     }
 }
 
-export async function fetchCivicVariants(civicGenes: ICivicGene,
-                                         mutationData?:MobxPromise<Mutation[]>,
-                                         uncalledMutationData?:MobxPromise<Mutation[]>)
-{
+export async function fetchCivicVariants(
+    civicGenes: ICivicGene,
+    mutationData?: MobxPromise<Mutation[]>,
+    uncalledMutationData?: MobxPromise<Mutation[]>
+) {
     let civicVariants: ICivicVariant = {};
-    const mutationDataResult = concatMutationData(mutationData, uncalledMutationData);
+    const mutationDataResult = concatMutationData(
+        mutationData,
+        uncalledMutationData
+    );
 
     if (mutationDataResult.length > 0) {
-        civicVariants = (await getCivicVariants(civicGenes, mutationDataResult));
-    }
-    else if (!_.isEmpty(civicGenes)) {
-        civicVariants = (await getCivicVariants(civicGenes));
+        civicVariants = await getCivicVariants(civicGenes, mutationDataResult);
+    } else if (!_.isEmpty(civicGenes)) {
+        civicVariants = await getCivicVariants(civicGenes);
     }
 
     return civicVariants;
 }
 
-export async function fetchDiscreteCNAData(discreteCopyNumberFilter:DiscreteCopyNumberFilter,
-                                           molecularProfileIdDiscrete:MobxPromise<string>,
-                                           client:CBioPortalAPI = defaultClient)
-{
-    if (molecularProfileIdDiscrete.isComplete && molecularProfileIdDiscrete.result) {
-        return await client.fetchDiscreteCopyNumbersInMolecularProfileUsingPOST({
-            projection: 'DETAILED',
-            discreteCopyNumberFilter,
-            molecularProfileId: molecularProfileIdDiscrete.result
-        });
+export async function fetchDiscreteCNAData(
+    discreteCopyNumberFilter: DiscreteCopyNumberFilter,
+    molecularProfileIdDiscrete: MobxPromise<string>,
+    client: CBioPortalAPI = defaultClient
+) {
+    if (
+        molecularProfileIdDiscrete.isComplete &&
+        molecularProfileIdDiscrete.result
+    ) {
+        return await client.fetchDiscreteCopyNumbersInMolecularProfileUsingPOST(
+            {
+                projection: 'DETAILED',
+                discreteCopyNumberFilter,
+                molecularProfileId: molecularProfileIdDiscrete.result,
+            }
+        );
     } else {
         return [];
     }
 }
 
-export function findMolecularProfileIdDiscrete(molecularProfilesInStudy:MobxPromise<MolecularProfile[]>)
-{
+export function findMolecularProfileIdDiscrete(
+    molecularProfilesInStudy: MobxPromise<MolecularProfile[]>
+) {
     if (!molecularProfilesInStudy.result) {
         return undefined;
     }
 
-    const profile = molecularProfilesInStudy.result.find((p: MolecularProfile) => {
-        return p.datatype === 'DISCRETE';
-    });
+    const profile = molecularProfilesInStudy.result.find(
+        (p: MolecularProfile) => {
+            return p.datatype === 'DISCRETE';
+        }
+    );
 
     return profile ? profile.molecularProfileId : undefined;
 }
 
-export function isMutationProfile(profile:MolecularProfile):boolean {
-    return profile.molecularAlterationType === "MUTATION_EXTENDED";
+export function isMutationProfile(profile: MolecularProfile): boolean {
+    return profile.molecularAlterationType === 'MUTATION_EXTENDED';
 }
 
-export function findMutationMolecularProfile(molecularProfilesInStudy: MobxPromise<MolecularProfile[]>,
-                                             studyId:string,
-                                             suffix:string = MOLECULAR_PROFILE_MUTATIONS_SUFFIX)
-{
+export function findMutationMolecularProfile(
+    molecularProfilesInStudy: MobxPromise<MolecularProfile[]>,
+    studyId: string,
+    suffix: string = MOLECULAR_PROFILE_MUTATIONS_SUFFIX
+) {
     if (!molecularProfilesInStudy.result) {
         return undefined;
     }
 
-    const profile = molecularProfilesInStudy.result.find((p: MolecularProfile) => {
-        return p.molecularProfileId === `${studyId}${suffix}`;
-    });
+    const profile = molecularProfilesInStudy.result.find(
+        (p: MolecularProfile) => {
+            return p.molecularProfileId === `${studyId}${suffix}`;
+        }
+    );
 
     return profile;
 }
 
-export function findUncalledMutationMolecularProfileId(molecularProfilesInStudy: MobxPromise<MolecularProfile[]>,
-                                                     studyId:string,
-                                                     suffix:string = MOLECULAR_PROFILE_UNCALLED_MUTATIONS_SUFFIX)
-{
-    const profile = findMutationMolecularProfile(molecularProfilesInStudy, studyId, suffix);
+export function findUncalledMutationMolecularProfileId(
+    molecularProfilesInStudy: MobxPromise<MolecularProfile[]>,
+    studyId: string,
+    suffix: string = MOLECULAR_PROFILE_UNCALLED_MUTATIONS_SUFFIX
+) {
+    const profile = findMutationMolecularProfile(
+        molecularProfilesInStudy,
+        studyId,
+        suffix
+    );
     if (profile) {
         return profile.molecularProfileId;
     } else {
@@ -807,41 +1010,47 @@ export function findUncalledMutationMolecularProfileId(molecularProfilesInStudy:
     }
 }
 
-export function findMrnaRankMolecularProfileId(molecularProfilesInStudy: MobxPromise<MolecularProfile[]>)
-{
+export function findMrnaRankMolecularProfileId(
+    molecularProfilesInStudy: MobxPromise<MolecularProfile[]>
+) {
     if (!molecularProfilesInStudy.result) {
         return null;
     }
 
     const regex1 = /^.+rna_seq.*_zscores$/; // We prefer profiles that look like this
     const regex2 = /^.*_zscores$/; // If none of the above are available, we'll look for ones like this
-    const preferredProfile: (MolecularProfile | undefined) = molecularProfilesInStudy.result.find(
-        (gp: MolecularProfile) => regex1.test(gp.molecularProfileId.toLowerCase()));
+    const preferredProfile:
+        | MolecularProfile
+        | undefined = molecularProfilesInStudy.result.find(
+        (gp: MolecularProfile) =>
+            regex1.test(gp.molecularProfileId.toLowerCase())
+    );
 
     if (preferredProfile) {
         return preferredProfile.molecularProfileId;
     } else {
-        const fallbackProfile: (MolecularProfile | undefined) = molecularProfilesInStudy.result.find(
-            (gp: MolecularProfile) => regex2.test(gp.molecularProfileId.toLowerCase()));
+        const fallbackProfile:
+            | MolecularProfile
+            | undefined = molecularProfilesInStudy.result.find(
+            (gp: MolecularProfile) =>
+                regex2.test(gp.molecularProfileId.toLowerCase())
+        );
 
         return fallbackProfile ? fallbackProfile.molecularProfileId : null;
     }
 }
 
+export function generateUniqueSampleKeyToTumorTypeMap(
+    clinicalDataForSamples: MobxPromise<ClinicalData[]>,
+    studies?: MobxPromise<CancerStudy[]>,
+    samples?: MobxPromise<Sample[]>
+): { [sampleId: string]: string } {
+    const map: { [sampleId: string]: string } = {};
 
-
-export function generateUniqueSampleKeyToTumorTypeMap(clinicalDataForSamples: MobxPromise<ClinicalData[]>,
-                                               studies?: MobxPromise<CancerStudy[]>,
-                                               samples?: MobxPromise<Sample[]>): {[sampleId: string]: string}
-
-{
-    const map: {[sampleId: string]: string} = {};
-
-    if (clinicalDataForSamples.result)
-    {
+    if (clinicalDataForSamples.result) {
         // first priority is CANCER_TYPE_DETAILED in clinical data
         _.each(clinicalDataForSamples.result, (clinicalData: ClinicalData) => {
-            if (clinicalData.clinicalAttributeId === "CANCER_TYPE_DETAILED") {
+            if (clinicalData.clinicalAttributeId === 'CANCER_TYPE_DETAILED') {
                 map[clinicalData.uniqueSampleKey] = clinicalData.value;
             }
         });
@@ -856,13 +1065,13 @@ export function generateUniqueSampleKeyToTumorTypeMap(clinicalDataForSamples: Mo
     }
 
     // last resort: fall back to the study cancer type
-    if (studies && studies.result && samples && samples.result)
-    {
+    if (studies && studies.result && samples && samples.result) {
         const studyIdToCancerType = makeStudyToCancerTypeMap(studies.result);
 
         _.each(samples.result, (sample: Sample) => {
             if (map[sample.uniqueSampleKey] === undefined) {
-                map[sample.uniqueSampleKey] = studyIdToCancerType[sample.studyId];
+                map[sample.uniqueSampleKey] =
+                    studyIdToCancerType[sample.studyId];
             }
         });
     }
@@ -870,9 +1079,10 @@ export function generateUniqueSampleKeyToTumorTypeMap(clinicalDataForSamples: Mo
     return map;
 }
 
-export function mergeDiscreteCNAData(discreteCNAData:MobxPromise<DiscreteCopyNumberData[]>)
-{
-    const idToCNAs: {[key: string]: DiscreteCopyNumberData[]} = {};
+export function mergeDiscreteCNAData(
+    discreteCNAData: MobxPromise<DiscreteCopyNumberData[]>
+) {
+    const idToCNAs: { [key: string]: DiscreteCopyNumberData[] } = {};
 
     if (discreteCNAData.result) {
         for (const d of discreteCNAData.result) {
@@ -882,45 +1092,62 @@ export function mergeDiscreteCNAData(discreteCNAData:MobxPromise<DiscreteCopyNum
         }
     }
 
-    return Object.keys(idToCNAs).map((id:string) => idToCNAs[id]);
+    return Object.keys(idToCNAs).map((id: string) => idToCNAs[id]);
 }
 
-export function mergeMutations(mutationData:MobxPromise<Mutation[]>,
-                               generateMutationId:MutationIdGenerator = generateMutationIdByGeneAndProteinChangeAndEvent)
-{
-    const idToMutations: {[key: string]: Mutation[]} = {};
+export function mergeMutations(
+    mutationData: MobxPromise<Mutation[]>,
+    generateMutationId: MutationIdGenerator = generateMutationIdByGeneAndProteinChangeAndEvent
+) {
+    const idToMutations: { [key: string]: Mutation[] } = {};
 
-    updateIdToMutationsMap(idToMutations, mutationData, generateMutationId, false);
+    updateIdToMutationsMap(
+        idToMutations,
+        mutationData,
+        generateMutationId,
+        false
+    );
 
-    return Object.keys(idToMutations).map((id:string) => idToMutations[id]);
+    return Object.keys(idToMutations).map((id: string) => idToMutations[id]);
 }
 
-export function indexPdbAlignmentData(alignmentData: MobxPromise<Alignment[]>)
-{
+export function indexPdbAlignmentData(alignmentData: MobxPromise<Alignment[]>) {
     return indexPdbAlignments(alignmentData.result || []);
 }
 
-export function mergeMutationsIncludingUncalled(mutationData:MobxPromise<Mutation[]>,
-                                                uncalledMutationData:MobxPromise<Mutation[]>,
-                                                generateMutationId:MutationIdGenerator = generateMutationIdByGeneAndProteinChangeAndEvent)
-{
-    const idToMutations: {[key: string]: Mutation[]} = {};
+export function mergeMutationsIncludingUncalled(
+    mutationData: MobxPromise<Mutation[]>,
+    uncalledMutationData: MobxPromise<Mutation[]>,
+    generateMutationId: MutationIdGenerator = generateMutationIdByGeneAndProteinChangeAndEvent
+) {
+    const idToMutations: { [key: string]: Mutation[] } = {};
 
-    updateIdToMutationsMap(idToMutations, mutationData, generateMutationId, false);
-    updateIdToMutationsMap(idToMutations, uncalledMutationData, generateMutationId, true);
+    updateIdToMutationsMap(
+        idToMutations,
+        mutationData,
+        generateMutationId,
+        false
+    );
+    updateIdToMutationsMap(
+        idToMutations,
+        uncalledMutationData,
+        generateMutationId,
+        true
+    );
 
-    return Object.keys(idToMutations).map((id:string) => idToMutations[id]);
+    return Object.keys(idToMutations).map((id: string) => idToMutations[id]);
 }
 
-function updateIdToMutationsMap(idToMutations: {[key: string]: Mutation[]},
-                                mutationData:MobxPromise<Mutation[]>,
-                                generateMutationId:MutationIdGenerator = generateMutationIdByGeneAndProteinChangeAndEvent,
-                                onlyUpdateExistingIds: boolean)
-{
+function updateIdToMutationsMap(
+    idToMutations: { [key: string]: Mutation[] },
+    mutationData: MobxPromise<Mutation[]>,
+    generateMutationId: MutationIdGenerator = generateMutationIdByGeneAndProteinChangeAndEvent,
+    onlyUpdateExistingIds: boolean
+) {
     if (mutationData.result) {
         for (const mutation of mutationData.result) {
             const mutationId = generateMutationId(mutation);
-            if (!onlyUpdateExistingIds || (mutationId in idToMutations)) {
+            if (!onlyUpdateExistingIds || mutationId in idToMutations) {
                 idToMutations[mutationId] = idToMutations[mutationId] || [];
                 idToMutations[mutationId].push(mutation);
             }
@@ -928,67 +1155,94 @@ function updateIdToMutationsMap(idToMutations: {[key: string]: Mutation[]},
     }
 }
 
-export function concatMutationData(mutationData?:MobxPromise<Mutation[]>,
-                                   uncalledMutationData?:MobxPromise<Mutation[]>): Mutation[]
-{
-    const mutationDataResult:Mutation[] = mutationData && mutationData.result ?
-        mutationData.result : [];
+export function concatMutationData(
+    mutationData?: MobxPromise<Mutation[]>,
+    uncalledMutationData?: MobxPromise<Mutation[]>
+): Mutation[] {
+    const mutationDataResult: Mutation[] =
+        mutationData && mutationData.result ? mutationData.result : [];
 
-    const uncalledMutationDataResult:Mutation[] = uncalledMutationData && uncalledMutationData.result ?
-        uncalledMutationData.result : [];
+    const uncalledMutationDataResult: Mutation[] =
+        uncalledMutationData && uncalledMutationData.result
+            ? uncalledMutationData.result
+            : [];
 
     return mutationDataResult.concat(uncalledMutationDataResult);
 }
 
 function mutationEventFields(m: Mutation) {
-    return [m.chr, m.startPosition, m.endPosition, m.referenceAllele, m.variantAllele];
+    return [
+        m.chr,
+        m.startPosition,
+        m.endPosition,
+        m.referenceAllele,
+        m.variantAllele,
+    ];
 }
 
 export function generateMutationIdByEvent(m: Mutation): string {
-    return mutationEventFields(m).join("_");
+    return mutationEventFields(m).join('_');
 }
 
-export function generateMutationIdByGeneAndProteinChangeAndEvent(m: Mutation): string {
-    return [m.gene.hugoGeneSymbol, m.proteinChange, ...mutationEventFields(m)].join("_");
+export function generateMutationIdByGeneAndProteinChangeAndEvent(
+    m: Mutation
+): string {
+    return [
+        m.gene.hugoGeneSymbol,
+        m.proteinChange,
+        ...mutationEventFields(m),
+    ].join('_');
 }
 
-export function generateDataQueryFilter(sampleListId: string|null, sampleIds?: string[]): IDataQueryFilter
-{
+export function generateDataQueryFilter(
+    sampleListId: string | null,
+    sampleIds?: string[]
+): IDataQueryFilter {
     let filter: IDataQueryFilter = {};
 
     if (sampleListId) {
         filter = {
-            sampleListId
+            sampleListId,
         };
-    }
-    else if (sampleIds) {
+    } else if (sampleIds) {
         filter = {
-            sampleIds
+            sampleIds,
         };
     }
 
     return filter;
 }
 
-export function makeStudyToCancerTypeMap(studies:CancerStudy[]): {[studyId: string]: string} {
-    return studies.reduce((map:{[studyId:string]:string}, next:CancerStudy) => {
-        map[next.studyId] = next.cancerType.name;
-        return map;
-    }, {});
-}
-
-export function groupBySampleId(sampleIds: Array<string>, clinicalDataArray: Array<ClinicalData>) {
-    return _.map(
-        sampleIds,
-        (k: string) => ({
-            id: k,
-            clinicalData: clinicalDataArray.filter((cd: ClinicalData) => cd.sampleId === k)
-        })
+export function makeStudyToCancerTypeMap(
+    studies: CancerStudy[]
+): { [studyId: string]: string } {
+    return studies.reduce(
+        (map: { [studyId: string]: string }, next: CancerStudy) => {
+            map[next.studyId] = next.cancerType.name;
+            return map;
+        },
+        {}
     );
 }
 
-export function groupBy<T>(data:T[], keyFn:(d:T)=>string, defaultKeys:string[]=[]):{[key:string]:T[]} {
-    const ret:{[key:string]:T[]} = {};
+export function groupBySampleId(
+    sampleIds: Array<string>,
+    clinicalDataArray: Array<ClinicalData>
+) {
+    return _.map(sampleIds, (k: string) => ({
+        id: k,
+        clinicalData: clinicalDataArray.filter(
+            (cd: ClinicalData) => cd.sampleId === k
+        ),
+    }));
+}
+
+export function groupBy<T>(
+    data: T[],
+    keyFn: (d: T) => string,
+    defaultKeys: string[] = []
+): { [key: string]: T[] } {
+    const ret: { [key: string]: T[] } = {};
     for (const key of defaultKeys) {
         ret[key] = [];
     }
@@ -1001,8 +1255,18 @@ export function groupBy<T>(data:T[], keyFn:(d:T)=>string, defaultKeys:string[]=[
 }
 
 export async function getHierarchyData(
-        geneticProfileId: string, percentile: number, scoreThreshold: number, pvalueThreshold: number,
-        sampleListId: string|undefined,  client:CBioPortalAPIInternal = internalClient) {
-    return await client.fetchGenesetHierarchyInfoUsingPOST({geneticProfileId, percentile, scoreThreshold,
-        pvalueThreshold, sampleListId});
+    geneticProfileId: string,
+    percentile: number,
+    scoreThreshold: number,
+    pvalueThreshold: number,
+    sampleListId: string | undefined,
+    client: CBioPortalAPIInternal = internalClient
+) {
+    return await client.fetchGenesetHierarchyInfoUsingPOST({
+        geneticProfileId,
+        percentile,
+        scoreThreshold,
+        pvalueThreshold,
+        sampleListId,
+    });
 }
diff --git a/src/shared/lib/TimeUtils.ts b/src/shared/lib/TimeUtils.ts
index c815242429a..f1a91d671ce 100644
--- a/src/shared/lib/TimeUtils.ts
+++ b/src/shared/lib/TimeUtils.ts
@@ -2,17 +2,21 @@ export function sleep(ms: number) {
     return new Promise(resolve => setTimeout(resolve, ms));
 }
 
-export function sleepUntil(predicate:()=>boolean, intervalMs:number=100, timeoutMs:number=2000) {
-    return new Promise(resolve=>{
+export function sleepUntil(
+    predicate: () => boolean,
+    intervalMs: number = 100,
+    timeoutMs: number = 2000
+) {
+    return new Promise(resolve => {
         let timeElapsed = 0;
-        const interval = setInterval(()=>{
+        const interval = setInterval(() => {
             timeElapsed += intervalMs;
             if (predicate()) {
                 clearInterval(interval);
                 resolve();
             } else if (timeElapsed > timeoutMs) {
                 clearInterval(interval);
-                throw new Error("sleepUntil timeout");
+                throw new Error('sleepUntil timeout');
             }
         }, intervalMs);
     });
diff --git a/src/shared/lib/TypeScriptUtils.ts b/src/shared/lib/TypeScriptUtils.ts
index 7b5f23e50dc..3e4c5052318 100644
--- a/src/shared/lib/TypeScriptUtils.ts
+++ b/src/shared/lib/TypeScriptUtils.ts
@@ -1 +1 @@
-export type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
\ No newline at end of file
+export type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
diff --git a/src/shared/lib/URLWrapper.spec.ts b/src/shared/lib/URLWrapper.spec.ts
index 6d81553b0b0..3cec60ebbd9 100644
--- a/src/shared/lib/URLWrapper.spec.ts
+++ b/src/shared/lib/URLWrapper.spec.ts
@@ -1,15 +1,16 @@
-import {assert} from "chai";
-import ResultsViewURLWrapper from "pages/resultsView/ResultsViewURLWrapper";
-import {autorun, observable, reaction} from "mobx";
-import ExtendedRouterStore, {PortalSession} from "shared/lib/ExtendedRouterStore";
-import sinon from "sinon";
-import {createMemoryHistory} from "react-router";
-import {syncHistoryWithStore} from "mobx-react-router";
-import memoize from "memoize-weak-decorator";
-import {needToLoadSession} from "shared/lib/URLWrapper";
-
-describe("URLWrapper", () => {
-
+import { assert } from 'chai';
+import ResultsViewURLWrapper from 'pages/resultsView/ResultsViewURLWrapper';
+import { autorun, observable, reaction } from 'mobx';
+import ExtendedRouterStore, {
+    PortalSession,
+} from 'shared/lib/ExtendedRouterStore';
+import sinon from 'sinon';
+import { createMemoryHistory } from 'react-router';
+import { syncHistoryWithStore } from 'mobx-react-router';
+import memoize from 'memoize-weak-decorator';
+import { needToLoadSession } from 'shared/lib/URLWrapper';
+
+describe('URLWrapper', () => {
     let routingStore: ExtendedRouterStore;
 
     let wrapper: ResultsViewURLWrapper;
@@ -19,41 +20,50 @@ describe("URLWrapper", () => {
         const memoryHistory = createMemoryHistory();
         const history = syncHistoryWithStore(memoryHistory, routingStore);
         wrapper = new ResultsViewURLWrapper(routingStore);
-        routingStore.updateRoute({}, "/results");
+        routingStore.updateRoute({}, '/results');
     });
 
-    it("reacts to change in underling router store", () => {
-
-        routingStore.updateRoute({clinicallist: "monkeys"}, "/results");
+    it('reacts to change in underling router store', () => {
+        routingStore.updateRoute({ clinicallist: 'monkeys' }, '/results');
 
         const wrapper = new ResultsViewURLWrapper(routingStore);
 
-        assert.equal(wrapper.query.clinicallist, "monkeys", "handles undefined properties");
-        routingStore.updateRoute({clinicallist: "donkeys"});
-        assert.equal(wrapper.query.clinicallist, "donkeys", "handles undefined properties");
-
-
+        assert.equal(
+            wrapper.query.clinicallist,
+            'monkeys',
+            'handles undefined properties'
+        );
+        routingStore.updateRoute({ clinicallist: 'donkeys' });
+        assert.equal(
+            wrapper.query.clinicallist,
+            'donkeys',
+            'handles undefined properties'
+        );
     });
 
+    it('resolves properties aliases correctly', () => {
+        routingStore.updateRoute({
+            cancer_study_id: 'some_study_id',
+            non_property: 'foo',
+        });
 
-    it("resolves properties aliases correctly", () => {
-
-        routingStore.updateRoute({cancer_study_id: "some_study_id", non_property: "foo"});
-
-        assert.equal(wrapper.query.cancer_study_list, "some_study_id", "alias resolves to correct param");
-
-        assert.notProperty(wrapper.query, "cancer_study_id");
+        assert.equal(
+            wrapper.query.cancer_study_list,
+            'some_study_id',
+            'alias resolves to correct param'
+        );
 
+        assert.notProperty(wrapper.query, 'cancer_study_id');
     });
 
-    it("resolves properties correctly", () => {
-        routingStore.updateRoute({case_ids: "bar", non_property: "foo"});
-        assert.notProperty(wrapper.query, "non_property");
-        assert.equal(wrapper.query.case_ids, "bar");
+    it('resolves properties correctly', () => {
+        routingStore.updateRoute({ case_ids: 'bar', non_property: 'foo' });
+        assert.notProperty(wrapper.query, 'non_property');
+        assert.equal(wrapper.query.case_ids, 'bar');
     });
 
-    it("reacts to underlying routing store according to rules", () => {
-        routingStore.updateRoute({case_ids: "bar", non_property: "foo"});
+    it('reacts to underlying routing store according to rules', () => {
+        routingStore.updateRoute({ case_ids: 'bar', non_property: 'foo' });
 
         const stub = sinon.stub();
 
@@ -61,54 +71,78 @@ describe("URLWrapper", () => {
 
         assert.equal(stub.args.length, 0, "stub hasn't been called");
 
-        routingStore.updateRoute({case_ids: "bar2", non_property: "foo"});
+        routingStore.updateRoute({ case_ids: 'bar2', non_property: 'foo' });
 
-        assert.equal(stub.args.length, 1, "stub has been called due to update to property");
+        assert.equal(
+            stub.args.length,
+            1,
+            'stub has been called due to update to property'
+        );
 
-        routingStore.updateRoute({case_ids: "bar2", non_property: "foo"});
+        routingStore.updateRoute({ case_ids: 'bar2', non_property: 'foo' });
 
-        assert.equal(stub.args.length, 1, "setting property to existing value does not cause reaction");
+        assert.equal(
+            stub.args.length,
+            1,
+            'setting property to existing value does not cause reaction'
+        );
 
-        routingStore.updateRoute({cancer_study_list: "study1"});
+        routingStore.updateRoute({ cancer_study_list: 'study1' });
 
         assert.equal(
             stub.args.length,
             1,
-            "setting query property which is not referenced in reaction does not cause reaction"
+            'setting query property which is not referenced in reaction does not cause reaction'
         );
 
-        routingStore.updateRoute({case_ids: "bar3", non_property: "foo"});
+        routingStore.updateRoute({ case_ids: 'bar3', non_property: 'foo' });
 
-        assert.equal(stub.args.length, 2, "setting property to knew value DOES cause reaction");
+        assert.equal(
+            stub.args.length,
+            2,
+            'setting property to knew value DOES cause reaction'
+        );
 
-        routingStore.updateRoute({case_ids: "bar4", non_property: "foo"}, "/patient");
+        routingStore.updateRoute(
+            { case_ids: 'bar4', non_property: 'foo' },
+            '/patient'
+        );
 
-        assert.equal(stub.args.length, 2, "does not react when pathname doesn't match");
+        assert.equal(
+            stub.args.length,
+            2,
+            "does not react when pathname doesn't match"
+        );
 
         disposer();
     });
 
     it('hash composed only of session props', () => {
-
-        routingStore.updateRoute({case_ids: "bar", non_property: "foo"});
+        routingStore.updateRoute({ case_ids: 'bar', non_property: 'foo' });
         const beforeChange = wrapper.hash;
 
-        routingStore.updateRoute({clinicallist: "1,2,3"});
-        assert.equal(wrapper.hash, beforeChange, "hash doesn't change if we mutate non session prop");
-
-        routingStore.updateRoute({case_ids: "blah", non_property: "foo"});
-        assert.notEqual(wrapper.hash, beforeChange, "hash changes if we mutate session prop");
+        routingStore.updateRoute({ clinicallist: '1,2,3' });
+        assert.equal(
+            wrapper.hash,
+            beforeChange,
+            "hash doesn't change if we mutate non session prop"
+        );
 
+        routingStore.updateRoute({ case_ids: 'blah', non_property: 'foo' });
+        assert.notEqual(
+            wrapper.hash,
+            beforeChange,
+            'hash changes if we mutate session prop'
+        );
     });
 
-    it("sets and reads from internal session appropriately", (done) => {
+    it('sets and reads from internal session appropriately', done => {
+        const stub = sinon.stub(wrapper, 'saveRemoteSession');
 
-        const stub = sinon.stub(wrapper, "saveRemoteSession");
-
-        stub.callsFake(function (sessionData) {
-            return new Promise((resolve) => {
+        stub.callsFake(function(sessionData) {
+            return new Promise(resolve => {
                 setTimeout(() => {
-                    return resolve({id: "someSessionId"});
+                    return resolve({ id: 'someSessionId' });
                 }, 5);
             });
         });
@@ -117,38 +151,53 @@ describe("URLWrapper", () => {
 
         wrapper.urlCharThresholdForSession = 0;
 
-        wrapper.updateURL({clinicallist: "one,two,three", case_ids: "1231"});
+        wrapper.updateURL({ clinicallist: 'one,two,three', case_ids: '1231' });
 
-        assert(stub.calledOnce, "save session method is called");
+        assert(stub.calledOnce, 'save session method is called');
 
-        assert.equal(wrapper.sessionId, "pending", "pending session state");
+        assert.equal(wrapper.sessionId, 'pending', 'pending session state');
 
-        assert.equal(wrapper.query.clinicallist, "one,two,three", "non session is present in query");
+        assert.equal(
+            wrapper.query.clinicallist,
+            'one,two,three',
+            'non session is present in query'
+        );
 
-        assert.equal(routingStore.location.query.clinicallist, "one,two,three", "non session params present in url");
+        assert.equal(
+            routingStore.location.query.clinicallist,
+            'one,two,three',
+            'non session params present in url'
+        );
 
-        assert.isNotTrue("clinicallist" in wrapper._sessionData!.query, "non session params NOT present in internal session store");
+        assert.isNotTrue(
+            'clinicallist' in wrapper._sessionData!.query,
+            'non session params NOT present in internal session store'
+        );
 
-        assert.isUndefined(routingStore.location.query.case_ids, "session params NOT in url");
+        assert.isUndefined(
+            routingStore.location.query.case_ids,
+            'session params NOT in url'
+        );
 
-        assert.equal(wrapper.query.case_ids, "1231", "we have access to session prop on query");
+        assert.equal(
+            wrapper.query.case_ids,
+            '1231',
+            'we have access to session prop on query'
+        );
 
         setTimeout(() => {
-            assert.equal(wrapper.sessionId, "someSessionId");
+            assert.equal(wrapper.sessionId, 'someSessionId');
             done();
         }, 10);
-
     });
 
+    it('respects url length threshold for session', done => {
+        const stub = sinon.stub(wrapper, 'saveRemoteSession');
 
-    it("respects url length threshold for session", (done) => {
-
-        const stub = sinon.stub(wrapper, "saveRemoteSession");
-
-        stub.callsFake(function (sessionData) {
-            return new Promise((resolve) => {
+        stub.callsFake(function(sessionData) {
+            return new Promise(resolve => {
                 setTimeout(() => {
-                    return resolve({id: "someSessionId"});
+                    return resolve({ id: 'someSessionId' });
                 }, 5);
             });
         });
@@ -157,77 +206,94 @@ describe("URLWrapper", () => {
 
         wrapper.urlCharThresholdForSession = 14;
 
-        wrapper.updateURL({clinicallist: "one,two,three", case_ids: "1231"});
+        wrapper.updateURL({ clinicallist: 'one,two,three', case_ids: '1231' });
 
-        assert.equal(routingStore.location.query.case_ids, "1231");
+        assert.equal(routingStore.location.query.case_ids, '1231');
 
-        assert.isFalse(stub.called, "save session method is NOT called b/c thresshold is not met");
+        assert.isFalse(
+            stub.called,
+            'save session method is NOT called b/c thresshold is not met'
+        );
 
-        assert.isUndefined(wrapper.sessionId,"no sessionID");
+        assert.isUndefined(wrapper.sessionId, 'no sessionID');
 
-        wrapper.updateURL({clinicallist: "one,two,three", case_ids: "12312341234"});
+        wrapper.updateURL({
+            clinicallist: 'one,two,three',
+            case_ids: '12312341234',
+        });
 
-        assert.isUndefined(routingStore.location.query.case_ids, "case_ids no longer in url");
+        assert.isUndefined(
+            routingStore.location.query.case_ids,
+            'case_ids no longer in url'
+        );
 
-        assert.isTrue(stub.calledOnce, "save session method IS called when thresshold is met");
+        assert.isTrue(
+            stub.calledOnce,
+            'save session method IS called when thresshold is met'
+        );
 
         // EVEN IF URL is under threshold, you cannot go back to non session behavior
-        wrapper.updateURL({clinicallist: "one,two,three", case_ids: "2222"});
+        wrapper.updateURL({ clinicallist: 'one,two,three', case_ids: '2222' });
 
         assert.isUndefined(routingStore.location.query.case_ids);
-        assert.equal(wrapper.query.case_ids, "2222");
+        assert.equal(wrapper.query.case_ids, '2222');
 
-        setTimeout(()=>{
-            assert.equal(wrapper.query.case_ids, "2222");
+        setTimeout(() => {
+            assert.equal(wrapper.query.case_ids, '2222');
             assert.isUndefined(routingStore.location.query.case_ids);
             done();
-        },50)
-
+        }, 50);
     });
 
-    it("respects sessionEnabled flag and thresholds", () => {
-
-        const stub = sinon.stub(wrapper, "saveRemoteSession");
+    it('respects sessionEnabled flag and thresholds', () => {
+        const stub = sinon.stub(wrapper, 'saveRemoteSession');
 
         wrapper.sessionEnabled = false;
 
         wrapper.urlCharThresholdForSession = 0;
 
-        wrapper.updateURL({clinicallist: "one,two,three", case_ids: "1231"});
-
-        assert.isFalse(stub.called, "does not call create session");
+        wrapper.updateURL({ clinicallist: 'one,two,three', case_ids: '1231' });
 
-        assert.isFalse(wrapper.hasSessionId, "does not have session id");
+        assert.isFalse(stub.called, 'does not call create session');
 
-        assert.equal(routingStore.location.query.case_ids, "1231", "puts session prop in url");
+        assert.isFalse(wrapper.hasSessionId, 'does not have session id');
 
-        assert.equal(wrapper.query.case_ids, "1231", "obtains session prop from url");
+        assert.equal(
+            routingStore.location.query.case_ids,
+            '1231',
+            'puts session prop in url'
+        );
 
+        assert.equal(
+            wrapper.query.case_ids,
+            '1231',
+            'obtains session prop from url'
+        );
     });
 
+    it('fetches remote session as necessary', done => {
+        const stub = sinon.stub(wrapper, 'getRemoteSession');
 
-    it("fetches remote session as necessary", (done) => {
-
-        const stub = sinon.stub(wrapper, "getRemoteSession");
-
-        stub.callsFake(function (sessionData) {
-            return new Promise((resolve) => {
+        stub.callsFake(function(sessionData) {
+            return new Promise(resolve => {
                 setTimeout(() => {
                     return resolve({
-                                       "id": "5dcae586e4b04a9c23e27e5f",
-                                       "data": {
-                                           "genetic_profile_ids_PROFILE_COPY_NUMBER_ALTERATION": "msk_impact_2017_cna",
-                                           "Z_SCORE_THRESHOLD": "2.0",
-                                           "gene_list": "CDKN2A%20MDM2%20MDM4%20TP53",
-                                           "case_set_id": "msk_impact_2017_cnaseq",
-                                           "RPPA_SCORE_THRESHOLD": "2.0",
-                                           "cancer_study_list": "msk_impact_2017",
-                                           "geneset_list": " ",
-                                           "genetic_profile_ids_PROFILE_MUTATION_EXTENDED": "msk_impact_2017_mutations"
-                                       },
-                                       "source": "public_portal",
-                                       "type": "main_session"
-                                   });
+                        id: '5dcae586e4b04a9c23e27e5f',
+                        data: {
+                            genetic_profile_ids_PROFILE_COPY_NUMBER_ALTERATION:
+                                'msk_impact_2017_cna',
+                            Z_SCORE_THRESHOLD: '2.0',
+                            gene_list: 'CDKN2A%20MDM2%20MDM4%20TP53',
+                            case_set_id: 'msk_impact_2017_cnaseq',
+                            RPPA_SCORE_THRESHOLD: '2.0',
+                            cancer_study_list: 'msk_impact_2017',
+                            geneset_list: ' ',
+                            genetic_profile_ids_PROFILE_MUTATION_EXTENDED:
+                                'msk_impact_2017_mutations',
+                        },
+                        source: 'public_portal',
+                        type: 'main_session',
+                    });
                 }, 5);
             });
         });
@@ -239,49 +305,47 @@ describe("URLWrapper", () => {
             wrapper.isLoadingSession;
         });
 
-        routingStore.updateRoute({session_id: "5dcae586e4b04a9c23e27e5f"});
+        routingStore.updateRoute({ session_id: '5dcae586e4b04a9c23e27e5f' });
 
-        assert.isTrue(wrapper.isLoadingSession, "it is loading session");
-        assert.isFalse(wrapper.isPendingSession, "it is NOT pending session");
+        assert.isTrue(wrapper.isLoadingSession, 'it is loading session');
+        assert.isFalse(wrapper.isPendingSession, 'it is NOT pending session');
 
         setTimeout(() => {
             assert.isTrue(stub.calledOnce);
 
             assert.isTrue(stub.calledOnce);
 
-            assert.equal(wrapper.query.gene_list, "CDKN2A MDM2 MDM4 TP53", "sets session props on query after session load");
+            assert.equal(
+                wrapper.query.gene_list,
+                'CDKN2A MDM2 MDM4 TP53',
+                'sets session props on query after session load'
+            );
 
             done();
-
         }, 100);
-
     });
 
-    it("handles back/forward of routingstore", (done) => {
-
-        const getRemoteSessionStub = sinon.stub(wrapper, "getRemoteSession");
-        let saveSessionStub = sinon.stub(wrapper, "saveRemoteSession");
+    it('handles back/forward of routingstore', done => {
+        const getRemoteSessionStub = sinon.stub(wrapper, 'getRemoteSession');
+        let saveSessionStub = sinon.stub(wrapper, 'saveRemoteSession');
 
-
-        getRemoteSessionStub.callsFake(function (sessionData) {
-            return new Promise((resolve) => {
+        getRemoteSessionStub.callsFake(function(sessionData) {
+            return new Promise(resolve => {
                 setTimeout(() => {
                     return resolve({
-                                       "id": "5dcae586e4b04a9c23e27e5f",
-                                       "data": {
-                                           "gene_list": "CDKN2A%20MDM2%20MDM4%20TP53",
-
-
-                                       }
-                                   });
+                        id: '5dcae586e4b04a9c23e27e5f',
+                        data: {
+                            gene_list: 'CDKN2A%20MDM2%20MDM4%20TP53',
+                        },
+                    });
                 }, 5);
             });
         });
 
-        saveSessionStub.callsFake(function (sessionData) {
-            return new Promise((resolve) => {
+        saveSessionStub.callsFake(function(sessionData) {
+            return new Promise(resolve => {
                 setTimeout(() => {
-                    return resolve({id: "someSessionId"});
+                    return resolve({ id: 'someSessionId' });
                 }, 5);
             });
         });
@@ -295,78 +359,91 @@ describe("URLWrapper", () => {
             wrapper.isLoadingSession;
         });
 
-        routingStore.updateRoute({session_id: "5dcae586e4b04a9c23e27e5f"});
+        routingStore.updateRoute({ session_id: '5dcae586e4b04a9c23e27e5f' });
 
-        assert.isTrue(wrapper.isLoadingSession, "it is loading session");
-        assert.isFalse(wrapper.isPendingSession, "it is NOT pending session");
+        assert.isTrue(wrapper.isLoadingSession, 'it is loading session');
+        assert.isFalse(wrapper.isPendingSession, 'it is NOT pending session');
 
         setTimeout(() => {
             assert.isTrue(getRemoteSessionStub.calledOnce);
-            assert.equal(wrapper.query.gene_list, "CDKN2A MDM2 MDM4 TP53", "sets session props on query after session load");
-            assert.equal(routingStore.location.query.session_id, "5dcae586e4b04a9c23e27e5f")
-
-            wrapper.updateURL({ gene_list: "CDKN2%20MDM2%20MDM4" });
-
-            setTimeout(()=>{
+            assert.equal(
+                wrapper.query.gene_list,
+                'CDKN2A MDM2 MDM4 TP53',
+                'sets session props on query after session load'
+            );
+            assert.equal(
+                routingStore.location.query.session_id,
+                '5dcae586e4b04a9c23e27e5f'
+            );
+
+            wrapper.updateURL({ gene_list: 'CDKN2%20MDM2%20MDM4' });
+
+            setTimeout(() => {
                 assert.isTrue(saveSessionStub.calledOnce);
                 assert.isTrue(getRemoteSessionStub.calledOnce);
-                assert.equal(wrapper.sessionId,"someSessionId", "session id updated");
-                assert.equal(wrapper.query.gene_list, "CDKN2 MDM2 MDM4", "has correct gene list");
+                assert.equal(
+                    wrapper.sessionId,
+                    'someSessionId',
+                    'session id updated'
+                );
+                assert.equal(
+                    wrapper.query.gene_list,
+                    'CDKN2 MDM2 MDM4',
+                    'has correct gene list'
+                );
 
                 routingStore.goBack();
 
-                assert.equal(wrapper.sessionId, "5dcae586e4b04a9c23e27e5f");
+                assert.equal(wrapper.sessionId, '5dcae586e4b04a9c23e27e5f');
 
                 assert.isTrue(wrapper.isLoadingSession);
                 assert.isTrue(getRemoteSessionStub.calledTwice);
 
-                setTimeout(()=>{
+                setTimeout(() => {
                     assert.isFalse(wrapper.isLoadingSession);
-                    assert.equal(wrapper.query.gene_list, "CDKN2A MDM2 MDM4 TP53");
+                    assert.equal(
+                        wrapper.query.gene_list,
+                        'CDKN2A MDM2 MDM4 TP53'
+                    );
                     done();
-                },20);
-
-            },10);
-
-
-
+                }, 20);
+            }, 10);
         }, 100);
-
     });
 
+    it('creates new session when session param is changed', done => {
+        let getSessionStub = sinon.stub(wrapper, 'getRemoteSession');
 
-    it("creates new session when session param is changed", (done) => {
-
-        let getSessionStub = sinon.stub(wrapper, "getRemoteSession");
-
-        let saveSessionStub = sinon.stub(wrapper, "saveRemoteSession");
+        let saveSessionStub = sinon.stub(wrapper, 'saveRemoteSession');
 
-        saveSessionStub.callsFake(function (sessionData) {
-            return new Promise((resolve) => {
+        saveSessionStub.callsFake(function(sessionData) {
+            return new Promise(resolve => {
                 setTimeout(() => {
-                    return resolve({id: "someSessionId"});
+                    return resolve({ id: 'someSessionId' });
                 }, 5);
             });
         });
 
-        getSessionStub.callsFake(function (sessionData) {
-            return new Promise((resolve) => {
+        getSessionStub.callsFake(function(sessionData) {
+            return new Promise(resolve => {
                 setTimeout(() => {
                     return resolve({
-                                       "id": "5dcae586e4b04a9c23e27e5f",
-                                       "data": {
-                                           "genetic_profile_ids_PROFILE_COPY_NUMBER_ALTERATION": "msk_impact_2017_cna",
-                                           "Z_SCORE_THRESHOLD": "2.0",
-                                           "gene_list": "CDKN2A%20MDM2%20MDM4%20TP53",
-                                           "case_set_id": "msk_impact_2017_cnaseq",
-                                           "RPPA_SCORE_THRESHOLD": "2.0",
-                                           "cancer_study_list": "msk_impact_2017",
-                                           "geneset_list": " ",
-                                           "genetic_profile_ids_PROFILE_MUTATION_EXTENDED": "msk_impact_2017_mutations"
-                                       },
-                                       "source": "public_portal",
-                                       "type": "main_session"
-                                   });
+                        id: '5dcae586e4b04a9c23e27e5f',
+                        data: {
+                            genetic_profile_ids_PROFILE_COPY_NUMBER_ALTERATION:
+                                'msk_impact_2017_cna',
+                            Z_SCORE_THRESHOLD: '2.0',
+                            gene_list: 'CDKN2A%20MDM2%20MDM4%20TP53',
+                            case_set_id: 'msk_impact_2017_cnaseq',
+                            RPPA_SCORE_THRESHOLD: '2.0',
+                            cancer_study_list: 'msk_impact_2017',
+                            geneset_list: ' ',
+                            genetic_profile_ids_PROFILE_MUTATION_EXTENDED:
+                                'msk_impact_2017_mutations',
+                        },
+                        source: 'public_portal',
+                        type: 'main_session',
+                    });
                 }, 5);
             });
         });
@@ -380,144 +457,147 @@ describe("URLWrapper", () => {
         });
 
         // set first session for loading
-        routingStore.updateRoute({session_id: "5dcae586e4b04a9c23e27e5f"});
+        routingStore.updateRoute({ session_id: '5dcae586e4b04a9c23e27e5f' });
 
         assert.isTrue(getSessionStub.calledOnce);
         assert.isTrue(wrapper.isLoadingSession);
 
         setTimeout(() => {
-
             assert.isFalse(wrapper.isLoadingSession);
 
-            wrapper.updateURL({ gene_list:"EGFR TP53" });
+            wrapper.updateURL({ gene_list: 'EGFR TP53' });
 
-            assert.isTrue(saveSessionStub.calledOnce, "it called save session service");
+            assert.isTrue(
+                saveSessionStub.calledOnce,
+                'it called save session service'
+            );
 
-            assert.equal(wrapper.query.gene_list,"EGFR TP53", "sets query params for new session immediately");
+            assert.equal(
+                wrapper.query.gene_list,
+                'EGFR TP53',
+                'sets query params for new session immediately'
+            );
 
             assert.isTrue(wrapper.isPendingSession);
 
-            setTimeout(()=>{
-                assert.isTrue(getSessionStub.calledOnce, "did not call get session again");
-                assert.equal(wrapper.sessionId, "someSessionId", "sets session id appropriatly");
+            setTimeout(() => {
+                assert.isTrue(
+                    getSessionStub.calledOnce,
+                    'did not call get session again'
+                );
+                assert.equal(
+                    wrapper.sessionId,
+                    'someSessionId',
+                    'sets session id appropriatly'
+                );
                 done();
-
-            },50)
-
+            }, 50);
         }, 50);
-
-
-
     });
 
-    it('when clear=true, gets rid of any existing params',()=>{
-
+    it('when clear=true, gets rid of any existing params', () => {
         wrapper.updateURL({
-           case_ids:"12345",
-           "clinicallist": "6789"
+            case_ids: '12345',
+            clinicallist: '6789',
         });
-        assert.equal(wrapper.query.case_ids,"12345");
-        assert.equal(routingStore.location.query.case_ids,"12345");
+        assert.equal(wrapper.query.case_ids, '12345');
+        assert.equal(routingStore.location.query.case_ids, '12345');
 
-        wrapper.updateURL({ cancer_study_list:"somelist" }, undefined, true);
+        wrapper.updateURL({ cancer_study_list: 'somelist' }, undefined, true);
 
         assert.isUndefined(routingStore.location.query.case_ids);
 
-        assert.isFalse("case_ids" in routingStore.location.query);
+        assert.isFalse('case_ids' in routingStore.location.query);
 
-        assert.isUndefined(wrapper.query.case_ids, "removes existing params on clear");
-
-        assert.equal(routingStore.location.query.cancer_study_list, "somelist")
+        assert.isUndefined(
+            wrapper.query.case_ids,
+            'removes existing params on clear'
+        );
 
+        assert.equal(routingStore.location.query.cancer_study_list, 'somelist');
     });
 
-
-    it('Populates wrapper query according to alias rules ON instantiation (fire immediately on reaction)', ()=>{
-
+    it('Populates wrapper query according to alias rules ON instantiation (fire immediately on reaction)', () => {
         routingStore = new ExtendedRouterStore();
 
         const memoryHistory = createMemoryHistory();
         const history = syncHistoryWithStore(memoryHistory, routingStore);
 
-        routingStore.updateRoute({ gene_list:"12345", cancer_study_id:"789" });
+        routingStore.updateRoute({
+            gene_list: '12345',
+            cancer_study_id: '789',
+        });
 
         wrapper = new ResultsViewURLWrapper(routingStore);
 
-        assert.equal(wrapper.query.gene_list, "12345");
-        assert.equal(wrapper.query.cancer_study_list, "789");
-
+        assert.equal(wrapper.query.gene_list, '12345');
+        assert.equal(wrapper.query.cancer_study_list, '789');
     });
 
-    it('handles new session before old session finished saving',(done)=>{
-
+    it('handles new session before old session finished saving', done => {
         wrapper.urlCharThresholdForSession = 0;
         wrapper.sessionEnabled = true;
 
-        let saveSessionStub = sinon.stub(wrapper, "saveRemoteSession");
+        let saveSessionStub = sinon.stub(wrapper, 'saveRemoteSession');
 
-        saveSessionStub.callsFake(function (sessionData) {
-            return new Promise((resolve) => {
+        saveSessionStub.callsFake(function(sessionData) {
+            return new Promise(resolve => {
                 setTimeout(() => {
-                    return resolve({id: "sessionId1"});
+                    return resolve({ id: 'sessionId1' });
                 }, 10);
             });
         });
 
-        wrapper.updateURL({ gene_list:"12345" });
+        wrapper.updateURL({ gene_list: '12345' });
 
         assert.isTrue(saveSessionStub.called);
 
-        saveSessionStub.callsFake(function (sessionData) {
-            return new Promise((resolve) => {
+        saveSessionStub.callsFake(function(sessionData) {
+            return new Promise(resolve => {
                 setTimeout(() => {
-                    return resolve({id: "sessionId2"});
+                    return resolve({ id: 'sessionId2' });
                 }, 5);
             });
         });
 
-        wrapper.updateURL({ gene_list:"54321" });
+        wrapper.updateURL({ gene_list: '54321' });
 
         assert.isTrue(saveSessionStub.calledTwice);
 
         // should reflect sequence of sessions, not response
         // i.e. first session should have been cancelled by second
         // even though second response sooner
-        setTimeout(()=>{
-            assert.equal(wrapper.sessionId, "sessionId2");
-            assert.equal(wrapper.query.gene_list,"54321");
-            assert.equal(routingStore.location.query.session_id, "sessionId2");
+        setTimeout(() => {
+            assert.equal(wrapper.sessionId, 'sessionId2');
+            assert.equal(wrapper.query.gene_list, '54321');
+            assert.equal(routingStore.location.query.session_id, 'sessionId2');
             done();
-        },20);
-
+        }, 20);
     });
 
-    it('#needToLoadSession obeys rules', ()=>{
-
-        assert.isFalse(needToLoadSession({
-
-                                         }));
-
-        assert.isFalse(needToLoadSession({
-            sessionId:"pending"
-                                         }));
-
-        assert.isFalse(needToLoadSession({
-                                            sessionId:"123",
-                                            _sessionData: ({ id:"123" } as PortalSession)
-                                        }), "sessionId is same, so we already have data");
+    it('#needToLoadSession obeys rules', () => {
+        assert.isFalse(needToLoadSession({}));
 
+        assert.isFalse(
+            needToLoadSession({
+                sessionId: 'pending',
+            })
+        );
 
-        assert.isTrue(needToLoadSession({
-            sessionId:"123",
-            _sessionData:{ id:"321" } as PortalSession
-        }), "sessionId from url is different from internal store");
+        assert.isFalse(
+            needToLoadSession({
+                sessionId: '123',
+                _sessionData: { id: '123' } as PortalSession,
+            }),
+            'sessionId is same, so we already have data'
+        );
 
+        assert.isTrue(
+            needToLoadSession({
+                sessionId: '123',
+                _sessionData: { id: '321' } as PortalSession,
+            }),
+            'sessionId from url is different from internal store'
+        );
     });
-
-
 });
-
-
-
-
-
diff --git a/src/shared/lib/URLWrapper.ts b/src/shared/lib/URLWrapper.ts
index 2e262dd38b7..d77e2ea08c4 100644
--- a/src/shared/lib/URLWrapper.ts
+++ b/src/shared/lib/URLWrapper.ts
@@ -15,14 +15,14 @@ import ExtendedRouterStore, {
     getRemoteSession,
     normalizeLegacySession,
     PortalSession,
-    saveRemoteSession
+    saveRemoteSession,
 } from './ExtendedRouterStore';
 import hashString from 'shared/lib/hashString';
 import * as _ from 'lodash';
 import { log } from 'shared/lib/consoleLog';
-import {QueryParams} from "url";
-import ResultsViewURLWrapper from "pages/resultsView/ResultsViewURLWrapper";
-import {Omit} from "./TypeScriptUtils";
+import { QueryParams } from 'url';
+import ResultsViewURLWrapper from 'pages/resultsView/ResultsViewURLWrapper';
+import { Omit } from './TypeScriptUtils';
 
 export type BooleanString = string;
 export type NumberString = string;
@@ -33,9 +33,15 @@ export type Property<T> = {
     aliases?: string[];
 };
 
-export function needToLoadSession(obj:Partial<ResultsViewURLWrapper>): boolean {
-    return obj.sessionId !== undefined && obj.sessionId !== 'pending' &&
-        (obj._sessionData === undefined || obj._sessionData.id !== obj.sessionId);
+export function needToLoadSession(
+    obj: Partial<ResultsViewURLWrapper>
+): boolean {
+    return (
+        obj.sessionId !== undefined &&
+        obj.sessionId !== 'pending' &&
+        (obj._sessionData === undefined ||
+            obj._sessionData.id !== obj.sessionId)
+    );
 }
 
 export default class URLWrapper<
@@ -44,24 +50,26 @@ export default class URLWrapper<
     public query: QueryParamsType;
     public reactionDisposer: IReactionDisposer;
     protected pathContext: string;
-    protected readonly properties:Property<QueryParamsType>[];
+    protected readonly properties: Property<QueryParamsType>[];
 
     @observable sessionProps = {};
 
     constructor(
         protected routing: ExtendedRouterStore,
         // pass it in in a map so that typescript can ensure that every property is accounted for
-        protected propertiesMap: {[property in keyof QueryParamsType]:Omit<Property<QueryParamsType>, "name">},
+        protected propertiesMap: {
+            [property in keyof QueryParamsType]: Omit<
+                Property<QueryParamsType>,
+                'name'
+            >;
+        },
         public sessionEnabled = false,
         public urlCharThresholdForSession = 1500
     ) {
-
-        this.properties = _.entries(this.propertiesMap).map(
-            entry=>({
-                name: entry[0],
-                ...entry[1]
-            })
-        );
+        this.properties = _.entries(this.propertiesMap).map(entry => ({
+            name: entry[0],
+            ...entry[1],
+        }));
 
         const initValues: Partial<QueryParamsType> = {};
 
@@ -69,8 +77,9 @@ export default class URLWrapper<
         // even if they are not represented in browser url at the moment
         // they need to be there so that they will observable in the future upon assignment
         for (const property of this.properties) {
-            let value = (routing.location
-                .query as QueryParamsType)[property.name];
+            let value = (routing.location.query as QueryParamsType)[
+                property.name
+            ];
             if (_.isString(value)) {
                 // @ts-ignore
                 value = decodeURIComponent(value);
@@ -112,9 +121,12 @@ export default class URLWrapper<
                 // at least in test context, it doesn't otherwise work
                 //const queryProps = _.mapValues(routing.location.query);
                 //const sessionProps = this._sessionData && this._sessionData.query && _.mapValues(this._sessionData.query);
-                return [routing.location.query, this._sessionData && this._sessionData.query];
+                return [
+                    routing.location.query,
+                    this._sessionData && this._sessionData.query,
+                ];
             },
-            ([routeQuery,sessionQuery]) => {
+            ([routeQuery, sessionQuery]) => {
                 if (
                     this.pathContext &&
                     !new RegExp(`^/*${this.pathContext}`).test(
@@ -125,14 +137,15 @@ export default class URLWrapper<
                 }
 
                 runInAction(() => {
-                    log("setting session", routeQuery.session_id);
+                    log('setting session', routeQuery.session_id);
 
                     for (const property of this.properties) {
                         // if property is not a session prop
                         // it will always be represented in URL
                         if (this.hasSessionId && property.isSessionProp) {
                             // if there is a session, then sync it with session
-                            sessionQuery && this.syncProperty(property, sessionQuery)
+                            sessionQuery &&
+                                this.syncProperty(property, sessionQuery);
                         } else {
                             // @ts-ignore
                             this.syncProperty(property, routeQuery);
@@ -140,15 +153,19 @@ export default class URLWrapper<
                     }
                 });
             },
-            { fireImmediately:true }
+            { fireImmediately: true }
         );
     }
 
     //@observable _sessionId: string;
 
     @action
-    public updateURL(updatedParams: Partial<QueryParamsType>, path:string | undefined = undefined, clear = false, replace = false) {
-
+    public updateURL(
+        updatedParams: Partial<QueryParamsType>,
+        path: string | undefined = undefined,
+        clear = false,
+        replace = false
+    ) {
         // get the names of the props that are designated as session props
         const sessionProps = this.getSessionProps();
 
@@ -177,46 +194,52 @@ export default class URLWrapper<
             { sessionProps: {}, nonSessionProps: {} }
         );
 
-        const url = _.reduce(paramsMap.sessionProps,(agg:string[], val, key)=>{
-            if (val !== undefined) {
-                agg.push(`${key}=${encodeURIComponent(val)}`);
-            }
-            return agg;
-        }, []).join("&");
+        const url = _.reduce(
+            paramsMap.sessionProps,
+            (agg: string[], val, key) => {
+                if (val !== undefined) {
+                    agg.push(`${key}=${encodeURIComponent(val)}`);
+                }
+                return agg;
+            },
+            []
+        ).join('&');
 
-        log("url length", url.length);
+        log('url length', url.length);
 
         // determine which of the MODIFIED params are session props
-        const sessionParametersChanged = _.some(_.keys(updatedParams), (key)=>key in sessionProps);
+        const sessionParametersChanged = _.some(
+            _.keys(updatedParams),
+            key => key in sessionProps
+        );
 
         // we need session if url is longer than this
         // or if we already have session
-        const inSessionMode = this.sessionEnabled && (this.hasSessionId || url.length > this.urlCharThresholdForSession);
+        const inSessionMode =
+            this.sessionEnabled &&
+            (this.hasSessionId || url.length > this.urlCharThresholdForSession);
 
         // if we need to make a new session due to url constraints AND we have a changed session prop
         // then save a new remote session and put the session props in memory for consumption by app
         // otherwise just update the URL
-        if (
-            inSessionMode
-        ) {
+        if (inSessionMode) {
             if (sessionParametersChanged) {
-
                 // keep a timestamp to make sure
                 // that async session response matches the
                 // current session and hasn't been invalidated by subsequent session
                 var timeStamp = Date.now();
 
                 this._sessionData = {
-                    id: "pending",
+                    id: 'pending',
                     query: paramsMap.sessionProps,
                     path: path || this.pathName,
-                    version:3,
-                    timeStamp
+                    version: 3,
+                    timeStamp,
                 };
 
                 // we need to make a new session
                 this.routing.updateRoute(
-                    Object.assign({}, paramsMap.nonSessionProps , {
+                    Object.assign({}, paramsMap.nonSessionProps, {
                         session_id: 'pending',
                     }),
                     path,
@@ -224,18 +247,21 @@ export default class URLWrapper<
                     false
                 );
 
-                log("updating URL (non session)", updatedParams);
+                log('updating URL (non session)', updatedParams);
 
                 this.saveRemoteSession(paramsMap.sessionProps).then(data => {
                     // make sure that we have sessionData and that timestamp on the session hasn't
                     // been changed since it started
-                    if (this._sessionData && timeStamp === this._sessionData.timeStamp) {
+                    if (
+                        this._sessionData &&
+                        timeStamp === this._sessionData.timeStamp
+                    ) {
                         this._sessionData.id = data.id;
                         this.routing.updateRoute(
-                            {session_id: data.id},
+                            { session_id: data.id },
                             path,
                             false,
-                            true, // we don't want pending to show up in history
+                            true // we don't want pending to show up in history
                         );
                     }
                 });
@@ -248,15 +274,15 @@ export default class URLWrapper<
                     replace
                 );
             }
-        } else { // WE ARE NOT IN SESSION MODE
+        } else {
+            // WE ARE NOT IN SESSION MODE
             //this._sessionData = undefined;
             //updatedParams.session_id = undefined;
             this.routing.updateRoute(updatedParams, path, clear, replace);
         }
-
     }
 
-    saveRemoteSession(sessionProps:Partial<QueryParamsType>){
+    saveRemoteSession(sessionProps: Partial<QueryParamsType>) {
         return saveRemoteSession(sessionProps);
     }
 
@@ -264,26 +290,27 @@ export default class URLWrapper<
         return this.sessionId === 'pending';
     }
 
-    @computed public get sessionId(){
-        return this.routing.location.query.session_id === "" ?
-            undefined : this.routing.location.query.session_id
+    @computed public get sessionId() {
+        return this.routing.location.query.session_id === ''
+            ? undefined
+            : this.routing.location.query.session_id;
     }
 
-    @observable public _sessionData:PortalSession | undefined;
+    @observable public _sessionData: PortalSession | undefined;
 
-    @computed get isLoadingSession(){
-        return (!_.isEmpty(this.sessionId) && this.remoteSessionData.isPending);
+    @computed get isLoadingSession() {
+        return !_.isEmpty(this.sessionId) && this.remoteSessionData.isPending;
     }
 
-    @computed get hasSessionId(){
+    @computed get hasSessionId() {
         return this.sessionId !== undefined;
     }
 
-    getRemoteSession(sessionId:string){
+    getRemoteSession(sessionId: string) {
         return getRemoteSession(this.sessionId);
     }
 
-    @computed get needToLoadSession(){
+    @computed get needToLoadSession() {
         // if we have a session id
         // it's NOT equal to pending
         // we either have NO session data or the existing session data is
@@ -295,10 +322,8 @@ export default class URLWrapper<
 
     public remoteSessionData = remoteData({
         invoke: async () => {
-            if (
-                this.needToLoadSession
-            ) {
-                log("fetching remote session", this.sessionId);
+            if (this.needToLoadSession) {
+                log('fetching remote session', this.sessionId);
 
                 let sessionData = await this.getRemoteSession(this.sessionId);
 
@@ -348,14 +373,12 @@ export default class URLWrapper<
         }
 
         this.trySyncProperty(property, value);
-
     }
 
     private trySyncProperty(
         property: Property<QueryParamsType>,
         value: string | undefined
     ) {
-
         const processedValue =
             typeof value === 'string' ? decodeURIComponent(value) : undefined;
 
@@ -363,7 +386,7 @@ export default class URLWrapper<
             // @ts-ignore
             this.query[property.name] = processedValue;
         } else {
-            extendObservable(this.query, { [property.name]:processedValue });
+            extendObservable(this.query, { [property.name]: processedValue });
         }
 
         return processedValue !== undefined;
diff --git a/src/shared/lib/UuidUtils.spec.ts b/src/shared/lib/UuidUtils.spec.ts
index 4faf80b648d..ef4a982ce12 100644
--- a/src/shared/lib/UuidUtils.spec.ts
+++ b/src/shared/lib/UuidUtils.spec.ts
@@ -1,31 +1,74 @@
-import {assert} from "chai";
-import {toSampleUuid, toPatientUuid, fromSampleUuid, fromPatientUuid} from "./UuidUtils";
+import { assert } from 'chai';
+import {
+    toSampleUuid,
+    toPatientUuid,
+    fromSampleUuid,
+    fromPatientUuid,
+} from './UuidUtils';
 
-describe("UuidUtils", ()=>{
-    it("recovers the input study/sample/patient properly", ()=>{
-        const samples = ["a","ab","abc","abcd","12345","xijd-3985-djfi", "xij-+jdsapf-3r31"];
-        const studies = ["abc_def", "abcdfa_a", "a_b_c_d_e_f"];
+describe('UuidUtils', () => {
+    it('recovers the input study/sample/patient properly', () => {
+        const samples = [
+            'a',
+            'ab',
+            'abc',
+            'abcd',
+            '12345',
+            'xijd-3985-djfi',
+            'xij-+jdsapf-3r31',
+        ];
+        const studies = ['abc_def', 'abcdfa_a', 'a_b_c_d_e_f'];
 
         for (const sample of samples) {
             for (const study of studies) {
                 let sampleUuid1 = toSampleUuid(study, sample);
-                let sampleUuid2 = toSampleUuid({studyId:study, sampleId:sample});
-                assert.equal(sampleUuid1, sampleUuid2, "sample uuids should be the same for both function signatures");
+                let sampleUuid2 = toSampleUuid({
+                    studyId: study,
+                    sampleId: sample,
+                });
+                assert.equal(
+                    sampleUuid1,
+                    sampleUuid2,
+                    'sample uuids should be the same for both function signatures'
+                );
 
                 let patientUuid1 = toPatientUuid(study, sample);
-                let patientUuid2 = toPatientUuid({studyId:study, patientId:sample});
-                assert.equal(patientUuid1, patientUuid2, "patient uuids should be the same for both function signatures");
+                let patientUuid2 = toPatientUuid({
+                    studyId: study,
+                    patientId: sample,
+                });
+                assert.equal(
+                    patientUuid1,
+                    patientUuid2,
+                    'patient uuids should be the same for both function signatures'
+                );
 
                 let fromSampleUuid1 = fromSampleUuid(sampleUuid1);
                 let fromSampleUuid2 = fromSampleUuid(sampleUuid2);
                 let fromPatientUuid1 = fromPatientUuid(patientUuid1);
                 let fromPatientUuid2 = fromPatientUuid(patientUuid2);
 
-                assert.deepEqual(fromSampleUuid1, fromSampleUuid2, "parse results should be same for sample");
-                assert.deepEqual(fromPatientUuid1, fromPatientUuid2, "parse results should be same for patient");
-                assert.deepEqual(fromSampleUuid1, {studyId:study, sampleId:sample}, "parse result correct for sample");
-                assert.deepEqual(fromPatientUuid1, {studyId:study, patientId:sample}, "parse result correct for patient");
+                assert.deepEqual(
+                    fromSampleUuid1,
+                    fromSampleUuid2,
+                    'parse results should be same for sample'
+                );
+                assert.deepEqual(
+                    fromPatientUuid1,
+                    fromPatientUuid2,
+                    'parse results should be same for patient'
+                );
+                assert.deepEqual(
+                    fromSampleUuid1,
+                    { studyId: study, sampleId: sample },
+                    'parse result correct for sample'
+                );
+                assert.deepEqual(
+                    fromPatientUuid1,
+                    { studyId: study, patientId: sample },
+                    'parse result correct for patient'
+                );
             }
         }
     });
-});
\ No newline at end of file
+});
diff --git a/src/shared/lib/UuidUtils.ts b/src/shared/lib/UuidUtils.ts
index 3b3c3061341..b8c1513d30c 100644
--- a/src/shared/lib/UuidUtils.ts
+++ b/src/shared/lib/UuidUtils.ts
@@ -1,23 +1,25 @@
 // helpers - these actually do the work
-const DELIMITER = ":";
-function toUuid(x:string, y:string):string {
+const DELIMITER = ':';
+function toUuid(x: string, y: string): string {
     return `${x}${DELIMITER}${y}`;
 }
 
-function fromUuid(uuid:string):{x:string, y:string} {
+function fromUuid(uuid: string): { x: string; y: string } {
     const split = uuid.split(DELIMITER);
-    return {x:split[0], y:split[1]};
+    return { x: split[0], y: split[1] };
 }
 
-
 // exported functions - convenient interfaces
-export function toSampleUuid(studyId:string, sampleId:string):string;
-export function toSampleUuid(d:{studyId:string, sampleId:string}):string;
+export function toSampleUuid(studyId: string, sampleId: string): string;
+export function toSampleUuid(d: { studyId: string; sampleId: string }): string;
 
-export function toSampleUuid(studyIdOrD:string|{studyId:string, sampleId:string}, sampleId?:string):string {
-    if (typeof studyIdOrD === "string") {
+export function toSampleUuid(
+    studyIdOrD: string | { studyId: string; sampleId: string },
+    sampleId?: string
+): string {
+    if (typeof studyIdOrD === 'string') {
         if (!sampleId) {
-            throw "no sampleId given";
+            throw 'no sampleId given';
         } else {
             return toUuid(studyIdOrD, sampleId);
         }
@@ -26,13 +28,19 @@ export function toSampleUuid(studyIdOrD:string|{studyId:string, sampleId:string}
     }
 }
 
-export function toPatientUuid(studyId:string, patientId:string):string;
-export function toPatientUuid(d:{studyId:string, patientId:string}):string;
+export function toPatientUuid(studyId: string, patientId: string): string;
+export function toPatientUuid(d: {
+    studyId: string;
+    patientId: string;
+}): string;
 
-export function toPatientUuid(studyIdOrD:string|{studyId:string, patientId:string}, patientId?:string):string {
-    if (typeof studyIdOrD === "string") {
+export function toPatientUuid(
+    studyIdOrD: string | { studyId: string; patientId: string },
+    patientId?: string
+): string {
+    if (typeof studyIdOrD === 'string') {
         if (!patientId) {
-            throw "no patientId given";
+            throw 'no patientId given';
         } else {
             return toUuid(studyIdOrD, patientId);
         }
@@ -41,12 +49,16 @@ export function toPatientUuid(studyIdOrD:string|{studyId:string, patientId:strin
     }
 }
 
-export function fromSampleUuid(uuid:string):{studyId:string, sampleId:string} {
+export function fromSampleUuid(
+    uuid: string
+): { studyId: string; sampleId: string } {
     const split = fromUuid(uuid);
-    return {studyId: split.x, sampleId: split.y};
+    return { studyId: split.x, sampleId: split.y };
 }
 
-export function fromPatientUuid(uuid:string):{studyId:string, patientId:string} {
+export function fromPatientUuid(
+    uuid: string
+): { studyId: string; patientId: string } {
     const split = fromUuid(uuid);
-    return {studyId: split.x, patientId: split.y};
-}
\ No newline at end of file
+    return { studyId: split.x, patientId: split.y };
+}
diff --git a/src/shared/lib/VictoryChartUtils.spec.ts b/src/shared/lib/VictoryChartUtils.spec.ts
index 1e7b826fcd1..d8135735bb7 100644
--- a/src/shared/lib/VictoryChartUtils.spec.ts
+++ b/src/shared/lib/VictoryChartUtils.spec.ts
@@ -1,9 +1,7 @@
-import {assert} from 'chai';
-import {adjustedLongestLabelLength} from "./VictoryChartUtils";
+import { assert } from 'chai';
+import { adjustedLongestLabelLength } from './VictoryChartUtils';
 
 describe('VictoryChartUtils functions', () => {
-
-
     it('adjustedLongestLabelLength', () => {
         assert.equal(adjustedLongestLabelLength(['Test']), 5);
         assert.equal(adjustedLongestLabelLength(['Test', 'Tes']), 5);
diff --git a/src/shared/lib/VictoryChartUtils.ts b/src/shared/lib/VictoryChartUtils.ts
index 5fef2fcc7f0..ad94cc0c3ec 100644
--- a/src/shared/lib/VictoryChartUtils.ts
+++ b/src/shared/lib/VictoryChartUtils.ts
@@ -1,13 +1,22 @@
 import * as _ from 'lodash';
 
 export function adjustedLongestLabelLength(labels: string[]): number {
-    const adjustedForCaps = labels.map((label) => {
+    const adjustedForCaps = labels.map(label => {
         const capitalizedLetters = label.match(/[A-Z]/g) || [];
         const undercaseLetters = label.match(/[a-z]/g) || [];
         const spaces = label.match(/\s/g) || [];
-        const everythingelse = label.length - capitalizedLetters.length - undercaseLetters.length - spaces.length;
-        return (capitalizedLetters.length * 2) + (undercaseLetters.length * 1) + (spaces.length * 2) + (everythingelse * 1);
+        const everythingelse =
+            label.length -
+            capitalizedLetters.length -
+            undercaseLetters.length -
+            spaces.length;
+        return (
+            capitalizedLetters.length * 2 +
+            undercaseLetters.length * 1 +
+            spaces.length * 2 +
+            everythingelse * 1
+        );
     });
 
     return _.max(adjustedForCaps) || 0;
-}
\ No newline at end of file
+}
diff --git a/src/shared/lib/accumulatingDebounce.spec.ts b/src/shared/lib/accumulatingDebounce.spec.ts
index d190feedcc5..df714a17558 100644
--- a/src/shared/lib/accumulatingDebounce.spec.ts
+++ b/src/shared/lib/accumulatingDebounce.spec.ts
@@ -1,104 +1,171 @@
 import { assert } from 'chai';
-import accumulatingDebounce from "./accumulatingDebounce";
+import accumulatingDebounce from './accumulatingDebounce';
 import sinon from 'sinon';
-import lolex from "lolex";
-import {Clock} from "lolex";
-import {AccumulatingDebouncedFunction} from "./accumulatingDebounce";
+import lolex from 'lolex';
+import { Clock } from 'lolex';
+import { AccumulatingDebouncedFunction } from './accumulatingDebounce';
 
-describe('accumulatingDebounce', ()=>{
+describe('accumulatingDebounce', () => {
+    let clock: Clock;
 
-    let clock:Clock;
-
-    before(()=>{
+    before(() => {
         clock = lolex.install();
     });
 
-    after(()=>{
+    after(() => {
         clock.uninstall();
     });
 
-    it("calls the add function once, followed by the final function, when the returned function is called once", ()=>{
-        let deb:AccumulatingDebouncedFunction<any>;
+    it('calls the add function once, followed by the final function, when the returned function is called once', () => {
+        let deb: AccumulatingDebouncedFunction<any>;
         let done = false;
-        const finalFn = sinon.spy(()=>{
-            assert(addFn.calledOnce, "add function called exactly once, before the final function");
-            assert(true, "final function called");
+        const finalFn = sinon.spy(() => {
+            assert(
+                addFn.calledOnce,
+                'add function called exactly once, before the final function'
+            );
+            assert(true, 'final function called');
         });
-        const addFn = sinon.spy(()=>{ return {}; });
-        deb = accumulatingDebounce(finalFn, addFn, ()=>{return {};}, 0, ()=>{
-            assert(!deb.isPending(), "final function wont be called again");
-            done = true;
+        const addFn = sinon.spy(() => {
+            return {};
         });
+        deb = accumulatingDebounce(
+            finalFn,
+            addFn,
+            () => {
+                return {};
+            },
+            0,
+            () => {
+                assert(!deb.isPending(), 'final function wont be called again');
+                done = true;
+            }
+        );
 
-        assert(!deb.isPending(), "before being called, no timeout is pending");
+        assert(!deb.isPending(), 'before being called, no timeout is pending');
         deb();
         clock.tick(1);
         assert.isTrue(done);
         assert.isTrue(finalFn.calledOnce);
     });
 
-    it("calls the add function three times, followed by the final function once, when the returned function is called "+
-            "three times in succession", ()=>{
-        let deb:AccumulatingDebouncedFunction<any>;
-        let done = false;
-        const finalFn = sinon.spy(()=>{
-            assert(addFn.callCount === 3, "add function called three times, before the final function called once");
-        });
-        const addFn = sinon.spy(()=>{ return {}; });
-        const afterTimeoutExpire = sinon.spy(()=>{
-            if (afterTimeoutExpire.callCount === 1) {
-                assert(addFn.callCount === 3, "add function called three times before the first timeout expire");
-                assert(deb.isPending(), "final function will be called again, because there has been an add call "+
-                                        "(actually, 2) since the timeout was set");
-            } else {
-                assert(afterTimeoutExpire.callCount === 2, "timeout expired only twice");
-                assert(addFn.callCount === 3, "no additional add calls triggered since last timeout expire");
-                assert(!deb.isPending(), "final function will not be called again");
-                done = true;
-            }
-        });
-        deb = accumulatingDebounce(finalFn, addFn, ()=>{return {};}, 0, afterTimeoutExpire);
-        deb();
-        deb();
-        deb();
-        clock.tick(1);
-        assert.isTrue(finalFn.calledOnce);
-        assert.isTrue(done);
-    });
+    it(
+        'calls the add function three times, followed by the final function once, when the returned function is called ' +
+            'three times in succession',
+        () => {
+            let deb: AccumulatingDebouncedFunction<any>;
+            let done = false;
+            const finalFn = sinon.spy(() => {
+                assert(
+                    addFn.callCount === 3,
+                    'add function called three times, before the final function called once'
+                );
+            });
+            const addFn = sinon.spy(() => {
+                return {};
+            });
+            const afterTimeoutExpire = sinon.spy(() => {
+                if (afterTimeoutExpire.callCount === 1) {
+                    assert(
+                        addFn.callCount === 3,
+                        'add function called three times before the first timeout expire'
+                    );
+                    assert(
+                        deb.isPending(),
+                        'final function will be called again, because there has been an add call ' +
+                            '(actually, 2) since the timeout was set'
+                    );
+                } else {
+                    assert(
+                        afterTimeoutExpire.callCount === 2,
+                        'timeout expired only twice'
+                    );
+                    assert(
+                        addFn.callCount === 3,
+                        'no additional add calls triggered since last timeout expire'
+                    );
+                    assert(
+                        !deb.isPending(),
+                        'final function will not be called again'
+                    );
+                    done = true;
+                }
+            });
+            deb = accumulatingDebounce(
+                finalFn,
+                addFn,
+                () => {
+                    return {};
+                },
+                0,
+                afterTimeoutExpire
+            );
+            deb();
+            deb();
+            deb();
+            clock.tick(1);
+            assert.isTrue(finalFn.calledOnce);
+            assert.isTrue(done);
+        }
+    );
 
-    it("accumulates arguments as specified, and only triggers the final function with them once per burst", ()=>{
-        let deb:AccumulatingDebouncedFunction<number>;
+    it('accumulates arguments as specified, and only triggers the final function with them once per burst', () => {
+        let deb: AccumulatingDebouncedFunction<number>;
         let done = false;
 
         let finalFnCalls = 0;
         let expiredTimeouts = 0;
-        const finalFn = (arg:number[])=>{
+        const finalFn = (arg: number[]) => {
             finalFnCalls++;
             if (finalFnCalls === 1) {
-                assert.deepEqual(arg, [1,2,3,4,5], "first burst of arguments should be accumulated");
+                assert.deepEqual(
+                    arg,
+                    [1, 2, 3, 4, 5],
+                    'first burst of arguments should be accumulated'
+                );
             } else if (finalFnCalls === 2) {
-                assert.deepEqual(arg, [6], "second burst of arguments accumulated");
+                assert.deepEqual(
+                    arg,
+                    [6],
+                    'second burst of arguments accumulated'
+                );
             } else if (finalFnCalls === 3) {
-                assert.deepEqual(arg, [7,8], "third burst of arguments accumulated");
+                assert.deepEqual(
+                    arg,
+                    [7, 8],
+                    'third burst of arguments accumulated'
+                );
                 done = true;
             }
         };
-        const addFn = (acc:number[], arg:number)=>{
+        const addFn = (acc: number[], arg: number) => {
             acc.push(arg);
             return acc;
         };
 
-        deb = accumulatingDebounce(finalFn, addFn, ()=>[], 0, ()=>{
+        deb = accumulatingDebounce(finalFn, addFn, () => [], 0, () => {
             expiredTimeouts++;
             if (finalFnCalls === 1 && expiredTimeouts === 2) {
-                assert(!deb.isPending(), "before we add more arguments, no timeout is set to happen");
+                assert(
+                    !deb.isPending(),
+                    'before we add more arguments, no timeout is set to happen'
+                );
                 deb(6);
-                assert(deb.isPending(), "after adding arguments, timeout is set to happen");
+                assert(
+                    deb.isPending(),
+                    'after adding arguments, timeout is set to happen'
+                );
             } else if (finalFnCalls === 2 && expiredTimeouts === 3) {
-                assert(!deb.isPending(), "before we add more arguments, no timeout is set to happen");
+                assert(
+                    !deb.isPending(),
+                    'before we add more arguments, no timeout is set to happen'
+                );
                 deb(7);
                 deb(8);
-                assert(deb.isPending(), "after adding arguments, timeout is set to happen");
+                assert(
+                    deb.isPending(),
+                    'after adding arguments, timeout is set to happen'
+                );
             }
         });
         deb(1);
@@ -110,9 +177,18 @@ describe('accumulatingDebounce', ()=>{
         assert.isTrue(done);
     });
 
-    it("waits the specified number of milliseconds before executing", ()=>{
+    it('waits the specified number of milliseconds before executing', () => {
         let done = false;
-        let deb = accumulatingDebounce((x:number)=>{ done = true; }, (x:number)=>0, ()=>{return 0;}, 250);
+        let deb = accumulatingDebounce(
+            (x: number) => {
+                done = true;
+            },
+            (x: number) => 0,
+            () => {
+                return 0;
+            },
+            250
+        );
         deb();
         clock.tick(10);
         assert.isFalse(done);
@@ -124,25 +200,38 @@ describe('accumulatingDebounce', ()=>{
         assert.isTrue(done);
     });
 
-    it("does not execute if cancelled", ()=>{
-        let done = sinon.spy((x:number)=>{});
-        let deb = accumulatingDebounce(done, (x:number)=>0, ()=>{return 0;}, 0);
+    it('does not execute if cancelled', () => {
+        let done = sinon.spy((x: number) => {});
+        let deb = accumulatingDebounce(
+            done,
+            (x: number) => 0,
+            () => {
+                return 0;
+            },
+            0
+        );
         deb();
         clock.tick(20);
-        assert.isTrue(done.calledOnce, "if not cancelled, it executes");
-        assert.isFalse(deb.isPending(), "call is not pending after an execution");
+        assert.isTrue(done.calledOnce, 'if not cancelled, it executes');
+        assert.isFalse(
+            deb.isPending(),
+            'call is not pending after an execution'
+        );
 
         deb();
-        assert.isTrue(deb.isPending(), "call is pending");
+        assert.isTrue(deb.isPending(), 'call is pending');
         deb();
         deb();
         deb();
-        assert.isTrue(deb.isPending(), "call is still pending");
-        assert.isTrue(done.calledOnce, "final function not called again");
+        assert.isTrue(deb.isPending(), 'call is still pending');
+        assert.isTrue(done.calledOnce, 'final function not called again');
         deb.cancel();
-        assert.isFalse(deb.isPending(), "call not pending after being cancelled");
+        assert.isFalse(
+            deb.isPending(),
+            'call not pending after being cancelled'
+        );
         clock.tick(500);
-        assert.isFalse(deb.isPending(), "call still not pending 500 ms later");
-        assert.isTrue(done.calledOnce, "final function was never called again");
+        assert.isFalse(deb.isPending(), 'call still not pending 500 ms later');
+        assert.isTrue(done.calledOnce, 'final function was never called again');
     });
-});
\ No newline at end of file
+});
diff --git a/src/shared/lib/accumulatingDebounce.ts b/src/shared/lib/accumulatingDebounce.ts
index 7080549821b..13bf0262cef 100644
--- a/src/shared/lib/accumulatingDebounce.ts
+++ b/src/shared/lib/accumulatingDebounce.ts
@@ -1,19 +1,18 @@
 export type AccumulatingDebouncedFunction<ArgsType> = {
-    (...next:ArgsType[]):void;
-    isPending:()=>boolean;
-    cancel: ()=>void;
+    (...next: ArgsType[]): void;
+    isPending: () => boolean;
+    cancel: () => void;
 };
 export default function accumulatingDebounce<AccumulatorType, ArgsType>(
-                            fn:(acc:AccumulatorType)=>void,
-                            addArgs:(acc:AccumulatorType, ...next:ArgsType[])=>AccumulatorType,
-                            getInit:()=>AccumulatorType, // getInit needs to be a function, otherwise we'd have to deal w/clonining the given init value to ensure we're resetting
-                            wait:number,
-                            afterTimeoutExpire?:(...args:any[])=>void) // mainly useful for testing
-    :AccumulatingDebouncedFunction<ArgsType>
-{
-    let timeout:number|null;
-    let shouldExecuteFn:boolean;
-    let acc:AccumulatorType;
+    fn: (acc: AccumulatorType) => void,
+    addArgs: (acc: AccumulatorType, ...next: ArgsType[]) => AccumulatorType,
+    getInit: () => AccumulatorType, // getInit needs to be a function, otherwise we'd have to deal w/clonining the given init value to ensure we're resetting
+    wait: number,
+    afterTimeoutExpire?: (...args: any[]) => void // mainly useful for testing
+): AccumulatingDebouncedFunction<ArgsType> {
+    let timeout: number | null;
+    let shouldExecuteFn: boolean;
+    let acc: AccumulatorType;
 
     function reset() {
         acc = getInit();
@@ -34,24 +33,27 @@ export default function accumulatingDebounce<AccumulatorType, ArgsType>(
 
     reset();
 
-    let ret:AccumulatingDebouncedFunction<ArgsType> = Object.assign((...next:ArgsType[])=>{
-        acc = addArgs(acc, ...next);
+    let ret: AccumulatingDebouncedFunction<ArgsType> = Object.assign(
+        (...next: ArgsType[]) => {
+            acc = addArgs(acc, ...next);
 
-        if (timeout === null) {
-            shouldExecuteFn = true;
-            timeout = window.setTimeout(considerExecuting, wait);
-        } else {
-            shouldExecuteFn = false;
-        }
-    }, {
-        isPending: ()=>(timeout !== null),
-        cancel: ()=>{
-            if (timeout !== null) {
-                window.clearTimeout(timeout);
+            if (timeout === null) {
+                shouldExecuteFn = true;
+                timeout = window.setTimeout(considerExecuting, wait);
+            } else {
+                shouldExecuteFn = false;
             }
-            reset();
+        },
+        {
+            isPending: () => timeout !== null,
+            cancel: () => {
+                if (timeout !== null) {
+                    window.clearTimeout(timeout);
+                }
+                reset();
+            },
         }
-    });
+    );
 
     return ret;
-}
\ No newline at end of file
+}
diff --git a/src/shared/lib/ajaxQuiet.js b/src/shared/lib/ajaxQuiet.js
index 151ac28f39c..3e974d62077 100644
--- a/src/shared/lib/ajaxQuiet.js
+++ b/src/shared/lib/ajaxQuiet.js
@@ -2,14 +2,13 @@ window.ajaxRequests = {};
 var _send = XMLHttpRequest.prototype.send;
 var lastTimeout = null;
 
-export function setNetworkListener(){
-
+export function setNetworkListener() {
     window.ajaxQuiet = true;
 
     var xhrProto = XMLHttpRequest.prototype,
         origOpen = xhrProto.open;
 
-    xhrProto.open = function (method, url) {
+    xhrProto.open = function(method, url) {
         this._url = url;
         return origOpen.apply(this, arguments);
     };
@@ -17,10 +16,10 @@ export function setNetworkListener(){
     XMLHttpRequest.prototype.send = function() {
         window.ajaxQuiet = false;
         var id = Math.floor(Math.random() * 1000000000);
-        window.ajaxRequests[id] = { url:this._url, started: Date.now()  };
+        window.ajaxRequests[id] = { url: this._url, started: Date.now() };
         /* Wrap onreadystaechange callback */
         var callback = this.onreadystatechange;
-        this.onreadystatechange = function () {
+        this.onreadystatechange = function() {
             if (this.readyState == 4) {
                 delete window.ajaxRequests[id];
             }
@@ -28,9 +27,8 @@ export function setNetworkListener(){
             if (Object.keys(window.ajaxRequests).length === 0) {
                 window.ajaxQuiet = true;
             }
-        }
+        };
 
         _send.apply(this, arguments);
-    }
-
+    };
 }
diff --git a/src/shared/lib/alterationCountHelpers.spec.ts b/src/shared/lib/alterationCountHelpers.spec.ts
index 1260a6d435d..680f6e74c3c 100644
--- a/src/shared/lib/alterationCountHelpers.spec.ts
+++ b/src/shared/lib/alterationCountHelpers.spec.ts
@@ -1,467 +1,530 @@
-import {assert} from 'chai';
-import {shallow, mount} from "enzyme";
-import * as React from "react";
+import { assert } from 'chai';
+import { shallow, mount } from 'enzyme';
+import * as React from 'react';
 import * as _ from 'lodash';
-import {countAlterationOccurences} from "./alterationCountHelpers";
+import { countAlterationOccurences } from './alterationCountHelpers';
 
 describe('alterationCountHelpers', () => {
-
     describe('#countAlterationOccurences', () => {
+        let groupedSamples: any,
+            alterationsBySampleId: any,
+            molecularProfileIdsByAlterationType: any,
+            genePanelData: any;
 
-        let groupedSamples:any, alterationsBySampleId:any, molecularProfileIdsByAlterationType:any, genePanelData:any;
-
-        beforeEach(()=>{
-
+        beforeEach(() => {
             groupedSamples = {
-                "Hepatobiliary Cancer": [{
-                    "uniqueSampleKey": "QjA4NTpjaG9sX251c18yMDEy",
-                    "uniquePatientKey": "QjA4NTpjaG9sX251c18yMDEy",
-                    "sampleType": "Primary Solid Tumor",
-                    "sampleId": "B085",
-                    "patientId": "B085",
-                    "cancerTypeId": "chol",
-                    "studyId": "chol_nus_2012",
-                    "cancerType": "Hepatobiliary Cancer",
-                    "cancerTypeDetailed": "Cholangiocarcinoma"
-                }, {
-                    "uniqueSampleKey": "QjA5OTpjaG9sX251c18yMDEy",
-                    "uniquePatientKey": "QjA5OTpjaG9sX251c18yMDEy",
-                    "sampleType": "Primary Solid Tumor",
-                    "sampleId": "B099",
-                    "patientId": "B099",
-                    "cancerTypeId": "chol",
-                    "studyId": "chol_nus_2012",
-                    "cancerType": "Hepatobiliary Cancer",
-                    "cancerTypeDetailed": "Cholangiocarcinoma"
-                }, {
-                    "uniqueSampleKey": "UjEwNDpjaG9sX251c18yMDEy",
-                    "uniquePatientKey": "UjEwNDpjaG9sX251c18yMDEy",
-                    "sampleType": "Primary Solid Tumor",
-                    "sampleId": "R104",
-                    "patientId": "R104",
-                    "cancerTypeId": "chol",
-                    "studyId": "chol_nus_2012",
-                    "cancerType": "Hepatobiliary Cancer",
-                    "cancerTypeDetailed": "Cholangiocarcinoma"
-                }, {
-                    "uniqueSampleKey": "VDAyNjpjaG9sX251c18yMDEy",
-                    "uniquePatientKey": "VDAyNjpjaG9sX251c18yMDEy",
-                    "sampleType": "Primary Solid Tumor",
-                    "sampleId": "T026",
-                    "patientId": "T026",
-                    "cancerTypeId": "chol",
-                    "studyId": "chol_nus_2012",
-                    "cancerType": "Hepatobiliary Cancer",
-                    "cancerTypeDetailed": "Cholangiocarcinoma"
-                }, {
-                    "uniqueSampleKey": "VTA0NDpjaG9sX251c18yMDEy",
-                    "uniquePatientKey": "VTA0NDpjaG9sX251c18yMDEy",
-                    "sampleType": "Primary Solid Tumor",
-                    "sampleId": "U044",
-                    "patientId": "U044",
-                    "cancerTypeId": "chol",
-                    "studyId": "chol_nus_2012",
-                    "cancerType": "Hepatobiliary Cancer",
-                    "cancerTypeDetailed": "Cholangiocarcinoma"
-                }, {
-                    "uniqueSampleKey": "VzAxMjpjaG9sX251c18yMDEy",
-                    "uniquePatientKey": "VzAxMjpjaG9sX251c18yMDEy",
-                    "sampleType": "Primary Solid Tumor",
-                    "sampleId": "W012",
-                    "patientId": "W012",
-                    "cancerTypeId": "chol",
-                    "studyId": "chol_nus_2012",
-                    "cancerType": "Hepatobiliary Cancer",
-                    "cancerTypeDetailed": "Cholangiocarcinoma"
-                }, {
-                    "uniqueSampleKey": "VzAzOTpjaG9sX251c18yMDEy",
-                    "uniquePatientKey": "VzAzOTpjaG9sX251c18yMDEy",
-                    "sampleType": "Primary Solid Tumor",
-                    "sampleId": "W039",
-                    "patientId": "W039",
-                    "cancerTypeId": "chol",
-                    "studyId": "chol_nus_2012",
-                    "cancerType": "Hepatobiliary Cancer",
-                    "cancerTypeDetailed": "Cholangiocarcinoma"
-                }, {
-                    "uniqueSampleKey": "VzA0MDpjaG9sX251c18yMDEy",
-                    "uniquePatientKey": "VzA0MDpjaG9sX251c18yMDEy",
-                    "sampleType": "Primary Solid Tumor",
-                    "sampleId": "W040",
-                    "patientId": "W040",
-                    "cancerTypeId": "chol",
-                    "studyId": "chol_nus_2012",
-                    "cancerType": "Hepatobiliary Cancer",
-                    "cancerTypeDetailed": "Cholangiocarcinoma"
-                }]
+                'Hepatobiliary Cancer': [
+                    {
+                        uniqueSampleKey: 'QjA4NTpjaG9sX251c18yMDEy',
+                        uniquePatientKey: 'QjA4NTpjaG9sX251c18yMDEy',
+                        sampleType: 'Primary Solid Tumor',
+                        sampleId: 'B085',
+                        patientId: 'B085',
+                        cancerTypeId: 'chol',
+                        studyId: 'chol_nus_2012',
+                        cancerType: 'Hepatobiliary Cancer',
+                        cancerTypeDetailed: 'Cholangiocarcinoma',
+                    },
+                    {
+                        uniqueSampleKey: 'QjA5OTpjaG9sX251c18yMDEy',
+                        uniquePatientKey: 'QjA5OTpjaG9sX251c18yMDEy',
+                        sampleType: 'Primary Solid Tumor',
+                        sampleId: 'B099',
+                        patientId: 'B099',
+                        cancerTypeId: 'chol',
+                        studyId: 'chol_nus_2012',
+                        cancerType: 'Hepatobiliary Cancer',
+                        cancerTypeDetailed: 'Cholangiocarcinoma',
+                    },
+                    {
+                        uniqueSampleKey: 'UjEwNDpjaG9sX251c18yMDEy',
+                        uniquePatientKey: 'UjEwNDpjaG9sX251c18yMDEy',
+                        sampleType: 'Primary Solid Tumor',
+                        sampleId: 'R104',
+                        patientId: 'R104',
+                        cancerTypeId: 'chol',
+                        studyId: 'chol_nus_2012',
+                        cancerType: 'Hepatobiliary Cancer',
+                        cancerTypeDetailed: 'Cholangiocarcinoma',
+                    },
+                    {
+                        uniqueSampleKey: 'VDAyNjpjaG9sX251c18yMDEy',
+                        uniquePatientKey: 'VDAyNjpjaG9sX251c18yMDEy',
+                        sampleType: 'Primary Solid Tumor',
+                        sampleId: 'T026',
+                        patientId: 'T026',
+                        cancerTypeId: 'chol',
+                        studyId: 'chol_nus_2012',
+                        cancerType: 'Hepatobiliary Cancer',
+                        cancerTypeDetailed: 'Cholangiocarcinoma',
+                    },
+                    {
+                        uniqueSampleKey: 'VTA0NDpjaG9sX251c18yMDEy',
+                        uniquePatientKey: 'VTA0NDpjaG9sX251c18yMDEy',
+                        sampleType: 'Primary Solid Tumor',
+                        sampleId: 'U044',
+                        patientId: 'U044',
+                        cancerTypeId: 'chol',
+                        studyId: 'chol_nus_2012',
+                        cancerType: 'Hepatobiliary Cancer',
+                        cancerTypeDetailed: 'Cholangiocarcinoma',
+                    },
+                    {
+                        uniqueSampleKey: 'VzAxMjpjaG9sX251c18yMDEy',
+                        uniquePatientKey: 'VzAxMjpjaG9sX251c18yMDEy',
+                        sampleType: 'Primary Solid Tumor',
+                        sampleId: 'W012',
+                        patientId: 'W012',
+                        cancerTypeId: 'chol',
+                        studyId: 'chol_nus_2012',
+                        cancerType: 'Hepatobiliary Cancer',
+                        cancerTypeDetailed: 'Cholangiocarcinoma',
+                    },
+                    {
+                        uniqueSampleKey: 'VzAzOTpjaG9sX251c18yMDEy',
+                        uniquePatientKey: 'VzAzOTpjaG9sX251c18yMDEy',
+                        sampleType: 'Primary Solid Tumor',
+                        sampleId: 'W039',
+                        patientId: 'W039',
+                        cancerTypeId: 'chol',
+                        studyId: 'chol_nus_2012',
+                        cancerType: 'Hepatobiliary Cancer',
+                        cancerTypeDetailed: 'Cholangiocarcinoma',
+                    },
+                    {
+                        uniqueSampleKey: 'VzA0MDpjaG9sX251c18yMDEy',
+                        uniquePatientKey: 'VzA0MDpjaG9sX251c18yMDEy',
+                        sampleType: 'Primary Solid Tumor',
+                        sampleId: 'W040',
+                        patientId: 'W040',
+                        cancerTypeId: 'chol',
+                        studyId: 'chol_nus_2012',
+                        cancerType: 'Hepatobiliary Cancer',
+                        cancerTypeDetailed: 'Cholangiocarcinoma',
+                    },
+                ],
             };
 
             alterationsBySampleId = {
-                "UjEwNDpjaG9sX251c18yMDEy": [{
-                    "uniqueSampleKey": "UjEwNDpjaG9sX251c18yMDEy",
-                    "uniquePatientKey": "UjEwNDpjaG9sX251c18yMDEy",
-                    "molecularProfileId": "chol_nus_2012_mutations",
-                    "sampleId": "R104",
-                    "patientId": "R104",
-                    "entrezGeneId": 3845,
-                    "gene": {
-                        "entrezGeneId": 3845,
-                        "hugoGeneSymbol": "KRAS",
-                        "type": "protein-coding",
-                        "cytoband": "12p12.1",
-                        "length": 47305,
-                        "chromosome": "12"
+                UjEwNDpjaG9sX251c18yMDEy: [
+                    {
+                        uniqueSampleKey: 'UjEwNDpjaG9sX251c18yMDEy',
+                        uniquePatientKey: 'UjEwNDpjaG9sX251c18yMDEy',
+                        molecularProfileId: 'chol_nus_2012_mutations',
+                        sampleId: 'R104',
+                        patientId: 'R104',
+                        entrezGeneId: 3845,
+                        gene: {
+                            entrezGeneId: 3845,
+                            hugoGeneSymbol: 'KRAS',
+                            type: 'protein-coding',
+                            cytoband: '12p12.1',
+                            length: 47305,
+                            chromosome: '12',
+                        },
+                        studyId: 'chol_nus_2012',
+                        center: 'NUS',
+                        mutationStatus: 'NA',
+                        validationStatus: 'NA',
+                        tumorAltCount: -1,
+                        tumorRefCount: -1,
+                        normalAltCount: -1,
+                        normalRefCount: -1,
+                        startPosition: 25398281,
+                        endPosition: 25398281,
+                        referenceAllele: 'C',
+                        proteinChange: 'G13D',
+                        mutationType: 'Missense_Mutation',
+                        functionalImpactScore: 'M',
+                        fisValue: 3.375,
+                        linkXvar:
+                            'getma.org/?cm=var&var=hg19,12,25398281,C,T&fts=all',
+                        linkPdb:
+                            'getma.org/pdb.php?prot=RASK_HUMAN&from=5&to=165&var=G13D',
+                        linkMsa:
+                            'getma.org/?cm=msa&ty=f&p=RASK_HUMAN&rb=5&re=165&var=G13D',
+                        ncbiBuild: 'GRCh37',
+                        variantType: 'SNP',
+                        keyword: 'KRAS G13 missense',
+                        driverFilter: '',
+                        driverFilterAnnotation: '',
+                        driverTiersFilter: '',
+                        driverTiersFilterAnnotation: '',
+                        sequenced: true,
+                        wildType: false,
+                        variantAllele: 'T',
+                        refseqMrnaId: 'NM_033360.2',
+                        proteinPosStart: 13,
+                        proteinPosEnd: 13,
+                        molecularProfileAlterationType: 'MUTATION_EXTENDED',
+                        alterationSubType: 'missense',
+                        alterationType: 'MUTATION_EXTENDED',
                     },
-                    "studyId": "chol_nus_2012",
-                    "center": "NUS",
-                    "mutationStatus": "NA",
-                    "validationStatus": "NA",
-                    "tumorAltCount": -1,
-                    "tumorRefCount": -1,
-                    "normalAltCount": -1,
-                    "normalRefCount": -1,
-                    "startPosition": 25398281,
-                    "endPosition": 25398281,
-                    "referenceAllele": "C",
-                    "proteinChange": "G13D",
-                    "mutationType": "Missense_Mutation",
-                    "functionalImpactScore": "M",
-                    "fisValue": 3.375,
-                    "linkXvar": "getma.org/?cm=var&var=hg19,12,25398281,C,T&fts=all",
-                    "linkPdb": "getma.org/pdb.php?prot=RASK_HUMAN&from=5&to=165&var=G13D",
-                    "linkMsa": "getma.org/?cm=msa&ty=f&p=RASK_HUMAN&rb=5&re=165&var=G13D",
-                    "ncbiBuild": "GRCh37",
-                    "variantType": "SNP",
-                    "keyword": "KRAS G13 missense",
-                    "driverFilter": "",
-                    "driverFilterAnnotation": "",
-                    "driverTiersFilter": "",
-                    "driverTiersFilterAnnotation": "",
-                    "sequenced": true,
-                    "wildType": false,
-                    "variantAllele": "T",
-                    "refseqMrnaId": "NM_033360.2",
-                    "proteinPosStart": 13,
-                    "proteinPosEnd": 13,
-                    "molecularProfileAlterationType": "MUTATION_EXTENDED",
-                    "alterationSubType": "missense",
-                    "alterationType": "MUTATION_EXTENDED"
-                }],
-                "QjA4NTpjaG9sX251c18yMDEy": [{
-                    "uniqueSampleKey": "QjA4NTpjaG9sX251c18yMDEy",
-                    "uniquePatientKey": "QjA4NTpjaG9sX251c18yMDEy",
-                    "molecularProfileId": "chol_nus_2012_mutations",
-                    "sampleId": "B085",
-                    "patientId": "B085",
-                    "entrezGeneId": 3845,
-                    "gene": {
-                        "entrezGeneId": 3845,
-                        "hugoGeneSymbol": "KRAS",
-                        "type": "protein-coding",
-                        "cytoband": "12p12.1",
-                        "length": 47305,
-                        "chromosome": "12"
+                ],
+                QjA4NTpjaG9sX251c18yMDEy: [
+                    {
+                        uniqueSampleKey: 'QjA4NTpjaG9sX251c18yMDEy',
+                        uniquePatientKey: 'QjA4NTpjaG9sX251c18yMDEy',
+                        molecularProfileId: 'chol_nus_2012_mutations',
+                        sampleId: 'B085',
+                        patientId: 'B085',
+                        entrezGeneId: 3845,
+                        gene: {
+                            entrezGeneId: 3845,
+                            hugoGeneSymbol: 'KRAS',
+                            type: 'protein-coding',
+                            cytoband: '12p12.1',
+                            length: 47305,
+                            chromosome: '12',
+                        },
+                        studyId: 'chol_nus_2012',
+                        center: 'NUS',
+                        mutationStatus: 'NA',
+                        validationStatus: 'NA',
+                        tumorAltCount: -1,
+                        tumorRefCount: -1,
+                        normalAltCount: -1,
+                        normalRefCount: -1,
+                        startPosition: 25398284,
+                        endPosition: 25398284,
+                        referenceAllele: 'G',
+                        proteinChange: 'MUTATED',
+                        mutationType: 'Missense_Mutation',
+                        functionalImpactScore: 'NA',
+                        fisValue: 1.4013e-45,
+                        linkXvar: 'NA',
+                        linkPdb: 'NA',
+                        linkMsa: 'NA',
+                        ncbiBuild: '37',
+                        variantType: 'SNP',
+                        driverFilter: '',
+                        driverFilterAnnotation: '',
+                        driverTiersFilter: '',
+                        driverTiersFilterAnnotation: '',
+                        sequenced: true,
+                        wildType: false,
+                        variantAllele: 'C',
+                        refseqMrnaId: 'NA',
+                        proteinPosStart: -1,
+                        proteinPosEnd: -1,
+                        molecularProfileAlterationType: 'MUTATION_EXTENDED',
+                        alterationSubType: 'missense',
+                        alterationType: 'MUTATION_EXTENDED',
                     },
-                    "studyId": "chol_nus_2012",
-                    "center": "NUS",
-                    "mutationStatus": "NA",
-                    "validationStatus": "NA",
-                    "tumorAltCount": -1,
-                    "tumorRefCount": -1,
-                    "normalAltCount": -1,
-                    "normalRefCount": -1,
-                    "startPosition": 25398284,
-                    "endPosition": 25398284,
-                    "referenceAllele": "G",
-                    "proteinChange": "MUTATED",
-                    "mutationType": "Missense_Mutation",
-                    "functionalImpactScore": "NA",
-                    "fisValue": 1.4013e-45,
-                    "linkXvar": "NA",
-                    "linkPdb": "NA",
-                    "linkMsa": "NA",
-                    "ncbiBuild": "37",
-                    "variantType": "SNP",
-                    "driverFilter": "",
-                    "driverFilterAnnotation": "",
-                    "driverTiersFilter": "",
-                    "driverTiersFilterAnnotation": "",
-                    "sequenced": true,
-                    "wildType": false,
-                    "variantAllele": "C",
-                    "refseqMrnaId": "NA",
-                    "proteinPosStart": -1,
-                    "proteinPosEnd": -1,
-                    "molecularProfileAlterationType": "MUTATION_EXTENDED",
-                    "alterationSubType": "missense",
-                    "alterationType": "MUTATION_EXTENDED"
-                },
-                ]
+                ],
             };
 
             molecularProfileIdsByAlterationType = {
-                "MUTATION_EXTENDED":[{
-                    "molecularProfileId": "chol_nus_2012_mutations"
-                }]
-            }
+                MUTATION_EXTENDED: [
+                    {
+                        molecularProfileId: 'chol_nus_2012_mutations',
+                    },
+                ],
+            };
 
             genePanelData = {
                 samples: {
-                    "UjEwNDpjaG9sX251c18yMDEy": {
-                        byGene:{"KRAS":[{
-                            uniqueSampleKey: "UjEwNDpjaG9sX251c18yMDEy",
-                            uniquePatientKey: "UjEwNDpjaG9sX251c18yMDEy",
-                            molecularProfileId: "chol_nus_2012_mutations",
-                            genePanelId: "GENEPANEL1",
-                            profiled: true
-                        }]},
-                        allGenes:[],
-                        notProfiledByGene:{},
-                        notProfiledAllGenes:[]
+                    UjEwNDpjaG9sX251c18yMDEy: {
+                        byGene: {
+                            KRAS: [
+                                {
+                                    uniqueSampleKey: 'UjEwNDpjaG9sX251c18yMDEy',
+                                    uniquePatientKey:
+                                        'UjEwNDpjaG9sX251c18yMDEy',
+                                    molecularProfileId:
+                                        'chol_nus_2012_mutations',
+                                    genePanelId: 'GENEPANEL1',
+                                    profiled: true,
+                                },
+                            ],
+                        },
+                        allGenes: [],
+                        notProfiledByGene: {},
+                        notProfiledAllGenes: [],
                     },
-                    "QjA4NTpjaG9sX251c18yMDEy": {
-                        byGene:{"KRAS":[{
-                            uniqueSampleKey: "QjA4NTpjaG9sX251c18yMDEy",
-                            uniquePatientKey: "QjA4NTpjaG9sX251c18yMDEy",
-                            molecularProfileId: "chol_nus_2012_mutations",
-                            genePanelId: "GENEPANEL1",
-                            profiled: true
-                        }]},
-                        allGenes:[],
-                        notProfiledByGene:{},
-                        notProfiledAllGenes:[]
+                    QjA4NTpjaG9sX251c18yMDEy: {
+                        byGene: {
+                            KRAS: [
+                                {
+                                    uniqueSampleKey: 'QjA4NTpjaG9sX251c18yMDEy',
+                                    uniquePatientKey:
+                                        'QjA4NTpjaG9sX251c18yMDEy',
+                                    molecularProfileId:
+                                        'chol_nus_2012_mutations',
+                                    genePanelId: 'GENEPANEL1',
+                                    profiled: true,
+                                },
+                            ],
+                        },
+                        allGenes: [],
+                        notProfiledByGene: {},
+                        notProfiledAllGenes: [],
                     },
-                    "VzA0MDpjaG9sX251c18yMDEy": {
-                        byGene:{"KRAS":[{
-                            uniqueSampleKey: "VzA0MDpjaG9sX251c18yMDEy",
-                            uniquePatientKey: "VzA0MDpjaG9sX251c18yMDEy",
-                            molecularProfileId: "chol_nus_2012_mutations",
-                            genePanelId: "GENEPANEL1",
-                            profiled: true
-                        }]},
-                        allGenes:[],
-                        notProfiledByGene:{},
-                        notProfiledAllGenes:[]
-                    }
-                }
-            }
-
+                    VzA0MDpjaG9sX251c18yMDEy: {
+                        byGene: {
+                            KRAS: [
+                                {
+                                    uniqueSampleKey: 'VzA0MDpjaG9sX251c18yMDEy',
+                                    uniquePatientKey:
+                                        'VzA0MDpjaG9sX251c18yMDEy',
+                                    molecularProfileId:
+                                        'chol_nus_2012_mutations',
+                                    genePanelId: 'GENEPANEL1',
+                                    profiled: true,
+                                },
+                            ],
+                        },
+                        allGenes: [],
+                        notProfiledByGene: {},
+                        notProfiledAllGenes: [],
+                    },
+                },
+            };
         });
 
         it('count total samples and alteration totals', () => {
-
-            const ret = countAlterationOccurences(groupedSamples, alterationsBySampleId, molecularProfileIdsByAlterationType, genePanelData);
+            const ret = countAlterationOccurences(
+                groupedSamples,
+                alterationsBySampleId,
+                molecularProfileIdsByAlterationType,
+                genePanelData
+            );
 
             const expectedResult = {
-                "Hepatobiliary Cancer": {
-                    "profiledSampleTotal": 3,
-                    "alterationTotal": 2,
-                    "alterationTypeCounts": {
-                        "mutated": 2,
-                        "amp": 0,
-                        "homdel": 0,
-                        "hetloss": 0,
-                        "gain": 0,
-                        "fusion": 0,
-                        "mrnaExpressionHigh": 0,
-                        "mrnaExpressionLow": 0,
-                        "protExpressionHigh": 0,
-                        "protExpressionLow": 0,
-                        "multiple": 0
+                'Hepatobiliary Cancer': {
+                    profiledSampleTotal: 3,
+                    alterationTotal: 2,
+                    alterationTypeCounts: {
+                        mutated: 2,
+                        amp: 0,
+                        homdel: 0,
+                        hetloss: 0,
+                        gain: 0,
+                        fusion: 0,
+                        mrnaExpressionHigh: 0,
+                        mrnaExpressionLow: 0,
+                        protExpressionHigh: 0,
+                        protExpressionLow: 0,
+                        multiple: 0,
+                    },
+                    alteredSampleCount: 2,
+                    parentCancerType: 'Hepatobiliary Cancer',
+                    profiledSamplesCounts: {
+                        mutation: 3,
+                        cna: 0,
+                        expression: 0,
+                        protein: 0,
                     },
-                    "alteredSampleCount": 2,
-                    "parentCancerType": "Hepatobiliary Cancer",
-                    "profiledSamplesCounts":{
-                        "mutation": 3,
-                        "cna": 0,
-                        "expression": 0,
-                        "protein": 0
+                    notProfiledSamplesCounts: {
+                        mutation: 5,
+                        cna: 0,
+                        expression: 0,
+                        protein: 0,
                     },
-                    "notProfiledSamplesCounts":{
-                        "mutation": 5,
-                        "cna": 0,
-                        "expression": 0,
-                        "protein": 0
-                    }
-                }
+                },
             };
 
             assert.deepEqual(ret, expectedResult);
-
         });
 
         it('counts an added fusion alteration and CNA alterations, according to CNA sub types', () => {
-
-            alterationsBySampleId["VTA0NDpjaG9sX251c18yMDEy"] = [
+            alterationsBySampleId['VTA0NDpjaG9sX251c18yMDEy'] = [
                 {
-                    "uniqueSampleKey": "VTA0NDpjaG9sX251c18yMDEy",
-                    "molecularProfileAlterationType": "MUTATION_EXTENDED",
-                    "alterationSubType": "missense",
-                    "alterationType": "FUSION"
+                    uniqueSampleKey: 'VTA0NDpjaG9sX251c18yMDEy',
+                    molecularProfileAlterationType: 'MUTATION_EXTENDED',
+                    alterationSubType: 'missense',
+                    alterationType: 'FUSION',
                 },
             ];
 
-            alterationsBySampleId["VzAxMjpjaG9sX251c18yMDEy"] = [
+            alterationsBySampleId['VzAxMjpjaG9sX251c18yMDEy'] = [
                 {
-                    "uniqueSampleKey": "VzAxMjpjaG9sX251c18yMDEy",
-                    "alterationSubType": "amp",
-                    "alterationType": "COPY_NUMBER_ALTERATION"
-                }
+                    uniqueSampleKey: 'VzAxMjpjaG9sX251c18yMDEy',
+                    alterationSubType: 'amp',
+                    alterationType: 'COPY_NUMBER_ALTERATION',
+                },
             ];
 
-            alterationsBySampleId["VzA0MDpjaG9sX251c18yMDEy"] = [
+            alterationsBySampleId['VzA0MDpjaG9sX251c18yMDEy'] = [
                 {
-                    "uniqueSampleKey": "VzA0MDpjaG9sX251c18yMDEy",
-                    "alterationSubType": "homdel",
-                    "alterationType": "COPY_NUMBER_ALTERATION"
-                }
+                    uniqueSampleKey: 'VzA0MDpjaG9sX251c18yMDEy',
+                    alterationSubType: 'homdel',
+                    alterationType: 'COPY_NUMBER_ALTERATION',
+                },
             ];
 
-            const ret = countAlterationOccurences(groupedSamples, alterationsBySampleId, molecularProfileIdsByAlterationType, genePanelData);
+            const ret = countAlterationOccurences(
+                groupedSamples,
+                alterationsBySampleId,
+                molecularProfileIdsByAlterationType,
+                genePanelData
+            );
 
             const expectedResult = {
-                "Hepatobiliary Cancer": {
-                    "profiledSampleTotal": 3,
-                    "alterationTotal": 5,
-                    "alterationTypeCounts": {
-                        "mutated": 2,
-                        "amp": 1,
-                        "homdel": 1,
-                        "hetloss": 0,
-                        "gain": 0,
-                        "fusion": 1,
-                        "mrnaExpressionHigh": 0,
-                        "mrnaExpressionLow": 0,
-                        "protExpressionHigh": 0,
-                        "protExpressionLow": 0,
-                        "multiple": 0
+                'Hepatobiliary Cancer': {
+                    profiledSampleTotal: 3,
+                    alterationTotal: 5,
+                    alterationTypeCounts: {
+                        mutated: 2,
+                        amp: 1,
+                        homdel: 1,
+                        hetloss: 0,
+                        gain: 0,
+                        fusion: 1,
+                        mrnaExpressionHigh: 0,
+                        mrnaExpressionLow: 0,
+                        protExpressionHigh: 0,
+                        protExpressionLow: 0,
+                        multiple: 0,
+                    },
+                    alteredSampleCount: 5,
+                    parentCancerType: 'Hepatobiliary Cancer',
+                    profiledSamplesCounts: {
+                        mutation: 3,
+                        cna: 0,
+                        expression: 0,
+                        protein: 0,
                     },
-                    "alteredSampleCount": 5,
-                    "parentCancerType": "Hepatobiliary Cancer",
-                    "profiledSamplesCounts":{
-                        "mutation": 3,
-                        "cna": 0,
-                        "expression": 0,
-                        "protein": 0
+                    notProfiledSamplesCounts: {
+                        mutation: 5,
+                        cna: 0,
+                        expression: 0,
+                        protein: 0,
                     },
-                    "notProfiledSamplesCounts":{
-                        "mutation": 5,
-                        "cna": 0,
-                        "expression": 0,
-                        "protein": 0
-                    }
-                }
+                },
             };
 
             assert.deepEqual(ret, expectedResult);
-
         });
 
         it('samples with multiple mutations are only counted as "multiple"; alteration total reflects ALL alterations; does not double count multiple alterations to same sample in alteredSampleCount', () => {
-
-            alterationsBySampleId["VTA0NDpjaG9sX251c18yMDEy"] = [{
-                "uniqueSampleKey": "VTA0NDpjaG9sX251c18yMDEy",
-                "alterationType": "FUSION"
-            },
-            {
-                "uniqueSampleKey": "VTA0NDpjaG9sX251c18yMDEy",
-                "alterationType": "MUTATION_EXTENDED"
-            }
+            alterationsBySampleId['VTA0NDpjaG9sX251c18yMDEy'] = [
+                {
+                    uniqueSampleKey: 'VTA0NDpjaG9sX251c18yMDEy',
+                    alterationType: 'FUSION',
+                },
+                {
+                    uniqueSampleKey: 'VTA0NDpjaG9sX251c18yMDEy',
+                    alterationType: 'MUTATION_EXTENDED',
+                },
             ];
 
-            const ret = countAlterationOccurences(groupedSamples, alterationsBySampleId, molecularProfileIdsByAlterationType, genePanelData);
+            const ret = countAlterationOccurences(
+                groupedSamples,
+                alterationsBySampleId,
+                molecularProfileIdsByAlterationType,
+                genePanelData
+            );
 
             const expectedResult = {
-                "Hepatobiliary Cancer": {
-                    "profiledSampleTotal": 3,
-                    "alterationTotal": 4,
-                    "alterationTypeCounts": {
-                        "mutated": 2,
-                        "amp": 0,
-                        "homdel": 0,
-                        "hetloss": 0,
-                        "gain": 0,
-                        "fusion": 0,
-                        "mrnaExpressionHigh": 0,
-                        "mrnaExpressionLow": 0,
-                        "protExpressionHigh": 0,
-                        "protExpressionLow": 0,
-                        "multiple": 1
+                'Hepatobiliary Cancer': {
+                    profiledSampleTotal: 3,
+                    alterationTotal: 4,
+                    alterationTypeCounts: {
+                        mutated: 2,
+                        amp: 0,
+                        homdel: 0,
+                        hetloss: 0,
+                        gain: 0,
+                        fusion: 0,
+                        mrnaExpressionHigh: 0,
+                        mrnaExpressionLow: 0,
+                        protExpressionHigh: 0,
+                        protExpressionLow: 0,
+                        multiple: 1,
                     },
-                    "alteredSampleCount": 3,
-                    "parentCancerType": "Hepatobiliary Cancer",
-                    "profiledSamplesCounts":{
-                        "mutation": 3,
-                        "cna": 0,
-                        "expression": 0,
-                        "protein": 0
+                    alteredSampleCount: 3,
+                    parentCancerType: 'Hepatobiliary Cancer',
+                    profiledSamplesCounts: {
+                        mutation: 3,
+                        cna: 0,
+                        expression: 0,
+                        protein: 0,
                     },
-                    "notProfiledSamplesCounts":{
-                        "mutation": 5,
-                        "cna": 0,
-                        "expression": 0,
-                        "protein": 0
-                    }
-                }
+                    notProfiledSamplesCounts: {
+                        mutation: 5,
+                        cna: 0,
+                        expression: 0,
+                        protein: 0,
+                    },
+                },
             };
 
             assert.deepEqual(ret, expectedResult);
-
         });
 
         it('uses alterationSubType to evaluate MRNA direction', () => {
-
-            alterationsBySampleId["VTA0NDpjaG9sX251c18yMDEy"] = [
+            alterationsBySampleId['VTA0NDpjaG9sX251c18yMDEy'] = [
                 {
-                    "uniqueSampleKey": "VTA0NDpjaG9sX251c18yMDEy",
-                    "molecularProfileAlterationType": "MUTATION_EXTENDED",
-                    "alterationSubType": "low",
-                    "alterationType": "MRNA_EXPRESSION"
+                    uniqueSampleKey: 'VTA0NDpjaG9sX251c18yMDEy',
+                    molecularProfileAlterationType: 'MUTATION_EXTENDED',
+                    alterationSubType: 'low',
+                    alterationType: 'MRNA_EXPRESSION',
                 },
             ];
 
-            alterationsBySampleId["VzAxMjpjaG9sX251c18yMDEy"] = [
+            alterationsBySampleId['VzAxMjpjaG9sX251c18yMDEy'] = [
                 {
-                    "uniqueSampleKey": "VzAxMjpjaG9sX251c18yMDEy",
-                    "alterationSubType": "high",
-                    "alterationType": "MRNA_EXPRESSION"
-                }
+                    uniqueSampleKey: 'VzAxMjpjaG9sX251c18yMDEy',
+                    alterationSubType: 'high',
+                    alterationType: 'MRNA_EXPRESSION',
+                },
             ];
 
-            const ret = countAlterationOccurences(groupedSamples, alterationsBySampleId, molecularProfileIdsByAlterationType, genePanelData);
-
-            assert.equal(ret["Hepatobiliary Cancer"].alterationTypeCounts.mrnaExpressionLow, 1);
-            assert.equal(ret["Hepatobiliary Cancer"].alterationTypeCounts.mrnaExpressionHigh, 1);
-
+            const ret = countAlterationOccurences(
+                groupedSamples,
+                alterationsBySampleId,
+                molecularProfileIdsByAlterationType,
+                genePanelData
+            );
+
+            assert.equal(
+                ret['Hepatobiliary Cancer'].alterationTypeCounts
+                    .mrnaExpressionLow,
+                1
+            );
+            assert.equal(
+                ret['Hepatobiliary Cancer'].alterationTypeCounts
+                    .mrnaExpressionHigh,
+                1
+            );
         });
 
         it('uses alterationSubType to evaluate PROT direction', () => {
-
-            alterationsBySampleId["VTA0NDpjaG9sX251c18yMDEy"] = [
+            alterationsBySampleId['VTA0NDpjaG9sX251c18yMDEy'] = [
                 {
-                    "uniqueSampleKey": "VTA0NDpjaG9sX251c18yMDEy",
-                    "molecularProfileAlterationType": "MUTATION_EXTENDED",
-                    "alterationSubType": "low",
-                    "alterationType": "PROTEIN_LEVEL"
+                    uniqueSampleKey: 'VTA0NDpjaG9sX251c18yMDEy',
+                    molecularProfileAlterationType: 'MUTATION_EXTENDED',
+                    alterationSubType: 'low',
+                    alterationType: 'PROTEIN_LEVEL',
                 },
             ];
 
-            alterationsBySampleId["VzAxMjpjaG9sX251c18yMDEy"] = [
+            alterationsBySampleId['VzAxMjpjaG9sX251c18yMDEy'] = [
                 {
-                    "uniqueSampleKey": "VzAxMjpjaG9sX251c18yMDEy",
-                    "alterationSubType": "high",
-                    "alterationType": "PROTEIN_LEVEL"
-                }
+                    uniqueSampleKey: 'VzAxMjpjaG9sX251c18yMDEy',
+                    alterationSubType: 'high',
+                    alterationType: 'PROTEIN_LEVEL',
+                },
             ];
 
-            const ret = countAlterationOccurences(groupedSamples, alterationsBySampleId, molecularProfileIdsByAlterationType, genePanelData);
-
-            assert.equal(ret["Hepatobiliary Cancer"].alterationTypeCounts.protExpressionLow, 1);
-            assert.equal(ret["Hepatobiliary Cancer"].alterationTypeCounts.protExpressionHigh, 1);
-
+            const ret = countAlterationOccurences(
+                groupedSamples,
+                alterationsBySampleId,
+                molecularProfileIdsByAlterationType,
+                genePanelData
+            );
+
+            assert.equal(
+                ret['Hepatobiliary Cancer'].alterationTypeCounts
+                    .protExpressionLow,
+                1
+            );
+            assert.equal(
+                ret['Hepatobiliary Cancer'].alterationTypeCounts
+                    .protExpressionHigh,
+                1
+            );
         });
-
     });
-
-
-});
\ No newline at end of file
+});
diff --git a/src/shared/lib/alterationCountHelpers.ts b/src/shared/lib/alterationCountHelpers.ts
index 389501de770..6583bebe8aa 100644
--- a/src/shared/lib/alterationCountHelpers.ts
+++ b/src/shared/lib/alterationCountHelpers.ts
@@ -1,38 +1,68 @@
 import {
-    AlterationTypeConstants, ExtendedAlteration,
-    ExtendedSample
-} from "../../pages/resultsView/ResultsViewPageStore";
-import {IAlterationCountMap, IAlterationData} from "../../pages/resultsView/cancerSummary/CancerSummaryContent";
-import {Sample, MolecularProfile} from "../api/generated/CBioPortalAPI";
+    AlterationTypeConstants,
+    ExtendedAlteration,
+    ExtendedSample,
+} from '../../pages/resultsView/ResultsViewPageStore';
+import {
+    IAlterationCountMap,
+    IAlterationData,
+} from '../../pages/resultsView/cancerSummary/CancerSummaryContent';
+import { Sample, MolecularProfile } from '../api/generated/CBioPortalAPI';
 import * as _ from 'lodash';
-import { CoverageInformation } from "pages/resultsView/ResultsViewPageStoreUtils";
-import { isSampleProfiledInMultiple } from "./isSampleProfiled";
+import { CoverageInformation } from 'pages/resultsView/ResultsViewPageStoreUtils';
+import { isSampleProfiledInMultiple } from './isSampleProfiled';
 
 export function getAlterationCountsForCancerTypesByGene(
-    alterationsByGeneBySampleKey: { [geneName: string]: { [sampleId: string]: ExtendedAlteration[] } },
+    alterationsByGeneBySampleKey: {
+        [geneName: string]: { [sampleId: string]: ExtendedAlteration[] };
+    },
     samplesExtendedWithClinicalData: ExtendedSample[],
     groupByProperty: keyof ExtendedSample,
-    molecularProfileIdsByAlterationType:{ [alterationType: string]: MolecularProfile[] },
-    coverageInformation:CoverageInformation) {
-
-    const ret = _.mapValues(alterationsByGeneBySampleKey, (alterationsBySampleId: { [sampleId: string]: ExtendedAlteration[] }, gene: string) => {
-        const samplesByCancerType = _.groupBy(samplesExtendedWithClinicalData, (sample: ExtendedSample) => {
-            return sample[groupByProperty];
-        });
-        return countAlterationOccurences(samplesByCancerType, alterationsBySampleId, molecularProfileIdsByAlterationType, coverageInformation, gene);
-    });
+    molecularProfileIdsByAlterationType: {
+        [alterationType: string]: MolecularProfile[];
+    },
+    coverageInformation: CoverageInformation
+) {
+    const ret = _.mapValues(
+        alterationsByGeneBySampleKey,
+        (
+            alterationsBySampleId: { [sampleId: string]: ExtendedAlteration[] },
+            gene: string
+        ) => {
+            const samplesByCancerType = _.groupBy(
+                samplesExtendedWithClinicalData,
+                (sample: ExtendedSample) => {
+                    return sample[groupByProperty];
+                }
+            );
+            return countAlterationOccurences(
+                samplesByCancerType,
+                alterationsBySampleId,
+                molecularProfileIdsByAlterationType,
+                coverageInformation,
+                gene
+            );
+        }
+    );
     return ret;
 }
 
 export function getAlterationCountsForCancerTypesForAllGenes(
-    alterationsByGeneBySampleKey: { [geneName: string]: { [sampleId: string]: ExtendedAlteration[] } },
+    alterationsByGeneBySampleKey: {
+        [geneName: string]: { [sampleId: string]: ExtendedAlteration[] };
+    },
     samplesExtendedWithClinicalData: ExtendedSample[],
     groupByProperty: keyof ExtendedSample,
-    molecularProfileIdsByAlterationType:{ [alterationType: string]: MolecularProfile[] },
-    coverageInformation:CoverageInformation) {
-
-    const samplesByCancerType = _.groupBy(samplesExtendedWithClinicalData, (sample: ExtendedSample) => sample[groupByProperty]);
-    const flattened = _.flatMap(alterationsByGeneBySampleKey, (map) => map);
+    molecularProfileIdsByAlterationType: {
+        [alterationType: string]: MolecularProfile[];
+    },
+    coverageInformation: CoverageInformation
+) {
+    const samplesByCancerType = _.groupBy(
+        samplesExtendedWithClinicalData,
+        (sample: ExtendedSample) => sample[groupByProperty]
+    );
+    const flattened = _.flatMap(alterationsByGeneBySampleKey, map => map);
 
     // NEED TO FLATTEN and then merge this to get all alteration by sampleId
     function customizer(objValue: any, srcValue: any) {
@@ -41,10 +71,17 @@ export function getAlterationCountsForCancerTypesForAllGenes(
         }
     }
 
-    const merged: { [uniqueSampleKey: string]: ExtendedAlteration[] } =
-        (_.mergeWith({}, ...flattened, customizer) as { [uniqueSampleKey: string]: ExtendedAlteration[] });
-    return countAlterationOccurences(samplesByCancerType, merged, molecularProfileIdsByAlterationType, coverageInformation);
-
+    const merged: {
+        [uniqueSampleKey: string]: ExtendedAlteration[];
+    } = _.mergeWith({}, ...flattened, customizer) as {
+        [uniqueSampleKey: string]: ExtendedAlteration[];
+    };
+    return countAlterationOccurences(
+        samplesByCancerType,
+        merged,
+        molecularProfileIdsByAlterationType,
+        coverageInformation
+    );
 }
 
 /*
@@ -54,133 +91,178 @@ export function getAlterationCountsForCancerTypesForAllGenes(
 export function countAlterationOccurences(
     groupedSamples: { [groupingProperty: string]: ExtendedSample[] },
     alterationsBySampleId: { [id: string]: ExtendedAlteration[] },
-    molecularProfileIdsByAlterationType:{ [alterationType: string]: MolecularProfile[] },
-    coverageInformation:CoverageInformation,
-    hugoGeneSymbol?:string) {
-
-    return _.mapValues(groupedSamples, (samples: ExtendedSample[], cancerType: string) => {
+    molecularProfileIdsByAlterationType: {
+        [alterationType: string]: MolecularProfile[];
+    },
+    coverageInformation: CoverageInformation,
+    hugoGeneSymbol?: string
+) {
+    return _.mapValues(
+        groupedSamples,
+        (samples: ExtendedSample[], cancerType: string) => {
+            const counts: IAlterationCountMap = {
+                mutated: 0,
+                amp: 0, // 2
+                homdel: 0, // -2
+                hetloss: 0, // -1
+                gain: 0, // 1
+                fusion: 0,
+                mrnaExpressionHigh: 0,
+                mrnaExpressionLow: 0,
+                protExpressionHigh: 0,
+                protExpressionLow: 0,
+                multiple: 0,
+            };
 
-        const counts: IAlterationCountMap = {
-            mutated: 0,
-            amp: 0, // 2
-            homdel: 0, // -2
-            hetloss: 0, // -1
-            gain:0, // 1
-            fusion: 0,
-            mrnaExpressionHigh: 0,
-            mrnaExpressionLow: 0,
-            protExpressionHigh: 0,
-            protExpressionLow: 0,
-            multiple: 0,
-        };
+            const profiledTypeCounts = {
+                mutation: 0,
+                cna: 0,
+                expression: 0,
+                protein: 0,
+            };
 
-        const profiledTypeCounts = {
-            mutation:0,
-            cna:0,
-            expression:0,
-            protein:0
-        }
+            const notProfiledSamplesCounts = {
+                mutation: 0,
+                cna: 0,
+                expression: 0,
+                protein: 0,
+            };
 
-        const notProfiledSamplesCounts = {
-            mutation:0,
-            cna:0,
-            expression:0,
-            protein:0
-        }
+            const ret: IAlterationData = {
+                profiledSampleTotal: 0,
+                alterationTotal: 0,
+                alterationTypeCounts: counts,
+                alteredSampleCount: 0,
+                parentCancerType: samples[0].cancerType,
+                profiledSamplesCounts: profiledTypeCounts,
+                notProfiledSamplesCounts: notProfiledSamplesCounts,
+            };
 
-        const ret: IAlterationData = {
-            profiledSampleTotal:0,
-            alterationTotal:0,
-            alterationTypeCounts:counts,
-            alteredSampleCount:0,
-            parentCancerType:samples[0].cancerType,
-            profiledSamplesCounts: profiledTypeCounts,
-            notProfiledSamplesCounts: notProfiledSamplesCounts
-        };
-
-        // for each sample in cancer type
-        _.forEach(samples, (sample: Sample) => {
-            
-            let isSampleProfiled = false;
-
-            _.forEach(molecularProfileIdsByAlterationType, (molecularProfiles, alterationType) => {
-                const profiled = _.some(isSampleProfiledInMultiple(sample.uniqueSampleKey, _.map(molecularProfiles,molecularProfile=>molecularProfile.molecularProfileId), coverageInformation, hugoGeneSymbol))
-                isSampleProfiled = isSampleProfiled || profiled
-                switch (alterationType) {
-                    case AlterationTypeConstants.COPY_NUMBER_ALTERATION: {
-                        profiled ? profiledTypeCounts.cna++ : notProfiledSamplesCounts.cna++;
-                        break;
-                    }
-                    case AlterationTypeConstants.MRNA_EXPRESSION: {
-                        profiled ? profiledTypeCounts.expression++ : notProfiledSamplesCounts.expression++;
-                        break;
-                    }
-                    case AlterationTypeConstants.PROTEIN_LEVEL: {
-                        profiled ? profiledTypeCounts.protein++ : notProfiledSamplesCounts.protein++;
-                        break;
-                    }
-                    case AlterationTypeConstants.MUTATION_EXTENDED: {
-                        profiled ? profiledTypeCounts.mutation++ : notProfiledSamplesCounts.mutation++;
-                        break;
-                    }
-                }
-            });
+            // for each sample in cancer type
+            _.forEach(samples, (sample: Sample) => {
+                let isSampleProfiled = false;
 
-            if(isSampleProfiled) {
-                ret.profiledSampleTotal += 1;
-            }
-            // there are alterations corresponding to that sample
-            if (sample.uniqueSampleKey in alterationsBySampleId) {
-                const alterations = alterationsBySampleId[sample.uniqueSampleKey];
-
-                //a sample could have multiple mutations.  we only want to to count one
-                const uniqueAlterations = _.uniqBy(alterations, (alteration) => alteration.alterationType);
-
-                ret.alterationTotal += uniqueAlterations.length;
-
-                // if the sample has at least one alteration, it's altered so
-                // increment alteredSampleTotal
-                if (uniqueAlterations.length > 0) { //
-                    ret.alteredSampleCount+=1;
-                }
-
-                // if we have multiple alterations, we just register this as "multiple" and do NOT add
-                // individual alterations to their respective counts
-                if (uniqueAlterations.length > 1) {
-                    counts.multiple++;
-                } else {
-
-                    // for each alteration, determine what it's type is and increment the counts for this set of samples
-                    _.forEach(uniqueAlterations, (alteration: ExtendedAlteration) => {
-                        switch (alteration.alterationType) {
-                            case AlterationTypeConstants.COPY_NUMBER_ALTERATION:
-                                // to do: type oqlfilter so that we can be sure alterationSubType is truly key of interface
-                                counts[(alteration.alterationSubType as keyof IAlterationCountMap)]++;
+                _.forEach(
+                    molecularProfileIdsByAlterationType,
+                    (molecularProfiles, alterationType) => {
+                        const profiled = _.some(
+                            isSampleProfiledInMultiple(
+                                sample.uniqueSampleKey,
+                                _.map(
+                                    molecularProfiles,
+                                    molecularProfile =>
+                                        molecularProfile.molecularProfileId
+                                ),
+                                coverageInformation,
+                                hugoGeneSymbol
+                            )
+                        );
+                        isSampleProfiled = isSampleProfiled || profiled;
+                        switch (alterationType) {
+                            case AlterationTypeConstants.COPY_NUMBER_ALTERATION: {
+                                profiled
+                                    ? profiledTypeCounts.cna++
+                                    : notProfiledSamplesCounts.cna++;
                                 break;
-                            case AlterationTypeConstants.MRNA_EXPRESSION:
-                                if (alteration.alterationSubType === 'high') counts.mrnaExpressionHigh++;
-                                if (alteration.alterationSubType === 'low') counts.mrnaExpressionLow++;
+                            }
+                            case AlterationTypeConstants.MRNA_EXPRESSION: {
+                                profiled
+                                    ? profiledTypeCounts.expression++
+                                    : notProfiledSamplesCounts.expression++;
                                 break;
-                            case AlterationTypeConstants.PROTEIN_LEVEL:
-                                if (alteration.alterationSubType === 'high') counts.protExpressionHigh++;
-                                if (alteration.alterationSubType === 'low') counts.protExpressionLow++;
+                            }
+                            case AlterationTypeConstants.PROTEIN_LEVEL: {
+                                profiled
+                                    ? profiledTypeCounts.protein++
+                                    : notProfiledSamplesCounts.protein++;
                                 break;
-                            case AlterationTypeConstants.MUTATION_EXTENDED:
-                                counts.mutated++;
+                            }
+                            case AlterationTypeConstants.MUTATION_EXTENDED: {
+                                profiled
+                                    ? profiledTypeCounts.mutation++
+                                    : notProfiledSamplesCounts.mutation++;
                                 break;
-                            case AlterationTypeConstants.FUSION:
-                                counts.fusion++;
-                                break;
-
+                            }
                         }
+                    }
+                );
 
-                    });
+                if (isSampleProfiled) {
+                    ret.profiledSampleTotal += 1;
                 }
+                // there are alterations corresponding to that sample
+                if (sample.uniqueSampleKey in alterationsBySampleId) {
+                    const alterations =
+                        alterationsBySampleId[sample.uniqueSampleKey];
+
+                    //a sample could have multiple mutations.  we only want to to count one
+                    const uniqueAlterations = _.uniqBy(
+                        alterations,
+                        alteration => alteration.alterationType
+                    );
 
-            }
+                    ret.alterationTotal += uniqueAlterations.length;
 
-        });
-        return ret;
-    });
+                    // if the sample has at least one alteration, it's altered so
+                    // increment alteredSampleTotal
+                    if (uniqueAlterations.length > 0) {
+                        //
+                        ret.alteredSampleCount += 1;
+                    }
 
-}
\ No newline at end of file
+                    // if we have multiple alterations, we just register this as "multiple" and do NOT add
+                    // individual alterations to their respective counts
+                    if (uniqueAlterations.length > 1) {
+                        counts.multiple++;
+                    } else {
+                        // for each alteration, determine what it's type is and increment the counts for this set of samples
+                        _.forEach(
+                            uniqueAlterations,
+                            (alteration: ExtendedAlteration) => {
+                                switch (alteration.alterationType) {
+                                    case AlterationTypeConstants.COPY_NUMBER_ALTERATION:
+                                        // to do: type oqlfilter so that we can be sure alterationSubType is truly key of interface
+                                        counts[
+                                            alteration.alterationSubType as keyof IAlterationCountMap
+                                        ]++;
+                                        break;
+                                    case AlterationTypeConstants.MRNA_EXPRESSION:
+                                        if (
+                                            alteration.alterationSubType ===
+                                            'high'
+                                        )
+                                            counts.mrnaExpressionHigh++;
+                                        if (
+                                            alteration.alterationSubType ===
+                                            'low'
+                                        )
+                                            counts.mrnaExpressionLow++;
+                                        break;
+                                    case AlterationTypeConstants.PROTEIN_LEVEL:
+                                        if (
+                                            alteration.alterationSubType ===
+                                            'high'
+                                        )
+                                            counts.protExpressionHigh++;
+                                        if (
+                                            alteration.alterationSubType ===
+                                            'low'
+                                        )
+                                            counts.protExpressionLow++;
+                                        break;
+                                    case AlterationTypeConstants.MUTATION_EXTENDED:
+                                        counts.mutated++;
+                                        break;
+                                    case AlterationTypeConstants.FUSION:
+                                        counts.fusion++;
+                                        break;
+                                }
+                            }
+                        );
+                    }
+                }
+            });
+            return ret;
+        }
+    );
+}
diff --git a/src/shared/lib/boxPlotUtils.spec.ts b/src/shared/lib/boxPlotUtils.spec.ts
index 50b53db6e0c..b61f4efaf0e 100644
--- a/src/shared/lib/boxPlotUtils.spec.ts
+++ b/src/shared/lib/boxPlotUtils.spec.ts
@@ -1,13 +1,44 @@
 import { assert } from 'chai';
-import {calculateBoxPlotModel} from "./boxPlotUtils";
-import jStat from 'jStat'
+import { calculateBoxPlotModel } from './boxPlotUtils';
+import jStat from 'jStat';
 
-describe('Box Plot Utils', ()=>{
-
-    it('Calculates box plot model for distributions WITHOUT outliers',()=>{
-        const arr = [1,2,2,2.5,3,5,6,7,8,10,11,11.5,12,13,13,13,14.5,15,17,17.5,18,20,21];
+describe('Box Plot Utils', () => {
+    it('Calculates box plot model for distributions WITHOUT outliers', () => {
+        const arr = [
+            1,
+            2,
+            2,
+            2.5,
+            3,
+            5,
+            6,
+            7,
+            8,
+            10,
+            11,
+            11.5,
+            12,
+            13,
+            13,
+            13,
+            14.5,
+            15,
+            17,
+            17.5,
+            18,
+            20,
+            21,
+        ];
         const result = calculateBoxPlotModel(arr);
-        const expected = {q1: 5, q2: 12, q3: 14.5, IQR: 9.5, median: 12, whiskerUpper: 21, whiskerLower: 1};
+        const expected = {
+            q1: 5,
+            q2: 12,
+            q3: 14.5,
+            IQR: 9.5,
+            median: 12,
+            whiskerUpper: 21,
+            whiskerLower: 1,
+        };
         assert.equal(result.q1, 5, 'q1');
         assert.equal(result.q2, 11.5, 'q2');
         assert.equal(result.q3, 14.5, 'q3');
@@ -15,25 +46,83 @@ describe('Box Plot Utils', ()=>{
         assert.equal(result.IQR, 9.5, 'IQR');
         assert.equal(result.whiskerUpper, result.max, 'whiskerUpper is max');
         assert.equal(result.whiskerLower, result.min, 'whiskerLower is min');
-
     });
 
-
-    it('Sets whiskers to quartile +- 1.5(IQR) when outliers exist',()=>{
-        const arr = [1,2,2,2.5,3,5,6,7,8,10,11,11.5,12,13,13,13,14.5,15,17,17.5,18,20,100];
+    it('Sets whiskers to quartile +- 1.5(IQR) when outliers exist', () => {
+        const arr = [
+            1,
+            2,
+            2,
+            2.5,
+            3,
+            5,
+            6,
+            7,
+            8,
+            10,
+            11,
+            11.5,
+            12,
+            13,
+            13,
+            13,
+            14.5,
+            15,
+            17,
+            17.5,
+            18,
+            20,
+            100,
+        ];
         const result = calculateBoxPlotModel(arr);
-        const expected = {q1: 5, q2: 12, q3: 14.5, IQR: 9.5, median: 12, whiskerUpper: 21, whiskerLower: 1};
+        const expected = {
+            q1: 5,
+            q2: 12,
+            q3: 14.5,
+            IQR: 9.5,
+            median: 12,
+            whiskerUpper: 21,
+            whiskerLower: 1,
+        };
         assert.equal(result.q1, 5, 'q1');
         assert.equal(result.q2, 11.5, 'q2');
         assert.equal(result.q3, 14.5, 'q3');
         assert.equal(result.median, 11.5, 'median');
         assert.equal(result.IQR, 9.5, 'IQR');
-        assert.equal(result.whiskerUpper, result.q3 + (1.5*result.IQR), 'whiskerUpper is NOT max');
+        assert.equal(
+            result.whiskerUpper,
+            result.q3 + 1.5 * result.IQR,
+            'whiskerUpper is NOT max'
+        );
         assert.equal(result.whiskerLower, result.min, 'whiskerLower is min');
     });
 
-    it('Sets whiskers to quartile +- 1.5(IQR) when outliers exist',()=>{
-        const arr = [-200,1,2,2,2.5,3,5,6,7,8,10,11,11.5,12,13,13,13,14.5,15,17,17.5,18,20];
+    it('Sets whiskers to quartile +- 1.5(IQR) when outliers exist', () => {
+        const arr = [
+            -200,
+            1,
+            2,
+            2,
+            2.5,
+            3,
+            5,
+            6,
+            7,
+            8,
+            10,
+            11,
+            11.5,
+            12,
+            13,
+            13,
+            13,
+            14.5,
+            15,
+            17,
+            17.5,
+            18,
+            20,
+        ];
         const result = calculateBoxPlotModel(arr);
         assert.equal(result.q1, 3, 'q1');
         assert.equal(result.q2, 11, 'q2');
@@ -41,18 +130,51 @@ describe('Box Plot Utils', ()=>{
         assert.equal(result.median, 11, 'median');
         assert.equal(result.IQR, 10, 'IQR');
         assert.equal(result.whiskerUpper, 20, 'whiskerUpper is NOT max');
-        assert.equal(result.whiskerLower, (result.q1 - (1.5*result.IQR)), 'whiskerLower is min');
+        assert.equal(
+            result.whiskerLower,
+            result.q1 - 1.5 * result.IQR,
+            'whiskerLower is min'
+        );
     });
 
-    it('Gets upper and lower suspectedoutliers',()=>{
-        const arr = [-27,-26,-12,-11.9,2.5,3,5,6,7,8,10,11,11.5,12,13,13,13,14.5,15,27,28,42.9,44];
+    it('Gets upper and lower suspectedoutliers', () => {
+        const arr = [
+            -27,
+            -26,
+            -12,
+            -11.9,
+            2.5,
+            3,
+            5,
+            6,
+            7,
+            8,
+            10,
+            11,
+            11.5,
+            12,
+            13,
+            13,
+            13,
+            14.5,
+            15,
+            27,
+            28,
+            42.9,
+            44,
+        ];
         const result = calculateBoxPlotModel(arr);
         assert.deepEqual(result.outliersLower.outliers, [-27], 'gets outlier');
-        assert.deepEqual(result.outliersLower.suspectedOutliers, [-26,-12], 'two suspected outliers');
-        assert.deepEqual(result.outliersUpper.suspectedOutliers, [28,42.9], 'two outliers');
+        assert.deepEqual(
+            result.outliersLower.suspectedOutliers,
+            [-26, -12],
+            'two suspected outliers'
+        );
+        assert.deepEqual(
+            result.outliersUpper.suspectedOutliers,
+            [28, 42.9],
+            'two outliers'
+        );
         assert.deepEqual(result.outliersUpper.outliers, [44], 'two outliers');
     });
-
-
-
-});
\ No newline at end of file
+});
diff --git a/src/shared/lib/boxPlotUtils.ts b/src/shared/lib/boxPlotUtils.ts
index 5dae8b579cf..3238655e7f1 100644
--- a/src/shared/lib/boxPlotUtils.ts
+++ b/src/shared/lib/boxPlotUtils.ts
@@ -1,4 +1,4 @@
-import jStat from 'jStat'
+import jStat from 'jStat';
 import * as _ from 'lodash';
 
 const SUSPECTED_OUTLIER_MULTIPLE = 1.5;
@@ -12,46 +12,55 @@ interface Outliers {
     lower: {
         suspectedOutliers: number[];
         outliers: number[];
-    }
-};
+    };
+}
 
 export type BoxPlotModel = {
-    min: number,
-    median: number,
-    max: number,
-    q1: number,
-    q2: number,
-    q3: number,
-    x?: number,
-    whiskerUpper: number,
-    whiskerLower: number,
-    IQR: number,
-    outliersUpper: Outliers["upper"],
-    outliersLower: Outliers["lower"]
+    min: number;
+    median: number;
+    max: number;
+    q1: number;
+    q2: number;
+    q3: number;
+    x?: number;
+    whiskerUpper: number;
+    whiskerLower: number;
+    IQR: number;
+    outliersUpper: Outliers['upper'];
+    outliersLower: Outliers['lower'];
 };
 
-
-function calculateOutliers(vector: number[], suspectedOutlierThresholdUpper: number, outlierThresholdUpper: number,
-                           suspectedOutlierThresholdLower: number, outlierThresholdLower: number): Outliers {
-
-    return vector.reduce((memo: Outliers, val) => {
-        if (val >= suspectedOutlierThresholdUpper) {
-            (val < outlierThresholdUpper) ?
-                memo.upper.suspectedOutliers.push(val) : memo.upper.outliers.push(val);
-        }
-
-        if (val <= suspectedOutlierThresholdLower) {
-            (val > outlierThresholdLower) ?
-                memo.lower.suspectedOutliers.push(val) : memo.lower.outliers.push(val);
+function calculateOutliers(
+    vector: number[],
+    suspectedOutlierThresholdUpper: number,
+    outlierThresholdUpper: number,
+    suspectedOutlierThresholdLower: number,
+    outlierThresholdLower: number
+): Outliers {
+    return vector.reduce(
+        (memo: Outliers, val) => {
+            if (val >= suspectedOutlierThresholdUpper) {
+                val < outlierThresholdUpper
+                    ? memo.upper.suspectedOutliers.push(val)
+                    : memo.upper.outliers.push(val);
+            }
+
+            if (val <= suspectedOutlierThresholdLower) {
+                val > outlierThresholdLower
+                    ? memo.lower.suspectedOutliers.push(val)
+                    : memo.lower.outliers.push(val);
+            }
+
+            return memo;
+        },
+        {
+            upper: { outliers: [], suspectedOutliers: [] },
+            lower: { outliers: [], suspectedOutliers: [] },
         }
-
-        return memo;
-    }, {upper: {outliers: [], suspectedOutliers: []}, lower: {outliers: [], suspectedOutliers: []}});
+    );
 }
 
-
 export function calculateBoxPlotModel(vector: number[]): BoxPlotModel {
-
     const sortedVector = _.sortBy<number>(vector, [(n: number) => n]);
 
     const quartiles = jStat.quartiles(sortedVector) as number[];
@@ -64,20 +73,33 @@ export function calculateBoxPlotModel(vector: number[]): BoxPlotModel {
     const max: number = sortedVector[sortedVector.length - 1];
     const min: number = sortedVector[0];
 
-    const outlierThresholdLower = q1 - (OUTLIER_MULTIPLE * IQR);
-    const outlierThresholdUpper = q3 + (OUTLIER_MULTIPLE * IQR);
-
-    const suspectedOutlierThresholdLower = q1 - (SUSPECTED_OUTLIER_MULTIPLE * IQR);
-    const suspectedOutlierThresholdUpper = q3 + (SUSPECTED_OUTLIER_MULTIPLE * IQR);
-
-    const outliers = calculateOutliers(sortedVector, suspectedOutlierThresholdUpper, outlierThresholdUpper,
-        suspectedOutlierThresholdLower, outlierThresholdLower);
-
-    const whiskerLower = (outliers.lower.suspectedOutliers.length > 0 || outliers.lower.outliers.length > 0) ?
-        suspectedOutlierThresholdLower : sortedVector[0];
-
-    const whiskerUpper = (outliers.upper.suspectedOutliers.length > 0 || outliers.upper.outliers.length > 0) ?
-        suspectedOutlierThresholdUpper : sortedVector[sortedVector.length - 1];
+    const outlierThresholdLower = q1 - OUTLIER_MULTIPLE * IQR;
+    const outlierThresholdUpper = q3 + OUTLIER_MULTIPLE * IQR;
+
+    const suspectedOutlierThresholdLower =
+        q1 - SUSPECTED_OUTLIER_MULTIPLE * IQR;
+    const suspectedOutlierThresholdUpper =
+        q3 + SUSPECTED_OUTLIER_MULTIPLE * IQR;
+
+    const outliers = calculateOutliers(
+        sortedVector,
+        suspectedOutlierThresholdUpper,
+        outlierThresholdUpper,
+        suspectedOutlierThresholdLower,
+        outlierThresholdLower
+    );
+
+    const whiskerLower =
+        outliers.lower.suspectedOutliers.length > 0 ||
+        outliers.lower.outliers.length > 0
+            ? suspectedOutlierThresholdLower
+            : sortedVector[0];
+
+    const whiskerUpper =
+        outliers.upper.suspectedOutliers.length > 0 ||
+        outliers.upper.outliers.length > 0
+            ? suspectedOutlierThresholdUpper
+            : sortedVector[sortedVector.length - 1];
 
     return {
         q1,
@@ -91,18 +113,18 @@ export function calculateBoxPlotModel(vector: number[]): BoxPlotModel {
         min,
         outliersUpper: outliers.upper,
         outliersLower: outliers.lower,
-    }
+    };
 }
 
 export const BOX_STYLES = {
-    min: {stroke: "#999999"},
-    max: {stroke: "#999999"},
-    q1: {fill: "#eeeeee"},
-    q3: {fill: "#eeeeee"},
-    median: {stroke: "#999999", strokeWidth: 1}
+    min: { stroke: '#999999' },
+    max: { stroke: '#999999' },
+    q1: { fill: '#eeeeee' },
+    q3: { fill: '#eeeeee' },
+    median: { stroke: '#999999', strokeWidth: 1 },
 };
 
 export interface VictoryBoxPlotModel extends BoxPlotModel {
     realMin: number;
     realMax: number;
-}
\ No newline at end of file
+}
diff --git a/src/shared/lib/calculation/BenjaminiHochbergFDRCalculator.spec.ts b/src/shared/lib/calculation/BenjaminiHochbergFDRCalculator.spec.ts
index 65dcaa59b44..1e5f7fe77bb 100644
--- a/src/shared/lib/calculation/BenjaminiHochbergFDRCalculator.spec.ts
+++ b/src/shared/lib/calculation/BenjaminiHochbergFDRCalculator.spec.ts
@@ -1,31 +1,79 @@
 import { ExtendedSample } from '../../../pages/resultsView/ResultsViewPageStore';
-import {calculateQValues} from "./BenjaminiHochbergFDRCalculator"
+import { calculateQValues } from './BenjaminiHochbergFDRCalculator';
 import { assert } from 'chai';
 
 const exampleData = [];
 
-describe("#calculateQValue()", () => {
-    it("returns p value as q value for the single data", () => {
+describe('#calculateQValue()', () => {
+    it('returns p value as q value for the single data', () => {
         const arg = [0.0256];
         const exampleResult = [0.0256];
-        assert.deepEqual(exampleResult, calculateQValues(arg), "single q value");
-    })
+        assert.deepEqual(
+            exampleResult,
+            calculateQValues(arg),
+            'single q value'
+        );
+    });
 
-    it("returns 0s for the zero p values", () => {
+    it('returns 0s for the zero p values', () => {
         const arg = [0, 0, 0];
         const exampleResult = [0, 0, 0];
-        assert.deepEqual(exampleResult, calculateQValues(arg), "zero q values");
-    })
+        assert.deepEqual(exampleResult, calculateQValues(arg), 'zero q values');
+    });
 
-    it("returns correct q values for multiple data", () => {
+    it('returns correct q values for multiple data', () => {
         const arg = [0.0256, 0.0635, 0.1465];
         const exampleResult = [0.07680000000000001, 0.09525, 0.1465];
-        assert.deepEqual(exampleResult, calculateQValues(arg), "multiple q value");
-    })
+        assert.deepEqual(
+            exampleResult,
+            calculateQValues(arg),
+            'multiple q value'
+        );
+    });
 
-    it("returns correct q values for massive data", () => {
-        const arg = [0.001, 0.002, 0.003, 0.004, 0.005, 0.006, 0.007, 0.008, 0.009, 0.1, 0.2, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9];
-        const exampleResult = [0.017, 0.017, 0.017, 0.017, 0.017, 0.017, 0.017, 0.017, 0.017, 0.17, 0.30909090909090914, 0.5666666666666668, 0.6538461538461539, 0.7285714285714285, 0.7933333333333332, 0.8500000000000001, 0.9];
-        assert.deepEqual(exampleResult, calculateQValues(arg), "massive q value");
-    })
-});
\ No newline at end of file
+    it('returns correct q values for massive data', () => {
+        const arg = [
+            0.001,
+            0.002,
+            0.003,
+            0.004,
+            0.005,
+            0.006,
+            0.007,
+            0.008,
+            0.009,
+            0.1,
+            0.2,
+            0.4,
+            0.5,
+            0.6,
+            0.7,
+            0.8,
+            0.9,
+        ];
+        const exampleResult = [
+            0.017,
+            0.017,
+            0.017,
+            0.017,
+            0.017,
+            0.017,
+            0.017,
+            0.017,
+            0.017,
+            0.17,
+            0.30909090909090914,
+            0.5666666666666668,
+            0.6538461538461539,
+            0.7285714285714285,
+            0.7933333333333332,
+            0.8500000000000001,
+            0.9,
+        ];
+        assert.deepEqual(
+            exampleResult,
+            calculateQValues(arg),
+            'massive q value'
+        );
+    });
+});
diff --git a/src/shared/lib/calculation/BenjaminiHochbergFDRCalculator.ts b/src/shared/lib/calculation/BenjaminiHochbergFDRCalculator.ts
index 97a3be95357..31c3590ba1a 100644
--- a/src/shared/lib/calculation/BenjaminiHochbergFDRCalculator.ts
+++ b/src/shared/lib/calculation/BenjaminiHochbergFDRCalculator.ts
@@ -1,15 +1,20 @@
 export function calculateQValues(pValuesInIncreasingOrder: number[]): number[] {
-    let cachedElement : number;
+    let cachedElement: number;
     const dataLength = pValuesInIncreasingOrder.length;
-    const reversedQValues = pValuesInIncreasingOrder.reverse().map((currentElement, index) => {
-        if (cachedElement) {
-            const calculatedValue = Math.min(cachedElement, currentElement * dataLength / (dataLength - index));
-            cachedElement = calculatedValue;
-            return calculatedValue;
-        }
-        cachedElement = currentElement;
-        return currentElement;
-    });
+    const reversedQValues = pValuesInIncreasingOrder
+        .reverse()
+        .map((currentElement, index) => {
+            if (cachedElement) {
+                const calculatedValue = Math.min(
+                    cachedElement,
+                    (currentElement * dataLength) / (dataLength - index)
+                );
+                cachedElement = calculatedValue;
+                return calculatedValue;
+            }
+            cachedElement = currentElement;
+            return currentElement;
+        });
 
     return reversedQValues.reverse();
-}
\ No newline at end of file
+}
diff --git a/src/shared/lib/chunkMapReduce.ts b/src/shared/lib/chunkMapReduce.ts
index d8167b78f6d..2435f01f6fd 100644
--- a/src/shared/lib/chunkMapReduce.ts
+++ b/src/shared/lib/chunkMapReduce.ts
@@ -1,7 +1,11 @@
-import * as _ from "lodash";
+import * as _ from 'lodash';
 
-export default async function chunkMapReduce<T,U>(arr:T[], chunkFunc:(chunk:T[])=>Promise<U[]>, chunkSize:number):Promise<U[]> {
+export default async function chunkMapReduce<T, U>(
+    arr: T[],
+    chunkFunc: (chunk: T[]) => Promise<U[]>,
+    chunkSize: number
+): Promise<U[]> {
     const chunks = _.chunk(arr, chunkSize);
     const promises = chunks.map(chunkFunc);
     return _.flatten(await Promise.all(promises));
-}
\ No newline at end of file
+}
diff --git a/src/shared/lib/cloneJSXWithoutKeyAndRef.tsx b/src/shared/lib/cloneJSXWithoutKeyAndRef.tsx
index 56e18b1fa6b..bd619914ab9 100644
--- a/src/shared/lib/cloneJSXWithoutKeyAndRef.tsx
+++ b/src/shared/lib/cloneJSXWithoutKeyAndRef.tsx
@@ -1,11 +1,17 @@
-import * as React from "react";
+import * as React from 'react';
 
-export default function cloneJSXWithoutKeyAndRef(jsx:React.ReactChild):React.ReactChild {
+export default function cloneJSXWithoutKeyAndRef(
+    jsx: React.ReactChild
+): React.ReactChild {
     if (React.isValidElement(jsx)) {
         let element = jsx as React.ReactElement<any>;
-        let {children, key, ref, ...rest} = element.props;
-        return <element.type {...rest}>{React.Children.map(children, cloneJSXWithoutKeyAndRef)}</element.type>
+        let { children, key, ref, ...rest } = element.props;
+        return (
+            <element.type {...rest}>
+                {React.Children.map(children, cloneJSXWithoutKeyAndRef)}
+            </element.type>
+        );
     } else {
         return jsx;
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/lib/complexKeyDataStructures/ComplexKeyCounter.spec.ts b/src/shared/lib/complexKeyDataStructures/ComplexKeyCounter.spec.ts
index 525379d8d5b..472752bc0fc 100644
--- a/src/shared/lib/complexKeyDataStructures/ComplexKeyCounter.spec.ts
+++ b/src/shared/lib/complexKeyDataStructures/ComplexKeyCounter.spec.ts
@@ -1,47 +1,62 @@
-import {assert} from "chai";
-import ComplexKeyCounter from "./ComplexKeyCounter";
+import { assert } from 'chai';
+import ComplexKeyCounter from './ComplexKeyCounter';
 
-describe("ComplexKeyCounter", () => {
-    it("nonexisting keys start at 0, `entries` only reflects incremented keys", ()=>{
+describe('ComplexKeyCounter', () => {
+    it('nonexisting keys start at 0, `entries` only reflects incremented keys', () => {
         const counter = new ComplexKeyCounter();
         assert.deepEqual(counter.entries(), []);
-        assert.equal(counter.get({ k:"aaidsopjfap"}), 0);
-        assert.equal(counter.get({ "kjaspdoijfp134u13!@@#$!$$":"sdf0913"}), 0);
+        assert.equal(counter.get({ k: 'aaidsopjfap' }), 0);
+        assert.equal(
+            counter.get({ 'kjaspdoijfp134u13!@@#$!$$': 'sdf0913' }),
+            0
+        );
         assert.deepEqual(counter.entries(), []);
     });
-    it("after incrementing, the value with `get` changes appropriately, `entries` reflect current state", ()=>{
+    it('after incrementing, the value with `get` changes appropriately, `entries` reflect current state', () => {
         const counter = new ComplexKeyCounter();
         assert.deepEqual(counter.entries(), []);
-        assert.equal(counter.get({ k:"aaidsopjfap"}), 0);
-        assert.equal(counter.get({ "kjaspdoijfp134u13!@@#$!$$":"sdf0913"}), 0);
-        counter.increment({ k:"aaidsopjfap"});
-        counter.increment({ k:"aaidsopjfap"});
-        counter.increment({ k:"aaidsopjfap"});
-        counter.increment({ k:"aaidsopjfap"});
-        counter.increment({ k:"aaidsopjfap"});
-        counter.increment({ "kjaspdoijfp134u13!@@#$!$$":"sdf0913"});
-        counter.increment({ "kjaspdoijfp134u13!@@#$!$$":"sdf0913"});
-        assert.equal(counter.get({ k:"aaidsopjfap"}), 5);
-        assert.equal(counter.get({ "kjaspdoijfp134u13!@@#$!$$":"sdf0913"}), 2);
+        assert.equal(counter.get({ k: 'aaidsopjfap' }), 0);
+        assert.equal(
+            counter.get({ 'kjaspdoijfp134u13!@@#$!$$': 'sdf0913' }),
+            0
+        );
+        counter.increment({ k: 'aaidsopjfap' });
+        counter.increment({ k: 'aaidsopjfap' });
+        counter.increment({ k: 'aaidsopjfap' });
+        counter.increment({ k: 'aaidsopjfap' });
+        counter.increment({ k: 'aaidsopjfap' });
+        counter.increment({ 'kjaspdoijfp134u13!@@#$!$$': 'sdf0913' });
+        counter.increment({ 'kjaspdoijfp134u13!@@#$!$$': 'sdf0913' });
+        assert.equal(counter.get({ k: 'aaidsopjfap' }), 5);
+        assert.equal(
+            counter.get({ 'kjaspdoijfp134u13!@@#$!$$': 'sdf0913' }),
+            2
+        );
         assert.deepEqual(counter.entries(), [
-            { key: { k:"aaidsopjfap"}, value: 5},
-            { key: { "kjaspdoijfp134u13!@@#$!$$":"sdf0913"}, value: 2}
+            { key: { k: 'aaidsopjfap' }, value: 5 },
+            { key: { 'kjaspdoijfp134u13!@@#$!$$': 'sdf0913' }, value: 2 },
         ]);
     });
-    it("after clearing, all keys are back to 0, `entries` returns empty", ()=>{
+    it('after clearing, all keys are back to 0, `entries` returns empty', () => {
         const counter = new ComplexKeyCounter();
-        counter.increment({ k:"aaidsopjfap"});
-        counter.increment({ k:"aaidsopjfap"});
-        counter.increment({ k:"aaidsopjfap"});
-        counter.increment({ k:"aaidsopjfap"});
-        counter.increment({ k:"aaidsopjfap"});
-        counter.increment({ "kjaspdoijfp134u13!@@#$!$$":"sdf0913"});
-        counter.increment({ "kjaspdoijfp134u13!@@#$!$$":"sdf0913"});
-        assert.equal(counter.get({ k:"aaidsopjfap"}), 5);
-        assert.equal(counter.get({ "kjaspdoijfp134u13!@@#$!$$":"sdf0913"}), 2);
+        counter.increment({ k: 'aaidsopjfap' });
+        counter.increment({ k: 'aaidsopjfap' });
+        counter.increment({ k: 'aaidsopjfap' });
+        counter.increment({ k: 'aaidsopjfap' });
+        counter.increment({ k: 'aaidsopjfap' });
+        counter.increment({ 'kjaspdoijfp134u13!@@#$!$$': 'sdf0913' });
+        counter.increment({ 'kjaspdoijfp134u13!@@#$!$$': 'sdf0913' });
+        assert.equal(counter.get({ k: 'aaidsopjfap' }), 5);
+        assert.equal(
+            counter.get({ 'kjaspdoijfp134u13!@@#$!$$': 'sdf0913' }),
+            2
+        );
         counter.clear();
-        assert.equal(counter.get({ k:"aaidsopjfap"}), 0);
-        assert.equal(counter.get({ "kjaspdoijfp134u13!@@#$!$$":"sdf0913"}), 0);
+        assert.equal(counter.get({ k: 'aaidsopjfap' }), 0);
+        assert.equal(
+            counter.get({ 'kjaspdoijfp134u13!@@#$!$$': 'sdf0913' }),
+            0
+        );
         assert.deepEqual(counter.entries(), []);
     });
-});
\ No newline at end of file
+});
diff --git a/src/shared/lib/complexKeyDataStructures/ComplexKeyCounter.ts b/src/shared/lib/complexKeyDataStructures/ComplexKeyCounter.ts
index 4052546f95d..c26ca41cce1 100644
--- a/src/shared/lib/complexKeyDataStructures/ComplexKeyCounter.ts
+++ b/src/shared/lib/complexKeyDataStructures/ComplexKeyCounter.ts
@@ -1,13 +1,13 @@
-import ComplexKeyMap, {ComplexKey} from "./ComplexKeyMap";
+import ComplexKeyMap, { ComplexKey } from './ComplexKeyMap';
 
 export default class ComplexKeyCounter {
-    private map:ComplexKeyMap<number> = new ComplexKeyMap<number>();
+    private map: ComplexKeyMap<number> = new ComplexKeyMap<number>();
 
-    public increment(key:ComplexKey) {
+    public increment(key: ComplexKey) {
         this.map.set(key, (this.map.get(key) || 0) + 1);
     }
 
-    public get(key:ComplexKey) {
+    public get(key: ComplexKey) {
         return this.map.get(key) || 0;
     }
 
@@ -18,4 +18,4 @@ export default class ComplexKeyCounter {
     public entries() {
         return this.map.entries();
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/lib/complexKeyDataStructures/ComplexKeyGroupsMap.spec.ts b/src/shared/lib/complexKeyDataStructures/ComplexKeyGroupsMap.spec.ts
index f1a95515a74..e524a22e201 100644
--- a/src/shared/lib/complexKeyDataStructures/ComplexKeyGroupsMap.spec.ts
+++ b/src/shared/lib/complexKeyDataStructures/ComplexKeyGroupsMap.spec.ts
@@ -1,32 +1,42 @@
-import {assert} from "chai";
-import ComplexKeyGroupsMap from "./ComplexKeyGroupsMap";
+import { assert } from 'chai';
+import ComplexKeyGroupsMap from './ComplexKeyGroupsMap';
 
-describe("ComplexKeyGroupsMap", () => {
-    it ("nonexisting keys return undefined", ()=>{
+describe('ComplexKeyGroupsMap', () => {
+    it('nonexisting keys return undefined', () => {
         const map = new ComplexKeyGroupsMap<number>();
-        assert.isUndefined(map.get({id:"any"}));
-        assert.isUndefined(map.get({id2:"any"}));
+        assert.isUndefined(map.get({ id: 'any' }));
+        assert.isUndefined(map.get({ id2: 'any' }));
     });
-    it("values get added to arrays", ()=>{
+    it('values get added to arrays', () => {
         const map = new ComplexKeyGroupsMap<number>();
-        map.add({ sampleId:"sample1", studyId:"study1"}, 1);
-        map.add({ sampleId:"sample1", studyId:"study1"}, 5);
-        map.add({ sampleId:"sample1", studyId:"study1"}, 10);
-        map.add({ sampleId:"sample2", studyId:"study1"}, 2);
-        map.add({ sampleId:"sample2", studyId:"study1"}, 4);
-        map.add({ sampleId:"sample2", studyId:"study10"}, 6);
+        map.add({ sampleId: 'sample1', studyId: 'study1' }, 1);
+        map.add({ sampleId: 'sample1', studyId: 'study1' }, 5);
+        map.add({ sampleId: 'sample1', studyId: 'study1' }, 10);
+        map.add({ sampleId: 'sample2', studyId: 'study1' }, 2);
+        map.add({ sampleId: 'sample2', studyId: 'study1' }, 4);
+        map.add({ sampleId: 'sample2', studyId: 'study10' }, 6);
 
-        assert.deepEqual(map.get({ sampleId:"sample1", studyId:"study1"}), [1,5,10]);
-        assert.deepEqual(map.get({ sampleId:"sample2", studyId:"study1"}), [2,4]);
-        assert.deepEqual(map.get({ sampleId:"sample2", studyId:"study10"}), [6]);
-        assert.isUndefined(map.get({id2:"any"}));
+        assert.deepEqual(map.get({ sampleId: 'sample1', studyId: 'study1' }), [
+            1,
+            5,
+            10,
+        ]);
+        assert.deepEqual(map.get({ sampleId: 'sample2', studyId: 'study1' }), [
+            2,
+            4,
+        ]);
+        assert.deepEqual(map.get({ sampleId: 'sample2', studyId: 'study10' }), [
+            6,
+        ]);
+        assert.isUndefined(map.get({ id2: 'any' }));
 
-        assert.deepEqual(map.entries(),
-            [
-                {key:{ sampleId:"sample1", studyId:"study1"}, value:[1,5,10]},
-                {key:{ sampleId:"sample2", studyId:"study1"}, value:[2,4]},
-                {key:{ sampleId:"sample2", studyId:"study10"}, value:[6]}
-            ]
-        );
+        assert.deepEqual(map.entries(), [
+            {
+                key: { sampleId: 'sample1', studyId: 'study1' },
+                value: [1, 5, 10],
+            },
+            { key: { sampleId: 'sample2', studyId: 'study1' }, value: [2, 4] },
+            { key: { sampleId: 'sample2', studyId: 'study10' }, value: [6] },
+        ]);
     });
-});
\ No newline at end of file
+});
diff --git a/src/shared/lib/complexKeyDataStructures/ComplexKeyGroupsMap.ts b/src/shared/lib/complexKeyDataStructures/ComplexKeyGroupsMap.ts
index ebb8b38704c..eec9683ca49 100644
--- a/src/shared/lib/complexKeyDataStructures/ComplexKeyGroupsMap.ts
+++ b/src/shared/lib/complexKeyDataStructures/ComplexKeyGroupsMap.ts
@@ -1,10 +1,10 @@
-import ComplexKeyMap, {ComplexKey} from "./ComplexKeyMap";
+import ComplexKeyMap, { ComplexKey } from './ComplexKeyMap';
 
 export default class ComplexKeyGroupsMap<V> {
-    private map:ComplexKeyMap<V[]> = new ComplexKeyMap<V[]>();
+    private map: ComplexKeyMap<V[]> = new ComplexKeyMap<V[]>();
 
-    public add(key:ComplexKey, value:V) {
-        let array:V[] = [];
+    public add(key: ComplexKey, value: V) {
+        let array: V[] = [];
         if (this.map.has(key)) {
             array = this.map.get(key)!;
         } else {
@@ -13,7 +13,7 @@ export default class ComplexKeyGroupsMap<V> {
         array.push(value);
     }
 
-    public get(key:ComplexKey) {
+    public get(key: ComplexKey) {
         return this.map.get(key);
     }
 
@@ -24,4 +24,4 @@ export default class ComplexKeyGroupsMap<V> {
     public entries() {
         return this.map.entries();
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/lib/complexKeyDataStructures/ComplexKeyMap.spec.ts b/src/shared/lib/complexKeyDataStructures/ComplexKeyMap.spec.ts
index 6d02f8f13f4..55beb1b0608 100644
--- a/src/shared/lib/complexKeyDataStructures/ComplexKeyMap.spec.ts
+++ b/src/shared/lib/complexKeyDataStructures/ComplexKeyMap.spec.ts
@@ -1,131 +1,193 @@
-import {assert} from "chai";
-import ComplexKeyMap from "./ComplexKeyMap";
+import { assert } from 'chai';
+import ComplexKeyMap from './ComplexKeyMap';
 
-describe("ComplexKeyMap", ()=>{
-    it ("`get` returns `undefined` if theres no entry", () => {
+describe('ComplexKeyMap', () => {
+    it('`get` returns `undefined` if theres no entry', () => {
         const map = new ComplexKeyMap<string>();
-        assert.equal(map.get({ word1: "", word2: ""}), undefined);
-        assert.equal(map.get({ word1: "yo", word2: ""}), undefined);
-        assert.equal(map.get({ word1: "whatsup", word2: "yo"}), undefined);
+        assert.equal(map.get({ word1: '', word2: '' }), undefined);
+        assert.equal(map.get({ word1: 'yo', word2: '' }), undefined);
+        assert.equal(map.get({ word1: 'whatsup', word2: 'yo' }), undefined);
     });
-    it ("`get` returns the value if there is an entry, but after clearing theyre not there anymore", () => {
+    it('`get` returns the value if there is an entry, but after clearing theyre not there anymore', () => {
         const map = new ComplexKeyMap<string>();
-        assert.equal(map.get({word1:"", word2:"", word3:""}), undefined);
-        map.set({word1:"", word2:"", word3:""}, "test");
-        assert.equal(map.get({word1:"", word2:"", word3:""}), "test");
-        assert.equal(map.get({word1:"asdf", word2:"", word3:""}), undefined);
-        map.set({word1:"asdf", word2:"", word3:""}, "blah");
-        assert.equal(map.get({word1:"asdf", word2:"", word3:""}), "blah");
-        assert.equal(map.get({word1:"yo", word2:"whatsup", word3:""}), undefined);
-        map.set({word1:"yo", word2:"whatsup", word3:""}, "apsoidjfa");
-        assert.equal(map.get({word1:"yo", word2:"whatsup", word3:""}), "apsoidjfa");
-        assert.equal(map.get({word1:"whatsup", word2:"yo", word3:""}), undefined);
-        map.set({word1:"whatsup", word2:"yo", word3:""}, "foobar");
-        assert.equal(map.get({word1:"whatsup", word2:"yo", word3:""}), "foobar");
-        assert.equal(map.get({word1:"whatsup", word2:"yo", word3:"bye"}), undefined);
-        map.set({word1:"whatsup", word2:"yo", word3:"bye"}, "fubar");
-        assert.equal(map.get({word1:"whatsup", word2:"yo", word3:"bye"}), "fubar");
+        assert.equal(map.get({ word1: '', word2: '', word3: '' }), undefined);
+        map.set({ word1: '', word2: '', word3: '' }, 'test');
+        assert.equal(map.get({ word1: '', word2: '', word3: '' }), 'test');
+        assert.equal(
+            map.get({ word1: 'asdf', word2: '', word3: '' }),
+            undefined
+        );
+        map.set({ word1: 'asdf', word2: '', word3: '' }, 'blah');
+        assert.equal(map.get({ word1: 'asdf', word2: '', word3: '' }), 'blah');
+        assert.equal(
+            map.get({ word1: 'yo', word2: 'whatsup', word3: '' }),
+            undefined
+        );
+        map.set({ word1: 'yo', word2: 'whatsup', word3: '' }, 'apsoidjfa');
+        assert.equal(
+            map.get({ word1: 'yo', word2: 'whatsup', word3: '' }),
+            'apsoidjfa'
+        );
+        assert.equal(
+            map.get({ word1: 'whatsup', word2: 'yo', word3: '' }),
+            undefined
+        );
+        map.set({ word1: 'whatsup', word2: 'yo', word3: '' }, 'foobar');
+        assert.equal(
+            map.get({ word1: 'whatsup', word2: 'yo', word3: '' }),
+            'foobar'
+        );
+        assert.equal(
+            map.get({ word1: 'whatsup', word2: 'yo', word3: 'bye' }),
+            undefined
+        );
+        map.set({ word1: 'whatsup', word2: 'yo', word3: 'bye' }, 'fubar');
+        assert.equal(
+            map.get({ word1: 'whatsup', word2: 'yo', word3: 'bye' }),
+            'fubar'
+        );
 
         map.clear();
-        assert.equal(map.get({word1:"", word2:"", word3:""}), undefined);
-        assert.equal(map.get({word1:"asdf", word2:"", word3:""}), undefined);
-        assert.equal(map.get({word1:"yo", word2:"whatsup", word3:""}), undefined);
-        assert.equal(map.get({word1:"whatsup", word2:"yo", word3:""}), undefined);
-        assert.equal(map.get({word1:"whatsup", word2:"yo", word3:"bye"}), undefined);
+        assert.equal(map.get({ word1: '', word2: '', word3: '' }), undefined);
+        assert.equal(
+            map.get({ word1: 'asdf', word2: '', word3: '' }),
+            undefined
+        );
+        assert.equal(
+            map.get({ word1: 'yo', word2: 'whatsup', word3: '' }),
+            undefined
+        );
+        assert.equal(
+            map.get({ word1: 'whatsup', word2: 'yo', word3: '' }),
+            undefined
+        );
+        assert.equal(
+            map.get({ word1: 'whatsup', word2: 'yo', word3: 'bye' }),
+            undefined
+        );
     });
-    it("`get` returns the most recently-set value for a key", () => {
+    it('`get` returns the most recently-set value for a key', () => {
         const map = new ComplexKeyMap<string>();
-        assert.equal(map.get({word1:"", word2:"", word3:""}), undefined);
-        map.set({word1:"", word2:"", word3:""}, "test");
-        assert.equal(map.get({word1:"", word2:"", word3:""}), "test");
-        map.set({word1:"", word2:"", word3:""}, "test2");
-        assert.equal(map.get({word1:"", word2:"", word3:""}), "test2");
+        assert.equal(map.get({ word1: '', word2: '', word3: '' }), undefined);
+        map.set({ word1: '', word2: '', word3: '' }, 'test');
+        assert.equal(map.get({ word1: '', word2: '', word3: '' }), 'test');
+        map.set({ word1: '', word2: '', word3: '' }, 'test2');
+        assert.equal(map.get({ word1: '', word2: '', word3: '' }), 'test2');
 
-        assert.equal(map.get({word1:"yo", word2:"", word3:""}), undefined);
-        map.set({word1:"yo", word2:"", word3:""}, "test");
-        assert.equal(map.get({word1:"yo", word2:"", word3:""}), "test");
-        map.set({word1:"yo", word2:"", word3:""}, "test2");
-        assert.equal(map.get({word1:"yo", word2:"", word3:""}), "test2");
+        assert.equal(map.get({ word1: 'yo', word2: '', word3: '' }), undefined);
+        map.set({ word1: 'yo', word2: '', word3: '' }, 'test');
+        assert.equal(map.get({ word1: 'yo', word2: '', word3: '' }), 'test');
+        map.set({ word1: 'yo', word2: '', word3: '' }, 'test2');
+        assert.equal(map.get({ word1: 'yo', word2: '', word3: '' }), 'test2');
 
-        assert.equal(map.get({word1:"yo", word2:"whatsup", word3:""}), undefined);
-        map.set({word1:"yo", word2:"whatsup", word3:""}, "test");
-        assert.equal(map.get({word1:"yo", word2:"whatsup", word3:""}), "test");
-        map.set({word1:"yo", word2:"whatsup", word3:""}, "test2");
-        assert.equal(map.get({word1:"yo", word2:"whatsup", word3:""}), "test2");
+        assert.equal(
+            map.get({ word1: 'yo', word2: 'whatsup', word3: '' }),
+            undefined
+        );
+        map.set({ word1: 'yo', word2: 'whatsup', word3: '' }, 'test');
+        assert.equal(
+            map.get({ word1: 'yo', word2: 'whatsup', word3: '' }),
+            'test'
+        );
+        map.set({ word1: 'yo', word2: 'whatsup', word3: '' }, 'test2');
+        assert.equal(
+            map.get({ word1: 'yo', word2: 'whatsup', word3: '' }),
+            'test2'
+        );
 
-        assert.equal(map.get({word1:"whatsup", word2:"yo", word3:"bye"}), undefined);
-        map.set({word1:"whatsup", word2:"yo", word3:"bye"}, "test");
-        assert.equal(map.get({word1:"whatsup", word2:"yo", word3:"bye"}), "test");
-        map.set({word1:"whatsup", word2:"yo", word3:"bye"}, "test2");
-        assert.equal(map.get({word1:"whatsup", word2:"yo", word3:"bye"}), "test2");
+        assert.equal(
+            map.get({ word1: 'whatsup', word2: 'yo', word3: 'bye' }),
+            undefined
+        );
+        map.set({ word1: 'whatsup', word2: 'yo', word3: 'bye' }, 'test');
+        assert.equal(
+            map.get({ word1: 'whatsup', word2: 'yo', word3: 'bye' }),
+            'test'
+        );
+        map.set({ word1: 'whatsup', word2: 'yo', word3: 'bye' }, 'test2');
+        assert.equal(
+            map.get({ word1: 'whatsup', word2: 'yo', word3: 'bye' }),
+            'test2'
+        );
     });
-    it("`entries` returns the entries in insertion order", ()=>{
+    it('`entries` returns the entries in insertion order', () => {
         const map = new ComplexKeyMap<string>();
-        map.set({word1:""}, "test");
-        map.set({word1:"asdf"}, "blah");
-        map.set({word1:"yo", word2:"whatsup"}, "apsoidjfa");
-        map.set({word1:"whatsup", word2:"yo"}, "foobar");
-        map.set({word1:"whatsup", word2:"yo", word3:"bye"}, "fubar");
+        map.set({ word1: '' }, 'test');
+        map.set({ word1: 'asdf' }, 'blah');
+        map.set({ word1: 'yo', word2: 'whatsup' }, 'apsoidjfa');
+        map.set({ word1: 'whatsup', word2: 'yo' }, 'foobar');
+        map.set({ word1: 'whatsup', word2: 'yo', word3: 'bye' }, 'fubar');
         assert.deepEqual(map.entries(), [
             {
-                key: {word1:""},
-                value: "test"
+                key: { word1: '' },
+                value: 'test',
             },
             {
-                key:{word1:"asdf"},
-                value:"blah"
+                key: { word1: 'asdf' },
+                value: 'blah',
             },
             {
-                key: {word1:"yo", word2:"whatsup"},
-                value: "apsoidjfa"
+                key: { word1: 'yo', word2: 'whatsup' },
+                value: 'apsoidjfa',
             },
             {
-                key: {word1:"whatsup", word2:"yo"},
-                value: "foobar"
+                key: { word1: 'whatsup', word2: 'yo' },
+                value: 'foobar',
             },
             {
-                key: {word1:"whatsup", word2:"yo", word3:"bye"},
-                value: "fubar"
-            }
+                key: { word1: 'whatsup', word2: 'yo', word3: 'bye' },
+                value: 'fubar',
+            },
         ]);
     });
-    it("`has` returns true iff there is a corresponding entry", ()=>{
-        const map = new ComplexKeyMap<string|number>();
-        assert.isFalse(map.has({k:""}));
-        map.set({k:""}, "test");
-        assert.isTrue(map.has({k:""}));
-        map.set({k:""}, "test2");
-        assert.isTrue(map.has({k:""}));
+    it('`has` returns true iff there is a corresponding entry', () => {
+        const map = new ComplexKeyMap<string | number>();
+        assert.isFalse(map.has({ k: '' }));
+        map.set({ k: '' }, 'test');
+        assert.isTrue(map.has({ k: '' }));
+        map.set({ k: '' }, 'test2');
+        assert.isTrue(map.has({ k: '' }));
 
-        assert.isFalse(map.has({k12:"yo"}));
-        map.set({k12:"yo"}, 1241);
-        assert.isTrue(map.has({k12:"yo"}));
-        map.set({k12:"yo"}, "test2");
-        assert.isTrue(map.has({k12:"yo"}));
+        assert.isFalse(map.has({ k12: 'yo' }));
+        map.set({ k12: 'yo' }, 1241);
+        assert.isTrue(map.has({ k12: 'yo' }));
+        map.set({ k12: 'yo' }, 'test2');
+        assert.isTrue(map.has({ k12: 'yo' }));
 
-        const crazyKey = {"aijsdpfoiaj3141#.131-4-r1":"aisdjfpaosijd#rjrq", "ijzpxdcidajf9w83r!341$$$":19183409180};
+        const crazyKey = {
+            'aijsdpfoiaj3141#.131-4-r1': 'aisdjfpaosijd#rjrq',
+            'ijzpxdcidajf9w83r!341$$$': 19183409180,
+        };
         assert.isFalse(map.has(crazyKey));
-        map.set(crazyKey, "test");
+        map.set(crazyKey, 'test');
         assert.isTrue(map.has(crazyKey));
         map.set(crazyKey, 32515);
         assert.isTrue(map.has(crazyKey));
     });
-    it("`from` creates a ListIndexedMap from a given list", ()=>{
-        const map = ComplexKeyMap.from([
-            { id:"obj1"}, { id:"obj2"}, {id:"obj3"}
-        ], o=>({"234ijdfapso#":o.id}));
-        assert.deepEqual(map.get({"234ijdfapso#":"obj1"}), { id:"obj1"});
-        assert.deepEqual(map.get({"234ijdfapso#":"obj2"}), { id:"obj2"});
-        assert.deepEqual(map.get({"234ijdfapso#":"obj3"}), { id:"obj3"});
+    it('`from` creates a ListIndexedMap from a given list', () => {
+        const map = ComplexKeyMap.from(
+            [{ id: 'obj1' }, { id: 'obj2' }, { id: 'obj3' }],
+            o => ({ '234ijdfapso#': o.id })
+        );
+        assert.deepEqual(map.get({ '234ijdfapso#': 'obj1' }), { id: 'obj1' });
+        assert.deepEqual(map.get({ '234ijdfapso#': 'obj2' }), { id: 'obj2' });
+        assert.deepEqual(map.get({ '234ijdfapso#': 'obj3' }), { id: 'obj3' });
 
-        const map2 = ComplexKeyMap.from([
-            { id:"obj1"}, { id:"obj2"}, {id:"obj3"}
-        ], o=>({"234ijdfapso#":o.id, whatever:"yo"}));
-        assert.isUndefined(map2.get({"234ijdfapso#":"obj1"}));
-        assert.isUndefined(map2.get({"234ijdfapso#":"obj2"}));
-        assert.isUndefined(map2.get({"234ijdfapso#":"obj3"}));
-        assert.deepEqual(map2.get({"234ijdfapso#":"obj1", whatever:"yo"}), { id:"obj1"});
-        assert.deepEqual(map2.get({"234ijdfapso#":"obj2", whatever:"yo"}), { id:"obj2"});
-        assert.deepEqual(map2.get({"234ijdfapso#":"obj3", whatever:"yo"}), { id:"obj3"});
+        const map2 = ComplexKeyMap.from(
+            [{ id: 'obj1' }, { id: 'obj2' }, { id: 'obj3' }],
+            o => ({ '234ijdfapso#': o.id, whatever: 'yo' })
+        );
+        assert.isUndefined(map2.get({ '234ijdfapso#': 'obj1' }));
+        assert.isUndefined(map2.get({ '234ijdfapso#': 'obj2' }));
+        assert.isUndefined(map2.get({ '234ijdfapso#': 'obj3' }));
+        assert.deepEqual(map2.get({ '234ijdfapso#': 'obj1', whatever: 'yo' }), {
+            id: 'obj1',
+        });
+        assert.deepEqual(map2.get({ '234ijdfapso#': 'obj2', whatever: 'yo' }), {
+            id: 'obj2',
+        });
+        assert.deepEqual(map2.get({ '234ijdfapso#': 'obj3', whatever: 'yo' }), {
+            id: 'obj3',
+        });
     });
-});
\ No newline at end of file
+});
diff --git a/src/shared/lib/complexKeyDataStructures/ComplexKeyMap.ts b/src/shared/lib/complexKeyDataStructures/ComplexKeyMap.ts
index 23a2b41d4e6..45db5b4a055 100644
--- a/src/shared/lib/complexKeyDataStructures/ComplexKeyMap.ts
+++ b/src/shared/lib/complexKeyDataStructures/ComplexKeyMap.ts
@@ -1,27 +1,29 @@
-import _ from "lodash";
+import _ from 'lodash';
 
-export type ComplexKey = {[k:string]:string|number|boolean|null|undefined};
+export type ComplexKey = {
+    [k: string]: string | number | boolean | null | undefined;
+};
 
 type Entry<V> = {
-    key: ComplexKey,
-    value: V
-}
+    key: ComplexKey;
+    value: V;
+};
 
-function getStringKey(key:ComplexKey) {
+function getStringKey(key: ComplexKey) {
     const keyElements = _.keys(key);
     const sortedKeyElements = _.sortBy(keyElements);
-    return sortedKeyElements.map(k=>`${key}:${(key as any)[k]}`).join(",");
+    return sortedKeyElements.map(k => `${key}:${(key as any)[k]}`).join(',');
 }
 
-function keyEquals(key1:ComplexKey, key2:ComplexKey) {
+function keyEquals(key1: ComplexKey, key2: ComplexKey) {
     return _.isEqual(key1, key2);
 }
 
-function narrowKey(key:ComplexKey, keyMembers?:string[]) {
+function narrowKey(key: ComplexKey, keyMembers?: string[]) {
     if (!keyMembers) {
         return key;
     } else {
-        const ret:ComplexKey = {};
+        const ret: ComplexKey = {};
         for (const keyMember of keyMembers) {
             ret[keyMember] = key[keyMember];
         }
@@ -30,14 +32,13 @@ function narrowKey(key:ComplexKey, keyMembers?:string[]) {
 }
 
 export default class ComplexKeyMap<V> {
+    private map: { [stringKey: string]: Entry<V>[] } = {};
 
-    private map:{[stringKey:string]:Entry<V>[]} = {};
-
-    public entries():Entry<V>[] {
+    public entries(): Entry<V>[] {
         return _.flatten(_.values(this.map));
     }
 
-    public set(key:ComplexKey, value:V, keyMembers?:string[]):boolean {
+    public set(key: ComplexKey, value: V, keyMembers?: string[]): boolean {
         // true if an entry was added, false if an entry existed and was updated
 
         key = narrowKey(key, keyMembers);
@@ -51,7 +52,7 @@ export default class ComplexKeyMap<V> {
         }
     }
 
-    public get(key:ComplexKey, keyMembers?:string[]):V|undefined {
+    public get(key: ComplexKey, keyMembers?: string[]): V | undefined {
         key = narrowKey(key, keyMembers);
         const entry = this.getEntry(key);
         if (!entry) {
@@ -61,7 +62,7 @@ export default class ComplexKeyMap<V> {
         }
     }
 
-    public has(key:ComplexKey, keyMembers?:string[]):boolean {
+    public has(key: ComplexKey, keyMembers?: string[]): boolean {
         key = narrowKey(key, keyMembers);
         return !!this.getEntry(key);
     }
@@ -70,7 +71,10 @@ export default class ComplexKeyMap<V> {
         this.map = {};
     }
 
-    public static from<K, T>(objs:T[], key:(t:T)=>ComplexKey):ComplexKeyMap<T> {
+    public static from<K, T>(
+        objs: T[],
+        key: (t: T) => ComplexKey
+    ): ComplexKeyMap<T> {
         const map = new ComplexKeyMap<T>();
         for (const o of objs) {
             map.set(key(o), o);
@@ -78,13 +82,15 @@ export default class ComplexKeyMap<V> {
         return map;
     }
 
-    private getEntriesWithStringKey(key:ComplexKey):Entry<V>[] {
+    private getEntriesWithStringKey(key: ComplexKey): Entry<V>[] {
         const stringKey = getStringKey(key);
         this.map[stringKey] = this.map[stringKey] || [];
         return this.map[stringKey];
     }
 
-    private getEntry(key:ComplexKey):Entry<V>|undefined {
-        return this.getEntriesWithStringKey(key).find(entry=>keyEquals(entry.key, key));
+    private getEntry(key: ComplexKey): Entry<V> | undefined {
+        return this.getEntriesWithStringKey(key).find(entry =>
+            keyEquals(entry.key, key)
+        );
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/lib/complexKeyDataStructures/ComplexKeySet.spec.ts b/src/shared/lib/complexKeyDataStructures/ComplexKeySet.spec.ts
index dd15f0e0f50..710b3d26b23 100644
--- a/src/shared/lib/complexKeyDataStructures/ComplexKeySet.spec.ts
+++ b/src/shared/lib/complexKeyDataStructures/ComplexKeySet.spec.ts
@@ -1,75 +1,103 @@
-import {assert} from "chai";
-import ComplexKeySet from "./ComplexKeySet";
+import { assert } from 'chai';
+import ComplexKeySet from './ComplexKeySet';
 
-describe("ComplexKeySet", () => {
-    it("`add`, `delete`, `has`, `clear`, and `keys` work correctly through this use flow, starting from empty set", ()=>{
+describe('ComplexKeySet', () => {
+    it('`add`, `delete`, `has`, `clear`, and `keys` work correctly through this use flow, starting from empty set', () => {
         const set = new ComplexKeySet();
-        assert.isFalse(set.has({yo:"hey"}));
-        set.add({yo:"hey"});
-        assert.isTrue(set.has({yo:"hey"}));
-        assert.isFalse(set.has({yo:"whatsup"}));
-        assert.deepEqual(set.keys(), [{yo:"hey"}]);
-        set.add({yo:"whatsup"});
-        assert.deepEqual(set.keys(), [{yo:"hey"}, {yo:"whatsup"}]);
-        assert.isTrue(set.has({yo:"whatsup"}));
-        set.delete({yo:"hey"});
-        assert.deepEqual(set.keys(), [{yo:"whatsup"}]);
-        assert.isTrue(set.has({yo:"whatsup"}));
-        assert.isFalse(set.has({yo:"hey"}));
-        set.delete({yo:"whatsup"});
-        set.add({yo:"hey"});
-        assert.deepEqual(set.keys(), [{yo:"hey"}]);
-        assert.isFalse(set.has({yo:"whatsup"}));
-        assert.isTrue(set.has({yo:"hey"}));
+        assert.isFalse(set.has({ yo: 'hey' }));
+        set.add({ yo: 'hey' });
+        assert.isTrue(set.has({ yo: 'hey' }));
+        assert.isFalse(set.has({ yo: 'whatsup' }));
+        assert.deepEqual(set.keys(), [{ yo: 'hey' }]);
+        set.add({ yo: 'whatsup' });
+        assert.deepEqual(set.keys(), [{ yo: 'hey' }, { yo: 'whatsup' }]);
+        assert.isTrue(set.has({ yo: 'whatsup' }));
+        set.delete({ yo: 'hey' });
+        assert.deepEqual(set.keys(), [{ yo: 'whatsup' }]);
+        assert.isTrue(set.has({ yo: 'whatsup' }));
+        assert.isFalse(set.has({ yo: 'hey' }));
+        set.delete({ yo: 'whatsup' });
+        set.add({ yo: 'hey' });
+        assert.deepEqual(set.keys(), [{ yo: 'hey' }]);
+        assert.isFalse(set.has({ yo: 'whatsup' }));
+        assert.isTrue(set.has({ yo: 'hey' }));
         set.clear();
         assert.deepEqual(set.keys(), []);
-        assert.isFalse(set.has({yo:"whatsup"}));
-        assert.isFalse(set.has({yo:"hey"}));
+        assert.isFalse(set.has({ yo: 'whatsup' }));
+        assert.isFalse(set.has({ yo: 'hey' }));
     });
-    it("`add`, `delete`, `has`, `clear`, and `keys` work correctly through this use flow, starting from set constructed with `from`", ()=>{
+    it('`add`, `delete`, `has`, `clear`, and `keys` work correctly through this use flow, starting from set constructed with `from`', () => {
         const set = ComplexKeySet.from([
-            {"23u4pu13":1, "123u90":false}, {"3":1, "000-----":null, "13oid":undefined},
-            {"AGASDIJB93939####$$$":undefined}
+            { '23u4pu13': 1, '123u90': false },
+            { '3': 1, '000-----': null, '13oid': undefined },
+            { 'AGASDIJB93939####$$$': undefined },
         ]);
-        assert.isTrue(set.has({"23u4pu13":1, "123u90":false}));
-        assert.isTrue(set.has({"3":1, "000-----":null, "13oid":undefined}));
-        assert.isTrue(set.has({"AGASDIJB93939####$$$":undefined}));
-        assert.isFalse(set.has({yo:"hey"}));
-        set.add({yo:"hey"});
-        assert.isTrue(set.has({"23u4pu13":1, "123u90":false}));
-        assert.isTrue(set.has({"3":1, "000-----":null, "13oid":undefined}));
-        assert.isTrue(set.has({"AGASDIJB93939####$$$":undefined}));
-        assert.isTrue(set.has({yo:"hey"}));
-        assert.isFalse(set.has({yo:"whatsup"}));
-        assert.deepEqual(set.keys(), [{"23u4pu13":1, "123u90":false}, {"3":1, "000-----":null, "13oid":undefined},
-            {"AGASDIJB93939####$$$":undefined},{yo:"hey"}]);
-        set.add({yo:"whatsup"});
-        assert.isTrue(set.has({"23u4pu13":1, "123u90":false}));
-        assert.isTrue(set.has({"3":1, "000-----":null, "13oid":undefined}));
-        assert.isTrue(set.has({"AGASDIJB93939####$$$":undefined}));
-        assert.deepEqual(set.keys(), [{"23u4pu13":1, "123u90":false}, {"3":1, "000-----":null, "13oid":undefined},
-            {"AGASDIJB93939####$$$":undefined}, {yo:"hey"}, {yo:"whatsup"}]);
-        assert.isTrue(set.has({yo:"whatsup"}));
-        set.delete({yo:"hey"});
-        assert.isTrue(set.has({"23u4pu13":1, "123u90":false}));
-        assert.isTrue(set.has({"3":1, "000-----":null, "13oid":undefined}));
-        assert.isTrue(set.has({"AGASDIJB93939####$$$":undefined}));
-        assert.deepEqual(set.keys(), [{"23u4pu13":1, "123u90":false}, {"3":1, "000-----":null, "13oid":undefined},
-            {"AGASDIJB93939####$$$":undefined}, {yo:"whatsup"}]);
-        assert.isTrue(set.has({yo:"whatsup"}));
-        assert.isFalse(set.has({yo:"hey"}));
-        set.delete({yo:"whatsup"});
-        set.add({yo:"hey"});
-        assert.isTrue(set.has({"23u4pu13":1, "123u90":false}));
-        assert.isTrue(set.has({"3":1, "000-----":null, "13oid":undefined}));
-        assert.isTrue(set.has({"AGASDIJB93939####$$$":undefined}));
-        assert.deepEqual(set.keys(), [{"23u4pu13":1, "123u90":false}, {"3":1, "000-----":null, "13oid":undefined},
-            {"AGASDIJB93939####$$$":undefined}, {yo:"hey"}]);
-        assert.isFalse(set.has({yo:"whatsup"}));
-        assert.isTrue(set.has({yo:"hey"}));
+        assert.isTrue(set.has({ '23u4pu13': 1, '123u90': false }));
+        assert.isTrue(
+            set.has({ '3': 1, '000-----': null, '13oid': undefined })
+        );
+        assert.isTrue(set.has({ 'AGASDIJB93939####$$$': undefined }));
+        assert.isFalse(set.has({ yo: 'hey' }));
+        set.add({ yo: 'hey' });
+        assert.isTrue(set.has({ '23u4pu13': 1, '123u90': false }));
+        assert.isTrue(
+            set.has({ '3': 1, '000-----': null, '13oid': undefined })
+        );
+        assert.isTrue(set.has({ 'AGASDIJB93939####$$$': undefined }));
+        assert.isTrue(set.has({ yo: 'hey' }));
+        assert.isFalse(set.has({ yo: 'whatsup' }));
+        assert.deepEqual(set.keys(), [
+            { '23u4pu13': 1, '123u90': false },
+            { '3': 1, '000-----': null, '13oid': undefined },
+            { 'AGASDIJB93939####$$$': undefined },
+            { yo: 'hey' },
+        ]);
+        set.add({ yo: 'whatsup' });
+        assert.isTrue(set.has({ '23u4pu13': 1, '123u90': false }));
+        assert.isTrue(
+            set.has({ '3': 1, '000-----': null, '13oid': undefined })
+        );
+        assert.isTrue(set.has({ 'AGASDIJB93939####$$$': undefined }));
+        assert.deepEqual(set.keys(), [
+            { '23u4pu13': 1, '123u90': false },
+            { '3': 1, '000-----': null, '13oid': undefined },
+            { 'AGASDIJB93939####$$$': undefined },
+            { yo: 'hey' },
+            { yo: 'whatsup' },
+        ]);
+        assert.isTrue(set.has({ yo: 'whatsup' }));
+        set.delete({ yo: 'hey' });
+        assert.isTrue(set.has({ '23u4pu13': 1, '123u90': false }));
+        assert.isTrue(
+            set.has({ '3': 1, '000-----': null, '13oid': undefined })
+        );
+        assert.isTrue(set.has({ 'AGASDIJB93939####$$$': undefined }));
+        assert.deepEqual(set.keys(), [
+            { '23u4pu13': 1, '123u90': false },
+            { '3': 1, '000-----': null, '13oid': undefined },
+            { 'AGASDIJB93939####$$$': undefined },
+            { yo: 'whatsup' },
+        ]);
+        assert.isTrue(set.has({ yo: 'whatsup' }));
+        assert.isFalse(set.has({ yo: 'hey' }));
+        set.delete({ yo: 'whatsup' });
+        set.add({ yo: 'hey' });
+        assert.isTrue(set.has({ '23u4pu13': 1, '123u90': false }));
+        assert.isTrue(
+            set.has({ '3': 1, '000-----': null, '13oid': undefined })
+        );
+        assert.isTrue(set.has({ 'AGASDIJB93939####$$$': undefined }));
+        assert.deepEqual(set.keys(), [
+            { '23u4pu13': 1, '123u90': false },
+            { '3': 1, '000-----': null, '13oid': undefined },
+            { 'AGASDIJB93939####$$$': undefined },
+            { yo: 'hey' },
+        ]);
+        assert.isFalse(set.has({ yo: 'whatsup' }));
+        assert.isTrue(set.has({ yo: 'hey' }));
         set.clear();
         assert.deepEqual(set.keys(), []);
-        assert.isFalse(set.has({yo:"whatsup"}));
-        assert.isFalse(set.has({yo:"hey"}));
+        assert.isFalse(set.has({ yo: 'whatsup' }));
+        assert.isFalse(set.has({ yo: 'hey' }));
     });
-});
\ No newline at end of file
+});
diff --git a/src/shared/lib/complexKeyDataStructures/ComplexKeySet.ts b/src/shared/lib/complexKeyDataStructures/ComplexKeySet.ts
index 5ec60881668..f8a65dd4c8e 100644
--- a/src/shared/lib/complexKeyDataStructures/ComplexKeySet.ts
+++ b/src/shared/lib/complexKeyDataStructures/ComplexKeySet.ts
@@ -1,9 +1,9 @@
-import ComplexKeyMap, {ComplexKey} from "./ComplexKeyMap";
+import ComplexKeyMap, { ComplexKey } from './ComplexKeyMap';
 
 export default class ComplexKeySet {
-    private map:ComplexKeyMap<boolean> = new ComplexKeyMap<boolean>();
+    private map: ComplexKeyMap<boolean> = new ComplexKeyMap<boolean>();
 
-    public static from(keys:ComplexKey[]) {
+    public static from(keys: ComplexKey[]) {
         const set = new ComplexKeySet();
         for (const k of keys) {
             set.add(k);
@@ -11,19 +11,22 @@ export default class ComplexKeySet {
         return set;
     }
 
-    public keys():ComplexKey[] {
-        return this.map.entries().filter(e=>e.value).map(e=>e.key);
+    public keys(): ComplexKey[] {
+        return this.map
+            .entries()
+            .filter(e => e.value)
+            .map(e => e.key);
     }
 
-    public add(key:ComplexKey) {
+    public add(key: ComplexKey) {
         this.map.set(key, true);
     }
 
-    public delete(key:ComplexKey) {
+    public delete(key: ComplexKey) {
         this.map.set(key, false);
     }
 
-    public has(key:ComplexKey, keyMembers?:string[]) {
+    public has(key: ComplexKey, keyMembers?: string[]) {
         return !!this.map.get(key, keyMembers);
     }
 
@@ -34,4 +37,4 @@ export default class ComplexKeySet {
     public clear() {
         this.map.clear();
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/lib/consoleLog.ts b/src/shared/lib/consoleLog.ts
index 7f40316e094..41d48bca5d4 100644
--- a/src/shared/lib/consoleLog.ts
+++ b/src/shared/lib/consoleLog.ts
@@ -1,17 +1,15 @@
-import {getBrowserWindow} from "cbioportal-frontend-commons";
+import { getBrowserWindow } from 'cbioportal-frontend-commons';
 
 const win = getBrowserWindow();
 
-export function log(...args:any[]){
-
+export function log(...args: any[]) {
     if (win.localStorage.debug) {
         if (win.greplog && typeof args[0] === 'string') {
             if (new RegExp(win.greplog).test(args[0])) {
-                console.log.apply(this,args);
+                console.log.apply(this, args);
             }
         } else {
-            console.log.apply(this,args);
+            console.log.apply(this, args);
         }
     }
-
-}
\ No newline at end of file
+}
diff --git a/src/shared/lib/createQueryStore.ts b/src/shared/lib/createQueryStore.ts
index 80b97840d13..a4de8dda3b0 100644
--- a/src/shared/lib/createQueryStore.ts
+++ b/src/shared/lib/createQueryStore.ts
@@ -1,34 +1,44 @@
-import {CancerStudyQueryUrlParams, QueryStore} from "shared/components/query/QueryStore";
-import {ResultsViewTab} from "pages/resultsView/ResultsViewPageHelpers";
-import ResultsViewURLWrapper from "pages/resultsView/ResultsViewURLWrapper";
-
-export function createQueryStore(currentQuery?:any, urlWrapper?:ResultsViewURLWrapper, clearUrl = true) {
-
-    const win:any = window;
+import {
+    CancerStudyQueryUrlParams,
+    QueryStore,
+} from 'shared/components/query/QueryStore';
+import { ResultsViewTab } from 'pages/resultsView/ResultsViewPageHelpers';
+import ResultsViewURLWrapper from 'pages/resultsView/ResultsViewURLWrapper';
+
+export function createQueryStore(
+    currentQuery?: any,
+    urlWrapper?: ResultsViewURLWrapper,
+    clearUrl = true
+) {
+    const win: any = window;
 
     const queryStore = new QueryStore(currentQuery);
 
-    queryStore.singlePageAppSubmitRoutine = function(query:CancerStudyQueryUrlParams) {
-
+    queryStore.singlePageAppSubmitRoutine = function(
+        query: CancerStudyQueryUrlParams
+    ) {
         // normalize this
-        query.cancer_study_list = query.cancer_study_list || query.cancer_study_id;
+        query.cancer_study_list =
+            query.cancer_study_list || query.cancer_study_id;
         delete query.cancer_study_id;
 
-        const tab = (queryStore.physicalStudyIdsInSelection.length > 1 && queryStore.geneIds.length === 1) ?
-            ResultsViewTab.CANCER_TYPES_SUMMARY : ResultsViewTab.ONCOPRINT;
+        const tab =
+            queryStore.physicalStudyIdsInSelection.length > 1 &&
+            queryStore.geneIds.length === 1
+                ? ResultsViewTab.CANCER_TYPES_SUMMARY
+                : ResultsViewTab.ONCOPRINT;
 
-        const wrapper = urlWrapper || new ResultsViewURLWrapper(win.routingStore);
+        const wrapper =
+            urlWrapper || new ResultsViewURLWrapper(win.routingStore);
 
-        wrapper.updateURL(query,`results/${tab}`, clearUrl, false);
+        wrapper.updateURL(query, `results/${tab}`, clearUrl, false);
 
         // we only want to destroy the urlwrapper if we just created it for submission purpose
         // i.e. it was NOT passed to us
         if (urlWrapper === undefined) {
             wrapper.destroy();
         }
-
     };
 
     return queryStore;
-
 }
diff --git a/src/shared/lib/customTabs.ts b/src/shared/lib/customTabs.ts
index 0b7a485ddf0..6df1bce8751 100644
--- a/src/shared/lib/customTabs.ts
+++ b/src/shared/lib/customTabs.ts
@@ -1,19 +1,21 @@
 import load from 'little-loader';
-import {getBrowserWindow} from "cbioportal-frontend-commons";
-import {ICustomTabConfiguration} from "../model/ITabConfiguration";
-import {autorun} from "mobx";
+import { getBrowserWindow } from 'cbioportal-frontend-commons';
+import { ICustomTabConfiguration } from '../model/ITabConfiguration';
+import { autorun } from 'mobx';
 
-export function loadCustomTabDeps(tab:any){
+export function loadCustomTabDeps(tab: any) {
     if (tab.pathsToCSS) {
         tab.pathsToCSS.forEach((str: string) => {
-            $('head').append(`<link rel="stylesheet" href=${str} type="text/css" />`);
+            $('head').append(
+                `<link rel="stylesheet" href=${str} type="text/css" />`
+            );
         });
     }
     if (tab.pathsToJs) {
-        const proms:Promise<any>[] = [];
-        tab.pathsToJs.forEach((str:string)=>{
-            const p = new Promise(function(resolve, reject){
-                load(str,(err:any)=>{
+        const proms: Promise<any>[] = [];
+        tab.pathsToJs.forEach((str: string) => {
+            const p = new Promise(function(resolve, reject) {
+                load(str, (err: any) => {
                     if (err) {
                         reject(err);
                     } else {
@@ -28,18 +30,31 @@ export function loadCustomTabDeps(tab:any){
     }
 }
 
-export function showCustomTab(div:HTMLDivElement, tab:ICustomTabConfiguration, url:string, store:any, isUnmount = false){
+export function showCustomTab(
+    div: HTMLDivElement,
+    tab: ICustomTabConfiguration,
+    url: string,
+    store: any,
+    isUnmount = false
+) {
     tab.dependencyPromise = tab.dependencyPromise || loadCustomTabDeps(tab);
 
-    const runCallback = (tab:ICustomTabConfiguration)=>{
+    const runCallback = (tab: ICustomTabConfiguration) => {
         if (getBrowserWindow()[tab.mountCallbackName]) {
-            getBrowserWindow()[tab.mountCallbackName](div, tab, url, store, autorun, isUnmount);
+            getBrowserWindow()[tab.mountCallbackName](
+                div,
+                tab,
+                url,
+                store,
+                autorun,
+                isUnmount
+            );
         } else {
             alert(`Callback for tab ${tab.title} not found`);
         }
-    }
+    };
 
-    tab.dependencyPromise!.then(()=>{
+    tab.dependencyPromise!.then(() => {
         runCallback(tab);
     });
 }
@@ -58,4 +73,4 @@ export function showCustomTab(div:HTMLDivElement, tab:ICustomTabConfiguration, u
 //     } else { // clean up!
 //         myGlobal.myDisposer();
 //     }
-// }
\ No newline at end of file
+// }
diff --git a/src/shared/lib/errorFormatter.spec.ts b/src/shared/lib/errorFormatter.spec.ts
index 47c12311844..a980d487727 100644
--- a/src/shared/lib/errorFormatter.spec.ts
+++ b/src/shared/lib/errorFormatter.spec.ts
@@ -1,6 +1,10 @@
-import {assert} from "chai";
-import {SiteError} from "../../AppStore";
-import { formatErrorLog, formatErrorTitle, formatErrorMessages } from "./errorFormatter";
+import { assert } from 'chai';
+import { SiteError } from '../../AppStore';
+import {
+    formatErrorLog,
+    formatErrorTitle,
+    formatErrorMessages,
+} from './errorFormatter';
 
 const RESPONSE_BODY_MESSAGE = 'RESPONSE_BODY_MESSAGE';
 const REQUEST_ERROR_MESSAGE = 'REQUEST_ERROR_MESSAGE';
@@ -12,59 +16,90 @@ const siteErrors: SiteError[] = [
         errorObj: {
             response: {
                 body: {
-                    message: RESPONSE_BODY_MESSAGE
-                }
-            }
+                    message: RESPONSE_BODY_MESSAGE,
+                },
+            },
         } as any,
-        dismissed: false
+        dismissed: false,
     },
     {
         errorObj: {
-            message: REQUEST_ERROR_MESSAGE
+            message: REQUEST_ERROR_MESSAGE,
         } as any,
         dismissed: false,
-        title: EXAMPLE_TITLE_1
+        title: EXAMPLE_TITLE_1,
     },
     {
-        errorObj: {otherInformation: ""} as any,
+        errorObj: { otherInformation: '' } as any,
         dismissed: false,
-        title: EXAMPLE_TITLE_2
-    }
+        title: EXAMPLE_TITLE_2,
+    },
 ];
 
-describe("ErrorFormatter", () => {
-    describe("formatErrorLog", ()=>{
-        it ("formatErrorLog one error", ()=>{
-            assert.deepEqual(formatErrorLog(siteErrors.slice(0, 1)), '{"body":{"message":"RESPONSE_BODY_MESSAGE"}}');
-            assert.deepEqual(formatErrorLog(siteErrors.slice(1, 2)), REQUEST_ERROR_MESSAGE);
-            assert.deepEqual(formatErrorLog(siteErrors.slice(-1)), siteErrors[2].errorObj.toString());
+describe('ErrorFormatter', () => {
+    describe('formatErrorLog', () => {
+        it('formatErrorLog one error', () => {
+            assert.deepEqual(
+                formatErrorLog(siteErrors.slice(0, 1)),
+                '{"body":{"message":"RESPONSE_BODY_MESSAGE"}}'
+            );
+            assert.deepEqual(
+                formatErrorLog(siteErrors.slice(1, 2)),
+                REQUEST_ERROR_MESSAGE
+            );
+            assert.deepEqual(
+                formatErrorLog(siteErrors.slice(-1)),
+                siteErrors[2].errorObj.toString()
+            );
         });
-        it ("formatErrorLog multiple errors", ()=>{
-            assert.deepEqual(formatErrorLog(siteErrors), '{"body":{"message":"RESPONSE_BODY_MESSAGE"}}\n\n\nREQUEST_ERROR_MESSAGE\n\n\n[object Object]');
+        it('formatErrorLog multiple errors', () => {
+            assert.deepEqual(
+                formatErrorLog(siteErrors),
+                '{"body":{"message":"RESPONSE_BODY_MESSAGE"}}\n\n\nREQUEST_ERROR_MESSAGE\n\n\n[object Object]'
+            );
         });
     });
 
-    describe("formatErrorTitle", ()=>{
-        it ("formatErrorTitle no title", ()=>{
+    describe('formatErrorTitle', () => {
+        it('formatErrorTitle no title', () => {
             assert.isUndefined(formatErrorTitle(siteErrors.slice(0, 1)));
         });
-        it ("formatErrorTitle has one title", ()=>{
-            assert.equal(formatErrorTitle(siteErrors.slice(1,2)), EXAMPLE_TITLE_1);
-            assert.equal(formatErrorTitle(siteErrors.slice(-1)), EXAMPLE_TITLE_2);
+        it('formatErrorTitle has one title', () => {
+            assert.equal(
+                formatErrorTitle(siteErrors.slice(1, 2)),
+                EXAMPLE_TITLE_1
+            );
+            assert.equal(
+                formatErrorTitle(siteErrors.slice(-1)),
+                EXAMPLE_TITLE_2
+            );
         });
-        it ("formatErrorTitle has multiple titles", ()=>{
-            assert.equal(formatErrorTitle(siteErrors), `${EXAMPLE_TITLE_1} ${EXAMPLE_TITLE_2}`);
+        it('formatErrorTitle has multiple titles', () => {
+            assert.equal(
+                formatErrorTitle(siteErrors),
+                `${EXAMPLE_TITLE_1} ${EXAMPLE_TITLE_2}`
+            );
         });
     });
 
-    describe("formatErrorMessages", ()=>{
-        it ("formatErrorMessages one error", ()=>{
-            assert.deepEqual(formatErrorMessages(siteErrors.slice(0, 1))!, [RESPONSE_BODY_MESSAGE]);
-            assert.deepEqual(formatErrorMessages(siteErrors.slice(1, 2))!, [REQUEST_ERROR_MESSAGE]);
-            assert.deepEqual(formatErrorMessages(siteErrors.slice(-1)), undefined);
+    describe('formatErrorMessages', () => {
+        it('formatErrorMessages one error', () => {
+            assert.deepEqual(formatErrorMessages(siteErrors.slice(0, 1))!, [
+                RESPONSE_BODY_MESSAGE,
+            ]);
+            assert.deepEqual(formatErrorMessages(siteErrors.slice(1, 2))!, [
+                REQUEST_ERROR_MESSAGE,
+            ]);
+            assert.deepEqual(
+                formatErrorMessages(siteErrors.slice(-1)),
+                undefined
+            );
         });
-        it ("formatErrorMessages multiple errors", ()=>{
-            assert.deepEqual(formatErrorMessages(siteErrors), [RESPONSE_BODY_MESSAGE, REQUEST_ERROR_MESSAGE]);
+        it('formatErrorMessages multiple errors', () => {
+            assert.deepEqual(formatErrorMessages(siteErrors), [
+                RESPONSE_BODY_MESSAGE,
+                REQUEST_ERROR_MESSAGE,
+            ]);
         });
     });
-});
\ No newline at end of file
+});
diff --git a/src/shared/lib/errorFormatter.ts b/src/shared/lib/errorFormatter.ts
index 4bf851a5a86..49992476ac8 100644
--- a/src/shared/lib/errorFormatter.ts
+++ b/src/shared/lib/errorFormatter.ts
@@ -1,39 +1,38 @@
 import * as React from 'react';
-import {SiteError} from "AppStore";
+import { SiteError } from 'AppStore';
 
 export function formatErrorLog(errors: SiteError[]) {
-    return errors.map((err) => {
-        try {
-            if (err.errorObj.response) {
-                return JSON.stringify(err.errorObj.response);
-            } else if (err.errorObj.message) {
-                return err.errorObj.message;
-            } else {
-                return err.errorObj.toString();
+    return errors
+        .map(err => {
+            try {
+                if (err.errorObj.response) {
+                    return JSON.stringify(err.errorObj.response);
+                } else if (err.errorObj.message) {
+                    return err.errorObj.message;
+                } else {
+                    return err.errorObj.toString();
+                }
+            } catch (exc) {
+                return 'No error message available';
             }
-        } catch (exc) {
-            return "No error message available";
-        }
-    }).join('\n\n\n');
+        })
+        .join('\n\n\n');
 }
 
 export function formatErrorTitle(errors: SiteError[]): string | undefined {
-    const errorTitles = errors.filter((err) => {
-        return "title" in err;
+    const errorTitles = errors.filter(err => {
+        return 'title' in err;
     });
 
     if (errorTitles && errorTitles.length > 0) {
-        return errorTitles.map((err) => 
-            err.title
-        ).join(' ');
-    }
-    else {
+        return errorTitles.map(err => err.title).join(' ');
+    } else {
         return undefined;
     }
 }
 
 export function formatErrorMessages(errors: SiteError[]): string[] | undefined {
-    const errorMessages = errors.map((err) => {
+    const errorMessages = errors.map(err => {
         try {
             if (err.errorObj.response) {
                 return err.errorObj.response.body.message;
@@ -46,11 +45,12 @@ export function formatErrorMessages(errors: SiteError[]): string[] | undefined {
             return undefined;
         }
     });
-    const validErrorMessages = errorMessages.filter((errorMessage) => errorMessage !== undefined);
+    const validErrorMessages = errorMessages.filter(
+        errorMessage => errorMessage !== undefined
+    );
     if (validErrorMessages.length > 0) {
         return validErrorMessages;
-    }
-    else {
+    } else {
         return undefined;
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/lib/exposeComponentRenderer.spec.tsx b/src/shared/lib/exposeComponentRenderer.spec.tsx
index 96611d19659..09a5147eda3 100644
--- a/src/shared/lib/exposeComponentRenderer.spec.tsx
+++ b/src/shared/lib/exposeComponentRenderer.spec.tsx
@@ -4,42 +4,30 @@ import * as React from 'react';
 import * as _ from 'lodash';
 import * as $ from 'jquery';
 
-describe('test',()=>{
+describe('test', () => {
+    let targetEl: HTMLDivElement | null;
 
-    let targetEl:HTMLDivElement | null;
-
-    before(()=>{
+    before(() => {
         targetEl = document.createElement('div');
     });
 
-    after(()=>{
+    after(() => {
         targetEl = null;
     });
 
-
-    it ('exposeComponentRenderer puts a function on window object. calling the function renders the passed component', ()=>{
-
+    it('exposeComponentRenderer puts a function on window object. calling the function renders the passed component', () => {
         class testClass extends React.Component<any, any> {
-
-            render(){
-
+            render() {
                 return <div>foo</div>;
-
             }
+        }
 
-        };
-
-        exposeComponentRenderer("renderTestComponent",testClass,{});
+        exposeComponentRenderer('renderTestComponent', testClass, {});
 
         assert.isTrue(_.isFunction((window as any).renderTestComponent));
 
         (window as any).renderTestComponent(targetEl);
 
         assert.equal(targetEl!.innerText, 'foo');
-
     });
-
-
-
-
 });
diff --git a/src/shared/lib/exposeComponentRenderer.ts b/src/shared/lib/exposeComponentRenderer.ts
index cdd58ae5fe6..240a3ba3349 100644
--- a/src/shared/lib/exposeComponentRenderer.ts
+++ b/src/shared/lib/exposeComponentRenderer.ts
@@ -1,22 +1,21 @@
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 
-export default function(name: string, Comp: React.ComponentClass<any> | React.StatelessComponent<any>, props:any = {}) {
+export default function(
+    name: string,
+    Comp: React.ComponentClass<any> | React.StatelessComponent<any>,
+    props: any = {}
+) {
+    const win = window as any;
 
-    const win = (window as any);
+    if (win) {
+        win[name] = (
+            mountNode: HTMLElement,
+            props: { [k: string]: string | boolean | number }
+        ): void => {
+            let el = React.createElement(Comp as any, props);
 
-    if(win) {
-        win[name] = (mountNode: HTMLElement, props:{[k:string]:string|boolean|number}): void => {
-            let el = React.createElement(
-                Comp as any,
-                props
-            );
-
-            ReactDOM.render(
-                el,
-                mountNode
-            );
+            ReactDOM.render(el, mountNode);
         };
     }
-
 }
diff --git a/src/shared/lib/formSubmit.ts b/src/shared/lib/formSubmit.ts
index ae485d0ef49..33971070cbe 100644
--- a/src/shared/lib/formSubmit.ts
+++ b/src/shared/lib/formSubmit.ts
@@ -1,12 +1,18 @@
-import {buildCBioPortalPageUrl} from "../api/urls";
+import { buildCBioPortalPageUrl } from '../api/urls';
 
-export default function formSubmit(path:string, params:{[s:string]:any}, target?:string, method:"get"|"post"|"smart"="post") {
+export default function formSubmit(
+    path: string,
+    params: { [s: string]: any },
+    target?: string,
+    method: 'get' | 'post' | 'smart' = 'post'
+) {
     // method="smart" means submit with GET iff the URL wouldn't be too long
 
     const form = document.createElement('form');
     let computedMethod = method;
-    if (method === "smart") {
-        computedMethod = buildCBioPortalPageUrl(path, params).length > 1800 ? "post" : "get"; // use POST if URL will be too large for some browsers
+    if (method === 'smart') {
+        computedMethod =
+            buildCBioPortalPageUrl(path, params).length > 1800 ? 'post' : 'get'; // use POST if URL will be too large for some browsers
     }
     form.setAttribute('method', computedMethod);
     form.setAttribute('action', path);
@@ -24,4 +30,4 @@ export default function formSubmit(path:string, params:{[s:string]:any}, target?
 
     document.body.appendChild(form);
     form.submit();
-}
\ No newline at end of file
+}
diff --git a/src/shared/lib/getDefaultMolecularProfiles.ts b/src/shared/lib/getDefaultMolecularProfiles.ts
index c38cde8960c..a2ae6197ad7 100644
--- a/src/shared/lib/getDefaultMolecularProfiles.ts
+++ b/src/shared/lib/getDefaultMolecularProfiles.ts
@@ -1,52 +1,63 @@
-import {MolecularProfile} from "../api/generated/CBioPortalAPI";
+import { MolecularProfile } from '../api/generated/CBioPortalAPI';
 import * as _ from 'lodash';
-import {AlterationTypeConstants} from "../../pages/resultsView/ResultsViewPageStore";
+import { AlterationTypeConstants } from '../../pages/resultsView/ResultsViewPageStore';
 
 export enum MolecularProfileFilterEnum {
     MutationAndCNA = 0,
     Mutation = 1,
-    CNA = 2
+    CNA = 2,
 }
 
-export function getDefaultMolecularProfiles(studyToMolecularProfiles:{[studyId:string]:MolecularProfile[]}, profileFilter:number) {
-    return _.flatMap(studyToMolecularProfiles, (profiles)=>getDefaultMolecularProfilesForStudy(profiles, profileFilter))
+export function getDefaultMolecularProfiles(
+    studyToMolecularProfiles: { [studyId: string]: MolecularProfile[] },
+    profileFilter: number
+) {
+    return _.flatMap(studyToMolecularProfiles, profiles =>
+        getDefaultMolecularProfilesForStudy(profiles, profileFilter)
+    );
 }
 
-export function isGistic(profileId:string){
+export function isGistic(profileId: string) {
     return /GISTIC/i.test(profileId);
 }
 
-export function isRAE(profileId:string){
+export function isRAE(profileId: string) {
     return /RAE/i.test(profileId);
 }
 
-export interface CNAProfileGroups
-{
-    gistic:MolecularProfile[],
-    rae:MolecularProfile[],
-    other:MolecularProfile[]
+export interface CNAProfileGroups {
+    gistic: MolecularProfile[];
+    rae: MolecularProfile[];
+    other: MolecularProfile[];
 }
 
-export function getDefaultCNAProfile(profiles:MolecularProfile[]):MolecularProfile|undefined {
+export function getDefaultCNAProfile(
+    profiles: MolecularProfile[]
+): MolecularProfile | undefined {
     // we only want CNA profiles
     const cnaProfiles = profiles.filter(
-        (profile)=>profile.molecularAlterationType === AlterationTypeConstants.COPY_NUMBER_ALTERATION
+        profile =>
+            profile.molecularAlterationType ===
+            AlterationTypeConstants.COPY_NUMBER_ALTERATION
     );
     // now put profiles into groups (gistic, RAE, other)
-    const cnaGroups = cnaProfiles.reduce((map:CNAProfileGroups, profile)=>{
-        if (isGistic(profile.molecularProfileId)) {
-            map.gistic.push(profile);
-        } else if (isRAE(profile.molecularProfileId)) {
-            map.rae.push(profile);
-        } else {
-            map.other.push(profile);
+    const cnaGroups = cnaProfiles.reduce(
+        (map: CNAProfileGroups, profile) => {
+            if (isGistic(profile.molecularProfileId)) {
+                map.gistic.push(profile);
+            } else if (isRAE(profile.molecularProfileId)) {
+                map.rae.push(profile);
+            } else {
+                map.other.push(profile);
+            }
+            return map;
+        },
+        {
+            gistic: [],
+            rae: [],
+            other: [],
         }
-        return map;
-    },{
-        gistic:[],
-        rae:[],
-        other:[]
-    });
+    );
 
     //now return according to priority (gistic, rae, other)
     if (cnaGroups.gistic.length) {
@@ -55,24 +66,31 @@ export function getDefaultCNAProfile(profiles:MolecularProfile[]):MolecularProfi
         return cnaGroups.rae[0];
     } else if (cnaGroups.other.length) {
         // show the first profile in with showProfileInAnalysisTab flag set to true
-        return _.find(cnaGroups.other,(profile)=>profile.showProfileInAnalysisTab);
+        return _.find(
+            cnaGroups.other,
+            profile => profile.showProfileInAnalysisTab
+        );
     } else {
         return undefined;
     }
 }
 
-export function getDefaultMutationProfile(profiles:MolecularProfile[]){
-    return _.find(profiles,
-        (profile)=>profile.molecularAlterationType === AlterationTypeConstants.MUTATION_EXTENDED
+export function getDefaultMutationProfile(profiles: MolecularProfile[]) {
+    return _.find(
+        profiles,
+        profile =>
+            profile.molecularAlterationType ===
+            AlterationTypeConstants.MUTATION_EXTENDED
     );
 }
 
-export function getDefaultMolecularProfilesForStudy(profiles: MolecularProfile[], profileFilter:number) {
-
-    const defaultProfiles: (MolecularProfile|undefined)[] = [];
+export function getDefaultMolecularProfilesForStudy(
+    profiles: MolecularProfile[],
+    profileFilter: number
+) {
+    const defaultProfiles: (MolecularProfile | undefined)[] = [];
 
     switch (profileFilter) {
-
         case MolecularProfileFilterEnum.Mutation:
             defaultProfiles.push(getDefaultMutationProfile(profiles));
             break;
@@ -85,4 +103,4 @@ export function getDefaultMolecularProfilesForStudy(profiles: MolecularProfile[]
     }
     // get rid of any undefined items
     return _.compact(defaultProfiles);
-}
\ No newline at end of file
+}
diff --git a/src/shared/lib/getMobxPromiseGroupStatus.ts b/src/shared/lib/getMobxPromiseGroupStatus.ts
index 74eb05e002e..dbbb0afe24d 100644
--- a/src/shared/lib/getMobxPromiseGroupStatus.ts
+++ b/src/shared/lib/getMobxPromiseGroupStatus.ts
@@ -1,12 +1,13 @@
-import * as _ from "lodash";
+import * as _ from 'lodash';
 
-export function getMobxPromiseGroupStatus(...promises:{ status:"complete"|"error"|"pending"}[]): "complete" | "error" | "pending" {
-    if (_.some(promises,(p)=>p.status === "error")){
-        return "error";
-    }
-    else if (_.some(promises,(p)=>p.status === "pending")){
-        return "pending";
+export function getMobxPromiseGroupStatus(
+    ...promises: { status: 'complete' | 'error' | 'pending' }[]
+): 'complete' | 'error' | 'pending' {
+    if (_.some(promises, p => p.status === 'error')) {
+        return 'error';
+    } else if (_.some(promises, p => p.status === 'pending')) {
+        return 'pending';
     } else {
-        return "complete";
+        return 'complete';
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/lib/getOverlappingStudies.spec.ts b/src/shared/lib/getOverlappingStudies.spec.ts
index 12a9a58d827..89410a6bc8e 100644
--- a/src/shared/lib/getOverlappingStudies.spec.ts
+++ b/src/shared/lib/getOverlappingStudies.spec.ts
@@ -1,102 +1,81 @@
 import { assert } from 'chai';
-import getOverlappingStudies from "./getOverlappingStudies";
-import {CancerStudy} from "../api/generated/CBioPortalAPI";
+import getOverlappingStudies from './getOverlappingStudies';
+import { CancerStudy } from '../api/generated/CBioPortalAPI';
 
-describe('getOverlappingStudies',()=>{
-
-    it('finds overlapping studies based on pub/nonpub signature in studyId', ()=>{
-
-        let studies = [
-            { studyId:'moo_tcga'},
-            { studyId: 'moo1_tcga_pub'}
-        ];
+describe('getOverlappingStudies', () => {
+    it('finds overlapping studies based on pub/nonpub signature in studyId', () => {
+        let studies = [{ studyId: 'moo_tcga' }, { studyId: 'moo1_tcga_pub' }];
 
         let ret = getOverlappingStudies(studies as CancerStudy[]);
 
-        assert.equal(ret.length, 0, 'shouldn\'t find anything');
+        assert.equal(ret.length, 0, "shouldn't find anything");
 
         // now adjust
-        studies = [
-            { studyId:'moo_tcga'},
-            { studyId: 'moo_tcga_pub'}
-        ];
+        studies = [{ studyId: 'moo_tcga' }, { studyId: 'moo_tcga_pub' }];
 
         ret = getOverlappingStudies(studies as CancerStudy[]);
 
-        assert.equal(ret[0][0].studyId,'moo_tcga');
-        assert.equal(ret[0][1].studyId,'moo_tcga_pub');
-
+        assert.equal(ret[0][0].studyId, 'moo_tcga');
+        assert.equal(ret[0][1].studyId, 'moo_tcga_pub');
     });
 
-    it('finds overlapping studies based on year suffix', ()=>{
-
+    it('finds overlapping studies based on year suffix', () => {
         let studies = [
-            { studyId:'moo_tcga_2016'},
-            { studyId: 'moo_tcga_2015'},
-            { studyId: 'doo_tcga_2011'},
-            { studyId: 'doo_tcga_2012'},
-            { studyId: 'scoo_tcga_2011'},
-            { studyId: 'floo_tcga_2012'}
+            { studyId: 'moo_tcga_2016' },
+            { studyId: 'moo_tcga_2015' },
+            { studyId: 'doo_tcga_2011' },
+            { studyId: 'doo_tcga_2012' },
+            { studyId: 'scoo_tcga_2011' },
+            { studyId: 'floo_tcga_2012' },
         ];
 
         let ret = getOverlappingStudies(studies as CancerStudy[]);
 
         assert.equal(ret.length, 2);
-
     });
 
-    it('doesn\'nt detect non TCGA stuides', ()=>{
-
+    it("doesn'nt detect non TCGA stuides", () => {
         let studies = [
-            { studyId: 'blca_mskcc_solit_2014'},
-            { studyId: 'blca_mskcc_solit_2012'}
+            { studyId: 'blca_mskcc_solit_2014' },
+            { studyId: 'blca_mskcc_solit_2012' },
         ];
 
         let ret = getOverlappingStudies(studies as CancerStudy[]);
 
         assert.equal(ret.length, 0);
-
     });
 
-    it('finds them when year and pub are suffixes', ()=>{
-
+    it('finds them when year and pub are suffixes', () => {
         let studies = [
             { studyId: 'brca_tcga_pub2015' },
-            { studyId: 'brca_tcga_pub'}
+            { studyId: 'brca_tcga_pub' },
         ];
 
         let ret = getOverlappingStudies(studies as CancerStudy[]);
 
         assert.equal(ret.length, 1);
-
     });
 
-    it('finds pan can, pub and provisional', ()=>{
-
+    it('finds pan can, pub and provisional', () => {
         let studies = [
             { studyId: 'blca_tcga_pub' },
-            { studyId: 'blca_tcga_pan_can_atlas_2018'},
-            { studyId: 'blca_tcga'}
+            { studyId: 'blca_tcga_pan_can_atlas_2018' },
+            { studyId: 'blca_tcga' },
         ];
 
         let ret = getOverlappingStudies(studies as CancerStudy[]);
 
         assert.equal(ret[0].length, 3);
-
     });
 
-    it('finds pan can and pub', ()=>{
-
+    it('finds pan can and pub', () => {
         let studies = [
             { studyId: 'blca_tcga_pub' },
-            { studyId: 'blca_tcga_pan_can_atlas_2018'},
+            { studyId: 'blca_tcga_pan_can_atlas_2018' },
         ];
 
         let ret = getOverlappingStudies(studies as CancerStudy[]);
 
         assert.equal(ret[0].length, 2);
-
     });
-
-
-})
\ No newline at end of file
+});
diff --git a/src/shared/lib/getOverlappingStudies.ts b/src/shared/lib/getOverlappingStudies.ts
index c43f46dfbe6..0058a920767 100644
--- a/src/shared/lib/getOverlappingStudies.ts
+++ b/src/shared/lib/getOverlappingStudies.ts
@@ -1,21 +1,30 @@
-import {CancerStudy} from "../api/generated/CBioPortalAPI";
+import { CancerStudy } from '../api/generated/CBioPortalAPI';
 import * as _ from 'lodash';
 
-export default function getOverlappingStudies(studies: CancerStudy[]):CancerStudy[][] {
-    const groupedTCGAStudies = _.reduce(studies,(memo, study:CancerStudy)=>{
-        if (/_tcga/.test(study.studyId)) {
-            // we need to find when root of study name is in duplicate, so strip out the modifiers (pub or pancan)
-            const initial = study.studyId.replace(/(_\d\d\d\d|_pub|(_pub\d\d\d\d)|_pan_can_atlas_\d\d\d\d)$/g,'');
-            if (initial) {
-                if (initial in memo) {
-                    memo[initial].push(study);
-                } else {
-                    memo[initial] = [study];
+export default function getOverlappingStudies(
+    studies: CancerStudy[]
+): CancerStudy[][] {
+    const groupedTCGAStudies = _.reduce(
+        studies,
+        (memo, study: CancerStudy) => {
+            if (/_tcga/.test(study.studyId)) {
+                // we need to find when root of study name is in duplicate, so strip out the modifiers (pub or pancan)
+                const initial = study.studyId.replace(
+                    /(_\d\d\d\d|_pub|(_pub\d\d\d\d)|_pan_can_atlas_\d\d\d\d)$/g,
+                    ''
+                );
+                if (initial) {
+                    if (initial in memo) {
+                        memo[initial].push(study);
+                    } else {
+                        memo[initial] = [study];
+                    }
                 }
             }
-        }
 
-        return memo;
-    }, {} as { [studyId:string]:CancerStudy[] });
-    return _.filter(groupedTCGAStudies, (grouping)=>grouping.length > 1);
-}
\ No newline at end of file
+            return memo;
+        },
+        {} as { [studyId: string]: CancerStudy[] }
+    );
+    return _.filter(groupedTCGAStudies, grouping => grouping.length > 1);
+}
diff --git a/src/shared/lib/handleLongUrls.ts b/src/shared/lib/handleLongUrls.ts
index 5b17dbac8bc..05cf781fddf 100644
--- a/src/shared/lib/handleLongUrls.ts
+++ b/src/shared/lib/handleLongUrls.ts
@@ -1,30 +1,37 @@
-import {getBrowserWindow} from "cbioportal-frontend-commons";
+import { getBrowserWindow } from 'cbioportal-frontend-commons';
 
-export const NAVCASEIDS_PARAM = "navCaseIds";
+export const NAVCASEIDS_PARAM = 'navCaseIds';
 
 export const NAVCASEIDS_REGEXP = new RegExp(`${NAVCASEIDS_PARAM}=([^&]*)`);
 
-const PROP_NAME = "navCaseIdsCache";
+const PROP_NAME = 'navCaseIdsCache';
 
-export function parseCohortIds(concatenatedIds:string){
-    return concatenatedIds.split(',').map((entityId:string)=>{
-        return entityId.includes(':') ? entityId : this.studyId + ':' + entityId;
+export function parseCohortIds(concatenatedIds: string) {
+    return concatenatedIds.split(',').map((entityId: string) => {
+        return entityId.includes(':')
+            ? entityId
+            : this.studyId + ':' + entityId;
     });
 }
 
-export function handleLongUrls(){
-    const navCaseIdMatch = getBrowserWindow().location.hash.match(new RegExp(NAVCASEIDS_REGEXP));
+export function handleLongUrls() {
+    const navCaseIdMatch = getBrowserWindow().location.hash.match(
+        new RegExp(NAVCASEIDS_REGEXP)
+    );
     // google analytics starts to crash when location.href gets too long
     // this is a fairly arbitrary length at which point we need to store these caseIds in localStorage instead of in hash
     if (navCaseIdMatch && navCaseIdMatch[1].length > 60000) {
         // now delete from url so that we don't hurt google analytics
-        getBrowserWindow().location.hash = getBrowserWindow().location.hash.replace(NAVCASEIDS_REGEXP,"");
+        getBrowserWindow().location.hash = getBrowserWindow().location.hash.replace(
+            NAVCASEIDS_REGEXP,
+            ''
+        );
         getBrowserWindow()[PROP_NAME] = navCaseIdMatch[1];
     }
 }
 
-export function getNavCaseIdsCache(){
+export function getNavCaseIdsCache() {
     const data = getBrowserWindow()[PROP_NAME];
     delete getBrowserWindow()[PROP_NAME];
-    return (data) ? parseCohortIds(data) : undefined;
-}
\ No newline at end of file
+    return data ? parseCohortIds(data) : undefined;
+}
diff --git a/src/shared/lib/hashString.ts b/src/shared/lib/hashString.ts
index 3661c2d769b..035f439f2ba 100644
--- a/src/shared/lib/hashString.ts
+++ b/src/shared/lib/hashString.ts
@@ -1,12 +1,12 @@
 // source: https://werxltd.com/wp/2010/05/13/javascript-implementation-of-javas-string-hashcode-method/
 
-export default function hashString(str:string) {
+export default function hashString(str: string) {
     let hash = 0;
     if (str.length == 0) return hash;
     for (let i = 0; i < str.length; i++) {
         const char = str.charCodeAt(i);
-        hash = ((hash<<5)-hash)+char;
+        hash = (hash << 5) - hash + char;
         hash = hash & hash; // Convert to 32bit integer
     }
     return hash;
-}
\ No newline at end of file
+}
diff --git a/src/shared/lib/ifNotDefined.ts b/src/shared/lib/ifNotDefined.ts
index a5a9e6e7ba7..9a5a38fa595 100644
--- a/src/shared/lib/ifNotDefined.ts
+++ b/src/shared/lib/ifNotDefined.ts
@@ -1,9 +1,9 @@
 const type_of_undefined = typeof undefined;
 
-export default function ifNotDefined<T>(target:any, fallback:T) {
+export default function ifNotDefined<T>(target: any, fallback: T) {
     if (typeof target === type_of_undefined) {
         return fallback;
     } else {
         return target;
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/lib/invertIncreasingFunction.spec.ts b/src/shared/lib/invertIncreasingFunction.spec.ts
index b6ba938b29f..4b7a33613fa 100644
--- a/src/shared/lib/invertIncreasingFunction.spec.ts
+++ b/src/shared/lib/invertIncreasingFunction.spec.ts
@@ -1,48 +1,61 @@
-import {assert} from "chai";
-import invertIncreasingFunction, {findXRangeOfIncreasingFunction} from "./invertIncreasingFunction";
+import { assert } from 'chai';
+import invertIncreasingFunction, {
+    findXRangeOfIncreasingFunction,
+} from './invertIncreasingFunction';
 
-describe("invertIncreasingFunction", () => {
-    it("correctly inverts square", ()=>{
-        for (let i=1; i<10; i+= 1) {
-            assert.isTrue(Math.abs(invertIncreasingFunction(x=>x*x, i, [0, i]) - Math.sqrt(i)) < 0.001);
+describe('invertIncreasingFunction', () => {
+    it('correctly inverts square', () => {
+        for (let i = 1; i < 10; i += 1) {
+            assert.isTrue(
+                Math.abs(
+                    invertIncreasingFunction(x => x * x, i, [0, i]) -
+                        Math.sqrt(i)
+                ) < 0.001
+            );
         }
     });
 });
 
-describe("findXRangeOfIncreasingFunction", ()=>{
-    function testRange(func:(x:number)=>number, y:number) {
+describe('findXRangeOfIncreasingFunction', () => {
+    function testRange(func: (x: number) => number, y: number) {
         const range = findXRangeOfIncreasingFunction(func, y);
         assert.isAtMost(func(range[0]), y);
         assert.isAtLeast(func(range[1]), y);
     }
 
-    it("finds an acceptable range for various inputs of square function", ()=>{
-        const square = (x:number)=>x*x;
-        for (let i=1; i<10; i+=1) {
+    it('finds an acceptable range for various inputs of square function', () => {
+        const square = (x: number) => x * x;
+        for (let i = 1; i < 10; i += 1) {
             testRange(square, i);
         }
     });
-    it("finds an acceptable range for various inputs of log function", ()=>{
-        const log = (x:number)=>Math.log(x);
-        for (let i=1; i<10; i+=1) {
+    it('finds an acceptable range for various inputs of log function', () => {
+        const log = (x: number) => Math.log(x);
+        for (let i = 1; i < 10; i += 1) {
             testRange(log, i);
         }
     });
-    it("errors and fails to find an acceptable range when the input is not valid", ()=>{
+    it('errors and fails to find an acceptable range when the input is not valid', () => {
         let errorOccurred = false;
         try {
             findXRangeOfIncreasingFunction(Math.exp, -1); // there is no lower bound, a, so that Math.exp(a) <= -1
         } catch (e) {
             errorOccurred = true;
         }
-        assert.isTrue(errorOccurred, "Failed to throw error when lower bound doesnt exist");
+        assert.isTrue(
+            errorOccurred,
+            'Failed to throw error when lower bound doesnt exist'
+        );
 
         errorOccurred = false;
         try {
-            findXRangeOfIncreasingFunction(x=>(1 - 1/x), 2); // there is no upper bound, b, so that 2<=1/(1-b)
+            findXRangeOfIncreasingFunction(x => 1 - 1 / x, 2); // there is no upper bound, b, so that 2<=1/(1-b)
         } catch (e) {
             errorOccurred = true;
         }
-        assert.isTrue(errorOccurred, "Failed to throw error when upper bound doesnt exist");
+        assert.isTrue(
+            errorOccurred,
+            'Failed to throw error when upper bound doesnt exist'
+        );
     });
-});
\ No newline at end of file
+});
diff --git a/src/shared/lib/invertIncreasingFunction.ts b/src/shared/lib/invertIncreasingFunction.ts
index 84ba04127fa..96f32c0a5e4 100644
--- a/src/shared/lib/invertIncreasingFunction.ts
+++ b/src/shared/lib/invertIncreasingFunction.ts
@@ -1,13 +1,13 @@
 export function findXRangeOfIncreasingFunction(
-    func:(x:number)=>number,
-    y:number // the output range is so that func(range[0]) <= y <= func(range[1])
+    func: (x: number) => number,
+    y: number // the output range is so that func(range[0]) <= y <= func(range[1])
 ) {
     // find lower
     let lower = 0;
     let step = 1;
     while (func(lower) > y) {
         if (lower < Number.MIN_SAFE_INTEGER) {
-            throw new Error("Couldnt find lower bound");
+            throw new Error('Couldnt find lower bound');
         }
 
         lower -= step;
@@ -18,7 +18,7 @@ export function findXRangeOfIncreasingFunction(
     let upper = 0;
     while (func(upper) < y) {
         if (upper > Number.MAX_SAFE_INTEGER) {
-            throw new Error("Couldnt find upper bound");
+            throw new Error('Couldnt find upper bound');
         }
 
         upper += step;
@@ -29,10 +29,10 @@ export function findXRangeOfIncreasingFunction(
 }
 
 export default function invertIncreasingFunction(
-    func:(x:number)=>number,
+    func: (x: number) => number,
     y: number,
-    xRange?:[number,number],
-    iterations:number = 20
+    xRange?: [number, number],
+    iterations: number = 20
 ) {
     xRange = xRange || findXRangeOfIncreasingFunction(func, y);
     // tries to approximate the value x, within xRange, such that func(x) = targetOutput, assuming func is monotonic increasing
@@ -55,11 +55,11 @@ export default function invertIncreasingFunction(
 }
 
 export function invertDecreasingFunction(
-    func:(x:number)=>number,
+    func: (x: number) => number,
     y: number,
-    xRange?:[number,number],
-    iterations:number = 20
+    xRange?: [number, number],
+    iterations: number = 20
 ) {
-    const increasingFn = (x:number)=>-func(x);
+    const increasingFn = (x: number) => -func(x);
     return invertIncreasingFunction(increasingFn, -y, xRange, iterations);
-}
\ No newline at end of file
+}
diff --git a/src/shared/lib/isSampleProfiled.spec.ts b/src/shared/lib/isSampleProfiled.spec.ts
index 3770034628a..6f2d6522678 100644
--- a/src/shared/lib/isSampleProfiled.spec.ts
+++ b/src/shared/lib/isSampleProfiled.spec.ts
@@ -1,130 +1,203 @@
-import {assert} from "chai";
-import {isSampleProfiled} from "./isSampleProfiled";
+import { assert } from 'chai';
+import { isSampleProfiled } from './isSampleProfiled';
 
 describe('isSampleProfiled', () => {
-
     it('(mis)matches by allGenes as appropriate', () => {
+        let uniqueSampleKey =
+            'VENHQS0zWC1BQVY5LTAxOmNob2xfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg';
 
-        let uniqueSampleKey = "VENHQS0zWC1BQVY5LTAxOmNob2xfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg";
-
-        let hugoGeneSymbol = "EGFR";
+        let hugoGeneSymbol = 'EGFR';
 
         let coverageInformation = {
-            "samples": {
-                "VENHQS0zWC1BQVY5LTAxOmNob2xfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg": {
-                    "byGene": {},
-                    "allGenes": [{
-                        "uniqueSampleKey": "VENHQS0zWC1BQVY5LTAxOmNob2xfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                        "uniquePatientKey": "VENHQS0zWC1BQVY5OmNob2xfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                        "molecularProfileId": "chol_tcga_pan_can_atlas_2018_gistic",
-                        "sampleId": "TCGA-3X-AAV9-01",
-                        "patientId": "TCGA-3X-AAV9",
-                        "studyId": "chol_tcga_pan_can_atlas_2018",
-                        "profiled": true
-                    }, {
-                        "uniqueSampleKey": "VENHQS0zWC1BQVY5LTAxOmNob2xfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                        "uniquePatientKey": "VENHQS0zWC1BQVY5OmNob2xfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                        "molecularProfileId": "chol_tcga_pan_can_atlas_2018_mutations",
-                        "sampleId": "TCGA-3X-AAV9-01",
-                        "patientId": "TCGA-3X-AAV9",
-                        "studyId": "chol_tcga_pan_can_atlas_2018",
-                        "profiled": true
-                    }],
-                    "notProfiledByGene": {},
-                    "notProfiledAllGenes": []
+            samples: {
+                VENHQS0zWC1BQVY5LTAxOmNob2xfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg: {
+                    byGene: {},
+                    allGenes: [
+                        {
+                            uniqueSampleKey:
+                                'VENHQS0zWC1BQVY5LTAxOmNob2xfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                            uniquePatientKey:
+                                'VENHQS0zWC1BQVY5OmNob2xfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                            molecularProfileId:
+                                'chol_tcga_pan_can_atlas_2018_gistic',
+                            sampleId: 'TCGA-3X-AAV9-01',
+                            patientId: 'TCGA-3X-AAV9',
+                            studyId: 'chol_tcga_pan_can_atlas_2018',
+                            profiled: true,
+                        },
+                        {
+                            uniqueSampleKey:
+                                'VENHQS0zWC1BQVY5LTAxOmNob2xfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                            uniquePatientKey:
+                                'VENHQS0zWC1BQVY5OmNob2xfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                            molecularProfileId:
+                                'chol_tcga_pan_can_atlas_2018_mutations',
+                            sampleId: 'TCGA-3X-AAV9-01',
+                            patientId: 'TCGA-3X-AAV9',
+                            studyId: 'chol_tcga_pan_can_atlas_2018',
+                            profiled: true,
+                        },
+                    ],
+                    notProfiledByGene: {},
+                    notProfiledAllGenes: [],
+                },
+                VENHQS0zWC1BQVZBLTAxOmNob2xfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg: {
+                    byGene: {},
+                    allGenes: [
+                        {
+                            uniqueSampleKey:
+                                'VENHQS0zWC1BQVZBLTAxOmNob2xfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                            uniquePatientKey:
+                                'VENHQS0zWC1BQVZBOmNob2xfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                            molecularProfileId:
+                                'chol_tcga_pan_can_atlas_2018_gistic',
+                            sampleId: 'TCGA-3X-AAVA-01',
+                            patientId: 'TCGA-3X-AAVA',
+                            studyId: 'chol_tcga_pan_can_atlas_2018',
+                            profiled: true,
+                        },
+                        {
+                            uniqueSampleKey:
+                                'VENHQS0zWC1BQVZBLTAxOmNob2xfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                            uniquePatientKey:
+                                'VENHQS0zWC1BQVZBOmNob2xfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                            molecularProfileId:
+                                'chol_tcga_pan_can_atlas_2018_mutations',
+                            sampleId: 'TCGA-3X-AAVA-01',
+                            patientId: 'TCGA-3X-AAVA',
+                            studyId: 'chol_tcga_pan_can_atlas_2018',
+                            profiled: true,
+                        },
+                    ],
+                    notProfiledByGene: {},
+                    notProfiledAllGenes: [],
                 },
-                "VENHQS0zWC1BQVZBLTAxOmNob2xfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg": {
-                    "byGene": {},
-                    "allGenes": [{
-                        "uniqueSampleKey": "VENHQS0zWC1BQVZBLTAxOmNob2xfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                        "uniquePatientKey": "VENHQS0zWC1BQVZBOmNob2xfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                        "molecularProfileId": "chol_tcga_pan_can_atlas_2018_gistic",
-                        "sampleId": "TCGA-3X-AAVA-01",
-                        "patientId": "TCGA-3X-AAVA",
-                        "studyId": "chol_tcga_pan_can_atlas_2018",
-                        "profiled": true
-                    }, {
-                        "uniqueSampleKey": "VENHQS0zWC1BQVZBLTAxOmNob2xfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                        "uniquePatientKey": "VENHQS0zWC1BQVZBOmNob2xfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                        "molecularProfileId": "chol_tcga_pan_can_atlas_2018_mutations",
-                        "sampleId": "TCGA-3X-AAVA-01",
-                        "patientId": "TCGA-3X-AAVA",
-                        "studyId": "chol_tcga_pan_can_atlas_2018",
-                        "profiled": true
-                    }],
-                    "notProfiledByGene": {},
-                    "notProfiledAllGenes": []
-                }
-            }
+            },
         } as any;
 
-        assert.isFalse(isSampleProfiled(uniqueSampleKey, 'chol_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
-            hugoGeneSymbol, coverageInformation),'non matching molecularProfile');
-
-        assert.isTrue(isSampleProfiled(uniqueSampleKey, 'chol_tcga_pan_can_atlas_2018_mutations',
-            hugoGeneSymbol, coverageInformation),'matching molecularProfile');
-
-        assert.isTrue(isSampleProfiled(uniqueSampleKey, 'chol_tcga_pan_can_atlas_2018_mutations',
-            'blah', coverageInformation),'matches allGenes inspite of gene mismatch');
-
-        assert.isFalse(isSampleProfiled(uniqueSampleKey + "blah", 'chol_tcga_pan_can_atlas_2018_mutations',
-            hugoGeneSymbol, coverageInformation),'no matching sample key');
-
-        assert.isFalse(isSampleProfiled(uniqueSampleKey, 'chol_tcga_pan_can_atlas_2018_mutations',
-            hugoGeneSymbol, { samples:{} } as any),'no matching sample key');
-
-
-
+        assert.isFalse(
+            isSampleProfiled(
+                uniqueSampleKey,
+                'chol_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                hugoGeneSymbol,
+                coverageInformation
+            ),
+            'non matching molecularProfile'
+        );
+
+        assert.isTrue(
+            isSampleProfiled(
+                uniqueSampleKey,
+                'chol_tcga_pan_can_atlas_2018_mutations',
+                hugoGeneSymbol,
+                coverageInformation
+            ),
+            'matching molecularProfile'
+        );
+
+        assert.isTrue(
+            isSampleProfiled(
+                uniqueSampleKey,
+                'chol_tcga_pan_can_atlas_2018_mutations',
+                'blah',
+                coverageInformation
+            ),
+            'matches allGenes inspite of gene mismatch'
+        );
+
+        assert.isFalse(
+            isSampleProfiled(
+                uniqueSampleKey + 'blah',
+                'chol_tcga_pan_can_atlas_2018_mutations',
+                hugoGeneSymbol,
+                coverageInformation
+            ),
+            'no matching sample key'
+        );
+
+        assert.isFalse(
+            isSampleProfiled(
+                uniqueSampleKey,
+                'chol_tcga_pan_can_atlas_2018_mutations',
+                hugoGeneSymbol,
+                { samples: {} } as any
+            ),
+            'no matching sample key'
+        );
     });
 
-
     it('(mis)matches by byGenes as appropriate', () => {
+        let uniqueSampleKey =
+            'VENHQS0zWC1BQVY5LTAxOmNob2xfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg';
 
-        let uniqueSampleKey = "VENHQS0zWC1BQVY5LTAxOmNob2xfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg";
-
-        let hugoGeneSymbol = "EGFR";
+        let hugoGeneSymbol = 'EGFR';
 
         let coverageInformation = {
-            "samples": {
-                "VENHQS0zWC1BQVY5LTAxOmNob2xfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg": {
-                    "byGene": {
-                        "EGFR":[{
-                            "uniqueSampleKey": "VENHQS0zWC1BQVY5LTAxOmNob2xfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                            "uniquePatientKey": "VENHQS0zWC1BQVY5OmNob2xfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                            "molecularProfileId": "chol_tcga_pan_can_atlas_2018_gistic",
-                            "sampleId": "TCGA-3X-AAV9-01",
-                            "patientId": "TCGA-3X-AAV9",
-                            "studyId": "chol_tcga_pan_can_atlas_2018",
-                            "profiled": true
-                        }, {
-                            "uniqueSampleKey": "VENHQS0zWC1BQVY5LTAxOmNob2xfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                            "uniquePatientKey": "VENHQS0zWC1BQVY5OmNob2xfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg",
-                            "molecularProfileId": "chol_tcga_pan_can_atlas_2018_mutations",
-                            "sampleId": "TCGA-3X-AAV9-01",
-                            "patientId": "TCGA-3X-AAV9",
-                            "studyId": "chol_tcga_pan_can_atlas_2018",
-                            "profiled": true
-                        }]
+            samples: {
+                VENHQS0zWC1BQVY5LTAxOmNob2xfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg: {
+                    byGene: {
+                        EGFR: [
+                            {
+                                uniqueSampleKey:
+                                    'VENHQS0zWC1BQVY5LTAxOmNob2xfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                                uniquePatientKey:
+                                    'VENHQS0zWC1BQVY5OmNob2xfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                                molecularProfileId:
+                                    'chol_tcga_pan_can_atlas_2018_gistic',
+                                sampleId: 'TCGA-3X-AAV9-01',
+                                patientId: 'TCGA-3X-AAV9',
+                                studyId: 'chol_tcga_pan_can_atlas_2018',
+                                profiled: true,
+                            },
+                            {
+                                uniqueSampleKey:
+                                    'VENHQS0zWC1BQVY5LTAxOmNob2xfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                                uniquePatientKey:
+                                    'VENHQS0zWC1BQVY5OmNob2xfdGNnYV9wYW5fY2FuX2F0bGFzXzIwMTg',
+                                molecularProfileId:
+                                    'chol_tcga_pan_can_atlas_2018_mutations',
+                                sampleId: 'TCGA-3X-AAV9-01',
+                                patientId: 'TCGA-3X-AAV9',
+                                studyId: 'chol_tcga_pan_can_atlas_2018',
+                                profiled: true,
+                            },
+                        ],
                     },
-                    "allGenes": [],
-                    "notProfiledByGene": {},
-                    "notProfiledAllGenes": []
-                }
-            }
+                    allGenes: [],
+                    notProfiledByGene: {},
+                    notProfiledAllGenes: [],
+                },
+            },
         } as any;
 
-        assert.isFalse(isSampleProfiled(uniqueSampleKey, 'chol_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
-            hugoGeneSymbol, coverageInformation),'non matching molecularProfile');
-
-        assert.isTrue(isSampleProfiled(uniqueSampleKey, 'chol_tcga_pan_can_atlas_2018_mutations',
-            hugoGeneSymbol, coverageInformation),'matching molecularProfile');
-
-        assert.isFalse(isSampleProfiled(uniqueSampleKey, 'chol_tcga_pan_can_atlas_2018_mutations',
-            'blah', coverageInformation),'non matching if GENE doesn\'t exist in result');
-
-
+        assert.isFalse(
+            isSampleProfiled(
+                uniqueSampleKey,
+                'chol_tcga_pan_can_atlas_2018_rna_seq_v2_mrna_median',
+                hugoGeneSymbol,
+                coverageInformation
+            ),
+            'non matching molecularProfile'
+        );
+
+        assert.isTrue(
+            isSampleProfiled(
+                uniqueSampleKey,
+                'chol_tcga_pan_can_atlas_2018_mutations',
+                hugoGeneSymbol,
+                coverageInformation
+            ),
+            'matching molecularProfile'
+        );
+
+        assert.isFalse(
+            isSampleProfiled(
+                uniqueSampleKey,
+                'chol_tcga_pan_can_atlas_2018_mutations',
+                'blah',
+                coverageInformation
+            ),
+            "non matching if GENE doesn't exist in result"
+        );
     });
-
-
-
-});
\ No newline at end of file
+});
diff --git a/src/shared/lib/isSampleProfiled.ts b/src/shared/lib/isSampleProfiled.ts
index 9d6645323f9..98886080e32 100644
--- a/src/shared/lib/isSampleProfiled.ts
+++ b/src/shared/lib/isSampleProfiled.ts
@@ -1,33 +1,45 @@
 import * as _ from 'lodash';
-import {CoverageInformation, CoverageInformationForCase} from "../../pages/resultsView/ResultsViewPageStoreUtils";
-import {GenePanelData} from "../api/generated/CBioPortalAPI";
+import {
+    CoverageInformation,
+    CoverageInformationForCase,
+} from '../../pages/resultsView/ResultsViewPageStoreUtils';
+import { GenePanelData } from '../api/generated/CBioPortalAPI';
 
-export function isSampleProfiled(uniqueSampleKey:string, molecularProfileId:string,
-                                  hugoGeneSymbol:string, coverageInformation:CoverageInformation):boolean
-{
-    return !!getSampleProfiledReport(uniqueSampleKey, coverageInformation, hugoGeneSymbol)[molecularProfileId];
+export function isSampleProfiled(
+    uniqueSampleKey: string,
+    molecularProfileId: string,
+    hugoGeneSymbol: string,
+    coverageInformation: CoverageInformation
+): boolean {
+    return !!getSampleProfiledReport(
+        uniqueSampleKey,
+        coverageInformation,
+        hugoGeneSymbol
+    )[molecularProfileId];
 }
 
 function getSampleProfiledReport(
-    uniqueSampleKey:string,
-    coverageInformation:CoverageInformation,
-    hugoGeneSymbol?:string
-):{[molecularProfileId:string]:boolean} {
+    uniqueSampleKey: string,
+    coverageInformation: CoverageInformation,
+    hugoGeneSymbol?: string
+): { [molecularProfileId: string]: boolean } {
     // returns a map whose keys are the profiles which the sample is profiled in
     const sampleCoverage = coverageInformation.samples[uniqueSampleKey];
 
     // no sample coverage for sample
     if (!sampleCoverage) return {};
 
-    const byGeneCoverage = hugoGeneSymbol ? sampleCoverage.byGene[hugoGeneSymbol] : _.flatten(_.values(sampleCoverage.byGene));
+    const byGeneCoverage = hugoGeneSymbol
+        ? sampleCoverage.byGene[hugoGeneSymbol]
+        : _.flatten(_.values(sampleCoverage.byGene));
 
     // no by gene coverage for gene AND there's no allGene data available
     if (!byGeneCoverage && sampleCoverage.allGenes.length === 0) return {};
 
-    const ret:{[m:string]:boolean} = {};
+    const ret: { [m: string]: boolean } = {};
 
     // does molecular profile appear in the GENE specific panel data
-    for (const gpData of (byGeneCoverage || [])) {
+    for (const gpData of byGeneCoverage || []) {
         ret[gpData.molecularProfileId] = true;
     }
 
@@ -39,10 +51,19 @@ function getSampleProfiledReport(
     return ret;
 }
 
-export function isSampleProfiledInMultiple(uniqueSampleKey:string, molecularProfileIds:string[],
-                                           coverageInformation:CoverageInformation, hugoGeneSymbol?:string):boolean[]
-{
+export function isSampleProfiledInMultiple(
+    uniqueSampleKey: string,
+    molecularProfileIds: string[],
+    coverageInformation: CoverageInformation,
+    hugoGeneSymbol?: string
+): boolean[] {
     // returns boolean[] in same order as molecularProfileIds
-    const profiledReport = getSampleProfiledReport(uniqueSampleKey, coverageInformation, hugoGeneSymbol);
-    return molecularProfileIds.map(molecularProfileId=>!!profiledReport[molecularProfileId]);
-}
\ No newline at end of file
+    const profiledReport = getSampleProfiledReport(
+        uniqueSampleKey,
+        coverageInformation,
+        hugoGeneSymbol
+    );
+    return molecularProfileIds.map(
+        molecularProfileId => !!profiledReport[molecularProfileId]
+    );
+}
diff --git a/src/shared/lib/onMobxPromise.spec.ts b/src/shared/lib/onMobxPromise.spec.ts
index 9a63a3eabea..2ba0d115ce6 100644
--- a/src/shared/lib/onMobxPromise.spec.ts
+++ b/src/shared/lib/onMobxPromise.spec.ts
@@ -1,103 +1,141 @@
 import { assert } from 'chai';
-import {remoteData} from "cbioportal-frontend-commons";
-import onMobxPromise from "./onMobxPromise";
-import {extras, IReactionDisposer, observable} from "mobx";
+import { remoteData } from 'cbioportal-frontend-commons';
+import onMobxPromise from './onMobxPromise';
+import { extras, IReactionDisposer, observable } from 'mobx';
 
-describe('onMobxPromise', ()=>{
-    it('executes the given callback with the result when the mobx promise completes', (done)=>{
+describe('onMobxPromise', () => {
+    it('executes the given callback with the result when the mobx promise completes', done => {
         let promiseInvokeCount = 0;
         let promise = remoteData({
-            invoke:async ()=>{
-                promiseInvokeCount +=1;
+            invoke: async () => {
+                promiseInvokeCount += 1;
                 return 5;
-            }
+            },
         });
-        assert.equal(promiseInvokeCount, 0, "promise not invoked yet");
-        onMobxPromise(promise, (result:number)=>{
-            assert.equal(promiseInvokeCount, 1, "promise invoked once");
-            assert.equal(result, 5, "promise invoked with right result");
+        assert.equal(promiseInvokeCount, 0, 'promise not invoked yet');
+        onMobxPromise(promise, (result: number) => {
+            assert.equal(promiseInvokeCount, 1, 'promise invoked once');
+            assert.equal(result, 5, 'promise invoked with right result');
             done();
         });
     });
-    it('executes the given callback with the results when the mobx promises complete', (done)=>{
+    it('executes the given callback with the results when the mobx promises complete', done => {
         let promiseInvokeCount = 0;
         let promise1 = remoteData({
-            invoke:async ()=>{
-                promiseInvokeCount +=1;
+            invoke: async () => {
+                promiseInvokeCount += 1;
                 return 5;
-            }
+            },
         });
         let promise2 = remoteData({
-            invoke:async ()=>{
-                promiseInvokeCount +=1;
+            invoke: async () => {
+                promiseInvokeCount += 1;
                 return 6;
-            }
+            },
         });
         let promise3 = remoteData({
-            invoke:async ()=>{
-                promiseInvokeCount +=1;
+            invoke: async () => {
+                promiseInvokeCount += 1;
                 return 7;
-            }
-        });
-        assert.equal(promiseInvokeCount, 0, "promise not invoked yet");
-        onMobxPromise([promise1, promise2, promise3], (result1:number, result2:number, result3:number)=>{
-            assert.equal(promiseInvokeCount, 3, "promises each invoked once");
-            assert.equal(result1, 5, "promise invoked with right result");
-            assert.equal(result2, 6, "promise invoked with right result");
-            assert.equal(result3, 7, "promise invoked with right result");
-            done();
+            },
         });
+        assert.equal(promiseInvokeCount, 0, 'promise not invoked yet');
+        onMobxPromise(
+            [promise1, promise2, promise3],
+            (result1: number, result2: number, result3: number) => {
+                assert.equal(
+                    promiseInvokeCount,
+                    3,
+                    'promises each invoked once'
+                );
+                assert.equal(result1, 5, 'promise invoked with right result');
+                assert.equal(result2, 6, 'promise invoked with right result');
+                assert.equal(result3, 7, 'promise invoked with right result');
+                done();
+            }
+        );
     });
-    it('executes the given callback the specified number of times', (done)=>{
+    it('executes the given callback the specified number of times', done => {
         let handlerInvokeCount = 0;
         let promiseResult = observable(0);
         let lastInvokedPromiseResult = 0;
-        let promiseResultIncrementerDisposer:IReactionDisposer;
+        let promiseResultIncrementerDisposer: IReactionDisposer;
         let promise = remoteData({
-            invoke:async ()=>{
+            invoke: async () => {
                 lastInvokedPromiseResult = promiseResult.get();
                 return lastInvokedPromiseResult;
-            }
+            },
         });
-        onMobxPromise(promise, (result:number)=>{
-            assert.equal(result, lastInvokedPromiseResult, "promise invoked with result = lastInvokedPromiseResult");
-            handlerInvokeCount += 1;
-            promiseResult.set(promiseResult.get() + 1);
-        }, 5, ()=>{
-            promiseResultIncrementerDisposer = onMobxPromise(promise, ()=>{
-                assert.equal(handlerInvokeCount, 5, "never invoked again");
+        onMobxPromise(
+            promise,
+            (result: number) => {
+                assert.equal(
+                    result,
+                    lastInvokedPromiseResult,
+                    'promise invoked with result = lastInvokedPromiseResult'
+                );
+                handlerInvokeCount += 1;
                 promiseResult.set(promiseResult.get() + 1);
-            }, 10, ()=>{
-                done();
-            });
-        });
+            },
+            5,
+            () => {
+                promiseResultIncrementerDisposer = onMobxPromise(
+                    promise,
+                    () => {
+                        assert.equal(
+                            handlerInvokeCount,
+                            5,
+                            'never invoked again'
+                        );
+                        promiseResult.set(promiseResult.get() + 1);
+                    },
+                    10,
+                    () => {
+                        done();
+                    }
+                );
+            }
+        );
     });
-    it('executes immediately if the promise is already resolved, does not execute again', (done)=>{
-
+    it('executes immediately if the promise is already resolved, does not execute again', done => {
         let handlerInvokeCount = 0;
         let promiseResult = observable(0);
         let lastInvokedPromiseResult = 0;
-        let promiseResultIncrementerDisposer:IReactionDisposer;
+        let promiseResultIncrementerDisposer: IReactionDisposer;
         let promise = remoteData({
-            invoke:async ()=>{
+            invoke: async () => {
                 lastInvokedPromiseResult = promiseResult.get();
                 return lastInvokedPromiseResult;
-            }
+            },
         });
-        onMobxPromise(promise, ()=>{
+        onMobxPromise(promise, () => {
             // ensure the promise is already resolved by this point
-            onMobxPromise(promise, (result:number)=>{
-                assert.equal(result, 0, "promise invoked with result = 0");
-                handlerInvokeCount += 1;
-                promiseResult.set(promiseResult.get() + 1);
-            }, 1, ()=>{
-                promiseResultIncrementerDisposer = onMobxPromise(promise, ()=>{
-                    assert.equal(handlerInvokeCount, 1, "never invoked again");
+            onMobxPromise(
+                promise,
+                (result: number) => {
+                    assert.equal(result, 0, 'promise invoked with result = 0');
+                    handlerInvokeCount += 1;
                     promiseResult.set(promiseResult.get() + 1);
-                }, 10, ()=>{
-                    done();
-                });
-            });
+                },
+                1,
+                () => {
+                    promiseResultIncrementerDisposer = onMobxPromise(
+                        promise,
+                        () => {
+                            assert.equal(
+                                handlerInvokeCount,
+                                1,
+                                'never invoked again'
+                            );
+                            promiseResult.set(promiseResult.get() + 1);
+                        },
+                        10,
+                        () => {
+                            done();
+                        }
+                    );
+                }
+            );
         });
     });
-});
\ No newline at end of file
+});
diff --git a/src/shared/lib/onMobxPromise.ts b/src/shared/lib/onMobxPromise.ts
index 4fa168f551b..a0f66d3f617 100644
--- a/src/shared/lib/onMobxPromise.ts
+++ b/src/shared/lib/onMobxPromise.ts
@@ -1,22 +1,24 @@
-import {MobxPromise} from "mobxpromise";
-import {autorun, IReactionDisposer} from "mobx";
+import { MobxPromise } from 'mobxpromise';
+import { autorun, IReactionDisposer } from 'mobx';
 
-export function onMobxPromise<T>(promise:MobxPromise<T>|Array<MobxPromise<T>>,
-                                         onComplete:(...results:T[])=>void,
-                                         times:number = 1,
-                                        onDispose?:()=>void):IReactionDisposer {
-    let disposer:IReactionDisposer;
-    let count:number = 0;
-    let promiseArray:Array<MobxPromise<T>>;
+export function onMobxPromise<T>(
+    promise: MobxPromise<T> | Array<MobxPromise<T>>,
+    onComplete: (...results: T[]) => void,
+    times: number = 1,
+    onDispose?: () => void
+): IReactionDisposer {
+    let disposer: IReactionDisposer;
+    let count: number = 0;
+    let promiseArray: Array<MobxPromise<T>>;
     if (promise instanceof Array) {
         promiseArray = promise;
     } else {
         promiseArray = [promise];
     }
-    disposer = autorun((reaction)=>{
-        if (promiseArray.reduce((acc, next)=>(acc && next.isComplete), true)) {
+    disposer = autorun(reaction => {
+        if (promiseArray.reduce((acc, next) => acc && next.isComplete, true)) {
             // if all complete
-            onComplete(...promiseArray.map(x=>(x.result as T)));
+            onComplete(...promiseArray.map(x => x.result as T));
             count += 1;
         }
         if (count >= times) {
@@ -27,4 +29,4 @@ export function onMobxPromise<T>(promise:MobxPromise<T>|Array<MobxPromise<T>>,
     return disposer;
 }
 
-export default onMobxPromise;
\ No newline at end of file
+export default onMobxPromise;
diff --git a/src/shared/lib/onNextRenderFrame.ts b/src/shared/lib/onNextRenderFrame.ts
index ba006e42ccd..0b60f68a1a7 100644
--- a/src/shared/lib/onNextRenderFrame.ts
+++ b/src/shared/lib/onNextRenderFrame.ts
@@ -8,8 +8,8 @@
 // all of that is done. So you need to wait until the call stack is cleared (setTimeout 0) and painting is done
 // (requestAnimationFrame)
 
-export default function onNextRenderFrame(callback:(...args:any[])=>void) {
-    setTimeout(()=>{
+export default function onNextRenderFrame(callback: (...args: any[]) => void) {
+    setTimeout(() => {
         window.requestAnimationFrame(callback);
     }, 0);
-}
\ No newline at end of file
+}
diff --git a/src/shared/lib/openSocialAuthWindow.ts b/src/shared/lib/openSocialAuthWindow.ts
index 91bc5c49ca0..5f5b84e3bd5 100644
--- a/src/shared/lib/openSocialAuthWindow.ts
+++ b/src/shared/lib/openSocialAuthWindow.ts
@@ -1,30 +1,33 @@
-import {buildCBioPortalPageUrl} from "../api/urls";
-import {getBrowserWindow} from "cbioportal-frontend-commons";
-import {fetchServerConfig} from "../../config/config";
-import {AppStore} from "../../AppStore";
-import {IServerConfig} from "../../config/IAppConfig";
+import { buildCBioPortalPageUrl } from '../api/urls';
+import { getBrowserWindow } from 'cbioportal-frontend-commons';
+import { fetchServerConfig } from '../../config/config';
+import { AppStore } from '../../AppStore';
+import { IServerConfig } from '../../config/IAppConfig';
 
-export function openSocialAuthWindow(appStore:AppStore) {
-
-    var _window = getBrowserWindow().open(buildCBioPortalPageUrl('login.jsp'), 'blank', 'width=1000, height=800')!;
+export function openSocialAuthWindow(appStore: AppStore) {
+    var _window = getBrowserWindow().open(
+        buildCBioPortalPageUrl('login.jsp'),
+        'blank',
+        'width=1000, height=800'
+    )!;
     var interval = setInterval(function() {
         try {
             if (_window.closed) {
                 clearInterval(interval);
-            } else if (_window.document.URL.includes(location.origin) &&
+            } else if (
+                _window.document.URL.includes(location.origin) &&
                 !_window.document.URL.includes(location.origin + '/auth') &&
-                !_window.document.URL.includes('login.jsp')) {
+                !_window.document.URL.includes('login.jsp')
+            ) {
                 _window.close();
 
-                fetchServerConfig().then(
-                    (config:IServerConfig)=>{
-                        appStore.userName = config.user_email_address;
-                        appStore.authMethod = config.authenticationMethod;
-                    }
-                );
+                fetchServerConfig().then((config: IServerConfig) => {
+                    appStore.userName = config.user_email_address;
+                    appStore.authMethod = config.authenticationMethod;
+                });
             }
         } catch (err) {
             console.log('Error while monitoring the Login window: ', err);
         }
     }, 1000);
-};
\ No newline at end of file
+}
diff --git a/src/shared/lib/oql/AccessorsForOqlFilter.ts b/src/shared/lib/oql/AccessorsForOqlFilter.ts
index 5ba547b49a3..a33b72176c0 100644
--- a/src/shared/lib/oql/AccessorsForOqlFilter.ts
+++ b/src/shared/lib/oql/AccessorsForOqlFilter.ts
@@ -1,106 +1,128 @@
-import {Mutation, MolecularProfile, NumericGeneMolecularData} from "../../api/generated/CBioPortalAPI";
+import {
+    Mutation,
+    MolecularProfile,
+    NumericGeneMolecularData,
+} from '../../api/generated/CBioPortalAPI';
 import * as _ from 'lodash';
 import {
     AlterationTypeConstants,
     AnnotatedExtendedAlteration,
-    AnnotatedMutation, AnnotatedNumericGeneMolecularData
-} from "../../../pages/resultsView/ResultsViewPageStore";
-import {isNotGermlineMutation} from "../MutationUtils";
+    AnnotatedMutation,
+    AnnotatedNumericGeneMolecularData,
+} from '../../../pages/resultsView/ResultsViewPageStore';
+import { isNotGermlineMutation } from '../MutationUtils';
 
 export const cna_profile_data_to_string: any = {
-    "-2": "homdel",
-    "-1": "hetloss",
-    "0": null,
-    "1": "gain",
-    "2": "amp"
+    '-2': 'homdel',
+    '-1': 'hetloss',
+    '0': null,
+    '1': 'gain',
+    '2': 'amp',
 };
 
 export type SimplifiedMutationType =
-    "missense" | "frameshift" | "nonsense" | "splice" |
-    "nonstart" | "nonstop" | "fusion" | "inframe" | "other";
-
-export function getSimplifiedMutationType(type: string):SimplifiedMutationType {
-    let ret:SimplifiedMutationType;
-    type = (typeof type === "string") ? type.toLowerCase() : "";
+    | 'missense'
+    | 'frameshift'
+    | 'nonsense'
+    | 'splice'
+    | 'nonstart'
+    | 'nonstop'
+    | 'fusion'
+    | 'inframe'
+    | 'other';
+
+export function getSimplifiedMutationType(
+    type: string
+): SimplifiedMutationType {
+    let ret: SimplifiedMutationType;
+    type = typeof type === 'string' ? type.toLowerCase() : '';
     switch (type) {
-        case "missense_mutation":
-        case "missense":
-        case "missense_variant":
-            ret = "missense";
+        case 'missense_mutation':
+        case 'missense':
+        case 'missense_variant':
+            ret = 'missense';
             break;
-        case "frame_shift_ins":
-        case "frame_shift_del":
-        case "frameshift":
-        case "frameshift_deletion":
-        case "frameshift_insertion":
-        case "de_novo_start_outofframe":
-        case "frameshift_variant":
-            ret = "frameshift";
+        case 'frame_shift_ins':
+        case 'frame_shift_del':
+        case 'frameshift':
+        case 'frameshift_deletion':
+        case 'frameshift_insertion':
+        case 'de_novo_start_outofframe':
+        case 'frameshift_variant':
+            ret = 'frameshift';
             break;
-        case "nonsense_mutation":
-        case "nonsense":
-        case "stopgain_snv":
-            ret = "nonsense";
+        case 'nonsense_mutation':
+        case 'nonsense':
+        case 'stopgain_snv':
+            ret = 'nonsense';
             break;
-        case "splice_site":
-        case "splice":
-        case "splice site":
-        case "splicing":
-        case "splice_site_snp":
-        case "splice_site_del":
-        case "splice_site_indel":
-        case "splice_region":
-            ret = "splice";
+        case 'splice_site':
+        case 'splice':
+        case 'splice site':
+        case 'splicing':
+        case 'splice_site_snp':
+        case 'splice_site_del':
+        case 'splice_site_indel':
+        case 'splice_region':
+            ret = 'splice';
             break;
-        case "translation_start_site":
-        case "start_codon_snp":
-        case "start_codon_del":
-            ret = "nonstart";
+        case 'translation_start_site':
+        case 'start_codon_snp':
+        case 'start_codon_del':
+            ret = 'nonstart';
             break;
-        case "nonstop_mutation":
-            ret = "nonstop";
+        case 'nonstop_mutation':
+            ret = 'nonstop';
             break;
-        case "fusion":
-            ret = "fusion";
+        case 'fusion':
+            ret = 'fusion';
             break;
-        case "in_frame_del":
-        case "in_frame_ins":
-        case "in_frame_deletion":
-        case "in_frame_insertion":
-        case "indel":
-        case "nonframeshift_deletion":
-        case "nonframeshift":
-        case "nonframeshift insertion":
-        case "nonframeshift_insertion":
-            ret = "inframe";
+        case 'in_frame_del':
+        case 'in_frame_ins':
+        case 'in_frame_deletion':
+        case 'in_frame_insertion':
+        case 'indel':
+        case 'nonframeshift_deletion':
+        case 'nonframeshift':
+        case 'nonframeshift insertion':
+        case 'nonframeshift_insertion':
+            ret = 'inframe';
             break;
         default:
-            ret = "other";
+            ret = 'other';
             break;
     }
     return ret;
-};
+}
 
 export default class AccessorsForOqlFilter {
-    private molecularProfileIdToMolecularProfile:{[molecularProfileId:string]:MolecularProfile};
-
-    constructor(
-        molecularProfiles: MolecularProfile[]
-    ) {
-        this.molecularProfileIdToMolecularProfile = _.keyBy(molecularProfiles, p=>p.molecularProfileId);
+    private molecularProfileIdToMolecularProfile: {
+        [molecularProfileId: string]: MolecularProfile;
+    };
+
+    constructor(molecularProfiles: MolecularProfile[]) {
+        this.molecularProfileIdToMolecularProfile = _.keyBy(
+            molecularProfiles,
+            p => p.molecularProfileId
+        );
     }
 
     public gene(d: Mutation) {
         return d.gene.hugoGeneSymbol;
     }
 
-    public molecularAlterationType(molecularProfileId:string) {
-        const profile = this.molecularProfileIdToMolecularProfile[molecularProfileId];
+    public molecularAlterationType(molecularProfileId: string) {
+        const profile = this.molecularProfileIdToMolecularProfile[
+            molecularProfileId
+        ];
         return profile && profile.molecularAlterationType;
     }
 
     public cna(d: NumericGeneMolecularData) {
-        if (this.molecularAlterationType(d.molecularProfileId) === 'COPY_NUMBER_ALTERATION') {
+        if (
+            this.molecularAlterationType(d.molecularProfileId) ===
+            'COPY_NUMBER_ALTERATION'
+        ) {
             return cna_profile_data_to_string[d.value];
         } else {
             return null;
@@ -108,11 +130,17 @@ export default class AccessorsForOqlFilter {
     }
 
     public mut_type(d: Mutation) {
-        if (this.molecularAlterationType(d.molecularProfileId) === 'MUTATION_EXTENDED') {
-            if (d.mutationType && d.mutationType.toLowerCase() === "fusion") {
+        if (
+            this.molecularAlterationType(d.molecularProfileId) ===
+            'MUTATION_EXTENDED'
+        ) {
+            if (d.mutationType && d.mutationType.toLowerCase() === 'fusion') {
                 return null;
-            } else if (d.proteinChange && d.proteinChange.toLowerCase() === "promoter") {
-                return "promoter";
+            } else if (
+                d.proteinChange &&
+                d.proteinChange.toLowerCase() === 'promoter'
+            ) {
+                return 'promoter';
             } else {
                 return getSimplifiedMutationType(d.mutationType);
             }
@@ -121,12 +149,15 @@ export default class AccessorsForOqlFilter {
         }
     }
 
-    public mut_status(d:Mutation) {
-        if (this.molecularAlterationType(d.molecularProfileId) === AlterationTypeConstants.MUTATION_EXTENDED) {
+    public mut_status(d: Mutation) {
+        if (
+            this.molecularAlterationType(d.molecularProfileId) ===
+            AlterationTypeConstants.MUTATION_EXTENDED
+        ) {
             if (isNotGermlineMutation(d)) {
-                return "somatic";
+                return 'somatic';
             } else {
-                return "germline";
+                return 'germline';
             }
         } else {
             return null;
@@ -134,7 +165,10 @@ export default class AccessorsForOqlFilter {
     }
 
     public mut_position(d: Mutation) {
-        if (this.molecularAlterationType(d.molecularProfileId) === 'MUTATION_EXTENDED') {
+        if (
+            this.molecularAlterationType(d.molecularProfileId) ===
+            'MUTATION_EXTENDED'
+        ) {
             var start = d.proteinPosStart;
             var end = d.proteinPosEnd;
             if (start !== null && end !== null) {
@@ -148,7 +182,10 @@ export default class AccessorsForOqlFilter {
     }
 
     public mut_amino_acid_change(d: Mutation) {
-        if (this.molecularAlterationType(d.molecularProfileId) === 'MUTATION_EXTENDED') {
+        if (
+            this.molecularAlterationType(d.molecularProfileId) ===
+            'MUTATION_EXTENDED'
+        ) {
             return d.proteinChange;
         } else {
             return null;
@@ -156,7 +193,10 @@ export default class AccessorsForOqlFilter {
     }
 
     public exp(d: NumericGeneMolecularData) {
-        if (this.molecularAlterationType(d.molecularProfileId) === 'MRNA_EXPRESSION') {
+        if (
+            this.molecularAlterationType(d.molecularProfileId) ===
+            'MRNA_EXPRESSION'
+        ) {
             return d.value;
         } else {
             return null;
@@ -164,7 +204,10 @@ export default class AccessorsForOqlFilter {
     }
 
     public prot(d: NumericGeneMolecularData) {
-        if (this.molecularAlterationType(d.molecularProfileId) === 'PROTEIN_LEVEL') {
+        if (
+            this.molecularAlterationType(d.molecularProfileId) ===
+            'PROTEIN_LEVEL'
+        ) {
             return d.value;
         } else {
             return null;
@@ -172,14 +215,22 @@ export default class AccessorsForOqlFilter {
     }
 
     public fusion(d: Mutation) {
-        return (getSimplifiedMutationType(d.mutationType) === "fusion") ? true : null;
+        return getSimplifiedMutationType(d.mutationType) === 'fusion'
+            ? true
+            : null;
     }
 
-    public is_driver(d: AnnotatedMutation|AnnotatedNumericGeneMolecularData) {
-        if (this.molecularAlterationType(d.molecularProfileId) === AlterationTypeConstants.MUTATION_EXTENDED) {
+    public is_driver(d: AnnotatedMutation | AnnotatedNumericGeneMolecularData) {
+        if (
+            this.molecularAlterationType(d.molecularProfileId) ===
+            AlterationTypeConstants.MUTATION_EXTENDED
+        ) {
             // covers mutations and fusions
             return !!(d as AnnotatedMutation).putativeDriver;
-        } else if (this.molecularAlterationType(d.molecularProfileId) === AlterationTypeConstants.COPY_NUMBER_ALTERATION) {
+        } else if (
+            this.molecularAlterationType(d.molecularProfileId) ===
+            AlterationTypeConstants.COPY_NUMBER_ALTERATION
+        ) {
             // covers CNA
             return !!(d as AnnotatedNumericGeneMolecularData).oncoKbOncogenic;
         } else {
diff --git a/src/shared/lib/oql/annotateAlterationTypes.ts b/src/shared/lib/oql/annotateAlterationTypes.ts
index 9126dd11c52..8e70d7c0946 100644
--- a/src/shared/lib/oql/annotateAlterationTypes.ts
+++ b/src/shared/lib/oql/annotateAlterationTypes.ts
@@ -1,28 +1,40 @@
-import AccessorsForOqlFilter from "./AccessorsForOqlFilter";
-import {NumericGeneMolecularData} from "../../api/generated/CBioPortalAPI";
+import AccessorsForOqlFilter from './AccessorsForOqlFilter';
+import { NumericGeneMolecularData } from '../../api/generated/CBioPortalAPI';
 import {
     AlterationTypeConstants,
     AnnotatedMutation,
-    ExtendedAlteration
-} from "../../../pages/resultsView/ResultsViewPageStore";
-import {isMutation} from "../CBioPortalAPIUtils";
+    ExtendedAlteration,
+} from '../../../pages/resultsView/ResultsViewPageStore';
+import { isMutation } from '../CBioPortalAPIUtils';
 
-export function annotateAlterationTypes(datum:(AnnotatedMutation | NumericGeneMolecularData)&Partial<ExtendedAlteration>, accessors:AccessorsForOqlFilter):ExtendedAlteration {
-    const molecularAlterationType = accessors.molecularAlterationType(datum.molecularProfileId);
+export function annotateAlterationTypes(
+    datum: (AnnotatedMutation | NumericGeneMolecularData) &
+        Partial<ExtendedAlteration>,
+    accessors: AccessorsForOqlFilter
+): ExtendedAlteration {
+    const molecularAlterationType = accessors.molecularAlterationType(
+        datum.molecularProfileId
+    );
     switch (molecularAlterationType) {
         case AlterationTypeConstants.MUTATION_EXTENDED:
         case AlterationTypeConstants.FUSION:
             if (accessors.fusion(datum as AnnotatedMutation) !== null) {
                 datum.alterationType = AlterationTypeConstants.FUSION;
-                datum.alterationSubType = "";
+                datum.alterationSubType = '';
             } else {
-                datum.alterationType = AlterationTypeConstants.MUTATION_EXTENDED;
-                datum.alterationSubType = accessors.mut_type(datum as AnnotatedMutation) as any;
+                datum.alterationType =
+                    AlterationTypeConstants.MUTATION_EXTENDED;
+                datum.alterationSubType = accessors.mut_type(
+                    datum as AnnotatedMutation
+                ) as any;
             }
             break;
         case AlterationTypeConstants.COPY_NUMBER_ALTERATION:
-            datum.alterationType = AlterationTypeConstants.COPY_NUMBER_ALTERATION;
-            datum.alterationSubType = accessors.cna(datum as NumericGeneMolecularData);
+            datum.alterationType =
+                AlterationTypeConstants.COPY_NUMBER_ALTERATION;
+            datum.alterationSubType = accessors.cna(
+                datum as NumericGeneMolecularData
+            );
             break;
         case AlterationTypeConstants.MRNA_EXPRESSION:
         case AlterationTypeConstants.PROTEIN_LEVEL:
@@ -30,4 +42,4 @@ export function annotateAlterationTypes(datum:(AnnotatedMutation | NumericGeneMo
             break;
     }
     return datum as ExtendedAlteration;
-};
\ No newline at end of file
+}
diff --git a/src/shared/lib/oql/oql-parser.d.ts b/src/shared/lib/oql/oql-parser.d.ts
index f8701be2c68..323f803eb41 100644
--- a/src/shared/lib/oql/oql-parser.d.ts
+++ b/src/shared/lib/oql/oql-parser.d.ts
@@ -1,15 +1,24 @@
-export declare class SyntaxError
-{
-	constructor(message:string, expected:string, found:string, offset:number, line:number, column:number);
+export declare class SyntaxError {
+    constructor(
+        message: string,
+        expected: string,
+        found: string,
+        offset: number,
+        line: number,
+        column: number
+    );
 
-	message: string;
-	expected: string;
-	found: string;
-	location:{ start: {offset:number, line:number, column:number}, end: { offset:number, line:number, column:number }};
-	name: "SyntaxError";
+    message: string;
+    expected: string;
+    found: string;
+    location: {
+        start: { offset: number; line: number; column: number };
+        end: { offset: number; line: number; column: number };
+    };
+    name: 'SyntaxError';
 }
 
-export declare function parse(str:string):OQLQuery | undefined;
+export declare function parse(str: string): OQLQuery | undefined;
 
 // start
 // 	= Query
@@ -27,7 +36,27 @@ export declare function parse(str:string):OQLQuery | undefined;
 //         / whole_part:NaturalNumber {return whole_part;}
 // String = word:[-_.@/a-zA-Z0-9*]+ { return word.join("") }
 // AminoAcid = letter:[GPAVLIMCFYWHKRQNEDST] { return letter; }
-export declare type AminoAcid = 'G'|'P'|'A'|'V'|'L'|'I'|'M'|'C'|'F'|'Y'|'W'|'H'|'K'|'R'|'Q'|'N'|'E'|'D'|'S'|'T';
+export declare type AminoAcid =
+    | 'G'
+    | 'P'
+    | 'A'
+    | 'V'
+    | 'L'
+    | 'I'
+    | 'M'
+    | 'C'
+    | 'F'
+    | 'Y'
+    | 'W'
+    | 'H'
+    | 'K'
+    | 'R'
+    | 'Q'
+    | 'N'
+    | 'E'
+    | 'D'
+    | 'S'
+    | 'T';
 //
 // sp = space:[ \t\r]+
 // msp = space:[ \t\r]*
@@ -58,8 +87,14 @@ export declare type OQLQuery = (SingleGeneQuery | MergedGeneQuery)[];
 // SingleGeneQuery
 // 	= geneName:String msp ":" msp alts:Alterations { return {"gene": geneName, "alterations": alts}; }
 // 	/ geneName:String { return {"gene": geneName, "alterations":false}; }
-export declare type MergedGeneQuery = {label?: string, list: SingleGeneQuery[]};
-export declare type SingleGeneQuery = {gene:string, alterations:false|Alteration[]};
+export declare type MergedGeneQuery = {
+    label?: string;
+    list: SingleGeneQuery[];
+};
+export declare type SingleGeneQuery = {
+    gene: string;
+    alterations: false | Alteration[];
+};
 //
 // Alterations
 // 	= a1:Alteration sp a2:Alterations { return [a1].concat(a2);}
@@ -72,10 +107,18 @@ export declare type SingleGeneQuery = {gene:string, alterations:false|Alteration
 //         / cmd:FUSIONCommand { return cmd; }
 // // MUT has to go at the end because it matches an arbitrary string at the end as a type of mutation
 // 	/ cmd:MUTCommand { return cmd; }
-export declare type Alteration = AnyTypeWithModifiersCommand | CNACommand | EXPCommand | PROTCommand | FUSIONCommand | MUTCommand<Mutation>;
+export declare type Alteration =
+    | AnyTypeWithModifiersCommand
+    | CNACommand
+    | EXPCommand
+    | PROTCommand
+    | FUSIONCommand
+    | MUTCommand<Mutation>;
 
-
-export declare type AnyTypeWithModifiersCommand = { alteration_type: "any", modifiers:AnyModifier[] };
+export declare type AnyTypeWithModifiersCommand = {
+    alteration_type: 'any';
+    modifiers: AnyModifier[];
+};
 
 //
 // CNAType
@@ -88,29 +131,58 @@ export declare type CNAType = 'AMP' | 'HOMDEL' | 'GAIN' | 'HETLOSS';
 // CNACommand
 // 	= "CNA"i msp op:ComparisonOp msp constrval:CNAType { return {"alteration_type":"cna", "constr_rel":op, "constr_val":constrval}; }
 //         / constrval:CNAType { return {"alteration_type":"cna", "constr_rel":"=", "constr_val":constrval}; }
-export declare type CNACommand = {alteration_type:'cna', constr_rel?:ComparisonOp | '=', constr_val?:CNAType, modifiers:CNAModifier[]};
+export declare type CNACommand = {
+    alteration_type: 'cna';
+    constr_rel?: ComparisonOp | '=';
+    constr_val?: CNAType;
+    modifiers: CNAModifier[];
+};
 //
 // MUTCommand
 // 	= "MUT" msp "=" msp mutation:Mutation { return {"alteration_type":"mut", "constr_rel": "=", "constr_type":mutation.type, "constr_val":mutation.value, "info":mutation.info}; }
 // 	/ "MUT" msp "!=" msp mutation:Mutation { return {"alteration_type":"mut", "constr_rel": "!=", "constr_type":mutation.type, "constr_val":mutation.value, "info":mutation.info}; }
 // 	/ "MUT" { return {"alteration_type":"mut"}; }
 // 	/ mutation:Mutation { return {"alteration_type":"mut", "constr_rel": "=", "constr_type":mutation.type, "constr_val":mutation.value, "info":mutation.info}; }
-export declare type MUTCommand<M extends Mutation> = (
-	{alteration_type:'mut', constr_rel?:undefined, constr_type?:undefined, constr_val?:undefined, info:{}, modifiers:M['modifiers']} |
-	{alteration_type:'mut', constr_rel:'='|'!=', constr_type:M['type'], constr_val:M['value'], info:M['info'], modifiers:M['modifiers']}
-);
+export declare type MUTCommand<M extends Mutation> =
+    | {
+          alteration_type: 'mut';
+          constr_rel?: undefined;
+          constr_type?: undefined;
+          constr_val?: undefined;
+          info: {};
+          modifiers: M['modifiers'];
+      }
+    | {
+          alteration_type: 'mut';
+          constr_rel: '=' | '!=';
+          constr_type: M['type'];
+          constr_val: M['value'];
+          info: M['info'];
+          modifiers: M['modifiers'];
+      };
 //
 // EXPCommand
 // 	= "EXP" msp op:ComparisonOp msp constrval:Number { return {"alteration_type":"exp", "constr_rel":op, "constr_val":parseFloat(constrval)}; }
-export declare type EXPCommand = {alteration_type:'exp', constr_rel:ComparisonOp, constr_val:number};
+export declare type EXPCommand = {
+    alteration_type: 'exp';
+    constr_rel: ComparisonOp;
+    constr_val: number;
+};
 //
 // FUSIONCommand
 //         = "FUSION" { return {"alteration_type":"fusion"}; }
-export declare type FUSIONCommand = {alteration_type:'fusion', modifiers:FusionModifier[]};
+export declare type FUSIONCommand = {
+    alteration_type: 'fusion';
+    modifiers: FusionModifier[];
+};
 //
 // PROTCommand
 // 	= "PROT" msp op:ComparisonOp msp constrval:Number { return {"alteration_type":"prot", "constr_rel":op, "constr_val":parseFloat(constrval)}; }
-export declare type PROTCommand = {alteration_type:'prot', constr_rel:ComparisonOp, constr_val:number};
+export declare type PROTCommand = {
+    alteration_type: 'prot';
+    constr_rel: ComparisonOp;
+    constr_val: number;
+};
 //
 // ComparisonOp
 // 	= ">=" { return ">="; }
@@ -132,9 +204,18 @@ export declare type ComparisonOp = '>=' | '<=' | '>' | '<';
 //         / letter:AminoAcid position:NaturalNumber string:String { return {"type":"name" , "value":(letter+position+string), "info":{}};}
 //         / letter:AminoAcid position:NaturalNumber { return {"type":"position", "value":parseInt(position), "info":{"amino_acid":letter.toUpperCase()}}; }
 // 	/ mutation_name:String { return {"type":"name", "value":mutation_name, "info":{}}; }
-export declare type MutationType = 'MISSENSE'|'NONSENSE'|'NONSTART'|'NONSTOP'|'FRAMESHIFT'|'INFRAME'|'SPLICE'|'TRUNC'|'PROMOTER';
+export declare type MutationType =
+    | 'MISSENSE'
+    | 'NONSENSE'
+    | 'NONSTART'
+    | 'NONSTOP'
+    | 'FRAMESHIFT'
+    | 'INFRAME'
+    | 'SPLICE'
+    | 'TRUNC'
+    | 'PROMOTER';
 
-export declare type MutationModifier = 'GERMLINE'|'SOMATIC'|DriverModifier;
+export declare type MutationModifier = 'GERMLINE' | 'SOMATIC' | DriverModifier;
 
 export declare type CNAModifier = DriverModifier;
 
@@ -144,8 +225,22 @@ export declare type AnyModifier = DriverModifier;
 
 export declare type DriverModifier = 'DRIVER';
 
-export declare type Mutation = (
-	{type:'class', value:MutationType, info:{}, modifiers:MutationModifier[]} |
-	{type:'name', value:string, info:{unrecognized?:boolean}, modifiers:MutationModifier[]} |
-	{type:'position', value:number, info:{amino_acid:AminoAcid}, modifiers:MutationModifier[]}
-);
+export declare type Mutation =
+    | {
+          type: 'class';
+          value: MutationType;
+          info: {};
+          modifiers: MutationModifier[];
+      }
+    | {
+          type: 'name';
+          value: string;
+          info: { unrecognized?: boolean };
+          modifiers: MutationModifier[];
+      }
+    | {
+          type: 'position';
+          value: number;
+          info: { amino_acid: AminoAcid };
+          modifiers: MutationModifier[];
+      };
diff --git a/src/shared/lib/oql/oql-parser.js b/src/shared/lib/oql/oql-parser.js
index b8047d775a0..7c55c5bece1 100644
--- a/src/shared/lib/oql/oql-parser.js
+++ b/src/shared/lib/oql/oql-parser.js
@@ -4,2561 +4,3031 @@
  * http://pegjs.org/
  */
 
-"use strict";
+'use strict';
 
 function peg$subclass(child, parent) {
-  function ctor() { this.constructor = child; }
-  ctor.prototype = parent.prototype;
-  child.prototype = new ctor();
+    function ctor() {
+        this.constructor = child;
+    }
+    ctor.prototype = parent.prototype;
+    child.prototype = new ctor();
 }
 
 function peg$SyntaxError(message, expected, found, location) {
-  this.message  = message;
-  this.expected = expected;
-  this.found    = found;
-  this.location = location;
-  this.name     = "SyntaxError";
-
-  if (typeof Error.captureStackTrace === "function") {
-    Error.captureStackTrace(this, peg$SyntaxError);
-  }
+    this.message = message;
+    this.expected = expected;
+    this.found = found;
+    this.location = location;
+    this.name = 'SyntaxError';
+
+    if (typeof Error.captureStackTrace === 'function') {
+        Error.captureStackTrace(this, peg$SyntaxError);
+    }
 }
 
 peg$subclass(peg$SyntaxError, Error);
 
 peg$SyntaxError.buildMessage = function(expected, found) {
-  var DESCRIBE_EXPECTATION_FNS = {
+    var DESCRIBE_EXPECTATION_FNS = {
         literal: function(expectation) {
-          return "\"" + literalEscape(expectation.text) + "\"";
+            return '"' + literalEscape(expectation.text) + '"';
         },
 
-        "class": function(expectation) {
-          var escapedParts = "",
-              i;
-
-          for (i = 0; i < expectation.parts.length; i++) {
-            escapedParts += expectation.parts[i] instanceof Array
-              ? classEscape(expectation.parts[i][0]) + "-" + classEscape(expectation.parts[i][1])
-              : classEscape(expectation.parts[i]);
-          }
+        class: function(expectation) {
+            var escapedParts = '',
+                i;
+
+            for (i = 0; i < expectation.parts.length; i++) {
+                escapedParts +=
+                    expectation.parts[i] instanceof Array
+                        ? classEscape(expectation.parts[i][0]) +
+                          '-' +
+                          classEscape(expectation.parts[i][1])
+                        : classEscape(expectation.parts[i]);
+            }
 
-          return "[" + (expectation.inverted ? "^" : "") + escapedParts + "]";
+            return '[' + (expectation.inverted ? '^' : '') + escapedParts + ']';
         },
 
         any: function(expectation) {
-          return "any character";
+            return 'any character';
         },
 
         end: function(expectation) {
-          return "end of input";
+            return 'end of input';
         },
 
         other: function(expectation) {
-          return expectation.description;
-        }
-      };
-
-  function hex(ch) {
-    return ch.charCodeAt(0).toString(16).toUpperCase();
-  }
-
-  function literalEscape(s) {
-    return s
-      .replace(/\\/g, '\\\\')
-      .replace(/"/g,  '\\"')
-      .replace(/\0/g, '\\0')
-      .replace(/\t/g, '\\t')
-      .replace(/\n/g, '\\n')
-      .replace(/\r/g, '\\r')
-      .replace(/[\x00-\x0F]/g,          function(ch) { return '\\x0' + hex(ch); })
-      .replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return '\\x'  + hex(ch); });
-  }
-
-  function classEscape(s) {
-    return s
-      .replace(/\\/g, '\\\\')
-      .replace(/\]/g, '\\]')
-      .replace(/\^/g, '\\^')
-      .replace(/-/g,  '\\-')
-      .replace(/\0/g, '\\0')
-      .replace(/\t/g, '\\t')
-      .replace(/\n/g, '\\n')
-      .replace(/\r/g, '\\r')
-      .replace(/[\x00-\x0F]/g,          function(ch) { return '\\x0' + hex(ch); })
-      .replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return '\\x'  + hex(ch); });
-  }
-
-  function describeExpectation(expectation) {
-    return DESCRIBE_EXPECTATION_FNS[expectation.type](expectation);
-  }
-
-  function describeExpected(expected) {
-    var descriptions = new Array(expected.length),
-        i, j;
-
-    for (i = 0; i < expected.length; i++) {
-      descriptions[i] = describeExpectation(expected[i]);
-    }
-
-    descriptions.sort();
-
-    if (descriptions.length > 0) {
-      for (i = 1, j = 1; i < descriptions.length; i++) {
-        if (descriptions[i - 1] !== descriptions[i]) {
-          descriptions[j] = descriptions[i];
-          j++;
-        }
-      }
-      descriptions.length = j;
-    }
-
-    switch (descriptions.length) {
-      case 1:
-        return descriptions[0];
-
-      case 2:
-        return descriptions[0] + " or " + descriptions[1];
-
-      default:
-        return descriptions.slice(0, -1).join(", ")
-          + ", or "
-          + descriptions[descriptions.length - 1];
-    }
-  }
-
-  function describeFound(found) {
-    return found ? "\"" + literalEscape(found) + "\"" : "end of input";
-  }
-
-  return "Expected " + describeExpected(expected) + " but " + describeFound(found) + " found.";
-};
-
-function peg$parse(input, options) {
-  options = options !== void 0 ? options : {};
-
-  var peg$FAILED = {},
-
-      peg$startRuleFunctions = { start: peg$parsestart },
-      peg$startRuleFunction  = peg$parsestart,
-
-      peg$c0 = function() { return false; },
-      peg$c1 = /^[0-9]/,
-      peg$c2 = peg$classExpectation([["0", "9"]], false, false),
-      peg$c3 = function(number) { return number.join("");},
-      peg$c4 = "-",
-      peg$c5 = peg$literalExpectation("-", false),
-      peg$c6 = function(number) { return "-"+number;},
-      peg$c7 = ".",
-      peg$c8 = peg$literalExpectation(".", false),
-      peg$c9 = function(whole_part, decimal_part) { return whole_part + "." + decimal_part;},
-      peg$c10 = function(decimal_part) { return "."+decimal_part;},
-      peg$c11 = function(whole_part) {return whole_part;},
-      peg$c12 = /^[\-_.@\/a-zA-Z0-9*]/,
-      peg$c13 = peg$classExpectation(["-", "_", ".", "@", "/", ["a", "z"], ["A", "Z"], ["0", "9"], "*"], false, false),
-      peg$c14 = function(word) { return word.join("") },
-      peg$c15 = /^[\-_.\/a-zA-Z0-9*]/,
-      peg$c16 = peg$classExpectation(["-", "_", ".", "/", ["a", "z"], ["A", "Z"], ["0", "9"], "*"], false, false),
-      peg$c17 = function(char) { return char; },
-      peg$c18 = /^[GPAVLIMCFYWHKRQNEDST]/,
-      peg$c19 = peg$classExpectation(["G", "P", "A", "V", "L", "I", "M", "C", "F", "Y", "W", "H", "K", "R", "Q", "N", "E", "D", "S", "T"], false, false),
-      peg$c20 = function(letter) { return letter; },
-      peg$c21 = /^[^"]/,
-      peg$c22 = peg$classExpectation(["\""], true, false),
-      peg$c23 = function(stringExceptQuotes) { return stringExceptQuotes.join("") },
-      peg$c24 = /^[ \t\r]/,
-      peg$c25 = peg$classExpectation([" ", "\t", "\r"], false, false),
-      peg$c26 = /^[,; \t\r\n]/,
-      peg$c27 = peg$classExpectation([",", ";", " ", "\t", "\r", "\n"], false, false),
-      peg$c28 = "[",
-      peg$c29 = peg$literalExpectation("[", false),
-      peg$c30 = "\"",
-      peg$c31 = peg$literalExpectation("\"", false),
-      peg$c32 = function(label) {return {"label": label, "list":[]};},
-      peg$c33 = function() {return {"label": undefined, "list":[]};},
-      peg$c34 = "amp",
-      peg$c35 = peg$literalExpectation("AMP", true),
-      peg$c36 = "homdel",
-      peg$c37 = peg$literalExpectation("HOMDEL", true),
-      peg$c38 = "gain",
-      peg$c39 = peg$literalExpectation("GAIN", true),
-      peg$c40 = "hetloss",
-      peg$c41 = peg$literalExpectation("HETLOSS", true),
-      peg$c42 = "mut",
-      peg$c43 = peg$literalExpectation("MUT", true),
-      peg$c44 = "exp",
-      peg$c45 = peg$literalExpectation("EXP", true),
-      peg$c46 = "prot",
-      peg$c47 = peg$literalExpectation("PROT", true),
-      peg$c48 = function(mqr, sqr) {return mqr.concat(sqr);},
-      peg$c49 = function(qr, sqr) {return qr.concat(sqr);},
-      peg$c50 = function(mqr) {return mqr;},
-      peg$c51 = function(qr) {return qr; },
-      peg$c52 = "]",
-      peg$c53 = peg$literalExpectation("]", false),
-      peg$c54 = function(mergedGenes, qr, mqr) { mergedGenes.list = qr; return [mergedGenes].concat(mqr);; },
-      peg$c55 = function(mergedGenes, qr) { mergedGenes.list = qr; return [mergedGenes]; },
-      peg$c56 = function(first, rest) { return [first].concat(rest); },
-      peg$c57 = function(first) { return [first]; },
-      peg$c58 = ":",
-      peg$c59 = peg$literalExpectation(":", false),
-      peg$c60 = function(geneName, alts) { return {"gene": geneName, "alterations": alts}; },
-      peg$c61 = function(geneName) { return {"gene": geneName, "alterations":false}; },
-      peg$c62 = function(a1, a2) { return [a1].concat(a2);},
-      peg$c63 = function(a1) { return [a1]; },
-      peg$c64 = function(cmd) { return cmd; },
-      peg$c65 = "_",
-      peg$c66 = peg$literalExpectation("_", false),
-      peg$c67 = function(d) { return {"alteration_type":"any", modifiers:[d]}; },
-      peg$c68 = function() { return "AMP"; },
-      peg$c69 = function() { return "HOMDEL"; },
-      peg$c70 = function() { return "GAIN"; },
-      peg$c71 = function() { return "HETLOSS"; },
-      peg$c72 = "cna",
-      peg$c73 = peg$literalExpectation("CNA", true),
-      peg$c74 = function(op, constrval) { return {"alteration_type":"cna", "constr_rel":op, "constr_val":constrval, modifiers:[]}; },
-      peg$c75 = "CNA_",
-      peg$c76 = peg$literalExpectation("CNA_", false),
-      peg$c77 = function(mod) { return {"alteration_type":"cna", modifiers:[mod]}; },
-      peg$c78 = function(constrval, mod) { return {"alteration_type":"cna", "constr_rel":"=", "constr_val":constrval, modifiers:[mod]}; },
-      peg$c79 = "_CNA",
-      peg$c80 = peg$literalExpectation("_CNA", false),
-      peg$c81 = function(mod, constrval) { return {"alteration_type":"cna", "constr_rel":"=", "constr_val":constrval, modifiers:[mod]}; },
-      peg$c82 = function(constrval) { return {"alteration_type":"cna", "constr_rel":"=", "constr_val":constrval, modifiers:[]}; },
-      peg$c83 = "MUT",
-      peg$c84 = peg$literalExpectation("MUT", false),
-      peg$c85 = "=",
-      peg$c86 = peg$literalExpectation("=", false),
-      peg$c87 = function(mutation) { return {"alteration_type":"mut", "constr_rel": "=", "constr_type":mutation.type, "constr_val":mutation.value, "info":mutation.info, modifiers: mutation.modifiers}; },
-      peg$c88 = "!=",
-      peg$c89 = peg$literalExpectation("!=", false),
-      peg$c90 = function(mutation) { return {"alteration_type":"mut", "constr_rel": "!=", "constr_type":mutation.type, "constr_val":mutation.value, "info":mutation.info, modifiers: mutation.modifiers}; },
-      peg$c91 = function(mutation) {
-      	        if (mutation.type) {
-      	            return {"alteration_type":"mut", "constr_rel": "=", "constr_type":mutation.type, "constr_val":mutation.value, "info":mutation.info, modifiers: mutation.modifiers};
-                  } else {
-                      return {"alteration_type":"mut", "info":{}, "modifiers": mutation.modifiers};
-                  }
-              },
-      peg$c92 = "EXP",
-      peg$c93 = peg$literalExpectation("EXP", false),
-      peg$c94 = function(op, constrval) { return {"alteration_type":"exp", "constr_rel":op, "constr_val":parseFloat(constrval)}; },
-      peg$c95 = "fusion",
-      peg$c96 = peg$literalExpectation("FUSION", true),
-      peg$c97 = function(mod) { return {"alteration_type":"fusion", modifiers: [mod] }; },
-      peg$c98 = "_fusion",
-      peg$c99 = peg$literalExpectation("_FUSION", true),
-      peg$c100 = function() { return {"alteration_type":"fusion", modifiers:[]}; },
-      peg$c101 = "PROT",
-      peg$c102 = peg$literalExpectation("PROT", false),
-      peg$c103 = function(op, constrval) { return {"alteration_type":"prot", "constr_rel":op, "constr_val":parseFloat(constrval)}; },
-      peg$c104 = ">=",
-      peg$c105 = peg$literalExpectation(">=", false),
-      peg$c106 = function() { return ">="; },
-      peg$c107 = "<=",
-      peg$c108 = peg$literalExpectation("<=", false),
-      peg$c109 = function() { return "<="; },
-      peg$c110 = ">",
-      peg$c111 = peg$literalExpectation(">", false),
-      peg$c112 = function() { return ">"; },
-      peg$c113 = "<",
-      peg$c114 = peg$literalExpectation("<", false),
-      peg$c115 = function() { return "<"; },
-      peg$c116 = function(modifier, mutationWithModifiers) { mutationWithModifiers.modifiers.unshift(modifier); return mutationWithModifiers; },
-      peg$c117 = function(mutation, modifiers) { mutation.modifiers = modifiers; return mutation; },
-      peg$c118 = function(modifier) { return { info: {}, modifiers: [modifier] }; },
-      peg$c119 = function(mutation) { mutation.modifiers = []; return mutation; },
-      peg$c120 = function(modifier, more) { return [modifier].concat(more); },
-      peg$c121 = function(modifier) { return [modifier]; },
-      peg$c122 = function() { return {"info":{}}; },
-      peg$c123 = "missense",
-      peg$c124 = peg$literalExpectation("MISSENSE", true),
-      peg$c125 = function() { return {"type":"class", "value":"MISSENSE", "info":{}}; },
-      peg$c126 = "nonsense",
-      peg$c127 = peg$literalExpectation("NONSENSE", true),
-      peg$c128 = function() { return {"type":"class", "value":"NONSENSE", "info":{}}; },
-      peg$c129 = "nonstart",
-      peg$c130 = peg$literalExpectation("NONSTART", true),
-      peg$c131 = function() { return {"type":"class", "value":"NONSTART", "info":{}}; },
-      peg$c132 = "nonstop",
-      peg$c133 = peg$literalExpectation("NONSTOP", true),
-      peg$c134 = function() { return {"type":"class", "value":"NONSTOP", "info":{}}; },
-      peg$c135 = "frameshift",
-      peg$c136 = peg$literalExpectation("FRAMESHIFT", true),
-      peg$c137 = function() { return {"type":"class", "value":"FRAMESHIFT", "info":{}}; },
-      peg$c138 = "inframe",
-      peg$c139 = peg$literalExpectation("INFRAME", true),
-      peg$c140 = function() { return {"type":"class", "value":"INFRAME", "info":{}}; },
-      peg$c141 = "splice",
-      peg$c142 = peg$literalExpectation("SPLICE", true),
-      peg$c143 = function() { return {"type":"class", "value":"SPLICE", "info":{}}; },
-      peg$c144 = "trunc",
-      peg$c145 = peg$literalExpectation("TRUNC", true),
-      peg$c146 = function() { return {"type":"class", "value":"TRUNC", "info":{}}; },
-      peg$c147 = "promoter",
-      peg$c148 = peg$literalExpectation("PROMOTER", true),
-      peg$c149 = function() { return {"type":"class", "value":"PROMOTER", "info":{}}; },
-      peg$c150 = function(letter, position, string) { return {"type":"name" , "value":(letter+position+string), "info":{}};},
-      peg$c151 = function(letter, position) { return {"type":"position", "value":parseInt(position), "info":{"amino_acid":letter.toUpperCase()}}; },
-      peg$c152 = function(mutation_name) { return {"type":"name", "value":mutation_name, "info":{"unrecognized":true}}; },
-      peg$c153 = function(firstChar, rest) { return firstChar + rest; },
-      peg$c154 = function(lastChar) { return lastChar; },
-      peg$c155 = function(mod) { return mod; },
-      peg$c156 = "germline",
-      peg$c157 = peg$literalExpectation("GERMLINE", true),
-      peg$c158 = function() { return "GERMLINE";},
-      peg$c159 = "somatic",
-      peg$c160 = peg$literalExpectation("SOMATIC", true),
-      peg$c161 = function() { return "SOMATIC";},
-      peg$c162 = function(d) { return d; },
-      peg$c163 = "driver",
-      peg$c164 = peg$literalExpectation("DRIVER", true),
-      peg$c165 = function() { return "DRIVER";},
-
-      peg$currPos          = 0,
-      peg$savedPos         = 0,
-      peg$posDetailsCache  = [{ line: 1, column: 1 }],
-      peg$maxFailPos       = 0,
-      peg$maxFailExpected  = [],
-      peg$silentFails      = 0,
-
-      peg$result;
-
-  if ("startRule" in options) {
-    if (!(options.startRule in peg$startRuleFunctions)) {
-      throw new Error("Can't start parsing from rule \"" + options.startRule + "\".");
-    }
-
-    peg$startRuleFunction = peg$startRuleFunctions[options.startRule];
-  }
-
-  function text() {
-    return input.substring(peg$savedPos, peg$currPos);
-  }
-
-  function location() {
-    return peg$computeLocation(peg$savedPos, peg$currPos);
-  }
-
-  function expected(description, location) {
-    location = location !== void 0 ? location : peg$computeLocation(peg$savedPos, peg$currPos)
-
-    throw peg$buildStructuredError(
-      [peg$otherExpectation(description)],
-      input.substring(peg$savedPos, peg$currPos),
-      location
-    );
-  }
-
-  function error(message, location) {
-    location = location !== void 0 ? location : peg$computeLocation(peg$savedPos, peg$currPos)
-
-    throw peg$buildSimpleError(message, location);
-  }
-
-  function peg$literalExpectation(text, ignoreCase) {
-    return { type: "literal", text: text, ignoreCase: ignoreCase };
-  }
+            return expectation.description;
+        },
+    };
 
-  function peg$classExpectation(parts, inverted, ignoreCase) {
-    return { type: "class", parts: parts, inverted: inverted, ignoreCase: ignoreCase };
-  }
+    function hex(ch) {
+        return ch
+            .charCodeAt(0)
+            .toString(16)
+            .toUpperCase();
+    }
+
+    function literalEscape(s) {
+        return s
+            .replace(/\\/g, '\\\\')
+            .replace(/"/g, '\\"')
+            .replace(/\0/g, '\\0')
+            .replace(/\t/g, '\\t')
+            .replace(/\n/g, '\\n')
+            .replace(/\r/g, '\\r')
+            .replace(/[\x00-\x0F]/g, function(ch) {
+                return '\\x0' + hex(ch);
+            })
+            .replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) {
+                return '\\x' + hex(ch);
+            });
+    }
+
+    function classEscape(s) {
+        return s
+            .replace(/\\/g, '\\\\')
+            .replace(/\]/g, '\\]')
+            .replace(/\^/g, '\\^')
+            .replace(/-/g, '\\-')
+            .replace(/\0/g, '\\0')
+            .replace(/\t/g, '\\t')
+            .replace(/\n/g, '\\n')
+            .replace(/\r/g, '\\r')
+            .replace(/[\x00-\x0F]/g, function(ch) {
+                return '\\x0' + hex(ch);
+            })
+            .replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) {
+                return '\\x' + hex(ch);
+            });
+    }
+
+    function describeExpectation(expectation) {
+        return DESCRIBE_EXPECTATION_FNS[expectation.type](expectation);
+    }
+
+    function describeExpected(expected) {
+        var descriptions = new Array(expected.length),
+            i,
+            j;
+
+        for (i = 0; i < expected.length; i++) {
+            descriptions[i] = describeExpectation(expected[i]);
+        }
 
-  function peg$anyExpectation() {
-    return { type: "any" };
-  }
+        descriptions.sort();
 
-  function peg$endExpectation() {
-    return { type: "end" };
-  }
+        if (descriptions.length > 0) {
+            for (i = 1, j = 1; i < descriptions.length; i++) {
+                if (descriptions[i - 1] !== descriptions[i]) {
+                    descriptions[j] = descriptions[i];
+                    j++;
+                }
+            }
+            descriptions.length = j;
+        }
 
-  function peg$otherExpectation(description) {
-    return { type: "other", description: description };
-  }
+        switch (descriptions.length) {
+            case 1:
+                return descriptions[0];
 
-  function peg$computePosDetails(pos) {
-    var details = peg$posDetailsCache[pos], p;
+            case 2:
+                return descriptions[0] + ' or ' + descriptions[1];
 
-    if (details) {
-      return details;
-    } else {
-      p = pos - 1;
-      while (!peg$posDetailsCache[p]) {
-        p--;
-      }
-
-      details = peg$posDetailsCache[p];
-      details = {
-        line:   details.line,
-        column: details.column
-      };
-
-      while (p < pos) {
-        if (input.charCodeAt(p) === 10) {
-          details.line++;
-          details.column = 1;
-        } else {
-          details.column++;
+            default:
+                return (
+                    descriptions.slice(0, -1).join(', ') +
+                    ', or ' +
+                    descriptions[descriptions.length - 1]
+                );
         }
-
-        p++;
-      }
-
-      peg$posDetailsCache[pos] = details;
-      return details;
     }
-  }
-
-  function peg$computeLocation(startPos, endPos) {
-    var startPosDetails = peg$computePosDetails(startPos),
-        endPosDetails   = peg$computePosDetails(endPos);
-
-    return {
-      start: {
-        offset: startPos,
-        line:   startPosDetails.line,
-        column: startPosDetails.column
-      },
-      end: {
-        offset: endPos,
-        line:   endPosDetails.line,
-        column: endPosDetails.column
-      }
-    };
-  }
-
-  function peg$fail(expected) {
-    if (peg$currPos < peg$maxFailPos) { return; }
 
-    if (peg$currPos > peg$maxFailPos) {
-      peg$maxFailPos = peg$currPos;
-      peg$maxFailExpected = [];
+    function describeFound(found) {
+        return found ? '"' + literalEscape(found) + '"' : 'end of input';
     }
 
-    peg$maxFailExpected.push(expected);
-  }
-
-  function peg$buildSimpleError(message, location) {
-    return new peg$SyntaxError(message, null, null, location);
-  }
-
-  function peg$buildStructuredError(expected, found, location) {
-    return new peg$SyntaxError(
-      peg$SyntaxError.buildMessage(expected, found),
-      expected,
-      found,
-      location
+    return (
+        'Expected ' +
+        describeExpected(expected) +
+        ' but ' +
+        describeFound(found) +
+        ' found.'
     );
-  }
-
-  function peg$parsestart() {
-    var s0, s1;
-
-    s0 = peg$parseQuery();
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = peg$parsesp();
-      if (s1 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s1 = peg$c0();
-      }
-      s0 = s1;
-    }
-
-    return s0;
-  }
+};
 
-  function peg$parseNaturalNumber() {
-    var s0, s1, s2;
+function peg$parse(input, options) {
+    options = options !== void 0 ? options : {};
 
-    s0 = peg$currPos;
-    s1 = [];
-    if (peg$c1.test(input.charAt(peg$currPos))) {
-      s2 = input.charAt(peg$currPos);
-      peg$currPos++;
-    } else {
-      s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c2); }
-    }
-    if (s2 !== peg$FAILED) {
-      while (s2 !== peg$FAILED) {
-        s1.push(s2);
-        if (peg$c1.test(input.charAt(peg$currPos))) {
-          s2 = input.charAt(peg$currPos);
-          peg$currPos++;
-        } else {
-          s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c2); }
+    var peg$FAILED = {},
+        peg$startRuleFunctions = { start: peg$parsestart },
+        peg$startRuleFunction = peg$parsestart,
+        peg$c0 = function() {
+            return false;
+        },
+        peg$c1 = /^[0-9]/,
+        peg$c2 = peg$classExpectation([['0', '9']], false, false),
+        peg$c3 = function(number) {
+            return number.join('');
+        },
+        peg$c4 = '-',
+        peg$c5 = peg$literalExpectation('-', false),
+        peg$c6 = function(number) {
+            return '-' + number;
+        },
+        peg$c7 = '.',
+        peg$c8 = peg$literalExpectation('.', false),
+        peg$c9 = function(whole_part, decimal_part) {
+            return whole_part + '.' + decimal_part;
+        },
+        peg$c10 = function(decimal_part) {
+            return '.' + decimal_part;
+        },
+        peg$c11 = function(whole_part) {
+            return whole_part;
+        },
+        peg$c12 = /^[\-_.@\/a-zA-Z0-9*]/,
+        peg$c13 = peg$classExpectation(
+            ['-', '_', '.', '@', '/', ['a', 'z'], ['A', 'Z'], ['0', '9'], '*'],
+            false,
+            false
+        ),
+        peg$c14 = function(word) {
+            return word.join('');
+        },
+        peg$c15 = /^[\-_.\/a-zA-Z0-9*]/,
+        peg$c16 = peg$classExpectation(
+            ['-', '_', '.', '/', ['a', 'z'], ['A', 'Z'], ['0', '9'], '*'],
+            false,
+            false
+        ),
+        peg$c17 = function(char) {
+            return char;
+        },
+        peg$c18 = /^[GPAVLIMCFYWHKRQNEDST]/,
+        peg$c19 = peg$classExpectation(
+            [
+                'G',
+                'P',
+                'A',
+                'V',
+                'L',
+                'I',
+                'M',
+                'C',
+                'F',
+                'Y',
+                'W',
+                'H',
+                'K',
+                'R',
+                'Q',
+                'N',
+                'E',
+                'D',
+                'S',
+                'T',
+            ],
+            false,
+            false
+        ),
+        peg$c20 = function(letter) {
+            return letter;
+        },
+        peg$c21 = /^[^"]/,
+        peg$c22 = peg$classExpectation(['"'], true, false),
+        peg$c23 = function(stringExceptQuotes) {
+            return stringExceptQuotes.join('');
+        },
+        peg$c24 = /^[ \t\r]/,
+        peg$c25 = peg$classExpectation([' ', '\t', '\r'], false, false),
+        peg$c26 = /^[,; \t\r\n]/,
+        peg$c27 = peg$classExpectation(
+            [',', ';', ' ', '\t', '\r', '\n'],
+            false,
+            false
+        ),
+        peg$c28 = '[',
+        peg$c29 = peg$literalExpectation('[', false),
+        peg$c30 = '"',
+        peg$c31 = peg$literalExpectation('"', false),
+        peg$c32 = function(label) {
+            return { label: label, list: [] };
+        },
+        peg$c33 = function() {
+            return { label: undefined, list: [] };
+        },
+        peg$c34 = 'amp',
+        peg$c35 = peg$literalExpectation('AMP', true),
+        peg$c36 = 'homdel',
+        peg$c37 = peg$literalExpectation('HOMDEL', true),
+        peg$c38 = 'gain',
+        peg$c39 = peg$literalExpectation('GAIN', true),
+        peg$c40 = 'hetloss',
+        peg$c41 = peg$literalExpectation('HETLOSS', true),
+        peg$c42 = 'mut',
+        peg$c43 = peg$literalExpectation('MUT', true),
+        peg$c44 = 'exp',
+        peg$c45 = peg$literalExpectation('EXP', true),
+        peg$c46 = 'prot',
+        peg$c47 = peg$literalExpectation('PROT', true),
+        peg$c48 = function(mqr, sqr) {
+            return mqr.concat(sqr);
+        },
+        peg$c49 = function(qr, sqr) {
+            return qr.concat(sqr);
+        },
+        peg$c50 = function(mqr) {
+            return mqr;
+        },
+        peg$c51 = function(qr) {
+            return qr;
+        },
+        peg$c52 = ']',
+        peg$c53 = peg$literalExpectation(']', false),
+        peg$c54 = function(mergedGenes, qr, mqr) {
+            mergedGenes.list = qr;
+            return [mergedGenes].concat(mqr);
+        },
+        peg$c55 = function(mergedGenes, qr) {
+            mergedGenes.list = qr;
+            return [mergedGenes];
+        },
+        peg$c56 = function(first, rest) {
+            return [first].concat(rest);
+        },
+        peg$c57 = function(first) {
+            return [first];
+        },
+        peg$c58 = ':',
+        peg$c59 = peg$literalExpectation(':', false),
+        peg$c60 = function(geneName, alts) {
+            return { gene: geneName, alterations: alts };
+        },
+        peg$c61 = function(geneName) {
+            return { gene: geneName, alterations: false };
+        },
+        peg$c62 = function(a1, a2) {
+            return [a1].concat(a2);
+        },
+        peg$c63 = function(a1) {
+            return [a1];
+        },
+        peg$c64 = function(cmd) {
+            return cmd;
+        },
+        peg$c65 = '_',
+        peg$c66 = peg$literalExpectation('_', false),
+        peg$c67 = function(d) {
+            return { alteration_type: 'any', modifiers: [d] };
+        },
+        peg$c68 = function() {
+            return 'AMP';
+        },
+        peg$c69 = function() {
+            return 'HOMDEL';
+        },
+        peg$c70 = function() {
+            return 'GAIN';
+        },
+        peg$c71 = function() {
+            return 'HETLOSS';
+        },
+        peg$c72 = 'cna',
+        peg$c73 = peg$literalExpectation('CNA', true),
+        peg$c74 = function(op, constrval) {
+            return {
+                alteration_type: 'cna',
+                constr_rel: op,
+                constr_val: constrval,
+                modifiers: [],
+            };
+        },
+        peg$c75 = 'CNA_',
+        peg$c76 = peg$literalExpectation('CNA_', false),
+        peg$c77 = function(mod) {
+            return { alteration_type: 'cna', modifiers: [mod] };
+        },
+        peg$c78 = function(constrval, mod) {
+            return {
+                alteration_type: 'cna',
+                constr_rel: '=',
+                constr_val: constrval,
+                modifiers: [mod],
+            };
+        },
+        peg$c79 = '_CNA',
+        peg$c80 = peg$literalExpectation('_CNA', false),
+        peg$c81 = function(mod, constrval) {
+            return {
+                alteration_type: 'cna',
+                constr_rel: '=',
+                constr_val: constrval,
+                modifiers: [mod],
+            };
+        },
+        peg$c82 = function(constrval) {
+            return {
+                alteration_type: 'cna',
+                constr_rel: '=',
+                constr_val: constrval,
+                modifiers: [],
+            };
+        },
+        peg$c83 = 'MUT',
+        peg$c84 = peg$literalExpectation('MUT', false),
+        peg$c85 = '=',
+        peg$c86 = peg$literalExpectation('=', false),
+        peg$c87 = function(mutation) {
+            return {
+                alteration_type: 'mut',
+                constr_rel: '=',
+                constr_type: mutation.type,
+                constr_val: mutation.value,
+                info: mutation.info,
+                modifiers: mutation.modifiers,
+            };
+        },
+        peg$c88 = '!=',
+        peg$c89 = peg$literalExpectation('!=', false),
+        peg$c90 = function(mutation) {
+            return {
+                alteration_type: 'mut',
+                constr_rel: '!=',
+                constr_type: mutation.type,
+                constr_val: mutation.value,
+                info: mutation.info,
+                modifiers: mutation.modifiers,
+            };
+        },
+        peg$c91 = function(mutation) {
+            if (mutation.type) {
+                return {
+                    alteration_type: 'mut',
+                    constr_rel: '=',
+                    constr_type: mutation.type,
+                    constr_val: mutation.value,
+                    info: mutation.info,
+                    modifiers: mutation.modifiers,
+                };
+            } else {
+                return {
+                    alteration_type: 'mut',
+                    info: {},
+                    modifiers: mutation.modifiers,
+                };
+            }
+        },
+        peg$c92 = 'EXP',
+        peg$c93 = peg$literalExpectation('EXP', false),
+        peg$c94 = function(op, constrval) {
+            return {
+                alteration_type: 'exp',
+                constr_rel: op,
+                constr_val: parseFloat(constrval),
+            };
+        },
+        peg$c95 = 'fusion',
+        peg$c96 = peg$literalExpectation('FUSION', true),
+        peg$c97 = function(mod) {
+            return { alteration_type: 'fusion', modifiers: [mod] };
+        },
+        peg$c98 = '_fusion',
+        peg$c99 = peg$literalExpectation('_FUSION', true),
+        peg$c100 = function() {
+            return { alteration_type: 'fusion', modifiers: [] };
+        },
+        peg$c101 = 'PROT',
+        peg$c102 = peg$literalExpectation('PROT', false),
+        peg$c103 = function(op, constrval) {
+            return {
+                alteration_type: 'prot',
+                constr_rel: op,
+                constr_val: parseFloat(constrval),
+            };
+        },
+        peg$c104 = '>=',
+        peg$c105 = peg$literalExpectation('>=', false),
+        peg$c106 = function() {
+            return '>=';
+        },
+        peg$c107 = '<=',
+        peg$c108 = peg$literalExpectation('<=', false),
+        peg$c109 = function() {
+            return '<=';
+        },
+        peg$c110 = '>',
+        peg$c111 = peg$literalExpectation('>', false),
+        peg$c112 = function() {
+            return '>';
+        },
+        peg$c113 = '<',
+        peg$c114 = peg$literalExpectation('<', false),
+        peg$c115 = function() {
+            return '<';
+        },
+        peg$c116 = function(modifier, mutationWithModifiers) {
+            mutationWithModifiers.modifiers.unshift(modifier);
+            return mutationWithModifiers;
+        },
+        peg$c117 = function(mutation, modifiers) {
+            mutation.modifiers = modifiers;
+            return mutation;
+        },
+        peg$c118 = function(modifier) {
+            return { info: {}, modifiers: [modifier] };
+        },
+        peg$c119 = function(mutation) {
+            mutation.modifiers = [];
+            return mutation;
+        },
+        peg$c120 = function(modifier, more) {
+            return [modifier].concat(more);
+        },
+        peg$c121 = function(modifier) {
+            return [modifier];
+        },
+        peg$c122 = function() {
+            return { info: {} };
+        },
+        peg$c123 = 'missense',
+        peg$c124 = peg$literalExpectation('MISSENSE', true),
+        peg$c125 = function() {
+            return { type: 'class', value: 'MISSENSE', info: {} };
+        },
+        peg$c126 = 'nonsense',
+        peg$c127 = peg$literalExpectation('NONSENSE', true),
+        peg$c128 = function() {
+            return { type: 'class', value: 'NONSENSE', info: {} };
+        },
+        peg$c129 = 'nonstart',
+        peg$c130 = peg$literalExpectation('NONSTART', true),
+        peg$c131 = function() {
+            return { type: 'class', value: 'NONSTART', info: {} };
+        },
+        peg$c132 = 'nonstop',
+        peg$c133 = peg$literalExpectation('NONSTOP', true),
+        peg$c134 = function() {
+            return { type: 'class', value: 'NONSTOP', info: {} };
+        },
+        peg$c135 = 'frameshift',
+        peg$c136 = peg$literalExpectation('FRAMESHIFT', true),
+        peg$c137 = function() {
+            return { type: 'class', value: 'FRAMESHIFT', info: {} };
+        },
+        peg$c138 = 'inframe',
+        peg$c139 = peg$literalExpectation('INFRAME', true),
+        peg$c140 = function() {
+            return { type: 'class', value: 'INFRAME', info: {} };
+        },
+        peg$c141 = 'splice',
+        peg$c142 = peg$literalExpectation('SPLICE', true),
+        peg$c143 = function() {
+            return { type: 'class', value: 'SPLICE', info: {} };
+        },
+        peg$c144 = 'trunc',
+        peg$c145 = peg$literalExpectation('TRUNC', true),
+        peg$c146 = function() {
+            return { type: 'class', value: 'TRUNC', info: {} };
+        },
+        peg$c147 = 'promoter',
+        peg$c148 = peg$literalExpectation('PROMOTER', true),
+        peg$c149 = function() {
+            return { type: 'class', value: 'PROMOTER', info: {} };
+        },
+        peg$c150 = function(letter, position, string) {
+            return {
+                type: 'name',
+                value: letter + position + string,
+                info: {},
+            };
+        },
+        peg$c151 = function(letter, position) {
+            return {
+                type: 'position',
+                value: parseInt(position),
+                info: { amino_acid: letter.toUpperCase() },
+            };
+        },
+        peg$c152 = function(mutation_name) {
+            return {
+                type: 'name',
+                value: mutation_name,
+                info: { unrecognized: true },
+            };
+        },
+        peg$c153 = function(firstChar, rest) {
+            return firstChar + rest;
+        },
+        peg$c154 = function(lastChar) {
+            return lastChar;
+        },
+        peg$c155 = function(mod) {
+            return mod;
+        },
+        peg$c156 = 'germline',
+        peg$c157 = peg$literalExpectation('GERMLINE', true),
+        peg$c158 = function() {
+            return 'GERMLINE';
+        },
+        peg$c159 = 'somatic',
+        peg$c160 = peg$literalExpectation('SOMATIC', true),
+        peg$c161 = function() {
+            return 'SOMATIC';
+        },
+        peg$c162 = function(d) {
+            return d;
+        },
+        peg$c163 = 'driver',
+        peg$c164 = peg$literalExpectation('DRIVER', true),
+        peg$c165 = function() {
+            return 'DRIVER';
+        },
+        peg$currPos = 0,
+        peg$savedPos = 0,
+        peg$posDetailsCache = [{ line: 1, column: 1 }],
+        peg$maxFailPos = 0,
+        peg$maxFailExpected = [],
+        peg$silentFails = 0,
+        peg$result;
+
+    if ('startRule' in options) {
+        if (!(options.startRule in peg$startRuleFunctions)) {
+            throw new Error(
+                'Can\'t start parsing from rule "' + options.startRule + '".'
+            );
         }
-      }
-    } else {
-      s1 = peg$FAILED;
-    }
-    if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$c3(s1);
-    }
-    s0 = s1;
-
-    return s0;
-  }
 
-  function peg$parseNumber() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    if (input.charCodeAt(peg$currPos) === 45) {
-      s1 = peg$c4;
-      peg$currPos++;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c5); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$parseNumber();
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s1 = peg$c6(s2);
-        s0 = s1;
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = peg$parseNaturalNumber();
-      if (s1 !== peg$FAILED) {
-        if (input.charCodeAt(peg$currPos) === 46) {
-          s2 = peg$c7;
-          peg$currPos++;
-        } else {
-          s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c8); }
-        }
-        if (s2 !== peg$FAILED) {
-          s3 = peg$parseNaturalNumber();
-          if (s3 !== peg$FAILED) {
-            peg$savedPos = s0;
-            s1 = peg$c9(s1, s3);
-            s0 = s1;
-          } else {
-            peg$currPos = s0;
-            s0 = peg$FAILED;
-          }
-        } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
-        }
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-      if (s0 === peg$FAILED) {
-        s0 = peg$currPos;
-        if (input.charCodeAt(peg$currPos) === 46) {
-          s1 = peg$c7;
-          peg$currPos++;
-        } else {
-          s1 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c8); }
-        }
-        if (s1 !== peg$FAILED) {
-          s2 = peg$parseNaturalNumber();
-          if (s2 !== peg$FAILED) {
-            peg$savedPos = s0;
-            s1 = peg$c10(s2);
-            s0 = s1;
-          } else {
-            peg$currPos = s0;
-            s0 = peg$FAILED;
-          }
-        } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
-        }
-        if (s0 === peg$FAILED) {
-          s0 = peg$currPos;
-          s1 = peg$parseNaturalNumber();
-          if (s1 !== peg$FAILED) {
-            peg$savedPos = s0;
-            s1 = peg$c11(s1);
-          }
-          s0 = s1;
-        }
-      }
+        peg$startRuleFunction = peg$startRuleFunctions[options.startRule];
     }
 
-    return s0;
-  }
-
-  function peg$parseString() {
-    var s0, s1, s2;
-
-    s0 = peg$currPos;
-    s1 = [];
-    if (peg$c12.test(input.charAt(peg$currPos))) {
-      s2 = input.charAt(peg$currPos);
-      peg$currPos++;
-    } else {
-      s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c13); }
+    function text() {
+        return input.substring(peg$savedPos, peg$currPos);
     }
-    if (s2 !== peg$FAILED) {
-      while (s2 !== peg$FAILED) {
-        s1.push(s2);
-        if (peg$c12.test(input.charAt(peg$currPos))) {
-          s2 = input.charAt(peg$currPos);
-          peg$currPos++;
-        } else {
-          s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c13); }
-        }
-      }
-    } else {
-      s1 = peg$FAILED;
-    }
-    if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$c14(s1);
-    }
-    s0 = s1;
-
-    return s0;
-  }
-
-  function peg$parseMutationProteinChangeCodeChar() {
-    var s0, s1;
 
-    s0 = peg$currPos;
-    if (peg$c15.test(input.charAt(peg$currPos))) {
-      s1 = input.charAt(peg$currPos);
-      peg$currPos++;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c16); }
-    }
-    if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$c17(s1);
+    function location() {
+        return peg$computeLocation(peg$savedPos, peg$currPos);
     }
-    s0 = s1;
 
-    return s0;
-  }
+    function expected(description, location) {
+        location =
+            location !== void 0
+                ? location
+                : peg$computeLocation(peg$savedPos, peg$currPos);
 
-  function peg$parseAminoAcid() {
-    var s0, s1;
-
-    s0 = peg$currPos;
-    if (peg$c18.test(input.charAt(peg$currPos))) {
-      s1 = input.charAt(peg$currPos);
-      peg$currPos++;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c19); }
+        throw peg$buildStructuredError(
+            [peg$otherExpectation(description)],
+            input.substring(peg$savedPos, peg$currPos),
+            location
+        );
     }
-    if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$c20(s1);
-    }
-    s0 = s1;
-
-    return s0;
-  }
 
-  function peg$parseStringExceptQuotes() {
-    var s0, s1, s2;
+    function error(message, location) {
+        location =
+            location !== void 0
+                ? location
+                : peg$computeLocation(peg$savedPos, peg$currPos);
 
-    s0 = peg$currPos;
-    s1 = [];
-    if (peg$c21.test(input.charAt(peg$currPos))) {
-      s2 = input.charAt(peg$currPos);
-      peg$currPos++;
-    } else {
-      s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c22); }
-    }
-    if (s2 !== peg$FAILED) {
-      while (s2 !== peg$FAILED) {
-        s1.push(s2);
-        if (peg$c21.test(input.charAt(peg$currPos))) {
-          s2 = input.charAt(peg$currPos);
-          peg$currPos++;
-        } else {
-          s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c22); }
-        }
-      }
-    } else {
-      s1 = peg$FAILED;
+        throw peg$buildSimpleError(message, location);
     }
-    if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$c23(s1);
-    }
-    s0 = s1;
-
-    return s0;
-  }
 
-  function peg$parsesp() {
-    var s0, s1;
-
-    s0 = [];
-    if (peg$c24.test(input.charAt(peg$currPos))) {
-      s1 = input.charAt(peg$currPos);
-      peg$currPos++;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c25); }
+    function peg$literalExpectation(text, ignoreCase) {
+        return { type: 'literal', text: text, ignoreCase: ignoreCase };
     }
-    if (s1 !== peg$FAILED) {
-      while (s1 !== peg$FAILED) {
-        s0.push(s1);
-        if (peg$c24.test(input.charAt(peg$currPos))) {
-          s1 = input.charAt(peg$currPos);
-          peg$currPos++;
-        } else {
-          s1 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c25); }
-        }
-      }
-    } else {
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
 
-  function peg$parsemsp() {
-    var s0, s1;
+    function peg$classExpectation(parts, inverted, ignoreCase) {
+        return {
+            type: 'class',
+            parts: parts,
+            inverted: inverted,
+            ignoreCase: ignoreCase,
+        };
+    }
 
-    s0 = [];
-    if (peg$c24.test(input.charAt(peg$currPos))) {
-      s1 = input.charAt(peg$currPos);
-      peg$currPos++;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c25); }
-    }
-    while (s1 !== peg$FAILED) {
-      s0.push(s1);
-      if (peg$c24.test(input.charAt(peg$currPos))) {
-        s1 = input.charAt(peg$currPos);
-        peg$currPos++;
-      } else {
-        s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c25); }
-      }
-    }
-
-    return s0;
-  }
-
-  function peg$parsezmbs() {
-    var s0, s1;
-
-    s0 = [];
-    if (peg$c26.test(input.charAt(peg$currPos))) {
-      s1 = input.charAt(peg$currPos);
-      peg$currPos++;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c27); }
-    }
-    while (s1 !== peg$FAILED) {
-      s0.push(s1);
-      if (peg$c26.test(input.charAt(peg$currPos))) {
-        s1 = input.charAt(peg$currPos);
-        peg$currPos++;
-      } else {
-        s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c27); }
-      }
-    }
-
-    return s0;
-  }
-
-  function peg$parseombs() {
-    var s0, s1;
-
-    s0 = [];
-    if (peg$c26.test(input.charAt(peg$currPos))) {
-      s1 = input.charAt(peg$currPos);
-      peg$currPos++;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c27); }
+    function peg$anyExpectation() {
+        return { type: 'any' };
     }
-    if (s1 !== peg$FAILED) {
-      while (s1 !== peg$FAILED) {
-        s0.push(s1);
-        if (peg$c26.test(input.charAt(peg$currPos))) {
-          s1 = input.charAt(peg$currPos);
-          peg$currPos++;
-        } else {
-          s1 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c27); }
-        }
-      }
-    } else {
-      s0 = peg$FAILED;
+
+    function peg$endExpectation() {
+        return { type: 'end' };
     }
 
-    return s0;
-  }
+    function peg$otherExpectation(description) {
+        return { type: 'other', description: description };
+    }
 
-  function peg$parseStartMergedGenes() {
-    var s0, s1, s2, s3, s4, s5;
+    function peg$computePosDetails(pos) {
+        var details = peg$posDetailsCache[pos],
+            p;
 
-    s0 = peg$currPos;
-    if (input.charCodeAt(peg$currPos) === 91) {
-      s1 = peg$c28;
-      peg$currPos++;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c29); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$parsezmbs();
-      if (s2 !== peg$FAILED) {
-        if (input.charCodeAt(peg$currPos) === 34) {
-          s3 = peg$c30;
-          peg$currPos++;
+        if (details) {
+            return details;
         } else {
-          s3 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c31); }
-        }
-        if (s3 !== peg$FAILED) {
-          s4 = peg$parseStringExceptQuotes();
-          if (s4 !== peg$FAILED) {
-            if (input.charCodeAt(peg$currPos) === 34) {
-              s5 = peg$c30;
-              peg$currPos++;
-            } else {
-              s5 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$c31); }
-            }
-            if (s5 !== peg$FAILED) {
-              peg$savedPos = s0;
-              s1 = peg$c32(s4);
-              s0 = s1;
-            } else {
-              peg$currPos = s0;
-              s0 = peg$FAILED;
+            p = pos - 1;
+            while (!peg$posDetailsCache[p]) {
+                p--;
             }
-          } else {
-            peg$currPos = s0;
-            s0 = peg$FAILED;
-          }
-        } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
-        }
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      if (input.charCodeAt(peg$currPos) === 91) {
-        s1 = peg$c28;
-        peg$currPos++;
-      } else {
-        s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c29); }
-      }
-      if (s1 !== peg$FAILED) {
-        s2 = peg$parsezmbs();
-        if (s2 !== peg$FAILED) {
-          peg$savedPos = s0;
-          s1 = peg$c33();
-          s0 = s1;
-        } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
-        }
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    }
-
-    return s0;
-  }
 
-  function peg$parseAMP() {
-    var s0;
-
-    if (input.substr(peg$currPos, 3).toLowerCase() === peg$c34) {
-      s0 = input.substr(peg$currPos, 3);
-      peg$currPos += 3;
-    } else {
-      s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c35); }
-    }
+            details = peg$posDetailsCache[p];
+            details = {
+                line: details.line,
+                column: details.column,
+            };
 
-    return s0;
-  }
+            while (p < pos) {
+                if (input.charCodeAt(p) === 10) {
+                    details.line++;
+                    details.column = 1;
+                } else {
+                    details.column++;
+                }
 
-  function peg$parseHOMDEL() {
-    var s0;
+                p++;
+            }
 
-    if (input.substr(peg$currPos, 6).toLowerCase() === peg$c36) {
-      s0 = input.substr(peg$currPos, 6);
-      peg$currPos += 6;
-    } else {
-      s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c37); }
+            peg$posDetailsCache[pos] = details;
+            return details;
+        }
     }
 
-    return s0;
-  }
+    function peg$computeLocation(startPos, endPos) {
+        var startPosDetails = peg$computePosDetails(startPos),
+            endPosDetails = peg$computePosDetails(endPos);
 
-  function peg$parseGAIN() {
-    var s0;
-
-    if (input.substr(peg$currPos, 4).toLowerCase() === peg$c38) {
-      s0 = input.substr(peg$currPos, 4);
-      peg$currPos += 4;
-    } else {
-      s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c39); }
+        return {
+            start: {
+                offset: startPos,
+                line: startPosDetails.line,
+                column: startPosDetails.column,
+            },
+            end: {
+                offset: endPos,
+                line: endPosDetails.line,
+                column: endPosDetails.column,
+            },
+        };
     }
 
-    return s0;
-  }
+    function peg$fail(expected) {
+        if (peg$currPos < peg$maxFailPos) {
+            return;
+        }
 
-  function peg$parseHETLOSS() {
-    var s0;
+        if (peg$currPos > peg$maxFailPos) {
+            peg$maxFailPos = peg$currPos;
+            peg$maxFailExpected = [];
+        }
 
-    if (input.substr(peg$currPos, 7).toLowerCase() === peg$c40) {
-      s0 = input.substr(peg$currPos, 7);
-      peg$currPos += 7;
-    } else {
-      s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c41); }
+        peg$maxFailExpected.push(expected);
     }
 
-    return s0;
-  }
-
-  function peg$parseMUT() {
-    var s0;
+    function peg$buildSimpleError(message, location) {
+        return new peg$SyntaxError(message, null, null, location);
+    }
 
-    if (input.substr(peg$currPos, 3).toLowerCase() === peg$c42) {
-      s0 = input.substr(peg$currPos, 3);
-      peg$currPos += 3;
-    } else {
-      s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c43); }
+    function peg$buildStructuredError(expected, found, location) {
+        return new peg$SyntaxError(
+            peg$SyntaxError.buildMessage(expected, found),
+            expected,
+            found,
+            location
+        );
     }
 
-    return s0;
-  }
+    function peg$parsestart() {
+        var s0, s1;
 
-  function peg$parseEXP() {
-    var s0;
+        s0 = peg$parseQuery();
+        if (s0 === peg$FAILED) {
+            s0 = peg$currPos;
+            s1 = peg$parsesp();
+            if (s1 !== peg$FAILED) {
+                peg$savedPos = s0;
+                s1 = peg$c0();
+            }
+            s0 = s1;
+        }
 
-    if (input.substr(peg$currPos, 3).toLowerCase() === peg$c44) {
-      s0 = input.substr(peg$currPos, 3);
-      peg$currPos += 3;
-    } else {
-      s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c45); }
+        return s0;
     }
 
-    return s0;
-  }
+    function peg$parseNaturalNumber() {
+        var s0, s1, s2;
 
-  function peg$parsePROT() {
-    var s0;
-
-    if (input.substr(peg$currPos, 4).toLowerCase() === peg$c46) {
-      s0 = input.substr(peg$currPos, 4);
-      peg$currPos += 4;
-    } else {
-      s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c47); }
-    }
-
-    return s0;
-  }
-
-  function peg$parseQuery() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = peg$parseMergedQuery();
-    if (s1 !== peg$FAILED) {
-      s2 = peg$parseombs();
-      if (s2 !== peg$FAILED) {
-        s3 = peg$parseQuery();
-        if (s3 !== peg$FAILED) {
-          peg$savedPos = s0;
-          s1 = peg$c48(s1, s3);
-          s0 = s1;
+        s0 = peg$currPos;
+        s1 = [];
+        if (peg$c1.test(input.charAt(peg$currPos))) {
+            s2 = input.charAt(peg$currPos);
+            peg$currPos++;
         } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
+            s2 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$c2);
+            }
         }
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = peg$parseStandardQuery();
-      if (s1 !== peg$FAILED) {
-        s2 = peg$parseombs();
         if (s2 !== peg$FAILED) {
-          s3 = peg$parseQuery();
-          if (s3 !== peg$FAILED) {
-            peg$savedPos = s0;
-            s1 = peg$c49(s1, s3);
-            s0 = s1;
-          } else {
-            peg$currPos = s0;
-            s0 = peg$FAILED;
-          }
+            while (s2 !== peg$FAILED) {
+                s1.push(s2);
+                if (peg$c1.test(input.charAt(peg$currPos))) {
+                    s2 = input.charAt(peg$currPos);
+                    peg$currPos++;
+                } else {
+                    s2 = peg$FAILED;
+                    if (peg$silentFails === 0) {
+                        peg$fail(peg$c2);
+                    }
+                }
+            }
         } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
-        }
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-      if (s0 === peg$FAILED) {
-        s0 = peg$currPos;
-        s1 = peg$parseMergedQuery();
+            s1 = peg$FAILED;
+        }
         if (s1 !== peg$FAILED) {
-          s2 = peg$parsezmbs();
-          if (s2 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$c50(s1);
-            s0 = s1;
-          } else {
-            peg$currPos = s0;
-            s0 = peg$FAILED;
-          }
-        } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
-        }
-        if (s0 === peg$FAILED) {
-          s0 = peg$currPos;
-          s1 = peg$parseStandardQuery();
-          if (s1 !== peg$FAILED) {
-            s2 = peg$parsezmbs();
-            if (s2 !== peg$FAILED) {
-              peg$savedPos = s0;
-              s1 = peg$c51(s1);
-              s0 = s1;
-            } else {
-              peg$currPos = s0;
-              s0 = peg$FAILED;
-            }
-          } else {
-            peg$currPos = s0;
-            s0 = peg$FAILED;
-          }
+            s1 = peg$c3(s1);
         }
-      }
+        s0 = s1;
+
+        return s0;
     }
 
-    return s0;
-  }
+    function peg$parseNumber() {
+        var s0, s1, s2, s3;
 
-  function peg$parseMergedQuery() {
-    var s0, s1, s2, s3, s4, s5, s6, s7;
-
-    s0 = peg$currPos;
-    s1 = peg$parsezmbs();
-    if (s1 !== peg$FAILED) {
-      s2 = peg$parseStartMergedGenes();
-      if (s2 !== peg$FAILED) {
-        s3 = peg$parseStandardQuery();
-        if (s3 !== peg$FAILED) {
-          s4 = peg$parsezmbs();
-          if (s4 !== peg$FAILED) {
-            if (input.charCodeAt(peg$currPos) === 93) {
-              s5 = peg$c52;
-              peg$currPos++;
-            } else {
-              s5 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$c53); }
-            }
-            if (s5 !== peg$FAILED) {
-              s6 = peg$parsezmbs();
-              if (s6 !== peg$FAILED) {
-                s7 = peg$parseMergedQuery();
-                if (s7 !== peg$FAILED) {
-                  peg$savedPos = s0;
-                  s1 = peg$c54(s2, s3, s7);
-                  s0 = s1;
-                } else {
-                  peg$currPos = s0;
-                  s0 = peg$FAILED;
-                }
-              } else {
-                peg$currPos = s0;
-                s0 = peg$FAILED;
-              }
-            } else {
-              peg$currPos = s0;
-              s0 = peg$FAILED;
-            }
-          } else {
-            peg$currPos = s0;
-            s0 = peg$FAILED;
-          }
+        s0 = peg$currPos;
+        if (input.charCodeAt(peg$currPos) === 45) {
+            s1 = peg$c4;
+            peg$currPos++;
         } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
+            s1 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$c5);
+            }
         }
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = peg$parsezmbs();
-      if (s1 !== peg$FAILED) {
-        s2 = peg$parseStartMergedGenes();
-        if (s2 !== peg$FAILED) {
-          s3 = peg$parseStandardQuery();
-          if (s3 !== peg$FAILED) {
-            s4 = peg$parsezmbs();
-            if (s4 !== peg$FAILED) {
-              if (input.charCodeAt(peg$currPos) === 93) {
-                s5 = peg$c52;
-                peg$currPos++;
-              } else {
-                s5 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$c53); }
-              }
-              if (s5 !== peg$FAILED) {
+        if (s1 !== peg$FAILED) {
+            s2 = peg$parseNumber();
+            if (s2 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s1 = peg$c55(s2, s3);
+                s1 = peg$c6(s2);
                 s0 = s1;
-              } else {
+            } else {
                 peg$currPos = s0;
                 s0 = peg$FAILED;
-              }
-            } else {
-              peg$currPos = s0;
-              s0 = peg$FAILED;
             }
-          } else {
-            peg$currPos = s0;
-            s0 = peg$FAILED;
-          }
         } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
-        }
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    }
-
-    return s0;
-  }
-
-  function peg$parseStandardQuery() {
-    var s0, s1, s2, s3, s4;
-
-    s0 = peg$currPos;
-    s1 = peg$parsezmbs();
-    if (s1 !== peg$FAILED) {
-      s2 = peg$parseSingleGeneQuery();
-      if (s2 !== peg$FAILED) {
-        s3 = peg$parseombs();
-        if (s3 !== peg$FAILED) {
-          s4 = peg$parseStandardQuery();
-          if (s4 !== peg$FAILED) {
-            peg$savedPos = s0;
-            s1 = peg$c56(s2, s4);
-            s0 = s1;
-          } else {
             peg$currPos = s0;
             s0 = peg$FAILED;
-          }
-        } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
         }
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = peg$parsezmbs();
-      if (s1 !== peg$FAILED) {
-        s2 = peg$parseSingleGeneQuery();
-        if (s2 !== peg$FAILED) {
-          peg$savedPos = s0;
-          s1 = peg$c57(s2);
-          s0 = s1;
-        } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
+        if (s0 === peg$FAILED) {
+            s0 = peg$currPos;
+            s1 = peg$parseNaturalNumber();
+            if (s1 !== peg$FAILED) {
+                if (input.charCodeAt(peg$currPos) === 46) {
+                    s2 = peg$c7;
+                    peg$currPos++;
+                } else {
+                    s2 = peg$FAILED;
+                    if (peg$silentFails === 0) {
+                        peg$fail(peg$c8);
+                    }
+                }
+                if (s2 !== peg$FAILED) {
+                    s3 = peg$parseNaturalNumber();
+                    if (s3 !== peg$FAILED) {
+                        peg$savedPos = s0;
+                        s1 = peg$c9(s1, s3);
+                        s0 = s1;
+                    } else {
+                        peg$currPos = s0;
+                        s0 = peg$FAILED;
+                    }
+                } else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                }
+            } else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+            }
+            if (s0 === peg$FAILED) {
+                s0 = peg$currPos;
+                if (input.charCodeAt(peg$currPos) === 46) {
+                    s1 = peg$c7;
+                    peg$currPos++;
+                } else {
+                    s1 = peg$FAILED;
+                    if (peg$silentFails === 0) {
+                        peg$fail(peg$c8);
+                    }
+                }
+                if (s1 !== peg$FAILED) {
+                    s2 = peg$parseNaturalNumber();
+                    if (s2 !== peg$FAILED) {
+                        peg$savedPos = s0;
+                        s1 = peg$c10(s2);
+                        s0 = s1;
+                    } else {
+                        peg$currPos = s0;
+                        s0 = peg$FAILED;
+                    }
+                } else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                }
+                if (s0 === peg$FAILED) {
+                    s0 = peg$currPos;
+                    s1 = peg$parseNaturalNumber();
+                    if (s1 !== peg$FAILED) {
+                        peg$savedPos = s0;
+                        s1 = peg$c11(s1);
+                    }
+                    s0 = s1;
+                }
+            }
         }
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    }
 
-    return s0;
-  }
+        return s0;
+    }
 
-  function peg$parseSingleGeneQuery() {
-    var s0, s1, s2, s3, s4, s5;
+    function peg$parseString() {
+        var s0, s1, s2;
 
-    s0 = peg$currPos;
-    s1 = peg$parseString();
-    if (s1 !== peg$FAILED) {
-      s2 = peg$parsemsp();
-      if (s2 !== peg$FAILED) {
-        if (input.charCodeAt(peg$currPos) === 58) {
-          s3 = peg$c58;
-          peg$currPos++;
+        s0 = peg$currPos;
+        s1 = [];
+        if (peg$c12.test(input.charAt(peg$currPos))) {
+            s2 = input.charAt(peg$currPos);
+            peg$currPos++;
         } else {
-          s3 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c59); }
-        }
-        if (s3 !== peg$FAILED) {
-          s4 = peg$parsemsp();
-          if (s4 !== peg$FAILED) {
-            s5 = peg$parseAlterations();
-            if (s5 !== peg$FAILED) {
-              peg$savedPos = s0;
-              s1 = peg$c60(s1, s5);
-              s0 = s1;
-            } else {
-              peg$currPos = s0;
-              s0 = peg$FAILED;
+            s2 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$c13);
             }
-          } else {
-            peg$currPos = s0;
-            s0 = peg$FAILED;
-          }
-        } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
         }
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = peg$parseString();
-      if (s1 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s1 = peg$c61(s1);
-      }
-      s0 = s1;
-    }
-
-    return s0;
-  }
-
-  function peg$parseAlterations() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = peg$parseAlteration();
-    if (s1 !== peg$FAILED) {
-      s2 = peg$parsesp();
-      if (s2 !== peg$FAILED) {
-        s3 = peg$parseAlterations();
-        if (s3 !== peg$FAILED) {
-          peg$savedPos = s0;
-          s1 = peg$c62(s1, s3);
-          s0 = s1;
+        if (s2 !== peg$FAILED) {
+            while (s2 !== peg$FAILED) {
+                s1.push(s2);
+                if (peg$c12.test(input.charAt(peg$currPos))) {
+                    s2 = input.charAt(peg$currPos);
+                    peg$currPos++;
+                } else {
+                    s2 = peg$FAILED;
+                    if (peg$silentFails === 0) {
+                        peg$fail(peg$c13);
+                    }
+                }
+            }
         } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
+            s1 = peg$FAILED;
         }
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = peg$parseAlteration();
-      if (s1 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s1 = peg$c63(s1);
-      }
-      s0 = s1;
-    }
-
-    return s0;
-  }
-
-  function peg$parseAlteration() {
-    var s0, s1;
-
-    s0 = peg$currPos;
-    s1 = peg$parseAnyTypeWithModifiersCommand();
-    if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$c64(s1);
-    }
-    s0 = s1;
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = peg$parseCNACommand();
-      if (s1 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s1 = peg$c64(s1);
-      }
-      s0 = s1;
-      if (s0 === peg$FAILED) {
-        s0 = peg$currPos;
-        s1 = peg$parseEXPCommand();
         if (s1 !== peg$FAILED) {
-          peg$savedPos = s0;
-          s1 = peg$c64(s1);
-        }
-        s0 = s1;
-        if (s0 === peg$FAILED) {
-          s0 = peg$currPos;
-          s1 = peg$parsePROTCommand();
-          if (s1 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$c64(s1);
-          }
-          s0 = s1;
-          if (s0 === peg$FAILED) {
-            s0 = peg$currPos;
-            s1 = peg$parseFUSIONCommand();
-            if (s1 !== peg$FAILED) {
-              peg$savedPos = s0;
-              s1 = peg$c64(s1);
-            }
-            s0 = s1;
-            if (s0 === peg$FAILED) {
-              s0 = peg$currPos;
-              s1 = peg$parseMUTCommand();
-              if (s1 !== peg$FAILED) {
-                peg$savedPos = s0;
-                s1 = peg$c64(s1);
-              }
-              s0 = s1;
-            }
-          }
-        }
-      }
-    }
-
-    return s0;
-  }
-
-  function peg$parseAnyTypeWithModifiersCommand() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = peg$parseDriverModifier();
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      peg$silentFails++;
-      if (input.charCodeAt(peg$currPos) === 95) {
-        s3 = peg$c65;
-        peg$currPos++;
-      } else {
-        s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c66); }
-      }
-      peg$silentFails--;
-      if (s3 === peg$FAILED) {
-        s2 = void 0;
-      } else {
-        peg$currPos = s2;
-        s2 = peg$FAILED;
-      }
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s1 = peg$c67(s1);
+            s1 = peg$c14(s1);
+        }
         s0 = s1;
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
 
-    return s0;
-  }
+        return s0;
+    }
 
-  function peg$parseCNAType() {
-    var s0, s1;
+    function peg$parseMutationProteinChangeCodeChar() {
+        var s0, s1;
 
-    s0 = peg$currPos;
-    if (input.substr(peg$currPos, 3).toLowerCase() === peg$c34) {
-      s1 = input.substr(peg$currPos, 3);
-      peg$currPos += 3;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c35); }
-    }
-    if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$c68();
-    }
-    s0 = s1;
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      if (input.substr(peg$currPos, 6).toLowerCase() === peg$c36) {
-        s1 = input.substr(peg$currPos, 6);
-        peg$currPos += 6;
-      } else {
-        s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c37); }
-      }
-      if (s1 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s1 = peg$c69();
-      }
-      s0 = s1;
-      if (s0 === peg$FAILED) {
         s0 = peg$currPos;
-        if (input.substr(peg$currPos, 4).toLowerCase() === peg$c38) {
-          s1 = input.substr(peg$currPos, 4);
-          peg$currPos += 4;
+        if (peg$c15.test(input.charAt(peg$currPos))) {
+            s1 = input.charAt(peg$currPos);
+            peg$currPos++;
         } else {
-          s1 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c39); }
+            s1 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$c16);
+            }
         }
         if (s1 !== peg$FAILED) {
-          peg$savedPos = s0;
-          s1 = peg$c70();
+            peg$savedPos = s0;
+            s1 = peg$c17(s1);
         }
         s0 = s1;
-        if (s0 === peg$FAILED) {
-          s0 = peg$currPos;
-          if (input.substr(peg$currPos, 7).toLowerCase() === peg$c40) {
-            s1 = input.substr(peg$currPos, 7);
-            peg$currPos += 7;
-          } else {
+
+        return s0;
+    }
+
+    function peg$parseAminoAcid() {
+        var s0, s1;
+
+        s0 = peg$currPos;
+        if (peg$c18.test(input.charAt(peg$currPos))) {
+            s1 = input.charAt(peg$currPos);
+            peg$currPos++;
+        } else {
             s1 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$c41); }
-          }
-          if (s1 !== peg$FAILED) {
+            if (peg$silentFails === 0) {
+                peg$fail(peg$c19);
+            }
+        }
+        if (s1 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$c71();
-          }
-          s0 = s1;
+            s1 = peg$c20(s1);
         }
-      }
-    }
+        s0 = s1;
 
-    return s0;
-  }
+        return s0;
+    }
 
-  function peg$parseCNACommand() {
-    var s0, s1, s2, s3, s4, s5;
+    function peg$parseStringExceptQuotes() {
+        var s0, s1, s2;
 
-    s0 = peg$currPos;
-    if (input.substr(peg$currPos, 3).toLowerCase() === peg$c72) {
-      s1 = input.substr(peg$currPos, 3);
-      peg$currPos += 3;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c73); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$parsemsp();
-      if (s2 !== peg$FAILED) {
-        s3 = peg$parseComparisonOp();
-        if (s3 !== peg$FAILED) {
-          s4 = peg$parsemsp();
-          if (s4 !== peg$FAILED) {
-            s5 = peg$parseCNAType();
-            if (s5 !== peg$FAILED) {
-              peg$savedPos = s0;
-              s1 = peg$c74(s3, s5);
-              s0 = s1;
-            } else {
-              peg$currPos = s0;
-              s0 = peg$FAILED;
-            }
-          } else {
-            peg$currPos = s0;
-            s0 = peg$FAILED;
-          }
+        s0 = peg$currPos;
+        s1 = [];
+        if (peg$c21.test(input.charAt(peg$currPos))) {
+            s2 = input.charAt(peg$currPos);
+            peg$currPos++;
         } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
+            s2 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$c22);
+            }
         }
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      if (input.substr(peg$currPos, 4) === peg$c75) {
-        s1 = peg$c75;
-        peg$currPos += 4;
-      } else {
-        s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c76); }
-      }
-      if (s1 !== peg$FAILED) {
-        s2 = peg$parseCNAModifier();
         if (s2 !== peg$FAILED) {
-          peg$savedPos = s0;
-          s1 = peg$c77(s2);
-          s0 = s1;
+            while (s2 !== peg$FAILED) {
+                s1.push(s2);
+                if (peg$c21.test(input.charAt(peg$currPos))) {
+                    s2 = input.charAt(peg$currPos);
+                    peg$currPos++;
+                } else {
+                    s2 = peg$FAILED;
+                    if (peg$silentFails === 0) {
+                        peg$fail(peg$c22);
+                    }
+                }
+            }
         } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
-        }
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-      if (s0 === peg$FAILED) {
-        s0 = peg$currPos;
-        s1 = peg$parseCNAType();
+            s1 = peg$FAILED;
+        }
         if (s1 !== peg$FAILED) {
-          if (input.charCodeAt(peg$currPos) === 95) {
-            s2 = peg$c65;
+            peg$savedPos = s0;
+            s1 = peg$c23(s1);
+        }
+        s0 = s1;
+
+        return s0;
+    }
+
+    function peg$parsesp() {
+        var s0, s1;
+
+        s0 = [];
+        if (peg$c24.test(input.charAt(peg$currPos))) {
+            s1 = input.charAt(peg$currPos);
             peg$currPos++;
-          } else {
-            s2 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$c66); }
-          }
-          if (s2 !== peg$FAILED) {
-            s3 = peg$parseCNAModifier();
-            if (s3 !== peg$FAILED) {
-              peg$savedPos = s0;
-              s1 = peg$c78(s1, s3);
-              s0 = s1;
-            } else {
-              peg$currPos = s0;
-              s0 = peg$FAILED;
-            }
-          } else {
-            peg$currPos = s0;
-            s0 = peg$FAILED;
-          }
         } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
-        }
-        if (s0 === peg$FAILED) {
-          s0 = peg$currPos;
-          s1 = peg$parseCNAModifier();
-          if (s1 !== peg$FAILED) {
-            if (input.substr(peg$currPos, 4) === peg$c79) {
-              s2 = peg$c79;
-              peg$currPos += 4;
-            } else {
-              s2 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$c80); }
-            }
-            if (s2 !== peg$FAILED) {
-              peg$savedPos = s0;
-              s1 = peg$c77(s1);
-              s0 = s1;
-            } else {
-              peg$currPos = s0;
-              s0 = peg$FAILED;
+            s1 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$c25);
             }
-          } else {
-            peg$currPos = s0;
-            s0 = peg$FAILED;
-          }
-          if (s0 === peg$FAILED) {
-            s0 = peg$currPos;
-            s1 = peg$parseCNAModifier();
-            if (s1 !== peg$FAILED) {
-              if (input.charCodeAt(peg$currPos) === 95) {
-                s2 = peg$c65;
-                peg$currPos++;
-              } else {
-                s2 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$c66); }
-              }
-              if (s2 !== peg$FAILED) {
-                s3 = peg$parseCNAType();
-                if (s3 !== peg$FAILED) {
-                  peg$savedPos = s0;
-                  s1 = peg$c81(s1, s3);
-                  s0 = s1;
+        }
+        if (s1 !== peg$FAILED) {
+            while (s1 !== peg$FAILED) {
+                s0.push(s1);
+                if (peg$c24.test(input.charAt(peg$currPos))) {
+                    s1 = input.charAt(peg$currPos);
+                    peg$currPos++;
                 } else {
-                  peg$currPos = s0;
-                  s0 = peg$FAILED;
+                    s1 = peg$FAILED;
+                    if (peg$silentFails === 0) {
+                        peg$fail(peg$c25);
+                    }
                 }
-              } else {
-                peg$currPos = s0;
-                s0 = peg$FAILED;
-              }
-            } else {
-              peg$currPos = s0;
-              s0 = peg$FAILED;
             }
-            if (s0 === peg$FAILED) {
-              s0 = peg$currPos;
-              s1 = peg$parseCNAType();
-              if (s1 !== peg$FAILED) {
-                peg$savedPos = s0;
-                s1 = peg$c82(s1);
-              }
-              s0 = s1;
-            }
-          }
+        } else {
+            s0 = peg$FAILED;
         }
-      }
-    }
 
-    return s0;
-  }
+        return s0;
+    }
 
-  function peg$parseMUTCommand() {
-    var s0, s1, s2, s3, s4, s5;
+    function peg$parsemsp() {
+        var s0, s1;
 
-    s0 = peg$currPos;
-    if (input.substr(peg$currPos, 3) === peg$c83) {
-      s1 = peg$c83;
-      peg$currPos += 3;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c84); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$parsemsp();
-      if (s2 !== peg$FAILED) {
-        if (input.charCodeAt(peg$currPos) === 61) {
-          s3 = peg$c85;
-          peg$currPos++;
+        s0 = [];
+        if (peg$c24.test(input.charAt(peg$currPos))) {
+            s1 = input.charAt(peg$currPos);
+            peg$currPos++;
         } else {
-          s3 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c86); }
-        }
-        if (s3 !== peg$FAILED) {
-          s4 = peg$parsemsp();
-          if (s4 !== peg$FAILED) {
-            s5 = peg$parseMutationWithModifiers();
-            if (s5 !== peg$FAILED) {
-              peg$savedPos = s0;
-              s1 = peg$c87(s5);
-              s0 = s1;
-            } else {
-              peg$currPos = s0;
-              s0 = peg$FAILED;
+            s1 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$c25);
             }
-          } else {
-            peg$currPos = s0;
-            s0 = peg$FAILED;
-          }
-        } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
         }
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      if (input.substr(peg$currPos, 3) === peg$c83) {
-        s1 = peg$c83;
-        peg$currPos += 3;
-      } else {
-        s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c84); }
-      }
-      if (s1 !== peg$FAILED) {
-        s2 = peg$parsemsp();
-        if (s2 !== peg$FAILED) {
-          if (input.substr(peg$currPos, 2) === peg$c88) {
-            s3 = peg$c88;
-            peg$currPos += 2;
-          } else {
-            s3 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$c89); }
-          }
-          if (s3 !== peg$FAILED) {
-            s4 = peg$parsemsp();
-            if (s4 !== peg$FAILED) {
-              s5 = peg$parseMutationWithModifiers();
-              if (s5 !== peg$FAILED) {
-                peg$savedPos = s0;
-                s1 = peg$c90(s5);
-                s0 = s1;
-              } else {
-                peg$currPos = s0;
-                s0 = peg$FAILED;
-              }
+        while (s1 !== peg$FAILED) {
+            s0.push(s1);
+            if (peg$c24.test(input.charAt(peg$currPos))) {
+                s1 = input.charAt(peg$currPos);
+                peg$currPos++;
             } else {
-              peg$currPos = s0;
-              s0 = peg$FAILED;
+                s1 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                    peg$fail(peg$c25);
+                }
             }
-          } else {
-            peg$currPos = s0;
-            s0 = peg$FAILED;
-          }
-        } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
-        }
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-      if (s0 === peg$FAILED) {
-        s0 = peg$currPos;
-        s1 = peg$parseMutationWithModifiers();
-        if (s1 !== peg$FAILED) {
-          peg$savedPos = s0;
-          s1 = peg$c91(s1);
         }
-        s0 = s1;
-      }
-    }
 
-    return s0;
-  }
+        return s0;
+    }
 
-  function peg$parseEXPCommand() {
-    var s0, s1, s2, s3, s4, s5;
+    function peg$parsezmbs() {
+        var s0, s1;
 
-    s0 = peg$currPos;
-    if (input.substr(peg$currPos, 3) === peg$c92) {
-      s1 = peg$c92;
-      peg$currPos += 3;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c93); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$parsemsp();
-      if (s2 !== peg$FAILED) {
-        s3 = peg$parseComparisonOp();
-        if (s3 !== peg$FAILED) {
-          s4 = peg$parsemsp();
-          if (s4 !== peg$FAILED) {
-            s5 = peg$parseNumber();
-            if (s5 !== peg$FAILED) {
-              peg$savedPos = s0;
-              s1 = peg$c94(s3, s5);
-              s0 = s1;
+        s0 = [];
+        if (peg$c26.test(input.charAt(peg$currPos))) {
+            s1 = input.charAt(peg$currPos);
+            peg$currPos++;
+        } else {
+            s1 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$c27);
+            }
+        }
+        while (s1 !== peg$FAILED) {
+            s0.push(s1);
+            if (peg$c26.test(input.charAt(peg$currPos))) {
+                s1 = input.charAt(peg$currPos);
+                peg$currPos++;
             } else {
-              peg$currPos = s0;
-              s0 = peg$FAILED;
+                s1 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                    peg$fail(peg$c27);
+                }
             }
-          } else {
-            peg$currPos = s0;
-            s0 = peg$FAILED;
-          }
-        } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
         }
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
 
-    return s0;
-  }
+        return s0;
+    }
 
-  function peg$parseFUSIONCommand() {
-    var s0, s1, s2, s3;
+    function peg$parseombs() {
+        var s0, s1;
 
-    s0 = peg$currPos;
-    if (input.substr(peg$currPos, 6).toLowerCase() === peg$c95) {
-      s1 = input.substr(peg$currPos, 6);
-      peg$currPos += 6;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c96); }
-    }
-    if (s1 !== peg$FAILED) {
-      if (input.charCodeAt(peg$currPos) === 95) {
-        s2 = peg$c65;
-        peg$currPos++;
-      } else {
-        s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c66); }
-      }
-      if (s2 !== peg$FAILED) {
-        s3 = peg$parseFusionModifier();
-        if (s3 !== peg$FAILED) {
-          peg$savedPos = s0;
-          s1 = peg$c97(s3);
-          s0 = s1;
+        s0 = [];
+        if (peg$c26.test(input.charAt(peg$currPos))) {
+            s1 = input.charAt(peg$currPos);
+            peg$currPos++;
         } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
+            s1 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$c27);
+            }
         }
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = peg$parseFusionModifier();
-      if (s1 !== peg$FAILED) {
-        if (input.substr(peg$currPos, 7).toLowerCase() === peg$c98) {
-          s2 = input.substr(peg$currPos, 7);
-          peg$currPos += 7;
+        if (s1 !== peg$FAILED) {
+            while (s1 !== peg$FAILED) {
+                s0.push(s1);
+                if (peg$c26.test(input.charAt(peg$currPos))) {
+                    s1 = input.charAt(peg$currPos);
+                    peg$currPos++;
+                } else {
+                    s1 = peg$FAILED;
+                    if (peg$silentFails === 0) {
+                        peg$fail(peg$c27);
+                    }
+                }
+            }
         } else {
-          s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c99); }
+            s0 = peg$FAILED;
         }
-        if (s2 !== peg$FAILED) {
-          peg$savedPos = s0;
-          s1 = peg$c97(s1);
-          s0 = s1;
-        } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
-        }
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-      if (s0 === peg$FAILED) {
+
+        return s0;
+    }
+
+    function peg$parseStartMergedGenes() {
+        var s0, s1, s2, s3, s4, s5;
+
         s0 = peg$currPos;
-        if (input.substr(peg$currPos, 6).toLowerCase() === peg$c95) {
-          s1 = input.substr(peg$currPos, 6);
-          peg$currPos += 6;
+        if (input.charCodeAt(peg$currPos) === 91) {
+            s1 = peg$c28;
+            peg$currPos++;
         } else {
-          s1 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c96); }
+            s1 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$c29);
+            }
         }
         if (s1 !== peg$FAILED) {
-          peg$savedPos = s0;
-          s1 = peg$c100();
-        }
-        s0 = s1;
-      }
-    }
-
-    return s0;
-  }
-
-  function peg$parsePROTCommand() {
-    var s0, s1, s2, s3, s4, s5;
-
-    s0 = peg$currPos;
-    if (input.substr(peg$currPos, 4) === peg$c101) {
-      s1 = peg$c101;
-      peg$currPos += 4;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c102); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$parsemsp();
-      if (s2 !== peg$FAILED) {
-        s3 = peg$parseComparisonOp();
-        if (s3 !== peg$FAILED) {
-          s4 = peg$parsemsp();
-          if (s4 !== peg$FAILED) {
-            s5 = peg$parseNumber();
-            if (s5 !== peg$FAILED) {
-              peg$savedPos = s0;
-              s1 = peg$c103(s3, s5);
-              s0 = s1;
+            s2 = peg$parsezmbs();
+            if (s2 !== peg$FAILED) {
+                if (input.charCodeAt(peg$currPos) === 34) {
+                    s3 = peg$c30;
+                    peg$currPos++;
+                } else {
+                    s3 = peg$FAILED;
+                    if (peg$silentFails === 0) {
+                        peg$fail(peg$c31);
+                    }
+                }
+                if (s3 !== peg$FAILED) {
+                    s4 = peg$parseStringExceptQuotes();
+                    if (s4 !== peg$FAILED) {
+                        if (input.charCodeAt(peg$currPos) === 34) {
+                            s5 = peg$c30;
+                            peg$currPos++;
+                        } else {
+                            s5 = peg$FAILED;
+                            if (peg$silentFails === 0) {
+                                peg$fail(peg$c31);
+                            }
+                        }
+                        if (s5 !== peg$FAILED) {
+                            peg$savedPos = s0;
+                            s1 = peg$c32(s4);
+                            s0 = s1;
+                        } else {
+                            peg$currPos = s0;
+                            s0 = peg$FAILED;
+                        }
+                    } else {
+                        peg$currPos = s0;
+                        s0 = peg$FAILED;
+                    }
+                } else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                }
+            } else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+            }
+        } else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+        }
+        if (s0 === peg$FAILED) {
+            s0 = peg$currPos;
+            if (input.charCodeAt(peg$currPos) === 91) {
+                s1 = peg$c28;
+                peg$currPos++;
+            } else {
+                s1 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                    peg$fail(peg$c29);
+                }
+            }
+            if (s1 !== peg$FAILED) {
+                s2 = peg$parsezmbs();
+                if (s2 !== peg$FAILED) {
+                    peg$savedPos = s0;
+                    s1 = peg$c33();
+                    s0 = s1;
+                } else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                }
+            } else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+            }
+        }
+
+        return s0;
+    }
+
+    function peg$parseAMP() {
+        var s0;
+
+        if (input.substr(peg$currPos, 3).toLowerCase() === peg$c34) {
+            s0 = input.substr(peg$currPos, 3);
+            peg$currPos += 3;
+        } else {
+            s0 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$c35);
+            }
+        }
+
+        return s0;
+    }
+
+    function peg$parseHOMDEL() {
+        var s0;
+
+        if (input.substr(peg$currPos, 6).toLowerCase() === peg$c36) {
+            s0 = input.substr(peg$currPos, 6);
+            peg$currPos += 6;
+        } else {
+            s0 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$c37);
+            }
+        }
+
+        return s0;
+    }
+
+    function peg$parseGAIN() {
+        var s0;
+
+        if (input.substr(peg$currPos, 4).toLowerCase() === peg$c38) {
+            s0 = input.substr(peg$currPos, 4);
+            peg$currPos += 4;
+        } else {
+            s0 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$c39);
+            }
+        }
+
+        return s0;
+    }
+
+    function peg$parseHETLOSS() {
+        var s0;
+
+        if (input.substr(peg$currPos, 7).toLowerCase() === peg$c40) {
+            s0 = input.substr(peg$currPos, 7);
+            peg$currPos += 7;
+        } else {
+            s0 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$c41);
+            }
+        }
+
+        return s0;
+    }
+
+    function peg$parseMUT() {
+        var s0;
+
+        if (input.substr(peg$currPos, 3).toLowerCase() === peg$c42) {
+            s0 = input.substr(peg$currPos, 3);
+            peg$currPos += 3;
+        } else {
+            s0 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$c43);
+            }
+        }
+
+        return s0;
+    }
+
+    function peg$parseEXP() {
+        var s0;
+
+        if (input.substr(peg$currPos, 3).toLowerCase() === peg$c44) {
+            s0 = input.substr(peg$currPos, 3);
+            peg$currPos += 3;
+        } else {
+            s0 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$c45);
+            }
+        }
+
+        return s0;
+    }
+
+    function peg$parsePROT() {
+        var s0;
+
+        if (input.substr(peg$currPos, 4).toLowerCase() === peg$c46) {
+            s0 = input.substr(peg$currPos, 4);
+            peg$currPos += 4;
+        } else {
+            s0 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$c47);
+            }
+        }
+
+        return s0;
+    }
+
+    function peg$parseQuery() {
+        var s0, s1, s2, s3;
+
+        s0 = peg$currPos;
+        s1 = peg$parseMergedQuery();
+        if (s1 !== peg$FAILED) {
+            s2 = peg$parseombs();
+            if (s2 !== peg$FAILED) {
+                s3 = peg$parseQuery();
+                if (s3 !== peg$FAILED) {
+                    peg$savedPos = s0;
+                    s1 = peg$c48(s1, s3);
+                    s0 = s1;
+                } else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                }
+            } else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+            }
+        } else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+        }
+        if (s0 === peg$FAILED) {
+            s0 = peg$currPos;
+            s1 = peg$parseStandardQuery();
+            if (s1 !== peg$FAILED) {
+                s2 = peg$parseombs();
+                if (s2 !== peg$FAILED) {
+                    s3 = peg$parseQuery();
+                    if (s3 !== peg$FAILED) {
+                        peg$savedPos = s0;
+                        s1 = peg$c49(s1, s3);
+                        s0 = s1;
+                    } else {
+                        peg$currPos = s0;
+                        s0 = peg$FAILED;
+                    }
+                } else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                }
+            } else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+            }
+            if (s0 === peg$FAILED) {
+                s0 = peg$currPos;
+                s1 = peg$parseMergedQuery();
+                if (s1 !== peg$FAILED) {
+                    s2 = peg$parsezmbs();
+                    if (s2 !== peg$FAILED) {
+                        peg$savedPos = s0;
+                        s1 = peg$c50(s1);
+                        s0 = s1;
+                    } else {
+                        peg$currPos = s0;
+                        s0 = peg$FAILED;
+                    }
+                } else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                }
+                if (s0 === peg$FAILED) {
+                    s0 = peg$currPos;
+                    s1 = peg$parseStandardQuery();
+                    if (s1 !== peg$FAILED) {
+                        s2 = peg$parsezmbs();
+                        if (s2 !== peg$FAILED) {
+                            peg$savedPos = s0;
+                            s1 = peg$c51(s1);
+                            s0 = s1;
+                        } else {
+                            peg$currPos = s0;
+                            s0 = peg$FAILED;
+                        }
+                    } else {
+                        peg$currPos = s0;
+                        s0 = peg$FAILED;
+                    }
+                }
+            }
+        }
+
+        return s0;
+    }
+
+    function peg$parseMergedQuery() {
+        var s0, s1, s2, s3, s4, s5, s6, s7;
+
+        s0 = peg$currPos;
+        s1 = peg$parsezmbs();
+        if (s1 !== peg$FAILED) {
+            s2 = peg$parseStartMergedGenes();
+            if (s2 !== peg$FAILED) {
+                s3 = peg$parseStandardQuery();
+                if (s3 !== peg$FAILED) {
+                    s4 = peg$parsezmbs();
+                    if (s4 !== peg$FAILED) {
+                        if (input.charCodeAt(peg$currPos) === 93) {
+                            s5 = peg$c52;
+                            peg$currPos++;
+                        } else {
+                            s5 = peg$FAILED;
+                            if (peg$silentFails === 0) {
+                                peg$fail(peg$c53);
+                            }
+                        }
+                        if (s5 !== peg$FAILED) {
+                            s6 = peg$parsezmbs();
+                            if (s6 !== peg$FAILED) {
+                                s7 = peg$parseMergedQuery();
+                                if (s7 !== peg$FAILED) {
+                                    peg$savedPos = s0;
+                                    s1 = peg$c54(s2, s3, s7);
+                                    s0 = s1;
+                                } else {
+                                    peg$currPos = s0;
+                                    s0 = peg$FAILED;
+                                }
+                            } else {
+                                peg$currPos = s0;
+                                s0 = peg$FAILED;
+                            }
+                        } else {
+                            peg$currPos = s0;
+                            s0 = peg$FAILED;
+                        }
+                    } else {
+                        peg$currPos = s0;
+                        s0 = peg$FAILED;
+                    }
+                } else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                }
+            } else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+            }
+        } else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+        }
+        if (s0 === peg$FAILED) {
+            s0 = peg$currPos;
+            s1 = peg$parsezmbs();
+            if (s1 !== peg$FAILED) {
+                s2 = peg$parseStartMergedGenes();
+                if (s2 !== peg$FAILED) {
+                    s3 = peg$parseStandardQuery();
+                    if (s3 !== peg$FAILED) {
+                        s4 = peg$parsezmbs();
+                        if (s4 !== peg$FAILED) {
+                            if (input.charCodeAt(peg$currPos) === 93) {
+                                s5 = peg$c52;
+                                peg$currPos++;
+                            } else {
+                                s5 = peg$FAILED;
+                                if (peg$silentFails === 0) {
+                                    peg$fail(peg$c53);
+                                }
+                            }
+                            if (s5 !== peg$FAILED) {
+                                peg$savedPos = s0;
+                                s1 = peg$c55(s2, s3);
+                                s0 = s1;
+                            } else {
+                                peg$currPos = s0;
+                                s0 = peg$FAILED;
+                            }
+                        } else {
+                            peg$currPos = s0;
+                            s0 = peg$FAILED;
+                        }
+                    } else {
+                        peg$currPos = s0;
+                        s0 = peg$FAILED;
+                    }
+                } else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                }
+            } else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+            }
+        }
+
+        return s0;
+    }
+
+    function peg$parseStandardQuery() {
+        var s0, s1, s2, s3, s4;
+
+        s0 = peg$currPos;
+        s1 = peg$parsezmbs();
+        if (s1 !== peg$FAILED) {
+            s2 = peg$parseSingleGeneQuery();
+            if (s2 !== peg$FAILED) {
+                s3 = peg$parseombs();
+                if (s3 !== peg$FAILED) {
+                    s4 = peg$parseStandardQuery();
+                    if (s4 !== peg$FAILED) {
+                        peg$savedPos = s0;
+                        s1 = peg$c56(s2, s4);
+                        s0 = s1;
+                    } else {
+                        peg$currPos = s0;
+                        s0 = peg$FAILED;
+                    }
+                } else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                }
+            } else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+            }
+        } else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+        }
+        if (s0 === peg$FAILED) {
+            s0 = peg$currPos;
+            s1 = peg$parsezmbs();
+            if (s1 !== peg$FAILED) {
+                s2 = peg$parseSingleGeneQuery();
+                if (s2 !== peg$FAILED) {
+                    peg$savedPos = s0;
+                    s1 = peg$c57(s2);
+                    s0 = s1;
+                } else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                }
+            } else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+            }
+        }
+
+        return s0;
+    }
+
+    function peg$parseSingleGeneQuery() {
+        var s0, s1, s2, s3, s4, s5;
+
+        s0 = peg$currPos;
+        s1 = peg$parseString();
+        if (s1 !== peg$FAILED) {
+            s2 = peg$parsemsp();
+            if (s2 !== peg$FAILED) {
+                if (input.charCodeAt(peg$currPos) === 58) {
+                    s3 = peg$c58;
+                    peg$currPos++;
+                } else {
+                    s3 = peg$FAILED;
+                    if (peg$silentFails === 0) {
+                        peg$fail(peg$c59);
+                    }
+                }
+                if (s3 !== peg$FAILED) {
+                    s4 = peg$parsemsp();
+                    if (s4 !== peg$FAILED) {
+                        s5 = peg$parseAlterations();
+                        if (s5 !== peg$FAILED) {
+                            peg$savedPos = s0;
+                            s1 = peg$c60(s1, s5);
+                            s0 = s1;
+                        } else {
+                            peg$currPos = s0;
+                            s0 = peg$FAILED;
+                        }
+                    } else {
+                        peg$currPos = s0;
+                        s0 = peg$FAILED;
+                    }
+                } else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                }
+            } else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+            }
+        } else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+        }
+        if (s0 === peg$FAILED) {
+            s0 = peg$currPos;
+            s1 = peg$parseString();
+            if (s1 !== peg$FAILED) {
+                peg$savedPos = s0;
+                s1 = peg$c61(s1);
+            }
+            s0 = s1;
+        }
+
+        return s0;
+    }
+
+    function peg$parseAlterations() {
+        var s0, s1, s2, s3;
+
+        s0 = peg$currPos;
+        s1 = peg$parseAlteration();
+        if (s1 !== peg$FAILED) {
+            s2 = peg$parsesp();
+            if (s2 !== peg$FAILED) {
+                s3 = peg$parseAlterations();
+                if (s3 !== peg$FAILED) {
+                    peg$savedPos = s0;
+                    s1 = peg$c62(s1, s3);
+                    s0 = s1;
+                } else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                }
+            } else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+            }
+        } else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+        }
+        if (s0 === peg$FAILED) {
+            s0 = peg$currPos;
+            s1 = peg$parseAlteration();
+            if (s1 !== peg$FAILED) {
+                peg$savedPos = s0;
+                s1 = peg$c63(s1);
+            }
+            s0 = s1;
+        }
+
+        return s0;
+    }
+
+    function peg$parseAlteration() {
+        var s0, s1;
+
+        s0 = peg$currPos;
+        s1 = peg$parseAnyTypeWithModifiersCommand();
+        if (s1 !== peg$FAILED) {
+            peg$savedPos = s0;
+            s1 = peg$c64(s1);
+        }
+        s0 = s1;
+        if (s0 === peg$FAILED) {
+            s0 = peg$currPos;
+            s1 = peg$parseCNACommand();
+            if (s1 !== peg$FAILED) {
+                peg$savedPos = s0;
+                s1 = peg$c64(s1);
+            }
+            s0 = s1;
+            if (s0 === peg$FAILED) {
+                s0 = peg$currPos;
+                s1 = peg$parseEXPCommand();
+                if (s1 !== peg$FAILED) {
+                    peg$savedPos = s0;
+                    s1 = peg$c64(s1);
+                }
+                s0 = s1;
+                if (s0 === peg$FAILED) {
+                    s0 = peg$currPos;
+                    s1 = peg$parsePROTCommand();
+                    if (s1 !== peg$FAILED) {
+                        peg$savedPos = s0;
+                        s1 = peg$c64(s1);
+                    }
+                    s0 = s1;
+                    if (s0 === peg$FAILED) {
+                        s0 = peg$currPos;
+                        s1 = peg$parseFUSIONCommand();
+                        if (s1 !== peg$FAILED) {
+                            peg$savedPos = s0;
+                            s1 = peg$c64(s1);
+                        }
+                        s0 = s1;
+                        if (s0 === peg$FAILED) {
+                            s0 = peg$currPos;
+                            s1 = peg$parseMUTCommand();
+                            if (s1 !== peg$FAILED) {
+                                peg$savedPos = s0;
+                                s1 = peg$c64(s1);
+                            }
+                            s0 = s1;
+                        }
+                    }
+                }
+            }
+        }
+
+        return s0;
+    }
+
+    function peg$parseAnyTypeWithModifiersCommand() {
+        var s0, s1, s2, s3;
+
+        s0 = peg$currPos;
+        s1 = peg$parseDriverModifier();
+        if (s1 !== peg$FAILED) {
+            s2 = peg$currPos;
+            peg$silentFails++;
+            if (input.charCodeAt(peg$currPos) === 95) {
+                s3 = peg$c65;
+                peg$currPos++;
+            } else {
+                s3 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                    peg$fail(peg$c66);
+                }
+            }
+            peg$silentFails--;
+            if (s3 === peg$FAILED) {
+                s2 = void 0;
+            } else {
+                peg$currPos = s2;
+                s2 = peg$FAILED;
+            }
+            if (s2 !== peg$FAILED) {
+                peg$savedPos = s0;
+                s1 = peg$c67(s1);
+                s0 = s1;
+            } else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+            }
+        } else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+        }
+
+        return s0;
+    }
+
+    function peg$parseCNAType() {
+        var s0, s1;
+
+        s0 = peg$currPos;
+        if (input.substr(peg$currPos, 3).toLowerCase() === peg$c34) {
+            s1 = input.substr(peg$currPos, 3);
+            peg$currPos += 3;
+        } else {
+            s1 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$c35);
+            }
+        }
+        if (s1 !== peg$FAILED) {
+            peg$savedPos = s0;
+            s1 = peg$c68();
+        }
+        s0 = s1;
+        if (s0 === peg$FAILED) {
+            s0 = peg$currPos;
+            if (input.substr(peg$currPos, 6).toLowerCase() === peg$c36) {
+                s1 = input.substr(peg$currPos, 6);
+                peg$currPos += 6;
+            } else {
+                s1 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                    peg$fail(peg$c37);
+                }
+            }
+            if (s1 !== peg$FAILED) {
+                peg$savedPos = s0;
+                s1 = peg$c69();
+            }
+            s0 = s1;
+            if (s0 === peg$FAILED) {
+                s0 = peg$currPos;
+                if (input.substr(peg$currPos, 4).toLowerCase() === peg$c38) {
+                    s1 = input.substr(peg$currPos, 4);
+                    peg$currPos += 4;
+                } else {
+                    s1 = peg$FAILED;
+                    if (peg$silentFails === 0) {
+                        peg$fail(peg$c39);
+                    }
+                }
+                if (s1 !== peg$FAILED) {
+                    peg$savedPos = s0;
+                    s1 = peg$c70();
+                }
+                s0 = s1;
+                if (s0 === peg$FAILED) {
+                    s0 = peg$currPos;
+                    if (
+                        input.substr(peg$currPos, 7).toLowerCase() === peg$c40
+                    ) {
+                        s1 = input.substr(peg$currPos, 7);
+                        peg$currPos += 7;
+                    } else {
+                        s1 = peg$FAILED;
+                        if (peg$silentFails === 0) {
+                            peg$fail(peg$c41);
+                        }
+                    }
+                    if (s1 !== peg$FAILED) {
+                        peg$savedPos = s0;
+                        s1 = peg$c71();
+                    }
+                    s0 = s1;
+                }
+            }
+        }
+
+        return s0;
+    }
+
+    function peg$parseCNACommand() {
+        var s0, s1, s2, s3, s4, s5;
+
+        s0 = peg$currPos;
+        if (input.substr(peg$currPos, 3).toLowerCase() === peg$c72) {
+            s1 = input.substr(peg$currPos, 3);
+            peg$currPos += 3;
+        } else {
+            s1 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$c73);
+            }
+        }
+        if (s1 !== peg$FAILED) {
+            s2 = peg$parsemsp();
+            if (s2 !== peg$FAILED) {
+                s3 = peg$parseComparisonOp();
+                if (s3 !== peg$FAILED) {
+                    s4 = peg$parsemsp();
+                    if (s4 !== peg$FAILED) {
+                        s5 = peg$parseCNAType();
+                        if (s5 !== peg$FAILED) {
+                            peg$savedPos = s0;
+                            s1 = peg$c74(s3, s5);
+                            s0 = s1;
+                        } else {
+                            peg$currPos = s0;
+                            s0 = peg$FAILED;
+                        }
+                    } else {
+                        peg$currPos = s0;
+                        s0 = peg$FAILED;
+                    }
+                } else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                }
+            } else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+            }
+        } else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+        }
+        if (s0 === peg$FAILED) {
+            s0 = peg$currPos;
+            if (input.substr(peg$currPos, 4) === peg$c75) {
+                s1 = peg$c75;
+                peg$currPos += 4;
+            } else {
+                s1 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                    peg$fail(peg$c76);
+                }
+            }
+            if (s1 !== peg$FAILED) {
+                s2 = peg$parseCNAModifier();
+                if (s2 !== peg$FAILED) {
+                    peg$savedPos = s0;
+                    s1 = peg$c77(s2);
+                    s0 = s1;
+                } else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                }
+            } else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+            }
+            if (s0 === peg$FAILED) {
+                s0 = peg$currPos;
+                s1 = peg$parseCNAType();
+                if (s1 !== peg$FAILED) {
+                    if (input.charCodeAt(peg$currPos) === 95) {
+                        s2 = peg$c65;
+                        peg$currPos++;
+                    } else {
+                        s2 = peg$FAILED;
+                        if (peg$silentFails === 0) {
+                            peg$fail(peg$c66);
+                        }
+                    }
+                    if (s2 !== peg$FAILED) {
+                        s3 = peg$parseCNAModifier();
+                        if (s3 !== peg$FAILED) {
+                            peg$savedPos = s0;
+                            s1 = peg$c78(s1, s3);
+                            s0 = s1;
+                        } else {
+                            peg$currPos = s0;
+                            s0 = peg$FAILED;
+                        }
+                    } else {
+                        peg$currPos = s0;
+                        s0 = peg$FAILED;
+                    }
+                } else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                }
+                if (s0 === peg$FAILED) {
+                    s0 = peg$currPos;
+                    s1 = peg$parseCNAModifier();
+                    if (s1 !== peg$FAILED) {
+                        if (input.substr(peg$currPos, 4) === peg$c79) {
+                            s2 = peg$c79;
+                            peg$currPos += 4;
+                        } else {
+                            s2 = peg$FAILED;
+                            if (peg$silentFails === 0) {
+                                peg$fail(peg$c80);
+                            }
+                        }
+                        if (s2 !== peg$FAILED) {
+                            peg$savedPos = s0;
+                            s1 = peg$c77(s1);
+                            s0 = s1;
+                        } else {
+                            peg$currPos = s0;
+                            s0 = peg$FAILED;
+                        }
+                    } else {
+                        peg$currPos = s0;
+                        s0 = peg$FAILED;
+                    }
+                    if (s0 === peg$FAILED) {
+                        s0 = peg$currPos;
+                        s1 = peg$parseCNAModifier();
+                        if (s1 !== peg$FAILED) {
+                            if (input.charCodeAt(peg$currPos) === 95) {
+                                s2 = peg$c65;
+                                peg$currPos++;
+                            } else {
+                                s2 = peg$FAILED;
+                                if (peg$silentFails === 0) {
+                                    peg$fail(peg$c66);
+                                }
+                            }
+                            if (s2 !== peg$FAILED) {
+                                s3 = peg$parseCNAType();
+                                if (s3 !== peg$FAILED) {
+                                    peg$savedPos = s0;
+                                    s1 = peg$c81(s1, s3);
+                                    s0 = s1;
+                                } else {
+                                    peg$currPos = s0;
+                                    s0 = peg$FAILED;
+                                }
+                            } else {
+                                peg$currPos = s0;
+                                s0 = peg$FAILED;
+                            }
+                        } else {
+                            peg$currPos = s0;
+                            s0 = peg$FAILED;
+                        }
+                        if (s0 === peg$FAILED) {
+                            s0 = peg$currPos;
+                            s1 = peg$parseCNAType();
+                            if (s1 !== peg$FAILED) {
+                                peg$savedPos = s0;
+                                s1 = peg$c82(s1);
+                            }
+                            s0 = s1;
+                        }
+                    }
+                }
+            }
+        }
+
+        return s0;
+    }
+
+    function peg$parseMUTCommand() {
+        var s0, s1, s2, s3, s4, s5;
+
+        s0 = peg$currPos;
+        if (input.substr(peg$currPos, 3) === peg$c83) {
+            s1 = peg$c83;
+            peg$currPos += 3;
+        } else {
+            s1 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$c84);
+            }
+        }
+        if (s1 !== peg$FAILED) {
+            s2 = peg$parsemsp();
+            if (s2 !== peg$FAILED) {
+                if (input.charCodeAt(peg$currPos) === 61) {
+                    s3 = peg$c85;
+                    peg$currPos++;
+                } else {
+                    s3 = peg$FAILED;
+                    if (peg$silentFails === 0) {
+                        peg$fail(peg$c86);
+                    }
+                }
+                if (s3 !== peg$FAILED) {
+                    s4 = peg$parsemsp();
+                    if (s4 !== peg$FAILED) {
+                        s5 = peg$parseMutationWithModifiers();
+                        if (s5 !== peg$FAILED) {
+                            peg$savedPos = s0;
+                            s1 = peg$c87(s5);
+                            s0 = s1;
+                        } else {
+                            peg$currPos = s0;
+                            s0 = peg$FAILED;
+                        }
+                    } else {
+                        peg$currPos = s0;
+                        s0 = peg$FAILED;
+                    }
+                } else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                }
+            } else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+            }
+        } else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+        }
+        if (s0 === peg$FAILED) {
+            s0 = peg$currPos;
+            if (input.substr(peg$currPos, 3) === peg$c83) {
+                s1 = peg$c83;
+                peg$currPos += 3;
+            } else {
+                s1 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                    peg$fail(peg$c84);
+                }
+            }
+            if (s1 !== peg$FAILED) {
+                s2 = peg$parsemsp();
+                if (s2 !== peg$FAILED) {
+                    if (input.substr(peg$currPos, 2) === peg$c88) {
+                        s3 = peg$c88;
+                        peg$currPos += 2;
+                    } else {
+                        s3 = peg$FAILED;
+                        if (peg$silentFails === 0) {
+                            peg$fail(peg$c89);
+                        }
+                    }
+                    if (s3 !== peg$FAILED) {
+                        s4 = peg$parsemsp();
+                        if (s4 !== peg$FAILED) {
+                            s5 = peg$parseMutationWithModifiers();
+                            if (s5 !== peg$FAILED) {
+                                peg$savedPos = s0;
+                                s1 = peg$c90(s5);
+                                s0 = s1;
+                            } else {
+                                peg$currPos = s0;
+                                s0 = peg$FAILED;
+                            }
+                        } else {
+                            peg$currPos = s0;
+                            s0 = peg$FAILED;
+                        }
+                    } else {
+                        peg$currPos = s0;
+                        s0 = peg$FAILED;
+                    }
+                } else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                }
+            } else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+            }
+            if (s0 === peg$FAILED) {
+                s0 = peg$currPos;
+                s1 = peg$parseMutationWithModifiers();
+                if (s1 !== peg$FAILED) {
+                    peg$savedPos = s0;
+                    s1 = peg$c91(s1);
+                }
+                s0 = s1;
+            }
+        }
+
+        return s0;
+    }
+
+    function peg$parseEXPCommand() {
+        var s0, s1, s2, s3, s4, s5;
+
+        s0 = peg$currPos;
+        if (input.substr(peg$currPos, 3) === peg$c92) {
+            s1 = peg$c92;
+            peg$currPos += 3;
+        } else {
+            s1 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$c93);
+            }
+        }
+        if (s1 !== peg$FAILED) {
+            s2 = peg$parsemsp();
+            if (s2 !== peg$FAILED) {
+                s3 = peg$parseComparisonOp();
+                if (s3 !== peg$FAILED) {
+                    s4 = peg$parsemsp();
+                    if (s4 !== peg$FAILED) {
+                        s5 = peg$parseNumber();
+                        if (s5 !== peg$FAILED) {
+                            peg$savedPos = s0;
+                            s1 = peg$c94(s3, s5);
+                            s0 = s1;
+                        } else {
+                            peg$currPos = s0;
+                            s0 = peg$FAILED;
+                        }
+                    } else {
+                        peg$currPos = s0;
+                        s0 = peg$FAILED;
+                    }
+                } else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                }
+            } else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+            }
+        } else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+        }
+
+        return s0;
+    }
+
+    function peg$parseFUSIONCommand() {
+        var s0, s1, s2, s3;
+
+        s0 = peg$currPos;
+        if (input.substr(peg$currPos, 6).toLowerCase() === peg$c95) {
+            s1 = input.substr(peg$currPos, 6);
+            peg$currPos += 6;
+        } else {
+            s1 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$c96);
+            }
+        }
+        if (s1 !== peg$FAILED) {
+            if (input.charCodeAt(peg$currPos) === 95) {
+                s2 = peg$c65;
+                peg$currPos++;
+            } else {
+                s2 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                    peg$fail(peg$c66);
+                }
+            }
+            if (s2 !== peg$FAILED) {
+                s3 = peg$parseFusionModifier();
+                if (s3 !== peg$FAILED) {
+                    peg$savedPos = s0;
+                    s1 = peg$c97(s3);
+                    s0 = s1;
+                } else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                }
+            } else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+            }
+        } else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+        }
+        if (s0 === peg$FAILED) {
+            s0 = peg$currPos;
+            s1 = peg$parseFusionModifier();
+            if (s1 !== peg$FAILED) {
+                if (input.substr(peg$currPos, 7).toLowerCase() === peg$c98) {
+                    s2 = input.substr(peg$currPos, 7);
+                    peg$currPos += 7;
+                } else {
+                    s2 = peg$FAILED;
+                    if (peg$silentFails === 0) {
+                        peg$fail(peg$c99);
+                    }
+                }
+                if (s2 !== peg$FAILED) {
+                    peg$savedPos = s0;
+                    s1 = peg$c97(s1);
+                    s0 = s1;
+                } else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                }
+            } else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+            }
+            if (s0 === peg$FAILED) {
+                s0 = peg$currPos;
+                if (input.substr(peg$currPos, 6).toLowerCase() === peg$c95) {
+                    s1 = input.substr(peg$currPos, 6);
+                    peg$currPos += 6;
+                } else {
+                    s1 = peg$FAILED;
+                    if (peg$silentFails === 0) {
+                        peg$fail(peg$c96);
+                    }
+                }
+                if (s1 !== peg$FAILED) {
+                    peg$savedPos = s0;
+                    s1 = peg$c100();
+                }
+                s0 = s1;
+            }
+        }
+
+        return s0;
+    }
+
+    function peg$parsePROTCommand() {
+        var s0, s1, s2, s3, s4, s5;
+
+        s0 = peg$currPos;
+        if (input.substr(peg$currPos, 4) === peg$c101) {
+            s1 = peg$c101;
+            peg$currPos += 4;
+        } else {
+            s1 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$c102);
+            }
+        }
+        if (s1 !== peg$FAILED) {
+            s2 = peg$parsemsp();
+            if (s2 !== peg$FAILED) {
+                s3 = peg$parseComparisonOp();
+                if (s3 !== peg$FAILED) {
+                    s4 = peg$parsemsp();
+                    if (s4 !== peg$FAILED) {
+                        s5 = peg$parseNumber();
+                        if (s5 !== peg$FAILED) {
+                            peg$savedPos = s0;
+                            s1 = peg$c103(s3, s5);
+                            s0 = s1;
+                        } else {
+                            peg$currPos = s0;
+                            s0 = peg$FAILED;
+                        }
+                    } else {
+                        peg$currPos = s0;
+                        s0 = peg$FAILED;
+                    }
+                } else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                }
+            } else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+            }
+        } else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+        }
+
+        return s0;
+    }
+
+    function peg$parseComparisonOp() {
+        var s0, s1;
+
+        s0 = peg$currPos;
+        if (input.substr(peg$currPos, 2) === peg$c104) {
+            s1 = peg$c104;
+            peg$currPos += 2;
+        } else {
+            s1 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$c105);
+            }
+        }
+        if (s1 !== peg$FAILED) {
+            peg$savedPos = s0;
+            s1 = peg$c106();
+        }
+        s0 = s1;
+        if (s0 === peg$FAILED) {
+            s0 = peg$currPos;
+            if (input.substr(peg$currPos, 2) === peg$c107) {
+                s1 = peg$c107;
+                peg$currPos += 2;
+            } else {
+                s1 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                    peg$fail(peg$c108);
+                }
+            }
+            if (s1 !== peg$FAILED) {
+                peg$savedPos = s0;
+                s1 = peg$c109();
+            }
+            s0 = s1;
+            if (s0 === peg$FAILED) {
+                s0 = peg$currPos;
+                if (input.charCodeAt(peg$currPos) === 62) {
+                    s1 = peg$c110;
+                    peg$currPos++;
+                } else {
+                    s1 = peg$FAILED;
+                    if (peg$silentFails === 0) {
+                        peg$fail(peg$c111);
+                    }
+                }
+                if (s1 !== peg$FAILED) {
+                    peg$savedPos = s0;
+                    s1 = peg$c112();
+                }
+                s0 = s1;
+                if (s0 === peg$FAILED) {
+                    s0 = peg$currPos;
+                    if (input.charCodeAt(peg$currPos) === 60) {
+                        s1 = peg$c113;
+                        peg$currPos++;
+                    } else {
+                        s1 = peg$FAILED;
+                        if (peg$silentFails === 0) {
+                            peg$fail(peg$c114);
+                        }
+                    }
+                    if (s1 !== peg$FAILED) {
+                        peg$savedPos = s0;
+                        s1 = peg$c115();
+                    }
+                    s0 = s1;
+                }
+            }
+        }
+
+        return s0;
+    }
+
+    function peg$parseMutationWithModifiers() {
+        var s0, s1, s2, s3;
+
+        s0 = peg$currPos;
+        s1 = peg$parseMutationModifier();
+        if (s1 !== peg$FAILED) {
+            if (input.charCodeAt(peg$currPos) === 95) {
+                s2 = peg$c65;
+                peg$currPos++;
+            } else {
+                s2 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                    peg$fail(peg$c66);
+                }
+            }
+            if (s2 !== peg$FAILED) {
+                s3 = peg$parseMutationWithModifiers();
+                if (s3 !== peg$FAILED) {
+                    peg$savedPos = s0;
+                    s1 = peg$c116(s1, s3);
+                    s0 = s1;
+                } else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                }
             } else {
-              peg$currPos = s0;
-              s0 = peg$FAILED;
+                peg$currPos = s0;
+                s0 = peg$FAILED;
             }
-          } else {
+        } else {
             peg$currPos = s0;
             s0 = peg$FAILED;
-          }
-        } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
         }
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
+        if (s0 === peg$FAILED) {
+            s0 = peg$currPos;
+            s1 = peg$parseMutation();
+            if (s1 !== peg$FAILED) {
+                if (input.charCodeAt(peg$currPos) === 95) {
+                    s2 = peg$c65;
+                    peg$currPos++;
+                } else {
+                    s2 = peg$FAILED;
+                    if (peg$silentFails === 0) {
+                        peg$fail(peg$c66);
+                    }
+                }
+                if (s2 !== peg$FAILED) {
+                    s3 = peg$parseMutationModifiers();
+                    if (s3 !== peg$FAILED) {
+                        peg$savedPos = s0;
+                        s1 = peg$c117(s1, s3);
+                        s0 = s1;
+                    } else {
+                        peg$currPos = s0;
+                        s0 = peg$FAILED;
+                    }
+                } else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                }
+            } else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+            }
+            if (s0 === peg$FAILED) {
+                s0 = peg$currPos;
+                s1 = peg$parseMutationModifier();
+                if (s1 !== peg$FAILED) {
+                    peg$savedPos = s0;
+                    s1 = peg$c118(s1);
+                }
+                s0 = s1;
+                if (s0 === peg$FAILED) {
+                    s0 = peg$currPos;
+                    s1 = peg$parseMutation();
+                    if (s1 !== peg$FAILED) {
+                        peg$savedPos = s0;
+                        s1 = peg$c119(s1);
+                    }
+                    s0 = s1;
+                }
+            }
+        }
 
-    return s0;
-  }
+        return s0;
+    }
 
-  function peg$parseComparisonOp() {
-    var s0, s1;
+    function peg$parseMutationModifiers() {
+        var s0, s1, s2, s3;
 
-    s0 = peg$currPos;
-    if (input.substr(peg$currPos, 2) === peg$c104) {
-      s1 = peg$c104;
-      peg$currPos += 2;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c105); }
-    }
-    if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$c106();
-    }
-    s0 = s1;
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      if (input.substr(peg$currPos, 2) === peg$c107) {
-        s1 = peg$c107;
-        peg$currPos += 2;
-      } else {
-        s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c108); }
-      }
-      if (s1 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s1 = peg$c109();
-      }
-      s0 = s1;
-      if (s0 === peg$FAILED) {
         s0 = peg$currPos;
-        if (input.charCodeAt(peg$currPos) === 62) {
-          s1 = peg$c110;
-          peg$currPos++;
-        } else {
-          s1 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c111); }
-        }
+        s1 = peg$parseMutationModifier();
         if (s1 !== peg$FAILED) {
-          peg$savedPos = s0;
-          s1 = peg$c112();
-        }
-        s0 = s1;
-        if (s0 === peg$FAILED) {
-          s0 = peg$currPos;
-          if (input.charCodeAt(peg$currPos) === 60) {
-            s1 = peg$c113;
-            peg$currPos++;
-          } else {
-            s1 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$c114); }
-          }
-          if (s1 !== peg$FAILED) {
-            peg$savedPos = s0;
-            s1 = peg$c115();
-          }
-          s0 = s1;
-        }
-      }
-    }
-
-    return s0;
-  }
-
-  function peg$parseMutationWithModifiers() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = peg$parseMutationModifier();
-    if (s1 !== peg$FAILED) {
-      if (input.charCodeAt(peg$currPos) === 95) {
-        s2 = peg$c65;
-        peg$currPos++;
-      } else {
-        s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c66); }
-      }
-      if (s2 !== peg$FAILED) {
-        s3 = peg$parseMutationWithModifiers();
-        if (s3 !== peg$FAILED) {
-          peg$savedPos = s0;
-          s1 = peg$c116(s1, s3);
-          s0 = s1;
-        } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
-        }
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = peg$parseMutation();
-      if (s1 !== peg$FAILED) {
-        if (input.charCodeAt(peg$currPos) === 95) {
-          s2 = peg$c65;
-          peg$currPos++;
+            if (input.charCodeAt(peg$currPos) === 95) {
+                s2 = peg$c65;
+                peg$currPos++;
+            } else {
+                s2 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                    peg$fail(peg$c66);
+                }
+            }
+            if (s2 !== peg$FAILED) {
+                s3 = peg$parseMutationModifiers();
+                if (s3 !== peg$FAILED) {
+                    peg$savedPos = s0;
+                    s1 = peg$c120(s1, s3);
+                    s0 = s1;
+                } else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                }
+            } else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+            }
         } else {
-          s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c66); }
-        }
-        if (s2 !== peg$FAILED) {
-          s3 = peg$parseMutationModifiers();
-          if (s3 !== peg$FAILED) {
-            peg$savedPos = s0;
-            s1 = peg$c117(s1, s3);
-            s0 = s1;
-          } else {
             peg$currPos = s0;
             s0 = peg$FAILED;
-          }
-        } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
-        }
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-      if (s0 === peg$FAILED) {
-        s0 = peg$currPos;
-        s1 = peg$parseMutationModifier();
-        if (s1 !== peg$FAILED) {
-          peg$savedPos = s0;
-          s1 = peg$c118(s1);
         }
-        s0 = s1;
         if (s0 === peg$FAILED) {
-          s0 = peg$currPos;
-          s1 = peg$parseMutation();
-          if (s1 !== peg$FAILED) {
-            peg$savedPos = s0;
-            s1 = peg$c119(s1);
-          }
-          s0 = s1;
-        }
-      }
-    }
-
-    return s0;
-  }
-
-  function peg$parseMutationModifiers() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    s1 = peg$parseMutationModifier();
-    if (s1 !== peg$FAILED) {
-      if (input.charCodeAt(peg$currPos) === 95) {
-        s2 = peg$c65;
-        peg$currPos++;
-      } else {
-        s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c66); }
-      }
-      if (s2 !== peg$FAILED) {
-        s3 = peg$parseMutationModifiers();
-        if (s3 !== peg$FAILED) {
-          peg$savedPos = s0;
-          s1 = peg$c120(s1, s3);
-          s0 = s1;
-        } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
+            s0 = peg$currPos;
+            s1 = peg$parseMutationModifier();
+            if (s1 !== peg$FAILED) {
+                peg$savedPos = s0;
+                s1 = peg$c121(s1);
+            }
+            s0 = s1;
         }
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = peg$parseMutationModifier();
-      if (s1 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s1 = peg$c121(s1);
-      }
-      s0 = s1;
-    }
 
-    return s0;
-  }
+        return s0;
+    }
 
-  function peg$parseMutation() {
-    var s0, s1, s2, s3;
+    function peg$parseMutation() {
+        var s0, s1, s2, s3;
 
-    s0 = peg$currPos;
-    if (input.substr(peg$currPos, 3).toLowerCase() === peg$c42) {
-      s1 = input.substr(peg$currPos, 3);
-      peg$currPos += 3;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c43); }
-    }
-    if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$c122();
-    }
-    s0 = s1;
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      if (input.substr(peg$currPos, 8).toLowerCase() === peg$c123) {
-        s1 = input.substr(peg$currPos, 8);
-        peg$currPos += 8;
-      } else {
-        s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c124); }
-      }
-      if (s1 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s1 = peg$c125();
-      }
-      s0 = s1;
-      if (s0 === peg$FAILED) {
         s0 = peg$currPos;
-        if (input.substr(peg$currPos, 8).toLowerCase() === peg$c126) {
-          s1 = input.substr(peg$currPos, 8);
-          peg$currPos += 8;
+        if (input.substr(peg$currPos, 3).toLowerCase() === peg$c42) {
+            s1 = input.substr(peg$currPos, 3);
+            peg$currPos += 3;
         } else {
-          s1 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c127); }
+            s1 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$c43);
+            }
         }
         if (s1 !== peg$FAILED) {
-          peg$savedPos = s0;
-          s1 = peg$c128();
+            peg$savedPos = s0;
+            s1 = peg$c122();
         }
         s0 = s1;
         if (s0 === peg$FAILED) {
-          s0 = peg$currPos;
-          if (input.substr(peg$currPos, 8).toLowerCase() === peg$c129) {
-            s1 = input.substr(peg$currPos, 8);
-            peg$currPos += 8;
-          } else {
-            s1 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$c130); }
-          }
-          if (s1 !== peg$FAILED) {
-            peg$savedPos = s0;
-            s1 = peg$c131();
-          }
-          s0 = s1;
-          if (s0 === peg$FAILED) {
             s0 = peg$currPos;
-            if (input.substr(peg$currPos, 7).toLowerCase() === peg$c132) {
-              s1 = input.substr(peg$currPos, 7);
-              peg$currPos += 7;
+            if (input.substr(peg$currPos, 8).toLowerCase() === peg$c123) {
+                s1 = input.substr(peg$currPos, 8);
+                peg$currPos += 8;
             } else {
-              s1 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$c133); }
+                s1 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                    peg$fail(peg$c124);
+                }
             }
             if (s1 !== peg$FAILED) {
-              peg$savedPos = s0;
-              s1 = peg$c134();
+                peg$savedPos = s0;
+                s1 = peg$c125();
             }
             s0 = s1;
             if (s0 === peg$FAILED) {
-              s0 = peg$currPos;
-              if (input.substr(peg$currPos, 10).toLowerCase() === peg$c135) {
-                s1 = input.substr(peg$currPos, 10);
-                peg$currPos += 10;
-              } else {
-                s1 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$c136); }
-              }
-              if (s1 !== peg$FAILED) {
-                peg$savedPos = s0;
-                s1 = peg$c137();
-              }
-              s0 = s1;
-              if (s0 === peg$FAILED) {
                 s0 = peg$currPos;
-                if (input.substr(peg$currPos, 7).toLowerCase() === peg$c138) {
-                  s1 = input.substr(peg$currPos, 7);
-                  peg$currPos += 7;
+                if (input.substr(peg$currPos, 8).toLowerCase() === peg$c126) {
+                    s1 = input.substr(peg$currPos, 8);
+                    peg$currPos += 8;
                 } else {
-                  s1 = peg$FAILED;
-                  if (peg$silentFails === 0) { peg$fail(peg$c139); }
+                    s1 = peg$FAILED;
+                    if (peg$silentFails === 0) {
+                        peg$fail(peg$c127);
+                    }
                 }
                 if (s1 !== peg$FAILED) {
-                  peg$savedPos = s0;
-                  s1 = peg$c140();
+                    peg$savedPos = s0;
+                    s1 = peg$c128();
                 }
                 s0 = s1;
                 if (s0 === peg$FAILED) {
-                  s0 = peg$currPos;
-                  if (input.substr(peg$currPos, 6).toLowerCase() === peg$c141) {
-                    s1 = input.substr(peg$currPos, 6);
-                    peg$currPos += 6;
-                  } else {
-                    s1 = peg$FAILED;
-                    if (peg$silentFails === 0) { peg$fail(peg$c142); }
-                  }
-                  if (s1 !== peg$FAILED) {
-                    peg$savedPos = s0;
-                    s1 = peg$c143();
-                  }
-                  s0 = s1;
-                  if (s0 === peg$FAILED) {
                     s0 = peg$currPos;
-                    if (input.substr(peg$currPos, 5).toLowerCase() === peg$c144) {
-                      s1 = input.substr(peg$currPos, 5);
-                      peg$currPos += 5;
+                    if (
+                        input.substr(peg$currPos, 8).toLowerCase() === peg$c129
+                    ) {
+                        s1 = input.substr(peg$currPos, 8);
+                        peg$currPos += 8;
                     } else {
-                      s1 = peg$FAILED;
-                      if (peg$silentFails === 0) { peg$fail(peg$c145); }
+                        s1 = peg$FAILED;
+                        if (peg$silentFails === 0) {
+                            peg$fail(peg$c130);
+                        }
                     }
                     if (s1 !== peg$FAILED) {
-                      peg$savedPos = s0;
-                      s1 = peg$c146();
+                        peg$savedPos = s0;
+                        s1 = peg$c131();
                     }
                     s0 = s1;
                     if (s0 === peg$FAILED) {
-                      s0 = peg$currPos;
-                      if (input.substr(peg$currPos, 8).toLowerCase() === peg$c147) {
-                        s1 = input.substr(peg$currPos, 8);
-                        peg$currPos += 8;
-                      } else {
-                        s1 = peg$FAILED;
-                        if (peg$silentFails === 0) { peg$fail(peg$c148); }
-                      }
-                      if (s1 !== peg$FAILED) {
-                        peg$savedPos = s0;
-                        s1 = peg$c149();
-                      }
-                      s0 = s1;
-                      if (s0 === peg$FAILED) {
                         s0 = peg$currPos;
-                        s1 = peg$parseAminoAcid();
-                        if (s1 !== peg$FAILED) {
-                          s2 = peg$parseNaturalNumber();
-                          if (s2 !== peg$FAILED) {
-                            s3 = peg$parseMutationProteinChangeCode();
-                            if (s3 !== peg$FAILED) {
-                              peg$savedPos = s0;
-                              s1 = peg$c150(s1, s2, s3);
-                              s0 = s1;
-                            } else {
-                              peg$currPos = s0;
-                              s0 = peg$FAILED;
-                            }
-                          } else {
-                            peg$currPos = s0;
-                            s0 = peg$FAILED;
-                          }
+                        if (
+                            input.substr(peg$currPos, 7).toLowerCase() ===
+                            peg$c132
+                        ) {
+                            s1 = input.substr(peg$currPos, 7);
+                            peg$currPos += 7;
                         } else {
-                          peg$currPos = s0;
-                          s0 = peg$FAILED;
+                            s1 = peg$FAILED;
+                            if (peg$silentFails === 0) {
+                                peg$fail(peg$c133);
+                            }
                         }
+                        if (s1 !== peg$FAILED) {
+                            peg$savedPos = s0;
+                            s1 = peg$c134();
+                        }
+                        s0 = s1;
                         if (s0 === peg$FAILED) {
-                          s0 = peg$currPos;
-                          s1 = peg$parseAminoAcid();
-                          if (s1 !== peg$FAILED) {
-                            s2 = peg$parseNaturalNumber();
-                            if (s2 !== peg$FAILED) {
-                              peg$savedPos = s0;
-                              s1 = peg$c151(s1, s2);
-                              s0 = s1;
+                            s0 = peg$currPos;
+                            if (
+                                input.substr(peg$currPos, 10).toLowerCase() ===
+                                peg$c135
+                            ) {
+                                s1 = input.substr(peg$currPos, 10);
+                                peg$currPos += 10;
                             } else {
-                              peg$currPos = s0;
-                              s0 = peg$FAILED;
+                                s1 = peg$FAILED;
+                                if (peg$silentFails === 0) {
+                                    peg$fail(peg$c136);
+                                }
                             }
-                          } else {
-                            peg$currPos = s0;
-                            s0 = peg$FAILED;
-                          }
-                          if (s0 === peg$FAILED) {
-                            s0 = peg$currPos;
-                            s1 = peg$parseMutationProteinChangeCode();
                             if (s1 !== peg$FAILED) {
-                              peg$savedPos = s0;
-                              s1 = peg$c152(s1);
+                                peg$savedPos = s0;
+                                s1 = peg$c137();
                             }
                             s0 = s1;
-                          }
+                            if (s0 === peg$FAILED) {
+                                s0 = peg$currPos;
+                                if (
+                                    input
+                                        .substr(peg$currPos, 7)
+                                        .toLowerCase() === peg$c138
+                                ) {
+                                    s1 = input.substr(peg$currPos, 7);
+                                    peg$currPos += 7;
+                                } else {
+                                    s1 = peg$FAILED;
+                                    if (peg$silentFails === 0) {
+                                        peg$fail(peg$c139);
+                                    }
+                                }
+                                if (s1 !== peg$FAILED) {
+                                    peg$savedPos = s0;
+                                    s1 = peg$c140();
+                                }
+                                s0 = s1;
+                                if (s0 === peg$FAILED) {
+                                    s0 = peg$currPos;
+                                    if (
+                                        input
+                                            .substr(peg$currPos, 6)
+                                            .toLowerCase() === peg$c141
+                                    ) {
+                                        s1 = input.substr(peg$currPos, 6);
+                                        peg$currPos += 6;
+                                    } else {
+                                        s1 = peg$FAILED;
+                                        if (peg$silentFails === 0) {
+                                            peg$fail(peg$c142);
+                                        }
+                                    }
+                                    if (s1 !== peg$FAILED) {
+                                        peg$savedPos = s0;
+                                        s1 = peg$c143();
+                                    }
+                                    s0 = s1;
+                                    if (s0 === peg$FAILED) {
+                                        s0 = peg$currPos;
+                                        if (
+                                            input
+                                                .substr(peg$currPos, 5)
+                                                .toLowerCase() === peg$c144
+                                        ) {
+                                            s1 = input.substr(peg$currPos, 5);
+                                            peg$currPos += 5;
+                                        } else {
+                                            s1 = peg$FAILED;
+                                            if (peg$silentFails === 0) {
+                                                peg$fail(peg$c145);
+                                            }
+                                        }
+                                        if (s1 !== peg$FAILED) {
+                                            peg$savedPos = s0;
+                                            s1 = peg$c146();
+                                        }
+                                        s0 = s1;
+                                        if (s0 === peg$FAILED) {
+                                            s0 = peg$currPos;
+                                            if (
+                                                input
+                                                    .substr(peg$currPos, 8)
+                                                    .toLowerCase() === peg$c147
+                                            ) {
+                                                s1 = input.substr(
+                                                    peg$currPos,
+                                                    8
+                                                );
+                                                peg$currPos += 8;
+                                            } else {
+                                                s1 = peg$FAILED;
+                                                if (peg$silentFails === 0) {
+                                                    peg$fail(peg$c148);
+                                                }
+                                            }
+                                            if (s1 !== peg$FAILED) {
+                                                peg$savedPos = s0;
+                                                s1 = peg$c149();
+                                            }
+                                            s0 = s1;
+                                            if (s0 === peg$FAILED) {
+                                                s0 = peg$currPos;
+                                                s1 = peg$parseAminoAcid();
+                                                if (s1 !== peg$FAILED) {
+                                                    s2 = peg$parseNaturalNumber();
+                                                    if (s2 !== peg$FAILED) {
+                                                        s3 = peg$parseMutationProteinChangeCode();
+                                                        if (s3 !== peg$FAILED) {
+                                                            peg$savedPos = s0;
+                                                            s1 = peg$c150(
+                                                                s1,
+                                                                s2,
+                                                                s3
+                                                            );
+                                                            s0 = s1;
+                                                        } else {
+                                                            peg$currPos = s0;
+                                                            s0 = peg$FAILED;
+                                                        }
+                                                    } else {
+                                                        peg$currPos = s0;
+                                                        s0 = peg$FAILED;
+                                                    }
+                                                } else {
+                                                    peg$currPos = s0;
+                                                    s0 = peg$FAILED;
+                                                }
+                                                if (s0 === peg$FAILED) {
+                                                    s0 = peg$currPos;
+                                                    s1 = peg$parseAminoAcid();
+                                                    if (s1 !== peg$FAILED) {
+                                                        s2 = peg$parseNaturalNumber();
+                                                        if (s2 !== peg$FAILED) {
+                                                            peg$savedPos = s0;
+                                                            s1 = peg$c151(
+                                                                s1,
+                                                                s2
+                                                            );
+                                                            s0 = s1;
+                                                        } else {
+                                                            peg$currPos = s0;
+                                                            s0 = peg$FAILED;
+                                                        }
+                                                    } else {
+                                                        peg$currPos = s0;
+                                                        s0 = peg$FAILED;
+                                                    }
+                                                    if (s0 === peg$FAILED) {
+                                                        s0 = peg$currPos;
+                                                        s1 = peg$parseMutationProteinChangeCode();
+                                                        if (s1 !== peg$FAILED) {
+                                                            peg$savedPos = s0;
+                                                            s1 = peg$c152(s1);
+                                                        }
+                                                        s0 = s1;
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
                         }
-                      }
                     }
-                  }
                 }
-              }
             }
-          }
         }
-      }
-    }
 
-    return s0;
-  }
+        return s0;
+    }
 
-  function peg$parseMutationProteinChangeCode() {
-    var s0, s1, s2, s3, s4;
+    function peg$parseMutationProteinChangeCode() {
+        var s0, s1, s2, s3, s4;
 
-    s0 = peg$currPos;
-    s1 = peg$currPos;
-    peg$silentFails++;
-    s2 = peg$parseTrailingMutationModifier();
-    peg$silentFails--;
-    if (s2 === peg$FAILED) {
-      s1 = void 0;
-    } else {
-      peg$currPos = s1;
-      s1 = peg$FAILED;
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$parseMutationProteinChangeCodeChar();
-      if (s2 !== peg$FAILED) {
-        s3 = peg$currPos;
+        s0 = peg$currPos;
+        s1 = peg$currPos;
         peg$silentFails++;
-        s4 = peg$parseTrailingMutationModifier();
+        s2 = peg$parseTrailingMutationModifier();
         peg$silentFails--;
-        if (s4 === peg$FAILED) {
-          s3 = void 0;
+        if (s2 === peg$FAILED) {
+            s1 = void 0;
         } else {
-          peg$currPos = s3;
-          s3 = peg$FAILED;
+            peg$currPos = s1;
+            s1 = peg$FAILED;
         }
-        if (s3 !== peg$FAILED) {
-          s4 = peg$parseMutationProteinChangeCode();
-          if (s4 !== peg$FAILED) {
-            peg$savedPos = s0;
-            s1 = peg$c153(s2, s4);
-            s0 = s1;
-          } else {
+        if (s1 !== peg$FAILED) {
+            s2 = peg$parseMutationProteinChangeCodeChar();
+            if (s2 !== peg$FAILED) {
+                s3 = peg$currPos;
+                peg$silentFails++;
+                s4 = peg$parseTrailingMutationModifier();
+                peg$silentFails--;
+                if (s4 === peg$FAILED) {
+                    s3 = void 0;
+                } else {
+                    peg$currPos = s3;
+                    s3 = peg$FAILED;
+                }
+                if (s3 !== peg$FAILED) {
+                    s4 = peg$parseMutationProteinChangeCode();
+                    if (s4 !== peg$FAILED) {
+                        peg$savedPos = s0;
+                        s1 = peg$c153(s2, s4);
+                        s0 = s1;
+                    } else {
+                        peg$currPos = s0;
+                        s0 = peg$FAILED;
+                    }
+                } else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                }
+            } else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+            }
+        } else {
             peg$currPos = s0;
             s0 = peg$FAILED;
-          }
-        } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
         }
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      s1 = peg$currPos;
-      peg$silentFails++;
-      s2 = peg$parseTrailingMutationModifier();
-      peg$silentFails--;
-      if (s2 === peg$FAILED) {
-        s1 = void 0;
-      } else {
-        peg$currPos = s1;
-        s1 = peg$FAILED;
-      }
-      if (s1 !== peg$FAILED) {
-        s2 = peg$parseMutationProteinChangeCodeChar();
-        if (s2 !== peg$FAILED) {
-          peg$savedPos = s0;
-          s1 = peg$c154(s2);
-          s0 = s1;
-        } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
+        if (s0 === peg$FAILED) {
+            s0 = peg$currPos;
+            s1 = peg$currPos;
+            peg$silentFails++;
+            s2 = peg$parseTrailingMutationModifier();
+            peg$silentFails--;
+            if (s2 === peg$FAILED) {
+                s1 = void 0;
+            } else {
+                peg$currPos = s1;
+                s1 = peg$FAILED;
+            }
+            if (s1 !== peg$FAILED) {
+                s2 = peg$parseMutationProteinChangeCodeChar();
+                if (s2 !== peg$FAILED) {
+                    peg$savedPos = s0;
+                    s1 = peg$c154(s2);
+                    s0 = s1;
+                } else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                }
+            } else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+            }
         }
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
+
+        return s0;
     }
 
-    return s0;
-  }
+    function peg$parseTrailingMutationModifier() {
+        var s0, s1, s2;
 
-  function peg$parseTrailingMutationModifier() {
-    var s0, s1, s2;
+        s0 = peg$currPos;
+        if (input.charCodeAt(peg$currPos) === 95) {
+            s1 = peg$c65;
+            peg$currPos++;
+        } else {
+            s1 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$c66);
+            }
+        }
+        if (s1 !== peg$FAILED) {
+            s2 = peg$parseMutationModifier();
+            if (s2 !== peg$FAILED) {
+                peg$savedPos = s0;
+                s1 = peg$c155(s2);
+                s0 = s1;
+            } else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+            }
+        } else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+        }
 
-    s0 = peg$currPos;
-    if (input.charCodeAt(peg$currPos) === 95) {
-      s1 = peg$c65;
-      peg$currPos++;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c66); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$parseMutationModifier();
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s1 = peg$c155(s2);
-        s0 = s1;
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
+        return s0;
     }
 
-    return s0;
-  }
+    function peg$parseMutationModifier() {
+        var s0, s1;
 
-  function peg$parseMutationModifier() {
-    var s0, s1;
-
-    s0 = peg$currPos;
-    if (input.substr(peg$currPos, 8).toLowerCase() === peg$c156) {
-      s1 = input.substr(peg$currPos, 8);
-      peg$currPos += 8;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c157); }
-    }
-    if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$c158();
-    }
-    s0 = s1;
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      if (input.substr(peg$currPos, 7).toLowerCase() === peg$c159) {
-        s1 = input.substr(peg$currPos, 7);
-        peg$currPos += 7;
-      } else {
-        s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c160); }
-      }
-      if (s1 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s1 = peg$c161();
-      }
-      s0 = s1;
-      if (s0 === peg$FAILED) {
         s0 = peg$currPos;
-        s1 = peg$parseDriverModifier();
+        if (input.substr(peg$currPos, 8).toLowerCase() === peg$c156) {
+            s1 = input.substr(peg$currPos, 8);
+            peg$currPos += 8;
+        } else {
+            s1 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$c157);
+            }
+        }
         if (s1 !== peg$FAILED) {
-          peg$savedPos = s0;
-          s1 = peg$c155(s1);
+            peg$savedPos = s0;
+            s1 = peg$c158();
         }
         s0 = s1;
-      }
+        if (s0 === peg$FAILED) {
+            s0 = peg$currPos;
+            if (input.substr(peg$currPos, 7).toLowerCase() === peg$c159) {
+                s1 = input.substr(peg$currPos, 7);
+                peg$currPos += 7;
+            } else {
+                s1 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                    peg$fail(peg$c160);
+                }
+            }
+            if (s1 !== peg$FAILED) {
+                peg$savedPos = s0;
+                s1 = peg$c161();
+            }
+            s0 = s1;
+            if (s0 === peg$FAILED) {
+                s0 = peg$currPos;
+                s1 = peg$parseDriverModifier();
+                if (s1 !== peg$FAILED) {
+                    peg$savedPos = s0;
+                    s1 = peg$c155(s1);
+                }
+                s0 = s1;
+            }
+        }
+
+        return s0;
     }
 
-    return s0;
-  }
+    function peg$parseCNAModifier() {
+        var s0, s1;
 
-  function peg$parseCNAModifier() {
-    var s0, s1;
+        s0 = peg$currPos;
+        s1 = peg$parseDriverModifier();
+        if (s1 !== peg$FAILED) {
+            peg$savedPos = s0;
+            s1 = peg$c162(s1);
+        }
+        s0 = s1;
 
-    s0 = peg$currPos;
-    s1 = peg$parseDriverModifier();
-    if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$c162(s1);
+        return s0;
     }
-    s0 = s1;
 
-    return s0;
-  }
+    function peg$parseFusionModifier() {
+        var s0, s1;
 
-  function peg$parseFusionModifier() {
-    var s0, s1;
+        s0 = peg$currPos;
+        s1 = peg$parseDriverModifier();
+        if (s1 !== peg$FAILED) {
+            peg$savedPos = s0;
+            s1 = peg$c162(s1);
+        }
+        s0 = s1;
 
-    s0 = peg$currPos;
-    s1 = peg$parseDriverModifier();
-    if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$c162(s1);
+        return s0;
     }
-    s0 = s1;
 
-    return s0;
-  }
+    function peg$parseDriverModifier() {
+        var s0, s1;
 
-  function peg$parseDriverModifier() {
-    var s0, s1;
+        s0 = peg$currPos;
+        if (input.substr(peg$currPos, 6).toLowerCase() === peg$c163) {
+            s1 = input.substr(peg$currPos, 6);
+            peg$currPos += 6;
+        } else {
+            s1 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$c164);
+            }
+        }
+        if (s1 !== peg$FAILED) {
+            peg$savedPos = s0;
+            s1 = peg$c165();
+        }
+        s0 = s1;
 
-    s0 = peg$currPos;
-    if (input.substr(peg$currPos, 6).toLowerCase() === peg$c163) {
-      s1 = input.substr(peg$currPos, 6);
-      peg$currPos += 6;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c164); }
-    }
-    if (s1 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s1 = peg$c165();
+        return s0;
     }
-    s0 = s1;
 
-    return s0;
-  }
+    peg$result = peg$startRuleFunction();
 
-  peg$result = peg$startRuleFunction();
+    if (peg$result !== peg$FAILED && peg$currPos === input.length) {
+        return peg$result;
+    } else {
+        if (peg$result !== peg$FAILED && peg$currPos < input.length) {
+            peg$fail(peg$endExpectation());
+        }
 
-  if (peg$result !== peg$FAILED && peg$currPos === input.length) {
-    return peg$result;
-  } else {
-    if (peg$result !== peg$FAILED && peg$currPos < input.length) {
-      peg$fail(peg$endExpectation());
+        throw peg$buildStructuredError(
+            peg$maxFailExpected,
+            peg$maxFailPos < input.length ? input.charAt(peg$maxFailPos) : null,
+            peg$maxFailPos < input.length
+                ? peg$computeLocation(peg$maxFailPos, peg$maxFailPos + 1)
+                : peg$computeLocation(peg$maxFailPos, peg$maxFailPos)
+        );
     }
-
-    throw peg$buildStructuredError(
-      peg$maxFailExpected,
-      peg$maxFailPos < input.length ? input.charAt(peg$maxFailPos) : null,
-      peg$maxFailPos < input.length
-        ? peg$computeLocation(peg$maxFailPos, peg$maxFailPos + 1)
-        : peg$computeLocation(peg$maxFailPos, peg$maxFailPos)
-    );
-  }
 }
 
 module.exports = {
-  SyntaxError: peg$SyntaxError,
-  parse:       peg$parse
+    SyntaxError: peg$SyntaxError,
+    parse: peg$parse,
 };
diff --git a/src/shared/lib/oql/oql-parser.spec.ts b/src/shared/lib/oql/oql-parser.spec.ts
index e97b261266e..3dad2b8d758 100644
--- a/src/shared/lib/oql/oql-parser.spec.ts
+++ b/src/shared/lib/oql/oql-parser.spec.ts
@@ -1,12 +1,14 @@
-import oql_parser, {Alteration, OQLQuery} from './oql-parser';
-import {assert} from "chai";
+import oql_parser, { Alteration, OQLQuery } from './oql-parser';
+import { assert } from 'chai';
 
-function testCallback(query:string, expectedParsedResult:OQLQuery) {
+function testCallback(query: string, expectedParsedResult: OQLQuery) {
     try {
         assert.deepEqual(oql_parser.parse(query), expectedParsedResult);
     } catch (e) {
-        if (e.name === "SyntaxError") {
-            throw new Error(`SyntaxError at character ${e.location.start.offset}: ${e.message}`);
+        if (e.name === 'SyntaxError') {
+            throw new Error(
+                `SyntaxError at character ${e.location.start.offset}: ${e.message}`
+            );
         } else {
             throw e;
         }
@@ -14,293 +16,1040 @@ function testCallback(query:string, expectedParsedResult:OQLQuery) {
 }
 
 type DoTest = {
-    (query:string, expectedParsedResult:OQLQuery):void;
-    only: (query:string, expectedParsedResult:OQLQuery)=>void;
+    (query: string, expectedParsedResult: OQLQuery): void;
+    only: (query: string, expectedParsedResult: OQLQuery) => void;
 };
 
-const doTest:DoTest = function(query:string, expectedParsedResult:OQLQuery) {
-    it(query, ()=>testCallback(query, expectedParsedResult));
+const doTest: DoTest = function(query: string, expectedParsedResult: OQLQuery) {
+    it(query, () => testCallback(query, expectedParsedResult));
 } as DoTest;
 
-doTest.only = function(query:string, expectedParsedResult:OQLQuery) {
-    it.only(query, ()=>testCallback(query, expectedParsedResult));
+doTest.only = function(query: string, expectedParsedResult: OQLQuery) {
+    it.only(query, () => testCallback(query, expectedParsedResult));
 };
 
-describe("OQL parser", ()=>{
-    doTest("     TP53", [{gene:"TP53", alterations:false}]);
-    doTest("                      [TP53 BRCA1] NRAS",
+describe('OQL parser', () => {
+    doTest('     TP53', [{ gene: 'TP53', alterations: false }]);
+    doTest('                      [TP53 BRCA1] NRAS', [
+        {
+            label: undefined,
+            list: [
+                {
+                    gene: 'TP53',
+                    alterations: false,
+                },
+                {
+                    gene: 'BRCA1',
+                    alterations: false,
+                },
+            ],
+        },
+        {
+            gene: 'NRAS',
+            alterations: false,
+        },
+    ]);
+    doTest('TP53', [{ gene: 'TP53', alterations: false }]);
+    doTest('TP53;', [{ gene: 'TP53', alterations: false }]);
+    doTest('TP53\n', [{ gene: 'TP53', alterations: false }]);
+    doTest('TP53 BRCA1 KRAS NRAS', [
+        { gene: 'TP53', alterations: false },
+        { gene: 'BRCA1', alterations: false },
+        { gene: 'KRAS', alterations: false },
+        { gene: 'NRAS', alterations: false },
+    ]);
+    doTest('TP53,BRCA1,KRAS, NRAS', [
+        { gene: 'TP53', alterations: false },
+        { gene: 'BRCA1', alterations: false },
+        { gene: 'KRAS', alterations: false },
+        { gene: 'NRAS', alterations: false },
+    ]);
+    doTest('TP53: MUT BRCA1', [
+        {
+            gene: 'TP53',
+            alterations: [
+                { alteration_type: 'mut', info: {}, modifiers: [] },
+                {
+                    alteration_type: 'mut',
+                    constr_rel: '=',
+                    constr_type: 'name',
+                    constr_val: 'BRCA1',
+                    info: { unrecognized: true },
+                    modifiers: [],
+                },
+            ],
+        },
+    ]);
+    doTest('TP53:MUT', [
+        {
+            gene: 'TP53',
+            alterations: [{ alteration_type: 'mut', info: {}, modifiers: [] }],
+        },
+    ]);
+    doTest('TP53: GERMLINE', [
+        {
+            gene: 'TP53',
+            alterations: [
+                { alteration_type: 'mut', info: {}, modifiers: ['GERMLINE'] },
+            ],
+        },
+    ]);
+    doTest('TP53: GERMLINE_SOMATIC', [
+        {
+            gene: 'TP53',
+            alterations: [
+                {
+                    alteration_type: 'mut',
+                    info: {},
+                    modifiers: ['GERMLINE', 'SOMATIC'],
+                },
+            ],
+        },
+    ]);
+    doTest('TP53: protein_change_code', [
+        {
+            gene: 'TP53',
+            alterations: [
+                {
+                    alteration_type: 'mut',
+                    constr_type: 'name',
+                    constr_rel: '=',
+                    constr_val: 'protein_change_code',
+                    info: { unrecognized: true },
+                    modifiers: [],
+                },
+            ],
+        },
+    ]);
+    doTest('STK11:  MUT=X125_SPLICE', [
+        {
+            gene: 'STK11',
+            alterations: [
+                {
+                    alteration_type: 'mut',
+                    constr_type: 'name',
+                    constr_rel: '=',
+                    constr_val: 'X125_SPLICE',
+                    info: { unrecognized: true },
+                    modifiers: [],
+                },
+            ],
+        },
+    ]);
+    doTest('STK11:  MUT=DRIVER_X125_SPLICE', [
+        {
+            gene: 'STK11',
+            alterations: [
+                {
+                    alteration_type: 'mut',
+                    constr_type: 'name',
+                    constr_rel: '=',
+                    constr_val: 'X125_SPLICE',
+                    info: { unrecognized: true },
+                    modifiers: ['DRIVER'],
+                },
+            ],
+        },
+    ]);
+    doTest('STK11:  MUT=DRIVER_X125_SPLICE_GERMLINE', [
+        {
+            gene: 'STK11',
+            alterations: [
+                {
+                    alteration_type: 'mut',
+                    constr_type: 'name',
+                    constr_rel: '=',
+                    constr_val: 'X125_SPLICE',
+                    info: { unrecognized: true },
+                    modifiers: ['DRIVER', 'GERMLINE'],
+                },
+            ],
+        },
+    ]);
+    doTest('TP53: protein_change_code_GERMLINE', [
+        {
+            gene: 'TP53',
+            alterations: [
+                {
+                    alteration_type: 'mut',
+                    constr_type: 'name',
+                    constr_rel: '=',
+                    constr_val: 'protein_change_code',
+                    info: { unrecognized: true },
+                    modifiers: ['GERMLINE'],
+                },
+            ],
+        },
+    ]);
+    doTest('TP53: DRIVER_protein_change_code', [
+        {
+            gene: 'TP53',
+            alterations: [
+                {
+                    alteration_type: 'mut',
+                    constr_type: 'name',
+                    constr_rel: '=',
+                    constr_val: 'protein_change_code',
+                    info: { unrecognized: true },
+                    modifiers: ['DRIVER'],
+                },
+            ],
+        },
+    ]);
+    doTest('TP53: protein_change_code_DRIVER', [
+        {
+            gene: 'TP53',
+            alterations: [
+                {
+                    alteration_type: 'mut',
+                    constr_type: 'name',
+                    constr_rel: '=',
+                    constr_val: 'protein_change_code',
+                    info: { unrecognized: true },
+                    modifiers: ['DRIVER'],
+                },
+            ],
+        },
+    ]);
+    doTest('KRAS: G12D_DRIVER', [
+        {
+            gene: 'KRAS',
+            alterations: [
+                {
+                    alteration_type: 'mut',
+                    constr_type: 'name',
+                    constr_rel: '=',
+                    constr_val: 'G12D',
+                    info: {},
+                    modifiers: ['DRIVER'],
+                },
+            ],
+        },
+    ]);
+    doTest('KRAS: G12_DRIVER', [
+        {
+            gene: 'KRAS',
+            alterations: [
+                {
+                    alteration_type: 'mut',
+                    constr_type: 'position',
+                    constr_rel: '=',
+                    constr_val: 12,
+                    info: { amino_acid: 'G' },
+                    modifiers: ['DRIVER'],
+                },
+            ],
+        },
+    ]);
+    doTest('KRAS: DRIVER_G12D', [
+        {
+            gene: 'KRAS',
+            alterations: [
+                {
+                    alteration_type: 'mut',
+                    constr_type: 'name',
+                    constr_rel: '=',
+                    constr_val: 'G12D',
+                    info: {},
+                    modifiers: ['DRIVER'],
+                },
+            ],
+        },
+    ]);
+    doTest('KRAS: DRIVER_G12', [
+        {
+            gene: 'KRAS',
+            alterations: [
+                {
+                    alteration_type: 'mut',
+                    constr_type: 'position',
+                    constr_rel: '=',
+                    constr_val: 12,
+                    info: { amino_acid: 'G' },
+                    modifiers: ['DRIVER'],
+                },
+            ],
+        },
+    ]);
+    doTest('KRAS: MUT=G12D_DRIVER', [
+        {
+            gene: 'KRAS',
+            alterations: [
+                {
+                    alteration_type: 'mut',
+                    constr_type: 'name',
+                    constr_rel: '=',
+                    constr_val: 'G12D',
+                    info: {},
+                    modifiers: ['DRIVER'],
+                },
+            ],
+        },
+    ]);
+    doTest('KRAS: MUT=G12_DRIVER', [
+        {
+            gene: 'KRAS',
+            alterations: [
+                {
+                    alteration_type: 'mut',
+                    constr_type: 'position',
+                    constr_rel: '=',
+                    constr_val: 12,
+                    info: { amino_acid: 'G' },
+                    modifiers: ['DRIVER'],
+                },
+            ],
+        },
+    ]);
+    doTest('KRAS: MUT=DRIVER_G12D', [
+        {
+            gene: 'KRAS',
+            alterations: [
+                {
+                    alteration_type: 'mut',
+                    constr_type: 'name',
+                    constr_rel: '=',
+                    constr_val: 'G12D',
+                    info: {},
+                    modifiers: ['DRIVER'],
+                },
+            ],
+        },
+    ]);
+    doTest('KRAS: MUT=DRIVER_G12', [
+        {
+            gene: 'KRAS',
+            alterations: [
+                {
+                    alteration_type: 'mut',
+                    constr_type: 'position',
+                    constr_rel: '=',
+                    constr_val: 12,
+                    info: { amino_acid: 'G' },
+                    modifiers: ['DRIVER'],
+                },
+            ],
+        },
+    ]);
+    doTest('TP53:MISSENSE_GERMLINE', [
+        {
+            gene: 'TP53',
+            alterations: [
+                {
+                    alteration_type: 'mut',
+                    constr_rel: '=',
+                    constr_type: 'class',
+                    constr_val: 'MISSENSE',
+                    info: {},
+                    modifiers: ['GERMLINE'],
+                },
+            ],
+        },
+    ]);
+    doTest(
+        'TP53:MISSENSE_GERMLINE_SOMATIC GERMLINE_INFRAME_SOMATIC_DRIVER GERMLINE_DRIVER_INFRAME_SOMATIC DRIVER_SOMATIC_GERMLINE_NONSENSE DRIVER_MUT_GERMLINE',
         [
             {
-                "label": undefined,
-                "list": [
+                gene: 'TP53',
+                alterations: [
                     {
-                        "gene": "TP53",
-                        "alterations": false
+                        alteration_type: 'mut',
+                        constr_rel: '=',
+                        constr_type: 'class',
+                        constr_val: 'MISSENSE',
+                        info: {},
+                        modifiers: ['GERMLINE', 'SOMATIC'],
                     },
                     {
-                        "gene": "BRCA1",
-                        "alterations": false
-                    }
-                ]
-            },
-            {
-                "gene": "NRAS",
-                "alterations": false
-            }
-        ]);
-    doTest("TP53", [{gene:"TP53", alterations:false}]);
-    doTest("TP53;", [{gene:"TP53", alterations:false}]);
-    doTest("TP53\n", [{gene:"TP53", alterations:false}]);
-    doTest("TP53 BRCA1 KRAS NRAS", [{gene:"TP53", alterations:false}, {gene:"BRCA1", alterations:false}, {gene:"KRAS", alterations:false}, {gene:"NRAS", alterations:false}]);
-    doTest("TP53,BRCA1,KRAS, NRAS", [{gene:"TP53", alterations:false}, {gene:"BRCA1", alterations:false}, {gene:"KRAS", alterations:false}, {gene:"NRAS", alterations:false}]);
-    doTest("TP53: MUT BRCA1", [{gene:"TP53", alterations:[{alteration_type:"mut", info:{}, modifiers:[]}, {alteration_type:"mut", constr_rel:"=", constr_type:"name", constr_val:"BRCA1", info:{unrecognized:true}, modifiers:[]}]}]);
-    doTest("TP53:MUT", [{gene:"TP53", alterations:[{alteration_type: "mut", info:{}, modifiers:[]}]}])
-    doTest("TP53: GERMLINE", [{gene:"TP53", alterations:[{alteration_type:"mut", info:{}, modifiers:["GERMLINE"]}]}]);
-    doTest("TP53: GERMLINE_SOMATIC", [{gene:"TP53", alterations:[{alteration_type:"mut", info:{}, modifiers:["GERMLINE", "SOMATIC"]}]}]);
-    doTest("TP53: protein_change_code", [{gene:"TP53", alterations:[{alteration_type:"mut", constr_type:"name", constr_rel:"=", constr_val:"protein_change_code", info:{unrecognized:true}, modifiers:[]}]}]);
-    doTest("STK11:  MUT=X125_SPLICE", [{gene:"STK11", alterations:[{alteration_type:"mut", constr_type:"name", constr_rel:"=", constr_val:"X125_SPLICE", info:{unrecognized:true}, modifiers:[]}]}]);
-    doTest("STK11:  MUT=DRIVER_X125_SPLICE", [{gene:"STK11", alterations:[{alteration_type:"mut", constr_type:"name", constr_rel:"=", constr_val:"X125_SPLICE", info:{unrecognized:true}, modifiers:["DRIVER"]}]}]);
-    doTest("STK11:  MUT=DRIVER_X125_SPLICE_GERMLINE", [{gene:"STK11", alterations:[{alteration_type:"mut", constr_type:"name", constr_rel:"=", constr_val:"X125_SPLICE", info:{unrecognized:true}, modifiers:["DRIVER","GERMLINE"]}]}]);
-    doTest("TP53: protein_change_code_GERMLINE", [{gene:"TP53", alterations:[{alteration_type:"mut", constr_type:"name", constr_rel:"=", constr_val:"protein_change_code", info:{unrecognized:true}, modifiers:["GERMLINE"]}]}]);
-    doTest("TP53: DRIVER_protein_change_code", [{gene:"TP53", alterations:[{alteration_type:"mut", constr_type:"name", constr_rel:"=", constr_val:"protein_change_code", info:{unrecognized:true}, modifiers:["DRIVER"]}]}]);
-    doTest("TP53: protein_change_code_DRIVER", [{gene:"TP53", alterations:[{alteration_type:"mut", constr_type:"name", constr_rel:"=", constr_val:"protein_change_code", info:{unrecognized:true}, modifiers:["DRIVER"]}]}]);
-    doTest("KRAS: G12D_DRIVER", [{gene:"KRAS", alterations:[{alteration_type:"mut", constr_type:"name", constr_rel:"=", constr_val:"G12D", info:{}, modifiers:["DRIVER"]}]}]);
-    doTest("KRAS: G12_DRIVER", [{gene:"KRAS", alterations:[{alteration_type:"mut", constr_type:"position", constr_rel:"=", constr_val:12, info:{amino_acid:"G"}, modifiers:["DRIVER"]}]}]);
-    doTest("KRAS: DRIVER_G12D", [{gene:"KRAS", alterations:[{alteration_type:"mut", constr_type:"name", constr_rel:"=", constr_val:"G12D", info:{}, modifiers:["DRIVER"]}]}]);
-    doTest("KRAS: DRIVER_G12", [{gene:"KRAS", alterations:[{alteration_type:"mut", constr_type:"position", constr_rel:"=", constr_val:12, info:{amino_acid:"G"}, modifiers:["DRIVER"]}]}]);
-    doTest("KRAS: MUT=G12D_DRIVER", [{gene:"KRAS", alterations:[{alteration_type:"mut", constr_type:"name", constr_rel:"=", constr_val:"G12D", info:{}, modifiers:["DRIVER"]}]}]);
-    doTest("KRAS: MUT=G12_DRIVER", [{gene:"KRAS", alterations:[{alteration_type:"mut", constr_type:"position", constr_rel:"=", constr_val:12, info:{amino_acid:"G"}, modifiers:["DRIVER"]}]}]);
-    doTest("KRAS: MUT=DRIVER_G12D", [{gene:"KRAS", alterations:[{alteration_type:"mut", constr_type:"name", constr_rel:"=", constr_val:"G12D", info:{}, modifiers:["DRIVER"]}]}]);
-    doTest("KRAS: MUT=DRIVER_G12", [{gene:"KRAS", alterations:[{alteration_type:"mut", constr_type:"position", constr_rel:"=", constr_val:12, info:{amino_acid:"G"}, modifiers:["DRIVER"]}]}]);
-    doTest("TP53:MISSENSE_GERMLINE", [{gene:"TP53", alterations:[{alteration_type: "mut", constr_rel: "=", constr_type: "class", constr_val: "MISSENSE", info: {}, modifiers:["GERMLINE"]}]}])
-    doTest("TP53:MISSENSE_GERMLINE_SOMATIC GERMLINE_INFRAME_SOMATIC_DRIVER GERMLINE_DRIVER_INFRAME_SOMATIC DRIVER_SOMATIC_GERMLINE_NONSENSE DRIVER_MUT_GERMLINE", [{gene:"TP53", alterations:[
-        {alteration_type: "mut", constr_rel: "=", constr_type: "class", constr_val: "MISSENSE", info: {}, modifiers:["GERMLINE", "SOMATIC"]},
-        {alteration_type: "mut", constr_rel: "=", constr_type: "class", constr_val: "INFRAME", info: {}, modifiers:["GERMLINE", "SOMATIC", "DRIVER"]},
-        {alteration_type: "mut", constr_rel: "=", constr_type: "class", constr_val: "INFRAME", info: {}, modifiers:["GERMLINE", "DRIVER", "SOMATIC"]},
-        {alteration_type: "mut", constr_rel: "=", constr_type: "class", constr_val: "NONSENSE", info: {}, modifiers:["DRIVER", "SOMATIC", "GERMLINE"]},
-        {alteration_type: "mut", info: {}, modifiers:["DRIVER", "GERMLINE"]}
-    ]}]);
-    doTest("TP53:GERMLINE_MISSENSE", [{gene:"TP53", alterations:[{alteration_type: "mut", constr_rel: "=", constr_type: "class", constr_val: "MISSENSE", info: {}, modifiers:["GERMLINE"]}]}])
-    doTest("TP53:GERMLINE_SOMATIC_MISSENSE", [{gene:"TP53", alterations:[{alteration_type: "mut", constr_rel: "=", constr_type: "class", constr_val: "MISSENSE", info: {}, modifiers:["GERMLINE", "SOMATIC"]}]}])
-    doTest("TP53:MISSENSE_GERMLINE PROMOTER", [{gene:"TP53", alterations:[{alteration_type: "mut", constr_rel: "=", constr_type: "class", constr_val: "MISSENSE", info: {}, modifiers:["GERMLINE"]},{alteration_type: "mut", constr_rel: "=", constr_type: "class", constr_val: "PROMOTER", info: {}, modifiers:[]}]}])
-    doTest("TP53:MISSENSE_GERMLINE PROMOTER_SOMATIC", [{gene:"TP53", alterations:[{alteration_type: "mut", constr_rel: "=", constr_type: "class", constr_val: "MISSENSE", info: {}, modifiers:["GERMLINE"]},{alteration_type: "mut", constr_rel: "=", constr_type: "class", constr_val: "PROMOTER", info: {}, modifiers:["SOMATIC"]}]}])
-    doTest("TP53:MISSENSE PROMOTER_GERMLINE", [{gene:"TP53", alterations:[{alteration_type: "mut", constr_rel: "=", constr_type: "class", constr_val: "MISSENSE", info: {}, modifiers:[]},{alteration_type: "mut", constr_rel: "=", constr_type: "class", constr_val: "PROMOTER", info: {}, modifiers:["GERMLINE"]}]}])
-    doTest("TP53:MISSENSE GERMLINE_PROMOTER", [{gene:"TP53", alterations:[{alteration_type: "mut", constr_rel: "=", constr_type: "class", constr_val: "MISSENSE", info: {}, modifiers:[]},{alteration_type: "mut", constr_rel: "=", constr_type: "class", constr_val: "PROMOTER", info: {}, modifiers:["GERMLINE"]}]}])
-    doTest("TP53:SOMATIC GERMLINE_PROMOTER", [{gene:"TP53", alterations:[{alteration_type: "mut", info: {}, modifiers:["SOMATIC"]},{alteration_type: "mut", constr_rel: "=", constr_type: "class", constr_val: "PROMOTER", info: {}, modifiers:["GERMLINE"]}]}])
-    doTest("TP53:DRIVER GERMLINE_DRIVER DRIVER_GERMLINE TRUNC_DRIVER DRIVER_MISSENSE INFRAME_DRIVER_GERMLINE DRIVER_GERMLINE_INFRAME", [{gene:"TP53", alterations:[
-        {alteration_type: "any", modifiers:["DRIVER"]},
-        {alteration_type: "mut", info: {}, modifiers:["GERMLINE", "DRIVER"]},
-        {alteration_type: "mut", info: {}, modifiers:["DRIVER", "GERMLINE"]},
-        {alteration_type: "mut", constr_rel: "=", constr_type: "class", constr_val: "TRUNC", info: {}, modifiers:["DRIVER"]},
-        {alteration_type: "mut", constr_rel: "=", constr_type: "class", constr_val: "MISSENSE", info: {}, modifiers:["DRIVER"]},
-        {alteration_type: "mut", constr_rel: "=", constr_type: "class", constr_val: "INFRAME", info: {}, modifiers:["DRIVER", "GERMLINE"]},
-        {alteration_type: "mut", constr_rel: "=", constr_type: "class", constr_val: "INFRAME", info: {}, modifiers:["DRIVER", "GERMLINE"]}
-    ] as Alteration[]}])
-    doTest("TP53:MUT=DRIVER MUT_DRIVER DRIVER_MUT CNA_DRIVER DRIVER_CNA", [{gene:"TP53", alterations:[
-            {alteration_type: "mut", constr_rel:"=", constr_type: undefined, constr_val: undefined, info: {}, modifiers:["DRIVER"]},
-            {alteration_type: "mut", info: {}, modifiers:["DRIVER"]},
-            {alteration_type: "mut", info: {}, modifiers:["DRIVER"]},
-            {alteration_type: "cna", modifiers:["DRIVER"]},
-            {alteration_type: "cna", modifiers:["DRIVER"]}
-        ] as Alteration[]}])
-    doTest("TP53:AMP_DRIVER DRIVER_AMP FUSION_DRIVER DRIVER_FUSION DRIVER_HOMDEL HETLOSS DRIVER", [{gene:"TP53", alterations:[
-            {alteration_type: "cna", constr_rel:"=", constr_val:"AMP", modifiers:["DRIVER"]},
-            {alteration_type: "cna", constr_rel:"=", constr_val:"AMP", modifiers:["DRIVER"]},
-            {alteration_type: "fusion", modifiers:["DRIVER"]},
-            {alteration_type: "fusion", modifiers:["DRIVER"]},
-            {alteration_type: "cna", constr_rel:"=", constr_val:"HOMDEL", modifiers:["DRIVER"]},
-            {alteration_type: "cna", constr_rel:"=", constr_val:"HETLOSS", modifiers:[]},
-            {alteration_type: "any", modifiers:["DRIVER"]}
-        ] as Alteration[]}])
-    doTest("TP53:MISSENSE PROMOTER", [{gene:"TP53", alterations:[{alteration_type: "mut", constr_rel: "=", constr_type: "class", constr_val: "MISSENSE", info: {}, modifiers:[]},{alteration_type: "mut", constr_rel: "=", constr_type: "class", constr_val: "PROMOTER", info: {}, modifiers:[]}]}])
-    doTest("TP53:MUT;", [{gene:"TP53", alterations:[{alteration_type: "mut", info:{}, modifiers:[]}]}])
-    doTest("TP53:MUT\n", [{gene:"TP53", alterations:[{alteration_type: "mut", info:{}, modifiers:[]}]}])
-    doTest("TP53:MUT; BRCA1: gAiN hetloss EXP>=3 PROT<1", [{gene:"TP53", alterations:[{alteration_type: "mut", info:{}, modifiers:[]}]},
-        {gene:"BRCA1", alterations:[{alteration_type: "cna", constr_rel: "=", constr_val: "GAIN", modifiers:[]},
-            {alteration_type: "cna", constr_rel: "=", constr_val: "HETLOSS", modifiers:[]},
-            {alteration_type: "exp", constr_rel: ">=", constr_val: 3},
-            {alteration_type: "prot", constr_rel: "<", constr_val: 1}] as Alteration[]}])
-    doTest("TP53:MUT;;;\n BRCA1: AMP HOMDEL EXP>=3 PROT<1", [{gene:"TP53", alterations:[{alteration_type: "mut", info:{}, modifiers:[]}]},
-        {gene:"BRCA1", alterations:[{alteration_type: "cna", constr_rel: "=", constr_val: "AMP", modifiers:[]},
-            {alteration_type: "cna", constr_rel: "=", constr_val: "HOMDEL", modifiers:[]},
-            {alteration_type: "exp", constr_rel: ">=", constr_val: 3},
-            {alteration_type: "prot", constr_rel: "<", constr_val: 1}] as Alteration[]}])
-    doTest("TP53:MUT;\n BRCA1: amp GAIN EXP>=3 PROT<1", [{gene:"TP53", alterations:[{alteration_type: "mut", info:{}, modifiers:[]}]},
-        {gene:"BRCA1", alterations:[{alteration_type: "cna", constr_rel: "=", constr_val: "AMP", modifiers:[]},
-            {alteration_type: "cna", constr_rel: "=", constr_val: "GAIN", modifiers:[]},
-            {alteration_type: "exp", constr_rel: ">=", constr_val: 3},
-            {alteration_type: "prot", constr_rel: "<", constr_val: 1}] as Alteration[]}])
-    doTest("TP53:MUT\n BRCA1: AMP HOMDEL EXP>=3 PROT<1;", [{gene:"TP53", alterations:[{alteration_type: "mut", info:{}, modifiers:[]}]},
-        {gene:"BRCA1", alterations:[{alteration_type: "cna", constr_rel: "=", constr_val: "AMP", modifiers:[]},
-            {alteration_type: "cna", constr_rel: "=", constr_val: "HOMDEL", modifiers:[]},
-            {alteration_type: "exp", constr_rel: ">=", constr_val: 3},
-            {alteration_type: "prot", constr_rel: "<", constr_val: 1}] as Alteration[]}])
-    doTest("TP53:MUT, BRCA1: AMP HOMDEL EXP>=3 PROT<1;", [{gene:"TP53", alterations:[{alteration_type: "mut", info:{}, modifiers:[]}]},
-        {gene:"BRCA1", alterations:[{alteration_type: "cna", constr_rel: "=", constr_val: "AMP", modifiers:[]},
-                {alteration_type: "cna", constr_rel: "=", constr_val: "HOMDEL", modifiers:[]},
-                {alteration_type: "exp", constr_rel: ">=", constr_val: 3},
-                {alteration_type: "prot", constr_rel: "<", constr_val: 1}] as Alteration[]}])
-
-    doTest("TP53:PROT<=-2\n", [{gene:"TP53", alterations:[{alteration_type: "prot", constr_rel: "<=", constr_val:-2}]}])
-
-    doTest("BRAF:MUT=V600E", [{gene:"BRAF", alterations:[{alteration_type: "mut", constr_rel: "=", constr_type:"name", constr_val:"V600E", info:{}, modifiers:[]}]}])
-    doTest("BRAF:MUT=V600", [{gene:"BRAF", alterations:[{alteration_type: "mut", constr_rel: "=", constr_type:"position", constr_val:600, info:{amino_acid:"V"}, modifiers:[]}]}])
-    doTest("BRAF:FUSION MUT=V600", [{gene:"BRAF", alterations:[{alteration_type:'fusion', modifiers:[]}, {alteration_type: "mut", constr_rel: "=", constr_type:"position", constr_val:600, info:{"amino_acid":"V"}, modifiers:[]}] as Alteration[]}])
-    doTest("BRAF:FUSION", [{gene:"BRAF", alterations:[{alteration_type:'fusion', modifiers:[]}] as Alteration[]}])
-    doTest("MIR-493*:MUT=V600", [{gene:"MIR-493*", alterations:[{alteration_type: "mut", constr_rel: "=", constr_type:"position", constr_val:600, info:{amino_acid:"V"}, modifiers:[]}]}])
-
-    doTest("BRAF:CNA >= gain", [{gene:"BRAF", alterations:[{alteration_type:"cna", constr_rel:">=", constr_val:"GAIN", modifiers:[]}] as Alteration[]}])
-    doTest("BRAF:CNA < homdel", [{gene:"BRAF", alterations:[{alteration_type:"cna", constr_rel:"<", constr_val:"HOMDEL", modifiers:[]}] as Alteration[]}])
-
-    doTest("[TP53 BRCA1] NRAS",
-        [
-            {
-                "label": undefined,
-                "list": [
+                        alteration_type: 'mut',
+                        constr_rel: '=',
+                        constr_type: 'class',
+                        constr_val: 'INFRAME',
+                        info: {},
+                        modifiers: ['GERMLINE', 'SOMATIC', 'DRIVER'],
+                    },
+                    {
+                        alteration_type: 'mut',
+                        constr_rel: '=',
+                        constr_type: 'class',
+                        constr_val: 'INFRAME',
+                        info: {},
+                        modifiers: ['GERMLINE', 'DRIVER', 'SOMATIC'],
+                    },
                     {
-                        "gene": "TP53",
-                        "alterations": false
+                        alteration_type: 'mut',
+                        constr_rel: '=',
+                        constr_type: 'class',
+                        constr_val: 'NONSENSE',
+                        info: {},
+                        modifiers: ['DRIVER', 'SOMATIC', 'GERMLINE'],
                     },
                     {
-                        "gene": "BRCA1",
-                        "alterations": false
-                    }
-                ]
+                        alteration_type: 'mut',
+                        info: {},
+                        modifiers: ['DRIVER', 'GERMLINE'],
+                    },
+                ],
             },
-            {
-                "gene": "NRAS",
-                "alterations": false
-            }
-        ]);
-
-    doTest("NRAS [TP53 BRCA1]",
+        ]
+    );
+    doTest('TP53:GERMLINE_MISSENSE', [
+        {
+            gene: 'TP53',
+            alterations: [
+                {
+                    alteration_type: 'mut',
+                    constr_rel: '=',
+                    constr_type: 'class',
+                    constr_val: 'MISSENSE',
+                    info: {},
+                    modifiers: ['GERMLINE'],
+                },
+            ],
+        },
+    ]);
+    doTest('TP53:GERMLINE_SOMATIC_MISSENSE', [
+        {
+            gene: 'TP53',
+            alterations: [
+                {
+                    alteration_type: 'mut',
+                    constr_rel: '=',
+                    constr_type: 'class',
+                    constr_val: 'MISSENSE',
+                    info: {},
+                    modifiers: ['GERMLINE', 'SOMATIC'],
+                },
+            ],
+        },
+    ]);
+    doTest('TP53:MISSENSE_GERMLINE PROMOTER', [
+        {
+            gene: 'TP53',
+            alterations: [
+                {
+                    alteration_type: 'mut',
+                    constr_rel: '=',
+                    constr_type: 'class',
+                    constr_val: 'MISSENSE',
+                    info: {},
+                    modifiers: ['GERMLINE'],
+                },
+                {
+                    alteration_type: 'mut',
+                    constr_rel: '=',
+                    constr_type: 'class',
+                    constr_val: 'PROMOTER',
+                    info: {},
+                    modifiers: [],
+                },
+            ],
+        },
+    ]);
+    doTest('TP53:MISSENSE_GERMLINE PROMOTER_SOMATIC', [
+        {
+            gene: 'TP53',
+            alterations: [
+                {
+                    alteration_type: 'mut',
+                    constr_rel: '=',
+                    constr_type: 'class',
+                    constr_val: 'MISSENSE',
+                    info: {},
+                    modifiers: ['GERMLINE'],
+                },
+                {
+                    alteration_type: 'mut',
+                    constr_rel: '=',
+                    constr_type: 'class',
+                    constr_val: 'PROMOTER',
+                    info: {},
+                    modifiers: ['SOMATIC'],
+                },
+            ],
+        },
+    ]);
+    doTest('TP53:MISSENSE PROMOTER_GERMLINE', [
+        {
+            gene: 'TP53',
+            alterations: [
+                {
+                    alteration_type: 'mut',
+                    constr_rel: '=',
+                    constr_type: 'class',
+                    constr_val: 'MISSENSE',
+                    info: {},
+                    modifiers: [],
+                },
+                {
+                    alteration_type: 'mut',
+                    constr_rel: '=',
+                    constr_type: 'class',
+                    constr_val: 'PROMOTER',
+                    info: {},
+                    modifiers: ['GERMLINE'],
+                },
+            ],
+        },
+    ]);
+    doTest('TP53:MISSENSE GERMLINE_PROMOTER', [
+        {
+            gene: 'TP53',
+            alterations: [
+                {
+                    alteration_type: 'mut',
+                    constr_rel: '=',
+                    constr_type: 'class',
+                    constr_val: 'MISSENSE',
+                    info: {},
+                    modifiers: [],
+                },
+                {
+                    alteration_type: 'mut',
+                    constr_rel: '=',
+                    constr_type: 'class',
+                    constr_val: 'PROMOTER',
+                    info: {},
+                    modifiers: ['GERMLINE'],
+                },
+            ],
+        },
+    ]);
+    doTest('TP53:SOMATIC GERMLINE_PROMOTER', [
+        {
+            gene: 'TP53',
+            alterations: [
+                { alteration_type: 'mut', info: {}, modifiers: ['SOMATIC'] },
+                {
+                    alteration_type: 'mut',
+                    constr_rel: '=',
+                    constr_type: 'class',
+                    constr_val: 'PROMOTER',
+                    info: {},
+                    modifiers: ['GERMLINE'],
+                },
+            ],
+        },
+    ]);
+    doTest(
+        'TP53:DRIVER GERMLINE_DRIVER DRIVER_GERMLINE TRUNC_DRIVER DRIVER_MISSENSE INFRAME_DRIVER_GERMLINE DRIVER_GERMLINE_INFRAME',
         [
             {
-                "gene": "NRAS",
-                "alterations": false
-            },
-            {
-                "label": undefined,
-                "list": [
+                gene: 'TP53',
+                alterations: [
+                    { alteration_type: 'any', modifiers: ['DRIVER'] },
                     {
-                        "gene": "TP53",
-                        "alterations": false
+                        alteration_type: 'mut',
+                        info: {},
+                        modifiers: ['GERMLINE', 'DRIVER'],
                     },
                     {
-                        "gene": "BRCA1",
-                        "alterations": false
-                    }
-                ]
-            }
-        ]);
-
-    doTest("NRAS [TP53 BRCA1] BRCA2",
-        [
-            {
-                "gene": "NRAS",
-                "alterations": false
-            },
-            {
-                "label": undefined,
-                "list": [
-                    {
-                        "gene": "TP53",
-                        "alterations": false
+                        alteration_type: 'mut',
+                        info: {},
+                        modifiers: ['DRIVER', 'GERMLINE'],
                     },
                     {
-                        "gene": "BRCA1",
-                        "alterations": false
-                    }
-                ]
-            },
-            {
-                "gene": "BRCA2",
-                "alterations": false
-            }
-        ]);
-
-    doTest("[TP53;BRAF:MUT=V600E;KRAS] NRAS",
-        [
-            {
-                "label": undefined,
-                "list": [
+                        alteration_type: 'mut',
+                        constr_rel: '=',
+                        constr_type: 'class',
+                        constr_val: 'TRUNC',
+                        info: {},
+                        modifiers: ['DRIVER'],
+                    },
                     {
-                        "gene": "TP53",
-                        "alterations": false
+                        alteration_type: 'mut',
+                        constr_rel: '=',
+                        constr_type: 'class',
+                        constr_val: 'MISSENSE',
+                        info: {},
+                        modifiers: ['DRIVER'],
                     },
                     {
-                        "gene": "BRAF",
-                        "alterations": [
-                            {
-                                "alteration_type": "mut",
-                                "constr_rel": "=",
-                                "constr_type": "name",
-                                "constr_val": "V600E",
-                                "info": {},
-                                modifiers:[]
-                            }
-                        ]
+                        alteration_type: 'mut',
+                        constr_rel: '=',
+                        constr_type: 'class',
+                        constr_val: 'INFRAME',
+                        info: {},
+                        modifiers: ['DRIVER', 'GERMLINE'],
                     },
                     {
-                        "gene": "KRAS",
-                        "alterations": false
-                    }
-                ]
+                        alteration_type: 'mut',
+                        constr_rel: '=',
+                        constr_type: 'class',
+                        constr_val: 'INFRAME',
+                        info: {},
+                        modifiers: ['DRIVER', 'GERMLINE'],
+                    },
+                ] as Alteration[],
             },
-            {
-                "gene": "NRAS",
-                "alterations": false
-            }
-        ]);
-
-    doTest("[TP53 BRCA1] [KRAS NRAS]",
+        ]
+    );
+    doTest('TP53:MUT=DRIVER MUT_DRIVER DRIVER_MUT CNA_DRIVER DRIVER_CNA', [
+        {
+            gene: 'TP53',
+            alterations: [
+                {
+                    alteration_type: 'mut',
+                    constr_rel: '=',
+                    constr_type: undefined,
+                    constr_val: undefined,
+                    info: {},
+                    modifiers: ['DRIVER'],
+                },
+                { alteration_type: 'mut', info: {}, modifiers: ['DRIVER'] },
+                { alteration_type: 'mut', info: {}, modifiers: ['DRIVER'] },
+                { alteration_type: 'cna', modifiers: ['DRIVER'] },
+                { alteration_type: 'cna', modifiers: ['DRIVER'] },
+            ] as Alteration[],
+        },
+    ]);
+    doTest(
+        'TP53:AMP_DRIVER DRIVER_AMP FUSION_DRIVER DRIVER_FUSION DRIVER_HOMDEL HETLOSS DRIVER',
         [
             {
-                "label": undefined,
-                "list": [
+                gene: 'TP53',
+                alterations: [
                     {
-                        "gene": "TP53",
-                        "alterations": false
+                        alteration_type: 'cna',
+                        constr_rel: '=',
+                        constr_val: 'AMP',
+                        modifiers: ['DRIVER'],
                     },
                     {
-                        "gene": "BRCA1",
-                        "alterations": false
-                    }
-                ]
-            },
-            {
-                "label": undefined,
-                "list": [
-                    {
-                        "gene": "KRAS",
-                        "alterations": false
+                        alteration_type: 'cna',
+                        constr_rel: '=',
+                        constr_val: 'AMP',
+                        modifiers: ['DRIVER'],
                     },
+                    { alteration_type: 'fusion', modifiers: ['DRIVER'] },
+                    { alteration_type: 'fusion', modifiers: ['DRIVER'] },
                     {
-                        "gene": "NRAS",
-                        "alterations": false
-                    }
-                ]
-            }
-        ]);
-
-    doTest('["Test_gene_set #1" TP53 BRCA1] NRAS',
-        [
-            {
-                "label": "Test_gene_set #1",
-                "list": [
-                    {
-                        "gene": "TP53",
-                        "alterations": false
+                        alteration_type: 'cna',
+                        constr_rel: '=',
+                        constr_val: 'HOMDEL',
+                        modifiers: ['DRIVER'],
                     },
                     {
-                        "gene": "BRCA1",
-                        "alterations": false
-                    }
-                ]
+                        alteration_type: 'cna',
+                        constr_rel: '=',
+                        constr_val: 'HETLOSS',
+                        modifiers: [],
+                    },
+                    { alteration_type: 'any', modifiers: ['DRIVER'] },
+                ] as Alteration[],
             },
-            {
-                "gene": "NRAS",
-                "alterations": false
-            }
-        ]);
-});
\ No newline at end of file
+        ]
+    );
+    doTest('TP53:MISSENSE PROMOTER', [
+        {
+            gene: 'TP53',
+            alterations: [
+                {
+                    alteration_type: 'mut',
+                    constr_rel: '=',
+                    constr_type: 'class',
+                    constr_val: 'MISSENSE',
+                    info: {},
+                    modifiers: [],
+                },
+                {
+                    alteration_type: 'mut',
+                    constr_rel: '=',
+                    constr_type: 'class',
+                    constr_val: 'PROMOTER',
+                    info: {},
+                    modifiers: [],
+                },
+            ],
+        },
+    ]);
+    doTest('TP53:MUT;', [
+        {
+            gene: 'TP53',
+            alterations: [{ alteration_type: 'mut', info: {}, modifiers: [] }],
+        },
+    ]);
+    doTest('TP53:MUT\n', [
+        {
+            gene: 'TP53',
+            alterations: [{ alteration_type: 'mut', info: {}, modifiers: [] }],
+        },
+    ]);
+    doTest('TP53:MUT; BRCA1: gAiN hetloss EXP>=3 PROT<1', [
+        {
+            gene: 'TP53',
+            alterations: [{ alteration_type: 'mut', info: {}, modifiers: [] }],
+        },
+        {
+            gene: 'BRCA1',
+            alterations: [
+                {
+                    alteration_type: 'cna',
+                    constr_rel: '=',
+                    constr_val: 'GAIN',
+                    modifiers: [],
+                },
+                {
+                    alteration_type: 'cna',
+                    constr_rel: '=',
+                    constr_val: 'HETLOSS',
+                    modifiers: [],
+                },
+                { alteration_type: 'exp', constr_rel: '>=', constr_val: 3 },
+                { alteration_type: 'prot', constr_rel: '<', constr_val: 1 },
+            ] as Alteration[],
+        },
+    ]);
+    doTest('TP53:MUT;;;\n BRCA1: AMP HOMDEL EXP>=3 PROT<1', [
+        {
+            gene: 'TP53',
+            alterations: [{ alteration_type: 'mut', info: {}, modifiers: [] }],
+        },
+        {
+            gene: 'BRCA1',
+            alterations: [
+                {
+                    alteration_type: 'cna',
+                    constr_rel: '=',
+                    constr_val: 'AMP',
+                    modifiers: [],
+                },
+                {
+                    alteration_type: 'cna',
+                    constr_rel: '=',
+                    constr_val: 'HOMDEL',
+                    modifiers: [],
+                },
+                { alteration_type: 'exp', constr_rel: '>=', constr_val: 3 },
+                { alteration_type: 'prot', constr_rel: '<', constr_val: 1 },
+            ] as Alteration[],
+        },
+    ]);
+    doTest('TP53:MUT;\n BRCA1: amp GAIN EXP>=3 PROT<1', [
+        {
+            gene: 'TP53',
+            alterations: [{ alteration_type: 'mut', info: {}, modifiers: [] }],
+        },
+        {
+            gene: 'BRCA1',
+            alterations: [
+                {
+                    alteration_type: 'cna',
+                    constr_rel: '=',
+                    constr_val: 'AMP',
+                    modifiers: [],
+                },
+                {
+                    alteration_type: 'cna',
+                    constr_rel: '=',
+                    constr_val: 'GAIN',
+                    modifiers: [],
+                },
+                { alteration_type: 'exp', constr_rel: '>=', constr_val: 3 },
+                { alteration_type: 'prot', constr_rel: '<', constr_val: 1 },
+            ] as Alteration[],
+        },
+    ]);
+    doTest('TP53:MUT\n BRCA1: AMP HOMDEL EXP>=3 PROT<1;', [
+        {
+            gene: 'TP53',
+            alterations: [{ alteration_type: 'mut', info: {}, modifiers: [] }],
+        },
+        {
+            gene: 'BRCA1',
+            alterations: [
+                {
+                    alteration_type: 'cna',
+                    constr_rel: '=',
+                    constr_val: 'AMP',
+                    modifiers: [],
+                },
+                {
+                    alteration_type: 'cna',
+                    constr_rel: '=',
+                    constr_val: 'HOMDEL',
+                    modifiers: [],
+                },
+                { alteration_type: 'exp', constr_rel: '>=', constr_val: 3 },
+                { alteration_type: 'prot', constr_rel: '<', constr_val: 1 },
+            ] as Alteration[],
+        },
+    ]);
+    doTest('TP53:MUT, BRCA1: AMP HOMDEL EXP>=3 PROT<1;', [
+        {
+            gene: 'TP53',
+            alterations: [{ alteration_type: 'mut', info: {}, modifiers: [] }],
+        },
+        {
+            gene: 'BRCA1',
+            alterations: [
+                {
+                    alteration_type: 'cna',
+                    constr_rel: '=',
+                    constr_val: 'AMP',
+                    modifiers: [],
+                },
+                {
+                    alteration_type: 'cna',
+                    constr_rel: '=',
+                    constr_val: 'HOMDEL',
+                    modifiers: [],
+                },
+                { alteration_type: 'exp', constr_rel: '>=', constr_val: 3 },
+                { alteration_type: 'prot', constr_rel: '<', constr_val: 1 },
+            ] as Alteration[],
+        },
+    ]);
+
+    doTest('TP53:PROT<=-2\n', [
+        {
+            gene: 'TP53',
+            alterations: [
+                { alteration_type: 'prot', constr_rel: '<=', constr_val: -2 },
+            ],
+        },
+    ]);
+
+    doTest('BRAF:MUT=V600E', [
+        {
+            gene: 'BRAF',
+            alterations: [
+                {
+                    alteration_type: 'mut',
+                    constr_rel: '=',
+                    constr_type: 'name',
+                    constr_val: 'V600E',
+                    info: {},
+                    modifiers: [],
+                },
+            ],
+        },
+    ]);
+    doTest('BRAF:MUT=V600', [
+        {
+            gene: 'BRAF',
+            alterations: [
+                {
+                    alteration_type: 'mut',
+                    constr_rel: '=',
+                    constr_type: 'position',
+                    constr_val: 600,
+                    info: { amino_acid: 'V' },
+                    modifiers: [],
+                },
+            ],
+        },
+    ]);
+    doTest('BRAF:FUSION MUT=V600', [
+        {
+            gene: 'BRAF',
+            alterations: [
+                { alteration_type: 'fusion', modifiers: [] },
+                {
+                    alteration_type: 'mut',
+                    constr_rel: '=',
+                    constr_type: 'position',
+                    constr_val: 600,
+                    info: { amino_acid: 'V' },
+                    modifiers: [],
+                },
+            ] as Alteration[],
+        },
+    ]);
+    doTest('BRAF:FUSION', [
+        {
+            gene: 'BRAF',
+            alterations: [
+                { alteration_type: 'fusion', modifiers: [] },
+            ] as Alteration[],
+        },
+    ]);
+    doTest('MIR-493*:MUT=V600', [
+        {
+            gene: 'MIR-493*',
+            alterations: [
+                {
+                    alteration_type: 'mut',
+                    constr_rel: '=',
+                    constr_type: 'position',
+                    constr_val: 600,
+                    info: { amino_acid: 'V' },
+                    modifiers: [],
+                },
+            ],
+        },
+    ]);
+
+    doTest('BRAF:CNA >= gain', [
+        {
+            gene: 'BRAF',
+            alterations: [
+                {
+                    alteration_type: 'cna',
+                    constr_rel: '>=',
+                    constr_val: 'GAIN',
+                    modifiers: [],
+                },
+            ] as Alteration[],
+        },
+    ]);
+    doTest('BRAF:CNA < homdel', [
+        {
+            gene: 'BRAF',
+            alterations: [
+                {
+                    alteration_type: 'cna',
+                    constr_rel: '<',
+                    constr_val: 'HOMDEL',
+                    modifiers: [],
+                },
+            ] as Alteration[],
+        },
+    ]);
+
+    doTest('[TP53 BRCA1] NRAS', [
+        {
+            label: undefined,
+            list: [
+                {
+                    gene: 'TP53',
+                    alterations: false,
+                },
+                {
+                    gene: 'BRCA1',
+                    alterations: false,
+                },
+            ],
+        },
+        {
+            gene: 'NRAS',
+            alterations: false,
+        },
+    ]);
+
+    doTest('NRAS [TP53 BRCA1]', [
+        {
+            gene: 'NRAS',
+            alterations: false,
+        },
+        {
+            label: undefined,
+            list: [
+                {
+                    gene: 'TP53',
+                    alterations: false,
+                },
+                {
+                    gene: 'BRCA1',
+                    alterations: false,
+                },
+            ],
+        },
+    ]);
+
+    doTest('NRAS [TP53 BRCA1] BRCA2', [
+        {
+            gene: 'NRAS',
+            alterations: false,
+        },
+        {
+            label: undefined,
+            list: [
+                {
+                    gene: 'TP53',
+                    alterations: false,
+                },
+                {
+                    gene: 'BRCA1',
+                    alterations: false,
+                },
+            ],
+        },
+        {
+            gene: 'BRCA2',
+            alterations: false,
+        },
+    ]);
+
+    doTest('[TP53;BRAF:MUT=V600E;KRAS] NRAS', [
+        {
+            label: undefined,
+            list: [
+                {
+                    gene: 'TP53',
+                    alterations: false,
+                },
+                {
+                    gene: 'BRAF',
+                    alterations: [
+                        {
+                            alteration_type: 'mut',
+                            constr_rel: '=',
+                            constr_type: 'name',
+                            constr_val: 'V600E',
+                            info: {},
+                            modifiers: [],
+                        },
+                    ],
+                },
+                {
+                    gene: 'KRAS',
+                    alterations: false,
+                },
+            ],
+        },
+        {
+            gene: 'NRAS',
+            alterations: false,
+        },
+    ]);
+
+    doTest('[TP53 BRCA1] [KRAS NRAS]', [
+        {
+            label: undefined,
+            list: [
+                {
+                    gene: 'TP53',
+                    alterations: false,
+                },
+                {
+                    gene: 'BRCA1',
+                    alterations: false,
+                },
+            ],
+        },
+        {
+            label: undefined,
+            list: [
+                {
+                    gene: 'KRAS',
+                    alterations: false,
+                },
+                {
+                    gene: 'NRAS',
+                    alterations: false,
+                },
+            ],
+        },
+    ]);
+
+    doTest('["Test_gene_set #1" TP53 BRCA1] NRAS', [
+        {
+            label: 'Test_gene_set #1',
+            list: [
+                {
+                    gene: 'TP53',
+                    alterations: false,
+                },
+                {
+                    gene: 'BRCA1',
+                    alterations: false,
+                },
+            ],
+        },
+        {
+            gene: 'NRAS',
+            alterations: false,
+        },
+    ]);
+});
diff --git a/src/shared/lib/oql/oqlfilter.d.ts b/src/shared/lib/oql/oqlfilter.d.ts
index bac84282658..8d01e15fccd 100644
--- a/src/shared/lib/oql/oqlfilter.d.ts
+++ b/src/shared/lib/oql/oqlfilter.d.ts
@@ -1,14 +1,18 @@
-
-
 //export function filterCBioPortalWebServiceData(oql_query, data, opt_default_oql, opt_by_oql_line, opt_mark_oql_regulation_direction) {
 
 //export declare function filterCBioPortalWebServiceData(oql_query:string, data:any, opt_default_oql:string, opt_mark_oql_regulation_direction: string ): any;
 
 //var filterData = function (oql_query, data, _accessors, opt_default_oql, opt_by_oql_line, opt_mark_oql_regulation_direction)
 
-import {SingleGeneQuery, MergedGeneQuery} from "./oql-parser";
-import {AnnotatedMutation, ExtendedAlteration} from "../../../pages/resultsView/ResultsViewPageStore";
-import {NumericGeneMolecularData, Mutation} from "../../api/generated/CBioPortalAPI";
+import { SingleGeneQuery, MergedGeneQuery } from './oql-parser';
+import {
+    AnnotatedMutation,
+    ExtendedAlteration,
+} from '../../../pages/resultsView/ResultsViewPageStore';
+import {
+    NumericGeneMolecularData,
+    Mutation,
+} from '../../api/generated/CBioPortalAPI';
 import { Alteration } from 'shared/lib/oql/oql-parser';
 
 type OQLAlterationFilterString = string;
@@ -21,20 +25,18 @@ export type OQLLineFilterOutput<T> = {
 };
 
 export type MergedTrackLineFilterOutput<T> = {
-    list: OQLLineFilterOutput<T>[],
-    label?: string
+    list: OQLLineFilterOutput<T>[];
+    label?: string;
 };
-export type UnflattenedOQLLineFilterOutput<T> = (
-    OQLLineFilterOutput<T> | MergedTrackLineFilterOutput<T>
-);
+export type UnflattenedOQLLineFilterOutput<T> =
+    | OQLLineFilterOutput<T>
+    | MergedTrackLineFilterOutput<T>;
 
 export declare function isMergedTrackFilter<T>(
     oqlFilter: UnflattenedOQLLineFilterOutput<T>
 ): oqlFilter is MergedTrackLineFilterOutput<T>;
 
-export declare function uniqueGenesInOQLQuery(
-    oql_query:string
-):string[];
+export declare function uniqueGenesInOQLQuery(oql_query: string): string[];
 
 /* Interprets datatypes statements and flattens out merged track queries. */
 export declare function parseOQLQuery(
@@ -43,30 +45,42 @@ export declare function parseOQLQuery(
 ): SingleGeneQuery[];
 
 export declare function parsedOQLAlterationToSourceOQL(
-    alteration:Alteration
+    alteration: Alteration
 ): string;
 
 export declare function unparseOQLQueryLine(
-    parsed_oql_line:SingleGeneQuery
+    parsed_oql_line: SingleGeneQuery
 ): string;
 
+export declare function doesQueryContainOQL(oql_query: string): boolean;
 
-export declare function doesQueryContainOQL(
-    oql_query:string
-):boolean;
-
-export declare function doesQueryContainMutationOQL(
-    oql_query:string
-):boolean;
+export declare function doesQueryContainMutationOQL(oql_query: string): boolean;
 
-export declare function filterCBioPortalWebServiceData<T extends (Mutation | NumericGeneMolecularData)>(oql_query:string, data:T[], accessors:any, default_oql:string): (T & ExtendedAlteration)[];
+export declare function filterCBioPortalWebServiceData<
+    T extends Mutation | NumericGeneMolecularData
+>(
+    oql_query: string,
+    data: T[],
+    accessors: any,
+    default_oql: string
+): (T & ExtendedAlteration)[];
 
-export declare function filterCBioPortalWebServiceDataByOQLLine(oql_query:string, data:(AnnotatedMutation | NumericGeneMolecularData)[], accessors:any, default_oql:string): OQLLineFilterOutput<ExtendedAlteration&AnnotatedMutation>[];
-export declare function filterCBioPortalWebServiceDataByOQLLine(oql_query:string, data:(Mutation | NumericGeneMolecularData)[], accessors:any, default_oql:string): OQLLineFilterOutput<ExtendedAlteration>[];
+export declare function filterCBioPortalWebServiceDataByOQLLine(
+    oql_query: string,
+    data: (AnnotatedMutation | NumericGeneMolecularData)[],
+    accessors: any,
+    default_oql: string
+): OQLLineFilterOutput<ExtendedAlteration & AnnotatedMutation>[];
+export declare function filterCBioPortalWebServiceDataByOQLLine(
+    oql_query: string,
+    data: (Mutation | NumericGeneMolecularData)[],
+    accessors: any,
+    default_oql: string
+): OQLLineFilterOutput<ExtendedAlteration>[];
 
 export declare function filterCBioPortalWebServiceDataByUnflattenedOQLLine(
     oql_query: string,
-    data: (AnnotatedMutation|NumericGeneMolecularData)[],
-    accessors:any,
-    default_oql:string
-): UnflattenedOQLLineFilterOutput<ExtendedAlteration&AnnotatedMutation>[];
+    data: (AnnotatedMutation | NumericGeneMolecularData)[],
+    accessors: any,
+    default_oql: string
+): UnflattenedOQLLineFilterOutput<ExtendedAlteration & AnnotatedMutation>[];
diff --git a/src/shared/lib/oql/oqlfilter.js b/src/shared/lib/oql/oqlfilter.js
index 249f091d74b..3aedafb6b92 100644
--- a/src/shared/lib/oql/oqlfilter.js
+++ b/src/shared/lib/oql/oqlfilter.js
@@ -2,7 +2,7 @@
 // Heavily dependent on OQL PEGjs specification
 import * as _ from 'lodash';
 import oql_parser from './oql-parser';
-import {annotateAlterationTypes} from "./annotateAlterationTypes";
+import { annotateAlterationTypes } from './annotateAlterationTypes';
 
 function isDatatypeStatement(line) {
     return line.gene !== undefined && line.gene.toUpperCase() === 'DATATYPES';
@@ -24,12 +24,12 @@ function parseMergedTrackOQLQuery(oql_query, opt_default_oql = '') {
      */
 
     /* In:
-    *     - oql_lines:
-    *         (DatatypeStatement | MergedTrackLine | SingleGeneLine)[]
-    *     - intial_dt: Alterations
-    * Out:
-    *     (SingleGeneLine|MergedTrackLine)[]
-    */
+     *     - oql_lines:
+     *         (DatatypeStatement | MergedTrackLine | SingleGeneLine)[]
+     *     - intial_dt: Alterations
+     * Out:
+     *     (SingleGeneLine|MergedTrackLine)[]
+     */
     function applyDatatypes(oql_lines, initial_dt) {
         /* In:
          *     - dt_state: Alterations
@@ -44,55 +44,67 @@ function parseMergedTrackOQLQuery(oql_query, opt_default_oql = '') {
             if (isDatatypeStatement(line)) {
                 return {
                     dt_state: line.alterations,
-                    query_line: []
+                    query_line: [],
                 };
             } else if (isMergedTrackLine(line)) {
                 const applied_list = applyDatatypes(line.list, dt_state);
                 return {
                     dt_state,
-                    query_line: [_.assign({}, line, { list: applied_list })]
+                    query_line: [_.assign({}, line, { list: applied_list })],
                 };
             } else {
                 const applied_alterations = line.alterations || dt_state;
                 return {
                     dt_state,
-                    query_line: [_.assign({}, line, { alterations: applied_alterations })]
+                    query_line: [
+                        _.assign({}, line, {
+                            alterations: applied_alterations,
+                        }),
+                    ],
                 };
             }
         }
 
         /* In:
-        *     - current_result:
-        *         {
-        *             dt_state: Alterations,
-        *             query: (SingleGeneLine|MergedTrackLine)[]
-        *         }
-        *     - line: OQLQueryLine
-        * Out:
-        *     {
-        *         dt_state: Alterations,
-        *         query: (SingleGeneLine|MergedTrackLine)[]
-        *     }
-        */
+         *     - current_result:
+         *         {
+         *             dt_state: Alterations,
+         *             query: (SingleGeneLine|MergedTrackLine)[]
+         *         }
+         *     - line: OQLQueryLine
+         * Out:
+         *     {
+         *         dt_state: Alterations,
+         *         query: (SingleGeneLine|MergedTrackLine)[]
+         *     }
+         */
         function appendDtResult({ dt_state, query }, line) {
-            const { dt_state: new_dt_state, query_line } = evaluateDt(dt_state, line);
+            const { dt_state: new_dt_state, query_line } = evaluateDt(
+                dt_state,
+                line
+            );
             return {
                 dt_state: new_dt_state,
-                query: query.concat(query_line)
+                query: query.concat(query_line),
             };
         }
 
-        return oql_lines.reduce(
-            appendDtResult,
-            { dt_state: initial_dt, query: [] }
-        ).query;
+        return oql_lines.reduce(appendDtResult, {
+            dt_state: initial_dt,
+            query: [],
+        }).query;
     }
 
     const parsed = oql_parser.parse(oql_query);
     let parsed_with_datatypes = applyDatatypes(parsed, false);
     if (opt_default_oql.length > 0) {
-        const default_alterations = oql_parser.parse(`DUMMYGENE:${opt_default_oql};`)[0].alterations;
-        parsed_with_datatypes = applyDatatypes(parsed_with_datatypes, default_alterations);
+        const default_alterations = oql_parser.parse(
+            `DUMMYGENE:${opt_default_oql};`
+        )[0].alterations;
+        parsed_with_datatypes = applyDatatypes(
+            parsed_with_datatypes,
+            default_alterations
+        );
     }
     return parsed_with_datatypes;
 }
@@ -108,13 +120,13 @@ export function parseOQLQuery(oql_query, opt_default_oql = '') {
      * Out: SingleGeneLine[]
      */
     function extractGeneLines(line) {
-        return (isMergedTrackLine(line)
-            ? line.list
-            : [line]
-        );
+        return isMergedTrackLine(line) ? line.list : [line];
     }
 
-    const parsed_with_datatypes = parseMergedTrackOQLQuery(oql_query, opt_default_oql);
+    const parsed_with_datatypes = parseMergedTrackOQLQuery(
+        oql_query,
+        opt_default_oql
+    );
     return _.flatMap(parsed_with_datatypes, extractGeneLines);
 }
 
@@ -144,14 +156,17 @@ export function doesQueryContainMutationOQL(oql_query) {
     for (const singleGeneQuery of parsedQuery) {
         if (singleGeneQuery.alterations !== false) {
             for (const alteration of singleGeneQuery.alterations) {
-                if (alteration.alteration_type === "mut" &&
-                    (alteration.constr_rel !== undefined || (alteration.modifiers.length > 0))) {
+                if (
+                    alteration.alteration_type === 'mut' &&
+                    (alteration.constr_rel !== undefined ||
+                        alteration.modifiers.length > 0)
+                ) {
                     // nontrivial mutation specification
                     ret = true;
                     break;
-                } else if (alteration.alteration_type === "any") {
+                } else if (alteration.alteration_type === 'any') {
                     // any DRIVER specification, which includes mutation
-                    if (alteration.modifiers.indexOf("DRIVER") > -1) {
+                    if (alteration.modifiers.indexOf('DRIVER') > -1) {
                         ret = true;
                         break;
                     }
@@ -167,59 +182,79 @@ export function doesQueryContainMutationOQL(oql_query) {
 
 export function parsedOQLAlterationToSourceOQL(alteration) {
     switch (alteration.alteration_type) {
-        case "cna":
+        case 'cna':
             var ret;
-            if (alteration.constr_rel === "=") {
+            if (alteration.constr_rel === '=') {
                 ret = alteration.constr_val;
             } else {
-                ret = ["CNA",alteration.constr_rel,alteration.constr_val].join("");
+                ret = [
+                    'CNA',
+                    alteration.constr_rel,
+                    alteration.constr_val,
+                ].join('');
             }
             if (alteration.modifiers.length > 0) {
-                ret += "_";
-                ret += alteration.modifiers.join("_");
+                ret += '_';
+                ret += alteration.modifiers.join('_');
             }
             return ret;
-        case "mut":
+        case 'mut':
             var ret;
             var underscoreBeforeModifiers = true;
             if (alteration.constr_rel) {
-                if (alteration.constr_type === "position") {
-                    ret = ["MUT",alteration.constr_rel,alteration.info.amino_acid,alteration.constr_val].join("");
+                if (alteration.constr_type === 'position') {
+                    ret = [
+                        'MUT',
+                        alteration.constr_rel,
+                        alteration.info.amino_acid,
+                        alteration.constr_val,
+                    ].join('');
                 } else {
-                    ret = ["MUT",alteration.constr_rel,alteration.constr_val].join("");
+                    ret = [
+                        'MUT',
+                        alteration.constr_rel,
+                        alteration.constr_val,
+                    ].join('');
                     if (!alteration.constr_val) {
                         underscoreBeforeModifiers = false;
                     }
                 }
             } else {
-                ret = "MUT";
+                ret = 'MUT';
             }
             if (underscoreBeforeModifiers && alteration.modifiers.length > 0) {
-                ret += "_";
+                ret += '_';
             }
-            ret += alteration.modifiers.join("_");
+            ret += alteration.modifiers.join('_');
             return ret;
-        case "exp":
-            return "EXP" + alteration.constr_rel + alteration.constr_val;
-        case "prot":
-            return "PROT" + alteration.constr_rel + alteration.constr_val;
-        case "fusion":
-            return "FUSION" + alteration.modifiers.map(function(modifier) { return "_"+modifier; }).join("");
-        case "any":
-            return alteration.modifiers.join("_");
+        case 'exp':
+            return 'EXP' + alteration.constr_rel + alteration.constr_val;
+        case 'prot':
+            return 'PROT' + alteration.constr_rel + alteration.constr_val;
+        case 'fusion':
+            return (
+                'FUSION' +
+                alteration.modifiers
+                    .map(function(modifier) {
+                        return '_' + modifier;
+                    })
+                    .join('')
+            );
+        case 'any':
+            return alteration.modifiers.join('_');
     }
-};
+}
 export function unparseOQLQueryLine(parsed_oql_query_line) {
-    var ret = "";
+    var ret = '';
     var gene = parsed_oql_query_line.gene;
     var alterations = parsed_oql_query_line.alterations;
     ret += gene;
     if (alterations.length > 0) {
-        ret += ": " + alterations.map(parsedOQLAlterationToSourceOQL).join(" ");
-        ret += ";";
+        ret += ': ' + alterations.map(parsedOQLAlterationToSourceOQL).join(' ');
+        ret += ';';
     }
     return ret;
-};
+}
 
 /* For the methods isDatumWantedByOQL, ..., the AccessorsForOqlFilter argument is as follows:
  * null always means the accessor does not apply to the given element. for example, `cna` applied to a mutation should give null
@@ -263,7 +298,7 @@ export function unparseOQLQueryLine(parsed_oql_query_line) {
  *  },
  * }
  */
-var isDatumWantedByOQL = function (parsed_oql_query, datum, accessors) {
+var isDatumWantedByOQL = function(parsed_oql_query, datum, accessors) {
     /*  In: - parsed_oql_query, the result of parseOQLQuery above
      *	- datum, a datum
      *	- AccessorsForOqlFilter, an object as described above with methods that apply to datum
@@ -284,7 +319,12 @@ var isDatumWantedByOQL = function (parsed_oql_query, datum, accessors) {
         }, false);
 };
 
-var isDatumWantedByOQLLine = function(query_line, datum, datum_gene, accessors) {
+var isDatumWantedByOQLLine = function(
+    query_line,
+    datum,
+    datum_gene,
+    accessors
+) {
     /*  Helper method for isDatumWantedByOQL
      *  In: - query_line, one element of a parseOQLQuery output array
      *	- datum, see isDatumWantedByOQL
@@ -300,28 +340,33 @@ var isDatumWantedByOQLLine = function(query_line, datum, datum_gene, accessors)
     if (!query_line.alterations) {
         return 1;
     }
-    return (query_line.alterations
-        .map(function(alteration_cmd) {
-            return isDatumWantedByOQLAlterationCommand(alteration_cmd, datum, accessors);
-        })
-        .reduce(function(acc, next) {
-            if (next === 1) {
-                // if it's wanted by this command, its wanted
-                return 1;
-            } else if (next === 0) {
-                // if this command doesn't address it, go with what currently decided
-                return acc;
-            } else if (next === -1) {
-                // if this command addresses and rejects it, then if its
-                //  not already wanted, then for now its unwanted
-                if (acc === 1) {
+    return (
+        query_line.alterations
+            .map(function(alteration_cmd) {
+                return isDatumWantedByOQLAlterationCommand(
+                    alteration_cmd,
+                    datum,
+                    accessors
+                );
+            })
+            .reduce(function(acc, next) {
+                if (next === 1) {
+                    // if it's wanted by this command, its wanted
                     return 1;
-                } else {
-                    return -1;
+                } else if (next === 0) {
+                    // if this command doesn't address it, go with what currently decided
+                    return acc;
+                } else if (next === -1) {
+                    // if this command addresses and rejects it, then if its
+                    //  not already wanted, then for now its unwanted
+                    if (acc === 1) {
+                        return 1;
+                    } else {
+                        return -1;
+                    }
                 }
-            }
-        }, -1) // start off with unwanted
-    === 1);
+            }, -1) === 1 // start off with unwanted
+    );
 };
 
 var isDatumWantedByOQLAlterationCommand = function(alt_cmd, datum, accessors) {
@@ -334,35 +379,51 @@ var isDatumWantedByOQLAlterationCommand = function(alt_cmd, datum, accessors) {
      *	-1 if the datum is addressed by this command and rejected
      */
     switch (alt_cmd.alteration_type) {
-        case "cna":
+        case 'cna':
             return isDatumWantedByOQLCNACommand(alt_cmd, datum, accessors);
-        case "mut":
+        case 'mut':
             return isDatumWantedByOQLMUTCommand(alt_cmd, datum, accessors);
-        case "exp":
-        case "prot":
-            return isDatumWantedByOQLEXPOrPROTCommand(alt_cmd, datum, accessors);
-        case "fusion":
+        case 'exp':
+        case 'prot':
+            return isDatumWantedByOQLEXPOrPROTCommand(
+                alt_cmd,
+                datum,
+                accessors
+            );
+        case 'fusion':
             return isDatumWantedByFUSIONCommand(alt_cmd, datum, accessors);
-        case "any":
-            return isDatumWantedByAnyTypeWithModifiersCommand(alt_cmd, datum, accessors);
+        case 'any':
+            return isDatumWantedByAnyTypeWithModifiersCommand(
+                alt_cmd,
+                datum,
+                accessors
+            );
     }
     return 0;
 };
 
-var isDatumWantedByAnyTypeWithModifiersCommand = function(alt_cmd, datum, accessors) {
+var isDatumWantedByAnyTypeWithModifiersCommand = function(
+    alt_cmd,
+    datum,
+    accessors
+) {
     // if any modifier is false, its not wanted (-1)
     // else if any modifier is true, its wanted (1)
     // else its not addressed (0)
     var isWantedBySome = false;
     var isUnwantedBySome = false;
 
-    for (var i=0; i<alt_cmd.modifiers.length; i++) {
+    for (var i = 0; i < alt_cmd.modifiers.length; i++) {
         var modifier = alt_cmd.modifiers[i];
         var datumWanted = null;
         switch (modifier) {
-            case "DRIVER":
+            case 'DRIVER':
             default:
-                datumWanted = isDatumWantedByOQLAlterationModifier(modifier, datum, accessors);
+                datumWanted = isDatumWantedByOQLAlterationModifier(
+                    modifier,
+                    datum,
+                    accessors
+                );
         }
         if (datumWanted === true) {
             isWantedBySome = true;
@@ -370,7 +431,7 @@ var isDatumWantedByAnyTypeWithModifiersCommand = function(alt_cmd, datum, access
             isUnwantedBySome = true;
             break;
         }
-    };
+    }
 
     if (isUnwantedBySome) {
         return -1;
@@ -393,13 +454,17 @@ var isDatumWantedByFUSIONCommand = function(alt_cmd, datum, accessors) {
     } else {
         var match = true;
         // now filter by modifiers with AND logic
-        for (var i=0; i<alt_cmd.modifiers.length; i++) {
-            const datumWanted = isDatumWantedByOQLAlterationModifier(alt_cmd.modifiers[i], datum, accessors);
+        for (var i = 0; i < alt_cmd.modifiers.length; i++) {
+            const datumWanted = isDatumWantedByOQLAlterationModifier(
+                alt_cmd.modifiers[i],
+                datum,
+                accessors
+            );
             if (datumWanted !== null) {
                 match = match && datumWanted;
             }
         }
-        return 2 * (+match) - 1; // map 0,1 to -1,1
+        return 2 * +match - 1; // map 0,1 to -1,1
     }
 };
 
@@ -414,31 +479,41 @@ var isDatumWantedByOQLCNACommand = function(alt_cmd, datum, accessors) {
     } else {
         // Otherwise, return -1 if it doesnt match, 1 if it matches
         var match = true;
-        if (alt_cmd.constr_rel === "=") {
-            match = (d_cna === alt_cmd.constr_val.toLowerCase());
+        if (alt_cmd.constr_rel === '=') {
+            match = d_cna === alt_cmd.constr_val.toLowerCase();
         } else if (alt_cmd.constr_rel) {
-            var integer_copy_number = {"amp":2, "gain":1, "hetloss":-1, "homdel":-2};
+            var integer_copy_number = {
+                amp: 2,
+                gain: 1,
+                hetloss: -1,
+                homdel: -2,
+            };
             var d_int_cna = integer_copy_number[d_cna];
-            var alt_int_cna = integer_copy_number[alt_cmd.constr_val.toLowerCase()];
-            if (alt_cmd.constr_rel === ">") {
-                match = (d_int_cna > alt_int_cna);
-            } else if (alt_cmd.constr_rel === ">=") {
-                match = (d_int_cna >= alt_int_cna);
-            } else if (alt_cmd.constr_rel === "<") {
-                match = (d_int_cna < alt_int_cna);
-            } else if (alt_cmd.constr_rel === "<=") {
-                match = (d_int_cna <= alt_int_cna);
+            var alt_int_cna =
+                integer_copy_number[alt_cmd.constr_val.toLowerCase()];
+            if (alt_cmd.constr_rel === '>') {
+                match = d_int_cna > alt_int_cna;
+            } else if (alt_cmd.constr_rel === '>=') {
+                match = d_int_cna >= alt_int_cna;
+            } else if (alt_cmd.constr_rel === '<') {
+                match = d_int_cna < alt_int_cna;
+            } else if (alt_cmd.constr_rel === '<=') {
+                match = d_int_cna <= alt_int_cna;
             }
         }
 
         // now filter by modifiers with AND logic
-        for (var i=0; i<alt_cmd.modifiers.length; i++) {
-            const datumWanted = isDatumWantedByOQLAlterationModifier(alt_cmd.modifiers[i], datum, accessors);
+        for (var i = 0; i < alt_cmd.modifiers.length; i++) {
+            const datumWanted = isDatumWantedByOQLAlterationModifier(
+                alt_cmd.modifiers[i],
+                datum,
+                accessors
+            );
             if (datumWanted !== null) {
                 match = match && datumWanted;
             }
         }
-        return 2 * (+match) - 1; // map 0,1 to -1,1
+        return 2 * +match - 1; // map 0,1 to -1,1
     }
 };
 var isDatumWantedByOQLMUTCommand = function(alt_cmd, datum, accessors) {
@@ -450,7 +525,6 @@ var isDatumWantedByOQLMUTCommand = function(alt_cmd, datum, accessors) {
         // If no mut data on the datum, it's not addressed
         return 0;
     } else {
-
         d_mut_type = d_mut_type.toLowerCase();
 
         var matches = false;
@@ -465,8 +539,11 @@ var isDatumWantedByOQLMUTCommand = function(alt_cmd, datum, accessors) {
             var target_type = alt_cmd.constr_val.toLowerCase();
             // It matches if the type of mutation matches, or if
             //  the target is truncating and the mutation is anything but missense or inframe
-            matches = (d_mut_type === target_type) ||
-                (target_type === 'trunc' && d_mut_type !== 'missense' && d_mut_type !== 'inframe');
+            matches =
+                d_mut_type === target_type ||
+                (target_type === 'trunc' &&
+                    d_mut_type !== 'missense' &&
+                    d_mut_type !== 'inframe');
             if (alt_cmd.constr_rel === '!=') {
                 // If '!=', then we want 1 if it DOESNT match
                 matches = !matches;
@@ -479,50 +556,65 @@ var isDatumWantedByOQLMUTCommand = function(alt_cmd, datum, accessors) {
                 return -1;
             }
             var target_position = alt_cmd.constr_val;
-            matches = (target_position >= d_mut_range[0] && target_position <= d_mut_range[1]);
+            matches =
+                target_position >= d_mut_range[0] &&
+                target_position <= d_mut_range[1];
             if (alt_cmd.constr_rel === '!=') {
                 matches = !matches;
             }
         } else if (alt_cmd.constr_type === 'name') {
             // Matching on amino acid change code
-            var d_mut_name = accessors.mut_amino_acid_change(datum).toLowerCase();
+            var d_mut_name = accessors
+                .mut_amino_acid_change(datum)
+                .toLowerCase();
             if (!d_mut_name) {
                 // If no amino acid change data, reject
                 return -1;
             }
             var target_name = alt_cmd.constr_val.toLowerCase();
-            matches = (target_name === d_mut_name);
+            matches = target_name === d_mut_name;
             if (alt_cmd.constr_rel === '!=') {
                 matches = !matches;
             }
         }
 
         // now filter by modifiers with AND logic
-        for (var i=0; i<alt_cmd.modifiers.length; i++) {
-            const datumWanted = isDatumWantedByOQLMutationModifier(alt_cmd.modifiers[i], datum, accessors);
+        for (var i = 0; i < alt_cmd.modifiers.length; i++) {
+            const datumWanted = isDatumWantedByOQLMutationModifier(
+                alt_cmd.modifiers[i],
+                datum,
+                accessors
+            );
             if (datumWanted !== null) {
                 matches = matches && datumWanted;
             }
         }
 
-        return 2*(+matches) - 1; // return 1 if true, -1 if false
+        return 2 * +matches - 1; // return 1 if true, -1 if false
     }
-
 };
 
 var isDatumWantedByOQLMutationModifier = function(modifier, datum, accessors) {
     switch (modifier) {
-        case "GERMLINE":
-        case "SOMATIC":
+        case 'GERMLINE':
+        case 'SOMATIC':
             return accessors.mut_status(datum) === modifier.toLowerCase();
         default:
-            return isDatumWantedByOQLAlterationModifier(modifier, datum, accessors);
+            return isDatumWantedByOQLAlterationModifier(
+                modifier,
+                datum,
+                accessors
+            );
     }
 };
 
-var isDatumWantedByOQLAlterationModifier = function(modifier, datum, accessors) {
+var isDatumWantedByOQLAlterationModifier = function(
+    modifier,
+    datum,
+    accessors
+) {
     switch (modifier) {
-        case "DRIVER":
+        case 'DRIVER':
             return accessors.is_driver(datum);
         default:
             return false;
@@ -533,7 +625,9 @@ var isDatumWantedByOQLEXPOrPROTCommand = function(alt_cmd, datum, accessors) {
     /*  Helper method for isDatumWantedByOQLAlterationCommand
      *  In/Out: See isDatumWantedByOQLAlterationCommand
      */
-    var level = accessors[(alt_cmd.alteration_type === "exp" ? 'exp' : 'prot')](datum);
+    var level = accessors[alt_cmd.alteration_type === 'exp' ? 'exp' : 'prot'](
+        datum
+    );
     if (level === null) {
         // If no data, it's not addressed
         return 0;
@@ -543,10 +637,16 @@ var isDatumWantedByOQLEXPOrPROTCommand = function(alt_cmd, datum, accessors) {
         var target_rel = alt_cmd.constr_rel;
         var match;
         var direction = undefined;
-        if ((target_rel === '<' && level < target_level) || (target_rel === '<=' && level <= target_level)) {
+        if (
+            (target_rel === '<' && level < target_level) ||
+            (target_rel === '<=' && level <= target_level)
+        ) {
             match = 1;
             direction = -1;
-        } else if ((target_rel === '>' && level > target_level) || (target_rel === '>=' && level >= target_level)) {
+        } else if (
+            (target_rel === '>' && level > target_level) ||
+            (target_rel === '>=' && level >= target_level)
+        ) {
             match = 1;
             direction = 1;
         } else {
@@ -554,14 +654,21 @@ var isDatumWantedByOQLEXPOrPROTCommand = function(alt_cmd, datum, accessors) {
         }
 
         if (match > 0) {
-            datum.alterationSubType = (direction && (direction > 0)) ? 'high' : 'low';
+            datum.alterationSubType =
+                direction && direction > 0 ? 'high' : 'low';
         }
 
         return match;
     }
 };
 
-function filterData(oql_query, data, _accessors, opt_default_oql = '', opt_by_oql_line) {
+function filterData(
+    oql_query,
+    data,
+    _accessors,
+    opt_default_oql = '',
+    opt_by_oql_line
+) {
     /* In:	- oql_query, a string
      *	- data, a list of data
      *	- AccessorsForOqlFilter, AccessorsForOqlFilter as defined above,
@@ -583,7 +690,7 @@ function filterData(oql_query, data, _accessors, opt_default_oql = '', opt_by_oq
      *      a flat list of the data that is wanted by at least one oql line.
      */
     data = $.extend(true, [], data); // deep copy, because of any modifications it will make during filtration
-    var null_fn = function () {
+    var null_fn = function() {
         return null;
     };
 
@@ -595,17 +702,21 @@ function filterData(oql_query, data, _accessors, opt_default_oql = '', opt_by_oq
     //     AccessorsForOqlFilter[required_accessors[i]] = _accessors[required_accessors[i]] || null_fn;
     // }
 
-    for (var i=0; i<data.length; i++) {
-        data[i].molecularProfileAlterationType = accessors.molecularAlterationType(data[i].molecularProfileId);
+    for (var i = 0; i < data.length; i++) {
+        data[
+            i
+        ].molecularProfileAlterationType = accessors.molecularAlterationType(
+            data[i].molecularProfileId
+        );
         annotateAlterationTypes(data[i], accessors);
     }
 
     function applyToGeneLines(geneLineFunction) {
-        return (line) => {
+        return line => {
             if (isMergedTrackLine(line)) {
                 return {
                     ...line,
-                    list: line.list.map(applyToGeneLines(geneLineFunction))
+                    list: line.list.map(applyToGeneLines(geneLineFunction)),
                 };
             } else {
                 return geneLineFunction(line);
@@ -613,38 +724,46 @@ function filterData(oql_query, data, _accessors, opt_default_oql = '', opt_by_oq
         };
     }
 
-    const queryParsingFunction = (
+    const queryParsingFunction =
         opt_by_oql_line === 'mergedtrack'
-        ? parseMergedTrackOQLQuery
-        : parseOQLQuery
-    );
+            ? parseMergedTrackOQLQuery
+            : parseOQLQuery;
     const parsed_query = queryParsingFunction(oql_query, opt_default_oql).map(
-        applyToGeneLines(
-            q_line => ({ ...q_line, gene: q_line.gene.toUpperCase() })
-        )
+        applyToGeneLines(q_line => ({
+            ...q_line,
+            gene: q_line.gene.toUpperCase(),
+        }))
     );
 
     if (opt_by_oql_line) {
-        return parsed_query.map(applyToGeneLines(
-            query_line => ({
+        return parsed_query.map(
+            applyToGeneLines(query_line => ({
                 gene: query_line.gene,
                 parsed_oql_line: query_line,
                 oql_line: unparseOQLQueryLine(query_line),
                 data: data.filter(datum =>
-                    isDatumWantedByOQLLine(query_line, datum, accessors.gene(datum).toUpperCase(), accessors)
-                )
-            })
-        ));
+                    isDatumWantedByOQLLine(
+                        query_line,
+                        datum,
+                        accessors.gene(datum).toUpperCase(),
+                        accessors
+                    )
+                ),
+            }))
+        );
     } else {
-        return data.filter(function (datum) {
+        return data.filter(function(datum) {
             return isDatumWantedByOQL(parsed_query, datum, accessors);
         });
     }
-};
-
-
+}
 
-export function filterCBioPortalWebServiceData(oql_query, data, accessors, opt_default_oql) {
+export function filterCBioPortalWebServiceData(
+    oql_query,
+    data,
+    accessors,
+    opt_default_oql
+) {
     /* Wrapper method for filterData that has the cBioPortal default accessor functions
      * Note that for use, the input data must have the field 'genetic_alteration_type,' which
      * takes one of the following values:
@@ -657,7 +776,12 @@ export function filterCBioPortalWebServiceData(oql_query, data, accessors, opt_d
     return filterData(oql_query, data, accessors, opt_default_oql);
 }
 
-export function filterCBioPortalWebServiceDataByOQLLine(oql_query, data, accessors, opt_default_oql) {
+export function filterCBioPortalWebServiceDataByOQLLine(
+    oql_query,
+    data,
+    accessors,
+    opt_default_oql
+) {
     /* Wrapper method for filterData that has the cBioPortal default accessor functions
      * Note that for use, the input data must have the field 'genetic_alteration_type,' which
      * takes one of the following values:
@@ -670,7 +794,12 @@ export function filterCBioPortalWebServiceDataByOQLLine(oql_query, data, accesso
     return filterData(oql_query, data, accessors, opt_default_oql, 'gene');
 }
 
-export function filterCBioPortalWebServiceDataByUnflattenedOQLLine(oql_query, data, accessors, opt_default_oql) {
+export function filterCBioPortalWebServiceDataByUnflattenedOQLLine(
+    oql_query,
+    data,
+    accessors,
+    opt_default_oql
+) {
     /* Wrapper method for filterData that has the cBioPortal default accessor functions
      * Note that for use, the input data must have the field 'genetic_alteration_type,' which
      * takes one of the following values:
@@ -680,10 +809,15 @@ export function filterCBioPortalWebServiceDataByUnflattenedOQLLine(oql_query, da
      *	- PROTEIN_LEVEL
      */
 
-    return filterData(oql_query, data, accessors, opt_default_oql, 'mergedtrack');
+    return filterData(
+        oql_query,
+        data,
+        accessors,
+        opt_default_oql,
+        'mergedtrack'
+    );
 }
 
-
 // export function filterCBioPortalWebServiceData(oql_query, data, opt_default_oql, opt_by_oql_line, opt_mark_oql_regulation_direction) {
 //     /* Wrapper method for filterData that has the cBioPortal default accessor functions
 //      * Note that for use, the input data must have the field 'genetic_alteration_type,' which
@@ -767,22 +901,23 @@ export function filterCBioPortalWebServiceDataByUnflattenedOQLLine(oql_query, da
 //     return filterData(oql_query, data, AccessorsForOqlFilter, opt_default_oql, opt_by_oql_line, opt_mark_oql_regulation_direction);
 // }
 
-
 export function uniqueGenesInOQLQuery(oql_query) {
     var parse_result = parseOQLQuery(oql_query);
-    var genes = parse_result.filter(function (q_line) {
-        return q_line.gene.toLowerCase() !== "datatypes";
-    }).map(function (q_line) {
-        return q_line.gene.toUpperCase();
-    });
+    var genes = parse_result
+        .filter(function(q_line) {
+            return q_line.gene.toLowerCase() !== 'datatypes';
+        })
+        .map(function(q_line) {
+            return q_line.gene.toUpperCase();
+        });
     var unique_genes_set = {};
-    for (var i=0; i<genes.length; i++) {
+    for (var i = 0; i < genes.length; i++) {
         unique_genes_set[genes[i]] = true;
     }
     return Object.keys(unique_genes_set);
 }
 
-function isValid (oql_query) {
+function isValid(oql_query) {
     var ret = true;
     try {
         oql_parser.parse(oql_query);
@@ -791,4 +926,3 @@ function isValid (oql_query) {
     }
     return ret;
 }
-
diff --git a/src/shared/lib/oql/oqlfilter.spec.ts b/src/shared/lib/oql/oqlfilter.spec.ts
index ad564dc1919..ecde4ddc217 100644
--- a/src/shared/lib/oql/oqlfilter.spec.ts
+++ b/src/shared/lib/oql/oqlfilter.spec.ts
@@ -5,17 +5,23 @@ import {
     filterCBioPortalWebServiceData,
     parseOQLQuery,
     unparseOQLQueryLine,
-    doesQueryContainMutationOQL, doesQueryContainOQL
+    doesQueryContainMutationOQL,
+    doesQueryContainOQL,
 } from './oqlfilter';
-import {NumericGeneMolecularData, MolecularProfile, Mutation} from '../../api/generated/CBioPortalAPI';
+import {
+    NumericGeneMolecularData,
+    MolecularProfile,
+    Mutation,
+} from '../../api/generated/CBioPortalAPI';
 import AccessorsForOqlFilter from './AccessorsForOqlFilter';
 import * as _ from 'lodash';
-import {assert} from 'chai';
+import { assert } from 'chai';
 import sinon from 'sinon';
 import {
-    AlterationTypeConstants, AnnotatedMutation,
-    AnnotatedNumericGeneMolecularData
-} from "../../../pages/resultsView/ResultsViewPageStore";
+    AlterationTypeConstants,
+    AnnotatedMutation,
+    AnnotatedNumericGeneMolecularData,
+} from '../../../pages/resultsView/ResultsViewPageStore';
 
 // This file uses type assertions to force functions that use overly specific
 // Swagger-generated types as parameters to accept mocked literals believed to
@@ -23,270 +29,429 @@ import {
 // tslint:disable no-object-literal-type-assertion
 
 // I believe DETAILED projection to have enough details for the filter function
-const THREE_GENE_TWO_SAMPLE_CNA_DATA = [
-    {__id: 4, oncoKbOncogenic: "", "sampleId": "TCGA-02-0001-01", "entrezGeneId": 672, "value": 1, "molecularProfileId": "gbm_tcga_gistic", "uniqueSampleKey": "VENHQS0wMi0wMDAxLTAxOmdibV90Y2dh", "uniquePatientKey": "VENHQS0wMi0wMDAxOmdibV90Y2dh", "patientId": "TCGA-02-0001", "studyId": "gbm_tcga", "gene": {"entrezGeneId": 672, "hugoGeneSymbol": "BRCA1", "type": "protein-coding", "cytoband": "17q21.31", "length": 8922}},
-    {__id: 5, oncoKbOncogenic: "", "sampleId": "TCGA-02-0001-01", "entrezGeneId": 5728, "value": 0, "molecularProfileId": "gbm_tcga_gistic", "uniqueSampleKey": "VENHQS0wMi0wMDAxLTAxOmdibV90Y2dh", "uniquePatientKey": "VENHQS0wMi0wMDAxOmdibV90Y2dh", "patientId": "TCGA-02-0001", "studyId": "gbm_tcga", "gene": {"entrezGeneId": 5728, "hugoGeneSymbol": "PTEN", "type": "protein-coding", "cytoband": "10q23.31", "length": 11581}},
-    {__id: 6, oncoKbOncogenic: "", "sampleId": "TCGA-02-0001-01", "entrezGeneId": 7157, "value": -1, "molecularProfileId": "gbm_tcga_gistic", "uniqueSampleKey": "VENHQS0wMi0wMDAxLTAxOmdibV90Y2dh", "uniquePatientKey": "VENHQS0wMi0wMDAxOmdibV90Y2dh", "patientId": "TCGA-02-0001", "studyId": "gbm_tcga", "gene": {"entrezGeneId": 7157, "hugoGeneSymbol": "TP53", "type": "protein-coding", "cytoband": "17p13.1", "length": 4576}},
-    {__id: 7, oncoKbOncogenic: "oncogenic", "sampleId": "TCGA-02-0003-01", "entrezGeneId": 672, "value": 0, "molecularProfileId": "gbm_tcga_gistic", "uniqueSampleKey": "VENHQS0wMi0wMDAzLTAxOmdibV90Y2dh", "uniquePatientKey": "VENHQS0wMi0wMDAzOmdibV90Y2dh", "patientId": "TCGA-02-0003", "studyId": "gbm_tcga", "gene": {"entrezGeneId": 672, "hugoGeneSymbol": "BRCA1", "type": "protein-coding", "cytoband": "17q21.31", "length": 8922}},
-    {__id: 8, oncoKbOncogenic: "predicted Oncogenic", "sampleId": "TCGA-02-0003-01", "entrezGeneId": 5728, "value": -1, "molecularProfileId": "gbm_tcga_gistic", "uniqueSampleKey": "VENHQS0wMi0wMDAzLTAxOmdibV90Y2dh", "uniquePatientKey": "VENHQS0wMi0wMDAzOmdibV90Y2dh", "patientId": "TCGA-02-0003", "studyId": "gbm_tcga", "gene": {"entrezGeneId": 5728, "hugoGeneSymbol": "PTEN", "type": "protein-coding", "cytoband": "10q23.31", "length": 11581}},
-    {__id: 9, oncoKbOncogenic: "Likely Oncogenic", "sampleId": "TCGA-02-0003-01", "entrezGeneId": 7157, "value": 0, "molecularProfileId": "gbm_tcga_gistic", "uniqueSampleKey": "VENHQS0wMi0wMDAzLTAxOmdibV90Y2dh", "uniquePatientKey": "VENHQS0wMi0wMDAzOmdibV90Y2dh", "patientId": "TCGA-02-0003", "studyId": "gbm_tcga", "gene": {"entrezGeneId": 7157, "hugoGeneSymbol": "TP53", "type": "protein-coding", "cytoband": "17p13.1", "length": 4576}}
-] as any as AnnotatedNumericGeneMolecularData[];
+const THREE_GENE_TWO_SAMPLE_CNA_DATA = ([
+    {
+        __id: 4,
+        oncoKbOncogenic: '',
+        sampleId: 'TCGA-02-0001-01',
+        entrezGeneId: 672,
+        value: 1,
+        molecularProfileId: 'gbm_tcga_gistic',
+        uniqueSampleKey: 'VENHQS0wMi0wMDAxLTAxOmdibV90Y2dh',
+        uniquePatientKey: 'VENHQS0wMi0wMDAxOmdibV90Y2dh',
+        patientId: 'TCGA-02-0001',
+        studyId: 'gbm_tcga',
+        gene: {
+            entrezGeneId: 672,
+            hugoGeneSymbol: 'BRCA1',
+            type: 'protein-coding',
+            cytoband: '17q21.31',
+            length: 8922,
+        },
+    },
+    {
+        __id: 5,
+        oncoKbOncogenic: '',
+        sampleId: 'TCGA-02-0001-01',
+        entrezGeneId: 5728,
+        value: 0,
+        molecularProfileId: 'gbm_tcga_gistic',
+        uniqueSampleKey: 'VENHQS0wMi0wMDAxLTAxOmdibV90Y2dh',
+        uniquePatientKey: 'VENHQS0wMi0wMDAxOmdibV90Y2dh',
+        patientId: 'TCGA-02-0001',
+        studyId: 'gbm_tcga',
+        gene: {
+            entrezGeneId: 5728,
+            hugoGeneSymbol: 'PTEN',
+            type: 'protein-coding',
+            cytoband: '10q23.31',
+            length: 11581,
+        },
+    },
+    {
+        __id: 6,
+        oncoKbOncogenic: '',
+        sampleId: 'TCGA-02-0001-01',
+        entrezGeneId: 7157,
+        value: -1,
+        molecularProfileId: 'gbm_tcga_gistic',
+        uniqueSampleKey: 'VENHQS0wMi0wMDAxLTAxOmdibV90Y2dh',
+        uniquePatientKey: 'VENHQS0wMi0wMDAxOmdibV90Y2dh',
+        patientId: 'TCGA-02-0001',
+        studyId: 'gbm_tcga',
+        gene: {
+            entrezGeneId: 7157,
+            hugoGeneSymbol: 'TP53',
+            type: 'protein-coding',
+            cytoband: '17p13.1',
+            length: 4576,
+        },
+    },
+    {
+        __id: 7,
+        oncoKbOncogenic: 'oncogenic',
+        sampleId: 'TCGA-02-0003-01',
+        entrezGeneId: 672,
+        value: 0,
+        molecularProfileId: 'gbm_tcga_gistic',
+        uniqueSampleKey: 'VENHQS0wMi0wMDAzLTAxOmdibV90Y2dh',
+        uniquePatientKey: 'VENHQS0wMi0wMDAzOmdibV90Y2dh',
+        patientId: 'TCGA-02-0003',
+        studyId: 'gbm_tcga',
+        gene: {
+            entrezGeneId: 672,
+            hugoGeneSymbol: 'BRCA1',
+            type: 'protein-coding',
+            cytoband: '17q21.31',
+            length: 8922,
+        },
+    },
+    {
+        __id: 8,
+        oncoKbOncogenic: 'predicted Oncogenic',
+        sampleId: 'TCGA-02-0003-01',
+        entrezGeneId: 5728,
+        value: -1,
+        molecularProfileId: 'gbm_tcga_gistic',
+        uniqueSampleKey: 'VENHQS0wMi0wMDAzLTAxOmdibV90Y2dh',
+        uniquePatientKey: 'VENHQS0wMi0wMDAzOmdibV90Y2dh',
+        patientId: 'TCGA-02-0003',
+        studyId: 'gbm_tcga',
+        gene: {
+            entrezGeneId: 5728,
+            hugoGeneSymbol: 'PTEN',
+            type: 'protein-coding',
+            cytoband: '10q23.31',
+            length: 11581,
+        },
+    },
+    {
+        __id: 9,
+        oncoKbOncogenic: 'Likely Oncogenic',
+        sampleId: 'TCGA-02-0003-01',
+        entrezGeneId: 7157,
+        value: 0,
+        molecularProfileId: 'gbm_tcga_gistic',
+        uniqueSampleKey: 'VENHQS0wMi0wMDAzLTAxOmdibV90Y2dh',
+        uniquePatientKey: 'VENHQS0wMi0wMDAzOmdibV90Y2dh',
+        patientId: 'TCGA-02-0003',
+        studyId: 'gbm_tcga',
+        gene: {
+            entrezGeneId: 7157,
+            hugoGeneSymbol: 'TP53',
+            type: 'protein-coding',
+            cytoband: '17p13.1',
+            length: 4576,
+        },
+    },
+] as any) as AnnotatedNumericGeneMolecularData[];
 // I believe these metadata to be all `new AccessorsForOqlFilter()` needs
 const DATA_PROFILE = {
-    "molecularAlterationType": "COPY_NUMBER_ALTERATION",
-    "datatype": "DISCRETE",
-    "molecularProfileId": "gbm_tcga_gistic",
-    "studyId": "gbm_tcga",
+    molecularAlterationType: 'COPY_NUMBER_ALTERATION',
+    datatype: 'DISCRETE',
+    molecularProfileId: 'gbm_tcga_gistic',
+    studyId: 'gbm_tcga',
 } as MolecularProfile;
 
 const MUTATION_PROFILE = {
-    "molecularAlterationType": AlterationTypeConstants.MUTATION_EXTENDED,
-    "molecularProfileId": "gbm_tcga_mutations",
-    "studyId": "gbm_tcga",
+    molecularAlterationType: AlterationTypeConstants.MUTATION_EXTENDED,
+    molecularProfileId: 'gbm_tcga_mutations',
+    studyId: 'gbm_tcga',
 } as MolecularProfile;
 
-const MUTATION_DATA = [
-{
+const MUTATION_DATA = ([
+    {
+        gene: {
+            hugoGeneSymbol: 'BRCA1',
+        },
+        molecularProfileId: 'gbm_tcga_mutations',
+        mutationType: 'fusion',
+        mutationStatus: undefined,
+        putativeDriver: true,
+        __id: -1,
+    },
+    {
         gene: {
-            hugoGeneSymbol:"BRCA1",
+            hugoGeneSymbol: 'BRCA1',
         },
-        molecularProfileId: "gbm_tcga_mutations",
-        mutationType:"fusion",
-        mutationStatus:undefined,
+        molecularProfileId: 'gbm_tcga_mutations',
+        mutationType: 'Missense_Variant',
+        mutationStatus: 'germline',
         putativeDriver: true,
-        __id: -1
-},{
-    gene: {
-        hugoGeneSymbol:"BRCA1",
+        __id: 0,
     },
-    molecularProfileId: "gbm_tcga_mutations",
-    mutationType:"Missense_Variant",
-    mutationStatus: "germline",
-    putativeDriver: true,
-    __id: 0
-},{
-    gene: {
-        hugoGeneSymbol:"BRCA1",
+    {
+        gene: {
+            hugoGeneSymbol: 'BRCA1',
+        },
+        molecularProfileId: 'gbm_tcga_mutations',
+        mutationType: 'Missense_Variant',
+        mutationStatus: 'aspdoifjpasoid',
+        putativeDriver: true,
+        __id: 1,
     },
-    molecularProfileId: "gbm_tcga_mutations",
-    mutationType:"Missense_Variant",
-    mutationStatus:"aspdoifjpasoid",
-    putativeDriver: true,
-    __id: 1
-},{
-    gene: {
-        hugoGeneSymbol:"BRCA1",
+    {
+        gene: {
+            hugoGeneSymbol: 'BRCA1',
+        },
+        molecularProfileId: 'gbm_tcga_mutations',
+        mutationType: 'Missense_Variant',
+        mutationStatus: null,
+        putativeDriver: false,
+        __id: 2,
     },
-    molecularProfileId: "gbm_tcga_mutations",
-    mutationType:"Missense_Variant",
-    mutationStatus:null,
-    putativeDriver: false,
-    __id: 2
-},{
-    gene: {
-        hugoGeneSymbol:"BRCA1",
+    {
+        gene: {
+            hugoGeneSymbol: 'BRCA1',
+        },
+        molecularProfileId: 'gbm_tcga_mutations',
+        mutationType: 'in_frame_ins',
+        mutationStatus: undefined,
+        putativeDriver: true,
+        __id: 3,
     },
-    molecularProfileId: "gbm_tcga_mutations",
-    mutationType:"in_frame_ins",
-    mutationStatus:undefined,
-    putativeDriver: true,
-    __id: 3
-}] as any as AnnotatedMutation[];
+] as any) as AnnotatedMutation[];
 
-describe("doesQueryContainOQL", ()=>{
-    it("returns correct result in various cases", ()=>{
-        assert.equal(doesQueryContainOQL("TP53 BRCA1 BRCA2"), false);
-        assert.equal(doesQueryContainOQL("TP53"), false);
-        assert.equal(doesQueryContainOQL("TP53 BRCA1 BRCA2;"), false);
-        assert.equal(doesQueryContainOQL("TP53;"), false);
-        assert.equal(doesQueryContainOQL("TP53 BRCA1 BRCA2:MUT"), true);
-        assert.equal(doesQueryContainOQL("TP53 BRCA1 BRCA2:AMP"), true);
-        assert.equal(doesQueryContainOQL("TP53 BRCA1 BRCA2:HOMDEL"), true);
-        assert.equal(doesQueryContainOQL("TP53 BRCA1 BRCA2:EXP>0"), true);
-        assert.equal(doesQueryContainOQL("TP53 BRCA1 BRCA2:FUSION"), true);
-        assert.equal(doesQueryContainOQL("TP53 BRCA1 BRCA2:DRIVER"), true);
+describe('doesQueryContainOQL', () => {
+    it('returns correct result in various cases', () => {
+        assert.equal(doesQueryContainOQL('TP53 BRCA1 BRCA2'), false);
+        assert.equal(doesQueryContainOQL('TP53'), false);
+        assert.equal(doesQueryContainOQL('TP53 BRCA1 BRCA2;'), false);
+        assert.equal(doesQueryContainOQL('TP53;'), false);
+        assert.equal(doesQueryContainOQL('TP53 BRCA1 BRCA2:MUT'), true);
+        assert.equal(doesQueryContainOQL('TP53 BRCA1 BRCA2:AMP'), true);
+        assert.equal(doesQueryContainOQL('TP53 BRCA1 BRCA2:HOMDEL'), true);
+        assert.equal(doesQueryContainOQL('TP53 BRCA1 BRCA2:EXP>0'), true);
+        assert.equal(doesQueryContainOQL('TP53 BRCA1 BRCA2:FUSION'), true);
+        assert.equal(doesQueryContainOQL('TP53 BRCA1 BRCA2:DRIVER'), true);
     });
 });
 
-describe("doesQueryContainMutationOQL", ()=>{
-    it("returns correct result in various cases", ()=>{
-        assert.equal(doesQueryContainMutationOQL("TP53: AMP"), false);
-        assert.equal(doesQueryContainMutationOQL("TP53: EXP>0"), false);
-        assert.equal(doesQueryContainMutationOQL("TP53;"), false);
-        assert.equal(doesQueryContainMutationOQL("TP53 BRCA1 BRCA2;"), false);
-        assert.equal(doesQueryContainMutationOQL("TP53: MUT"), false);
-        assert.equal(doesQueryContainMutationOQL("TP53: GERMLINE"), true);
-        assert.equal(doesQueryContainMutationOQL("TP53: proteinchange"), true);
-        assert.equal(doesQueryContainMutationOQL("TP53: proteinchange_GERMLINE"), true);
-        assert.equal(doesQueryContainMutationOQL("TP53: DRIVER"), true);
+describe('doesQueryContainMutationOQL', () => {
+    it('returns correct result in various cases', () => {
+        assert.equal(doesQueryContainMutationOQL('TP53: AMP'), false);
+        assert.equal(doesQueryContainMutationOQL('TP53: EXP>0'), false);
+        assert.equal(doesQueryContainMutationOQL('TP53;'), false);
+        assert.equal(doesQueryContainMutationOQL('TP53 BRCA1 BRCA2;'), false);
+        assert.equal(doesQueryContainMutationOQL('TP53: MUT'), false);
+        assert.equal(doesQueryContainMutationOQL('TP53: GERMLINE'), true);
+        assert.equal(doesQueryContainMutationOQL('TP53: proteinchange'), true);
+        assert.equal(
+            doesQueryContainMutationOQL('TP53: proteinchange_GERMLINE'),
+            true
+        );
+        assert.equal(doesQueryContainMutationOQL('TP53: DRIVER'), true);
     });
 });
 
-describe("unparseOQLQueryLine", ()=>{
-    it("unparses query with no alterations", ()=>{
-        const parsedLine = parseOQLQuery("TP53;")[0];
-        assert.equal(unparseOQLQueryLine(parsedLine), "TP53");
+describe('unparseOQLQueryLine', () => {
+    it('unparses query with no alterations', () => {
+        const parsedLine = parseOQLQuery('TP53;')[0];
+        assert.equal(unparseOQLQueryLine(parsedLine), 'TP53');
     });
-    it("unparses query with MUT keyword", ()=>{
-        const parsedLine = parseOQLQuery("TP53: MUT;")[0];
-        assert.equal(unparseOQLQueryLine(parsedLine), "TP53: MUT;");
+    it('unparses query with MUT keyword', () => {
+        const parsedLine = parseOQLQuery('TP53: MUT;')[0];
+        assert.equal(unparseOQLQueryLine(parsedLine), 'TP53: MUT;');
     });
-    it("unparses query with complex mutation specifications", ()=>{
-        const parsedLine = parseOQLQuery("TP53: MISSENSE proteinchange;")[0];
-        assert.equal(unparseOQLQueryLine(parsedLine), "TP53: MUT=MISSENSE MUT=proteinchange;");
+    it('unparses query with complex mutation specifications', () => {
+        const parsedLine = parseOQLQuery('TP53: MISSENSE proteinchange;')[0];
+        assert.equal(
+            unparseOQLQueryLine(parsedLine),
+            'TP53: MUT=MISSENSE MUT=proteinchange;'
+        );
     });
-    it("unparses query with EXP and PROT", ()=>{
-        const parsedLine = parseOQLQuery("TP53: EXP > 0 PROT < -2")[0];
-        assert.equal(unparseOQLQueryLine(parsedLine), "TP53: EXP>0 PROT<-2;");
+    it('unparses query with EXP and PROT', () => {
+        const parsedLine = parseOQLQuery('TP53: EXP > 0 PROT < -2')[0];
+        assert.equal(unparseOQLQueryLine(parsedLine), 'TP53: EXP>0 PROT<-2;');
     });
-    it("unparses query with many alteration types", ()=>{
-        const parsedLine = parseOQLQuery("TP53: MISSENSE proteinchange HOMDEL EXP<-4 PROT>1 FUSION;")[0];
-        assert.equal(unparseOQLQueryLine(parsedLine), "TP53: MUT=MISSENSE MUT=proteinchange HOMDEL EXP<-4 PROT>1 FUSION;");
+    it('unparses query with many alteration types', () => {
+        const parsedLine = parseOQLQuery(
+            'TP53: MISSENSE proteinchange HOMDEL EXP<-4 PROT>1 FUSION;'
+        )[0];
+        assert.equal(
+            unparseOQLQueryLine(parsedLine),
+            'TP53: MUT=MISSENSE MUT=proteinchange HOMDEL EXP<-4 PROT>1 FUSION;'
+        );
     });
-    it("unparses queries with germline and somatic mutation modifiers", ()=>{
-        const parsedLine = parseOQLQuery("TP53: GERMLINE SOMATIC_MISSENSE proteinchange_GERMLINE;")[0];
-        assert.equal(unparseOQLQueryLine(parsedLine), "TP53: MUT_GERMLINE MUT=MISSENSE_SOMATIC MUT=proteinchange_GERMLINE;");
+    it('unparses queries with germline and somatic mutation modifiers', () => {
+        const parsedLine = parseOQLQuery(
+            'TP53: GERMLINE SOMATIC_MISSENSE proteinchange_GERMLINE;'
+        )[0];
+        assert.equal(
+            unparseOQLQueryLine(parsedLine),
+            'TP53: MUT_GERMLINE MUT=MISSENSE_SOMATIC MUT=proteinchange_GERMLINE;'
+        );
     });
-    it("unparses queries with driver modifier", ()=>{
-        const parsedLine = parseOQLQuery("TP53: DRIVER MUT=DRIVER CNA_DRIVER DRIVER_CNA FUSION_DRIVER DRIVER_FUSION TRUNC_DRIVER DRIVER_TRUNC AMP_DRIVER DRIVER_HOMDEL GERMLINE SOMATIC_MISSENSE proteinchange_GERMLINE;")[0];
-        assert.equal(unparseOQLQueryLine(parsedLine), "TP53: DRIVER MUT=DRIVER CNA_DRIVER CNA_DRIVER FUSION_DRIVER FUSION_DRIVER MUT=TRUNC_DRIVER MUT=TRUNC_DRIVER AMP_DRIVER HOMDEL_DRIVER MUT_GERMLINE MUT=MISSENSE_SOMATIC MUT=proteinchange_GERMLINE;");
+    it('unparses queries with driver modifier', () => {
+        const parsedLine = parseOQLQuery(
+            'TP53: DRIVER MUT=DRIVER CNA_DRIVER DRIVER_CNA FUSION_DRIVER DRIVER_FUSION TRUNC_DRIVER DRIVER_TRUNC AMP_DRIVER DRIVER_HOMDEL GERMLINE SOMATIC_MISSENSE proteinchange_GERMLINE;'
+        )[0];
+        assert.equal(
+            unparseOQLQueryLine(parsedLine),
+            'TP53: DRIVER MUT=DRIVER CNA_DRIVER CNA_DRIVER FUSION_DRIVER FUSION_DRIVER MUT=TRUNC_DRIVER MUT=TRUNC_DRIVER AMP_DRIVER HOMDEL_DRIVER MUT_GERMLINE MUT=MISSENSE_SOMATIC MUT=proteinchange_GERMLINE;'
+        );
     });
 });
 
-describe('filterCBioPortalWebServiceData', ()=>{
-    it('filters properly using the GERMLINE and SOMATIC mutation modifiers', ()=>{
+describe('filterCBioPortalWebServiceData', () => {
+    it('filters properly using the GERMLINE and SOMATIC mutation modifiers', () => {
         const accessorsInstance = new AccessorsForOqlFilter([MUTATION_PROFILE]);
         let filteredData = filterCBioPortalWebServiceData(
-            "BRCA1:GERMLINE",
+            'BRCA1:GERMLINE',
             MUTATION_DATA,
             accessorsInstance,
-            ""
+            ''
         );
-        assert.deepEqual((filteredData as any).map((x:any)=>x.__id), [0]);
+        assert.deepEqual((filteredData as any).map((x: any) => x.__id), [0]);
         filteredData = filterCBioPortalWebServiceData(
-            "BRCA1:SOMATIC",
+            'BRCA1:SOMATIC',
             MUTATION_DATA,
             accessorsInstance,
-            ""
+            ''
         );
-        assert.deepEqual((filteredData as any).map((x:any)=>x.__id), [1,2,3]);
+        assert.deepEqual((filteredData as any).map((x: any) => x.__id), [
+            1,
+            2,
+            3,
+        ]);
         filteredData = filterCBioPortalWebServiceData(
-            "BRCA1:MISSENSE_SOMATIC",
+            'BRCA1:MISSENSE_SOMATIC',
             MUTATION_DATA,
             accessorsInstance,
-            ""
+            ''
         );
-        assert.deepEqual((filteredData as any).map((x:any)=>x.__id), [1,2]);
+        assert.deepEqual((filteredData as any).map((x: any) => x.__id), [1, 2]);
         filteredData = filterCBioPortalWebServiceData(
-            "BRCA1:INFRAME_SOMATIC",
+            'BRCA1:INFRAME_SOMATIC',
             MUTATION_DATA,
             accessorsInstance,
-            ""
+            ''
         );
-        assert.deepEqual((filteredData as any).map((x:any)=>x.__id), [3]);
+        assert.deepEqual((filteredData as any).map((x: any) => x.__id), [3]);
         filteredData = filterCBioPortalWebServiceData(
-            "BRCA1:INFRAME_GERMLINE",
+            'BRCA1:INFRAME_GERMLINE',
             MUTATION_DATA,
             accessorsInstance,
-            ""
+            ''
         );
-        assert.deepEqual((filteredData as any).map((x:any)=>x.__id), []);
+        assert.deepEqual((filteredData as any).map((x: any) => x.__id), []);
         filteredData = filterCBioPortalWebServiceData(
-            "BRCA1:MISSENSE_GERMLINE",
+            'BRCA1:MISSENSE_GERMLINE',
             MUTATION_DATA,
             accessorsInstance,
-            ""
+            ''
         );
-        assert.deepEqual((filteredData as any).map((x:any)=>x.__id), [0]);
+        assert.deepEqual((filteredData as any).map((x: any) => x.__id), [0]);
         filteredData = filterCBioPortalWebServiceData(
-            "BRCA1:MISSENSE_GERMLINE INFRAME_SOMATIC",
+            'BRCA1:MISSENSE_GERMLINE INFRAME_SOMATIC',
             MUTATION_DATA,
             accessorsInstance,
-            ""
+            ''
         );
-        assert.deepEqual((filteredData as any).map((x:any)=>x.__id), [0,3]);
+        assert.deepEqual((filteredData as any).map((x: any) => x.__id), [0, 3]);
     });
-    it("filters properly using the DRIVER modifier", ()=>{
-        const accessorsInstance = new AccessorsForOqlFilter([MUTATION_PROFILE, DATA_PROFILE]);
+    it('filters properly using the DRIVER modifier', () => {
+        const accessorsInstance = new AccessorsForOqlFilter([
+            MUTATION_PROFILE,
+            DATA_PROFILE,
+        ]);
         let filteredData = filterCBioPortalWebServiceData(
-            "BRCA1:DRIVER",
+            'BRCA1:DRIVER',
             [...MUTATION_DATA, ...THREE_GENE_TWO_SAMPLE_CNA_DATA] as any[],
             accessorsInstance,
-            ""
+            ''
         );
-        assert.deepEqual((filteredData as any).map((x:any)=>x.__id), [-1, 0, 1, 3, 7]);
+        assert.deepEqual((filteredData as any).map((x: any) => x.__id), [
+            -1,
+            0,
+            1,
+            3,
+            7,
+        ]);
 
         filteredData = filterCBioPortalWebServiceData(
-            "BRCA1:MUT=DRIVER",
+            'BRCA1:MUT=DRIVER',
             [...MUTATION_DATA, ...THREE_GENE_TWO_SAMPLE_CNA_DATA] as any[],
             accessorsInstance,
-            ""
+            ''
         );
-        assert.deepEqual((filteredData as any).map((x:any)=>x.__id), [0, 1, 3]);
+        assert.deepEqual((filteredData as any).map((x: any) => x.__id), [
+            0,
+            1,
+            3,
+        ]);
 
         filteredData = filterCBioPortalWebServiceData(
-            "BRCA1:MISSENSE_DRIVER",
+            'BRCA1:MISSENSE_DRIVER',
             [...MUTATION_DATA, ...THREE_GENE_TWO_SAMPLE_CNA_DATA] as any[],
             accessorsInstance,
-            ""
+            ''
         );
-        assert.deepEqual((filteredData as any).map((x:any)=>x.__id), [0, 1]);
+        assert.deepEqual((filteredData as any).map((x: any) => x.__id), [0, 1]);
 
         filteredData = filterCBioPortalWebServiceData(
-            "BRCA1:MUT=MISSENSE_DRIVER",
+            'BRCA1:MUT=MISSENSE_DRIVER',
             [...MUTATION_DATA, ...THREE_GENE_TWO_SAMPLE_CNA_DATA] as any[],
             accessorsInstance,
-            ""
+            ''
         );
-        assert.deepEqual((filteredData as any).map((x:any)=>x.__id), [0, 1]);
+        assert.deepEqual((filteredData as any).map((x: any) => x.__id), [0, 1]);
 
         filteredData = filterCBioPortalWebServiceData(
-            "BRCA1:DRIVER_MISSENSE",
+            'BRCA1:DRIVER_MISSENSE',
             [...MUTATION_DATA, ...THREE_GENE_TWO_SAMPLE_CNA_DATA] as any[],
             accessorsInstance,
-            ""
+            ''
         );
-        assert.deepEqual((filteredData as any).map((x:any)=>x.__id), [0, 1]);
+        assert.deepEqual((filteredData as any).map((x: any) => x.__id), [0, 1]);
 
         filteredData = filterCBioPortalWebServiceData(
-            "PTEN:DRIVER_HETLOSS",
+            'PTEN:DRIVER_HETLOSS',
             [...MUTATION_DATA, ...THREE_GENE_TWO_SAMPLE_CNA_DATA] as any[],
             accessorsInstance,
-            ""
+            ''
         );
-        assert.deepEqual((filteredData as any).map((x:any)=>x.__id), [8]);
+        assert.deepEqual((filteredData as any).map((x: any) => x.__id), [8]);
 
         filteredData = filterCBioPortalWebServiceData(
-            "PTEN:CNA_DRIVER",
+            'PTEN:CNA_DRIVER',
             [...MUTATION_DATA, ...THREE_GENE_TWO_SAMPLE_CNA_DATA] as any[],
             accessorsInstance,
-            ""
+            ''
         );
-        assert.deepEqual((filteredData as any).map((x:any)=>x.__id), [8]);
+        assert.deepEqual((filteredData as any).map((x: any) => x.__id), [8]);
 
         filteredData = filterCBioPortalWebServiceData(
-            "BRCA1: DRIVER; PTEN:HETLOSS_DRIVER; TP53: DRIVER",
+            'BRCA1: DRIVER; PTEN:HETLOSS_DRIVER; TP53: DRIVER',
             [...MUTATION_DATA, ...THREE_GENE_TWO_SAMPLE_CNA_DATA] as any[],
             accessorsInstance,
-            ""
+            ''
         );
-        assert.deepEqual((filteredData as any).map((x:any)=>x.__id), [-1, 0,1,3,7,8,9]);
+        assert.deepEqual((filteredData as any).map((x: any) => x.__id), [
+            -1,
+            0,
+            1,
+            3,
+            7,
+            8,
+            9,
+        ]);
 
         filteredData = filterCBioPortalWebServiceData(
-            "BRCA1:FUSION_DRIVER",
+            'BRCA1:FUSION_DRIVER',
             [...MUTATION_DATA, ...THREE_GENE_TWO_SAMPLE_CNA_DATA] as any[],
             accessorsInstance,
-            ""
+            ''
         );
-        assert.deepEqual((filteredData as any).map((x:any)=>x.__id), [-1]);
+        assert.deepEqual((filteredData as any).map((x: any) => x.__id), [-1]);
 
         filteredData = filterCBioPortalWebServiceData(
-            "BRCA1:DRIVER_FUSION",
+            'BRCA1:DRIVER_FUSION',
             [...MUTATION_DATA, ...THREE_GENE_TWO_SAMPLE_CNA_DATA] as any[],
             accessorsInstance,
-            ""
+            ''
         );
-        assert.deepEqual((filteredData as any).map((x:any)=>x.__id), [-1]);
+        assert.deepEqual((filteredData as any).map((x: any) => x.__id), [-1]);
     });
 });
 
@@ -295,7 +460,9 @@ describe('filterCBioPortalWebServiceDataByUnflattenedOQLLine', () => {
         // given CNA data for 3 genes in 2 samples and an AccessorsForOqlFilter instance
         // aware of their profile
         const dataArray: NumericGeneMolecularData[] = THREE_GENE_TWO_SAMPLE_CNA_DATA;
-        const accessorsInstance: AccessorsForOqlFilter = new AccessorsForOqlFilter([DATA_PROFILE]);
+        const accessorsInstance: AccessorsForOqlFilter = new AccessorsForOqlFilter(
+            [DATA_PROFILE]
+        );
         // when calling the function with an OQL query asking data for 1 gene
         const filteredData = filterCBioPortalWebServiceDataByUnflattenedOQLLine(
             'BRCA1',
@@ -312,7 +479,9 @@ describe('filterCBioPortalWebServiceDataByUnflattenedOQLLine', () => {
         // given CNA data for 3 genes in 2 samples and an AccessorsForOqlFilter instance
         // aware of their profile
         const dataArray: NumericGeneMolecularData[] = THREE_GENE_TWO_SAMPLE_CNA_DATA;
-        const accessorsInstance: AccessorsForOqlFilter = new AccessorsForOqlFilter([DATA_PROFILE]);
+        const accessorsInstance: AccessorsForOqlFilter = new AccessorsForOqlFilter(
+            [DATA_PROFILE]
+        );
         // when calling the function with an OQL query asking data for a
         // 1-gene list
         const filteredData = filterCBioPortalWebServiceDataByUnflattenedOQLLine(
@@ -324,15 +493,23 @@ describe('filterCBioPortalWebServiceDataByUnflattenedOQLLine', () => {
         // then it returns a single list object containing a single data object
         assert.lengthOf(filteredData, 1);
         assert.property(filteredData[0], 'list');
-        assert.lengthOf((filteredData[0] as MergedTrackLineFilterOutput<object>).list, 1);
-        assert.property((filteredData[0] as MergedTrackLineFilterOutput<object>).list[0], 'data');
+        assert.lengthOf(
+            (filteredData[0] as MergedTrackLineFilterOutput<object>).list,
+            1
+        );
+        assert.property(
+            (filteredData[0] as MergedTrackLineFilterOutput<object>).list[0],
+            'data'
+        );
     });
 
     it('returns a .list with two .data objects for a two-gene merged query', () => {
         // given CNA data for 3 genes in 2 samples and an AccessorsForOqlFilter instance
         // aware of their profile
         const dataArray: NumericGeneMolecularData[] = THREE_GENE_TWO_SAMPLE_CNA_DATA;
-        const accessorsInstance: AccessorsForOqlFilter = new AccessorsForOqlFilter([DATA_PROFILE]);
+        const accessorsInstance: AccessorsForOqlFilter = new AccessorsForOqlFilter(
+            [DATA_PROFILE]
+        );
         // when calling the function with an OQL query asking data for a
         // 2-gene list
         const filteredData = filterCBioPortalWebServiceDataByUnflattenedOQLLine(
@@ -344,7 +521,10 @@ describe('filterCBioPortalWebServiceDataByUnflattenedOQLLine', () => {
         // then it returns a single list object containing 2 data objects
         assert.lengthOf(filteredData, 1);
         assert.property(filteredData[0], 'list');
-        assert.lengthOf((filteredData[0] as MergedTrackLineFilterOutput<object>).list, 2);
+        assert.lengthOf(
+            (filteredData[0] as MergedTrackLineFilterOutput<object>).list,
+            2
+        );
         (filteredData[0] as MergedTrackLineFilterOutput<object>).list.forEach(
             subline => assert.property(subline, 'data')
         );
@@ -354,7 +534,9 @@ describe('filterCBioPortalWebServiceDataByUnflattenedOQLLine', () => {
         // given CNA data for 3 genes in 2 samples and an AccessorsForOqlFilter instance
         // aware of their profile
         const dataArray: NumericGeneMolecularData[] = THREE_GENE_TWO_SAMPLE_CNA_DATA;
-        const accessorsInstance: AccessorsForOqlFilter = new AccessorsForOqlFilter([DATA_PROFILE]);
+        const accessorsInstance: AccessorsForOqlFilter = new AccessorsForOqlFilter(
+            [DATA_PROFILE]
+        );
         // when calling the function with an OQL query asking data for 1 gene
         const filteredData = filterCBioPortalWebServiceDataByUnflattenedOQLLine(
             '[BRCA1 PTEN] TP53',
@@ -365,7 +547,10 @@ describe('filterCBioPortalWebServiceDataByUnflattenedOQLLine', () => {
         // then it returns both a two-element .list and a .data
         assert.lengthOf(filteredData, 2);
         assert.property(filteredData[0], 'list');
-        assert.lengthOf((filteredData[0] as MergedTrackLineFilterOutput<object>).list, 2);
+        assert.lengthOf(
+            (filteredData[0] as MergedTrackLineFilterOutput<object>).list,
+            2
+        );
         assert.property(filteredData[1], 'data');
     });
 
@@ -373,7 +558,9 @@ describe('filterCBioPortalWebServiceDataByUnflattenedOQLLine', () => {
         // given CNA data for 3 genes in 2 samples and an AccessorsForOqlFilter instance
         // aware of their profile
         const dataArray: NumericGeneMolecularData[] = THREE_GENE_TWO_SAMPLE_CNA_DATA;
-        const accessorsInstance: AccessorsForOqlFilter = new AccessorsForOqlFilter([DATA_PROFILE]);
+        const accessorsInstance: AccessorsForOqlFilter = new AccessorsForOqlFilter(
+            [DATA_PROFILE]
+        );
         // when calling the function with an OQL query asking data for 1 gene
         const filteredData = filterCBioPortalWebServiceDataByUnflattenedOQLLine(
             'PTEN [BRCA1 TP53]',
@@ -385,7 +572,9 @@ describe('filterCBioPortalWebServiceDataByUnflattenedOQLLine', () => {
         assert.lengthOf(filteredData, 2);
         assert.property(filteredData[0], 'data');
         assert.property(filteredData[1], 'list');
-        assert.lengthOf((filteredData[1] as MergedTrackLineFilterOutput<object>).list, 2);
+        assert.lengthOf(
+            (filteredData[1] as MergedTrackLineFilterOutput<object>).list,
+            2
+        );
     });
-
 });
diff --git a/src/shared/lib/reactionWithPrev.spec.ts b/src/shared/lib/reactionWithPrev.spec.ts
index 6efbbc2082c..56105e7e74b 100644
--- a/src/shared/lib/reactionWithPrev.spec.ts
+++ b/src/shared/lib/reactionWithPrev.spec.ts
@@ -1,40 +1,36 @@
 import { assert } from 'chai';
-import reactionWithPrev from "./reactionWithPrev";
-import {IReactionDisposer, observable} from "mobx";
+import reactionWithPrev from './reactionWithPrev';
+import { IReactionDisposer, observable } from 'mobx';
 
-describe("reactionWithPrev", ()=>{
-    let dispose:IReactionDisposer;
+describe('reactionWithPrev', () => {
+    let dispose: IReactionDisposer;
 
-    it("passes through the correct arguments each time", (done)=>{
-        let values = [0,3,5,7,7,7,8,10];
+    it('passes through the correct arguments each time', done => {
+        let values = [0, 3, 5, 7, 7, 7, 8, 10];
         let argumentIndex = observable(-1);
-        let indexesWhereEffectCalled:{[index:number]:boolean} = {};
-
-        let dataFn = ()=>values[argumentIndex.get()];
-        let effectFn = (data:number, prevData?:number)=>{
+        let indexesWhereEffectCalled: { [index: number]: boolean } = {};
 
+        let dataFn = () => values[argumentIndex.get()];
+        let effectFn = (data: number, prevData?: number) => {
             if (argumentIndex.get() === values.length) {
-                assert.isTrue(indexesWhereEffectCalled[0], "0");
-                assert.isTrue(indexesWhereEffectCalled[1], "1");
-                assert.isTrue(indexesWhereEffectCalled[2], "2");
-                assert.isTrue(indexesWhereEffectCalled[3], "3");
-                assert.isTrue(!indexesWhereEffectCalled[4], "4");
-                assert.isTrue(!indexesWhereEffectCalled[5], "5");
-                assert.isTrue(indexesWhereEffectCalled[6], "6");
-                assert.isTrue(indexesWhereEffectCalled[7], "7");
+                assert.isTrue(indexesWhereEffectCalled[0], '0');
+                assert.isTrue(indexesWhereEffectCalled[1], '1');
+                assert.isTrue(indexesWhereEffectCalled[2], '2');
+                assert.isTrue(indexesWhereEffectCalled[3], '3');
+                assert.isTrue(!indexesWhereEffectCalled[4], '4');
+                assert.isTrue(!indexesWhereEffectCalled[5], '5');
+                assert.isTrue(indexesWhereEffectCalled[6], '6');
+                assert.isTrue(indexesWhereEffectCalled[7], '7');
                 done();
             } else {
                 indexesWhereEffectCalled[argumentIndex.get()] = true;
                 assert.equal(data, values[argumentIndex.get()]);
                 if (argumentIndex.get() > 0) {
-                    assert.equal(prevData, values[argumentIndex.get()-1]);
+                    assert.equal(prevData, values[argumentIndex.get() - 1]);
                 }
             }
         };
-        dispose = reactionWithPrev<number>(
-            dataFn,
-            effectFn
-        );
+        dispose = reactionWithPrev<number>(dataFn, effectFn);
         argumentIndex.set(0);
         argumentIndex.set(1);
         argumentIndex.set(2);
@@ -45,5 +41,4 @@ describe("reactionWithPrev", ()=>{
         argumentIndex.set(7);
         argumentIndex.set(8);
     });
-
-});
\ No newline at end of file
+});
diff --git a/src/shared/lib/reactionWithPrev.ts b/src/shared/lib/reactionWithPrev.ts
index d7755a834a1..2759f49b74c 100644
--- a/src/shared/lib/reactionWithPrev.ts
+++ b/src/shared/lib/reactionWithPrev.ts
@@ -1,21 +1,21 @@
-import {IReactionDisposer, IReactionOptions, reaction} from "mobx";
+import { IReactionDisposer, IReactionOptions, reaction } from 'mobx';
 
 export default function reactionWithPrev<D>(
-        dataFn:()=>D,
-        effectFn:(data:D, prevData?:D)=>void,
-        opts?:IReactionOptions
-    ) {
-    let prevData:D|undefined = undefined;
-    let currData:D|undefined = undefined;
+    dataFn: () => D,
+    effectFn: (data: D, prevData?: D) => void,
+    opts?: IReactionOptions
+) {
+    let prevData: D | undefined = undefined;
+    let currData: D | undefined = undefined;
     return reaction(
-        ()=>{
+        () => {
             prevData = currData;
             currData = dataFn();
             return currData;
         },
-        (data:D)=>{
+        (data: D) => {
             effectFn(data, prevData);
         },
         opts
     );
-}
\ No newline at end of file
+}
diff --git a/src/shared/lib/redirectHelpers.spec.ts b/src/shared/lib/redirectHelpers.spec.ts
index 54410a67362..e2f45f1112d 100644
--- a/src/shared/lib/redirectHelpers.spec.ts
+++ b/src/shared/lib/redirectHelpers.spec.ts
@@ -1,62 +1,56 @@
 import { restoreRouteAfterRedirect } from './redirectHelpers';
 import sinon from 'sinon';
-import ExtendedRouterStore from "./ExtendedRouterStore";
+import ExtendedRouterStore from './ExtendedRouterStore';
 import { assert } from 'chai';
 
-describe('restoreRouteAfterRedirect', ()=>{
-
+describe('restoreRouteAfterRedirect', () => {
     let getItemStub: sinon.SinonStub;
     let removeItemStub: sinon.SinonStub;
-    let stores:any;
-
-    beforeEach(()=>{
+    let stores: any;
 
+    beforeEach(() => {
         stores = {
-            routing:{
+            routing: {
                 location: {
                     query: {
-                        key: "mooo"
-                    }
+                        key: 'mooo',
+                    },
                 },
-                push:sinon.stub(),
-                updateRoute:()=>{}
-            }
-
+                push: sinon.stub(),
+                updateRoute: () => {},
+            },
         };
 
         removeItemStub = sinon.stub(window.localStorage, 'removeItem');
         getItemStub = sinon.stub(window.localStorage, 'getItem');
     });
 
-    afterEach(()=>{
+    afterEach(() => {
         getItemStub.restore();
         removeItemStub.restore();
     });
 
-    it('calls getItem with appropriate key', ()=>{
+    it('calls getItem with appropriate key', () => {
         restoreRouteAfterRedirect(stores as any);
         assert.isTrue(getItemStub.calledOnce);
-        assert.equal(getItemStub.args[0][0], "mooo");
+        assert.equal(getItemStub.args[0][0], 'mooo');
     });
 
-    it('if no key is available, we redirect to root route', ()=>{
+    it('if no key is available, we redirect to root route', () => {
         getItemStub.returns(undefined);
         restoreRouteAfterRedirect(stores as any);
-        assert.isTrue((stores.routing.push as sinon.SinonStub).calledWith("/"));
+        assert.isTrue((stores.routing.push as sinon.SinonStub).calledWith('/'));
         assert.isFalse(removeItemStub.called);
-
     });
 
-    it('if key is available, we redirect to it, sans #, delete key', ()=>{
-        getItemStub.returns("#one/two");
+    it('if key is available, we redirect to it, sans #, delete key', () => {
+        getItemStub.returns('#one/two');
         restoreRouteAfterRedirect(stores as any);
         assert.isTrue(removeItemStub.calledOnce);
-        assert.isTrue(stores.routing.push.calledWith("one/two"));
+        assert.isTrue(stores.routing.push.calledWith('one/two'));
     });
-
 });
 
-
 // const key = injected.routing.location.query.key;
 // let restoreRoute = window.localStorage.getItem(key);
 // if (restoreRoute) {
@@ -66,4 +60,4 @@ describe('restoreRouteAfterRedirect', ()=>{
 //     return null;
 // } else {
 //     injected.routing.push('/');
-// }
\ No newline at end of file
+// }
diff --git a/src/shared/lib/redirectHelpers.ts b/src/shared/lib/redirectHelpers.ts
index d3b1e579784..a50c7f723e6 100644
--- a/src/shared/lib/redirectHelpers.ts
+++ b/src/shared/lib/redirectHelpers.ts
@@ -1,12 +1,13 @@
-import ExtendedRouterStore from "./ExtendedRouterStore";
-import {getBrowserWindow} from "cbioportal-frontend-commons";
-import {QueryParams} from "url";
-import {PatientViewUrlParams} from "../../pages/patientView/PatientViewPage";
-import AppConfig from "appConfig";
-import ResultsViewURLWrapper from "pages/resultsView/ResultsViewURLWrapper";
-
-export function restoreRouteAfterRedirect(injected: { routing:ExtendedRouterStore }){
-
+import ExtendedRouterStore from './ExtendedRouterStore';
+import { getBrowserWindow } from 'cbioportal-frontend-commons';
+import { QueryParams } from 'url';
+import { PatientViewUrlParams } from '../../pages/patientView/PatientViewPage';
+import AppConfig from 'appConfig';
+import ResultsViewURLWrapper from 'pages/resultsView/ResultsViewURLWrapper';
+
+export function restoreRouteAfterRedirect(injected: {
+    routing: ExtendedRouterStore;
+}) {
     const win = getBrowserWindow();
 
     const key = injected.routing.location.query.key;
@@ -23,33 +24,36 @@ export function restoreRouteAfterRedirect(injected: { routing:ExtendedRouterStor
         injected.routing.push('/');
     }
     return null;
-
 }
 
 // harvest query data written to the page by JSP to support queries originating
 // from external posts
-export function handlePostedSubmission(urlWrapper:ResultsViewURLWrapper){
+export function handlePostedSubmission(urlWrapper: ResultsViewURLWrapper) {
     if (getBrowserWindow().postData) {
-        urlWrapper.updateURL(getBrowserWindow().postData, "results", true, true);
+        urlWrapper.updateURL(
+            getBrowserWindow().postData,
+            'results',
+            true,
+            true
+        );
         // we don't want this data to be around anymore once we've tranferred it to URL
         getBrowserWindow().postData = null;
     }
 }
 
-export function handleLegacySubmission(urlWrapper:ResultsViewURLWrapper){
-    const legacySubmission = localStorage.getItem("legacyStudySubmission");
-    localStorage.removeItem("legacyStudySubmission");
+export function handleLegacySubmission(urlWrapper: ResultsViewURLWrapper) {
+    const legacySubmission = localStorage.getItem('legacyStudySubmission');
+    localStorage.removeItem('legacyStudySubmission');
     if (legacySubmission) {
-        const parsedSubmission:any = JSON.parse(legacySubmission);
+        const parsedSubmission: any = JSON.parse(legacySubmission);
         if (parsedSubmission.Action) {
-           urlWrapper.updateURL(parsedSubmission, "results");
+            urlWrapper.updateURL(parsedSubmission, 'results');
         }
     }
 }
 
-export function handleCaseDO(){
-
-    const routingStore:ExtendedRouterStore = getBrowserWindow().routingStore;
+export function handleCaseDO() {
+    const routingStore: ExtendedRouterStore = getBrowserWindow().routingStore;
 
     const newParams: Partial<PatientViewUrlParams> = {};
 
@@ -67,55 +71,83 @@ export function handleCaseDO(){
         newParams.sampleId = currentQuery.sample_id;
     }
 
-    if (routingStore.location.hash && routingStore.location.hash.includes("nav_case_ids")) {
-        routingStore.location.hash = routingStore.location.hash!.replace(/nav_case_ids/,"navCaseIds");
+    if (
+        routingStore.location.hash &&
+        routingStore.location.hash.includes('nav_case_ids')
+    ) {
+        routingStore.location.hash = routingStore.location.hash!.replace(
+            /nav_case_ids/,
+            'navCaseIds'
+        );
     }
 
-    (getBrowserWindow().routingStore as ExtendedRouterStore).updateRoute(newParams, "/patient", true);
-
+    (getBrowserWindow().routingStore as ExtendedRouterStore).updateRoute(
+        newParams,
+        '/patient',
+        true
+    );
 }
 
 /*
  * Handle LinkOut of style /ln?q=TP53:MUT and ln?cancer_study_id=gbm_tcga&q=EGFR+NF1.
  */
 export function handleLinkOut() {
-    const routingStore:ExtendedRouterStore = getBrowserWindow().routingStore;
+    const routingStore: ExtendedRouterStore = getBrowserWindow().routingStore;
     const currentQuery = routingStore.location.query;
 
     const data = {
         case_set_id: 'all',
-        gene_list: currentQuery.q.replace("+",","),
+        gene_list: currentQuery.q.replace('+', ','),
         cancer_study_list:
             currentQuery.cancer_study_id ||
             // use same set of studies as quick search gene query if no
             // specific study is supplied
             AppConfig.serverConfig.default_cross_cancer_study_session_id ||
-            AppConfig.serverConfig.default_cross_cancer_study_list
+            AppConfig.serverConfig.default_cross_cancer_study_list,
     };
 
-    (getBrowserWindow().routingStore as ExtendedRouterStore).updateRoute(data, "/results/mutations", true, true);
+    (getBrowserWindow().routingStore as ExtendedRouterStore).updateRoute(
+        data,
+        '/results/mutations',
+        true,
+        true
+    );
 }
 
-export function handleStudyDO(){
-    (getBrowserWindow().routingStore as ExtendedRouterStore).updateRoute({}, "/study", false);
+export function handleStudyDO() {
+    (getBrowserWindow().routingStore as ExtendedRouterStore).updateRoute(
+        {},
+        '/study',
+        false
+    );
 }
 
-
-export function handleIndexDO(){
+export function handleIndexDO() {
     if (/Action=Submit/i.test(window.location.search)) {
-
         let data: QueryParams = {};
 
         // ALL QUERIES NOW HAVE cancer_study_list. if we have a legacy cancer_study_id but not a cancer_study_list, copy it over
-        if (!getBrowserWindow().routingStore.location.query.cancer_study_list && getBrowserWindow().routingStore.location.query.cancer_study_id) {
+        if (
+            !getBrowserWindow().routingStore.location.query.cancer_study_list &&
+            getBrowserWindow().routingStore.location.query.cancer_study_id
+        ) {
             data.cancer_study_list = getBrowserWindow().routingStore.location.query.cancer_study_id;
             data.cancer_study_id = undefined;
         }
 
-        (getBrowserWindow().routingStore as ExtendedRouterStore).updateRoute(data, "/results");
+        (getBrowserWindow().routingStore as ExtendedRouterStore).updateRoute(
+            data,
+            '/results'
+        );
     } else if (/session_id/.test(window.location.search)) {
-        (getBrowserWindow().routingStore as ExtendedRouterStore).updateRoute({}, "/results");
+        (getBrowserWindow().routingStore as ExtendedRouterStore).updateRoute(
+            {},
+            '/results'
+        );
     } else {
-        (getBrowserWindow().routingStore as ExtendedRouterStore).updateRoute({}, "/");
+        (getBrowserWindow().routingStore as ExtendedRouterStore).updateRoute(
+            {},
+            '/'
+        );
     }
 }
diff --git a/src/shared/lib/seekUrlHash.ts b/src/shared/lib/seekUrlHash.ts
index d3206ef3690..71483e0c5fb 100644
--- a/src/shared/lib/seekUrlHash.ts
+++ b/src/shared/lib/seekUrlHash.ts
@@ -1,9 +1,9 @@
-import {getBrowserWindow} from "cbioportal-frontend-commons";
+import { getBrowserWindow } from 'cbioportal-frontend-commons';
 
 // this is the only way to solve issue in SPA where content doesn't exist when URL changes
 // thus anchors corresponding to url hash may not be in DOM to scroll to
 
-function getElement(id:string) {
+function getElement(id: string) {
     const eltById = document.getElementById(id);
     if (eltById) {
         return eltById;
@@ -17,17 +17,17 @@ function getElement(id:string) {
     return null;
 }
 
-export function seekUrlHash(id:string){
+export function seekUrlHash(id: string) {
     let counter = 0;
     let limit = 50;
     let pollInterval = 100;
-    let interval = setInterval(()=>{
+    let interval = setInterval(() => {
         if (getElement(id)) {
             clearInterval(interval);
             // this is a bit of a hack to get browser to
             // scroll to element as it would if this problem
             // didn't exist
-            getBrowserWindow().location.hash = "";
+            getBrowserWindow().location.hash = '';
             getBrowserWindow().location.hash = id;
         }
         // bail if we reach reasonable limit
diff --git a/src/shared/lib/setWindowVariable.ts b/src/shared/lib/setWindowVariable.ts
index 13434d40a1a..23dd5da6788 100644
--- a/src/shared/lib/setWindowVariable.ts
+++ b/src/shared/lib/setWindowVariable.ts
@@ -1,3 +1,3 @@
-export default function setWindowVariable(propName:string, value:any) {
+export default function setWindowVariable(propName: string, value: any) {
     if (window) (window as any)[propName] = value;
 }
diff --git a/src/shared/lib/sortedFindWith.spec.ts b/src/shared/lib/sortedFindWith.spec.ts
index 30f9c51d3ac..6d54b9bd963 100644
--- a/src/shared/lib/sortedFindWith.spec.ts
+++ b/src/shared/lib/sortedFindWith.spec.ts
@@ -1,62 +1,161 @@
-import {assert} from "chai";
-import {sortedFindWith} from "./sortedFindWith";
+import { assert } from 'chai';
+import { sortedFindWith } from './sortedFindWith';
 
-describe("sortedFindWith", () => {
+describe('sortedFindWith', () => {
     // for each test: it finds the target element
     //              if target element doesnt exist, it returns undefined
-    it("empty array", ()=>{
-        const array:number[] = [];
-        assert.isUndefined(sortedFindWith(array, t=>0));
+    it('empty array', () => {
+        const array: number[] = [];
+        assert.isUndefined(sortedFindWith(array, t => 0));
     });
-    it("one element array", ()=>{
-        const array = [{ id:0, name:"hey" }];
-        assert.isUndefined(sortedFindWith(array, t=>Math.sign(t.id + 1)));
-        assert.deepEqual(sortedFindWith(array, t=>Math.sign(t.id)), { id:0, name:"hey"});
+    it('one element array', () => {
+        const array = [{ id: 0, name: 'hey' }];
+        assert.isUndefined(sortedFindWith(array, t => Math.sign(t.id + 1)));
+        assert.deepEqual(sortedFindWith(array, t => Math.sign(t.id)), {
+            id: 0,
+            name: 'hey',
+        });
     });
-    it("two element array", ()=>{
-        const array = [{ id:0, name:"hey" }, { id:1, name:"yo" }];
-        assert.isUndefined(sortedFindWith(array, t=>Math.sign(t.id + 1)));
-        assert.deepEqual(sortedFindWith(array, t=>Math.sign(t.id - 1)), { id:1, name:"yo"});
-        assert.deepEqual(sortedFindWith(array, t=>Math.sign(t.id)), { id:0, name:"hey"});
+    it('two element array', () => {
+        const array = [{ id: 0, name: 'hey' }, { id: 1, name: 'yo' }];
+        assert.isUndefined(sortedFindWith(array, t => Math.sign(t.id + 1)));
+        assert.deepEqual(sortedFindWith(array, t => Math.sign(t.id - 1)), {
+            id: 1,
+            name: 'yo',
+        });
+        assert.deepEqual(sortedFindWith(array, t => Math.sign(t.id)), {
+            id: 0,
+            name: 'hey',
+        });
     });
-    it("three element array", ()=>{
-        const array = [{ id:0, name:"A" }, { id:1, name:"B" }, { id:2, name:"C" }];
-        assert.isUndefined(sortedFindWith(array, t=>Math.sign(t.id - 3)));
-        assert.deepEqual(sortedFindWith(array, t=>Math.sign(t.id - 2)), { id:2, name:"C" });
-        assert.deepEqual(sortedFindWith(array, t=>Math.sign(t.id - 1)), { id:1, name:"B" });
-        assert.deepEqual(sortedFindWith(array, t=>Math.sign(t.id)), { id:0, name:"A" });
+    it('three element array', () => {
+        const array = [
+            { id: 0, name: 'A' },
+            { id: 1, name: 'B' },
+            { id: 2, name: 'C' },
+        ];
+        assert.isUndefined(sortedFindWith(array, t => Math.sign(t.id - 3)));
+        assert.deepEqual(sortedFindWith(array, t => Math.sign(t.id - 2)), {
+            id: 2,
+            name: 'C',
+        });
+        assert.deepEqual(sortedFindWith(array, t => Math.sign(t.id - 1)), {
+            id: 1,
+            name: 'B',
+        });
+        assert.deepEqual(sortedFindWith(array, t => Math.sign(t.id)), {
+            id: 0,
+            name: 'A',
+        });
     });
-    it("four element array", ()=>{
-        const array = [{ id:0, name:"A" }, { id:1, name:"B" }, { id:2, name:"C" }, { id:3, name:"D" }];
-        assert.isUndefined(sortedFindWith(array, t=>Math.sign(t.id + 1)));
-        assert.deepEqual(sortedFindWith(array, t=>Math.sign(t.id - 3)), { id:3, name:"D" });
-        assert.deepEqual(sortedFindWith(array, t=>Math.sign(t.id - 2)), { id:2, name:"C" });
-        assert.deepEqual(sortedFindWith(array, t=>Math.sign(t.id - 1)), { id:1, name:"B" });
-        assert.deepEqual(sortedFindWith(array, t=>Math.sign(t.id)), { id:0, name:"A" });
+    it('four element array', () => {
+        const array = [
+            { id: 0, name: 'A' },
+            { id: 1, name: 'B' },
+            { id: 2, name: 'C' },
+            { id: 3, name: 'D' },
+        ];
+        assert.isUndefined(sortedFindWith(array, t => Math.sign(t.id + 1)));
+        assert.deepEqual(sortedFindWith(array, t => Math.sign(t.id - 3)), {
+            id: 3,
+            name: 'D',
+        });
+        assert.deepEqual(sortedFindWith(array, t => Math.sign(t.id - 2)), {
+            id: 2,
+            name: 'C',
+        });
+        assert.deepEqual(sortedFindWith(array, t => Math.sign(t.id - 1)), {
+            id: 1,
+            name: 'B',
+        });
+        assert.deepEqual(sortedFindWith(array, t => Math.sign(t.id)), {
+            id: 0,
+            name: 'A',
+        });
     });
-    it("several element even length array", ()=>{
-        const array = [{ id:0, name:"A" }, { id:1, name:"B" }, { id:2, name:"C" }, { id:3, name:"D" },
-            { id:4, name:"E" }, { id:5, name:"F" }, { id:6, name:"G" }, { id:7, name:"H" }];
-        assert.isUndefined(sortedFindWith(array, t=>Math.sign(t.id - 10)));
-        assert.deepEqual(sortedFindWith(array, t=>Math.sign(t.id - 7)), { id:7, name:"H" });
-        assert.deepEqual(sortedFindWith(array, t=>Math.sign(t.id - 6)), { id:6, name:"G" });
-        assert.deepEqual(sortedFindWith(array, t=>Math.sign(t.id - 5)), { id:5, name:"F" });
-        assert.deepEqual(sortedFindWith(array, t=>Math.sign(t.id - 4)), { id:4, name:"E" });
-        assert.deepEqual(sortedFindWith(array, t=>Math.sign(t.id - 3)), { id:3, name:"D" });
-        assert.deepEqual(sortedFindWith(array, t=>Math.sign(t.id - 2)), { id:2, name:"C" });
-        assert.deepEqual(sortedFindWith(array, t=>Math.sign(t.id - 1)), { id:1, name:"B" });
-        assert.deepEqual(sortedFindWith(array, t=>Math.sign(t.id)), { id:0, name:"A" });
+    it('several element even length array', () => {
+        const array = [
+            { id: 0, name: 'A' },
+            { id: 1, name: 'B' },
+            { id: 2, name: 'C' },
+            { id: 3, name: 'D' },
+            { id: 4, name: 'E' },
+            { id: 5, name: 'F' },
+            { id: 6, name: 'G' },
+            { id: 7, name: 'H' },
+        ];
+        assert.isUndefined(sortedFindWith(array, t => Math.sign(t.id - 10)));
+        assert.deepEqual(sortedFindWith(array, t => Math.sign(t.id - 7)), {
+            id: 7,
+            name: 'H',
+        });
+        assert.deepEqual(sortedFindWith(array, t => Math.sign(t.id - 6)), {
+            id: 6,
+            name: 'G',
+        });
+        assert.deepEqual(sortedFindWith(array, t => Math.sign(t.id - 5)), {
+            id: 5,
+            name: 'F',
+        });
+        assert.deepEqual(sortedFindWith(array, t => Math.sign(t.id - 4)), {
+            id: 4,
+            name: 'E',
+        });
+        assert.deepEqual(sortedFindWith(array, t => Math.sign(t.id - 3)), {
+            id: 3,
+            name: 'D',
+        });
+        assert.deepEqual(sortedFindWith(array, t => Math.sign(t.id - 2)), {
+            id: 2,
+            name: 'C',
+        });
+        assert.deepEqual(sortedFindWith(array, t => Math.sign(t.id - 1)), {
+            id: 1,
+            name: 'B',
+        });
+        assert.deepEqual(sortedFindWith(array, t => Math.sign(t.id)), {
+            id: 0,
+            name: 'A',
+        });
     });
-    it("several element odd length array", ()=>{
-        const array = [{ id:0, name:"A" }, { id:1, name:"B" }, { id:2, name:"C" }, { id:3, name:"D" },
-            { id:4, name:"E" }, { id:5, name:"F" }, { id:6, name:"G" }];
-        assert.isUndefined(sortedFindWith(array, t=>Math.sign(t.id - 10)));
-        assert.deepEqual(sortedFindWith(array, t=>Math.sign(t.id - 6)), { id:6, name:"G" });
-        assert.deepEqual(sortedFindWith(array, t=>Math.sign(t.id - 5)), { id:5, name:"F" });
-        assert.deepEqual(sortedFindWith(array, t=>Math.sign(t.id - 4)), { id:4, name:"E" });
-        assert.deepEqual(sortedFindWith(array, t=>Math.sign(t.id - 3)), { id:3, name:"D" });
-        assert.deepEqual(sortedFindWith(array, t=>Math.sign(t.id - 2)), { id:2, name:"C" });
-        assert.deepEqual(sortedFindWith(array, t=>Math.sign(t.id - 1)), { id:1, name:"B" });
-        assert.deepEqual(sortedFindWith(array, t=>Math.sign(t.id)), { id:0, name:"A" });
+    it('several element odd length array', () => {
+        const array = [
+            { id: 0, name: 'A' },
+            { id: 1, name: 'B' },
+            { id: 2, name: 'C' },
+            { id: 3, name: 'D' },
+            { id: 4, name: 'E' },
+            { id: 5, name: 'F' },
+            { id: 6, name: 'G' },
+        ];
+        assert.isUndefined(sortedFindWith(array, t => Math.sign(t.id - 10)));
+        assert.deepEqual(sortedFindWith(array, t => Math.sign(t.id - 6)), {
+            id: 6,
+            name: 'G',
+        });
+        assert.deepEqual(sortedFindWith(array, t => Math.sign(t.id - 5)), {
+            id: 5,
+            name: 'F',
+        });
+        assert.deepEqual(sortedFindWith(array, t => Math.sign(t.id - 4)), {
+            id: 4,
+            name: 'E',
+        });
+        assert.deepEqual(sortedFindWith(array, t => Math.sign(t.id - 3)), {
+            id: 3,
+            name: 'D',
+        });
+        assert.deepEqual(sortedFindWith(array, t => Math.sign(t.id - 2)), {
+            id: 2,
+            name: 'C',
+        });
+        assert.deepEqual(sortedFindWith(array, t => Math.sign(t.id - 1)), {
+            id: 1,
+            name: 'B',
+        });
+        assert.deepEqual(sortedFindWith(array, t => Math.sign(t.id)), {
+            id: 0,
+            name: 'A',
+        });
     });
-});
\ No newline at end of file
+});
diff --git a/src/shared/lib/sortedFindWith.ts b/src/shared/lib/sortedFindWith.ts
index fa322074ce4..4d0d37e1c15 100644
--- a/src/shared/lib/sortedFindWith.ts
+++ b/src/shared/lib/sortedFindWith.ts
@@ -3,9 +3,9 @@
 // Behavior undefined on non-sorted arrays.
 
 export function sortedFindWith<T>(
-    sortedArray:T[],
-    oracle:(t:T)=>number // -1, 0, 1
-):T|undefined {
+    sortedArray: T[],
+    oracle: (t: T) => number // -1, 0, 1
+): T | undefined {
     let lowIncl = 0;
     let highExcl = sortedArray.length;
     let middle;
@@ -20,7 +20,7 @@ export function sortedFindWith<T>(
             case -1:
                 // "too small"
                 // target element must be in [middle+1, high)
-                lowIncl = middle+1;
+                lowIncl = middle + 1;
                 break;
             case 0:
                 // we found it
@@ -28,4 +28,4 @@ export function sortedFindWith<T>(
         }
     }
     return undefined;
-}
\ No newline at end of file
+}
diff --git a/src/shared/lib/textQueryUtils.ts b/src/shared/lib/textQueryUtils.ts
index 040ac596d36..9e243dacf80 100644
--- a/src/shared/lib/textQueryUtils.ts
+++ b/src/shared/lib/textQueryUtils.ts
@@ -1,161 +1,145 @@
-export type SearchClause = (
-	{type: 'not', data: string} |
-	{type: 'and', data: string[]}
-);
+export type SearchClause =
+    | { type: 'not'; data: string }
+    | { type: 'and'; data: string[] };
 
-export type SearchResult = {match: boolean, forced: boolean};
+export type SearchResult = { match: boolean; forced: boolean };
 
-export function parse_search_query(query:string):SearchClause[]
-{
-	// First eliminate trailing whitespace and reduce every whitespace
-	//	to a single space.
-	query = query.toLowerCase().trim().split(/\s+/g).join(' ');
-	// Now factor out quotation marks and inter-token spaces
-	let phrases = [];
-	let currInd = 0;
-	let nextSpace, nextQuote;
-	while (currInd < query.length)
-	{
-		if (query[currInd] === '"')
-		{
-			nextQuote = query.indexOf('"', currInd + 1);
-			if (nextQuote === -1)
-			{
-				phrases.push(query.substring(currInd + 1));
-				currInd = query.length;
-			}
-			else
-			{
-				phrases.push(query.substring(currInd + 1, nextQuote));
-				currInd = nextQuote + 1;
-			}
-		}
-		else if (query[currInd] === ' ')
-		{
-			currInd += 1;
-		}
-		else if (query[currInd] === '-')
-		{
-			phrases.push('-');
-			currInd += 1;
-		}
-		else
-		{
-			nextSpace = query.indexOf(' ', currInd);
-			if (nextSpace === -1)
-			{
-				phrases.push(query.substring(currInd));
-				currInd = query.length;
-			}
-			else
-			{
-				phrases.push(query.substring(currInd, nextSpace));
-				currInd = nextSpace + 1;
-			}
-		}
-	}
-	// Now get the conjunctive clauses, and the negative clauses
-	let clauses:SearchClause[] = [];
-	currInd = 0;
-	let nextOr, nextDash;
-	while (currInd < phrases.length)
-	{
-		if (phrases[currInd] === '-')
-		{
-			if (currInd < phrases.length - 1)
-			{
-				clauses.push({"type": "not", "data": phrases[currInd + 1]});
-			}
-			currInd = currInd + 2;
-		}
-		else
-		{
-			nextOr = phrases.indexOf('or', currInd);
-			nextDash = phrases.indexOf('-', currInd);
-			if (nextOr === -1 && nextDash === -1)
-			{
-				clauses.push({"type": "and", "data": phrases.slice(currInd)});
-				currInd = phrases.length;
-			}
-			else if (nextOr === -1 && nextDash > 0)
-			{
-				clauses.push({"type": "and", "data": phrases.slice(currInd, nextDash)});
-				currInd = nextDash;
-			}
-			else if (nextOr > 0 && nextDash === -1)
-			{
-				clauses.push({"type": "and", "data": phrases.slice(currInd, nextOr)});
-				currInd = nextOr + 1;
-			}
-			else
-			{
-				if (nextOr < nextDash)
-				{
-					clauses.push({"type": "and", "data": phrases.slice(currInd, nextOr)});
-					currInd = nextOr + 1;
-				}
-				else
-				{
-					clauses.push({"type": "and", "data": phrases.slice(currInd, nextDash)});
-					currInd = nextDash;
-				}
-			}
-		}
-	}
-	return clauses;
+export function parse_search_query(query: string): SearchClause[] {
+    // First eliminate trailing whitespace and reduce every whitespace
+    //	to a single space.
+    query = query
+        .toLowerCase()
+        .trim()
+        .split(/\s+/g)
+        .join(' ');
+    // Now factor out quotation marks and inter-token spaces
+    let phrases = [];
+    let currInd = 0;
+    let nextSpace, nextQuote;
+    while (currInd < query.length) {
+        if (query[currInd] === '"') {
+            nextQuote = query.indexOf('"', currInd + 1);
+            if (nextQuote === -1) {
+                phrases.push(query.substring(currInd + 1));
+                currInd = query.length;
+            } else {
+                phrases.push(query.substring(currInd + 1, nextQuote));
+                currInd = nextQuote + 1;
+            }
+        } else if (query[currInd] === ' ') {
+            currInd += 1;
+        } else if (query[currInd] === '-') {
+            phrases.push('-');
+            currInd += 1;
+        } else {
+            nextSpace = query.indexOf(' ', currInd);
+            if (nextSpace === -1) {
+                phrases.push(query.substring(currInd));
+                currInd = query.length;
+            } else {
+                phrases.push(query.substring(currInd, nextSpace));
+                currInd = nextSpace + 1;
+            }
+        }
+    }
+    // Now get the conjunctive clauses, and the negative clauses
+    let clauses: SearchClause[] = [];
+    currInd = 0;
+    let nextOr, nextDash;
+    while (currInd < phrases.length) {
+        if (phrases[currInd] === '-') {
+            if (currInd < phrases.length - 1) {
+                clauses.push({ type: 'not', data: phrases[currInd + 1] });
+            }
+            currInd = currInd + 2;
+        } else {
+            nextOr = phrases.indexOf('or', currInd);
+            nextDash = phrases.indexOf('-', currInd);
+            if (nextOr === -1 && nextDash === -1) {
+                clauses.push({ type: 'and', data: phrases.slice(currInd) });
+                currInd = phrases.length;
+            } else if (nextOr === -1 && nextDash > 0) {
+                clauses.push({
+                    type: 'and',
+                    data: phrases.slice(currInd, nextDash),
+                });
+                currInd = nextDash;
+            } else if (nextOr > 0 && nextDash === -1) {
+                clauses.push({
+                    type: 'and',
+                    data: phrases.slice(currInd, nextOr),
+                });
+                currInd = nextOr + 1;
+            } else {
+                if (nextOr < nextDash) {
+                    clauses.push({
+                        type: 'and',
+                        data: phrases.slice(currInd, nextOr),
+                    });
+                    currInd = nextOr + 1;
+                } else {
+                    clauses.push({
+                        type: 'and',
+                        data: phrases.slice(currInd, nextDash),
+                    });
+                    currInd = nextDash;
+                }
+            }
+        }
+    }
+    return clauses;
 }
 
-export function matchPhrase(phrase:string, fullText:string)
-{
-	return fullText.toLowerCase().indexOf(phrase.toLowerCase()) > -1;
+export function matchPhrase(phrase: string, fullText: string) {
+    return fullText.toLowerCase().indexOf(phrase.toLowerCase()) > -1;
 }
 
-export function perform_search_single(parsed_query:SearchClause[], item:string):SearchResult;
-export function perform_search_single<T>(parsed_query:SearchClause[], item:T, matcher:(phrase:string, item:T)=>boolean):SearchResult;
-export function perform_search_single<T>(parsed_query:SearchClause[], item:T, matcher?:(phrase:string, item:T)=>boolean)
-{
-	if (!matcher)
-		matcher = matchPhrase as any;
+export function perform_search_single(
+    parsed_query: SearchClause[],
+    item: string
+): SearchResult;
+export function perform_search_single<T>(
+    parsed_query: SearchClause[],
+    item: T,
+    matcher: (phrase: string, item: T) => boolean
+): SearchResult;
+export function perform_search_single<T>(
+    parsed_query: SearchClause[],
+    item: T,
+    matcher?: (phrase: string, item: T) => boolean
+) {
+    if (!matcher) matcher = matchPhrase as any;
 
-	// return true iff the query, considering quotation marks, 'and' and 'or' logic, matches
-	let match = false;
-	let hasPositiveClauseType = false;
-	let forced = false;
+    // return true iff the query, considering quotation marks, 'and' and 'or' logic, matches
+    let match = false;
+    let hasPositiveClauseType = false;
+    let forced = false;
 
-	for (let clause of parsed_query)
-	{
-		if (clause.type !== 'not')
-		{
-			hasPositiveClauseType = true;
-			break;
-		}
-	}
-	if (!hasPositiveClauseType)
-	{
-		// if only negative clauses, match by default
-		match = true;
-	}
-	for (let clause of parsed_query)
-	{
-		if (clause.type === 'not')
-		{
-			if (matcher!(clause.data, item))
-			{
-				match = false;
-				forced = true;
-				break;
-			}
-		}
-		else if (clause.type === 'and')
-		{
-			hasPositiveClauseType = true;
-			let clauseMatch = true;
-			for (let phrase of clause.data)
-			{
-				clauseMatch = clauseMatch && matcher!(phrase, item);
-			}
-			match = match || clauseMatch;
-		}
-	}
-	return {match, forced};
+    for (let clause of parsed_query) {
+        if (clause.type !== 'not') {
+            hasPositiveClauseType = true;
+            break;
+        }
+    }
+    if (!hasPositiveClauseType) {
+        // if only negative clauses, match by default
+        match = true;
+    }
+    for (let clause of parsed_query) {
+        if (clause.type === 'not') {
+            if (matcher!(clause.data, item)) {
+                match = false;
+                forced = true;
+                break;
+            }
+        } else if (clause.type === 'and') {
+            hasPositiveClauseType = true;
+            let clauseMatch = true;
+            for (let phrase of clause.data) {
+                clauseMatch = clauseMatch && matcher!(phrase, item);
+            }
+            match = match || clauseMatch;
+        }
+    }
+    return { match, forced };
 }
diff --git a/src/shared/lib/tracking.ts b/src/shared/lib/tracking.ts
index a3969a8dc19..ceaf395834a 100644
--- a/src/shared/lib/tracking.ts
+++ b/src/shared/lib/tracking.ts
@@ -1,47 +1,60 @@
 import $ from 'jquery';
-import AppConfig from "appConfig";
-import {getBrowserWindow, isWebdriver} from "cbioportal-frontend-commons";
+import AppConfig from 'appConfig';
+import { getBrowserWindow, isWebdriver } from 'cbioportal-frontend-commons';
 import * as _ from 'lodash';
-import {log} from "./consoleLog";
-import {StudyViewPageStore} from "../../pages/studyView/StudyViewPageStore";
+import { log } from './consoleLog';
+import { StudyViewPageStore } from '../../pages/studyView/StudyViewPageStore';
 
 export type GAEvent = {
-  category:"studyPage"|"resultsView"|"quickSearch"|"download"|"groupComparison"|"homePage"|"patientView";
-  action:string;
-  label?:string|string[];
-  fieldsObject?:{ [key:string]:string|number; }
+    category:
+        | 'studyPage'
+        | 'resultsView'
+        | 'quickSearch'
+        | 'download'
+        | 'groupComparison'
+        | 'homePage'
+        | 'patientView';
+    action: string;
+    label?: string | string[];
+    fieldsObject?: { [key: string]: string | number };
 };
 
-export function initializeTracking(){
-
+export function initializeTracking() {
     if (!_.isEmpty(AppConfig.serverConfig.google_analytics_profile_id)) {
-        embedGoogleAnalytics(AppConfig.serverConfig.google_analytics_profile_id!);
+        embedGoogleAnalytics(
+            AppConfig.serverConfig.google_analytics_profile_id!
+        );
     }
 
-    $("body").on("click","[data-event]",(el)=>{
+    $('body').on('click', '[data-event]', el => {
         try {
-            const event:GAEvent = JSON.parse(($(el.currentTarget).attr("data-event")!)) as GAEvent;
+            const event: GAEvent = JSON.parse(
+                $(el.currentTarget).attr('data-event')!
+            ) as GAEvent;
             trackEvent(event);
-        } catch (ex) {
-
-        }
+        } catch (ex) {}
     });
-
 }
 
-export function trackEvent(event:GAEvent){
-    getGAInstance()('send','event', event.category, event.action, event.label, event.fieldsObject);
+export function trackEvent(event: GAEvent) {
+    getGAInstance()(
+        'send',
+        'event',
+        event.category,
+        event.action,
+        event.label,
+        event.fieldsObject
+    );
 }
 
-export function serializeEvent(gaEvent:GAEvent){
-
+export function serializeEvent(gaEvent: GAEvent) {
     // when we send arrays of values as single event properties to google analytics
     // we want to send them as comma delimitted strings WITH trailing commas to allow us to filter in analytics
     // without risk of catching substring matches (e.g. tcga_brca, tcga_brca_2018)
     // this is annoying to do on one off basis, so this is a little helper transform
-    const arraysToString = _.mapValues(gaEvent, (val)=>{
+    const arraysToString = _.mapValues(gaEvent, val => {
         if (_.isArray(val)) {
-            return val.join(",") + "," // add trailing comma
+            return val.join(',') + ','; // add trailing comma
         } else {
             return val;
         }
@@ -52,105 +65,127 @@ export function serializeEvent(gaEvent:GAEvent){
     } catch (ex) {}
 }
 
-function sendToLoggly(){
+function sendToLoggly() {
     try {
-        if (window.location.hostname === "www.cbioportal.org") {
-            const LOGGLY_TOKEN = "b7a422a1-9878-49a2-8a30-2a8d5d33518f";
+        if (window.location.hostname === 'www.cbioportal.org') {
+            const LOGGLY_TOKEN = 'b7a422a1-9878-49a2-8a30-2a8d5d33518f';
 
             $.ajax({
-                       url: `//logs-01.loggly.com/inputs/${LOGGLY_TOKEN}.gif`,
-                       data: {
-                           location: window.location.href.replace(/#.*$/, ""),
-                           message: "PAGE_VIEW",
-                           e2e: isWebdriver() ? "true" : "false"
-                       }
-                   });
+                url: `//logs-01.loggly.com/inputs/${LOGGLY_TOKEN}.gif`,
+                data: {
+                    location: window.location.href.replace(/#.*$/, ''),
+                    message: 'PAGE_VIEW',
+                    e2e: isWebdriver() ? 'true' : 'false',
+                },
+            });
         }
     } catch (ex) {
         // do nothing
     }
 }
 
-export function embedGoogleAnalytics(ga_code:string){
-
+export function embedGoogleAnalytics(ga_code: string) {
     $(document).ready(function() {
-
-        $('<script async src="https://www.google-analytics.com/analytics.js"></script>').appendTo("body");
-        $('<script async src="https://cdnjs.cloudflare.com/ajax/libs/autotrack/2.4.1/autotrack.js"></script>').appendTo("body");
-        getBrowserWindow().ga=getBrowserWindow().ga||function(){(ga.q=ga.q||[]).push(arguments)};
-        const ga:UniversalAnalytics.ga = getBrowserWindow().ga;
-        ga.l=+new Date;
+        $(
+            '<script async src="https://www.google-analytics.com/analytics.js"></script>'
+        ).appendTo('body');
+        $(
+            '<script async src="https://cdnjs.cloudflare.com/ajax/libs/autotrack/2.4.1/autotrack.js"></script>'
+        ).appendTo('body');
+        getBrowserWindow().ga =
+            getBrowserWindow().ga ||
+            function() {
+                (ga.q = ga.q || []).push(arguments);
+            };
+        const ga: UniversalAnalytics.ga = getBrowserWindow().ga;
+        ga.l = +new Date();
         ga('create', ga_code, 'auto');
 
-
         ga('require', 'urlChangeTracker', {
-            hitFilter: function(model:any) {
+            hitFilter: function(model: any) {
                 sendToLoggly();
-            }
+            },
         });
 
         ga('require', 'cleanUrlTracker', {
-            stripQuery:true,
-            trailingSlash:'remove'
+            stripQuery: true,
+            trailingSlash: 'remove',
         });
         ga('send', 'pageview');
         sendToLoggly();
     });
 }
 
-export function sendSentryMessage(msg:string) {
-    log("sentry message", msg);
+export function sendSentryMessage(msg: string) {
+    log('sentry message', msg);
     if ((window as any).Sentry) {
         (window as any).Sentry.captureException(new Error(msg));
     }
 }
 
 export function getGAInstance(): UniversalAnalytics.ga {
+    const ga: UniversalAnalytics.ga = getBrowserWindow().ga;
 
-    const ga:UniversalAnalytics.ga = getBrowserWindow().ga;
-
-    return ga || function(){};
-
+    return ga || function() {};
 }
 
 let queryCount = 0;
 
 export enum GACustomFieldsEnum {
-  QueryCount = "metric1",
-  OQL = "dimension1",
-  StudyCount = "metric2",
-  Genes = "dimension2",
-  VirtualStudy = "dimension3",
-  StudyId = "dimension4",
-  GroupCount= "metric3"
-};
-
-
-export function trackQuery(cancerStudyIds:string[], oql:string, geneSymbols:string[], isVirtualStudy:boolean){
+    QueryCount = 'metric1',
+    OQL = 'dimension1',
+    StudyCount = 'metric2',
+    Genes = 'dimension2',
+    VirtualStudy = 'dimension3',
+    StudyId = 'dimension4',
+    GroupCount = 'metric3',
+}
 
+export function trackQuery(
+    cancerStudyIds: string[],
+    oql: string,
+    geneSymbols: string[],
+    isVirtualStudy: boolean
+) {
     const qCount = queryCount++;
 
-    getGAInstance()('send','event','resultsView','queryCount',qCount);
-
-    getGAInstance()('send', 'event', 'resultsView', 'query', cancerStudyIds.join(",")+",", {
-        [GACustomFieldsEnum.QueryCount]:qCount,
-        [GACustomFieldsEnum.OQL]:oql,
-        [GACustomFieldsEnum.StudyCount]:cancerStudyIds.length,
-        [GACustomFieldsEnum.Genes]:geneSymbols.join(",")+",",
-        [GACustomFieldsEnum.VirtualStudy]: isVirtualStudy.toString()
-    });
+    getGAInstance()('send', 'event', 'resultsView', 'queryCount', qCount);
+
+    getGAInstance()(
+        'send',
+        'event',
+        'resultsView',
+        'query',
+        cancerStudyIds.join(',') + ',',
+        {
+            [GACustomFieldsEnum.QueryCount]: qCount,
+            [GACustomFieldsEnum.OQL]: oql,
+            [GACustomFieldsEnum.StudyCount]: cancerStudyIds.length,
+            [GACustomFieldsEnum.Genes]: geneSymbols.join(',') + ',',
+            [GACustomFieldsEnum.VirtualStudy]: isVirtualStudy.toString(),
+        }
+    );
 }
 
 export function trackPatient(studyId: string): void {
-    trackEvent({category: "patientView", action: "patientViewed", label: studyId,})
+    trackEvent({
+        category: 'patientView',
+        action: 'patientViewed',
+        label: studyId,
+    });
 }
 
-
-export function trackStudyViewFilterEvent(label:string, store:StudyViewPageStore){
+export function trackStudyViewFilterEvent(
+    label: string,
+    store: StudyViewPageStore
+) {
     trackEvent({
-        category: "studyPage", action: "addFilter", label: label,
+        category: 'studyPage',
+        action: 'addFilter',
+        label: label,
         fieldsObject: {
-            [GACustomFieldsEnum.StudyId]: store.queriedPhysicalStudyIds.result.join(",") + ","
-        }
+            [GACustomFieldsEnum.StudyId]:
+                store.queriedPhysicalStudyIds.result.join(',') + ',',
+        },
     });
 }
diff --git a/src/shared/lib/validateParameters.spec.ts b/src/shared/lib/validateParameters.spec.ts
index f7e38a9a544..b52c709464b 100644
--- a/src/shared/lib/validateParameters.spec.ts
+++ b/src/shared/lib/validateParameters.spec.ts
@@ -4,35 +4,44 @@ import * as React from 'react';
 import * as _ from 'lodash';
 import * as $ from 'jquery';
 
-describe('validateParameters function',()=>{
-
-
-    it('recognizes valid and invalid url parameter combinations according to provided rules', ()=>{
+describe('validateParameters function', () => {
+    it('recognizes valid and invalid url parameter combinations according to provided rules', () => {
         assert.isTrue(
-            validateParameters({ studyId:'someString', sampleId:'someString' }, [ 'studyId', ['sampleId', 'caseId']]).isValid
+            validateParameters(
+                { studyId: 'someString', sampleId: 'someString' },
+                ['studyId', ['sampleId', 'caseId']]
+            ).isValid
         );
 
         assert.isTrue(
-            validateParameters({ studyId:'someString', caseId:'someString' }, [ 'studyId', ['sampleId', 'caseId']]).isValid
+            validateParameters(
+                { studyId: 'someString', caseId: 'someString' },
+                ['studyId', ['sampleId', 'caseId']]
+            ).isValid
         );
 
         assert.isFalse(
-            validateParameters({ studyId:'someString', sampleId:'' }, [ 'studyId', ['sampleId', 'caseId']]).isValid,
+            validateParameters({ studyId: 'someString', sampleId: '' }, [
+                'studyId',
+                ['sampleId', 'caseId'],
+            ]).isValid,
             'non zero length string required'
-        )
+        );
 
         assert.isFalse(
-            validateParameters({ studyId:'someString', sampleId:'' }, [ 'param1', ['sampleId', 'caseId']]).isValid,
+            validateParameters({ studyId: 'someString', sampleId: '' }, [
+                'param1',
+                ['sampleId', 'caseId'],
+            ]).isValid,
             'non zero length string required'
-        )
+        );
 
         assert.isFalse(
-            validateParameters({ sampleId:'' }, [ 'studyId', ['sampleId', 'caseId']]).isValid,
+            validateParameters({ sampleId: '' }, [
+                'studyId',
+                ['sampleId', 'caseId'],
+            ]).isValid,
             'missing parameter recognized'
-        )
+        );
     });
-
-
-
-
 });
diff --git a/src/shared/lib/validateParameters.ts b/src/shared/lib/validateParameters.ts
index a9f12152412..a97373fb7c5 100644
--- a/src/shared/lib/validateParameters.ts
+++ b/src/shared/lib/validateParameters.ts
@@ -2,28 +2,36 @@ import { validate, ParameterValidationError } from 'parameter-validator';
 import * as _ from 'lodash';
 
 export interface URLValidationResult {
-    isValid:Boolean;
-    message:string | null
+    isValid: Boolean;
+    message: string | null;
 }
 
-export function validateParametersPatientView(params: { [k:string]: string} ): URLValidationResult {
+export function validateParametersPatientView(params: {
+    [k: string]: string;
+}): URLValidationResult {
     return validateParameters(params, ['studyId', ['sampleId', 'caseId']]);
 }
 
-export default function validateParameters(params: { [k:string]: string }, rules:(string | string[])[]): URLValidationResult {
-
+export default function validateParameters(
+    params: { [k: string]: string },
+    rules: (string | string[])[]
+): URLValidationResult {
     // we want to interpret empty string as missing
-    let cleanedParams = _.reduce(params,(memo: { [k:string]: string }, paramVal, paramKey)=>{
-        if (paramVal && paramVal.length > 0) {
-            memo[paramKey] = paramVal;
-        }
-        return memo;
-    },{});
+    let cleanedParams = _.reduce(
+        params,
+        (memo: { [k: string]: string }, paramVal, paramKey) => {
+            if (paramVal && paramVal.length > 0) {
+                memo[paramKey] = paramVal;
+            }
+            return memo;
+        },
+        {}
+    );
 
     try {
-         validate(cleanedParams, rules);
-         return { isValid:true, message:null }
+        validate(cleanedParams, rules);
+        return { isValid: true, message: null };
     } catch (error) {
-        return { isValid:false, message: error.message }
+        return { isValid: false, message: error.message };
     }
 }
diff --git a/src/shared/lib/writeTest.ts b/src/shared/lib/writeTest.ts
index a942a8d46f1..ca81d19f7af 100644
--- a/src/shared/lib/writeTest.ts
+++ b/src/shared/lib/writeTest.ts
@@ -1,30 +1,38 @@
 import $ from 'jquery';
 
-export function writeTest(name:string, argJSON:string[], retJSON:string): void {
-
-    showTest(formatTest(name,argJSON,retJSON));
-
+export function writeTest(
+    name: string,
+    argJSON: string[],
+    retJSON: string
+): void {
+    showTest(formatTest(name, argJSON, retJSON));
 }
 
 // this is decorator for method
-export function testIt(obj:any, methodname:string, des:any) {
-   var old = des.value;
-   des.value = function(...args:any[]){
-       return (window as any)._handleTestReports(args,old,'fdsa,fdas',this, methodname);
-   }
+export function testIt(obj: any, methodname: string, des: any) {
+    var old = des.value;
+    des.value = function(...args: any[]) {
+        return (window as any)._handleTestReports(
+            args,
+            old,
+            'fdsa,fdas',
+            this,
+            methodname
+        );
+    };
 }
 
-function formatTest(functionName:string, argMap:string[], retJSON:string){
-
-return (
-`
+function formatTest(functionName: string, argMap: string[], retJSON: string) {
+    return `
 describe('${functionName}', ()=>{
 
     it('###should do something###',()=>{
         
-        ${argMap.reduce((s,a)=>s+=a+'\n\n','')}
+        ${argMap.reduce((s, a) => (s += a + '\n\n'), '')}
         
-        const ret = ${functionName}(${argMap.map((n,i)=>'arg'+i).join(', ')});
+        const ret = ${functionName}(${argMap
+        .map((n, i) => 'arg' + i)
+        .join(', ')});
         
         const expectedResult = ${retJSON};
         
@@ -34,21 +42,21 @@ describe('${functionName}', ()=>{
 
 });
 
-`)
+`;
 }
 
 function showTest(txt: string) {
-    $("<textarea/>").css(
-        {
-            position:'absolute',
-            left:200,
-            right:200,
-            top:100,
-            bottom:100,
-            zIndex:100
-        }
-    ).val(txt)
-        .appendTo("body")
+    $('<textarea/>')
+        .css({
+            position: 'absolute',
+            left: 200,
+            right: 200,
+            top: 100,
+            bottom: 100,
+            zIndex: 100,
+        })
+        .val(txt)
+        .appendTo('body');
 }
 
 // var old = extendSamplesWithCancerType;
diff --git a/src/shared/model/AlterationEnrichmentRow.ts b/src/shared/model/AlterationEnrichmentRow.ts
index b18684095d8..03f8cc8d855 100644
--- a/src/shared/model/AlterationEnrichmentRow.ts
+++ b/src/shared/model/AlterationEnrichmentRow.ts
@@ -1,4 +1,4 @@
-import { CountSummary } from "shared/api/generated/CBioPortalAPIInternal";
+import { CountSummary } from 'shared/api/generated/CBioPortalAPIInternal';
 
 export interface AlterationEnrichmentRow {
     checked: boolean;
@@ -9,7 +9,7 @@ export interface AlterationEnrichmentRow {
     logRatio?: number;
     pValue?: number;
     qValue?: number;
-    value?:number; // for copy number, used in group comparison
-    groupsSet:{[id:string]:CountSummary & {alteredPercentage:number}};
-    enrichedGroup?:string;
+    value?: number; // for copy number, used in group comparison
+    groupsSet: { [id: string]: CountSummary & { alteredPercentage: number } };
+    enrichedGroup?: string;
 }
diff --git a/src/shared/model/BookmarkLinks.ts b/src/shared/model/BookmarkLinks.ts
index 348de779b34..4b6d50bbef8 100644
--- a/src/shared/model/BookmarkLinks.ts
+++ b/src/shared/model/BookmarkLinks.ts
@@ -1,4 +1,4 @@
 export interface BookmarkLinks {
-  longUrl:string;
-  shortenedUrl:string|undefined;
-};
\ No newline at end of file
+    longUrl: string;
+    shortenedUrl: string | undefined;
+}
diff --git a/src/shared/model/CancerHotspots.ts b/src/shared/model/CancerHotspots.ts
index a4e24d99a1e..854d2e0a411 100644
--- a/src/shared/model/CancerHotspots.ts
+++ b/src/shared/model/CancerHotspots.ts
@@ -1,6 +1,6 @@
-import {IHotspotIndex} from "react-mutation-mapper";
+import { IHotspotIndex } from 'react-mutation-mapper';
 
 export interface IHotspotDataWrapper {
-    status: "pending" | "error" | "complete";
+    status: 'pending' | 'error' | 'complete';
     result?: IHotspotIndex;
 }
diff --git a/src/shared/model/Civic.ts b/src/shared/model/Civic.ts
index d237f969c22..9c42dd11598 100644
--- a/src/shared/model/Civic.ts
+++ b/src/shared/model/Civic.ts
@@ -3,8 +3,8 @@ export interface ICivicGeneData {
     name: string;
     description: string;
     url: string;
-    variants: {[variantName: string]: number};
-};
+    variants: { [variantName: string]: number };
+}
 
 export interface ICivicVariantData {
     id: number;
@@ -12,21 +12,25 @@ export interface ICivicVariantData {
     geneId: number;
     description: string;
     url: string;
-    evidence: {[evidenceType: string]: number};
-};
+    evidence: { [evidenceType: string]: number };
+}
 
-export interface ICivicGene {[name: string]: ICivicGeneData;};
+export interface ICivicGene {
+    [name: string]: ICivicGeneData;
+}
 
-export interface ICivicVariant {[geneName: string]: {[variantName: string]: ICivicVariantData};};
+export interface ICivicVariant {
+    [geneName: string]: { [variantName: string]: ICivicVariantData };
+}
 
 export interface ICivicEntry {
     name: string;
     description: string;
     url: string;
-    variants: {[name: string]: ICivicVariantData};
-};
+    variants: { [name: string]: ICivicVariantData };
+}
 
-export type MobXStatus = "pending" | "error" | "complete";
+export type MobXStatus = 'pending' | 'error' | 'complete';
 
 export interface ICivicGeneDataWrapper {
     status: MobXStatus;
@@ -36,4 +40,4 @@ export interface ICivicGeneDataWrapper {
 export interface ICivicVariantDataWrapper {
     status: MobXStatus;
     result?: ICivicVariant;
-}
\ No newline at end of file
+}
diff --git a/src/shared/model/ClinicalInformation.ts b/src/shared/model/ClinicalInformation.ts
index da90a4a7a89..681380adc26 100644
--- a/src/shared/model/ClinicalInformation.ts
+++ b/src/shared/model/ClinicalInformation.ts
@@ -1,11 +1,11 @@
-import {ClinicalData} from "shared/api/generated/CBioPortalAPI";
-import {ClinicalDataBySampleId} from "shared/api/api-types-extended";
+import { ClinicalData } from 'shared/api/generated/CBioPortalAPI';
+import { ClinicalDataBySampleId } from 'shared/api/api-types-extended';
 
 export type ClinicalInformationData = {
     patient?: {
-        id: string,
-        clinicalData: ClinicalData[]
-    },
-    samples?: ClinicalDataBySampleId[],
-    nodes?: any[]//PDXNode[],
+        id: string;
+        clinicalData: ClinicalData[];
+    };
+    samples?: ClinicalDataBySampleId[];
+    nodes?: any[]; //PDXNode[],
 };
diff --git a/src/shared/model/Cosmic.ts b/src/shared/model/Cosmic.ts
index 703fccec076..a024f6fe6e2 100644
--- a/src/shared/model/Cosmic.ts
+++ b/src/shared/model/Cosmic.ts
@@ -1,5 +1,5 @@
-import {CosmicMutation} from "shared/api/generated/CBioPortalAPIInternal";
+import { CosmicMutation } from 'shared/api/generated/CBioPortalAPIInternal';
 
 export interface ICosmicData {
-    [keyword:string]: CosmicMutation[];
+    [keyword: string]: CosmicMutation[];
 }
diff --git a/src/shared/model/ExpressionEnrichmentRow.ts b/src/shared/model/ExpressionEnrichmentRow.ts
index 51bd5d63bbb..d4e445a5a02 100644
--- a/src/shared/model/ExpressionEnrichmentRow.ts
+++ b/src/shared/model/ExpressionEnrichmentRow.ts
@@ -1,4 +1,4 @@
-import { GroupStatistics } from "shared/api/generated/CBioPortalAPIInternal";
+import { GroupStatistics } from 'shared/api/generated/CBioPortalAPIInternal';
 
 export interface ExpressionEnrichmentRow {
     checked: boolean;
@@ -9,6 +9,6 @@ export interface ExpressionEnrichmentRow {
     logRatio?: number;
     pValue: number;
     qValue: number;
-    groupsSet:{[id:string]:GroupStatistics};    
-    enrichedGroup:string;
+    groupsSet: { [id: string]: GroupStatistics };
+    enrichedGroup: string;
 }
diff --git a/src/shared/model/Gistic.ts b/src/shared/model/Gistic.ts
index 7b958154817..45d949d9c14 100644
--- a/src/shared/model/Gistic.ts
+++ b/src/shared/model/Gistic.ts
@@ -1,9 +1,9 @@
 export interface IGisticSummary {
     amp: boolean;
-    qValue:number;
-    peakGeneCount:number;
+    qValue: number;
+    peakGeneCount: number;
 }
 
 export interface IGisticData {
-    [entrezGeneId:string]: IGisticSummary[];
+    [entrezGeneId: string]: IGisticSummary[];
 }
diff --git a/src/shared/model/ITabConfiguration.ts b/src/shared/model/ITabConfiguration.ts
index acc70f578c6..5ba347d8966 100644
--- a/src/shared/model/ITabConfiguration.ts
+++ b/src/shared/model/ITabConfiguration.ts
@@ -1,18 +1,18 @@
-import {ResultsViewTab} from "../../pages/resultsView/ResultsViewPageHelpers";
+import { ResultsViewTab } from '../../pages/resultsView/ResultsViewPageHelpers';
 export interface ITabConfiguration {
-    id:ResultsViewTab;
-    getTab:()=>JSX.Element;
-    hide?:()=>boolean;
+    id: ResultsViewTab;
+    getTab: () => JSX.Element;
+    hide?: () => boolean;
 }
 
 export interface ICustomTabConfiguration {
-    title: string,
-    location: string,
-    mountCallbackName: string,
-    pathsToJs:string[],
-    pathsToCSS:string[],
-    showWithMultipleStudies: boolean,
-    customParameters: {[key:string]:any},
-    unmountOnHide:boolean,
-    dependencyPromise?: Promise<any>
-}
\ No newline at end of file
+    title: string;
+    location: string;
+    mountCallbackName: string;
+    pathsToJs: string[];
+    pathsToCSS: string[];
+    showWithMultipleStudies: boolean;
+    customParameters: { [key: string]: any };
+    unmountOnHide: boolean;
+    dependencyPromise?: Promise<any>;
+}
diff --git a/src/shared/model/ITooltipModel.ts b/src/shared/model/ITooltipModel.ts
index a5db69d05f8..c6e0a228cb0 100644
--- a/src/shared/model/ITooltipModel.ts
+++ b/src/shared/model/ITooltipModel.ts
@@ -1,5 +1,5 @@
 export interface ITooltipModel<T> {
-    x:number,
-    y:number,
-    data:T
-}
\ No newline at end of file
+    x: number;
+    y: number;
+    data: T;
+}
diff --git a/src/shared/model/MatchMiner.ts b/src/shared/model/MatchMiner.ts
index 3f173cae54e..3510adf742b 100644
--- a/src/shared/model/MatchMiner.ts
+++ b/src/shared/model/MatchMiner.ts
@@ -2,7 +2,7 @@ enum MatchType {
     MUTATION = 'MUTATION',
     CNA = 'CNA',
     MSI = 'MSI',
-    WILDTYPE = 'WILDTYPE'
+    WILDTYPE = 'WILDTYPE',
 }
 
 export interface ITrial {
@@ -82,19 +82,19 @@ export interface IPatientGenomic {
 export interface IClinicalGroupMatch {
     trialAgeNumerical: string[];
     trialOncotreePrimaryDiagnosis: {
-        positive: string[], // trialOncotreePrimaryDiagnosis not includes '!'
-        negative: string[] // trialOncotreePrimaryDiagnosis includes '!'
+        positive: string[]; // trialOncotreePrimaryDiagnosis not includes '!'
+        negative: string[]; // trialOncotreePrimaryDiagnosis includes '!'
     };
     matches?: IGenomicMatchType;
     notMatches?: IGenomicMatchType;
 }
 
 export interface IGenomicMatchType {
-    MUTATION: IGenomicGroupMatch[],
-    CNA: IGenomicGroupMatch[],
-    MSI: IGenomicGroupMatch[],
-    WILDTYPE: IGenomicGroupMatch[],
-    [key: string]: IGenomicGroupMatch[]
+    MUTATION: IGenomicGroupMatch[];
+    CNA: IGenomicGroupMatch[];
+    MSI: IGenomicGroupMatch[];
+    WILDTYPE: IGenomicGroupMatch[];
+    [key: string]: IGenomicGroupMatch[];
 }
 
 export interface IGenomicGroupMatch {
diff --git a/src/shared/model/MutSig.ts b/src/shared/model/MutSig.ts
index 38129e2795e..b14d6e7bd18 100644
--- a/src/shared/model/MutSig.ts
+++ b/src/shared/model/MutSig.ts
@@ -1,3 +1,3 @@
 export interface IMutSigData {
-    [entrezGeneId:string]:{ qValue:number }
+    [entrezGeneId: string]: { qValue: number };
 }
diff --git a/src/shared/model/MutationalSignature.ts b/src/shared/model/MutationalSignature.ts
index 6fb821ac442..6d212575949 100644
--- a/src/shared/model/MutationalSignature.ts
+++ b/src/shared/model/MutationalSignature.ts
@@ -10,16 +10,16 @@ export interface IMutationalSignature {
     numberOfMutationsForSample: number;
 }
 
-export interface IMutationalSignatureMeta{
+export interface IMutationalSignatureMeta {
     mutationalSignatureId: string;
     description: string;
     confidenceStatement: string;
 }
 
-export interface ISignificantMutationalSignaturesForSample{
+export interface ISignificantMutationalSignaturesForSample {
     numberOfMutationsForSample: number;
     confidenceStatement: string;
     significantSignatures: {
-        [mutationalSignatureId: string]: number
-    }
+        [mutationalSignatureId: string]: number;
+    };
 }
diff --git a/src/shared/model/MutualExclusivity.ts b/src/shared/model/MutualExclusivity.ts
index 503f3792ce4..f114fc2ff02 100644
--- a/src/shared/model/MutualExclusivity.ts
+++ b/src/shared/model/MutualExclusivity.ts
@@ -7,6 +7,6 @@ export interface MutualExclusivity {
     bothCount: number;
     logOddsRatio: number;
     pValue: number;
-    qValue: number,
+    qValue: number;
     association: string;
-}
\ No newline at end of file
+}
diff --git a/src/shared/model/MyCancerGenome.ts b/src/shared/model/MyCancerGenome.ts
index 6432e5f61ea..69d8fab6221 100644
--- a/src/shared/model/MyCancerGenome.ts
+++ b/src/shared/model/MyCancerGenome.ts
@@ -6,5 +6,5 @@ export interface IMyCancerGenome {
 }
 
 export interface IMyCancerGenomeData {
-    [hugoSymbol:string]: IMyCancerGenome[];
+    [hugoSymbol: string]: IMyCancerGenome[];
 }
diff --git a/src/shared/model/OncoKB.ts b/src/shared/model/OncoKB.ts
index 25c829e5a1b..9c53fd6e46b 100644
--- a/src/shared/model/OncoKB.ts
+++ b/src/shared/model/OncoKB.ts
@@ -1,4 +1,4 @@
-import {CancerGene, IndicatorQueryResp} from "cbioportal-frontend-commons";
+import { CancerGene, IndicatorQueryResp } from 'cbioportal-frontend-commons';
 
 export interface IEvidence {
     id: string;
@@ -19,22 +19,22 @@ export interface IEvidence {
         sensitivity: {
             current: any[];
             inOtherTumor: any[];
-        },
+        };
         resistance: any[];
     };
 }
 
 export interface IOncoKbData {
-    indicatorMap: {[id:string]: IndicatorQueryResp} | null;
-    uniqueSampleKeyToTumorType: {[sampleId:string]: string} | null;
+    indicatorMap: { [id: string]: IndicatorQueryResp } | null;
+    uniqueSampleKeyToTumorType: { [sampleId: string]: string } | null;
 }
 
 export interface IOncoKbDataWrapper {
-    status: "pending" | "error" | "complete";
-    result?: IOncoKbData|Error;
+    status: 'pending' | 'error' | 'complete';
+    result?: IOncoKbData | Error;
 }
 
 export interface IOncoKbCancerGenesWrapper {
-    status: "pending" | "error" | "complete";
+    status: 'pending' | 'error' | 'complete';
     result?: CancerGene[] | Error;
 }
diff --git a/src/shared/model/PatientSurvival.ts b/src/shared/model/PatientSurvival.ts
index 90c403552f3..988c747ae9b 100644
--- a/src/shared/model/PatientSurvival.ts
+++ b/src/shared/model/PatientSurvival.ts
@@ -1,7 +1,7 @@
 export interface PatientSurvival {
     patientId: string;
     studyId: string;
-    uniquePatientKey:string;
+    uniquePatientKey: string;
     months: number;
     status: boolean;
 }
diff --git a/src/shared/model/Pdb.ts b/src/shared/model/Pdb.ts
index ff831d09d52..9080d8b49a8 100644
--- a/src/shared/model/Pdb.ts
+++ b/src/shared/model/Pdb.ts
@@ -1,4 +1,4 @@
-import {Alignment} from "cbioportal-frontend-commons";
+import { Alignment } from 'cbioportal-frontend-commons';
 
 export interface IPdbPosition {
     position: number;
@@ -12,8 +12,8 @@ export interface IPdbPositionRange {
 
 export type PdbAlignmentIndex = {
     [pdbId: string]: {
-        [chainId: string]: Alignment[]
-    }
+        [chainId: string]: Alignment[];
+    };
 };
 
 export interface IPdbChain {
@@ -26,7 +26,7 @@ export interface IPdbChain {
     identity: number;
 }
 
-export const ALIGNMENT_GAP = "*";
-export const ALIGNMENT_PLUS = "+";
-export const ALIGNMENT_MINUS = "-";
-export const ALIGNMENT_SPACE = " ";
+export const ALIGNMENT_GAP = '*';
+export const ALIGNMENT_PLUS = '+';
+export const ALIGNMENT_MINUS = '-';
+export const ALIGNMENT_SPACE = ' ';
diff --git a/src/shared/model/PubMedRecord.ts b/src/shared/model/PubMedRecord.ts
index 41a49c58155..5e71edb4c5c 100644
--- a/src/shared/model/PubMedRecord.ts
+++ b/src/shared/model/PubMedRecord.ts
@@ -1,45 +1,50 @@
 export type PubMedRecord = {
-    uid: string,
-    pubdate: string,
-    epubdate: string,
-    source: string,
-    authors: { name: string, authtype: string, clusterid: string}[],
-    lastauthor: string,
-    title: string,
-    sorttitle: string,
-    volume: string,
-    issue: string,
-    pages: string,
-    lang: string[],
-    nlmuniqueid: string,
-    issn: string,
-    essn: string,
-    pubtype: string,
-    recordstatus: string,
-    pubstatus:string,
-    articleids: { idtype: string, idtypen: number, value: string}[],
-    history: { pubstatus:string, date:string }[],
-    references: { refsource: string, reftype: string, pmid: number, note: string }[],
-    attributes: string[],
-    pmcrefcount: number,
-    fulljournalname: string,
-    elocationid: string,
-    doctype: string,
-    srccontriblist:any[],
-    booktitle: string,
-    medium: string,
-    edition: string,
-    publisherlocation: string,
-    publishername: string,
-    srcdate: string,
-    reportnumber: string,
-    availablefromurl:string,
-    locationlabel: string,
-    doccontriblist:any[],
-    docdate: string,
-    bookname: string,
-    chapter: string,
-    sortpubdate: string,
-    sortfirstauthor: string,
-    vernaculartitle:string
-};
\ No newline at end of file
+    uid: string;
+    pubdate: string;
+    epubdate: string;
+    source: string;
+    authors: { name: string; authtype: string; clusterid: string }[];
+    lastauthor: string;
+    title: string;
+    sorttitle: string;
+    volume: string;
+    issue: string;
+    pages: string;
+    lang: string[];
+    nlmuniqueid: string;
+    issn: string;
+    essn: string;
+    pubtype: string;
+    recordstatus: string;
+    pubstatus: string;
+    articleids: { idtype: string; idtypen: number; value: string }[];
+    history: { pubstatus: string; date: string }[];
+    references: {
+        refsource: string;
+        reftype: string;
+        pmid: number;
+        note: string;
+    }[];
+    attributes: string[];
+    pmcrefcount: number;
+    fulljournalname: string;
+    elocationid: string;
+    doctype: string;
+    srccontriblist: any[];
+    booktitle: string;
+    medium: string;
+    edition: string;
+    publisherlocation: string;
+    publishername: string;
+    srcdate: string;
+    reportnumber: string;
+    availablefromurl: string;
+    locationlabel: string;
+    doccontriblist: any[];
+    docdate: string;
+    bookname: string;
+    chapter: string;
+    sortpubdate: string;
+    sortfirstauthor: string;
+    vernaculartitle: string;
+};
diff --git a/src/shared/model/VirtualStudy.ts b/src/shared/model/VirtualStudy.ts
index 4f4e32e53dd..81b64c5852f 100644
--- a/src/shared/model/VirtualStudy.ts
+++ b/src/shared/model/VirtualStudy.ts
@@ -1,14 +1,14 @@
-import {StudyViewFilter} from "../api/generated/CBioPortalAPIInternal";
+import { StudyViewFilter } from '../api/generated/CBioPortalAPIInternal';
 
 export interface VirtualStudyData {
     name: string;
     description: string;
-    studies:{ id:string, samples: string[] }[];
+    studies: { id: string; samples: string[] }[];
     origin: string[];
-    studyViewFilter:StudyViewFilter;
-};
+    studyViewFilter: StudyViewFilter;
+}
 
 export interface VirtualStudy {
     id: string;
     data: VirtualStudyData;
-};
\ No newline at end of file
+}
diff --git a/src/shared/polyfill/canvasToBlob.js b/src/shared/polyfill/canvasToBlob.js
index bc25a9e9164..9de91a4afa0 100644
--- a/src/shared/polyfill/canvasToBlob.js
+++ b/src/shared/polyfill/canvasToBlob.js
@@ -1,20 +1,20 @@
 if (!HTMLCanvasElement.prototype.toBlob) {
     Object.defineProperty(HTMLCanvasElement.prototype, 'toBlob', {
-        value: function (callback, type, quality) {
+        value: function(callback, type, quality) {
             var canvas = this;
             setTimeout(function() {
-
-                var binStr = atob( canvas.toDataURL(type, quality).split(',')[1] ),
+                var binStr = atob(
+                        canvas.toDataURL(type, quality).split(',')[1]
+                    ),
                     len = binStr.length,
                     arr = new Uint8Array(len);
 
-                for (var i = 0; i < len; i++ ) {
+                for (var i = 0; i < len; i++) {
                     arr[i] = binStr.charCodeAt(i);
                 }
 
-                callback( new Blob( [arr], {type: type || 'image/png'} ) );
-
+                callback(new Blob([arr], { type: type || 'image/png' }));
             });
-        }
+        },
     });
-}
\ No newline at end of file
+}
diff --git a/src/shared/theme/cBioPoralTheme.ts b/src/shared/theme/cBioPoralTheme.ts
index 72c0405b7b9..bc307e6c3d5 100644
--- a/src/shared/theme/cBioPoralTheme.ts
+++ b/src/shared/theme/cBioPoralTheme.ts
@@ -1,31 +1,31 @@
-import { assign } from "lodash";
+import { assign } from 'lodash';
 
 // *
 // * Colors
 // *
-const yellow200 = "#FFF59D";
-const deepOrange600 = "#F4511E";
-const lime300 = "#DCE775";
-const lightGreen500 = "#8BC34A";
-const teal700 = "#00796B";
-const cyan900 = "#006064";
+const yellow200 = '#FFF59D';
+const deepOrange600 = '#F4511E';
+const lime300 = '#DCE775';
+const lightGreen500 = '#8BC34A';
+const teal700 = '#00796B';
+const cyan900 = '#006064';
 const colors = [
     deepOrange600,
     yellow200,
     lime300,
     lightGreen500,
     teal700,
-    cyan900
+    cyan900,
 ];
-const blueGrey50 = "#ECEFF1";
-const blueGrey300 = "#90A4AE";
-const blueGrey700 = "#455A64";
-const grey900 = "#212121";
+const blueGrey50 = '#ECEFF1';
+const blueGrey300 = '#90A4AE';
+const blueGrey700 = '#455A64';
+const grey900 = '#212121';
 // *
 // * Typography
 // *
-const sansSerif = "Arial, Helvetica";
-const letterSpacing = "normal";
+const sansSerif = 'Arial, Helvetica';
+const letterSpacing = 'normal';
 const fontSize = 13;
 // *
 // * Layout
@@ -35,7 +35,7 @@ const baseProps = {
     fontFamily: sansSerif,
     width: 350,
     height: 350,
-    padding: 50
+    padding: 50,
 };
 // *
 // * Labels
@@ -45,198 +45,241 @@ export const baseLabelStyles = {
     fontSize,
     letterSpacing,
     padding,
-    stroke: "transparent",
-    strokeWidth: 0
+    stroke: 'transparent',
+    strokeWidth: 0,
 };
 
+const centeredLabelStyles = assign({ textAnchor: 'middle' }, baseLabelStyles);
 
-
-const centeredLabelStyles = assign({ textAnchor: "middle" }, baseLabelStyles);
-
-export const axisLabelStyles = assign({}, baseLabelStyles, { fontSize:13, padding })
+export const axisLabelStyles = assign({}, baseLabelStyles, {
+    fontSize: 13,
+    padding,
+});
 export const axisTickLabelStyles = assign({}, baseLabelStyles, {
-    fill: "black",
-    padding:2
+    fill: 'black',
+    padding: 2,
 });
 
 // *
 // * Strokes
 // *
-const strokeDasharray = "10, 5";
-const strokeLinecap = "round";
-const strokeLinejoin = "round";
+const strokeDasharray = '10, 5';
+const strokeLinecap = 'round';
+const strokeLinejoin = 'round';
 
 const CBIOPORTAL_VICTORY_THEME = {
-    area: assign({
-        style: {
-            data: {
-                fill: grey900
+    area: assign(
+        {
+            style: {
+                data: {
+                    fill: grey900,
+                },
+                labels: centeredLabelStyles,
             },
-            labels: centeredLabelStyles
-        }
-    }, baseProps),
-    axis: assign({
-        style: {
-            axis: {
-                fill: "transparent",
-                stroke: "black",
-                strokeWidth: 1,
-                strokeLinecap,
-                strokeLinejoin
-            },
-            axisLabel: assign({}, centeredLabelStyles, axisLabelStyles),
-            grid: {
-                fill: "none",
-                stroke: blueGrey50,
-                strokeOpacity: (t:number)=>(t === 0 ? 0 : 1),
-                strokeDasharray,
-                strokeLinecap,
-                strokeLinejoin,
-                pointerEvents: "visible"
+        },
+        baseProps
+    ),
+    axis: assign(
+        {
+            style: {
+                axis: {
+                    fill: 'transparent',
+                    stroke: 'black',
+                    strokeWidth: 1,
+                    strokeLinecap,
+                    strokeLinejoin,
+                },
+                axisLabel: assign({}, centeredLabelStyles, axisLabelStyles),
+                grid: {
+                    fill: 'none',
+                    stroke: blueGrey50,
+                    strokeOpacity: (t: number) => (t === 0 ? 0 : 1),
+                    strokeDasharray,
+                    strokeLinecap,
+                    strokeLinejoin,
+                    pointerEvents: 'visible',
+                },
+                ticks: {
+                    fill: 'transparent',
+                    size: 4,
+                    stroke: 'black',
+                    strokeWidth: 1,
+                    strokeLinecap,
+                    strokeLinejoin,
+                },
+                tickLabels: axisTickLabelStyles,
             },
-            ticks: {
-                fill: "transparent",
-                size: 4,
-                stroke: "black",
-                strokeWidth: 1,
-                strokeLinecap,
-                strokeLinejoin
+        },
+        baseProps
+    ),
+    bar: assign(
+        {
+            style: {
+                data: {
+                    fill: blueGrey700,
+                    padding,
+                    strokeWidth: 0,
+                },
+                labels: baseLabelStyles,
             },
-            tickLabels: axisTickLabelStyles
-        }
-    }, baseProps),
-    bar: assign({
-        style: {
-            data: {
-                fill: blueGrey700,
-                padding,
-                strokeWidth: 0
+        },
+        baseProps
+    ),
+    boxplot: assign(
+        {
+            style: {
+                max: { padding, stroke: blueGrey700, strokeWidth: 1 },
+                maxLabels: baseLabelStyles,
+                median: { padding, stroke: blueGrey700, strokeWidth: 1 },
+                medianLabels: baseLabelStyles,
+                min: { padding, stroke: blueGrey700, strokeWidth: 1 },
+                minLabels: baseLabelStyles,
+                q1: { padding, fill: blueGrey700 },
+                q1Labels: baseLabelStyles,
+                q3: { padding, fill: blueGrey700 },
+                q3Labels: baseLabelStyles,
             },
-            labels: baseLabelStyles
-        }
-    }, baseProps),
-    boxplot: assign({
-        style: {
-            max: { padding, stroke: blueGrey700, strokeWidth: 1 },
-            maxLabels: baseLabelStyles,
-            median: { padding, stroke: blueGrey700, strokeWidth: 1 },
-            medianLabels: baseLabelStyles,
-            min: { padding, stroke: blueGrey700, strokeWidth: 1 },
-            minLabels: baseLabelStyles,
-            q1: { padding, fill: blueGrey700 },
-            q1Labels: baseLabelStyles,
-            q3: { padding, fill: blueGrey700 },
-            q3Labels: baseLabelStyles
+            boxWidth: 20,
         },
-        boxWidth: 20
-    }, baseProps),
-    candlestick: assign({
-        style: {
-            data: {
-                stroke: blueGrey700
+        baseProps
+    ),
+    candlestick: assign(
+        {
+            style: {
+                data: {
+                    stroke: blueGrey700,
+                },
+                labels: centeredLabelStyles,
+            },
+            candleColors: {
+                positive: '#ffffff',
+                negative: blueGrey700,
             },
-            labels: centeredLabelStyles
         },
-        candleColors: {
-            positive: "#ffffff",
-            negative: blueGrey700
-        }
-    }, baseProps),
+        baseProps
+    ),
     chart: baseProps,
-    errorbar: assign({
-        borderWidth: 8,
-        style: {
-            data: {
-                fill: "transparent",
-                opacity: 1,
-                stroke: blueGrey700,
-                strokeWidth: 2
+    errorbar: assign(
+        {
+            borderWidth: 8,
+            style: {
+                data: {
+                    fill: 'transparent',
+                    opacity: 1,
+                    stroke: blueGrey700,
+                    strokeWidth: 2,
+                },
+                labels: centeredLabelStyles,
             },
-            labels: centeredLabelStyles
-        }
-    }, baseProps),
-    group: assign({
-        colorScale: colors
-    }, baseProps),
-    line: assign({
-        style: {
-            data: {
-                fill: "transparent",
-                opacity: 1,
-                stroke: blueGrey700,
-                strokeWidth: 2
+        },
+        baseProps
+    ),
+    group: assign(
+        {
+            colorScale: colors,
+        },
+        baseProps
+    ),
+    line: assign(
+        {
+            style: {
+                data: {
+                    fill: 'transparent',
+                    opacity: 1,
+                    stroke: blueGrey700,
+                    strokeWidth: 2,
+                },
+                labels: centeredLabelStyles,
             },
-            labels: centeredLabelStyles
-        }
-    }, baseProps),
-    pie: assign({
-        colorScale: colors,
-        style: {
-            data: {
-                padding,
-                stroke: blueGrey50,
-                strokeWidth: 1
+        },
+        baseProps
+    ),
+    pie: assign(
+        {
+            colorScale: colors,
+            style: {
+                data: {
+                    padding,
+                    stroke: blueGrey50,
+                    strokeWidth: 1,
+                },
+                labels: assign({}, baseLabelStyles, { padding: 20 }),
             },
-            labels: assign({}, baseLabelStyles, { padding: 20 })
-        }
-    }, baseProps),
-    scatter: assign({
-        style: {
-            data: {
-                fill: blueGrey700,
-                opacity: 1,
-                stroke: "transparent",
-                strokeWidth: 0
+        },
+        baseProps
+    ),
+    scatter: assign(
+        {
+            style: {
+                data: {
+                    fill: blueGrey700,
+                    opacity: 1,
+                    stroke: 'transparent',
+                    strokeWidth: 0,
+                },
+                labels: centeredLabelStyles,
             },
-            labels: centeredLabelStyles
-        }
-    }, baseProps),
-    stack: assign({
-        colorScale: colors
-    }, baseProps),
+        },
+        baseProps
+    ),
+    stack: assign(
+        {
+            colorScale: colors,
+        },
+        baseProps
+    ),
     tooltip: {
-        style: assign({}, centeredLabelStyles, { padding: 5, pointerEvents: "none" }),
+        style: assign({}, centeredLabelStyles, {
+            padding: 5,
+            pointerEvents: 'none',
+        }),
         flyoutStyle: {
             stroke: grey900,
             strokeWidth: 1,
-            fill: "#f0f0f0",
-            pointerEvents: "none"
+            fill: '#f0f0f0',
+            pointerEvents: 'none',
         },
         cornerRadius: 5,
-        pointerLength: 10
+        pointerLength: 10,
     },
-    voronoi: assign({
-        style: {
-            data: {
-                fill: "transparent",
-                stroke: "transparent",
-                strokeWidth: 0
+    voronoi: assign(
+        {
+            style: {
+                data: {
+                    fill: 'transparent',
+                    stroke: 'transparent',
+                    strokeWidth: 0,
+                },
+                labels: assign({}, centeredLabelStyles, {
+                    padding: 5,
+                    pointerEvents: 'none',
+                }),
+                flyout: {
+                    stroke: grey900,
+                    strokeWidth: 1,
+                    fill: '#f0f0f0',
+                    pointerEvents: 'none',
+                },
             },
-            labels: assign({}, centeredLabelStyles, { padding: 5, pointerEvents: "none" }),
-            flyout: {
-                stroke: grey900,
-                strokeWidth: 1,
-                fill: "#f0f0f0",
-                pointerEvents: "none"
-            }
-        }
-    }, baseProps),
+        },
+        baseProps
+    ),
     legend: {
         colorScale: colors,
         gutter: 10,
-        orientation: "vertical",
-        titleOrientation: "top",
+        orientation: 'vertical',
+        titleOrientation: 'top',
         style: {
             data: {
-                type: "circle",
-                size:3,
-                strokeWidth:1,
-                stroke:"black"
+                type: 'circle',
+                size: 3,
+                strokeWidth: 1,
+                stroke: 'black',
             },
             labels: baseLabelStyles,
-            title: assign({}, baseLabelStyles, { padding: 5 })
-        }
-    }
+            title: assign({}, baseLabelStyles, { padding: 5 }),
+        },
+    },
 };
 
 export default CBIOPORTAL_VICTORY_THEME;
diff --git a/src/test/CivicMockUtils.ts b/src/test/CivicMockUtils.ts
index fbf833fb707..fd455a0fdea 100644
--- a/src/test/CivicMockUtils.ts
+++ b/src/test/CivicMockUtils.ts
@@ -1,131 +1,224 @@
-import { ICivicGene, ICivicVariant, ICivicEntry, ICivicVariantData } from "shared/model/Civic";
-import {DiscreteCopyNumberData, Mutation} from "shared/api/generated/CBioPortalAPI";
+import {
+    ICivicGene,
+    ICivicVariant,
+    ICivicEntry,
+    ICivicVariantData,
+} from 'shared/model/Civic';
+import {
+    DiscreteCopyNumberData,
+    Mutation,
+} from 'shared/api/generated/CBioPortalAPI';
 import * as _ from 'lodash';
 
-export function getCivicVariantData(): ICivicVariantData
-{
+export function getCivicVariantData(): ICivicVariantData {
     return {
         id: 0,
         name: 'variantdata',
         geneId: 124,
         description: 'descr',
         url: 'http://',
-        evidence: {'type1' : 1}
+        evidence: { type1: 1 },
     };
 }
 
-export function getCivicGenes(): ICivicGene
-{
+export function getCivicGenes(): ICivicGene {
     return {
-        "PIK3CA": {
-                id: 37,
-                name: "PIK3CA",
-                description: "PIK3CA is the most recurrently mutated gene in breast cancer, and has been found to important in a number of cancer types. An integral part of the PI3K pathway, PIK3CA has long been described as an oncogene, with two main hotspots for activating mutations, the 542/545 region of the helical domain, and the 1047 region of the kinase domain. PIK3CA, and its interaction with the AKT and mTOR pathways, is the subject of an immense amount of research and development, and PI3K inhibition has seen some limited success in recent clinical trials. While monotherapies seem to be limited in their potential, there is a recent interest in pursuing PI3K inhibition as part of a combination therapy regiment with inhibition partners including TKI's, MEK inhibitors, PARP inhibitors, and in breast cancer, aromatase inhibitors.",
-                url: "https://civicdb.org/#/events/genes/37/summary",
-                variants: {"AMPLIFICATION": 212, "C420R": 931, "E542K": 103, "E542Q": 933, "E545A": 882, "E545D": 934, "E545G": 883, "E545K": 104, "E545Q": 881,
-                          "E545V": 884, "EXON 10 MUTATION": 106, "EXON 21 MUTATION": 105, "G1049R": 940, "G1049S": 939, "H1047L": 1151, "H1047R": 107, "H1047Y": 938,
-                          "I391M": 1235, "K111N": 1234, "M1043I": 937, "MUTATION": 311, "P471L": 294, "Q546E": 886, "Q546K": 885, "Y1021C": 935}
-                },
-        "RAF1": {
-                id: 4767,
-                name: "RAF1",
-                description: "",
-                url: "https://civicdb.org/#/events/genes/4767/summary",
-                variants: {"AMPLIFICATION": 591}
-                }
+        PIK3CA: {
+            id: 37,
+            name: 'PIK3CA',
+            description:
+                "PIK3CA is the most recurrently mutated gene in breast cancer, and has been found to important in a number of cancer types. An integral part of the PI3K pathway, PIK3CA has long been described as an oncogene, with two main hotspots for activating mutations, the 542/545 region of the helical domain, and the 1047 region of the kinase domain. PIK3CA, and its interaction with the AKT and mTOR pathways, is the subject of an immense amount of research and development, and PI3K inhibition has seen some limited success in recent clinical trials. While monotherapies seem to be limited in their potential, there is a recent interest in pursuing PI3K inhibition as part of a combination therapy regiment with inhibition partners including TKI's, MEK inhibitors, PARP inhibitors, and in breast cancer, aromatase inhibitors.",
+            url: 'https://civicdb.org/#/events/genes/37/summary',
+            variants: {
+                AMPLIFICATION: 212,
+                C420R: 931,
+                E542K: 103,
+                E542Q: 933,
+                E545A: 882,
+                E545D: 934,
+                E545G: 883,
+                E545K: 104,
+                E545Q: 881,
+                E545V: 884,
+                'EXON 10 MUTATION': 106,
+                'EXON 21 MUTATION': 105,
+                G1049R: 940,
+                G1049S: 939,
+                H1047L: 1151,
+                H1047R: 107,
+                H1047Y: 938,
+                I391M: 1235,
+                K111N: 1234,
+                M1043I: 937,
+                MUTATION: 311,
+                P471L: 294,
+                Q546E: 886,
+                Q546K: 885,
+                Y1021C: 935,
+            },
+        },
+        RAF1: {
+            id: 4767,
+            name: 'RAF1',
+            description: '',
+            url: 'https://civicdb.org/#/events/genes/4767/summary',
+            variants: { AMPLIFICATION: 591 },
+        },
     };
 }
 
-export function getCnaCivicVariants(): ICivicVariant
-{
+export function getCnaCivicVariants(): ICivicVariant {
     return {
-        "RAF1": {"AMPLIFICATION": {
-                                   id: 591,
-                                   name: "AMPLIFICATION",
-                                   geneId: 4767,
-                                   description: "",
-                                   url: "https://civicdb.org/#/events/genes/4767/summary/variants/591/summary#variant",
-                                   evidence: {"Predictive": 1}
-                                   }
-                }
+        RAF1: {
+            AMPLIFICATION: {
+                id: 591,
+                name: 'AMPLIFICATION',
+                geneId: 4767,
+                description: '',
+                url:
+                    'https://civicdb.org/#/events/genes/4767/summary/variants/591/summary#variant',
+                evidence: { Predictive: 1 },
+            },
+        },
     };
 }
 
-export function getCnaCivicEmptyVariants(): ICivicVariant
-{
+export function getCnaCivicEmptyVariants(): ICivicVariant {
     return {};
 }
 
-export function getMutationCivicVariants(): ICivicVariant
-{
+export function getMutationCivicVariants(): ICivicVariant {
     return {
-        "PIK3CA": { "E545K": {
-                             id: 104,
-                             name: "E545K",
-                             geneId: 37,
-                             description: "PIK3CA E545K/E542K are the second most recurrent PIK3CA mutations in breast cancer, and are highly recurrent mutations in many other cancer types. E545K, and possibly the other mutations in the E545 region, may present patients with a poorer prognosis than patients with either patients with other PIK3CA variant or wild-type PIK3CA. There is also data to suggest that E545/542 mutations may confer resistance to EGFR inhibitors like cetuximab. While very prevalent, targeted therapies for variants in PIK3CA are still in early clinical trial phases.",
-                             url: "https://civicdb.org/#/events/genes/37/summary/variants/104/summary#variant",
-                             evidence: {"Prognostic": 1, "Predictive": 14}
-                             }
-                },
+        PIK3CA: {
+            E545K: {
+                id: 104,
+                name: 'E545K',
+                geneId: 37,
+                description:
+                    'PIK3CA E545K/E542K are the second most recurrent PIK3CA mutations in breast cancer, and are highly recurrent mutations in many other cancer types. E545K, and possibly the other mutations in the E545 region, may present patients with a poorer prognosis than patients with either patients with other PIK3CA variant or wild-type PIK3CA. There is also data to suggest that E545/542 mutations may confer resistance to EGFR inhibitors like cetuximab. While very prevalent, targeted therapies for variants in PIK3CA are still in early clinical trial phases.',
+                url:
+                    'https://civicdb.org/#/events/genes/37/summary/variants/104/summary#variant',
+                evidence: { Prognostic: 1, Predictive: 14 },
+            },
+        },
     };
 }
 
-export function getCnaData(): Array<DiscreteCopyNumberData>
-{
-    return [{alteration: 2, entrezGeneId: 5894, gene: {geneticEntityId: 4721, entrezGeneId: 5894, hugoGeneSymbol: "RAF1",
-           type: "protein-coding"}, molecularProfileId: "ccle_gistic", sampleId: "NCIH508_LARGE_INTESTINE", patientId:"PATIENT1", studyId: "STUDY1",
-           uniquePatientKey: "", uniqueSampleKey: ""}];
+export function getCnaData(): Array<DiscreteCopyNumberData> {
+    return [
+        {
+            alteration: 2,
+            entrezGeneId: 5894,
+            gene: {
+                geneticEntityId: 4721,
+                entrezGeneId: 5894,
+                hugoGeneSymbol: 'RAF1',
+                type: 'protein-coding',
+            },
+            molecularProfileId: 'ccle_gistic',
+            sampleId: 'NCIH508_LARGE_INTESTINE',
+            patientId: 'PATIENT1',
+            studyId: 'STUDY1',
+            uniquePatientKey: '',
+            uniqueSampleKey: '',
+        },
+    ];
 }
 
-export function getMutationData(): Mutation
-{
+export function getMutationData(): Mutation {
     return {
-       center: "broad.mit.edu", endPosition: 178936091, entrezGeneId: 5290, fisValue: 1.4013e-45, functionalImpactScore:"",
-       gene: {geneticEntityId: 4233, entrezGeneId: 5290, hugoGeneSymbol: "PIK3CA", type: "protein-coding"},
-       alleleSpecificCopyNumber: {ascnIntegerCopyNumber: -1, ascnMethod: "", ccfMCopies: -1, ccfMCopiesUpper: -1,
-       clonal: false, minorCopyNumber: -1, mutantCopies: -1, totalCopyNumber: -1 },
-       molecularProfileId: "ccle_mutations", keyword: "PIK3CA E545 missense", linkMsa:"", linkPdb: "", linkXvar: "", mutationStatus: "NA",
-       mutationType: "Missense_Mutation", ncbiBuild: "GRCh37", normalAltCount: -1, normalRefCount: -1, proteinChange: "E545K", proteinPosEnd: 545,
-       proteinPosStart: 545, referenceAllele: "G", refseqMrnaId: "NM_006218.2", sampleId: "NCIH508_LARGE_INTESTINE", patientId: "PATIENT1",
-       studyId: "STUDY1", uniquePatientKey: "", uniqueSampleKey: "", startPosition: 178936091, tumorAltCount: -1, tumorRefCount: -1,
-       validationStatus: "NA", variantAllele: "A", variantType: "SNP", aminoAcidChange: "", driverFilter: "", driverFilterAnnotation: "", driverTiersFilter: "",
-       driverTiersFilterAnnotation: "", chr: "3"
-   };
+        center: 'broad.mit.edu',
+        endPosition: 178936091,
+        entrezGeneId: 5290,
+        fisValue: 1.4013e-45,
+        functionalImpactScore: '',
+        gene: {
+            geneticEntityId: 4233,
+            entrezGeneId: 5290,
+            hugoGeneSymbol: 'PIK3CA',
+            type: 'protein-coding',
+        },
+        alleleSpecificCopyNumber: {
+            ascnIntegerCopyNumber: -1,
+            ascnMethod: '',
+            ccfMCopies: -1,
+            ccfMCopiesUpper: -1,
+            clonal: false,
+            minorCopyNumber: -1,
+            mutantCopies: -1,
+            totalCopyNumber: -1,
+        },
+        molecularProfileId: 'ccle_mutations',
+        keyword: 'PIK3CA E545 missense',
+        linkMsa: '',
+        linkPdb: '',
+        linkXvar: '',
+        mutationStatus: 'NA',
+        mutationType: 'Missense_Mutation',
+        ncbiBuild: 'GRCh37',
+        normalAltCount: -1,
+        normalRefCount: -1,
+        proteinChange: 'E545K',
+        proteinPosEnd: 545,
+        proteinPosStart: 545,
+        referenceAllele: 'G',
+        refseqMrnaId: 'NM_006218.2',
+        sampleId: 'NCIH508_LARGE_INTESTINE',
+        patientId: 'PATIENT1',
+        studyId: 'STUDY1',
+        uniquePatientKey: '',
+        uniqueSampleKey: '',
+        startPosition: 178936091,
+        tumorAltCount: -1,
+        tumorRefCount: -1,
+        validationStatus: 'NA',
+        variantAllele: 'A',
+        variantType: 'SNP',
+        aminoAcidChange: '',
+        driverFilter: '',
+        driverFilterAnnotation: '',
+        driverTiersFilter: '',
+        driverTiersFilterAnnotation: '',
+        chr: '3',
+    };
 }
 
-export function getExpectedCivicEntry(): ICivicEntry
-{
+export function getExpectedCivicEntry(): ICivicEntry {
     return {
-            name: "PIK3CA",
-            description: "PIK3CA is the most recurrently mutated gene in breast cancer, and has been found to important in a number of cancer types. An integral part of the PI3K pathway, PIK3CA has long been described as an oncogene, with two main hotspots for activating mutations, the 542/545 region of the helical domain, and the 1047 region of the kinase domain. PIK3CA, and its interaction with the AKT and mTOR pathways, is the subject of an immense amount of research and development, and PI3K inhibition has seen some limited success in recent clinical trials. While monotherapies seem to be limited in their potential, there is a recent interest in pursuing PI3K inhibition as part of a combination therapy regiment with inhibition partners including TKI's, MEK inhibitors, PARP inhibitors, and in breast cancer, aromatase inhibitors.",
-            url: "https://civicdb.org/#/events/genes/37/summary",
-            variants: { "E545K": {
-                                 id: 104,
-                                 name: "E545K",
-                                 geneId: 37,
-                                 description: "PIK3CA E545K/E542K are the second most recurrent PIK3CA mutations in breast cancer, and are highly recurrent mutations in many other cancer types. E545K, and possibly the other mutations in the E545 region, may present patients with a poorer prognosis than patients with either patients with other PIK3CA variant or wild-type PIK3CA. There is also data to suggest that E545/542 mutations may confer resistance to EGFR inhibitors like cetuximab. While very prevalent, targeted therapies for variants in PIK3CA are still in early clinical trial phases.",
-                                 url: "https://civicdb.org/#/events/genes/37/summary/variants/104/summary#variant",
-                                 evidence: {"Prognostic": 1, "Predictive": 14}
-                                 }
-                      }
-            };
+        name: 'PIK3CA',
+        description:
+            "PIK3CA is the most recurrently mutated gene in breast cancer, and has been found to important in a number of cancer types. An integral part of the PI3K pathway, PIK3CA has long been described as an oncogene, with two main hotspots for activating mutations, the 542/545 region of the helical domain, and the 1047 region of the kinase domain. PIK3CA, and its interaction with the AKT and mTOR pathways, is the subject of an immense amount of research and development, and PI3K inhibition has seen some limited success in recent clinical trials. While monotherapies seem to be limited in their potential, there is a recent interest in pursuing PI3K inhibition as part of a combination therapy regiment with inhibition partners including TKI's, MEK inhibitors, PARP inhibitors, and in breast cancer, aromatase inhibitors.",
+        url: 'https://civicdb.org/#/events/genes/37/summary',
+        variants: {
+            E545K: {
+                id: 104,
+                name: 'E545K',
+                geneId: 37,
+                description:
+                    'PIK3CA E545K/E542K are the second most recurrent PIK3CA mutations in breast cancer, and are highly recurrent mutations in many other cancer types. E545K, and possibly the other mutations in the E545 region, may present patients with a poorer prognosis than patients with either patients with other PIK3CA variant or wild-type PIK3CA. There is also data to suggest that E545/542 mutations may confer resistance to EGFR inhibitors like cetuximab. While very prevalent, targeted therapies for variants in PIK3CA are still in early clinical trial phases.',
+                url:
+                    'https://civicdb.org/#/events/genes/37/summary/variants/104/summary#variant',
+                evidence: { Prognostic: 1, Predictive: 14 },
+            },
+        },
+    };
 }
 
-export function getExpectedCnaCivicEntry(): ICivicEntry
-{
+export function getExpectedCnaCivicEntry(): ICivicEntry {
     return {
-           name: "RAF1",
-           description: "",
-           url: "https://civicdb.org/#/events/genes/4767/summary",
-           variants: {"RAF1": {
-                                       id: 591,
-                                       name: "AMPLIFICATION",
-                                       geneId: 4767,
-                                       description: "",
-                                       url: "https://civicdb.org/#/events/genes/4767/summary/variants/591/summary#variant",
-                                       evidence: {"Predictive": 1}
-                                       }
-                     }
-           };
+        name: 'RAF1',
+        description: '',
+        url: 'https://civicdb.org/#/events/genes/4767/summary',
+        variants: {
+            RAF1: {
+                id: 591,
+                name: 'AMPLIFICATION',
+                geneId: 4767,
+                description: '',
+                url:
+                    'https://civicdb.org/#/events/genes/4767/summary/variants/591/summary#variant',
+                evidence: { Predictive: 1 },
+            },
+        },
+    };
 }
diff --git a/src/test/MutationMockUtils.ts b/src/test/MutationMockUtils.ts
index 3fbdaaeb573..3a4cb6ca8a0 100644
--- a/src/test/MutationMockUtils.ts
+++ b/src/test/MutationMockUtils.ts
@@ -1,5 +1,5 @@
 import * as _ from 'lodash';
-import {Mutation} from "shared/api/generated/CBioPortalAPI";
+import { Mutation } from 'shared/api/generated/CBioPortalAPI';
 
 /**
  * Utility functions to generate mock data.
@@ -7,63 +7,61 @@ import {Mutation} from "shared/api/generated/CBioPortalAPI";
  * @author Selcuk Onur Sumer
  */
 
-
-export function emptyMutation(): Mutation
-{
+export function emptyMutation(): Mutation {
     return {
-        aminoAcidChange: "",
-        center: "",
+        aminoAcidChange: '',
+        center: '',
         endPosition: -1,
         entrezGeneId: -1,
         fisValue: -1,
-        functionalImpactScore: "",
+        functionalImpactScore: '',
         gene: {
             geneticEntityId: -1,
             entrezGeneId: -1,
-            hugoGeneSymbol: "",
-            type: ""
+            hugoGeneSymbol: '',
+            type: '',
         },
         alleleSpecificCopyNumber: {
             ascnIntegerCopyNumber: -1,
-            ascnMethod: "",
+            ascnMethod: '',
             ccfMCopies: -1,
             ccfMCopiesUpper: -1,
             clonal: false,
             minorCopyNumber: -1,
             mutantCopies: -1,
-            totalCopyNumber: -1
+            totalCopyNumber: -1,
         },
-        molecularProfileId: "",
-        keyword: "",
-        linkMsa: "",
-        linkPdb: "",
-        linkXvar: "",
-        mutationStatus: "",
-        mutationType: "",
-        ncbiBuild: "",
+        molecularProfileId: '',
+        keyword: '',
+        linkMsa: '',
+        linkPdb: '',
+        linkXvar: '',
+        mutationStatus: '',
+        mutationType: '',
+        ncbiBuild: '',
         normalAltCount: -1,
         normalRefCount: -1,
-        proteinChange: "",
+        proteinChange: '',
         proteinPosEnd: -1,
         proteinPosStart: -1,
-        referenceAllele: "",
-        refseqMrnaId: "",
-        sampleId: "",
-        patientId: "",
-        studyId: "",
-        uniqueSampleKey: "",
-        uniquePatientKey: "",
+        referenceAllele: '',
+        refseqMrnaId: '',
+        sampleId: '',
+        patientId: '',
+        studyId: '',
+        uniqueSampleKey: '',
+        uniquePatientKey: '',
         startPosition: -1,
         tumorAltCount: -1,
         tumorRefCount: -1,
-        validationStatus: "",
-        variantAllele: "",
-        variantType: "",
-        driverFilter: "",
-        driverFilterAnnotation: "",
-        driverTiersFilter: "",
-        driverTiersFilterAnnotation: "",
-        chr: ""
+        validationStatus: '',
+        variantAllele: '',
+        variantType: '',
+        driverFilter: '',
+        driverFilterAnnotation: '',
+        driverTiersFilter: '',
+        driverTiersFilterAnnotation: '',
+        chr: '',
         /*wildType:false,
         sequenced:true*/
     };
@@ -75,8 +73,7 @@ export function emptyMutation(): Mutation
  * @param props
  * @returns {Mutation}
  */
-export function initMutation(props:{[key:string]: any}): Mutation
-{
+export function initMutation(props: { [key: string]: any }): Mutation {
     const mutation = emptyMutation();
 
     // TODO this is not a type safe operation since the property values can be anything
diff --git a/src/test/PdbMockUtils.ts b/src/test/PdbMockUtils.ts
index 8fccb7b8708..82af7df09c9 100644
--- a/src/test/PdbMockUtils.ts
+++ b/src/test/PdbMockUtils.ts
@@ -1,5 +1,5 @@
 import * as _ from 'lodash';
-import {Alignment} from "cbioportal-frontend-commons";
+import { Alignment } from 'cbioportal-frontend-commons';
 
 /**
  * Utility functions to generate mock data.
@@ -7,45 +7,47 @@ import {Alignment} from "cbioportal-frontend-commons";
  * @author Selcuk Onur Sumer
  */
 
-export function initPdbAlignment(alignmentString: string, uniprotFrom: number): Alignment
-{
+export function initPdbAlignment(
+    alignmentString: string,
+    uniprotFrom: number
+): Alignment {
     return initPdbAlignmentWithPartialProps({
         midlineAlign: alignmentString,
         pdbAlign: alignmentString,
         seqAlign: alignmentString,
         seqFrom: uniprotFrom,
-        seqTo: uniprotFrom + alignmentString.length - 1
+        seqTo: uniprotFrom + alignmentString.length - 1,
     });
 }
 
-export function emptyPdbAlignment(): Alignment
-{
+export function emptyPdbAlignment(): Alignment {
     return {
         alignmentId: -1,
         bitscore: 0,
-        chain: "",
-        evalue: "",
+        chain: '',
+        evalue: '',
         identity: -1,
         identityPositive: -1,
-        midlineAlign: "",
-        pdbAlign: "",
-        seqAlign: "",
+        midlineAlign: '',
+        pdbAlign: '',
+        seqAlign: '',
         pdbFrom: 0,
-        pdbId: "",
-        pdbNo: "",
-        pdbSeg: "",
+        pdbId: '',
+        pdbNo: '',
+        pdbSeg: '',
         pdbTo: 0,
         seqFrom: -1,
-        seqId: "",
+        seqId: '',
         seqTo: -1,
-        segStart: "",
+        segStart: '',
         residueMapping: [],
-        updateDate: ""
+        updateDate: '',
     };
 }
 
-function initPdbAlignmentWithPartialProps(props:{[key:string]: any}): Alignment
-{
+function initPdbAlignmentWithPartialProps(props: {
+    [key: string]: any;
+}): Alignment {
     const alignment = emptyPdbAlignment();
 
     _.merge(alignment, props);
diff --git a/src/test/fetchMockData.js b/src/test/fetchMockData.js
index edff64d42df..846870e60d6 100644
--- a/src/test/fetchMockData.js
+++ b/src/test/fetchMockData.js
@@ -13,25 +13,27 @@ const ArgumentParser = require('argparse').ArgumentParser;
 
 const API_ROOT = 'cbioportal-rc.herokuapp.com/api';
 
+const storeFile = (url, outputFile) => response => {
+    let str = '';
 
-const storeFile = (url, outputFile) =>
-    (response) => {
-        let str = '';
-
-        response.on('data', (chunk) => {
-            str += chunk;
-        });
+    response.on('data', chunk => {
+        str += chunk;
+    });
 
-        response.on('end', () => {
-            fs.writeFile(outputFile, JSON.stringify(JSON.parse(str), null, 4), (e) => {
+    response.on('end', () => {
+        fs.writeFile(
+            outputFile,
+            JSON.stringify(JSON.parse(str), null, 4),
+            e => {
                 if (e) {
                     return 1;
                 }
                 console.log(`✓ Downloaded ${url} to ${outputFile}`.green);
                 return 0;
-            });
-        });
-    };
+            }
+        );
+    });
+};
 
 const downloadFileFromURL = (url, file, postData) => {
     const urlSplit = url.split('/');
@@ -46,8 +48,8 @@ const downloadFileFromURL = (url, file, postData) => {
         options.headers = {
             'Content-Type': 'application/json',
             'Cache-Control': 'no-cache',
-            'Accept': 'application/json',
-            'Content-Length': JSON.stringify(postData).length
+            Accept: 'application/json',
+            'Content-Length': JSON.stringify(postData).length,
         };
     } else {
         options.method = 'GET';
@@ -58,18 +60,17 @@ const downloadFileFromURL = (url, file, postData) => {
     }
     req.end();
 
-    req.on('error', (e) => {
+    req.on('error', e => {
         console.error(e);
     });
 };
 
-
-const main = (testDiff) => {
+const main = testDiff => {
     const failed = [];
     let URLsProcessed = 0;
     let fail;
 
-    mockDataURLs.forEach((x) => {
+    mockDataURLs.forEach(x => {
         URLsProcessed += 1;
 
         if (x.implemented === 'true') {
@@ -77,7 +78,7 @@ const main = (testDiff) => {
             fail = downloadFileFromURL(`${API_ROOT}/${x.url}`, x.file, x.data);
             if (testDiff) {
                 const diff = spawn('git', ['diff', '--quiet', x.file]);
-                diff.on('close', (code) => {
+                diff.on('close', code => {
                     if (!code || fail) {
                         failed.push(x);
                     }
@@ -89,9 +90,15 @@ const main = (testDiff) => {
 
         if (URLsProcessed === mockDataURLs.length) {
             if (failed.length > 0) {
-                console.log('✗ FAILED: Following files in API differ from stored mockData:'.red);
-                failed.forEach((file) => {
-                    console.log(`✗ File from API is differs from stored mock ${file}`.red);
+                console.log(
+                    '✗ FAILED: Following files in API differ from stored mockData:'
+                        .red
+                );
+                failed.forEach(file => {
+                    console.log(
+                        `✗ File from API is differs from stored mock ${file}`
+                            .red
+                    );
                 });
                 process.exit(1);
             }
@@ -102,16 +109,13 @@ const main = (testDiff) => {
 if (require.main === module) {
     const parser = new ArgumentParser({
         addHelp: true,
-        description: 'Download mock data & test if it is different from repo'
+        description: 'Download mock data & test if it is different from repo',
+    });
+    parser.addArgument(['-d', '--diff'], {
+        help: 'Test if files are different using git diff',
+        type: Boolean,
+        action: 'storeTrue',
     });
-    parser.addArgument(
-        ['-d', '--diff'],
-        {
-            help: 'Test if files are different using git diff',
-            type: Boolean,
-            action: 'storeTrue'
-        }
-    );
     const args = parser.parseArgs();
     main(args.diff);
 }
diff --git a/src/testWriter.js b/src/testWriter.js
index 7ccb3e32e3c..5b1c9eb0235 100644
--- a/src/testWriter.js
+++ b/src/testWriter.js
@@ -2,63 +2,74 @@ import $ from 'jquery';
 
 window._trCountMap = {};
 
-
-function testObj(me){
-    Object.assign(this,me);
+function testObj(me) {
+    Object.assign(this, me);
 }
 
-testObj.prototype.writeTest = function(){
+testObj.prototype.writeTest = function() {
     console.log(_formatTest(this));
-}
+};
 
-window._handleTestReports = function(args,func,params,context,funcName){
-    window._tr=window._tr||{};
+window._handleTestReports = function(args, func, params, context, funcName) {
+    window._tr = window._tr || {};
     var name = funcName || func.name;
-    var paramArr = (/\(/.test(params)) ? params.replace(/[()]/g,'').split(',') : null;
+    var paramArr = /\(/.test(params)
+        ? params.replace(/[()]/g, '').split(',')
+        : null;
     var argArr = Array.from(args);
-    var argMap = argArr.map((a,i)=>JSON.stringify(a));
+    var argMap = argArr.map((a, i) => JSON.stringify(a));
 
-    window._trCountMap[name] = (name in window._trCountMap) ? window._trCountMap[name]++ : 0;
-    let ret = func.apply(context,args);
+    window._trCountMap[name] =
+        name in window._trCountMap ? window._trCountMap[name]++ : 0;
+    let ret = func.apply(context, args);
     // if there are no constraints or we asre within constraints
     window._tr[name] = window._tr[name] || [];
-    if (paramArr === null || (window._trCountMap[name] >= paramArr[0] && window._trCountMap[name] <= paramArr[1])) {
-        window._tr[name].push(new testObj({
-            argMap: argMap,
-            args: args,
-            ret: ret,
-            name: funcName || func.name,
-            fn: func,
-            argNames: func.toString().match(/\((.*)\)/)[1].split(', ')
-        }));
+    if (
+        paramArr === null ||
+        (window._trCountMap[name] >= paramArr[0] &&
+            window._trCountMap[name] <= paramArr[1])
+    ) {
+        window._tr[name].push(
+            new testObj({
+                argMap: argMap,
+                args: args,
+                ret: ret,
+                name: funcName || func.name,
+                fn: func,
+                argNames: func
+                    .toString()
+                    .match(/\((.*)\)/)[1]
+                    .split(', '),
+            })
+        );
     }
     return ret;
-}
-
+};
 
 window._writeTest = function(name, argJSON, retJSON) {
+    showTest(formatTest(name, argJSON, retJSON));
+};
 
-    showTest(formatTest(name,argJSON,retJSON));
-
-}
-
-
-window._formatTest = function(report){
+window._formatTest = function(report) {
     let argDeclarations = '';
     if (report.argMap.length > 0) {
-        argDeclarations=`
-        ${report.argNames.reduce((s,a,i)=>s+='let '+a+' = '+ report.argMap[i] +';\n\n','')}
+        argDeclarations = `
+        ${report.argNames.reduce(
+            (s, a, i) => (s += 'let ' + a + ' = ' + report.argMap[i] + ';\n\n'),
+            ''
+        )}
         
-        `
+        `;
     }
 
-    return (
-        `
+    return `
 describe('${report.name}', ()=>{
 
     it('###should do something###',()=>{
         ${argDeclarations}
-        const ret = ${report.name}(${report.argNames.map((n,i)=>n).join(', ')});
+        const ret = ${report.name}(${report.argNames
+        .map((n, i) => n)
+        .join(', ')});
         
         const expectedResult = ${JSON.stringify(report.ret)};
         
@@ -68,19 +79,19 @@ describe('${report.name}', ()=>{
 
 });
 
-`)
+`;
 };
 
 window._showTest = function showTest(txt) {
-    $("<textarea/>").css(
-        {
-            position:'absolute',
-            left:200,
-            right:200,
-            top:100,
-            bottom:100,
-            zIndex:100
-        }
-    ).val(txt)
-        .appendTo("body")
-}
\ No newline at end of file
+    $('<textarea/>')
+        .css({
+            position: 'absolute',
+            left: 200,
+            right: 200,
+            top: 100,
+            bottom: 100,
+            zIndex: 100,
+        })
+        .val(txt)
+        .appendTo('body');
+};